guardian-framework 0.1.35 → 0.1.37

package/dist/cli.js

@@ -1335,7 +1335,7 @@ __export(exports_package, {
   bin: () => bin,
   author: () => author
 });
-var name = "guardian-framework", version = "0.1.35", description = "Token-optimized agentic framework scaffolder with pi-first architecture", type = "module", main = "dist/exports.js", exports, types = "dist/exports.d.ts", bin, files, engines, scripts, publishConfig, pi, repository, homepage = "https://github.com/arman-jalili/guardian-framework#readme", bugs, dependencies, devDependencies, keywords, author = "Arman Wolkensteiner-Jalili", license = "MIT", package_default;
+var name = "guardian-framework", version = "0.1.37", description = "Token-optimized agentic framework scaffolder with pi-first architecture", type = "module", main = "dist/exports.js", exports, types = "dist/exports.d.ts", bin, files, engines, scripts, publishConfig, pi, repository, homepage = "https://github.com/arman-jalili/guardian-framework#readme", bugs, dependencies, devDependencies, keywords, author = "Arman Wolkensteiner-Jalili", license = "MIT", package_default;
 var init_package = __esm(() => {
   exports = {
     ".": {

package/dist/exports.js

@@ -995,7 +995,7 @@ __export(exports_package, {
   bin: () => bin,
   author: () => author
 });
-var name = "guardian-framework", version = "0.1.35", description = "Token-optimized agentic framework scaffolder with pi-first architecture", type = "module", main = "dist/exports.js", exports, types = "dist/exports.d.ts", bin, files, engines, scripts, publishConfig, pi, repository, homepage = "https://github.com/arman-jalili/guardian-framework#readme", bugs, dependencies, devDependencies, keywords, author = "Arman Wolkensteiner-Jalili", license = "MIT", package_default;
+var name = "guardian-framework", version = "0.1.37", description = "Token-optimized agentic framework scaffolder with pi-first architecture", type = "module", main = "dist/exports.js", exports, types = "dist/exports.d.ts", bin, files, engines, scripts, publishConfig, pi, repository, homepage = "https://github.com/arman-jalili/guardian-framework#readme", bugs, dependencies, devDependencies, keywords, author = "Arman Wolkensteiner-Jalili", license = "MIT", package_default;
 var init_package = __esm(() => {
   exports = {
     ".": {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "guardian-framework",
-	"version": "0.1.35",
+	"version": "0.1.37",
 	"description": "Token-optimized agentic framework scaffolder with pi-first architecture",
 	"type": "module",
 	"main": "dist/exports.js",

package/templates/pi/extensions/pipeline.ts

@@ -1,4 +1,7 @@
 /**
+ * Canonical Reference: .pi/architecture/modules/core-libraries.md
+ * Last Sync: 2026-05-31
+
  * Pipeline Extension for pi
  *
  * Multi-step workflow engine that iterates over items (issues, tasks, etc.)
@@ -18,7 +21,7 @@
  */
 
 import { execSync } from "node:child_process";
-import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { existsSync, mkdirSync, readFileSync, readdirSync, writeFileSync } from "node:fs";
 import { dirname, join } from "node:path";
 
 // ── Validator Scripts ──
@@ -332,19 +335,199 @@ class PipelineManager {
 		this.state = loadPipelineState(cwd);
 	}
 
-	getState(): PipelineState | null {
-		return this.state;
+	/**
+	 * Reconcile pipeline state against ground truth (git, GitHub, validators).
+	 * Also updates module markdown docs when items complete.
+	 * Call this on session_start and before any state-dependent operation.
+	 */
+	reconcile(): void {
+		if (!this.state) return;
+		let changed = false;
+
+		for (let i = 0; i < this.state.items.length; i++) {
+			const item = this.state.items[i];
+			const slug = item.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "");
+			const branch = `feat/${slug}`;
+			const result = this.state.results.find((r) => r.item === item);
+
+			// Check ground truth
+			const branchExists = this.gitBranchExists(branch);
+			const prMerged = this.ghPrMerged(branch);
+			const prExists = this.ghPrExists(branch);
+			const hasCommits = branchExists && this.branchHasCommits(branch);
+
+			if (prMerged) {
+				// All steps done — mark item complete
+				if (!result || result.status !== "done") {
+					const itemResult: ItemResult = {
+						item,
+						status: "done",
+						stepResults: this.state.steps.map((s) => ({ step: s.name, status: "passed", reason: "reconciled" })),
+					};
+					// Replace or add
+					const idx = this.state.results.findIndex((r) => r.item === item);
+					if (idx >= 0) this.state.results[idx] = itemResult;
+					else this.state.results.push(itemResult);
+					changed = true;
+					this.updateModuleDocStatus(item, "implemented");
+				}
+			} else if (prExists) {
+				// PR open — implement+validate+create-mr done, waiting on merge
+				if (!result || result.status === "skipped") {
+					const steps = this.state.steps;
+					const stepResults = steps.map((s, idx) => ({
+						step: s.name,
+						status: idx < steps.length - 1 ? "passed" as const : "skipped" as const,
+						reason: idx < steps.length - 1 ? "reconciled" : "waiting for merge",
+					}));
+					const itemResult: ItemResult = { item, status: "in-progress", stepResults };
+					const idx = this.state.results.findIndex((r) => r.item === item);
+					if (idx >= 0) this.state.results[idx] = itemResult;
+					else this.state.results.push(itemResult);
+					changed = true;
+				}
+			} else if (hasCommits) {
+				// Branch with commits — implement done, rest pending
+				if (!result || result.status === "skipped") {
+					const stepResults = [{ step: "implement", status: "passed" as const, reason: "reconciled" }];
+					const itemResult: ItemResult = { item, status: "in-progress", stepResults };
+					const idx = this.state.results.findIndex((r) => r.item === item);
+					if (idx >= 0) this.state.results[idx] = itemResult;
+					else this.state.results.push(itemResult);
+					changed = true;
+				}
+			}
+		}
+
+		// If all items done, update overall status
+		if (this.state.results.every((r) => r.status === "done") && this.state.items.length > 0) {
+			this.state.status = "done";
+			this.state.currentItemIndex = this.state.items.length;
+			this.state.currentStepIndex = 0;
+			changed = true;
+		}
+
+		// Reposition currentItemIndex to first non-done item
+		const firstUndone = this.state.items.findIndex((item, idx) => {
+			const r = this.state!.results.find((res) => res.item === item);
+			return !r || r.status !== "done";
+		});
+		if (firstUndone >= 0) {
+			this.state.currentItemIndex = firstUndone;
+			this.state.currentStepIndex = 0;
+		} else if (this.state.items.length > 0) {
+			// All done
+			this.state.currentItemIndex = this.state.items.length;
+			this.state.currentStepIndex = 0;
+		}
+
+		if (changed) {
+			this.state.updatedAt = new Date().toISOString();
+			savePipelineState(this.cwd, this.state);
+		}
+	}
+
+	private gitBranchExists(branch: string): boolean {
+		try {
+			const result = execSync(`git branch -a --list "${branch}" 2>/dev/null`, { cwd: this.cwd, encoding: "utf-8" });
+			return result.trim().length > 0;
+		} catch { return false; }
+	}
+
+	private branchHasCommits(branch: string): boolean {
+		try {
+			const result = execSync(`git log --oneline "${branch}" 2>/dev/null | head -1`, { cwd: this.cwd, encoding: "utf-8" });
+			return result.trim().length > 0;
+		} catch { return false; }
+	}
+
+	private ghPrExists(branch: string): boolean {
+		try {
+			const result = execSync(`gh pr list --head "${branch}" --json number --jq "length" 2>/dev/null`, { cwd: this.cwd, encoding: "utf-8" });
+			return parseInt(result.trim()) > 0;
+		} catch { return false; }
+	}
+
+	private ghPrMerged(branch: string): boolean {
+		try {
+			const result = execSync(`gh pr list --head "${branch}" --json state,mergedAt --jq ".[] | select(.state==\"MERGED\") | .mergedAt" 2>/dev/null`, { cwd: this.cwd, encoding: "utf-8" });
+			return result.trim().length > 0;
+		} catch { return false; }
 	}
 
-	reload(): void {
-		const raw = loadPipelineState(this.cwd);
-		if (raw) {
-			// Migrate old string-step format to StepConfig objects
-			if (raw.steps.length > 0 && typeof raw.steps[0] === "string") {
-				raw.steps = buildSteps(raw.steps as unknown as string[]);
+	/**
+	 * Update module markdown doc status when an item is confirmed done.
+	 * Looks for .pi/architecture/modules/<item>.md and replaces `status: planned` with `status: implemented`.
+	 */
+	private updateModuleDocStatus(item: string, newStatus: string): void {
+		const modulesDir = join(this.cwd, ".pi", "architecture", "modules");
+		try {
+			const files = readdirSync(modulesDir).filter((f) => f.endsWith(".md") && f !== "module-template.md");
+			// Match by module name (kebab-case from item name)
+			const slug = item.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "");
+			for (const file of files) {
+				if (file.replace(".md", "") === slug || file.includes(slug)) {
+					const filePath = join(modulesDir, file);
+					let content = readFileSync(filePath, "utf-8");
+					const oldStatus = content.match(/\*\*Status:\*\*\s*(\w+)/);
+					if (oldStatus && oldStatus[1] !== newStatus) {
+						content = content.replace(/\*\*Status:\*\*\s*\w+/, `**Status:** ${newStatus}`);
+						// Also update status: planned → status: implemented markers
+						content = content.replace(/^status: planned$/gm, `status: ${newStatus}`);
+						writeFileSync(filePath, content, "utf-8");
+					}
+					break;
+				}
 			}
+		} catch { /* modules dir may not exist */ }
+	}
+
+	/**
+	 * Verify the current step's work actually happened before advancing.
+	 * For "implement" step: check git branch has commits.
+	 * For "validate" step: run acceptance gates.
+	 * For "create-mr" step: check PR exists.
+	 * For "merge" step: check PR is merged.
+	 */
+	verifyCurrentStep(): { verified: boolean; reason: string } {
+		if (!this.state) return { verified: false, reason: "No pipeline state" };
+		const item = this.state.items[this.state.currentItemIndex];
+		const step = this.state.steps[this.state.currentStepIndex];
+		if (!step) return { verified: true, reason: "No current step" };
+
+		const slug = item.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "");
+		const branch = `feat/${slug}`;
+
+		switch (step.name) {
+			case "implement": {
+				if (!this.gitBranchExists(branch) || !this.branchHasCommits(branch)) {
+					return { verified: false, reason: `No commits found on branch ${branch}. Implement the feature first.` };
+				}
+				return { verified: true, reason: "Commits found on branch" };
+			}
+			case "create-mr": {
+				if (!this.ghPrExists(branch)) {
+					return { verified: false, reason: `No PR found for branch ${branch}. Create a PR first.` };
+				}
+				return { verified: true, reason: "PR exists" };
+			}
+			case "merge": {
+				if (!this.ghPrMerged(branch)) {
+					return { verified: false, reason: `PR for ${branch} is not merged yet.` };
+				}
+				return { verified: true, reason: "PR merged" };
+			}
+			default:
+				return { verified: true, reason: "Unknown step — skipping verification" };
 		}
-		this.state = raw;
+	}
+
+	getState(): PipelineState | null {
+		return this.state;
+	}
+
+	getState(): PipelineState | null {
+		return this.state;
 	}
 
 	create(
@@ -424,6 +607,28 @@ class PipelineManager {
 
 	advanceStep(): void {
 		if (!this.state) return;
+
+		// Before advancing, verify the current step's work actually happened
+		if (this.state.currentStepIndex < this.state.steps.length) {
+			const { verified, reason } = this.verifyCurrentStep();
+			if (!verified) {
+				// Reality disagrees with state — reconcile from git and refuse to advance
+				this.reconcile();
+				return; // don't advance, state was wrong
+			}
+
+			// Auto-run acceptance gates for validate steps
+			const step = this.state.steps[this.state.currentStepIndex];
+			if (step.name === "validate" && step.acceptance.type !== "none") {
+				const { allPassed, errors } = this.runAcceptanceGates(step);
+				if (!allPassed) {
+					const item = this.state.items[this.state.currentItemIndex];
+					this.markStepFailed(step.name, `Acceptance failed: ${errors.join("; ")}`);
+					return; // don't advance, acceptance failed
+				}
+			}
+		}
+
 		this.state.currentStepIndex++;
 		this.state.updatedAt = new Date().toISOString();
 
@@ -432,8 +637,6 @@ class PipelineManager {
 			const item = this.state.items[this.state.currentItemIndex];
 			let result = this.state.results.find((r) => r.item === item);
 
-			// If no result entry exists (e.g. advanceStep called before any steps ran),
-			// create one so the item is tracked.
 			if (!result) {
 				result = { item, status: "skipped", stepResults: [] };
 				this.state.results.push(result);
@@ -444,6 +647,8 @@ class PipelineManager {
 					result.status = "skipped";
 				} else {
 					result.status = "done";
+					// Update module doc to implemented
+					this.updateModuleDocStatus(item, "implemented");
 				}
 			} else {
 				result.status = "failed";
@@ -456,39 +661,47 @@ class PipelineManager {
 
 			if (this.state.currentItemIndex >= this.state.items.length) {
 				this.state.status = "done";
+			}
+		}
 
-				// Auto-advance roadmap when module epic completes
-				const roadmapFile = join(this.cwd, ".pi/.guardian-roadmap-state.json");
-				if (existsSync(roadmapFile)) {
-					try {
-						const roadmap = JSON.parse(readFileSync(roadmapFile, "utf-8"));
-						const epicName = this.state.name;
-						const currentPhase = roadmap.phases?.[roadmap.currentPhaseIndex];
-						if (currentPhase && epicName) {
-							// Mark module as completed
-							const completed = new Set(currentPhase.completedModules || []);
-							completed.add(epicName);
-							currentPhase.completedModules = Array.from(completed);
-
-							// Check if all modules done → mark phase done
-							const allDone = currentPhase.modules.every(
-								(m: { name: string }) => completed.has(m.name),
-							);
-							if (allDone) {
-								currentPhase.status = "done";
-							}
-
-							roadmap.updatedAt = new Date().toISOString();
-							writeFileSync(roadmapFile, JSON.stringify(roadmap, null, 2));
-						}
-					} catch (err) {
-						// Silently fail — roadmap update is best-effort
-					}
+		savePipelineState(this.cwd, this.state);
+	}
+
+	/**
+	 * Run acceptance gates for a step and return pass/fail.
+	 */
+	private runAcceptanceGates(step: StepConfig): { allPassed: boolean; errors: string[] } {
+		const errors: string[] = [];
+		const acceptance = step.acceptance;
+
+		if (acceptance.type === "none") return { allPassed: true, errors: [] };
+
+		if (acceptance.type === "shell") {
+			try {
+				execSync(`bash -c "${acceptance.command}"`, { cwd: this.cwd, timeout: 300_000, encoding: "utf-8" });
+				return { allPassed: true, errors: [] };
+			} catch (e: unknown) {
+				const err = e as { stdout?: string };
+				return { allPassed: false, errors: [err.stdout?.slice(0, 200) || "shell failed"] };
+			}
+		}
+
+		if (acceptance.type === "validator") {
+			for (const validator of acceptance.validators) {
+				const scriptPath = VALIDATOR_SCRIPTS[validator];
+				if (!scriptPath) { errors.push(`Unknown validator: ${validator}`); continue; }
+				try {
+					execSync(`bash -c "${scriptPath}"`, { cwd: this.cwd, timeout: 120_000, encoding: "utf-8" });
+				} catch (e: unknown) {
+					const err = e as { stdout?: string };
+					errors.push(`${validator}: ${(err.stdout || "").slice(0, 200)}`);
 				}
 			}
+			return { allPassed: errors.length === 0, errors };
 		}
 
-		savePipelineState(this.cwd, this.state);
+		// LLM gates — can't auto-run, skip verification
+		return { allPassed: true, errors: [] };
 	}
 
 	markStepFailed(stepName: string, reason: string): void {
@@ -519,88 +732,6 @@ class PipelineManager {
 	}
 }
 
-// ── Step-specific instruction builders ──
-
-function getDefaultBranch(cwd: string): string {
-	try {
-		const symRef = execSync("git symbolic-ref refs/remotes/origin/HEAD", {
-			cwd, encoding: "utf-8"
-		}).trim();
-		return symRef.replace(/^refs\/remotes\/origin\//, "");
-	} catch {
-		return "main";
-	}
-}
-
-function buildImplementInstructions(issueId: string, branchExists: boolean): string {
-	const slug = issueId.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "");
-	const branch = `feat/${slug}`;
-
-	if (branchExists) {
-		return [
-			"## MANDATORY GIT WORKFLOW",
-			"",
-			`Branch \`${branch}\` already exists. Continue working on it.`,
-			"",
-			"1. **CHECKOUT:** `git checkout " + branch + "`",
-			"2. Implement the issue requirements",
-			"3. **COMMIT every logical chunk:** `git add <files> && git commit -m \"feat: description\"`",
-			"4. **PUSH regularly:** `git push origin " + branch + "`",
-			"5. When implementation complete, commit+push final changes then call `pipeline_run_acceptance`",
-			"",
-			"⛔ DO NOT skip git. Every commit must be pushed. This is MANDATORY.",
-		].join("\n");
-	}
-
-	return [
-		"## MANDATORY GIT WORKFLOW — DO NOT SKIP",
-		"",
-		"1. **CREATE BRANCH:** `git checkout -b " + branch + "`",
-		"2. Implement the issue requirements",
-		"3. **COMMIT every logical chunk:** `git add <files> && git commit -m \"feat: description\"`",
-		"4. **PUSH regularly:** `git push origin " + branch + "`",
-		"5. When implementation complete, commit+push final changes then call `pipeline_run_acceptance`",
-		"",
-		"⛔ **CRITICAL:** You MUST create a branch, commit, and push. The pipeline validates git history.",
-		"Do NOT implement directly on main. Do NOT skip git operations.",
-	].join("\n");
-}
-
-function buildCreateMRInstructions(issueId: string, repo: string, defaultBranch: string): string {
-	const slug = issueId.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "");
-	const branch = `feat/${slug}`;
-
-	return [
-		"## MANDATORY: CREATE PULL REQUEST",
-		"",
-		"1. **ENSURE pushed:** `git push origin " + branch + "`",
-		"2. **CREATE PR:** `gh pr create --base " + defaultBranch + " --head " + branch + " --title \"" + issueId + ": <description>\" --body \"Closes #<issue-number>\"`",
-		"3. Wait for CI checks to pass on the PR",
-		"4. If checks fail, fix, commit+push, re-check",
-		"5. When PR is created and CI passes, call `pipeline_advance`",
-		"",
-		"⛔ **CRITICAL:** You MUST create a PR via `gh pr create`. Do NOT skip this.",
-		"The repository is: " + (repo || "check guardian-manifest.json"),
-	].join("\n");
-}
-
-function buildMergeInstructions(issueId: string, defaultBranch: string): string {
-	const slug = issueId.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "");
-	const branch = `feat/${slug}`;
-
-	return [
-		"## MANDATORY: MERGE PULL REQUEST",
-		"",
-		"1. Find the PR for branch `" + branch + "`: `gh pr list --head " + branch + " --json number --jq '.[0].number'`",
-		"2. **MERGE PR:** `gh pr merge <PR_NUMBER> --squash --delete-branch`",
-		"3. **CHECKOUT main:** `git checkout " + defaultBranch + "`",
-		"4. **PULL latest:** `git pull origin " + defaultBranch + "`",
-		"5. Call `pipeline_advance`",
-		"",
-		"⛔ **CRITICAL:** You MUST merge the PR via `gh pr merge`. Do NOT skip this.",
-	].join("\n");
-}
-
 // ── Extension ──
 
 export default function (pi: ExtensionAPI) {
@@ -608,6 +739,8 @@ export default function (pi: ExtensionAPI) {
 
 	pi.on("session_start", async (_event, ctx) => {
 		manager = new PipelineManager(ctx.cwd);
+		// Always reconcile pipeline state against ground truth on session start
+		manager.reconcile();
 		const state = manager.getState();
 		if (state && state.status !== "done" && state.status !== "aborted") {
 			ctx.ui.setStatus("pipeline", statusLine(state));
@@ -619,7 +752,6 @@ export default function (pi: ExtensionAPI) {
 		description: "Manage multi-step pipeline workflows",
 		handler: async (args, ctx) => {
 			if (!manager) manager = new PipelineManager(ctx.cwd);
-			manager.reload();
 			const state = manager.getState();
 
 			// pi passes args as a string. Split into tokens.
@@ -754,7 +886,6 @@ export default function (pi: ExtensionAPI) {
 		parameters: { type: "object", properties: {} },
 		async execute(_toolCallId, _params, _signal, _onUpdate, ctx) {
 			if (!manager) manager = new PipelineManager(ctx.cwd);
-			manager.reload();
 			const state = manager.getState();
 			if (!state) {
 				return { content: [{ type: "text" as const, text: "No active pipeline." }] };
@@ -776,7 +907,6 @@ export default function (pi: ExtensionAPI) {
 		},
 		async execute(_toolCallId, params, _signal, _onUpdate, ctx) {
 			if (!manager) manager = new PipelineManager(ctx.cwd);
-			manager.reload();
 			const state = manager.getState();
 			if (!state || state.status !== "running") {
 				return { content: [{ type: "text" as const, text: "No running pipeline." }] };
@@ -839,20 +969,12 @@ export default function (pi: ExtensionAPI) {
 					`**Next task:** Item "${currentItem}" → Step: implement`,
 					"",
 					"**Instructions:**",
-					"1. Create branch: `feat/${currentItem}`",
-					"2. Review the issue context below",
-					"3. Implement the component according to the issue spec",
-					"4. Run `pipeline_run_acceptance` to validate",
-					"5. Call `pipeline_advance` when done",
+					"1. Review the issue context below",
+					"2. Implement the component according to the issue spec",
+					"3. Run `pipeline_run_acceptance` to validate",
+					"4. Call `pipeline_advance` when done",
 					"",
-					"**Available tools:**",
-					"- `pipeline_next_task` — get full context for current step",
-					"- `pipeline_run_acceptance` — run validators (CI, tests, security, shell, LLM)",
-					"- `pipeline_advance` — mark step passed, advance to next",
-					"- `pipeline_fail` — mark step failed, skip remaining steps for this item",
-					"- `pipeline_status` — check overall pipeline progress",
-					"",
-					"⚠️ **IMPORTANT:** After each step, call `pipeline_run_acceptance` then `pipeline_advance`. The pipeline flows: implement → validate → create-mr → merge. Continue through ALL items — do not stop after completing one.",
+					"⚠️ **IMPORTANT:** After you complete this item and call `pipeline_advance`, the pipeline will automatically advance to the next step. Continue this loop until all items are done. Do not stop after completing a single item — keep going through implement → validate → create-mr → merge for every item.",
 					"",
 					"---",
 					"",
@@ -884,7 +1006,6 @@ export default function (pi: ExtensionAPI) {
 		},
 		async execute(_toolCallId, params, _signal, _onUpdate, ctx) {
 			if (!manager) manager = new PipelineManager(ctx.cwd);
-			manager.reload();
 			const state = manager.getState();
 			if (!state || state.status !== "running") {
 				return { content: [{ type: "text" as const, text: "No running pipeline." }] };
@@ -980,7 +1101,6 @@ export default function (pi: ExtensionAPI) {
 		},
 		async execute(_toolCallId, params, _signal, _onUpdate, ctx) {
 			if (!manager) manager = new PipelineManager(ctx.cwd);
-			manager.reload();
 			const state = manager.getState();
 			if (!state || state.status !== "running") {
 				return { content: [{ type: "text" as const, text: "No running pipeline." }] };
@@ -1020,30 +1140,6 @@ export default function (pi: ExtensionAPI) {
 				}
 			}
 
-			// Build step-specific git-mandatory instructions
-			const repo = readRepository(ctx.cwd) || "";
-			const defaultBranch = getDefaultBranch(ctx.cwd);
-			const slug = issueId.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "");
-			const branch = `feat/${slug}`;
-
-			let stepInstructions = "";
-			if (step.name === "implement") {
-				let branchExists = false;
-				try {
-					execSync(`git rev-parse --verify ${branch}`, { cwd: ctx.cwd, encoding: "utf-8" });
-					branchExists = true;
-				} catch { /* doesn't exist */ }
-				stepInstructions = buildImplementInstructions(issueId, branchExists);
-			} else if (step.name === "validate") {
-				stepInstructions = "## VALIDATION STEP\n\n1. Ensure all changes committed+push to feature branch\n2. Call `pipeline_run_acceptance`\n3. If pass: `pipeline_advance`. If fail: fix, commit+push, re-run.\n\n⛔ All changes must be committed and pushed before validation.";
-			} else if (step.name === "create-mr") {
-				stepInstructions = buildCreateMRInstructions(issueId, repo, defaultBranch);
-			} else if (step.name === "merge") {
-				stepInstructions = buildMergeInstructions(issueId, defaultBranch);
-			} else {
-				stepInstructions = "## Instructions\n\n1. Complete the work for this step\n2. Commit and push all changes\n3. Call `pipeline_run_acceptance` then `pipeline_advance`";
-			}
-
 			const text = [
 				"## Pipeline Task",
 				"",
@@ -1054,10 +1150,6 @@ export default function (pi: ExtensionAPI) {
 				"",
 				"---",
 				"",
-				stepInstructions,
-				"",
-				"---",
-				"",
 				stepPrompt || "",
 				"",
 				"---",
@@ -1065,6 +1157,14 @@ export default function (pi: ExtensionAPI) {
 				"## Issue Context",
 				"",
 				issueContent,
+				"",
+				"---",
+				"",
+				"**Instructions:**",
+				"1. Review the issue context above",
+				"2. Follow the step prompt instructions",
+				"3. When complete, call `pipeline_run_acceptance` to validate your work",
+				"4. Then call `pipeline_advance` to move to the next step",
 			].join("\n");
 
 			return { content: [{ type: "text" as const, text }] };
@@ -1079,7 +1179,6 @@ export default function (pi: ExtensionAPI) {
 		parameters: { type: "object", properties: {} },
 		async execute(_toolCallId, _params, _signal, _onUpdate, ctx) {
 			if (!manager) manager = new PipelineManager(ctx.cwd);
-			manager.reload();
 			const state = manager.getState();
 			if (!state || state.status !== "running") {
 				return { content: [{ type: "text" as const, text: "No running pipeline." }] };
@@ -1095,45 +1194,6 @@ export default function (pi: ExtensionAPI) {
 				};
 			}
 
-			if (acceptance.type === "llm") {
-				const promptPath = join(ctx.cwd, acceptance.prompt);
-				let validatorPrompt = "";
-				try {
-					if (existsSync(promptPath)) {
-						validatorPrompt = readFileSync(promptPath, "utf-8");
-					}
-				} catch {
-					// ignore
-				}
-				if (!validatorPrompt) {
-					return {
-						content: [{
-							type: "text" as const,
-							text: `LLM validator prompt not found: ${acceptance.prompt}. Skipping gate.`,
-						}],
-					};
-				}
-				return {
-					content: [{
-						type: "text" as const,
-						text: [
-							`## LLM Validator: ${step.name}`,
-							"",
-							"Read the validator agent definition below. Execute it as an agent:",
-							"1. Read and understand the validation criteria",
-							"2. Audit the current implementation against each criterion",
-							"3. Report pass/fail with evidence for each criterion",
-							"4. If all pass, call `pipeline_advance`",
-							"5. If any fail, fix the issues and re-run acceptance",
-							"",
-							"---",
-							"",
-							validatorPrompt,
-						].join("\n"),
-					}],
-				};
-			}
-
 			if (acceptance.type === "shell") {
 				const lines: string[] = [`## Acceptance Gate: ${step.name}\n`];
 				const scriptPath = acceptance.command;
@@ -1226,21 +1286,8 @@ function buildSteps(stepNames: string[]): StepConfig[] {
 		},
 		merge: {
 			name: "merge",
-			prompt: ".pi/prompts/issue-merge.md",
 			acceptance: { type: "validator", validators: ["ci", "canonical"] },
 		},
-		"architecture-validator": {
-			name: "architecture-validator",
-			acceptance: { type: "llm", prompt: ".pi/agents/architecture-validator.md" },
-		},
-		"security-validator": {
-			name: "security-validator",
-			acceptance: { type: "llm", prompt: ".pi/agents/security-validator.md" },
-		},
-		"operations-validator": {
-			name: "operations-validator",
-			acceptance: { type: "llm", prompt: ".pi/agents/operations-validator.md" },
-		},
 		document: {
 			name: "document",
 			prompt: ".pi/prompts/blueprint-update.md",

package/templates/pi/preflight_report.json

@@ -1,5 +1,5 @@
 {
-  "timestamp": "2026-07-03T21:25:26Z",
+  "timestamp": "2026-07-03T21:41:44Z",
   "mode": "all",
   "stages_run": [],
   "summary": {