Merge branch 'development' into claude/investigate-issue-774-011CUUSx5mk2o87uHFSjWLww

Author: vadi2

.devcontainer/Dockerfile

@@ -1,23 +1,30 @@
 # See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.208.0/containers/cpp/.devcontainer/base.Dockerfile
 
-# [Choice] Debian / Ubuntu version (use Debian 11/9, Ubuntu 18.04/21.04 on local arm64/Apple Silicon): debian-11, debian-10, debian-9, ubuntu-21.04, ubuntu-20.04, ubuntu-18.04
-ARG VARIANT=debian-11
-FROM mcr.microsoft.com/devcontainers/cpp:0-${VARIANT}
+# [Choice] Debian / Ubuntu version: debian-13, debian-12, debian-11, ubuntu-24.04, ubuntu-22.04
+ARG VARIANT=debian-13
+FROM mcr.microsoft.com/devcontainers/cpp:${VARIANT}
 ENV DBUS_SESSION_BUS_ADDRESS="autolaunch:" DISPLAY=":1" LANG="en_US.UTF-8" LANGUAGE="en_US.UTF-8"
 
+# Add deb-multimedia repo for libpcre3-dev (not available in Debian 13+)
+RUN echo "deb http://www.deb-multimedia.org trixie main" >> /etc/apt/sources.list \
+    && apt-get update -oAcquire::AllowInsecureRepositories=true \
+    && apt-get install -y --allow-unauthenticated deb-multimedia-keyring \
+    && rm -rf /var/lib/apt/lists/*
+
 # Install C++ dependencies
 RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
-    && apt-get -y install --no-install-recommends build-essential git liblua5.1-dev  \
-        zlib1g-dev libhunspell-dev libpcre3-dev libzip-dev libboost-dev libyajl-dev  \
-        libpulse-dev lua-rex-pcre lua-filesystem lua-zip qtbase5-dev \
-        qtchooser qt5-qmake qtbase5-dev-tools qtmultimedia5-dev qttools5-dev luarocks\
-        ccache libpugixml-dev libqt5texttospeech5-dev qtspeech5-flite-plugin         \
-        qtspeech5-speechd-plugin libqt5opengl5-dev ninja-build firefox-esr           \
-    && apt-get clean                                        \
+    && apt-get -y install --no-install-recommends build-essential git libglu1-mesa-dev \
+        libgl1-mesa-dev liblua5.1-0-dev zlib1g-dev libhunspell-dev libpcre3-dev libpcre2-dev \
+        libzip-dev libboost-dev libyajl-dev libpulse-dev libsecret-1-dev lua-rex-pcre2 \
+        lua-filesystem lua-zip lua-sql-sqlite3 libxkbcommon-dev qmake6-bin qt6-base-dev \
+        libqt6opengl6-dev qt6-multimedia-dev qt6-tools-dev qtkeychain-qt6-dev luarocks ccache \
+        libpugixml-dev libqt6core5compat6-dev qt6-speech-dev ninja-build cmake libzstd-dev \
+        libsqlite3-dev libassimp-dev firefox-esr \
+    && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
-# Install Lua dependencies
-RUN luarocks install luautf8     \
+# Install Lua dependencies (lua-sql-sqlite3 and lua-rex-pcre2 are already installed via apt)
+RUN luarocks install luautf8 \
     && luarocks install lua-yajl \
-    && luarocks install lua-sql-sqlite3 2.6.1 \
+    && luarocks install lrexlib-pcre \
     && luarocks install busted

.devcontainer/devcontainer.json

@@ -4,9 +4,9 @@
 	"name": "C++",
 	"build": {
 		"dockerfile": "Dockerfile",
-		// Update 'VARIANT' to pick an Debian / Ubuntu OS version: debian-11, debian-10, debian-9, ubuntu-21.04, ubuntu-20.04, ubuntu-18.04
-		// Use Debian 11, Debian 9, Ubuntu 18.04 or Ubuntu 21.04 on local arm64/Apple Silicon
-		"args": { "VARIANT": "debian-11" }
+		// Update 'VARIANT' to pick an Debian / Ubuntu OS version: debian-12, debian-11, ubuntu-24.04, ubuntu-22.04
+		// Use Debian 12, Debian 11, Ubuntu 22.04 or Ubuntu 24.04 on local arm64/Apple Silicon
+		"args": { "VARIANT": "debian-13" }
 	},
 	"runArgs": ["--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined"],
 
@@ -16,7 +16,8 @@
 	// Add the IDs of extensions you want installed when the container is created.
 	"extensions": [
 		"ms-vscode.cpptools",
-		"ms-vscode.cmake-tools"
+		"ms-vscode.cmake-tools",
+		"ms-dotnettools.vscode-dotnet-runtime"
 	],
 
 	"forwardPorts": [5900, 5901, 6080],
@@ -32,10 +33,10 @@
 	// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
 	"remoteUser": "vscode",
 	"features": {
-    "desktop-lite": {
-        "password": "mudlet",
-        "webPort": "6080",
-        "vncPort": "5901"
-    }
+		"ghcr.io/devcontainers/features/desktop-lite:1": {
+			"password": "mudlet",
+			"webPort": "6080",
+			"vncPort": "5901"
+		}
 	}
 }

.github/workflows/build-mudlet-win.yml

@@ -29,7 +29,7 @@ jobs:
     - name: Checkout Mudlet source code
       uses: actions/checkout@v6
       with:
-        submodules: true
+        submodules: recursive
         fetch-depth: 0
 
     - name: (Windows) Setup MSYS2
@@ -62,8 +62,25 @@ jobs:
         GITHUB_SCHEDULED_BUILD: ${{ github.event_name == 'schedule' || github.event.inputs.scheduled == 'true' }}
         GITHUB_PULL_REQUEST_NUMBER: ${{ github.event.pull_request.number }}
         GITHUB_PULL_REQUEST_HEAD_SHA: ${{ github.event.pull_request.head.sha }}
+        # Enable debug sending only for tags and scheduled builds (Release builds and PTB builds)
+        SENTRY_SEND_DEBUG: ${{ (startsWith(github.ref, 'refs/tags/') || github.event_name == 'schedule' || github.event.inputs.scheduled == 'true') && '1' || '0' }}
+        SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+        SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
+        WITH_SENTRY: "ON"
       run: $GITHUB_WORKSPACE/CI/build-mudlet-for-windows.sh
 
+    - name: (Windows) Run QTest
+      shell: msys2 {0}
+      run: |
+        LUA_PATH=$(cygpath -u "$(luarocks --lua-version 5.1 path --lr-path)" )
+        export LUA_PATH
+        LUA_CPATH=$(cygpath -u "$(luarocks --lua-version 5.1 path --lr-cpath)" )
+        export LUA_CPATH
+
+        ctest --test-dir $GITHUB_WORKSPACE/build-$MSYSTEM/test --output-on-failure
+      env:
+        QT_FORCE_STDERR_LOGGING: 1
+
     - name: (Windows) Run Lua tests
       timeout-minutes: 5
       shell: msys2 {0}
@@ -98,7 +115,9 @@ jobs:
     - name: (Windows) Package
       shell: msys2 {0}
       run: $GITHUB_WORKSPACE/CI/package-mudlet-for-windows.sh
-
+      env:
+        WITH_SENTRY: "ON"
+  
     - name: (Windows) Login to Azure
       uses: azure/login@v2
       if: github.actor != 'dependabot[bot]' && (github.event_name == 'push' || github.event_name == 'schedule' || github.event.inputs.scheduled == 'true' || github.event.pull_request.head.repo.full_name == github.repository)

.github/workflows/build-mudlet.yml

@@ -63,7 +63,7 @@ jobs:
     - name: Checkout Mudlet source code
       uses: actions/checkout@v6
       with:
-        submodules: true
+        submodules: recursive
         fetch-depth: 0
 
     - name: Install Qt
@@ -97,7 +97,7 @@ jobs:
         HOMEBREW_NO_INSTALL_CLEANUP: "ON"
       run: |
         # Install all required dependencies
-        brew install libzzip libzip ccache expect assimp hunspell pcre pugixml sqlite yajl boost
+        brew install libzzip libzip ccache expect assimp hunspell pcre2 pugixml sqlite yajl boost
 
         echo "CCACHE_DIR=${{runner.workspace}}/ccache" >> $GITHUB_ENV
 
@@ -117,8 +117,8 @@ jobs:
         # The action installs to .lua/ and .luarocks/ in the runner home
         echo "LUA_DIR=$HOME/.lua" >> $GITHUB_ENV
 
-        # Help CMake find keg-only Homebrew packages (PCRE is keg-only on macOS)
-        echo "PKG_CONFIG_PATH=${HOMEBREW_PREFIX}/opt/pcre/lib/pkgconfig:$PKG_CONFIG_PATH" >> $GITHUB_ENV
+        # Help CMake find keg-only Homebrew packages (PCRE2 is keg-only on macOS)
+        echo "PKG_CONFIG_PATH=${HOMEBREW_PREFIX}/opt/pcre2/lib/pkgconfig:$PKG_CONFIG_PATH" >> $GITHUB_ENV
 
         # Install lua-yajl early to generate translation statistics
         luarocks --lua-version 5.1 install --local lua-yajl YAJL_DIR=${HOMEBREW_PREFIX}/opt/yajl
@@ -154,19 +154,23 @@ jobs:
           imagemagick \
           libassimp-dev \
           libboost-dev \
+          libcurl4-openssl-dev \
           libglu1-mesa-dev \
           libhunspell-dev \
           liblua5.1-0-dev \
-          libpcre3-dev \
+          libpcre2-dev \
           libpulse-dev \
           libpugixml-dev \
           libsecret-1-dev \
           libsqlite3-dev \
           libxkbcommon-x11-0 \
           libyajl-dev \
           libzip-dev \
-          pcregrep \
+          pcre2-utils \
           pkg-config \
+          libssl-dev \
+          openssl \
+          ca-certificates \
           -y
 
         # switch to GCC that supports C++20 while retaining support for older OS's
@@ -207,7 +211,7 @@ jobs:
       env:
         GITHUB_EVENT_INPUTS_SCHEDULED: ${{inputs.scheduled}}
       run: |
-        sudo apt-get -y install pcregrep
+        sudo apt-get -y install pcre2-utils
         ${{github.workspace}}/CI/travis.validate_deployment.sh
         ${{github.workspace}}/CI/travis.set-build-info.sh
 
@@ -216,7 +220,7 @@ jobs:
       env:
         GITHUB_EVENT_INPUTS_SCHEDULED: ${{inputs.scheduled}}
       run: |
-        brew install pcre
+        brew install pcre2
         ${{github.workspace}}/CI/travis.validate_deployment.sh
         ${{github.workspace}}/CI/travis.set-build-info.sh
         # ccache can't reliably detect that the compiler is clang on macOS, so just say so explicitly.
@@ -237,8 +241,12 @@ jobs:
           -DCMAKE_PREFIX_PATH=${{ env.QT_PREFIX != '' && env.QT_PREFIX || env.MINGW_BASE_DIR }}
           ${{ runner.os == 'macOS' && format('-DLUA_INCLUDE_DIR={0}/.lua/include -DLUA_LIBRARY={0}/.lua/lib/liblua.a', github.workspace) || '' }}
           -DUSE_SANITIZER=""
+          -DWITH_SENTRY=ON
+          -DSENTRY_SEND_DEBUG=${{ (startsWith(github.ref, 'refs/tags/') || github.event_name == 'schedule' || github.event.inputs.scheduled == 'true') && '1' || '0' }}
+          -DSENTRY_DSN=${{ secrets.SENTRY_DSN }}
       env:
         NINJA_STATUS: '[%f/%t %o/sec] '
+        SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
 
     - name: Save ccache
       if: always() && steps.restore-ccache.outputs.cache-hit != 'true'
@@ -255,6 +263,11 @@ jobs:
       working-directory: '${{runner.workspace}}/b/ninja'
       run: ctest --output-on-failure
 
+    - name: Run QTest
+      run: ctest --test-dir ${{runner.workspace}}/b/ninja -L functional --output-on-failure
+      env:
+        QT_FORCE_STDERR_LOGGING: 1
+
     - name: install dependencies for packaging/tests
       if: matrix.deploy == 'deploy' || matrix.run_tests == 'true'
       run: |
@@ -266,11 +279,11 @@ jobs:
         if [ "$RUNNER_OS" = "macOS" ]; then
           $LUAROCKS lua-zip ZIP_DIR=${HOMEBREW_PREFIX}/opt/libzip
           $LUAROCKS LuaSQL-SQLite3 2.6.1 SQLITE_DIR=${HOMEBREW_PREFIX}/opt/sqlite
-          $LUAROCKS lrexlib-pcre PCRE_DIR=${HOMEBREW_PREFIX}/opt/pcre
+          $LUAROCKS lrexlib-pcre2 PCRE2_DIR=${HOMEBREW_PREFIX}/opt/pcre2
         else
           $LUAROCKS lua-zip
           $LUAROCKS LuaSQL-SQLite3 2.6.1
-          $LUAROCKS lrexlib-pcre
+          $LUAROCKS lrexlib-pcre2
         fi
 
         # CI changelog generation dependencies
@@ -323,6 +336,7 @@ jobs:
         APPLE_USERNAME: ${{secrets.APPLE_USERNAME}}
         APPLE_PASSWORD: ${{secrets.APPLE_PASSWORD}}
         APPLE_TEAM_ID: ${{secrets.APPLE_TEAM_ID}}
+        WITH_SENTRY: "ON"
 
     - name: Upload packaged Mudlet
       uses: actions/upload-artifact@v5

.github/workflows/clangtidy-diff-analysis.yml

@@ -6,6 +6,12 @@ on:
     - '**.cpp'
     - '**.h'
     - '.github/workflows/clangtidy-diff-analysis.yml'
+  workflow_dispatch:
+    inputs:
+      pr_number:
+        description: 'PR number to analyze (required for clang-tidy to have files to check)'
+        required: true
+        type: number
 
 jobs:
   compile-mudlet:
@@ -29,7 +35,7 @@ jobs:
     - name: Checkout Mudlet source code
       uses: actions/checkout@v6
       with:
-        submodules: true
+        submodules: recursive
         fetch-depth: 0
         # https://github.com/ZedThree/clang-tidy-review/issues/10
         ref: ${{ github.event.pull_request.head.sha }}
@@ -79,6 +85,17 @@ jobs:
     - name: Use CMake 3.30.3
       uses: lukka/get-cmake@v3.30.3
 
+    - name: (Linux) Install Lua via GitHub Actions
+      uses: leafo/gh-actions-lua@v12
+      if: runner.os == 'Linux'
+      with:
+        luaVersion: "5.1.5"
+        buildCache: false
+
+    - name: (Linux) Install Luarocks via GitHub Actions
+      uses: leafo/gh-actions-luarocks@v6
+      if: runner.os == 'Linux'
+
     - name: (Linux) Install dependencies
       if: runner.os == 'Linux'
       run: |
@@ -87,9 +104,15 @@ jobs:
         # Install all required dependencies
         # liblua5.1-0-dev is needed for CMake to find Lua headers/library
         sudo apt-get install libsecret-1-dev ccache pkg-config libzip-dev libglu1-mesa-dev libpulse-dev \
-          libassimp-dev libpcre3-dev libpugixml-dev libsqlite3-dev libyajl-dev libhunspell-dev liblua5.1-0-dev libboost-dev -y
+          libassimp-dev libpcre2-dev libpugixml-dev libsqlite3-dev libyajl-dev libhunspell-dev liblua5.1-0-dev libboost-dev -y
+
+        # Install lua-yajl early to generate translation statistics
+        luarocks install --local lua-yajl
 
-        echo "Skipping generation of translation stats, so not installing lua-yajl."
+        # Allow stats generation script to see location of lua-yajl
+        eval "$(luarocks path --local --lua-version "5.1")"
+        echo "LUA_PATH=$LUA_PATH" >> $GITHUB_ENV
+        echo "LUA_CPATH=$LUA_CPATH" >> $GITHUB_ENV
 
     - name: Generate compile_commands.json
       uses: lukka/run-cmake@v3
@@ -107,15 +130,18 @@ jobs:
           --target autogen
 
     - name: Check C++ changes against style guide
-      uses: ZedThree/clang-tidy-review@v0.22.1
+      uses: ZedThree/clang-tidy-review@v0.22.2
       id: static_analysis
       with:
+        pr: ${{ inputs.pr_number || github.event.pull_request.number }}
         build_dir: 'b/ninja' # path is relative to checkout directory
         exclude: '3rdparty'
         config_file: '.clang-tidy'
         # the action doesn't see system-level libraries, need to replicate them here
-        apt_packages: 'gettext, pkg-config, libzip-dev, libglu1-mesa-dev, libpulse-dev'
+        apt_packages: 'gettext, pkg-config, libzip-dev, libglu1-mesa-dev, libpulse-dev, libpcre3-dev, liblua5.1-0-dev, libassimp-dev, libboost-dev, libhunspell-dev, libpugixml-dev, libsecret-1-dev, libsqlite3-dev, libyajl-dev'
+        # workaround for https://github.com/ZedThree/clang-tidy-review/issues/157
+        extra_arguments: '--allow-no-checks'
         split_workflow: true
 
     - name: Upload check results
-      uses: ZedThree/clang-tidy-review/upload@v0.22.1
+      uses: ZedThree/clang-tidy-review/upload@v0.22.2

.github/workflows/clangtidy-post-comments.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: ZedThree/clang-tidy-review/post@v0.22.1
+      - uses: ZedThree/clang-tidy-review/post@v0.22.2
         with:
           # don't post any comments if the PR is fine
           lgtm_comment_body: ''

.github/workflows/codeql-analysis.yml

@@ -44,7 +44,7 @@ jobs:
         # We must fetch at least the immediate parents so that if this is
         # a pull request then we can checkout the head.
         fetch-depth: 2
-        submodules: true
+        submodules: recursive
 
     - name: (Windows) Install Qt
       uses: jurplel/install-qt-action@v4
@@ -118,8 +118,8 @@ jobs:
 
         # Install all required dependencies
         # liblua5.1-0-dev is needed for CMake to find Lua headers/library
-        sudo apt-get install libsecret-1-dev ccache pkg-config pcregrep expect libzip-dev libglu1-mesa-dev libpulse-dev g++-${{matrix.gcc_compiler_version}} \
-          libassimp-dev libpcre3-dev libpugixml-dev libsqlite3-dev libyajl-dev libhunspell-dev liblua5.1-0-dev libboost-dev -y
+        sudo apt-get install libsecret-1-dev ccache pkg-config pcre2-utils expect libzip-dev libglu1-mesa-dev libpulse-dev g++-${{matrix.gcc_compiler_version}} \
+          libassimp-dev libpcre2-dev libpugixml-dev libsqlite3-dev libyajl-dev libhunspell-dev liblua5.1-0-dev libboost-dev -y
 
         # switch to GCC that supports C++20 while retaining support for older OS's
         sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${{matrix.gcc_compiler_version}} ${{matrix.gcc_compiler_version}}

.github/workflows/performance-analysis.yml

@@ -25,19 +25,21 @@ jobs:
       uses: actions/checkout@v6
       with:
         fetch-depth: 0
-        submodules: true
+        submodules: recursive
 
     - name: Use CMake 3.30.3
       uses: lukka/get-cmake@v3.30.3
 
     - name: Install dependencies
       run: |
         sudo apt-get update
-        sudo apt-get install build-essential git liblua5.1-dev zlib1g-dev libhunspell-dev libpcre3-dev \
-          libzip-dev libboost-graph-dev libyajl-dev libpulse-dev lua-rex-pcre lua-filesystem lua-zip \
+        sudo apt-get install build-essential git liblua5.1-dev zlib1g-dev libhunspell-dev libpcre2-dev \
+          libzip-dev libboost-graph-dev libyajl-dev libpulse-dev lua-filesystem lua-zip \
           lua-sql-sqlite3 qt6-multimedia-dev qt6-tools-dev luarocks ccache libpugixml-dev cmake ninja-build \
           xvfb libassimp-dev -y
 
+        sudo luarocks install lrexlib-pcre2
+
         sudo luarocks install luautf8
         sudo luarocks install lua-yajl YAJL_LIBDIR=`find /usr -name "libyajl.so" -printf '%h\n'` YAJL_INCDIR=/usr/include