azdo-cli 0.2.0-008-pull-request-handling.99 → 0.2.0-008-pull-request-handling.101

package/dist/index.js

@@ -1613,25 +1613,35 @@ function formatPullRequestBlock(pullRequest) {
 function formatThreads(prId, title, threads) {
   const lines = [`Active comments for pull request #${prId}: ${title}`];
   for (const thread of threads) {
-    lines.push("");
-    lines.push(`Thread #${thread.id} [${thread.status}] ${thread.threadContext ?? "(general)"}`);
+    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 Command10("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 {
-      context = resolveContext(options);
-      const repo = detectRepoName();
-      const branch = getCurrentBranch();
-      const credential = await resolvePat();
-      const pullRequests = await listPullRequests(context, repo, credential.pat, branch);
+      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)}
@@ -1665,14 +1675,19 @@ function createPrOpenCommand() {
     }
     let context;
     try {
-      context = resolveContext(options);
-      const repo = detectRepoName();
-      const branch = getCurrentBranch();
-      if (branch === "develop") {
+      const resolved = await resolvePrCommandContext(options);
+      context = resolved.context;
+      if (resolved.branch === "develop") {
         writeError("Pull request creation requires a source branch other than develop.");
       }
-      const credential = await resolvePat();
-      const result = await openPullRequest(context, repo, credential.pat, branch, title, description);
+      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)}
 `);
@@ -1685,7 +1700,7 @@ ${result.pullRequest.url}
         return;
       }
       process.stdout.write(
-        `Active pull request already exists for ${branch} -> develop: #${result.pullRequest.id}
+        `Active pull request already exists for ${resolved.branch} -> develop: #${result.pullRequest.id}
 ${result.pullRequest.url}
 `
       );
@@ -1705,21 +1720,21 @@ function createPrCommentsCommand() {
     validateOrgProjectPair(options);
     let context;
     try {
-      context = resolveContext(options);
-      const repo = detectRepoName();
-      const branch = getCurrentBranch();
-      const credential = await resolvePat();
-      const pullRequests = await listPullRequests(context, repo, credential.pat, branch, { status: "active" });
+      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 ${branch}.`);
+        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 ${branch}: ${ids}. Use pr status to review them.`);
+        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(context, repo, credential.pat, pullRequest.id);
-      const result = { branch, pullRequest, threads };
+      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)}
 `);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "azdo-cli",
-  "version": "0.2.0-008-pull-request-handling.99",
+  "version": "0.2.0-008-pull-request-handling.101",
   "description": "Azure DevOps CLI tool",
   "type": "module",
   "bin": {