claude-teammate 0.1.85 → 0.1.87

package/package.json

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

package/src/commands/worker.js

@@ -410,7 +410,7 @@ export async function processReviewPullRequest({
     github.createPullRequestReview(repoUrl, prNumber, body, suggestions, event)
 }) {
   await github.addLabelsToPullRequest(pr.repoUrl, pr.number, ["AI-reviewed"]);
-  await github.postIssueComment(pr.repoUrl, pr.number, "I am reviewing the PR.");
+  await postPullRequestComment(github, pr.repoUrl, pr.number, "I am reviewing the PR.");
 
   const repoPath = await ensureReviewRepoFn(pr.repoUrl, reviewReposDir);
   const prDetail = await fetchPullRequestFn(pr.repoUrl, pr.number);
@@ -782,7 +782,7 @@ async function processGitHubIssue({ repo, issue, projectRoot, github, jira, gith
     return buildGitHubIssueState(detail, githubIssueMemory, null);
   }
 
-  const isMemberForIssue = await checkCommentAuthorIsMember(github, repo, latestComment, logger, detail.number);
+  const isMemberForIssue = await checkCommentAuthorIsMember(github, repo, latestComment, logger, detail.number, false);
   if (!isMemberForIssue) {
     return buildGitHubIssueState(detail, githubIssueMemory, null);
   }
@@ -1021,7 +1021,7 @@ async function processTrackedPullRequest({ projectRoot, repo, pullRequest, githu
     return buildDraftPrState(detail, currentStatus, null);
   }
 
-  const isMemberForPr = await checkCommentAuthorIsMember(github, repo, latestComment, logger, detail.number);
+  const isMemberForPr = await checkCommentAuthorIsMember(github, repo, latestComment, logger, detail.number, true);
   if (!isMemberForPr) {
     return buildDraftPrState(detail, currentStatus, null);
   }
@@ -1131,7 +1131,7 @@ async function processTrackedPullRequest({ projectRoot, repo, pullRequest, githu
   });
 
   if (review.decision === "comment" && review.comment_body) {
-    await github.postIssueComment(repo.url, detail.number, review.comment_body);
+    await postPullRequestComment(github, repo.url, detail.number, review.comment_body);
     if (issueMemoryRecord && issueMemory && githubIssueMemory) {
       githubIssueMemory.last_comment_action = "commented";
       issueMemory.github_issues = dedupeGitHubIssues(issueMemory.github_issues);
@@ -1143,7 +1143,7 @@ async function processTrackedPullRequest({ projectRoot, repo, pullRequest, githu
   }
 
   if (commentReviewRepoAccess.blocker) {
-    await github.postIssueComment(repo.url, detail.number, commentReviewRepoAccess.blocker);
+    await postPullRequestComment(github, repo.url, detail.number, commentReviewRepoAccess.blocker);
     if (issueMemoryRecord && issueMemory && githubIssueMemory) {
       githubIssueMemory.last_comment_action = "blocked";
       issueMemory.github_issues = dedupeGitHubIssues(issueMemory.github_issues);
@@ -1214,7 +1214,7 @@ async function processPullRequestImplementation({
       title: detail.title,
       body: stuckBody
     });
-    await github.postIssueComment(repo.url, detail.number, repoAccess.blocker);
+    await postPullRequestComment(github, repo.url, detail.number, repoAccess.blocker);
     await logger.info("Pull request blocked before implementation", {
       repo: repo.url,
       pr: detail.number,
@@ -1229,7 +1229,7 @@ async function processPullRequestImplementation({
       title: detail.title,
       body: nextBody
     });
-    await github.postIssueComment(repo.url, detail.number, buildImplementingGifComment());
+    await postPullRequestComment(github, repo.url, detail.number, buildImplementingGifComment());
     await logger.info("Pull request status moved to IMPLEMENTING", {
       repo: repo.url,
       pr: detail.number,
@@ -1325,7 +1325,7 @@ async function processPullRequestImplementation({
         await transitionLinkedJiraIssueToReview(detail.title, jira, logger, detail.number);
       }
       const successComment = successCommentBody || formatPullRequestOutcomeComment(result.summary, "Implemented the requested changes and pushed them to this PR branch.");
-      await github.postIssueComment(repo.url, detail.number, successComment);
+      await postPullRequestComment(github, repo.url, detail.number, successComment);
       await postLinkedJiraComment(extractJiraKey(detail.title), successComment, jira, logger);
       await logger.info("Pull request implemented", {
         repo: repo.url,
@@ -1353,7 +1353,7 @@ async function processPullRequestImplementation({
       body: stuckBody
     });
     const stuckComment = formatPullRequestOutcomeComment(result.summary, "I could not complete the requested changes and the implementation is currently stuck.");
-    await github.postIssueComment(repo.url, detail.number, stuckComment);
+    await postPullRequestComment(github, repo.url, detail.number, stuckComment);
     await postLinkedJiraComment(extractJiraKey(detail.title), stuckComment, jira, logger);
     await logger.info("Pull request marked STUCK", {
       repo: repo.url,
@@ -1391,7 +1391,7 @@ async function processPullRequestImplementation({
       body: stuckBody
     });
     const errorComment = formatPullRequestOutcomeComment(message, "I hit an error while trying to implement the requested changes.");
-    await github.postIssueComment(repo.url, detail.number, errorComment);
+    await postPullRequestComment(github, repo.url, detail.number, errorComment);
     await postLinkedJiraComment(extractJiraKey(detail.title), errorComment, jira, logger);
     await logger.error("Pull request implementation failed", {
       repo: repo.url,
@@ -1851,7 +1851,7 @@ export function hasPlusOneReaction(comment) {
 }
 
 export async function acknowledgePullRequestComment({ github, logger, repoUrl, issueNumber, commentId = "" }) {
-  return markGitHubThreadRead({
+  return markPullRequestThreadRead({
     github,
     logger,
     repoUrl,
@@ -2091,6 +2091,34 @@ async function markGitHubThreadRead({ github, logger, repoUrl, issueNumber, comm
   }
 }
 
+async function markPullRequestThreadRead({ github, logger, repoUrl, issueNumber, commentId = "" }) {
+  try {
+    if (!commentId) {
+      return false;
+    }
+    const react = typeof github.createPullRequestCommentReaction === "function"
+      ? github.createPullRequestCommentReaction.bind(github)
+      : github.createIssueCommentReaction.bind(github);
+    await react(repoUrl, commentId, "eyes", issueNumber);
+    return true;
+  } catch (error) {
+    await logger.error("Failed to add pull request read reaction", {
+      repo: repoUrl,
+      issue: issueNumber,
+      commentId,
+      error
+    });
+    return false;
+  }
+}
+
+async function postPullRequestComment(github, repoUrl, pullNumber, body) {
+  const postComment = typeof github.postPullRequestComment === "function"
+    ? github.postPullRequestComment.bind(github)
+    : github.postIssueComment.bind(github);
+  return postComment(repoUrl, pullNumber, body);
+}
+
 function buildIssueState(issue, epicMemory, issueMemory, claudeDecision, lastError = null) {
   const repoUrls = epicMemory.repos.map((repo) => repo.url);
   const localRepoPaths = epicMemory.repos.map((repo) => repo.local_path).filter(Boolean);
@@ -2515,11 +2543,15 @@ async function resolveRepoLocalPath(repo, reposDir, logger, skipLabel) {
   }
 }
 
-async function checkCommentAuthorIsMember(github, repo, latestComment, logger, issueNumber = "") {
+async function checkCommentAuthorIsMember(github, repo, latestComment, logger, issueNumber = "", isPullRequest = false) {
   try {
     const isMember = await github.isRepoCollaborator(repo.url, latestComment.author.login);
     if (!isMember) {
-      await github.createIssueCommentReaction(repo.url, latestComment.id, "+1", issueNumber);
+      const react =
+        isPullRequest && typeof github.createPullRequestCommentReaction === "function"
+          ? github.createPullRequestCommentReaction.bind(github)
+          : github.createIssueCommentReaction.bind(github);
+      await react(repo.url, latestComment.id, "+1", issueNumber);
       return false;
     }
     return true;

package/src/forge/github.js

@@ -158,6 +158,10 @@ export function createGitHubClient(config) {
       return mapGitHubComment(payload);
     },
 
+    async postPullRequestComment(repoUrl, pullNumber, body) {
+      return this.postIssueComment(repoUrl, pullNumber, body);
+    },
+
     async createIssueReaction(repoUrl, issueNumber, content = "eyes") {
       const repo = parseGitHubRepoUrl(repoUrl);
       return requestGitHub(
@@ -184,6 +188,10 @@ export function createGitHubClient(config) {
       );
     },
 
+    async createPullRequestCommentReaction(repoUrl, commentId, content = "eyes", pullNumber = "") {
+      return this.createIssueCommentReaction(repoUrl, commentId, content, pullNumber);
+    },
+
     async isRepoCollaborator(repoUrl, username) {
       const repo = parseGitHubRepoUrl(repoUrl);
       const response = await fetch(

package/src/forge/gitlab.js

@@ -145,6 +145,15 @@ export function createGitLabClient(config) {
       return mapGitLabComment(payload);
     },
 
+    async postPullRequestComment(repoUrl, pullNumber, body) {
+      const repo = parseGitLabRepoUrl(repoUrl);
+      const payload = await requestGitLabProject(config, repo, mergeRequestNotePath(pullNumber), {
+        method: "POST",
+        body: { body }
+      });
+      return mapGitLabComment(payload);
+    },
+
     async createIssueReaction(repoUrl, issueNumber, content = "eyes") {
       const repo = parseGitLabRepoUrl(repoUrl);
       return requestGitLabProject(config, repo, `${issueNotePath(issueNumber)}/award_emoji`, {
@@ -159,7 +168,7 @@ export function createGitLabClient(config) {
       const repo = parseGitLabRepoUrl(repoUrl);
       const body = { name: mapReaction(content) };
       const candidates = [
-        projectPath(repo, `/merge_requests/${issueNumber}/notes/${commentId}/award_emoji`),
+        projectPath(repo, `${mergeRequestNotePath(issueNumber)}/${commentId}/award_emoji`),
         projectPath(repo, `/issues/${issueNumber}/notes/${commentId}/award_emoji`)
       ];
 
@@ -179,6 +188,17 @@ export function createGitLabClient(config) {
       throw lastError;
     },
 
+    async createPullRequestCommentReaction(repoUrl, commentId, content = "eyes", pullNumber = "") {
+      const repo = parseGitLabRepoUrl(repoUrl);
+      return requestGitLab(config, projectPath(repo, `${mergeRequestNotePath(pullNumber)}/${commentId}/award_emoji`), {
+        baseUrl: `${repo.origin}/`,
+        method: "POST",
+        body: {
+          name: mapReaction(content)
+        }
+      });
+    },
+
     async isRepoCollaborator(repoUrl, username) {
       const repo = parseGitLabRepoUrl(repoUrl);
       const users = await requestGitLab(config, "/api/v4/users", {
@@ -365,6 +385,10 @@ function issueNotePath(issueNumber) {
   return `/issues/${issueNumber}/notes`;
 }
 
+function mergeRequestNotePath(pullNumber) {
+  return `/merge_requests/${pullNumber}/notes`;
+}
+
 function requestGitLabProject(config, repo, suffix = "", init = {}) {
   return requestGitLab(config, projectPath(repo, suffix), {
     ...init,

package/src/repo.js

@@ -238,7 +238,7 @@ async function execGit(repoPath, args) {
     await execFileAsync("git", args, {
       cwd: repoPath,
       maxBuffer: 10 * 1024 * 1024,
-      env: buildGitEnvForRepoUrl()
+      env: await resolveRepoGitEnv(repoPath)
     });
   } catch (error) {
     throw formatGitExecError(error);
@@ -250,7 +250,7 @@ async function execGitOutput(repoPath, args) {
     const { stdout } = await execFileAsync("git", args, {
       cwd: repoPath,
       maxBuffer: 10 * 1024 * 1024,
-      env: buildGitEnvForRepoUrl()
+      env: await resolveRepoGitEnv(repoPath)
     });
     return String(stdout || "");
   } catch (error) {
@@ -259,11 +259,35 @@ async function execGitOutput(repoPath, args) {
 }
 
 async function branchHasChangesAgainstMain(repoPath) {
-  const output = await execGitOutput(repoPath, ["rev-list", "--count", "origin/main..HEAD"]);
+  const defaultBranch = await resolveRemoteDefaultBranch(repoPath);
+  const output = await execGitOutput(repoPath, ["rev-list", "--count", `origin/${defaultBranch}..HEAD`]);
   const count = Number.parseInt(output.trim(), 10);
   return Number.isFinite(count) && count > 0;
 }
 
+async function resolveRemoteDefaultBranch(repoPath) {
+  try {
+    const output = await execGitOutput(repoPath, ["symbolic-ref", "refs/remotes/origin/HEAD"]);
+    const match = /refs\/remotes\/origin\/(.+)\s*$/u.exec(output);
+    if (match?.[1]) {
+      return match[1];
+    }
+  } catch {
+    // Fall through to ls-remote when origin/HEAD is unavailable locally.
+  }
+
+  try {
+    const output = await execGitOutput(repoPath, ["ls-remote", "--symref", "origin", "HEAD"]);
+    const match = /^ref:\s+refs\/heads\/([^\s]+)\s+HEAD$/mu.exec(output);
+    if (match?.[1]) {
+      return match[1];
+    }
+  } catch {
+    // Fall back to main when the remote HEAD cannot be resolved.
+  }
+  return "main";
+}
+
 async function initializeRemoteDefaultBranch(repoPath, baseBranch) {
   await execGit(repoPath, ["checkout", "--orphan", baseBranch]);
   await execGit(repoPath, [
@@ -298,3 +322,21 @@ function isMissingRemoteBranchError(error) {
   const message = error instanceof Error ? error.message : String(error);
   return /couldn't find remote ref /u.test(message);
 }
+
+async function resolveRepoGitEnv(repoPath) {
+  const remoteUrl = await readGitRemoteUrl(repoPath);
+  return buildGitEnvForRepoUrl(remoteUrl);
+}
+
+async function readGitRemoteUrl(repoPath) {
+  try {
+    const { stdout } = await execFileAsync("git", ["config", "--get", "remote.origin.url"], {
+      cwd: repoPath,
+      maxBuffer: 1024 * 1024,
+      env: buildGitEnvForRepoUrl()
+    });
+    return String(stdout || "").trim();
+  } catch {
+    return "";
+  }
+}