taskplane 0.25.6 → 0.25.8

package/extensions/taskplane/process-registry.ts

@@ -30,12 +30,14 @@ import {
 	runtimeRegistryPath,
 	runtimeAgentEventsPath,
 	runtimeLaneSnapshotPath,
+	runtimeMergeSnapshotPath,
 	validateAgentManifest,
 	type RuntimeAgentId,
 	type RuntimeAgentManifest,
 	type RuntimeAgentRole,
 	type RuntimeAgentStatus,
 	type RuntimeRegistry,
+	type RuntimeMergeSnapshot,
 	type PacketPaths,
 } from "./types.ts";
 
@@ -362,3 +364,53 @@ export function readLaneSnapshot(
 		return null;
 	}
 }
+
+/**
+ * Write a V2 merge agent snapshot to disk (atomic rename).
+ *
+ * Stored in the `lanes/` directory alongside lane snapshots so the dashboard
+ * server picks it up with the same scan that reads lane-N.json files.
+ *
+ * @param stateRoot   - Repository root (where `.pi/` lives)
+ * @param batchId     - Current batch identifier
+ * @param mergeNumber - 1-indexed merge agent number
+ * @param snapshot    - Snapshot data to persist
+ *
+ * @since TP-164
+ */
+export function writeMergeSnapshot(
+	stateRoot: string,
+	batchId: string,
+	mergeNumber: number,
+	snapshot: RuntimeMergeSnapshot,
+): void {
+	const path = runtimeMergeSnapshotPath(stateRoot, batchId, mergeNumber);
+	mkdirSync(dirname(path), { recursive: true });
+	const tmpPath = path + ".tmp";
+	writeFileSync(tmpPath, JSON.stringify(snapshot, null, 2) + "\n", "utf-8");
+	renameSync(tmpPath, path);
+}
+
+/**
+ * Read a V2 merge agent snapshot from disk.
+ * Returns null if the file does not exist or is unreadable.
+ *
+ * @param stateRoot   - Repository root (where `.pi/` lives)
+ * @param batchId     - Current batch identifier
+ * @param mergeNumber - 1-indexed merge agent number
+ *
+ * @since TP-164
+ */
+export function readMergeSnapshot(
+	stateRoot: string,
+	batchId: string,
+	mergeNumber: number,
+): RuntimeMergeSnapshot | null {
+	try {
+		const p = runtimeMergeSnapshotPath(stateRoot, batchId, mergeNumber);
+		if (!existsSync(p)) return null;
+		return JSON.parse(readFileSync(p, "utf-8")) as RuntimeMergeSnapshot;
+	} catch {
+		return null;
+	}
+}

package/extensions/taskplane/resume.ts

@@ -8,7 +8,7 @@ import { join } from "path";
 import { assembleDiagnosticInput, emitDiagnosticReports } from "./diagnostic-reports.ts";
 import { runDiscovery } from "./discovery.ts";
 import { executeOrchBatch } from "./engine.ts";
-import { computeTransitiveDependents, execLog, executeLaneV2, executeWave, resolveCanonicalTaskPaths } from "./execution.ts";
+import { buildReviewerEnv, computeTransitiveDependents, execLog, executeLaneV2, executeWave, resolveCanonicalTaskPaths } from "./execution.ts";
 import type { MonitorUpdateCallback, RuntimeBackend } from "./execution.ts";
 import { selectRuntimeBackend } from "./engine.ts";
 import { readRegistrySnapshot, isTerminalStatus, isProcessAlive } from "./process-registry.ts";
@@ -1461,7 +1461,7 @@ export async function resumeOrchBatch(
 				const laneResult = await executeLaneV2(
 					lane, orchConfig, laneRepoRoot, batchState.pauseSignal,
 					workspaceRoot, !!workspaceConfig,
-					{ ORCH_BATCH_ID: batchState.batchId },
+					{ ORCH_BATCH_ID: batchState.batchId, ...buildReviewerEnv(runnerConfig.reviewer) },
 					emitAlert,
 				);
 				const taskResult = laneResult.tasks.find(t => t.taskId === task.taskId);
@@ -1543,7 +1543,7 @@ export async function resumeOrchBatch(
 				const laneResult = await executeLaneV2(
 					lane, orchConfig, reExecRepoRoot, batchState.pauseSignal,
 					workspaceRoot, !!workspaceConfig,
-					{ ORCH_BATCH_ID: batchState.batchId },
+					{ ORCH_BATCH_ID: batchState.batchId, ...buildReviewerEnv(runnerConfig.reviewer) },
 					emitAlert,
 				);
 				const taskResult = laneResult.tasks.find(t => t.taskId === task.taskId);
@@ -1994,6 +1994,7 @@ export async function resumeOrchBatch(
 			resumeBackend,
 			emitAlert,
 			supervisorAutonomy,
+			runnerConfig.reviewer,
 		);
 
 		batchState.waveResults.push(waveResult);

package/extensions/taskplane/types.ts

@@ -291,6 +291,19 @@ export interface TaskRunnerConfig {
 	 * @since TP-055
 	 */
 	model_fallback?: "inherit" | "fail";
+	/**
+	 * Reviewer agent model/thinking/tools configuration.
+	 * Threaded through to `spawnReviewer()` via env vars.
+	 * @since TP-160
+	 */
+	reviewer?: {
+		/** Model string (empty = inherit session default) */
+		model: string;
+		/** Thinking mode ("on" | "off" | budget string, empty = inherit) */
+		thinking: string;
+		/** Comma-separated tool allowlist */
+		tools: string;
+	};
 }
 
 /** Result of a preflight check */
@@ -4062,6 +4075,50 @@ export function runtimeLaneSnapshotPath(stateRoot: string, batchId: string, lane
 	return `${stateRoot}/.pi/runtime/${batchId}/lanes/lane-${laneNumber}.json`;
 }
 
+/**
+ * Telemetry snapshot for a merge agent.
+ *
+ * Written to `.pi/runtime/{batchId}/lanes/merge-{mergeNumber}.json` alongside
+ * lane snapshots so the dashboard can display live merge-phase telemetry.
+ * Follows the same file-backed pattern as {@link RuntimeLaneSnapshot} but is
+ * simpler — merge agents have no reviewer, progress tracking, or repoId.
+ *
+ * @since TP-164
+ */
+export interface RuntimeMergeSnapshot {
+	/** Batch this merge agent belongs to */
+	batchId: string;
+	/** 1-indexed merge agent number (e.g. 1 for "orch-henry-merge-1") */
+	mergeNumber: number;
+	/** Stable agent session name (e.g. "orch-henry-merge-1") */
+	sessionName: string;
+	/** Wave index this merge agent is processing (0-indexed, 0 when unknown) */
+	waveIndex: number;
+	/** Merge agent lifecycle status */
+	status: "running" | "complete" | "failed";
+	/** Live telemetry snapshot for the merge agent (null when not yet started) */
+	agent: RuntimeAgentTelemetrySnapshot | null;
+	/** Epoch ms when this snapshot was last updated */
+	updatedAt: number;
+}
+
+/**
+ * Resolve the path for a merge agent snapshot file.
+ *
+ * Snapshots are stored alongside lane snapshots in the `lanes/` directory so
+ * the dashboard server's directory scan picks them up automatically.
+ *
+ * @param stateRoot  - Repository root (where `.pi/` lives)
+ * @param batchId    - Current batch identifier
+ * @param mergeNumber - 1-indexed merge agent number
+ * @returns Absolute path to the merge snapshot JSON file
+ *
+ * @since TP-164
+ */
+export function runtimeMergeSnapshotPath(stateRoot: string, batchId: string, mergeNumber: number): string {
+	return `${stateRoot}/.pi/runtime/${batchId}/lanes/merge-${mergeNumber}.json`;
+}
+
 /**
  * Resolve the path for the batch runtime registry.
  *

package/package.json

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