azdo-cli 0.22.0-develop.822 → 0.22.0-develop.828

package/README.md

@@ -105,6 +105,7 @@ git log -1 --format=%B | azdo pr comments add --file - --pr-number 64      # "-"
 azdo pr open --title "Fix the thing" --description "Because X was broken"
 azdo pr open --title "Fix the thing"   # uses docs/pull_request_template[/branches/<branch>].md if present
 azdo pr open --title "Fix the thing" --description-file body.md   # or --description-file - to pipe it in
+azdo pr open --title "Fix the thing" --target master --source feature/x --draft --work-item 1234 --label bug   # --work-item/--label repeat; --json adds top-level id and url
 # The description plus the template must stay within Azure DevOps' 4000-character cap; over it,
 # the command says by how much and creates nothing. See docs/commands.md.
 

package/dist/index.js

@@ -143,6 +143,7 @@ function getActiveTraceWriter() {
 }
 
 // src/services/command-helpers.ts
+import { existsSync, readFileSync as readFileSync2 } from "fs";
 var EXIT_CREDENTIAL_STORE_UNAVAILABLE = 4;
 function reportCredentialStoreUnavailable(err) {
   if (!(err instanceof CredentialStoreUnavailableError)) return false;
@@ -279,11 +280,29 @@ function handleCommandError(err, id, context, scope = "write", exit = true) {
     process.exitCode = 1;
   }
 }
+var STDIN_PATH = "-";
+function readTextSource(file) {
+  if (file === STDIN_PATH) {
+    try {
+      return readFileSync2(0, "utf-8");
+    } catch {
+      throw new Error("Cannot read standard input.");
+    }
+  }
+  if (!existsSync(file)) {
+    throw new Error(`File not found: ${file}`);
+  }
+  try {
+    return readFileSync2(file, "utf-8");
+  } catch {
+    throw new Error(`Cannot read file: ${file}`);
+  }
+}
 
 // src/services/image-download.ts
 import { Jimp } from "jimp";
 import { writeFile } from "fs/promises";
-import { existsSync } from "fs";
+import { existsSync as existsSync2 } from "fs";
 import { tmpdir } from "os";
 import { join } from "path";
 var ATTACHMENT_GUID_RE = /_apis\/wit\/attachments\/([0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12})/;
@@ -366,7 +385,7 @@ function resolveImageDownloadOptions(flags) {
     maxWidth = parsed;
   }
   const outputDir = flags.imagesPath ?? tmpdir();
-  if (flags.imagesPath !== void 0 && !existsSync(outputDir)) {
+  if (flags.imagesPath !== void 0 && !existsSync2(outputDir)) {
     throw new Error(`Images path "${outputDir}" does not exist.`);
   }
   return { enabled, maxWidth, outputDir };
@@ -668,6 +687,11 @@ function buildWorkItemCommentsUrl(context, id) {
   url.searchParams.set("api-version", "7.1-preview.4");
   return url;
 }
+function buildWorkItemCommentUrl(context, id, commentId) {
+  const url = buildWorkItemCommentsUrl(context, id);
+  url.pathname = `${url.pathname}/${commentId}`;
+  return url;
+}
 function mapWorkItemComment(comment, fallbackWorkItemId) {
   return {
     id: comment.id ?? comment.commentId ?? 0,
@@ -892,16 +916,11 @@ async function listWorkItemComments(context, id, cred) {
     comments
   };
 }
-async function addWorkItemComment(context, id, cred, text, format = "html") {
-  const url = buildWorkItemCommentsUrl(context, id);
-  url.searchParams.set("format", format);
+async function sendCommentRequest(url, cred, method, body) {
   const response = await fetchWithErrors(url.toString(), {
-    method: "POST",
-    headers: {
-      ...authHeaders(cred),
-      "Content-Type": "application/json"
-    },
-    body: JSON.stringify({ text })
+    method,
+    headers: body === void 0 ? authHeaders(cred) : { ...authHeaders(cred), "Content-Type": "application/json" },
+    body: body === void 0 ? void 0 : JSON.stringify(body)
   });
   if (response.status === 400) {
     const serverMessage = await readResponseMessage(response) ?? "Unknown error";
@@ -910,16 +929,50 @@ async function addWorkItemComment(context, id, cred, text, format = "html") {
   if (!response.ok) {
     throw httpError(response);
   }
+  return response;
+}
+async function writeCommentText(url, cred, method, text, format, fallback) {
+  url.searchParams.set("format", format);
+  const response = await sendCommentRequest(url, cred, method, { text });
   const data = await response.json();
   return {
-    workItemId: data.workItemId ?? id,
-    commentId: data.commentId ?? data.id ?? 0,
+    workItemId: data.workItemId ?? fallback.workItemId,
+    commentId: data.commentId ?? data.id ?? fallback.commentId,
     text: typeof data.text === "string" ? data.text : text,
     author: data.createdBy?.displayName ?? null,
     createdAt: data.createdDate ?? null,
+    modifiedAt: data.modifiedDate ?? null,
     url: data.url ?? null
   };
 }
+async function addWorkItemComment(context, id, cred, text, format = "html") {
+  const written = await writeCommentText(
+    buildWorkItemCommentsUrl(context, id),
+    cred,
+    "POST",
+    text,
+    format,
+    { workItemId: id, commentId: 0 }
+  );
+  return {
+    workItemId: written.workItemId,
+    commentId: written.commentId,
+    text: written.text,
+    author: written.author,
+    createdAt: written.createdAt,
+    url: written.url
+  };
+}
+async function updateWorkItemComment(context, id, commentId, cred, text, format = "html") {
+  return writeCommentText(buildWorkItemCommentUrl(context, id, commentId), cred, "PATCH", text, format, {
+    workItemId: id,
+    commentId
+  });
+}
+async function deleteWorkItemComment(context, id, commentId, cred) {
+  await sendCommentRequest(buildWorkItemCommentUrl(context, id, commentId), cred, "DELETE");
+  return { workItemId: id, commentId, deleted: true };
+}
 async function updateWorkItem(context, id, cred, fieldName, operations) {
   const result = await applyWorkItemPatch(context, id, cred, operations);
   const title = result.fields["System.Title"];
@@ -1093,7 +1146,7 @@ async function queryWorkItems(context, cred, filter) {
 
 // src/services/auth.ts
 import { createInterface } from "readline";
-import { existsSync as existsSync2, readFileSync as readFileSync2 } from "fs";
+import { existsSync as existsSync3, readFileSync as readFileSync3 } from "fs";
 import { dirname as dirname2, join as join2 } from "path";
 
 // src/services/oauth-device-code.ts
@@ -1263,8 +1316,8 @@ async function promptForPat() {
   });
 }
 function patFromEnvFile(envFile) {
-  if (!existsSync2(envFile)) return null;
-  const contents = readFileSync2(envFile, "utf8");
+  if (!existsSync3(envFile)) return null;
+  const contents = readFileSync3(envFile, "utf8");
   for (const line of contents.split("\n")) {
     const match = line.match(/^AZDO_PAT\s*=([^\n\r]+)$/);
     if (match === null) continue;
@@ -3318,7 +3371,7 @@ function createGetMdFieldCommand() {
 }
 
 // src/commands/set-md-field.ts
-import { existsSync as existsSync3, readFileSync as readFileSync3 } from "fs";
+import { existsSync as existsSync4, readFileSync as readFileSync4 } from "fs";
 import { Command as Command10 } from "commander";
 function fail(message) {
   process.stderr.write(`Error: ${message}
@@ -3338,11 +3391,11 @@ function resolveContent(inlineContent, options) {
   return null;
 }
 function readFileContent(filePath) {
-  if (!existsSync3(filePath)) {
+  if (!existsSync4(filePath)) {
     fail(`File not found: ${filePath}`);
   }
   try {
-    return readFileSync3(filePath, "utf-8");
+    return readFileSync4(filePath, "utf-8");
   } catch {
     fail(`Cannot read file: ${filePath}`);
   }
@@ -3407,7 +3460,7 @@ function createSetMdFieldCommand() {
 }
 
 // src/commands/upsert.ts
-import { existsSync as existsSync4, readFileSync as readFileSync4, unlinkSync } from "fs";
+import { existsSync as existsSync5, readFileSync as readFileSync5, unlinkSync } from "fs";
 import { Command as Command11 } from "commander";
 
 // src/services/task-document.ts
@@ -3571,12 +3624,12 @@ function loadSourceContent(options) {
     return { content: options.content };
   }
   const filePath = options.file;
-  if (!existsSync4(filePath)) {
+  if (!existsSync5(filePath)) {
     fail2(`File not found: ${filePath}`);
   }
   try {
     return {
-      content: readFileSync4(filePath, "utf-8"),
+      content: readFileSync5(filePath, "utf-8"),
       sourceFile: filePath
     };
   } catch {
@@ -3795,7 +3848,6 @@ function createListFieldsCommand() {
 }
 
 // src/commands/pr.ts
-import { existsSync as existsSync5, readFileSync as readFileSync5 } from "fs";
 import { Command as Command13 } from "commander";
 
 // src/services/pr-client.ts
@@ -4130,43 +4182,26 @@ function formatContributions(composed) {
 function describeDescriptionBudget(composed) {
   return `description: ${composed.providedChars} provided + ${composed.separatorChars} separator + ${composed.templateChars} template = ${composed.totalChars} characters (client limit ${MAX_PR_DESCRIPTION_CHARS})`;
 }
-async function openPullRequest(context, repo, cred, sourceBranch, title, description) {
-  const existing = await listPullRequests(context, repo, cred, 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 repository = await getRepository(context, repo, cred);
-  const defaultBranch = repository.defaultBranch ? repository.defaultBranch.replace(/^refs\/heads\//, "") : "develop";
-  const template = await resolvePullRequestTemplate(context, repo, cred, defaultBranch, "develop");
-  const composed = composeDescription(description, template);
-  if (composed === null) {
-    throw new Error("DESCRIPTION_REQUIRED");
-  }
-  if (composed.totalChars > MAX_PR_DESCRIPTION_CHARS) {
-    throw new Error(`DESCRIPTION_TOO_LONG: ${formatDescriptionOverflow(composed)}`);
-  }
+function buildOpenPayload(sourceBranch, targetBranch, title, description, options) {
   const payload = {
     sourceRefName: `refs/heads/${sourceBranch}`,
-    targetRefName: "refs/heads/develop",
+    targetRefName: `refs/heads/${targetBranch}`,
     title,
-    description: composed.text
+    description
   };
+  if (options.isDraft) {
+    payload.isDraft = true;
+  }
+  if (options.labels && options.labels.length > 0) {
+    payload.labels = options.labels.map((name) => ({ name }));
+  }
+  return payload;
+}
+async function createPullRequest(context, repo, cred, payload, composed) {
   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");
-  let data;
   try {
     const response = await fetchWithErrors(url.toString(), {
       method: "POST",
@@ -4176,19 +4211,69 @@ async function openPullRequest(context, repo, cred, sourceBranch, title, descrip
       },
       body: JSON.stringify(payload)
     });
-    data = await readJsonResponse(response);
+    return await readJsonResponse(response);
   } catch (err) {
     if (err instanceof Error && err.message.startsWith("HTTP_400")) {
       throw new Error(`${err.message} | ${describeDescriptionBudget(composed)}`, { cause: err });
     }
     throw err;
   }
-  return {
+}
+function linkWorkItems(context, repo, cred, prId, workItemIds) {
+  return Promise.all(
+    workItemIds.map(
+      (id) => linkWorkItemToPullRequest(context, repo, cred, prId, id).then(
+        () => ({ id, linked: true }),
+        (err) => ({ id, linked: false, error: err instanceof Error ? err.message : String(err) })
+      )
+    )
+  );
+}
+async function openPullRequest(context, repo, cred, sourceBranch, title, description, options = {}) {
+  const targetBranch = options.targetBranch ?? "develop";
+  const existing = await listPullRequests(context, repo, cred, sourceBranch, {
+    status: "active",
+    targetBranch
+  });
+  if (existing.length === 1) {
+    return {
+      branch: sourceBranch,
+      targetBranch,
+      created: false,
+      pullRequest: existing[0]
+    };
+  }
+  if (existing.length > 1) {
+    throw new Error(`AMBIGUOUS_PRS:${existing.map((pullRequest2) => pullRequest2.id).join(",")}`);
+  }
+  const repository = await getRepository(context, repo, cred);
+  const defaultBranch = repository.defaultBranch ? repository.defaultBranch.replace(/^refs\/heads\//, "") : "develop";
+  const template = await resolvePullRequestTemplate(context, repo, cred, defaultBranch, targetBranch);
+  const composed = composeDescription(description, template);
+  if (composed === null) {
+    throw new Error("DESCRIPTION_REQUIRED");
+  }
+  if (composed.totalChars > MAX_PR_DESCRIPTION_CHARS) {
+    throw new Error(`DESCRIPTION_TOO_LONG: ${formatDescriptionOverflow(composed)}`);
+  }
+  const data = await createPullRequest(
+    context,
+    repo,
+    cred,
+    buildOpenPayload(sourceBranch, targetBranch, title, composed.text, options),
+    composed
+  );
+  const pullRequest = mapPullRequest(context, repo, data);
+  const result = {
     branch: sourceBranch,
-    targetBranch: "develop",
+    targetBranch,
     created: true,
-    pullRequest: mapPullRequest(context, repo, data)
+    pullRequest
   };
+  if (options.workItemIds && options.workItemIds.length > 0) {
+    result.workItems = await linkWorkItems(context, repo, cred, pullRequest.id, options.workItemIds);
+  }
+  return result;
 }
 async function updatePullRequest(context, repo, cred, prId, fields) {
   if (fields.description !== void 0 && fields.description.length > MAX_PR_DESCRIPTION_CHARS) {
@@ -4615,24 +4700,11 @@ function writeContractError(line) {
   process.exitCode = 1;
 }
 var EMPTY_BODY_ERROR = "Comment text must not be empty. Pass the text inline or use --file <path>.";
-var STDIN_PATH = "-";
-function readTextSource(file) {
-  if (file === STDIN_PATH) {
-    try {
-      return readFileSync5(0, "utf-8");
-    } catch {
-      writeError("Cannot read standard input.");
-      return null;
-    }
-  }
-  if (!existsSync5(file)) {
-    writeError(`File not found: ${file}`);
-    return null;
-  }
+function readTextSource2(file) {
   try {
-    return readFileSync5(file, "utf-8");
-  } catch {
-    writeError(`Cannot read file: ${file}`);
+    return readTextSource(file);
+  } catch (err) {
+    writeError(err.message);
     return null;
   }
 }
@@ -4643,7 +4715,7 @@ function resolveCommentBody(inline, file, emptyMessage = EMPTY_BODY_ERROR) {
   }
   let body;
   if (file !== void 0) {
-    const read = readTextSource(file);
+    const read = readTextSource2(file);
     if (read === null) {
       return null;
     }
@@ -4673,7 +4745,7 @@ function resolveOptionalTextInput(inline, file, flag) {
   const emptyMessage = `${label} must not be empty. Pass the text inline or use --${flag}-file <path>.`;
   let value;
   if (file !== void 0) {
-    const read = readTextSource(file);
+    const read = readTextSource2(file);
     if (read === null) {
       return null;
     }
@@ -4970,11 +5042,11 @@ function createPrStatusCommand() {
   });
   return command;
 }
-function handlePrOpenError(err, context) {
+function handlePrOpenError(err, context, targetBranch = "develop") {
   const message = err instanceof Error ? err.message : "";
   if (message.startsWith("AMBIGUOUS_PRS:")) {
     const ids = 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.`);
+    writeError(`Multiple active pull requests already exist for this branch targeting ${targetBranch}: ${ids}. Use pr status to review them.`);
     return;
   }
   if (message === "DESCRIPTION_REQUIRED") {
@@ -4987,13 +5059,54 @@ function handlePrOpenError(err, context) {
   }
   handlePrCommandError(err, context, "write");
 }
+function collectOption(value, previous) {
+  return [...previous, value];
+}
+function stripHeadsPrefix(branch) {
+  return branch.trim().replace(/^refs\/heads\//, "");
+}
+function resolveOpenOptions(options) {
+  const targetBranch = options.target === void 0 ? "develop" : stripHeadsPrefix(options.target);
+  const source = options.source === void 0 ? void 0 : stripHeadsPrefix(options.source);
+  if (!targetBranch) {
+    writeError("--target must not be empty.");
+    return null;
+  }
+  if (source !== void 0 && !source) {
+    writeError("--source must not be empty.");
+    return null;
+  }
+  const workItemIds = [];
+  for (const raw of options.workItem ?? []) {
+    const id = Number(raw.trim());
+    if (!/^\d+$/.test(raw.trim()) || !Number.isSafeInteger(id) || id <= 0) {
+      writeError(`--work-item must be a positive integer, got "${raw}".`);
+      return null;
+    }
+    if (!workItemIds.includes(id)) {
+      workItemIds.push(id);
+    }
+  }
+  const labels = [];
+  for (const raw of options.label ?? []) {
+    const name = raw.trim();
+    if (!name) {
+      writeError("--label must not be empty.");
+      return null;
+    }
+    if (!labels.includes(name)) {
+      labels.push(name);
+    }
+  }
+  return { targetBranch, source, isDraft: options.draft === true, labels, workItemIds };
+}
 function resolveOpenDescription(inline, file) {
   if (inline !== void 0 && file !== void 0) {
     writeError("Cannot specify both --description and --description-file.");
     return null;
   }
   if (file !== void 0) {
-    const fromFile = readTextSource(file);
+    const fromFile = readTextSource2(file);
     if (fromFile === null) {
       return null;
     }
@@ -5012,13 +5125,18 @@ function resolveOpenDescription(inline, file) {
 }
 function createPrOpenCommand() {
   const command = new Command13("open");
-  withCommonPrOptions(command).description("Open a pull request from the current branch to develop").option("--title <title>", "pull request title").option(
+  withCommonPrOptions(command).description("Open a pull request (default: from the current branch to develop)").option("--title <title>", "pull request title").option(
     "--description <description>",
     "pull request description; when omitted, a repository-defined pull request template is used if one exists (prepended by this text when both are present)"
   ).option(
     "--description-file <path>",
     'read the description from a UTF-8 file instead of --description; "-" reads standard input'
-  ).option("--json", "output JSON").action(async (options) => {
+  ).option("--target <branch>", "target branch (default: develop); refs/heads/ prefix accepted").option("--source <branch>", "source branch (default: the current branch); no local checkout needed").option("--draft", "open the pull request as a draft").option(
+    "--work-item <id>",
+    "link a work item to the pull request (positive integer; repeatable)",
+    collectOption,
+    []
+  ).option("--label <label>", "add a label to the pull request (repeatable)", collectOption, []).option("--json", "output JSON; adds top-level id and url next to pullRequest").action(async (options) => {
     validateOrgProjectPair(options);
     const title = options.title?.trim();
     if (!title) {
@@ -5029,45 +5147,71 @@ function createPrOpenCommand() {
     if (description === null) {
       return;
     }
+    const openOptions = resolveOpenOptions(options);
+    if (openOptions === null) {
+      return;
+    }
     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 openBranch = openOptions.source ?? getCurrentBranch();
+      const target = openOptions.targetBranch;
+      if (openBranch === target) {
+        writeError(
+          target === "develop" ? "Pull request creation requires a source branch other than develop." : `Pull request creation requires a source branch other than the target branch (${target}).`
+        );
         return;
       }
-      const openBranch = resolved.branch;
+      const resolved = await resolvePrCommandContext(options, { requireBranch: false });
+      context = resolved.context;
       const result = await openPullRequest(
         resolved.context,
         resolved.repo,
         resolved.pat,
         openBranch,
         title,
-        description
+        description,
+        openOptions
       );
       if (options.json) {
-        process.stdout.write(`${JSON.stringify(result, null, 2)}
+        const output = { ...result, id: result.pullRequest.id, url: result.pullRequest.url };
+        process.stdout.write(`${JSON.stringify(output, null, 2)}
 `);
+        reportWorkItemLinkFailures(result);
         return;
       }
       if (result.created) {
         process.stdout.write(`Created pull request #${result.pullRequest.id}: ${result.pullRequest.title}
 ${result.pullRequest.url ?? "\u2014"}
 `);
+        reportWorkItemLinkFailures(result);
         return;
       }
       process.stdout.write(
-        `Active pull request already exists for ${resolved.branch} -> develop: #${result.pullRequest.id}
+        `Active pull request already exists for ${openBranch} -> ${result.targetBranch}: #${result.pullRequest.id}
 ${result.pullRequest.url ?? "\u2014"}
 `
       );
+      if (openOptions.isDraft || openOptions.labels?.length || openOptions.workItemIds?.length) {
+        const hint = openOptions.workItemIds?.length ? " Use pr work-items link to link a work item." : "";
+        process.stdout.write(
+          `--draft, --label and --work-item were not applied; the existing pull request was left unchanged.${hint}
+`
+        );
+      }
     } catch (err) {
-      handlePrOpenError(err, context);
+      handlePrOpenError(err, context, openOptions.targetBranch);
     }
   });
   return command;
 }
+function reportWorkItemLinkFailures(result) {
+  const failed = (result.workItems ?? []).filter((item) => !item.linked);
+  if (failed.length === 0) return;
+  const detail = failed.map((item) => `#${item.id} (${item.error ?? "unknown error"})`).join(", ");
+  writeError(
+    `Pull request #${result.pullRequest.id} was created but could not be linked to work item ${detail}. Retry with: azdo pr work-items link <id> --pr-number ${result.pullRequest.id}`
+  );
+}
 function handlePrUpdateError(err, context) {
   const message = err instanceof Error ? err.message : "";
   if (message.startsWith("DESCRIPTION_TOO_LONG: ")) {
@@ -7534,6 +7678,26 @@ function createPipelineCommand() {
 
 // src/commands/comments.ts
 import { Command as Command15 } from "commander";
+async function runCommentWrite(options, target, request, humanLine) {
+  let context;
+  try {
+    context = resolveContext(options);
+    const credential = await requireAuthCredential(context.org);
+    const result = await request(context, credential);
+    process.stdout.write(options.json ? `${JSON.stringify(result, null, 2)}
+` : `${humanLine(result)}
+`);
+  } catch (err) {
+    if (target.commentId === void 0) {
+      handleCommandError(err, target.id, context, "write");
+    } else {
+      handleCommentWriteError(err, target.id, target.commentId, context);
+    }
+  }
+}
+function commentFormat(options) {
+  return options.markdown === true ? "markdown" : "html";
+}
 function writeError3(message) {
   process.stderr.write(`Error: ${message}
 `);
@@ -7588,22 +7752,74 @@ function createCommentsAddCommand() {
     if (text.trim() === "") {
       writeError3("Comment text must be a non-empty string.");
     }
-    let context;
+    await runCommentWrite(
+      options,
+      { id },
+      (context, credential) => addWorkItemComment(context, id, credential, text, commentFormat(options)),
+      (result) => `Added comment #${result.commentId} to work item #${result.workItemId}`
+    );
+  });
+  return command;
+}
+function parseCommentId(value) {
+  if (!/^\d+$/.test(value) || Number(value) < 1) {
+    writeError3(`Invalid comment ID "${value}". Expected a positive integer.`);
+  }
+  return Number(value);
+}
+function resolveEditText(inline, file) {
+  if (inline !== void 0 && file !== void 0) {
+    writeError3("Cannot specify both inline text and --file.");
+  }
+  let body = inline;
+  if (file !== void 0) {
     try {
-      context = resolveContext(options);
-      const credential = await requireAuthCredential(context.org);
-      const format = options.markdown === true ? "markdown" : "html";
-      const result = await addWorkItemComment(context, id, credential, text, format);
-      if (options.json) {
-        process.stdout.write(`${JSON.stringify(result, null, 2)}
-`);
-        return;
-      }
-      process.stdout.write(`Added comment #${result.commentId} to work item #${result.workItemId}
-`);
+      body = readTextSource(file);
     } catch (err) {
-      handleCommandError(err, id, context, "write");
+      writeError3(err.message);
     }
+  }
+  if (body === void 0 || body.trim() === "") {
+    writeError3("Comment text must be a non-empty string. Pass the text inline or use --file <path>.");
+  }
+  return body;
+}
+function handleCommentWriteError(err, id, commentId, context) {
+  if (err instanceof Error && err.message.startsWith("NOT_FOUND")) {
+    writeError3(
+      `Comment ${commentId} not found on work item ${id} in ${context?.org}/${context?.project}.`
+    );
+  }
+  handleCommandError(err, id, context, "write");
+}
+function createCommentsEditCommand() {
+  const command = new Command15("edit");
+  command.description("Edit an existing comment on a work item").argument("<id>", "work item ID").argument("<commentId>", "comment ID").argument("[text]", "new comment text (or use --file)").option("--file <path>", 'read the new comment text from a file ("-" for stdin)').option("--org <org>", "Azure DevOps organization").option("--project <project>", "Azure DevOps project").option("--json", "output JSON").option("--markdown", "post comment as markdown").action(async (idStr, commentIdStr, text, options) => {
+    validateOrgProjectPair(options);
+    const id = parseWorkItemId(idStr);
+    const commentId = parseCommentId(commentIdStr);
+    const body = resolveEditText(text, options.file);
+    await runCommentWrite(
+      options,
+      { id, commentId },
+      (context, credential) => updateWorkItemComment(context, id, commentId, credential, body, commentFormat(options)),
+      (result) => `Updated comment #${result.commentId} on work item #${result.workItemId}`
+    );
+  });
+  return command;
+}
+function createCommentsDeleteCommand() {
+  const command = new Command15("delete");
+  command.description("Delete a comment from a work item (no confirmation prompt)").argument("<id>", "work item ID").argument("<commentId>", "comment ID").option("--org <org>", "Azure DevOps organization").option("--project <project>", "Azure DevOps project").option("--json", "output JSON").action(async (idStr, commentIdStr, options) => {
+    validateOrgProjectPair(options);
+    const id = parseWorkItemId(idStr);
+    const commentId = parseCommentId(commentIdStr);
+    await runCommentWrite(
+      options,
+      { id, commentId },
+      (context, credential) => deleteWorkItemComment(context, id, commentId, credential),
+      (result) => `Deleted comment #${result.commentId} from work item #${result.workItemId}`
+    );
   });
   return command;
 }
@@ -7612,6 +7828,8 @@ function createCommentsCommand() {
   command.description("Manage Azure DevOps work item comments");
   command.addCommand(createCommentsListCommand());
   command.addCommand(createCommentsAddCommand());
+  command.addCommand(createCommentsEditCommand());
+  command.addCommand(createCommentsDeleteCommand());
   return command;
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "azdo-cli",
-  "version": "0.22.0-develop.822",
+  "version": "0.22.0-develop.828",
   "description": "Azure DevOps CLI tool",
   "type": "module",
   "bin": {