merge-steward 0.8.4 → 0.8.6

package/dist/cli.js

@@ -15,6 +15,11 @@ export async function runCli(argv, options) {
     const runCommand = options?.runCommand ?? defaultRunCommand;
     try {
         const parsed = parseArgs(argv);
+        if (parsed.flags.get("version") === true || parsed.positionals[0] === "version") {
+            const { version } = await import("../package.json", { with: { type: "json" } }).then((m) => m.default);
+            writeOutput(stdout, `merge-steward ${version}\n`);
+            return 0;
+        }
         validateFlags(parsed);
         const command = parsed.positionals[0] ?? "help";
         if (hasHelpFlag(parsed) || command === "help") {

package/dist/reconciler.js

@@ -159,7 +159,6 @@ async function prepareEntry(ctx, entry, isHead, prevEntry) {
         }
         // Gate: non-spinning — skip if base hasn't changed since last conflict.
         if (isRetryGated(entry, baseSha)) {
-            emit(ctx, entry, "retry_gated", { baseSha, detail: "base unchanged since last conflict" });
             try {
                 const prStatus = await ctx.github.getStatus(entry.prNumber);
                 if (prStatus.mergeStateStatus === "DIRTY") {
@@ -168,10 +167,18 @@ async function prepareEntry(ctx, entry, isHead, prevEntry) {
                         detail: "retry gated and GitHub still reports merge conflict",
                     });
                     await evictEntry(ctx, entry, "integration_conflict");
+                    return;
                 }
+                // GitHub says CLEAN but local clone conflicted — the conflict was
+                // likely transient (stale clone state). Clear the gate and retry.
+                emit(ctx, entry, "retry_gated", { baseSha, detail: "local conflict but GitHub reports CLEAN, retrying" });
+                ctx.store.transition(entry.id, "preparing_head", {
+                    lastFailedBaseSha: null, ...CLEAN_CI, ...CLEAN_SPEC,
+                }, "GitHub reports CLEAN, clearing retry gate");
             }
             catch {
-                // Best-effort check.
+                // GitHub probe failed — hold the gate.
+                emit(ctx, entry, "retry_gated", { baseSha, detail: "base unchanged since last conflict" });
             }
             return;
         }

package/dist/watch/format.js

@@ -128,17 +128,23 @@ const STATUS_DISPLAY = {
 function displayStatus(status) {
     return STATUS_DISPLAY[status] ?? status;
 }
+/** Truncate hex strings longer than 12 chars (SHAs, run IDs) to 8 chars. */
+function shortenHashes(text) {
+    return text.replace(/\b[0-9a-f]{13,}\b/g, (match) => match.slice(0, 8));
+}
 export function formatEventSummary(event) {
     const from = event.fromStatus ? displayStatus(event.fromStatus) : null;
     const to = displayStatus(event.toStatus);
     const transition = from ? `${from} \u2192 ${to}` : to;
-    return `#${event.prNumber} ${transition}${event.detail ? ` (${event.detail})` : ""}`;
+    const detail = event.detail ? ` (${shortenHashes(event.detail)})` : "";
+    return `#${event.prNumber} ${transition}${detail}`;
 }
 export function formatEntryEvent(event) {
     const from = event.fromStatus ? displayStatus(event.fromStatus) : null;
     const to = displayStatus(event.toStatus);
     const transition = from ? `${from} \u2192 ${to}` : to;
-    return `${transition}${event.detail ? ` (${event.detail})` : ""}`;
+    const detail = event.detail ? ` (${shortenHashes(event.detail)})` : "";
+    return `${transition}${detail}`;
 }
 export function formatDuration(ms) {
     const seconds = Math.floor(ms / 1000);

package/package.json

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