taskplane 0.21.6 → 0.21.8

package/extensions/taskplane/discovery.ts

@@ -928,7 +928,40 @@ export function resolveTaskRouting(
 			}
 		}
 
-		// Precedence 3: workspace default repo
+		// Precedence 3: file scope inference — match file path prefixes against
+		// known workspace repo IDs. If file scope entries like "web-client/src/..."
+		// start with a repo name, route the task to that repo.
+		if (!resolvedId && task.fileScope && task.fileScope.length > 0) {
+			const repoIds = [...validRepoIds.keys()];
+			const repoCounts = new Map<string, number>();
+			for (const filePath of task.fileScope) {
+				const normalized = filePath.replace(/\\/g, "/");
+				for (const repoId of repoIds) {
+					if (normalized.startsWith(repoId + "/") || normalized === repoId) {
+						repoCounts.set(repoId, (repoCounts.get(repoId) || 0) + 1);
+						break; // first matching repo wins for this path
+					}
+				}
+			}
+			// Use the repo with the most file scope matches (majority vote)
+			if (repoCounts.size === 1) {
+				resolvedId = repoCounts.keys().next().value!;
+				source = "file-scope";
+			} else if (repoCounts.size > 1) {
+				// Multiple repos in file scope — pick the one with most entries.
+				// (Future: #51 will handle multi-repo tasks properly)
+				let maxCount = 0;
+				for (const [repoId, count] of repoCounts) {
+					if (count > maxCount) {
+						maxCount = count;
+						resolvedId = repoId;
+					}
+				}
+				source = "file-scope";
+			}
+		}
+
+		// Precedence 4: workspace default repo
 		if (!resolvedId) {
 			resolvedId = workspaceConfig.routing.defaultRepo;
 			source = "default";
@@ -940,7 +973,8 @@ export function resolveTaskRouting(
 				code: "TASK_REPO_UNRESOLVED",
 				message:
 					`Task ${task.taskId} has no resolved repo. ` +
-					`Add a Repo: field to the PROMPT, set repo_id on area "${task.areaName}", ` +
+					`Add file scope paths prefixed with the repo name (e.g., "web-client/src/..."), ` +
+					`set repo_id on area "${task.areaName}", ` +
 					`or set routing.default_repo in the workspace config.`,
 				taskId: task.taskId,
 				taskPath: task.promptPath,

package/extensions/taskplane/execution.ts

@@ -431,8 +431,16 @@ export function buildLaneEnvVars(
 
 	let relativePath: string;
 	if (workspaceRoot) {
-		// Workspace mode: always use absolute path for cross-repo safety
-		relativePath = resolve(promptPath);
+		// Workspace mode: use worktree-relative path when the task folder is
+		// inside the lane's repo. This ensures STATUS.md, .DONE, and git commits
+		// all operate in the worktree (not the original source directory).
+		// Falls back to absolute path for cross-repo tasks (task in repo A,
+		// worker in repo B — future: issue #51).
+		if (promptNorm.startsWith(repoRootNorm + "/")) {
+			relativePath = promptNorm.slice(repoRootNorm.length + 1);
+		} else {
+			relativePath = resolve(promptPath);
+		}
 	} else if (promptNorm.startsWith(repoRootNorm + "/")) {
 		// Repo mode: relative path from repo root (mirrors into worktree)
 		relativePath = promptNorm.slice(repoRootNorm.length + 1);
@@ -764,28 +772,16 @@ export function resolveCanonicalTaskPaths(
 	let resolvedFolder: string;
 
 	if (isWorkspaceMode) {
-		// 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)
+		// Workspace mode: use worktree-relative path when the task folder is
+		// inside the lane's repo (same logic as TASK_AUTOSTART resolution).
+		// The worker writes .DONE and STATUS.md in the worktree, so the engine
+		// must look there too.
 		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;
-			}
+			resolvedFolder = join(worktreePath, relPath);
+		} else {
+			// Cross-repo fallback: use absolute path (future: #51)
+			resolvedFolder = resolve(taskFolder);
 		}
 	} else if (folderNorm.startsWith(repoRootNorm + "/")) {
 		// Repo mode: task folder is inside the repo root.

package/package.json

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