@ryan_nookpi/pi-extension-subagent 0.5.5 → 0.5.7

package/README.md

@@ -68,7 +68,7 @@ Run `/subagents`, `subagent agents`, or the `list-agents` tool to inspect discov
 
 ### Optional starter pack
 
-If no agents are found, `/subagents` can offer an optional, opinionated starter pack. It copies nine agent templates, two example workflow skills, and missing global `subagent` settings. Existing files and configured values are not overwritten.
+If no agents are found, `/subagents` can offer an optional, opinionated starter pack. It copies eight agent templates, two example workflow skills, and missing global `subagent` settings. Existing files and configured values are not overwritten.
 
 The starter pack is not required. Decline it if you prefer to define agents manually. It fills a missing `claudeRuntime` setting with `cli`; without that setting, the extension default is `sdk`.
 
@@ -98,9 +98,9 @@ subagent run <agent> [--main|--isolated] -- <task>
 subagent continue <runId> [--agent <agent>] [--main|--isolated] -- <task>
 subagent batch [--main|--isolated] --agent <agent> --task <task> ...
 subagent chain [--main|--isolated] --agent <agent> --task <task> ...
-subagent status <runId>
-subagent detail <runId>
-subagent abort <runId|runId,runId|all>
+subagent status <runId|groupId>
+subagent detail <runId|groupId>
+subagent abort <runId|groupId|runId,runId|all>
 subagent remove <runId|runId,runId|all>
 ```
 

package/cli.ts

@@ -64,7 +64,7 @@ export const SUBAGENT_CLI_HELP_TEXT = [
 	"    subagent chain [--main|--isolated] --agent <agent> --task <task> --agent <agent> --task <task> ...",
 	"",
 	"  Cleanup:",
-	"    subagent abort <runId|runId,runId|all>",
+	"    subagent abort <runId|groupId|runId,runId|all>",
 	"    subagent remove <runId|runId,runId|all>",
 	"",
 	"━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━",
@@ -88,6 +88,7 @@ export const SUBAGENT_CLI_HELP_TEXT = [
 	"    subagent status 22",
 	"    subagent detail 22",
 	"    subagent abort 22",
+	"    subagent abort p_1712...",
 	"    subagent remove all",
 	"",
 	"━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━",
@@ -508,8 +509,14 @@ export function parseSubagentToolCommand(
 			if (!target)
 				return {
 					type: "error",
-					message: `❌ ${verb} requires <runId|runId,runId|all>\n\n✓ Examples:\n  subagent ${verb} 22\n  subagent ${verb} 22,23,24\n  subagent ${verb} all`,
+					message:
+						verb === "abort"
+							? "❌ abort requires <runId|groupId|runId,runId|all>\n\n✓ Examples:\n  subagent abort 22\n  subagent abort p_1712_abcd\n  subagent abort 22,23,24\n  subagent abort all"
+							: "❌ remove requires <runId|runId,runId|all>\n\n✓ Examples:\n  subagent remove 22\n  subagent remove 22,23,24\n  subagent remove all",
 				};
+			if (verb === "abort" && isGroupId(target)) {
+				return { type: "params", params: { asyncAction: "abort", groupId: target } };
+			}
 			const parsedTarget = parseRunTarget(target, options.knownRunIds);
 			if ("error" in parsedTarget)
 				return {

package/failure-telemetry.ts

@@ -5,6 +5,7 @@ export type SubagentErrorClass =
 	| "overloaded"
 	| "rate_limit"
 	| "tool_error"
+	| "network_error"
 	| "aborted"
 	| "process_error"
 	| "unknown";
@@ -64,6 +65,9 @@ const TOOL_ERROR_PATTERNS = [
 	/invalid tool/i,
 ];
 
+const NETWORK_PATTERNS = [/\bwebsocket\b/i, /\bconnection error\b/i];
+const PROCESS_SIGNAL_TERMINATION_PATTERN = /\bprocess terminated by signal\b/i;
+
 export function classifySubagentFailure(input: FailureTelemetryInput): SubagentErrorClass | undefined {
 	if (!input.failed) return undefined;
 	const text = [input.errorMessage, input.stderr, input.output].filter(Boolean).join("\n");
@@ -73,6 +77,14 @@ export function classifySubagentFailure(input: FailureTelemetryInput): SubagentE
 	if (OVERLOADED_PATTERNS.some((pattern) => pattern.test(text))) return "overloaded";
 	if (RATE_LIMIT_PATTERNS.some((pattern) => pattern.test(text))) return "rate_limit";
 	if (TOOL_ERROR_PATTERNS.some((pattern) => pattern.test(text))) return "tool_error";
+	const signalTerminated = PROCESS_SIGNAL_TERMINATION_PATTERN.test(input.stderr ?? "");
+	if (
+		!signalTerminated &&
+		(NETWORK_PATTERNS.some((pattern) => pattern.test(text)) ||
+			/^terminated\.?$/i.test(input.errorMessage?.trim() ?? ""))
+	) {
+		return "network_error";
+	}
 	if ((input.exitCode ?? 0) !== 0) return "process_error";
 	return "unknown";
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ryan_nookpi/pi-extension-subagent",
-  "version": "0.5.5",
+  "version": "0.5.7",
   "description": "Asynchronous subagent delegation for pi with run, batch, chain, and continuation workflows.",
   "license": "MIT",
   "repository": {

package/retry.ts

@@ -34,9 +34,13 @@ function buildFailureText(result: SingleResult): string {
 		.join("\n");
 }
 
+const PROCESS_SIGNAL_TERMINATION_PATTERN = /\bprocess terminated by signal\b/i;
+
 const TRANSIENT_FAILURE_PATTERNS: RegExp[] = [
 	/\bnetwork\b/i,
+	/\bwebsocket\b/i,
 	/\bfetch failed\b/i,
+	/\bconnection error\b/i,
 	/\bconnection reset\b/i,
 	/\bsocket hang up\b/i,
 	/\btemporar(?:y|ily) unavailable\b/i,
@@ -70,12 +74,18 @@ function matchesTransientPattern(text: string): boolean {
 
 export function diagnoseRetryableResult(result: SingleResult): RetryDecision {
 	if (result.stopReason === "aborted") return { retryable: false };
+	if (PROCESS_SIGNAL_TERMINATION_PATTERN.test(result.stderr)) return { retryable: false };
 
 	const finalOutput = getFinalOutput(result.messages).trim();
 	if (result.exitCode === 0 && result.stopReason !== "error" && finalOutput) {
 		return { retryable: false };
 	}
 
+	const errorMessage = result.errorMessage?.trim();
+	if (errorMessage && /^terminated\.?$/i.test(errorMessage)) {
+		return { retryable: true, reason: errorMessage };
+	}
+
 	const failureText = buildFailureText(result);
 	if (!failureText) return { retryable: false };
 	if (!matchesTransientPattern(failureText)) return { retryable: false };

package/run-utils.ts

@@ -242,18 +242,18 @@ export function snapshotBatchGroup(
 	let failed = 0;
 	let aborted = 0;
 	const members: FinishedGroupMember[] = batch.runIds.map((runId) => {
-		const run = store.commandRuns.get(runId);
+		const run = batch.completedRuns.get(runId) ?? store.commandRuns.get(runId);
 		if (!run) {
 			if (batch.abortedRunIds.has(runId)) aborted++;
 			else if (batch.failedRunIds.has(runId)) failed++;
 			return {
 				summaryLine: `#${runId} [gone] (run no longer available)`,
-				output: batch.pendingResults.get(runId)?.trim() || "(no output)",
+				output: "(no output)",
 			};
 		}
 		if (run.errorClass === "aborted" || batch.abortedRunIds.has(runId)) aborted++;
 		else if (run.status === "error" || batch.failedRunIds.has(runId)) failed++;
-		return { summaryLine: formatCommandRunSummary(run), output: memberOutput(run, batch.pendingResults.get(runId)) };
+		return { summaryLine: formatCommandRunSummary(run), output: memberOutput(run) };
 	});
 	return {
 		groupId: batch.batchId,

package/starter-pack.ts

@@ -11,7 +11,6 @@ export const STARTER_AGENT_NAMES = [
 	"reviewer",
 	"searcher",
 	"security-auditor",
-	"simplifier",
 	"verifier",
 	"worker",
 ] as const;
@@ -220,7 +219,7 @@ export async function offerStarterPackIfEmpty(
 
 	const accepted = await ctx.ui.confirm(
 		"Install starter subagents?",
-		"No subagent definitions were found. Install 9 portable English agents, the stress-interview and self-healing skills, and missing subagent settings? Existing files and configured values will not be overwritten.",
+		"No subagent definitions were found. Install 8 portable English agents, the stress-interview and self-healing skills, and missing subagent settings? Existing files and configured values will not be overwritten.",
 	);
 	if (!accepted) return { status: "declined", discovery };
 

package/tool-execute.ts

@@ -49,6 +49,7 @@ import {
 import { clearPendingGroupCompletion, upsertPendingGroupCompletion } from "./group-pending.js";
 import { enqueueSubagentInvocation } from "./invocation-queue.js";
 import { appendDisplayTaskUpdate, getSessionFileSize } from "./persisted-session.js";
+import { invokeWithAutoRetry, MAX_SUBAGENT_AUTO_RETRIES } from "./retry.js";
 import {
 	clearFinishedRuns,
 	evictStaleFinishedGroups,
@@ -501,7 +502,13 @@ 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 }) {
@@ -1039,6 +1046,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;
@@ -1177,7 +1223,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;
@@ -1199,7 +1247,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"),
@@ -1207,6 +1261,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(", ")}.`);
@@ -1412,48 +1469,71 @@ 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;
 			const recordActivity = createRunActivityRecorder(pi, runState, (model) => resolveContextWindow(ctx, model));
-			return enqueueSubagentInvocation(async () => {
-				if (runState.removed || abortSignal?.aborted) throw new Error("Subagent was aborted");
-				return runSingleAgent(
-					ctx.cwd,
-					agents,
-					runState.agent,
-					taskForAgent,
-					runState.pipelineStepIndex,
-					abortSignal,
-					(partial) => {
-						if (runState.removed || store.disposed) return;
-						const current = partial.details?.results?.[0];
-						if (!current) return;
-						updateRunFromResult(runState, current);
-						recordActivity();
-						if (shouldRunAsync && !claudeCheckpointSent && runState.claudeSessionId) {
-							claudeCheckpointSent = true;
-							pi.sendMessage(buildRunStartMessage(runState, "started"), {
-								deliverAs: "followUp",
-								triggerTurn: false,
-							});
-						}
-						updateCommandRunsWidget(store);
-					},
-					(results) => makeDetails(mode, results),
-					{
-						sessionFile: runState.sessionFile,
-						resumeSessionId: runState.claudeSessionId,
-						sidecarSessionFile: runState.sessionFile,
-						persistedSessionBaseOffset: runState.persistedSessionBaseOffset,
-						onDiagnostic: createRunDiagnosticSink(pi, runState),
-					},
-				);
-			}).then((result) =>
-				runState.removed || abortSignal?.aborted
+			return invokeWithAutoRetry({
+				maxRetries: MAX_SUBAGENT_AUTO_RETRIES,
+				signal: abortSignal,
+				onRetryScheduled: ({ retryIndex, maxRetries, delayMs, reason }) => {
+					runState.retryCount = retryIndex;
+					runState.lastRetryReason = reason;
+					runState.lastActivityAt = Date.now();
+					runState.lastLine = `Auto-retrying ${retryIndex}/${maxRetries} in ${Math.ceil(delayMs / 1000)}s: ${reason}`;
+					runState.lastOutput = runState.lastLine;
+					updateCommandRunsWidget(store);
+				},
+				invoke: () => {
+					runState.persistedSessionBaseOffset = getSessionFileSize(runState.sessionFile);
+					return enqueueSubagentInvocation(async () => {
+						if (runState.removed || abortSignal?.aborted) throw new Error("Subagent was aborted");
+						return runSingleAgent(
+							ctx.cwd,
+							agents,
+							runState.agent,
+							taskForAgent,
+							runState.pipelineStepIndex,
+							abortSignal,
+							(partial) => {
+								if (runState.removed || store.disposed) return;
+								const current = partial.details?.results?.[0];
+								if (!current) return;
+								updateRunFromResult(runState, current);
+								recordActivity();
+								if (shouldRunAsync && !claudeCheckpointSent && runState.claudeSessionId) {
+									claudeCheckpointSent = true;
+									pi.sendMessage(buildRunStartMessage(runState, "started"), {
+										deliverAs: "followUp",
+										triggerTurn: false,
+									});
+								}
+								updateCommandRunsWidget(store);
+							},
+							(results) => makeDetails(mode, results),
+							{
+								sessionFile: runState.sessionFile,
+								resumeSessionId: runState.claudeSessionId,
+								sidecarSessionFile: runState.sessionFile,
+								persistedSessionBaseOffset: runState.persistedSessionBaseOffset,
+								onDiagnostic: createRunDiagnosticSink(pi, runState),
+							},
+						);
+					});
+				},
+			}).then(({ result, retryCount }) => {
+				runState.retryCount = retryCount;
+				return runState.removed || abortSignal?.aborted
 					? finalizeRunError(runState, new Error("Subagent was aborted"))
-					: finalizeRunState(runState, result),
-			);
+					: finalizeRunState(runState, result);
+			});
 		}
 
 		if (hasSingle) {
@@ -1717,7 +1797,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);
 
@@ -1733,11 +1813,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,
@@ -1746,7 +1828,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, {
@@ -1782,9 +1864,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 = {
@@ -1802,7 +1882,7 @@ export function createSubagentToolExecute(pi: ExtensionAPI, store: SubagentStore
 							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);
@@ -1836,9 +1916,7 @@ 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,
@@ -1855,7 +1933,7 @@ export function createSubagentToolExecute(pi: ExtensionAPI, store: SubagentStore
 							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);
@@ -1914,6 +1992,7 @@ export function createSubagentToolExecute(pi: ExtensionAPI, store: SubagentStore
 			store.pipelines.set(pipelineId, {
 				pipelineId,
 				currentIndex: 0,
+				abortRequested: false,
 				stepRunIds: [],
 				stepResults: [],
 				originSessionFile,
@@ -1935,6 +2014,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 =
@@ -1988,26 +2071,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);
 
@@ -2033,7 +2110,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, {
@@ -2065,6 +2142,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];
@@ -2117,26 +2198,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);
 
@@ -2182,7 +2257,7 @@ export function createSubagentToolExecute(pi: ExtensionAPI, store: SubagentStore
 						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);

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;

package/seeds/agents/simplifier.md

@@ -1,68 +0,0 @@
----
-name: simplifier
-description: Code simplification specialist that improves clarity while preserving behavior
-runtime: pi
-thinking: high
-tools: read,grep,find,ls,bash,edit,write
----
-
-<system_prompt agent="simplifier">
-  <identity>
-    You simplify recently modified code for clarity, consistency, and maintainability without changing observable behavior.
-  </identity>
-
-  <scope_rule>
-    <rule>Only simplify the requested or clearly identified changed scope.</rule>
-    <rule>Do not broaden into unrelated cleanup or architecture changes.</rule>
-    <rule>Preserve outputs, side effects, public contracts, and data flow.</rule>
-    <rule>Handle each supplied finding independently; one blocked item must not stop unrelated safe items.</rule>
-  </scope_rule>
-
-  <principles>
-    <rule>Prefer explicit, readable control flow over clever compression.</rule>
-    <rule>Reduce unnecessary nesting, indirection, and dead intermediates.</rule>
-    <rule>Keep abstractions that improve organization, testing, or reuse.</rule>
-    <rule>Follow existing repository patterns before introducing a new style.</rule>
-    <rule>Choose a no-op over churn when the code is already clear.</rule>
-  </principles>
-
-  <allowed_efficiency_changes>
-    <item>Parallelize operations only when independence and ordering are proven.</item>
-    <item>Add change-detection guards to avoid no-op updates.</item>
-    <item>Remove preflight existence checks when direct operation plus error handling is safer.</item>
-    <item>Use an existing batch API when it is behaviorally equivalent.</item>
-    <item>Narrow overly broad reads when equivalence is clear.</item>
-  </allowed_efficiency_changes>
-
-  <workflow>
-    <step index="1">Identify the exact file regions or enumerate supplied findings.</step>
-    <step index="2">Read surrounding code and any utility proposed for reuse.</step>
-    <step index="3">Choose the smallest behavior-preserving change for each item.</step>
-    <step index="4">Edit only the necessary files.</step>
-    <step index="5">Run targeted tests, type checking, linting, and build checks.</step>
-    <step index="6">Report each item as applied, skipped, or escalated.</step>
-  </workflow>
-
-  <rules>
-    <rule>Do not force a utility substitution when null handling or edge behavior differs.</rule>
-    <rule>Do not suppress type errors.</rule>
-    <rule>Escalate items that require behavior change or cross-module redesign.</rule>
-    <rule>Fix only issues introduced by the requested change.</rule>
-  </rules>
-
-  <output_template>
-    <![CDATA[
-### Applied
-- `path:start-end` — {change}
-
-### Skipped
-- {item} — {reason}
-
-### Escalate
-- {item} — {reason}
-
-### Residual Risk
-- {risk or none}
-    ]]>
-  </output_template>
-</system_prompt>