taskplane 0.21.4 → 0.21.6

package/extensions/taskplane/discovery.ts

@@ -208,9 +208,9 @@ export function parsePromptForOrchestrator(
 		}
 	}
 	if (execTargetSectionBody !== null) {
-		// Match "Repo: api" or "**Repo:** api" or "Repo: api" with whitespace
+		// Match "Repo: api" or "**Repo:** api" or "Workspace: api" with whitespace
 		const repoLineMatch = execTargetSectionBody.match(
-			/^\s*\*?\*?Repo:?\*?\*?\s+(\S+)/mi,
+			/^\s*\*?\*?(?:Repo|Workspace):?\*?\*?\s+(\S+)/mi,
 		);
 		if (repoLineMatch) {
 			const candidate = repoLineMatch[1].trim().toLowerCase();
@@ -220,10 +220,10 @@ export function parsePromptForOrchestrator(
 		}
 	}
 
-	// Priority 2 (fallback): Inline "**Repo:** <id>" anywhere in content
+	// Priority 2 (fallback): Inline "**Repo:** <id>" or "**Workspace:** <id>" anywhere in content
 	if (!promptRepoId) {
 		const inlineRepoMatch = content.match(
-			/^\*\*Repo:\*\*\s+(\S+)/m,
+			/^\*\*(?:Repo|Workspace):\*\*\s+(\S+)/m,
 		);
 		if (inlineRepoMatch) {
 			const candidate = inlineRepoMatch[1].trim().toLowerCase();

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.

package/package.json

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