merge-steward 0.14.2 → 0.14.3

package/dist/service-runtime.d.ts

@@ -22,6 +22,8 @@ export declare class MergeStewardRuntime {
     private lastTickOutcome;
     private lastTickError;
     private currentQueueBlock;
+    private readonly waitingMainInfoAt;
+    private static readonly WAITING_MAIN_INFO_INTERVAL_MS;
     constructor(config: StewardConfig, policy: GitHubPolicyCache, store: QueueStore, git: GitOperations, ci: CIRunner, github: GitHubPRApi, eviction: EvictionReporter, specBuilder: SpeculativeBranchBuilder, logger: Logger, beforeTick?: (() => Promise<void>) | undefined);
     start(): Promise<void>;
     stop(): Promise<void>;

package/dist/service-runtime.js

@@ -17,6 +17,12 @@ export class MergeStewardRuntime {
     lastTickOutcome = "idle";
     lastTickError = null;
     currentQueueBlock = null;
+    // Per-entry timestamp of the last info-level `merge_waiting_main` log.
+    // The event fires every tick while the gate waits, so subsequent ticks
+    // log at debug to avoid spamming; a re-emission of info every ~5 min keeps
+    // long waits visible in `service logs` without drowning it out.
+    waitingMainInfoAt = new Map();
+    static WAITING_MAIN_INFO_INTERVAL_MS = 5 * 60 * 1000;
     constructor(config, policy, store, git, ci, github, eviction, specBuilder, logger, beforeTick) {
         this.config = config;
         this.policy = policy;
@@ -101,8 +107,23 @@ export class MergeStewardRuntime {
                         || event.action === "ci_failed"
                         || event.action === "merge_rejected" || event.action === "budget_exhausted";
                     const isDebug = event.action === "ci_pending" || event.action === "retry_gated"
-                        || event.action === "fetch_started" || event.action === "merge_waiting_main";
-                    const level = isWarn ? "warn" : isDebug ? "debug" : "info";
+                        || event.action === "fetch_started";
+                    let level = isWarn ? "warn" : isDebug ? "debug" : "info";
+                    if (event.action === "merge_waiting_main") {
+                        // The event fires every ~tick while the gate waits on main's own
+                        // CI.  Log at info the first time (so an operator can see *why*
+                        // the head entry is parked in merging) and once every interval
+                        // after, debug on the intermediate ticks to avoid spamming.
+                        const last = this.waitingMainInfoAt.get(event.entryId);
+                        const now = Date.now();
+                        if (last === undefined || now - last >= MergeStewardRuntime.WAITING_MAIN_INFO_INTERVAL_MS) {
+                            level = "info";
+                            this.waitingMainInfoAt.set(event.entryId, now);
+                        }
+                        else {
+                            level = "debug";
+                        }
+                    }
                     this.logger[level]({ ...event }, `Queue: ${event.action} PR #${event.prNumber}`);
                     if (event.action === "main_broken" && tickQueueBlockEvent === null) {
                         tickQueueBlockEvent = event;

package/package.json

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