Support dynamic list for mcp tool

anthony0t · anthony0t · commit 8fe526f1fad4 · 2026-01-08T10:46:32.000-08:00
diff --git a/apps/Standalone/src/designer/app/AzureLogicAppsDesigner/laDesigner.tsx b/apps/Standalone/src/designer/app/AzureLogicAppsDesigner/laDesigner.tsx
@@ -141,20 +141,40 @@ const DesignerEditor = () => {
     addOrUpdateAppSettings(connectionAndSetting.settings, settingsData?.properties ?? {});
   };
 
-  const getConnectionConfiguration = async (connectionId: string): Promise<any> => {
+  const getConnectionConfiguration = async (connectionId: string, _manifest: any, useMcpConnections?: boolean): Promise<any> => {
     if (!connectionId) {
       return Promise.resolve();
     }
 
     const connectionName = connectionId.split('/').splice(-1)[0];
-    const connectionInfo =
-      connectionsData?.serviceProviderConnections?.[connectionName] ?? connectionsData?.apiManagementConnections?.[connectionName];
+    let connectionInfo: any;
+    let isAgentMcpConnection = false;
+
+    if (useMcpConnections) {
+      connectionInfo = connectionsData?.agentMcpConnections?.[connectionName];
+
+      if (connectionInfo) {
+        isAgentMcpConnection = true;
+      }
+
+      connectionInfo = connectionInfo ?? connectionsData?.managedApiConnections?.[connectionName];
+    } else {
+      connectionInfo =
+        connectionsData?.serviceProviderConnections?.[connectionName] ?? connectionsData?.apiManagementConnections?.[connectionName];
+    }
 
     if (connectionInfo) {
       // TODO(psamband): Add new settings in this blade so that we do not resolve all the appsettings in the connectionInfo.
       const resolvedConnectionInfo = resolveConnectionsReferences(JSON.stringify(connectionInfo), {}, settingsData?.properties);
       delete resolvedConnectionInfo.displayName;
 
+      if (useMcpConnections) {
+        return {
+          isAgentMcpConnection,
+          connection: resolvedConnectionInfo,
+        };
+      }
+
       return {
         connection: resolvedConnectionInfo,
       };
@@ -627,6 +647,7 @@ const getDesignerServices = (
   });
   const connectorService = new StandardConnectorService({
     ...defaultServiceParams,
+    workflowName,
     clientSupportedOperations: [
       ['connectionProviders/localWorkflowOperation', 'invokeWorkflow'],
       ['connectionProviders/xmlOperations', 'xmlValidation'],
diff --git a/apps/Standalone/src/designer/app/AzureLogicAppsDesigner/laDesignerV2.tsx b/apps/Standalone/src/designer/app/AzureLogicAppsDesigner/laDesignerV2.tsx
@@ -156,20 +156,40 @@ const DesignerEditor = () => {
     setIsDraftMode(draftMode);
   }, []);
 
-  const getConnectionConfiguration = async (connectionId: string): Promise<any> => {
+  const getConnectionConfiguration = async (connectionId: string, _manifest: any, useMcpConnections?: boolean): Promise<any> => {
     if (!connectionId) {
       return Promise.resolve();
     }
 
     const connectionName = connectionId.split('/').splice(-1)[0];
-    const connectionInfo =
-      connectionsData?.serviceProviderConnections?.[connectionName] ?? connectionsData?.apiManagementConnections?.[connectionName];
+    let connectionInfo: any;
+    let isAgentMcpConnection = false;
+
+    if (useMcpConnections) {
+      connectionInfo = connectionsData?.agentMcpConnections?.[connectionName];
+
+      if (connectionInfo) {
+        isAgentMcpConnection = true;
+      }
+
+      connectionInfo = connectionInfo ?? connectionsData?.managedApiConnections?.[connectionName];
+    } else {
+      connectionInfo =
+        connectionsData?.serviceProviderConnections?.[connectionName] ?? connectionsData?.apiManagementConnections?.[connectionName];
+    }
 
     if (connectionInfo) {
       // TODO(psamband): Add new settings in this blade so that we do not resolve all the appsettings in the connectionInfo.
       const resolvedConnectionInfo = resolveConnectionsReferences(JSON.stringify(connectionInfo), {}, settingsData?.properties);
       delete resolvedConnectionInfo.displayName;
 
+      if (useMcpConnections) {
+        return {
+          isAgentMcpConnection,
+          connection: resolvedConnectionInfo,
+        };
+      }
+
       return {
         connection: resolvedConnectionInfo,
       };
@@ -578,7 +598,7 @@ const DesignerEditor = () => {
         options={{
           services,
           isDarkMode,
-          readOnly: isReadOnly || isMonitoringView || !isDraftMode,
+          readOnly: isReadOnly || isMonitoringView,
           isMonitoringView,
           isDraft: isDraftMode,
           isUnitTest,
@@ -771,6 +791,7 @@ const getDesignerServices = (
   });
   const connectorService = new StandardConnectorService({
     ...defaultServiceParams,
+    workflowName,
     clientSupportedOperations: [
       ['connectionProviders/localWorkflowOperation', 'invokeWorkflow'],
       ['connectionProviders/xmlOperations', 'xmlValidation'],
diff --git a/apps/Standalone/src/mcp/app/McpStandard.tsx b/apps/Standalone/src/mcp/app/McpStandard.tsx
@@ -240,6 +240,7 @@ const getResourceBasedServices = (
 
   const connectorService = new StandardConnectorService({
     ...defaultServiceParams,
+    workflowName: '',
     clientSupportedOperations: [],
     getConfiguration: () => Promise.resolve({}),
     schemaClient: {},
diff --git a/apps/Standalone/src/templates/app/TemplatesStandard.tsx b/apps/Standalone/src/templates/app/TemplatesStandard.tsx
@@ -524,6 +524,7 @@ const getResourceBasedServices = (
   });
   const connectorService = new StandardConnectorService({
     ...defaultServiceParams,
+    workflowName: '',
     clientSupportedOperations: [
       ['connectionProviders/localWorkflowOperation', 'invokeWorkflow'],
       ['connectionProviders/xmlOperations', 'xmlValidation'],
diff --git a/libs/designer-v2/src/lib/core/actions/bjsworkflow/__test__/operationdeserializer.spec.ts b/libs/designer-v2/src/lib/core/actions/bjsworkflow/__test__/operationdeserializer.spec.ts
@@ -249,6 +249,7 @@ describe('operationdeserializer', () => {
             operationId: 'test-operation',
             type: 'McpClientTool',
             kind: 'Managed',
+            operationPath: '/servers/filesystem',
           }),
         })
       );
diff --git a/libs/designer-v2/src/lib/core/actions/bjsworkflow/operationdeserializer.ts b/libs/designer-v2/src/lib/core/actions/bjsworkflow/operationdeserializer.ts
@@ -273,7 +273,7 @@ export const initializeOperationDetailsForManagedMcpServer = async (
     };
     const builtinMcpServerManifest = await getOperationManifest(builtinMcpServerOperationInfo);
 
-    const operationInfo = { connectorId, operationId, type: operation.type, kind: operation.kind };
+    const operationInfo = { connectorId, operationId, type: operation.type, kind: operation.kind, operationPath: mcpServerPath };
     dispatch(initializeOperationInfo({ id: nodeId, ...operationInfo }));
 
     const operationForParameters = {
diff --git a/libs/designer-v2/src/lib/core/queries/connector.ts b/libs/designer-v2/src/lib/core/queries/connector.ts
@@ -105,7 +105,8 @@ export const getListDynamicValues = async (
   connectorId: string,
   operationId: string,
   parameters: Record<string, any>,
-  dynamicState: any
+  dynamicState: any,
+  operationPath?: string
 ): Promise<ListDynamicValue[]> => {
   const queryClient = getReactQueryClient();
   const service = ConnectorService();
@@ -119,7 +120,7 @@ export const getListDynamicValues = async (
       dynamicState.operationId?.toLowerCase(),
       getParametersKey({ ...dynamicState.parameters, ...parameters }),
     ],
-    () => service.getListDynamicValues(connectionId, connectorId, operationId, parameters, dynamicState)
+    () => service.getListDynamicValues(connectionId, connectorId, operationId, parameters, dynamicState, undefined, operationPath)
   );
 };
 
diff --git a/libs/designer-v2/src/lib/core/state/operation/operationMetadataSlice.ts b/libs/designer-v2/src/lib/core/state/operation/operationMetadataSlice.ts
@@ -262,8 +262,8 @@ export const operationMetadataSlice = createSlice({
       state.loadStatus.nodesInitialized = true;
     },
     initializeOperationInfo: (state, action: PayloadAction<AddNodeOperationPayload>) => {
-      const { id, connectorId, operationId, type, kind } = action.payload;
-      state.operationInfo[id] = { connectorId, operationId, type, kind };
+      const { id, connectorId, operationId, type, kind, operationPath } = action.payload;
+      state.operationInfo[id] = { connectorId, operationId, type, kind, operationPath };
     },
     initializeNodes: (state, action: PayloadAction<InitializeNodesPayload>) => {
       const { nodes, clearExisting = false } = action.payload;
diff --git a/libs/designer-v2/src/lib/core/utils/parameters/dynamicdata.ts b/libs/designer-v2/src/lib/core/utils/parameters/dynamicdata.ts
@@ -118,7 +118,8 @@ export async function getDynamicValues(
       operationInfo.connectorId,
       operationInfo.operationId,
       operationParameters,
-      dynamicState
+      dynamicState,
+      operationInfo.operationPath
     );
   }
   if (isLegacyDynamicValuesExtension(definition)) {
diff --git a/libs/designer/src/lib/core/actions/bjsworkflow/add.ts b/libs/designer/src/lib/core/actions/bjsworkflow/add.ts
@@ -50,6 +50,7 @@ import {
   UserPreferenceService,
   LoggerService,
   LogEntryLevel,
+  removeConnectionPrefix,
 } from '@microsoft/logic-apps-shared';
 import type {
   Connection,
@@ -187,11 +188,17 @@ export const initializeOperationDetails = async (
 
   if (isManagedMcpClient) {
     // managed mcp client ignores the swagger and uses a fixed set of parameters similar to manifest based native mcp client
-    const { connector: swaggerConnector } = await getConnectorWithSwagger(connectorId);
+    const { connector: swaggerConnector, parsedSwagger } = await getConnectorWithSwagger(connectorId);
     connector = swaggerConnector;
     const iconUri = getIconUriFromConnector(connector);
     const brandColor = getBrandColorFromConnector(connector);
 
+    const swaggerOperation = parsedSwagger.getOperationByOperationId(operationId);
+    const operationPath = swaggerOperation ? removeConnectionPrefix(swaggerOperation.path) : undefined;
+    if (operationPath) {
+      dispatch(initializeOperationInfo({ id: nodeId, ...operationInfo, operationPath }));
+    }
+
     const nativeMcpOperationInfo = { connectorId: 'connectionProviders/mcpclient', operationId: 'nativemcpclient' };
     const nativeMcpManifest = await getOperationManifest(nativeMcpOperationInfo);
     isConnectionRequired = isConnectionRequiredForOperation(nativeMcpManifest);
diff --git a/libs/designer/src/lib/core/actions/bjsworkflow/operationdeserializer.ts b/libs/designer/src/lib/core/actions/bjsworkflow/operationdeserializer.ts
@@ -273,7 +273,7 @@ export const initializeOperationDetailsForManagedMcpServer = async (
     };
     const builtinMcpServerManifest = await getOperationManifest(builtinMcpServerOperationInfo);
 
-    const operationInfo = { connectorId, operationId, type: operation.type, kind: operation.kind };
+    const operationInfo = { connectorId, operationId, type: operation.type, kind: operation.kind, operationPath: mcpServerPath };
     dispatch(initializeOperationInfo({ id: nodeId, ...operationInfo }));
 
     //const parsedManifest = new ManifestParser(manifest, OperationManifestService().isAliasingSupported(operation.type, operation.kind));
diff --git a/libs/designer/src/lib/core/queries/connector.ts b/libs/designer/src/lib/core/queries/connector.ts
@@ -105,7 +105,8 @@ export const getListDynamicValues = async (
   connectorId: string,
   operationId: string,
   parameters: Record<string, any>,
-  dynamicState: any
+  dynamicState: any,
+  operationPath?: string
 ): Promise<ListDynamicValue[]> => {
   const queryClient = getReactQueryClient();
   const service = ConnectorService();
@@ -119,7 +120,7 @@ export const getListDynamicValues = async (
       dynamicState.operationId?.toLowerCase(),
       getParametersKey({ ...dynamicState.parameters, ...parameters }),
     ],
-    () => service.getListDynamicValues(connectionId, connectorId, operationId, parameters, dynamicState)
+    () => service.getListDynamicValues(connectionId, connectorId, operationId, parameters, dynamicState, undefined, operationPath)
   );
 };
 
diff --git a/libs/designer/src/lib/core/state/operation/operationMetadataSlice.ts b/libs/designer/src/lib/core/state/operation/operationMetadataSlice.ts
@@ -262,8 +262,8 @@ export const operationMetadataSlice = createSlice({
       state.loadStatus.nodesInitialized = true;
     },
     initializeOperationInfo: (state, action: PayloadAction<AddNodeOperationPayload>) => {
-      const { id, connectorId, operationId, type, kind } = action.payload;
-      state.operationInfo[id] = { connectorId, operationId, type, kind };
+      const { id, connectorId, operationId, type, kind, operationPath } = action.payload;
+      state.operationInfo[id] = { connectorId, operationId, type, kind, operationPath };
     },
     initializeNodes: (state, action: PayloadAction<InitializeNodesPayload>) => {
       const { nodes, clearExisting = false } = action.payload;
diff --git a/libs/designer/src/lib/core/utils/parameters/dynamicdata.ts b/libs/designer/src/lib/core/utils/parameters/dynamicdata.ts
@@ -118,7 +118,8 @@ export async function getDynamicValues(
       operationInfo.connectorId,
       operationInfo.operationId,
       operationParameters,
-      dynamicState
+      dynamicState,
+      operationInfo.operationPath
     );
   }
   if (isLegacyDynamicValuesExtension(definition)) {
diff --git a/libs/logic-apps-shared/src/designer-client-services/lib/connector.ts b/libs/logic-apps-shared/src/designer-client-services/lib/connector.ts
@@ -67,7 +67,8 @@ export interface IConnectorService {
     operationId: string,
     parameters: Record<string, any>,
     dynamicState: any,
-    isManagedIdentityConnection?: boolean
+    isManagedIdentityConnection?: boolean,
+    operationPath?: string
   ): Promise<ListDynamicValue[]>;
 
   /**
diff --git a/libs/logic-apps-shared/src/designer-client-services/lib/standard/connector.ts b/libs/logic-apps-shared/src/designer-client-services/lib/standard/connector.ts
@@ -9,10 +9,15 @@ import { LoggerService } from '../logger';
 import { LogEntryLevel } from '../logging/logEntry';
 import { getHybridAppBaseRelativeUrl, hybridApiVersion, isHybridLogicApp } from './hybrid';
 
-type GetConfigurationFunction = (connectionId: string, manifest?: OperationManifest) => Promise<Record<string, any>>;
+type GetConfigurationFunction = (
+  connectionId: string,
+  manifest?: OperationManifest,
+  useManagedConnections?: boolean
+) => Promise<Record<string, any>>;
 
 export interface StandardConnectorServiceOptions extends BaseConnectorServiceOptions {
   getConfiguration: GetConfigurationFunction;
+  workflowName: string;
 }
 
 export class StandardConnectorService extends BaseConnectorService {
@@ -60,11 +65,13 @@ export class StandardConnectorService extends BaseConnectorService {
     operationId: string,
     parameters: Record<string, any>,
     dynamicState: any,
-    configuration: Record<string, any>
+    connectionId: string | undefined,
+    operationPath?: string
   ): Promise<ListDynamicValue[]> {
-    const { baseUrl, apiVersion, httpClient } = this.options;
-    const { operationId: dynamicOperation } = dynamicState;
+    const { baseUrl, apiVersion, httpClient, getConfiguration } = this.options;
+    const { operationId: dynamicOperation, apiType } = dynamicState;
     const invokeParameters = this._getInvokeParameters(parameters, dynamicState);
+    const isMcpConnection = apiType === 'mcp' && dynamicOperation === 'listMcpTools';
 
     if (this._isClientSupportedOperation(connectorId, operationId)) {
       if (!this.options.valuesClient?.[dynamicOperation]) {
@@ -73,10 +80,43 @@ export class StandardConnectorService extends BaseConnectorService {
       return this.options.valuesClient?.[dynamicOperation]({
         operationId,
         parameters: invokeParameters,
-        configuration,
+        configuration: await getConfiguration(connectionId ?? ''),
       });
     }
 
+    const configuration: any = await getConfiguration(connectionId ?? '', /* manifest */ undefined, !!isMcpConnection);
+    if (isMcpConnection) {
+      const uri = `${baseUrl}/workflows/${this.options.workflowName}/listMcpTools`;
+      let content: any;
+
+      if (configuration.isAgentMcpConnection) {
+        content = { connection: configuration.connection };
+      } else {
+        // Workaround: Remove connectionRuntimeUrl from connectionProperties if it exists
+        // connectionRuntimeUrl should be at the root level, not inside connectionProperties
+        const connection = { ...configuration.connection };
+        if (connection?.connectionProperties?.connectionRuntimeUrl) {
+          delete connection.connectionProperties.connectionRuntimeUrl;
+        }
+        content = {
+          managedConnection: connection,
+          mcpServerPath: operationPath,
+        };
+      }
+      const mcpToolsResponse = await httpClient.post({
+        uri,
+        queryParameters: { 'api-version': apiVersion },
+        content,
+      });
+      const tools = this._getResponseFromDynamicApi(mcpToolsResponse, uri);
+
+      return (tools ?? []).map((tool: any) => ({
+        value: tool.name,
+        displayName: tool.name,
+        description: tool.description,
+      }));
+    }
+
     const uri = `${baseUrl}/operationGroups/${connectorId.split('/').slice(-1)}/operations/${dynamicOperation}/dynamicInvoke`;
     let response = null;
     if (isHybridLogicApp(uri)) {
@@ -106,11 +146,11 @@ export class StandardConnectorService extends BaseConnectorService {
     connectorId: string,
     operationId: string,
     parameters: Record<string, any>,
-    dynamicState: any
+    dynamicState: any,
+    _isManagedIdentityConnection?: boolean,
+    operationPath?: string
   ): Promise<ListDynamicValue[]> {
-    const { getConfiguration } = this.options;
-    const configuration = await getConfiguration(connectionId ?? '');
-    return this._listDynamicValues(connectorId, operationId, parameters, dynamicState, configuration);
+    return this._listDynamicValues(connectorId, operationId, parameters, dynamicState, connectionId, operationPath);
   }
 
   protected async _getDynamicSchema(
diff --git a/libs/logic-apps-shared/src/designer-client-services/lib/standard/manifest/builtinmcpclient.ts b/libs/logic-apps-shared/src/designer-client-services/lib/standard/manifest/builtinmcpclient.ts
@@ -26,20 +26,19 @@ export default {
             type: 'string',
           },
           title: 'Allowed tools',
+          // 'x-ms-editor': 'combobox',
           // 'x-ms-editor-options': {
           //   multiSelect: true,
           //   titleSeparator: ',',
           //   serialization: {
-          //     valueType: 'array'
-          //   }
+          //     valueType: 'array',
+          //   },
           // },
           // 'x-ms-dynamic-list': {
           //   dynamicState: {
-          //     operationId: 'gettools',
+          //     apiType: 'mcp',
+          //     operationId: 'listMcpTools',
           //   },
-          //   parameters: {},
-          //   itemPath: '',
-          //   itemValuePath: 'Name',
           // },
         },
       },
diff --git a/libs/logic-apps-shared/src/utils/src/lib/models/operationmanifest.ts b/libs/logic-apps-shared/src/utils/src/lib/models/operationmanifest.ts
