azdo-cli 0.2.0-feature-devcontainer.72 → 0.2.0-feature-more-resilient-fields.105

package/README.md

@@ -12,9 +12,12 @@ Azure DevOps CLI focused on work item read/write workflows.
 - Update work item state (`set-state`)
 - Assign and unassign work items (`assign`)
 - Set any work item field by reference name (`set-field`)
+- 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`)
+- List all fields of a work item (`list-fields`)
 - Store PAT in OS credential store (or use `AZDO_PAT`)
 
 ## Installation
@@ -47,6 +50,9 @@ azdo get-item 12345
 
 # 3) Update state
 azdo set-state 12345 "Active"
+
+# 4) Create or update a Task from markdown
+azdo upsert --content $'---\nTitle: Improve markdown import UX\nState: New\n---'
 ```
 
 ## Command Cheat Sheet
@@ -57,8 +63,11 @@ azdo set-state 12345 "Active"
 | `azdo set-state <id> <state>` | Change work item state | `--json`, `--org`, `--project` |
 | `azdo assign <id> [name]` | Assign or unassign owner | `--unassign`, `--json`, `--org`, `--project` |
 | `azdo set-field <id> <field> <value>` | Update any field | `--json`, `--org`, `--project` |
+| `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 list-fields <id>` | List all fields of a work item | `--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 |
 
@@ -95,6 +104,16 @@ azdo assign 12345 --unassign
 azdo set-field 12345 System.Title "Updated title"
 ```
 
+### List Fields
+
+```bash
+# List all fields with values (rich text fields preview first 5 lines)
+azdo list-fields 12345
+
+# JSON output
+azdo list-fields 12345 --json
+```
+
 ### Markdown Display
 
 The `get-item` command can convert HTML rich-text fields to readable markdown. Resolution order:
@@ -119,6 +138,120 @@ 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.
+
+```bash
+# Create from inline content
+azdo upsert --content $'---\nTitle: Improve markdown import UX\nAssigned To: user@example.com\nState: New\n---'
+
+# Update from a file
+azdo upsert 12345 --file ./task-import.md
+
+# JSON output
+azdo upsert 12345 --content $'---\nSystem.Title: Improve markdown import UX\n---' --json
+```
+
+The command requires exactly one source flag:
+
+- `azdo upsert [id] --content <markdown>`
+- `azdo upsert [id] --file <path>`
+
+If `--file` succeeds, the source file is deleted after the Azure DevOps write completes. If parsing, validation, or the API call fails, the file is preserved. If deletion fails after a successful write, the command still succeeds and prints a warning.
+
+### Task Document Format
+
+The document starts with YAML front matter for scalar fields, followed by optional `##` heading sections for markdown rich-text fields.
+
+```md
+---
+Title: Improve markdown import UX
+Assigned To: user@example.com
+State: New
+Tags: cli; markdown
+Priority: null
+---
+
+## Description
+
+Implement a single-command task import flow.
+
+## Acceptance Criteria
+
+- Supports create when no ID is passed
+- Supports update when an ID is passed
+- Deletes imported files only after success
+```
+
+Supported friendly field names:
+
+- `Title`
+- `Assigned To` / `assignedTo`
+- `State`
+- `Description`
+- `Acceptance Criteria` / `acceptanceCriteria`
+- `Tags`
+- `Priority`
+
+Raw Azure DevOps reference names are also accepted anywhere a field name is expected, for example `System.Title` or `Microsoft.VSTS.Common.AcceptanceCriteria`.
+
+Clear semantics:
+
+- Scalar YAML fields with `null` or an empty value are treated as clears on update.
+- Rich-text heading sections with an empty body are treated as clears on update.
+- Omitted fields are untouched on update.
+
+`--json` output shape:
+
+```json
+{
+  "action": "created",
+  "id": 12345,
+  "fields": {
+    "System.Title": "Improve markdown import UX",
+    "System.Description": "Implement a single-command task import flow."
+  }
+}
+```
+
 ### Configuration
 
 ```bash
@@ -150,6 +283,7 @@ azdo clear-pat
 ## JSON Output
 
 These commands support `--json` for machine-readable output:
+- `list-fields`
 - `set-state`
 - `assign`
 - `set-field`

package/dist/index.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 // src/index.ts
-import { Command as Command9 } from "commander";
+import { Command as Command12 } from "commander";
 
 // src/version.ts
 import { readFileSync } from "fs";
@@ -55,16 +55,73 @@ 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];
+    let val = fields[name];
+    let resolvedName = name;
+    if (val === void 0) {
+      const nameSuffix = name.split(".").pop().toLowerCase();
+      const match = Object.keys(fields).find(
+        (k) => k.split(".").pop().toLowerCase() === nameSuffix
+      );
+      if (match !== void 0) {
+        val = fields[match];
+        resolvedName = match;
+      }
+    }
     if (val !== void 0 && val !== null) {
-      result[name] = String(val);
+      result[resolvedName] = stringifyFieldValue(val);
     }
   }
   return Object.keys(result).length > 0 ? result : null;
 }
+function writeHeaders(pat) {
+  return {
+    ...authHeaders(pat),
+    "Content-Type": "application/json-patch+json"
+  };
+}
+async function readWriteResponse(response, errorCode) {
+  if (response.status === 400) {
+    const serverMessage = await readResponseMessage(response) ?? "Unknown error";
+    throw new Error(`${errorCode}: ${serverMessage}`);
+  }
+  if (!response.ok) {
+    throw new Error(`HTTP_${response.status}`);
+  }
+  const data = await response.json();
+  return {
+    id: data.id,
+    rev: data.rev,
+    fields: data.fields
+  };
+}
+async function getWorkItemFields(context, id, pat) {
+  const url = new URL(
+    `https://dev.azure.com/${encodeURIComponent(context.org)}/${encodeURIComponent(context.project)}/_apis/wit/workitems/${id}`
+  );
+  url.searchParams.set("api-version", "7.1");
+  url.searchParams.set("$expand", "all");
+  const response = await fetchWithErrors(url.toString(), { headers: authHeaders(pat) });
+  if (response.status === 400) {
+    const serverMessage = await readResponseMessage(response);
+    if (serverMessage) {
+      throw new Error(`BAD_REQUEST: ${serverMessage}`);
+    }
+  }
+  if (!response.ok) {
+    throw new Error(`HTTP_${response.status}`);
+  }
+  const data = await response.json();
+  return data.fields;
+}
 async function getWorkItem(context, id, pat, extraFields) {
   const url = new URL(
     `https://dev.azure.com/${encodeURIComponent(context.org)}/${encodeURIComponent(context.project)}/_apis/wit/workitems/${id}`
@@ -98,7 +155,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("");
   }
@@ -137,38 +194,44 @@ 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.at(-1);
+  const fieldValue = lastOp?.value ?? null;
+  return {
+    id: result.id,
+    rev: result.rev,
+    title: typeof title === "string" ? title : "",
+    fieldName,
+    fieldValue
+  };
+}
+async function createWorkItem(context, workItemType, pat, operations) {
+  const url = new URL(
+    `https://dev.azure.com/${encodeURIComponent(context.org)}/${encodeURIComponent(context.project)}/_apis/wit/workitems/$${encodeURIComponent(workItemType)}`
+  );
+  url.searchParams.set("api-version", "7.1");
+  const response = await fetchWithErrors(url.toString(), {
+    method: "POST",
+    headers: writeHeaders(pat),
+    body: JSON.stringify(operations)
+  });
+  return readWriteResponse(response, "CREATE_REJECTED");
+}
+async function applyWorkItemPatch(context, id, pat, operations) {
   const url = new URL(
     `https://dev.azure.com/${encodeURIComponent(context.org)}/${encodeURIComponent(context.project)}/_apis/wit/workitems/${id}`
   );
   url.searchParams.set("api-version", "7.1");
   const response = await fetchWithErrors(url.toString(), {
     method: "PATCH",
-    headers: {
-      ...authHeaders(pat),
-      "Content-Type": "application/json-patch+json"
-    },
+    headers: writeHeaders(pat),
     body: JSON.stringify(operations)
   });
-  if (response.status === 400) {
-    const serverMessage = await readResponseMessage(response) ?? "Unknown error";
-    throw new Error(`UPDATE_REJECTED: ${serverMessage}`);
-  }
-  if (!response.ok) {
-    throw new Error(`HTTP_${response.status}`);
-  }
-  const data = await response.json();
-  const lastOp = operations[operations.length - 1];
-  const fieldValue = lastOp.value ?? null;
-  return {
-    id: data.id,
-    rev: data.rev,
-    title: data.fields["System.Title"],
-    fieldName,
-    fieldValue
-  };
+  return readWriteResponse(response, "UPDATE_REJECTED");
 }
 
 // src/services/auth.ts
@@ -274,19 +337,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)) {
@@ -310,6 +373,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";
@@ -509,6 +601,24 @@ function validateOrgProjectPair(options) {
     process.exit(1);
   }
 }
+function validateSource(options) {
+  const hasContent = options.content !== void 0;
+  const hasFile = options.file !== void 0;
+  if (hasContent === hasFile) {
+    process.stderr.write("Error: provide exactly one of --content or --file\n");
+    process.exit(1);
+  }
+}
+function formatCreateError(err) {
+  const error = err instanceof Error ? err : new Error(String(err));
+  const message = error.message.startsWith("CREATE_REJECTED:") ? error.message.replace("CREATE_REJECTED:", "").trim() : error.message;
+  const requiredMatches = [...message.matchAll(/field ['"]([^'"]+)['"]/gi)];
+  if (requiredMatches.length > 0) {
+    const fields = Array.from(new Set(requiredMatches.map((match) => match[1])));
+    return `Create rejected: ${message} (fields: ${fields.join(", ")})`;
+  }
+  return `Create rejected: ${message}`;
+}
 function handleCommandError(err, id, context, scope = "write", exit = true) {
   const error = err instanceof Error ? err : new Error(String(err));
   const msg = error.message;
@@ -535,6 +645,9 @@ function handleCommandError(err, id, context, scope = "write", exit = true) {
   } else if (msg.startsWith("BAD_REQUEST:")) {
     const serverMsg = msg.replace("BAD_REQUEST: ", "");
     process.stderr.write(`Error: Request rejected: ${serverMsg}
+`);
+  } else if (msg.startsWith("CREATE_REJECTED:")) {
+    process.stderr.write(`Error: ${formatCreateError(error)}
 `);
   } else if (msg.startsWith("UPDATE_REJECTED:")) {
     const serverMsg = msg.replace("UPDATE_REJECTED: ", "");
@@ -561,18 +674,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) {
@@ -593,16 +706,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) {
@@ -613,8 +729,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");
 }
@@ -628,7 +743,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);
@@ -659,6 +774,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");
@@ -711,27 +883,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) => {
@@ -763,36 +917,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");
@@ -1047,8 +1176,683 @@ function createSetMdFieldCommand() {
   return command;
 }
 
+// src/commands/upsert.ts
+import { existsSync as existsSync2, readFileSync as readFileSync3, unlinkSync } from "fs";
+import { Command as Command9 } from "commander";
+
+// src/services/task-document.ts
+var FIELD_ALIASES = /* @__PURE__ */ new Map([
+  ["title", "System.Title"],
+  ["assignedto", "System.AssignedTo"],
+  ["assigned to", "System.AssignedTo"],
+  ["state", "System.State"],
+  ["description", "System.Description"],
+  ["acceptancecriteria", "Microsoft.VSTS.Common.AcceptanceCriteria"],
+  ["acceptance criteria", "Microsoft.VSTS.Common.AcceptanceCriteria"],
+  ["tags", "System.Tags"],
+  ["priority", "Microsoft.VSTS.Common.Priority"]
+]);
+var RICH_TEXT_FIELDS = /* @__PURE__ */ new Set([
+  "System.Description",
+  "Microsoft.VSTS.Common.AcceptanceCriteria"
+]);
+var REFERENCE_NAME_PATTERN = /^[A-Z][A-Za-z0-9]*(\.[A-Za-z0-9]+)+$/;
+function normalizeAlias(name) {
+  return name.trim().replaceAll(/\s+/g, " ").toLowerCase();
+}
+function parseScalarValue(rawValue, fieldName) {
+  if (rawValue === void 0) {
+    throw new Error(`Malformed YAML front matter: missing value for "${fieldName}"`);
+  }
+  const trimmed = rawValue.trim();
+  if (trimmed === "" || trimmed === "null" || trimmed === "~") {
+    return null;
+  }
+  if (trimmed.startsWith('"') && trimmed.endsWith('"') || trimmed.startsWith("'") && trimmed.endsWith("'")) {
+    return trimmed.slice(1, -1);
+  }
+  if (/^[[{]|^[>|]-?$/.test(trimmed)) {
+    throw new Error(`Malformed YAML front matter: unsupported value for "${fieldName}"`);
+  }
+  return trimmed;
+}
+function parseFrontMatter(content) {
+  if (!content.startsWith("---")) {
+    return { frontMatter: "", remainder: content };
+  }
+  const frontMatterPattern = /^---\r?\n([\s\S]*?)\r?\n---(?:\r?\n|$)/;
+  const match = frontMatterPattern.exec(content);
+  if (!match) {
+    throw new Error('Malformed YAML front matter: missing closing "---"');
+  }
+  return {
+    frontMatter: match[1],
+    remainder: content.slice(match[0].length)
+  };
+}
+function assertKnownField(name, kind) {
+  const resolved = resolveFieldName(name);
+  if (!resolved) {
+    const prefix = kind === "rich-text" ? "Unknown rich-text field" : "Unknown field";
+    throw new Error(`${prefix}: ${name}`);
+  }
+  if (kind === "rich-text" && !RICH_TEXT_FIELDS.has(resolved)) {
+    throw new Error(`Unknown rich-text field: ${name}`);
+  }
+  return resolved;
+}
+function pushField(fields, seen, refName, value, kind) {
+  if (seen.has(refName)) {
+    throw new Error(`Duplicate field: ${refName}`);
+  }
+  seen.add(refName);
+  fields.push({
+    refName,
+    value,
+    op: value === null ? "clear" : "set",
+    kind
+  });
+}
+function parseScalarFields(frontMatter, fields, seen) {
+  if (frontMatter.trim() === "") {
+    return;
+  }
+  for (const rawLine of frontMatter.split(/\r?\n/)) {
+    const line = rawLine.trim();
+    if (line === "") {
+      continue;
+    }
+    const separatorIndex = rawLine.indexOf(":");
+    if (separatorIndex <= 0) {
+      throw new Error(`Malformed YAML front matter: ${rawLine.trim()}`);
+    }
+    const rawName = rawLine.slice(0, separatorIndex).trim();
+    const rawValue = rawLine.slice(separatorIndex + 1);
+    const refName = assertKnownField(rawName, "scalar");
+    const value = parseScalarValue(rawValue, rawName);
+    pushField(fields, seen, refName, value, "scalar");
+  }
+}
+function parseRichTextSections(content, fields, seen) {
+  const normalizedContent = content.replaceAll("\r\n", "\n");
+  const lines = normalizedContent.split("\n");
+  const headings = [];
+  for (let index = 0; index < lines.length; index += 1) {
+    const line = lines[index];
+    if (!line.startsWith("##")) {
+      continue;
+    }
+    const headingBody = line.slice(2);
+    if (headingBody.trim() === "" || !headingBody.startsWith(" ") && !headingBody.startsWith("	")) {
+      continue;
+    }
+    headings.push({
+      lineIndex: index,
+      rawName: headingBody.trim()
+    });
+  }
+  if (headings.length === 0) {
+    return;
+  }
+  for (let index = 0; index < headings[0].lineIndex; index += 1) {
+    if (lines[index].trim() !== "") {
+      throw new Error("Unexpected content before the first markdown heading section");
+    }
+  }
+  for (let index = 0; index < headings.length; index += 1) {
+    const { lineIndex, rawName } = headings[index];
+    const refName = assertKnownField(rawName, "rich-text");
+    const bodyStart = lineIndex + 1;
+    const bodyEnd = index + 1 < headings.length ? headings[index + 1].lineIndex : lines.length;
+    const rawBody = lines.slice(bodyStart, bodyEnd).join("\n");
+    const value = rawBody.trim() === "" ? null : rawBody.trimEnd();
+    pushField(fields, seen, refName, value, "rich-text");
+  }
+}
+function resolveFieldName(name) {
+  const trimmed = name.trim();
+  if (trimmed === "") {
+    return null;
+  }
+  const alias = FIELD_ALIASES.get(normalizeAlias(trimmed));
+  if (alias) {
+    return alias;
+  }
+  return REFERENCE_NAME_PATTERN.test(trimmed) ? trimmed : null;
+}
+function parseTaskDocument(content) {
+  const { frontMatter, remainder } = parseFrontMatter(content);
+  const fields = [];
+  const seen = /* @__PURE__ */ new Set();
+  parseScalarFields(frontMatter, fields, seen);
+  parseRichTextSections(remainder, fields, seen);
+  return { fields };
+}
+
+// src/commands/upsert.ts
+function fail2(message) {
+  process.stderr.write(`Error: ${message}
+`);
+  process.exit(1);
+}
+function loadSourceContent(options) {
+  validateSource(options);
+  if (options.content !== void 0) {
+    return { content: options.content };
+  }
+  const filePath = options.file;
+  if (!existsSync2(filePath)) {
+    fail2(`File not found: ${filePath}`);
+  }
+  try {
+    return {
+      content: readFileSync3(filePath, "utf-8"),
+      sourceFile: filePath
+    };
+  } catch {
+    fail2(`Cannot read file: ${filePath}`);
+  }
+}
+function toPatchOperations(fields, action) {
+  const operations = [];
+  for (const field of fields) {
+    if (field.op === "clear") {
+      if (action === "updated") {
+        operations.push({ op: "remove", path: `/fields/${field.refName}` });
+      }
+      continue;
+    }
+    operations.push({ op: "add", path: `/fields/${field.refName}`, value: field.value ?? "" });
+    if (field.kind === "rich-text") {
+      operations.push({
+        op: "add",
+        path: `/multilineFieldsFormat/${field.refName}`,
+        value: "Markdown"
+      });
+    }
+  }
+  return operations;
+}
+function buildAppliedFields(fields) {
+  const applied = {};
+  for (const field of fields) {
+    applied[field.refName] = field.value;
+  }
+  return applied;
+}
+function ensureTitleForCreate(fields) {
+  const titleField = fields.find((field) => field.refName === "System.Title");
+  if (!titleField || titleField.op === "clear" || titleField.value === null || titleField.value.trim() === "") {
+    fail2("Title is required when creating a task.");
+  }
+}
+function writeSuccess(result, options) {
+  if (options.json) {
+    process.stdout.write(`${JSON.stringify(result)}
+`);
+    return;
+  }
+  const verb = result.action === "created" ? "Created" : "Updated";
+  const fields = Object.keys(result.fields).join(", ");
+  const suffix = fields ? ` (${fields})` : "";
+  process.stdout.write(`${verb} task #${result.id}${suffix}
+`);
+}
+function cleanupSourceFile(sourceFile) {
+  if (!sourceFile) {
+    return;
+  }
+  try {
+    unlinkSync(sourceFile);
+  } catch {
+    process.stderr.write(`Warning: upsert succeeded but could not delete source file: ${sourceFile}
+`);
+  }
+}
+function buildUpsertResult(action, writeResult, fields) {
+  const appliedFields = buildAppliedFields(fields);
+  return {
+    action,
+    id: writeResult.id,
+    fields: appliedFields
+  };
+}
+function isUpdateWriteError(err) {
+  return err.message === "AUTH_FAILED" || err.message === "PERMISSION_DENIED" || err.message === "NOT_FOUND" || err.message === "NETWORK_ERROR" || err.message.startsWith("BAD_REQUEST:") || err.message.startsWith("UPDATE_REJECTED:");
+}
+function isCreateWriteError(err) {
+  return err.message === "AUTH_FAILED" || err.message === "PERMISSION_DENIED" || err.message === "NETWORK_ERROR" || err.message.startsWith("BAD_REQUEST:") || err.message.startsWith("HTTP_");
+}
+function handleUpsertError(err, id, context) {
+  if (!(err instanceof Error)) {
+    process.stderr.write(`Error: ${String(err)}
+`);
+    process.exit(1);
+  }
+  if (id === void 0 && err.message.startsWith("CREATE_REJECTED:")) {
+    process.stderr.write(`Error: ${formatCreateError(err)}
+`);
+    process.exit(1);
+  }
+  if (id !== void 0 && isUpdateWriteError(err)) {
+    handleCommandError(err, id, context, "write");
+    return;
+  }
+  if (id === void 0 && isCreateWriteError(err)) {
+    handleCommandError(err, 0, context, "write");
+    return;
+  }
+  process.stderr.write(`Error: ${err.message}
+`);
+  process.exit(1);
+}
+function createUpsertCommand() {
+  const command = new Command9("upsert");
+  command.description("Create or update a Task from a markdown document").argument("[id]", "work item ID to update; omit to create a new Task").option("--content <markdown>", "task document content").option("--file <path>", "read task document from file").option("--json", "output result as JSON").option("--org <org>", "Azure DevOps organization").option("--project <project>", "Azure DevOps project").action(async (idStr, options) => {
+    validateOrgProjectPair(options);
+    const id = idStr === void 0 ? void 0 : parseWorkItemId(idStr);
+    const { content, sourceFile } = loadSourceContent(options);
+    let context;
+    try {
+      context = resolveContext(options);
+      const document = parseTaskDocument(content);
+      const action = id === void 0 ? "created" : "updated";
+      if (action === "created") {
+        ensureTitleForCreate(document.fields);
+      }
+      const operations = toPatchOperations(document.fields, action);
+      const credential = await resolvePat();
+      let writeResult;
+      if (action === "created") {
+        writeResult = await createWorkItem(context, "Task", credential.pat, operations);
+      } else {
+        if (id === void 0) {
+          fail2("Work item ID is required for updates.");
+        }
+        writeResult = await applyWorkItemPatch(context, id, credential.pat, operations);
+      }
+      const result = buildUpsertResult(action, writeResult, document.fields);
+      writeSuccess(result, options);
+      cleanupSourceFile(sourceFile);
+    } catch (err) {
+      handleUpsertError(err, id, context);
+    }
+  });
+  return command;
+}
+
+// src/commands/list-fields.ts
+import { Command as Command10 } from "commander";
+function stringifyValue(value) {
+  if (value === null || value === void 0) return "";
+  if (typeof value === "object") return JSON.stringify(value);
+  return String(value);
+}
+function formatRichValue(raw) {
+  const md = htmlToMarkdown(raw);
+  const lines = md.split("\n").filter((l) => l.trim() !== "");
+  const preview = lines.slice(0, 5);
+  const suffix = lines.length > 5 ? `
+  \u2026 (${lines.length - 5} more lines)` : "";
+  return preview.join("\n  ") + suffix;
+}
+function formatFieldList(fields) {
+  const entries = Object.entries(fields).sort(([a], [b]) => a.localeCompare(b));
+  const maxKeyLen = Math.min(
+    Math.max(...entries.map(([k]) => k.length)),
+    50
+  );
+  return entries.map(([key, value]) => {
+    const raw = stringifyValue(value);
+    if (raw === "") return `${key.padEnd(maxKeyLen + 2)}(empty)`;
+    if (typeof value === "string" && isHtml(value)) {
+      const preview = formatRichValue(value);
+      return `${key.padEnd(maxKeyLen + 2)}[rich text]
+  ${preview}`;
+    }
+    return `${key.padEnd(maxKeyLen + 2)}${raw}`;
+  }).join("\n");
+}
+function createListFieldsCommand() {
+  const command = new Command10("list-fields");
+  command.description("List all fields of an Azure DevOps work item").argument("<id>", "work item ID").option("--org <org>", "Azure DevOps organization").option("--project <project>", "Azure DevOps project").option("--json", "output result as JSON").action(
+    async (idStr, options) => {
+      const id = parseWorkItemId(idStr);
+      validateOrgProjectPair(options);
+      let context;
+      try {
+        context = resolveContext(options);
+        const credential = await resolvePat();
+        const fields = await getWorkItemFields(context, id, credential.pat);
+        if (options.json) {
+          process.stdout.write(JSON.stringify({ id, fields }, null, 2) + "\n");
+        } else {
+          process.stdout.write(`Work Item ${id} \u2014 ${Object.keys(fields).length} fields
+
+`);
+          process.stdout.write(formatFieldList(fields) + "\n");
+        }
+      } catch (err) {
+        handleCommandError(err, id, context, "read");
+      }
+    }
+  );
+  return command;
+}
+
+// src/commands/pr.ts
+import { Command as Command11 } 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("", `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");
+}
+async function resolvePrCommandContext(options) {
+  const context = resolveContext(options);
+  const repo = detectRepoName();
+  const branch = getCurrentBranch();
+  const credential = await resolvePat();
+  return {
+    context,
+    repo,
+    branch,
+    pat: credential.pat
+  };
+}
+function createPrStatusCommand() {
+  const command = new Command11("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 {
+      const resolved = await resolvePrCommandContext(options);
+      context = resolved.context;
+      const pullRequests = await listPullRequests(resolved.context, resolved.repo, resolved.pat, resolved.branch);
+      const { branch, repo } = resolved;
+      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 Command11("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 {
+      const resolved = await resolvePrCommandContext(options);
+      context = resolved.context;
+      if (resolved.branch === "develop") {
+        writeError("Pull request creation requires a source branch other than develop.");
+      }
+      const result = await openPullRequest(
+        resolved.context,
+        resolved.repo,
+        resolved.pat,
+        resolved.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 ${resolved.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 Command11("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 {
+      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}.`);
+      }
+      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.`);
+      }
+      const pullRequest = pullRequests[0];
+      const threads = await getPullRequestThreads(resolved.context, resolved.repo, resolved.pat, pullRequest.id);
+      const result = { branch: resolved.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 Command11("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 Command9();
+var program = new Command12();
 program.name("azdo").description("Azure DevOps CLI tool").version(version, "-v, --version");
 program.addCommand(createGetItemCommand());
 program.addCommand(createClearPatCommand());
@@ -1058,6 +1862,9 @@ program.addCommand(createAssignCommand());
 program.addCommand(createSetFieldCommand());
 program.addCommand(createGetMdFieldCommand());
 program.addCommand(createSetMdFieldCommand());
+program.addCommand(createUpsertCommand());
+program.addCommand(createListFieldsCommand());
+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-feature-devcontainer.72",
+  "version": "0.2.0-feature-more-resilient-fields.105",
   "description": "Azure DevOps CLI tool",
   "type": "module",
   "bin": {
@@ -14,7 +14,8 @@
     "lint": "eslint src/",
     "typecheck": "tsc --noEmit",
     "format": "prettier --check src/",
-    "test": "npm run build && vitest run"
+    "test": "npm run build && vitest run tests/unit",
+    "test:integration": "npm run build && vitest run tests/integration"
   },
   "repository": {
     "type": "git",
@@ -28,12 +29,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"
   }
 }