@camunda/connectors-element-templates 1.0.20 → 1.0.21

package/src/element-templates/agenticai-mcp-remote-client-outbound-connector.json

@@ -1,13 +1,11 @@
 [
   {
     "$schema": "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
-    "name": "MCP Remote Client (early access)",
+    "name": "MCP Remote Client",
     "id": "io.camunda.connectors.agenticai.mcp.remoteclient.v0",
-    "description": "MCP (Model Context Protocol) client, operating on temporary remote connections. Only supports tool operations.",
-    "metadata": {
-      "keywords": []
-    },
-    "version": 0,
+    "description": "MCP (Model Context Protocol) client, operating on temporary remote connections.",
+    "documentationRef": "https://docs.camunda.io/docs/8.9/components/connectors/out-of-the-box-connectors/agentic-ai-mcp-remote-client-connector/",
+    "version": 3,
     "category": {
       "id": "aiTools",
       "name": "AI Tools"
@@ -17,22 +15,36 @@
       "value": "bpmn:ServiceTask"
     },
     "engines": {
-      "camunda": "^8.8"
+      "camunda": "^8.9"
     },
     "groups": [
       {
-        "id": "connection",
-        "label": "HTTP Connection",
-        "tooltip": "Configure the HTTP/SSE connection to the remote MCP server. Setting authentication headers is not supported yet."
+        "id": "transport",
+        "label": "Transport",
+        "tooltip": "Configure the connection to the remote MCP server."
       },
       {
-        "id": "tools",
-        "label": "Tools"
+        "id": "authentication",
+        "label": "Authentication"
+      },
+      {
+        "id": "options",
+        "label": "Options"
+      },
+      {
+        "id": "connectorMode",
+        "label": "Connector mode",
+        "tooltip": "Select how this connector is used. When the connector is used as an AI agent tool, select the AI Agent tool mode."
       },
       {
         "id": "operation",
         "label": "Operation"
       },
+      {
+        "id": "filters",
+        "label": "Filters",
+        "openByDefault": false
+      },
       {
         "id": "connector",
         "label": "Connector"
@@ -52,7 +64,7 @@
     ],
     "properties": [
       {
-        "value": "io.camunda.agenticai:mcpremoteclient:0",
+        "value": "io.camunda.agenticai:mcpremoteclient:1",
         "binding": {
           "property": "type",
           "type": "zeebe:taskDefinition"
@@ -65,154 +77,1330 @@
           "name": "io.camunda.agenticai.gateway.type",
           "type": "zeebe:property"
         },
+        "condition": {
+          "property": "data.connectorMode.type",
+          "equals": "aiAgentTool",
+          "type": "simple"
+        },
         "type": "Hidden"
       },
       {
-        "id": "data.connection.sseUrl",
-        "label": "SSE URL",
-        "description": "SSE URL to connect to the MCP server. Typically ends with <code>/sse</code>.",
+        "id": "data.transport.type",
+        "label": "Type",
+        "description": "Specify the MCP transport type.",
+        "value": "http",
+        "group": "transport",
+        "binding": {
+          "name": "data.transport.type",
+          "type": "zeebe:input"
+        },
+        "type": "Dropdown",
+        "choices": [
+          {
+            "name": "Streamable HTTP",
+            "value": "http"
+          },
+          {
+            "name": "SSE",
+            "value": "sse"
+          }
+        ]
+      },
+      {
+        "id": "data.transport.http.url",
+        "label": "URL",
+        "description": "URL to connect to the MCP server. Typically ends with <code>/mcp</code>.",
         "optional": false,
         "constraints": {
           "notEmpty": true
         },
         "feel": "optional",
-        "group": "connection",
+        "group": "transport",
         "binding": {
-          "name": "data.connection.sseUrl",
+          "name": "data.transport.http.url",
           "type": "zeebe:input"
         },
+        "condition": {
+          "property": "data.transport.type",
+          "equals": "http",
+          "type": "simple"
+        },
         "type": "String"
       },
       {
-        "id": "data.connection.headers",
+        "id": "data.transport.http.headers",
         "label": "HTTP headers",
-        "description": "Map of HTTP headers to add to the request <strong>(NOT SUPPORTED YET)</strong>.",
+        "description": "Map of HTTP headers to add to the request.",
         "optional": true,
-        "group": "connection",
+        "feel": "required",
+        "group": "transport",
         "binding": {
-          "name": "data.connection.headers",
+          "name": "data.transport.http.headers",
           "type": "zeebe:input"
         },
-        "type": "Hidden"
+        "condition": {
+          "property": "data.transport.type",
+          "equals": "http",
+          "type": "simple"
+        },
+        "type": "String"
       },
       {
-        "id": "data.connection.timeout",
+        "id": "data.transport.http.timeout",
         "label": "Timeout",
         "description": "Timeout for individual HTTP requests as ISO-8601 duration (example: <code>PT30S</code>)",
         "optional": true,
-        "group": "connection",
-        "binding": {
-          "name": "data.connection.timeout",
-          "type": "zeebe:input"
-        },
-        "type": "Hidden"
-      },
-      {
-        "id": "data.tools.included",
-        "label": "Included tools",
-        "description": "List of tools that can be used by the MCP client. By default, all tools are allowed.",
-        "optional": true,
-        "feel": "required",
-        "group": "tools",
+        "feel": "optional",
+        "group": "transport",
         "binding": {
-          "name": "data.tools.included",
+          "name": "data.transport.http.timeout",
           "type": "zeebe:input"
         },
-        "type": "Text"
-      },
-      {
-        "id": "data.tools.excluded",
-        "label": "Excluded tools",
-        "description": "List of tools that are not allowed to be used by the MCP client. Will override any included tools.",
-        "optional": true,
-        "feel": "required",
-        "group": "tools",
-        "binding": {
-          "name": "data.tools.excluded",
-          "type": "zeebe:input"
+        "condition": {
+          "property": "data.transport.type",
+          "equals": "http",
+          "type": "simple"
         },
-        "type": "Text"
+        "type": "String"
       },
       {
-        "id": "data.operation.method",
-        "label": "Method",
-        "description": "The MCP method to be called, e.g. <code>tools/list</code>.",
+        "id": "data.transport.sse.url",
+        "label": "URL",
+        "description": "URL to connect to the MCP server. Typically ends with <code>/sse</code>.",
         "optional": false,
-        "value": "=toolCall.method",
         "constraints": {
           "notEmpty": true
         },
         "feel": "optional",
-        "group": "operation",
+        "group": "transport",
         "binding": {
-          "name": "data.operation.method",
+          "name": "data.transport.sse.url",
           "type": "zeebe:input"
         },
-        "tooltip": "The method to be called on the MCP server. See the <a href=\"https://modelcontextprotocol.io/specification/2024-11-05/server\">MCP specification</a> for a list of available methods.<br><br>Currently supported:<br><code>tools/list</code>, <code>tools/call</code>",
+        "condition": {
+          "property": "data.transport.type",
+          "equals": "sse",
+          "type": "simple"
+        },
         "type": "String"
       },
       {
-        "id": "data.operation.params",
-        "label": "Parameters",
-        "description": "The parameters to be passed to the MCP method.",
+        "id": "data.transport.sse.headers",
+        "label": "HTTP headers",
+        "description": "Map of HTTP headers to add to the request.",
         "optional": true,
-        "value": "=toolCall.params",
         "feel": "required",
-        "group": "operation",
+        "group": "transport",
         "binding": {
-          "name": "data.operation.params",
+          "name": "data.transport.sse.headers",
           "type": "zeebe:input"
         },
-        "tooltip": "The parameter structure depends on the method being called. See the <a href=\"https://modelcontextprotocol.io/specification/2024-11-05/server/tools#calling-tools\">MCP specification</a> for an example of the parameters for the <code>tools/call</code> method.",
+        "condition": {
+          "property": "data.transport.type",
+          "equals": "sse",
+          "type": "simple"
+        },
         "type": "String"
       },
       {
-        "id": "version",
-        "label": "Version",
-        "description": "Version of the element template",
-        "value": "0",
-        "group": "connector",
+        "id": "data.transport.sse.timeout",
+        "label": "Timeout",
+        "description": "Timeout for individual HTTP requests as ISO-8601 duration (example: <code>PT30S</code>)",
+        "optional": true,
+        "feel": "optional",
+        "group": "transport",
         "binding": {
-          "key": "elementTemplateVersion",
-          "type": "zeebe:taskHeader"
+          "name": "data.transport.sse.timeout",
+          "type": "zeebe:input"
         },
-        "type": "Hidden"
-      },
-      {
-        "id": "id",
-        "label": "ID",
-        "description": "ID of the element template",
-        "value": "io.camunda.connectors.agenticai.mcp.remoteclient.v0",
-        "group": "connector",
-        "binding": {
-          "key": "elementTemplateId",
-          "type": "zeebe:taskHeader"
+        "condition": {
+          "property": "data.transport.type",
+          "equals": "sse",
+          "type": "simple"
         },
-        "type": "Hidden"
+        "type": "String"
       },
       {
-        "id": "resultVariable",
-        "label": "Result variable",
-        "description": "Name of variable to store the response in",
-        "value": "toolCallResult",
-        "group": "output",
+        "id": "data.transport.http.authentication.type",
+        "label": "Type",
+        "description": "Choose the authentication type. Select 'None' if no authentication is necessary",
+        "value": "noAuth",
+        "group": "authentication",
         "binding": {
-          "key": "resultVariable",
-          "type": "zeebe:taskHeader"
+          "name": "data.transport.http.authentication.type",
+          "type": "zeebe:input"
         },
-        "type": "String"
+        "condition": {
+          "property": "data.transport.type",
+          "equals": "http",
+          "type": "simple"
+        },
+        "type": "Dropdown",
+        "choices": [
+          {
+            "name": "None",
+            "value": "noAuth"
+          },
+          {
+            "name": "Basic",
+            "value": "basic"
+          },
+          {
+            "name": "Bearer token",
+            "value": "bearer"
+          },
+          {
+            "name": "OAuth 2.0",
+            "value": "oauth-client-credentials-flow"
+          }
+        ]
       },
       {
-        "id": "resultExpression",
-        "label": "Result expression",
-        "description": "Expression to map the response into process variables",
-        "feel": "required",
-        "group": "output",
+        "id": "data.transport.http.authentication.username",
+        "label": "Username",
+        "optional": false,
+        "constraints": {
+          "notEmpty": true
+        },
+        "feel": "optional",
+        "group": "authentication",
         "binding": {
-          "key": "resultExpression",
-          "type": "zeebe:taskHeader"
+          "name": "data.transport.http.authentication.username",
+          "type": "zeebe:input"
         },
-        "type": "Text"
+        "condition": {
+          "allMatch": [
+            {
+              "property": "data.transport.http.authentication.type",
+              "equals": "basic",
+              "type": "simple"
+            },
+            {
+              "property": "data.transport.type",
+              "equals": "http",
+              "type": "simple"
+            }
+          ]
+        },
+        "type": "String"
+      },
+      {
+        "id": "data.transport.http.authentication.password",
+        "label": "Password",
+        "optional": false,
+        "constraints": {
+          "notEmpty": true
+        },
+        "feel": "optional",
+        "group": "authentication",
+        "binding": {
+          "name": "data.transport.http.authentication.password",
+          "type": "zeebe:input"
+        },
+        "condition": {
+          "allMatch": [
+            {
+              "property": "data.transport.http.authentication.type",
+              "equals": "basic",
+              "type": "simple"
+            },
+            {
+              "property": "data.transport.type",
+              "equals": "http",
+              "type": "simple"
+            }
+          ]
+        },
+        "type": "String"
+      },
+      {
+        "id": "data.transport.http.authentication.token",
+        "label": "Bearer token",
+        "optional": false,
+        "constraints": {
+          "notEmpty": true
+        },
+        "feel": "optional",
+        "group": "authentication",
+        "binding": {
+          "name": "data.transport.http.authentication.token",
+          "type": "zeebe:input"
+        },
+        "condition": {
+          "allMatch": [
+            {
+              "property": "data.transport.http.authentication.type",
+              "equals": "bearer",
+              "type": "simple"
+            },
+            {
+              "property": "data.transport.type",
+              "equals": "http",
+              "type": "simple"
+            }
+          ]
+        },
+        "type": "String"
+      },
+      {
+        "id": "data.transport.http.authentication.oauthTokenEndpoint",
+        "label": "OAuth 2.0 token endpoint",
+        "description": "The OAuth token endpoint",
+        "optional": false,
+        "constraints": {
+          "notEmpty": true,
+          "pattern": {
+            "value": "^(=|(http://|https://|secrets|\\{\\{).*$)",
+            "message": "Must be a http(s) URL"
+          }
+        },
+        "feel": "optional",
+        "group": "authentication",
+        "binding": {
+          "name": "data.transport.http.authentication.oauthTokenEndpoint",
+          "type": "zeebe:input"
+        },
+        "condition": {
+          "allMatch": [
+            {
+              "property": "data.transport.http.authentication.type",
+              "equals": "oauth-client-credentials-flow",
+              "type": "simple"
+            },
+            {
+              "property": "data.transport.type",
+              "equals": "http",
+              "type": "simple"
+            }
+          ]
+        },
+        "type": "String"
+      },
+      {
+        "id": "data.transport.http.authentication.clientId",
+        "label": "Client ID",
+        "description": "Your application's client ID from the OAuth client",
+        "optional": false,
+        "constraints": {
+          "notEmpty": true
+        },
+        "feel": "optional",
+        "group": "authentication",
+        "binding": {
+          "name": "data.transport.http.authentication.clientId",
+          "type": "zeebe:input"
+        },
+        "condition": {
+          "allMatch": [
+            {
+              "property": "data.transport.http.authentication.type",
+              "equals": "oauth-client-credentials-flow",
+              "type": "simple"
+            },
+            {
+              "property": "data.transport.type",
+              "equals": "http",
+              "type": "simple"
+            }
+          ]
+        },
+        "type": "String"
+      },
+      {
+        "id": "data.transport.http.authentication.clientSecret",
+        "label": "Client secret",
+        "description": "Your application's client secret from the OAuth client",
+        "optional": false,
+        "constraints": {
+          "notEmpty": true
+        },
+        "feel": "optional",
+        "group": "authentication",
+        "binding": {
+          "name": "data.transport.http.authentication.clientSecret",
+          "type": "zeebe:input"
+        },
+        "condition": {
+          "allMatch": [
+            {
+              "property": "data.transport.http.authentication.type",
+              "equals": "oauth-client-credentials-flow",
+              "type": "simple"
+            },
+            {
+              "property": "data.transport.type",
+              "equals": "http",
+              "type": "simple"
+            }
+          ]
+        },
+        "type": "String"
+      },
+      {
+        "id": "data.transport.http.authentication.audience",
+        "label": "Audience",
+        "description": "The unique identifier of the target API you want to access",
+        "optional": true,
+        "feel": "optional",
+        "group": "authentication",
+        "binding": {
+          "name": "data.transport.http.authentication.audience",
+          "type": "zeebe:input"
+        },
+        "condition": {
+          "allMatch": [
+            {
+              "property": "data.transport.http.authentication.type",
+              "equals": "oauth-client-credentials-flow",
+              "type": "simple"
+            },
+            {
+              "property": "data.transport.type",
+              "equals": "http",
+              "type": "simple"
+            }
+          ]
+        },
+        "type": "String"
+      },
+      {
+        "id": "data.transport.http.authentication.clientAuthentication",
+        "label": "Client authentication",
+        "description": "Send client ID and client secret as Basic Auth request in the header, or as client credentials in the request body",
+        "optional": false,
+        "value": "BASIC_AUTH_HEADER",
+        "constraints": {
+          "notEmpty": true
+        },
+        "group": "authentication",
+        "binding": {
+          "name": "data.transport.http.authentication.clientAuthentication",
+          "type": "zeebe:input"
+        },
+        "condition": {
+          "allMatch": [
+            {
+              "property": "data.transport.http.authentication.type",
+              "equals": "oauth-client-credentials-flow",
+              "type": "simple"
+            },
+            {
+              "property": "data.transport.type",
+              "equals": "http",
+              "type": "simple"
+            }
+          ]
+        },
+        "type": "Dropdown",
+        "choices": [
+          {
+            "name": "Send as Basic Auth header",
+            "value": "BASIC_AUTH_HEADER"
+          },
+          {
+            "name": "Send client credentials in body",
+            "value": "CREDENTIALS_BODY"
+          }
+        ]
+      },
+      {
+        "id": "data.transport.http.authentication.scopes",
+        "label": "Scopes",
+        "description": "The scopes which you want to request authorization for (e.g.read:contacts)",
+        "optional": true,
+        "feel": "optional",
+        "group": "authentication",
+        "binding": {
+          "name": "data.transport.http.authentication.scopes",
+          "type": "zeebe:input"
+        },
+        "condition": {
+          "allMatch": [
+            {
+              "property": "data.transport.http.authentication.type",
+              "equals": "oauth-client-credentials-flow",
+              "type": "simple"
+            },
+            {
+              "property": "data.transport.type",
+              "equals": "http",
+              "type": "simple"
+            }
+          ]
+        },
+        "type": "String"
+      },
+      {
+        "id": "data.transport.sse.authentication.type",
+        "label": "Type",
+        "description": "Choose the authentication type. Select 'None' if no authentication is necessary",
+        "value": "noAuth",
+        "group": "authentication",
+        "binding": {
+          "name": "data.transport.sse.authentication.type",
+          "type": "zeebe:input"
+        },
+        "condition": {
+          "property": "data.transport.type",
+          "equals": "sse",
+          "type": "simple"
+        },
+        "type": "Dropdown",
+        "choices": [
+          {
+            "name": "None",
+            "value": "noAuth"
+          },
+          {
+            "name": "Basic",
+            "value": "basic"
+          },
+          {
+            "name": "Bearer token",
+            "value": "bearer"
+          },
+          {
+            "name": "OAuth 2.0",
+            "value": "oauth-client-credentials-flow"
+          }
+        ]
+      },
+      {
+        "id": "data.transport.sse.authentication.username",
+        "label": "Username",
+        "optional": false,
+        "constraints": {
+          "notEmpty": true
+        },
+        "feel": "optional",
+        "group": "authentication",
+        "binding": {
+          "name": "data.transport.sse.authentication.username",
+          "type": "zeebe:input"
+        },
+        "condition": {
+          "allMatch": [
+            {
+              "property": "data.transport.sse.authentication.type",
+              "equals": "basic",
+              "type": "simple"
+            },
+            {
+              "property": "data.transport.type",
+              "equals": "sse",
+              "type": "simple"
+            }
+          ]
+        },
+        "type": "String"
+      },
+      {
+        "id": "data.transport.sse.authentication.password",
+        "label": "Password",
+        "optional": false,
+        "constraints": {
+          "notEmpty": true
+        },
+        "feel": "optional",
+        "group": "authentication",
+        "binding": {
+          "name": "data.transport.sse.authentication.password",
+          "type": "zeebe:input"
+        },
+        "condition": {
+          "allMatch": [
+            {
+              "property": "data.transport.sse.authentication.type",
+              "equals": "basic",
+              "type": "simple"
+            },
+            {
+              "property": "data.transport.type",
+              "equals": "sse",
+              "type": "simple"
+            }
+          ]
+        },
+        "type": "String"
+      },
+      {
+        "id": "data.transport.sse.authentication.token",
+        "label": "Bearer token",
+        "optional": false,
+        "constraints": {
+          "notEmpty": true
+        },
+        "feel": "optional",
+        "group": "authentication",
+        "binding": {
+          "name": "data.transport.sse.authentication.token",
+          "type": "zeebe:input"
+        },
+        "condition": {
+          "allMatch": [
+            {
+              "property": "data.transport.sse.authentication.type",
+              "equals": "bearer",
+              "type": "simple"
+            },
+            {
+              "property": "data.transport.type",
+              "equals": "sse",
+              "type": "simple"
+            }
+          ]
+        },
+        "type": "String"
+      },
+      {
+        "id": "data.transport.sse.authentication.oauthTokenEndpoint",
+        "label": "OAuth 2.0 token endpoint",
+        "description": "The OAuth token endpoint",
+        "optional": false,
+        "constraints": {
+          "notEmpty": true,
+          "pattern": {
+            "value": "^(=|(http://|https://|secrets|\\{\\{).*$)",
+            "message": "Must be a http(s) URL"
+          }
+        },
+        "feel": "optional",
+        "group": "authentication",
+        "binding": {
+          "name": "data.transport.sse.authentication.oauthTokenEndpoint",
+          "type": "zeebe:input"
+        },
+        "condition": {
+          "allMatch": [
+            {
+              "property": "data.transport.sse.authentication.type",
+              "equals": "oauth-client-credentials-flow",
+              "type": "simple"
+            },
+            {
+              "property": "data.transport.type",
+              "equals": "sse",
+              "type": "simple"
+            }
+          ]
+        },
+        "type": "String"
+      },
+      {
+        "id": "data.transport.sse.authentication.clientId",
+        "label": "Client ID",
+        "description": "Your application's client ID from the OAuth client",
+        "optional": false,
+        "constraints": {
+          "notEmpty": true
+        },
+        "feel": "optional",
+        "group": "authentication",
+        "binding": {
+          "name": "data.transport.sse.authentication.clientId",
+          "type": "zeebe:input"
+        },
+        "condition": {
+          "allMatch": [
+            {
+              "property": "data.transport.sse.authentication.type",
+              "equals": "oauth-client-credentials-flow",
+              "type": "simple"
+            },
+            {
+              "property": "data.transport.type",
+              "equals": "sse",
+              "type": "simple"
+            }
+          ]
+        },
+        "type": "String"
+      },
+      {
+        "id": "data.transport.sse.authentication.clientSecret",
+        "label": "Client secret",
+        "description": "Your application's client secret from the OAuth client",
+        "optional": false,
+        "constraints": {
+          "notEmpty": true
+        },
+        "feel": "optional",
+        "group": "authentication",
+        "binding": {
+          "name": "data.transport.sse.authentication.clientSecret",
+          "type": "zeebe:input"
+        },
+        "condition": {
+          "allMatch": [
+            {
+              "property": "data.transport.sse.authentication.type",
+              "equals": "oauth-client-credentials-flow",
+              "type": "simple"
+            },
+            {
+              "property": "data.transport.type",
+              "equals": "sse",
+              "type": "simple"
+            }
+          ]
+        },
+        "type": "String"
+      },
+      {
+        "id": "data.transport.sse.authentication.audience",
+        "label": "Audience",
+        "description": "The unique identifier of the target API you want to access",
+        "optional": true,
+        "feel": "optional",
+        "group": "authentication",
+        "binding": {
+          "name": "data.transport.sse.authentication.audience",
+          "type": "zeebe:input"
+        },
+        "condition": {
+          "allMatch": [
+            {
+              "property": "data.transport.sse.authentication.type",
+              "equals": "oauth-client-credentials-flow",
+              "type": "simple"
+            },
+            {
+              "property": "data.transport.type",
+              "equals": "sse",
+              "type": "simple"
+            }
+          ]
+        },
+        "type": "String"
+      },
+      {
+        "id": "data.transport.sse.authentication.clientAuthentication",
+        "label": "Client authentication",
+        "description": "Send client ID and client secret as Basic Auth request in the header, or as client credentials in the request body",
+        "optional": false,
+        "value": "BASIC_AUTH_HEADER",
+        "constraints": {
+          "notEmpty": true
+        },
+        "group": "authentication",
+        "binding": {
+          "name": "data.transport.sse.authentication.clientAuthentication",
+          "type": "zeebe:input"
+        },
+        "condition": {
+          "allMatch": [
+            {
+              "property": "data.transport.sse.authentication.type",
+              "equals": "oauth-client-credentials-flow",
+              "type": "simple"
+            },
+            {
+              "property": "data.transport.type",
+              "equals": "sse",
+              "type": "simple"
+            }
+          ]
+        },
+        "type": "Dropdown",
+        "choices": [
+          {
+            "name": "Send as Basic Auth header",
+            "value": "BASIC_AUTH_HEADER"
+          },
+          {
+            "name": "Send client credentials in body",
+            "value": "CREDENTIALS_BODY"
+          }
+        ]
+      },
+      {
+        "id": "data.transport.sse.authentication.scopes",
+        "label": "Scopes",
+        "description": "The scopes which you want to request authorization for (e.g.read:contacts)",
+        "optional": true,
+        "feel": "optional",
+        "group": "authentication",
+        "binding": {
+          "name": "data.transport.sse.authentication.scopes",
+          "type": "zeebe:input"
+        },
+        "condition": {
+          "allMatch": [
+            {
+              "property": "data.transport.sse.authentication.type",
+              "equals": "oauth-client-credentials-flow",
+              "type": "simple"
+            },
+            {
+              "property": "data.transport.type",
+              "equals": "sse",
+              "type": "simple"
+            }
+          ]
+        },
+        "type": "String"
+      },
+      {
+        "id": "data.options.clientCache",
+        "label": "Enable client caching",
+        "description": "If enabled, the MCP client instance is cached on the connector runtime and reused across requests.",
+        "optional": true,
+        "feel": "static",
+        "group": "options",
+        "binding": {
+          "name": "data.options.clientCache",
+          "type": "zeebe:input"
+        },
+        "tooltip": "Only enable this option if you are sure that the configuration or authentication details of this client will not change between invocations.<br>Caching the client instance can improve performance by reusing existing connections.",
+        "type": "Boolean"
+      },
+      {
+        "id": "data.connectorMode.type",
+        "label": "Connector mode",
+        "description": "Select how this connector is used.",
+        "value": "aiAgentTool",
+        "group": "connectorMode",
+        "binding": {
+          "name": "data.connectorMode.type",
+          "type": "zeebe:input"
+        },
+        "type": "Dropdown",
+        "choices": [
+          {
+            "name": "Standalone",
+            "value": "standalone"
+          },
+          {
+            "name": "AI Agent tool",
+            "value": "aiAgentTool"
+          }
+        ]
+      },
+      {
+        "id": "data.connectorMode.operation.type",
+        "label": "Operation",
+        "description": "The type of operation to perform.",
+        "value": "tools/list",
+        "group": "operation",
+        "binding": {
+          "name": "data.connectorMode.operation.type",
+          "type": "zeebe:input"
+        },
+        "condition": {
+          "property": "data.connectorMode.type",
+          "equals": "standalone",
+          "type": "simple"
+        },
+        "type": "Dropdown",
+        "choices": [
+          {
+            "name": "List Tools",
+            "value": "tools/list"
+          },
+          {
+            "name": "Call Tool",
+            "value": "tools/call"
+          },
+          {
+            "name": "List Resources",
+            "value": "resources/list"
+          },
+          {
+            "name": "List Resource Templates",
+            "value": "resources/templates/list"
+          },
+          {
+            "name": "Read Resource",
+            "value": "resources/read"
+          },
+          {
+            "name": "List Prompts",
+            "value": "prompts/list"
+          },
+          {
+            "name": "Get Prompt",
+            "value": "prompts/get"
+          }
+        ]
+      },
+      {
+        "id": "data.connectorMode.operation.toolName",
+        "label": "Tool name",
+        "description": "The name of the tool to call.",
+        "optional": false,
+        "constraints": {
+          "notEmpty": true
+        },
+        "feel": "optional",
+        "group": "operation",
+        "binding": {
+          "name": "data.connectorMode.operation.toolName",
+          "type": "zeebe:input"
+        },
+        "condition": {
+          "allMatch": [
+            {
+              "property": "data.connectorMode.operation.type",
+              "equals": "tools/call",
+              "type": "simple"
+            },
+            {
+              "property": "data.connectorMode.type",
+              "equals": "standalone",
+              "type": "simple"
+            }
+          ]
+        },
+        "type": "String"
+      },
+      {
+        "id": "data.connectorMode.operation.toolArguments",
+        "label": "Tool arguments",
+        "description": "The arguments to pass to the tool.",
+        "optional": true,
+        "feel": "required",
+        "group": "operation",
+        "binding": {
+          "name": "data.connectorMode.operation.toolArguments",
+          "type": "zeebe:input"
+        },
+        "condition": {
+          "allMatch": [
+            {
+              "property": "data.connectorMode.operation.type",
+              "equals": "tools/call",
+              "type": "simple"
+            },
+            {
+              "property": "data.connectorMode.type",
+              "equals": "standalone",
+              "type": "simple"
+            }
+          ]
+        },
+        "type": "String"
+      },
+      {
+        "id": "data.connectorMode.operation.resourceUri",
+        "label": "Resource URI",
+        "description": "The URI of the resource to read.",
+        "optional": false,
+        "constraints": {
+          "notEmpty": true
+        },
+        "feel": "optional",
+        "group": "operation",
+        "binding": {
+          "name": "data.connectorMode.operation.resourceUri",
+          "type": "zeebe:input"
+        },
+        "condition": {
+          "allMatch": [
+            {
+              "property": "data.connectorMode.operation.type",
+              "equals": "resources/read",
+              "type": "simple"
+            },
+            {
+              "property": "data.connectorMode.type",
+              "equals": "standalone",
+              "type": "simple"
+            }
+          ]
+        },
+        "type": "String"
+      },
+      {
+        "id": "data.connectorMode.operation.promptName",
+        "label": "Prompt name",
+        "description": "The name of the prompt to get.",
+        "optional": false,
+        "constraints": {
+          "notEmpty": true
+        },
+        "feel": "optional",
+        "group": "operation",
+        "binding": {
+          "name": "data.connectorMode.operation.promptName",
+          "type": "zeebe:input"
+        },
+        "condition": {
+          "allMatch": [
+            {
+              "property": "data.connectorMode.operation.type",
+              "equals": "prompts/get",
+              "type": "simple"
+            },
+            {
+              "property": "data.connectorMode.type",
+              "equals": "standalone",
+              "type": "simple"
+            }
+          ]
+        },
+        "type": "String"
+      },
+      {
+        "id": "data.connectorMode.operation.promptArguments",
+        "label": "Prompt arguments",
+        "description": "The arguments to pass to the prompt generation.",
+        "optional": true,
+        "feel": "required",
+        "group": "operation",
+        "binding": {
+          "name": "data.connectorMode.operation.promptArguments",
+          "type": "zeebe:input"
+        },
+        "condition": {
+          "allMatch": [
+            {
+              "property": "data.connectorMode.operation.type",
+              "equals": "prompts/get",
+              "type": "simple"
+            },
+            {
+              "property": "data.connectorMode.type",
+              "equals": "standalone",
+              "type": "simple"
+            }
+          ]
+        },
+        "type": "String"
+      },
+      {
+        "id": "data.connectorMode.standaloneModeMeta",
+        "label": "Metadata",
+        "description": "MCP <code>_meta</code> parameters to be passed to the MCP request.",
+        "optional": true,
+        "feel": "required",
+        "group": "operation",
+        "binding": {
+          "name": "data.connectorMode.meta",
+          "type": "zeebe:input"
+        },
+        "condition": {
+          "property": "data.connectorMode.type",
+          "equals": "standalone",
+          "type": "simple"
+        },
+        "tooltip": "Forwarded unmodified as the <code>_meta</code> field of the MCP request. Required metadata is defined by the MCP server. See the <a href=\"https://modelcontextprotocol.io/specification/2025-11-25/basic/index#_meta\">MCP specification</a> for details.",
+        "type": "String"
+      },
+      {
+        "id": "data.connectorMode.toolOperation.method",
+        "label": "Method",
+        "description": "The MCP method to be called, e.g. <code>tools/list</code>.",
+        "optional": false,
+        "value": "=toolCall.method",
+        "constraints": {
+          "notEmpty": true
+        },
+        "feel": "optional",
+        "group": "operation",
+        "binding": {
+          "name": "data.connectorMode.toolOperation.method",
+          "type": "zeebe:input"
+        },
+        "condition": {
+          "property": "data.connectorMode.type",
+          "equals": "aiAgentTool",
+          "type": "simple"
+        },
+        "tooltip": "The method to be called on the MCP server. See the <a href=\"https://modelcontextprotocol.io/specification/2024-11-05/server\">MCP specification</a> for a list of available methods.<br><br>Currently supported:<br><code>tools/list</code>, <code>tools/call</code>",
+        "type": "String"
+      },
+      {
+        "id": "data.connectorMode.toolOperation.params",
+        "label": "Parameters",
+        "description": "The parameters to be passed to the MCP method.",
+        "optional": true,
+        "value": "=toolCall.params",
+        "feel": "required",
+        "group": "operation",
+        "binding": {
+          "name": "data.connectorMode.toolOperation.params",
+          "type": "zeebe:input"
+        },
+        "condition": {
+          "property": "data.connectorMode.type",
+          "equals": "aiAgentTool",
+          "type": "simple"
+        },
+        "tooltip": "The parameter structure depends on the method being called. See the <a href=\"https://modelcontextprotocol.io/specification/2024-11-05/server/tools#calling-tools\">MCP specification</a> for an example of the parameters for the <code>tools/call</code> method.",
+        "type": "String"
+      },
+      {
+        "id": "data.connectorMode.toolModeMeta",
+        "label": "Metadata",
+        "description": "MCP <code>_meta</code> parameters to be passed to the MCP request.",
+        "optional": true,
+        "feel": "required",
+        "group": "operation",
+        "binding": {
+          "name": "data.connectorMode.meta",
+          "type": "zeebe:input"
+        },
+        "condition": {
+          "property": "data.connectorMode.type",
+          "equals": "aiAgentTool",
+          "type": "simple"
+        },
+        "tooltip": "Forwarded unmodified as the <code>_meta</code> field of the MCP request. Required metadata is defined by the MCP server. See the <a href=\"https://modelcontextprotocol.io/specification/2025-11-25/basic/index#_meta\">MCP specification</a> for details.",
+        "type": "String"
+      },
+      {
+        "id": "data.connectorMode.standaloneModeFilters.tools.included",
+        "label": "Included tools",
+        "description": "List of tools that can be used by the MCP client. By default, all tools are allowed.",
+        "optional": true,
+        "feel": "required",
+        "group": "filters",
+        "binding": {
+          "name": "data.connectorMode.standaloneModeFilters.tools.included",
+          "type": "zeebe:input"
+        },
+        "condition": {
+          "allMatch": [
+            {
+              "property": "data.connectorMode.operation.type",
+              "oneOf": ["tools/call", "tools/list"],
+              "type": "simple"
+            },
+            {
+              "property": "data.connectorMode.type",
+              "equals": "standalone",
+              "type": "simple"
+            }
+          ]
+        },
+        "type": "Text"
+      },
+      {
+        "id": "data.connectorMode.standaloneModeFilters.tools.excluded",
+        "label": "Excluded tools",
+        "description": "List of tools that are not allowed to be used by the MCP client. Will override any included tools.",
+        "optional": true,
+        "feel": "required",
+        "group": "filters",
+        "binding": {
+          "name": "data.connectorMode.standaloneModeFilters.tools.excluded",
+          "type": "zeebe:input"
+        },
+        "condition": {
+          "allMatch": [
+            {
+              "property": "data.connectorMode.operation.type",
+              "oneOf": ["tools/call", "tools/list"],
+              "type": "simple"
+            },
+            {
+              "property": "data.connectorMode.type",
+              "equals": "standalone",
+              "type": "simple"
+            }
+          ]
+        },
+        "type": "Text"
+      },
+      {
+        "id": "data.connectorMode.standaloneModeFilters.resources.included",
+        "label": "Included resources",
+        "description": "List of resources that can be accessed by the MCP client. By default, all resources are allowed.",
+        "optional": true,
+        "feel": "required",
+        "group": "filters",
+        "binding": {
+          "name": "data.connectorMode.standaloneModeFilters.resources.included",
+          "type": "zeebe:input"
+        },
+        "condition": {
+          "allMatch": [
+            {
+              "property": "data.connectorMode.operation.type",
+              "oneOf": [
+                "resources/read",
+                "resources/list",
+                "resources/templates/list"
+              ],
+              "type": "simple"
+            },
+            {
+              "property": "data.connectorMode.type",
+              "equals": "standalone",
+              "type": "simple"
+            }
+          ]
+        },
+        "type": "Text"
+      },
+      {
+        "id": "data.connectorMode.standaloneModeFilters.resources.excluded",
+        "label": "Excluded resources",
+        "description": "List of resources that are not allowed to be accessed by the MCP client. Will override any included resources.",
+        "optional": true,
+        "feel": "required",
+        "group": "filters",
+        "binding": {
+          "name": "data.connectorMode.standaloneModeFilters.resources.excluded",
+          "type": "zeebe:input"
+        },
+        "condition": {
+          "allMatch": [
+            {
+              "property": "data.connectorMode.operation.type",
+              "oneOf": [
+                "resources/read",
+                "resources/list",
+                "resources/templates/list"
+              ],
+              "type": "simple"
+            },
+            {
+              "property": "data.connectorMode.type",
+              "equals": "standalone",
+              "type": "simple"
+            }
+          ]
+        },
+        "type": "Text"
+      },
+      {
+        "id": "data.connectorMode.standaloneModeFilters.prompts.included",
+        "label": "Included prompts",
+        "description": "List of prompts that can be accessed by the MCP client. By default, all prompts are allowed.",
+        "optional": true,
+        "feel": "required",
+        "group": "filters",
+        "binding": {
+          "name": "data.connectorMode.standaloneModeFilters.prompts.included",
+          "type": "zeebe:input"
+        },
+        "condition": {
+          "allMatch": [
+            {
+              "property": "data.connectorMode.operation.type",
+              "oneOf": ["prompts/get", "prompts/list"],
+              "type": "simple"
+            },
+            {
+              "property": "data.connectorMode.type",
+              "equals": "standalone",
+              "type": "simple"
+            }
+          ]
+        },
+        "type": "Text"
+      },
+      {
+        "id": "data.connectorMode.standaloneModeFilters.prompts.excluded",
+        "label": "Excluded prompts",
+        "description": "List of prompts that are not allowed to be accessed by the MCP client. Will override any included prompts.",
+        "optional": true,
+        "feel": "required",
+        "group": "filters",
+        "binding": {
+          "name": "data.connectorMode.standaloneModeFilters.prompts.excluded",
+          "type": "zeebe:input"
+        },
+        "condition": {
+          "allMatch": [
+            {
+              "property": "data.connectorMode.operation.type",
+              "oneOf": ["prompts/get", "prompts/list"],
+              "type": "simple"
+            },
+            {
+              "property": "data.connectorMode.type",
+              "equals": "standalone",
+              "type": "simple"
+            }
+          ]
+        },
+        "type": "Text"
+      },
+      {
+        "id": "data.connectorMode.toolModeFilters.tools.included",
+        "label": "Included tools",
+        "description": "List of tools that can be used by the MCP client. By default, all tools are allowed.",
+        "optional": true,
+        "feel": "required",
+        "group": "filters",
+        "binding": {
+          "name": "data.connectorMode.toolModeFilters.tools.included",
+          "type": "zeebe:input"
+        },
+        "condition": {
+          "property": "data.connectorMode.type",
+          "equals": "aiAgentTool",
+          "type": "simple"
+        },
+        "type": "Text"
+      },
+      {
+        "id": "data.connectorMode.toolModeFilters.tools.excluded",
+        "label": "Excluded tools",
+        "description": "List of tools that are not allowed to be used by the MCP client. Will override any included tools.",
+        "optional": true,
+        "feel": "required",
+        "group": "filters",
+        "binding": {
+          "name": "data.connectorMode.toolModeFilters.tools.excluded",
+          "type": "zeebe:input"
+        },
+        "condition": {
+          "property": "data.connectorMode.type",
+          "equals": "aiAgentTool",
+          "type": "simple"
+        },
+        "type": "Text"
+      },
+      {
+        "id": "version",
+        "label": "Version",
+        "description": "Version of the element template",
+        "value": "3",
+        "group": "connector",
+        "binding": {
+          "key": "elementTemplateVersion",
+          "type": "zeebe:taskHeader"
+        },
+        "type": "Hidden"
+      },
+      {
+        "id": "id",
+        "label": "ID",
+        "description": "ID of the element template",
+        "value": "io.camunda.connectors.agenticai.mcp.remoteclient.v0",
+        "group": "connector",
+        "binding": {
+          "key": "elementTemplateId",
+          "type": "zeebe:taskHeader"
+        },
+        "type": "Hidden"
+      },
+      {
+        "id": "resultVariable",
+        "label": "Result variable",
+        "description": "Name of variable to store the response in. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/use-connectors/#result-variable\" target=\"_blank\">documentation</a>.",
+        "value": "toolCallResult",
+        "group": "output",
+        "binding": {
+          "key": "resultVariable",
+          "type": "zeebe:taskHeader"
+        },
+        "type": "String"
+      },
+      {
+        "id": "resultExpression",
+        "label": "Result expression",
+        "description": "Expression to map the response into process variables. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/use-connectors/#result-expression\" target=\"_blank\">documentation</a>.",
+        "feel": "required",
+        "group": "output",
+        "binding": {
+          "key": "resultExpression",
+          "type": "zeebe:taskHeader"
+        },
+        "type": "Text"
       },
       {
         "id": "errorExpression",
@@ -243,7 +1431,7 @@
         "id": "retryBackoff",
         "label": "Retry backoff",
         "description": "ISO-8601 duration to wait between retries",
-        "value": "PT0S",
+        "value": "PT30S",
         "group": "retries",
         "binding": {
           "key": "retryBackoff",
@@ -258,13 +1446,11 @@
   },
   {
     "$schema": "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
-    "name": "MCP Remote Client (early access)",
+    "name": "MCP Remote Client",
     "id": "io.camunda.connectors.agenticai.mcp.remoteclient.v0",
     "description": "MCP (Model Context Protocol) client, operating on temporary remote connections.",
-    "metadata": {
-      "keywords": []
-    },
-    "version": 1,
+    "documentationRef": "https://docs.camunda.io/docs/8.9/components/connectors/out-of-the-box-connectors/agentic-ai-mcp-remote-client-connector/",
+    "version": 2,
     "category": {
       "id": "aiTools",
       "name": "AI Tools"
@@ -300,8 +1486,8 @@
         "label": "Operation"
       },
       {
-        "id": "tools",
-        "label": "Tools",
+        "id": "filters",
+        "label": "Filters",
         "openByDefault": false
       },
       {
@@ -325,173 +1511,483 @@
       {
         "value": "io.camunda.agenticai:mcpremoteclient:1",
         "binding": {
-          "property": "type",
-          "type": "zeebe:taskDefinition"
+          "property": "type",
+          "type": "zeebe:taskDefinition"
+        },
+        "type": "Hidden"
+      },
+      {
+        "value": "mcpClient",
+        "binding": {
+          "name": "io.camunda.agenticai.gateway.type",
+          "type": "zeebe:property"
+        },
+        "condition": {
+          "property": "data.connectorMode.type",
+          "equals": "aiAgentTool",
+          "type": "simple"
+        },
+        "type": "Hidden"
+      },
+      {
+        "id": "data.transport.type",
+        "label": "Type",
+        "description": "Specify the MCP transport type.",
+        "value": "http",
+        "group": "transport",
+        "binding": {
+          "name": "data.transport.type",
+          "type": "zeebe:input"
+        },
+        "type": "Dropdown",
+        "choices": [
+          {
+            "name": "Streamable HTTP",
+            "value": "http"
+          },
+          {
+            "name": "SSE",
+            "value": "sse"
+          }
+        ]
+      },
+      {
+        "id": "data.transport.http.url",
+        "label": "URL",
+        "description": "URL to connect to the MCP server. Typically ends with <code>/mcp</code>.",
+        "optional": false,
+        "constraints": {
+          "notEmpty": true
+        },
+        "feel": "optional",
+        "group": "transport",
+        "binding": {
+          "name": "data.transport.http.url",
+          "type": "zeebe:input"
+        },
+        "condition": {
+          "property": "data.transport.type",
+          "equals": "http",
+          "type": "simple"
+        },
+        "type": "String"
+      },
+      {
+        "id": "data.transport.http.headers",
+        "label": "HTTP headers",
+        "description": "Map of HTTP headers to add to the request.",
+        "optional": true,
+        "feel": "required",
+        "group": "transport",
+        "binding": {
+          "name": "data.transport.http.headers",
+          "type": "zeebe:input"
+        },
+        "condition": {
+          "property": "data.transport.type",
+          "equals": "http",
+          "type": "simple"
+        },
+        "type": "String"
+      },
+      {
+        "id": "data.transport.http.timeout",
+        "label": "Timeout",
+        "description": "Timeout for individual HTTP requests as ISO-8601 duration (example: <code>PT30S</code>)",
+        "optional": true,
+        "feel": "optional",
+        "group": "transport",
+        "binding": {
+          "name": "data.transport.http.timeout",
+          "type": "zeebe:input"
+        },
+        "condition": {
+          "property": "data.transport.type",
+          "equals": "http",
+          "type": "simple"
+        },
+        "type": "String"
+      },
+      {
+        "id": "data.transport.sse.url",
+        "label": "URL",
+        "description": "URL to connect to the MCP server. Typically ends with <code>/sse</code>.",
+        "optional": false,
+        "constraints": {
+          "notEmpty": true
+        },
+        "feel": "optional",
+        "group": "transport",
+        "binding": {
+          "name": "data.transport.sse.url",
+          "type": "zeebe:input"
+        },
+        "condition": {
+          "property": "data.transport.type",
+          "equals": "sse",
+          "type": "simple"
+        },
+        "type": "String"
+      },
+      {
+        "id": "data.transport.sse.headers",
+        "label": "HTTP headers",
+        "description": "Map of HTTP headers to add to the request.",
+        "optional": true,
+        "feel": "required",
+        "group": "transport",
+        "binding": {
+          "name": "data.transport.sse.headers",
+          "type": "zeebe:input"
         },
-        "type": "Hidden"
+        "condition": {
+          "property": "data.transport.type",
+          "equals": "sse",
+          "type": "simple"
+        },
+        "type": "String"
       },
       {
-        "value": "mcpClient",
+        "id": "data.transport.sse.timeout",
+        "label": "Timeout",
+        "description": "Timeout for individual HTTP requests as ISO-8601 duration (example: <code>PT30S</code>)",
+        "optional": true,
+        "feel": "optional",
+        "group": "transport",
         "binding": {
-          "name": "io.camunda.agenticai.gateway.type",
-          "type": "zeebe:property"
+          "name": "data.transport.sse.timeout",
+          "type": "zeebe:input"
         },
         "condition": {
-          "property": "data.connectorMode.type",
-          "equals": "aiAgentTool",
+          "property": "data.transport.type",
+          "equals": "sse",
           "type": "simple"
         },
-        "type": "Hidden"
+        "type": "String"
       },
       {
-        "id": "data.transport.type",
+        "id": "data.transport.http.authentication.type",
         "label": "Type",
-        "description": "Specify the MCP transport type.",
-        "value": "http",
-        "group": "transport",
+        "description": "Choose the authentication type. Select 'None' if no authentication is necessary",
+        "value": "noAuth",
+        "group": "authentication",
         "binding": {
-          "name": "data.transport.type",
+          "name": "data.transport.http.authentication.type",
           "type": "zeebe:input"
         },
+        "condition": {
+          "property": "data.transport.type",
+          "equals": "http",
+          "type": "simple"
+        },
         "type": "Dropdown",
         "choices": [
           {
-            "name": "Streamable HTTP",
-            "value": "http"
+            "name": "None",
+            "value": "noAuth"
           },
           {
-            "name": "SSE",
-            "value": "sse"
+            "name": "Basic",
+            "value": "basic"
+          },
+          {
+            "name": "Bearer token",
+            "value": "bearer"
+          },
+          {
+            "name": "OAuth 2.0",
+            "value": "oauth-client-credentials-flow"
           }
         ]
       },
       {
-        "id": "data.transport.http.url",
-        "label": "URL",
-        "description": "URL to connect to the MCP server. Typically ends with <code>/mcp</code>.",
+        "id": "data.transport.http.authentication.username",
+        "label": "Username",
         "optional": false,
         "constraints": {
           "notEmpty": true
         },
         "feel": "optional",
-        "group": "transport",
+        "group": "authentication",
         "binding": {
-          "name": "data.transport.http.url",
+          "name": "data.transport.http.authentication.username",
           "type": "zeebe:input"
         },
         "condition": {
-          "property": "data.transport.type",
-          "equals": "http",
-          "type": "simple"
+          "allMatch": [
+            {
+              "property": "data.transport.http.authentication.type",
+              "equals": "basic",
+              "type": "simple"
+            },
+            {
+              "property": "data.transport.type",
+              "equals": "http",
+              "type": "simple"
+            }
+          ]
         },
         "type": "String"
       },
       {
-        "id": "data.transport.http.headers",
-        "label": "HTTP headers",
-        "description": "Map of HTTP headers to add to the request.",
-        "optional": true,
-        "feel": "required",
-        "group": "transport",
+        "id": "data.transport.http.authentication.password",
+        "label": "Password",
+        "optional": false,
+        "constraints": {
+          "notEmpty": true
+        },
+        "feel": "optional",
+        "group": "authentication",
         "binding": {
-          "name": "data.transport.http.headers",
+          "name": "data.transport.http.authentication.password",
           "type": "zeebe:input"
         },
         "condition": {
-          "property": "data.transport.type",
-          "equals": "http",
-          "type": "simple"
+          "allMatch": [
+            {
+              "property": "data.transport.http.authentication.type",
+              "equals": "basic",
+              "type": "simple"
+            },
+            {
+              "property": "data.transport.type",
+              "equals": "http",
+              "type": "simple"
+            }
+          ]
         },
         "type": "String"
       },
       {
-        "id": "data.transport.http.timeout",
-        "label": "Timeout",
-        "description": "Timeout for individual HTTP requests as ISO-8601 duration (example: <code>PT30S</code>)",
-        "optional": true,
+        "id": "data.transport.http.authentication.token",
+        "label": "Bearer token",
+        "optional": false,
+        "constraints": {
+          "notEmpty": true
+        },
         "feel": "optional",
-        "group": "transport",
+        "group": "authentication",
         "binding": {
-          "name": "data.transport.http.timeout",
+          "name": "data.transport.http.authentication.token",
           "type": "zeebe:input"
         },
         "condition": {
-          "property": "data.transport.type",
-          "equals": "http",
-          "type": "simple"
+          "allMatch": [
+            {
+              "property": "data.transport.http.authentication.type",
+              "equals": "bearer",
+              "type": "simple"
+            },
+            {
+              "property": "data.transport.type",
+              "equals": "http",
+              "type": "simple"
+            }
+          ]
         },
         "type": "String"
       },
       {
-        "id": "data.transport.sse.url",
-        "label": "URL",
-        "description": "URL to connect to the MCP server. Typically ends with <code>/sse</code>.",
+        "id": "data.transport.http.authentication.oauthTokenEndpoint",
+        "label": "OAuth 2.0 token endpoint",
+        "description": "The OAuth token endpoint",
+        "optional": false,
+        "constraints": {
+          "notEmpty": true,
+          "pattern": {
+            "value": "^(=|(http://|https://|secrets|\\{\\{).*$)",
+            "message": "Must be a http(s) URL"
+          }
+        },
+        "feel": "optional",
+        "group": "authentication",
+        "binding": {
+          "name": "data.transport.http.authentication.oauthTokenEndpoint",
+          "type": "zeebe:input"
+        },
+        "condition": {
+          "allMatch": [
+            {
+              "property": "data.transport.http.authentication.type",
+              "equals": "oauth-client-credentials-flow",
+              "type": "simple"
+            },
+            {
+              "property": "data.transport.type",
+              "equals": "http",
+              "type": "simple"
+            }
+          ]
+        },
+        "type": "String"
+      },
+      {
+        "id": "data.transport.http.authentication.clientId",
+        "label": "Client ID",
+        "description": "Your application's client ID from the OAuth client",
         "optional": false,
         "constraints": {
           "notEmpty": true
         },
         "feel": "optional",
-        "group": "transport",
+        "group": "authentication",
         "binding": {
-          "name": "data.transport.sse.url",
+          "name": "data.transport.http.authentication.clientId",
           "type": "zeebe:input"
         },
         "condition": {
-          "property": "data.transport.type",
-          "equals": "sse",
-          "type": "simple"
+          "allMatch": [
+            {
+              "property": "data.transport.http.authentication.type",
+              "equals": "oauth-client-credentials-flow",
+              "type": "simple"
+            },
+            {
+              "property": "data.transport.type",
+              "equals": "http",
+              "type": "simple"
+            }
+          ]
+        },
+        "type": "String"
+      },
+      {
+        "id": "data.transport.http.authentication.clientSecret",
+        "label": "Client secret",
+        "description": "Your application's client secret from the OAuth client",
+        "optional": false,
+        "constraints": {
+          "notEmpty": true
+        },
+        "feel": "optional",
+        "group": "authentication",
+        "binding": {
+          "name": "data.transport.http.authentication.clientSecret",
+          "type": "zeebe:input"
+        },
+        "condition": {
+          "allMatch": [
+            {
+              "property": "data.transport.http.authentication.type",
+              "equals": "oauth-client-credentials-flow",
+              "type": "simple"
+            },
+            {
+              "property": "data.transport.type",
+              "equals": "http",
+              "type": "simple"
+            }
+          ]
+        },
+        "type": "String"
+      },
+      {
+        "id": "data.transport.http.authentication.audience",
+        "label": "Audience",
+        "description": "The unique identifier of the target API you want to access",
+        "optional": true,
+        "feel": "optional",
+        "group": "authentication",
+        "binding": {
+          "name": "data.transport.http.authentication.audience",
+          "type": "zeebe:input"
+        },
+        "condition": {
+          "allMatch": [
+            {
+              "property": "data.transport.http.authentication.type",
+              "equals": "oauth-client-credentials-flow",
+              "type": "simple"
+            },
+            {
+              "property": "data.transport.type",
+              "equals": "http",
+              "type": "simple"
+            }
+          ]
         },
         "type": "String"
       },
       {
-        "id": "data.transport.sse.headers",
-        "label": "HTTP headers",
-        "description": "Map of HTTP headers to add to the request.",
-        "optional": true,
-        "feel": "required",
-        "group": "transport",
+        "id": "data.transport.http.authentication.clientAuthentication",
+        "label": "Client authentication",
+        "description": "Send client ID and client secret as Basic Auth request in the header, or as client credentials in the request body",
+        "optional": false,
+        "value": "BASIC_AUTH_HEADER",
+        "constraints": {
+          "notEmpty": true
+        },
+        "group": "authentication",
         "binding": {
-          "name": "data.transport.sse.headers",
+          "name": "data.transport.http.authentication.clientAuthentication",
           "type": "zeebe:input"
         },
         "condition": {
-          "property": "data.transport.type",
-          "equals": "sse",
-          "type": "simple"
+          "allMatch": [
+            {
+              "property": "data.transport.http.authentication.type",
+              "equals": "oauth-client-credentials-flow",
+              "type": "simple"
+            },
+            {
+              "property": "data.transport.type",
+              "equals": "http",
+              "type": "simple"
+            }
+          ]
         },
-        "type": "String"
+        "type": "Dropdown",
+        "choices": [
+          {
+            "name": "Send as Basic Auth header",
+            "value": "BASIC_AUTH_HEADER"
+          },
+          {
+            "name": "Send client credentials in body",
+            "value": "CREDENTIALS_BODY"
+          }
+        ]
       },
       {
-        "id": "data.transport.sse.timeout",
-        "label": "Timeout",
-        "description": "Timeout for individual HTTP requests as ISO-8601 duration (example: <code>PT30S</code>)",
+        "id": "data.transport.http.authentication.scopes",
+        "label": "Scopes",
+        "description": "The scopes which you want to request authorization for (e.g.read:contacts)",
         "optional": true,
         "feel": "optional",
-        "group": "transport",
+        "group": "authentication",
         "binding": {
-          "name": "data.transport.sse.timeout",
+          "name": "data.transport.http.authentication.scopes",
           "type": "zeebe:input"
         },
         "condition": {
-          "property": "data.transport.type",
-          "equals": "sse",
-          "type": "simple"
+          "allMatch": [
+            {
+              "property": "data.transport.http.authentication.type",
+              "equals": "oauth-client-credentials-flow",
+              "type": "simple"
+            },
+            {
+              "property": "data.transport.type",
+              "equals": "http",
+              "type": "simple"
+            }
+          ]
         },
         "type": "String"
       },
       {
-        "id": "data.transport.http.authentication.type",
+        "id": "data.transport.sse.authentication.type",
         "label": "Type",
         "description": "Choose the authentication type. Select 'None' if no authentication is necessary",
         "value": "noAuth",
         "group": "authentication",
         "binding": {
-          "name": "data.transport.http.authentication.type",
+          "name": "data.transport.sse.authentication.type",
           "type": "zeebe:input"
         },
         "condition": {
           "property": "data.transport.type",
-          "equals": "http",
+          "equals": "sse",
           "type": "simple"
         },
         "type": "Dropdown",
@@ -515,7 +2011,7 @@
         ]
       },
       {
-        "id": "data.transport.http.authentication.username",
+        "id": "data.transport.sse.authentication.username",
         "label": "Username",
         "optional": false,
         "constraints": {
@@ -524,19 +2020,19 @@
         "feel": "optional",
         "group": "authentication",
         "binding": {
-          "name": "data.transport.http.authentication.username",
+          "name": "data.transport.sse.authentication.username",
           "type": "zeebe:input"
         },
         "condition": {
           "allMatch": [
             {
-              "property": "data.transport.http.authentication.type",
+              "property": "data.transport.sse.authentication.type",
               "equals": "basic",
               "type": "simple"
             },
             {
               "property": "data.transport.type",
-              "equals": "http",
+              "equals": "sse",
               "type": "simple"
             }
           ]
@@ -544,7 +2040,7 @@
         "type": "String"
       },
       {
-        "id": "data.transport.http.authentication.password",
+        "id": "data.transport.sse.authentication.password",
         "label": "Password",
         "optional": false,
         "constraints": {
@@ -553,19 +2049,19 @@
         "feel": "optional",
         "group": "authentication",
         "binding": {
-          "name": "data.transport.http.authentication.password",
+          "name": "data.transport.sse.authentication.password",
           "type": "zeebe:input"
         },
         "condition": {
           "allMatch": [
             {
-              "property": "data.transport.http.authentication.type",
+              "property": "data.transport.sse.authentication.type",
               "equals": "basic",
               "type": "simple"
             },
             {
               "property": "data.transport.type",
-              "equals": "http",
+              "equals": "sse",
               "type": "simple"
             }
           ]
@@ -573,7 +2069,7 @@
         "type": "String"
       },
       {
-        "id": "data.transport.http.authentication.token",
+        "id": "data.transport.sse.authentication.token",
         "label": "Bearer token",
         "optional": false,
         "constraints": {
@@ -582,19 +2078,19 @@
         "feel": "optional",
         "group": "authentication",
         "binding": {
-          "name": "data.transport.http.authentication.token",
+          "name": "data.transport.sse.authentication.token",
           "type": "zeebe:input"
         },
         "condition": {
           "allMatch": [
             {
-              "property": "data.transport.http.authentication.type",
+              "property": "data.transport.sse.authentication.type",
               "equals": "bearer",
               "type": "simple"
             },
             {
               "property": "data.transport.type",
-              "equals": "http",
+              "equals": "sse",
               "type": "simple"
             }
           ]
@@ -602,7 +2098,7 @@
         "type": "String"
       },
       {
-        "id": "data.transport.http.authentication.oauthTokenEndpoint",
+        "id": "data.transport.sse.authentication.oauthTokenEndpoint",
         "label": "OAuth 2.0 token endpoint",
         "description": "The OAuth token endpoint",
         "optional": false,
@@ -616,19 +2112,19 @@
         "feel": "optional",
         "group": "authentication",
         "binding": {
-          "name": "data.transport.http.authentication.oauthTokenEndpoint",
+          "name": "data.transport.sse.authentication.oauthTokenEndpoint",
           "type": "zeebe:input"
         },
         "condition": {
           "allMatch": [
             {
-              "property": "data.transport.http.authentication.type",
+              "property": "data.transport.sse.authentication.type",
               "equals": "oauth-client-credentials-flow",
               "type": "simple"
             },
             {
               "property": "data.transport.type",
-              "equals": "http",
+              "equals": "sse",
               "type": "simple"
             }
           ]
@@ -636,7 +2132,7 @@
         "type": "String"
       },
       {
-        "id": "data.transport.http.authentication.clientId",
+        "id": "data.transport.sse.authentication.clientId",
         "label": "Client ID",
         "description": "Your application's client ID from the OAuth client",
         "optional": false,
@@ -646,19 +2142,19 @@
         "feel": "optional",
         "group": "authentication",
         "binding": {
-          "name": "data.transport.http.authentication.clientId",
+          "name": "data.transport.sse.authentication.clientId",
           "type": "zeebe:input"
         },
         "condition": {
           "allMatch": [
             {
-              "property": "data.transport.http.authentication.type",
+              "property": "data.transport.sse.authentication.type",
               "equals": "oauth-client-credentials-flow",
               "type": "simple"
             },
             {
               "property": "data.transport.type",
-              "equals": "http",
+              "equals": "sse",
               "type": "simple"
             }
           ]
@@ -666,7 +2162,7 @@
         "type": "String"
       },
       {
-        "id": "data.transport.http.authentication.clientSecret",
+        "id": "data.transport.sse.authentication.clientSecret",
         "label": "Client secret",
         "description": "Your application's client secret from the OAuth client",
         "optional": false,
@@ -676,19 +2172,19 @@
         "feel": "optional",
         "group": "authentication",
         "binding": {
-          "name": "data.transport.http.authentication.clientSecret",
+          "name": "data.transport.sse.authentication.clientSecret",
           "type": "zeebe:input"
         },
         "condition": {
           "allMatch": [
             {
-              "property": "data.transport.http.authentication.type",
+              "property": "data.transport.sse.authentication.type",
               "equals": "oauth-client-credentials-flow",
               "type": "simple"
             },
             {
               "property": "data.transport.type",
-              "equals": "http",
+              "equals": "sse",
               "type": "simple"
             }
           ]
@@ -696,26 +2192,26 @@
         "type": "String"
       },
       {
-        "id": "data.transport.http.authentication.audience",
+        "id": "data.transport.sse.authentication.audience",
         "label": "Audience",
         "description": "The unique identifier of the target API you want to access",
         "optional": true,
         "feel": "optional",
         "group": "authentication",
         "binding": {
-          "name": "data.transport.http.authentication.audience",
+          "name": "data.transport.sse.authentication.audience",
           "type": "zeebe:input"
         },
         "condition": {
           "allMatch": [
             {
-              "property": "data.transport.http.authentication.type",
+              "property": "data.transport.sse.authentication.type",
               "equals": "oauth-client-credentials-flow",
               "type": "simple"
             },
             {
               "property": "data.transport.type",
-              "equals": "http",
+              "equals": "sse",
               "type": "simple"
             }
           ]
@@ -723,7 +2219,7 @@
         "type": "String"
       },
       {
-        "id": "data.transport.http.authentication.clientAuthentication",
+        "id": "data.transport.sse.authentication.clientAuthentication",
         "label": "Client authentication",
         "description": "Send client ID and client secret as Basic Auth request in the header, or as client credentials in the request body",
         "optional": false,
@@ -733,19 +2229,19 @@
         },
         "group": "authentication",
         "binding": {
-          "name": "data.transport.http.authentication.clientAuthentication",
+          "name": "data.transport.sse.authentication.clientAuthentication",
           "type": "zeebe:input"
         },
         "condition": {
           "allMatch": [
             {
-              "property": "data.transport.http.authentication.type",
+              "property": "data.transport.sse.authentication.type",
               "equals": "oauth-client-credentials-flow",
               "type": "simple"
             },
             {
               "property": "data.transport.type",
-              "equals": "http",
+              "equals": "sse",
               "type": "simple"
             }
           ]
@@ -763,26 +2259,26 @@
         ]
       },
       {
-        "id": "data.transport.http.authentication.scopes",
+        "id": "data.transport.sse.authentication.scopes",
         "label": "Scopes",
         "description": "The scopes which you want to request authorization for (e.g.read:contacts)",
         "optional": true,
         "feel": "optional",
         "group": "authentication",
         "binding": {
-          "name": "data.transport.http.authentication.scopes",
+          "name": "data.transport.sse.authentication.scopes",
           "type": "zeebe:input"
         },
         "condition": {
           "allMatch": [
             {
-              "property": "data.transport.http.authentication.type",
+              "property": "data.transport.sse.authentication.type",
               "equals": "oauth-client-credentials-flow",
               "type": "simple"
             },
             {
               "property": "data.transport.type",
-              "equals": "http",
+              "equals": "sse",
               "type": "simple"
             }
           ]
@@ -790,63 +2286,139 @@
         "type": "String"
       },
       {
-        "id": "data.transport.sse.authentication.type",
-        "label": "Type",
-        "description": "Choose the authentication type. Select 'None' if no authentication is necessary",
-        "value": "noAuth",
-        "group": "authentication",
+        "id": "data.options.clientCache",
+        "label": "Enable client caching",
+        "description": "If enabled, the MCP client instance is cached on the connector runtime and reused across requests.",
+        "optional": true,
+        "feel": "static",
+        "group": "options",
         "binding": {
-          "name": "data.transport.sse.authentication.type",
+          "name": "data.options.clientCache",
+          "type": "zeebe:input"
+        },
+        "tooltip": "Only enable this option if you are sure that the configuration or authentication details of this client will not change between invocations.<br>Caching the client instance can improve performance by reusing existing connections.",
+        "type": "Boolean"
+      },
+      {
+        "id": "data.connectorMode.type",
+        "label": "Connector mode",
+        "description": "Select how this connector is used.",
+        "value": "aiAgentTool",
+        "group": "connectorMode",
+        "binding": {
+          "name": "data.connectorMode.type",
+          "type": "zeebe:input"
+        },
+        "type": "Dropdown",
+        "choices": [
+          {
+            "name": "Standalone",
+            "value": "standalone"
+          },
+          {
+            "name": "AI Agent tool",
+            "value": "aiAgentTool"
+          }
+        ]
+      },
+      {
+        "id": "data.connectorMode.operation.type",
+        "label": "Operation",
+        "description": "The type of operation to perform.",
+        "value": "tools/list",
+        "group": "operation",
+        "binding": {
+          "name": "data.connectorMode.operation.type",
           "type": "zeebe:input"
         },
         "condition": {
-          "property": "data.transport.type",
-          "equals": "sse",
+          "property": "data.connectorMode.type",
+          "equals": "standalone",
           "type": "simple"
         },
         "type": "Dropdown",
         "choices": [
           {
-            "name": "None",
-            "value": "noAuth"
+            "name": "List Tools",
+            "value": "tools/list"
           },
           {
-            "name": "Basic",
-            "value": "basic"
+            "name": "Call Tool",
+            "value": "tools/call"
           },
           {
-            "name": "Bearer token",
-            "value": "bearer"
+            "name": "List Resources",
+            "value": "resources/list"
           },
           {
-            "name": "OAuth 2.0",
-            "value": "oauth-client-credentials-flow"
+            "name": "List Resource Templates",
+            "value": "resources/templates/list"
+          },
+          {
+            "name": "Read Resource",
+            "value": "resources/read"
+          },
+          {
+            "name": "List Prompts",
+            "value": "prompts/list"
+          },
+          {
+            "name": "Get Prompt",
+            "value": "prompts/get"
           }
         ]
       },
       {
-        "id": "data.transport.sse.authentication.username",
-        "label": "Username",
-        "optional": false,
-        "constraints": {
-          "notEmpty": true
-        },
-        "feel": "optional",
-        "group": "authentication",
+        "id": "data.connectorMode.operation.toolName",
+        "label": "Tool name",
+        "description": "The name of the tool to call.",
+        "optional": false,
+        "constraints": {
+          "notEmpty": true
+        },
+        "feel": "optional",
+        "group": "operation",
+        "binding": {
+          "name": "data.connectorMode.operation.toolName",
+          "type": "zeebe:input"
+        },
+        "condition": {
+          "allMatch": [
+            {
+              "property": "data.connectorMode.operation.type",
+              "equals": "tools/call",
+              "type": "simple"
+            },
+            {
+              "property": "data.connectorMode.type",
+              "equals": "standalone",
+              "type": "simple"
+            }
+          ]
+        },
+        "type": "String"
+      },
+      {
+        "id": "data.connectorMode.operation.toolArguments",
+        "label": "Tool arguments",
+        "description": "The arguments to pass to the tool.",
+        "optional": true,
+        "feel": "required",
+        "group": "operation",
         "binding": {
-          "name": "data.transport.sse.authentication.username",
+          "name": "data.connectorMode.operation.toolArguments",
           "type": "zeebe:input"
         },
         "condition": {
           "allMatch": [
             {
-              "property": "data.transport.sse.authentication.type",
-              "equals": "basic",
+              "property": "data.connectorMode.operation.type",
+              "equals": "tools/call",
               "type": "simple"
             },
             {
-              "property": "data.transport.type",
-              "equals": "sse",
+              "property": "data.connectorMode.type",
+              "equals": "standalone",
               "type": "simple"
             }
           ]
@@ -854,28 +2426,29 @@
         "type": "String"
       },
       {
-        "id": "data.transport.sse.authentication.password",
-        "label": "Password",
+        "id": "data.connectorMode.operation.resourceUri",
+        "label": "Resource URI",
+        "description": "The URI of the resource to read.",
         "optional": false,
         "constraints": {
           "notEmpty": true
         },
         "feel": "optional",
-        "group": "authentication",
+        "group": "operation",
         "binding": {
-          "name": "data.transport.sse.authentication.password",
+          "name": "data.connectorMode.operation.resourceUri",
           "type": "zeebe:input"
         },
         "condition": {
           "allMatch": [
             {
-              "property": "data.transport.sse.authentication.type",
-              "equals": "basic",
+              "property": "data.connectorMode.operation.type",
+              "equals": "resources/read",
               "type": "simple"
             },
             {
-              "property": "data.transport.type",
-              "equals": "sse",
+              "property": "data.connectorMode.type",
+              "equals": "standalone",
               "type": "simple"
             }
           ]
@@ -883,28 +2456,29 @@
         "type": "String"
       },
       {
-        "id": "data.transport.sse.authentication.token",
-        "label": "Bearer token",
+        "id": "data.connectorMode.operation.promptName",
+        "label": "Prompt name",
+        "description": "The name of the prompt to get.",
         "optional": false,
         "constraints": {
           "notEmpty": true
         },
         "feel": "optional",
-        "group": "authentication",
+        "group": "operation",
         "binding": {
-          "name": "data.transport.sse.authentication.token",
+          "name": "data.connectorMode.operation.promptName",
           "type": "zeebe:input"
         },
         "condition": {
           "allMatch": [
             {
-              "property": "data.transport.sse.authentication.type",
-              "equals": "bearer",
+              "property": "data.connectorMode.operation.type",
+              "equals": "prompts/get",
               "type": "simple"
             },
             {
-              "property": "data.transport.type",
-              "equals": "sse",
+              "property": "data.connectorMode.type",
+              "equals": "standalone",
               "type": "simple"
             }
           ]
@@ -912,33 +2486,26 @@
         "type": "String"
       },
       {
-        "id": "data.transport.sse.authentication.oauthTokenEndpoint",
-        "label": "OAuth 2.0 token endpoint",
-        "description": "The OAuth token endpoint",
-        "optional": false,
-        "constraints": {
-          "notEmpty": true,
-          "pattern": {
-            "value": "^(=|(http://|https://|secrets|\\{\\{).*$)",
-            "message": "Must be a http(s) URL"
-          }
-        },
-        "feel": "optional",
-        "group": "authentication",
+        "id": "data.connectorMode.operation.promptArguments",
+        "label": "Prompt arguments",
+        "description": "The arguments to pass to the prompt generation.",
+        "optional": true,
+        "feel": "required",
+        "group": "operation",
         "binding": {
-          "name": "data.transport.sse.authentication.oauthTokenEndpoint",
+          "name": "data.connectorMode.operation.promptArguments",
           "type": "zeebe:input"
         },
         "condition": {
           "allMatch": [
             {
-              "property": "data.transport.sse.authentication.type",
-              "equals": "oauth-client-credentials-flow",
+              "property": "data.connectorMode.operation.type",
+              "equals": "prompts/get",
               "type": "simple"
             },
             {
-              "property": "data.transport.type",
-              "equals": "sse",
+              "property": "data.connectorMode.type",
+              "equals": "standalone",
               "type": "simple"
             }
           ]
@@ -946,321 +2513,451 @@
         "type": "String"
       },
       {
-        "id": "data.transport.sse.authentication.clientId",
-        "label": "Client ID",
-        "description": "Your application's client ID from the OAuth client",
+        "id": "data.connectorMode.toolOperation.method",
+        "label": "Method",
+        "description": "The MCP method to be called, e.g. <code>tools/list</code>.",
         "optional": false,
+        "value": "=toolCall.method",
         "constraints": {
           "notEmpty": true
         },
         "feel": "optional",
-        "group": "authentication",
+        "group": "operation",
         "binding": {
-          "name": "data.transport.sse.authentication.clientId",
+          "name": "data.connectorMode.toolOperation.method",
+          "type": "zeebe:input"
+        },
+        "condition": {
+          "property": "data.connectorMode.type",
+          "equals": "aiAgentTool",
+          "type": "simple"
+        },
+        "tooltip": "The method to be called on the MCP server. See the <a href=\"https://modelcontextprotocol.io/specification/2024-11-05/server\">MCP specification</a> for a list of available methods.<br><br>Currently supported:<br><code>tools/list</code>, <code>tools/call</code>",
+        "type": "String"
+      },
+      {
+        "id": "data.connectorMode.toolOperation.params",
+        "label": "Parameters",
+        "description": "The parameters to be passed to the MCP method.",
+        "optional": true,
+        "value": "=toolCall.params",
+        "feel": "required",
+        "group": "operation",
+        "binding": {
+          "name": "data.connectorMode.toolOperation.params",
+          "type": "zeebe:input"
+        },
+        "condition": {
+          "property": "data.connectorMode.type",
+          "equals": "aiAgentTool",
+          "type": "simple"
+        },
+        "tooltip": "The parameter structure depends on the method being called. See the <a href=\"https://modelcontextprotocol.io/specification/2024-11-05/server/tools#calling-tools\">MCP specification</a> for an example of the parameters for the <code>tools/call</code> method.",
+        "type": "String"
+      },
+      {
+        "id": "data.connectorMode.standaloneModeFilters.tools.included",
+        "label": "Included tools",
+        "description": "List of tools that can be used by the MCP client. By default, all tools are allowed.",
+        "optional": true,
+        "feel": "required",
+        "group": "filters",
+        "binding": {
+          "name": "data.connectorMode.standaloneModeFilters.tools.included",
           "type": "zeebe:input"
         },
         "condition": {
           "allMatch": [
             {
-              "property": "data.transport.sse.authentication.type",
-              "equals": "oauth-client-credentials-flow",
+              "property": "data.connectorMode.operation.type",
+              "oneOf": ["tools/call", "tools/list"],
               "type": "simple"
             },
             {
-              "property": "data.transport.type",
-              "equals": "sse",
+              "property": "data.connectorMode.type",
+              "equals": "standalone",
               "type": "simple"
             }
           ]
         },
-        "type": "String"
+        "type": "Text"
       },
       {
-        "id": "data.transport.sse.authentication.clientSecret",
-        "label": "Client secret",
-        "description": "Your application's client secret from the OAuth client",
-        "optional": false,
-        "constraints": {
-          "notEmpty": true
-        },
-        "feel": "optional",
-        "group": "authentication",
+        "id": "data.connectorMode.standaloneModeFilters.tools.excluded",
+        "label": "Excluded tools",
+        "description": "List of tools that are not allowed to be used by the MCP client. Will override any included tools.",
+        "optional": true,
+        "feel": "required",
+        "group": "filters",
         "binding": {
-          "name": "data.transport.sse.authentication.clientSecret",
+          "name": "data.connectorMode.standaloneModeFilters.tools.excluded",
           "type": "zeebe:input"
         },
         "condition": {
           "allMatch": [
             {
-              "property": "data.transport.sse.authentication.type",
-              "equals": "oauth-client-credentials-flow",
+              "property": "data.connectorMode.operation.type",
+              "oneOf": ["tools/call", "tools/list"],
               "type": "simple"
             },
             {
-              "property": "data.transport.type",
-              "equals": "sse",
+              "property": "data.connectorMode.type",
+              "equals": "standalone",
               "type": "simple"
             }
           ]
         },
-        "type": "String"
+        "type": "Text"
       },
       {
-        "id": "data.transport.sse.authentication.audience",
-        "label": "Audience",
-        "description": "The unique identifier of the target API you want to access",
+        "id": "data.connectorMode.standaloneModeFilters.resources.included",
+        "label": "Included resources",
+        "description": "List of resources that can be accessed by the MCP client. By default, all resources are allowed.",
         "optional": true,
-        "feel": "optional",
-        "group": "authentication",
+        "feel": "required",
+        "group": "filters",
         "binding": {
-          "name": "data.transport.sse.authentication.audience",
+          "name": "data.connectorMode.standaloneModeFilters.resources.included",
           "type": "zeebe:input"
         },
         "condition": {
           "allMatch": [
             {
-              "property": "data.transport.sse.authentication.type",
-              "equals": "oauth-client-credentials-flow",
+              "property": "data.connectorMode.operation.type",
+              "oneOf": [
+                "resources/read",
+                "resources/list",
+                "resources/templates/list"
+              ],
               "type": "simple"
             },
             {
-              "property": "data.transport.type",
-              "equals": "sse",
+              "property": "data.connectorMode.type",
+              "equals": "standalone",
               "type": "simple"
             }
           ]
         },
-        "type": "String"
+        "type": "Text"
       },
       {
-        "id": "data.transport.sse.authentication.clientAuthentication",
-        "label": "Client authentication",
-        "description": "Send client ID and client secret as Basic Auth request in the header, or as client credentials in the request body",
-        "optional": false,
-        "value": "BASIC_AUTH_HEADER",
-        "constraints": {
-          "notEmpty": true
-        },
-        "group": "authentication",
+        "id": "data.connectorMode.standaloneModeFilters.resources.excluded",
+        "label": "Excluded resources",
+        "description": "List of resources that are not allowed to be accessed by the MCP client. Will override any included resources.",
+        "optional": true,
+        "feel": "required",
+        "group": "filters",
         "binding": {
-          "name": "data.transport.sse.authentication.clientAuthentication",
+          "name": "data.connectorMode.standaloneModeFilters.resources.excluded",
           "type": "zeebe:input"
         },
         "condition": {
           "allMatch": [
             {
-              "property": "data.transport.sse.authentication.type",
-              "equals": "oauth-client-credentials-flow",
+              "property": "data.connectorMode.operation.type",
+              "oneOf": [
+                "resources/read",
+                "resources/list",
+                "resources/templates/list"
+              ],
+              "type": "simple"
+            },
+            {
+              "property": "data.connectorMode.type",
+              "equals": "standalone",
+              "type": "simple"
+            }
+          ]
+        },
+        "type": "Text"
+      },
+      {
+        "id": "data.connectorMode.standaloneModeFilters.prompts.included",
+        "label": "Included prompts",
+        "description": "List of prompts that can be accessed by the MCP client. By default, all prompts are allowed.",
+        "optional": true,
+        "feel": "required",
+        "group": "filters",
+        "binding": {
+          "name": "data.connectorMode.standaloneModeFilters.prompts.included",
+          "type": "zeebe:input"
+        },
+        "condition": {
+          "allMatch": [
+            {
+              "property": "data.connectorMode.operation.type",
+              "oneOf": ["prompts/get", "prompts/list"],
               "type": "simple"
             },
             {
-              "property": "data.transport.type",
-              "equals": "sse",
+              "property": "data.connectorMode.type",
+              "equals": "standalone",
               "type": "simple"
             }
           ]
         },
-        "type": "Dropdown",
-        "choices": [
-          {
-            "name": "Send as Basic Auth header",
-            "value": "BASIC_AUTH_HEADER"
-          },
-          {
-            "name": "Send client credentials in body",
-            "value": "CREDENTIALS_BODY"
-          }
-        ]
+        "type": "Text"
       },
       {
-        "id": "data.transport.sse.authentication.scopes",
-        "label": "Scopes",
-        "description": "The scopes which you want to request authorization for (e.g.read:contacts)",
+        "id": "data.connectorMode.standaloneModeFilters.prompts.excluded",
+        "label": "Excluded prompts",
+        "description": "List of prompts that are not allowed to be accessed by the MCP client. Will override any included prompts.",
         "optional": true,
-        "feel": "optional",
-        "group": "authentication",
+        "feel": "required",
+        "group": "filters",
         "binding": {
-          "name": "data.transport.sse.authentication.scopes",
+          "name": "data.connectorMode.standaloneModeFilters.prompts.excluded",
           "type": "zeebe:input"
         },
         "condition": {
           "allMatch": [
             {
-              "property": "data.transport.sse.authentication.type",
-              "equals": "oauth-client-credentials-flow",
+              "property": "data.connectorMode.operation.type",
+              "oneOf": ["prompts/get", "prompts/list"],
               "type": "simple"
             },
             {
-              "property": "data.transport.type",
-              "equals": "sse",
+              "property": "data.connectorMode.type",
+              "equals": "standalone",
               "type": "simple"
             }
           ]
         },
-        "type": "String"
+        "type": "Text"
       },
       {
-        "id": "data.options.clientCache",
-        "label": "Enable client caching",
-        "description": "If enabled, the MCP client instance is cached on the connector runtime and reused across requests.",
+        "id": "data.connectorMode.toolModeFilters.tools.included",
+        "label": "Included tools",
+        "description": "List of tools that can be used by the MCP client. By default, all tools are allowed.",
         "optional": true,
-        "feel": "static",
-        "group": "options",
+        "feel": "required",
+        "group": "filters",
         "binding": {
-          "name": "data.options.clientCache",
+          "name": "data.connectorMode.toolModeFilters.tools.included",
           "type": "zeebe:input"
         },
-        "tooltip": "Only enable this option if you are sure that the configuration or authentication details of this client will not change between invocations.<br>Caching the client instance can improve performance by reusing existing connections.",
-        "type": "Boolean"
-      },
-      {
-        "id": "data.connectorMode.type",
-        "label": "Connector mode",
-        "description": "Select how this connector is used.",
-        "value": "aiAgentTool",
-        "group": "connectorMode",
-        "binding": {
-          "name": "data.connectorMode.type",
-          "type": "zeebe:input"
+        "condition": {
+          "property": "data.connectorMode.type",
+          "equals": "aiAgentTool",
+          "type": "simple"
         },
-        "type": "Dropdown",
-        "choices": [
-          {
-            "name": "Standalone",
-            "value": "standalone"
-          },
-          {
-            "name": "AI Agent tool",
-            "value": "aiAgentTool"
-          }
-        ]
+        "type": "Text"
       },
       {
-        "id": "data.connectorMode.operation.type",
-        "label": "Operation",
-        "description": "The type of operation to perform.",
-        "value": "tools/list",
-        "group": "operation",
+        "id": "data.connectorMode.toolModeFilters.tools.excluded",
+        "label": "Excluded tools",
+        "description": "List of tools that are not allowed to be used by the MCP client. Will override any included tools.",
+        "optional": true,
+        "feel": "required",
+        "group": "filters",
         "binding": {
-          "name": "data.connectorMode.operation.type",
+          "name": "data.connectorMode.toolModeFilters.tools.excluded",
           "type": "zeebe:input"
         },
         "condition": {
           "property": "data.connectorMode.type",
-          "equals": "standalone",
+          "equals": "aiAgentTool",
           "type": "simple"
         },
-        "type": "Dropdown",
-        "choices": [
-          {
-            "name": "Call Tool",
-            "value": "tools/call"
-          },
-          {
-            "name": "List Tools",
-            "value": "tools/list"
-          }
-        ]
+        "type": "Text"
       },
       {
-        "id": "data.connectorMode.operation.toolName",
-        "label": "Tool name",
-        "description": "The name of the tool to call.",
-        "optional": false,
-        "constraints": {
-          "notEmpty": true
+        "id": "version",
+        "label": "Version",
+        "description": "Version of the element template",
+        "value": "2",
+        "group": "connector",
+        "binding": {
+          "key": "elementTemplateVersion",
+          "type": "zeebe:taskHeader"
+        },
+        "type": "Hidden"
+      },
+      {
+        "id": "id",
+        "label": "ID",
+        "description": "ID of the element template",
+        "value": "io.camunda.connectors.agenticai.mcp.remoteclient.v0",
+        "group": "connector",
+        "binding": {
+          "key": "elementTemplateId",
+          "type": "zeebe:taskHeader"
+        },
+        "type": "Hidden"
+      },
+      {
+        "id": "resultVariable",
+        "label": "Result variable",
+        "description": "Name of variable to store the response in. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/use-connectors/#result-variable\" target=\"_blank\">documentation</a>.",
+        "value": "toolCallResult",
+        "group": "output",
+        "binding": {
+          "key": "resultVariable",
+          "type": "zeebe:taskHeader"
+        },
+        "type": "String"
+      },
+      {
+        "id": "resultExpression",
+        "label": "Result expression",
+        "description": "Expression to map the response into process variables. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/use-connectors/#result-expression\" target=\"_blank\">documentation</a>.",
+        "feel": "required",
+        "group": "output",
+        "binding": {
+          "key": "resultExpression",
+          "type": "zeebe:taskHeader"
+        },
+        "type": "Text"
+      },
+      {
+        "id": "errorExpression",
+        "label": "Error expression",
+        "description": "Expression to handle errors. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/use-connectors/\" target=\"_blank\">documentation</a>.",
+        "feel": "required",
+        "group": "error",
+        "binding": {
+          "key": "errorExpression",
+          "type": "zeebe:taskHeader"
         },
+        "type": "Text"
+      },
+      {
+        "id": "retryCount",
+        "label": "Retries",
+        "description": "Number of retries",
+        "value": "3",
         "feel": "optional",
-        "group": "operation",
+        "group": "retries",
+        "binding": {
+          "property": "retries",
+          "type": "zeebe:taskDefinition"
+        },
+        "type": "String"
+      },
+      {
+        "id": "retryBackoff",
+        "label": "Retry backoff",
+        "description": "ISO-8601 duration to wait between retries",
+        "value": "PT30S",
+        "group": "retries",
+        "binding": {
+          "key": "retryBackoff",
+          "type": "zeebe:taskHeader"
+        },
+        "type": "String"
+      }
+    ],
+    "icon": {
+      "contents": "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIyMDAiIGhlaWdodD0iMjAwIiBmaWxsPSJub25lIiB2aWV3Qm94PSIwIDAgMjAwIDIwMCI+CiAgICA8cGF0aCBkPSJNMjUgOTcuODUyOEw5Mi44ODIzIDI5Ljk3MDZDMTAyLjI1NSAyMC41OTggMTE3LjQ1MSAyMC41OTggMTI2LjgyMyAyOS45NzA2VjI5Ljk3MDZDMTM2LjE5NiAzOS4zNDMxIDEzNi4xOTYgNTQuNTM5MSAxMjYuODIzIDYzLjkxMTdMNzUuNTU4MSAxMTUuMTc3IiBzdHJva2U9ImJsYWNrIiBzdHJva2Utd2lkdGg9IjEyIiBzdHJva2UtbGluZWNhcD0icm91bmQiLz4KICAgIDxwYXRoIGQ9Ik03Ni4yNjUzIDExNC40N0wxMjYuODIzIDYzLjkxMTdDMTM2LjE5NiA1NC41MzkxIDE1MS4zOTIgNTQuNTM5MSAxNjAuNzY1IDYzLjkxMTdMMTYxLjExOCA2NC4yNjUyQzE3MC40OTEgNzMuNjM3OCAxNzAuNDkxIDg4LjgzMzggMTYxLjExOCA5OC4yMDYzTDk5LjcyNDggMTU5LjZDOTYuNjAwNiAxNjIuNzI0IDk2LjYwMDYgMTY3Ljc4OSA5OS43MjQ4IDE3MC45MTNMMTEyLjMzMSAxODMuNTIiIHN0cm9rZT0iYmxhY2siIHN0cm9rZS13aWR0aD0iMTIiIHN0cm9rZS1saW5lY2FwPSJyb3VuZCIvPgogICAgPHBhdGggZD0iTTEwOS44NTMgNDYuOTQxMUw1OS42NDgyIDk3LjE0NTdDNTAuMjc1NyAxMDYuNTE4IDUwLjI3NTcgMTIxLjcxNCA1OS42NDgyIDEzMS4wODdWMTMxLjA4N0M2OS4wMjA4IDE0MC40NTkgODQuMjE2OCAxNDAuNDU5IDkzLjU4OTQgMTMxLjA4N0wxNDMuNzk0IDgwLjg4MjIiIHN0cm9rZT0iYmxhY2siIHN0cm9rZS13aWR0aD0iMTIiIHN0cm9rZS1saW5lY2FwPSJyb3VuZCIvPgo8L3N2Zz4K"
+    }
+  },
+  {
+    "$schema": "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
+    "name": "MCP Remote Client (early access)",
+    "id": "io.camunda.connectors.agenticai.mcp.remoteclient.v0",
+    "description": "MCP (Model Context Protocol) client, operating on temporary remote connections. Only supports tool operations.",
+    "metadata": {
+      "keywords": []
+    },
+    "version": 0,
+    "category": {
+      "id": "aiTools",
+      "name": "AI Tools"
+    },
+    "appliesTo": ["bpmn:Task"],
+    "elementType": {
+      "value": "bpmn:ServiceTask"
+    },
+    "engines": {
+      "camunda": "^8.8"
+    },
+    "groups": [
+      {
+        "id": "connection",
+        "label": "HTTP Connection",
+        "tooltip": "Configure the HTTP/SSE connection to the remote MCP server. Setting authentication headers is not supported yet."
+      },
+      {
+        "id": "tools",
+        "label": "Tools"
+      },
+      {
+        "id": "operation",
+        "label": "Operation"
+      },
+      {
+        "id": "connector",
+        "label": "Connector"
+      },
+      {
+        "id": "output",
+        "label": "Output mapping"
+      },
+      {
+        "id": "error",
+        "label": "Error handling"
+      },
+      {
+        "id": "retries",
+        "label": "Retries"
+      }
+    ],
+    "properties": [
+      {
+        "value": "io.camunda.agenticai:mcpremoteclient:0",
         "binding": {
-          "name": "data.connectorMode.operation.toolName",
-          "type": "zeebe:input"
-        },
-        "condition": {
-          "allMatch": [
-            {
-              "property": "data.connectorMode.operation.type",
-              "equals": "tools/call",
-              "type": "simple"
-            },
-            {
-              "property": "data.connectorMode.type",
-              "equals": "standalone",
-              "type": "simple"
-            }
-          ]
+          "property": "type",
+          "type": "zeebe:taskDefinition"
         },
-        "type": "String"
+        "type": "Hidden"
       },
       {
-        "id": "data.connectorMode.operation.toolArguments",
-        "label": "Tool arguments",
-        "description": "The arguments to pass to the tool.",
-        "optional": true,
-        "feel": "required",
-        "group": "operation",
+        "value": "mcpClient",
         "binding": {
-          "name": "data.connectorMode.operation.toolArguments",
-          "type": "zeebe:input"
-        },
-        "condition": {
-          "allMatch": [
-            {
-              "property": "data.connectorMode.operation.type",
-              "equals": "tools/call",
-              "type": "simple"
-            },
-            {
-              "property": "data.connectorMode.type",
-              "equals": "standalone",
-              "type": "simple"
-            }
-          ]
+          "name": "io.camunda.agenticai.gateway.type",
+          "type": "zeebe:property"
         },
-        "type": "String"
+        "type": "Hidden"
       },
       {
-        "id": "data.connectorMode.toolOperation.method",
-        "label": "Method",
-        "description": "The MCP method to be called, e.g. <code>tools/list</code>.",
+        "id": "data.connection.sseUrl",
+        "label": "SSE URL",
+        "description": "SSE URL to connect to the MCP server. Typically ends with <code>/sse</code>.",
         "optional": false,
-        "value": "=toolCall.method",
         "constraints": {
           "notEmpty": true
         },
         "feel": "optional",
-        "group": "operation",
+        "group": "connection",
         "binding": {
-          "name": "data.connectorMode.toolOperation.method",
+          "name": "data.connection.sseUrl",
           "type": "zeebe:input"
         },
-        "condition": {
-          "property": "data.connectorMode.type",
-          "equals": "aiAgentTool",
-          "type": "simple"
-        },
-        "tooltip": "The method to be called on the MCP server. See the <a href=\"https://modelcontextprotocol.io/specification/2024-11-05/server\">MCP specification</a> for a list of available methods.<br><br>Currently supported:<br><code>tools/list</code>, <code>tools/call</code>",
         "type": "String"
       },
       {
-        "id": "data.connectorMode.toolOperation.params",
-        "label": "Parameters",
-        "description": "The parameters to be passed to the MCP method.",
+        "id": "data.connection.headers",
+        "label": "HTTP headers",
+        "description": "Map of HTTP headers to add to the request <strong>(NOT SUPPORTED YET)</strong>.",
         "optional": true,
-        "value": "=toolCall.params",
-        "feel": "required",
-        "group": "operation",
+        "group": "connection",
         "binding": {
-          "name": "data.connectorMode.toolOperation.params",
+          "name": "data.connection.headers",
           "type": "zeebe:input"
         },
-        "condition": {
-          "property": "data.connectorMode.type",
-          "equals": "aiAgentTool",
-          "type": "simple"
+        "type": "Hidden"
+      },
+      {
+        "id": "data.connection.timeout",
+        "label": "Timeout",
+        "description": "Timeout for individual HTTP requests as ISO-8601 duration (example: <code>PT30S</code>)",
+        "optional": true,
+        "group": "connection",
+        "binding": {
+          "name": "data.connection.timeout",
+          "type": "zeebe:input"
         },
-        "tooltip": "The parameter structure depends on the method being called. See the <a href=\"https://modelcontextprotocol.io/specification/2024-11-05/server/tools#calling-tools\">MCP specification</a> for an example of the parameters for the <code>tools/call</code> method.",
-        "type": "String"
+        "type": "Hidden"
       },
       {
         "id": "data.tools.included",
@@ -1288,11 +2985,44 @@
         },
         "type": "Text"
       },
+      {
+        "id": "data.operation.method",
+        "label": "Method",
+        "description": "The MCP method to be called, e.g. <code>tools/list</code>.",
+        "optional": false,
+        "value": "=toolCall.method",
+        "constraints": {
+          "notEmpty": true
+        },
+        "feel": "optional",
+        "group": "operation",
+        "binding": {
+          "name": "data.operation.method",
+          "type": "zeebe:input"
+        },
+        "tooltip": "The method to be called on the MCP server. See the <a href=\"https://modelcontextprotocol.io/specification/2024-11-05/server\">MCP specification</a> for a list of available methods.<br><br>Currently supported:<br><code>tools/list</code>, <code>tools/call</code>",
+        "type": "String"
+      },
+      {
+        "id": "data.operation.params",
+        "label": "Parameters",
+        "description": "The parameters to be passed to the MCP method.",
+        "optional": true,
+        "value": "=toolCall.params",
+        "feel": "required",
+        "group": "operation",
+        "binding": {
+          "name": "data.operation.params",
+          "type": "zeebe:input"
+        },
+        "tooltip": "The parameter structure depends on the method being called. See the <a href=\"https://modelcontextprotocol.io/specification/2024-11-05/server/tools#calling-tools\">MCP specification</a> for an example of the parameters for the <code>tools/call</code> method.",
+        "type": "String"
+      },
       {
         "id": "version",
         "label": "Version",
         "description": "Version of the element template",
-        "value": "1",
+        "value": "0",
         "group": "connector",
         "binding": {
           "key": "elementTemplateVersion",
@@ -1380,11 +3110,13 @@
   },
   {
     "$schema": "https://unpkg.com/@camunda/zeebe-element-templates-json-schema/resources/schema.json",
-    "name": "MCP Remote Client",
+    "name": "MCP Remote Client (early access)",
     "id": "io.camunda.connectors.agenticai.mcp.remoteclient.v0",
     "description": "MCP (Model Context Protocol) client, operating on temporary remote connections.",
-    "documentationRef": "https://docs.camunda.io/docs/8.9/components/connectors/out-of-the-box-connectors/agentic-ai-mcp-remote-client-connector/",
-    "version": 2,
+    "metadata": {
+      "keywords": []
+    },
+    "version": 1,
     "category": {
       "id": "aiTools",
       "name": "AI Tools"
@@ -1420,8 +3152,8 @@
         "label": "Operation"
       },
       {
-        "id": "filters",
-        "label": "Filters",
+        "id": "tools",
+        "label": "Tools",
         "openByDefault": false
       },
       {
@@ -2253,146 +3985,39 @@
             "name": "AI Agent tool",
             "value": "aiAgentTool"
           }
-        ]
-      },
-      {
-        "id": "data.connectorMode.operation.type",
-        "label": "Operation",
-        "description": "The type of operation to perform.",
-        "value": "tools/list",
-        "group": "operation",
-        "binding": {
-          "name": "data.connectorMode.operation.type",
-          "type": "zeebe:input"
-        },
-        "condition": {
-          "property": "data.connectorMode.type",
-          "equals": "standalone",
-          "type": "simple"
-        },
-        "type": "Dropdown",
-        "choices": [
-          {
-            "name": "List Tools",
-            "value": "tools/list"
-          },
-          {
-            "name": "Call Tool",
-            "value": "tools/call"
-          },
-          {
-            "name": "List Resources",
-            "value": "resources/list"
-          },
-          {
-            "name": "List Resource Templates",
-            "value": "resources/templates/list"
-          },
-          {
-            "name": "Read Resource",
-            "value": "resources/read"
-          },
-          {
-            "name": "List Prompts",
-            "value": "prompts/list"
-          },
-          {
-            "name": "Get Prompt",
-            "value": "prompts/get"
-          }
-        ]
-      },
-      {
-        "id": "data.connectorMode.operation.toolName",
-        "label": "Tool name",
-        "description": "The name of the tool to call.",
-        "optional": false,
-        "constraints": {
-          "notEmpty": true
-        },
-        "feel": "optional",
-        "group": "operation",
-        "binding": {
-          "name": "data.connectorMode.operation.toolName",
-          "type": "zeebe:input"
-        },
-        "condition": {
-          "allMatch": [
-            {
-              "property": "data.connectorMode.operation.type",
-              "equals": "tools/call",
-              "type": "simple"
-            },
-            {
-              "property": "data.connectorMode.type",
-              "equals": "standalone",
-              "type": "simple"
-            }
-          ]
-        },
-        "type": "String"
-      },
-      {
-        "id": "data.connectorMode.operation.toolArguments",
-        "label": "Tool arguments",
-        "description": "The arguments to pass to the tool.",
-        "optional": true,
-        "feel": "required",
-        "group": "operation",
-        "binding": {
-          "name": "data.connectorMode.operation.toolArguments",
-          "type": "zeebe:input"
-        },
-        "condition": {
-          "allMatch": [
-            {
-              "property": "data.connectorMode.operation.type",
-              "equals": "tools/call",
-              "type": "simple"
-            },
-            {
-              "property": "data.connectorMode.type",
-              "equals": "standalone",
-              "type": "simple"
-            }
-          ]
-        },
-        "type": "String"
-      },
-      {
-        "id": "data.connectorMode.operation.resourceUri",
-        "label": "Resource URI",
-        "description": "The URI of the resource to read.",
-        "optional": false,
-        "constraints": {
-          "notEmpty": true
-        },
-        "feel": "optional",
+        ]
+      },
+      {
+        "id": "data.connectorMode.operation.type",
+        "label": "Operation",
+        "description": "The type of operation to perform.",
+        "value": "tools/list",
         "group": "operation",
         "binding": {
-          "name": "data.connectorMode.operation.resourceUri",
+          "name": "data.connectorMode.operation.type",
           "type": "zeebe:input"
         },
         "condition": {
-          "allMatch": [
-            {
-              "property": "data.connectorMode.operation.type",
-              "equals": "resources/read",
-              "type": "simple"
-            },
-            {
-              "property": "data.connectorMode.type",
-              "equals": "standalone",
-              "type": "simple"
-            }
-          ]
+          "property": "data.connectorMode.type",
+          "equals": "standalone",
+          "type": "simple"
         },
-        "type": "String"
+        "type": "Dropdown",
+        "choices": [
+          {
+            "name": "Call Tool",
+            "value": "tools/call"
+          },
+          {
+            "name": "List Tools",
+            "value": "tools/list"
+          }
+        ]
       },
       {
-        "id": "data.connectorMode.operation.promptName",
-        "label": "Prompt name",
-        "description": "The name of the prompt to get.",
+        "id": "data.connectorMode.operation.toolName",
+        "label": "Tool name",
+        "description": "The name of the tool to call.",
         "optional": false,
         "constraints": {
           "notEmpty": true
@@ -2400,14 +4025,14 @@
         "feel": "optional",
         "group": "operation",
         "binding": {
-          "name": "data.connectorMode.operation.promptName",
+          "name": "data.connectorMode.operation.toolName",
           "type": "zeebe:input"
         },
         "condition": {
           "allMatch": [
             {
               "property": "data.connectorMode.operation.type",
-              "equals": "prompts/get",
+              "equals": "tools/call",
               "type": "simple"
             },
             {
@@ -2420,21 +4045,21 @@
         "type": "String"
       },
       {
-        "id": "data.connectorMode.operation.promptArguments",
-        "label": "Prompt arguments",
-        "description": "The arguments to pass to the prompt generation.",
+        "id": "data.connectorMode.operation.toolArguments",
+        "label": "Tool arguments",
+        "description": "The arguments to pass to the tool.",
         "optional": true,
         "feel": "required",
         "group": "operation",
         "binding": {
-          "name": "data.connectorMode.operation.promptArguments",
+          "name": "data.connectorMode.operation.toolArguments",
           "type": "zeebe:input"
         },
         "condition": {
           "allMatch": [
             {
               "property": "data.connectorMode.operation.type",
-              "equals": "prompts/get",
+              "equals": "tools/call",
               "type": "simple"
             },
             {
@@ -2490,216 +4115,36 @@
         "type": "String"
       },
       {
-        "id": "data.connectorMode.standaloneModeFilters.tools.included",
-        "label": "Included tools",
-        "description": "List of tools that can be used by the MCP client. By default, all tools are allowed.",
-        "optional": true,
-        "feel": "required",
-        "group": "filters",
-        "binding": {
-          "name": "data.connectorMode.standaloneModeFilters.tools.included",
-          "type": "zeebe:input"
-        },
-        "condition": {
-          "allMatch": [
-            {
-              "property": "data.connectorMode.operation.type",
-              "oneOf": ["tools/call", "tools/list"],
-              "type": "simple"
-            },
-            {
-              "property": "data.connectorMode.type",
-              "equals": "standalone",
-              "type": "simple"
-            }
-          ]
-        },
-        "type": "Text"
-      },
-      {
-        "id": "data.connectorMode.standaloneModeFilters.tools.excluded",
-        "label": "Excluded tools",
-        "description": "List of tools that are not allowed to be used by the MCP client. Will override any included tools.",
-        "optional": true,
-        "feel": "required",
-        "group": "filters",
-        "binding": {
-          "name": "data.connectorMode.standaloneModeFilters.tools.excluded",
-          "type": "zeebe:input"
-        },
-        "condition": {
-          "allMatch": [
-            {
-              "property": "data.connectorMode.operation.type",
-              "oneOf": ["tools/call", "tools/list"],
-              "type": "simple"
-            },
-            {
-              "property": "data.connectorMode.type",
-              "equals": "standalone",
-              "type": "simple"
-            }
-          ]
-        },
-        "type": "Text"
-      },
-      {
-        "id": "data.connectorMode.standaloneModeFilters.resources.included",
-        "label": "Included resources",
-        "description": "List of resources that can be accessed by the MCP client. By default, all resources are allowed.",
-        "optional": true,
-        "feel": "required",
-        "group": "filters",
-        "binding": {
-          "name": "data.connectorMode.standaloneModeFilters.resources.included",
-          "type": "zeebe:input"
-        },
-        "condition": {
-          "allMatch": [
-            {
-              "property": "data.connectorMode.operation.type",
-              "oneOf": [
-                "resources/read",
-                "resources/list",
-                "resources/templates/list"
-              ],
-              "type": "simple"
-            },
-            {
-              "property": "data.connectorMode.type",
-              "equals": "standalone",
-              "type": "simple"
-            }
-          ]
-        },
-        "type": "Text"
-      },
-      {
-        "id": "data.connectorMode.standaloneModeFilters.resources.excluded",
-        "label": "Excluded resources",
-        "description": "List of resources that are not allowed to be accessed by the MCP client. Will override any included resources.",
-        "optional": true,
-        "feel": "required",
-        "group": "filters",
-        "binding": {
-          "name": "data.connectorMode.standaloneModeFilters.resources.excluded",
-          "type": "zeebe:input"
-        },
-        "condition": {
-          "allMatch": [
-            {
-              "property": "data.connectorMode.operation.type",
-              "oneOf": [
-                "resources/read",
-                "resources/list",
-                "resources/templates/list"
-              ],
-              "type": "simple"
-            },
-            {
-              "property": "data.connectorMode.type",
-              "equals": "standalone",
-              "type": "simple"
-            }
-          ]
-        },
-        "type": "Text"
-      },
-      {
-        "id": "data.connectorMode.standaloneModeFilters.prompts.included",
-        "label": "Included prompts",
-        "description": "List of prompts that can be accessed by the MCP client. By default, all prompts are allowed.",
-        "optional": true,
-        "feel": "required",
-        "group": "filters",
-        "binding": {
-          "name": "data.connectorMode.standaloneModeFilters.prompts.included",
-          "type": "zeebe:input"
-        },
-        "condition": {
-          "allMatch": [
-            {
-              "property": "data.connectorMode.operation.type",
-              "oneOf": ["prompts/get", "prompts/list"],
-              "type": "simple"
-            },
-            {
-              "property": "data.connectorMode.type",
-              "equals": "standalone",
-              "type": "simple"
-            }
-          ]
-        },
-        "type": "Text"
-      },
-      {
-        "id": "data.connectorMode.standaloneModeFilters.prompts.excluded",
-        "label": "Excluded prompts",
-        "description": "List of prompts that are not allowed to be accessed by the MCP client. Will override any included prompts.",
-        "optional": true,
-        "feel": "required",
-        "group": "filters",
-        "binding": {
-          "name": "data.connectorMode.standaloneModeFilters.prompts.excluded",
-          "type": "zeebe:input"
-        },
-        "condition": {
-          "allMatch": [
-            {
-              "property": "data.connectorMode.operation.type",
-              "oneOf": ["prompts/get", "prompts/list"],
-              "type": "simple"
-            },
-            {
-              "property": "data.connectorMode.type",
-              "equals": "standalone",
-              "type": "simple"
-            }
-          ]
-        },
-        "type": "Text"
-      },
-      {
-        "id": "data.connectorMode.toolModeFilters.tools.included",
+        "id": "data.tools.included",
         "label": "Included tools",
         "description": "List of tools that can be used by the MCP client. By default, all tools are allowed.",
         "optional": true,
         "feel": "required",
-        "group": "filters",
+        "group": "tools",
         "binding": {
-          "name": "data.connectorMode.toolModeFilters.tools.included",
+          "name": "data.tools.included",
           "type": "zeebe:input"
         },
-        "condition": {
-          "property": "data.connectorMode.type",
-          "equals": "aiAgentTool",
-          "type": "simple"
-        },
         "type": "Text"
       },
       {
-        "id": "data.connectorMode.toolModeFilters.tools.excluded",
+        "id": "data.tools.excluded",
         "label": "Excluded tools",
         "description": "List of tools that are not allowed to be used by the MCP client. Will override any included tools.",
         "optional": true,
         "feel": "required",
-        "group": "filters",
+        "group": "tools",
         "binding": {
-          "name": "data.connectorMode.toolModeFilters.tools.excluded",
+          "name": "data.tools.excluded",
           "type": "zeebe:input"
         },
-        "condition": {
-          "property": "data.connectorMode.type",
-          "equals": "aiAgentTool",
-          "type": "simple"
-        },
         "type": "Text"
       },
       {
         "id": "version",
         "label": "Version",
         "description": "Version of the element template",
-        "value": "2",
+        "value": "1",
         "group": "connector",
         "binding": {
           "key": "elementTemplateVersion",
@@ -2722,7 +4167,7 @@
       {
         "id": "resultVariable",
         "label": "Result variable",
-        "description": "Name of variable to store the response in. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/use-connectors/#result-variable\" target=\"_blank\">documentation</a>.",
+        "description": "Name of variable to store the response in",
         "value": "toolCallResult",
         "group": "output",
         "binding": {
@@ -2734,7 +4179,7 @@
       {
         "id": "resultExpression",
         "label": "Result expression",
-        "description": "Expression to map the response into process variables. Details in the <a href=\"https://docs.camunda.io/docs/components/connectors/use-connectors/#result-expression\" target=\"_blank\">documentation</a>.",
+        "description": "Expression to map the response into process variables",
         "feel": "required",
         "group": "output",
         "binding": {
@@ -2772,7 +4217,7 @@
         "id": "retryBackoff",
         "label": "Retry backoff",
         "description": "ISO-8601 duration to wait between retries",
-        "value": "PT30S",
+        "value": "PT0S",
         "group": "retries",
         "binding": {
           "key": "retryBackoff",