@overdeck/desktop 0.45.21 → 0.45.23

package/server/{verification-runner-gAzh3cVD.js → verification-runner-Br0S_Ous.js}

@@ -1,14 +1,16 @@
-import { $n as resolveProjectFromIssueSync, En as findProjectByPathSync, Or as init_errors, dn as init_state_plane, ei as getOverdeckHome, lr as init_issue_id, ri as packageRoot, ti as init_paths, zn as init_projects } from "./config-yaml-Ciyp2mYe.js";
-import { C as init_review_status_source, c as init_review_status, f as markWorkspaceStuck, s as getReviewStatusSync, w as readReviewStatusMap, y as setReviewStatusSync } from "./review-status-CCgPVK1h.js";
-import { $ as stopAgent, Kn as setAgentPaused, L as messageAgent, s as init_agents } from "./queries-B5hl7lMQ.js";
-import { n as init_tracker_utils } from "./tracker-utils-DiceZN3a.js";
-import { m as readWorkspacePlanSync, o as init_io, t as VBriefMergeConflictError, v as init_types, y as subItemsOf } from "./io-BiM-7Zsx.js";
-import { a as writeFeedbackFile, i as init_feedback_writer } from "./feedback-writer-Wlq5-qgS.js";
-import { n as resolveIssueFeedbackTarget, r as surfaceIssueFeedbackNeedsYou, t as init_feedback_target } from "./feedback-target-Dqik2WTe.js";
-import { n as init_shadow_utils } from "./shadow-utils-CyOg6_Xq.js";
-import { i as runQualityGates, n as init_validation, t as DEFAULT_GATES } from "./validation-BA4e5EGm.js";
-import { r as writeVerificationArtifact, t as readVerificationArtifact } from "./verification-artifact-Dr_0g9nb.js";
-import { n as getVBriefACStatusSync } from "./acceptance-criteria-CJIFA8Vg.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-DvyMuOle.js";
+import { b as setReviewStatusSync, c as getReviewStatusSync, l as init_review_status, p as markWorkspaceStuck } from "./review-status-A7quS5KJ.js";
+import { X as messageAgent, ar as setAgentPaused, b as init_agents, ft as stopAgent } from "./queries-6d7Cdtm7.js";
+import { n as init_tracker_utils } from "./tracker-utils-tnxxqROg.js";
+import { i as readReviewStatusMap, n as init_review_status_source } from "./review-status-source-CxuEjLGg.js";
+import { o as init_lifecycle, s as isXBriefFilename } from "./lifecycle-DfeyBDwA.js";
+import { m as readWorkspacePlanSync, o as init_io, t as XBriefMergeConflictError, v as init_types, y as subItemsOf } from "./io-B3_AHDfr.js";
+import { a as writeFeedbackFile, i as init_feedback_writer } from "./feedback-writer-C9b6ccN1.js";
+import { n as resolveIssueFeedbackTarget, r as surfaceIssueFeedbackNeedsYou, t as init_feedback_target } from "./feedback-target-CPS15Vte.js";
+import { n as init_shadow_utils } from "./shadow-utils-4bvjn9b3.js";
+import { i as runQualityGates, n as init_validation, t as DEFAULT_GATES } from "./validation-B5JxoPUS.js";
+import { r as writeVerificationArtifact, t as readVerificationArtifact } from "./verification-artifact-BcnIbigL.js";
+import { n as getXBriefACStatusSync } from "./acceptance-criteria-DOA0KgXx.js";
 import { join } from "node:path";
 import { Data, Effect } from "effect";
 import { existsSync } from "fs";
@@ -57,7 +59,18 @@ 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;
+		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;
 	}
@@ -71,20 +84,36 @@ function writeJsonAtomic(path, value) {
 	writeFileSync$1(temp, `${JSON.stringify(value, null, 2)}\n`);
 	renameSync$1(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) {
+	for (;;) {
 		if (existsSync$1(state.resultPath)) return JSON.parse(readFileSync$1(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);
@@ -134,7 +163,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();
@@ -145,6 +176,7 @@ async function runSupervisedVerification(issueId, workspacePath, workspaceInfo,
 //#region ../../lib/work/test-requirement-gate.ts
 init_projects();
 init_state_plane();
+init_lifecycle();
 init_types();
 init_io();
 init_agents();
@@ -169,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})`);
@@ -195,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;
 }
@@ -221,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", {
@@ -286,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}`);
@@ -398,17 +446,19 @@ 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;
 }
 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`;
@@ -434,6 +484,8 @@ async function runVerificationForIssuePromise(issueId, workspacePath, workspaceI
 				console.log(`[${logPrefix}] Syncing ${targetBranch} into ${displayName} for ${issueId}...`);
 				syncResults.push(await syncSingleRepo(gitDir, 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;
@@ -481,6 +533,8 @@ 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);
@@ -544,10 +598,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 = "";
@@ -568,6 +624,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 {
@@ -579,7 +637,7 @@ 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-DjdpALr1.js");
+				const { rebuildWorkspaceStack } = await import("./rebuild-stack-kA7XngID.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}`);
 				});
@@ -639,30 +697,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",
@@ -671,7 +729,7 @@ async function runVerificationForIssuePromise(issueId, workspacePath, workspaceI
 					maxCycles: 3
 				};
 			}
-			throw vbriefErr;
+			throw xbriefErr;
 		}
 		if (acStatus && !acStatus.allCompleted) {
 			const newCycleCount = currentCycles + 1;
@@ -707,7 +765,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";
@@ -745,10 +805,12 @@ async function runVerificationForIssuePromise(issueId, workspacePath, workspaceI
 				encoding: "utf-8",
 				timeout: 15e3
 			});
+			const postDiffMergedOutcome = skipMergedVerification(issueId, logPrefix);
+			if (postDiffMergedOutcome) return postDiffMergedOutcome;
 			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).`;
+				const summary = `Branch has no implementation — only pipeline artifacts (.pan/xBRIEF task state) changed vs ${changedBase}. The work agent produced no code (likely a kickoff-delivery zombie — PAN-2179).`;
 				setReviewStatusSync(issueId, {
 					reviewStatus: "pending",
 					verificationStatus: "failed",
@@ -758,7 +820,7 @@ async function runVerificationForIssuePromise(issueId, workspacePath, workspaceI
 				});
 				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.`, {
+					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 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);
@@ -785,6 +847,8 @@ async function runVerificationForIssuePromise(issueId, workspacePath, workspaceI
 			});
 			lastVerifiedCommit = stdout.trim();
 		} catch {}
+		const prePassMergedOutcome = skipMergedVerification(issueId, logPrefix);
+		if (prePassMergedOutcome) return prePassMergedOutcome;
 		setReviewStatusSync(issueId, {
 			verificationStatus: "passed",
 			verificationNotes: void 0,
@@ -796,7 +860,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-CeSVFL6C.js");
+				const { postOverdeckTestsStatus } = await import("./github-app-CPfoFAdV.js");
 				await postOverdeckTestsStatus(workspacePath, owner, name, "success", "Verification gate passed");
 			} catch (err) {
 				console.warn(`[${logPrefix}] Failed to post overdeck/tests status: ${err.message}`);
@@ -804,6 +868,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",
@@ -832,4 +898,4 @@ function runVerificationForIssueInProcess(issueId, workspacePath, workspaceInfo,
 //#endregion
 export { runVerificationForIssueInProcess as i, reconcileInterruptedVerifications as n, runVerificationForIssue as r, changesetHasNoContent as t };
 
-//# sourceMappingURL=verification-runner-gAzh3cVD.js.map
+//# sourceMappingURL=verification-runner-Br0S_Ous.js.map

package/server/{verification-runner-Dcksl_P-.js → verification-runner-CDj4lD4t.js}

@@ -1,2 +1,2 @@
-import { n as reconcileInterruptedVerifications, r as runVerificationForIssue } from "./verification-runner-gAzh3cVD.js";
+import { n as reconcileInterruptedVerifications, r as runVerificationForIssue } from "./verification-runner-Br0S_Ous.js";
 export { reconcileInterruptedVerifications, runVerificationForIssue };

package/server/{vtt-parser-3VZKsmSm.js → vtt-parser-DKpNNW5i.js}

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

package/server/{work-agent-prompt-ULdcANl5.js → work-agent-prompt-Yb2bd3Fq.js}

@@ -1,12 +1,12 @@
 import { n as __esmMin } from "./rolldown-runtime-DNCzzKnI.js";
-import { At as init_record, It as readRecordContinueViewSync, Lt as resolveProjectForIssue, On as findProjectByTeamSync, kt as getProjectConfigFromWorkspacePath, t as init_config_yaml, u as isTldrEnabledSync, wn as extractTeamPrefix, zn as init_projects } from "./config-yaml-Ciyp2mYe.js";
-import { d as readPlanSync, i as findPlanSync, o as init_io, p as readWorkspacePlan } from "./io-BiM-7Zsx.js";
-import { f as init_config, m as loadConfigSync } from "./config-CrduXs4a.js";
-import { i as NotImplementedError, o as init_interface } from "./rally-api-DGaFz5L5.js";
-import { n as createTrackerFromConfig, r as init_factory } from "./factory-CQNprtHe.js";
-import { i as createActiveSlice, l as init_dag, o as getDispatchableItems } from "./dag-DIji6O2b.js";
-import { l as getReadableWorkspacePanPaths, n as readWorkspaceContext, o as readFeedback, r as writeWorkspaceContext, t as init_pan_dir } from "./pan-dir-Rw17YjT1.js";
-import { n as renderPrompt, t as init_prompts } from "./prompts-CbqaVjbe.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-DvyMuOle.js";
+import { F as getReadableWorkspacePanPaths, d as readPlanSync, i as findPlanSync, o as init_io, p as readWorkspacePlan } from "./io-B3_AHDfr.js";
+import { f as init_config, m as loadConfigSync } from "./config-CCvjQf27.js";
+import { i as NotImplementedError, o as init_interface } from "./rally-api-nY0ZANw3.js";
+import { n as createTrackerFromConfig, r as init_factory } from "./factory-CynerjXO.js";
+import { i as createActiveSlice, l as init_dag, o as getDispatchableItems } from "./dag-CdOjJVDT.js";
+import { l as readFeedback, n as readWorkspaceContext, r as writeWorkspaceContext, t as init_pan_dir } from "./pan-dir-DeVUgwA7.js";
+import { n as renderPrompt, t as init_prompts } from "./prompts-Dp4Tpk39.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 "";
@@ -143,7 +143,7 @@ async function readPendingFeedback(workspacePath) {
 * Fetch tracker context (new comments + issue status) since continue file was last modified.
 * Returns a formatted markdown string for injection into the work agent prompt.
 */
-async function getTrackerContext(issueId, workspacePath) {
+async function getTrackerContext(issueId, workspacePath, signal) {
 	let stateMtime = null;
 	try {
 		const workspaceContinuePath = getReadableWorkspacePanPaths(workspacePath).continuePath;
@@ -161,7 +161,7 @@ async function getTrackerContext(issueId, workspacePath) {
 	if (trackersConfig.secondary) trackerTypes.push(trackersConfig.secondary);
 	for (const trackerType of trackerTypes) try {
 		const tracker = createTrackerFromConfig(trackersConfig, trackerType);
-		const [issue, allComments] = await Promise.all([Effect.runPromise(tracker.getIssue(issueId)), Effect.runPromise(tracker.getComments(issueId)).catch((err) => {
+		const [issue, allComments] = await Promise.all([Effect.runPromise(tracker.getIssue(issueId), { signal }), Effect.runPromise(tracker.getComments(issueId), { signal }).catch((err) => {
 			if (err instanceof NotImplementedError) return [];
 			throw err;
 		})]);
@@ -211,6 +211,7 @@ async function getTrackerContext(issueId, workspacePath) {
 		if (!isReopened && newComments.length === 0) return "";
 		return result;
 	} catch (err) {
+		if (signal?.aborted) return "";
 		const message = err instanceof Error ? err.message : String(err);
 		if (message.toLowerCase().includes("not found") || message.toLowerCase().includes("404") || message.toLowerCase().includes("no configuration")) continue;
 		return `_Tracker unavailable: ${message}. Check tracker status and review any new comments manually._`;
@@ -294,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;
@@ -435,4 +436,4 @@ __esmMin((() => {
 }))();
 export { buildPolyrepoContext, buildWorkAgentPrompt, extractStitchDesigns, getTrackerContext, readFeatureContext, readPlanningContext, writeStoryFeatureContext };
 
-//# sourceMappingURL=work-agent-prompt-ULdcANl5.js.map
+//# sourceMappingURL=work-agent-prompt-Yb2bd3Fq.js.map