taskplane 0.7.1 → 0.8.0

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`;
@@ -308,9 +310,17 @@ function renderSummary(batch) {
   let batchChecked = 0, batchTotal = 0;
   const waveStats = wavePlan.map((taskIds, waveIdx) => {
     let wChecked = 0, wTotal = 0;
+    let allSucceeded = taskIds.length > 0;
     for (const tid of taskIds) {
       const t = taskMap.get(tid);
-      if (t && t.statusData) {
+      if (!t || t.status !== "succeeded") allSucceeded = false;
+      if (t && t.status === "succeeded" && t.statusData) {
+        // Succeeded task with statusData: count as fully done even if
+        // STATUS.md checkboxes weren't all ticked before .DONE was created
+        const total = t.statusData.total || 1;
+        wChecked += total;
+        wTotal += total;
+      } else if (t && t.statusData) {
         wChecked += t.statusData.checked || 0;
         wTotal += t.statusData.total || 0;
       } else if (t && t.status === "succeeded") {
@@ -322,7 +332,7 @@ function renderSummary(batch) {
     }
     batchChecked += wChecked;
     batchTotal += wTotal;
-    return { waveIdx, taskIds, checked: wChecked, total: wTotal };
+    return { waveIdx, taskIds, checked: wChecked, total: wTotal, allSucceeded };
   });
 
   const overallPct = batchTotal > 0 ? Math.round((batchChecked / batchTotal) * 100) : 0;
@@ -333,15 +343,19 @@ function renderSummary(batch) {
   for (const ws of waveStats) {
     const segWidthPct = batchTotal > 0 ? (ws.total / batchTotal) * 100 : (100 / waveStats.length);
     const fillPct = ws.total > 0 ? (ws.checked / ws.total) * 100 : 0;
-    const isDone = ws.checked === ws.total && ws.total > 0;
-    const isCurrent = ws.waveIdx === currentWaveIdx && batch.phase === "executing";
+    const checkboxDone = ws.checked === ws.total && ws.total > 0;
+    const pastWave = ws.waveIdx < currentWaveIdx;
+    const batchDone = batch.phase === "completed" || batch.phase === "merging";
+    const isDone = checkboxDone || pastWave || batchDone || ws.allSucceeded;
+    const isCurrent = ws.waveIdx === currentWaveIdx && (batch.phase === "executing" || batch.phase === "merging");
     const isFuture = ws.waveIdx > currentWaveIdx && batch.phase === "executing";
 
     const fillClass = isDone ? "pct-hi" : fillPct > 50 ? "pct-mid" : fillPct > 0 ? "pct-low" : "pct-0";
+    const fillWidth = isDone ? 100 : fillPct;
     const segClass = isCurrent ? "wave-seg-current" : isFuture ? "wave-seg-future" : "";
 
     barHtml += `<div class="wave-seg ${segClass}" style="width:${segWidthPct.toFixed(1)}%" title="W${ws.waveIdx + 1}: ${ws.checked}/${ws.total} checkboxes (${ws.taskIds.join(', ')})">`;
-    barHtml += `  <div class="wave-seg-fill ${fillClass}" style="width:${fillPct.toFixed(1)}%"></div>`;
+    barHtml += `  <div class="wave-seg-fill ${fillClass}" style="width:${fillWidth.toFixed(1)}%"></div>`;
     barHtml += `  <span class="wave-seg-label">W${ws.waveIdx + 1}</span>`;
     barHtml += `</div>`;
   }
@@ -699,17 +713,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 = "";
   }
@@ -1393,10 +1406,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(() => {});