lalph 0.1.17 → 0.1.18

package/dist/cli.mjs

@@ -133880,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));
@@ -133891,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
 		});
@@ -140185,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
 		});
@@ -140390,10 +140397,11 @@ To remove a task, simply delete the item from the prd.yml file.
 \`\`\`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.yml file. This should
    be the task YOU decide as the most important to work on next, not just the
@@ -140403,7 +140411,39 @@ permission.
 2. **Before doing anything else**, mark the task as "in progress" by updating its
    \`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
@@ -140412,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.yml 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}
@@ -140429,19 +140466,6 @@ permission.
    - 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.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.
-
 ## Handling blockers
 
 If for any reason you get stuck on a task, mark the task back as "todo" by updating its
@@ -140473,6 +140497,7 @@ Users idea / request: ${idea}
  
 ${prdNotes}`;
 	return {
+		promptChoose,
 		prompt,
 		planPrompt,
 		planContinuePrompt: `# Instructions
@@ -140561,16 +140586,10 @@ 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;
@@ -140583,28 +140602,35 @@ var Prd = class extends Service()("lalph/Prd", { make: gen(function* () {
 			});
 		})));
 	}).pipe(uninterruptible);
-	const 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;
-	});
-	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));
@@ -140632,13 +140658,27 @@ 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,
+		prompt: promptGen.prompt(task.id),
 		prdFilePath: pathService.join(".lalph", "prd.yml")
 	});
 	const handle = yield* make$22(cliCommand[0], cliCommand.slice(1), {
@@ -140664,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,
@@ -140677,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

package/package.json

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

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/Prd.ts

@@ -30,7 +30,6 @@ export class Prd extends ServiceMap.Service<Prd>()("lalph/Prd", {
       {
         readonly issue: PrdIssue
         readonly originalStateId: string
-        count: number
       }
     >()
 
@@ -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(
@@ -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

@@ -38,10 +38,11 @@ To remove a task, simply delete the item from the prd.yml file.
 ${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.yml file. This should
    be the task YOU decide as the most important to work on next, not just the
@@ -51,7 +52,40 @@ permission.
 2. **Before doing anything else**, mark the task as "in progress" by updating its
    \`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.yml 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}
@@ -77,19 +108,6 @@ permission.
    - 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.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.
-
 ## Handling blockers
 
 If for any reason you get stuck on a task, mark the task back as "todo" by updating its
@@ -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,14 +19,33 @@ 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,
+      prompt: promptGen.prompt(task.id),
       prdFilePath: pathService.join(".lalph", "prd.yml"),
     })
     const handle = yield* ChildProcess.make(
@@ -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,
+  }),
+)