@docupace/pipeline 1.0.71 → 1.0.73

package/package.json

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

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

@@ -2,6 +2,7 @@ import { execSync } from 'child_process';
 import { readFileSync, existsSync, mkdirSync } from 'fs';
 import { join, dirname } from 'path';
 import { fileURLToPath } from 'url';
+import { getExistingPRsWithDescription } from './pr.js';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 
@@ -335,7 +336,9 @@ async function processMergeBranch(
   const finalResults = await runFollowUpPhase(prepareResults, verbose);
 
   // Summary
-  const allPassed = prepareResults.every((r) => r.exitCode === 0);
+  const allPassed = prepareResults.every(
+    (r) => r.exitCode === 0 || r.exitCode === 4,
+  );
   const mergeFailures = prepareResults.filter((r) => r.exitCode === 2);
   const buildFailures = prepareResults.filter((r) => r.exitCode === 3);
   const successes = prepareResults.filter((r) => r.exitCode === 0);
@@ -371,6 +374,27 @@ async function mergeAll(verbose = false) {
     // Read configuration
     const config = readMergeConfig(verbose);
 
+    // Check for existing PRs with "Automated merge with changeset" description
+    if (verbose) console.log('🔍 Checking for existing automated merge PRs...');
+    const existingPRs = await getExistingPRsWithDescription(
+      'Automated merge with changeset',
+    );
+
+    if (existingPRs.length > 0) {
+      console.log(
+        `❌ Found ${existingPRs.length} existing pull request(s) with "Automated merge with changeset" description. Exiting to prevent conflicts.`,
+      );
+      if (verbose) {
+        existingPRs.forEach((pr) => {
+          console.log(`  - PR #${pr.id}: ${pr.title} (${pr.links.html.href})`);
+        });
+      }
+      process.exit(1);
+    }
+
+    if (verbose)
+      console.log('✅ No existing automated merge PRs found. Proceeding...');
+
     // Setup repos directory
     const reposDir = join(process.cwd(), 'repos');
     if (!existsSync(reposDir)) {

package/src/merge/pr.js

@@ -8,6 +8,67 @@
  */
 import { execSync } from 'child_process';
 
+/**
+ * Check for existing pull requests with specific description pattern
+ * @param {string} descriptionPattern - Pattern to match in PR descriptions
+ * @returns {Promise<Object[]>} - Array of matching PRs
+ */
+export async function getExistingPRsWithDescription(descriptionPattern) {
+  try {
+    // Get Bitbucket workspace and repo from git remote
+    const remoteUrl = execSync('git config --get remote.origin.url', {
+      encoding: 'utf-8',
+    }).trim();
+    const match = remoteUrl.match(/bitbucket\.org[\/:]([^\/]+)\/([^\/\.]+)/);
+
+    if (!match) {
+      throw new Error(
+        'Could not parse Bitbucket workspace and repository from remote URL',
+      );
+    }
+
+    const [, workspace, repoSlug] = match;
+
+    // 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 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();
+      throw new Error(`Bitbucket API error: ${response.status} - ${error}`);
+    }
+
+    const data = await response.json();
+    const matchingPRs = data.values.filter(pr => 
+      pr.description && pr.description.startsWith(descriptionPattern)
+    );
+
+    return matchingPRs;
+  } catch (error) {
+    console.error(`Failed to get existing PRs: ${error.message}`);
+    return [];
+  }
+}
+
 export async function createBitbucketPR(
   sourceBranch,
   targetBranch,

package/src/next/config.js

@@ -20,13 +20,13 @@ export const environmentConfig = {
   uat: {
     newUrl: (site) => `https://${site}.uat.dpai.tech`,
     oldUrl: (site) => `https://uat.paperout.com/${site}`,
-    docupaceHost: () => 'uat.paperout.com',
+    docupaceHost: () => 'www.uat.paperout.com',
     ccUrl: (site) => `https://${site}-cc.uat.dpai.tech`,
   },
   stage: {
     newUrl: (site) => `https://${site}.stage.dpai.tech`,
     oldUrl: (site) => `https://stage.paperout.com/${site}`,
-    docupaceHost: () => 'stage.paperout.com',
+    docupaceHost: () => 'www.stage.paperout.com',
     ccUrl: (site) => `https://${site}-cc.stage.dpai.tech`,
   },
   prod: {