taskplane 0.1.7 → 0.1.8

package/extensions/taskplane/execution.ts

@@ -480,6 +480,12 @@ export async function pollUntilTaskComplete(
 
 	let lastPaneTail = "";
 
+	// Abort signal file path — checked each poll cycle.
+	// Any process can create this file to trigger abort (belt-and-suspenders
+	// alongside the in-memory pauseSignal, since /orch-abort may not be able
+	// to run concurrently with the /orch command handler).
+	const abortSignalFile = join(repoRoot, ".pi", "orch-abort-signal");
+
 	// Main polling loop
 	while (true) {
 		// Check pause signal
@@ -494,6 +500,20 @@ export async function pollUntilTaskComplete(
 			};
 		}
 
+		// Check file-based abort signal
+		if (existsSync(abortSignalFile)) {
+			execLog(laneId, task.taskId, "abort signal file detected — killing session and aborting");
+			tmuxKillSession(sessionName);
+			// Also kill child sessions (worker, reviewer)
+			tmuxKillSession(`${sessionName}-worker`);
+			tmuxKillSession(`${sessionName}-reviewer`);
+			return {
+				status: "failed",
+				exitReason: "Aborted by signal file (.pi/orch-abort-signal)",
+				doneFileFound: false,
+			};
+		}
+
 		// Capture live pane output for diagnostics (best effort).
 		const paneTail = captureTmuxPaneTail(sessionName);
 		if (paneTail) {

package/extensions/taskplane/extension.ts

@@ -1,6 +1,8 @@
 import type { ExtensionAPI, ExtensionContext } from "@mariozechner/pi-coding-agent";
 
 import { execSync } from "child_process";
+import { writeFileSync, unlinkSync, mkdirSync } from "fs";
+import { join } from "path";
 
 import {
 	DEFAULT_ORCHESTRATOR_CONFIG,
@@ -10,7 +12,6 @@ import {
 	createOrchWidget,
 	deleteBatchState,
 	detectOrphanSessions,
-	executeAbort,
 	executeLane,
 	executeOrchBatch,
 	formatDependencyGraph,
@@ -347,113 +348,144 @@ export default function (pi: ExtensionAPI) {
 	pi.registerCommand("orch-abort", {
 		description: "Abort batch: /orch-abort [--hard]",
 		handler: async (args, ctx) => {
-			const hard = args?.trim() === "--hard";
-			const mode: AbortMode = hard ? "hard" : "graceful";
-			const prefix = orchConfig.orchestrator.tmux_prefix;
-			const gracePeriodMs = orchConfig.orchestrator.abort_grace_period * 1000;
-
-			// Check for active in-memory batch
-			const hasActiveBatch = orchBatchState.phase !== "idle" &&
-				orchBatchState.phase !== "completed" &&
-				orchBatchState.phase !== "failed" &&
-				orchBatchState.phase !== "stopped";
-
-			// Also check for persisted state (abort can work on orphaned batches too)
-			let persistedState: PersistedBatchState | null = null;
 			try {
-				persistedState = loadBatchState(ctx.cwd);
-			} catch {
-				// Ignore — we may still have in-memory state or orphan sessions
-			}
+				const hard = args?.trim() === "--hard";
+				const mode: AbortMode = hard ? "hard" : "graceful";
+				const prefix = orchConfig.orchestrator.tmux_prefix;
+				const gracePeriodMs = orchConfig.orchestrator.abort_grace_period * 1000;
+
+				ctx.ui.notify(`🛑 Abort requested (${mode} mode, prefix: ${prefix})...`, "info");
+
+				// ── Step 1: Write abort signal file immediately ──────────
+				// This is the primary abort mechanism. The orchestrator's polling
+				// loop checks for this file on every cycle, so even if this command
+				// handler runs concurrently with /orch (or is queued behind it),
+				// the signal file will be detected.
+				const abortSignalFile = join(ctx.cwd, ".pi", "orch-abort-signal");
+				try {
+					mkdirSync(join(ctx.cwd, ".pi"), { recursive: true });
+					writeFileSync(abortSignalFile, `abort requested at ${new Date().toISOString()} (mode: ${mode})`, "utf-8");
+					ctx.ui.notify("  ✓ Abort signal file written (.pi/orch-abort-signal)", "info");
+				} catch (err) {
+					ctx.ui.notify(`  ⚠ Failed to write abort signal file: ${err instanceof Error ? err.message : String(err)}`, "warning");
+				}
 
-			// If no in-memory batch AND no persisted state, check for orphan sessions
-			if (!hasActiveBatch && !persistedState) {
-				// Last chance: check for orphan sessions
-				const sessionNames = parseOrchSessionNames(
-					(() => {
-						try {
-							return execSync('tmux list-sessions -F "#{session_name}"', {
-								encoding: "utf-8",
-								timeout: 5000,
-							});
-						} catch {
-							return "";
-						}
-					})(),
-					prefix,
-				);
-				if (sessionNames.length === 0) {
-					ctx.ui.notify(ORCH_MESSAGES.abortNoBatch(), "warning");
-					return;
+				// ── Step 2: Set pause signal immediately ─────────────────
+				// Belt-and-suspenders: if the /orch polling loop can see this
+				// shared object, it will stop on the next iteration.
+				if (orchBatchState.pauseSignal) {
+					orchBatchState.pauseSignal.paused = true;
+					ctx.ui.notify("  ✓ Pause signal set on in-memory batch state", "info");
 				}
-				// If orphan sessions exist, proceed with abort (will kill them)
-			}
 
-			const batchId = orchBatchState.batchId || persistedState?.batchId || "unknown";
+				// ── Step 3: Check what we're aborting ────────────────────
+				const hasActiveBatch = orchBatchState.phase !== "idle" &&
+					orchBatchState.phase !== "completed" &&
+					orchBatchState.phase !== "failed" &&
+					orchBatchState.phase !== "stopped";
+
+				let persistedState: PersistedBatchState | null = null;
+				try {
+					persistedState = loadBatchState(ctx.cwd);
+				} catch {
+					// Ignore — we may still have in-memory state or orphan sessions
+				}
 
-			// Notify user of abort start
-			if (mode === "graceful") {
-				const sessionCount = orchBatchState.currentLanes.length || persistedState?.tasks.length || 0;
-				ctx.ui.notify(ORCH_MESSAGES.abortGracefulStarting(batchId, sessionCount), "info");
 				ctx.ui.notify(
-					ORCH_MESSAGES.abortGracefulWaiting(batchId, orchConfig.orchestrator.abort_grace_period),
+					`  Batch state: in-memory=${hasActiveBatch ? orchBatchState.phase : "none"}, ` +
+					`persisted=${persistedState ? persistedState.batchId : "none"}`,
 					"info",
 				);
-			} else {
-				const sessionCount = orchBatchState.currentLanes.length || persistedState?.tasks.length || 0;
-				ctx.ui.notify(ORCH_MESSAGES.abortHardStarting(batchId, sessionCount), "info");
-			}
 
-			// Execute abort
-			const result = await executeAbort(
-				mode,
-				prefix,
-				ctx.cwd,
-				orchBatchState,
-				persistedState,
-				gracePeriodMs,
-			);
+				// ── Step 4: Scan for tmux sessions ──────────────────────
+				let allSessionNames: string[] = [];
+				try {
+					const tmuxOutput = execSync('tmux list-sessions -F "#{session_name}"', {
+						encoding: "utf-8",
+						timeout: 5000,
+					}).trim();
+					const all = tmuxOutput ? tmuxOutput.split("\n").map(s => s.trim()).filter(Boolean) : [];
+					allSessionNames = all.filter(name => name.startsWith(`${prefix}-`));
+					ctx.ui.notify(`  Found ${allSessionNames.length} session(s) matching prefix "${prefix}-": ${allSessionNames.join(", ") || "(none)"}`, "info");
+				} catch {
+					ctx.ui.notify("  ⚠ Could not list tmux sessions (tmux not available?)", "warning");
+				}
 
-			// Update in-memory batch state
-			orchBatchState.phase = "stopped";
-			orchBatchState.endedAt = result.durationMs + Date.now() - result.durationMs; // Use actual time
-			updateOrchWidget();
+				// If no batch AND no sessions, nothing to abort
+				if (!hasActiveBatch && !persistedState && allSessionNames.length === 0) {
+					ctx.ui.notify(ORCH_MESSAGES.abortNoBatch(), "warning");
+					// Clean up signal file
+					try { unlinkSync(abortSignalFile); } catch {}
+					return;
+				}
+
+				const batchId = orchBatchState.batchId || persistedState?.batchId || "unknown";
 
-			// Notify results
-			const durationSec = Math.round(result.durationMs / 1000);
-			if (mode === "graceful") {
-				const forceKilled = result.sessionsKilled - result.gracefulExits;
-				if (forceKilled > 0) {
-					ctx.ui.notify(
-						ORCH_MESSAGES.abortGracefulForceKill(forceKilled),
-						"warning",
-					);
+				// ── Step 5: Kill sessions directly (fast path) ──────────
+				// For hard mode or when sessions are found, kill them immediately
+				// rather than waiting through the full executeAbort flow.
+				if (allSessionNames.length > 0) {
+					ctx.ui.notify(`  Killing ${allSessionNames.length} tmux session(s)...`, "info");
+					let killed = 0;
+					for (const name of allSessionNames) {
+						try {
+							// Kill child sessions first (worker, reviewer)
+							execSync(`tmux kill-session -t "${name}-worker" 2>/dev/null`, { timeout: 3000 }).toString();
+						} catch {}
+						try {
+							execSync(`tmux kill-session -t "${name}-reviewer" 2>/dev/null`, { timeout: 3000 }).toString();
+						} catch {}
+						try {
+							execSync(`tmux kill-session -t "${name}" 2>/dev/null`, { timeout: 3000 }).toString();
+							killed++;
+							ctx.ui.notify(`    ✓ Killed: ${name}`, "info");
+						} catch {
+							// Session may have already exited
+							ctx.ui.notify(`    · ${name} (already exited)`, "info");
+							killed++;
+						}
+					}
+					ctx.ui.notify(`  ✓ ${killed}/${allSessionNames.length} session(s) terminated`, "info");
+				} else {
+					ctx.ui.notify("  No tmux sessions to kill", "info");
 				}
+
+				// ── Step 6: Clean up batch state ────────────────────────
+				try {
+					orchBatchState.phase = "stopped";
+					orchBatchState.endedAt = Date.now();
+					updateOrchWidget();
+					ctx.ui.notify("  ✓ In-memory batch state set to 'stopped'", "info");
+				} catch (err) {
+					ctx.ui.notify(`  ⚠ Failed to update in-memory state: ${err instanceof Error ? err.message : String(err)}`, "warning");
+				}
+
+				try {
+					deleteBatchState(ctx.cwd);
+					ctx.ui.notify("  ✓ Batch state file deleted (.pi/batch-state.json)", "info");
+				} catch (err) {
+					ctx.ui.notify(`  ⚠ Failed to delete batch state file: ${err instanceof Error ? err.message : String(err)}`, "warning");
+				}
+
+				// ── Step 7: Clean up abort signal file ───────────────────
+				try { unlinkSync(abortSignalFile); } catch {}
+
+				// ── Done ─────────────────────────────────────────────────
 				ctx.ui.notify(
-					ORCH_MESSAGES.abortGracefulComplete(batchId, result.gracefulExits, forceKilled, durationSec),
-					"info",
-				);
-			} else {
-				ctx.ui.notify(
-					ORCH_MESSAGES.abortHardComplete(batchId, result.sessionsKilled, durationSec),
+					`✅ Abort complete for batch ${batchId}. Sessions killed, state cleaned up.\n` +
+					`   Worktrees and branches are preserved for inspection.`,
 					"info",
 				);
-			}
-
-			// Report errors if any
-			if (result.errors.length > 0) {
-				const errorDetails = result.errors.map(e => `  • [${e.code}] ${e.message}`).join("\n");
+			} catch (err) {
+				// Top-level catch: ensure the user ALWAYS sees something
 				ctx.ui.notify(
-					`${ORCH_MESSAGES.abortPartialFailure(result.errors.length)}\n${errorDetails}`,
-					"warning",
+					`❌ Abort failed with error: ${err instanceof Error ? err.message : String(err)}\n` +
+					`   Stack: ${err instanceof Error ? err.stack : "N/A"}\n\n` +
+					`   Manual cleanup: tmux kill-server (kills ALL tmux sessions)\n` +
+					`   Or: tmux kill-session -t <session-name> for each session`,
+					"error",
 				);
 			}
-
-			// Final message
-			ctx.ui.notify(
-				ORCH_MESSAGES.abortComplete(mode, result.sessionsKilled),
-				"info",
-			);
 		},
 	});
 

package/package.json

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