lalph 0.3.45 → 0.3.47

package/dist/cli.mjs

@@ -5353,6 +5353,18 @@ const succeed$8 = succeed$9;
 */
 const fail$10 = fail$11;
 /**
+* A pre-built `Result<void>` holding `undefined` as its failure value.
+*
+* - Use when you need a `Result` that represents "failed with no meaningful value"
+* - Equivalent to `Result.fail(undefined)` but avoids an extra allocation
+*
+* @see {@link fail}
+*
+* @category Constructors
+* @since 4.0.0
+*/
+const failVoid = /* @__PURE__ */ fail$10(void 0);
+/**
 * Checks whether a `Result` is a `Failure`.
 *
 * - Acts as a TypeScript type guard, narrowing to `Failure<A, E>`
@@ -13021,7 +13033,7 @@ const repeat$1 = /* @__PURE__ */ dual(2, (self, options) => {
 	return repeatOrElse$1(self, typeof options === "function" ? options(identity) : isSchedule(options) ? options : buildFromOptions(options), fail$9);
 });
 /** @internal */
-const retry$2 = /* @__PURE__ */ dual(2, (self, options) => {
+const retry$4 = /* @__PURE__ */ dual(2, (self, options) => {
 	return retryOrElse$1(self, typeof options === "function" ? options(identity) : isSchedule(options) ? options : buildFromOptions(options), fail$9);
 });
 const passthroughForever = /* @__PURE__ */ passthrough$2(forever$1);
@@ -14800,7 +14812,7 @@ const tapCause = tapCause$1;
 * @since 2.0.0
 * @category Error Handling
 */
-const retry$1 = retry$2;
+const retry$3 = retry$4;
 /**
 * Discards both the success and failure values of an effect.
 *
@@ -24046,6 +24058,90 @@ const set$9 = /* @__PURE__ */ dual(2, (self, value) => {
 	self.current = value;
 	return self;
 });
+/**
+* Sets the MutableRef to a new value and returns the new value.
+*
+* @example
+* ```ts
+* import { MutableRef } from "effect"
+*
+* const ref = MutableRef.make("old")
+*
+* // Set and get the new value
+* const newValue = MutableRef.setAndGet(ref, "new")
+* console.log(newValue) // "new"
+* console.log(MutableRef.get(ref)) // "new"
+*
+* // Useful for assignments that need the value
+* const counter = MutableRef.make(0)
+* const currentValue = MutableRef.setAndGet(counter, 42)
+* console.log(`Counter set to: ${currentValue}`) // "Counter set to: 42"
+*
+* // Pipe-able version
+* const setValue = MutableRef.setAndGet("final")
+* const result = setValue(ref)
+* console.log(result) // "final"
+*
+* // Difference from set: returns value instead of reference
+* const ref1 = MutableRef.make(1)
+* const returnedRef = MutableRef.set(ref1, 2) // Returns MutableRef
+* const returnedValue = MutableRef.setAndGet(ref1, 3) // Returns value
+* console.log(returnedValue) // 3
+* ```
+*
+* @since 2.0.0
+* @category general
+*/
+const setAndGet = /* @__PURE__ */ dual(2, (self, value) => {
+	self.current = value;
+	return self.current;
+});
+/**
+* Updates the MutableRef with the result of applying a function to its current value,
+* and returns the new value.
+*
+* @example
+* ```ts
+* import { MutableRef } from "effect"
+*
+* const counter = MutableRef.make(5)
+*
+* // Increment and get the new value
+* const newValue = MutableRef.updateAndGet(counter, (n) => n + 1)
+* console.log(newValue) // 6
+* console.log(MutableRef.get(counter)) // 6
+*
+* // Double the value and get the result
+* const doubled = MutableRef.updateAndGet(counter, (n) => n * 2)
+* console.log(doubled) // 12
+*
+* // Transform string and get result
+* const message = MutableRef.make("hello")
+* const upperCase = MutableRef.updateAndGet(message, (s) => s.toUpperCase())
+* console.log(upperCase) // "HELLO"
+*
+* // Pipe-able version
+* const increment = MutableRef.updateAndGet((n: number) => n + 1)
+* const result = increment(counter)
+* console.log(result) // 13 (new value)
+*
+* // Useful for calculations that need the result
+* const score = MutableRef.make(100)
+* const bonus = 50
+* const newScore = MutableRef.updateAndGet(score, (s) => s + bonus)
+* console.log(`New score: ${newScore}`) // "New score: 150"
+*
+* // Array transformations
+* const list = MutableRef.make<Array<number>>([1, 2, 3])
+* const newList = MutableRef.updateAndGet(list, (arr) => arr.map((x) => x * 2))
+* console.log(newList) // [2, 4, 6]
+* console.log(MutableRef.get(list)) // [2, 4, 6]
+* ```
+*
+* @since 2.0.0
+* @category general
+*/
+const updateAndGet = /* @__PURE__ */ dual(2, (self, f) => setAndGet(self, f(get$14(self))));
 //#endregion
 //#region node_modules/.pnpm/effect@4.0.0-beta.30/node_modules/effect/dist/PubSub.js
 /**
@@ -27684,6 +27780,18 @@ const filterArray = /* @__PURE__ */ dual(2, (self, predicate) => transformPull$1
 * @since 4.0.0
 * @category Filtering
 */
+const filterMapArray = /* @__PURE__ */ dual(2, (self, filter) => transformPull$1(self, (pull) => succeed$3(flatMap$4(pull, function loop(arr) {
+	const passes = [];
+	for (let i = 0; i < arr.length; i++) {
+		const result = filter(arr[i]);
+		if (isSuccess$5(result)) passes.push(result.success);
+	}
+	return isReadonlyArrayNonEmpty(passes) ? succeed$3(passes) : flatMap$4(pull, loop);
+}))));
+/**
+* @since 4.0.0
+* @category Filtering
+*/
 const filterMapArrayEffect = /* @__PURE__ */ dual(2, (self, filter) => transformPull$1(self, (pull) => succeed$3(flatMap$4(pull, function loop(arr) {
 	return flatMap$4(filterMapEffect$1(arr, filter), (passes) => isReadonlyArrayNonEmpty(passes) ? succeed$3(passes) : flatMap$4(pull, loop));
 }))));
@@ -27796,6 +27904,63 @@ const mapError$1 = /* @__PURE__ */ dual(2, (self, f) => catch_$1(self, (err) =>
 */
 const orDie$1 = (self) => catch_$1(self, die$1);
 /**
+* Returns a new channel that retries this channel according to the specified
+* schedule whenever it fails.
+*
+* @since 4.0.0
+* @category utils
+*/
+const retry$2 = /* @__PURE__ */ dual(2, (self, schedule) => suspend$2(() => {
+	let step = void 0;
+	let meta = CurrentMetadata.defaultValue();
+	const withReset = onFirst(provideServiceEffect(self, CurrentMetadata, sync(() => meta)), () => {
+		step = void 0;
+		return void_$1;
+	});
+	const resolvedSchedule = typeof schedule === "function" ? schedule(identity) : schedule;
+	const loop = catch_$1(withReset, fnUntraced(function* (error) {
+		if (!step) step = yield* toStepWithMetadata(resolvedSchedule);
+		meta = yield* step(error);
+		return loop;
+	}, (effect, error) => catchDone(effect, () => succeed$3(fail$3(error))), unwrap$2));
+	return loop;
+}));
+/**
+* Returns a new channel, which sequentially combines this channel, together
+* with the provided factory function, which creates a second channel based on
+* the output values of this channel. The result is a channel that will first
+* perform the functions of this channel, before performing the functions of
+* the created channel (including yielding its terminal value).
+*
+* @example
+* ```ts
+* import { Channel, Data } from "effect"
+*
+* class SwitchError extends Data.TaggedError("SwitchError")<{
+*   readonly reason: string
+* }> {}
+*
+* // Create a channel that outputs numbers
+* const numberChannel = Channel.fromIterable([1, 2, 3])
+*
+* // Switch to new channels based on each value
+* const switchedChannel = Channel.switchMap(
+*   numberChannel,
+*   (n) => Channel.fromIterable([`value-${n}`])
+* )
+*
+* // Outputs: "value-1", "value-2", "value-3"
+* ```
+*
+* @since 2.0.0
+* @category sequencing
+*/
+const switchMap$1 = /* @__PURE__ */ dual((args) => isChannel(args[0]), (self, f, options) => self.pipe(map$7(f), mergeAll$1({
+	...options,
+	concurrency: options?.concurrency ?? 1,
+	switch: true
+})));
+/**
 * Merges multiple channels with specified concurrency and buffering options.
 *
 * @example
@@ -28066,6 +28231,18 @@ const onExit = /* @__PURE__ */ dual(2, (self, finalizer) => fromTransformBracket
 * @since 4.0.0
 * @category utils
 */
+const onFirst = /* @__PURE__ */ dual(2, (self, onFirst) => transformPull$1(self, (pull) => sync(() => {
+	let isFirst = true;
+	const pullFirst = tap$1(pull, (element) => {
+		isFirst = false;
+		return onFirst(element);
+	});
+	return suspend$3(() => isFirst ? pullFirst : pull);
+})));
+/**
+* @since 4.0.0
+* @category utils
+*/
 const onEnd$1 = /* @__PURE__ */ dual(2, (self, onEnd) => transformPull$1(self, (pull) => succeed$3(catchDone(pull, (leftover) => flatMap$4(onEnd, () => done(leftover))))));
 /**
 * Returns a new channel with an attached finalizer. The finalizer is
@@ -28104,6 +28281,11 @@ const runWith$1 = (self, f, onHalt) => suspend$3(() => {
 */
 const provideService$1 = /* @__PURE__ */ dual(3, (self, key, service) => fromTransform$1((upstream, scope) => map$8(provideService$2(toTransform(self)(upstream, scope), key, service), provideService$2(key, service))));
 /**
+* @since 4.0.0
+* @category Services
+*/
+const provideServiceEffect = /* @__PURE__ */ dual(3, (self, key, service) => fromTransform$1((upstream, scope) => flatMap$4(service, (s) => toTransform(provideService$1(self, key, s))(upstream, scope))));
+/**
 * Runs a channel and discards all output elements, returning only the final result.
 *
 * @example
@@ -29581,6 +29763,30 @@ const tap = /* @__PURE__ */ dual((args) => isStream(args[0]), (self, f, options)
 */
 const flatMap$2 = /* @__PURE__ */ dual((args) => isStream(args[0]), (self, f, options) => self.channel.pipe(flattenArray, flatMap$3((a) => f(a).channel, options), fromChannel));
 /**
+* Switches to the latest stream produced by the mapping function, interrupting
+* the previous stream when a new element arrives.
+*
+* @example
+* ```ts
+* import { Console, Effect, Stream } from "effect"
+*
+* const program = Stream.make(1, 2, 3).pipe(
+*   Stream.switchMap((n) => (n === 3 ? Stream.make(n) : Stream.never)),
+*   Stream.runCollect
+* )
+*
+* Effect.gen(function*() {
+*   const result = yield* program
+*   yield* Console.log(result)
+*   // Output: [ 3 ]
+* })
+* ```
+*
+* @since 4.0.0
+* @category Sequencing
+*/
+const switchMap = /* @__PURE__ */ dual((args) => isStream(args[0]), (self, f, options) => self.channel.pipe(flattenArray, switchMap$1((a) => f(a).channel, options), fromChannel));
+/**
 * Flattens a stream of streams into a single stream by concatenating the
 * inner streams in strict order.
 *
@@ -29764,6 +29970,13 @@ const mergeAll = /* @__PURE__ */ dual(2, (streams, options) => flatten(fromItera
 */
 const filter$3 = /* @__PURE__ */ dual(2, (self, predicate) => fromChannel(filterArray(toChannel(self), predicate)));
 /**
+* Filters and maps stream elements in one pass using a `Filter`.
+*
+* @since 4.0.0
+* @category Filtering
+*/
+const filterMap$2 = /* @__PURE__ */ dual(2, (self, filter) => fromChannel(filterMapArray(toChannel(self), filter)));
+/**
 * Effectfully filters and maps elements in a single pass.
 *
 * @since 4.0.0
@@ -29945,6 +30158,38 @@ const mapError = /* @__PURE__ */ dual(2, (self, f) => fromChannel(mapError$1(sel
 */
 const orDie = (self) => fromChannel(orDie$1(self.channel));
 /**
+* When the stream fails, retry it according to the given schedule.
+*
+* This retries the entire stream, so will re-execute all of the stream's
+* acquire operations.
+*
+* The schedule is reset as soon as the first element passes through the
+* stream again.
+*
+* @example
+* ```ts
+* import { Console, Effect, Schedule, Stream } from "effect"
+*
+* const program = Effect.gen(function*() {
+*   const values = yield* Stream.make(1).pipe(
+*     Stream.concat(Stream.fail("boom")),
+*     Stream.retry(Schedule.recurs(1)),
+*     Stream.take(2),
+*     Stream.runCollect
+*   )
+*
+*   yield* Console.log(values)
+* })
+*
+* Effect.runPromise(program)
+* // Output: [ 1, 1 ]
+* ```
+*
+* @since 2.0.0
+* @category Error Handling
+*/
+const retry$1 = /* @__PURE__ */ dual(2, (self, policy) => fromChannel(retry$2(self.channel, policy)));
+/**
 * Takes the first `n` elements from this stream, returning `Stream.empty` when `n < 1`.
 *
 * @example
@@ -57286,7 +57531,7 @@ const retryTransient = /* @__PURE__ */ dual(2, (self, options) => {
 		schedule: passthroughSchedule,
 		times,
 		while: isTransientResponse
-	}), retryOn === "response-only" ? identity : retry$1({
+	}), retryOn === "response-only" ? identity : retry$3({
 		while: isOnlySchedule || options.while === void 0 ? isTransientError : or(isTransientError, options.while),
 		schedule,
 		times
@@ -87378,6 +87623,15 @@ var PrdIssue = class PrdIssue extends Class$1("PrdIssue")({
 			autoMerge
 		});
 	}
+	update(options) {
+		return new PrdIssue({
+			...this,
+			title: options.title ?? this.title,
+			description: options.description ?? this.description,
+			state: options.state ?? this.state,
+			blockedBy: options.blockedBy ?? this.blockedBy
+		});
+	}
 };
 //#endregion
 //#region node_modules/.pnpm/@linear+sdk@77.0.0_graphql@16.12.0/node_modules/@linear/sdk/dist/chunk-DPPnyiuk.mjs
@@ -179923,7 +180177,7 @@ var CurrentIssueSource = class CurrentIssueSource extends Service$1()("lalph/Cur
 		const services$8 = yield* services();
 		const refresh = set$4(ref, build$1).pipe(provideServices(services$8));
 		const proxy = IssueSource.of({
-			issues: (projectId) => get$6(ref).pipe(flatMap$4((source) => source.issues(projectId)), tapErrorTag("IssueSourceError", (e) => logWarning("Rebuilding issue source due to error", fail$7(e)).pipe(andThen(ignore$1(refresh)))), retry$1(refreshSchedule)),
+			issues: (projectId) => get$6(ref).pipe(flatMap$4((source) => source.issues(projectId)), tapErrorTag("IssueSourceError", (e) => logWarning("Rebuilding issue source due to error", fail$7(e)).pipe(andThen(ignore$1(refresh)))), retry$3(refreshSchedule)),
 			createIssue: (projectId, options) => get$6(ref).pipe(flatMap$4((source) => source.createIssue(projectId, options))),
 			updateIssue: (options) => get$6(ref).pipe(flatMap$4((source) => source.updateIssue(options))),
 			cancelIssue: (projectId, issueId) => get$6(ref).pipe(flatMap$4((source) => source.cancelIssue(projectId, issueId))),
@@ -180191,7 +180445,7 @@ ${options.gitFlow.reviewInstructions}
 # Previous instructions (only for context, do not repeat)
 
 ${options.prompt}`;
-	const promptReviewCustom = (options) => `${options.prompt}
+	const promptReviewCustom = (options) => options.removePrdNotes ? options.prompt : `${options.prompt}
 
 ${prdNotes(options)}`;
 	const promptTimeout = (options) => `Your earlier attempt to complete the task with id \`${options.taskId}\` took too
@@ -180775,7 +181029,7 @@ var Prd = class extends Service$1()("lalph/Prd", { make: gen(function* () {
 		if (currentYaml === nextYaml) return;
 		yield* fs.writeFileString(prdFile, nextYaml);
 	}, scoped$1, withSpan("Prd.updateSync"), run$3(updateSyncHandle, { onlyIfMissing: true }), syncSemaphore.withPermitsIfAvailable(1));
-	yield* fs.watch(lalphDir).pipe(debounce(50), runForEach((_) => clear(updateSyncHandle).pipe(andThen(ignore$1(sync$2)))), retry$1(forever$1), forkScoped);
+	yield* fs.watch(lalphDir).pipe(debounce(50), runForEach((_) => clear(updateSyncHandle).pipe(andThen(ignore$1(sync$2)))), retry$3(forever$1), forkScoped);
 	yield* toStreamResult(registry, currentIssuesAtom(projectId)).pipe(runForEach(updateSync), forkScoped);
 	const findById = fnUntraced(function* (issueId) {
 		return (yield* getCurrentIssues).find((i) => i.id === issueId) ?? null;
@@ -187991,7 +188245,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.0.15_@effect+ai-openai-compat@4.0.0-beta.29_effect@4.0.0-beta.30__@effect+ai-o_cb421abed6b4689eec8c33622f2a024f/node_modules/clanka/dist/ApplyPatch.js
+//#region node_modules/.pnpm/clanka@0.0.17_@effect+ai-openai-compat@4.0.0-beta.30_effect@4.0.0-beta.30__@effect+ai-o_aaa5a0e42657b29782e5d1fe76ccda57/node_modules/clanka/dist/ApplyPatch.js
 /**
 * @since 1.0.0
 */
@@ -188019,17 +188273,27 @@ const locate = (text) => {
 		end
 	};
 };
+const parseChunkHeader = (line) => {
+	if (line === "@@") return;
+	const unified = line.match(/^@@\s+-\d+(?:,\d+)?\s+\+\d+(?:,\d+)?\s+@@(?:\s?(.*))?$/);
+	if (unified) {
+		const ctx = unified[1]?.trim();
+		return ctx === void 0 || ctx.length === 0 ? void 0 : ctx;
+	}
+	const ctx = line.slice(2).trim();
+	return ctx.length === 0 ? void 0 : ctx;
+};
 const parseChunks = (lines, start, end = lines.length) => {
 	const chunks = Array();
 	let i = start;
 	while (i < end) {
 		const line = lines[i];
-		if (line.startsWith("***")) break;
+		if (line.startsWith("***") || line.startsWith("diff --git ")) break;
 		if (!line.startsWith("@@")) {
 			i++;
 			continue;
 		}
-		const ctx = line.slice(2).trim();
+		const ctx = parseChunkHeader(line);
 		const old = Array();
 		const next = Array();
 		let eof = false;
@@ -188041,19 +188305,20 @@ const parseChunks = (lines, start, end = lines.length) => {
 				i++;
 				break;
 			}
-			if (line.startsWith("@@") || line.startsWith("***")) break;
+			if (line.startsWith("@@") || line.startsWith("***") || line.startsWith("diff --git ")) break;
 			if (line.startsWith(" ")) {
 				const text = line.slice(1);
 				old.push(text);
 				next.push(text);
 			} else if (line.startsWith("-")) old.push(line.slice(1));
 			else if (line.startsWith("+")) next.push(line.slice(1));
+			else if (line === "\") {}
 			i++;
 		}
 		chunks.push({
 			old,
 			next,
-			...ctx.length > 0 ? { ctx } : {},
+			...ctx === void 0 ? {} : { ctx },
 			...eof ? { eof: true } : {}
 		});
 	}
@@ -188076,64 +188341,158 @@ const parseAdd = (lines, start, end) => {
 		next: i
 	};
 };
-const parsePatch = (input) => {
-	const text = normalize(input);
-	if (text.length === 0) throw new Error("patchText is required");
-	if (text === `${BEGIN}\n${END}`) throw new Error("patch rejected: empty patch");
-	const { lines, begin, end } = locate(text);
+const normalizeDiffPath = (path) => {
+	if (path === "/dev/null") return path;
+	if (path.startsWith("a/") || path.startsWith("b/")) return path.slice(2);
+	return path;
+};
+const parseHeaderPath = (line, prefix) => {
+	const body = line.slice(prefix.length);
+	const tabIndex = body.indexOf("	");
+	return normalizeDiffPath((tabIndex === -1 ? body : body.slice(0, tabIndex)).trim());
+};
+const parseDiffGitPaths = (line) => {
+	const match = line.match(/^diff --git a\/(.+) b\/(.+)$/);
+	if (!match) return;
+	return [match[1], match[2]];
+};
+const hasDiffHeaders = (lines) => lines.some((line) => line.startsWith("diff --git ") || line.startsWith("--- ") || line.startsWith("rename from ") || line.startsWith("rename to "));
+const parseGitPatch = (text) => {
+	const lines = text.split("\n");
 	const out = Array();
-	let i = begin + 1;
-	while (i < end) {
-		while (i < end && lines[i].trim() === "") i++;
-		if (i === end) break;
-		const line = lines[i];
-		if (line.startsWith(ADD)) {
-			const path = line.slice(13).trim();
-			if (path.length === 0) fail("missing add file path");
-			const parsed = parseAdd(lines, i + 1, end);
+	let i = 0;
+	while (i < lines.length) {
+		while (i < lines.length && lines[i].trim() === "") i++;
+		if (i >= lines.length) break;
+		let oldPath;
+		let newPath;
+		let renameFrom;
+		let renameTo;
+		if (lines[i].startsWith("diff --git ")) {
+			const parsedPaths = parseDiffGitPaths(lines[i]);
+			if (!parsedPaths) return fail(`invalid git diff header: ${lines[i]}`);
+			const [parsedOldPath, parsedNewPath] = parsedPaths;
+			oldPath = parsedOldPath;
+			newPath = parsedNewPath;
+			i++;
+		}
+		while (i < lines.length) {
+			const line = lines[i];
+			if (line.startsWith("diff --git ")) break;
+			if (line.startsWith("rename from ")) {
+				renameFrom = line.slice(12).trim();
+				i++;
+				continue;
+			}
+			if (line.startsWith("rename to ")) {
+				renameTo = line.slice(10).trim();
+				i++;
+				continue;
+			}
+			if (line.startsWith("--- ")) {
+				oldPath = parseHeaderPath(line, "--- ");
+				i++;
+				if (i >= lines.length || !lines[i].startsWith("+++ ")) fail("missing new file header");
+				newPath = parseHeaderPath(lines[i], "+++ ");
+				i++;
+				break;
+			}
+			if (line.startsWith("@@")) break;
+			i++;
+		}
+		const parsed = parseChunks(lines, i);
+		i = parsed.next;
+		const fromPath = normalizeDiffPath(renameFrom ?? oldPath ?? "/dev/null");
+		const toPath = normalizeDiffPath(renameTo ?? newPath ?? fromPath);
+		if (fromPath === "/dev/null") {
+			if (toPath === "/dev/null") fail("invalid diff: both file paths are /dev/null");
 			out.push({
 				type: "add",
-				path,
-				content: parsed.content
+				path: toPath,
+				content: patchChunks(toPath, "", parsed.chunks)
 			});
-			i = parsed.next;
 			continue;
 		}
-		if (line.startsWith(DELETE)) {
-			const path = line.slice(16).trim();
-			if (path.length === 0) fail("missing delete file path");
+		if (toPath === "/dev/null") {
 			out.push({
 				type: "delete",
-				path
+				path: fromPath
 			});
-			i++;
 			continue;
 		}
-		if (line.startsWith(UPDATE)) {
-			const path = line.slice(16).trim();
-			if (path.length === 0) fail("missing update file path");
-			i++;
-			let movePath;
-			if (i < end && lines[i].startsWith(MOVE)) {
-				movePath = lines[i].slice(12).trim();
-				if (movePath.length === 0) fail("missing move file path");
+		if (parsed.chunks.length === 0 && fromPath === toPath) fail(`no hunks found for ${fromPath}`);
+		out.push({
+			type: "update",
+			path: fromPath,
+			chunks: parsed.chunks,
+			...toPath === fromPath ? {} : { movePath: toPath }
+		});
+	}
+	if (out.length === 0) fail("no hunks found");
+	return out;
+};
+const parsePatch = (input) => {
+	const text = normalize(input);
+	if (text.length === 0) throw new Error("patchText is required");
+	if (text === `${BEGIN}\n${END}`) throw new Error("patch rejected: empty patch");
+	if (text.startsWith(BEGIN)) {
+		const { lines, begin, end } = locate(text);
+		const out = Array();
+		let i = begin + 1;
+		while (i < end) {
+			while (i < end && lines[i].trim() === "") i++;
+			if (i === end) break;
+			const line = lines[i];
+			if (line.startsWith(ADD)) {
+				const path = line.slice(13).trim();
+				if (path.length === 0) fail("missing add file path");
+				const parsed = parseAdd(lines, i + 1, end);
+				out.push({
+					type: "add",
+					path,
+					content: parsed.content
+				});
+				i = parsed.next;
+				continue;
+			}
+			if (line.startsWith(DELETE)) {
+				const path = line.slice(16).trim();
+				if (path.length === 0) fail("missing delete file path");
+				out.push({
+					type: "delete",
+					path
+				});
+				i++;
+				continue;
+			}
+			if (line.startsWith(UPDATE)) {
+				const path = line.slice(16).trim();
+				if (path.length === 0) fail("missing update file path");
 				i++;
+				let movePath;
+				if (i < end && lines[i].startsWith(MOVE)) {
+					movePath = lines[i].slice(12).trim();
+					if (movePath.length === 0) fail("missing move file path");
+					i++;
+				}
+				const parsed = parseChunks(lines, i, end);
+				if (parsed.chunks.length === 0) fail("no hunks found");
+				out.push({
+					type: "update",
+					path,
+					chunks: parsed.chunks,
+					...movePath === void 0 ? {} : { movePath }
+				});
+				i = parsed.next;
+				continue;
 			}
-			const parsed = parseChunks(lines, i, end);
-			if (parsed.chunks.length === 0) fail("no hunks found");
-			out.push({
-				type: "update",
-				path,
-				chunks: parsed.chunks,
-				...movePath === void 0 ? {} : { movePath }
-			});
-			i = parsed.next;
-			continue;
+			fail(`unexpected line in wrapped patch: ${line}`);
 		}
-		fail(`unexpected line in wrapped patch: ${line}`);
+		if (out.length === 0) fail("no hunks found");
+		return out;
 	}
-	if (out.length === 0) fail("no hunks found");
-	return out;
+	if (hasDiffHeaders(text.split("\n"))) return parseGitPatch(text);
+	return fail("Invalid patch format: expected git/unified diff");
 };
 const normalizeUnicode = (line) => line.replace(/[\u2018\u2019\u201A\u201B]/g, "'").replace(/[\u201C\u201D\u201E\u201F]/g, "\"").replace(/[\u2010\u2011\u2012\u2013\u2014\u2015]/g, "-").replace(/\u2026/g, "...").replace(/\u00A0/g, " ");
 const match = (lines, part, from, same, eof) => {
@@ -188215,7 +188574,7 @@ const patchChunks = (file, input, chunks) => {
 	return eol === "\r\n" ? text.replace(/\n/g, "\r\n") : text;
 };
 //#endregion
-//#region node_modules/.pnpm/clanka@0.0.15_@effect+ai-openai-compat@4.0.0-beta.29_effect@4.0.0-beta.30__@effect+ai-o_cb421abed6b4689eec8c33622f2a024f/node_modules/clanka/dist/AgentTools.js
+//#region node_modules/.pnpm/clanka@0.0.17_@effect+ai-openai-compat@4.0.0-beta.30_effect@4.0.0-beta.30__@effect+ai-o_aaa5a0e42657b29782e5d1fe76ccda57/node_modules/clanka/dist/AgentTools.js
 /**
 * @since 1.0.0
 */
@@ -188247,15 +188606,15 @@ const AgentTools = make$9(make$7("readFile", {
 	}),
 	success: NullOr(String$1),
 	dependencies: [CurrentDirectory]
-}), make$7("createFile", {
-	description: "Write content to a file, creating parent directories if needed.",
+}), make$7("writeFile", {
+	description: "Write content to a file, creating parent directories if needed. PREFER USING applyPatch to update existing files.",
 	parameters: Struct({
 		path: String$1,
 		content: String$1
 	}),
 	dependencies: [CurrentDirectory]
 }), make$7("applyPatch", {
-	description: "Apply a wrapped patch with Add/Delete/Update sections.",
+	description: "Apply a git diff / unified diff patch across one or more files.",
 	parameters: String$1.annotate({ identifier: "patch" }),
 	success: String$1,
 	dependencies: [CurrentDirectory]
@@ -188341,8 +188700,8 @@ const AgentToolHandlers = AgentTools.toLayer(gen(function* () {
 			if (options.endLine) stream = take(stream, options.endLine - (options.startLine ?? 1) + 1);
 			return yield* runCollect(stream).pipe(map$8(join$3("\n")), catchReason("PlatformError", "NotFound", () => succeed$3(null)), orDie$2);
 		}),
-		createFile: fn("AgentTools.createFile")(function* (options) {
-			yield* logInfo(`Calling "createFile"`).pipe(annotateLogs({ path: options.path }));
+		writeFile: fn("AgentTools.writeFile")(function* (options) {
+			yield* logInfo(`Calling "writeFile"`).pipe(annotateLogs({ path: options.path }));
 			const cwd = yield* CurrentDirectory;
 			const path = pathService.resolve(cwd, options.path);
 			if (yield* fs.exists(path)) return yield* die$2("File already exists");
@@ -188511,7 +188870,7 @@ const AgentToolHandlers = AgentTools.toLayer(gen(function* () {
 }));
 var ApplyPatchError = class extends TaggedClass$1("ApplyPatchError") {};
 //#endregion
-//#region node_modules/.pnpm/clanka@0.0.15_@effect+ai-openai-compat@4.0.0-beta.29_effect@4.0.0-beta.30__@effect+ai-o_cb421abed6b4689eec8c33622f2a024f/node_modules/clanka/dist/Executor.js
+//#region node_modules/.pnpm/clanka@0.0.17_@effect+ai-openai-compat@4.0.0-beta.30_effect@4.0.0-beta.30__@effect+ai-o_aaa5a0e42657b29782e5d1fe76ccda57/node_modules/clanka/dist/Executor.js
 /**
 * @since 1.0.0
 */
@@ -188591,7 +188950,7 @@ var QueueWriteStream = class extends Writable {
 	}
 };
 //#endregion
-//#region node_modules/.pnpm/clanka@0.0.15_@effect+ai-openai-compat@4.0.0-beta.29_effect@4.0.0-beta.30__@effect+ai-o_cb421abed6b4689eec8c33622f2a024f/node_modules/clanka/dist/TypeBuilder.js
+//#region node_modules/.pnpm/clanka@0.0.17_@effect+ai-openai-compat@4.0.0-beta.30_effect@4.0.0-beta.30__@effect+ai-o_aaa5a0e42657b29782e5d1fe76ccda57/node_modules/clanka/dist/TypeBuilder.js
 const resolveDocumentation = resolveAt("documentation");
 const identifierPattern = /^[$A-Z_a-z][$0-9A-Z_a-z]*$/u;
 const Precedence = {
@@ -188864,7 +189223,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.0.15_@effect+ai-openai-compat@4.0.0-beta.29_effect@4.0.0-beta.30__@effect+ai-o_cb421abed6b4689eec8c33622f2a024f/node_modules/clanka/dist/ToolkitRenderer.js
+//#region node_modules/.pnpm/clanka@0.0.17_@effect+ai-openai-compat@4.0.0-beta.30_effect@4.0.0-beta.30__@effect+ai-o_aaa5a0e42657b29782e5d1fe76ccda57/node_modules/clanka/dist/ToolkitRenderer.js
 /**
 * @since 1.0.0
 */
@@ -188886,7 +189245,7 @@ declare function ${name}(${params}): Promise<${render(tool.successSchema)}>`);
 	}) });
 };
 //#endregion
-//#region node_modules/.pnpm/clanka@0.0.15_@effect+ai-openai-compat@4.0.0-beta.29_effect@4.0.0-beta.30__@effect+ai-o_cb421abed6b4689eec8c33622f2a024f/node_modules/clanka/dist/Agent.js
+//#region node_modules/.pnpm/clanka@0.0.17_@effect+ai-openai-compat@4.0.0-beta.30_effect@4.0.0-beta.30__@effect+ai-o_aaa5a0e42657b29782e5d1fe76ccda57/node_modules/clanka/dist/Agent.js
 /**
 * @since 1.0.0
 */
@@ -189126,7 +189485,7 @@ ${prompt}`));
 						case "finish": break;
 					}
 					return void_$1;
-				}), retry$1({ while: (err) => {
+				}), retry$3({ while: (err) => {
 					response = [];
 					return err.isRetryable;
 				} }), modelConfig.systemPromptTransform ? (effect) => modelConfig.systemPromptTransform(system, effect) : identity);
@@ -189200,7 +189559,7 @@ const generateSystemMulti = (toolsDts) => {
 
 - Use \`console.log\` to print any output you need.
 - Top level await is supported.
-- **Prefer using the functions provided** over the bash tool
+- AVOID passing scripts into the "bash" function, and instead write javascript.
 
 **When you have fully completed your task**, call the "taskComplete" function with the final output.
 Make sure every detail of the task is done before calling "taskComplete".
@@ -189218,7 +189577,7 @@ const generateSystemSingle = (toolsDts) => {
 
 - Use \`console.log\` to print any output you need.
 - Top level await is supported.
-- **Prefer using the functions provided** over the bash tool
+- AVOID passing scripts into the "bash" function, and instead write javascript.
 
 You have the following functions available to you:
 
@@ -189527,7 +189886,7 @@ var Retry = class Retry extends TaggedClass$1("Retry") {
 	}
 };
 //#endregion
-//#region node_modules/.pnpm/@effect+ai-openai@4.0.0-beta.29_effect@4.0.0-beta.30/node_modules/@effect/ai-openai/dist/Generated.js
+//#region node_modules/.pnpm/@effect+ai-openai@4.0.0-beta.30_effect@4.0.0-beta.30/node_modules/@effect/ai-openai/dist/Generated.js
 /**
 * @since 1.0.0
 */ const AdminApiKey = /* @__PURE__ */ Struct({
@@ -195933,6 +196292,13 @@ const ResponseStreamEvent = /* @__PURE__ */ Union([
 	ResponseInProgressEvent,
 	ResponseFailedEvent,
 	ResponseIncompleteEvent,
+	/* @__PURE__ */ Struct({
+		"type": Literal("keepalive").annotate({ "description": "The type of the keepalive event. Always `keepalive`." }),
+		"sequence_number": Number$1.annotate({ "description": "The sequence number of this keepalive event." }).check(isInt())
+	}).annotate({
+		"title": "Keep alive",
+		"description": "A keepalive event emitted during long-running response streams."
+	}),
 	ResponseOutputItemAddedEvent,
 	ResponseOutputItemDoneEvent,
 	ResponseReasoningSummaryPartAddedEvent,
@@ -197588,7 +197954,7 @@ const OpenAiClientError = (tag, cause, response) => new OpenAiClientErrorImpl({
 	request: response.request
 });
 //#endregion
-//#region node_modules/.pnpm/@effect+ai-openai@4.0.0-beta.29_effect@4.0.0-beta.30/node_modules/@effect/ai-openai/dist/internal/errors.js
+//#region node_modules/.pnpm/@effect+ai-openai@4.0.0-beta.30_effect@4.0.0-beta.30/node_modules/@effect/ai-openai/dist/internal/errors.js
 /** @internal */
 const OpenAiErrorBody$1 = /* @__PURE__ */ Struct({ error: /* @__PURE__ */ Struct({
 	message: String$1,
@@ -197801,7 +198167,7 @@ const mapStatusCodeToReason$1 = ({ status, headers, message, metadata, http }) =
 	}
 };
 //#endregion
-//#region node_modules/.pnpm/@effect+ai-openai@4.0.0-beta.29_effect@4.0.0-beta.30/node_modules/@effect/ai-openai/dist/OpenAiConfig.js
+//#region node_modules/.pnpm/@effect+ai-openai@4.0.0-beta.30_effect@4.0.0-beta.30/node_modules/@effect/ai-openai/dist/OpenAiConfig.js
 /**
 * @since 1.0.0
 */
@@ -197816,7 +198182,7 @@ var OpenAiConfig$1 = class OpenAiConfig$1 extends Service$1()("@effect/ai-openai
 	static getOrUndefined = /* @__PURE__ */ map$8(/* @__PURE__ */ services(), (context) => context.mapUnsafe.get(OpenAiConfig$1.key));
 };
 //#endregion
-//#region node_modules/.pnpm/@effect+ai-openai@4.0.0-beta.29_effect@4.0.0-beta.30/node_modules/@effect/ai-openai/dist/OpenAiClient.js
+//#region node_modules/.pnpm/@effect+ai-openai@4.0.0-beta.30_effect@4.0.0-beta.30/node_modules/@effect/ai-openai/dist/OpenAiClient.js
 /**
 * OpenAI Client module for interacting with OpenAI's API.
 *
@@ -197887,7 +198253,7 @@ const make$3 = /* @__PURE__ */ fnUntraced(function* (options) {
 */
 const layer$3 = (options) => effect$1(OpenAiClient$1, make$3(options));
 //#endregion
-//#region node_modules/.pnpm/@effect+ai-openai@4.0.0-beta.29_effect@4.0.0-beta.30/node_modules/@effect/ai-openai/dist/internal/utilities.js
+//#region node_modules/.pnpm/@effect+ai-openai@4.0.0-beta.30_effect@4.0.0-beta.30/node_modules/@effect/ai-openai/dist/internal/utilities.js
 const finishReasonMap$1 = {
 	content_filter: "content-filter",
 	function_call: "tool-calls",
@@ -197905,7 +198271,7 @@ const resolveFinishReason$1 = (finishReason, hasToolCalls) => {
 	return reason;
 };
 //#endregion
-//#region node_modules/.pnpm/@effect+ai-openai@4.0.0-beta.29_effect@4.0.0-beta.30/node_modules/@effect/ai-openai/dist/OpenAiTelemetry.js
+//#region node_modules/.pnpm/@effect+ai-openai@4.0.0-beta.30_effect@4.0.0-beta.30/node_modules/@effect/ai-openai/dist/OpenAiTelemetry.js
 /**
 * OpenAI telemetry attributes for OpenTelemetry integration.
 *
@@ -197934,7 +198300,7 @@ const addGenAIAnnotations$1 = /* @__PURE__ */ dual(2, (span, options) => {
 	}
 });
 //#endregion
-//#region node_modules/.pnpm/@effect+ai-openai@4.0.0-beta.29_effect@4.0.0-beta.30/node_modules/@effect/ai-openai/dist/OpenAiLanguageModel.js
+//#region node_modules/.pnpm/@effect+ai-openai@4.0.0-beta.30_effect@4.0.0-beta.30/node_modules/@effect/ai-openai/dist/OpenAiLanguageModel.js
 /**
 * OpenAI Language Model implementation.
 *
@@ -199647,7 +200013,7 @@ const transformToolCallParams = /* @__PURE__ */ fnUntraced(function* (tools, too
 	})));
 });
 //#endregion
-//#region node_modules/.pnpm/clanka@0.0.15_@effect+ai-openai-compat@4.0.0-beta.29_effect@4.0.0-beta.30__@effect+ai-o_cb421abed6b4689eec8c33622f2a024f/node_modules/clanka/dist/CodexAuth.js
+//#region node_modules/.pnpm/clanka@0.0.17_@effect+ai-openai-compat@4.0.0-beta.30_effect@4.0.0-beta.30__@effect+ai-o_aaa5a0e42657b29782e5d1fe76ccda57/node_modules/clanka/dist/CodexAuth.js
 /**
 * @since 1.0.0
 */
@@ -199825,7 +200191,7 @@ var CodexAuth = class CodexAuth extends Service$1()("clanka/CodexAuth") {
 				user_code: deviceCode.userCode
 			}));
 			const delayMs = deviceCode.intervalMs + POLLING_SAFETY_MARGIN_MS;
-			return yield* httpClient.execute(request).pipe(retry$1({
+			return yield* httpClient.execute(request).pipe(retry$3({
 				while: (e) => e.response?.status === 403 || e.response?.status === 404,
 				schedule: spaced(delayMs)
 			}), mapError$2((cause) => requestDeviceCodeError("Failed to poll Codex device authorization", cause)), flatMap$4((response) => schemaBodyJson(AuthorizationCodeResponseSchema)(response).pipe(mapError$2((cause) => requestDeviceCodeError("Failed to decode the Codex authorization approval response", cause)), map$8((payload) => ({
@@ -199867,7 +200233,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.0.15_@effect+ai-openai-compat@4.0.0-beta.29_effect@4.0.0-beta.30__@effect+ai-o_cb421abed6b4689eec8c33622f2a024f/node_modules/clanka/dist/Codex.js
+//#region node_modules/.pnpm/clanka@0.0.17_@effect+ai-openai-compat@4.0.0-beta.30_effect@4.0.0-beta.30__@effect+ai-o_aaa5a0e42657b29782e5d1fe76ccda57/node_modules/clanka/dist/Codex.js
 /**
 * @since 1.0.0
 */
@@ -199896,7 +200262,7 @@ const model$1 = (model, options) => make$6("openai", model, merge$5(layer$2({
 	supportsNoTools: options?.supportsNoTools ?? true
 })).pipe(provide$3(layerClient$1)));
 //#endregion
-//#region node_modules/.pnpm/@effect+ai-openai-compat@4.0.0-beta.29_effect@4.0.0-beta.30/node_modules/@effect/ai-openai-compat/dist/internal/errors.js
+//#region node_modules/.pnpm/@effect+ai-openai-compat@4.0.0-beta.30_effect@4.0.0-beta.30/node_modules/@effect/ai-openai-compat/dist/internal/errors.js
 /** @internal */
 const OpenAiErrorBody = /* @__PURE__ */ Struct({ error: /* @__PURE__ */ Struct({
 	message: String$1,
@@ -200104,7 +200470,7 @@ const mapStatusCodeToReason = ({ status, headers, message, metadata, http }) =>
 	}
 };
 //#endregion
-//#region node_modules/.pnpm/@effect+ai-openai-compat@4.0.0-beta.29_effect@4.0.0-beta.30/node_modules/@effect/ai-openai-compat/dist/OpenAiConfig.js
+//#region node_modules/.pnpm/@effect+ai-openai-compat@4.0.0-beta.30_effect@4.0.0-beta.30/node_modules/@effect/ai-openai-compat/dist/OpenAiConfig.js
 /**
 * @since 1.0.0
 */
@@ -200119,7 +200485,7 @@ var OpenAiConfig = class OpenAiConfig extends Service$1()("@effect/ai-openai-com
 	static getOrUndefined = /* @__PURE__ */ map$8(/* @__PURE__ */ services(), (context) => context.mapUnsafe.get(OpenAiConfig.key));
 };
 //#endregion
-//#region node_modules/.pnpm/@effect+ai-openai-compat@4.0.0-beta.29_effect@4.0.0-beta.30/node_modules/@effect/ai-openai-compat/dist/OpenAiClient.js
+//#region node_modules/.pnpm/@effect+ai-openai-compat@4.0.0-beta.30_effect@4.0.0-beta.30/node_modules/@effect/ai-openai-compat/dist/OpenAiClient.js
 /**
 * @since 1.0.0
 */
@@ -200188,27 +200554,34 @@ const CreateEmbeddingResponseSchema = /* @__PURE__ */ Struct({
 		total_tokens: Number$1
 	}))
 });
-const ChatCompletionToolCall = /* @__PURE__ */ Struct({
-	id: /* @__PURE__ */ optionalKey(String$1),
-	index: /* @__PURE__ */ optionalKey(Number$1),
-	type: /* @__PURE__ */ optionalKey(String$1),
-	function: /* @__PURE__ */ optionalKey(/* @__PURE__ */ Struct({
-		name: String$1,
-		arguments: /* @__PURE__ */ optionalKey(String$1)
-	}))
-});
 const ChatCompletionChoice = /* @__PURE__ */ Struct({
 	index: Number$1,
 	finish_reason: /* @__PURE__ */ optionalKey(/* @__PURE__ */ NullOr(String$1)),
 	message: /* @__PURE__ */ optionalKey(/* @__PURE__ */ Struct({
 		role: /* @__PURE__ */ optionalKey(String$1),
 		content: /* @__PURE__ */ optionalKey(/* @__PURE__ */ NullOr(String$1)),
-		tool_calls: /* @__PURE__ */ optionalKey(/* @__PURE__ */ Array$1(ChatCompletionToolCall))
+		tool_calls: /* @__PURE__ */ optionalKey(/* @__PURE__ */ Array$1(/* @__PURE__ */ Struct({
+			id: /* @__PURE__ */ optionalKey(String$1),
+			index: /* @__PURE__ */ optionalKey(Number$1),
+			type: /* @__PURE__ */ optionalKey(String$1),
+			function: /* @__PURE__ */ optionalKey(/* @__PURE__ */ Struct({
+				name: String$1,
+				arguments: /* @__PURE__ */ optionalKey(String$1)
+			}))
+		})))
 	})),
 	delta: /* @__PURE__ */ optionalKey(/* @__PURE__ */ Struct({
 		role: /* @__PURE__ */ optionalKey(String$1),
 		content: /* @__PURE__ */ optionalKey(/* @__PURE__ */ NullOr(String$1)),
-		tool_calls: /* @__PURE__ */ optionalKey(/* @__PURE__ */ Array$1(ChatCompletionToolCall))
+		tool_calls: /* @__PURE__ */ optionalKey(/* @__PURE__ */ Array$1(/* @__PURE__ */ Struct({
+			id: /* @__PURE__ */ optionalKey(String$1),
+			index: /* @__PURE__ */ optionalKey(Number$1),
+			type: /* @__PURE__ */ optionalKey(String$1),
+			function: /* @__PURE__ */ optionalKey(/* @__PURE__ */ Struct({
+				name: /* @__PURE__ */ optionalKey(String$1),
+				arguments: /* @__PURE__ */ optionalKey(String$1)
+			}))
+		})))
 	}))
 });
 const ChatCompletionUsage = /* @__PURE__ */ Struct({
@@ -200248,7 +200621,7 @@ const decodeChatCompletionSseData = (data) => {
 	return isChatCompletionChunk(parsed) ? parsed : void 0;
 };
 //#endregion
-//#region node_modules/.pnpm/@effect+ai-openai-compat@4.0.0-beta.29_effect@4.0.0-beta.30/node_modules/@effect/ai-openai-compat/dist/internal/utilities.js
+//#region node_modules/.pnpm/@effect+ai-openai-compat@4.0.0-beta.30_effect@4.0.0-beta.30/node_modules/@effect/ai-openai-compat/dist/internal/utilities.js
 const finishReasonMap = {
 	content_filter: "content-filter",
 	function_call: "tool-calls",
@@ -200264,7 +200637,7 @@ const resolveFinishReason = (finishReason, hasToolCalls) => {
 	return reason;
 };
 //#endregion
-//#region node_modules/.pnpm/@effect+ai-openai-compat@4.0.0-beta.29_effect@4.0.0-beta.30/node_modules/@effect/ai-openai-compat/dist/OpenAiTelemetry.js
+//#region node_modules/.pnpm/@effect+ai-openai-compat@4.0.0-beta.30_effect@4.0.0-beta.30/node_modules/@effect/ai-openai-compat/dist/OpenAiTelemetry.js
 /**
 * OpenAI telemetry attributes for OpenTelemetry integration.
 *
@@ -200293,7 +200666,7 @@ const addGenAIAnnotations = /* @__PURE__ */ dual(2, (span, options) => {
 	}
 });
 //#endregion
-//#region node_modules/.pnpm/@effect+ai-openai-compat@4.0.0-beta.29_effect@4.0.0-beta.30/node_modules/@effect/ai-openai-compat/dist/OpenAiLanguageModel.js
+//#region node_modules/.pnpm/@effect+ai-openai-compat@4.0.0-beta.30_effect@4.0.0-beta.30/node_modules/@effect/ai-openai-compat/dist/OpenAiLanguageModel.js
 /**
 * OpenAI Language Model implementation.
 *
@@ -200751,11 +201124,11 @@ const makeStreamResponse = /* @__PURE__ */ fnUntraced(function* ({ stream, respo
 			hasToolCalls = hasToolCalls || choice.delta.tool_calls.length > 0;
 			choice.delta.tool_calls.forEach((deltaTool, indexInChunk) => {
 				const toolIndex = deltaTool.index ?? indexInChunk;
-				const toolId = deltaTool.id ?? `${event.id}_tool_${toolIndex}`;
+				const activeToolCall = activeToolCalls[toolIndex];
+				const toolId = activeToolCall?.id ?? deltaTool.id ?? `${event.id}_tool_${toolIndex}`;
 				const providerToolName = deltaTool.function?.name;
-				const toolName = toolNameMapper.getCustomName(providerToolName ?? "unknown_tool");
+				const toolName = providerToolName !== void 0 ? toolNameMapper.getCustomName(providerToolName) : activeToolCall?.name ?? toolNameMapper.getCustomName("unknown_tool");
 				const argumentsDelta = deltaTool.function?.arguments ?? "";
-				const activeToolCall = activeToolCalls[toolIndex];
 				if (isUndefined(activeToolCall)) {
 					activeToolCalls[toolIndex] = {
 						id: toolId,
@@ -201175,7 +201548,7 @@ const getUsageDetailNumber = (details, field) => {
 	return typeof value === "number" ? value : void 0;
 };
 //#endregion
-//#region node_modules/.pnpm/clanka@0.0.15_@effect+ai-openai-compat@4.0.0-beta.29_effect@4.0.0-beta.30__@effect+ai-o_cb421abed6b4689eec8c33622f2a024f/node_modules/clanka/dist/CopilotAuth.js
+//#region node_modules/.pnpm/clanka@0.0.17_@effect+ai-openai-compat@4.0.0-beta.30_effect@4.0.0-beta.30__@effect+ai-o_aaa5a0e42657b29782e5d1fe76ccda57/node_modules/clanka/dist/CopilotAuth.js
 /**
 * @since 1.0.0
 */
@@ -201366,7 +201739,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.0.15_@effect+ai-openai-compat@4.0.0-beta.29_effect@4.0.0-beta.30__@effect+ai-o_cb421abed6b4689eec8c33622f2a024f/node_modules/clanka/dist/Copilot.js
+//#region node_modules/.pnpm/clanka@0.0.17_@effect+ai-openai-compat@4.0.0-beta.30_effect@4.0.0-beta.30__@effect+ai-o_aaa5a0e42657b29782e5d1fe76ccda57/node_modules/clanka/dist/Copilot.js
 /**
 * @since 1.0.0
 */
@@ -201789,7 +202162,7 @@ Object.defineProperties(createChalk.prototype, styles);
 const chalk = createChalk();
 createChalk({ level: stderrColor ? stderrColor.level : 0 });
 //#endregion
-//#region node_modules/.pnpm/clanka@0.0.15_@effect+ai-openai-compat@4.0.0-beta.29_effect@4.0.0-beta.30__@effect+ai-o_cb421abed6b4689eec8c33622f2a024f/node_modules/clanka/dist/OutputFormatter.js
+//#region node_modules/.pnpm/clanka@0.0.17_@effect+ai-openai-compat@4.0.0-beta.30_effect@4.0.0-beta.30__@effect+ai-o_aaa5a0e42657b29782e5d1fe76ccda57/node_modules/clanka/dist/OutputFormatter.js
 /**
 * @since 1.0.0
 */
@@ -201833,19 +202206,24 @@ const doneIcon = "";
 //#endregion
 //#region src/TaskTools.ts
 var ChosenTaskDeferred = class extends Reference("lalph/TaskTools/ChosenTaskDeferred", { defaultValue: makeUnsafe$13 }) {};
+var CurrentTaskRef = class CurrentTaskRef extends Service$1()("lalph/TaskTools/CurrentTaskRef") {
+	static update(f) {
+		return serviceOption(CurrentTaskRef).pipe(map$8(map$15((ref) => updateAndGet(ref, f))));
+	}
+};
+const TaskList = Array$1(Struct({
+	id: String$1.annotate({ documentation: "The unique identifier of the task." }),
+	...pick(PrdIssue.fields, [
+		"title",
+		"description",
+		"state",
+		"priority",
+		"blockedBy"
+	])
+}));
 var TaskTools = class extends make$9(make$7("listTasks", {
 	description: "Returns the current list of tasks.",
-	success: Array$1(Struct({
-		id: String$1.annotate({ documentation: "The unique identifier of the task." }),
-		...pick(PrdIssue.fields, [
-			"title",
-			"description",
-			"state",
-			"priority",
-			"estimate",
-			"blockedBy"
-		])
-	})),
+	success: TaskList,
 	dependencies: [CurrentProjectId]
 }), make$7("createTask", {
 	description: "Create a new task and return it's id.",
@@ -201854,7 +202232,6 @@ var TaskTools = class extends make$9(make$7("listTasks", {
 		description: PrdIssue.fields.description,
 		state: PrdIssue.fields.state,
 		priority: PrdIssue.fields.priority,
-		estimate: PrdIssue.fields.estimate,
 		blockedBy: PrdIssue.fields.blockedBy
 	}),
 	success: String$1,
@@ -201869,6 +202246,10 @@ var TaskTools = class extends make$9(make$7("listTasks", {
 		blockedBy: optional$2(PrdIssue.fields.blockedBy)
 	}),
 	dependencies: [CurrentProjectId]
+}), make$7("removeTask", {
+	description: "Remove a task by it's id.",
+	parameters: String$1.annotate({ identifier: "taskId" }),
+	dependencies: [CurrentProjectId]
 })) {};
 var TaskToolsWithChoose = class extends merge(TaskTools, make$9(make$7("chooseTask", {
 	description: "Choose the task to work on",
@@ -201876,6 +202257,10 @@ var TaskToolsWithChoose = class extends merge(TaskTools, make$9(make$7("chooseTa
 		taskId: String$1,
 		githubPrNumber: optional$2(Number$1)
 	})
+}), make$7("listEligibleTasks", {
+	description: "List tasks eligible for being chosen with chooseTask.",
+	success: TaskList,
+	dependencies: [CurrentProjectId]
 }))) {};
 const TaskToolsHandlers = TaskToolsWithChoose.toLayer(gen(function* () {
 	const source = yield* IssueSource;
@@ -201889,7 +202274,18 @@ const TaskToolsHandlers = TaskToolsWithChoose.toLayer(gen(function* () {
 				description: issue.description,
 				state: issue.state,
 				priority: issue.priority,
-				estimate: issue.estimate,
+				blockedBy: issue.blockedBy
+			}));
+		}, orDie$2),
+		listEligibleTasks: fn("TaskTools.listEligibleTasks")(function* () {
+			yield* log$1(`Calling "listEligibleTasks"`);
+			const projectId = yield* CurrentProjectId;
+			return (yield* source.issues(projectId)).filter((t) => t.blockedBy.length === 0 && t.state === "todo").map((issue) => ({
+				id: issue.id ?? "",
+				title: issue.title,
+				description: issue.description,
+				state: issue.state,
+				priority: issue.priority,
 				blockedBy: issue.blockedBy
 			}));
 		}, orDie$2),
@@ -201903,17 +202299,24 @@ const TaskToolsHandlers = TaskToolsWithChoose.toLayer(gen(function* () {
 			return (yield* source.createIssue(projectId, new PrdIssue({
 				...options,
 				id: null,
+				estimate: null,
 				autoMerge: false
 			}))).id;
 		}, orDie$2),
 		updateTask: fn("TaskTools.updateTask")(function* (options) {
 			yield* log$1(`Calling "updateTask"`).pipe(annotateLogs({ taskId: options.taskId }));
 			const projectId = yield* CurrentProjectId;
+			yield* CurrentTaskRef.update((prev) => prev.update(options));
 			yield* source.updateIssue({
 				projectId,
 				issueId: options.taskId,
 				...options
 			});
+		}, orDie$2),
+		removeTask: fn("TaskTools.removeTask")(function* (taskId) {
+			yield* log$1(`Calling "removeTask"`).pipe(annotateLogs({ taskId }));
+			const projectId = yield* CurrentProjectId;
+			yield* source.cancelIssue(projectId, taskId);
 		}, orDie$2)
 	});
 }));
@@ -201965,10 +202368,15 @@ const runClanka = fnUntraced(
 			tools: options.withChoose ? TaskToolsWithChoose : TaskTools,
 			subagentModel: clankaSubagent(models, options.model)
 		}).pipe(provide$1(models.get(options.model)));
-		return yield* (options.stallTimeout ? withStallTimeout(options.stallTimeout)(agent.output) : agent.output).pipe(pretty, runForEachArray((out) => {
+		let stream = options.stallTimeout ? withStallTimeout(options.stallTimeout)(agent.output) : agent.output;
+		if (options.steer) yield* options.steer.pipe(switchMap(fnUntraced(function* (message) {
+			yield* log$1(`Received steer message: ${message}`);
+			yield* agent.steer(message);
+		}, fromEffectDrain)), runDrain, forkScoped);
+		return yield* stream.pipe(pretty, runForEachArray((out) => {
 			for (const item of out) process.stdout.write(item);
 			return void_$1;
-		}), (_) => _);
+		}));
 	},
 	scoped$1,
 	provide$1([layerServices, TaskToolsHandlers])
@@ -201984,8 +202392,9 @@ const agentWorker = fnUntraced(function* (options) {
 			model: options.preset.extraArgs.join(" "),
 			system: options.system,
 			prompt: options.prompt,
-			stallTimeout: options.stallTimeout
-		});
+			stallTimeout: options.stallTimeout,
+			steer: options.steer
+		}).pipe(options.taskRef ? provideService$2(CurrentTaskRef, options.taskRef) : identity);
 		return ExitCode(0);
 	}
 	return yield* pipe(options.preset.cliAgent.command({
@@ -202168,7 +202577,8 @@ const agentReviewer = fnUntraced(function* (options) {
 				}),
 				onSome: (prompt) => promptGen.promptReviewCustom({
 					prompt,
-					specsDirectory: options.specsDirectory
+					specsDirectory: options.specsDirectory,
+					removePrdNotes: true
 				})
 			}),
 			stallTimeout: options.stallTimeout
@@ -202183,7 +202593,8 @@ const agentReviewer = fnUntraced(function* (options) {
 			}),
 			onSome: (prompt) => promptGen.promptReviewCustom({
 				prompt,
-				specsDirectory: options.specsDirectory
+				specsDirectory: options.specsDirectory,
+				removePrdNotes: false
 			})
 		}),
 		prdFilePath: pathService.join(".lalph", "prd.yml"),
@@ -202284,17 +202695,30 @@ const run = fnUntraced(function* (options) {
 	}));
 	if (yield* gen(function* () {
 		registry.update(currentWorker.state, (s) => s.transitionTo(WorkerStatus.Working({ issueId: taskId })));
-		const instructions = (yield* PromptGen).prompt({
+		const promptGen = yield* PromptGen;
+		const instructions = taskPreset.cliAgent.command ? promptGen.prompt({
 			specsDirectory: options.specsDirectory,
 			targetBranch: getOrUndefined$1(options.targetBranch),
 			task: chosenTask.prd,
 			githubPrNumber: chosenTask.githubPrNumber ?? void 0,
 			gitFlow
+		}) : promptGen.promptClanka({
+			specsDirectory: options.specsDirectory,
+			targetBranch: getOrUndefined$1(options.targetBranch),
+			task: chosenTask.prd,
+			githubPrNumber: chosenTask.githubPrNumber ?? void 0,
+			gitFlow
+		});
+		const issueRef = make$63(chosenTask.prd.update({ state: "in-progress" }));
+		const steer = yield* taskUpdateSteer({
+			issueId: taskId,
+			current: issueRef
 		});
 		yield* log$1(`Agent exited with code: ${yield* agentWorker({
 			stallTimeout: options.stallTimeout,
 			preset: taskPreset,
-			prompt: instructions
+			prompt: instructions,
+			steer
 		}).pipe(catchStallInReview, withSpan("Main.agentWorker"))}`);
 		if (options.review) {
 			registry.update(currentWorker.state, (s) => s.transitionTo(WorkerStatus.Reviewing({ issueId: taskId })));
@@ -202421,6 +202845,19 @@ const watchTaskState = fnUntraced(function* (options) {
 		}));
 	}), withSpan("Main.watchTaskState"));
 });
+const taskUpdateSteer = fnUntraced(function* (options) {
+	return toStreamResult(yield* AtomRegistry, currentIssuesAtom(yield* CurrentProjectId)).pipe(drop(1), retry$1(forever$1), orDie, filterMap$2((issues) => {
+		const issue = issues.find((entry) => entry.id === options.issueId);
+		if (!issue) return failVoid;
+		if (!issue.isChangedComparedTo(options.current.current)) return failVoid;
+		set$9(options.current, issue);
+		return succeed$8(`The task has been updated by the user. Here is the latest information:
+
+# ${issue.title}
+
+${issue.description}`);
+	}));
+});
 //#endregion
 //#region src/Agents/planner.ts
 const agentPlanner = fnUntraced(function* (options) {
@@ -202520,7 +202957,12 @@ var Editor = class extends Service$1()("lalph/Editor", { make: gen(function* ()
 			const content = (yield* fs.readFileString(file)).trim();
 			if (content === initialContent) return yield* new NoSuchElementError();
 			return content;
-		}, scoped$1, provideService$2(ChildProcessSpawner, spawner), option$1)
+		}, scoped$1, provideService$2(ChildProcessSpawner, spawner), option$1),
+		saveTemp: fnUntraced(function* (content, options) {
+			const file = yield* fs.makeTempFile({ suffix: options.suffix ?? ".txt" });
+			yield* fs.writeFileString(file, content);
+			return file;
+		})
 	};
 }) }) {
 	static layer = effect$1(this, this.make).pipe(provide$3(PlatformServices));
@@ -202537,6 +202979,10 @@ const commandPlan = make$46("plan", {
 		onSuccess: (path) => fs.readFileString(path).pipe(asSome)
 	});
 	if (isNone(thePlan)) return;
+	yield* addFinalizer((exit) => {
+		if (isSuccess$3(exit)) return void_$1;
+		return pipe(editor.saveTemp(thePlan.value, { suffix: ".md" }), flatMap$4((file) => log$1(`Saved your plan to: ${file}`)), ignore$1);
+	});
 	yield* gen(function* () {
 		const project = withNewProject ? yield* addOrUpdateProject() : yield* selectProject;
 		const { specsDirectory } = yield* commandRoot;
@@ -202553,7 +202999,7 @@ const commandPlan = make$46("plan", {
 		CurrentIssueSource.layer,
 		ClankaModels.layer
 	]));
-}, provide$1(Editor.layer))), withSubcommands([commandPlanTasks]));
+}, scoped$1, provide$1(Editor.layer))), withSubcommands([commandPlanTasks]));
 const plan = fnUntraced(function* (options) {
 	const fs = yield* FileSystem;
 	const pathService = yield* Path$1;
@@ -202630,12 +203076,18 @@ const FrontMatterSchema = toCodecJson(Struct({
 	autoMerge: Boolean$2
 }));
 const handler$1 = flow(withHandler(fnUntraced(function* () {
-	const content = yield* (yield* Editor).editTemp({
+	const editor = yield* Editor;
+	const content = yield* editor.editTemp({
 		suffix: ".md",
 		initialContent: issueTemplate
 	});
 	if (isNone(content)) return;
-	const lines = content.value.split("\n");
+	const contentValue = content.value.trim();
+	yield* addFinalizer((exit) => {
+		if (isSuccess$3(exit)) return void_$1;
+		return pipe(editor.saveTemp(contentValue, { suffix: ".md" }), flatMap$4((file) => log$1(`Saved your issue to: ${file}`)), ignore$1);
+	});
+	const lines = contentValue.split("\n");
 	const yamlLines = [];
 	let descriptionStartIndex = 0;
 	for (let i = 0; i < lines.length; i++) {
@@ -202663,7 +203115,7 @@ const handler$1 = flow(withHandler(fnUntraced(function* () {
 		console.log(`Created issue with ID: ${created.id}`);
 		console.log(`URL: ${created.url}`);
 	}).pipe(provide$1([layerProjectIdPrompt, CurrentIssueSource.layer]));
-})), provide(Editor.layer));
+}, scoped$1)), provide(Editor.layer));
 const commandIssue = make$46("issue").pipe(withDescription("Create a new issue in your editor."), withAlias("i"), handler$1);
 //#endregion
 //#region src/commands/edit.ts
@@ -202677,7 +203129,7 @@ const commandEdit = make$46("edit").pipe(withDescription("Open the selected proj
 const commandSource = make$46("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.45";
+var version = "0.3.47";
 //#endregion
 //#region src/commands/projects/ls.ts
 const commandProjectsLs = make$46("ls").pipe(withDescription("List configured projects and how they run (enabled state, concurrency, branch, git flow, review agent)."), withHandler(fnUntraced(function* () {