@vypdev/copilot 3.3.0 → 3.3.1

package/build/cli/index.js

@@ -56991,7 +56991,7 @@ function sanitizeTitle(title) {
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.buildDeploymentMergePlan = buildDeploymentMergePlan;
-/** Returns the ordered merge operations required after a successful deployment. */
+/** Returns the merge operations required after a successful deployment. */
 function buildDeploymentMergePlan(configuration) {
     if (configuration.releaseBranch) {
         return [
@@ -58865,7 +58865,7 @@ const deployed_action_policy_1 = __nccwpck_require__(5510);
 const logging_ports_1 = __nccwpck_require__(6152);
 const task_emoji_1 = __nccwpck_require__(46103);
 const TASK_ID = 'DeployedActionUseCase';
-/** Replaces the deploy label, performs ordered merges, and closes only after all succeed. */
+/** Replaces the deploy label, performs the required merges, and closes only after all succeed. */
 async function runDeployedActionWorkflow(param, dependencies) {
     (0, logging_ports_1.logInfo)(`${(0, task_emoji_1.getTaskEmoji)(TASK_ID)} Executing ${TASK_ID}.`);
     const results = [];
@@ -58936,9 +58936,17 @@ async function mergeBranches(param, branchMergePort) {
         defaultBranch: param.branches.defaultBranch,
         developmentBranch: param.branches.development,
     });
+    const executeMerge = (source, target) => (branchMergePort.mergeBranch(param.owner, param.repo, source, target, param.pullRequest.mergeTimeout, param.tokens.token));
+    // Both release merges use the immutable release branch as their source, so
+    // their PRs and checks are independent and can run concurrently. A hotfix
+    // must remain sequential because the second merge uses the updated default
+    // branch produced by the first merge.
+    if (param.currentConfiguration.releaseBranch) {
+        return await Promise.all(plan.map((merge) => executeMerge(merge.source, merge.target)));
+    }
     const mergeResults = [];
     for (const merge of plan) {
-        mergeResults.push(await branchMergePort.mergeBranch(param.owner, param.repo, merge.source, merge.target, param.pullRequest.mergeTimeout, param.tokens.token));
+        mergeResults.push(await executeMerge(merge.source, merge.target));
     }
     return mergeResults;
 }
@@ -76055,20 +76063,20 @@ function isBlockingCombinedStatus(state) {
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.MergeChecksWaiter = void 0;
+exports.MergeChecksWaiter = exports.MERGE_CHECKS_POLL_INTERVAL_SECONDS = void 0;
 const logger_1 = __nccwpck_require__(91151);
 const merge_checks_policy_1 = __nccwpck_require__(39281);
 const merge_checks_waiter_policy_1 = __nccwpck_require__(88955);
+exports.MERGE_CHECKS_POLL_INTERVAL_SECONDS = 20;
 /** Polls only the checks relevant to one pull request before a merge. */
 class MergeChecksWaiter {
     async wait(octokit, owner, repository, head, pullRequestNumber, timeout) {
-        const pollIntervalSeconds = 10;
         const maxWaitForPrChecksAttempts = 3;
         let attempts = 0;
         let waitForPrChecksAttempts = 0;
         const maxAttempts = timeout === 0
             ? Number.POSITIVE_INFINITY
-            : Math.max(1, Math.ceil(timeout / pollIntervalSeconds));
+            : Math.max(1, Math.ceil(timeout / exports.MERGE_CHECKS_POLL_INTERVAL_SECONDS));
         while (attempts < maxAttempts) {
             const { data: checkRuns } = await octokit.rest.checks.listForRef({ owner, repo: repository, ref: head });
             const { data: commitStatus } = await octokit.rest.repos.getCombinedStatusForRef({ owner, repo: repository, ref: head });
@@ -76084,7 +76092,7 @@ class MergeChecksWaiter {
             waitForPrChecksAttempts = assessment.nextRegistrationAttempts;
             if (this.handleAssessment(assessment, commitStatus.state, commitStatus.statuses, maxWaitForPrChecksAttempts))
                 return;
-            await this.waitForNextCheckPoll(pollIntervalSeconds);
+            await this.waitForNextCheckPoll();
             attempts++;
         }
         throw new Error('Timed out waiting for checks to complete');
@@ -76127,8 +76135,8 @@ class MergeChecksWaiter {
         (0, logger_1.logDebugInfo)(`Waiting for ${pendingChecks.length} status checks to complete:`);
         pendingChecks.forEach(check => (0, logger_1.logDebugInfo)(`  - ${check.context} (State: ${check.state})`));
     }
-    async waitForNextCheckPoll(pollIntervalSeconds) {
-        await new Promise(resolve => setTimeout(resolve, pollIntervalSeconds * 1000));
+    async waitForNextCheckPoll() {
+        await new Promise(resolve => setTimeout(resolve, exports.MERGE_CHECKS_POLL_INTERVAL_SECONDS * 1000));
     }
     assertChecksPassed(checkRuns, combinedStatus, statuses) {
         const blockingChecks = (0, merge_checks_policy_1.blockingCheckRuns)(checkRuns);
@@ -76162,13 +76170,25 @@ const merge_checks_policy_1 = __nccwpck_require__(39281);
 function assessMergeChecksPoll(input) {
     const runsForPullRequest = (0, merge_checks_policy_1.selectPullRequestChecks)(input.checkRuns, input.pullRequestNumber);
     if (runsForPullRequest.length > 0) {
-        return assessPullRequestChecks(runsForPullRequest, input.combinedStatus, input.registrationAttempts);
+        return assessPullRequestChecks(runsForPullRequest, input.combinedStatus, input.statuses, input.registrationAttempts);
     }
     return assessRefChecks(input.checkRuns.length, input.combinedStatus, input.statuses, input.registrationAttempts, input.maximumRegistrationAttempts);
 }
-function assessPullRequestChecks(checkRuns, combinedStatus, registrationAttempts) {
+function assessPullRequestChecks(checkRuns, combinedStatus, statuses, registrationAttempts) {
     const pendingChecks = (0, merge_checks_policy_1.pendingCheckRuns)(checkRuns);
-    if (pendingChecks.length === 0 && combinedStatus !== 'pending') {
+    if (pendingChecks.length > 0) {
+        return {
+            kind: 'pending-check-runs',
+            nextRegistrationAttempts: registrationAttempts,
+            pendingChecks,
+        };
+    }
+    // GitHub reports the combined commit status as `pending` when no legacy
+    // commit statuses exist. Check runs are a separate API, so that empty
+    // aggregate must not keep completed PR checks waiting forever.
+    const commitStatusesComplete = statuses.length === 0
+        || statusChecksAreComplete(combinedStatus, statuses);
+    if (commitStatusesComplete) {
         return {
             kind: 'completed',
             source: 'pull-request-checks',
@@ -76177,9 +76197,9 @@ function assessPullRequestChecks(checkRuns, combinedStatus, registrationAttempts
         };
     }
     return {
-        kind: 'pending-check-runs',
+        kind: 'pending-status-checks',
         nextRegistrationAttempts: registrationAttempts,
-        pendingChecks,
+        statuses: [...statuses],
     };
 }
 function assessRefChecks(totalCheckRuns, combinedStatus, statuses, registrationAttempts, maximumRegistrationAttempts) {

package/build/github_action/index.js

@@ -53607,7 +53607,7 @@ function sanitizeTitle(title) {
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.buildDeploymentMergePlan = buildDeploymentMergePlan;
-/** Returns the ordered merge operations required after a successful deployment. */
+/** Returns the merge operations required after a successful deployment. */
 function buildDeploymentMergePlan(configuration) {
     if (configuration.releaseBranch) {
         return [
@@ -55830,7 +55830,7 @@ const deployed_action_policy_1 = __nccwpck_require__(5510);
 const logging_ports_1 = __nccwpck_require__(6152);
 const task_emoji_1 = __nccwpck_require__(46103);
 const TASK_ID = 'DeployedActionUseCase';
-/** Replaces the deploy label, performs ordered merges, and closes only after all succeed. */
+/** Replaces the deploy label, performs the required merges, and closes only after all succeed. */
 async function runDeployedActionWorkflow(param, dependencies) {
     (0, logging_ports_1.logInfo)(`${(0, task_emoji_1.getTaskEmoji)(TASK_ID)} Executing ${TASK_ID}.`);
     const results = [];
@@ -55901,9 +55901,17 @@ async function mergeBranches(param, branchMergePort) {
         defaultBranch: param.branches.defaultBranch,
         developmentBranch: param.branches.development,
     });
+    const executeMerge = (source, target) => (branchMergePort.mergeBranch(param.owner, param.repo, source, target, param.pullRequest.mergeTimeout, param.tokens.token));
+    // Both release merges use the immutable release branch as their source, so
+    // their PRs and checks are independent and can run concurrently. A hotfix
+    // must remain sequential because the second merge uses the updated default
+    // branch produced by the first merge.
+    if (param.currentConfiguration.releaseBranch) {
+        return await Promise.all(plan.map((merge) => executeMerge(merge.source, merge.target)));
+    }
     const mergeResults = [];
     for (const merge of plan) {
-        mergeResults.push(await branchMergePort.mergeBranch(param.owner, param.repo, merge.source, merge.target, param.pullRequest.mergeTimeout, param.tokens.token));
+        mergeResults.push(await executeMerge(merge.source, merge.target));
     }
     return mergeResults;
 }
@@ -71038,20 +71046,20 @@ function isBlockingCombinedStatus(state) {
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.MergeChecksWaiter = void 0;
+exports.MergeChecksWaiter = exports.MERGE_CHECKS_POLL_INTERVAL_SECONDS = void 0;
 const logger_1 = __nccwpck_require__(91151);
 const merge_checks_policy_1 = __nccwpck_require__(39281);
 const merge_checks_waiter_policy_1 = __nccwpck_require__(88955);
+exports.MERGE_CHECKS_POLL_INTERVAL_SECONDS = 20;
 /** Polls only the checks relevant to one pull request before a merge. */
 class MergeChecksWaiter {
     async wait(octokit, owner, repository, head, pullRequestNumber, timeout) {
-        const pollIntervalSeconds = 10;
         const maxWaitForPrChecksAttempts = 3;
         let attempts = 0;
         let waitForPrChecksAttempts = 0;
         const maxAttempts = timeout === 0
             ? Number.POSITIVE_INFINITY
-            : Math.max(1, Math.ceil(timeout / pollIntervalSeconds));
+            : Math.max(1, Math.ceil(timeout / exports.MERGE_CHECKS_POLL_INTERVAL_SECONDS));
         while (attempts < maxAttempts) {
             const { data: checkRuns } = await octokit.rest.checks.listForRef({ owner, repo: repository, ref: head });
             const { data: commitStatus } = await octokit.rest.repos.getCombinedStatusForRef({ owner, repo: repository, ref: head });
@@ -71067,7 +71075,7 @@ class MergeChecksWaiter {
             waitForPrChecksAttempts = assessment.nextRegistrationAttempts;
             if (this.handleAssessment(assessment, commitStatus.state, commitStatus.statuses, maxWaitForPrChecksAttempts))
                 return;
-            await this.waitForNextCheckPoll(pollIntervalSeconds);
+            await this.waitForNextCheckPoll();
             attempts++;
         }
         throw new Error('Timed out waiting for checks to complete');
@@ -71110,8 +71118,8 @@ class MergeChecksWaiter {
         (0, logger_1.logDebugInfo)(`Waiting for ${pendingChecks.length} status checks to complete:`);
         pendingChecks.forEach(check => (0, logger_1.logDebugInfo)(`  - ${check.context} (State: ${check.state})`));
     }
-    async waitForNextCheckPoll(pollIntervalSeconds) {
-        await new Promise(resolve => setTimeout(resolve, pollIntervalSeconds * 1000));
+    async waitForNextCheckPoll() {
+        await new Promise(resolve => setTimeout(resolve, exports.MERGE_CHECKS_POLL_INTERVAL_SECONDS * 1000));
     }
     assertChecksPassed(checkRuns, combinedStatus, statuses) {
         const blockingChecks = (0, merge_checks_policy_1.blockingCheckRuns)(checkRuns);
@@ -71145,13 +71153,25 @@ const merge_checks_policy_1 = __nccwpck_require__(39281);
 function assessMergeChecksPoll(input) {
     const runsForPullRequest = (0, merge_checks_policy_1.selectPullRequestChecks)(input.checkRuns, input.pullRequestNumber);
     if (runsForPullRequest.length > 0) {
-        return assessPullRequestChecks(runsForPullRequest, input.combinedStatus, input.registrationAttempts);
+        return assessPullRequestChecks(runsForPullRequest, input.combinedStatus, input.statuses, input.registrationAttempts);
     }
     return assessRefChecks(input.checkRuns.length, input.combinedStatus, input.statuses, input.registrationAttempts, input.maximumRegistrationAttempts);
 }
-function assessPullRequestChecks(checkRuns, combinedStatus, registrationAttempts) {
+function assessPullRequestChecks(checkRuns, combinedStatus, statuses, registrationAttempts) {
     const pendingChecks = (0, merge_checks_policy_1.pendingCheckRuns)(checkRuns);
-    if (pendingChecks.length === 0 && combinedStatus !== 'pending') {
+    if (pendingChecks.length > 0) {
+        return {
+            kind: 'pending-check-runs',
+            nextRegistrationAttempts: registrationAttempts,
+            pendingChecks,
+        };
+    }
+    // GitHub reports the combined commit status as `pending` when no legacy
+    // commit statuses exist. Check runs are a separate API, so that empty
+    // aggregate must not keep completed PR checks waiting forever.
+    const commitStatusesComplete = statuses.length === 0
+        || statusChecksAreComplete(combinedStatus, statuses);
+    if (commitStatusesComplete) {
         return {
             kind: 'completed',
             source: 'pull-request-checks',
@@ -71160,9 +71180,9 @@ function assessPullRequestChecks(checkRuns, combinedStatus, registrationAttempts
         };
     }
     return {
-        kind: 'pending-check-runs',
+        kind: 'pending-status-checks',
         nextRegistrationAttempts: registrationAttempts,
-        pendingChecks,
+        statuses: [...statuses],
     };
 }
 function assessRefChecks(totalCheckRuns, combinedStatus, statuses, registrationAttempts, maximumRegistrationAttempts) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vypdev/copilot",
-  "version": "3.3.0",
+  "version": "3.3.1",
   "packageManager": "pnpm@10.12.4",
   "description": "Automates branch management, GitHub project linking, and issue/PR tracking with Git-Flow methodology.",
   "homepage": "https://github.com/vypdev/copilot",