From 587da339271e97bd12d833cecbd676d7655d91b8 Mon Sep 17 00:00:00 2001
From: labkey-nicka <nickk@labkey.com>
Date: Fri, 5 Jun 2026 14:58:25 -0700
Subject: [PATCH] AbstractAgentAction: statically resolve issued
 conversationIds

---
 .../labkey/api/mcp/AbstractAgentAction.java   | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/api/src/org/labkey/api/mcp/AbstractAgentAction.java b/api/src/org/labkey/api/mcp/AbstractAgentAction.java
index d585b5d936d..fbb438bb285 100644
--- a/api/src/org/labkey/api/mcp/AbstractAgentAction.java
+++ b/api/src/org/labkey/api/mcp/AbstractAgentAction.java
@@ -189,15 +189,20 @@ private String getIssuedConversationIdsKey()
 
     private Set<GUID> getIssuedConversationIds(HttpSession session)
     {
-        return SessionHelper.getAttribute(session, getIssuedConversationIdsKey(), () ->
-                Collections.synchronizedSet(Collections.newSetFromMap(
-                        new LinkedHashMap<>(16, 0.75f, false)
-                        {
-                            @Override
-                            protected boolean removeEldestEntry(Map.Entry<GUID, Boolean> eldest)
-                            {
-                                return size() > MAX_ISSUED_CONVERSATION_IDS;
-                            }
-                        })));
+        return SessionHelper.getAttribute(session, getIssuedConversationIdsKey(), AbstractAgentAction::newIssuedConversationIdSet);
+    }
+
+    private static Set<GUID> newIssuedConversationIdSet()
+    {
+        return Collections.synchronizedSet(Collections.newSetFromMap(
+            new LinkedHashMap<>(16, 0.75f, false)
+            {
+                @Override
+                protected boolean removeEldestEntry(Map.Entry<GUID, Boolean> eldest)
+                {
+                    return size() > MAX_ISSUED_CONVERSATION_IDS;
+                }
+            }
+        ));
     }
 }