Merge branch 'development' into pr/pieroguerrero-mendix/11004

Author: Yiyun333

.claude/hooks/audit-log.sh

@@ -13,9 +13,9 @@ set -uo pipefail
 # ---------------------------------------------------------------------------
 INPUT="$(cat)"
 
-TOOL_NAME="$(printf '%s' "$INPUT" | python3 -c "import sys,json; print(json.load(sys.stdin).get('tool_name','unknown'))" 2>/dev/null || echo "unknown")"
+TOOL_NAME="$(printf '%s' "$INPUT" | jq -r '.tool_name // "unknown"' 2>/dev/null || echo "unknown")"
 
-COMMAND="$(printf '%s' "$INPUT" | python3 -c "import sys,json; print(json.load(sys.stdin).get('tool_input',{}).get('command',''))" 2>/dev/null || echo "")"
+COMMAND="$(printf '%s' "$INPUT" | jq -r '.tool_input.command // ""' 2>/dev/null || echo "")"
 
 # ---------------------------------------------------------------------------
 # 2. Determine log file path (relative to project root)

.claude/hooks/validate-bash-command.sh

@@ -14,14 +14,15 @@ set -euo pipefail
 # ---------------------------------------------------------------------------
 INPUT="$(cat)"
 
-TOOL_NAME="$(printf '%s' "$INPUT" | python3 -c "import sys,json; print(json.load(sys.stdin).get('tool_name',''))" 2>/dev/null || true)"
+TOOL_NAME="$(printf '%s' "$INPUT" | jq -r '.tool_name // ""' 2>/dev/null || true)"
 
-# Only validate Bash commands — allow everything else through
-if [[ "$TOOL_NAME" != "Bash" ]]; then
+# Only validate Bash commands — allow everything else through.
+# If TOOL_NAME is empty (parse failure), fall through to check the command anyway (fail closed).
+if [[ -n "$TOOL_NAME" && "$TOOL_NAME" != "Bash" ]]; then
   exit 0
 fi
 
-COMMAND="$(printf '%s' "$INPUT" | python3 -c "import sys,json; print(json.load(sys.stdin).get('tool_input',{}).get('command',''))" 2>/dev/null || true)"
+COMMAND="$(printf '%s' "$INPUT" | jq -r '.tool_input.command // ""' 2>/dev/null || true)"
 
 if [[ -z "$COMMAND" ]]; then
   exit 0
@@ -136,20 +137,19 @@ BLOCKED_PATTERNS=(
 # ---------------------------------------------------------------------------
 check_command() {
   local cmd="$1"
-  # Trim leading/trailing whitespace
-  cmd="$(echo "$cmd" | sed 's/^[[:space:]]*//;s/[[:space:]]*$//')"
+  # Trim leading/trailing whitespace using parameter expansion
+  cmd="${cmd#"${cmd%%[![:space:]]*}"}"
+  cmd="${cmd%"${cmd##*[![:space:]]}"}"
 
   if [[ -z "$cmd" ]]; then
     return 0
   fi
 
-  # Convert to lowercase for case-insensitive matching
-  local cmd_lower
-  cmd_lower="$(echo "$cmd" | tr '[:upper:]' '[:lower:]')"
+  # Convert to lowercase using parameter expansion
+  local cmd_lower="${cmd,,}"
 
   for pattern in "${BLOCKED_PATTERNS[@]}"; do
-    local pattern_lower
-    pattern_lower="$(echo "$pattern" | tr '[:upper:]' '[:lower:]')"
+    local pattern_lower="${pattern,,}"
 
     # shellcheck disable=SC2254
     if [[ "$cmd_lower" == $pattern_lower ]]; then
@@ -164,8 +164,12 @@ check_command() {
 # ---------------------------------------------------------------------------
 # 4. Split on pipes and command chains, then check each sub-command
 # ---------------------------------------------------------------------------
-# Replace common chain operators with a delimiter
-NORMALIZED="$(echo "$COMMAND" | sed 's/&&/\n/g; s/||/\n/g; s/;/\n/g; s/|/\n/g')"
+# Replace common chain operators with newlines using parameter expansion
+# Order matters: replace && and || before | to avoid double-splitting ||
+NORMALIZED="${COMMAND//&&/$'\n'}"
+NORMALIZED="${NORMALIZED//||/$'\n'}"
+NORMALIZED="${NORMALIZED//;/$'\n'}"
+NORMALIZED="${NORMALIZED//|/$'\n'}"
 
 while IFS= read -r subcmd; do
   check_command "$subcmd"

.github/workflows/branch-deletion-pr-creation.yml

@@ -38,10 +38,18 @@ jobs:
 
       - name: Process branches
         id: branch-data
+        env:
+          MIN_AGE_DAYS: ${{ github.event.inputs.min_age_days || '27' }}
         run: |
           set -e
           ALL_BRANCHES=$(git branch -r | grep -v "origin/HEAD" | sed 's/origin\///')
-          MIN_AGE_DAYS=${{ github.event.inputs.min_age_days || 27 }}
+          MIN_AGE_DAYS=${MIN_AGE_DAYS:-27}
+
+          echo "MIN_AGE_DAYS=${MIN_AGE_DAYS}"
+
+          PROTECTED_COUNT=0
+          MERGED_COUNT=0
+          UNMERGED_COUNT=0
 
           PROTECTED_BRANCHES=()
           MERGED_BRANCHES_TO_PROCESS=()
@@ -54,38 +62,56 @@ jobs:
 
           for BRANCH in $ALL_BRANCHES; do
             branch_lower=$(echo "$BRANCH" | tr '[:upper:]' '[:lower:]')
-            if [[ $branch_lower =~ (backup|development|main|master|production) ]]; then
-              PROTECTED_BRANCHES+=("$BRANCH (protected)")
+            if [[ $branch_lower == *backup* || $branch_lower =~ ^(development|main|master|production)(-[0-9]+)?$ ]]; then
+              PROTECTED_BRANCHES+=("$BRANCH")
+              PROTECTED_COUNT=$((PROTECTED_COUNT+1))
             elif git branch -r --merged origin/development | grep -q "origin/$BRANCH"; then
               MERGED_BRANCHES_TO_PROCESS+=("$BRANCH")
+              MERGED_COUNT=$((MERGED_COUNT+1))
             else
-              UNMERGED_BRANCHES+=("$BRANCH (not merged)")
+              UNMERGED_BRANCHES+=("$BRANCH")
+              UNMERGED_COUNT=$((UNMERGED_COUNT+1))
             fi
           done
 
+          echo "branch totals: protected=${PROTECTED_COUNT} merged=${MERGED_COUNT} unmerged=${UNMERGED_COUNT}"
+
           for BRANCH in "${MERGED_BRANCHES_TO_PROCESS[@]}"; do
             MERGE_HASH=$(git log --grep="Merge branch.*$BRANCH" origin/development -n 1 --pretty=format:"%H" || true)
-            [ -z "$MERGE_HASH" ] && MERGE_HASH=$(git log -n 1 origin/$BRANCH --pretty=format:"%H")
-            
-            MERGE_DATE=$(git show -s --format=%ct $MERGE_HASH)
-            DAYS_AGO=$(( ($(date +%s) - MERGE_DATE) / 86400 ))
-            
+            if [ -z "$MERGE_HASH" ]; then
+              MERGE_HASH=$(git log -n 1 origin/$BRANCH --pretty=format:"%H" || true)
+            fi
+
+            if [ -z "$MERGE_HASH" ]; then
+              echo "WARN: no merge commit found for $BRANCH — skipping"
+              UNMERGED_BRANCHES+=("$BRANCH (no-merge-hash)")
+              UNMERGED_COUNT=$((UNMERGED_COUNT+1))
+              continue
+            fi
+
+            MERGE_DATE_EPOCH=$(git show -s --format=%ct $MERGE_HASH 2>/dev/null || true)
+            if [ -z "$MERGE_DATE_EPOCH" ]; then
+              echo "WARN: could not read commit date for $BRANCH (hash=$MERGE_HASH) — skipping"
+              UNMERGED_BRANCHES+=("$BRANCH (no-merge-date)")
+              UNMERGED_COUNT=$((UNMERGED_COUNT+1))
+              continue
+            fi
+
+            DAYS_AGO=$(( ($(date +%s) - MERGE_DATE_EPOCH) / 86400 ))
+
             if [[ $DAYS_AGO -ge $MIN_AGE_DAYS ]]; then
-              BRANCHES_TO_DELETE+=("$BRANCH")
+              BRANCHES_TO_DELETE+=("$BRANCH (${DAYS_AGO}d since merge)")
             else
-              BRANCHES_TOO_RECENT+=("$BRANCH (too recent: ${DAYS_AGO}d)")
+              BRANCHES_TOO_RECENT+=("$BRANCH (${DAYS_AGO}d since merge)")
             fi
+            echo "checked $BRANCH: hash=$MERGE_HASH date=$MERGE_DATE_EPOCH days=${DAYS_AGO}"
           done
 
-           ALL_NON_DELETED=(
-            "${PROTECTED_BRANCHES[@]}" 
-            "${BRANCHES_TOO_RECENT[@]}"
-            "${UNMERGED_BRANCHES[@]}"
-          )
-
           echo "HAS_BRANCHES=$([ ${#BRANCHES_TO_DELETE[@]} -gt 0 ] && echo true || echo false)" >> $GITHUB_ENV
           echo "BRANCHES_TO_DELETE=$(printf -- '- %s\n' "${BRANCHES_TO_DELETE[@]}" | jq -Rs .)" >> $GITHUB_ENV
-          echo "ALL_NON_DELETED=$(printf -- '- %s\n' "${ALL_NON_DELETED[@]}" | jq -Rs .)" >> $GITHUB_ENV
+          echo "PROTECTED_BRANCHES=$(printf -- '- %s\n' "${PROTECTED_BRANCHES[@]}" | jq -Rs .)" >> $GITHUB_ENV
+          echo "BRANCHES_TOO_RECENT=$(printf -- '- %s\n' "${BRANCHES_TOO_RECENT[@]}" | jq -Rs .)" >> $GITHUB_ENV
+          echo "UNMERGED_BRANCHES=$(printf -- '- %s\n' "${UNMERGED_BRANCHES[@]}" | jq -Rs .)" >> $GITHUB_ENV
 
       - name: Create Deletion PR
         if: env.HAS_BRANCHES == 'true'
@@ -97,8 +123,14 @@ jobs:
             ### Branches for Deletion
             ${{ fromJSON(env.BRANCHES_TO_DELETE) }}
 
-            ### Protected/Recent Branches
-            ${{ fromJSON(env.ALL_NON_DELETED) }}
+            ### Protected Branches
+            ${{ fromJSON(env.PROTECTED_BRANCHES) }}
+
+            ### Recent Merges (too recent to delete)
+            ${{ fromJSON(env.BRANCHES_TOO_RECENT) }}
+
+            ### Unmerged Branches
+            ${{ fromJSON(env.UNMERGED_BRANCHES) }}
           base: development
           labels: Internal WIP
           assignees: MarkvanMents,OlufunkeMoronfolu

.gitignore

@@ -8,6 +8,7 @@ hugo.exe
 /.hugo_build.lock
 /.claude/audit.log
 /.claude/settings.local.json
+/.mcp.json
 
 # For Mac users
 .DS_Store

content/en/docs/catalog/consume/_index.md

@@ -16,4 +16,4 @@ Common tasks for users who want to consume services from the Catalog include the
 * Using the [Integration pane](/refguide/integration-pane/)
 * Understanding how sources are related in the [Landscape](/data-hub/data-hub-landscape/)
 
-For an overview on consuming services, see [Consume Registered Assets](/catalog/consume/consume-registered-assets/). 
+For an overview on consuming services, see [Consume Registered Assets](/catalog/consume/consume-registered-assets/).

content/en/docs/community-tools/contribute-to-mendix-docs/markdown-shortcodes.md

@@ -189,7 +189,7 @@ If the tab pane contains code with an asterisk (`*`) in it, the linter rule for
 
 Mendix videos are hosted on Vidyard. For more information, see [the Videos section of the Style Guide](https://mendix.atlassian.net/wiki/spaces/RNDHB/pages/2510061889/Images+Icons+and+Videos#Videos).
 
-{{< vidyard "GwE17mzGma5NAvDnXrVdFA" >}}
+{{< vidyard id="GwE17mzGma5NAvDnXrVdFA" date_updated="YYYY-MM-DD" >}}
 
 ## Other Markdown and HTML Guidelines
 

content/en/docs/community-tools/how-to-set-up-your-partner-profile.md

@@ -75,8 +75,6 @@ If you already had projects in the old partner profile, they can be automaticall
 
 {{% alert color="info" %}}Ensure you have customer approval for publishing project references.{{% /alert %}}
 
-For technical support or questions, contact partnerfinder@mendix.com.
-
 ## Read More
 
 * [Mendix Profile](/portal/mendix-profile/)

content/en/docs/deployment/on-premises-design/ms-windows/_index.md

@@ -45,7 +45,7 @@ Before starting this how-to, make sure you have the following prerequisites:
 
     * Suitable database servers are MariaDB, MS SQL Server, MySQL, Oracle Database and PostgreSQL. See [System Requirements](/refguide/system-requirements/#databases) for more information
 
-* A local or domain user with the *“log on as a service”* local security policy set
+* A local user, domain user or group managed service account (gMSA) with the *“log on as a service”* local security policy set
 
 ## Installing the Mendix Service Console {#service-console}
 
@@ -88,32 +88,36 @@ To deploy a Mendix app using the Mendix Service Console, follow these steps:
     * **Display name** – the description of the app which is visible as a tooltip for the app in the left bar of the Mendix Service Console or as a column in the list of Windows services
     * **Description** – a description of the application that will be visible in the Mendix Service Console
     * **Startup type** – select whether you want the app to be started automatically when the server starts, started with a delay, started manually, or disabled altogether
-    * **User name** and **Password** – the app will always run under the user account given here, and the service will be installed with this user account configured (for more information, see [Prerequisites](#Prerequisites))
+    * **User name** and **Password** – the app will run under the user account given here, and the service will be installed with this user account configured (for more information, see [Prerequisites](#Prerequisites))
+    * **Install service with LocalSystem account** – optionally, select the checkbox if you want to use a gMSA account for a Mendix app instead of the user account given under **User name** and **Password**.
+    
+4. Click **Next >**. 
 
-4. Click **Next >**.
+5. Optionally, if you selected the **Install service with LocalSystem account** checkbox while creating the app, install the service once your app is created. The service will be installed with the LocalSystem account. (You can verify the service account type in the Services app of Windows.) Execute the following command in the administrator command prompt to change the account type to your gMSA: `sc.exe config MyServiceName obj= "YOURDOMAIN\MyGMSAAccount$"`. 
+Configure folder access permissions for gMSA account on the directory selected in the **Preferences** setting. For more information, refer to the [Installing the Mendix Service Console](/developerportal/deploy/deploy-mendix-on-microsoft-windows/#service-console) section above.
 
-    {{< figure src="/attachments/deployment/on-premises-design/ms-windows/18580728.png" >}}
+    {{< figure src="/attachments/deployment/on-premises-design/ms-windows/gmsa.png" >}}
 
-5. On the **Project Files** screen, click **Select app…**.
+6. On the **Project Files** screen, click **Select app…**.
 
     {{< figure src="/attachments/deployment/on-premises-design/ms-windows/service_console_selectapp.png" >}}
 
-6. Now select the **MDA** file that was [created in Mendix Studio Pro](/refguide/create-deployment-package-dialog/) and contains your application logic. After the installation of your MDA file, you will see which Mendix server (Mendix Runtime) version is needed.
+7. Now select the **MDA** file that was [created in Mendix Studio Pro](/refguide/create-deployment-package-dialog/) and contains your application logic. After the installation of your MDA file, you will see which Mendix server (Mendix Runtime) version is needed.
 
-7. Configure the **Database Settings**:
+8. Configure the **Database Settings**:
 
     * **Type** – the database server type
     * **Host** – the IP address or host name of the database server
     * **Name** – the database name
     * **User name** and **Password** – the database user name and password
 
-8. Click **Next >**.
+9. Click **Next >**.
 
     {{< figure src="/attachments/deployment/on-premises-design/ms-windows/18580726.png" >}}
 
-9. On the **Common Configuration** screen, keep the default settings. These settings should only be changed if this is needed for your application setup.
+10. On the **Common Configuration** screen, keep the default settings. These settings should only be changed if this is needed for your application setup.
 
-10. Click **Finish** and start the application.
+11. Click **Finish** and start the application.
 
 ## Configuring the Microsoft Internet Information Services Server{#configure-msiis}
 

content/en/docs/deployment/on-premises-design/ms-windows/automate-mendix-deployment-on-microsoft-windows.md

@@ -180,6 +180,48 @@ $appName = 'Name of Mendix app'
 Install-MxService $appName
 ```
 
+### Sample Script - Set App Runtime Settings
+
+The following script example demonstrates how to set runtime settings for your app. It applies custom runtime configuration settings to your application using a hashtable of key-value pairs.
+
+```text
+$appName = 'Name of Mendix app'
+$settings = @{
+    'MaxJavaHeapSize' = '2048'           
+    'DatabaseHost' = 'localhost'        
+}      
+
+# Set runtime settings
+Set-MxAppRuntimeSettings $appName -Settings $settings
+```
+
+### Sample Script - Set App Constant
+
+The following script example demonstrates how to set an application constant for your app. It updates a specific constant value in your Mendix app configuration.
+
+```text
+$appName = '{Name of your app}'
+$constants = @{
+    'constantName' = 'constantValue'
+    'constantName2' = 'constantValue2'
+}
+
+# Set application constant
+Set-MxAppConstants $appName -Constants $constants
+```
+
+### Sample Script - Get Server Id
+
+The `Start-MxApp` cmdlet automatically retrieves the Server ID (License ID) when starting a Mendix app. You can use this unique identifier for license tracking and application monitoring. The following script example demonstrates the process required to retrieve Server Id.
+
+```text
+# Start the Mendix app and get Server ID
+$app = Start-MxApp "MyAppName" -NoService -SynchronizeDatabase
+
+# Display the Server ID
+Write-Host "Server ID: $($app.ServerId)"
+```
+
 ## Troubleshooting
 
 If you encounter any issues while automating Mendix deployment on Windows using cmdlets, use the following troubleshooting tips to help you solve them.

content/en/docs/deployment/on-premises-design/ms-windows/sql-server/restoring-a-sql-server-database.md

@@ -15,7 +15,7 @@ This how-to teaches you how to do the following:
 
 For a deep-dive look into this action, check out this video:
 
-{{< vidyard "WZu7QtHZPjtYUTdcV58PKr?" >}}
+{{< vidyard id="WZu7QtHZPjtYUTdcV58PKr?" >}}
 
 ## Prerequisites