Add MCP server support for Consumption Logic Apps

apps/Standalone/src/designer/app/AzureLogicAppsDesigner/Services/ConsumptionSerializationHelpers.ts

@@ -1,4 +1,3 @@
-/* eslint-disable no-param-reassign */
 import { isOpenApiSchemaVersion } from '@microsoft/logic-apps-designer';
 import { clone } from '@microsoft/logic-apps-shared';
 

apps/Standalone/src/designer/app/AzureLogicAppsDesigner/laDesignerConsumption.tsx

@@ -309,6 +309,7 @@ const DesignerEditorConsumption = () => {
             ...getSKUDefaultHostOptions(Constants.SKU.CONSUMPTION),
           },
           showPerformanceDebug,
+          mcpClientToolEnabled: true,
         }}
       >
         {definition ? (

libs/designer-v2/src/lib/core/state/workflow/helper.ts

@@ -135,6 +135,10 @@ export const isManagedMcpOperation = (operation: { type?: string; kind?: string
   return equals(operation?.type, Constants.NODE.TYPE.MCP_CLIENT) && equals(operation?.kind, Constants.NODE.KIND.MANAGED);
 };
 
+export const isBuiltInMcpOperation = (operation: { type?: string; kind?: string }) => {
+  return equals(operation?.type, Constants.NODE.TYPE.MCP_CLIENT) && !equals(operation?.kind, Constants.NODE.KIND.MANAGED);
+};
+
 export const isA2AWorkflow = (state: WorkflowState): boolean => {
   const workflowKind = state.workflowKind;
 

libs/designer-v2/src/lib/core/templates/utils/createhelper.ts

@@ -11,6 +11,12 @@ interface WorkflowPayload {
   connectionReferences?: ConnectionReferences;
 }
 
+const isBuiltInMcpConnectionReference = (connection: any): boolean => {
+  const apiId = connection?.api?.id?.toLowerCase?.() ?? '';
+  const connectionId = connection?.connection?.id?.toLowerCase?.() ?? '';
+  return apiId.includes('connectionproviders/mcpclient') || connectionId.includes('/connectionproviders/mcpclient/');
+};
+
 export const getConsumptionWorkflowPayloadForCreate = (
   definition: LogicAppsV2.WorkflowDefinition,
   parameterDefinitions: Record<string, Template.ParameterDefinition>,
@@ -149,11 +155,14 @@ const convertDesignerWorkflowToConsumptionWorkflow = (
   } else {
     // Move connection data to parameters
     if (workflow?.connections) {
+      const filteredConnections = Object.fromEntries(
+        Object.entries(workflow.connections).filter(([, connection]) => !isBuiltInMcpConnectionReference(connection))
+      );
       workflow.parameters = {
         ...workflow.parameters,
         $connections: {
           value: {
-            ...workflow.connections,
+            ...filteredConnections,
           },
         } as WorkflowParameter,
       };
@@ -179,6 +188,9 @@ const convertDesignerWorkflowToConsumptionWorkflow = (
         workflow.parameters.$connections = { type: 'Object', value: {} };
       }
       Object.entries(workflow.connectionReferences ?? {}).forEach(([key, connection]: [key: string, value: any]) => {
+        if (isBuiltInMcpConnectionReference(connection)) {
+          return;
+        }
         workflow.parameters.$connections.value[key] = {
           id: connection.api.id,
           connectionId: connection.connection.id,

libs/designer-v2/src/lib/ui/panel/connectionsPanel/createConnection/createConnection.tsx

@@ -21,6 +21,7 @@ import {
 import {
   ConnectionParameterEditorService,
   ConnectionService,
+  ConsumptionConnectionService,
   Capabilities,
   ConnectionParameterTypes,
   SERVICE_PRINCIPLE_CONSTANTS,
@@ -405,12 +406,23 @@ export const CreateConnection = (props: CreateConnectionProps) => {
   }, [enabledCapabilities, parametersByCapability]);
 
   // Don't show name for simple connections
-  const showNameInput = useMemo(
-    () =>
+  const showNameInput = useMemo(() => {
+    const isMcpClientConnection = connectorId?.toLowerCase().includes('mcpclient');
+
+    if (isMcpClientConnection) {
+      const connectionService = ConnectionService();
+      const isConsumptionSku = connectionService instanceof ConsumptionConnectionService;
+
+      if (isConsumptionSku) {
+        return false;
+      }
+    }
+
+    return (
       !(isUsingOAuth && !isMultiAuth) &&
-      (isMultiAuth || Object.keys(capabilityEnabledParameters ?? {}).length > 0 || legacyManagedIdentitySelected),
-    [isUsingOAuth, isMultiAuth, capabilityEnabledParameters, legacyManagedIdentitySelected]
-  );
+      (isMultiAuth || Object.keys(capabilityEnabledParameters ?? {}).length > 0 || legacyManagedIdentitySelected)
+    );
+  }, [connectorId, isUsingOAuth, isMultiAuth, capabilityEnabledParameters, legacyManagedIdentitySelected]);
 
   const validParams = useMemo(() => {
     if (showNameInput && !connectionDisplayName) {

libs/designer/src/lib/core/actions/bjsworkflow/serializer.ts

@@ -903,7 +903,6 @@ const serializeHost = (
         },
       };
     case ConnectionReferenceKeyFormat.OpenApiConnection: {
-      // eslint-disable-next-line no-case-declarations
       const connectorSegments = connectorId.split('/');
       return {
         host: {
@@ -966,10 +965,8 @@ const serializeHost = (
 const mergeHostWithInputs = (hostInfo: Record<string, any>, inputs: any): any => {
   for (const [key, value] of Object.entries(hostInfo)) {
     if (inputs[key]) {
-      // eslint-disable-next-line no-param-reassign
       inputs[key] = { ...inputs[key], ...value };
     } else {
-      // eslint-disable-next-line no-param-reassign
       inputs[key] = value;
     }
   }

libs/designer/src/lib/core/state/workflow/helper.ts

@@ -135,6 +135,10 @@ export const isManagedMcpOperation = (operation: { type?: string; kind?: string
   return equals(operation?.type, Constants.NODE.TYPE.MCP_CLIENT) && equals(operation?.kind, Constants.NODE.KIND.MANAGED);
 };
 
+export const isBuiltInMcpOperation = (operation: { type?: string; kind?: string }) => {
+  return equals(operation?.type, Constants.NODE.TYPE.MCP_CLIENT) && !equals(operation?.kind, Constants.NODE.KIND.MANAGED);
+};
+
 export const isA2AWorkflow = (state: WorkflowState): boolean => {
   const workflowKind = state.workflowKind;
 

libs/designer/src/lib/core/templates/utils/createhelper.ts

@@ -11,6 +11,12 @@ interface WorkflowPayload {
   connectionReferences?: ConnectionReferences;
 }
 
+const isBuiltInMcpConnectionReference = (connection: any): boolean => {
+  const apiId = connection?.api?.id?.toLowerCase?.() ?? '';
+  const connectionId = connection?.connection?.id?.toLowerCase?.() ?? '';
+  return apiId.includes('connectionproviders/mcpclient') || connectionId.includes('/connectionproviders/mcpclient/');
+};
+
 export const getConsumptionWorkflowPayloadForCreate = (
   definition: LogicAppsV2.WorkflowDefinition,
   parameterDefinitions: Record<string, Template.ParameterDefinition>,
@@ -149,11 +155,14 @@ const convertDesignerWorkflowToConsumptionWorkflow = (
   } else {
     // Move connection data to parameters
     if (workflow?.connections) {
+      const filteredConnections = Object.fromEntries(
+        Object.entries(workflow.connections).filter(([, connection]) => !isBuiltInMcpConnectionReference(connection))
+      );
       workflow.parameters = {
         ...workflow.parameters,
         $connections: {
           value: {
-            ...workflow.connections,
+            ...filteredConnections,
           },
         } as WorkflowParameter,
       };
@@ -179,6 +188,9 @@ const convertDesignerWorkflowToConsumptionWorkflow = (
         workflow.parameters.$connections = { type: 'Object', value: {} };
       }
       Object.entries(workflow.connectionReferences ?? {}).forEach(([key, connection]: [key: string, value: any]) => {
+        if (isBuiltInMcpConnectionReference(connection)) {
+          return;
+        }
         // For dynamic connections, pull runtimeSource out to root level
         const runtimeSource = connection?.connectionProperties?.runtimeSource;
         const remainingConnectionProperties = connection?.connectionProperties

libs/designer/src/lib/ui/panel/connectionsPanel/createConnection/createConnection.tsx

@@ -21,6 +21,7 @@ import {
 import {
   ConnectionParameterEditorService,
   ConnectionService,
+  ConsumptionConnectionService,
   Capabilities,
   ConnectionParameterTypes,
   SERVICE_PRINCIPLE_CONSTANTS,
@@ -407,12 +408,23 @@ export const CreateConnection = (props: CreateConnectionProps) => {
   }, [enabledCapabilities, parametersByCapability]);
 
   // Don't show name for simple connections
-  const showNameInput = useMemo(
-    () =>
+  const showNameInput = useMemo(() => {
+    const isMcpClientConnection = connectorId?.toLowerCase().includes('mcpclient');
+
+    if (isMcpClientConnection) {
+      const connectionService = ConnectionService();
+      const isConsumptionSku = connectionService instanceof ConsumptionConnectionService;
+
+      if (isConsumptionSku) {
+        return false;
+      }
+    }
+
+    return (
       !(isUsingOAuth && !isMultiAuth) &&
-      (isMultiAuth || Object.keys(capabilityEnabledParameters ?? {}).length > 0 || legacyManagedIdentitySelected),
-    [isUsingOAuth, isMultiAuth, capabilityEnabledParameters, legacyManagedIdentitySelected]
-  );
+      (isMultiAuth || Object.keys(capabilityEnabledParameters ?? {}).length > 0 || legacyManagedIdentitySelected)
+    );
+  }, [connectorId, isUsingOAuth, isMultiAuth, capabilityEnabledParameters, legacyManagedIdentitySelected]);
 
   const validParams = useMemo(() => {
     if (showNameInput && !connectionDisplayName) {