lalph 0.3.17 → 0.3.19

package/dist/cli.mjs

@@ -152325,6 +152325,7 @@ But you **do not** need to git push your changes or switch branches.
 			const prd = yield* Prd;
 			const parsed = parseBranch(targetBranch);
 			yield* worktree.exec`git fetch ${parsed.remote}`;
+			yield* worktree.exec`git restore --worktree .`;
 			if ((yield* worktree.exec`git rebase ${parsed.branchWithRemote}`) !== 0) {
 				yield* prd.flagUnmergable({ issueId });
 				return yield* new GitFlowError({ message: `Failed to rebase onto ${parsed.branchWithRemote}. Aborting task.` });
@@ -152485,6 +152486,10 @@ const run = fnUntraced(function* (options) {
 		yield* fs.writeFileString(pathService.join(worktree.directory, ".lalph", "feedback.md"), feedback);
 	}
 	const taskPreset = getOrElse$1(yield* source.issueCliAgentPreset(chosenTask.prd), () => preset);
+	const catchStallInReview = (effect) => catchIf(effect, (u) => u instanceof RunnerStalled, fnUntraced(function* (e) {
+		if ((yield* prd.findById(taskId))?.state === "in-review") return;
+		return yield* e;
+	}));
 	if (yield* gen(function* () {
 		registry.update(currentWorker.state, (s) => s.transitionTo(WorkerStatus.Working({ issueId: taskId })));
 		const instructions = (yield* PromptGen).prompt({
@@ -152498,7 +152503,7 @@ const run = fnUntraced(function* (options) {
 			stallTimeout: options.stallTimeout,
 			preset: taskPreset,
 			prompt: instructions
-		}).pipe(withSpan("Main.agentWorker"));
+		}).pipe(catchStallInReview, withSpan("Main.agentWorker"));
 		yield* log$1(`Agent exited with code: ${exitCode}`);
 		if (options.review) {
 			registry.update(currentWorker.state, (s) => s.transitionTo(WorkerStatus.Reviewing({ issueId: taskId })));
@@ -152507,7 +152512,7 @@ const run = fnUntraced(function* (options) {
 				stallTimeout: options.stallTimeout,
 				preset: taskPreset,
 				instructions
-			}).pipe(withSpan("Main.agentReviewer"));
+			}).pipe(catchStallInReview, withSpan("Main.agentReviewer"));
 		}
 	}).pipe(timeout(options.runTimeout), tapErrorTag("TimeoutError", () => agentTimeout({
 		specsDirectory: options.specsDirectory,
@@ -152867,7 +152872,7 @@ const commandSource = make$36("source").pipe(withDescription("Select the issue s
 
 //#endregion
 //#region package.json
-var version = "0.3.17";
+var version = "0.3.19";
 
 //#endregion
 //#region src/commands/projects/ls.ts

package/package.json

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

package/src/GitFlow.ts

@@ -151,6 +151,8 @@ But you **do not** need to git push your changes or switch branches.
 
         const parsed = parseBranch(targetBranch)
         yield* worktree.exec`git fetch ${parsed.remote}`
+
+        yield* worktree.exec`git restore --worktree .`
         const rebaseResult =
           yield* worktree.exec`git rebase ${parsed.branchWithRemote}`
         if (rebaseResult !== 0) {

package/src/commands/root.ts

@@ -142,6 +142,20 @@ const run = Effect.fnUntraced(
       () => preset,
     )
 
+    const catchStallInReview = <A, E, R>(
+      effect: Effect.Effect<A, E | RunnerStalled, R>,
+    ) =>
+      Effect.catchIf(
+        effect,
+        (u): u is RunnerStalled => u instanceof RunnerStalled,
+        Effect.fnUntraced(function* (e) {
+          const task = yield* prd.findById(taskId!)
+          const inReview = task?.state === "in-review"
+          if (inReview) return
+          return yield* e
+        }),
+      )
+
     const cancelled = yield* Effect.gen(function* () {
       //
       // 2. Work on task
@@ -164,7 +178,7 @@ const run = Effect.fnUntraced(
         stallTimeout: options.stallTimeout,
         preset: taskPreset,
         prompt: instructions,
-      }).pipe(Effect.withSpan("Main.agentWorker"))
+      }).pipe(catchStallInReview, Effect.withSpan("Main.agentWorker"))
       yield* Effect.log(`Agent exited with code: ${exitCode}`)
 
       // 3. Review task
@@ -180,7 +194,7 @@ const run = Effect.fnUntraced(
           stallTimeout: options.stallTimeout,
           preset: taskPreset,
           instructions,
-        }).pipe(Effect.withSpan("Main.agentReviewer"))
+        }).pipe(catchStallInReview, Effect.withSpan("Main.agentReviewer"))
       }
     }).pipe(
       Effect.timeout(options.runTimeout),