lalph 0.1.108 → 0.1.110

package/dist/cli.mjs

@@ -149176,18 +149176,7 @@ If for any reason you get stuck on a task, mark the task back as "todo" by updat
 challenges faced.
 
 ${prdNotes(options)}`;
-	const promptInstructions = (options) => `You are to read all of the following sections, and then output
-step by step instructions for another AI agent to fullfil the task. Make sure to
-do some quick research to understand the task before writing the instructions.
-
-Save the instructions in a markdown file called ".lalph/instructions.md".
-
-**DO NOT** start working on the task yet, only output the instructions.
-Do everything you can to help the agent succeed.
-
-"Help others achieve their dreams and you will achieve yours."
-
-# The task
+	const prompt = (options) => `# The task
 
 ID: ${options.task.id}
 Task: ${options.task.title}
@@ -149220,9 +149209,6 @@ ${options.task.description}
    - Rewrite the notes in the description to include only the key discoveries and information that could speed up future work on other tasks. Make sure to preserve important information such as specification file references.
    - If you believe the task is complete, update the \`state\` to "in-review".
 
-${keyInformation(options)}`;
-	const prompt = (options) => `${options.prompt}
-
 ${keyInformation(options)}`;
 	const promptReview = (options) => `A previous AI agent has completed a task from the instructions below.
 
@@ -149232,9 +149218,10 @@ ${options.gitFlow.reviewInstructions}
 
 # Prevous instructions (only for context, do not repeat)
 
-${options.prompt}
+${options.prompt}`;
+	const promptReviewCustom = (options) => `${options.prompt}
 
-${keyInformation(options)}`;
+${prdNotes(options)}`;
 	const promptTimeout = (options) => `Your earlier attempt to complete the task with id \`${options.taskId}\` took too
 long and has timed out. You can find the task details in the prd.yml file.
 
@@ -149283,9 +149270,9 @@ ${prdNotes(options)}`;
 ${prdNotes(options)}`;
 	return {
 		promptChoose,
-		promptInstructions,
 		prompt,
 		promptReview,
+		promptReviewCustom,
 		promptTimeout,
 		planPrompt
 	};
@@ -149695,6 +149682,20 @@ const getOrSelectCliAgent = gen(function* () {
 });
 const commandAgent = make$34("agent").pipe(withDescription("Select the CLI agent to use"), withHandler(() => selectCliAgent.pipe(provide$1(Settings.layer))));
 
+//#endregion
+//#region src/Agents/worker.ts
+const agentWorker = fnUntraced(function* (options) {
+	const pathService = yield* Path$1;
+	const worktree = yield* Worktree;
+	return yield* pipe(options.cliAgent.command({
+		prompt: options.prompt,
+		prdFilePath: pathService.join(".lalph", "prd.yml")
+	}), setCwd(worktree.directory), options.commandPrefix).pipe(worktree.execWithStallTimeout({
+		cliAgent: options.cliAgent,
+		stallTimeout: options.stallTimeout
+	}));
+});
+
 //#endregion
 //#region src/shared/fs.ts
 const makeWaitForFile = gen(function* () {
@@ -149786,49 +149787,6 @@ After making any changes, commit them to the same branch. Do not git push your c
 })).pipe(provide$3(layer));
 var GitFlowError = class extends TaggedError("GitFlowError") {};
 
-//#endregion
-//#region src/Agents/instructor.ts
-const agentInstructor = fnUntraced(function* (options) {
-	const fs = yield* FileSystem;
-	const pathService = yield* Path$1;
-	const worktree = yield* Worktree;
-	const promptGen = yield* PromptGen;
-	const gitFlow = yield* GitFlow;
-	const waitForFile = yield* makeWaitForFile;
-	yield* pipe(options.cliAgent.command({
-		prompt: promptGen.promptInstructions({
-			task: options.task,
-			targetBranch: getOrUndefined(options.targetBranch),
-			specsDirectory: options.specsDirectory,
-			githubPrNumber: options.githubPrNumber,
-			gitFlow
-		}),
-		prdFilePath: pathService.join(".lalph", "prd.yml")
-	}), setCwd(worktree.directory), options.commandPrefix, worktree.execWithStallTimeout({
-		cliAgent: options.cliAgent,
-		stallTimeout: options.stallTimeout
-	}), raceFirst(waitForFile(pathService.join(worktree.directory, ".lalph"), "instructions.md")));
-	return yield* fs.readFileString(pathService.join(worktree.directory, ".lalph", "instructions.md"));
-});
-
-//#endregion
-//#region src/Agents/worker.ts
-const agentWorker = fnUntraced(function* (options) {
-	const pathService = yield* Path$1;
-	const worktree = yield* Worktree;
-	const promptGen = yield* PromptGen;
-	return yield* pipe(options.cliAgent.command({
-		prompt: promptGen.prompt({
-			prompt: options.instructions,
-			specsDirectory: options.specsDirectory
-		}),
-		prdFilePath: pathService.join(".lalph", "prd.yml")
-	}), setCwd(worktree.directory), options.commandPrefix).pipe(worktree.execWithStallTimeout({
-		cliAgent: options.cliAgent,
-		stallTimeout: options.stallTimeout
-	}));
-});
-
 //#endregion
 //#region src/Agents/chooser.ts
 const agentChooser = fnUntraced(function* (options) {
@@ -149867,15 +149825,22 @@ const ChosenTask = fromJsonString(Struct({
 //#endregion
 //#region src/Agents/reviewer.ts
 const agentReviewer = fnUntraced(function* (options) {
+	const fs = yield* FileSystem;
 	const pathService = yield* Path$1;
 	const worktree = yield* Worktree;
 	const promptGen = yield* PromptGen;
 	const gitFlow = yield* GitFlow;
+	const customInstructions = yield* pipe(fs.readFileString(pathService.join(worktree.directory, "LALPH_REVIEW.md")), option$1);
 	return yield* pipe(options.cliAgent.command({
-		prompt: promptGen.promptReview({
-			prompt: options.instructions,
-			specsDirectory: options.specsDirectory,
-			gitFlow
+		prompt: match$7(customInstructions, {
+			onNone: () => promptGen.promptReview({
+				prompt: options.instructions,
+				gitFlow
+			}),
+			onSome: (prompt) => promptGen.promptReviewCustom({
+				prompt,
+				specsDirectory: options.specsDirectory
+			})
 		}),
 		prdFilePath: pathService.join(".lalph", "prd.yml")
 	}), setCwd(worktree.directory), options.commandPrefix).pipe(worktree.execWithStallTimeout({
@@ -149954,24 +149919,20 @@ const run = fnUntraced(function* (options) {
 		const feedback = yield* gh.prFeedbackMd(chosenTask.githubPrNumber);
 		yield* fs.writeFileString(pathService.join(worktree.directory, ".lalph", "feedback.md"), feedback);
 	}
-	registry.update(currentWorker.state, (s) => s.transitionTo(WorkerStatus.Instructing({ issueId: taskId })));
-	const instructions = yield* agentInstructor({
-		stallTimeout: options.stallTimeout,
-		commandPrefix: options.commandPrefix,
-		specsDirectory: options.specsDirectory,
-		targetBranch: options.targetBranch,
-		task: chosenTask.prd,
-		cliAgent,
-		githubPrNumber: chosenTask.githubPrNumber ?? void 0
-	}).pipe(withSpan("Main.agentInstructor"));
 	yield* gen(function* () {
 		registry.update(currentWorker.state, (s) => s.transitionTo(WorkerStatus.Working({ issueId: taskId })));
-		const exitCode = yield* agentWorker({
+		const instructions = (yield* PromptGen).prompt({
 			specsDirectory: options.specsDirectory,
+			targetBranch: getOrUndefined(options.targetBranch),
+			task: chosenTask.prd,
+			githubPrNumber: chosenTask.githubPrNumber ?? void 0,
+			gitFlow
+		});
+		const exitCode = yield* agentWorker({
 			stallTimeout: options.stallTimeout,
 			cliAgent,
 			commandPrefix: options.commandPrefix,
-			instructions
+			prompt: instructions
 		}).pipe(withSpan("Main.agentWorker"));
 		yield* log$1(`Agent exited with code: ${exitCode}`);
 		if (options.review) {
@@ -150014,7 +149975,7 @@ const stallMinutes = integer("stall-minutes").pipe(withDescription$1("If no acti
 const specsDirectory = directory("specs").pipe(withDescription$1("Directory to store plan specifications. Env variable: LALPH_SPECS"), withAlias("s"), withFallbackConfig(string$4("LALPH_SPECS")), withDefault(".specs"));
 const commitMode = boolean("commit").pipe(withDescription$1("Commit to the target branch instead of creating PRs"));
 const verbose = boolean("verbose").pipe(withDescription$1("Enable verbose logging"), withAlias("v"));
-const review = boolean("review").pipe(withDescription$1("Enabled the AI peer-review step"));
+const review = boolean("review").pipe(withDescription$1("Enable the AI peer-review step. Will use LALPH_REVIEW.md if present."));
 const reset = boolean("reset").pipe(withDescription$1("Reset the current issue source before running"), withAlias("r"));
 const commandRoot = make$34("lalph", {
 	iterations,
@@ -150213,7 +150174,7 @@ const commandSource = make$34("source").pipe(withDescription("Select the issue s
 
 //#endregion
 //#region package.json
-var version = "0.1.108";
+var version = "0.1.110";
 
 //#endregion
 //#region src/Tracing.ts

package/package.json

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

package/src/Agents/reviewer.ts

@@ -1,4 +1,4 @@
-import { Duration, Effect, Path, pipe } from "effect"
+import { Duration, Effect, FileSystem, Option, Path, pipe } from "effect"
 import { PromptGen } from "../PromptGen.ts"
 import { ChildProcess } from "effect/unstable/process"
 import { Worktree } from "../Worktree.ts"
@@ -14,17 +14,30 @@ export const agentReviewer = Effect.fnUntraced(function* (options: {
   ) => ChildProcess.Command
   readonly instructions: string
 }) {
+  const fs = yield* FileSystem.FileSystem
   const pathService = yield* Path.Path
   const worktree = yield* Worktree
   const promptGen = yield* PromptGen
   const gitFlow = yield* GitFlow
 
+  const customInstructions = yield* pipe(
+    fs.readFileString(pathService.join(worktree.directory, "LALPH_REVIEW.md")),
+    Effect.option,
+  )
+
   const cliCommand = pipe(
     options.cliAgent.command({
-      prompt: promptGen.promptReview({
-        prompt: options.instructions,
-        specsDirectory: options.specsDirectory,
-        gitFlow,
+      prompt: Option.match(customInstructions, {
+        onNone: () =>
+          promptGen.promptReview({
+            prompt: options.instructions,
+            gitFlow,
+          }),
+        onSome: (prompt) =>
+          promptGen.promptReviewCustom({
+            prompt,
+            specsDirectory: options.specsDirectory,
+          }),
       }),
       prdFilePath: pathService.join(".lalph", "prd.yml"),
     }),

package/src/Agents/worker.ts

@@ -1,28 +1,22 @@
 import { Duration, Effect, Path, pipe } from "effect"
-import { PromptGen } from "../PromptGen.ts"
 import { ChildProcess } from "effect/unstable/process"
 import { Worktree } from "../Worktree.ts"
 import type { CliAgent } from "../domain/CliAgent.ts"
 
 export const agentWorker = Effect.fnUntraced(function* (options: {
-  readonly specsDirectory: string
   readonly stallTimeout: Duration.Duration
   readonly cliAgent: CliAgent
   readonly commandPrefix: (
     command: ChildProcess.Command,
   ) => ChildProcess.Command
-  readonly instructions: string
+  readonly prompt: string
 }) {
   const pathService = yield* Path.Path
   const worktree = yield* Worktree
-  const promptGen = yield* PromptGen
 
   const cliCommand = pipe(
     options.cliAgent.command({
-      prompt: promptGen.prompt({
-        prompt: options.instructions,
-        specsDirectory: options.specsDirectory,
-      }),
+      prompt: options.prompt,
       prdFilePath: pathService.join(".lalph", "prd.yml"),
     }),
     ChildProcess.setCwd(worktree.directory),

package/src/PromptGen.ts

@@ -137,24 +137,13 @@ challenges faced.
 
 ${prdNotes(options)}`
 
-      const promptInstructions = (options: {
+      const prompt = (options: {
         readonly task: PrdIssue
         readonly targetBranch: string | undefined
         readonly specsDirectory: string
         readonly githubPrNumber: number | undefined
         readonly gitFlow: GitFlow["Service"]
-      }) => `You are to read all of the following sections, and then output
-step by step instructions for another AI agent to fullfil the task. Make sure to
-do some quick research to understand the task before writing the instructions.
-
-Save the instructions in a markdown file called ".lalph/instructions.md".
-
-**DO NOT** start working on the task yet, only output the instructions.
-Do everything you can to help the agent succeed.
-
-"Help others achieve their dreams and you will achieve yours."
-
-# The task
+      }) => `# The task
 
 ID: ${options.task.id}
 Task: ${options.task.title}
@@ -187,18 +176,10 @@ ${options.task.description}
    - Rewrite the notes in the description to include only the key discoveries and information that could speed up future work on other tasks. Make sure to preserve important information such as specification file references.
    - If you believe the task is complete, update the \`state\` to "in-review".
 
-${keyInformation(options)}`
-
-      const prompt = (options: {
-        readonly prompt: string
-        readonly specsDirectory: string
-      }) => `${options.prompt}
-
 ${keyInformation(options)}`
 
       const promptReview = (options: {
         readonly prompt: string
-        readonly specsDirectory: string
         readonly gitFlow: GitFlow["Service"]
       }) => `A previous AI agent has completed a task from the instructions below.
 
@@ -208,9 +189,14 @@ ${options.gitFlow.reviewInstructions}
 
 # Prevous instructions (only for context, do not repeat)
 
-${options.prompt}
+${options.prompt}`
 
-${keyInformation(options)}`
+      const promptReviewCustom = (options: {
+        readonly prompt: string
+        readonly specsDirectory: string
+      }) => `${options.prompt}
+
+${prdNotes(options)}`
 
       const promptTimeout = (options: {
         readonly taskId: string
@@ -267,9 +253,9 @@ ${prdNotes(options)}`
 
       return {
         promptChoose,
-        promptInstructions,
         prompt,
         promptReview,
+        promptReviewCustom,
         promptTimeout,
         planPrompt,
       } as const

package/src/commands/root.ts

@@ -24,7 +24,6 @@ import {
   resetInProgress,
 } from "../IssueSources.ts"
 import { GithubCli } from "../Github/Cli.ts"
-import { agentInstructor } from "../Agents/instructor.ts"
 import { agentWorker } from "../Agents/worker.ts"
 import { agentChooser } from "../Agents/chooser.ts"
 import { RunnerStalled } from "../domain/Errors.ts"
@@ -143,42 +142,33 @@ const run = Effect.fnUntraced(
       )
     }
 
-    // 2. Generate instructions
-    // -----------------------
-
-    registry.update(currentWorker.state, (s) =>
-      s.transitionTo(WorkerStatus.Instructing({ issueId: taskId })),
-    )
-
-    const instructions = yield* agentInstructor({
-      stallTimeout: options.stallTimeout,
-      commandPrefix: options.commandPrefix,
-      specsDirectory: options.specsDirectory,
-      targetBranch: options.targetBranch,
-      task: chosenTask.prd,
-      cliAgent,
-      githubPrNumber: chosenTask.githubPrNumber ?? undefined,
-    }).pipe(Effect.withSpan("Main.agentInstructor"))
-
     yield* Effect.gen(function* () {
       //
-      // 3. Work on task
+      // 2. Work on task
       // -----------------------
 
       registry.update(currentWorker.state, (s) =>
         s.transitionTo(WorkerStatus.Working({ issueId: taskId })),
       )
 
-      const exitCode = yield* agentWorker({
+      const promptGen = yield* PromptGen
+      const instructions = promptGen.prompt({
         specsDirectory: options.specsDirectory,
+        targetBranch: Option.getOrUndefined(options.targetBranch),
+        task: chosenTask.prd,
+        githubPrNumber: chosenTask.githubPrNumber ?? undefined,
+        gitFlow,
+      })
+
+      const exitCode = yield* agentWorker({
         stallTimeout: options.stallTimeout,
         cliAgent,
         commandPrefix: options.commandPrefix,
-        instructions,
+        prompt: instructions,
       }).pipe(Effect.withSpan("Main.agentWorker"))
       yield* Effect.log(`Agent exited with code: ${exitCode}`)
 
-      // 4. Review task
+      // 3. Review task
       // -----------------------
 
       if (options.review) {
@@ -302,7 +292,9 @@ const verbose = Flag.boolean("verbose").pipe(
 )
 
 const review = Flag.boolean("review").pipe(
-  Flag.withDescription("Enabled the AI peer-review step"),
+  Flag.withDescription(
+    "Enable the AI peer-review step. Will use LALPH_REVIEW.md if present.",
+  ),
 )
 
 // handled in cli.ts

package/src/domain/WorkerState.ts

@@ -32,7 +32,6 @@ export class WorkerState extends Data.Class<{
 export type WorkerStatus = Data.TaggedEnum<{
   Booting: {}
   ChoosingTask: {}
-  Instructing: { issueId: string }
   Working: { issueId: string }
   Reviewing: { issueId: string }
   Merging: { issueId: string }

package/src/Agents/instructor.ts

@@ -1,55 +0,0 @@
-import { Duration, Effect, FileSystem, Option, Path, pipe } from "effect"
-import { PromptGen } from "../PromptGen.ts"
-import { ChildProcess } from "effect/unstable/process"
-import { Worktree } from "../Worktree.ts"
-import type { CliAgent } from "../domain/CliAgent.ts"
-import type { PrdIssue } from "../domain/PrdIssue.ts"
-import { makeWaitForFile } from "../shared/fs.ts"
-import { GitFlow } from "../GitFlow.ts"
-
-export const agentInstructor = Effect.fnUntraced(function* (options: {
-  readonly targetBranch: Option.Option<string>
-  readonly specsDirectory: string
-  readonly stallTimeout: Duration.Duration
-  readonly commandPrefix: (
-    command: ChildProcess.Command,
-  ) => ChildProcess.Command
-  readonly cliAgent: CliAgent
-  readonly task: PrdIssue
-  readonly githubPrNumber: number | undefined
-}) {
-  const fs = yield* FileSystem.FileSystem
-  const pathService = yield* Path.Path
-  const worktree = yield* Worktree
-  const promptGen = yield* PromptGen
-  const gitFlow = yield* GitFlow
-  const waitForFile = yield* makeWaitForFile
-
-  yield* pipe(
-    options.cliAgent.command({
-      prompt: promptGen.promptInstructions({
-        task: options.task,
-        targetBranch: Option.getOrUndefined(options.targetBranch),
-        specsDirectory: options.specsDirectory,
-        githubPrNumber: options.githubPrNumber,
-        gitFlow,
-      }),
-      prdFilePath: pathService.join(".lalph", "prd.yml"),
-    }),
-    ChildProcess.setCwd(worktree.directory),
-    options.commandPrefix,
-    worktree.execWithStallTimeout({
-      cliAgent: options.cliAgent,
-      stallTimeout: options.stallTimeout,
-    }),
-    Effect.raceFirst(
-      waitForFile(
-        pathService.join(worktree.directory, ".lalph"),
-        "instructions.md",
-      ),
-    ),
-  )
-  return yield* fs.readFileString(
-    pathService.join(worktree.directory, ".lalph", "instructions.md"),
-  )
-})