azdo-cli 0.5.0-017-pr-comments-threads.238 → 0.5.0-017-pr-comments-threads.242

package/dist/index.js

@@ -2340,7 +2340,7 @@ function mapPullRequest(repo, pullRequest) {
     targetRefName: pullRequest.targetRefName,
     status: pullRequest.status,
     createdBy: pullRequest.createdBy?.displayName ?? null,
-    url: pullRequest._links.web.href
+    url: pullRequest._links?.web?.href ?? null
   };
 }
 function mapPullRequestCheckName(status) {
@@ -2385,9 +2385,6 @@ function mapComment(comment) {
   };
 }
 function mapThread(thread) {
-  if (thread.status !== "active" && thread.status !== "pending") {
-    return null;
-  }
   const comments = thread.comments.map(mapComment).filter((comment) => comment !== null);
   if (comments.length === 0) {
     return null;
@@ -2399,6 +2396,10 @@ function mapThread(thread) {
     comments
   };
 }
+var RESOLVED_THREAD_STATUSES = /* @__PURE__ */ new Set(["fixed", "wontFix", "closed", "byDesign"]);
+function isThreadResolved(status) {
+  return RESOLVED_THREAD_STATUSES.has(status);
+}
 async function readJsonResponse(response) {
   if (!response.ok) {
     throw new Error(`HTTP_${response.status}`);
@@ -2480,25 +2481,30 @@ function formatBranchName(refName) {
 function writeError(message) {
   process.stderr.write(`Error: ${message}
 `);
-  process.exit(1);
+  process.exitCode = 1;
 }
 function handlePrCommandError(err, context, mode = "read") {
   const error = err instanceof Error ? err : new Error(String(err));
   if (error.message === "AUTH_FAILED") {
     const scopeLabel = mode === "write" ? "Code (Read & Write)" : "Code (Read)";
     writeError(`Authentication failed. Check that your PAT is valid and has the "${scopeLabel}" scope.`);
+    return;
   }
   if (error.message === "PERMISSION_DENIED") {
     writeError(`Access denied. Your PAT may lack ${mode} permissions for project "${context?.project}".`);
+    return;
   }
   if (error.message === "NETWORK_ERROR") {
     writeError("Could not connect to Azure DevOps. Check your network connection.");
+    return;
   }
   if (error.message.startsWith("NOT_FOUND")) {
     writeError(`Azure DevOps repository not found in ${context?.org}/${context?.project}.`);
+    return;
   }
   if (error.message.startsWith("HTTP_")) {
     writeError(`Azure DevOps request failed with ${error.message}.`);
+    return;
   }
   writeError(error.message);
 }
@@ -2519,14 +2525,17 @@ function formatPullRequestBlock(pullRequest) {
   return [
     `#${pullRequest.id} [${pullRequest.status}] ${pullRequest.title}`,
     `${formatBranchName(pullRequest.sourceRefName)} -> ${formatBranchName(pullRequest.targetRefName)}`,
-    pullRequest.url,
+    pullRequest.url ?? "\u2014",
     ...formatPullRequestChecks(pullRequest.checks)
   ].join("\n");
 }
+function threadStatusLabel(status) {
+  return isThreadResolved(status) ? "resolved" : status;
+}
 function formatThreads(prId, title, threads) {
   const lines = [`Active comments for pull request #${prId}: ${title}`];
   for (const thread of threads) {
-    lines.push("", `Thread #${thread.id} [${thread.status}] ${thread.threadContext ?? "(general)"}`);
+    lines.push("", `Thread #${thread.id} [${threadStatusLabel(thread.status)}] ${thread.threadContext ?? "(general)"}`);
     for (const comment of thread.comments) {
       lines.push(`  ${comment.author ?? "Unknown"}: ${comment.content}`);
     }
@@ -2587,10 +2596,12 @@ function createPrOpenCommand() {
     const title = options.title?.trim();
     if (!title) {
       writeError("--title is required for pull request creation.");
+      return;
     }
     const description = options.description?.trim();
     if (!description) {
       writeError("--description is required for pull request creation.");
+      return;
     }
     let context;
     try {
@@ -2598,6 +2609,7 @@ function createPrOpenCommand() {
       context = resolved.context;
       if (resolved.branch === "develop") {
         writeError("Pull request creation requires a source branch other than develop.");
+        return;
       }
       const result = await openPullRequest(
         resolved.context,
@@ -2614,19 +2626,20 @@ function createPrOpenCommand() {
       }
       if (result.created) {
         process.stdout.write(`Created pull request #${result.pullRequest.id}: ${result.pullRequest.title}
-${result.pullRequest.url}
+${result.pullRequest.url ?? "\u2014"}
 `);
         return;
       }
       process.stdout.write(
         `Active pull request already exists for ${resolved.branch} -> develop: #${result.pullRequest.id}
-${result.pullRequest.url}
+${result.pullRequest.url ?? "\u2014"}
 `
       );
     } catch (err) {
       if (err instanceof Error && err.message.startsWith("AMBIGUOUS_PRS:")) {
         const ids = err.message.replace("AMBIGUOUS_PRS:", "").split(",").map((id) => `#${id}`).join(", ");
         writeError(`Multiple active pull requests already exist for this branch targeting develop: ${ids}. Use pr status to review them.`);
+        return;
       }
       handlePrCommandError(err, context, "write");
     }
@@ -2635,7 +2648,7 @@ ${result.pullRequest.url}
 }
 function createPrCommentsCommand() {
   const command = new Command12("comments");
-  command.description("List active pull request comments for the current branch").option("--org <org>", "Azure DevOps organization").option("--project <project>", "Azure DevOps project").option("--json", "output JSON").action(async (options) => {
+  command.description("List pull request comment threads for the current branch").option("--org <org>", "Azure DevOps organization").option("--project <project>", "Azure DevOps project").option("--hide-resolved", "hide threads whose status is resolved / won't fix / closed / by design").option("--json", "output JSON").action(async (options) => {
     validateOrgProjectPair(options);
     let context;
     try {
@@ -2646,13 +2659,16 @@ function createPrCommentsCommand() {
       });
       if (pullRequests.length === 0) {
         writeError(`No active pull request found for branch ${resolved.branch}.`);
+        return;
       }
       if (pullRequests.length > 1) {
         const ids = pullRequests.map((pullRequest2) => `#${pullRequest2.id}`).join(", ");
         writeError(`Multiple active pull requests found for branch ${resolved.branch}: ${ids}. Use pr status to review them.`);
+        return;
       }
       const pullRequest = pullRequests[0];
-      const threads = await getPullRequestThreads(resolved.context, resolved.repo, resolved.pat, pullRequest.id);
+      const allThreads = await getPullRequestThreads(resolved.context, resolved.repo, resolved.pat, pullRequest.id);
+      const threads = options.hideResolved ? allThreads.filter((thread) => !isThreadResolved(thread.status)) : allThreads;
       const result = { branch: resolved.branch, pullRequest, threads };
       if (options.json) {
         process.stdout.write(`${JSON.stringify(result, null, 2)}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "azdo-cli",
-  "version": "0.5.0-017-pr-comments-threads.238",
+  "version": "0.5.0-017-pr-comments-threads.242",
   "description": "Azure DevOps CLI tool",
   "type": "module",
   "bin": {