taskplane 0.7.2 → 0.8.1

package/dashboard/public/app.js

@@ -17,9 +17,11 @@ function formatDuration(ms) {
   return `${m}m ${String(s).padStart(2, "0")}s`;
 }
 
-function relativeTime(epochMs) {
-  if (!epochMs) return "";
-  const diff = Date.now() - epochMs;
+function relativeTime(epochOrIso) {
+  if (!epochOrIso) return "";
+  const ts = typeof epochOrIso === "string" ? new Date(epochOrIso).getTime() : epochOrIso;
+  if (isNaN(ts)) return "";
+  const diff = Date.now() - ts;
   if (diff < 60000) return `${Math.floor(diff / 1000)}s ago`;
   if (diff < 3600000) return `${Math.floor(diff / 60000)}m ago`;
   return `${Math.floor(diff / 3600000)}h ago`;
@@ -587,6 +589,7 @@ function renderMergeAgents(batch, tmuxSessions) {
   const mergeResults = batch?.mergeResults || [];
   const tmuxSet = new Set(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"));
@@ -597,7 +600,7 @@ function renderMergeAgents(batch, tmuxSessions) {
   }
 
   let html = '<table class="merge-table"><thead><tr>';
-  html += '<th>Wave</th><th>Status</th><th>Session</th><th>Attach</th><th>Details</th>';
+  html += '<th>Wave</th><th>Status</th><th>Session</th><th>Telemetry</th><th>Attach</th><th>Details</th>';
   html += '</tr></thead><tbody>';
 
   // Show merge results
@@ -618,10 +621,29 @@ function renderMergeAgents(batch, tmuxSessions) {
     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;
+
     html += `<tr>`;
     html += `<td style="font-family:var(--font-mono);">Wave ${mr.waveIndex + 1}</td>`;
     html += `<td><span class="status-badge ${statusCls}">${mr.status}</span></td>`;
     html += `<td style="font-family:var(--font-mono);font-size:0.8rem;">${alive ? escapeHtml(sessionName) : "—"}</td>`;
+    // Telemetry cell
+    html += `<td style="font-size:0.75rem;">`;
+    if (mergeTel) {
+      const totalTok = (mergeTel.inputTokens || 0) + (mergeTel.outputTokens || 0);
+      const cost = mergeTel.cost || 0;
+      if (totalTok > 0 || cost > 0) {
+        html += `<span style="color:var(--text-muted);">${totalTok > 0 ? totalTok.toLocaleString() + " tok" : ""}`;
+        if (cost > 0) html += ` · $${cost.toFixed(4)}`;
+        html += `</span>`;
+      } else {
+        html += '<span style="color:var(--text-faint);">—</span>';
+      }
+    } else {
+      html += '<span style="color:var(--text-faint);">—</span>';
+    }
+    html += `</td>`;
     html += `<td>`;
     if (alive) {
       const cmd = `tmux attach -t ${sessionName}`;
@@ -650,7 +672,8 @@ function renderMergeAgents(batch, tmuxSessions) {
         html += `<td>${repoBadgeHtml(rr.repoId)}</td>`;
         html += `<td><span class="status-badge ${rrStatusCls}">${rr.status}</span></td>`;
         html += `<td style="font-family:var(--font-mono);font-size:0.75rem;color:var(--text-faint);">${rrLanes}</td>`;
-        html += `<td></td>`;
+        html += `<td></td>`; /* telemetry placeholder */
+        html += `<td></td>`; /* attach placeholder */
         html += `<td style="font-size:0.75rem;color:var(--text-faint);">${rrDetail}</td>`;
         html += `</tr>`;
       }
@@ -662,11 +685,28 @@ function renderMergeAgents(batch, tmuxSessions) {
     const alreadyShown = mergeResults.some((mr) => `orch-merge-w${mr.waveIndex + 1}` === sess);
     if (alreadyShown) continue;
 
+    const sessTel = telemetry[sess] || null;
     const cmd = `tmux attach -t ${sess}`;
     html += `<tr>`;
     html += `<td style="font-family:var(--font-mono);">—</td>`;
     html += `<td><span class="status-badge status-running"><span class="status-dot running"></span> merging</span></td>`;
     html += `<td style="font-family:var(--font-mono);font-size:0.8rem;">${escapeHtml(sess)}</td>`;
+    // Telemetry cell for active merge session
+    html += `<td style="font-size:0.75rem;">`;
+    if (sessTel) {
+      const totalTok = (sessTel.inputTokens || 0) + (sessTel.outputTokens || 0);
+      const cost = sessTel.cost || 0;
+      if (totalTok > 0 || cost > 0) {
+        html += `<span style="color:var(--text-muted);">${totalTok > 0 ? totalTok.toLocaleString() + " tok" : ""}`;
+        if (cost > 0) html += ` · $${cost.toFixed(4)}`;
+        html += `</span>`;
+      } else {
+        html += '<span style="color:var(--text-faint);">—</span>';
+      }
+    } else {
+      html += '<span style="color:var(--text-faint);">—</span>';
+    }
+    html += `</td>`;
     html += `<td><span class="tmux-cmd" data-tmux="${escapeHtml(sess)}" onclick="copyTmuxCmd('${escapeHtml(sess)}')" title="Click to copy">${escapeHtml(cmd)}</span></td>`;
     html += `<td>—</td>`;
     html += `</tr>`;
@@ -711,17 +751,16 @@ function renderNoBatch() {
   if ($mergePanel) $mergePanel.style.display = "none";
   if ($errorsPanel) $errorsPanel.style.display = "none";
 
-  // Try to show the latest history entry
-  if (historyList.length > 0 && !viewingHistoryId) {
-    viewHistoryEntry(historyList[0].batchId);
-    $historySelect.value = historyList[0].batchId;
-  } else if (historyList.length === 0) {
-    // No history yet — show placeholder in the history panel
+  // Show a placeholder while history loads. loadHistoryList() (called in
+  // render() just before this) is async — the fresh list may not be
+  // available yet. The loadHistoryList callback will replace this with
+  // the actual latest entry once it resolves.
+  if (!viewingHistoryId) {
     $historyBody.innerHTML = `
       <div class="no-batch">
         <div class="no-batch-icon">⏳</div>
-        <div class="no-batch-title">No batch running</div>
-        <div class="no-batch-hint">.pi/batch-state.json not found<br>Start an orchestrator batch to see the dashboard.</div>
+        <div class="no-batch-title">Batch complete</div>
+        <div class="no-batch-hint">Loading history…</div>
       </div>`;
     $historyPanel.style.display = "";
   }
@@ -1405,10 +1444,22 @@ function loadHistoryList() {
     .then(list => {
       historyList = list || [];
       renderHistoryDropdown();
-      // If no live batch and no history shown yet, auto-select latest
-      if (noBatchRendered && !viewingHistoryId && historyList.length > 0) {
+      // Auto-select the latest history entry when no live batch is running.
+      // Always update the view here — renderNoBatch() shows a placeholder
+      // while this async fetch completes, so we need to replace it with
+      // the actual latest entry. This fixes #20 where the stale cached
+      // historyList caused the previous batch to be shown.
+      if (noBatchRendered && historyList.length > 0) {
         viewHistoryEntry(historyList[0].batchId);
         $historySelect.value = historyList[0].batchId;
+      } else if (noBatchRendered && historyList.length === 0) {
+        $historyBody.innerHTML = `
+          <div class="no-batch">
+            <div class="no-batch-icon">⏳</div>
+            <div class="no-batch-title">No batch running</div>
+            <div class="no-batch-hint">.pi/batch-state.json not found<br>Start an orchestrator batch to see the dashboard.</div>
+          </div>`;
+        $historyPanel.style.display = "";
       }
     })
     .catch(() => {});

package/dashboard/server.cjs

@@ -239,7 +239,8 @@ const telemetryPrefixFiles = new Map();
 /**
  * Parse a telemetry JSONL filename to extract lane number and role.
  * Pattern: {opId}-{batchId}-{repoId}[-{taskId}][-lane-{N}]-{role}.jsonl
- * Returns { laneNumber: number|null, role: string } or null if unparseable.
+ * Roles: worker, reviewer, merger
+ * Returns { laneNumber: number|null, role: string, mergeNumber: number|null } or null if unparseable.
  */
 function parseTelemetryFilename(filename) {
   // Remove .jsonl extension
@@ -248,13 +249,17 @@ function parseTelemetryFilename(filename) {
   const lastDash = base.lastIndexOf("-");
   if (lastDash < 0) return null;
   const role = base.slice(lastDash + 1);
-  if (role !== "worker" && role !== "reviewer") return null;
+  if (role !== "worker" && role !== "reviewer" && role !== "merger") return null;
 
   // Extract lane number from -lane-{N}- pattern
   const laneMatch = base.match(/-lane-(\d+)-/);
   const laneNumber = laneMatch ? parseInt(laneMatch[1], 10) : null;
 
-  return { laneNumber, role };
+  // Extract merge number from -merge-{N}- pattern (merge agents)
+  const mergeMatch = base.match(/-merge-(\d+)-/);
+  const mergeNumber = mergeMatch ? parseInt(mergeMatch[1], 10) : null;
+
+  return { laneNumber, role, mergeNumber };
 }
 
 /**
@@ -375,7 +380,10 @@ function loadTelemetryData(batchState) {
 
     // Determine the key (tmux prefix)
     let prefix;
-    if (parsed.laneNumber != null && laneToPrefix[parsed.laneNumber]) {
+    if (parsed.role === "merger") {
+      // Merge agent — key by merge session number or generic "merge"
+      prefix = parsed.mergeNumber != null ? `orch-merge-${parsed.mergeNumber}` : "orch-merge";
+    } else if (parsed.laneNumber != null && laneToPrefix[parsed.laneNumber]) {
       prefix = laneToPrefix[parsed.laneNumber];
     } else if (parsed.laneNumber != null) {
       // Lane number found but no batch-state mapping — use heuristic