taskplane 0.5.3 → 0.5.5

package/extensions/taskplane/engine.ts

@@ -2,8 +2,8 @@
  * Main batch execution engine
  * @module orch/engine
  */
-import { readFileSync, readdirSync, unlinkSync } from "fs";
-import { join } from "path";
+import { existsSync, readFileSync, readdirSync, unlinkSync } from "fs";
+import { dirname, join, resolve } from "path";
 
 import { formatDiscoveryResults, runDiscovery } from "./discovery.ts";
 import { execLog, executeWave, tmuxKillSession } from "./execution.ts";
@@ -339,6 +339,16 @@ export async function executeOrchBatch(
 			}
 		}
 
+		// ── Workspace mode: commit task artifacts to task-area repos ─
+		// In workspace mode, workers write .DONE and STATUS.md to the
+		// canonical task folder (e.g., shared-libs/task-management/...) via
+		// absolute paths, not to the lane worktree. These changes land as
+		// uncommitted modifications in the task-area repo's working tree.
+		// Commit them before the merge step so they appear in the orch branch.
+		if (workspaceConfig && waveResult.succeededTaskIds.length > 0) {
+			commitWorkspaceTaskArtifacts(discoveryRef, workspaceRoot ?? repoRoot, waveIdx + 1, batchState.batchId);
+		}
+
 		// ── Wave Merge ───────────────────────────────────────────
 		// Only merge if there are succeeded tasks in this wave
 		let mergeResult: MergeWaveResult | null = null;
@@ -847,5 +857,78 @@ export async function executeOrchBatch(
 }
 
 
+// ── Workspace Task Artifact Commit ───────────────────────────────────
+
+/**
+ * In workspace mode, commit task artifacts (.DONE, STATUS.md) that workers
+ * wrote to the canonical task folder in the task-area repo.
+ *
+ * Workers write to absolute paths (e.g., shared-libs/task-management/.../TP-002/.DONE)
+ * which land as uncommitted changes in the task-area repo's working tree.
+ * This function finds all task-area repos with dirty task files and commits them
+ * so they appear in the lane branches and merge correctly.
+ *
+ * Best-effort: failures are logged but don't block the batch.
+ */
+function commitWorkspaceTaskArtifacts(
+	discovery: DiscoveryResult | null,
+	workspaceRoot: string,
+	waveIndex: number,
+	batchId: string,
+): void {
+	if (!discovery) return;
+
+	// Collect unique repo roots that contain task folders
+	const repoRootsWithTasks = new Set<string>();
+	for (const [, task] of discovery.pending) {
+		const taskFolder = resolve(task.taskFolder);
+		// Walk up to find the git repo root for this task folder
+		const gitResult = runGit(["rev-parse", "--show-toplevel"], dirname(taskFolder));
+		if (gitResult.ok) {
+			repoRootsWithTasks.add(gitResult.stdout.trim().replace(/\\/g, "/"));
+		}
+	}
+
+	for (const taskRepoRoot of repoRootsWithTasks) {
+		// Check for uncommitted changes
+		const statusResult = runGit(["status", "--porcelain", "--", "task-management/"], taskRepoRoot);
+		if (!statusResult.ok) {
+			// Try without path filter (task area might have different name)
+			const statusAll = runGit(["status", "--porcelain"], taskRepoRoot);
+			if (!statusAll.ok || !statusAll.stdout.trim()) continue;
+		}
+		if (statusResult.ok && !statusResult.stdout.trim()) continue;
+
+		// Stage task artifacts (only .DONE and STATUS.md files)
+		const lines = (statusResult.stdout || "").split("\n").filter(l => l.trim());
+		let hasTaskArtifacts = false;
+		for (const line of lines) {
+			const file = line.slice(3).trim();
+			if (file.endsWith(".DONE") || file.endsWith("STATUS.md")) {
+				const addResult = runGit(["add", file], taskRepoRoot);
+				if (addResult.ok) hasTaskArtifacts = true;
+			}
+		}
+
+		if (!hasTaskArtifacts) continue;
+
+		// Commit
+		const commitResult = runGit(
+			["commit", "-m", `checkpoint: wave ${waveIndex} task artifacts (.DONE, STATUS.md)`],
+			taskRepoRoot,
+		);
+		if (commitResult.ok) {
+			execLog("batch", batchId, `committed workspace task artifacts`, {
+				repoRoot: taskRepoRoot,
+				wave: waveIndex,
+			});
+		} else if (!commitResult.stderr.includes("nothing to commit")) {
+			execLog("batch", batchId, `workspace task artifact commit failed (non-fatal): ${commitResult.stderr.slice(0, 200)}`, {
+				repoRoot: taskRepoRoot,
+			});
+		}
+	}
+}
+
 // ── Dashboard Widget (Step 6) ────────────────────────────────────────
 

package/extensions/taskplane/execution.ts

@@ -413,21 +413,26 @@ export function resolveCanonicalTaskPaths(
 	taskFolder: string,
 	worktreePath: string,
 	repoRoot: string,
+	isWorkspaceMode?: boolean,
 ): ResolvedTaskPaths {
 	const repoRootNorm = resolve(repoRoot).replace(/\\/g, "/");
 	const folderNorm = resolve(taskFolder).replace(/\\/g, "/");
 
 	let resolvedFolder: string;
 
-	if (folderNorm.startsWith(repoRootNorm + "/")) {
-		// Case 1: Task folder is inside the repo root.
+	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);
+	} else if (folderNorm.startsWith(repoRootNorm + "/")) {
+		// Repo mode: task folder is inside the repo root.
 		// Translate to equivalent path in the worktree.
 		const relativePath = folderNorm.slice(repoRootNorm.length + 1);
 		resolvedFolder = join(worktreePath, relativePath);
 	} else {
-		// Case 2: Task folder is outside the repo root (workspace mode).
-		// Use the absolute path directly — task state lives in the
-		// canonical task folder, not mirrored in any worktree.
+		// Fallback: use absolute path directly.
 		resolvedFolder = resolve(taskFolder);
 	}
 
@@ -484,8 +489,9 @@ export function resolveTaskDonePath(
 	taskFolder: string,
 	worktreePath: string,
 	repoRoot: string,
+	isWorkspaceMode?: boolean,
 ): string {
-	return resolveCanonicalTaskPaths(taskFolder, worktreePath, repoRoot).donePath;
+	return resolveCanonicalTaskPaths(taskFolder, worktreePath, repoRoot, isWorkspaceMode).donePath;
 }
 
 /**
@@ -613,10 +619,11 @@ export async function pollUntilTaskComplete(
 	config: OrchestratorConfig,
 	repoRoot: string,
 	pauseSignal: { paused: boolean },
+	isWorkspaceMode?: boolean,
 ): Promise<{ status: LaneTaskStatus; exitReason: string; doneFileFound: boolean }> {
 	const sessionName = lane.tmuxSessionName;
 	const laneId = lane.laneId;
-	const resolved = resolveCanonicalTaskPaths(task.task.taskFolder, lane.worktreePath, repoRoot);
+	const resolved = resolveCanonicalTaskPaths(task.task.taskFolder, lane.worktreePath, repoRoot, isWorkspaceMode);
 	const donePath = resolved.donePath;
 	const statusPath = resolved.statusPath;
 	const laneLogPath = resolveLaneLogPath(lane, task);
@@ -832,6 +839,7 @@ export async function executeLane(
 	repoRoot: string,
 	pauseSignal: { paused: boolean },
 	workspaceRoot?: string,
+	isWorkspaceMode?: boolean,
 ): Promise<LaneExecutionResult> {
 	const laneId = lane.laneId;
 	const laneStartTime = Date.now();
@@ -877,6 +885,7 @@ export async function executeLane(
 				config,
 				repoRoot,
 				pauseSignal,
+				isWorkspaceMode,
 			);
 
 			taskOutcome = {
@@ -1003,9 +1012,10 @@ export function parseWorktreeStatusMd(
 	taskFolder: string,
 	worktreePath: string,
 	repoRoot: string,
+	isWorkspaceMode?: boolean,
 ): { parsed: ParsedWorktreeStatus | null; error: string | null } {
 	// Use canonical resolver for consistent path translation
-	const resolved = resolveCanonicalTaskPaths(taskFolder, worktreePath, repoRoot);
+	const resolved = resolveCanonicalTaskPaths(taskFolder, worktreePath, repoRoot, isWorkspaceMode);
 	const statusPath = resolved.statusPath;
 
 	if (!existsSync(statusPath)) {
@@ -1323,6 +1333,7 @@ export async function monitorLanes(
 	pauseSignal: { paused: boolean },
 	waveNumber: number = 1,
 	onUpdate?: MonitorUpdateCallback,
+	isWorkspaceMode?: boolean,
 ): Promise<MonitorState> {
 	const pollIntervalMs = (config.monitoring.poll_interval || 5) * 1000;
 	const stallTimeoutMs = (config.failure.stall_timeout || 30) * 60_000;
@@ -1412,8 +1423,8 @@ export async function monitorLanes(
 					currentTaskId = task.taskId;
 
 					const tracker = getOrCreateTracker(task.taskId, now);
-					const donePath = resolveTaskDonePath(task.task.taskFolder, lane.worktreePath, repoRoot);
-					const statusResult = parseWorktreeStatusMd(task.task.taskFolder, lane.worktreePath, repoRoot);
+					const donePath = resolveTaskDonePath(task.task.taskFolder, lane.worktreePath, repoRoot, isWorkspaceMode);
+					const statusResult = parseWorktreeStatusMd(task.task.taskFolder, lane.worktreePath, repoRoot, isWorkspaceMode);
 
 					const snapshot = resolveTaskMonitorState(
 						task.taskId,
@@ -1819,8 +1830,9 @@ export async function executeWave(
 	// 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 isWsMode = !!workspaceConfig;
 	const lanePromises = lanes.map(lane =>
-		executeLane(lane, config, repoRoot, wavePauseSignal, wsRoot),
+		executeLane(lane, config, repoRoot, wavePauseSignal, wsRoot, isWsMode),
 	);
 
 	// Start monitoring as a sibling async loop
@@ -1832,6 +1844,7 @@ export async function executeWave(
 		wavePauseSignal,
 		waveIndex,
 		onMonitorUpdate,
+		isWsMode,
 	);
 
 	// ── Stage 4: Wait for all lanes + apply policy ───────────────

package/package.json

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