claude-teammate 0.1.145 → 0.1.147

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-teammate",
-  "version": "0.1.145",
+  "version": "0.1.147",
   "description": "CLI bootstrapper for Claude Teammate.",
   "license": "MIT",
   "type": "module",

package/src/commands/worker.js

@@ -191,7 +191,8 @@ export async function runWorkerCommand({ projectRoot }) {
     lastReviewSuccessAt: null,
     lastReviewError: null,
     reviewPrCount: 0,
-    reviewPrs: []
+    reviewPrs: [],
+    pollerBusy: { jira: false, github: false, draftPr: false, reviewPr: false }
   };
 
   const updatePrSubtaskState = async (key, updates) => {
@@ -250,6 +251,8 @@ export async function runWorkerCommand({ projectRoot }) {
       return;
     }
     jiraFlag.value = true;
+    state.pollerBusy.jira = true;
+    await writeState(runtimePaths.stateFile, state);
     await runPoll("", "Jira", state, async () => {
       const result = await jira.fetchAssignedIssues();
       const processedIssues = [];
@@ -272,6 +275,8 @@ export async function runWorkerCommand({ projectRoot }) {
         logInfo: { issues: result.issues.length, assigned: result.total }
       };
     }, { stateFile: runtimePaths.stateFile, logger, flagRef: jiraFlag });
+    state.pollerBusy.jira = false;
+    await writeState(runtimePaths.stateFile, state);
   };
 
   const pollGitHub = async () => {
@@ -279,6 +284,8 @@ export async function runWorkerCommand({ projectRoot }) {
       return;
     }
     githubFlag.value = true;
+    state.pollerBusy.github = true;
+    await writeState(runtimePaths.stateFile, state);
     await runPoll("GitHub", "GitHub", state, async () => {
       const repos = filterReposForActiveForge(await listKnownRepos(projectRoot), forgeRegistry);
       const reposByUrl = new Map(repos.map((repo) => [repo.url, repo]));
@@ -396,6 +403,8 @@ export async function runWorkerCommand({ projectRoot }) {
         logInfo: { tracked: trackedIssueCount }
       };
     }, { stateFile: runtimePaths.stateFile, logger, flagRef: githubFlag });
+    state.pollerBusy.github = false;
+    await writeState(runtimePaths.stateFile, state);
   };
 
   const pollDraftPrs = async () => {
@@ -403,6 +412,8 @@ export async function runWorkerCommand({ projectRoot }) {
       return;
     }
     prFlag.value = true;
+    state.pollerBusy.draftPr = true;
+    await writeState(runtimePaths.stateFile, state);
     const prJira = createJiraClient(values);
     await runPoll("Pr", "Pull request", state, async () => {
       const repos = filterReposForActiveForge(await listKnownRepos(projectRoot), forgeRegistry);
@@ -529,6 +540,8 @@ export async function runWorkerCommand({ projectRoot }) {
         logInfo: { tracked: trackedPrCount }
       };
     }, { stateFile: runtimePaths.stateFile, logger, flagRef: prFlag });
+    state.pollerBusy.draftPr = false;
+    await writeState(runtimePaths.stateFile, state);
   };
 
   const pollReviewPrs = async () => {
@@ -536,6 +549,8 @@ export async function runWorkerCommand({ projectRoot }) {
       return;
     }
     reviewFlag.value = true;
+    state.pollerBusy.reviewPr = true;
+    await writeState(runtimePaths.stateFile, state);
     await runPoll("Review", "PR review", state, async () => {
       const processedPrs = [];
       const repos = filterReposForActiveForge(await listKnownRepos(projectRoot), forgeRegistry);
@@ -594,6 +609,8 @@ export async function runWorkerCommand({ projectRoot }) {
         logInfo: { reviewed: reviewedPrCount }
       };
     }, { stateFile: runtimePaths.stateFile, logger, flagRef: reviewFlag });
+    state.pollerBusy.reviewPr = false;
+    await writeState(runtimePaths.stateFile, state);
   };
 
   await pollJira();
@@ -2447,15 +2464,21 @@ export function getLatestClarificationInput(detail, botUser, jira) {
 }
 
 export function hasNewHumanReplyWhileWaiting(detail, botUser, jira) {
-  const latestNonProgressComment = [...detail.comments]
+  const nonProgressComments = [...detail.comments]
     .filter((comment) => !String(comment?.bodyText || "").startsWith(PROGRESS_COMMENT_PREFIX))
-    .sort(compareCommentsNewestFirst)[0];
+    .sort(compareCommentsNewestFirst);
 
-  if (!latestNonProgressComment) {
+  const latestHumanComment = nonProgressComments.find((comment) => !jira.isBotAuthor(comment.author, botUser));
+  if (!latestHumanComment) {
     return false;
   }
 
-  return !jira.isBotAuthor(latestNonProgressComment.author, botUser);
+  const latestBotComment = nonProgressComments.find((comment) => jira.isBotAuthor(comment.author, botUser));
+  if (!latestBotComment) {
+    return true;
+  }
+
+  return getCommentTimestamp(latestHumanComment) > getCommentTimestamp(latestBotComment);
 }
 
 export function shouldReuseNoCodeDecision({ issueMemory, latestInputId }) {
@@ -2467,11 +2490,15 @@ export function shouldReuseNoCodeDecision({ issueMemory, latestInputId }) {
 }
 
 function compareCommentsNewestFirst(left, right) {
-  const leftTime = Date.parse(left?.updated || left?.created || "") || 0;
-  const rightTime = Date.parse(right?.updated || right?.created || "") || 0;
+  const leftTime = getCommentTimestamp(left);
+  const rightTime = getCommentTimestamp(right);
   return rightTime - leftTime;
 }
 
+function getCommentTimestamp(comment) {
+  return Date.parse(comment?.updated || comment?.created || "") || 0;
+}
+
 export function getLatestBlockedTaskRestartComment(detail, issueMemory, botUser, jira) {
   if (!isBlockedOrFailedIssueState(detail, issueMemory)) {
     return null;

package/src/dashboard/ui.html

@@ -624,8 +624,8 @@ tr:hover td { background:var(--bg); }
   margin-top:5px;
 }
 
-/* ── Implementation Tracker ── */
-.impl-tracker {
+/* ── Heartbeat Queues ── */
+.heartbeat-queues {
   background:var(--bg-card);
   border:1px solid var(--border);
   border-radius:var(--r-lg);
@@ -634,104 +634,90 @@ tr:hover td { background:var(--bg); }
   overflow:hidden;
 }
 
-.impl-header {
+.hbq-header {
   display:flex;
   align-items:center;
   gap:10px;
-  padding:14px 18px;
+  padding:12px 18px;
   border-bottom:1px solid var(--border);
-  background: linear-gradient(135deg, var(--teal-bg), var(--sky-bg));
+  background:linear-gradient(135deg, var(--teal-bg), var(--sky-bg));
 }
 
-.impl-icon {
-  width:32px; height:32px;
-  background:var(--teal);
-  border-radius:8px;
-  display:flex;
-  align-items:center;
-  justify-content:center;
-  color:white;
+.hbq-title {
   font-size:.85rem;
-  flex-shrink:0;
-}
-
-.impl-title {
-  font-size:.9rem;
-  font-weight:600;
+  font-weight:700;
   color:var(--ink-1);
 }
 
-.impl-sub {
-  font-size:.72rem;
-  color:var(--ink-3);
-  margin-top:1px;
-}
-
-.impl-body { padding:16px 18px; }
+.hbq-body { padding:14px 18px; display:flex; flex-direction:column; gap:10px; }
 
-.impl-phase-row {
+.hbq-row {
   display:flex;
   align-items:center;
   gap:10px;
-  margin-bottom:12px;
 }
 
-.impl-phase-label {
-  font-size:.72rem;
-  font-weight:600;
+.hbq-label {
+  font-size:.68rem;
+  font-weight:700;
   text-transform:uppercase;
   letter-spacing:.5px;
-  color:var(--ink-2);
-  width:140px;
+  color:var(--ink-3);
+  width:80px;
   flex-shrink:0;
 }
 
-.impl-progress-bar {
+.hbq-cards {
+  display:flex;
+  flex-direction:row;
+  flex-wrap:nowrap;
+  gap:6px;
+  overflow-x:auto;
   flex:1;
-  height:8px;
-  background:var(--border);
-  border-radius:4px;
-  overflow:hidden;
+  scrollbar-width:none;
+  padding-bottom:2px;
 }
 
-.impl-progress-fill {
-  height:100%;
-  border-radius:4px;
-  width:0;
-  transition:width 1.5s cubic-bezier(.4,0,.2,1) .2s;
-  background:linear-gradient(90deg,var(--teal),var(--sky));
-  position:relative;
-  overflow:hidden;
+.hbq-cards::-webkit-scrollbar { display:none; }
+
+.hbq-card {
+  font-family:var(--f-mono);
+  font-size:.72rem;
+  font-weight:600;
+  padding:4px 9px;
+  border-radius:5px;
+  border:1px solid var(--border);
+  background:var(--bg);
+  color:var(--ink-2);
+  white-space:nowrap;
+  cursor:pointer;
+  flex-shrink:0;
+  transition:border-color .15s, color .15s;
 }
 
-.impl-progress-fill::after {
-  content:"";
-  position:absolute;
-  top:0; left:0; bottom:0;
-  width:60px;
-  background:linear-gradient(90deg,transparent,rgba(255,255,255,.4),transparent);
-  animation:shimmer 2s infinite;
+.hbq-card:hover { border-color:var(--accent); color:var(--accent); }
+
+.hbq-card.active {
+  border-color:var(--teal);
+  color:var(--teal);
+  background:var(--teal-bg);
+  animation:hbq-pulse 1.4s ease-in-out infinite;
 }
 
-@keyframes shimmer {
-  from { transform:translateX(-60px); }
-  to   { transform:translateX(calc(100% + 60px)); }
+@keyframes hbq-pulse {
+  0%, 100% { opacity:1; }
+  50%       { opacity:.45; }
 }
 
-.impl-phase-status {
-  font-family:var(--f-mono);
-  font-size:.68rem;
-  font-weight:600;
-  width:80px;
-  text-align:right;
-  flex-shrink:0;
+@media (prefers-reduced-motion: reduce) {
+  .hbq-card.active { animation:none; }
 }
 
-.impl-dur {
-  font-family:var(--f-mono);
-  font-size:.72rem;
+.hbq-idle {
+  font-size:.68rem;
   color:var(--ink-3);
-  text-align:right;
+  font-style:italic;
+  padding:4px 2px;
 }
 
 /* ── Log ── */
@@ -1571,8 +1557,8 @@ tr.clickable:hover td { background:var(--sky-bg) !important; }
         </div>
       </div>
 
-      <!-- Active implementation tracker -->
-      <div id="impl-tracker-wrap"></div>
+      <!-- Heartbeat queue view -->
+      <div id="heartbeat-queues-wrap"></div>
 
       <!-- Worker info -->
       <div class="card" id="worker-card">
@@ -1729,7 +1715,6 @@ let cachedStatus = null;
 let cachedMemFiles = [];
 let activeBoardFilter = null;
 let currentMemPath = null;
-let lastImplTrackerKey = null;
 let currentDrawerKey = null;
 let currentLogFilter = "all";
 
@@ -1798,7 +1783,7 @@ async function loadStatus() {
     renderStats(data);
     renderWorkerDetails(data);
     renderIssues(data);
-    renderImplTracker(data);
+    renderHeartbeatQueues(data);
     renderBoardFilters(data);
     renderPipeline(data);
     renderAwaiting(data);
@@ -1958,86 +1943,52 @@ function renderIssues(data) {
   }).join("");
 }
 
-function renderImplTracker(data) {
-  const wrap = document.getElementById("impl-tracker-wrap");
+function renderHeartbeatQueues(data) {
+  const wrap = document.getElementById("heartbeat-queues-wrap");
   const s = data.state || {};
-  const impl = s.prImplementation;
-  const review = s.prCommentReview;
-
-  if (!impl && !review) {
-    if (lastImplTrackerKey !== null) { wrap.innerHTML = ""; lastImplTrackerKey = null; }
-    return;
-  }
-
-  const trackerKey = [
-    impl?.branch || "", impl?.status || "", impl?.startedAt || "", impl?.finishedAt || "",
-    review?.branch || "", review?.status || "", review?.startedAt || "", review?.finishedAt || ""
-  ].join("|");
-  if (trackerKey === lastImplTrackerKey) return;
-  lastImplTrackerKey = trackerKey;
-
-  const phases = [];
-
-  if (review) phases.push({
-    label: "Comment Review",
-    status: review.status,
-    started: review.startedAt,
-    finished: review.finishedAt,
-    pr: review.pullRequestUrl,
-    branch: review.branchName
-  });
-
-  if (impl) phases.push({
-    label: "Implementation",
-    status: impl.status,
-    started: impl.startedAt,
-    finished: impl.finishedAt,
-    pr: impl.pullRequestUrl,
-    branch: impl.branchName
-  });
-
-  const mainPhase = impl || review;
-  const dur = mainPhase.finishedAt && mainPhase.startedAt
-    ? formatDuration(new Date(mainPhase.finishedAt) - new Date(mainPhase.startedAt))
-    : mainPhase.startedAt ? "In progress · " + formatDuration(Date.now() - new Date(mainPhase.startedAt)) : "—";
+  const busy = s.pollerBusy || {};
+
+  const rows = [
+    { label: "Jira",       items: s.issues || [],        busyKey: "jira",     type: "jira" },
+    { label: "GitHub",     items: s.githubIssues || [],  busyKey: "github",   type: "jira" },
+    { label: "Draft PRs",  items: s.draftPrs || [],      busyKey: "draftPr",  type: "pr" },
+    { label: "Review PRs", items: s.reviewPrs || [],     busyKey: "reviewPr", type: "pr" }
+  ];
+
+  const renderCard = (item, isActive, type, idx) => {
+    const activeClass = isActive && idx === 0 ? " active" : "";
+    if (type === "jira") {
+      const key = esc(item.key || "");
+      const onclick = item.key
+        ? `onclick='openDrawer(${JSON.stringify(item)}, cachedStatus)'`
+        : "";
+      return `<div class="hbq-card${activeClass}" ${onclick}>${key}</div>`;
+    }
+    const label = item.pullRequestNumber ? esc("#" + item.pullRequestNumber) : "PR";
+    const href = item.pullRequestUrl ? esc(item.pullRequestUrl) : "#";
+    return `<a class="hbq-card${activeClass}" href="${href}" target="_blank" style="text-decoration:none">${label}</a>`;
+  };
 
   wrap.innerHTML = `
-    <div class="impl-tracker">
-      <div class="impl-header">
-        <div class="impl-icon">⚡</div>
-        <div>
-          <div class="impl-title">${esc(mainPhase.branch || "Implementation Tracker")}</div>
-          <div class="impl-sub">
-            ${mainPhase.pr ? `<a href="${esc(mainPhase.pr)}" target="_blank">View PR</a> · ` : ""}
-            Duration: ${dur}
-          </div>
-        </div>
-        <span class="tag ${mainPhase.status}" style="margin-left:auto">${esc(mainPhase.status)}</span>
+    <div class="heartbeat-queues">
+      <div class="hbq-header">
+        <span class="hbq-title">Heartbeat Queues</span>
       </div>
-      <div class="impl-body">
-        ${phases.map((ph, i) => {
-          const pct = ph.status === "finished" ? 100 : ph.status === "running" ? 60 : 0;
-          const color = ph.status === "finished" ? "var(--green)" : "var(--teal)";
-          const animDelay = i * 0.3;
+      <div class="hbq-body">
+        ${rows.map(row => {
+          const isActive = !!busy[row.busyKey];
+          const cards = row.items.length > 0
+            ? row.items.map((item, idx) => renderCard(item, isActive, row.type, idx)).join("")
+            : `<span class="hbq-idle">idle</span>`;
           return `
-          <div class="impl-phase-row">
-            <div class="impl-phase-label">${esc(ph.label)}</div>
-            <div class="impl-progress-bar">
-              <div class="impl-progress-fill" data-pct="${pct}" style="background:${color};transition-delay:${animDelay}s"></div>
-            </div>
-            <div class="impl-phase-status" style="color:${pct===100?'var(--green)':'var(--teal)'}">${esc(ph.status)}</div>
-          </div>`;
+            <div class="hbq-row">
+              <div class="hbq-label">${esc(row.label)}</div>
+              <div class="hbq-cards">${cards}</div>
+            </div>`;
         }).join("")}
       </div>
     </div>
   `;
-
-  // animate bars
-  setTimeout(() => {
-    wrap.querySelectorAll(".impl-progress-fill[data-pct]").forEach(el => {
-      el.style.width = el.dataset.pct + "%";
-    });
-  }, 100);
 }
 
 /* ── Pipeline ── */