ultimate-pi 0.8.0 → 0.9.1

package/.pi/extensions/lib/harness-subagents/vendored/agent-runner.ts

@@ -18,6 +18,7 @@ import {
 	SettingsManager,
 } from "@earendil-works/pi-coding-agent";
 import { evaluateHarnessSubagentToolCall } from "../harness-subagent-policy.js";
+import { createParentAskUserBridgeFactory } from "../parent-ask-user-bridge.js";
 import {
 	getAgentConfig,
 	getConfig,
@@ -39,7 +40,6 @@ const EXCLUDED_TOOL_NAMES = [
 	"get_subagent_result",
 	"steer_subagent",
 	"blackboard",
-	"ask_user",
 ];
 
 /** Default max turns. undefined = unlimited (no turn limit). */
@@ -152,6 +152,8 @@ export interface RunOptions {
 	}) => void;
 	/** Blackboard or other spawn context appended to the subagent system prompt. */
 	systemPromptAppendix?: string;
+	/** Parent session context — used to bridge ask_user UI into subagents. */
+	parentExtensionContext?: ExtensionContext;
 }
 
 export interface RunResult {
@@ -328,26 +330,31 @@ export async function runAgent(
 			? `${systemPrompt}\n\n---\n\n## Spawn context\n\n${appendix}`
 			: systemPrompt;
 
-	const extensionFactories: Array<(pi: ExtensionAPI) => void> = [
-		(pi) => {
-			pi.on("tool_call", (event) => {
-				const decision = evaluateHarnessSubagentToolCall(
-					event.toolName,
-					event.input as Record<string, unknown> | undefined,
-					type,
-				);
-				if (decision.action === "block") {
-					return { block: true, reason: decision.reason };
-				}
-				return undefined;
-			});
-			pi.on("before_agent_start", (event: { systemPrompt?: string }) => {
-				const base =
-					typeof event.systemPrompt === "string" ? event.systemPrompt : "";
-				return { systemPrompt: base };
-			});
-		},
-	];
+	const extensionFactories: Array<(pi: ExtensionAPI) => void> = [];
+	const askUserBridge = options.parentExtensionContext
+		? createParentAskUserBridgeFactory(options.parentExtensionContext, type)
+		: null;
+	if (askUserBridge) {
+		extensionFactories.push(askUserBridge);
+	}
+	extensionFactories.push((pi) => {
+		pi.on("tool_call", (event) => {
+			const decision = evaluateHarnessSubagentToolCall(
+				event.toolName,
+				event.input as Record<string, unknown> | undefined,
+				type,
+			);
+			if (decision.action === "block") {
+				return { block: true, reason: decision.reason };
+			}
+			return undefined;
+		});
+		pi.on("before_agent_start", (event: { systemPrompt?: string }) => {
+			const base =
+				typeof event.systemPrompt === "string" ? event.systemPrompt : "";
+			return { systemPrompt: base };
+		});
+	});
 
 	const loader = new DefaultResourceLoader({
 		cwd: effectiveCwd,
@@ -403,6 +410,7 @@ export async function runAgent(
 	const filterTools = (names: string[]) =>
 		names.filter((t) => {
 			if (EXCLUDED_TOOL_NAMES.includes(t)) return false;
+			if (t === "ask_user" && askUserBridge) return true;
 			if (disallowedSet?.has(t)) return false;
 			if (builtinToolNameSet.has(t)) return true;
 			if (extensions === false) return false;
@@ -416,9 +424,11 @@ export async function runAgent(
 	if (activeTools.length > 0) {
 		session.setActiveToolsByName(activeTools);
 	} else {
-		session.setActiveToolsByName(
-			toolNames.filter((t) => !disallowedSet?.has(t)),
-		);
+		const fallback = toolNames.filter((t) => {
+			if (t === "ask_user" && askUserBridge) return true;
+			return !disallowedSet?.has(t);
+		});
+		session.setActiveToolsByName(fallback);
 	}
 
 	// Bind extensions so that session_start fires and extensions can initialize
@@ -434,6 +444,12 @@ export async function runAgent(
 		},
 	});
 
+	if (askUserBridge) {
+		const withAsk = new Set(session.getActiveToolNames());
+		withAsk.add("ask_user");
+		session.setActiveToolsByName([...withAsk]);
+	}
+
 	options.onSessionCreated?.(session);
 
 	// Track turns for graceful max_turns enforcement

package/.pi/extensions/lib/harness-subagents/vendored/index.ts

@@ -17,6 +17,10 @@ import {
 } from "@earendil-works/pi-coding-agent";
 import { Text } from "@earendil-works/pi-tui";
 import { Type } from "@sinclair/typebox";
+import {
+	extractPlanApprovalsFromEntries,
+	getLatestRunContext,
+} from "../../../../lib/harness-run-context.js";
 import { getDriftReport } from "../agent-manifest.js";
 import { Blackboard } from "../blackboard.js";
 import {
@@ -1599,6 +1603,23 @@ Guidelines:
 						cancelNudge(params.agent_id);
 					}
 
+					if (record.session && record.status !== "running") {
+						const parentEntries = _ctx.sessionManager.getEntries();
+						const runCtx = getLatestRunContext(parentEntries);
+						if (runCtx) {
+							const subEntries = record.session.sessionManager.getEntries();
+							for (const approval of extractPlanApprovalsFromEntries(
+								subEntries,
+							)) {
+								pi.appendEntry("harness-plan-approval", {
+									plan_id: approval.plan_id ?? runCtx.plan_id,
+									approved_at: approval.approved_at,
+									source: "ask_user",
+								});
+							}
+						}
+					}
+
 					// Verbose: include full conversation
 					if (params.verbose && record.session) {
 						const conversation = getAgentConversation(record.session);

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

@@ -15,7 +15,7 @@ import {
 	getPolicyTransitionBlock,
 	hasApprovedPlanSignalFromUserPrompt,
 	hasHarnessAbortSignal,
-	inferHarnessPhaseFromPrompt,
+	inferHarnessPhase,
 	isHarnessAutoSession,
 	isHarnessBootstrapPrompt,
 	isPlanPhaseAllowedMutation,
@@ -77,8 +77,8 @@ function nowIso(): string {
 
 function defaultState(): PolicyState {
 	return {
-		phase: "execute",
-		approvedPlan: true,
+		phase: "plan",
+		approvedPlan: false,
 		planId: null,
 		budgetBypass: false,
 		aborted: false,
@@ -198,7 +198,7 @@ export default function policyGate(pi: ExtensionAPI) {
 			};
 		}
 
-		const nextPhase = inferHarnessPhaseFromPrompt(userPrompt);
+		const nextPhase = inferHarnessPhase(entries, userPrompt);
 		const planSignal = hasApprovedPlanSignal(userPrompt, entries);
 
 		const transitionBlock = getPolicyTransitionBlock(userPrompt, entries);

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

@@ -1,84 +1,84 @@
 {
-	"schema_version": "1.0.0",
-	"package": "ultimate-pi",
-	"package_version": "0.7.0",
-	"generated_at": "2026-05-17T08:24:57.263Z",
-	"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": "3052e0b4ca504c7aa025b1926228e34adfe7f1c42d66a24db43fc6a1abb9968d"
-		},
-		"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.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"
+    }
+  }
 }

package/.pi/harness/docs/adrs/0031-harness-run-context.md

@@ -9,7 +9,7 @@ Manual harness steps required copying `run_id` and `plan-packet.json` paths betw
 
 ## Decision
 
-1. Add `.pi/lib/harness-run-context.ts` and `harness-run-context.ts` extension as the single source of truth for active runs.
+1. Add `.pi/lib/harness-run-context.ts` and `harness-run-context.ts` extension as the single source of truth for active runs. **Harness command routing:** `pi.on("input")` appends `harness-turn` for raw `/harness-*` (before template expansion); `before_agent_start` bootstraps from that entry, not expanded prompt headers.
 2. Persist mirrors:
    - `.pi/harness/runs/<run_id>/run-context.json`
    - `.pi/harness/active-run.json` (cross-session pointer for forked eval)

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

@@ -9,12 +9,12 @@ Harness slash prompts duplicated logic already defined in `harness/*` agents. Co
 
 ## Decision
 
-1. **Slash commands** parse args, spawn the matching `harness/*` agent, run all `ask_user` gates, perform policy-gated writes, and emit handoff blocks.
-2. **Agents** perform multi-turn reads and emit structured JSON drafts; they do not approve plans or write canonical run artifacts (except executor mutations in scope).
-3. **HarnessSpawnContext** JSON (`.pi/harness/specs/harness-spawn-context.schema.json`) is required in every spawn prompt because subagents do not receive `[HarnessActivePlan]` injection.
-4. **Review isolation** uses `Agent` spawn with `inherit_context: false`, not session fork. `review-integrity` allows `Agent` / `get_subagent_result` for `harness/evaluator`, `harness/adversary`, and `harness/tie-breaker`.
-5. **Subagent policy** (`harness-subagent-policy.ts`) blocks mutating tools for planner/evaluator/adversary and related read-only agents; executor keeps write tools and `extensions: true`.
-6. **Planner** has `disallowed_tools: ask_user`; clarification options return in JSON for the parent orchestrator.
+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`.
+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.
 
 ## Consequences
 

package/.pi/harness/specs/budget-exhausted-event.schema.json

@@ -54,7 +54,9 @@
 			"enum": [
 				"max_rounds_reached",
 				"round_token_cap_exceeded",
-				"debate_global_cap_exceeded"
+				"debate_global_cap_exceeded",
+				"phase_cap_exceeded",
+				"global_cap_exceeded"
 			]
 		},
 		"caps": {

package/.pi/harness/specs/harness-turn.schema.json

@@ -0,0 +1,18 @@
+{
+	"$schema": "http://json-schema.org/draft-07/schema#",
+	"title": "HarnessTurn",
+	"description": "Recorded on Pi input event when user invokes a /harness-* prompt template (raw slash, before expansion).",
+	"type": "object",
+	"required": ["schema_version", "command", "args", "source", "invoked_at"],
+	"additionalProperties": false,
+	"properties": {
+		"schema_version": { "const": "1.0.0" },
+		"command": {
+			"type": "string",
+			"pattern": "^harness-[a-z0-9-]+$"
+		},
+		"args": { "type": "string" },
+		"source": { "const": "slash" },
+		"invoked_at": { "type": "string", "format": "date-time" }
+	}
+}