@deslop/workbench 0.0.305 → 0.0.315

package/dist/server.js

@@ -4562,7 +4562,7 @@ const isSome$1 = (fa) => fa._tag === "Some";
 /** @internal */
 const none$1 = /*#__PURE__*/ Object.create(NoneProto);
 /** @internal */
-const some$1 = (value) => {
+const some$2 = (value) => {
 	const a = Object.create(SomeProto);
 	a.value = value;
 	return a;
@@ -5061,7 +5061,7 @@ const none = () => none$1;
 * @category constructors
 * @since 2.0.0
 */
-const some = some$1;
+const some$1 = some$2;
 /**
 * Checks whether an `Option` is `None` (absent).
 *
@@ -5256,7 +5256,7 @@ const orElse$1 = /*#__PURE__*/ dual(2, (self, that) => isNone(self) ? that() : s
 * @category converting
 * @since 4.0.0
 */
-const fromNullishOr = (a) => a == null ? none() : some(a);
+const fromNullishOr = (a) => a == null ? none() : some$1(a);
 /**
 * Converts a possibly `undefined` value into an `Option`, leaving `null`
 * as a valid `Some`.
@@ -5291,7 +5291,7 @@ const fromNullishOr = (a) => a == null ? none() : some(a);
 * @category converting
 * @since 4.0.0
 */
-const fromUndefinedOr = (a) => a === void 0 ? none() : some(a);
+const fromUndefinedOr = (a) => a === void 0 ? none() : some$1(a);
 /**
 * Extracts the value from a `Some`, or returns `undefined` for `None`.
 *
@@ -5355,7 +5355,7 @@ const getOrUndefined$1 = /*#__PURE__*/ getOrElse$1(constUndefined);
 * @category mapping
 * @since 2.0.0
 */
-const map$9 = /*#__PURE__*/ dual(2, (self, f) => isNone(self) ? none() : some(f(self.value)));
+const map$9 = /*#__PURE__*/ dual(2, (self, f) => isNone(self) ? none() : some$1(f(self.value)));
 /**
 * Applies a function that returns an `Option` to the value of a `Some`,
 * flattening the result. Returns `None` if the input is `None`.
@@ -5442,7 +5442,7 @@ const flatMap$6 = /*#__PURE__*/ dual(2, (self, f) => isNone(self) ? none() : f(s
 * @category filtering
 * @since 2.0.0
 */
-const filter$3 = /*#__PURE__*/ dual(2, (self, predicate) => isNone(self) ? none() : predicate(self.value) ? some(self.value) : none());
+const filter$3 = /*#__PURE__*/ dual(2, (self, predicate) => isNone(self) ? none() : predicate(self.value) ? some$1(self.value) : none());
 /**
 * Lifts a `Predicate` or `Refinement` into the `Option` context: returns
 * `Some(value)` when the predicate holds, `None` otherwise.
@@ -5478,7 +5478,7 @@ const filter$3 = /*#__PURE__*/ dual(2, (self, predicate) => isNone(self) ? none(
 * @category lifting
 * @since 2.0.0
 */
-const liftPredicate = /*#__PURE__*/ dual(2, (b, predicate) => predicate(b) ? some(b) : none());
+const liftPredicate = /*#__PURE__*/ dual(2, (b, predicate) => predicate(b) ? some$1(b) : none());
 //#endregion
 //#region ../../node_modules/.pnpm/effect@4.0.0-beta.74/node_modules/effect/dist/Result.js
 /**
@@ -6386,7 +6386,7 @@ const headNonEmpty = /*#__PURE__*/ (/* @__PURE__ */ dual(2, (self, index) => {
 * @category getters
 * @since 2.0.0
 */
-const last = (self) => isReadonlyArrayNonEmpty(self) ? some(lastNonEmpty(self)) : none();
+const last = (self) => isReadonlyArrayNonEmpty(self) ? some$1(lastNonEmpty(self)) : none();
 /**
 * Returns the last element of a `NonEmptyReadonlyArray` directly (no `Option`
 * wrapper).
@@ -6433,6 +6433,45 @@ const lastNonEmpty = (self) => self[self.length - 1];
 */
 const tailNonEmpty = (self) => self.slice(1);
 /**
+* Takes elements from the start while the predicate holds, stopping at the
+* first element that fails.
+*
+* **When to use**
+*
+* Use to keep the leading elements of an iterable while each element satisfies
+* a predicate, returning the retained prefix as an array.
+*
+* **Details**
+*
+* - Supports refinements for type narrowing.
+* - The predicate receives `(element, index)`.
+*
+* **Example** (Taking while condition holds)
+*
+* ```ts
+* import { Array } from "effect"
+*
+* console.log(Array.takeWhile([1, 3, 2, 4, 1, 2], (x) => x < 4)) // [1, 3, 2]
+* ```
+*
+* @see {@link take} for keeping a fixed number of leading elements
+* @see {@link dropWhile} for removing the matching prefix and keeping the rest
+* @see {@link span} for splitting the matching prefix from the remaining elements
+*
+* @category getters
+* @since 2.0.0
+*/
+const takeWhile = /*#__PURE__*/ dual(2, (self, predicate) => {
+	let i = 0;
+	const out = [];
+	for (const a of self) {
+		if (!predicate(a, i)) break;
+		out.push(a);
+		i++;
+	}
+	return out;
+});
+/**
 * Removes the first `n` elements, creating a new array.
 *
 * **When to use**
@@ -6929,6 +6968,26 @@ const reduce = /*#__PURE__*/ dual(3, (self, b, f) => fromIterable$2(self).reduce
 */
 const every = /*#__PURE__*/ dual(2, (self, refinement) => self.every(refinement));
 /**
+* Checks whether at least one element satisfies the predicate. Narrows the type
+* to `NonEmptyReadonlyArray` on success.
+*
+* **Example** (Testing for any match)
+*
+* ```ts
+* import { Array } from "effect"
+*
+* console.log(Array.some([1, 3, 4], (x) => x % 2 === 0)) // true
+* console.log(Array.some([1, 3, 5], (x) => x % 2 === 0)) // false
+* ```
+*
+* @see {@link every} — test if all elements match
+* @see {@link contains} — test for a specific value
+*
+* @category elements
+* @since 2.0.0
+*/
+const some = /*#__PURE__*/ dual(2, (self, predicate) => self.some(predicate));
+/**
 * Creates an `Equivalence` for arrays based on an element `Equivalence`. Two
 * arrays are equivalent when they have the same length and all elements are
 * pairwise equivalent.
@@ -7598,8 +7657,8 @@ const serviceNotFoundError = (service) => {
 * @since 2.0.0
 */
 const getOption = /*#__PURE__*/ dual(2, (self, service) => {
-	if (self.mapUnsafe.has(service.key)) return some(self.mapUnsafe.get(service.key));
-	return isReference(service) ? some(getDefaultValue(service)) : none();
+	if (self.mapUnsafe.has(service.key)) return some$1(self.mapUnsafe.get(service.key));
+	return isReference(service) ? some$1(getDefaultValue(service)) : none();
 });
 /**
 * Merges two `Context`s into one.
@@ -9454,7 +9513,7 @@ const yieldNow$1 = /*#__PURE__*/ (/* @__PURE__ */ makePrimitive({
 	}
 }))(0);
 /** @internal */
-const succeedSome$1 = (a) => succeed$6(some(a));
+const succeedSome$1 = (a) => succeed$6(some$1(a));
 /** @internal */
 const succeedNone$1 = /*#__PURE__*/ succeed$6(/*#__PURE__*/ none());
 /** @internal */
@@ -9609,7 +9668,7 @@ const as$1 = /*#__PURE__*/ dual(2, (self, value) => {
 	return flatMap$4(self, (_) => b);
 });
 /** @internal */
-const asSome$1 = (self) => map$6(self, some);
+const asSome$1 = (self) => map$6(self, some$1);
 /** @internal */
 const andThen$1 = /*#__PURE__*/ dual(2, (self, f) => flatMap$4(self, (a) => isEffect$1(f) ? f : internalCall(() => f(a))));
 /** @internal */
@@ -9726,7 +9785,7 @@ const exitAsVoidAll = (exits) => {
 	return failures.length === 0 ? exitVoid : exitFailCause(causeFromReasons(failures));
 };
 /** @internal */
-const exitGetSuccess = (self) => exitIsSuccess(self) ? some(self.value) : none();
+const exitGetSuccess = (self) => exitIsSuccess(self) ? some$1(self.value) : none();
 /** @internal */
 const service$1 = (service) => service;
 /** @internal */
@@ -9853,7 +9912,7 @@ const ignore$2 = /*#__PURE__*/ dual((args) => isEffect$1(args[0]), (self, option
 /** @internal */
 const option$2 = (self) => match$1(self, {
 	onFailure: none,
-	onSuccess: some
+	onSuccess: some$1
 });
 /** @internal */
 const result = (self) => matchEager(self, {
@@ -10160,7 +10219,7 @@ const findFirst$1 = /*#__PURE__*/ dual((args) => isIterable(args[0]) && !isEffec
 	return succeed$6(none());
 }));
 const findFirstLoop = (iterator, index, predicate, value) => flatMap$4(predicate(value, index), (keep) => {
-	if (keep) return succeed$6(some(value));
+	if (keep) return succeed$6(some$1(value));
 	const next = iterator.next();
 	if (!next.done) return findFirstLoop(iterator, index + 1, predicate, next.value);
 	return succeed$6(none());
@@ -10494,12 +10553,12 @@ const NoopSpanProto = {
 const noopSpan = (options) => Object.assign(Object.create(NoopSpanProto), options);
 const filterDisablePropagation = (span) => {
 	if (!span) return none();
-	return get$9(span.annotations, DisablePropagation) ? span._tag === "Span" ? filterDisablePropagation(getOrUndefined$1(span.parent)) : none() : some(span);
+	return get$9(span.annotations, DisablePropagation) ? span._tag === "Span" ? filterDisablePropagation(getOrUndefined$1(span.parent)) : none() : some$1(span);
 };
 /** @internal */
 const makeSpanUnsafe = (fiber, name, options) => {
 	const disablePropagation = !fiber.getRef(TracerEnabled$1) || options?.annotations && get$9(options.annotations, DisablePropagation);
-	const parent = options?.parent !== void 0 ? some(options.parent) : options?.root ? none() : filterDisablePropagation(fiber.currentSpan);
+	const parent = options?.parent !== void 0 ? some$1(options.parent) : options?.root ? none() : filterDisablePropagation(fiber.currentSpan);
 	let span;
 	if (disablePropagation) span = noopSpan({
 		name,
@@ -13767,12 +13826,12 @@ const nextPow2 = (n) => {
 * @since 2.0.0
 */
 const parse$2 = (s) => {
-	if (s === "NaN") return some(NaN);
-	if (s === "Infinity") return some(Infinity);
-	if (s === "-Infinity") return some(-Infinity);
+	if (s === "NaN") return some$1(NaN);
+	if (s === "Infinity") return some$1(Infinity);
+	if (s === "-Infinity") return some$1(-Infinity);
 	if (s.trim() === "") return none();
 	const n = Number$4(s);
-	return Number$4.isNaN(n) ? none() : some(n);
+	return Number$4.isNaN(n) ? none() : some$1(n);
 };
 globalThis.String;
 /**
@@ -13818,6 +13877,23 @@ const replace = (searchValue, replaceValue) => (self) => self.replace(searchValu
 */
 const trim = (self) => self.trim();
 /**
+* Checks whether a `string` is empty.
+*
+* **Example** (Checking for empty strings)
+*
+* ```ts
+* import { String } from "effect"
+* import * as assert from "node:assert"
+*
+* assert.deepStrictEqual(String.isEmpty(""), true)
+* assert.deepStrictEqual(String.isEmpty("a"), false)
+* ```
+*
+* @category predicates
+* @since 2.0.0
+*/
+const isEmpty$1 = (self) => self.length === 0;
+/**
 * Checks whether a `string` is non-empty.
 *
 * **Example** (Checking for non-empty strings)
@@ -14565,7 +14641,7 @@ const repeatOrElse = /*#__PURE__*/ dual(3, (self, schedule, orElse) => flatMap$4
 	let meta = CurrentMetadata.defaultValue();
 	return catch_$3(forever$2(tap$1(flatMap$4(suspend$3(() => provideService$1(self, CurrentMetadata, meta)), step), (meta_) => sync$1(() => {
 		meta = meta_;
-	})), { disableYield: true }), (error) => isDone$2(error) ? succeed$6(error.value) : orElse(error, meta.attempt === 0 ? none() : some(meta)));
+	})), { disableYield: true }), (error) => isDone$2(error) ? succeed$6(error.value) : orElse(error, meta.attempt === 0 ? none() : some$1(meta)));
 }));
 /** @internal */
 const repeat$1 = /*#__PURE__*/ dual(2, (self, options) => {
@@ -19406,14 +19482,14 @@ var OneOf = class extends Base$1 {
 };
 function makeFilterIssue(input, entry) {
 	if (isIssue(entry)) return entry;
-	if (typeof entry === "string") return new InvalidValue(some(input), { message: entry });
-	const inner = typeof entry.issue === "string" ? new InvalidValue(some(input), { message: entry.issue }) : entry.issue;
+	if (typeof entry === "string") return new InvalidValue(some$1(input), { message: entry });
+	const inner = typeof entry.issue === "string" ? new InvalidValue(some$1(input), { message: entry.issue }) : entry.issue;
 	return new Pointer(entry.path, inner);
 }
 /** @internal */
 function makeSingle(input, out) {
 	if (out === void 0) return;
-	if (typeof out === "boolean") return out ? void 0 : new InvalidValue(some(input));
+	if (typeof out === "boolean") return out ? void 0 : new InvalidValue(some$1(input));
 	return makeFilterIssue(input, out);
 }
 /** @internal */
@@ -19421,7 +19497,7 @@ function make$55(input, ast, out) {
 	if (Array.isArray(out)) {
 		if (isReadonlyArrayNonEmpty(out)) {
 			if (out.length === 1) return makeFilterIssue(input, out[0]);
-			return new Composite(ast, some(input), map$7(out, (entry) => makeFilterIssue(input, entry)));
+			return new Composite(ast, some$1(input), map$7(out, (entry) => makeFilterIssue(input, entry)));
 		}
 		return;
 	}
@@ -19898,7 +19974,7 @@ function transformOptional(f) {
 function withDefault$1(defaultValue) {
 	return new Getter((o) => {
 		const filtered = filter$3(o, isNotUndefined);
-		return isSome(filtered) ? succeed$3(filtered) : mapEager(defaultValue, some);
+		return isSome(filtered) ? succeed$3(filtered) : mapEager(defaultValue, some$1);
 	});
 }
 /**
@@ -19961,8 +20037,8 @@ function Number$3() {
 }
 function parseJson(options) {
 	return onSome((input) => try_({
-		try: () => some(JSON.parse(input, options?.reviver)),
-		catch: (e) => new InvalidValue(some(input), { message: globalThis.String(e) })
+		try: () => some$1(JSON.parse(input, options?.reviver)),
+		catch: (e) => new InvalidValue(some$1(input), { message: globalThis.String(e) })
 	}));
 }
 /**
@@ -19999,8 +20075,8 @@ function parseJson(options) {
 */
 function stringifyJson(options) {
 	return onSome((input) => try_({
-		try: () => some(JSON.stringify(input, options?.replacer, options?.space)),
-		catch: (e) => new InvalidValue(some(input), { message: globalThis.String(e) })
+		try: () => some$1(JSON.stringify(input, options?.replacer, options?.space)),
+		catch: (e) => new InvalidValue(some$1(input), { message: globalThis.String(e) })
 	}));
 }
 /**
@@ -21019,7 +21095,7 @@ var Declaration = class Declaration extends Base {
 		const run = this.run(this.typeParameters);
 		return (oinput, options) => {
 			if (isNone(oinput)) return succeedNone;
-			return mapEager(run(oinput.value, this, options), some);
+			return mapEager(run(oinput.value, this, options), some$1);
 		};
 	}
 	/** @internal */
@@ -21510,7 +21586,7 @@ var Arrays = class Arrays extends Base {
 				else return yield* fail$3(new Composite(ast, oinput, [issue]));
 			}
 			if (state.issues) return yield* fail$3(new Composite(ast, oinput, state.issues));
-			return some(state.output);
+			return some$1(state.output);
 		});
 	}
 	/** @internal */
@@ -21526,7 +21602,7 @@ var Arrays = class Arrays extends Base {
 };
 const parseArray = /*#__PURE__*/ iterateEager()({
 	onItem(s, item, i) {
-		const value = i < s.len ? some(item) : none();
+		const value = i < s.len ? some$1(item) : none();
 		return s.getParser(s.tailThreshold, i).parser(value, s.options);
 	},
 	step(s, _, exit, i) {
@@ -21730,14 +21806,14 @@ var Objects = class Objects extends Base {
 		if (ast.propertySignatures.length === 0 && ast.indexSignatures.length === 0) return fromRefinement(ast, isNotNullish);
 		const parseIndexes = indexCount > 0 ? iterateEager()({
 			onItem: fnUntracedEager(function* (s, [key, is]) {
-				const effKey = recur(indexSignatureParameterFromString(is.parameter))(some(key), s.options);
+				const effKey = recur(indexSignatureParameterFromString(is.parameter))(some$1(key), s.options);
 				const exitKey = effectIsExit(effKey) ? effKey : yield* exit(effKey);
 				if (exitKey._tag === "Failure") {
 					const eff = wrapPropertyKeyIssue(s, ast, key, exitKey);
 					if (eff) yield* eff;
 					return;
 				}
-				const value = some(s.input[key]);
+				const value = some$1(s.input[key]);
 				const effValue = recur(is.type)(value, s.options);
 				const exitValue = effectIsExit(effValue) ? effValue : yield* exit(effValue);
 				if (exitValue._tag === "Failure") {
@@ -21807,9 +21883,9 @@ var Objects = class Objects extends Base {
 				const keys = (inputKeys ?? Reflect.ownKeys(input)).concat(expectedKeys);
 				const preserved = {};
 				for (const key of keys) if (Object.hasOwn(out, key)) set$7(preserved, key, out[key]);
-				return some(preserved);
+				return some$1(preserved);
 			}
-			return some(out);
+			return some$1(out);
 		});
 	}
 	rebuild(recur, flipMerge) {
@@ -21841,7 +21917,7 @@ var Objects = class Objects extends Base {
 };
 const parseProperties = /*#__PURE__*/ iterateEager()({
 	onItem(s, p) {
-		const value = Object.hasOwn(s.input, p.name) ? some(s.input[p.name]) : none();
+		const value = Object.hasOwn(s.input, p.name) ? some$1(s.input[p.name]) : none();
 		return p.parser(value, s.options);
 	},
 	step(s, p, exit) {
@@ -22641,7 +22717,7 @@ function isJson(u) {
 	}
 }
 /** @internal */
-const Json = /*#__PURE__*/ new Declaration([], () => (input, ast) => isJson(input) ? succeed$3(input) : fail$3(new InvalidType(ast, some(input))), {
+const Json = /*#__PURE__*/ new Declaration([], () => (input, ast) => isJson(input) ? succeed$3(input) : fail$3(new InvalidType(ast, some$1(input))), {
 	typeConstructor: { _tag: "effect/Json" },
 	generation: {
 		runtime: `Schema.Json`,
@@ -22674,7 +22750,7 @@ function isStringTree(u) {
 	}
 }
 /** @internal */
-const unknownToStringTree = /*#__PURE__*/ new Link(/* @__PURE__ */ new Declaration([], () => (input, ast) => isStringTree(input) ? succeed$3(input) : fail$3(new InvalidType(ast, some(input))), {
+const unknownToStringTree = /*#__PURE__*/ new Link(/* @__PURE__ */ new Declaration([], () => (input, ast) => isStringTree(input) ? succeed$3(input) : fail$3(new InvalidType(ast, some$1(input))), {
 	expected: "StringTree",
 	toCodecStringTree: () => new Link(unknown, passthrough())
 }), /*#__PURE__*/ passthrough());
@@ -22695,7 +22771,7 @@ const unknownToStringTree = /*#__PURE__*/ new Link(/* @__PURE__ */ new Declarati
 */
 function nominal() {
 	return Object.assign((input) => input, {
-		option: (input) => some(input),
+		option: (input) => some$1(input),
 		result: (input) => succeed$7(input),
 		is: (_) => true
 	});
@@ -26505,7 +26581,7 @@ const fromIteratorArray = (iterator, chunkSize = DefaultChunkSize) => fromPull$1
 			const state = iter.next();
 			if (state.done) {
 				if (buffer.length === 0) return done(state.value);
-				done$15 = some(state.value);
+				done$15 = some$1(state.value);
 				break;
 			}
 			buffer.push(state.value);
@@ -27587,7 +27663,7 @@ const splitLines$1 = () => fromTransform$1((upstream, _scope) => sync(() => {
 			onSuccess: loop,
 			onFailure: failCause$2,
 			onDone: (leftover) => {
-				done$13 = some(leftover);
+				done$13 = some$1(leftover);
 				if (stringBuilder.length > 0 || midCRLF) {
 					const last = stringBuilder;
 					stringBuilder = "";
@@ -28159,10 +28235,10 @@ const empty$9 = () => {
 * @since 2.0.0
 */
 const get$7 = /*#__PURE__*/ dual(2, (self, key) => {
-	if (self.backing.has(key)) return some(self.backing.get(key));
+	if (self.backing.has(key)) return some$1(self.backing.get(key));
 	else if (isSimpleKey(key)) return none();
 	const refKey = referentialKeysCache.get(self);
-	if (refKey !== void 0) return self.backing.has(refKey) ? some(self.backing.get(refKey)) : none();
+	if (refKey !== void 0) return self.backing.has(refKey) ? some$1(self.backing.get(refKey)) : none();
 	const hash$5 = hash(key);
 	const bucket = self.buckets.get(hash$5);
 	if (bucket === void 0) return none();
@@ -28174,7 +28250,7 @@ const getFromBucket = (self, bucket, key) => {
 	for (let i = 0, len = bucket.length; i < len; i++) if (equals$2(key, bucket[i])) {
 		const refKey = bucket[i];
 		referentialKeysCache.set(key, refKey);
-		return some(self.backing.get(refKey));
+		return some$1(self.backing.get(refKey));
 	}
 	return none();
 };
@@ -31970,7 +32046,7 @@ var LeafNode = class LeafNode extends Node {
 		return 1;
 	}
 	get(_shift, hash, key) {
-		if (this.hash === hash && equals$2(this.key, key)) return some(this.value);
+		if (this.hash === hash && equals$2(this.key, key)) return some$1(this.value);
 		return none();
 	}
 	has(_shift, hash, key) {
@@ -32023,7 +32099,7 @@ var CollisionNode = class CollisionNode extends Node {
 	}
 	get(_shift, hash, key) {
 		if (this.hash !== hash) return none();
-		for (const [k, v] of this.entries) if (equals$2(k, key)) return some(v);
+		for (const [k, v] of this.entries) if (equals$2(k, key)) return some$1(v);
 		return none();
 	}
 	has(_shift, hash, key) {
@@ -32974,7 +33050,7 @@ const mergeParseOptions = (options, overrideOptions) => overrideOptions === void
 /** @internal */
 function run(ast) {
 	const parser = recur$1(ast);
-	return (input, options) => flatMapEager(parser(some(input), options ?? defaultParseOptions), (oa) => {
+	return (input, options) => flatMapEager(parser(some$1(input), options ?? defaultParseOptions), (oa) => {
 		if (oa._tag === "None") return fail$3(new InvalidValue(oa));
 		return succeed$3(oa.value);
 	});
@@ -33204,7 +33280,7 @@ function declareConstructor() {
 * @since 3.10.0
 */
 function declare(is, annotations) {
-	return declareConstructor()([], () => (input, ast) => is(input) ? succeed$3(input) : fail$3(new InvalidType(ast, some(input))), annotations);
+	return declareConstructor()([], () => (input, ast) => is(input) ? succeed$3(input) : fail$3(new InvalidType(ast, some$1(input))), annotations);
 }
 /**
 * Returns `true` if `u` is a {@link SchemaError}.
@@ -34072,15 +34148,15 @@ function isInt(annotations) {
 */
 function CauseReason(error, defect) {
 	return make$35(declareConstructor()([error, defect], ([error, defect]) => (input, ast, options) => {
-		if (!isReason(input)) return fail$3(new InvalidType(ast, some(input)));
+		if (!isReason(input)) return fail$3(new InvalidType(ast, some$1(input)));
 		switch (input._tag) {
 			case "Fail": return mapBothEager(decodeUnknownEffect$1(error)(input.error, options), {
 				onSuccess: makeFailReason,
-				onFailure: (issue) => new Composite(ast, some(input), [new Pointer(["error"], issue)])
+				onFailure: (issue) => new Composite(ast, some$1(input), [new Pointer(["error"], issue)])
 			});
 			case "Die": return mapBothEager(decodeUnknownEffect$1(defect)(input.defect, options), {
 				onSuccess: makeDieReason,
-				onFailure: (issue) => new Composite(ast, some(input), [new Pointer(["defect"], issue)])
+				onFailure: (issue) => new Composite(ast, some$1(input), [new Pointer(["defect"], issue)])
 			});
 			case "Interrupt": return succeed$3(input);
 		}
@@ -34175,10 +34251,10 @@ function Cause(error, defect) {
 	return make$35(declareConstructor()([error, defect], ([error, defect]) => {
 		const failures = ArraySchema(CauseReason(error, defect));
 		return (input, ast, options) => {
-			if (!isCause(input)) return fail$3(new InvalidType(ast, some(input)));
+			if (!isCause(input)) return fail$3(new InvalidType(ast, some$1(input)));
 			return mapBothEager(decodeUnknownEffect$1(failures)(input.reasons, options), {
 				onSuccess: fromReasons,
-				onFailure: (issue) => new Composite(ast, some(input), [new Pointer(["failures"], issue)])
+				onFailure: (issue) => new Composite(ast, some$1(input), [new Pointer(["failures"], issue)])
 			});
 		};
 	}, {
@@ -34282,15 +34358,15 @@ function Exit(value, error, defect) {
 	], ([value, error, defect]) => {
 		const cause = Cause(error, defect);
 		return (input, ast, options) => {
-			if (!isExit(input)) return fail$3(new InvalidType(ast, some(input)));
+			if (!isExit(input)) return fail$3(new InvalidType(ast, some$1(input)));
 			switch (input._tag) {
 				case "Success": return mapBothEager(decodeUnknownEffect$1(value)(input.value, options), {
 					onSuccess: succeed$5,
-					onFailure: (issue) => new Composite(ast, some(input), [new Pointer(["value"], issue)])
+					onFailure: (issue) => new Composite(ast, some$1(input), [new Pointer(["value"], issue)])
 				});
 				case "Failure": return mapBothEager(decodeUnknownEffect$1(cause)(input.cause, options), {
 					onSuccess: failCause$3,
-					onFailure: (issue) => new Composite(ast, some(input), [new Pointer(["cause"], issue)])
+					onFailure: (issue) => new Composite(ast, some$1(input), [new Pointer(["cause"], issue)])
 				});
 			}
 		};
@@ -34518,7 +34594,7 @@ function getClassSchemaFactory(from, identifier, annotations) {
 		if (memo === void 0) {
 			const transformation = getClassTransformation(self);
 			const to = make$35(new Declaration([from.ast], () => (input, ast) => {
-				return input instanceof self || hasProperty(input, getClassTypeId(identifier)) ? succeed$3(input) : fail$3(new InvalidType(ast, some(input)));
+				return input instanceof self || hasProperty(input, getClassTypeId(identifier)) ? succeed$3(input) : fail$3(new InvalidType(ast, some$1(input)));
 			}, {
 				identifier,
 				[ClassTypeId]: ([from]) => new Link(from, transformation),
@@ -36145,7 +36221,7 @@ const setUrlParams = /*#__PURE__*/ dual(2, (self, input) => makeWith$1(self.meth
 * @category combinators
 * @since 4.0.0
 */
-const setHash = /*#__PURE__*/ dual(2, (self, hash) => makeWith$1(self.method, self.url, self.urlParams, some(hash), self.headers, self.body));
+const setHash = /*#__PURE__*/ dual(2, (self, hash) => makeWith$1(self.method, self.url, self.urlParams, some$1(hash), self.headers, self.body));
 /**
 * Sets the request body and updates `Content-Type` and `Content-Length` headers from the body metadata when available.
 *
@@ -36479,7 +36555,7 @@ const b3 = (headers) => {
 	if (!("b3" in headers)) return none();
 	const parts = headers["b3"].split("-");
 	if (parts.length < 2) return none();
-	return some(externalSpan({
+	return some$1(externalSpan({
 		traceId: parts[0],
 		spanId: parts[1],
 		sampled: parts[2] ? parts[2] === "1" : true
@@ -36498,7 +36574,7 @@ const b3 = (headers) => {
 */
 const xb3 = (headers) => {
 	if (!headers["x-b3-traceid"] || !headers["x-b3-spanid"]) return none();
-	return some(externalSpan({
+	return some$1(externalSpan({
 		traceId: headers["x-b3-traceid"],
 		spanId: headers["x-b3-spanid"],
 		sampled: headers["x-b3-sampled"] ? headers["x-b3-sampled"] === "1" : true
@@ -36524,7 +36600,7 @@ const w3c = (headers) => {
 	switch (version) {
 		case "00":
 			if (w3cTraceId.test(traceId) === false || w3cSpanId.test(spanId) === false) return none();
-			return some(externalSpan({
+			return some$1(externalSpan({
 				traceId,
 				spanId,
 				sampled: (parseInt(flags, 16) & 1) === 1
@@ -37972,7 +38048,7 @@ const causeResponseStripped = (cause) => {
 		}
 		return true;
 	});
-	return [response ?? internalServerError, failures.length > 0 ? some(fromReasons(failures)) : none()];
+	return [response ?? internalServerError, failures.length > 0 ? some$1(fromReasons(failures)) : none()];
 };
 const internalServerError = /*#__PURE__*/ empty({ status: 500 });
 const succeedInternalServerError = /*#__PURE__*/ succeed$3(internalServerError);
@@ -39711,7 +39787,7 @@ const toURL = (self) => {
 	const host = self.headers.host ?? "localhost";
 	const protocol = self.headers["x-forwarded-proto"] === "https" ? "https" : "http";
 	try {
-		return some(new URL(self.url, `${protocol}://${host}`));
+		return some$1(new URL(self.url, `${protocol}://${host}`));
 	} catch {
 		return none();
 	}
@@ -40456,7 +40532,7 @@ const RouteTypeId = "~effect/http/HttpRouter/Route";
 const makeRoute = (options) => ({
 	...options,
 	uninterruptible: options.uninterruptible ?? false,
-	prefix: typeof options.prefix === "string" ? some(options.prefix) : options.prefix ?? none(),
+	prefix: typeof options.prefix === "string" ? some$1(options.prefix) : options.prefix ?? none(),
 	[RouteTypeId]: RouteTypeId
 });
 /**
@@ -40787,7 +40863,7 @@ function isStreamSchema(schema) {
 }
 /** @internal */
 function getStreamSchemas(schema) {
-	return isStreamSchema(schema) ? some({
+	return isStreamSchema(schema) ? some$1({
 		success: schema.success,
 		error: schema.error
 	}) : none();
@@ -45091,7 +45167,7 @@ const withDefault = /*#__PURE__*/ dual(2, (self, defaultValue) => {
 * @category combinators
 * @since 2.0.0
 */
-const option = (self) => self.pipe(map(some), withDefault(none()));
+const option = (self) => self.pipe(map(some$1), withDefault(none()));
 /**
 * Constructs a `Config<T>` from a value matching `Wrap<T>`.
 *
@@ -49117,10 +49193,10 @@ const makeFile = /*#__PURE__*/ (() => {
 				}), (bytesRead) => {
 					if (bytesRead === 0) return none();
 					this.position = position + BigInt(bytesRead);
-					if (bytesRead === sizeNumber) return some(buffer);
+					if (bytesRead === sizeNumber) return some$1(buffer);
 					const dst = Buffer.allocUnsafeSlow(bytesRead);
 					buffer.copy(dst, 0, 0, bytesRead);
-					return some(dst);
+					return some$1(dst);
 				});
 			});
 		}
@@ -49219,7 +49295,7 @@ const makeFileInfo = (stat) => ({
 	uid: fromNullishOr(stat.uid),
 	gid: fromNullishOr(stat.gid),
 	size: Size(stat.size),
-	blksize: stat.blksize !== void 0 ? some(Size(stat.blksize)) : none(),
+	blksize: stat.blksize !== void 0 ? some$1(Size(stat.blksize)) : none(),
 	blocks: fromNullishOr(stat.blocks)
 });
 const stat = /*#__PURE__*/ (() => {
@@ -51527,7 +51603,7 @@ const toSchemaStore = (self, schema) => {
 	const modify = (key, f) => flatMap$2(get(key), (o) => {
 		if (isNone(o)) return succeedNone;
 		const newValue = f(o.value);
-		return as(set(key, newValue), some(newValue));
+		return as(set(key, newValue), some$1(newValue));
 	});
 	return {
 		[SchemaStoreTypeId]: SchemaStoreTypeId,
@@ -52122,7 +52198,6 @@ const GitDiffStatus = Literals([
 	"modified",
 	"renamed"
 ]);
-const GitDiffScope = Literals(["staged-to-worktree", "head-to-staged"]);
 var GitDiffSegment = class extends Class("GitDiffSegment")({
 	filePath: String$1,
 	fingerprint: String$1,
@@ -52155,8 +52230,21 @@ var GitCommit = class extends Class("GitCommit")({
 }) {};
 var GitReviewMetadata = class extends Class("GitReviewMetadata")({
 	base: String$1,
+	branch: String$1,
 	commits: ArraySchema(GitCommit),
-	dirty: Boolean$1
+	defaultBranch: String$1,
+	dirty: Boolean$1,
+	prUrl: optional(String$1),
+	unpushedCommits: Boolean$1
+}) {};
+var GitHubReviewThread = class extends Class("GitHubReviewThread")({
+	body: String$1,
+	filePath: String$1,
+	id: String$1,
+	lineNumber: Number$1,
+	resolved: Boolean$1,
+	side: optional(Literals(["additions", "deletions"])),
+	url: optional(String$1)
 }) {};
 var GitRepository = class extends Class("GitRepository")({
 	gitDirectory: String$1,
@@ -52264,6 +52352,7 @@ var ReviewComment = class extends Class("ReviewComment")({
 	body: String$1,
 	filePath: String$1,
 	lineNumber: Number$1,
+	resolved: optional(Boolean$1),
 	side: optional(Literals(["additions", "deletions"]))
 }) {};
 var ReviewState = class extends Class("ReviewState")({
@@ -52302,14 +52391,6 @@ var RpcContracts = class extends make$15(make$18("agents.create", {
 	error: GitError,
 	payload: Struct({ cwd: String$1 }),
 	success: GitBranchesSnapshot
-}), make$18("review.watch", {
-	error: GitError,
-	payload: Struct({
-		cwd: String$1,
-		scope: GitDiffScope
-	}),
-	stream: true,
-	success: ArraySchema(GitDiff)
 }), make$18("review.metadata", {
 	error: GitError,
 	payload: Struct({
@@ -52355,7 +52436,7 @@ var RpcContracts = class extends make$15(make$18("agents.create", {
 		comment: ReviewComment,
 		cwd: String$1
 	})
-}), make$18("review.comments.delete", {
+}), make$18("review.comments.resolve", {
 	error: GitError,
 	payload: Struct({
 		base: String$1,
@@ -52377,6 +52458,16 @@ var RpcContracts = class extends make$15(make$18("agents.create", {
 		cwd: String$1,
 		message: String$1
 	})
+}), make$18("review.githubThreads", {
+	error: GitError,
+	payload: Struct({ cwd: String$1 }),
+	success: ArraySchema(GitHubReviewThread)
+}), make$18("review.githubThreads.resolve", {
+	error: GitError,
+	payload: Struct({
+		cwd: String$1,
+		threadId: String$1
+	})
 }), make$18("review.stageFile", {
 	error: GitError,
 	payload: Struct({
@@ -52737,12 +52828,11 @@ var GitWorkspace = class extends Service()("@deslop/git/service/GitWorkspace", {
 	static layer = effect(this, this.make);
 };
 var GitWorktree = class extends Service()("@deslop/git/service/GitWorktree", { make: fnUntraced(function* (config) {
+	const execString = yield* ChildProcessSpawner.useSync((spawner) => spawner.string);
 	const git = yield* makeGitExecutor;
 	const fs = yield* FileSystem;
 	const path = yield* Path$1;
-	const hasWorktreeChanges = gen(function* () {
-		return yield* pipe(git.lines(config.cwd, ["status", "--porcelain"]), map$4((lines) => !isReadonlyArrayEmpty(lines)));
-	});
+	const hasWorktreeChanges = pipe(git.lines(config.cwd, ["status", "--porcelain"]), map$4((lines) => !isReadonlyArrayEmpty(lines)));
 	const resolveFrom = fnUntraced(function* (from) {
 		if (from.type === "ref") return from.ref;
 		return yield* pipe(git.string(config.cwd, [
@@ -52755,7 +52845,7 @@ var GitWorktree = class extends Service()("@deslop/git/service/GitWorktree", { m
 		return to.type === "ref" ? [to.ref] : empty$13();
 	}
 	function segmentsByFile(segments) {
-		return reduce(segments, empty$6(), (groups, segment) => modifyAt(groups, segment.filePath, (current) => some(append$1(getOrElse$1(current, () => empty$13()), segment))));
+		return reduce(segments, empty$6(), (groups, segment) => modifyAt(groups, segment.filePath, (current) => some$1(append$1(getOrElse$1(current, () => empty$13()), segment))));
 	}
 	function diffFromPatchChunk(chunk, segments) {
 		const deleted = /^deleted file mode /mu.test(chunk);
@@ -52794,31 +52884,21 @@ var GitWorktree = class extends Service()("@deslop/git/service/GitWorktree", { m
 			"--no-ext-diff"
 		]), input.segments);
 	});
-	const untrackedDiffs = gen(function* () {
-		return yield* forEach$1(yield* git.lines(config.cwd, [
-			"ls-files",
-			"--others",
-			"--exclude-standard"
-		]), (filePath) => pipe(fs.readFileString(path.join(config.cwd, filePath)), orElseSucceed(() => ""), map$4((content) => new GitDiff({
+	const untrackedDiffs = pipe(git.lines(config.cwd, [
+		"ls-files",
+		"--others",
+		"--exclude-standard"
+	]), flatMap$2((files) => forEach$1(files, (filePath) => pipe(fs.readFileString(path.join(config.cwd, filePath)), orElseSucceed(() => ""), map$4((content) => new GitDiff({
+		filePath,
+		patch: `diff --git a/${filePath} b/${filePath}\nnew file mode 100644\n--- /dev/null\n+++ b/${filePath}\n@@ -0,0 +1,${length(split$1("\n")(content))} @@\n${pipe(split$1("\n")(content), map$7((line) => `+${line}`), join$3("\n"))}`,
+		segments: [new GitDiffSegment({
 			filePath,
-			patch: `diff --git a/${filePath} b/${filePath}\nnew file mode 100644\n--- /dev/null\n+++ b/${filePath}\n@@ -0,0 +1,${length(split$1("\n")(content))} @@\n${pipe(split$1("\n")(content), map$7((line) => `+${line}`), join$3("\n"))}`,
-			segments: [new GitDiffSegment({
-				filePath,
-				fingerprint: content,
-				id: "HEAD->worktree",
-				type: "worktree"
-			})],
-			status: "added"
-		}))), { concurrency: "unbounded" });
-	});
-	const reviewDiffs = fnUntraced(function* (scope) {
-		const diffs = yield* gitDiffs({
-			args: scope === "head-to-staged" ? ["--cached"] : empty$13(),
-			segments: empty$13()
-		});
-		if (scope === "head-to-staged") return diffs;
-		return yield* pipe(untrackedDiffs, map$4(appendAll(diffs)));
-	});
+			fingerprint: content,
+			id: "HEAD->worktree",
+			type: "worktree"
+		})],
+		status: "added"
+	}))), { concurrency: "unbounded" })));
 	const commitSegmentDiffs = fnUntraced(function* (input) {
 		return pipe((yield* git.string(config.cwd, [
 			"log",
@@ -52885,23 +52965,44 @@ var GitWorktree = class extends Service()("@deslop/git/service/GitWorktree", { m
 		if (input.to.type === "ref") return diffsWithSegments;
 		return appendAll(diffsWithSegments, untracked);
 	});
-	const suggestBase = gen(function* () {
-		return yield* pipe([
-			yield* pipe(git.string(config.cwd, [
-				"symbolic-ref",
-				"--short",
-				"refs/remotes/origin/HEAD"
-			]), map$4(flow(trim, replace(/^origin\//u, "origin/"))), orElseSucceed(() => "origin/main")),
-			"origin/main",
-			"origin/master",
-			"main",
-			"master"
-		], findFirst((candidate) => pipe(git.string(config.cwd, [
+	const ghString = fnUntraced(function* (args) {
+		return yield* pipe(execString(make$40("gh", args, { cwd: config.cwd })), mapError$2((cause) => new GitError({ cause })));
+	});
+	const currentBranch = pipe(git.string(config.cwd, ["branch", "--show-current"]), map$4(trim));
+	const defaultBranchName = pipe(git.string(config.cwd, [
+		"symbolic-ref",
+		"--short",
+		"refs/remotes/origin/HEAD"
+	]), map$4(flow(trim, replace(/^origin\//u, ""))));
+	const branchBase = fnUntraced(function* (defaultBranch) {
+		return yield* pipe([`origin/${defaultBranch}`, defaultBranch], findFirst((candidate) => pipe(git.string(config.cwd, [
 			"rev-parse",
 			"--verify",
 			candidate
 		]), as(true), orElseSucceed(() => false))), map$4(getOrElse$1(() => "HEAD")));
 	});
+	const branchPrUrl = pipe(ghString([
+		"pr",
+		"view",
+		"--json",
+		"url",
+		"--jq",
+		".url"
+	]), map$4(trim), map$4((url) => isNonEmpty$1(url) ? some$1(url) : none()), catchTag("GitError", () => succeed$3(none())));
+	function isWipSubject(subject) {
+		return subject === "wip" || startsWith("wip: ")(subject);
+	}
+	function commitFromLogLine(line) {
+		const parts = split$1("\0")(line);
+		const subject = parts[2] ?? "";
+		return new GitCommit({
+			hash: parts[0] ?? "",
+			parents: pipe(parts[3] ?? "", split$1(" "), filter$2(isNonEmpty$1)),
+			shortHash: parts[1] ?? "",
+			subject,
+			wip: isWipSubject(subject)
+		});
+	}
 	const commits = fnUntraced(function* (base) {
 		const from = yield* pipe(git.string(config.cwd, [
 			"merge-base",
@@ -52913,55 +53014,148 @@ var GitWorktree = class extends Service()("@deslop/git/service/GitWorktree", { m
 			"--max-count=80",
 			"--format=%H%x00%h%x00%s%x00%P",
 			`${from}..HEAD`
-		]), map$4(map$7((line) => {
-			const parts = split$1("\0")(line);
-			const subject = parts[2] ?? "";
-			return new GitCommit({
-				hash: parts[0] ?? "",
-				parents: pipe(parts[3] ?? "", split$1(" "), filter$2(isNonEmpty$1)),
-				shortHash: parts[1] ?? "",
-				subject,
-				wip: startsWith("wip: ")(subject)
-			});
+		]), map$4(map$7(commitFromLogLine)));
+	});
+	const firstParentCommits = pipe(git.lines(config.cwd, [
+		"log",
+		"--first-parent",
+		"--max-count=80",
+		"--format=%H%x00%h%x00%s%x00%P",
+		"HEAD"
+	]), map$4(map$7(commitFromLogLine)));
+	const pushCurrentBranch = gen(function* () {
+		const branch = yield* currentBranch;
+		yield* pipe(git.string(config.cwd, [
+			"push",
+			"-u",
+			"origin",
+			`HEAD:${branch}`
+		]), asVoid);
+	});
+	const hasPushableCommits = pipe(gen(function* () {
+		const remoteBranch = `origin/${yield* currentBranch}`;
+		if (yield* pipe(git.string(config.cwd, [
+			"rev-parse",
+			"--verify",
+			remoteBranch
+		]), as(true), orElseSucceed(() => false))) return yield* git.lines(config.cwd, [
+			"log",
+			"--format=%s",
+			`${remoteBranch}..HEAD`
+		]);
+		const base = yield* branchBase(yield* defaultBranchName);
+		const from = yield* pipe(git.string(config.cwd, [
+			"merge-base",
+			base,
+			"HEAD"
+		]), map$4(trim), catchTag("GitError", () => succeed$3(base)));
+		return yield* git.lines(config.cwd, [
+			"log",
+			"--format=%s",
+			`${from}..HEAD`
+		]);
+	}), map$4((subjects) => !some(subjects, isWipSubject) && !isReadonlyArrayEmpty(subjects)));
+	const createDraftPr = pipe(ghString([
+		"pr",
+		"create",
+		"--draft",
+		"--fill"
+	]), map$4((output) => {
+		const url = output.match(/https?:\/\/\S+/u)?.[0] ?? trim(output);
+		return isNonEmpty$1(url) ? some$1(url) : none();
+	}));
+	const prReviewThreads = gen(function* () {
+		const pr = yield* pipe(ghString([
+			"pr",
+			"view",
+			"--json",
+			"number",
+			"--jq",
+			".number"
+		]), map$4(flow(trim, parse$2)), flatMap$2(match$5({
+			onNone: () => new GitError({ message: "No PR found." }),
+			onSome: succeed$3
 		})));
+		const repository = yield* pipe(ghString([
+			"repo",
+			"view",
+			"--json",
+			"owner,name"
+		]), map$4((output) => JSON.parse(output)));
+		const response = yield* 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
+										}
+									}
+								}
+							}
+						}
+					}
+				}`,
+			"-f",
+			`owner=${repository.owner.login}`,
+			"-f",
+			`name=${repository.name}`,
+			"-F",
+			`number=${pr}`
+		]);
+		return pipe(JSON.parse(response).data?.repository?.pullRequest?.reviewThreads?.nodes ?? [], filter$2((thread) => thread.id !== void 0), flatMap$5((thread) => pipe(thread.comments?.nodes ?? [], filter$2((comment) => comment.body !== void 0 && comment.path !== void 0), map$7((comment) => new GitHubReviewThread({
+			body: comment.body ?? "",
+			filePath: comment.path ?? "",
+			id: thread.id ?? "",
+			lineNumber: comment.line ?? comment.originalLine ?? 1,
+			resolved: thread.isResolved === true,
+			side: thread.diffSide === "LEFT" ? "deletions" : "additions",
+			url: comment.url
+		})))));
 	});
 	const worktreeChanges = pipe(make$43(void 0), merge$1(pipe(fs.watch(config.cwd), catch_(() => empty$8), map$2(() => void 0))), debounce(millis(50)));
 	return {
 		commitAndPush: fnUntraced(function* (input) {
-			if (yield* hasWorktreeChanges) return yield* fail$3(new GitError({ message: "Create a WIP commit before squashing." }));
-			const oldestWip = pipe(yield* commits(input.base), filter$2((commit) => commit.wip), last, getOrUndefined$1);
-			if (!oldestWip) return yield* fail$3(new GitError({ message: "No WIP commits to squash." }));
-			yield* pipe(git.string(config.cwd, [
+			const oldestWip = pipe(yield* commits(input.base), takeWhile((commit) => commit.wip), last, getOrUndefined$1);
+			const dirty = yield* hasWorktreeChanges;
+			if (oldestWip) yield* pipe(git.string(config.cwd, [
 				"reset",
 				"--soft",
 				`${oldestWip.hash}^`
 			]), asVoid);
+			else if (!dirty) return yield* new GitError({ message: "No changes to commit." });
+			yield* pipe(git.string(config.cwd, ["add", "-A"]), asVoid);
 			yield* pipe(git.string(config.cwd, [
 				"commit",
 				"-m",
 				input.message
 			]), asVoid);
-			const branch = yield* pipe(git.string(config.cwd, ["branch", "--show-current"]), map$4(trim));
-			yield* pipe((yield* pipe(git.string(config.cwd, [
-				"rev-parse",
-				"--abbrev-ref",
-				"--symbolic-full-name",
-				"@{u}"
-			]), as(true), orElseSucceed(() => false))) ? git.string(config.cwd, ["push"]) : git.string(config.cwd, [
-				"push",
-				"-u",
-				"origin",
-				branch
-			]), asVoid);
+			yield* pushCurrentBranch;
+			if (yield* hasPushableCommits) return yield* new GitError({ message: "Push completed but the branch still has unpushed commits." });
+			if ((yield* currentBranch) !== (yield* defaultBranchName) && isNone(yield* branchPrUrl)) yield* createDraftPr;
 		}),
 		commits,
 		createWipCommit: fnUntraced(function* (message) {
-			if (!(yield* hasWorktreeChanges)) return yield* fail$3(new GitError({ message: "No changes to commit." }));
+			if (!(yield* hasWorktreeChanges)) return yield* new GitError({ message: "No changes to commit." });
 			yield* pipe(git.string(config.cwd, ["add", "-A"]), asVoid);
+			const subject = pipe(message, trim, (message) => isEmpty$1(message) ? "wip" : `wip: ${message}`);
 			yield* pipe(git.string(config.cwd, [
 				"commit",
 				"-m",
-				`wip: ${message}`
+				subject
 			]), asVoid);
 		}),
 		discardFile: fnUntraced(function* (filePath) {
@@ -52986,15 +53180,38 @@ var GitWorktree = class extends Service()("@deslop/git/service/GitWorktree", { m
 			]), asVoid);
 		}),
 		metadata: fnUntraced(function* (input) {
-			const base = input?.base ?? (yield* suggestBase);
+			const branch = yield* currentBranch;
+			const defaultBranch = yield* defaultBranchName;
+			const base = input?.base ?? (yield* branchBase(defaultBranch));
 			return new GitReviewMetadata({
 				base,
-				commits: yield* commits(base),
-				dirty: yield* hasWorktreeChanges
+				branch,
+				commits: branch === defaultBranch ? yield* firstParentCommits : yield* commits(base),
+				defaultBranch,
+				dirty: yield* hasWorktreeChanges,
+				prUrl: getOrUndefined$1(yield* branchPrUrl),
+				unpushedCommits: yield* hasPushableCommits
 			});
 		}),
-		reviewDiffs,
+		resolveReviewThread: fnUntraced(function* (threadId) {
+			yield* pipe(ghString([
+				"api",
+				"graphql",
+				"-f",
+				`query=
+					mutation(\$threadId: ID!) {
+						resolveReviewThread(input: {threadId: \$threadId}) {
+							thread {
+								id
+							}
+						}
+					}`,
+				"-f",
+				`threadId=${threadId}`
+			]), asVoid);
+		}),
 		reviewRangeDiffs,
+		reviewThreads: pipe(prReviewThreads, catchTag("GitError", () => succeed$3(empty$13()))),
 		stageFile: fnUntraced(function* (filePath) {
 			yield* pipe(git.string(config.cwd, [
 				"add",
@@ -53010,7 +53227,6 @@ var GitWorktree = class extends Service()("@deslop/git/service/GitWorktree", { m
 				filePath
 			]), asVoid);
 		}),
-		watchReviewDiffs: (scope) => pipe(worktreeChanges, mapEffect(() => pipe(reviewDiffs(scope), catchTag("GitError", () => succeed$3(empty$13())))), changesWith((left, right) => length(left) === length(right) && every(left, (leftDiff, index) => right[index] !== void 0 && leftDiff.filePath === right[index].filePath && leftDiff.status === right[index].status && leftDiff.patch === right[index].patch))),
 		watchReviewRangeDiffs: (input) => pipe(worktreeChanges, mapEffect(() => pipe(reviewRangeDiffs(input), catchTag("GitError", () => succeed$3(empty$13())))), changesWith((left, right) => length(left) === length(right) && every(left, (leftDiff, index) => right[index] !== void 0 && leftDiff.filePath === right[index].filePath && leftDiff.status === right[index].status && leftDiff.patch === right[index].patch)))
 	};
 }) }) {
@@ -53201,7 +53417,7 @@ var Terminal = class extends Service()("@deslop/terminal/service/Terminal", { ma
 		title: ""
 	})), andThen(get(stateRef)));
 	function setPorts(ports) {
-		return updateSome(stateRef, (state) => samePorts(state.ports, ports) ? none() : some({
+		return updateSome(stateRef, (state) => samePorts(state.ports, ports) ? none() : some$1({
 			...state,
 			ports: [...ports]
 		}));
@@ -53483,6 +53699,10 @@ const TerminalSessionKey = Struct({
 	cwd: String$1,
 	sessionId: optional(String$1)
 });
+const emptyReviewState = new ReviewState({
+	comments: empty$13(),
+	marks: empty$13()
+});
 const AgentSessionKey = Struct({
 	cwd: String$1,
 	uuid: String$1
@@ -53510,13 +53730,7 @@ const RpcHandlers = RpcContracts.toLayer(gen(function* () {
 		return Buffer.from(`${root}\u0000${input.base}`, "utf8").toString("base64url");
 	});
 	const readReviewState = fnUntraced(function* (key) {
-		return yield* pipe(reviewStore.get(`review-state/${key}`), map$4(getOrElse$1(() => new ReviewState({
-			comments: empty$13(),
-			marks: empty$13()
-		}))), orElseSucceed(() => new ReviewState({
-			comments: empty$13(),
-			marks: empty$13()
-		})));
+		return yield* pipe(reviewStore.get(`review-state/${key}`), map$4(getOrElse$1(() => emptyReviewState)), orElseSucceed(() => emptyReviewState));
 	});
 	const reviewStates = yield* make$46({
 		idleTimeToLive: minutes(5),
@@ -53578,7 +53792,7 @@ const RpcHandlers = RpcContracts.toLayer(gen(function* () {
 		"projects.createWorktree": (payload) => git.createWorktree(payload),
 		"projects.deleteWorktree": (payload) => git.deleteWorktree(payload),
 		"projects.watch": () => unwrap$1(pipe(get(git.projects), map$4((projects) => pipe(make$43(projects), concat(drop(1)(changes(git.projects))))))),
-		"review.comments.delete": (payload) => updateReviewState(payload, (state) => {
+		"review.comments.resolve": (payload) => updateReviewState(payload, (state) => {
 			const key = commentKey(payload);
 			return new ReviewState({
 				comments: filter$2(state.comments, (comment) => commentKey(comment) !== key),
@@ -53588,7 +53802,10 @@ const RpcHandlers = RpcContracts.toLayer(gen(function* () {
 		"review.comments.save": (payload) => updateReviewState(payload, (state) => {
 			const key = commentKey(payload.comment);
 			return new ReviewState({
-				comments: append$1(filter$2(state.comments, (comment) => commentKey(comment) !== key), payload.comment),
+				comments: append$1(filter$2(state.comments, (comment) => commentKey(comment) !== key), new ReviewComment({
+					...payload.comment,
+					resolved: false
+				})),
 				marks: state.marks
 			});
 		}),
@@ -53598,6 +53815,8 @@ const RpcHandlers = RpcContracts.toLayer(gen(function* () {
 		}))),
 		"review.createWipCommit": (payload) => pipe(get$6(gitWorktrees, payload.cwd), flatMap$2((worktree) => worktree.createWipCommit(payload.message))),
 		"review.discardFile": (payload) => pipe(get$6(gitWorktrees, payload.cwd), flatMap$2((worktree) => worktree.discardFile(payload.filePath))),
+		"review.githubThreads": (payload) => pipe(get$6(gitWorktrees, payload.cwd), flatMap$2((worktree) => worktree.reviewThreads)),
+		"review.githubThreads.resolve": (payload) => pipe(get$6(gitWorktrees, payload.cwd), flatMap$2((worktree) => worktree.resolveReviewThread(payload.threadId))),
 		"review.metadata": (payload) => pipe(get$6(gitWorktrees, payload.cwd), flatMap$2((worktree) => worktree.metadata({ base: payload.base }))),
 		"review.stageFile": (payload) => pipe(get$6(gitWorktrees, payload.cwd), flatMap$2((worktree) => worktree.stageFile(payload.filePath))),
 		"review.state.mark": (payload) => updateReviewState(payload, (state) => {
@@ -53616,7 +53835,6 @@ const RpcHandlers = RpcContracts.toLayer(gen(function* () {
 		}),
 		"review.state.watch": (payload) => unwrap$1(pipe(reviewStateKey(payload), flatMap$2((key) => get$6(reviewStates, key)), flatMap$2((ref) => pipe(get(ref), map$4((state) => concat(drop(1)(changes(ref)))(make$43(state))))))),
 		"review.unstageFile": (payload) => pipe(get$6(gitWorktrees, payload.cwd), flatMap$2((worktree) => worktree.unstageFile(payload.filePath))),
-		"review.watch": (payload) => unwrap$1(pipe(get$6(gitWorktrees, payload.cwd), map$4((worktree) => worktree.watchReviewDiffs(payload.scope)))),
 		"review.watchRange": (payload) => unwrap$1(pipe(get$6(gitWorktrees, payload.cwd), map$4((worktree) => worktree.watchReviewRangeDiffs({
 			from: payload.from,
 			to: payload.to
@@ -67202,7 +67420,7 @@ const isSampled = (traceFlags) => (traceFlags & TraceFlags.SAMPLED) === TraceFla
 const getOtelParent = (tracer, context, annotations) => {
 	const otelParent = tracer.getSpan(context)?.spanContext();
 	if (!otelParent) return none();
-	return some(externalSpan({
+	return some$1(externalSpan({
 		spanId: otelParent.spanId,
 		traceId: otelParent.traceId,
 		sampled: (otelParent.traceFlags & 1) === 1,