@overdeck/desktop 0.45.22 → 0.45.24

package/server/{workspaces-CFPcL0vl.js → workspaces-Do_9J0LQ.js}

@@ -1,44 +1,44 @@
-import { Dn as extractTeamPrefix, Hn as init_projects, In as getProjectSync, Kn as listProjectsSync, Sr as GitError, Xr as encodeClaudeProjectDir, dr as extractPrefixSync, fr as init_issue_id, gr as resolveIssueIdSync, hn as isStatePlaneOnlyStatus, ii as init_paths, jn as findProjectByTeamSync, jr as init_errors, mn as init_state_plane, mr as parseIssueIdSync, nr as resolveProjectFromIssueSync, ri as getOverdeckHome, t as init_config_yaml, tt as resolveModel, ur as extractNumberSync, xr as FsError } from "./config-yaml-ig8Nwtiw.js";
-import { d as rejectUnsafeDashboardMutationRequest, ht as getHeaderFromMap, it as getWorkAgentLifecycleStateSync, l as rejectUnauthorizedDashboardRequest, n as _serverManagedMerges, ot as spawnPanCli, xt as jsonResponse, yt as httpHandler } from "./specialists-Bg9v4z3F.js";
+import { $n as resolveIssueIdSync, Br as getOverdeckHome, Jn as extractPrefixSync, Nr as encodeClaudeProjectDir, Tn as init_projects, Vr as init_paths, Xt as isStatePlaneOnlyStatus, Yn as init_issue_id, Yt as init_state_plane, Zn as parseIssueIdSync, ar as GitError, ir as FsError, kn as listProjectsSync, mn as findProjectByTeamSync, mr as init_errors, qn as extractNumberSync, t as init_config_yaml, tt as resolveModel, un as extractTeamPrefix, yn as getProjectSync, zn as resolveProjectFromIssueSync } from "./config-yaml-DySPNmKN.js";
+import { Q as getWorkAgentLifecycleStateSync, St as jsonResponse, bt as httpHandler, dt as rejectUnauthorizedDashboardRequest, et as spawnPanCli, gt as getHeaderFromMap, n as _serverManagedMerges, pt as rejectUnsafeDashboardMutationRequest } from "./specialists-CC4r-c2s.js";
 import { a as init_activity_logger, n as emitActivityEntrySync } from "./activity-logger-DDlOIAML.js";
-import { d as getOverdeckDatabaseSync, f as init_infra } from "./infra-D4iNWMA5.js";
-import { V as sessionExists, X as buildChildEnvWithoutTmuxSync, Z as init_child_env, i as capturePane, j as listSessionNames, w as init_tmux } from "./tmux-L5LgvGLp.js";
-import { a as init_event_store, n as getEventStore } from "./event-store-TnWdydfB.js";
-import { _ as setDeaconIgnored, c as init_review_status, f as markWorkspaceStuck, g as setAutoMerge, s as getReviewStatusSync, u as loadReviewStatuses, y as setReviewStatusSync } from "./review-status-DFRjDFef.js";
-import { _ as init_queue_position, a as EventStoreService, g as findPositionInQueueSync, h as computeQueuePositionFromStatusSync, s as init_domain_services } from "./issue-lifecycle-CeyW_HoD.js";
-import { o as getPricingSync, s as init_cost, t as calculateCostSync } from "./cost-Codk1pc2.js";
-import { L as messageAgent, Nt as transitionIssueToInReview, X as spawnAgent, fr as saveAgentRuntimeState, i as listRunningAgents, kn as getAgentState, s as init_agents, ur as getAgentRuntimeStateSync } from "./queries-ZABd5aXP.js";
-import { f as CostWriter, l as CostDoorLive } from "./service-Bagb90KZ.js";
-import { a as init_tracker_config, t as getGitHubConfig } from "./tracker-config-DdT-nUAM.js";
-import { i as resolveGitHubIssueSync, n as init_tracker_utils } from "./tracker-utils-CawsPSS2.js";
-import { o as getInternalTokenSync, s as init_internal_token, t as INTERNAL_TOKEN_HEADER } from "./internal-token-CXsfxslp.js";
+import { d as getOverdeckDatabaseSync, f as init_infra } from "./infra-BEqFxlJc.js";
+import { $ as init_child_env, H as sessionExists, M as listSessionNames, Q as buildChildEnvWithoutTmuxSync, i as capturePane, w as init_tmux } from "./tmux-R7N7y-Mh.js";
+import { a as init_event_store, n as getEventStore } from "./event-store-CQL6NeqB.js";
+import { _ as setAutoMerge, b as setReviewStatusSync, c as getReviewStatusSync, d as loadReviewStatuses, l as init_review_status, p as markWorkspaceStuck, v as setDeaconIgnored } from "./review-status-kZj_KyCk.js";
+import { _ as init_queue_position, a as EventStoreService, g as findPositionInQueueSync, h as computeQueuePositionFromStatusSync, s as init_domain_services } from "./issue-lifecycle-ojZAzDBP.js";
+import { o as getPricingSync, s as init_cost, t as calculateCostSync } from "./cost-B2ddP6wq.js";
+import { Ar as saveAgentRuntimeState, Kt as transitionIssueToInReview, Or as getAgentRuntimeStateSync, X as messageAgent, b as init_agents, i as listRunningAgents, lt as spawnAgent, qn as getAgentState } from "./queries-CjNIf-Ub.js";
+import { f as CostWriter, l as CostDoorLive } from "./service-CLeAoU6G.js";
+import { a as init_tracker_config, t as getGitHubConfig } from "./tracker-config-G6latr8C.js";
+import { i as resolveGitHubIssueSync, n as init_tracker_utils } from "./tracker-utils-DHv5pSDT.js";
+import { o as getInternalTokenSync, s as init_internal_token, t as INTERNAL_TOKEN_HEADER } from "./internal-token-s0-oKybJ.js";
 import { a as PAN_DIRNAME, i as PAN_CONTINUE_FILENAME, p as init_types } from "./types-hraoaQIp.js";
-import { o as init_merge_sync, r as getAllActiveQueues } from "./merge-sync-Do8_q32h.js";
-import { A as init_vbrief_index, M as readVBriefDocument, _ as VBRIEF_INSPECTION_POLICIES, c as mergeRecordStatusOverrides, k as findVBriefByIssue, o as init_io, r as findPlan, s as isPlanningComplete, u as readPlan, v as init_types$1 } from "./io-DQR9PMgS.js";
-import { it as findConversationForCostSessionSync, k as init_conversations } from "./conversations-bYpM9-kZ.js";
-import { i as normalizeModelOverrideSync, r as init_model_validation } from "./launcher-generator-COgR2By1.js";
-import { f as init_config, m as loadConfigSync$1 } from "./config-q4Gvd8dq.js";
-import { a as init_stack_health, i as getWorkspaceStackHealth, n as collectDockerContainerLifecycleSnapshot } from "./stack-health-C-ifC7b0.js";
-import { a as criticalPath, l as init_dag, t as actionableDoc } from "./dag-CJpgf9A3.js";
-import { a as readEventsFromLineSync, i as init_events, l as init_wal, o as readEventsSync, r as getLastEventMetadataSync, t as appendCostEventSync } from "./events-DSUdR-04.js";
-import { n as getContainersReferencingWorkspacePath, r as init_workspace_manager } from "./workspace-manager-ClkCIWTe.js";
-import { r as init_devcontainer_renderer, t as DEVCONTAINER_DIRNAME } from "./devcontainer-renderer-CNmQy0pL.js";
-import { a as init_jsonl_parser, t as getActiveSessionModelSync } from "./jsonl-parser-C3HVNR5d.js";
-import { r as init_in_flight_guard, t as createInFlightGuard } from "./in-flight-guard-BoWm66Kh.js";
-import { i as findWorkspacePath, o as init_archive_planning } from "./archive-planning-BvDuWNMo.js";
-import { E as verifyAppCanMerge, f as init_github_app, m as isIntegrationPermissionError } from "./github-app-CDPtGF7J.js";
-import { a as loadWorkspaceMetadataSync, i as listWorkspaceMetadataSync } from "./workspace-metadata-tiSRIWJP.js";
-import { n as enrichReviewStatusFromSessions } from "./review-status-enrichment-crNAtIpL.js";
-import { n as generateDailySummary, r as init_cli } from "./cli-CbKNkFE5.js";
-import { a as getDiffStat, i as getDiffBase, o as init_review_context, r as getChangedFiles } from "./review-context-OYfKUprb.js";
-import { n as getTldrDaemonServiceSync, r as init_tldr_daemon } from "./tldr-daemon-BQFmmFp0.js";
-import { C as init_operations, S as gitPush, T as listGitOperationsSync, a as init_merge_agent, w as init_git_activity, x as MainDivergedError, y as syncMainIntoWorkspace } from "./merge-agent-DDiIjzk-.js";
-import { F as enqueueMerge, I as getAllActiveQueues$1, L as getCurrentMerge, P as dequeueMerge, z as markMergeProcessing } from "./merge-C1t-bspg.js";
-import { n as init_release_set, t as getReleaseSetSync } from "./release-set-DeUSOEHy.js";
-import { i as init_conflict_gate, r as getCachedConflictGateMergeability } from "./conflict-gate-CFqPVxEg.js";
-import { r as runVerificationForIssue } from "./verification-runner-FiuAZ-H2.js";
-import { t as teardownWorkspace } from "./teardown-workspace-DDCf5n-a.js";
-import { n as init_rebuild_stack, t as composeProjectNameForWorkspace } from "./rebuild-stack-JUm0jqYP.js";
+import { o as init_merge_sync, r as getAllActiveQueues } from "./merge-sync-VPV28g0g.js";
+import { A as init_xbrief_index, M as readXBriefDocument, _ as XBRIEF_INSPECTION_POLICIES, c as mergeRecordStatusOverrides, g as serializeXBriefDocument, k as findXBriefByIssue, o as init_io, r as findPlan, s as isPlanningComplete, u as readPlan, v as init_types$1 } from "./io-C9kF1wtJ.js";
+import { it as findConversationForCostSessionSync, k as init_conversations } from "./conversations-6AfUfbwc.js";
+import { a as normalizeModelOverrideSync, i as init_model_validation } from "./launcher-generator-BBWG_SiS.js";
+import { f as init_config, m as loadConfigSync$1 } from "./config-BZ0sHTju.js";
+import { a as getWorkspaceStackHealth, n as collectDockerContainerLifecycleSnapshot, r as composeProjectNameForWorkspace, s as init_stack_health } from "./stack-health-DxSdG9cW.js";
+import { a as criticalPath, l as init_dag, t as actionableDoc } from "./dag-B1ucnjDU.js";
+import { E as verifyAppCanMerge, M as withConcurrencyLimit, f as init_github_app, j as init_concurrency, m as isIntegrationPermissionError } from "./github-app-C3QrAUd0.js";
+import { a as readEventsFromLineSync, i as init_events, l as init_wal, o as readEventsSync, r as getLastEventMetadataSync, t as appendCostEventSync } from "./events-DTfAe4My.js";
+import { n as getContainersReferencingWorkspacePath, r as init_workspace_manager } from "./workspace-manager-CBhNdzE4.js";
+import { r as init_devcontainer_renderer, t as DEVCONTAINER_DIRNAME } from "./devcontainer-renderer-_d6XhyND.js";
+import { a as init_jsonl_parser, t as getActiveSessionModelSync } from "./jsonl-parser-BXSlHwEh.js";
+import { r as init_in_flight_guard, t as createInFlightGuard } from "./in-flight-guard-CAAkqPLu.js";
+import { i as findWorkspacePath, o as init_archive_planning } from "./archive-planning-Du25Jtst.js";
+import { a as loadWorkspaceMetadataSync, i as listWorkspaceMetadataSync } from "./workspace-metadata-_WygnyoX.js";
+import { n as enrichReviewStatusFromSessions } from "./review-status-enrichment-Dci-ZwEt.js";
+import { n as generateDailySummary, r as init_cli } from "./cli-RoOx5DUf.js";
+import { a as getDiffStat, i as getDiffBase, o as init_review_context, r as getChangedFiles } from "./review-context-2uj-YQ8J.js";
+import { n as getTldrDaemonServiceSync, r as init_tldr_daemon } from "./tldr-daemon-C-69c3OI.js";
+import { C as init_operations, S as gitPush, T as listGitOperationsSync, a as init_merge_agent, w as init_git_activity, x as MainDivergedError, y as syncMainIntoWorkspace } from "./merge-agent-4WOWlSYA.js";
+import { F as enqueueMerge, I as getAllActiveQueues$1, L as getCurrentMerge, P as dequeueMerge, z as markMergeProcessing } from "./merge-CefQNAnq.js";
+import { n as init_release_set, t as getReleaseSetSync } from "./release-set-CQfuN9-v.js";
+import { i as init_conflict_gate, r as getCachedConflictGateMergeability } from "./conflict-gate-BaCVrH-N.js";
+import { r as runVerificationForIssue } from "./verification-runner-CkgX6EtI.js";
+import { t as teardownWorkspace } from "./teardown-workspace-DeTTImn-.js";
+import { t as init_rebuild_stack } from "./rebuild-stack-lwtsW0GO.js";
 import { basename, dirname, join, resolve, sep } from "node:path";
 import { Effect, Layer, Option, Stream } from "effect";
 import { closeSync, existsSync, fstatSync, mkdirSync, openSync, readFileSync, readSync, readdirSync, renameSync, writeFileSync } from "fs";
@@ -54,6 +54,162 @@ import { promisify } from "node:util";
 import { timingSafeEqual } from "node:crypto";
 import { createConnection } from "node:net";
 import { crc32 } from "node:zlib";
+//#region services/agent-output-service.ts
+/**
+* Agent Output Service (PAN-1221 F3)
+*
+* Captures tmux pane output only for agents with an active output subscriber.
+* Explicit agent subscriptions and the public all-output SSE feed share one
+* reference-counted poller, so zero interest means zero pane captures.
+*/
+init_agents();
+init_tmux();
+init_concurrency();
+init_event_store();
+function splitLines(text) {
+	const lines = text.split("\n");
+	if (lines.length > 0 && lines[lines.length - 1] === "") lines.pop();
+	return lines;
+}
+/**
+* Find new lines by looking for the longest suffix of `previous` that matches
+* a prefix of `current`. The non-overlapping prefix of `current` is returned.
+* If there is no overlap, all of `current` is new (pane was cleared or scrolled
+* past the overlap window).
+*/
+function diffLines(previous, current) {
+	if (previous.length === 0) return current;
+	for (let start = 0; start < previous.length; start++) {
+		const suffix = previous.slice(start);
+		if (suffix.length > current.length) continue;
+		if (suffix.every((line, i) => line === current[i])) return current.slice(suffix.length);
+	}
+	return current;
+}
+function hasAgentInterest(state, agentId) {
+	return state.allInterestCount > 0 || (state.interestCounts.get(agentId) ?? 0) > 0;
+}
+async function captureInterestedAgent(state, agentId) {
+	if (!hasAgentInterest(state, agentId) || state.inFlight.has(agentId)) return;
+	state.inFlight.add(agentId);
+	try {
+		let stdout;
+		try {
+			const remoteState = await readFile(join(homedir$1(), ".overdeck", "agents", agentId, "remote-state.json"), "utf-8").then((text) => JSON.parse(text)).catch(() => null);
+			if (remoteState?.location === "remote" && remoteState?.vmName) {
+				const { getRemoteAgentOutput } = await import("./remote-agents-CA3Ihlxj.js");
+				stdout = await getRemoteAgentOutput(agentId, remoteState.vmName, 50);
+			} else stdout = await Effect.runPromise(capturePane(agentId, 50));
+		} catch {
+			stdout = await Effect.runPromise(capturePane(agentId, 50).pipe(Effect.catch(() => Effect.succeed(""))));
+		}
+		if (!hasAgentInterest(state, agentId)) return;
+		if (!stdout || stdout.trim() === "" || stdout.trim() === "Session not found") return;
+		const previousOutput = state.lastOutput.get(agentId) ?? "";
+		if (stdout === previousOutput) return;
+		const newLines = diffLines(splitLines(previousOutput), splitLines(stdout));
+		state.lastOutput.set(agentId, stdout);
+		if (newLines.length === 0) return;
+		const event = {
+			type: "agent.output_received",
+			timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+			payload: {
+				agentId,
+				lines: newLines
+			}
+		};
+		getEventStore().emitOnly(event);
+	} finally {
+		state.inFlight.delete(agentId);
+	}
+}
+async function pollOnce(state) {
+	if (state.polling) return;
+	state.polling = true;
+	try {
+		const interestedIds = new Set(state.interestCounts.keys());
+		if (state.allInterestCount > 0) try {
+			const runningAgents = await Effect.runPromise(listRunningAgents());
+			for (const agent of runningAgents) if (agent.tmuxActive) interestedIds.add(agent.id);
+		} catch {}
+		if (interestedIds.size === 0) return;
+		await Effect.runPromise(withConcurrencyLimit([...interestedIds].map((agentId) => Effect.tryPromise({
+			try: () => captureInterestedAgent(state, agentId),
+			catch: (cause) => cause
+		})), 4));
+	} finally {
+		state.polling = false;
+	}
+}
+const POLL_INTERVAL_MS = 3e3;
+const serviceState = {
+	timer: null,
+	lastOutput: /* @__PURE__ */ new Map(),
+	interestCounts: /* @__PURE__ */ new Map(),
+	allInterestCount: 0,
+	inFlight: /* @__PURE__ */ new Set(),
+	polling: false,
+	started: false
+};
+function hasAnyInterest(state) {
+	return state.allInterestCount > 0 || state.interestCounts.size > 0;
+}
+function ensurePolling() {
+	if (!serviceState.started || serviceState.timer !== null || !hasAnyInterest(serviceState)) return;
+	serviceState.timer = setInterval(() => {
+		pollOnce(serviceState).catch(() => void 0);
+	}, POLL_INTERVAL_MS);
+}
+function stopPollingIfIdle() {
+	if (hasAnyInterest(serviceState) || serviceState.timer === null) return;
+	clearInterval(serviceState.timer);
+	serviceState.timer = null;
+}
+function retainAgentOutputInterest(agentId) {
+	const previousCount = serviceState.interestCounts.get(agentId) ?? 0;
+	serviceState.interestCounts.set(agentId, previousCount + 1);
+	ensurePolling();
+	if (serviceState.started && previousCount === 0) captureInterestedAgent(serviceState, agentId).catch(() => void 0);
+	let released = false;
+	return () => {
+		if (released) return;
+		released = true;
+		const count = serviceState.interestCounts.get(agentId) ?? 0;
+		if (count <= 1) serviceState.interestCounts.delete(agentId);
+		else serviceState.interestCounts.set(agentId, count - 1);
+		stopPollingIfIdle();
+	};
+}
+/** Preserve the public SSE feed's existing all-agent output surface on demand. */
+function retainAllAgentOutputInterest() {
+	serviceState.allInterestCount += 1;
+	ensurePolling();
+	if (serviceState.started && serviceState.allInterestCount === 1) pollOnce(serviceState).catch(() => void 0);
+	let released = false;
+	return () => {
+		if (released) return;
+		released = true;
+		serviceState.allInterestCount = Math.max(0, serviceState.allInterestCount - 1);
+		stopPollingIfIdle();
+	};
+}
+function startAgentOutputService() {
+	if (serviceState.started) return;
+	serviceState.started = true;
+	ensurePolling();
+	if (hasAnyInterest(serviceState)) pollOnce(serviceState).catch(() => void 0);
+}
+function stopAgentOutputService() {
+	serviceState.started = false;
+	if (serviceState.timer !== null) clearInterval(serviceState.timer);
+	serviceState.timer = null;
+	serviceState.lastOutput.clear();
+	serviceState.interestCounts.clear();
+	serviceState.allInterestCount = 0;
+	serviceState.inFlight.clear();
+	serviceState.polling = false;
+}
+//#endregion
 //#region workspace-paths.ts
 init_issue_id();
 function getWorkspacePathForIssue(projectPath, rawIssueId) {
@@ -775,7 +931,7 @@ const postWorkspaceContainerActionRoute = HttpRouter.add("POST", "/api/workspace
 	}
 	if (!workspacePath) return jsonResponse({ error: `Workspace not found for ${issueId}` }, { status: 404 });
 	if (!composeFile && ["start", "restart"].includes(action)) {
-		const { ensureDevcontainerSync } = yield* Effect.promise(() => import("./ensure-devcontainer-Cs6W9Yzj.js"));
+		const { ensureDevcontainerSync } = yield* Effect.promise(() => import("./ensure-devcontainer-BZgOhRo7.js"));
 		if (ensureDevcontainerSync({
 			workspacePath,
 			issueId
@@ -2371,6 +2527,7 @@ const getEventStreamRoute = HttpRouter.add("GET", "/events/stream", httpHandler(
 	const nodeStream = new ReadableStream({
 		start(controller) {
 			let closed = false;
+			let cleanedUp = false;
 			const safeEnqueue = (chunk) => {
 				if (closed) return;
 				try {
@@ -2398,14 +2555,17 @@ const getEventStreamRoute = HttpRouter.add("GET", "/events/stream", httpHandler(
 				if (!matchesFilter(event, filters)) return;
 				safeEnqueue(encoder.encode(formatFrame(event)));
 			});
+			const releaseOutputInterest = !filters.types || filters.types.has("agent.output_received") ? retainAllAgentOutputInterest() : () => void 0;
 			const keepalive = setInterval(() => {
 				safeEnqueue(encoder.encode(`: keepalive\n\n`));
 			}, KEEPALIVE_INTERVAL_MS);
 			cleanup = () => {
-				if (closed) return;
+				if (cleanedUp) return;
+				cleanedUp = true;
 				closed = true;
 				clearInterval(keepalive);
 				unsubscribe();
+				releaseOutputInterest();
 				try {
 					controller.close();
 				} catch {}
@@ -2602,6 +2762,12 @@ const internalEventsRouteLayer = Layer.mergeAll(internalEventsRoute, internalEve
 //#endregion
 //#region routes/workspaces/merge-strike.ts
 init_agents();
+function mergeVerificationOptions(request) {
+	return {
+		syncTargetBranch: false,
+		...request.kind === "strike" ? { skipPlanChecklist: true } : {}
+	};
+}
 function parseStrikeMergeRequest(raw) {
 	if (!raw || typeof raw !== "object") return null;
 	const request = raw;
@@ -2611,7 +2777,9 @@ function mergeCompletionStatus(request) {
 	return request.kind === "strike" ? {
 		strikeLandingState: "landed",
 		strikeReadyHead: void 0,
-		strikeReadyAt: void 0
+		strikeReadyAt: void 0,
+		strikeTransportRetryCount: void 0,
+		strikeNextAttemptAt: void 0
 	} : {};
 }
 function activeStrikeMerge(currentMerge, pendingOperation) {
@@ -2823,7 +2991,7 @@ async function reconcileGitHubMergeStatus(issueId, status) {
 	const prRef = parseGitHubPullRequestUrl(status.prUrl);
 	if (!prRef) return false;
 	try {
-		const { getPullRequestState, isGitHubAppConfigured } = await import("./github-app-CU14oYzP.js");
+		const { getPullRequestState, isGitHubAppConfigured } = await import("./github-app-ClZ2lk8D.js");
 		if (!isGitHubAppConfigured()) return false;
 		const prState = await Effect.runPromise(getPullRequestState(prRef.owner, prRef.repo, prRef.number));
 		console.log(`[merge] reconcileGitHubMergeStatus: ${issueId} PR #${prRef.number} merged=${prState.merged} state=${prState.state}`);
@@ -2842,7 +3010,7 @@ async function reconcileGitHubMergeStatus(issueId, status) {
 }
 /**
 * Build a rich PR body with issue link, tasks task summary, and AC checklist
-* from the vBRIEF plan. Exported for testing.
+* from the xBRIEF plan. Exported for testing.
 */
 async function buildRichPRBody(issueId, workspacePath) {
 	const lines = [];
@@ -3090,8 +3258,8 @@ async function triggerMerge(issueId, request = { kind: "normal" }) {
 	try {
 		if (request.kind === "normal" && workspaceInfo.isRemote && workspaceInfo.vmName) {
 			console.log(`[merge] Remote workspace detected for ${issueId}, using review artifact merge...`);
-			const { getMergeSetSync, ensureMergeSetForIssueSync } = await import("./merge-set-6LEglm6o.js");
-			const { getForgeAdapter } = await import("./forge-B0_opi-V.js");
+			const { getMergeSetSync, ensureMergeSetForIssueSync } = await import("./merge-set-bUqbm3yc.js");
+			const { getForgeAdapter } = await import("./forge-DXnS_YFH.js");
 			const remotePrimaryRepo = (getMergeSetSync(issueId) || ensureMergeSetForIssueSync(issueId))?.repos[0];
 			const remoteTargetBranch = remotePrimaryRepo?.targetBranch || "main";
 			const remoteForge = remotePrimaryRepo?.forge || "github";
@@ -3127,7 +3295,7 @@ async function triggerMerge(issueId, request = { kind: "normal" }) {
 					...mergeCompletionStatus(request)
 				});
 				completePendingOperation(issueId, null);
-				const { postMergeLifecycle } = await import("./merge-agent-B-SnXOoc.js");
+				const { postMergeLifecycle } = await import("./merge-agent-CKkgIBPB.js");
 				await postMergeLifecycle(issueId, projectPath);
 				return {
 					success: true,
@@ -3164,10 +3332,10 @@ async function triggerMerge(issueId, request = { kind: "normal" }) {
 		const projectConfig = findProjectByTeamSync(issuePrefix);
 		if (projectConfig?.workspace?.type === "polyrepo" && projectConfig?.workspace?.repos) {
 			console.log(`[merge] Polyrepo detected for ${issueId}, coordinating merge set...`);
-			const { getMergeSetSync, ensureMergeSetForIssueSync, upsertMergeSetSync, withRepoStateSync } = await import("./merge-set-6LEglm6o.js");
-			const { runQualityGates } = await import("./validation-DcAgXTQp.js");
-			const { getForgeAdapter } = await import("./forge-B0_opi-V.js");
-			const { messageAgent } = await import("./agents-DyHKlq1I.js");
+			const { getMergeSetSync, ensureMergeSetForIssueSync, upsertMergeSetSync, withRepoStateSync } = await import("./merge-set-bUqbm3yc.js");
+			const { runQualityGates } = await import("./validation-CC9OPqJZ.js");
+			const { getForgeAdapter } = await import("./forge-DXnS_YFH.js");
+			const { messageAgent } = await import("./agents-wi9NWzs2.js");
 			let mergeSet = getMergeSetSync(issueId) || ensureMergeSetForIssueSync(issueId);
 			if (!mergeSet) {
 				const error = `No merge set found for ${issueId}`;
@@ -3438,7 +3606,7 @@ async function triggerMerge(issueId, request = { kind: "normal" }) {
 				...mergeCompletionStatus(request)
 			});
 			completePendingOperation(issueId, null);
-			const { postMergeLifecycle } = await import("./merge-agent-B-SnXOoc.js");
+			const { postMergeLifecycle } = await import("./merge-agent-CKkgIBPB.js");
 			advanceQueue();
 			await postMergeLifecycle(issueId, projectPath);
 			return {
@@ -3449,8 +3617,8 @@ async function triggerMerge(issueId, request = { kind: "normal" }) {
 				repos: mergeResults
 			};
 		}
-		const { getMergeSetSync, ensureMergeSetForIssueSync } = await import("./merge-set-6LEglm6o.js");
-		const { getForgeAdapter } = await import("./forge-B0_opi-V.js");
+		const { getMergeSetSync, ensureMergeSetForIssueSync } = await import("./merge-set-bUqbm3yc.js");
+		const { getForgeAdapter } = await import("./forge-DXnS_YFH.js");
 		const primaryRepo = (getMergeSetSync(issueId) || ensureMergeSetForIssueSync(issueId))?.repos[0];
 		const targetBranch = primaryRepo?.targetBranch || "main";
 		const primaryForge = primaryRepo?.forge || "github";
@@ -3492,7 +3660,7 @@ async function triggerMerge(issueId, request = { kind: "normal" }) {
 			};
 		}
 		if (githubPrRef) try {
-			const { getPullRequestState, isGitHubAppConfigured } = await import("./github-app-CU14oYzP.js");
+			const { getPullRequestState, isGitHubAppConfigured } = await import("./github-app-ClZ2lk8D.js");
 			if (isGitHubAppConfigured()) {
 				const prState = await Effect.runPromise(getPullRequestState(githubPrRef.owner, githubPrRef.repo, githubPrRef.number));
 				if (prState.state !== "OPEN" && !prState.merged) {
@@ -3554,7 +3722,7 @@ async function triggerMerge(issueId, request = { kind: "normal" }) {
 						...mergeCompletionStatus(request)
 					});
 					completePendingOperation(issueId, null);
-					const { postMergeLifecycle } = await import("./merge-agent-B-SnXOoc.js");
+					const { postMergeLifecycle } = await import("./merge-agent-CKkgIBPB.js");
 					await postMergeLifecycle(issueId, projectPath, branchName);
 					return {
 						success: true,
@@ -3568,13 +3736,13 @@ async function triggerMerge(issueId, request = { kind: "normal" }) {
 		} catch (prStateErr) {
 			console.warn(`[merge] Pre-merge PR state check failed for ${issueId}: ${prStateErr.message} — proceeding (check is best-effort)`);
 		}
-		const { postMergeLifecycle } = await import("./merge-agent-B-SnXOoc.js");
+		const { postMergeLifecycle } = await import("./merge-agent-CKkgIBPB.js");
 		const agentId = request.kind === "strike" ? request.recoveryTarget : `agent-${issueId.toLowerCase()}`;
 		const rebaseMsg = request.kind === "strike" ? `STRIKE LANDING REQUEST: Rebase ${branchName} onto ${targetBranch}, resolve conflicts, run the full quality gates, push ${branchName}, then run pan strike-ready ${issueId} to persist the new HEAD. Do NOT merge or push main.` : `MERGE REQUESTED: The human has clicked MERGE for ${issueId}. Please rebase onto ${targetBranch} and push:\n\n1. git fetch origin ${targetBranch}\n2. git rebase origin/${targetBranch}\n3. If conflicts: resolve them, git add, git rebase --continue\n4. git push --force-with-lease\n\nAfter pushing, the server will handle verification and merge automatically. Do NOT run gh pr merge yourself.`;
 		setReviewStatus(issueId, { mergeStep: "rebasing" });
 		console.log(`[merge] Rebasing ${branchName} onto ${targetBranch} for ${issueId} (agent=${await Effect.runPromise(sessionExists(agentId)) ? "running" : "stopped"})...`);
 		{
-			const { beginShipLog, appendShipLog } = await import("./ship-log-__QtAFXG.js");
+			const { beginShipLog, appendShipLog } = await import("./ship-log-D9MlVzYU.js");
 			beginShipLog(issueId);
 			appendShipLog(issueId, `Ship started: rebasing ${branchName} onto ${targetBranch}…`, "rebasing");
 		}
@@ -3705,7 +3873,7 @@ async function triggerMerge(issueId, request = { kind: "normal" }) {
 		});
 		let skipLocalVerification = false;
 		if (primaryForge === "github" && artifactUrl) try {
-			const { parsePullRequestRef, getCiCheckRunsStatePromise, isGitHubAppConfigured } = await import("./github-app-CU14oYzP.js");
+			const { parsePullRequestRef, getCiCheckRunsStatePromise, isGitHubAppConfigured } = await import("./github-app-ClZ2lk8D.js");
 			if (isGitHubAppConfigured()) {
 				const ref = parsePullRequestRef({ url: artifactUrl });
 				if (ref) {
@@ -3726,14 +3894,14 @@ async function triggerMerge(issueId, request = { kind: "normal" }) {
 		} catch (ciErr) {
 			console.warn(`[merge] CI-state check failed (${ciErr.message?.slice(0, 120)}) — falling back to local verification for ${issueId}`);
 		}
-		const { appendShipLog } = await import("./ship-log-__QtAFXG.js");
+		const { appendShipLog } = await import("./ship-log-D9MlVzYU.js");
 		if (skipLocalVerification) appendShipLog(issueId, "✓ Local verification skipped — CI already green on this exact commit", "verifying");
 		const verifyResult = skipLocalVerification ? { outcome: "passed" } : await (async () => {
 			console.log(`[merge] Running post-rebase verification for ${issueId}...`);
 			appendShipLog(issueId, "Running post-rebase verification (full quality-gate suite)…", "verifying");
-			const { runVerificationForIssue } = await import("./verification-runner-DlJezzef.js");
+			const { runVerificationForIssue } = await import("./verification-runner-BW4HOKAz.js");
 			return Effect.runPromise(runVerificationForIssue(issueId, workspacePath, { isRemote: false }, "merge-verify", {
-				syncTargetBranch: false,
+				...mergeVerificationOptions(request),
 				onGateLog: (line) => appendShipLog(issueId, line, "verifying")
 			}));
 		})();
@@ -3764,7 +3932,7 @@ async function triggerMerge(issueId, request = { kind: "normal" }) {
 		console.log(`[merge] Post-rebase verification ${verifyResult.outcome} for ${issueId}`);
 		setReviewStatus(issueId, { mergeStep: "reporting-statuses" });
 		try {
-			const { getPullRequestState, isGitHubAppConfigured, reportCommitStatus } = await import("./github-app-CU14oYzP.js");
+			const { getPullRequestState, isGitHubAppConfigured, reportCommitStatus } = await import("./github-app-ClZ2lk8D.js");
 			if (githubPrRef && isGitHubAppConfigured()) {
 				const sha = (await Effect.runPromise(getPullRequestState(githubPrRef.owner, githubPrRef.repo, githubPrRef.number))).headSha.trim();
 				if (sha) {
@@ -3792,7 +3960,7 @@ async function triggerMerge(issueId, request = { kind: "normal" }) {
 		} catch (prMergeErr) {
 			console.error(`[merge] Review artifact merge threw for ${issueId}:`, prMergeErr);
 			try {
-				const { getPullRequestState, isGitHubAppConfigured } = await import("./github-app-CU14oYzP.js");
+				const { getPullRequestState, isGitHubAppConfigured } = await import("./github-app-ClZ2lk8D.js");
 				if (githubPrRef && isGitHubAppConfigured()) {
 					artifactMerged = (await Effect.runPromise(getPullRequestState(githubPrRef.owner, githubPrRef.repo, githubPrRef.number))).merged;
 					if (artifactMerged) console.log(`[merge] Race-detected: PR #${githubPrRef.number} for ${issueId} was already merged despite thrown error; proceeding`);
@@ -3911,8 +4079,8 @@ const postForgeApproveRoute = HttpRouter.add("POST", "/api/issues/:issueId/forge
 	if (!parseIssueIdSync(issueId)) return jsonResponse({ error: "Invalid issue ID" }, { status: 400 });
 	if (!/^[A-Z]+-\d+$/i.test(issueId)) return jsonResponse({ error: "Invalid issue ID format" }, { status: 400 });
 	return yield* Effect.promise(async () => {
-		const { getMergeSetSync, upsertMergeSetSync, withRepoArtifactUrlSync, withRepoStateSync } = await import("./merge-set-6LEglm6o.js");
-		const { getForgeAdapter } = await import("./forge-B0_opi-V.js");
+		const { getMergeSetSync, upsertMergeSetSync, withRepoArtifactUrlSync, withRepoStateSync } = await import("./merge-set-bUqbm3yc.js");
+		const { getForgeAdapter } = await import("./forge-DXnS_YFH.js");
 		let mergeSet = getMergeSetSync(issueId);
 		if (!mergeSet) return jsonResponse({ error: `No merge set found for ${issueId}` }, { status: 404 });
 		const results = [];
@@ -4000,8 +4168,8 @@ const postForgeMergeRoute = HttpRouter.add("POST", "/api/issues/:issueId/forge-m
 	if (!parseIssueIdSync(issueId)) return jsonResponse({ error: "Invalid issue ID" }, { status: 400 });
 	if (!/^[A-Z]+-\d+$/i.test(issueId)) return jsonResponse({ error: "Invalid issue ID format" }, { status: 400 });
 	return yield* Effect.promise(async () => {
-		const { getMergeSetSync, upsertMergeSetSync, withRepoArtifactUrlSync, withRepoStateSync } = await import("./merge-set-6LEglm6o.js");
-		const { getForgeAdapter } = await import("./forge-B0_opi-V.js");
+		const { getMergeSetSync, upsertMergeSetSync, withRepoArtifactUrlSync, withRepoStateSync } = await import("./merge-set-bUqbm3yc.js");
+		const { getForgeAdapter } = await import("./forge-DXnS_YFH.js");
 		let mergeSet = getMergeSetSync(issueId);
 		if (!mergeSet) return jsonResponse({ error: `No merge set found for ${issueId}` }, { status: 404 });
 		const results = [];
@@ -4194,7 +4362,7 @@ const postWorkspaceApproveRoute = HttpRouter.add("POST", "/api/issues/:issueId/a
 		console.log(`[approve] Starting role pipeline for ${issueId}...`);
 		let reviewResult;
 		try {
-			const { spawnReviewRoleForIssue } = await import("./review-agent-CCum8sGe.js");
+			const { spawnReviewRoleForIssue } = await import("./review-agent-DNboMyW4.js");
 			reviewResult = await Effect.runPromise(spawnReviewRoleForIssue({
 				issueId,
 				workspace: workspacePath,
@@ -4241,7 +4409,7 @@ const postWorkspaceApproveRoute = HttpRouter.add("POST", "/api/issues/:issueId/a
 		}
 		console.log(`[approve] Step 3/3: Running server-side rebase for ${issueId}...`);
 		try {
-			const { rebaseFeatureBranch } = await import("./merge-rebase-Cm6fXaZN.js");
+			const { rebaseFeatureBranch } = await import("./merge-rebase-BfaTyXsw.js");
 			const workspacePathForRebase = join(projectPath, "workspaces", `feature-${issueId.toLowerCase()}`);
 			const rebaseResult = await Effect.runPromise(rebaseFeatureBranch(workspacePathForRebase, branchName, "main", issueId));
 			if (!rebaseResult.success) {
@@ -4261,7 +4429,7 @@ const postWorkspaceApproveRoute = HttpRouter.add("POST", "/api/issues/:issueId/a
 			completePendingOperation(issueId, pushResult.error);
 			return jsonResponse({ error: pushResult.error }, { status: pushResult.httpStatus });
 		}
-		const { approve: lifecycleApprove } = await import("./lifecycle-CtPDcZ9u.js");
+		const { approve: lifecycleApprove } = await import("./lifecycle-xmBfK2GJ.js");
 		const ghResolved = resolveGitHubIssueSync(issueId);
 		const isGitHubIssueFlag = ghResolved.isGitHub;
 		const lifecycleCtx = {
@@ -4295,7 +4463,7 @@ const getMergeQueueRoute = HttpRouter.add("GET", "/api/merge-queue", httpHandler
 })));
 const postInternalPipelineNotifyRoute = HttpRouter.add("POST", "/api/internal/pipeline/notify", httpHandler(Effect.gen(function* () {
 	const request = yield* HttpServerRequest.HttpServerRequest;
-	const { INTERNAL_TOKEN_HEADER, getInternalTokenSync } = yield* Effect.promise(() => import("./internal-token-C9DdEOKY.js"));
+	const { INTERNAL_TOKEN_HEADER, getInternalTokenSync } = yield* Effect.promise(() => import("./internal-token-BrcU6qfe.js"));
 	const expected = getInternalTokenSync();
 	if (!expected) return jsonResponse({
 		ok: false,
@@ -4309,7 +4477,7 @@ const postInternalPipelineNotifyRoute = HttpRouter.add("POST", "/api/internal/pi
 	}, 403);
 	const event = yield* readJsonBody;
 	const type = event.type;
-	const { notifyPipelineSync } = yield* Effect.promise(() => import("./pipeline-notifier-CZsrU_nj.js"));
+	const { notifyPipelineSync } = yield* Effect.promise(() => import("./pipeline-notifier-BJr8gQX6.js"));
 	switch (type) {
 		case "status_changed": {
 			const issueId = event.issueId;
@@ -4472,7 +4640,7 @@ init_review_status();
 init_io();
 init_types();
 init_dag();
-init_vbrief_index();
+init_xbrief_index();
 init_types$1();
 init_review_context();
 init_tldr_daemon();
@@ -4601,9 +4769,9 @@ async function getIndexStats(workspacePath) {
 function resolvePlanLocation(projectPath, issueId) {
 	return Effect.gen(function* () {
 		const workspacePath = join(projectPath, "workspaces", `feature-${issueId.toLowerCase()}`);
-		const found = yield* findVBriefByIssue(projectPath, issueId);
+		const found = yield* findXBriefByIssue(projectPath, issueId);
 		if (found) {
-			const doc = yield* readVBriefDocument(found.path);
+			const doc = yield* readXBriefDocument(found.path);
 			return {
 				path: found.path,
 				lifecycleDir: found.lifecycleDir,
@@ -4990,7 +5158,7 @@ const getWorkspacePlanRoute = HttpRouter.add("GET", "/api/workspaces/:issueId/pl
 	const issueId = (yield* HttpRouter.params)["issueId"] ?? "";
 	if (!parseIssueIdSync(issueId)) return jsonResponse({ error: "Invalid issue ID" }, { status: 400 });
 	const location = yield* resolvePlanLocation(getProjectPath(void 0, extractPrefixSync(issueId) ?? issueId.split("-")[0]), issueId);
-	if (!location) return jsonResponse({ error: "No vBRIEF plan found for this workspace" }, { status: 404 });
+	if (!location) return jsonResponse({ error: "No xBRIEF plan found for this workspace" }, { status: 404 });
 	const cp = criticalPath(actionableDoc(location.doc));
 	return jsonResponse({
 		...location.doc,
@@ -5026,14 +5194,14 @@ const patchWorkspacePlanInspectionPolicyRoute = HttpRouter.add("PATCH", "/api/wo
 	const issueId = (yield* HttpRouter.params)["issueId"] ?? "";
 	if (!parseIssueIdSync(issueId)) return jsonResponse({ error: "Invalid issue ID" }, { status: 400 });
 	const policy = (yield* readJsonBody).inspectionPolicy;
-	if (!VBRIEF_INSPECTION_POLICIES.includes(policy)) return jsonResponse({ error: "Invalid inspection policy" }, { status: 400 });
+	if (!XBRIEF_INSPECTION_POLICIES.includes(policy)) return jsonResponse({ error: "Invalid inspection policy" }, { status: 400 });
 	const location = yield* resolvePlanLocation(getProjectPath(void 0, extractPrefixSync(issueId) ?? issueId.split("-")[0]), issueId);
-	if (!location) return jsonResponse({ error: "No vBRIEF plan found for this workspace" }, { status: 404 });
+	if (!location) return jsonResponse({ error: "No xBRIEF plan found for this workspace" }, { status: 404 });
 	const now = (/* @__PURE__ */ new Date()).toISOString();
 	const updated = {
 		...location.doc,
-		vBRIEFInfo: {
-			...location.doc.vBRIEFInfo,
+		xBRIEFInfo: {
+			...location.doc.xBRIEFInfo,
 			inspectionPolicy: policy,
 			updated: now
 		},
@@ -5042,7 +5210,7 @@ const patchWorkspacePlanInspectionPolicyRoute = HttpRouter.add("PATCH", "/api/wo
 			updated: now
 		}
 	};
-	yield* Effect.promise(() => writeFile(location.path, JSON.stringify(updated, null, 2) + "\n", "utf-8"));
+	yield* Effect.promise(() => writeFile(location.path, `${serializeXBriefDocument(updated)}\n`, "utf-8"));
 	const cp = criticalPath(updated);
 	return jsonResponse({
 		...updated,
@@ -5084,10 +5252,10 @@ const patchWorkspaceTieredExecutionRoute = HttpRouter.add("PATCH", "/api/workspa
 	if (override !== "on" && override !== "off" && override !== null && override !== void 0) return jsonResponse({ error: "Invalid tiered-execution override" }, { status: 400 });
 	const project = getProjectSync(extractPrefixSync(issueId) ?? issueId.split("-")[0]);
 	if (!project) return jsonResponse({ error: "Project not found" }, { status: 404 });
-	yield* Effect.promise(() => import("./record-rwK-nKv_.js").then((m) => m.writeRecordTieredExecutionOverride(project, issueId, override)));
+	yield* Effect.promise(() => import("./record-CN0pj4_5.js").then((m) => m.writeRecordTieredExecutionOverride(project, issueId, override)));
 	const projectPath = project.path;
 	const location = yield* resolvePlanLocation(projectPath, issueId);
-	if (!location) return jsonResponse({ error: "No vBRIEF plan found for this workspace" }, { status: 404 });
+	if (!location) return jsonResponse({ error: "No xBRIEF plan found for this workspace" }, { status: 404 });
 	const globalEnabled = loadConfigSync().config.tieredExecution?.enabled ?? false;
 	const planMetadata = location.doc.plan?.metadata;
 	let source;
@@ -5431,6 +5599,33 @@ const MAX_AUTO_REQUEUE = 25;
 const requestReviewPipeline = createRequestReviewPipeline();
 /** Safe `.message` read for caught values of unknown shape. */
 const errorMessage = (e) => e instanceof Error ? e.message : void 0;
+/**
+* Push the feature branch of every repo in the workspace (PAN-2948).
+*
+* A polyrepo workspace root is a one-commit wrapper repo with no remote and no
+* feature branch — pushing there fails and, on the verified-dispatch path,
+* kills the whole re-review pipeline. Loop the resolved repo roots instead
+* (mirrors rebase-helper.ts), skipping repos whose feature branch doesn't
+* exist locally (untouched sub-repos). Monorepo resolves to a single root at
+* the workspace path, preserving the previous behavior.
+*/
+async function pushFeatureBranches(issueId, workspacePath) {
+	const { resolveWorkspaceRepoRootsSync } = await import("./project-repos-DXKQsc_m.js");
+	for (const root of resolveWorkspaceRepoRootsSync(issueId, workspacePath)) {
+		try {
+			await execAsync$2(`git rev-parse --verify --quiet refs/heads/${root.sourceBranch}`, {
+				cwd: root.dir,
+				encoding: "utf-8"
+			});
+		} catch {
+			continue;
+		}
+		await execAsync$2(`git push origin ${root.sourceBranch}`, {
+			cwd: root.dir,
+			encoding: "utf-8"
+		});
+	}
+}
 function shouldTreatAsRerun(status) {
 	if (!status) return false;
 	return status.readyForMerge === true || status.reviewStatus === "passed" || status.testStatus === "passed" || status.mergeStatus === "failed";
@@ -5542,15 +5737,12 @@ const postWorkspaceReviewRoute = HttpRouter.add("POST", "/api/review/:issueId/tr
 				console.warn(`[review] Could not transition ${issueId} to in_review: ${errorMessage(err)}`);
 			});
 			try {
-				await execAsync$2(`git push origin ${branchName}`, {
-					cwd: workspacePath,
-					encoding: "utf-8"
-				});
+				await pushFeatureBranches(issueId, workspacePath);
 			} catch (pushErr) {
 				console.log(`Feature branch push note: ${errorMessage(pushErr)}`);
 			}
 			try {
-				const { createReviewArtifactsForIssue } = await import("./review-artifacts-CXywD0F2.js");
+				const { createReviewArtifactsForIssue } = await import("./review-artifacts-nRDPuMxd.js");
 				const artifactResult = await Effect.runPromise(createReviewArtifactsForIssue(issueId, workspacePath));
 				const primaryArtifact = artifactResult.mergeSet?.repos.find((repo) => !!repo.artifactUrl);
 				artifactResult.mergeSet?.repos.find((repo) => repo.mergeStatus !== "skipped")?.targetBranch;
@@ -5605,7 +5797,7 @@ const postWorkspaceReviewRoute = HttpRouter.add("POST", "/api/review/:issueId/tr
 				} catch {}
 				return;
 			}
-			const { spawnReviewRoleForIssue } = await import("./review-agent-CCum8sGe.js");
+			const { spawnReviewRoleForIssue } = await import("./review-agent-DNboMyW4.js");
 			const prUrl = getReviewStatusSync(issueId)?.prUrl;
 			const reviewResult = await Effect.runPromise(spawnReviewRoleForIssue({
 				issueId,
@@ -5736,15 +5928,12 @@ const postWorkspaceRequestReviewRoute = HttpRouter.add("POST", "/api/review/:iss
 						console.warn(`[request-review] Could not transition ${issueId} to in_review: ${errorMessage(err)}`);
 					});
 					try {
-						await execAsync$2(`git push origin ${branchNameRerun}`, {
-							cwd: workspacePathRerun,
-							encoding: "utf-8"
-						});
+						await pushFeatureBranches(issueId, workspacePathRerun);
 					} catch (pushErr) {
 						console.log(`[request-review] Feature branch push note: ${errorMessage(pushErr)}`);
 					}
 					const prUrl = getReviewStatusSync(issueId)?.prUrl;
-					const { spawnReviewRoleForIssue } = await import("./review-agent-CCum8sGe.js");
+					const { spawnReviewRoleForIssue } = await import("./review-agent-DNboMyW4.js");
 					const result = await Effect.runPromise(spawnReviewRoleForIssue({
 						issueId,
 						workspace: workspacePathRerun,
@@ -5794,7 +5983,7 @@ const postWorkspaceRequestReviewRoute = HttpRouter.add("POST", "/api/review/:iss
 					});
 				} else {
 					const workspacePath = join(resolved.projectPath, "workspaces", `feature-${issueId.toLowerCase()}`);
-					const { spawnRun } = yield* Effect.promise(() => import("./agents-DyHKlq1I.js"));
+					const { spawnRun } = yield* Effect.promise(() => import("./agents-wi9NWzs2.js"));
 					try {
 						const testRun = yield* Effect.promise(() => spawnRun(issueId, "test", { workspace: workspacePath }));
 						setReviewStatus(issueId, { testStatus: "testing" });
@@ -5890,12 +6079,8 @@ const postWorkspaceRequestReviewRoute = HttpRouter.add("POST", "/api/review/:iss
 			});
 		},
 		pushBranch: async () => {
-			const pushCommand = `git push origin ${branchName}`;
-			if (workspaceInfo.isRemote && workspaceInfo.vmName) await execAsync$2(flyExecCmd(workspaceInfo.vmName, `cd ${workspacePath} && ${pushCommand}`), { encoding: "utf-8" });
-			else await execAsync$2(pushCommand, {
-				cwd: workspacePath,
-				encoding: "utf-8"
-			});
+			if (workspaceInfo.isRemote && workspaceInfo.vmName) await execAsync$2(flyExecCmd(workspaceInfo.vmName, `cd ${workspacePath} && git push origin ${branchName}`), { encoding: "utf-8" });
+			else await pushFeatureBranches(issueId, workspacePath);
 			console.log(`[request-review] Pushed verified branch ${branchName} for ${issueId}`);
 		},
 		dispatchReview: async () => {
@@ -5904,7 +6089,7 @@ const postWorkspaceRequestReviewRoute = HttpRouter.add("POST", "/api/review/:iss
 				testStatus: "pending",
 				reviewNotes
 			});
-			const { spawnReviewRoleForIssue } = await import("./review-agent-CCum8sGe.js");
+			const { spawnReviewRoleForIssue } = await import("./review-agent-DNboMyW4.js");
 			const result = await Effect.runPromise(spawnReviewRoleForIssue({
 				issueId,
 				workspace: workspacePath,
@@ -6213,7 +6398,7 @@ const postWorkspaceResetReviewRoute = HttpRouter.add("POST", "/api/review/:issue
 	const result = processResetReviewPipeline(issueId, resetWorkspace.exists);
 	if (result.httpStatus !== 200) return jsonResponse(result.body, { status: result.httpStatus });
 	try {
-		const { resetPostMergeState } = yield* Effect.promise(() => import("./merge-agent-B-SnXOoc.js"));
+		const { resetPostMergeState } = yield* Effect.promise(() => import("./merge-agent-CKkgIBPB.js"));
 		resetPostMergeState(issueId);
 	} catch (err) {
 		console.warn(`[reset-review] resetPostMergeState best-effort failed for ${issueId}:`, err);
@@ -6222,7 +6407,7 @@ const postWorkspaceResetReviewRoute = HttpRouter.add("POST", "/api/review/:issue
 	const rerun = body?.rerun === true;
 	if (rerun) try {
 		yield* Effect.promise(async () => {
-			const { spawnReviewRoleForIssue } = await import("./review-agent-CCum8sGe.js");
+			const { spawnReviewRoleForIssue } = await import("./review-agent-DNboMyW4.js");
 			const dispatchArgs = buildReviewRedispatchArgs(issueId, resetWorkspace, workspaceInfo, resolved);
 			if (dispatchArgs) {
 				const result = await Effect.runPromise(spawnReviewRoleForIssue({
@@ -6251,7 +6436,7 @@ const postWorkspaceResetReviewRoute = HttpRouter.add("POST", "/api/review/:issue
 const postWorkspaceReviewPurgeRoute = HttpRouter.add("POST", "/api/review/:issueId/purge", httpHandler(Effect.gen(function* () {
 	const issueId = (yield* HttpRouter.params)["issueId"] ?? "";
 	if (!parseIssueIdSync(issueId)) return jsonResponse({ error: "Invalid issue ID" }, { status: 400 });
-	const { purgeReviewAgentsForIssue } = yield* Effect.promise(() => import("./review-agent-CCum8sGe.js"));
+	const { purgeReviewAgentsForIssue } = yield* Effect.promise(() => import("./review-agent-DNboMyW4.js"));
 	const projectKey = resolveProjectFromIssueSync(issueId)?.projectKey;
 	const purge = yield* Effect.promise(() => purgeReviewAgentsForIssue(projectKey, issueId));
 	const workspaceInfo = getWorkspaceInfoForIssue(issueId);
@@ -6281,8 +6466,8 @@ const postWorkspaceAbortReviewRoute = HttpRouter.add("POST", "/api/review/:issue
 		success: false,
 		error: "Workspace does not exist"
 	}, { status: 400 });
-	const { resolveProjectFromIssueSync } = yield* Effect.promise(() => import("./projects-BKkwpH6q.js"));
-	const { killAllReviewerSessions } = yield* Effect.promise(() => import("./review-agent-CCum8sGe.js"));
+	const { resolveProjectFromIssueSync } = yield* Effect.promise(() => import("./projects-vjjcmiN8.js"));
+	const { killAllReviewerSessions } = yield* Effect.promise(() => import("./review-agent-DNboMyW4.js"));
 	const { killed, failed } = yield* killAllReviewerSessions(resolveProjectFromIssueSync(issueId)?.projectKey, issueId);
 	setReviewStatus(issueId, {
 		reviewStatus: "pending",
@@ -6354,8 +6539,8 @@ const getReviewConfigRoute = HttpRouter.add("GET", "/api/review/:issueId/config"
 	const issueId = ((yield* HttpRouter.params)["issueId"] ?? "").toUpperCase();
 	if (!parseIssueIdSync(issueId)) return jsonResponse({ error: "Invalid issue ID" }, { status: 400 });
 	return jsonResponse(yield* Effect.promise(async () => {
-		const { readIssueRecordSync, resolveProjectForIssue } = await import("./record-rwK-nKv_.js");
-		const { resolveReviewMode, resolveReReviewScope } = await import("./review-agent-CCum8sGe.js");
+		const { readIssueRecordSync, resolveProjectForIssue } = await import("./record-CN0pj4_5.js");
+		const { resolveReviewMode, resolveReReviewScope } = await import("./review-agent-DNboMyW4.js");
 		const project = resolveProjectForIssue(issueId);
 		const record = project ? readIssueRecordSync(project, issueId) : null;
 		return {
@@ -6390,9 +6575,9 @@ const postReviewConfigRoute = HttpRouter.add("POST", "/api/review/:issueId/confi
 		return jsonResponse({ error: error instanceof Error ? error.message : String(error) }, { status: 400 });
 	}
 	return jsonResponse(yield* Effect.promise(async () => {
-		const { resolveProjectForIssue } = await import("./record-rwK-nKv_.js");
-		const { updateIssueRecord } = await import("./record-update-D3N6WMFR.js");
-		const { resolveReviewMode, resolveReReviewScope } = await import("./review-agent-CCum8sGe.js");
+		const { resolveProjectForIssue } = await import("./record-CN0pj4_5.js");
+		const { updateIssueRecord } = await import("./record-update-bLJxAXH4.js");
+		const { resolveReviewMode, resolveReReviewScope } = await import("./review-agent-DNboMyW4.js");
 		const record = await updateIssueRecord(resolveProjectForIssue(issueId), issueId, (current) => {
 			if (hasMode) if (body.reviewMode === null) delete current.reviewMode;
 			else current.reviewMode = body.reviewMode;
@@ -6825,7 +7010,7 @@ async function readWorkspacePlanningMarkdown(issueId, fileName) {
 */
 async function readWorkspaceContinueFile(_projectPath, workspacePath, issueId) {
 	try {
-		const { readRecordContinueViewSync, getProjectConfigFromWorkspacePath, resolveProjectForIssue } = await import("./record-rwK-nKv_.js");
+		const { readRecordContinueViewSync, getProjectConfigFromWorkspacePath, resolveProjectForIssue } = await import("./record-CN0pj4_5.js");
 		const recordView = readRecordContinueViewSync(resolveProjectForIssue(issueId) ?? getProjectConfigFromWorkspacePath(workspacePath), issueId);
 		return recordView ? JSON.stringify(recordView, null, 2) : null;
 	} catch {
@@ -7584,7 +7769,7 @@ const getWorkspaceReviewStatusRoute = HttpRouter.add("GET", "/api/review/:issueI
 	if (queuePosition === null) try {
 		const resolved = resolveProjectFromIssueSync(issueId);
 		if (resolved) {
-			const { getQueueForProject } = yield* Effect.promise(() => import("./merge-BwsyNRJV.js"));
+			const { getQueueForProject } = yield* Effect.promise(() => import("./merge-B1DiziGU.js"));
 			const mergePos = findPositionInQueueSync(issueId, getQueueForProject(resolved.projectKey).map((e) => ({
 				id: String(e.id),
 				type: "task",
@@ -7622,7 +7807,7 @@ const postWorkspaceReviewStatusRoute = HttpRouter.add("POST", "/api/review/:issu
 		const workspaceInfo = getWorkspaceInfoForIssue(issueId);
 		if (workspaceInfo.exists && workspaceInfo.localPath) {
 			const localPath = workspaceInfo.localPath;
-			const { getWorkspaceGitInfo } = yield* Effect.promise(() => import("./git-utils-CsKGnzFA.js"));
+			const { getWorkspaceGitInfo } = yield* Effect.promise(() => import("./git-utils-D0_yhCgF.js"));
 			try {
 				const gitInfo = yield* getWorkspaceGitInfo(localPath);
 				if (gitInfo.HEAD) update.reviewedAtCommit = gitInfo.HEAD;
@@ -7637,7 +7822,7 @@ const postWorkspaceReviewStatusRoute = HttpRouter.add("POST", "/api/review/:issu
 	if (verificationStatus) update.verificationStatus = verificationStatus;
 	if (readyForMerge !== void 0) update.readyForMerge = readyForMerge;
 	const status = setReviewStatus(issueId, update);
-	const { getTmuxSessionName } = yield* Effect.promise(() => import("./specialists-Dqe6_HE5.js"));
+	const { getTmuxSessionName } = yield* Effect.promise(() => import("./specialists-DM6bWjsi.js"));
 	const projectKey = resolveProjectFromIssueSync(issueId)?.projectKey;
 	if (reviewStatus && [
 		"passed",
@@ -7655,7 +7840,7 @@ const postWorkspaceReviewStatusRoute = HttpRouter.add("POST", "/api/review/:issu
 			const agentId = `agent-${issueId.toLowerCase()}`;
 			const feedbackBody = `CODE REVIEW ${reviewStatus.toUpperCase()} for ${issueId}:\n\n${reviewNotes}\n\n## REQUIRED: Fix ALL issues above, then invoke the /rebase-and-submit skill\n\n1. Read each blocking issue carefully\n2. Fix the code for EVERY issue listed\n3. Run tests locally to verify your fixes\n4. Commit every change\n5. Invoke the /rebase-and-submit skill for ${issueId} — this is an atomic task that runs pan done (which handles rebase + push + re-submit internally)\n\nDo NOT stop between steps. Do NOT run git push manually — the skill handles it. Do NOT stop until pan done has completed successfully.`;
 			try {
-				const { writeFeedbackFile } = yield* Effect.promise(() => import("./feedback-writer-Bx5z11mF.js"));
+				const { writeFeedbackFile } = yield* Effect.promise(() => import("./feedback-writer-D3a22RCd.js"));
 				const wsInfo = getWorkspaceInfoForIssue(issueId);
 				const fileResult = yield* Effect.promise(() => writeFeedbackFile({
 					issueId,
@@ -7719,7 +7904,7 @@ const postWorkspaceReviewStatusRoute = HttpRouter.add("POST", "/api/review/:issu
 			const agentId = `agent-${issueId.toLowerCase()}`;
 			const feedbackBody = `TESTS FAILED for ${issueId}:\n\n${testNotes}\n\n## REQUIRED: Fix ALL test failures, then invoke the /rebase-and-submit skill\n\n1. Read each test failure carefully\n2. Fix the code causing EVERY failure\n3. Run the test suite locally to verify your fixes pass\n4. Commit every change\n5. Invoke the /rebase-and-submit skill for ${issueId} — this is an atomic task that runs pan done (which handles rebase + push + re-submit internally)\n\nDo NOT stop between steps. Do NOT run git push manually — the skill handles it. Do NOT stop until pan done has completed successfully.`;
 			try {
-				const { writeFeedbackFile } = yield* Effect.promise(() => import("./feedback-writer-Bx5z11mF.js"));
+				const { writeFeedbackFile } = yield* Effect.promise(() => import("./feedback-writer-D3a22RCd.js"));
 				const wsInfo = getWorkspaceInfoForIssue(issueId);
 				const fileResult = yield* Effect.promise(() => writeFeedbackFile({
 					issueId,
@@ -7752,14 +7937,14 @@ const postWorkspaceReviewStatusRoute = HttpRouter.add("POST", "/api/review/:issu
 			});
 			yield* Effect.promise(async () => {
 				try {
-					const { resolveProjectFromIssueSync, getProjectSync } = await import("./projects-BKkwpH6q.js");
+					const { resolveProjectFromIssueSync, getProjectSync } = await import("./projects-vjjcmiN8.js");
 					const project = resolveProjectFromIssueSync(issueId);
 					const repo = (project ? getProjectSync(project.projectKey) : null)?.github_repo;
 					if (!repo || !repo.includes("/")) return;
 					const [owner, name] = repo.split("/");
 					const wsInfo = getWorkspaceInfoForIssue(issueId);
 					if (!wsInfo?.localPath) return;
-					const { postOverdeckTestsStatus } = await import("./github-app-CU14oYzP.js");
+					const { postOverdeckTestsStatus } = await import("./github-app-ClZ2lk8D.js");
 					await postOverdeckTestsStatus(wsInfo.localPath, owner, name, "success", "Test specialist passed");
 				} catch (err) {
 					console.warn(`[review-status] Failed to post overdeck/tests for ${issueId}: ${err.message}`);
@@ -7801,7 +7986,7 @@ const postWorkspaceRefreshTokenRoute = HttpRouter.add("POST", "/api/workspaces/:
 	if (!parseIssueIdSync(issueId)) return jsonResponse({ error: "Invalid issue ID" }, { status: 400 });
 	const issueLower = issueId.toLowerCase();
 	const workspacePath = join(getProjectPath(void 0, extractPrefixSync(issueId) ?? issueId.split("-")[0]), "workspaces", `feature-${issueLower}`);
-	const { refreshWorkspaceToken, isGitHubAppConfigured } = yield* Effect.promise(() => import("./github-app-CU14oYzP.js"));
+	const { refreshWorkspaceToken, isGitHubAppConfigured } = yield* Effect.promise(() => import("./github-app-ClZ2lk8D.js"));
 	if (!isGitHubAppConfigured()) return jsonResponse({
 		success: false,
 		error: "GitHub App not configured"
@@ -7814,6 +7999,6 @@ const postWorkspaceRefreshTokenRoute = HttpRouter.add("POST", "/api/workspaces/:
 })));
 const workspacesRouteLayer = Layer.mergeAll(workspaceDataRouteLayer, postWorkspaceRebuildRoute, postWorkspaceRebuildAndStartRoute, uatStackActionRouteLayer, getWorkspaceStateMdRoute, getWorkspaceInferenceMdRoute, stashCleanRouteLayer, containerOpsRouteLayer, postWorkspaceStartRoute, getWorkspaceReviewStatusRoute, postWorkspaceReviewStatusRoute, reviewPipelineRouteLayer, reviewControlRouteLayer, mergeOpsRouteLayer, postWorkspaceRefreshTokenRoute);
 //#endregion
-export { getWorkspacePathForIssue as C, resolveIssueHeadlineCost as S, getCostsForIssueSync as _, pushApproveMain as a, processPendingFeedbackDeliveries as b, triggerMerge as c, resumeQueuedMerges as d, syncWalFromAllProjects as f, migrateAllSessionsSync as g, reclassifyUnknownCostEventsSync as h, mergeOpsRouteLayer as i, internalEventsRouteLayer as l, reconcilePiTranscripts as m, buildRichPRBody as n, reconcileGitHubMergeStatus as o, reconcile as p, isBranchAlreadyRebased as r, shouldBlockApproveForDirtyStatus as s, workspacesRouteLayer as t, eventsRouteLayer as u, rebuildCacheSync as v, getCachedRunningAgents as x, syncCacheSync as y };
+export { getWorkspacePathForIssue as C, stopAgentOutputService as E, resolveIssueHeadlineCost as S, startAgentOutputService as T, getCostsForIssueSync as _, pushApproveMain as a, processPendingFeedbackDeliveries as b, triggerMerge as c, resumeQueuedMerges as d, syncWalFromAllProjects as f, migrateAllSessionsSync as g, reclassifyUnknownCostEventsSync as h, mergeOpsRouteLayer as i, internalEventsRouteLayer as l, reconcilePiTranscripts as m, buildRichPRBody as n, reconcileGitHubMergeStatus as o, reconcile as p, isBranchAlreadyRebased as r, shouldBlockApproveForDirtyStatus as s, workspacesRouteLayer as t, eventsRouteLayer as u, rebuildCacheSync as v, retainAgentOutputInterest as w, getCachedRunningAgents as x, syncCacheSync as y };
 
-//# sourceMappingURL=workspaces-CFPcL0vl.js.map
+//# sourceMappingURL=workspaces-Do_9J0LQ.js.map