taskplane 0.3.1 → 0.4.0

package/extensions/taskplane/merge.ts

@@ -261,6 +261,8 @@ export function buildMergeRequest(
  * @param repoRoot        - Main repository root (merge happens here)
  * @param mergeRequestPath - Path to the merge request temp file
  * @param config          - Orchestrator config (for model, tools)
+ * @param stateRoot       - Root for state files (batch state, merge results). Stays at workspace root.
+ * @param agentRoot       - Root for agent prompts. When pointer is resolved, this is the config repo's agent dir. Falls back to `<stateRoot>/.pi/agents/` or `<repoRoot>/.pi/agents/`.
  * @throws MergeError if spawn fails after retries
  */
 export function spawnMergeAgent(
@@ -270,6 +272,7 @@ export function spawnMergeAgent(
 	mergeRequestPath: string,
 	config: OrchestratorConfig,
 	stateRoot?: string,
+	agentRoot?: string,
 ): void {
 	execLog("merge", sessionName, "preparing to spawn merge agent", {
 		mergeWorkDir,
@@ -304,7 +307,7 @@ export function spawnMergeAgent(
 		"pi --no-session",
 		modelArgs,
 		toolsArgs,
-		`--append-system-prompt ${shellQuote(join(stateRoot ?? repoRoot, ".pi", "agents", "task-merger.md"))}`,
+		`--append-system-prompt ${shellQuote(agentRoot ? join(agentRoot, "task-merger.md") : join(stateRoot ?? repoRoot, ".pi", "agents", "task-merger.md"))}`,
 		`@${shellQuote(mergeRequestPath)}`,
 	].filter(Boolean).join(" ");
 
@@ -509,6 +512,7 @@ export function mergeWave(
 	batchId: string,
 	baseBranch: string,
 	stateRoot?: string,
+	agentRoot?: string,
 ): MergeWaveResult {
 	const startTime = Date.now();
 	const tmuxPrefix = config.orchestrator.tmux_prefix;
@@ -648,10 +652,11 @@ export function mergeWave(
 			writeFileSync(requestFilePath, mergeRequestContent, "utf-8");
 
 			// Spawn merge agent in the isolated merge worktree
-			spawnMergeAgent(sessionName, repoRoot, mergeWorkDir, requestFilePath, config, stateRoot);
+			spawnMergeAgent(sessionName, repoRoot, mergeWorkDir, requestFilePath, config, stateRoot, agentRoot);
 
-			// Wait for result
-			const mergeResult = waitForMergeResult(resultFilePath, sessionName);
+			// Wait for result — use configured timeout (default 10 min, was 5 min)
+			const timeoutMs = (config.merge.timeout_minutes ?? 10) * 60 * 1000;
+			const mergeResult = waitForMergeResult(resultFilePath, sessionName, timeoutMs);
 
 			// Clean up request file (leave result file for debugging)
 			try {
@@ -894,6 +899,7 @@ export function mergeWaveByRepo(
 	baseBranch: string,
 	workspaceConfig?: WorkspaceConfig | null,
 	stateRoot?: string,
+	agentRoot?: string,
 ): MergeWaveResult {
 	const startTime = Date.now();
 
@@ -947,6 +953,7 @@ export function mergeWaveByRepo(
 			batchId,
 			baseBranch,
 			stateRoot,
+			agentRoot,
 		);
 		// Attach empty repoResults for consistent shape
 		return { ...result, repoResults: [] };
@@ -991,6 +998,7 @@ export function mergeWaveByRepo(
 			batchId,
 			groupBaseBranch,
 			stateRoot,
+			agentRoot,
 		);
 
 		// Accumulate lane results

package/extensions/taskplane/resume.ts

@@ -499,14 +499,19 @@ export async function resumeOrchBatch(
 	onNotify: (message: string, level: "info" | "warning" | "error") => void,
 	onMonitorUpdate?: MonitorUpdateCallback,
 	workspaceConfig?: WorkspaceConfig | null,
+	workspaceRoot?: string,
+	agentRoot?: string,
 ): Promise<void> {
 	const repoRoot = cwd;
+	// State files (.pi/batch-state.json, lane-state, etc.) belong in the workspace root,
+	// which is where .pi/ config lives. In repo mode, stateRoot === repoRoot.
+	const stateRoot = workspaceRoot ?? cwd;
 	const prefix = orchConfig.orchestrator.tmux_prefix;
 
 	// ── 1. Load persisted state ──────────────────────────────────
 	let persistedState: PersistedBatchState | null;
 	try {
-		persistedState = loadBatchState(repoRoot);
+		persistedState = loadBatchState(stateRoot);
 	} catch (err: unknown) {
 		if (err instanceof StateFileError) {
 			onNotify(
@@ -898,6 +903,8 @@ export async function resumeOrchBatch(
 				batchState.batchId,
 				batchState.baseBranch,
 				workspaceConfig,
+				stateRoot,
+				agentRoot,
 			);
 
 			if (reExecMergeResult.status === "succeeded") {
@@ -989,7 +996,7 @@ export async function resumeOrchBatch(
 		}
 	}
 
-	persistRuntimeState("resume-reconciliation", batchState, wavePlan, latestAllocatedLanes, allTaskOutcomes, discovery ?? null, repoRoot);
+	persistRuntimeState("resume-reconciliation", batchState, wavePlan, latestAllocatedLanes, allTaskOutcomes, discovery ?? null, stateRoot);
 
 	// ── 10. Continue wave execution ──────────────────────────────
 	// We need to execute remaining waves starting from resumeWaveIndex.
@@ -1001,13 +1008,13 @@ export async function resumeOrchBatch(
 		// Check pause signal
 		if (batchState.pauseSignal.paused) {
 			batchState.phase = "paused";
-			persistRuntimeState("pause-before-wave", batchState, wavePlan, latestAllocatedLanes, allTaskOutcomes, discovery, repoRoot);
+			persistRuntimeState("pause-before-wave", batchState, wavePlan, latestAllocatedLanes, allTaskOutcomes, discovery, stateRoot);
 			onNotify(`⏸️  Batch paused before wave ${waveIdx + 1}.`, "warning");
 			break;
 		}
 
 		batchState.currentWaveIndex = waveIdx;
-		persistRuntimeState("wave-index-change", batchState, wavePlan, latestAllocatedLanes, allTaskOutcomes, discovery, repoRoot);
+		persistRuntimeState("wave-index-change", batchState, wavePlan, latestAllocatedLanes, allTaskOutcomes, discovery, stateRoot);
 
 		// Get wave tasks, filtering out completed/failed/blocked ones.
 		let waveTasks = persistedState.wavePlan[waveIdx].filter(
@@ -1043,7 +1050,7 @@ export async function resumeOrchBatch(
 		const handleResumeMonitorUpdate: MonitorUpdateCallback = (monitorState) => {
 			const changed = syncTaskOutcomesFromMonitor(monitorState, allTaskOutcomes);
 			if (changed) {
-				persistRuntimeState("task-transition", batchState, wavePlan, latestAllocatedLanes, allTaskOutcomes, discovery, repoRoot);
+				persistRuntimeState("task-transition", batchState, wavePlan, latestAllocatedLanes, allTaskOutcomes, discovery, stateRoot);
 			}
 			onMonitorUpdate?.(monitorState);
 		};
@@ -1068,7 +1075,7 @@ export async function resumeOrchBatch(
 					encounteredRepoRoots.add(resolveRepoRoot(lane.repoId, repoRoot, workspaceConfig));
 				}
 				if (seedPendingOutcomesForAllocatedLanes(lanes, allTaskOutcomes)) {
-					persistRuntimeState("wave-lanes-allocated", batchState, wavePlan, latestAllocatedLanes, allTaskOutcomes, discovery, repoRoot);
+					persistRuntimeState("wave-lanes-allocated", batchState, wavePlan, latestAllocatedLanes, allTaskOutcomes, discovery, stateRoot);
 				}
 			},
 			workspaceConfig,
@@ -1105,7 +1112,7 @@ export async function resumeOrchBatch(
 			batchState.blockedTaskIds.add(blocked);
 		}
 
-		persistRuntimeState("wave-execution-complete", batchState, wavePlan, latestAllocatedLanes, allTaskOutcomes, discovery, repoRoot);
+		persistRuntimeState("wave-execution-complete", batchState, wavePlan, latestAllocatedLanes, allTaskOutcomes, discovery, stateRoot);
 
 		const elapsedSec = Math.round((waveResult.endedAt - waveResult.startedAt) / 1000);
 		onNotify(
@@ -1123,13 +1130,13 @@ export async function resumeOrchBatch(
 		if (waveResult.stoppedEarly) {
 			if (waveResult.policyApplied === "stop-all") {
 				batchState.phase = "stopped";
-				persistRuntimeState("stop-all", batchState, wavePlan, latestAllocatedLanes, allTaskOutcomes, discovery, repoRoot);
+				persistRuntimeState("stop-all", batchState, wavePlan, latestAllocatedLanes, allTaskOutcomes, discovery, stateRoot);
 				onNotify(ORCH_MESSAGES.orchBatchStopped(batchState.batchId, "stop-all"), "error");
 				break;
 			}
 			if (waveResult.policyApplied === "stop-wave") {
 				batchState.phase = "stopped";
-				persistRuntimeState("stop-wave", batchState, wavePlan, latestAllocatedLanes, allTaskOutcomes, discovery, repoRoot);
+				persistRuntimeState("stop-wave", batchState, wavePlan, latestAllocatedLanes, allTaskOutcomes, discovery, stateRoot);
 				onNotify(ORCH_MESSAGES.orchBatchStopped(batchState.batchId, "stop-wave"), "error");
 				break;
 			}
@@ -1163,7 +1170,7 @@ export async function resumeOrchBatch(
 
 			if (mergeableLaneCount > 0) {
 				batchState.phase = "merging";
-				persistRuntimeState("merge-start", batchState, wavePlan, latestAllocatedLanes, allTaskOutcomes, discovery, repoRoot);
+				persistRuntimeState("merge-start", batchState, wavePlan, latestAllocatedLanes, allTaskOutcomes, discovery, stateRoot);
 				onNotify(ORCH_MESSAGES.orchMergeStart(waveIdx + 1, mergeableLaneCount), "info");
 
 				mergeResult = mergeWaveByRepo(
@@ -1175,6 +1182,8 @@ export async function resumeOrchBatch(
 					batchState.batchId,
 					batchState.baseBranch,
 					workspaceConfig,
+					stateRoot,
+					agentRoot,
 				);
 				batchState.mergeResults.push(mergeResult);
 
@@ -1223,7 +1232,7 @@ export async function resumeOrchBatch(
 				}
 
 				batchState.phase = "executing";
-				persistRuntimeState("merge-complete", batchState, wavePlan, latestAllocatedLanes, allTaskOutcomes, discovery, repoRoot);
+				persistRuntimeState("merge-complete", batchState, wavePlan, latestAllocatedLanes, allTaskOutcomes, discovery, stateRoot);
 			} else if (mixedOutcomeLanes.length > 0) {
 				const mixedIds = mixedOutcomeLanes.map(l => `lane-${l.laneNumber}`).join(", ");
 				mergeResult = {
@@ -1255,7 +1264,7 @@ export async function resumeOrchBatch(
 
 			batchState.phase = policyResult.targetPhase;
 			batchState.errors.push(policyResult.errorMessage);
-			persistRuntimeState(policyResult.persistTrigger, batchState, wavePlan, latestAllocatedLanes, allTaskOutcomes, discovery, repoRoot);
+			persistRuntimeState(policyResult.persistTrigger, batchState, wavePlan, latestAllocatedLanes, allTaskOutcomes, discovery, stateRoot);
 			onNotify(policyResult.notifyMessage, policyResult.notifyLevel);
 			preserveWorktreesForResume = true;
 			break;
@@ -1325,7 +1334,7 @@ export async function resumeOrchBatch(
 		}
 	}
 
-	persistRuntimeState("batch-terminal", batchState, wavePlan, latestAllocatedLanes, allTaskOutcomes, discovery, repoRoot);
+	persistRuntimeState("batch-terminal", batchState, wavePlan, latestAllocatedLanes, allTaskOutcomes, discovery, stateRoot);
 
 	if (batchState.phase === "paused" || batchState.phase === "stopped") {
 		execLog("resume", batchState.batchId, "resumed batch ended in non-terminal state", { phase: batchState.phase });
@@ -1344,7 +1353,7 @@ export async function resumeOrchBatch(
 
 		if (batchState.phase === "completed") {
 			try {
-				deleteBatchState(repoRoot);
+				deleteBatchState(stateRoot);
 				execLog("state", batchState.batchId, "state file deleted on clean resume completion");
 			} catch {
 				// Best-effort