lalph 0.2.10 → 0.2.12

package/dist/cli.mjs

@@ -151168,6 +151168,139 @@ const withWorkerState = (projectId) => (effect) => AtomRegistry.use((registry) =
 	}));
 });
 
+//#endregion
+//#region src/Projects.ts
+const layerProjectIdPrompt = effect$1(CurrentProjectId, gen(function* () {
+	return (yield* selectProject).id;
+})).pipe(provide$3(Settings.layer), provide$3(CurrentIssueSource.layer));
+const allProjects = new Setting("projects", Array$1(Project$1));
+const getAllProjects = Settings.get(allProjects).pipe(map$8(getOrElse$1(() => [])));
+const projectById = fnUntraced(function* (projectId) {
+	const projects = yield* getAllProjects;
+	return findFirst$3(projects, (p) => p.id === projectId);
+});
+const allProjectsAtom = (function() {
+	const read = Settings.runtime.atom(fnUntraced(function* () {
+		const projects = yield* (yield* Settings).get(allProjects);
+		return getOrElse$1(projects, () => []);
+	}));
+	const set = Settings.runtime.fn()(fnUntraced(function* (value, get) {
+		yield* (yield* Settings).set(allProjects, some$2(value));
+		get.refresh(read);
+	}));
+	return writable((get) => {
+		get.mount(set);
+		return get(read);
+	}, (ctx, value) => {
+		ctx.set(set, value);
+	}, (r) => r(read));
+})();
+const projectAtom = family((projectId) => {
+	const read = make(fnUntraced(function* (get) {
+		const projects = yield* get.result(allProjectsAtom);
+		return findFirst$3(projects, (p) => p.id === projectId);
+	}));
+	const set = Settings.runtime.fn()(fnUntraced(function* (value, get) {
+		const projects = yield* get.result(allProjectsAtom);
+		const updatedProjects = match$7(value, {
+			onNone: () => filter$6(projects, (p) => p.id !== projectId),
+			onSome: (project) => map$12(projects, (p) => p.id === projectId ? project : p)
+		});
+		get.set(allProjectsAtom, updatedProjects);
+	}));
+	return writable((get) => {
+		get.mount(set);
+		return get(read);
+	}, (ctx, value) => {
+		ctx.set(set, value);
+	}, (refresh) => refresh(read));
+});
+const selectProject = gen(function* () {
+	const projects = yield* getAllProjects;
+	if (projects.length === 0) return yield* welcomeWizard;
+	else if (projects.length === 1) {
+		const project = projects[0];
+		yield* log$1(`Using project: ${project.id}`);
+		return project;
+	}
+	return yield* autoComplete({
+		message: "Select a project:",
+		choices: projects.map((p) => ({
+			title: p.id,
+			value: p
+		}))
+	});
+});
+const welcomeWizard = gen(function* () {
+	const welcome = [
+		"  .--.",
+		" |^()^|  lalph",
+		"  '--'",
+		"",
+		"Welcome! Let's add your first project.",
+		"Projects let you configure how lalph runs tasks.",
+		""
+	].join("\n");
+	console.log(welcome);
+	return yield* addOrUpdateProject();
+});
+const addOrUpdateProject = fnUntraced(function* (existing) {
+	const projects = yield* getAllProjects;
+	const id = existing ? existing.id : yield* text$2({
+		message: "Project name",
+		validate(input) {
+			input = input.trim();
+			if (input.length === 0) return fail$4("Project name cannot be empty");
+			else if (projects.some((p) => p.id === input)) return fail$4("Project already exists");
+			return succeed$1(input);
+		}
+	});
+	const concurrency = yield* integer$2({
+		message: "Concurrency (number of tasks to run in parallel)",
+		min: 1
+	});
+	const targetBranch = pipe(yield* text$2({ message: "Target branch (leave empty to use HEAD)" }), trim, liftPredicate(isNonEmpty));
+	const gitFlow = yield* select({
+		message: "Git flow",
+		choices: [{
+			title: "Pull Request",
+			description: "Create a pull request for each task",
+			value: "pr"
+		}, {
+			title: "Commit",
+			description: "Tasks are committed directly to the target branch",
+			value: "commit"
+		}]
+	});
+	const reviewAgent = yield* toggle({ message: "Enable review agent?" });
+	const project = new Project$1({
+		id: ProjectId.makeUnsafe(id),
+		enabled: existing ? existing.enabled : true,
+		concurrency,
+		targetBranch,
+		gitFlow,
+		reviewAgent
+	});
+	yield* Settings.set(allProjects, some$2(existing ? projects.map((p) => p.id === project.id ? project : p) : [...projects, project]));
+	const source = yield* IssueSource;
+	yield* source.reset.pipe(provideService(CurrentProjectId, project.id));
+	yield* source.settings(project.id);
+	return project;
+});
+
+//#endregion
+//#region src/shared/git.ts
+const parseBranch = (ref) => {
+	const parts = ref.split("/");
+	const remote = parts.length > 1 ? parts[0] : "origin";
+	const branch = parts.length > 1 ? parts.slice(1).join("/") : parts[0];
+	return {
+		remote,
+		branch,
+		branchWithRemote: `${remote}/${branch}`
+	};
+};
+
 //#endregion
 //#region src/Worktree.ts
 var Worktree = class extends Service$1()("lalph/Worktree", { make: gen(function* () {
@@ -151188,17 +151321,16 @@ var Worktree = class extends Service$1()("lalph/Worktree", { make: gen(function*
 	}));
 	yield* make$23`git worktree add ${directory} -d HEAD`.pipe(exitCode);
 	yield* fs.makeDirectory(pathService.join(directory, ".lalph"), { recursive: true });
-	const setupPath = pathService.resolve("scripts", "worktree-setup.sh");
-	yield* seedSetupScript(setupPath);
-	yield* seedCheckoutScript(pathService.resolve("scripts", "checkout-setup.sh"));
-	if (yield* fs.exists(setupPath)) yield* make$23({
-		cwd: directory,
-		shell: process.env.SHELL ?? true
-	})`${setupPath}`.pipe(exitCode);
+	const execHelpers = yield* makeExecHelpers({ directory });
+	yield* setupWorktree({
+		directory,
+		exec: execHelpers.exec,
+		pathService
+	});
 	return {
 		directory,
 		inExisting,
-		...yield* makeExecHelpers({ directory })
+		...execHelpers
 	};
 }).pipe(withSpan("Worktree.build")) }) {
 	static layer = effect$1(this, this.make);
@@ -151223,11 +151355,31 @@ const seedSetupScript = fnUntraced(function* (setupPath) {
 	yield* fs.writeFileString(setupPath, setupScriptTemplate(baseBranch));
 	yield* fs.chmod(setupPath, 493);
 });
-const seedCheckoutScript = fnUntraced(function* (setupPath) {
+const setupWorktree = fnUntraced(function* (options) {
 	const fs = yield* FileSystem;
-	if (yield* fs.exists(setupPath)) return;
-	yield* fs.writeFileString(setupPath, checkoutScriptTemplate);
-	yield* fs.chmod(setupPath, 493);
+	const targetBranch = yield* getTargetBranch;
+	const shouldUseWorktree = isSome(targetBranch);
+	if (shouldUseWorktree) {
+		const parsed = parseBranch(targetBranch.value);
+		if ((yield* options.exec`git checkout ${parsed.branchWithRemote}`) !== 0) {
+			yield* options.exec`git checkout -b ${parsed.branch}`;
+			yield* options.exec`git push -u ${parsed.remote} ${parsed.branch}`;
+		}
+	}
+	const setupPath = shouldUseWorktree ? options.pathService.join(options.directory, "scripts", "worktree-setup.sh") : options.pathService.resolve("scripts", "worktree-setup.sh");
+	yield* seedSetupScript(setupPath);
+	if (yield* fs.exists(setupPath)) {
+		const setupCwd = shouldUseWorktree ? options.directory : options.pathService.resolve(".");
+		yield* make$23({
+			cwd: setupCwd,
+			shell: process.env.SHELL ?? true
+		})`${setupPath}`.pipe(exitCode);
+	}
+});
+const getTargetBranch = gen(function* () {
+	const project = yield* projectById(yield* CurrentProjectId);
+	if (isNone(project)) return none$4();
+	return project.value.targetBranch;
 });
 const discoverBaseBranch = gen(function* () {
 	const originHead = yield* make$23`git symbolic-ref --short refs/remotes/origin/HEAD`.pipe(string, catch_$1((_) => succeed$1("")), map$8((output) => output.trim()));
@@ -151243,13 +151395,6 @@ git checkout origin/${baseBranch}
 
 # Seeded by lalph. Customize this to prepare new worktrees.
 `;
-const checkoutScriptTemplate = `#!/usr/bin/env bash
-set -euo pipefail
-
-pnpm install || true
-
-# Seeded by lalph. Customize this to prepare branches after checkout.
-`;
 const makeExecHelpers = fnUntraced(function* (options) {
 	const spawner = yield* ChildProcessSpawner;
 	const provide = provideService(ChildProcessSpawner, spawner);
@@ -151559,19 +151704,6 @@ const makeWaitForFile = gen(function* () {
 	return (directory, name) => pipe(fs.watch(directory), filter$2((e) => pathService.basename(e.path) === name), runHead);
 });
 
-//#endregion
-//#region src/shared/git.ts
-const parseBranch = (ref) => {
-	const parts = ref.split("/");
-	const remote = parts.length > 1 ? parts[0] : "origin";
-	const branch = parts.length > 1 ? parts.slice(1).join("/") : parts[0];
-	return {
-		remote,
-		branch,
-		branchWithRemote: `${remote}/${branch}`
-	};
-};
-
 //#endregion
 //#region src/GitFlow.ts
 var GitFlow = class extends Service$1()("lalph/GitFlow") {};
@@ -151730,126 +151862,6 @@ const agentTimeout = fnUntraced(function* (options) {
 	}));
 });
 
-//#endregion
-//#region src/Projects.ts
-const layerProjectIdPrompt = effect$1(CurrentProjectId, gen(function* () {
-	return (yield* selectProject).id;
-})).pipe(provide$3(Settings.layer), provide$3(CurrentIssueSource.layer));
-const allProjects = new Setting("projects", Array$1(Project$1));
-const getAllProjects = Settings.get(allProjects).pipe(map$8(getOrElse$1(() => [])));
-const projectById = fnUntraced(function* (projectId) {
-	const projects = yield* getAllProjects;
-	return findFirst$3(projects, (p) => p.id === projectId);
-});
-const allProjectsAtom = (function() {
-	const read = Settings.runtime.atom(fnUntraced(function* () {
-		const projects = yield* (yield* Settings).get(allProjects);
-		return getOrElse$1(projects, () => []);
-	}));
-	const set = Settings.runtime.fn()(fnUntraced(function* (value, get) {
-		yield* (yield* Settings).set(allProjects, some$2(value));
-		get.refresh(read);
-	}));
-	return writable((get) => {
-		get.mount(set);
-		return get(read);
-	}, (ctx, value) => {
-		ctx.set(set, value);
-	}, (r) => r(read));
-})();
-const projectAtom = family((projectId) => {
-	const read = make(fnUntraced(function* (get) {
-		const projects = yield* get.result(allProjectsAtom);
-		return findFirst$3(projects, (p) => p.id === projectId);
-	}));
-	const set = Settings.runtime.fn()(fnUntraced(function* (value, get) {
-		const projects = yield* get.result(allProjectsAtom);
-		const updatedProjects = match$7(value, {
-			onNone: () => filter$6(projects, (p) => p.id !== projectId),
-			onSome: (project) => map$12(projects, (p) => p.id === projectId ? project : p)
-		});
-		get.set(allProjectsAtom, updatedProjects);
-	}));
-	return writable((get) => {
-		get.mount(set);
-		return get(read);
-	}, (ctx, value) => {
-		ctx.set(set, value);
-	}, (refresh) => refresh(read));
-});
-const selectProject = gen(function* () {
-	const projects = yield* getAllProjects;
-	if (projects.length === 0) return yield* welcomeWizard;
-	else if (projects.length === 1) {
-		const project = projects[0];
-		yield* log$1(`Using project: ${project.id}`);
-		return project;
-	}
-	return yield* autoComplete({
-		message: "Select a project:",
-		choices: projects.map((p) => ({
-			title: p.id,
-			value: p
-		}))
-	});
-});
-const welcomeWizard = gen(function* () {
-	const welcome = [
-		"  .--.",
-		" |^()^|  lalph",
-		"  '--'",
-		"",
-		"Welcome! Let's add your first project.",
-		"Projects let you configure how lalph runs tasks.",
-		""
-	].join("\n");
-	console.log(welcome);
-	return yield* addOrUpdateProject();
-});
-const addOrUpdateProject = fnUntraced(function* (existing) {
-	const projects = yield* getAllProjects;
-	const id = existing ? existing.id : yield* text$2({
-		message: "Project name",
-		validate(input) {
-			input = input.trim();
-			if (input.length === 0) return fail$4("Project name cannot be empty");
-			else if (projects.some((p) => p.id === input)) return fail$4("Project already exists");
-			return succeed$1(input);
-		}
-	});
-	const concurrency = yield* integer$2({
-		message: "Concurrency (number of tasks to run in parallel)",
-		min: 1
-	});
-	const targetBranch = pipe(yield* text$2({ message: "Target branch (leave empty to use HEAD)" }), trim, liftPredicate(isNonEmpty));
-	const gitFlow = yield* select({
-		message: "Git flow",
-		choices: [{
-			title: "Pull Request",
-			description: "Create a pull request for each task",
-			value: "pr"
-		}, {
-			title: "Commit",
-			description: "Tasks are committed directly to the target branch",
-			value: "commit"
-		}]
-	});
-	const reviewAgent = yield* toggle({ message: "Enable review agent?" });
-	const project = new Project$1({
-		id: ProjectId.makeUnsafe(id),
-		enabled: existing ? existing.enabled : true,
-		concurrency,
-		targetBranch,
-		gitFlow,
-		reviewAgent
-	});
-	yield* Settings.set(allProjects, some$2(existing ? projects.map((p) => p.id === project.id ? project : p) : [...projects, project]));
-	const source = yield* IssueSource;
-	yield* source.reset.pipe(provideService(CurrentProjectId, project.id));
-	yield* source.settings(project.id);
-	return project;
-});
-
 //#endregion
 //#region src/commands/root.ts
 const run = fnUntraced(function* (options) {
@@ -151864,19 +151876,6 @@ const run = fnUntraced(function* (options) {
 	const gitFlow = yield* GitFlow;
 	const currentWorker = yield* CurrentWorkerState;
 	const registry = yield* AtomRegistry;
-	if (isSome(options.targetBranch)) {
-		const parsed = parseBranch(options.targetBranch.value);
-		if ((yield* worktree.exec`git checkout ${parsed.branchWithRemote}`) !== 0) {
-			yield* worktree.exec`git checkout -b ${parsed.branch}`;
-			yield* worktree.exec`git push -u ${parsed.remote} ${parsed.branch}`;
-		}
-	}
-	if (gitFlow.branch) {
-		yield* worktree.exec`git branch -D ${gitFlow.branch}`;
-		yield* worktree.exec`git checkout -b ${gitFlow.branch}`;
-	}
-	const checkoutScript = pathService.resolve("scripts", "checkout-setup.sh");
-	if (yield* fs.exists(checkoutScript)) yield* worktree.exec`${checkoutScript}`;
 	yield* addFinalizer(fnUntraced(function* () {
 		const currentBranchName = yield* worktree.currentBranch(worktree.directory).pipe(option$1, map$8(getOrUndefined));
 		if (!currentBranchName) return;
@@ -151886,9 +151885,12 @@ const run = fnUntraced(function* (options) {
 	let taskId = void 0;
 	yield* addFinalizer(fnUntraced(function* (exit) {
 		if (exit._tag === "Success") return;
-		const prd = yield* Prd;
-		if (taskId) yield* prd.maybeRevertIssue({ issueId: taskId });
-		else yield* prd.revertUpdatedIssues;
+		if (taskId) yield* source.updateIssue({
+			projectId,
+			issueId: taskId,
+			state: "todo"
+		});
+		else yield* (yield* Prd).revertUpdatedIssues;
 	}, ignore()));
 	registry.update(currentWorker.state, (s) => s.transitionTo(WorkerStatus.ChoosingTask()));
 	const chosenTask = yield* agentChooser({
@@ -151979,7 +151981,7 @@ const runProject = fnUntraced(function* (options) {
 			commandPrefix: options.commandPrefix,
 			review: options.project.reviewAgent
 		}).pipe(provide$1(options.project.gitFlow === "commit" ? GitFlowCommit : GitFlowPR, { local: true }), withWorkerState(options.project.id))), catchTags({
-			NoMoreWork(_) {
+			NoMoreWork(_error) {
 				if (isFinite) {
 					iterations = currentIteration;
 					return log$1(`No more work to process, ending after ${currentIteration} iteration(s).`);
@@ -151987,7 +151989,7 @@ const runProject = fnUntraced(function* (options) {
 				const log = size$3(fibers) <= 1 ? log$1("No more work to process, waiting 30 seconds...") : void_$1;
 				return andThen(log, sleep(seconds(30)));
 			},
-			QuitError(_) {
+			QuitError(_error) {
 				quit = true;
 				return void_$1;
 			}
@@ -152094,7 +152096,7 @@ const commandPlanTasks = make$35("tasks", { specificationPath }).pipe(withDescri
 	Settings.layer,
 	PromptGen.layer,
 	Prd.layerProvided.pipe(provide$3(layerProjectIdPrompt)),
-	Worktree.layer
+	Worktree.layer.pipe(provide$3(layerProjectIdPrompt))
 ]))));
 
 //#endregion
@@ -152120,11 +152122,6 @@ const plan = fnUntraced(function* (options) {
 	const pathService = yield* Path$1;
 	const worktree = yield* Worktree;
 	const cliAgent = yield* getOrSelectCliAgent;
-	const exec = (template, ...args) => exitCode(make$23({
-		cwd: worktree.directory,
-		extendEnv: true
-	})(template, ...args));
-	if (isSome(options.targetBranch)) yield* exec`git checkout ${options.targetBranch.value.includes("/") ? options.targetBranch.value : `origin/${options.targetBranch.value}`}`;
 	yield* agentPlanner({
 		specsDirectory: options.specsDirectory,
 		commandPrefix: options.commandPrefix,
@@ -152142,7 +152139,7 @@ const plan = fnUntraced(function* (options) {
 }, scoped$1, provide$1([
 	PromptGen.layer,
 	Prd.layerProvided,
-	Worktree.layer,
+	Worktree.layer.pipe(provide$3(layerProjectIdPrompt)),
 	Settings.layer,
 	CurrentIssueSource.layer
 ]));
@@ -152232,7 +152229,7 @@ const commandSource = make$35("source").pipe(withDescription("Select the issue s
 
 //#endregion
 //#region package.json
-var version = "0.2.10";
+var version = "0.2.12";
 
 //#endregion
 //#region src/commands/projects/ls.ts

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "lalph",
   "type": "module",
-  "version": "0.2.10",
+  "version": "0.2.12",
   "publishConfig": {
     "access": "public"
   },

package/src/Worktree.ts

@@ -9,6 +9,7 @@ import {
   Layer,
   Option,
   Path,
+  PlatformError,
   Schema,
   ServiceMap,
   Stream,
@@ -18,6 +19,9 @@ import { RunnerStalled } from "./domain/Errors.ts"
 import type { CliAgent } from "./domain/CliAgent.ts"
 import { constWorkerMaxOutputChunks, CurrentWorkerState } from "./Workers.ts"
 import { AtomRegistry } from "effect/unstable/reactivity"
+import { CurrentProjectId } from "./Settings.ts"
+import { projectById } from "./Projects.ts"
+import { parseBranch } from "./shared/git.ts"
 
 export class Worktree extends ServiceMap.Service<Worktree>()("lalph/Worktree", {
   make: Effect.gen(function* () {
@@ -52,22 +56,17 @@ export class Worktree extends ServiceMap.Service<Worktree>()("lalph/Worktree", {
       recursive: true,
     })
 
-    const setupPath = pathService.resolve("scripts", "worktree-setup.sh")
-    yield* seedSetupScript(setupPath)
-    yield* seedCheckoutScript(
-      pathService.resolve("scripts", "checkout-setup.sh"),
-    )
-    if (yield* fs.exists(setupPath)) {
-      yield* ChildProcess.make({
-        cwd: directory,
-        shell: process.env.SHELL ?? true,
-      })`${setupPath}`.pipe(ChildProcess.exitCode)
-    }
+    const execHelpers = yield* makeExecHelpers({ directory })
+    yield* setupWorktree({
+      directory,
+      exec: execHelpers.exec,
+      pathService,
+    })
 
     return {
       directory,
       inExisting,
-      ...(yield* makeExecHelpers({ directory })),
+      ...execHelpers,
     } as const
   }).pipe(Effect.withSpan("Worktree.build")),
 }) {
@@ -107,13 +106,53 @@ const seedSetupScript = Effect.fnUntraced(function* (setupPath: string) {
   yield* fs.chmod(setupPath, 0o755)
 })
 
-const seedCheckoutScript = Effect.fnUntraced(function* (setupPath: string) {
+const setupWorktree = Effect.fnUntraced(function* (options: {
+  readonly directory: string
+  readonly exec: (
+    template: TemplateStringsArray,
+    ...args: Array<string | number | boolean>
+  ) => Effect.Effect<ChildProcessSpawner.ExitCode, PlatformError.PlatformError>
+  readonly pathService: Path.Path
+}) {
   const fs = yield* FileSystem.FileSystem
+  const targetBranch = yield* getTargetBranch
+  const shouldUseWorktree = Option.isSome(targetBranch)
+
+  if (shouldUseWorktree) {
+    const parsed = parseBranch(targetBranch.value)
+    const code = yield* options.exec`git checkout ${parsed.branchWithRemote}`
+    if (code !== 0) {
+      yield* options.exec`git checkout -b ${parsed.branch}`
+      yield* options.exec`git push -u ${parsed.remote} ${parsed.branch}`
+    }
+  }
 
-  if (yield* fs.exists(setupPath)) return
+  const setupPath = shouldUseWorktree
+    ? options.pathService.join(
+        options.directory,
+        "scripts",
+        "worktree-setup.sh",
+      )
+    : options.pathService.resolve("scripts", "worktree-setup.sh")
+  yield* seedSetupScript(setupPath)
+  if (yield* fs.exists(setupPath)) {
+    const setupCwd = shouldUseWorktree
+      ? options.directory
+      : options.pathService.resolve(".")
+    yield* ChildProcess.make({
+      cwd: setupCwd,
+      shell: process.env.SHELL ?? true,
+    })`${setupPath}`.pipe(ChildProcess.exitCode)
+  }
+})
 
-  yield* fs.writeFileString(setupPath, checkoutScriptTemplate)
-  yield* fs.chmod(setupPath, 0o755)
+const getTargetBranch = Effect.gen(function* () {
+  const projectId = yield* CurrentProjectId
+  const project = yield* projectById(projectId)
+  if (Option.isNone(project)) {
+    return Option.none<string>()
+  }
+  return project.value.targetBranch
 })
 
 const discoverBaseBranch = Effect.gen(function* () {
@@ -148,14 +187,6 @@ git checkout origin/${baseBranch}
 
 # Seeded by lalph. Customize this to prepare new worktrees.
 `
-const checkoutScriptTemplate = `#!/usr/bin/env bash
-set -euo pipefail
-
-pnpm install || true
-
-# Seeded by lalph. Customize this to prepare branches after checkout.
-`
-
 const makeExecHelpers = Effect.fnUntraced(function* (options: {
   readonly directory: string
 }) {

package/src/commands/plan/tasks.ts

@@ -54,7 +54,7 @@ export const commandPlanTasks = Command.make("tasks", {
         Settings.layer,
         PromptGen.layer,
         Prd.layerProvided.pipe(Layer.provide(layerProjectIdPrompt)),
-        Worktree.layer,
+        Worktree.layer.pipe(Layer.provide(layerProjectIdPrompt)),
       ]),
     ),
   ),

package/src/commands/plan.ts

@@ -1,14 +1,27 @@
-import { Data, Effect, FileSystem, Option, Path, pipe, Schema } from "effect"
+import {
+  Data,
+  Effect,
+  FileSystem,
+  Layer,
+  Option,
+  Path,
+  pipe,
+  Schema,
+} from "effect"
 import { PromptGen } from "../PromptGen.ts"
 import { Prd } from "../Prd.ts"
-import { ChildProcess } from "effect/unstable/process"
 import { Worktree } from "../Worktree.ts"
+import type { ChildProcess } from "effect/unstable/process"
 import { getCommandPrefix, getOrSelectCliAgent } from "./agent.ts"
 import { Command, Flag } from "effect/unstable/cli"
 import { CurrentIssueSource } from "../CurrentIssueSource.ts"
 import { commandRoot } from "./root.ts"
 import { CurrentProjectId, Settings } from "../Settings.ts"
-import { addOrUpdateProject, selectProject } from "../Projects.ts"
+import {
+  addOrUpdateProject,
+  layerProjectIdPrompt,
+  selectProject,
+} from "../Projects.ts"
 import { agentPlanner } from "../Agents/planner.ts"
 import { agentTasker } from "../Agents/tasker.ts"
 import { commandPlanTasks } from "./plan/tasks.ts"
@@ -64,24 +77,6 @@ const plan = Effect.fnUntraced(
     const worktree = yield* Worktree
     const cliAgent = yield* getOrSelectCliAgent
 
-    const exec = (
-      template: TemplateStringsArray,
-      ...args: Array<string | number | boolean>
-    ) =>
-      ChildProcess.exitCode(
-        ChildProcess.make({
-          cwd: worktree.directory,
-          extendEnv: true,
-        })(template, ...args),
-      )
-
-    if (Option.isSome(options.targetBranch)) {
-      const targetWithRemote = options.targetBranch.value.includes("/")
-        ? options.targetBranch.value
-        : `origin/${options.targetBranch.value}`
-      yield* exec`git checkout ${targetWithRemote}`
-    }
-
     yield* agentPlanner({
       specsDirectory: options.specsDirectory,
       commandPrefix: options.commandPrefix,
@@ -119,7 +114,7 @@ const plan = Effect.fnUntraced(
   Effect.provide([
     PromptGen.layer,
     Prd.layerProvided,
-    Worktree.layer,
+    Worktree.layer.pipe(Layer.provide(layerProjectIdPrompt)),
     Settings.layer,
     CurrentIssueSource.layer,
   ]),

package/src/commands/root.ts

@@ -36,7 +36,6 @@ import {
 } from "../Workers.ts"
 import { WorkerStatus } from "../domain/WorkerState.ts"
 import { GitFlow, GitFlowCommit, GitFlowPR } from "../GitFlow.ts"
-import { parseBranch } from "../shared/git.ts"
 import { getAllProjects, welcomeWizard } from "../Projects.ts"
 import type { Project } from "../domain/Project.ts"
 
@@ -66,24 +65,6 @@ const run = Effect.fnUntraced(
     const currentWorker = yield* CurrentWorkerState
     const registry = yield* AtomRegistry.AtomRegistry
 
-    if (Option.isSome(options.targetBranch)) {
-      const parsed = parseBranch(options.targetBranch.value)
-      const code = yield* worktree.exec`git checkout ${parsed.branchWithRemote}`
-      if (code !== 0) {
-        yield* worktree.exec`git checkout -b ${parsed.branch}`
-        yield* worktree.exec`git push -u ${parsed.remote} ${parsed.branch}`
-      }
-    }
-    if (gitFlow.branch) {
-      yield* worktree.exec`git branch -D ${gitFlow.branch}`
-      yield* worktree.exec`git checkout -b ${gitFlow.branch}`
-    }
-
-    const checkoutScript = pathService.resolve("scripts", "checkout-setup.sh")
-    if (yield* fs.exists(checkoutScript)) {
-      yield* worktree.exec`${checkoutScript}`
-    }
-
     // ensure cleanup of branch after run
     yield* Effect.addFinalizer(
       Effect.fnUntraced(function* () {
@@ -105,12 +86,14 @@ const run = Effect.fnUntraced(
     yield* Effect.addFinalizer(
       Effect.fnUntraced(function* (exit) {
         if (exit._tag === "Success") return
-        const prd = yield* Prd
         if (taskId) {
-          yield* prd.maybeRevertIssue({
+          yield* source.updateIssue({
+            projectId,
             issueId: taskId,
+            state: "todo",
           })
         } else {
+          const prd = yield* Prd
           yield* prd.revertUpdatedIssues
         }
       }, Effect.ignore()),
@@ -284,7 +267,7 @@ const runProject = Effect.fnUntraced(
           ),
         ),
         Effect.catchTags({
-          NoMoreWork(_) {
+          NoMoreWork(_error) {
             if (isFinite) {
               // If we have a finite number of iterations, we exit when no more
               // work is found
@@ -299,7 +282,7 @@ const runProject = Effect.fnUntraced(
                 : Effect.void
             return Effect.andThen(log, Effect.sleep(Duration.seconds(30)))
           },
-          QuitError(_) {
+          QuitError(_error) {
             quit = true
             return Effect.void
           },