pi-herdr-agents 1.2.1 → 1.2.3

package/CHANGELOG.md

@@ -7,11 +7,26 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
-## [v1.2.1](https://github.com/giuseppecrj/pi-herdr-agents/compare/v1.2.0...v1.2.1)
+## [v1.2.3](https://github.com/giuseppecrj/pi-herdr-agents/compare/v1.2.2...v1.2.3)
+
+### Commits
+
+- fix: shorten worktree labels [`4caeabb`](https://github.com/giuseppecrj/pi-herdr-agents/commit/4caeabb4db088b8c60d0caf701ec49fe538f8df2)
+- docs: add release workflow skill [`9937f34`](https://github.com/giuseppecrj/pi-herdr-agents/commit/9937f3402ab672023525c19a50dee3cbd7d579bb)
+
+## [v1.2.2](https://github.com/giuseppecrj/pi-herdr-agents/compare/v1.2.1...v1.2.2) - 2026-08-18
+
+### Commits
+
+- fix: hide completion tool from auto-exit children [`e4cad6b`](https://github.com/giuseppecrj/pi-herdr-agents/commit/e4cad6bdbe5d1952f5bb838640493c20ab332dbd)
+- chore: release v1.2.2 [`ab7843b`](https://github.com/giuseppecrj/pi-herdr-agents/commit/ab7843b4919574789029c985f27509b968242b05)
+
+## [v1.2.1](https://github.com/giuseppecrj/pi-herdr-agents/compare/v1.2.0...v1.2.1) - 2026-08-13
 
 ### Commits
 
 - docs: polish package readme and artwork [`908dd76`](https://github.com/giuseppecrj/pi-herdr-agents/commit/908dd76875c91871b8d91113e6d1633d5112d5b3)
+- chore: release v1.2.1 [`df87f12`](https://github.com/giuseppecrj/pi-herdr-agents/commit/df87f126ec5cad4735c441752471aa8bd724f2e9)
 
 ## [v1.2.0](https://github.com/giuseppecrj/pi-herdr-agents/compare/v1.1.0...v1.2.0) - 2026-08-13
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-herdr-agents",
-  "version": "1.2.1",
+  "version": "1.2.3",
   "description": "Asynchronous Pi subagents and approved review workflows in Herdr, with optional isolated Git worktrees",
   "keywords": [
     "pi-package",

package/pi-extension/subagents/index.ts

@@ -117,6 +117,7 @@ import {
 	persistWorktreeResult,
 	runSubagentScript,
 	writeWorktreeManifest,
+	buildSubagentToolAllowlist,
 	type WorktreeHandoff,
 	type WorktreeLaunch,
 } from "./launch.ts";
@@ -231,8 +232,7 @@ const SubagentParams = Type.Object({
 		Type.Object({
 			branch: Type.String({
 				minLength: 1,
-				description:
-					"New branch name for an isolated Herdr-managed Git worktree",
+				description: "New branch name for an isolated Herdr-managed Git worktree",
 			}),
 			base: Type.Optional(
 				Type.String({
@@ -360,7 +360,7 @@ function getFrontmatterValue(
 }
 
 function parseOptionalBoolean(value: string | undefined): boolean | undefined {
-	return value != null ? value === "true" : undefined;
+	return value == null ? undefined : value === "true";
 }
 
 function parseSessionMode(
@@ -400,12 +400,8 @@ function parseAgentDefinition(
 			getFrontmatterValue(frontmatter, "skill"),
 		thinking: thinking && isThinkingLevel(thinking) ? thinking : undefined,
 		denyTools: getFrontmatterValue(frontmatter, "deny-tools"),
-		spawning: parseOptionalBoolean(
-			getFrontmatterValue(frontmatter, "spawning"),
-		),
-		autoExit: parseOptionalBoolean(
-			getFrontmatterValue(frontmatter, "auto-exit"),
-		),
+		spawning: parseOptionalBoolean(getFrontmatterValue(frontmatter, "spawning")),
+		autoExit: parseOptionalBoolean(getFrontmatterValue(frontmatter, "auto-exit")),
 		interactive: parseOptionalBoolean(
 			getFrontmatterValue(frontmatter, "interactive"),
 		),
@@ -461,8 +457,7 @@ function findPackageMetadata(path: string): {
 				const pkg = JSON.parse(readFileSync(packagePath, "utf8"));
 				return {
 					provider: typeof pkg.name === "string" ? pkg.name : undefined,
-					providerVersion:
-						typeof pkg.version === "string" ? pkg.version : undefined,
+					providerVersion: typeof pkg.version === "string" ? pkg.version : undefined,
 				};
 			} catch {
 				return {};
@@ -489,8 +484,7 @@ function discoverRolePackPaths(pi?: Pick<ExtensionAPI, "events">): {
 				if (typeof path !== "string" || !isAbsolute(path)) {
 					diagnostics.push({
 						code: "invalid-role-pack-path",
-						message:
-							"Role packs must register an absolute file or directory path.",
+						message: "Role packs must register an absolute file or directory path.",
 					});
 					return;
 				}
@@ -527,8 +521,7 @@ function discoverAgentCatalog(pi?: Pick<ExtensionAPI, "events">): AgentCatalog {
 				continue;
 			}
 			const parsed = parseAgentDefinition(content, fallbackName);
-			if (parsed)
-				agents.set(parsed.name, { ...parsed, source, path: filePath });
+			if (parsed) agents.set(parsed.name, { ...parsed, source, path: filePath });
 		}
 	};
 
@@ -1029,9 +1022,9 @@ function resolveResultPresentation(
 			`subagent or resume the session with subagent_resume.`;
 	} else {
 		body =
-			result.exitCode !== 0
-				? `Sub-agent "${name}" failed (exit code ${result.exitCode}).\n\n${result.summary}`
-				: `Sub-agent "${name}" completed (${formatElapsed(result.elapsed)}).\n\n${result.summary}`;
+			result.exitCode === 0
+				? `Sub-agent "${name}" completed (${formatElapsed(result.elapsed)}).\n\n${result.summary}`
+				: `Sub-agent "${name}" failed (exit code ${result.exitCode}).\n\n${result.summary}`;
 	}
 
 	if (result.fallbackAttempts && result.fallbackAttempts.length > 1) {
@@ -1404,32 +1397,6 @@ function updateWidget() {
  * first positional message so that /skill: args land in messages[1..] and arrive
  * as standalone prompts in the child session.
  */
-const SUBAGENT_CONTROL_TOOLS = ["caller_ping", "subagent_done"] as const;
-
-/**
- * Build the child --tools allowlist.
- *
- * Pi 0.70+ applies --tools to built-in, extension, and custom tools. If a
- * subagent definition restricts tools to e.g. "read,bash,write", the child
- * control tools from subagent-done.ts would otherwise be hidden, leaving a
- * manually resumed or user-touched subagent unable to call subagent_done.
- */
-function buildSubagentToolAllowlist(effectiveTools?: string): string | null {
-	const requested = (effectiveTools ?? "")
-		.split(",")
-		.map((tool) => tool.trim())
-		.filter(Boolean);
-
-	if (requested.length === 0) return null;
-
-	const allow = new Set(requested);
-	for (const tool of SUBAGENT_CONTROL_TOOLS) {
-		allow.add(tool);
-	}
-
-	return [...allow].join(",");
-}
-
 function buildPiPromptArgs(params: {
 	effectiveSkills?: string;
 	taskDelivery: "direct" | "artifact";
@@ -1488,15 +1455,13 @@ function ensureLifecycle(running: RunningSubagent): SubagentLifecycle {
 					turnActive: state.phase === "active",
 					providerActive: false,
 					toolActive: state.activeScope === "tool",
-					...(state.activeScope
-						? { activeScope: state.activeScope as any }
-						: {}),
-					...(state.activeSinceMs != null
-						? { activeSince: state.activeSinceMs }
-						: {}),
-					...(state.waitingSinceMs != null
-						? { waitingSince: state.waitingSinceMs }
-						: {}),
+					...(state.activeScope ? { activeScope: state.activeScope as any } : {}),
+					...(state.activeSinceMs == null
+						? {}
+						: { activeSince: state.activeSinceMs }),
+					...(state.waitingSinceMs == null
+						? {}
+						: { waitingSince: state.waitingSinceMs }),
 					...(state.activityLabel && state.activeScope === "tool"
 						? { toolName: state.activityLabel }
 						: {}),
@@ -1692,10 +1657,7 @@ function startStatusRefresh(pi: ExtensionAPI) {
 			pi.sendMessage(
 				{
 					customType: "subagent_status",
-					content: formatStatusAggregate(
-						transitionLines,
-						statusConfig.lineLimit,
-					),
+					content: formatStatusAggregate(transitionLines, statusConfig.lineLimit),
 					display: true,
 					details: { lines: capped.visibleLines, overflow: capped.overflow },
 				},
@@ -1965,9 +1927,7 @@ function resolveSubagentRuntimePlans(
 		wrapPiModelRegistry(ctx.modelRegistry),
 	);
 	if (params.worktree && plans.length > 1) {
-		throw new Error(
-			"Model fallbacks are not supported for worktree subagents.",
-		);
+		throw new Error("Model fallbacks are not supported for worktree subagents.");
 	}
 	return plans;
 }
@@ -2050,9 +2010,9 @@ async function watchSubagent(
 						? observed.thinking
 						: undefined;
 				const mismatch =
-					observedModel !== running.runtimePlan.model
-						? `Resolved model ${running.runtimePlan.model} but child reported ${observedModel}`
-						: undefined;
+					observedModel === running.runtimePlan.model
+						? undefined
+						: `Resolved model ${running.runtimePlan.model} but child reported ${observedModel}`;
 				running.runtimePlan = {
 					...running.runtimePlan,
 					...(observedThinking ? { thinking: observedThinking } : {}),
@@ -2067,15 +2027,15 @@ async function watchSubagent(
 				findLastAssistantMessage(allEntries) ??
 				(result.errorMessage
 					? `Subagent error: ${result.errorMessage}`
-					: result.exitCode !== 0
-						? `Sub-agent exited with code ${result.exitCode}`
-						: "Sub-agent exited without output");
+					: result.exitCode === 0
+						? "Sub-agent exited without output"
+						: `Sub-agent exited with code ${result.exitCode}`);
 		} else {
 			summary = result.errorMessage
 				? `Subagent error: ${result.errorMessage}`
-				: result.exitCode !== 0
-					? `Sub-agent exited with code ${result.exitCode}`
-					: "Sub-agent exited without output";
+				: result.exitCode === 0
+					? "Sub-agent exited without output"
+					: `Sub-agent exited with code ${result.exitCode}`;
 		}
 
 		const worktreeHandoff = finalizeSubagentSurface(
@@ -2383,11 +2343,7 @@ export default function subagentsExtension(pi: ExtensionAPI) {
 			);
 		}
 		const id = `workflow-${candidate.runId}-${Math.random().toString(16).slice(2, 10)}`;
-		const sessionFile = join(
-			dirname(candidate.path),
-			"sessions",
-			`${id}.jsonl`,
-		);
+		const sessionFile = join(dirname(candidate.path), "sessions", `${id}.jsonl`);
 		let surface: string | undefined;
 		let launched = false;
 		const childController = new AbortController();
@@ -2497,10 +2453,7 @@ export default function subagentsExtension(pi: ExtensionAPI) {
 			if (childController.signal.aborted)
 				return workflowFailure("cancelled", "Workflow cancelled.");
 			const message = error instanceof Error ? error.message : String(error);
-			return workflowFailure(
-				launched ? "child_error" : "launch_error",
-				message,
-			);
+			return workflowFailure(launched ? "child_error" : "launch_error", message);
 		} finally {
 			owner.controller.signal.removeEventListener("abort", onOwnerAbort);
 			owner.children.delete(id);
@@ -2525,7 +2478,7 @@ export default function subagentsExtension(pi: ExtensionAPI) {
 		const envelope = {
 			runId: candidate.runId,
 			state: outcome.state,
-			...(outcome.result !== undefined ? { result: outcome.result } : {}),
+			...(outcome.result === undefined ? {} : { result: outcome.result }),
 			...(outcome.error ? { error: outcome.error } : {}),
 			...(checkoutResult ? { checkout: checkoutResult } : {}),
 		};
@@ -2567,9 +2520,7 @@ export default function subagentsExtension(pi: ExtensionAPI) {
 	) => {
 		if (!claimWorkflowTerminal(owner.gate, outcome)) {
 			return (
-				owner.gate.outcome ??
-				runtime.workflowOutcomes.get(owner.runId) ??
-				outcome
+				owner.gate.outcome ?? runtime.workflowOutcomes.get(owner.runId) ?? outcome
 			);
 		}
 		runtime.workflowOutcomes.set(owner.runId, outcome);
@@ -2848,7 +2799,8 @@ export default function subagentsExtension(pi: ExtensionAPI) {
 							content: [
 								{
 									type: "text",
-									text: "Error: start pi with a persistent session before preparing a workflow.",
+									text:
+										"Error: start pi with a persistent session before preparing a workflow.",
 								},
 							],
 							details: { error: "workflow_persistent_session_required" },
@@ -2863,9 +2815,7 @@ export default function subagentsExtension(pi: ExtensionAPI) {
 						});
 						runtime.pendingWorkflow = candidate;
 						return {
-							content: [
-								{ type: "text", text: formatApprovalPacket(candidate) },
-							],
+							content: [{ type: "text", text: formatApprovalPacket(candidate) }],
 							details: {
 								runId: candidate.runId,
 								scriptHash: candidate.scriptHash,
@@ -3003,13 +2953,9 @@ export default function subagentsExtension(pi: ExtensionAPI) {
 					}
 					try {
 						const root = realpathSync(
-							execFileSync(
-								"git",
-								["-C", ctx.cwd, "rev-parse", "--show-toplevel"],
-								{
-									encoding: "utf8",
-								},
-							).trim(),
+							execFileSync("git", ["-C", ctx.cwd, "rev-parse", "--show-toplevel"], {
+								encoding: "utf8",
+							}).trim(),
 						);
 						const commonDir = realpathSync(
 							execFileSync(
@@ -3032,7 +2978,8 @@ export default function subagentsExtension(pi: ExtensionAPI) {
 								content: [
 									{
 										type: "text",
-										text: "Error: workflow cancellation must use the approved repository identity.",
+										text:
+											"Error: workflow cancellation must use the approved repository identity.",
 									},
 								],
 								details: { error: "workflow_cancel_identity_mismatch" },
@@ -3064,9 +3011,7 @@ export default function subagentsExtension(pi: ExtensionAPI) {
 					};
 				}
 				return {
-					content: [
-						{ type: "text", text: "Error: unsupported workflow action." },
-					],
+					content: [{ type: "text", text: "Error: unsupported workflow action." }],
 					details: { error: "workflow_action_unavailable" },
 				};
 			},
@@ -3139,7 +3084,8 @@ export default function subagentsExtension(pi: ExtensionAPI) {
 						content: [
 							{
 								type: "text",
-								text: "Error: no session file. Start pi with a persistent session to use subagents.",
+								text:
+									"Error: no session file. Start pi with a persistent session to use subagents.",
 							},
 						],
 						details: { error: "no session file" },
@@ -3157,9 +3103,7 @@ export default function subagentsExtension(pi: ExtensionAPI) {
 					parentThinking !== "xhigh" &&
 					parentThinking !== "max"
 				) {
-					throw new Error(
-						`Unsupported parent thinking level: ${parentThinking}`,
-					);
+					throw new Error(`Unsupported parent thinking level: ${parentThinking}`);
 				}
 				const runtimePlans = resolveSubagentRuntimePlans(
 					params,
@@ -3252,9 +3196,7 @@ export default function subagentsExtension(pi: ExtensionAPI) {
 							exitCode: result.exitCode,
 							elapsed: result.elapsed,
 							sessionFile: result.sessionFile,
-							...(result.errorMessage
-								? { errorMessage: result.errorMessage }
-								: {}),
+							...(result.errorMessage ? { errorMessage: result.errorMessage } : {}),
 							...(result.fallbackAttempts
 								? { fallbackAttempts: result.fallbackAttempts }
 								: {}),
@@ -3301,9 +3243,7 @@ export default function subagentsExtension(pi: ExtensionAPI) {
 								(running.worktree
 									? ` in worktree ${running.worktree.path} on branch ${running.worktree.branch}. `
 									: ". ") +
-								(worktreeLaunchWarning
-									? `Warning: ${worktreeLaunchWarning} `
-									: "") +
+								(worktreeLaunchWarning ? `Warning: ${worktreeLaunchWarning} ` : "") +
 								`Do NOT generate or assume any results — you have no idea what the sub-agent will do or produce. ` +
 								`The results will be delivered to you automatically as a steer message when the sub-agent finishes. ` +
 								`Until then, move on to other work or tell the user you're waiting.`,
@@ -3320,9 +3260,7 @@ export default function subagentsExtension(pi: ExtensionAPI) {
 						thinking: running.runtimePlan?.thinking,
 						runtimePlan: running.runtimePlan,
 						...(running.worktree ? { worktree: running.worktree } : {}),
-						...(worktreeLaunchWarning
-							? { warning: worktreeLaunchWarning }
-							: {}),
+						...(worktreeLaunchWarning ? { warning: worktreeLaunchWarning } : {}),
 						status: "started",
 					},
 				};
@@ -3334,8 +3272,7 @@ export default function subagentsExtension(pi: ExtensionAPI) {
 					typeof partialArgs.name === "string" && partialArgs.name
 						? partialArgs.name
 						: "(unnamed)";
-				const task =
-					typeof partialArgs.task === "string" ? partialArgs.task : "";
+				const task = typeof partialArgs.task === "string" ? partialArgs.task : "";
 				const agent =
 					typeof partialArgs.agent === "string" && partialArgs.agent
 						? theme.fg("dim", ` (${partialArgs.agent})`)
@@ -3344,9 +3281,7 @@ export default function subagentsExtension(pi: ExtensionAPI) {
 					typeof partialArgs.cwd === "string" && partialArgs.cwd
 						? theme.fg("dim", ` in ${partialArgs.cwd}`)
 						: "";
-				const worktree = partialArgs.worktree as
-					| { branch?: unknown }
-					| undefined;
+				const worktree = partialArgs.worktree as { branch?: unknown } | undefined;
 				const worktreeHint =
 					typeof worktree?.branch === "string"
 						? theme.fg("dim", ` on ${worktree.branch} (worktree)`)
@@ -3362,8 +3297,7 @@ export default function subagentsExtension(pi: ExtensionAPI) {
 				// LLM generates tool arguments, so args.task grows token by token.
 				// We keep it compact here — Ctrl+O on renderResult expands the full content.
 				if (task) {
-					const firstLine =
-						task.split("\n").find((l: string) => l.trim()) ?? "";
+					const firstLine = task.split("\n").find((l: string) => l.trim()) ?? "";
 					const preview =
 						firstLine.length > 100 ? firstLine.slice(0, 100) + "…" : firstLine;
 					if (preview) {
@@ -3502,21 +3436,13 @@ export default function subagentsExtension(pi: ExtensionAPI) {
 				const agents = details?.agents ?? [];
 				const diagnostics = details?.diagnostics ?? [];
 				if (agents.length === 0 && diagnostics.length === 0) {
-					return new Text(
-						theme.fg("dim", "No subagent definitions found."),
-						0,
-						0,
-					);
+					return new Text(theme.fg("dim", "No subagent definitions found."), 0, 0);
 				}
 				const lines = agents.map((a: any) => {
 					const source =
-						a.source === "package" && a.provider
-							? `package:${a.provider}`
-							: a.source;
+						a.source === "package" && a.provider ? `package:${a.provider}` : a.source;
 					const badge = theme.fg("accent", ` (${source})`);
-					const desc = a.description
-						? theme.fg("dim", ` — ${a.description}`)
-						: "";
+					const desc = a.description ? theme.fg("dim", ` — ${a.description}`) : "";
 					const model = a.model ? theme.fg("dim", ` [${a.model}]`) : "";
 					return `  ${theme.fg("toolTitle", theme.bold(a.name))}${badge}${model}${desc}`;
 				});
@@ -3673,17 +3599,14 @@ export default function subagentsExtension(pi: ExtensionAPI) {
 							return;
 						}
 
-						const allEntries = getNewEntries(
-							params.sessionPath,
-							entryCountBefore,
-						);
+						const allEntries = getNewEntries(params.sessionPath, entryCountBefore);
 						const summary =
 							findLastAssistantMessage(allEntries) ??
 							(result.errorMessage
 								? `Subagent error: ${result.errorMessage}`
-								: result.exitCode !== 0
-									? `Resumed session exited with code ${result.exitCode}`
-									: "Resumed session exited without new output");
+								: result.exitCode === 0
+									? "Resumed session exited without new output"
+									: `Resumed session exited with code ${result.exitCode}`);
 						const presentation = resolveResultPresentation(
 							{ ...result, summary, sessionFile: params.sessionPath },
 							name,
@@ -3696,12 +3619,8 @@ export default function subagentsExtension(pi: ExtensionAPI) {
 							exitCode: result.exitCode,
 							elapsed: result.elapsed,
 							sessionFile: params.sessionPath,
-							...(result.errorMessage
-								? { errorMessage: result.errorMessage }
-								: {}),
-							...(running.runtimePlan
-								? { runtimePlan: running.runtimePlan }
-								: {}),
+							...(result.errorMessage ? { errorMessage: result.errorMessage } : {}),
+							...(running.runtimePlan ? { runtimePlan: running.runtimePlan } : {}),
 						});
 					})
 					.catch((err) => {
@@ -3872,10 +3791,7 @@ export default function subagentsExtension(pi: ExtensionAPI) {
 
 			const branch = parts.shift();
 			if (!branch || branch === "list") {
-				ctx.ui.notify(
-					"Usage: /worktree <name> [task] | /worktree list",
-					"warning",
-				);
+				ctx.ui.notify("Usage: /worktree <name> [task] | /worktree list", "warning");
 				return;
 			}
 			if (!isTerminalAvailable()) {
@@ -3911,7 +3827,7 @@ export default function subagentsExtension(pi: ExtensionAPI) {
 				);
 				const result = await launchPiWorktreeHandoff({
 					kind: "fresh",
-					name: `Worktree: ${branch}`,
+					name: `wt: ${branch}`,
 					task,
 					cwd: ctx.cwd,
 					worktree: { branch },
@@ -3976,10 +3892,7 @@ export default function subagentsExtension(pi: ExtensionAPI) {
 					...formatVisibleAgentDefinitions(catalog.agents),
 					...formatAgentDiagnostics(catalog.diagnostics),
 				];
-				ctx.ui.notify(
-					lines.join("\n") || "No subagent definitions found.",
-					"info",
-				);
+				ctx.ui.notify(lines.join("\n") || "No subagent definitions found.", "info");
 				return;
 			}
 			if (!trimmed) {
@@ -4029,7 +3942,7 @@ export default function subagentsExtension(pi: ExtensionAPI) {
 					typeof details.errorMessage === "string" ? details.errorMessage : "";
 				const failed = exitCode !== 0 || !!errorMessage;
 				const elapsed =
-					details.elapsed != null ? formatElapsed(details.elapsed) : "?";
+					details.elapsed == null ? "?" : formatElapsed(details.elapsed);
 				const bgFn = failed
 					? (text: string) => theme.bg("toolErrorBg", text)
 					: (text: string) => theme.bg("toolSuccessBg", text);
@@ -4055,10 +3968,7 @@ export default function subagentsExtension(pi: ExtensionAPI) {
 				const summary = rawContent
 					.replace(/\n\nSession: .+\nResume: .+$/, "")
 					.replace(`Sub-agent "${name}" completed (${elapsed}).\n\n`, "")
-					.replace(
-						`Sub-agent "${name}" failed (exit code ${exitCode}).\n\n`,
-						"",
-					)
+					.replace(`Sub-agent "${name}" failed (exit code ${exitCode}).\n\n`, "")
 					.replace(
 						new RegExp(
 							`^Sub-agent "${name.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}" failed after ${elapsed} \\(provider/agent error — auto-retry exhausted\\)\\.\\n\\n`,
@@ -4078,9 +3988,7 @@ export default function subagentsExtension(pi: ExtensionAPI) {
 					}
 					if (details.sessionFile) {
 						contentLines.push("");
-						contentLines.push(
-							theme.fg("dim", `Session: ${details.sessionFile}`),
-						);
+						contentLines.push(theme.fg("dim", `Session: ${details.sessionFile}`));
 						contentLines.push(
 							theme.fg("dim", `Resume:  pi --session ${details.sessionFile}`),
 						);
@@ -4094,9 +4002,7 @@ export default function subagentsExtension(pi: ExtensionAPI) {
 						}
 						const totalLines = summary.split("\n").length;
 						if (totalLines > 5) {
-							contentLines.push(
-								theme.fg("muted", `… ${totalLines - 5} more lines`),
-							);
+							contentLines.push(theme.fg("muted", `… ${totalLines - 5} more lines`));
 						}
 					}
 					contentLines.push(
@@ -4116,8 +4022,7 @@ export default function subagentsExtension(pi: ExtensionAPI) {
 	pi.registerMessageRenderer("subagent_status", (message, options, theme) => {
 		const details = message.details as any;
 		const lines = Array.isArray(details?.lines) ? details.lines : [];
-		const overflow =
-			typeof details?.overflow === "number" ? details.overflow : 0;
+		const overflow = typeof details?.overflow === "number" ? details.overflow : 0;
 		if (lines.length === 0 && overflow === 0) return undefined;
 
 		return {
@@ -4173,9 +4078,7 @@ export default function subagentsExtension(pi: ExtensionAPI) {
 					contentLines.push(details.message ?? "");
 					if (details.sessionFile) {
 						contentLines.push("");
-						contentLines.push(
-							theme.fg("dim", `Session: ${details.sessionFile}`),
-						);
+						contentLines.push(theme.fg("dim", `Session: ${details.sessionFile}`));
 					}
 				} else {
 					const preview = (details.message ?? "")

package/pi-extension/subagents/launch.ts

@@ -28,7 +28,6 @@ import {
 	type HerdrWorktreeSurface,
 } from "./terminal.ts";
 
-const SUBAGENT_CONTROL_TOOLS = ["caller_ping", "subagent_done"] as const;
 const SUBAGENTS_DIR = dirname(fileURLToPath(import.meta.url));
 
 type SubagentSessionMode = "standalone" | "lineage-only" | "fork";
@@ -550,7 +549,10 @@ function buildPiCommand(
 			shellQuote(artifacts.systemPromptFile),
 		);
 	}
-	const toolAllowlist = buildToolAllowlist(request.behavior.tools);
+	const toolAllowlist = buildSubagentToolAllowlist(
+		request.behavior.tools,
+		request.behavior.autoExit,
+	);
 	if (toolAllowlist) parts.push("--tools", shellQuote(toolAllowlist));
 	if (!request.handoff) {
 		for (const prompt of buildPromptArgs(
@@ -579,7 +581,9 @@ function buildPiCommand(
 		env.push(`PI_SUBAGENT_NAME=${shellQuote(request.name)}`);
 		if (request.agent)
 			env.push(`PI_SUBAGENT_AGENT=${shellQuote(request.agent)}`);
-		if (request.behavior.autoExit) env.push("PI_SUBAGENT_AUTO_EXIT=1");
+		env.push(
+			`PI_SUBAGENT_AUTO_EXIT=${request.behavior.autoExit ? "1" : "0"}`,
+		);
 		env.push(`PI_SUBAGENT_SESSION=${shellQuote(artifacts.sessionFile)}`);
 		env.push(`PI_SUBAGENT_ID=${shellQuote(resolved.id)}`);
 		env.push(`PI_SUBAGENT_ACTIVITY_FILE=${shellQuote(artifacts.activityFile)}`);
@@ -678,7 +682,7 @@ async function launchResumedPiSubagent(
 		`PI_SUBAGENT_SESSION=${shellQuote(request.sessionFile)}`,
 		`PI_SUBAGENT_ID=${shellQuote(id)}`,
 		`PI_SUBAGENT_ACTIVITY_FILE=${shellQuote(activityFile)}`,
-		...(autoExit ? ["PI_SUBAGENT_AUTO_EXIT=1"] : []),
+		`PI_SUBAGENT_AUTO_EXIT=${autoExit ? "1" : "0"}`,
 	];
 	const command = [
 		...env,
@@ -722,14 +726,19 @@ async function launchResumedPiSubagent(
 	};
 }
 
-function buildToolAllowlist(tools?: string): string | null {
+export function buildSubagentToolAllowlist(
+	tools?: string,
+	autoExit = false,
+): string | null {
 	const requested = (tools ?? "")
 		.split(",")
 		.map((tool) => tool.trim())
 		.filter(Boolean);
 	if (requested.length === 0) return null;
 	const allow = new Set(requested);
-	for (const tool of SUBAGENT_CONTROL_TOOLS) allow.add(tool);
+	allow.delete("subagent_done");
+	allow.add("caller_ping");
+	if (!autoExit) allow.add("subagent_done");
 	return [...allow].join(",");
 }
 

package/pi-extension/subagents/subagent-done.ts

@@ -1,7 +1,7 @@
 /**
  * Extension loaded into sub-agents.
  * - Shows agent identity + available tools as a styled widget above the editor (toggle with Ctrl+J)
- * - Provides a `subagent_done` tool for autonomous agents to self-terminate
+ * - Provides a `subagent_done` tool for interactive agents to self-terminate
  */
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { Box, Text } from "@earendil-works/pi-tui";
@@ -302,6 +302,8 @@ export default function (pi: ExtensionAPI) {
     },
   });
 
+  if (autoExit) return;
+
   pi.registerTool({
     name: "subagent_done",
     label: "Subagent Done",