lalph 0.1.16 → 0.1.18

package/dist/cli.mjs

@@ -59594,7 +59594,7 @@ const selectedCliAgentId = new Setting("selectedCliAgentId", Literals(allCliAgen
 
 //#endregion
 //#region src/domain/PrdIssue.ts
-var PrdIssue = class extends Class("PrdIssue")({
+var PrdIssue = class PrdIssue extends Class("PrdIssue")({
 	id: NullOr(String$1).annotate({ description: "The unique identifier of the issue. If null, it is considered a new issue." }),
 	title: String$1.annotate({ description: "The title of the issue" }),
 	description: String$1.annotate({ description: "The description of the issue in markdown format." }),
@@ -59607,8 +59607,13 @@ var PrdIssue = class extends Class("PrdIssue")({
 }) {
 	static Array = Array$1(this);
 	static ArrayFromJson = toCodecJson(this.Array);
-	static arrayToJson(issues) {
-		return JSON.stringify(encodeSync(this.ArrayFromJson)(issues), null, 2);
+	static arrayToYaml(issues) {
+		const json = encodeSync(this.ArrayFromJson)(issues);
+		return import_dist.stringify(json, { blockQuote: "literal" });
+	}
+	static arrayFromYaml(yaml) {
+		const json = import_dist.parse(yaml);
+		return decodeSync(PrdIssue.ArrayFromJson)(json);
 	}
 	static jsonSchemaDoc = toJsonSchemaDocument(this);
 	static jsonSchema = {
@@ -59619,18 +59624,6 @@ var PrdIssue = class extends Class("PrdIssue")({
 		return this.title !== issue.title || this.description !== issue.description || this.stateId !== issue.stateId || !makeEquivalence$1(asEquivalence())(this.blockedBy, issue.blockedBy);
 	}
 };
-var PrdList = class extends Class$1 {
-	static fromJson(json) {
-		return decodeSync(PrdIssue.ArrayFromJson)(JSON.parse(json));
-	}
-	toJson() {
-		const issuesArray = fromIterable$2(this.issues.values());
-		return PrdIssue.arrayToJson(issuesArray);
-	}
-	cast() {
-		return this;
-	}
-};
 
 //#endregion
 //#region src/IssueSource.ts
@@ -133887,7 +133880,13 @@ const LinearIssueSource = effect(IssueSource, gen(function* () {
 			"started",
 			"completed"
 		] } }
-	} })).pipe(mapEffect$1(fnUntraced(function* (issue) {
+	} })).pipe(filter((issue) => {
+		const completedAt = issue.completedAt;
+		if (!completedAt) return true;
+		const completed = makeUnsafe$3(completedAt);
+		const threeDaysAgo = nowUnsafe().pipe(subtract({ days: 3 }));
+		return isGreaterThanOrEqualTo$1(completed, threeDaysAgo);
+	}), mapEffect$1(fnUntraced(function* (issue) {
 		identifierMap.set(issue.identifier, issue.id);
 		const state = linear.states.get(issue.stateId);
 		const blockedBy = yield* runCollect(linear.blockedBy(issue));
@@ -133898,7 +133897,7 @@ const LinearIssueSource = effect(IssueSource, gen(function* () {
 			priority: issue.priority,
 			estimate: issue.estimate ?? null,
 			stateId: issue.stateId,
-			complete: state.type === "completed",
+			complete: state.type === "completed" || state.name.toLowerCase().includes("review"),
 			blockedBy: blockedBy.map((i) => i.identifier),
 			githubPrNumber: null
 		});
@@ -140192,14 +140191,15 @@ const GithubIssueSource = effect(IssueSource, gen(function* () {
 		labels: getOrUndefined(labelFilter$1)
 	})).pipe(merge$2(recentlyClosed), filter((issue) => issue.pull_request === void 0), mapEffect$1(fnUntraced(function* (issue) {
 		const dependencies = yield* listOpenBlockedBy(issue.number).pipe(runCollect);
+		const stateId = issue.state === "closed" ? "closed" : hasLabel(issue.labels, "in-progress") ? "in-progress" : hasLabel(issue.labels, "in-review") ? "in-review" : "open";
 		return new PrdIssue({
 			id: `#${issue.number}`,
 			title: issue.title,
 			description: issue.body ?? "",
 			priority: 0,
 			estimate: null,
-			stateId: issue.state === "closed" ? "closed" : hasLabel(issue.labels, "in-progress") ? "in-progress" : hasLabel(issue.labels, "in-review") ? "in-review" : "open",
-			complete: issue.state === "closed",
+			stateId,
+			complete: stateId === "closed" || stateId === "in-review",
 			blockedBy: dependencies.map((dep) => `#${dep.number}`),
 			githubPrNumber: null
 		});
@@ -140371,9 +140371,9 @@ var CurrentIssueSource = class CurrentIssueSource extends Service()("lalph/Curre
 var PromptGen = class extends Service()("lalph/PromptGen", { make: gen(function* () {
 	const sourceMeta = yield* CurrentIssueSource;
 	const states = yield* (yield* IssueSource).states;
-	const prdNotes = `## prd.json format
+	const prdNotes = `## prd.yml format
 
-Each item in the prd.json file represents a task for the current project.
+Each item in the prd.yml file represents a task for the current project.
 
 The \`stateId\` field indicates the current state of the task. The possible states
 are:
@@ -140382,35 +140382,68 @@ ${Array.from(states.values(), (state) => `- **${state.name}** (stateId: \`${stat
 
 ### Adding tasks
 
-To add a new task, append a new item to the prd.json file with the id set to
+To add a new task, append a new item to the prd.yml file with the id set to
 \`null\`.
 
 When adding a new task, it will take about 5 seconds for the system to update the
-prd.json file with a new id for the task.
+prd.yml file with a new id for the task.
 
 ### Removing tasks
 
-To remove a task, simply delete the item from the prd.json file.
+To remove a task, simply delete the item from the prd.yml file.
 
-### prd.json json schema
+### prd.yml json schema
 
 \`\`\`json
 ${JSON.stringify(PrdIssue.jsonSchema, null, 2)}
 \`\`\``;
-	const prompt = `# Instructions
+	const promptChoose = `# Instructions
 
-The following instructions should be done without interaction or asking for
-permission.
+Your job is to choose the next task to work on from the prd.yml file. **DO NOT** implement the task yet.
+
+The following instructions should be done without interaction or asking for permission.
 
-1. Decide which single task to work on next from the prd.json file. This should
+1. Decide which single task to work on next from the prd.yml file. This should
    be the task YOU decide as the most important to work on next, not just the
    first task in the list.
    - Only start tasks that are in a "todo" state (i.e., not started yet).
    - If the \`blockedBy\` field is not empty, skip the task.
 2. **Before doing anything else**, mark the task as "in progress" by updating its
-   \`stateId\` in the prd.json file.
+   \`stateId\` in the prd.yml file.
    This prevents other people or agents from working on the same task simultaneously.
-3. Check if there is an existing Github PR for the task, otherwise create a new
+3. Research the task. If it seems like too many steps are needed to complete the task,
+   break it down into smaller tasks and add them to the prd.yml file, marking the
+   original task as "closed" by updating its \`stateId\`.
+4. Once you have chosen a task of reasonable size, save its information in a
+   "task.json" file alongside the prd.yml file. Use the following format:
+
+\`\`\`json
+{
+  "id": "task id",
+  "todoStateId": "id of the todo state",
+  "inProgressStateId": "id of the in progress state",
+  "reviewStateId": "id of the review state"
+}
+\`\`\`
+
+## Important: Task sizing
+
+If at any point you decide that a task is too large or complex to complete in a
+single iteration, break it down into smaller tasks and add them to the prd.yml
+file. Then, mark the original task as "closed" by updating its \`stateId\`.
+
+Each task should be small and specific.
+Instead of creating tasks like "Refactor the authentication system", create
+smaller tasks like "Implement OAuth2 login endpoint", "Add JWT token refresh mechanism", etc.
+
+${prdNotes}`;
+	const prompt = (taskId) => `# Instructions
+
+The following instructions should be done without interaction or asking for
+permission.
+
+1. Your job is to complete the task with id \`${taskId}\` from the prd.yml file.
+2. Check if there is an existing Github PR for the task, otherwise create a new
    branch for the task.
    - If there is an existing PR, checkout the branch for that PR.
    - If there is an existing PR, check if there are any new comments or requested
@@ -140419,10 +140452,7 @@ permission.
      HEAD as the base.
    - New branches should be named using the format \`{task id}/description\`.
    - When checking for PR reviews, make sure to check the "reviews" field and read ALL unresolved comments.
-4. Research the task. If it seems like too many steps are needed to complete the task,
-   break it down into smaller tasks and add them to the prd.json file, marking the
-   original task as "closed" by updating its \`stateId\`.
-   Otherwise, implement the task.
+4. Implement the task.
 5. Run any checks / feedback loops, such as type checks, unit tests, or linting.
 6. Create or update the pull request with your progress.
    ${sourceMeta.githubPrInstructions}
@@ -140430,25 +140460,12 @@ permission.
    - None of the files in the \`.lalph\` directory should be committed.
    - You have permission to create or update the PR as needed. You have full
      permission to push branches, create PRs or create git commits.
-7. Update the prd.json file to reflect any changes in task states.
+7. Update the prd.yml file to reflect any changes in task states.
    - Add follow up tasks only if needed.
    - Append to the \`description\` field with any notes or important discoveries.
    - If you believe the task is complete, update the \`stateId\` for "review".
      Only if no "review" state exists, use a completed state.
 
-Remember, only work on a single task at a time, that you decide is the most
-important to work on next.
-
-## Important: Task sizing
-
-If at any point you decide that a task is too large or complex to complete in a
-single iteration, break it down into smaller tasks and add them to the prd.json
-file. Then, mark the original task as "closed" by updating its \`stateId\`.
-
-Each task should be small and specific.
-Instead of creating tasks like "Refactor the authentication system", create
-smaller tasks like "Implement OAuth2 login endpoint", "Add JWT token refresh mechanism", etc.
-
 ## Handling blockers
 
 If for any reason you get stuck on a task, mark the task back as "todo" by updating its
@@ -140464,27 +140481,28 @@ ${prdNotes}`;
 Users idea / request: ${idea}
 
 1. For the users idea / request above, break it down into multiple smaller tasks
-   that can be added to the prd.json file.
+   that can be added to the prd.yml file.
    - Make sure to research the codebase before creating any tasks, to ensure they
      are relevant and feasible.
-   - Check if similar tasks already exist in the prd.json file to avoid duplication.
+   - Check if similar tasks already exist in the prd.yml file to avoid duplication.
 2. Each task should have a id of \`null\`, a title, and a concise description that
    includes a short summary of the task and a brief list of steps to complete it.
    - The tasks should start in a "Todo" state (i.e., not started yet).
    - Each task should be small and specific.
      Instead of creating tasks like "Refactor the authentication system", create
      smaller tasks like "Implement OAuth2 login endpoint", "Add JWT token refresh mechanism", etc.
-3. Add the new tasks to the prd.json file.
+3. Add the new tasks to the prd.yml file.
 4. Add a brief outline of the plan to a "lalph-plan.md" file, that will help guide future
    iterations.
  
 ${prdNotes}`;
 	return {
+		promptChoose,
 		prompt,
 		planPrompt,
 		planContinuePrompt: `# Instructions
 
-1. Review the existing prd.json file and lalph-plan.md file to understand the current
+1. Review the existing prd.yml file and lalph-plan.md file to understand the current
    plan and tasks.
 2. Ask the user for feedback to iterate on the existing plan.
 
@@ -140536,17 +140554,17 @@ var Prd = class extends Service()("lalph/Prd", { make: gen(function* () {
 	const fs = yield* FileSystem;
 	const source = yield* IssueSource;
 	const lalphDir = pathService.join(worktree.directory, `.lalph`);
-	const prdFile = pathService.join(worktree.directory, `.lalph`, `prd.json`);
+	const prdFile = pathService.join(worktree.directory, `.lalph`, `prd.yml`);
 	let current = yield* source.issues;
-	yield* fs.writeFileString(prdFile, PrdIssue.arrayToJson(current));
+	yield* fs.writeFileString(prdFile, PrdIssue.arrayToYaml(current));
 	const updatedIssues = /* @__PURE__ */ new Map();
 	yield* fs.watch(lalphDir).pipe(buffer({
 		capacity: 1,
 		strategy: "dropping"
 	}), runForEach((_) => ignore(sync$3)), retry$1(forever$1), forkScoped);
 	const sync$3 = gen(function* () {
-		const json = yield* fs.readFileString(prdFile);
-		const updated = PrdList.fromJson(json);
+		const yaml = yield* fs.readFileString(prdFile);
+		const updated = PrdIssue.arrayFromYaml(yaml);
 		if (!(updated.length !== current.length || updated.some((u, i) => u.isChangedComparedTo(current[i])))) return;
 		const githubPrs = /* @__PURE__ */ new Map();
 		const toRemove = new Set(current.filter((i) => i.id !== null).map((i) => i.id));
@@ -140568,20 +140586,14 @@ var Prd = class extends Service()("lalph/Prd", { make: gen(function* () {
 				stateId: issue.stateId,
 				blockedBy: issue.blockedBy
 			});
-			let entry = updatedIssues.get(issue.id);
-			if (!entry) {
-				entry = {
-					issue,
-					originalStateId: existing.stateId,
-					count: 0
-				};
-				updatedIssues.set(issue.id, entry);
-			}
-			entry.count++;
+			if (!updatedIssues.has(issue.id)) updatedIssues.set(issue.id, {
+				issue,
+				originalStateId: existing.stateId
+			});
 		}
 		yield* forEach$1(toRemove, (issueId) => source.cancelIssue(issueId), { concurrency: "unbounded" });
 		current = yield* source.issues;
-		yield* fs.writeFileString(prdFile, PrdIssue.arrayToJson(current.map((issue) => {
+		yield* fs.writeFileString(prdFile, PrdIssue.arrayToYaml(current.map((issue) => {
 			const prNumber = githubPrs.get(issue.id);
 			if (!prNumber) return issue;
 			return new PrdIssue({
@@ -140590,28 +140602,35 @@ var Prd = class extends Service()("lalph/Prd", { make: gen(function* () {
 			});
 		})));
 	}).pipe(uninterruptible);
-	const mergableGithubPrs = gen(function* () {
-		const json = yield* fs.readFileString(prdFile);
-		const updated = PrdList.fromJson(json);
-		const prs = empty$11();
-		for (const issue of updated) {
-			const entry = updatedIssues.get(issue.id ?? "");
-			if (!entry || !issue.githubPrNumber || issue.stateId === entry.originalStateId) continue;
-			prs.push(issue.githubPrNumber);
-		}
-		return prs;
-	});
-	const revertStateIds = (options) => suspend$2(() => forEach$1(updatedIssues.values(), ({ issue, originalStateId, count }) => options.reason === "error" || count === 1 ? source.updateIssue({
-		issueId: issue.id,
-		stateId: originalStateId
-	}) : void_$1, {
-		concurrency: "unbounded",
-		discard: true
-	}));
 	return {
 		path: prdFile,
-		mergableGithubPrs,
-		revertStateIds
+		mergableGithubPrs: gen(function* () {
+			const yaml = yield* fs.readFileString(prdFile);
+			const updated = PrdIssue.arrayFromYaml(yaml);
+			const prs = empty$11();
+			for (const issue of updated) {
+				const entry = updatedIssues.get(issue.id ?? "");
+				if (!entry || !issue.githubPrNumber || issue.stateId === entry.originalStateId) continue;
+				prs.push(issue.githubPrNumber);
+			}
+			return prs;
+		}),
+		revertStateIds: suspend$2(() => forEach$1(updatedIssues.values(), ({ issue, originalStateId }) => source.updateIssue({
+			issueId: issue.id,
+			stateId: originalStateId
+		}), {
+			concurrency: "unbounded",
+			discard: true
+		})),
+		maybeRevertIssue: fnUntraced(function* (options) {
+			const yaml = yield* fs.readFileString(prdFile);
+			const issue = PrdIssue.arrayFromYaml(yaml).find((i) => i.id === options.issueId);
+			if (!issue || issue.stateId === options.reviewStateId) return;
+			yield* source.updateIssue({
+				issueId: issue.id,
+				stateId: options.todoStateId
+			});
+		})
 	};
 }) }) {
 	static layer = effect(this, this.make).pipe(provide$3(Worktree.layer));
@@ -140639,14 +140658,28 @@ const getOrSelectCliAgent = gen(function* () {
 //#endregion
 //#region src/Runner.ts
 const run = fnUntraced(function* (options) {
+	const fs = yield* FileSystem;
 	const pathService = yield* Path$1;
 	const worktree = yield* Worktree;
 	const promptGen = yield* PromptGen;
 	const cliAgent = yield* getOrSelectCliAgent;
 	const prd = yield* Prd;
+	const chooseCommand = cliAgent.command({
+		prompt: promptGen.promptChoose,
+		prdFilePath: pathService.join(".lalph", "prd.yml")
+	});
+	yield* make$22(chooseCommand[0], chooseCommand.slice(1), {
+		cwd: worktree.directory,
+		extendEnv: true,
+		stdout: "inherit",
+		stderr: "inherit",
+		stdin: "inherit"
+	}).pipe(exitCode);
+	const taskJson = yield* fs.readFileString(pathService.join(worktree.directory, ".lalph", "task.json"));
+	const task = yield* decodeEffect(ChosenTask)(taskJson);
 	const cliCommand = cliAgent.command({
-		prompt: promptGen.prompt,
-		prdFilePath: pathService.join(".lalph", "prd.json")
+		prompt: promptGen.prompt(task.id),
+		prdFilePath: pathService.join(".lalph", "prd.yml")
 	});
 	const handle = yield* make$22(cliCommand[0], cliCommand.slice(1), {
 		cwd: worktree.directory,
@@ -140671,11 +140704,14 @@ const run = fnUntraced(function* (options) {
 	const exitCode$1 = yield* handle.exitCode;
 	yield* log$1(`Agent exited with code: ${exitCode$1}`);
 	const prs = yield* prd.mergableGithubPrs;
-	if (prs.length === 0) yield* prd.revertStateIds({ reason: "inactivity" });
+	if (prs.length === 0) yield* prd.maybeRevertIssue({
+		...task,
+		issueId: task.id
+	});
 	else if (options.autoMerge) for (const pr of prs) yield* make$22`gh pr merge ${pr} -sd`.pipe(exitCode);
 }, onError(fnUntraced(function* () {
 	const prd = yield* Prd;
-	yield* ignore(prd.revertStateIds({ reason: "error" }));
+	yield* ignore(prd.revertStateIds);
 })), scoped$1, provide$1([
 	PromptGen.layer,
 	Prd.layer,
@@ -140684,6 +140720,12 @@ const run = fnUntraced(function* (options) {
 var RunnerStalled = class extends TaggedError("RunnerStalled") {
 	message = "The runner has stalled due to inactivity.";
 };
+const ChosenTask = fromJsonString(Struct({
+	id: String$1,
+	todoStateId: String$1,
+	inProgressStateId: String$1,
+	reviewStateId: String$1
+}));
 
 //#endregion
 //#region src/Planner.ts
@@ -140698,7 +140740,7 @@ const plan = gen(function* () {
 	yield* scoped$1(fs.open(lalphPlanPath, { flag: "a+" }));
 	const cliCommand = cliAgent.commandPlan({
 		prompt: promptGen.planPrompt(idea),
-		prdFilePath: pathService.join(worktree.directory, ".lalph", "prd.json")
+		prdFilePath: pathService.join(worktree.directory, ".lalph", "prd.yml")
 	});
 	const exitCode$1 = yield* make$22(cliCommand[0], cliCommand.slice(1), {
 		cwd: worktree.directory,
@@ -140726,7 +140768,7 @@ const planContinue = gen(function* () {
 	yield* scoped$1(fs.open(lalphPlanPath, { flag: "a+" }));
 	const cliCommand = cliAgent.commandPlan({
 		prompt: promptGen.planContinuePrompt,
-		prdFilePath: pathService.join(worktree.directory, ".lalph", "prd.json")
+		prdFilePath: pathService.join(worktree.directory, ".lalph", "prd.yml")
 	});
 	const exitCode$1 = yield* make$22(cliCommand[0], cliCommand.slice(1), {
 		cwd: worktree.directory,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "lalph",
   "type": "module",
-  "version": "0.1.16",
+  "version": "0.1.18",
   "publishConfig": {
     "access": "public"
   },
@@ -31,7 +31,8 @@
     "octokit": "^5.0.5",
     "prettier": "^3.7.4",
     "tsdown": "^0.19.0",
-    "typescript": "^5.9.3"
+    "typescript": "^5.9.3",
+    "yaml": "^2.8.2"
   },
   "scripts": {
     "check": "tsc --noEmit && prettier --check .",

package/src/Github.ts

@@ -185,21 +185,22 @@ export const GithubIssueSource = Layer.effect(
             const dependencies = yield* listOpenBlockedBy(issue.number).pipe(
               Stream.runCollect,
             )
+            const stateId =
+              issue.state === "closed"
+                ? "closed"
+                : hasLabel(issue.labels, "in-progress")
+                  ? "in-progress"
+                  : hasLabel(issue.labels, "in-review")
+                    ? "in-review"
+                    : "open"
             return new PrdIssue({
               id: `#${issue.number}`,
               title: issue.title,
               description: issue.body ?? "",
               priority: 0,
               estimate: null,
-              stateId:
-                issue.state === "closed"
-                  ? "closed"
-                  : hasLabel(issue.labels, "in-progress")
-                    ? "in-progress"
-                    : hasLabel(issue.labels, "in-review")
-                      ? "in-review"
-                      : "open",
-              complete: issue.state === "closed",
+              stateId,
+              complete: stateId === "closed" || stateId === "in-review",
               blockedBy: dependencies.map((dep) => `#${dep.number}`),
               githubPrNumber: null,
             })

package/src/Linear.ts

@@ -6,6 +6,7 @@ import {
   ServiceMap,
   Option,
   RcMap,
+  DateTime,
 } from "effect"
 import {
   Connection,
@@ -168,6 +169,15 @@ export const LinearIssueSource = Layer.effect(
         }),
       )
       .pipe(
+        Stream.filter((issue) => {
+          const completedAt = issue.completedAt
+          if (!completedAt) return true
+          const completed = DateTime.makeUnsafe(completedAt)
+          const threeDaysAgo = DateTime.nowUnsafe().pipe(
+            DateTime.subtract({ days: 3 }),
+          )
+          return DateTime.isGreaterThanOrEqualTo(completed, threeDaysAgo)
+        }),
         Stream.mapEffect(
           Effect.fnUntraced(function* (issue) {
             identifierMap.set(issue.identifier, issue.id)
@@ -180,7 +190,9 @@ export const LinearIssueSource = Layer.effect(
               priority: issue.priority,
               estimate: issue.estimate ?? null,
               stateId: issue.stateId!,
-              complete: state.type === "completed",
+              complete:
+                state.type === "completed" ||
+                state.name.toLowerCase().includes("review"),
               blockedBy: blockedBy.map((i) => i.identifier),
               githubPrNumber: null,
             })

package/src/Planner.ts

@@ -22,7 +22,7 @@ export const plan = Effect.gen(function* () {
 
   const cliCommand = cliAgent.commandPlan({
     prompt: promptGen.planPrompt(idea),
-    prdFilePath: pathService.join(worktree.directory, ".lalph", "prd.json"),
+    prdFilePath: pathService.join(worktree.directory, ".lalph", "prd.yml"),
   })
   const exitCode = yield* ChildProcess.make(
     cliCommand[0]!,
@@ -60,7 +60,7 @@ export const planContinue = Effect.gen(function* () {
 
   const cliCommand = cliAgent.commandPlan({
     prompt: promptGen.planContinuePrompt,
-    prdFilePath: pathService.join(worktree.directory, ".lalph", "prd.json"),
+    prdFilePath: pathService.join(worktree.directory, ".lalph", "prd.yml"),
   })
   const exitCode = yield* ChildProcess.make(
     cliCommand[0]!,

package/src/Prd.ts

@@ -9,7 +9,7 @@ import {
   Stream,
 } from "effect"
 import { Worktree } from "./Worktree.ts"
-import { PrdIssue, PrdList } from "./domain/PrdIssue.ts"
+import { PrdIssue } from "./domain/PrdIssue.ts"
 import { IssueSource } from "./IssueSource.ts"
 
 export class Prd extends ServiceMap.Service<Prd>()("lalph/Prd", {
@@ -20,17 +20,16 @@ export class Prd extends ServiceMap.Service<Prd>()("lalph/Prd", {
     const source = yield* IssueSource
 
     const lalphDir = pathService.join(worktree.directory, `.lalph`)
-    const prdFile = pathService.join(worktree.directory, `.lalph`, `prd.json`)
+    const prdFile = pathService.join(worktree.directory, `.lalph`, `prd.yml`)
 
     let current = yield* source.issues
-    yield* fs.writeFileString(prdFile, PrdIssue.arrayToJson(current))
+    yield* fs.writeFileString(prdFile, PrdIssue.arrayToYaml(current))
 
     const updatedIssues = new Map<
       string,
       {
         readonly issue: PrdIssue
         readonly originalStateId: string
-        count: number
       }
     >()
 
@@ -45,8 +44,8 @@ export class Prd extends ServiceMap.Service<Prd>()("lalph/Prd", {
     )
 
     const sync = Effect.gen(function* () {
-      const json = yield* fs.readFileString(prdFile)
-      const updated = PrdList.fromJson(json)
+      const yaml = yield* fs.readFileString(prdFile)
+      const updated = PrdIssue.arrayFromYaml(yaml)
       const anyChanges =
         updated.length !== current.length ||
         updated.some((u, i) => u.isChangedComparedTo(current[i]!))
@@ -84,12 +83,12 @@ export class Prd extends ServiceMap.Service<Prd>()("lalph/Prd", {
           blockedBy: issue.blockedBy,
         })
 
-        let entry = updatedIssues.get(issue.id)
-        if (!entry) {
-          entry = { issue, originalStateId: existing.stateId, count: 0 }
-          updatedIssues.set(issue.id, entry)
+        if (!updatedIssues.has(issue.id!)) {
+          updatedIssues.set(issue.id, {
+            issue,
+            originalStateId: existing.stateId,
+          })
         }
-        entry.count++
       }
 
       yield* Effect.forEach(
@@ -101,7 +100,7 @@ export class Prd extends ServiceMap.Service<Prd>()("lalph/Prd", {
       current = yield* source.issues
       yield* fs.writeFileString(
         prdFile,
-        PrdIssue.arrayToJson(
+        PrdIssue.arrayToYaml(
           current.map((issue) => {
             const prNumber = githubPrs.get(issue.id!)
             if (!prNumber) return issue
@@ -112,8 +111,8 @@ export class Prd extends ServiceMap.Service<Prd>()("lalph/Prd", {
     }).pipe(Effect.uninterruptible)
 
     const mergableGithubPrs = Effect.gen(function* () {
-      const json = yield* fs.readFileString(prdFile)
-      const updated = PrdList.fromJson(json)
+      const yaml = yield* fs.readFileString(prdFile)
+      const updated = PrdIssue.arrayFromYaml(yaml)
       const prs = Array.empty<number>()
       for (const issue of updated) {
         const entry = updatedIssues.get(issue.id ?? "")
@@ -129,24 +128,39 @@ export class Prd extends ServiceMap.Service<Prd>()("lalph/Prd", {
       return prs
     })
 
-    const revertStateIds = (options: {
-      readonly reason: "inactivity" | "error"
-    }) =>
-      Effect.suspend(() =>
-        Effect.forEach(
-          updatedIssues.values(),
-          ({ issue, originalStateId, count }) =>
-            options.reason === "error" || count === 1
-              ? source.updateIssue({
-                  issueId: issue.id!,
-                  stateId: originalStateId,
-                })
-              : Effect.void,
-          { concurrency: "unbounded", discard: true },
-        ),
-      )
+    const revertStateIds = Effect.suspend(() =>
+      Effect.forEach(
+        updatedIssues.values(),
+        ({ issue, originalStateId }) =>
+          source.updateIssue({
+            issueId: issue.id!,
+            stateId: originalStateId,
+          }),
+        { concurrency: "unbounded", discard: true },
+      ),
+    )
+    const maybeRevertIssue = Effect.fnUntraced(function* (options: {
+      readonly issueId: string
+      readonly todoStateId: string
+      readonly inProgressStateId: string
+      readonly reviewStateId: string
+    }) {
+      const yaml = yield* fs.readFileString(prdFile)
+      const updated = PrdIssue.arrayFromYaml(yaml)
+      const issue = updated.find((i) => i.id === options.issueId)
+      if (!issue || issue.stateId === options.reviewStateId) return
+      yield* source.updateIssue({
+        issueId: issue.id!,
+        stateId: options.todoStateId,
+      })
+    })
 
-    return { path: prdFile, mergableGithubPrs, revertStateIds } as const
+    return {
+      path: prdFile,
+      mergableGithubPrs,
+      revertStateIds,
+      maybeRevertIssue,
+    } as const
   }),
 }) {
   static layer = Layer.effect(this, this.make).pipe(

package/src/PromptGen.ts

@@ -11,9 +11,9 @@ export class PromptGen extends ServiceMap.Service<PromptGen>()(
       const source = yield* IssueSource
       const states = yield* source.states
 
-      const prdNotes = `## prd.json format
+      const prdNotes = `## prd.yml format
 
-Each item in the prd.json file represents a task for the current project.
+Each item in the prd.yml file represents a task for the current project.
 
 The \`stateId\` field indicates the current state of the task. The possible states
 are:
@@ -22,36 +22,70 @@ ${Array.from(states.values(), (state) => `- **${state.name}** (stateId: \`${stat
 
 ### Adding tasks
 
-To add a new task, append a new item to the prd.json file with the id set to
+To add a new task, append a new item to the prd.yml file with the id set to
 \`null\`.
 
 When adding a new task, it will take about 5 seconds for the system to update the
-prd.json file with a new id for the task.
+prd.yml file with a new id for the task.
 
 ### Removing tasks
 
-To remove a task, simply delete the item from the prd.json file.
+To remove a task, simply delete the item from the prd.yml file.
 
-### prd.json json schema
+### prd.yml json schema
 
 \`\`\`json
 ${JSON.stringify(PrdIssue.jsonSchema, null, 2)}
 \`\`\``
 
-      const prompt = `# Instructions
+      const promptChoose = `# Instructions
 
-The following instructions should be done without interaction or asking for
-permission.
+Your job is to choose the next task to work on from the prd.yml file. **DO NOT** implement the task yet.
+
+The following instructions should be done without interaction or asking for permission.
 
-1. Decide which single task to work on next from the prd.json file. This should
+1. Decide which single task to work on next from the prd.yml file. This should
    be the task YOU decide as the most important to work on next, not just the
    first task in the list.
    - Only start tasks that are in a "todo" state (i.e., not started yet).
    - If the \`blockedBy\` field is not empty, skip the task.
 2. **Before doing anything else**, mark the task as "in progress" by updating its
-   \`stateId\` in the prd.json file.
+   \`stateId\` in the prd.yml file.
    This prevents other people or agents from working on the same task simultaneously.
-3. Check if there is an existing Github PR for the task, otherwise create a new
+3. Research the task. If it seems like too many steps are needed to complete the task,
+   break it down into smaller tasks and add them to the prd.yml file, marking the
+   original task as "closed" by updating its \`stateId\`.
+4. Once you have chosen a task of reasonable size, save its information in a
+   "task.json" file alongside the prd.yml file. Use the following format:
+
+\`\`\`json
+{
+  "id": "task id",
+  "todoStateId": "id of the todo state",
+  "inProgressStateId": "id of the in progress state",
+  "reviewStateId": "id of the review state"
+}
+\`\`\`
+
+## Important: Task sizing
+
+If at any point you decide that a task is too large or complex to complete in a
+single iteration, break it down into smaller tasks and add them to the prd.yml
+file. Then, mark the original task as "closed" by updating its \`stateId\`.
+
+Each task should be small and specific.
+Instead of creating tasks like "Refactor the authentication system", create
+smaller tasks like "Implement OAuth2 login endpoint", "Add JWT token refresh mechanism", etc.
+
+${prdNotes}`
+
+      const prompt = (taskId: string) => `# Instructions
+
+The following instructions should be done without interaction or asking for
+permission.
+
+1. Your job is to complete the task with id \`${taskId}\` from the prd.yml file.
+2. Check if there is an existing Github PR for the task, otherwise create a new
    branch for the task.
    - If there is an existing PR, checkout the branch for that PR.
    - If there is an existing PR, check if there are any new comments or requested
@@ -60,10 +94,7 @@ permission.
      HEAD as the base.
    - New branches should be named using the format \`{task id}/description\`.
    - When checking for PR reviews, make sure to check the "reviews" field and read ALL unresolved comments.
-4. Research the task. If it seems like too many steps are needed to complete the task,
-   break it down into smaller tasks and add them to the prd.json file, marking the
-   original task as "closed" by updating its \`stateId\`.
-   Otherwise, implement the task.
+4. Implement the task.
 5. Run any checks / feedback loops, such as type checks, unit tests, or linting.
 6. Create or update the pull request with your progress.
    ${sourceMeta.githubPrInstructions}
@@ -71,25 +102,12 @@ permission.
    - None of the files in the \`.lalph\` directory should be committed.
    - You have permission to create or update the PR as needed. You have full
      permission to push branches, create PRs or create git commits.
-7. Update the prd.json file to reflect any changes in task states.
+7. Update the prd.yml file to reflect any changes in task states.
    - Add follow up tasks only if needed.
    - Append to the \`description\` field with any notes or important discoveries.
    - If you believe the task is complete, update the \`stateId\` for "review".
      Only if no "review" state exists, use a completed state.
 
-Remember, only work on a single task at a time, that you decide is the most
-important to work on next.
-
-## Important: Task sizing
-
-If at any point you decide that a task is too large or complex to complete in a
-single iteration, break it down into smaller tasks and add them to the prd.json
-file. Then, mark the original task as "closed" by updating its \`stateId\`.
-
-Each task should be small and specific.
-Instead of creating tasks like "Refactor the authentication system", create
-smaller tasks like "Implement OAuth2 login endpoint", "Add JWT token refresh mechanism", etc.
-
 ## Handling blockers
 
 If for any reason you get stuck on a task, mark the task back as "todo" by updating its
@@ -106,17 +124,17 @@ ${prdNotes}`
 Users idea / request: ${idea}
 
 1. For the users idea / request above, break it down into multiple smaller tasks
-   that can be added to the prd.json file.
+   that can be added to the prd.yml file.
    - Make sure to research the codebase before creating any tasks, to ensure they
      are relevant and feasible.
-   - Check if similar tasks already exist in the prd.json file to avoid duplication.
+   - Check if similar tasks already exist in the prd.yml file to avoid duplication.
 2. Each task should have a id of \`null\`, a title, and a concise description that
    includes a short summary of the task and a brief list of steps to complete it.
    - The tasks should start in a "Todo" state (i.e., not started yet).
    - Each task should be small and specific.
      Instead of creating tasks like "Refactor the authentication system", create
      smaller tasks like "Implement OAuth2 login endpoint", "Add JWT token refresh mechanism", etc.
-3. Add the new tasks to the prd.json file.
+3. Add the new tasks to the prd.yml file.
 4. Add a brief outline of the plan to a "lalph-plan.md" file, that will help guide future
    iterations.
  
@@ -124,7 +142,7 @@ ${prdNotes}`
 
       const planContinuePrompt = `# Instructions
 
-1. Review the existing prd.json file and lalph-plan.md file to understand the current
+1. Review the existing prd.yml file and lalph-plan.md file to understand the current
    plan and tasks.
 2. Ask the user for feedback to iterate on the existing plan.
 
@@ -141,7 +159,7 @@ ${prdNotes}`
  
 ${prdNotes}`
 
-      return { prompt, planPrompt, planContinuePrompt } as const
+      return { promptChoose, prompt, planPrompt, planContinuePrompt } as const
     }),
   },
 ) {

package/src/Runner.ts

@@ -1,4 +1,13 @@
-import { Data, DateTime, Duration, Effect, Path, Stream } from "effect"
+import {
+  Data,
+  DateTime,
+  Duration,
+  Effect,
+  FileSystem,
+  Path,
+  Schema,
+  Stream,
+} from "effect"
 import { PromptGen } from "./PromptGen.ts"
 import { Prd } from "./Prd.ts"
 import { ChildProcess } from "effect/unstable/process"
@@ -10,15 +19,34 @@ export const run = Effect.fnUntraced(
     readonly autoMerge: boolean
     readonly stallTimeout: Duration.Duration
   }) {
+    const fs = yield* FileSystem.FileSystem
     const pathService = yield* Path.Path
     const worktree = yield* Worktree
     const promptGen = yield* PromptGen
     const cliAgent = yield* getOrSelectCliAgent
     const prd = yield* Prd
 
+    const chooseCommand = cliAgent.command({
+      prompt: promptGen.promptChoose,
+      prdFilePath: pathService.join(".lalph", "prd.yml"),
+    })
+
+    yield* ChildProcess.make(chooseCommand[0]!, chooseCommand.slice(1), {
+      cwd: worktree.directory,
+      extendEnv: true,
+      stdout: "inherit",
+      stderr: "inherit",
+      stdin: "inherit",
+    }).pipe(ChildProcess.exitCode)
+
+    const taskJson = yield* fs.readFileString(
+      pathService.join(worktree.directory, ".lalph", "task.json"),
+    )
+    const task = yield* Schema.decodeEffect(ChosenTask)(taskJson)
+
     const cliCommand = cliAgent.command({
-      prompt: promptGen.prompt,
-      prdFilePath: pathService.join(".lalph", "prd.json"),
+      prompt: promptGen.prompt(task.id),
+      prdFilePath: pathService.join(".lalph", "prd.yml"),
     })
     const handle = yield* ChildProcess.make(
       cliCommand[0]!,
@@ -62,7 +90,10 @@ export const run = Effect.fnUntraced(
 
     const prs = yield* prd.mergableGithubPrs
     if (prs.length === 0) {
-      yield* prd.revertStateIds({ reason: "inactivity" })
+      yield* prd.maybeRevertIssue({
+        ...task,
+        issueId: task.id,
+      })
     } else if (options.autoMerge) {
       for (const pr of prs) {
         yield* ChildProcess.make`gh pr merge ${pr} -sd`.pipe(
@@ -75,7 +106,7 @@ export const run = Effect.fnUntraced(
   Effect.onError(
     Effect.fnUntraced(function* () {
       const prd = yield* Prd
-      yield* Effect.ignore(prd.revertStateIds({ reason: "error" }))
+      yield* Effect.ignore(prd.revertStateIds)
     }),
   ),
   Effect.scoped,
@@ -85,3 +116,12 @@ export const run = Effect.fnUntraced(
 export class RunnerStalled extends Data.TaggedError("RunnerStalled") {
   readonly message = "The runner has stalled due to inactivity."
 }
+
+const ChosenTask = Schema.fromJsonString(
+  Schema.Struct({
+    id: Schema.String,
+    todoStateId: Schema.String,
+    inProgressStateId: Schema.String,
+    reviewStateId: Schema.String,
+  }),
+)

package/src/domain/PrdIssue.ts

@@ -1,4 +1,5 @@
-import { Schema, Data, Array, Equal } from "effect"
+import { Schema, Array, Equal } from "effect"
+import * as Yaml from "yaml"
 
 export class PrdIssue extends Schema.Class<PrdIssue>("PrdIssue")({
   id: Schema.NullOr(Schema.String).annotate({
@@ -36,12 +37,14 @@ export class PrdIssue extends Schema.Class<PrdIssue>("PrdIssue")({
 }) {
   static Array = Schema.Array(this)
   static ArrayFromJson = Schema.toCodecJson(this.Array)
-  static arrayToJson(issues: ReadonlyArray<PrdIssue>): string {
-    return JSON.stringify(
-      Schema.encodeSync(this.ArrayFromJson)(issues),
-      null,
-      2,
-    )
+  static arrayToYaml(issues: ReadonlyArray<PrdIssue>): string {
+    const json = Schema.encodeSync(this.ArrayFromJson)(issues)
+    return Yaml.stringify(json, { blockQuote: "literal" })
+  }
+  static arrayFromYaml(yaml: string): ReadonlyArray<PrdIssue> {
+    const json = Yaml.parse(yaml)
+    const issues = Schema.decodeSync(PrdIssue.ArrayFromJson)(json)
+    return issues
   }
 
   static jsonSchemaDoc = Schema.toJsonSchemaDocument(this)
@@ -62,22 +65,3 @@ export class PrdIssue extends Schema.Class<PrdIssue>("PrdIssue")({
     )
   }
 }
-
-export class PrdList<O = unknown> extends Data.Class<{
-  readonly issues: ReadonlyMap<string, PrdIssue>
-  readonly orignals: ReadonlyMap<string, O>
-}> {
-  static fromJson(json: string): ReadonlyArray<PrdIssue> {
-    const issues = Schema.decodeSync(PrdIssue.ArrayFromJson)(JSON.parse(json))
-    return issues
-  }
-
-  toJson(): string {
-    const issuesArray = Array.fromIterable(this.issues.values())
-    return PrdIssue.arrayToJson(issuesArray)
-  }
-
-  cast<T>(): PrdList<T> {
-    return this as any
-  }
-}