azdo-cli 0.10.0-develop.317 → 0.10.0-develop.348

package/README.md

@@ -16,7 +16,7 @@ Azure DevOps CLI focused on work item read/write workflows.
 - Check branch pull request status, open PRs to `develop`, list PR comment threads for any PR (`--pr-number`), and resolve/reopen threads from the CLI (`pr`)
 - Persist org/project/default fields in local config (`config`)
 - List all fields of a work item (`list-fields`)
-- Store a PAT per Azure DevOps organization in the OS credential store via `azdo auth` (or use `AZDO_PAT`). Inspect with `azdo auth status`, remove with `azdo auth logout`. See [docs/authentication.md](docs/authentication.md).
+- Authenticate per Azure DevOps organization with `azdo auth login` — OAuth (Microsoft Entra) by default, or a Personal Access Token via `--use-pat` (or the `AZDO_PAT` env var). Credentials are stored in the OS credential store. Inspect with `azdo auth status`, remove with `azdo auth logout`. See [docs/authentication.md](docs/authentication.md).
 
 ## Installation
 
@@ -27,6 +27,9 @@ npm install -g azdo-cli
 ## Quick Start
 
 ```bash
+# Sign in to an organization (OAuth by default; add --use-pat for a PAT)
+azdo auth login --org myorg
+
 # Configure defaults once
 azdo config set org myorg
 azdo config set project myproject
@@ -56,7 +59,7 @@ azdo pr comment-reopen 17  --pr-number 64
 
 | Topic | File |
 |-------|------|
-| Authentication & PAT storage | [docs/authentication.md](docs/authentication.md) |
+| Authentication (OAuth & PAT) | [docs/authentication.md](docs/authentication.md) |
 | Linux credential store setup | [docs/linux-credential-store.md](docs/linux-credential-store.md) |
 | Full command reference | [docs/commands.md](docs/commands.md) |
 | Development setup | [docs/development.md](docs/development.md) |

package/dist/index.js

@@ -766,22 +766,42 @@ async function status() {
 
 // src/services/git-remote.ts
 import { execSync } from "child_process";
+
+// src/services/remote-warning.ts
+var WARNING = "azdo: warning: origin includes embedded credentials; consider removing them with 'git remote set-url origin <clean-url>'\n";
+var warned = false;
+function noticeCredentialBearingRemote() {
+  if (warned) {
+    return;
+  }
+  warned = true;
+  try {
+    process.stderr.write(WARNING);
+  } catch {
+  }
+}
+
+// src/services/git-remote.ts
 var patterns = [
-  // HTTPS (current): https://dev.azure.com/{org}/{project}/_git/{repo}
-  /^https?:\/\/dev\.azure\.com\/([^/]+)\/([^/]+)\/_git\/([^/]+)$/,
-  // HTTPS (legacy + DefaultCollection): https://{org}.visualstudio.com/DefaultCollection/{project}/_git/{repo}
-  /^https?:\/\/([^.]+)\.visualstudio\.com\/DefaultCollection\/([^/]+)\/_git\/([^/]+)$/,
-  // HTTPS (legacy): https://{org}.visualstudio.com/{project}/_git/{repo}
-  /^https?:\/\/([^.]+)\.visualstudio\.com\/([^/]+)\/_git\/([^/]+)$/,
-  // SSH (current): git@ssh.dev.azure.com:v3/{org}/{project}/{repo}
-  /^git@ssh\.dev\.azure\.com:v3\/([^/]+)\/([^/]+)\/([^/]+)$/,
-  // SSH (legacy): {org}@vs-ssh.visualstudio.com:v3/{org}/{project}/{repo}
-  /^[^@]+@vs-ssh\.visualstudio\.com:v3\/([^/]+)\/([^/]+)\/([^/]+)$/
+  // HTTPS (current): https://[user[:token]@]dev.azure.com/{org}/{project}/_git/{repo}[.git]
+  /^https?:\/\/(?:[^@/]+@)?dev\.azure\.com\/([^/]+)\/([^/]+)\/_git\/([^/]+?)(?:\.git)?$/,
+  // HTTPS (legacy + DefaultCollection): https://[user[:token]@]{org}.visualstudio.com/DefaultCollection/{project}/_git/{repo}[.git]
+  /^https?:\/\/(?:[^@/]+@)?([^.]+)\.visualstudio\.com\/DefaultCollection\/([^/]+)\/_git\/([^/]+?)(?:\.git)?$/,
+  // HTTPS (legacy): https://[user[:token]@]{org}.visualstudio.com/{project}/_git/{repo}[.git]
+  /^https?:\/\/(?:[^@/]+@)?([^.]+)\.visualstudio\.com\/([^/]+)\/_git\/([^/]+?)(?:\.git)?$/,
+  // SSH (current): git@ssh.dev.azure.com:v3/{org}/{project}/{repo}[.git]
+  /^git@ssh\.dev\.azure\.com:v3\/([^/]+)\/([^/]+)\/([^/]+?)(?:\.git)?$/,
+  // SSH (legacy): {org}@vs-ssh.visualstudio.com:v3/{org}/{project}/{repo}[.git]
+  /^[^@]+@vs-ssh\.visualstudio\.com:v3\/([^/]+)\/([^/]+)\/([^/]+?)(?:\.git)?$/
 ];
+var httpsUserinfo = /^https?:\/\/[^@/]+@/;
 function parseAzdoRemote(url) {
   for (const pattern of patterns) {
     const match = pattern.exec(url);
     if (match) {
+      if (httpsUserinfo.test(url)) {
+        noticeCredentialBearingRemote();
+      }
       const project = match[2];
       if (/^DefaultCollection$/i.test(project)) {
         return { org: match[1], project: "" };
@@ -808,6 +828,9 @@ function parseRepoName(url) {
   for (const pattern of patterns) {
     const match = pattern.exec(url);
     if (match) {
+      if (httpsUserinfo.test(url)) {
+        noticeCredentialBearingRemote();
+      }
       return match[3];
     }
   }
@@ -2624,6 +2647,21 @@ 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 configureUnwrappedHelp(command) {
+  return command.configureHelp({ helpWidth: 1e3 });
+}
+function autoDetectZeroMatch(branch) {
+  return `No open pull request matches branch ${branch}. Pass --pr-number to target a specific PR, or push the branch and open a pull request.`;
+}
+function autoDetectMultiMatch(branch, ids) {
+  return `Multiple open pull requests match branch ${branch}: ${ids.map((id) => `#${id}`).join(", ")}. Re-run with --pr-number to choose.`;
+}
+function writeContractError(line) {
+  process.stderr.write(`${line}
+`);
+  process.exitCode = 1;
+}
 function formatBranchName(refName) {
   return refName.startsWith("refs/heads/") ? refName.slice("refs/heads/".length) : refName;
 }
@@ -2799,7 +2837,7 @@ ${result.pullRequest.url ?? "\u2014"}
 }
 function createPrCommentsCommand() {
   const command = new Command12("comments");
-  command.description("List pull request comment threads for the current branch").option("--org <org>", "Azure DevOps organization").option("--project <project>", "Azure DevOps project").option("--pr-number <N>", "target the pull request with this numeric id, instead of the current branch's PR").option("--hide-resolved", "hide threads whose status is resolved / won't fix / closed / by design").option("--json", "output JSON").action(async (options) => {
+  configureUnwrappedHelp(command).description("List pull request comment threads for the current branch").option("--org <org>", "Azure DevOps organization").option("--project <project>", "Azure DevOps project").option("--pr-number <N>", PR_NUMBER_HELP).option("--hide-resolved", "hide threads whose status is resolved / won't fix / closed / by design").option("--json", "output JSON").action(async (options) => {
     validateOrgProjectPair(options);
     let context;
     let explicitPrId = null;
@@ -2831,12 +2869,11 @@ function createPrCommentsCommand() {
           status: "active"
         });
         if (pullRequests.length === 0) {
-          writeError(`No active pull request found for branch ${resolved.branch}.`);
+          writeContractError(autoDetectZeroMatch(resolved.branch));
           return;
         }
         if (pullRequests.length > 1) {
-          const ids = pullRequests.map((pr) => `#${pr.id}`).join(", ");
-          writeError(`Multiple active pull requests found for branch ${resolved.branch}: ${ids}. Use pr status to review them.`);
+          writeContractError(autoDetectMultiMatch(resolved.branch, pullRequests.map((pr) => pr.id)));
           return;
         }
         pullRequest = pullRequests[0];
@@ -2900,12 +2937,11 @@ async function resolveThreadTarget(threadIdRaw, options) {
       status: "active"
     });
     if (pullRequests.length === 0) {
-      writeError(`No active pull request found for branch ${resolved.branch}.`);
+      writeContractError(autoDetectZeroMatch(resolved.branch));
       return null;
     }
     if (pullRequests.length > 1) {
-      const ids = pullRequests.map((pr) => `#${pr.id}`).join(", ");
-      writeError(`Multiple active pull requests found for branch ${resolved.branch}: ${ids}. Use pr status to review them.`);
+      writeContractError(autoDetectMultiMatch(resolved.branch, pullRequests.map((pr) => pr.id)));
       return null;
     }
     pullRequest = pullRequests[0];
@@ -2973,14 +3009,14 @@ async function runThreadStateChange(threadIdRaw, options, direction) {
 }
 function createPrCommentResolveCommand() {
   const command = new Command12("comment-resolve");
-  command.description("Mark a pull request comment thread as resolved").argument("<threadId>", "numeric id of the thread to resolve").option("--org <org>", "Azure DevOps organization").option("--project <project>", "Azure DevOps project").option("--pr-number <N>", "target the pull request with this numeric id, instead of the current branch's PR").option("--json", "output JSON").action(async (threadIdRaw, options) => {
+  configureUnwrappedHelp(command).description("Mark a pull request comment thread as resolved").argument("<threadId>", "numeric id of the thread to resolve").option("--org <org>", "Azure DevOps organization").option("--project <project>", "Azure DevOps project").option("--pr-number <N>", PR_NUMBER_HELP).option("--json", "output JSON").action(async (threadIdRaw, options) => {
     await runThreadStateChange(threadIdRaw, options, "resolve");
   });
   return command;
 }
 function createPrCommentReopenCommand() {
   const command = new Command12("comment-reopen");
-  command.description("Reopen (set to active) a previously resolved pull request comment thread").argument("<threadId>", "numeric id of the thread to reopen").option("--org <org>", "Azure DevOps organization").option("--project <project>", "Azure DevOps project").option("--pr-number <N>", "target the pull request with this numeric id, instead of the current branch's PR").option("--json", "output JSON").action(async (threadIdRaw, options) => {
+  configureUnwrappedHelp(command).description("Reopen (set to active) a previously resolved pull request comment thread").argument("<threadId>", "numeric id of the thread to reopen").option("--org <org>", "Azure DevOps organization").option("--project <project>", "Azure DevOps project").option("--pr-number <N>", PR_NUMBER_HELP).option("--json", "output JSON").action(async (threadIdRaw, options) => {
     await runThreadStateChange(threadIdRaw, options, "reopen");
   });
   return command;

package/package.json

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