ultimate-pi 0.13.1 → 0.15.0

package/.pi/extensions/harness-live-widget.ts

@@ -3,12 +3,14 @@ import type {
 	ExtensionContext,
 } from "@earendil-works/pi-coding-agent";
 import {
+	deriveHarnessStatusHint,
+	formatHarnessPhaseLabel,
+	type HarnessStatusSeverity,
 	type HarnessUiState,
 	HarnessUiStateStore,
+	nextHarnessPhase,
 } from "../lib/harness-ui-state";
 
-type Severity = "accent" | "warning" | "error";
-
 type TuiLike = { requestRender(): void };
 type ThemeLike = {
 	fg(
@@ -164,31 +166,25 @@ function composeZones(left: string, right: string, width: number): string {
 	return fitToWidth(`${leftFit}${" ".repeat(minGap)}${rightFit}`, width);
 }
 
-type InFlightState = {
-	toolCount: number;
-	lastToolName: string | null;
-};
+function themeSeverityColor(
+	severity: HarnessStatusSeverity,
+): "accent" | "warning" | "error" | "success" | "muted" {
+	return severity;
+}
 
 class HarnessWidgetComponent {
 	private widthCache?: number;
 	private linesCache?: string[];
 	private state: HarnessUiState;
-	private inFlight: InFlightState;
 	private themeRef: ThemeLike;
 
-	constructor(
-		state: HarnessUiState,
-		inFlight: InFlightState,
-		theme: ThemeLike,
-	) {
+	constructor(state: HarnessUiState, theme: ThemeLike) {
 		this.state = state;
-		this.inFlight = inFlight;
 		this.themeRef = theme;
 	}
 
-	public setData(state: HarnessUiState, inFlight: InFlightState): void {
+	public setData(state: HarnessUiState): void {
 		this.state = state;
-		this.inFlight = inFlight;
 		this.invalidate();
 	}
 
@@ -201,109 +197,23 @@ class HarnessWidgetComponent {
 		if (this.linesCache && this.widthCache === width) return this.linesCache;
 		const theme = this.themeRef;
 		const rowWidth = Math.max(1, width - TERMINAL_WIDTH_SAFETY_MARGIN);
-		const showDebateRow =
-			this.state.phase === "adversary" || this.state.phase === "merge";
-
-		const substateColor: Severity =
-			this.state.flowSubstate === "blocked"
-				? "error"
-				: this.state.flowSubstate === "severity-policy" ||
-						this.state.flowSubstate === "human-required"
-					? "warning"
-					: "accent";
-		const policyColor =
-			this.state.policyDecision === "pass"
-				? "success"
-				: this.state.policyDecision === "conditional_pass"
-					? "warning"
-					: this.state.policyDecision === "block" ||
-							this.state.policyDecision === "human_required"
-						? "error"
-						: "muted";
-
-		const policyDisplay = this.state.policyDecision ?? "pending";
-
-		const phaseToken = `${theme.fg("dim", "phase:")}${theme.fg("accent", this.state.phase)}`;
-		const flowToken = `${theme.fg("dim", "flow:")}${theme.fg(substateColor, this.state.flowSubstate)}`;
-		const policyToken = `${theme.fg("dim", "policy:")}${theme.fg(policyColor, policyDisplay)}`;
-		const row1 = composeZones(
-			`${theme.bold("Harness")} ${phaseToken} ${flowToken}`,
-			policyToken,
-			rowWidth,
-		);
 
-		const debateProgress =
-			this.state.debateMaxRounds != null
-				? `${this.state.debateRound}/${this.state.debateMaxRounds}`
-				: String(this.state.debateRound);
-		const budgetDisplay =
-			this.state.debateBudgetUsed != null && this.state.debateBudgetCap != null
-				? `${this.state.debateBudgetUsed}/${this.state.debateBudgetCap}`
-				: this.state.debateBudgetUsed != null
-					? String(this.state.debateBudgetUsed)
-					: "n/a";
-		const consensusTrend =
-			this.state.consensusDelta == null
-				? "flat"
-				: this.state.consensusDelta > 0
-					? "up"
-					: this.state.consensusDelta < 0
-						? "down"
-						: "flat";
-		const trendColor =
-			consensusTrend === "up"
-				? "success"
-				: consensusTrend === "down"
-					? "warning"
-					: "muted";
-
-		const sev = this.state.severity;
-		const severityCompact =
-			sev.correctness == null &&
-			sev.security == null &&
-			sev.architecture == null &&
-			sev.testIntegrity == null
-				? theme.fg("muted", "sev:n/a")
-				: `${theme.fg("dim", "sev")} ${theme.fg("accent", `c:${sev.correctness ?? "-"}`)} ${theme.fg("accent", `s:${sev.security ?? "-"}`)} ${theme.fg("accent", `a:${sev.architecture ?? "-"}`)} ${theme.fg("accent", `t:${sev.testIntegrity ?? "-"}`)}`;
-
-		const planFlag = this.state.planApproved
-			? `${theme.fg("dim", "📋 Plan:")}${theme.fg("success", "OK")}`
-			: `${theme.fg("dim", "📋 Plan:")}${theme.fg("error", "NO")}`;
-		const reviewFlag = this.state.reviewIsolationOk
-			? `${theme.fg("dim", "🧪 Review:")}${theme.fg("success", "OK")}`
-			: `${theme.fg("dim", "🧪 Review:")}${theme.fg("warning", "ISO")}`;
-		const budgetFlag = this.state.budgetExhausted
-			? `${theme.fg("dim", "💰 Budget:")}${theme.fg("error", "HIT")}`
-			: `${theme.fg("dim", "💰 Budget:")}${theme.fg("success", "OK")}`;
-		const testsFlag =
-			this.state.testIntegritySeverity === "high"
-				? `${theme.fg("dim", "🛡 Tests:")}${theme.fg("error", "HIGH")}`
-				: this.state.testIntegritySeverity === "medium"
-					? `${theme.fg("dim", "🛡 Tests:")}${theme.fg("warning", "MED")}`
-					: `${theme.fg("dim", "🛡 Tests:")}${theme.fg("success", "OK")}`;
-
-		const toolDisplay = this.inFlight.lastToolName
-			? `${this.inFlight.toolCount}:${this.inFlight.lastToolName}`
-			: String(this.inFlight.toolCount);
-		const nextDisplay =
-			this.state.nextRecommendedCommand != null
-				? this.state.nextRecommendedCommand.length > 36
-					? `${this.state.nextRecommendedCommand.slice(0, 33)}...`
-					: this.state.nextRecommendedCommand
-				: null;
-		const row3Left = `${planFlag} ${reviewFlag} ${budgetFlag} ${testsFlag}`;
-		const row3Right = nextDisplay
-			? `${theme.fg("dim", "inFlight:")}${theme.fg("accent", toolDisplay)} ${theme.fg("dim", "next:")}${theme.fg("accent", nextDisplay)}`
-			: `${theme.fg("dim", "inFlight:")}${theme.fg("accent", toolDisplay)}`;
-		const row3 = composeZones(row3Left, row3Right, rowWidth);
-
-		const lines: string[] = [truncateToWidth(row1, rowWidth)];
-		if (showDebateRow) {
-			const debateLeft = `${theme.fg("dim", "Debate")} ${theme.fg("accent", `rounds:${debateProgress}`)} ${theme.fg("dim", "trend:")}${theme.fg(trendColor, consensusTrend)} ${theme.fg("dim", "budget:")}${theme.fg("accent", budgetDisplay)}`;
-			const row2 = composeZones(debateLeft, severityCompact, rowWidth);
-			lines.push(truncateToWidth(row2, rowWidth));
-		}
-		lines.push(truncateToWidth(row3, rowWidth));
+		const currentLabel = formatHarnessPhaseLabel(this.state.phase);
+		const nextPhase = nextHarnessPhase(this.state.phase);
+		const nowToken = `${theme.fg("dim", "now:")}${theme.fg("accent", currentLabel)}`;
+		const phaseToken =
+			nextPhase != null
+				? `${nowToken} ${theme.fg("dim", "→")} ${theme.fg("accent", formatHarnessPhaseLabel(nextPhase))}`
+				: nowToken;
+
+		const status = deriveHarnessStatusHint(this.state);
+		const statusColor = themeSeverityColor(status.severity);
+		const statusToken = theme.fg(statusColor, status.text);
+
+		const left = `${theme.bold("Harness")} ${phaseToken}`;
+		const row = composeZones(left, statusToken, rowWidth);
+
+		const lines = [truncateToWidth(row, rowWidth)];
 		this.widthCache = width;
 		this.linesCache = lines;
 		return lines;
@@ -316,14 +226,16 @@ class HarnessWidgetComponent {
 }
 
 function statusToken(state: HarnessUiState): string {
-	const decision = state.policyDecision ?? "pending";
-	return `h:${state.phase}/${state.flowSubstate}/${decision}`;
+	const current = formatHarnessPhaseLabel(state.phase);
+	const next = nextHarnessPhase(state.phase);
+	const phasePart =
+		next != null ? `${current}→${formatHarnessPhaseLabel(next)}` : current;
+	const hint = deriveHarnessStatusHint(state).text;
+	return `h:${phasePart}|${hint}`;
 }
 
 export default function harnessLiveWidget(pi: ExtensionAPI) {
 	const stateStore = new HarnessUiStateStore();
-	const inFlightCalls = new Set<string>();
-	let lastToolName: string | null = null;
 	let widgetMounted = false;
 	let tuiHandle: TuiLike | null = null;
 	let component: HarnessWidgetComponent | null = null;
@@ -334,19 +246,14 @@ export default function harnessLiveWidget(pi: ExtensionAPI) {
 	function mountHarnessWidget(ctx: ExtensionContext): void {
 		if (!ctx.hasUI) return;
 		const state = stateStore.refresh(ctx);
-		const inFlight: InFlightState = { toolCount: 0, lastToolName: null };
-		lastRenderHash = computeRenderHash(state, inFlight);
+		lastRenderHash = computeRenderHash(state);
 
 		ctx.ui.setWidget(
 			"harness-live",
 			(tui, theme) => {
 				widgetMounted = true;
 				tuiHandle = tui;
-				component = new HarnessWidgetComponent(
-					stateStore.snapshot(),
-					inFlight,
-					theme,
-				);
+				component = new HarnessWidgetComponent(stateStore.snapshot(), theme);
 				return {
 					render(width: number): string[] {
 						component?.setTheme(theme);
@@ -388,26 +295,15 @@ export default function harnessLiveWidget(pi: ExtensionAPI) {
 		ctx.ui.setStatus("harness-mode", undefined);
 	}
 
-	function computeRenderHash(
-		state: HarnessUiState,
-		inFlight: InFlightState,
-	): string {
+	function computeRenderHash(state: HarnessUiState): string {
 		return JSON.stringify({
 			phase: state.phase,
-			flowSubstate: state.flowSubstate,
 			planApproved: state.planApproved,
-			reviewIsolationOk: state.reviewIsolationOk,
 			budgetExhausted: state.budgetExhausted,
 			testIntegritySeverity: state.testIntegritySeverity,
-			debateRound: state.debateRound,
-			debateMaxRounds: state.debateMaxRounds,
-			debateBudgetUsed: state.debateBudgetUsed,
-			debateBudgetCap: state.debateBudgetCap,
 			policyDecision: state.policyDecision,
-			consensusDelta: state.consensusDelta,
-			severity: state.severity,
+			flowSubstate: state.flowSubstate,
 			nextRecommendedCommand: state.nextRecommendedCommand,
-			inFlight,
 		});
 	}
 
@@ -417,15 +313,11 @@ export default function harnessLiveWidget(pi: ExtensionAPI) {
 		queueMicrotask(() => {
 			refreshQueued = false;
 			const state = stateStore.refresh(ctx);
-			const inFlight: InFlightState = {
-				toolCount: inFlightCalls.size,
-				lastToolName,
-			};
-			const hash = computeRenderHash(state, inFlight);
+			const hash = computeRenderHash(state);
 			updateStatusFallback(ctx, state);
 			if (hash === lastRenderHash) return;
 			lastRenderHash = hash;
-			if (component) component.setData(state, inFlight);
+			if (component) component.setData(state);
 			tuiHandle?.requestRender();
 		});
 	}
@@ -450,16 +342,4 @@ export default function harnessLiveWidget(pi: ExtensionAPI) {
 	pi.on("agent_end", (_event, ctx) => {
 		scheduleRefresh(ctx);
 	});
-
-	pi.on("tool_execution_start", (event, ctx) => {
-		inFlightCalls.add(event.toolCallId);
-		lastToolName = event.toolName;
-		scheduleRefresh(ctx);
-	});
-
-	pi.on("tool_result", (event, ctx) => {
-		inFlightCalls.delete(event.toolCallId);
-		if (inFlightCalls.size === 0) lastToolName = null;
-		scheduleRefresh(ctx);
-	});
 }

package/.pi/extensions/harness-plan-approval.ts

@@ -2,6 +2,9 @@
  * harness-plan-approval — PlanPacket approval UI and transcript renderer for parent sessions.
  */
 
+import { constants } from "node:fs";
+import { access } from "node:fs/promises";
+import { join } from "node:path";
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { Text } from "@earendil-works/pi-tui";
 import { Type } from "@sinclair/typebox";
@@ -20,8 +23,10 @@ import {
 	executeCreatePlan,
 	formatCreatePlanResultText,
 } from "./lib/plan-approval/create-plan.js";
-import { runPlanApprovalDialog } from "./lib/plan-approval/dialog.js";
-import { runPlanApprovalFallback } from "./lib/plan-approval/fallback.js";
+import {
+	buildPlanApprovalMarkdown,
+	runPlanApprovalDialog,
+} from "./lib/plan-approval/dialog.js";
 import { writePlanReviewMarkdown } from "./lib/plan-approval/plan-review.js";
 import {
 	renderApprovePlanCall,
@@ -42,6 +47,7 @@ import {
 	toApprovePlanToolDetails,
 	validateApprovePlanParams,
 } from "./lib/plan-approval/validate.js";
+import { validatePlanDebateGate } from "./lib/plan-debate-gate.js";
 
 // @ts-expect-error pi extensions run as ESM
 const MODULE_URL = import.meta.url;
@@ -65,18 +71,23 @@ export default function harnessPlanApproval(pi: ExtensionAPI) {
 				| {
 						plan_packet?: unknown;
 						human_summary?: string | null;
+						plan_markdown?: string | null;
 				  }
 				| undefined;
 			if (!data?.plan_packet) return undefined;
+			const contentText =
+				typeof message.content === "string" ? message.content : null;
 			const lines = renderHarnessPlanDraft(
 				{
 					plan_packet: data.plan_packet as Parameters<
 						typeof renderHarnessPlanDraft
 					>[0]["plan_packet"],
 					human_summary: data.human_summary,
+					plan_markdown: data.plan_markdown,
 				},
-				80,
+				120,
 				theme,
+				contentText,
 			);
 			return new Text(lines.join("\n"), 0, 0);
 		},
@@ -86,7 +97,7 @@ export default function harnessPlanApproval(pi: ExtensionAPI) {
 		name: "approve_plan",
 		label: "Approve Plan",
 		description:
-			"Present a PlanPacket for user approval with a scrollable plan view. Parent /harness-plan orchestrator calls this after decomposition, hypothesis, and parallel reviews.",
+			"Present a PlanPacket for user approval: full plan markdown in the transcript, then Approve / Request changes / Cancel via the same prompt as ask_user. Parent /harness-plan orchestrator calls this after decomposition, hypothesis, and parallel reviews.",
 		promptSnippet: PROMPT_SNIPPET,
 		promptGuidelines: PROMPT_GUIDELINES,
 		parameters: ApprovePlanParamsSchema,
@@ -133,11 +144,67 @@ export default function harnessPlanApproval(pi: ExtensionAPI) {
 			}
 
 			const planId = String(validated.plan_packet.plan_id ?? "plan");
-			const summary =
+			const _summary =
 				validated.human_summary?.trim() ||
 				`Plan ${planId} — pending your approval`;
 			const runCtx = getLatestRunContext(entries);
 			const projectRoot = process.cwd();
+			const implWarnings: string[] = [];
+			if (runCtx?.run_id) {
+				const implPath = join(
+					projectRoot,
+					".pi",
+					"harness",
+					"runs",
+					runCtx.run_id,
+					"artifacts",
+					"implementation-research.yaml",
+				);
+				let implExists = false;
+				try {
+					await access(implPath, constants.R_OK);
+					implExists = true;
+				} catch {
+					implExists = false;
+				}
+				const risk = String(
+					validated.plan_packet.risk_level ?? "med",
+				).toLowerCase();
+				if (!implExists) {
+					const msg =
+						"approve_plan: missing artifacts/implementation-research.yaml (Phase 3.5 required)";
+					if (risk === "high") {
+						return {
+							content: [{ type: "text", text: msg }],
+							details: {
+								plan_packet: validated.plan_packet,
+								cancelled: true,
+							},
+							isError: true,
+						};
+					}
+					implWarnings.push(msg);
+				}
+			}
+			if (runCtx?.run_id) {
+				const gate = await validatePlanDebateGate(projectRoot, runCtx.run_id);
+				if (!gate.ok) {
+					return {
+						content: [
+							{
+								type: "text",
+								text: `approve_plan blocked — plan debate gate incomplete:\n- ${gate.errors.join("\n- ")}`,
+							},
+						],
+						details: {
+							plan_packet: validated.plan_packet,
+							debate_gate: gate,
+							cancelled: true,
+						},
+						isError: true,
+					};
+				}
+			}
 			const reviewPath = await writePlanReviewMarkdown(
 				projectRoot,
 				runCtx,
@@ -148,10 +215,11 @@ export default function harnessPlanApproval(pi: ExtensionAPI) {
 					status: "draft",
 				},
 			);
+			const planMarkdown = buildPlanApprovalMarkdown(validated);
 			const draftContent =
 				reviewPath != null
-					? `${summary}\nEditor review: ${reviewPath}`
-					: summary;
+					? `${planMarkdown}\n\n---\n\nEditor copy: \`${reviewPath}\``
+					: planMarkdown;
 			pi.sendMessage({
 				customType: "harness-plan-draft",
 				content: draftContent,
@@ -162,20 +230,16 @@ export default function harnessPlanApproval(pi: ExtensionAPI) {
 					human_summary: validated.human_summary ?? null,
 					research_brief: validated.research_brief ?? null,
 					plan_review_path: reviewPath,
+					plan_markdown: planMarkdown,
 					shown_at: new Date().toISOString(),
 				},
 			});
 
-			let outcome: PlanApprovalDialogResult;
-			if (ctx.hasUI) {
-				outcome = await runPlanApprovalDialog(ctx.ui, validated, {
-					onMounted: () => {
-						pi.events.emit("plan-approval:mounted", {});
-					},
-				});
-			} else {
-				outcome = await runPlanApprovalFallback(ctx.ui, validated);
-			}
+			const outcome: PlanApprovalDialogResult = await runPlanApprovalDialog(
+				ctx.ui,
+				validated,
+				{ hasUI: ctx.hasUI },
+			);
 
 			const details = toApprovePlanToolDetails(
 				validated,
@@ -213,13 +277,15 @@ export default function harnessPlanApproval(pi: ExtensionAPI) {
 				);
 			}
 
-			const text = formatApprovePlanResultText(
-				outcome.response,
-				outcome.cancelled,
-			);
+			const text = [
+				formatApprovePlanResultText(outcome.response, outcome.cancelled),
+				...implWarnings,
+			]
+				.filter(Boolean)
+				.join("\n\n");
 			return {
 				content: [{ type: "text", text }],
-				details,
+				details: { ...details, implementation_warnings: implWarnings },
 			};
 		},
 

package/.pi/extensions/harness-run-context.ts

@@ -56,6 +56,8 @@ import {
 	writeYamlFile,
 } from "../lib/harness-yaml.js";
 import { claimExtensionLoad } from "./lib/extension-load-guard.js";
+import { isReviewRoundArtifactPath } from "./lib/plan-debate-gate.js";
+import { isReviewRoundYamlWriteAllowed } from "./lib/plan-debate-write-guard.js";
 
 // @ts-expect-error pi extensions run as ESM
 const MODULE_URL = import.meta.url;
@@ -987,6 +989,22 @@ export default function harnessRunContext(pi: ExtensionAPI) {
 					isError: true,
 				};
 			}
+			const relForGate = pathArg.replace(/\\/g, "/");
+			if (
+				isReviewRoundArtifactPath(relForGate) &&
+				!isReviewRoundYamlWriteAllowed()
+			) {
+				return {
+					content: [
+						{
+							type: "text",
+							text: `Blocked: ${pathArg} must be written via harness_debate_submit_round after lane YAML + messenger thread are complete. Parent sessions cannot author review-round files directly.`,
+						},
+					],
+					details: { path: pathArg },
+					isError: true,
+				};
+			}
 			let doc: unknown;
 			try {
 				doc = parseStructuredDocument(content, pathArg);