azdo-cli 0.10.0-develop.233 → 0.10.0-develop.260

package/README.md

@@ -13,7 +13,7 @@ Azure DevOps CLI focused on work item read/write workflows.
 - Create or update work items from markdown documents (`upsert`)
 - Read and post work item comments (`comments`)
 - Read/write rich-text fields as markdown (`get-md-field`, `set-md-field`)
-- Check branch pull request status, open PRs to `develop`, and review active comments (`pr`)
+- Check branch pull request status, open PRs to `develop`, list PR comment threads for any PR (`--pr-number`), and resolve/reopen threads from the CLI (`pr`)
 - Persist org/project/default fields in local config (`config`)
 - List all fields of a work item (`list-fields`)
 - Store a PAT per Azure DevOps organization in the OS credential store via `azdo auth` (or use `AZDO_PAT`). Inspect with `azdo auth status`, remove with `azdo auth logout`. See [docs/authentication.md](docs/authentication.md).
@@ -40,9 +40,16 @@ azdo set-state 12345 "Active"
 # Create a work item from markdown
 azdo upsert --type "User Story" --content $'---\nTitle: Improve markdown import UX\nState: New\n---'
 
-# Read and post comments
+# Read and post work item comments
 azdo comments list 12345
 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 comment-resolve 17 --pr-number 64   # idempotent: exit 0 even when already resolved
+azdo pr comment-reopen 17  --pr-number 64
 ```
 
 ## Documentation

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,12 +2396,49 @@ function mapThread(thread) {
     comments
   };
 }
+function toActiveCommentThread(thread) {
+  return {
+    id: thread.id,
+    status: thread.status,
+    threadContext: thread.threadContext?.filePath ?? null,
+    comments: thread.comments.map(mapComment).filter((comment) => comment !== null)
+  };
+}
+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}`);
   }
   return response.json();
 }
+async function patchThreadStatus(context, repo, pat, prId, threadId, status) {
+  const url = new URL(
+    `https://dev.azure.com/${encodeURIComponent(context.org)}/${encodeURIComponent(context.project)}/_apis/git/repositories/${encodeURIComponent(repo)}/pullRequests/${prId}/threads/${threadId}`
+  );
+  url.searchParams.set("api-version", "7.1");
+  const response = await fetchWithErrors(url.toString(), {
+    method: "PATCH",
+    headers: {
+      ...authHeaders(pat),
+      "Content-Type": "application/json"
+    },
+    body: JSON.stringify({ status })
+  });
+  const data = await readJsonResponse(response);
+  return toActiveCommentThread(data);
+}
+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(),
@@ -2474,31 +2508,43 @@ 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;
 }
 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,24 +2565,28 @@ 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}`];
+  const lines = [`Comment threads 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}`);
     }
   }
   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();
+  const branch = requireBranch ? getCurrentBranch() : null;
   const credential = await requirePat(context.org);
   return {
     context,
@@ -2553,15 +2603,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)}
 `);
@@ -2587,10 +2637,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,12 +2650,14 @@ function createPrOpenCommand() {
       context = resolved.context;
       if (resolved.branch === "develop") {
         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
       );
@@ -2614,19 +2668,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,33 +2690,65 @@ ${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("--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;
+    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;
+      }
+    }
     try {
-      const resolved = await resolvePrCommandContext(options);
+      const resolved = await resolvePrCommandContext(options, { requireBranch: explicitPrId === null });
       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}.`);
-      }
-      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.`);
+      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 threads = await getPullRequestThreads(resolved.context, resolved.repo, resolved.pat, pullRequest.id);
-      const result = { branch: resolved.branch, pullRequest, threads };
+      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: branchLabel, pullRequest, threads };
       if (options.json) {
         process.stdout.write(`${JSON.stringify(result, null, 2)}
 `);
         return;
       }
       if (threads.length === 0) {
-        process.stdout.write(`Pull request #${pullRequest.id} has no active comments.
+        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).
+`);
+        } else {
+          process.stdout.write(`Pull request #${pullRequest.id} has no comment threads.
 `);
+        }
         return;
       }
       process.stdout.write(`${formatThreads(pullRequest.id, pullRequest.title, threads)}
@@ -2672,12 +2759,131 @@ function createPrCommentsCommand() {
   });
   return command;
 }
+async function resolveThreadTarget(threadIdRaw, options) {
+  validateOrgProjectPair(options);
+  const threadId = parsePositivePrNumber(threadIdRaw);
+  if (threadId === null) {
+    writeError(`Invalid thread id "${threadIdRaw}"; expected a positive integer.`);
+    return null;
+  }
+  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 null;
+    }
+  }
+  const resolved = await resolvePrCommandContext(options, { requireBranch: explicitPrId === null });
+  let pullRequest;
+  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 null;
+      }
+      throw err;
+    }
+  } 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 null;
+    }
+    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 null;
+    }
+    pullRequest = pullRequests[0];
+  }
+  return { context: resolved.context, repo: resolved.repo, pat: resolved.pat, pullRequest, threadId };
+}
+async function runThreadStateChange(threadIdRaw, options, direction) {
+  let context;
+  try {
+    const target = await resolveThreadTarget(threadIdRaw, options);
+    if (target === null) {
+      return;
+    }
+    context = target.context;
+    const threads = await getPullRequestThreads(target.context, target.repo, target.pat, target.pullRequest.id);
+    const thread = threads.find((t) => t.id === target.threadId);
+    if (!thread) {
+      writeError(`Thread #${target.threadId} not found on pull request #${target.pullRequest.id}.`);
+      return;
+    }
+    const alreadyInTargetState = direction === "resolve" ? isThreadResolved(thread.status) : !isThreadResolved(thread.status);
+    const targetStatus = direction === "resolve" ? "fixed" : "active";
+    if (alreadyInTargetState) {
+      const humanLabel = direction === "resolve" ? "resolved" : "active";
+      const noopResult = {
+        pullRequestId: target.pullRequest.id,
+        threadId: target.threadId,
+        status: thread.status,
+        noop: true
+      };
+      if (options.json) {
+        process.stdout.write(`${JSON.stringify(noopResult, null, 2)}
+`);
+        return;
+      }
+      process.stdout.write(`Thread #${target.threadId} is already ${humanLabel} on pull request #${target.pullRequest.id} (current status: ${thread.status}).
+`);
+      return;
+    }
+    const updated = await patchThreadStatus(
+      target.context,
+      target.repo,
+      target.pat,
+      target.pullRequest.id,
+      target.threadId,
+      targetStatus
+    );
+    const result = {
+      pullRequestId: target.pullRequest.id,
+      threadId: target.threadId,
+      status: targetStatus,
+      noop: false
+    };
+    if (options.json) {
+      process.stdout.write(`${JSON.stringify(result, null, 2)}
+`);
+      return;
+    }
+    const verb = direction === "resolve" ? "resolved" : "reopened";
+    process.stdout.write(`Thread #${target.threadId} ${verb} on pull request #${target.pullRequest.id} (status: ${updated.status}).
+`);
+  } catch (err) {
+    handlePrCommandError(err, context, "write");
+  }
+}
+function createPrCommentResolveCommand() {
+  const command = new Command12("comment-resolve");
+  command.description("Mark a pull request comment thread as resolved").argument("<threadId>", "numeric id of the thread to resolve").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("--json", "output JSON").action(async (threadIdRaw, options) => {
+    await runThreadStateChange(threadIdRaw, options, "resolve");
+  });
+  return command;
+}
+function createPrCommentReopenCommand() {
+  const command = new Command12("comment-reopen");
+  command.description("Reopen (set to active) a previously resolved pull request comment thread").argument("<threadId>", "numeric id of the thread to reopen").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("--json", "output JSON").action(async (threadIdRaw, options) => {
+    await runThreadStateChange(threadIdRaw, options, "reopen");
+  });
+  return command;
+}
 function createPrCommand() {
   const command = new Command12("pr");
   command.description("Manage Azure DevOps pull requests");
   command.addCommand(createPrStatusCommand());
   command.addCommand(createPrOpenCommand());
   command.addCommand(createPrCommentsCommand());
+  command.addCommand(createPrCommentResolveCommand());
+  command.addCommand(createPrCommentReopenCommand());
   return command;
 }
 

package/package.json

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