paperclip-github-plugin 0.5.2 → 0.5.3

package/README.md

@@ -154,7 +154,7 @@ Additional behavior:
 - Sync-driven handoffs to agent assignees best-effort enqueue an explicit wakeup so the next reviewer, approver, or executor can pick the issue up even when their agent is not running heartbeats.
 - Open imported issues that are already in `backlog` stay in `backlog` until someone changes them in Paperclip.
 - If an imported issue is `done` or `cancelled` and GitHub shows it open again with no linked pull request, sync moves it to `todo` so agents can pick it up again.
-- Trusted new GitHub comments from the original issue author or a verified maintainer/admin can move an open imported issue back into active work, using `in_progress` when GitHub Sync can route the issue to an executor and otherwise `todo`.
+- Trusted new GitHub comments from the original issue author or a verified maintainer/admin can move an open imported issue back into active work, whether the new comment lands on the source issue, in a linked pull request's top-level comment stream, or in a linked pull request review thread; GitHub Sync uses `in_progress` when it can route the issue to an executor and otherwise `todo`.
 - When the sync changes a Paperclip issue status, it adds a Paperclip comment explaining what changed and why.
 
 ## Security and authentication

package/dist/manifest.js

@@ -511,7 +511,7 @@ var require2 = createRequire(import.meta.url);
 var packageJson = require2("../package.json");
 var DASHBOARD_WIDGET_CAPABILITY = "ui.dashboardWidget.register";
 var SCHEDULE_TICK_CRON = "* * * * *";
-var MANIFEST_VERSION = "0.5.2"?.trim() || typeof packageJson.version === "string" && packageJson.version.trim() || process.env.npm_package_version?.trim() || "0.0.0-dev";
+var MANIFEST_VERSION = "0.5.3"?.trim() || typeof packageJson.version === "string" && packageJson.version.trim() || process.env.npm_package_version?.trim() || "0.0.0-dev";
 var manifest = {
   id: "paperclip-github-plugin",
   apiVersion: 1,

package/dist/worker.js

@@ -3722,6 +3722,9 @@ function normalizeImportRegistry(value) {
     const paperclipProjectId = typeof record.paperclipProjectId === "string" && record.paperclipProjectId.trim() ? record.paperclipProjectId.trim() : void 0;
     const companyId = typeof record.companyId === "string" && record.companyId.trim() ? record.companyId.trim() : void 0;
     const lastSeenCommentCount = typeof record.lastSeenCommentCount === "number" && record.lastSeenCommentCount >= 0 ? Math.floor(record.lastSeenCommentCount) : void 0;
+    const linkedPullRequestCommentCounts = normalizeGitHubPullRequestCommentCountRecords(
+      record.linkedPullRequestCommentCounts
+    );
     if (!mappingId || Number.isNaN(githubIssueId) || !paperclipIssueId || !importedAt) {
       return null;
     }
@@ -3734,7 +3737,8 @@ function normalizeImportRegistry(value) {
       ...repositoryUrl ? { repositoryUrl } : {},
       ...paperclipProjectId ? { paperclipProjectId } : {},
       ...companyId ? { companyId } : {},
-      ...lastSeenCommentCount !== void 0 ? { lastSeenCommentCount } : {}
+      ...lastSeenCommentCount !== void 0 ? { lastSeenCommentCount } : {},
+      ...linkedPullRequestCommentCounts.length > 0 ? { linkedPullRequestCommentCounts } : {}
     };
   }).filter((entry) => entry !== null);
 }
@@ -3780,6 +3784,7 @@ function buildImportedIssueRecord(mapping, issue, paperclipIssueId, importedAt)
     paperclipIssueId,
     importedAt,
     lastSeenCommentCount: issue.commentsCount,
+    linkedPullRequestCommentCounts: [],
     repositoryUrl: getNormalizedMappingRepositoryUrl(mapping),
     paperclipProjectId: mapping.paperclipProjectId,
     companyId: mapping.companyId
@@ -4612,7 +4617,7 @@ function buildSyncFallbackExecutionStatePatch(params) {
   return void 0;
 }
 function describeGitHubStatusTransitionReason(params) {
-  const { snapshot, previousCommentCount, hasTrustedNewComment, maintainerAuthoredImportedIssue } = params;
+  const { snapshot, hasTrustedNewComment, maintainerAuthoredImportedIssue } = params;
   if (snapshot.state === "closed") {
     switch (snapshot.stateReason) {
       case "duplicate":
@@ -4623,8 +4628,7 @@ function describeGitHubStatusTransitionReason(params) {
         return "the GitHub issue was closed as completed work";
     }
   }
-  const baselineCommentCount = previousCommentCount ?? snapshot.commentCount;
-  if (snapshot.commentCount > baselineCommentCount && hasTrustedNewComment) {
+  if (hasTrustedNewComment) {
     return "a new GitHub comment from the issue author or a repository maintainer was added";
   }
   if (snapshot.linkedPullRequests.length === 0) {
@@ -4675,13 +4679,11 @@ function buildPaperclipIssueStatusTransitionComment(params) {
     nextStatus,
     repository,
     snapshot,
-    previousCommentCount,
     hasTrustedNewComment,
     maintainerAuthoredImportedIssue
   } = params;
   const reason = describeGitHubStatusTransitionReason({
     snapshot,
-    previousCommentCount,
     hasTrustedNewComment,
     maintainerAuthoredImportedIssue
   });
@@ -4700,7 +4702,6 @@ function resolvePaperclipIssueStatus(params) {
   const {
     currentStatus,
     snapshot,
-    previousCommentCount,
     hasTrustedNewComment,
     wasImportedThisRun,
     defaultImportedStatus,
@@ -4713,8 +4714,7 @@ function resolvePaperclipIssueStatus(params) {
   if (currentStatus === "backlog" && !wasImportedThisRun) {
     return "backlog";
   }
-  const baselineCommentCount = previousCommentCount ?? snapshot.commentCount;
-  if (snapshot.commentCount > baselineCommentCount && hasTrustedNewComment) {
+  if (hasTrustedNewComment) {
     return hasExecutorHandoffTarget ? "in_progress" : "todo";
   }
   if (snapshot.linkedPullRequests.length > 0) {
@@ -5214,25 +5214,58 @@ async function listNewGitHubIssueCommentsSinceCount(octokit, repository, issueNu
   }
   return comments;
 }
-async function hasTrustedNewGitHubIssueComment(params) {
-  const normalizedPreviousCommentCount = typeof params.previousCommentCount === "number" && params.previousCommentCount >= 0 ? Math.floor(params.previousCommentCount) : params.currentCommentCount;
-  const normalizedCurrentCommentCount = Math.max(0, Math.floor(params.currentCommentCount));
+async function listNewGitHubPullRequestReviewCommentsSinceCount(octokit, repository, pullRequestNumber, previousCommentCount, currentCommentCount) {
+  const normalizedPreviousCommentCount = Math.max(0, Math.floor(previousCommentCount));
+  const normalizedCurrentCommentCount = Math.max(0, Math.floor(currentCommentCount));
   if (normalizedCurrentCommentCount <= normalizedPreviousCommentCount) {
-    return false;
+    return [];
   }
-  const newComments = await listNewGitHubIssueCommentsSinceCount(
-    params.octokit,
-    params.repository,
-    params.githubIssue.number,
-    normalizedPreviousCommentCount,
-    normalizedCurrentCommentCount
-  );
-  if (newComments.length === 0) {
-    return false;
+  const newCommentCount = normalizedCurrentCommentCount - normalizedPreviousCommentCount;
+  const comments = [];
+  const perPage = 100;
+  let page = Math.floor(normalizedPreviousCommentCount / perPage) + 1;
+  let remainingOffset = normalizedPreviousCommentCount % perPage;
+  while (comments.length < newCommentCount) {
+    const response = await octokit.rest.pulls.listReviewComments({
+      owner: repository.owner,
+      repo: repository.repo,
+      pull_number: pullRequestNumber,
+      page,
+      per_page: perPage,
+      headers: {
+        accept: "application/vnd.github+json",
+        "X-GitHub-Api-Version": GITHUB_API_VERSION
+      }
+    });
+    if (response.data.length === 0) {
+      break;
+    }
+    for (const comment of response.data.slice(remainingOffset)) {
+      comments.push({
+        id: comment.id,
+        body: typeof comment.body === "string" ? stripNullBytes(comment.body) : "",
+        url: comment.html_url ?? void 0,
+        authorLogin: normalizeGitHubUserLogin(comment.user?.login),
+        ...normalizeGitHubLowercaseString(comment.author_association) ? { authorAssociation: normalizeGitHubLowercaseString(comment.author_association) } : {},
+        createdAt: comment.created_at ?? void 0,
+        updatedAt: comment.updated_at ?? void 0
+      });
+      if (comments.length >= newCommentCount) {
+        break;
+      }
+    }
+    if (response.data.length < perPage) {
+      break;
+    }
+    page += 1;
+    remainingOffset = 0;
   }
-  const originalPosterLogin = normalizeGitHubUserLogin(params.githubIssue.authorLogin);
+  return comments;
+}
+async function hasTrustedGitHubCommentRecords(params) {
+  const originalPosterLogin = normalizeGitHubUserLogin(params.originalPosterLogin);
   const unseenAuthors = /* @__PURE__ */ new Set();
-  for (const comment of newComments) {
+  for (const comment of params.comments) {
     const authorLogin = normalizeGitHubUserLogin(comment.authorLogin);
     if (!authorLogin) {
       continue;
@@ -5266,6 +5299,122 @@ async function hasTrustedNewGitHubIssueComment(params) {
   }
   return false;
 }
+async function hasTrustedNewGitHubIssueComment(params) {
+  const normalizedPreviousCommentCount = typeof params.previousCommentCount === "number" && params.previousCommentCount >= 0 ? Math.floor(params.previousCommentCount) : params.currentCommentCount;
+  const normalizedCurrentCommentCount = Math.max(0, Math.floor(params.currentCommentCount));
+  if (normalizedCurrentCommentCount <= normalizedPreviousCommentCount) {
+    return false;
+  }
+  const newComments = await listNewGitHubIssueCommentsSinceCount(
+    params.octokit,
+    params.repository,
+    params.githubIssue.number,
+    normalizedPreviousCommentCount,
+    normalizedCurrentCommentCount
+  );
+  if (newComments.length === 0) {
+    return false;
+  }
+  return hasTrustedGitHubCommentRecords({
+    octokit: params.octokit,
+    repository: params.repository,
+    comments: newComments,
+    originalPosterLogin: params.githubIssue.authorLogin,
+    maintainerCache: params.maintainerCache
+  });
+}
+async function getGitHubPullRequestCommentCountRecord(octokit, repository, pullRequestNumber, cache) {
+  const pullRequestReference = {
+    number: pullRequestNumber,
+    repositoryUrl: repository.url
+  };
+  const cacheKey = buildGitHubPullRequestReferenceKey(pullRequestReference);
+  const cachedRecord = cache.get(cacheKey);
+  if (cachedRecord) {
+    return cachedRecord;
+  }
+  const response = await octokit.rest.pulls.get({
+    owner: repository.owner,
+    repo: repository.repo,
+    pull_number: pullRequestNumber,
+    headers: {
+      "X-GitHub-Api-Version": GITHUB_API_VERSION
+    }
+  });
+  const record = {
+    ...pullRequestReference,
+    topLevelCommentCount: typeof response.data.comments === "number" && response.data.comments >= 0 ? Math.floor(response.data.comments) : 0,
+    reviewCommentCount: typeof response.data.review_comments === "number" && response.data.review_comments >= 0 ? Math.floor(response.data.review_comments) : 0
+  };
+  cache.set(cacheKey, record);
+  return record;
+}
+async function listGitHubPullRequestCommentCountRecords(octokit, linkedPullRequests, cache) {
+  const commentCounts = [];
+  for (const pullRequest of linkedPullRequests) {
+    commentCounts.push(
+      await getGitHubPullRequestCommentCountRecord(
+        octokit,
+        requireRepositoryReference(pullRequest.repositoryUrl),
+        pullRequest.number,
+        cache
+      )
+    );
+  }
+  return normalizeGitHubPullRequestCommentCountRecords(commentCounts);
+}
+async function hasTrustedNewLinkedPullRequestComments(params) {
+  if ((params.currentCommentCounts?.length ?? 0) === 0 || (params.previousCommentCounts?.length ?? 0) === 0) {
+    return false;
+  }
+  const previousCommentCountsByKey = new Map(
+    (params.previousCommentCounts ?? []).map((record) => [buildGitHubPullRequestReferenceKey(record), record])
+  );
+  for (const currentCommentCount of params.currentCommentCounts) {
+    const previousCommentCount = previousCommentCountsByKey.get(buildGitHubPullRequestReferenceKey(currentCommentCount));
+    if (!previousCommentCount) {
+      continue;
+    }
+    const pullRequestRepository = requireRepositoryReference(currentCommentCount.repositoryUrl);
+    if (currentCommentCount.topLevelCommentCount > previousCommentCount.topLevelCommentCount) {
+      const newTopLevelComments = await listNewGitHubIssueCommentsSinceCount(
+        params.octokit,
+        pullRequestRepository,
+        currentCommentCount.number,
+        previousCommentCount.topLevelCommentCount,
+        currentCommentCount.topLevelCommentCount
+      );
+      if (await hasTrustedGitHubCommentRecords({
+        octokit: params.octokit,
+        repository: pullRequestRepository,
+        comments: newTopLevelComments,
+        originalPosterLogin: params.githubIssue.authorLogin,
+        maintainerCache: params.maintainerCache
+      })) {
+        return true;
+      }
+    }
+    if (currentCommentCount.reviewCommentCount > previousCommentCount.reviewCommentCount) {
+      const newReviewComments = await listNewGitHubPullRequestReviewCommentsSinceCount(
+        params.octokit,
+        pullRequestRepository,
+        currentCommentCount.number,
+        previousCommentCount.reviewCommentCount,
+        currentCommentCount.reviewCommentCount
+      );
+      if (await hasTrustedGitHubCommentRecords({
+        octokit: params.octokit,
+        repository: pullRequestRepository,
+        comments: newReviewComments,
+        originalPosterLogin: params.githubIssue.authorLogin,
+        maintainerCache: params.maintainerCache
+      })) {
+        return true;
+      }
+    }
+  }
+  return false;
+}
 async function isMaintainerAuthoredGitHubIssue(params) {
   const authorLogin = normalizeGitHubUserLogin(params.githubIssue.authorLogin);
   if (!authorLogin) {
@@ -5375,6 +5524,41 @@ function normalizeLinkedPullRequestNumbers(values) {
 function buildGitHubPullRequestReferenceKey(pullRequest) {
   return `${getNormalizedMappingRepositoryUrl({ repositoryUrl: pullRequest.repositoryUrl }).toLowerCase()}#${Math.max(1, Math.floor(pullRequest.number))}`;
 }
+function normalizeGitHubPullRequestCommentCountRecords(value) {
+  if (!Array.isArray(value)) {
+    return [];
+  }
+  const recordsByKey = /* @__PURE__ */ new Map();
+  for (const entry of value) {
+    if (!entry || typeof entry !== "object") {
+      continue;
+    }
+    const record = entry;
+    const pullRequestNumber = typeof record.number === "number" && Number.isInteger(record.number) && record.number > 0 ? Math.floor(record.number) : void 0;
+    const repositoryUrl = typeof record.repositoryUrl === "string" && record.repositoryUrl.trim() ? getNormalizedMappingRepositoryUrl({
+      repositoryUrl: record.repositoryUrl
+    }) : void 0;
+    const topLevelCommentCount = typeof record.topLevelCommentCount === "number" && record.topLevelCommentCount >= 0 ? Math.floor(record.topLevelCommentCount) : void 0;
+    const reviewCommentCount = typeof record.reviewCommentCount === "number" && record.reviewCommentCount >= 0 ? Math.floor(record.reviewCommentCount) : void 0;
+    if (pullRequestNumber === void 0 || !repositoryUrl || topLevelCommentCount === void 0 || reviewCommentCount === void 0) {
+      continue;
+    }
+    const normalizedRecord = {
+      number: pullRequestNumber,
+      repositoryUrl,
+      topLevelCommentCount,
+      reviewCommentCount
+    };
+    recordsByKey.set(buildGitHubPullRequestReferenceKey(normalizedRecord), normalizedRecord);
+  }
+  return [...recordsByKey.values()].sort((left, right) => {
+    const repositoryComparison = left.repositoryUrl.toLowerCase().localeCompare(right.repositoryUrl.toLowerCase());
+    if (repositoryComparison !== 0) {
+      return repositoryComparison;
+    }
+    return left.number - right.number;
+  });
+}
 function normalizeLinkedPullRequestReferences(values, fallbackRepositoryUrl) {
   const references = [];
   const seenKeys = /* @__PURE__ */ new Set();
@@ -7172,6 +7356,7 @@ async function synchronizePaperclipIssueStatuses(ctx, octokit, repository, mappi
   let completedIssueCount = 0;
   const totalIssueCount = importedIssues.length;
   const queuedIssueWakeups = [];
+  const pullRequestCommentCountCache = /* @__PURE__ */ new Map();
   for (const importedIssue of importedIssues) {
     if (assertNotCancelled) {
       await assertNotCancelled();
@@ -7278,8 +7463,8 @@ async function synchronizePaperclipIssueStatuses(ctx, octokit, repository, mappi
         snapshot.linkedPullRequests
       );
       const previousCommentCount = importedIssue.lastSeenCommentCount;
-      const hasNewComments = snapshot.commentCount > (previousCommentCount ?? snapshot.commentCount);
-      const hasTrustedNewComment = paperclipIssue.status === "backlog" || !hasNewComments ? false : await hasTrustedNewGitHubIssueComment({
+      const hasNewIssueComments = snapshot.commentCount > (previousCommentCount ?? snapshot.commentCount);
+      const hasTrustedNewIssueComment = paperclipIssue.status === "backlog" || !hasNewIssueComments ? false : await hasTrustedNewGitHubIssueComment({
         octokit,
         repository,
         githubIssue,
@@ -7287,6 +7472,28 @@ async function synchronizePaperclipIssueStatuses(ctx, octokit, repository, mappi
         currentCommentCount: snapshot.commentCount,
         maintainerCache: repositoryMaintainerCache
       });
+      let currentLinkedPullRequestCommentCounts = snapshot.linkedPullRequests.length === 0 ? [] : importedIssue.linkedPullRequestCommentCounts ?? [];
+      if (snapshot.linkedPullRequests.length > 0) {
+        try {
+          currentLinkedPullRequestCommentCounts = await listGitHubPullRequestCommentCountRecords(
+            octokit,
+            snapshot.linkedPullRequests,
+            pullRequestCommentCountCache
+          );
+        } catch (error) {
+          if (isGitHubRateLimitError(error)) {
+            throw error;
+          }
+        }
+      }
+      const hasTrustedNewLinkedPullRequestComment = paperclipIssue.status === "backlog" || currentLinkedPullRequestCommentCounts.length === 0 ? false : await hasTrustedNewLinkedPullRequestComments({
+        octokit,
+        githubIssue,
+        previousCommentCounts: importedIssue.linkedPullRequestCommentCounts,
+        currentCommentCounts: currentLinkedPullRequestCommentCounts,
+        maintainerCache: repositoryMaintainerCache
+      });
+      const hasTrustedNewComment = hasTrustedNewIssueComment || hasTrustedNewLinkedPullRequestComment;
       const wasImportedThisRun = createdIssueIds.has(importedIssue.githubIssueId);
       const maintainerAuthoredImportedIssue = wasImportedThisRun && advancedSettings.defaultStatus !== "todo" && snapshot.state === "open" && snapshot.linkedPullRequests.length === 0 ? await isMaintainerAuthoredGitHubIssue({
         octokit,
@@ -7302,7 +7509,6 @@ async function synchronizePaperclipIssueStatuses(ctx, octokit, repository, mappi
       const nextStatus = resolvePaperclipIssueStatus({
         currentStatus: paperclipIssue.status,
         snapshot,
-        previousCommentCount,
         hasTrustedNewComment,
         wasImportedThisRun,
         defaultImportedStatus: advancedSettings.defaultStatus,
@@ -7320,6 +7526,7 @@ async function synchronizePaperclipIssueStatuses(ctx, octokit, repository, mappi
       const shouldWakeTransitionAssignee = paperclipIssue.status !== nextStatus && nextTransitionAssignee?.principal.kind === "agent" && isActionablePaperclipIssueStatus(nextStatus) && (nextAssigneeChanged || paperclipIssue.status !== nextStatus);
       importedIssue.githubIssueNumber = githubIssue.number;
       importedIssue.lastSeenCommentCount = snapshot.commentCount;
+      importedIssue.linkedPullRequestCommentCounts = currentLinkedPullRequestCommentCounts;
       if (paperclipIssue.status === nextStatus) {
         if (shouldClearTransitionAssignee) {
           updateSyncFailureContext(syncFailureContext, {
@@ -7353,7 +7560,6 @@ async function synchronizePaperclipIssueStatuses(ctx, octokit, repository, mappi
         nextStatus,
         repository,
         snapshot,
-        previousCommentCount,
         hasTrustedNewComment,
         maintainerAuthoredImportedIssue
       });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "paperclip-github-plugin",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "description": "Paperclip plugin for synchronizing GitHub issues into Paperclip projects.",
   "license": "Apache-2.0",
   "type": "module",