lalph 0.3.4 → 0.3.6

package/dist/cli.mjs

@@ -144005,7 +144005,11 @@ var IssuesNode = class extends Class("IssuesNode")({
 }) {
 	blockedBy = this.inverseRelations.nodes.filter((relation) => relation.type === "blocks" && incompleteStates.has(relation.issue.state.type));
 };
-const incompleteStates = new Set(["unstarted", "started"]);
+const incompleteStates = new Set([
+	"backlog",
+	"unstarted",
+	"started"
+]);
 const LinearIssueData = Struct({ issue: IssuesNode });
 var Issues = class extends Class("Issues")({ nodes: Array$1(IssuesNode) }) {};
 var LinearIssuesData = class extends Class("LinearIssuesData")({ issues: Issues }) {};
@@ -151362,13 +151366,34 @@ ${options.plan}
      accordingly.
 2. Add a detailed implementation plan to the specification, breaking down the work into
    smaller, manageable tasks.
-3. Start two subagents with a copy of this prompt.
-   - The first subagent will review the plan and provide feedback or improvements.
-   - The second subagent will look over the implementation plan, and ensure each task is
-     small, atomic and independently shippable. It also **NEEDS TO** make sure task
+3. Start two subagents to review the plan:
+   - The first subagent will recieve the following prompt:
+     \`\`\`
+     Your job is to thoroughly review the specification created for the request,
+     recommend improvements, and ensure every detail is covered.
+
+     Below is the original request.
+
+     ---
+
+     {insert original prompt here}
+     \`\`\`
+
+   - The second subagent will receive the following prompt:
+     \`\`\`
+     Your job is to look over the implementation plan, and ensure each task is
+     small, atomic and independently shippable. You also **NEED TO** make sure task
      can be completed without failing validation checks (typechecks, linting, tests).
      If a task will only pass validations when combined with another, the subagent should
      combine the work into one task.
+
+     Below is the original request.
+
+     ---
+
+     {insert original prompt here}
+     \`\`\`
+
 4. Write the specification details to a \`.lalph/plan.json\` file using the following format:
    \`\`\`json
    {
@@ -151421,6 +151446,9 @@ ${prdNotes(options)}`;
 var RunnerStalled = class extends TaggedError("RunnerStalled") {
 	message = "The runner has stalled due to inactivity.";
 };
+var TaskStateChanged = class extends TaggedError("TaskStateChanged") {
+	message = `Task "${this.issueId}" moved to "${this.state}", cancelling run.`;
+};
 
 //#endregion
 //#region src/domain/WorkerState.ts
@@ -152175,7 +152203,7 @@ const run = fnUntraced(function* (options) {
 		yield* fs.writeFileString(pathService.join(worktree.directory, ".lalph", "feedback.md"), feedback);
 	}
 	const taskPreset = getOrElse$1(yield* source.issueCliAgentPreset(chosenTask.prd), () => preset);
-	yield* gen(function* () {
+	if (yield* gen(function* () {
 		registry.update(currentWorker.state, (s) => s.transitionTo(WorkerStatus.Working({ issueId: taskId })));
 		const instructions = (yield* PromptGen).prompt({
 			specsDirectory: options.specsDirectory,
@@ -152204,7 +152232,7 @@ const run = fnUntraced(function* (options) {
 		stallTimeout: options.stallTimeout,
 		preset: taskPreset,
 		task: chosenTask.prd
-	})));
+	})), raceFirst(watchTaskState({ issueId: taskId })), as(false), catchTag("TaskStateChanged", (error) => log$1(`Task ${error.issueId} moved to ${error.state}; cancelling run.`).pipe(as(true))))) return;
 	yield* gitFlow.postWork({
 		worktree,
 		targetBranch: getOrUndefined(options.targetBranch),
@@ -152297,6 +152325,22 @@ const commandRoot = make$35("lalph", {
 	layer,
 	layer$17
 ]))));
+const watchTaskState = fnUntraced(function* (options) {
+	const registry = yield* AtomRegistry;
+	const projectId = yield* CurrentProjectId;
+	return yield* toStreamResult(registry, currentIssuesAtom(projectId)).pipe(runForEach((issues) => {
+		const issue = issues.find((entry) => entry.id === options.issueId);
+		if (!issue) return fail$4(new TaskStateChanged({
+			issueId: options.issueId,
+			state: "missing"
+		}));
+		if (issue.state === "in-progress" || issue.state === "in-review") return void_$1;
+		return fail$4(new TaskStateChanged({
+			issueId: options.issueId,
+			state: issue.state
+		}));
+	}), withSpan("Main.watchTaskState"));
+});
 
 //#endregion
 //#region src/Agents/planner.ts
@@ -152513,7 +152557,7 @@ const commandSource = make$35("source").pipe(withDescription("Select the issue s
 
 //#endregion
 //#region package.json
-var version = "0.3.4";
+var version = "0.3.6";
 
 //#endregion
 //#region src/commands/projects/ls.ts

package/package.json

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

package/src/PromptGen.ts

@@ -255,13 +255,34 @@ ${options.plan}
      accordingly.
 2. Add a detailed implementation plan to the specification, breaking down the work into
    smaller, manageable tasks.
-3. Start two subagents with a copy of this prompt.
-   - The first subagent will review the plan and provide feedback or improvements.
-   - The second subagent will look over the implementation plan, and ensure each task is
-     small, atomic and independently shippable. It also **NEEDS TO** make sure task
+3. Start two subagents to review the plan:
+   - The first subagent will recieve the following prompt:
+     \`\`\`
+     Your job is to thoroughly review the specification created for the request,
+     recommend improvements, and ensure every detail is covered.
+
+     Below is the original request.
+
+     ---
+
+     {insert original prompt here}
+     \`\`\`
+
+   - The second subagent will receive the following prompt:
+     \`\`\`
+     Your job is to look over the implementation plan, and ensure each task is
+     small, atomic and independently shippable. You also **NEED TO** make sure task
      can be completed without failing validation checks (typechecks, linting, tests).
      If a task will only pass validations when combined with another, the subagent should
      combine the work into one task.
+
+     Below is the original request.
+
+     ---
+
+     {insert original prompt here}
+     \`\`\`
+
 4. Write the specification details to a \`.lalph/plan.json\` file using the following format:
    \`\`\`json
    {

package/src/commands/root.ts

@@ -8,6 +8,7 @@ import {
   Iterable,
   Option,
   Path,
+  Stream,
 } from "effect"
 import { PromptGen } from "../PromptGen.ts"
 import { Prd } from "../Prd.ts"
@@ -17,12 +18,13 @@ import { IssueSource } from "../IssueSource.ts"
 import {
   checkForWork,
   CurrentIssueSource,
+  currentIssuesAtom,
   resetInProgress,
 } from "../CurrentIssueSource.ts"
 import { GithubCli } from "../Github/Cli.ts"
 import { agentWorker } from "../Agents/worker.ts"
 import { agentChooser } from "../Agents/chooser.ts"
-import { RunnerStalled } from "../domain/Errors.ts"
+import { RunnerStalled, TaskStateChanged } from "../domain/Errors.ts"
 import { agentReviewer } from "../Agents/reviewer.ts"
 import { agentTimeout } from "../Agents/timeout.ts"
 import { CurrentProjectId, Settings } from "../Settings.ts"
@@ -135,7 +137,7 @@ const run = Effect.fnUntraced(
       () => preset,
     )
 
-    yield* Effect.gen(function* () {
+    const cancelled = yield* Effect.gen(function* () {
       //
       // 2. Work on task
       // -----------------------
@@ -185,8 +187,17 @@ const run = Effect.fnUntraced(
           task: chosenTask.prd,
         }),
       ),
+      Effect.raceFirst(watchTaskState({ issueId: taskId })),
+      Effect.as(false),
+      Effect.catchTag("TaskStateChanged", (error) =>
+        Effect.log(
+          `Task ${error.issueId} moved to ${error.state}; cancelling run.`,
+        ).pipe(Effect.as(true)),
+      ),
     )
 
+    if (cancelled) return
+
     yield* gitFlow.postWork({
       worktree,
       targetBranch: Option.getOrUndefined(options.targetBranch),
@@ -396,3 +407,37 @@ export const commandRoot = Command.make("lalph", {
     ),
   ),
 )
+
+const watchTaskState = Effect.fnUntraced(function* (options: {
+  readonly issueId: string
+}) {
+  const registry = yield* AtomRegistry.AtomRegistry
+  const projectId = yield* CurrentProjectId
+
+  return yield* AtomRegistry.toStreamResult(
+    registry,
+    currentIssuesAtom(projectId),
+  ).pipe(
+    Stream.runForEach((issues) => {
+      const issue = issues.find((entry) => entry.id === options.issueId)
+      if (!issue) {
+        return Effect.fail(
+          new TaskStateChanged({
+            issueId: options.issueId,
+            state: "missing",
+          }),
+        )
+      }
+      if (issue.state === "in-progress" || issue.state === "in-review") {
+        return Effect.void
+      }
+      return Effect.fail(
+        new TaskStateChanged({
+          issueId: options.issueId,
+          state: issue.state,
+        }),
+      )
+    }),
+    Effect.withSpan("Main.watchTaskState"),
+  )
+})

package/src/domain/Errors.ts

@@ -1,5 +1,13 @@
 import { Data } from "effect"
+import type { PrdIssue } from "./PrdIssue.ts"
 
 export class RunnerStalled extends Data.TaggedError("RunnerStalled") {
   readonly message = "The runner has stalled due to inactivity."
 }
+
+export class TaskStateChanged extends Data.TaggedError("TaskStateChanged")<{
+  readonly issueId: string
+  readonly state: PrdIssue["state"] | "missing"
+}> {
+  readonly message = `Task "${this.issueId}" moved to "${this.state}", cancelling run.`
+}

package/src/domain/LinearIssues.ts

@@ -54,7 +54,7 @@ export class IssuesNode extends S.Class<IssuesNode>("IssuesNode")({
       incompleteStates.has(relation.issue.state.type),
   )
 }
-const incompleteStates = new Set<Type>(["unstarted", "started"])
+const incompleteStates = new Set<Type>(["backlog", "unstarted", "started"])
 
 export const LinearIssueData = S.Struct({
   issue: IssuesNode,