From ea4f5106ea10ed01adbcf16c87b2a24c52ad58b1 Mon Sep 17 00:00:00 2001
From: Vignesh Natarajan <vigneshnatarajan92@gmail.com>
Date: Sat, 28 Feb 2026 13:03:45 -0800
Subject: [PATCH] chore(gateway): guard cron agent heartbeat type

---
 src/gateway/server-cron.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/gateway/server-cron.ts b/src/gateway/server-cron.ts
index 7430870f111..dbfb8350b87 100644
--- a/src/gateway/server-cron.ts
+++ b/src/gateway/server-cron.ts
@@ -192,9 +192,11 @@ export function buildGatewayCronService(params: {
           (entry) =>
             entry && typeof entry.id === "string" && normalizeAgentId(entry.id) === agentId,
         );
+      const agentHeartbeat =
+        agentEntry && typeof agentEntry === "object" ? agentEntry.heartbeat : undefined;
       const baseHeartbeat = {
         ...runtimeConfig.agents?.defaults?.heartbeat,
-        ...agentEntry?.heartbeat,
+        ...agentHeartbeat,
       };
       const heartbeatOverride = opts?.heartbeat
         ? { ...baseHeartbeat, ...opts.heartbeat }