lalph 0.3.113 → 0.3.115

package/dist/cli.mjs

@@ -7858,7 +7858,7 @@ var FiberImpl = class {
 		if (this.currentStackFrame) cause = causeAnnotate(cause, make$89(StackTraceKey, this.currentStackFrame));
 		if (annotations) cause = causeAnnotate(cause, annotations);
 		this._interruptedCause = this._interruptedCause ? causeCombine(this._interruptedCause, cause) : cause;
-		if (this.interruptible) this.evaluate(failCause$6(this._interruptedCause));
+		if (this.interruptible) this.evaluate(failCause$5(this._interruptedCause));
 	}
 	pollUnsafe() {
 		return this._exit;
@@ -8049,7 +8049,7 @@ const fiberInterruptAll = (fibers) => withFiber$1((parent) => {
 /** @internal */
 const succeed$8 = exitSucceed;
 /** @internal */
-const failCause$6 = exitFailCause;
+const failCause$5 = exitFailCause;
 /** @internal */
 const fail$9 = exitFail;
 /** @internal */
@@ -8159,7 +8159,7 @@ const asyncFinalizer = /* @__PURE__ */ makePrimitive$1({
 		}
 	},
 	[contE](cause, _fiber) {
-		return hasInterrupts$2(cause) ? flatMap$7(this[args](), () => failCause$6(cause)) : failCause$6(cause);
+		return hasInterrupts$2(cause) ? flatMap$7(this[args](), () => failCause$5(cause)) : failCause$5(cause);
 	}
 });
 /** @internal */
@@ -8289,6 +8289,8 @@ const tap$2 = /* @__PURE__ */ dual(2, (self, f) => flatMap$7(self, (a) => as$2(i
 /** @internal */
 const asVoid$2 = (self) => flatMap$7(self, (_) => exitVoid);
 /** @internal */
+const sandbox$1 = (self) => catchCause$3(self, fail$9);
+/** @internal */
 const raceAllFirst$1 = (all, options) => withFiber$1((parent) => callback$2((resume) => {
 	let done = false;
 	const fibers = /* @__PURE__ */ new Set();
@@ -8459,7 +8461,7 @@ const forever$2 = /* @__PURE__ */ dual((args) => isEffect$1(args[0]), (self, opt
 	step: constVoid
 }));
 /** @internal */
-const catchCause$4 = /* @__PURE__ */ dual(2, (self, f) => {
+const catchCause$3 = /* @__PURE__ */ dual(2, (self, f) => {
 	const onFailure = Object.create(OnFailureProto);
 	onFailure[args] = self;
 	onFailure[contE] = f.length !== 1 ? (cause) => f(cause) : f;
@@ -8473,9 +8475,9 @@ const OnFailureProto = /* @__PURE__ */ makePrimitiveProto({
 	}
 });
 /** @internal */
-const catchCauseFilter$2 = /* @__PURE__ */ dual(3, (self, filter, f) => catchCause$4(self, (cause) => {
+const catchCauseFilter$2 = /* @__PURE__ */ dual(3, (self, filter, f) => catchCause$3(self, (cause) => {
 	const eb = filter(cause);
-	return isFailure$4(eb) ? failCause$6(eb.failure) : internalCall(() => f(eb.success, cause));
+	return isFailure$4(eb) ? failCause$5(eb.failure) : internalCall(() => f(eb.success, cause));
 }));
 /** @internal */
 const catch_$3 = /* @__PURE__ */ dual(2, (self, f) => catchCauseFilter$2(self, findError$2, (e) => f(e)));
@@ -8487,12 +8489,12 @@ const catchNoSuchElement$1 = (self) => matchEffect$2(self, {
 /** @internal */
 const catchDefect$1 = /* @__PURE__ */ dual(2, (self, f) => catchCauseFilter$2(self, findDefect$2, f));
 /** @internal */
-const tapCause$2 = /* @__PURE__ */ dual(2, (self, f) => catchCause$4(self, (cause) => andThen$1(internalCall(() => f(cause)), failCause$6(cause))));
+const tapCause$2 = /* @__PURE__ */ dual(2, (self, f) => catchCause$3(self, (cause) => andThen$1(internalCall(() => f(cause)), failCause$5(cause))));
 /** @internal */
-const tapCauseFilter$1 = /* @__PURE__ */ dual(3, (self, filter, f) => catchCause$4(self, (cause) => {
+const tapCauseFilter$1 = /* @__PURE__ */ dual(3, (self, filter, f) => catchCause$3(self, (cause) => {
 	const result = filter(cause);
-	if (isFailure$4(result)) return failCause$6(cause);
-	return andThen$1(internalCall(() => f(result.success, cause)), failCause$6(cause));
+	if (isFailure$4(result)) return failCause$5(cause);
+	return andThen$1(internalCall(() => f(result.success, cause)), failCause$5(cause));
 }));
 /** @internal */
 const tapError$1 = /* @__PURE__ */ dual(2, (self, f) => tapCauseFilter$1(self, findError$2, (e) => f(e)));
@@ -8502,18 +8504,18 @@ const tapErrorTag$1 = /* @__PURE__ */ dual(3, (self, k, f) => {
 	return tapError$1(self, (error) => predicate(error) ? f(error) : void_$4);
 });
 /** @internal */
-const catchIf$3 = /* @__PURE__ */ dual((args) => isEffect$1(args[0]), (self, predicate, f, orElse) => catchCause$4(self, (cause) => {
+const catchIf$3 = /* @__PURE__ */ dual((args) => isEffect$1(args[0]), (self, predicate, f, orElse) => catchCause$3(self, (cause) => {
 	const error = findError$2(cause);
-	if (isFailure$4(error)) return failCause$6(error.failure);
-	if (!predicate(error.success)) return orElse ? internalCall(() => orElse(error.success)) : failCause$6(cause);
+	if (isFailure$4(error)) return failCause$5(error.failure);
+	if (!predicate(error.success)) return orElse ? internalCall(() => orElse(error.success)) : failCause$5(cause);
 	return internalCall(() => f(error.success));
 }));
 /** @internal */
-const catchFilter$3 = /* @__PURE__ */ dual((args) => isEffect$1(args[0]), (self, filter, f, orElse) => catchCause$4(self, (cause) => {
+const catchFilter$3 = /* @__PURE__ */ dual((args) => isEffect$1(args[0]), (self, filter, f, orElse) => catchCause$3(self, (cause) => {
 	const error = findError$2(cause);
-	if (isFailure$4(error)) return failCause$6(error.failure);
+	if (isFailure$4(error)) return failCause$5(error.failure);
 	const result = filter(error.success);
-	if (isFailure$4(result)) return orElse ? internalCall(() => orElse(result.failure)) : failCause$6(cause);
+	if (isFailure$4(result)) return orElse ? internalCall(() => orElse(result.failure)) : failCause$5(cause);
 	return internalCall(() => f(result.success));
 }));
 /** @internal */
@@ -8556,24 +8558,12 @@ const ignore$2 = /* @__PURE__ */ dual((args) => isEffect$1(args[0]), (self, opti
 	return matchCauseEffect$1(self, {
 		onFailure(cause) {
 			const failure = findFail$1(cause);
-			return isFailure$4(failure) ? failCause$6(failure.failure) : options.message === void 0 ? logEffect(cause) : logEffect(options.message, cause);
+			return isFailure$4(failure) ? failCause$5(failure.failure) : options.message === void 0 ? logEffect(cause) : logEffect(options.message, cause);
 		},
 		onSuccess: (_) => void_$4
 	});
 });
 /** @internal */
-const ignoreCause$1 = /* @__PURE__ */ dual((args) => isEffect$1(args[0]), (self, options) => {
-	if (!options?.log) return matchCauseEffect$1(self, {
-		onFailure: (_) => void_$4,
-		onSuccess: (_) => void_$4
-	});
-	const logEffect = logWithLevel$1(options.log === true ? void 0 : options.log);
-	return matchCauseEffect$1(self, {
-		onFailure: (cause) => options.message === void 0 ? logEffect(cause) : logEffect(options.message, cause),
-		onSuccess: (_) => void_$4
-	});
-});
-/** @internal */
 const option$2 = (self) => match$6(self, {
 	onFailure: none$4,
 	onSuccess: some$2
@@ -8607,7 +8597,7 @@ const matchCause$1 = /* @__PURE__ */ dual(2, (self, options) => matchCauseEffect
 const matchEffect$2 = /* @__PURE__ */ dual(2, (self, options) => matchCauseEffect$1(self, {
 	onFailure: (cause) => {
 		const fail = cause.reasons.find(isFailReason$1);
-		return fail ? internalCall(() => options.onFailure(fail.error)) : failCause$6(cause);
+		return fail ? internalCall(() => options.onFailure(fail.error)) : failCause$5(cause);
 	},
 	onSuccess: options.onSuccess
 }));
@@ -8652,9 +8642,9 @@ const exitPrimitive = /* @__PURE__ */ makePrimitive$1({
 /** @internal */
 const delay$1 = /* @__PURE__ */ dual(2, (self, duration) => andThen$1(sleep$1(duration), self));
 /** @internal */
-const timeoutOrElse$2 = /* @__PURE__ */ dual(2, (self, options) => raceFirst$1(self, flatMap$7(sleep$1(options.duration), options.orElse)));
+const timeoutOrElse$1 = /* @__PURE__ */ dual(2, (self, options) => raceFirst$1(self, flatMap$7(sleep$1(options.duration), options.orElse)));
 /** @internal */
-const timeout$1 = /* @__PURE__ */ dual(2, (self, duration) => timeoutOrElse$2(self, {
+const timeout$1 = /* @__PURE__ */ dual(2, (self, duration) => timeoutOrElse$1(self, {
 	duration,
 	orElse: () => fail$9(new TimeoutError$1())
 }));
@@ -8842,7 +8832,7 @@ const cachedWithTTL$1 = /* @__PURE__ */ dual(2, (self, timeToLive) => map$13(cac
 /** @internal */
 const cached$2 = (self) => cachedWithTTL$1(self, infinity);
 /** @internal */
-const interrupt$4 = /* @__PURE__ */ withFiber$1((fiber) => failCause$6(causeInterrupt(fiber.id)));
+const interrupt$4 = /* @__PURE__ */ withFiber$1((fiber) => failCause$5(causeInterrupt(fiber.id)));
 /** @internal */
 const uninterruptible$1 = (self) => withFiber$1((fiber) => {
 	if (!fiber.interruptible) return self;
@@ -8854,7 +8844,7 @@ const setInterruptible = /* @__PURE__ */ makePrimitive$1({
 	op: "SetInterruptible",
 	[contAll](fiber) {
 		fiber.interruptible = this[args];
-		if (fiber._interruptedCause && fiber.interruptible) return () => failCause$6(fiber._interruptedCause);
+		if (fiber._interruptedCause && fiber.interruptible) return () => failCause$5(fiber._interruptedCause);
 	}
 });
 const setInterruptibleTrue = /* @__PURE__ */ setInterruptible(true);
@@ -8864,7 +8854,7 @@ const interruptible$1 = (self) => withFiber$1((fiber) => {
 	if (fiber.interruptible) return self;
 	fiber.interruptible = true;
 	fiber._stack.push(setInterruptibleFalse);
-	if (fiber._interruptedCause) return failCause$6(fiber._interruptedCause);
+	if (fiber._interruptedCause) return failCause$5(fiber._interruptedCause);
 	return self;
 });
 /** @internal */
@@ -9640,7 +9630,7 @@ const succeed$7 = exitSucceed;
 * @category constructors
 * @since 2.0.0
 */
-const failCause$5 = exitFailCause;
+const failCause$4 = exitFailCause;
 /**
 * Creates a failed Exit from a typed error value.
 *
@@ -9962,7 +9952,7 @@ const done$1 = completeWith;
 * @since 2.0.0
 * @category utils
 */
-const failCause$4 = /* @__PURE__ */ dual(2, (self, cause) => done$1(self, exitFailCause(cause)));
+const failCause$3 = /* @__PURE__ */ dual(2, (self, cause) => done$1(self, exitFailCause(cause)));
 /**
 * Completes the `Deferred` with interruption. This will interrupt all fibers
 * waiting on the value of the `Deferred` with the specified `FiberId`.
@@ -9981,7 +9971,7 @@ const failCause$4 = /* @__PURE__ */ dual(2, (self, cause) => done$1(self, exitFa
 * @since 2.0.0
 * @category utils
 */
-const interruptWith = /* @__PURE__ */ dual(2, (self, fiberId) => failCause$4(self, causeInterrupt(fiberId)));
+const interruptWith = /* @__PURE__ */ dual(2, (self, fiberId) => failCause$3(self, causeInterrupt(fiberId)));
 /**
 * Returns `true` if this `Deferred` has already been completed with a value or
 * an error, `false` otherwise.
@@ -11434,7 +11424,7 @@ const flatMap$6 = /* @__PURE__ */ dual(2, (self, f) => fromBuild((memoMap, scope
 * @since 4.0.0
 * @category sequencing
 */
-const tapCause$1 = /* @__PURE__ */ dual(2, (self, f) => fromBuild((memoMap, scope) => catchCause$4(self.build(memoMap, scope), (cause) => provide$4(andThen$1(f(cause), failCause$6(cause)), scope))));
+const tapCause$1 = /* @__PURE__ */ dual(2, (self, f) => fromBuild((memoMap, scope) => catchCause$3(self.build(memoMap, scope), (cause) => provide$4(andThen$1(f(cause), failCause$5(cause)), scope))));
 /**
 * Translates effect failure into death of the fiber, making all failures
 * unchecked and not a part of the type of the layer.
@@ -11538,7 +11528,7 @@ const orDie$3 = (self) => fromBuildUnsafe((memoMap, scope) => orDie$4(self.build
 * @since 2.0.0
 * @category error handling
 */
-const catchCause$3 = /* @__PURE__ */ dual(2, (self, onError) => fromBuildUnsafe((memoMap, scope) => catchCause$4(self.build(memoMap, scope), (cause) => onError(cause).build(memoMap, scope))));
+const catchCause$2 = /* @__PURE__ */ dual(2, (self, onError) => fromBuildUnsafe((memoMap, scope) => catchCause$3(self.build(memoMap, scope), (cause) => onError(cause).build(memoMap, scope))));
 /**
 * Creates a fresh version of this layer that will not be shared.
 *
@@ -12796,7 +12786,7 @@ const filterDoneLeftover = /* @__PURE__ */ composePassthrough(findError, (e) =>
 */
 const doneExitFromCause = (cause) => {
 	const halt = filterDone(cause);
-	return !isFailure$4(halt) ? succeed$7(halt.success.value) : failCause$5(halt.failure);
+	return !isFailure$4(halt) ? succeed$7(halt.success.value) : failCause$4(halt.failure);
 };
 /**
 * Pattern matches on a Pull, handling success, failure, and done cases.
@@ -13003,7 +12993,7 @@ const fromStepWithMetadata = (step) => fromStep(map$13(step, (f) => {
 * @since 4.0.0
 * @category destructors
 */
-const toStep = (schedule) => catchCause$4(schedule.step, (cause) => succeed$8(() => failCause$6(cause)));
+const toStep = (schedule) => catchCause$3(schedule.step, (cause) => succeed$8(() => failCause$5(cause)));
 /**
 * Extracts a step function from a Schedule that provides metadata about each
 * execution. It will also handle sleeping for the computed delay.
@@ -13136,7 +13126,7 @@ const either = /* @__PURE__ */ dual(2, (self, other) => eitherWith(self, other,
 */
 const eitherWith = /* @__PURE__ */ dual(3, (self, other, combine) => fromStep(map$13(zip$1(toStep(self), toStep(other)), ([stepLeft, stepRight]) => (now, input) => matchEffect$1(stepLeft(now, input), {
 	onSuccess: (leftResult) => stepRight(now, input).pipe(map$13((rightResult) => [combine(leftResult[0], rightResult[0]), min$2(leftResult[1], rightResult[1])]), catchDone((rightDone) => succeed$8([combine(leftResult[0], rightDone), leftResult[1]]))),
-	onFailure: failCause$6,
+	onFailure: failCause$5,
 	onDone: (leftDone) => stepRight(now, input).pipe(map$13((rightResult) => [combine(leftDone, rightResult[0]), rightResult[1]]), catchDone((rightDone) => done(combine(leftDone, rightDone))))
 }))));
 /**
@@ -13269,7 +13259,7 @@ const jittered = (self) => modifyDelay(self, (_, delay) => map$13(randomNext, (r
 */
 const passthrough$2 = (self) => fromStep(map$13(toStep(self), (step) => (now, input) => matchEffect$1(step(now, input), {
 	onSuccess: (result) => succeed$8([input, result[1]]),
-	onFailure: failCause$6,
+	onFailure: failCause$5,
 	onDone: () => done(input)
 })));
 /**
@@ -14306,7 +14296,7 @@ const fail$6 = fail$9;
 * @since 2.0.0
 * @category Creating Effects
 */
-const failCause$3 = failCause$6;
+const failCause$2 = failCause$5;
 /**
 * Creates an effect that terminates a fiber with a specified error.
 *
@@ -15105,7 +15095,7 @@ const catchReason$2 = catchReason$3;
 * @since 4.0.0
 * @category Error Handling
 */
-const catchCause$2 = catchCause$4;
+const catchCause$1 = catchCause$3;
 /**
 * Recovers from all defects using a provided recovery function.
 *
@@ -15464,6 +15454,41 @@ const tapCause = tapCause$2;
 */
 const retry$1 = retry$2;
 /**
+* The `sandbox` function transforms an effect by exposing the full cause
+* of any error, defect, or fiber interruption that might occur during its
+* execution. It changes the error channel of the effect to include detailed
+* information about the cause, which is wrapped in a `Cause<E>` type.
+*
+* This function is useful when you need access to the complete underlying cause
+* of failures, defects, or interruptions, enabling more detailed error
+* handling. Once you apply `sandbox`, you can use operators like
+* {@link catchAll} and {@link catchTags} to handle specific error conditions.
+* If necessary, you can revert the sandboxing operation with {@link unsandbox}
+* to return to the original error handling behavior.
+*
+* @example
+* ```ts
+* import { Cause, Effect } from "effect"
+*
+* const task = Effect.fail("Something went wrong")
+*
+* // Sandbox exposes the full cause as the error type
+* const program = Effect.gen(function*() {
+*   const result = yield* Effect.flip(Effect.sandbox(task))
+*   return `Caught cause: ${Cause.squash(result)}`
+* })
+*
+* Effect.runPromise(program).then(console.log)
+* // Output: "Caught cause: Something went wrong"
+* ```
+*
+* @see {@link unsandbox} to restore the original error handling.
+*
+* @since 2.0.0
+* @category Error Handling
+*/
+const sandbox = sandbox$1;
+/**
 * Discards both the success and failure values of an effect.
 *
 * **When to Use**
@@ -15511,26 +15536,6 @@ const retry$1 = retry$2;
 */
 const ignore$1 = ignore$2;
 /**
-* Ignores the effect's failure cause, including defects and interruptions.
-*
-* Use the `log` option to emit the full {@link Cause} when the effect fails,
-* and `message` to prepend a custom log message.
-*
-* @example
-* ```ts
-* import { Effect } from "effect"
-*
-* const task = Effect.fail("boom")
-*
-* const program = task.pipe(Effect.ignoreCause)
-* const programLog = task.pipe(Effect.ignoreCause({ log: true, message: "Ignoring failure cause" }))
-* ```
-*
-* @since 4.0.0
-* @category Error Handling
-*/
-const ignoreCause = ignoreCause$1;
-/**
 * Replaces the original failure with a success value, ensuring the effect
 * cannot fail.
 *
@@ -15655,7 +15660,7 @@ const timeout = timeout$1;
 * @since 3.1.0
 * @category Delays & Timeouts
 */
-const timeoutOrElse$1 = timeoutOrElse$2;
+const timeoutOrElse = timeoutOrElse$1;
 /**
 * Returns an effect that is delayed from this effect by the specified
 * `Duration`.
@@ -26761,7 +26766,7 @@ const offerAllUnsafe = (self, messages) => {
 * @category Completion
 * @since 4.0.0
 */
-const fail$4 = (self, error) => failCause$2(self, causeFail(error));
+const fail$4 = (self, error) => failCause$1(self, causeFail(error));
 /**
 * Fail the queue with a cause. If the queue is already done, `false` is
 * returned.
@@ -26788,7 +26793,7 @@ const fail$4 = (self, error) => failCause$2(self, causeFail(error));
 * @category Completion
 * @since 4.0.0
 */
-const failCause$2 = /* @__PURE__ */ dual(2, (self, cause) => sync$2(() => failCauseUnsafe(self, cause)));
+const failCause$1 = /* @__PURE__ */ dual(2, (self, cause) => sync$2(() => failCauseUnsafe(self, cause)));
 /**
 * Fail the queue with a cause synchronously. If the queue is already done, `false` is
 * returned.
@@ -26865,7 +26870,7 @@ const failCauseUnsafe = (self, cause) => {
 * @category Completion
 * @since 4.0.0
 */
-const end = (self) => failCause$2(self, causeFail(Done$1()));
+const end = (self) => failCause$1(self, causeFail(Done$1()));
 /**
 * Signal that the queue is complete synchronously. If the queue is already done, `false` is
 * returned.
@@ -27509,7 +27514,7 @@ const ChannelProto = {
 */
 const fromTransform$1 = (transform) => {
 	const self = Object.create(ChannelProto);
-	self.transform = (upstream, scope) => catchCause$2(transform(upstream, scope), (cause) => succeed$4(failCause$3(cause)));
+	self.transform = (upstream, scope) => catchCause$1(transform(upstream, scope), (cause) => succeed$4(failCause$2(cause)));
 	return self;
 };
 /**
@@ -27801,7 +27806,7 @@ const fail$3 = (error) => fromPull$1(succeed$4(fail$6(error)));
 * @since 2.0.0
 * @category constructors
 */
-const failCause$1 = (cause) => fromPull$1(failCause$3(cause));
+const failCause = (cause) => fromPull$1(failCause$2(cause));
 /**
 * Constructs a channel that fails immediately with the specified defect.
 *
@@ -27825,7 +27830,7 @@ const failCause$1 = (cause) => fromPull$1(failCause$3(cause));
 * @since 2.0.0
 * @category constructors
 */
-const die$1 = (defect) => failCause$1(die$3(defect));
+const die$1 = (defect) => failCause(die$3(defect));
 /**
 * Use an effect to write a single value to the channel.
 *
@@ -28284,17 +28289,17 @@ const mapEffectConcurrent = (self, f, options) => fromTransformBracket(fnUntrace
 		const semaphore = makeUnsafe$9(concurrencyN);
 		const release = constant(semaphore.release(1));
 		const handle = matchCauseEffect({
-			onFailure: (cause) => flatMap$5(failCause$2(queue, cause), release),
+			onFailure: (cause) => flatMap$5(failCause$1(queue, cause), release),
 			onSuccess: (value) => flatMap$5(offer(queue, value), release)
 		});
 		yield* semaphore.take(1).pipe(flatMap$5(() => pull), flatMap$5((value) => {
 			trackFiber(runFork(handle(f(value, i++))));
 			return void_$2;
-		}), forever({ disableYield: true }), catchCause$2((cause) => semaphore.withPermits(concurrencyN - 1)(failCause$2(queue, cause))), forkIn(forkedScope));
+		}), forever({ disableYield: true }), catchCause$1((cause) => semaphore.withPermits(concurrencyN - 1)(failCause$1(queue, cause))), forkIn(forkedScope));
 	} else {
 		const effects = yield* bounded(concurrencyN - 2);
 		yield* addFinalizer$1(forkedScope, shutdown(queue));
-		yield* take$1(effects).pipe(flatten$1, flatMap$5((value) => offer(queue, value)), forever({ disableYield: true }), catchCause$2((cause) => failCause$2(queue, cause)), forkIn(forkedScope));
+		yield* take$1(effects).pipe(flatten$1, flatMap$5((value) => offer(queue, value)), forever({ disableYield: true }), catchCause$1((cause) => failCause$1(queue, cause)), forkIn(forkedScope));
 		let errorCause;
 		const onExit = (exit) => {
 			if (exit._tag === "Success") return;
@@ -28302,12 +28307,12 @@ const mapEffectConcurrent = (self, f, options) => fromTransformBracket(fnUntrace
 			failCauseUnsafe(queue, exit.cause);
 		};
 		yield* pull.pipe(flatMap$5((value) => {
-			if (errorCause) return failCause$3(errorCause);
+			if (errorCause) return failCause$2(errorCause);
 			const fiber = runFork(f(value, i++));
 			trackFiber(fiber);
 			fiber.addObserver(onExit);
 			return offer(effects, join$2(fiber));
-		}), forever({ disableYield: true }), catchCause$2((cause) => offer(effects, failCause$5(cause)).pipe(andThen(failCause$2(effects, cause)))), forkIn(forkedScope));
+		}), forever({ disableYield: true }), catchCause$1((cause) => offer(effects, failCause$4(cause)).pipe(andThen(failCause$1(effects, cause)))), forkIn(forkedScope));
 	}
 	return take$1(queue);
 }));
@@ -28506,14 +28511,14 @@ const filterMapArrayEffect = /* @__PURE__ */ dual(2, (self, filter) => transform
 * @since 4.0.0
 * @category Error handling
 */
-const catchCause$1 = /* @__PURE__ */ dual(2, (self, f) => fromTransform$1((upstream, scope) => {
+const catchCause = /* @__PURE__ */ dual(2, (self, f) => fromTransform$1((upstream, scope) => {
 	let forkedScope = forkUnsafe(scope);
 	return map$10(toTransform(self)(upstream, forkedScope), (pull) => {
-		let currentPull = pull.pipe(catchCause$2((cause) => {
-			if (isDoneCause(cause)) return failCause$3(cause);
+		let currentPull = pull.pipe(catchCause$1((cause) => {
+			if (isDoneCause(cause)) return failCause$2(cause);
 			const toClose = forkedScope;
 			forkedScope = forkUnsafe(scope);
-			return close(toClose, failCause$5(cause)).pipe(andThen(toTransform(f(cause))(upstream, forkedScope)), flatMap$5((childPull) => {
+			return close(toClose, failCause$4(cause)).pipe(andThen(toTransform(f(cause))(upstream, forkedScope)), flatMap$5((childPull) => {
 				currentPull = childPull;
 				return childPull;
 			}));
@@ -28525,9 +28530,9 @@ const catchCause$1 = /* @__PURE__ */ dual(2, (self, f) => fromTransform$1((upstr
 * @since 4.0.0
 * @category Error handling
 */
-const catchCauseFilter = /* @__PURE__ */ dual(3, (self, filter, f) => catchCause$1(self, (cause) => {
+const catchCauseFilter = /* @__PURE__ */ dual(3, (self, filter, f) => catchCause(self, (cause) => {
 	const result = filter(cause);
-	return isFailure$4(result) ? failCause$1(result.failure) : f(result.success, cause);
+	return isFailure$4(result) ? failCause(result.failure) : f(result.success, cause);
 }));
 const catch_$1 = /* @__PURE__ */ dual(2, (self, f) => catchCauseFilter(self, findError, (e) => f(e)));
 /**
@@ -28707,18 +28712,18 @@ const mergeAll$1 = /* @__PURE__ */ dual(2, (channels, { bufferSize = 16, concurr
 			}
 			const fiber = yield* childPull.pipe(tap$1(() => yieldNow), flatMap$5((value) => offer(queue, value)), forever({ disableYield: true }), onError(fnUntraced(function* (cause) {
 				const halt = filterDone(cause);
-				yield* exit(close(childScope, !isFailure$4(halt) ? succeed$7(halt.success.value) : failCause$5(halt.failure)));
+				yield* exit(close(childScope, !isFailure$4(halt) ? succeed$7(halt.success.value) : failCause$4(halt.failure)));
 				if (!fibers.has(fiber)) return;
 				fibers.delete(fiber);
 				if (semaphore) yield* semaphore.release(1);
 				if (fibers.size === 0) yield* doneLatch.open;
 				if (isSuccess$5(halt)) return;
-				return yield* failCause$2(queue, cause);
+				return yield* failCause$1(queue, cause);
 			})), forkChild);
 			doneLatch.closeUnsafe();
 			fibers.add(fiber);
 		}
-	}).pipe(catchCause$2((cause) => doneLatch.whenOpen(failCause$2(queue, cause))), forkIn(forkedScope));
+	}).pipe(catchCause$1((cause) => doneLatch.whenOpen(failCause$1(queue, cause))), forkIn(forkedScope));
 	return take$1(queue);
 })));
 /**
@@ -28756,12 +28761,12 @@ const merge$5 = /* @__PURE__ */ dual((args) => isChannel(args[0]) && isChannel(a
 	let done = 0;
 	function onExit(side, cause) {
 		done++;
-		if (!isDoneCause(cause)) return failCause$2(queue, cause);
+		if (!isDoneCause(cause)) return failCause$1(queue, cause);
 		switch (strategy) {
-			case "both": return done === 2 ? failCause$2(queue, cause) : void_$2;
+			case "both": return done === 2 ? failCause$1(queue, cause) : void_$2;
 			case "left":
-			case "right": return side === strategy ? failCause$2(queue, cause) : void_$2;
-			case "either": return failCause$2(queue, cause);
+			case "right": return side === strategy ? failCause$1(queue, cause) : void_$2;
+			case "either": return failCause$1(queue, cause);
 		}
 	}
 	const runSide = (side, channel, scope) => toTransform(channel)(upstream, scope).pipe(flatMap$5((pull) => pull.pipe(flatMap$5((value) => offer(queue, value)), forever)), onError((cause) => andThen(close(scope, doneExitFromCause(cause)), onExit(side, cause))), forkIn(forkedScope));
@@ -29101,7 +29106,7 @@ const toPull$1 = /* @__PURE__ */ fnUntraced(function* (self) {
 	const context = yield* services();
 	const scope = get$16(context, Scope);
 	return (yield* toTransform(self)(done(), scope)).pipe(provideServices$2(context), semaphore.withPermits(1));
-}, /* @__PURE__ */ catchCause$2((cause) => succeed$4(failCause$3(cause))));
+}, /* @__PURE__ */ catchCause$1((cause) => succeed$4(failCause$2(cause))));
 /**
 * Converts a channel to a Pull within an existing scope.
 *
@@ -30376,30 +30381,6 @@ const suspend$1 = (stream) => fromChannel(suspend$2(() => stream().channel));
 */
 const fail$2 = (error) => fromChannel(fail$3(error));
 /**
-* Creates a stream that fails with the specified `Cause`.
-*
-* @example
-* ```ts
-* import { Cause, Console, Effect, Stream } from "effect"
-*
-* const stream = Stream.failCause(Cause.fail("Database connection failed")).pipe(
-*   Stream.catchCause(() => Stream.succeed("recovered"))
-* )
-*
-* const program = Effect.gen(function*() {
-*   const values = yield* Stream.runCollect(stream)
-*   yield* Console.log(values)
-*   // Output: [ "recovered" ]
-* })
-*
-* Effect.runPromise(program)
-* ```
-*
-* @since 2.0.0
-* @category Constructors
-*/
-const failCause = (cause) => fromChannel(failCause$1(cause));
-/**
 * The stream that dies with the specified defect.
 *
 * @example
@@ -30931,43 +30912,6 @@ const switchMap = /* @__PURE__ */ dual((args) => isStream(args[0]), (self, f, op
 */
 const flatten = /* @__PURE__ */ dual((args) => isStream(args[0]), (self, options) => flatMap$3(self, identity, options));
 /**
-* @since 2.0.0
-* @category Rate Limiting
-*/
-const timeoutOrElse = /* @__PURE__ */ dual(2, (self, options) => {
-	const duration = fromInputUnsafe(options.duration);
-	if (!isFinite$2(duration)) return self;
-	if (isZero$1(duration)) return suspend$1(options.orElse);
-	const timeoutSymbol = Symbol();
-	return catchCause(suspend$1(() => {
-		const clock = getCurrent().getRef(Clock);
-		const durationMs = toMillis(duration);
-		let deadline = void 0;
-		const latch = makeUnsafe$10(false);
-		return merge$4(transformPull(self, (pull, _scope) => suspend$3(() => {
-			deadline = clock.currentTimeMillisUnsafe() + durationMs;
-			latch.openUnsafe();
-			return pull;
-		}).pipe(map$10((arr) => {
-			latch.closeUnsafe();
-			deadline = void 0;
-			return arr;
-		}), succeed$4)), fromEffectDrain(gen(function* () {
-			while (true) {
-				yield* latch.await;
-				if (deadline === void 0) continue;
-				yield* sleep(deadline - clock.currentTimeMillisUnsafe());
-				if (deadline === void 0) continue;
-				if (deadline - clock.currentTimeMillisUnsafe() > 0) continue;
-				return yield* die$2(timeoutSymbol);
-			}
-		})), { haltStrategy: "left" });
-	}), (cause) => {
-		if (cause.reasons.find((r) => r._tag === "Die" && r.defect === timeoutSymbol)) return options.orElse();
-		return failCause(cause);
-	});
-});
-/**
 * Submerges the iterables emitted by this stream into the stream's structure.
 *
 * **Previously Known As**
@@ -31137,43 +31081,6 @@ const filterMap$2 = /* @__PURE__ */ dual(2, (self, filter) => fromChannel(filter
 * @category Filtering
 */
 const filterMapEffect = /* @__PURE__ */ dual(2, (self, filter) => fromChannel(filterMapArrayEffect(toChannel(self), filter)));
-/**
-* Switches over to the stream produced by the provided function in case this
-* one fails. Allows recovery from all causes of failure, including
-* interruption if the stream is uninterruptible.
-*
-* **Previously Known As**
-*
-* This API replaces the following from Effect 3.x:
-*
-* - `Stream.catchAllCause`
-*
-* @example
-* ```ts
-* import { Console, Effect, Stream } from "effect"
-*
-* const stream = Stream.make(1, 2).pipe(
-*   Stream.concat(Stream.fail("Oops!")),
-*   Stream.concat(Stream.make(3, 4))
-* )
-*
-* const recovered = stream.pipe(
-*   Stream.catchCause(() => Stream.make(999))
-* )
-*
-* const program = Effect.gen(function*() {
-*   const values = yield* Stream.runCollect(recovered)
-*   yield* Console.log(values)
-* })
-*
-* Effect.runPromise(program)
-* // Output: [ 1, 2, 999 ]
-* ```
-*
-* @since 4.0.0
-* @category Error Handling
-*/
-const catchCause = /* @__PURE__ */ dual(2, (self, f) => self.channel.pipe(catchCause$1((cause) => f(cause).channel), fromChannel));
 const catch_ = /* @__PURE__ */ dual(2, (self, f) => fromChannel(catch_$1(self.channel, (error) => f(error).channel)));
 /**
 * Recovers from errors that match a predicate by switching to a recovery stream.
@@ -31581,7 +31488,7 @@ const debounce = /* @__PURE__ */ dual(2, (self, duration) => transformPull(self,
 				const eff = succeed$4(of$1(lastNonEmpty(lastArr)));
 				lastArr = void 0;
 				return eff;
-			} else if (cause) return failCause$3(cause);
+			} else if (cause) return failCause$2(cause);
 			return loop();
 		});
 	});
@@ -31592,7 +31499,7 @@ const debounce = /* @__PURE__ */ dual(2, (self, duration) => transformPull(self,
 				lastArr = void 0;
 				return eff;
 			}
-			return failCause$3(cause);
+			return failCause$2(cause);
 		}
 		pullLatch.openUnsafe();
 		return emitLatch.whenOpen(sleepLoop);
@@ -36812,7 +36719,7 @@ function Exit(value, error, defect) {
 					onFailure: (issue) => new Composite(ast, some$2(input), [new Pointer(["value"], issue)])
 				});
 				case "Failure": return mapBothEager(decodeUnknownEffect$1(cause)(input.cause, options), {
-					onSuccess: failCause$5,
+					onSuccess: failCause$4,
 					onFailure: (issue) => new Composite(ast, some$2(input), [new Pointer(["cause"], issue)])
 				});
 			}
@@ -36832,7 +36739,7 @@ function Exit(value, error, defect) {
 			_tag: Literal("Failure"),
 			cause: Cause(error, defect)
 		})]), transform$3({
-			decode: (e) => e._tag === "Success" ? succeed$7(e.value) : failCause$5(e.cause),
+			decode: (e) => e._tag === "Success" ? succeed$7(e.value) : failCause$4(e.cause),
 			encode: (exit) => isSuccess$3(exit) ? {
 				_tag: "Success",
 				value: exit.value
@@ -36844,7 +36751,7 @@ function Exit(value, error, defect) {
 		toArbitrary: ([value, error, defect]) => (fc, ctx) => fc.oneof(ctx?.isSuspend ? {
 			maxDepth: 2,
 			depthIdentifier: "Exit"
-		} : {}, value.map((v) => succeed$7(v)), causeToArbitrary(error, defect)(fc, ctx).map((cause) => failCause$5(cause))),
+		} : {}, value.map((v) => succeed$7(v)), causeToArbitrary(error, defect)(fc, ctx).map((cause) => failCause$4(cause))),
 		toEquivalence: ([value, error, defect]) => {
 			const cause = causeToEquivalence(error, defect);
 			return (a, b) => {
@@ -57063,7 +56970,7 @@ const makeUnsafe = (scope, value) => {
 */
 const fromAcquire = /* @__PURE__ */ fnUntraced(function* (acquire) {
 	const scope = makeUnsafe$13();
-	const self = makeUnsafe(scope, yield* acquire.pipe(provide$4(scope), tapCause((cause) => close(scope, failCause$5(cause)))));
+	const self = makeUnsafe(scope, yield* acquire.pipe(provide$4(scope), tapCause((cause) => close(scope, failCause$4(cause)))));
 	yield* addFinalizer((exit) => close(self.backing.backing.ref.current[0], exit));
 	return self;
 }, uninterruptible);
@@ -57095,7 +57002,7 @@ const get$7 = (self) => sync(() => getUnsafe(self));
 const set$4 = /* @__PURE__ */ dual(2, /* @__PURE__ */ fnUntraced(function* (self, acquire) {
 	yield* close(self.backing.backing.ref.current[0], void_$3);
 	const scope = makeUnsafe$13();
-	const value = yield* acquire.pipe(provide$4(scope), tapCause((cause) => close(scope, failCause$5(cause))));
+	const value = yield* acquire.pipe(provide$4(scope), tapCause((cause) => close(scope, failCause$4(cause))));
 	self.backing.backing.ref.current = [scope, value];
 }, uninterruptible, (effect, self) => self.backing.semaphore.withPermit(effect)));
 //#endregion
@@ -59538,7 +59445,7 @@ const layer$30 = /* @__PURE__ */ effect$1(ChildProcessSpawner, /* @__PURE__ */ g
 	});
 	const withTimeout = (childProcess, command, options) => (kill) => {
 		const killSignal = options?.killSignal ?? "SIGTERM";
-		return isUndefined(options?.forceKillAfter) ? kill(command, childProcess, killSignal) : timeoutOrElse$1(kill(command, childProcess, killSignal), {
+		return isUndefined(options?.forceKillAfter) ? kill(command, childProcess, killSignal) : timeoutOrElse(kill(command, childProcess, killSignal), {
 			duration: options.forceKillAfter,
 			orElse: () => kill(command, childProcess, "SIGKILL")
 		});
@@ -61087,7 +60994,7 @@ const make$40 = (f) => makeWith((effect) => flatMap$5(effect, (request) => withF
 			},
 			onFailure(cause) {
 				if (hasInterrupts(cause)) controller.abort();
-				return failCause$3(cause);
+				return failCause$2(cause);
 			}
 		}));
 	}
@@ -61115,7 +61022,7 @@ const make$40 = (f) => makeWith((effect) => flatMap$5(effect, (request) => withF
 			},
 			onFailure(cause) {
 				if (!scopedController && hasInterrupts(cause)) controller.abort();
-				return failCause$3(cause);
+				return failCause$2(cause);
 			}
 		})));
 	});
@@ -62037,7 +61944,7 @@ const notFound = /* @__PURE__ */ empty$2({ status: 404 });
 */
 const toResponseOrElse = (u, orElse) => {
 	if (isHttpServerResponse(u)) return succeed$4(u);
-	else if (isRespondable(u)) return catchCause$2(u[symbol](), () => succeed$4(orElse));
+	else if (isRespondable(u)) return catchCause$1(u[symbol](), () => succeed$4(orElse));
 	else if (isSchemaError(u)) return succeed$4(badRequest);
 	else if (isNoSuchElementError(u)) return succeed$4(notFound);
 	return succeed$4(orElse);
@@ -62048,7 +61955,7 @@ const toResponseOrElse = (u, orElse) => {
 */
 const toResponseOrElseDefect = (u, orElse) => {
 	if (isHttpServerResponse(u)) return succeed$4(u);
-	else if (isRespondable(u)) return catchCause$2(u[symbol](), () => succeed$4(orElse));
+	else if (isRespondable(u)) return catchCause$1(u[symbol](), () => succeed$4(orElse));
 	return succeed$4(orElse);
 };
 //#endregion
@@ -62419,7 +62326,7 @@ const fromWebSocket = (acquire, options) => withFiber((fiber) => {
 				open = true;
 				doneUnsafe(openDeferred, void_$2);
 			}, { once: true });
-			yield* _await(openDeferred).pipe(timeoutOrElse$1({
+			yield* _await(openDeferred).pipe(timeoutOrElse({
 				duration: options?.openTimeout ?? 1e4,
 				orElse: () => fail$6(new SocketError({ reason: new SocketOpenError({
 					kind: "Timeout",
@@ -63626,7 +63533,7 @@ const toHandled = (self, handleResponse, middleware) => {
 		reportCauseUnsafe(fiber, cause);
 		const request = getUnsafe$4(fiber.services, HttpServerRequest);
 		const handler = requestPreResponseHandlers.get(request.source);
-		const cont = cause.reasons.length === 0 ? succeed$4(response) : failCause$3(cause);
+		const cont = cause.reasons.length === 0 ? succeed$4(response) : failCause$2(cause);
 		if (handler === void 0) {
 			request[handledSymbol] = true;
 			return flatMapEager(handleResponse(request, response), () => cont);
@@ -64418,7 +64325,7 @@ const makeNoSerialization = /* @__PURE__ */ fnUntraced(function* (group, options
 	const clearEntries = fnUntraced(function* (exit) {
 		for (const [id, entry] of entries) {
 			entries.delete(id);
-			if (entry._tag === "Queue") yield* exit._tag === "Success" ? end(entry.queue) : failCause$2(entry.queue, exit.cause);
+			if (entry._tag === "Queue") yield* exit._tag === "Success" ? end(entry.queue) : failCause$1(entry.queue, exit.cause);
 			else entry.resume(exit);
 		}
 	});
@@ -64514,7 +64421,7 @@ const makeNoSerialization = /* @__PURE__ */ fnUntraced(function* (group, options
 				sampled: span.sampled
 			} : {},
 			headers: merge$3(fiber.getRef(CurrentHeaders), headers)
-		}).pipe(span ? withParentSpan(span, { captureStackTrace: false }) : identity, catchCause$2((error) => failCause$2(queue, error)), interruptible, forkIn(scope, { startImmediately: true }));
+		}).pipe(span ? withParentSpan(span, { captureStackTrace: false }) : identity, catchCause$1((error) => failCause$1(queue, error)), interruptible, forkIn(scope, { startImmediately: true }));
 		return queue;
 	});
 	const getRpcClientMiddleware = (rpc) => {
@@ -64563,7 +64470,7 @@ const makeNoSerialization = /* @__PURE__ */ fnUntraced(function* (group, options
 					},
 					context: entry.context,
 					discard: false
-				})) : identity, catchCause$2((cause) => failCause$2(entry.queue, cause)));
+				})) : identity, catchCause$1((cause) => failCause$1(entry.queue, cause)));
 			}
 			case "Exit": {
 				const requestId = message.requestId;
@@ -64574,7 +64481,7 @@ const makeNoSerialization = /* @__PURE__ */ fnUntraced(function* (group, options
 					entry.resume(message.exit);
 					return void_$2;
 				}
-				return message.exit._tag === "Success" ? end(entry.queue) : failCause$2(entry.queue, message.exit.cause);
+				return message.exit._tag === "Success" ? end(entry.queue) : failCause$1(entry.queue, message.exit.cause);
 			}
 			case "Defect": return clearEntries(die$4(message.defect));
 			case "ClientEnd": return void_$2;
@@ -64663,7 +64570,7 @@ const make$27 = /* @__PURE__ */ fnUntraced(function* (group, options) {
 					_tag: "Exit",
 					clientId: 0,
 					requestId: RequestId(message.requestId),
-					exit: failCause$5(cause)
+					exit: failCause$4(cause)
 				})));
 			}
 			case "Exit": {
@@ -64682,7 +64589,7 @@ const make$27 = /* @__PURE__ */ fnUntraced(function* (group, options) {
 						_tag: "Exit",
 						clientId: 0,
 						requestId,
-						exit: failCause$5(cause)
+						exit: failCause$4(cause)
 					})
 				}));
 			}
@@ -64702,7 +64609,7 @@ const make$27 = /* @__PURE__ */ fnUntraced(function* (group, options) {
 			}
 			default: return void_$2;
 		}
-	}).pipe(catchCause$2(logError), interruptible, forkScoped);
+	}).pipe(catchCause$1(logError), interruptible, forkScoped);
 	return client;
 });
 const rpcSchemasCache = /* @__PURE__ */ new WeakMap();
@@ -64953,7 +64860,7 @@ const make$25 = ({ dumpSchema = () => void_$2 }) => ({ loader, schemaDirectory,
 	});
 	yield* ensureMigrationsTable;
 	const completed = yield* pipe$1(sql.withTransaction(run), catchTag$1("MigrationError", (_) => _.kind === "Locked" ? as$1(logDebug(_.message), []) : fail$6(_)));
-	if (schemaDirectory && completed.length > 0) yield* dumpSchema(`${schemaDirectory}/_schema.sql`, table).pipe(catchCause$2((cause) => logInfo("Could not dump schema", cause)));
+	if (schemaDirectory && completed.length > 0) yield* dumpSchema(`${schemaDirectory}/_schema.sql`, table).pipe(catchCause$1((cause) => logInfo("Could not dump schema", cause)));
 	return completed;
 });
 const migrationOrder = /* @__PURE__ */ make$91(([a], [b]) => Number$5(a, b));
@@ -90910,7 +90817,7 @@ const make$20 = /* @__PURE__ */ fnUntraced(function* (evaluate, options) {
 			else resume(void_$2);
 		});
 	}).pipe(cached$1);
-	const preemptiveShutdown = options.disablePreemptiveShutdown ? void_$2 : timeoutOrElse$1(shutdown, {
+	const preemptiveShutdown = options.disablePreemptiveShutdown ? void_$2 : timeoutOrElse(shutdown, {
 		duration: options.gracefulShutdownTimeout ?? seconds(20),
 		orElse: () => void_$2
 	});
@@ -91182,7 +91089,7 @@ const handleCause = (nodeResponse, originalResponse) => (originalCause) => flatM
 	const headersSent = nodeResponse.headersSent;
 	if (!headersSent) nodeResponse.writeHead(response.status);
 	if (!nodeResponse.writableEnded) nodeResponse.end();
-	return failCause$3(headersSent ? combine$1(originalCause, die$3(originalResponse)) : cause);
+	return failCause$2(headersSent ? combine$1(originalCause, die$3(originalResponse)) : cause);
 });
 //#endregion
 //#region node_modules/.pnpm/@effect+platform-node@4.0.0-beta.40_effect@4.0.0-beta.40_ioredis@5.10.0/node_modules/@effect/platform-node/dist/NodeRuntime.js
@@ -91778,7 +91685,7 @@ const getOrThrow = (self) => getOrThrowWith$1(value(self), () => new NoSuchEleme
 const toExit = (self) => {
 	switch (self._tag) {
 		case "Success": return succeed$7(self.value);
-		case "Failure": return failCause$5(self.cause);
+		case "Failure": return failCause$4(self.cause);
 		default: return fail$8(new NoSuchElementError());
 	}
 };
@@ -92206,7 +92113,7 @@ const LifetimeProto = {
 		if (options?.suspendOnWaiting && result.waiting) return never$5;
 		switch (result._tag) {
 			case "Initial": return never$5;
-			case "Failure": return failCause$5(result.cause);
+			case "Failure": return failCause$4(result.cause);
 			case "Success": return succeed$4(result.value);
 		}
 	},
@@ -92282,7 +92189,7 @@ const LifetimeProto = {
 		}));
 	},
 	streamResult(atom, options) {
-		return this.stream(atom, options).pipe(filter$3(isNotInitial), mapEffect$1((result) => result._tag === "Success" ? succeed$4(result.value) : failCause$3(result.cause)));
+		return this.stream(atom, options).pipe(filter$3(isNotInitial), mapEffect$1((result) => result._tag === "Success" ? succeed$4(result.value) : failCause$2(result.cause)));
 	},
 	dispose() {
 		this.disposed = true;
@@ -92625,7 +92532,7 @@ function makeStream(ctx, stream, initialValue, services = empty$16()) {
 		step(arr) {
 			ctx.setSelf(success(lastNonEmpty(arr), { waiting: true }));
 		}
-	}))).pipe(catchCause$2((cause) => {
+	}))).pipe(catchCause$1((cause) => {
 		if (isDoneCause(cause)) pipe$1(ctx.self(), flatMap$9(value), match$10({
 			onNone: () => ctx.setSelf(failWithPrevious(new NoSuchElementError(), { previous: ctx.self() })),
 			onSome: (a) => ctx.setSelf(success(a))
@@ -92725,7 +92632,7 @@ const makeStreamPullEffect = (get, pullSignal, create, options) => flatMap$5(toP
 					items: acc
 				});
 			}
-			return failCause$3(cause);
+			return failCause$2(cause);
 		},
 		onSuccess(chunk) {
 			let items;
@@ -179460,7 +179367,7 @@ var IssueSource = class IssueSource extends Service$1()("lalph/IssueSource") {
 			const refs = yield* make$48({
 				lookup: fnUntraced(function* (projectId) {
 					const ref = yield* make$47(IssuesChange.Internal({ issues: yield* pipe$1(impl.issues(projectId), orElseSucceed(empty$17)) }));
-					yield* changes(ref).pipe(switchMap((_) => impl.issues(projectId).pipe(tap$1((issues) => set$3(ref, IssuesChange.External({ issues }))), ignoreCause, delay(seconds(30)), fromEffectDrain)), runDrain, forkScoped);
+					yield* changes(ref).pipe(switchMap((_) => impl.issues(projectId).pipe(tap$1((issues) => set$3(ref, IssuesChange.External({ issues }))), delay(seconds(30)), sandbox, retry$1(forever$1), fromEffectDrain)), runDrain, forkScoped);
 					return ref;
 				}),
 				capacity: Number.MAX_SAFE_INTEGER
@@ -182830,7 +182737,7 @@ var ji = Bt, Ii = Object.assign(Qe, { sync: Bt }), zi = Ut, Bi = Object.assign(e
 });
 Ze.glob = Ze;
 //#endregion
-//#region node_modules/.pnpm/clanka@0.2.38_@effect+ai-openai-compat@4.0.0-beta.40_effect@4.0.0-beta.40__@effect+ai-o_8b26d89888c4b7e6bcb90ea99ae4f7cf/node_modules/clanka/dist/ApplyPatch.js
+//#region node_modules/.pnpm/clanka@0.2.41_@effect+ai-openai-compat@4.0.0-beta.40_effect@4.0.0-beta.40__@effect+ai-o_6376d741d1c21dc6594a81ad54906cf7/node_modules/clanka/dist/ApplyPatch.js
 /**
 * @since 1.0.0
 */
@@ -183286,10 +183193,7 @@ function assignProp(target, prop, value) {
 }
 function mergeDefs(...defs) {
 	const mergedDescriptors = {};
-	for (const def of defs) {
-		const descriptors = Object.getOwnPropertyDescriptors(def);
-		Object.assign(mergedDescriptors, descriptors);
-	}
+	for (const def of defs) Object.assign(mergedDescriptors, Object.getOwnPropertyDescriptors(def));
 	return Object.defineProperties({}, mergedDescriptors);
 }
 function esc(str) {
@@ -186496,7 +186400,7 @@ const optionalProcessor = (schema, ctx, _json, params) => {
 	seen.ref = def.innerType;
 };
 //#endregion
-//#region node_modules/.pnpm/@modelcontextprotocol+sdk@1.27.1_zod@4.3.6/node_modules/@modelcontextprotocol/sdk/dist/esm/server/zod-compat.js
+//#region node_modules/.pnpm/@modelcontextprotocol+sdk@1.28.0_zod@4.3.6/node_modules/@modelcontextprotocol/sdk/dist/esm/server/zod-compat.js
 function isZ4Schema(s) {
 	return !!s._zod;
 }
@@ -187270,7 +187174,7 @@ function number(params) {
 	return /* @__PURE__ */ _coercedNumber(ZodNumber, params);
 }
 //#endregion
-//#region node_modules/.pnpm/@modelcontextprotocol+sdk@1.27.1_zod@4.3.6/node_modules/@modelcontextprotocol/sdk/dist/esm/types.js
+//#region node_modules/.pnpm/@modelcontextprotocol+sdk@1.28.0_zod@4.3.6/node_modules/@modelcontextprotocol/sdk/dist/esm/types.js
 const LATEST_PROTOCOL_VERSION = "2025-11-25";
 const SUPPORTED_PROTOCOL_VERSIONS = [
 	LATEST_PROTOCOL_VERSION,
@@ -188463,7 +188367,7 @@ var UrlElicitationRequiredError = class extends McpError {
 	}
 };
 //#endregion
-//#region node_modules/.pnpm/@modelcontextprotocol+sdk@1.27.1_zod@4.3.6/node_modules/@modelcontextprotocol/sdk/dist/esm/experimental/tasks/interfaces.js
+//#region node_modules/.pnpm/@modelcontextprotocol+sdk@1.28.0_zod@4.3.6/node_modules/@modelcontextprotocol/sdk/dist/esm/experimental/tasks/interfaces.js
 /**
 * Experimental task interfaces for MCP SDK.
 * WARNING: These APIs are experimental and may change without notice.
@@ -188480,7 +188384,7 @@ function isTerminal(status) {
 	return status === "completed" || status === "failed" || status === "cancelled";
 }
 //#endregion
-//#region node_modules/.pnpm/@modelcontextprotocol+sdk@1.27.1_zod@4.3.6/node_modules/@modelcontextprotocol/sdk/dist/esm/server/zod-json-schema-compat.js
+//#region node_modules/.pnpm/@modelcontextprotocol+sdk@1.28.0_zod@4.3.6/node_modules/@modelcontextprotocol/sdk/dist/esm/server/zod-json-schema-compat.js
 function getMethodLiteral(schema) {
 	const methodSchema = getObjectShape(schema)?.method;
 	if (!methodSchema) throw new Error("Schema is missing a method literal");
@@ -188674,6 +188578,8 @@ var Protocol = class {
 		this._progressHandlers.clear();
 		this._taskProgressTokens.clear();
 		this._pendingDebouncedNotifications.clear();
+		for (const info of this._timeoutInfo.values()) clearTimeout(info.timeoutId);
+		this._timeoutInfo.clear();
 		for (const controller of this._requestHandlerAbortControllers.values()) controller.abort();
 		this._requestHandlerAbortControllers.clear();
 		const error = McpError.fromError(ErrorCode.ConnectionClosed, "Connection closed");
@@ -188777,7 +188683,7 @@ var Protocol = class {
 			}, capturedTransport?.sessionId);
 			else await capturedTransport?.send(errorResponse);
 		}).catch((error) => this._onerror(/* @__PURE__ */ new Error(`Failed to send response: ${error}`))).finally(() => {
-			this._requestHandlerAbortControllers.delete(request.id);
+			if (this._requestHandlerAbortControllers.get(request.id) === abortController) this._requestHandlerAbortControllers.delete(request.id);
 		});
 	}
 	_onprogress(notification) {
@@ -195411,7 +195317,7 @@ var require_dist = /* @__PURE__ */ __commonJSMin$1(((exports, module) => {
 	exports.default = formatsPlugin;
 }));
 //#endregion
-//#region node_modules/.pnpm/@modelcontextprotocol+sdk@1.27.1_zod@4.3.6/node_modules/@modelcontextprotocol/sdk/dist/esm/validation/ajv-provider.js
+//#region node_modules/.pnpm/@modelcontextprotocol+sdk@1.28.0_zod@4.3.6/node_modules/@modelcontextprotocol/sdk/dist/esm/validation/ajv-provider.js
 var import_ajv = /* @__PURE__ */ __toESM(require_ajv(), 1);
 var import_dist = /* @__PURE__ */ __toESM(require_dist(), 1);
 function createDefaultAjvInstance() {
@@ -195487,7 +195393,7 @@ var AjvJsonSchemaValidator = class {
 	}
 };
 //#endregion
-//#region node_modules/.pnpm/@modelcontextprotocol+sdk@1.27.1_zod@4.3.6/node_modules/@modelcontextprotocol/sdk/dist/esm/experimental/tasks/client.js
+//#region node_modules/.pnpm/@modelcontextprotocol+sdk@1.28.0_zod@4.3.6/node_modules/@modelcontextprotocol/sdk/dist/esm/experimental/tasks/client.js
 /**
 * Experimental client task features for MCP SDK.
 * WARNING: These APIs are experimental and may change without notice.
@@ -195660,7 +195566,7 @@ var ExperimentalClientTasks = class {
 	}
 };
 //#endregion
-//#region node_modules/.pnpm/@modelcontextprotocol+sdk@1.27.1_zod@4.3.6/node_modules/@modelcontextprotocol/sdk/dist/esm/experimental/tasks/helpers.js
+//#region node_modules/.pnpm/@modelcontextprotocol+sdk@1.28.0_zod@4.3.6/node_modules/@modelcontextprotocol/sdk/dist/esm/experimental/tasks/helpers.js
 /**
 * Experimental task capability assertion helpers.
 * WARNING: These APIs are experimental and may change without notice.
@@ -195711,7 +195617,7 @@ function assertClientRequestTaskCapability(requests, method, entityName) {
 	}
 }
 //#endregion
-//#region node_modules/.pnpm/@modelcontextprotocol+sdk@1.27.1_zod@4.3.6/node_modules/@modelcontextprotocol/sdk/dist/esm/client/index.js
+//#region node_modules/.pnpm/@modelcontextprotocol+sdk@1.28.0_zod@4.3.6/node_modules/@modelcontextprotocol/sdk/dist/esm/client/index.js
 /**
 * Elicitation default application helper. Applies defaults to the data based on the schema.
 *
@@ -196191,7 +196097,7 @@ var Client = class extends Protocol {
 	}
 };
 //#endregion
-//#region node_modules/.pnpm/@modelcontextprotocol+sdk@1.27.1_zod@4.3.6/node_modules/@modelcontextprotocol/sdk/dist/esm/shared/transport.js
+//#region node_modules/.pnpm/@modelcontextprotocol+sdk@1.28.0_zod@4.3.6/node_modules/@modelcontextprotocol/sdk/dist/esm/shared/transport.js
 /**
 * Normalizes HeadersInit to a plain Record<string, string> for manipulation.
 * Handles Headers objects, arrays of tuples, and plain objects.
@@ -196278,7 +196184,7 @@ async function pkceChallenge(length) {
 	};
 }
 //#endregion
-//#region node_modules/.pnpm/@modelcontextprotocol+sdk@1.27.1_zod@4.3.6/node_modules/@modelcontextprotocol/sdk/dist/esm/shared/auth.js
+//#region node_modules/.pnpm/@modelcontextprotocol+sdk@1.28.0_zod@4.3.6/node_modules/@modelcontextprotocol/sdk/dist/esm/shared/auth.js
 /**
 * Reusable URL validation that disallows javascript: scheme
 */
@@ -196450,7 +196356,7 @@ object({
 	token_type_hint: string().optional()
 }).strip();
 //#endregion
-//#region node_modules/.pnpm/@modelcontextprotocol+sdk@1.27.1_zod@4.3.6/node_modules/@modelcontextprotocol/sdk/dist/esm/shared/auth-utils.js
+//#region node_modules/.pnpm/@modelcontextprotocol+sdk@1.28.0_zod@4.3.6/node_modules/@modelcontextprotocol/sdk/dist/esm/shared/auth-utils.js
 /**
 * Utilities for handling OAuth resource URIs.
 */
@@ -196483,7 +196389,7 @@ function checkResourceAllowed({ requestedResource, configuredResource }) {
 	return requestedPath.startsWith(configuredPath);
 }
 //#endregion
-//#region node_modules/.pnpm/@modelcontextprotocol+sdk@1.27.1_zod@4.3.6/node_modules/@modelcontextprotocol/sdk/dist/esm/server/auth/errors.js
+//#region node_modules/.pnpm/@modelcontextprotocol+sdk@1.28.0_zod@4.3.6/node_modules/@modelcontextprotocol/sdk/dist/esm/server/auth/errors.js
 /**
 * Base class for all OAuth errors
 */
@@ -196633,7 +196539,7 @@ const OAUTH_ERRORS = {
 	[InvalidTargetError.errorCode]: InvalidTargetError
 };
 //#endregion
-//#region node_modules/.pnpm/@modelcontextprotocol+sdk@1.27.1_zod@4.3.6/node_modules/@modelcontextprotocol/sdk/dist/esm/client/auth.js
+//#region node_modules/.pnpm/@modelcontextprotocol+sdk@1.28.0_zod@4.3.6/node_modules/@modelcontextprotocol/sdk/dist/esm/client/auth.js
 var UnauthorizedError = class extends Error {
 	constructor(message) {
 		super(message ?? "Unauthorized");
@@ -196662,8 +196568,8 @@ const AUTHORIZATION_CODE_CHALLENGE_METHOD = "S256";
 */
 function selectClientAuthMethod(clientInformation, supportedMethods) {
 	const hasClientSecret = clientInformation.client_secret !== void 0;
-	if (supportedMethods.length === 0) return hasClientSecret ? "client_secret_post" : "none";
-	if ("token_endpoint_auth_method" in clientInformation && clientInformation.token_endpoint_auth_method && isClientAuthMethod(clientInformation.token_endpoint_auth_method) && supportedMethods.includes(clientInformation.token_endpoint_auth_method)) return clientInformation.token_endpoint_auth_method;
+	if ("token_endpoint_auth_method" in clientInformation && clientInformation.token_endpoint_auth_method && isClientAuthMethod(clientInformation.token_endpoint_auth_method) && (supportedMethods.length === 0 || supportedMethods.includes(clientInformation.token_endpoint_auth_method))) return clientInformation.token_endpoint_auth_method;
+	if (supportedMethods.length === 0) return hasClientSecret ? "client_secret_basic" : "none";
 	if (hasClientSecret && supportedMethods.includes("client_secret_basic")) return "client_secret_basic";
 	if (hasClientSecret && supportedMethods.includes("client_secret_post")) return "client_secret_post";
 	if (supportedMethods.includes("none")) return "none";
@@ -196796,6 +196702,7 @@ async function authInternal(provider, { serverUrl, authorizationCode, scope, res
 		});
 	}
 	const resource = await selectResourceURL(serverUrl, provider, resourceMetadata);
+	const resolvedScope = scope || resourceMetadata?.scopes_supported?.join(" ") || provider.clientMetadata.scope;
 	let clientInformation = await Promise.resolve(provider.clientInformation());
 	if (!clientInformation) {
 		if (authorizationCode !== void 0) throw new Error("Existing OAuth client information is required when exchanging an authorization code");
@@ -196810,6 +196717,7 @@ async function authInternal(provider, { serverUrl, authorizationCode, scope, res
 			const fullInformation = await registerClient(authorizationServerUrl, {
 				metadata,
 				clientMetadata: provider.clientMetadata,
+				scope: resolvedScope,
 				fetchFn
 			});
 			await provider.saveClientInformation(fullInformation);
@@ -196848,7 +196756,7 @@ async function authInternal(provider, { serverUrl, authorizationCode, scope, res
 		clientInformation,
 		state,
 		redirectUrl: provider.redirectUrl,
-		scope: scope || resourceMetadata?.scopes_supported?.join(" ") || provider.clientMetadata.scope,
+		scope: resolvedScope,
 		resource
 	});
 	await provider.saveCodeVerifier(codeVerifier);
@@ -197236,8 +197144,12 @@ async function fetchToken(provider, authorizationServerUrl, { metadata, resource
 }
 /**
 * Performs OAuth 2.0 Dynamic Client Registration according to RFC 7591.
+*
+* If `scope` is provided, it overrides `clientMetadata.scope` in the registration
+* request body. This allows callers to apply the Scope Selection Strategy (SEP-835)
+* consistently across both DCR and the subsequent authorization request.
 */
-async function registerClient(authorizationServerUrl, { metadata, clientMetadata, fetchFn }) {
+async function registerClient(authorizationServerUrl, { metadata, clientMetadata, scope, fetchFn }) {
 	let registrationUrl;
 	if (metadata) {
 		if (!metadata.registration_endpoint) throw new Error("Incompatible auth server: does not support dynamic client registration");
@@ -197246,7 +197158,10 @@ async function registerClient(authorizationServerUrl, { metadata, clientMetadata
 	const response = await (fetchFn ?? fetch)(registrationUrl, {
 		method: "POST",
 		headers: { "Content-Type": "application/json" },
-		body: JSON.stringify(clientMetadata)
+		body: JSON.stringify({
+			...clientMetadata,
+			...scope !== void 0 ? { scope } : {}
+		})
 	});
 	if (!response.ok) throw await parseErrorResponse(response);
 	return OAuthClientInformationFullSchema.parse(await response.json());
@@ -197373,7 +197288,7 @@ var EventSourceParserStream = class extends TransformStream {
 	}
 };
 //#endregion
-//#region node_modules/.pnpm/@modelcontextprotocol+sdk@1.27.1_zod@4.3.6/node_modules/@modelcontextprotocol/sdk/dist/esm/client/streamableHttp.js
+//#region node_modules/.pnpm/@modelcontextprotocol+sdk@1.28.0_zod@4.3.6/node_modules/@modelcontextprotocol/sdk/dist/esm/client/streamableHttp.js
 const DEFAULT_STREAMABLE_HTTP_RECONNECTION_OPTIONS = {
 	initialReconnectionDelay: 1e3,
 	maxReconnectionDelay: 3e4,
@@ -197703,7 +197618,7 @@ var StreamableHTTPClientTransport = class {
 	}
 };
 //#endregion
-//#region node_modules/.pnpm/clanka@0.2.38_@effect+ai-openai-compat@4.0.0-beta.40_effect@4.0.0-beta.40__@effect+ai-o_8b26d89888c4b7e6bcb90ea99ae4f7cf/node_modules/clanka/dist/McpClient.js
+//#region node_modules/.pnpm/clanka@0.2.41_@effect+ai-openai-compat@4.0.0-beta.40_effect@4.0.0-beta.40__@effect+ai-o_6376d741d1c21dc6594a81ad54906cf7/node_modules/clanka/dist/McpClient.js
 /**
 * @since 1.0.0
 */
@@ -197748,7 +197663,7 @@ const layer$13 = effect$1(McpClient, gen(function* () {
 	});
 }));
 //#endregion
-//#region node_modules/.pnpm/clanka@0.2.38_@effect+ai-openai-compat@4.0.0-beta.40_effect@4.0.0-beta.40__@effect+ai-o_8b26d89888c4b7e6bcb90ea99ae4f7cf/node_modules/clanka/dist/ExaSearch.js
+//#region node_modules/.pnpm/clanka@0.2.41_@effect+ai-openai-compat@4.0.0-beta.40_effect@4.0.0-beta.40__@effect+ai-o_6376d741d1c21dc6594a81ad54906cf7/node_modules/clanka/dist/ExaSearch.js
 /**
 * @since 1.0.0
 */
@@ -212698,7 +212613,7 @@ var require_lib = /* @__PURE__ */ __commonJSMin$1(((exports) => {
 	exports.impl = impl;
 }));
 //#endregion
-//#region node_modules/.pnpm/clanka@0.2.38_@effect+ai-openai-compat@4.0.0-beta.40_effect@4.0.0-beta.40__@effect+ai-o_8b26d89888c4b7e6bcb90ea99ae4f7cf/node_modules/clanka/dist/WebToMarkdown.js
+//#region node_modules/.pnpm/clanka@0.2.41_@effect+ai-openai-compat@4.0.0-beta.40_effect@4.0.0-beta.40__@effect+ai-o_6376d741d1c21dc6594a81ad54906cf7/node_modules/clanka/dist/WebToMarkdown.js
 /**
 * @since 1.0.0
 */
@@ -215281,7 +215196,7 @@ const Proto$2 = {
 						isFailure: false,
 						preliminary: false
 					})), updateServices((input) => merge$7(schemas.services, input)), matchCauseEffect({
-						onFailure: (cause) => failCause$2(queue, cause),
+						onFailure: (cause) => failCause$1(queue, cause),
 						onSuccess: () => end(queue)
 					}), forkChild);
 					const encodeResult = (result) => schemas.encodeResult(result).pipe(mapError$2((cause) => make$15({
@@ -215837,7 +215752,7 @@ function isEmptyParamsRecord(indexSignature) {
 	return indexSignature.parameter === string$3 && isNever(indexSignature.type);
 }
 //#endregion
-//#region node_modules/.pnpm/clanka@0.2.38_@effect+ai-openai-compat@4.0.0-beta.40_effect@4.0.0-beta.40__@effect+ai-o_8b26d89888c4b7e6bcb90ea99ae4f7cf/node_modules/clanka/dist/SemanticSearch/Service.js
+//#region node_modules/.pnpm/clanka@0.2.41_@effect+ai-openai-compat@4.0.0-beta.40_effect@4.0.0-beta.40__@effect+ai-o_6376d741d1c21dc6594a81ad54906cf7/node_modules/clanka/dist/SemanticSearch/Service.js
 /**
 * @since 1.0.0
 */
@@ -215863,7 +215778,7 @@ const maybeRemoveFile = (path) => serviceOption(SemanticSearch).pipe(flatMap$5(m
 	onSome: (service) => service.removeFile(path)
 })));
 //#endregion
-//#region node_modules/.pnpm/clanka@0.2.38_@effect+ai-openai-compat@4.0.0-beta.40_effect@4.0.0-beta.40__@effect+ai-o_8b26d89888c4b7e6bcb90ea99ae4f7cf/node_modules/clanka/dist/AgentTools.js
+//#region node_modules/.pnpm/clanka@0.2.41_@effect+ai-openai-compat@4.0.0-beta.40_effect@4.0.0-beta.40__@effect+ai-o_6376d741d1c21dc6594a81ad54906cf7/node_modules/clanka/dist/AgentTools.js
 /**
 * @since 1.0.0
 */
@@ -216135,7 +216050,7 @@ const AgentToolHandlersNoDeps = AgentToolsWithSearch.toLayer(gen(function* () {
 			return yield* execute(make$45("bash", ["-c", options.command], {
 				cwd,
 				stdin: "ignore"
-			})).pipe(timeoutOrElse$1({
+			})).pipe(timeoutOrElse({
 				duration: timeoutMs,
 				orElse: () => die$2(/* @__PURE__ */ new Error(`Command timed out after ${timeoutMs}ms`))
 			}));
@@ -216266,7 +216181,7 @@ const AgentToolHandlers = AgentToolHandlersNoDeps.pipe(provide$3([layer$12, laye
 AgentToolHandlersNoDeps.pipe(provide$3([mock(ExaSearch)({}), mock(WebToMarkdown)({})]));
 var ApplyPatchError = class extends TaggedClass$2("ApplyPatchError") {};
 //#endregion
-//#region node_modules/.pnpm/clanka@0.2.38_@effect+ai-openai-compat@4.0.0-beta.40_effect@4.0.0-beta.40__@effect+ai-o_8b26d89888c4b7e6bcb90ea99ae4f7cf/node_modules/clanka/dist/TypeBuilder.js
+//#region node_modules/.pnpm/clanka@0.2.41_@effect+ai-openai-compat@4.0.0-beta.40_effect@4.0.0-beta.40__@effect+ai-o_6376d741d1c21dc6594a81ad54906cf7/node_modules/clanka/dist/TypeBuilder.js
 const resolveDocumentation = resolveAt("documentation");
 const identifierPattern = /^[$A-Z_a-z][$0-9A-Z_a-z]*$/u;
 const Precedence = {
@@ -216539,7 +216454,7 @@ const render = (schema, options) => {
 	return printNode({ text: documentation === void 0 ? rendered.text : `${renderJsDoc(documentation, 0, printerOptions)}${printerOptions.newLine}${rendered.text}` }, printerOptions);
 };
 //#endregion
-//#region node_modules/.pnpm/clanka@0.2.38_@effect+ai-openai-compat@4.0.0-beta.40_effect@4.0.0-beta.40__@effect+ai-o_8b26d89888c4b7e6bcb90ea99ae4f7cf/node_modules/clanka/dist/ToolkitRenderer.js
+//#region node_modules/.pnpm/clanka@0.2.41_@effect+ai-openai-compat@4.0.0-beta.40_effect@4.0.0-beta.40__@effect+ai-o_6376d741d1c21dc6594a81ad54906cf7/node_modules/clanka/dist/ToolkitRenderer.js
 /**
 * @since 1.0.0
 */
@@ -216561,7 +216476,7 @@ declare function ${name}(${params}): Promise<${render(tool.successSchema)}>`);
 	}) });
 };
 //#endregion
-//#region node_modules/.pnpm/clanka@0.2.38_@effect+ai-openai-compat@4.0.0-beta.40_effect@4.0.0-beta.40__@effect+ai-o_8b26d89888c4b7e6bcb90ea99ae4f7cf/node_modules/clanka/dist/ScriptPreprocessing.js
+//#region node_modules/.pnpm/clanka@0.2.41_@effect+ai-openai-compat@4.0.0-beta.40_effect@4.0.0-beta.40__@effect+ai-o_6376d741d1c21dc6594a81ad54906cf7/node_modules/clanka/dist/ScriptPreprocessing.js
 const callTemplateTargets = ["applyPatch", "taskComplete"];
 const objectPropertyTargets = [{
 	functionName: "writeFile",
@@ -216634,6 +216549,14 @@ const findTemplateEnd = (text, start, isTerminator) => {
 	}
 	return end;
 };
+const findTemplateEndFirst = (text, start, isTerminator) => {
+	for (let index = start + 1; index < text.length; index++) {
+		if (text[index] !== "`" || isEscaped(text, index)) continue;
+		if (isTerminator(text[index + 1])) return index;
+		if (isTerminator(text[skipWhitespace(text, index + 1)])) return index;
+	}
+	return -1;
+};
 const findTypeAnnotationAssignment = (text, start) => {
 	let index = start;
 	while (index < text.length) {
@@ -216869,6 +216792,23 @@ const escapeTemplateLiteralContent = (text) => {
 	return out;
 };
 const normalizeObjectLiteralTemplateMarkers = (text) => text.replace(/\\{2,}(?=`|\$\{)/g, "\\");
+const escapeTaggedTemplateLiteralContent = (text) => {
+	if (!needsTemplateEscaping(text)) return text;
+	let out = "";
+	for (let index = 0; index < text.length; index++) {
+		const char = text[index];
+		if (char === "`" && !isEscaped(text, index)) {
+			out += "\\`";
+			continue;
+		}
+		if (char === "$" && text[index + 1] === "{" && !isEscaped(text, index)) {
+			out += "\\$";
+			continue;
+		}
+		out += char;
+	}
+	return out;
+};
 const replaceSlice = (text, start, end, replacement) => `${text.slice(0, start)}${replacement}${text.slice(end)}`;
 const rewriteTemplateContents = (script, findNext, rewrite) => {
 	let out = script;
@@ -216961,6 +216901,28 @@ const findObjectPropertyTemplate = (text, target, from) => {
 		};
 	}
 };
+const findTaggedTemplate = (text, tag, from) => {
+	let cursor = from;
+	while (cursor < text.length) {
+		const tagStart = findNextIdentifier(text, tag, cursor);
+		if (tagStart === -1) return;
+		const templateStart = skipWhitespace(text, tagStart + tag.length);
+		if (text[templateStart] !== "`") {
+			cursor = tagStart + tag.length;
+			continue;
+		}
+		const templateEnd = findTemplateEndFirst(text, templateStart, (char) => char === void 0 || char === "+" || char === "," || char === ";" || char === ")" || char === "}" || char === "]");
+		if (templateEnd === -1) {
+			cursor = templateStart + 1;
+			continue;
+		}
+		return {
+			contentStart: templateStart + 1,
+			contentEnd: templateEnd,
+			nextCursor: templateEnd + 1
+		};
+	}
+};
 const collectCallArgumentIdentifiers = (script, functionName) => {
 	const identifiers = /* @__PURE__ */ new Set();
 	let cursor = 0;
@@ -217098,6 +217060,7 @@ const collectObjectEntryMapSources = (script, valueIdentifier) => {
 };
 const rewriteDirectTemplates = (script) => {
 	let out = script;
+	out = rewriteTemplateContents(out, (text, from) => findTaggedTemplate(text, "String.raw", from), escapeTaggedTemplateLiteralContent);
 	for (const target of objectPropertyTargets) out = rewriteTemplateContents(out, (text, from) => findObjectPropertyTemplate(text, target, from), escapeTemplateLiteralContent);
 	for (const functionName of callTemplateTargets) out = rewriteTemplateContents(out, (text, from) => findDirectCallTemplate(text, functionName, from), escapeTemplateLiteralContent);
 	return out;
@@ -217123,7 +217086,7 @@ const rewriteAssignedTargets = (script) => {
 };
 const preprocessScript = (script) => rewriteAssignedTargets(rewriteDirectTemplates(script));
 //#endregion
-//#region node_modules/.pnpm/clanka@0.2.38_@effect+ai-openai-compat@4.0.0-beta.40_effect@4.0.0-beta.40__@effect+ai-o_8b26d89888c4b7e6bcb90ea99ae4f7cf/node_modules/clanka/dist/AgentExecutor.js
+//#region node_modules/.pnpm/clanka@0.2.41_@effect+ai-openai-compat@4.0.0-beta.40_effect@4.0.0-beta.40__@effect+ai-o_6376d741d1c21dc6594a81ad54906cf7/node_modules/clanka/dist/AgentExecutor.js
 /**
 * @since 1.0.0
 */
@@ -217202,7 +217165,7 @@ const makeLocal = fnUntraced(function* (options) {
 				yield* yieldNow;
 				if (running === 0) break;
 			}
-		}).pipe(ensuring$2(close(handlerScope, void_$3)), catchCause$2(logFatal), provideService$2(Console$1, console), ensuring$2(end(output)), forkScoped);
+		}).pipe(ensuring$2(close(handlerScope, void_$3)), catchCause$1(logFatal), provideService$2(Console$1, console), ensuring$2(end(output)), forkScoped);
 		return fromQueue(output);
 	}, unwrap);
 	return AgentExecutor.of({
@@ -217308,7 +217271,7 @@ var QueueWriteStream = class extends Writable {
 	}
 };
 //#endregion
-//#region node_modules/.pnpm/clanka@0.2.38_@effect+ai-openai-compat@4.0.0-beta.40_effect@4.0.0-beta.40__@effect+ai-o_8b26d89888c4b7e6bcb90ea99ae4f7cf/node_modules/clanka/dist/ScriptExtraction.js
+//#region node_modules/.pnpm/clanka@0.2.41_@effect+ai-openai-compat@4.0.0-beta.40_effect@4.0.0-beta.40__@effect+ai-o_6376d741d1c21dc6594a81ad54906cf7/node_modules/clanka/dist/ScriptExtraction.js
 const stripWrappingCodeFence = (script) => {
 	const lines = script.split(/\r?\n/);
 	if (lines.length < 2) return script;
@@ -218638,7 +218601,7 @@ const make$10 = /* @__PURE__ */ fnUntraced(function* (params) {
 			else immediateParts.push(part);
 			if (immediateParts.length > 0) yield* offerAll(queue, immediateParts);
 			for (const part of chunk) if (part.type === "tool-call" && part.providerExecuted !== true) yield* run$2(toolCallFibers, handleToolCall(part));
-		})), andThen(raceFirst(join$1(toolCallFibers), awaitEmpty(toolCallFibers))), andThen(offerAll(queue, deferredFinishParts)), andThen(end(queue)), tapCause((cause) => failCause$2(queue, cause)), forkScoped);
+		})), andThen(raceFirst(join$1(toolCallFibers), awaitEmpty(toolCallFibers))), andThen(offerAll(queue, deferredFinishParts)), andThen(end(queue)), tapCause((cause) => failCause$1(queue, cause)), forkScoped);
 		return fromQueue(queue);
 	});
 	return {
@@ -218857,7 +218820,7 @@ const applySpanTransformer = (transformer, response, options) => {
 	});
 };
 //#endregion
-//#region node_modules/.pnpm/clanka@0.2.38_@effect+ai-openai-compat@4.0.0-beta.40_effect@4.0.0-beta.40__@effect+ai-o_8b26d89888c4b7e6bcb90ea99ae4f7cf/node_modules/clanka/dist/Agent.js
+//#region node_modules/.pnpm/clanka@0.2.41_@effect+ai-openai-compat@4.0.0-beta.40_effect@4.0.0-beta.40__@effect+ai-o_6376d741d1c21dc6594a81ad54906cf7/node_modules/clanka/dist/Agent.js
 /**
 * @since 1.0.0
 */
@@ -218900,7 +218863,6 @@ ${content}
 		const subagentModel = yield* SubagentModel;
 		const modelConfig = yield* AgentModelConfig;
 		const conversationMode = yield* ConversationMode;
-		const turnTimeout = yield* TurnTimeout;
 		let finalSummary = none$4();
 		const output = yield* make$75();
 		let inputTokens = 0;
@@ -219022,13 +218984,10 @@ ${content}
 				let reasoningStarted = false;
 				let hadReasoningDelta = false;
 				let hadToolCall = false;
-				yield* pipe$1(ai.streamText({
+				yield* pipe$1(suspend$1(() => ai.streamText({
 					prompt: prompt.current,
 					toolkit: singleTool
-				}), timeoutOrElse({
-					duration: turnTimeout,
-					orElse: () => fail$2(new TimeoutError())
-				}), takeUntil((part) => {
+				})), takeUntil((part) => {
 					if ((part.type === "text-end" || part.type === "reasoning-end") && pendingMessages.size > 0) return true;
 					return false;
 				}), runForEachArray((parts) => {
@@ -219088,16 +219047,21 @@ ${content}
 					return void_$2;
 				}), retry$1({
 					while: (err) => {
+						if (err.isRetryable) {
+							maybeSend({
+								agentId,
+								part: new ErrorRetry({ error: err })
+							});
+							switch (err.reason._tag) {
+								case "ToolNotFoundError":
+								case "InvalidOutputError": update$1(prompt, concat(fromResponseParts(response).pipe(concat(`There was an error, please try again using the "execute" tool:\n\n${pretty$1(fail$7(err))}`))));
+							}
+						}
 						response = [];
-						if (err._tag === "TimeoutError") return true;
-						if (err.isRetryable) maybeSend({
-							agentId,
-							part: new ErrorRetry({ error: err })
-						});
 						return err.isRetryable;
 					},
 					schedule: retryPolicy
-				}), catchTag$1("TimeoutError", die$2), modelConfig.systemPromptTransform ? (effect) => modelConfig.systemPromptTransform(system, effect) : identity);
+				}), modelConfig.systemPromptTransform ? (effect) => modelConfig.systemPromptTransform(system, effect) : identity);
 				update$1(prompt, concat(fromResponseParts(response)));
 				if (conversationMode && !hadToolCall && pendingMessages.size === 0) finalSummary = some$2(responseToSummary(response));
 			}
@@ -219111,7 +219075,7 @@ ${content}
 				part: new ScriptDelta({ delta: script })
 			});
 			return executeScript(script);
-		}), catchCause$2((cause) => failCause$2(output, cause)), forkScoped);
+		}), catchCause$1((cause) => failCause$1(output, cause)), forkScoped);
 		yield* offer(output, new AgentStart({
 			id: opts.agentId,
 			prompt: opts.prompt,
@@ -219149,7 +219113,7 @@ ${options.toolInstructions}
 
 ${options.agentsMd}
 `;
-const generateSystemTools = (capabilities, conversationMode) => `You only have one tool available: "execute", to run javascript code to do your work.
+const generateSystemTools = (capabilities, conversationMode) => `YOU ONLY HAVE ONE TOOL AVAILABLE: "execute", to run javascript code to do your work.
 
 - Use \`console.log\` to print any output you need.
 - Use top level await.${capabilities.supportsSearch ? `
@@ -219241,15 +219205,6 @@ var ConversationMode = class ConversationMode extends Reference("clanka/Agent/Co
 	static layer = (enabled) => succeed$5(ConversationMode, enabled);
 };
 /**
-* Specify an inactivity timeout before retrying a turn.
-*
-* @since 1.0.0
-* @category Turn timeout
-*/
-var TurnTimeout = class TurnTimeout extends Reference("clanka/Agent/TurnTimeout", { defaultValue: () => minutes(2) }) {
-	static layer = (timeout) => succeed$5(TurnTimeout, fromInputUnsafe(timeout));
-};
-/**
 * @since 1.0.0
 * @category System prompts
 */
@@ -228008,7 +227963,7 @@ const makeSocket = /* @__PURE__ */ gen(function* () {
 					}
 					offerUnsafe(currentQueue, event);
 				} catch {}
-			}).pipe(catchCause$2((cause) => {
+			}).pipe(catchCause$1((cause) => {
 				tracker.clearUnsafe();
 				return currentQueue ? fail$4(currentQueue, make$15({
 					module: "OpenAiClient",
@@ -230377,7 +230332,7 @@ const transformToolCallParams = /* @__PURE__ */ fnUntraced(function* (tools, too
 	})));
 });
 //#endregion
-//#region node_modules/.pnpm/clanka@0.2.38_@effect+ai-openai-compat@4.0.0-beta.40_effect@4.0.0-beta.40__@effect+ai-o_8b26d89888c4b7e6bcb90ea99ae4f7cf/node_modules/clanka/dist/CodexAuth.js
+//#region node_modules/.pnpm/clanka@0.2.41_@effect+ai-openai-compat@4.0.0-beta.40_effect@4.0.0-beta.40__@effect+ai-o_6376d741d1c21dc6594a81ad54906cf7/node_modules/clanka/dist/CodexAuth.js
 /**
 * @since 1.0.0
 */
@@ -230597,7 +230552,7 @@ var CodexAuth = class CodexAuth extends Service$1()("clanka/CodexAuth") {
 	static layerClient = this.layerClientNoDeps.pipe(provide$3(CodexAuth.layer));
 };
 //#endregion
-//#region node_modules/.pnpm/clanka@0.2.38_@effect+ai-openai-compat@4.0.0-beta.40_effect@4.0.0-beta.40__@effect+ai-o_8b26d89888c4b7e6bcb90ea99ae4f7cf/node_modules/clanka/dist/Codex.js
+//#region node_modules/.pnpm/clanka@0.2.41_@effect+ai-openai-compat@4.0.0-beta.40_effect@4.0.0-beta.40__@effect+ai-o_6376d741d1c21dc6594a81ad54906cf7/node_modules/clanka/dist/Codex.js
 /**
 * @since 1.0.0
 */
@@ -230623,7 +230578,7 @@ const layerModel = (model, options) => layer$7({
 	}
 }).pipe(merge$6(AgentModelConfig.layer({ systemPromptTransform: (system, effect) => withConfigOverride(effect, { instructions: system }) })));
 //#endregion
-//#region node_modules/.pnpm/clanka@0.2.38_@effect+ai-openai-compat@4.0.0-beta.40_effect@4.0.0-beta.40__@effect+ai-o_8b26d89888c4b7e6bcb90ea99ae4f7cf/node_modules/clanka/dist/CodeChunker.js
+//#region node_modules/.pnpm/clanka@0.2.41_@effect+ai-openai-compat@4.0.0-beta.40_effect@4.0.0-beta.40__@effect+ai-o_6376d741d1c21dc6594a81ad54906cf7/node_modules/clanka/dist/CodeChunker.js
 /**
 * @since 1.0.0
 */
@@ -231166,7 +231121,7 @@ const mapStatusCodeError = /* @__PURE__ */ fnUntraced(function* (error, method)
 	const status = response.status;
 	const headers = response.headers;
 	const requestId = headers["x-request-id"];
-	let body = yield* response.text.pipe(catchCause$2(() => succeed$4(description?.startsWith("{") ? description : void 0)));
+	let body = yield* response.text.pipe(catchCause$1(() => succeed$4(description?.startsWith("{") ? description : void 0)));
 	const decoded = OpenAiErrorBodyJson(body);
 	return yield* make$15({
 		module: "OpenAiClient",
@@ -232383,7 +232338,7 @@ const getUsageDetailNumber = (details, field) => {
 	return typeof value === "number" ? value : void 0;
 };
 //#endregion
-//#region node_modules/.pnpm/clanka@0.2.38_@effect+ai-openai-compat@4.0.0-beta.40_effect@4.0.0-beta.40__@effect+ai-o_8b26d89888c4b7e6bcb90ea99ae4f7cf/node_modules/clanka/dist/CopilotAuth.js
+//#region node_modules/.pnpm/clanka@0.2.41_@effect+ai-openai-compat@4.0.0-beta.40_effect@4.0.0-beta.40__@effect+ai-o_6376d741d1c21dc6594a81ad54906cf7/node_modules/clanka/dist/CopilotAuth.js
 /**
 * @since 1.0.0
 */
@@ -232574,7 +232529,7 @@ var GithubCopilotAuth = class GithubCopilotAuth extends Service$1()("clanka/Gith
 	static layerClient = this.layerClientNoDeps.pipe(provide$3(GithubCopilotAuth.layer));
 };
 //#endregion
-//#region node_modules/.pnpm/clanka@0.2.38_@effect+ai-openai-compat@4.0.0-beta.40_effect@4.0.0-beta.40__@effect+ai-o_8b26d89888c4b7e6bcb90ea99ae4f7cf/node_modules/clanka/dist/Copilot.js
+//#region node_modules/.pnpm/clanka@0.2.41_@effect+ai-openai-compat@4.0.0-beta.40_effect@4.0.0-beta.40__@effect+ai-o_6376d741d1c21dc6594a81ad54906cf7/node_modules/clanka/dist/Copilot.js
 /**
 * @since 1.0.0
 */
@@ -232994,7 +232949,7 @@ Object.defineProperties(createChalk.prototype, styles);
 const chalk = createChalk();
 createChalk({ level: stderrColor ? stderrColor.level : 0 });
 //#endregion
-//#region node_modules/.pnpm/clanka@0.2.38_@effect+ai-openai-compat@4.0.0-beta.40_effect@4.0.0-beta.40__@effect+ai-o_8b26d89888c4b7e6bcb90ea99ae4f7cf/node_modules/clanka/dist/OutputFormatter.js
+//#region node_modules/.pnpm/clanka@0.2.41_@effect+ai-openai-compat@4.0.0-beta.40_effect@4.0.0-beta.40__@effect+ai-o_6376d741d1c21dc6594a81ad54906cf7/node_modules/clanka/dist/OutputFormatter.js
 /**
 * @since 1.0.0
 */
@@ -233601,7 +233556,7 @@ const partitionRequests = function* (requests, schema) {
 	const encode = encodeEffect(schema);
 	const handle = matchCauseEager({
 		onFailure(cause) {
-			entry.completeUnsafe(failCause$5(cause));
+			entry.completeUnsafe(failCause$4(cause));
 		},
 		onSuccess(value) {
 			inputs.push(value);
@@ -233621,7 +233576,7 @@ const partitionRequestsById = function* (requests, schema) {
 	const encode = encodeEffect(schema);
 	const handle = matchCauseEager({
 		onFailure(cause) {
-			entry.completeUnsafe(failCause$5(cause));
+			entry.completeUnsafe(failCause$4(cause));
 		},
 		onSuccess(value) {
 			inputs.push(value);
@@ -233702,7 +233657,7 @@ select * from ${sql(options.tableName)} where ${sql(idColumn)} = LAST_INSERT_ID(
 	};
 });
 //#endregion
-//#region node_modules/.pnpm/clanka@0.2.38_@effect+ai-openai-compat@4.0.0-beta.40_effect@4.0.0-beta.40__@effect+ai-o_8b26d89888c4b7e6bcb90ea99ae4f7cf/node_modules/clanka/dist/ChunkRepo.js
+//#region node_modules/.pnpm/clanka@0.2.41_@effect+ai-openai-compat@4.0.0-beta.40_effect@4.0.0-beta.40__@effect+ai-o_6376d741d1c21dc6594a81ad54906cf7/node_modules/clanka/dist/ChunkRepo.js
 /**
 * @since 1.0.0
 * @category Models
@@ -233968,7 +233923,7 @@ const run$1 = /* @__PURE__ */ make$25({});
 */
 const layer$1 = (options) => effectDiscard(run$1(options));
 //#endregion
-//#region node_modules/.pnpm/clanka@0.2.38_@effect+ai-openai-compat@4.0.0-beta.40_effect@4.0.0-beta.40__@effect+ai-o_8b26d89888c4b7e6bcb90ea99ae4f7cf/node_modules/clanka/dist/internal/sqlite-vector.js
+//#region node_modules/.pnpm/clanka@0.2.41_@effect+ai-openai-compat@4.0.0-beta.40_effect@4.0.0-beta.40__@effect+ai-o_6376d741d1c21dc6594a81ad54906cf7/node_modules/clanka/dist/internal/sqlite-vector.js
 /**
 * Binary extension for each platform
 */
@@ -234085,7 +234040,7 @@ function getExtensionPath() {
 	throw new ExtensionNotFoundError(`SQLite Vector extension not found for platform: ${getCurrentPlatform()}\n\nThe platform-specific package "${getPlatformPackageName()}" is not installed.\nThis usually happens when:\n  1. Your platform is not supported\n  2. npm failed to install optional dependencies\n  3. You're installing with --no-optional flag\n\nTry running: npm install --force`);
 }
 //#endregion
-//#region node_modules/.pnpm/clanka@0.2.38_@effect+ai-openai-compat@4.0.0-beta.40_effect@4.0.0-beta.40__@effect+ai-o_8b26d89888c4b7e6bcb90ea99ae4f7cf/node_modules/clanka/dist/Sqlite.js
+//#region node_modules/.pnpm/clanka@0.2.41_@effect+ai-openai-compat@4.0.0-beta.40_effect@4.0.0-beta.40__@effect+ai-o_6376d741d1c21dc6594a81ad54906cf7/node_modules/clanka/dist/Sqlite.js
 /**
 * @since 1.0.0
 */
@@ -234113,7 +234068,7 @@ const SqliteLayer = (database) => layer$1({ loader: fromRecord({ "0001_create_ch
 	yield* fs.makeDirectory(directory, { recursive: true });
 }))));
 //#endregion
-//#region node_modules/.pnpm/clanka@0.2.38_@effect+ai-openai-compat@4.0.0-beta.40_effect@4.0.0-beta.40__@effect+ai-o_8b26d89888c4b7e6bcb90ea99ae4f7cf/node_modules/clanka/dist/SemanticSearch.js
+//#region node_modules/.pnpm/clanka@0.2.41_@effect+ai-openai-compat@4.0.0-beta.40_effect@4.0.0-beta.40__@effect+ai-o_6376d741d1c21dc6594a81ad54906cf7/node_modules/clanka/dist/SemanticSearch.js
 /**
 * @since 1.0.0
 */
@@ -237979,10 +237934,9 @@ var import_light = /* @__PURE__ */ __toESM((/* @__PURE__ */ __commonJSMin$1(((ex
 			}
 		};
 		var version = "2.19.5";
-		var version$1 = { version };
 		var version$2 = /* @__PURE__ */ Object.freeze({
 			version,
-			default: version$1
+			default: { version }
 		});
 		var require$$2 = () => console.log("You must import the full version of Bottleneck in order to use this feature.");
 		var require$$3 = () => console.log("You must import the full version of Bottleneck in order to use this feature.");
@@ -242326,7 +242280,7 @@ var Worktree = class extends Service$1()("lalph/Worktree", { make: gen(function*
 		yield* copySharedBack({
 			shared,
 			worktreeShared
-		}).pipe(catchCause$2(logWarning));
+		}).pipe(catchCause$1(logWarning));
 	}));
 	return {
 		directory,
@@ -242346,7 +242300,7 @@ var Worktree = class extends Service$1()("lalph/Worktree", { make: gen(function*
 		};
 	}));
 };
-const execIgnore = (spawner, command) => command.pipe(spawner.exitCode, catchCause$2(logWarning));
+const execIgnore = (spawner, command) => command.pipe(spawner.exitCode, catchCause$1(logWarning));
 const seedSetupScript = fnUntraced(function* (setupPath) {
 	const fs = yield* FileSystem;
 	const pathService = yield* Path$1;
@@ -242742,7 +242696,7 @@ const SemanticSearchLayer = unwrap$3(gen(function* () {
 	return layer({
 		directory: worktree.directory,
 		database: pathService.join(worktree.directory, ".lalph", "shared", "search.sqlite")
-	}).pipe(orDie$3, provide$3(model$1("text-embedding-3-small", { dimensions: 1536 })), provide$3(layer$9({ apiKey: apiKey.value }).pipe(provide$3(layerUndici))), tapCause$1((cause) => logWarning(`Failed to create SemanticSearch layer`, cause)), catchCause$3(() => empty$15));
+	}).pipe(orDie$3, provide$3(model$1("text-embedding-3-small", { dimensions: 1536 })), provide$3(layer$9({ apiKey: apiKey.value }).pipe(provide$3(layerUndici))), tapCause$1((cause) => logWarning(`Failed to create SemanticSearch layer`, cause)), catchCause$2(() => empty$15));
 }).pipe(orDie$2));
 const runClanka = fnUntraced(function* (options) {
 	const muxer = yield* Muxer;
@@ -242756,7 +242710,7 @@ const runClanka = fnUntraced(function* (options) {
 		yield* log$1(`Received steer message: ${message}`);
 		yield* agent.steer(message);
 	}, fromEffectDrain)), runDrain, forkScoped);
-	return yield* output.pipe(options.maxContext ? tap((part) => {
+	return yield* (options.stallTimeout ? withStallTimeout(options.stallTimeout)(output) : output).pipe(options.maxContext ? tap((part) => {
 		if (part._tag !== "Usage") return void_$2;
 		if (part.contextTokens <= options.maxContext) return void_$2;
 		return fail$6(new TimeoutError("Max context reached"));
@@ -242814,6 +242768,7 @@ ${research}`
 			}),
 			maxContext: options.maxContext,
 			steer: options.steer,
+			stallTimeout: options.stallTimeout,
 			mode: CurrentTask.$match(options.currentTask, {
 				task: () => "default",
 				ralph: () => "ralph"
@@ -242970,7 +242925,8 @@ const agentChooser = fnUntraced(function* (options) {
 			directory: worktree.directory,
 			model: options.preset.extraArgs.join(" "),
 			prompt: promptGen.promptChooseClanka({ gitFlow }),
-			mode: "choose"
+			mode: "choose",
+			stallTimeout: options.stallTimeout
 		}).pipe(provideService$2(ChosenTaskDeferred, deferred), flatMap$5(() => fail$6(new ChosenTaskNotFound$1())), raceFirst(_await(deferred)));
 		const prdTask = yield* source.findById(projectId, result.taskId);
 		if (!prdTask) return yield* new ChosenTaskNotFound$1();
@@ -242985,7 +242941,7 @@ const agentChooser = fnUntraced(function* (options) {
 		prompt: promptGen.promptChoose({ gitFlow }),
 		prdFilePath: pathService.join(".lalph", "prd.yml"),
 		extraArgs: options.preset.extraArgs
-	}), setCwd(worktree.directory), options.preset.withCommandPrefix, worktree.execWithWorkerOutput({ cliAgent: options.preset.cliAgent }), timeoutOrElse$1({
+	}), setCwd(worktree.directory), options.preset.withCommandPrefix, worktree.execWithWorkerOutput({ cliAgent: options.preset.cliAgent }), timeoutOrElse({
 		duration: options.stallTimeout,
 		orElse: () => fail$6(new RunnerStalled())
 	}), raceFirst(taskJsonCreated));
@@ -243031,6 +242987,7 @@ const agentReviewer = fnUntraced(function* (options) {
 				prompt: options.instructions,
 				gitFlow
 			})),
+			stallTimeout: options.stallTimeout,
 			mode
 		});
 		return ExitCode(0);
@@ -243087,6 +243044,7 @@ const agentTimeout = fnUntraced(function* (options) {
 			model: options.preset.extraArgs.join(" "),
 			system: timeoutMode.system,
 			prompt: timeoutMode.clankaPrompt,
+			stallTimeout: options.stallTimeout,
 			mode: timeoutMode.mode
 		});
 		return ExitCode(0);
@@ -243110,7 +243068,8 @@ const agentResearcher = fnUntraced(function* (options) {
 		directory: worktree.directory,
 		model: options.preset.extraArgs.join(" "),
 		system: promptGen.systemClanka(options),
-		prompt: promptGen.promptResearch({ task: options.task })
+		prompt: promptGen.promptResearch({ task: options.task }),
+		stallTimeout: options.stallTimeout
 	}).pipe(asSome);
 });
 //#endregion
@@ -243130,7 +243089,7 @@ const agentChooserRalph = fnUntraced(function* (options) {
 		prompt: promptGen.promptChooseRalph({ specFile: options.specFile }),
 		prdFilePath: void 0,
 		extraArgs: options.preset.extraArgs
-	}), setCwd(worktree.directory), options.preset.withCommandPrefix, worktree.execWithWorkerOutput({ cliAgent: options.preset.cliAgent }), timeoutOrElse$1({
+	}), setCwd(worktree.directory), options.preset.withCommandPrefix, worktree.execWithWorkerOutput({ cliAgent: options.preset.cliAgent }), timeoutOrElse({
 		duration: options.stallTimeout,
 		orElse: () => fail$6(new RunnerStalled())
 	}));
@@ -243182,7 +243141,7 @@ const run = fnUntraced(function* (options) {
 	});
 	yield* prd.setChosenIssueId(taskId);
 	yield* prd.setAutoMerge(chosenTask.prd.autoMerge);
-	yield* source.ensureInProgress(projectId, taskId).pipe(timeoutOrElse$1({
+	yield* source.ensureInProgress(projectId, taskId).pipe(timeoutOrElse({
 		duration: "1 minute",
 		orElse: () => fail$6(new RunnerStalled())
 	}));
@@ -243423,7 +243382,7 @@ const runProject = fnUntraced(function* (options) {
 				quit = true;
 				return void_$2;
 			}
-		}), catchCause$2((cause) => logWarning(cause).pipe(andThen(sleep(seconds(10))))), ensuring$2(semaphore.release(1)), ensuring$2(completeWith(startedDeferred, void_$2)), run$2(fibers));
+		}), catchCause$1((cause) => logWarning(cause).pipe(andThen(sleep(seconds(10))))), ensuring$2(semaphore.release(1)), ensuring$2(completeWith(startedDeferred, void_$2)), run$2(fibers));
 		if (executionMode._tag === "ralph") {
 			yield* await_(fiber);
 			if (ralphDone) break;
@@ -243794,7 +243753,7 @@ const commandEdit = make$60("edit").pipe(withDescription("Open the selected proj
 const commandSource = make$60("source").pipe(withDescription("Select the issue source to use (e.g. GitHub Issues or Linear). This applies to all projects."), withHandler(() => selectIssueSource), provide(Settings.layer));
 //#endregion
 //#region package.json
-var version = "0.3.113";
+var version = "0.3.115";
 //#endregion
 //#region src/Tracing.ts
 const TracingLayer = unwrap$3(gen(function* () {