@overdeck/desktop 0.45.22 → 0.45.24

package/server/{verification-runner-FiuAZ-H2.js → verification-runner-CkgX6EtI.js}

@@ -1,22 +1,22 @@
-import { Hn as init_projects, fr as init_issue_id, ii as init_paths, jr as init_errors, kn as findProjectByPathSync, mn as init_state_plane, nr as resolveProjectFromIssueSync, oi as packageRoot, ri as getOverdeckHome } from "./config-yaml-ig8Nwtiw.js";
-import { c as init_review_status, f as markWorkspaceStuck, s as getReviewStatusSync, y as setReviewStatusSync } from "./review-status-DFRjDFef.js";
-import { $ as stopAgent, Kn as setAgentPaused, L as messageAgent, s as init_agents } from "./queries-ZABd5aXP.js";
-import { n as init_tracker_utils } from "./tracker-utils-CawsPSS2.js";
+import { Br as getOverdeckHome, Tn as init_projects, Ur as packageRoot, Vr as init_paths, Yn as init_issue_id, Yt as init_state_plane, fn as findProjectByPathSync, mr as init_errors, zn as resolveProjectFromIssueSync } from "./config-yaml-DySPNmKN.js";
+import { b as setReviewStatusSync, c as getReviewStatusSync, l as init_review_status, p as markWorkspaceStuck } from "./review-status-kZj_KyCk.js";
+import { X as messageAgent, b as init_agents, ft as stopAgent, ur as setAgentPaused } from "./queries-CjNIf-Ub.js";
+import { n as init_tracker_utils } from "./tracker-utils-DHv5pSDT.js";
 import { i as readReviewStatusMap, n as init_review_status_source } from "./review-status-source-CxuEjLGg.js";
-import { m as readWorkspacePlanSync, o as init_io, t as VBriefMergeConflictError, v as init_types, y as subItemsOf } from "./io-DQR9PMgS.js";
-import { a as writeFeedbackFile, i as init_feedback_writer } from "./feedback-writer-BXP6g75N.js";
-import { n as resolveIssueFeedbackTarget, r as surfaceIssueFeedbackNeedsYou, t as init_feedback_target } from "./feedback-target-DZ-iAnAa.js";
-import { n as init_shadow_utils } from "./shadow-utils-CYMRPeRT.js";
-import { i as runQualityGates, n as init_validation, t as DEFAULT_GATES } from "./validation-CabEISJT.js";
-import { r as writeVerificationArtifact, t as readVerificationArtifact } from "./verification-artifact-BuTA1QbL.js";
-import { n as getVBriefACStatusSync } from "./acceptance-criteria-BH7ac_1G.js";
+import { c as resolveWorkspaceRepoRootsSync, r as init_project_repos } from "./project-repos-B6GycDh9.js";
+import { o as init_lifecycle, s as isXBriefFilename } from "./lifecycle-yPd___5E.js";
+import { m as readWorkspacePlanSync, o as init_io, t as XBriefMergeConflictError, v as init_types, y as subItemsOf } from "./io-C9kF1wtJ.js";
+import { a as writeFeedbackFile, i as init_feedback_writer } from "./feedback-writer-CY5L1lB7.js";
+import { n as resolveIssueFeedbackTarget, r as surfaceIssueFeedbackNeedsYou, t as init_feedback_target } from "./feedback-target-7mqqwrX6.js";
+import { n as init_shadow_utils } from "./shadow-utils-Db3oroFG.js";
+import { i as runQualityGates, n as init_validation, t as DEFAULT_GATES } from "./validation-Dw1pzDzr.js";
+import { r as writeVerificationArtifact, t as readVerificationArtifact } from "./verification-artifact-TVFSz_q1.js";
+import { n as getXBriefACStatusSync } from "./acceptance-criteria-DDCnXF58.js";
 import { join } from "node:path";
 import { Data, Effect } from "effect";
-import { existsSync } from "fs";
 import { basename as basename$1, dirname as dirname$1, join as join$1 } from "path";
 import { homedir } from "os";
-import { closeSync as closeSync$1, existsSync as existsSync$1, mkdirSync as mkdirSync$1, openSync as openSync$1, readFileSync as readFileSync$1, renameSync as renameSync$1, writeFileSync as writeFileSync$1 } from "node:fs";
-import { readdir } from "fs/promises";
+import { closeSync, existsSync, mkdirSync, openSync, readFileSync, renameSync, writeFileSync } from "node:fs";
 import { exec, spawn } from "node:child_process";
 import { promisify } from "node:util";
 import { exec as exec$1 } from "child_process";
@@ -57,53 +57,80 @@ function isProcessAlive(pid) {
 }
 function readVerificationWorkerState(issueId) {
 	try {
-		const parsed = JSON.parse(readFileSync$1(statePath(issueId), "utf8"));
-		return parsed.issueId === issueId && Number.isInteger(parsed.pid) ? parsed : null;
+		const parsed = JSON.parse(readFileSync(statePath(issueId), "utf8"));
+		if (parsed.issueId !== issueId || !Number.isInteger(parsed.pid) || typeof parsed.runId !== "string" || typeof parsed.workspacePath !== "string" || typeof parsed.startedAt !== "string" || typeof parsed.resultPath !== "string") return null;
+		return {
+			...parsed,
+			runId: parsed.runId,
+			issueId,
+			workspacePath: parsed.workspacePath,
+			pid: parsed.pid,
+			startedAt: parsed.startedAt,
+			resultPath: parsed.resultPath,
+			phase: parsed.phase === "queued" ? "queued" : "running",
+			admittedAt: parsed.admittedAt === void 0 ? parsed.startedAt : parsed.admittedAt
+		};
 	} catch {
 		return null;
 	}
 }
 function isVerificationWorkerActive(issueId) {
 	const state = readVerificationWorkerState(issueId);
-	return !!state && isProcessAlive(state.pid) && !existsSync$1(state.resultPath);
+	return !!state && isProcessAlive(state.pid) && !existsSync(state.resultPath);
 }
 function writeJsonAtomic(path, value) {
 	const temp = `${path}.${process.pid}.tmp`;
-	writeFileSync$1(temp, `${JSON.stringify(value, null, 2)}\n`);
-	renameSync$1(temp, path);
+	writeFileSync(temp, `${JSON.stringify(value, null, 2)}\n`);
+	renameSync(temp, path);
+}
+function verificationWorkerDeadline(state) {
+	if (!state.admittedAt) return null;
+	const admittedAt = Date.parse(state.admittedAt);
+	return Number.isFinite(admittedAt) ? admittedAt + MAX_RUN_MS : null;
+}
+function markVerificationWorkerAdmissionPhase(issueId, update) {
+	const state = readVerificationWorkerState(issueId);
+	if (!state || state.pid !== process.pid) return;
+	writeJsonAtomic(statePath(issueId), {
+		...state,
+		phase: update.phase,
+		admittedAt: state.admittedAt ?? update.admittedAt ?? null,
+		currentGate: update.gateName,
+		currentAttempt: update.attempt
+	});
 }
 async function waitForResult(state) {
-	const deadline = Date.now() + MAX_RUN_MS;
-	while (Date.now() < deadline) {
-		if (existsSync$1(state.resultPath)) return JSON.parse(readFileSync$1(state.resultPath, "utf8"));
+	for (;;) {
+		if (existsSync(state.resultPath)) return JSON.parse(readFileSync(state.resultPath, "utf8"));
 		if (!isProcessAlive(state.pid)) return {
 			outcome: "error",
 			message: `Verification worker ${state.pid} exited before writing a result`
 		};
+		const deadline = verificationWorkerDeadline(readVerificationWorkerState(state.issueId) ?? state);
+		if (deadline !== null && Date.now() >= deadline) return {
+			outcome: "error",
+			message: `Verification worker ${state.pid} exceeded ${MAX_RUN_MS}ms after CPU admission`
+		};
 		await new Promise((resolve) => setTimeout(resolve, POLL_MS));
 	}
-	return {
-		outcome: "error",
-		message: `Verification worker ${state.pid} exceeded ${MAX_RUN_MS}ms`
-	};
 }
 async function runSupervisedVerification(issueId, workspacePath, workspaceInfo, logPrefix, options = {}) {
 	const existing = readVerificationWorkerState(issueId);
-	if (existing && existing.workspacePath === workspacePath && isProcessAlive(existing.pid) && !existsSync$1(existing.resultPath)) {
+	if (existing && existing.workspacePath === workspacePath && isProcessAlive(existing.pid) && !existsSync(existing.resultPath)) {
 		console.log(`[${logPrefix}] Joining live verification worker ${existing.pid} for ${issueId}`);
 		return waitForResult(existing);
 	}
 	const dir = workerDir(issueId);
-	mkdirSync$1(dir, { recursive: true });
+	mkdirSync(dir, { recursive: true });
 	const runId = `${Date.now()}-${process.pid}`;
 	const resultPath = join(dir, `result-${runId}.json`);
 	const logPath = join(dir, `worker-${runId}.log`);
 	const workerPath = process.env.OVERDECK_VERIFICATION_WORKER_PATH || join(packageRoot, "dist", "verification-worker.js");
-	if (!existsSync$1(workerPath)) return {
+	if (!existsSync(workerPath)) return {
 		outcome: "error",
 		message: `Verification worker bundle missing at ${workerPath}; run npm run build`
 	};
-	const logFd = openSync$1(logPath, "a");
+	const logFd = openSync(logPath, "a");
 	const child = spawn(process.execPath, [workerPath, JSON.stringify({
 		issueId,
 		workspacePath,
@@ -124,7 +151,7 @@ async function runSupervisedVerification(issueId, workspacePath, workspaceInfo,
 			OVERDECK_VERIFICATION_WORKER: "1"
 		}
 	});
-	closeSync$1(logFd);
+	closeSync(logFd);
 	if (!child.pid) return {
 		outcome: "error",
 		message: "Failed to spawn verification worker"
@@ -135,7 +162,9 @@ async function runSupervisedVerification(issueId, workspacePath, workspaceInfo,
 		workspacePath,
 		pid: child.pid,
 		startedAt: (/* @__PURE__ */ new Date()).toISOString(),
-		resultPath
+		resultPath,
+		phase: "queued",
+		admittedAt: null
 	};
 	writeJsonAtomic(statePath(issueId), state);
 	child.unref();
@@ -146,6 +175,8 @@ async function runSupervisedVerification(issueId, workspacePath, workspaceInfo,
 //#region ../../lib/work/test-requirement-gate.ts
 init_projects();
 init_state_plane();
+init_project_repos();
+init_lifecycle();
 init_types();
 init_io();
 init_agents();
@@ -170,7 +201,7 @@ promisify(exec);
 const terminal = new Set(["completed", "cancelled"]);
 function checkIncompletePlanItemsSync(workspacePath) {
 	const doc = readWorkspacePlanSync(workspacePath);
-	if (!doc) return ["  The required vBRIEF checklist is missing or unreadable; return the issue to planning before completion."];
+	if (!doc) return ["  The required xBRIEF checklist is missing or unreadable; return the issue to planning before completion."];
 	const incomplete = doc.plan.items.flatMap((item) => {
 		const lines = [];
 		if (!terminal.has(item.status)) lines.push(`    - ${item.id} ${item.title} (${item.status})`);
@@ -196,6 +227,19 @@ async function checkIncompletePlanItemsPromise(workspacePath, _issueId) {
 init_io();
 const execAsync = promisify$1(exec$1);
 const NO_PROGRESS_REPEAT_THRESHOLD = 2;
+const MERGED_VERIFICATION_REASON = "Merge already landed; verify-on-main owns post-merge validation.";
+function skipMergedVerification(issueId, logPrefix, status = getReviewStatusSync(issueId)) {
+	if (status?.mergeStatus !== "merged") return null;
+	setReviewStatusSync(issueId, {
+		verificationStatus: "skipped",
+		verificationNotes: MERGED_VERIFICATION_REASON
+	});
+	console.log(`[${logPrefix}] Skipping pre-merge verification for ${issueId}: ${MERGED_VERIFICATION_REASON}`);
+	return {
+		outcome: "skipped",
+		reason: MERGED_VERIFICATION_REASON
+	};
+}
 function isFinalVerificationAttempt(cycleCount) {
 	return cycleCount >= 3;
 }
@@ -222,6 +266,7 @@ function setStateDerivedVerificationFailure(issueId, failedCheck, summary, cycle
 	console.warn(`[verification-runner] ${issueId} review is passed but held by state-derived gate ${failedCheck}: ${summary}`);
 }
 async function escalateVerificationStuck(issueId, failedCheck, cycleCount, summary, logPrefix) {
+	if (skipMergedVerification(issueId, logPrefix)) return;
 	const agentId = `agent-${issueId.toLowerCase()}`;
 	const reason = `needs-you: verification stuck after ${cycleCount}/3 attempts (${failedCheck})`;
 	markWorkspaceStuck(issueId, "verification_stuck", {
@@ -287,7 +332,9 @@ function reconcileInterruptedVerifications(logPrefix = "boot-reconciliation") {
 	return reset;
 }
 async function deliverVerificationFeedback(issueId, message, details, logPrefix) {
+	if (skipMergedVerification(issueId, logPrefix)) return;
 	const target = await resolveIssueFeedbackTarget(issueId);
+	if (skipMergedVerification(issueId, logPrefix)) return;
 	if ("agentId" in target) {
 		await messageAgent(target.agentId, message, "internal", { owesRework: true });
 		console.log(`[${logPrefix}] Sent verification feedback for ${issueId} to ${target.agentId}`);
@@ -298,29 +345,6 @@ async function deliverVerificationFeedback(issueId, message, details, logPrefix)
 		...details
 	});
 }
-async function resolveGitDirs(workspacePath, projectConfig) {
-	if (!(projectConfig?.workspace?.type === "polyrepo") && existsSync(join$1(workspacePath, ".git"))) return {
-		gitDirs: [workspacePath],
-		isPolyrepo: false
-	};
-	const gitDirs = [];
-	try {
-		const entries = await readdir(workspacePath, { withFileTypes: true });
-		for (const entry of entries) if (entry.isDirectory() && !entry.name.startsWith(".") && existsSync(join$1(workspacePath, entry.name, ".git"))) gitDirs.push(join$1(workspacePath, entry.name));
-	} catch {}
-	if (gitDirs.length > 0) return {
-		gitDirs,
-		isPolyrepo: true
-	};
-	if (existsSync(join$1(workspacePath, ".git"))) return {
-		gitDirs: [workspacePath],
-		isPolyrepo: false
-	};
-	return {
-		gitDirs: [],
-		isPolyrepo: false
-	};
-}
 async function syncSingleRepo(gitDir, targetBranch) {
 	const repoName = basename$1(gitDir);
 	try {
@@ -399,17 +423,39 @@ function getSyncTargetBranch(workspacePath, projectConfig, repoName) {
 }
 /**
 * PAN-2179: detect a "plan-only" / zombie changeset — one whose only changes are
-* pipeline artifacts (.pan/, beads, vbrief) with no actual implementation. A work
+* pipeline artifacts (.pan/, task state, xBRIEF) with no actual implementation. A work
 * agent that never received its kickoff produces exactly this. The verification
 * gate uses it to bounce the branch back instead of letting an empty "completion"
 * advance to review/merge. A legit non-code change (docs, rules under
 * sync-sources/, config) counts as content and is NOT flagged.
 */
 function changesetHasNoContent(changedFiles) {
-	return changedFiles.map((f) => f.trim()).filter(Boolean).filter((f) => !f.startsWith(".pan/") && !f.endsWith(".vbrief.json")).length === 0;
+	return changedFiles.map((f) => f.trim()).filter(Boolean).filter((f) => !f.startsWith(".pan/") && !isXBriefFilename(f)).length === 0;
+}
+/**
+* Return whether any actual workspace repository contains implementation
+* changes. `undefined` means at least one repo diff failed and no positive
+* evidence was found, so callers must conservatively skip the empty guard.
+*/
+async function workspaceChangesetHasContent(issueId, workspacePath) {
+	const roots = resolveWorkspaceRepoRootsSync(issueId, workspacePath);
+	let diffFailed = false;
+	for (const root of roots) try {
+		const { stdout } = await execAsync(`git diff --name-only origin/${root.targetBranch}...HEAD`, {
+			cwd: root.dir,
+			encoding: "utf-8",
+			timeout: 15e3
+		});
+		if (!changesetHasNoContent(stdout.split("\n"))) return true;
+	} catch {
+		diffFailed = true;
+	}
+	return diffFailed ? void 0 : false;
 }
 async function runVerificationForIssuePromise(issueId, workspacePath, workspaceInfo, logPrefix, options = {}) {
 	const currentStatus = getReviewStatusSync(issueId);
+	const mergedOutcome = skipMergedVerification(issueId, logPrefix, currentStatus);
+	if (mergedOutcome) return mergedOutcome;
 	const currentCycles = currentStatus?.verificationCycleCount ?? 0;
 	if (currentCycles >= 3) {
 		const reason = `Circuit breaker: ${currentCycles}/3 cycles exceeded — skipping verification`;
@@ -424,17 +470,18 @@ async function runVerificationForIssuePromise(issueId, workspacePath, workspaceI
 	console.log(`[${logPrefix}] Running verification gate for ${issueId} (attempt ${currentCycles + 1}/3)`);
 	try {
 		const projectConfig = findProjectByPathSync(workspacePath);
-		const { gitDirs, isPolyrepo } = await resolveGitDirs(workspacePath, projectConfig);
-		if (options.syncTargetBranch !== false) if (gitDirs.length === 0) console.log(`[${logPrefix}] No git directories found in workspace ${workspacePath} — skipping sync`);
+		const repoRoots = resolveWorkspaceRepoRootsSync(issueId, workspacePath);
+		const isPolyrepo = repoRoots.some((root) => root.isPolyrepo);
+		if (options.syncTargetBranch !== false) if (repoRoots.length === 0) console.log(`[${logPrefix}] No git directories found in workspace ${workspacePath} — skipping sync`);
 		else {
 			const syncResults = [];
-			for (const gitDir of gitDirs) {
-				const repoName = isPolyrepo ? basename$1(gitDir) : void 0;
-				const targetBranch = getSyncTargetBranch(workspacePath, projectConfig, repoName);
-				const displayName = repoName || basename$1(workspacePath);
-				console.log(`[${logPrefix}] Syncing ${targetBranch} into ${displayName} for ${issueId}...`);
-				syncResults.push(await syncSingleRepo(gitDir, targetBranch));
+			for (const root of repoRoots) {
+				const displayName = (isPolyrepo ? root.repoKey : void 0) || basename$1(workspacePath);
+				console.log(`[${logPrefix}] Syncing ${root.targetBranch} into ${displayName} for ${issueId}...`);
+				syncResults.push(await syncSingleRepo(root.dir, root.targetBranch));
 			}
+			const postSyncMergedOutcome = skipMergedVerification(issueId, logPrefix);
+			if (postSyncMergedOutcome) return postSyncMergedOutcome;
 			const failures = syncResults.filter((r) => !r.success);
 			if (failures.length > 0) {
 				const newCycleCount = currentCycles + 1;
@@ -482,13 +529,15 @@ async function runVerificationForIssuePromise(issueId, workspacePath, workspaceI
 			}
 		}
 		else console.log(`[${logPrefix}] Skipping target-branch sync for ${issueId}; verifying current workspace state`);
+		const postSyncMergedOutcome = skipMergedVerification(issueId, logPrefix);
+		if (postSyncMergedOutcome) return postSyncMergedOutcome;
 		const gates = projectConfig?.quality_gates && Object.keys(projectConfig.quality_gates).length > 0 ? projectConfig.quality_gates : DEFAULT_GATES;
 		console.log(`[${logPrefix}] Project: ${projectConfig?.name || "NOT FOUND"}, gates: [${Object.keys(gates).join(", ")}], workspace: ${workspacePath}`);
 		const featureFolder = basename$1(workspacePath);
 		const featureName = featureFolder.replace(/^feature-/, "");
 		const projectPath = projectConfig?.path || dirname$1(dirname$1(workspacePath));
 		const domain = projectConfig?.workspace?.dns?.domain || "localhost";
-		const changedBase = `origin/${getSyncTargetBranch(workspacePath, projectConfig, void 0)}`;
+		const changedBase = `origin/${repoRoots[0]?.targetBranch ?? getSyncTargetBranch(workspacePath, projectConfig, void 0)}`;
 		const placeholders = {
 			FEATURE_NAME: featureName,
 			FEATURE_FOLDER: featureFolder,
@@ -545,10 +594,12 @@ async function runVerificationForIssuePromise(issueId, workspacePath, workspaceI
 		};
 		writeLiveArtifact();
 		const gateResults = await Effect.runPromise(runQualityGates(gates, workspacePath, "pre_push", {
+			issueId,
 			isRemote: workspaceInfo.isRemote,
 			vmName: workspaceInfo.vmName,
 			placeholders,
 			...options.onGateLog ? { onLog: options.onGateLog } : {},
+			onAdmissionPhase: (state) => markVerificationWorkerAdmissionPhase(issueId, state),
 			onGateStart: (name) => {
 				liveGateName = name;
 				liveGateTail = "";
@@ -569,6 +620,8 @@ async function runVerificationForIssuePromise(issueId, workspacePath, workspaceI
 				writeLiveArtifact();
 			}
 		}));
+		const postGateMergedOutcome = skipMergedVerification(issueId, logPrefix);
+		if (postGateMergedOutcome) return postGateMergedOutcome;
 		const failedGate = gateResults.find((r) => !r.passed && r.required !== false);
 		if (failedGate?.infraUnavailable) {
 			try {
@@ -580,12 +633,11 @@ async function runVerificationForIssuePromise(issueId, workspacePath, workspaceI
 				verificationNotes: `Verification deferred: ${failedGate.error}. Workspace stack rebuild triggered; verification re-runs on the next cycle.`
 			});
 			try {
-				const { rebuildWorkspaceStack } = await import("./rebuild-stack-CKjJAI8L.js");
-				Effect.runPromise(rebuildWorkspaceStack(issueId, { onProgress: (m) => console.log(`[${logPrefix}] ${issueId} stack rebuild: ${m}`) })).then((r) => {
-					if (!r.success) console.warn(`[${logPrefix}] Stack rebuild for ${issueId} failed: ${r.error}`);
-				});
+				const { rebuildWorkspaceStack } = await import("./rebuild-stack-CFvcBHsS.js");
+				const rebuildResult = await Effect.runPromise(rebuildWorkspaceStack(issueId, { onProgress: (m) => console.log(`[${logPrefix}] ${issueId} stack rebuild: ${m}`) }));
+				if (!rebuildResult.success) console.warn(`[${logPrefix}] Stack rebuild for ${issueId} failed: ${rebuildResult.error}`);
 			} catch (err) {
-				console.warn(`[${logPrefix}] Could not trigger stack rebuild for ${issueId}: ${err instanceof Error ? err.message : String(err)}`);
+				console.warn(`[${logPrefix}] Could not settle stack rebuild for ${issueId}: ${err instanceof Error ? err.message : String(err)}`);
 			}
 			return {
 				outcome: "failed",
@@ -640,30 +692,30 @@ async function runVerificationForIssuePromise(issueId, workspacePath, workspaceI
 		}
 		let acStatus;
 		try {
-			acStatus = getVBriefACStatusSync(workspacePath);
-		} catch (vbriefErr) {
-			if (vbriefErr instanceof VBriefMergeConflictError) {
+			acStatus = getXBriefACStatusSync(workspacePath);
+		} catch (xbriefErr) {
+			if (xbriefErr instanceof XBriefMergeConflictError) {
 				const newCycleCount = currentCycles + 1;
 				const failedCheck = "vbrief-conflicts";
-				const summary = `vBRIEF spec has unresolved git merge conflict markers. Resolve all conflict markers in the spec file and commit before resubmitting.`;
+				const summary = `xBRIEF spec has unresolved git merge conflict markers. Resolve all conflict markers in the spec file and commit before resubmitting.`;
 				setStateDerivedVerificationFailure(issueId, failedCheck, summary, newCycleCount, currentStatus);
 				if (shouldEscalateVerificationFailure(currentStatus, failedCheck, newCycleCount)) await escalateVerificationStuck(issueId, failedCheck, newCycleCount, summary, logPrefix);
-				const feedbackBody = shouldEscalateVerificationFailure(currentStatus, failedCheck, newCycleCount) ? `VERIFICATION STUCK for ${issueId} (attempt ${newCycleCount}/3):\n\nFailed check: ${failedCheck}\n\n${summary}\n\n${buildFinalFailureInstructions(issueId)}` : `VERIFICATION FAILED for ${issueId} (attempt ${newCycleCount}/3):\n\nFailed check: ${failedCheck}\n\n${summary}\n\n## REQUIRED: Fix merge conflicts in vBRIEF spec BEFORE resubmitting\n\n1. Open the vBRIEF spec (on main in .pan/specs/)\n2. Find and resolve all <<<<<<< HEAD / ======= / >>>>>>> conflict markers\n3. Ensure the file is valid JSON (only keep ONE version of each conflicted block)\n4. Commit the fixed file on main\n5. ONLY THEN resubmit: pan review request ${issueId} -m "Resolved spec merge conflict"\n\nDo NOT resubmit until the spec parses cleanly.`;
+				const feedbackBody = shouldEscalateVerificationFailure(currentStatus, failedCheck, newCycleCount) ? `VERIFICATION STUCK for ${issueId} (attempt ${newCycleCount}/3):\n\nFailed check: ${failedCheck}\n\n${summary}\n\n${buildFinalFailureInstructions(issueId)}` : `VERIFICATION FAILED for ${issueId} (attempt ${newCycleCount}/3):\n\nFailed check: ${failedCheck}\n\n${summary}\n\n## REQUIRED: Fix merge conflicts in xBRIEF spec BEFORE resubmitting\n\n1. Open the xBRIEF spec (on main in .pan/specs/)\n2. Find and resolve all <<<<<<< HEAD / ======= / >>>>>>> conflict markers\n3. Ensure the file is valid JSON (only keep ONE version of each conflicted block)\n4. Commit the fixed file on main\n5. ONLY THEN resubmit: pan review request ${issueId} -m "Resolved spec merge conflict"\n\nDo NOT resubmit until the spec parses cleanly.`;
 				try {
 					const fileResult = await Effect.runPromise(writeFeedbackFile({
 						issueId,
 						workspacePath,
 						specialist: "verification-gate",
 						outcome: "failed",
-						summary: `vBRIEF plan has merge conflicts (attempt ${newCycleCount}/3)`,
+						summary: `xBRIEF plan has merge conflicts (attempt ${newCycleCount}/3)`,
 						markdownBody: feedbackBody
 					}));
-					if (fileResult.success) await deliverVerificationFeedback(issueId, shouldEscalateVerificationFailure(currentStatus, failedCheck, newCycleCount) ? `VERIFICATION STUCK for ${issueId}.\nFailed check: ${failedCheck} after repeated attempts.\n\nMUST READ: ${fileResult.filePath}\n\nFix every reported failure, commit and push the corrections, then run pan done ${issueId} -c "<summary>" to reset verification and return the latest commit to the normal pipeline.` : `VERIFICATION FAILED for ${issueId}.\nFailed check: ${failedCheck} — plan.vbrief.json has merge conflict markers.\n\nMUST READ: ${fileResult.filePath}\n\nUse your Read tool to open this file, read every line, resolve the merge conflict markers, commit and push the fix, then request a new review with pan review request. Do NOT stop at the prompt — keep working until pan review request completes successfully.`, {
+					if (fileResult.success) await deliverVerificationFeedback(issueId, shouldEscalateVerificationFailure(currentStatus, failedCheck, newCycleCount) ? `VERIFICATION STUCK for ${issueId}.\nFailed check: ${failedCheck} after repeated attempts.\n\nMUST READ: ${fileResult.filePath}\n\nFix every reported failure, commit and push the corrections, then run pan done ${issueId} -c "<summary>" to reset verification and return the latest commit to the normal pipeline.` : `VERIFICATION FAILED for ${issueId}.\nFailed check: ${failedCheck} — the xBRIEF document has merge conflict markers.\n\nMUST READ: ${fileResult.filePath}\n\nUse your Read tool to open this file, read every line, resolve the merge conflict markers, commit and push the fix, then request a new review with pan review request. Do NOT stop at the prompt — keep working until pan review request completes successfully.`, {
 						failedCheck,
 						feedbackPath: fileResult.filePath
 					}, logPrefix);
 				} catch (feedbackErr) {
-					console.error(`[${logPrefix}] Failed to write vBRIEF conflict feedback for ${issueId}:`, feedbackErr);
+					console.error(`[${logPrefix}] Failed to write xBRIEF conflict feedback for ${issueId}:`, feedbackErr);
 				}
 				return {
 					outcome: "failed",
@@ -672,7 +724,7 @@ async function runVerificationForIssuePromise(issueId, workspacePath, workspaceI
 					maxCycles: 3
 				};
 			}
-			throw vbriefErr;
+			throw xbriefErr;
 		}
 		if (acStatus && !acStatus.allCompleted) {
 			const newCycleCount = currentCycles + 1;
@@ -708,7 +760,9 @@ async function runVerificationForIssuePromise(issueId, workspacePath, workspaceI
 				maxCycles: 3
 			};
 		}
-		const taskBlockers = await checkIncompletePlanItemsPromise(workspacePath, issueId);
+		const taskBlockers = options.skipPlanChecklist ? [] : await checkIncompletePlanItemsPromise(workspacePath, issueId);
+		const postChecklistMergedOutcome = skipMergedVerification(issueId, logPrefix);
+		if (postChecklistMergedOutcome) return postChecklistMergedOutcome;
 		if (taskBlockers.length > 0) {
 			const newCycleCount = currentCycles + 1;
 			const failedCheck = "incomplete-plan-items";
@@ -740,52 +794,46 @@ async function runVerificationForIssuePromise(issueId, workspacePath, workspaceI
 				maxCycles: 3
 			};
 		}
-		try {
-			const { stdout: changedOut } = await execAsync(`git diff --name-only ${changedBase}...HEAD`, {
-				cwd: workspacePath,
-				encoding: "utf-8",
-				timeout: 15e3
+		const changesetHasContent = await workspaceChangesetHasContent(issueId, workspacePath);
+		const postDiffMergedOutcome = skipMergedVerification(issueId, logPrefix);
+		if (postDiffMergedOutcome) return postDiffMergedOutcome;
+		if (changesetHasContent === false) {
+			const newCycleCount = currentCycles + 1;
+			const failedCheck = "empty-changeset";
+			const comparedTargets = repoRoots.map((root) => `${root.repoKey}:origin/${root.targetBranch}`).join(", ");
+			const summary = `Branch has no implementation — only pipeline artifacts (.pan/xBRIEF task state) changed across workspace repos vs ${comparedTargets}. The work agent produced no code (likely a kickoff-delivery zombie — PAN-2179).`;
+			setReviewStatusSync(issueId, {
+				reviewStatus: "pending",
+				verificationStatus: "failed",
+				verificationNotes: summary,
+				verificationCycleCount: newCycleCount,
+				verificationMaxCycles: 3
 			});
-			if (changesetHasNoContent(changedOut.split("\n"))) {
-				const newCycleCount = currentCycles + 1;
-				const failedCheck = "empty-changeset";
-				const summary = `Branch has no implementation — only pipeline artifacts (.pan/vBRIEF task state) changed vs ${changedBase}. The work agent produced no code (likely a kickoff-delivery zombie — PAN-2179).`;
-				setReviewStatusSync(issueId, {
-					reviewStatus: "pending",
-					verificationStatus: "failed",
-					verificationNotes: summary,
-					verificationCycleCount: newCycleCount,
-					verificationMaxCycles: 3
-				});
-				if (shouldEscalateVerificationFailure(currentStatus, failedCheck, newCycleCount)) await escalateVerificationStuck(issueId, failedCheck, newCycleCount, summary, logPrefix);
-				try {
-					await deliverVerificationFeedback(issueId, shouldEscalateVerificationFailure(currentStatus, failedCheck, newCycleCount) ? `VERIFICATION STUCK for ${issueId}.\nFailed check: ${failedCheck} after ${newCycleCount}/3 attempts — branch still has no implementation.\n\n${buildFinalFailureInstructions(issueId)}` : `VERIFICATION FAILED for ${issueId}.\nFailed check: ${failedCheck} — your branch contains NO code (only .pan/vBRIEF task state changed vs ${changedBase}).\n\nYou must actually implement the issue: read the plan (.pan/spec.vbrief.json + the issue body), write and commit the code, push, then run pan review request. Do NOT stop at the prompt — keep working until pan review request completes.`, {
-						failedCheck,
-						changedBase
-					}, logPrefix);
-					console.error(`[${logPrefix}] VERIFICATION FAILED for ${issueId}: empty-changeset (no content files vs ${changedBase})`);
-				} catch (feedbackErr) {
-					console.error(`[${logPrefix}] Failed to send empty-changeset feedback for ${issueId}:`, feedbackErr);
-				}
-				return {
-					outcome: "failed",
+			if (shouldEscalateVerificationFailure(currentStatus, failedCheck, newCycleCount)) await escalateVerificationStuck(issueId, failedCheck, newCycleCount, summary, logPrefix);
+			try {
+				await deliverVerificationFeedback(issueId, shouldEscalateVerificationFailure(currentStatus, failedCheck, newCycleCount) ? `VERIFICATION STUCK for ${issueId}.\nFailed check: ${failedCheck} after ${newCycleCount}/3 attempts — branch still has no implementation.\n\n${buildFinalFailureInstructions(issueId)}` : `VERIFICATION FAILED for ${issueId}.\nFailed check: ${failedCheck} — your branch contains NO code (only .pan/xBRIEF task state changed across ${comparedTargets}).\n\nYou must actually implement the issue: read the plan (.pan/spec.vbrief.json + the issue body), write and commit the code, push, then run pan review request. Do NOT stop at the prompt — keep working until pan review request completes.`, {
 					failedCheck,
-					cycleCount: newCycleCount,
-					maxCycles: 3
-				};
+					changedBase: comparedTargets
+				}, logPrefix);
+				console.error(`[${logPrefix}] VERIFICATION FAILED for ${issueId}: empty-changeset (no content files across ${comparedTargets})`);
+			} catch (feedbackErr) {
+				console.error(`[${logPrefix}] Failed to send empty-changeset feedback for ${issueId}:`, feedbackErr);
 			}
-		} catch (diffErr) {
-			console.warn(`[${logPrefix}] empty-changeset guard skipped (diff failed): ${diffErr.message}`);
+			return {
+				outcome: "failed",
+				failedCheck,
+				cycleCount: newCycleCount,
+				maxCycles: 3
+			};
 		}
+		if (changesetHasContent === void 0) console.warn(`[${logPrefix}] empty-changeset guard skipped (one or more repo diffs failed)`);
 		let lastVerifiedCommit;
 		try {
-			const { stdout } = await execAsync("git rev-parse HEAD", {
-				cwd: workspacePath,
-				encoding: "utf-8",
-				timeout: 5e3
-			});
-			lastVerifiedCommit = stdout.trim();
+			const { snapshotWorkspaceHeadsPromise } = await import("./git-utils-D0_yhCgF.js");
+			lastVerifiedCommit = await snapshotWorkspaceHeadsPromise(issueId, workspacePath);
 		} catch {}
+		const prePassMergedOutcome = skipMergedVerification(issueId, logPrefix);
+		if (prePassMergedOutcome) return prePassMergedOutcome;
 		setReviewStatusSync(issueId, {
 			verificationStatus: "passed",
 			verificationNotes: void 0,
@@ -797,7 +845,7 @@ async function runVerificationForIssuePromise(issueId, workspacePath, workspaceI
 				const repo = findProjectByPathSync(workspacePath)?.github_repo;
 				if (!repo || !repo.includes("/")) return;
 				const [owner, name] = repo.split("/");
-				const { postOverdeckTestsStatus } = await import("./github-app-CU14oYzP.js");
+				const { postOverdeckTestsStatus } = await import("./github-app-ClZ2lk8D.js");
 				await postOverdeckTestsStatus(workspacePath, owner, name, "success", "Verification gate passed");
 			} catch (err) {
 				console.warn(`[${logPrefix}] Failed to post overdeck/tests status: ${err.message}`);
@@ -805,6 +853,8 @@ async function runVerificationForIssuePromise(issueId, workspacePath, workspaceI
 		})();
 		return { outcome: "passed" };
 	} catch (verifyErr) {
+		const errorMergedOutcome = skipMergedVerification(issueId, logPrefix);
+		if (errorMergedOutcome) return errorMergedOutcome;
 		setReviewStatusSync(issueId, {
 			reviewStatus: "pending",
 			verificationStatus: "failed",
@@ -831,6 +881,6 @@ function runVerificationForIssueInProcess(issueId, workspacePath, workspaceInfo,
 	return Effect.promise(() => runVerificationForIssuePromise(issueId, workspacePath, workspaceInfo, logPrefix, options));
 }
 //#endregion
-export { runVerificationForIssueInProcess as i, reconcileInterruptedVerifications as n, runVerificationForIssue as r, changesetHasNoContent as t };
+export { workspaceChangesetHasContent as a, runVerificationForIssueInProcess as i, reconcileInterruptedVerifications as n, runVerificationForIssue as r, changesetHasNoContent as t };
 
-//# sourceMappingURL=verification-runner-FiuAZ-H2.js.map
+//# sourceMappingURL=verification-runner-CkgX6EtI.js.map

package/server/{vtt-parser-BnRsYzcz.js → vtt-parser-DYPbKcIJ.js}

@@ -107,4 +107,4 @@ function consolidateSpeakerCues(cues) {
 //#endregion
 export { vttToMarkdown };
 
-//# sourceMappingURL=vtt-parser-BnRsYzcz.js.map
+//# sourceMappingURL=vtt-parser-DYPbKcIJ.js.map

package/server/{work-agent-prompt-DLthEPAq.js → work-agent-prompt-Du8Vh2aJ.js}

@@ -1,12 +1,12 @@
 import { n as __esmMin } from "./rolldown-runtime-DNCzzKnI.js";
-import { Bt as resolveProjectForIssue, Dn as extractTeamPrefix, Hn as init_projects, Mt as getProjectConfigFromWorkspacePath, Nt as init_record, jn as findProjectByTeamSync, t as init_config_yaml, u as isTldrEnabledSync, zt as readRecordContinueViewSync } from "./config-yaml-ig8Nwtiw.js";
-import { d as readPlanSync, i as findPlanSync, o as init_io, p as readWorkspacePlan } from "./io-DQR9PMgS.js";
-import { f as init_config, m as loadConfigSync } from "./config-q4Gvd8dq.js";
-import { i as NotImplementedError, o as init_interface } from "./rally-api-DqKqIMNR.js";
-import { n as createTrackerFromConfig, r as init_factory } from "./factory-BMrK4TrE.js";
-import { i as createActiveSlice, l as init_dag, o as getDispatchableItems } from "./dag-CJpgf9A3.js";
-import { l as getReadableWorkspacePanPaths, n as readWorkspaceContext, o as readFeedback, r as writeWorkspaceContext, t as init_pan_dir } from "./pan-dir-DOcf6ug3.js";
-import { n as renderPrompt, t as init_prompts } from "./prompts-EvhMeeHG.js";
+import { Dt as getProjectConfigFromWorkspacePath, Ft as resolveProjectForIssue, Ot as init_record, Pt as readRecordContinueViewSync, Tn as init_projects, mn as findProjectByTeamSync, t as init_config_yaml, u as isTldrEnabledSync, un as extractTeamPrefix } from "./config-yaml-DySPNmKN.js";
+import { F as getReadableWorkspacePanPaths, d as readPlanSync, i as findPlanSync, o as init_io, p as readWorkspacePlan } from "./io-C9kF1wtJ.js";
+import { f as init_config, m as loadConfigSync } from "./config-BZ0sHTju.js";
+import { i as NotImplementedError, o as init_interface } from "./rally-api-C8e_1JRi.js";
+import { n as createTrackerFromConfig, r as init_factory } from "./factory-CFibJuaw.js";
+import { i as createActiveSlice, l as init_dag, o as getDispatchableItems } from "./dag-B1ucnjDU.js";
+import { l as readFeedback, n as readWorkspaceContext, r as writeWorkspaceContext, t as init_pan_dir } from "./pan-dir-B0c3w0Ya.js";
+import { n as renderPrompt, t as init_prompts } from "./prompts-DxzFXuLl.js";
 import { Effect } from "effect";
 import { existsSync, readdirSync, statSync } from "fs";
 import { dirname, join } from "path";
@@ -67,7 +67,7 @@ async function buildActiveSliceContext(workspacePath, issueId) {
 		const normalizedIssueId = (issueId ?? "").toUpperCase();
 		const currentItemIds = doc.plan.items.filter((item) => item.status === "running" || item.id === nextItem.id).map((item) => item.id);
 		return [
-			"## Active vBRIEF Slice (Canonical Task Graph)",
+			"## Active xBRIEF Slice (Canonical Task Graph)",
 			"",
 			createActiveSlice(doc, {
 				issueId: normalizedIssueId,
@@ -76,7 +76,7 @@ async function buildActiveSliceContext(workspacePath, issueId) {
 				synthesisOutputs: void 0
 			}).prompt,
 			"",
-			"_The merged vBRIEF is the canonical task authority._"
+			"_The merged xBRIEF is the canonical task authority._"
 		].join("\n");
 	} catch {
 		return "";
@@ -295,9 +295,9 @@ async function writeStoryFeatureContext(workspacePath, issueId) {
 					const subItems = item.subItems?.map((s) => `  - ${s.title} (${s.status})`).join("\n") || "";
 					return `- **${item.id}**: ${item.title} (${item.status})${item.narrative?.Action ? `\n  - Action: ${item.narrative.Action}` : ""}${subItems ? `\n${subItems}` : ""}`;
 				}).join("\n");
-				contextContent = `# Feature Context for ${issueId}\n\n**Parent Feature:** ${parentTitle} (${issue.parentRef})\n\n## Plan Narratives\n${narrativeSection || "_No narratives found._"}\n\n## Cross-Story Dependencies\n${edgesSection || "_No dependency edges found._"}\n\n## Related Plan Items\n${itemsSection || "_No plan items found for this story._"}\n\n---\n*Synthesized from parent feature workspace vBRIEF*\n`;
+				contextContent = `# Feature Context for ${issueId}\n\n**Parent Feature:** ${parentTitle} (${issue.parentRef})\n\n## Plan Narratives\n${narrativeSection || "_No narratives found._"}\n\n## Cross-Story Dependencies\n${edgesSection || "_No dependency edges found._"}\n\n## Related Plan Items\n${itemsSection || "_No plan items found for this story._"}\n\n---\n*Synthesized from parent feature workspace xBRIEF*\n`;
 			} catch (planErr) {
-				console.warn(`[writeStoryFeatureContext] Could not read parent workspace vBRIEF: ${planErr instanceof Error ? planErr.message : String(planErr)}`);
+				console.warn(`[writeStoryFeatureContext] Could not read parent workspace xBRIEF: ${planErr instanceof Error ? planErr.message : String(planErr)}`);
 			}
 			const parentPanContext = await Effect.runPromise(readWorkspaceContext(parentWorkspace));
 			if (parentPanContext && !contextContent) contextContent = parentPanContext;
@@ -436,4 +436,4 @@ __esmMin((() => {
 }))();
 export { buildPolyrepoContext, buildWorkAgentPrompt, extractStitchDesigns, getTrackerContext, readFeatureContext, readPlanningContext, writeStoryFeatureContext };
 
-//# sourceMappingURL=work-agent-prompt-DLthEPAq.js.map
+//# sourceMappingURL=work-agent-prompt-Du8Vh2aJ.js.map

package/server/workflows-BQu4RFQ-.js

@@ -0,0 +1,2 @@
+import { a as deepWipe, i as closeOut } from "./workflows-mbQzh6mQ.js";
+export { closeOut, deepWipe };