taskplane 0.5.10 → 0.5.12

package/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,

package/extensions/taskplane/merge.ts

@@ -767,7 +767,10 @@ export function mergeWave(
 			const lines = statusResult.stdout.split("\n").filter((l: string) => l.trim());
 			const artifactFiles = lines
 				.map((l: string) => l.slice(3).trim())
-				.filter((f: string) => f.endsWith(".DONE") || f.endsWith("STATUS.md"));
+				.filter((f: string) =>
+					(f.endsWith(".DONE") || f.endsWith("STATUS.md")) &&
+					!f.includes(".worktrees/"),  // Never stage worktree internals
+				);
 
 			if (artifactFiles.length > 0) {
 				let staged = 0;
@@ -787,16 +790,11 @@ export function mergeWave(
 					spawnSync("git", ["commit", "-m", `checkpoint: wave ${waveIndex} task artifacts (.DONE, STATUS.md)`], { cwd: mergeWorkDir });
 					execLog("merge", `W${waveIndex}`, `committed ${staged} task artifact(s) to merge worktree`);
 
-					// Restore .DONE files only — these are untracked and would cause
-					// "dirty working tree" issues on /orch-integrate.
-					// Keep STATUS.md modifications in develop's working tree so the
-					// dashboard can read current progress from the canonical path.
-					for (const file of artifactFiles) {
-						if (file.endsWith(".DONE")) {
-							const srcPath = join(repoRoot, file);
-							try { if (existsSync(srcPath)) unlinkSync(srcPath); } catch { /* best effort */ }
-						}
-					}
+					// Keep both .DONE and STATUS.md in develop's working tree:
+					// - STATUS.md: dashboard reads current progress from canonical path
+					// - .DONE: harmless untracked files, cleaned up by /orch-integrate stash
+					// Previous approach of deleting .DONE caused them to be missing
+					// after ff integration (git couldn't reliably restore them).
 				}
 			}
 		}

package/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");
 	},

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "taskplane",
-  "version": "0.5.10",
+  "version": "0.5.12",
   "description": "AI agent orchestration for pi — parallel task execution with checkpoint discipline",
   "keywords": [
     "pi-package",