lalph 0.1.91 → 0.1.93

package/dist/cli.mjs

@@ -144662,9 +144662,9 @@ ${options.task.description}
    - Add important discoveries about the codebase, or challenges faced to the task's
      \`description\`. More details below.
 4. Run any checks / feedback loops, such as type checks, unit tests, or linting.
-5. ${!options.githubPrNumber ? `Create a pull request for this task.${options.targetBranch ? ` The target branch for the PR should be \`${options.targetBranch}\`. If the target branch does not exist, create it first.` : ""}` : "Commit and push your changes to the pull request."}
+5. ${!options.githubPrNumber ? `Create a pull request for this task. If the target branch does not exist, create it first.` : "Commit and push your changes to the pull request."}
    ${sourceMeta.githubPrInstructions}
-   The PR description should include a summary of the changes made.
+   The PR description should include a summary of the changes made.${options.targetBranch ? `\n   - The target branch for the PR should be \`${options.targetBranch}\`.` : ""}
    - **DO NOT** commit any of the files in the \`.lalph\` directory.
    - You have permission to create or update the PR as needed. You have full permission to push branches, create PRs or create git commits.
 6. Update the prd.yml file to reflect any changes in task states.
@@ -144820,11 +144820,11 @@ var Prd = class extends Service()("lalph/Prd", { make: gen(function* () {
 			state: "todo"
 		});
 	}, syncSemaphore.withPermit);
-	const mergeConflictInstruction = "Next step: Rebase PR and resolve merge conflicts.";
+	const mergeConflictInstruction = "**Before doing anything else**: rebase the PR against the target branch, and resolve any 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()}`;
+		const nextDescription = issue.description.includes(mergeConflictInstruction) ? issue.description : `${mergeConflictInstruction}\n\n---\n\nPrevious description:\n\n${issue.description.trim()}`;
 		yield* source.updateIssue({
 			issueId: issue.id,
 			description: nextDescription,
@@ -145159,7 +145159,7 @@ const run = fnUntraced(function* (options) {
 		const autoMerge = gen(function* () {
 			let prState = yield* viewPrState();
 			yield* log$1("PR state", prState);
-			if (isNone(prState)) return;
+			if (isNone(prState)) return yield* prd.maybeRevertIssue({ issueId: taskId });
 			if (isSome(options.targetBranch)) yield* exec`gh pr edit --base ${options.targetBranch.value}`;
 			yield* exec`gh pr merge -sd`;
 			yield* sleep(seconds(3));
@@ -145323,7 +145323,7 @@ const commandSource = make$28("source").pipe(withDescription("Select the issue s
 
 //#endregion
 //#region package.json
-var version = "0.1.91";
+var version = "0.1.93";
 
 //#endregion
 //#region src/Tracing.ts

package/package.json

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

package/src/Prd.ts

@@ -69,7 +69,7 @@ export class Prd extends ServiceMap.Service<
     }, syncSemaphore.withPermit)
 
     const mergeConflictInstruction =
-      "Next step: Rebase PR and resolve merge conflicts."
+      "**Before doing anything else**: rebase the PR against the target branch, and resolve any merge conflicts."
 
     const flagUnmergable = Effect.fnUntraced(function* (options: {
       readonly issueId: string
@@ -82,7 +82,7 @@ export class Prd extends ServiceMap.Service<
       )
       const nextDescription = hasInstruction
         ? issue.description
-        : `${mergeConflictInstruction}\n\n${issue.description.trim()}`
+        : `${mergeConflictInstruction}\n\n---\n\nPrevious description:\n\n${issue.description.trim()}`
 
       yield* source.updateIssue({
         issueId: issue.id!,

package/src/PromptGen.ts

@@ -167,9 +167,9 @@ ${options.task.description}
    - Add important discoveries about the codebase, or challenges faced to the task's
      \`description\`. More details below.
 4. Run any checks / feedback loops, such as type checks, unit tests, or linting.
-5. ${!options.githubPrNumber ? `Create a pull request for this task.${options.targetBranch ? ` The target branch for the PR should be \`${options.targetBranch}\`. If the target branch does not exist, create it first.` : ""}` : "Commit and push your changes to the pull request."}
+5. ${!options.githubPrNumber ? `Create a pull request for this task. If the target branch does not exist, create it first.` : "Commit and push your changes to the pull request."}
    ${sourceMeta.githubPrInstructions}
-   The PR description should include a summary of the changes made.
+   The PR description should include a summary of the changes made.${options.targetBranch ? `\n   - The target branch for the PR should be \`${options.targetBranch}\`.` : ""}
    - **DO NOT** commit any of the files in the \`.lalph\` directory.
    - You have permission to create or update the PR as needed. You have full permission to push branches, create PRs or create git commits.
 6. Update the prd.yml file to reflect any changes in task states.

package/src/commands/root.ts

@@ -436,7 +436,9 @@ const run = Effect.fnUntraced(
       const autoMerge = Effect.gen(function* () {
         let prState = yield* viewPrState()
         yield* Effect.log("PR state", prState)
-        if (Option.isNone(prState)) return
+        if (Option.isNone(prState)) {
+          return yield* prd.maybeRevertIssue({ issueId: taskId })
+        }
         if (Option.isSome(options.targetBranch)) {
           yield* exec`gh pr edit --base ${options.targetBranch.value}`
         }