taskplane 0.23.4 → 0.23.6

package/extensions/taskplane/engine.ts

@@ -2253,28 +2253,57 @@ export async function executeOrchBatch(
 
 	// ── Save batch history (before cleanup deletes sidecar files) ────
 	try {
-		// Read token data from sidecar files while they still exist
+		// Read token data from sidecar files or V2 lane snapshots
 		const piDir = join(stateRoot, ".pi");
 		const laneTokens = new Map<string, TokenCounts>();
+
+		// TP-115: Try V2 lane snapshots first (authoritative for Runtime V2)
 		try {
-			const files = readdirSync(piDir).filter(f => f.startsWith("lane-state-") && f.endsWith(".json"));
-			for (const f of files) {
-				try {
-					const raw = readFileSync(join(piDir, f), "utf-8").trim();
-					if (!raw) continue;
-					const data = JSON.parse(raw);
-					if (data.prefix) {
-						laneTokens.set(data.prefix, {
-							input: data.workerInputTokens || 0,
-							output: data.workerOutputTokens || 0,
-							cacheRead: data.workerCacheReadTokens || 0,
-							cacheWrite: data.workerCacheWriteTokens || 0,
-							costUsd: data.workerCostUsd || 0,
+			const lanesDir = join(piDir, "runtime", batchState.batchId, "lanes");
+			if (existsSync(lanesDir)) {
+				const files = readdirSync(lanesDir).filter(f => f.startsWith("lane-") && f.endsWith(".json"));
+				for (const f of files) {
+					try {
+						const snap = JSON.parse(readFileSync(join(lanesDir, f), "utf-8"));
+						const w = snap.worker || {};
+						const r = snap.reviewer || {};
+						// Key by session name (match lane record) for per-task lookup
+						const laneRec = batchState.lanes.find((l: { laneNumber: number }) => l.laneNumber === snap.laneNumber);
+						const key = laneRec?.tmuxSessionName || `lane-${snap.laneNumber}`;
+						laneTokens.set(key, {
+							input: (w.inputTokens || 0) + (r.inputTokens || 0),
+							output: (w.outputTokens || 0) + (r.outputTokens || 0),
+							cacheRead: (w.cacheReadTokens || 0) + (r.cacheReadTokens || 0),
+							cacheWrite: (w.cacheWriteTokens || 0) + (r.cacheWriteTokens || 0),
+							costUsd: (w.costUsd || 0) + (r.costUsd || 0),
 						});
-					}
-				} catch { /* skip invalid files */ }
+					} catch { /* skip invalid files */ }
+				}
 			}
-		} catch { /* .pi dir may not exist */ }
+		} catch { /* runtime dir may not exist */ }
+
+		// Legacy fallback: lane-state-*.json sidecars (only if V2 found nothing)
+		if (laneTokens.size === 0) {
+			try {
+				const files = readdirSync(piDir).filter(f => f.startsWith("lane-state-") && f.endsWith(".json"));
+				for (const f of files) {
+					try {
+						const raw = readFileSync(join(piDir, f), "utf-8").trim();
+						if (!raw) continue;
+						const data = JSON.parse(raw);
+						if (data.prefix) {
+							laneTokens.set(data.prefix, {
+								input: data.workerInputTokens || 0,
+								output: data.workerOutputTokens || 0,
+								cacheRead: data.workerCacheReadTokens || 0,
+								cacheWrite: data.workerCacheWriteTokens || 0,
+								costUsd: data.workerCostUsd || 0,
+							});
+						}
+					} catch { /* skip invalid files */ }
+				}
+			} catch { /* .pi dir may not exist */ }
+		}
 
 		// Build per-task summaries from allTaskOutcomes + wave plan
 		const taskSummaries: BatchTaskSummary[] = allTaskOutcomes.map((to) => {

package/extensions/taskplane/supervisor.ts

@@ -28,7 +28,7 @@
 
 import { join, dirname } from "path";
 import { fileURLToPath } from "url";
-import { existsSync, readFileSync, writeFileSync, unlinkSync, mkdirSync, renameSync, statSync, openSync, readSync, closeSync, appendFileSync } from "fs";
+import { existsSync, readFileSync, readdirSync, writeFileSync, unlinkSync, mkdirSync, renameSync, statSync, openSync, readSync, closeSync, appendFileSync } from "fs";
 import { stat as fsStat, open as fsOpen, readFile as fsReadFile, writeFile as fsWriteFile, rename as fsRename } from "fs/promises";
 import { execFileSync } from "child_process";
 import type { ExtensionAPI, ExtensionContext } from "@mariozechner/pi-coding-agent";
@@ -1264,6 +1264,30 @@ function formatDurationMs(ms: number): string {
  *
  * @since TP-043
  */
+
+/**
+ * TP-115: Compute batch cost from V2 lane snapshots.
+ * Reads .pi/runtime/{batchId}/lanes/*.json and sums worker + reviewer costUsd.
+ * Returns 0 if no V2 data exists.
+ * @since TP-115
+ */
+function computeV2BatchCost(stateRoot: string, batchId: string): number {
+	try {
+		const lanesDir = join(stateRoot, ".pi", "runtime", batchId, "lanes");
+		if (!existsSync(lanesDir)) return 0;
+		const files = readdirSync(lanesDir).filter(f => f.startsWith("lane-") && f.endsWith(".json"));
+		let total = 0;
+		for (const f of files) {
+			try {
+				const snap = JSON.parse(readFileSync(join(lanesDir, f), "utf-8"));
+				total += snap.worker?.costUsd || 0;
+				total += snap.reviewer?.costUsd || 0;
+			} catch { /* skip */ }
+		}
+		return total;
+	} catch { return 0; }
+}
+
 export function collectBatchSummaryData(
 	batchState: OrchBatchRuntimeState,
 	stateRoot: string,
@@ -1297,7 +1321,9 @@ export function collectBatchSummaryData(
 		failedTasks: batchState.failedTasks,
 		skippedTasks: batchState.skippedTasks,
 		blockedTasks: batchState.blockedTasks,
-		batchCost: diagnostics?.batchCost ?? 0,
+		batchCost: (diagnostics?.batchCost ?? 0) > 0
+			? diagnostics!.batchCost
+			: computeV2BatchCost(stateRoot, batchState.batchId),
 		wavePlan: [], // Not directly available on runtime state — use waveResults
 		waveResults,
 		taskExits: diagnostics?.taskExits ?? {},
@@ -1680,9 +1706,11 @@ export function presentBatchSummary(
 	const duration = batchState.endedAt && batchState.startedAt
 		? formatDurationMs(batchState.endedAt - batchState.startedAt)
 		: "in progress";
-	const cost = (diagnostics?.batchCost ?? 0) > 0
-		? `$${(diagnostics?.batchCost ?? 0).toFixed(2)}`
-		: "not tracked";
+	// TP-115: Use V2 lane snapshot cost when diagnostics.batchCost is zero
+	const rawCost = (diagnostics?.batchCost ?? 0) > 0
+		? diagnostics!.batchCost
+		: computeV2BatchCost(stateRoot, batchState.batchId);
+	const cost = rawCost > 0 ? `$${rawCost.toFixed(2)}` : "not tracked";
 	const filename = `${opId}-${batchState.batchId}-summary.md`;
 
 	const conciseText =

package/package.json

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