taskplane 0.23.16 → 0.24.1

package/extensions/taskplane/config-schema.ts

@@ -109,8 +109,8 @@ export interface WorkerConfig {
 	tools: string;
 	/** Thinking mode setting passed to worker agent */
 	thinking: string;
-	/** Optional spawn mode override for task-runner */
-	spawnMode?: "subprocess" | "tmux";
+	/** Optional spawn mode override for task-runner (Runtime V2 subprocess-only). */
+	spawnMode?: "subprocess";
 }
 
 /** Reviewer agent configuration */
@@ -139,7 +139,7 @@ export interface ContextConfig {
 	maxReviewCycles: number;
 	/** Max no-progress iterations before marking failure */
 	noProgressLimit: number;
-	/** Optional per-worker wall-clock cap (minutes, used in tmux/orchestrated flows) */
+	/** Optional per-worker wall-clock cap (minutes, used in orchestrated flows) */
 	maxWorkerMinutes?: number;
 }
 
@@ -260,10 +260,10 @@ export interface OrchestratorCoreConfig {
 	worktreePrefix: string;
 	/** Batch ID format used in logs/branch naming */
 	batchIdFormat: "timestamp" | "sequential";
-	/** How lane sessions are spawned */
-	spawnMode: "tmux" | "subprocess";
-	/** Prefix for orchestrator tmux sessions (tmux mode) */
-	tmuxPrefix: string;
+	/** How lane sessions are spawned (Runtime V2 subprocess-only). */
+	spawnMode: "subprocess";
+	/** Prefix for orchestrator session naming */
+	sessionPrefix: string;
 	/** Operator identifier. Auto-detected from OS username if empty */
 	operatorId: string;
 	/** How completed batches are integrated. manual = user runs /orch-integrate. supervised = supervisor proposes plan, asks confirmation. auto = supervisor executes without asking. */
@@ -498,7 +498,7 @@ export interface TaskplaneConfig {
  * | Preference field   | Config path                          | Type    |
  * |--------------------|--------------------------------------|---------|
  * | operatorId         | orchestrator.orchestrator.operatorId | string  |
- * | tmuxPrefix         | orchestrator.orchestrator.tmuxPrefix | string  |
+ * | sessionPrefix      | orchestrator.orchestrator.sessionPrefix | string  |
  * | spawnMode          | orchestrator.orchestrator.spawnMode  | string  |
  * | workerModel        | taskRunner.worker.model              | string  |
  * | reviewerModel      | taskRunner.reviewer.model            | string  |
@@ -509,10 +509,10 @@ export interface TaskplaneConfig {
 export interface UserPreferences {
 	/** Operator identifier (overrides orchestrator.orchestrator.operatorId) */
 	operatorId?: string;
-	/** TMUX session prefix (overrides orchestrator.orchestrator.tmuxPrefix) */
-	tmuxPrefix?: string;
-	/** Spawn mode override (overrides orchestrator.orchestrator.spawnMode) */
-	spawnMode?: "tmux" | "subprocess";
+	/** Orchestrator session prefix (overrides orchestrator.orchestrator.sessionPrefix) */
+	sessionPrefix?: string;
+	/** Spawn mode override (overrides orchestrator.orchestrator.spawnMode). */
+	spawnMode?: "subprocess";
 	/** Worker model override (overrides taskRunner.worker.model) */
 	workerModel?: string;
 	/** Reviewer model override (overrides taskRunner.reviewer.model) */
@@ -582,7 +582,7 @@ export const DEFAULT_ORCHESTRATOR_SECTION: OrchestratorSection = {
 		worktreePrefix: "taskplane-wt",
 		batchIdFormat: "timestamp",
 		spawnMode: "subprocess",
-		tmuxPrefix: "orch",
+		sessionPrefix: "orch",
 		operatorId: "",
 		integration: "manual",
 	},

package/extensions/taskplane/diagnostic-reports.ts

@@ -411,7 +411,7 @@ export function assembleDiagnosticInput(
 			const record: PersistedTaskRecord = {
 				taskId,
 				laneNumber: lane?.laneNumber ?? 0,
-				sessionName: outcome?.sessionName || lane?.tmuxSessionName || "",
+				sessionName: outcome?.sessionName || lane?.laneSessionId || "",
 				status: outcome?.status ?? "pending",
 				taskFolder: "",
 				startedAt: outcome?.startTime ?? null,

package/extensions/taskplane/diagnostics.ts

@@ -49,9 +49,9 @@ export interface SessionTokenCounts {
  * | `context_overflow`   | Hit context window limit (compactions + high ctx %)  |
  * | `wall_clock_timeout` | Killed by task-runner's max_worker_minutes timer     |
  * | `process_crash`      | Non-zero exit code with no API error indicators      |
- * | `session_vanished`   | Tmux session disappeared without exit summary        |
+ * | `session_vanished`   | Session disappeared without exit summary             |
  * | `stall_timeout`      | No STATUS.md progress for stall_timeout minutes      |
- * | `user_killed`        | User manually killed the session (e.g., tmux kill)   |
+ * | `user_killed`        | User manually killed the session (e.g., forced process kill) |
  * | `unknown`            | Could not determine cause                            |
  */
 export type ExitClassification =
@@ -157,7 +157,7 @@ export interface ExitSummary {
  * - `timerKilled`: true if task-runner's max_worker_minutes timer killed the session
  * - `contextKilled`: true if the task-runner explicitly killed the session due to context limit
  * - `stallDetected`: true if monitoring detected no STATUS.md progress
- * - `userKilled`: true if user manually killed the session (e.g., /orch-abort, tmux kill)
+ * - `userKilled`: true if user manually killed the session (e.g., /orch-abort, forced process kill)
  * - `contextPct`: estimated context utilization % (0-100), null if unknown
  *
  * Design: single structured input object (not positional args) for

package/extensions/taskplane/engine.ts

@@ -6,19 +6,19 @@ import { existsSync, readdirSync, readFileSync, unlinkSync } from "fs";
 import { join, resolve } from "path";
 
 import { formatDiscoveryResults, runDiscovery } from "./discovery.ts";
-import { computeTransitiveDependents, execLog, executeLane, executeLaneV2, executeWave, tmuxKillSession } from "./execution.ts";
+import { computeTransitiveDependents, execLog, executeLaneV2, executeWave, killV2LaneAgents } from "./execution.ts";
 import type { RuntimeBackend } from "./execution.ts";
 import type { MonitorUpdateCallback } from "./execution.ts";
 // classifyExit no longer called directly — Tier 0 uses exitDiagnostic.classification
 // from the diagnostic-reports pipeline (populated by assembleDiagnosticInput).
 import { getCurrentBranch, runGit } from "./git.ts";
-import { mergeWaveByRepo, MergeHealthMonitor } from "./merge.ts";
+import { killAllMergeAgentsV2, mergeWaveByRepo, MergeHealthMonitor } from "./merge.ts";
 import { applyMergeRetryLoop, computeCleanupGatePolicy, computeMergeFailurePolicy, extractFailedRepoId, formatRepoMergeSummary, ORCH_MESSAGES } from "./messages.ts";
 import type { CleanupGateRepoFailure } from "./messages.ts";
 import { assembleDiagnosticInput, emitDiagnosticReports } from "./diagnostic-reports.ts";
 import { resolveOperatorId } from "./naming.ts";
 import { applyPartialProgressToOutcomes, buildTier0EventBase, deleteBatchState, emitEngineEvent, emitTier0Event, loadBatchHistory, loadBatchState, persistRuntimeState, saveBatchHistory, seedPendingOutcomesForAllocatedLanes, syncTaskOutcomesFromMonitor, upsertTaskOutcome } from "./persistence.ts";
-import { listOrchSessions } from "./sessions.ts";
+import { readRegistrySnapshot, isTerminalStatus, isProcessAlive as registryIsProcessAlive } from "./process-registry.ts";
 import { buildBatchProgressSnapshot, buildEngineEventBase, defaultResilienceState, FATAL_DISCOVERY_CODES, generateBatchId, TIER0_RETRYABLE_CLASSIFICATIONS, TIER0_RETRY_BUDGETS, tier0ScopeKey, tier0WaveScopeKey } from "./types.ts";
 import type { AllocatedLane, AllocatedTask, BatchHistorySummary, BatchTaskSummary, BatchWaveSummary, DiscoveryResult, EngineEventCallback, EscalationContext, LaneExecutionResult, LaneTaskOutcome, MergeWaveResult, OrchBatchPhase, OrchBatchRuntimeState, OrchestratorConfig, SupervisorAlert, SupervisorAlertCallback, TaskRunnerConfig, Tier0EscalationPattern, Tier0RecoveryPattern, TokenCounts, WaveExecutionResult, WorkspaceConfig } from "./types.ts";
 import { buildDependencyGraph, computeWaves, resolveBaseBranch, resolveRepoRoot, validateGraph } from "./waves.ts";
@@ -278,8 +278,7 @@ async function attemptWorkerCrashRetry(
 			// may be paused due to stop-wave policy, but Tier 0 retry should
 			// attempt recovery before the stop decision takes effect (R002-4).
 			const retryPauseSignal = { paused: false };
-			const retryExecutor = (runtimeBackend === "v2") ? executeLaneV2 : executeLane;
-			const retryResult = await retryExecutor(
+			const retryResult = await executeLaneV2(
 				retryLane,
 				orchConfig,
 				repoRoot,
@@ -546,8 +545,7 @@ async function attemptModelFallbackRetry(
 			// the task-runner to use the session model instead of configured model.
 			// TP-089: Also include ORCH_BATCH_ID so mailbox steering works for retries.
 			const modelFallbackEnv = { TASKPLANE_MODEL_FALLBACK: "1", ORCH_BATCH_ID: batchState.batchId };
-			const retryExecutor = (runtimeBackend === "v2") ? executeLaneV2 : executeLane;
-			const retryResult = await retryExecutor(
+			const retryResult = await executeLaneV2(
 				retryLane,
 				orchConfig,
 				repoRoot,
@@ -2475,16 +2473,39 @@ export async function executeOrchBatch(
 	if (preserveWorktreesForResume) {
 		execLog("batch", batchState.batchId, "skipping final cleanup to preserve worktrees/branches for resume");
 	} else {
-		// Kill any lingering lane tmux sessions BEFORE removing worktrees.
-		// On Windows, tmux sessions with cwd inside the worktree lock the
-		// directory, causing git worktree remove to fail.
-		const orchPrefix = orchConfig.orchestrator.tmux_prefix;
-		const lingering = listOrchSessions(orchPrefix, batchState);
-		if (lingering.length > 0) {
-			execLog("batch", batchState.batchId, `killing ${lingering.length} lingering tmux session(s) before cleanup`);
-			for (const sess of lingering) {
-				tmuxKillSession(sess.sessionName);
+		// Kill lingering Runtime V2 agents BEFORE removing worktrees.
+		// On Windows, lingering processes with cwd inside the worktree can lock
+		// the directory and cause `git worktree remove` to fail.
+		const lingeringLaneSessions = new Set<string>();
+		const registry = readRegistrySnapshot(stateRoot, batchState.batchId);
+		if (registry) {
+			for (const manifest of Object.values(registry.agents)) {
+				if (manifest.role !== "worker" && manifest.role !== "reviewer") continue;
+				if (isTerminalStatus(manifest.status) || !registryIsProcessAlive(manifest.pid)) continue;
+				lingeringLaneSessions.add(manifest.agentId.replace(/-(worker|reviewer)$/, ""));
 			}
+		}
+
+		let performedAgentCleanup = false;
+		if (lingeringLaneSessions.size > 0) {
+			execLog("batch", batchState.batchId, `killing ${lingeringLaneSessions.size} lingering lane agent session(s) before cleanup`);
+			for (const sessionName of lingeringLaneSessions) {
+				killV2LaneAgents(sessionName, {
+					stateRoot,
+					batchId: batchState.batchId,
+					logContext: "batch",
+				});
+			}
+			performedAgentCleanup = true;
+		}
+
+		const killedMergeAgents = killAllMergeAgentsV2();
+		if (killedMergeAgents > 0) {
+			execLog("batch", batchState.batchId, `killed ${killedMergeAgents} lingering merge agent(s) before cleanup`);
+			performedAgentCleanup = true;
+		}
+
+		if (performedAgentCleanup) {
 			sleepSync(1000); // Give OS time to release file locks
 		}