merge-steward 0.32.2 → 0.32.3

package/dist/reconciler.js

@@ -126,6 +126,9 @@ async function verifyMergedEntriesPostPush(ctx) {
                 postMergeCheckedAt: now,
             }, "post-merge verification");
         }
+        const post = ctx.store.getEntry(entry.id);
+        if (post)
+            await syncQueueStateLabels(ctx, post);
     }
 }
 // phase implementations live in dedicated modules now

package/dist/service-queue.d.ts

@@ -35,7 +35,8 @@ export declare class MergeStewardQueueCommands {
     tryAdmit(prNumber: number, branch: string, headSha: string): Promise<boolean>;
     dequeueByPR(prNumber: number): void;
     updateHeadByPR(prNumber: number, headSha: string): void;
-    acknowledgeExternalMerge(prNumber: number): void;
+    acknowledgeExternalMerge(prNumber: number): Promise<void>;
+    private clearQueueStateLabels;
     private invalidateDownstreamOf;
     private findAffectedEntriesAfterPriorityChange;
     private requeueAffectedEntries;

package/dist/service-queue.js

@@ -250,7 +250,7 @@ export class MergeStewardQueueCommands {
             this.logger.info({ prNumber, entryId: entry.id, headSha }, "PR head updated via webhook");
         }
     }
-    acknowledgeExternalMerge(prNumber) {
+    async acknowledgeExternalMerge(prNumber) {
         const entry = this.store.getEntryByPR(this.config.repoId, prNumber);
         if (entry) {
             this.store.transition(entry.id, "merged", {
@@ -260,9 +260,32 @@ export class MergeStewardQueueCommands {
                 postMergeCheckedAt: new Date().toISOString(),
             });
             this.invalidateDownstreamOf(entry);
+            await this.clearQueueStateLabels(prNumber);
             this.logger.info({ prNumber, entryId: entry.id }, "External merge acknowledged");
         }
     }
+    async clearQueueStateLabels(prNumber) {
+        const managed = [this.config.queueTestingLabel, this.config.queueMergingLabel].filter(Boolean);
+        if (managed.length === 0)
+            return;
+        let current;
+        try {
+            current = await this.github.listLabels(prNumber);
+        }
+        catch (error) {
+            this.logger.debug({ prNumber, err: error }, "Could not read queue state labels after external merge");
+            return;
+        }
+        const remove = managed.filter((label) => current.includes(label));
+        if (remove.length === 0)
+            return;
+        try {
+            await this.github.setLabels(prNumber, { remove });
+        }
+        catch (error) {
+            this.logger.warn({ prNumber, labels: remove, err: error }, "Could not clear queue state labels after external merge");
+        }
+    }
     invalidateDownstreamOf(removedEntry) {
         const allActive = this.store.listActive(this.config.repoId);
         const targets = selectDownstream(allActive, removedEntry.id);

package/dist/service.d.ts

@@ -39,7 +39,7 @@ export declare class MergeStewardService {
     dequeueByPR(prNumber: number): void;
     updateHeadByPR(prNumber: number, headSha: string): void;
     updatePriorityByPR(prNumber: number, priority: number): boolean;
-    acknowledgeExternalMerge(prNumber: number): void;
+    acknowledgeExternalMerge(prNumber: number): Promise<void>;
     getStatus(): QueueEntry[];
     getIncident(incidentId: string): IncidentRecord | undefined;
     listIncidents(entryId: string): IncidentRecord[];

package/dist/service.js

@@ -76,8 +76,8 @@ export class MergeStewardService {
     updatePriorityByPR(prNumber, priority) {
         return this.queueCommands.updatePriorityByPR(prNumber, priority);
     }
-    acknowledgeExternalMerge(prNumber) {
-        this.queueCommands.acknowledgeExternalMerge(prNumber);
+    async acknowledgeExternalMerge(prNumber) {
+        await this.queueCommands.acknowledgeExternalMerge(prNumber);
     }
     getStatus() {
         return this.watchQueries.getStatus();

package/dist/webhook-handler.js

@@ -128,7 +128,7 @@ export async function processWebhookEvent(event, service, config, logger) {
             break;
         }
         case "pr_merged": {
-            service.acknowledgeExternalMerge(event.prNumber);
+            await service.acknowledgeExternalMerge(event.prNumber);
             break;
         }
         case "pr_closed": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "merge-steward",
-  "version": "0.32.2",
+  "version": "0.32.3",
   "description": "Serial merge queue for GitHub — rebase, CI-gate, and merge PRs one at a time",
   "type": "module",
   "repository": {