taskplane 0.14.0 → 0.14.1

package/dashboard/public/app.js

@@ -627,8 +627,23 @@ function renderMergeAgents(batch, tmuxSessions) {
   const showRepos = knownRepos.length >= 2;
   const telemetry = currentData?.telemetry || {};
 
-  // Check for active merge sessions (convention: orch-merge-*)
-  const mergeSessions = (tmuxSessions || []).filter(s => s.startsWith("orch-merge"));
+  // Check for active merge sessions (convention: {prefix}-{opId}-merge-{N})
+  const mergeSessions = (tmuxSessions || []).filter(s => s.includes("-merge-"));
+
+  // Derive merge session name from lane session naming pattern.
+  // Lane sessions: "{prefix}-{opId}-lane-{N}", merge sessions: "{prefix}-{opId}-merge-{N}".
+  // Extract the prefix-opId part from the first lane and use it to construct merge names.
+  const lanes = batch?.lanes || [];
+  let mergePrefix = "orch-merge"; // fallback for legacy/unknown patterns
+  if (lanes.length > 0 && lanes[0].tmuxSessionName) {
+    const laneName = lanes[0].tmuxSessionName;
+    const laneMatch = laneName.match(/^(.+)-lane-\d+$/);
+    if (laneMatch) {
+      mergePrefix = laneMatch[1] + "-merge";
+    }
+  }
+  // Helper: get merge session name for a lane number
+  const getMergeSessionName = (laneNum) => `${mergePrefix}-${laneNum}`;
 
   if (mergeResults.length === 0 && mergeSessions.length === 0) {
     $mergeBody.innerHTML = '<div class="empty-state">No merge agents active</div>';
@@ -639,6 +654,9 @@ function renderMergeAgents(batch, tmuxSessions) {
   html += '<th>Wave</th><th>Status</th><th>Session</th><th>Telemetry</th><th>Attach</th><th>Details</th>';
   html += '</tr></thead><tbody>';
 
+  // Track sessions shown in wave result rows so we don't duplicate them below
+  const shownSessions = new Set();
+
   // Show merge results
   for (const mr of mergeResults) {
     // Repo filtering: if a repo is selected and this merge has repoResults,
@@ -653,12 +671,19 @@ function renderMergeAgents(batch, tmuxSessions) {
       : mr.status === "partial" ? "status-stalled"
       : "status-failed";
 
-    // Look for matching tmux session
-    const sessionName = `orch-merge-w${mr.waveIndex + 1}`;
-    const alive = tmuxSet.has(sessionName);
-
-    // Look for merge telemetry data
-    const mergeTel = telemetry[sessionName] || telemetry[`orch-merge-${mr.waveIndex + 1}`] || null;
+    // Look for matching tmux merge sessions for this wave result.
+    // Merge sessions follow the naming pattern: {prefix}-{opId}-merge-{laneNumber}
+    // (e.g., "orch-henrylach-merge-1"). Find any alive merge sessions.
+    const waveMergeSessions = mergeSessions.filter(s => tmuxSet.has(s));
+    const sessionName = waveMergeSessions.length > 0 ? waveMergeSessions[0] : null;
+    const alive = sessionName !== null;
+    if (alive) shownSessions.add(sessionName);
+
+    // Look for merge telemetry data — check all merge sessions
+    let mergeTel = null;
+    for (const ms of mergeSessions) {
+      if (telemetry[ms]) { mergeTel = telemetry[ms]; break; }
+    }
 
     html += `<tr>`;
     html += `<td style="font-family:var(--font-mono);">Wave ${mr.waveIndex + 1}</td>`;
@@ -718,8 +743,7 @@ function renderMergeAgents(batch, tmuxSessions) {
 
   // Show active merge sessions not yet in results
   for (const sess of mergeSessions) {
-    const alreadyShown = mergeResults.some((mr) => `orch-merge-w${mr.waveIndex + 1}` === sess);
-    if (alreadyShown) continue;
+    if (shownSessions.has(sess)) continue;
 
     const sessTel = telemetry[sess] || null;
     const cmd = `tmux attach -t ${sess}`;

package/extensions/taskplane/formatting.ts

@@ -436,6 +436,7 @@ export function buildDashboardViewModel(
 	return {
 		phase: batchState.phase,
 		batchId: batchState.batchId,
+		orchBranch: batchState.orchBranch || batchState.baseBranch || "",
 		waveProgress,
 		elapsed,
 		summary,
@@ -684,7 +685,7 @@ export function createOrchWidget(
 				} else if (vm.phase === "merging") {
 					lines.push("");
 					lines.push(truncateToWidth(
-						theme.fg("accent", "  🔀 Merging lane branches into develop..."),
+						theme.fg("accent", `  🔀 Merging lane branches into ${vm.orchBranch || "orch branch"}...`),
 						width,
 					));
 				} else if (vm.phase === "paused") {

package/extensions/taskplane/types.ts

@@ -1957,6 +1957,7 @@ export interface OrchLaneCardData {
 export interface OrchDashboardViewModel {
 	phase: OrchBatchPhase;
 	batchId: string;
+	orchBranch: string; // e.g., "orch/henry-20260318T140000" — merge target branch
 	waveProgress: string; // e.g., "2/3"
 	elapsed: string; // e.g., "2m 14s"
 	summary: OrchSummaryCounts;

package/package.json

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