@ferris1225/pi-subagents 4.3.2 → 4.3.4

package/src/dispatch.ts

@@ -1,7 +1,7 @@
 /**
- * The `subagent` tool: dispatches the enabled agents (scout, artisan, steward,
- * plus custom roles) as isolated pi
- * child processes, single or parallel. Owns the public dispatch contract and
+ * The `subagent` tool: dispatches enabled scout, artisan, steward, sentinel,
+ * and custom roles as isolated pi child processes, single or parallel.
+ * Owns the public dispatch contract and
  * per-run status tracking. Stable thread generations, final integration, and
  * completion ownership live in thread-lifecycle.ts.
  */
@@ -11,7 +11,7 @@ import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { Text } from "@earendil-works/pi-tui";
 import { join, resolve } from "node:path";
 import { Type } from "typebox";
-import { discoverAgents, isWriteCapableAgent, resolveAgentTools, type AgentConfig } from "./agents.ts";
+import { discoverAgents, resolveAgentTools, type AgentConfig } from "./agents.ts";
 import { loadConfig } from "./config.ts";
 import { formatCompletionBlock, formatUsage, queuedResult } from "./format.ts";
 import {
@@ -39,6 +39,7 @@ import {
 } from "./spawn.ts";
 import {
 	createBackgroundDispatcher,
+	isWorktreeCapableAgent,
 	projectResultsRoot,
 	resolveDispatchModelRoute,
 	runInManagedRepositoryLane,
@@ -47,7 +48,7 @@ import {
 } from "./thread-lifecycle.ts";
 import type { IsolationMode } from "./worktree.ts";
 
-export { isWorktreeCapableAgent, runInManagedRepositoryLane } from "./thread-lifecycle.ts";
+export { isWorktreeCapableAgent, runInManagedRepositoryLane };
 
 const NON_BLANK_TASK_OPTIONS = { minLength: 1, pattern: "\\S" } as const;
 
@@ -88,7 +89,7 @@ const SubagentParams = Type.Object({
 
 /** Roles that default to worktree isolation in parallel dispatches even when
  * the live catalog cannot be consulted (render-only call sites). Custom
- * write-capable agents join them via isWriteCapableAgent on the execute path. */
+ * worktree-capable agents join them via the live catalog on the execute path. */
 const WORKTREE_DEFAULT_AGENTS = new Set(["artisan", "steward"]);
 
 /** Resolve the default isolation for a dispatch. Precedence: an explicit
@@ -467,7 +468,7 @@ export function registerSubagentTool(pi: ExtensionAPI, runtime: SubagentRuntime)
 							"parallel",
 							item.agent,
 							item.isolation as IsolationMode | undefined,
-							catalogAgent ? isWriteCapableAgent(catalogAgent) : undefined,
+							catalogAgent ? isWorktreeCapableAgent(catalogAgent) : undefined,
 							catalogAgent?.isolation,
 						),
 						{ deliveryRoute: params.wait ? "await" : "background" },
@@ -522,7 +523,7 @@ export function registerSubagentTool(pi: ExtensionAPI, runtime: SubagentRuntime)
 					"single",
 					params.agent as string,
 					params.isolation as IsolationMode | undefined,
-					singleCatalogAgent ? isWriteCapableAgent(singleCatalogAgent) : undefined,
+					singleCatalogAgent ? isWorktreeCapableAgent(singleCatalogAgent) : undefined,
 					singleCatalogAgent?.isolation,
 				),
 				{ deliveryRoute: params.wait ? "await" : "background" },

package/src/prompt.ts

@@ -34,8 +34,9 @@ function bullets(lines: readonly string[]): string {
 
 function phaseForAgent(agentName: string): string {
 	if (agentName === "scout") return "broad reconnaissance";
-	if (agentName === "artisan") return "implementation and targeted checks";
+	if (agentName === "artisan") return "primary change";
 	if (agentName === "steward") return "pre-commit cleanup and cross-cutting docs";
+	if (agentName === "sentinel") return "post-cleanup adversarial review";
 	return "delegated scope";
 }
 
@@ -104,16 +105,21 @@ export function buildDelegationDirective(
 	const hasScout = agents.some((agent) => agent.name === "scout");
 	const hasArtisan = agents.some((agent) => agent.name === "artisan");
 	const hasSteward = agents.some((agent) => agent.name === "steward");
+	const hasSentinel = agents.some((agent) => agent.name === "sentinel");
 
 	const dispatchRules = [
-		"Main owns routing, architecture, integration, the final gate, and release. Each child starts a paid context; delegate only when saved main-context work exceeds handoff cost.",
-		"Keep atomic lookups, focused edits, known answers, and context-heavy work in main. Cluster related reconnaissance into one scout brief.",
-		...(hasScout ? ["`scout`: broad or unfamiliar reconnaissance; return compact findings and decisive citations."] : []),
-		...(hasArtisan ? ["`artisan`: substantial self-contained implementation, including affected tests, docs, comments, and targeted checks."] : []),
-		...(hasSteward ? ["`steward`: one pre-commit cleanup or cross-cutting docs/comments pass for a completed broad or multi-writer change; keep small diff hygiene inline."] : []),
-		"One owner per phase; dependent phases wait. A launch leases that phase: main may inspect its result, citations, diff, and check output but must not rerun it.",
-		"Parallelize only independently justified, disjoint scopes. Brief goal, scope, constraints, and expected output; resume retained work with `subagent_control`.",
-		"Completions deliver automatically. Never poll, restate a result, or finish while a run is active.",
+		`Main owns routing, architecture, integration, the final gate, and release. Each child starts a paid context; delegate only when handoff saves more than it costs${hasSentinel ? ", except required sentinel review before commit" : ""}.`,
+		"Keep atomic lookups, focused edits, known answers, and context-heavy work in main. Cluster related reconnaissance into one scout brief, including external research.",
+		...(hasScout ? ["`scout`: read-only broad code mapping or external research; return file/source citations as leads, not proof."] : []),
+		...(hasArtisan ? ["`artisan`: one substantial primary change; own root cause, implementation, affected tests/docs, and targeted checks."] : []),
+		...(hasSteward ? ["`steward`: final cleanup/docs sync for a completed broad or multi-writer diff; keep focused hygiene inline."] : []),
+		...(hasSentinel ? ["`sentinel`: read-only post-cleanup review; use available matching skills, but never block on their absence; report only evidenced defects."] : []),
+		...(hasSentinel
+			? [`Before every commit: cleanup -> sentinel review. ${hasSteward ? "Use steward once only for broad or multi-writer diffs" : "Keep cleanup inline"}. Then dispatch sentinel on the final diff and check evidence. After review fixes, clean and review once more; findings block commit.`]
+			: []),
+		"One owner per phase; dependent phases wait. A launch leases that phase: main may inspect its result, citations, diff, and checks, not redo the phase; main still runs the final gate.",
+		"Parallelize only independent, disjoint scopes. Brief goal, paths, constraints, and expected output; resume with `subagent_control`.",
+		"`wait: true` only when the result is the immediate dependency; otherwise continue disjoint work. Never sleep or poll, and never finish while a run is active.",
 		"Inspect the integrated diff and actual check output. Never report an unrun check as passed.",
 	];