azdo-cli 0.19.0-develop.710 → 0.19.0-develop.717

package/README.md

@@ -15,7 +15,7 @@ Azure DevOps CLI focused on work item read/write workflows.
 - Attach a local file to a work item, or remove a named attachment (`add-attachment`, `delete-attachment`)
 - Read/write rich-text fields as markdown (`get-md-field`, `set-md-field`)
 - Download images embedded in rich-text fields, optionally resized for LLM use (`get-item`/`get-md-field` `--download-images`, `--resize-images`)
-- Check branch pull request status, open PRs to `develop` (optionally pre-filled from a repository-defined template), update an existing PR's title or description (`pr update`), list PR comment threads for any PR (`--pr-number`), resolve/reopen threads, link/unlink work items, and add/remove required or optional reviewers — all from the CLI (`pr`)
+- Check branch pull request status, open PRs to `develop` (optionally pre-filled from a repository-defined template), update an existing PR's title or description (`pr update`), abandon or reactivate one (`pr abandon` / `pr reactivate`), list PR comment threads for any PR (`--pr-number`), resolve/reopen threads, link/unlink work items, and add/remove required or optional reviewers — all from the CLI (`pr`)
 - Feed long PR titles, descriptions and comment bodies from a file or a pipe instead of the shell (`--title-file`, `--description-file`, `--file`; `-` reads standard input)
 - Persist org/project/default fields in local config (`config`)
 - List all fields of a work item (`list-fields`)
@@ -102,6 +102,12 @@ cat body.md | azdo pr edit --pr-number 64 --description-file -   # "edit" is an
 azdo pr update --pr-number 64 --title "A real title" --json  # { pullRequestId, title, description, url, noop, updatedFields }
 # Re-running with the values it already has writes nothing and reports "noop": true.
 
+# Abandon a PR you opened by mistake — reversible, never prompts, nothing is deleted
+azdo pr abandon --pr-number 64        # "close" is an alias; it does NOT complete/merge the PR
+azdo pr reactivate --pr-number 64     # bring it back; --pr-number-less lookup searches abandoned PRs
+azdo pr abandon --pr-number 64 --json # { pullRequestId, title, status, previousStatus, url, noop }
+# Already abandoned? noop, exit 0, no write. Already completed? exit 1, no write.
+
 # Link/unlink a work item, add/remove reviewers
 azdo pr work-items link 1234 --pr-number 64
 azdo pr work-items unlink 1234 --pr-number 64

package/dist/index.js

@@ -4105,7 +4105,12 @@ function parsePositivePrNumber(raw) {
   const n = Number.parseInt(raw, 10);
   return Number.isFinite(n) && n > 0 ? n : null;
 }
-var PR_NUMBER_HELP = "target the pull request with this numeric id, instead of the current branch's PR. When omitted, the CLI auto-detects the pull request whose source branch equals refs/heads/<current branch> in the Azure DevOps repository identified by the origin remote; if zero or more than one open PR matches, the command fails with a message naming the searched branch.";
+function prNumberHelp(branchStatus = "active") {
+  const matched = branchStatus === "abandoned" ? "abandoned" : "open";
+  return `target the pull request with this numeric id, instead of the current branch's PR. When omitted, the CLI auto-detects the pull request whose source branch equals refs/heads/<current branch> in the Azure DevOps repository identified by the origin remote; if zero or more than one ${matched} PR matches, the command fails with a message naming the searched branch.`;
+}
+var PR_NUMBER_HELP = prNumberHelp();
+var PR_NUMBER_HELP_ABANDONED = prNumberHelp("abandoned");
 var PR_REPO_HELP = 'Azure DevOps repository name; defaults to the repository of the git "origin" remote';
 function configureUnwrappedHelp(command) {
   return command.configureHelp({ helpWidth: 1e3 });
@@ -4123,6 +4128,13 @@ function autoDetectMultiMatch(branch, ids) {
   const idList = ids.map((id) => `#${id}`).join(", ");
   return `Multiple open pull requests match branch ${branch}: ${idList}. Re-run with --pr-number to choose.`;
 }
+function abandonedAutoDetectZeroMatch(branch) {
+  return `No abandoned pull request matches branch ${branch}. Pass --pr-number to target a specific PR.`;
+}
+function abandonedAutoDetectMultiMatch(branch, ids) {
+  const idList = ids.map((id) => `#${id}`).join(", ");
+  return `Multiple abandoned pull requests match branch ${branch}: ${idList}. Re-run with --pr-number to choose.`;
+}
 function writeContractError(line) {
   process.stderr.write(`${line}
 `);
@@ -4595,11 +4607,14 @@ async function runPrUpdate(options) {
   }
   let context;
   try {
-    const target = await resolvePullRequestTarget(options);
+    const target = await resolvePullRequestTarget(options, {
+      onContextResolved: (resolved) => {
+        context = resolved;
+      }
+    });
     if (target === null) {
       return;
     }
-    context = target.context;
     const current = target.pullRequest;
     const { fields, updatedFields, requestedFields } = diffRequestedFields(requested, current);
     if (updatedFields.length === 0) {
@@ -4655,6 +4670,102 @@ function createPrUpdateCommand() {
   });
   return command;
 }
+var PR_STATUS_CHANGES = {
+  abandon: {
+    target: "abandoned",
+    search: "active",
+    verb: "abandoned",
+    applied: "Abandoned",
+    refusal: "abandoned"
+  },
+  reactivate: {
+    target: "active",
+    search: "abandoned",
+    verb: "active",
+    applied: "Reactivated",
+    refusal: "reactivated"
+  }
+};
+var COMPLETED_STATUS = "completed";
+async function runPrStatusChange(options, direction) {
+  const change = PR_STATUS_CHANGES[direction];
+  let context;
+  try {
+    const target = await resolvePullRequestTarget(options, {
+      branchStatus: change.search,
+      onContextResolved: (resolved) => {
+        context = resolved;
+      }
+    });
+    if (target === null) {
+      return;
+    }
+    const current = target.pullRequest;
+    if (current.status === COMPLETED_STATUS) {
+      writeError(
+        `Pull request #${current.id} is completed and cannot be ${change.refusal}. A completed pull request is final; revert it with a new pull request instead.`
+      );
+      return;
+    }
+    if (current.status === change.target) {
+      const noopResult = {
+        pullRequestId: current.id,
+        title: current.title,
+        status: current.status,
+        previousStatus: current.status,
+        url: current.url,
+        noop: true
+      };
+      if (options.json) {
+        process.stdout.write(`${JSON.stringify(noopResult, null, 2)}
+`);
+        return;
+      }
+      process.stdout.write(`Pull request #${current.id} is already ${change.verb}; nothing to do.
+`);
+      return;
+    }
+    const updated = await updatePullRequest(target.context, target.repo, target.pat, current.id, {
+      status: change.target
+    });
+    const result = {
+      pullRequestId: updated.id,
+      title: updated.title,
+      status: updated.status,
+      previousStatus: current.status,
+      url: updated.url,
+      noop: false
+    };
+    if (options.json) {
+      process.stdout.write(`${JSON.stringify(result, null, 2)}
+`);
+      return;
+    }
+    process.stdout.write(`${change.applied} pull request #${updated.id} (${updated.title}).
+${updated.url ?? "\u2014"}
+`);
+  } catch (err) {
+    handlePrCommandError(err, context, "write");
+  }
+}
+function createPrAbandonCommand() {
+  const command = new Command12("abandon");
+  withCommonPrOptions(configureUnwrappedHelp(command)).alias("close").description(
+    'Abandon a pull request (status: abandoned) \u2014 reversible with "azdo pr reactivate". This does NOT complete or merge the pull request; nothing is deleted and no confirmation is asked.'
+  ).option("--pr-number <N>", PR_NUMBER_HELP).option("--json", "output JSON").action(async (_options, command2) => {
+    await runPrStatusChange(mergedPrOptions(command2), "abandon");
+  });
+  return command;
+}
+function createPrReactivateCommand() {
+  const command = new Command12("reactivate");
+  withCommonPrOptions(configureUnwrappedHelp(command)).description(
+    "Reactivate an abandoned pull request (status: active). When --pr-number is omitted the current branch's single ABANDONED pull request is used, not the active one."
+  ).option("--pr-number <N>", PR_NUMBER_HELP_ABANDONED).option("--json", "output JSON").action(async (_options, command2) => {
+    await runPrStatusChange(mergedPrOptions(command2), "reactivate");
+  });
+  return command;
+}
 function createPrCommentsCommand() {
   const command = new Command12("comments");
   withCommonPrOptions(configureUnwrappedHelp(command)).description("List pull request comment threads for the current branch").option("--pr-number <N>", PR_NUMBER_HELP).option("--hide-resolved", "hide threads whose status is resolved / won't fix / closed / by design").option("--exclude-resolved", "alias of --hide-resolved: exclude resolved / won't fix / closed / by design threads").option("--code-related-only", "show only threads anchored to a file/line; omit general discussion threads").option("--exclude-system", "omit Azure DevOps system comments (branch updates, reviewer votes, build events)").option("--max-chars <N>", "truncate each comment body to N characters (0 = no limit, the default)").option("--thread <id>", "show only the thread with this numeric id; fails when the pull request has no such thread").option("--contains <text>", "show only threads holding a comment that contains this literal, case-sensitive substring (matched before --max-chars truncates)").option("--json", "output JSON").action(async (options) => {
@@ -4770,52 +4881,75 @@ function createPrCommentsCommand() {
   command.addCommand(createPrCommentsEditCommand());
   return command;
 }
-async function resolvePullRequestTarget(options) {
-  validateOrgProjectPair(options);
-  let explicitPrId = null;
-  if (options.prNumber !== void 0) {
-    explicitPrId = parsePositivePrNumber(options.prNumber);
-    if (explicitPrId === null) {
-      writeError(`Invalid --pr-number "${options.prNumber}"; expected a positive integer.`);
-      return null;
-    }
+function parseTargetPrNumber(options) {
+  if (options.prNumber === void 0) {
+    return "none";
   }
-  const resolved = await resolvePrCommandContext(options, { requireBranch: explicitPrId === null });
-  let pullRequest;
-  if (explicitPrId !== null) {
-    try {
-      pullRequest = await getPullRequestById(resolved.context, resolved.repo, resolved.pat, explicitPrId);
-    } catch (err) {
-      if (err instanceof Error && err.message.startsWith("NOT_FOUND")) {
-        writeError(`Pull request #${explicitPrId} not found in ${resolved.context.org}/${resolved.context.project}/${resolved.repo}.`, EXIT_NOT_FOUND);
-        return null;
-      }
-      throw err;
-    }
-  } else {
-    const pullRequests = await listPullRequests(resolved.context, resolved.repo, resolved.pat, resolved.branch, {
-      status: "active"
-    });
-    if (pullRequests.length === 0) {
-      writeContractError(autoDetectZeroMatch(resolved.branch));
-      return null;
-    }
-    if (pullRequests.length > 1) {
-      writeContractError(autoDetectMultiMatch(resolved.branch, pullRequests.map((pr) => pr.id)));
+  const parsed = parsePositivePrNumber(options.prNumber);
+  if (parsed === null) {
+    writeError(`Invalid --pr-number "${options.prNumber}"; expected a positive integer.`);
+    return "invalid";
+  }
+  return parsed;
+}
+async function fetchTargetById(resolved, prId) {
+  try {
+    return await getPullRequestById(resolved.context, resolved.repo, resolved.pat, prId);
+  } catch (err) {
+    if (err instanceof Error && err.message.startsWith("NOT_FOUND")) {
+      writeError(
+        `Pull request #${prId} not found in ${resolved.context.org}/${resolved.context.project}/${resolved.repo}.`,
+        EXIT_NOT_FOUND
+      );
       return null;
     }
-    pullRequest = pullRequests[0];
+    throw err;
+  }
+}
+async function findBranchPullRequest(resolved, branch, branchStatus) {
+  const pullRequests = await listPullRequests(resolved.context, resolved.repo, resolved.pat, branch, {
+    status: branchStatus
+  });
+  const abandoned = branchStatus === "abandoned";
+  if (pullRequests.length === 0) {
+    writeContractError(abandoned ? abandonedAutoDetectZeroMatch(branch) : autoDetectZeroMatch(branch));
+    return null;
+  }
+  if (pullRequests.length > 1) {
+    const ids = pullRequests.map((pr) => pr.id);
+    writeContractError(
+      abandoned ? abandonedAutoDetectMultiMatch(branch, ids) : autoDetectMultiMatch(branch, ids)
+    );
+    return null;
+  }
+  return pullRequests[0];
+}
+async function resolvePullRequestTarget(options, {
+  branchStatus = "active",
+  onContextResolved
+} = {}) {
+  validateOrgProjectPair(options);
+  const explicitPrId = parseTargetPrNumber(options);
+  if (explicitPrId === "invalid") {
+    return null;
+  }
+  const byBranch = explicitPrId === "none";
+  const resolved = await resolvePrCommandContext(options, { requireBranch: byBranch });
+  onContextResolved?.(resolved.context);
+  const pullRequest = byBranch ? await findBranchPullRequest(resolved, resolved.branch, branchStatus) : await fetchTargetById(resolved, explicitPrId);
+  if (pullRequest === null) {
+    return null;
   }
   return { context: resolved.context, repo: resolved.repo, pat: resolved.pat, pullRequest };
 }
-async function resolveThreadTarget(threadIdRaw, options) {
+async function resolveThreadTarget(threadIdRaw, options, { onContextResolved } = {}) {
   const threadId = parsePositivePrNumber(threadIdRaw);
   if (threadId === null) {
     validateOrgProjectPair(options);
     writeError(`Invalid thread id "${threadIdRaw}"; expected a positive integer.`);
     return null;
   }
-  const target = await resolvePullRequestTarget(options);
+  const target = await resolvePullRequestTarget(options, { onContextResolved });
   if (target === null) {
     return null;
   }
@@ -4824,11 +4958,14 @@ async function resolveThreadTarget(threadIdRaw, options) {
 async function runThreadStateChange(threadIdRaw, options, direction) {
   let context;
   try {
-    const target = await resolveThreadTarget(threadIdRaw, options);
+    const target = await resolveThreadTarget(threadIdRaw, options, {
+      onContextResolved: (resolved) => {
+        context = resolved;
+      }
+    });
     if (target === null) {
       return;
     }
-    context = target.context;
     const threads = await getPullRequestThreads(target.context, target.repo, target.pat, target.pullRequest.id);
     const thread = threads.find((t) => t.id === target.threadId);
     if (!thread) {
@@ -4901,11 +5038,14 @@ async function runCommentReply(threadIdRaw, text, options) {
     if (trimmedText === null) {
       return;
     }
-    const target = await resolveThreadTarget(threadIdRaw, options);
+    const target = await resolveThreadTarget(threadIdRaw, options, {
+      onContextResolved: (resolved) => {
+        context = resolved;
+      }
+    });
     if (target === null) {
       return;
     }
-    context = target.context;
     const threads = await getPullRequestThreads(target.context, target.repo, target.pat, target.pullRequest.id);
     const thread = threads.find((t) => t.id === target.threadId);
     if (!thread) {
@@ -4979,11 +5119,14 @@ async function runCommentAdd(text, options) {
       }
       status2 = match;
     }
-    const target = await resolvePullRequestTarget(options);
+    const target = await resolvePullRequestTarget(options, {
+      onContextResolved: (resolved) => {
+        context = resolved;
+      }
+    });
     if (target === null) {
       return;
     }
-    context = target.context;
     if (options.dryRun === true) {
       const dryResult = {
         pullRequestId: target.pullRequest.id,
@@ -5122,11 +5265,14 @@ async function runCommentEdit(threadIdRaw, text, options) {
         return;
       }
     }
-    const target = await resolveThreadTarget(threadIdRaw, options);
+    const target = await resolveThreadTarget(threadIdRaw, options, {
+      onContextResolved: (resolved) => {
+        context = resolved;
+      }
+    });
     if (target === null) {
       return;
     }
-    context = target.context;
     const thread = await fetchThreadForEdit(target);
     if (thread === null) {
       return;
@@ -5261,11 +5407,14 @@ async function runWorkItemLinkChange(workItemIdRaw, options, direction) {
       writeError(`Invalid work item id "${workItemIdRaw}"; expected a positive integer.`);
       return;
     }
-    const target = await resolvePullRequestTarget(options);
+    const target = await resolvePullRequestTarget(options, {
+      onContextResolved: (resolved) => {
+        context = resolved;
+      }
+    });
     if (target === null) {
       return;
     }
-    context = target.context;
     let outcome;
     try {
       outcome = direction === "link" ? await linkWorkItemToPullRequest(target.context, target.repo, target.pat, target.pullRequest.id, workItemId) : await unlinkWorkItemFromPullRequest(target.context, target.repo, target.pat, target.pullRequest.id, workItemId);
@@ -5320,11 +5469,14 @@ function createPrWorkItemsCommand() {
 async function runReviewerAdd(reviewer, options) {
   let context;
   try {
-    const target = await resolvePullRequestTarget(options);
+    const target = await resolvePullRequestTarget(options, {
+      onContextResolved: (resolved) => {
+        context = resolved;
+      }
+    });
     if (target === null) {
       return;
     }
-    context = target.context;
     let identity;
     try {
       identity = await resolveReviewerIdentity(target.context.org, target.pat, reviewer);
@@ -5375,11 +5527,14 @@ async function runReviewerAdd(reviewer, options) {
 async function runReviewerRemove(reviewer, options) {
   let context;
   try {
-    const target = await resolvePullRequestTarget(options);
+    const target = await resolvePullRequestTarget(options, {
+      onContextResolved: (resolved) => {
+        context = resolved;
+      }
+    });
     if (target === null) {
       return;
     }
-    context = target.context;
     let identity;
     try {
       identity = await resolveReviewerIdentity(target.context.org, target.pat, reviewer);
@@ -5435,6 +5590,8 @@ function createPrCommand() {
   command.addCommand(createPrStatusCommand());
   command.addCommand(createPrOpenCommand());
   command.addCommand(createPrUpdateCommand());
+  command.addCommand(createPrAbandonCommand());
+  command.addCommand(createPrReactivateCommand());
   command.addCommand(createPrCommentsCommand());
   command.addCommand(createPrCommentResolveCommand());
   command.addCommand(createPrCommentReopenCommand());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "azdo-cli",
-  "version": "0.19.0-develop.710",
+  "version": "0.19.0-develop.717",
   "description": "Azure DevOps CLI tool",
   "type": "module",
   "bin": {