pi-plans 0.1.2 → 0.3.0

package/tools/refine.ts

@@ -15,12 +15,21 @@ import { Type } from "typebox";
 import * as fs from "node:fs";
 import * as path from "node:path";
 import { loadConfig, normalizeWorkdir, readActive, recordSubagent, resolveStateRootOrNull, StateError, type RoleConfig } from "../src/state.ts";
-import { buildCriticizerTask, buildReviewerTask, reviewerLanes } from "../src/refine-prompts.ts";
+import { buildCriticizerTask, buildImplementationCriticizerTask, buildImplementationReviewerTask, buildReviewerTask, reviewerLanes } from "../src/refine-prompts.ts";
+import { graphBlockForRefiner } from "../src/code-graph/prompts.ts";
 import { runPiSubagent, stripFrontmatter } from "../src/subagent.ts";
+import { RefineOverlayController, refineOverlayContext } from "../src/refine-ui.ts";
+
 
 const RefineParams = Type.Object({
 	role: StringEnum(["reviewer", "criticizer"] as const, { description: "Refinement role to run" }),
 	planPath: Type.String({ description: "Path to the PLAN_vN.md to review (absolute or relative to workdir)" }),
+	target: Type.Optional(
+		StringEnum(["plan", "implementation"] as const, {
+			description:
+				'Review target: "plan" (default) reviews the plan text; "implementation" reviews the implemented worktree against the plan\'s goals and acceptance criteria (post-execution amelioration).',
+		}),
+	),
 	focus: Type.Optional(Type.String({ description: "Specific concerns to direct the pass at" })),
 	reviewers: Type.Optional(
 		Type.Integer({
@@ -46,7 +55,30 @@ function roleGateError(role: string, roleConfig: RoleConfig | undefined, problem
 	);
 }
 
+function setupRefinementExecution(
+	ctx: ExtensionContext,
+	parentSignal: AbortSignal | undefined,
+	role: "reviewer" | "criticizer",
+	lanes: Array<{ id: string; label?: string }>,
+	modelLabel?: string,
+) {
+	const controller = new AbortController();
+	const relayAbort = () => controller.abort();
+	if (parentSignal?.aborted) controller.abort();
+	else parentSignal?.addEventListener("abort", relayAbort, { once: true });
 
+	const overlay = ctx.mode === "tui" ? new RefineOverlayController(role, lanes, relayAbort) : undefined;
+	overlay?.open(refineOverlayContext(ctx), modelLabel);
+
+	return {
+		signal: controller.signal,
+		overlay,
+		async close() {
+			await overlay?.close();
+			parentSignal?.removeEventListener("abort", relayAbort);
+		},
+	};
+}
 
 export function registerRefineTool(pi: ExtensionAPI, baseDir: string): void {
 	const agentsDir = path.join(baseDir, "agents");
@@ -60,7 +92,7 @@ export function registerRefineTool(pi: ExtensionAPI, baseDir: string): void {
 		name: "refine",
 		label: "Refine",
 		description:
-			"Run a reviewer or criticizer refinement round on a PLAN_vN.md via read-only Pi subagents. Reviewer: findings with IDs, severity, evidence, impact, fix, disposition. Criticizer: up to five adaptive questions. Use reviewers: 3 for the big-plan concurrent reviewer round. Refuses to spawn until the role's mode and model are confirmed in .git/pi_plans/config.json (ask via ask_choice, persist via the plans tool).",
+			"Run a reviewer or criticizer refinement round on a PLAN_vN.md (target=\"plan\", default) or on the implemented worktree (target=\"implementation\", post-execution amelioration) via read-only Pi subagents. Reviewer: findings with IDs, severity, evidence, impact, fix, disposition. Criticizer: up to five adaptive questions. Use reviewers: 3 for the big-plan concurrent reviewer round. Refuses to spawn until the role's mode and model are confirmed in .git/pi_plans/config.json (ask via ask_choice, persist via the plans tool).",
 		promptSnippet: "Run reviewer/criticizer plan-refinement rounds",
 		parameters: RefineParams,
 
@@ -97,15 +129,28 @@ export function registerRefineTool(pi: ExtensionAPI, baseDir: string): void {
 				}
 			};
 
+			const target = params.target ?? "plan";
+			const pickTask = (role: "reviewer" | "criticizer", lens: string | null): string => {
+				if (role === "reviewer") {
+					return target === "implementation"
+						? buildImplementationReviewerTask({ planText, planPath, lens, focus: params.focus, context: params.context })
+						: buildReviewerTask({ planText, planPath, lens, focus: params.focus, context: params.context });
+				}
+				return target === "implementation"
+					? buildImplementationCriticizerTask({ planText, planPath, focus: params.focus, context: params.context })
+					: buildCriticizerTask({ planText, planPath, focus: params.focus, context: params.context });
+			};
+
 			const systemPrompt = loadAgentPrompt(params.role);
+			const graphEnabled = config.graph_enabled === true;
+			const subagentTools = graphEnabled ? ["read", "grep", "find", "ls", "code_graph"] : undefined;
+			const graphPrompt = graphBlockForRefiner(graphEnabled);
 			const inheritModel = ctx.model ? `${ctx.model.provider}/${ctx.model.id}` : undefined;
 			const model = roleConfig.model_selector ?? inheritModel;
+			const modelLabel = model ?? "inherit";
 
 			if (roleConfig.mode === "current-session") {
-				const task =
-					params.role === "reviewer"
-						? buildReviewerTask({ planText, planPath, lens: null, focus: params.focus, context: params.context })
-						: buildCriticizerTask({ planText, planPath, focus: params.focus, context: params.context });
+				const task = pickTask(params.role, null);
 				return {
 					content: [
 						{
@@ -113,101 +158,155 @@ export function registerRefineTool(pi: ExtensionAPI, baseDir: string): void {
 							text: `Role mode is current-session: perform the read-only ${params.role} pass yourself, in this session, following this brief. Do not spawn anything.\n\n${task}`,
 						},
 					],
-					details: { mode: "current-session", role: params.role, planPath },
+					details: { mode: "current-session", role: params.role, planPath, target },
 				};
 			}
 
 			if (params.role === "criticizer") {
 				const name = `${roleConfig.name_prefix}-criticizer-${Date.now().toString(36)}`;
-				const result = await runPiSubagent({
-					systemPrompt,
-					task: buildCriticizerTask({ planText, planPath, focus: params.focus, context: params.context }),
-					cwd: workdir,
-					model,
-					signal,
-				});
-				record(name, result.ok ? result.model ?? model : null);
-				if (!result.ok) {
-					throw new Error(
-						`criticizer subagent failed: ${result.errorMessage ?? "unknown error"}${result.stderr ? `\nstderr: ${result.stderr.slice(0, 2000)}` : ""}`,
-					);
+				const execution = setupRefinementExecution(ctx, signal, "criticizer", [{ id: name, label: "criticizer" }], modelLabel);
+				try {
+					const result = await runPiSubagent({
+						systemPrompt: `${systemPrompt}\n\n${graphPrompt}`,
+						task: pickTask("criticizer", null),
+						cwd: workdir,
+						model,
+						tools: subagentTools,
+						signal: execution.signal,
+						onProgress: (event) => execution.overlay?.update(name, event),
+					});
+					execution.overlay?.complete(name, result);
+					record(name, result.ok ? result.model ?? model : null);
+					if (!result.ok) {
+						throw new Error(
+							`criticizer subagent failed: ${result.errorMessage ?? "unknown error"}${result.stderr ? `\nstderr: ${result.stderr.slice(0, 2000)}` : ""}`,
+						);
+					}
+					return {
+						content: [
+							{
+								type: "text",
+								text: `${result.output}\n\n---\nAsk each criticizer question with ask_choice (one call per question, in the configured language), record every answer, then revise the plan only after every question has an answer.`,
+							},
+						],
+						details: { mode: "delegated-subagent", role: params.role, planPath, target, model: result.model ?? model },
+					};
+				} finally {
+					await execution.close();
 				}
-				return {
-					content: [
-						{
-							type: "text",
-							text: `${result.output}\n\n---\nAsk each criticizer question with ask_choice (one call per question, in the configured language), record every answer, then revise the plan only after every question has an answer.`,
-						},
-					],
-					details: { mode: "delegated-subagent", role: params.role, planPath, model: result.model ?? model },
-				};
 			}
 
-			// Reviewer round: 1 by default, 3 for the big-plan concurrent round.
 			const count = Math.min(3, Math.max(1, params.reviewers ?? 1));
 			const lanes = reviewerLanes(count);
 			const jobs = lanes.map((lane) => {
 				const name = `${roleConfig.name_prefix}-${active?.run_id ?? "adhoc"}-${lane.id}`;
-				const task = buildReviewerTask({ planText, planPath, lens: lane.lens, focus: params.focus, context: params.context });
+				const task = pickTask("reviewer", lane.lens);
 				return { lane, name, task };
 			});
 
-			const results = await Promise.all(
-				jobs.map(async (job) => {
-					try {
-						const result = await runPiSubagent({ systemPrompt, task: job.task, cwd: workdir, model, signal });
-						record(job.name, result.ok ? result.model ?? model : null);
-						return { job, result };
-					} catch (error) {
-						record(job.name, null);
-						const message = error instanceof Error ? error.message : String(error);
-						return {
-							job,
-							result: { ok: false, output: "", model: model ?? undefined, errorMessage: message, stderr: "", turns: 0 },
-						};
-					}
-				}),
+			// Per-plan amelioration round counter (post-execution loop auditability).
+			const roundsSlot = ctx.sessionManager as unknown as { __ameliorateRounds?: Map<string, number> };
+			const nextRound = (planPath: string): number => {
+				roundsSlot.__ameliorateRounds ??= new Map();
+				const round = (roundsSlot.__ameliorateRounds.get(planPath) ?? 0) + 1;
+				roundsSlot.__ameliorateRounds.set(planPath, round);
+				return round;
+			};
+
+			const execution = setupRefinementExecution(
+				ctx,
+				signal,
+				"reviewer",
+				jobs.map((job) => ({ id: job.lane.id, label: job.lane.id })),
+				modelLabel,
 			);
+			try {
+				const results = await Promise.all(
+					jobs.map(async (job) => {
+						try {
+							const result = await runPiSubagent({
+								systemPrompt: `${systemPrompt}\n\n${graphPrompt}`,
+								task: job.task,
+								cwd: workdir,
+								model,
+								tools: subagentTools,
+								signal: execution.signal,
+								onProgress: (event) => execution.overlay?.update(job.lane.id, event),
+							});
+							execution.overlay?.complete(job.lane.id, result);
+							record(job.name, result.ok ? result.model ?? model : null);
+							if (target === "implementation" && result.ok) {
+								try {
+									pi.appendEntry("pi-plans-ameliorate", {
+										planPath,
+										phase: "round",
+										currentRound: nextRound(planPath),
+										lane: job.lane.id,
+									});
+								} catch {
+									/* appendEntry is best-effort; audit trail survives in subagents.jsonl */
+								}
+							}
+							return { job, result };
+						} catch (error) {
+							record(job.name, null);
+							const message = error instanceof Error ? error.message : String(error);
+							const result = {
+								ok: false,
+								output: "",
+								model: model ?? undefined,
+								errorMessage: message,
+								stderr: "",
+								turns: 0,
+							};
+							execution.overlay?.complete(job.lane.id, result);
+							return { job, result };
+						}
+					}),
+				);
 
-			const sections: string[] = [];
-			let failures = 0;
-			for (const { job, result } of results) {
-				const title = job.lane.lens ? `${job.name} — ${job.lane.lens}` : job.name;
-				if (!result.ok) {
-					failures += 1;
-					sections.push(`### ${title} — FAILED\n${result.errorMessage ?? "unknown error"}`);
-					continue;
+				const sections: string[] = [];
+				let failures = 0;
+				for (const { job, result } of results) {
+					const title = job.lane.lens ? `${job.name} — ${job.lane.lens}` : job.name;
+					if (!result.ok) {
+						failures += 1;
+						sections.push(`### ${title} — FAILED\n${result.errorMessage ?? "unknown error"}`);
+						continue;
+					}
+					sections.push(`### ${title}\n${result.output}`);
+				}
+				if (failures === results.length) {
+					const first = results[0];
+					throw new Error(
+						`all reviewer subagents failed: ${first?.result.errorMessage ?? "unknown error"}${first?.result.stderr ? `\nstderr: ${first.result.stderr.slice(0, 2000)}` : ""}${model ? `\nIf the model selector "${model}" is unavailable, reset the confirmation (plans set-role --reset-confirmation) and re-ask the model-confirmation question.` : ""}`,
+					);
 				}
-				sections.push(`### ${title}\n${result.output}`);
-			}
-			if (failures === results.length) {
-				const first = results[0];
-				throw new Error(
-					`all reviewer subagents failed: ${first?.result.errorMessage ?? "unknown error"}${first?.result.stderr ? `\nstderr: ${first.result.stderr.slice(0, 2000)}` : ""}${model ? `\nIf the model selector "${model}" is unavailable, reset the confirmation (plans set-role --reset-confirmation) and re-ask the model-confirmation question.` : ""}`,
-				);
-			}
 
-			const combined = sections.join("\n\n---\n\n");
-			const truncation = truncateHead(combined, { maxLines: 2000, maxBytes: 50 * 1024 });
-			let text = truncation.content;
-			if (truncation.truncated) text += `\n\n[Output truncated; full outputs remain in this tool result's details.]`;
+				const combined = sections.join("\n\n---\n\n");
+				const truncation = truncateHead(combined, { maxLines: 2000, maxBytes: 50 * 1024 });
+				let text = truncation.content;
+				if (truncation.truncated) text += `\n\n[Output truncated; full outputs remain in this tool result's details.]`;
 
-			return {
-				content: [
-					{
-						type: "text",
-						text: `${text}\n\n---\nConsolidate: merge and dedupe findings into PLAN_vN_reviewer_comments.md${count === 3 ? " (one consolidated file; keep each finding's source reviewer, severity, evidence, and disposition)" : ""}, accept or reject each finding on repo/reference evidence, surface at most five high-priority findings to the user, then immediately ask the next refinement-mode question with ask_choice.`,
+				return {
+					content: [
+						{
+							type: "text",
+							text: `${text}\n\n---\nConsolidate: merge and dedupe findings into PLAN_vN_reviewer_comments.md${count === 3 ? " (one consolidated file; keep each finding's source reviewer, severity, evidence, and disposition)" : ""}, accept or reject each finding on repo/reference evidence, surface at most five high-priority findings to the user, then immediately ask the next refinement-mode question with ask_choice.`,
+						},
+					],
+					details: {
+						mode: "delegated-subagent",
+						role: "reviewer",
+						planPath,
+						reviewers: count,
+						model,
+						outputs: results.map(({ job, result }) => ({ name: job.name, lane: job.lane.id, lens: job.lane.lens, ok: result.ok, output: result.output, stderr: result.stderr, turns: result.turns })),
 					},
-				],
-				details: {
-					mode: "delegated-subagent",
-					role: "reviewer",
-					planPath,
-					reviewers: count,
-					model,
-					outputs: results.map(({ job, result }) => ({ name: job.name, lane: job.lane.id, lens: job.lane.lens, ok: result.ok, output: result.output, stderr: result.stderr, turns: result.turns })),
-				},
-			};
+				};
+			} finally {
+				await execution.close();
+			}
 		},
 
 		renderCall(args, theme) {
@@ -218,6 +317,7 @@ export function registerRefineTool(pi: ExtensionAPI, baseDir: string): void {
 				theme.fg("muted", count > 1 ? ` ×${count}` : "");
 			const short = args.planPath ? args.planPath.split("/").pop() : "";
 			if (short) text += theme.fg("dim", ` ${short}`);
+			if (args.target === "implementation") text += theme.fg("dim", "  (implementation)");
 			if (args.focus) text += `\n${theme.fg("dim", `  focus: ${args.focus.slice(0, 80)}`)}`;
 			return new Text(text, 0, 0);
 		},