lalph 0.1.105 → 0.1.106

package/dist/cli.mjs

@@ -149514,7 +149514,7 @@ var Prd = class extends Service()("lalph/Prd", { make: gen(function* () {
 			state: "todo"
 		});
 	}, syncSemaphore.withPermit);
-	const mergeConflictInstruction = "**Your only remaining task**: rebase the PR against the target branch, and resolve any merge conflicts. Once done, you can remove this instruction from the issue description.";
+	const mergeConflictInstruction = "A previous attempt at this task resulted in merge conflicts. Please try implementing the task again.";
 	const flagUnmergable = fnUntraced(function* (options) {
 		const issue = (yield* getCurrentIssues).find((entry) => entry.id === options.issueId);
 		if (!issue) return;
@@ -149746,6 +149746,7 @@ After making any changes, commit and push them to the same pull request.`,
 		if (isSome(prState) && prState.value.state === "MERGED") return;
 		yield* log$1("Flagging unmergable PR");
 		yield* prd.flagUnmergable({ issueId: options.issueId });
+		yield* worktree.exec`gh pr close -d`;
 	})
 }));
 const GitFlowCommit = effect$1(GitFlow, gen(function* () {
@@ -150204,7 +150205,7 @@ const commandSource = make$34("source").pipe(withDescription("Select the issue s
 
 //#endregion
 //#region package.json
-var version = "0.1.105";
+var version = "0.1.106";
 
 //#endregion
 //#region src/Tracing.ts

package/package.json

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

package/src/GitFlow.ts

@@ -101,6 +101,7 @@ After making any changes, commit and push them to the same pull request.`,
       }
       yield* Effect.log("Flagging unmergable PR")
       yield* prd.flagUnmergable({ issueId: options.issueId })
+      yield* worktree.exec`gh pr close -d`
     }),
   }),
 )

package/src/Prd.ts

@@ -75,7 +75,7 @@ export class Prd extends ServiceMap.Service<
     }, syncSemaphore.withPermit)
 
     const mergeConflictInstruction =
-      "**Your only remaining task**: rebase the PR against the target branch, and resolve any merge conflicts. Once done, you can remove this instruction from the issue description."
+      "A previous attempt at this task resulted in merge conflicts. Please try implementing the task again."
 
     const flagUnmergable = Effect.fnUntraced(function* (options: {
       readonly issueId: string