From 53df18943fec864bc8ab179672a4e8ebabec0687 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Mon, 20 Apr 2026 15:52:43 +0100
Subject: [PATCH] refactor: reuse gateway close handler params

---
 src/gateway/server.impl.ts | 44 ++++++++------------------------------
 1 file changed, 9 insertions(+), 35 deletions(-)

diff --git a/src/gateway/server.impl.ts b/src/gateway/server.impl.ts
index 7611810e678..1d805aab841 100644
--- a/src/gateway/server.impl.ts
+++ b/src/gateway/server.impl.ts
@@ -521,9 +521,10 @@ export async function startGatewayServer(
       clearSecretsRuntimeSnapshot,
       closeMcpServer: async () => await closeMcpLoopbackServer(),
     });
-  const closeOnStartupFailure = async () => {
-    await runClosePrelude();
-    await createGatewayCloseHandler({
+  const { getRuntimeSnapshot, startChannels, startChannel, stopChannel, markChannelLoggedOut } =
+    channelManager;
+  const createCloseHandler = () =>
+    createGatewayCloseHandler({
       bonjourStop: runtimeState.bonjourStop,
       tailscaleCleanup: runtimeState.tailscaleCleanup,
       canvasHost,
@@ -551,11 +552,12 @@ export async function startGatewayServer(
       wss,
       httpServer,
       httpServers,
-    })({ reason: "gateway startup failed" });
+    });
+  const closeOnStartupFailure = async () => {
+    await runClosePrelude();
+    await createCloseHandler()({ reason: "gateway startup failed" });
   };
 
-  const { getRuntimeSnapshot, startChannels, startChannel, stopChannel, markChannelLoggedOut } =
-    channelManager;
   try {
     const earlyRuntime = await startGatewayEarlyRuntime({
       minimalTestGateway,
@@ -826,35 +828,7 @@ export async function startGatewayServer(
     throw err;
   }
 
-  const close = createGatewayCloseHandler({
-    bonjourStop: runtimeState.bonjourStop,
-    tailscaleCleanup: runtimeState.tailscaleCleanup,
-    canvasHost,
-    canvasHostServer,
-    releasePluginRouteRegistry,
-    stopChannel,
-    pluginServices: runtimeState.pluginServices,
-    cron: runtimeState.cronState.cron,
-    heartbeatRunner: runtimeState.heartbeatRunner,
-    updateCheckStop: runtimeState.stopGatewayUpdateCheck,
-    stopTaskRegistryMaintenance,
-    nodePresenceTimers,
-    broadcast,
-    tickInterval: runtimeState.tickInterval,
-    healthInterval: runtimeState.healthInterval,
-    dedupeCleanup: runtimeState.dedupeCleanup,
-    mediaCleanup: runtimeState.mediaCleanup,
-    agentUnsub: runtimeState.agentUnsub,
-    heartbeatUnsub: runtimeState.heartbeatUnsub,
-    transcriptUnsub: runtimeState.transcriptUnsub,
-    lifecycleUnsub: runtimeState.lifecycleUnsub,
-    chatRunState,
-    clients,
-    configReloader: runtimeState.configReloader,
-    wss,
-    httpServer,
-    httpServers,
-  });
+  const close = createCloseHandler();
 
   return {
     close: async (opts) => {