merge-steward 0.10.0 → 0.10.2

package/README.md

@@ -258,6 +258,7 @@ These are the first commands to reach for after setup or when a queue looks wron
 ```bash
 merge-steward doctor --repo app
 merge-steward service status
+merge-steward service restart
 merge-steward dashboard
 merge-steward queue status --repo app
 merge-steward queue show --repo app --pr 123

package/dist/cli/commands/service.js

@@ -2,7 +2,7 @@ import { installServiceUnit } from "../../install.js";
 import { UsageError } from "../types.js";
 import { parseIntegerFlag } from "../args.js";
 import { formatJson, writeOutput } from "../output.js";
-import { formatCommandFailure, parseSystemctlShowOutput, runSystemctl } from "../system.js";
+import { fetchServiceHealthStatus, formatCommandFailure, parseSystemctlShowOutput, runSystemctl } from "../system.js";
 const UNIT_NAME = "merge-steward.service";
 export async function handleService(parsed, stdout, runCommand) {
     const subcommand = parsed.positionals[1];
@@ -31,6 +31,8 @@ export async function handleService(parsed, stdout, runCommand) {
         const restart = await runSystemctl(runCommand, ["reload-or-restart", UNIT_NAME]);
         if (parsed.flags.get("json") === true) {
             writeOutput(stdout, formatJson({
+                service: "merge-steward",
+                unit: UNIT_NAME,
                 daemonReloaded: daemonReload.ok,
                 restarted: restart.ok,
                 errors: [
@@ -55,8 +57,9 @@ export async function handleService(parsed, stdout, runCommand) {
             throw new Error(status.error);
         }
         const properties = parseSystemctlShowOutput(status.result.stdout);
+        const health = await fetchServiceHealthStatus();
         if (parsed.flags.get("json") === true) {
-            writeOutput(stdout, formatJson({ unit: UNIT_NAME, systemd: properties }));
+            writeOutput(stdout, formatJson({ service: "merge-steward", unit: UNIT_NAME, systemd: properties, health }));
             return 0;
         }
         writeOutput(stdout, [
@@ -65,6 +68,9 @@ export async function handleService(parsed, stdout, runCommand) {
             `Enabled: ${properties.UnitFileState ?? "unknown"}`,
             `Active: ${properties.ActiveState ?? "unknown"}${properties.SubState ? ` (${properties.SubState})` : ""}`,
             properties.ExecMainPID ? `Main PID: ${properties.ExecMainPID}` : undefined,
+            health.reachable
+                ? `Health: ${health.ok ? "ok" : "unhealthy"} (HTTP ${health.status})`
+                : `Health: not reachable (${health.error})`,
         ]
             .filter(Boolean)
             .join("\n") + "\n");

package/dist/cli/help.js

@@ -20,7 +20,7 @@ function rootHelpText() {
         "  repo list [--json]                                     List attached repositories",
         "  repo show <id> [--json]                                Show one repo config",
         "  doctor [--repo <id>] [--json]                          Validate config, secrets, auth, and required binaries",
-        "  service status [--json]                                Show systemd state",
+        "  service status [--json]                                Show systemd state and local health",
         "  service logs [--lines <count>] [--json]                Show recent journal logs",
         "  queue status --repo <id> [--json]                      Show queue summary and current entries",
         "  queue show --repo <id> (--entry <id> | --pr <num>) [--events <count>] [--json]",
@@ -83,7 +83,7 @@ function serviceHelpText() {
         "Commands:",
         "  install [--force] [--json]    Reinstall the systemd unit",
         "  restart [--json]              Reload-or-restart the service",
-        "  status [--json]               Show systemd state",
+        "  status [--json]               Show systemd state and local health",
         "  logs [--lines <count>] [--json]",
         "                                Show recent journal logs",
     ].join("\n");

package/dist/cli/system.d.ts

@@ -40,6 +40,14 @@ export declare function fetchGatewayJson<T>(relativePath: string, options?: {
     method?: string;
     body?: unknown;
 }): Promise<T>;
+export declare function fetchServiceHealthStatus(): Promise<{
+    reachable: true;
+    ok: boolean;
+    status: number;
+} | {
+    reachable: false;
+    error: string;
+}>;
 export declare function fetchLocalJson<T>(repoId: string, relativePath: string, options?: {
     method?: string;
 }): Promise<T>;

package/dist/cli/system.js

@@ -161,7 +161,7 @@ export function getGatewayBaseUrl() {
         throw new Error("merge-steward home not initialized.");
     }
     const homeConfig = parseHomeConfigObject(readFileSync(homeConfigPath, "utf8"), homeConfigPath);
-    const bind = homeConfig.server.bind;
+    const bind = homeConfig.server.bind === "0.0.0.0" ? "127.0.0.1" : homeConfig.server.bind;
     const port = homeConfig.server.gateway_port ?? (homeConfig.server.port_base - 1);
     return `http://${bind}:${port}`;
 }
@@ -193,6 +193,34 @@ export async function fetchGatewayJson(relativePath, options) {
     const base = getGatewayBaseUrl();
     return await requestGatewayJson(`${base}${relativePath}`, options);
 }
+export async function fetchServiceHealthStatus() {
+    try {
+        const response = await fetch(`${getGatewayBaseUrl()}/health`, {
+            signal: AbortSignal.timeout(2_000),
+        });
+        let ok = response.ok;
+        try {
+            const body = await response.json();
+            if (typeof body.ok === "boolean") {
+                ok = response.ok && body.ok;
+            }
+        }
+        catch {
+            ok = response.ok;
+        }
+        return {
+            reachable: true,
+            ok,
+            status: response.status,
+        };
+    }
+    catch (error) {
+        return {
+            reachable: false,
+            error: error instanceof Error ? error.message : String(error),
+        };
+    }
+}
 export async function fetchLocalJson(repoId, relativePath, options) {
     return await fetchGatewayJson(`/repos/${repoId}${relativePath}`, options);
 }

package/dist/watch/dashboard-model.js

@@ -3,6 +3,39 @@ import { formatDuration, humanStatus, nextStepLabel, relativeTime, summarizeQueu
 const RECENT_EVICTION_MS = 60 * 60 * 1_000;
 const STUCK_ENTRY_MS = 25 * 60 * 1_000;
 const OFFLINE_STALE_MS = 10 * 1_000;
+function isLaterEntry(left, right) {
+    if (left.position !== right.position) {
+        return left.position > right.position;
+    }
+    return new Date(left.updatedAt).getTime() >= new Date(right.updatedAt).getTime();
+}
+function getLatestEntries(snapshot) {
+    if (!snapshot) {
+        return [];
+    }
+    const byPR = new Map();
+    for (const entry of snapshot.entries) {
+        const existing = byPR.get(entry.prNumber);
+        if (!existing || isLaterEntry(entry, existing)) {
+            byPR.set(entry.prNumber, entry);
+        }
+    }
+    return [...byPR.values()].sort((a, b) => a.position - b.position);
+}
+function getMostRecentActivityAt(snapshot) {
+    const latestEntries = getLatestEntries(snapshot);
+    if (latestEntries.length === 0) {
+        return undefined;
+    }
+    return latestEntries.reduce((latest, entry) => {
+        if (!latest) {
+            return entry.updatedAt;
+        }
+        return new Date(entry.updatedAt).getTime() > new Date(latest).getTime()
+            ? entry.updatedAt
+            : latest;
+    }, undefined);
+}
 export function matchRepoRef(repo, repoRef) {
     if (!repoRef) {
         return false;
@@ -22,10 +55,7 @@ export function getChainEntries(snapshot) {
     return buildChainEntries(snapshot.entries);
 }
 export function getActiveEntries(snapshot) {
-    if (!snapshot) {
-        return [];
-    }
-    return snapshot.entries.filter((entry) => (entry.status !== "merged" && entry.status !== "evicted" && entry.status !== "dequeued"));
+    return getLatestEntries(snapshot).filter((entry) => (entry.status !== "merged" && entry.status !== "evicted" && entry.status !== "dequeued"));
 }
 export function getDefaultEntryId(snapshot, filter, preferredPrNumber) {
     if (!snapshot) {
@@ -81,7 +111,7 @@ export function getRepoHealth(repo, now = Date.now()) {
             };
         }
     }
-    const recentEvicted = snapshot.entries.find((entry) => (entry.status === "evicted"
+    const recentEvicted = getLatestEntries(snapshot).find((entry) => (entry.status === "evicted"
         && now - new Date(entry.updatedAt).getTime() <= RECENT_EVICTION_MS));
     if (recentEvicted) {
         return {
@@ -106,7 +136,7 @@ export function getRepoHealth(repo, now = Date.now()) {
         label: "Idle",
         color: "green",
         detail: snapshot.summary.total > 0
-            ? `No active queue work right now. Last activity was ${relativeTime(snapshot.entries[0]?.updatedAt)} ago.`
+            ? `No active queue work right now. Last activity was ${relativeTime(getMostRecentActivityAt(snapshot))} ago.`
             : "No pull requests are queued right now.",
     };
 }
@@ -143,19 +173,23 @@ export function projectStatsSummary(snapshot) {
     if (!snapshot) {
         return "No queue data yet.";
     }
-    const { summary } = snapshot;
+    const latestEntries = getLatestEntries(snapshot);
     const activeEntries = getActiveEntries(snapshot);
     const avgWaitMs = activeEntries.length > 0
         ? activeEntries.reduce((sum, entry) => sum + (Date.now() - new Date(entry.enqueuedAt).getTime()), 0) / activeEntries.length
         : 0;
+    const queued = latestEntries.filter((entry) => entry.status === "queued").length;
+    const validating = latestEntries.filter((entry) => entry.status === "validating" || entry.status === "preparing_head").length;
+    const merging = latestEntries.filter((entry) => entry.status === "merging").length;
+    const evicted = latestEntries.filter((entry) => entry.status === "evicted").length;
     const parts = [
-        `${summary.active} active`,
-        `${summary.queued} waiting`,
-        `${summary.validating} testing`,
-        `${summary.merging} merging`,
+        `${activeEntries.length} active`,
+        `${queued} waiting`,
+        `${validating} testing`,
+        `${merging} merging`,
     ];
-    if (summary.evicted > 0) {
-        parts.push(`${summary.evicted} need repair`);
+    if (evicted > 0) {
+        parts.push(`${evicted} need repair`);
     }
     if (avgWaitMs > 0) {
         parts.push(`avg wait ${formatDuration(avgWaitMs)}`);

package/package.json

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