taskplane 0.5.9 → 0.5.10

package/extensions/taskplane/extension.ts

@@ -1185,6 +1185,10 @@ export default function (pi: ExtensionAPI) {
 			const repoMessages: string[] = [];
 
 			for (const repo of reposToIntegrate) {
+				// Count commits BEFORE integration (after ff, HEAD === orch tip so count would be 0)
+				const preCountResult = runGit(["rev-list", "--count", `HEAD..${resolvedOrchBranch}`], repo.root);
+				const repoCommitsBefore = preCountResult.ok ? parseInt(preCountResult.stdout) || 0 : 0;
+
 				const integrationResult = executeIntegration(parsed.mode, resolution as IntegrationContext, {
 					runGit: (gitArgs: string[]) => runGit(gitArgs, repo.root),
 					runCommand: (cmd: string, cmdArgs: string[]) => {
@@ -1214,10 +1218,7 @@ export default function (pi: ExtensionAPI) {
 					break;
 				}
 
-				// Count commits for this repo
-				const countResult = runGit(["rev-list", "--count", `HEAD...${resolvedOrchBranch}`], repo.root);
-				const repoCommits = countResult.ok ? parseInt(countResult.stdout) || 0 : 0;
-				totalCommits += repoCommits;
+				totalCommits += repoCommitsBefore;
 				repoMessages.push(`  ${repo.id}: ${integrationResult.message}`);
 			}
 

package/extensions/taskplane/merge.ts

@@ -787,12 +787,10 @@ 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 the repo's working tree — remove the artifacts from develop's working tree
-					// so they don't cause conflicts on /orch-integrate
-					for (const file of artifactFiles) {
-						spawnSync("git", ["checkout", "--", file], { cwd: repoRoot });
-					}
-					// Also remove any untracked .DONE files
+					// 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);

package/package.json

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