Merge remote-tracking branch 'upstream/development' into development

Author: github-actions[bot]

.claude/settings.json

@@ -183,5 +183,8 @@
       }
     ]
   },
-  "statusline": ".claude/statusline.sh"
+  "statusLine": {
+    "type": "command",
+    "command": ".claude/statusline.sh"
+  }
 }

.github/workflows/check-claude-settings.yml

@@ -18,7 +18,7 @@ jobs:
 
             You've modified Claude Code configuration files. These files contain the shared configuration for all contributors. Please revert this change if unintended. **ONLY modify these files if you need to change shared configurations that apply to everyone and have discussed this change with the TW team.**
 
-            To override the Claude settings locally, use \`.claude/settings.local.json\` instead.
+            To override the Claude settings locally, use \`.claude/settings.local.json\` instead. This local file is gitignored and overrides the repo default.
 
             **For example, if you're changing AWS_PROFILE:**
             The default profile name is \`my-sandbox\`. If your AWS profile has a different name, override it locally instead of changing the shared file.
@@ -32,8 +32,7 @@ jobs:
               }
             }
             \`\`\`
-
-            This local file is gitignored and overrides the repo default.`;
+            `;
 
             github.rest.issues.createComment({
               issue_number: context.issue.number,

content/en/docs/deployment/general/populate-user-type.md

@@ -50,7 +50,7 @@ For more information, refer to the User Provisioning section of the following mo
 
 * [OIDC SSO](/appstore/modules/oidc/#custom-provisioning-rt)
 * [SCIM](/appstore/modules/scim/#user-provisioning)
-* [SAML](/appstore/modules/saml/#custom-provisioning-rt)
+* [SAML](/appstore/modules/saml/user-provisioning/#custom-provisioning-rt)
 
 #### Prerequisites for IdP-Based User Classification
 

content/en/docs/deployment/private-cloud/private-cloud-deploy/_index.md

@@ -130,22 +130,30 @@ All environments are defined as production environments, which means that [secur
 
 8. Click **Next**.
 
-    {{< figure src="/attachments/deployment/private-cloud/private-cloud-deploy/configureEnvResources.png" class="no-border" >}}
+    {{< figure src="/attachments/deployment/private-cloud/private-cloud-deploy/configure-env-resources.png" class="no-border" >}}
 
 9. Select **Core Resources**.
 
     For core resources, there are two sets of values. The **Request** value is the amount of core resources which are initially requested. The **Limit** value is the maximum amount of resource that the environment can use.
 
-    There are three pre-defined sets of resources, **Small**, **Medium**, and **Large**. Choosing these will set the **CPU** and **Memory** values automatically.
+    There are six pre-defined sets of resources, **XS**, **S**, **M**, **L**, **XL**, and **XXL**.
+
+    Legacy plans are still visible with a **Legacy** prefix.
 
     | **Name** | **CPU cores**: Limit | **Memory (GB)**: Limit | **Ephemeral Storage (GB)**: Limit | **CPU cores**: Request | **Memory (GB)**: Request | **Ephemeral Storage (GB)**: Request |
     | --- | --- | --- | --- | --- | --- | --- |
-    | Small | 1 | 0.5 | 1 | 0.1 | 0.5 | 1 |
-    | Medium | 2 | 2 | 1 | 1 | 1 | 1 |
-    | Large | 4 | 4 | 1 | 2 | 2 | 1 |
+    | XS | 0.25 | 1 | 1 | 0.25 | 1 | 1 |
+    | S | 0.5 | 2 | 1 | 0.5 | 2 | 1 |
+    | M | 1 | 4 | 1 | 1 | 4 | 1 |
+    | L | 2 | 8 | 1 | 2 | 8 | 1 |
+    | XL | 4 | 16 | 1 | 4 | 16 | 1 |
+    | XXL | 8 | 32 | 1 | 4 | 32 | 1 |
+    | Legacy Small | 1 | 0.5 | 1 | 0.1 | 0.5 | 1 |
+    | Legacy Medium | 2 | 2 | 1 | 1 | 1 | 1 |
+    | Legacy Large | 4 | 4 | 1 | 2 | 2 | 1 |
     | Custom | own choice | own choice | own choice | own choice | own choice | own choice |
 
-    Alternatively, you can choose **Custom**, and enter your own requirements for **CPU** and **Memory**. Ensure that these values are the same or greater than the values for a *Small* environment, otherwise you may run into problems running your app.
+    Alternatively, you can choose **Custom**, and enter your own requirements for **CPU** and **Memory**. Ensure that these values are the same or greater than the values for a *Legacy Small* environment, otherwise you may run into problems running your app. Existing environments will continue to utilize their legacy resources.
 
     {{% alert color="info" %}}If the cluster manager has added and enabled customized core resource plan on Cluster manager page, only the configured custom core resource plans will be visible for selection. Once the custom core resources plans are enabled, environments cannot be created using the default plans until all the associated environments using the custom core resource plan are deleted and the custom resource plan is disabled on the **Cluster manager** page.{{% /alert %}}
 
@@ -521,7 +529,7 @@ For a *connected* cluster, the top level MendixApp CRD will be deleted from the
 
 * The database will be dropped and the database user will be deleted from the database server — databases and users from other environments will remain untouched.
 
-    {{% alert color="info" %}}If the storage plan is using a JDBC plan (not Postgres or SQL Server), the database and the user will remain untouched).{{% /alert %}}
+    {{% alert color="info" %}}If the storage plan is using a JDBC plan (not Postgres or SQL Server), the database and the user will remain untouched.{{% /alert %}}
 
 * Files related to that environment will be deleted from the S3/Minio storage bucket (or prefix if this is using a shared bucket).
 
@@ -539,6 +547,13 @@ Images are not deleted from the container registry. You should delete those imag
 If any of these garbage collection steps fail, you will no longer see the environment in the Mendix Portal, and will have to [delete the storage instances](#delete-storage) manually.
 {{% /alert %}}
 
+##### Custom JVM Heap Memory
+
+Adjust the JVM memory usage manually if the default settings are not fully utilizing available memory. The JVM's memory usage must always remain below the total core resource memory to prevent application crashloops.
+For more information, see [JVM Memory Tuning for Mendix on Kubernetes](/developerportal/deploy/private-cloud-jvm-memory-tuning/).
+
+{{< figure src="/attachments/deployment/private-cloud/private-cloud-deploy/change-jvm-heapmemory.png" class="no-border" >}}
+
 ##### Read-Only Root Filesystem
 
 [Read-only Root file system](/developerportal/deploy/private-cloud-cluster/#readonlyrootfs) can be enabled per environment. By default, this option is disabled. 

content/en/docs/developerportal/maia-plan.md

@@ -80,7 +80,6 @@ Once the **Solution Proposal** window is populated, you can see the following in
     * To see the full details of a story or to edit it, click the three-dot menu, then select **Edit**.    
     * To remove a story, click the three-dot menu, then select **Delete**.
 
-<!--
 #### Recommended Marketplace Components {#recommender}
 
 {{% alert color="warning" %}} This feature is in Public Beta. For more information, refer to Release Status. {{% /alert %}}
@@ -98,11 +97,10 @@ If your company does not have company-approved components, Maia returns the foll
 
 * platform-supported components
 * all Private Marketplace components
--->
 
 ### Opening the App
 
-Once you are happy with Maia's suggested project plan, click **Open in Studio Pro** in the top right of the page. This opens Studio Pro, where you can continue working on the new app. <!-- Note that, at the moment, Studio Pro does not take into account [recommended components](#recommender). -->    
+Once you are happy with Maia's suggested project plan, click **Open in Studio Pro** in the top right of the page. This opens Studio Pro, where you can continue working on the new app. Note that, at the moment, Studio Pro does not take into account [recommended components](#recommender).         
 For details, refer to [Maia Make](/refguide/maia-make/) in the Studio Pro documentation.    
 
-You can also click **Open in Planning** to open the **Planning** window of the new app, which includes  all the project's stories. <!-- Note that, if you click **Open in Planning** before Maia is done [finding recommendations](#recommender), recommended components are not displayed in the **Planning** window. -->
+You can also click **Open in Planning** to open the **Planning** window of the new app, which includes  all the project's stories. Note that, if you click **Open in Planning** before Maia is done [finding recommendations](#recommender), recommended components are not displayed in the **Planning** window. 

content/en/docs/marketplace/genai/how-to/create-single-agent.md

@@ -23,10 +23,11 @@ The type of agent you can build is a single-turn agent, which means that:
 * It focuses on specific task completion. 
 * It uses a knowledge base and function calling to retrieve data or perform actions.
 
-This document covers two approaches to defining an agent for your Mendix app. Both approaches leverage the capabilities of Mendix' Agents Kit:
+This document covers three approaches to defining an agent for your Mendix app. Both approaches leverage the capabilities of Mendix' Agents Kit:
 
-* The first approach uses the [Agent Builder UI to define agents](#define-agent-commons) at runtime by the principles of Agent Commons. It enables versioning, development iteration and refinement at runtime, separate from the traditional app logic development cycle. 
-* The second approach [defines the agent programmatically](#define-genai-commons) using the building blocks of GenAI Commons, and is more useful for very specific use cases and when the agent needs to be part of the code repository of the app.
+* The first approach uses the [Agent Editor in Studio Pro](#define-agent-editor). It is used for creating and iterating on agent definitions as part of the app model, leveraging existing development capabilities of the platform to define, manage and deploy agents as part of a Mendix app.
+* The second approach uses the [Agent Builder UI to define agents](#define-agent-commons) at runtime by the principles of Agent Commons. It enables versioning, development iteration and refinement at runtime, separate from the traditional app logic development cycle. 
+* The third approach [defines the agent programmatically](#define-genai-commons) using the building blocks of GenAI Commons. It is more useful for very specific use cases, especially when the agent needs to be part of the code repository of the app.
 
 ### Prerequisites {#prerequisites}
 
@@ -214,9 +215,17 @@ To get started:
 
 This method provides greater flexibility in managing and sharing functions across different applications and environments.
 
+## Define the Agent Using the Agent Editor {#define-agent-editor}
+
+The main approach to create and manage agents makes use of the [Agent Editor](https://marketplace.mendix.com/link/component/257918) in the Studio Pro. This extension allows you to manage the lifecycle of your agents as part of the app model. You can define Agents as documents of type "Agent" in your app while working in Studio Pro, alongside related documents such as Large Language Models, Knowledge bases, and Consumed MCP services.
+
+{{% alert color="warning" %}}
+The Agent Editor will become available shortly after the Mendix Studio Pro 11.9 release as a downloadable extension on the Mendix Marketplace. Click **Add to Saved** on the [Marketplace listing](https://marketplace.mendix.com/link/component/257918) and stay tuned for updates!
+{{% /alert %}}
+
 ## Define the Agent Using Agent Commons {#define-agent-commons}
 
-The main approach to set up the agent and build logic to generate responses is based on the logic part of the Agent Commons module. Start by defining an agent with a prompt at runtime, then, through the same UI, add tools, (microflows as functions) and knowledge bases to the agent version.
+An alternative approach to set up the agent and build logic to generate responses is based on the logic part of the Agent Commons module. Start by defining an agent with a prompt at runtime, then, through the same UI, add tools, (microflows as functions) and knowledge bases to the agent version.
 
 ### Set up the Agent with a Prompt
 
@@ -391,7 +400,7 @@ You can find examples for both Agent Commons and GenAI Commons in the `ExampleMi
 
 ## Define the Agent Using Microflows {#define-genai-commons}
 
-This is an alternative approach to the steps described in the [Define the Agent Using Agent Commons](#define-agent-commons) section. Find out how to set up the agent and build logic to generate responses, using microflows for empowering the agent. You start with a prompt at runtime, and add functions and knowledge bases to the microflow at design time.
+This is an additional approach as alternative to the steps described in previous sections. Find out how to set up the agent and build logic to generate responses, using microflows for empowering the agent. You start with a prompt at runtime, and add functions and knowledge bases to the microflow at design time.
 
 ### Create Your Agent
 

content/en/docs/marketplace/genai/reference-guide/agent-editor.md

@@ -0,0 +1,19 @@
+---
+title: "Agent Editor"
+url: /appstore/modules/genai/genai-for-mx/agent-editor/
+linktitle: "Agent Editor"
+description: "Describes the purpose, configuration, and usage of the Agents Editor and the Agent Editor Commons modules from the Mendix Marketplace that allows developers to build, define, and refine Agents, to integrate GenAI principles, and Agentic patterns into their Mendix app."
+weight: 20
+---
+
+## Introduction
+
+{{% alert color="warning" %}}
+The Agent Editor will become available shortly after the Mendix Studio Pro 11.9 release as a downloadable extension on the Mendix Marketplace. Click **Add to Saved** on the [Marketplace listing](https://marketplace.mendix.com/link/component/257918) and stay tuned for updates!
+{{% /alert %}}
+
+The [Agent Editor](https://marketplace.mendix.com/link/component/257918) module enables users to develop, test, and optimize their GenAI use cases by creating effective agents that interact with large language models (LLMs). With the Agent Editor module, you can define Agents at design time in the Studio Pro (11.9.0 and above), and manage their lifecycle as part of your project by taking advantage of existing platform capabilities such as model documents, version control, and deployment capabilities. You can define and develop Agents locally and consecutively deploy them to cloud environments directly with the app model.
+
+The Agent Editor is compatible with the Agent Commons module. Using this module, you can define and manage prompts, microflows (as tools), external MCP servers, knowledge bases, and large language models to build agentic patterns that support your business logic. Additionally, it allows you to define variables that act as placeholders for data from the app session context, which are replaced with actual values when the end user interacts with the app.
+
+The Agent Editor module includes a Studio Pro extension that allows users to define GenAI Agents as documents in the app model. The Agent Editor Commons module, which is installed as part of the same package, includes logic and activities to call these agents from microflows in a running application.