@camunda/connectors-element-templates 1.0.18 → 1.0.19

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

@@ -1,50 +1,38 @@
 [
   {
     "$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,
+    "description": "MCP (Model Context Protocol) client, operating on temporary remote connections. Only supports tool operations.",
+    "metadata": {
+      "keywords": []
+    },
+    "version": 0,
     "category": {
-      "id": "connectors",
-      "name": "Connectors"
+      "id": "aiTools",
+      "name": "AI Tools"
     },
     "appliesTo": ["bpmn:Task"],
     "elementType": {
       "value": "bpmn:ServiceTask"
     },
     "engines": {
-      "camunda": "^8.9"
+      "camunda": "^8.8"
     },
     "groups": [
       {
-        "id": "transport",
-        "label": "Transport",
-        "tooltip": "Configure the connection to the remote MCP server."
-      },
-      {
-        "id": "authentication",
-        "label": "Authentication"
-      },
-      {
-        "id": "options",
-        "label": "Options"
+        "id": "connection",
+        "label": "HTTP Connection",
+        "tooltip": "Configure the HTTP/SSE connection to the remote MCP server. Setting authentication headers is not supported yet."
       },
       {
-        "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": "tools",
+        "label": "Tools"
       },
       {
         "id": "operation",
         "label": "Operation"
       },
-      {
-        "id": "filters",
-        "label": "Filters",
-        "openByDefault": false
-      },
       {
         "id": "connector",
         "label": "Connector"
@@ -64,7 +52,7 @@
     ],
     "properties": [
       {
-        "value": "io.camunda.agenticai:mcpremoteclient:1",
+        "value": "io.camunda.agenticai:mcpremoteclient:0",
         "binding": {
           "property": "type",
           "type": "zeebe:taskDefinition"
@@ -77,196 +65,467 @@
           "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>.",
+        "id": "data.connection.sseUrl",
+        "label": "SSE URL",
+        "description": "SSE URL to connect to the MCP server. Typically ends with <code>/sse</code>.",
         "optional": false,
         "constraints": {
           "notEmpty": true
         },
         "feel": "optional",
-        "group": "transport",
+        "group": "connection",
         "binding": {
-          "name": "data.transport.http.url",
+          "name": "data.connection.sseUrl",
           "type": "zeebe:input"
         },
-        "condition": {
-          "property": "data.transport.type",
-          "equals": "http",
-          "type": "simple"
-        },
         "type": "String"
       },
       {
-        "id": "data.transport.http.headers",
+        "id": "data.connection.headers",
         "label": "HTTP headers",
-        "description": "Map of HTTP headers to add to the request.",
+        "description": "Map of HTTP headers to add to the request <strong>(NOT SUPPORTED YET)</strong>.",
         "optional": true,
-        "feel": "required",
-        "group": "transport",
+        "group": "connection",
         "binding": {
-          "name": "data.transport.http.headers",
+          "name": "data.connection.headers",
           "type": "zeebe:input"
         },
-        "condition": {
-          "property": "data.transport.type",
-          "equals": "http",
-          "type": "simple"
-        },
-        "type": "String"
+        "type": "Hidden"
       },
       {
-        "id": "data.transport.http.timeout",
+        "id": "data.connection.timeout",
         "label": "Timeout",
         "description": "Timeout for individual HTTP requests as ISO-8601 duration (example: <code>PT30S</code>)",
         "optional": true,
-        "feel": "optional",
-        "group": "transport",
+        "group": "connection",
         "binding": {
-          "name": "data.transport.http.timeout",
+          "name": "data.connection.timeout",
           "type": "zeebe:input"
         },
-        "condition": {
-          "property": "data.transport.type",
-          "equals": "http",
-          "type": "simple"
+        "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",
+        "binding": {
+          "name": "data.tools.included",
+          "type": "zeebe:input"
         },
-        "type": "String"
+        "type": "Text"
       },
       {
-        "id": "data.transport.sse.url",
-        "label": "URL",
-        "description": "URL to connect to the MCP server. Typically ends with <code>/sse</code>.",
+        "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"
+        },
+        "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": "transport",
+        "group": "operation",
         "binding": {
-          "name": "data.transport.sse.url",
+          "name": "data.operation.method",
           "type": "zeebe:input"
         },
-        "condition": {
-          "property": "data.transport.type",
-          "equals": "sse",
-          "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.transport.sse.headers",
-        "label": "HTTP headers",
-        "description": "Map of HTTP headers to add to the request.",
+        "id": "data.operation.params",
+        "label": "Parameters",
+        "description": "The parameters to be passed to the MCP method.",
         "optional": true,
+        "value": "=toolCall.params",
         "feel": "required",
-        "group": "transport",
+        "group": "operation",
         "binding": {
-          "name": "data.transport.sse.headers",
+          "name": "data.operation.params",
           "type": "zeebe:input"
         },
-        "condition": {
-          "property": "data.transport.type",
-          "equals": "sse",
-          "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.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",
+        "id": "version",
+        "label": "Version",
+        "description": "Version of the element template",
+        "value": "0",
+        "group": "connector",
         "binding": {
-          "name": "data.transport.sse.timeout",
-          "type": "zeebe:input"
-        },
-        "condition": {
-          "property": "data.transport.type",
-          "equals": "sse",
-          "type": "simple"
+          "key": "elementTemplateVersion",
+          "type": "zeebe:taskHeader"
         },
-        "type": "String"
+        "type": "Hidden"
       },
       {
-        "id": "data.transport.http.authentication.type",
-        "label": "Type",
-        "description": "Choose the authentication type. Select 'None' if no authentication is necessary",
-        "value": "noAuth",
-        "group": "authentication",
+        "id": "id",
+        "label": "ID",
+        "description": "ID of the element template",
+        "value": "io.camunda.connectors.agenticai.mcp.remoteclient.v0",
+        "group": "connector",
         "binding": {
-          "name": "data.transport.http.authentication.type",
-          "type": "zeebe:input"
-        },
-        "condition": {
-          "property": "data.transport.type",
-          "equals": "http",
-          "type": "simple"
+          "key": "elementTemplateId",
+          "type": "zeebe:taskHeader"
         },
-        "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"
-          }
-        ]
+        "type": "Hidden"
       },
       {
-        "id": "data.transport.http.authentication.username",
-        "label": "Username",
-        "optional": false,
-        "constraints": {
-          "notEmpty": true
+        "id": "resultVariable",
+        "label": "Result variable",
+        "description": "Name of variable to store the response in",
+        "value": "toolCallResult",
+        "group": "output",
+        "binding": {
+          "key": "resultVariable",
+          "type": "zeebe:taskHeader"
         },
-        "feel": "optional",
-        "group": "authentication",
+        "type": "String"
+      },
+      {
+        "id": "resultExpression",
+        "label": "Result expression",
+        "description": "Expression to map the response into process variables",
+        "feel": "required",
+        "group": "output",
         "binding": {
-          "name": "data.transport.http.authentication.username",
-          "type": "zeebe:input"
+          "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": "retries",
+        "binding": {
+          "property": "retries",
+          "type": "zeebe:taskDefinition"
+        },
+        "type": "String"
+      },
+      {
+        "id": "retryBackoff",
+        "label": "Retry backoff",
+        "description": "ISO-8601 duration to wait between retries",
+        "value": "PT0S",
+        "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.",
+    "metadata": {
+      "keywords": []
+    },
+    "version": 1,
+    "category": {
+      "id": "aiTools",
+      "name": "AI Tools"
+    },
+    "appliesTo": ["bpmn:Task"],
+    "elementType": {
+      "value": "bpmn:ServiceTask"
+    },
+    "engines": {
+      "camunda": "^8.9"
+    },
+    "groups": [
+      {
+        "id": "transport",
+        "label": "Transport",
+        "tooltip": "Configure the connection to the remote MCP server."
+      },
+      {
+        "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": "tools",
+        "label": "Tools",
+        "openByDefault": false
+      },
+      {
+        "id": "connector",
+        "label": "Connector"
+      },
+      {
+        "id": "output",
+        "label": "Output mapping"
+      },
+      {
+        "id": "error",
+        "label": "Error handling"
+      },
+      {
+        "id": "retries",
+        "label": "Retries"
+      }
+    ],
+    "properties": [
+      {
+        "value": "io.camunda.agenticai:mcpremoteclient:1",
+        "binding": {
+          "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"
+        },
+        "condition": {
+          "property": "data.transport.type",
+          "equals": "sse",
+          "type": "simple"
+        },
+        "type": "String"
+      },
+      {
+        "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": "data.transport.sse.timeout",
+          "type": "zeebe:input"
+        },
+        "condition": {
+          "property": "data.transport.type",
+          "equals": "sse",
+          "type": "simple"
+        },
+        "type": "String"
+      },
+      {
+        "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": {
+          "name": "data.transport.http.authentication.type",
+          "type": "zeebe:input"
+        },
+        "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": "data.transport.http.authentication.username",
+        "label": "Username",
+        "optional": false,
+        "constraints": {
+          "notEmpty": true
+        },
+        "feel": "optional",
+        "group": "authentication",
+        "binding": {
+          "name": "data.transport.http.authentication.username",
+          "type": "zeebe:input"
         },
         "condition": {
           "allMatch": [
@@ -892,128 +1151,21 @@
           "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"
+        "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
@@ -1021,14 +1173,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"
             },
             {
@@ -1041,21 +1193,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"
             },
             {
@@ -1111,216 +1263,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",
@@ -1343,7 +1315,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": {
@@ -1355,7 +1327,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": {
@@ -1408,16 +1380,14 @@
   },
   {
     "$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": "connectors",
-      "name": "Connectors"
+      "id": "aiTools",
+      "name": "AI Tools"
     },
     "appliesTo": ["bpmn:Task"],
     "elementType": {
@@ -1450,8 +1420,8 @@
         "label": "Operation"
       },
       {
-        "id": "tools",
-        "label": "Tools",
+        "id": "filters",
+        "label": "Filters",
         "openByDefault": false
       },
       {
@@ -2303,12 +2273,32 @@
         "type": "Dropdown",
         "choices": [
           {
-            "name": "Call Tool",
-            "value": "tools/call"
+            "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 Tools",
-            "value": "tools/list"
+            "name": "List Prompts",
+            "value": "prompts/list"
+          },
+          {
+            "name": "Get Prompt",
+            "value": "prompts/get"
           }
         ]
       },
@@ -2370,336 +2360,346 @@
         "type": "String"
       },
       {
-        "id": "data.connectorMode.toolOperation.method",
-        "label": "Method",
-        "description": "The MCP method to be called, e.g. <code>tools/list</code>.",
+        "id": "data.connectorMode.operation.resourceUri",
+        "label": "Resource URI",
+        "description": "The URI of the resource to read.",
         "optional": false,
-        "value": "=toolCall.method",
         "constraints": {
           "notEmpty": true
         },
         "feel": "optional",
         "group": "operation",
         "binding": {
-          "name": "data.connectorMode.toolOperation.method",
+          "name": "data.connectorMode.operation.resourceUri",
           "type": "zeebe:input"
         },
         "condition": {
-          "property": "data.connectorMode.type",
-          "equals": "aiAgentTool",
-          "type": "simple"
+          "allMatch": [
+            {
+              "property": "data.connectorMode.operation.type",
+              "equals": "resources/read",
+              "type": "simple"
+            },
+            {
+              "property": "data.connectorMode.type",
+              "equals": "standalone",
+              "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",
+        "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.toolOperation.params",
+          "name": "data.connectorMode.operation.promptName",
           "type": "zeebe:input"
         },
         "condition": {
-          "property": "data.connectorMode.type",
-          "equals": "aiAgentTool",
-          "type": "simple"
+          "allMatch": [
+            {
+              "property": "data.connectorMode.operation.type",
+              "equals": "prompts/get",
+              "type": "simple"
+            },
+            {
+              "property": "data.connectorMode.type",
+              "equals": "standalone",
+              "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.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",
-        "binding": {
-          "name": "data.tools.included",
-          "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.",
+        "id": "data.connectorMode.operation.promptArguments",
+        "label": "Prompt arguments",
+        "description": "The arguments to pass to the prompt generation.",
         "optional": true,
         "feel": "required",
-        "group": "tools",
+        "group": "operation",
         "binding": {
-          "name": "data.tools.excluded",
+          "name": "data.connectorMode.operation.promptArguments",
           "type": "zeebe:input"
         },
-        "type": "Text"
-      },
-      {
-        "id": "version",
-        "label": "Version",
-        "description": "Version of the element template",
-        "value": "1",
-        "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",
-        "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",
-        "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": "retries",
-        "binding": {
-          "property": "retries",
-          "type": "zeebe:taskDefinition"
-        },
-        "type": "String"
-      },
-      {
-        "id": "retryBackoff",
-        "label": "Retry backoff",
-        "description": "ISO-8601 duration to wait between retries",
-        "value": "PT0S",
-        "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": "connectors",
-      "name": "Connectors"
-    },
-    "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": {
-          "property": "type",
-          "type": "zeebe:taskDefinition"
-        },
-        "type": "Hidden"
-      },
-      {
-        "value": "mcpClient",
-        "binding": {
-          "name": "io.camunda.agenticai.gateway.type",
-          "type": "zeebe:property"
+        "condition": {
+          "allMatch": [
+            {
+              "property": "data.connectorMode.operation.type",
+              "equals": "prompts/get",
+              "type": "simple"
+            },
+            {
+              "property": "data.connectorMode.type",
+              "equals": "standalone",
+              "type": "simple"
+            }
+          ]
         },
-        "type": "Hidden"
+        "type": "String"
       },
       {
-        "id": "data.connection.sseUrl",
-        "label": "SSE URL",
-        "description": "SSE URL to connect to the MCP server. Typically ends with <code>/sse</code>.",
+        "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": "connection",
+        "group": "operation",
         "binding": {
-          "name": "data.connection.sseUrl",
+          "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.connection.headers",
-        "label": "HTTP headers",
-        "description": "Map of HTTP headers to add to the request <strong>(NOT SUPPORTED YET)</strong>.",
+        "id": "data.connectorMode.toolOperation.params",
+        "label": "Parameters",
+        "description": "The parameters to be passed to the MCP method.",
         "optional": true,
-        "group": "connection",
+        "value": "=toolCall.params",
+        "feel": "required",
+        "group": "operation",
         "binding": {
-          "name": "data.connection.headers",
+          "name": "data.connectorMode.toolOperation.params",
           "type": "zeebe:input"
         },
-        "type": "Hidden"
+        "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.connection.timeout",
-        "label": "Timeout",
-        "description": "Timeout for individual HTTP requests as ISO-8601 duration (example: <code>PT30S</code>)",
+        "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,
-        "group": "connection",
+        "feel": "required",
+        "group": "filters",
         "binding": {
-          "name": "data.connection.timeout",
+          "name": "data.connectorMode.standaloneModeFilters.tools.included",
           "type": "zeebe:input"
         },
-        "type": "Hidden"
+        "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.tools.included",
-        "label": "Included tools",
-        "description": "List of tools that can be used by the MCP client. By default, all tools are allowed.",
+        "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": "tools",
+        "group": "filters",
         "binding": {
-          "name": "data.tools.included",
+          "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.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.",
+        "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": "tools",
+        "group": "filters",
         "binding": {
-          "name": "data.tools.excluded",
+          "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.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
+        "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"
         },
-        "feel": "optional",
-        "group": "operation",
+        "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.operation.method",
+          "name": "data.connectorMode.standaloneModeFilters.prompts.included",
           "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"
+        "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.operation.params",
-        "label": "Parameters",
-        "description": "The parameters to be passed to the MCP method.",
+        "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,
-        "value": "=toolCall.params",
         "feel": "required",
-        "group": "operation",
+        "group": "filters",
         "binding": {
-          "name": "data.operation.params",
+          "name": "data.connectorMode.standaloneModeFilters.prompts.excluded",
           "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"
+        "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": "0",
+        "value": "2",
         "group": "connector",
         "binding": {
           "key": "elementTemplateVersion",
@@ -2722,7 +2722,7 @@
       {
         "id": "resultVariable",
         "label": "Result variable",
-        "description": "Name of variable to store the response in",
+        "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": {
@@ -2734,7 +2734,7 @@
       {
         "id": "resultExpression",
         "label": "Result expression",
-        "description": "Expression to map the response into process variables",
+        "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": {