@staff0rd/assist 0.25.0 → 0.26.0

package/dist/index.js

@@ -81,7 +81,7 @@ function commit(message) {
     execSync(`git commit -m "${message.replace(/"/g, '\\"')}"`, {
       stdio: "inherit"
     });
-    const sha = execSync("git rev-parse --short=6 HEAD", {
+    const sha = execSync("git rev-parse --short=7 HEAD", {
       encoding: "utf-8"
     }).trim();
     console.log(`Committed: ${sha}`);
@@ -2113,7 +2113,7 @@ function printComments(comments) {
   }
 }
 function fetchThreadIds(org, repo, prNumber) {
-  const query = `query($owner: String!, $repo: String!, $prNumber: Int!) { repository(owner: $owner, name: $repo) { pullRequest(number: $prNumber) { reviewThreads(first: 100) { nodes { id comments(first: 100) { nodes { databaseId } } } } } } }`;
+  const query = `query($owner: String!, $repo: String!, $prNumber: Int!) { repository(owner: $owner, name: $repo) { pullRequest(number: $prNumber) { reviewThreads(first: 100) { nodes { id isResolved comments(first: 100) { nodes { databaseId } } } } } } }`;
   const queryFile = join9(tmpdir(), `gh-query-${Date.now()}.graphql`);
   writeFileSync9(queryFile, query);
   try {
@@ -2123,12 +2123,16 @@ function fetchThreadIds(org, repo, prNumber) {
     );
     const response = JSON.parse(result);
     const threadMap = /* @__PURE__ */ new Map();
+    const resolvedThreadIds = /* @__PURE__ */ new Set();
     for (const thread of response.data.repository.pullRequest.reviewThreads.nodes) {
+      if (thread.isResolved) {
+        resolvedThreadIds.add(thread.id);
+      }
       for (const comment of thread.comments.nodes) {
         threadMap.set(comment.databaseId, thread.id);
       }
     }
-    return threadMap;
+    return { threadMap, resolvedThreadIds };
   } finally {
     unlinkSync2(queryFile);
   }
@@ -2151,7 +2155,11 @@ async function listComments() {
     const prNumber = getCurrentPrNumber();
     const { org, repo } = getRepoInfo();
     const allComments = [];
-    const threadMap = fetchThreadIds(org, repo, prNumber);
+    const { threadMap, resolvedThreadIds } = fetchThreadIds(
+      org,
+      repo,
+      prNumber
+    );
     const reviewResult = execSync12(
       `gh api repos/${org}/${repo}/pulls/${prNumber}/reviews`,
       { encoding: "utf-8" }
@@ -2177,10 +2185,14 @@ async function listComments() {
     if (lineResult.trim()) {
       const lineComments = JSON.parse(lineResult);
       for (const comment of lineComments) {
+        const threadId = threadMap.get(comment.id) ?? "";
+        if (resolvedThreadIds.has(threadId)) {
+          continue;
+        }
         allComments.push({
           type: "line",
           id: comment.id,
-          threadId: threadMap.get(comment.id) ?? "",
+          threadId,
           user: comment.user.login,
           path: comment.path,
           line: comment.line,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@staff0rd/assist",
-	"version": "0.25.0",
+	"version": "0.26.0",
 	"type": "module",
 	"main": "dist/index.js",
 	"bin": {