stashing for now, this adds the ability to fetch the username if it exists

2026-03-25 20:41:37 +00:00
2213 changed files with 91819 additions and 225050 deletions
@@ -8,9 +8,6 @@ build/
 **/build/
 out/
 target/
-**/target/
-bin/
-version_builds/

 # Gradle caches (local, not what's in the container)
 .gradle/
@@ -19,15 +16,9 @@ version_builds/
 # Node / frontend
 node_modules/
 **/node_modules/
-frontend/node_modules/
-frontend/dist/
 .npm/
 .yarn/

-# Tauri/desktop builds
-src-tauri/target/
-src-tauri/dist/
-
 # IDE and editor
 .idea/
 .vscode/
@@ -55,22 +46,7 @@ Dockerfile*
 **/test-results/
 **/jacoco/

-# Testing and documentation (not needed in build)
-testing/
-docs/
-*.md
-README*
-
 # Local env
 .env
 .env.*
 !.env.example
-!engine/.env
-
-# Misc
-*.swp
-*.swo
-*~
-.DS_Store
-.cache/
-.pytest_cache/
@@ -15,7 +15,6 @@ max_line_length = 100

 [*.py]
 indent_size = 4
-max_line_length = 120

 [*.gradle]
 indent_size = 4
@@ -1,29 +0,0 @@
-# Maintainer: Stirling PDF Inc <contact@stirlingpdf.com>
-pkgname=stirling-pdf-bin
-pkgver=2.7.3
-pkgrel=1
-pkgdesc="Locally hosted, web-based PDF manipulation tool (desktop app, prebuilt binary)"
-arch=('x86_64')
-url="https://www.stirling.com"
-license=('MIT' 'LicenseRef-Stirling-PDF-Proprietary')
-depends=('gtk3' 'webkit2gtk' 'libappindicator-gtk3')
-provides=('stirling-pdf')
-conflicts=('stirling-pdf' 'stirling-pdf-git')
-options=('!strip')
-
-source_x86_64=("${pkgname}-${pkgver}.deb::https://github.com/Stirling-Tools/Stirling-PDF/releases/download/v${pkgver}/Stirling-PDF-linux-x86_64.deb")
-sha256sums_x86_64=('PLACEHOLDER_DEB_SHA256')
-
-package() {
-    # Extract the .deb archive
-    bsdtar -xf data.tar* -C "${pkgdir}"
-
-    # Fix permissions
-    find "${pkgdir}" -type d -exec chmod 755 {} \;
-
-    # Install license
-    install -Dm644 /dev/stdin "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" <<EOF
-Copyright (c) 2025 Stirling PDF Inc
-All rights reserved. See https://github.com/Stirling-Tools/Stirling-PDF/blob/main/LICENSE
-EOF
-}
@@ -1,90 +0,0 @@
-# Maintainer: Stirling PDF Inc <contact@stirlingpdf.com>
-pkgname=stirling-pdf-server-bin
-pkgver=2.7.3
-pkgrel=1
-pkgdesc="Locally hosted, web-based PDF manipulation tool (server JAR, prebuilt)"
-arch=('any')
-url="https://www.stirling.com"
-license=('MIT' 'LicenseRef-Stirling-PDF-Proprietary')
-depends=('java-runtime>=21')
-provides=('stirling-pdf-server')
-conflicts=('stirling-pdf-server' 'stirling-pdf-server-git')
-backup=('etc/stirling-pdf-server/settings.yml')
-
-source=("Stirling-PDF-with-login-${pkgver}.jar::https://github.com/Stirling-Tools/Stirling-PDF/releases/download/v${pkgver}/Stirling-PDF-with-login.jar"
-        "stirling-pdf-server.service"
-        "stirling-pdf-server.sysusers"
-        "stirling-pdf-server.tmpfiles")
-sha256sums=('PLACEHOLDER_JAR_SHA256'
-            'PLACEHOLDER_SERVICE_SHA256'
-            'PLACEHOLDER_SYSUSERS_SHA256'
-            'PLACEHOLDER_TMPFILES_SHA256')
-
-prepare() {
-    cat > stirling-pdf-server.service << 'EOF'
-[Unit]
-Description=Stirling-PDF Server
-After=network.target
-
-[Service]
-Type=simple
-User=stirling-pdf
-Group=stirling-pdf
-WorkingDirectory=/var/lib/stirling-pdf-server
-ExecStart=/usr/bin/java -jar /usr/share/stirling-pdf-server/stirling-pdf-server.jar
-Restart=on-failure
-RestartSec=5
-StandardOutput=journal
-StandardError=journal
-SyslogIdentifier=stirling-pdf-server
-Environment=JAVA_OPTS=-Xmx512m
-
-[Install]
-WantedBy=multi-user.target
-EOF
-
-    cat > stirling-pdf-server.sysusers << 'EOF'
-u stirling-pdf - "Stirling-PDF Server" /var/lib/stirling-pdf-server -
-EOF
-
-    cat > stirling-pdf-server.tmpfiles << 'EOF'
-d /var/lib/stirling-pdf-server 0750 stirling-pdf stirling-pdf -
-d /var/log/stirling-pdf-server 0750 stirling-pdf stirling-pdf -
-EOF
-}
-
-package() {
-    # JAR
-    install -Dm644 "Stirling-PDF-with-login-${pkgver}.jar" \
-        "${pkgdir}/usr/share/stirling-pdf-server/stirling-pdf-server.jar"
-
-    # Wrapper script
-    install -Dm755 /dev/stdin "${pkgdir}/usr/bin/stirling-pdf-server" << 'EOF'
-#!/bin/sh
-exec java $JAVA_OPTS -jar /usr/share/stirling-pdf-server/stirling-pdf-server.jar "$@"
-EOF
-
-    # systemd unit
-    install -Dm644 stirling-pdf-server.service \
-        "${pkgdir}/usr/lib/systemd/system/stirling-pdf-server.service"
-
-    # sysusers / tmpfiles
-    install -Dm644 stirling-pdf-server.sysusers \
-        "${pkgdir}/usr/lib/sysusers.d/stirling-pdf-server.conf"
-    install -Dm644 stirling-pdf-server.tmpfiles \
-        "${pkgdir}/usr/lib/tmpfiles.d/stirling-pdf-server.conf"
-
-    # Default config stub
-    install -dm755 "${pkgdir}/etc/stirling-pdf-server"
-    install -Dm644 /dev/stdin "${pkgdir}/etc/stirling-pdf-server/settings.yml" << 'EOF'
-# Stirling-PDF Server configuration
-# See https://github.com/Stirling-Tools/Stirling-PDF for all options
-server:
-  port: 8080
-EOF
-
-    # License
-    install -Dm644 /dev/stdin "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" << 'EOF'
-MIT License — see https://github.com/Stirling-Tools/Stirling-PDF/blob/main/LICENSE
-EOF
-}
@@ -6,20 +6,14 @@ openapi: &openapi
  - *build
  - app/(common|core|proprietary)/src/main/java/**

-docker-base: &docker-base
-  - docker/base/Dockerfile
-  - ".github/workflows/push-docker-base.yml"
-
 docker: &docker
-  - docker/embedded/Dockerfile
-  - docker/embedded/Dockerfile.fat
-  - docker/embedded/Dockerfile.ultra-lite
+  - Dockerfile
+  - Dockerfile.fat
+  - Dockerfile.ultra-lite
  - ".github/workflows/build.yml"
-  - ".github/workflows/push-docker.yml"
  - scripts/init.sh
  - scripts/init-without-ocr.sh
  - exampleYmlFiles/**
-  - *docker-base

 project: &project
  - app/(common|core|proprietary)/src/(main|test)/java/**
@@ -30,7 +24,6 @@ project: &project
  - libs/**
  - "testing/**/!(requirements*.txt|requirements*.in)*"
  - *docker
-  - *docker-base
  - gradle.properties
  - gradlew
  - gradlew.bat
@@ -46,7 +39,8 @@ frontend: &frontend
  - testing/**
  - docker/**
  - scripts/translations/*.py
-  - .taskfiles/desktop.yml
+  - scripts/build-tauri-jlink.bat
+  - scripts/build-tauri-jlink.sh
  - scripts/convert_cff_to_ttf.py
  - scripts/harvest_type3_fonts.py
  - scripts/ignore_translation.toml
@@ -17,7 +17,7 @@ Closes #(issue_number)
 ### General

 - [ ] I have read the [Contribution Guidelines](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/CONTRIBUTING.md)
- [ ] I have read the [Stirling-PDF Developer Guide](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/DeveloperGuide.md) (if applicable)
+- [ ] I have read the [Stirling-PDF Developer Guide](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/devGuide/DeveloperGuide.md) (if applicable)
 - [ ] I have read the [How to add new languages to Stirling-PDF](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/devGuide/HowToAddNewLanguage.md) (if applicable)
 - [ ] I have performed a self-review of my own code
 - [ ] My changes generate no new warnings
@@ -37,5 +37,4 @@ Closes #(issue_number)

 ### Testing (if applicable)

- [ ] I have run `task check` to verify linters, typechecks, and tests pass
- [ ] I have tested my changes locally. Refer to the [Testing Guide](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/DeveloperGuide.md#7-testing) for more details.
+- [ ] I have tested my changes locally. Refer to the [Testing Guide](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/devGuide/DeveloperGuide.md#6-testing) for more details.
@@ -3,31 +3,6 @@ name: PR Deployment via Comment
 on:
  issue_comment:
    types: [created]
-  workflow_dispatch:
-    inputs:
-      pr_number:
-        description: "PR number to deploy"
-        required: true
-      enable_prototypes:
-        description: "Build with prototypes frontend"
-        required: false
-        type: boolean
-        default: false
-      enable_pro:
-        description: "Enable pro features"
-        required: false
-        type: boolean
-        default: false
-      enable_enterprise:
-        description: "Enable enterprise features"
-        required: false
-        type: boolean
-        default: false
-      disable_security:
-        description: "Disable security/login"
-        required: false
-        type: boolean
-        default: true

 permissions:
  contents: read
@@ -39,27 +14,23 @@ jobs:
    permissions:
      issues: write
    if: |
-      vars.CI_PROFILE != 'lite' && (
-        github.event_name == 'workflow_dispatch' ||
-        (
-          github.event.issue.pull_request &&
-          (
-            contains(github.event.comment.body, 'prdeploy') ||
-            contains(github.event.comment.body, 'deploypr')
-          )
-          &&
-          (
-            github.event.comment.user.login == 'frooodle' ||
-            github.event.comment.user.login == 'sf298' ||
-            github.event.comment.user.login == 'Ludy87' ||
-            github.event.comment.user.login == 'balazs-szucs' ||
-            github.event.comment.user.login == 'reecebrowne' ||
-            github.event.comment.user.login == 'DarioGii' ||
-            github.event.comment.user.login == 'EthanHealy01' ||
-            github.event.comment.user.login == 'jbrunton96' ||
-            github.event.comment.user.login == 'ConnorYoh'
-          )
-        )
+      vars.CI_PROFILE != 'lite' &&
+      github.event.issue.pull_request &&
+      (
+        contains(github.event.comment.body, 'prdeploy') ||
+        contains(github.event.comment.body, 'deploypr')
+      )
+      &&
+      (
+        github.event.comment.user.login == 'frooodle' ||
+        github.event.comment.user.login == 'sf298' ||
+        github.event.comment.user.login == 'Ludy87' ||
+        github.event.comment.user.login == 'balazs-szucs' ||
+        github.event.comment.user.login == 'reecebrowne' ||
+        github.event.comment.user.login == 'DarioGii' ||
+        github.event.comment.user.login == 'EthanHealy01' ||
+        github.event.comment.user.login == 'jbrunton96' ||
+        github.event.comment.user.login == 'ConnorYoh'
      )
    outputs:
      pr_number: ${{ steps.get-pr.outputs.pr_number }}
@@ -67,7 +38,6 @@ jobs:
      disable_security: ${{ steps.check-security-flag.outputs.disable_security }}
      enable_pro: ${{ steps.check-pro-flag.outputs.enable_pro }}
      enable_enterprise: ${{ steps.check-pro-flag.outputs.enable_enterprise }}
-      enable_prototypes: ${{ steps.check-prototypes-flag.outputs.enable_prototypes }}
    steps:
      - name: Harden Runner
        uses: step-security/harden-runner@58077d3c7e43986b6b15fba718e8ea69e387dfcc # v2.15.1
@@ -91,9 +61,7 @@ jobs:
        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
        with:
          script: |
-            const prNumber = context.eventName === 'workflow_dispatch'
-              ? context.payload.inputs.pr_number
-              : context.payload.issue.number;
+            const prNumber = context.payload.issue.number;
            console.log(`PR Number: ${prNumber}`);
            core.setOutput('pr_number', prNumber);

@@ -101,14 +69,12 @@ jobs:
        id: check-security-flag
        env:
          COMMENT_BODY: ${{ github.event.comment.body }}
-          IS_DISPATCH: ${{ github.event_name == 'workflow_dispatch' }}
-          DISPATCH_DISABLE_SECURITY: ${{ inputs.disable_security }}
        run: |
-          if [[ "$IS_DISPATCH" == "true" ]]; then
-            echo "disable_security=$DISPATCH_DISABLE_SECURITY" >> $GITHUB_OUTPUT
-          elif [[ "$COMMENT_BODY" == *"security"* ]] || [[ "$COMMENT_BODY" == *"login"* ]]; then
+          if [[ "$COMMENT_BODY" == *"security"* ]] || [[ "$COMMENT_BODY" == *"login"* ]]; then
+            echo "Security flags detected in comment"
            echo "disable_security=false" >> $GITHUB_OUTPUT
          else
+            echo "No security flags detected in comment"
            echo "disable_security=true" >> $GITHUB_OUTPUT
          fi

@@ -116,43 +82,22 @@ jobs:
        id: check-pro-flag
        env:
          COMMENT_BODY: ${{ github.event.comment.body }}
-          IS_DISPATCH: ${{ github.event_name == 'workflow_dispatch' }}
-          DISPATCH_PRO: ${{ inputs.enable_pro }}
-          DISPATCH_ENTERPRISE: ${{ inputs.enable_enterprise }}
        run: |
-          if [[ "$IS_DISPATCH" == "true" ]]; then
-            echo "enable_pro=$DISPATCH_PRO" >> $GITHUB_OUTPUT
-            echo "enable_enterprise=$DISPATCH_ENTERPRISE" >> $GITHUB_OUTPUT
-          elif [[ "$COMMENT_BODY" == *"pro"* ]] || [[ "$COMMENT_BODY" == *"premium"* ]]; then
+          if [[ "$COMMENT_BODY" == *"pro"* ]] || [[ "$COMMENT_BODY" == *"premium"* ]]; then
+            echo "pro flags detected in comment"
            echo "enable_pro=true" >> $GITHUB_OUTPUT
            echo "enable_enterprise=false" >> $GITHUB_OUTPUT
          elif [[ "$COMMENT_BODY" == *"enterprise"* ]]; then
+            echo "enterprise flags detected in comment"
            echo "enable_enterprise=true" >> $GITHUB_OUTPUT
            echo "enable_pro=true" >> $GITHUB_OUTPUT
          else
+            echo "No pro or enterprise flags detected in comment"
            echo "enable_pro=false" >> $GITHUB_OUTPUT
            echo "enable_enterprise=false" >> $GITHUB_OUTPUT
          fi

-      - name: Check for prototypes flag
-        id: check-prototypes-flag
-        env:
-          COMMENT_BODY: ${{ github.event.comment.body }}
-          IS_DISPATCH: ${{ github.event_name == 'workflow_dispatch' }}
-          DISPATCH_PROTOTYPES: ${{ inputs.enable_prototypes }}
-        run: |
-          if [[ "$IS_DISPATCH" == "true" ]]; then
-            echo "enable_prototypes=$DISPATCH_PROTOTYPES" >> $GITHUB_OUTPUT
-          elif [[ "$COMMENT_BODY" == *"prototypes"* ]]; then
-            echo "Prototypes flag detected in comment"
-            echo "enable_prototypes=true" >> $GITHUB_OUTPUT
-          else
-            echo "No prototypes flag detected in comment"
-            echo "enable_prototypes=false" >> $GITHUB_OUTPUT
-          fi
-
      - name: Add 'in_progress' reaction to comment
-        if: github.event_name == 'issue_comment'
        id: add-eyes-reaction
        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
        with:
@@ -216,8 +161,6 @@ jobs:
        with:
          gradle-version: 9.3.1

-      - name: Install Task
-        uses: go-task/setup-task@3be4020d41929789a01026e0e427a4321ce0ad44 # v2.0.0
      - name: Run Gradle Command
        run: |
          if [ "${{ needs.check-comment.outputs.disable_security }}" == "true" ]; then
@@ -225,7 +168,7 @@ jobs:
          else
            export DISABLE_ADDITIONAL_FEATURES=false
          fi
-          task backend:build
+          ./gradlew build
        env:
          MAVEN_USER: ${{ secrets.MAVEN_USER }}
          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
@@ -250,21 +193,7 @@ jobs:
          cache-from: type=gha,scope=stirling-pdf-latest
          cache-to: type=gha,mode=max,scope=stirling-pdf-latest
          tags: ${{ secrets.DOCKER_HUB_USERNAME }}/test:pr-${{ needs.check-comment.outputs.pr_number }}
-          build-args: |
-            VERSION_TAG=alpha
-            PROTOTYPES_BUILD=${{ needs.check-comment.outputs.enable_prototypes }}
-          platforms: linux/amd64
-
-      - name: Build and push engine image
-        if: needs.check-comment.outputs.enable_prototypes == 'true'
-        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
-        with:
-          context: ./engine
-          file: ./engine/Dockerfile
-          push: true
-          cache-from: type=gha,scope=stirling-pdf-engine
-          cache-to: type=gha,mode=max,scope=stirling-pdf-engine
-          tags: ${{ secrets.DOCKER_HUB_USERNAME }}/test:engine-pr-${{ needs.check-comment.outputs.pr_number }}
+          build-args: VERSION_TAG=alpha
          platforms: linux/amd64

      - name: Set up SSH
@@ -302,64 +231,33 @@ jobs:
            PREMIUM_PROFEATURES_AUDIT_ENABLED="false"
          fi

-          ENABLE_PROTOTYPES="${{ needs.check-comment.outputs.enable_prototypes }}"
-          PR_NUMBER="${{ needs.check-comment.outputs.pr_number }}"
-          DOCKER_USER="${{ secrets.DOCKER_HUB_USERNAME }}"
-
-          # Build engine env vars for backend (only set when prototypes enabled)
-          if [ "$ENABLE_PROTOTYPES" == "true" ]; then
-            AI_ENGINE_VARS="
-                SYSTEM_AIENGINE_ENABLED: \"true\"
-                SYSTEM_AIENGINE_URL: \"http://stirling-pdf-engine-pr-${PR_NUMBER}:5001\""
-            ENGINE_SERVICE="
-            stirling-pdf-engine:
-              container_name: stirling-pdf-engine-pr-${PR_NUMBER}
-              image: ${DOCKER_USER}/test:engine-pr-${PR_NUMBER}
-              environment:
-                ANTHROPIC_API_KEY: \"${{ secrets.ANTHROPIC_API_KEY }}\"
-              networks:
-                - pr-network
-              restart: on-failure:5"
-            NETWORK_SECTION="
-          networks:
-            pr-network:"
-            BACKEND_NETWORK="
-              networks:
-                - pr-network"
-          else
-            AI_ENGINE_VARS=""
-            ENGINE_SERVICE=""
-            NETWORK_SECTION=""
-            BACKEND_NETWORK=""
-          fi
-
          # First create the docker-compose content locally
          cat > docker-compose.yml << EOF
          version: '3.3'
          services:
            stirling-pdf:
-              container_name: stirling-pdf-pr-${PR_NUMBER}
-              image: ${DOCKER_USER}/test:pr-${PR_NUMBER}
+              container_name: stirling-pdf-pr-${{ needs.check-comment.outputs.pr_number }}
+              image: ${{ secrets.DOCKER_HUB_USERNAME }}/test:pr-${{ needs.check-comment.outputs.pr_number }}
              ports:
-                - "${PR_NUMBER}:8080"
+                - "${{ needs.check-comment.outputs.pr_number }}:8080"
              volumes:
-                - /stirling/PR-${PR_NUMBER}/data:/usr/share/tessdata:rw
-                - /stirling/PR-${PR_NUMBER}/config:/configs:rw
-                - /stirling/PR-${PR_NUMBER}/logs:/logs:rw
+                - /stirling/PR-${{ needs.check-comment.outputs.pr_number }}/data:/usr/share/tessdata:rw
+                - /stirling/PR-${{ needs.check-comment.outputs.pr_number }}/config:/configs:rw
+                - /stirling/PR-${{ needs.check-comment.outputs.pr_number }}/logs:/logs:rw
              environment:
                DISABLE_ADDITIONAL_FEATURES: "${DISABLE_ADDITIONAL_FEATURES}"
                SECURITY_ENABLELOGIN: "${LOGIN_SECURITY}"
                SYSTEM_DEFAULTLOCALE: en-GB
-                UI_APPNAME: "Stirling-PDF PR#${PR_NUMBER}"
-                UI_HOMEDESCRIPTION: "PR#${PR_NUMBER} for Stirling-PDF Latest"
-                UI_APPNAMENAVBAR: "PR#${PR_NUMBER}"
+                UI_APPNAME: "Stirling-PDF PR#${{ needs.check-comment.outputs.pr_number }}"
+                UI_HOMEDESCRIPTION: "PR#${{ needs.check-comment.outputs.pr_number }} for Stirling-PDF Latest"
+                UI_APPNAMENAVBAR: "PR#${{ needs.check-comment.outputs.pr_number }}"
                SYSTEM_MAXFILESIZE: "100"
                METRICS_ENABLED: "true"
                SYSTEM_GOOGLEVISIBILITY: "false"
                PREMIUM_KEY:                         "${PREMIUM_KEY}"
                PREMIUM_ENABLED:                     "${PREMIUM_ENABLED}"
-                PREMIUM_PROFEATURES_AUDIT_ENABLED:   "${PREMIUM_PROFEATURES_AUDIT_ENABLED}"${AI_ENGINE_VARS}
-              restart: on-failure:5${BACKEND_NETWORK}${ENGINE_SERVICE}${NETWORK_SECTION}
+                PREMIUM_PROFEATURES_AUDIT_ENABLED:   "${PREMIUM_PROFEATURES_AUDIT_ENABLED}"
+              restart: on-failure:5
          EOF

          # Then copy the file and execute commands
@@ -367,13 +265,13 @@ jobs:

          ssh -i ../private.key -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -T ${{ secrets.NEW_VPS_USERNAME }}@${{ secrets.NEW_VPS_HOST }} << ENDSSH
            # Create PR-specific directories
-            mkdir -p /stirling/PR-${PR_NUMBER}/{data,config,logs}
+            mkdir -p /stirling/PR-${{ needs.check-comment.outputs.pr_number }}/{data,config,logs}

            # Move docker-compose file to correct location
-            mv /tmp/docker-compose.yml /stirling/PR-${PR_NUMBER}/docker-compose.yml
+            mv /tmp/docker-compose.yml /stirling/PR-${{ needs.check-comment.outputs.pr_number }}/docker-compose.yml

            # Start or restart the container
-            cd /stirling/PR-${PR_NUMBER}
+            cd /stirling/PR-${{ needs.check-comment.outputs.pr_number }}
            docker-compose pull
            docker-compose up -d
          ENDSSH
@@ -382,7 +280,7 @@ jobs:
          echo "security_status=${SECURITY_STATUS}" >> $GITHUB_ENV

      - name: Add success reaction to comment
-        if: success() && github.event_name == 'issue_comment'
+        if: success()
        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
        with:
          github-token: ${{ steps.setup-bot.outputs.token }}
@@ -417,7 +315,7 @@ jobs:
            }

      - name: Add failure reaction to comment
-        if: failure() && github.event_name == 'issue_comment'
+        if: failure()
        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
        with:
          github-token: ${{ steps.setup-bot.outputs.token }}
@@ -121,9 +121,8 @@ jobs:
              # Remove PR-specific directories
              rm -rf /stirling/PR-${{ github.event.pull_request.number }}

-              # Remove the Docker images
+              # Remove the Docker image
              docker rmi --no-prune ${{ secrets.DOCKER_HUB_USERNAME }}/test:pr-${{ github.event.pull_request.number }} || true
-              docker rmi --no-prune ${{ secrets.DOCKER_HUB_USERNAME }}/test:engine-pr-${{ github.event.pull_request.number }} || true

              echo "PERFORMED_CLEANUP"
            else
@@ -11,6 +11,10 @@ jobs:
    permissions:
      contents: read
      pull-requests: write
+    defaults:
+      run:
+        working-directory: engine
+
    steps:
      - name: Checkout code
        uses: actions/checkout@v4
@@ -20,85 +24,60 @@ jobs:
        with:
          enable-cache: true

-      - name: Set up JDK 25
-        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
-        with:
-          java-version: "25"
-          distribution: "temurin"
-
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5.0.1
-        with:
-          gradle-version: 9.3.1
-
-      - name: Install Task
-        uses: go-task/setup-task@3be4020d41929789a01026e0e427a4321ce0ad44 # v2.0.0
-
-      - name: Regenerate tool models
-        run: task engine:tool-models
-
-      - name: Verify tool models are up to date
-        run: |
-          if ! git diff --exit-code engine/src/stirling/models/tool_models.py; then
-            echo "tool_models.py is out of date."
-            echo "Run 'task engine:tool-models' locally and commit the updated file."
-            exit 1
-          fi
+      - name: Install dependencies
+        run: make install

      - name: Run fixers
-        run: task engine:fix
+        # Ignore errors here because we're going to add comments for them in the following steps before actually failing
+        run: make fix || true

-      - name: Verify fixes are committed
+      - name: Check for fixer changes
        id: fixer_changes
        run: |
-          if ! git diff --quiet; then
-            git --no-pager diff --stat
-            echo "::error::There are issues with your Python code that will need to be fixed before they can be merged in. Run 'task engine:fix' to auto-fix what can be fixed automatically, then run 'task engine:check' to see what still needs fixing manually."
-            exit 1
+          if git diff --quiet; then
+            echo "changed=false" >> "$GITHUB_OUTPUT"
+          else
+            echo "changed=true" >> "$GITHUB_OUTPUT"
          fi

-      - name: Comment on fixer failures
-        if: steps.fixer_changes.outcome == 'failure' && github.event_name == 'pull_request'
+      - name: Post fixer suggestions
+        if: steps.fixer_changes.outputs.changed == 'true' && github.event_name == 'pull_request'
+        uses: reviewdog/action-suggester@v1
        continue-on-error: true
+        with:
+          tool_name: engine-make-fix
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          filter_mode: file
+          fail_level: any
+          level: info
+
+      - name: Comment on fixer suggestions
+        if: steps.fixer_changes.outputs.changed == 'true' && github.event_name == 'pull_request'
        uses: actions/github-script@v7
        with:
          script: |
-            const marker = '<!-- engine-check -->';
-            const body = [
-              marker,
-              '### Engine Check Failed',
-              '',
-              'There are issues with your Python code that will need to be fixed before they can be merged in.',
-              '',
-              'Run `task engine:fix` to auto-fix what can be fixed automatically, then run `task engine:check` to see what still needs fixing manually.',
-            ].join('\n');
-            const { data: comments } = await github.rest.issues.listComments({
+            await github.rest.issues.createComment({
              owner: context.repo.owner,
              repo: context.repo.repo,
              issue_number: context.issue.number,
+              body: "The Python code in your PR has formatting/linting issues. Consider running `make fix` locally or setting up your editor's Ruff integration to auto-format and lint your files as you go, or commit the suggested changes on this PR.",
            });
-            const existing = comments.find(c => c.body.includes(marker));
-            if (existing) {
-              await github.rest.issues.updateComment({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                comment_id: existing.id,
-                body,
-              });
-            } else {
-              await github.rest.issues.createComment({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                issue_number: context.issue.number,
-                body,
-              });
-            }
+
+      - name: Verify fixer changes are committed
+        if: steps.fixer_changes.outputs.changed == 'true'
+        run: |
+          if ! git diff --exit-code; then
+            echo "Fixes are out of date."
+            echo "Apply the reviewdog suggestions or run 'make fix' from engine/ and commit the updated files."
+            git --no-pager diff --stat
+            exit 1
+          fi

      - name: Run linting
-        run: task engine:lint
+        run: make lint

      - name: Run type checking
-        run: task engine:typecheck
+        run: make typecheck

      - name: Run tests
-        run: task engine:test
+        run: make test
@@ -1,128 +0,0 @@
-name: Publish to AUR
-
-on:
-  release:
-    types: [released]
-  workflow_dispatch:
-    inputs:
-      version:
-        description: "Version to publish (e.g. 2.9.2 — no v prefix)"
-        required: true
-        type: string
-      dry_run:
-        description: "Skip the AUR push (safe test)"
-        type: boolean
-        default: true
-
-permissions:
-  contents: read
-
-jobs:
-  get-release-info:
-    runs-on: ubuntu-latest
-    outputs:
-      version: ${{ steps.info.outputs.version }}
-      deb_sha256: ${{ steps.hashes.outputs.deb_sha256 }}
-      jar_sha256: ${{ steps.hashes.outputs.jar_sha256 }}
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@6c3c2f2c1c457b00c10c4848d6f5491db3b629df # v2.18.0
-        with:
-          egress-policy: audit
-
-      - name: Extract version from tag or manual input
-        id: info
-        env:
-          DISPATCH_VERSION: ${{ inputs.version }}
-          RELEASE_TAG: ${{ github.event.release.tag_name }}
-        run: |
-          if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
-            VERSION="$DISPATCH_VERSION"
-          else
-            VERSION="$RELEASE_TAG"
-          fi
-          VERSION="${VERSION#v}"
-          echo "version=$VERSION" >> "$GITHUB_OUTPUT"
-
-      - name: Download release assets and compute SHA256
-        id: hashes
-        env:
-          VERSION: ${{ steps.info.outputs.version }}
-        run: |
-          BASE="https://github.com/Stirling-Tools/Stirling-PDF/releases/download/v${VERSION}"
-
-          download_sha256() {
-            local url="$1"
-            local file
-            file=$(basename "$url")
-            curl -fsSL --retry 3 -o "$file" "$url"
-            sha256sum "$file" | awk '{print $1}'
-          }
-
-          DEB_SHA=$(download_sha256 "${BASE}/Stirling-PDF-linux-x86_64.deb")
-          JAR_SHA=$(download_sha256 "${BASE}/Stirling-PDF-with-login.jar")
-
-          echo "deb_sha256=$DEB_SHA" >> "$GITHUB_OUTPUT"
-          echo "jar_sha256=$JAR_SHA" >> "$GITHUB_OUTPUT"
-
-  publish-aur:
-    needs: get-release-info
-    runs-on: ubuntu-latest
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@v2
-        with:
-          egress-policy: audit
-
-      - name: Checkout repository (for PKGBUILD templates)
-        uses: actions/checkout@v4
-
-      - name: Update stirling-pdf-bin PKGBUILD
-        env:
-          VERSION: ${{ needs.get-release-info.outputs.version }}
-          DEB_SHA: ${{ needs.get-release-info.outputs.deb_sha256 }}
-        run: |
-          PKGBUILD=".github/aur/stirling-pdf-bin/PKGBUILD"
-          sed -i "s/^pkgver=.*/pkgver=${VERSION}/" "$PKGBUILD"
-          sed -i "s/^pkgrel=.*/pkgrel=1/" "$PKGBUILD"
-          sed -i "s/'PLACEHOLDER_DEB_SHA256'/'${DEB_SHA}'/" "$PKGBUILD"
-
-      - name: Update stirling-pdf-server-bin PKGBUILD
-        env:
-          VERSION: ${{ needs.get-release-info.outputs.version }}
-          JAR_SHA: ${{ needs.get-release-info.outputs.jar_sha256 }}
-        run: |
-          PKGBUILD=".github/aur/stirling-pdf-server-bin/PKGBUILD"
-          sed -i "s/^pkgver=.*/pkgver=${VERSION}/" "$PKGBUILD"
-          sed -i "s/^pkgrel=.*/pkgrel=1/" "$PKGBUILD"
-          sed -i "s/'PLACEHOLDER_JAR_SHA256'/'${JAR_SHA}'/" "$PKGBUILD"
-
-      - name: Show updated PKGBUILDs (for dry-run visibility)
-        run: |
-          echo "--- stirling-pdf-bin PKGBUILD ---"
-          cat .github/aur/stirling-pdf-bin/PKGBUILD
-          echo ""
-          echo "--- stirling-pdf-server-bin PKGBUILD ---"
-          cat .github/aur/stirling-pdf-server-bin/PKGBUILD
-
-      - name: Publish stirling-pdf-bin to AUR
-        if: ${{ github.event_name == 'release' || inputs.dry_run == false }}
-        uses: KSXGitHub/github-actions-deploy-aur@2ac5a4c1d7035885d46b10e3193393be8460b6f1 # v4.1.1
-        with:
-          pkgname: stirling-pdf-bin
-          pkgbuild: .github/aur/stirling-pdf-bin/PKGBUILD
-          commit_username: Stirling PDF Inc
-          commit_email: contact@stirlingpdf.com
-          ssh_private_key: ${{ secrets.AUR_SSH_PRIVATE_KEY }}
-          commit_message: "Update to v${{ needs.get-release-info.outputs.version }}"
-
-      - name: Publish stirling-pdf-server-bin to AUR
-        if: ${{ github.event_name == 'release' || inputs.dry_run == false }}
-        uses: KSXGitHub/github-actions-deploy-aur@v4.1.1
-        with:
-          pkgname: stirling-pdf-server-bin
-          pkgbuild: .github/aur/stirling-pdf-server-bin/PKGBUILD
-          commit_username: Stirling PDF Inc
-          commit_email: contact@stirlingpdf.com
-          ssh_private_key: ${{ secrets.AUR_SSH_PRIVATE_KEY }}
-          commit_message: "Update to v${{ needs.get-release-info.outputs.version }}"
@@ -30,7 +30,6 @@ jobs:
      project: ${{ steps.changes.outputs.project }}
      openapi: ${{ steps.changes.outputs.openapi }}
      frontend: ${{ steps.changes.outputs.frontend }}
-      docker-base: ${{ steps.changes.outputs.docker-base }}
    steps:
      - name: Harden the runner (Audit all outbound calls)
        uses: step-security/harden-runner@58077d3c7e43986b6b15fba718e8ea69e387dfcc # v2.15.1
@@ -50,7 +49,6 @@ jobs:
    permissions:
      actions: read
      security-events: write
-      pull-requests: write
    strategy:
      fail-fast: false
      matrix:
@@ -71,7 +69,7 @@ jobs:
          distribution: "temurin"

      - name: Cache Gradle dependency artifacts
-        uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
+        uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
        with:
          path: |
            ~/.gradle/wrapper
@@ -85,77 +83,8 @@ jobs:
          gradle-version: 9.3.1
          cache-disabled: true

-      - name: Install Task
-        uses: go-task/setup-task@3be4020d41929789a01026e0e427a4321ce0ad44 # v2.0.0
-      - name: Check Java formatting (Spotless)
-        if: matrix.jdk-version == 25 && matrix.spring-security == false
-        id: spotless-check
-        run: task backend:format:check
-        continue-on-error: true
-        env:
-          MAVEN_USER: ${{ secrets.MAVEN_USER }}
-          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
-          MAVEN_PUBLIC_URL: ${{ secrets.MAVEN_PUBLIC_URL }}
-
-      - name: Comment on Java formatting failure
-        if: steps.spotless-check.outcome == 'failure'
-        continue-on-error: true
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
-        with:
-          script: |
-            const marker = '<!-- java-formatting-check -->';
-            const body = [
-              marker,
-              '### Java Formatting Check Failed',
-              '',
-              'Your code has formatting issues. Run the following command to fix them:',
-              '',
-              '```bash',
-              'task backend:format',
-              '```',
-              '',
-              'Then commit and push the changes.',
-            ].join('\n');
-            const { data: comments } = await github.rest.issues.listComments({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              issue_number: context.issue.number,
-            });
-            const existing = comments.find(c => c.body.includes(marker));
-            if (existing) {
-              await github.rest.issues.updateComment({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                comment_id: existing.id,
-                body,
-              });
-            } else {
-              await github.rest.issues.createComment({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                issue_number: context.issue.number,
-                body,
-              });
-            }
-
-      - name: Fail if Java formatting issues found
-        if: steps.spotless-check.outcome == 'failure'
-        run: |
-          echo "============================================"
-          echo "  Java Formatting Check Failed"
-          echo "============================================"
-          echo ""
-          echo "Your code has formatting issues."
-          echo "Run the following command to fix them:"
-          echo ""
-          echo "  task backend:format"
-          echo ""
-          echo "Then commit and push the changes."
-          echo "============================================"
-          exit 1
-
      - name: Build with Gradle and spring security ${{ matrix.spring-security }}
-        run: task backend:build:ci
+        run: ./gradlew build -PnoSpotless
        env:
          MAVEN_USER: ${{ secrets.MAVEN_USER }}
          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
@@ -225,7 +154,7 @@ jobs:
          distribution: "temurin"

      - name: Cache Gradle dependency artifacts
-        uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
+        uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
        with:
          path: |
            ~/.gradle/wrapper
@@ -239,10 +168,8 @@ jobs:
          gradle-version: 9.3.1
          cache-disabled: true

-      - name: Install Task
-        uses: go-task/setup-task@3be4020d41929789a01026e0e427a4321ce0ad44 # v2.0.0
      - name: Generate OpenAPI documentation
-        run: task backend:swagger
+        run: ./gradlew :stirling-pdf:generateOpenApiDocs
        env:
          MAVEN_USER: ${{ secrets.MAVEN_USER }}
          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
@@ -259,9 +186,6 @@ jobs:
    if: needs.files-changed.outputs.frontend == 'true'
    needs: files-changed
    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      pull-requests: write
    steps:
      - name: Harden Runner
        uses: step-security/harden-runner@58077d3c7e43986b6b15fba718e8ea69e387dfcc # v2.15.1
@@ -275,63 +199,16 @@ jobs:
          node-version: "22"
          cache: "npm"
          cache-dependency-path: frontend/package-lock.json
-      - name: Install Task
-        uses: go-task/setup-task@3be4020d41929789a01026e0e427a4321ce0ad44 # v2.0.0
-      - name: Quality-check frontend
-        id: frontend-check
-        run: task frontend:check:all
-        continue-on-error: true
-      - name: Comment on frontend check failure
-        if: steps.frontend-check.outcome == 'failure'
-        continue-on-error: true
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
-        with:
-          script: |
-            const marker = '<!-- frontend-check -->';
-            const body = [
-              marker,
-              '### Frontend Check Failed',
-              '',
-              'There are issues with your frontend code that will need to be fixed before they can be merged in.',
-              '',
-              'Run `task frontend:fix` to auto-fix what can be fixed automatically, then run `task frontend:check:all` to see what still needs fixing manually.',
-            ].join('\n');
-            const { data: comments } = await github.rest.issues.listComments({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              issue_number: context.issue.number,
-            });
-            const existing = comments.find(c => c.body.includes(marker));
-            if (existing) {
-              await github.rest.issues.updateComment({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                comment_id: existing.id,
-                body,
-              });
-            } else {
-              await github.rest.issues.createComment({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                issue_number: context.issue.number,
-                body,
-              });
-            }
-      - name: Fail if frontend check failed
-        if: steps.frontend-check.outcome == 'failure'
-        run: |
-          echo "============================================"
-          echo "  Frontend Check Failed"
-          echo "============================================"
-          echo ""
-          echo "There are issues with your frontend code that"
-          echo "will need to be fixed before they can be merged in."
-          echo ""
-          echo "Run 'task frontend:fix' to auto-fix what can be"
-          echo "fixed automatically, then run 'task frontend:check:all'"
-          echo "to see what still needs fixing manually."
-          echo "============================================"
-          exit 1
+      - name: Install frontend dependencies
+        run: cd frontend && npm ci
+      - name: Type-check frontend
+        run: cd frontend && npm run prep && npm run typecheck:all
+      - name: Lint frontend
+        run: cd frontend && npm run lint
+      - name: Build frontend
+        run: cd frontend && npm run build
+      - name: Run frontend tests
+        run: cd frontend && npm run test -- --run
      - name: Upload frontend build artifacts
        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
        with:
@@ -339,37 +216,6 @@ jobs:
          path: frontend/dist/
          retention-days: 3

-  playwright-e2e:
-    if: needs.files-changed.outputs.frontend == 'true'
-    needs: files-changed
-    runs-on: ubuntu-latest
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@58077d3c7e43986b6b15fba718e8ea69e387dfcc # v2.15.1
-        with:
-          egress-policy: audit
-      - name: Checkout repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-      - name: Set up Node.js
-        uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
-        with:
-          node-version: "22"
-          cache: "npm"
-          cache-dependency-path: frontend/package-lock.json
-      - name: Install Task
-        uses: go-task/setup-task@3be4020d41929789a01026e0e427a4321ce0ad44 # v2.0.0
-      - name: Install Playwright (chromium only)
-        run: task frontend:test:e2e:install -- chromium
-      - name: Run E2E tests (chromium)
-        run: task frontend:test:e2e -- --project=chromium
-      - name: Upload Playwright report
-        if: always()
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
-        with:
-          name: playwright-report-pr-${{ github.run_id }}
-          path: frontend/playwright-report/
-          retention-days: 7
-
  check-licence:
    if: needs.files-changed.outputs.build == 'true'
    needs: [files-changed, build]
@@ -390,7 +236,7 @@ jobs:
          distribution: "temurin"

      - name: Cache Gradle dependency artifacts
-        uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
+        uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
        with:
          path: |
            ~/.gradle/wrapper
@@ -404,10 +250,13 @@ jobs:
          gradle-version: 9.3.1
          cache-disabled: true

-      - name: Install Task
-        uses: go-task/setup-task@3be4020d41929789a01026e0e427a4321ce0ad44 # v2.0.0
-      - name: Check licenses for compatibility
-        run: task backend:licenses:check
+      - name: check the licenses for compatibility
+        # NOTE: --no-parallel is intentional here. Running the checkLicense task in parallel with other
+        # Gradle tasks has been observed to cause intermittent failures with the dependency license
+        # checking plugin on this Gradle version. Disabling parallel execution trades some build speed
+        # for more reliable, deterministic license checks. If upgrading Gradle or the plugin, consider
+        # re-evaluating whether this flag is still required before removing it.
+        run: ./gradlew checkLicense --no-parallel
        env:
          MAVEN_USER: ${{ secrets.MAVEN_USER }}
          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
@@ -460,7 +309,7 @@ jobs:
          distribution: "temurin"

      - name: Cache Gradle dependency artifacts
-        uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
+        uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
        with:
          path: |
            ~/.gradle/wrapper
@@ -508,7 +357,6 @@ jobs:
          MAVEN_USER: ${{ secrets.MAVEN_USER }}
          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
          MAVEN_PUBLIC_URL: ${{ secrets.MAVEN_PUBLIC_URL }}
-          DOCKER_BASE_CHANGED: ${{ needs.files-changed.outputs.docker-base }}

      - name: Upload Cucumber Report
        if: always()
@@ -519,15 +367,6 @@ jobs:
          retention-days: 7
          if-no-files-found: warn

-      - name: Upload Test Reports
-        if: always()
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
-        with:
-          name: docker-compose-test-reports
-          path: testing/reports/
-          retention-days: 7
-          if-no-files-found: warn
-
      - name: Cucumber Test Report
        if: always()
        uses: dorny/test-reporter@b082adf0eced0765477756c2a610396589b8c637 # v2.5.0
@@ -563,17 +402,6 @@ jobs:
      - name: Checkout Repository
        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2

-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ github.token }}
-
-      - name: Convert repository owner to lowercase
-        id: repoowner
-        run: echo "lowercase=$(echo ${{ github.repository_owner }} | awk '{print tolower($0)}')" >> $GITHUB_OUTPUT
-
      - name: Free disk space on runner
        run: |
          echo "Disk space before cleanup:" && df -h
@@ -588,7 +416,7 @@ jobs:
          distribution: "temurin"

      - name: Cache Gradle dependency artifacts
-        uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
+        uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
        with:
          path: |
            ~/.gradle/wrapper
@@ -602,10 +430,8 @@ jobs:
          gradle-version: 9.3.1
          cache-disabled: true

-      - name: Install Task
-        uses: go-task/setup-task@3be4020d41929789a01026e0e427a4321ce0ad44 # v2.0.0
      - name: Build application
-        run: task backend:build
+        run: ./gradlew build
        env:
          MAVEN_USER: ${{ secrets.MAVEN_USER }}
          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
@@ -614,28 +440,12 @@ jobs:
          STIRLING_PDF_DESKTOP_UI: false

      - name: Set up QEMU
-        uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a # v4.0.0
+        uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3.7.0

      - name: Set up Docker Buildx
        id: buildx
        uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0

-      - name: Build base image locally (PR base change only)
-        if: github.event_name == 'pull_request' && needs.files-changed.outputs.docker-base == 'true'
-        run: |
-          docker build -t stirling-pdf-base:pr-test -f docker/base/Dockerfile docker/base
-
-      - name: Set base image and platform for this build
-        id: build-params
-        run: |
-          if [ "${{ github.event_name }}" == "pull_request" ] && [ "${{ needs.files-changed.outputs.docker-base }}" == "true" ]; then
-            echo "base_image=stirling-pdf-base:pr-test" >> $GITHUB_OUTPUT
-            echo "platforms=linux/amd64" >> $GITHUB_OUTPUT
-          else
-            echo "base_image=stirlingtools/stirling-pdf-base:latest" >> $GITHUB_OUTPUT
-            echo "platforms=linux/amd64,linux/arm64/v8" >> $GITHUB_OUTPUT
-          fi
-
      - name: Build ${{ matrix.docker-rev }}
        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
        with:
@@ -645,9 +455,7 @@ jobs:
          push: false
          cache-from: type=gha,scope=${{ matrix.cache-scope }}
          cache-to: type=gha,mode=max,scope=${{ matrix.cache-scope }}
-          platforms: ${{ steps.build-params.outputs.platforms }}
-          build-args: |
-            BASE_IMAGE=${{ steps.build-params.outputs.base_image }}
+          platforms: linux/amd64,linux/arm64/v8
          provenance: true
          sbom: true

@@ -89,13 +89,12 @@ jobs:
          NPM_CONFIG_IGNORE_SCRIPTS: "true"
        run: npm ci --ignore-scripts --audit=false --fund=false

-      - name: Install Task
-        uses: go-task/setup-task@3be4020d41929789a01026e0e427a4321ce0ad44 # v2.0.0
      - name: Generate frontend license report (internal PR)
        if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork == false
+        working-directory: frontend
        env:
          PR_IS_FORK: "false"
-        run: task frontend:licenses:generate
+        run: npm run generate-licenses

      - name: Generate frontend license report (fork PRs, pinned)
        if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork == true
@@ -342,11 +341,15 @@ jobs:
        with:
          gradle-version: 9.3.1

-      - name: Install Task
-        uses: go-task/setup-task@3be4020d41929789a01026e0e427a4321ce0ad44 # v2.0.0
      - name: Check licenses and generate report
        id: license-check
-        run: task backend:licenses:generate || echo "LICENSE_CHECK_FAILED=true" >> $GITHUB_ENV
+        run: |
+          # NOTE: --no-parallel is intentional here. Running the license-checking tasks in parallel has
+          # previously caused intermittent concurrency issues in CI (e.g. flaky failures in the license
+          # plugin/Gradle when multiple projects are evaluated concurrently). Disabling parallelism trades
+          # some build speed for more reliable license reports. If the underlying issues are resolved in
+          # future Gradle or plugin versions, this flag can be reconsidered.
+          ./gradlew checkLicense generateLicenseReport --no-parallel || echo "LICENSE_CHECK_FAILED=true" >> $GITHUB_ENV
        env:
          MAVEN_USER: ${{ secrets.MAVEN_USER }}
          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
@@ -23,7 +23,7 @@ jobs:
        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2

      - name: Run Labeler
-        uses: crazy-max/ghaction-github-labeler@548a7c3603594ec17c819e1239f281a3b801ab4d # v6.0.0
+        uses: crazy-max/ghaction-github-labeler@24d110aa46a59976b8a7f35518cb7f14f434c916 # v5.3.0
        with:
          github-token: ${{ secrets.GITHUB_TOKEN }}
          yaml-file: .github/labels.yml
@@ -21,14 +21,6 @@ on:
          - windows
          - macos
          - linux
-      sign:
-        description: "Code sign the binaries (requires signing secrets)"
-        required: false
-        default: "true"
-        type: choice
-        options:
-          - "true"
-          - "false"
  release:
    types: [created]

@@ -57,7 +49,7 @@ jobs:
          distribution: "temurin"

      - name: Cache Gradle dependencies
-        uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
+        uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
        with:
          path: |
            ~/.gradle/caches
@@ -71,11 +63,11 @@ jobs:
        with:
          gradle-version: 9.3.1

-      - name: Install Task
-        uses: go-task/setup-task@3be4020d41929789a01026e0e427a4321ce0ad44 # v2.0.0
      - name: Get version number
        id: versionNumber
        run: |
+          echo "Running gradlew printVersion..."
+          ./gradlew printVersion --quiet
          VERSION=$(./gradlew printVersion --quiet | tail -1)
          echo "Extracted version: $VERSION"
          echo "versionNumber=$VERSION" >> $GITHUB_OUTPUT
@@ -152,9 +144,6 @@ jobs:
          cache: "npm"
          cache-dependency-path: frontend/package-lock.json

-      - name: Install Task
-        uses: go-task/setup-task@3be4020d41929789a01026e0e427a4321ce0ad44 # v2.0.0
-
      - name: Build JAR
        run: ./gradlew build ${{ matrix.variant.build_frontend && '-PbuildWithFrontend=true' || '' }} -x spotlessApply -x spotlessCheck -x test -x sonarqube
        env:
@@ -193,9 +182,6 @@ jobs:
        uses: step-security/harden-runner@58077d3c7e43986b6b15fba718e8ea69e387dfcc # v2.15.1
        with:
          egress-policy: audit
-          allowed-endpoints: >
-            one.digicert.com:443
-            clientauth.one.digicert.com:443

      - name: Checkout repository
        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
@@ -230,21 +216,89 @@ jobs:
        with:
          gradle-version: 9.3.1

-      - name: Install Task
-        uses: go-task/setup-task@3be4020d41929789a01026e0e427a4321ce0ad44 # v2.0.0
+      - name: Build Java backend with JLink
+        working-directory: ./
+        shell: bash
+        run: |
+          chmod +x ./gradlew
+          echo "🔧 Building Stirling-PDF JAR..."
+          ./gradlew build -x spotlessApply -x spotlessCheck -x test -x sonarqube

-      - name: Prepare desktop build
-        run: task desktop:prepare
+          # Find the built JAR
+          STIRLING_JAR=$(ls app/core/build/libs/stirling-pdf-*.jar | head -n 1)
+          echo "✅ Built JAR: $STIRLING_JAR"
+
+          # Create Tauri directories
+          mkdir -p ./frontend/src-tauri/libs
+          mkdir -p ./frontend/src-tauri/runtime
+
+          # Copy JAR to Tauri libs
+          cp "$STIRLING_JAR" ./frontend/src-tauri/libs/
+          echo "✅ JAR copied to Tauri libs"
+
+          # Analyze JAR dependencies for jlink modules
+          echo "🔍 Analyzing JAR dependencies..."
+          if command -v jdeps &> /dev/null; then
+            DETECTED_MODULES=$(jdeps --print-module-deps --ignore-missing-deps "$STIRLING_JAR" 2>/dev/null || echo "")
+            if [ -n "$DETECTED_MODULES" ]; then
+              echo "📋 jdeps detected modules: $DETECTED_MODULES"
+              MODULES="$DETECTED_MODULES,java.compiler,java.instrument,java.management,java.naming,java.net.http,java.prefs,java.rmi,java.scripting,java.security.jgss,java.security.sasl,java.sql,java.transaction.xa,java.xml.crypto,jdk.crypto.ec,jdk.crypto.cryptoki,jdk.unsupported"
+            else
+              echo "⚠️ jdeps analysis failed, using predefined modules"
+              MODULES="java.base,java.compiler,java.desktop,java.instrument,java.logging,java.management,java.naming,java.net.http,java.prefs,java.rmi,java.scripting,java.security.jgss,java.security.sasl,java.sql,java.transaction.xa,java.xml,java.xml.crypto,jdk.crypto.ec,jdk.crypto.cryptoki,jdk.unsupported"
+            fi
+          else
+            echo "⚠️ jdeps not available, using predefined modules"
+            MODULES="java.base,java.compiler,java.desktop,java.instrument,java.logging,java.management,java.naming,java.net.http,java.prefs,java.rmi,java.scripting,java.security.jgss,java.security.sasl,java.sql,java.transaction.xa,java.xml,java.xml.crypto,jdk.crypto.ec,jdk.crypto.cryptoki,jdk.unsupported"
+          fi
+
+          # Create custom JRE with jlink
+          echo "🔧 Creating custom JRE with jlink..."
+          echo "📋 Using modules: $MODULES"
+
+          # Remove any existing JRE
+          rm -rf ./frontend/src-tauri/runtime/jre
+
+          # Create the custom JRE
+          jlink \
+            --add-modules "$MODULES" \
+            --strip-debug \
+            --compress=2 \
+            --no-header-files \
+            --no-man-pages \
+            --output ./frontend/src-tauri/runtime/jre
+
+          if [ ! -d "./frontend/src-tauri/runtime/jre" ]; then
+            echo "❌ Failed to create JLink runtime"
+            exit 1
+          fi
+
+          # Test the bundled runtime
+          if [ -f "./frontend/src-tauri/runtime/jre/bin/java" ]; then
+            RUNTIME_VERSION=$(./frontend/src-tauri/runtime/jre/bin/java --version 2>&1 | head -n 1)
+            echo "✅ Custom JRE created successfully: $RUNTIME_VERSION"
+          else
+            echo "❌ Custom JRE executable not found"
+            exit 1
+          fi
+
+          # Calculate runtime size
+          RUNTIME_SIZE=$(du -sh ./frontend/src-tauri/runtime/jre | cut -f1)
+          echo "📊 Custom JRE size: $RUNTIME_SIZE"
        env:
          MAVEN_USER: ${{ secrets.MAVEN_USER }}
          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
          MAVEN_PUBLIC_URL: ${{ secrets.MAVEN_PUBLIC_URL }}
          DISABLE_ADDITIONAL_FEATURES: true

+      - name: Install frontend dependencies
+        working-directory: ./frontend
+        run: npm ci
+
      # DigiCert KeyLocker Setup (Cloud HSM)
      - name: Setup DigiCert KeyLocker
        id: digicert-setup
-        if: ${{ matrix.platform == 'windows-latest' && env.SM_API_KEY != '' && (github.event_name == 'release' || (github.event_name == 'workflow_dispatch' && github.event.inputs.sign != 'false') || github.ref == 'refs/heads/V2-master') }}
+        if: ${{ matrix.platform == 'windows-latest' && env.SM_API_KEY != '' && (github.event_name == 'release' || github.ref == 'refs/heads/V2-master') }}
        uses: digicert/ssm-code-signing@1d820463733701cf1484c7eb5d7d24a15ca2c454 # v1.2.1
        env:
          SM_API_KEY: ${{ secrets.SM_API_KEY }}
@@ -254,7 +308,7 @@ jobs:
          SM_HOST: ${{ secrets.SM_HOST }}

      - name: Setup DigiCert KeyLocker Certificate
-        if: ${{ matrix.platform == 'windows-latest' && env.SM_API_KEY != '' && (github.event_name == 'release' || (github.event_name == 'workflow_dispatch' && github.event.inputs.sign != 'false') || github.ref == 'refs/heads/V2-master') }}
+        if: ${{ matrix.platform == 'windows-latest' && env.SM_API_KEY != '' && (github.event_name == 'release' || github.ref == 'refs/heads/V2-master') }}
        shell: pwsh
        run: |
          Write-Host "Setting up DigiCert KeyLocker environment..."
@@ -289,7 +343,7 @@ jobs:

      # Traditional PFX Certificate Import (fallback if KeyLocker not configured)
      - name: Import Windows Code Signing Certificate
-        if: ${{ matrix.platform == 'windows-latest' && env.SM_API_KEY == '' && (github.event_name == 'release' || (github.event_name == 'workflow_dispatch' && github.event.inputs.sign != 'false') || github.ref == 'refs/heads/V2-master') }}
+        if: ${{ matrix.platform == 'windows-latest' && env.SM_API_KEY == '' && (github.event_name == 'release' || github.ref == 'refs/heads/V2-master') }}
        env:
          WINDOWS_CERTIFICATE: ${{ secrets.WINDOWS_CERTIFICATE }}
          WINDOWS_CERTIFICATE_PASSWORD: ${{ secrets.WINDOWS_CERTIFICATE_PASSWORD }}
@@ -320,7 +374,7 @@ jobs:
          }

      - name: Import Apple Developer Certificate
-        if: (matrix.platform == 'macos-15' || matrix.platform == 'macos-15-intel') && (github.event_name == 'release' || (github.event_name == 'workflow_dispatch' && github.event.inputs.sign != 'false') || github.ref == 'refs/heads/V2-master')
+        if: (matrix.platform == 'macos-15' || matrix.platform == 'macos-15-intel') && (github.event_name == 'release' || github.ref == 'refs/heads/V2-master')
        env:
          APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
          APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
@@ -341,7 +395,7 @@ jobs:
          rm certificate.p12

      - name: Verify Certificate
-        if: (matrix.platform == 'macos-15' || matrix.platform == 'macos-15-intel') && (github.event_name == 'release' || (github.event_name == 'workflow_dispatch' && github.event.inputs.sign != 'false') || github.ref == 'refs/heads/V2-master')
+        if: (matrix.platform == 'macos-15' || matrix.platform == 'macos-15-intel') && (github.event_name == 'release' || github.ref == 'refs/heads/V2-master')
        run: |
          echo "Verifying Apple Developer Certificate..."
          KEYCHAIN_PATH=$RUNNER_TEMP/app-signing.keychain-db
@@ -352,82 +406,6 @@ jobs:
          echo "APPLE_SIGNING_IDENTITY=$CERT_ID" >> $GITHUB_ENV
          echo "Certificate imported successfully."

-      # Pre-flight: verify smctl can talk to DigiCert and sync cert before we sign.
-      # Mirrors the setup from working public Tauri+KeyLocker repos (Labric, Meetily).
-      # Without this, signCommand failures are opaque (Tauri captures but drops
-      # smctl's stderr) - running these loudly surfaces auth/env/keypair issues.
-      - name: Preflight smctl
-        if: ${{ matrix.platform == 'windows-latest' && env.SM_API_KEY != '' && (github.event_name == 'release' || (github.event_name == 'workflow_dispatch' && github.event.inputs.sign != 'false') || github.ref == 'refs/heads/V2-master') }}
-        shell: pwsh
-        env:
-          KEYPAIR_ALIAS: ${{ secrets.SM_KEYPAIR_ALIAS }}
-        run: |
-          & smctl healthcheck
-          if ($LASTEXITCODE -ne 0) { Write-Host "[ERROR] smctl healthcheck failed"; exit 1 }
-          & smctl keypair ls
-          if ($LASTEXITCODE -ne 0) { Write-Host "[ERROR] smctl keypair ls failed"; exit 1 }
-          & smctl windows certsync --keypair-alias "$env:KEYPAIR_ALIAS"
-          if ($LASTEXITCODE -ne 0) { Write-Host "[WARN] smctl windows certsync returned non-zero - continuing" }
-          Write-Host "[SUCCESS] smctl preflight passed"
-
-      # Write platform-specific Tauri config that adds signCommand for Windows.
-      # Tauri auto-merges tauri.windows.conf.json with tauri.conf.json (RFC 7396).
-      # Tauri calls this command on every binary BEFORE bundling into the MSI,
-      # substituting %1 with the file path.
-      #
-      # Why OBJECT form (cmd + args) instead of string:
-      # Tauri's string-form parser does a naive split(' ') with no shell/quote handling.
-      # Args with spaces or quote characters get mangled. The object form passes each
-      # arg directly to Rust's Command::arg which handles Windows CreateProcess quoting.
-      #
-      # Why --keypair-alias instead of --fingerprint:
-      # --fingerprint requires smctl windows certsync to have synced the cert to the
-      # Windows cert store first. --keypair-alias goes direct through PKCS11 and works
-      # without certsync. All real-world working Tauri+smctl examples use this flag.
-      #
-      # smctl reads SM_HOST, SM_API_KEY, SM_CLIENT_CERT_FILE, SM_CLIENT_CERT_PASSWORD
-      # from env (set by prior DigiCert setup step). No --config-file needed.
-      - name: Configure Windows code signing
-        if: ${{ matrix.platform == 'windows-latest' && env.SM_API_KEY != '' && (github.event_name == 'release' || (github.event_name == 'workflow_dispatch' && github.event.inputs.sign != 'false') || github.ref == 'refs/heads/V2-master') }}
-        shell: bash
-        env:
-          KEYPAIR_ALIAS: ${{ secrets.SM_KEYPAIR_ALIAS }}
-        run: |
-          cat > ./frontend/src-tauri/tauri.windows.conf.json <<EOF
-          {
-            "bundle": {
-              "windows": {
-                "signCommand": {
-                  "cmd": "smctl",
-                  "args": ["sign", "--keypair-alias", "${KEYPAIR_ALIAS}", "--input", "%1", "--verbose"]
-                }
-              }
-            }
-          }
-          EOF
-          echo "Generated tauri.windows.conf.json (alias masked):"
-          sed "s/${KEYPAIR_ALIAS}/***/g" ./frontend/src-tauri/tauri.windows.conf.json
-
-      - name: Import release GPG signing key (Linux)
-        if: matrix.platform == 'ubuntu-22.04'
-        env:
-          RELEASE_GPG_PRIVATE_KEY: ${{ secrets.RELEASE_GPG_PRIVATE_KEY }}
-        run: |
-          echo "$RELEASE_GPG_PRIVATE_KEY" | gpg --batch --import
-          gpg --list-secret-keys --keyid-format=long
-
-      - name: Make libjvm discoverable for linuxdeploy (Linux AppImage)
-        if: matrix.platform == 'ubuntu-22.04'
-        run: |
-          JAVA_LIBJVM="$JAVA_HOME/lib/server/libjvm.so"
-          if [ -f "$JAVA_LIBJVM" ]; then
-            sudo ln -sf "$JAVA_LIBJVM" /usr/lib/libjvm.so
-            echo "Linked libjvm from $JAVA_LIBJVM -> /usr/lib/libjvm.so"
-          else
-            echo "libjvm not found at $JAVA_LIBJVM"
-            exit 1
-          fi
-
      - name: Build Tauri app
        uses: tauri-apps/tauri-action@51a9f1156b33df106d827c3a78f8f894946c5faa # v0.5.25
        env:
@@ -438,115 +416,114 @@ jobs:
          APPLE_ID: ${{ secrets.APPLE_ID }}
          APPLE_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
          APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
-          # AppImage signing — three env vars work together:
-          #   SIGN=1                        tells linuxdeploy-plugin-appimage to forward --sign to appimagetool
-          #   APPIMAGETOOL_SIGN_PASSPHRASE  appimagetool uses this to unlock the GPG key non-interactively
-          #   SIGN_KEY                      appimagetool picks the key matching this fingerprint
-          # Without SIGN=1, the other two are ignored and the AppImage is built unsigned even if a key is present.
-          SIGN: "1"
-          APPIMAGETOOL_SIGN_PASSPHRASE: ${{ secrets.RELEASE_GPG_PASSPHRASE }}
-          SIGN_KEY: ${{ vars.RELEASE_GPG_FINGERPRINT }}
+          APPIMAGETOOL_SIGN_PASSPHRASE: ${{ secrets.APPIMAGETOOL_SIGN_PASSPHRASE }}
          TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }}
          TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY_PASSWORD }}
          VITE_SUPABASE_PUBLISHABLE_DEFAULT_KEY: ${{ secrets.VITE_SUPABASE_PUBLISHABLE_DEFAULT_KEY || 'sb_publishable_UHz2SVRF5mvdrPHWkRteyA_yNlZTkYb' }}
          VITE_SAAS_SERVER_URL: ${{ secrets.VITE_SAAS_SERVER_URL || 'https://app.stirlingpdf.com' }}
          VITE_SAAS_BACKEND_API_URL: ${{ secrets.VITE_SAAS_BACKEND_API_URL || 'https://api.stirlingpdf.com' }}
-          # DigiCert KeyLocker env vars consumed by smctl during signCommand
-          SM_CODE_SIGNING_CERT_SHA1_HASH: ${{ secrets.SM_CODE_SIGNING_CERT_SHA1_HASH }}
+          # Only enable Windows signing in Tauri when on release or V2-master
+          SIGN: ${{ (github.event_name == 'release' || github.ref == 'refs/heads/V2-master') && (env.SM_API_KEY == '' && env.WINDOWS_CERTIFICATE != '') && '1' || '0' }}
          CI: true
        with:
          projectPath: ./frontend
          tauriScript: npx tauri
          args: ${{ matrix.args }}

-      - name: Clear release GPG key from runner keyring (Linux)
-        if: always() && matrix.platform == 'ubuntu-22.04'
-        env:
-          RELEASE_GPG_FINGERPRINT: ${{ vars.RELEASE_GPG_FINGERPRINT }}
-        run: |
-          if [ -n "$RELEASE_GPG_FINGERPRINT" ]; then
-            gpg --batch --yes --delete-secret-keys "$RELEASE_GPG_FINGERPRINT" || true
-            gpg --batch --yes --delete-keys "$RELEASE_GPG_FINGERPRINT" || true
-          fi
-
-      # Verify the MSI (outer wrapper users download) AND the inner exe extracted
-      # from it (what actually gets installed and what AV scans). We don't check
-      # target/.../release/stirling-pdf.exe - that's Tauri's intermediate build
-      # artifact. Tauri signs a COPY when bundling into the MSI and leaves the raw
-      # cargo output unsigned, so checking it produces false negatives.
-      - name: Verify Windows Code Signature
-        if: ${{ matrix.platform == 'windows-latest' && env.SM_API_KEY != '' && (github.event_name == 'release' || (github.event_name == 'workflow_dispatch' && github.event.inputs.sign != 'false') || github.ref == 'refs/heads/V2-master') }}
+      # Sign with DigiCert KeyLocker (post-build)
+      - name: Sign Windows binaries with DigiCert KeyLocker
+        if: ${{ matrix.platform == 'windows-latest' && env.SM_API_KEY != '' && (github.event_name == 'release' || github.ref == 'refs/heads/V2-master') }}
        shell: pwsh
        run: |
-          $allSigned = $true
+          Write-Host "=== DigiCert KeyLocker Signing ==="

-          # Check MSI installer (outer wrapper - what users download)
+          # Test smctl connectivity first
+          Write-Host "Testing smctl connection..."
+          $healthCheck = & smctl healthcheck 2>&1
+          if ($LASTEXITCODE -eq 0) {
+            Write-Host "[SUCCESS] Connected to DigiCert KeyLocker"
+          } else {
+            Write-Host "[ERROR] Failed to connect to DigiCert KeyLocker"
+            Write-Host $healthCheck
+            exit 1
+          }
+          Write-Host ""
+
+          # Sync certificates to Windows certificate store
+          Write-Host "Syncing certificates to Windows certificate store..."
+          $syncOutput = & smctl windows certsync 2>&1
+          Write-Host "Cert sync result: $syncOutput"
+          Write-Host ""
+
+          # Find only the files we need to sign
+          $filesToSign = @()
+
+          # Main application executable
+          $mainExe = Get-ChildItem -Path "./frontend/src-tauri/target/x86_64-pc-windows-msvc/release" -Filter "stirling-pdf.exe" -File -ErrorAction SilentlyContinue
+          if ($mainExe) { $filesToSign += $mainExe }
+
+          # MSI installer
          $msiFiles = Get-ChildItem -Path "./frontend/src-tauri/target" -Filter "*.msi" -Recurse -File
-          if ($msiFiles.Count -eq 0) {
-            Write-Host "[ERROR] No MSI found under target/"
+          $filesToSign += $msiFiles
+
+          if ($filesToSign.Count -eq 0) {
+            Write-Host "[ERROR] No files found to sign"
            exit 1
          }
-          foreach ($msi in $msiFiles) {
-            $sig = Get-AuthenticodeSignature -FilePath $msi.FullName
-            Write-Host "MSI: Status=$($sig.Status), Signer=$($sig.SignerCertificate.Subject)"
-            if ($sig.Status -ne "Valid") {
-              Write-Host "[ERROR] MSI is not signed"
-              $allSigned = $false
-            }
-          }

-          # Extract MSI and verify the inner exe (the file that actually gets installed).
-          # This is the critical check - AV flags the installed exe at runtime.
-          $msi = $msiFiles[0].FullName
-          $extractDir = Join-Path $env:RUNNER_TEMP "msi-verify"
-          if (Test-Path $extractDir) { Remove-Item $extractDir -Recurse -Force }
-          $proc = Start-Process msiexec.exe -ArgumentList '/a', $msi, '/qn', "TARGETDIR=$extractDir" -Wait -PassThru -NoNewWindow
-          if ($proc.ExitCode -eq 0) {
-            $innerExe = Get-ChildItem -Path $extractDir -Filter "stirling-pdf.exe" -Recurse -File | Select-Object -First 1
-            if ($innerExe) {
-              $sig = Get-AuthenticodeSignature -FilePath $innerExe.FullName
-              Write-Host "Inner EXE (from MSI): Status=$($sig.Status), Signer=$($sig.SignerCertificate.Subject)"
-              if ($sig.Status -ne "Valid") {
-                Write-Host "[ERROR] Inner exe extracted from MSI is NOT signed - AV will flag this at runtime"
-                $allSigned = $false
-              }
+          Write-Host "Found $($filesToSign.Count) files to sign:"
+          foreach ($f in $filesToSign) { Write-Host "  - $($f.Name)" }
+          Write-Host ""
+
+          $signedCount = 0
+          foreach ($file in $filesToSign) {
+            Write-Host "Signing: $($file.Name)"
+
+            # Get PKCS11 config file path
+            $pkcs11Config = $env:PKCS11_CONFIG
+            if (-not $pkcs11Config) {
+              Write-Host "[ERROR] PKCS11_CONFIG environment variable not set"
+              exit 1
+            }
+
+            Write-Host "Using PKCS11 config: $pkcs11Config"
+
+            # Try signing with certificate fingerprint first (if available)
+            $fingerprint = "${{ secrets.SM_CODE_SIGNING_CERT_SHA1_HASH }}"
+            if ($fingerprint -and $fingerprint -ne "") {
+              Write-Host "Attempting to sign with certificate fingerprint..."
+              $output = & smctl sign --fingerprint "$fingerprint" --input "$($file.FullName)" --config-file "$pkcs11Config" --verbose 2>&1
+              $exitCode = $LASTEXITCODE
            } else {
-              Write-Host "[ERROR] Could not find stirling-pdf.exe inside MSI"
-              $allSigned = $false
+              Write-Host "No fingerprint provided, using keypair alias..."
+              $output = & smctl sign --keypair-alias "${{ secrets.SM_KEYPAIR_ALIAS }}" --input "$($file.FullName)" --config-file "$pkcs11Config" --verbose 2>&1
+              $exitCode = $LASTEXITCODE
            }
-          } else {
-            Write-Host "[ERROR] Failed to extract MSI for verification (exit code: $($proc.ExitCode))"
-            $allSigned = $false
-          }

-          if (-not $allSigned) {
-            Write-Host "[ERROR] Signature verification failed"
-            exit 1
-          }
-          Write-Host "[SUCCESS] MSI and installed exe are properly signed"
+            Write-Host "Exit code: $exitCode"
+            Write-Host "Output: $output"

-      # Dump smctl log files on failure. Tauri's signCommand captures smctl output
-      # but drops stderr when the command exits non-zero, making failures opaque.
-      # The real errors live in smctl's log files - surface them here for debugging.
-      - name: Dump smctl logs on failure
-        if: ${{ failure() && matrix.platform == 'windows-latest' && env.SM_API_KEY != '' }}
-        shell: pwsh
-        run: |
-          $logDir = "$env:USERPROFILE\.signingmanager\logs"
-          if (Test-Path $logDir) {
-            Get-ChildItem $logDir | ForEach-Object {
-              Write-Host "=== $($_.FullName) ==="
-              Get-Content $_.FullName -Tail 200
-              Write-Host ""
+            if ($output -match "FAILED" -or $output -match "error" -or $output -match "Error") {
+              Write-Host "[ERROR] Signing failed for $($file.Name)"
+              exit 1
            }
-          } else {
-            Write-Host "smctl log directory not found at $logDir"
+
+            if ($exitCode -ne 0) {
+              Write-Host "[ERROR] Failed to sign $($file.Name)"
+              Write-Host "Full error output:"
+              Write-Host $output
+              exit 1
+            }
+
+            $signedCount++
+            Write-Host "[SUCCESS] Signed: $($file.Name)"
+            Write-Host ""
          }

-      # Rename + Upload: use always() so artifacts are still collected when verify
-      # fails - we need them to manually inspect what actually came out of the build.
+          Write-Host "=== Summary ==="
+          Write-Host "[SUCCESS] Signed $signedCount/$($filesToSign.Count) files successfully"
+
      - name: Rename artifacts
-        if: always() && steps.digicert-setup.conclusion != 'failure'
        shell: bash
        run: |
          mkdir -p ./dist
@@ -554,20 +531,17 @@ jobs:

          # Find and rename artifacts based on platform
          if [ "${{ matrix.platform }}" = "windows-latest" ]; then
-            # Only ship the MSI installer on Windows. The loose exe and WiX toolset exes
-            # are not the user-facing installer - the MSI contains the signed inner exe.
+            find . -name "*.exe" -exec cp {} "../../../dist/Stirling-PDF-${{ matrix.name }}.exe" \;
            find . -name "*.msi" -exec cp {} "../../../dist/Stirling-PDF-${{ matrix.name }}.msi" \;
          elif [ "${{ matrix.platform }}" = "macos-15" ] || [ "${{ matrix.platform }}" = "macos-15-intel" ]; then
            find . -name "*.dmg" -exec cp {} "../../../dist/Stirling-PDF-${{ matrix.name }}.dmg" \;
            find . -name "*.app" -exec cp -r {} "../../../dist/Stirling-PDF-${{ matrix.name }}.app" \;
          else
            find . -name "*.deb" -exec cp {} "../../../dist/Stirling-PDF-${{ matrix.name }}.deb" \;
-            find . -name "*.rpm" -exec cp {} "../../../dist/Stirling-PDF-${{ matrix.name }}.rpm" \;
            find . -name "*.AppImage" -exec cp {} "../../../dist/Stirling-PDF-${{ matrix.name }}.AppImage" \;
          fi

      - name: Upload build artifacts
-        if: always() && steps.digicert-setup.conclusion != 'failure'
        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
        with:
          name: Stirling-PDF-${{ matrix.name }}
@@ -614,7 +588,7 @@ jobs:
        run: ls -R ./artifacts

      - name: Upload binaries to Release
-        uses: softprops/action-gh-release@153bb8e04406b158c6c84fc1615b65b24149a1fe # v2.6.1
+        uses: softprops/action-gh-release@a06a81a03ee405af7f2048a818ed3f03bbf83c7b # v2.5.0
        with:
          tag_name: v${{ needs.determine-matrix.outputs.version }}
          generate_release_notes: true
@@ -623,7 +597,6 @@ jobs:
            ./artifacts/**/*.msi
            ./artifacts/**/*.dmg
            ./artifacts/**/*.deb
-            ./artifacts/**/*.rpm
            ./artifacts/**/*.AppImage
          draft: false
          prerelease: false
@@ -1,49 +0,0 @@
-name: Nightly E2E Tests
-
-on:
-  schedule:
-    - cron: "0 2 * * *" # 2 AM UTC every night
-  workflow_dispatch:
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-permissions:
-  contents: read
-
-jobs:
-  playwright-all-browsers:
-    name: Playwright (chromium + firefox + webkit)
-    runs-on: ubuntu-latest
-    steps:
-      - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@58077d3c7e43986b6b15fba718e8ea69e387dfcc # v2.15.1
-        with:
-          egress-policy: audit
-
-      - name: Checkout repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-
-      - name: Set up Node.js
-        uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
-        with:
-          node-version: "22"
-          cache: "npm"
-          cache-dependency-path: frontend/package-lock.json
-
-      - name: Install Task
-        uses: go-task/setup-task@3be4020d41929789a01026e0e427a4321ce0ad44 # v2.0.0
-      - name: Install all Playwright browsers
-        run: task frontend:test:e2e:install
-
-      - name: Run E2E tests (all browsers)
-        run: task frontend:test:e2e
-
-      - name: Upload Playwright report
-        if: always()
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
-        with:
-          name: playwright-nightly-${{ github.run_id }}
-          path: frontend/playwright-report/
-          retention-days: 14
@@ -1,197 +0,0 @@
-name: Update Package Manager Manifests
-
-on:
-  # release:
-  #   types: [released]
-  workflow_dispatch:
-    inputs:
-      version:
-        description: "Version to test (e.g. 2.9.2 — no v prefix)"
-        required: true
-        type: string
-      dry_run:
-        description: "Skip the git push at the end (safe test)"
-        type: boolean
-        default: true
-
-permissions:
-  contents: read
-
-jobs:
-  get-release-info:
-    runs-on: ubuntu-latest
-    outputs:
-      version: ${{ steps.info.outputs.version }}
-      dmg_arm64_sha256: ${{ steps.hashes.outputs.dmg_arm64_sha256 }}
-      dmg_x86_64_sha256: ${{ steps.hashes.outputs.dmg_x86_64_sha256 }}
-      msi_sha256: ${{ steps.hashes.outputs.msi_sha256 }}
-      deb_sha256: ${{ steps.hashes.outputs.deb_sha256 }}
-      jar_sha256: ${{ steps.hashes.outputs.jar_sha256 }}
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@v2
-        with:
-          egress-policy: audit
-
-      - name: Extract version from tag or manual input
-        id: info
-        env:
-          DISPATCH_VERSION: ${{ inputs.version }}
-          RELEASE_TAG: ${{ github.event.release.tag_name }}
-        run: |
-          if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
-            VERSION="$DISPATCH_VERSION"
-          else
-            VERSION="$RELEASE_TAG"
-          fi
-          VERSION="${VERSION#v}"
-          echo "version=$VERSION" >> "$GITHUB_OUTPUT"
-
-      - name: Download release assets and compute SHA256
-        id: hashes
-        env:
-          VERSION: ${{ steps.info.outputs.version }}
-          GH_TOKEN: ${{ github.token }}
-        run: |
-          BASE="https://github.com/Stirling-Tools/Stirling-PDF/releases/download/v${VERSION}"
-
-          download_sha256() {
-            local url="$1"
-            local file
-            file=$(basename "$url")
-            curl -fsSL --retry 3 -o "$file" "$url"
-            sha256sum "$file" | awk '{print $1}'
-          }
-
-          DMG_ARM64_SHA=$(download_sha256 "${BASE}/Stirling-PDF-macos-aarch64.dmg")
-          DMG_X64_SHA=$(download_sha256 "${BASE}/Stirling-PDF-macos-x86_64.dmg")
-          MSI_SHA=$(download_sha256 "${BASE}/Stirling-PDF-windows-x86_64.msi")
-          DEB_SHA=$(download_sha256 "${BASE}/Stirling-PDF-linux-x86_64.deb")
-          JAR_SHA=$(download_sha256 "${BASE}/Stirling-PDF-with-login.jar")
-
-          echo "dmg_arm64_sha256=$DMG_ARM64_SHA" >> "$GITHUB_OUTPUT"
-          echo "dmg_x86_64_sha256=$DMG_X64_SHA"  >> "$GITHUB_OUTPUT"
-          echo "msi_sha256=$MSI_SHA"              >> "$GITHUB_OUTPUT"
-          echo "deb_sha256=$DEB_SHA"              >> "$GITHUB_OUTPUT"
-          echo "jar_sha256=$JAR_SHA"              >> "$GITHUB_OUTPUT"
-
-  update-homebrew:
-    needs: get-release-info
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@v2
-        with:
-          egress-policy: audit
-
-      - name: Checkout homebrew tap
-        uses: actions/checkout@v4
-        with:
-          repository: Stirling-Tools/homebrew-stirling-pdf
-          token: ${{ secrets.HOMEBREW_TAP_TOKEN }}
-          path: homebrew-tap
-
-      - name: Update cask (stirling-pdf.rb)
-        env:
-          VERSION: ${{ needs.get-release-info.outputs.version }}
-          ARM64_SHA: ${{ needs.get-release-info.outputs.dmg_arm64_sha256 }}
-          X64_SHA: ${{ needs.get-release-info.outputs.dmg_x86_64_sha256 }}
-        run: |
-          CASK="homebrew-tap/Casks/stirling-pdf.rb"
-          sed -i "s/version \".*\"/version \"${VERSION}\"/" "$CASK"
-          # Update ARM64 sha256 (line following on_arm block)
-          awk -v arm="$ARM64_SHA" -v x64="$X64_SHA" '
-            /on_arm/     { in_arm=1 }
-            /on_intel/   { in_arm=0; in_intel=1 }
-            /end/        { in_arm=0; in_intel=0 }
-            in_arm  && /sha256/ { sub(/sha256 ".*"/, "sha256 \"" arm "\"") }
-            in_intel && /sha256/ { sub(/sha256 ".*"/, "sha256 \"" x64 "\"") }
-            { print }
-          ' "$CASK" > tmp && mv tmp "$CASK"
-
-      - name: Update formula (stirling-pdf-server.rb)
-        env:
-          VERSION: ${{ needs.get-release-info.outputs.version }}
-          JAR_SHA: ${{ needs.get-release-info.outputs.jar_sha256 }}
-        run: |
-          FORMULA="homebrew-tap/Formula/stirling-pdf-server.rb"
-          sed -i "s/version \".*\"/version \"${VERSION}\"/" "$FORMULA"
-          sed -i "s/sha256 \".*\"/sha256 \"${JAR_SHA}\"/" "$FORMULA"
-
-      - name: Show homebrew tap diff (for dry-run visibility)
-        working-directory: homebrew-tap
-        run: |
-          echo "--- diff --stat ---"
-          git diff --stat
-          echo "--- full diff ---"
-          git diff
-
-      - name: Commit and push homebrew tap updates
-        if: ${{ github.event_name == 'release' || inputs.dry_run == false }}
-        working-directory: homebrew-tap
-        run: |
-          git config user.name  "github-actions[bot]"
-          git config user.email "github-actions[bot]@users.noreply.github.com"
-          git add Casks/stirling-pdf.rb Formula/stirling-pdf-server.rb
-          git diff --cached --quiet && echo "No changes" && exit 0
-          git commit -m "chore: bump Stirling-PDF to v${{ needs.get-release-info.outputs.version }}"
-          git push
-
-  update-scoop:
-    needs: get-release-info
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@v2
-        with:
-          egress-policy: audit
-
-      - name: Checkout Scoop bucket (shared with Homebrew tap)
-        uses: actions/checkout@v4
-        with:
-          repository: Stirling-Tools/homebrew-stirling-pdf
-          token: ${{ secrets.SCOOP_BUCKET_TOKEN }}
-          path: scoop-bucket
-
-      - name: Update stirling-pdf.json
-        env:
-          VERSION: ${{ needs.get-release-info.outputs.version }}
-          MSI_SHA: ${{ needs.get-release-info.outputs.msi_sha256 }}
-        run: |
-          MANIFEST="scoop-bucket/scoop/stirling-pdf.json"
-          jq --arg v "$VERSION" --arg h "$MSI_SHA" \
-            '.version = $v | .architecture["64bit"].url = "https://github.com/Stirling-Tools/Stirling-PDF/releases/download/v\($v)/Stirling-PDF-windows-x86_64.msi" | .architecture["64bit"].hash = $h' \
-            "$MANIFEST" > tmp.json && mv tmp.json "$MANIFEST"
-
-      - name: Update stirling-pdf-server.json
-        env:
-          VERSION: ${{ needs.get-release-info.outputs.version }}
-          JAR_SHA: ${{ needs.get-release-info.outputs.jar_sha256 }}
-        run: |
-          MANIFEST="scoop-bucket/scoop/stirling-pdf-server.json"
-          jq --arg v "$VERSION" --arg h "$JAR_SHA" \
-            '.version = $v | .url = "https://github.com/Stirling-Tools/Stirling-PDF/releases/download/v\($v)/Stirling-PDF-with-login.jar" | .hash = $h' \
-            "$MANIFEST" > tmp.json && mv tmp.json "$MANIFEST"
-
-      - name: Show Scoop bucket diff (for dry-run visibility)
-        working-directory: scoop-bucket
-        run: |
-          echo "--- diff --stat ---"
-          git diff --stat
-          echo "--- full diff ---"
-          git diff
-
-      - name: Commit and push Scoop bucket updates
-        if: ${{ github.event_name == 'release' || inputs.dry_run == false }}
-        working-directory: scoop-bucket
-        run: |
-          git config user.name  "github-actions[bot]"
-          git config user.email "github-actions[bot]@users.noreply.github.com"
-          git add scoop/stirling-pdf.json scoop/stirling-pdf-server.json
-          git diff --cached --quiet && echo "No changes" && exit 0
-          git commit -m "chore: bump Stirling-PDF to v${{ needs.get-release-info.outputs.version }}"
-          git push
@@ -2,7 +2,7 @@ name: Pre-commit

 on:
  workflow_dispatch:
-  pull_request:
+  push:
    branches:
      - main

@@ -16,6 +16,9 @@ jobs:
      # Prevents sdist builds → no tar extraction
      PIP_ONLY_BINARY: ":all:"
      PIP_DISABLE_PIP_VERSION_CHECK: "1"
+    permissions:
+      contents: write
+      pull-requests: write
    steps:
      - name: Harden Runner
        uses: step-security/harden-runner@58077d3c7e43986b6b15fba718e8ea69e387dfcc # v2.15.1
@@ -28,6 +31,13 @@ jobs:
          fetch-depth: 0
          persist-credentials: false

+      - name: Setup GitHub App Bot
+        id: setup-bot
+        uses: ./.github/actions/setup-bot
+        with:
+          app-id: ${{ secrets.GH_APP_ID }}
+          private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}
+
      - name: Set up Python
        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
        with:
@@ -47,4 +57,47 @@ jobs:
          pre-commit run gitleaks --all-files -c .pre-commit-config.yaml
          pre-commit run end-of-file-fixer --all-files -c .pre-commit-config.yaml
          pre-commit run trailing-whitespace --all-files -c .pre-commit-config.yaml
-          git diff --exit-code
+        continue-on-error: true
+
+      - name: Set up JDK 25
+        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
+        with:
+          java-version: "25"
+          distribution: "temurin"
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5.0.1
+        with:
+          gradle-version: 9.3.1
+
+      - name: Build with Gradle
+        run: ./gradlew build
+        env:
+          MAVEN_USER: ${{ secrets.MAVEN_USER }}
+          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
+          MAVEN_PUBLIC_URL: ${{ secrets.MAVEN_PUBLIC_URL }}
+
+      - name: git add
+        run: |
+          git add .
+          git diff --staged --quiet || echo "CHANGES_DETECTED=true" >> $GITHUB_ENV
+
+      - name: Create Pull Request
+        if: env.CHANGES_DETECTED == 'true'
+        uses: peter-evans/create-pull-request@c0f553fe549906ede9cf27b5156039d195d2ece0 # v8.1.0
+        with:
+          token: ${{ steps.setup-bot.outputs.token }}
+          commit-message: ":file_folder: pre-commit"
+          committer: ${{ steps.setup-bot.outputs.committer }}
+          author: ${{ steps.setup-bot.outputs.committer }}
+          signoff: true
+          branch: pre-commit
+          title: "🤖 format everything with pre-commit by ${{ steps.setup-bot.outputs.app-slug }}"
+          body: |
+            Auto-generated by [create-pull-request][1] with **${{ steps.setup-bot.outputs.app-slug }}**
+
+            [1]: https://github.com/peter-evans/create-pull-request
+          draft: false
+          delete-branch: true
+          labels: github-actions
+          sign-commits: true
@@ -1,122 +0,0 @@
-name: Push Docker Base Image
-
-on:
-  push:
-    branches:
-      - baseDockerImage
-      - accessIssueFix
-  workflow_dispatch:
-    inputs:
-      version:
-        description: 'Base image version (e.g., 1.0.0, 1.0.1)'
-        required: true
-        type: string
-
-permissions:
-  contents: read
-
-jobs:
-  push-base:
-    if: ${{ vars.CI_PROFILE != 'lite' && github.actor == 'Frooodle' }}
-    runs-on: ubuntu-24.04-8core
-    permissions:
-      packages: write
-      id-token: write
-    steps:
-      - name: Verify authorized user
-        run: |
-          if [ "${{ github.actor }}" != "Frooodle" ]; then
-            echo "Error: Only Frooodle is authorized to run this workflow"
-            exit 1
-          fi
-
-      - name: Set version
-        id: version
-        run: |
-          if [ "${{ github.event_name }}" == "workflow_dispatch" ]; then
-            VERSION="${{ github.event.inputs.version }}"
-          elif [ "${{ github.ref_name }}" == "accessIssueFix" ]; then
-            VERSION="1.0.3"
-          else
-            VERSION="1.0.0"
-          fi
-          echo "version=${VERSION}" >> $GITHUB_OUTPUT
-
-      - name: Harden Runner
-        uses: step-security/harden-runner@58077d3c7e43986b6b15fba718e8ea69e387dfcc # v2.15.1
-        with:
-          egress-policy: audit
-
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
-        with:
-          username: ${{ secrets.DOCKER_HUB_USERNAME }}
-          password: ${{ secrets.DOCKER_HUB_API }}
-
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ github.token }}
-
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3.7.0
-
-      - name: Convert repository owner to lowercase
-        id: repoowner
-        run: echo "lowercase=$(echo ${{ github.repository_owner }} | awk '{print tolower($0)}')" >> $GITHUB_OUTPUT
-
-      - name: Generate tags for base image
-        id: meta
-        uses: docker/metadata-action@030e881283bb7a6894de51c315a6bfe6a94e05cf # v6.0.0
-        with:
-          images: |
-            ${{ secrets.DOCKER_HUB_ORG_USERNAME }}/stirling-pdf-base
-            ghcr.io/${{ steps.repoowner.outputs.lowercase }}/stirling-pdf-base
-          tags: |
-            type=raw,value=${{ steps.version.outputs.version }}
-
-      - name: Build and push base image
-        id: build-push-base
-        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
-        with:
-          builder: ${{ steps.buildx.outputs.name }}
-          context: docker/base
-          file: ./docker/base/Dockerfile
-          push: true
-          cache-from: type=gha,scope=stirling-pdf-base
-          cache-to: type=gha,mode=max,scope=stirling-pdf-base
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          platforms: linux/amd64,linux/arm64/v8
-          provenance: true
-          sbom: true
-
-      - name: Install cosign
-        uses: sigstore/cosign-installer@faadad0cce49287aee09b3a48701e75088a2c6ad # v4.0.0
-        with:
-          cosign-release: "v2.4.1"
-
-      - name: Sign base images
-        env:
-          DIGEST: ${{ steps.build-push-base.outputs.digest }}
-          TAGS: ${{ steps.meta.outputs.tags }}
-          COSIGN_PRIVATE_KEY: ${{ secrets.COSIGN_PRIVATE_KEY }}
-          COSIGN_PASSWORD: ${{ secrets.COSIGN_PASSWORD }}
-        run: |
-          if [ -n "$COSIGN_PRIVATE_KEY" ]; then
-            echo "$TAGS" | tr ',' '\n' | while read -r tag; do
-              cosign sign --yes \
-                --key env://COSIGN_PRIVATE_KEY \
-                "${tag}@${DIGEST}"
-            done
-          else
-            echo "Warning: COSIGN_PRIVATE_KEY not set, skipping image signing"
-          fi
@@ -46,7 +46,7 @@ jobs:
          distribution: "temurin"

      - name: Cache Gradle dependencies
-        uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
+        uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
        with:
          path: |
            ~/.gradle/caches
@@ -64,8 +64,6 @@ jobs:
        id: buildx
        uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0

-      - name: Install Task
-        uses: go-task/setup-task@3be4020d41929789a01026e0e427a4321ce0ad44 # v2.0.0
      - name: Get version number
        id: versionNumber
        run: echo "versionNumber=$(./gradlew printVersion --quiet | tail -1)" >> $GITHUB_OUTPUT
@@ -76,13 +74,13 @@ jobs:

      - name: Install cosign
        if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/V2-master'
-        uses: sigstore/cosign-installer@ba7bc0a3fef59531c69a25acd34668d6d3fe6f22 # v4.1.0
+        uses: sigstore/cosign-installer@faadad0cce49287aee09b3a48701e75088a2c6ad # v4.0.0
        with:
          cosign-release: "v2.4.1"

      - name: Install cosign
        if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/V2-master'
-        uses: sigstore/cosign-installer@ba7bc0a3fef59531c69a25acd34668d6d3fe6f22 # v4.1.0
+        uses: sigstore/cosign-installer@faadad0cce49287aee09b3a48701e75088a2c6ad # v4.0.0
        with:
          cosign-release: "v2.4.1"

@@ -100,7 +98,7 @@ jobs:
          password: ${{ github.token }}

      - name: Set up QEMU
-        uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a # v4.0.0
+        uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3.7.0

      - name: Convert repository owner to lowercase
        id: repoowner
@@ -132,9 +130,7 @@ jobs:
          cache-to: type=gha,mode=max,scope=stirling-pdf-latest
          tags: ${{ steps.meta.outputs.tags }}
          labels: ${{ steps.meta.outputs.labels }}
-          build-args: |
-            VERSION_TAG=${{ steps.versionNumber.outputs.versionNumber }}
-            BASE_VERSION=1.0.0
+          build-args: VERSION_TAG=${{ steps.versionNumber.outputs.versionNumber }}
          platforms: linux/amd64,linux/arm64/v8
          provenance: true
          sbom: true
@@ -1,93 +0,0 @@
-name: Rollback Latest Tags to Version
-
-on:
-  workflow_dispatch:
-    inputs:
-      version:
-        description: "Version to rollback to (e.g. 2.8.0)"
-        required: true
-        type: string
-
-permissions:
-  contents: read
-
-jobs:
-  rollback:
-    runs-on: ubuntu-latest
-    permissions:
-      packages: write
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@58077d3c7e43986b6b15fba718e8ea69e387dfcc # v2.15.1
-        with:
-          egress-policy: audit
-
-      - name: Install crane
-        uses: imjasonh/setup-crane@31b88afe9de28ae0ffa220711af4b60be9435f6e # v0.4
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
-        with:
-          username: ${{ secrets.DOCKER_HUB_USERNAME }}
-          password: ${{ secrets.DOCKER_HUB_API }}
-
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ github.token }}
-
-      - name: Convert repository owner to lowercase
-        id: repoowner
-        run: echo "lowercase=$(echo ${{ github.repository_owner }} | awk '{print tolower($0)}')" >> $GITHUB_OUTPUT
-
-      - name: Rollback all latest tags to v${{ inputs.version }}
-        env:
-          VERSION: ${{ inputs.version }}
-          DOCKER_HUB_USERNAME: ${{ secrets.DOCKER_HUB_USERNAME }}
-          DOCKER_HUB_ORG_USERNAME: ${{ secrets.DOCKER_HUB_ORG_USERNAME }}
-          REPO_OWNER: ${{ steps.repoowner.outputs.lowercase }}
-        run: |
-          set -euo pipefail
-
-          IMAGES=(
-            "${DOCKER_HUB_USERNAME}/s-pdf"
-            "ghcr.io/${REPO_OWNER}/s-pdf"
-            "ghcr.io/${REPO_OWNER}/stirling-pdf"
-            "${DOCKER_HUB_ORG_USERNAME}/stirling-pdf"
-          )
-
-          VARIANTS=(
-            "${VERSION}:latest"
-            "${VERSION}-fat:latest-fat"
-            "${VERSION}-ultra-lite:latest-ultra-lite"
-          )
-
-          FAILED=0
-
-          for image in "${IMAGES[@]}"; do
-            for variant in "${VARIANTS[@]}"; do
-              SOURCE_TAG="${variant%%:*}"
-              TARGET_TAG="${variant##*:}"
-
-              echo "::group::${image} — ${SOURCE_TAG} → ${TARGET_TAG}"
-
-              if crane manifest "${image}:${SOURCE_TAG}" > /dev/null 2>&1; then
-                crane cp "${image}:${SOURCE_TAG}" "${image}:${TARGET_TAG}"
-                echo "✅ ${image}:${TARGET_TAG} now points to ${SOURCE_TAG}"
-              else
-                echo "::warning::⚠️ ${image}:${SOURCE_TAG} not found, skipping"
-                FAILED=1
-              fi
-
-              echo "::endgroup::"
-            done
-          done
-
-          if [ "$FAILED" -ne 0 ]; then
-            echo "::warning::Some source tags were not found. This is expected if not all variants exist for this version."
-          fi
-
-          echo ""
-          echo "🎉 Rollback to ${VERSION} complete!"
@@ -56,8 +56,6 @@ jobs:
          SWAGGERHUB_API_KEY: ${{ secrets.SWAGGERHUB_API_KEY }}
          SWAGGERHUB_USER: "Frooodle"

-      - name: Install Task
-        uses: go-task/setup-task@3be4020d41929789a01026e0e427a4321ce0ad44 # v2.0.0
      - name: Get version number
        id: versionNumber
        run: echo "versionNumber=$(./gradlew printVersion --quiet | tail -1)" >> $GITHUB_OUTPUT
@@ -128,16 +128,86 @@ jobs:
        with:
          gradle-version: 9.3.1

-      - name: Setup Task
-        uses: go-task/setup-task@3be4020d41929789a01026e0e427a4321ce0ad44 # v2.0.0
-      - name: Prepare desktop build
-        run: task desktop:prepare
+      - name: Build Java backend with JLink
+        working-directory: ./
+        shell: bash
+        run: |
+          chmod +x ./gradlew
+          echo "🔧 Building Stirling-PDF JAR..."
+          # STIRLING_PDF_DESKTOP_UI=false ./gradlew bootJar --no-daemon
+          ./gradlew build -x spotlessApply -x spotlessCheck -x test -x sonarqube
+
+          # Find the built JAR
+          STIRLING_JAR=$(ls app/core/build/libs/stirling-pdf-*.jar | head -n 1)
+          echo "✅ Built JAR: $STIRLING_JAR"
+
+          # Create Tauri directories
+          mkdir -p ./frontend/src-tauri/libs
+          mkdir -p ./frontend/src-tauri/runtime
+
+          # Copy JAR to Tauri libs
+          cp "$STIRLING_JAR" ./frontend/src-tauri/libs/
+          echo "✅ JAR copied to Tauri libs"
+
+          # Analyze JAR dependencies for jlink modules
+          echo "🔍 Analyzing JAR dependencies..."
+          if command -v jdeps &> /dev/null; then
+            DETECTED_MODULES=$(jdeps --print-module-deps --ignore-missing-deps "$STIRLING_JAR" 2>/dev/null || echo "")
+            if [ -n "$DETECTED_MODULES" ]; then
+              echo "📋 jdeps detected modules: $DETECTED_MODULES"
+              MODULES="$DETECTED_MODULES,java.compiler,java.instrument,java.management,java.naming,java.net.http,java.prefs,java.rmi,java.scripting,java.security.jgss,java.security.sasl,java.sql,java.transaction.xa,java.xml.crypto,jdk.crypto.ec,jdk.crypto.cryptoki,jdk.unsupported"
+            else
+              echo "⚠️ jdeps analysis failed, using predefined modules"
+              MODULES="java.base,java.compiler,java.desktop,java.instrument,java.logging,java.management,java.naming,java.net.http,java.prefs,java.rmi,java.scripting,java.security.jgss,java.security.sasl,java.sql,java.transaction.xa,java.xml,java.xml.crypto,jdk.crypto.ec,jdk.crypto.cryptoki,jdk.unsupported"
+            fi
+          else
+            echo "⚠️ jdeps not available, using predefined modules"
+            MODULES="java.base,java.compiler,java.desktop,java.instrument,java.logging,java.management,java.naming,java.net.http,java.prefs,java.rmi,java.scripting,java.security.jgss,java.security.sasl,java.sql,java.transaction.xa,java.xml,java.xml.crypto,jdk.crypto.ec,jdk.crypto.cryptoki,jdk.unsupported"
+          fi
+
+          # Create custom JRE with jlink (always rebuild)
+          echo "🔧 Creating custom JRE with jlink..."
+          echo "📋 Using modules: $MODULES"
+
+          # Remove any existing JRE
+          rm -rf ./frontend/src-tauri/runtime/jre
+
+          # Create the custom JRE
+          jlink \
+            --add-modules "$MODULES" \
+            --strip-debug \
+            --compress=2 \
+            --no-header-files \
+            --no-man-pages \
+            --output ./frontend/src-tauri/runtime/jre
+
+          if [ ! -d "./frontend/src-tauri/runtime/jre" ]; then
+            echo "❌ Failed to create JLink runtime"
+            exit 1
+          fi
+
+          # Test the bundled runtime
+          if [ -f "./frontend/src-tauri/runtime/jre/bin/java" ]; then
+            RUNTIME_VERSION=$(./frontend/src-tauri/runtime/jre/bin/java --version 2>&1 | head -n 1)
+            echo "✅ Custom JRE created successfully: $RUNTIME_VERSION"
+          else
+            echo "❌ Custom JRE executable not found"
+            exit 1
+          fi
+
+          # Calculate runtime size
+          RUNTIME_SIZE=$(du -sh ./frontend/src-tauri/runtime/jre | cut -f1)
+          echo "📊 Custom JRE size: $RUNTIME_SIZE"
        env:
          MAVEN_USER: ${{ secrets.MAVEN_USER }}
          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
          MAVEN_PUBLIC_URL: ${{ secrets.MAVEN_PUBLIC_URL }}
          DISABLE_ADDITIONAL_FEATURES: true

+      - name: Install frontend dependencies
+        working-directory: ./frontend
+        run: npm ci
+
      # DigiCert KeyLocker Setup (Cloud HSM)
      - name: Setup DigiCert KeyLocker
        id: digicert-setup
@@ -260,58 +330,6 @@ jobs:
          echo "Available tools:"
          ls -la /usr/bin/hd* || echo "No hd* tools found"

-      - name: Preflight smctl
-        if: ${{ matrix.platform == 'windows-latest' && env.SM_API_KEY != '' && github.ref == 'refs/heads/main' }}
-        shell: pwsh
-        env:
-          KEYPAIR_ALIAS: ${{ secrets.SM_KEYPAIR_ALIAS }}
-        run: |
-          & smctl healthcheck
-          if ($LASTEXITCODE -ne 0) { Write-Host "[ERROR] smctl healthcheck failed"; exit 1 }
-          & smctl keypair ls
-          if ($LASTEXITCODE -ne 0) { Write-Host "[ERROR] smctl keypair ls failed"; exit 1 }
-          & smctl windows certsync --keypair-alias "$env:KEYPAIR_ALIAS"
-          if ($LASTEXITCODE -ne 0) { Write-Host "[WARN] smctl windows certsync returned non-zero - continuing" }
-
-      - name: Configure Windows code signing
-        if: ${{ matrix.platform == 'windows-latest' && env.SM_API_KEY != '' && github.ref == 'refs/heads/main' }}
-        shell: bash
-        env:
-          KEYPAIR_ALIAS: ${{ secrets.SM_KEYPAIR_ALIAS }}
-        run: |
-          cat > ./frontend/src-tauri/tauri.windows.conf.json <<EOF
-          {
-            "bundle": {
-              "windows": {
-                "signCommand": {
-                  "cmd": "smctl",
-                  "args": ["sign", "--keypair-alias", "${KEYPAIR_ALIAS}", "--input", "%1", "--verbose"]
-                }
-              }
-            }
-          }
-          EOF
-
-      - name: Import release GPG signing key (Linux)
-        if: matrix.platform == 'ubuntu-22.04'
-        env:
-          RELEASE_GPG_PRIVATE_KEY: ${{ secrets.RELEASE_GPG_PRIVATE_KEY }}
-        run: |
-          echo "$RELEASE_GPG_PRIVATE_KEY" | gpg --batch --import
-          gpg --list-secret-keys --keyid-format=long
-
-      - name: Make libjvm discoverable for linuxdeploy (Linux AppImage)
-        if: matrix.platform == 'ubuntu-22.04'
-        run: |
-          JAVA_LIBJVM="$JAVA_HOME/lib/server/libjvm.so"
-          if [ -f "$JAVA_LIBJVM" ]; then
-            sudo ln -sf "$JAVA_LIBJVM" /usr/lib/libjvm.so
-            echo "Linked libjvm from $JAVA_LIBJVM -> /usr/lib/libjvm.so"
-          else
-            echo "libjvm not found at $JAVA_LIBJVM"
-            exit 1
-          fi
-
      - name: Build Tauri app
        uses: tauri-apps/tauri-action@51a9f1156b33df106d827c3a78f8f894946c5faa # v0.5.25
        env:
@@ -322,35 +340,178 @@ jobs:
          APPLE_ID: ${{ secrets.APPLE_ID }}
          APPLE_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
          APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
-          # AppImage signing — three env vars work together:
-          #   SIGN=1                        tells linuxdeploy-plugin-appimage to forward --sign to appimagetool
-          #   APPIMAGETOOL_SIGN_PASSPHRASE  appimagetool uses this to unlock the GPG key non-interactively
-          #   SIGN_KEY                      appimagetool picks the key matching this fingerprint
-          # Without SIGN=1, the other two are ignored and the AppImage is built unsigned even if a key is present.
-          SIGN: "1"
-          APPIMAGETOOL_SIGN_PASSPHRASE: ${{ secrets.RELEASE_GPG_PASSPHRASE }}
-          SIGN_KEY: ${{ vars.RELEASE_GPG_FINGERPRINT }}
+          APPIMAGETOOL_SIGN_PASSPHRASE: ${{ secrets.APPIMAGETOOL_SIGN_PASSPHRASE }}
          TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }}
          TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY_PASSWORD }}
          VITE_SUPABASE_PUBLISHABLE_DEFAULT_KEY: ${{ secrets.VITE_SUPABASE_PUBLISHABLE_DEFAULT_KEY || 'sb_publishable_UHz2SVRF5mvdrPHWkRteyA_yNlZTkYb' }}
          VITE_SAAS_SERVER_URL: ${{ secrets.VITE_SAAS_SERVER_URL || 'https://app.stirlingpdf.com' }}
          VITE_SAAS_BACKEND_API_URL: ${{ secrets.VITE_SAAS_BACKEND_API_URL || 'https://api.stirlingpdf.com' }}
-          SM_CODE_SIGNING_CERT_SHA1_HASH: ${{ secrets.SM_CODE_SIGNING_CERT_SHA1_HASH }}
+          # Only enable Windows signing in Tauri when on main
+          SIGN: ${{ github.ref == 'refs/heads/main' && (env.SM_API_KEY == '' && env.WINDOWS_CERTIFICATE != '') && '1' || '0' }}
          CI: true
        with:
          projectPath: ./frontend
          tauriScript: npx tauri
          args: ${{ matrix.args }}

-      - name: Clear release GPG key from runner keyring (Linux)
-        if: always() && matrix.platform == 'ubuntu-22.04'
-        env:
-          RELEASE_GPG_FINGERPRINT: ${{ vars.RELEASE_GPG_FINGERPRINT }}
+      # Sign with DigiCert KeyLocker (post-build)
+      - name: Sign Windows binaries with DigiCert KeyLocker
+        if: ${{ matrix.platform == 'windows-latest' && env.SM_API_KEY != '' && github.ref == 'refs/heads/main' }}
+        shell: pwsh
        run: |
-          if [ -n "$RELEASE_GPG_FINGERPRINT" ]; then
-            gpg --batch --yes --delete-secret-keys "$RELEASE_GPG_FINGERPRINT" || true
-            gpg --batch --yes --delete-keys "$RELEASE_GPG_FINGERPRINT" || true
-          fi
+          Write-Host "=== DigiCert KeyLocker Signing ==="
+
+          # Test smctl connectivity first
+          Write-Host "Testing smctl connection..."
+          $healthCheck = & smctl healthcheck 2>&1
+          if ($LASTEXITCODE -eq 0) {
+            Write-Host "[SUCCESS] Connected to DigiCert KeyLocker"
+          } else {
+            Write-Host "[ERROR] Failed to connect to DigiCert KeyLocker"
+            Write-Host $healthCheck
+            exit 1
+          }
+          Write-Host ""
+
+          # Sync certificates to Windows certificate store
+          Write-Host "Syncing certificates to Windows certificate store..."
+          $syncOutput = & smctl windows certsync 2>&1
+          Write-Host "Cert sync result: $syncOutput"
+          Write-Host ""
+
+          # List available certificates and check if they have certificates attached
+          Write-Host "Checking for available certificates..."
+          $certList = & smctl keypair ls 2>&1
+          Write-Host "Keypair list output:"
+          Write-Host $certList
+          Write-Host ""
+
+          # Parse the output to check certificate status
+          $lines = $certList -split "`n"
+          $foundKeypair = $false
+          $hasCertificate = $false
+
+          foreach ($line in $lines) {
+            if ($line -match "${{ secrets.SM_KEYPAIR_ALIAS }}") {
+              $foundKeypair = $true
+              Write-Host "[SUCCESS] Found keypair in list"
+
+              # Check if this line has certificate info (not just empty spaces after alias)
+              $parts = $line -split "\s+"
+              if ($parts.Count -gt 2 -and $parts[1] -ne "" -and $parts[1] -ne "CERTIFICATE") {
+                $hasCertificate = $true
+                Write-Host "[SUCCESS] Certificate is associated with keypair"
+              }
+            }
+          }
+
+          if (-not $foundKeypair) {
+            Write-Host "[ERROR] Keypair not found: ${{ secrets.SM_KEYPAIR_ALIAS }}"
+            Write-Host "Available keypairs are listed above"
+            Write-Host ""
+            Write-Host "Please verify:"
+            Write-Host "  1. Keypair alias is correct in GitHub secret"
+            Write-Host "  2. API key has access to this keypair"
+            exit 1
+          }
+
+          if (-not $hasCertificate) {
+            Write-Host "[ERROR] No certificate associated with keypair"
+            Write-Host "This usually means:"
+            Write-Host "  1. Certificate not yet synced to KeyLocker (run sync manually)"
+            Write-Host "  2. Certificate is pending approval"
+            Write-Host "  3. Certificate needs to be attached to the keypair"
+            Write-Host ""
+            Write-Host "Try running in DigiCert ONE portal:"
+            Write-Host "  smctl keypair sync"
+            exit 1
+          }
+
+          Write-Host "[SUCCESS] Certificate check passed"
+          Write-Host ""
+
+          # Find only the files we need to sign (not build scripts)
+          $filesToSign = @()
+
+          # Main application executable
+          $mainExe = Get-ChildItem -Path "./frontend/src-tauri/target/x86_64-pc-windows-msvc/release" -Filter "stirling-pdf.exe" -File -ErrorAction SilentlyContinue
+          if ($mainExe) { $filesToSign += $mainExe }
+
+          # MSI installer
+          $msiFiles = Get-ChildItem -Path "./frontend/src-tauri/target" -Filter "*.msi" -Recurse -File
+          $filesToSign += $msiFiles
+
+          if ($filesToSign.Count -eq 0) {
+            Write-Host "[ERROR] No files found to sign"
+            exit 1
+          }
+
+          Write-Host "Found $($filesToSign.Count) files to sign:"
+          foreach ($f in $filesToSign) { Write-Host "  - $($f.Name)" }
+          Write-Host ""
+
+          $signedCount = 0
+          foreach ($file in $filesToSign) {
+            Write-Host "Signing: $($file.Name)"
+
+            # Get PKCS11 config file path (set by DigiCert action)
+            $pkcs11Config = $env:PKCS11_CONFIG
+            if (-not $pkcs11Config) {
+              Write-Host "[ERROR] PKCS11_CONFIG environment variable not set"
+              Write-Host "DigiCert KeyLocker action may not have run correctly"
+              exit 1
+            }
+
+            Write-Host "Using PKCS11 config: $pkcs11Config"
+
+            # Try signing with certificate fingerprint first (if available)
+            $fingerprint = "${{ secrets.SM_CODE_SIGNING_CERT_SHA1_HASH }}"
+            if ($fingerprint -and $fingerprint -ne "") {
+              Write-Host "Attempting to sign with certificate fingerprint..."
+              $output = & smctl sign --fingerprint "$fingerprint" --input "$($file.FullName)" --config-file "$pkcs11Config" --verbose 2>&1
+              $exitCode = $LASTEXITCODE
+            } else {
+              Write-Host "No fingerprint provided, using keypair alias..."
+              # Use smctl to sign with keypair alias
+              $output = & smctl sign --keypair-alias "${{ secrets.SM_KEYPAIR_ALIAS }}" --input "$($file.FullName)" --config-file "$pkcs11Config" --verbose 2>&1
+              $exitCode = $LASTEXITCODE
+            }
+
+            Write-Host "Exit code: $exitCode"
+            Write-Host "Output: $output"
+
+            # Check if output contains "FAILED" even with exit code 0
+            if ($output -match "FAILED" -or $output -match "error" -or $output -match "Error") {
+              Write-Host ""
+              Write-Host "[ERROR] Signing failed for $($file.Name)"
+              Write-Host "[ERROR] smctl returned success but output indicates failure"
+              Write-Host ""
+              Write-Host "Possible issues:"
+              Write-Host "  1. Certificate not fully synced to KeyLocker (wait a few minutes)"
+              Write-Host "  2. Incorrect keypair alias"
+              Write-Host "  3. API key lacks signing permissions"
+              Write-Host ""
+              Write-Host "Please verify in DigiCert ONE portal:"
+              Write-Host "  - Certificate status is 'Issued' (not Pending)"
+              Write-Host "  - Keypair status is 'Online'"
+              Write-Host "  - 'Can sign' is set to 'Yes'"
+              exit 1
+            }
+
+            if ($exitCode -ne 0) {
+              Write-Host "[ERROR] Failed to sign $($file.Name)"
+              Write-Host "Full error output:"
+              Write-Host $output
+              exit 1
+            }
+
+            $signedCount++
+            Write-Host "[SUCCESS] Signed: $($file.Name)"
+            Write-Host ""
+          }
+
+          Write-Host "=== Summary ==="
+          Write-Host "[SUCCESS] Signed $signedCount/$($filesToSign.Count) files successfully"

      - name: Verify notarization (macOS only)
        if: matrix.platform == 'macos-15' || matrix.platform == 'macos-15-intel'
@@ -375,80 +536,73 @@ jobs:

          # Find and rename artifacts based on platform
          if [ "${{ matrix.platform }}" = "windows-latest" ]; then
-            # Only ship the MSI installer. The loose exe and WiX toolset exes
-            # are not the user-facing installer - the MSI contains the signed inner exe.
+            find . -name "*.exe" -exec cp {} "../../../dist/Stirling-PDF-${{ matrix.name }}.exe" \;
            find . -name "*.msi" -exec cp {} "../../../dist/Stirling-PDF-${{ matrix.name }}.msi" \;
          elif [ "${{ matrix.platform }}" = "macos-15" ] || [ "${{ matrix.platform }}" = "macos-15-intel" ]; then
            find . -name "*.dmg" -exec cp {} "../../../dist/Stirling-PDF-${{ matrix.name }}.dmg" \;
          else
            find . -name "*.deb" -exec cp {} "../../../dist/Stirling-PDF-${{ matrix.name }}.deb" \;
-            find . -name "*.rpm" -exec cp {} "../../../dist/Stirling-PDF-${{ matrix.name }}.rpm" \;
            find . -name "*.AppImage" -exec cp {} "../../../dist/Stirling-PDF-${{ matrix.name }}.AppImage" \;
          fi

-      # Verify the MSI AND the inner exe extracted from it are signed.
-      # The inner exe is what gets installed on users' machines and what AV scans.
      - name: Verify Windows Code Signature
-        if: matrix.platform == 'windows-latest' && env.SM_API_KEY != '' && github.ref == 'refs/heads/main'
+        if: matrix.platform == 'windows-latest' && github.ref == 'refs/heads/main'
        shell: pwsh
        run: |
-          $allSigned = $true
+          Write-Host "Verifying Windows code signatures..."
+
+          $exePath = "./dist/Stirling-PDF-${{ matrix.name }}.exe"
          $msiPath = "./dist/Stirling-PDF-${{ matrix.name }}.msi"

-          # Check MSI (outer wrapper)
-          if (Test-Path $msiPath) {
-            $sig = Get-AuthenticodeSignature -FilePath $msiPath
-            Write-Host "MSI: Status=$($sig.Status), Signer=$($sig.SignerCertificate.Subject)"
-            if ($sig.Status -ne "Valid") {
-              Write-Host "[ERROR] MSI is not signed"
-              $allSigned = $false
-            }
+          $allSigned = $true
+          $usingKeyLocker = "${{ env.SM_API_KEY }}" -ne ""
+          $usingPfx = "${{ env.WINDOWS_CERTIFICATE }}" -ne ""

-            # Extract MSI and verify inner exe
-            $extractDir = Join-Path $env:RUNNER_TEMP "msi-verify"
-            if (Test-Path $extractDir) { Remove-Item $extractDir -Recurse -Force }
-            $proc = Start-Process msiexec.exe -ArgumentList '/a', $msiPath, '/qn', "TARGETDIR=$extractDir" -Wait -PassThru -NoNewWindow
-            if ($proc.ExitCode -eq 0) {
-              $innerExe = Get-ChildItem -Path $extractDir -Filter "stirling-pdf.exe" -Recurse -File | Select-Object -First 1
-              if ($innerExe) {
-                $sig = Get-AuthenticodeSignature -FilePath $innerExe.FullName
-                Write-Host "Inner EXE: Status=$($sig.Status), Signer=$($sig.SignerCertificate.Subject)"
-                if ($sig.Status -ne "Valid") {
-                  Write-Host "[ERROR] Inner exe is NOT signed - AV will flag this at runtime"
-                  $allSigned = $false
-                }
-              } else {
-                Write-Host "[ERROR] Could not find stirling-pdf.exe inside MSI"
+          # Check EXE signature
+          if (Test-Path $exePath) {
+            $exeSig = Get-AuthenticodeSignature -FilePath $exePath
+            Write-Host "EXE Signature Status: $($exeSig.Status)"
+            Write-Host "EXE Signer: $($exeSig.SignerCertificate.Subject)"
+            Write-Host "EXE Timestamp: $($exeSig.TimeStamperCertificate.NotAfter)"
+
+            if ($exeSig.Status -ne "Valid") {
+              Write-Host "[WARNING] EXE is not properly signed (Status: $($exeSig.Status))"
+              if ($usingKeyLocker -or $usingPfx) {
+                Write-Host "[ERROR] Certificate was provided but signing failed"
                $allSigned = $false
+              } else {
+                Write-Host "[INFO] Building unsigned binary (no certificate provided)"
              }
            } else {
-              Write-Host "[ERROR] MSI extraction failed (exit code: $($proc.ExitCode))"
-              $allSigned = $false
+              Write-Host "[SUCCESS] EXE is properly signed"
            }
-          } else {
-            Write-Host "[ERROR] MSI not found at $msiPath"
-            $allSigned = $false
          }

-          if (-not $allSigned) {
-            Write-Host "[ERROR] Signature verification failed"
+          # Check MSI signature
+          if (Test-Path $msiPath) {
+            $msiSig = Get-AuthenticodeSignature -FilePath $msiPath
+            Write-Host "MSI Signature Status: $($msiSig.Status)"
+            Write-Host "MSI Signer: $($msiSig.SignerCertificate.Subject)"
+            Write-Host "MSI Timestamp: $($msiSig.TimeStamperCertificate.NotAfter)"
+
+            if ($msiSig.Status -ne "Valid") {
+              Write-Host "[WARNING] MSI is not properly signed (Status: $($msiSig.Status))"
+              if ($usingKeyLocker -or $usingPfx) {
+                Write-Host "[ERROR] Certificate was provided but signing failed"
+                $allSigned = $false
+              } else {
+                Write-Host "[INFO] Building unsigned binary (no certificate provided)"
+              }
+            } else {
+              Write-Host "[SUCCESS] MSI is properly signed"
+            }
+          }
+
+          if (($usingKeyLocker -or $usingPfx) -and -not $allSigned) {
+            Write-Host "[ERROR] Code signing verification failed"
            exit 1
-          }
-          Write-Host "[SUCCESS] MSI and inner exe are properly signed"
-
-      - name: Dump smctl logs on failure
-        if: ${{ failure() && matrix.platform == 'windows-latest' && env.SM_API_KEY != '' }}
-        shell: pwsh
-        run: |
-          $logDir = "$env:USERPROFILE\.signingmanager\logs"
-          if (Test-Path $logDir) {
-            Get-ChildItem $logDir | ForEach-Object {
-              Write-Host "=== $($_.FullName) ==="
-              Get-Content $_.FullName -Tail 200
-              Write-Host ""
-            }
          } else {
-            Write-Host "smctl log directory not found at $logDir"
+            Write-Host "[SUCCESS] Code signature verification completed"
          }

      - name: Upload artifacts
@@ -480,8 +634,8 @@ jobs:
            fi
          else
            echo "Checking for Linux artifacts..."
-            find . -name "*.deb" -o -name "*.rpm" -o -name "*.AppImage" | head -5
-            if [ $(find . -name "*.deb" -o -name "*.rpm" -o -name "*.AppImage" | wc -l) -eq 0 ]; then
+            find . -name "*.deb" -o -name "*.AppImage" | head -5
+            if [ $(find . -name "*.deb" -o -name "*.AppImage" | wc -l) -eq 0 ]; then
              echo "❌ No Linux artifacts found"
              exit 1
            fi
@@ -494,7 +648,7 @@ jobs:
        run: |
          cd ./frontend/src-tauri/target
          echo "Artifact sizes for ${{ matrix.name }}:"
-          find . -name "*.exe" -o -name "*.dmg" -o -name "*.deb" -o -name "*.rpm" -o -name "*.AppImage" -o -name "*.msi" | while read file; do
+          find . -name "*.exe" -o -name "*.dmg" -o -name "*.deb" -o -name "*.AppImage" -o -name "*.msi" | while read file; do
            if [ -f "$file" ]; then
              size=$(stat -c%s "$file" 2>/dev/null || stat -f%z "$file" 2>/dev/null || echo "unknown")
              echo "$file: $size bytes"
@@ -538,7 +692,7 @@ jobs:
              'Stirling-PDF-windows-x86_64': { icon: '🪟', platform: 'Windows x64', files: '.exe, .msi' },
              'Stirling-PDF-macos-aarch64': { icon: '🍎', platform: 'macOS ARM64', files: '.dmg' },
              'Stirling-PDF-macos-x86_64': { icon: '🍎', platform: 'macOS Intel', files: '.dmg' },
-              'Stirling-PDF-linux-x86_64': { icon: '🐧', platform: 'Linux x64', files: '.deb, .rpm, .AppImage' }
+              'Stirling-PDF-linux-x86_64': { icon: '🐧', platform: 'Linux x64', files: '.deb, .AppImage' }
            };

            let commentBody = `## 📦 Tauri Desktop Builds Ready!\n\n`;
@@ -167,9 +167,9 @@ jobs:
        with:
          key: ${{secrets.TESTDRIVER_API_KEY}}
          prerun: |
-            choco install go-task -y
-            task frontend:build
            cd frontend
+            npm install
+            npm run build
            npm install dashcam-chrome --save
            Start-Process "C:/Program Files/Google/Chrome/Application/chrome.exe" -ArgumentList "--start-maximized", "--load-extension=$(pwd)/node_modules/dashcam-chrome/build", "http://${{ secrets.NEW_VPS_HOST }}:1337"
            Start-Sleep -Seconds 20
@@ -29,14 +29,8 @@ clientWebUI/
 exampleYmlFiles/stirling/
 /stirling/
 /testing/file_snapshots
-/testing/cucumber/junit/
-/testing/cucumber/report.html
-/testing/.failed_tests
 SwaggerDoc.json

-# Runtime storage for uploaded files and user data (not Java source code)
-app/core/storage/
-
 # Frontend build artifacts copied to backend static resources
 # These are generated by npm build and should not be committed
 app/core/src/main/resources/static/assets/
@@ -165,7 +159,6 @@ __pycache__/
 # Virtual environments
 .env*
 !.env*.example
-!engine/.env
 .venv*
 env*/
 venv*/
@@ -182,7 +175,6 @@ venv.bak/
 .idea/
 *.iml
 out/
-.junie/

 # Ignore Mac DS_Store files
 .DS_Store
@@ -205,9 +197,6 @@ out/
 *.jks
 *.asc

-# Allow test fixture certificates (synthetic, no real credentials)
-!frontend/src/core/tests/test-fixtures/certs/**
-
 # SSH Keys
 *.pub
 *.priv
@@ -218,14 +207,8 @@ id_ecdsa.pub
 id_ed25519
 id_ed25519.pub
 .ssh/
-
-# Allow the published GPG release signing public key (safe to share)
-!docs/security/signing-key.pub
 *ssh

-# Taskfile checksum cache
-.task/
-
 # cache
 .cache
 .ruff_cache
@@ -262,6 +245,3 @@ docs/type3/signatures/

 # Type3 sample PDFs (development only)
 **/type3/samples/
-
-# Claude
-.claude/
@@ -16,7 +16,7 @@ repos:
    hooks:
      - id: codespell
        args:
-          - --ignore-words-list=thirdParty,tabEl,tabEls,Sie,ist,fulfilment
+          - --ignore-words-list=thirdParty,tabEl,tabEls,Sie,ist
          - --skip="./.*,*.csv,*.json,*.ambr"
          - --quiet-level=2
        files: \.(html|css|js|py|md)$
@@ -1,117 +0,0 @@
-version: '3'
-
-tasks:
-  dev:
-    desc: "Start backend dev server"
-    ignore_error: true
-    cmds:
-      - cmd: cmd /c gradlew.bat :stirling-pdf:bootRun
-        platforms: [windows]
-      - cmd: ./gradlew :stirling-pdf:bootRun
-        platforms: [linux, darwin]
-
-  build:
-    desc: "Full backend build"
-    cmds:
-      - cmd: cmd /c gradlew.bat clean build
-        platforms: [windows]
-      - cmd: ./gradlew clean build
-        platforms: [linux, darwin]
-
-  build:fast:
-    desc: "Build without tests"
-    cmds:
-      - cmd: cmd /c gradlew.bat clean build -x test
-        platforms: [windows]
-      - cmd: ./gradlew clean build -x test
-        platforms: [linux, darwin]
-
-  build:ci:
-    desc: "Build for CI (formatting checked separately)"
-    cmds:
-      - cmd: cmd /c gradlew.bat build -PnoSpotless
-        platforms: [windows]
-      - cmd: ./gradlew build -PnoSpotless
-        platforms: [linux, darwin]
-
-  test:
-    desc: "Run backend tests"
-    cmds:
-      - cmd: cmd /c gradlew.bat test
-        platforms: [windows]
-      - cmd: ./gradlew test
-        platforms: [linux, darwin]
-
-  format:
-    desc: "Auto-fix code formatting"
-    cmds:
-      - cmd: cmd /c gradlew.bat spotlessApply
-        platforms: [windows]
-      - cmd: ./gradlew spotlessApply
-        platforms: [linux, darwin]
-
-  format:check:
-    desc: "Check code formatting"
-    cmds:
-      - cmd: cmd /c gradlew.bat spotlessCheck
-        platforms: [windows]
-      - cmd: ./gradlew spotlessCheck
-        platforms: [linux, darwin]
-
-  fix:
-    desc: "Auto-fix backend"
-    cmds:
-      - task: format
-
-  swagger:
-    desc: "Generate OpenAPI docs"
-    cmds:
-      - cmd: cmd /c gradlew.bat :stirling-pdf:copySwaggerDoc
-        platforms: [windows]
-      - cmd: ./gradlew :stirling-pdf:copySwaggerDoc
-        platforms: [linux, darwin]
-    sources:
-      - app/core/src/main/java/**/*.java
-      - app/proprietary/src/main/java/**/*.java
-      - app/common/src/main/java/**/*.java
-    generates:
-      - SwaggerDoc.json
-
-  check:
-    desc: "Backend quality gate"
-    cmds:
-      - task: format:check
-      - task: test
-
-  version:
-    desc: "Print project version"
-    silent: true
-    cmds:
-      - cmd: cmd /c gradlew.bat printVersion --quiet | tail -1
-        platforms: [windows]
-      - cmd: ./gradlew printVersion --quiet | tail -1
-        platforms: [linux, darwin]
-
-  licenses:check:
-    desc: "Check dependency licenses"
-    cmds:
-      - cmd: cmd /c gradlew.bat checkLicense --no-parallel
-        platforms: [windows]
-      - cmd: ./gradlew checkLicense --no-parallel
-        platforms: [linux, darwin]
-
-  licenses:generate:
-    desc: "Check and generate dependency license report"
-    cmds:
-      - cmd: cmd /c gradlew.bat checkLicense generateLicenseReport --no-parallel
-        platforms: [windows]
-      - cmd: ./gradlew checkLicense generateLicenseReport --no-parallel
-        platforms: [linux, darwin]
-
-  clean:
-    desc: "Clean build artifacts"
-    cmds:
-      - cmd: cmd /c gradlew.bat clean
-        platforms: [windows]
-      - cmd: ./gradlew clean
-        platforms: [linux, darwin]
@@ -1,105 +0,0 @@
-version: '3'
-
-vars:
-  JLINK_MODULES: "java.base,java.compiler,java.desktop,java.instrument,java.logging,java.management,java.naming,java.net.http,java.prefs,java.rmi,java.scripting,java.security.jgss,java.security.sasl,java.sql,java.transaction.xa,java.xml,java.xml.crypto,jdk.crypto.ec,jdk.crypto.cryptoki,jdk.unsupported"
-
-tasks:
-  prepare:
-    desc: "Prepare desktop build dependencies"
-    deps: [jlink, ":frontend:prepare:desktop", provisioner]
-
-  provisioner:
-    desc: "Build installer provisioner"
-    platforms: [windows]
-    cmds:
-      - node scripts/build-provisioner.mjs
-
-  dev:
-    desc: "Start Tauri desktop dev mode"
-    deps: [prepare]
-    ignore_error: true
-    cmds:
-      - npx tauri dev --no-watch
-
-  build:
-    desc: "Build Tauri desktop app (production)"
-    deps: [prepare]
-    cmds:
-      - npx tauri build
-
-  build:dev:
-    desc: "Build Tauri desktop app (dev, no bundling)"
-    deps: [prepare]
-    cmds:
-      - npx tauri build --no-bundle
-
-  build:dev:mac:
-    desc: "Build Tauri desktop .app bundle (macOS)"
-    deps: [prepare]
-    cmds:
-      - npx tauri build --bundles app
-
-  build:dev:windows:
-    desc: "Build Tauri desktop NSIS installer (Windows)"
-    deps: [prepare]
-    cmds:
-      - npx tauri build --bundles nsis
-
-  build:dev:linux:
-    desc: "Build Tauri desktop AppImage (Linux)"
-    deps: [prepare]
-    cmds:
-      - npx tauri build --bundles appimage
-
-  clean:
-    desc: "Clean Tauri/Cargo build artifacts"
-    cmds:
-      - task: jlink:clean
-      - cd src-tauri && cargo clean
-      - rm -rf dist build
-
-  # ============================================================
-  # JLink — Build bundled Java runtime for Tauri
-  # ============================================================
-
-  jlink:
-    desc: "Build backend JAR and create JLink runtime for Tauri"
-    deps: [jlink:jar, jlink:runtime]
-
-  jlink:jar:
-    desc: "Build backend JAR for Tauri bundling"
-    run: once
-    dir: ..
-    env:
-      DISABLE_ADDITIONAL_FEATURES: "true"
-    cmds:
-      - cmd: cmd /c gradlew.bat bootJar --no-daemon
-        platforms: [windows]
-      - cmd: ./gradlew bootJar --no-daemon
-        platforms: [linux, darwin]
-      - mkdir -p frontend/src-tauri/libs
-      - cp app/core/build/libs/stirling-pdf-*.jar frontend/src-tauri/libs/
-    status:
-      - test -f frontend/src-tauri/libs/stirling-pdf-*.jar
-
-  jlink:runtime:
-    desc: "Create custom JRE with jlink"
-    deps: [jlink:jar]
-    cmds:
-      - rm -rf src-tauri/runtime/jre
-      - mkdir -p src-tauri/runtime
-      - >-
-        jlink
-        --add-modules {{.JLINK_MODULES}}
-        --strip-debug
-        --compress=2
-        --no-header-files
-        --no-man-pages
-        --output src-tauri/runtime/jre
-    status:
-      - test -d src-tauri/runtime/jre
-
-  jlink:clean:
-    desc: "Remove JLink runtime and bundled JARs"
-    cmds:
-      - rm -rf src-tauri/libs src-tauri/runtime
@@ -1,57 +0,0 @@
-version: '3'
-
-vars:
-  COMPOSE_DIR: docker/compose
-  EMBEDDED_DIR: docker/embedded
-
-tasks:
-  build:
-    desc: "Build standard Docker image"
-    cmds:
-      - docker build -t stirling-pdf -f {{.EMBEDDED_DIR}}/Dockerfile .
-
-  build:fat:
-    desc: "Build fat Docker image (all features)"
-    cmds:
-      - docker build -t stirling-pdf-fat -f {{.EMBEDDED_DIR}}/Dockerfile.fat .
-
-  build:ultra-lite:
-    desc: "Build ultra-lite Docker image"
-    cmds:
-      - docker build -t stirling-pdf-ultra-lite -f {{.EMBEDDED_DIR}}/Dockerfile.ultra-lite .
-
-  build:frontend:
-    desc: "Build frontend-only Docker image"
-    cmds:
-      - docker build -t stirling-pdf-frontend -f docker/frontend/Dockerfile .
-
-  build:engine:
-    desc: "Build engine Docker image"
-    dir: engine
-    cmds:
-      - docker build -t stirling-pdf-engine .
-
-  up:
-    desc: "Start standard docker compose stack"
-    cmds:
-      - docker compose -f {{.COMPOSE_DIR}}/docker-compose.yml up -d
-
-  up:fat:
-    desc: "Start fat docker compose stack"
-    cmds:
-      - docker compose -f {{.COMPOSE_DIR}}/docker-compose.fat.yml up -d
-
-  up:ultra-lite:
-    desc: "Start ultra-lite docker compose stack"
-    cmds:
-      - docker compose -f {{.COMPOSE_DIR}}/docker-compose.ultra-lite.yml up -d
-
-  down:
-    desc: "Stop all running docker compose stacks"
-    cmds:
-      - docker compose -f {{.COMPOSE_DIR}}/docker-compose.yml down
-
-  logs:
-    desc: "Tail docker compose logs"
-    cmds:
-      - docker compose -f {{.COMPOSE_DIR}}/docker-compose.yml logs -f
@@ -1,127 +0,0 @@
-version: '3'
-
-tasks:
-  install:
-    desc: "Install engine dependencies"
-    run: once
-    cmds:
-      - uv python install 3.13.8
-      - uv sync
-    sources:
-      - uv.lock
-      - pyproject.toml
-    status:
-      - test -d .venv
-
-  prepare:
-    desc: "Set up engine .env from template"
-    deps: [install]
-    cmds:
-      - uv run scripts/setup_env.py
-    sources:
-      - scripts/setup_env.py
-    generates:
-      - .env.local
-
-  run:
-    desc: "Run engine server"
-    deps: [prepare]
-    ignore_error: true
-    dir: src
-    env:
-      PYTHONUNBUFFERED: "1"
-    cmds:
-      - uv run uvicorn stirling.api.app:app --host 0.0.0.0 --port 5001
-
-  dev:
-    desc: "Start engine dev server with hot reload"
-    deps: [prepare]
-    ignore_error: true
-    dir: src
-    env:
-      PYTHONUNBUFFERED: "1"
-    cmds:
-      - uv run uvicorn stirling.api.app:app --host 0.0.0.0 --port 5001 --reload
-
-  lint:
-    desc: "Run linting"
-    deps: [install]
-    cmds:
-      - uv run ruff check .
-
-  lint:fix:
-    desc: "Auto-fix lint issues"
-    deps: [install]
-    cmds:
-      - uv run ruff check . --fix
-
-  format:
-    desc: "Auto-fix code formatting"
-    deps: [install]
-    cmds:
-      - uv run ruff format .
-
-  format:check:
-    desc: "Check code formatting"
-    deps: [install]
-    cmds:
-      - uv run ruff format . --diff
-
-  typecheck:
-    desc: "Run type checking"
-    deps: [install]
-    cmds:
-      - uv run pyright . --warnings
-
-  test:
-    desc: "Run tests"
-    deps: [prepare]
-    cmds:
-      - uv run pytest tests
-
-  fix:
-    desc: "Auto-fix lint + format"
-    cmds:
-      - task: lint:fix
-      - task: format
-
-  check:
-    desc: "Full engine quality gate"
-    cmds:
-      - task: typecheck
-      - task: lint
-      - task: format:check
-      - task: test
-
-  tool-models:
-    desc: "Generate tool_models.py from Java OpenAPI spec (SwaggerDoc.json)"
-    deps: [install, ":backend:swagger"]
-    cmds:
-      - uv run python scripts/generate_tool_models.py --spec ../SwaggerDoc.json --output src/stirling/models/tool_models.py
-    sources:
-      - ../SwaggerDoc.json
-      - scripts/generate_tool_models.py
-    generates:
-      - src/stirling/models/tool_models.py
-
-  clean:
-    desc: "Clean build artifacts"
-    cmds:
-      - task: '{{if eq .OS "Windows_NT"}}clean-windows{{else}}clean-unix{{end}}'
-
-  clean-unix:
-    internal: true
-    desc: "Clean build artifacts"
-    cmds:
-      - rm -rf .venv data logs output
-
-  # On Windows, use PowerShell as bash failed to delete some dependencies
-  clean-windows:
-    internal: true
-    desc: "Clean build artifacts"
-    ignore_error: true
-    cmds:
-      - powershell rm -Recurse -Force -ErrorAction SilentlyContinue .venv
-      - powershell rm -Recurse -Force -ErrorAction SilentlyContinue data
-      - powershell rm -Recurse -Force -ErrorAction SilentlyContinue logs
-      - powershell rm -Recurse -Force -ErrorAction SilentlyContinue output
@@ -1,313 +0,0 @@
-version: '3'
-
-tasks:
-  install:
-    desc: "Install dependencies"
-    run: once
-    cmds:
-      - '{{ if eq .CI "true" }}npm ci{{ else }}npm install{{ end }}'
-    sources:
-      - package-lock.json
-      - package.json
-    status:
-      - test -d node_modules
-    env:
-      CI: '{{ .CI | default "false" }}'
-
-  prepare:env:
-    desc: "Generate .env from example if missing"
-    run: once
-    deps: [install]
-    cmds:
-      - npx tsx scripts/setup-env.ts
-    sources:
-      - scripts/setup-env.ts
-      - config/.env.example
-    generates:
-      - .env
-
-  prepare:env:saas:
-    desc: "Generate .env and .env.saas from examples if missing"
-    run: once
-    deps: [install]
-    cmds:
-      - npx tsx scripts/setup-env.ts --saas
-    sources:
-      - scripts/setup-env.ts
-      - config/.env.example
-      - config/.env.saas.example
-    generates:
-      - .env
-      - .env.saas
-
-  prepare:env:desktop:
-    desc: "Generate .env and .env.desktop from examples if missing"
-    run: once
-    deps: [install]
-    cmds:
-      - npx tsx scripts/setup-env.ts --desktop
-    sources:
-      - scripts/setup-env.ts
-      - config/.env.example
-      - config/.env.desktop.example
-    generates:
-      - .env
-      - .env.desktop
-
-  prepare:icons:
-    desc: "Generate icon bundle from source references"
-    run: once
-    deps: [install]
-    cmds:
-      - node scripts/generate-icons.js
-
-  prepare:
-    desc: "Set up dev environment"
-    run: once
-    deps: [prepare:env, prepare:icons]
-
-  prepare:saas:
-    desc: "Prepare for SaaS mode"
-    run: once
-    deps: [prepare:env:saas, prepare:icons]
-
-  prepare:desktop:
-    desc: "Prepare for desktop mode"
-    run: once
-    deps: [prepare:env:desktop, prepare:icons]
-
-  # ============================================================
-  # Development
-  # ============================================================
-
-  dev:
-    desc: "Start frontend dev server"
-    deps: [prepare]
-    ignore_error: true
-    cmds:
-      - npx vite
-
-  dev:core:
-    desc: "Start frontend dev server in core mode"
-    deps: [prepare]
-    ignore_error: true
-    cmds:
-      - npx vite --mode core
-
-  dev:proprietary:
-    desc: "Start frontend dev server in proprietary mode"
-    deps: [prepare]
-    ignore_error: true
-    cmds:
-      - npx vite --mode proprietary
-
-  dev:saas:
-    desc: "Start frontend dev server in SaaS mode"
-    deps: [prepare:saas]
-    ignore_error: true
-    cmds:
-      - npx vite --mode saas
-
-  dev:desktop:
-    desc: "Start frontend dev server in desktop mode"
-    deps: [prepare:desktop]
-    ignore_error: true
-    cmds:
-      - npx vite --mode desktop
-
-  dev:prototypes:
-    desc: "Start frontend dev server in prototypes mode"
-    deps: [prepare]
-    ignore_error: true
-    cmds:
-      - npx vite --mode prototypes
-
-  # ============================================================
-  # Build
-  # ============================================================
-
-  build:
-    desc: "Production build (default mode)"
-    deps: [prepare]
-    cmds:
-      - npx vite build
-
-  build:core:
-    desc: "Build for core mode"
-    deps: [prepare]
-    cmds:
-      - npx vite build --mode core
-
-  build:proprietary:
-    desc: "Build for proprietary mode"
-    deps: [prepare]
-    cmds:
-      - npx vite build --mode proprietary
-
-  build:saas:
-    desc: "Build for SaaS mode"
-    deps: [prepare:saas]
-    cmds:
-      - npx vite build --mode saas
-
-  build:desktop:
-    desc: "Build for desktop mode"
-    deps: [prepare:desktop]
-    cmds:
-      - npx vite build --mode desktop
-
-  build:prototypes:
-    desc: "Build for prototypes mode"
-    deps: [prepare]
-    cmds:
-      - npx vite build --mode prototypes
-
-  # ============================================================
-  # Code quality
-  # ============================================================
-
-  lint:
-    desc: "Run linting"
-    deps: [install]
-    cmds:
-      - npx eslint --max-warnings=0
-      - npx dpdm src --circular --no-warning --no-tree --exit-code circular:1
-
-  lint:fix:
-    desc: "Auto-fix lint issues"
-    deps: [install]
-    cmds:
-      - npx eslint --fix
-
-  format:
-    desc: "Auto-fix code formatting"
-    deps: [install]
-    cmds:
-      - npx prettier --write .
-
-  format:check:
-    desc: "Check code formatting"
-    deps: [install]
-    cmds:
-      - npx prettier --check .
-
-  fix:
-    desc: "Auto-fix lint and format"
-    cmds:
-      - task: format
-      - task: lint:fix
-
-  typecheck:
-    desc: "Typecheck default build of the app"
-    cmds:
-      - task: typecheck:proprietary
-
-  typecheck:core:
-    desc: "Typecheck core build variant"
-    deps: [prepare]
-    cmds:
-      - npx tsc --noEmit --project src/core/tsconfig.json
-
-  typecheck:proprietary:
-    desc: "Typecheck proprietary build variant"
-    deps: [prepare]
-    cmds:
-      - npx tsc --noEmit --project src/proprietary/tsconfig.json
-
-  typecheck:saas:
-    desc: "Typecheck SaaS build variant"
-    deps: [prepare:saas]
-    cmds:
-      - npx tsc --noEmit --project src/saas/tsconfig.json
-
-  typecheck:desktop:
-    desc: "Typecheck desktop build variant"
-    deps: [prepare:desktop]
-    cmds:
-      - npx tsc --noEmit --project src/desktop/tsconfig.json
-
-  typecheck:scripts:
-    desc: "Typecheck scripts"
-    deps: [prepare]
-    cmds:
-      - npx tsc --noEmit --project scripts/tsconfig.json
-
-  typecheck:prototypes:
-    desc: "Typecheck prototypes build variant"
-    deps: [prepare]
-    cmds:
-      - npx tsc --noEmit --project src/prototypes/tsconfig.json
-
-  typecheck:all:
-    desc: "Typecheck all build variants"
-    cmds:
-      - task: typecheck:core
-      - task: typecheck:proprietary
-      - task: typecheck:saas
-      - task: typecheck:desktop
-      - task: typecheck:scripts
-
-  # ============================================================
-  # Quality Gate
-  # ============================================================
-
-  check:
-    desc: "Quick quality gate for local development"
-    cmds:
-      - task: typecheck
-      - task: lint
-      - task: format:check
-      - task: test
-
-  check:all:
-    desc: "Full CI quality gate"
-    cmds:
-      - task: typecheck:all
-      - task: lint
-      - task: format:check
-      - task: build
-      - task: test
-
-  # ============================================================
-  # Test
-  # ============================================================
-
-  test:
-    desc: "Run tests"
-    deps: [install]
-    cmds:
-      - npx vitest run
-
-  test:watch:
-    desc: "Run tests in watch mode"
-    deps: [install]
-    cmds:
-      - npx vitest --watch
-
-  test:coverage:
-    desc: "Run tests with coverage"
-    deps: [install]
-    cmds:
-      - npx vitest --coverage
-
-  test:e2e:
-    desc: "Run E2E tests"
-    deps: [prepare]
-    cmds:
-      - npx playwright test {{.CLI_ARGS}}
-
-  test:e2e:install:
-    desc: "Install E2E test browsers"
-    deps: [install]
-    cmds:
-      - npx playwright install {{.CLI_ARGS}} --with-deps
-
-  # ============================================================
-  # Code Generation
-  # ============================================================
-
-  licenses:generate:
-    desc: "Generate frontend license report"
-    deps: [install]
-    cmds:
-      - node scripts/generate-licenses.js
@@ -2,67 +2,45 @@

 This file provides guidance to AI Agents when working with code in this repository.

-## Taskfile (Recommended)
-
-This project uses [Task](https://taskfile.dev/) as a unified command runner. All build, dev, test, lint, and docker commands can be run from the repo root via `task <command>`. Run `task --list` to see all available commands.
-
-### Quick Reference
- `task install` — install all dependencies
- `task dev` — start backend + frontend concurrently
- `task dev:all` — start backend + frontend + engine concurrently
- `task build` — build all components
- `task test` — run all tests (backend + frontend + engine)
- `task lint` — run all linters
- `task format` — auto-fix formatting across all components
- `task check` — full quality gate (lint + typecheck + test)
- `task clean` — clean all build artifacts
- `task docker:build` — build standard Docker image
- `task docker:up` — start Docker compose stack
-
 ## Common Development Commands

 ### Build and Test
- **Build project**: `task build`
- **Run backend locally**: `task backend:dev`
- **Run all tests**: `task test` (or individually: `task backend:test`, `task frontend:test`, `task engine:test`)
- **Docker integration tests**: `./test.sh` (builds all Docker variants and runs comprehensive tests)
- **Code formatting**: `task format` (or `task backend:format` for Java only)
- **Full quality gate**: `task check` (runs lint + typecheck + test across all components)
-
-After modifying any files in the project, you must run the relevant `task check` command that covers that area of the code. For example, when editing frontend files run `task frontend:check`; for Python engine files run `task engine:check`; for Java backend files run `task backend:check`.
+- **Build project**: `./gradlew clean build`
+- **Run locally**: `./gradlew bootRun`
+- **Full test suite**: `./test.sh` (builds all Docker variants and runs comprehensive tests)
+- **Code formatting**: `./gradlew spotlessApply` (runs automatically before compilation)

 ### Docker Development
- **Build standard**: `task docker:build` (or `docker build -t stirling-pdf -f docker/embedded/Dockerfile .`)
- **Build fat version**: `task docker:build:fat`
- **Build ultra-lite**: `task docker:build:ultra-lite`
- **Start compose stack**: `task docker:up` (or `task docker:up:fat`, `task docker:up:ultra-lite`)
- **Stop compose stack**: `task docker:down`
- **View logs**: `task docker:logs`
+- **Build ultra-lite**: `docker build -t stirlingtools/stirling-pdf:latest-ultra-lite -f ./Dockerfile.ultra-lite .`
+- **Build standard**: `docker build -t stirlingtools/stirling-pdf:latest -f ./Dockerfile .`
+- **Build fat version**: `docker build -t stirlingtools/stirling-pdf:latest-fat -f ./Dockerfile.fat .`
 - **Example compose files**: Located in `exampleYmlFiles/` directory

 ### Security Mode Development
 Set `DOCKER_ENABLE_SECURITY=true` environment variable to enable security features during development. This is required for testing the full version locally.

 ### Python Development
-Development for the AI engine happens in the `engine/` folder. The frontend calls the Python via Java as a proxy.
+Development for the AI engine happens in the `engine/` folder. It's built with Langchain and Pydantic and allows for the creation and editing of PDF documents. The frontend calls the Python via Java as a proxy.

- Follow the engine-specific guidance in [engine/AGENTS.md](engine/AGENTS.md) for Python architecture, code style, and AI usage.
- Use Task commands from the repo root:
-  - `task engine:check` — lint, type-check, test
-  - `task engine:fix` — auto-fix linting and formatting
-  - `task engine:install` — install dependencies
- The project structure is defined in `engine/pyproject.toml`. Any new dependencies should be listed there, followed by running `task engine:install`.
+- Python version is 3.13; use modern Python features (type aliases, pattern matching, dataclasses, etc.) where they help clarity.
+- Write fully type-correct code; keep pyright clean and avoid `Any` unless strictly necessary.
+- JSON handling: deserialize into fully typed Pydantic models as early as possible, and serialize back from Pydantic models as late as possible.
+- Use Makefile commands for Python work:
+  - From `engine/`: `make check` to lint, type-check, test, etc. and `make fix` to fix easily fixable linting & formatting issues.
+- The project structure is defined in `engine/pyproject.toml`. Any new dependencies should be listed appropriately there, followed by running `make install`.
+- Prefer using classes to nesting functions, and make other similar architectural decisions to improve testability. Do not nest classes or functions unless specifically required to for the code construct (like a decorator).
+- All environment variables used within the code must begin with the `STIRLING_` prefix in order to keep them unique and easier to find.

 ### Frontend Development
- **Frontend dev server**: `task frontend:dev` — requires backend on localhost:8080
+- **Frontend dev server**: `cd frontend && npm run dev` (requires backend on localhost:8080)
 - **Tech Stack**: Vite + React + TypeScript + Mantine UI + TailwindCSS
 - **Proxy Configuration**: Vite proxies `/api/*` calls to backend (localhost:8080)
 - **Build Process**: DO NOT run build scripts manually - builds are handled by CI/CD pipelines
- **Package Installation**: `task frontend:install`
+- **Package Installation**: DO NOT run npm install commands - package management handled separately
 - **Deployment Options**:
-  - **Desktop App**: `task desktop:build`
-  - **Web Server**: `task frontend:build` then serve dist/ folder
-  - **Development**: `task desktop:dev` for desktop dev mode
+  - **Desktop App**: `npm run tauri-build` (native desktop application)
+  - **Web Server**: `npm run build` then serve dist/ folder
+  - **Development**: `npm run tauri-dev` for desktop dev mode

 #### Environment Variables
 - All `VITE_*` variables must be declared in the appropriate example file:
@@ -70,8 +48,8 @@ Development for the AI engine happens in the `engine/` folder. The frontend call
  - `frontend/config/.env.saas.example` — SaaS-only vars
  - `frontend/config/.env.desktop.example` — desktop (Tauri)-only vars
 - Never use `|| 'hardcoded-fallback'` inline — put defaults in the example files
- `task frontend:prepare` / `prepare:saas` / `prepare:desktop` auto-create the env files from examples on first run, and error if any required keys are missing
- Prepare runs automatically as a dependency of all `dev*`, `build*`, and `desktop*` tasks
+- `npm run prep` / `prep:saas` / `prep:desktop` auto-create the env files from examples on first run, and error if any required keys are missing
+- These prep scripts run automatically at the start of all `dev*`, `build*`, and `tauri*` commands
 - See `frontend/README.md#environment-variables` for full documentation

 #### Import Paths - CRITICAL
@@ -325,17 +303,15 @@ The frontend is organized with a clear separation of concerns:

 ## Development Workflow

-1. **Local Development** (using Taskfile):
-   - Backend + frontend: `task dev`
-   - All services (including AI engine): `task dev:all`
-   - Or individually: `task backend:dev` (localhost:8080), `task frontend:dev` (localhost:5173), `task engine:dev` (localhost:5001)
-2. **Quality Gate**: Run `task check` before submitting PRs
-3. **Docker Testing**: Use `./test.sh` for full Docker integration tests
-4. **Code Style**: Spotless enforces Google Java Format automatically (`task backend:format`)
-5. **Translations**:
+1. **Local Development**:
+   - Backend: `./gradlew bootRun` (runs on localhost:8080)
+   - Frontend: `cd frontend && npm run dev` (runs on localhost:5173, proxies to backend)
+2. **Docker Testing**: Use `./test.sh` before submitting PRs
+3. **Code Style**: Spotless enforces Google Java Format automatically
+4. **Translations**:
   - Backend: Use helper scripts in `/scripts` for multi-language updates
   - Frontend: Update JSON files in `frontend/public/locales/` or use conversion script
-6. **Documentation**: API docs auto-generated and available at `/swagger-ui/index.html`
+5. **Documentation**: API docs auto-generated and available at `/swagger-ui/index.html`

 ## Frontend Architecture Status

@@ -15,19 +15,6 @@ Before you start working on an issue, please comment on (or create) the issue an
 Once you have been assigned an issue, you can start working on it. When you are ready to submit your changes, open a pull request.
 For a detailed pull request tutorial, see [this guide](https://www.digitalocean.com/community/tutorials/how-to-create-a-pull-request-on-github).

-## Development Quick Start
-
-This project uses [Task](https://taskfile.dev/) as a unified command runner. After cloning:
-
-1. Install the `task` CLI: https://taskfile.dev/installation/
-2. Run `task install` to install all dependencies
-3. Run `task dev` to start backend + frontend
-4. Run `task check` before submitting a PR
-
-Run `task --list` to see all available commands.
-
-## Pull Request Guidelines
-
 Please make sure your Pull Request adheres to the following guidelines:

 - Use the PR template provided.
@@ -52,10 +39,9 @@ If, at any point in time, you have a question, please feel free to ask in the sa

 ## Developer Documentation

-For technical guides, setup instructions, and development resources:
+For technical guides, setup instructions, and development resources, please see our [Developer Documentation](devGuide/) which includes:

- [Developer Guide](DeveloperGuide.md) - Main setup and architecture guide
- [Taskfile.yml](Taskfile.yml) - Unified task runner for all build/dev/test/lint commands
+- [Developer Guide](devGuide/DeveloperGuide.md) - Main setup and architecture guide
 - [Exception Handling Guide](devGuide/EXCEPTION_HANDLING_GUIDE.md) - Error handling patterns and i18n
 - [Translation Guide](devGuide/HowToAddNewLanguage.md) - Adding new languages
 - And more in the [devGuide folder](devGuide/)
@@ -42,13 +42,11 @@ This guide focuses on developing for Stirling 2.0, including both the React fron

 ### Prerequisites

- [Task](https://taskfile.dev/installation/) — unified command runner (recommended)
 - Docker
 - Git
 - Java JDK 21 or later (JDK 25 recommended)
 - Node.js 18+ and npm (required for frontend development)
 - Gradle 7.0 or later (Included within the repo)
- [uv](https://docs.astral.sh/uv/) — Python package manager (required for engine development)
 - Rust and Cargo (required for Tauri desktop app development)
 - Tauri CLI (install with `cargo install tauri-cli`)

@@ -84,29 +82,13 @@ For local testing, you should generally be testing the full 'Security' version o
 5. **Frontend Setup (Required for Stirling 2.0)**
   Navigate to the frontend directory and install dependencies using npm.

-### Verify Setup
-
-Run `task install` to install all project dependencies (frontend npm packages, engine Python packages). Gradle manages its own dependencies automatically. Then run `task check` to verify everything builds and passes.
-
 ## 4. Stirling 2.0 Development Workflow

-### Using Taskfile (Recommended)
-
-The fastest way to start developing:
-
-1. **Start developing**: `task dev` (runs backend + frontend concurrently — Ctrl+C to stop)
-2. **Or start services individually** in separate terminals:
-   - `task backend:dev` — Spring Boot on localhost:8080
-   - `task frontend:dev` — Vite on localhost:5173
-   - `task engine:dev` — FastAPI on localhost:5001
-
-Run `task --list` to see all available commands.
-
 ### Frontend Development (React)
 The frontend is a React SPA that runs independently during development:

-1. **Start the backend**: `task backend:dev` (serves API endpoints on localhost:8080)
-2. **Start the frontend dev server**: `task frontend:dev` (serves UI on localhost:5173)
+1. **Start the backend**: Run the Spring Boot application (serves API endpoints on localhost:8080)
+2. **Start the frontend dev server**: Navigate to the frontend directory and run the development server (serves UI on localhost:5173)
 3. **Development flow**: The Vite dev server automatically proxies API calls to the backend

 ### File Storage Architecture
@@ -117,10 +99,7 @@ Stirling 2.0 uses client-side file storage:

 ### Tauri Desktop App Development
 Stirling-PDF can be packaged as a cross-platform desktop application using Tauri with PDF file association support and bundled JRE.
-
-Using Taskfile: `task desktop:dev` (development) or `task desktop:build` (production build).
-
-See [the frontend README](frontend/README.md#tauri) for detailed build instructions.
+See [the frontend README](frontend/README.md#tauri) for build instructions.

 ## 5. Project Structure

@@ -208,7 +187,7 @@ services:
        limits:
          memory: 4G
    healthcheck:
-      test: ["CMD-SHELL", "curl -f http://localhost:8080$${SYSTEM_ROOTURIPATH:-''}/api/v1/info/status | grep -q 'UP' && curl -fL http://localhost:8080/ | grep -q 'Please sign in'"]
+      test: ["CMD-SHELL", "curl -f http://localhost:8080/api/v1/info/status | grep -q 'UP' && curl -fL http://localhost:8080/ | grep -q 'Please sign in'"]
      interval: 5s
      timeout: 10s
      retries: 16
@@ -243,20 +222,6 @@ docker-compose -f exampleYmlFiles/docker-compose-latest-security.yml up

 ### Building Docker Images

-#### Using Taskfile (Recommended)
-
-```bash
-task docker:build            # standard image
-task docker:build:fat        # fat image (all features)
-task docker:build:ultra-lite # ultra-lite image
-task docker:up               # start standard compose stack
-task docker:up:fat           # start fat compose stack
-task docker:down             # stop all stacks
-task docker:logs             # tail logs
-```
-
-#### Manual Docker Builds
-
 Stirling-PDF uses different Docker images for various configurations. The build process is controlled by environment variables and uses specific Dockerfile variants. Here's how to build the Docker images:

 1. Set the security environment variable:
@@ -265,10 +230,10 @@ Stirling-PDF uses different Docker images for various configurations. The build
   export DISABLE_ADDITIONAL_FEATURES=true  # or false for to enable login and security features for builds
   ```

-2. Build the project:
+2. Build the project with Gradle:

   ```bash
-   task backend:build
+   ./gradlew clean build
   ```

 3. Build the Docker images:
@@ -296,18 +261,9 @@ Note: The `--no-cache` and `--pull` flags ensure that the build process uses the

 ## 7. Testing

-### Quick Testing with Taskfile
-
-Run all unit/integration tests across all components:
-
-```bash
-task test    # run all tests (backend + frontend + engine)
-task check   # full quality gate: lint + typecheck + test
-```
-
 ### Comprehensive Testing Script

-Stirling-PDF also provides a `test.sh` script in the root directory for Docker integration tests. This script builds all versions of Stirling-PDF, checks that each version works, and runs Cucumber tests. It's recommended to run this script before submitting a final pull request.
+Stirling-PDF provides a `test.sh` script in the root directory. This script builds all versions of Stirling-PDF, checks that each version works, and runs Cucumber tests. It's recommended to run this script before submitting a final pull request.

 To run the test script:

@@ -333,11 +289,10 @@ Note: The `test.sh` script will run automatically when you raise a PR. However,

 For React frontend development:

-1. Start the backend: `task backend:dev` (serves API endpoints on localhost:8080)
-2. Start the frontend dev server: `task frontend:dev` (serves UI on localhost:5173)
+1. Start the backend: Run the Spring Boot application to serve API endpoints on localhost:8080
+2. Start the frontend dev server: Navigate to the frontend directory and run the development server on localhost:5173
 3. The Vite dev server automatically proxies API calls to the backend
-4. Run frontend tests: `task frontend:test` (or `task frontend:test:watch` for watch mode)
-5. Test React components, UI interactions, and IndexedDB file operations using browser developer tools
+4. Test React components, UI interactions, and IndexedDB file operations using browser developer tools

 ### Local Testing (Java and UI Components)

@@ -353,7 +308,7 @@ To run Stirling-PDF locally:
 1. Compile and run the project using built-in IDE methods or by running:

   ```bash
-   task backend:dev
+   ./gradlew bootRun
   ```

 2. Access the application at `http://localhost:8080` in your web browser.
@@ -374,11 +329,10 @@ Important notes:
 2. Create a new branch for your feature or bug fix.
 3. Make your changes and commit them with clear, descriptive messages and ensure any documentation is updated related to your changes.
 4. Test your changes thoroughly in the Docker environment.
-5. Run the quality gate and integration tests:
+5. Run the `test.sh` script to ensure all versions build correctly and pass the Cucumber tests:

   ```bash
-   task check   # lint + typecheck + test across all components
-   ./test.sh    # Docker integration tests (builds all variants + Cucumber)
+   ./test.sh
   ```

 6. Push your changes to your fork.
@@ -1,444 +0,0 @@
-# File Sharing Feature - Architecture & Workflow
-
-## Overview
-
-The File Sharing feature enables users to store files server-side and share them with other registered users or via token-based share links. Files are stored using a pluggable storage provider (local filesystem or database) with optional quota enforcement.
-
-**Key Capabilities:**
- Server-side file storage (upload, update, download, delete)
- Optional history bundle and audit log attachments per file
- Direct user-to-user sharing with access roles
- Token-based share links (requires `system.frontendUrl`)
- Optional email notifications for shares (requires `mail.enabled`)
- Access audit trail (tracks who accessed a share link and how)
- Automatic share link expiration
- Storage quotas (per-user and total)
- Pluggable storage backend (local filesystem or database BLOB)
- Integration with the Shared Signing workflow
-
-## Architecture
-
-### Database Schema
-
-**`stored_files`**
- One record per uploaded file
- Stores file metadata (name, content type, size, storage key)
- Optionally links to a history bundle and audit log as separate stored objects
- `workflow_session_id` — nullable link to a `WorkflowSession` (signing feature)
- `file_purpose` — enum classifying the file's role: `GENERIC`, `SIGNING_ORIGINAL`, `SIGNING_SIGNED`, `SIGNING_HISTORY`
-
-**`file_shares`**
- One record per sharing relationship
- Two share types, distinguished by which fields are set:
-  - **User share**: `shared_with_user_id` is set, `share_token` is null
-  - **Link share**: `share_token` is set (UUID), `shared_with_user_id` is null
- `access_role` — `EDITOR`, `COMMENTER`, or `VIEWER`
- `expires_at` — nullable expiration for link shares
- `workflow_participant_id` — when set, marks this as a **workflow share** (hidden from the file manager, accessible only via workflow endpoints)
-
-**`file_share_accesses`**
- One record per access event on a share link
- Tracks: user, share link, access type (`VIEW` or `DOWNLOAD`), timestamp
-
-**`storage_cleanup_entries`**
- Queue of storage keys to be deleted asynchronously
- Used when a file is deleted but the physical storage object cleanup is deferred
-
-### Access Roles
-
-| Role | Can Read | Can Write |
-|------|----------|-----------|
-| `EDITOR` | ✅ | ✅ |
-| `COMMENTER` | ✅ | ❌ |
-| `VIEWER` | ✅ | ❌ |
-
-Default role when none is specified: `EDITOR`.
-
-Owners always have full access regardless of role.
-
-#### Role Semantics: COMMENTER vs VIEWER
-
-In the file storage layer, `COMMENTER` and `VIEWER` are equivalent — both grant read-only access and neither can replace file content. The distinction is meaningful in the **signing workflow** context:
-
-| Context | COMMENTER | VIEWER |
-|---------|-----------|--------|
-| File storage | Read only (same as VIEWER) | Read only |
-| Signing workflow | Can submit a signing action | Read only |
-
-`WorkflowParticipant.canEdit()` returns `true` for `COMMENTER` (and `EDITOR`) roles, which the signing workflow uses to determine if a participant can still submit a signature. Once a participant has signed or declined, their effective role is automatically downgraded to `VIEWER` regardless of their configured role.
-
-The rationale: "annotating" a document (submitting a signature) is not the same as "replacing" it. COMMENTER grants annotation rights without file-replacement rights.
-
-### Backend Architecture
-
-#### Service Layer
-
-**FileStorageService** (`1137 lines`)
- Core file management service
- Upload, update, download, and delete operations
- User share management (share, revoke, leave)
- Link share management (create, revoke, access)
- Access recording and listing
- Storage quota enforcement
- Configuration feature gate checks
-
-**StorageCleanupService**
- Scheduled daily: deletes orphaned storage keys from `storage_cleanup_entries`
- Scheduled daily: purges expired share links from `file_shares`
- Processes cleanup in batches of 50 entries
-
-#### Storage Providers
-
-**LocalStorageProvider**
- Files stored on the filesystem under `storage.local.basePath` (default: `./storage`)
- Storage key is a path relative to the base directory
-
-**DatabaseStorageProvider**
- Files stored as BLOBs in `stored_file_blobs` table
- No filesystem dependency
-
-Provider is selected at startup via `storage.provider: local | database`.
-
-#### Controller Layer
-
-**FileStorageController** (`/api/v1/storage`)
- All endpoints require authentication
- File CRUD and sharing operations
-
-### Data Flow
-
-```
-User uploads file → StorageProvider stores bytes → StoredFile record created
-       ↓
-Owner shares file → FileShare record created (user or link)
-       ↓
-Recipient accesses file → Access recorded → File bytes streamed
-```
-
-## File Operations
-
-### Upload File
-
-```bash
-POST /api/v1/storage/files
-Content-Type: multipart/form-data
-
-file: document.pdf                # Required — main file
-historyBundle: history.json       # Optional — version history
-auditLog: audit.json              # Optional — audit trail
-```
-
-**Response:**
-```json
-{
-  "id": 42,
-  "fileName": "document.pdf",
-  "contentType": "application/pdf",
-  "sizeBytes": 102400,
-  "owner": "alice",
-  "ownedByCurrentUser": true,
-  "accessRole": "editor",
-  "createdAt": "2025-01-01T12:00:00",
-  "updatedAt": "2025-01-01T12:00:00",
-  "sharedWithUsers": [],
-  "sharedUsers": [],
-  "shareLinks": []
-}
-```
-
-### Update File
-
-Replaces the file content. Only the owner can update.
-
-```bash
-PUT /api/v1/storage/files/{fileId}
-Content-Type: multipart/form-data
-
-file: document_v2.pdf
-historyBundle: history.json       # Optional
-auditLog: audit.json              # Optional
-```
-
-### List Files
-
-Returns all files owned by or shared with the current user. Workflow-shared files (signing participants) are excluded — those are accessible via signing endpoints only.
-
-```bash
-GET /api/v1/storage/files
-```
-
-Response is sorted by `createdAt` descending.
-
-### Download File
-
-```bash
-GET /api/v1/storage/files/{fileId}/download?inline=false
-```
-
- `inline=false` (default) — `Content-Disposition: attachment`
- `inline=true` — `Content-Disposition: inline` (for browser preview)
-
-### Delete File
-
-Only the owner can delete. All associated share links and their access records are deleted first, then the database record, then the physical storage object.
-
-```bash
-DELETE /api/v1/storage/files/{fileId}
-```
-
-## Sharing Operations
-
-### Share with User
-
-```bash
-POST /api/v1/storage/files/{fileId}/shares/users
-Content-Type: application/json
-
-{
-  "username": "bob",          # Username or email address
-  "accessRole": "editor"      # "editor", "commenter", or "viewer" (default: "editor")
-}
-```
-
-**Behaviour:**
- If the target user exists: creates/updates a `FileShare` with `sharedWithUser` set
- If `username` is an email address and the user doesn't exist: creates a share link and sends a notification email (requires `sharing.emailEnabled` and `sharing.linkEnabled`)
- If the target user is the owner: returns 400
- If sharing is disabled: returns 403
-
-### Revoke User Share
-
-Only the owner can revoke.
-
-```bash
-DELETE /api/v1/storage/files/{fileId}/shares/users/{username}
-```
-
-### Leave Shared File
-
-The recipient removes themselves from a shared file.
-
-```bash
-DELETE /api/v1/storage/files/{fileId}/shares/self
-```
-
-### Create Share Link
-
-Creates a token-based link for anonymous/authenticated access. Requires `sharing.linkEnabled` and `system.frontendUrl` to be configured.
-
-```bash
-POST /api/v1/storage/files/{fileId}/shares/links
-Content-Type: application/json
-
-{
-  "accessRole": "viewer"      # Optional (default: "editor")
-}
-```
-
-**Response:**
-```json
-{
-  "token": "550e8400-e29b-41d4-a716-446655440000",
-  "accessRole": "viewer",
-  "createdAt": "2025-01-01T12:00:00",
-  "expiresAt": "2025-01-04T12:00:00"
-}
-```
-
-Expiration is set to `now + sharing.linkExpirationDays` (default: 3 days).
-
-### Revoke Share Link
-
-```bash
-DELETE /api/v1/storage/files/{fileId}/shares/links/{token}
-```
-
-Also deletes all access records for that token.
-
-## Share Link Access
-
-### Download via Share Link
-
-Authentication is required (even for share links). Anonymous access is not permitted.
-
-```bash
-GET /api/v1/storage/share-links/{token}?inline=false
-```
-
- Returns 401 if unauthenticated
- Returns 403 if authenticated but link doesn't permit access
- Returns 410 if the link has expired
- Records a `FileShareAccess` entry on success
-
-> **Token-as-credential semantics:** Any authenticated user who holds the token can access the file — the token is the credential. If you need per-user access control (only a specific person can open it), use "Share with User" instead. Share links are appropriate for broader distribution where possession of the token implies authorization.
-
-### Get Share Link Metadata
-
-```bash
-GET /api/v1/storage/share-links/{token}/metadata
-```
-
-Returns file name, owner, access role, creation/expiry timestamps, and whether the current user owns the file.
-
-### List Accessed Share Links
-
-Returns the most recent access for each non-expired share link the current user has accessed.
-
-```bash
-GET /api/v1/storage/share-links/accessed
-```
-
-### List Accesses for a Link (Owner Only)
-
-```bash
-GET /api/v1/storage/files/{fileId}/shares/links/{token}/accesses
-```
-
-Returns per-user access history (username, VIEW/DOWNLOAD, timestamp), sorted descending by time.
-
-## Workflow Share Integration
-
-Signing workflow participants access documents via their own `WorkflowParticipant.shareToken`. No `FileShare` record is created for participants; access control is self-contained in the `WorkflowParticipant` entity.
-
-The `FileShare.workflow_participant_id` column and the `FileShare.isWorkflowShare()` method are **deprecated**. Legacy data (sessions created before this change) may still have `FileShare` records with `workflow_participant_id` set, which continue to work via the existing token lookup path in `UnifiedAccessControlService`. No new records are created.
-
-`GET /api/v1/storage/files` returns all files owned by or shared with the current user (via `FileShare`). Signing-session PDFs use the `file_purpose` field (`SIGNING_ORIGINAL`, `SIGNING_SIGNED`, etc.) to distinguish them from generic files. The file manager UI can filter on this field if needed.
-
-## API Reference
-
-| Method | Endpoint | Description | Auth |
-|--------|----------|-------------|------|
-| POST | `/api/v1/storage/files` | Upload file | Required |
-| PUT | `/api/v1/storage/files/{id}` | Update file | Required (owner) |
-| GET | `/api/v1/storage/files` | List accessible files | Required |
-| GET | `/api/v1/storage/files/{id}` | Get file metadata | Required |
-| GET | `/api/v1/storage/files/{id}/download` | Download file | Required |
-| DELETE | `/api/v1/storage/files/{id}` | Delete file | Required (owner) |
-| POST | `/api/v1/storage/files/{id}/shares/users` | Share with user | Required (owner) |
-| DELETE | `/api/v1/storage/files/{id}/shares/users/{username}` | Revoke user share | Required (owner) |
-| DELETE | `/api/v1/storage/files/{id}/shares/self` | Leave shared file | Required |
-| POST | `/api/v1/storage/files/{id}/shares/links` | Create share link | Required (owner) |
-| DELETE | `/api/v1/storage/files/{id}/shares/links/{token}` | Revoke share link | Required (owner) |
-| GET | `/api/v1/storage/share-links/{token}` | Download via share link | Required |
-| GET | `/api/v1/storage/share-links/{token}/metadata` | Get share link metadata | Required |
-| GET | `/api/v1/storage/share-links/accessed` | List accessed share links | Required |
-| GET | `/api/v1/storage/files/{id}/shares/links/{token}/accesses` | List share accesses | Required (owner) |
-
-## Configuration
-
-All storage settings live under the `storage:` key in `settings.yml`:
-
-```yaml
-storage:
-  enabled: true                  # Requires security.enableLogin = true
-  provider: local                # 'local' or 'database'
-  local:
-    basePath: './storage'        # Filesystem base directory (local provider only)
-  quotas:
-    maxStorageMbPerUser: -1      # Per-user storage cap in MB; -1 = unlimited
-    maxStorageMbTotal: -1        # Total storage cap in MB; -1 = unlimited
-    maxFileMb: -1                # Max size per upload (main + history + audit) in MB; -1 = unlimited
-  sharing:
-    enabled: false               # Master switch for all sharing (opt-in)
-    linkEnabled: false           # Enable token-based share links (requires system.frontendUrl)
-    emailEnabled: false          # Enable email notifications (requires mail.enabled)
-    linkExpirationDays: 3        # Days until share links expire
-```
-
-**Prerequisites:**
- `storage.enabled` requires `security.enableLogin = true`
- `sharing.linkEnabled` requires `system.frontendUrl` to be set (used to build share link URLs)
- `sharing.emailEnabled` requires `mail.enabled = true`
-
-## Security Considerations
-
-### Access Control
- All endpoints require authentication — there is no anonymous access
- Owner-only operations enforced in service layer (not just controller)
- `requireReadAccess` / `requireEditorAccess` checked on every download
-
-### Share Link Security
- Tokens are UUIDs (random, not guessable)
- Expiration enforced on every access
- Expired links return HTTP 410 Gone
- Revoked links delete all access records
-
-### Quota Enforcement
- Checked before storing (not after)
- Accounts for existing file size when replacing (only the delta counts)
- Covers main file + history bundle + audit log in a single check
-
-## Automatic Cleanup
-
-`StorageCleanupService` runs two scheduled jobs daily:
-
-1. **Orphaned storage cleanup** — processes up to 50 `StorageCleanupEntry` records, deletes the physical storage object, then removes the entry. Failed attempts increment `attemptCount` for retry.
-
-2. **Expired share link cleanup** — deletes all `FileShare` records where `expiresAt` is in the past and `shareToken` is set.
-
-## Troubleshooting
-
-**"Storage is disabled":**
- Check `storage.enabled: true` in settings
- Verify `security.enableLogin: true`
-
-**"Share links are disabled":**
- Check `sharing.linkEnabled: true`
- Verify `system.frontendUrl` is set and non-empty
-
-**"Email sharing is disabled":**
- Check `sharing.emailEnabled: true`
- Verify `mail.enabled: true` and mail configuration
-
-**Signing-session PDF appearing in the general file list:**
- This is expected — signing PDFs are accessible to owners and shared users
- Filter by `file_purpose` (`SIGNING_ORIGINAL`, `SIGNING_SIGNED`) in the UI to distinguish them
-
-**Share link returns 410:**
- Link has expired — check `expires_at` in `file_shares` table
- Owner must create a new link
-
-### Debug Queries
-
-```sql
-- List files and their share counts
-SELECT sf.stored_file_id, sf.original_filename, u.username as owner,
-       COUNT(DISTINCT fs.file_share_id) FILTER (WHERE fs.shared_with_user_id IS NOT NULL) as user_shares,
-       COUNT(DISTINCT fs.file_share_id) FILTER (WHERE fs.share_token IS NOT NULL) as link_shares
-FROM stored_files sf
-LEFT JOIN users u ON sf.owner_id = u.user_id
-LEFT JOIN file_shares fs ON fs.stored_file_id = sf.stored_file_id
-GROUP BY sf.stored_file_id, u.username;
-
-- Check share link expiration
-SELECT share_token, access_role, created_at, expires_at,
-       expires_at < NOW() as is_expired
-FROM file_shares
-WHERE share_token IS NOT NULL;
-
-- Check access history for a share link
-SELECT u.username, fsa.access_type, fsa.accessed_at
-FROM file_share_accesses fsa
-JOIN file_shares fs ON fsa.file_share_id = fs.file_share_id
-JOIN users u ON fsa.user_id = u.user_id
-WHERE fs.share_token = '{token}'
-ORDER BY fsa.accessed_at DESC;
-
-- Pending cleanup entries
-SELECT storage_key, attempt_count, updated_at
-FROM storage_cleanup_entries
-ORDER BY updated_at ASC;
-```
-
-## Summary
-
-The File Sharing feature provides:
- ✅ Server-side file storage with pluggable backend (local/database)
- ✅ History bundle and audit log attachments per file
- ✅ Direct user-to-user sharing with EDITOR/COMMENTER/VIEWER roles
- ✅ Token-based share links with expiration
- ✅ Optional email notifications for shares
- ✅ Per-access audit trail for share links
- ✅ Storage quotas (per-user, total, per-file)
- ✅ Automatic cleanup of expired links and orphaned storage
- ✅ Workflow integration (signing-session PDFs stored via same infrastructure; participant access via `WorkflowParticipant.shareToken`)
@@ -14,8 +14,6 @@ if that directory exists, is licensed under the license defined in "frontend/src
 if that directory exists, is licensed under the license defined in "frontend/src/desktop/LICENSE".
 * All content that resides under the "frontend/src/saas/" directory of this repository,
 if that directory exists, is licensed under the license defined in "frontend/src/saas/LICENSE".
-* All content that resides under the "frontend/src/prototypes/" directory of this repository,
-if that directory exists, is licensed under the license defined in "frontend/src/prototypes/LICENSE".
 * Content outside of the above mentioned directories or restrictions above is
 available under the MIT License as defined below.

@@ -60,7 +60,7 @@ For full installation options (including desktop and Kubernetes), see our [Docum

 We welcome contributions! Please see [CONTRIBUTING.md](CONTRIBUTING.md) for guidelines.

-This project uses [Task](https://taskfile.dev/) as a unified command runner for all build, dev, and test commands. Run `task install` to get started, or see the [Developer Guide](DeveloperGuide.md) for full details.
+For development setup, see the [Developer Guide](DeveloperGuide.md).

 For adding translations, see the [Translation Guide](devGuide/HowToAddNewLanguage.md).

@@ -1,691 +0,0 @@
-# Shared Signing Feature - Architecture & Workflow
-
-## Overview
-
-The Shared Signing feature enables collaborative document signing workflows where a document owner can request signatures from multiple participants. Each participant receives a secure token to access the document, submit their digital signature (with optional wet signature overlay), and track the signing progress.
-
-**Key Capabilities:**
- Multi-participant signing sessions
- Digital certificate signatures (P12/PKCS12, JKS, SERVER, USER_CERT, PEM/UPLOAD)
- Visual wet signature overlays (drawn, typed, or uploaded) — multiple per participant
- Token-based participant access (no authentication required for participants)
- Authenticated participant access for registered users via sign-requests API
- Progress tracking for session owners
- Optional signature summary page appended to finalized PDF
- Automatic role downgrade after signing (security)
- GDPR-compliant wet signature metadata cleanup
-
-## Architecture
-
-### Database Schema
-
-#### Core Tables
-
-**`workflow_sessions`**
- Tracks signing sessions created by document owners
- Links to original and processed (signed) PDF files
- Stores session metadata (message, due date, status)
-
-**`workflow_participants`**
- One record per participant per session
- Tracks participant status: PENDING → VIEWED → SIGNED/DECLINED
-  - `NOTIFIED` status is reserved for a future email notification feature; no current code path sets it
- Stores participant-specific metadata (certificates, wet signatures) as JSONB
- Each participant holds their own `shareToken` (UUID) for token-based access — no separate `FileShare` record is created
- `accessRole` controls what actions the participant can perform. `COMMENTER` (and `EDITOR`) allow submitting a signature; `VIEWER` does not. After signing/declining, effective role is automatically downgraded to `VIEWER`
-
-**`user_server_certificates`**
- Stores auto-generated certificates per user
- Enables "Use My Personal Certificate" option
-
-#### Extended Tables
-
-**`stored_files`**
- Added `workflow_session_id` to link files to signing sessions
- Added `file_purpose` enum (SIGNING_ORIGINAL, SIGNING_SIGNED, etc.)
-
-**`file_shares`**
- Regular file shares are created when the session owner shares the document with other users via the file manager
- The `workflow_participant_id` column is deprecated; participant access is self-contained in `WorkflowParticipant.shareToken`
-
-### Backend Architecture
-
-#### Service Layer
-
-**WorkflowSessionService** (`816 lines`)
- Core workflow management service
- Creates sessions with participants
- Handles participant status updates
- Stores signature metadata (certificates and wet signatures)
- Finalizes sessions by coordinating signing process
-
-Key responsibilities:
- Session lifecycle management (create, list, get details, delete)
- Participant management (add, remove, notify)
- Certificate submission storage
- Wet signature metadata storage
- Session finalization orchestration
-
-**UnifiedAccessControlService**
- Validates participant tokens
- Checks session status and expiration
- Maps participant status to effective access role
- Automatic role downgrade after signing: SIGNED/DECLINED → VIEWER role
-
-**UserServerCertificateService**
- Auto-generates personal certificates for users
- Manages certificate storage and retrieval
- Enables "Use My Personal Certificate" signing option
-
-#### Controller Layer
-
-**SigningSessionController** (Owner-facing + Authenticated participant endpoints)
- `POST /api/v1/security/cert-sign/sessions` - Create signing session
- `GET /api/v1/security/cert-sign/sessions` - List user's sessions
- `GET /api/v1/security/cert-sign/sessions/{id}` - Get session details
- `GET /api/v1/security/cert-sign/sessions/{id}/pdf` - Download original PDF
- `POST /api/v1/security/cert-sign/sessions/{id}/finalize` - Finalize and apply signatures
- `GET /api/v1/security/cert-sign/sessions/{id}/signed-pdf` - Download signed PDF
- `DELETE /api/v1/security/cert-sign/sessions/{id}` - Delete session
- `POST /api/v1/security/cert-sign/sessions/{id}/participants` - Add participants
- `DELETE /api/v1/security/cert-sign/sessions/{id}/participants/{participantId}` - Remove participant
- `GET /api/v1/security/cert-sign/sign-requests` - List sign requests for authenticated user
- `GET /api/v1/security/cert-sign/sign-requests/{id}` - Get sign request details
- `GET /api/v1/security/cert-sign/sign-requests/{id}/document` - Download document for signing
- `POST /api/v1/security/cert-sign/sign-requests/{id}/sign` - Sign document (authenticated)
- `POST /api/v1/security/cert-sign/sign-requests/{id}/decline` - Decline sign request (authenticated)
-
-**WorkflowParticipantController** (Participant-facing, token-based)
- `GET /api/v1/workflow/participant/session?token={token}` - View session details
- `GET /api/v1/workflow/participant/details?token={token}` - Get participant details
- `GET /api/v1/workflow/participant/document?token={token}` - Download PDF
- `POST /api/v1/workflow/participant/submit-signature` - Submit signature
- `POST /api/v1/workflow/participant/decline?token={token}` - Decline to sign
-
-#### Data Flow
-
-```
-Owner creates session → Participants receive tokens →
-Participants access via token (or authenticated) → Participants submit signatures →
-Owner finalizes → System applies signatures → [Optional: append summary page] → Signed PDF generated
-```
-
-### Frontend Architecture
-
-#### Quick Access Integration
-
-**SignPopout Component**
- Displays in Quick Access Bar (top navigation)
- Shows active and completed signing sessions
- Auto-refreshes every 15 seconds to show signature progress
- Badge indicator shows count of pending sessions
-
-**ActiveSessionsPanel**
- Lists sessions where user is owner or participant
- Shows signature progress: "X/Y signatures" (e.g., "2/5 signatures")
- Color-coded badges:
-  - Blue: No signatures yet (0/X)
-  - Yellow: Partial signatures (X/Y)
-  - Green: Ready to finalize (X/X)
-
-**CompletedSessionsPanel**
- Lists finalized sessions and declined sign requests
- Allows viewing/downloading signed PDFs
-
-#### Workbench Views
-
-**SignRequestWorkbenchView**
- Full-screen view for participants to sign documents
- Integrated PDF viewer with annotation support
- Certificate selection (Personal/Organization/Custom P12)
- Wet signature input (draw, type, or upload)
- Signature placement on PDF pages
-
-**SessionDetailWorkbenchView**
- Owner's view of session details
- Participant list with status indicators
- Ability to add/remove participants
- Finalize button when all signatures collected
- Download original/signed PDF
-
-#### State Management
-
-**FileContext Integration**
- Signing sessions operate within FileContext workflow
- PDFs loaded once, persist across tool switches
- Memory management for large files (up to 100GB+)
-
-**ToolWorkflowContext**
- Registers custom workbench views
- Manages navigation between viewer and signing tools
- Preserves file state during signing operations
-
-#### Services & Hooks
-
-**workflowService.ts**
- API client for all signing endpoints
- Handles session creation, listing, and management
- Participant operations (submit, decline)
-
-**useWorkflowSession.ts**
- React hook for owner session management
- State management for session list and details
-
-**useParticipantSession.ts**
- React hook for participant signing workflow
- Manages signature submission state
-
-## Signing Workflow Process
-
-### 1. Session Creation (Owner)
-
-```
-Owner → Uploads PDF → Selects participants → Creates session
-        ↓
-System creates:
-  - WorkflowSession record
-  - WorkflowParticipant records (one per participant, each with a unique shareToken)
-        ↓
-Participants receive token (via email or share link)
-```
-
-**API Call:**
-```bash
-POST /api/v1/security/cert-sign/sessions
-Content-Type: multipart/form-data
-
-file: document.pdf
-workflowType: SIGNING
-documentName: "contract.pdf"           # Optional display name
-participantUserIds: [1, 2, 3]          # Registered user IDs
-participantEmails: ["a@b.com"]         # External/unregistered users
-participants: [...]                    # Detailed participant configs (optional)
-message: "Please sign this contract"
-dueDate: "2025-12-31"
-ownerEmail: "owner@example.com"        # Optional, for notifications
-workflowMetadata: '{"showSignature": false, "showLogo": false, "includeSummaryPage": true}'
-```
-
-**Session-level `workflowMetadata` fields:**
-| Field | Type | Description |
-|-------|------|-------------|
-| `showSignature` | boolean | Show visible digital signature block on PDF |
-| `pageNumber` | integer | Page to place digital signature on |
-| `showLogo` | boolean | Show logo in digital signature block |
-| `includeSummaryPage` | boolean | Append a signature summary page before digital signing |
-
-**Response:**
-```json
-{
-  "sessionId": "uuid",
-  "documentName": "contract.pdf",
-  "participants": [
-    {
-      "userId": 1,
-      "email": "user1@example.com",
-      "shareToken": "token1",
-      "status": "PENDING"
-    }
-  ],
-  "participantCount": 3,
-  "signedCount": 0
-}
-```
-
-### 2. Participant Access
-
-```
-Participant → Clicks token link → Views session details
-        ↓
-Status changes: PENDING/NOTIFIED → VIEWED
-        ↓
-Participant downloads PDF to review
-```
-
-**Access URL (unauthenticated):**
-```
-https://app.example.com/sign?token={participant_token}
-```
-
-**Authenticated participants** can also use:
-```
-GET /api/v1/security/cert-sign/sign-requests
-GET /api/v1/security/cert-sign/sign-requests/{sessionId}
-GET /api/v1/security/cert-sign/sign-requests/{sessionId}/document
-```
-
-**Automatic Status Update:**
- First access: PENDING/NOTIFIED → VIEWED
- Downloads tracked but don't change status
-
-### 3. Signature Submission
-
-```
-Participant → Selects certificate type → Uploads certificate (if needed)
-           → Draws/uploads wet signatures (optional, multiple supported)
-           → Submits signature
-        ↓
-System stores:
-  - Certificate data (P12/JKS keystore as base64)
-  - Certificate password
-  - Wet signatures metadata (JSON array: base64 image + coordinates per signature)
-        ↓
-Status changes: VIEWED → SIGNED
-Access role: EDITOR → VIEWER (automatic downgrade)
-```
-
-**API Call (token-based, unauthenticated):**
-```bash
-POST /api/v1/workflow/participant/submit-signature
-Content-Type: multipart/form-data
-
-participantToken: {token}
-certType: P12 | JKS | SERVER | USER_CERT
-p12File: certificate.p12 (if certType=P12)
-jksFile: keystore.jks (if certType=JKS)
-password: cert_password
-showSignature: false
-pageNumber: 1
-location: "New York"
-reason: "I approve this contract"
-showLogo: false
-wetSignaturesData: '[{"page":0,"x":100,"y":200,"width":150,"height":50,"type":"IMAGE","data":"base64..."}]'
-```
-
-**API Call (authenticated users):**
-```bash
-POST /api/v1/security/cert-sign/sign-requests/{sessionId}/sign
-Content-Type: multipart/form-data
-
-certType: SERVER | USER_CERT | UPLOAD | PEM | PKCS12 | PFX | JKS
-p12File: certificate.p12 (if applicable)
-password: cert_password
-reason: "I approve this contract"
-location: "New York"
-wetSignaturesData: '[...]'
-```
-
-**Metadata Storage (JSONB):**
-```json
-{
-  "certificateSubmission": {
-    "certType": "P12",
-    "password": "cert_password",
-    "p12Keystore": "base64_encoded_keystore",
-    "showSignature": false,
-    "pageNumber": 1,
-    "location": "New York",
-    "reason": "I approve this contract",
-    "showLogo": false
-  },
-  "wetSignatures": [
-    {
-      "type": "IMAGE",
-      "data": "base64_image",
-      "page": 0,
-      "x": 100,
-      "y": 200,
-      "width": 150,
-      "height": 50
-    }
-  ]
-}
-```
-
-Note: Multiple wet signatures are supported per participant (array).
-
-### 4. Progress Tracking (Owner)
-
-```
-Owner → Views session list → Sees "2/5 signatures"
-      → Clicks session → Views participant status
-        ↓
-Participant list shows:
-  - user1@example.com: SIGNED ✓
-  - user2@example.com: SIGNED ✓
-  - user3@example.com: VIEWED (pending)
-  - user4@example.com: PENDING
-  - user5@example.com: DECLINED ✗
-        ↓
-Auto-refresh every 15 seconds
-```
-
-**Badge Colors:**
- 🔵 Blue: 0/5 signatures (awaiting)
- 🟡 Yellow: 2/5 signatures (partial)
- 🟢 Green: 5/5 signatures (ready to finalize)
-
-### 5. Session Finalization
-
-```
-Owner → Clicks "Finalize" → System processes signatures
-        ↓
-Processing steps:
-  1. Apply wet signatures to PDF (visual overlays)
-  1.5. Append signature summary page (if includeSummaryPage=true)
-  2. Apply digital certificates in participant order
-     - Visual signature block suppressed when summary page is enabled
-  3. Store signed PDF
-  4. Clear wet signature metadata (GDPR compliance)
-        ↓
-Owner downloads signed PDF
-```
-
-**Finalization Process:**
-
-1. **Apply Wet Signatures First**
-   ```java
-   for (WetSignature sig : wetSignatures) {
-     PDPage page = document.getPage(sig.getPage());
-     byte[] imageBytes = Base64.decode(sig.getData());
-     // Convert Y from top-left (UI) to bottom-left (PDF) coordinate system
-     float pdfY = page.getMediaBox().getHeight() - sig.getY() - sig.getHeight();
-     PDImageXObject image = PDImageXObject.createFromByteArray(document, imageBytes, "signature");
-     contentStream.drawImage(image, sig.getX(), pdfY, sig.getWidth(), sig.getHeight());
-   }
-   ```
-
-2. **Append Summary Page (optional, before digital signing)**
-
-   If `includeSummaryPage=true`, a new A4 page is appended showing:
-   - Stirling logo and "Signature Summary" title
-   - Document name and session owner
-   - Finalization timestamp
-   - Per-participant: name, email, status, signed timestamp, reason, location, certificate type
-   - Supports overflow to additional pages
-
-   This step occurs **before** digital certificate signing so signatures are not invalidated.
-   When a summary page is added, the visual digital signature block (`showSignature`) is suppressed — wet signatures (hand-drawn overlays) are unaffected.
-
-3. **Apply Digital Certificates (in participant order)**
-   ```java
-   for (Participant p : participants) {
-     if (p.status == SIGNED) {
-       KeyStore keystore = buildKeystore(p.certificate);
-       // Reason: participant override > owner default > "Document Signing"
-       // Location: participant-provided only (no default)
-       CertSignController.sign(pdfBytes, keystore, password, settings);
-     }
-   }
-   ```
-
-4. **Store and Cleanup**
-   ```java
-   StoredFile signedFile = storeFile(signedPdfBytes, SIGNING_SIGNED);
-   session.setProcessedFile(signedFile);
-   session.setFinalized(true);
-
-   // GDPR: Clear sensitive metadata after finalization
-   for (Participant p : participants) {
-     p.metadata.remove("wetSignatures");         // Clears wet signature image data
-     p.metadata.remove("certificateSubmission"); // Clears keystore bytes + password
-   }
-   ```
-
-**API Call:**
-```bash
-POST /api/v1/security/cert-sign/sessions/{sessionId}/finalize
-Authorization: Bearer {owner_token}
-```
-
-**Response:** Binary PDF file with Content-Disposition header
-
-## Key Technical Features
-
-### 1. Double JSON Encoding Fix (Recent)
-
-**Problem:** JSONB columns were storing JSON strings instead of JSON objects, requiring double-parsing.
-
-**Solution:** Created `JsonMapConverter` JPA AttributeConverter:
-```java
-@Convert(converter = JsonMapConverter.class)
-@Column(name = "participant_metadata", columnDefinition = "jsonb")
-private Map<String, Object> participantMetadata;
-```
-
-**Benefits:**
- Single parse on read
- Proper JSON storage in PostgreSQL
- Type-safe Map access
- Backward compatible with legacy data
-
-### 2. Signature Progress Display (Recent)
-
-**Implementation:**
- `WorkflowSessionResponse` includes `participantCount` and `signedCount`
- `WorkflowMapper` calculates counts when converting to DTO
- Frontend displays "X/Y signatures" in session list
- Auto-refresh every 15 seconds keeps counts updated
-
-### 3. Token-Based Security
-
-**No Authentication Required for Participants:**
- Participants access via secure token (UUID)
- Token linked to specific participant and session
- Automatic expiration support
- One-time signing (cannot sign twice)
-
-**Authenticated Participant Access:**
- Registered users can also access sign requests via `/api/v1/security/cert-sign/sign-requests`
- Standard Spring Security authentication required
- Supports additional cert types: UPLOAD, PEM, PKCS12, PFX
-
-**Automatic Role Downgrade:**
- After signing: EDITOR → VIEWER
- After declining: EDITOR → VIEWER
- Prevents modification after action taken
-
-### 4. Storage Integration
-
-**Unified with File Sharing:**
- All PDFs stored via `StorageProvider` (Database or Local)
- Respects storage quotas
- Supports files up to 100GB+ (with Local storage)
- Consistent with existing file sharing infrastructure
-
-### 5. Certificate Types
-
-**P12/PKCS12/PFX:** User uploads PKCS#12 file + password
-**JKS:** User uploads Java KeyStore + password
-**PEM/UPLOAD:** User uploads PEM certificate + private key
-**SERVER:** Uses organization's server certificate (no upload needed)
-**USER_CERT:** Uses user's auto-generated personal certificate (one-click)
-
-Note: UPLOAD, PEM, PKCS12, PFX are available on the authenticated (`sign-requests`) path. The token-based path uses P12, JKS, SERVER, USER_CERT.
-
-## Frontend Components Overview
-
-### Owner Workflow Components
-
-1. **CreateSessionPanel** - Form to create new signing session
-2. **ActiveSessionsPanel** - List of pending sessions with progress
-3. **SessionDetailWorkbenchView** - Full session management interface
-4. **CompletedSessionsPanel** - History of finalized sessions
-
-### Participant Workflow Components
-
-1. **SignRequestWorkbenchView** - Main signing interface
-2. **SignatureSettingsInput** - Certificate selection and configuration
-3. **WetSignatureInput** - Draw/type/upload signature overlay
-4. **SignatureSettingsDisplay** - Preview of signature settings
-
-### Shared Components
-
-1. **UserSelector** - Multi-select user picker for participants
-2. **LocalEmbedPDFWithAnnotations** - PDF viewer with signature placement
-
-## Configuration
-
-### Backend Configuration
-
-**application.properties:**
-```properties
-# Database (H2 or PostgreSQL)
-spring.jpa.hibernate.ddl-auto=update
-
-# Security
-DOCKER_ENABLE_SECURITY=true
-
-# Storage Provider (DATABASE or LOCAL)
-storage.provider=LOCAL
-storage.maxFileSize=100GB
-```
-
-### Frontend Configuration
-
-**Quick Access Bar:**
- Signing popout accessible from top navigation
- Auto-refresh interval: 15 seconds
- Badge shows pending session count
-
-## API Reference Summary
-
-### Owner Endpoints (Authenticated)
-
-| Method | Endpoint | Description |
-|--------|----------|-------------|
-| POST | `/api/v1/security/cert-sign/sessions` | Create session |
-| GET | `/api/v1/security/cert-sign/sessions` | List sessions |
-| GET | `/api/v1/security/cert-sign/sessions/{id}` | Get details |
-| POST | `/api/v1/security/cert-sign/sessions/{id}/finalize` | Finalize session |
-| GET | `/api/v1/security/cert-sign/sessions/{id}/pdf` | Download original |
-| GET | `/api/v1/security/cert-sign/sessions/{id}/signed-pdf` | Download signed |
-| DELETE | `/api/v1/security/cert-sign/sessions/{id}` | Delete session |
-| POST | `/api/v1/security/cert-sign/sessions/{id}/participants` | Add participants |
-| DELETE | `/api/v1/security/cert-sign/sessions/{id}/participants/{pid}` | Remove participant |
-
-### Authenticated Participant Endpoints
-
-| Method | Endpoint | Description |
-|--------|----------|-------------|
-| GET | `/api/v1/security/cert-sign/sign-requests` | List sign requests |
-| GET | `/api/v1/security/cert-sign/sign-requests/{id}` | Get sign request details |
-| GET | `/api/v1/security/cert-sign/sign-requests/{id}/document` | Download document |
-| POST | `/api/v1/security/cert-sign/sign-requests/{id}/sign` | Sign document |
-| POST | `/api/v1/security/cert-sign/sign-requests/{id}/decline` | Decline signing |
-
-### Token-Based Participant Endpoints (No Auth Required)
-
-| Method | Endpoint | Description |
-|--------|----------|-------------|
-| GET | `/api/v1/workflow/participant/session?token={token}` | View session |
-| GET | `/api/v1/workflow/participant/details?token={token}` | Get participant details |
-| GET | `/api/v1/workflow/participant/document?token={token}` | Download PDF |
-| POST | `/api/v1/workflow/participant/submit-signature` | Submit signature |
-| POST | `/api/v1/workflow/participant/decline?token={token}` | Decline signing |
-
-## Security Considerations
-
-### Data Protection
- Wet signature image data cleared after finalization (GDPR compliance)
- Certificate submission data (keystore bytes + password) cleared after finalization (GDPR compliance)
- Certificate passwords are not encrypted at rest while stored (TODO: encrypt at rest)
- Token expiration support
-
-### Access Control
- Owner authentication required for session management
- Participant access via secure UUID tokens (no auth) or standard auth (sign-requests)
- Automatic role downgrade prevents re-signing
- Session status checks prevent unauthorized actions
-
-### Audit Trail
- All participant actions tracked
- FileShare access logged
- Status transitions recorded
- Notification history maintained
-
-## Performance Characteristics
-
-### Scalability
- Supports PDFs up to 100GB+ (with Local storage provider)
- Memory-efficient streaming for large files
- IndexedDB caching on frontend
- Database indexes on session_id, share_token, workflow_session_id
-
-### Response Times
- Session creation: ~500ms (10MB file)
- Session listing: ~100ms
- Token validation: ~50ms
- Finalization: ~2s per MB of PDF (varies by certificate operations)
-
-## Future Enhancements
-
-### Planned Features
- Email notifications for participants
- Reminder system for pending signatures
- Bulk signing operations
- Template-based signing workflows
- Signature validation/verification UI
- Certificate password encryption at rest
- Certificate keystore cleanup after finalization (GDPR)
- Webhook support for external integrations
- Analytics dashboard for signing metrics
-
-### Additional Workflow Types
- **REVIEW** - Document review with comments
- **APPROVAL** - Multi-level approval chains
- **COLLABORATION** - Real-time collaborative editing
-
-## Troubleshooting
-
-### Common Issues
-
-**"Token invalid" error:**
- Check token exists in workflow_participants table
- Verify session is not finalized
- Check expiration date (expires_at)
-
-**Signature not appearing on PDF:**
- Verify certificate type is correct
- Check certificate password
- Review logs for signing errors
- Ensure PDFDocumentFactory is available
-
-**"Awaiting signatures" not updating:**
- Backend should return participantCount and signedCount
- Frontend auto-refresh every 15 seconds
- Check network tab for API errors
-
-**Wet signatures not visible after finalization:**
- Wet signatures are applied first as image overlays (Step 1)
- Check `wetSignaturesData` was sent as valid JSON array
- Verify page index is within document bounds
- Note: wet signatures survive regardless of `includeSummaryPage` setting
-
-### Debug Queries
-
-```sql
-- Check session status
-SELECT session_id, status, finalized,
-       (SELECT COUNT(*) FROM workflow_participants WHERE workflow_session_id = ws.id) as participant_count,
-       (SELECT COUNT(*) FROM workflow_participants WHERE workflow_session_id = ws.id AND status = 'SIGNED') as signed_count
-FROM workflow_sessions ws;
-
-- Check participant tokens
-SELECT email, status, share_token, expires_at
-FROM workflow_participants
-WHERE workflow_session_id = (SELECT id FROM workflow_sessions WHERE session_id = '{session_id}');
-
-- Check metadata storage
-SELECT email,
-       participant_metadata->'certificateSubmission'->>'certType' as cert_type,
-       jsonb_array_length(participant_metadata->'wetSignatures') as wet_sig_count
-FROM workflow_participants;
-```
-
-## Summary
-
-The Shared Signing feature provides a complete collaborative signing workflow with:
- ✅ Multi-participant support with progress tracking
- ✅ Multiple certificate types (P12/PKCS12/PFX, JKS, PEM, SERVER, USER_CERT)
- ✅ Visual wet signature overlays (multiple per participant)
- ✅ Token-based security for unauthenticated participants
- ✅ Authenticated participant access via sign-requests API
- ✅ Automatic role management
- ✅ Large file support (100GB+)
- ✅ GDPR-compliant wet signature metadata cleanup
- ✅ Real-time progress updates
- ✅ Full frontend integration with Quick Access Bar
- ✅ Optional signature summary page with logo and participant details
-
-The architecture leverages existing file sharing infrastructure while adding workflow-specific features, ensuring consistency and maintainability across the application.
@@ -1,128 +0,0 @@
-version: '3'
-
-output: prefixed
-
-includes:
-  backend:
-    taskfile: .taskfiles/backend.yml
-    dir: .
-  frontend:
-    taskfile: .taskfiles/frontend.yml
-    dir: frontend
-  engine:
-    taskfile: .taskfiles/engine.yml
-    dir: engine
-  docker:
-    taskfile: .taskfiles/docker.yml
-    dir: .
-  desktop:
-    taskfile: .taskfiles/desktop.yml
-    dir: frontend
-
-tasks:
-  # ============================================================
-  # Setup & Prerequisites
-  # ============================================================
-
-  install:
-    desc: "Install all project dependencies"
-    cmds:
-      - task: frontend:install
-      - task: engine:install
-
-  # ============================================================
-  # Development
-  # ============================================================
-
-  dev:
-    desc: "Start backend + frontend concurrently"
-    deps:
-      - backend:dev
-      - frontend:dev
-
-  dev:all:
-    desc: "Start backend + frontend + engine concurrently"
-    deps:
-      - backend:dev
-      - frontend:dev:prototypes
-      - engine:dev
-
-  # ============================================================
-  # Build
-  # ============================================================
-
-  build:
-    desc: "Build all components"
-    cmds:
-      - task: backend:build
-      - task: frontend:build
-
-  # ============================================================
-  # Test
-  # ============================================================
-
-  test:
-    desc: "Run ALL tests (backend + frontend + engine)"
-    cmds:
-      - task: backend:test
-      - task: frontend:test
-      - task: engine:test
-
-  # ============================================================
-  # Lint & Format
-  # ============================================================
-
-  lint:
-    desc: "Run all linters"
-    cmds:
-      - task: frontend:lint
-      - task: engine:lint
-
-  fix:
-    desc: "Auto-fix all components"
-    cmds:
-      - task: backend:fix
-      - task: frontend:fix
-      - task: engine:fix
-
-  format:
-    desc: "Auto-fix formatting across all components"
-    cmds:
-      - task: backend:format
-      - task: frontend:format
-      - task: engine:format
-
-  format:check:
-    desc: "Check formatting across all components"
-    cmds:
-      - task: backend:format:check
-      - task: frontend:format:check
-      - task: engine:format:check
-
-  # ============================================================
-  # Quality Gate
-  # ============================================================
-
-  check:
-    desc: "Quick quality gate for local development"
-    cmds:
-      - task: backend:check
-      - task: frontend:check
-      - task: engine:check
-
-  check:all:
-    desc: "Full CI quality gate"
-    cmds:
-      - task: backend:check
-      - task: frontend:check:all
-      - task: engine:check
-
-  # ============================================================
-  # Clean
-  # ============================================================
-
-  clean:
-    desc: "Clean all build artifacts"
-    cmds:
-      - task: backend:clean
-      - task: engine:clean
@@ -7,8 +7,6 @@ spotless {
        target 'src/**/java/**/*.java'
        targetExclude 'src/main/java/org/apache/**'
        googleJavaFormat(googleJavaFormatVersion).aosp().reorderImports(false)
-        // google-java-format 1.28.0 bundles Guava 32.x which crashes Spotless lint on JDK 24/25
-        suppressLintsFor { setStep('google-java-format') }

        importOrder("java", "javax", "org", "com", "net", "io", "jakarta", "lombok", "me", "stirling")
        trimTrailingWhitespace()
@@ -29,10 +27,10 @@ spotless {
    }
 }
 dependencies {
-    api 'com.google.guava:guava:33.5.0-jre'
+    api 'com.google.guava:guava:33.4.8-jre'
    api 'org.springframework.boot:spring-boot-starter-webmvc'
    api 'org.springframework.boot:spring-boot-starter-aspectj'
-    api 'com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20260313.1'
+    api 'com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20260102.1'
    api 'com.fathzer:javaluator:3.0.6'
    api 'com.posthog.java:posthog:1.2.0'
    api 'org.apache.commons:commons-lang3:3.20.0'
@@ -45,7 +43,7 @@ dependencies {
    api 'com.github.junrar:junrar:7.5.8' // RAR archive support for CBR files
    api 'jakarta.servlet:jakarta.servlet-api:6.1.0'
    api 'org.snakeyaml:snakeyaml-engine:3.0.1'
-    api "org.springdoc:springdoc-openapi-starter-webmvc-ui:3.0.2"
+    api "org.springdoc:springdoc-openapi-starter-webmvc-ui:3.0.1"
    // Simple Java Mail for EML/MSG parsing (replaces direct Angus Mail usage)
    api 'org.simplejavamail:simple-java-mail:8.12.6'
    api 'org.simplejavamail:outlook-module:8.12.6' // MSG file support
@@ -356,7 +356,6 @@ public class EndpointConfiguration {
        addEndpointToGroup("Security", "cert-sign");
        addEndpointToGroup("Security", "remove-cert-sign");
        addEndpointToGroup("Security", "sanitize-pdf");
-        addEndpointToGroup("Security", "timestamp-pdf");
        addEndpointToGroup("Security", "auto-redact");
        addEndpointToGroup("Security", "validate-signature");
        addEndpointToGroup("Security", "add-stamp");
@@ -473,7 +472,6 @@ public class EndpointConfiguration {
        addEndpointToGroup("Java", "auto-rename");
        addEndpointToGroup("Java", "auto-split-pdf");
        addEndpointToGroup("Java", "sanitize-pdf");
-        addEndpointToGroup("Java", "timestamp-pdf");
        addEndpointToGroup("Java", "crop");
        addEndpointToGroup("Java", "get-info-on-pdf");
        addEndpointToGroup("Java", "pdf-to-single-page");
@@ -58,7 +58,6 @@ public class ApplicationProperties {
    private Legal legal = new Legal();
    private Security security = new Security();
    private System system = new System();
-    private Storage storage = new Storage();
    private Ui ui = new Ui();
    private Endpoints endpoints = new Endpoints();
    private Metrics metrics = new Metrics();
@@ -75,7 +74,6 @@ public class ApplicationProperties {
    private AutoPipeline autoPipeline = new AutoPipeline();
    private ProcessExecutor processExecutor = new ProcessExecutor();
    private PdfEditor pdfEditor = new PdfEditor();
-    private AiEngine aiEngine = new AiEngine();

    @Bean
    public PropertySource<?> dynamicYamlPropertySource(ConfigurableEnvironment environment)
@@ -152,44 +150,6 @@ public class ApplicationProperties {
    @Data
    public static class AutoPipeline {
        private String outputFolder;
-        private FileReadiness fileReadiness = new FileReadiness();
-
-        /**
-         * Configuration for the {@link stirling.software.common.util.FileReadinessChecker}.
-         * Controls how the pipeline determines whether a file is fully written and stable before
-         * processing begins.
-         */
-        @Data
-        public static class FileReadiness {
-            /**
-             * Master toggle. When {@code false} every readiness check is skipped and all files are
-             * considered immediately ready (preserves legacy behaviour).
-             */
-            private boolean enabled = true;
-
-            /**
-             * How long (in milliseconds) a file must remain unmodified before it is considered
-             * stable. Files modified more recently than this threshold are skipped and retried on
-             * the next scan cycle. Default: 5 000 ms (5 seconds).
-             */
-            private long settleTimeMillis = 5000;
-
-            /**
-             * How long (in milliseconds) to pause between two consecutive file-size reads when
-             * checking whether a file is still being written. If the size differs between the two
-             * reads the file is considered unstable. This catches active copies on Linux/macOS
-             * where advisory locking alone cannot detect a mid-copy file. Default: 500 ms.
-             */
-            private long sizeCheckDelayMillis = 500;
-
-            /**
-             * Optional list of file extensions (without the leading dot, case-insensitive) that are
-             * allowed through the readiness check. An empty list means all extensions are accepted.
-             * Example: {@code ["pdf", "tiff"]} will skip any file whose extension is not {@code
-             * pdf} or {@code tiff}.
-             */
-            private List<String> allowedExtensions = new java.util.ArrayList<>();
-        }
    }

    @Data
@@ -232,13 +192,6 @@ public class ApplicationProperties {
        }
    }

-    @Data
-    public static class AiEngine {
-        private boolean enabled = false;
-        private String url = "http://localhost:5001";
-        private int timeoutSeconds = 120;
-    }
-
    @Data
    public static class Legal {
        private String termsAndConditions;
@@ -260,7 +213,6 @@ public class ApplicationProperties {
        private String customGlobalAPIKey;
        private Jwt jwt = new Jwt();
        private Validation validation = new Validation();
-        private Timestamp timestamp = new Timestamp();
        private String xFrameOptions = "DENY";

        public Boolean isAltLogin() {
@@ -579,12 +531,6 @@ public class ApplicationProperties {
                private boolean hardFail = false;
            }
        }
-
-        @Data
-        public static class Timestamp {
-            private String defaultTsaUrl = "http://timestamp.digicert.com";
-            private List<String> customTsaUrls = new ArrayList<>();
-        }
    }

    @Data
@@ -643,41 +589,6 @@ public class ApplicationProperties {
        }
    }

-    @Data
-    public static class Storage {
-        private boolean enabled = false;
-        private String provider = "local";
-        private Local local = new Local();
-        private Quotas quotas = new Quotas();
-        private Sharing sharing = new Sharing();
-        private Signing signing = new Signing();
-
-        @Data
-        public static class Local {
-            private String basePath = InstallationPathConfig.getPath() + "storage";
-        }
-
-        @Data
-        public static class Sharing {
-            private boolean enabled = false;
-            private boolean linkEnabled = false;
-            private boolean emailEnabled = false;
-            private int linkExpirationDays = 3;
-        }
-
-        @Data
-        public static class Quotas {
-            private long maxStorageMbPerUser = -1;
-            private long maxStorageMbTotal = -1;
-            private long maxFileMb = -1;
-        }
-
-        @Data
-        public static class Signing {
-            private boolean enabled = false;
-        }
-    }
-
    @Data
    public static class DatabaseBackup {
        private String cron = "0 0 0 * * ?"; // daily at midnight
@@ -785,7 +696,8 @@ public class ApplicationProperties {

        @Override
        public String toString() {
-            return """
+            return
+                    """
            Driver {
              driverName='%s'
            }
@@ -1,16 +0,0 @@
-package stirling.software.common.model.api.security;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class UserSummaryDTO {
-    private Long userId;
-    private String username;
-    private String displayName;
-    private String teamName;
-    private boolean enabled;
-}
@@ -1,10 +1,8 @@
 package stirling.software.common.service;

 import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.OutputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.UUID;
@@ -12,7 +10,6 @@ import java.util.UUID;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.servlet.mvc.method.annotation.StreamingResponseBody;

 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -146,24 +143,6 @@ public class FileStorage {
        return new StoredFile(fileId, size);
    }

-    public String storeFromStreamingBody(StreamingResponseBody body, String originalName)
-            throws IOException {
-        String fileId = generateFileId();
-        Path filePath = getFilePath(fileId);
-        Files.createDirectories(filePath.getParent());
-        boolean success = false;
-        try (OutputStream os = new BufferedOutputStream(Files.newOutputStream(filePath))) {
-            body.writeTo(os);
-            success = true;
-        } finally {
-            if (!success) {
-                Files.deleteIfExists(filePath);
-            }
-        }
-        log.debug("Stored StreamingResponseBody with ID: {}", fileId);
-        return fileId;
-    }
-
    /**
     * Delete a file by its ID
     *
@@ -1,184 +0,0 @@
-package stirling.software.common.service;
-
-import java.io.IOException;
-import java.io.UncheckedIOException;
-import java.net.URLDecoder;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.util.regex.Pattern;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.env.Environment;
-import org.springframework.core.io.FileSystemResource;
-import org.springframework.core.io.Resource;
-import org.springframework.http.*;
-import org.springframework.stereotype.Service;
-import org.springframework.util.MultiValueMap;
-import org.springframework.web.client.RequestCallback;
-import org.springframework.web.client.RestTemplate;
-
-import jakarta.servlet.ServletContext;
-
-import lombok.extern.slf4j.Slf4j;
-
-import stirling.software.common.model.enumeration.Role;
-import stirling.software.common.util.TempFile;
-import stirling.software.common.util.TempFileManager;
-
-/**
- * Dispatches HTTP POST requests to internal Stirling API endpoints via loopback. Used by
- * PipelineProcessor and AiWorkflowService to execute tool operations programmatically without
- * leaving the JVM network stack.
- */
-@Service
-@Slf4j
-public class InternalApiClient {
-
-    // Allowlist for internal dispatch. Matches a fixed namespace prefix,
-    // but rejects traversal (..), URL-encoding (%), query/fragment, backslashes, and any other
-    // character that could alter the resolved endpoint on the local Spring server.
-    private static final Pattern ALLOWED_ENDPOINT_PATH =
-            Pattern.compile("^/api/v1/(general|misc|security|convert|filter)(/[A-Za-z0-9_-]+)+$");
-
-    private final ServletContext servletContext;
-    private final UserServiceInterface userService;
-    private final TempFileManager tempFileManager;
-    private final Environment environment;
-
-    public InternalApiClient(
-            ServletContext servletContext,
-            @Autowired(required = false) UserServiceInterface userService,
-            TempFileManager tempFileManager,
-            Environment environment) {
-        this.servletContext = servletContext;
-        this.userService = userService;
-        this.tempFileManager = tempFileManager;
-        this.environment = environment;
-    }
-
-    /**
-     * POST to an internal API endpoint. The endpointPath must start with one of the allowed
-     * prefixes (e.g. {@code /api/v1/misc/compress-pdf}).
-     *
-     * @param endpointPath API path (e.g. {@code /api/v1/general/rotate-pdf})
-     * @param body multipart form body (fileInput + parameters)
-     * @return response with the result file as a {@link TempFileResource} body
-     */
-    public ResponseEntity<Resource> post(String endpointPath, MultiValueMap<String, Object> body) {
-        validateUrl(endpointPath);
-        String url = getBaseUrl() + endpointPath;
-
-        RestTemplate restTemplate = new RestTemplate();
-        HttpHeaders headers = new HttpHeaders();
-        String apiKey = getApiKeyForUser();
-        if (apiKey != null && !apiKey.isEmpty()) {
-            headers.add("X-API-KEY", apiKey);
-        }
-
-        HttpEntity<MultiValueMap<String, Object>> entity = new HttpEntity<>(body, headers);
-        RequestCallback requestCallback = restTemplate.httpEntityCallback(entity, Resource.class);
-
-        return restTemplate.execute(
-                url,
-                HttpMethod.POST,
-                requestCallback,
-                response -> {
-                    try {
-                        TempFile tempFile = tempFileManager.createManagedTempFile("internal-api");
-                        Files.copy(
-                                response.getBody(),
-                                tempFile.getPath(),
-                                java.nio.file.StandardCopyOption.REPLACE_EXISTING);
-                        String filename = extractFilename(response.getHeaders());
-                        TempFileResource resource = new TempFileResource(tempFile, filename);
-                        return ResponseEntity.status(response.getStatusCode())
-                                .headers(response.getHeaders())
-                                .body(resource);
-                    } catch (IOException e) {
-                        throw new UncheckedIOException(e);
-                    }
-                });
-    }
-
-    /**
-     * Extract the filename from a response's {@code Content-Disposition} header. Returns {@code
-     * null} if the header is missing or has no filename.
-     */
-    private static String extractFilename(HttpHeaders headers) {
-        String contentDisposition = headers.getFirst(HttpHeaders.CONTENT_DISPOSITION);
-        if (contentDisposition == null || contentDisposition.isBlank()) {
-            return null;
-        }
-        for (String part : contentDisposition.split(";")) {
-            String trimmed = part.trim();
-            if (trimmed.startsWith("filename")) {
-                String[] kv = trimmed.split("=", 2);
-                if (kv.length != 2) {
-                    continue;
-                }
-                String value = kv[1].trim().replace("\"", "");
-                return URLDecoder.decode(value, StandardCharsets.UTF_8);
-            }
-        }
-        return null;
-    }
-
-    private String getBaseUrl() {
-        // Resolve the port lazily so desktop mode (server.port=0, OS-assigned) dispatches to the
-        // actual bound port. Spring publishes local.server.port once the web server is up; fall
-        // back to the configured server.port for early calls (tests, non-web contexts).
-        String port = environment.getProperty("local.server.port");
-        if (port == null) {
-            port = environment.getProperty("server.port", "8080");
-        }
-        return "http://localhost:" + port + servletContext.getContextPath();
-    }
-
-    private String getApiKeyForUser() {
-        if (userService == null) return "";
-        String username = userService.getCurrentUsername();
-        if (username != null && !username.equals("anonymousUser")) {
-            return userService.getApiKeyForUser(username);
-        }
-        return userService.getApiKeyForUser(Role.INTERNAL_API_USER.getRoleId());
-    }
-
-    private void validateUrl(String endpointPath) {
-        if (endpointPath == null || !ALLOWED_ENDPOINT_PATH.matcher(endpointPath).matches()) {
-            log.warn("Blocked internal API request to disallowed path: {}", endpointPath);
-            throw new SecurityException(
-                    "Internal API dispatch not permitted for endpoint: " + endpointPath);
-        }
-    }
-
-    /**
-     * A {@link FileSystemResource} that holds a reference to its backing {@link TempFile}.
-     *
-     * <p>If a display filename is supplied (typically parsed from the upstream response's {@code
-     * Content-Disposition} header), it is returned from {@link #getFilename()} instead of the
-     * underlying temp file's path-based name.
-     */
-    public static class TempFileResource extends FileSystemResource {
-        private final TempFile tempFile;
-        private final String displayFilename;
-
-        public TempFileResource(TempFile tempFile) {
-            this(tempFile, null);
-        }
-
-        public TempFileResource(TempFile tempFile, String displayFilename) {
-            super(tempFile.getFile());
-            this.tempFile = tempFile;
-            this.displayFilename = displayFilename;
-        }
-
-        public TempFile getTempFile() {
-            return tempFile;
-        }
-
-        @Override
-        public String getFilename() {
-            return displayFilename != null ? displayFilename : super.getFilename();
-        }
-    }
-}
@@ -16,7 +16,6 @@ import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.servlet.mvc.method.annotation.StreamingResponseBody;

 import jakarta.servlet.http.HttpServletRequest;

@@ -306,21 +305,33 @@ public class JobExecutorService {
                Object body = response.getBody();

                if (body instanceof byte[]) {
-                    String filename = extractResponseFilename(response);
-                    String contentType = extractResponseContentType(response);
+                    // Extract filename from content-disposition header if available
+                    String filename = "result.pdf";
+                    String contentType = MediaType.APPLICATION_PDF_VALUE;

+                    if (response.getHeaders().getContentDisposition() != null) {
+                        String disposition =
+                                response.getHeaders().getContentDisposition().toString();
+                        if (disposition.contains("filename=")) {
+                            filename =
+                                    disposition.substring(
+                                            disposition.indexOf("filename=") + 9,
+                                            disposition.lastIndexOf('"'));
+                        }
+                    }
+
+                    MediaType mediaType = response.getHeaders().getContentType();
+
+                    if (mediaType != null) {
+                        contentType = mediaType.toString();
+                    }
+
+                    // Store byte array directly to disk
                    String fileId = fileStorage.storeBytes((byte[]) body, filename);
                    taskManager.setFileResult(jobId, fileId, filename, contentType);
                    log.debug("Stored ResponseEntity<byte[]> result with fileId: {}", fileId);
-                } else if (body instanceof StreamingResponseBody streamingBody) {
-                    String filename = extractResponseFilename(response);
-                    String contentType = extractResponseContentType(response);

-                    String fileId = fileStorage.storeFromStreamingBody(streamingBody, filename);
-                    taskManager.setFileResult(jobId, fileId, filename, contentType);
-                    log.debug(
-                            "Stored ResponseEntity<StreamingResponseBody> result with fileId: {}",
-                            fileId);
+                    // Let the GC handle the memory naturally
                } else {
                    // Check if the response body contains a fileId
                    if (body != null && body.toString().contains("fileId")) {
@@ -470,21 +481,6 @@ public class JobExecutorService {
        }
    }

-    private static String extractResponseFilename(ResponseEntity<?> response) {
-        if (response.getHeaders().getContentDisposition() != null) {
-            String filename = response.getHeaders().getContentDisposition().getFilename();
-            if (filename != null && !filename.isEmpty()) {
-                return filename;
-            }
-        }
-        return "result.pdf";
-    }
-
-    private static String extractResponseContentType(ResponseEntity<?> response) {
-        MediaType mediaType = response.getHeaders().getContentType();
-        return mediaType != null ? mediaType.toString() : MediaType.APPLICATION_PDF_VALUE;
-    }
-
    /**
     * Parse session timeout string (e.g., "30m", "1h") to milliseconds
     *
@@ -401,7 +401,7 @@ public class JobQueue implements SmartLifecycle {
     * @throws Exception If there is an execution error
     */
    private <T> T executeWithTimeout(Supplier<T> supplier, long timeoutMs) throws Exception {
-        CompletableFuture<T> future = CompletableFuture.supplyAsync(supplier, jobExecutor);
+        CompletableFuture<T> future = CompletableFuture.supplyAsync(supplier);

        try {
            if (timeoutMs <= 0) {
@@ -1,37 +0,0 @@
-package stirling.software.common.service;
-
-import java.security.KeyStore;
-
-/**
- * Abstraction for PDF digital signature operations. Defined in common so that proprietary services
- * can use it without creating a circular dependency on core.
- */
-public interface PdfSigningService {
-
-    /**
-     * Signs a PDF document using the provided KeyStore.
-     *
-     * @param pdfBytes raw PDF bytes to sign
-     * @param keystore the KeyStore containing the signing key and certificate chain
-     * @param password keystore password
-     * @param showSignature whether to render a visible signature block
-     * @param pageNumber 0-indexed page on which to render the visible signature (may be null)
-     * @param name signer name embedded in the signature
-     * @param location location string embedded in the signature
-     * @param reason reason string embedded in the signature
-     * @param showLogo whether to include the Stirling-PDF logo in the visible signature
-     * @return signed PDF bytes
-     * @throws Exception on any signing failure
-     */
-    byte[] signWithKeystore(
-            byte[] pdfBytes,
-            KeyStore keystore,
-            char[] password,
-            boolean showSignature,
-            Integer pageNumber,
-            String name,
-            String location,
-            String reason,
-            boolean showLogo)
-            throws Exception;
-}
@@ -7,8 +7,11 @@ import java.lang.management.MemoryMXBean;
 import java.lang.management.OperatingSystemMXBean;
 import java.lang.management.RuntimeMXBean;
 import java.lang.management.ThreadMXBean;
+import java.net.InetAddress;
+import java.net.NetworkInterface;
 import java.nio.file.Files;
 import java.nio.file.Paths;
+import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
@@ -91,12 +94,21 @@ public class PostHogService {
            metrics.put("os_name", System.getProperty("os.name"));
            metrics.put("os_version", System.getProperty("os.version"));
            metrics.put("java_version", System.getProperty("java.version"));
+            metrics.put("user_name", System.getProperty("user.name"));
+            metrics.put("user_home", System.getProperty("user.home"));
+            metrics.put("user_dir", System.getProperty("user.dir"));

            // CPU and Memory
            metrics.put("cpu_cores", Runtime.getRuntime().availableProcessors());
            metrics.put("total_memory", Runtime.getRuntime().totalMemory());
            metrics.put("free_memory", Runtime.getRuntime().freeMemory());

+            // Network and Server Identity
+            InetAddress localHost = InetAddress.getLocalHost();
+            metrics.put("ip_address", localHost.getHostAddress());
+            metrics.put("hostname", localHost.getHostName());
+            metrics.put("mac_address", getMacAddress());
+
            // JVM info
            metrics.put("jvm_vendor", System.getProperty("java.vendor"));
            metrics.put("jvm_version", System.getProperty("java.vm.version"));
@@ -141,6 +153,9 @@ public class PostHogService {
                metrics.put("gc_" + gcBean.getName() + "_time", gcBean.getCollectionTime());
            }

+            // Network interfaces
+            metrics.put("network_interfaces", getNetworkInterfacesInfo());
+
            // Docker detection and stats
            boolean isDocker = isRunningInDocker();
            if (isDocker) {
@@ -338,6 +353,30 @@ public class PostHogService {
                            .getProFeatures()
                            .getCustomMetadata()
                            .isAutoUpdateMetadata());
+            addIfNotEmpty(
+                    properties,
+                    "enterpriseEdition_customMetadata_author",
+                    applicationProperties
+                            .getPremium()
+                            .getProFeatures()
+                            .getCustomMetadata()
+                            .getAuthor());
+            addIfNotEmpty(
+                    properties,
+                    "enterpriseEdition_customMetadata_creator",
+                    applicationProperties
+                            .getPremium()
+                            .getProFeatures()
+                            .getCustomMetadata()
+                            .getCreator());
+            addIfNotEmpty(
+                    properties,
+                    "enterpriseEdition_customMetadata_producer",
+                    applicationProperties
+                            .getPremium()
+                            .getProFeatures()
+                            .getCustomMetadata()
+                            .getProducer());
        }
        // Capture AutoPipeline properties
        addIfNotEmpty(
@@ -347,4 +386,39 @@ public class PostHogService {

        return properties;
    }
+
+    private String getMacAddress() {
+        try {
+            Enumeration<NetworkInterface> networkInterfaces =
+                    NetworkInterface.getNetworkInterfaces();
+            while (networkInterfaces.hasMoreElements()) {
+                NetworkInterface ni = networkInterfaces.nextElement();
+                byte[] hardwareAddress = ni.getHardwareAddress();
+                if (hardwareAddress != null) {
+                    String[] hexadecimal = new String[hardwareAddress.length];
+                    for (int i = 0; i < hardwareAddress.length; i++) {
+                        hexadecimal[i] = String.format("%02X", hardwareAddress[i]);
+                    }
+                    return String.join("-", hexadecimal);
+                }
+            }
+        } catch (Exception e) {
+            // Handle exception
+        }
+        return "Unknown";
+    }
+
+    private Map<String, String> getNetworkInterfacesInfo() {
+        Map<String, String> interfacesInfo = new HashMap<>();
+        try {
+            Enumeration<NetworkInterface> nets = NetworkInterface.getNetworkInterfaces();
+            while (nets.hasMoreElements()) {
+                NetworkInterface netint = nets.nextElement();
+                interfacesInfo.put(netint.getName(), netint.getDisplayName());
+            }
+        } catch (Exception e) {
+            interfacesInfo.put("error", e.getMessage());
+        }
+        return interfacesInfo;
+    }
 }
@@ -1,18 +0,0 @@
-package stirling.software.common.service;
-
-/** Provides metadata about tool endpoints for internal dispatch. */
-public interface ToolMetadataService {
-
-    /** Returns true if the given operation path accepts multiple input files. */
-    boolean isMultiInput(String operationPath);
-
-    /**
-     * Returns true when the endpoint's ZIP response is a transport for multiple typed results and
-     * should be unpacked: multi-output endpoints (Type:SIMO / Type:MIMO) and wrapper declarations
-     * such as {@code Output:ZIP-PDF} or {@code Output:IMAGE/ZIP}.
-     *
-     * <p>Returns false for a bare {@code Output:ZIP} (e.g. {@code get-attachments}), where the
-     * archive itself is the deliverable and should be kept packed.
-     */
-    boolean shouldUnpackZipResponse(String operationPath);
-}
@@ -5,8 +5,6 @@ public interface UserServiceInterface {

    String getCurrentUsername();

-    String getCurrentUserApiKey();
-
    long getTotalUsersCount();

    boolean isCurrentUserAdmin();
@@ -341,7 +341,8 @@ public class EmlProcessingUtils {
    }

    private String getFallbackStyles() {
-        return """
+        return
+        """
            /* Minimal fallback - main CSS resource failed to load */
            body {
                font-family: var(--font-family, Helvetica, sans-serif);
@@ -23,8 +23,7 @@ public class EmlToPdf {

        EmlParser.EmailContent emailContent =
                EmlParser.extractEmailContent(emlBytes, request, customHtmlSanitizer);
-        return EmlProcessingUtils.generateEnhancedEmailHtml(
-                emailContent, request, customHtmlSanitizer);
+        return EmlProcessingUtils.generateEnhancedEmailHtml(emailContent, request, customHtmlSanitizer);
    }

    public static byte[] convertEmlToPdf(
@@ -112,6 +112,8 @@ public class FileMonitor {
         All files observed changes in the last iteration will be considered as staging files.
         If those files are not modified in current iteration, they will be considered as ready for processing.
        */
+        stagingFiles = new HashSet<>(newlyDiscoveredFiles);
+        readyForProcessingFiles.clear();

        if (path2KeyMapping.isEmpty()) {
            log.warn("Not monitoring any directories; attempting to re-register root paths.");
@@ -127,19 +129,8 @@ public class FileMonitor {
            }
        }

-        // Skip expensive collection work when there is nothing to track
-        WatchKey firstKey = watchService.poll();
-        if (firstKey == null
-                && newlyDiscoveredFiles.isEmpty()
-                && readyForProcessingFiles.isEmpty()) {
-            return;
-        }
-
-        stagingFiles = new HashSet<>(newlyDiscoveredFiles);
-        readyForProcessingFiles.clear();
-
-        WatchKey key = firstKey;
-        while (key != null) {
+        WatchKey key;
+        while ((key = watchService.poll()) != null) {
            final Path watchingDir = (Path) key.watchable();
            key.pollEvents()
                    .forEach(
@@ -176,7 +167,6 @@ public class FileMonitor {
            if (!isKeyValid) { // key is invalid when the directory itself is no longer exists
                path2KeyMapping.remove((Path) key.watchable());
            }
-            key = watchService.poll();
        }
        readyForProcessingFiles.addAll(stagingFiles);
    }
@@ -1,217 +0,0 @@
-package stirling.software.common.util;
-
-import java.io.IOException;
-import java.io.RandomAccessFile;
-import java.nio.channels.FileChannel;
-import java.nio.channels.FileLock;
-import java.nio.channels.OverlappingFileLockException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.List;
-import java.util.Locale;
-
-import org.springframework.stereotype.Component;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-
-import stirling.software.common.model.ApplicationProperties;
-import stirling.software.common.model.ApplicationProperties.AutoPipeline.FileReadiness;
-
-/**
- * Stateless safety checker that decides whether a file is stable and ready for pipeline processing.
- * Call {@link #isReady(Path)} before moving or processing any file picked up from a watched folder.
- *
- * <p>A file is considered ready when ALL of the following hold:
- *
- * <ol>
- *   <li>The file exists on disk.
- *   <li>The path refers to a regular file, not a directory.
- *   <li>The file's extension matches the configured allow-list (if one is set).
- *   <li>The file has not been modified within the configured settle window ({@code
- *       settleTimeMillis}), meaning it is no longer being written.
- *   <li>The file size is stable: two reads separated by {@code sizeCheckDelayMillis} return the
- *       same value. This catches active copies on Linux/macOS where advisory file locking alone
- *       cannot detect a mid-copy file.
- *   <li>An exclusive file-system lock can be acquired, confirming no other process holds it.
- * </ol>
- *
- * <p>All behaviour is controlled through {@link FileReadiness} inside {@link
- * ApplicationProperties.AutoPipeline}. Setting {@code enabled: false} makes every call return
- * {@code true} so the checker is a no-op drop-in.
- */
-@Component
-@RequiredArgsConstructor
-@Slf4j
-public class FileReadinessChecker {
-
-    private final ApplicationProperties applicationProperties;
-
-    /**
-     * Returns {@code true} when the file at {@code path} passes every readiness check and is safe
-     * to hand off to the pipeline for processing. Returns {@code false} when any check fails; the
-     * caller should skip the file and retry on the next scan cycle.
-     */
-    public boolean isReady(Path path) {
-        FileReadiness config = applicationProperties.getAutoPipeline().getFileReadiness();
-
-        if (!config.isEnabled()) {
-            return true;
-        }
-
-        if (!existsAsRegularFile(path)) {
-            return false;
-        }
-
-        if (!isExtensionAllowed(path, config.getAllowedExtensions())) {
-            return false;
-        }
-
-        if (!hasSettled(path, config.getSettleTimeMillis())) {
-            return false;
-        }
-
-        if (!hasSizeStabilized(path, config.getSizeCheckDelayMillis())) {
-            return false;
-        }
-
-        if (isLocked(path)) {
-            return false;
-        }
-
-        return true;
-    }
-
-    // -------------------------------------------------------------------------
-    // Individual checks
-    // -------------------------------------------------------------------------
-
-    private boolean existsAsRegularFile(Path path) {
-        if (!Files.exists(path)) {
-            log.debug("File does not exist, skipping: {}", path);
-            return false;
-        }
-        if (!Files.isRegularFile(path)) {
-            log.debug("Path is not a regular file (directory or symlink?), skipping: {}", path);
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Returns {@code true} when {@code allowedExtensions} is empty (no filter) or when the file's
-     * extension (case-insensitive) appears in the list.
-     */
-    private boolean isExtensionAllowed(Path path, List<String> allowedExtensions) {
-        if (allowedExtensions == null || allowedExtensions.isEmpty()) {
-            return true;
-        }
-        String filename = path.getFileName().toString();
-        String extension =
-                filename.contains(".")
-                        ? filename.substring(filename.lastIndexOf('.') + 1).toLowerCase(Locale.ROOT)
-                        : "";
-        boolean allowed =
-                allowedExtensions.stream().anyMatch(ext -> ext.equalsIgnoreCase(extension));
-        if (!allowed) {
-            log.debug(
-                    "File '{}' has extension '{}' which is not in the allowed list {}, skipping",
-                    filename,
-                    extension,
-                    allowedExtensions);
-        }
-        return allowed;
-    }
-
-    /**
-     * Returns {@code true} when the file's last-modified timestamp is at least {@code
-     * settleTimeMillis} milliseconds in the past, indicating the write has completed and the file
-     * has "settled".
-     */
-    private boolean hasSettled(Path path, long settleTimeMillis) {
-        try {
-            long lastModified = Files.getLastModifiedTime(path).toMillis();
-            long ageMillis = System.currentTimeMillis() - lastModified;
-            boolean settled = ageMillis >= settleTimeMillis;
-            if (!settled) {
-                log.debug(
-                        "File '{}' was modified {}ms ago (settle threshold: {}ms), not yet ready",
-                        path.getFileName(),
-                        ageMillis,
-                        settleTimeMillis);
-            }
-            return settled;
-        } catch (IOException e) {
-            log.warn(
-                    "Could not read last-modified time for '{}', treating as not settled: {}",
-                    path,
-                    e.getMessage());
-            return false;
-        }
-    }
-
-    /**
-     * Returns {@code true} when the file size is the same before and after a short pause of {@code
-     * sizeCheckDelayMillis} milliseconds. A size change indicates another process is still
-     * appending to the file. This is the primary write-detection mechanism on Linux/macOS, where
-     * mandatory file locking is not enforced by the OS.
-     */
-    private boolean hasSizeStabilized(Path path, long sizeCheckDelayMillis) {
-        try {
-            long sizeBefore = Files.size(path);
-            Thread.sleep(sizeCheckDelayMillis);
-            long sizeAfter = Files.size(path);
-            boolean stable = sizeBefore == sizeAfter;
-            if (!stable) {
-                log.debug(
-                        "File '{}' size changed from {} to {} bytes during stability check,"
-                                + " not yet ready",
-                        path.getFileName(),
-                        sizeBefore,
-                        sizeAfter);
-            }
-            return stable;
-        } catch (IOException e) {
-            log.warn(
-                    "Could not read file size for '{}', treating as unstable: {}",
-                    path,
-                    e.getMessage());
-            return false;
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-            log.warn(
-                    "Size stability check interrupted for '{}', treating as unstable",
-                    path.getFileName());
-            return false;
-        }
-    }
-
-    /**
-     * Returns {@code true} when an exclusive file-system lock cannot be acquired, which indicates
-     * another process still holds the file open for writing.
-     *
-     * <p>{@link OverlappingFileLockException} is also treated as locked: the JVM already holds a
-     * lock on this file (e.g. from another thread), so it is unsafe to process.
-     */
-    private boolean isLocked(Path path) {
-        try (RandomAccessFile raf = new RandomAccessFile(path.toFile(), "rw");
-                FileChannel channel = raf.getChannel()) {
-            FileLock lock = channel.tryLock();
-            if (lock == null) {
-                log.debug("File '{}' is locked by another process", path.getFileName());
-                return true;
-            }
-            lock.release();
-            return false;
-        } catch (OverlappingFileLockException e) {
-            log.debug("File '{}' is already locked by this JVM", path.getFileName());
-            return true;
-        } catch (IOException e) {
-            log.debug(
-                    "Could not acquire lock on '{}', treating as locked: {}",
-                    path.getFileName(),
-                    e.getMessage());
-            return true;
-        }
-    }
-}
@@ -1,5 +1,6 @@
 package stirling.software.common.util;

+import java.io.ByteArrayInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.UncheckedIOException;
@@ -65,7 +66,16 @@ public class FileToPdf {
                        ProcessExecutor.getInstance(ProcessExecutor.Processes.WEASYPRINT)
                                .runCommandWithOutputHandling(command);

-                return Files.readAllBytes(tempOutputFile.getPath());
+                byte[] pdfBytes = Files.readAllBytes(tempOutputFile.getPath());
+                try {
+                    return pdfBytes;
+                } catch (Exception e) {
+                    pdfBytes = Files.readAllBytes(tempOutputFile.getPath());
+                    if (pdfBytes.length < 1) {
+                        throw e;
+                    }
+                    return pdfBytes;
+                }
            } // tempInputFile auto-closed
        } // tempOutputFile auto-closed
    }
@@ -82,7 +92,8 @@ public class FileToPdf {
            throws IOException {
        try (TempDirectory tempUnzippedDir = new TempDirectory(tempFileManager)) {
            try (ZipInputStream zipIn =
-                    ZipSecurity.createHardenedInputStream(Files.newInputStream(zipFilePath))) {
+                    ZipSecurity.createHardenedInputStream(
+                            new ByteArrayInputStream(Files.readAllBytes(zipFilePath)))) {
                ZipEntry entry = zipIn.getNextEntry();
                while (entry != null) {
                    Path filePath =
@@ -629,12 +629,11 @@ public class FormUtils {
            }
            log.debug("Skipping form fill because document has no AcroForm");
            if (flatten) {
-                flattenEntireDocument(document, null, false);
+                flattenEntireDocument(document, null);
            }
            return;
        }

-        boolean valuesApplied = false;
        if (values != null && !values.isEmpty()) {
            acroForm.setCacheFields(true);

@@ -668,26 +667,18 @@ public class FormUtils {
                Object rawValue = entry.getValue();
                String value = rawValue == null ? null : Objects.toString(rawValue, null);
                applyValueToField(field, value, strict);
-                valuesApplied = true;
            }

-            if (valuesApplied) {
-                ensureAppearances(acroForm);
-            }
+            ensureAppearances(acroForm);
        }

        repairWidgetGeometry(document, acroForm);

        if (flatten) {
-            flattenEntireDocument(document, acroForm, valuesApplied);
+            flattenEntireDocument(document, acroForm);
        }
    }

-    // Cap the fallback rendering DPI. This path only runs when acroForm.flatten()
-    // throws, and the goal is a readable flattened document — not print quality —
-    // so clamping avoids runaway memory/CPU on pathological inputs.
-    private static final int FLATTEN_FALLBACK_MAX_DPI = 200;
-
    private void flattenViaRendering(PDDocument document, PDAcroForm acroForm) throws IOException {
        if (document == null) {
            return;
@@ -713,34 +704,28 @@ public class FormUtils {
                properties != null && properties.getSystem() != null
                        ? properties.getSystem().getMaxDPI()
                        : 300;
-        int effectiveDpi = Math.min(requestedDpi, FLATTEN_FALLBACK_MAX_DPI);

-        rebuildDocumentFromImages(document, renderer, effectiveDpi);
+        rebuildDocumentFromImages(document, renderer, requestedDpi);
    }

-    // Use PDFBox's built-in field flattening which bakes form field values
-    // into the page content stream as static text/graphics, removing the
-    // interactive form structure but preserving all other document content
-    // (images, text, annotations, etc.) at full quality.
-    //
-    // Forcing appearance regeneration via setNeedAppearances(true) drives
-    // PDFBox into refreshAppearances inside flatten(), where it can hang on
-    // certain documents (PDFBOX-5962). We therefore only regenerate when we
-    // actually wrote new values, or when some widgets are missing appearance
-    // streams and would otherwise flatten blank.
-    private void flattenEntireDocument(
-            PDDocument document, PDAcroForm acroForm, boolean valuesWritten) throws IOException {
-        if (document == null || acroForm == null) {
+    // note: this implementation suffers from:
+    // https://issues.apache.org/jira/browse/PDFBOX-5962
+    private void flattenEntireDocument(PDDocument document, PDAcroForm acroForm)
+            throws IOException {
+        if (document == null) {
            return;
        }

-        if (valuesWritten || hasWidgetWithoutAppearance(acroForm)) {
-            ensureAppearances(acroForm);
-        } else {
-            acroForm.setNeedAppearances(false);
+        if (acroForm == null) {
+            return;
        }

+        // Use PDFBox's built-in field flattening which bakes form field values
+        // into the page content stream as static text/graphics, removing the
+        // interactive form structure but preserving all other document content
+        // (images, text, annotations, etc.) at full quality.
        try {
+            ensureAppearances(acroForm);
            acroForm.flatten();
        } catch (Exception e) {
            log.warn(
@@ -751,28 +736,6 @@ public class FormUtils {
        }
    }

-    private boolean hasWidgetWithoutAppearance(PDAcroForm acroForm) {
-        for (PDField field : acroForm.getFieldTree()) {
-            if (!(field instanceof PDTerminalField terminalField)) {
-                continue;
-            }
-            List<PDAnnotationWidget> widgets = terminalField.getWidgets();
-            if (widgets == null) {
-                continue;
-            }
-            for (PDAnnotationWidget widget : widgets) {
-                if (widget == null) {
-                    continue;
-                }
-                PDAppearanceDictionary appearance = widget.getAppearance();
-                if (appearance == null || appearance.getNormalAppearance() == null) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
    private void rebuildDocumentFromImages(PDDocument document, PDFRenderer renderer, int dpi)
            throws IOException {
        int pageCount = document.getNumberOfPages();
@@ -1183,25 +1183,4 @@ public class GeneralUtils {
            }
        }
    }
-
-    public String getLocalNetworkIp() {
-        try {
-            Enumeration<NetworkInterface> interfaces = NetworkInterface.getNetworkInterfaces();
-            if (interfaces == null) return null;
-            while (interfaces.hasMoreElements()) {
-                NetworkInterface iface = interfaces.nextElement();
-                if (!iface.isUp() || iface.isLoopback() || iface.isVirtual()) continue;
-                Enumeration<InetAddress> addresses = iface.getInetAddresses();
-                while (addresses.hasMoreElements()) {
-                    InetAddress addr = addresses.nextElement();
-                    if (addr instanceof Inet4Address && addr.isSiteLocalAddress()) {
-                        return addr.getHostAddress();
-                    }
-                }
-            }
-        } catch (Exception e) {
-            log.warn("Failed to detect local network IP", e);
-        }
-        return null;
-    }
 }
@@ -1,9 +1,9 @@
 package stirling.software.common.util;

+import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
-import java.io.OutputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -20,7 +20,6 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.servlet.mvc.method.annotation.StreamingResponseBody;

 import com.vladsch.flexmark.html2md.converter.FlexmarkHtmlConverter;
 import com.vladsch.flexmark.util.data.MutableDataSet;
@@ -49,7 +48,7 @@ public class PDFToFile {
        this.runtimePathConfig = runtimePathConfig;
    }

-    public ResponseEntity<StreamingResponseBody> processPdfToMarkdown(MultipartFile inputFile)
+    public ResponseEntity<byte[]> processPdfToMarkdown(MultipartFile inputFile)
            throws IOException, InterruptedException {
        if (!MediaType.APPLICATION_PDF_VALUE.equals(inputFile.getContentType())) {
            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
@@ -86,77 +85,78 @@ public class PDFToFile {
            pdfBaseName = originalPdfFileName.substring(0, originalPdfFileName.lastIndexOf('.'));
        }

-        String fileName = pdfBaseName + "ToMarkdown.zip";
-        TempFile finalOut = tempFileManager.createManagedTempFile(".zip");
-        try {
-            try (TempFile tempInputFile = new TempFile(tempFileManager, ".pdf");
-                    TempDirectory tempOutputDir = new TempDirectory(tempFileManager)) {
-                inputFile.transferTo(tempInputFile.getFile());
+        byte[] fileBytes;
+        String fileName;

-                List<String> command =
-                        new ArrayList<>(
-                                Arrays.asList(
-                                        "pdftohtml",
-                                        "-s",
-                                        "-noframes",
-                                        "-c",
-                                        tempInputFile.getAbsolutePath(),
-                                        pdfBaseName));
+        try (TempFile tempInputFile = new TempFile(tempFileManager, ".pdf");
+                TempDirectory tempOutputDir = new TempDirectory(tempFileManager)) {
+            inputFile.transferTo(tempInputFile.getFile());

-                ProcessExecutorResult returnCode =
-                        ProcessExecutor.getInstance(ProcessExecutor.Processes.PDFTOHTML)
-                                .runCommandWithOutputHandling(
-                                        command, tempOutputDir.getPath().toFile());
-                // Process HTML files to Markdown
-                File[] outputFiles =
-                        Objects.requireNonNull(tempOutputDir.getPath().toFile().listFiles());
-                List<File> markdownFiles = new ArrayList<>();
-                List<File> imageFiles = new ArrayList<>();
+            List<String> command =
+                    new ArrayList<>(
+                            Arrays.asList(
+                                    "pdftohtml",
+                                    "-s",
+                                    "-noframes",
+                                    "-c",
+                                    tempInputFile.getAbsolutePath(),
+                                    pdfBaseName));

-                // Convert HTML files to Markdown and collect image files
-                for (File outputFile : outputFiles) {
-                    if (outputFile.getName().endsWith(".html")) {
-                        String html = Files.readString(outputFile.toPath());
-                        String markdown = htmlToMarkdownConverter.convert(html);
+            ProcessExecutorResult returnCode =
+                    ProcessExecutor.getInstance(ProcessExecutor.Processes.PDFTOHTML)
+                            .runCommandWithOutputHandling(
+                                    command, tempOutputDir.getPath().toFile());
+            // Process HTML files to Markdown
+            File[] outputFiles =
+                    Objects.requireNonNull(tempOutputDir.getPath().toFile().listFiles());
+            List<File> markdownFiles = new ArrayList<>();
+            List<File> imageFiles = new ArrayList<>();

-                        // Update image references to point to images/ folder
-                        markdown = updateImageReferences(markdown);
+            // Convert HTML files to Markdown and collect image files
+            for (File outputFile : outputFiles) {
+                if (outputFile.getName().endsWith(".html")) {
+                    String html = Files.readString(outputFile.toPath());
+                    String markdown = htmlToMarkdownConverter.convert(html);

-                        String mdFileName = outputFile.getName().replace(".html", ".md");
-                        File mdFile = new File(tempOutputDir.getPath().toFile(), mdFileName);
-                        Files.writeString(mdFile.toPath(), markdown);
-                        markdownFiles.add(mdFile);
-                    } else if (!outputFile.getName().endsWith(".md")) {
-                        // Collect non-HTML, non-MD files as images/assets
-                        imageFiles.add(outputFile);
-                    }
-                }
+                    // Update image references to point to images/ folder
+                    markdown = updateImageReferences(markdown);

-                try (OutputStream fos = Files.newOutputStream(finalOut.getPath());
-                        ZipOutputStream zipOutputStream = new ZipOutputStream(fos)) {
-                    // Add markdown files to root of ZIP
-                    for (File mdFile : markdownFiles) {
-                        ZipEntry mdEntry = new ZipEntry(mdFile.getName());
-                        zipOutputStream.putNextEntry(mdEntry);
-                        Files.copy(mdFile.toPath(), zipOutputStream);
-                        zipOutputStream.closeEntry();
-                    }
-
-                    // Add images and other assets to images/ folder
-                    for (File imageFile : imageFiles) {
-                        ZipEntry assetEntry = new ZipEntry("images/" + imageFile.getName());
-                        zipOutputStream.putNextEntry(assetEntry);
-                        Files.copy(imageFile.toPath(), zipOutputStream);
-                        zipOutputStream.closeEntry();
-                    }
+                    String mdFileName = outputFile.getName().replace(".html", ".md");
+                    File mdFile = new File(tempOutputDir.getPath().toFile(), mdFileName);
+                    Files.writeString(mdFile.toPath(), markdown);
+                    markdownFiles.add(mdFile);
+                } else if (!outputFile.getName().endsWith(".md")) {
+                    // Collect non-HTML, non-MD files as images/assets
+                    imageFiles.add(outputFile);
                }
            }
-        } catch (Exception e) {
-            finalOut.close();
-            throw e;
+
+            // Always create a ZIP file
+            fileName = pdfBaseName + "ToMarkdown.zip";
+            ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+
+            try (ZipOutputStream zipOutputStream = new ZipOutputStream(byteArrayOutputStream)) {
+                // Add markdown files to root of ZIP
+                for (File mdFile : markdownFiles) {
+                    ZipEntry mdEntry = new ZipEntry(mdFile.getName());
+                    zipOutputStream.putNextEntry(mdEntry);
+                    Files.copy(mdFile.toPath(), zipOutputStream);
+                    zipOutputStream.closeEntry();
+                }
+
+                // Add images and other assets to images/ folder
+                for (File imageFile : imageFiles) {
+                    ZipEntry assetEntry = new ZipEntry("images/" + imageFile.getName());
+                    zipOutputStream.putNextEntry(assetEntry);
+                    Files.copy(imageFile.toPath(), zipOutputStream);
+                    zipOutputStream.closeEntry();
+                }
+            }
+
+            fileBytes = byteArrayOutputStream.toByteArray();
        }
-        return WebResponseUtils.fileToWebResponse(
-                finalOut, fileName, MediaType.APPLICATION_OCTET_STREAM);
+        return WebResponseUtils.bytesToWebResponse(
+                fileBytes, fileName, MediaType.APPLICATION_OCTET_STREAM);
    }

    /**
@@ -169,7 +169,7 @@ public class PDFToFile {
        return PATTERN.matcher(markdown).replaceAll("$1(images/$2)");
    }

-    public ResponseEntity<StreamingResponseBody> processPdfToHtml(MultipartFile inputFile)
+    public ResponseEntity<byte[]> processPdfToHtml(MultipartFile inputFile)
            throws IOException, InterruptedException {
        if (!MediaType.APPLICATION_PDF_VALUE.equals(inputFile.getContentType())) {
            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
@@ -182,57 +182,56 @@ public class PDFToFile {
            pdfBaseName = originalPdfFileName.substring(0, originalPdfFileName.lastIndexOf('.'));
        }

-        String fileName = pdfBaseName + "ToHtml.zip";
-        TempFile finalOut = tempFileManager.createManagedTempFile(".zip");
-        try {
-            try (TempFile inputFileTemp = new TempFile(tempFileManager, ".pdf");
-                    TempDirectory outputDirTemp = new TempDirectory(tempFileManager)) {
+        byte[] fileBytes;
+        String fileName;

-                Path tempInputFile = inputFileTemp.getPath();
-                Path tempOutputDir = outputDirTemp.getPath();
+        try (TempFile inputFileTemp = new TempFile(tempFileManager, ".pdf");
+                TempDirectory outputDirTemp = new TempDirectory(tempFileManager)) {

-                // Save the uploaded file to a temporary location
-                inputFile.transferTo(tempInputFile);
+            Path tempInputFile = inputFileTemp.getPath();
+            Path tempOutputDir = outputDirTemp.getPath();

-                // Run the pdftohtml command with complex output
-                List<String> command =
-                        new ArrayList<>(
-                                Arrays.asList(
-                                        "pdftohtml", "-c", tempInputFile.toString(), pdfBaseName));
+            // Save the uploaded file to a temporary location
+            inputFile.transferTo(tempInputFile);

-                ProcessExecutorResult returnCode =
-                        ProcessExecutor.getInstance(ProcessExecutor.Processes.PDFTOHTML)
-                                .runCommandWithOutputHandling(command, tempOutputDir.toFile());
+            // Run the pdftohtml command with complex output
+            List<String> command =
+                    new ArrayList<>(
+                            Arrays.asList(
+                                    "pdftohtml", "-c", tempInputFile.toString(), pdfBaseName));

-                // Get output files
-                File[] outputFiles = Objects.requireNonNull(tempOutputDir.toFile().listFiles());
+            ProcessExecutorResult returnCode =
+                    ProcessExecutor.getInstance(ProcessExecutor.Processes.PDFTOHTML)
+                            .runCommandWithOutputHandling(command, tempOutputDir.toFile());

-                try (OutputStream fos = Files.newOutputStream(finalOut.getPath());
-                        ZipOutputStream zipOutputStream = new ZipOutputStream(fos)) {
-                    for (File outputFile : outputFiles) {
-                        ZipEntry entry = new ZipEntry(outputFile.getName());
-                        zipOutputStream.putNextEntry(entry);
-                        try (FileInputStream fis = new FileInputStream(outputFile)) {
-                            IOUtils.copy(fis, zipOutputStream);
-                        } catch (IOException e) {
-                            log.error("Exception writing zip entry", e);
-                        }
-                        zipOutputStream.closeEntry();
+            // Get output files
+            File[] outputFiles = Objects.requireNonNull(tempOutputDir.toFile().listFiles());
+
+            // Return output files in a ZIP archive
+            fileName = pdfBaseName + "ToHtml.zip";
+            ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+            try (ZipOutputStream zipOutputStream = new ZipOutputStream(byteArrayOutputStream)) {
+                for (File outputFile : outputFiles) {
+                    ZipEntry entry = new ZipEntry(outputFile.getName());
+                    zipOutputStream.putNextEntry(entry);
+                    try (FileInputStream fis = new FileInputStream(outputFile)) {
+                        IOUtils.copy(fis, zipOutputStream);
+                    } catch (IOException e) {
+                        log.error("Exception writing zip entry", e);
                    }
-                } catch (IOException e) {
-                    log.error("Exception writing zip", e);
+                    zipOutputStream.closeEntry();
                }
+            } catch (IOException e) {
+                log.error("Exception writing zip", e);
            }
-        } catch (Exception e) {
-            finalOut.close();
-            throw e;
+            fileBytes = byteArrayOutputStream.toByteArray();
        }

-        return WebResponseUtils.fileToWebResponse(
-                finalOut, fileName, MediaType.APPLICATION_OCTET_STREAM);
+        return WebResponseUtils.bytesToWebResponse(
+                fileBytes, fileName, MediaType.APPLICATION_OCTET_STREAM);
    }

-    public ResponseEntity<StreamingResponseBody> processPdfToOfficeFormat(
+    public ResponseEntity<byte[]> processPdfToOfficeFormat(
            MultipartFile inputFile, String outputFormat, String libreOfficeFilter)
            throws IOException, InterruptedException {

@@ -258,115 +257,109 @@ public class PDFToFile {
            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
        }

+        byte[] fileBytes;
        String fileName;
-        TempFile finalOut =
-                tempFileManager.createManagedTempFile("." + resolvePrimaryExtension(outputFormat));
+
        Path libreOfficeProfile = null;
-        try {
-            try (TempFile inputFileTemp = new TempFile(tempFileManager, ".pdf");
-                    TempDirectory outputDirTemp = new TempDirectory(tempFileManager)) {
+        try (TempFile inputFileTemp = new TempFile(tempFileManager, ".pdf");
+                TempDirectory outputDirTemp = new TempDirectory(tempFileManager)) {

-                Path tempInputFile = inputFileTemp.getPath();
-                Path tempOutputDir = outputDirTemp.getPath();
-                Path unoOutputFile =
-                        tempOutputDir.resolve(
-                                pdfBaseName + "." + resolvePrimaryExtension(outputFormat));
+            Path tempInputFile = inputFileTemp.getPath();
+            Path tempOutputDir = outputDirTemp.getPath();
+            Path unoOutputFile =
+                    tempOutputDir.resolve(
+                            pdfBaseName + "." + resolvePrimaryExtension(outputFormat));

-                // Save the uploaded file to a temporary location
-                inputFile.transferTo(tempInputFile);
+            // Save the uploaded file to a temporary location
+            inputFile.transferTo(tempInputFile);

-                // Run the LibreOffice command
-                ProcessExecutorResult returnCode = null;
-                IOException unoconvertException = null;
+            // Run the LibreOffice command
+            ProcessExecutorResult returnCode = null;
+            IOException unoconvertException = null;

-                if (isUnoConvertEnabled()) {
-                    try {
-                        List<String> unoCommand =
-                                buildUnoConvertCommand(
-                                        tempInputFile,
-                                        unoOutputFile,
-                                        outputFormat,
-                                        libreOfficeFilter);
-                        returnCode =
-                                ProcessExecutor.getInstance(ProcessExecutor.Processes.LIBRE_OFFICE)
-                                        .runCommandWithOutputHandling(unoCommand);
-                    } catch (IOException e) {
-                        unoconvertException = e;
-                        log.warn(
-                                "Unoconvert command failed ({}). Falling back to soffice command.",
-                                e.getMessage());
-                    }
-                }
-
-                if (returnCode == null) {
-                    // Run the LibreOffice command as a fallback
-                    libreOfficeProfile = Files.createTempDirectory("libreoffice_profile_");
-                    List<String> command = new ArrayList<>();
-                    command.add(runtimePathConfig.getSOfficePath());
-                    command.add("-env:UserInstallation=" + libreOfficeProfile.toUri().toString());
-                    command.add("--headless");
-                    command.add("--nologo");
-                    command.add("--infilter=" + libreOfficeFilter);
-                    command.add("--convert-to");
-                    command.add(outputFormat);
-                    command.add("--outdir");
-                    command.add(tempOutputDir.toString());
-                    command.add(tempInputFile.toString());
-
-                    try {
-                        returnCode =
-                                ProcessExecutor.getInstance(ProcessExecutor.Processes.LIBRE_OFFICE)
-                                        .runCommandWithOutputHandling(command);
-                    } catch (IOException e) {
-                        if (unoconvertException != null) {
-                            e.addSuppressed(unoconvertException);
-                        }
-                        throw e;
-                    }
-                }
-
-                // Get output files
-                List<File> outputFiles = Arrays.asList(tempOutputDir.toFile().listFiles());
-
-                if (outputFiles.size() == 1) {
-                    // Return single output file
-                    File outputFile = outputFiles.get(0);
-                    if ("txt:Text".equals(outputFormat)) {
-                        outputFormat = "txt";
-                    }
-                    fileName = pdfBaseName + "." + outputFormat;
-                    FileUtils.copyFile(outputFile, finalOut.getFile());
-                } else {
-                    // Return output files in a ZIP archive
-                    fileName = pdfBaseName + "To" + outputFormat + ".zip";
-                    try (OutputStream fos = Files.newOutputStream(finalOut.getPath());
-                            ZipOutputStream zipOutputStream = new ZipOutputStream(fos)) {
-                        for (File outputFile : outputFiles) {
-                            ZipEntry entry = new ZipEntry(outputFile.getName());
-                            zipOutputStream.putNextEntry(entry);
-                            try (FileInputStream fis = new FileInputStream(outputFile)) {
-                                IOUtils.copy(fis, zipOutputStream);
-                            } catch (IOException e) {
-                                log.error("Exception writing zip entry", e);
-                            }
-
-                            zipOutputStream.closeEntry();
-                        }
-                    } catch (IOException e) {
-                        log.error("Exception writing zip", e);
-                    }
+            if (isUnoConvertEnabled()) {
+                try {
+                    List<String> unoCommand =
+                            buildUnoConvertCommand(
+                                    tempInputFile, unoOutputFile, outputFormat, libreOfficeFilter);
+                    returnCode =
+                            ProcessExecutor.getInstance(ProcessExecutor.Processes.LIBRE_OFFICE)
+                                    .runCommandWithOutputHandling(unoCommand);
+                } catch (IOException e) {
+                    unoconvertException = e;
+                    log.warn(
+                            "Unoconvert command failed ({}). Falling back to soffice command.",
+                            e.getMessage());
                }
            }
-        } catch (Exception e) {
-            finalOut.close();
-            throw e;
+
+            if (returnCode == null) {
+                // Run the LibreOffice command as a fallback
+                libreOfficeProfile = Files.createTempDirectory("libreoffice_profile_");
+                List<String> command = new ArrayList<>();
+                command.add(runtimePathConfig.getSOfficePath());
+                command.add("-env:UserInstallation=" + libreOfficeProfile.toUri().toString());
+                command.add("--headless");
+                command.add("--nologo");
+                command.add("--infilter=" + libreOfficeFilter);
+                command.add("--convert-to");
+                command.add(outputFormat);
+                command.add("--outdir");
+                command.add(tempOutputDir.toString());
+                command.add(tempInputFile.toString());
+
+                try {
+                    returnCode =
+                            ProcessExecutor.getInstance(ProcessExecutor.Processes.LIBRE_OFFICE)
+                                    .runCommandWithOutputHandling(command);
+                } catch (IOException e) {
+                    if (unoconvertException != null) {
+                        e.addSuppressed(unoconvertException);
+                    }
+                    throw e;
+                }
+            }
+
+            // Get output files
+            List<File> outputFiles = Arrays.asList(tempOutputDir.toFile().listFiles());
+
+            if (outputFiles.size() == 1) {
+                // Return single output file
+                File outputFile = outputFiles.get(0);
+                if ("txt:Text".equals(outputFormat)) {
+                    outputFormat = "txt";
+                }
+                fileName = pdfBaseName + "." + outputFormat;
+                fileBytes = FileUtils.readFileToByteArray(outputFile);
+            } else {
+                // Return output files in a ZIP archive
+                fileName = pdfBaseName + "To" + outputFormat + ".zip";
+                ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+                try (ZipOutputStream zipOutputStream = new ZipOutputStream(byteArrayOutputStream)) {
+                    for (File outputFile : outputFiles) {
+                        ZipEntry entry = new ZipEntry(outputFile.getName());
+                        zipOutputStream.putNextEntry(entry);
+                        try (FileInputStream fis = new FileInputStream(outputFile)) {
+                            IOUtils.copy(fis, zipOutputStream);
+                        } catch (IOException e) {
+                            log.error("Exception writing zip entry", e);
+                        }
+
+                        zipOutputStream.closeEntry();
+                    }
+                } catch (IOException e) {
+                    log.error("Exception writing zip", e);
+                }
+
+                fileBytes = byteArrayOutputStream.toByteArray();
+            }
        } finally {
            if (libreOfficeProfile != null) {
                FileUtils.deleteQuietly(libreOfficeProfile.toFile());
            }
        }
-        return WebResponseUtils.fileToWebResponse(
-                finalOut, fileName, MediaType.APPLICATION_OCTET_STREAM);
+        return WebResponseUtils.bytesToWebResponse(
+                fileBytes, fileName, MediaType.APPLICATION_OCTET_STREAM);
    }

    private boolean isUnoConvertEnabled() {
@@ -282,9 +282,8 @@ public class ProcessExecutor {
            boolean finished = process.waitFor(timeoutDuration, TimeUnit.MINUTES);

            if (!finished) {
-                // Kill the entire process tree (descendants first, then the process itself)
-                process.descendants().forEach(ProcessHandle::destroyForcibly);
-                process.destroyForcibly();
+                // Terminate the process
+                process.destroy();
                // Interrupt the reader threads
                errorReaderThread.interrupt();
                outputReaderThread.interrupt();
@@ -538,9 +538,9 @@ public final class RegexPatternUtils {
        getPattern("[^a-zA-Z0-9 ]"); // Input sanitization
        getPattern("[^a-zA-Z0-9]"); // Filename sanitization
        // API doc patterns
-        getPattern("Output:\\s*(\\w+)");
-        getPattern("Input:\\s*(\\w+)");
-        getPattern("Type:\\s*(\\w+)");
+        getPattern("Output:(\\w+)"); // precompiled single-escaped for runtime regex \w
+        getPattern("Input:(\\w+)");
+        getPattern("Type:(\\w+)");
        log.debug("Pre-compiled {} common regex patterns", patternCache.size());
    }

@@ -552,19 +552,19 @@ public final class RegexPatternUtils {

    /* Pattern for matching Output:<TYPE> in API descriptions */
    public Pattern getApiDocOutputTypePattern() {
-        return getPattern("Output:\\s*(\\w+)");
+        return getPattern("Output:(\\w+)");
    }

    /* Pattern for matching Input:<TYPE> in API descriptions */
    public Pattern getApiDocInputTypePattern() {
-        return getPattern("Input:\\s*(\\w+)");
+        return getPattern("Input:(\\w+)");
    }

    /**
     * Pattern for matching Type:<CODE> in API descriptions
     */
    public Pattern getApiDocTypePattern() {
-        return getPattern("Type:\\s*(\\w+)");
+        return getPattern("Type:(\\w+)");
    }

    /* Pattern for validating file extensions (2-4 alphanumeric, case-insensitive) */
@@ -86,6 +86,7 @@ public class RequestUriUtils {
        // Blocklist of backend/non-frontend paths that should still go through filters
        String[] backendOnlyPrefixes = {
            "/register",
+            "/invite",
            "/pipeline",
            "/pdfjs",
            "/pdfjs-legacy",
@@ -180,9 +181,7 @@ public class RequestUriUtils {
                || trimmedUri.startsWith("/readiness")
                || trimmedUri.startsWith(
                        "/api/v1/mobile-scanner/") // Mobile scanner endpoints (no auth)
-                || trimmedUri.startsWith("/v1/api-docs")
-                // Workflow participant endpoints — access controlled by share tokens, not login
-                || trimmedUri.startsWith("/api/v1/workflow/participant/");
+                || trimmedUri.startsWith("/v1/api-docs");
    }

    private static String stripContextPath(String contextPath, String requestURI) {
@@ -73,19 +73,6 @@ public class WebResponseUtils {
        return baosToWebResponse(baos, docName);
    }

-    public static ResponseEntity<StreamingResponseBody> pdfDocToWebResponse(
-            PDDocument document, String docName, TempFileManager tempFileManager)
-            throws IOException {
-        TempFile tempFile = tempFileManager.createManagedTempFile(".pdf");
-        try {
-            document.save(tempFile.getFile());
-        } catch (IOException e) {
-            tempFile.close();
-            throw e;
-        }
-        return pdfFileToWebResponse(tempFile, docName);
-    }
-
    /**
     * Convert a File to a web response (PDF default).
     *
@@ -121,37 +108,23 @@ public class WebResponseUtils {
    public static ResponseEntity<StreamingResponseBody> fileToWebResponse(
            TempFile outputTempFile, String docName, MediaType mediaType) throws IOException {

-        try {
-            Path path = outputTempFile.getFile().toPath().normalize();
-            long len = Files.size(path);
-            HttpHeaders headers = new HttpHeaders();
-            headers.setContentType(mediaType);
-            headers.setContentLength(len);
-            String encodedDocName =
-                    RegexPatternUtils.getInstance()
-                            .getPlusSignPattern()
-                            .matcher(URLEncoder.encode(docName, StandardCharsets.UTF_8))
-                            .replaceAll("%20");
-            headers.setContentDispositionFormData("attachment", encodedDocName);
+        Path path = outputTempFile.getFile().toPath().normalize();
+        long len = Files.size(path);
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(mediaType);
+        headers.setContentLength(len);
+        headers.add(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + docName + "\"");

-            StreamingResponseBody body =
-                    os -> {
-                        try (os) {
-                            Files.copy(path, os);
-                            os.flush();
-                        } finally {
-                            outputTempFile.close();
-                        }
-                    };
+        StreamingResponseBody body =
+                os -> {
+                    try (os) {
+                        Files.copy(path, os);
+                        os.flush();
+                    } finally {
+                        outputTempFile.close();
+                    }
+                };

-            return new ResponseEntity<>(body, headers, HttpStatus.OK);
-        } catch (IOException | RuntimeException e) {
-            try {
-                outputTempFile.close();
-            } catch (Exception closeEx) {
-                e.addSuppressed(closeEx);
-            }
-            throw e;
-        }
+        return new ResponseEntity<>(body, headers, HttpStatus.OK);
    }
 }
@@ -1,142 +0,0 @@
-package stirling.software.common.util;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.nio.file.Files;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.function.Consumer;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
-
-import org.springframework.core.io.FileSystemResource;
-import org.springframework.core.io.Resource;
-
-import io.github.pixee.security.ZipSecurity;
-
-import lombok.experimental.UtilityClass;
-import lombok.extern.slf4j.Slf4j;
-
-/**
- * Helpers for detecting and extracting ZIP-formatted responses returned from Stirling API
- * endpoints. Shared between {@code PipelineProcessor} and {@code AiWorkflowService} so both callers
- * unpack ZIPs consistently (hardened against zip-slip, depth-limited, backed by managed temp
- * files).
- */
-@Slf4j
-@UtilityClass
-public class ZipExtractionUtils {
-
-    private static final int MAX_UNZIP_DEPTH = 10;
-    private static final byte[] ZIP_MAGIC = {0x50, 0x4B, 0x03, 0x04};
-
-    /**
-     * Returns true if the resource starts with the standard ZIP magic bytes. CBZ files are
-     * explicitly treated as non-ZIP.
-     */
-    public static boolean isZip(Resource data) throws IOException {
-        return isZip(data, null);
-    }
-
-    /**
-     * Returns true if the resource starts with the standard ZIP magic bytes. Files named with the
-     * {@code .cbz} extension are excluded (handled separately by the comic viewer).
-     */
-    public static boolean isZip(Resource data, String filename) throws IOException {
-        if (data == null || data.contentLength() < ZIP_MAGIC.length) {
-            return false;
-        }
-        if (filename != null && filename.toLowerCase().endsWith(".cbz")) {
-            return false;
-        }
-        try (InputStream is = data.getInputStream()) {
-            byte[] header = new byte[ZIP_MAGIC.length];
-            if (is.read(header) < ZIP_MAGIC.length) {
-                return false;
-            }
-            for (int i = 0; i < ZIP_MAGIC.length; i++) {
-                if (header[i] != ZIP_MAGIC[i]) {
-                    return false;
-                }
-            }
-            return true;
-        }
-    }
-
-    /**
-     * Extract a ZIP resource into a flat list of resources, one per file entry. Nested ZIPs are
-     * recursively extracted up to {@link #MAX_UNZIP_DEPTH}. Each entry is materialized as a
-     * hardened-extracted managed temp file so downstream consumers can stream the bytes.
-     */
-    public static List<Resource> extractZip(Resource zip, TempFileManager tempFileManager)
-            throws IOException {
-        return extractZip(zip, tempFileManager, null);
-    }
-
-    /**
-     * Extract a ZIP resource into a flat list of resources. Each created {@link TempFile} is also
-     * passed to {@code tempFileConsumer} when non-null, giving callers the option to register the
-     * temp files with an auxiliary lifecycle (e.g. {@code PipelineResult}).
-     */
-    public static List<Resource> extractZip(
-            Resource zip, TempFileManager tempFileManager, Consumer<TempFile> tempFileConsumer)
-            throws IOException {
-        return extractZipInternal(zip, tempFileManager, tempFileConsumer, 0);
-    }
-
-    private static List<Resource> extractZipInternal(
-            Resource zip,
-            TempFileManager tempFileManager,
-            Consumer<TempFile> tempFileConsumer,
-            int depth)
-            throws IOException {
-        if (depth > MAX_UNZIP_DEPTH) {
-            log.warn(
-                    "ZIP nesting depth {} exceeds limit {}, treating as file",
-                    depth,
-                    MAX_UNZIP_DEPTH);
-            return List.of(zip);
-        }
-        log.debug("Unzipping data of length: {}", zip.contentLength());
-        List<Resource> extracted = new ArrayList<>();
-        try (InputStream bais = zip.getInputStream();
-                ZipInputStream zis = ZipSecurity.createHardenedInputStream(bais)) {
-            ZipEntry entry;
-            while ((entry = zis.getNextEntry()) != null) {
-                if (entry.isDirectory()) {
-                    continue;
-                }
-                TempFile tempFile = tempFileManager.createManagedTempFile("unzip");
-                if (tempFileConsumer != null) {
-                    tempFileConsumer.accept(tempFile);
-                }
-                try (OutputStream os = Files.newOutputStream(tempFile.getPath())) {
-                    byte[] buffer = new byte[4096];
-                    int count;
-                    while ((count = zis.read(buffer)) != -1) {
-                        os.write(buffer, 0, count);
-                    }
-                }
-                final String filename = entry.getName();
-                Resource fileResource =
-                        new FileSystemResource(tempFile.getFile()) {
-                            @Override
-                            public String getFilename() {
-                                return filename;
-                            }
-                        };
-                if (isZip(fileResource, filename)) {
-                    log.debug("Nested ZIP entry {} — recursing", filename);
-                    extracted.addAll(
-                            extractZipInternal(
-                                    fileResource, tempFileManager, tempFileConsumer, depth + 1));
-                } else {
-                    extracted.add(fileResource);
-                }
-            }
-        }
-        log.debug("Unzipping completed. {} files extracted.", extracted.size());
-        return extracted;
-    }
-}
@@ -1,159 +0,0 @@
-package stirling.software.common.service;
-
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.*;
-import static org.mockito.Mockito.*;
-
-import java.io.ByteArrayInputStream;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
-import org.springframework.core.io.ByteArrayResource;
-import org.springframework.core.io.Resource;
-import org.springframework.http.*;
-import org.springframework.http.client.ClientHttpResponse;
-import org.springframework.mock.env.MockEnvironment;
-import org.springframework.util.LinkedMultiValueMap;
-import org.springframework.util.MultiValueMap;
-import org.springframework.web.client.RequestCallback;
-import org.springframework.web.client.ResponseExtractor;
-import org.springframework.web.client.RestTemplate;
-
-import jakarta.servlet.ServletContext;
-
-import stirling.software.common.util.TempFile;
-import stirling.software.common.util.TempFileManager;
-
-@ExtendWith(MockitoExtension.class)
-class InternalApiClientTest {
-
-    @Mock ServletContext servletContext;
-    @Mock UserServiceInterface userService;
-    @Mock TempFileManager tempFileManager;
-
-    InternalApiClient client;
-
-    @BeforeEach
-    void setUp() {
-        lenient().when(servletContext.getContextPath()).thenReturn("");
-        MockEnvironment environment = new MockEnvironment().withProperty("server.port", "8080");
-        client = new InternalApiClient(servletContext, userService, tempFileManager, environment);
-    }
-
-    @Test
-    void postDoesNotForceContentType() throws Exception {
-        MultiValueMap<String, Object> body = new LinkedMultiValueMap<>();
-        body.add("fileInput", namedResource("input.pdf", "data"));
-
-        Path tempPath = Files.createTempFile("internal-api-test", ".tmp");
-        TempFile tempFile = mock(TempFile.class);
-        when(tempFile.getPath()).thenReturn(tempPath);
-        when(tempFile.getFile()).thenReturn(tempPath.toFile());
-        when(tempFileManager.createManagedTempFile("internal-api")).thenReturn(tempFile);
-
-        HttpHeaders[] captured = {null};
-
-        try (var ignored =
-                mockConstruction(
-                        RestTemplate.class,
-                        (rt, ctx) -> {
-                            when(rt.httpEntityCallback(any(), eq(Resource.class)))
-                                    .thenAnswer(
-                                            inv -> {
-                                                HttpEntity<?> entity = inv.getArgument(0);
-                                                captured[0] = entity.getHeaders();
-                                                return (RequestCallback) req -> {};
-                                            });
-
-                            when(rt.execute(anyString(), eq(HttpMethod.POST), any(), any()))
-                                    .thenAnswer(inv -> fakeOkResponse(inv.getArgument(3)));
-                        })) {
-
-            ResponseEntity<Resource> response = client.post("/api/v1/general/merge-pdfs", body);
-
-            assertNotNull(response);
-            assertEquals(HttpStatus.OK, response.getStatusCode());
-            assertNotNull(response.getBody());
-            assertNull(captured[0].getContentType(), "Content-Type should not be forced");
-        } finally {
-            Files.deleteIfExists(tempPath);
-        }
-    }
-
-    @Test
-    void postRejectsDisallowedPath() {
-        MultiValueMap<String, Object> body = new LinkedMultiValueMap<>();
-        assertThrows(SecurityException.class, () -> client.post("/api/v1/admin/settings", body));
-    }
-
-    @Test
-    void postRejectsPathTraversal() {
-        MultiValueMap<String, Object> body = new LinkedMultiValueMap<>();
-        assertThrows(
-                SecurityException.class,
-                () -> client.post("/api/v1/misc/../../actuator/env", body));
-    }
-
-    @Test
-    void postRejectsUrlEncodedCharacters() {
-        MultiValueMap<String, Object> body = new LinkedMultiValueMap<>();
-        assertThrows(
-                SecurityException.class, () -> client.post("/api/v1/misc/%2e%2e/actuator", body));
-    }
-
-    @Test
-    void postRejectsQueryString() {
-        MultiValueMap<String, Object> body = new LinkedMultiValueMap<>();
-        assertThrows(
-                SecurityException.class,
-                () -> client.post("/api/v1/misc/compress-pdf?redirect=evil", body));
-    }
-
-    @Test
-    void postRejectsEmptySegment() {
-        MultiValueMap<String, Object> body = new LinkedMultiValueMap<>();
-        assertThrows(SecurityException.class, () -> client.post("/api/v1/misc//foo", body));
-    }
-
-    @Test
-    void postRejectsTrailingSlash() {
-        MultiValueMap<String, Object> body = new LinkedMultiValueMap<>();
-        assertThrows(SecurityException.class, () -> client.post("/api/v1/misc/foo/", body));
-    }
-
-    @Test
-    void postRejectsNullPath() {
-        MultiValueMap<String, Object> body = new LinkedMultiValueMap<>();
-        assertThrows(SecurityException.class, () -> client.post(null, body));
-    }
-
-    /** Create a ByteArrayResource with a filename (required for multipart). */
-    private static Resource namedResource(String filename, String content) {
-        return new ByteArrayResource(content.getBytes(StandardCharsets.UTF_8)) {
-            @Override
-            public String getFilename() {
-                return filename;
-            }
-        };
-    }
-
-    /** Simulate a successful HTTP response through a RestTemplate ResponseExtractor. */
-    @SuppressWarnings("unchecked")
-    private static ResponseEntity<Resource> fakeOkResponse(Object extractorArg) throws Exception {
-        var extractor = (ResponseExtractor<ResponseEntity<Resource>>) extractorArg;
-        ClientHttpResponse response = mock(ClientHttpResponse.class);
-        when(response.getBody())
-                .thenReturn(new ByteArrayInputStream("ok".getBytes(StandardCharsets.UTF_8)));
-        HttpHeaders headers = new HttpHeaders();
-        headers.add(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"out.pdf\"");
-        when(response.getHeaders()).thenReturn(headers);
-        lenient().when(response.getStatusCode()).thenReturn(HttpStatus.OK);
-        return extractor.extractData(response);
-    }
-}
@@ -1,56 +0,0 @@
-package stirling.software.common.util;
-
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Mockito.*;
-
-import java.util.List;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.ApplicationArguments;
-
-class AppArgsCaptureTest {
-
-    private AppArgsCapture capture;
-
-    @BeforeEach
-    void setUp() {
-        capture = new AppArgsCapture();
-        AppArgsCapture.APP_ARGS.set(List.of());
-    }
-
-    @Test
-    void run_withArgs_capturesArgs() {
-        ApplicationArguments args = mock(ApplicationArguments.class);
-        when(args.getSourceArgs()).thenReturn(new String[] {"--server.port=8080", "--debug"});
-        capture.run(args);
-        assertEquals(List.of("--server.port=8080", "--debug"), AppArgsCapture.APP_ARGS.get());
-    }
-
-    @Test
-    void run_withNoArgs_capturesEmptyList() {
-        ApplicationArguments args = mock(ApplicationArguments.class);
-        when(args.getSourceArgs()).thenReturn(new String[] {});
-        capture.run(args);
-        assertEquals(List.of(), AppArgsCapture.APP_ARGS.get());
-    }
-
-    @Test
-    void run_calledTwice_overwritesPreviousArgs() {
-        ApplicationArguments args1 = mock(ApplicationArguments.class);
-        when(args1.getSourceArgs()).thenReturn(new String[] {"--first"});
-        capture.run(args1);
-        assertEquals(List.of("--first"), AppArgsCapture.APP_ARGS.get());
-
-        ApplicationArguments args2 = mock(ApplicationArguments.class);
-        when(args2.getSourceArgs()).thenReturn(new String[] {"--second", "--third"});
-        capture.run(args2);
-        assertEquals(List.of("--second", "--third"), AppArgsCapture.APP_ARGS.get());
-    }
-
-    @Test
-    void appArgs_defaultValue_isEmptyList() {
-        // After setUp resets it
-        assertTrue(AppArgsCapture.APP_ARGS.get().isEmpty());
-    }
-}
@@ -1,108 +0,0 @@
-package stirling.software.common.util;
-
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Mockito.*;
-
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.NoSuchBeanDefinitionException;
-import org.springframework.context.ApplicationContext;
-
-class ApplicationContextProviderTest {
-
-    private ApplicationContextProvider provider;
-
-    @BeforeEach
-    void setUp() {
-        provider = new ApplicationContextProvider();
-        // Reset to null state
-        provider.setApplicationContext(null);
-    }
-
-    @AfterEach
-    void tearDown() {
-        // Clean up static state
-        provider.setApplicationContext(null);
-    }
-
-    @Test
-    void getBean_byClass_whenNoContext_returnsNull() {
-        provider.setApplicationContext(null);
-        assertNull(ApplicationContextProvider.getBean(String.class));
-    }
-
-    @Test
-    void getBean_byClass_whenBeanExists_returnsBean() {
-        ApplicationContext ctx = mock(ApplicationContext.class);
-        when(ctx.getBean(String.class)).thenReturn("hello");
-        provider.setApplicationContext(ctx);
-        assertEquals("hello", ApplicationContextProvider.getBean(String.class));
-    }
-
-    @Test
-    void getBean_byClass_whenBeanNotFound_returnsNull() {
-        ApplicationContext ctx = mock(ApplicationContext.class);
-        when(ctx.getBean(String.class)).thenThrow(new NoSuchBeanDefinitionException(""));
-        provider.setApplicationContext(ctx);
-        assertNull(ApplicationContextProvider.getBean(String.class));
-    }
-
-    @Test
-    void getBean_byNameAndClass_whenNoContext_returnsNull() {
-        provider.setApplicationContext(null);
-        assertNull(ApplicationContextProvider.getBean("myBean", String.class));
-    }
-
-    @Test
-    void getBean_byNameAndClass_whenBeanExists_returnsBean() {
-        ApplicationContext ctx = mock(ApplicationContext.class);
-        when(ctx.getBean("myBean", String.class)).thenReturn("world");
-        provider.setApplicationContext(ctx);
-        assertEquals("world", ApplicationContextProvider.getBean("myBean", String.class));
-    }
-
-    @Test
-    void getBean_byNameAndClass_whenBeanNotFound_returnsNull() {
-        ApplicationContext ctx = mock(ApplicationContext.class);
-        when(ctx.getBean("missing", String.class)).thenThrow(new NoSuchBeanDefinitionException(""));
-        provider.setApplicationContext(ctx);
-        assertNull(ApplicationContextProvider.getBean("missing", String.class));
-    }
-
-    @Test
-    void containsBean_whenNoContext_returnsFalse() {
-        provider.setApplicationContext(null);
-        assertFalse(ApplicationContextProvider.containsBean(String.class));
-    }
-
-    @Test
-    void containsBean_whenBeanExists_returnsTrue() {
-        ApplicationContext ctx = mock(ApplicationContext.class);
-        when(ctx.getBean(String.class)).thenReturn("exists");
-        provider.setApplicationContext(ctx);
-        assertTrue(ApplicationContextProvider.containsBean(String.class));
-    }
-
-    @Test
-    void containsBean_whenBeanNotFound_returnsFalse() {
-        ApplicationContext ctx = mock(ApplicationContext.class);
-        when(ctx.getBean(Integer.class)).thenThrow(new NoSuchBeanDefinitionException(""));
-        provider.setApplicationContext(ctx);
-        assertFalse(ApplicationContextProvider.containsBean(Integer.class));
-    }
-
-    @Test
-    void setApplicationContext_updatesStaticContext() {
-        ApplicationContext ctx = mock(ApplicationContext.class);
-        when(ctx.getBean(String.class)).thenReturn("test");
-        provider.setApplicationContext(ctx);
-        assertEquals("test", ApplicationContextProvider.getBean(String.class));
-
-        // Now set a different context
-        ApplicationContext ctx2 = mock(ApplicationContext.class);
-        when(ctx2.getBean(String.class)).thenReturn("updated");
-        provider.setApplicationContext(ctx2);
-        assertEquals("updated", ApplicationContextProvider.getBean(String.class));
-    }
-}
@@ -1,70 +0,0 @@
-package stirling.software.common.util;
-
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Mockito.*;
-
-import org.apache.pdfbox.cos.COSDictionary;
-import org.apache.pdfbox.cos.COSName;
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.pdmodel.PDDocumentCatalog;
-import org.apache.pdfbox.pdmodel.PageMode;
-import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Test;
-
-class AttachmentUtilsTest {
-
-    @Test
-    @DisplayName("should set page mode on catalog")
-    void setsPageMode() {
-        try (PDDocument document = new PDDocument()) {
-            AttachmentUtils.setCatalogViewerPreferences(document, PageMode.USE_ATTACHMENTS);
-
-            PDDocumentCatalog catalog = document.getDocumentCatalog();
-            assertEquals(PageMode.USE_ATTACHMENTS, catalog.getPageMode());
-        } catch (Exception e) {
-            fail("Should not throw: " + e.getMessage());
-        }
-    }
-
-    @Test
-    @DisplayName("should create viewer preferences dictionary if absent")
-    void createsViewerPreferences() {
-        try (PDDocument document = new PDDocument()) {
-            AttachmentUtils.setCatalogViewerPreferences(document, PageMode.USE_ATTACHMENTS);
-
-            COSDictionary catalogDict = document.getDocumentCatalog().getCOSObject();
-            COSDictionary viewerPrefs =
-                    (COSDictionary) catalogDict.getDictionaryObject(COSName.VIEWER_PREFERENCES);
-            assertNotNull(viewerPrefs);
-        } catch (Exception e) {
-            fail("Should not throw: " + e.getMessage());
-        }
-    }
-
-    @Test
-    @DisplayName("should set DisplayDocTitle to true in viewer preferences")
-    void setsDisplayDocTitle() {
-        try (PDDocument document = new PDDocument()) {
-            AttachmentUtils.setCatalogViewerPreferences(document, PageMode.USE_ATTACHMENTS);
-
-            COSDictionary catalogDict = document.getDocumentCatalog().getCOSObject();
-            COSDictionary viewerPrefs =
-                    (COSDictionary) catalogDict.getDictionaryObject(COSName.VIEWER_PREFERENCES);
-            assertTrue(viewerPrefs.getBoolean(COSName.getPDFName("DisplayDocTitle"), false));
-        } catch (Exception e) {
-            fail("Should not throw: " + e.getMessage());
-        }
-    }
-
-    @Test
-    @DisplayName("should not throw when catalog returns null from mocked document")
-    void handlesNullCatalogGracefully() {
-        PDDocument document = mock(PDDocument.class);
-        when(document.getDocumentCatalog()).thenReturn(null);
-
-        assertDoesNotThrow(
-                () ->
-                        AttachmentUtils.setCatalogViewerPreferences(
-                                document, PageMode.USE_ATTACHMENTS));
-    }
-}
@@ -1,98 +0,0 @@
-package stirling.software.common.util;
-
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Mockito.*;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.web.multipart.MultipartFile;
-
-class CbrUtilsTest {
-
-    // --- isCbrFile tests ---
-
-    @Test
-    void isCbrFile_withCbrExtension_returnsTrue() {
-        MultipartFile file = mock(MultipartFile.class);
-        when(file.getOriginalFilename()).thenReturn("comic.cbr");
-        assertTrue(CbrUtils.isCbrFile(file));
-    }
-
-    @Test
-    void isCbrFile_withRarExtension_returnsTrue() {
-        MultipartFile file = mock(MultipartFile.class);
-        when(file.getOriginalFilename()).thenReturn("archive.rar");
-        assertTrue(CbrUtils.isCbrFile(file));
-    }
-
-    @Test
-    void isCbrFile_withUpperCaseExtension_returnsTrue() {
-        MultipartFile file = mock(MultipartFile.class);
-        when(file.getOriginalFilename()).thenReturn("comic.CBR");
-        assertTrue(CbrUtils.isCbrFile(file));
-    }
-
-    @Test
-    void isCbrFile_withPdfExtension_returnsFalse() {
-        MultipartFile file = mock(MultipartFile.class);
-        when(file.getOriginalFilename()).thenReturn("document.pdf");
-        assertFalse(CbrUtils.isCbrFile(file));
-    }
-
-    @Test
-    void isCbrFile_withNullFilename_returnsFalse() {
-        MultipartFile file = mock(MultipartFile.class);
-        when(file.getOriginalFilename()).thenReturn(null);
-        assertFalse(CbrUtils.isCbrFile(file));
-    }
-
-    @Test
-    void isCbrFile_withCbzExtension_returnsFalse() {
-        MultipartFile file = mock(MultipartFile.class);
-        when(file.getOriginalFilename()).thenReturn("comic.cbz");
-        assertFalse(CbrUtils.isCbrFile(file));
-    }
-
-    @Test
-    void isCbrFile_withNoExtension_returnsFalse() {
-        MultipartFile file = mock(MultipartFile.class);
-        when(file.getOriginalFilename()).thenReturn("noextension");
-        assertFalse(CbrUtils.isCbrFile(file));
-    }
-
-    @Test
-    void isCbrFile_withMixedCaseRar_returnsTrue() {
-        MultipartFile file = mock(MultipartFile.class);
-        when(file.getOriginalFilename()).thenReturn("file.RaR");
-        assertTrue(CbrUtils.isCbrFile(file));
-    }
-
-    // --- convertCbrToPdf validation tests ---
-
-    @Test
-    void convertCbrToPdf_withNullFile_throwsException() {
-        assertThrows(Exception.class, () -> CbrUtils.convertCbrToPdf(null, null, null));
-    }
-
-    @Test
-    void convertCbrToPdf_withEmptyFile_throwsException() {
-        MultipartFile file = mock(MultipartFile.class);
-        when(file.isEmpty()).thenReturn(true);
-        assertThrows(Exception.class, () -> CbrUtils.convertCbrToPdf(file, null, null));
-    }
-
-    @Test
-    void convertCbrToPdf_withNullFilename_throwsException() {
-        MultipartFile file = mock(MultipartFile.class);
-        when(file.isEmpty()).thenReturn(false);
-        when(file.getOriginalFilename()).thenReturn(null);
-        assertThrows(Exception.class, () -> CbrUtils.convertCbrToPdf(file, null, null));
-    }
-
-    @Test
-    void convertCbrToPdf_withWrongExtension_throwsException() {
-        MultipartFile file = mock(MultipartFile.class);
-        when(file.isEmpty()).thenReturn(false);
-        when(file.getOriginalFilename()).thenReturn("file.pdf");
-        assertThrows(Exception.class, () -> CbrUtils.convertCbrToPdf(file, null, null));
-    }
-}
@@ -1,142 +0,0 @@
-package stirling.software.common.util;
-
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Mockito.*;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.web.multipart.MultipartFile;
-
-class CbzUtilsTest {
-
-    // --- isCbzFile tests ---
-
-    @Test
-    void isCbzFile_withCbzExtension_returnsTrue() {
-        MultipartFile file = mock(MultipartFile.class);
-        when(file.getOriginalFilename()).thenReturn("comic.cbz");
-        assertTrue(CbzUtils.isCbzFile(file));
-    }
-
-    @Test
-    void isCbzFile_withZipExtension_returnsTrue() {
-        MultipartFile file = mock(MultipartFile.class);
-        when(file.getOriginalFilename()).thenReturn("archive.zip");
-        assertTrue(CbzUtils.isCbzFile(file));
-    }
-
-    @Test
-    void isCbzFile_withUpperCaseExtension_returnsTrue() {
-        MultipartFile file = mock(MultipartFile.class);
-        when(file.getOriginalFilename()).thenReturn("comic.CBZ");
-        assertTrue(CbzUtils.isCbzFile(file));
-    }
-
-    @Test
-    void isCbzFile_withPdfExtension_returnsFalse() {
-        MultipartFile file = mock(MultipartFile.class);
-        when(file.getOriginalFilename()).thenReturn("document.pdf");
-        assertFalse(CbzUtils.isCbzFile(file));
-    }
-
-    @Test
-    void isCbzFile_withNullFilename_returnsFalse() {
-        MultipartFile file = mock(MultipartFile.class);
-        when(file.getOriginalFilename()).thenReturn(null);
-        assertFalse(CbzUtils.isCbzFile(file));
-    }
-
-    @Test
-    void isCbzFile_withCbrExtension_returnsFalse() {
-        MultipartFile file = mock(MultipartFile.class);
-        when(file.getOriginalFilename()).thenReturn("comic.cbr");
-        assertFalse(CbzUtils.isCbzFile(file));
-    }
-
-    // --- isComicBookFile tests ---
-
-    @Test
-    void isComicBookFile_withCbzExtension_returnsTrue() {
-        MultipartFile file = mock(MultipartFile.class);
-        when(file.getOriginalFilename()).thenReturn("comic.cbz");
-        assertTrue(CbzUtils.isComicBookFile(file));
-    }
-
-    @Test
-    void isComicBookFile_withZipExtension_returnsTrue() {
-        MultipartFile file = mock(MultipartFile.class);
-        when(file.getOriginalFilename()).thenReturn("archive.zip");
-        assertTrue(CbzUtils.isComicBookFile(file));
-    }
-
-    @Test
-    void isComicBookFile_withCbrExtension_returnsTrue() {
-        MultipartFile file = mock(MultipartFile.class);
-        when(file.getOriginalFilename()).thenReturn("comic.cbr");
-        assertTrue(CbzUtils.isComicBookFile(file));
-    }
-
-    @Test
-    void isComicBookFile_withRarExtension_returnsTrue() {
-        MultipartFile file = mock(MultipartFile.class);
-        when(file.getOriginalFilename()).thenReturn("archive.rar");
-        assertTrue(CbzUtils.isComicBookFile(file));
-    }
-
-    @Test
-    void isComicBookFile_withPdfExtension_returnsFalse() {
-        MultipartFile file = mock(MultipartFile.class);
-        when(file.getOriginalFilename()).thenReturn("document.pdf");
-        assertFalse(CbzUtils.isComicBookFile(file));
-    }
-
-    @Test
-    void isComicBookFile_withNullFilename_returnsFalse() {
-        MultipartFile file = mock(MultipartFile.class);
-        when(file.getOriginalFilename()).thenReturn(null);
-        assertFalse(CbzUtils.isComicBookFile(file));
-    }
-
-    @Test
-    void isComicBookFile_withUpperCaseCBR_returnsTrue() {
-        MultipartFile file = mock(MultipartFile.class);
-        when(file.getOriginalFilename()).thenReturn("comic.CBR");
-        assertTrue(CbzUtils.isComicBookFile(file));
-    }
-
-    @Test
-    void isComicBookFile_withNoExtension_returnsFalse() {
-        MultipartFile file = mock(MultipartFile.class);
-        when(file.getOriginalFilename()).thenReturn("noextension");
-        assertFalse(CbzUtils.isComicBookFile(file));
-    }
-
-    // --- convertCbzToPdf validation tests ---
-
-    @Test
-    void convertCbzToPdf_withNullFile_throwsException() {
-        assertThrows(Exception.class, () -> CbzUtils.convertCbzToPdf(null, null, null, false));
-    }
-
-    @Test
-    void convertCbzToPdf_withEmptyFile_throwsException() {
-        MultipartFile file = mock(MultipartFile.class);
-        when(file.isEmpty()).thenReturn(true);
-        assertThrows(Exception.class, () -> CbzUtils.convertCbzToPdf(file, null, null, false));
-    }
-
-    @Test
-    void convertCbzToPdf_withNullFilename_throwsException() {
-        MultipartFile file = mock(MultipartFile.class);
-        when(file.isEmpty()).thenReturn(false);
-        when(file.getOriginalFilename()).thenReturn(null);
-        assertThrows(Exception.class, () -> CbzUtils.convertCbzToPdf(file, null, null, false));
-    }
-
-    @Test
-    void convertCbzToPdf_withWrongExtension_throwsException() {
-        MultipartFile file = mock(MultipartFile.class);
-        when(file.isEmpty()).thenReturn(false);
-        when(file.getOriginalFilename()).thenReturn("file.pdf");
-        assertThrows(Exception.class, () -> CbzUtils.convertCbzToPdf(file, null, null, false));
-    }
-}
@@ -1,210 +0,0 @@
-package stirling.software.common.util;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Map;
-
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.io.TempDir;
-
-class ChecksumUtilsAdditionalTest {
-
-    private static final byte[] HELLO = "hello".getBytes(StandardCharsets.UTF_8);
-
-    @TempDir Path tempDir;
-
-    private Path writeFile(byte[] data) throws IOException {
-        Path file = tempDir.resolve("testfile.bin");
-        Files.write(file, data);
-        return file;
-    }
-
-    // --- checksum(Path, String) ---
-
-    @Test
-    void testChecksumPath_sha256() throws IOException {
-        Path file = writeFile(HELLO);
-        String hex = ChecksumUtils.checksum(file, "SHA-256");
-        assertEquals("2cf24dba5fb0a30e26e83b2ac5b9e29e1b161e5c1fa7425e73043362938b9824", hex);
-    }
-
-    @Test
-    void testChecksumPath_md5() throws IOException {
-        Path file = writeFile(HELLO);
-        String hex = ChecksumUtils.checksum(file, "MD5");
-        assertEquals("5d41402abc4b2a76b9719d911017c592", hex);
-    }
-
-    @Test
-    void testChecksumPath_crc32() throws IOException {
-        Path file = writeFile(HELLO);
-        String hex = ChecksumUtils.checksum(file, "CRC32");
-        assertEquals("3610a686", hex);
-    }
-
-    // --- checksum(InputStream, String) ---
-
-    @Test
-    void testChecksumStream_adler32() throws IOException {
-        try (InputStream is = new ByteArrayInputStream(HELLO)) {
-            String hex = ChecksumUtils.checksum(is, "ADLER32");
-            assertNotNull(hex);
-            assertEquals(8, hex.length());
-        }
-    }
-
-    @Test
-    void testChecksumStream_sha1() throws IOException {
-        try (InputStream is = new ByteArrayInputStream(HELLO)) {
-            String hex = ChecksumUtils.checksum(is, "SHA-1");
-            assertEquals("aaf4c61ddcc5e8a2dabede0f3b482cd9aea9434d", hex);
-        }
-    }
-
-    @Test
-    void testChecksumStream_unsupportedAlgorithm() {
-        assertThrows(
-                IllegalStateException.class,
-                () -> {
-                    try (InputStream is = new ByteArrayInputStream(HELLO)) {
-                        ChecksumUtils.checksum(is, "FAKE-ALGO");
-                    }
-                });
-    }
-
-    // --- checksumBase64(Path, String) ---
-
-    @Test
-    void testChecksumBase64Path_md5() throws IOException {
-        Path file = writeFile(HELLO);
-        String b64 = ChecksumUtils.checksumBase64(file, "MD5");
-        assertEquals("XUFAKrxLKna5cZ2REBfFkg==", b64);
-    }
-
-    @Test
-    void testChecksumBase64Path_crc32() throws IOException {
-        Path file = writeFile(HELLO);
-        String b64 = ChecksumUtils.checksumBase64(file, "CRC32");
-        assertEquals("NhCmhg==", b64);
-    }
-
-    // --- checksumBase64(InputStream, String) ---
-
-    @Test
-    void testChecksumBase64Stream_adler32() throws IOException {
-        try (InputStream is = new ByteArrayInputStream(HELLO)) {
-            String b64 = ChecksumUtils.checksumBase64(is, "ADLER32");
-            assertNotNull(b64);
-            assertFalse(b64.isEmpty());
-        }
-    }
-
-    @Test
-    void testChecksumBase64Stream_sha256() throws IOException {
-        try (InputStream is = new ByteArrayInputStream(HELLO)) {
-            String b64 = ChecksumUtils.checksumBase64(is, "SHA-256");
-            assertNotNull(b64);
-            assertFalse(b64.isEmpty());
-        }
-    }
-
-    // --- checksums(Path, String...) ---
-
-    @Test
-    void testChecksumsPath_multipleAlgorithms() throws IOException {
-        Path file = writeFile(HELLO);
-        Map<String, String> results = ChecksumUtils.checksums(file, "MD5", "SHA-256", "CRC32");
-        assertEquals(3, results.size());
-        assertEquals("5d41402abc4b2a76b9719d911017c592", results.get("MD5"));
-        assertEquals(
-                "2cf24dba5fb0a30e26e83b2ac5b9e29e1b161e5c1fa7425e73043362938b9824",
-                results.get("SHA-256"));
-        assertEquals("3610a686", results.get("CRC32"));
-    }
-
-    @Test
-    void testChecksumsPath_preservesOrder() throws IOException {
-        Path file = writeFile(HELLO);
-        // Digests are output first, then Checksums (CRC32/ADLER32), per implementation
-        Map<String, String> results = ChecksumUtils.checksums(file, "MD5", "SHA-1");
-        String[] keys = results.keySet().toArray(new String[0]);
-        assertEquals("MD5", keys[0]);
-        assertEquals("SHA-1", keys[1]);
-    }
-
-    @Test
-    void testChecksumsStream_unsupportedAlgorithm() {
-        assertThrows(
-                IllegalStateException.class,
-                () -> {
-                    try (InputStream is = new ByteArrayInputStream(HELLO)) {
-                        ChecksumUtils.checksums(is, "BOGUS");
-                    }
-                });
-    }
-
-    // --- matches(Path, String, String) ---
-
-    @Test
-    void testMatchesPath_correctHash() throws IOException {
-        Path file = writeFile(HELLO);
-        assertTrue(ChecksumUtils.matches(file, "MD5", "5d41402abc4b2a76b9719d911017c592"));
-    }
-
-    @Test
-    void testMatchesPath_wrongHash() throws IOException {
-        Path file = writeFile(HELLO);
-        assertFalse(ChecksumUtils.matches(file, "MD5", "0000000000000000000000000000000000"));
-    }
-
-    @Test
-    void testMatchesPath_caseInsensitive() throws IOException {
-        Path file = writeFile(HELLO);
-        assertTrue(ChecksumUtils.matches(file, "MD5", "5D41402ABC4B2A76B9719D911017C592"));
-    }
-
-    // --- matches(InputStream, String, String) ---
-
-    @Test
-    void testMatchesStream_correct() throws IOException {
-        try (InputStream is = new ByteArrayInputStream(HELLO)) {
-            assertTrue(
-                    ChecksumUtils.matches(is, "SHA-1", "aaf4c61ddcc5e8a2dabede0f3b482cd9aea9434d"));
-        }
-    }
-
-    @Test
-    void testMatchesStream_wrong() throws IOException {
-        try (InputStream is = new ByteArrayInputStream(HELLO)) {
-            assertFalse(
-                    ChecksumUtils.matches(is, "SHA-1", "0000000000000000000000000000000000000000"));
-        }
-    }
-
-    // --- empty input ---
-
-    @Test
-    void testChecksumEmptyInput() throws IOException {
-        byte[] empty = new byte[0];
-        try (InputStream is = new ByteArrayInputStream(empty)) {
-            String hex = ChecksumUtils.checksum(is, "MD5");
-            // MD5 of empty input is d41d8cd98f00b204e9800998ecf8427e
-            assertEquals("d41d8cd98f00b204e9800998ecf8427e", hex);
-        }
-    }
-
-    @Test
-    void testChecksumCrc32EmptyInput() throws IOException {
-        byte[] empty = new byte[0];
-        try (InputStream is = new ByteArrayInputStream(empty)) {
-            String hex = ChecksumUtils.checksum(is, "CRC32");
-            assertEquals("00000000", hex);
-        }
-    }
-}
@@ -1,93 +0,0 @@
-package stirling.software.common.util;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Nested;
-import org.junit.jupiter.api.Test;
-
-class EmlParserTest {
-
-    @Nested
-    @DisplayName("safeMimeDecode")
-    class SafeMimeDecodeTests {
-
-        @Test
-        @DisplayName("should return empty string for null input")
-        void nullInput() {
-            assertEquals("", EmlParser.safeMimeDecode(null));
-        }
-
-        @Test
-        @DisplayName("should return empty string for empty input")
-        void emptyInput() {
-            assertEquals("", EmlParser.safeMimeDecode(""));
-        }
-
-        @Test
-        @DisplayName("should return empty string for blank input")
-        void blankInput() {
-            assertEquals("", EmlParser.safeMimeDecode("   "));
-        }
-
-        @Test
-        @DisplayName("should return plain text as-is")
-        void plainText() {
-            assertEquals("Hello World", EmlParser.safeMimeDecode("Hello World"));
-        }
-
-        @Test
-        @DisplayName("should trim surrounding whitespace")
-        void trimWhitespace() {
-            assertEquals("Hello", EmlParser.safeMimeDecode("  Hello  "));
-        }
-
-        @Test
-        @DisplayName("should decode base64 MIME encoded word")
-        void decodeBase64MimeWord() {
-            // =?UTF-8?B?SGVsbG8=?= is Base64 for "Hello"
-            assertEquals("Hello", EmlParser.safeMimeDecode("=?UTF-8?B?SGVsbG8=?="));
-        }
-
-        @Test
-        @DisplayName("should decode quoted-printable MIME encoded word")
-        void decodeQpMimeWord() {
-            // =?UTF-8?Q?Hello_World?= where _ means space in Q encoding
-            assertEquals("Hello World", EmlParser.safeMimeDecode("=?UTF-8?Q?Hello_World?="));
-        }
-
-        @Test
-        @DisplayName("should handle mixed text and encoded words")
-        void mixedTextAndEncoded() {
-            String input = "Re: =?UTF-8?B?SGVsbG8=?= test";
-            String result = EmlParser.safeMimeDecode(input);
-            assertEquals("Re: Hello test", result);
-        }
-    }
-
-    @Nested
-    @DisplayName("extractEmailContent")
-    class ExtractEmailContentTests {
-
-        @Test
-        @DisplayName("should throw on null input")
-        void nullInput() {
-            assertThrows(Exception.class, () -> EmlParser.extractEmailContent(null, null, null));
-        }
-
-        @Test
-        @DisplayName("should throw on empty input")
-        void emptyInput() {
-            assertThrows(
-                    Exception.class, () -> EmlParser.extractEmailContent(new byte[0], null, null));
-        }
-
-        @Test
-        @DisplayName("should throw on invalid content that is not EML or MSG")
-        void invalidContent() {
-            byte[] randomBytes = "This is not an email file at all.".getBytes();
-            assertThrows(
-                    Exception.class, () -> EmlParser.extractEmailContent(randomBytes, null, null));
-        }
-    }
-}
@@ -1,293 +0,0 @@
-package stirling.software.common.util;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Nested;
-import org.junit.jupiter.api.Test;
-
-class EmlProcessingUtilsTest {
-
-    @Nested
-    @DisplayName("validateEmlInput")
-    class ValidateEmlInputTests {
-
-        @Test
-        @DisplayName("should throw on null input")
-        void nullInput() {
-            assertThrows(Exception.class, () -> EmlProcessingUtils.validateEmlInput(null));
-        }
-
-        @Test
-        @DisplayName("should throw on empty input")
-        void emptyInput() {
-            assertThrows(Exception.class, () -> EmlProcessingUtils.validateEmlInput(new byte[0]));
-        }
-
-        @Test
-        @DisplayName("should throw on invalid format with insufficient headers")
-        void invalidFormat() {
-            byte[] data = "Hello, this is just random text without email headers.".getBytes();
-            assertThrows(Exception.class, () -> EmlProcessingUtils.validateEmlInput(data));
-        }
-
-        @Test
-        @DisplayName("should accept valid EML with multiple headers")
-        void validEml() {
-            String emlContent =
-                    "From: sender@example.com\r\n"
-                            + "To: recipient@example.com\r\n"
-                            + "Subject: Test\r\n"
-                            + "Date: Mon, 1 Jan 2024 00:00:00 +0000\r\n"
-                            + "\r\n"
-                            + "Body text";
-            assertDoesNotThrow(() -> EmlProcessingUtils.validateEmlInput(emlContent.getBytes()));
-        }
-    }
-
-    @Nested
-    @DisplayName("isMsgFile")
-    class IsMsgFileTests {
-
-        @Test
-        @DisplayName("should return false for null")
-        void nullInput() {
-            assertFalse(EmlProcessingUtils.isMsgFile(null));
-        }
-
-        @Test
-        @DisplayName("should return false for short bytes")
-        void shortBytes() {
-            assertFalse(EmlProcessingUtils.isMsgFile(new byte[] {0x01, 0x02}));
-        }
-
-        @Test
-        @DisplayName("should return true for MSG magic bytes")
-        void msgMagicBytes() {
-            byte[] magic = {
-                (byte) 0xD0,
-                (byte) 0xCF,
-                (byte) 0x11,
-                (byte) 0xE0,
-                (byte) 0xA1,
-                (byte) 0xB1,
-                (byte) 0x1A,
-                (byte) 0xE1,
-                0x00,
-                0x00
-            };
-            assertTrue(EmlProcessingUtils.isMsgFile(magic));
-        }
-
-        @Test
-        @DisplayName("should return false for non-MSG bytes")
-        void nonMsgBytes() {
-            byte[] data = new byte[] {0x50, 0x4B, 0x03, 0x04, 0x00, 0x00, 0x00, 0x00};
-            assertFalse(EmlProcessingUtils.isMsgFile(data));
-        }
-    }
-
-    @Nested
-    @DisplayName("escapeHtml")
-    class EscapeHtmlTests {
-
-        @Test
-        @DisplayName("should return empty string for null")
-        void nullInput() {
-            assertEquals("", EmlProcessingUtils.escapeHtml(null));
-        }
-
-        @Test
-        @DisplayName("should escape all HTML special characters")
-        void escapeSpecialChars() {
-            String result = EmlProcessingUtils.escapeHtml("<div class=\"test\">'&'</div>");
-            assertEquals("&lt;div class=&quot;test&quot;&gt;&#39;&amp;&#39;&lt;/div&gt;", result);
-        }
-
-        @Test
-        @DisplayName("should not modify plain text")
-        void plainText() {
-            assertEquals("Hello World", EmlProcessingUtils.escapeHtml("Hello World"));
-        }
-    }
-
-    @Nested
-    @DisplayName("convertTextToHtml")
-    class ConvertTextToHtmlTests {
-
-        @Test
-        @DisplayName("should return empty string for null")
-        void nullInput() {
-            assertEquals("", EmlProcessingUtils.convertTextToHtml(null, null));
-        }
-
-        @Test
-        @DisplayName("should convert newlines to br tags")
-        void newlinesToBr() {
-            String result = EmlProcessingUtils.convertTextToHtml("Line1\nLine2", null);
-            assertTrue(result.contains("<br>"));
-        }
-
-        @Test
-        @DisplayName("should convert CRLF to br tags")
-        void crlfToBr() {
-            String result = EmlProcessingUtils.convertTextToHtml("Line1\r\nLine2", null);
-            assertTrue(result.contains("<br>"));
-            assertFalse(result.contains("\r"));
-        }
-
-        @Test
-        @DisplayName("should linkify URLs")
-        void linkifyUrls() {
-            String result =
-                    EmlProcessingUtils.convertTextToHtml("Visit https://example.com today", null);
-            assertTrue(result.contains("<a href=\"https://example.com\""));
-        }
-
-        @Test
-        @DisplayName("should linkify email addresses")
-        void linkifyEmails() {
-            String result = EmlProcessingUtils.convertTextToHtml("Contact test@example.com", null);
-            assertTrue(result.contains("mailto:test@example.com"));
-        }
-    }
-
-    @Nested
-    @DisplayName("decodeMimeHeader")
-    class DecodeMimeHeaderTests {
-
-        @Test
-        @DisplayName("should return null for null input")
-        void nullInput() {
-            assertNull(EmlProcessingUtils.decodeMimeHeader(null));
-        }
-
-        @Test
-        @DisplayName("should return empty string for empty input")
-        void emptyInput() {
-            assertEquals("", EmlProcessingUtils.decodeMimeHeader(""));
-        }
-
-        @Test
-        @DisplayName("should return plain text unchanged")
-        void plainText() {
-            assertEquals("Hello World", EmlProcessingUtils.decodeMimeHeader("Hello World"));
-        }
-
-        @Test
-        @DisplayName("should decode Base64 encoded header")
-        void decodeBase64() {
-            // "Hello" in Base64
-            String result = EmlProcessingUtils.decodeMimeHeader("=?UTF-8?B?SGVsbG8=?=");
-            assertEquals("Hello", result);
-        }
-
-        @Test
-        @DisplayName("should decode quoted-printable encoded header")
-        void decodeQuotedPrintable() {
-            String result = EmlProcessingUtils.decodeMimeHeader("=?UTF-8?Q?Hello_World?=");
-            assertEquals("Hello World", result);
-        }
-
-        @Test
-        @DisplayName("should decode concatenated encoded words")
-        void decodeConcatenated() {
-            String input = "=?UTF-8?B?SGVs?= =?UTF-8?B?bG8=?=";
-            String result = EmlProcessingUtils.decodeMimeHeader(input);
-            assertEquals("Hello", result);
-        }
-
-        @Test
-        @DisplayName("should handle unknown encoding gracefully")
-        void unknownEncoding() {
-            String input = "=?UTF-8?X?unknown?=";
-            String result = EmlProcessingUtils.decodeMimeHeader(input);
-            assertEquals("=?UTF-8?X?unknown?=", result);
-        }
-    }
-
-    @Nested
-    @DisplayName("detectMimeType")
-    class DetectMimeTypeTests {
-
-        @Test
-        @DisplayName("should return existing MIME type if provided")
-        void existingMimeType() {
-            assertEquals(
-                    "image/jpeg", EmlProcessingUtils.detectMimeType("photo.png", "image/jpeg"));
-        }
-
-        @Test
-        @DisplayName("should detect PNG from filename")
-        void detectPng() {
-            assertEquals("image/png", EmlProcessingUtils.detectMimeType("image.png", null));
-        }
-
-        @Test
-        @DisplayName("should detect JPEG from filename")
-        void detectJpeg() {
-            assertEquals("image/jpeg", EmlProcessingUtils.detectMimeType("photo.jpg", null));
-        }
-
-        @Test
-        @DisplayName("should default to image/png for unknown extension")
-        void defaultMimeType() {
-            assertEquals("image/png", EmlProcessingUtils.detectMimeType("file.xyz", null));
-        }
-
-        @Test
-        @DisplayName("should default to image/png for null filename and mime")
-        void nullFilenameAndMime() {
-            assertEquals("image/png", EmlProcessingUtils.detectMimeType(null, null));
-        }
-    }
-
-    @Nested
-    @DisplayName("sanitizeText")
-    class SanitizeTextTests {
-
-        @Test
-        @DisplayName("should escape HTML when no sanitizer provided")
-        void noSanitizer() {
-            String result = EmlProcessingUtils.sanitizeText("<script>", null);
-            assertEquals("&lt;script&gt;", result);
-        }
-    }
-
-    @Nested
-    @DisplayName("processEmailHtmlBody")
-    class ProcessEmailHtmlBodyTests {
-
-        @Test
-        @DisplayName("should return empty string for null body")
-        void nullBody() {
-            assertEquals("", EmlProcessingUtils.processEmailHtmlBody(null, null, null));
-        }
-
-        @Test
-        @DisplayName("should strip fixed position CSS")
-        void stripFixedPosition() {
-            String html = "<div style=\"position:fixed; top:0\">content</div>";
-            String result = EmlProcessingUtils.processEmailHtmlBody(html, null, null);
-            assertFalse(result.contains("position:fixed"));
-        }
-    }
-
-    @Nested
-    @DisplayName("decodeUrlEncoded")
-    class DecodeUrlEncodedTests {
-
-        @Test
-        @DisplayName("should decode URL-encoded string")
-        void decodeEncoded() {
-            assertEquals("hello world", EmlProcessingUtils.decodeUrlEncoded("hello%20world"));
-        }
-
-        @Test
-        @DisplayName("should return original on invalid encoding")
-        void invalidEncoding() {
-            String result = EmlProcessingUtils.decodeUrlEncoded("%ZZinvalid");
-            assertEquals("%ZZinvalid", result);
-        }
-    }
-}
@@ -1,114 +0,0 @@
-package stirling.software.common.util;
-
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Mockito.*;
-
-import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Nested;
-import org.junit.jupiter.api.Test;
-import org.springframework.ui.Model;
-import org.springframework.web.servlet.ModelAndView;
-
-class ErrorUtilsTest {
-
-    @Nested
-    @DisplayName("exceptionToModel")
-    class ExceptionToModelTests {
-
-        @Test
-        @DisplayName("should add error message to model")
-        void addsErrorMessage() {
-            Model model = mock(Model.class);
-            Exception ex = new RuntimeException("test error");
-
-            ErrorUtils.exceptionToModel(model, ex);
-
-            verify(model).addAttribute("errorMessage", "test error");
-        }
-
-        @Test
-        @DisplayName("should add stack trace to model")
-        void addsStackTrace() {
-            Model model = mock(Model.class);
-            Exception ex = new RuntimeException("test error");
-
-            ErrorUtils.exceptionToModel(model, ex);
-
-            verify(model)
-                    .addAttribute(
-                            eq("stackTrace"),
-                            argThat(
-                                    arg ->
-                                            arg instanceof String s
-                                                    && s.contains("RuntimeException")
-                                                    && s.contains("test error")));
-        }
-
-        @Test
-        @DisplayName("should return the same model instance")
-        void returnsSameModel() {
-            Model model = mock(Model.class);
-            Exception ex = new RuntimeException("test");
-
-            Model result = ErrorUtils.exceptionToModel(model, ex);
-
-            assertSame(model, result);
-        }
-
-        @Test
-        @DisplayName("should handle exception with null message")
-        void nullExceptionMessage() {
-            Model model = mock(Model.class);
-            Exception ex = new RuntimeException((String) null);
-
-            ErrorUtils.exceptionToModel(model, ex);
-
-            verify(model).addAttribute("errorMessage", null);
-        }
-    }
-
-    @Nested
-    @DisplayName("exceptionToModelView")
-    class ExceptionToModelViewTests {
-
-        @Test
-        @DisplayName("should create ModelAndView with error message")
-        void addsErrorMessage() {
-            Model model = mock(Model.class);
-            Exception ex = new RuntimeException("view error");
-
-            ModelAndView result = ErrorUtils.exceptionToModelView(model, ex);
-
-            assertNotNull(result);
-            assertEquals("view error", result.getModel().get("errorMessage"));
-        }
-
-        @Test
-        @DisplayName("should create ModelAndView with stack trace")
-        void addsStackTrace() {
-            Model model = mock(Model.class);
-            Exception ex = new RuntimeException("view error");
-
-            ModelAndView result = ErrorUtils.exceptionToModelView(model, ex);
-
-            String stackTrace = (String) result.getModel().get("stackTrace");
-            assertNotNull(stackTrace);
-            assertTrue(stackTrace.contains("RuntimeException"));
-            assertTrue(stackTrace.contains("view error"));
-        }
-
-        @Test
-        @DisplayName("should handle nested exception")
-        void nestedException() {
-            Model model = mock(Model.class);
-            Exception cause = new IllegalArgumentException("root cause");
-            Exception ex = new RuntimeException("wrapper", cause);
-
-            ModelAndView result = ErrorUtils.exceptionToModelView(model, ex);
-
-            String stackTrace = (String) result.getModel().get("stackTrace");
-            assertTrue(stackTrace.contains("root cause"));
-            assertEquals("wrapper", result.getModel().get("errorMessage"));
-        }
-    }
-}
@@ -1,90 +0,0 @@
-package stirling.software.common.util;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicReference;
-
-import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Test;
-
-class ExecutorFactoryTest {
-
-    @Test
-    @DisplayName("newVirtualThreadExecutor should return non-null executor")
-    void virtualThreadExecutorNotNull() {
-        ExecutorService executor = ExecutorFactory.newVirtualThreadExecutor();
-        assertNotNull(executor);
-        executor.shutdown();
-    }
-
-    @Test
-    @DisplayName("newVirtualThreadExecutor should execute tasks")
-    void virtualThreadExecutorExecutesTasks() throws Exception {
-        ExecutorService executor = ExecutorFactory.newVirtualThreadExecutor();
-        AtomicBoolean ran = new AtomicBoolean(false);
-        CountDownLatch latch = new CountDownLatch(1);
-
-        executor.submit(
-                () -> {
-                    ran.set(true);
-                    latch.countDown();
-                });
-
-        assertTrue(latch.await(5, TimeUnit.SECONDS));
-        assertTrue(ran.get());
-        executor.shutdown();
-    }
-
-    @Test
-    @DisplayName("newVirtualThreadExecutor should run on virtual threads")
-    void virtualThreadExecutorUsesVirtualThreads() throws Exception {
-        ExecutorService executor = ExecutorFactory.newVirtualThreadExecutor();
-        AtomicReference<Boolean> isVirtual = new AtomicReference<>();
-        CountDownLatch latch = new CountDownLatch(1);
-
-        executor.submit(
-                () -> {
-                    isVirtual.set(Thread.currentThread().isVirtual());
-                    latch.countDown();
-                });
-
-        assertTrue(latch.await(5, TimeUnit.SECONDS));
-        assertTrue(isVirtual.get());
-        executor.shutdown();
-    }
-
-    @Test
-    @DisplayName("newSingleVirtualThreadScheduledExecutor should return non-null")
-    void scheduledExecutorNotNull() {
-        ScheduledExecutorService executor =
-                ExecutorFactory.newSingleVirtualThreadScheduledExecutor();
-        assertNotNull(executor);
-        executor.shutdown();
-    }
-
-    @Test
-    @DisplayName("newSingleVirtualThreadScheduledExecutor should execute scheduled tasks")
-    void scheduledExecutorExecutesTasks() throws Exception {
-        ScheduledExecutorService executor =
-                ExecutorFactory.newSingleVirtualThreadScheduledExecutor();
-        AtomicBoolean ran = new AtomicBoolean(false);
-        CountDownLatch latch = new CountDownLatch(1);
-
-        executor.schedule(
-                () -> {
-                    ran.set(true);
-                    latch.countDown();
-                },
-                10,
-                TimeUnit.MILLISECONDS);
-
-        assertTrue(latch.await(5, TimeUnit.SECONDS));
-        assertTrue(ran.get());
-        executor.shutdown();
-    }
-}
@@ -1,110 +0,0 @@
-package stirling.software.common.util;
-
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Mockito.*;
-
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.List;
-import java.util.function.Predicate;
-
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.io.TempDir;
-
-import stirling.software.common.configuration.RuntimePathConfig;
-
-class FileMonitorTest {
-
-    @TempDir Path tempDir;
-
-    private FileMonitor createFileMonitor(Path watchDir) throws IOException {
-        Predicate<Path> acceptAll = path -> true;
-        RuntimePathConfig runtimePathConfig = mock(RuntimePathConfig.class);
-        when(runtimePathConfig.getPipelineWatchedFoldersPaths())
-                .thenReturn(List.of(watchDir.toString()));
-        return new FileMonitor(acceptAll, runtimePathConfig);
-    }
-
-    @Test
-    void testConstructor_withValidDirectory() throws IOException {
-        FileMonitor monitor = createFileMonitor(tempDir);
-        assertNotNull(monitor);
-    }
-
-    @Test
-    void testConstructor_withNonExistentDirectory() throws IOException {
-        Path nonExistent = tempDir.resolve("does_not_exist");
-        Predicate<Path> acceptAll = path -> true;
-        RuntimePathConfig config = mock(RuntimePathConfig.class);
-        when(config.getPipelineWatchedFoldersPaths()).thenReturn(List.of(nonExistent.toString()));
-
-        // Should not throw - just logs an error about non-existent path
-        FileMonitor monitor = new FileMonitor(acceptAll, config);
-        assertNotNull(monitor);
-    }
-
-    @Test
-    void testConstructor_withEmptyWatchedFolders() throws IOException {
-        Predicate<Path> acceptAll = path -> true;
-        RuntimePathConfig config = mock(RuntimePathConfig.class);
-        when(config.getPipelineWatchedFoldersPaths()).thenReturn(List.of());
-
-        FileMonitor monitor = new FileMonitor(acceptAll, config);
-        assertNotNull(monitor);
-    }
-
-    @Test
-    void testTrackFiles_noEventsDoesNotThrow() throws IOException {
-        FileMonitor monitor = createFileMonitor(tempDir);
-        // Should not throw even when no events have occurred
-        assertDoesNotThrow(() -> monitor.trackFiles());
-    }
-
-    @Test
-    void testIsFileReadyForProcessing_nonExistentFile() throws IOException {
-        FileMonitor monitor = createFileMonitor(tempDir);
-        Path nonExistent = tempDir.resolve("nonexistent.pdf");
-
-        // Non-existent file should not be ready (file lock check will fail)
-        boolean ready = monitor.isFileReadyForProcessing(nonExistent);
-        assertFalse(ready, "Non-existent file should not be ready for processing");
-    }
-
-    @Test
-    void testIsFileReadyForProcessing_existingFile() throws IOException, InterruptedException {
-        FileMonitor monitor = createFileMonitor(tempDir);
-        Path testFile = tempDir.resolve("test.pdf");
-        Files.writeString(testFile, "test content");
-
-        // Run trackFiles to process any events
-        monitor.trackFiles();
-
-        // The file might or might not be ready depending on timing,
-        // but calling the method should not throw
-        assertDoesNotThrow(() -> monitor.isFileReadyForProcessing(testFile));
-    }
-
-    @Test
-    void testTrackFiles_afterFileCreation() throws IOException {
-        FileMonitor monitor = createFileMonitor(tempDir);
-
-        // Create a file in the watched directory
-        Path testFile = tempDir.resolve("newfile.txt");
-        Files.writeString(testFile, "hello");
-
-        // Track files should process the creation event
-        assertDoesNotThrow(() -> monitor.trackFiles());
-    }
-
-    @Test
-    void testConstructor_withPathFilter() throws IOException {
-        // Filter that rejects all paths
-        Predicate<Path> rejectAll = path -> false;
-        RuntimePathConfig config = mock(RuntimePathConfig.class);
-        when(config.getPipelineWatchedFoldersPaths()).thenReturn(List.of(tempDir.toString()));
-
-        FileMonitor monitor = new FileMonitor(rejectAll, config);
-        assertNotNull(monitor);
-    }
-}
@@ -1,357 +0,0 @@
-package stirling.software.common.util;
-
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Answers.CALLS_REAL_METHODS;
-import static org.mockito.Mockito.*;
-
-import java.io.IOException;
-import java.io.RandomAccessFile;
-import java.nio.channels.FileChannel;
-import java.nio.channels.FileLock;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.attribute.FileTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Nested;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.io.TempDir;
-import org.mockito.Mock;
-import org.mockito.MockedStatic;
-import org.mockito.MockitoAnnotations;
-
-import stirling.software.common.model.ApplicationProperties;
-import stirling.software.common.model.ApplicationProperties.AutoPipeline.FileReadiness;
-
-@DisplayName("FileReadinessChecker")
-class FileReadinessCheckerTest {
-
-    @TempDir Path tempDir;
-
-    @Mock ApplicationProperties applicationProperties;
-    @Mock ApplicationProperties.AutoPipeline autoPipeline;
-
-    /** Real config object — easier to tweak per test than chaining multiple stubs. */
-    FileReadiness config;
-
-    FileReadinessChecker checker;
-
-    @BeforeEach
-    void setUp() {
-        MockitoAnnotations.openMocks(this);
-
-        config = new FileReadiness();
-        config.setEnabled(true);
-        config.setSettleTimeMillis(0); // instant settle by default — individual tests override
-        config.setSizeCheckDelayMillis(1); // minimal pause keeps tests fast
-        config.setAllowedExtensions(new ArrayList<>());
-
-        when(applicationProperties.getAutoPipeline()).thenReturn(autoPipeline);
-        when(autoPipeline.getFileReadiness()).thenReturn(config);
-
-        checker = new FileReadinessChecker(applicationProperties);
-    }
-
-    // =========================================================================
-    // Master toggle
-    // =========================================================================
-
-    @Nested
-    @DisplayName("when enabled=false")
-    class WhenDisabled {
-
-        @Test
-        @DisplayName("always returns true regardless of file state")
-        void alwaysReady() throws IOException {
-            config.setEnabled(false);
-
-            // Non-existent path — would normally fail check #1
-            Path ghost = tempDir.resolve("does-not-exist.pdf");
-            assertTrue(checker.isReady(ghost));
-        }
-    }
-
-    // =========================================================================
-    // Check #1 + #2: existence and regular-file guard
-    // =========================================================================
-
-    @Nested
-    @DisplayName("existence and file-type checks")
-    class ExistenceChecks {
-
-        @Test
-        @DisplayName("non-existent path → not ready")
-        void fileDoesNotExist() {
-            Path ghost = tempDir.resolve("ghost.pdf");
-            assertFalse(checker.isReady(ghost));
-        }
-
-        @Test
-        @DisplayName("path is a directory → not ready")
-        void pathIsDirectory() throws IOException {
-            Path dir = tempDir.resolve("subdir");
-            Files.createDirectory(dir);
-            assertFalse(checker.isReady(dir));
-        }
-
-        @Test
-        @DisplayName("path is a regular file → passes existence checks")
-        void regularFilePassesExistenceCheck() throws IOException {
-            Path file = realFile("test.pdf", "content");
-            setLastModifiedInPast(file, 60_000);
-            assertTrue(checker.isReady(file));
-        }
-    }
-
-    // =========================================================================
-    // Check #3: extension filter
-    // =========================================================================
-
-    @Nested
-    @DisplayName("extension filter")
-    class ExtensionFilter {
-
-        @Test
-        @DisplayName("empty allow-list → all extensions accepted")
-        void emptyAllowListAcceptsAll() throws IOException {
-            config.setAllowedExtensions(new ArrayList<>()); // empty = no filter
-            Path file = realFile("report.docx", "data");
-            setLastModifiedInPast(file, 60_000);
-            assertTrue(checker.isReady(file));
-        }
-
-        @Test
-        @DisplayName("extension in allow-list → passes")
-        void extensionInAllowList() throws IOException {
-            config.setAllowedExtensions(List.of("pdf", "tiff"));
-            Path file = realFile("scan.pdf", "data");
-            setLastModifiedInPast(file, 60_000);
-            assertTrue(checker.isReady(file));
-        }
-
-        @Test
-        @DisplayName("extension not in allow-list → not ready")
-        void extensionNotInAllowList() throws IOException {
-            config.setAllowedExtensions(List.of("pdf", "tiff"));
-            Path file = realFile("document.docx", "data");
-            setLastModifiedInPast(file, 60_000);
-            assertFalse(checker.isReady(file));
-        }
-
-        @Test
-        @DisplayName("extension matching is case-insensitive")
-        void extensionMatchIsCaseInsensitive() throws IOException {
-            config.setAllowedExtensions(List.of("PDF"));
-            Path file = realFile("scan.pdf", "data");
-            setLastModifiedInPast(file, 60_000);
-            assertTrue(checker.isReady(file));
-        }
-
-        @Test
-        @DisplayName("file without extension and non-empty allow-list → not ready")
-        void fileWithNoExtension() throws IOException {
-            config.setAllowedExtensions(List.of("pdf"));
-            Path file = realFile("README", "data");
-            setLastModifiedInPast(file, 60_000);
-            assertFalse(checker.isReady(file));
-        }
-    }
-
-    // =========================================================================
-    // Check #4: settle-time (last-modified age)
-    // =========================================================================
-
-    @Nested
-    @DisplayName("settle-time check")
-    class SettleTime {
-
-        @Test
-        @DisplayName("recently modified file → not ready")
-        void recentlyModified_notReady() throws IOException {
-            config.setSettleTimeMillis(60_000); // require 1 minute of quiet
-            Path file = realFile("new.pdf", "data");
-            // last-modified is now (just created) — well within the threshold
-            assertFalse(checker.isReady(file));
-        }
-
-        @Test
-        @DisplayName("file settled for longer than threshold → ready")
-        void settled_ready() throws IOException {
-            config.setSettleTimeMillis(5_000);
-            Path file = realFile("old.pdf", "data");
-            setLastModifiedInPast(file, 10_000); // 10 s ago — older than 5 s threshold
-            assertTrue(checker.isReady(file));
-        }
-
-        @Test
-        @DisplayName("settle threshold of 0 ms passes any file")
-        void zeroThreshold_alwaysPasses() throws IOException {
-            config.setSettleTimeMillis(0);
-            Path file = realFile("instant.pdf", "data");
-            // last-modified is right now; 0 ms threshold means anything passes
-            assertTrue(checker.isReady(file));
-        }
-    }
-
-    // =========================================================================
-    // Check #5: size stability
-    // =========================================================================
-
-    @Nested
-    @DisplayName("size-stability check")
-    class SizeStability {
-
-        @Test
-        @DisplayName("size unchanged between two reads → ready")
-        void sizeStable_ready() throws IOException {
-            config.setSizeCheckDelayMillis(1);
-            Path file = realFile("stable.pdf", "fixed content");
-            setLastModifiedInPast(file, 60_000);
-            assertTrue(checker.isReady(file));
-        }
-
-        @Test
-        @DisplayName("size changes between two reads → not ready")
-        void sizeChanging_notReady() throws IOException {
-            config.setSizeCheckDelayMillis(1);
-            Path file = realFile("growing.pdf", "initial");
-            setLastModifiedInPast(file, 60_000);
-
-            // Use MockedStatic to control what Files.size() returns on each call
-            // while leaving all other Files.* methods intact.
-            AtomicInteger sizeCallCount = new AtomicInteger(0);
-            try (MockedStatic<Files> mockedFiles = mockStatic(Files.class, CALLS_REAL_METHODS)) {
-                mockedFiles
-                        .when(() -> Files.size(file))
-                        .thenAnswer(
-                                inv ->
-                                        sizeCallCount.incrementAndGet() == 1
-                                                ? 100L // first read: 100 bytes
-                                                : 200L); // second read: 200 bytes — changed!
-                assertFalse(checker.isReady(file));
-            }
-        }
-    }
-
-    // =========================================================================
-    // Check #6: file-lock check
-    // =========================================================================
-
-    @Nested
-    @DisplayName("file-lock check")
-    class FileLockCheck {
-
-        @Test
-        @DisplayName("file held open with exclusive lock by another thread → not ready")
-        void fileLocked_notReady() throws IOException, InterruptedException {
-            Path file = realFile("locked.pdf", "data");
-            setLastModifiedInPast(file, 60_000);
-
-            CountDownLatch lockAcquired = new CountDownLatch(1);
-            CountDownLatch testDone = new CountDownLatch(1);
-            AtomicInteger lockThreadFailed = new AtomicInteger(0);
-
-            Thread lockHolder =
-                    new Thread(
-                            () -> {
-                                try (RandomAccessFile raf =
-                                                new RandomAccessFile(file.toFile(), "rw");
-                                        FileChannel channel = raf.getChannel();
-                                        FileLock lock = channel.lock()) {
-                                    lockAcquired.countDown();
-                                    testDone.await(10, TimeUnit.SECONDS);
-                                } catch (Exception e) {
-                                    lockThreadFailed.set(1);
-                                    lockAcquired.countDown();
-                                }
-                            });
-            lockHolder.setDaemon(true);
-            lockHolder.start();
-            lockAcquired.await(5, TimeUnit.SECONDS);
-
-            try {
-                if (lockThreadFailed.get() == 0) {
-                    // Lock was successfully held — the checker must see it as locked.
-                    // On JVM, tryLock() from a second thread in the same process throws
-                    // OverlappingFileLockException (or returns null on some platforms), both of
-                    // which isLocked() maps to true.
-                    assertFalse(checker.isReady(file));
-                }
-                // If locking failed on this platform we simply skip the assertion rather than
-                // failing the build — the logic path is still exercised by other tests.
-            } finally {
-                testDone.countDown();
-                lockHolder.join(5_000);
-            }
-        }
-
-        @Test
-        @DisplayName("file with no external lock and all checks passing → ready")
-        void noLock_ready() throws IOException {
-            Path file = realFile("unlocked.pdf", "data");
-            setLastModifiedInPast(file, 60_000);
-            assertTrue(checker.isReady(file));
-        }
-    }
-
-    // =========================================================================
-    // Full happy-path integration
-    // =========================================================================
-
-    @Nested
-    @DisplayName("full happy path")
-    class HappyPath {
-
-        @Test
-        @DisplayName("all checks pass → ready")
-        void allChecksPass_ready() throws IOException {
-            config.setSettleTimeMillis(5_000);
-            config.setSizeCheckDelayMillis(1);
-            config.setAllowedExtensions(List.of("pdf"));
-
-            Path file = realFile("invoice.pdf", "PDF content");
-            setLastModifiedInPast(file, 10_000);
-
-            assertTrue(checker.isReady(file));
-        }
-
-        @Test
-        @DisplayName("first failing check short-circuits evaluation")
-        void shortCircuitsOnFirstFailure() throws IOException {
-            // Extension filter will reject — settle / size / lock checks must never run
-            config.setAllowedExtensions(List.of("pdf"));
-            config.setSettleTimeMillis(0);
-            config.setSizeCheckDelayMillis(1);
-
-            Path file = realFile("archive.zip", "ZIP data");
-            setLastModifiedInPast(file, 60_000);
-
-            assertFalse(checker.isReady(file));
-        }
-    }
-
-    // =========================================================================
-    // Helpers
-    // =========================================================================
-
-    private Path realFile(String name, String content) throws IOException {
-        Path file = tempDir.resolve(name);
-        Files.writeString(file, content);
-        return file;
-    }
-
-    /**
-     * Back-dates the last-modified time of {@code path} by {@code millisAgo} so that settle-time
-     * checks pass without actually waiting.
-     */
-    private void setLastModifiedInPast(Path path, long millisAgo) throws IOException {
-        Files.setLastModifiedTime(
-                path, FileTime.fromMillis(System.currentTimeMillis() - millisAgo));
-    }
-}
@@ -1,76 +0,0 @@
-package stirling.software.common.util;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-import org.junit.jupiter.api.Test;
-
-class FileToPdfTest {
-
-    @Test
-    void testSanitizeZipFilename_normalFilename() {
-        String result = FileToPdf.sanitizeZipFilename("document.html");
-        assertEquals("document.html", result);
-    }
-
-    @Test
-    void testSanitizeZipFilename_pathTraversal() {
-        String result = FileToPdf.sanitizeZipFilename("../../etc/passwd");
-        // Should remove ../ sequences
-        assertFalse(result.contains(".."), "Path traversal sequences should be removed");
-    }
-
-    @Test
-    void testSanitizeZipFilename_driveLetterRemoved() {
-        String result = FileToPdf.sanitizeZipFilename("C:\\Users\\test\\file.html");
-        assertFalse(result.startsWith("C:"), "Drive letter should be removed");
-    }
-
-    @Test
-    void testSanitizeZipFilename_backslashesNormalized() {
-        String result = FileToPdf.sanitizeZipFilename("path\\to\\file.html");
-        assertFalse(result.contains("\\"), "Backslashes should be normalized to forward slashes");
-        assertTrue(result.contains("/") || !result.contains("\\"));
-    }
-
-    @Test
-    void testSanitizeZipFilename_nullInput() {
-        String result = FileToPdf.sanitizeZipFilename(null);
-        assertEquals("", result, "Null input should return empty string");
-    }
-
-    @Test
-    void testSanitizeZipFilename_emptyInput() {
-        String result = FileToPdf.sanitizeZipFilename("");
-        assertEquals("", result, "Empty input should return empty string");
-    }
-
-    @Test
-    void testSanitizeZipFilename_whitespaceOnly() {
-        String result = FileToPdf.sanitizeZipFilename("   ");
-        assertEquals("", result, "Whitespace-only input should return empty string");
-    }
-
-    @Test
-    void testSanitizeZipFilename_leadingSlashes() {
-        String result = FileToPdf.sanitizeZipFilename("///path/to/file.html");
-        assertFalse(result.startsWith("/"), "Leading slashes should be removed");
-    }
-
-    @Test
-    void testSanitizeZipFilename_nestedDirectories() {
-        String result = FileToPdf.sanitizeZipFilename("dir1/dir2/file.html");
-        assertEquals("dir1/dir2/file.html", result, "Normal nested paths should be preserved");
-    }
-
-    @Test
-    void testSanitizeZipFilename_mixedTraversal() {
-        String result = FileToPdf.sanitizeZipFilename("dir/../../../etc/passwd");
-        assertFalse(result.contains(".."), "Mixed path traversal should be removed");
-    }
-
-    @Test
-    void testSanitizeZipFilename_backslashTraversal() {
-        String result = FileToPdf.sanitizeZipFilename("dir\\..\\..\\etc\\passwd");
-        assertFalse(result.contains(".."), "Backslash path traversal should be removed");
-    }
-}
@@ -1,163 +0,0 @@
-package stirling.software.common.util;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.pdmodel.interactive.form.PDAcroForm;
-import org.apache.pdfbox.pdmodel.interactive.form.PDCheckBox;
-import org.apache.pdfbox.pdmodel.interactive.form.PDComboBox;
-import org.apache.pdfbox.pdmodel.interactive.form.PDListBox;
-import org.apache.pdfbox.pdmodel.interactive.form.PDPushButton;
-import org.apache.pdfbox.pdmodel.interactive.form.PDRadioButton;
-import org.apache.pdfbox.pdmodel.interactive.form.PDSignatureField;
-import org.apache.pdfbox.pdmodel.interactive.form.PDTerminalField;
-import org.apache.pdfbox.pdmodel.interactive.form.PDTextField;
-import org.junit.jupiter.api.Test;
-
-class FormFieldTypeSupportTest {
-
-    @Test
-    void forField_withNull_returnsNull() {
-        assertNull(FormFieldTypeSupport.forField(null));
-    }
-
-    @Test
-    void forField_withTextField_returnsTEXT() {
-        try (PDDocument doc = new PDDocument()) {
-            PDAcroForm form = new PDAcroForm(doc);
-            PDTextField field = new PDTextField(form);
-            assertEquals(FormFieldTypeSupport.TEXT, FormFieldTypeSupport.forField(field));
-        } catch (Exception e) {
-            fail("Unexpected exception: " + e.getMessage());
-        }
-    }
-
-    @Test
-    void forField_withCheckBox_returnsCHECKBOX() {
-        try (PDDocument doc = new PDDocument()) {
-            PDAcroForm form = new PDAcroForm(doc);
-            PDCheckBox field = new PDCheckBox(form);
-            assertEquals(FormFieldTypeSupport.CHECKBOX, FormFieldTypeSupport.forField(field));
-        } catch (Exception e) {
-            fail("Unexpected exception: " + e.getMessage());
-        }
-    }
-
-    @Test
-    void forField_withRadioButton_returnsRADIO() {
-        try (PDDocument doc = new PDDocument()) {
-            PDAcroForm form = new PDAcroForm(doc);
-            PDRadioButton field = new PDRadioButton(form);
-            assertEquals(FormFieldTypeSupport.RADIO, FormFieldTypeSupport.forField(field));
-        } catch (Exception e) {
-            fail("Unexpected exception: " + e.getMessage());
-        }
-    }
-
-    @Test
-    void forField_withComboBox_returnsCOMBOBOX() {
-        try (PDDocument doc = new PDDocument()) {
-            PDAcroForm form = new PDAcroForm(doc);
-            PDComboBox field = new PDComboBox(form);
-            assertEquals(FormFieldTypeSupport.COMBOBOX, FormFieldTypeSupport.forField(field));
-        } catch (Exception e) {
-            fail("Unexpected exception: " + e.getMessage());
-        }
-    }
-
-    @Test
-    void forField_withListBox_returnsLISTBOX() {
-        try (PDDocument doc = new PDDocument()) {
-            PDAcroForm form = new PDAcroForm(doc);
-            PDListBox field = new PDListBox(form);
-            assertEquals(FormFieldTypeSupport.LISTBOX, FormFieldTypeSupport.forField(field));
-        } catch (Exception e) {
-            fail("Unexpected exception: " + e.getMessage());
-        }
-    }
-
-    @Test
-    void forField_withSignatureField_returnsSIGNATURE() {
-        try (PDDocument doc = new PDDocument()) {
-            PDAcroForm form = new PDAcroForm(doc);
-            PDSignatureField field = new PDSignatureField(form);
-            assertEquals(FormFieldTypeSupport.SIGNATURE, FormFieldTypeSupport.forField(field));
-        } catch (Exception e) {
-            fail("Unexpected exception: " + e.getMessage());
-        }
-    }
-
-    @Test
-    void forField_withPushButton_returnsBUTTON() {
-        try (PDDocument doc = new PDDocument()) {
-            PDAcroForm form = new PDAcroForm(doc);
-            PDPushButton field = new PDPushButton(form);
-            assertEquals(FormFieldTypeSupport.BUTTON, FormFieldTypeSupport.forField(field));
-        } catch (Exception e) {
-            fail("Unexpected exception: " + e.getMessage());
-        }
-    }
-
-    @Test
-    void forTypeName_withValidNames_returnsCorrectEnum() {
-        assertEquals(FormFieldTypeSupport.TEXT, FormFieldTypeSupport.forTypeName("text"));
-        assertEquals(FormFieldTypeSupport.CHECKBOX, FormFieldTypeSupport.forTypeName("checkbox"));
-        assertEquals(FormFieldTypeSupport.RADIO, FormFieldTypeSupport.forTypeName("radio"));
-        assertEquals(FormFieldTypeSupport.COMBOBOX, FormFieldTypeSupport.forTypeName("combobox"));
-        assertEquals(FormFieldTypeSupport.LISTBOX, FormFieldTypeSupport.forTypeName("listbox"));
-        assertEquals(FormFieldTypeSupport.SIGNATURE, FormFieldTypeSupport.forTypeName("signature"));
-        assertEquals(FormFieldTypeSupport.BUTTON, FormFieldTypeSupport.forTypeName("button"));
-    }
-
-    @Test
-    void forTypeName_withNull_returnsNull() {
-        assertNull(FormFieldTypeSupport.forTypeName(null));
-    }
-
-    @Test
-    void forTypeName_withUnknown_returnsNull() {
-        assertNull(FormFieldTypeSupport.forTypeName("unknown"));
-    }
-
-    @Test
-    void doesNotSupportsDefinitionCreation_textReturnsFalse() {
-        assertFalse(FormFieldTypeSupport.TEXT.doesNotsupportsDefinitionCreation());
-    }
-
-    @Test
-    void doesNotSupportsDefinitionCreation_radioReturnsTrue() {
-        assertTrue(FormFieldTypeSupport.RADIO.doesNotsupportsDefinitionCreation());
-    }
-
-    @Test
-    void doesNotSupportsDefinitionCreation_signatureReturnsTrue() {
-        assertTrue(FormFieldTypeSupport.SIGNATURE.doesNotsupportsDefinitionCreation());
-    }
-
-    @Test
-    void doesNotSupportsDefinitionCreation_buttonReturnsTrue() {
-        assertTrue(FormFieldTypeSupport.BUTTON.doesNotsupportsDefinitionCreation());
-    }
-
-    @Test
-    void createField_text_returnsPDTextField() {
-        try (PDDocument doc = new PDDocument()) {
-            PDAcroForm form = new PDAcroForm(doc);
-            PDTerminalField field = FormFieldTypeSupport.TEXT.createField(form);
-            assertInstanceOf(PDTextField.class, field);
-        } catch (Exception e) {
-            fail("Unexpected exception: " + e.getMessage());
-        }
-    }
-
-    @Test
-    void createField_checkbox_returnsPDCheckBox() {
-        try (PDDocument doc = new PDDocument()) {
-            PDAcroForm form = new PDAcroForm(doc);
-            PDTerminalField field = FormFieldTypeSupport.CHECKBOX.createField(form);
-            assertInstanceOf(PDCheckBox.class, field);
-        } catch (Exception e) {
-            fail("Unexpected exception: " + e.getMessage());
-        }
-    }
-}
@@ -1,359 +0,0 @@
-package stirling.software.common.util;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-import java.io.IOException;
-import java.time.Duration;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.pdmodel.PDPage;
-import org.apache.pdfbox.pdmodel.PDResources;
-import org.apache.pdfbox.pdmodel.common.PDRectangle;
-import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotationWidget;
-import org.apache.pdfbox.pdmodel.interactive.form.PDAcroForm;
-import org.apache.pdfbox.pdmodel.interactive.form.PDCheckBox;
-import org.apache.pdfbox.pdmodel.interactive.form.PDTextField;
-import org.junit.jupiter.api.Test;
-
-class FormUtilsAdditionalTest {
-
-    private record SetupDocument(PDPage page, PDAcroForm acroForm) {}
-
-    private static SetupDocument createBasicDocument(PDDocument document) throws IOException {
-        PDPage page = new PDPage();
-        document.addPage(page);
-
-        PDAcroForm acroForm = new PDAcroForm(document);
-        acroForm.setDefaultResources(new PDResources());
-        acroForm.setNeedAppearances(true);
-        document.getDocumentCatalog().setAcroForm(acroForm);
-
-        return new SetupDocument(page, acroForm);
-    }
-
-    private static void attachWidget(
-            SetupDocument setup,
-            org.apache.pdfbox.pdmodel.interactive.form.PDTerminalField field,
-            PDRectangle rectangle)
-            throws IOException {
-        PDAnnotationWidget widget = new PDAnnotationWidget();
-        widget.setRectangle(rectangle);
-        widget.setPage(setup.page);
-        List<PDAnnotationWidget> widgets = new ArrayList<>(field.getWidgets());
-        widgets.add(widget);
-        field.setWidgets(widgets);
-        setup.acroForm.getFields().add(field);
-        setup.page.getAnnotations().add(widget);
-    }
-
-    // --- detectFieldType ---
-
-    @Test
-    void testDetectFieldType_textField() throws IOException {
-        try (PDDocument doc = new PDDocument()) {
-            SetupDocument setup = createBasicDocument(doc);
-            PDTextField field = new PDTextField(setup.acroForm);
-            assertEquals("text", FormUtils.detectFieldType(field));
-        }
-    }
-
-    @Test
-    void testDetectFieldType_checkBox() throws IOException {
-        try (PDDocument doc = new PDDocument()) {
-            SetupDocument setup = createBasicDocument(doc);
-            PDCheckBox field = new PDCheckBox(setup.acroForm);
-            assertEquals("checkbox", FormUtils.detectFieldType(field));
-        }
-    }
-
-    // --- extractFormFields ---
-
-    @Test
-    void testExtractFormFields_nullDocument() {
-        List<FormUtils.FormFieldInfo> fields = FormUtils.extractFormFields(null);
-        assertTrue(fields.isEmpty());
-    }
-
-    @Test
-    void testExtractFormFields_noAcroForm() throws IOException {
-        try (PDDocument doc = new PDDocument()) {
-            doc.addPage(new PDPage());
-            // No AcroForm set
-            List<FormUtils.FormFieldInfo> fields = FormUtils.extractFormFields(doc);
-            assertTrue(fields.isEmpty());
-        }
-    }
-
-    @Test
-    void testExtractFormFields_singleTextField() throws IOException {
-        try (PDDocument doc = new PDDocument()) {
-            SetupDocument setup = createBasicDocument(doc);
-            PDTextField textField = new PDTextField(setup.acroForm);
-            textField.setPartialName("firstName");
-            attachWidget(setup, textField, new PDRectangle(50, 700, 200, 20));
-
-            List<FormUtils.FormFieldInfo> fields = FormUtils.extractFormFields(doc);
-            assertEquals(1, fields.size());
-            assertEquals("firstName", fields.get(0).name());
-            assertEquals("text", fields.get(0).type());
-            assertEquals(0, fields.get(0).pageIndex());
-        }
-    }
-
-    @Test
-    void testExtractFormFields_multipleFields() throws IOException {
-        try (PDDocument doc = new PDDocument()) {
-            SetupDocument setup = createBasicDocument(doc);
-
-            PDTextField field1 = new PDTextField(setup.acroForm);
-            field1.setPartialName("name");
-            attachWidget(setup, field1, new PDRectangle(50, 700, 200, 20));
-
-            PDTextField field2 = new PDTextField(setup.acroForm);
-            field2.setPartialName("email");
-            attachWidget(setup, field2, new PDRectangle(50, 660, 200, 20));
-
-            List<FormUtils.FormFieldInfo> fields = FormUtils.extractFormFields(doc);
-            assertEquals(2, fields.size());
-        }
-    }
-
-    // --- buildFillTemplateRecord ---
-
-    @Test
-    void testBuildFillTemplateRecord_null() {
-        Map<String, Object> result = FormUtils.buildFillTemplateRecord(null);
-        assertTrue(result.isEmpty());
-    }
-
-    @Test
-    void testBuildFillTemplateRecord_empty() {
-        Map<String, Object> result = FormUtils.buildFillTemplateRecord(Collections.emptyList());
-        assertTrue(result.isEmpty());
-    }
-
-    @Test
-    void testBuildFillTemplateRecord_textField() {
-        FormUtils.FormFieldInfo info =
-                new FormUtils.FormFieldInfo(
-                        "name", "Name", "text", "John", null, false, 0, false, null, 0);
-        Map<String, Object> result = FormUtils.buildFillTemplateRecord(List.of(info));
-        assertEquals("John", result.get("name"));
-    }
-
-    @Test
-    void testBuildFillTemplateRecord_checkboxField() {
-        FormUtils.FormFieldInfo info =
-                new FormUtils.FormFieldInfo(
-                        "agree", "Agreement", "checkbox", "Yes", null, false, 0, false, null, 0);
-        Map<String, Object> result = FormUtils.buildFillTemplateRecord(List.of(info));
-        assertEquals(Boolean.TRUE, result.get("agree"));
-    }
-
-    @Test
-    void testBuildFillTemplateRecord_checkboxFieldOff() {
-        FormUtils.FormFieldInfo info =
-                new FormUtils.FormFieldInfo(
-                        "agree", "Agreement", "checkbox", "Off", null, false, 0, false, null, 0);
-        Map<String, Object> result = FormUtils.buildFillTemplateRecord(List.of(info));
-        assertEquals(Boolean.FALSE, result.get("agree"));
-    }
-
-    @Test
-    void testBuildFillTemplateRecord_skipsButton() {
-        FormUtils.FormFieldInfo info =
-                new FormUtils.FormFieldInfo(
-                        "submit", "Submit", "button", null, null, false, 0, false, null, 0);
-        Map<String, Object> result = FormUtils.buildFillTemplateRecord(List.of(info));
-        assertFalse(result.containsKey("submit"));
-    }
-
-    @Test
-    void testBuildFillTemplateRecord_skipsSignature() {
-        FormUtils.FormFieldInfo info =
-                new FormUtils.FormFieldInfo(
-                        "sig", "Signature", "signature", null, null, false, 0, false, null, 0);
-        Map<String, Object> result = FormUtils.buildFillTemplateRecord(List.of(info));
-        assertFalse(result.containsKey("sig"));
-    }
-
-    // --- safeValue ---
-
-    @Test
-    void testSafeValue_nonNull() {
-        assertEquals("hello", FormUtils.safeValue("hello"));
-    }
-
-    @Test
-    void testSafeValue_null() {
-        assertEquals("", FormUtils.safeValue(null));
-    }
-
-    // --- applyFieldValues ---
-
-    @Test
-    void testApplyFieldValues_nullDocument() throws IOException {
-        // Should not throw
-        FormUtils.applyFieldValues(null, Map.of("key", "value"), false);
-    }
-
-    @Test
-    void testApplyFieldValues_noAcroFormStrict() throws IOException {
-        try (PDDocument doc = new PDDocument()) {
-            doc.addPage(new PDPage());
-            assertThrows(
-                    IOException.class,
-                    () -> FormUtils.applyFieldValues(doc, Map.of("key", "val"), false, true));
-        }
-    }
-
-    @Test
-    void testApplyFieldValues_noAcroFormNonStrict() throws IOException {
-        try (PDDocument doc = new PDDocument()) {
-            doc.addPage(new PDPage());
-            // Should not throw in non-strict mode
-            FormUtils.applyFieldValues(doc, Map.of("key", "val"), false, false);
-        }
-    }
-
-    @Test
-    void testApplyFieldValues_setsTextValue() throws IOException {
-        try (PDDocument doc = new PDDocument()) {
-            SetupDocument setup = createBasicDocument(doc);
-            PDTextField textField = new PDTextField(setup.acroForm);
-            textField.setPartialName("company");
-            attachWidget(setup, textField, new PDRectangle(60, 720, 220, 20));
-
-            FormUtils.applyFieldValues(doc, Map.of("company", "Stirling"), false);
-            assertEquals("Stirling", textField.getValueAsString());
-        }
-    }
-
-    @Test
-    void testApplyFieldValues_checksCheckbox_nonStrict() throws IOException {
-        // In non-strict mode, checkbox state changes may fail silently
-        // if appearance streams are not properly configured. Just verify no exception.
-        try (PDDocument doc = new PDDocument()) {
-            SetupDocument setup = createBasicDocument(doc);
-            PDCheckBox checkBox = new PDCheckBox(setup.acroForm);
-            checkBox.setPartialName("subscribed");
-            checkBox.setExportValues(List.of("Yes"));
-            attachWidget(setup, checkBox, new PDRectangle(60, 680, 16, 16));
-
-            // Should not throw in non-strict mode even if appearance is missing
-            FormUtils.applyFieldValues(doc, Map.of("subscribed", true), false, false);
-            FormUtils.applyFieldValues(doc, Map.of("subscribed", false), false, false);
-        }
-    }
-
-    // Regression: PDFBOX-5962. Flattening with an empty values map used to force
-    // setNeedAppearances(true), triggering PDFBox's refreshAppearances loop which
-    // could hang indefinitely. The call must complete quickly and clear form fields.
-    @Test
-    void testApplyFieldValues_emptyValuesWithFlatten_completesAndFlattens() throws IOException {
-        try (PDDocument doc = new PDDocument()) {
-            SetupDocument setup = createBasicDocument(doc);
-            PDTextField textField = new PDTextField(setup.acroForm);
-            textField.setPartialName("company");
-            attachWidget(setup, textField, new PDRectangle(60, 720, 220, 20));
-
-            assertTrue(setup.acroForm.getNeedAppearances());
-
-            assertTimeoutPreemptively(
-                    Duration.ofSeconds(10),
-                    () -> FormUtils.applyFieldValues(doc, Map.of(), true, false));
-
-            PDAcroForm after = doc.getDocumentCatalog().getAcroForm();
-            assertTrue(after == null || after.getFields().isEmpty());
-        }
-    }
-
-    @Test
-    void testApplyFieldValues_nullValuesWithFlatten_completesAndFlattens() throws IOException {
-        try (PDDocument doc = new PDDocument()) {
-            SetupDocument setup = createBasicDocument(doc);
-            PDTextField textField = new PDTextField(setup.acroForm);
-            textField.setPartialName("company");
-            attachWidget(setup, textField, new PDRectangle(60, 720, 220, 20));
-
-            assertTimeoutPreemptively(
-                    Duration.ofSeconds(10),
-                    () -> FormUtils.applyFieldValues(doc, null, true, false));
-
-            PDAcroForm after = doc.getDocumentCatalog().getAcroForm();
-            assertTrue(after == null || after.getFields().isEmpty());
-        }
-    }
-
-    @Test
-    void testApplyFieldValues_valuesWithFlatten_appliesValueAndFlattens() throws IOException {
-        try (PDDocument doc = new PDDocument()) {
-            SetupDocument setup = createBasicDocument(doc);
-            PDTextField textField = new PDTextField(setup.acroForm);
-            textField.setPartialName("company");
-            attachWidget(setup, textField, new PDRectangle(60, 720, 220, 20));
-
-            FormUtils.applyFieldValues(doc, Map.of("company", "Stirling"), true, false);
-
-            PDAcroForm after = doc.getDocumentCatalog().getAcroForm();
-            assertTrue(after == null || after.getFields().isEmpty());
-        }
-    }
-
-    // --- filterSingleChoiceSelection ---
-
-    @Test
-    void testFilterSingleChoiceSelection_validSelection() {
-        String result =
-                FormUtils.filterSingleChoiceSelection(
-                        "Option A", List.of("Option A", "Option B"), "field1");
-        assertEquals("Option A", result);
-    }
-
-    @Test
-    void testFilterSingleChoiceSelection_invalidSelection() {
-        String result =
-                FormUtils.filterSingleChoiceSelection(
-                        "Invalid", List.of("Option A", "Option B"), "field1");
-        assertNull(result);
-    }
-
-    @Test
-    void testFilterSingleChoiceSelection_nullSelection() {
-        String result = FormUtils.filterSingleChoiceSelection(null, List.of("Option A"), "field1");
-        assertNull(result);
-    }
-
-    @Test
-    void testFilterSingleChoiceSelection_emptySelection() {
-        String result = FormUtils.filterSingleChoiceSelection("  ", List.of("Option A"), "field1");
-        assertNull(result);
-    }
-
-    // --- extractFieldsWithTemplate ---
-
-    @Test
-    void testExtractFieldsWithTemplate_emptyDocument() throws IOException {
-        try (PDDocument doc = new PDDocument()) {
-            doc.addPage(new PDPage());
-            FormUtils.FormFieldExtraction extraction = FormUtils.extractFieldsWithTemplate(doc);
-            assertNotNull(extraction);
-            assertTrue(extraction.fields().isEmpty());
-            assertTrue(extraction.template().isEmpty());
-        }
-    }
-
-    // --- hasAnyRotatedPage ---
-
-    @Test
-    void testHasAnyRotatedPage_noRotation() throws IOException {
-        try (PDDocument doc = new PDDocument()) {
-            doc.addPage(new PDPage());
-            assertFalse(FormUtils.hasAnyRotatedPage(doc));
-        }
-    }
-}
@@ -1,97 +0,0 @@
-package stirling.software.common.util;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.pdmodel.PDPage;
-import org.junit.jupiter.api.Test;
-
-class GeneralFormCopyUtilsTest {
-
-    @Test
-    void hasAnyRotatedPage_noRotation_returnsFalse() throws Exception {
-        try (PDDocument doc = new PDDocument()) {
-            doc.addPage(new PDPage());
-            doc.addPage(new PDPage());
-            assertFalse(GeneralFormCopyUtils.hasAnyRotatedPage(doc));
-        }
-    }
-
-    @Test
-    void hasAnyRotatedPage_with90Rotation_returnsTrue() throws Exception {
-        try (PDDocument doc = new PDDocument()) {
-            PDPage page = new PDPage();
-            page.setRotation(90);
-            doc.addPage(page);
-            assertTrue(GeneralFormCopyUtils.hasAnyRotatedPage(doc));
-        }
-    }
-
-    @Test
-    void hasAnyRotatedPage_with180Rotation_returnsTrue() throws Exception {
-        try (PDDocument doc = new PDDocument()) {
-            PDPage page = new PDPage();
-            page.setRotation(180);
-            doc.addPage(page);
-            assertTrue(GeneralFormCopyUtils.hasAnyRotatedPage(doc));
-        }
-    }
-
-    @Test
-    void hasAnyRotatedPage_with360Rotation_returnsFalse() throws Exception {
-        try (PDDocument doc = new PDDocument()) {
-            PDPage page = new PDPage();
-            page.setRotation(360);
-            doc.addPage(page);
-            assertFalse(GeneralFormCopyUtils.hasAnyRotatedPage(doc));
-        }
-    }
-
-    @Test
-    void hasAnyRotatedPage_emptyDocument_returnsFalse() throws Exception {
-        try (PDDocument doc = new PDDocument()) {
-            assertFalse(GeneralFormCopyUtils.hasAnyRotatedPage(doc));
-        }
-    }
-
-    @Test
-    void hasAnyRotatedPage_mixedPages_returnsTrue() throws Exception {
-        try (PDDocument doc = new PDDocument()) {
-            doc.addPage(new PDPage());
-            PDPage rotated = new PDPage();
-            rotated.setRotation(270);
-            doc.addPage(rotated);
-            assertTrue(GeneralFormCopyUtils.hasAnyRotatedPage(doc));
-        }
-    }
-
-    @Test
-    void copyAndTransformFormFields_noAcroForm_doesNotThrow() throws Exception {
-        try (PDDocument source = new PDDocument();
-                PDDocument target = new PDDocument()) {
-            source.addPage(new PDPage());
-            target.addPage(new PDPage());
-            // No acro form set on source - should simply return without error
-            assertDoesNotThrow(
-                    () ->
-                            GeneralFormCopyUtils.copyAndTransformFormFields(
-                                    source, target, 1, 1, 1, 1, 612f, 792f));
-        }
-    }
-
-    @Test
-    void copyAndTransformFormFields_emptyAcroForm_doesNotThrow() throws Exception {
-        try (PDDocument source = new PDDocument();
-                PDDocument target = new PDDocument()) {
-            source.addPage(new PDPage());
-            target.addPage(new PDPage());
-            // Empty acro form
-            var acroForm = new org.apache.pdfbox.pdmodel.interactive.form.PDAcroForm(source);
-            source.getDocumentCatalog().setAcroForm(acroForm);
-            assertDoesNotThrow(
-                    () ->
-                            GeneralFormCopyUtils.copyAndTransformFormFields(
-                                    source, target, 1, 1, 1, 1, 612f, 792f));
-        }
-    }
-}
@@ -1,147 +0,0 @@
-package stirling.software.common.util;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.pdmodel.interactive.form.PDAcroForm;
-import org.apache.pdfbox.pdmodel.interactive.form.PDCheckBox;
-import org.apache.pdfbox.pdmodel.interactive.form.PDComboBox;
-import org.apache.pdfbox.pdmodel.interactive.form.PDListBox;
-import org.apache.pdfbox.pdmodel.interactive.form.PDPushButton;
-import org.apache.pdfbox.pdmodel.interactive.form.PDRadioButton;
-import org.apache.pdfbox.pdmodel.interactive.form.PDSignatureField;
-import org.apache.pdfbox.pdmodel.interactive.form.PDTerminalField;
-import org.apache.pdfbox.pdmodel.interactive.form.PDTextField;
-import org.junit.jupiter.api.Test;
-
-class GeneralFormFieldTypeSupportTest {
-
-    @Test
-    void forField_withNull_returnsNull() {
-        assertNull(GeneralFormFieldTypeSupport.forField(null));
-    }
-
-    @Test
-    void forField_withTextField_returnsTEXT() throws Exception {
-        try (PDDocument doc = new PDDocument()) {
-            PDAcroForm form = new PDAcroForm(doc);
-            PDTextField field = new PDTextField(form);
-            assertEquals(
-                    GeneralFormFieldTypeSupport.TEXT, GeneralFormFieldTypeSupport.forField(field));
-        }
-    }
-
-    @Test
-    void forField_withCheckBox_returnsCHECKBOX() throws Exception {
-        try (PDDocument doc = new PDDocument()) {
-            PDAcroForm form = new PDAcroForm(doc);
-            PDCheckBox field = new PDCheckBox(form);
-            assertEquals(
-                    GeneralFormFieldTypeSupport.CHECKBOX,
-                    GeneralFormFieldTypeSupport.forField(field));
-        }
-    }
-
-    @Test
-    void forField_withRadioButton_returnsRADIO() throws Exception {
-        try (PDDocument doc = new PDDocument()) {
-            PDAcroForm form = new PDAcroForm(doc);
-            PDRadioButton field = new PDRadioButton(form);
-            assertEquals(
-                    GeneralFormFieldTypeSupport.RADIO, GeneralFormFieldTypeSupport.forField(field));
-        }
-    }
-
-    @Test
-    void forField_withComboBox_returnsCOMBOBOX() throws Exception {
-        try (PDDocument doc = new PDDocument()) {
-            PDAcroForm form = new PDAcroForm(doc);
-            PDComboBox field = new PDComboBox(form);
-            assertEquals(
-                    GeneralFormFieldTypeSupport.COMBOBOX,
-                    GeneralFormFieldTypeSupport.forField(field));
-        }
-    }
-
-    @Test
-    void forField_withListBox_returnsLISTBOX() throws Exception {
-        try (PDDocument doc = new PDDocument()) {
-            PDAcroForm form = new PDAcroForm(doc);
-            PDListBox field = new PDListBox(form);
-            assertEquals(
-                    GeneralFormFieldTypeSupport.LISTBOX,
-                    GeneralFormFieldTypeSupport.forField(field));
-        }
-    }
-
-    @Test
-    void forField_withSignatureField_returnsSIGNATURE() throws Exception {
-        try (PDDocument doc = new PDDocument()) {
-            PDAcroForm form = new PDAcroForm(doc);
-            PDSignatureField field = new PDSignatureField(form);
-            assertEquals(
-                    GeneralFormFieldTypeSupport.SIGNATURE,
-                    GeneralFormFieldTypeSupport.forField(field));
-        }
-    }
-
-    @Test
-    void forField_withPushButton_returnsBUTTON() throws Exception {
-        try (PDDocument doc = new PDDocument()) {
-            PDAcroForm form = new PDAcroForm(doc);
-            PDPushButton field = new PDPushButton(form);
-            assertEquals(
-                    GeneralFormFieldTypeSupport.BUTTON,
-                    GeneralFormFieldTypeSupport.forField(field));
-        }
-    }
-
-    @Test
-    void createField_text_returnsPDTextField() throws Exception {
-        try (PDDocument doc = new PDDocument()) {
-            PDAcroForm form = new PDAcroForm(doc);
-            PDTerminalField field = GeneralFormFieldTypeSupport.TEXT.createField(form);
-            assertInstanceOf(PDTextField.class, field);
-        }
-    }
-
-    @Test
-    void createField_checkbox_returnsPDCheckBox() throws Exception {
-        try (PDDocument doc = new PDDocument()) {
-            PDAcroForm form = new PDAcroForm(doc);
-            PDTerminalField field = GeneralFormFieldTypeSupport.CHECKBOX.createField(form);
-            assertInstanceOf(PDCheckBox.class, field);
-        }
-    }
-
-    @Test
-    void createField_signature_returnsPDSignatureField() throws Exception {
-        try (PDDocument doc = new PDDocument()) {
-            PDAcroForm form = new PDAcroForm(doc);
-            PDTerminalField field = GeneralFormFieldTypeSupport.SIGNATURE.createField(form);
-            assertInstanceOf(PDSignatureField.class, field);
-        }
-    }
-
-    @Test
-    void typeName_returnsExpectedValues() {
-        assertEquals("text", GeneralFormFieldTypeSupport.TEXT.typeName());
-        assertEquals("checkbox", GeneralFormFieldTypeSupport.CHECKBOX.typeName());
-        assertEquals("radio", GeneralFormFieldTypeSupport.RADIO.typeName());
-        assertEquals("combobox", GeneralFormFieldTypeSupport.COMBOBOX.typeName());
-        assertEquals("listbox", GeneralFormFieldTypeSupport.LISTBOX.typeName());
-        assertEquals("signature", GeneralFormFieldTypeSupport.SIGNATURE.typeName());
-        assertEquals("button", GeneralFormFieldTypeSupport.BUTTON.typeName());
-    }
-
-    @Test
-    void fallbackWidgetName_returnsExpectedValues() {
-        assertEquals("textField", GeneralFormFieldTypeSupport.TEXT.fallbackWidgetName());
-        assertEquals("checkBox", GeneralFormFieldTypeSupport.CHECKBOX.fallbackWidgetName());
-        assertEquals("radioButton", GeneralFormFieldTypeSupport.RADIO.fallbackWidgetName());
-        assertEquals("comboBox", GeneralFormFieldTypeSupport.COMBOBOX.fallbackWidgetName());
-        assertEquals("listBox", GeneralFormFieldTypeSupport.LISTBOX.fallbackWidgetName());
-        assertEquals("signature", GeneralFormFieldTypeSupport.SIGNATURE.fallbackWidgetName());
-        assertEquals("pushButton", GeneralFormFieldTypeSupport.BUTTON.fallbackWidgetName());
-    }
-}
@@ -1,111 +0,0 @@
-package stirling.software.common.util;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-import java.awt.Color;
-import java.awt.Graphics2D;
-import java.awt.image.BufferedImage;
-import java.awt.image.DataBufferByte;
-import java.awt.image.DataBufferInt;
-
-import org.junit.jupiter.api.Test;
-
-class ImageProcessingUtilsTest {
-
-    @Test
-    void convertColorType_greyscale_returnsGrayscaleImage() {
-        BufferedImage source = new BufferedImage(10, 10, BufferedImage.TYPE_INT_RGB);
-        BufferedImage result = ImageProcessingUtils.convertColorType(source, "greyscale");
-        assertEquals(BufferedImage.TYPE_BYTE_GRAY, result.getType());
-        assertEquals(10, result.getWidth());
-        assertEquals(10, result.getHeight());
-    }
-
-    @Test
-    void convertColorType_blackwhite_returnsBinaryImage() {
-        BufferedImage source = new BufferedImage(10, 10, BufferedImage.TYPE_INT_RGB);
-        BufferedImage result = ImageProcessingUtils.convertColorType(source, "blackwhite");
-        assertEquals(BufferedImage.TYPE_BYTE_BINARY, result.getType());
-    }
-
-    @Test
-    void convertColorType_fullColor_returnsSameImage() {
-        BufferedImage source = new BufferedImage(10, 10, BufferedImage.TYPE_INT_RGB);
-        BufferedImage result = ImageProcessingUtils.convertColorType(source, "fullcolor");
-        assertSame(source, result);
-    }
-
-    @Test
-    void convertColorType_unknownType_returnsSameImage() {
-        BufferedImage source = new BufferedImage(10, 10, BufferedImage.TYPE_INT_RGB);
-        BufferedImage result = ImageProcessingUtils.convertColorType(source, "something_else");
-        assertSame(source, result);
-    }
-
-    @Test
-    void getImageData_byteBuffer_returnsCorrectData() {
-        BufferedImage image = new BufferedImage(2, 2, BufferedImage.TYPE_BYTE_GRAY);
-        byte[] data = ImageProcessingUtils.getImageData(image);
-        assertNotNull(data);
-        assertTrue(data instanceof byte[]);
-        // TYPE_BYTE_GRAY uses DataBufferByte
-        assertTrue(image.getRaster().getDataBuffer() instanceof DataBufferByte);
-    }
-
-    @Test
-    void getImageData_intBuffer_returnsCorrectLength() {
-        BufferedImage image = new BufferedImage(2, 2, BufferedImage.TYPE_INT_RGB);
-        // TYPE_INT_RGB uses DataBufferInt
-        assertTrue(image.getRaster().getDataBuffer() instanceof DataBufferInt);
-        byte[] data = ImageProcessingUtils.getImageData(image);
-        assertNotNull(data);
-        // 2x2 pixels, 4 bytes per int
-        assertEquals(2 * 2 * 4, data.length);
-    }
-
-    @Test
-    void getImageData_ushortBuffer_returnsRGBData() {
-        // TYPE_USHORT_GRAY uses DataBufferUShort which hits the else branch
-        BufferedImage image = new BufferedImage(2, 2, BufferedImage.TYPE_USHORT_GRAY);
-        byte[] data = ImageProcessingUtils.getImageData(image);
-        assertNotNull(data);
-        // 2x2 pixels, 3 bytes per pixel (RGB)
-        assertEquals(2 * 2 * 3, data.length);
-    }
-
-    @Test
-    void applyOrientation_zeroRotation_returnsSameImage() {
-        BufferedImage image = new BufferedImage(10, 20, BufferedImage.TYPE_INT_RGB);
-        BufferedImage result = ImageProcessingUtils.applyOrientation(image, 0);
-        assertSame(image, result);
-    }
-
-    @Test
-    void applyOrientation_90degrees_returnsRotatedImage() {
-        BufferedImage image = new BufferedImage(10, 20, BufferedImage.TYPE_INT_RGB);
-        Graphics2D g = image.createGraphics();
-        g.setColor(Color.RED);
-        g.fillRect(0, 0, 10, 20);
-        g.dispose();
-
-        BufferedImage result = ImageProcessingUtils.applyOrientation(image, 90);
-        assertNotNull(result);
-        // The rotated image should have non-zero dimensions
-        assertTrue(result.getWidth() > 0);
-        assertTrue(result.getHeight() > 0);
-    }
-
-    @Test
-    void applyOrientation_180degrees_returnsRotatedImage() {
-        BufferedImage image = new BufferedImage(10, 10, BufferedImage.TYPE_INT_RGB);
-        BufferedImage result = ImageProcessingUtils.applyOrientation(image, 180);
-        assertNotNull(result);
-    }
-
-    @Test
-    void applyOrientation_270degrees_returnsRotatedImage() {
-        BufferedImage image = new BufferedImage(10, 20, BufferedImage.TYPE_INT_RGB);
-        BufferedImage result = ImageProcessingUtils.applyOrientation(image, 270);
-        assertNotNull(result);
-    }
-}
@@ -1,49 +0,0 @@
-package stirling.software.common.util;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-import java.nio.file.Path;
-
-import org.junit.jupiter.api.Test;
-
-class JarPathUtilTest {
-
-    @Test
-    void currentJar_notRunningFromJar_returnsNull() {
-        // When running tests from IDE/Gradle, we are not in a JAR
-        Path result = JarPathUtil.currentJar();
-        assertNull(result, "Should return null when not running from a JAR file");
-    }
-
-    @Test
-    void restartHelperJar_notFound_returnsNull() {
-        // Since we're not running from JAR and restart-helper.jar likely doesn't exist
-        Path result = JarPathUtil.restartHelperJar();
-        assertNull(result, "Should return null when restart-helper.jar is not found");
-    }
-
-    @Test
-    void javaExecutable_returnsNonNullPath() {
-        String result = JarPathUtil.javaExecutable();
-        assertNotNull(result);
-        assertTrue(result.contains("java"), "Should contain 'java' in the path");
-        assertTrue(result.contains("bin"), "Should contain 'bin' in the path");
-    }
-
-    @Test
-    void javaExecutable_containsJavaHome() {
-        String javaHome = System.getProperty("java.home");
-        String result = JarPathUtil.javaExecutable();
-        assertTrue(result.startsWith(javaHome), "Should start with java.home system property");
-    }
-
-    @Test
-    void javaExecutable_windowsHasExeExtension() {
-        String result = JarPathUtil.javaExecutable();
-        if (System.getProperty("os.name").toLowerCase().contains("win")) {
-            assertTrue(result.endsWith(".exe"), "On Windows, should end with .exe");
-        } else {
-            assertFalse(result.endsWith(".exe"), "On non-Windows, should not end with .exe");
-        }
-    }
-}
@@ -1,62 +0,0 @@
-package stirling.software.common.util;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Test;
-
-class JobContextTest {
-
-    @AfterEach
-    void cleanup() {
-        JobContext.clear();
-    }
-
-    @Test
-    @DisplayName("should return null when no job ID is set")
-    void returnsNullByDefault() {
-        assertNull(JobContext.getJobId());
-    }
-
-    @Test
-    @DisplayName("should store and retrieve job ID")
-    void setAndGet() {
-        JobContext.setJobId("job-123");
-        assertEquals("job-123", JobContext.getJobId());
-    }
-
-    @Test
-    @DisplayName("should clear job ID")
-    void clearJobId() {
-        JobContext.setJobId("job-456");
-        JobContext.clear();
-        assertNull(JobContext.getJobId());
-    }
-
-    @Test
-    @DisplayName("should isolate job IDs between threads")
-    void threadIsolation() throws Exception {
-        JobContext.setJobId("main-job");
-
-        Thread other =
-                new Thread(
-                        () -> {
-                            assertNull(JobContext.getJobId());
-                            JobContext.setJobId("other-job");
-                            assertEquals("other-job", JobContext.getJobId());
-                        });
-        other.start();
-        other.join();
-
-        assertEquals("main-job", JobContext.getJobId());
-    }
-
-    @Test
-    @DisplayName("should allow overwriting job ID")
-    void overwriteJobId() {
-        JobContext.setJobId("first");
-        JobContext.setJobId("second");
-        assertEquals("second", JobContext.getJobId());
-    }
-}
@@ -1,95 +0,0 @@
-package stirling.software.common.util;
-
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Mockito.*;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.pdmodel.PDPage;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import stirling.software.common.service.CustomPDFDocumentFactory;
-
-class PDFServiceTest {
-
-    private PDFService pdfService;
-    private CustomPDFDocumentFactory mockFactory;
-    private final List<PDDocument> documentsToClose = new ArrayList<>();
-
-    @BeforeEach
-    void setUp() {
-        mockFactory = mock(CustomPDFDocumentFactory.class);
-        pdfService = new PDFService(mockFactory);
-    }
-
-    @AfterEach
-    void tearDown() throws IOException {
-        for (PDDocument doc : documentsToClose) {
-            try {
-                doc.close();
-            } catch (Exception ignored) {
-            }
-        }
-    }
-
-    private PDDocument createDocWithPages(int pageCount) {
-        PDDocument doc = new PDDocument();
-        for (int i = 0; i < pageCount; i++) {
-            doc.addPage(new PDPage());
-        }
-        documentsToClose.add(doc);
-        return doc;
-    }
-
-    @Test
-    void mergeDocuments_twoDocuments_mergesPages() throws IOException {
-        PDDocument merged = new PDDocument();
-        documentsToClose.add(merged);
-        when(mockFactory.createNewDocument()).thenReturn(merged);
-
-        PDDocument doc1 = createDocWithPages(2);
-        PDDocument doc2 = createDocWithPages(3);
-
-        PDDocument result = pdfService.mergeDocuments(List.of(doc1, doc2));
-        assertEquals(5, result.getNumberOfPages());
-    }
-
-    @Test
-    void mergeDocuments_emptyList_returnsEmptyDocument() throws IOException {
-        PDDocument merged = new PDDocument();
-        documentsToClose.add(merged);
-        when(mockFactory.createNewDocument()).thenReturn(merged);
-
-        PDDocument result = pdfService.mergeDocuments(List.of());
-        assertEquals(0, result.getNumberOfPages());
-    }
-
-    @Test
-    void mergeDocuments_singleDocument_returnsSamePages() throws IOException {
-        PDDocument merged = new PDDocument();
-        documentsToClose.add(merged);
-        when(mockFactory.createNewDocument()).thenReturn(merged);
-
-        PDDocument doc1 = createDocWithPages(4);
-
-        PDDocument result = pdfService.mergeDocuments(List.of(doc1));
-        assertEquals(4, result.getNumberOfPages());
-    }
-
-    @Test
-    void mergeDocuments_factoryCalled() throws IOException {
-        PDDocument merged = new PDDocument();
-        documentsToClose.add(merged);
-        when(mockFactory.createNewDocument()).thenReturn(merged);
-
-        PDDocument doc1 = createDocWithPages(1);
-
-        pdfService.mergeDocuments(List.of(doc1));
-        verify(mockFactory).createNewDocument();
-    }
-}
@@ -9,7 +9,6 @@ import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.mockStatic;
 import static org.mockito.Mockito.when;

-import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
@@ -30,7 +29,6 @@ import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.servlet.mvc.method.annotation.StreamingResponseBody;

 import io.github.pixee.security.ZipSecurity;

@@ -61,19 +59,6 @@ class PDFToFileTest {
                .thenAnswer(
                        invocation ->
                                Files.createTempFile("test", invocation.getArgument(0)).toFile());
-        lenient()
-                .when(mockTempFileManager.createManagedTempFile(anyString()))
-                .thenAnswer(
-                        invocation -> {
-                            File f =
-                                    Files.createTempFile("test", invocation.<String>getArgument(0))
-                                            .toFile();
-                            TempFile tf = org.mockito.Mockito.mock(TempFile.class);
-                            lenient().when(tf.getFile()).thenReturn(f);
-                            lenient().when(tf.getPath()).thenReturn(f.toPath());
-                            lenient().when(tf.getAbsolutePath()).thenReturn(f.getAbsolutePath());
-                            return tf;
-                        });
        lenient()
                .when(mockTempFileManager.createTempDirectory())
                .thenAnswer(invocation -> Files.createTempDirectory("test"));
@@ -83,12 +68,6 @@ class PDFToFileTest {
        pdfToFile = new PDFToFile(mockTempFileManager, mockRuntimePathConfig);
    }

-    private static byte[] drain(ResponseEntity<StreamingResponseBody> response) throws IOException {
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        response.getBody().writeTo(baos);
-        return baos.toByteArray();
-    }
-
    @Test
    void testProcessPdfToMarkdown_InvalidContentType() throws IOException, InterruptedException {
        // Prepare
@@ -100,7 +79,7 @@ class PDFToFileTest {
                        "This is not a PDF".getBytes());

        // Execute
-        ResponseEntity<StreamingResponseBody> response = pdfToFile.processPdfToMarkdown(nonPdfFile);
+        ResponseEntity<byte[]> response = pdfToFile.processPdfToMarkdown(nonPdfFile);

        // Verify
        assertEquals(HttpStatus.BAD_REQUEST, response.getStatusCode());
@@ -117,7 +96,7 @@ class PDFToFileTest {
                        "This is not a PDF".getBytes());

        // Execute
-        ResponseEntity<StreamingResponseBody> response = pdfToFile.processPdfToHtml(nonPdfFile);
+        ResponseEntity<byte[]> response = pdfToFile.processPdfToHtml(nonPdfFile);

        // Verify
        assertEquals(HttpStatus.BAD_REQUEST, response.getStatusCode());
@@ -135,7 +114,7 @@ class PDFToFileTest {
                        "This is not a PDF".getBytes());

        // Execute
-        ResponseEntity<StreamingResponseBody> response =
+        ResponseEntity<byte[]> response =
                pdfToFile.processPdfToOfficeFormat(nonPdfFile, "docx", "draw_pdf_import");

        // Verify
@@ -154,7 +133,7 @@ class PDFToFileTest {
                        "Fake PDF content".getBytes());

        // Execute with invalid format
-        ResponseEntity<StreamingResponseBody> response =
+        ResponseEntity<byte[]> response =
                pdfToFile.processPdfToOfficeFormat(pdfFile, "invalid_format", "draw_pdf_import");

        // Verify
@@ -205,14 +184,12 @@ class PDFToFileTest {
                            });

            // Execute the method
-            ResponseEntity<StreamingResponseBody> response =
-                    pdfToFile.processPdfToMarkdown(pdfFile);
+            ResponseEntity<byte[]> response = pdfToFile.processPdfToMarkdown(pdfFile);

            // Verify - should now return a ZIP file instead of plain markdown
            assertEquals(HttpStatus.OK, response.getStatusCode());
-            byte[] bodyBytes = drain(response);
-            assertNotNull(bodyBytes);
-            assertTrue(bodyBytes.length > 0);
+            assertNotNull(response.getBody());
+            assertTrue(response.getBody().length > 0);

            // Verify content disposition indicates a ZIP file
            assertTrue(
@@ -224,7 +201,7 @@ class PDFToFileTest {
            // Verify the content by unzipping it
            try (ZipInputStream zipStream =
                    ZipSecurity.createHardenedInputStream(
-                            new java.io.ByteArrayInputStream(bodyBytes))) {
+                            new java.io.ByteArrayInputStream(response.getBody()))) {
                ZipEntry entry;
                boolean foundMdFile = false;
                boolean foundImageInFolder = false;
@@ -298,14 +275,12 @@ class PDFToFileTest {
                            });

            // Execute the method
-            ResponseEntity<StreamingResponseBody> response =
-                    pdfToFile.processPdfToMarkdown(pdfFile);
+            ResponseEntity<byte[]> response = pdfToFile.processPdfToMarkdown(pdfFile);

            // Verify
            assertEquals(HttpStatus.OK, response.getStatusCode());
-            byte[] bodyBytes = drain(response);
-            assertNotNull(bodyBytes);
-            assertTrue(bodyBytes.length > 0);
+            assertNotNull(response.getBody());
+            assertTrue(response.getBody().length > 0);

            // Verify content disposition indicates a zip file
            assertTrue(
@@ -317,7 +292,7 @@ class PDFToFileTest {
            // Verify the content by unzipping it
            try (ZipInputStream zipStream =
                    ZipSecurity.createHardenedInputStream(
-                            new java.io.ByteArrayInputStream(bodyBytes))) {
+                            new java.io.ByteArrayInputStream(response.getBody()))) {
                ZipEntry entry;
                boolean foundMdFiles = false;
                boolean foundImage = false;
@@ -377,13 +352,12 @@ class PDFToFileTest {
                            });

            // Execute the method
-            ResponseEntity<StreamingResponseBody> response = pdfToFile.processPdfToHtml(pdfFile);
+            ResponseEntity<byte[]> response = pdfToFile.processPdfToHtml(pdfFile);

            // Verify
            assertEquals(HttpStatus.OK, response.getStatusCode());
-            byte[] bodyBytes = drain(response);
-            assertNotNull(bodyBytes);
-            assertTrue(bodyBytes.length > 0);
+            assertNotNull(response.getBody());
+            assertTrue(response.getBody().length > 0);

            // Verify content disposition indicates a zip file
            assertTrue(
@@ -395,7 +369,7 @@ class PDFToFileTest {
            // Verify the content by unzipping it
            try (ZipInputStream zipStream =
                    ZipSecurity.createHardenedInputStream(
-                            new java.io.ByteArrayInputStream(bodyBytes))) {
+                            new java.io.ByteArrayInputStream(response.getBody()))) {
                ZipEntry entry;
                boolean foundMainHtml = false;
                boolean foundIndexHtml = false;
@@ -463,14 +437,13 @@ class PDFToFileTest {
                            });

            // Execute the method with docx format
-            ResponseEntity<StreamingResponseBody> response =
+            ResponseEntity<byte[]> response =
                    pdfToFile.processPdfToOfficeFormat(pdfFile, "docx", "draw_pdf_import");

            // Verify
            assertEquals(HttpStatus.OK, response.getStatusCode());
-            byte[] bodyBytes = drain(response);
-            assertNotNull(bodyBytes);
-            assertTrue(bodyBytes.length > 0);
+            assertNotNull(response.getBody());
+            assertTrue(response.getBody().length > 0);

            // Verify content disposition has correct filename
            assertTrue(
@@ -535,14 +508,13 @@ class PDFToFileTest {
                            });

            // Execute the method with ODP format
-            ResponseEntity<StreamingResponseBody> response =
+            ResponseEntity<byte[]> response =
                    pdfToFile.processPdfToOfficeFormat(pdfFile, "odp", "draw_pdf_import");

            // Verify
            assertEquals(HttpStatus.OK, response.getStatusCode());
-            byte[] bodyBytes = drain(response);
-            assertNotNull(bodyBytes);
-            assertTrue(bodyBytes.length > 0);
+            assertNotNull(response.getBody());
+            assertTrue(response.getBody().length > 0);

            // Verify content disposition for zip file
            assertTrue(
@@ -554,7 +526,7 @@ class PDFToFileTest {
            // Verify the content by unzipping it
            try (ZipInputStream zipStream =
                    ZipSecurity.createHardenedInputStream(
-                            new java.io.ByteArrayInputStream(bodyBytes))) {
+                            new java.io.ByteArrayInputStream(response.getBody()))) {
                ZipEntry entry;
                boolean foundMainFile = false;
                boolean foundMediaFiles = false;
@@ -620,14 +592,13 @@ class PDFToFileTest {
                            });

            // Execute the method with text format
-            ResponseEntity<StreamingResponseBody> response =
+            ResponseEntity<byte[]> response =
                    pdfToFile.processPdfToOfficeFormat(pdfFile, "txt:Text", "draw_pdf_import");

            // Verify
            assertEquals(HttpStatus.OK, response.getStatusCode());
-            byte[] bodyBytes = drain(response);
-            assertNotNull(bodyBytes);
-            assertTrue(bodyBytes.length > 0);
+            assertNotNull(response.getBody());
+            assertTrue(response.getBody().length > 0);

            // Verify content disposition has txt extension
            assertTrue(
@@ -679,14 +650,13 @@ class PDFToFileTest {
                            });

            // Execute the method
-            ResponseEntity<StreamingResponseBody> response =
+            ResponseEntity<byte[]> response =
                    pdfToFile.processPdfToOfficeFormat(pdfFile, "docx", "draw_pdf_import");

            // Verify
            assertEquals(HttpStatus.OK, response.getStatusCode());
-            byte[] bodyBytes = drain(response);
-            assertNotNull(bodyBytes);
-            assertTrue(bodyBytes.length > 0);
+            assertNotNull(response.getBody());
+            assertTrue(response.getBody().length > 0);

            // Verify content disposition contains output.docx
            assertTrue(
@@ -726,13 +696,12 @@ class PDFToFileTest {
                                return mockExecutorResult;
                            });

-            ResponseEntity<StreamingResponseBody> response =
+            ResponseEntity<byte[]> response =
                    pdfToFileWithUno.processPdfToOfficeFormat(pdfFile, "docx", "writer_pdf_import");

            assertEquals(HttpStatus.OK, response.getStatusCode());
-            byte[] bodyBytes = drain(response);
-            assertNotNull(bodyBytes);
-            assertTrue(bodyBytes.length > 0);
+            assertNotNull(response.getBody());
+            assertTrue(response.getBody().length > 0);
            assertTrue(
                    response.getHeaders()
                            .getContentDisposition()
@@ -790,13 +759,12 @@ class PDFToFileTest {
                                return mockExecutorResult;
                            });

-            ResponseEntity<StreamingResponseBody> response =
+            ResponseEntity<byte[]> response =
                    pdfToFileWithUno.processPdfToOfficeFormat(pdfFile, "docx", "writer_pdf_import");

            assertEquals(HttpStatus.OK, response.getStatusCode());
-            byte[] bodyBytes = drain(response);
-            assertNotNull(bodyBytes);
-            assertTrue(bodyBytes.length > 0);
+            assertNotNull(response.getBody());
+            assertTrue(response.getBody().length > 0);
            assertTrue(
                    response.getHeaders()
                            .getContentDisposition()
@@ -1,98 +0,0 @@
-package stirling.software.common.util;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
-import java.util.Date;
-import java.util.GregorianCalendar;
-
-import org.junit.jupiter.api.Test;
-
-class PdfAttachmentHandlerTest {
-
-    @Test
-    void formatEmailDate_nullDate_returnsEmptyString() {
-        assertEquals("", PdfAttachmentHandler.formatEmailDate((Date) null));
-    }
-
-    @Test
-    void formatEmailDate_nullZonedDateTime_returnsEmptyString() {
-        assertEquals("", PdfAttachmentHandler.formatEmailDate((ZonedDateTime) null));
-    }
-
-    @Test
-    void formatEmailDate_validDate_returnsFormattedString() {
-        // Create a date: January 15, 2024 10:30 AM UTC
-        GregorianCalendar cal = new GregorianCalendar(java.util.TimeZone.getTimeZone("UTC"));
-        cal.set(2024, 0, 15, 10, 30, 0);
-        cal.set(java.util.Calendar.MILLISECOND, 0);
-        Date date = cal.getTime();
-
-        String result = PdfAttachmentHandler.formatEmailDate(date);
-        assertNotNull(result);
-        assertFalse(result.isEmpty());
-        // Should contain the date components
-        assertTrue(result.contains("2024"));
-        assertTrue(result.contains("Jan"));
-        assertTrue(result.contains("15"));
-    }
-
-    @Test
-    void formatEmailDate_zonedDateTime_returnsUTCFormatted() {
-        ZonedDateTime dateTime =
-                ZonedDateTime.of(2024, 3, 15, 14, 30, 0, 0, ZoneId.of("America/New_York"));
-        String result = PdfAttachmentHandler.formatEmailDate(dateTime);
-        assertNotNull(result);
-        assertFalse(result.isEmpty());
-        // Should be converted to UTC
-        assertTrue(result.contains("UTC"));
-        assertTrue(result.contains("2024"));
-    }
-
-    @Test
-    void processInlineImages_nullHtmlContent_returnsNull() {
-        String result = PdfAttachmentHandler.processInlineImages(null, null);
-        assertNull(result);
-    }
-
-    @Test
-    void processInlineImages_nullEmailContent_returnsOriginal() {
-        String html = "<html><body>test</body></html>";
-        String result = PdfAttachmentHandler.processInlineImages(html, null);
-        assertEquals(html, result);
-    }
-
-    @Test
-    void processInlineImages_noCidReferences_returnsOriginal() {
-        EmlParser.EmailContent emailContent = new EmlParser.EmailContent();
-        String html = "<html><body><img src='test.png'/></body></html>";
-        String result = PdfAttachmentHandler.processInlineImages(html, emailContent);
-        assertEquals(html, result);
-    }
-
-    @Test
-    void markerPosition_constructorAndGetters() {
-        PdfAttachmentHandler.MarkerPosition pos =
-                new PdfAttachmentHandler.MarkerPosition(2, 100.5f, 200.3f, "@", "test.pdf");
-        assertEquals(2, pos.getPageIndex());
-        assertEquals(100.5f, pos.getX(), 0.001f);
-        assertEquals(200.3f, pos.getY(), 0.001f);
-        assertEquals("@", pos.getCharacter());
-        assertEquals("test.pdf", pos.getFilename());
-    }
-
-    @Test
-    void markerPosition_setters() {
-        PdfAttachmentHandler.MarkerPosition pos =
-                new PdfAttachmentHandler.MarkerPosition(0, 0f, 0f, "@", null);
-        pos.setPageIndex(5);
-        pos.setX(50.0f);
-        pos.setY(75.0f);
-        pos.setFilename("doc.pdf");
-        assertEquals(5, pos.getPageIndex());
-        assertEquals(50.0f, pos.getX(), 0.001f);
-        assertEquals(75.0f, pos.getY(), 0.001f);
-        assertEquals("doc.pdf", pos.getFilename());
-    }
-}
@@ -1,85 +0,0 @@
-package stirling.software.common.util;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-import java.io.IOException;
-
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.ValueSource;
-
-class PdfErrorUtilsTest {
-
-    @ParameterizedTest
-    @ValueSource(
-            strings = {
-                "Missing root object specification",
-                "Header doesn't contain versioninfo",
-                "Expected trailer",
-                "Invalid PDF",
-                "Corrupted",
-                "damaged",
-                "Unknown dir object",
-                "Can't dereference COSObject",
-                "parseCOSString string should start with",
-                "ICCBased colorspace array must have a stream",
-                "1-based index not found",
-                "Invalid dictionary, found:",
-                "AES initialization vector not fully read",
-                "BadPaddingException",
-                "Given final block not properly padded",
-                "End-of-File, expected line"
-            })
-    void isCorruptedPdfError_ioException_corruptionIndicators_returnsTrue(String message) {
-        IOException e = new IOException(message);
-        assertTrue(PdfErrorUtils.isCorruptedPdfError(e));
-    }
-
-    @ParameterizedTest
-    @ValueSource(
-            strings = {
-                "Missing root object specification in the file",
-                "Header doesn't contain versioninfo xyz",
-                "Some prefix Corrupted suffix"
-            })
-    void isCorruptedPdfError_ioException_messagesContainingIndicators_returnsTrue(String message) {
-        IOException e = new IOException(message);
-        assertTrue(PdfErrorUtils.isCorruptedPdfError(e));
-    }
-
-    @Test
-    void isCorruptedPdfError_ioException_normalError_returnsFalse() {
-        IOException e = new IOException("File not found");
-        assertFalse(PdfErrorUtils.isCorruptedPdfError(e));
-    }
-
-    @Test
-    void isCorruptedPdfError_ioException_nullMessage_returnsFalse() {
-        IOException e = new IOException((String) null);
-        assertFalse(PdfErrorUtils.isCorruptedPdfError(e));
-    }
-
-    @Test
-    void isCorruptedPdfError_genericException_corruptionMessage_returnsTrue() {
-        Exception e = new RuntimeException("Invalid PDF structure");
-        assertTrue(PdfErrorUtils.isCorruptedPdfError(e));
-    }
-
-    @Test
-    void isCorruptedPdfError_genericException_normalMessage_returnsFalse() {
-        Exception e = new RuntimeException("Something went wrong");
-        assertFalse(PdfErrorUtils.isCorruptedPdfError(e));
-    }
-
-    @Test
-    void isCorruptedPdfError_genericException_nullMessage_returnsFalse() {
-        Exception e = new RuntimeException((String) null);
-        assertFalse(PdfErrorUtils.isCorruptedPdfError(e));
-    }
-
-    @Test
-    void isCorruptedPdfError_ioException_emptyMessage_returnsFalse() {
-        IOException e = new IOException("");
-        assertFalse(PdfErrorUtils.isCorruptedPdfError(e));
-    }
-}
@@ -1,80 +0,0 @@
-package stirling.software.common.util;
-
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Mockito.*;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.web.multipart.MultipartFile;
-
-class PdfToCbrUtilsTest {
-
-    @Test
-    void isPdfFile_pdfExtension_returnsTrue() {
-        MultipartFile file = mock(MultipartFile.class);
-        when(file.getOriginalFilename()).thenReturn("document.pdf");
-        assertTrue(PdfToCbrUtils.isPdfFile(file));
-    }
-
-    @Test
-    void isPdfFile_uppercasePdfExtension_returnsTrue() {
-        MultipartFile file = mock(MultipartFile.class);
-        when(file.getOriginalFilename()).thenReturn("document.PDF");
-        assertTrue(PdfToCbrUtils.isPdfFile(file));
-    }
-
-    @Test
-    void isPdfFile_mixedCasePdfExtension_returnsTrue() {
-        MultipartFile file = mock(MultipartFile.class);
-        when(file.getOriginalFilename()).thenReturn("document.Pdf");
-        assertTrue(PdfToCbrUtils.isPdfFile(file));
-    }
-
-    @Test
-    void isPdfFile_nonPdfExtension_returnsFalse() {
-        MultipartFile file = mock(MultipartFile.class);
-        when(file.getOriginalFilename()).thenReturn("document.txt");
-        assertFalse(PdfToCbrUtils.isPdfFile(file));
-    }
-
-    @Test
-    void isPdfFile_nullFilename_returnsFalse() {
-        MultipartFile file = mock(MultipartFile.class);
-        when(file.getOriginalFilename()).thenReturn(null);
-        assertFalse(PdfToCbrUtils.isPdfFile(file));
-    }
-
-    @Test
-    void isPdfFile_imageExtension_returnsFalse() {
-        MultipartFile file = mock(MultipartFile.class);
-        when(file.getOriginalFilename()).thenReturn("image.png");
-        assertFalse(PdfToCbrUtils.isPdfFile(file));
-    }
-
-    @Test
-    void convertPdfToCbr_nullFile_throwsException() {
-        assertThrows(Exception.class, () -> PdfToCbrUtils.convertPdfToCbr(null, 300, null));
-    }
-
-    @Test
-    void convertPdfToCbr_emptyFile_throwsException() {
-        MultipartFile file = mock(MultipartFile.class);
-        when(file.isEmpty()).thenReturn(true);
-        assertThrows(Exception.class, () -> PdfToCbrUtils.convertPdfToCbr(file, 300, null));
-    }
-
-    @Test
-    void convertPdfToCbr_nonPdfFile_throwsException() {
-        MultipartFile file = mock(MultipartFile.class);
-        when(file.isEmpty()).thenReturn(false);
-        when(file.getOriginalFilename()).thenReturn("image.png");
-        assertThrows(Exception.class, () -> PdfToCbrUtils.convertPdfToCbr(file, 300, null));
-    }
-
-    @Test
-    void convertPdfToCbr_nullFilename_throwsException() {
-        MultipartFile file = mock(MultipartFile.class);
-        when(file.isEmpty()).thenReturn(false);
-        when(file.getOriginalFilename()).thenReturn(null);
-        assertThrows(Exception.class, () -> PdfToCbrUtils.convertPdfToCbr(file, 300, null));
-    }
-}
@@ -1,73 +0,0 @@
-package stirling.software.common.util;
-
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Mockito.*;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.web.multipart.MultipartFile;
-
-class PdfToCbzUtilsTest {
-
-    @Test
-    void isPdfFile_pdfExtension_returnsTrue() {
-        MultipartFile file = mock(MultipartFile.class);
-        when(file.getOriginalFilename()).thenReturn("document.pdf");
-        assertTrue(PdfToCbzUtils.isPdfFile(file));
-    }
-
-    @Test
-    void isPdfFile_uppercasePdfExtension_returnsTrue() {
-        MultipartFile file = mock(MultipartFile.class);
-        when(file.getOriginalFilename()).thenReturn("DOCUMENT.PDF");
-        assertTrue(PdfToCbzUtils.isPdfFile(file));
-    }
-
-    @Test
-    void isPdfFile_nonPdfExtension_returnsFalse() {
-        MultipartFile file = mock(MultipartFile.class);
-        when(file.getOriginalFilename()).thenReturn("document.docx");
-        assertFalse(PdfToCbzUtils.isPdfFile(file));
-    }
-
-    @Test
-    void isPdfFile_nullFilename_returnsFalse() {
-        MultipartFile file = mock(MultipartFile.class);
-        when(file.getOriginalFilename()).thenReturn(null);
-        assertFalse(PdfToCbzUtils.isPdfFile(file));
-    }
-
-    @Test
-    void isPdfFile_noExtension_returnsFalse() {
-        MultipartFile file = mock(MultipartFile.class);
-        when(file.getOriginalFilename()).thenReturn("document");
-        assertFalse(PdfToCbzUtils.isPdfFile(file));
-    }
-
-    @Test
-    void convertPdfToCbz_nullFile_throwsException() {
-        assertThrows(Exception.class, () -> PdfToCbzUtils.convertPdfToCbz(null, 300, null, null));
-    }
-
-    @Test
-    void convertPdfToCbz_emptyFile_throwsException() {
-        MultipartFile file = mock(MultipartFile.class);
-        when(file.isEmpty()).thenReturn(true);
-        assertThrows(Exception.class, () -> PdfToCbzUtils.convertPdfToCbz(file, 300, null, null));
-    }
-
-    @Test
-    void convertPdfToCbz_nonPdfFile_throwsException() {
-        MultipartFile file = mock(MultipartFile.class);
-        when(file.isEmpty()).thenReturn(false);
-        when(file.getOriginalFilename()).thenReturn("image.jpg");
-        assertThrows(Exception.class, () -> PdfToCbzUtils.convertPdfToCbz(file, 300, null, null));
-    }
-
-    @Test
-    void convertPdfToCbz_nullFilename_throwsException() {
-        MultipartFile file = mock(MultipartFile.class);
-        when(file.isEmpty()).thenReturn(false);
-        when(file.getOriginalFilename()).thenReturn(null);
-        assertThrows(Exception.class, () -> PdfToCbzUtils.convertPdfToCbz(file, 300, null, null));
-    }
-}
@@ -1,245 +0,0 @@
-package stirling.software.common.util;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-import java.awt.image.BufferedImage;
-import java.awt.image.RenderedImage;
-import java.io.IOException;
-import java.util.List;
-
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.pdmodel.PDPage;
-import org.apache.pdfbox.pdmodel.PDResources;
-import org.apache.pdfbox.pdmodel.common.PDRectangle;
-import org.apache.pdfbox.pdmodel.graphics.image.LosslessFactory;
-import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.CsvSource;
-
-class PdfUtilsTest {
-
-    @ParameterizedTest
-    @CsvSource({"A0", "A1", "A2", "A3", "A4", "A5", "A6", "LETTER", "LEGAL"})
-    void textToPageSize_validSizes_returnsCorrectRectangle(String size) {
-        PDRectangle result = PdfUtils.textToPageSize(size);
-        assertNotNull(result);
-        assertTrue(result.getWidth() > 0);
-        assertTrue(result.getHeight() > 0);
-    }
-
-    @Test
-    void textToPageSize_lowercaseA4_returnsA4() {
-        PDRectangle result = PdfUtils.textToPageSize("a4");
-        assertEquals(PDRectangle.A4.getWidth(), result.getWidth(), 0.01f);
-        assertEquals(PDRectangle.A4.getHeight(), result.getHeight(), 0.01f);
-    }
-
-    @Test
-    void textToPageSize_invalidSize_throwsException() {
-        assertThrows(Exception.class, () -> PdfUtils.textToPageSize("INVALID"));
-    }
-
-    @Test
-    void getAllImages_emptyResources_returnsEmptyList() throws IOException {
-        try (PDDocument doc = new PDDocument()) {
-            PDPage page = new PDPage();
-            page.setResources(new PDResources());
-            doc.addPage(page);
-            List<RenderedImage> images = PdfUtils.getAllImages(page.getResources());
-            assertTrue(images.isEmpty());
-        }
-    }
-
-    @Test
-    void getAllImages_withImage_returnsImage() throws IOException {
-        try (PDDocument doc = new PDDocument()) {
-            PDPage page = new PDPage();
-            doc.addPage(page);
-
-            BufferedImage bufferedImage = new BufferedImage(10, 10, BufferedImage.TYPE_INT_RGB);
-            PDImageXObject pdImage = LosslessFactory.createFromImage(doc, bufferedImage);
-
-            PDResources resources = new PDResources();
-            resources.add(pdImage);
-            page.setResources(resources);
-
-            List<RenderedImage> images = PdfUtils.getAllImages(page.getResources());
-            assertEquals(1, images.size());
-        }
-    }
-
-    @Test
-    void hasImagesOnPage_noImages_returnsFalse() throws IOException {
-        try (PDDocument doc = new PDDocument()) {
-            PDPage page = new PDPage();
-            page.setResources(new PDResources());
-            doc.addPage(page);
-            assertFalse(PdfUtils.hasImagesOnPage(page));
-        }
-    }
-
-    @Test
-    void hasTextOnPage_noText_returnsFalse() throws IOException {
-        try (PDDocument doc = new PDDocument()) {
-            PDPage page = new PDPage();
-            doc.addPage(page);
-            assertFalse(PdfUtils.hasTextOnPage(page, "hello"));
-        }
-    }
-
-    @Test
-    void pageCount_greaterComparator_correct() throws IOException {
-        try (PDDocument doc = new PDDocument()) {
-            doc.addPage(new PDPage());
-            doc.addPage(new PDPage());
-            doc.addPage(new PDPage());
-            assertTrue(PdfUtils.pageCount(doc, 2, "greater"));
-        }
-    }
-
-    @Test
-    void pageCount_equalComparator_correct() throws IOException {
-        try (PDDocument doc = new PDDocument()) {
-            doc.addPage(new PDPage());
-            doc.addPage(new PDPage());
-            assertTrue(PdfUtils.pageCount(doc, 2, "equal"));
-        }
-    }
-
-    @Test
-    void pageCount_lessComparator_correct() throws IOException {
-        try (PDDocument doc = new PDDocument()) {
-            doc.addPage(new PDPage());
-            assertTrue(PdfUtils.pageCount(doc, 5, "less"));
-        }
-    }
-
-    @Test
-    void pageCount_invalidComparator_throwsException() throws IOException {
-        try (PDDocument doc = new PDDocument()) {
-            doc.addPage(new PDPage());
-            assertThrows(Exception.class, () -> PdfUtils.pageCount(doc, 1, "invalid"));
-        }
-    }
-
-    @Test
-    void pageSize_matchingSize_returnsTrue() throws IOException {
-        try (PDDocument doc = new PDDocument()) {
-            PDPage page = new PDPage(PDRectangle.A4);
-            doc.addPage(page);
-            String sizeStr = PDRectangle.A4.getWidth() + "x" + PDRectangle.A4.getHeight();
-            assertTrue(PdfUtils.pageSize(doc, sizeStr));
-        }
-    }
-
-    @Test
-    void pageSize_nonMatchingSize_returnsFalse() throws IOException {
-        try (PDDocument doc = new PDDocument()) {
-            PDPage page = new PDPage(PDRectangle.A4);
-            doc.addPage(page);
-            assertFalse(PdfUtils.pageSize(doc, "100x100"));
-        }
-    }
-
-    // --- hasImages ---
-
-    @Test
-    void hasImages_noImages_returnsFalse() throws IOException {
-        try (PDDocument doc = new PDDocument()) {
-            PDPage page = new PDPage();
-            page.setResources(new PDResources());
-            doc.addPage(page);
-            assertFalse(PdfUtils.hasImages(doc, "all"));
-        }
-    }
-
-    @Test
-    void hasImages_withImage_returnsTrue() throws IOException {
-        try (PDDocument doc = new PDDocument()) {
-            PDPage page = new PDPage();
-            doc.addPage(page);
-
-            BufferedImage bufferedImage = new BufferedImage(10, 10, BufferedImage.TYPE_INT_RGB);
-            PDImageXObject pdImage = LosslessFactory.createFromImage(doc, bufferedImage);
-            PDResources resources = new PDResources();
-            resources.add(pdImage);
-            page.setResources(resources);
-
-            assertTrue(PdfUtils.hasImages(doc, "all"));
-        }
-    }
-
-    // --- hasText ---
-
-    @Test
-    void hasText_noText_returnsFalse() throws IOException {
-        try (PDDocument doc = new PDDocument()) {
-            doc.addPage(new PDPage());
-            assertFalse(PdfUtils.hasText(doc, "all", "hello"));
-        }
-    }
-
-    // --- textToPageSize additional ---
-
-    @Test
-    void textToPageSize_letter_returnsLetter() {
-        PDRectangle result = PdfUtils.textToPageSize("letter");
-        assertEquals(PDRectangle.LETTER.getWidth(), result.getWidth(), 0.01f);
-        assertEquals(PDRectangle.LETTER.getHeight(), result.getHeight(), 0.01f);
-    }
-
-    @Test
-    void textToPageSize_legal_returnsLegal() {
-        PDRectangle result = PdfUtils.textToPageSize("legal");
-        assertEquals(PDRectangle.LEGAL.getWidth(), result.getWidth(), 0.01f);
-        assertEquals(PDRectangle.LEGAL.getHeight(), result.getHeight(), 0.01f);
-    }
-
-    // --- pageCount additional ---
-
-    @Test
-    void pageCount_greaterComparator_false() throws IOException {
-        try (PDDocument doc = new PDDocument()) {
-            doc.addPage(new PDPage());
-            assertFalse(PdfUtils.pageCount(doc, 5, "greater"));
-        }
-    }
-
-    @Test
-    void pageCount_equalComparator_false() throws IOException {
-        try (PDDocument doc = new PDDocument()) {
-            doc.addPage(new PDPage());
-            doc.addPage(new PDPage());
-            assertFalse(PdfUtils.pageCount(doc, 3, "equal"));
-        }
-    }
-
-    @Test
-    void pageCount_lessComparator_false() throws IOException {
-        try (PDDocument doc = new PDDocument()) {
-            doc.addPage(new PDPage());
-            doc.addPage(new PDPage());
-            doc.addPage(new PDPage());
-            assertFalse(PdfUtils.pageCount(doc, 2, "less"));
-        }
-    }
-
-    // --- hasImagesOnPage with image ---
-
-    @Test
-    void hasImagesOnPage_withImage_returnsTrue() throws IOException {
-        try (PDDocument doc = new PDDocument()) {
-            PDPage page = new PDPage();
-            doc.addPage(page);
-
-            BufferedImage bufferedImage = new BufferedImage(5, 5, BufferedImage.TYPE_INT_RGB);
-            PDImageXObject pdImage = LosslessFactory.createFromImage(doc, bufferedImage);
-            PDResources resources = new PDResources();
-            resources.add(pdImage);
-            page.setResources(resources);
-
-            assertTrue(PdfUtils.hasImagesOnPage(page));
-        }
-    }
-}
@@ -1,120 +0,0 @@
-package stirling.software.common.util;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.junit.jupiter.api.Test;
-
-class ProcessExecutorTest {
-
-    // Use reflection to test private validateCommand method
-    private void invokeValidateCommand(ProcessExecutor executor, List<String> command)
-            throws Exception {
-        Method method = ProcessExecutor.class.getDeclaredMethod("validateCommand", List.class);
-        method.setAccessible(true);
-        try {
-            method.invoke(executor, command);
-        } catch (java.lang.reflect.InvocationTargetException e) {
-            throw (Exception) e.getCause();
-        }
-    }
-
-    private ProcessExecutor getExecutor() {
-        return ProcessExecutor.getInstance(ProcessExecutor.Processes.QPDF);
-    }
-
-    @Test
-    void testValidateCommand_nullCommand() {
-        assertThrows(
-                IllegalArgumentException.class, () -> invokeValidateCommand(getExecutor(), null));
-    }
-
-    @Test
-    void testValidateCommand_emptyCommand() {
-        assertThrows(
-                IllegalArgumentException.class,
-                () -> invokeValidateCommand(getExecutor(), List.of()));
-    }
-
-    @Test
-    void testValidateCommand_nullArgument() {
-        List<String> command = new ArrayList<>();
-        command.add("echo");
-        command.add(null);
-        assertThrows(
-                IllegalArgumentException.class,
-                () -> invokeValidateCommand(getExecutor(), command));
-    }
-
-    @Test
-    void testValidateCommand_nullByteInArgument() {
-        assertThrows(
-                IllegalArgumentException.class,
-                () -> invokeValidateCommand(getExecutor(), List.of("echo", "bad\0arg")));
-    }
-
-    @Test
-    void testValidateCommand_newlineInArgument() {
-        assertThrows(
-                IllegalArgumentException.class,
-                () -> invokeValidateCommand(getExecutor(), List.of("echo", "bad\narg")));
-    }
-
-    @Test
-    void testValidateCommand_carriageReturnInArgument() {
-        assertThrows(
-                IllegalArgumentException.class,
-                () -> invokeValidateCommand(getExecutor(), List.of("echo", "bad\rarg")));
-    }
-
-    @Test
-    void testValidateCommand_pathTraversal() {
-        assertThrows(
-                IllegalArgumentException.class,
-                () -> invokeValidateCommand(getExecutor(), List.of("../../bin/evil")));
-    }
-
-    @Test
-    void testValidateCommand_blankExecutable() {
-        assertThrows(
-                IllegalArgumentException.class,
-                () -> invokeValidateCommand(getExecutor(), List.of("  ")));
-    }
-
-    @Test
-    void testValidateCommand_validSimpleCommand() throws Exception {
-        // Simple command names (no path) should pass validation
-        invokeValidateCommand(getExecutor(), List.of("echo", "hello"));
-    }
-
-    @Test
-    void testGetInstance_returnsSameInstance() {
-        ProcessExecutor e1 = ProcessExecutor.getInstance(ProcessExecutor.Processes.QPDF);
-        ProcessExecutor e2 = ProcessExecutor.getInstance(ProcessExecutor.Processes.QPDF);
-        assertSame(e1, e2);
-    }
-
-    @Test
-    void testGetInstance_differentProcessTypes() {
-        ProcessExecutor e1 = ProcessExecutor.getInstance(ProcessExecutor.Processes.QPDF);
-        ProcessExecutor e2 = ProcessExecutor.getInstance(ProcessExecutor.Processes.TESSERACT);
-        assertNotSame(e1, e2);
-    }
-
-    @Test
-    void testProcessExecutorResult() {
-        ProcessExecutor executor = getExecutor();
-        ProcessExecutor.ProcessExecutorResult result =
-                executor.new ProcessExecutorResult(0, "success");
-        assertEquals(0, result.getRc());
-        assertEquals("success", result.getMessages());
-
-        result.setRc(1);
-        result.setMessages("error");
-        assertEquals(1, result.getRc());
-        assertEquals("error", result.getMessages());
-    }
-}
@@ -1,82 +0,0 @@
-package stirling.software.common.util;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-import java.util.List;
-
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.Test;
-
-class PropertyConfigsTest {
-
-    private static final String TEST_KEY = "stirling.test.property.key";
-    private static final String TEST_KEY_2 = "stirling.test.property.key2";
-
-    @AfterEach
-    void tearDown() {
-        System.clearProperty(TEST_KEY);
-        System.clearProperty(TEST_KEY_2);
-    }
-
-    @Test
-    void testGetBooleanValue_singleKey_fromSystemProperty() {
-        System.setProperty(TEST_KEY, "true");
-        assertTrue(PropertyConfigs.getBooleanValue(TEST_KEY, false));
-    }
-
-    @Test
-    void testGetBooleanValue_singleKey_defaultWhenMissing() {
-        assertFalse(PropertyConfigs.getBooleanValue(TEST_KEY, false));
-        assertTrue(PropertyConfigs.getBooleanValue(TEST_KEY, true));
-    }
-
-    @Test
-    void testGetBooleanValue_singleKey_falseValue() {
-        System.setProperty(TEST_KEY, "false");
-        assertFalse(PropertyConfigs.getBooleanValue(TEST_KEY, true));
-    }
-
-    @Test
-    void testGetStringValue_singleKey_fromSystemProperty() {
-        System.setProperty(TEST_KEY, "hello");
-        assertEquals("hello", PropertyConfigs.getStringValue(TEST_KEY, "default"));
-    }
-
-    @Test
-    void testGetStringValue_singleKey_defaultWhenMissing() {
-        assertEquals("default", PropertyConfigs.getStringValue(TEST_KEY, "default"));
-    }
-
-    @Test
-    void testGetBooleanValue_listKeys_firstMatch() {
-        System.setProperty(TEST_KEY_2, "true");
-        assertTrue(PropertyConfigs.getBooleanValue(List.of(TEST_KEY, TEST_KEY_2), false));
-    }
-
-    @Test
-    void testGetBooleanValue_listKeys_defaultWhenNoneMatch() {
-        assertFalse(PropertyConfigs.getBooleanValue(List.of(TEST_KEY, TEST_KEY_2), false));
-    }
-
-    @Test
-    void testGetStringValue_listKeys_firstMatch() {
-        System.setProperty(TEST_KEY, "first");
-        System.setProperty(TEST_KEY_2, "second");
-        assertEquals(
-                "first", PropertyConfigs.getStringValue(List.of(TEST_KEY, TEST_KEY_2), "default"));
-    }
-
-    @Test
-    void testGetStringValue_listKeys_defaultWhenNoneMatch() {
-        assertEquals(
-                "default",
-                PropertyConfigs.getStringValue(List.of(TEST_KEY, TEST_KEY_2), "default"));
-    }
-
-    @Test
-    void testGetBooleanValue_nonBooleanString() {
-        System.setProperty(TEST_KEY, "notaboolean");
-        // Boolean.valueOf returns false for non-boolean strings
-        assertFalse(PropertyConfigs.getBooleanValue(TEST_KEY, true));
-    }
-}
@@ -1,96 +0,0 @@
-package stirling.software.common.util;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-import org.junit.jupiter.api.Test;
-
-import stirling.software.common.model.oauth2.Provider;
-
-class ProviderUtilsAdditionalTest {
-
-    @Test
-    void testValidateProvider_null() {
-        assertFalse(ProviderUtils.validateProvider(null));
-    }
-
-    @Test
-    void testValidateProvider_nullClientId() {
-        Provider provider = new Provider();
-        provider.setClientId(null);
-        provider.setClientSecret("secret");
-        provider.setScopes("read");
-        assertFalse(ProviderUtils.validateProvider(provider));
-    }
-
-    @Test
-    void testValidateProvider_emptyClientId() {
-        Provider provider = new Provider();
-        provider.setClientId("");
-        provider.setClientSecret("secret");
-        provider.setScopes("read");
-        assertFalse(ProviderUtils.validateProvider(provider));
-    }
-
-    @Test
-    void testValidateProvider_blankClientId() {
-        Provider provider = new Provider();
-        provider.setClientId("   ");
-        provider.setClientSecret("secret");
-        provider.setScopes("read");
-        assertFalse(ProviderUtils.validateProvider(provider));
-    }
-
-    @Test
-    void testValidateProvider_nullClientSecret() {
-        Provider provider = new Provider();
-        provider.setClientId("id");
-        provider.setClientSecret(null);
-        provider.setScopes("read");
-        assertFalse(ProviderUtils.validateProvider(provider));
-    }
-
-    @Test
-    void testValidateProvider_emptyClientSecret() {
-        Provider provider = new Provider();
-        provider.setClientId("id");
-        provider.setClientSecret("");
-        provider.setScopes("read");
-        assertFalse(ProviderUtils.validateProvider(provider));
-    }
-
-    @Test
-    void testValidateProvider_nullScopes() {
-        Provider provider = new Provider();
-        provider.setClientId("id");
-        provider.setClientSecret("secret");
-        provider.setScopes(null);
-        assertFalse(ProviderUtils.validateProvider(provider));
-    }
-
-    @Test
-    void testValidateProvider_emptyScopes() {
-        Provider provider = new Provider();
-        provider.setClientId("id");
-        provider.setClientSecret("secret");
-        provider.setScopes("");
-        assertFalse(ProviderUtils.validateProvider(provider));
-    }
-
-    @Test
-    void testValidateProvider_allFieldsValid() {
-        Provider provider = new Provider();
-        provider.setClientId("my-client-id");
-        provider.setClientSecret("my-secret");
-        provider.setScopes("openid,profile");
-        assertTrue(ProviderUtils.validateProvider(provider));
-    }
-
-    @Test
-    void testValidateProvider_singleScope() {
-        Provider provider = new Provider();
-        provider.setClientId("id");
-        provider.setClientSecret("secret");
-        provider.setScopes("email");
-        assertTrue(ProviderUtils.validateProvider(provider));
-    }
-}
@@ -1,164 +0,0 @@
-package stirling.software.common.util;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-import org.junit.jupiter.api.Test;
-
-class RequestUriUtilsTest {
-
-    // --- isStaticResource tests ---
-
-    @Test
-    void testIsStaticResource_nullUri() {
-        assertFalse(RequestUriUtils.isStaticResource(null));
-    }
-
-    @Test
-    void testIsStaticResource_cssDirectory() {
-        assertTrue(RequestUriUtils.isStaticResource("/css/style.css"));
-    }
-
-    @Test
-    void testIsStaticResource_jsDirectory() {
-        assertTrue(RequestUriUtils.isStaticResource("/js/app.js"));
-    }
-
-    @Test
-    void testIsStaticResource_imagesDirectory() {
-        assertTrue(RequestUriUtils.isStaticResource("/images/logo.png"));
-    }
-
-    @Test
-    void testIsStaticResource_robotsTxt() {
-        assertTrue(RequestUriUtils.isStaticResource("/robots.txt"));
-    }
-
-    @Test
-    void testIsStaticResource_faviconIco() {
-        assertTrue(RequestUriUtils.isStaticResource("/favicon.ico"));
-    }
-
-    @Test
-    void testIsStaticResource_loginPath() {
-        assertTrue(RequestUriUtils.isStaticResource("/login"));
-    }
-
-    @Test
-    void testIsStaticResource_errorPath() {
-        assertTrue(RequestUriUtils.isStaticResource("/error"));
-    }
-
-    @Test
-    void testIsStaticResource_svgExtension() {
-        assertTrue(RequestUriUtils.isStaticResource("/some/path/icon.svg"));
-    }
-
-    @Test
-    void testIsStaticResource_apiRoute_notStatic() {
-        assertFalse(RequestUriUtils.isStaticResource("/api/v1/convert"));
-    }
-
-    @Test
-    void testIsStaticResource_apiStatusEndpoint() {
-        assertTrue(RequestUriUtils.isStaticResource("/api/v1/info/status"));
-    }
-
-    @Test
-    void testIsStaticResource_withContextPath() {
-        assertTrue(RequestUriUtils.isStaticResource("/app", "/app/css/style.css"));
-    }
-
-    @Test
-    void testIsStaticResource_mobileScannerPath() {
-        assertTrue(RequestUriUtils.isStaticResource("/mobile-scanner"));
-    }
-
-    // --- isFrontendRoute tests ---
-
-    @Test
-    void testIsFrontendRoute_nullUri() {
-        assertFalse(RequestUriUtils.isFrontendRoute("", null));
-    }
-
-    @Test
-    void testIsFrontendRoute_apiPath() {
-        assertFalse(RequestUriUtils.isFrontendRoute("", "/api/v1/convert"));
-    }
-
-    @Test
-    void testIsFrontendRoute_backendOnlyPath() {
-        assertFalse(RequestUriUtils.isFrontendRoute("", "/swagger"));
-        assertFalse(RequestUriUtils.isFrontendRoute("", "/register"));
-        assertFalse(RequestUriUtils.isFrontendRoute("", "/actuator"));
-    }
-
-    @Test
-    void testIsFrontendRoute_extensionlessPath() {
-        assertTrue(RequestUriUtils.isFrontendRoute("", "/merge"));
-        assertTrue(RequestUriUtils.isFrontendRoute("", "/split-pdf"));
-    }
-
-    @Test
-    void testIsFrontendRoute_pathWithExtension() {
-        assertFalse(RequestUriUtils.isFrontendRoute("", "/some/file.pdf"));
-    }
-
-    @Test
-    void testIsFrontendRoute_blankPath() {
-        assertFalse(RequestUriUtils.isFrontendRoute("", ""));
-    }
-
-    // --- isTrackableResource tests ---
-
-    @Test
-    void testIsTrackableResource_jsPath() {
-        assertFalse(RequestUriUtils.isTrackableResource("/js/app.js"));
-    }
-
-    @Test
-    void testIsTrackableResource_cssFile() {
-        assertFalse(RequestUriUtils.isTrackableResource("/some/file.css"));
-    }
-
-    @Test
-    void testIsTrackableResource_apiPage() {
-        assertTrue(RequestUriUtils.isTrackableResource("/api/v1/convert"));
-    }
-
-    @Test
-    void testIsTrackableResource_swaggerPath() {
-        assertFalse(RequestUriUtils.isTrackableResource("/swagger-ui/index.html"));
-    }
-
-    @Test
-    void testIsTrackableResource_infoApi() {
-        assertFalse(RequestUriUtils.isTrackableResource("/api/v1/info/status"));
-    }
-
-    // --- isPublicAuthEndpoint tests ---
-
-    @Test
-    void testIsPublicAuthEndpoint_loginPath() {
-        assertTrue(RequestUriUtils.isPublicAuthEndpoint("/login", ""));
-    }
-
-    @Test
-    void testIsPublicAuthEndpoint_oauthPath() {
-        assertTrue(RequestUriUtils.isPublicAuthEndpoint("/oauth2/authorization/google", ""));
-    }
-
-    @Test
-    void testIsPublicAuthEndpoint_healthEndpoint() {
-        assertTrue(RequestUriUtils.isPublicAuthEndpoint("/actuator/health", ""));
-    }
-
-    @Test
-    void testIsPublicAuthEndpoint_regularApiNotPublic() {
-        assertFalse(RequestUriUtils.isPublicAuthEndpoint("/api/v1/convert", ""));
-    }
-
-    @Test
-    void testIsPublicAuthEndpoint_withContextPath() {
-        assertTrue(RequestUriUtils.isPublicAuthEndpoint("/app/login", "/app"));
-    }
-}
@@ -1,100 +0,0 @@
-package stirling.software.common.util;
-
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Mockito.*;
-
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import stirling.software.common.model.ApplicationProperties;
-import stirling.software.common.service.SsrfProtectionService;
-
-class SvgSanitizerTest {
-
-    private SvgSanitizer sanitizer;
-    private ApplicationProperties applicationProperties;
-    private SsrfProtectionService ssrfProtectionService;
-
-    @BeforeEach
-    void setUp() {
-        applicationProperties = new ApplicationProperties();
-        ssrfProtectionService = mock(SsrfProtectionService.class);
-        sanitizer = new SvgSanitizer(ssrfProtectionService, applicationProperties);
-    }
-
-    @Test
-    void testSanitize_validSvg() throws IOException {
-        String svg = "<svg xmlns=\"http://www.w3.org/2000/svg\"><circle r=\"10\"/></svg>";
-        byte[] result = sanitizer.sanitize(svg.getBytes(StandardCharsets.UTF_8));
-        assertNotNull(result);
-        assertTrue(result.length > 0);
-        String output = new String(result, StandardCharsets.UTF_8);
-        assertTrue(output.contains("circle"));
-    }
-
-    @Test
-    void testSanitize_removesScriptElement() throws IOException {
-        String svg =
-                "<svg xmlns=\"http://www.w3.org/2000/svg\"><script>alert('xss')</script><circle r=\"10\"/></svg>";
-        byte[] result = sanitizer.sanitize(svg.getBytes(StandardCharsets.UTF_8));
-        String output = new String(result, StandardCharsets.UTF_8);
-        assertFalse(output.contains("script"));
-        assertTrue(output.contains("circle"));
-    }
-
-    @Test
-    void testSanitize_removesEventHandler() throws IOException {
-        String svg =
-                "<svg xmlns=\"http://www.w3.org/2000/svg\"><circle r=\"10\" onclick=\"alert('xss')\"/></svg>";
-        byte[] result = sanitizer.sanitize(svg.getBytes(StandardCharsets.UTF_8));
-        String output = new String(result, StandardCharsets.UTF_8);
-        assertFalse(output.contains("onclick"));
-    }
-
-    @Test
-    void testSanitize_removesJavascriptUrl() throws IOException {
-        String svg =
-                "<svg xmlns=\"http://www.w3.org/2000/svg\"><a href=\"javascript:alert('xss')\"><circle r=\"10\"/></a></svg>";
-        byte[] result = sanitizer.sanitize(svg.getBytes(StandardCharsets.UTF_8));
-        String output = new String(result, StandardCharsets.UTF_8);
-        assertFalse(output.contains("javascript"));
-    }
-
-    @Test
-    void testSanitize_nullInput() {
-        assertThrows(IOException.class, () -> sanitizer.sanitize(null));
-    }
-
-    @Test
-    void testSanitize_emptyInput() {
-        assertThrows(IOException.class, () -> sanitizer.sanitize(new byte[0]));
-    }
-
-    @Test
-    void testSanitize_disabledByConfig() throws IOException {
-        applicationProperties.getSystem().setDisableSanitize(true);
-        byte[] input =
-                "<svg xmlns=\"http://www.w3.org/2000/svg\"><script>evil</script></svg>"
-                        .getBytes(StandardCharsets.UTF_8);
-        byte[] result = sanitizer.sanitize(input);
-        assertArrayEquals(input, result);
-    }
-
-    @Test
-    void testSanitize_removesForeignObject() throws IOException {
-        String svg =
-                "<svg xmlns=\"http://www.w3.org/2000/svg\"><foreignObject><body>evil</body></foreignObject><rect width=\"10\" height=\"10\"/></svg>";
-        byte[] result = sanitizer.sanitize(svg.getBytes(StandardCharsets.UTF_8));
-        String output = new String(result, StandardCharsets.UTF_8);
-        assertFalse(output.toLowerCase().contains("foreignobject"));
-    }
-
-    @Test
-    void testSanitize_invalidXml() {
-        byte[] invalid = "not xml at all".getBytes(StandardCharsets.UTF_8);
-        assertThrows(IOException.class, () -> sanitizer.sanitize(invalid));
-    }
-}
@@ -1,137 +0,0 @@
-package stirling.software.common.util;
-
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Mockito.*;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.io.TempDir;
-
-import stirling.software.common.model.ApplicationProperties;
-
-class TempFileManagerTest {
-
-    private TempFileManager manager;
-    private TempFileRegistry registry;
-    private ApplicationProperties applicationProperties;
-
-    @TempDir Path tempDir;
-
-    @BeforeEach
-    void setUp() {
-        registry = new TempFileRegistry();
-        applicationProperties = new ApplicationProperties();
-        applicationProperties.getSystem().getTempFileManagement().setBaseTmpDir(tempDir.toString());
-        applicationProperties.getSystem().getTempFileManagement().setPrefix("test-stirling-");
-        manager = new TempFileManager(registry, applicationProperties);
-    }
-
-    @Test
-    void testCreateTempFile() throws IOException {
-        File file = manager.createTempFile(".pdf");
-        assertNotNull(file);
-        assertTrue(file.exists());
-        assertTrue(file.getName().endsWith(".pdf"));
-        assertTrue(registry.contains(file));
-    }
-
-    @Test
-    void testCreateManagedTempFile() throws IOException {
-        TempFile tempFile = manager.createManagedTempFile(".txt");
-        assertNotNull(tempFile);
-        assertTrue(tempFile.exists());
-        assertTrue(tempFile.getFile().getName().endsWith(".txt"));
-    }
-
-    @Test
-    void testCreateTempDirectory() throws IOException {
-        Path dir = manager.createTempDirectory();
-        assertNotNull(dir);
-        assertTrue(Files.isDirectory(dir));
-        assertTrue(registry.getTempDirectories().contains(dir));
-    }
-
-    @Test
-    void testDeleteTempFile_file() throws IOException {
-        File file = manager.createTempFile(".tmp");
-        assertTrue(file.exists());
-
-        boolean deleted = manager.deleteTempFile(file);
-        assertTrue(deleted);
-        assertFalse(file.exists());
-        assertFalse(registry.contains(file));
-    }
-
-    @Test
-    void testDeleteTempFile_path() throws IOException {
-        File file = manager.createTempFile(".tmp");
-        Path path = file.toPath();
-        assertTrue(Files.exists(path));
-
-        boolean deleted = manager.deleteTempFile(path);
-        assertTrue(deleted);
-        assertFalse(Files.exists(path));
-    }
-
-    @Test
-    void testDeleteTempFile_nullFile() {
-        assertFalse(manager.deleteTempFile((File) null));
-    }
-
-    @Test
-    void testDeleteTempFile_nullPath() {
-        assertFalse(manager.deleteTempFile((Path) null));
-    }
-
-    @Test
-    void testDeleteTempFile_nonExistentFile() {
-        File nonExistent = new File(tempDir.toFile(), "does-not-exist.tmp");
-        assertFalse(manager.deleteTempFile(nonExistent));
-    }
-
-    @Test
-    void testRegister() throws IOException {
-        File file = Files.createTempFile(tempDir, "existing", ".tmp").toFile();
-        File result = manager.register(file);
-        assertSame(file, result);
-        assertTrue(registry.contains(file));
-    }
-
-    @Test
-    void testRegister_nullFile() {
-        File result = manager.register(null);
-        assertNull(result);
-    }
-
-    @Test
-    void testGenerateTempFileName() {
-        String name = manager.generateTempFileName("convert", "pdf");
-        assertNotNull(name);
-        assertTrue(name.startsWith("test-stirling-"));
-        assertTrue(name.contains("convert"));
-        assertTrue(name.endsWith(".pdf"));
-    }
-
-    @Test
-    void testGetMaxAgeMillis() {
-        applicationProperties.getSystem().getTempFileManagement().setMaxAgeHours(2);
-        long millis = manager.getMaxAgeMillis();
-        assertEquals(2 * 60 * 60 * 1000L, millis);
-    }
-
-    @Test
-    void testCleanupOldTempFiles() throws IOException, InterruptedException {
-        File file = manager.createTempFile(".tmp");
-        assertTrue(file.exists());
-
-        Thread.sleep(50);
-        int deleted = manager.cleanupOldTempFiles(10);
-        assertTrue(deleted >= 1);
-        assertFalse(file.exists());
-    }
-}
@@ -1,131 +0,0 @@
-package stirling.software.common.util;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Set;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.io.TempDir;
-
-class TempFileRegistryTest {
-
-    private TempFileRegistry registry;
-
-    @TempDir Path tempDir;
-
-    @BeforeEach
-    void setUp() {
-        registry = new TempFileRegistry();
-    }
-
-    @Test
-    void testRegisterFile() throws IOException {
-        File file = Files.createTempFile(tempDir, "test", ".tmp").toFile();
-        File result = registry.register(file);
-        assertSame(file, result);
-        assertTrue(registry.contains(file));
-    }
-
-    @Test
-    void testRegisterNull() {
-        registry.register((File) null);
-        assertEquals(0, registry.getAllRegisteredFiles().size());
-    }
-
-    @Test
-    void testRegisterPath() throws IOException {
-        Path path = Files.createTempFile(tempDir, "test", ".tmp");
-        Path result = registry.register(path);
-        assertSame(path, result);
-        assertTrue(registry.getAllRegisteredFiles().contains(path));
-    }
-
-    @Test
-    void testUnregisterFile() throws IOException {
-        File file = Files.createTempFile(tempDir, "test", ".tmp").toFile();
-        registry.register(file);
-        assertTrue(registry.contains(file));
-
-        registry.unregister(file);
-        assertFalse(registry.contains(file));
-    }
-
-    @Test
-    void testUnregisterPath() throws IOException {
-        Path path = Files.createTempFile(tempDir, "test", ".tmp");
-        registry.register(path);
-        registry.unregister(path);
-        assertFalse(registry.getAllRegisteredFiles().contains(path));
-    }
-
-    @Test
-    void testUnregisterNull() {
-        // Should not throw
-        registry.unregister((File) null);
-        registry.unregister((Path) null);
-    }
-
-    @Test
-    void testRegisterDirectory() throws IOException {
-        Path dir = Files.createTempDirectory(tempDir, "testdir");
-        Path result = registry.registerDirectory(dir);
-        assertSame(dir, result);
-        assertTrue(registry.getTempDirectories().contains(dir));
-    }
-
-    @Test
-    void testRegisterThirdParty() throws IOException {
-        File file = Files.createTempFile(tempDir, "third", ".tmp").toFile();
-        File result = registry.registerThirdParty(file);
-        assertSame(file, result);
-        assertTrue(registry.getThirdPartyTempFiles().contains(file.toPath()));
-        assertTrue(registry.contains(file));
-    }
-
-    @Test
-    void testContainsNull() {
-        assertFalse(registry.contains(null));
-    }
-
-    @Test
-    void testGetFilesOlderThan() throws IOException, InterruptedException {
-        Path path = Files.createTempFile(tempDir, "old", ".tmp");
-        registry.register(path);
-
-        // Files registered just now should not be "older than 0ms" since
-        // getFilesOlderThan uses isBefore(cutoff), meaning strictly before
-        Thread.sleep(50);
-        Set<Path> oldFiles = registry.getFilesOlderThan(10);
-        assertTrue(oldFiles.contains(path));
-    }
-
-    @Test
-    void testGetFilesOlderThan_recentFiles() throws IOException {
-        Path path = Files.createTempFile(tempDir, "recent", ".tmp");
-        registry.register(path);
-
-        // With a very large maxAge, no files should be "old"
-        Set<Path> oldFiles = registry.getFilesOlderThan(999_999_999);
-        assertFalse(oldFiles.contains(path));
-    }
-
-    @Test
-    void testClear() throws IOException {
-        File file = Files.createTempFile(tempDir, "clear", ".tmp").toFile();
-        Path dir = Files.createTempDirectory(tempDir, "cleardir");
-        registry.register(file);
-        registry.registerThirdParty(file);
-        registry.registerDirectory(dir);
-
-        registry.clear();
-
-        assertEquals(0, registry.getAllRegisteredFiles().size());
-        assertEquals(0, registry.getThirdPartyTempFiles().size());
-        assertEquals(0, registry.getTempDirectories().size());
-    }
-}
@@ -1,80 +0,0 @@
-package stirling.software.common.util;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-import java.io.IOException;
-import java.nio.file.Path;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.io.TempDir;
-
-import stirling.software.common.model.ApplicationProperties;
-
-class TempFileTest {
-
-    private TempFileManager manager;
-
-    @TempDir Path tempDir;
-
-    @BeforeEach
-    void setUp() {
-        TempFileRegistry registry = new TempFileRegistry();
-        ApplicationProperties props = new ApplicationProperties();
-        props.getSystem().getTempFileManagement().setBaseTmpDir(tempDir.toString());
-        props.getSystem().getTempFileManagement().setPrefix("test-");
-        manager = new TempFileManager(registry, props);
-    }
-
-    @Test
-    void testTempFileCreation() throws IOException {
-        TempFile tempFile = new TempFile(manager, ".pdf");
-        assertNotNull(tempFile.getFile());
-        assertTrue(tempFile.exists());
-        assertTrue(tempFile.getFile().getName().endsWith(".pdf"));
-    }
-
-    @Test
-    void testGetPath() throws IOException {
-        TempFile tempFile = new TempFile(manager, ".txt");
-        Path path = tempFile.getPath();
-        assertNotNull(path);
-        assertEquals(tempFile.getFile().toPath(), path);
-    }
-
-    @Test
-    void testGetAbsolutePath() throws IOException {
-        TempFile tempFile = new TempFile(manager, ".tmp");
-        String absPath = tempFile.getAbsolutePath();
-        assertNotNull(absPath);
-        assertEquals(tempFile.getFile().getAbsolutePath(), absPath);
-    }
-
-    @Test
-    void testClose_deletesFile() throws IOException {
-        TempFile tempFile = new TempFile(manager, ".tmp");
-        assertTrue(tempFile.exists());
-
-        tempFile.close();
-        assertFalse(tempFile.exists());
-    }
-
-    @Test
-    void testTryWithResources() throws IOException {
-        TempFile tempFileRef;
-        try (TempFile tempFile = new TempFile(manager, ".tmp")) {
-            tempFileRef = tempFile;
-            assertTrue(tempFile.exists());
-        }
-        assertFalse(tempFileRef.exists());
-    }
-
-    @Test
-    void testToString() throws IOException {
-        TempFile tempFile = new TempFile(manager, ".tmp");
-        String str = tempFile.toString();
-        assertTrue(str.startsWith("TempFile{"));
-        assertTrue(str.endsWith("}"));
-        assertTrue(str.contains(tempFile.getFile().getAbsolutePath()));
-    }
-}
@@ -1,131 +0,0 @@
-package stirling.software.common.util;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Arrays;
-import java.util.List;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.io.TempDir;
-
-import stirling.software.common.model.ApplicationProperties;
-
-class TempFileUtilTest {
-
-    private TempFileManager manager;
-
-    @TempDir Path tempDir;
-
-    @BeforeEach
-    void setUp() {
-        TempFileRegistry registry = new TempFileRegistry();
-        ApplicationProperties props = new ApplicationProperties();
-        props.getSystem().getTempFileManagement().setBaseTmpDir(tempDir.toString());
-        props.getSystem().getTempFileManagement().setPrefix("test-");
-        manager = new TempFileManager(registry, props);
-    }
-
-    @Test
-    void testWithTempFile_executesAndCleansUp() throws IOException {
-        final File[] fileRef = new File[1];
-        String result =
-                TempFileUtil.withTempFile(
-                        manager,
-                        ".tmp",
-                        file -> {
-                            fileRef[0] = file;
-                            assertTrue(file.exists());
-                            return "done";
-                        });
-        assertEquals("done", result);
-        assertFalse(fileRef[0].exists());
-    }
-
-    @Test
-    void testWithMultipleTempFiles() throws IOException {
-        final List<File>[] filesRef = new List[1];
-        String result =
-                TempFileUtil.withMultipleTempFiles(
-                        manager,
-                        3,
-                        ".tmp",
-                        files -> {
-                            filesRef[0] = files;
-                            assertEquals(3, files.size());
-                            for (File f : files) {
-                                assertTrue(f.exists());
-                            }
-                            return "ok";
-                        });
-        assertEquals("ok", result);
-        for (File f : filesRef[0]) {
-            assertFalse(f.exists());
-        }
-    }
-
-    @Test
-    void testSafeDeleteFiles() throws IOException {
-        Path file1 = Files.createTempFile(tempDir, "safe", ".tmp");
-        Path file2 = Files.createTempFile(tempDir, "safe", ".tmp");
-        assertTrue(Files.exists(file1));
-        assertTrue(Files.exists(file2));
-
-        TempFileUtil.safeDeleteFiles(Arrays.asList(file1, file2));
-        assertFalse(Files.exists(file1));
-        assertFalse(Files.exists(file2));
-    }
-
-    @Test
-    void testSafeDeleteFiles_nullList() {
-        // Should not throw
-        TempFileUtil.safeDeleteFiles(null);
-    }
-
-    @Test
-    void testSafeDeleteFiles_nullElement() throws IOException {
-        Path file = Files.createTempFile(tempDir, "safe", ".tmp");
-        // Should handle null elements gracefully
-        TempFileUtil.safeDeleteFiles(Arrays.asList(null, file));
-        assertFalse(Files.exists(file));
-    }
-
-    @Test
-    void testRegisterExistingTempFile() throws IOException {
-        File file = Files.createTempFile(tempDir, "existing", ".tmp").toFile();
-        File result = TempFileUtil.registerExistingTempFile(manager, file);
-        assertSame(file, result);
-    }
-
-    @Test
-    void testRegisterExistingTempFile_nullManager() throws IOException {
-        File file = Files.createTempFile(tempDir, "existing", ".tmp").toFile();
-        File result = TempFileUtil.registerExistingTempFile(null, file);
-        assertSame(file, result);
-    }
-
-    @Test
-    void testRegisterExistingTempFile_nullFile() {
-        File result = TempFileUtil.registerExistingTempFile(manager, null);
-        assertNull(result);
-    }
-
-    @Test
-    void testTempFileCollection() throws IOException {
-        TempFileUtil.TempFileCollection collection = new TempFileUtil.TempFileCollection(manager);
-        File f1 = collection.addTempFile(".tmp");
-        File f2 = collection.addTempFile(".pdf");
-
-        assertTrue(f1.exists());
-        assertTrue(f2.exists());
-        assertEquals(2, collection.getFiles().size());
-
-        collection.close();
-        assertFalse(f1.exists());
-        assertFalse(f2.exists());
-    }
-}
--- a/Show More
+++ b/Show More