merge-steward 0.32.3 → 0.32.5

package/dist/graceful-shutdown.d.ts

@@ -0,0 +1,11 @@
+export interface ShutdownLogger {
+    info(bindings: Record<string, unknown>, message: string): void;
+    warn(bindings: Record<string, unknown>, message: string): void;
+    error(bindings: Record<string, unknown>, message: string): void;
+}
+export declare function createGracefulShutdown(options: {
+    service: string;
+    logger: ShutdownLogger;
+    cleanup: () => Promise<void>;
+    terminate?: (code: number) => void;
+}): (trigger: string) => Promise<void>;

package/dist/graceful-shutdown.js

@@ -0,0 +1,29 @@
+export function createGracefulShutdown(options) {
+    let shutdownPromise;
+    let firstTrigger;
+    const terminate = options.terminate ?? ((code) => {
+        process.exitCode = code;
+        setImmediate(() => process.exit(code));
+    });
+    return (trigger) => {
+        if (shutdownPromise) {
+            options.logger.warn({ service: options.service, trigger, firstTrigger }, "Shutdown already in progress");
+            return shutdownPromise;
+        }
+        firstTrigger = trigger;
+        options.logger.info({ service: options.service, trigger }, "Shutdown requested");
+        shutdownPromise = options.cleanup()
+            .then(() => {
+            options.logger.info({ service: options.service, trigger }, "Shutdown complete");
+        })
+            .catch((error) => {
+            options.logger.error({
+                service: options.service,
+                trigger,
+                error: error instanceof Error ? error.message : String(error),
+            }, "Shutdown failed");
+            terminate(1);
+        });
+        return shutdownPromise;
+    };
+}

package/dist/http-multi.d.ts

@@ -18,4 +18,4 @@ export declare function buildMultiRepoHttpServer(options: {
         }): Promise<ServiceGitHubRepoAccessResponse>;
     };
     logger: Logger;
-}): Promise<fastify.FastifyInstance<import("node:http").Server<typeof import("node:http").IncomingMessage, typeof import("node:http").ServerResponse>, import("node:http").IncomingMessage, import("node:http").ServerResponse<import("node:http").IncomingMessage>, Logger, fastify.FastifyTypeProviderDefault>>;
+}): Promise<fastify.FastifyInstance<import("http").Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse>, import("http").IncomingMessage, import("http").ServerResponse<import("http").IncomingMessage>, Logger, fastify.FastifyTypeProviderDefault>>;

package/dist/http-multi.js

@@ -1,4 +1,4 @@
-import fastify from "fastify";
+import fastify, { LogController } from "fastify";
 import rawBody from "fastify-raw-body";
 import { z } from "zod";
 import { verifySignature, normalizeWebhook, processWebhookEvent } from "./webhook-handler.js";
@@ -33,7 +33,7 @@ export async function buildMultiRepoHttpServer(options) {
     for (const record of repos.values()) {
         byRepoId.set(record.config.repoId, record);
     }
-    const app = fastify({ loggerInstance: logger, disableRequestLogging: true });
+    const app = fastify({ loggerInstance: logger, logController: new LogController({ disableRequestLogging: true }) });
     await app.register(rawBody, { runFirst: true });
     // --- Health ---
     app.get("/health", async () => ({

package/dist/server.js

@@ -11,6 +11,7 @@ import { buildMultiRepoHttpServer } from "./http-multi.js";
 import { loadAllRepoConfigs } from "./install.js";
 import { parseHomeConfigObject } from "./steward-home.js";
 import { getMergeStewardPathLayout } from "./runtime-paths.js";
+import { createGracefulShutdown } from "./graceful-shutdown.js";
 import { createGitHubAppTokenManager, generateJwt, resolveGitHubAuthConfig, resolveAppSlug } from "./github-auth.js";
 import { discoverRepoSettings } from "./github-repo-discovery.js";
 import { resolveSecretWithSource } from "./resolve-secret.js";
@@ -193,24 +194,26 @@ export async function startMultiServer() {
         },
         logger,
     });
-    const shutdown = async () => {
-        shuttingDown = true;
-        logger.info("Shutting down...");
-        githubAppTokenManager?.stop();
-        setRuntimeGitHubAuthProvider(undefined);
-        for (const record of repos.values()) {
-            const inst = record.instance;
-            if (!inst) {
-                continue;
+    const shutdown = createGracefulShutdown({
+        service: "merge-steward",
+        logger,
+        cleanup: async () => {
+            shuttingDown = true;
+            githubAppTokenManager?.stop();
+            setRuntimeGitHubAuthProvider(undefined);
+            for (const record of repos.values()) {
+                const inst = record.instance;
+                if (!inst) {
+                    continue;
+                }
+                await inst.service.stop();
+                inst.store.close();
             }
-            await inst.service.stop();
-            inst.store.close();
-        }
-        await app.close();
-        process.exit(0);
-    };
-    process.on("SIGTERM", () => void shutdown());
-    process.on("SIGINT", () => void shutdown());
+            await app.close();
+        },
+    });
+    process.once("SIGTERM", () => void shutdown("SIGTERM"));
+    process.once("SIGINT", () => void shutdown("SIGINT"));
     await app.listen({ host: bind, port });
     logger.info({ bind, port, repos: repos.size }, "merge-steward listening");
     const initializeRepo = async (record) => {

package/infra/merge-steward.service

@@ -21,7 +21,7 @@ LoadCredentialEncrypted=merge-steward-webhook-secret:/etc/credstore.encrypted/me
 LoadCredentialEncrypted=merge-steward-github-app-pem:/etc/credstore.encrypted/merge-steward-github-app-pem.cred
 
 ExecStart=/usr/bin/env merge-steward serve
-Restart=on-failure
+Restart=always
 RestartSec=5
 
 NoNewPrivileges=true

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "merge-steward",
-  "version": "0.32.3",
+  "version": "0.32.5",
   "description": "Serial merge queue for GitHub — rebase, CI-gate, and merge PRs one at a time",
   "type": "module",
   "repository": {
@@ -35,20 +35,20 @@
     "merge-steward": "dist/index.js"
   },
   "dependencies": {
-    "fastify": "^5.8.5",
+    "fastify": "^5.10.0",
     "fastify-raw-body": "^5.0.0",
-    "ink": "^7.0.1",
+    "ink": "^7.1.0",
     "pino": "^10.3.1",
-    "react": "^19.2.5",
-    "zod": "^4.3.6"
+    "react": "^19.2.7",
+    "zod": "^4.4.3"
   },
   "devDependencies": {
-    "@types/node": "^25.6.0",
-    "@types/react": "^19.2.14",
+    "@types/node": "^24.13.3",
+    "@types/react": "^19.2.17",
     "@typescript/native-preview": "7.0.0-dev.20260427.1",
-    "fast-check": "^4.7.0",
-    "isomorphic-git": "^1.37.6",
-    "memfs": "^4.57.2"
+    "fast-check": "^4.9.0",
+    "isomorphic-git": "^1.38.6",
+    "memfs": "^4.64.0"
   },
   "scripts": {
     "dev": "node --watch --experimental-transform-types src/index.ts",