merge-steward 0.5.0 → 0.5.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/service.d.ts CHANGED
@@ -23,7 +23,6 @@ export declare class MergeStewardService {
23
23
  private lastTickCompletedAt;
24
24
  private lastTickOutcome;
25
25
  private lastTickError;
26
- private mainBrokenReported;
27
26
  private currentQueueBlock;
28
27
  constructor(config: StewardConfig, store: QueueStore, git: GitOperations, ci: CIRunner, github: GitHubPRApi, eviction: EvictionReporter, specBuilder: import("./interfaces.ts").SpeculativeBranchBuilder | null, logger: Logger);
29
28
  /** Expose the GitHub client for webhook handler branch→PR lookups. */
package/dist/service.js CHANGED
@@ -21,7 +21,6 @@ export class MergeStewardService {
21
21
  lastTickCompletedAt = null;
22
22
  lastTickOutcome = "idle";
23
23
  lastTickError = null;
24
- mainBrokenReported = false;
25
24
  currentQueueBlock = null;
26
25
  constructor(config, store, git, ci, github, eviction, specBuilder, logger) {
27
26
  this.config = config;
@@ -264,16 +263,12 @@ export class MergeStewardService {
264
263
  || event.action === "fetch_started";
265
264
  const level = isWarn ? "warn" : isDebug ? "debug" : "info";
266
265
  this.logger[level]({ ...event }, `Queue: ${event.action} PR #${event.prNumber}`);
267
- if (event.action === "main_broken" && !this.mainBrokenReported) {
268
- this.mainBrokenReported = true;
269
- }
270
266
  if (event.action === "main_broken" && tickQueueBlockEvent === null) {
271
267
  tickQueueBlockEvent = event;
272
268
  }
273
269
  },
274
270
  });
275
271
  this.currentQueueBlock = tickQueueBlockEvent ? await this.describeMainBroken(tickQueueBlockEvent) : null;
276
- this.mainBrokenReported = false; // Reset after successful tick.
277
272
  this.lastTickOutcome = "succeeded";
278
273
  }
279
274
  catch (error) {
@@ -309,9 +304,10 @@ export class MergeStewardService {
309
304
  baseSha = event.baseSha ?? null;
310
305
  }
311
306
  }
307
+ const checkRef = event.baseSha ?? baseSha ?? baseRef;
312
308
  let checks = [];
313
309
  try {
314
- checks = await this.github.listChecksForRef(baseRef);
310
+ checks = await this.github.listChecksForRef(checkRef);
315
311
  }
316
312
  catch {
317
313
  checks = [];
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "merge-steward",
3
- "version": "0.5.0",
3
+ "version": "0.5.1",
4
4
  "description": "Serial merge queue for GitHub — rebase, CI-gate, and merge PRs one at a time",
5
5
  "type": "module",
6
6
  "repository": {