merge-steward 0.5.0 → 0.5.2

package/dist/github/shell-git.d.ts

@@ -8,6 +8,7 @@ export declare class ShellGitOperations implements GitOperations, SpeculativeBra
     private git;
     fetch(remote?: string): Promise<void>;
     headSha(branch: string): Promise<string>;
+    isAncestor(ancestor: string, descendant: string): Promise<boolean>;
     rebase(branch: string, onto: string): Promise<RebaseResult>;
     push(branch: string, force?: boolean): Promise<void>;
     buildSpeculative(prBranch: string, baseBranch: string, specName: string): Promise<MergeResult>;

package/dist/github/shell-git.js

@@ -33,8 +33,25 @@ export class ShellGitOperations {
         const result = await this.git(["rev-parse", branch]);
         return result.stdout.trim();
     }
+    async isAncestor(ancestor, descendant) {
+        const result = await this.git(["merge-base", "--is-ancestor", ancestor, descendant], { allowNonZero: true });
+        if (result.exitCode === 0)
+            return true;
+        if (result.exitCode === 1)
+            return false;
+        throw new Error(`git merge-base --is-ancestor failed: ${result.stderr || result.stdout}`);
+    }
     async rebase(branch, onto) {
-        await this.git(["checkout", branch]);
+        const remoteBranchRef = `refs/remotes/origin/${branch}`;
+        const remoteBranchExists = await this.git(["show-ref", "--verify", remoteBranchRef], { allowNonZero: true });
+        if (remoteBranchExists.exitCode === 0) {
+            // Always start from the freshly fetched remote branch tip so stale local branches
+            // cannot reintroduce old commits into queue processing.
+            await this.git(["checkout", "-B", branch, `origin/${branch}`]);
+        }
+        else {
+            await this.git(["checkout", branch]);
+        }
         const result = await this.git(["rebase", onto], { allowNonZero: true });
         if (result.exitCode !== 0) {
             await this.git(["rebase", "--abort"], { allowNonZero: true });

package/dist/interfaces.d.ts

@@ -6,6 +6,7 @@ import type { CIStatus, CheckResult, IncidentRecord, MergeResult, PRStatus, Queu
 export interface GitOperations {
     fetch(remote?: string): Promise<void>;
     headSha(branch: string): Promise<string>;
+    isAncestor(ancestor: string, descendant: string): Promise<boolean>;
     rebase(branch: string, onto: string): Promise<RebaseResult>;
     push(branch: string, force?: boolean): Promise<void>;
 }

package/dist/reconciler.js

@@ -154,6 +154,26 @@ async function performRebase(ctx, entry, baseSha) {
         return;
     }
     const headSha = result.newHeadSha ?? entry.headSha;
+    await ctx.git.fetch();
+    const latestRemoteHead = await ctx.git.headSha(ref(ctx, entry.branch));
+    const candidateKeepsLatestRemote = await ctx.git.isAncestor(latestRemoteHead, headSha);
+    if (!candidateKeepsLatestRemote) {
+        const detail = latestRemoteHead === entry.headSha
+            ? `candidate diverged from remote head: expected ${entry.headSha.slice(0, 8)}, ` +
+                `latest ${latestRemoteHead.slice(0, 8)}, candidate ${headSha.slice(0, 8)}`
+            : `remote advanced during rebase: expected ${entry.headSha.slice(0, 8)}, ` +
+                `latest ${latestRemoteHead.slice(0, 8)}, candidate ${headSha.slice(0, 8)}`;
+        emit(ctx, entry, "branch_mismatch", { detail });
+        if (latestRemoteHead !== entry.headSha) {
+            ctx.store.updateHead(entry.id, latestRemoteHead);
+        }
+        else {
+            ctx.store.transition(entry.id, "queued", {
+                ...CLEAN_CI,
+            }, `stale local branch diverged from ${latestRemoteHead.slice(0, 8)}`);
+        }
+        return;
+    }
     await ctx.git.push(entry.branch, true);
     emit(ctx, entry, "rebase_succeeded", { baseSha });
     // Build speculative branch for downstream entries.

package/dist/service.d.ts

@@ -23,7 +23,6 @@ export declare class MergeStewardService {
     private lastTickCompletedAt;
     private lastTickOutcome;
     private lastTickError;
-    private mainBrokenReported;
     private currentQueueBlock;
     constructor(config: StewardConfig, store: QueueStore, git: GitOperations, ci: CIRunner, github: GitHubPRApi, eviction: EvictionReporter, specBuilder: import("./interfaces.ts").SpeculativeBranchBuilder | null, logger: Logger);
     /** Expose the GitHub client for webhook handler branch→PR lookups. */

package/dist/service.js

@@ -21,7 +21,6 @@ export class MergeStewardService {
     lastTickCompletedAt = null;
     lastTickOutcome = "idle";
     lastTickError = null;
-    mainBrokenReported = false;
     currentQueueBlock = null;
     constructor(config, store, git, ci, github, eviction, specBuilder, logger) {
         this.config = config;
@@ -264,16 +263,12 @@ export class MergeStewardService {
                         || event.action === "fetch_started";
                     const level = isWarn ? "warn" : isDebug ? "debug" : "info";
                     this.logger[level]({ ...event }, `Queue: ${event.action} PR #${event.prNumber}`);
-                    if (event.action === "main_broken" && !this.mainBrokenReported) {
-                        this.mainBrokenReported = true;
-                    }
                     if (event.action === "main_broken" && tickQueueBlockEvent === null) {
                         tickQueueBlockEvent = event;
                     }
                 },
             });
             this.currentQueueBlock = tickQueueBlockEvent ? await this.describeMainBroken(tickQueueBlockEvent) : null;
-            this.mainBrokenReported = false; // Reset after successful tick.
             this.lastTickOutcome = "succeeded";
         }
         catch (error) {
@@ -309,9 +304,10 @@ export class MergeStewardService {
                 baseSha = event.baseSha ?? null;
             }
         }
+        const checkRef = event.baseSha ?? baseSha ?? baseRef;
         let checks = [];
         try {
-            checks = await this.github.listChecksForRef(baseRef);
+            checks = await this.github.listChecksForRef(checkRef);
         }
         catch {
             checks = [];

package/dist/watch/QueueListView.js

@@ -19,5 +19,5 @@ export function QueueListView({ entries, selectedEntryId, recentEvents, headEntr
     const eventRows = Math.min(8, Math.max(4, rows - entries.length - CHROME_ROWS));
     const displayedEvents = useMemo(() => recentEvents.slice(-eventRows), [eventRows, recentEvents]);
     const queueBlockLabel = summarizeQueueBlock(queueBlock);
-    return (_jsxs(Box, { flexDirection: "column", marginTop: 1, children: [queueBlock && (_jsxs(Box, { marginBottom: 1, flexDirection: "column", children: [_jsxs(Text, { color: "yellow", children: ["Queue paused: ", queueBlockLabel ?? "main is unhealthy", queueBlock.baseSha ? ` at ${truncate(queueBlock.baseSha, 10)}` : "", "."] }), _jsxs(Text, { dimColor: true, children: ["Head PR #", queueBlock.headPrNumber ?? "?", " will resume automatically once main recovers."] })] })), _jsx(Text, { dimColor: true, children: " s h pos pr    status          rt   ago branch" }), entries.length === 0 ? (_jsx(Text, { dimColor: true, children: "No queue entries in this filter." })) : (entries.map((entry) => (_jsx(QueueRow, { entry: entry, selected: entry.id === selectedEntryId, branchWidth: branchWidth, isHead: entry.id === headEntryId, queueBlock: queueBlock }, entry.id)))), _jsxs(Box, { marginTop: 1, flexDirection: "column", children: [_jsx(Text, { bold: true, children: "Recent Events" }), displayedEvents.length === 0 ? (_jsx(Text, { dimColor: true, children: "No queue events yet." })) : (displayedEvents.map((event) => (_jsxs(Box, { gap: 1, children: [_jsx(Text, { dimColor: true, children: relativeTime(event.at).padStart(4, " ") }), _jsx(Text, { children: formatEventSummary(event) })] }, event.id ?? `${event.entryId}-${event.at}`))))] })] }));
+    return (_jsxs(Box, { flexDirection: "column", marginTop: 1, children: [queueBlock && (_jsxs(Box, { marginBottom: 1, flexDirection: "column", children: [_jsxs(Text, { color: "yellow", children: ["Queue paused: ", queueBlockLabel ?? "main is unhealthy", queueBlock.baseSha ? ` at ${truncate(queueBlock.baseSha, 10)}` : "", "."] }), _jsxs(Text, { dimColor: true, children: ["Head PR #", queueBlock.headPrNumber ?? "?", " will resume automatically once main recovers."] })] })), _jsx(Text, { dimColor: true, children: " sel head pos pr    status          retry age branch" }), entries.length === 0 ? (_jsx(Text, { dimColor: true, children: "No queue entries in this filter." })) : (entries.map((entry) => (_jsx(QueueRow, { entry: entry, selected: entry.id === selectedEntryId, branchWidth: branchWidth, isHead: entry.id === headEntryId, queueBlock: queueBlock }, entry.id)))), _jsxs(Box, { marginTop: 1, flexDirection: "column", children: [_jsx(Text, { bold: true, children: "Recent Events" }), displayedEvents.length === 0 ? (_jsx(Text, { dimColor: true, children: "No queue events yet." })) : (displayedEvents.map((event) => (_jsxs(Box, { gap: 1, children: [_jsx(Text, { dimColor: true, children: relativeTime(event.at).padStart(4, " ") }), _jsx(Text, { children: formatEventSummary(event) })] }, event.id ?? `${event.entryId}-${event.at}`))))] })] }));
 }

package/dist/watch/index.js

@@ -21,6 +21,12 @@ export async function startWatch(configPath, initialPrNumber) {
     const config = loadConfig(configPath);
     const gatewayBase = resolveGatewayBaseUrl();
     const baseUrl = `${gatewayBase}/repos/${config.repoId}`;
-    const instance = render(createElement(App, { baseUrl, ...(initialPrNumber !== undefined ? { initialPrNumber } : {}) }), { stdout: process.stderr, stdin: process.stdin, patchConsole: false });
-    await instance.waitUntilExit();
+    process.stderr.write("\u001b[?1049h\u001b[2J\u001b[H");
+    try {
+        const instance = render(createElement(App, { baseUrl, ...(initialPrNumber !== undefined ? { initialPrNumber } : {}) }), { stdout: process.stderr, stdin: process.stdin, patchConsole: false });
+        await instance.waitUntilExit();
+    }
+    finally {
+        process.stderr.write("\u001b[?1049l");
+    }
 }

package/package.json

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