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

package/dist/index.js

@@ -2406,6 +2406,15 @@ async function readJsonResponse(response) {
   }
   return response.json();
 }
+async function getPullRequestById(context, repo, pat, prId) {
+  const url = new URL(
+    `https://dev.azure.com/${encodeURIComponent(context.org)}/${encodeURIComponent(context.project)}/_apis/git/repositories/${encodeURIComponent(repo)}/pullRequests/${prId}`
+  );
+  url.searchParams.set("api-version", "7.1");
+  const response = await fetchWithErrors(url.toString(), { headers: authHeaders(pat) });
+  const data = await readJsonResponse(response);
+  return mapPullRequest(repo, data);
+}
 async function listPullRequests(context, repo, pat, sourceBranch, opts) {
   const response = await fetchWithErrors(
     buildPullRequestsUrl(context, repo, sourceBranch, opts).toString(),
@@ -2475,6 +2484,13 @@ async function getPullRequestThreads(context, repo, pat, prId) {
 }
 
 // src/commands/pr.ts
+function parsePositivePrNumber(raw) {
+  if (!/^\d+$/.test(raw)) {
+    return null;
+  }
+  const n = Number.parseInt(raw, 10);
+  return Number.isFinite(n) && n > 0 ? n : null;
+}
 function formatBranchName(refName) {
   return refName.startsWith("refs/heads/") ? refName.slice("refs/heads/".length) : refName;
 }
@@ -2542,10 +2558,20 @@ function formatThreads(prId, title, threads) {
   }
   return lines.join("\n");
 }
-async function resolvePrCommandContext(options) {
+async function resolvePrCommandContext(options, resolveOpts = {}) {
+  const requireBranch = resolveOpts.requireBranch ?? true;
   const context = resolveContext(options);
   const repo = detectRepoName();
-  const branch = getCurrentBranch();
+  let branch;
+  if (requireBranch) {
+    branch = getCurrentBranch();
+  } else {
+    try {
+      branch = getCurrentBranch();
+    } catch {
+      branch = null;
+    }
+  }
   const credential = await requirePat(context.org);
   return {
     context,
@@ -2562,15 +2588,15 @@ function createPrStatusCommand() {
     try {
       const resolved = await resolvePrCommandContext(options);
       context = resolved.context;
-      const pullRequests = await listPullRequests(resolved.context, resolved.repo, resolved.pat, resolved.branch);
+      const branch = resolved.branch;
+      const pullRequests = await listPullRequests(resolved.context, resolved.repo, resolved.pat, branch);
       const pullRequestsWithChecks = await Promise.all(
         pullRequests.map(async (pullRequest) => ({
           ...pullRequest,
           checks: await getPullRequestChecks(resolved.context, resolved.repo, resolved.pat, pullRequest.id)
         }))
       );
-      const { branch, repo } = resolved;
-      const result = { branch, repository: repo, pullRequests: pullRequestsWithChecks };
+      const result = { branch, repository: resolved.repo, pullRequests: pullRequestsWithChecks };
       if (options.json) {
         process.stdout.write(`${JSON.stringify(result, null, 2)}
 `);
@@ -2611,11 +2637,12 @@ function createPrOpenCommand() {
         writeError("Pull request creation requires a source branch other than develop.");
         return;
       }
+      const openBranch = resolved.branch;
       const result = await openPullRequest(
         resolved.context,
         resolved.repo,
         resolved.pat,
-        resolved.branch,
+        openBranch,
         title,
         description
       );
@@ -2648,28 +2675,52 @@ ${result.pullRequest.url ?? "\u2014"}
 }
 function createPrCommentsCommand() {
   const command = new Command12("comments");
-  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) => {
+  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>", "target the pull request with this numeric id, instead of the current branch's PR").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 {
-      const resolved = await resolvePrCommandContext(options);
-      context = resolved.context;
-      const pullRequests = await listPullRequests(resolved.context, resolved.repo, resolved.pat, resolved.branch, {
-        status: "active"
-      });
-      if (pullRequests.length === 0) {
-        writeError(`No active pull request found for branch ${resolved.branch}.`);
+    let explicitPrId = null;
+    if (options.prNumber !== void 0) {
+      explicitPrId = parsePositivePrNumber(options.prNumber);
+      if (explicitPrId === null) {
+        writeError(`Invalid --pr-number "${options.prNumber}"; expected a positive integer.`);
         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;
+    }
+    try {
+      const resolved = await resolvePrCommandContext(options, { requireBranch: explicitPrId === null });
+      context = resolved.context;
+      let pullRequest;
+      let branchLabel;
+      if (explicitPrId !== null) {
+        try {
+          pullRequest = await getPullRequestById(resolved.context, resolved.repo, resolved.pat, explicitPrId);
+        } catch (err) {
+          if (err instanceof Error && err.message.startsWith("NOT_FOUND")) {
+            writeError(`Pull request #${explicitPrId} not found in ${resolved.context.org}/${resolved.context.project}/${resolved.repo}.`);
+            return;
+          }
+          throw err;
+        }
+        branchLabel = resolved.branch ?? pullRequest.sourceRefName;
+      } else {
+        const pullRequests = await listPullRequests(resolved.context, resolved.repo, resolved.pat, resolved.branch, {
+          status: "active"
+        });
+        if (pullRequests.length === 0) {
+          writeError(`No active pull request found for branch ${resolved.branch}.`);
+          return;
+        }
+        if (pullRequests.length > 1) {
+          const ids = pullRequests.map((pr) => `#${pr.id}`).join(", ");
+          writeError(`Multiple active pull requests found for branch ${resolved.branch}: ${ids}. Use pr status to review them.`);
+          return;
+        }
+        pullRequest = pullRequests[0];
+        branchLabel = resolved.branch;
       }
-      const pullRequest = pullRequests[0];
       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 };
+      const result = { branch: branchLabel, 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.242",
+  "version": "0.5.0-017-pr-comments-threads.244",
   "description": "Azure DevOps CLI tool",
   "type": "module",
   "bin": {