taskplane 0.21.3 → 0.21.5

package/extensions/taskplane/execution.ts

@@ -764,11 +764,29 @@ export function resolveCanonicalTaskPaths(
 	let resolvedFolder: string;
 
 	if (isWorkspaceMode) {
-		// Workspace mode: task folder may live in a different repo than
-		// the lane's worktree. Always use the absolute canonical path —
-		// .DONE and STATUS.md are written by workers to the original
-		// task folder (via absolute TASK_AUTOSTART path), not to the worktree.
-		resolvedFolder = resolve(taskFolder);
+		// Workspace mode: check both the original source path AND the
+		// worktree-relative path. The task-runner may write .DONE to either
+		// location depending on how TASK_AUTOSTART resolves in the worker's
+		// context. Check worktree first (most common), then fall back to original.
+		const candidatePaths: string[] = [];
+
+		// Candidate 1: worktree-relative (task folder mirrored in worktree)
+		if (folderNorm.startsWith(repoRootNorm + "/")) {
+			const relPath = folderNorm.slice(repoRootNorm.length + 1);
+			candidatePaths.push(join(worktreePath, relPath));
+		}
+
+		// Candidate 2: original absolute path
+		candidatePaths.push(resolve(taskFolder));
+
+		// Use whichever has .DONE or STATUS.md; default to first candidate
+		resolvedFolder = candidatePaths[0];
+		for (const candidate of candidatePaths) {
+			if (existsSync(join(candidate, ".DONE")) || existsSync(join(candidate, "STATUS.md"))) {
+				resolvedFolder = candidate;
+				break;
+			}
+		}
 	} else if (folderNorm.startsWith(repoRootNorm + "/")) {
 		// Repo mode: task folder is inside the repo root.
 		// Translate to equivalent path in the worktree.
@@ -1287,6 +1305,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.3",
+  "version": "0.21.5",
   "description": "AI agent orchestration for pi — parallel task execution with checkpoint discipline",
   "keywords": [
     "pi-package",