azdo-cli 0.10.0-develop.386 → 0.10.0-develop.394

package/README.md

@@ -56,7 +56,9 @@ azdo comments add 12345 "Investigating the root cause now."
 # PR comment threads — list, filter, target by number, resolve or reopen
 azdo pr comments                        # active-branch PR
 azdo pr comments --pr-number 64         # any PR by number (skips branch lookup)
-azdo pr comments --pr-number 64 --hide-resolved
+azdo pr comments --pr-number 64 --hide-resolved      # or --exclude-resolved (alias)
+azdo pr comments --code-related-only    # only file/line-anchored threads
+azdo pr status                          # PR checks (status + branch policies) + code-comment counts
 azdo pr comment-resolve 17 --pr-number 64   # idempotent: exit 0 even when already resolved
 azdo pr comment-reopen 17  --pr-number 64
 ```

package/dist/index.js

@@ -2652,6 +2652,21 @@ function buildPullRequestStatusesUrl(context, repo, prId) {
   url.searchParams.set("api-version", "7.1");
   return url;
 }
+function buildProjectUrl(context) {
+  const url = new URL(
+    `https://dev.azure.com/${encodeURIComponent(context.org)}/_apis/projects/${encodeURIComponent(context.project)}`
+  );
+  url.searchParams.set("api-version", "7.1");
+  return url;
+}
+function buildPolicyEvaluationsUrl(context, projectId, prId) {
+  const url = new URL(
+    `https://dev.azure.com/${encodeURIComponent(context.org)}/${encodeURIComponent(context.project)}/_apis/policy/evaluations`
+  );
+  url.searchParams.set("api-version", "7.1");
+  url.searchParams.set("artifactId", `vstfs:///CodeReview/CodeReviewId/${projectId}/${prId}`);
+  return url;
+}
 function mapPullRequest(repo, pullRequest) {
   return {
     id: pullRequest.pullRequestId,
@@ -2690,7 +2705,49 @@ function mapPullRequestCheck(status2) {
     targetUrl: status2.targetUrl ?? null,
     createdBy: status2.createdBy?.displayName ?? null,
     createdAt: status2.creationDate ?? null,
-    updatedAt: status2.updatedDate ?? null
+    updatedAt: status2.updatedDate ?? null,
+    source: "status"
+  };
+}
+function mapPolicyEvaluationState(status2) {
+  switch (status2) {
+    case "approved":
+      return "succeeded";
+    case "rejected":
+      return "failed";
+    case "running":
+    case "queued":
+      return "pending";
+    case "notApplicable":
+    case "notSet":
+    case void 0:
+      return null;
+    default:
+      return status2;
+  }
+}
+function mapPolicyEvaluationName(evaluation) {
+  const display = evaluation.configuration?.settings?.displayName?.trim() || evaluation.configuration?.type?.displayName?.trim();
+  if (display) {
+    return display;
+  }
+  return `Policy ${evaluation.configuration?.id ?? evaluation.evaluationId ?? "?"}`;
+}
+function mapPolicyEvaluationCheck(evaluation) {
+  const state = mapPolicyEvaluationState(evaluation.status);
+  if (state === null) {
+    return null;
+  }
+  return {
+    id: evaluation.configuration?.id ?? 0,
+    state,
+    name: mapPolicyEvaluationName(evaluation),
+    description: null,
+    targetUrl: null,
+    createdBy: null,
+    createdAt: null,
+    updatedAt: null,
+    source: "policy"
   };
 }
 function mapComment(comment) {
@@ -2776,6 +2833,21 @@ async function getPullRequestChecks(context, repo, cred, prId) {
   const data = await readJsonResponse(response);
   return data.value.map(mapPullRequestCheck).filter((check) => check !== null);
 }
+async function resolveProjectId(context, cred) {
+  const response = await fetchWithErrors(buildProjectUrl(context).toString(), {
+    headers: authHeaders(cred)
+  });
+  const data = await readJsonResponse(response);
+  return data.id;
+}
+async function getPullRequestPolicyEvaluations(context, cred, projectId, prId) {
+  const response = await fetchWithErrors(
+    buildPolicyEvaluationsUrl(context, projectId, prId).toString(),
+    { headers: authHeaders(cred) }
+  );
+  const data = await readJsonResponse(response);
+  return data.value.map(mapPolicyEvaluationCheck).filter((check) => check !== null);
+}
 async function openPullRequest(context, repo, cred, sourceBranch, title, description) {
   const existing = await listPullRequests(context, repo, cred, sourceBranch, {
     status: "active",
@@ -2884,7 +2956,10 @@ function handlePrCommandError(err, context, mode = "read") {
   }
   writeError(error.message);
 }
-function formatPullRequestChecks(checks) {
+function formatPullRequestChecks(checks, checksError) {
+  if (checksError) {
+    return [`Checks: unable to retrieve (${checksError})`];
+  }
   if (checks.length === 0) {
     return ["Checks: none reported by Azure DevOps"];
   }
@@ -2897,14 +2972,68 @@ function formatPullRequestChecks(checks) {
   }
   return lines;
 }
+function countCodeComments(threads) {
+  let open = 0;
+  let closed = 0;
+  for (const thread of threads) {
+    if (thread.threadContext === null) {
+      continue;
+    }
+    if (isThreadResolved(thread.status)) {
+      closed += 1;
+    } else {
+      open += 1;
+    }
+  }
+  return { open, closed };
+}
+function formatCodeCommentCounts(counts) {
+  return `Code comments: ${counts.open} open, ${counts.closed} closed`;
+}
 function formatPullRequestBlock(pullRequest) {
   return [
     `#${pullRequest.id} [${pullRequest.status}] ${pullRequest.title}`,
     `${formatBranchName(pullRequest.sourceRefName)} -> ${formatBranchName(pullRequest.targetRefName)}`,
     pullRequest.url ?? "\u2014",
-    ...formatPullRequestChecks(pullRequest.checks)
+    ...formatPullRequestChecks(pullRequest.checks, pullRequest.checksError),
+    formatCodeCommentCounts(pullRequest.codeCommentCounts)
   ].join("\n");
 }
+async function buildPullRequestStatusEntry(context, repo, cred, pullRequest, projectId) {
+  let statusChecks = [];
+  let statusOk = true;
+  try {
+    statusChecks = await getPullRequestChecks(context, repo, cred, pullRequest.id);
+  } catch {
+    statusOk = false;
+  }
+  let policyChecks = [];
+  let policyOk = true;
+  if (projectId === null) {
+    policyOk = false;
+  } else {
+    try {
+      policyChecks = await getPullRequestPolicyEvaluations(context, cred, projectId, pullRequest.id);
+    } catch {
+      policyOk = false;
+    }
+  }
+  let codeCommentCounts;
+  try {
+    const threads = await getPullRequestThreads(context, repo, cred, pullRequest.id);
+    codeCommentCounts = countCodeComments(threads);
+  } catch {
+    codeCommentCounts = { open: 0, closed: 0 };
+  }
+  const checks = [...statusChecks, ...policyChecks];
+  const checksError = checks.length === 0 && (!statusOk || !policyOk) ? "Azure DevOps request failed" : null;
+  return {
+    ...pullRequest,
+    checks,
+    codeCommentCounts,
+    checksError
+  };
+}
 function threadStatusLabel(status2) {
   return isThreadResolved(status2) ? "resolved" : status2;
 }
@@ -2941,11 +3070,16 @@ function createPrStatusCommand() {
       context = resolved.context;
       const branch = resolved.branch;
       const pullRequests = await listPullRequests(resolved.context, resolved.repo, resolved.pat, branch);
+      let projectId = null;
+      try {
+        projectId = await resolveProjectId(resolved.context, resolved.pat);
+      } catch {
+        projectId = null;
+      }
       const pullRequestsWithChecks = await Promise.all(
-        pullRequests.map(async (pullRequest) => ({
-          ...pullRequest,
-          checks: await getPullRequestChecks(resolved.context, resolved.repo, resolved.pat, pullRequest.id)
-        }))
+        pullRequests.map(
+          async (pullRequest) => buildPullRequestStatusEntry(resolved.context, resolved.repo, resolved.pat, pullRequest, projectId)
+        )
       );
       const result = { branch, repository: resolved.repo, pullRequests: pullRequestsWithChecks };
       if (options.json) {
@@ -3026,7 +3160,7 @@ ${result.pullRequest.url ?? "\u2014"}
 }
 function createPrCommentsCommand() {
   const command = new Command12("comments");
-  configureUnwrappedHelp(command).description("List pull request comment threads for the current branch").option("--org <org>", "Azure DevOps organization").option("--project <project>", "Azure DevOps project").option("--pr-number <N>", PR_NUMBER_HELP).option("--hide-resolved", "hide threads whose status is resolved / won't fix / closed / by design").option("--json", "output JSON").action(async (options) => {
+  configureUnwrappedHelp(command).description("List pull request comment threads for the current branch").option("--org <org>", "Azure DevOps organization").option("--project <project>", "Azure DevOps project").option("--pr-number <N>", PR_NUMBER_HELP).option("--hide-resolved", "hide threads whose status is resolved / won't fix / closed / by design").option("--exclude-resolved", "alias of --hide-resolved: exclude resolved / won't fix / closed / by design threads").option("--code-related-only", "show only threads anchored to a file/line; omit general discussion threads").option("--json", "output JSON").action(async (options) => {
     validateOrgProjectPair(options);
     let context;
     let explicitPrId = null;
@@ -3068,8 +3202,12 @@ function createPrCommentsCommand() {
         pullRequest = pullRequests[0];
         branchLabel = resolved.branch;
       }
+      const hideResolved = options.hideResolved === true || options.excludeResolved === true;
+      const codeRelatedOnly = options.codeRelatedOnly === true;
       const allThreads = await getPullRequestThreads(resolved.context, resolved.repo, resolved.pat, pullRequest.id);
-      const threads = options.hideResolved ? allThreads.filter((thread) => !isThreadResolved(thread.status)) : allThreads;
+      const threads = allThreads.filter(
+        (thread) => (!hideResolved || !isThreadResolved(thread.status)) && (!codeRelatedOnly || thread.threadContext !== null)
+      );
       const result = { branch: branchLabel, pullRequest, threads };
       if (options.json) {
         process.stdout.write(`${JSON.stringify(result, null, 2)}
@@ -3077,9 +3215,18 @@ function createPrCommentsCommand() {
         return;
       }
       if (threads.length === 0) {
-        if (options.hideResolved && allThreads.length > 0) {
-          process.stdout.write(`Pull request #${pullRequest.id} has no unresolved comment threads (${allThreads.length} resolved thread${allThreads.length === 1 ? "" : "s"} hidden by --hide-resolved).
-`);
+        if (allThreads.length > 0 && (hideResolved || codeRelatedOnly)) {
+          const filters = [];
+          if (codeRelatedOnly) {
+            filters.push("code-related");
+          }
+          if (hideResolved) {
+            filters.push("unresolved");
+          }
+          process.stdout.write(
+            `Pull request #${pullRequest.id} has no ${filters.join(" ")} comment threads (filtered from ${allThreads.length} thread${allThreads.length === 1 ? "" : "s"}).
+`
+          );
         } else {
           process.stdout.write(`Pull request #${pullRequest.id} has no comment threads.
 `);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "azdo-cli",
-  "version": "0.10.0-develop.386",
+  "version": "0.10.0-develop.394",
   "description": "Azure DevOps CLI tool",
   "type": "module",
   "bin": {