fix(orchestrator): prevent per-unit MR creation in discrete mode (#232)

* fix(orchestrator): prevent per-unit MR creation in discrete mode

Three interacting bugs caused agents to open one MR per unit instead of
one per stage:

1. mergeUnitWorktree left stale unit branches on remote after local
   merge — agents saw them and opened redundant MRs
2. external_review_requested gave no branching guidance — agents had
   to guess which branch to MR and guessed wrong
3. Discrete mode forced ALL gates to external, overriding review:auto
   stages the studio author explicitly trusted to auto-advance

Fixes: clean up remote unit branches after merge, tell the agent
exactly which branch to MR (stage→main, ONE MR), and let discrete
mode affect branching strategy without overriding review semantics.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* style: fix biome formatting on template literal

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* fix(orchestrator): VCS-aware instructions and final delivery PR/MR

Agent-facing instructions now respect the storage provider:

- intent_complete: in git mode, instructs agent to open ONE MR from
  haiku/{slug}/main to project mainline for final delivery; in
  filesystem mode, just reports completion
- external_review_requested: branch-specific MR instructions gated
  behind isGitRepo(), with neutral fallback for filesystem mode
- Review subagents: git diff step gated behind isGitRepo(), uses
  getMainlineBranch() instead of hardcoded "main"
- start_units announcement: "worktree" language only in git mode
- Subagent commit instructions: explicit isGitRepo() guard
- awaiting_external_review: removed git implementation details
- Tool descriptions (haiku_review, haiku_repair): VCS-neutral
- external_review_url schema: removed "PR, MR" framing

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* fix(orchestrator): remove stale comment about non-discrete mode

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: jwaldrip

packages/haiku/src/git-worktree.ts

@@ -724,6 +724,7 @@ export function mergeUnitWorktree(
 
 		tryRun(["git", "worktree", "remove", worktreePath, "--force"])
 		tryRun(["git", "branch", "-d", unitBranch])
+		tryRun(["git", "push", "origin", "--delete", unitBranch])
 
 		if (pushFailed) {
 			return {

packages/haiku/src/orchestrator.ts

@@ -27,6 +27,7 @@ import {
 	createIntentBranch,
 	createStageBranch,
 	createUnitWorktree,
+	getMainlineBranch,
 	isBranchMerged,
 	isOnIntentBranch,
 	isOnStageBranch,
@@ -1441,7 +1442,7 @@ export function runNext(slug: string): OrchestratorAction {
 
 		// All units valid — either auto-advance or open review gate before execution.
 		//
-		// For stages with review: auto (and non-discrete mode), skip the gate
+		// For stages with review: auto, skip the gate
 		// entirely and advance directly to execution. This is critical for
 		// autonomous workflows where the user should not be interrupted.
 		//
@@ -1452,11 +1453,11 @@ export function runNext(slug: string): OrchestratorAction {
 		// with intent_review context until intent_reviewed is set to true.
 		const intentReviewed = (intent.intent_reviewed as boolean) || false
 		const isIntentReview = currentStage === studioStages[0] && !intentReviewed
-		const intentMode = (intent.mode as string) || "continuous"
 		const stageReviewType = resolveStageReview(studio, currentStage)
 
-		// Auto gates: skip review UI and advance directly to execution
-		if (stageReviewType === "auto" && intentMode !== "discrete") {
+		// Auto gates: skip review UI and advance directly to execution.
+		// Discrete mode affects branching strategy, not review type semantics.
+		if (stageReviewType === "auto") {
 			if (isIntentReview) {
 				setFrontmatterField(intentFile, "intent_reviewed", true)
 				gitCommitState(`haiku: intent ${slug} auto-approved`)
@@ -1696,17 +1697,13 @@ export function runNext(slug: string): OrchestratorAction {
 		const nextStage =
 			stageIdx < studioStages.length - 1 ? studioStages[stageIdx + 1] : null
 
-		// Use the intent's declared mode (not effective branch mode) to determine gate UI.
-		// A continuous intent with PR-isolated external-review stages should still show
-		// the stage's full gate options, not be forced to external-only.
-		const intentMode = (intent.mode as string) || "continuous"
 		const gitAvailable = isGitRepo()
 
 		// Auto gates: advance without user interaction.
 		// "auto" review type means the studio author trusts the FSM to advance
-		// without human approval. In continuous/hybrid mode, skip the gate UI
-		// entirely. Discrete mode always uses external review (PR per stage).
-		if (reviewType === "auto" && intentMode !== "discrete") {
+		// without human approval. Skip the gate UI entirely regardless of mode —
+		// discrete mode affects branching strategy, not review type semantics.
+		if (reviewType === "auto") {
 			emitTelemetry("haiku.gate.auto_advanced", {
 				intent: slug,
 				stage: currentStage,
@@ -1745,9 +1742,6 @@ export function runNext(slug: string): OrchestratorAction {
 				.filter((t) => t !== "external")
 				.join(",")
 			effectiveGateType = remaining || "ask"
-		} else if (intentMode === "discrete") {
-			// Pure discrete intent: always submit for external review (PR per stage)
-			effectiveGateType = "external"
 		} else if (reviewType === "ask") {
 			effectiveGateType = "ask"
 		} else if (reviewType === "await") {
@@ -2366,8 +2360,9 @@ function enrichActionWithPreview(action: OrchestratorAction): void {
 		case "start_units": {
 			const units = (action.units as string[]) || []
 			tell_user = `Starting ${units.length} units in parallel: ${units.join(", ")}.`
-			next_step =
-				"Each unit runs in its own worktree. After all complete, the next wave starts or we advance to review."
+			next_step = isGitRepo()
+				? "Each unit runs in its own worktree. After all complete, the next wave starts or we advance to review."
+				: "After all units complete, the next wave starts or we advance to review."
 			break
 		}
 
@@ -3210,9 +3205,11 @@ function buildRunInstructions(
 					)
 					if (wt) {
 						unitInstrLines.push(`${unitStep++}. Work in worktree: \`${wt}\``)
-						unitInstrLines.push(
-							`${unitStep++}. Commit frequently: \`git add -A && git commit -m "..."\`. Do NOT push.`,
-						)
+						if (isGitRepo()) {
+							unitInstrLines.push(
+								`${unitStep++}. Commit frequently: \`git add -A && git commit -m "..."\`. Do NOT push.`,
+							)
+						}
 					}
 					unitInstrLines.push(
 						`${unitStep++}. Call \`haiku_unit_advance_hat { intent: "${slug}", unit: "${unitName}" }\` when done`,
@@ -3293,7 +3290,7 @@ function buildRunInstructions(
 				)
 				for (const [name, content] of Object.entries(agents)) {
 					sections.push(
-						`#### Subagent: \`${name}\`\n\n<subagent tool="Task">\n## Adversarial Review: ${name}\n\nYou are the "${name}" review agent for stage "${stage}" of intent "${slug}".\n\n## Your Mandate\n\n${content}\n\n## Instructions\n\n1. Run \`git diff main...HEAD\` to get the current diff\n2. Read the stage's output artifacts in \`.haiku/intents/${slug}/stages/${stage}/\`\n3. Review through your mandate's lens\n4. Report findings as: severity (HIGH/MEDIUM/LOW), file, line, description\n5. HIGH findings MUST be fixed before the stage can advance\n</subagent>\n`,
+						`#### Subagent: \`${name}\`\n\n<subagent tool="Task">\n## Adversarial Review: ${name}\n\nYou are the "${name}" review agent for stage "${stage}" of intent "${slug}".\n\n## Your Mandate\n\n${content}\n\n## Instructions\n\n${isGitRepo() ? `1. Run \`git diff ${getMainlineBranch()}...HEAD\` to get the current diff\n2. Read the stage's output artifacts in \`.haiku/intents/${slug}/stages/${stage}/\`\n3. Review through your mandate's lens\n4. Report findings as: severity (HIGH/MEDIUM/LOW), file, line, description\n5. HIGH findings MUST be fixed before the stage can advance` : `1. Read the stage's output artifacts in \`.haiku/intents/${slug}/stages/${stage}/\`\n2. Review through your mandate's lens\n3. Report findings as: severity (HIGH/MEDIUM/LOW), file, line, description\n4. HIGH findings MUST be fixed before the stage can advance`}\n</subagent>\n`,
 					)
 				}
 			}
@@ -3324,9 +3321,16 @@ function buildRunInstructions(
 		}
 
 		case "intent_complete": {
-			sections.push(
-				`## Intent Complete\n\nAll stages are done for intent "${slug}". The orchestrator has marked it as completed.\n\n### Instructions\n\nReport completion summary. Suggest /haiku:gate-review then PR creation.`,
-			)
+			if (isGitRepo()) {
+				const mainline = getMainlineBranch()
+				sections.push(
+					`## Intent Complete\n\nAll stages are done for intent "${slug}". The orchestrator has marked it as completed.\n\n### Instructions\n\n1. Report completion summary to the user\n2. Open ONE merge request from branch \`haiku/${slug}/main\` to \`${mainline}\` for final delivery\n3. Include the H·AI·K·U browse link in the description so reviewers can see the intent, units, and knowledge artifacts\n4. Record the review URL via \`haiku_run_next { intent: "${slug}", external_review_url: "<url>" }\``,
+				)
+			} else {
+				sections.push(
+					`## Intent Complete\n\nAll stages are done for intent "${slug}". The orchestrator has marked it as completed.\n\n### Instructions\n\nReport completion summary to the user.`,
+				)
+			}
 			break
 		}
 
@@ -3413,7 +3417,7 @@ function buildRunInstructions(
 					externalUrl
 						? `The stage is awaiting external review at: ${externalUrl}`
 						: "The stage is awaiting external review but no review URL has been recorded."
-				}\n\nThe orchestrator checks for approval automatically (branch merge detection + URL-based CLI probing). Neither detected approval yet.\n\nInform the user that the stage is waiting on external review. After the review is approved, run \`/haiku:pickup\` to continue.`,
+				}\n\nThe orchestrator checks for approval automatically. Neither detected approval yet.\n\nInform the user that the stage is waiting on external review. After the review is approved, run \`/haiku:pickup\` to continue.`,
 			)
 			break
 		}
@@ -3553,8 +3557,7 @@ export const orchestratorToolDefs = [
 				intent: { type: "string", description: "Intent slug" },
 				external_review_url: {
 					type: "string",
-					description:
-						"URL where stage was submitted for external review (PR, MR, etc.)",
+					description: "URL where stage was submitted for external review",
 				},
 			},
 			required: ["intent"],
@@ -3940,8 +3943,9 @@ export async function handleOrchestratorTool(
 						intent: slug,
 						stage,
 						feedback: reviewResult.feedback,
-						message:
-							"External review requested. Submit the work for review through your project's review process (PR, MR, review board, etc.). Include the H·AI·K·U browse link in the description so reviewers can see the intent, units, and knowledge artifacts. Record the review URL via haiku_run_next { intent, external_review_url }. Run /haiku:pickup again after approval.",
+						message: isGitRepo()
+							? `External review requested. Open ONE merge request from branch 'haiku/${slug}/${stage}' to 'haiku/${slug}/main'. Do NOT open separate MRs for individual units — all unit work is already merged into the stage branch. Include the H·AI·K·U browse link in the description so reviewers can see the intent, units, and knowledge artifacts. Record the review URL via haiku_run_next { intent, external_review_url }. Run /haiku:pickup again after approval.`
+							: `External review requested. Submit the work for review through your project's review process. Record the review URL via haiku_run_next { intent, external_review_url }. Run /haiku:pickup again after approval.`,
 					}
 					return text(withInstructions(gateResult))
 				}

packages/haiku/src/state-tools.ts

@@ -2284,7 +2284,7 @@ export const stateToolDefs = [
 	{
 		name: "haiku_review",
 		description:
-			"Runs a git diff against main/upstream and returns formatted pre-delivery code review instructions with diff, stats, review guidelines, and review-agent config.",
+			"Returns formatted pre-delivery code review instructions with diff, stats, review guidelines, and review-agent config.",
 		inputSchema: {
 			type: "object" as const,
 			properties: {
@@ -2344,7 +2344,7 @@ export const stateToolDefs = [
 	{
 		name: "haiku_repair",
 		description:
-			"Scan intents for metadata issues and auto-apply safe fixes. In a git repo, the default behavior is to scan ALL `haiku/<slug>/main` intent branches sequentially via temporary worktrees, auto-apply safe fixes (overlong title trim, legacy field renames, missing defaults, studio alias migration), commit and push the fixes to each branch, and open a PR/MR back to mainline if the branch was already merged. Pass `intent` to repair a single intent in the current working directory only. Pass `skip_branches: true` to force cwd-only mode in a git repo. Pass `apply: false` to scan without applying fixes.",
+			"Scan intents for metadata issues and auto-apply safe fixes. In a git repo, scans all intent branches sequentially, auto-applies safe fixes, syncs changes, and opens PRs/MRs for already-merged branches. In filesystem mode, scans intents in the current working directory. Pass `intent` to repair a single intent only. Pass `skip_branches: true` to force cwd-only mode in a git repo. Pass `apply: false` to scan without applying fixes.",
 		inputSchema: {
 			type: "object" as const,
 			properties: {