ISI-522: clear hook cleanup interval on service.stop()

PerformanceChef · Paperclip-Paperclip · PerformanceChef · commit b668a4f980ef · 2026-04-16T15:04:40.000+02:00
registerHooks now returns a disposer that clears the 60s setInterval
stale-session sweeper. index.ts captures it and invokes it from
service.stop() so the timer is released on plugin shutdown/reload
instead of leaking across lifecycles.

Co-Authored-By: Paperclip &lt;noreply@paperclip.ing&gt;
diff --git a/index.ts b/index.ts
@@ -59,7 +59,9 @@ const otelObservabilityPlugin = {
     // registering them later inside service.start() means our listeners
     // are never seen by the gateway. We register here and pass a lazy
     // telemetry getter; hooks no-op until start() has built the runtime.
-    registerHooks(api, () => telemetry, config);
+    // registerHooks returns a cleanup fn (clears the stale-session sweeper
+    // interval) so service.stop() doesn't leak the timer across reloads.
+    let stopHooks: (() => void) | null = registerHooks(api, () => telemetry, config);
 
     // ── RPC: status endpoint ────────────────────────────────────────
 
@@ -142,6 +144,10 @@ const otelObservabilityPlugin = {
       },
 
       stop: async () => {
+        if (stopHooks) {
+          stopHooks();
+          stopHooks = null;
+        }
         if (unsubscribeDiagnostics) {
           unsubscribeDiagnostics();
           unsubscribeDiagnostics = null;
diff --git a/src/hooks.ts b/src/hooks.ts
@@ -53,7 +53,7 @@ export function registerHooks(
   api: any,
   getTelemetry: () => TelemetryRuntime | null,
   config: OtelObservabilityConfig
-): void {
+): () => void {
   const logger = api.logger;
 
   const buildSecurityCounters = (counters: TelemetryRuntime["counters"]): SecurityCounters => ({
@@ -540,8 +540,10 @@ export function registerHooks(
   logger.info("[otel] Registered gateway:startup hook (via api.registerHook)");
 
   // ── Periodic cleanup ─────────────────────────────────────────────
-  // Safety net: clean up stale session contexts (e.g., if agent_end never fires)
-  setInterval(() => {
+  // Safety net: clean up stale session contexts (e.g., if agent_end never fires).
+  // The handle is returned to the caller so service.stop() can clear it and
+  // avoid leaking timers across plugin reload / shutdown.
+  const cleanupInterval = setInterval(() => {
     const now = Date.now();
     const maxAge = 5 * 60 * 1000; // 5 minutes
     for (const [key, ctx] of sessionContextMap) {
@@ -555,4 +557,8 @@ export function registerHooks(
       }
     }
   }, 60_000);
+
+  return () => {
+    clearInterval(cleanupInterval);
+  };
 }
