claude-teammate 0.1.149 → 0.1.151

package/package.json

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

package/src/commands/status.js

@@ -66,7 +66,7 @@ export async function runStatusCommand({ projectRoot, args = [] }) {
       process.stdout.write("GitHub issues:\n");
       for (const issue of state.githubIssues) {
         process.stdout.write(
-          `- ${issue.repoUrl}#${issue.issueNumber}${issue.prUrl ? ` | PR: ${issue.prUrl}` : ""}${issue.branchName ? ` | branch: ${issue.branchName}` : ""}${issue.lastCommentAction ? ` | action: ${issue.lastCommentAction}` : ""}\n`
+          `- ${formatForgeQueueLabel(issue.repoUrl, issue.issueNumber)}${issue.title ? ` | ${issue.title}` : ""}${issue.workflowState ? ` | ${issue.workflowState}` : ""}${issue.prUrl ? ` | PR: ${issue.prUrl}` : ""}${issue.branchName ? ` | branch: ${issue.branchName}` : ""}${issue.action ? ` | action: ${issue.action}` : ""}\n`
         );
       }
     }
@@ -75,9 +75,20 @@ export async function runStatusCommand({ projectRoot, args = [] }) {
       process.stdout.write("Draft PRs:\n");
       for (const pullRequest of state.draftPrs) {
         process.stdout.write(
-          `- ${pullRequest.pullRequestUrl}${pullRequest.branchName ? ` | branch: ${pullRequest.branchName}` : ""}${pullRequest.status ? ` | status: ${pullRequest.status}` : ""}${pullRequest.action ? ` | action: ${pullRequest.action}` : ""}\n`
+          `- ${formatForgeQueueLabel(pullRequest.repoUrl, pullRequest.pullRequestNumber)}${pullRequest.title ? ` | ${pullRequest.title}` : ""}${pullRequest.branchName ? ` | branch: ${pullRequest.branchName}` : ""}${pullRequest.status ? ` | status: ${pullRequest.status}` : ""}${pullRequest.action ? ` | action: ${pullRequest.action}` : ""}\n`
         );
       }
     }
   }
 }
+
+function formatForgeQueueLabel(repoUrl, itemNumber) {
+  try {
+    const url = new URL(String(repoUrl || "").trim());
+    const parts = url.pathname.split("/").filter(Boolean);
+    const repoName = parts[parts.length - 1] || "repo";
+    return `${repoName} #${itemNumber}`;
+  } catch {
+    return `repo #${itemNumber}`;
+  }
+}

package/src/commands/worker.js

@@ -711,7 +711,7 @@ async function processJiraIssue({ issue, jira, forgeRegistry, botUser, config, p
   let epicMemory = epicMemoryRecord.data;
   let issueMemory = issueMemoryRecord.data;
   let liveRepos = deriveTaskRepos(detail, epicMemory, forgeRegistry);
-  const labels = normalizeLabels(detail.labels);
+  let labels = normalizeLabels(detail.labels);
 
   if (isDoneStatus(detail.status)) {
     return buildIssueState(detail, { repos: liveRepos }, issueMemory, null);
@@ -845,30 +845,44 @@ async function processJiraIssue({ issue, jira, forgeRegistry, botUser, config, p
       await saveProgress("Repository ready. Analyzing requirements...");
     }
 
+    const linkedSource = await fetchLinkedForgeState({
+      issueMemory,
+      forgeRegistry,
+      logger
+    });
+    await reconcileJiraWithLinkedForgeState({
+      detail,
+      jira,
+      linkedSource,
+      logger
+    });
+    labels = normalizeLabels(detail.labels);
+
     if (!isInProgressStatus(detail.status)) {
-      return buildIssueState(detail, { repos: liveRepos }, issueMemory, null);
+      return buildIssueState(detail, { repos: liveRepos }, issueMemory, null, null, linkedSource);
     }
 
     if (labels.includes(OPERATIONAL_LABELS.waitingHuman)) {
       if (!hasNewHumanReplyWhileWaiting(detail, botUser, jira)) {
-        return buildIssueState(detail, { repos: liveRepos }, issueMemory, null);
+        return buildIssueState(detail, { repos: liveRepos }, issueMemory, null, null, linkedSource);
       }
 
       await replaceJiraOperationalLabels(jira, detail, []);
+      labels = normalizeLabels(detail.labels);
       await logger.info("Human reply received for waiting task; resuming processing", {
         issue: detail.key
       });
     }
 
     if (labels.includes(OPERATIONAL_LABELS.waitingApproval)) {
-      return buildIssueState(detail, { repos: liveRepos }, issueMemory, null);
+      return buildIssueState(detail, { repos: liveRepos }, issueMemory, null, null, linkedSource);
     }
 
     let claudeResult = null;
     const latestInput = getLatestClarificationInput(detail, botUser, jira);
     if (!latestInput) {
       await saveProgress("Task restarted. Please comment with any updated instructions or reply to continue.");
-      return buildIssueState(detail, { repos: liveRepos }, issueMemory, null);
+      return buildIssueState(detail, { repos: liveRepos }, issueMemory, null, null, linkedSource);
     }
 
     const reopenContext = buildReopenContext({
@@ -881,7 +895,7 @@ async function processJiraIssue({ issue, jira, forgeRegistry, botUser, config, p
     if (isClaudeUsageLimited()) {
       await logger.info("Skipping Claude: usage limit active", { issue: detail.key, resumesAt: new Date(claudeUsageLimitUntil).toISOString() });
       await saveProgress(`Claude usage limit active. Will retry automatically at ${new Date(claudeUsageLimitUntil).toISOString().replace("T", " ").slice(0, 16)} UTC.`);
-      return buildIssueState(detail, { repos: liveRepos }, issueMemory, null);
+      return buildIssueState(detail, { repos: liveRepos }, issueMemory, null, null, linkedSource);
     }
 
     await saveProgress("Analyzing requirements...");
@@ -2343,10 +2357,10 @@ async function continueGitHubIssueCreation({
     issueMemory.github_issues = dedupeGitHubIssues(issueMemory.github_issues);
     issueMemory = await saveIssueMemory(issueMemoryRecord.filePath, detail, issueMemory);
 
-    const successComment = `Created repository issue: [#${githubIssue.number}](${githubIssue.url})`;
-    if (!existingGitHubIssue) {
-      await ensureJiraComment(detail, jira, botUser, successComment);
-    }
+    const successComment = existingGitHubIssue
+      ? `Using existing repository issue: [#${githubIssue.number}](${githubIssue.url})`
+      : `Created repository issue: [#${githubIssue.number}](${githubIssue.url})`;
+    await ensureJiraComment(detail, jira, botUser, successComment);
     await replaceJiraOperationalLabels(jira, detail, [OPERATIONAL_LABELS.waitingApproval]);
     issueMemory.last_error = "";
     issueMemory = await saveIssueMemory(issueMemoryRecord.filePath, detail, issueMemory);
@@ -3219,6 +3233,7 @@ function buildGitHubIssueState(issue, githubIssueMemory, action) {
     repoUrl: githubIssueMemory.repo_url,
     issueNumber: String(issue.number),
     issueUrl: issue.url,
+    title: issue.title || "",
     state: issue.state || "",
     labels: normalizeLabels(issue.labels),
     workflowState: live.phase,
@@ -3236,6 +3251,7 @@ function buildDraftPrState(pullRequest, status, action) {
     repoUrl,
     pullRequestNumber: String(pullRequest.number),
     pullRequestUrl: pullRequest.url,
+    title: pullRequest.title || "",
     branchName: pullRequest.headRef || "",
     status,
     labels: normalizeLabels(pullRequest.labels),
@@ -3258,6 +3274,125 @@ function buildDefaultIssueMemory(workflowState) {
   };
 }
 
+async function fetchLinkedForgeState({ issueMemory, forgeRegistry, logger }) {
+  const linkedSource = {
+    githubIssues: [],
+    pullRequests: []
+  };
+
+  const entries = Array.isArray(issueMemory?.github_issues) ? issueMemory.github_issues : [];
+  const seenIssues = new Set();
+  const seenPullRequests = new Set();
+
+  for (const entry of entries) {
+    const repoUrl = String(entry?.repo_url || "").trim();
+    if (!repoUrl) {
+      continue;
+    }
+
+    let provider;
+    try {
+      provider = forgeRegistry.getClientForRepo(repoUrl);
+    } catch (error) {
+      await logger.error("Failed to resolve linked forge client", { repo: repoUrl, error });
+      continue;
+    }
+
+    const issueNumber = String(entry?.number || "").trim();
+    if (issueNumber) {
+      const issueKey = `${repoUrl}#${issueNumber}`;
+      if (!seenIssues.has(issueKey)) {
+        seenIssues.add(issueKey);
+        try {
+          const issue = await provider.fetchIssue(repoUrl, issueNumber);
+          linkedSource.githubIssues.push({
+            repoUrl,
+            issueNumber: String(issue.number || issueNumber),
+            issueUrl: issue.url || entry.url || "",
+            title: issue.title || "",
+            state: issue.state || "",
+            labels: normalizeLabels(issue.labels)
+          });
+        } catch (error) {
+          await logger.error("Failed to fetch linked forge issue", {
+            repo: repoUrl,
+            issue: issueNumber,
+            error
+          });
+        }
+      }
+    }
+
+    const pullRequestNumber = String(entry?.pr_number || "").trim();
+    if (pullRequestNumber) {
+      const pullKey = `${repoUrl}!${pullRequestNumber}`;
+      if (!seenPullRequests.has(pullKey)) {
+        seenPullRequests.add(pullKey);
+        try {
+          const pullRequest = await provider.fetchPullRequest(repoUrl, pullRequestNumber);
+          linkedSource.pullRequests.push({
+            repoUrl,
+            pullRequestNumber: String(pullRequest.number || pullRequestNumber),
+            pullRequestUrl: pullRequest.url || entry.pr_url || "",
+            title: pullRequest.title || "",
+            state: pullRequest.state || "",
+            draft: pullRequest.draft === true,
+            labels: normalizeLabels(pullRequest.labels),
+            status: getPullRequestStatus(pullRequest.body || "")
+          });
+        } catch (error) {
+          await logger.error("Failed to fetch linked pull request", {
+            repo: repoUrl,
+            pr: pullRequestNumber,
+            error
+          });
+        }
+      }
+    }
+  }
+
+  return linkedSource;
+}
+
+async function reconcileJiraWithLinkedForgeState({ detail, jira, linkedSource, logger }) {
+  const pullRequests = Array.isArray(linkedSource?.pullRequests) ? linkedSource.pullRequests : [];
+  const pullRequestStates = pullRequests.map((pullRequest) => derivePullRequestLiveState(pullRequest));
+
+  if (pullRequestStates.some((pullRequest) => pullRequest.phase === "done")) {
+    if (!isDoneStatus(detail.status)) {
+      const transition = await jira.transitionIssueToStatus(detail.key, "Done");
+      if (transition.transitioned) {
+        detail.status = "Done";
+      }
+      await logger.info("Linked pull request is complete; reconciling Jira to Done", {
+        issue: detail.key,
+        moved: transition.transitioned ? "yes" : "no"
+      });
+    }
+    await replaceJiraOperationalLabels(jira, detail, []);
+    return;
+  }
+
+  if (pullRequestStates.length > 0 && normalizeLabels(detail.labels).includes(OPERATIONAL_LABELS.waitingApproval)) {
+    await replaceJiraOperationalLabels(jira, detail, []);
+  }
+
+  if (
+    pullRequestStates.some((pullRequest) => pullRequest.phase === "in_pr_review") &&
+    !isInReviewStatus(detail.status) &&
+    !isDoneStatus(detail.status)
+  ) {
+    const transition = await jira.transitionIssueToStatus(detail.key, "In Review");
+    if (transition.transitioned) {
+      detail.status = "In Review";
+    }
+    await logger.info("Linked pull request entered review; reconciling Jira to In Review", {
+      issue: detail.key,
+      moved: transition.transitioned ? "yes" : "no"
+    });
+  }
+}
+
 function buildPrSubtaskState(previous = {}) {
   return {
     phase: String(previous?.phase || "").trim(),

package/src/dashboard/ui.html

@@ -1947,10 +1947,19 @@ function renderHeartbeatQueues(data) {
   const wrap = document.getElementById("heartbeat-queues-wrap");
   const s = data.state || {};
   const busy = s.pollerBusy || {};
+  const forgeRepoName = (url) => {
+    try {
+      const u = new URL(url || "");
+      const parts = u.pathname.split("/").filter(Boolean);
+      return parts[parts.length - 1] || "repo";
+    } catch {
+      return "repo";
+    }
+  };
 
   const rows = [
     { label: "Jira",       items: s.issues || [],        busyKey: "jira",     type: "jira" },
-    { label: "GitHub",     items: s.githubIssues || [],  busyKey: "github",   type: "jira" },
+    { label: "GitHub",     items: s.githubIssues || [],  busyKey: "github",   type: "github" },
     { label: "Draft PRs",  items: s.draftPrs || [],      busyKey: "draftPr",  type: "pr" },
     { label: "Review PRs", items: s.reviewPrs || [],     busyKey: "reviewPr", type: "pr" }
   ];
@@ -1964,9 +1973,16 @@ function renderHeartbeatQueues(data) {
         : "";
       return `<div class="hbq-card${activeClass}" ${onclick}>${key}</div>`;
     }
-    const label = item.pullRequestNumber ? esc("#" + item.pullRequestNumber) : "PR";
+    if (type === "github") {
+      const label = esc(`${forgeRepoName(item.issueUrl || item.repoUrl)} ${item.issueNumber ? `#${item.issueNumber}` : "issue"}`);
+      const href = item.issueUrl ? esc(item.issueUrl) : "#";
+      const title = esc(item.title || label);
+      return `<a class="hbq-card${activeClass}" href="${href}" target="_blank" style="text-decoration:none" title="${title}">${label}</a>`;
+    }
+    const label = esc(`${forgeRepoName(item.pullRequestUrl || item.repoUrl)} ${item.pullRequestNumber ? `#${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>`;
+    const title = esc(item.title || label);
+    return `<a class="hbq-card${activeClass}" href="${href}" target="_blank" style="text-decoration:none" title="${title}">${label}</a>`;
   };
 
   wrap.innerHTML = `