taskplane 0.2.1 → 0.2.3

package/extensions/taskplane/engine.ts

@@ -34,6 +34,7 @@ import { deleteBranchBestEffort, forceCleanupWorktree, formatPreflightResults, l
  * @param onNotify    - Callback for user-facing messages
  * @param onMonitorUpdate - Optional callback for dashboard updates
  * @param workspaceConfig - Workspace configuration for repo routing (null = repo mode)
+ * @param workspaceRoot - Workspace root for resolving task area paths (defaults to cwd)
  */
 export async function executeOrchBatch(
 	args: string,
@@ -44,6 +45,7 @@ export async function executeOrchBatch(
 	onNotify: (message: string, level: "info" | "warning" | "error") => void,
 	onMonitorUpdate?: MonitorUpdateCallback,
 	workspaceConfig?: WorkspaceConfig | null,
+	workspaceRoot?: string,
 ): Promise<void> {
 	const repoRoot = cwd;
 
@@ -94,8 +96,10 @@ export async function executeOrchBatch(
 		return;
 	}
 
-	// Discovery
-	const discovery = runDiscovery(args, runnerConfig.task_areas, cwd, {
+	// Discovery — task area paths in task-runner.yaml are workspace-relative.
+	// In repo mode workspaceRoot === repoRoot, so this is always correct.
+	const discoveryRoot = workspaceRoot ?? cwd;
+	const discovery = runDiscovery(args, runnerConfig.task_areas, discoveryRoot, {
 		refreshDependencies: false,
 		dependencySource: orchConfig.dependencies.source,
 		useDependencyCache: orchConfig.dependencies.cache,

package/extensions/taskplane/execution.ts

@@ -106,6 +106,7 @@ export function buildLaneEnvVars(
 	lane: AllocatedLane,
 	promptPath: string,
 	repoRoot: string,
+	workspaceRoot?: string,
 ): Record<string, string> {
 	// TASK_AUTOSTART needs a path relative to the worktree root.
 	// The promptPath is absolute (from the main repo). We need the
@@ -129,7 +130,7 @@ export function buildLaneEnvVars(
 	}
 	const nodePath = [...new Set(nodePathEntries)].join(pathDelimiter);
 
-	return {
+	const vars: Record<string, string> = {
 		TASK_AUTOSTART: relativePath,
 		TASK_RUNNER_SPAWN_MODE: "subprocess",
 		TASK_RUNNER_TMUX_PREFIX: lane.tmuxSessionName,
@@ -139,6 +140,15 @@ export function buildLaneEnvVars(
 		// Force xterm-256color so pi can render and start execution.
 		TERM: "xterm-256color",
 	};
+
+	// In workspace mode, the worktree cwd is inside a repo — not the workspace root.
+	// The task-runner needs TASKPLANE_WORKSPACE_ROOT to find .pi/task-runner.yaml
+	// and resolve task area paths from the correct base directory.
+	if (workspaceRoot && workspaceRoot !== repoRoot) {
+		vars.TASKPLANE_WORKSPACE_ROOT = workspaceRoot;
+	}
+
+	return vars;
 }
 
 /**
@@ -438,6 +448,7 @@ export function spawnLaneSession(
 	task: AllocatedTask,
 	config: OrchestratorConfig,
 	repoRoot: string,
+	workspaceRoot?: string,
 ): void {
 	const sessionName = lane.tmuxSessionName;
 	const laneId = lane.laneId;
@@ -460,7 +471,7 @@ export function spawnLaneSession(
 	}
 
 	// Build env vars
-	const envVars = buildLaneEnvVars(lane, task.task.promptPath, repoRoot);
+	const envVars = buildLaneEnvVars(lane, task.task.promptPath, repoRoot, workspaceRoot);
 
 	// Prepare per-task lane log path for post-mortem diagnostics
 	const laneLogPath = resolveLaneLogPath(lane, task);
@@ -761,6 +772,7 @@ export async function executeLane(
 	config: OrchestratorConfig,
 	repoRoot: string,
 	pauseSignal: { paused: boolean },
+	workspaceRoot?: string,
 ): Promise<LaneExecutionResult> {
 	const laneId = lane.laneId;
 	const laneStartTime = Date.now();
@@ -797,7 +809,7 @@ export async function executeLane(
 
 		try {
 			// Spawn TMUX session
-			spawnLaneSession(lane, task, config, repoRoot);
+			spawnLaneSession(lane, task, config, repoRoot, workspaceRoot);
 
 			// Poll until completion
 			const pollResult = await pollUntilTaskComplete(
@@ -1745,8 +1757,11 @@ export async function executeWave(
 	const wavePauseSignal = pauseSignal;
 
 	// Start lane execution promises
+	// In workspace mode, pass the workspace root so lane sessions can find .pi/ config.
+	// configPath is .pi/taskplane-workspace.yaml → parent of parent is workspace root.
+	const wsRoot = workspaceConfig ? dirname(dirname(workspaceConfig.configPath)) : undefined;
 	const lanePromises = lanes.map(lane =>
-		executeLane(lane, config, repoRoot, wavePauseSignal),
+		executeLane(lane, config, repoRoot, wavePauseSignal, wsRoot),
 	);
 
 	// Start monitoring as a sibling async loop

package/extensions/taskplane/extension.ts

@@ -207,6 +207,7 @@ export default function (pi: ExtensionAPI) {
 					if (changed) updateOrchWidget(); // Only refresh on actual state change
 				},
 				execCtx!.workspaceConfig,
+				execCtx!.workspaceRoot,
 			);
 
 			// Final widget update after batch completes
@@ -257,9 +258,9 @@ export default function (pi: ExtensionAPI) {
 			if (!preflight.passed) return;
 
 			// ── Section 2: Discovery ─────────────────────────────────
-			// Discovery uses repoRoot for consistency with engine.ts and resume.ts
-			// which both call runDiscovery with their cwd (= repoRoot).
-			const discovery = runDiscovery(cleanArgs, runnerConfig.task_areas, execCtx!.repoRoot, {
+			// Discovery resolves task area paths relative to workspaceRoot (not repoRoot),
+			// because task_areas in task-runner.yaml are workspace-relative paths.
+			const discovery = runDiscovery(cleanArgs, runnerConfig.task_areas, execCtx!.workspaceRoot, {
 				refreshDependencies: hasRefresh,
 				dependencySource: orchConfig.dependencies.source,
 				useDependencyCache: orchConfig.dependencies.cache,
@@ -608,8 +609,8 @@ export default function (pi: ExtensionAPI) {
 			}
 
 			// Run discovery (no preflight needed for deps view).
-			// Uses repoRoot for consistency with engine.ts and resume.ts.
-			const discovery = runDiscovery(cleanArgs, runnerConfig.task_areas, execCtx!.repoRoot, {
+			// Task area paths are workspace-relative, so use workspaceRoot.
+			const discovery = runDiscovery(cleanArgs, runnerConfig.task_areas, execCtx!.workspaceRoot, {
 				refreshDependencies: hasRefresh,
 				dependencySource: orchConfig.dependencies.source,
 				useDependencyCache: orchConfig.dependencies.cache,

package/package.json

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