fix: auto-stash during /orch-integrate + clearer completion message (#89)

* fix: clearer batch completion message with integration guidance

Simplified to two options (apply now vs PR for review). Removed --merge
from default message (shown in error fallback if ff fails). Added
'Your branch was not modified' to reassure users.

* fix: auto-stash dirty working tree during /orch-integrate + clearer completion message

Three changes:
1. /orch-integrate stashes dirty working tree before ff/merge and pops
   after. Workspace mode leaves STATUS.md modifications in the working
   tree for dashboard visibility — these blocked ff with 'local changes
   would be overwritten'.
2. Batch completion message simplified to two options (apply now vs PR).
   Removed --merge from default display (shown in ff error fallback).
   Added 'Your branch was not modified' reassurance.
3. Updated tests for new stash-check git call ordering.

Author: HenryLach

extensions/taskplane/extension.ts

@@ -327,8 +327,24 @@ export function executeIntegration(
 	const { orchBranch, currentBranch, batchId } = context;
 
 	if (mode === "ff") {
-		// Fast-forward merge
+		// Fast-forward merge.
+		// Stash any dirty working tree files first — workspace mode leaves
+		// STATUS.md modifications in the working tree for dashboard visibility.
+		// These would block ff if the orch branch has different versions.
+		let stashed = false;
+		const statusCheck = deps.runGit(["status", "--porcelain"]);
+		if (statusCheck.ok && statusCheck.stdout.trim()) {
+			deps.runGit(["stash", "push", "--include-untracked", "-m", `orch-integrate-autostash-${batchId}`]);
+			stashed = true;
+		}
+
 		const result = deps.runGit(["merge", "--ff-only", orchBranch]);
+
+		// Always pop stash if we stashed, regardless of ff result
+		if (stashed) {
+			deps.runGit(["stash", "pop"]);
+		}
+
 		if (!result.ok) {
 			return {
 				success: false,
@@ -359,7 +375,20 @@ export function executeIntegration(
 	}
 
 	if (mode === "merge") {
+		// Stash dirty working tree (same as ff mode — workspace STATUS.md artifacts)
+		let mergeStashed = false;
+		const mergeStatusCheck = deps.runGit(["status", "--porcelain"]);
+		if (mergeStatusCheck.ok && mergeStatusCheck.stdout.trim()) {
+			deps.runGit(["stash", "push", "--include-untracked", "-m", `orch-integrate-autostash-${batchId}`]);
+			mergeStashed = true;
+		}
+
 		const result = deps.runGit(["merge", orchBranch, "--no-edit"]);
+		// Pop stash regardless of merge result
+		if (mergeStashed) {
+			deps.runGit(["stash", "pop"]);
+		}
+
 		if (!result.ok) {
 			return {
 				success: false,

extensions/taskplane/messages.ts

@@ -50,14 +50,15 @@ export const ORCH_MESSAGES = {
 		}
 		if (orchBranch && succeeded > 0) {
 			lines.push("");
-			lines.push(`   ℹ Orch branch: ${orchBranch}`);
+			lines.push(`   ℹ All work is on orch branch: ${orchBranch}`);
+			lines.push(`   Your ${baseBranch || "working"} branch was not modified.`);
 			if (baseBranch) {
-				lines.push(`   Review changes: git log ${baseBranch}..${orchBranch}`);
+				lines.push(`   Preview: git log ${baseBranch}..${orchBranch}`);
 			}
-			lines.push("   Next steps:");
-			lines.push("   • /orch-integrate          — fast-forward into your branch");
-			lines.push("   • /orch-integrate --merge   — merge (if branches diverged)");
-			lines.push("   • /orch-integrate --pr      — push and open a PR");
+			lines.push("");
+			lines.push("   To apply the changes:");
+			lines.push("   • /orch-integrate           Apply now (fast-forward, recommended)");
+			lines.push("   • /orch-integrate --pr      Push orch branch & open a PR for team review");
 		}
 		return lines.join("\n");
 	},

extensions/tests/orch-integrate.test.ts

@@ -675,7 +675,10 @@ describe("executeIntegration — fast-forward mode", () => {
 			},
 		});
 		executeIntegration("ff", makeContext(), deps);
-		expect(gitCalls[0]).toEqual(["merge", "--ff-only", "orch/henry-20260318T140000"]);
+		// First call is status --porcelain (stash check), then merge
+		expect(gitCalls[0]).toEqual(["status", "--porcelain"]);
+		const mergeCall = gitCalls.find(c => c[0] === "merge");
+		expect(mergeCall).toEqual(["merge", "--ff-only", "orch/henry-20260318T140000"]);
 	});
 
 	it("returns error when ff fails (diverged branches)", () => {
@@ -736,7 +739,10 @@ describe("executeIntegration — merge mode", () => {
 			},
 		});
 		executeIntegration("merge", makeContext(), deps);
-		expect(gitCalls[0]).toEqual(["merge", "orch/henry-20260318T140000", "--no-edit"]);
+		// First call is status --porcelain (stash check), then merge
+		expect(gitCalls[0]).toEqual(["status", "--porcelain"]);
+		const mergeCall = gitCalls.find(c => c[0] === "merge");
+		expect(mergeCall).toEqual(["merge", "orch/henry-20260318T140000", "--no-edit"]);
 	});
 
 	it("returns error when merge fails (conflict)", () => {