@deslop/workbench 0.0.407 → 0.0.410

package/dist/server.js

@@ -4157,7 +4157,7 @@ const flatMap$6 = /*#__PURE__*/ dual(2, (self, f) => isNone(self) ? none() : f(s
 * @category filtering
 * @since 2.0.0
 */
-const filter$6 = /*#__PURE__*/ dual(2, (self, predicate) => isNone(self) ? none() : predicate(self.value) ? some$1(self.value) : none());
+const filter$5 = /*#__PURE__*/ dual(2, (self, predicate) => isNone(self) ? none() : predicate(self.value) ? some$1(self.value) : none());
 //#endregion
 //#region ../../node_modules/.pnpm/effect@4.0.0-beta.74/node_modules/effect/dist/Context.js
 /**
@@ -5320,7 +5320,7 @@ const toEntries = /*#__PURE__*/ (/* @__PURE__ */ dual(2, (self, f) => {
 * @category guards
 * @since 2.0.0
 */
-const has$6 = /*#__PURE__*/ dual(2, (self, key) => Object.hasOwn(self, key));
+const has$5 = /*#__PURE__*/ dual(2, (self, key) => Object.hasOwn(self, key));
 /**
 * Maps a record into another record by applying a transformation function to each of its values.
 *
@@ -5397,7 +5397,7 @@ const keys$3 = (self) => Object.keys(self);
 * @since 2.0.0
 */
 const isSubrecordBy = (equivalence) => dual(2, (self, that) => {
-	for (const key of keys$3(self)) if (!has$6(that, key) || !equivalence(self[key], that[key])) return false;
+	for (const key of keys$3(self)) if (!has$5(that, key) || !equivalence(self[key], that[key])) return false;
 	return true;
 });
 /**
@@ -5640,7 +5640,7 @@ const range$1 = (start, end) => start <= end ? makeBy(end - start + 1, (i) => st
 * @category constructors
 * @since 2.0.0
 */
-const fromIterable$6 = (collection) => Array$1.isArray(collection) ? collection : Array$1.from(collection);
+const fromIterable$4 = (collection) => Array$1.isArray(collection) ? collection : Array$1.from(collection);
 /**
 * Normalizes a value that is either a single element or an array into an array.
 *
@@ -5726,7 +5726,7 @@ const append$1 = /*#__PURE__*/ dual(2, (self, last) => [...self, last]);
 * @category combining
 * @since 2.0.0
 */
-const appendAll = /*#__PURE__*/ dual(2, (self, that) => fromIterable$6(self).concat(fromIterable$6(that)));
+const appendAll = /*#__PURE__*/ dual(2, (self, that) => fromIterable$4(self).concat(fromIterable$4(that)));
 Array$1.isArray;
 /**
 * Checks whether a mutable `Array` is empty, narrowing the type to `[]`.
@@ -6040,10 +6040,49 @@ const tailNonEmpty = (self) => self.slice(1);
 * @since 2.0.0
 */
 const take$3 = /*#__PURE__*/ dual(2, (self, n) => {
-	const input = fromIterable$6(self);
+	const input = fromIterable$4(self);
 	return input.slice(0, clamp$1(n, input));
 });
 /**
+* 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**
@@ -6072,7 +6111,7 @@ const take$3 = /*#__PURE__*/ dual(2, (self, n) => {
 * @since 2.0.0
 */
 const drop = /*#__PURE__*/ dual(2, (self, n) => {
-	const input = fromIterable$6(self);
+	const input = fromIterable$4(self);
 	return input.slice(clamp$1(n, input), input.length);
 });
 /**
@@ -6101,7 +6140,7 @@ const drop = /*#__PURE__*/ dual(2, (self, n) => {
 * @since 2.0.0
 */
 const dropRight = /*#__PURE__*/ dual(2, (self, n) => {
-	const input = fromIterable$6(self);
+	const input = fromIterable$4(self);
 	return input.slice(0, input.length - clamp$1(n, input));
 });
 /**
@@ -6163,7 +6202,7 @@ const findFirst$2 = findFirst$3;
 * @since 2.0.0
 */
 const findLast = /*#__PURE__*/ dual(2, (self, f) => {
-	const input = fromIterable$6(self);
+	const input = fromIterable$4(self);
 	for (let i = input.length - 1; i >= 0; i--) {
 		const a = input[i];
 		const o = f(a, i);
@@ -6299,8 +6338,8 @@ const contains = /*#__PURE__*/ containsWith(/*#__PURE__*/ asEquivalence());
 * @since 2.0.0
 */
 const unionWith = /*#__PURE__*/ dual(3, (self, that, isEquivalent) => {
-	const a = fromIterable$6(self);
-	const b = fromIterable$6(that);
+	const a = fromIterable$4(self);
+	const b = fromIterable$4(that);
 	if (isReadonlyArrayNonEmpty(a)) {
 		if (isReadonlyArrayNonEmpty(b)) return dedupeWith(isEquivalent)(appendAll(a, b));
 		return a;
@@ -6326,7 +6365,7 @@ const unionWith = /*#__PURE__*/ dual(3, (self, that, isEquivalent) => {
 * @category elements
 * @since 2.0.0
 */
-const union$1 = /*#__PURE__*/ dual(2, (self, that) => unionWith(self, that, asEquivalence()));
+const union$3 = /*#__PURE__*/ dual(2, (self, that) => unionWith(self, that, asEquivalence()));
 /**
 * Creates an empty array.
 *
@@ -6505,8 +6544,8 @@ const getSomes = (self) => {
 * @category filtering
 * @since 2.0.0
 */
-const filter$5 = /*#__PURE__*/ dual(2, (self, predicate) => {
-	const as = fromIterable$6(self);
+const filter$4 = /*#__PURE__*/ dual(2, (self, predicate) => {
+	const as = fromIterable$4(self);
 	const out = [];
 	for (let i = 0; i < as.length; i++) if (predicate(as[i], i)) out.push(as[i]);
 	return out;
@@ -6536,7 +6575,7 @@ const filter$5 = /*#__PURE__*/ dual(2, (self, predicate) => {
 * @category folding
 * @since 2.0.0
 */
-const reduce = /*#__PURE__*/ dual(3, (self, b, f) => fromIterable$6(self).reduce((b, a, i) => f(b, a, i), b));
+const reduce = /*#__PURE__*/ dual(3, (self, b, f) => fromIterable$4(self).reduce((b, a, i) => f(b, a, i), b));
 /**
 * Checks whether all elements satisfy the predicate. Supports refinements for
 * type narrowing.
@@ -6625,7 +6664,7 @@ const makeEquivalence = Array_;
 * @since 2.0.0
 */
 const dedupeWith = /*#__PURE__*/ dual(2, (self, isEquivalent) => {
-	const input = fromIterable$6(self);
+	const input = fromIterable$4(self);
 	if (isReadonlyArrayNonEmpty(input)) {
 		const out = [headNonEmpty(input)];
 		const rest = tailNonEmpty(input);
@@ -6674,7 +6713,7 @@ const dedupe = (self) => dedupeWith(self, asEquivalence());
 * @category folding
 * @since 2.0.0
 */
-const join$4 = /*#__PURE__*/ dual(2, (self, sep) => fromIterable$6(self).join(sep));
+const join$4 = /*#__PURE__*/ dual(2, (self, sep) => fromIterable$4(self).join(sep));
 //#endregion
 //#region ../../node_modules/.pnpm/effect@4.0.0-beta.74/node_modules/effect/dist/Duration.js
 const TypeId$49 = "~effect/time/Duration";
@@ -7263,7 +7302,7 @@ const toPredicate = (self) => (input) => !isFailure$1(self(input));
 * @category constructors
 * @since 4.0.0
 */
-const has$5 = (key) => (input) => input.has(key) ? succeed$7(input) : fail$7(input);
+const has$4 = (key) => (input) => input.has(key) ? succeed$7(input) : fail$7(input);
 /**
 * Composes two filters sequentially, feeding the output of the first into the second.
 *
@@ -7966,7 +8005,7 @@ const hasInterruptsOnly$1 = (self) => self.reasons.length > 0 && self.reasons.ev
 const causeCombine = /*#__PURE__*/ dual(2, (self, that) => {
 	if (self.reasons.length === 0) return that;
 	else if (that.reasons.length === 0) return self;
-	const newCause = new CauseImpl(union$1(self.reasons, that.reasons));
+	const newCause = new CauseImpl(union$3(self.reasons, that.reasons));
 	return equals$2(self, newCause) ? self : newCause;
 });
 /** @internal */
@@ -9161,7 +9200,7 @@ const forEach$2 = /*#__PURE__*/ dual((args) => typeof args[1] === "function", (i
 	const concurrencyOption = options?.concurrency === "inherit" ? parent.getRef(CurrentConcurrency) : options?.concurrency ?? 1;
 	const concurrency = concurrencyOption === "unbounded" ? Number.POSITIVE_INFINITY : Math.max(1, concurrencyOption);
 	if (concurrency === 1) return forEachSequential(iterable, f, options);
-	const items = fromIterable$6(iterable);
+	const items = fromIterable$4(iterable);
 	let length = items.length;
 	if (length === 0) return options?.discard ? void_$3 : succeed$6([]);
 	const out = options?.discard ? void 0 : new Array(length);
@@ -19618,7 +19657,7 @@ function omit() {
 */
 function withDefault$1(defaultValue) {
 	return new Getter((o) => {
-		const filtered = filter$6(o, isNotUndefined);
+		const filtered = filter$5(o, isNotUndefined);
 		return isSome(filtered) ? succeed$3(filtered) : mapEager(defaultValue, some$1);
 	});
 }
@@ -21787,7 +21826,7 @@ function tuple(elements, checks = void 0) {
 	return new Arrays(false, elements.map((e) => e.ast), [], void 0, checks);
 }
 /** @internal */
-function union(members, mode, checks) {
+function union$2(members, mode, checks) {
 	return new Union$2(members.map(getAST), mode, void 0, checks);
 }
 function getCandidateTypes(ast) {
@@ -23481,7 +23520,7 @@ const take$2 = (self) => {
 * @category mutations
 * @since 4.0.0
 */
-const filter$4 = (self, f) => {
+const filter$3 = (self, f) => {
 	const array = [];
 	let chunk = self.head;
 	while (chunk) {
@@ -23547,7 +23586,7 @@ const filter$4 = (self, f) => {
 * @category mutations
 * @since 4.0.0
 */
-const remove$7 = (self, value) => filter$4(self, (v) => v !== value);
+const remove$7 = (self, value) => filter$3(self, (v) => v !== value);
 //#endregion
 //#region ../../node_modules/.pnpm/effect@4.0.0-beta.74/node_modules/effect/dist/MutableRef.js
 const TypeId$38 = "~effect/MutableRef";
@@ -24336,7 +24375,7 @@ var BoundedPubSubArb = class {
 			if (this.replayBuffer) this.replayBuffer.offerAll(elements);
 			return [];
 		}
-		const chunk = fromIterable$6(elements);
+		const chunk = fromIterable$4(elements);
 		const n = chunk.length;
 		const size = this.publisherIndex - this.subscribersIndex;
 		const available = this.capacity - size;
@@ -24482,7 +24521,7 @@ var BoundedPubSubPow2 = class {
 			if (this.replayBuffer) this.replayBuffer.offerAll(elements);
 			return [];
 		}
-		const chunk = fromIterable$6(elements);
+		const chunk = fromIterable$4(elements);
 		const n = chunk.length;
 		const size = this.publisherIndex - this.subscribersIndex;
 		const available = this.capacity - size;
@@ -24624,7 +24663,7 @@ var BoundedPubSubSingle = class {
 			if (this.replayBuffer) this.replayBuffer.offerAll(elements);
 			return [];
 		}
-		const chunk = fromIterable$6(elements);
+		const chunk = fromIterable$4(elements);
 		if (chunk.length === 0) return chunk;
 		if (this.publish(chunk[0])) return chunk.slice(1);
 		else return chunk;
@@ -24958,7 +24997,7 @@ var BackPressureStrategy = class {
 		}
 	}
 	removeUnsafe(deferred) {
-		filter$4(this.publishers, ([_, d]) => d !== deferred);
+		filter$3(this.publishers, ([_, d]) => d !== deferred);
 	}
 };
 /**
@@ -27252,47 +27291,6 @@ const repeat$1 = /*#__PURE__*/ dual(2, (self, schedule) => toStepWithMetadata(ty
 	return loop;
 }), unwrap$3));
 /**
-* Filters arrays of elements emitted by a channel, applying the filter
-* to each element within the arrays and only emitting non-empty filtered arrays.
-*
-* **Example** (Filtering array output)
-*
-* ```ts
-* import { Array, Channel } from "effect"
-*
-* const nonEmptyArrayPredicate = Array.isReadonlyArrayNonEmpty
-*
-* // Create a channel that outputs arrays of mixed data
-* const arrayChannel = Channel.fromIterable([
-*   Array.make(1, 2, 3, 4, 5),
-*   Array.make(6, 7, 8, 9, 10),
-*   Array.make(11, 12, 13, 14, 15)
-* ]).pipe(Channel.filter(nonEmptyArrayPredicate))
-*
-* // Filter arrays to keep only even numbers
-* const evenArraysChannel = Channel.filterArray(arrayChannel, (n) => n % 2 === 0)
-* // Outputs: [2, 4], [6, 8, 10], [12, 14]
-* // Note: Only non-empty filtered arrays are emitted
-*
-* // Arrays that would become empty after filtering are discarded entirely
-* const oddChannel = Channel.fromIterable([
-*   Array.make(1, 3, 5),
-*   Array.make(2, 4),
-*   Array.make(7, 9)
-* ]).pipe(Channel.filter(nonEmptyArrayPredicate))
-* const filteredOddChannel = Channel.filterArray(oddChannel, (n) => n % 2 === 0)
-* // Outputs: [2, 4] (the arrays [1,3,5] and [7,9] are discarded)
-* ```
-*
-* @category filtering
-* @since 4.0.0
-*/
-const filterArray = /*#__PURE__*/ dual(2, (self, predicate) => transformPull$1(self, (pull) => succeed$3(flatMap$2(pull, function loop(arr) {
-	const passes = [];
-	for (let i = 0; i < arr.length; i++) if (predicate(arr[i])) passes.push(arr[i]);
-	return isReadonlyArrayNonEmpty(passes) ? succeed$3(passes) : flatMap$2(pull, loop);
-}))));
-/**
 * Filters and maps each element inside emitted non-empty arrays using a
 * `Filter`.
 *
@@ -27787,6 +27785,35 @@ const provideService = /*#__PURE__*/ dual(3, (self, key, service) => fromTransfo
 */
 const provideServiceEffect = /*#__PURE__*/ dual(3, (self, key, service) => fromTransform$1((upstream, scope) => flatMap$2(service, (s) => toTransform(provideService(self, key, s))(upstream, scope))));
 /**
+* Runs a channel and discards all output elements, returning only the final result.
+*
+* **Example** (Draining channel output at runtime)
+*
+* ```ts
+* import { Channel, Data } from "effect"
+*
+* class DrainError extends Data.TaggedError("DrainError")<{
+*   readonly stage: string
+* }> {}
+*
+* // Create a channel that outputs elements and completes with a result
+* const resultChannel = Channel.fromIterable([1, 2, 3])
+* const completedChannel = Channel.concatWith(
+*   resultChannel,
+*   () => Channel.succeed("completed")
+* )
+*
+* // Drain all elements and get only the final result
+* const drainEffect = Channel.runDrain(completedChannel)
+*
+* // Effect.runSync(drainEffect) // Returns: "completed"
+* ```
+*
+* @category execution
+* @since 2.0.0
+*/
+const runDrain$1 = (self) => runWith(self, (pull) => forever(pull, { disableYield: true }));
+/**
 * Runs a channel and applies an effect to each output element.
 *
 * **Example** (Running effects for each output)
@@ -28268,7 +28295,7 @@ const getFromBucket = (self, bucket, key) => {
 * @category elements
 * @since 2.0.0
 */
-const has$4 = /*#__PURE__*/ dual(2, (self, key) => isSome(get$7(self, key)));
+const has$3 = /*#__PURE__*/ dual(2, (self, key) => isSome(get$7(self, key)));
 /**
 * Sets a key-value pair in the MutableHashMap, mutating the map in place.
 * If the key already exists, its value is updated.
@@ -28655,7 +28682,7 @@ const get$6 = /*#__PURE__*/ dual(2, (self, key) => uninterruptibleMask((restore)
 const release = (self, key, entry) => withFiber((fiber) => {
 	entry.refCount--;
 	if (entry.refCount > 0) return void_$1;
-	else if (self.state._tag === "Closed" || !has$4(self.state.map, key) || isZero$1(entry.idleTimeToLive)) {
+	else if (self.state._tag === "Closed" || !has$3(self.state.map, key) || isZero$1(entry.idleTimeToLive)) {
 		if (self.state._tag === "Open") remove$6(self.state.map, key);
 		return close(entry.scope, void_$2);
 	} else if (!isFinite$2(entry.idleTimeToLive)) return void_$1;
@@ -29762,30 +29789,6 @@ const concat = /*#__PURE__*/ dual(2, (self, that) => flatten(fromArray([self, th
 */
 const merge$1 = /*#__PURE__*/ dual((args) => isStream(args[0]) && isStream(args[1]), (self, that, options) => fromChannel(merge$2(toChannel(self), toChannel(that), options)));
 /**
-* Filters a stream to the elements that satisfy a predicate.
-*
-* **Example** (Filtering stream values)
-*
-* ```ts
-* import { Console, Effect, Stream } from "effect"
-*
-* const program = Effect.gen(function*() {
-*   const stream = Stream.make(1, 2, 3, 4).pipe(
-*     Stream.filter((n) => n % 2 === 0)
-*   )
-*   const values = yield* Stream.runCollect(stream)
-*   yield* Console.log(values)
-* })
-*
-* Effect.runPromise(program)
-* // Output: [ 2, 4 ]
-* ```
-*
-* @category filtering
-* @since 2.0.0
-*/
-const filter$3 = /*#__PURE__*/ dual(2, (self, predicate) => fromChannel(filterArray(toChannel(self), predicate)));
-/**
 * Filters and maps stream elements in one pass using a `Filter`.
 *
 * **When to use**
@@ -30380,6 +30383,32 @@ const runForEach = /*#__PURE__*/ dual(2, (self, f) => runForEach$1(self.channel,
 */
 const runForEachArray = /*#__PURE__*/ dual(2, (self, f) => runForEach$1(self.channel, f));
 /**
+* Runs the stream for its effects, discarding emitted elements.
+*
+* **Example** (Draining a stream run)
+*
+* ```ts
+* import { Console, Effect, Stream } from "effect"
+*
+* const program = Effect.gen(function*() {
+*   const stream = Stream.make(1, 2, 3).pipe(
+*     Stream.mapEffect((n) => Console.log(`Processing: ${n}`))
+*   )
+*
+*   yield* Stream.runDrain(stream)
+* })
+*
+* Effect.runPromise(program)
+* // Processing: 1
+* // Processing: 2
+* // Processing: 3
+* ```
+*
+* @category destructors
+* @since 2.0.0
+*/
+const runDrain = (self) => runDrain$1(self.channel);
+/**
 * Concatenates all emitted strings into a single string.
 *
 * **Example** (Joining strings from a stream)
@@ -31777,24 +31806,11 @@ const isHashMap = (u) => hasProperty(u, HashMapTypeId);
 /** @internal */
 const empty$9 = () => new HashMapImpl(false, 0, emptyNode, 0);
 /** @internal */
-const fromIterable$4 = (entries) => {
-	let root = emptyNode;
-	let size = 0;
-	const added = { value: false };
-	for (const [key, value] of entries) {
-		const hash$1 = hash(key);
-		added.value = false;
-		root = root.set(NaN, 0, hash$1, key, value, added);
-		if (added.value) size++;
-	}
-	return new HashMapImpl(false, 0, root, size);
-};
-/** @internal */
 const get$3 = /*#__PURE__*/ dual(2, (self, key) => {
 	return self._root.get(0, hash(key), key);
 });
 /** @internal */
-const has$3 = /*#__PURE__*/ dual(2, (self, key) => {
+const has$2 = /*#__PURE__*/ dual(2, (self, key) => {
 	return self._root.has(0, hash(key), key);
 });
 /** @internal */
@@ -31857,7 +31873,7 @@ const size$1 = (self) => self.size;
 /** @internal */
 const modifyAt = /*#__PURE__*/ dual(3, (self, key, f) => {
 	const updated = f(get$3(self, key));
-	if (isNone(updated)) return has$3(self, key) ? remove$5(self, key) : self;
+	if (isNone(updated)) return has$2(self, key) ? remove$5(self, key) : self;
 	return set$4(self, key, updated.value);
 });
 /** @internal */
@@ -31980,24 +31996,6 @@ const filter$2 = /*#__PURE__*/ dual(2, (self, f) => {
 */
 const empty$8 = empty$9;
 /**
-* Creates a new `HashMap` from an iterable collection of key/value pairs.
-*
-* **Example** (Creating a HashMap from an iterable)
-*
-* ```ts
-* import { HashMap } from "effect"
-*
-* const entries = [["a", 1], ["b", 2], ["c", 3]] as const
-* const map = HashMap.fromIterable(entries)
-* console.log(HashMap.size(map)) // 3
-* console.log(HashMap.get(map, "a")) // Option.some(1)
-* ```
-*
-* @category constructors
-* @since 2.0.0
-*/
-const fromIterable$3 = fromIterable$4;
-/**
 * Looks up the value for the specified key in the `HashMap` safely using the
 * internal hashing function.
 *
@@ -32021,28 +32019,6 @@ const fromIterable$3 = fromIterable$4;
 */
 const get$2 = get$3;
 /**
-* Checks whether the specified key has an entry in the `HashMap`.
-*
-* **Example** (Checking for keys)
-*
-* ```ts
-* import { HashMap } from "effect"
-*
-* const map = HashMap.make(["a", 1], ["b", 2])
-*
-* console.log(HashMap.has(map, "a")) // true
-* console.log(HashMap.has(map, "c")) // false
-*
-* // Using pipe syntax
-* const hasB = HashMap.has("b")(map)
-* console.log(hasB) // true
-* ```
-*
-* @category elements
-* @since 2.0.0
-*/
-const has$2 = has$3;
-/**
 * Sets the specified key to the specified value using the internal hashing
 * function.
 *
@@ -32195,20 +32171,26 @@ const fromIterable$2 = (values) => {
 	return makeImpl(map);
 };
 /** @internal */
-const has$1 = (self, value) => has$3(keyMap(self), value);
+const has$1 = (self, value) => has$2(keyMap(self), value);
 /** @internal */
 const add$1 = (self, value) => {
 	const map = keyMap(self);
-	return has$3(map, value) ? self : makeImpl(set$4(map, value, true));
+	return has$2(map, value) ? self : makeImpl(set$4(map, value, true));
 };
 /** @internal */
 const remove$3 = (self, value) => {
 	const map = keyMap(self);
-	return has$3(map, value) ? makeImpl(remove$5(map, value)) : self;
+	return has$2(map, value) ? makeImpl(remove$5(map, value)) : self;
 };
 /** @internal */
 const size = (self) => size$1(keyMap(self));
 /** @internal */
+const union$1 = (self, that) => {
+	let result = keyMap(self);
+	for (const value of that) result = set$4(result, value, true);
+	return makeImpl(result);
+};
+/** @internal */
 const every = (self, predicate) => {
 	for (const value of self) if (!predicate(value)) return false;
 	return true;
@@ -32382,6 +32364,26 @@ const has = /*#__PURE__*/ dual(2, has$1);
 * @since 2.0.0
 */
 const remove$2 = /*#__PURE__*/ dual(2, remove$3);
+/**
+* Creates the union of two HashSets.
+*
+* **Example** (Combining HashSets)
+*
+* ```ts
+* import { HashSet } from "effect"
+*
+* const set1 = HashSet.make("a", "b")
+* const set2 = HashSet.make("b", "c")
+* const combined = HashSet.union(set1, set2)
+*
+* console.log(Array.from(combined).sort()) // ["a", "b", "c"]
+* console.log(HashSet.size(combined)) // 3
+* ```
+*
+* @category combinators
+* @since 2.0.0
+*/
+const union = /*#__PURE__*/ dual(2, union$1);
 //#endregion
 //#region ../../node_modules/.pnpm/effect@4.0.0-beta.74/node_modules/effect/dist/Struct.js
 /**
@@ -33517,7 +33519,7 @@ function makeUnion(ast, members) {
 		members,
 		mapMembers(f, options) {
 			const members = f(this.members);
-			return makeUnion(union(members, this.ast.mode, options?.unsafePreserveChecks ? this.ast.checks : void 0), members);
+			return makeUnion(union$2(members, this.ast.mode, options?.unsafePreserveChecks ? this.ast.checks : void 0), members);
 		}
 	});
 }
@@ -33546,7 +33548,7 @@ function makeUnion(ast, members) {
 * @since 3.10.0
 */
 function Union$1(members, options) {
-	return makeUnion(union(members, options?.mode ?? "anyOf", void 0), members);
+	return makeUnion(union$2(members, options?.mode ?? "anyOf", void 0), members);
 }
 /**
 * Creates a union schema from an array of literal values.
@@ -33566,7 +33568,7 @@ function Union$1(members, options) {
 */
 function Literals(literals) {
 	const members = literals.map(Literal$2);
-	return make$38(union(members, "anyOf", void 0), {
+	return make$38(union$2(members, "anyOf", void 0), {
 		literals,
 		members,
 		mapMembers(f) {
@@ -36730,7 +36732,7 @@ const fromInput = (input) => {
 	return make$34(out);
 };
 const fromInputNested = (input) => {
-	const entries = typeof input[Symbol.iterator] === "function" ? fromIterable$6(input) : Object.entries(input);
+	const entries = typeof input[Symbol.iterator] === "function" ? fromIterable$4(input) : Object.entries(input);
 	const out = [];
 	for (const [key, value] of entries) if (Array.isArray(value)) {
 		for (let i = 0; i < value.length; i++) if (value[i] !== void 0) out.push([key, String(value[i])]);
@@ -38793,7 +38795,7 @@ const make$30 = () => acquireRelease(sync(() => makeUnsafe(/* @__PURE__ */ new S
 	return interruptAll(fibers).pipe(into(set.deferred));
 }));
 const internalFiberId = -1;
-const isInternalInterruption = /*#__PURE__*/ toPredicate(/*#__PURE__*/ compose(filterInterruptors, /*#__PURE__*/ has$5(internalFiberId)));
+const isInternalInterruption = /*#__PURE__*/ toPredicate(/*#__PURE__*/ compose(filterInterruptors, /*#__PURE__*/ has$4(internalFiberId)));
 /**
 * Adds an existing fiber to the `FiberSet` using a synchronous, unsafe
 * mutation.
@@ -50464,7 +50466,7 @@ const getMiddleware = (context) => {
 	else {
 		const middleware = /* @__PURE__ */ new Set();
 		for (let i = maxLength - 1; i >= 0; i--) for (const arr of topLevel) if (i < arr.length) middleware.add(arr[i]);
-		arr = fromIterable$6(middleware).reverse();
+		arr = fromIterable$4(middleware).reverse();
 	}
 	middlewareCache.set(context, arr);
 	return arr;
@@ -54785,27 +54787,25 @@ const GitDiffStatus = Literals([
 	"modified",
 	"renamed"
 ]);
-const GitDiffSegment = Struct({
-	filePath: String$3,
-	fingerprint: String$3,
-	id: String$3,
-	type: Literals(["commit", "worktree"])
-});
 const GitDiff = Struct({
+	changeHash: String$3,
 	fileContent: optional(String$3),
 	filePath: String$3,
-	patch: String$3,
-	segments: ArraySchema(GitDiffSegment),
+	patch: optional(String$3),
 	status: GitDiffStatus
 });
 const GitReviewChangesTarget = TaggedStruct("changes", {});
+const GitReviewLocalTarget = TaggedStruct("local", {});
+const GitReviewBranchTarget = TaggedStruct("branch", {});
+const GitReviewCommitTarget = TaggedStruct("commit", { hash: String$3 });
 const GitReviewTarget = Union$1([
 	GitReviewChangesTarget,
-	TaggedStruct("local", {}),
-	TaggedStruct("branch", {}),
-	TaggedStruct("commit", { hash: String$3 })
+	GitReviewLocalTarget,
+	GitReviewBranchTarget,
+	GitReviewCommitTarget
 ]);
 const GitCommit = Struct({
+	checkpoint: Boolean$2,
 	hash: String$3,
 	shortHash: String$3,
 	subject: String$3
@@ -54815,7 +54815,6 @@ const GitReviewMetadata = Struct({
 	branchCommits: ArraySchema(GitCommit),
 	dirty: Boolean$2,
 	localCommits: ArraySchema(GitCommit),
-	prUrl: optional(String$3),
 	unpushedCommits: Boolean$2,
 	upstream: optional(Struct({
 		ahead: Number$3,
@@ -54823,17 +54822,21 @@ const GitReviewMetadata = Struct({
 	}))
 });
 const GitReviewMark = Struct({
+	changeHash: String$3,
+	filePath: String$3
+});
+const GitReviewCommentDraft = Struct({
+	body: String$3,
 	filePath: String$3,
-	fingerprint: String$3,
-	segmentId: String$3
+	lineNumber: Number$3,
+	side: optional(Literals(["additions", "deletions"]))
 });
 const GitReviewComment = Struct({
 	body: String$3,
 	filePath: String$3,
 	lineNumber: Number$3,
-	resolved: Boolean$2,
 	side: optional(Literals(["additions", "deletions"])),
-	source: optional(Literals(["local", "github"])),
+	source: Literals(["local", "github"]),
 	threadId: optional(String$3),
 	url: optional(String$3)
 });
@@ -54867,48 +54870,20 @@ const GitProject = Struct({
 	repository: GitRepository,
 	worktrees: ArraySchema(GitWorktree)
 });
-function gitReviewStateSaveComment(state, comment) {
+function gitReviewStateSaveComment(state, draft) {
+	const comment = GitReviewComment.make({
+		...draft,
+		source: "local"
+	});
 	return GitReviewState.make({
-		comments: append$1(filter$5(state.comments, (currentComment) => !equals$2({
-			filePath: currentComment.filePath,
-			lineNumber: currentComment.lineNumber,
-			side: currentComment.side ?? "additions",
-			source: currentComment.source ?? "local",
-			threadId: currentComment.threadId ?? ""
-		}, {
-			filePath: comment.filePath,
-			lineNumber: comment.lineNumber,
-			side: comment.side ?? "additions",
-			source: comment.source ?? "local",
-			threadId: comment.threadId ?? ""
-		})), GitReviewComment.make({
-			...comment,
-			resolved: false,
-			source: "local",
-			threadId: void 0,
-			url: void 0
-		})),
+		comments: append$1(filter$4(state.comments, (currentComment) => !sameCommentIdentity(currentComment, comment)), comment),
 		marks: state.marks
 	});
 }
-function gitReviewStateResolveComment(state, input) {
+function gitReviewStateDeleteComments(state, comments) {
+	const deletedThreadIds = pipe(comments, filter$4((comment) => comment.source === "github" && isString(comment.threadId)), map$7((comment) => comment.threadId ?? ""), fromIterable$1);
 	return GitReviewState.make({
-		comments: map$7(state.comments, (comment) => equals$2({
-			filePath: comment.filePath,
-			lineNumber: comment.lineNumber,
-			side: comment.side ?? "additions",
-			source: comment.source ?? "local",
-			threadId: comment.threadId ?? ""
-		}, {
-			filePath: input.filePath,
-			lineNumber: input.lineNumber,
-			side: input.side ?? "additions",
-			source: "local",
-			threadId: ""
-		}) ? GitReviewComment.make({
-			...comment,
-			resolved: true
-		}) : comment),
+		comments: filter$4(state.comments, (comment) => comment.source === "github" && has(deletedThreadIds, comment.threadId ?? "") ? false : every$1(comments, (deletedComment) => !sameCommentIdentity(comment, deletedComment))),
 		marks: state.marks
 	});
 }
@@ -54916,14 +54891,29 @@ function gitReviewStateMark(state, marks) {
 	const reviewed = fromIterable$1(marks);
 	return GitReviewState.make({
 		comments: state.comments,
-		marks: appendAll(filter$5(state.marks, (mark) => !has(reviewed, mark)), marks)
+		marks: appendAll(filter$4(state.marks, (mark) => !has(reviewed, mark)), marks)
 	});
 }
 function gitReviewStateUnmark(state, marks) {
 	const reviewed = fromIterable$1(marks);
 	return GitReviewState.make({
 		comments: state.comments,
-		marks: filter$5(state.marks, (mark) => !has(reviewed, mark))
+		marks: filter$4(state.marks, (mark) => !has(reviewed, mark))
+	});
+}
+function sameCommentIdentity(left, right) {
+	return equals$2({
+		filePath: left.filePath,
+		lineNumber: left.lineNumber,
+		side: left.side ?? "additions",
+		source: left.source,
+		threadId: left.threadId ?? ""
+	}, {
+		filePath: right.filePath,
+		lineNumber: right.lineNumber,
+		side: right.side ?? "additions",
+		source: right.source,
+		threadId: right.threadId ?? ""
 	});
 }
 //#endregion
@@ -55065,6 +55055,9 @@ var RpcContracts = class extends make$5(make$6("agents.create", {
 	error: GitError,
 	payload: CwdPayload,
 	success: GitBranchesSnapshot
+}), make$6("projects.maintenance", {
+	error: GitError,
+	payload: CwdPayload
 }), make$6("review.metadata", {
 	error: GitError,
 	payload: CwdPayload,
@@ -55098,25 +55091,30 @@ var RpcContracts = class extends make$5(make$6("agents.create", {
 }), make$6("review.comments.save", {
 	error: GitError,
 	payload: Struct({
-		comment: GitReviewComment,
+		comment: GitReviewCommentDraft,
 		cwd: String$3
 	})
 }), make$6("review.comments.resolve", {
 	error: GitError,
 	payload: Struct({
-		cwd: String$3,
-		filePath: String$3,
-		lineNumber: Number$3,
-		side: optional(Literals(["additions", "deletions"])),
-		threadId: optional(String$3)
+		comments: ArraySchema(GitReviewComment),
+		cwd: String$3
 	})
-}), make$6("publish.approve", {
+}), make$6("publish.checkpoint", {
+	error: GitError,
+	payload: CwdPayload
+}), make$6("publish.publish", {
 	error: GitError,
 	payload: Struct({
 		cwd: String$3,
 		message: String$3
 	}),
 	success: optional(GitPullRequest)
+}), make$6("publish.pullRequest", {
+	error: GitError,
+	payload: CwdPayload,
+	stream: true,
+	success: optional(GitPullRequest)
 }), make$6("publish.message.generate", {
 	error: PublishDraftError,
 	payload: CwdPayload,
@@ -55132,9 +55130,6 @@ var RpcContracts = class extends make$5(make$6("agents.create", {
 }), make$6("projects.deleteWorktree", {
 	error: GitError,
 	payload: CwdPayload
-}), make$6("projects.fix", {
-	error: GitError,
-	payload: CwdPayload
 }), make$6("runs.portless", {
 	error: TerminalError,
 	payload: CwdPayload,
@@ -55286,7 +55281,7 @@ const ClaudeTokenLine = fromJsonString(Struct({
 const claudeJsonlFiles = fnUntraced(function* (root) {
 	const fs = yield* FileSystem;
 	if (!(yield* fs.exists(root))) return [];
-	return pipe(yield* fs.readDirectory(root, { recursive: true }), filter$5((entry) => endsWith(".jsonl")(entry)), map$7((entry) => join(root, entry)));
+	return pipe(yield* fs.readDirectory(root, { recursive: true }), filter$4((entry) => endsWith(".jsonl")(entry)), map$7((entry) => join(root, entry)));
 });
 function claudeUsageTokens(input) {
 	return {
@@ -55381,7 +55376,7 @@ const makeLayerClaudeUsage = fnUntraced(function* (_config) {
 });
 function claudeSubscriptionLabel(value) {
 	if (!isString(value)) return;
-	return pipe(value, trim, split$1(/[\s_-]+/u), filter$5((token) => isNonEmpty$1(token) && toLowerCase(token) !== "default" && toLowerCase(token) !== "claude"), map$7((token) => /^\d+x$/u.test(toLowerCase(token)) ? toLowerCase(token) : capitalize(token)), (tokens) => isReadonlyArrayEmpty(tokens) ? void 0 : join$4(tokens, " "));
+	return pipe(value, trim, split$1(/[\s_-]+/u), filter$4((token) => isNonEmpty$1(token) && toLowerCase(token) !== "default" && toLowerCase(token) !== "claude"), map$7((token) => /^\d+x$/u.test(toLowerCase(token)) ? toLowerCase(token) : capitalize(token)), (tokens) => isReadonlyArrayEmpty(tokens) ? void 0 : join$4(tokens, " "));
 }
 function claudeWindow(input) {
 	return {
@@ -55435,7 +55430,7 @@ const CodexTokenLine = fromJsonString(Struct({
 const codexJsonlFiles = fnUntraced(function* (root) {
 	const fs = yield* FileSystem;
 	if (!(yield* fs.exists(root))) return [];
-	return pipe(yield* fs.readDirectory(root, { recursive: true }), filter$5((entry) => endsWith(".jsonl")(entry)), map$7((entry) => join(root, entry)));
+	return pipe(yield* fs.readDirectory(root, { recursive: true }), filter$4((entry) => endsWith(".jsonl")(entry)), map$7((entry) => join(root, entry)));
 });
 function codexUsageTokens(input) {
 	return {
@@ -55537,7 +55532,7 @@ const makeLayerCodexUsage = fnUntraced(function* (_config) {
 });
 function codexSubscriptionLabel(planType) {
 	if (!isString(planType)) return;
-	return pipe(planType, trim, split$1(/[\s_-]+/u), filter$5((token) => isNonEmpty$1(token) && toLowerCase(token) !== "default"), map$7((token) => /^\d+x$/u.test(toLowerCase(token)) ? toLowerCase(token) : capitalize(token)), (tokens) => isReadonlyArrayEmpty(tokens) ? void 0 : join$4(tokens, " "));
+	return pipe(planType, trim, split$1(/[\s_-]+/u), filter$4((token) => isNonEmpty$1(token) && toLowerCase(token) !== "default"), map$7((token) => /^\d+x$/u.test(toLowerCase(token)) ? toLowerCase(token) : capitalize(token)), (tokens) => isReadonlyArrayEmpty(tokens) ? void 0 : join$4(tokens, " "));
 }
 function codexWindow(input) {
 	return {
@@ -254125,7 +254120,7 @@ const piMessagesFromPromptHistory = fnUntraced(function* (messages, input, curre
 		})), when({ role: "assistant" }, (assistantMessage) => gen(function* () {
 			const content = yield* piAssistantContentFromPromptParts(assistantMessage.content);
 			if (isUndefined(content)) return yield* new AiError({ message: "Pi agent does not support assistant file or approval prompt parts" });
-			const toolResults = yield* piToolResultsFromPromptParts(filter$5(assistantMessage.content, (part) => part.type === "tool-result"));
+			const toolResults = yield* piToolResultsFromPromptParts(filter$4(assistantMessage.content, (part) => part.type === "tool-result"));
 			return [{
 				api: "openai-codex-responses",
 				content,
@@ -254326,8 +254321,8 @@ const makeLayerPi = fnUntraced(function* (config) {
 					message: "agent prompt failed"
 				}),
 				try: () => {
-					const text = pipe(current.prompt.prompt, filter$5((part) => part.type === "text"), map$7((part) => part.text), join$4("\n\n"));
-					const images = filter$5(current.prompt.prompt, (part) => part.type === "image");
+					const text = pipe(current.prompt.prompt, filter$4((part) => part.type === "text"), map$7((part) => part.text), join$4("\n\n"));
+					const images = filter$4(current.prompt.prompt, (part) => part.type === "image");
 					return current.session.prompt(text, { images });
 				}
 			}), catch_$2((error) => pipe(set$1(finished, true), andThen(setStatus("error")), andThen(offer(queue, makePart("error", { error: error.message }))), andThen(end$1(queue)))));
@@ -254396,7 +254391,7 @@ var GitCommand = class extends Service()("@deslop/git/service/GitCommand", { mak
 	});
 	return {
 		lines: fn("GitCommand.lines")(function* (cwd, args) {
-			return pipe(yield* string(cwd, args), split$1(/\r?\n/u), filter$5(isNonEmpty$1));
+			return pipe(yield* string(cwd, args), split$1(/\r?\n/u), filter$4(isNonEmpty$1));
 		}),
 		string,
 		stringWithInput
@@ -254439,19 +254434,13 @@ const reviewExclusionPathspecs = [
 	":(exclude)plans/*.md",
 	":(exclude)**/plans/*.md"
 ];
-function isReviewExcludedPath(filePath) {
-	const parts = split$1("/")(filePath);
-	const basename = parts.at(-1) ?? filePath;
-	if (filePath === "pnpm-lock.yaml") return true;
-	if (endsWith(".gen.ts")(basename)) return true;
-	for (const index of range$1(0, parts.length - 2)) {
-		const current = parts[index];
-		const next = parts[index + 1];
-		if (current === "components" && (next === "ui" || next === "svgs")) return true;
-		if (current === "plans" && index === parts.length - 2 && endsWith(".md")(basename)) return true;
-	}
-	return false;
-}
+const reviewDiffFlags = [
+	"--ignore-all-space",
+	"--ignore-blank-lines",
+	"--ignore-cr-at-eol"
+];
+const checkpointCommit = { trailer: "Deslop-Checkpoint: true" };
+const emptyGitPullRequests = [];
 const GitHubPullRequestViewResponse = Struct({ url: optional(String$3) });
 const GitHubRepositoryResponse = Struct({
 	name: String$3,
@@ -254469,9 +254458,6 @@ const GitHubReviewThreadsResponse = Struct({ data: optional(Struct({ repository:
 	id: String$3,
 	isResolved: Boolean$2
 })) })) })) })) })) });
-const emptyGitPullRequests = [];
-const emptyGitReviewCommentLists = [];
-const emptyStrings = [];
 function normalizePublicPath(value) {
 	return startsWith$1("/private/var/")(value) ? replace(/^\/private/u, "")(value) : value;
 }
@@ -254507,79 +254493,135 @@ function sameProjectSnapshot(left, right) {
 	});
 }
 function repositoryProbeOnlyPermissionErrors(stderr) {
-	const lines = pipe(stderr, split$1(/\r?\n/u), filter$5(isNonEmpty$1));
+	const lines = pipe(stderr, split$1(/\r?\n/u), filter$4(isNonEmpty$1));
 	return !isReadonlyArrayEmpty(lines) && every$1(lines, (line) => repositoryProbePermissionError.test(line));
 }
-function segmentsByFile(segments) {
-	return reduce(segments, empty$8(), (groups, segment) => set$3(groups, segment.filePath, pipe(get$2(groups, segment.filePath), getOrElse$1(() => empty$14()), append$1(segment))));
+function parseWorktreeFields(fields, current, records) {
+	const field = fields[0];
+	if (isUndefined(field)) return isNonEmpty$1(current.root) && current.hasHead ? append$1(records, current) : records;
+	const rest = drop(fields, 1);
+	if (startsWith$1("worktree ")(field)) return parseWorktreeFields(rest, {
+		branch: "",
+		hasHead: false,
+		root: replace(/^worktree\s+/u, "")(field)
+	}, isNonEmpty$1(current.root) && current.hasHead ? append$1(records, current) : records);
+	if (startsWith$1("HEAD ")(field)) return parseWorktreeFields(rest, {
+		...current,
+		hasHead: true
+	}, records);
+	if (startsWith$1("branch refs/heads/")(field)) return parseWorktreeFields(rest, {
+		...current,
+		branch: replace(/^branch\s+refs\/heads\//u, "")(field)
+	}, records);
+	return parseWorktreeFields(rest, current, records);
+}
+function parseWorktreeRecords(output) {
+	return parseWorktreeFields(split$1("\0")(output), {
+		branch: "",
+		hasHead: false,
+		root: ""
+	}, []);
 }
-function diffFromPatchChunk(chunk, segments) {
+function isReviewExcludedPath(filePath) {
+	const parts = split$1("/")(filePath);
+	const basename = parts.at(-1) ?? filePath;
+	if (filePath === "pnpm-lock.yaml") return true;
+	if (endsWith(".gen.ts")(basename)) return true;
+	for (const index of range$1(0, parts.length - 2)) {
+		const current = parts[index];
+		const next = parts[index + 1];
+		if (current === "components" && (next === "ui" || next === "svgs")) return true;
+		if (current === "plans" && index === parts.length - 2 && endsWith(".md")(basename)) return true;
+	}
+	return false;
+}
+function changeHash(value) {
+	return createHash("sha256").update(value).digest("hex");
+}
+function patchPathspec() {
+	return [
+		"--",
+		".",
+		...reviewExclusionPathspecs
+	];
+}
+function diffFromPatchChunk(chunk) {
 	const deleted = /^deleted file mode /mu.test(chunk);
 	const filePath = (deleted ? chunk.match(/^--- a\/(.+)$/mu)?.[1] : void 0) ?? chunk.match(/^\+\+\+ b\/(.+)$/mu)?.[1] ?? chunk.match(/^--- a\/(.+)$/mu)?.[1] ?? chunk.match(/^diff --git a\/.+ b\/(.+)$/mu)?.[1] ?? "";
 	const status = value$1(chunk).pipe(when((value) => /^new file mode /mu.test(value), () => "added"), when(() => deleted, () => "deleted"), when((value) => /^rename (from|to) /mu.test(value), () => "renamed"), orElse(() => "modified"));
 	return GitDiff.make({
+		changeHash: changeHash(chunk),
 		filePath,
 		patch: chunk,
-		segments: getOrElse$1(get$2(segments, filePath), () => empty$14()),
 		status
 	});
 }
-function withDisplayedPatchSegments(diffs, id, type) {
-	return map$7(diffs, (diff) => GitDiff.make({
-		fileContent: diff.fileContent,
-		filePath: diff.filePath,
-		patch: diff.patch,
-		segments: [GitDiffSegment.make({
-			filePath: diff.filePath,
-			fingerprint: diff.patch,
-			id,
-			type
-		})],
-		status: diff.status
-	}));
+function diffsFromPatch(patch) {
+	return pipe(patch.split(/(?=^diff --git )/mu), filter$4((chunk) => /^diff --git /u.test(chunk)), map$7(diffFromPatchChunk), filter$4((diff) => !isReviewExcludedPath(diff.filePath)));
+}
+function untrackedDiffFromContent(filePath, content) {
+	const patch = `diff --git a/${filePath} b/${filePath}\nnew file mode 100644\n--- /dev/null\n+++ b/${filePath}\n@@ -0,0 +1,${length$1(split$1("\n")(content))} @@\n${pipe(split$1("\n")(content), map$7((line) => `+${line}`), join$4("\n"))}`;
+	return GitDiff.make({
+		changeHash: changeHash(patch),
+		filePath,
+		patch,
+		status: "added"
+	});
+}
+function sameDiffs(left, right) {
+	return length$1(left) === length$1(right) && every$1(left, (leftDiff, index) => isNotUndefined(right[index]) && leftDiff.filePath === right[index].filePath && leftDiff.status === right[index].status && leftDiff.changeHash === right[index].changeHash && leftDiff.fileContent === right[index].fileContent);
+}
+function targetKey(target) {
+	return target._tag === "commit" ? `commit:${target.hash}` : target._tag;
+}
+function targetFromKey(key) {
+	if (startsWith$1("commit:")(key)) return GitReviewCommitTarget.make({ hash: replace(/^commit:/u, "")(key) });
+	return value$1(key).pipe(when("local", () => GitReviewLocalTarget.make({})), when("branch", () => GitReviewBranchTarget.make({})), orElse(() => GitReviewChangesTarget.make({})));
 }
-function commitFromLogLine(line) {
-	const parts = split$1("\0")(line);
+function commitFromRecord(record) {
+	const parts = pipe(split$1("\0")(record), map$7(trim));
 	return GitCommit.make({
+		checkpoint: includes(checkpointCommit.trailer)(parts[3] ?? ""),
 		hash: parts[0],
 		shortHash: parts[1] ?? "",
 		subject: parts[2] ?? ""
 	});
 }
-function parseWorktreeRecords(output) {
-	const parsed = reduce(split$1("\0")(output), {
-		current: {
-			branch: "",
-			hasHead: false,
-			root: ""
-		},
-		records: empty$14()
-	}, (state, field) => {
-		if (startsWith$1("worktree ")(field)) return {
-			current: {
-				branch: "",
-				hasHead: false,
-				root: replace(/^worktree\s+/u, "")(field)
-			},
-			records: isNonEmpty$1(state.current.root) && state.current.hasHead ? append$1(state.records, state.current) : state.records
-		};
-		if (startsWith$1("HEAD ")(field)) return {
-			...state,
-			current: {
-				...state.current,
-				hasHead: true
-			}
-		};
-		if (startsWith$1("branch refs/heads/")(field)) return {
-			...state,
-			current: {
-				...state.current,
-				branch: replace(/^branch\s+refs\/heads\//u, "")(field)
-			}
-		};
-		return state;
-	});
-	return isNonEmpty$1(parsed.current.root) && parsed.current.hasHead ? append$1(parsed.records, parsed.current) : parsed.records;
+function commitsFromRecords(output) {
+	return pipe(output, split$1(""), map$7(trim), filter$4(isNonEmpty$1), map$7(commitFromRecord), filter$4((commit) => isNonEmpty$1(commit.hash)));
+}
+function publishTitleAndBody(message) {
+	const lines = split$1(/\r?\n/)(trim(message));
+	return {
+		body: pipe(drop(lines, 1), join$4("\n"), trim),
+		title: trim(lines[0])
+	};
+}
+function gitHubString(spawner, cwd) {
+	function* runGh(args) {
+		yield* annotateCurrentSpan({
+			command: args[0] ?? "gh",
+			cwd
+		});
+		return yield* scoped$1(gen(function* () {
+			const handle = yield* pipe(spawner.spawn(make$18("gh", 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 || `gh ${join$4(" ")(args)} exited with ${exitCode}`) });
+			return output.stdout;
+		})).pipe(withSpan("gh.command", { attributes: {
+			command: args[0] ?? "gh",
+			cwd
+		} }));
+	}
+	return fn("gh.string")(runGh);
 }
 var GitWorkspace = class extends Service()("@deslop/git/service/GitWorkspace", { make: gen(function* () {
 	const git = yield* GitCommand;
@@ -254591,7 +254633,7 @@ var GitWorkspace = class extends Service()("@deslop/git/service/GitWorkspace", {
 	const worktreeClean = fn("GitWorkspace.worktreeClean")(function* (cwd) {
 		return yield* pipe(git.lines(cwd, ["status", "--porcelain"]), map$4(isReadonlyArrayEmpty));
 	});
-	const fixProject = fn("GitWorkspace.fixProject")(function* (cwd) {
+	const maintenanceProject = fn("GitWorkspace.maintenanceProject")(function* (cwd) {
 		yield* annotateCurrentSpan({ cwd });
 		const root = yield* sync(() => NFS.realpathSync.native(cwd));
 		yield* pipe(git.string(cwd, ["worktree", "prune"]), asVoid);
@@ -254619,7 +254661,7 @@ var GitWorkspace = class extends Service()("@deslop/git/service/GitWorkspace", {
 			"for-each-ref",
 			"refs/heads",
 			"--format=%(refname:short)%00%(upstream:short)%00%(upstream:track)%00%(worktreepath)"
-		]), fn("GitWorkspace.fixBranch")(function* (branchLine) {
+		]), fn("GitWorkspace.maintenanceBranch")(function* (branchLine) {
 			const fields = split$1("\0")(branchLine);
 			const branch = fields[0];
 			const upstream = fields[1] ?? "";
@@ -254721,17 +254763,17 @@ var GitWorkspace = class extends Service()("@deslop/git/service/GitWorkspace", {
 	});
 	const repositorySearchRoots = fn("GitWorkspace.repositorySearchRoots")(function* (root) {
 		if (root !== home) return [root];
-		return yield* pipe(yield* pipe(fs.readDirectory(root), orElseSucceed(() => empty$14())), filter$5((entry) => !has(excludedHomeDiscoveryEntries, entry)), filter$5((entry) => !has(excludedDiscoveryEntries, entry)), filter$5((entry) => !startsWith$1(".")(entry)), forEach$1((entry) => gen(function* () {
+		return yield* pipe(yield* pipe(fs.readDirectory(root), orElseSucceed(() => empty$14())), filter$4((entry) => !has(excludedHomeDiscoveryEntries, entry)), filter$4((entry) => !has(excludedDiscoveryEntries, entry)), filter$4((entry) => !startsWith$1(".")(entry)), forEach$1((entry) => gen(function* () {
 			const directory = path.join(root, entry);
 			return (yield* pipe(fs.stat(directory), orElseSucceed(() => {})))?.type === "Directory" ? directory : "";
-		})), map$4(filter$5(isNonEmpty$1)));
+		})), map$4(filter$4(isNonEmpty$1)));
 	});
 	const repositoryRootsFromProbe = fn("GitWorkspace.repositoryRootsFromProbe")(function* (root) {
 		const directRoot = yield* directRepositoryRoot(root);
 		if (isSome(directRoot)) return [directRoot.value];
 		const searchRoots = yield* repositorySearchRoots(root);
 		if (isReadonlyArrayEmpty(searchRoots)) return getSomes([directRoot]);
-		return pipe(yield* repositoryProbeOutput(searchRoots), split$1(/\r?\n/u), filter$5(isNonEmpty$1), map$7((head) => normalizePublicPath(path.dirname(path.dirname(head)))), dedupe, sortWith(identity, String$7));
+		return pipe(yield* repositoryProbeOutput(searchRoots), split$1(/\r?\n/u), filter$4(isNonEmpty$1), map$7((head) => normalizePublicPath(path.dirname(path.dirname(head)))), dedupe, sortWith(identity, String$7));
 	});
 	const repositoryFromRoot = fn("GitWorkspace.repositoryFromRoot")(function* (root) {
 		return yield* pipe(all({
@@ -254800,11 +254842,11 @@ var GitWorkspace = class extends Service()("@deslop/git/service/GitWorkspace", {
 					"for-each-ref",
 					"--format=%(refname:short)",
 					"refs/remotes"
-				]), map$4((lines) => pipe(lines, filter$5((name) => !endsWith("/HEAD")(name)), map$7((name) => GitBranch.make({
+				]), map$4((lines) => pipe(lines, filter$4((name) => !endsWith("/HEAD")(name)), map$7((name) => GitBranch.make({
 					name: pipe(split$1("/")(name), drop(1), join$4("/")),
 					remote: split$1("/")(name)[0],
 					type: "remote"
-				})), filter$5((branch) => isNonEmpty$1(branch.name)), appendAll(localBranches)))))),
+				})), filter$4((branch) => isNonEmpty$1(branch.name)), appendAll(localBranches)))))),
 				defaultBranch: yield* getDefaultBranch(cwd)
 			});
 		}),
@@ -254888,273 +254930,188 @@ var GitWorkspace = class extends Service()("@deslop/git/service/GitWorkspace", {
 			}));
 			yield* refreshProjects;
 		}),
-		fix: fn("GitWorkspace.fix")(function* (cwd) {
-			yield* fixProject(cwd);
-			yield* refreshProjects;
-		}),
 		listProjectsFrom,
 		listRepositoriesFrom,
 		listWorktrees,
+		maintenance: fn("GitWorkspace.maintenance")(function* (cwd) {
+			yield* maintenanceProject(cwd);
+			yield* refreshProjects;
+		}),
 		projects,
 		refreshProjects
 	};
 }) }) {
 	static layer = pipe(effect(this, this.make), provide$2(GitCommand.layer));
 };
-var GitReview = class extends Service()("@deslop/git/service/GitReview", { make: fn("GitReview.make")(function* (config) {
-	const spawner = yield* ChildProcessSpawner;
+var GitChanges = class extends Service()("@deslop/git/service/GitChanges", { make: fn("GitChanges.make")(function* (config) {
 	const git = yield* GitCommand;
 	const fs = yield* FileSystem;
 	const path = yield* Path$1;
-	const state = yield* make$10(GitReviewState.make({
-		comments: [],
-		marks: []
-	}));
-	const githubCommentsRef = yield* make$35(head(emptyGitReviewCommentLists));
+	const refs = yield* make$35(empty$14());
+	const fileContentCache = yield* make$35(empty$8());
 	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$5((chunk) => /^diff --git /u.test(chunk)), map$7((chunk) => diffFromPatchChunk(chunk, groupedSegments)));
-	}
-	const gitDiffs = fn("GitReview.gitDiffs")(function* (input) {
-		yield* annotateCurrentSpan({
-			cwd: config.cwd,
-			segmentCount: length$1(input.segments)
-		});
-		const diffs = pipe(diffsFromPatch(yield* git.string(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, ""))), catchTag("GitError", () => pipe(git.string(config.cwd, [
+		"rev-parse",
+		"--verify",
+		"main"
+	]), as$1("main"), catchTag("GitError", () => succeed$3("master")))));
+	const branchBase = fn("GitChanges.branchBase")(function* (defaultBranch) {
+		return yield* pipe([`origin/${defaultBranch}`, defaultBranch], findFirst((candidate) => pipe(git.string(config.cwd, [
+			"rev-parse",
+			"--verify",
+			candidate
+		]), as$1(true), orElseSucceed(() => false))), map$4(getOrElse$1(() => "HEAD")));
+	});
+	const localBase = gen(function* () {
+		const upstream = yield* pipe(git.string(config.cwd, [
+			"rev-parse",
+			"--abbrev-ref",
+			"--symbolic-full-name",
+			"@{u}"
+		]), map$4(trim), option$1);
+		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 = gen(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 gitDiffs = fn("GitChanges.gitDiffs")(function* (args) {
+		return diffsFromPatch(yield* git.string(config.cwd, [
 			"diff",
-			...input.args,
-			"--ignore-all-space",
-			"--ignore-blank-lines",
-			"--ignore-cr-at-eol",
+			...args,
+			...reviewDiffFlags,
 			"--patch",
 			"--find-renames",
 			"--no-ext-diff",
-			"--",
-			".",
-			...reviewExclusionPathspecs
-		]), input.segments), filter$5((diff) => !isReviewExcludedPath(diff.filePath)));
-		yield* annotateCurrentSpan({ diffCount: length$1(diffs) });
-		return diffs;
+			...patchPathspec()
+		]));
 	});
-	const commitDiffs = fn("GitReview.commitDiffs")(function* (hash) {
-		yield* annotateCurrentSpan({ cwd: config.cwd });
+	const commitDiffs = fn("GitChanges.commitDiffs")(function* (hash) {
 		const args = [
 			"--root",
 			"--patch",
-			"--ignore-all-space",
-			"--ignore-blank-lines",
-			"--ignore-cr-at-eol",
+			...reviewDiffFlags,
 			"--find-renames",
 			"--no-ext-diff"
 		];
-		const pathspec = [
-			"--",
-			".",
-			...reviewExclusionPathspecs
-		];
-		const diffs = pipe(diffsFromPatch(yield* pipe(git.string(config.cwd, [
+		const pathspec = patchPathspec();
+		const parents = yield* pipe(git.string(config.cwd, [
+			"rev-list",
+			"--parents",
+			"-n",
+			"1",
+			hash
+		]), map$4(flow(trim, split$1(/\s+/u))));
+		return diffsFromPatch(yield* pipe(length$1(parents) === 3 ? git.string(config.cwd, [
+			"show",
+			"--remerge-diff",
+			"--format=",
+			...drop(args, 1),
+			hash,
+			...pathspec
+		]) : git.string(config.cwd, [
 			"diff-tree",
 			...args,
 			hash,
 			...pathspec
 		]), flatMap$2((output) => {
 			if (/^diff --git /mu.test(output)) return succeed$3(output);
-			return pipe(git.string(config.cwd, [
-				"rev-list",
-				"--parents",
-				"-n",
-				"1",
-				hash
-			]), map$4(flow(trim, split$1(/\s+/u))), flatMap$2((parents) => {
-				const parent = parents[1];
-				if (isUndefined(parent)) return succeed$3(output);
-				return git.string(config.cwd, [
-					"diff-tree",
-					...args,
-					parent,
-					hash,
-					...pathspec
-				]);
-			}));
-		})), empty$14()), filter$5((diff) => !isReviewExcludedPath(diff.filePath)));
-		yield* annotateCurrentSpan({ diffCount: length$1(diffs) });
-		return diffs;
-	});
-	const untrackedDiffs = pipe(git.lines(config.cwd, [
-		"ls-files",
-		"--others",
-		"--exclude-standard"
-	]), map$4(filter$5((filePath) => !isReviewExcludedPath(filePath))), 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$1(split$1("\n")(content))} @@\n${pipe(split$1("\n")(content), map$7((line) => `+${line}`), join$4("\n"))}`;
-		return GitDiff.make({
-			filePath,
-			patch,
-			segments: [GitDiffSegment.make({
-				filePath,
-				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$14();
-		return yield* pipe(all([gitDiffs({
-			args: ["HEAD"],
-			segments: empty$14()
-		}), untrackedDiffs], { concurrency: "unbounded" }), map$4(([trackedDiffs, untracked]) => appendAll(map$7(trackedDiffs, (diff) => {
-			const segment = GitDiffSegment.make({
-				filePath: diff.filePath,
-				fingerprint: diff.patch,
-				id: "HEAD->worktree",
-				type: "worktree"
-			});
-			return GitDiff.make({
-				filePath: diff.filePath,
-				patch: diff.patch,
-				segments: [segment],
-				status: diff.status
-			});
-		}), 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(() => ""));
+			if (length$1(parents) === 3) return succeed$3(output);
+			const parent = parents[1];
+			if (isUndefined(parent)) return succeed$3(output);
+			return git.string(config.cwd, [
+				"diff-tree",
+				...args,
+				parent,
+				hash,
+				...pathspec
+			]);
+		})));
 	});
-	const withFileContent = fn("GitReview.withFileContent")(function* (input) {
-		const contentByFilePath = fromIterable$3(yield* forEach$1(input.diffs, (diff) => pipe(fileContent({
-			filePath: diff.filePath,
-			target: input.target
-		}), map$4((content) => [diff.filePath, content])), { concurrency: 1 }));
-		return map$7(input.diffs, (diff) => has$2(contentByFilePath, diff.filePath) ? GitDiff.make({
-			fileContent: getOrUndefined$2(get$2(contentByFilePath, diff.filePath)),
-			filePath: diff.filePath,
-			patch: diff.patch,
-			segments: diff.segments,
-			status: diff.status
-		}) : diff);
+	const untrackedDiffs = gen(function* () {
+		return yield* forEach$1(yield* pipe(git.lines(config.cwd, [
+			"ls-files",
+			"--others",
+			"--exclude-standard"
+		]), map$4(filter$4((filePath) => !isReviewExcludedPath(filePath)))), (filePath) => pipe(fs.readFileString(path.join(config.cwd, filePath)), orElseSucceed(() => ""), map$4((content) => untrackedDiffFromContent(filePath, content))), { concurrency: 8 });
 	});
-	const reviewDiffs = fn("GitReview.reviewDiffs")(function* (target) {
-		yield* annotateCurrentSpan({
-			cwd: config.cwd,
-			target: target._tag
-		});
-		const changesDiffs = gen(function* () {
-			return yield* withFileContent({
-				diffs: yield* worktreeDiffs,
-				target
-			});
-		});
-		const aggregateTargetDiffs = gen(function* () {
-			const base = target._tag === "local" ? yield* localBase : yield* branchDiffBase;
-			const diffsWithSegments = withDisplayedPatchSegments(yield* aggregateDiffs(base), `${base}->worktree`, "worktree");
-			yield* annotateCurrentSpan({ diffCount: length$1(diffsWithSegments) });
-			return yield* withFileContent({
-				diffs: diffsWithSegments,
-				target
-			});
-		});
-		return yield* value$1(target).pipe(when({ _tag: "changes" }, () => changesDiffs), when({ _tag: "commit" }, (commitTarget) => gen(function* () {
-			const id = `${commitTarget.hash}^->${commitTarget.hash}`;
-			const diffsWithSegments = withDisplayedPatchSegments(yield* commitDiffs(commitTarget.hash), id, "commit");
-			yield* annotateCurrentSpan({ diffCount: length$1(diffsWithSegments) });
-			return yield* withFileContent({
-				diffs: diffsWithSegments,
-				target
-			});
-		})), orElse(() => aggregateTargetDiffs));
+	const fileContent = fn("GitChanges.fileContent")(function* (input) {
+		if (input.diff.status === "deleted") return;
+		if (input.target._tag === "commit") return yield* pipe(git.string(config.cwd, ["show", `${input.target.hash}:${input.diff.filePath}`]), orElseSucceed(() => ""));
+		return yield* pipe(fs.readFileString(path.join(config.cwd, input.diff.filePath)), orElseSucceed(() => ""));
 	});
-	const ghString = fn("gh.string")(function* (args) {
-		yield* annotateCurrentSpan({
-			command: args[0] ?? "gh",
-			cwd: config.cwd
-		});
-		return yield* scoped$1(gen(function* () {
-			const handle = yield* pipe(spawner.spawn(make$18("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$4(" ")(args)} exited with ${exitCode}`) });
-			return output.stdout;
-		})).pipe(withSpan("gh.command", { attributes: {
-			command: args[0] ?? "gh",
-			cwd: config.cwd
-		} }));
+	const withFileContent = fn("GitChanges.withFileContent")(function* (input) {
+		return yield* forEach$1(input.diffs, (diff) => {
+			if (input.target._tag !== "commit") return pipe(fileContent({
+				diff,
+				target: input.target
+			}), map$4((content) => GitDiff.make({
+				...diff,
+				fileContent: content
+			})));
+			const key = `${targetKey(input.target)}\u0000${diff.filePath}\u0000${diff.changeHash}`;
+			return pipe(get$1(fileContentCache), flatMap$2((cache) => pipe(get$2(cache, key), match$6({
+				onNone: () => pipe(fileContent({
+					diff,
+					target: input.target
+				}), map$4((content) => GitDiff.make({
+					...diff,
+					fileContent: content
+				})), tap((readyDiff) => update$1(fileContentCache, (current) => set$3(current, key, readyDiff)))),
+				onSome: succeed$3
+			}))));
+		}, { concurrency: 8 });
 	});
-	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$1("main"), catchTag("GitError", () => succeed$3("master")))));
-	const branchBase = fn("GitReview.branchBase")(function* (defaultBranch) {
-		yield* annotateCurrentSpan({
-			cwd: config.cwd,
-			defaultBranch
+	const computeDiffs = fn("GitChanges.computeDiffs")(function* (target) {
+		const trackedDiffs = yield* value$1(target).pipe(when({ _tag: "changes" }, () => gitDiffs(["HEAD"])), when({ _tag: "commit" }, (commit) => commitDiffs(commit.hash)), when({ _tag: "local" }, () => pipe(localBase, flatMap$2((base) => gitDiffs([base])))), orElse(() => pipe(branchDiffBase, flatMap$2((base) => gitDiffs([base])))));
+		return yield* withFileContent({
+			diffs: target._tag === "changes" && !(yield* hasWorktreeChanges) ? empty$14() : appendAll(trackedDiffs, target._tag === "commit" ? empty$14() : yield* untrackedDiffs),
+			target
 		});
-		return yield* pipe([`origin/${defaultBranch}`, defaultBranch], findFirst((candidate) => pipe(git.string(config.cwd, [
-			"rev-parse",
-			"--verify",
-			candidate
-		]), as$1(true), orElseSucceed(() => false))), map$4(getOrElse$1(() => "HEAD")));
 	});
-	const branchPrUrl = pipe(ghString([
-		"pr",
-		"view",
-		"--json",
-		"url",
-		"--jq",
-		".url"
-	]), map$4(trim), map$4((url) => head(isNonEmpty$1(url) ? [url] : [])), catchTag("GitError", () => succeed$3(head(emptyStrings))));
-	const commits = fn("GitReview.commits")(function* (base) {
-		yield* annotateCurrentSpan({ cwd: config.cwd });
-		const from = yield* pipe(git.string(config.cwd, [
-			"merge-base",
-			base,
-			"HEAD"
-		]), map$4(trim), catchTag("GitError", () => succeed$3(base)));
-		return yield* pipe(git.lines(config.cwd, [
+	const commitRecords = fn("GitChanges.commitRecords")(function* (range) {
+		return commitsFromRecords(yield* git.string(config.cwd, [
 			"log",
 			"--max-count=80",
-			"--format=%H%x00%h%x00%s",
-			`${from}..HEAD`
-		]), map$4(map$7(commitFromLogLine)));
+			"--format=%H%x00%h%x00%s%x00%B%x1e",
+			range
+		]));
 	});
-	const commitsBetween = fn("GitReview.commitsBetween")(function* (from, to) {
-		yield* annotateCurrentSpan({ cwd: config.cwd });
-		return yield* pipe(git.lines(config.cwd, [
+	const firstParentCommits = gen(function* () {
+		return commitsFromRecords(yield* git.string(config.cwd, [
 			"log",
+			"--first-parent",
 			"--max-count=80",
-			"--format=%H%x00%h%x00%s",
-			`${from}..${to}`
-		]), map$4(map$7(commitFromLogLine)));
+			"--format=%H%x00%h%x00%s%x00%B%x1e",
+			"HEAD"
+		]));
 	});
-	const firstParentCommits = pipe(git.lines(config.cwd, [
-		"log",
-		"--first-parent",
-		"--max-count=80",
-		"--format=%H%x00%h%x00%s",
-		"HEAD"
-	]), map$4(map$7(commitFromLogLine)));
-	const hasPushableCommits = pipe(gen(function* () {
-		yield* annotateCurrentSpan({ cwd: config.cwd });
+	const commitsBetween = fn("GitChanges.commitsBetween")(function* (from, to) {
+		return yield* commitRecords(`${from}..${to}`);
+	});
+	const commits = fn("GitChanges.commits")(function* (base) {
+		return yield* commitsBetween(yield* pipe(git.string(config.cwd, [
+			"merge-base",
+			base,
+			"HEAD"
+		]), map$4(trim), catchTag("GitError", () => succeed$3(base))), "HEAD");
+	});
+	const pushableCommitCount = gen(function* () {
 		const upstream = yield* pipe(git.string(config.cwd, [
 			"rev-parse",
 			"--abbrev-ref",
@@ -255177,16 +255134,15 @@ var GitReview = class extends Service()("@deslop/git/service/GitReview", { make:
 			"--count",
 			`${from}..HEAD`
 		]), map$4(flow(trim, parse$5, getOrElse$1(() => 0))));
-	}), map$4((count) => count > 0));
+	});
 	const upstreamCounts = gen(function* () {
-		const noUpstream = void 0;
 		const upstream = yield* pipe(git.string(config.cwd, [
 			"rev-parse",
 			"--abbrev-ref",
 			"--symbolic-full-name",
 			"@{u}"
 		]), map$4(trim), option$1);
-		if (isNone(upstream)) return noUpstream;
+		if (isNone(upstream)) return [];
 		return yield* pipe(git.string(config.cwd, [
 			"rev-list",
 			"--left-right",
@@ -255194,43 +255150,72 @@ var GitReview = class extends Service()("@deslop/git/service/GitReview", { make:
 			`${upstream.value}...HEAD`
 		]), map$4((output) => {
 			const counts = pipe(output, trim, split$1(/\s+/u));
-			return {
+			return [{
 				ahead: getOrElse$1(parse$5(counts[1] ?? "0"), () => 0),
 				behind: getOrElse$1(parse$5(counts[0]), () => 0)
-			};
-		}), catchTag("GitError", () => succeed$3(noUpstream)));
-	});
-	const localBase = gen(function* () {
-		const upstream = yield* pipe(git.string(config.cwd, [
-			"rev-parse",
-			"--abbrev-ref",
-			"--symbolic-full-name",
-			"@{u}"
-		]), map$4(trim), option$1);
-		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)));
+			}];
+		}), catchTag("GitError", () => succeed$3([])));
 	});
-	const branchDiffBase = gen(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 metadataSnapshot = gen(function* () {
+		const branch = yield* currentBranch;
+		const defaultBranch = yield* defaultBranchName;
+		const branchBaseRef = yield* branchDiffBase;
+		const localCommits = yield* commitsBetween(yield* localBase, "HEAD");
+		const branchCommitCandidates = branch === defaultBranch ? yield* firstParentCommits : yield* commits(branchBaseRef);
+		const localCommitHashes = pipe(localCommits, map$7((commit) => commit.hash), fromIterable$1);
+		const branchCommits = filter$4(branchCommitCandidates, (commit) => !has(localCommitHashes, commit.hash));
+		return GitReviewMetadata.make({
+			branchCommits,
+			dirty: yield* hasWorktreeChanges,
+			localCommits,
+			unpushedCommits: (yield* pushableCommitCount) > 0,
+			upstream: pipe(yield* upstreamCounts, head, getOrUndefined$2)
+		});
 	});
-	const aggregateDiffs = fn("GitReview.aggregateDiffs")(function* (base) {
-		return appendAll(yield* gitDiffs({
-			args: [base],
-			segments: empty$14()
-		}), yield* untrackedDiffs);
+	const metadata = yield* make$10(yield* metadataSnapshot);
+	const worktreeChanges = yield* pipe(fs.watch(config.cwd), catch_(() => empty$10), debounce(millis(80)), map$2(() => void 0), share({
+		capacity: 1,
+		idleTimeToLive: seconds(30),
+		replay: 0,
+		strategy: "sliding"
+	}));
+	yield* forkScoped(pipe(worktreeChanges, mapEffect(() => pipe(metadataSnapshot, flatMap$2((next) => set(metadata, next)), ignore$4)), runDrain));
+	const ensureDiffRef = fn("GitChanges.ensureDiffRef")(function* (target) {
+		const key = targetKey(target);
+		const existing = findFirst$2(yield* get$1(refs), (entry) => entry.key === key);
+		if (isSome(existing)) return existing.value.ref;
+		const ref = yield* make$10(yield* computeDiffs(target));
+		yield* update$1(refs, (currentRefs) => append$1(currentRefs, {
+			key,
+			ref
+		}));
+		return ref;
 	});
-	const prReviewComments = gen(function* () {
-		yield* annotateCurrentSpan({ cwd: config.cwd });
+	yield* forkScoped(pipe(worktreeChanges, mapEffect(() => pipe(get$1(refs), flatMap$2((currentRefs) => forEach$1(currentRefs, (entry) => {
+		const target = targetFromKey(entry.key);
+		if (target._tag === "commit") return void_$1;
+		return pipe(computeDiffs(target), flatMap$2((next) => update(entry.ref, (currentDiffs) => sameDiffs(currentDiffs, next) ? currentDiffs : next)), ignore$4);
+	}, {
+		concurrency: 2,
+		discard: true
+	})))), runDrain));
+	yield* forkScoped(pipe(ensureDiffRef(GitReviewChangesTarget.make({})), ignore$4));
+	return {
+		diffs: ensureDiffRef,
+		metadata
+	};
+}) }) {
+	static layer = flow(this.make, (layer) => pipe(effect(this, layer), provide$2(GitCommand.layer)));
+};
+var GitReview = class extends Service()("@deslop/git/service/GitReview", { make: fn("GitReview.make")(function* (config) {
+	const spawner = yield* ChildProcessSpawner;
+	const state = yield* make$10(GitReviewState.make({
+		comments: [],
+		marks: []
+	}));
+	const suppressedThreadIds = yield* make$35(empty$6());
+	const ghString = gitHubString(spawner, config.cwd);
+	yield* forkScoped(pipe(gen(function* () {
 		const pr = yield* pipe(ghString([
 			"pr",
 			"view",
@@ -255251,160 +255236,61 @@ var GitReview = class extends Service()("@deslop/git/service/GitReview", { make:
 			cause,
 			message: "Failed to parse GitHub repository."
 		})));
-		const response = yield* ghString([
+		const response = yield* pipe(ghString([
 			"api",
 			"graphql",
 			"-f",
-			`query=
-				query(\$owner: String!, \$name: String!, \$number: Int!) {
-					repository(owner: \$owner, name: \$name) {
-						pullRequest(number: \$number) {
-							reviewThreads(first: 100) {
-								nodes {
-									id
-									isResolved
-									diffSide
-									comments(first: 20) {
-										nodes {
-											body
-											line
-											originalLine
-											path
-											url
-										}
-									}
-								}
-							}
-						}
-					}
-				}`,
+			`query=query(\$owner: String!, \$name: String!, \$number: Int!) { repository(owner: \$owner, name: \$name) { pullRequest(number: \$number) { reviewThreads(first: 100) { nodes { id isResolved diffSide comments(first: 20) { nodes { body line originalLine path url } } } } } } }`,
 			"-f",
 			`owner=${repository.owner.login}`,
 			"-f",
 			`name=${repository.name}`,
 			"-F",
 			`number=${pr}`
-		]);
-		const threads = (yield* pipe(decodeUnknownEffect(fromJsonString(GitHubReviewThreadsResponse))(response), mapError$2((cause) => new GitError({
+		]), flatMap$2(decodeUnknownEffect(fromJsonString(GitHubReviewThreadsResponse))), mapError$2((cause) => new GitError({
 			cause,
 			message: "Failed to parse GitHub review threads."
-		})))).data?.repository?.pullRequest?.reviewThreads?.nodes ?? [];
-		yield* annotateCurrentSpan({ threadCount: length$1(threads) });
-		return pipe(threads, flatMap$5((thread) => map$7(thread.comments.nodes, (comment) => GitReviewComment.make({
+		})));
+		const suppressed = yield* get$1(suppressedThreadIds);
+		return pipe(response.data?.repository?.pullRequest?.reviewThreads?.nodes ?? [], filter$4((thread) => thread.isResolved === false && !has(suppressed, thread.id)), flatMap$5((thread) => map$7(thread.comments.nodes, (comment) => GitReviewComment.make({
 			body: comment.body,
 			filePath: comment.path,
 			lineNumber: comment.line ?? comment.originalLine ?? 1,
-			resolved: thread.isResolved,
 			side: thread.diffSide === "LEFT" ? "deletions" : "additions",
 			source: "github",
 			threadId: thread.id,
 			url: comment.url
-		}))));
-	}).pipe(withSpan("GitReview.reviewComments", { attributes: { cwd: config.cwd } }));
-	const githubComments = fnUntraced(function* () {
-		const cached = yield* get$1(githubCommentsRef);
-		if (isSome(cached)) return cached.value;
-		const comments = yield* pipe(prReviewComments, catchTag("GitError", () => succeed$3(empty$14())));
-		yield* set$1(githubCommentsRef, head([comments]));
-		return comments;
-	});
-	const reviewState = gen(function* () {
-		const current = yield* get(state);
-		const github = yield* githubComments();
-		return GitReviewState.make({
-			comments: pipe(appendAll(current.comments, github), filter$5((comment) => !isReviewExcludedPath(comment.filePath))),
-			marks: filter$5(current.marks, (mark) => !isReviewExcludedPath(mark.filePath))
-		});
-	});
-	const worktreeChanges = yield* pipe(fs.watch(config.cwd), catch_(() => empty$10), debounce(millis(50)), mapEffect(() => pipe(git.lines(config.cwd, ["status", "--porcelain"]), map$4((lines) => some(lines, (line) => {
-		const filePath = trim(slice(3)(line));
-		return isNonEmpty$1(filePath) && !isReviewExcludedPath(filePath);
-	})), orElseSucceed(() => true))), filter$3(identity), map$2(() => void 0), share({
-		capacity: 16,
-		idleTimeToLive: seconds(30),
-		replay: 0,
-		strategy: "sliding"
-	}));
-	const metadata = gen(function* () {
-		yield* annotateCurrentSpan({ cwd: config.cwd });
-		const branch = yield* currentBranch;
-		const defaultBranch = yield* defaultBranchName;
-		const branchBaseRef = yield* branchDiffBase;
-		const localCommits = yield* commitsBetween(yield* localBase, "HEAD");
-		const branchCommitCandidates = branch === defaultBranch ? yield* firstParentCommits : yield* commits(branchBaseRef);
-		const localCommitHashes = pipe(localCommits, map$7((commit) => commit.hash), fromIterable$1);
-		const branchCommits = filter$5(branchCommitCandidates, (commit) => !has(localCommitHashes, commit.hash));
-		return GitReviewMetadata.make({
-			branchCommits,
-			dirty: yield* hasWorktreeChanges,
-			localCommits,
-			prUrl: getOrUndefined$2(yield* branchPrUrl),
-			unpushedCommits: yield* hasPushableCommits,
-			upstream: yield* upstreamCounts
-		});
-	});
+		}))), filter$4((comment) => !isReviewExcludedPath(comment.filePath)));
+	}), catchTag("GitError", () => succeed$3(empty$14())), flatMap$2((comments) => update(state, (current) => GitReviewState.make({
+		comments: appendAll(filter$4(current.comments, (comment) => comment.source !== "github"), comments),
+		marks: current.marks
+	})))));
 	return {
-		commits,
-		mark: fn("GitReview.mark")(function* (marks) {
-			yield* annotateCurrentSpan({
-				cwd: config.cwd,
-				markCount: length$1(marks)
-			});
-			yield* update(state, (current) => gitReviewStateMark(current, marks));
-		}),
-		metadata,
-		resolveComment: fn("GitReview.resolveComment")(function* (input) {
-			yield* annotateCurrentSpan({
-				cwd: config.cwd,
-				filePath: input.filePath
-			});
-			yield* update(state, (current) => gitReviewStateResolveComment(current, input));
-		}),
-		resolveReviewThread: fn("GitReview.resolveReviewThread")(function* (threadId) {
-			yield* annotateCurrentSpan({
-				cwd: config.cwd,
-				threadId
-			});
-			yield* pipe(ghString([
+		mark: (marks) => update(state, (current) => gitReviewStateMark(current, marks)),
+		resolveComments: fn("GitReview.resolveComments")(function* (comments) {
+			const threadIds = pipe(comments, filter$4((comment) => comment.source === "github" && isString(comment.threadId)), map$7((comment) => comment.threadId ?? ""), filter$4(isNonEmpty$1), dedupe);
+			if (isReadonlyArrayEmpty(threadIds)) {
+				yield* update(state, (current) => gitReviewStateDeleteComments(current, comments));
+				return;
+			}
+			const query = `mutation($threadId: ID!) { resolveReviewThread(input: {threadId: $threadId}) { thread { id } } }`;
+			if (!isReadonlyArrayEmpty(yield* pipe(threadIds, forEach$1((threadId) => pipe(ghString([
 				"api",
 				"graphql",
 				"-f",
-				`query=
-					mutation(\$threadId: ID!) {
-						resolveReviewThread(input: {threadId: \$threadId}) {
-							thread {
-								id
-							}
-						}
-					}`,
+				`query=${query}`,
 				"-f",
 				`threadId=${threadId}`
-			]), asVoid);
-			yield* set$1(githubCommentsRef, head(emptyGitReviewCommentLists));
+			]), as$1(empty$14()), catchTag("GitError", (error) => succeed$3([error]))), { concurrency: 4 }), map$4(flatten$3)))) return yield* new GitError({ message: "One or more GitHub threads failed to resolve." });
+			yield* update$1(suppressedThreadIds, (current) => union(current, fromIterable$1(threadIds)));
+			yield* update(state, (current) => gitReviewStateDeleteComments(current, comments));
 		}),
-		reviewDiffs,
-		reviewState,
 		saveComment: fn("GitReview.saveComment")(function* (comment) {
-			yield* annotateCurrentSpan({
-				cwd: config.cwd,
-				filePath: comment.filePath
-			});
+			if (isReviewExcludedPath(comment.filePath)) return;
 			yield* update(state, (current) => gitReviewStateSaveComment(current, comment));
 		}),
-		unmark: fn("GitReview.unmark")(function* (marks) {
-			yield* annotateCurrentSpan({
-				cwd: config.cwd,
-				markCount: length$1(marks)
-			});
-			yield* update(state, (current) => gitReviewStateUnmark(current, marks));
-		}),
-		watchReviewDiffs: (target) => {
-			const diffs = pipe(reviewDiffs(target), catchTag("GitError", () => succeed$3(empty$14())));
-			if (target._tag === "commit") return fromEffect(diffs);
-			return fromEffect(diffs).pipe(concat(pipe(worktreeChanges, mapEffect(() => diffs))), changesWith((left, right) => length$1(left) === length$1(right) && every$1(left, (leftDiff, index) => isNotUndefined(right[index]) && leftDiff.filePath === right[index].filePath && leftDiff.status === right[index].status && leftDiff.patch === right[index].patch)));
-		},
-		watchReviewMetadata: () => pipe(fromEffect(metadata), concat(pipe(worktreeChanges, mapEffect(() => metadata))), changes$1),
-		watchReviewState: () => pipe(changes(state), mapEffect(() => reviewState), changes$1)
+		state,
+		unmark: (marks) => update(state, (current) => gitReviewStateUnmark(current, marks))
 	};
 }) }) {
 	static layer = flow(this.make, (layer) => pipe(effect(this, layer), provide$2(GitCommand.layer)));
@@ -255412,29 +255298,7 @@ var GitReview = class extends Service()("@deslop/git/service/GitReview", { make:
 var GitPublish = class extends Service()("@deslop/git/service/GitPublish", { make: fn("GitPublish.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$1(gen(function* () {
-			const handle = yield* pipe(spawner.spawn(make$18("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$4(" ")(args)} exited with ${exitCode}`) });
-			return output.stdout;
-		})).pipe(withSpan("gh.command", { attributes: {
-			command: args[0] ?? "gh",
-			cwd: config.cwd
-		} }));
-	});
+	const ghString = gitHubString(spawner, 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, [
@@ -255447,10 +255311,6 @@ var GitPublish = class extends Service()("@deslop/git/service/GitPublish", { mak
 		"main"
 	]), as$1("main"), catchTag("GitError", () => succeed$3("master")))));
 	const branchBase = fn("GitPublish.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",
@@ -255466,8 +255326,8 @@ var GitPublish = class extends Service()("@deslop/git/service/GitPublish", { mak
 		cause,
 		message: "Failed to parse current pull request."
 	})))), flatMap$2((pr) => isNonEmpty$1(pr.url ?? "") ? succeed$3(head([GitPullRequest.make({ url: pr.url ?? "" })])) : succeed$3(head(emptyGitPullRequests))), catchTag("GitError", () => succeed$3(head(emptyGitPullRequests))));
+	const pullRequest = yield* make$10(yield* currentPullRequest);
 	const hasPushableCommits = pipe(gen(function* () {
-		yield* annotateCurrentSpan({ cwd: config.cwd });
 		const upstream = yield* pipe(git.string(config.cwd, [
 			"rev-parse",
 			"--abbrev-ref",
@@ -255491,60 +255351,119 @@ var GitPublish = class extends Service()("@deslop/git/service/GitPublish", { mak
 			`${from}..HEAD`
 		]), map$4(flow(trim, parse$5, 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 head(isNonEmpty$1(url) ? [GitPullRequest.make({ url })] : []);
-	}));
-	const commit = fn("GitPublish.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("GitPublish.stageAll"));
+	const headCheckpointCommits = gen(function* () {
+		return takeWhile(commitsFromRecords(yield* pipe(git.string(config.cwd, [
+			"log",
+			"--format=%H%x00%h%x00%s%x00%B%x1e",
+			"HEAD"
+		]), catchTag("GitError", () => succeed$3("")))), (commit) => commit.checkpoint);
+	});
+	const headCommitMessage = pipe(git.string(config.cwd, [
+		"log",
+		"-1",
+		"--format=%B",
+		"HEAD"
+	]), map$4(trim), catchTag("GitError", () => succeed$3("")));
+	const commitAll = fn("GitPublish.commitAll")(function* (message) {
+		yield* pipe(git.string(config.cwd, ["add", "-A"]), asVoid);
 		yield* pipe(git.stringWithInput(config.cwd, [
 			"commit",
 			"-F",
 			"-"
-		], message), asVoid, withSpan("GitPublish.createCommit"));
+		], message), asVoid);
 	});
 	const push = gen(function* () {
-		yield* annotateCurrentSpan({ cwd: config.cwd });
-		if (!(yield* hasPushableCommits)) return yield* new GitError({ message: "No unpushed commits." });
+		if (!(yield* hasPushableCommits)) return;
 		const branch = yield* currentBranch;
-		yield* annotateCurrentSpan({ branch });
 		yield* pipe(git.string(config.cwd, [
 			"push",
 			"-u",
 			"origin",
 			`HEAD:${branch}`
-		]), asVoid, withSpan("GitPublish.push", { attributes: {
-			branch,
-			cwd: config.cwd
-		} }));
+		]), asVoid);
 		if (yield* hasPushableCommits) return yield* new GitError({ message: "Push completed but the branch still has unpushed commits." });
 	});
-	const upsertDraftPullRequest = gen(function* () {
-		const branch = yield* currentBranch;
-		if (branch === (yield* defaultBranchName)) return head(emptyGitPullRequests);
+	const upsertDraftPullRequest = fn("GitPublish.upsertDraftPullRequest")(function* (message) {
+		if ((yield* currentBranch) === (yield* defaultBranchName)) return head(emptyGitPullRequests);
+		const titleBody = publishTitleAndBody(message);
+		if (isEmpty$1(titleBody.title)) return yield* new GitError({ message: "Publish message title required." });
 		const existing = yield* currentPullRequest;
-		if (isSome(existing)) return existing;
-		return yield* pipe(createDraftPr, withSpan("GitPublish.createDraftPr", { attributes: {
-			branch,
-			cwd: config.cwd
-		} }));
+		if (isSome(existing)) {
+			yield* pipe(ghString([
+				"pr",
+				"edit",
+				"--title",
+				titleBody.title,
+				"--body",
+				titleBody.body
+			]), asVoid);
+			return existing;
+		}
+		const output = yield* ghString([
+			"pr",
+			"create",
+			"--draft",
+			"--title",
+			titleBody.title,
+			"--body",
+			titleBody.body
+		]);
+		const url = output.match(/https?:\/\/\S+/u)?.[0] ?? trim(output);
+		return head(isNonEmpty$1(url) ? [GitPullRequest.make({ url })] : []);
 	});
-	return { approve: fn("GitPublish.approve")(function* (input) {
-		if (yield* hasWorktreeChanges) yield* commit(input.message);
-		if (!(yield* hasPushableCommits)) return yield* new GitError({ message: "No changes or unpushed commits to publish." });
-		yield* push;
-		return getOrUndefined$2(yield* upsertDraftPullRequest);
-	}) };
+	return {
+		checkpoint: gen(function* () {
+			if (!(yield* hasWorktreeChanges)) return yield* new GitError({ message: "No changes to checkpoint." });
+			yield* pipe(git.string(config.cwd, ["add", "-A"]), asVoid);
+			yield* pipe(git.stringWithInput(config.cwd, [
+				"commit",
+				"-F",
+				"-"
+			], `checkpoint\n\n${checkpointCommit.trailer}\n`), asVoid);
+		}),
+		publish: fn("GitPublish.publish")(function* (input) {
+			const checkpoints = yield* headCheckpointCommits;
+			const dirty = yield* hasWorktreeChanges;
+			const inputMessage = trim(input.message);
+			if (isEmpty$1(inputMessage) && (dirty || !isReadonlyArrayEmpty(checkpoints))) return yield* new GitError({ message: "Publish message required." });
+			const message = isNonEmpty$1(inputMessage) ? inputMessage : yield* headCommitMessage;
+			const committed = yield* gen(function* () {
+				if (isReadonlyArrayEmpty(checkpoints)) {
+					if (!dirty) return false;
+					yield* commitAll(message);
+					return true;
+				}
+				const oldest = pipe(checkpoints, last, getOrUndefined$2);
+				if (isUndefined(oldest)) return yield* new GitError({ message: "Checkpoint state is invalid." });
+				const backupRef = `refs/deslop/backups/${Date.now()}-${randomUUID()}`;
+				yield* pipe(git.string(config.cwd, [
+					"update-ref",
+					backupRef,
+					"HEAD"
+				]), asVoid);
+				yield* pipe(git.string(config.cwd, [
+					"reset",
+					"--soft",
+					`${oldest.hash}^`
+				]), asVoid);
+				yield* pipe(commitAll(message), catchTag("GitError", (error) => pipe(git.string(config.cwd, [
+					"reset",
+					"--hard",
+					backupRef
+				]), ignore$4, andThen(fail$3(error)))));
+				return true;
+			});
+			const pushed = yield* pipe(hasPushableCommits, flatMap$2((shouldPush) => shouldPush ? pipe(push, as$1(true)) : succeed$3(false)));
+			const pr = yield* pipe(upsertDraftPullRequest(message), catchTag("GitError", (error) => new GitError({
+				cause: error,
+				message: `${committed ? "Changes were committed. " : ""}${pushed ? "Changes were pushed. " : ""}PR update failed: ${error.message}`
+			})));
+			if (!committed && !pushed && isNone(pr)) return yield* new GitError({ message: "No changes, unpushed commits, or pull request to publish." });
+			yield* set(pullRequest, pr);
+			return getOrUndefined$2(pr);
+		}),
+		pullRequest
+	};
 }) }) {
 	static layer = flow(this.make, (layer) => pipe(effect(this, layer), provide$2(GitCommand.layer)));
 };
@@ -255703,7 +255622,7 @@ function commandAt(words, index) {
 	};
 }
 function frameworkCommand(source) {
-	const words = pipe(split$1(/\s+/u)(source), filter$5(isNonEmpty$1));
+	const words = pipe(split$1(/\s+/u)(source), filter$4(isNonEmpty$1));
 	if (isReadonlyArrayEmpty(words)) return;
 	const first = words[0];
 	if (isUndefined(first)) return;
@@ -255776,7 +255695,7 @@ const discover = fnUntraced(function* (cwd, input) {
 		"package.json",
 		"**/package.json"
 	], { cwd }));
-	const packageManifests = yield* pipe(pipe(split$1("\n")(output), filter$5((packagePath) => packagePath === "package.json" || endsWith("/package.json")(packagePath))), forEach$1((packagePath) => pipe(fs.readFileString(path.join(cwd, packagePath)), flatMap$2((source) => try_({
+	const packageManifests = yield* pipe(pipe(split$1("\n")(output), filter$4((packagePath) => packagePath === "package.json" || endsWith("/package.json")(packagePath))), forEach$1((packagePath) => pipe(fs.readFileString(path.join(cwd, packagePath)), flatMap$2((source) => try_({
 		catch: identity,
 		try: () => packageJson(source)
 	})), match$1({
@@ -255940,7 +255859,7 @@ const proxyWebSocket = fnUntraced(function* (request, origin) {
 	const hops = Number.parseInt(request.headers["x-portless-hops"] ?? "", 10);
 	if ((Number.isFinite(hops) ? hops : 0) >= 5) return loopDetectedResponse(Number.isFinite(hops) ? hops : 0);
 	const [pathname = "/", search = ""] = split$1(request.url, "?");
-	const protocols = pipe(fromUndefinedOr(request.headers["sec-websocket-protocol"]), map$9((header) => pipe(header, split$1(","), map$7(trim), filter$5(isNonEmpty$1))));
+	const protocols = pipe(fromUndefinedOr(request.headers["sec-websocket-protocol"]), map$9((header) => pipe(header, split$1(","), map$7(trim), filter$4(isNonEmpty$1))));
 	const inbound = yield* request.upgrade;
 	const upstreamUrl = new URL(origin);
 	upstreamUrl.protocol = upstreamUrl.protocol === "https:" ? "wss:" : "ws:";
@@ -256063,7 +255982,7 @@ var Portless = class Portless extends Service()("@deslop/portless/service/Portle
 			const existing = get$2(state.ports, key);
 			if (isSome(existing)) return existing.value;
 			for (const candidatePort of range$1(4e3, 4999)) {
-				if (has(browserBlockedPorts, candidatePort) || contains(fromIterable$6(values(state.ports)), candidatePort)) continue;
+				if (has(browserBlockedPorts, candidatePort) || contains(fromIterable$4(values(state.ports)), candidatePort)) continue;
 				if (yield* portAvailable(candidatePort)) {
 					state.ports = set$3(state.ports, key, candidatePort);
 					return candidatePort;
@@ -256173,7 +256092,7 @@ function removePackageScripts(current, cwd) {
 	return filter$1(current, (script) => script.cwd !== cwd);
 }
 function makeAgentSession(input) {
-	const labelCount = pipe(fromIterable$6(values(input.sessions)), filter$5((agentSession) => agentSession.cwd === input.cwd && agentSession.profileId === input.profile.id), length$1);
+	const labelCount = pipe(fromIterable$4(values(input.sessions)), filter$4((agentSession) => agentSession.cwd === input.cwd && agentSession.profileId === input.profile.id), length$1);
 	return {
 		args: [...input.preparedCommand.args],
 		command: input.preparedCommand.command,
@@ -256211,8 +256130,14 @@ const TerminalSessions = make$46({
 		return get$10(yield* buildWithScope(Terminal.layer(config), yield* scope), Terminal);
 	})
 });
+const GitChangesSessions = make$46({
+	idleTimeToLive: seconds(30),
+	lookup: fnUntraced(function* (cwd) {
+		return get$10(yield* buildWithScope(GitChanges.layer({ cwd }), yield* scope), GitChanges);
+	})
+});
 const GitReviewSessions = make$46({
-	idleTimeToLive: minutes(10),
+	idleTimeToLive: infinity,
 	lookup: fnUntraced(function* (cwd) {
 		return get$10(yield* buildWithScope(GitReview.layer({ cwd }), yield* scope), GitReview);
 	})
@@ -256275,6 +256200,7 @@ ${patches}`;
 const RpcHandlers = RpcContracts.toLayer(gen(function* () {
 	const git = yield* GitWorkspace;
 	const terminals = yield* TerminalSessions;
+	const gitChanges = yield* GitChangesSessions;
 	const gitReviews = yield* GitReviewSessions;
 	const gitPublishes = yield* GitPublishSessions;
 	const publishAgents = yield* PublishAgentSessions;
@@ -256392,7 +256318,7 @@ const RpcHandlers = RpcContracts.toLayer(gen(function* () {
 		}), andThen(update$1(portlessScripts, (current) => removePortlessScript(current, script.script).current)), andThen(pipe(invalidate(portlessWorktrees, script.script.cwd), ignore$4)), andThen(pipe(invalidate(scriptWorktrees, script.script.cwd), ignore$4)), andThen(invalidateTerminal(input)), andThen(update$1(portlessStatusWatchers, (current) => remove$2(current, watcherKey)))) : void_$1))), forkDetach);
 	});
 	const currentAgentSessions = fnUntraced(function* (cwd) {
-		return pipe(fromIterable$6(values(yield* get(agents))), filter$5((session) => session.cwd === cwd));
+		return pipe(fromIterable$4(values(yield* get(agents))), filter$4((session) => session.cwd === cwd));
 	});
 	const sidebarSnapshot = fnUntraced(function* () {
 		const statuses = yield* get(runStatuses);
@@ -256503,18 +256429,28 @@ const RpcHandlers = RpcContracts.toLayer(gen(function* () {
 		"projects.branches": (payload) => git.branches(payload.cwd),
 		"projects.createWorktree": (payload) => git.createWorktree(payload),
 		"projects.deleteWorktree": (payload) => pipe(portless.clear(payload.cwd), andThen(invalidate(portlessWorktrees, payload.cwd)), andThen(invalidate(scriptWorktrees, payload.cwd)), andThen(update$1(packageScripts, (current) => removePackageScripts(current, payload.cwd))), andThen(git.deleteWorktree(payload))),
-		"projects.fix": (payload) => git.fix(payload.cwd),
-		"publish.approve": (payload) => pipe(get$6(gitPublishes, payload.cwd), flatMap$2((publish) => publish.approve({ message: payload.message }))),
+		"projects.maintenance": (payload) => git.maintenance(payload.cwd),
+		"publish.checkpoint": (payload) => pipe(get$6(gitPublishes, payload.cwd), flatMap$2((publish) => publish.checkpoint), andThen(invalidate(gitChanges, payload.cwd))),
 		"publish.message.generate": fn("WorkbenchRpc.publish.message.generate")(function* (payload) {
 			return yield* scoped$1(gen(function* () {
-				const review = yield* get$6(gitReviews, payload.cwd);
-				const diffs = yield* review.reviewDiffs(GitReviewChangesTarget.make({}));
-				if (isReadonlyArrayEmpty(diffs)) return yield* new GitError({ message: "No current changes to summarize." });
-				const metadata = yield* review.metadata;
+				const changes = yield* get$6(gitChanges, payload.cwd);
+				const changesDiffs = yield* get(yield* changes.diffs(GitReviewChangesTarget.make({})));
+				const metadata = yield* get(changes.metadata);
+				const checkpointCommits = takeWhile(metadata.localCommits, (commit) => commit.checkpoint);
+				const promptDiffs = map$7(yield* gen(function* () {
+					if (!isReadonlyArrayEmpty(changesDiffs)) return changesDiffs;
+					if (isReadonlyArrayEmpty(checkpointCommits)) return changesDiffs;
+					return yield* get(yield* changes.diffs(GitReviewLocalTarget.make({})));
+				}), (diff) => ({
+					filePath: diff.filePath,
+					patch: diff.patch ?? "",
+					status: diff.status
+				}));
+				if (isReadonlyArrayEmpty(promptDiffs)) return yield* new GitError({ message: "No current changes to summarize." });
 				const recentSubjects = pipe(appendAll(metadata.localCommits, metadata.branchCommits), take$3(10), map$7((commit) => commit.subject));
 				const text = yield* pipe((yield* get$6(publishAgents, payload.cwd)).prompt({
 					messages: [makeMessage("user", { content: [makePart$1("text", { text: draftCommitPrompt({
-						diffs,
+						diffs: promptDiffs,
 						recentSubjects
 					}) })] })],
 					model: "gpt-5.5",
@@ -256525,15 +256461,13 @@ const RpcHandlers = RpcContracts.toLayer(gen(function* () {
 				return text;
 			}));
 		}),
-		"review.comments.resolve": (payload) => pipe(get$6(gitReviews, payload.cwd), flatMap$2((review) => isUndefined(payload.threadId) ? review.resolveComment({
-			filePath: payload.filePath,
-			lineNumber: payload.lineNumber,
-			side: payload.side
-		}) : review.resolveReviewThread(payload.threadId))),
+		"publish.publish": (payload) => pipe(get$6(gitPublishes, payload.cwd), flatMap$2((publish) => publish.publish({ message: payload.message })), tap(() => invalidate(gitChanges, payload.cwd))),
+		"publish.pullRequest": (payload) => unwrap$1(pipe(get$6(gitPublishes, payload.cwd), map$4((publish) => pipe(changes(publish.pullRequest), map$2(getOrUndefined$2))))),
+		"review.comments.resolve": (payload) => pipe(get$6(gitReviews, payload.cwd), flatMap$2((review) => review.resolveComments(payload.comments))),
 		"review.comments.save": (payload) => pipe(get$6(gitReviews, payload.cwd), flatMap$2((review) => review.saveComment(payload.comment))),
-		"review.diffs": (payload) => unwrap$1(pipe(get$6(gitReviews, payload.cwd), map$4((review) => review.watchReviewDiffs(payload.target)))),
-		"review.metadata": (payload) => unwrap$1(pipe(get$6(gitReviews, payload.cwd), map$4((review) => review.watchReviewMetadata()))),
-		"review.state": (payload) => unwrap$1(pipe(get$6(gitReviews, payload.cwd), map$4((review) => review.watchReviewState()))),
+		"review.diffs": (payload) => unwrap$1(pipe(get$6(gitChanges, payload.cwd), flatMap$2((changes) => changes.diffs(payload.target)), map$4(changes))),
+		"review.metadata": (payload) => unwrap$1(pipe(get$6(gitChanges, payload.cwd), map$4((changes$2) => changes(changes$2.metadata)))),
+		"review.state": (payload) => unwrap$1(pipe(get$6(gitReviews, payload.cwd), map$4((review) => changes(review.state)))),
 		"review.state.mark": (payload) => pipe(get$6(gitReviews, payload.cwd), flatMap$2((review) => review.mark(payload.marks))),
 		"review.state.unmark": (payload) => pipe(get$6(gitReviews, payload.cwd), flatMap$2((review) => review.unmark(payload.marks))),
 		"runs.portless": (payload) => get$6(portlessWorktrees, payload.cwd),
@@ -256571,7 +256505,7 @@ const RpcHandlers = RpcContracts.toLayer(gen(function* () {
 				sessionId: input.sessionId
 			});
 			const session = pipe(yield* get$1(resolvedTerminals), get$2(statusKey), getOrUndefined$2);
-			if (!(isUndefined(session) ? false : some(fromIterable$6(yield* keys$1(terminals)), (current) => equals$2(TerminalSessionIdentity.make(current), TerminalSessionIdentity.make(session)))) || isUndefined(session)) return pipe(make$43(isUndefined(scriptKey) ? {
+			if (!(isUndefined(session) ? false : some(fromIterable$4(yield* keys$1(terminals)), (current) => equals$2(TerminalSessionIdentity.make(current), TerminalSessionIdentity.make(session)))) || isUndefined(session)) return pipe(make$43(isUndefined(scriptKey) ? {
 				state: "idle",
 				title: ""
 			} : pipe(yield* get(runStatuses), get$2(scriptKey), getOrElse$1(() => ({