taskplane 0.23.8 → 0.23.10

package/extensions/taskplane/engine-worker-entry.mjs

@@ -14,8 +14,21 @@ import { fileURLToPath } from "node:url";
 import { dirname, join } from "node:path";
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
-// TP-115: Disable jiti filesystem cache to prevent stale compiled code
-// after npm update. Without this, jiti serves old cached .mjs even when
-// the .ts source files have been updated by a new package version.
-const jiti = createJiti(import.meta.url, { cache: false });
+
+// TP-115: Purge jiti cache for taskplane modules before loading.
+// Pi's main process caches compiled .ts → .mjs at $TEMP/jiti/.
+// The engine-worker fork must compile fresh from current source files,
+// not use stale cached versions from Pi's startup.
+import { readdirSync, unlinkSync } from "node:fs";
+import { tmpdir } from "node:os";
+try {
+  const cacheDir = join(tmpdir(), "jiti");
+  for (const f of readdirSync(cacheDir)) {
+    if (f.startsWith("taskplane-") && f.endsWith(".mjs")) {
+      try { unlinkSync(join(cacheDir, f)); } catch {}
+    }
+  }
+} catch { /* cache dir may not exist */ }
+
+const jiti = createJiti(import.meta.url);
 await jiti.import(join(__dirname, "engine-worker.ts"));

package/extensions/taskplane/engine.ts

@@ -2268,7 +2268,7 @@ export async function executeOrchBatch(
 						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 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),
@@ -2282,6 +2282,7 @@ export async function executeOrchBatch(
 			}
 		} catch { /* runtime dir may not exist */ }
 
+
 		// Legacy fallback: lane-state-*.json sidecars (only if V2 found nothing)
 		if (laneTokens.size === 0) {
 			try {
@@ -2320,7 +2321,11 @@ export async function executeOrchBatch(
 			const durationMs = (to.startTime && to.endTime) ? (to.endTime - to.startTime) : 0;
 
 			// Get tokens for this lane (cumulative — shared across tasks in same lane)
-			const tokens = laneTokens.get(to.sessionName) || { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, costUsd: 0 };
+			// TP-115: V2 sessionName includes role suffix (-worker/-reviewer) but
+			// laneTokens is keyed by tmuxSessionName (no suffix). Try both.
+			const tokens = laneTokens.get(to.sessionName)
+				|| laneTokens.get(to.sessionName?.replace(/-(?:worker|reviewer)$/, ""))
+				|| { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, costUsd: 0 };
 
 			return {
 				taskId: to.taskId,

package/extensions/taskplane/lane-runner.ts

@@ -1,5 +1,3 @@
-// DEBUG: module load marker
-try { require('fs').writeFileSync('/c/dev/taskplane/.pi/tp-lane-runner-loaded.txt', 'loaded at ' + new Date().toISOString() + ' from ' + __filename); } catch(e) { try { require('fs').writeFileSync('/c/dev/taskplane/.pi/tp-lane-runner-loaded.txt', 'loaded at ' + new Date().toISOString() + ' err: ' + e); } catch {} }
 /**
  * Lane Runner — Headless per-lane execution for Runtime V2
  *
@@ -282,8 +280,6 @@ export async function executeTaskV2(
 		// Context pressure: write wrap-up signal before kill
 		let workerKillReason: "context" | "timer" | null = null;
 
-		// DEBUG: verify this code path executes
-		try { writeFileSync(config.stateRoot + '/.pi/tp-debug-pre-spawn.json', JSON.stringify({ ts: Date.now(), iter: totalIterations, taskId })); } catch { /* */ }
 		const spawned = spawnAgent(hostOpts, undefined, (telemetry) => {
 			// Context pressure check
 			if (telemetry.contextUsage) {
@@ -307,8 +303,6 @@ export async function executeTaskV2(
 
 		// TP-115: Update lastTelemetry with definitive final values from AgentHostResult
 		lastTelemetry = workerResult;
-		// DEBUG
-		try { writeFileSync(config.stateRoot + '/.pi/tp-debug-workerResult.json', JSON.stringify({ iter: totalIterations, cost: workerResult.costUsd, tools: workerResult.toolCalls, input: workerResult.inputTokens, keys: Object.keys(workerResult) }, null, 2)); } catch { /* */ }
 
 		// Clean up wrap-up signal
 		if (existsSync(wrapUpFile)) try { unlinkSync(wrapUpFile); } catch { /* ignore */ }

package/extensions/taskplane/merge.ts

@@ -12,6 +12,7 @@ import { resolveOperatorId } from "./naming.ts";
 import { MERGE_POLL_INTERVAL_MS, MERGE_RESULT_GRACE_MS, MERGE_RESULT_READ_RETRIES, MERGE_RESULT_READ_RETRY_DELAY_MS, MERGE_SPAWN_RETRY_MAX, MERGE_TIMEOUT_MAX_RETRIES, MERGE_TIMEOUT_MS, MERGE_HEALTH_POLL_INTERVAL_MS, MERGE_HEALTH_WARNING_THRESHOLD_MS, MERGE_HEALTH_STUCK_THRESHOLD_MS, MERGE_HEALTH_CAPTURE_LINES, MergeError, VALID_MERGE_STATUSES, buildEngineEventBase } from "./types.ts";
 import type { AllocatedLane, LaneExecutionResult, MergeLaneResult, MergeResult, MergeResultStatus, MergeWaveResult, OrchestratorConfig, RepoMergeOutcome, TaskRunnerConfig, TransactionRecord, TransactionStatus, VerificationBaselineResult, WaveExecutionResult, WorkspaceConfig, MergeHealthStatus, MergeHealthEventType, MergeSessionSnapshot, MergeSessionHealthState, EngineEvent, OrchBatchPhase } from "./types.ts";
 import { resolveBaseBranch, resolveRepoRoot } from "./waves.ts";
+import { readManifest, writeManifest, buildRegistrySnapshot, writeRegistrySnapshot } from "./process-registry.ts";
 import { generateMergeWorktreePath, sleepAsync, sleepSync } from "./worktree.ts";
 import { getCurrentBranch, runGit } from "./git.ts";
 import { ORCH_MESSAGES } from "./messages.ts";
@@ -798,7 +799,7 @@ export async function spawnMergeAgentV2(
 	// Store the kill handle for external cleanup (pause/abort).
 	// The promise runs in background — caller uses waitForMergeResult()
 	// to poll for the result file, same contract as the TMUX path.
-	activeMergeAgents.set(sessionName, { promise, kill });
+	activeMergeAgents.set(sessionName, { promise, kill, stateRoot: stateRoot ?? repoRoot, batchId: bid });
 
 	// Fire-and-forget: the background promise handles exit logging
 	promise.then(result => {
@@ -816,17 +817,30 @@ export async function spawnMergeAgentV2(
 }
 
 /** Active V2 merge agent handles for cleanup/abort. @since TP-108 */
-const activeMergeAgents = new Map<string, { promise: Promise<AgentHostResult>; kill: () => void }>();
+const activeMergeAgents = new Map<string, { promise: Promise<AgentHostResult>; kill: () => void; stateRoot?: string; batchId?: string }>();
 
 /**
  * Kill a V2 merge agent if it's still running.
  * Used by pause/abort/cleanup flows.
  * @since TP-108
  */
-export function killMergeAgentV2(sessionName: string): boolean {
+export function killMergeAgentV2(sessionName: string, cleanExit?: boolean): boolean {
 	const handle = activeMergeAgents.get(sessionName);
 	if (handle) {
 		handle.kill();
+		// TP-115: On clean post-result cleanup, update manifest to "exited"
+		// so dashboard shows correct status instead of "killed".
+		if (cleanExit && handle.stateRoot && handle.batchId) {
+			try {
+				const manifest = readManifest(handle.stateRoot, handle.batchId, sessionName as any);
+				if (manifest) {
+					manifest.status = "exited";
+					writeManifest(handle.stateRoot, manifest);
+					const snapshot = buildRegistrySnapshot(handle.stateRoot, handle.batchId);
+					writeRegistrySnapshot(handle.stateRoot, snapshot);
+				}
+			} catch { /* best effort */ }
+		}
 		activeMergeAgents.delete(sessionName);
 		return true;
 	}
@@ -928,7 +942,7 @@ export async function waitForMergeResult(
 						});
 						// Clean up agent (may still be running post-write)
 						if (isV2) {
-							killMergeAgentV2(sessionName);
+							killMergeAgentV2(sessionName, true);
 						} else if (await tmuxHasSessionAsync(sessionName)) {
 							await tmuxKillSessionAsync(sessionName);
 						}
@@ -967,7 +981,7 @@ export async function waitForMergeResult(
 				});
 				// Clean up agent if still alive
 				if (isV2) {
-					killMergeAgentV2(sessionName);
+					killMergeAgentV2(sessionName, true);
 				} else if (await tmuxHasSessionAsync(sessionName)) {
 					await tmuxKillSessionAsync(sessionName);
 				}

package/package.json

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