@docupace/pipeline 1.0.73 → 1.0.74

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docupace/pipeline",
-  "version": "1.0.73",
+  "version": "1.0.74",
   "main": "index.js",
   "type": "module",
   "bin": {

package/src/merge/cli-merge-all.js

@@ -378,6 +378,7 @@ async function mergeAll(verbose = false) {
     if (verbose) console.log('🔍 Checking for existing automated merge PRs...');
     const existingPRs = await getExistingPRsWithDescription(
       'Automated merge with changeset',
+      config.repositories,
     );
 
     if (existingPRs.length > 0) {
@@ -386,7 +387,7 @@ async function mergeAll(verbose = false) {
       );
       if (verbose) {
         existingPRs.forEach((pr) => {
-          console.log(`  - PR #${pr.id}: ${pr.title} (${pr.links.html.href})`);
+          console.log(`  - PR #${pr.id}: ${pr.title} in ${pr.repositoryName || 'unknown repo'} (${pr.links.html.href})`);
         });
       }
       process.exit(1);

package/src/merge/pr.js

@@ -13,7 +13,84 @@ import { execSync } from 'child_process';
  * @param {string} descriptionPattern - Pattern to match in PR descriptions
  * @returns {Promise<Object[]>} - Array of matching PRs
  */
-export async function getExistingPRsWithDescription(descriptionPattern) {
+export async function getExistingPRsWithDescription(descriptionPattern, repositories) {
+  // If no repositories provided, fall back to current repo behavior for backward compatibility
+  if (!repositories || !Array.isArray(repositories)) {
+    return getExistingPRsFromCurrentRepo(descriptionPattern);
+  }
+
+  try {
+    // Check for Bitbucket credentials
+    const username = process.env.BITBUCKET_USERNAME;
+    const password = process.env.BITBUCKET_APP_PASSWORD;
+
+    if (!username || !password) {
+      console.log(
+        `\n⚠️  Bitbucket credentials not found. Cannot check existing PRs.`,
+      );
+      return [];
+    }
+
+    const auth = Buffer.from(`${username}:${password}`).toString('base64');
+    const allMatchingPRs = [];
+
+    // Check each repository for matching PRs
+    for (const repo of repositories) {
+      try {
+        const match = repo.url.match(/bitbucket\.org[\/:]([^\/]+)\/([^\/\.]+)/);
+        
+        if (!match) {
+          console.warn(`Could not parse repository URL: ${repo.url}`);
+          continue;
+        }
+
+        const [, workspace, repoSlug] = match;
+        
+        const response = await fetch(
+          `https://api.bitbucket.org/2.0/repositories/${workspace}/${repoSlug}/pullrequests?state=OPEN`,
+          {
+            method: 'GET',
+            headers: {
+              Authorization: `Basic ${auth}`,
+              'Content-Type': 'application/json',
+            },
+          },
+        );
+
+        if (!response.ok) {
+          const error = await response.text();
+          console.warn(`Bitbucket API error for ${repo.name}: ${response.status} - ${error}`);
+          continue;
+        }
+
+        const data = await response.json();
+        const matchingPRs = data.values.filter(pr => 
+          pr.description && pr.description.startsWith(descriptionPattern)
+        );
+
+        // Add repository info to each PR for context
+        matchingPRs.forEach(pr => {
+          pr.repositoryName = repo.name;
+          pr.repositoryUrl = repo.url;
+        });
+
+        allMatchingPRs.push(...matchingPRs);
+      } catch (error) {
+        console.warn(`Failed to check PRs for repository ${repo.name}: ${error.message}`);
+      }
+    }
+
+    return allMatchingPRs;
+  } catch (error) {
+    console.error(`Failed to get existing PRs: ${error.message}`);
+    return [];
+  }
+}
+
+/**
+ * Legacy function for backward compatibility - checks PRs in current repo only
+ */
+export async function getExistingPRsFromCurrentRepo(descriptionPattern) {
   try {
     // Get Bitbucket workspace and repo from git remote
     const remoteUrl = execSync('git config --get remote.origin.url', {