From 4a7aba5b081d17cd0b31deb82037546490fbbda9 Mon Sep 17 00:00:00 2001
From: labkey-nicka <nickk@labkey.com>
Date: Thu, 2 Jul 2026 16:30:27 -0700
Subject: [PATCH 1/3] McpService.isAIFeaturesEnabled

---
 api/src/org/labkey/api/mcp/AbstractAgentAction.java | 9 +++++++++
 api/src/org/labkey/api/mcp/McpService.java          | 6 ++++++
 api/src/org/labkey/api/mcp/NoopMcpService.java      | 6 ++++++
 api/src/org/labkey/api/util/PageFlowUtil.java       | 2 +-
 devtools/src/org/labkey/devtools/view/chat.jsp      | 6 +-----
 query/src/org/labkey/query/view/sourceQuery.jsp     | 2 +-
 6 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/api/src/org/labkey/api/mcp/AbstractAgentAction.java b/api/src/org/labkey/api/mcp/AbstractAgentAction.java
index 0affd4c5517..a8bb158aab1 100644
--- a/api/src/org/labkey/api/mcp/AbstractAgentAction.java
+++ b/api/src/org/labkey/api/mcp/AbstractAgentAction.java
@@ -85,9 +85,18 @@ protected String handleEscape(String prompt)
     @Override
     public void validateForm(F form, Errors errors)
     {
+        if (!McpService.get().isAIFeaturesEnabled())
+        {
+            errors.reject(ERROR_GENERIC, "Agent actions are not available.");
+            return;
+        }
+
         String prompt = form.getPrompt();
         if (prompt != null && prompt.length() > MAX_PROMPT_CHAR_LENGTH)
+        {
             errors.rejectValue("prompt", ERROR_GENERIC, "Prompt cannot exceed " + MAX_PROMPT_CHAR_LENGTH + " characters.");
+            return;
+        }
 
         // Only honor a client-supplied conversationId if this agent previously issued this session that
         // id. Otherwise, generate a fresh one. This prevents a same-session caller from splicing into
diff --git a/api/src/org/labkey/api/mcp/McpService.java b/api/src/org/labkey/api/mcp/McpService.java
index 4717e859b78..2cf82aeedec 100644
--- a/api/src/org/labkey/api/mcp/McpService.java
+++ b/api/src/org/labkey/api/mcp/McpService.java
@@ -99,6 +99,7 @@ public interface McpService extends ToolCallbackProvider
 
     Logger LOG = LogHelper.getLogger(McpService.class, "MCP registration exceptions");
     String ENABLE_MCP_SERVER_FLAG = "enableMcpServer";
+    String ENABLE_AI_FEATURES = "enableAIFeatures";
 
     // Interface for MCP classes that we will "ingest" using Spring annotations. Provides a few helper methods.
     interface McpImpl
@@ -145,6 +146,11 @@ default boolean isEnabled()
         return OptionalFeatureService.get().isFeatureEnabled(ENABLE_MCP_SERVER_FLAG);
     }
 
+    default boolean isAIFeaturesEnabled()
+    {
+        return OptionalFeatureService.get().isFeatureEnabled(ENABLE_AI_FEATURES);
+    }
+
     boolean isReady();
 
     // Register MCPs in Module.startup()
diff --git a/api/src/org/labkey/api/mcp/NoopMcpService.java b/api/src/org/labkey/api/mcp/NoopMcpService.java
index 2a0ff1c2f9a..1923c770ccd 100644
--- a/api/src/org/labkey/api/mcp/NoopMcpService.java
+++ b/api/src/org/labkey/api/mcp/NoopMcpService.java
@@ -42,6 +42,12 @@ public boolean isEnabled()
         return false;
     }
 
+    @Override
+    public boolean isAIFeaturesEnabled()
+    {
+        return false;
+    }
+
     @Override
     public boolean isReady()
     {
diff --git a/api/src/org/labkey/api/util/PageFlowUtil.java b/api/src/org/labkey/api/util/PageFlowUtil.java
index 520a6c2d171..bfd62f4fb58 100644
--- a/api/src/org/labkey/api/util/PageFlowUtil.java
+++ b/api/src/org/labkey/api/util/PageFlowUtil.java
@@ -2265,7 +2265,7 @@ public static JSONObject jsInitObject(ContainerUser context, @Nullable PageConfi
         if (AppProps.getInstance().isOptionalFeatureEnabled(NotificationMenuView.EXPERIMENTAL_NOTIFICATION_MENU) && user != null)
             json.put("notifications", Map.of("unreadCount", NotificationService.get().getUnreadNotificationCountByUser(null, user.getUserId())));
 
-        if (McpService.get().isEnabled())
+        if (McpService.get().isAIFeaturesEnabled())
             json.put("mcpReady", McpService.get().isReady());
 
         JSONObject defaultHeaders = new JSONObject();
diff --git a/devtools/src/org/labkey/devtools/view/chat.jsp b/devtools/src/org/labkey/devtools/view/chat.jsp
index 2799776390d..19b8defd8e5 100644
--- a/devtools/src/org/labkey/devtools/view/chat.jsp
+++ b/devtools/src/org/labkey/devtools/view/chat.jsp
@@ -15,10 +15,6 @@
  * limitations under the License.
  */
 %>
-<%@ page import="org.labkey.api.util.DOM" %>
-<%@ page import="java.util.stream.Stream" %>
-<%@ page import="static org.labkey.api.util.DOM.*" %>
-<%@ page import="static org.labkey.api.util.DOM.Attribute.*" %>
 <%@ page extends="org.labkey.api.jsp.JspBase" %>
 <%@ taglib prefix="labkey" uri="http://www.labkey.org/taglib" %>
 <style type="text/css">
@@ -30,7 +26,7 @@
       border-radius: 15px;
       border : solid 1px darkgray;
       display: flex;
-      align-items: center; */
+      align-items: center;
       box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
     }
 
diff --git a/query/src/org/labkey/query/view/sourceQuery.jsp b/query/src/org/labkey/query/view/sourceQuery.jsp
index 2fbd112797b..a1f68399ab9 100644
--- a/query/src/org/labkey/query/view/sourceQuery.jsp
+++ b/query/src/org/labkey/query/view/sourceQuery.jsp
@@ -52,7 +52,7 @@
     boolean canEdit = queryDef.canEdit(getUser());
     boolean canEditMetadata = queryDef.canEditMetadata(getUser());
     boolean canDelete = queryDef.canDelete(getUser());
-    boolean isChatReady = canEdit && McpService.get().isReady();
+    boolean isChatReady = canEdit && McpService.get().isAIFeaturesEnabled() && McpService.get().isReady();
 %>
 <style type="text/css">
 

From f06ed435840d51b08fb84011fa526926c79f96fe Mon Sep 17 00:00:00 2001
From: labkey-nicka <nickk@labkey.com>
Date: Thu, 2 Jul 2026 19:57:21 -0700
Subject: [PATCH 2/3] Remove enabled check preventing tool use

---
 api/src/org/labkey/api/mcp/McpService.java | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/api/src/org/labkey/api/mcp/McpService.java b/api/src/org/labkey/api/mcp/McpService.java
index 2cf82aeedec..2e89f90d285 100644
--- a/api/src/org/labkey/api/mcp/McpService.java
+++ b/api/src/org/labkey/api/mcp/McpService.java
@@ -121,9 +121,6 @@ default User getUser(ToolContext toolContext)
         // Every MCP resource should call this on every invocation
         default void incrementResourceRequestCount(String resource)
         {
-            if (!get().isEnabled())
-                throw new RuntimeException("The MCP server is not enabled for external requests. Consider toggling the optional feature flag.");
-
             get().incrementResourceRequestCount(resource);
         }
     }

From a1416e1a599a9be43342855c1914881cbefafec1 Mon Sep 17 00:00:00 2001
From: labkey-nicka <nickk@labkey.com>
Date: Thu, 2 Jul 2026 20:32:29 -0700
Subject: [PATCH 3/3] Review feedback

---
 api/src/org/labkey/api/mcp/McpService.java                  | 6 ++++++
 api/src/org/labkey/api/util/PageFlowUtil.java               | 3 +--
 core/src/org/labkey/core/admin/sql/SqlScriptController.java | 4 ++--
 devtools/src/org/labkey/devtools/TestController.java        | 2 +-
 query/src/org/labkey/query/view/sourceQuery.jsp             | 2 +-
 5 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/api/src/org/labkey/api/mcp/McpService.java b/api/src/org/labkey/api/mcp/McpService.java
index 2e89f90d285..06afb51e63a 100644
--- a/api/src/org/labkey/api/mcp/McpService.java
+++ b/api/src/org/labkey/api/mcp/McpService.java
@@ -150,6 +150,12 @@ default boolean isAIFeaturesEnabled()
 
     boolean isReady();
 
+    // Convenience for in-product AI features: the AI feature flag is on AND the service has started.
+    default boolean isAIFeaturesReady()
+    {
+        return isAIFeaturesEnabled() && isReady();
+    }
+
     // Register MCPs in Module.startup()
     default void register(McpImpl mcp)
     {
diff --git a/api/src/org/labkey/api/util/PageFlowUtil.java b/api/src/org/labkey/api/util/PageFlowUtil.java
index bfd62f4fb58..b4a80bf1bed 100644
--- a/api/src/org/labkey/api/util/PageFlowUtil.java
+++ b/api/src/org/labkey/api/util/PageFlowUtil.java
@@ -2265,8 +2265,7 @@ public static JSONObject jsInitObject(ContainerUser context, @Nullable PageConfi
         if (AppProps.getInstance().isOptionalFeatureEnabled(NotificationMenuView.EXPERIMENTAL_NOTIFICATION_MENU) && user != null)
             json.put("notifications", Map.of("unreadCount", NotificationService.get().getUnreadNotificationCountByUser(null, user.getUserId())));
 
-        if (McpService.get().isAIFeaturesEnabled())
-            json.put("mcpReady", McpService.get().isReady());
+        json.put("mcpReady", McpService.get().isAIFeaturesReady());
 
         JSONObject defaultHeaders = new JSONObject();
         defaultHeaders.put("X-ONUNAUTHORIZED", "UNAUTHORIZED");
diff --git a/core/src/org/labkey/core/admin/sql/SqlScriptController.java b/core/src/org/labkey/core/admin/sql/SqlScriptController.java
index 575d44a361a..42305e175b7 100644
--- a/core/src/org/labkey/core/admin/sql/SqlScriptController.java
+++ b/core/src/org/labkey/core/admin/sql/SqlScriptController.java
@@ -1122,7 +1122,7 @@ protected void renderScript(SqlScript script, PrintWriter out)
         protected void renderButtons(SqlScript script, PrintWriter out)
         {
             out.println(PageFlowUtil.button("Reorder Script").href(getScriptURL(ReorderScriptAction.class, script)));
-            if (McpService.get().isReady())
+            if (McpService.get().isAIFeaturesReady())
             {
                 out.println(
                     PageFlowUtil.button("Clean Up Script")
@@ -1259,7 +1259,7 @@ protected abstract class BaseAIScriptAction extends ScriptAction
         protected ModelAndView getScriptView(SqlScript script)
         {
             McpService mcpService = McpService.get();
-            if (mcpService.isReady())
+            if (mcpService.isAIFeaturesReady())
             {
                 String prompt = getPrompt(DbScope.getLabKeyScope().getSqlDialect(), script);
                 HttpSession session = getViewContext().getSession();
diff --git a/devtools/src/org/labkey/devtools/TestController.java b/devtools/src/org/labkey/devtools/TestController.java
index c7171d20189..d4b39982f9b 100644
--- a/devtools/src/org/labkey/devtools/TestController.java
+++ b/devtools/src/org/labkey/devtools/TestController.java
@@ -1285,7 +1285,7 @@ public static class ChatAction extends SimpleViewAction<Object>
         @Override
         public ModelAndView getView(Object o, BindException errors)
         {
-            if (null == McpService.get() || !McpService.get().isReady())
+            if (null == McpService.get() || !McpService.get().isAIFeaturesReady())
                 return HtmlView.of("Service is not ready yet.");
             getPageConfig().setTemplate(PageConfig.Template.Dialog);
             return new JspView<>("/org/labkey/devtools/view/chat.jsp");
diff --git a/query/src/org/labkey/query/view/sourceQuery.jsp b/query/src/org/labkey/query/view/sourceQuery.jsp
index a1f68399ab9..b967c0572d8 100644
--- a/query/src/org/labkey/query/view/sourceQuery.jsp
+++ b/query/src/org/labkey/query/view/sourceQuery.jsp
@@ -52,7 +52,7 @@
     boolean canEdit = queryDef.canEdit(getUser());
     boolean canEditMetadata = queryDef.canEditMetadata(getUser());
     boolean canDelete = queryDef.canDelete(getUser());
-    boolean isChatReady = canEdit && McpService.get().isAIFeaturesEnabled() && McpService.get().isReady();
+    boolean isChatReady = canEdit && McpService.get().isAIFeaturesReady();
 %>
 <style type="text/css">