azdo-cli 0.19.0 → 0.20.0-develop.741

package/dist/index.js

@@ -1146,25 +1146,26 @@ async function promptForPat() {
     process.stdin.on("data", onData);
   });
 }
+function patFromEnvFile(envFile) {
+  if (!existsSync2(envFile)) return null;
+  const contents = readFileSync2(envFile, "utf8");
+  for (const line of contents.split("\n")) {
+    const match = line.match(/^AZDO_PAT\s*=([^\n\r]+)$/);
+    if (match === null) continue;
+    const value = match[1].trim().replace(/^["']|["']$/g, "");
+    if (value.length > 0) return value;
+  }
+  return null;
+}
 function findDotEnvPat(startDir = process.cwd()) {
   let current = startDir;
-  while (true) {
-    const envFile = join2(current, ".env");
-    if (existsSync2(envFile)) {
-      const contents = readFileSync2(envFile, "utf8");
-      for (const line of contents.split("\n")) {
-        const match = line.match(/^AZDO_PAT\s*=([^\n\r]+)$/);
-        if (match) {
-          const value = match[1].trim().replace(/^["']|["']$/g, "");
-          if (value.length > 0) return value;
-        }
-      }
-    }
+  for (; ; ) {
+    const found = patFromEnvFile(join2(current, ".env"));
+    if (found !== null) return found;
     const parent = dirname2(current);
-    if (parent === current) break;
+    if (parent === current) return null;
     current = parent;
   }
-  return null;
 }
 async function resolveAuthCredential(org) {
   let cred;
@@ -2336,36 +2337,30 @@ Identifier:   ${masked}
 ` : "")
   );
 }
-async function handleLogout(options, orgFromGlobal) {
-  if (options.all && orgFromGlobal) {
-    process.stderr.write("--org and --all are mutually exclusive.\n");
-    process.exitCode = 1;
-    return;
-  }
-  if (options.all) {
-    try {
-      const result = await logout({ all: true });
-      if (result.removed.length === 0) {
-        process.stdout.write("No stored credentials to remove.\n");
-        return;
-      }
-      for (const r of result.removed) {
-        process.stdout.write(`Removed ${r.kind} credential for org ${r.org}.
-`);
-      }
-    } catch (err) {
-      if (err instanceof CredentialStoreUnavailableError) {
-        process.stderr.write(`${err.message}
+async function logoutAllOrgs() {
+  try {
+    const result = await logout({ all: true });
+    if (result.removed.length === 0) {
+      process.stdout.write("No stored credentials to remove.\n");
+      return;
+    }
+    for (const r of result.removed) {
+      process.stdout.write(`Removed ${r.kind} credential for org ${r.org}.
 `);
-        process.exitCode = 4;
-        return;
-      }
-      process.stderr.write(`Failed to remove credentials: ${err.message}
+    }
+  } catch (err) {
+    if (err instanceof CredentialStoreUnavailableError) {
+      process.stderr.write(`${err.message}
 `);
-      process.exitCode = 1;
+      process.exitCode = 4;
+      return;
     }
-    return;
+    process.stderr.write(`Failed to remove credentials: ${err.message}
+`);
+    process.exitCode = 1;
   }
+}
+async function logoutSingleOrg(orgFromGlobal) {
   const resolved = resolveOrg({ org: orgFromGlobal });
   if (!resolved) {
     process.stderr.write(`${formatResolutionError()}
@@ -2392,6 +2387,18 @@ async function handleLogout(options, orgFromGlobal) {
     throw err;
   }
 }
+async function handleLogout(options, orgFromGlobal) {
+  if (options.all && orgFromGlobal) {
+    process.stderr.write("--org and --all are mutually exclusive.\n");
+    process.exitCode = 1;
+    return;
+  }
+  if (options.all) {
+    await logoutAllOrgs();
+    return;
+  }
+  await logoutSingleOrg(orgFromGlobal);
+}
 function describeCredentialSource(cred) {
   switch (cred.source) {
     case "env":
@@ -3440,7 +3447,9 @@ function createUpsertCommand() {
 import { Command as Command11 } from "commander";
 function stringifyValue(value) {
   if (value === null || value === void 0) return "";
+  if (typeof value === "string") return value;
   if (typeof value === "object") return JSON.stringify(value);
+  if (typeof value === "symbol" || typeof value === "function") return value.toString();
   return String(value);
 }
 function formatRichValue(raw) {
@@ -4893,79 +4902,136 @@ function createPrReactivateCommand() {
   });
   return command;
 }
+function parseCommentsOptions(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;
+    }
+  }
+  let maxChars = 0;
+  if (options.maxChars !== void 0) {
+    const parsed = parseNonNegativeInt(options.maxChars);
+    if (parsed === null) {
+      writeError(`Invalid --max-chars "${options.maxChars}"; expected a non-negative integer.`);
+      return null;
+    }
+    maxChars = parsed;
+  }
+  let threadFilter = null;
+  if (options.thread !== void 0) {
+    threadFilter = parsePositivePrNumber(options.thread);
+    if (threadFilter === null) {
+      writeError(`Invalid --thread "${options.thread}"; expected a positive integer.`);
+      return null;
+    }
+  }
+  return { explicitPrId, maxChars, threadFilter };
+}
+async function resolveCommentsPullRequest(resolved, explicitPrId) {
+  if (explicitPrId !== null) {
+    let pullRequest;
+    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;
+    }
+    return { pullRequest, branchLabel: resolved.branch ?? pullRequest.sourceRefName };
+  }
+  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)));
+    return null;
+  }
+  return { pullRequest: pullRequests[0], branchLabel: resolved.branch };
+}
+function selectCommentThreads(fetchedThreads, threadFilter, pullRequestId) {
+  if (threadFilter === null) {
+    return fetchedThreads;
+  }
+  if (!fetchedThreads.some((thread) => thread.id === threadFilter)) {
+    writeError(`Thread #${threadFilter} not found on pull request #${pullRequestId}.`, EXIT_NOT_FOUND);
+    return null;
+  }
+  return fetchedThreads.filter((thread) => thread.id === threadFilter);
+}
+function shapeCommentThreads(allThreads, opts) {
+  return allThreads.filter(
+    (thread) => (!opts.hideResolved || !isThreadResolved(thread.status)) && (!opts.codeRelatedOnly || thread.threadContext !== null)
+  ).map(
+    (thread) => shapeThreadForOutput(thread, {
+      excludeSystem: opts.excludeSystem,
+      maxChars: opts.maxChars,
+      contains: opts.contains
+    })
+  ).filter((thread) => thread !== null);
+}
+function describeEmptyThreads(pullRequestId, allThreadCount, active) {
+  const filters = [];
+  if (active.contains !== void 0) {
+    filters.push("matching");
+  }
+  if (active.codeRelatedOnly) {
+    filters.push("code-related");
+  }
+  if (active.hideResolved) {
+    filters.push("unresolved");
+  }
+  if (active.excludeSystem) {
+    filters.push("non-system");
+  }
+  if (allThreadCount > 0 && filters.length > 0) {
+    return `Pull request #${pullRequestId} has no ${filters.join(" ")} comment threads (filtered from ${allThreadCount} thread${allThreadCount === 1 ? "" : "s"}).
+`;
+  }
+  return `Pull request #${pullRequestId} has no comment threads.
+`;
+}
 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) => {
     validateOrgProjectPair(options);
-    let context;
-    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;
-      }
-    }
-    let maxChars = 0;
-    if (options.maxChars !== void 0) {
-      const parsed = parseNonNegativeInt(options.maxChars);
-      if (parsed === null) {
-        writeError(`Invalid --max-chars "${options.maxChars}"; expected a non-negative integer.`);
-        return;
-      }
-      maxChars = parsed;
-    }
-    let threadFilter = null;
-    if (options.thread !== void 0) {
-      threadFilter = parsePositivePrNumber(options.thread);
-      if (threadFilter === null) {
-        writeError(`Invalid --thread "${options.thread}"; expected a positive integer.`);
-        return;
-      }
+    const parsed = parseCommentsOptions(options);
+    if (parsed === null) {
+      return;
     }
+    const { explicitPrId, maxChars, threadFilter } = parsed;
+    let context;
     try {
       const resolved = await resolvePrCommandContext(options, { requireBranch: explicitPrId === null });
       context = resolved.context;
-      let pullRequest;
-      let branchLabel;
-      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;
-          }
-          throw err;
-        }
-        branchLabel = resolved.branch ?? pullRequest.sourceRefName;
-      } else {
-        const pullRequests = await listPullRequests(resolved.context, resolved.repo, resolved.pat, resolved.branch, {
-          status: "active"
-        });
-        if (pullRequests.length === 0) {
-          writeContractError(autoDetectZeroMatch(resolved.branch));
-          return;
-        }
-        if (pullRequests.length > 1) {
-          writeContractError(autoDetectMultiMatch(resolved.branch, pullRequests.map((pr) => pr.id)));
-          return;
-        }
-        pullRequest = pullRequests[0];
-        branchLabel = resolved.branch;
+      const target = await resolveCommentsPullRequest(resolved, explicitPrId);
+      if (target === null) {
+        return;
       }
+      const { pullRequest, branchLabel } = target;
       const hideResolved = options.hideResolved === true || options.excludeResolved === true;
       const codeRelatedOnly = options.codeRelatedOnly === true;
       const excludeSystem = options.excludeSystem === true;
       const fetchedThreads = await getPullRequestThreads(resolved.context, resolved.repo, resolved.pat, pullRequest.id);
-      if (threadFilter !== null && !fetchedThreads.some((thread) => thread.id === threadFilter)) {
-        writeError(`Thread #${threadFilter} not found on pull request #${pullRequest.id}.`, EXIT_NOT_FOUND);
+      const allThreads = selectCommentThreads(fetchedThreads, threadFilter, pullRequest.id);
+      if (allThreads === null) {
         return;
       }
-      const allThreads = threadFilter === null ? fetchedThreads : fetchedThreads.filter((thread) => thread.id === threadFilter);
-      const threads = allThreads.filter(
-        (thread) => (!hideResolved || !isThreadResolved(thread.status)) && (!codeRelatedOnly || thread.threadContext !== null)
-      ).map((thread) => shapeThreadForOutput(thread, { excludeSystem, maxChars, contains: options.contains })).filter((thread) => thread !== null);
+      const threads = shapeCommentThreads(allThreads, {
+        hideResolved,
+        codeRelatedOnly,
+        excludeSystem,
+        maxChars,
+        contains: options.contains
+      });
       const result = { branch: branchLabel, pullRequest, threads };
       if (options.json) {
         process.stdout.write(`${JSON.stringify(result, null, 2)}
@@ -4973,28 +5039,12 @@ function createPrCommentsCommand() {
         return;
       }
       if (threads.length === 0) {
-        if (allThreads.length > 0 && (hideResolved || codeRelatedOnly || excludeSystem || options.contains !== void 0)) {
-          const filters = [];
-          if (options.contains !== void 0) {
-            filters.push("matching");
-          }
-          if (codeRelatedOnly) {
-            filters.push("code-related");
-          }
-          if (hideResolved) {
-            filters.push("unresolved");
-          }
-          if (excludeSystem) {
-            filters.push("non-system");
-          }
-          process.stdout.write(
-            `Pull request #${pullRequest.id} has no ${filters.join(" ")} comment threads (filtered from ${allThreads.length} thread${allThreads.length === 1 ? "" : "s"}).
-`
-          );
-        } else {
-          process.stdout.write(`Pull request #${pullRequest.id} has no comment threads.
-`);
-        }
+        process.stdout.write(describeEmptyThreads(pullRequest.id, allThreads.length, {
+          hideResolved,
+          codeRelatedOnly,
+          excludeSystem,
+          contains: options.contains
+        }));
         return;
       }
       process.stdout.write(`${formatThreads(pullRequest.id, pullRequest.title, threads)}
@@ -5174,8 +5224,7 @@ async function runCommentReply(threadIdRaw, text, options) {
       return;
     }
     const threads = await getPullRequestThreads(target.context, target.repo, target.pat, target.pullRequest.id);
-    const thread = threads.find((t) => t.id === target.threadId);
-    if (!thread) {
+    if (!threads.some((t) => t.id === target.threadId)) {
       writeError(`Thread #${target.threadId} not found on pull request #${target.pullRequest.id}.`, EXIT_NOT_FOUND);
       return;
     }
@@ -7105,7 +7154,7 @@ function handleRelationError(err, id1) {
 `
     );
   } else if (msg.startsWith("NOT_FOUND")) {
-    const target = id1 !== void 0 ? id1 : "unknown";
+    const target = id1 ?? "unknown";
     process.stderr.write(`Error: work item #${target} not found.
 `);
   } else if (isSentinel(msg, "AUTH_FAILED")) {
@@ -7315,7 +7364,7 @@ async function getUpdateNotice(opts) {
     if (!latest) return null;
     writeCache(JSON.stringify({ lastCheck: now(), latestVersion: latest }));
     if (isNewer(latest, currentVersion)) {
-      return `A new version of azdo-cli is available: ${currentVersion} \u2192 ${latest}. Run \`npm i -g azdo-cli\` to update.`;
+      return `A new version of azdo-cli is available: ${currentVersion} \u2192 ${latest}. Run \`npm install -g azdo-cli@latest\` to update.`;
     }
     return null;
   } catch {

package/package.json

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