@ryan_nookpi/pi-extension-subagent 0.5.6 → 0.5.8

package/tool-execute.ts

@@ -10,6 +10,14 @@ import * as fs from "node:fs";
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { createRunActivityRecorder } from "./activity.js";
 import { type AgentConfig, discoverAgents } from "./agents.js";
+import {
+	assertAsyncAdmission,
+	asyncInvocationDetails,
+	completeAsyncInvocation,
+	discardRemovedAsyncInvocation,
+	isExpectedTrackedCancellation,
+	retainAsyncCompletion,
+} from "./async-task-lifecycle.js";
 import { parseSubagentToolCommand, SUBAGENT_CLI_HELP_TEXT } from "./cli.js";
 import {
 	DEFAULT_TURN_COUNT,
@@ -453,6 +461,7 @@ function buildRunStartMessage(runState: CommandRunState, status: "started" | "re
 			`\nContext: ${contextLabel} · turn ${runState.turnCount}`,
 		display: false,
 		details: {
+			...asyncInvocationDetails(),
 			runId: runState.id,
 			agent: runState.agent,
 			task: runState.task,
@@ -502,14 +511,21 @@ function recordBatchResult(batch: BatchGroupState, finalized: FinalizedRun): voi
 	batch.completedRunIds.add(runId);
 	if (status === "aborted") batch.abortedRunIds.add(runId);
 	else if (status === "error") batch.failedRunIds.add(runId);
-	batch.pendingResults.set(runId, finalized.rawOutput);
+	batch.completedRuns.set(runId, { ...finalized.runState, abortController: undefined });
+}
+
+function getCompletedBatchRuns(batch: BatchGroupState): CommandRunState[] {
+	return batch.runIds
+		.map((runId) => batch.completedRuns.get(runId))
+		.filter((run): run is CommandRunState => Boolean(run));
 }
 
 function buildRunCompletionMessage(finalized: FinalizedRun, options?: { display?: boolean }) {
 	const { runState, result, rawOutput } = finalized;
 	const usage = result ? formatUsageStats(result.usage, result.model) : "";
 	const terminalLabel = getFinalizedRunLabel(finalized);
-	return {
+	completeAsyncInvocation(terminalLabel);
+	return retainAsyncCompletion({
 		customType: "subagent-tool" as const,
 		content:
 			`[subagent:${runState.agent}#${runState.id}] ${terminalLabel}` +
@@ -519,6 +535,7 @@ function buildRunCompletionMessage(finalized: FinalizedRun, options?: { display?
 			`\n\n${rawOutput}`,
 		display: options?.display ?? true,
 		details: {
+			...asyncInvocationDetails(),
 			runId: runState.id,
 			agent: runState.agent,
 			task: runState.task,
@@ -549,12 +566,13 @@ function buildRunCompletionMessage(finalized: FinalizedRun, options?: { display?
 			claudeSessionId: runState.claudeSessionId,
 			claudeProjectDir: runState.claudeProjectDir,
 		},
-	};
+	});
 }
 
 function buildEscalationMessage(runState: CommandRunState, escalationMessage: string, result: SingleResult) {
+	completeAsyncInvocation("completed");
 	const usage = formatUsageStats(result.usage, result.model);
-	return {
+	return retainAsyncCompletion({
 		customType: "subagent-tool" as const,
 		content:
 			`[subagent:${runState.agent}#${runState.id}] escalated` +
@@ -563,6 +581,7 @@ function buildEscalationMessage(runState: CommandRunState, escalationMessage: st
 			`\n\n[ESCALATION] ${escalationMessage}`,
 		display: true,
 		details: {
+			...asyncInvocationDetails(),
 			runId: runState.id,
 			agent: runState.agent,
 			task: runState.task,
@@ -586,7 +605,7 @@ function buildEscalationMessage(runState: CommandRunState, escalationMessage: st
 			claudeSessionId: runState.claudeSessionId,
 			claudeProjectDir: runState.claudeProjectDir,
 		},
-	};
+	});
 }
 
 function buildStrongWaitMessage(runId: number): string {
@@ -654,6 +673,7 @@ function formatBatchSummary(
 	runs: CommandRunState[],
 	terminalStatus: "completed" | "error" | "aborted",
 ): string {
+	completeAsyncInvocation(terminalStatus);
 	const statuses = runs.map((run) => getSubagentRunStatusLabel(run.status, run.errorClass));
 	const headerStatus = runs.map((run, index) => `#${run.id} ${statuses[index]}`).join(", ");
 	const outcomeCounts = formatOutcomeCounts(
@@ -674,6 +694,7 @@ function formatPipelineSummary(
 	stepResults: PipelineStepResult[],
 	terminalStatus: "completed" | "stopped" | "error" | "aborted",
 ): string {
+	completeAsyncInvocation(terminalStatus);
 	const outcomeCounts = formatOutcomeCounts(
 		stepResults.filter((step) => step.status === "error").length,
 		stepResults.filter((step) => step.status === "aborted").length,
@@ -811,6 +832,7 @@ function finalizeRunError(runState: CommandRunState, error: unknown): FinalizedR
 }
 
 export function createSubagentToolExecute(pi: ExtensionAPI, store: SubagentStore) {
+	pi = store.asyncTasks?.wrap(pi) ?? pi;
 	const execute = async (
 		_toolCallId: string,
 		params: Record<string, any>,
@@ -925,7 +947,7 @@ export function createSubagentToolExecute(pi: ExtensionAPI, store: SubagentStore
 		const hasChain = asyncAction === "chain";
 		const hasSingle = asyncAction === "run" || asyncAction === "continue";
 		const mode: LaunchMode = hasBatch ? "batch" : hasChain ? "chain" : "single";
-		const shouldRunAsync = isInteractiveTuiContext(ctx);
+		const shouldRunAsync = isInteractiveTuiContext(ctx) || store.asyncTasks?.provider.accepting === true;
 		const makeDetails = (
 			modeOverride: LaunchMode = mode,
 			results: SingleResult[] = [],
@@ -1040,6 +1062,45 @@ export function createSubagentToolExecute(pi: ExtensionAPI, store: SubagentStore
 			};
 		}
 
+		let abortGroupTarget: { groupId: string; kind: "batch" | "chain" } | undefined;
+		if (asyncAction === "abort" && typeof cmdParams.groupId === "string") {
+			evictStaleFinishedGroups(store);
+			const groupId = cmdParams.groupId;
+			const finished = store.finishedGroups.get(groupId);
+			if (finished) {
+				return {
+					content: [{ type: "text", text: `Subagent ${finished.kind} ${groupId} has already finished.` }],
+					details: makeDetails("single"),
+				};
+			}
+
+			const batch = store.batchGroups.get(groupId);
+			const pipeline = store.pipelines.get(groupId);
+			if (!batch && !pipeline) {
+				return {
+					content: [{ type: "text", text: `Unknown subagent group "${groupId}".` }],
+					details: makeDetails("single"),
+					isError: true,
+				};
+			}
+
+			abortGroupTarget = { groupId, kind: batch ? "batch" : "chain" };
+			if (pipeline) pipeline.abortRequested = true;
+			const groupRunIds = (batch?.runIds ?? pipeline?.stepRunIds ?? []).filter((runId) => {
+				const run = store.globalLiveRuns.get(runId)?.runState ?? store.commandRuns.get(runId);
+				return batch ? run?.batchId === groupId : run?.pipelineId === groupId;
+			});
+			if (groupRunIds.length === 0) {
+				return {
+					content: [
+						{ type: "text", text: `Subagent ${abortGroupTarget.kind} ${groupId} has no started runs to abort.` },
+					],
+					details: makeDetails("single"),
+				};
+			}
+			cmdParams.runIds = groupRunIds;
+		}
+
 		if ((asyncAction === "status" || asyncAction === "detail") && typeof cmdParams.groupId === "string") {
 			evictStaleFinishedGroups(store);
 			const groupId = cmdParams.groupId;
@@ -1178,7 +1239,9 @@ export function createSubagentToolExecute(pi: ExtensionAPI, store: SubagentStore
 				const unknown: number[] = [];
 
 				for (const runId of targetRunIds) {
-					const run = store.commandRuns.get(runId);
+					const run = abortGroupTarget
+						? (store.globalLiveRuns.get(runId)?.runState ?? store.commandRuns.get(runId))
+						: store.commandRuns.get(runId);
 					if (!run) {
 						unknown.push(runId);
 						continue;
@@ -1200,7 +1263,13 @@ export function createSubagentToolExecute(pi: ExtensionAPI, store: SubagentStore
 					updateCommandRunsWidget(store, ctx as WidgetRenderCtx);
 				}
 
-				if (targetRunIds.length === 1 && aborting.length === 1 && notRunning.length === 0 && unknown.length === 0) {
+				if (
+					!abortGroupTarget &&
+					targetRunIds.length === 1 &&
+					aborting.length === 1 &&
+					notRunning.length === 0 &&
+					unknown.length === 0
+				) {
 					return {
 						content: [{ type: "text", text: `Aborting subagent run #${aborting[0]}...` }],
 						details: makeDetails("single"),
@@ -1208,6 +1277,9 @@ export function createSubagentToolExecute(pi: ExtensionAPI, store: SubagentStore
 				}
 
 				const lines: string[] = [];
+				if (abortGroupTarget) {
+					lines.push(`Subagent ${abortGroupTarget.kind} ${abortGroupTarget.groupId}:`);
+				}
 				if (aborting.length > 0) lines.push(`Aborting: ${aborting.map((id) => `#${id}`).join(", ")}.`);
 				if (notRunning.length > 0) lines.push(`Not running: ${notRunning.map((id) => `#${id}`).join(", ")}.`);
 				if (unknown.length > 0) lines.push(`Unknown: ${unknown.map((id) => `#${id}`).join(", ")}.`);
@@ -1333,6 +1405,7 @@ export function createSubagentToolExecute(pi: ExtensionAPI, store: SubagentStore
 		}
 
 		function registerRunLaunch(config: RunLaunchConfig): CommandRunState {
+			assertAsyncAdmission();
 			const initialDisplayTask = buildSubagentDisplayTaskFallback(config.taskForDisplay);
 			let runState: CommandRunState;
 			if (config.existingRunState) {
@@ -1413,6 +1486,13 @@ export function createSubagentToolExecute(pi: ExtensionAPI, store: SubagentStore
 			store.recentLaunchTimestamps.delete(runId);
 		}
 
+		function cleanupGroupRunAfterFinalDelivery(runId: number, groupId: string, kind: "batch" | "chain") {
+			const run = store.globalLiveRuns.get(runId)?.runState ?? store.commandRuns.get(runId);
+			const ownsGroup = kind === "batch" ? run?.batchId === groupId : run?.pipelineId === groupId;
+			if (run && !ownsGroup) return;
+			cleanupRunAfterFinalDelivery(runId);
+		}
+
 		function launchRunInBackground(runState: CommandRunState, taskForAgent: string): Promise<FinalizedRun> {
 			let claudeCheckpointSent = !!runState.claudeSessionId;
 			const abortSignal = runState.abortController?.signal;
@@ -1460,6 +1540,7 @@ export function createSubagentToolExecute(pi: ExtensionAPI, store: SubagentStore
 								resumeSessionId: runState.claudeSessionId,
 								sidecarSessionFile: runState.sessionFile,
 								persistedSessionBaseOffset: runState.persistedSessionBaseOffset,
+								...(store.asyncTasks?.provider.supported ? { asyncRunId: runState.id } : {}),
 								onDiagnostic: createRunDiagnosticSink(pi, runState),
 							},
 						);
@@ -1615,7 +1696,10 @@ export function createSubagentToolExecute(pi: ExtensionAPI, store: SubagentStore
 			void (async () => {
 				try {
 					const finalized = await launchRunInBackground(runState, taskForAgent);
-					if (runState.removed || store.disposed) return;
+					if (runState.removed || store.disposed) {
+						discardRemovedAsyncInvocation(finalized.rawOutput);
+						return;
+					}
 					updateCommandRunsWidget(store);
 
 					if (finalized.result?.exitCode === ESCALATION_EXIT_CODE) {
@@ -1641,12 +1725,16 @@ export function createSubagentToolExecute(pi: ExtensionAPI, store: SubagentStore
 						if (entry) entry.pendingCompletion = makePendingCompletion(completionMessage, true);
 					}
 
-					ctx.ui?.notify?.(
-						`subagent tool run #${runState.id} (${resolvedAgent}) ${terminalLabel}`,
-						terminalLabel === "completed" ? "info" : terminalLabel === "aborted" ? "warning" : "error",
-					);
+					if (terminalLabel !== "aborted" || !isExpectedTrackedCancellation())
+						ctx.ui?.notify?.(
+							`subagent tool run #${runState.id} (${resolvedAgent}) ${terminalLabel}`,
+							terminalLabel === "completed" ? "info" : terminalLabel === "aborted" ? "warning" : "error",
+						);
 				} catch (error: unknown) {
-					if (runState.removed || store.disposed) return;
+					if (runState.removed || store.disposed) {
+						discardRemovedAsyncInvocation(String(error));
+						return;
+					}
 					const finalized = finalizeRunError(runState, error);
 					const terminalLabel = getFinalizedRunLabel(finalized);
 					const errorMessage = buildRunCompletionMessage(finalized);
@@ -1657,10 +1745,11 @@ export function createSubagentToolExecute(pi: ExtensionAPI, store: SubagentStore
 						const entry = store.globalLiveRuns.get(runState.id);
 						if (entry) entry.pendingCompletion = makePendingCompletion(errorMessage, true);
 					}
-					ctx.ui?.notify?.(
-						`subagent tool run #${runState.id} ${terminalLabel}: ${runState.lastLine}`,
-						terminalLabel === "aborted" ? "warning" : "error",
-					);
+					if (terminalLabel !== "aborted" || !isExpectedTrackedCancellation())
+						ctx.ui?.notify?.(
+							`subagent tool run #${runState.id} ${terminalLabel}: ${runState.lastLine}`,
+							terminalLabel === "aborted" ? "warning" : "error",
+						);
 					updateCommandRunsWidget(store);
 				} finally {
 					clearRunAbortState(runState);
@@ -1734,7 +1823,7 @@ export function createSubagentToolExecute(pi: ExtensionAPI, store: SubagentStore
 				abortedRunIds: new Set(),
 				originSessionFile,
 				createdAt: Date.now(),
-				pendingResults: new Map(),
+				completedRuns: new Map(),
 			});
 			updateCommandRunsWidget(store, ctx as WidgetRenderCtx);
 
@@ -1750,11 +1839,13 @@ export function createSubagentToolExecute(pi: ExtensionAPI, store: SubagentStore
 						}
 					}),
 				);
-				const orderedRuns = runStates.map(({ runState }) => runState);
 				const batchForSnapshot = store.batchGroups.get(batchId);
 				if (batchForSnapshot) {
 					for (const finalized of finalizedRuns) recordBatchResult(batchForSnapshot, finalized);
 				}
+				const orderedRuns = batchForSnapshot
+					? getCompletedBatchRuns(batchForSnapshot)
+					: runStates.map(({ runState }) => runState);
 				const terminalStatus = resolveGroupTerminalStatus(
 					batchForSnapshot?.failedRunIds.size ?? 0,
 					batchForSnapshot?.abortedRunIds.size ?? 0,
@@ -1763,7 +1854,7 @@ export function createSubagentToolExecute(pi: ExtensionAPI, store: SubagentStore
 				if (batchForSnapshot) {
 					retireFinishedGroup(store, snapshotBatchGroup(store, batchForSnapshot, terminalStatus));
 				}
-				for (const { runState } of runStates) cleanupRunAfterFinalDelivery(runState.id);
+				for (const { runState } of runStates) cleanupGroupRunAfterFinalDelivery(runState.id, batchId, "batch");
 				clearPendingGroupCompletion("batch", batchId);
 				store.batchGroups.delete(batchId);
 				trimCommandRunHistory(store, {
@@ -1799,9 +1890,7 @@ export function createSubagentToolExecute(pi: ExtensionAPI, store: SubagentStore
 						updateCommandRunsWidget(store);
 
 						if (batch.completedRunIds.size === batch.runIds.length) {
-							const orderedRuns = batch.runIds
-								.map((runId) => store.commandRuns.get(runId))
-								.filter((run): run is CommandRunState => Boolean(run));
+							const orderedRuns = getCompletedBatchRuns(batch);
 							const batchTerminalStatus = resolveGroupTerminalStatus(batch.failedRunIds.size, batch.abortedRunIds.size);
 							const content = formatBatchSummary(batchId, orderedRuns, batchTerminalStatus);
 							const message = {
@@ -1809,17 +1898,19 @@ export function createSubagentToolExecute(pi: ExtensionAPI, store: SubagentStore
 								content,
 								display: true,
 								details: {
+									...asyncInvocationDetails(),
 									batchId,
 									runIds: batch.runIds,
 									status: batchTerminalStatus === "completed" ? "done" : batchTerminalStatus,
 									runSummaries: orderedRuns.map((run) => buildRunAnalyticsSummary(run)),
 								},
 							};
+							retainAsyncCompletion(message);
 							retireFinishedGroup(store, snapshotBatchGroup(store, batch, batchTerminalStatus));
 							if (isInOriginSession(ctx, batch.originSessionFile)) {
 								pi.sendMessage(message, { deliverAs: "followUp", triggerTurn: true });
 								clearPendingGroupCompletion("batch", batchId);
-								for (const runId of batch.runIds) cleanupRunAfterFinalDelivery(runId);
+								for (const runId of batch.runIds) cleanupGroupRunAfterFinalDelivery(runId, batchId, "batch");
 								store.batchGroups.delete(batchId);
 							} else {
 								batch.pendingCompletion = makePendingCompletion(message, true);
@@ -1838,14 +1929,15 @@ export function createSubagentToolExecute(pi: ExtensionAPI, store: SubagentStore
 								updateWidget: false,
 								removalReason: "trim",
 							});
-							ctx.ui?.notify?.(
-								batchTerminalStatus === "error"
-									? `subagent batch ${batchId} finished with errors`
-									: batchTerminalStatus === "aborted"
-										? `subagent batch ${batchId} aborted`
-										: `subagent batch ${batchId} completed`,
-								batchTerminalStatus === "error" ? "error" : batchTerminalStatus === "aborted" ? "warning" : "info",
-							);
+							if (batchTerminalStatus !== "aborted" || !isExpectedTrackedCancellation())
+								ctx.ui?.notify?.(
+									batchTerminalStatus === "error"
+										? `subagent batch ${batchId} finished with errors`
+										: batchTerminalStatus === "aborted"
+											? `subagent batch ${batchId} aborted`
+											: `subagent batch ${batchId} completed`,
+									batchTerminalStatus === "error" ? "error" : batchTerminalStatus === "aborted" ? "warning" : "info",
+								);
 						}
 					} catch (error: unknown) {
 						const finalized = finalizeRunError(runState, error);
@@ -1853,26 +1945,26 @@ export function createSubagentToolExecute(pi: ExtensionAPI, store: SubagentStore
 						if (!batch) return;
 						recordBatchResult(batch, finalized);
 						if (batch.completedRunIds.size === batch.runIds.length) {
-							const orderedRuns = batch.runIds
-								.map((runId) => store.commandRuns.get(runId))
-								.filter((run): run is CommandRunState => Boolean(run));
+							const orderedRuns = getCompletedBatchRuns(batch);
 							const batchTerminalStatus = resolveGroupTerminalStatus(batch.failedRunIds.size, batch.abortedRunIds.size);
 							const message = {
 								customType: "subagent-tool" as const,
 								content: formatBatchSummary(batchId, orderedRuns, batchTerminalStatus),
 								display: true,
 								details: {
+									...asyncInvocationDetails(),
 									batchId,
 									runIds: batch.runIds,
 									status: batchTerminalStatus,
 									runSummaries: orderedRuns.map((run) => buildRunAnalyticsSummary(run)),
 								},
 							};
+							retainAsyncCompletion(message);
 							retireFinishedGroup(store, snapshotBatchGroup(store, batch, batchTerminalStatus));
 							if (isInOriginSession(ctx, batch.originSessionFile)) {
 								pi.sendMessage(message, { deliverAs: "followUp", triggerTurn: true });
 								clearPendingGroupCompletion("batch", batchId);
-								for (const runId of batch.runIds) cleanupRunAfterFinalDelivery(runId);
+								for (const runId of batch.runIds) cleanupGroupRunAfterFinalDelivery(runId, batchId, "batch");
 								store.batchGroups.delete(batchId);
 							} else {
 								batch.pendingCompletion = makePendingCompletion(message, true);
@@ -1931,6 +2023,7 @@ export function createSubagentToolExecute(pi: ExtensionAPI, store: SubagentStore
 			store.pipelines.set(pipelineId, {
 				pipelineId,
 				currentIndex: 0,
+				abortRequested: false,
 				stepRunIds: [],
 				stepResults: [],
 				originSessionFile,
@@ -1952,6 +2045,10 @@ export function createSubagentToolExecute(pi: ExtensionAPI, store: SubagentStore
 
 				try {
 					for (let index = 0; index < steps.length; index++) {
+						if (pipeline.abortRequested) {
+							terminalStatus = "aborted";
+							break;
+						}
 						pipeline.currentIndex = index;
 						const step = steps[index];
 						const pipelineReferenceSection =
@@ -2005,26 +2102,20 @@ export function createSubagentToolExecute(pi: ExtensionAPI, store: SubagentStore
 						}
 						finalizedRuns.push(finalized);
 
-						if (runState.removed) {
-							terminalStatus = "aborted";
-							pipeline.stepResults.push({
-								runId: runState.id,
-								agent: runState.agent,
-								task: step.task,
-								output: finalized.rawOutput || "Run removed before pipeline completion.",
-								status: "aborted",
-							});
-							break;
-						}
-
-						const stepStatus = getFinalizedRunStatus(finalized);
+						const stepStatus = runState.removed ? "aborted" : getFinalizedRunStatus(finalized);
 						pipeline.stepResults.push({
 							runId: runState.id,
 							agent: runState.agent,
 							task: step.task,
-							output: finalized.rawOutput,
+							output: runState.removed
+								? finalized.rawOutput || "Run removed before pipeline completion."
+								: finalized.rawOutput,
 							status: stepStatus,
 						});
+						if (runState.removed || pipeline.abortRequested) {
+							terminalStatus = "aborted";
+							break;
+						}
 						previousOutput = finalized.rawOutput;
 						updateCommandRunsWidget(store);
 
@@ -2050,7 +2141,7 @@ export function createSubagentToolExecute(pi: ExtensionAPI, store: SubagentStore
 				else if (terminalStatus === "completed" && hasAborted) terminalStatus = "aborted";
 				const content = formatPipelineSummary(pipelineId, pipeline.stepResults, terminalStatus);
 				retireFinishedGroup(store, snapshotPipeline(pipeline, terminalStatus));
-				for (const runId of pipeline.stepRunIds) cleanupRunAfterFinalDelivery(runId);
+				for (const runId of pipeline.stepRunIds) cleanupGroupRunAfterFinalDelivery(runId, pipelineId, "chain");
 				clearPendingGroupCompletion("chain", pipelineId);
 				store.pipelines.delete(pipelineId);
 				trimCommandRunHistory(store, {
@@ -2082,6 +2173,10 @@ export function createSubagentToolExecute(pi: ExtensionAPI, store: SubagentStore
 					for (let index = 0; index < steps.length; index++) {
 						const pipeline = store.pipelines.get(pipelineId);
 						if (!pipeline) return;
+						if (pipeline.abortRequested) {
+							terminalStatus = "aborted";
+							break;
+						}
 						pipeline.currentIndex = index;
 
 						const step = steps[index];
@@ -2134,26 +2229,20 @@ export function createSubagentToolExecute(pi: ExtensionAPI, store: SubagentStore
 						} finally {
 							clearRunAbortState(runState);
 						}
-						if (runState.removed) {
-							terminalStatus = "aborted";
-							pipeline.stepResults.push({
-								runId: runState.id,
-								agent: runState.agent,
-								task: step.task,
-								output: finalized.rawOutput || "Run removed before pipeline completion.",
-								status: "aborted",
-							});
-							break;
-						}
-
 						const stepResult: PipelineStepResult = {
 							runId: runState.id,
 							agent: runState.agent,
 							task: step.task,
-							output: finalized.rawOutput,
-							status: getFinalizedRunStatus(finalized),
+							output: runState.removed
+								? finalized.rawOutput || "Run removed before pipeline completion."
+								: finalized.rawOutput,
+							status: runState.removed ? "aborted" : getFinalizedRunStatus(finalized),
 						};
 						pipeline.stepResults.push(stepResult);
+						if (runState.removed || pipeline.abortRequested) {
+							terminalStatus = "aborted";
+							break;
+						}
 						previousOutput = finalized.rawOutput;
 						updateCommandRunsWidget(store);
 
@@ -2189,17 +2278,19 @@ export function createSubagentToolExecute(pi: ExtensionAPI, store: SubagentStore
 							content: formatPipelineSummary(pipelineId, pipeline.stepResults, terminalStatus),
 							display: true,
 							details: {
+								...asyncInvocationDetails(),
 								pipelineId,
 								stepRunIds: pipeline.stepRunIds,
 								status: terminalStatus === "completed" ? "done" : terminalStatus,
 								runSummaries: orderedRuns.map((run) => buildRunAnalyticsSummary(run)),
 							},
 						};
+						retainAsyncCompletion(message);
 						retireFinishedGroup(store, snapshotPipeline(pipeline, terminalStatus));
 						if (isInOriginSession(ctx, pipeline.originSessionFile)) {
 							pi.sendMessage(message, { deliverAs: "followUp", triggerTurn: true });
 							clearPendingGroupCompletion("chain", pipelineId);
-							for (const runId of pipeline.stepRunIds) cleanupRunAfterFinalDelivery(runId);
+							for (const runId of pipeline.stepRunIds) cleanupGroupRunAfterFinalDelivery(runId, pipelineId, "chain");
 							store.pipelines.delete(pipelineId);
 						} else {
 							pipeline.pendingCompletion = makePendingCompletion(message, true);
@@ -2243,5 +2334,20 @@ export function createSubagentToolExecute(pi: ExtensionAPI, store: SubagentStore
 		};
 	};
 
-	return execute;
+	return (...args: Parameters<typeof execute>) => {
+		const parsed = parseSubagentToolCommand(args[1].command, { knownRunIds: [...store.commandRuns.keys()] });
+		if (
+			parsed.type !== "params" ||
+			!["run", "continue", "batch", "chain"].includes(String(parsed.params.asyncAction ?? "run")) ||
+			!store.asyncTasks
+		)
+			return execute(...args);
+		return store.asyncTasks.invoke(
+			String(args[1].command).slice(0, 500),
+			args[0],
+			() => execute(...args),
+			false,
+			args[2],
+		);
+	};
 }

package/types.ts

@@ -177,7 +177,8 @@ export interface BatchGroupState {
 	abortedRunIds: Set<number>;
 	originSessionFile: string;
 	createdAt: number;
-	pendingResults: Map<number, string>;
+	/** Immutable member states captured as each batch run completes. */
+	completedRuns: Map<number, CommandRunState>;
 	pendingCompletion?: PendingCompletion;
 }
 
@@ -192,6 +193,8 @@ export interface PipelineStepResult {
 export interface PipelineState {
 	pipelineId: string;
 	currentIndex: number;
+	/** Set by `abort <pipelineId>` to prevent any subsequent step from launching. */
+	abortRequested: boolean;
 	stepRunIds: number[];
 	stepResults: PipelineStepResult[];
 	originSessionFile: string;