azdo-cli 0.2.0-007-work-item-upsert.86 → 0.2.0-008-pull-request-handling.99

package/README.md

@@ -15,6 +15,7 @@ Azure DevOps CLI focused on work item read/write workflows.
 - Create or update Tasks from markdown documents (`upsert`)
 - Read rich-text fields as markdown (`get-md-field`)
 - Set rich-text fields as markdown from inline text, file, or stdin (`set-md-field`)
+- Check branch pull request status, open PRs to `develop`, and review active comments (`pr`)
 - Persist org/project/default fields in local config (`config`)
 - Store PAT in OS credential store (or use `AZDO_PAT`)
 
@@ -64,6 +65,7 @@ azdo upsert --content $'---\nTitle: Improve markdown import UX\nState: New\n---'
 | `azdo upsert [id]` | Create or update a Task from markdown | `--content`, `--file`, `--json`, `--org`, `--project` |
 | `azdo get-md-field <id> <field>` | Get field as markdown | `--org`, `--project` |
 | `azdo set-md-field <id> <field> [content]` | Set markdown field | `--file`, `--json`, `--org`, `--project` |
+| `azdo pr <subcommand>` | Manage pull requests for the current branch | `status`, `open`, `comments`, `--json`, `--org`, `--project` |
 | `azdo config <subcommand>` | Manage saved settings | `set`, `get`, `list`, `unset`, `wizard`, `--json` |
 | `azdo clear-pat` | Remove stored PAT | none |
 
@@ -124,6 +126,43 @@ azdo set-md-field 12345 System.Description --file ./description.md
 cat description.md | azdo set-md-field 12345 System.Description
 ```
 
+### Pull Request Commands
+
+The `pr` command group uses the current git branch and the Azure DevOps `origin` remote automatically. It requires a PAT with `Code (Read)` scope for read operations and `Code (Read & Write)` for pull request creation.
+
+```bash
+# Check whether the current branch already has pull requests
+azdo pr status
+
+# Open a pull request to develop
+azdo pr open --title "Add PR handling" --description "Implements pr status, pr open, pr comments commands"
+
+# Review active comments for the current branch's active pull request
+azdo pr comments
+```
+
+`azdo pr status`
+
+- Lists all pull requests for the current branch, including active, completed, and abandoned PRs
+- Prints `No pull requests found for branch <branch>.` when no PRs exist
+- Supports `--json` for machine-readable output
+
+`azdo pr open`
+
+- Requires both `--title <title>` and `--description <description>`
+- Targets `develop` automatically
+- Creates a new active pull request when none exists
+- Reuses the existing active PR when one already matches the branch and target
+- Fails with a clear error when run from `develop` or when multiple active PRs already exist
+
+`azdo pr comments`
+
+- Resolves the single active pull request for the current branch
+- Returns only active or pending threads with visible, non-deleted comments
+- Groups text output by thread and shows file context when available
+- Prints `Pull request #<id> has no active comments.` when the PR has no active comment threads
+- Fails instead of guessing when no active PR or multiple active PRs exist
+
 ## azdo upsert
 
 `azdo upsert` accepts a single markdown task document and either creates a new Azure DevOps Task or updates an existing one. Omit `[id]` to create; pass `[id]` to update that work item in place.

package/dist/index.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 // src/index.ts
-import { Command as Command10 } from "commander";
+import { Command as Command11 } from "commander";
 
 // src/version.ts
 import { readFileSync } from "fs";
@@ -55,12 +55,18 @@ async function readResponseMessage(response) {
 function normalizeFieldList(fields) {
   return Array.from(new Set(fields.map((f) => f.trim()).filter((f) => f.length > 0)));
 }
+function stringifyFieldValue(value) {
+  if (typeof value === "object" && value !== null) {
+    return JSON.stringify(value);
+  }
+  return String(value);
+}
 function buildExtraFields(fields, requested) {
   const result = {};
   for (const name of requested) {
     const val = fields[name];
     if (val !== void 0 && val !== null) {
-      result[name] = String(val);
+      result[name] = stringifyFieldValue(val);
     }
   }
   return Object.keys(result).length > 0 ? result : null;
@@ -119,7 +125,7 @@ async function getWorkItem(context, id, pat, extraFields) {
   }
   let combinedDescription = null;
   if (descriptionParts.length === 1) {
-    combinedDescription = descriptionParts[0].value;
+    combinedDescription = descriptionParts.at(0)?.value ?? null;
   } else if (descriptionParts.length > 1) {
     combinedDescription = descriptionParts.map((p) => `<h3>${p.label}</h3>${p.value}`).join("");
   }
@@ -158,13 +164,13 @@ async function getWorkItemFieldValue(context, id, pat, fieldName) {
   if (value === void 0 || value === null || value === "") {
     return null;
   }
-  return typeof value === "object" ? JSON.stringify(value) : `${value}`;
+  return stringifyFieldValue(value);
 }
 async function updateWorkItem(context, id, pat, fieldName, operations) {
   const result = await applyWorkItemPatch(context, id, pat, operations);
   const title = result.fields["System.Title"];
-  const lastOp = operations[operations.length - 1];
-  const fieldValue = lastOp.value ?? null;
+  const lastOp = operations.at(-1);
+  const fieldValue = lastOp?.value ?? null;
   return {
     id: result.id,
     rev: result.rev,
@@ -301,19 +307,19 @@ async function resolvePat() {
 import { execSync } from "child_process";
 var patterns = [
   // HTTPS (current): https://dev.azure.com/{org}/{project}/_git/{repo}
-  /^https?:\/\/dev\.azure\.com\/([^/]+)\/([^/]+)\/_git\/.+$/,
+  /^https?:\/\/dev\.azure\.com\/([^/]+)\/([^/]+)\/_git\/([^/]+)$/,
   // HTTPS (legacy + DefaultCollection): https://{org}.visualstudio.com/DefaultCollection/{project}/_git/{repo}
-  /^https?:\/\/([^.]+)\.visualstudio\.com\/DefaultCollection\/([^/]+)\/_git\/.+$/,
+  /^https?:\/\/([^.]+)\.visualstudio\.com\/DefaultCollection\/([^/]+)\/_git\/([^/]+)$/,
   // HTTPS (legacy): https://{org}.visualstudio.com/{project}/_git/{repo}
-  /^https?:\/\/([^.]+)\.visualstudio\.com\/([^/]+)\/_git\/.+$/,
+  /^https?:\/\/([^.]+)\.visualstudio\.com\/([^/]+)\/_git\/([^/]+)$/,
   // SSH (current): git@ssh.dev.azure.com:v3/{org}/{project}/{repo}
-  /^git@ssh\.dev\.azure\.com:v3\/([^/]+)\/([^/]+)\/.+$/,
+  /^git@ssh\.dev\.azure\.com:v3\/([^/]+)\/([^/]+)\/([^/]+)$/,
   // SSH (legacy): {org}@vs-ssh.visualstudio.com:v3/{org}/{project}/{repo}
-  /^[^@]+@vs-ssh\.visualstudio\.com:v3\/([^/]+)\/([^/]+)\/.+$/
+  /^[^@]+@vs-ssh\.visualstudio\.com:v3\/([^/]+)\/([^/]+)\/([^/]+)$/
 ];
 function parseAzdoRemote(url) {
   for (const pattern of patterns) {
-    const match = url.match(pattern);
+    const match = pattern.exec(url);
     if (match) {
       const project = match[2];
       if (/^DefaultCollection$/i.test(project)) {
@@ -337,6 +343,35 @@ function detectAzdoContext() {
   }
   return context;
 }
+function parseRepoName(url) {
+  for (const pattern of patterns) {
+    const match = pattern.exec(url);
+    if (match) {
+      return match[3];
+    }
+  }
+  return null;
+}
+function detectRepoName() {
+  let remoteUrl;
+  try {
+    remoteUrl = execSync("git remote get-url origin", { encoding: "utf-8" }).trim();
+  } catch {
+    throw new Error('Not in a git repository. Check that git remote "origin" exists and try again.');
+  }
+  const repo = parseRepoName(remoteUrl);
+  if (!repo) {
+    throw new Error('Git remote "origin" is not an Azure DevOps URL. Check that origin points to Azure DevOps and try again.');
+  }
+  return repo;
+}
+function getCurrentBranch() {
+  const branch = execSync("git rev-parse --abbrev-ref HEAD", { encoding: "utf-8" }).trim();
+  if (branch === "HEAD") {
+    throw new Error("Not on a named branch. Check out a named branch and try again.");
+  }
+  return branch;
+}
 
 // src/services/config-store.ts
 import fs from "fs";
@@ -609,18 +644,18 @@ function parseRequestedFields(raw) {
 }
 function stripHtml(html) {
   let text = html;
-  text = text.replace(/<h[1-6][^>]*>(.*?)<\/h[1-6]>/gi, "\n--- $1 ---\n");
-  text = text.replace(/<br\s*\/?>/gi, "\n");
-  text = text.replace(/<\/?(p|div)>/gi, "\n");
-  text = text.replace(/<li>/gi, "\n");
-  text = text.replace(/<[^>]*>/g, "");
-  text = text.replace(/&amp;/g, "&");
-  text = text.replace(/&lt;/g, "<");
-  text = text.replace(/&gt;/g, ">");
-  text = text.replace(/&quot;/g, '"');
-  text = text.replace(/&#39;/g, "'");
-  text = text.replace(/&nbsp;/g, " ");
-  text = text.replace(/\n{3,}/g, "\n\n");
+  text = text.replaceAll(/<h[1-6][^>]*>(.*?)<\/h[1-6]>/gi, "\n--- $1 ---\n");
+  text = text.replaceAll(/<br\s*\/?>/gi, "\n");
+  text = text.replaceAll(/<\/?(p|div)>/gi, "\n");
+  text = text.replaceAll(/<li>/gi, "\n");
+  text = text.replaceAll(/<[^>]*>/g, "");
+  text = text.replaceAll("&amp;", "&");
+  text = text.replaceAll("&lt;", "<");
+  text = text.replaceAll("&gt;", ">");
+  text = text.replaceAll("&quot;", '"');
+  text = text.replaceAll("&#39;", "'");
+  text = text.replaceAll("&nbsp;", " ");
+  text = text.replaceAll(/\n{3,}/g, "\n\n");
   return text.trim();
 }
 function convertRichText(html, markdown) {
@@ -641,16 +676,19 @@ function summarizeDescription(text, label) {
   return [`${label("Description:")}${firstThree.join("\n")}${suffix}`];
 }
 function formatWorkItem(workItem, short, markdown = false) {
-  const lines = [];
   const label = (name) => name.padEnd(13);
-  lines.push(`${label("ID:")}${workItem.id}`);
-  lines.push(`${label("Type:")}${workItem.type}`);
-  lines.push(`${label("Title:")}${workItem.title}`);
-  lines.push(`${label("State:")}${workItem.state}`);
-  lines.push(`${label("Assigned To:")}${workItem.assignedTo ?? "Unassigned"}`);
+  const lines = [
+    `${label("ID:")}${workItem.id}`,
+    `${label("Type:")}${workItem.type}`,
+    `${label("Title:")}${workItem.title}`,
+    `${label("State:")}${workItem.state}`,
+    `${label("Assigned To:")}${workItem.assignedTo ?? "Unassigned"}`
+  ];
   if (!short) {
-    lines.push(`${label("Area:")}${workItem.areaPath}`);
-    lines.push(`${label("Iteration:")}${workItem.iterationPath}`);
+    lines.push(
+      `${label("Area:")}${workItem.areaPath}`,
+      `${label("Iteration:")}${workItem.iterationPath}`
+    );
   }
   lines.push(`${label("URL:")}${workItem.url}`);
   if (workItem.extraFields) {
@@ -661,8 +699,7 @@ function formatWorkItem(workItem, short, markdown = false) {
   if (short) {
     lines.push(...summarizeDescription(descriptionText, label));
   } else {
-    lines.push("Description:");
-    lines.push(descriptionText);
+    lines.push("Description:", descriptionText);
   }
   return lines.join("\n");
 }
@@ -676,7 +713,7 @@ function createGetItemCommand() {
       try {
         context = resolveContext(options);
         const credential = await resolvePat();
-        const fieldsList = options.fields !== void 0 ? parseRequestedFields(options.fields) : parseRequestedFields(loadConfig().fields);
+        const fieldsList = options.fields === void 0 ? parseRequestedFields(loadConfig().fields) : parseRequestedFields(options.fields);
         const workItem = await getWorkItem(context, id, credential.pat, fieldsList);
         const markdownEnabled = options.markdown ?? loadConfig().markdown ?? false;
         const output = formatWorkItem(workItem, options.short ?? false, markdownEnabled);
@@ -707,6 +744,63 @@ function createClearPatCommand() {
 // src/commands/config.ts
 import { Command as Command3 } from "commander";
 import { createInterface as createInterface2 } from "readline";
+function formatConfigValue(value, unsetFallback = "") {
+  if (value === void 0) {
+    return unsetFallback;
+  }
+  return Array.isArray(value) ? value.join(",") : value;
+}
+function writeConfigList(cfg) {
+  const keyWidth = 10;
+  const valueWidth = 30;
+  for (const setting of SETTINGS) {
+    const raw = cfg[setting.key];
+    const value = formatConfigValue(raw, "(not set)");
+    const marker = raw === void 0 && setting.required ? " *" : "";
+    process.stdout.write(
+      `${setting.key.padEnd(keyWidth)}${String(value).padEnd(valueWidth)}${setting.description}${marker}
+`
+    );
+  }
+  const hasUnset = SETTINGS.some((s) => s.required && cfg[s.key] === void 0);
+  if (hasUnset) {
+    process.stdout.write(
+      '\n* = required but not configured. Run "azdo config wizard" to set up.\n'
+    );
+  }
+}
+function createAsk(rl) {
+  return (prompt) => new Promise((resolve2) => rl.question(prompt, resolve2));
+}
+async function promptForSetting(cfg, setting, ask) {
+  const currentDisplay = String(formatConfigValue(cfg[setting.key], ""));
+  const requiredTag = setting.required ? " (required)" : " (optional)";
+  process.stderr.write(`${setting.description}${requiredTag}
+`);
+  if (setting.example) {
+    process.stderr.write(`  Example: ${setting.example}
+`);
+  }
+  const defaultHint = currentDisplay ? ` [${currentDisplay}]` : "";
+  const answer = await ask(`  ${setting.key}${defaultHint}: `);
+  const trimmed = answer.trim();
+  if (trimmed) {
+    setConfigValue(setting.key, trimmed);
+    process.stderr.write(`  -> Set "${setting.key}" to "${trimmed}"
+
+`);
+    return;
+  }
+  if (currentDisplay) {
+    process.stderr.write(`  -> Kept "${setting.key}" as "${currentDisplay}"
+
+`);
+    return;
+  }
+  process.stderr.write(`  -> Skipped "${setting.key}"
+
+`);
+}
 function createConfigCommand() {
   const config = new Command3("config");
   config.description("Manage CLI settings");
@@ -759,27 +853,9 @@ function createConfigCommand() {
     const cfg = loadConfig();
     if (options.json) {
       process.stdout.write(JSON.stringify(cfg) + "\n");
-    } else {
-      const keyWidth = 10;
-      const valueWidth = 30;
-      for (const setting of SETTINGS) {
-        const raw = cfg[setting.key];
-        const value = raw === void 0 ? "(not set)" : Array.isArray(raw) ? raw.join(",") : raw;
-        const marker = raw === void 0 && setting.required ? " *" : "";
-        process.stdout.write(
-          `${setting.key.padEnd(keyWidth)}${String(value).padEnd(valueWidth)}${setting.description}${marker}
-`
-        );
-      }
-      const hasUnset = SETTINGS.some(
-        (s) => s.required && cfg[s.key] === void 0
-      );
-      if (hasUnset) {
-        process.stdout.write(
-          '\n* = required but not configured. Run "azdo config wizard" to set up.\n'
-        );
-      }
+      return;
     }
+    writeConfigList(cfg);
   });
   const unset = new Command3("unset");
   unset.description("Remove a configuration value").argument("<key>", "setting key (org, project, fields)").option("--json", "output in JSON format").action((key, options) => {
@@ -811,36 +887,11 @@ function createConfigCommand() {
       input: process.stdin,
       output: process.stderr
     });
-    const ask = (prompt) => new Promise((resolve2) => rl.question(prompt, resolve2));
+    const ask = createAsk(rl);
     process.stderr.write("Azure DevOps CLI - Configuration Wizard\n");
     process.stderr.write("=======================================\n\n");
     for (const setting of SETTINGS) {
-      const current = cfg[setting.key];
-      const currentDisplay = current === void 0 ? "" : Array.isArray(current) ? current.join(",") : current;
-      const requiredTag = setting.required ? " (required)" : " (optional)";
-      process.stderr.write(`${setting.description}${requiredTag}
-`);
-      if (setting.example) {
-        process.stderr.write(`  Example: ${setting.example}
-`);
-      }
-      const defaultHint = currentDisplay ? ` [${currentDisplay}]` : "";
-      const answer = await ask(`  ${setting.key}${defaultHint}: `);
-      const trimmed = answer.trim();
-      if (trimmed) {
-        setConfigValue(setting.key, trimmed);
-        process.stderr.write(`  -> Set "${setting.key}" to "${trimmed}"
-
-`);
-      } else if (currentDisplay) {
-        process.stderr.write(`  -> Kept "${setting.key}" as "${currentDisplay}"
-
-`);
-      } else {
-        process.stderr.write(`  -> Skipped "${setting.key}"
-
-`);
-      }
+      await promptForSetting(cfg, setting, ask);
     }
     rl.close();
     process.stderr.write("Configuration complete!\n");
@@ -1400,8 +1451,304 @@ function createUpsertCommand() {
   return command;
 }
 
+// src/commands/pr.ts
+import { Command as Command10 } from "commander";
+
+// src/services/pr-client.ts
+function buildPullRequestsUrl(context, repo, sourceBranch, opts) {
+  const url = new URL(
+    `https://dev.azure.com/${encodeURIComponent(context.org)}/${encodeURIComponent(context.project)}/_apis/git/repositories/${encodeURIComponent(repo)}/pullrequests`
+  );
+  url.searchParams.set("api-version", "7.1");
+  url.searchParams.set("searchCriteria.sourceRefName", `refs/heads/${sourceBranch}`);
+  if (opts?.status) {
+    url.searchParams.set("searchCriteria.status", opts.status);
+  }
+  if (opts?.targetBranch) {
+    url.searchParams.set("searchCriteria.targetRefName", `refs/heads/${opts.targetBranch}`);
+  }
+  return url;
+}
+function mapPullRequest(repo, pullRequest) {
+  return {
+    id: pullRequest.pullRequestId,
+    title: pullRequest.title,
+    repository: repo,
+    sourceRefName: pullRequest.sourceRefName,
+    targetRefName: pullRequest.targetRefName,
+    status: pullRequest.status,
+    createdBy: pullRequest.createdBy?.displayName ?? null,
+    url: pullRequest._links.web.href
+  };
+}
+function mapComment(comment) {
+  const content = comment.content?.trim();
+  if (comment.isDeleted || !content) {
+    return null;
+  }
+  return {
+    id: comment.id,
+    author: comment.author?.displayName ?? null,
+    content,
+    publishedAt: comment.publishedDate ?? null
+  };
+}
+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;
+  }
+  return {
+    id: thread.id,
+    status: thread.status,
+    threadContext: thread.threadContext?.filePath ?? null,
+    comments
+  };
+}
+async function readJsonResponse(response) {
+  if (!response.ok) {
+    throw new Error(`HTTP_${response.status}`);
+  }
+  return response.json();
+}
+async function listPullRequests(context, repo, pat, sourceBranch, opts) {
+  const response = await fetchWithErrors(
+    buildPullRequestsUrl(context, repo, sourceBranch, opts).toString(),
+    { headers: authHeaders(pat) }
+  );
+  const data = await readJsonResponse(response);
+  return data.value.map((pullRequest) => mapPullRequest(repo, pullRequest));
+}
+async function openPullRequest(context, repo, pat, sourceBranch, title, description) {
+  const existing = await listPullRequests(context, repo, pat, sourceBranch, {
+    status: "active",
+    targetBranch: "develop"
+  });
+  if (existing.length === 1) {
+    return {
+      branch: sourceBranch,
+      targetBranch: "develop",
+      created: false,
+      pullRequest: existing[0]
+    };
+  }
+  if (existing.length > 1) {
+    throw new Error(`AMBIGUOUS_PRS:${existing.map((pullRequest) => pullRequest.id).join(",")}`);
+  }
+  const payload = {
+    sourceRefName: `refs/heads/${sourceBranch}`,
+    targetRefName: "refs/heads/develop",
+    title,
+    description
+  };
+  const url = new URL(
+    `https://dev.azure.com/${encodeURIComponent(context.org)}/${encodeURIComponent(context.project)}/_apis/git/repositories/${encodeURIComponent(repo)}/pullrequests`
+  );
+  url.searchParams.set("api-version", "7.1");
+  const response = await fetchWithErrors(url.toString(), {
+    method: "POST",
+    headers: {
+      ...authHeaders(pat),
+      "Content-Type": "application/json"
+    },
+    body: JSON.stringify(payload)
+  });
+  const data = await readJsonResponse(response);
+  return {
+    branch: sourceBranch,
+    targetBranch: "develop",
+    created: true,
+    pullRequest: mapPullRequest(repo, data)
+  };
+}
+async function getPullRequestThreads(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}/threads`
+  );
+  url.searchParams.set("api-version", "7.1");
+  const response = await fetchWithErrors(url.toString(), { headers: authHeaders(pat) });
+  const data = await readJsonResponse(response);
+  return data.value.map(mapThread).filter((thread) => thread !== null);
+}
+
+// src/commands/pr.ts
+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);
+}
+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.`);
+  }
+  if (error.message === "PERMISSION_DENIED") {
+    writeError(`Access denied. Your PAT may lack ${mode} permissions for project "${context?.project}".`);
+  }
+  if (error.message === "NETWORK_ERROR") {
+    writeError("Could not connect to Azure DevOps. Check your network connection.");
+  }
+  if (error.message === "NOT_FOUND") {
+    writeError(`Azure DevOps repository not found in ${context?.org}/${context?.project}.`);
+  }
+  if (error.message.startsWith("HTTP_")) {
+    writeError(`Azure DevOps request failed with ${error.message}.`);
+  }
+  writeError(error.message);
+}
+function formatPullRequestBlock(pullRequest) {
+  return [
+    `#${pullRequest.id} [${pullRequest.status}] ${pullRequest.title}`,
+    `${formatBranchName(pullRequest.sourceRefName)} -> ${formatBranchName(pullRequest.targetRefName)}`,
+    pullRequest.url
+  ].join("\n");
+}
+function formatThreads(prId, title, threads) {
+  const lines = [`Active comments for pull request #${prId}: ${title}`];
+  for (const thread of threads) {
+    lines.push("");
+    lines.push(`Thread #${thread.id} [${thread.status}] ${thread.threadContext ?? "(general)"}`);
+    for (const comment of thread.comments) {
+      lines.push(`  ${comment.author ?? "Unknown"}: ${comment.content}`);
+    }
+  }
+  return lines.join("\n");
+}
+function createPrStatusCommand() {
+  const command = new Command10("status");
+  command.description("Check pull requests for the current branch").option("--org <org>", "Azure DevOps organization").option("--project <project>", "Azure DevOps project").option("--json", "output JSON").action(async (options) => {
+    validateOrgProjectPair(options);
+    let context;
+    try {
+      context = resolveContext(options);
+      const repo = detectRepoName();
+      const branch = getCurrentBranch();
+      const credential = await resolvePat();
+      const pullRequests = await listPullRequests(context, repo, credential.pat, branch);
+      const result = { branch, repository: repo, pullRequests };
+      if (options.json) {
+        process.stdout.write(`${JSON.stringify(result, null, 2)}
+`);
+        return;
+      }
+      if (pullRequests.length === 0) {
+        process.stdout.write(`No pull requests found for branch ${branch}.
+`);
+        return;
+      }
+      process.stdout.write(`${pullRequests.map(formatPullRequestBlock).join("\n\n")}
+`);
+    } catch (err) {
+      handlePrCommandError(err, context, "read");
+    }
+  });
+  return command;
+}
+function createPrOpenCommand() {
+  const command = new Command10("open");
+  command.description("Open a pull request from the current branch to develop").option("--title <title>", "pull request title").option("--description <description>", "pull request description").option("--org <org>", "Azure DevOps organization").option("--project <project>", "Azure DevOps project").option("--json", "output JSON").action(async (options) => {
+    validateOrgProjectPair(options);
+    const title = options.title?.trim();
+    if (!title) {
+      writeError("--title is required for pull request creation.");
+    }
+    const description = options.description?.trim();
+    if (!description) {
+      writeError("--description is required for pull request creation.");
+    }
+    let context;
+    try {
+      context = resolveContext(options);
+      const repo = detectRepoName();
+      const branch = getCurrentBranch();
+      if (branch === "develop") {
+        writeError("Pull request creation requires a source branch other than develop.");
+      }
+      const credential = await resolvePat();
+      const result = await openPullRequest(context, repo, credential.pat, branch, title, description);
+      if (options.json) {
+        process.stdout.write(`${JSON.stringify(result, null, 2)}
+`);
+        return;
+      }
+      if (result.created) {
+        process.stdout.write(`Created pull request #${result.pullRequest.id}: ${result.pullRequest.title}
+${result.pullRequest.url}
+`);
+        return;
+      }
+      process.stdout.write(
+        `Active pull request already exists for ${branch} -> develop: #${result.pullRequest.id}
+${result.pullRequest.url}
+`
+      );
+    } 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.`);
+      }
+      handlePrCommandError(err, context, "write");
+    }
+  });
+  return command;
+}
+function createPrCommentsCommand() {
+  const command = new Command10("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) => {
+    validateOrgProjectPair(options);
+    let context;
+    try {
+      context = resolveContext(options);
+      const repo = detectRepoName();
+      const branch = getCurrentBranch();
+      const credential = await resolvePat();
+      const pullRequests = await listPullRequests(context, repo, credential.pat, branch, { status: "active" });
+      if (pullRequests.length === 0) {
+        writeError(`No active pull request found for branch ${branch}.`);
+      }
+      if (pullRequests.length > 1) {
+        const ids = pullRequests.map((pullRequest2) => `#${pullRequest2.id}`).join(", ");
+        writeError(`Multiple active pull requests found for branch ${branch}: ${ids}. Use pr status to review them.`);
+      }
+      const pullRequest = pullRequests[0];
+      const threads = await getPullRequestThreads(context, repo, credential.pat, pullRequest.id);
+      const result = { branch, 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.
+`);
+        return;
+      }
+      process.stdout.write(`${formatThreads(pullRequest.id, pullRequest.title, threads)}
+`);
+    } catch (err) {
+      handlePrCommandError(err, context, "read");
+    }
+  });
+  return command;
+}
+function createPrCommand() {
+  const command = new Command10("pr");
+  command.description("Manage Azure DevOps pull requests");
+  command.addCommand(createPrStatusCommand());
+  command.addCommand(createPrOpenCommand());
+  command.addCommand(createPrCommentsCommand());
+  return command;
+}
+
 // src/index.ts
-var program = new Command10();
+var program = new Command11();
 program.name("azdo").description("Azure DevOps CLI tool").version(version, "-v, --version");
 program.addCommand(createGetItemCommand());
 program.addCommand(createClearPatCommand());
@@ -1412,6 +1759,7 @@ program.addCommand(createSetFieldCommand());
 program.addCommand(createGetMdFieldCommand());
 program.addCommand(createSetMdFieldCommand());
 program.addCommand(createUpsertCommand());
+program.addCommand(createPrCommand());
 program.showHelpAfterError();
 program.parse();
 if (process.argv.length <= 2) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "azdo-cli",
-  "version": "0.2.0-007-work-item-upsert.86",
+  "version": "0.2.0-008-pull-request-handling.99",
   "description": "Azure DevOps CLI tool",
   "type": "module",
   "bin": {
@@ -28,12 +28,12 @@
   },
   "devDependencies": {
     "@eslint/js": "^10.0.1",
-    "@types/node": "^25.3.3",
-    "eslint": "^10.0.2",
+    "@types/node": "^25.5.0",
+    "eslint": "^10.1.0",
     "prettier": "^3.8.1",
     "tsup": "^8.5.1",
     "typescript": "^5.9.3",
-    "typescript-eslint": "^8.56.1",
-    "vitest": "^4.0.18"
+    "typescript-eslint": "^8.57.2",
+    "vitest": "^4.1.2"
   }
 }