claude-teammate 0.1.34 → 0.1.36

package/package.json

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

package/src/commands/worker.js

@@ -27,7 +27,7 @@ import {
 } from "../memory.js";
 import {
   commitAndPushRepoChanges,
-  ensureBranchFromMain,
+  ensureBranchFromDefault,
   hasUsableGitCheckout,
   listMissingRepoPaths,
   parseGitHubRepoUrl,
@@ -612,6 +612,25 @@ async function processGitHubIssue({ repo, issue, projectRoot, github, githubBotU
     return buildGitHubIssueState(detail, githubIssueMemory, null);
   }
 
+  if (hasPlusOneReaction(latestComment)) {
+    return buildGitHubIssueState(detail, githubIssueMemory, null);
+  }
+
+  try {
+    const isMember = await github.isRepoCollaborator(repo.url, latestComment.author.login);
+    if (!isMember) {
+      await github.createIssueCommentReaction(repo.url, latestComment.id, "+1");
+      return buildGitHubIssueState(detail, githubIssueMemory, null);
+    }
+  } catch (error) {
+    await logger.error("Failed to check GitHub collaborator status", {
+      repo: repo.url,
+      author: latestComment.author.login,
+      error: String(error)
+    });
+    return buildGitHubIssueState(detail, githubIssueMemory, null);
+  }
+
   const approvalComment = isApprovalComment(latestComment.body);
 
   if (approvalComment) {
@@ -658,12 +677,13 @@ async function processGitHubIssue({ repo, issue, projectRoot, github, githubBotU
         return buildGitHubIssueState(detail, githubIssueMemory, "blocked");
       }
 
-      await ensureBranchFromMain(githubIssueMemory.local_path, nextBranchName);
+      const defaultBranch = await github.getDefaultBranch(githubIssueMemory.repo_url);
+      await ensureBranchFromDefault(githubIssueMemory.local_path, nextBranchName, defaultBranch);
       const pullRequest = await github.createPullRequest(githubIssueMemory.repo_url, {
         title: detail.title,
         body: buildInitialPullRequestBody(detail.number, detail.body),
         head: nextBranchName,
-        base: "main",
+        base: defaultBranch,
         draft: true
       });
       githubIssueMemory.pr_url = pullRequest.url;
@@ -836,6 +856,25 @@ async function processTrackedPullRequest({ projectRoot, repo, pullRequest, githu
     return buildDraftPrState(detail, currentStatus, null);
   }
 
+  if (hasPlusOneReaction(latestComment)) {
+    return buildDraftPrState(detail, currentStatus, null);
+  }
+
+  try {
+    const isMember = await github.isRepoCollaborator(repo.url, latestComment.author.login);
+    if (!isMember) {
+      await github.createIssueCommentReaction(repo.url, latestComment.id, "+1");
+      return buildDraftPrState(detail, currentStatus, null);
+    }
+  } catch (error) {
+    await logger.error("Failed to check GitHub collaborator status", {
+      repo: repo.url,
+      author: latestComment.author.login,
+      error: String(error)
+    });
+    return buildDraftPrState(detail, currentStatus, null);
+  }
+
   const commentReviewRepoAccess = await buildPullRequestRepoAccessPlan({
     repo,
     pullRequestBody: detail.body || "",
@@ -1681,6 +1720,10 @@ function hasEyesReaction(comment) {
   return Number(comment?.reactions?.eyes ?? 0) > 0;
 }
 
+export function hasPlusOneReaction(comment) {
+  return Number(comment?.reactions?.plusOne ?? 0) > 0;
+}
+
 function formatClarificationQuestions(questions) {
   const cleanedQuestions = questions.filter(Boolean);
   if (cleanedQuestions.length === 0) {

package/src/github.js

@@ -181,6 +181,28 @@ export function createGitHubClient(config) {
       );
     },
 
+    async isRepoCollaborator(repoUrl, username) {
+      const repo = parseGitHubRepoUrl(repoUrl);
+      const response = await fetch(
+        `https://api.github.com/repos/${repo.owner}/${repo.name}/collaborators/${encodeURIComponent(username)}`,
+        {
+          headers: {
+            Accept: "application/vnd.github+json",
+            Authorization: `Bearer ${config.GITHUB_PAT}`,
+            "User-Agent": "claude-teammate"
+          }
+        }
+      );
+      if (response.status === 204) {
+        return true;
+      }
+      if (response.status === 404) {
+        return false;
+      }
+      const body = await response.text();
+      throw new Error(`GitHub collaborator check failed with status ${response.status}: ${body}`);
+    },
+
     async updatePullRequest(repoUrl, pullNumber, updates) {
       const repo = parseGitHubRepoUrl(repoUrl);
       const payload = await requestGitHub(
@@ -257,6 +279,17 @@ export function createGitHubClient(config) {
       };
     },
 
+    async getDefaultBranch(repoUrl) {
+      const repo = parseGitHubRepoUrl(repoUrl);
+      const payload = await requestGitHub(
+        `https://api.github.com/repos/${repo.owner}/${repo.name}`,
+        config,
+        { method: "GET" },
+        repo
+      );
+      return payload.default_branch;
+    },
+
     async createPullRequest(repoUrl, pullRequest) {
       const repo = parseGitHubRepoUrl(repoUrl);
       const payload = await requestGitHub(
@@ -355,7 +388,8 @@ function mapGitHubComment(payload) {
     createdAt: payload.created_at ?? null,
     updatedAt: payload.updated_at ?? null,
     reactions: {
-      eyes: Number(payload.reactions?.eyes ?? 0)
+      eyes: Number(payload.reactions?.eyes ?? 0),
+      plusOne: Number(payload.reactions?.["+1"] ?? 0)
     },
     author: {
       login: payload.user?.login ?? null,

package/src/repo.js

@@ -54,18 +54,18 @@ export async function validateOrEnsureLocalRepo(repoUrl, reposDir, localPath = "
   return ensureLocalRepo(repoUrl, reposDir);
 }
 
-export async function ensureBranchFromMain(repoPath, branchName) {
+export async function ensureBranchFromDefault(repoPath, branchName, baseBranch) {
   try {
-    await execGit(repoPath, ["fetch", "origin", "main", "--prune"]);
+    await execGit(repoPath, ["fetch", "origin", baseBranch, "--prune"]);
   } catch (error) {
-    if (!isMissingRemoteMainError(error)) {
+    if (!isMissingRemoteBranchError(error)) {
       throw error;
     }
 
-    await initializeRemoteMainBranch(repoPath);
+    await initializeRemoteDefaultBranch(repoPath, baseBranch);
   }
 
-  await execGit(repoPath, ["checkout", "-B", branchName, "origin/main"]);
+  await execGit(repoPath, ["checkout", "-B", branchName, `origin/${baseBranch}`]);
   await execGit(repoPath, [
     "-c",
     "user.name=Claude Teammate",
@@ -79,6 +79,10 @@ export async function ensureBranchFromMain(repoPath, branchName) {
   await execGit(repoPath, ["push", "-u", "origin", branchName]);
 }
 
+export async function ensureBranchFromMain(repoPath, branchName) {
+  return ensureBranchFromDefault(repoPath, branchName, "main");
+}
+
 export async function prepareRepoForBranch(repoPath, branchName) {
   await execGit(repoPath, ["fetch", "origin", branchName, "--prune"]);
   await execGit(repoPath, ["reset", "--hard"]);
@@ -211,8 +215,8 @@ async function branchHasChangesAgainstMain(repoPath) {
   return Number.isFinite(count) && count > 0;
 }
 
-async function initializeRemoteMainBranch(repoPath) {
-  await execGit(repoPath, ["checkout", "--orphan", "main"]);
+async function initializeRemoteDefaultBranch(repoPath, baseBranch) {
+  await execGit(repoPath, ["checkout", "--orphan", baseBranch]);
   await execGit(repoPath, [
     "-c",
     "user.name=Claude Teammate",
@@ -221,9 +225,9 @@ async function initializeRemoteMainBranch(repoPath) {
     "commit",
     "--allow-empty",
     "-m",
-    "Initialize main"
+    `Initialize ${baseBranch}`
   ]);
-  await execGit(repoPath, ["push", "-u", "origin", "main"]);
+  await execGit(repoPath, ["push", "-u", "origin", baseBranch]);
 }
 
 function formatGitExecError(error) {
@@ -241,9 +245,9 @@ function formatGitExecError(error) {
   return new Error(`${message}\n${detail}`);
 }
 
-function isMissingRemoteMainError(error) {
+function isMissingRemoteBranchError(error) {
   const message = error instanceof Error ? error.message : String(error);
-  return /couldn't find remote ref main/u.test(message);
+  return /couldn't find remote ref /u.test(message);
 }
 
 function parseGitHubPath(rawPath) {