taskplane 0.21.2 → 0.21.4

package/extensions/taskplane/execution.ts

@@ -1069,9 +1069,37 @@ export async function pollUntilTaskComplete(
 				}
 			}
 
-			// Grace period expired without .DONE → task failed (TP-070: async)
+			// Grace period expired — last resort: check the lane BRANCH for .DONE.
+			// The worker may have committed .DONE before the session exited, but
+			// the worktree filesystem doesn't reflect it (stale checkout, race).
+			// This handles the common case where the worker completes all work,
+			// commits .DONE, and then the session exits before the poll detects it.
+			{
+				const relDonePath = donePath.startsWith(lane.worktreePath)
+					? donePath.slice(lane.worktreePath.length).replace(/^[\\/]+/, "").replace(/\\/g, "/")
+					: null;
+				if (relDonePath) {
+					const gitResult = runGit(
+						["show", `${lane.branch}:${relDonePath}`],
+						lane.worktreePath,
+					);
+					if (gitResult.ok) {
+						execLog(laneId, task.taskId, ".DONE found on lane branch (not in worktree) — task succeeded", {
+							session: sessionName,
+							branch: lane.branch,
+						});
+						return {
+							status: "succeeded",
+							exitReason: ".DONE committed to lane branch (found via git show after grace period)",
+							doneFileFound: true,
+						};
+					}
+				}
+			}
+
+			// Truly failed — no .DONE on filesystem or branch
 			const logTail = await readLaneLogTailAsync(laneLogPath);
-			execLog(laneId, task.taskId, "grace period expired without .DONE — task failed", {
+			execLog(laneId, task.taskId, "grace period expired, no .DONE on filesystem or branch — task failed", {
 				session: sessionName,
 				logPath: laneLogPath,
 			});
@@ -1259,6 +1287,23 @@ export async function executeLane(
 			// The task-runner writes .DONE via writeFileSync but never commits it.
 			if (pollResult.status === "succeeded") {
 				commitTaskArtifacts(lane, task, laneId);
+
+				// Reset worktree to clean state for the next task on this lane.
+				// Without this, the next worker sees the previous task's modified
+				// files and can get confused about which task it's working on.
+				if (lane.tasks.indexOf(task) < lane.tasks.length - 1) {
+					execLog(laneId, task.taskId, "resetting worktree for next task");
+					const resetResult = runGit(["checkout", "--", "."], lane.worktreePath);
+					const cleanResult = runGit(["clean", "-fd"], lane.worktreePath);
+					if (!resetResult.ok || !cleanResult.ok) {
+						execLog(laneId, task.taskId, "worktree reset warning", {
+							resetOk: resetResult.ok,
+							cleanOk: cleanResult.ok,
+							resetErr: resetResult.stderr,
+							cleanErr: cleanResult.stderr,
+						});
+					}
+				}
 			}
 
 			// If task failed or was paused, skip remaining tasks

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "taskplane",
-  "version": "0.21.2",
+  "version": "0.21.4",
   "description": "AI agent orchestration for pi — parallel task execution with checkpoint discipline",
   "keywords": [
     "pi-package",