lalph 0.1.36 → 0.1.37

package/dist/cli.mjs

@@ -140554,6 +140554,8 @@ ${prdNotes}`;
    - Each task should be an atomic, committable piece of work.
      Instead of creating tasks like "Refactor the authentication system", create
      smaller tasks like "Implement OAuth2 login endpoint", "Add JWT token refresh mechanism", etc.
+   - **Never** create a research task. You should do all the necessary research
+     before creating the specification and tasks.
 3. Add the new or updated tasks to the prd.yml file.
 4. Wait until the tasks are saved, then setup task dependencies using the \`blockedBy\` field.
 5. Start a subagent with a copy of this prompt, to review the plan and provide feedback or improvements.
@@ -140743,6 +140745,11 @@ const run = fnUntraced(function* (options) {
 		extendEnv: true,
 		env: cliAgent.env
 	})(template, ...args$1).pipe(exitCode);
+	const execOutput = (template, ...args$1) => make$21({
+		cwd: worktree.directory,
+		extendEnv: true,
+		env: cliAgent.env
+	})(template, ...args$1).pipe(string, map$4((output) => output.trim()));
 	const execWithStallTimeout = fnUntraced(function* (command) {
 		let lastOutputAt = yield* now;
 		const stallTimeout = suspend$2(function loop() {
@@ -140768,47 +140775,58 @@ const run = fnUntraced(function* (options) {
 		return yield* handle.exitCode;
 	}, scoped$1);
 	if (isSome(options.targetBranch)) yield* exec`git checkout ${`origin/${options.targetBranch.value}`}`;
-	const chooseCommand = cliAgent.command({
-		prompt: promptGen.promptChoose,
-		prdFilePath: pathService.join(".lalph", "prd.yml")
-	});
-	yield* make$21(chooseCommand[0], chooseCommand.slice(1), {
-		cwd: worktree.directory,
-		extendEnv: true,
-		env: cliAgent.env,
-		stdout: "inherit",
-		stderr: "inherit",
-		stdin: "inherit"
-	}).pipe(exitCode, timeoutOrElse({
-		duration: options.stallTimeout,
-		onTimeout: () => fail$4(new RunnerStalled())
+	const currentBranch = execOutput`git branch --show-current`.pipe(map$4((branch) => {
+		branch = branch.trim();
+		return branch === "" ? null : branch;
 	}));
-	const taskJson = yield* fs.readFileString(pathService.join(worktree.directory, ".lalph", "task.json"));
-	const task = yield* decodeEffect(ChosenTask)(taskJson);
-	yield* completeWith(options.startedDeferred, void_$1);
-	const exitCode$1 = yield* execWithStallTimeout(cliAgent.command({
-		prompt: promptGen.prompt({
-			taskId: task.id,
-			targetBranch: getOrUndefined(options.targetBranch)
-		}),
-		prdFilePath: pathService.join(".lalph", "prd.yml")
-	})).pipe(timeout(options.runTimeout), catchTag("TimeoutError", fnUntraced(function* (error$1) {
-		yield* execWithStallTimeout(cliAgent.command({
-			prompt: promptGen.promptTimeout({ taskId: task.id }),
+	yield* gen(function* () {
+		const chooseCommand = cliAgent.command({
+			prompt: promptGen.promptChoose,
 			prdFilePath: pathService.join(".lalph", "prd.yml")
+		});
+		yield* make$21(chooseCommand[0], chooseCommand.slice(1), {
+			cwd: worktree.directory,
+			extendEnv: true,
+			env: cliAgent.env,
+			stdout: "inherit",
+			stderr: "inherit",
+			stdin: "inherit"
+		}).pipe(exitCode, timeoutOrElse({
+			duration: options.stallTimeout,
+			onTimeout: () => fail$4(new RunnerStalled())
 		}));
-		return yield* error$1;
-	})));
-	yield* log$1(`Agent exited with code: ${exitCode$1}`);
-	const prs = yield* prd.mergableGithubPrs;
-	if (prs.length === 0) yield* prd.maybeRevertIssue({
-		...task,
-		issueId: task.id
-	});
-	else if (options.autoMerge) for (const pr of prs) {
-		if (isSome(options.targetBranch)) yield* exec`gh pr edit ${pr.prNumber} --base ${options.targetBranch.value}`;
-		if ((yield* exec`gh pr merge ${pr.prNumber} -sd`) !== 0) yield* prd.flagUnmergable({ issueId: pr.issueId });
-	}
+		const taskJson = yield* fs.readFileString(pathService.join(worktree.directory, ".lalph", "task.json"));
+		const task = yield* decodeEffect(ChosenTask)(taskJson);
+		yield* completeWith(options.startedDeferred, void_$1);
+		const exitCode$1 = yield* execWithStallTimeout(cliAgent.command({
+			prompt: promptGen.prompt({
+				taskId: task.id,
+				targetBranch: getOrUndefined(options.targetBranch)
+			}),
+			prdFilePath: pathService.join(".lalph", "prd.yml")
+		})).pipe(timeout(options.runTimeout), catchTag("TimeoutError", fnUntraced(function* (error$1) {
+			yield* execWithStallTimeout(cliAgent.command({
+				prompt: promptGen.promptTimeout({ taskId: task.id }),
+				prdFilePath: pathService.join(".lalph", "prd.yml")
+			}));
+			return yield* error$1;
+		})));
+		yield* log$1(`Agent exited with code: ${exitCode$1}`);
+		const prs = yield* prd.mergableGithubPrs;
+		if (prs.length === 0) yield* prd.maybeRevertIssue({
+			...task,
+			issueId: task.id
+		});
+		else if (options.autoMerge) for (const pr of prs) {
+			if (isSome(options.targetBranch)) yield* exec`gh pr edit ${pr.prNumber} --base ${options.targetBranch.value}`;
+			if ((yield* exec`gh pr merge ${pr.prNumber} -sd`) !== 0) yield* prd.flagUnmergable({ issueId: pr.issueId });
+		}
+	}).pipe(ensuring(gen(function* () {
+		const currentBranchName = yield* currentBranch;
+		if (!currentBranchName) return;
+		yield* exec`git checkout --detach ${currentBranchName}`;
+		yield* exec`git branch -D ${currentBranchName}`;
+	}).pipe(ignore)));
 }, onError(fnUntraced(function* () {
 	const prd = yield* Prd;
 	yield* ignore(prd.revertStateIds);

package/package.json

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

package/src/PromptGen.ts

@@ -182,6 +182,8 @@ ${prdNotes}`
    - Each task should be an atomic, committable piece of work.
      Instead of creating tasks like "Refactor the authentication system", create
      smaller tasks like "Implement OAuth2 login endpoint", "Add JWT token refresh mechanism", etc.
+   - **Never** create a research task. You should do all the necessary research
+     before creating the specification and tasks.
 3. Add the new or updated tasks to the prd.yml file.
 4. Wait until the tasks are saved, then setup task dependencies using the \`blockedBy\` field.
 5. Start a subagent with a copy of this prompt, to review the plan and provide feedback or improvements.

package/src/Runner.ts

@@ -41,6 +41,19 @@ export const run = Effect.fnUntraced(
         env: cliAgent.env,
       })(template, ...args).pipe(ChildProcess.exitCode)
 
+    const execOutput = (
+      template: TemplateStringsArray,
+      ...args: Array<string | number | boolean>
+    ) =>
+      ChildProcess.make({
+        cwd: worktree.directory,
+        extendEnv: true,
+        env: cliAgent.env,
+      })(template, ...args).pipe(
+        ChildProcess.string,
+        Effect.map((output) => output.trim()),
+      )
+
     const execWithStallTimeout = Effect.fnUntraced(function* (
       command: ReadonlyArray<string>,
     ) {
@@ -88,77 +101,97 @@ export const run = Effect.fnUntraced(
       yield* exec`git checkout ${`origin/${options.targetBranch.value}`}`
     }
 
-    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,
-      env: cliAgent.env,
-      stdout: "inherit",
-      stderr: "inherit",
-      stdin: "inherit",
-    }).pipe(
-      ChildProcess.exitCode,
-      Effect.timeoutOrElse({
-        duration: options.stallTimeout,
-        onTimeout: () => Effect.fail(new RunnerStalled()),
+    const currentBranch = execOutput`git branch --show-current`.pipe(
+      Effect.map((branch) => {
+        branch = branch.trim()
+        return branch === "" ? null : branch
       }),
     )
 
-    const taskJson = yield* fs.readFileString(
-      pathService.join(worktree.directory, ".lalph", "task.json"),
-    )
-    const task = yield* Schema.decodeEffect(ChosenTask)(taskJson)
-
-    yield* Deferred.completeWith(options.startedDeferred, Effect.void)
+    yield* Effect.gen(function* () {
+      const chooseCommand = cliAgent.command({
+        prompt: promptGen.promptChoose,
+        prdFilePath: pathService.join(".lalph", "prd.yml"),
+      })
 
-    const cliCommand = cliAgent.command({
-      prompt: promptGen.prompt({
-        taskId: task.id,
-        targetBranch: Option.getOrUndefined(options.targetBranch),
-      }),
-      prdFilePath: pathService.join(".lalph", "prd.yml"),
-    })
-
-    const exitCode = yield* execWithStallTimeout(cliCommand).pipe(
-      Effect.timeout(options.runTimeout),
-      Effect.catchTag(
-        "TimeoutError",
-        Effect.fnUntraced(function* (error) {
-          const timeoutCommand = cliAgent.command({
-            prompt: promptGen.promptTimeout({
-              taskId: task.id,
-            }),
-            prdFilePath: pathService.join(".lalph", "prd.yml"),
-          })
-          yield* execWithStallTimeout(timeoutCommand)
-          return yield* error
+      yield* ChildProcess.make(chooseCommand[0]!, chooseCommand.slice(1), {
+        cwd: worktree.directory,
+        extendEnv: true,
+        env: cliAgent.env,
+        stdout: "inherit",
+        stderr: "inherit",
+        stdin: "inherit",
+      }).pipe(
+        ChildProcess.exitCode,
+        Effect.timeoutOrElse({
+          duration: options.stallTimeout,
+          onTimeout: () => Effect.fail(new RunnerStalled()),
         }),
-      ),
-    )
-    yield* Effect.log(`Agent exited with code: ${exitCode}`)
+      )
 
-    const prs = yield* prd.mergableGithubPrs
-    if (prs.length === 0) {
-      yield* prd.maybeRevertIssue({
-        ...task,
-        issueId: task.id,
+      const taskJson = yield* fs.readFileString(
+        pathService.join(worktree.directory, ".lalph", "task.json"),
+      )
+      const task = yield* Schema.decodeEffect(ChosenTask)(taskJson)
+
+      yield* Deferred.completeWith(options.startedDeferred, Effect.void)
+
+      const cliCommand = cliAgent.command({
+        prompt: promptGen.prompt({
+          taskId: task.id,
+          targetBranch: Option.getOrUndefined(options.targetBranch),
+        }),
+        prdFilePath: pathService.join(".lalph", "prd.yml"),
       })
-    } else if (options.autoMerge) {
-      for (const pr of prs) {
-        if (Option.isSome(options.targetBranch)) {
-          yield* exec`gh pr edit ${pr.prNumber} --base ${options.targetBranch.value}`
-        }
 
-        const exitCode = yield* exec`gh pr merge ${pr.prNumber} -sd`
-        if (exitCode !== 0) {
-          yield* prd.flagUnmergable({ issueId: pr.issueId })
+      const exitCode = yield* execWithStallTimeout(cliCommand).pipe(
+        Effect.timeout(options.runTimeout),
+        Effect.catchTag(
+          "TimeoutError",
+          Effect.fnUntraced(function* (error) {
+            const timeoutCommand = cliAgent.command({
+              prompt: promptGen.promptTimeout({
+                taskId: task.id,
+              }),
+              prdFilePath: pathService.join(".lalph", "prd.yml"),
+            })
+            yield* execWithStallTimeout(timeoutCommand)
+            return yield* error
+          }),
+        ),
+      )
+      yield* Effect.log(`Agent exited with code: ${exitCode}`)
+
+      const prs = yield* prd.mergableGithubPrs
+      if (prs.length === 0) {
+        yield* prd.maybeRevertIssue({
+          ...task,
+          issueId: task.id,
+        })
+      } else if (options.autoMerge) {
+        for (const pr of prs) {
+          if (Option.isSome(options.targetBranch)) {
+            yield* exec`gh pr edit ${pr.prNumber} --base ${options.targetBranch.value}`
+          }
+
+          const exitCode = yield* exec`gh pr merge ${pr.prNumber} -sd`
+          if (exitCode !== 0) {
+            yield* prd.flagUnmergable({ issueId: pr.issueId })
+          }
         }
       }
-    }
+    }).pipe(
+      Effect.ensuring(
+        Effect.gen(function* () {
+          const currentBranchName = yield* currentBranch
+          if (!currentBranchName) return
+          // enter detached state
+          yield* exec`git checkout --detach ${currentBranchName}`
+          // delete the branch
+          yield* exec`git branch -D ${currentBranchName}`
+        }).pipe(Effect.ignore),
+      ),
+    )
   },
   // on interrupt or error, revert any state changes made in the PRD
   Effect.onError(