@ferris1225/pi-subagents 4.1.18 → 4.1.21

package/agents/worker.md

@@ -1,45 +1,43 @@
----
-name: worker
-description: Default implementation route for any non-trivial, well-scoped, self-contained code change — implement, fix, refactor, or test, then verify and hand off.
-model: claude-sonnet-4-5
-thinking: high
-# Primary implementation model: coding ability + tool use, quality balanced
-# against cost. No `tools` field => inherits all tools (full capability).
----
-
-You are a worker agent with full capabilities in an isolated context window. You own a delegated, self-contained task end to end so the main conversation stays clean. You have NOT got the caller's conversation history — the task brief is your source of truth.
-
-## Procedure
-
-1. **Context.** Read the brief fully. Read referenced files — and referenced images (screenshots, mockups) when the model supports vision — before editing. If critical context is missing, state what an `explorer` should retrieve rather than guessing.
-2. **Plan.** Inspect existing code and conventions first; form the smallest coherent root-cause change that satisfies the brief. Prefer the design that deletes complexity rather than rearranges it, and decompose rather than push a file toward ~1000 lines. For a large task, note files, order, and risks before editing. No unrelated refactors or standalone docs work unless the brief asks.
-3. **Implement.** Preserve the user's work; limit edits to the request plus required validation. Follow the project's error handling, naming, and style. Synchronize existing README/docs/examples/comments directly affected by your change; do not defer obvious drift.
-4. **Verify.** Run the project's format/build/tests when they exist (e.g. `tsc --noEmit`, the test runner). NEVER report an unrun check as passed — report it as unavailable or a pre-existing failure, with the exact error.
-5. **Handoff.** Return only the concrete outcome. Do not repeat the task brief, plan, root-cause investigation, or tool chronology; report only unresolved blockers and checks that remain failed.
-
-## Boundaries
-
-- Never commit, push, publish, tag, release, or bump a package version. The parent workflow owns the independent review gate and every release action — even when repository instructions normally automate release after green checks.
-- Children are leaf processes: you cannot dispatch sub-agents. When the brief needs broad discovery, state what an `explorer` should retrieve; do not guess.
-- When your brief carries reviewer findings, apply their fix instructions: implement each when it is sound; when it is wrong, out of scope, or a sounder fix exists, ship your fix and push back in your report — cite the finding, refute the instruction's reasoning, and describe what you shipped instead. A deviation without reasoning will be re-opened.
-- Do not ask the caller to duplicate downstream roles, and never treat your own verification as the final gate.
-
-## Output format
-
-## Completed
-
-What was done, in a few lines.
-
-## Files Changed
-
-- `path/to/file.ts` — what changed.
-
-## Verification
-
-Which checks you ACTUALLY ran and their result (e.g. `tsc --noEmit` clean; `vitest` 12 passed). State explicitly anything you could not run and why.
-
-## Notes (only when material)
-
-Unresolved blockers, rejected requirements, or decisions the caller must know. For a reviewer handoff: exact paths changed and the key functions/types touched. Omit when nothing actionable.
-
-Keep the final response comfortably below the 40-line delivery cap unless the result genuinely requires more. Root-cause fixes over patches; no unrelated churn; an unrun check is never a passed check.
+---
+name: worker
+description: Default route for any non-trivial, self-contained code change — implement, fix, refactor, or test, then verify and hand off.
+thinking: high
+# No `tools` field => inherits all tools (full capability).
+---
+
+You are a worker agent with full capabilities in an isolated context window. You own a delegated, self-contained task end to end so the main conversation stays clean. You have NOT got the caller's conversation history — the task brief is your source of truth.
+
+## Procedure
+
+1. **Context.** Read the brief fully. Read referenced files — and referenced images (screenshots, mockups) when the model supports vision — before editing. If critical context is missing, state what an `explorer` should retrieve rather than guessing.
+2. **Plan.** Inspect existing code and conventions first; form the smallest coherent root-cause change that satisfies the brief. Prefer the design that deletes complexity rather than rearranges it, and decompose rather than push a file toward ~1000 lines. For a large task, note files, order, and risks before editing. No unrelated refactors or standalone docs work unless the brief asks.
+3. **Implement.** Preserve the user's work; limit edits to the request plus required validation. Follow the project's error handling, naming, and style. Synchronize existing README/docs/examples/comments directly affected by your change; do not defer obvious drift.
+4. **Verify.** Run the project's format/build/tests when they exist (e.g. `tsc --noEmit`, the test runner). NEVER report an unrun check as passed — report it as unavailable or a pre-existing failure, with the exact error.
+5. **Handoff.** Return only the concrete outcome. Do not repeat the task brief, plan, root-cause investigation, or tool chronology; report only unresolved blockers and checks that remain failed.
+
+## Boundaries
+
+- Never commit, push, publish, tag, release, or bump a package version. The parent workflow owns the independent review gate and every release action — even when repository instructions normally automate release after green checks.
+- Children are leaf processes: you cannot dispatch sub-agents.
+- When your brief carries reviewer findings, apply their fix instructions: implement each when it is sound; when it is wrong, out of scope, or a sounder fix exists, ship your fix and push back in your report — cite the finding, refute the instruction's reasoning, and describe what you shipped instead. A deviation without reasoning will be re-opened.
+- Do not ask the caller to duplicate downstream roles, and never treat your own verification as the final gate.
+
+## Output format
+
+## Completed
+
+What was done, in a few lines.
+
+## Files Changed
+
+- `path/to/file.ts` — what changed.
+
+## Verification
+
+Which checks you ACTUALLY ran and their result (e.g. `tsc --noEmit` clean; `vitest` 12 passed). State explicitly anything you could not run and why.
+
+## Notes (only when material)
+
+Unresolved blockers, rejected requirements, or decisions the caller must know. For a reviewer handoff: exact paths changed and the key functions/types touched. Omit when nothing actionable.
+
+Keep the final response comfortably below the 40-line delivery cap unless the result genuinely requires more.

package/package.json

@@ -1,55 +1,55 @@
-{
-  "name": "@ferris1225/pi-subagents",
-  "version": "4.1.18",
-  "description": "A managed sub-agent team for pi: specialized roles, pre-commit documentation sync, retained threads, auto-fix chains, model fallback, and Git worktree isolation.",
-  "type": "module",
-  "license": "MIT",
-  "publishConfig": {
-    "access": "public"
-  },
-  "keywords": [
-    "pi-package",
-    "pi-extension",
-    "subagent",
-    "sub-agent",
-    "delegation",
-    "code-cleanup",
-    "dead-code"
-  ],
-  "files": [
-    "src",
-    "agents",
-    "README.md",
-    "LICENSE"
-  ],
-  "pi": {
-    "extensions": [
-      "./src/index.ts"
-    ]
-  },
-  "scripts": {
-    "check": "tsc --noEmit",
-    "test": "vitest run tests",
-    "prepack": "npm run check && npm test"
-  },
-  "peerDependencies": {
-    "@earendil-works/pi-agent-core": ">=0.84.4",
-    "@earendil-works/pi-ai": ">=0.84.4",
-    "@earendil-works/pi-coding-agent": ">=0.84.4",
-    "@earendil-works/pi-tui": ">=0.84.4",
-    "typebox": "*"
-  },
-  "devDependencies": {
-    "@earendil-works/pi-agent-core": "^0.84.4",
-    "@earendil-works/pi-ai": "^0.84.4",
-    "@earendil-works/pi-coding-agent": "^0.84.4",
-    "@earendil-works/pi-tui": "^0.84.4",
-    "@types/node": "^22.10.0",
-    "typebox": "^1.3.9",
-    "typescript": "^5.9.0",
-    "vitest": "^4.1.0"
-  },
-  "engines": {
-    "node": ">=22.19.0"
-  }
-}
+{
+  "name": "@ferris1225/pi-subagents",
+  "version": "4.1.21",
+  "description": "A managed sub-agent team for pi: specialized roles, pre-commit documentation sync, retained threads, auto-fix chains, model fallback, and Git worktree isolation.",
+  "type": "module",
+  "license": "MIT",
+  "publishConfig": {
+    "access": "public"
+  },
+  "keywords": [
+    "pi-package",
+    "pi-extension",
+    "subagent",
+    "sub-agent",
+    "delegation",
+    "code-cleanup",
+    "dead-code"
+  ],
+  "files": [
+    "src",
+    "agents",
+    "README.md",
+    "LICENSE"
+  ],
+  "pi": {
+    "extensions": [
+      "./src/index.ts"
+    ]
+  },
+  "scripts": {
+    "check": "tsc --noEmit",
+    "test": "vitest run tests",
+    "prepack": "npm run check && npm test"
+  },
+  "peerDependencies": {
+    "@earendil-works/pi-agent-core": ">=0.84.4",
+    "@earendil-works/pi-ai": ">=0.84.4",
+    "@earendil-works/pi-coding-agent": ">=0.84.4",
+    "@earendil-works/pi-tui": ">=0.84.4",
+    "typebox": "*"
+  },
+  "devDependencies": {
+    "@earendil-works/pi-agent-core": "^0.84.4",
+    "@earendil-works/pi-ai": "^0.84.4",
+    "@earendil-works/pi-coding-agent": "^0.84.4",
+    "@earendil-works/pi-tui": "^0.84.4",
+    "@types/node": "^22.10.0",
+    "typebox": "^1.3.9",
+    "typescript": "^5.9.0",
+    "vitest": "^4.1.0"
+  },
+  "engines": {
+    "node": ">=22.19.0"
+  }
+}

package/src/agents.ts

@@ -16,6 +16,7 @@ import { dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
 import { CONFIG_DIR_NAME, getAgentDir, parseFrontmatter } from "@earendil-works/pi-coding-agent";
 import { THINKING_LEVEL_VALUES, type AgentScope, type ThinkingLevel } from "./config.ts";
+import type { IsolationMode } from "./worktree.ts";
 
 export type AgentSource = "builtin" | "user" | "project";
 
@@ -23,21 +24,27 @@ export interface AgentConfig {
 	name: string;
 	description: string;
 	tools?: string[];
+	/** Model ref this run was routed to; filled in by dispatch, never declared by the agent file. */
 	model?: string;
 	/** Per-agent default thinking strength (frontmatter `thinking`); config override wins. */
 	thinking?: ThinkingLevel;
+	/** Role-declared default isolation (frontmatter `isolation`); an explicit
+	 * per-call request wins, and `worktree` applies to write-capable roles only. */
+	isolation?: IsolationMode;
 	systemPrompt: string;
 	source: AgentSource;
 	filePath: string;
 }
 
 const SHELL_TOOL_NAMES = new Set(["bash", "powershell"]);
+/** The shell that actually fits the host: PowerShell on Windows, Bash elsewhere.
+ * Only used to break a tie when the parent has both enabled — a parent running a
+ * single shell is followed as configured, whatever it is. */
+const NATIVE_SHELL_TOOL = process.platform === "win32" ? "powershell" : "bash";
 const PI_BUILTIN_TOOL_NAMES = new Set(["read", "bash", "powershell", "edit", "write", "grep", "find", "ls"]);
 export const SUBAGENT_TOOL_NAMES = [
 	"subagent",
 	"subagent_control",
-	"subagent_wait",
-	"subagent_status",
 	"subagent_stop",
 ] as const;
 const SUBAGENT_TOOL_NAME_SET = new Set<string>(SUBAGENT_TOOL_NAMES);
@@ -45,7 +52,13 @@ const SUBAGENT_TOOL_NAME_SET = new Set<string>(SUBAGENT_TOOL_NAMES);
 /** Resolve every child against the parent's live tool selection. Roles without
  * an allowlist inherit the complete active set. Explicit lists keep only their
  * declared Pi built-ins, adapt an existing shell slot, and gain active extension/
- * SDK tools. pi-subagents controls are always removed so children stay leaves. */
+ * SDK tools. pi-subagents controls are always removed so children stay leaves.
+ *
+ * A declared shell is one slot, so it resolves to one shell: the parent's, and
+ * the host-native one when the parent runs both. A child never inherits a shell
+ * the parent does not have — Pi's `--tools` allowlist overrides the child's own
+ * `defaultTools` setting, so naming a shell the user disabled would hand it a
+ * terminal they deliberately turned off. */
 export function resolveAgentTools(
 	agent: AgentConfig,
 	activeToolNames: readonly string[],
@@ -53,7 +66,10 @@ export function resolveAgentTools(
 	const active = [...new Set(activeToolNames)].filter((tool) => !SUBAGENT_TOOL_NAME_SET.has(tool));
 	if (!agent.tools) return { ...agent, tools: active };
 
-	const activeShellTools = active.filter((tool) => SHELL_TOOL_NAMES.has(tool));
+	const parentShellTools = active.filter((tool) => SHELL_TOOL_NAMES.has(tool));
+	const activeShellTools = parentShellTools.length > 1 && parentShellTools.includes(NATIVE_SHELL_TOOL)
+		? [NATIVE_SHELL_TOOL]
+		: parentShellTools;
 	const tools: string[] = [];
 	let shellAdapted = false;
 	for (const tool of agent.tools) {
@@ -133,13 +149,17 @@ function loadAgentsFromDir(dir: string, source: AgentSource): AgentConfig[] {
 		const thinking = (THINKING_LEVEL_VALUES as readonly string[]).includes(rawThinking ?? "")
 			? (rawThinking as ThinkingLevel)
 			: undefined;
+		const rawIsolation = str(frontmatter.isolation)?.trim();
+		const isolation = rawIsolation === "worktree" || rawIsolation === "shared"
+			? (rawIsolation as IsolationMode)
+			: undefined;
 
 		agents.push({
 			name,
 			description,
 			tools: tools && tools.length > 0 ? tools : undefined,
-			model: str(frontmatter.model),
 			...(thinking ? { thinking } : {}),
+			...(isolation ? { isolation } : {}),
 			systemPrompt: body,
 			source,
 			filePath,

package/src/announcements.ts

@@ -1,75 +1,78 @@
-/** Session-start recovery, stale-config migration, and widget installation. */
-
-import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
-import { existsSync } from "node:fs";
-import { loadConfig, saveConfig } from "./config.ts";
-import { availableModelsInScope, filterUnavailableModelOverrides } from "./models.ts";
-import { announceRecoveryRecords } from "./recovery.ts";
-import type { SubagentRuntime } from "./runtime.ts";
-import { installActiveRunsWidget } from "./widget.ts";
-
-/**
- * One-time-per-stale-override migration: keep agent model selections Pi still
- * reports as available, drop the rest back to dynamic main-model routing, and
- * tell the user what was removed. Saving the cleaned config is what makes it
- * one-time — the dropped refs no longer exist to re-trigger the notice.
- */
-async function migrateUnavailableAgentModels(
-	ctx: { ui: { notify: (message: string, kind: "info" | "warning" | "error") => void } } & Parameters<typeof availableModelsInScope>[0],
-	runtime: SubagentRuntime,
-): Promise<void> {
-	try {
-		const config = await loadConfig(runtime.configPath);
-		const overrides = Object.entries(config.agentModels);
-		if (overrides.length === 0) return;
-		const { kept, dropped } = filterUnavailableModelOverrides(config.agentModels, availableModelsInScope(ctx));
-		if (dropped.length === 0) return;
-		await saveConfig({ ...config, agentModels: kept }, runtime.configPath);
-		const list = dropped.map(({ agent, ref }) => `${agent}: ${ref}`).join(", ");
-		ctx.ui.notify(
-			`pi-subagents: removed stale agent model overrides that are no longer available (${list}). Those agents now follow the current main model; run /subagents-setup to re-pick.`,
-			"warning",
-		);
-	} catch {
-		/* migration failures are non-fatal */
-	}
-}
-
-export function registerAnnouncements(pi: ExtensionAPI, runtime: SubagentRuntime): void {
-	pi.on("session_start", async (_event, ctx) => {
-		if (!existsSync(runtime.configPath)) {
-			ctx.ui.notify(
-				"pi-subagents: no configuration yet — run /subagents-setup to pick agents, models, and thinking strengths. Defaults (all five agents on the main model) apply until then.",
-				"info",
-			);
-		}
-		await announceRecoveryRecords(runtime.configPath, ctx);
-		await migrateUnavailableAgentModels(ctx, runtime);
-		if (!runtime.restoredNotified && runtime.restoredRunIds.length > 0) {
-			runtime.restoredNotified = true;
-			const ids = runtime.restoredRunIds.map((id) => `#${id}`).join(", ");
-			ctx.ui.notify(
-				`pi-subagents: restored ${runtime.restoredRunIds.length} interrupted thread${runtime.restoredRunIds.length === 1 ? "" : "s"} from the previous session (${ids}). subagent_status lists them; subagent_control resume continues one.`,
-				"info",
-			);
-		}
-		if (ctx.mode !== "tui") return;
-		installActiveRunsWidget(ctx);
-	});
-
-	// Compaction failures are otherwise silent in long orchestration sessions
-	// where subagent results accumulate; aborted (user-cancelled) compactions
-	// are deliberate and not worth a notice.
-	pi.on("session_compact_failed", async (event, ctx) => {
-		if (event.aborted && !event.errorMessage) return;
-		const detail = event.errorMessage ? `: ${event.errorMessage}` : "";
-		if (event.willRetry) {
-			ctx.ui.notify(`pi-subagents: session compaction failed${detail} — retrying automatically.`, "warning");
-			return;
-		}
-		ctx.ui.notify(
-			`pi-subagents: session compaction failed${detail}. Long threads may hit context limits soon; run /compact to retry or trim old results.`,
-			"error",
-		);
-	});
-}
+/** Session-start recovery, stale-config migration, and widget installation. */
+
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import { existsSync } from "node:fs";
+import { loadConfig, saveConfig } from "./config.ts";
+import { availableModelsInScope, filterUnavailableModelOverrides } from "./models.ts";
+import { announceRecoveryRecords } from "./recovery.ts";
+import type { SubagentRuntime } from "./runtime.ts";
+import { installActiveRunsWidget } from "./widget.ts";
+
+/**
+ * One-time-per-stale-override migration: keep agent model selections Pi still
+ * reports as available, drop the rest back to dynamic main-model routing, and
+ * tell the user what was removed. Saving the cleaned config is what makes it
+ * one-time — the dropped refs no longer exist to re-trigger the notice.
+ */
+async function migrateUnavailableAgentModels(
+	ctx: { ui: { notify: (message: string, kind: "info" | "warning" | "error") => void } } & Parameters<typeof availableModelsInScope>[0],
+	runtime: SubagentRuntime,
+): Promise<void> {
+	try {
+		const config = await loadConfig(runtime.configPath);
+		const overrides = Object.entries(config.agentModels);
+		if (overrides.length === 0) return;
+		const { kept, dropped } = filterUnavailableModelOverrides(config.agentModels, availableModelsInScope(ctx));
+		if (dropped.length === 0) return;
+		await saveConfig({ ...config, agentModels: kept }, runtime.configPath);
+		const list = dropped.map(({ agent, ref }) => `${agent}: ${ref}`).join(", ");
+		ctx.ui.notify(
+			`pi-subagents: removed stale agent model overrides that are no longer available (${list}). Those agents now follow the current main model; run /subagents-setup to re-pick.`,
+			"warning",
+		);
+	} catch {
+		/* migration failures are non-fatal */
+	}
+}
+
+export function registerAnnouncements(pi: ExtensionAPI, runtime: SubagentRuntime): void {
+	pi.on("session_start", async (_event, ctx) => {
+		if (!existsSync(runtime.configPath)) {
+			ctx.ui.notify(
+				"pi-subagents: no configuration yet — run /subagents-setup to pick agents, models, and thinking strengths. Defaults (all built-in agents on the main model) apply until then.",
+				"info",
+			);
+		}
+		await announceRecoveryRecords(runtime.configPath, ctx);
+		await migrateUnavailableAgentModels(ctx, runtime);
+		// Restore starts at extension load and session_start fires right behind
+		// it, so without this the notice reports whatever the race left behind.
+		await runtime.durableRestore;
+		if (!runtime.restoredNotified && runtime.restoredRunIds.length > 0) {
+			runtime.restoredNotified = true;
+			const ids = runtime.restoredRunIds.map((id) => `#${id}`).join(", ");
+			ctx.ui.notify(
+				`pi-subagents: restored ${runtime.restoredRunIds.length} interrupted thread${runtime.restoredRunIds.length === 1 ? "" : "s"} (${ids}) with retained context. subagent_control resume continues one.`,
+				"info",
+			);
+		}
+		if (ctx.mode !== "tui") return;
+		installActiveRunsWidget(ctx);
+	});
+
+	// Compaction failures are otherwise silent in long orchestration sessions
+	// where subagent results accumulate; aborted (user-cancelled) compactions
+	// are deliberate and not worth a notice.
+	pi.on("session_compact_failed", async (event, ctx) => {
+		if (event.aborted && !event.errorMessage) return;
+		const detail = event.errorMessage ? `: ${event.errorMessage}` : "";
+		if (event.willRetry) {
+			ctx.ui.notify(`pi-subagents: session compaction failed${detail} — retrying automatically.`, "warning");
+			return;
+		}
+		ctx.ui.notify(
+			`pi-subagents: session compaction failed${detail}. Long threads may hit context limits soon; run /compact to retry or trim old results.`,
+			"error",
+		);
+	});
+}

package/src/background.ts

@@ -86,6 +86,17 @@ export class BackgroundTaskQueue {
 		return this.concurrency;
 	}
 
+	/** Tasks still waiting for a free slot (never started). */
+	get pendingCount(): number {
+		return this.pending.length;
+	}
+
+	/** Tasks currently holding a slot. Suspended tasks (lane waits, managed
+	 * workflow continuations) hold none and are excluded. */
+	get activeCount(): number {
+		return this.active.size;
+	}
+
 	/** Stop counting a running task toward the concurrency limit. Its body keeps
 	 * running under the same abort signal; completion still releases everything
 	 * waitForTask/waitForIdle promise. Frees a slot for queued work immediately.

package/src/completion.ts

@@ -8,7 +8,7 @@
  */
 
 import { getResultOutput, isFailedResult, reviewVerdict, type SingleResult } from "./spawn.ts";
-import { formatUsageCompact, sumUsage } from "./monitor.ts";
+import { formatUsageCompact, sumUsage, type RunWaitReason } from "./monitor.ts";
 import type { UsageStats } from "./rpc-run.ts";
 
 export interface CompletionBatchTimings {
@@ -139,9 +139,22 @@ export interface ActiveRunFoot {
 	agent: string;
 	/** Optional content label (task-derived) shown next to the agent name. */
 	label?: string;
-	/** True when the run is waiting for a free process slot rather than
-	 * executing; stated so pacing is never mistaken for a stall. */
-	queued?: boolean;
+	/** Why a not-yet-executing run is waiting. Stated precisely so a repository
+	 * lane wait or a starting child is never mistaken for an exhausted pool. */
+	wait?: RunWaitReason;
+}
+
+function activeRunWaitTag(wait: RunWaitReason | undefined): string {
+	switch (wait) {
+		case "process-slot":
+			return " (queued, starts when a process slot frees)";
+		case "repository-lane":
+			return " (waiting for the repository write lane, not for a slot)";
+		case "starting":
+			return " (starting)";
+		default:
+			return "";
+	}
 }
 
 /**
@@ -156,11 +169,8 @@ export function formatActiveRunsFooter(runs: readonly ActiveRunFoot[], maxListed
 	if (runs.length === 0) return "";
 	const listed = runs.slice(0, maxListed);
 	const items = listed
-		.map((run) => {
-			const tagged = run.queued ? " (queued, starts when a slot frees)" : "";
-			return `#${run.id} ${run.agent}${run.label ? `·${run.label}` : ""}${tagged}`;
-		})
+		.map((run) => `#${run.id} ${run.agent}${run.label ? `·${run.label}` : ""}${activeRunWaitTag(run.wait)}`)
 		.join(", ");
 	const more = runs.length > listed.length ? `, +${runs.length - listed.length} more` : "";
-	return `\n\n⚠ ${runs.length} other run${runs.length === 1 ? "" : "s"} still active: ${items}${more}. Do not conclude the overall task yet — wait for their results (they wake you automatically) or check subagent_status.`;
+	return `\n\n⚠ ${runs.length} other run${runs.length === 1 ? "" : "s"} still active: ${items}${more}. Do not conclude the overall task yet — their results wake you automatically.`;
 }

package/src/config.ts

@@ -13,10 +13,10 @@ import { dirname, join } from "node:path";
 import { getAgentDir, withFileMutationQueue } from "@earendil-works/pi-coding-agent";
 
 /** Full catalog of agents shipped with the package (selectable in /subagents-setup). */
-export const BUILTIN_AGENT_NAMES = ["explorer", "worker", "cleaner", "documenter", "reviewer"] as const;
+export const BUILTIN_AGENT_NAMES = ["explorer", "worker", "cleaner", "documenter", "synthesizer", "reviewer"] as const;
 
 /** Agents enabled out of the box on a fresh install. */
-export const DEFAULT_ENABLED_AGENTS: readonly string[] = ["explorer", "worker", "cleaner", "documenter", "reviewer"];
+export const DEFAULT_ENABLED_AGENTS: readonly string[] = [...BUILTIN_AGENT_NAMES];
 
 export const AGENT_SCOPE_VALUES = ["user", "project", "both"] as const;
 export type AgentScope = (typeof AGENT_SCOPE_VALUES)[number];
@@ -45,7 +45,7 @@ export const DEFAULT_IDLE_TIMEOUT_SEC = 90;
 export const IDLE_TIMEOUT_SEC_LIMIT = 600;
 
 export interface SubagentsConfig {
-	/** Agent names that are discoverable and injected. Fresh-install default: explorer, worker, cleaner, reviewer. */
+	/** Agent names that are discoverable and injected. Fresh-install default: every built-in agent. */
 	enabledAgents: string[];
 	/** Per-agent model override, keyed by agent name, as "provider/model-id". */
 	agentModels: Record<string, string>;
@@ -62,8 +62,6 @@ export interface SubagentsConfig {
 	 * is included in the message. Default: 80.
 	 */
 	maxResultLines: number;
-	/** Whether to inject the delegation directive into the parent system prompt. Default: true. */
-	proactiveInjection: boolean;
 	/** Which agent directories to discover from. Default: "user". */
 	agentScope: AgentScope;
 	/**
@@ -80,7 +78,6 @@ export const DEFAULT_CONFIG: SubagentsConfig = {
 	agentThinkingLevels: {},
 	notifyOnReviewPass: false,
 	maxResultLines: DEFAULT_MAX_RESULT_LINES,
-	proactiveInjection: true,
 	agentScope: "user",
 	idleTimeoutSec: DEFAULT_IDLE_TIMEOUT_SEC,
 };
@@ -155,10 +152,6 @@ export function normalizeConfig(raw: unknown): SubagentsConfig {
 	const maxResultLines = clampCount(raw.maxResultLines, MAX_RESULT_LINES_LIMIT);
 	if (maxResultLines !== undefined) config.maxResultLines = maxResultLines;
 
-	if (typeof raw.proactiveInjection === "boolean") {
-		config.proactiveInjection = raw.proactiveInjection;
-	}
-
 	if (isAgentScope(raw.agentScope)) {
 		config.agentScope = raw.agentScope;
 	}