lalph 0.1.50 → 0.1.51

package/dist/cli.mjs

@@ -60210,6 +60210,7 @@ var PrdIssue = class PrdIssue extends Class("PrdIssue")({
 	]).annotate({ description: "The state of the issue." }),
 	blockedBy: Array$1(String$1).annotate({ description: "An array of issue IDs that block this issue. These issues must be completed before this issue can be worked on." }),
 	complete: Boolean$2.annotate({ description: "Whether the issue is complete." }),
+	autoMerge: Boolean$2.annotate({ description: "Whether the issue should be auto-merged when complete. Read-only field" }),
 	githubPrNumber: NullOr(Finite).annotate({ description: "The created or updated Github pull request number for this task." })
 }) {
 	static Array = Array$1(this);
@@ -134468,6 +134469,7 @@ const LinearIssueSource = effect(IssueSource, gen(function* () {
 	const project = yield* getOrSelectProject;
 	const teamId = yield* getOrSelectTeamId(project);
 	const labelId = yield* getOrSelectLabel$1;
+	const autoMergeLabelId = yield* getOrSelectAutoMergeLabel$1;
 	const identifierMap = /* @__PURE__ */ new Map();
 	const backlogState = linear.states.find((s) => s.type === "backlog" && s.name.toLowerCase().includes("backlog")) || linear.states.find((s) => s.type === "backlog");
 	const todoState = linear.states.find((s) => s.type === "unstarted" && (s.name.toLowerCase().includes("todo") || s.name.toLowerCase().includes("unstarted"))) || linear.states.find((s) => s.type === "unstarted");
@@ -134527,6 +134529,7 @@ const LinearIssueSource = effect(IssueSource, gen(function* () {
 			state,
 			complete: state === "in-review" || state === "done",
 			blockedBy: blockedBy.map((i) => i.identifier),
+			autoMerge: autoMergeLabelId.pipe(map$11((labelId$1) => issue.labelIds.includes(labelId$1)), getOrElse(() => false)),
 			githubPrNumber: null
 		});
 	}), { concurrency: 10 }), runCollect, mapError$2((cause) => new IssueSourceError({ cause })));
@@ -134595,6 +134598,7 @@ const resetLinear = gen(function* () {
 	yield* selectedProjectId.set(none$3());
 	yield* selectedTeamId.set(none$3());
 	yield* selectedLabelId.set(none$3());
+	yield* selectedAutoMergeLabelId.set(none$3());
 });
 var LinearError = class extends ErrorClass("lalph/LinearError")({
 	_tag: tag("LinearError"),
@@ -134655,10 +134659,32 @@ const labelIdSelect = gen(function* () {
 	return labelId;
 });
 const getOrSelectLabel$1 = gen(function* () {
-	const labedId = yield* selectedLabelId.get;
-	if (isSome(labedId)) return labedId.value;
+	const labelId = yield* selectedLabelId.get;
+	if (isSome(labelId)) return labelId.value;
 	return yield* labelIdSelect;
 });
+const selectedAutoMergeLabelId = new Setting("linear.selectedAutoMergeLabelId", Option(String$1));
+const autoMergeLabelIdSelect = gen(function* () {
+	const linear = yield* Linear;
+	const labels = yield* runCollect(linear.labels);
+	const labelId = yield* select({
+		message: "Select a label to mark issues for auto merge",
+		choices: [{
+			title: "Disabled",
+			value: none$3()
+		}].concat(labels.map((label) => ({
+			title: label.name,
+			value: some(label.id)
+		})))
+	});
+	yield* selectedAutoMergeLabelId.set(some(labelId));
+	return labelId;
+});
+const getOrSelectAutoMergeLabel$1 = gen(function* () {
+	const labelId = yield* selectedAutoMergeLabelId.get;
+	if (isSome(labelId)) return labelId.value;
+	return yield* autoMergeLabelIdSelect;
+});
 
 //#endregion
 //#region node_modules/.pnpm/universal-user-agent@7.0.3/node_modules/universal-user-agent/index.js
@@ -140773,6 +140799,7 @@ const GithubIssueSource = effect(IssueSource, gen(function* () {
 	const github = yield* Github;
 	const [owner, repo] = (yield* make$21`gh repo view --json nameWithOwner -q ${".nameWithOwner"}`.pipe(string, option$1, flatMap((o) => o.pipe(map$11(trim), filter$5(isNonEmpty), fromOption)), mapError$2((_) => new GithubRepoNotFound()))).split("/");
 	const labelFilter$1 = yield* getOrSelectLabel;
+	const autoMergeLabelName = yield* getOrSelectAutoMergeLabel;
 	const hasLabel = (label, name) => label.some((l) => typeof l === "string" ? l === name : l.name === name);
 	const listOpenBlockedBy = (issueId) => github.stream((rest, page) => rest.issues.listDependenciesBlockedBy({
 		owner,
@@ -140809,6 +140836,7 @@ const GithubIssueSource = effect(IssueSource, gen(function* () {
 			state,
 			complete: state === "done" || state === "in-review",
 			blockedBy: dependencies.map((dep) => `#${dep.number}`),
+			autoMerge: autoMergeLabelName.pipe(map$11((labelName) => hasLabel(issue.labels, labelName)), getOrElse(() => false)),
 			githubPrNumber: null
 		});
 	}), { concurrency: 10 }), runCollect, mapError$2((cause) => new IssueSourceError({ cause })));
@@ -140928,7 +140956,19 @@ const getOrSelectLabel = gen(function* () {
 	if (isSome(label)) return label.value;
 	return yield* labelSelect;
 });
-const resetGithub = labelFilter.set(none$3());
+const autoMergeLabel = new Setting("github.autoMergeLabel", Option(String$1));
+const autoMergeLabelSelect = gen(function* () {
+	const label = yield* text$2({ message: "What label do you want to use for auto-mergable issues? (leave empty for none)" });
+	const labelOption = some(label.trim()).pipe(filter$5(isNonEmpty));
+	yield* autoMergeLabel.set(some(labelOption));
+	return labelOption;
+});
+const getOrSelectAutoMergeLabel = gen(function* () {
+	const label = yield* autoMergeLabel.get;
+	if (isSome(label)) return label.value;
+	return yield* autoMergeLabelSelect;
+});
+const resetGithub = labelFilter.set(none$3()).pipe(andThen(autoMergeLabel.set(none$3())));
 const maybeNextPage = (page, linkHeader) => pipe(fromNullishOr$2(linkHeader), filter$5((_) => _.includes(`rel="next"`)), as$2(page + 1));
 
 //#endregion
@@ -141281,21 +141321,24 @@ var Prd = class extends Service()("lalph/Prd", { make: gen(function* () {
 		});
 	});
 	const mergeConflictInstruction = "Next step: Rebase PR and resolve merge conflicts.";
+	const flagUnmergable = fnUntraced(function* (options) {
+		const issue = current.find((entry) => entry.id === options.issueId);
+		if (!issue) return;
+		const nextDescription = issue.description.includes(mergeConflictInstruction) ? issue.description : `${mergeConflictInstruction}\n\n${issue.description.trim()}`;
+		yield* source.updateIssue({
+			issueId: issue.id,
+			description: nextDescription,
+			state: "todo"
+		});
+	});
+	const findById = (issueId) => sync(() => current.find((i) => i.id === issueId) ?? null);
 	return {
 		path: prdFile,
 		mergableGithubPrs,
 		revertStateIds,
 		maybeRevertIssue,
-		flagUnmergable: fnUntraced(function* (options) {
-			const issue = current.find((entry) => entry.id === options.issueId);
-			if (!issue) return;
-			const nextDescription = issue.description.includes(mergeConflictInstruction) ? issue.description : `${mergeConflictInstruction}\n\n${issue.description.trim()}`;
-			yield* source.updateIssue({
-				issueId: issue.id,
-				description: nextDescription,
-				state: "todo"
-			});
-		})
+		flagUnmergable,
+		findById
 	};
 }) }) {
 	static layerNoWorktree = effect(this, this.make);
@@ -141331,14 +141374,8 @@ const run = fnUntraced(function* (options) {
 	const promptGen = yield* PromptGen;
 	const cliAgent = yield* getOrSelectCliAgent;
 	const prd = yield* Prd;
-	const exec = (template, ...args$1) => make$21({
-		cwd: worktree.directory,
-		extendEnv: true
-	})(template, ...args$1).pipe(exitCode);
-	const execOutput = (template, ...args$1) => make$21({
-		cwd: worktree.directory,
-		extendEnv: true
-	})(template, ...args$1).pipe(string, map$5((output) => output.trim()));
+	const exec = (template, ...args$1) => make$21({ cwd: worktree.directory })(template, ...args$1).pipe(exitCode);
+	const execOutput = (template, ...args$1) => make$21({ cwd: worktree.directory })(template, ...args$1).pipe(string, map$5((output) => output.trim()));
 	const execWithStallTimeout = fnUntraced(function* (command) {
 		let lastOutputAt = yield* now;
 		const stallTimeout = suspend$2(function loop() {
@@ -141385,29 +141422,28 @@ const run = fnUntraced(function* (options) {
 			onTimeout: () => fail$4(new RunnerStalled())
 		}));
 		const taskJson = yield* fs.readFileString(pathService.join(worktree.directory, ".lalph", "task.json"));
-		const task = yield* decodeEffect(ChosenTask)(taskJson);
+		const taskId = (yield* decodeEffect(ChosenTask)(taskJson)).id;
+		const task = yield* prd.findById(taskId);
+		if (!task) return;
 		yield* completeWith(options.startedDeferred, void_$1);
 		const exitCode$1 = yield* execWithStallTimeout(cliAgent.command({
 			prompt: promptGen.prompt({
-				taskId: task.id,
+				taskId,
 				targetBranch: getOrUndefined(options.targetBranch),
 				specsDirectory: options.specsDirectory
 			}),
 			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 }),
+				prompt: promptGen.promptTimeout({ taskId }),
 				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 (prs.length === 0) yield* prd.maybeRevertIssue({ issueId: taskId });
+		else if (task.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 });
 		}
@@ -141483,6 +141519,7 @@ title: Issue Title
 priority: 3
 estimate: null
 blockedBy: []
+autoMerge: false
 ---
 
 Describe the issue here.`;
@@ -141490,7 +141527,8 @@ const FrontMatterSchema = toCodecJson(Struct({
 	title: String$1,
 	priority: Finite,
 	estimate: NullOr(Finite),
-	blockedBy: Array$1(String$1)
+	blockedBy: Array$1(String$1),
+	autoMerge: Boolean$2
 }));
 const createIssue = make$27("issue").pipe(withDescription("Create a new issue in the selected issue source"), withHandler(fnUntraced(function* () {
 	const source = yield* IssueSource;
@@ -141536,7 +141574,6 @@ const createIssue = make$27("issue").pipe(withDescription("Create a new issue in
 //#region src/cli.ts
 const iterations = integer("iterations").pipe(withDescription$1("Number of iterations to run, defaults to unlimited"), withAlias("i"), withDefault(Number.POSITIVE_INFINITY));
 const concurrency = integer("concurrency").pipe(withDescription$1("Number of concurrent agents, defaults to 1"), withAlias("c"), withDefault(1));
-const autoMerge = boolean("auto-merge").pipe(withAlias("a"), withDescription$1("Automatically merge eligible PRs"));
 const targetBranch = string$1("target-branch").pipe(withDescription$1("Target branch for PRs. Env variable: LALPH_TARGET_BRANCH"), withAlias("b"), withFallbackConfig(string$4("LALPH_TARGET_BRANCH")), optional);
 const maxIterationMinutes = integer("max-minutes").pipe(withDescription$1("Maximum number of minutes to allow an iteration to run. Defaults to 90 minutes. Env variable: LALPH_MAX_MINUTES"), withFallbackConfig(int("LALPH_MAX_MINUTES")), withDefault(90));
 const stallMinutes = integer("stall-minutes").pipe(withDescription$1("If no activity occurs for this many minutes, the iteration will be stopped. Defaults to 5 minutes. Env variable: LALPH_STALL_MINUTES"), withFallbackConfig(int("LALPH_STALL_MINUTES")), withDefault(5));
@@ -141545,13 +141582,12 @@ const reset = boolean("reset").pipe(withDescription$1("Reset the current issue s
 const root = make$27("lalph", {
 	iterations,
 	concurrency,
-	autoMerge,
 	targetBranch,
 	maxIterationMinutes,
 	stallMinutes,
 	reset,
 	specsDirectory
-}).pipe(withHandler(fnUntraced(function* ({ iterations: iterations$1, concurrency: concurrency$1, autoMerge: autoMerge$1, targetBranch: targetBranch$1, maxIterationMinutes: maxIterationMinutes$1, stallMinutes: stallMinutes$1, reset: reset$2, specsDirectory: specsDirectory$1 }) {
+}).pipe(withHandler(fnUntraced(function* ({ iterations: iterations$1, concurrency: concurrency$1, targetBranch: targetBranch$1, maxIterationMinutes: maxIterationMinutes$1, stallMinutes: stallMinutes$1, reset: reset$2, specsDirectory: specsDirectory$1 }) {
 	if (reset$2) yield* resetCurrentIssueSource;
 	const source = yield* build(CurrentIssueSource.layer);
 	yield* getOrSelectCliAgent;
@@ -141570,7 +141606,6 @@ const root = make$27("lalph", {
 		const startedDeferred = yield* make$47();
 		yield* checkForWork.pipe(andThen(run({
 			startedDeferred,
-			autoMerge: autoMerge$1,
 			targetBranch: targetBranch$1,
 			specsDirectory: specsDirectory$1,
 			stallTimeout: minutes(stallMinutes$1),

package/package.json

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

package/src/CreateIssue.ts

@@ -11,6 +11,7 @@ title: Issue Title
 priority: 3
 estimate: null
 blockedBy: []
+autoMerge: false
 ---
 
 Describe the issue here.`
@@ -21,6 +22,7 @@ const FrontMatterSchema = Schema.toCodecJson(
     priority: Schema.Finite,
     estimate: Schema.NullOr(Schema.Finite),
     blockedBy: Schema.Array(Schema.String),
+    autoMerge: Schema.Boolean,
   }),
 )
 

package/src/Github.ts

@@ -112,6 +112,7 @@ export const GithubIssueSource = Layer.effect(
       )
     const [owner, repo] = nameWithOwner.split("/") as [string, string]
     const labelFilter = yield* getOrSelectLabel
+    const autoMergeLabelName = yield* getOrSelectAutoMergeLabel
 
     const hasLabel = (
       label: ReadonlyArray<
@@ -190,6 +191,10 @@ export const GithubIssueSource = Layer.effect(
               state,
               complete: state === "done" || state === "in-review",
               blockedBy: dependencies.map((dep) => `#${dep.number}`),
+              autoMerge: autoMergeLabelName.pipe(
+                Option.map((labelName) => hasLabel(issue.labels, labelName)),
+                Option.getOrElse(() => false),
+              ),
               githubPrNumber: null,
             })
           }),
@@ -411,7 +416,34 @@ const getOrSelectLabel = Effect.gen(function* () {
   return yield* labelSelect
 })
 
-export const resetGithub = labelFilter.set(Option.none())
+// == auto merge label
+
+const autoMergeLabel = new Setting(
+  "github.autoMergeLabel",
+  Schema.Option(Schema.String),
+)
+const autoMergeLabelSelect = Effect.gen(function* () {
+  const label = yield* Prompt.text({
+    message:
+      "What label do you want to use for auto-mergable issues? (leave empty for none)",
+  })
+  const labelOption = Option.some(label.trim()).pipe(
+    Option.filter(String.isNonEmpty),
+  )
+  yield* autoMergeLabel.set(Option.some(labelOption))
+  return labelOption
+})
+const getOrSelectAutoMergeLabel = Effect.gen(function* () {
+  const label = yield* autoMergeLabel.get
+  if (Option.isSome(label)) {
+    return label.value
+  }
+  return yield* autoMergeLabelSelect
+})
+
+export const resetGithub = labelFilter
+  .set(Option.none())
+  .pipe(Effect.andThen(autoMergeLabel.set(Option.none())))
 
 // == helpers
 

package/src/Linear.ts

@@ -120,6 +120,7 @@ export const LinearIssueSource = Layer.effect(
     const project = yield* getOrSelectProject
     const teamId = yield* getOrSelectTeamId(project)
     const labelId = yield* getOrSelectLabel
+    const autoMergeLabelId = yield* getOrSelectAutoMergeLabel
 
     // Map of linear identifier to issue id
     const identifierMap = new Map<string, string>()
@@ -231,6 +232,10 @@ export const LinearIssueSource = Layer.effect(
               state,
               complete: state === "in-review" || state === "done",
               blockedBy: blockedBy.map((i) => i.identifier),
+              autoMerge: autoMergeLabelId.pipe(
+                Option.map((labelId) => issue.labelIds.includes(labelId)),
+                Option.getOrElse(() => false),
+              ),
               githubPrNumber: null,
             })
           }),
@@ -372,6 +377,7 @@ export const resetLinear = Effect.gen(function* () {
   yield* selectedProjectId.set(Option.none())
   yield* selectedTeamId.set(Option.none())
   yield* selectedLabelId.set(Option.none())
+  yield* selectedAutoMergeLabelId.set(Option.none())
 })
 
 export class LinearError extends Schema.ErrorClass("lalph/LinearError")({
@@ -459,9 +465,43 @@ const labelIdSelect = Effect.gen(function* () {
   return labelId
 })
 const getOrSelectLabel = Effect.gen(function* () {
-  const labedId = yield* selectedLabelId.get
-  if (Option.isSome(labedId)) {
-    return labedId.value
+  const labelId = yield* selectedLabelId.get
+  if (Option.isSome(labelId)) {
+    return labelId.value
   }
   return yield* labelIdSelect
 })
+
+// Auto merge label selection
+
+const selectedAutoMergeLabelId = new Setting(
+  "linear.selectedAutoMergeLabelId",
+  Schema.Option(Schema.String),
+)
+const autoMergeLabelIdSelect = Effect.gen(function* () {
+  const linear = yield* Linear
+  const labels = yield* Stream.runCollect(linear.labels)
+  const labelId = yield* Prompt.select({
+    message: "Select a label to mark issues for auto merge",
+    choices: [
+      {
+        title: "Disabled",
+        value: Option.none<string>(),
+      },
+    ].concat(
+      labels.map((label) => ({
+        title: label.name,
+        value: Option.some(label.id),
+      })),
+    ),
+  })
+  yield* selectedAutoMergeLabelId.set(Option.some(labelId))
+  return labelId
+})
+const getOrSelectAutoMergeLabel = Effect.gen(function* () {
+  const labelId = yield* selectedAutoMergeLabelId.get
+  if (Option.isSome(labelId)) {
+    return labelId.value
+  }
+  return yield* autoMergeLabelIdSelect
+})

package/src/Prd.ts

@@ -193,12 +193,16 @@ export class Prd extends ServiceMap.Service<Prd>()("lalph/Prd", {
       })
     })
 
+    const findById = (issueId: string) =>
+      Effect.sync(() => current.find((i) => i.id === issueId) ?? null)
+
     return {
       path: prdFile,
       mergableGithubPrs,
       revertStateIds,
       maybeRevertIssue,
       flagUnmergable,
+      findById,
     } as const
   }),
 }) {

package/src/Runner.ts

@@ -19,7 +19,6 @@ import { getOrSelectCliAgent } from "./CliAgent.ts"
 export const run = Effect.fnUntraced(
   function* (options: {
     readonly startedDeferred: Deferred.Deferred<void>
-    readonly autoMerge: boolean
     readonly targetBranch: Option.Option<string>
     readonly specsDirectory: string
     readonly stallTimeout: Duration.Duration
@@ -38,7 +37,6 @@ export const run = Effect.fnUntraced(
     ) =>
       ChildProcess.make({
         cwd: worktree.directory,
-        extendEnv: true,
       })(template, ...args).pipe(ChildProcess.exitCode)
 
     const execOutput = (
@@ -47,7 +45,6 @@ export const run = Effect.fnUntraced(
     ) =>
       ChildProcess.make({
         cwd: worktree.directory,
-        extendEnv: true,
       })(template, ...args).pipe(
         ChildProcess.string,
         Effect.map((output) => output.trim()),
@@ -131,13 +128,15 @@ export const run = Effect.fnUntraced(
       const taskJson = yield* fs.readFileString(
         pathService.join(worktree.directory, ".lalph", "task.json"),
       )
-      const task = yield* Schema.decodeEffect(ChosenTask)(taskJson)
+      const taskId = (yield* Schema.decodeEffect(ChosenTask)(taskJson)).id
+      const task = yield* prd.findById(taskId)
+      if (!task) return
 
       yield* Deferred.completeWith(options.startedDeferred, Effect.void)
 
       const cliCommand = cliAgent.command({
         prompt: promptGen.prompt({
-          taskId: task.id,
+          taskId,
           targetBranch: Option.getOrUndefined(options.targetBranch),
           specsDirectory: options.specsDirectory,
         }),
@@ -151,7 +150,7 @@ export const run = Effect.fnUntraced(
           Effect.fnUntraced(function* (error) {
             const timeoutCommand = cliAgent.command({
               prompt: promptGen.promptTimeout({
-                taskId: task.id,
+                taskId,
               }),
               prdFilePath: pathService.join(".lalph", "prd.yml"),
             })
@@ -164,11 +163,8 @@ export const run = Effect.fnUntraced(
 
       const prs = yield* prd.mergableGithubPrs
       if (prs.length === 0) {
-        yield* prd.maybeRevertIssue({
-          ...task,
-          issueId: task.id,
-        })
-      } else if (options.autoMerge) {
+        yield* prd.maybeRevertIssue({ issueId: taskId })
+      } else if (task.autoMerge) {
         for (const pr of prs) {
           if (Option.isSome(options.targetBranch)) {
             yield* exec`gh pr edit ${pr.prNumber} --base ${options.targetBranch.value}`

package/src/cli.ts

@@ -37,11 +37,6 @@ const concurrency = Flag.integer("concurrency").pipe(
   Flag.withDefault(1),
 )
 
-const autoMerge = Flag.boolean("auto-merge").pipe(
-  Flag.withAlias("a"),
-  Flag.withDescription("Automatically merge eligible PRs"),
-)
-
 const targetBranch = Flag.string("target-branch").pipe(
   Flag.withDescription(
     "Target branch for PRs. Env variable: LALPH_TARGET_BRANCH",
@@ -84,7 +79,6 @@ const reset = Flag.boolean("reset").pipe(
 const root = Command.make("lalph", {
   iterations,
   concurrency,
-  autoMerge,
   targetBranch,
   maxIterationMinutes,
   stallMinutes,
@@ -95,7 +89,6 @@ const root = Command.make("lalph", {
     Effect.fnUntraced(function* ({
       iterations,
       concurrency,
-      autoMerge,
       targetBranch,
       maxIterationMinutes,
       stallMinutes,
@@ -135,7 +128,6 @@ const root = Command.make("lalph", {
           Effect.andThen(
             run({
               startedDeferred,
-              autoMerge,
               targetBranch,
               specsDirectory,
               stallTimeout: Duration.minutes(stallMinutes),

package/src/domain/PrdIssue.ts

@@ -36,6 +36,10 @@ export class PrdIssue extends Schema.Class<PrdIssue>("PrdIssue")({
   complete: Schema.Boolean.annotate({
     description: "Whether the issue is complete.",
   }),
+  autoMerge: Schema.Boolean.annotate({
+    description:
+      "Whether the issue should be auto-merged when complete. Read-only field",
+  }),
   githubPrNumber: Schema.NullOr(Schema.Finite).annotate({
     description:
       "The created or updated Github pull request number for this task.",