[MCP] Server Features in MCP configuration: API Tools, Dynamic Tool Mode, Data Query Tools (Preview)

src/System Application/App/MCP/Permissions/MCPObjects.PermissionSet.al

@@ -17,5 +17,7 @@ permissionset 8350 "MCP - Objects"
                   table "MCP Configuration Tool" = X,
                   table "MCP Config Warning" = X,
                   table "MCP Entra Application" = X,
-                  table "MCP System Tool" = X;
+                  table "MCP System Tool" = X,
+                  table "MCP Server Feature" = X,
+                  table "MCP API Object Buffer" = X;
 }

src/System Application/App/MCP/app.json

@@ -72,11 +72,15 @@
   "idRanges": [
     {
       "from": 8350,
-      "to": 8360
+      "to": 8362
     },
     {
       "from": 8365,
       "to": 8370
+    },
+    {
+      "from": 8376,
+      "to": 8380
     }
   ],
   "target": "OnPrem",

src/System Application/App/MCP/src/Configuration/Codeunits/MCPApiToolsFeature.Codeunit.al

@@ -0,0 +1,53 @@
+// ------------------------------------------------------------------------------------------------
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+// ------------------------------------------------------------------------------------------------
+
+namespace System.MCP;
+
+codeunit 8369 "MCP API Tools Feature" implements "MCP Server Features"
+{
+    Access = Internal;
+
+    procedure SetActive(ConfigId: Guid; Active: Boolean)
+    var
+        MCPConfigImplementation: Codeunit "MCP Config Implementation";
+    begin
+        MCPConfigImplementation.EnableAPITools(ConfigId, Active);
+    end;
+
+    procedure IsActive(ConfigId: Guid): Boolean
+    var
+        MCPConfigImplementation: Codeunit "MCP Config Implementation";
+    begin
+        exit(MCPConfigImplementation.IsAPIToolsEnabled(ConfigId));
+    end;
+
+    procedure HasSettings(): Boolean
+    begin
+        exit(false);
+    end;
+
+    procedure OpenSettings(ConfigId: Guid)
+    begin
+        // No configurable settings.
+    end;
+
+    procedure Description(): Text[500]
+    begin
+        exit(DescriptionLbl);
+    end;
+
+    procedure LoadSystemTools(var MCPSystemTool: Record "MCP System Tool")
+    begin
+        // API Tools exposes no system tools.
+    end;
+
+    procedure TryGetParentFeature(var ParentFeature: Enum "MCP Server Feature"): Boolean
+    begin
+        exit(false);
+    end;
+
+    var
+        DescriptionLbl: Label 'Exposes the API Tools list on this configuration so the admin can curate which API pages and queries the MCP client can reach. Dynamic Tool Mode requires this feature to be enabled.';
+}

src/System Application/App/MCP/src/Configuration/Codeunits/MCPConfig.Codeunit.al

@@ -117,6 +117,26 @@ codeunit 8350 "MCP Config"
         MCPConfigImplementation.EnableDiscoverReadOnlyObjects(ConfigId, Enable);
     end;
 
+    /// <summary>
+    /// Enables or disables the Data Query Tools feature for the specified configuration.
+    /// </summary>
+    /// <param name="ConfigId">The SystemId (GUID) of the configuration.</param>
+    /// <param name="Enable">True to enable, false to disable.</param>
+    procedure EnableDataQueryTools(ConfigId: Guid; Enable: Boolean)
+    begin
+        MCPConfigImplementation.EnableDataQueryTools(ConfigId, Enable);
+    end;
+
+    /// <summary>
+    /// Enables or disables the API Tools feature for the specified configuration.
+    /// </summary>
+    /// <param name="ConfigId">The SystemId (GUID) of the configuration.</param>
+    /// <param name="Enable">True to enable, false to disable.</param>
+    procedure EnableAPITools(ConfigId: Guid; Enable: Boolean)
+    begin
+        MCPConfigImplementation.EnableAPITools(ConfigId, Enable);
+    end;
+
     /// <summary>
     /// Finds warnings for the specified MCP configuration, such as missing objects or missing parent objects.
     /// </summary>

src/System Application/App/MCP/src/Configuration/Codeunits/MCPConfigImplementation.Codeunit.al

@@ -35,6 +35,7 @@ codeunit 8351 "MCP Config Implementation"
         DesignatedDefaultCannotBeDeactivatedErr: Label 'The designated default configuration cannot be deactivated. Clear the default designation first.';
         ConfigurationMustBeActiveErr: Label 'Only active configurations can be set as the default.';
         DynamicToolModeRequiredErr: Label 'Dynamic tool mode needs to be enabled to discover read-only objects.';
+        APIToolsRequiredForDynamicErr: Label 'API Tools must be enabled before Dynamic Tool Mode can be enabled.';
         VersionNotValidErr: Label 'The API version is not valid for the selected tool.';
         MCPConfigurationCreatedLbl: Label 'MCP Configuration created', Locked = true;
         MCPConfigurationModifiedLbl: Label 'MCP Configuration modified', Locked = true;
@@ -224,6 +225,9 @@ codeunit 8351 "MCP Config Implementation"
         if not Enable and IsDefaultConfiguration(MCPConfiguration) then
             Error(DynamicToolModeCannotBeDisabledErr);
 
+        if Enable and not IsAPIToolsEnabled(ConfigId) then
+            Error(APIToolsRequiredForDynamicErr);
+
         MCPConfiguration.EnableDynamicToolMode := Enable;
         if not Enable then
             MCPConfiguration.DiscoverReadOnlyObjects := false;
@@ -252,6 +256,56 @@ codeunit 8351 "MCP Config Implementation"
         LogConfigurationModified(MCPConfiguration, xMCPConfiguration);
     end;
 
+    internal procedure EnableAPITools(ConfigId: Guid; Enable: Boolean)
+    var
+        MCPConfiguration: Record "MCP Configuration";
+        xMCPConfiguration: Record "MCP Configuration";
+    begin
+        if not MCPConfiguration.GetBySystemId(ConfigId) then
+            Error(ConfigurationNotFoundErr);
+        xMCPConfiguration := MCPConfiguration;
+        MCPConfiguration.EnableApiTools := Enable;
+        if not Enable then begin
+            // Dynamic Tool Mode requires API Tools, so disabling API Tools cascades it off
+            // (mirroring how disabling Dynamic Tool Mode clears Discover Read-Only Objects).
+            MCPConfiguration.EnableDynamicToolMode := false;
+            MCPConfiguration.DiscoverReadOnlyObjects := false;
+        end;
+        MCPConfiguration.Modify();
+        LogConfigurationModified(MCPConfiguration, xMCPConfiguration);
+    end;
+
+    internal procedure EnableDataQueryTools(ConfigId: Guid; Enable: Boolean)
+    var
+        MCPConfiguration: Record "MCP Configuration";
+        xMCPConfiguration: Record "MCP Configuration";
+    begin
+        if not MCPConfiguration.GetBySystemId(ConfigId) then
+            Error(ConfigurationNotFoundErr);
+        xMCPConfiguration := MCPConfiguration;
+        MCPConfiguration.EnableAlQueryTools := Enable;
+        MCPConfiguration.Modify();
+        LogConfigurationModified(MCPConfiguration, xMCPConfiguration);
+    end;
+
+    internal procedure IsAPIToolsEnabled(ConfigId: Guid): Boolean
+    var
+        MCPConfiguration: Record "MCP Configuration";
+    begin
+        if not MCPConfiguration.GetBySystemId(ConfigId) then
+            MCPConfiguration.Init(); // not persisted yet (new config): reflect the table default (InitValue)
+        exit(MCPConfiguration.EnableApiTools);
+    end;
+
+    internal procedure IsDataQueryToolsEnabled(ConfigId: Guid): Boolean
+    var
+        MCPConfiguration: Record "MCP Configuration";
+    begin
+        if not MCPConfiguration.GetBySystemId(ConfigId) then
+            MCPConfiguration.Init(); // not persisted yet (new config): reflect the table default (InitValue)
+        exit(MCPConfiguration.EnableAlQueryTools);
+    end;
+
     local procedure CheckAllowCreateUpdateDeleteTools(ConfigId: Guid)
     var
         MCPConfiguration: Record "MCP Configuration";
@@ -568,38 +622,65 @@ codeunit 8351 "MCP Config Implementation"
         MCPConfigurationTool.Modify();
     end;
 
-    internal procedure LookupAPIPageTools(var PageMetadata: Record "Page Metadata"): Boolean
+    internal procedure LookupAPIObjects(var SelectedObjects: Record "MCP API Object Buffer"): Boolean
     var
-        MCPAPIConfigToolLookup: Page "MCP API Config Tool Lookup";
+        TempMCPAPIObjectBuffer: Record "MCP API Object Buffer";
+        MCPAPIObjectLookup: Page "MCP API Object Lookup";
     begin
-        PageMetadata.SetRange(PageType, PageMetadata.PageType::API);
-        PageMetadata.SetFilter("AL Namespace", '<>%1', 'Microsoft.API.V1');
-        PageMetadata.SetFilter(APIVersion, '<>%1', 'beta');
+        PopulateAPIObjects(TempMCPAPIObjectBuffer);
+        if TempMCPAPIObjectBuffer.IsEmpty() then
+            exit(false);
 
-        MCPAPIConfigToolLookup.LookupMode := true;
-        MCPAPIConfigToolLookup.SetTableView(PageMetadata);
-        if MCPAPIConfigToolLookup.RunModal() <> Action::LookupOK then
+        MCPAPIObjectLookup.SetObjects(TempMCPAPIObjectBuffer);
+        MCPAPIObjectLookup.LookupMode := true;
+        if MCPAPIObjectLookup.RunModal() <> Action::LookupOK then
             exit(false);
 
-        MCPAPIConfigToolLookup.SetSelectionFilter(PageMetadata);
-        exit(true);
+        MCPAPIObjectLookup.GetSelectedObjects(SelectedObjects);
+        exit(not SelectedObjects.IsEmpty());
     end;
 
-    internal procedure LookupAPIQueryTools(var QueryMetadata: Record "Query Metadata"): Boolean
+    local procedure PopulateAPIObjects(var MCPAPIObjectBuffer: Record "MCP API Object Buffer")
     var
-        MCPQueryConfigToolLookup: Page "MCP Query Config Tool Lookup";
+        PageMetadata: Record "Page Metadata";
+        QueryMetadata: Record "Query Metadata";
     begin
+        MCPAPIObjectBuffer.Reset();
+        MCPAPIObjectBuffer.DeleteAll();
+
+        // API pages
+        PageMetadata.SetRange(PageType, PageMetadata.PageType::API);
+        PageMetadata.SetFilter("AL Namespace", '<>%1', 'Microsoft.API.V1');
+        PageMetadata.SetFilter(APIVersion, '<>%1', 'beta');
+        if PageMetadata.FindSet() then
+            repeat
+                MCPAPIObjectBuffer.Init();
+                MCPAPIObjectBuffer."Object Type" := MCPAPIObjectBuffer."Object Type"::Page;
+                MCPAPIObjectBuffer."Object ID" := PageMetadata.ID;
+                MCPAPIObjectBuffer.Name := CopyStr(PageMetadata.Name, 1, MaxStrLen(MCPAPIObjectBuffer.Name));
+                MCPAPIObjectBuffer."Entity Name" := CopyStr(PageMetadata.EntityName, 1, MaxStrLen(MCPAPIObjectBuffer."Entity Name"));
+                MCPAPIObjectBuffer."API Publisher" := CopyStr(PageMetadata.APIPublisher, 1, MaxStrLen(MCPAPIObjectBuffer."API Publisher"));
+                MCPAPIObjectBuffer."API Group" := CopyStr(PageMetadata.APIGroup, 1, MaxStrLen(MCPAPIObjectBuffer."API Group"));
+                MCPAPIObjectBuffer."API Version" := CopyStr(PageMetadata.APIVersion, 1, MaxStrLen(MCPAPIObjectBuffer."API Version"));
+                if MCPAPIObjectBuffer.Insert() then;
+            until PageMetadata.Next() = 0;
+
+        // API queries
         QueryMetadata.SetFilter(EntityName, '<>%1', '');
         QueryMetadata.SetFilter("AL Namespace", '<>%1', 'Microsoft.API.V1');
         QueryMetadata.SetFilter(ID, '<>%1&<>%2', 5480, 5481); // Exclude beta customer and vendor queries from Base Application, as they are already part of API v2.0
-
-        MCPQueryConfigToolLookup.LookupMode := true;
-        MCPQueryConfigToolLookup.SetTableView(QueryMetadata);
-        if MCPQueryConfigToolLookup.RunModal() <> Action::LookupOK then
-            exit(false);
-
-        MCPQueryConfigToolLookup.SetSelectionFilter(QueryMetadata);
-        exit(true);
+        if QueryMetadata.FindSet() then
+            repeat
+                MCPAPIObjectBuffer.Init();
+                MCPAPIObjectBuffer."Object Type" := MCPAPIObjectBuffer."Object Type"::Query;
+                MCPAPIObjectBuffer."Object ID" := QueryMetadata.ID;
+                MCPAPIObjectBuffer.Name := CopyStr(QueryMetadata.Name, 1, MaxStrLen(MCPAPIObjectBuffer.Name));
+                MCPAPIObjectBuffer."Entity Name" := CopyStr(QueryMetadata.EntityName, 1, MaxStrLen(MCPAPIObjectBuffer."Entity Name"));
+                MCPAPIObjectBuffer."API Publisher" := CopyStr(QueryMetadata.APIPublisher, 1, MaxStrLen(MCPAPIObjectBuffer."API Publisher"));
+                MCPAPIObjectBuffer."API Group" := CopyStr(QueryMetadata.APIGroup, 1, MaxStrLen(MCPAPIObjectBuffer."API Group"));
+                MCPAPIObjectBuffer."API Version" := CopyStr(QueryMetadata.APIVersion, 1, MaxStrLen(MCPAPIObjectBuffer."API Version"));
+                if MCPAPIObjectBuffer.Insert() then;
+            until QueryMetadata.Next() = 0;
     end;
 
     internal procedure GetAPIPublishers(var MCPAPIPublisherGroup: Record "MCP API Publisher Group")
@@ -850,27 +931,6 @@ codeunit 8351 "MCP Config Implementation"
         exit('');
     end;
 
-    internal procedure LoadSystemTools(var MCPSystemTool: Record "MCP System Tool")
-    var
-        MCPUtilities: Codeunit "MCP Utilities";
-        SystemTools: Dictionary of [Text, Text];
-        ToolName: Text;
-    begin
-        MCPSystemTool.Reset();
-        MCPSystemTool.DeleteAll();
-
-        SystemTools := MCPUtilities.GetSystemToolsInDynamicMode();
-        foreach ToolName in SystemTools.Keys() do
-            InsertSystemTool(MCPSystemTool, CopyStr(ToolName, 1, MaxStrLen(MCPSystemTool."Tool Name")), CopyStr(SystemTools.Get(ToolName), 1, MaxStrLen(MCPSystemTool."Tool Description")));
-    end;
-
-    local procedure InsertSystemTool(var MCPSystemTool: Record "MCP System Tool"; ToolName: Text[100]; ToolDescription: Text[250])
-    begin
-        MCPSystemTool."Tool Name" := ToolName;
-        MCPSystemTool."Tool Description" := ToolDescription;
-        MCPSystemTool.Insert();
-    end;
-
     internal procedure ValidateAPIPageVersion(ObjectId: Integer; APIVersion: Text)
     var
         PageMetadata: Record "Page Metadata";
@@ -1213,6 +1273,8 @@ codeunit 8351 "MCP Config Implementation"
         ConfigJson.Add('enableDynamicToolMode', MCPConfiguration.EnableDynamicToolMode);
         ConfigJson.Add('discoverReadOnlyObjects', MCPConfiguration.DiscoverReadOnlyObjects);
         ConfigJson.Add('allowProdChanges', MCPConfiguration.AllowProdChanges);
+        ConfigJson.Add('enableApiTools', MCPConfiguration.EnableApiTools);
+        ConfigJson.Add('enableAlQueryTools', MCPConfiguration.EnableAlQueryTools);
 
         MCPConfigurationTool.SetRange(ID, ConfigId);
         if MCPConfigurationTool.FindSet() then
@@ -1280,6 +1342,12 @@ codeunit 8351 "MCP Config Implementation"
         if ConfigJson.Contains('allowProdChanges') then
             MCPConfiguration.AllowProdChanges := ConfigJson.GetBoolean('allowProdChanges');
 
+        if ConfigJson.Contains('enableApiTools') then
+            MCPConfiguration.EnableApiTools := ConfigJson.GetBoolean('enableApiTools');
+
+        if ConfigJson.Contains('enableAlQueryTools') then
+            MCPConfiguration.EnableAlQueryTools := ConfigJson.GetBoolean('enableAlQueryTools');
+
         MCPConfiguration.Insert();
         LogConfigurationCreated(MCPConfiguration);
 
@@ -1411,6 +1479,14 @@ codeunit 8351 "MCP Config Implementation"
             Dimensions.Add('OldDiscoverReadOnlyObjects', Format(xMCPConfiguration.DiscoverReadOnlyObjects));
             Dimensions.Add('NewDiscoverReadOnlyObjects', Format(MCPConfiguration.DiscoverReadOnlyObjects));
         end;
+        if MCPConfiguration.EnableApiTools <> xMCPConfiguration.EnableApiTools then begin
+            Dimensions.Add('OldApiTools', Format(xMCPConfiguration.EnableApiTools));
+            Dimensions.Add('NewApiTools', Format(MCPConfiguration.EnableApiTools));
+        end;
+        if MCPConfiguration.EnableAlQueryTools <> xMCPConfiguration.EnableAlQueryTools then begin
+            Dimensions.Add('OldDataQueryTools', Format(xMCPConfiguration.EnableAlQueryTools));
+            Dimensions.Add('NewDataQueryTools', Format(MCPConfiguration.EnableAlQueryTools));
+        end;
         Session.LogMessage('0000QE9', MCPConfigurationModifiedLbl, Verbosity::Normal, DataClassification::SystemMetadata, TelemetryScope::All, Dimensions);
         Session.LogAuditMessage(StrSubstNo(MCPConfigurationAuditModifiedLbl, MCPConfiguration.Name, UserSecurityId(), CompanyName()), SecurityOperationResult::Success, AuditCategory::ApplicationManagement, 3, 0);
     end;