From 98db8cce7bbee50f120b87932f659ed9d7197ad3 Mon Sep 17 00:00:00 2001
From: Marc J Saint-jour <82672745+Junebugg1214@users.noreply.github.com>
Date: Thu, 12 Mar 2026 20:09:16 -0400
Subject: [PATCH] fix: throttle Cortex conflict probes without conflicts

---
 src/agents/cortex.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/agents/cortex.ts b/src/agents/cortex.ts
index 6590ebe795b..7427954cb14 100644
--- a/src/agents/cortex.ts
+++ b/src/agents/cortex.ts
@@ -412,6 +412,7 @@ export async function resolveAgentCortexConflictNotice(params: {
       .filter((entry) => entry.id && entry.summary)
       .toSorted((left, right) => right.severity - left.severity)[0];
     if (!topConflict) {
+      cortexConflictNoticeCooldowns.set(targetKey, now + cooldownMs);
       return null;
     }
     cortexConflictNoticeCooldowns.set(targetKey, now + cooldownMs);
@@ -424,6 +425,7 @@ export async function resolveAgentCortexConflictNotice(params: {
       ].join("\n"),
     };
   } catch {
+    cortexConflictNoticeCooldowns.set(targetKey, now + cooldownMs);
     return null;
   }
 }