ultimate-pi 0.10.1 → 0.12.0

package/.pi/extensions/lib/plan-approval/schema.ts

@@ -13,6 +13,21 @@ export const ApprovePlanParamsSchema = Type.Object({
 			description: "Short summary shown above the plan body.",
 		}),
 	),
+	research_brief: Type.Optional(
+		Type.Object(
+			{
+				decomposition: Type.Optional(
+					Type.Union([Type.Object({}), Type.Null()]),
+				),
+				hypothesis: Type.Optional(Type.Union([Type.Object({}), Type.Null()])),
+				eval: Type.Optional(Type.Union([Type.Object({}), Type.Null()])),
+			},
+			{
+				description:
+					"Optional Darwin research: decomposition, hypothesis, eval (plan-review.md only).",
+			},
+		),
+	),
 	options: Type.Optional(
 		Type.Array(
 			Type.Union([
@@ -30,7 +45,7 @@ export const ApprovePlanParamsSchema = Type.Object({
 });
 
 export const PROMPT_SNIPPET =
-	"approve_plan({ plan_packet: { ...PlanPacket fields... }, human_summary?: string })";
+	"approve_plan({ plan_packet: { ...PlanPacket fields... }, human_summary?: string, research_brief?: { decomposition, hypothesis, eval } })";
 
 export const PROMPT_GUIDELINES = [
 	"Call approve_plan once with the complete plan_packet when ready for user approval.",

package/.pi/extensions/lib/plan-approval/types.ts

@@ -7,9 +7,23 @@ export const DEFAULT_PLAN_APPROVAL_OPTIONS = [
 	"Cancel",
 ] as const;
 
+/** Optional Darwin research artifacts from /harness-plan (research-brief.yaml, not in plan-packet). */
+export interface PlanResearchBrief {
+	decomposition?: Record<string, unknown> | null;
+	hypothesis?: Record<string, unknown> | null;
+	eval?: Record<string, unknown> | null;
+	stack?: Record<string, unknown> | null;
+	debate?: {
+		rounds?: Record<string, unknown>[];
+		hypothesis_validations?: Record<string, unknown>[];
+	} | null;
+	dag_validation?: Record<string, unknown> | null;
+}
+
 export interface ApprovePlanParams {
 	plan_packet: PlanPacketLike;
 	human_summary?: string;
+	research_brief?: PlanResearchBrief | null;
 	options?: Array<string | { title: string; description?: string }>;
 	displayMode?: "overlay" | "inline";
 }
@@ -17,6 +31,7 @@ export interface ApprovePlanParams {
 export interface ValidatedApprovePlanParams {
 	plan_packet: PlanPacketLike;
 	human_summary?: string;
+	research_brief?: PlanResearchBrief | null;
 	options: { title: string; description?: string }[];
 	displayMode: "overlay" | "inline";
 }
@@ -24,6 +39,7 @@ export interface ValidatedApprovePlanParams {
 export interface ApprovePlanToolDetails {
 	plan_packet: PlanPacketLike;
 	human_summary?: string;
+	research_brief?: PlanResearchBrief | null;
 	options: string[];
 	response: AskResponse | null;
 	cancelled: boolean;

package/.pi/extensions/lib/plan-approval/validate.ts

@@ -34,6 +34,7 @@ export function validateApprovePlanParams(
 	return {
 		plan_packet: packet as PlanPacketLike,
 		human_summary: params.human_summary?.trim() || undefined,
+		research_brief: params.research_brief ?? undefined,
 		options,
 		displayMode: params.displayMode ?? "overlay",
 	};
@@ -47,6 +48,7 @@ export function toApprovePlanToolDetails(
 	return {
 		plan_packet: validated.plan_packet,
 		human_summary: validated.human_summary,
+		research_brief: validated.research_brief ?? null,
 		options: validated.options.map((o) => o.title),
 		response,
 		cancelled,

package/.pi/extensions/lib/plan-debate-envelope.ts

@@ -0,0 +1,84 @@
+/**
+ * Plan Review Gate — convert integrator YAML to debate bus round JSON.
+ */
+
+import type { DebateParticipant } from "../../lib/debate-orchestrator-types.js";
+
+export interface PlanReviewRoundDraft {
+	schema_version: string;
+	round_index: number;
+	debate_round_focus?: string;
+	round_summary?: string;
+	validation_summary?: string;
+	adversary_summary?: string;
+	disputes?: string[];
+	recommended_packet_patches?: Array<{ path: string; value: unknown }>;
+	review_gate_ready?: boolean;
+	participants?: DebateParticipant[];
+	claims?: string[];
+	rebuttals?: string[];
+	evidence_refs?: string[];
+	token_usage?: {
+		per_agent: Record<string, number>;
+		round_total: number;
+	};
+	consensus_delta?: number;
+	severity_scores?: {
+		correctness: number;
+		security: number;
+		architecture: number;
+		test_integrity: number;
+	};
+}
+
+export function buildPlanReviewRoundEnvelope(
+	draft: PlanReviewRoundDraft,
+	opts: { runId: string; debateId: string },
+): {
+	protocol: "pi-debate-bus/v1";
+	kind: "round";
+	correlation: {
+		run_id: string;
+		debate_id: string;
+		round_index: number;
+		sender: DebateParticipant;
+	};
+	payload: {
+		participants: DebateParticipant[];
+		claims: string[];
+		rebuttals: string[];
+		evidence_refs: string[];
+		token_usage: { per_agent: Record<string, number>; round_total: number };
+		consensus_delta: number;
+		severity_scores?: PlanReviewRoundDraft["severity_scores"];
+	};
+} {
+	const participants = (draft.participants ?? [
+		"PlanEvaluatorAgent",
+		"PlanAdversaryAgent",
+		"ReviewIntegratorAgent",
+	]) as DebateParticipant[];
+
+	return {
+		protocol: "pi-debate-bus/v1",
+		kind: "round",
+		correlation: {
+			run_id: opts.runId,
+			debate_id: opts.debateId,
+			round_index: draft.round_index,
+			sender: "ReviewIntegratorAgent",
+		},
+		payload: {
+			participants,
+			claims: draft.claims ?? [draft.round_summary ?? "review round"],
+			rebuttals: draft.rebuttals ?? draft.disputes ?? [],
+			evidence_refs: draft.evidence_refs ?? [],
+			token_usage: draft.token_usage ?? {
+				per_agent: { ReviewIntegratorAgent: 0 },
+				round_total: 0,
+			},
+			consensus_delta: draft.consensus_delta ?? 0,
+			severity_scores: draft.severity_scores,
+		},
+	};
+}

package/.pi/extensions/lib/{harness-subagents/spawn-policy.ts → spawn-policy.ts}

@@ -7,10 +7,10 @@ export const SUBAGENT_BLOCKED_TOOLS = new Set([
 	"get_subagent_result",
 	"steer_subagent",
 	"blackboard",
+	"subagent",
 ]);
 
 const ASK_USER_ALLOWED_AGENT_TYPES = new Set([
-	"harness/planner",
 	"harness/evaluator",
 	"harness/adversary",
 	"harness/tie-breaker",
@@ -42,12 +42,9 @@ export function evaluateSubagentToolCall(
 		};
 	}
 	if (toolName === "approve_plan" || toolName === "create_plan") {
-		if (agentType === "harness/planner") {
-			return { action: "allow" };
-		}
 		return {
 			action: "block",
-			reason: `Tool "${toolName}" is only available for harness/planner.`,
+			reason: `Tool "${toolName}" is only available in the parent harness orchestrator session.`,
 		};
 	}
 	return { action: "allow" };

package/.pi/extensions/policy-gate.ts

@@ -243,7 +243,7 @@ export default function policyGate(pi: ExtensionAPI) {
 
 		const planPhaseHint =
 			state.phase === "plan"
-				? "\nPlan phase: present the full PlanPacket in chat, call ask_user (Approve / Request changes / Cancel), then write only the canonical plan-packet.json after Approve."
+				? "\nPlan phase: scouts → decompose → hypothesis → stack-researcher → execution-plan-author → validate-plan-dag → 4-round plan debate → approve_plan → create_plan (YAML plan-packet.yaml). Post-execute: /harness-critic."
 				: "";
 
 		return {

package/.pi/extensions/review-integrity.ts

@@ -1,9 +1,8 @@
 /**
  * review-integrity — enforce evaluator/adversary isolation from executor session.
  *
- * Parent orchestrators spawn review agents in isolated subagent sessions.
- * Direct review tools in the executor session are blocked; Agent/get_subagent_result
- * for harness review agents remain allowed.
+ * Parent orchestrators spawn review agents in isolated subprocesses via `subagent`.
+ * Direct review tools in the executor session are blocked.
  */
 
 import { appendFile, mkdir } from "node:fs/promises";
@@ -15,12 +14,6 @@ type HarnessPhase = "plan" | "execute" | "evaluate" | "adversary" | "merge";
 const INCIDENTS_DIR = join(process.cwd(), ".pi", "harness", "incidents");
 const INCIDENT_FILE = join(INCIDENTS_DIR, "review-integrity.jsonl");
 
-const ORCHESTRATION_TOOLS = new Set([
-	"Agent",
-	"get_subagent_result",
-	"steer_subagent",
-]);
-
 const REVIEW_SUBAGENT_TYPES = new Set([
 	"harness/evaluator",
 	"harness/adversary",
@@ -104,15 +97,45 @@ function restoreState(ctx: {
 	};
 }
 
-function subagentTypeFromInput(
+function agentsFromSubagentInput(
 	input: Record<string, unknown> | undefined,
-): string {
-	if (!input) return "";
-	const direct = input.subagent_type;
-	if (typeof direct === "string") return direct;
-	const nested = input as { subagentType?: string };
-	if (typeof nested.subagentType === "string") return nested.subagentType;
-	return "";
+): string[] {
+	if (!input) return [];
+	const names: string[] = [];
+	if (typeof input.agent === "string") names.push(input.agent);
+	const tasks = input.tasks;
+	if (Array.isArray(tasks)) {
+		for (const t of tasks) {
+			if (
+				t &&
+				typeof t === "object" &&
+				typeof (t as { agent?: string }).agent === "string"
+			) {
+				names.push((t as { agent: string }).agent);
+			}
+		}
+	}
+	const chain = input.chain;
+	if (Array.isArray(chain)) {
+		for (const c of chain) {
+			if (
+				c &&
+				typeof c === "object" &&
+				typeof (c as { agent?: string }).agent === "string"
+			) {
+				names.push((c as { agent: string }).agent);
+			}
+		}
+	}
+	const agg = input.aggregator;
+	if (
+		agg &&
+		typeof agg === "object" &&
+		typeof (agg as { agent?: string }).agent === "string"
+	) {
+		names.push((agg as { agent: string }).agent);
+	}
+	return names;
 }
 
 async function appendIncident(payload: Record<string, unknown>): Promise<void> {
@@ -178,26 +201,26 @@ export default function reviewIntegrity(pi: ExtensionAPI) {
 				customType: "harness-review-integrity-hint",
 				display: true,
 				content: [
-					"Review phase in executor session: spawn harness/evaluator or harness/adversary via Agent (isolated subagent context).",
-					"Do not run review checks directly in this session — use get_subagent_result after spawn.",
+					"Review phase in executor session: spawn harness/evaluator or harness/adversary via subagent (isolated subprocess).",
+					"Do not run review checks directly in this session.",
 				].join("\n"),
 			},
 		};
 	});
 
 	pi.on("tool_call", async (event, ctx) => {
-		if (event.toolName === "Agent") {
-			const subagentType = subagentTypeFromInput(
+		if (event.toolName === "subagent") {
+			const agents = agentsFromSubagentInput(
 				event.input as Record<string, unknown> | undefined,
 			);
-			if (subagentType === EXECUTOR_SUBAGENT_TYPE) {
+			if (agents.includes(EXECUTOR_SUBAGENT_TYPE)) {
 				state.executorSessionId = ctx.sessionManager.getSessionId();
 				state.violationActive = false;
 				state.updatedAt = nowIso();
 				persist();
 				return undefined;
 			}
-			if (REVIEW_SUBAGENT_TYPES.has(subagentType)) {
+			if (agents.some((a) => REVIEW_SUBAGENT_TYPES.has(a))) {
 				state.violationActive = false;
 				state.updatedAt = nowIso();
 				persist();
@@ -207,10 +230,6 @@ export default function reviewIntegrity(pi: ExtensionAPI) {
 
 		if (!state.violationActive) return undefined;
 
-		if (ORCHESTRATION_TOOLS.has(event.toolName)) {
-			return undefined;
-		}
-
 		await appendIncident({
 			type: "review_integrity_violation",
 			session_id: ctx.sessionManager.getSessionId(),
@@ -218,13 +237,13 @@ export default function reviewIntegrity(pi: ExtensionAPI) {
 			reason:
 				"direct tool use in review phase while sharing executor session context",
 			mitigation:
-				"spawn harness/evaluator or harness/adversary via Agent instead",
+				"spawn harness/evaluator or harness/adversary via subagent instead",
 		});
 
 		return {
 			block: true,
 			reason:
-				"review-integrity: tool blocked in review phase — spawn an isolated review subagent via Agent.",
+				"review-integrity: tool blocked in review phase — spawn an isolated review subagent via subagent.",
 		};
 	});
 

package/.pi/extensions/ultimate-pi-vcc.ts

@@ -11,7 +11,12 @@
 
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import registerVcc from "../../vendor/pi-vcc/index.js";
+import { claimExtensionLoad } from "./lib/extension-load-guard.js";
+
+// @ts-expect-error pi extensions run as ESM
+const MODULE_URL = import.meta.url;
 
 export default function ultimatePiVcc(pi: ExtensionAPI): void {
+	if (!claimExtensionLoad("ultimate-pi-vcc", MODULE_URL)) return;
 	registerVcc(pi);
 }

package/.pi/harness/agents.manifest.json

@@ -1,84 +1,128 @@
 {
-  "schema_version": "1.0.0",
-  "package": "ultimate-pi",
-  "package_version": "0.9.0",
-  "generated_at": "2026-05-17T10:06:28.388Z",
-  "agents": {
-    "pi-pi/agent-expert": {
-      "path": ".pi/agents/pi-pi/agent-expert.md",
-      "sha256": "86561eb092b92fa43f221bfc6305de8d5afe10d43c5f577b9bf15a71bda051c6"
-    },
-    "pi-pi/cli-expert": {
-      "path": ".pi/agents/pi-pi/cli-expert.md",
-      "sha256": "6ecdbc37c60f1da7c68d504187454c95197dd19bd7091d97d136c6fb9e866838"
-    },
-    "pi-pi/config-expert": {
-      "path": ".pi/agents/pi-pi/config-expert.md",
-      "sha256": "c23b9b70a4c326cca2d139f18de48f8db2e0e28fa5ceb8205600f25430822a40"
-    },
-    "pi-pi/ext-expert": {
-      "path": ".pi/agents/pi-pi/ext-expert.md",
-      "sha256": "47c64a9e2cffe00a50cac5541b0edc89fe8bcbd66ec3bb302eecc10d405a977f"
-    },
-    "pi-pi/keybinding-expert": {
-      "path": ".pi/agents/pi-pi/keybinding-expert.md",
-      "sha256": "bb83f5fd2178075c8374ef28c360339f7de9faeedf811670b43a536c5f65c58e"
-    },
-    "pi-pi/pi-orchestrator": {
-      "path": ".pi/agents/pi-pi/pi-orchestrator.md",
-      "sha256": "1323fc262112030320bdd7d7866fd69e1b861377bb30fd3553a5e3a4398f9090"
-    },
-    "pi-pi/prompt-expert": {
-      "path": ".pi/agents/pi-pi/prompt-expert.md",
-      "sha256": "0d9f5e3e8ab162149cac8f08e159a7b2150a11f53ebe7021e72f8277fa004d0c"
-    },
-    "pi-pi/skill-expert": {
-      "path": ".pi/agents/pi-pi/skill-expert.md",
-      "sha256": "91732a2479097a2645b6af56171d5cdc1ed67a0896ca54bc4badba250341698f"
-    },
-    "pi-pi/theme-expert": {
-      "path": ".pi/agents/pi-pi/theme-expert.md",
-      "sha256": "3d256049203356d87c36eac2232c0ad6261fec8af02eb15d3144b18a400ed64d"
-    },
-    "pi-pi/tui-expert": {
-      "path": ".pi/agents/pi-pi/tui-expert.md",
-      "sha256": "a619b2ee3d3d94fe599abb61db0904f90d30335ec426851c3f1efdf2e5ce5390"
-    },
-    "harness/adversary": {
-      "path": ".pi/agents/harness/adversary.md",
-      "sha256": "b965f90610ca942d08b656f1aee839266d08a92beb174b8761dd5e840694a899"
-    },
-    "harness/evaluator": {
-      "path": ".pi/agents/harness/evaluator.md",
-      "sha256": "6c0de777a10de26dba4a6feb5641495fa5c2d31072a8b0e597a5ecc9921f129f"
-    },
-    "harness/executor": {
-      "path": ".pi/agents/harness/executor.md",
-      "sha256": "5af3ec2be4d64a738834e36d480a36c2bee4359e8cd5a2e1aac49be4cff79589"
-    },
-    "harness/incident-recorder": {
-      "path": ".pi/agents/harness/incident-recorder.md",
-      "sha256": "2de405f77b62dde38f331665bff220a3ef131c3c1cd42eebee364000fc83352b"
-    },
-    "harness/meta-optimizer": {
-      "path": ".pi/agents/harness/meta-optimizer.md",
-      "sha256": "ef2fb950e18e3a6439e91a68f764fc7ec922cd2d6b35de8f656f376854974d04"
-    },
-    "harness/planner": {
-      "path": ".pi/agents/harness/planner.md",
-      "sha256": "eb0459a1fcb018e4ca8d4339141e294828fa7014879d9a64258ae01abc13d3ad"
-    },
-    "harness/sentrux-bootstrap": {
-      "path": ".pi/agents/harness/sentrux-bootstrap.md",
-      "sha256": "3a0b43b94386a7c541b8a806a37524a5e53f1c8049270db7a420680df5799eeb"
-    },
-    "harness/tie-breaker": {
-      "path": ".pi/agents/harness/tie-breaker.md",
-      "sha256": "651f50b9e2c7903c542700e94908b1fcd026ebed12aa1f1d6ec481df3567e34f"
-    },
-    "harness/trace-librarian": {
-      "path": ".pi/agents/harness/trace-librarian.md",
-      "sha256": "d63fe08a2ea0466c0fd89fff4da03ac1d9d3580c306381cee251c89d4e8fdb97"
-    }
-  }
+	"schema_version": "1.0.0",
+	"package": "ultimate-pi",
+	"package_version": "0.11.0",
+	"generated_at": "2026-05-18T09:43:44.563Z",
+	"agents": {
+		"pi-pi/agent-expert": {
+			"path": ".pi/agents/pi-pi/agent-expert.md",
+			"sha256": "86561eb092b92fa43f221bfc6305de8d5afe10d43c5f577b9bf15a71bda051c6"
+		},
+		"pi-pi/cli-expert": {
+			"path": ".pi/agents/pi-pi/cli-expert.md",
+			"sha256": "6ecdbc37c60f1da7c68d504187454c95197dd19bd7091d97d136c6fb9e866838"
+		},
+		"pi-pi/config-expert": {
+			"path": ".pi/agents/pi-pi/config-expert.md",
+			"sha256": "c23b9b70a4c326cca2d139f18de48f8db2e0e28fa5ceb8205600f25430822a40"
+		},
+		"pi-pi/ext-expert": {
+			"path": ".pi/agents/pi-pi/ext-expert.md",
+			"sha256": "47c64a9e2cffe00a50cac5541b0edc89fe8bcbd66ec3bb302eecc10d405a977f"
+		},
+		"pi-pi/keybinding-expert": {
+			"path": ".pi/agents/pi-pi/keybinding-expert.md",
+			"sha256": "bb83f5fd2178075c8374ef28c360339f7de9faeedf811670b43a536c5f65c58e"
+		},
+		"pi-pi/pi-orchestrator": {
+			"path": ".pi/agents/pi-pi/pi-orchestrator.md",
+			"sha256": "1323fc262112030320bdd7d7866fd69e1b861377bb30fd3553a5e3a4398f9090"
+		},
+		"pi-pi/prompt-expert": {
+			"path": ".pi/agents/pi-pi/prompt-expert.md",
+			"sha256": "0d9f5e3e8ab162149cac8f08e159a7b2150a11f53ebe7021e72f8277fa004d0c"
+		},
+		"pi-pi/skill-expert": {
+			"path": ".pi/agents/pi-pi/skill-expert.md",
+			"sha256": "91732a2479097a2645b6af56171d5cdc1ed67a0896ca54bc4badba250341698f"
+		},
+		"pi-pi/theme-expert": {
+			"path": ".pi/agents/pi-pi/theme-expert.md",
+			"sha256": "3d256049203356d87c36eac2232c0ad6261fec8af02eb15d3144b18a400ed64d"
+		},
+		"pi-pi/tui-expert": {
+			"path": ".pi/agents/pi-pi/tui-expert.md",
+			"sha256": "a619b2ee3d3d94fe599abb61db0904f90d30335ec426851c3f1efdf2e5ce5390"
+		},
+		"harness/adversary": {
+			"path": ".pi/agents/harness/adversary.md",
+			"sha256": "dd2ef87139cb175d795f4d7bde78dca1a181d2e42c3c3bd0d48832cf5069aa29"
+		},
+		"harness/evaluator": {
+			"path": ".pi/agents/harness/evaluator.md",
+			"sha256": "2b8039fd79f9177fdafd5319a53a96812719d4f1f68e2de70632030142649cfe"
+		},
+		"harness/executor": {
+			"path": ".pi/agents/harness/executor.md",
+			"sha256": "b549e9fc802ba23857a1bc6b2ff36f3c169e708fe5ec13857b3bcfe841384f1f"
+		},
+		"harness/incident-recorder": {
+			"path": ".pi/agents/harness/incident-recorder.md",
+			"sha256": "d7577c911a9e6c9607eb64f76337aab85c4eb9a92e7cd917eb8d989ef3cd1de5"
+		},
+		"harness/meta-optimizer": {
+			"path": ".pi/agents/harness/meta-optimizer.md",
+			"sha256": "a4eed88084c7cfb5ace3edc72b72d7ead4134b3eae0d444b391decfe2640a632"
+		},
+		"harness/sentrux-bootstrap": {
+			"path": ".pi/agents/harness/sentrux-bootstrap.md",
+			"sha256": "3a0b43b94386a7c541b8a806a37524a5e53f1c8049270db7a420680df5799eeb"
+		},
+		"harness/tie-breaker": {
+			"path": ".pi/agents/harness/tie-breaker.md",
+			"sha256": "68f02b86e95927f06d7f963e1f61f193159bbef1ba4558d90c84d5457d62b3f7"
+		},
+		"harness/trace-librarian": {
+			"path": ".pi/agents/harness/trace-librarian.md",
+			"sha256": "03b499a948b8467f1cfe2b4e63190feb7b8b9d96461055638e774253b9b6b2d4"
+		},
+		"harness/planning/decompose": {
+			"path": ".pi/agents/harness/planning/decompose.md",
+			"sha256": "1b3f85d956d2e203ec87045a731c47f8b40f75b63fce8916fda91cefc39244a8"
+		},
+		"harness/planning/execution-plan-author": {
+			"path": ".pi/agents/harness/planning/execution-plan-author.md",
+			"sha256": "a69fb2e8bda9336e71ce9536071f9c8a2f4abd9d9d88930c6a8be29bdc9c5f62"
+		},
+		"harness/planning/hypothesis-validator": {
+			"path": ".pi/agents/harness/planning/hypothesis-validator.md",
+			"sha256": "f75312439c441ccee72692d41f44b6e733df08e06c89e930740fc256bed3ba02"
+		},
+		"harness/planning/hypothesis": {
+			"path": ".pi/agents/harness/planning/hypothesis.md",
+			"sha256": "b20c527d15c2243cd5d3a8f16cea6d44bdfd16e01915d42f3b830bf9938e5f8b"
+		},
+		"harness/planning/plan-adversary": {
+			"path": ".pi/agents/harness/planning/plan-adversary.md",
+			"sha256": "685926c638ae1377361d7cafda5e400be19cb3880510d8f6d389a5876647575f"
+		},
+		"harness/planning/plan-evaluator": {
+			"path": ".pi/agents/harness/planning/plan-evaluator.md",
+			"sha256": "44fd52389d7e43dd5093653cba9694900561318ee5f00e3bc05c3ecef5d43621"
+		},
+		"harness/planning/review-integrator": {
+			"path": ".pi/agents/harness/planning/review-integrator.md",
+			"sha256": "d0e8214539d0a78b9e5add70e61dd4e4de36def64172cda18d9b70727e7600ca"
+		},
+		"harness/planning/scout-graphify": {
+			"path": ".pi/agents/harness/planning/scout-graphify.md",
+			"sha256": "b59916a26afccfe105e29c0bd8637ac54275e8afef1c6cc88a58bd05b0325473"
+		},
+		"harness/planning/scout-semantic": {
+			"path": ".pi/agents/harness/planning/scout-semantic.md",
+			"sha256": "47b7ea3e65b20a65e6d0ff11b6d5daff59b47a9ed618b8a3b6282f2eb0460572"
+		},
+		"harness/planning/scout-structure": {
+			"path": ".pi/agents/harness/planning/scout-structure.md",
+			"sha256": "e67b7cd75519e5ae36e1bb5f49ca158888c28d365465863aee50a9b2e8e5b7d7"
+		},
+		"harness/planning/sprint-contract-auditor": {
+			"path": ".pi/agents/harness/planning/sprint-contract-auditor.md",
+			"sha256": "f613a4fa937d76936fa01155d4e7956a81878f300100f99f6a78915b0af6f7c7"
+		},
+		"harness/planning/stack-researcher": {
+			"path": ".pi/agents/harness/planning/stack-researcher.md",
+			"sha256": "90e2ff1348f54bebc8c0392407bf1bb4d794c942fd8d6f342d80b191c945b34e"
+		}
+	}
 }

package/.pi/harness/docs/adrs/0032-harness-command-orchestration.md

@@ -5,16 +5,16 @@
 
 ## Context
 
-Harness slash prompts duplicated logic already defined in `harness/*` agents. Commands did not invoke the `Agent` tool. Review docs told users to fork a new Pi session even though subagents already provide isolated context.
+Harness slash prompts duplicated logic already defined in `harness/*` agents. The in-process `Agent` / `createAgentSession` stack was heavy and unstable. Review docs told users to fork a new Pi session even though subprocess subagents already provide isolation.
 
 ## Decision
 
 1. **Slash commands** (prompt templates) are orchestrators: spawn `harness/*` agents once, perform policy-gated writes, emit handoff blocks. Command identity is captured on Pi **`input`** as `harness-turn` (raw `/harness-*`), not from expanded prompt markdown.
-2. **Agents** perform multi-turn reads and emit structured JSON drafts. **Planner** runs clarification and plan approval via `ask_user` (parent UI bridge); planner does not write `plan-packet.json`.
+2. **Agents** perform multi-turn reads and emit structured JSON drafts. **Planning** (`harness/planning/*`) scouts and plan-adversary are read-only; parent orchestrator runs `ask_user`, `approve_plan`, and `create_plan` (see ADR 0033).
 3. **HarnessSpawnContext** is injected in `[HarnessRunContext]`; orchestrator copies it into spawn prompts. Subagents do not receive `[HarnessActivePlan]` injection.
-4. **Review isolation** uses `Agent` spawn with `inherit_context: false`. `review-integrity` allows `Agent` / `get_subagent_result` for evaluator/adversary/tie-breaker.
-5. **Subagent policy** blocks mutating tools for read-only phase agents; `ask_user` allowed for planner/evaluator/adversary/tie-breaker only.
-6. **Parent** does not duplicate planner `ask_user` or re-spawn for clarification. `get_subagent_result` syncs `harness-plan-approval` from subagent sessions.
+4. **Review isolation** uses native `subagent` (vendored pi-subagents: isolated `pi --mode json` subprocess). `review-integrity` allows `subagent` when `agent` is evaluator/adversary/tie-breaker; bridge blocks plan-phase mutating spawns and nested `subagent` in children.
+5. **Subagent policy** blocks mutating tools for read-only phase agents; `ask_user` bridged for evaluator/adversary/tie-breaker only (not planning scouts).
+6. **Parent** owns plan-phase `ask_user`, `approve_plan`, and `create_plan` per ADR 0033.
 
 ## Consequences
 
@@ -32,6 +32,7 @@ Harness slash prompts duplicated logic already defined in `harness/*` agents. Co
 
 - `.pi/prompts/harness-*.md`
 - `.pi/agents/harness/*.md`
-- `.pi/extensions/lib/harness-subagents/harness-subagent-policy.ts`
+- `vendor/pi-subagents/src/subagents.ts`, `.pi/extensions/lib/harness-subagents-bridge.ts`
+- `.pi/extensions/lib/harness-subagent-policy.ts`
 - `.pi/extensions/review-integrity.ts`
 - `.pi/lib/harness-agent-output.ts`

package/.pi/harness/docs/adrs/0033-parent-orchestrated-planning.md

@@ -0,0 +1,34 @@
+# ADR 0033: Parent-orchestrated harness planning
+
+- **Status:** Accepted
+- **Date:** 2026-05-17
+
+## Context
+
+`/harness-plan` previously delegated the full plan lifecycle to a single `harness/planner` subagent. Plans and approval UI were largely invisible in the parent transcript until subprocess completion, and the orchestrator could not call `ask_user` / `approve_plan` / `create_plan` directly.
+
+## Decision
+
+1. **Parent orchestrator** runs `/harness-plan`: parallel read-only scouts under `harness/planning/*`, parent-built `PlanPacket`, `ask_user`, `harness/planning/plan-adversary`, then parent `approve_plan` + `create_plan`.
+2. **Planning agents** live in `.pi/agents/harness/planning/` (`scout-graphify`, `scout-structure`, `scout-semantic`, `plan-adversary`). Deprecated `harness/planner` shim retained at old path for one release.
+3. **`approve_plan` and `create_plan`** are parent-session tools only; subagents cannot call them.
+4. **`classifyHarnessAgent`** treats `harness/planning/*` as read-only (planner kind).
+
+## Consequences
+
+### Positive
+
+- Full plan visible in parent session; editor `plan-review.md` path surfaced from parent.
+- Specialized scouts (graphify, ast-grep, ck) run in parallel with clear JSON contracts.
+- Pre-approval adversary separate from post-run `harness/adversary`.
+
+### Negative
+
+- More subagent spawns per plan (3 scouts + adversary) vs one planner.
+- Parent prompt must parse multiple JSON blocks and handle partial scout failure.
+
+## References
+
+- `.pi/prompts/harness-plan.md`
+- `.pi/agents/harness/planning/`
+- ADR 0032