audit: jpdfium split

impl migration to pdfium for split
Delete MergeBenchmark
2026-05-22 10:04:53 +01:00 · 2026-05-22 09:43:18 +01:00 · 2026-05-21 23:00:00 +01:00 · 2026-05-21 19:11:52 +01:00 · 2026-05-21 19:03:31 +01:00 · 2026-05-21 17:46:46 +01:00
2138 changed files with 4675 additions and 38142 deletions
@@ -34,8 +34,8 @@ frontend/playwright-report/
 # Tauri/desktop builds
 src-tauri/target/
 src-tauri/dist/
-frontend/editor/src-tauri/target/
-frontend/editor/src-tauri/dist/
+frontend/src-tauri/target/
+frontend/src-tauri/dist/

 # IDE and editor
 .idea/
@@ -24,7 +24,7 @@ runs:
      id: generate-token
      uses: actions/create-github-app-token@bcd2ba49218906704ab6c1aa796996da409d3eb1 # v3.2.0
      with:
-        client-id: ${{ inputs.app-id }}
+        app-id: ${{ inputs.app-id }}
        private-key: ${{ inputs.private-key }}
    - name: Configure Git
      run: |
@@ -8,6 +8,7 @@ openapi: &openapi

 docker-base: &docker-base
  - docker/base/Dockerfile
+  - ".github/workflows/push-docker-base.yml"

 docker: &docker
  - docker/embedded/Dockerfile
@@ -38,8 +39,6 @@ project: &project
  - frontend/**
  - docker/**
  - scripts/RestartHelper.java
-  - scripts/db-migration/**
-  - .github/workflows/db-migration-test.yml

 frontend: &frontend
  - frontend/**
@@ -59,12 +58,12 @@ frontend: &frontend
 # Files that affect the Tauri desktop bundle. Gate the multi-OS Tauri build
 # job on changes to any of these.
 tauri: &tauri
-  - frontend/editor/src-tauri/**
-  - frontend/editor/src/desktop/**
-  - frontend/editor/tsconfig.desktop.vite.json
+  - frontend/src-tauri/**
+  - frontend/src/desktop/**
+  - frontend/tsconfig.desktop.json
  - frontend/package.json
  - frontend/package-lock.json
-  - frontend/editor/vite.config.ts
+  - frontend/vite.config.ts
  - .github/workflows/tauri-build.yml

 # Files that affect the AI engine (Python tool models, fixers, tests). Gate
@@ -79,7 +78,7 @@ licenses-frontend: &licenses-frontend
  - ".github/workflows/frontend-backend-licenses-update.yml"
  - "frontend/package.json"
  - "frontend/package-lock.json"
-  - "frontend/editor/scripts/generate-licenses.js"
+  - "frontend/scripts/generate-licenses.js"

 licenses-backend: &licenses-backend
  - ".github/workflows/frontend-backend-licenses-update.yml"
@@ -89,8 +88,8 @@ licenses-backend: &licenses-backend
 # Playwright job on changes to any of these on PRs.
 proprietary: &proprietary
  - app/proprietary/**
-  - frontend/editor/src/proprietary/**
-  - frontend/editor/src/core/tests/enterprise/**
+  - frontend/src/proprietary/**
+  - frontend/src/core/tests/enterprise/**
  - testing/compose/docker-compose-keycloak-oauth.yml
  - testing/compose/docker-compose-keycloak-saml.yml
  - testing/compose/keycloak-realm-oauth.json
@@ -25,8 +25,6 @@ updates:
      - "/docker/frontend"
      - "/docker/base"
      - "/docker/engine"
-      - "/docker/unoserver"
-      - "/engine"
    schedule:
      interval: "weekly"
    cooldown:
@@ -128,9 +126,9 @@ updates:

  - package-ecosystem: cargo
    directories:
-      - /frontend/editor/src-tauri
-      - /frontend/editor/src-tauri/thumbnail-handler
-      - /frontend/editor/src-tauri/provisioner
+      - /frontend/src-tauri
+      - /frontend/src-tauri/thumbnail-handler
+      - /frontend/src-tauri/provisioner
    schedule:
      interval: "weekly"
    cooldown:
@@ -51,7 +51,7 @@ labels:

  - label: 'Translation'
    files:
-      - 'frontend/editor/public/locales/[a-zA-Z]{2}-[a-zA-Z\-]{2,7}/translation.toml'
+      - 'frontend/public/locales/[a-zA-Z]{2}-[a-zA-Z\-]{2,7}/translation.toml'
      - 'scripts/ignore_translation.toml'
      - 'scripts/remove_translation_keys.sh'
      - 'scripts/replace_translation_line.sh'
@@ -69,8 +69,8 @@ labels:

  - label: 'Tauri'
    files:
-      - 'frontend/editor/src-tauri/**'
-      - 'frontend/editor/src-tauri/.*'
+      - 'frontend/src-tauri/**'
+      - 'frontend/src-tauri/.*'

  - label: 'engine'
    files:
@@ -13,7 +13,7 @@ Usage:
 """

 # Sample for Windows:
-# python .github/scripts/check_language_toml.py --reference-file frontend/editor/public/locales/en-GB/translation.toml --branch "" --files frontend/editor/public/locales/de-DE/translation.toml frontend/editor/public/locales/fr-FR/translation.toml
+# python .github/scripts/check_language_toml.py --reference-file frontend/public/locales/en-GB/translation.toml --branch "" --files frontend/public/locales/de-DE/translation.toml frontend/public/locales/fr-FR/translation.toml

 import argparse
 import glob
@@ -184,7 +184,7 @@ def check_for_differences(reference_file, file_list, branch, actor):
    if len(file_list) == 1:
        file_arr = file_list[0].split()

-    base_dir = Path.cwd() / "frontend" / "editor" / "public" / "locales"
+    base_dir = Path.cwd() / "frontend" / "public" / "locales"

    for file_path in file_arr:
        file_path = Path(file_path)
@@ -308,7 +308,7 @@ def check_for_differences(reference_file, file_list, branch, actor):
        report.append("## ❌ Overall Check Status: **_Failed_**")
        report.append("")
        report.append(
-            f"@{actor} please check your translation if it conforms to the standard. Follow the format of [en-GB/translation.toml](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/frontend/editor/public/locales/en-GB/translation.toml)"
+            f"@{actor} please check your translation if it conforms to the standard. Follow the format of [en-GB/translation.toml](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/frontend/public/locales/en-GB/translation.toml)"
        )
    else:
        report.append("## ✅ Overall Check Status: **_Success_**")
@@ -372,7 +372,6 @@ if __name__ == "__main__":
                os.path.join(
                    os.getcwd(),
                    "frontend",
-                    "editor",
                    "public",
                    "locales",
                    "*",
@@ -23,13 +23,9 @@ permissions:
  pull-requests: write

 jobs:
-  pick:
-    uses: ./.github/workflows/_runner-pick.yml
-
  check-pr:
    if: (github.event_name == 'pull_request' && github.event.action != 'closed') || github.event_name == 'workflow_dispatch'
-    needs: pick
-    runs-on: ${{ needs.pick.outputs.is_fork == 'true' && 'ubuntu-latest' || 'depot-ubuntu-24.04-4' }}
+    runs-on: ubuntu-latest
    outputs:
      should_deploy: ${{ steps.decide.outputs.should_deploy }}
      is_fork: ${{ steps.resolve.outputs.is_fork }}
@@ -39,7 +35,7 @@ jobs:
      pr_ref: ${{ steps.resolve.outputs.ref }}
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ab7a9404c0f3da075243ca237b5fac12c98deaa5 # v2.19.3
+        uses: step-security/harden-runner@a5ad31d6a139d249332a2605b85202e8c0b78450 # v2.19.1
        with:
          egress-policy: audit

@@ -101,8 +97,8 @@ jobs:
          echo "allow_fork=${allow_fork:-false}" >> $GITHUB_OUTPUT

  deploy-v2-pr:
-    needs: [pick, check-pr]
-    runs-on: ${{ needs.pick.outputs.is_fork == 'true' && 'ubuntu-latest' || 'depot-ubuntu-24.04-4' }}
+    needs: check-pr
+    runs-on: ubuntu-latest
    if: needs.check-pr.outputs.should_deploy == 'true' && (needs.check-pr.outputs.is_fork == 'false' || needs.check-pr.outputs.allow_fork == 'true')
    # Concurrency control - only one deployment per PR at a time
    concurrency:
@@ -112,14 +108,10 @@ jobs:
      contents: read
      issues: write
      pull-requests: write
-      id-token: write
-    env:
-      USE_DEPOT: ${{ needs.pick.outputs.is_fork != 'true' }}
-      DEPOT_TOKEN: ${{ secrets.DEPOT_TOKEN }}

    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ab7a9404c0f3da075243ca237b5fac12c98deaa5 # v2.19.3
+        uses: step-security/harden-runner@a5ad31d6a139d249332a2605b85202e8c0b78450 # v2.19.1
        with:
          egress-policy: audit

@@ -187,12 +179,7 @@ jobs:
          token: ${{ secrets.GITHUB_TOKEN }}
          fetch-depth: 0 # Fetch full history for commit hash detection

-      - name: Set up Depot CLI
-        if: env.USE_DEPOT == 'true'
-        uses: depot/setup-action@15c09a5f77a0840ad4bce955686522a257853461 # v1.0.0
-
      - name: Set up Docker Buildx
-        if: env.USE_DEPOT != 'true'
        uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0

      - name: Get version number
@@ -237,20 +224,8 @@ jobs:
            echo "Image needs to be built"
          fi

-      - name: Build and push V2 image (Depot)
-        if: env.USE_DEPOT == 'true' && steps.check-image.outputs.exists == 'false'
-        uses: depot/build-push-action@5f3b3c2e5a00f0093de47f657aeaefcedff27d18 # v1.16.0
-        with:
-          project: ${{ vars.DEPOT_PROJECT_ID }}
-          context: .
-          file: ./docker/embedded/Dockerfile
-          push: true
-          tags: ${{ secrets.DOCKER_HUB_USERNAME }}/test:v2-${{ steps.commit-hash.outputs.app_short }}
-          build-args: VERSION_TAG=v2-alpha
-          platforms: linux/amd64
-
-      - name: Build and push V2 image (Docker fork fallback)
-        if: env.USE_DEPOT != 'true' && steps.check-image.outputs.exists == 'false'
+      - name: Build and push V2 image
+        if: steps.check-image.outputs.exists == 'false'
        uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7.1.0
        with:
          context: .
@@ -287,7 +262,6 @@ jobs:
                - /stirling/V2-PR-${{ needs.check-pr.outputs.pr_number }}/data:/usr/share/tessdata:rw
                - /stirling/V2-PR-${{ needs.check-pr.outputs.pr_number }}/config:/configs:rw
                - /stirling/V2-PR-${{ needs.check-pr.outputs.pr_number }}/logs:/logs:rw
-                - /stirling/V2-PR-${{ needs.check-pr.outputs.pr_number }}/storage:/storage:rw
              environment:
                DISABLE_ADDITIONAL_FEATURES: "false"
                SECURITY_ENABLELOGIN: "true"
@@ -310,7 +284,7 @@ jobs:

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

            # Move docker-compose file to correct location
            mv /tmp/docker-compose-v2.yml /stirling/V2-PR-${{ needs.check-pr.outputs.pr_number }}/docker-compose.yml
@@ -377,8 +351,7 @@ jobs:

  cleanup-v2-deployment:
    if: github.event.action == 'closed'
-    needs: pick
-    runs-on: ${{ needs.pick.outputs.is_fork == 'true' && 'ubuntu-latest' || 'depot-ubuntu-24.04-4' }}
+    runs-on: ubuntu-latest
    permissions:
      contents: read
      issues: write
@@ -386,7 +359,7 @@ jobs:

    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ab7a9404c0f3da075243ca237b5fac12c98deaa5 # v2.19.3
+        uses: step-security/harden-runner@a5ad31d6a139d249332a2605b85202e8c0b78450 # v2.19.1
        with:
          egress-policy: audit

@@ -34,12 +34,8 @@ permissions:
  pull-requests: read

 jobs:
-  pick:
-    uses: ./.github/workflows/_runner-pick.yml
-
  check-comment:
-    needs: pick
-    runs-on: ${{ needs.pick.outputs.is_fork == 'true' && 'ubuntu-latest' || 'depot-ubuntu-24.04-4' }}
+    runs-on: ubuntu-latest
    permissions:
      issues: write
    if: |
@@ -74,7 +70,7 @@ jobs:
      enable_prototypes: ${{ steps.check-prototypes-flag.outputs.enable_prototypes }}
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ab7a9404c0f3da075243ca237b5fac12c98deaa5 # v2.19.3
+        uses: step-security/harden-runner@a5ad31d6a139d249332a2605b85202e8c0b78450 # v2.19.1
        with:
          egress-policy: audit

@@ -179,19 +175,15 @@ jobs:
            }

  deploy-pr:
-    needs: [pick, check-comment]
-    runs-on: ${{ needs.pick.outputs.is_fork == 'true' && 'ubuntu-latest' || 'depot-ubuntu-24.04-4' }}
+    needs: check-comment
+    runs-on: ubuntu-latest
    permissions:
      issues: write
      pull-requests: write
-      id-token: write
-    env:
-      USE_DEPOT: ${{ needs.pick.outputs.is_fork != 'true' }}
-      DEPOT_TOKEN: ${{ secrets.DEPOT_TOKEN }}

    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ab7a9404c0f3da075243ca237b5fac12c98deaa5 # v2.19.3
+        uses: step-security/harden-runner@a5ad31d6a139d249332a2605b85202e8c0b78450 # v2.19.1
        with:
          egress-policy: audit

@@ -240,12 +232,7 @@ jobs:
          MAVEN_PUBLIC_URL: ${{ secrets.MAVEN_PUBLIC_URL }}
          STIRLING_PDF_DESKTOP_UI: false

-      - name: Set up Depot CLI
-        if: env.USE_DEPOT == 'true'
-        uses: depot/setup-action@15c09a5f77a0840ad4bce955686522a257853461 # v1.0.0
-
      - name: Set up Docker Buildx
-        if: env.USE_DEPOT != 'true'
        uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0

      - name: Login to Docker Hub
@@ -254,22 +241,7 @@ jobs:
          username: ${{ secrets.DOCKER_HUB_USERNAME }}
          password: ${{ secrets.DOCKER_HUB_API }}

-      - name: Build and push PR-specific image (Depot)
-        if: env.USE_DEPOT == 'true'
-        uses: depot/build-push-action@5f3b3c2e5a00f0093de47f657aeaefcedff27d18 # v1.16.0
-        with:
-          project: ${{ vars.DEPOT_PROJECT_ID }}
-          context: .
-          file: ./docker/embedded/Dockerfile
-          push: true
-          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 PR-specific image (Docker fork fallback)
-        if: env.USE_DEPOT != 'true'
+      - name: Build and push PR-specific image
        uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7.1.0
        with:
          context: .
@@ -283,19 +255,8 @@ jobs:
            PROTOTYPES_BUILD=${{ needs.check-comment.outputs.enable_prototypes }}
          platforms: linux/amd64

-      - name: Build and push engine image (Depot)
-        if: env.USE_DEPOT == 'true' && needs.check-comment.outputs.enable_prototypes == 'true'
-        uses: depot/build-push-action@5f3b3c2e5a00f0093de47f657aeaefcedff27d18 # v1.16.0
-        with:
-          project: ${{ vars.DEPOT_PROJECT_ID }}
-          context: ./engine
-          file: ./engine/Dockerfile
-          push: true
-          tags: ${{ secrets.DOCKER_HUB_USERNAME }}/test:engine-pr-${{ needs.check-comment.outputs.pr_number }}
-          platforms: linux/amd64
-
-      - name: Build and push engine image (Docker fork fallback)
-        if: env.USE_DEPOT != 'true' && needs.check-comment.outputs.enable_prototypes == 'true'
+      - name: Build and push engine image
+        if: needs.check-comment.outputs.enable_prototypes == 'true'
        uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7.1.0
        with:
          context: ./engine
@@ -510,11 +471,10 @@ jobs:

  handle-label-commands:
    if: ${{ github.event.issue.pull_request != null }}
-    needs: pick
-    runs-on: ${{ needs.pick.outputs.is_fork == 'true' && 'ubuntu-latest' || 'depot-ubuntu-24.04-4' }}
+    runs-on: ubuntu-latest
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ab7a9404c0f3da075243ca237b5fac12c98deaa5 # v2.19.3
+        uses: step-security/harden-runner@a5ad31d6a139d249332a2605b85202e8c0b78450 # v2.19.1
        with:
          egress-policy: audit

@@ -21,7 +21,7 @@ jobs:

    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ab7a9404c0f3da075243ca237b5fac12c98deaa5 # v2.19.3
+        uses: step-security/harden-runner@a5ad31d6a139d249332a2605b85202e8c0b78450 # v2.19.1
        with:
          egress-policy: audit

@@ -1,70 +0,0 @@
-name: _runner-pick
-
-# Tiny reusable workflow that classifies the trigger as either a "fork PR
-# from an untrusted contributor" or a "trusted commit" so downstream jobs
-# can pick a runner class without each one duplicating the 200-char gate
-# expression in their own `runs-on:`.
-#
-# Caller pattern:
-#
-#   jobs:
-#     pick:
-#       uses: ./.github/workflows/_runner-pick.yml
-#
-#     real-work:
-#       needs: pick
-#       runs-on: ${{ needs.pick.outputs.is_fork == 'true' && 'ubuntu-latest' || 'depot-ubuntu-24.04-8' }}
-#       steps: [...]
-#
-# Output:
-#   is_fork: "true" when the trigger is a pull_request from a fork or an
-#            untrusted author_association, "false" otherwise.
-
-on:
-  workflow_call:
-    outputs:
-      is_fork:
-        description: '"true" if the trigger is an untrusted fork PR.'
-        value: ${{ jobs.pick.outputs.is_fork }}
-
-permissions:
-  contents: read
-
-jobs:
-  pick:
-    runs-on: ubuntu-latest
-    timeout-minutes: 1
-    outputs:
-      is_fork: ${{ steps.decide.outputs.is_fork }}
-    steps:
-      - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@ab7a9404c0f3da075243ca237b5fac12c98deaa5 # v2.19.3
-        with:
-          egress-policy: audit
-
-      - name: Classify the trigger
-        id: decide
-        env:
-          PR_NUMBER: ${{ github.event.pull_request.number }}
-          HEAD_REPO_FORK: ${{ github.event.pull_request.head.repo.fork }}
-          AUTHOR_ASSOC: ${{ github.event.pull_request.author_association }}
-        run: |
-          set -eu
-          if [ -z "${PR_NUMBER:-}" ]; then
-            # Not a pull_request event at all (push, schedule, workflow_dispatch,
-            # workflow_call from a non-PR trigger) -> trusted by default.
-            echo "is_fork=false" >> "$GITHUB_OUTPUT"
-            exit 0
-          fi
-          if [ "${HEAD_REPO_FORK}" = "true" ]; then
-            echo "is_fork=true" >> "$GITHUB_OUTPUT"
-            exit 0
-          fi
-          case "${AUTHOR_ASSOC}" in
-            OWNER|MEMBER|COLLABORATOR)
-              echo "is_fork=false" >> "$GITHUB_OUTPUT"
-              ;;
-            *)
-              echo "is_fork=true" >> "$GITHUB_OUTPUT"
-              ;;
-          esac
@@ -1,9 +1,8 @@
 name: AI Engine CI

-# Validates the Python AI engine: regenerates tool models and runs the
-# engine quality gate (lint, type-check, format-check, tests). Called from
-# build.yml on PRs and merge_group; also runs directly on push to main as
-# a post-merge safety net.
+# Validates the Python AI engine: regenerates tool models, runs fixers,
+# lint, type-check, and tests. Called from build.yml on PRs and merge_group;
+# also runs directly on push to main as a post-merge safety net.
 on:
  workflow_call:
  push:
@@ -18,16 +17,14 @@ jobs:
    permissions:
      contents: read
      pull-requests: write
-    env:
-      DEPOT_TOKEN: ${{ secrets.DEPOT_TOKEN }}
    steps:
      - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@ab7a9404c0f3da075243ca237b5fac12c98deaa5 # v2.19.3
+        uses: step-security/harden-runner@a5ad31d6a139d249332a2605b85202e8c0b78450 # v2.19.1
        with:
          egress-policy: audit

      - name: Checkout code
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1

      - name: Install uv
        uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
@@ -52,95 +49,27 @@ jobs:
        run: task engine:tool-models

      - name: Verify tool models are up to date
-        id: tool-models-check
-        continue-on-error: true
-        run: git diff --exit-code engine/src/stirling/models/tool_models.py
-
-      - name: Comment on tool models check failure
-        # Only post a comment on PRs. github-script's PR helpers need an
-        # issue/PR number, which doesn't exist on merge_group runs.
-        if: steps.tool-models-check.outcome == 'failure' && github.event_name == 'pull_request'
-        continue-on-error: true
-        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
-        with:
-          script: |
-            const marker = '<!-- tool-models-check -->';
-            const body = [
-              marker,
-              '### Tool Models Check Failed',
-              '',
-              'The generated `engine/src/stirling/models/tool_models.py` is out of date with the Java OpenAPI spec and will need to be regenerated before it can be merged in.',
-              '',
-              'Run `task engine:tool-models` to regenerate, then commit the updated file.',
-            ].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 tool models check failed
-        if: steps.tool-models-check.outcome == 'failure'
        run: |
-          echo "============================================"
-          echo "  Tool Models Check Failed"
-          echo "============================================"
-          echo ""
-          echo "The generated engine/src/stirling/models/tool_models.py"
-          echo "is out of date with the Java OpenAPI spec and will"
-          echo "need to be regenerated before it can be merged in."
-          echo ""
-          echo "Run 'task engine:tool-models' to regenerate, then"
-          echo "commit the updated file."
-          echo "============================================"
-          exit 1
+          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: Remove tool models check comment on success
-        if: steps.tool-models-check.outcome == 'success' && github.event_name == 'pull_request'
-        continue-on-error: true
-        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
-        with:
-          script: |
-            const marker = '<!-- tool-models-check -->';
-            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.deleteComment({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                comment_id: existing.id,
-              });
-            }
+      - name: Run fixers
+        run: task engine:fix

-      - name: Quality-check engine
-        id: engine-check
-        run: task engine:check
-        continue-on-error: true
+      - name: Verify fixes are committed
+        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
+          fi

-      - name: Comment on engine check failure
-        # Only post a comment on PRs. github-script's PR helpers need an
-        # issue/PR number, which doesn't exist on merge_group runs.
-        if: steps.engine-check.outcome == 'failure' && github.event_name == 'pull_request'
+      - name: Comment on fixer failures
+        if: steps.fixer_changes.outcome == 'failure' && github.event_name == 'pull_request'
        continue-on-error: true
        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
        with:
@@ -176,39 +105,11 @@ jobs:
              });
            }

-      - name: Fail if engine check failed
-        if: steps.engine-check.outcome == 'failure'
-        run: |
-          echo "============================================"
-          echo "  Engine Check Failed"
-          echo "============================================"
-          echo ""
-          echo "There are issues with your Python code that"
-          echo "will need to be fixed before they can be merged in."
-          echo ""
-          echo "Run 'task engine:fix' to auto-fix what can be"
-          echo "fixed automatically, then run 'task engine:check'"
-          echo "to see what still needs fixing manually."
-          echo "============================================"
-          exit 1
+      - name: Run linting
+        run: task engine:lint

-      - name: Remove engine check comment on success
-        if: steps.engine-check.outcome == 'success' && github.event_name == 'pull_request'
-        continue-on-error: true
-        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
-        with:
-          script: |
-            const marker = '<!-- engine-check -->';
-            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.deleteComment({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                comment_id: existing.id,
-              });
-            }
+      - name: Run type checking
+        run: task engine:typecheck
+
+      - name: Run tests
+        run: task engine:test
@@ -19,7 +19,7 @@ jobs:

    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ab7a9404c0f3da075243ca237b5fac12c98deaa5 # v2.19.3
+        uses: step-security/harden-runner@a5ad31d6a139d249332a2605b85202e8c0b78450 # v2.19.1
        with:
          egress-policy: audit

@@ -87,7 +87,7 @@ jobs:
      - name: AI PR Title Analysis
        if: steps.actor.outputs.is_repo_dev == 'true'
        id: ai-title-analysis
-        uses: actions/ai-inference@17ff458cb182449bbb2e43701fcd98f6af8f6570 # v2.1.0
+        uses: actions/ai-inference@e09e65981758de8b2fdab13c2bfb7c7d5493b0b6 # v2.0.7
        with:
          model: openai/gpt-4o
          system-prompt-file: ".github/config/system-prompt.txt"
@@ -26,7 +26,7 @@ jobs:
      jar_sha256: ${{ steps.hashes.outputs.jar_sha256 }}
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ab7a9404c0f3da075243ca237b5fac12c98deaa5 # v2.19.3
+        uses: step-security/harden-runner@a5ad31d6a139d249332a2605b85202e8c0b78450 # v2.19.1
        with:
          egress-policy: audit

@@ -70,12 +70,12 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ab7a9404c0f3da075243ca237b5fac12c98deaa5 # v2.19.3
+        uses: step-security/harden-runner@a5ad31d6a139d249332a2605b85202e8c0b78450 # v2.19.1
        with:
          egress-policy: audit

      - name: Checkout repository (for PKGBUILD templates)
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1

      - name: Update stirling-pdf-desktop PKGBUILD
        env:
@@ -106,7 +106,7 @@ jobs:

      - name: Publish stirling-pdf-desktop to AUR
        if: ${{ github.event_name == 'release' || inputs.dry_run == false }}
-        uses: KSXGitHub/github-actions-deploy-aur@da03e160361ce01bf087e790b6ffd196d7dccff7 # v4.1.3
+        uses: KSXGitHub/github-actions-deploy-aur@v4.1.3
        with:
          pkgname: stirling-pdf-desktop
          pkgbuild: .github/aur/stirling-pdf-desktop/PKGBUILD
@@ -16,7 +16,7 @@ jobs:
      pull-requests: write
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ab7a9404c0f3da075243ca237b5fac12c98deaa5 # v2.19.3
+        uses: step-security/harden-runner@a5ad31d6a139d249332a2605b85202e8c0b78450 # v2.19.1
        with:
          egress-policy: audit

@@ -13,14 +13,8 @@ permissions:
  pull-requests: write

 jobs:
-  pick:
-    uses: ./.github/workflows/_runner-pick.yml
-
  build:
-    needs: pick
-    runs-on: ${{ needs.pick.outputs.is_fork == 'true' && 'ubuntu-latest' || 'depot-ubuntu-24.04-8' }}
-    env:
-      DEPOT_TOKEN: ${{ secrets.DEPOT_TOKEN }}
+    runs-on: ubuntu-latest
    strategy:
      fail-fast: false
      matrix:
@@ -28,7 +22,7 @@ jobs:
        spring-security: [true, false]
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ab7a9404c0f3da075243ca237b5fac12c98deaa5 # v2.19.3
+        uses: step-security/harden-runner@a5ad31d6a139d249332a2605b85202e8c0b78450 # v2.19.1
        with:
          egress-policy: audit
      - name: Checkout repository
@@ -67,7 +61,7 @@ jobs:
          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
          MAVEN_PUBLIC_URL: ${{ secrets.MAVEN_PUBLIC_URL }}

-      - name: Comment on backend format check failure
+      - name: Comment on Java formatting failure
        # Only post a comment on PRs. github-script's PR helpers need an
        # issue/PR number, which doesn't exist on merge_group runs.
        if: steps.spotless-check.outcome == 'failure' && github.event_name == 'pull_request'
@@ -78,11 +72,15 @@ jobs:
            const marker = '<!-- java-formatting-check -->';
            const body = [
              marker,
-              '### Backend Format Check Failed',
+              '### Java Formatting Check Failed',
              '',
-              'There are formatting issues in your Java code that will need to be fixed before they can be merged in.',
+              'Your code has formatting issues. Run the following command to fix them:',
              '',
-              'Run `task backend:format` to auto-fix, then commit and push the changes.',
+              '```bash',
+              'task backend:format',
+              '```',
+              '',
+              'Then commit and push the changes.',
            ].join('\n');
            const { data: comments } = await github.rest.issues.listComments({
              owner: context.repo.owner,
@@ -106,43 +104,22 @@ jobs:
              });
            }

-      - name: Fail if backend format check failed
+      - name: Fail if Java formatting issues found
        if: steps.spotless-check.outcome == 'failure'
        run: |
          echo "============================================"
-          echo "  Backend Format Check Failed"
+          echo "  Java Formatting Check Failed"
          echo "============================================"
          echo ""
-          echo "There are formatting issues in your Java code"
-          echo "that will need to be fixed before they can be"
-          echo "merged in."
+          echo "Your code has formatting issues."
+          echo "Run the following command to fix them:"
          echo ""
-          echo "Run 'task backend:format' to auto-fix, then"
-          echo "commit and push the changes."
+          echo "  task backend:format"
+          echo ""
+          echo "Then commit and push the changes."
          echo "============================================"
          exit 1

-      - name: Remove backend format check comment on success
-        if: steps.spotless-check.outcome == 'success' && github.event_name == 'pull_request'
-        continue-on-error: true
-        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
-        with:
-          script: |
-            const marker = '<!-- java-formatting-check -->';
-            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.deleteComment({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                comment_id: existing.id,
-              });
-            }
-
      - name: Build with Gradle and spring security ${{ matrix.spring-security }}
        run: task backend:build:ci
        env:
@@ -17,23 +17,11 @@ name: Enterprise E2E (Playwright)

 on:
  workflow_call:
-    inputs:
-      depot_cores:
-        description: "Depot runner vCPU count (used in runs-on). Override for benchmarking."
-        required: false
-        type: string
-        default: "8"
  push:
    branches: ["main"]
  schedule:
    - cron: "0 4 * * *"
  workflow_dispatch:
-    inputs:
-      depot_cores:
-        description: "Depot runner vCPU count (used in runs-on). Override for benchmarking."
-        required: false
-        type: string
-        default: "8"

 # No `concurrency:` block here on purpose. When this workflow is called via
 # workflow_call from build.yml, ${{ github.workflow }}/event_name/pr_number
@@ -47,21 +35,16 @@ permissions:
  contents: read

 jobs:
-  pick:
-    uses: ./.github/workflows/_runner-pick.yml
-
  playwright-e2e-enterprise:
-    needs: pick
-    runs-on: ${{ needs.pick.outputs.is_fork == 'true' && 'ubuntu-latest' || format('depot-ubuntu-24.04-{0}', inputs.depot_cores || '8') }}
+    runs-on: ubuntu-latest
    timeout-minutes: 45
    env:
      PREMIUM_KEY: ${{ secrets.PREMIUM_KEY_ENTERPRISE }}
      PREMIUM_ENABLED: "true"
      SYSTEM_ENABLEANALYTICS: "false"
-      DEPOT_TOKEN: ${{ secrets.DEPOT_TOKEN }}
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ab7a9404c0f3da075243ca237b5fac12c98deaa5 # v2.19.3
+        uses: step-security/harden-runner@a5ad31d6a139d249332a2605b85202e8c0b78450 # v2.19.1
        with:
          egress-policy: audit
      - name: Checkout repository
@@ -285,5 +268,5 @@ jobs:
        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
        with:
          name: playwright-report-enterprise-${{ github.run_id }}
-          path: frontend/editor/playwright-report/
+          path: frontend/playwright-report/
          retention-days: 7
@@ -46,7 +46,7 @@ jobs:
      proprietary: ${{ steps.changes.outputs.proprietary }}
    steps:
      - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@ab7a9404c0f3da075243ca237b5fac12c98deaa5 # v2.19.3
+        uses: step-security/harden-runner@a5ad31d6a139d249332a2605b85202e8c0b78450 # v2.19.1
        with:
          egress-policy: audit
      - name: Checkout repository
@@ -68,18 +68,6 @@ jobs:
    uses: ./.github/workflows/backend-build.yml
    secrets: inherit

-  db-migration-test:
-    # Boots the current bootJar against H2 fixtures captured from past
-    # releases (v2.0.0 / v2.5.0 / v2.10.0) and verifies admin login still
-    # works after Hibernate's ddl-auto=update migrates the schema. Gated on
-    # the `project` filter so doc-only PRs skip this ~5-minute job.
-    if: needs.files-changed.outputs.project == 'true'
-    needs: [files-changed]
-    permissions:
-      contents: read
-    uses: ./.github/workflows/db-migration-test.yml
-    secrets: inherit
-
  check-generateOpenApiDocs:
    if: needs.files-changed.outputs.openapi == 'true'
    needs: [files-changed]
@@ -147,7 +135,6 @@ jobs:
    permissions:
      contents: read
      packages: read
-      id-token: write
    uses: ./.github/workflows/test-build-docker.yml
    secrets: inherit
    with:
@@ -196,7 +183,6 @@ jobs:
    needs:
      - files-changed
      - build
-      - db-migration-test
      - check-generateOpenApiDocs
      - frontend-validation
      - playwright-e2e
@@ -211,17 +197,11 @@ jobs:
      - dependency-review
    runs-on: ubuntu-latest
    steps:
-      - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@ab7a9404c0f3da075243ca237b5fac12c98deaa5 # v2.19.3
-        with:
-          egress-policy: audit
-
      - name: Verify every required job passed (or was legitimately skipped)
        env:
          RESULTS: |
            files-changed=${{ needs.files-changed.result }}
            build=${{ needs.build.result }}
-            db-migration-test=${{ needs.db-migration-test.result }}
            check-generateOpenApiDocs=${{ needs.check-generateOpenApiDocs.result }}
            frontend-validation=${{ needs.frontend-validation.result }}
            playwright-e2e=${{ needs.playwright-e2e.result }}
@@ -11,11 +11,9 @@ permissions:
 jobs:
  check-licence:
    runs-on: ubuntu-latest
-    env:
-      DEPOT_TOKEN: ${{ secrets.DEPOT_TOKEN }}
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ab7a9404c0f3da075243ca237b5fac12c98deaa5 # v2.19.3
+        uses: step-security/harden-runner@a5ad31d6a139d249332a2605b85202e8c0b78450 # v2.19.1
        with:
          egress-policy: audit

@@ -10,17 +10,11 @@ permissions:
  contents: read

 jobs:
-  pick:
-    uses: ./.github/workflows/_runner-pick.yml
-
  check-generate-openapi-docs:
-    needs: pick
-    runs-on: ${{ needs.pick.outputs.is_fork == 'true' && 'ubuntu-latest' || 'depot-ubuntu-24.04-4' }}
-    env:
-      DEPOT_TOKEN: ${{ secrets.DEPOT_TOKEN }}
+    runs-on: ubuntu-latest
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ab7a9404c0f3da075243ca237b5fac12c98deaa5 # v2.19.3
+        uses: step-security/harden-runner@a5ad31d6a139d249332a2605b85202e8c0b78450 # v2.19.1
        with:
          egress-policy: audit

@@ -6,7 +6,7 @@ on:
  pull_request_target:
    types: [opened, synchronize, reopened]
    paths:
-      - "frontend/editor/public/locales/*/translation.toml"
+      - "frontend/public/locales/*/translation.toml"
      - ".github/scripts/check_language_toml.py"
      - ".github/workflows/check_toml.yml"

@@ -27,7 +27,7 @@ jobs:
      pull-requests: write # Allow writing to pull requests
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ab7a9404c0f3da075243ca237b5fac12c98deaa5 # v2.19.3
+        uses: step-security/harden-runner@a5ad31d6a139d249332a2605b85202e8c0b78450 # v2.19.1
        with:
          egress-policy: audit

@@ -76,7 +76,7 @@ jobs:
            exit 1
          fi
          # Get changed files and filter for TOML translation files
-          gh pr view ${{ steps.get-pr-data.outputs.pr_number }} --json files -q ".files[].path" | grep -E '^frontend/editor/public/locales/[a-zA-Z-]+/translation\.toml$' > changed_files.txt || echo "No matching TOML files found in PR"
+          gh pr view ${{ steps.get-pr-data.outputs.pr_number }} --json files -q ".files[].path" | grep -E '^frontend/public/locales/[a-zA-Z-]+/translation\.toml$' > changed_files.txt || echo "No matching TOML files found in PR"
          # Check if any files were found
          if [ ! -s changed_files.txt ]; then
            echo "No TOML translation files changed in this PR"
@@ -166,12 +166,12 @@ jobs:

            // Determine reference file
            let referenceFilePath;
-            if (changedFiles.includes("frontend/editor/public/locales/en-GB/translation.toml")) {
+            if (changedFiles.includes("frontend/public/locales/en-GB/translation.toml")) {
              console.log("Using PR branch reference file.");
              const { data: fileContent } = await github.rest.repos.getContent({
                owner: prRepoOwner,
                repo: prRepoName,
-                path: "frontend/editor/public/locales/en-GB/translation.toml",
+                path: "frontend/public/locales/en-GB/translation.toml",
                ref: branch,
              });

@@ -183,7 +183,7 @@ jobs:
              const { data: fileContent } = await github.rest.repos.getContent({
                owner: repoOwner,
                repo: repoName,
-                path: "frontend/editor/public/locales/en-GB/translation.toml",
+                path: "frontend/public/locales/en-GB/translation.toml",
                ref: "main",
              });

@@ -1,93 +0,0 @@
-name: DB migration smoke test
-
-# Boots the current Stirling-PDF JAR against H2 fixtures captured from past
-# releases (v2.0.0 / v2.5.0 / v2.10.0) and verifies admin login still works.
-# Catches schema changes that would break existing user databases under
-# Hibernate's `ddl-auto=update` upgrade path.
-
-on:
-  workflow_call:
-
-permissions:
-  contents: read
-
-jobs:
-  pick:
-    uses: ./.github/workflows/_runner-pick.yml
-
-  migration-test:
-    needs: pick
-    runs-on: ${{ needs.pick.outputs.is_fork == 'true' && 'ubuntu-latest' || 'depot-ubuntu-24.04-8' }}
-    timeout-minutes: 30
-    env:
-      DEPOT_TOKEN: ${{ secrets.DEPOT_TOKEN }}
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@ab7a9404c0f3da075243ca237b5fac12c98deaa5 # v2.19.3
-        with:
-          egress-policy: audit
-
-      - name: Checkout repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-
-      - name: Set up JDK 25
-        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
-        with:
-          java-version: 25
-          distribution: temurin
-
-      - name: Cache Gradle dependency artifacts
-        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
-        with:
-          path: |
-            ~/.gradle/wrapper
-            ~/.gradle/caches/modules-2/files-2.1
-            ~/.gradle/caches/modules-2/metadata-2.*
-          key: gradle-deps-${{ runner.os }}-jdk-25-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties', '**/*.gradle', '**/*.gradle.kts', 'settings.gradle', 'settings.gradle.kts', 'gradle/libs.versions.toml') }}
-
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6.1.0
-        with:
-          gradle-version: 9.3.1
-          cache-disabled: true
-
-      # No `-PnoSpotless` here yet because the upstream cache layer matches the
-      # backend build's; reuse keeps cold-cache cost identical.
-      - name: Build Stirling-PDF JAR
-        env:
-          MAVEN_USER: ${{ secrets.MAVEN_USER }}
-          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
-          MAVEN_PUBLIC_URL: ${{ secrets.MAVEN_PUBLIC_URL }}
-        run: ./gradlew :stirling-pdf:bootJar -PnoSpotless --no-daemon
-
-      - name: Locate built JAR
-        id: jar
-        run: |
-          jar=$(find app/core/build/libs -maxdepth 1 -name 'Stirling-PDF*.jar' -o -name 'stirling-pdf*.jar' 2>/dev/null \
-              | grep -vE '(-plain|-sources)\.jar$' | head -n 1)
-          if [[ -z "$jar" ]]; then
-            echo "::error::No JAR under app/core/build/libs"
-            ls -lah app/core/build/libs || true
-            exit 1
-          fi
-          # Absolute path - the migration script pushd's into a temp workdir
-          # before invoking java, which would dangle a relative path.
-          jar=$(realpath "$jar")
-          echo "path=$jar" >> "$GITHUB_OUTPUT"
-          echo "Built JAR: $jar"
-
-      - name: Run migration smoke test
-        env:
-          STIRLING_JAR: ${{ steps.jar.outputs.path }}
-        run: bash scripts/db-migration/run-migration-test.sh
-
-      - name: Upload app logs on failure
-        if: failure()
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
-        with:
-          name: db-migration-app-logs
-          # Path matches the preserved workdir in run-migration-test.sh -
-          # only failing fixtures leave a directory behind.
-          path: /tmp/stirling-migration-failed-*/app.log
-          retention-days: 7
-          if-no-files-found: warn
@@ -14,7 +14,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ab7a9404c0f3da075243ca237b5fac12c98deaa5 # v2.19.3
+        uses: step-security/harden-runner@a5ad31d6a139d249332a2605b85202e8c0b78450 # v2.19.1
        with:
          egress-policy: audit

@@ -10,37 +10,22 @@ permissions:
  contents: read

 jobs:
-  pick:
-    uses: ./.github/workflows/_runner-pick.yml
-
  deploy-v2-on-push:
-    needs: pick
-    runs-on: ${{ needs.pick.outputs.is_fork == 'true' && 'ubuntu-latest' || 'depot-ubuntu-24.04-4' }}
+    runs-on: ubuntu-latest
    concurrency:
      group: deploy-v2-push-V2
      cancel-in-progress: true
-    permissions:
-      contents: read
-      id-token: write
-    env:
-      USE_DEPOT: ${{ needs.pick.outputs.is_fork != 'true' }}
-      DEPOT_TOKEN: ${{ secrets.DEPOT_TOKEN }}

    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ab7a9404c0f3da075243ca237b5fac12c98deaa5 # v2.19.3
+        uses: step-security/harden-runner@a5ad31d6a139d249332a2605b85202e8c0b78450 # v2.19.1
        with:
          egress-policy: audit

      - name: Checkout code
        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2

-      - name: Set up Depot CLI
-        if: env.USE_DEPOT == 'true'
-        uses: depot/setup-action@15c09a5f77a0840ad4bce955686522a257853461 # v1.0.0
-
      - name: Set up Docker Buildx
-        if: env.USE_DEPOT != 'true'
        uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0

      - name: Get commit hashes for frontend and backend
@@ -105,22 +90,8 @@ jobs:
          username: ${{ secrets.DOCKER_HUB_USERNAME }}
          password: ${{ secrets.DOCKER_HUB_API }}

-      - name: Build and push frontend image (Depot)
-        if: env.USE_DEPOT == 'true' && steps.check-frontend.outputs.exists == 'false'
-        uses: depot/build-push-action@5f3b3c2e5a00f0093de47f657aeaefcedff27d18 # v1.16.0
-        with:
-          project: ${{ vars.DEPOT_PROJECT_ID }}
-          context: .
-          file: ./docker/frontend/Dockerfile
-          push: true
-          tags: |
-            ${{ secrets.DOCKER_HUB_USERNAME }}/test:v2-frontend-${{ steps.commit-hashes.outputs.frontend_short }}
-            ${{ secrets.DOCKER_HUB_USERNAME }}/test:v2-frontend-latest
-          build-args: VERSION_TAG=v2-alpha
-          platforms: linux/amd64
-
-      - name: Build and push frontend image (Docker fork fallback)
-        if: env.USE_DEPOT != 'true' && steps.check-frontend.outputs.exists == 'false'
+      - name: Build and push frontend image
+        if: steps.check-frontend.outputs.exists == 'false'
        uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7.1.0
        with:
          context: .
@@ -134,22 +105,8 @@ jobs:
          build-args: VERSION_TAG=v2-alpha
          platforms: linux/amd64

-      - name: Build and push backend image (Depot)
-        if: env.USE_DEPOT == 'true' && steps.check-backend.outputs.exists == 'false'
-        uses: depot/build-push-action@5f3b3c2e5a00f0093de47f657aeaefcedff27d18 # v1.16.0
-        with:
-          project: ${{ vars.DEPOT_PROJECT_ID }}
-          context: .
-          file: ./docker/backend/Dockerfile
-          push: true
-          tags: |
-            ${{ secrets.DOCKER_HUB_USERNAME }}/test:v2-backend-${{ steps.commit-hashes.outputs.backend_short }}
-            ${{ secrets.DOCKER_HUB_USERNAME }}/test:v2-backend-latest
-          build-args: VERSION_TAG=v2-alpha
-          platforms: linux/amd64
-
-      - name: Build and push backend image (Docker fork fallback)
-        if: env.USE_DEPOT != 'true' && steps.check-backend.outputs.exists == 'false'
+      - name: Build and push backend image
+        if: steps.check-backend.outputs.exists == 'false'
        uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7.1.0
        with:
          context: .
@@ -11,32 +11,21 @@ on:
        required: false
        type: string
        default: "false"
-      depot_cores:
-        description: "Depot runner vCPU count (used in runs-on). Override for benchmarking. Tuned to 4 because bench showed 16 was within noise of 4."
-        required: false
-        type: string
-        default: "4"

 permissions:
  contents: read

 jobs:
-  pick:
-    uses: ./.github/workflows/_runner-pick.yml
-
  docker-compose-tests:
-    needs: pick
-    runs-on: ${{ needs.pick.outputs.is_fork == 'true' && 'ubuntu-latest' || format('depot-ubuntu-24.04-{0}', inputs.depot_cores || '4') }}
+    runs-on: ubuntu-latest
    permissions:
      actions: write
      contents: read
      checks: write
-    env:
-      DEPOT_TOKEN: ${{ secrets.DEPOT_TOKEN }}

    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ab7a9404c0f3da075243ca237b5fac12c98deaa5 # v2.19.3
+        uses: step-security/harden-runner@a5ad31d6a139d249332a2605b85202e8c0b78450 # v2.19.1
        with:
          egress-policy: audit

@@ -5,27 +5,17 @@ name: Playwright E2E (live backend)
 # server.
 on:
  workflow_call:
-    inputs:
-      depot_cores:
-        description: "Depot runner vCPU count (used in runs-on). Override for benchmarking."
-        required: false
-        type: string
-        default: "8"

 permissions:
  contents: read

 jobs:
-  pick:
-    uses: ./.github/workflows/_runner-pick.yml
-
  playwright-e2e-live:
-    needs: pick
-    runs-on: ${{ needs.pick.outputs.is_fork == 'true' && 'ubuntu-latest' || format('depot-ubuntu-24.04-{0}', inputs.depot_cores || '8') }}
+    runs-on: ubuntu-latest
    timeout-minutes: 30
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ab7a9404c0f3da075243ca237b5fac12c98deaa5 # v2.19.3
+        uses: step-security/harden-runner@a5ad31d6a139d249332a2605b85202e8c0b78450 # v2.19.1
        with:
          egress-policy: audit
      - name: Checkout repository
@@ -70,5 +60,5 @@ jobs:
        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
        with:
          name: playwright-report-live-${{ github.run_id }}
-          path: frontend/editor/playwright-report/
+          path: frontend/playwright-report/
          retention-days: 7
@@ -5,26 +5,16 @@ name: Playwright E2E (stubbed)
 # mocks API responses in the browser.
 on:
  workflow_call:
-    inputs:
-      depot_cores:
-        description: "Depot runner vCPU count (used in runs-on). Override for benchmarking. Tuned to 8 to match the other playwright workflows; bench showed flat scaling above 8."
-        required: false
-        type: string
-        default: "8"

 permissions:
  contents: read

 jobs:
-  pick:
-    uses: ./.github/workflows/_runner-pick.yml
-
  playwright-e2e:
-    needs: pick
-    runs-on: ${{ needs.pick.outputs.is_fork == 'true' && 'ubuntu-latest' || format('depot-ubuntu-24.04-{0}', inputs.depot_cores || '8') }}
+    runs-on: ubuntu-latest
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ab7a9404c0f3da075243ca237b5fac12c98deaa5 # v2.19.3
+        uses: step-security/harden-runner@a5ad31d6a139d249332a2605b85202e8c0b78450 # v2.19.1
        with:
          egress-policy: audit
      - name: Checkout repository
@@ -50,5 +40,5 @@ jobs:
        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
        with:
          name: playwright-report-stubbed-${{ github.run_id }}
-          path: frontend/editor/playwright-report/
+          path: frontend/playwright-report/
          retention-days: 7
@@ -19,20 +19,16 @@ permissions:
  contents: read

 jobs:
-  pick:
-    uses: ./.github/workflows/_runner-pick.yml
-
  files-changed:
    name: detect what files changed
-    needs: pick
-    runs-on: ${{ needs.pick.outputs.is_fork == 'true' && 'ubuntu-latest' || 'depot-ubuntu-24.04-4' }}
+    runs-on: ubuntu-latest
    timeout-minutes: 3
    outputs:
      licenses-frontend: ${{ steps.changes.outputs.licenses-frontend }}
      licenses-backend: ${{ steps.changes.outputs.licenses-backend }}
    steps:
      - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@ab7a9404c0f3da075243ca237b5fac12c98deaa5 # v2.19.3
+        uses: step-security/harden-runner@a5ad31d6a139d249332a2605b85202e8c0b78450 # v2.19.1
        with:
          egress-policy: audit

@@ -48,15 +44,15 @@ jobs:
  generate-frontend-license-report:
    if: needs.files-changed.outputs.licenses-frontend == 'true'
    name: Generate Frontend License Report
-    needs: [pick, files-changed]
-    runs-on: ${{ needs.pick.outputs.is_fork == 'true' && 'ubuntu-latest' || 'depot-ubuntu-24.04-4' }}
+    needs: files-changed
+    runs-on: ubuntu-latest
    permissions:
      contents: write
      pull-requests: write
      repository-projects: write # Required for enabling automerge
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ab7a9404c0f3da075243ca237b5fac12c98deaa5 # v2.19.3
+        uses: step-security/harden-runner@a5ad31d6a139d249332a2605b85202e8c0b78450 # v2.19.1
        with:
          egress-policy: audit

@@ -118,23 +114,23 @@ jobs:
        env:
          PR_IS_FORK: "true"
        run: |
-          node base/frontend/editor/scripts/generate-licenses.js \
-            --input frontend/editor/src/assets/3rdPartyLicenses.json
+          node base/frontend/scripts/generate-licenses.js \
+            --input frontend/src/assets/3rdPartyLicenses.json

      - name: Copy postprocessed artifacts back (fork PRs)
        if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork == true
        run: |
-          mkdir -p frontend/editor/src/assets
-          if [ -f "base/frontend/editor/src/assets/3rdPartyLicenses.json" ]; then
-            cp base/frontend/editor/src/assets/3rdPartyLicenses.json frontend/editor/src/assets/3rdPartyLicenses.json
+          mkdir -p frontend/src/assets
+          if [ -f "base/frontend/src/assets/3rdPartyLicenses.json" ]; then
+            cp base/frontend/src/assets/3rdPartyLicenses.json frontend/src/assets/3rdPartyLicenses.json
          fi
-          if [ -f "base/frontend/editor/src/assets/license-warnings.json" ]; then
-            cp base/frontend/editor/src/assets/license-warnings.json frontend/editor/src/assets/license-warnings.json
+          if [ -f "base/frontend/src/assets/license-warnings.json" ]; then
+            cp base/frontend/src/assets/license-warnings.json frontend/src/assets/license-warnings.json
          fi

      - name: Check for license warnings
        run: |
-          if [ -f "frontend/editor/src/assets/license-warnings.json" ]; then
+          if [ -f "frontend/src/assets/license-warnings.json" ]; then
            echo "LICENSE_WARNINGS_EXIST=true" >> $GITHUB_ENV
          else
            echo "LICENSE_WARNINGS_EXIST=false" >> $GITHUB_ENV
@@ -182,10 +178,10 @@ jobs:
            echo ""
            if [ "${LICENSE_WARNINGS_EXIST}" = "true" ]; then
              echo "❌ **Failed** – incompatible or unknown licenses found."
-              if [ -f "frontend/editor/src/assets/license-warnings.json" ]; then
+              if [ -f "frontend/src/assets/license-warnings.json" ]; then
                echo ""
                echo "### Warnings"
-                jq -r '.warnings[] | "- \(.message)"' frontend/editor/src/assets/license-warnings.json || true
+                jq -r '.warnings[] | "- \(.message)"' frontend/src/assets/license-warnings.json || true
              fi
            else
              echo "✅ **Passed** – no license warnings detected."
@@ -211,7 +207,7 @@ jobs:
              const fs = require('fs');
              let warningDetails = '';
              try {
-                const warnings = JSON.parse(fs.readFileSync('frontend/editor/src/assets/license-warnings.json', 'utf8'));
+                const warnings = JSON.parse(fs.readFileSync('frontend/src/assets/license-warnings.json', 'utf8'));
                warningDetails = warnings.warnings.map(w => `- ${w.message}`).join('\n');
              } catch (e) {
                warningDetails = 'Unable to read warning details';
@@ -251,7 +247,7 @@ jobs:
      - name: Commit changes (Push only)
        if: github.event_name == 'push'
        run: |
-          git add frontend/editor/src/assets/3rdPartyLicenses.json
+          git add frontend/src/assets/3rdPartyLicenses.json
          # Note: Do NOT commit license-warnings.json - it's only for PR review
          git diff --staged --quiet || echo "CHANGES_DETECTED=true" >> $GITHUB_ENV

@@ -269,7 +265,7 @@ jobs:

          The following licenses may require review for corporate compatibility:

-          $(cat frontend/editor/src/assets/license-warnings.json | jq -r '.warnings[].message')
+          $(cat frontend/src/assets/license-warnings.json | jq -r '.warnings[].message')

          Please review these licenses to ensure they are acceptable for your use case."
          fi
@@ -311,18 +307,16 @@ jobs:

  generate-backend-license-report:
    if: needs.files-changed.outputs.licenses-backend == 'true'
-    needs: [pick, files-changed]
+    needs: files-changed
    name: Generate Backend License Report
-    runs-on: ${{ needs.pick.outputs.is_fork == 'true' && 'ubuntu-latest' || 'depot-ubuntu-24.04-4' }}
+    runs-on: ubuntu-latest
    permissions:
      contents: write
      pull-requests: write
      repository-projects: write # Required for enabling automerge
-    env:
-      DEPOT_TOKEN: ${{ secrets.DEPOT_TOKEN }}
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ab7a9404c0f3da075243ca237b5fac12c98deaa5 # v2.19.3
+        uses: step-security/harden-runner@a5ad31d6a139d249332a2605b85202e8c0b78450 # v2.19.1
        with:
          egress-policy: audit

@@ -11,15 +11,11 @@ permissions:
  pull-requests: write

 jobs:
-  pick:
-    uses: ./.github/workflows/_runner-pick.yml
-
  frontend-validation:
-    needs: pick
-    runs-on: ${{ needs.pick.outputs.is_fork == 'true' && 'ubuntu-latest' || 'depot-ubuntu-24.04-4' }}
+    runs-on: ubuntu-latest
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ab7a9404c0f3da075243ca237b5fac12c98deaa5 # v2.19.3
+        uses: step-security/harden-runner@a5ad31d6a139d249332a2605b85202e8c0b78450 # v2.19.1
        with:
          egress-policy: audit
      - name: Checkout repository
@@ -113,5 +109,5 @@ jobs:
        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
        with:
          name: frontend-build
-          path: frontend/editor/dist/
+          path: frontend/dist/
          retention-days: 3
@@ -15,7 +15,7 @@ jobs:
      issues: write
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ab7a9404c0f3da075243ca237b5fac12c98deaa5 # v2.19.3
+        uses: step-security/harden-runner@a5ad31d6a139d249332a2605b85202e8c0b78450 # v2.19.1
        with:
          egress-policy: audit

@@ -36,19 +36,15 @@ permissions:
  contents: read

 jobs:
-  pick:
-    uses: ./.github/workflows/_runner-pick.yml
-
  determine-matrix:
    if: ${{ vars.CI_PROFILE != 'lite' }}
-    needs: pick
-    runs-on: ${{ needs.pick.outputs.is_fork == 'true' && 'ubuntu-latest' || 'depot-ubuntu-24.04-4' }}
+    runs-on: ubuntu-latest
    outputs:
      matrix: ${{ steps.set-matrix.outputs.matrix }}
      version: ${{ steps.versionNumber.outputs.versionNumber }}
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ab7a9404c0f3da075243ca237b5fac12c98deaa5 # v2.19.3
+        uses: step-security/harden-runner@a5ad31d6a139d249332a2605b85202e8c0b78450 # v2.19.1
        with:
          egress-policy: audit

@@ -112,10 +108,8 @@ jobs:
          fi

  build-jars:
-    needs: [pick, determine-matrix]
-    runs-on: ${{ needs.pick.outputs.is_fork == 'true' && 'ubuntu-latest' || 'depot-ubuntu-24.04-4' }}
-    env:
-      DEPOT_TOKEN: ${{ secrets.DEPOT_TOKEN }}
+    needs: determine-matrix
+    runs-on: ubuntu-latest
    strategy:
      matrix:
        variant:
@@ -133,7 +127,7 @@ jobs:
            file_suffix: "-server"
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ab7a9404c0f3da075243ca237b5fac12c98deaa5 # v2.19.3
+        uses: step-security/harden-runner@a5ad31d6a139d249332a2605b85202e8c0b78450 # v2.19.1
        with:
          egress-policy: audit

@@ -195,10 +189,9 @@ jobs:
      SM_API_KEY: ${{ secrets.SM_API_KEY }}
      WINDOWS_CERTIFICATE: ${{ secrets.WINDOWS_CERTIFICATE }}
      RELEASE_GPG_PRIVATE_KEY: ${{ secrets.RELEASE_GPG_PRIVATE_KEY }}
-      DEPOT_TOKEN: ${{ secrets.DEPOT_TOKEN }}
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ab7a9404c0f3da075243ca237b5fac12c98deaa5 # v2.19.3
+        uses: step-security/harden-runner@a5ad31d6a139d249332a2605b85202e8c0b78450 # v2.19.1
        with:
          egress-policy: audit
          allowed-endpoints: >
@@ -427,7 +420,7 @@ jobs:
        env:
          KEYPAIR_ALIAS: ${{ secrets.SM_KEYPAIR_ALIAS }}
        run: |
-          cat > ./frontend/editor/src-tauri/tauri.windows.conf.json <<EOF
+          cat > ./frontend/src-tauri/tauri.windows.conf.json <<EOF
          {
            "bundle": {
              "windows": {
@@ -440,11 +433,7 @@ jobs:
          }
          EOF
          echo "Generated tauri.windows.conf.json (alias masked):"
-          sed "s/${KEYPAIR_ALIAS}/***/g" ./frontend/editor/src-tauri/tauri.windows.conf.json
-
-      - name: Sign JPDFium dylibs inside bootJar (macOS only)
-        if: matrix.platform == 'macos-15' && env.APPLE_CERTIFICATE != ''
-        run: bash frontend/scripts/sign-jpdfium-dylibs-in-bootjar.sh
+          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 != '' && (github.event_name == 'release' || (github.event_name == 'workflow_dispatch' && github.event.inputs.sign != 'false') || github.ref == 'refs/heads/V2-master')
@@ -492,7 +481,7 @@ jobs:
          SM_CODE_SIGNING_CERT_SHA1_HASH: ${{ secrets.SM_CODE_SIGNING_CERT_SHA1_HASH }}
          CI: true
        with:
-          projectPath: ./frontend/editor
+          projectPath: ./frontend
          tauriScript: npx tauri
          args: ${{ matrix.args }}

@@ -518,7 +507,7 @@ jobs:
          $allSigned = $true

          # Check MSI installer (outer wrapper - what users download)
-          $msiFiles = Get-ChildItem -Path "./frontend/editor/src-tauri/target" -Filter "*.msi" -Recurse -File
+          $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/"
            exit 1
@@ -586,23 +575,21 @@ jobs:
        if: always() && steps.digicert-setup.conclusion != 'failure'
        shell: bash
        run: |
-          # Absolute dist path so the cd below can't break the copy targets.
-          DIST="$GITHUB_WORKSPACE/dist"
-          mkdir -p "$DIST"
-          cd ./frontend/editor/src-tauri/target
+          mkdir -p ./dist
+          cd ./frontend/src-tauri/target

          # 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 "*.msi" -exec cp {} "$DIST/Stirling-PDF-${{ matrix.name }}.msi" \;
+            find . -name "*.msi" -exec cp {} "../../../dist/Stirling-PDF-${{ matrix.name }}.msi" \;
          elif [ "${{ matrix.platform }}" = "macos-15" ]; then
-            find . -name "*.dmg" -exec cp {} "$DIST/Stirling-PDF-${{ matrix.name }}.dmg" \;
-            find . -name "*.app" -exec cp -r {} "$DIST/Stirling-PDF-${{ matrix.name }}.app" \;
+            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" \;
+            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
@@ -615,13 +602,13 @@ jobs:

  create-release:
    if: (github.event_name == 'workflow_dispatch' && github.event.inputs.test_mode != 'true') || github.event_name == 'release' || github.ref == 'refs/heads/V2-master'
-    needs: [pick, determine-matrix, build, build-jars]
-    runs-on: ${{ needs.pick.outputs.is_fork == 'true' && 'ubuntu-latest' || 'depot-ubuntu-24.04-4' }}
+    needs: [determine-matrix, build, build-jars]
+    runs-on: ubuntu-latest
    permissions:
      contents: write
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ab7a9404c0f3da075243ca237b5fac12c98deaa5 # v2.19.3
+        uses: step-security/harden-runner@a5ad31d6a139d249332a2605b85202e8c0b78450 # v2.19.1
        with:
          egress-policy: audit

@@ -13,16 +13,12 @@ permissions:
  contents: read

 jobs:
-  pick:
-    uses: ./.github/workflows/_runner-pick.yml
-
  playwright-all-browsers:
    name: Playwright (chromium + firefox + webkit)
-    needs: pick
-    runs-on: ${{ needs.pick.outputs.is_fork == 'true' && 'ubuntu-latest' || 'depot-ubuntu-24.04-4' }}
+    runs-on: ubuntu-latest
    steps:
      - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@ab7a9404c0f3da075243ca237b5fac12c98deaa5 # v2.19.3
+        uses: step-security/harden-runner@a5ad31d6a139d249332a2605b85202e8c0b78450 # v2.19.1
        with:
          egress-policy: audit

@@ -49,5 +45,5 @@ jobs:
        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
        with:
          name: playwright-nightly-${{ github.run_id }}
-          path: frontend/editor/playwright-report/
+          path: frontend/playwright-report/
          retention-days: 14
@@ -2,7 +2,7 @@ name: Update Package Manager Manifests

 on:
  release:
-    types: [released]
+    types: [ released ]
  workflow_dispatch:
    inputs:
      version:
@@ -28,7 +28,7 @@ jobs:
      jar_sha256: ${{ steps.hashes.outputs.jar_sha256 }}
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ab7a9404c0f3da075243ca237b5fac12c98deaa5 # v2.19.3
+        uses: step-security/harden-runner@a5ad31d6a139d249332a2605b85202e8c0b78450 # v2.19.1
        with:
          egress-policy: audit

@@ -79,12 +79,12 @@ jobs:
      contents: write
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ab7a9404c0f3da075243ca237b5fac12c98deaa5 # v2.19.3
+        uses: step-security/harden-runner@a5ad31d6a139d249332a2605b85202e8c0b78450 # v2.19.1
        with:
          egress-policy: audit

      - name: Checkout homebrew-stirling-pdf tap (also hosts Scoop bucket)
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
        with:
          repository: Stirling-Tools/homebrew-stirling-pdf
          token: ${{ secrets.HOMEBREW_TAP_TOKEN }}
@@ -19,7 +19,7 @@ jobs:
      PIP_DISABLE_PIP_VERSION_CHECK: "1"
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ab7a9404c0f3da075243ca237b5fac12c98deaa5 # v2.19.3
+        uses: step-security/harden-runner@a5ad31d6a139d249332a2605b85202e8c0b78450 # v2.19.1
        with:
          egress-policy: audit

@@ -43,7 +43,7 @@ jobs:
          echo "version=${VERSION}" >> $GITHUB_OUTPUT

      - name: Harden Runner
-        uses: step-security/harden-runner@ab7a9404c0f3da075243ca237b5fac12c98deaa5 # v2.19.3
+        uses: step-security/harden-runner@a5ad31d6a139d249332a2605b85202e8c0b78450 # v2.19.1
        with:
          egress-policy: audit

@@ -53,7 +53,7 @@ jobs:
      RUN_UNOSERVER: ${{ github.event_name != 'workflow_dispatch' || inputs.build_unoserver }}
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ab7a9404c0f3da075243ca237b5fac12c98deaa5 # v2.19.3
+        uses: step-security/harden-runner@a5ad31d6a139d249332a2605b85202e8c0b78450 # v2.19.1
        with:
          egress-policy: audit

@@ -18,7 +18,7 @@ jobs:
      packages: write
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ab7a9404c0f3da075243ca237b5fac12c98deaa5 # v2.19.3
+        uses: step-security/harden-runner@a5ad31d6a139d249332a2605b85202e8c0b78450 # v2.19.1
        with:
          egress-policy: audit

@@ -35,7 +35,7 @@ jobs:

    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ab7a9404c0f3da075243ca237b5fac12c98deaa5 # v2.19.3
+        uses: step-security/harden-runner@a5ad31d6a139d249332a2605b85202e8c0b78450 # v2.19.1
        with:
          egress-policy: audit

@@ -75,6 +75,6 @@ jobs:

      # Upload the results to GitHub's code scanning dashboard.
      - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@9e0d7b8d25671d64c341c19c0152d693099fb5ba # v3.29.5
+        uses: github/codeql-action/upload-sarif@68bde559dea0fdcac2102bfdf6230c5f70eb485e # v3.29.5
        with:
          sarif_file: results.sarif
@@ -17,7 +17,7 @@ jobs:
      pull-requests: write
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ab7a9404c0f3da075243ca237b5fac12c98deaa5 # v2.19.3
+        uses: step-security/harden-runner@a5ad31d6a139d249332a2605b85202e8c0b78450 # v2.19.1
        with:
          egress-policy: audit

@@ -22,18 +22,12 @@ permissions:
  contents: read

 jobs:
-  pick:
-    uses: ./.github/workflows/_runner-pick.yml
-
  push:
    if: ${{ vars.CI_PROFILE != 'lite' }}
-    needs: pick
-    runs-on: ${{ needs.pick.outputs.is_fork == 'true' && 'ubuntu-latest' || 'depot-ubuntu-24.04-4' }}
-    env:
-      DEPOT_TOKEN: ${{ secrets.DEPOT_TOKEN }}
+    runs-on: ubuntu-latest
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ab7a9404c0f3da075243ca237b5fac12c98deaa5 # v2.19.3
+        uses: step-security/harden-runner@a5ad31d6a139d249332a2605b85202e8c0b78450 # v2.19.1
        with:
          egress-policy: audit

@@ -11,7 +11,7 @@ on:
      - "app/core/build.gradle"
      - "app/proprietary/build.gradle"
      - "README.md"
-      - "frontend/editor/public/locales/*/translation.toml"
+      - "frontend/public/locales/*/translation.toml"
      - "app/core/src/main/resources/static/3rdPartyLicenses.json"
      - "scripts/ignore_translation.toml"

@@ -35,7 +35,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ab7a9404c0f3da075243ca237b5fac12c98deaa5 # v2.19.3
+        uses: step-security/harden-runner@a5ad31d6a139d249332a2605b85202e8c0b78450 # v2.19.1
        with:
          egress-policy: audit

@@ -62,7 +62,7 @@ jobs:

      - name: Sync translation TOML files
        run: |
-          python .github/scripts/check_language_toml.py --reference-file "frontend/editor/public/locales/en-GB/translation.toml" --branch main
+          python .github/scripts/check_language_toml.py --reference-file "frontend/public/locales/en-GB/translation.toml" --branch main

      - name: pre-commit run
        run: |
@@ -70,7 +70,7 @@ jobs:

      - name: Commit translation files
        run: |
-          git add frontend/editor/public/locales/*/translation.toml
+          git add frontend/public/locales/*/translation.toml
          git diff --staged --quiet || git commit -m ":memo: Sync translation files (TOML)" || echo "No changes detected"

      - name: Sync README.md
@@ -100,7 +100,7 @@ jobs:
            This Pull Request was automatically generated to synchronize updates to translation files and documentation. Below are the details of the changes made:

            #### **1. Synchronization of Translation Files**
-            - Updated translation files (`frontend/editor/public/locales/*/translation.toml`) to reflect changes in the reference file `en-GB/translation.toml`.
+            - Updated translation files (`frontend/public/locales/*/translation.toml`) to reflect changes in the reference file `en-GB/translation.toml`.
            - Ensured consistency and synchronization across all supported language files.
            - Highlighted any missing or incomplete translations.
            - **Format**: TOML
@@ -125,5 +125,5 @@ jobs:
          sign-commits: true
          add-paths: |
            README.md
-            frontend/editor/public/locales/*/translation.toml
+            frontend/public/locales/*/translation.toml
            scripts/ignore_translation.toml
@@ -4,10 +4,6 @@ name: Build Tauri Applications
 # Linux). Called from build.yml on PRs that touch desktop sources (gated
 # via the `tauri` filter in .github/config/.files.yaml). Also runnable
 # on demand via workflow_dispatch with a per-platform selector.
-#
-# Note: editing this file is itself enough to make the `tauri` path filter
-# match, which is how non-desktop PRs (e.g. backend-only fixes) opt into a
-# desktop smoke build.
 on:
  workflow_call:
    inputs:
@@ -41,7 +37,7 @@ jobs:
      matrix: ${{ steps.set-matrix.outputs.matrix }}
    steps:
      - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@ab7a9404c0f3da075243ca237b5fac12c98deaa5 # v2.19.3
+        uses: step-security/harden-runner@a5ad31d6a139d249332a2605b85202e8c0b78450 # v2.19.1
        with:
          egress-policy: audit

@@ -86,10 +82,9 @@ jobs:
      WINDOWS_CERTIFICATE: ${{ secrets.WINDOWS_CERTIFICATE }}
      APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
      RELEASE_GPG_PRIVATE_KEY: ${{ secrets.RELEASE_GPG_PRIVATE_KEY }}
-      DEPOT_TOKEN: ${{ secrets.DEPOT_TOKEN }}
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ab7a9404c0f3da075243ca237b5fac12c98deaa5 # v2.19.3
+        uses: step-security/harden-runner@a5ad31d6a139d249332a2605b85202e8c0b78450 # v2.19.1
        with:
          egress-policy: audit

@@ -157,9 +152,6 @@ jobs:
          JPDFIUM_PLATFORMS: ${{ matrix.jpdfium_platforms }}
        run: task desktop:prepare

-      - name: Run Tauri/Cargo tests
-        run: task desktop:test
-
      # DigiCert KeyLocker Setup (Cloud HSM)
      - name: Setup DigiCert KeyLocker
        id: digicert-setup
@@ -305,7 +297,7 @@ jobs:
        env:
          KEYPAIR_ALIAS: ${{ secrets.SM_KEYPAIR_ALIAS }}
        run: |
-          cat > ./frontend/editor/src-tauri/tauri.windows.conf.json <<EOF
+          cat > ./frontend/src-tauri/tauri.windows.conf.json <<EOF
          {
            "bundle": {
              "windows": {
@@ -363,7 +355,7 @@ jobs:
          SM_CODE_SIGNING_CERT_SHA1_HASH: ${{ secrets.SM_CODE_SIGNING_CERT_SHA1_HASH }}
          CI: true
        with:
-          projectPath: ./frontend/editor
+          projectPath: ./frontend
          tauriScript: npx tauri
          # Linux: build deb+rpm only here. AppImage runs in its own
          # continue-on-error step below so its persistent linuxdeploy
@@ -388,7 +380,7 @@ jobs:
          VITE_SAAS_BACKEND_API_URL: ${{ secrets.VITE_SAAS_BACKEND_API_URL || 'https://api.stirlingpdf.com' }}
          CI: true
        with:
-          projectPath: ./frontend/editor
+          projectPath: ./frontend
          tauriScript: npx tauri
          args: --bundles appimage

@@ -406,7 +398,7 @@ jobs:
        if: matrix.platform == 'macos-15'
        run: |
          echo "🔍 Verifying notarization status..."
-          cd ./frontend/editor/src-tauri/target
+          cd ./frontend/src-tauri/target
          DMG_FILE=$(find . -name "*.dmg" | head -1)
          if [ -n "$DMG_FILE" ]; then
            echo "Found DMG: $DMG_FILE"
@@ -420,22 +412,20 @@ jobs:
      - name: Rename artifacts
        shell: bash
        run: |
-          # Absolute dist path so the cd below can't break the copy targets.
-          DIST="$GITHUB_WORKSPACE/dist"
-          mkdir -p "$DIST"
-          cd ./frontend/editor/src-tauri/target
+          mkdir -p ./dist
+          cd ./frontend/src-tauri/target

          # 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 "*.msi" -exec cp {} "$DIST/Stirling-PDF-${{ matrix.name }}.msi" \;
+            find . -name "*.msi" -exec cp {} "../../../dist/Stirling-PDF-${{ matrix.name }}.msi" \;
          elif [ "${{ matrix.platform }}" = "macos-15" ]; then
-            find . -name "*.dmg" -exec cp {} "$DIST/Stirling-PDF-${{ matrix.name }}.dmg" \;
+            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" \;
+            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.
@@ -513,7 +503,7 @@ jobs:
      - name: Verify build artifacts
        shell: bash
        run: |
-          cd ./frontend/editor/src-tauri/target
+          cd ./frontend/src-tauri/target

          # Check for expected artifacts based on platform
          if [ "${{ matrix.platform }}" = "windows-latest" ]; then
@@ -544,7 +534,7 @@ jobs:
      - name: Test artifact sizes
        shell: bash
        run: |
-          cd ./frontend/editor/src-tauri/target
+          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
            if [ -f "$file" ]; then
@@ -565,7 +555,7 @@ jobs:
      pull-requests: write
    steps:
      - name: Harden the runner
-        uses: step-security/harden-runner@ab7a9404c0f3da075243ca237b5fac12c98deaa5 # v2.19.3
+        uses: step-security/harden-runner@a5ad31d6a139d249332a2605b85202e8c0b78450 # v2.19.1
        with:
          egress-policy: audit

@@ -656,7 +646,7 @@ jobs:
    if: always()
    steps:
      - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@ab7a9404c0f3da075243ca237b5fac12c98deaa5 # v2.19.3
+        uses: step-security/harden-runner@a5ad31d6a139d249332a2605b85202e8c0b78450 # v2.19.1
        with:
          egress-policy: audit

@@ -12,19 +12,11 @@ on:
        required: false
        type: string
        default: "false"
-      depot_cores:
-        description: "Depot runner vCPU count (used in runs-on). Override for benchmarking."
-        required: false
-        type: string
-        default: "8"

 permissions:
  contents: read

 jobs:
-  pick:
-    uses: ./.github/workflows/_runner-pick.yml
-
  # TODO: extract a pre-matrix `prepare` job that runs once and produces
  # shared artifacts for the three matrix entries below to consume:
  #   1. `task backend:build` — currently runs 3× in parallel with
@@ -40,14 +32,7 @@ jobs:
  # spring-security=true matrix entry if `task backend:build` and
  # `task backend:build:ci` produce equivalent JARs (verify before wiring).
  test-build-docker-images:
-    needs: pick
-    runs-on: ${{ needs.pick.outputs.is_fork == 'true' && 'ubuntu-latest' || format('depot-ubuntu-24.04-{0}', inputs.depot_cores || '8') }}
-    permissions:
-      contents: read
-      id-token: write
-    env:
-      USE_DEPOT: ${{ needs.pick.outputs.is_fork != 'true' && inputs.docker-base-changed != 'true' }}
-      DEPOT_TOKEN: ${{ secrets.DEPOT_TOKEN }}
+    runs-on: ubuntu-latest
    strategy:
      fail-fast: false
      matrix:
@@ -63,7 +48,7 @@ jobs:
            cache-scope: stirling-pdf-fat
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ab7a9404c0f3da075243ca237b5fac12c98deaa5 # v2.19.3
+        uses: step-security/harden-runner@a5ad31d6a139d249332a2605b85202e8c0b78450 # v2.19.1
        with:
          egress-policy: audit

@@ -120,16 +105,10 @@ jobs:
          DISABLE_ADDITIONAL_FEATURES: true
          STIRLING_PDF_DESKTOP_UI: false

-      - name: Set up Depot CLI
-        if: env.USE_DEPOT == 'true'
-        uses: depot/setup-action@15c09a5f77a0840ad4bce955686522a257853461 # v1.0.0
-
      - name: Set up QEMU
-        if: env.USE_DEPOT != 'true'
        uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a # v4.0.0

      - name: Set up Docker Buildx
-        if: env.USE_DEPOT != 'true'
        id: buildx
        uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0

@@ -155,22 +134,7 @@ jobs:
            echo "platforms=linux/amd64,linux/arm64/v8" >> "$GITHUB_OUTPUT"
          fi

-      - name: Build ${{ matrix.docker-rev }} (Depot)
-        if: env.USE_DEPOT == 'true'
-        uses: depot/build-push-action@5f3b3c2e5a00f0093de47f657aeaefcedff27d18 # v1.16.0
-        with:
-          project: ${{ vars.DEPOT_PROJECT_ID }}
-          context: .
-          file: ./${{ matrix.docker-rev }}
-          push: false
-          platforms: ${{ steps.build-params.outputs.platforms }}
-          build-args: |
-            BASE_IMAGE=${{ steps.build-params.outputs.base_image }}
-          provenance: true
-          sbom: true
-
-      - name: Build ${{ matrix.docker-rev }} (Docker fork fallback)
-        if: env.USE_DEPOT != 'true'
+      - name: Build ${{ matrix.docker-rev }}
        uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7.1.0
        with:
          builder: ${{ steps.buildx.outputs.name }}
@@ -198,52 +162,24 @@ jobs:
          if-no-files-found: warn

  test-build-unoserver-image:
-    needs: pick
-    runs-on: ${{ needs.pick.outputs.is_fork == 'true' && 'ubuntu-latest' || format('depot-ubuntu-24.04-{0}', inputs.depot_cores || '8') }}
-    permissions:
-      contents: read
-      id-token: write
-    env:
-      USE_DEPOT: ${{ needs.pick.outputs.is_fork != 'true' && inputs.docker-base-changed != 'true' }}
-      DEPOT_TOKEN: ${{ secrets.DEPOT_TOKEN }}
+    runs-on: ubuntu-latest
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ab7a9404c0f3da075243ca237b5fac12c98deaa5 # v2.19.3
+        uses: step-security/harden-runner@a5ad31d6a139d249332a2605b85202e8c0b78450 # v2.19.1
        with:
          egress-policy: audit

      - name: Checkout Repository
        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2

-      - name: Set up Depot CLI
-        if: env.USE_DEPOT == 'true'
-        uses: depot/setup-action@15c09a5f77a0840ad4bce955686522a257853461 # v1.0.0
-
      - name: Set up QEMU
-        if: env.USE_DEPOT != 'true'
        uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a # v4.0.0

      - name: Set up Docker Buildx
-        if: env.USE_DEPOT != 'true'
        id: buildx
        uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0

-      - name: Build docker/unoserver/Dockerfile (Depot)
-        if: env.USE_DEPOT == 'true'
-        uses: depot/build-push-action@5f3b3c2e5a00f0093de47f657aeaefcedff27d18 # v1.16.0
-        with:
-          project: ${{ vars.DEPOT_PROJECT_ID }}
-          context: .
-          file: ./docker/unoserver/Dockerfile
-          push: false
-          load: true
-          platforms: linux/amd64
-          tags: stirling-unoserver:pr-test
-          provenance: false
-          sbom: false
-
-      - name: Build docker/unoserver/Dockerfile (Docker fork fallback)
-        if: env.USE_DEPOT != 'true'
+      - name: Build docker/unoserver/Dockerfile
        uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7.1.0
        with:
          builder: ${{ steps.buildx.outputs.name }}
@@ -20,22 +20,12 @@ permissions:
  contents: read

 jobs:
-  pick:
-    uses: ./.github/workflows/_runner-pick.yml
-
  deploy:
    if: ${{ vars.CI_PROFILE != 'lite' }}
-    needs: pick
-    runs-on: ${{ needs.pick.outputs.is_fork == 'true' && 'ubuntu-latest' || 'depot-ubuntu-24.04-4' }}
-    permissions:
-      contents: read
-      id-token: write
-    env:
-      USE_DEPOT: ${{ needs.pick.outputs.is_fork != 'true' }}
-      DEPOT_TOKEN: ${{ secrets.DEPOT_TOKEN }}
+    runs-on: ubuntu-latest
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ab7a9404c0f3da075243ca237b5fac12c98deaa5 # v2.19.3
+        uses: step-security/harden-runner@a5ad31d6a139d249332a2605b85202e8c0b78450 # v2.19.1
        with:
          egress-policy: audit

@@ -61,12 +51,7 @@ jobs:
          MAVEN_PUBLIC_URL: ${{ secrets.MAVEN_PUBLIC_URL }}
          DISABLE_ADDITIONAL_FEATURES: true

-      - name: Set up Depot CLI
-        if: env.USE_DEPOT == 'true'
-        uses: depot/setup-action@15c09a5f77a0840ad4bce955686522a257853461 # v1.0.0
-
      - name: Set up Docker Buildx
-        if: env.USE_DEPOT != 'true'
        uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0

      - name: Get version number
@@ -81,20 +66,7 @@ jobs:
          username: ${{ secrets.DOCKER_HUB_USERNAME }}
          password: ${{ secrets.DOCKER_HUB_API }}

-      - name: Build and push test image (Depot)
-        if: env.USE_DEPOT == 'true'
-        uses: depot/build-push-action@5f3b3c2e5a00f0093de47f657aeaefcedff27d18 # v1.16.0
-        with:
-          project: ${{ vars.DEPOT_PROJECT_ID }}
-          context: .
-          file: ./docker/embedded/Dockerfile
-          push: true
-          tags: ${{ secrets.DOCKER_HUB_USERNAME }}/test:test-${{ github.sha }}
-          build-args: VERSION_TAG=${{ steps.versionNumber.outputs.versionNumber }}
-          platforms: linux/amd64
-
-      - name: Build and push test image (Docker fork fallback)
-        if: env.USE_DEPOT != 'true'
+      - name: Build and push test image
        uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7.1.0
        with:
          context: .
@@ -153,14 +125,13 @@ jobs:
  files-changed:
    if: always()
    name: detect what files changed
-    needs: pick
-    runs-on: ${{ needs.pick.outputs.is_fork == 'true' && 'ubuntu-latest' || 'depot-ubuntu-24.04-4' }}
+    runs-on: ubuntu-latest
    timeout-minutes: 3
    outputs:
      frontend: ${{ steps.changes.outputs.frontend }}
    steps:
      - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@ab7a9404c0f3da075243ca237b5fac12c98deaa5 # v2.19.3
+        uses: step-security/harden-runner@a5ad31d6a139d249332a2605b85202e8c0b78450 # v2.19.1
        with:
          egress-policy: audit

@@ -174,11 +145,12 @@ jobs:

  test:
    if: needs.files-changed.outputs.frontend == 'true'
-    needs: [pick, deploy, files-changed]
-    runs-on: ${{ needs.pick.outputs.is_fork == 'true' && 'ubuntu-latest' || 'depot-ubuntu-24.04-4' }}
+    needs: [deploy, files-changed]
+    runs-on: ubuntu-latest
+
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ab7a9404c0f3da075243ca237b5fac12c98deaa5 # v2.19.3
+        uses: step-security/harden-runner@a5ad31d6a139d249332a2605b85202e8c0b78450 # v2.19.1
        with:
          egress-policy: audit

@@ -208,13 +180,13 @@ jobs:
          FORCE_COLOR: "3"

  cleanup:
-    needs: [pick, deploy, test]
-    runs-on: ${{ needs.pick.outputs.is_fork == 'true' && 'ubuntu-latest' || 'depot-ubuntu-24.04-4' }}
+    needs: [deploy, test]
+    runs-on: ubuntu-latest
    if: always()

    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ab7a9404c0f3da075243ca237b5fac12c98deaa5 # v2.19.3
+        uses: step-security/harden-runner@a5ad31d6a139d249332a2605b85202e8c0b78450 # v2.19.1
        with:
          egress-policy: audit

@@ -23,10 +23,6 @@ customFiles/
 configs/
 watchedFolders/
 clientWebUI/
-# Scratch dir used by local fixture-regeneration runs (see
-# app/proprietary/src/test/resources/db-migration-fixtures/README.md).
-# Holds downloaded JARs and disposable workdirs. Never committed.
-.alpha-local/
 !cucumber/
 !cucumber/exampleFiles/
 !cucumber/exampleFiles/example_html.zip
@@ -161,7 +157,7 @@ app/proprietary/build
 common/build
 proprietary/build
 stirling-pdf/build
-frontend/editor/src-tauri/provisioner/target
+frontend/src-tauri/provisioner/target

 # Byte-compiled / optimized / DLL files
 __pycache__/
@@ -277,6 +273,3 @@ docs/type3/signatures/
 # Playwright MCP screenshots / traces
 .playwright-mcp/
 *.playwright-mcp.png
-
-# Local screenshot artifacts from *-screenshots.spec.ts
-frontend/screenshots/
@@ -1,6 +1,6 @@
 repos:
  - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.15.14
+    rev: v0.15.11
    hooks:
      - id: ruff
        args:
@@ -20,7 +20,7 @@ repos:
          - --skip="./.*,*.csv,*.json,*.ambr"
          - --quiet-level=2
        files: \.(html|css|js|py|md)$
-        exclude: (.vscode|.devcontainer|app/core/src/main/resources|app/proprietary/src/main/resources|frontend/editor/public/vendor|Dockerfile|.*/pdfjs.*|.*/thirdParty.*|bootstrap.*|.*\.min\..*|.*diff\.js)
+        exclude: (.vscode|.devcontainer|app/core/src/main/resources|app/proprietary/src/main/resources|frontend/public/vendor|Dockerfile|.*/pdfjs.*|.*/thirdParty.*|bootstrap.*|.*\.min\..*|.*diff\.js)
  - repo: https://github.com/gitleaks/gitleaks
    rev: v8.30.0
    hooks:
@@ -38,7 +38,7 @@ repos:
    rev: v0.24.4
    hooks:
      - id: toml-sort-fix
-        files: frontend/editor/public/locales/.*\.toml$
+        files: frontend/public/locales/.*\.toml$
        args: ['--in-place', '--all', '--ignore-case']
  # - repo: https://github.com/thibaudcolas/pre-commit-stylelint
  #   rev: v16.21.1
@@ -22,13 +22,12 @@ tasks:
    vars:
      PORT: '{{.PORT | default "8080"}}'
      AIENGINE_URL: '{{.AIENGINE_URL | default ""}}'
-      AIENGINE_TIMEOUTSECONDS: '{{.AIENGINE_TIMEOUTSECONDS | default "120"}}'
    env:
      SERVER_PORT: '{{.PORT}}'
    cmds:
-      - cmd: '{{if .AIENGINE_URL}}AIENGINE_URL={{.AIENGINE_URL}} AIENGINE_ENABLED=true AIENGINE_TIMEOUTSECONDS={{.AIENGINE_TIMEOUTSECONDS}} {{end}}cmd /c ".\gradlew.bat :stirling-pdf:bootRun"'
+      - cmd: '{{if .AIENGINE_URL}}AIENGINE_URL={{.AIENGINE_URL}} AIENGINE_ENABLED=true {{end}}cmd /c ".\gradlew.bat :stirling-pdf:bootRun"'
        platforms: [windows]
-      - cmd: '{{if .AIENGINE_URL}}AIENGINE_URL={{.AIENGINE_URL}} AIENGINE_ENABLED=true AIENGINE_TIMEOUTSECONDS={{.AIENGINE_TIMEOUTSECONDS}} {{end}}./gradlew :stirling-pdf:bootRun'
+      - cmd: '{{if .AIENGINE_URL}}AIENGINE_URL={{.AIENGINE_URL}} AIENGINE_ENABLED=true {{end}}./gradlew :stirling-pdf:bootRun'
        platforms: [linux, darwin]

  dev:bundled:
@@ -40,25 +39,6 @@ tasks:
      - cmd: ./gradlew clean bootRun -PbuildWithFrontend=true
        platforms: [linux, darwin]

-  dev:saas:
-    desc: "Start backend in SaaS flavor against Supabase"
-    # `dotenv:` reads from the root Taskfile's directory (".") because this
-    # subtaskfile is included with `dir: .`.
-    dotenv: ['app/.env.saas.local', 'app/.env.saas']
-    ignore_error: true
-    vars:
-      PORT: '{{.PORT | default "8080"}}'
-      # Override to "" to run the pure `saas` profile against your own SAAS_DB_*.
-      PROFILES: '{{.PROFILES | default "dev"}}'
-    env:
-      SERVER_PORT: '{{.PORT}}'
-      STIRLING_FLAVOR: saas
-    cmds:
-      - cmd: cmd /c ".\gradlew.bat :stirling-pdf:bootRun {{if .PROFILES}}--args=\"--spring.profiles.include={{.PROFILES}}\"{{end}}"
-        platforms: [windows]
-      - cmd: ./gradlew :stirling-pdf:bootRun {{if .PROFILES}}--args='--spring.profiles.include={{.PROFILES}}'{{end}}
-        platforms: [linux, darwin]
-
  build:
    desc: "Full backend build"
    cmds:
@@ -31,7 +31,6 @@ tasks:
  provisioner:
    desc: "Build installer provisioner"
    platforms: [windows]
-    dir: editor
    cmds:
      - node scripts/build-provisioner.mjs

@@ -39,55 +38,41 @@ tasks:
    desc: "Start Tauri desktop dev mode"
    deps: [prepare]
    ignore_error: true
-    dir: editor
    cmds:
      - npx tauri dev --no-watch

  build:
    desc: "Build Tauri desktop app (production)"
    deps: [prepare]
-    dir: editor
    cmds:
      - npx tauri build

  build:dev:
    desc: "Build Tauri desktop app (dev, no bundling)"
    deps: [prepare]
-    dir: editor
    cmds:
      - npx tauri build --no-bundle

  build:dev:mac:
    desc: "Build Tauri desktop .app bundle (macOS)"
    deps: [prepare]
-    dir: editor
    cmds:
      - npx tauri build --bundles app

  build:dev:windows:
    desc: "Build Tauri desktop NSIS installer (Windows)"
    deps: [prepare]
-    dir: editor
    cmds:
      - npx tauri build --bundles nsis

  build:dev:linux:
    desc: "Build Tauri desktop AppImage (Linux)"
    deps: [prepare]
-    dir: editor
    cmds:
      - npx tauri build --bundles appimage

-  test:
-    desc: "Run Tauri/Cargo tests"
-    deps: [prepare]
-    dir: editor/src-tauri
-    cmds:
-      - cargo test
-
  clean:
    desc: "Clean Tauri/Cargo build artifacts"
-    dir: editor
    cmds:
      - task: jlink:clean
      - cd src-tauri && cargo clean
@@ -113,18 +98,17 @@ tasks:
        platforms: [windows]
      - cmd: ./gradlew bootJar --no-daemon -PjpdfiumPlatforms={{.JPDFIUM_PLATFORMS}}
        platforms: [linux, darwin]
-      - mkdir -p frontend/editor/src-tauri/libs
-      - cp app/core/build/libs/stirling-pdf-*.jar frontend/editor/src-tauri/libs/
+      - mkdir -p frontend/src-tauri/libs
+      - cp app/core/build/libs/stirling-pdf-*.jar frontend/src-tauri/libs/
    status:
-      - test -f frontend/editor/src-tauri/libs/stirling-pdf-*.jar
+      - test -f frontend/src-tauri/libs/stirling-pdf-*.jar

  jlink:runtime:
    desc: "Create custom JRE with jlink"
    deps: [jlink:jar]
-    dir: editor/src-tauri
    cmds:
-      - rm -rf runtime/jre
-      - mkdir -p runtime
+      - rm -rf src-tauri/runtime/jre
+      - mkdir -p src-tauri/runtime
      - >-
        jlink
        --add-modules {{.JLINK_MODULES}}
@@ -132,36 +116,14 @@ tasks:
        --compress=zip-6
        --no-header-files
        --no-man-pages
-        --output runtime/jre
-      # jlink emits its files mode 444 (read-only). Tauri's build-script
-      # resource copier preserves source permissions when staging
-      # `runtime/jre/**/*` into `target/<profile>/runtime/jre/...`, so the
-      # staged copies are read-only too. On any subsequent incremental
-      # build the copier tries to overwrite them and fails with a bare
-      # `Permission denied (os error 13)` (Rust's io::Error Display drops
-      # the path, so the failure is opaque). Make the source writable here
-      # so the staged destinations are writable and can be overwritten.
-      #
-      # Trade-off: this task runs for both `task desktop:dev` and
-      # `task desktop:build`, so production bundles also ship mode-644
-      # JRE files instead of 444. Functionally harmless on POSIX (the
-      # `other` bit is `r--` either way, and on macOS code signing is the
-      # real integrity check) and on Windows the DOS read-only attribute
-      # isn't load-bearing for the bundled JDK. If we ever need strict
-      # 444 in production, split the chmod into a dev-only step and have
-      # `desktop:build` run `jlink:clean` first to force a fresh build.
-      - cmd: chmod -R u+w runtime/jre
-        platforms: [linux, darwin]
-      - cmd: powershell -NoProfile -Command "Get-ChildItem -Recurse runtime/jre | ForEach-Object { $_.IsReadOnly = $false }"
-        platforms: [windows]
+        --output src-tauri/runtime/jre
    status:
-      - test -f runtime/jre/release
+      - test -d src-tauri/runtime/jre

  jlink:clean:
    desc: "Remove JLink runtime and bundled JARs"
-    dir: editor/src-tauri
    cmds:
-      - rm -rf libs runtime
+      - rm -rf src-tauri/libs src-tauri/runtime

  # macOS-only. Replaces jlink:runtime's single-arch JRE with a universal
  # (arm64 + x86_64) one for the universal Tauri shell. Runs the x86_64
@@ -172,7 +134,6 @@ tasks:
    desc: "Create universal (arm64+x86_64) JRE for the macOS Tauri build"
    deps: [jlink:jar]
    platforms: [darwin]
-    dir: editor
    env:
      JLINK_MODULES: "{{.JLINK_MODULES}}"
      OUTPUT_DIR: src-tauri/runtime/jre
@@ -3,14 +3,14 @@ version: '3'
 tasks:
  install:
    desc: "Install Playwright browsers"
-    dir: frontend/editor
+    dir: frontend
    deps: [ ':frontend:install' ]
    cmds:
      - npx playwright install {{.CLI_ARGS}} --with-deps

  stubbed:
    desc: "Run stubbed E2E tests"
-    dir: frontend/editor
+    dir: frontend
    deps: [ ':frontend:prepare' ]
    cmds:
      - npx playwright test --project=stubbed {{.CLI_ARGS}}
@@ -72,7 +72,7 @@ tasks:
  live:runner:
    internal: true
    deps: [ ':frontend:prepare' ]
-    dir: frontend/editor
+    dir: frontend
    vars:
      BASE_DIR: '{{.ROOT_DIR}}/.test-state/playwright'
    cmds:
@@ -141,14 +141,14 @@ tasks:
      up first with:
        task e2e:oauth:up
        task e2e:saml:up
-    dir: frontend/editor
+    dir: frontend
    deps: [ ':frontend:prepare' ]
    cmds:
      - npx playwright test --project=enterprise {{.CLI_ARGS}}

  cross-browser:
    desc: "Run stubbed E2E tests on Chromium, Firefox, and WebKit"
-    dir: frontend/editor
+    dir: frontend
    deps: [ ':frontend:prepare' ]
    cmds:
      - npx playwright test --project=stubbed --project=stubbed-firefox --project=stubbed-webkit {{.CLI_ARGS}}
@@ -1,10 +1,5 @@
 version: '3'

-# Tasks operate from the workspace root (frontend/). Editor commands pass
-# `editor` as the vite project root (positional after `build` / before the
-# mode flag) or use `--project editor/...` for tsc — so the editor lives
-# under frontend/editor/ without each task needing a cd.
-
 tasks:
  install:
    desc: "Install dependencies"
@@ -26,19 +21,19 @@ tasks:
    vars:
      MODE: '{{.MODE | default ""}}'
    cmds:
-      - npx tsx editor/scripts/setup-env.mts{{if .MODE}} --{{.MODE}}{{end}}
+      - npx tsx scripts/setup-env.ts{{if .MODE}} --{{.MODE}}{{end}}
    sources:
-      - editor/scripts/setup-env.mts
+      - scripts/setup-env.ts
    generates:
-      - editor/.env.local
-      - editor/.env{{if .MODE}}.{{.MODE}}{{end}}.local
+      - .env.local
+      - .env{{if .MODE}}.{{.MODE}}{{end}}.local

  prepare:icons:
    internal: true
    run: once
    deps: [install]
    cmds:
-      - node editor/scripts/generate-icons.js
+      - node scripts/generate-icons.js

  prepare:
    desc: "Set up dev environment"
@@ -65,7 +60,7 @@ tasks:
    env:
      BACKEND_URL: '{{.BACKEND_URL}}'
    cmds:
-      - npx vite editor --mode {{.MODE}} --port {{.PORT}}{{if .OPEN}} --open{{end}}
+      - npx vite --mode {{.MODE}} --port {{.PORT}}{{if .OPEN}} --open{{end}}

  dev:
    desc: "Start frontend dev server"
@@ -120,19 +115,19 @@ tasks:
    desc: "Production build (default mode)"
    deps: [prepare]
    cmds:
-      - npx vite build editor
+      - npx vite build

  build:core:
    desc: "Build for core mode"
    deps: [prepare]
    cmds:
-      - npx vite build editor --mode core
+      - npx vite build --mode core

  build:proprietary:
    desc: "Build for proprietary mode"
    deps: [prepare]
    cmds:
-      - npx vite build editor --mode proprietary
+      - npx vite build --mode proprietary

  build:saas:
    desc: "Build for SaaS mode"
@@ -140,7 +135,7 @@ tasks:
      - task: prepare
        vars: { MODE: saas }
    cmds:
-      - npx vite build editor --mode saas
+      - npx vite build --mode saas

  build:desktop:
    desc: "Build for desktop mode"
@@ -148,13 +143,13 @@ tasks:
      - task: prepare
        vars: { MODE: desktop }
    cmds:
-      - npx vite build editor --mode desktop
+      - npx vite build --mode desktop

  build:prototypes:
    desc: "Build for prototypes mode"
    deps: [prepare]
    cmds:
-      - npx vite build editor --mode prototypes
+      - npx vite build --mode prototypes

  # ============================================================
  # Code quality
@@ -165,7 +160,7 @@ tasks:
    deps: [install]
    cmds:
      - npx eslint --max-warnings=0
-      - npx dpdm editor/src --circular --no-warning --no-tree --exit-code circular:1
+      - npx dpdm src --circular --no-warning --no-tree --exit-code circular:1

  lint:fix:
    desc: "Auto-fix lint issues"
@@ -200,13 +195,13 @@ tasks:
    desc: "Typecheck core build variant"
    deps: [prepare]
    cmds:
-      - npx tsc --noEmit --project editor/src/core/tsconfig.json
+      - npx tsc --noEmit --project src/core/tsconfig.json

  typecheck:proprietary:
    desc: "Typecheck proprietary build variant"
    deps: [prepare]
    cmds:
-      - npx tsc --noEmit --project editor/src/proprietary/tsconfig.json
+      - npx tsc --noEmit --project src/proprietary/tsconfig.json

  typecheck:saas:
    desc: "Typecheck SaaS build variant"
@@ -214,7 +209,7 @@ tasks:
      - task: prepare
        vars: { MODE: saas }
    cmds:
-      - npx tsc --noEmit --project editor/src/saas/tsconfig.json
+      - npx tsc --noEmit --project src/saas/tsconfig.json

  typecheck:desktop:
    desc: "Typecheck desktop build variant"
@@ -222,19 +217,19 @@ tasks:
      - task: prepare
        vars: { MODE: desktop }
    cmds:
-      - npx tsc --noEmit --project editor/src/desktop/tsconfig.json
+      - npx tsc --noEmit --project src/desktop/tsconfig.json

  typecheck:scripts:
    desc: "Typecheck scripts"
    deps: [prepare]
    cmds:
-      - npx tsc --noEmit --project editor/scripts/tsconfig.json
+      - npx tsc --noEmit --project scripts/tsconfig.json

  typecheck:prototypes:
    desc: "Typecheck prototypes build variant"
    deps: [prepare]
    cmds:
-      - npx tsc --noEmit --project editor/src/prototypes/tsconfig.json
+      - npx tsc --noEmit --project src/prototypes/tsconfig.json

  typecheck:all:
    desc: "Typecheck all build variants"
@@ -275,19 +270,19 @@ tasks:
    desc: "Run tests"
    deps: [install]
    cmds:
-      - npx vitest run --root editor
+      - npx vitest run

  test:watch:
    desc: "Run tests in watch mode"
    deps: [install]
    cmds:
-      - npx vitest --watch --root editor
+      - npx vitest --watch

  test:coverage:
    desc: "Run tests with coverage"
    deps: [install]
    cmds:
-      - npx vitest --coverage --root editor
+      - npx vitest --coverage

  # ============================================================
  # Code Generation
@@ -297,4 +292,4 @@ tasks:
    desc: "Generate frontend license report"
    deps: [install]
    cmds:
-      - node editor/scripts/generate-licenses.js
+      - node scripts/generate-licenses.js
@@ -10,14 +10,14 @@ When adding tools, follow this systematic approach using the established pattern

 Create these files in the correct directories:
 ```
-frontend/editor/src/hooks/tools/[toolName]/
+frontend/src/hooks/tools/[toolName]/
  ├── use[ToolName]Parameters.ts     # Parameter definitions and validation
  └── use[ToolName]Operation.ts      # Tool operation logic using useToolOperation

-frontend/editor/src/components/tools/[toolName]/
+frontend/src/components/tools/[toolName]/
  └── [ToolName]Settings.tsx         # Settings UI component (if needed)

-frontend/editor/src/tools/
+frontend/src/tools/
  └── [ToolName].tsx                 # Main tool component
 ```

@@ -128,7 +128,7 @@ export default [ToolName] as ToolComponent;
 ## 3. Register Tool in System
 Update these files to register your new tool:

-**Tool Registry** (`frontend/editor/src/data/useTranslatedToolRegistry.tsx`):
+**Tool Registry** (`frontend/src/data/useTranslatedToolRegistry.tsx`):
 1. Add imports at the top:
 ```typescript
 import [ToolName] from "../tools/[ToolName]";
@@ -155,7 +155,7 @@ import [ToolName]Settings from "../components/tools/[toolName]/[ToolName]Setting
 ## 4. Add Tooltips (Optional but Recommended)
 Create user-friendly tooltips to help non-technical users understand your tool. **Use simple, clear language - avoid technical jargon:**

-**Tooltip Hook** (`frontend/editor/src/components/tooltips/use[ToolName]Tips.ts`):
+**Tooltip Hook** (`frontend/src/components/tooltips/use[ToolName]Tips.ts`):
 ```typescript
 import { useTranslation } from 'react-i18next';
 import { TooltipContent } from '../../types/tips';
@@ -202,7 +202,7 @@ const [ToolName] = (props: BaseToolProps) => {
 ## 5. Add Translations
 Update translation files. **Important: Only update `en-GB` files** - other languages are handled separately.

-**File to update:** `frontend/editor/public/locales/en-GB/translation.toml`
+**File to update:** `frontend/public/locales/en-GB/translation.toml`

 **Required Translation Keys**:
 ```toml
@@ -139,9 +139,9 @@ The project structure is defined in `engine/pyproject.toml`. Any new dependencie

 #### Environment Variables
 - All `VITE_*` variables must be declared in the appropriate committed env file:
-  - `frontend/editor/.env` — core, proprietary, and shared vars
-  - `frontend/editor/.env.saas` — SaaS-only vars (layered on top of `.env` in SaaS mode)
-  - `frontend/editor/.env.desktop` — desktop (Tauri)-only vars (layered on top of `.env` in desktop mode)
+  - `frontend/.env` — core, proprietary, and shared vars
+  - `frontend/.env.saas` — SaaS-only vars (layered on top of `.env` in SaaS mode)
+  - `frontend/.env.desktop` — desktop (Tauri)-only vars (layered on top of `.env` in desktop mode)
 - These files are committed to Git and must not contain private keys
 - Local overrides (API keys, machine-specific settings) go in uncommitted sibling `.env.local` / `.env.saas.local` / `.env.desktop.local` files — Vite automatically layers them on top
 - Never use `|| 'hardcoded-fallback'` inline — put defaults in the committed env files
@@ -152,7 +152,7 @@ The project structure is defined in `engine/pyproject.toml`. Any new dependencie
 #### Import Paths - CRITICAL
 **ALWAYS use `@app/*` for imports.** Do not use `@core/*` or `@proprietary/*` unless explicitly wrapping/extending a lower layer implementation.

-For a broader explanation of the frontend layering and override architecture, see [frontend/editor/DeveloperGuide.md](frontend/editor/DeveloperGuide.md).
+For a broader explanation of the frontend layering and override architecture, see [frontend/DeveloperGuide.md](frontend/DeveloperGuide.md).

 ```typescript
 // ✅ CORRECT - Use @app/* for all imports
@@ -243,7 +243,7 @@ Frontend designed for **stateful document processing**:
 - No file reloading between tools - performance critical for large PDFs (up to 100GB+)

 #### FileContext - Central State Management
-**Location**: `frontend/editor/src/core/contexts/FileContext.tsx`
+**Location**: `frontend/src/core/contexts/FileContext.tsx`
 - **Active files**: Currently loaded PDFs and their variants
 - **Tool navigation**: Current mode (viewer/pageEditor/fileEditor/toolName)
 - **Memory management**: PDF document cleanup, blob URL lifecycle, Web Worker management
@@ -268,7 +268,7 @@ Without cleanup: browser crashes with memory leaks.

 **Architecture**: Modular hook-based system with clear separation of concerns:

- **useToolOperation** (`frontend/editor/src/core/hooks/tools/shared/useToolOperation.ts`): Main orchestrator hook
+- **useToolOperation** (`frontend/src/core/hooks/tools/shared/useToolOperation.ts`): Main orchestrator hook
  - Coordinates all tool operations with consistent interface
  - Integrates with FileContext for operation tracking
  - Handles validation, error handling, and UI state management
@@ -356,7 +356,7 @@ return useToolOperation({
 ### Frontend Directory Structure
 The frontend is organized with a clear separation of concerns:

- **`frontend/editor/src/core/`**: Main application code (shared, production-ready components)
+- **`frontend/src/core/`**: Main application code (shared, production-ready components)
  - **`core/components/`**: React components organized by feature
    - `core/components/tools/`: Individual PDF tool implementations
    - `core/components/viewer/`: PDF viewer components
@@ -374,17 +374,17 @@ The frontend is organized with a clear separation of concerns:
  - **`core/data/`**: Static data (tool taxonomy, etc.)
  - **`core/services/`**: Business logic services (PDF processing, storage, etc.)

- **`frontend/editor/src/desktop/`**: Desktop-specific (Tauri) code
- **`frontend/editor/src/proprietary/`**: Proprietary/licensed features
- **`frontend/editor/src-tauri/`**: Tauri (Rust) native desktop application code
- **`frontend/editor/public/`**: Static assets served directly
+- **`frontend/src/desktop/`**: Desktop-specific (Tauri) code
+- **`frontend/src/proprietary/`**: Proprietary/licensed features
+- **`frontend/src-tauri/`**: Tauri (Rust) native desktop application code
+- **`frontend/public/`**: Static assets served directly
  - `public/locales/`: Translation JSON files

 ### Component Architecture
- **Static Assets**: CSS, JS, and resources in `src/main/resources/static/` (legacy) + `frontend/editor/public/` (modern)
+- **Static Assets**: CSS, JS, and resources in `src/main/resources/static/` (legacy) + `frontend/public/` (modern)
 - **Internationalization**:
  - Backend: `messages_*.properties` files
-  - Frontend: JSON files in `frontend/editor/public/locales/` (converted from .properties)
+  - Frontend: JSON files in `frontend/public/locales/` (converted from .properties)
  - Conversion Script: `scripts/convert_properties_to_json.py`

 ### Configuration Modes
@@ -409,7 +409,7 @@ The frontend is organized with a clear separation of concerns:
 4. **Code Style**: Spotless enforces Google Java Format automatically (`task backend:format`)
 5. **Translations**:
   - Backend: Use helper scripts in `/scripts` for multi-language updates
-   - Frontend: Update JSON files in `frontend/editor/public/locales/` or use conversion script
+   - 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`

 ## Frontend Architecture Status
@@ -427,7 +427,7 @@ The frontend is organized with a clear separation of concerns:
 ## Translation Rules

 - **CRITICAL**: Always update translations in `en-GB` only, never `en-US`
- Translation files are located in `frontend/editor/public/locales/`
+- Translation files are located in `frontend/public/locales/`

 ## Important Notes

@@ -458,26 +458,3 @@ The frontend is organized with a clear separation of concerns:
 - Confirm approach before making structural changes
 - Request guidance on preferences (cross-platform vs specific tools, etc.)
 - Verify understanding of requirements before proceeding
-
-
-## Stack reality check (don't trust LLM training data) <!-- bleeding-edge-stack-note -->
-
-This codebase is on bleeding-edge versions of its core JVM stack: **Spring Boot 4.0.6**,
-**Jackson 3 (`tools.jackson`)**, **JDK 21/25 source/target with JDK 25 toolchain**.
-All three are *post*-2024 releases and your training corpus is overwhelmingly Spring Boot 2/3 and
-Jackson 2 patterns — those patterns will compile, run differently, or hallucinate APIs that no
-longer exist.
-
-Before writing or editing Spring / Jackson / JDK code:
-
-1. Open an existing module in `app/core/` or `app/common/` and grep for the actual imports being
-   used — `import tools.jackson...` not `import com.fasterxml.jackson...`, and the new
-   `org.springframework.boot` 4.x package layout.
-2. If you're not sure whether an API exists in this stack version, **check the source on disk
-   first** (the dependency JARs are downloaded under `~/.gradle/caches/modules-2/`).
-3. Do not silently downgrade a Spring Boot 4 pattern to a Spring Boot 3 equivalent. If something
-   doesn't work, surface it to the human — don't guess.
-
-Same goes for Jackson 3's API surface (renamed `ObjectMapper` builder methods, new
-`tools.jackson.databind` namespace) and JDK 25 preview features. Ground your code in this repo's
-actual imports, not what worked three years ago.
@@ -128,26 +128,24 @@ See [the frontend README](frontend/README.md#tauri) for detailed build instructi
 Stirling-PDF/
 ├── .github/               # GitHub-specific files (workflows, issue templates)
 ├── configs/               # Configuration files used by stirling at runtime (generated at runtime)
-├── frontend/              # Frontend workspace (Stirling 2.0)
-│   ├── editor/            # PDF editor app (the original React SPA)
-│   │   ├── src/
-│   │   │   ├── components/    # React components
-│   │   │   ├── tools/         # Tool-specific React components
-│   │   │   ├── hooks/         # Custom React hooks
-│   │   │   ├── services/      # API and utility services
-│   │   │   ├── types/         # TypeScript type definitions
-│   │   │   └── utils/         # Utility functions
-│   │   ├── src-tauri/     # Tauri desktop app configuration
-│   │   │   ├── src/           # Rust backend code
-│   │   │   ├── libs/          # JAR files (generated by build scripts)
-│   │   │   ├── runtime/       # Bundled JRE (generated by build scripts)
-│   │   │   ├── Cargo.toml     # Rust dependencies
-│   │   │   └── tauri.conf.json # Tauri configuration
-│   │   ├── public/
-│   │   │   └── locales/       # Internationalization files (JSON)
-│   │   └── vite.config.ts     # Vite configuration
-│   ├── package.json       # Shared workspace dependencies
-│   └── eslint.config.mjs  # Shared lint config
+├── frontend/              # React SPA frontend (Stirling 2.0)
+│   ├── src/
+│   │   ├── components/    # React components
+│   │   ├── tools/         # Tool-specific React components
+│   │   ├── hooks/         # Custom React hooks
+│   │   ├── services/      # API and utility services
+│   │   ├── types/         # TypeScript type definitions
+│   │   └── utils/         # Utility functions
+│   ├── src-tauri/         # Tauri desktop app configuration
+│   │   ├── src/           # Rust backend code
+│   │   ├── libs/          # JAR files (generated by build scripts)
+│   │   ├── runtime/       # Bundled JRE (generated by build scripts)
+│   │   ├── Cargo.toml     # Rust dependencies
+│   │   └── tauri.conf.json # Tauri configuration
+│   ├── public/
+│   │   └── locales/       # Internationalization files (JSON)
+│   ├── package.json       # Frontend dependencies
+│   └── vite.config.ts     # Vite configuration
 ├── customFiles/           # Custom static files and templates (generated at runtime used to replace existing files)
 ├── docs/                  # Documentation files
 ├── exampleYmlFiles/       # Example YAML configuration files
@@ -447,7 +445,7 @@ For Stirling 2.0, new features are built as React components:

 1. **Create the React Component:**
   ```typescript
-   // frontend/editor/src/tools/NewTool.tsx
+   // frontend/src/tools/NewTool.tsx
   import { useState } from 'react';
   import { Button, FileInput, Container } from '@mantine/core';

@@ -10,10 +10,6 @@ if that directory exists, is licensed under the license defined in "app/propriet
 if that directory exists, is licensed under the license defined in "app/saas/LICENSE".
 * All content that resides under the "engine/" directory of this repository,
 if that directory exists, is licensed under the license defined in "engine/LICENSE".
-* "scripts/pymupdf_convert.py", if that file exists, is licensed under the GNU Affero
-General Public License v3.0 (or later) as declared in its file header. It is a separate
-program invoked as an OS subprocess; its license does not extend to other content in
-this repository.
 * All content that resides under the "frontend/src/proprietary/" directory of this repository,
 if that directory exists, is licensed under the license defined in "frontend/src/proprietary/LICENSE".
 * All content that resides under the "frontend/src/desktop/" directory of this repository,
@@ -58,23 +58,6 @@ tasks:
          BACKEND_URL: 'http://localhost:{{.BACKEND_PORT}}'
          OPEN: "true"

-  dev:saas:
-    desc: "Start SaaS backend + frontend concurrently on free ports"
-    vars:
-      PORTS:
-        sh: '{{if eq OS "windows"}}{{.FIND_FREE_PORT_PS}} 8080 5173{{else}}{{.FIND_FREE_PORT_SH}} 8080 5173{{end}}'
-      BACKEND_PORT: '{{index (splitList "\n" .PORTS) 0}}'
-      FRONTEND_PORT: '{{index (splitList "\n" .PORTS) 1}}'
-    deps:
-      - task: backend:dev:saas
-        vars:
-          PORT: '{{.BACKEND_PORT}}'
-      - task: frontend:dev:saas
-        vars:
-          PORT: '{{.FRONTEND_PORT}}'
-          BACKEND_URL: 'http://localhost:{{.BACKEND_PORT}}'
-          OPEN: "true"
-
  dev:all:
    desc: "Start backend + frontend + engine concurrently on free ports"
    vars:
@@ -91,7 +74,7 @@ tasks:
        vars:
          PORT: '{{.BACKEND_PORT}}'
          AIENGINE_URL: 'http://localhost:{{.ENGINE_PORT}}'
-      - task: frontend:dev
+      - task: frontend:dev:prototypes
        vars:
          PORT: '{{.FRONTEND_PORT}}'
          BACKEND_URL: 'http://localhost:{{.BACKEND_PORT}}'
@@ -86,7 +86,7 @@ If you're using Tauri's built-in updater feature:

 ## Configuration Files

-### 1. Tauri Configuration (frontend/editor/src-tauri/tauri.conf.json)
+### 1. Tauri Configuration (frontend/src-tauri/tauri.conf.json)

 The Windows signing configuration is already set up:

@@ -1,34 +0,0 @@
-###############################################################################
-# Stirling-PDF SaaS environment defaults.
-#
-# This file is committed and provides non-secret defaults loaded by
-# `task backend:dev:saas`. Put real values for secrets (passwords, project
-# refs, edge function secrets) in `.env.saas.local` - any variable set there
-# takes precedence over what's defined here.
-#
-# DO NOT commit `.env.saas.local`. Only `.env.saas` is checked in.
-###############################################################################
-
-# ---------- Supabase project ----------
-# Project reference (the subdomain part of <ref>.supabase.co). Required.
-# Set in .env.saas.local.
-SAAS_DB_PROJECT_REF=
-
-# Edge function secret used by billing/license rollup calls. Set in .env.saas.local.
-SUPABASE_EDGE_FUNCTION_SECRET=
-
-# ---------- Database (saas profile) ----------
-# Direct JDBC URL to the Supabase Postgres. Required when running the plain
-# `saas` profile (i.e. without `--spring.profiles.include=dev`).
-# Example: jdbc:postgresql://db.<project-ref>.supabase.co:5432/postgres
-SAAS_DB_URL=
-SAAS_DB_USERNAME=postgres
-SAAS_DB_PASSWORD=
-
-# ---------- Database (dev profile overrides) ----------
-# Used when `--spring.profiles.include=dev` is active. The dev profile
-# defaults the URL/username to the shared dev Supabase project, but the
-# password must still be provided in .env.saas.local.
-SAAS_DEV_DB_URL=
-SAAS_DEV_DB_USERNAME=postgres
-SAAS_DEV_DB_PASSWORD=
@@ -1,3 +0,0 @@
-# Whitelist committed env defaults. `.env.saas.local` (and any other .env*)
-# stays ignored via the root .gitignore.
-!.env.saas
@@ -44,10 +44,6 @@
      "moduleName": ".*",
      "moduleLicense": "The MIT License"
    },
-    {
-      "moduleName": ".*",
-      "moduleLicense": "MIT-0"
-    },
    {
      "moduleName": "com.github.jai-imageio:jai-imageio-core",
      "moduleLicense": "LICENSE.txt"
@@ -60,7 +60,7 @@ dependencies {
        exclude group: 'com.google.code.gson', module: 'gson'
    }

-    api 'com.stirling:jpdfium:1.0.1'
+    api 'com.stirling:jpdfium:1.0.0'

    // -PjpdfiumPlatforms=all|<csv of linux-x64,linux-arm64,darwin-x64,darwin-arm64,windows-x64>
    def jpdfiumPlatformsProp = (project.findProperty('jpdfiumPlatforms') ?: 'all').toString().trim()
@@ -75,12 +75,9 @@ dependencies {
    }
    logger.lifecycle("JPDFium native platforms: ${jpdfiumPlatforms.join(', ')}")
    jpdfiumPlatforms.each { platform ->
-        runtimeOnly "com.stirling:jpdfium-natives-${platform}:1.0.1"
+        runtimeOnly "com.stirling:jpdfium-natives-${platform}:1.0.0"
    }

-    // Bucket4j (local in-process token bucket for RateLimitStore default impl)
-    implementation 'com.bucket4j:bucket4j_jdk17-core:8.19.0'
-
    // ArchUnit: enforces module dependency direction (see ArchitectureTest)
    testImplementation 'com.tngtech.archunit:archunit-junit5:1.4.2'
 }
@@ -77,10 +77,6 @@ public @interface AutoJobPostMapping {
    /**
     * Relative resource weight (1-100). See {@link
     * stirling.software.common.enumeration.ResourceWeight} for the standard tiers.
-     *
-     * <p>The default is a sentinel ({@link Integer#MIN_VALUE}); {@code
-     * AutoJobPostMappingWeightTest} fails the build if any endpoint leaves it unset. Runtime
-     * readers clamp the value into {@code [1, 100]}.
     */
-    int resourceWeight() default Integer.MIN_VALUE;
+    int resourceWeight() default 1;
 }
@@ -1,24 +0,0 @@
-package stirling.software.common.cluster;
-
-/** Health and identity facade for the active cluster backplane. */
-public interface ClusterBackplane {
-
-    /** Returns {@code true} when the backplane is reachable; used for health endpoints. */
-    boolean isHealthy();
-
-    /** Returns {@code "inprocess"} or {@code "valkey"}. */
-    String backplaneType();
-
-    /** Returns this JVM's stable node id (matches {@code Cluster.resolvedNodeId()}). */
-    String localNodeId();
-
-    /**
-     * Whether this JVM should run the local {@link
-     * stirling.software.common.service.TaskManager#cleanupOldJobs()} loop. Distributed backplanes
-     * own job expiry via their own TTL, so they should override this to return {@code false}.
-     * Defaults to {@code true} so in-process behavior is preserved without an explicit override.
-     */
-    default boolean shouldRunLocalCleanup() {
-        return true;
-    }
-}
@@ -1,63 +0,0 @@
-package stirling.software.common.cluster;
-
-import org.springframework.context.annotation.Configuration;
-
-import jakarta.annotation.PostConstruct;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-
-import stirling.software.common.model.ApplicationProperties;
-import stirling.software.common.model.ApplicationProperties.Cluster;
-
-/**
- * Validates that cluster mode is internally consistent.
- *
- * <p>Cluster settings are bound on the central {@link ApplicationProperties} under {@code
- * cluster.*}; this class reads {@link ApplicationProperties#getCluster()} and runs guards in {@link
- * PostConstruct}. When {@code cluster.enabled=false} (the default) all checks are skipped so a
- * single-instance install needs no new config.
- */
-@Slf4j
-@Configuration
-@RequiredArgsConstructor
-public class ClusterConfig {
-
-    private final ApplicationProperties applicationProperties;
-
-    @PostConstruct
-    void validate() {
-        Cluster cluster = applicationProperties.getCluster();
-        if (!cluster.isEnabled()) {
-            return;
-        }
-        String backplane = cluster.getBackplane();
-        if ("valkey".equalsIgnoreCase(backplane)) {
-            String url = cluster.getValkey() == null ? null : cluster.getValkey().getUrl();
-            if (url == null || url.isBlank()) {
-                throw new IllegalStateException(
-                        "cluster.enabled=true with backplane=valkey requires"
-                                + " cluster.valkey.url to be set (e.g."
-                                + " redis://valkey:6379).");
-            }
-        } else if ("inprocess".equalsIgnoreCase(backplane)) {
-            // enabled+inprocess only coordinates the local JVM; cross-node lookups will 410.
-            log.warn(
-                    "cluster.enabled=true with backplane=inprocess - only the local"
-                            + " JVM is coordinated. Cross-node lookups and the file proxy will fail."
-                            + " Use backplane=valkey for real multi-node deployments.");
-        } else {
-            // Fail fast on typos like "valky" so Spring doesn't later report a cryptic
-            // "no ClusterBackplane bean" - the operator-facing error names the bad value.
-            throw new IllegalStateException(
-                    "cluster.enabled=true with unknown backplane '"
-                            + backplane
-                            + "'. Valid values: inprocess | valkey.");
-        }
-        log.info(
-                "Cluster mode enabled (backplane={}, nodeRole={}, nodeId={}).",
-                backplane,
-                cluster.resolvedRole(),
-                cluster.resolvedNodeId());
-    }
-}
@@ -1,12 +0,0 @@
-package stirling.software.common.cluster;
-
-import java.time.Instant;
-
-/**
- * Snapshot of a peer node as recorded in the {@link InstanceRegistry}.
- *
- * @param internalAddress {@code host:port} the node listens on for {@code /internal/cluster/**}
- * @param role one of {@code WEB}, {@code WORKER}, {@code BOTH}
- */
-public record ClusterNode(
-        String nodeId, String internalAddress, Instant lastHeartbeat, String role) {}
@@ -1,21 +0,0 @@
-package stirling.software.common.cluster;
-
-import java.time.Duration;
-import java.util.Optional;
-
-/** Cluster-wide mutual exclusion primitive; non-reentrant by contract. */
-public interface DistributedLock {
-
-    Optional<LockHandle> tryAcquire(String lockKey, Duration leaseTime);
-
-    interface LockHandle extends AutoCloseable {
-        void release();
-
-        boolean renew(Duration leaseTime);
-
-        @Override
-        default void close() {
-            release();
-        }
-    }
-}
@@ -1,45 +0,0 @@
-package stirling.software.common.cluster;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-
-/** Low-level storage seam for result/job files. */
-public interface FileStore {
-
-    /** Stored file record. */
-    record Stored(String fileId, long size) {}
-
-    /** Store the given stream and return a generated file id and total bytes written. */
-    Stored store(InputStream in, String originalName) throws IOException;
-
-    /**
-     * Store the file at {@code source} and return a generated file id and total bytes written.
-     *
-     * <p>Default implementation opens {@code source} as a stream and delegates to {@link
-     * #store(InputStream, String)}. Local-disk implementations should override to use a direct
-     * file-to-file copy ({@code Files.copy(source, dest)} can use {@code sendfile(2)} on Linux),
-     * which avoids the two-memory-copy hit of streaming a disk-backed upload through the JVM heap.
-     */
-    default Stored store(Path source, String originalName) throws IOException {
-        try (InputStream in = Files.newInputStream(source)) {
-            return store(in, originalName);
-        }
-    }
-
-    /** Open the stored file for streaming reads. Caller closes. */
-    InputStream retrieve(String fileId) throws IOException;
-
-    /** Load the stored file into a byte array. */
-    byte[] retrieveBytes(String fileId) throws IOException;
-
-    /** Size of the stored file in bytes. */
-    long size(String fileId) throws IOException;
-
-    /** Delete the stored file. Returns true if a file was removed. */
-    boolean delete(String fileId);
-
-    /** Whether the file id exists in the store. */
-    boolean exists(String fileId);
-}
@@ -1,18 +0,0 @@
-package stirling.software.common.cluster;
-
-import java.time.Duration;
-import java.util.Collection;
-import java.util.Optional;
-
-/** Maps {@code nodeId} to its internal cluster address, with TTL'd heartbeats. */
-public interface InstanceRegistry {
-
-    /** Register or refresh this node. Idempotent so a wiped backplane self-heals on next tick. */
-    void register(ClusterNode node, Duration heartbeatTtl);
-
-    Optional<ClusterNode> lookup(String nodeId);
-
-    Collection<ClusterNode> activeNodes();
-
-    void deregister(String nodeId);
-}
@@ -1,24 +0,0 @@
-package stirling.software.common.cluster;
-
-import java.time.Duration;
-import java.util.Collection;
-import java.util.Optional;
-
-/** Cluster-visible storage for job status and result metadata, with TTL'd entries. */
-public interface JobStore {
-
-    /** Persist or overwrite a job entry. {@code ttl} sets the lifetime of the entry. */
-    void put(JobStoreEntry entry, Duration ttl);
-
-    Optional<JobStoreEntry> get(String jobId);
-
-    void delete(String jobId);
-
-    boolean exists(String jobId);
-
-    /** Reverse lookup: which job owns this result file id? */
-    Optional<String> findJobIdByFileId(String fileId);
-
-    /** Snapshot of every active entry. Used by admin/stats endpoints; may be O(n). */
-    Collection<JobStoreEntry> all();
-}
@@ -1,30 +0,0 @@
-package stirling.software.common.cluster;
-
-import java.time.Instant;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Cluster-visible projection of a job's status and result metadata, as persisted in {@link
- * JobStore}.
- *
- * @param owningNodeId the node id that originally executed the job
- */
-public record JobStoreEntry(
-        String jobId,
-        JobState state,
-        String owningNodeId,
-        Instant createdAt,
-        Instant completedAt,
-        String error,
-        List<String> fileIds,
-        Map<String, String> resultMeta) {
-
-    /** Lifecycle states for a job as observed by the cluster. */
-    public enum JobState {
-        PENDING,
-        RUNNING,
-        COMPLETE,
-        FAILED
-    }
-}
@@ -1,16 +0,0 @@
-package stirling.software.common.cluster;
-
-import java.time.Duration;
-import java.util.Optional;
-
-/** Short-TTL namespaced key/value cache backed by the cluster backplane. */
-public interface KeyValueCache {
-
-    void put(String namespace, String key, String value, Duration ttl);
-
-    Optional<String> get(String namespace, String key);
-
-    void evict(String namespace, String key);
-
-    void evictNamespace(String namespace);
-}
@@ -1,18 +0,0 @@
-package stirling.software.common.cluster;
-
-import java.time.Duration;
-
-/** Token-bucket rate limiting backed by the cluster backplane. */
-public interface RateLimitStore {
-
-    /**
-     * Attempt to consume one token from the bucket identified by {@code bucketKey}.
-     *
-     * @param bucketKey opaque key identifying the bucket (e.g. {@code api:user:123})
-     * @param capacity bucket capacity
-     * @param refillPeriod time window over which {@code capacity} tokens refill
-     */
-    RateLimitDecision tryConsume(String bucketKey, long capacity, Duration refillPeriod);
-
-    record RateLimitDecision(boolean allowed, long remainingTokens, long nanosToWaitForRefill) {}
-}
@@ -1,7 +0,0 @@
-package stirling.software.common.cluster;
-
-/** Records one increment per sticky-session miss (a 410 Gone for a job owned by another node). */
-@FunctionalInterface
-public interface StickyMissRecorder {
-    void recordStickyMiss();
-}
@@ -1,31 +0,0 @@
-package stirling.software.common.cluster.inprocess;
-
-import lombok.extern.slf4j.Slf4j;
-
-import stirling.software.common.cluster.ClusterBackplane;
-import stirling.software.common.model.ApplicationProperties;
-
-@Slf4j
-public class InProcessClusterBackplane implements ClusterBackplane {
-
-    private final ApplicationProperties applicationProperties;
-
-    public InProcessClusterBackplane(ApplicationProperties applicationProperties) {
-        this.applicationProperties = applicationProperties;
-    }
-
-    @Override
-    public boolean isHealthy() {
-        return true;
-    }
-
-    @Override
-    public String backplaneType() {
-        return "inprocess";
-    }
-
-    @Override
-    public String localNodeId() {
-        return applicationProperties.getCluster().resolvedNodeId();
-    }
-}
@@ -1,65 +0,0 @@
-package stirling.software.common.cluster.inprocess;
-
-import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-import lombok.extern.slf4j.Slf4j;
-
-import stirling.software.common.cluster.ClusterBackplane;
-import stirling.software.common.cluster.DistributedLock;
-import stirling.software.common.cluster.InstanceRegistry;
-import stirling.software.common.cluster.JobStore;
-import stirling.software.common.cluster.KeyValueCache;
-import stirling.software.common.cluster.RateLimitStore;
-import stirling.software.common.model.ApplicationProperties;
-
-/**
- * Default cluster backplane wiring: every interface gets an {@code InProcess*} bean. Active when
- * cluster mode is off or {@code cluster.backplane=inprocess}.
- */
-@Slf4j
-@Configuration
-@ConditionalOnExpression(
-        "!${cluster.enabled:false} ||"
-                + " '${cluster.backplane:inprocess}'.equalsIgnoreCase('inprocess')")
-public class InProcessClusterConfiguration {
-
-    @Bean
-    @ConditionalOnMissingBean
-    public ClusterBackplane clusterBackplane(ApplicationProperties applicationProperties) {
-        log.info("Cluster backplane: in-process (single node)");
-        return new InProcessClusterBackplane(applicationProperties);
-    }
-
-    @Bean
-    @ConditionalOnMissingBean
-    public JobStore jobStore() {
-        return new InProcessJobStore();
-    }
-
-    @Bean
-    @ConditionalOnMissingBean
-    public RateLimitStore rateLimitStore() {
-        return new InProcessRateLimitStore();
-    }
-
-    @Bean
-    @ConditionalOnMissingBean
-    public DistributedLock distributedLock() {
-        return new InProcessDistributedLock();
-    }
-
-    @Bean
-    @ConditionalOnMissingBean
-    public KeyValueCache keyValueCache() {
-        return new InProcessKeyValueCache();
-    }
-
-    @Bean
-    @ConditionalOnMissingBean
-    public InstanceRegistry instanceRegistry() {
-        return new InProcessInstanceRegistry();
-    }
-}
@@ -1,128 +0,0 @@
-package stirling.software.common.cluster.inprocess;
-
-import java.time.Duration;
-import java.util.Optional;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicLong;
-
-import stirling.software.common.cluster.DistributedLock;
-
-/**
- * In-process {@link DistributedLock}, non-reentrant per the interface contract, with lease-expiry
- * semantics that mirror a SET-NX-EX style distributed backend.
- *
- * <p>Each lock state carries a per-acquire {@code ownerToken} and an {@code expiryNanos}; another
- * caller can take over once the lease has elapsed even if the original holder never called {@link
- * LockHandle#release()}. This matters mostly for parity with the Valkey-backed implementation
- * (Redis {@code SETEX} auto-expires the key); within a single JVM a crashed holder takes its lock
- * state with it, but tests and code that rely on the {@code leaseTime} parameter still need it to
- * be honored.
- *
- * <p>Expiry is lazy: an expired lock state lingers in the map until the next acquire attempt for
- * the same key replaces it. Per-key cleanup also happens on explicit {@link LockHandle#release()},
- * so a balanced acquire/release workload keeps the map size bounded.
- */
-public class InProcessDistributedLock implements DistributedLock {
-
-    private final ConcurrentHashMap<String, LockState> locks = new ConcurrentHashMap<>();
-    private final AtomicLong tokenSeq = new AtomicLong();
-
-    /**
-     * Lease state for a single acquired lock. {@code ownerToken} prevents a former holder from
-     * releasing or renewing a lock now owned by someone else after lease expiry; {@code
-     * expiryNanos} is read/written only inside {@link ConcurrentHashMap#compute} so the bin lock
-     * provides the necessary happens-before guarantee.
-     */
-    private static final class LockState {
-        final long ownerToken;
-        long expiryNanos;
-
-        LockState(long ownerToken, long expiryNanos) {
-            this.ownerToken = ownerToken;
-            this.expiryNanos = expiryNanos;
-        }
-    }
-
-    @Override
-    public Optional<LockHandle> tryAcquire(String lockKey, Duration leaseTime) {
-        long token = tokenSeq.incrementAndGet();
-        long nowNanos = System.nanoTime();
-        long expiryNanos = nowNanos + leaseTime.toNanos();
-        boolean[] acquired = {false};
-        locks.compute(
-                lockKey,
-                (k, existing) -> {
-                    if (existing == null || existing.expiryNanos - nowNanos <= 0L) {
-                        // No lock, or the previous lease has expired - we take it. Subtraction
-                        // form avoids the long-overflow trap that would bite a naive
-                        // expiryNanos <= nowNanos comparison around System.nanoTime() rollover.
-                        acquired[0] = true;
-                        return new LockState(token, expiryNanos);
-                    }
-                    return existing;
-                });
-        if (!acquired[0]) {
-            return Optional.empty();
-        }
-        return Optional.of(new InProcessHandle(lockKey, token));
-    }
-
-    private void releaseInternal(String lockKey, long token) {
-        locks.compute(
-                lockKey,
-                (k, existing) -> {
-                    if (existing == null || existing.ownerToken != token) {
-                        // Already removed, expired-and-replaced, or never ours.
-                        return existing;
-                    }
-                    return null;
-                });
-    }
-
-    private boolean renewInternal(String lockKey, long token, Duration leaseTime) {
-        long nowNanos = System.nanoTime();
-        boolean[] renewed = {false};
-        locks.compute(
-                lockKey,
-                (k, existing) -> {
-                    if (existing == null
-                            || existing.ownerToken != token
-                            || existing.expiryNanos - nowNanos <= 0L) {
-                        // Lock is gone or expired; renewal is a no-op so the caller can detect it.
-                        return existing;
-                    }
-                    existing.expiryNanos = nowNanos + leaseTime.toNanos();
-                    renewed[0] = true;
-                    return existing;
-                });
-        return renewed[0];
-    }
-
-    private final class InProcessHandle implements LockHandle {
-        private final String lockKey;
-        private final long token;
-        private boolean released;
-
-        InProcessHandle(String lockKey, long token) {
-            this.lockKey = lockKey;
-            this.token = token;
-        }
-
-        @Override
-        public synchronized void release() {
-            if (released) {
-                return;
-            }
-            released = true;
-            releaseInternal(lockKey, token);
-        }
-
-        @Override
-        public synchronized boolean renew(Duration leaseTime) {
-            if (released) {
-                return false;
-            }
-            return renewInternal(lockKey, token, leaseTime);
-        }
-    }
-}
@@ -1,42 +0,0 @@
-package stirling.software.common.cluster.inprocess;
-
-import java.time.Duration;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Optional;
-import java.util.concurrent.atomic.AtomicReference;
-
-import stirling.software.common.cluster.ClusterNode;
-import stirling.software.common.cluster.InstanceRegistry;
-
-public class InProcessInstanceRegistry implements InstanceRegistry {
-
-    private final AtomicReference<ClusterNode> self = new AtomicReference<>();
-
-    @Override
-    public void register(ClusterNode node, Duration heartbeatTtl) {
-        self.set(node);
-    }
-
-    @Override
-    public Optional<ClusterNode> lookup(String nodeId) {
-        ClusterNode current = self.get();
-        return current != null && current.nodeId().equals(nodeId)
-                ? Optional.of(current)
-                : Optional.empty();
-    }
-
-    @Override
-    public Collection<ClusterNode> activeNodes() {
-        ClusterNode current = self.get();
-        return current == null ? Collections.emptyList() : Collections.singletonList(current);
-    }
-
-    @Override
-    public void deregister(String nodeId) {
-        ClusterNode current = self.get();
-        if (current != null && current.nodeId().equals(nodeId)) {
-            self.set(null);
-        }
-    }
-}
@@ -1,96 +0,0 @@
-package stirling.software.common.cluster.inprocess;
-
-import java.time.Duration;
-import java.time.Instant;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.concurrent.ConcurrentHashMap;
-
-import lombok.extern.slf4j.Slf4j;
-
-import stirling.software.common.cluster.JobStore;
-import stirling.software.common.cluster.JobStoreEntry;
-
-@Slf4j
-public class InProcessJobStore implements JobStore {
-
-    private final ConcurrentHashMap<String, Holder> entries = new ConcurrentHashMap<>();
-
-    @Override
-    public void put(JobStoreEntry entry, Duration ttl) {
-        Instant expiry = ttl == null ? Instant.MAX : Instant.now().plus(ttl);
-        entries.put(entry.jobId(), new Holder(entry, expiry));
-    }
-
-    @Override
-    public Optional<JobStoreEntry> get(String jobId) {
-        Holder h = entries.get(jobId);
-        if (h == null) {
-            return Optional.empty();
-        }
-        if (h.isExpired()) {
-            entries.remove(jobId, h);
-            return Optional.empty();
-        }
-        return Optional.of(h.entry);
-    }
-
-    @Override
-    public void delete(String jobId) {
-        entries.remove(jobId);
-    }
-
-    @Override
-    public boolean exists(String jobId) {
-        return get(jobId).isPresent();
-    }
-
-    @Override
-    public Optional<String> findJobIdByFileId(String fileId) {
-        for (Map.Entry<String, Holder> e : entries.entrySet()) {
-            Holder h = e.getValue();
-            if (h.isExpired()) {
-                continue;
-            }
-            List<String> fileIds = h.entry.fileIds();
-            if (fileIds != null && fileIds.contains(fileId)) {
-                return Optional.of(e.getKey());
-            }
-        }
-        return Optional.empty();
-    }
-
-    @Override
-    public Collection<JobStoreEntry> all() {
-        List<JobStoreEntry> result = new ArrayList<>(entries.size());
-        for (Holder h : entries.values()) {
-            if (!h.isExpired()) {
-                result.add(h.entry);
-            }
-        }
-        return result;
-    }
-
-    /** Drop entries whose TTL has elapsed. Called by the {@code TaskManager} cleanup scheduler. */
-    public int purgeExpired() {
-        int removed = 0;
-        Instant now = Instant.now();
-        for (Map.Entry<String, Holder> e : entries.entrySet()) {
-            if (!e.getValue().expiry.equals(Instant.MAX) && e.getValue().expiry.isBefore(now)) {
-                if (entries.remove(e.getKey(), e.getValue())) {
-                    removed++;
-                }
-            }
-        }
-        return removed;
-    }
-
-    private record Holder(JobStoreEntry entry, Instant expiry) {
-        boolean isExpired() {
-            return !expiry.equals(Instant.MAX) && expiry.isBefore(Instant.now());
-        }
-    }
-}
@@ -1,55 +0,0 @@
-package stirling.software.common.cluster.inprocess;
-
-import java.time.Duration;
-import java.time.Instant;
-import java.util.Map;
-import java.util.Optional;
-import java.util.concurrent.ConcurrentHashMap;
-
-import stirling.software.common.cluster.KeyValueCache;
-
-public class InProcessKeyValueCache implements KeyValueCache {
-
-    private final ConcurrentHashMap<String, ConcurrentHashMap<String, Expiring>> namespaces =
-            new ConcurrentHashMap<>();
-
-    @Override
-    public void put(String namespace, String key, String value, Duration ttl) {
-        Instant expiry = ttl == null ? Instant.MAX : Instant.now().plus(ttl);
-        namespaces
-                .computeIfAbsent(namespace, n -> new ConcurrentHashMap<>())
-                .put(key, new Expiring(value, expiry));
-    }
-
-    @Override
-    public Optional<String> get(String namespace, String key) {
-        Map<String, Expiring> ns = namespaces.get(namespace);
-        if (ns == null) {
-            return Optional.empty();
-        }
-        Expiring e = ns.get(key);
-        if (e == null) {
-            return Optional.empty();
-        }
-        if (e.expiry.isBefore(Instant.now())) {
-            ns.remove(key, e);
-            return Optional.empty();
-        }
-        return Optional.of(e.value);
-    }
-
-    @Override
-    public void evict(String namespace, String key) {
-        Map<String, Expiring> ns = namespaces.get(namespace);
-        if (ns != null) {
-            ns.remove(key);
-        }
-    }
-
-    @Override
-    public void evictNamespace(String namespace) {
-        namespaces.remove(namespace);
-    }
-
-    private record Expiring(String value, Instant expiry) {}
-}
@@ -1,49 +0,0 @@
-package stirling.software.common.cluster.inprocess;
-
-import java.time.Duration;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import io.github.bucket4j.Bandwidth;
-import io.github.bucket4j.Bucket;
-import io.github.bucket4j.ConsumptionProbe;
-import io.github.bucket4j.local.LocalBucketBuilder;
-
-import stirling.software.common.cluster.RateLimitStore;
-
-/** Bucket4j-backed token bucket implementation of {@link RateLimitStore}. */
-public class InProcessRateLimitStore implements RateLimitStore {
-
-    /** Cap to bound memory; oldest accessed buckets are evicted. */
-    private static final int MAX_BUCKETS = 10_000;
-
-    private final Map<String, Bucket> buckets =
-            Collections.synchronizedMap(
-                    new LinkedHashMap<String, Bucket>(256, 0.75f, true) {
-                        @Override
-                        protected boolean removeEldestEntry(Map.Entry<String, Bucket> eldest) {
-                            return size() > MAX_BUCKETS;
-                        }
-                    });
-
-    @Override
-    public RateLimitDecision tryConsume(String bucketKey, long capacity, Duration refillPeriod) {
-        String compositeKey = bucketKey + "|" + capacity + "|" + refillPeriod.toNanos();
-        Bucket bucket =
-                buckets.computeIfAbsent(compositeKey, k -> buildBucket(capacity, refillPeriod));
-        ConsumptionProbe probe = bucket.tryConsumeAndReturnRemaining(1);
-        return new RateLimitDecision(
-                probe.isConsumed(),
-                probe.getRemainingTokens(),
-                probe.isConsumed() ? 0L : probe.getNanosToWaitForRefill());
-    }
-
-    private static Bucket buildBucket(long capacity, Duration refillPeriod) {
-        Bandwidth limit =
-                Bandwidth.builder().capacity(capacity).refillGreedy(capacity, refillPeriod).build();
-        LocalBucketBuilder builder = Bucket.builder();
-        builder.addLimit(limit);
-        return builder.build();
-    }
-}
@@ -1,128 +0,0 @@
-package stirling.software.common.cluster.inprocess;
-
-import java.io.BufferedInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.UUID;
-
-import lombok.extern.slf4j.Slf4j;
-
-import stirling.software.common.cluster.FileStore;
-
-/** Local-disk {@link FileStore} storing files under a base directory keyed by a UUID file id. */
-@Slf4j
-public class LocalDiskFileStore implements FileStore {
-
-    private final String baseDirPath;
-
-    public LocalDiskFileStore(String baseDirPath) {
-        this.baseDirPath = baseDirPath;
-    }
-
-    @Override
-    public Stored store(InputStream in, String originalName) throws IOException {
-        String fileId = UUID.randomUUID().toString();
-        Path filePath = resolve(fileId);
-        Files.createDirectories(filePath.getParent());
-        boolean success = false;
-        try {
-            long size = Files.copy(in, filePath);
-            success = true;
-            return new Stored(fileId, size);
-        } finally {
-            if (!success) {
-                try {
-                    Files.deleteIfExists(filePath);
-                } catch (IOException cleanupEx) {
-                    log.warn(
-                            "Failed to clean up partial file {} after store failure",
-                            filePath,
-                            cleanupEx);
-                }
-            }
-        }
-    }
-
-    /**
-     * File-to-file copy. {@link Files#copy(Path, Path, java.nio.file.CopyOption...)} can use {@code
-     * sendfile(2)} on Linux for a zero-copy kernel transfer when source and destination share a
-     * filesystem, avoiding the streaming overhead of pulling the bytes through the JVM heap. Reads
-     * the source size before copying so the post-copy stat is unnecessary.
-     */
-    @Override
-    public Stored store(Path source, String originalName) throws IOException {
-        String fileId = UUID.randomUUID().toString();
-        Path filePath = resolve(fileId);
-        Files.createDirectories(filePath.getParent());
-        long size = Files.size(source);
-        boolean success = false;
-        try {
-            Files.copy(source, filePath);
-            success = true;
-            return new Stored(fileId, size);
-        } finally {
-            if (!success) {
-                try {
-                    Files.deleteIfExists(filePath);
-                } catch (IOException cleanupEx) {
-                    log.warn(
-                            "Failed to clean up partial file {} after store failure",
-                            filePath,
-                            cleanupEx);
-                }
-            }
-        }
-    }
-
-    @Override
-    public InputStream retrieve(String fileId) throws IOException {
-        return new BufferedInputStream(Files.newInputStream(resolve(fileId)));
-    }
-
-    @Override
-    public byte[] retrieveBytes(String fileId) throws IOException {
-        Path filePath = resolve(fileId);
-        if (!Files.exists(filePath)) {
-            throw new IOException("File not found with ID: " + fileId);
-        }
-        return Files.readAllBytes(filePath);
-    }
-
-    @Override
-    public long size(String fileId) throws IOException {
-        Path filePath = resolve(fileId);
-        if (!Files.exists(filePath)) {
-            throw new IOException("File not found with ID: " + fileId);
-        }
-        return Files.size(filePath);
-    }
-
-    @Override
-    public boolean delete(String fileId) {
-        try {
-            return Files.deleteIfExists(resolve(fileId));
-        } catch (IOException e) {
-            log.error("Error deleting file with ID: {}", fileId, e);
-            return false;
-        }
-    }
-
-    @Override
-    public boolean exists(String fileId) {
-        return Files.exists(resolve(fileId));
-    }
-
-    public Path resolve(String fileId) {
-        if (fileId.contains("..") || fileId.contains("/") || fileId.contains("\\")) {
-            throw new IllegalArgumentException("Invalid file ID");
-        }
-        Path basePath = Path.of(baseDirPath).normalize().toAbsolutePath();
-        Path resolvedPath = basePath.resolve(fileId).normalize();
-        if (!resolvedPath.startsWith(basePath)) {
-            throw new IllegalArgumentException("File ID resolves to an invalid path");
-        }
-        return resolvedPath;
-    }
-}
@@ -1,29 +0,0 @@
-package stirling.software.common.cluster.inprocess;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-import stirling.software.common.cluster.FileStore;
-
-/**
- * Always-on wiring for the per-node local-disk {@link FileStore}. Active when {@code
- * cluster.artifactStore=local} (the default; {@code matchIfMissing=true}). The S3 artifact-store
- * supplies its own bean when {@code cluster.artifactStore=s3}.
- */
-@Configuration
-@ConditionalOnProperty(
-        prefix = "cluster",
-        name = "artifactStore",
-        havingValue = "local",
-        matchIfMissing = true)
-public class LocalDiskFileStoreConfiguration {
-
-    @Bean
-    @ConditionalOnMissingBean
-    public FileStore fileStore(@Value("${stirling.tempDir:/tmp/stirling-files}") String tempDir) {
-        return new LocalDiskFileStore(tempDir);
-    }
-}
@@ -80,7 +80,6 @@ public class ConfigInitializer {
            YamlHelper settingsFile = new YamlHelper(settingTempPath);

            migrateEnterpriseEditionToPremium(settingsFile, settingsTemplateFile);
-            migrateProFeaturesKeyCasing(settingsFile, settingsTemplateFile);

            boolean changesMade =
                    settingsTemplateFile.updateValuesFromYaml(settingsFile, settingsTemplateFile);
@@ -117,52 +116,31 @@ public class ConfigInitializer {
        }
        if (yaml.getValueByExactKeyPath("enterpriseEdition", "SSOAutoLogin") != null) {
            template.updateValue(
-                    List.of("premium", "proFeatures", "ssoAutoLogin"),
+                    List.of("premium", "proFeatures", "SSOAutoLogin"),
                    yaml.getValueByExactKeyPath("enterpriseEdition", "SSOAutoLogin"));
        }
        if (yaml.getValueByExactKeyPath("enterpriseEdition", "CustomMetadata", "autoUpdateMetadata")
                != null) {
            template.updateValue(
-                    List.of("premium", "proFeatures", "customMetadata", "autoUpdateMetadata"),
+                    List.of("premium", "proFeatures", "CustomMetadata", "autoUpdateMetadata"),
                    yaml.getValueByExactKeyPath(
                            "enterpriseEdition", "CustomMetadata", "autoUpdateMetadata"));
        }
        if (yaml.getValueByExactKeyPath("enterpriseEdition", "CustomMetadata", "author") != null) {
            template.updateValue(
-                    List.of("premium", "proFeatures", "customMetadata", "author"),
+                    List.of("premium", "proFeatures", "CustomMetadata", "author"),
                    yaml.getValueByExactKeyPath("enterpriseEdition", "CustomMetadata", "author"));
        }
        if (yaml.getValueByExactKeyPath("enterpriseEdition", "CustomMetadata", "creator") != null) {
            template.updateValue(
-                    List.of("premium", "proFeatures", "customMetadata", "creator"),
+                    List.of("premium", "proFeatures", "CustomMetadata", "creator"),
                    yaml.getValueByExactKeyPath("enterpriseEdition", "CustomMetadata", "creator"));
        }
        if (yaml.getValueByExactKeyPath("enterpriseEdition", "CustomMetadata", "producer")
                != null) {
            template.updateValue(
-                    List.of("premium", "proFeatures", "customMetadata", "producer"),
+                    List.of("premium", "proFeatures", "CustomMetadata", "producer"),
                    yaml.getValueByExactKeyPath("enterpriseEdition", "CustomMetadata", "producer"));
        }
    }
-
-    // TODO: Remove post migration
-    // settings.yml.template renamed the two non-camelCase proFeatures keys
-    // ("SSOAutoLogin" -> "ssoAutoLogin", "CustomMetadata" -> "customMetadata") so the whole
-    // settings pipeline is consistent camelCase. The save path (YamlHelper.updateValue) matches
-    // keys case-sensitively, so without this carry-forward an existing install's values written
-    // under the old PascalCase keys would be dropped on upgrade and reset to template defaults.
-    void migrateProFeaturesKeyCasing(YamlHelper yaml, YamlHelper template) {
-        Object ssoAutoLogin = yaml.getValueByExactKeyPath("premium", "proFeatures", "SSOAutoLogin");
-        if (ssoAutoLogin != null) {
-            template.updateValue(List.of("premium", "proFeatures", "ssoAutoLogin"), ssoAutoLogin);
-        }
-        for (String field : List.of("autoUpdateMetadata", "author", "creator", "producer")) {
-            Object value =
-                    yaml.getValueByExactKeyPath("premium", "proFeatures", "CustomMetadata", field);
-            if (value != null) {
-                template.updateValue(
-                        List.of("premium", "proFeatures", "customMetadata", field), value);
-            }
-        }
-    }
 }
@@ -13,7 +13,6 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 import java.util.Locale;
-import java.util.UUID;

 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
@@ -78,7 +77,6 @@ public class ApplicationProperties {
    private PdfEditor pdfEditor = new PdfEditor();
    private AiEngine aiEngine = new AiEngine();
    private InternalApi internalApi = new InternalApi();
-    private Cluster cluster = new Cluster();

    @Bean
    public PropertySource<?> dynamicYamlPropertySource(ConfigurableEnvironment environment)
@@ -256,106 +254,6 @@ public class ApplicationProperties {
        private int longRunningTimeoutSeconds = 600;
    }

-    /**
-     * Cluster backplane configuration. All keys live under the top-level {@code cluster.*} prefix
-     * (e.g. env var {@code CLUSTER_ENABLED}). The master switch is {@link #enabled} and defaults to
-     * off; when off the in-process backplane is wired and no other cluster keys are required.
-     */
-    @Data
-    public static class Cluster {
-
-        /** Master switch. When {@code false} (default) the in-process backplane is wired. */
-        private boolean enabled = false;
-
-        /** Backplane implementation selector. Valid values: {@code inprocess} | {@code valkey}. */
-        private String backplane = "inprocess";
-
-        /**
-         * Transient cluster job-artifact store selector. Valid values: {@code local} | {@code s3}.
-         *
-         * <p>This is distinct from {@code storage.provider}, which selects the backend for
-         * persistent user-uploaded files. The two switches exist because the user-facing storage
-         * feature is optional ({@code storage.enabled=false} is common) but every multi-node
-         * cluster still needs a shared artifact store to serve cross-node downloads. Both
-         * implementations share credentials from {@code storage.s3.*} when set to {@code s3}.
-         */
-        private String artifactStore = "local";
-
-        private Valkey valkey = new Valkey();
-        private Node node = new Node();
-
-        private transient String cachedNodeId;
-
-        public NodeRole resolvedRole() {
-            if (node == null || node.getRole() == null) {
-                return NodeRole.BOTH;
-            }
-            String value = node.getRole().trim().toUpperCase(Locale.ROOT);
-            try {
-                return NodeRole.valueOf(value);
-            } catch (IllegalArgumentException ex) {
-                return NodeRole.BOTH;
-            }
-        }
-
-        public synchronized String resolvedNodeId() {
-            if (node != null && node.getId() != null && !node.getId().isBlank()) {
-                return node.getId();
-            }
-            if (cachedNodeId == null) {
-                cachedNodeId = UUID.randomUUID().toString();
-            }
-            return cachedNodeId;
-        }
-
-        public enum NodeRole {
-            WEB,
-            WORKER,
-            BOTH
-        }
-
-        @Data
-        public static class Valkey {
-            /**
-             * {@code redis://host:6379} or {@code rediss://...} for TLS. Required when cluster mode
-             * is on and backplane is valkey.
-             */
-            private String url = "";
-
-            private Tls tls = new Tls();
-
-            @Data
-            public static class Tls {
-                /**
-                 * When {@code true}, skip Valkey/Redis TLS certificate verification (dev/test
-                 * only). Leave {@code false} in production.
-                 */
-                private boolean skipCertVerification = false;
-            }
-        }
-
-        @Data
-        public static class Node {
-            /** Optional explicit node id. Blank = auto-generated UUID at startup. */
-            private String id = "";
-
-            /** {@code web} | {@code worker} | {@code both}. */
-            private String role = "both";
-
-            /**
-             * Internal cluster address advertised in the instance registry (host:port). Blank =
-             * derived at startup.
-             */
-            private String internalAddress = "";
-
-            /** {@code http} | {@code https} - scheme used when peers call this node. */
-            private String scheme = "http";
-
-            /** Heartbeat publish interval for the instance registry, in milliseconds. */
-            private long heartbeatIntervalMs = 5000;
-        }
-    }
-
    /**
     * HTTP timeouts for loopback calls to internal Stirling API endpoints, used by the AI workflow
     * executor and the pipeline processor. A bounded read timeout prevents a hung tool (e.g. an
@@ -528,16 +426,6 @@ public class ApplicationProperties {
            private String provider;
            private Client client = new Client();

-            /**
-             * When true, the OAuth2/OIDC login flow logs the full set of ID token and UserInfo
-             * claims at INFO level (and again at ERROR level if the username attribute cannot be
-             * resolved). Used to diagnose provider misconfiguration (for example ADFS not returning
-             * an {@code email} claim). WARNING: writes PII (sub, email, name) to application logs.
-             * Leave disabled in production; enable only while actively troubleshooting and disable
-             * again afterwards.
-             */
-            private Boolean debugLogging = false;
-
            public void setScopes(String scopes) {
                List<String> scopesList =
                        Arrays.stream(scopes.split(",")).map(String::trim).toList();
@@ -788,7 +676,6 @@ public class ApplicationProperties {
        private boolean enabled = false;
        private String provider = "local";
        private Local local = new Local();
-        private S3 s3 = new S3();
        private Quotas quotas = new Quotas();
        private Sharing sharing = new Sharing();
        private Signing signing = new Signing();
@@ -798,57 +685,6 @@ public class ApplicationProperties {
            private String basePath = InstallationPathConfig.getPath() + "storage";
        }

-        @Data
-        public static class S3 {
-            /**
-             * Optional custom endpoint (e.g. {@code https://<account>.r2.cloudflarestorage.com},
-             * {@code https://<project>.supabase.co/storage/v1/s3}, or {@code http://localhost:9000}
-             * for MinIO). Blank = use AWS regional default.
-             */
-            private String endpoint = "";
-
-            private String bucket = "";
-
-            private String region = "us-east-1";
-
-            private String accessKey = "";
-            private String secretKey = "";
-
-            /**
-             * When {@code true} use path-style URLs ({@code <endpoint>/<bucket>/<key>}) instead of
-             * virtual-hosted ({@code <bucket>.<endpoint>/<key>}). MinIO and most S3-compatible
-             * gateways require path-style; AWS S3 prefers virtual-hosted.
-             */
-            private boolean pathStyleAccess = false;
-
-            /**
-             * When {@code false} (default), {@code endpoint} hostnames that resolve to private,
-             * loopback, or link-local addresses are rejected at startup to block SSRF attacks via
-             * the cloud metadata service (e.g. {@code http://169.254.169.254/}). Set to {@code
-             * true} to opt in for MinIO / in-cluster S3 endpoints on private networks.
-             */
-            private boolean allowPrivateEndpoints = false;
-
-            /**
-             * Controls when the SDK adds an {@code x-amz-checksum-*} header on PUT/UploadPart.
-             * Default {@code WHEN_SUPPORTED} (the SDK default since 2.30) makes the SDK send a
-             * CRC32 checksum on every upload - this works on AWS S3, MinIO, current Supabase,
-             * Backblaze B2 (post-July-2025), and modern R2. Set to {@code WHEN_REQUIRED} to
-             * suppress the auto-checksum on vendors that reject unknown {@code x-amz-checksum-*}
-             * headers (older Backblaze B2, some R2 corner cases, GCS S3 endpoint). Invalid values
-             * fall back to {@code WHEN_SUPPORTED}.
-             */
-            private String requestChecksumCalculation = "WHEN_SUPPORTED";
-
-            /**
-             * Controls when the SDK validates returned {@code x-amz-checksum-*} headers on GET
-             * responses. Default {@code WHEN_SUPPORTED}. Set to {@code WHEN_REQUIRED} if your
-             * vendor never returns these headers and you see false-positive checksum-mismatch
-             * errors. Invalid values fall back to {@code WHEN_SUPPORTED}.
-             */
-            private String responseChecksumValidation = "WHEN_SUPPORTED";
-        }
-
        @Data
        public static class Sharing {
            private boolean enabled = false;
@@ -1350,10 +1186,6 @@ public class ApplicationProperties {
            public int getFfmpegSessionLimit() {
                return ffmpegSessionLimit > 0 ? ffmpegSessionLimit : 2;
            }
-
-            public int getPyMuPdfConvertSessionLimit() {
-                return 2;
-            }
        }

        @Data
@@ -1431,10 +1263,6 @@ public class ApplicationProperties {
            public long getFfmpegTimeoutMinutes() {
                return ffmpegTimeoutMinutes > 0 ? ffmpegTimeoutMinutes : 30;
            }
-
-            public long getPyMuPdfConvertTimeoutMinutes() {
-                return 10;
-            }
        }
    }
 }
@@ -1,13 +1,15 @@
 package stirling.software.common.service;

-import java.io.ByteArrayInputStream;
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.PipedInputStream;
-import java.io.PipedOutputStream;
-import java.util.concurrent.Executors;
-import java.util.concurrent.atomic.AtomicReference;
+import java.io.OutputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.UUID;

+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.Resource;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
@@ -16,11 +18,9 @@ import org.springframework.web.servlet.mvc.method.annotation.StreamingResponseBo
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

-import stirling.software.common.cluster.FileStore;
-
 /**
 * Service for storing and retrieving files with unique file IDs. Used by the AutoJobPostMapping
- * system to handle file references. Disk I/O is delegated to the injected {@link FileStore} bean.
+ * system to handle file references.
 */
@Service
@RequiredArgsConstructor
@@ -30,150 +30,251 @@ public class FileStorage {
    /** Holds the result of a stream-to-disk store operation: the file ID and the bytes written. */
    public record StoredFile(String fileId, long size) {}

+    @Value("${stirling.tempDir:/tmp/stirling-files}")
+    private String tempDirPath;
+
    private final FileOrUploadService fileOrUploadService;
-    private final FileStore fileStore;

+    /**
+     * Store a file and return its unique ID
+     *
+     * @param file The file to store
+     * @return The unique ID assigned to the file
+     * @throws IOException If there is an error storing the file
+     */
    public String storeFile(MultipartFile file) throws IOException {
-        // Fast path: when Spring buffered the multipart to disk (typical for large uploads), the
-        // backing Resource exposes a real File. Hand the Path to the FileStore so it can do a
-        // file-to-file copy (Linux sendfile, no copy through Java heap) rather than streaming
-        // the bytes through an 8K buffer. Falls back to the InputStream path for in-memory
-        // multiparts, exotic Resource impls, and anything that does not back onto a File.
-        Resource res;
-        try {
-            res = file.getResource();
-        } catch (RuntimeException ignored) {
-            res = null;
-        }
-        if (res != null && res.isFile()) {
-            try {
-                FileStore.Stored stored =
-                        fileStore.store(res.getFile().toPath(), file.getOriginalFilename());
-                log.debug("Stored file with ID: {} (fast path)", stored.fileId());
-                return stored.fileId();
-            } catch (IOException ex) {
-                // Some Resource impls advertise isFile()=true but throw on getFile(); fall through.
-                log.debug("Resource fast path failed, falling back to stream copy", ex);
-            }
-        }
-        try (InputStream in = file.getInputStream()) {
-            FileStore.Stored stored = fileStore.store(in, file.getOriginalFilename());
-            log.debug("Stored file with ID: {}", stored.fileId());
-            return stored.fileId();
-        }
+        String fileId = generateFileId();
+        Path filePath = getFilePath(fileId);
+
+        // Ensure the directory exists
+        Files.createDirectories(filePath.getParent());
+
+        // Transfer the file to the storage location
+        file.transferTo(filePath.toFile());
+
+        log.debug("Stored file with ID: {}", fileId);
+        return fileId;
    }

+    /**
+     * Store a byte array as a file and return its unique ID
+     *
+     * @param bytes The byte array to store
+     * @param originalName The original name of the file (for extension)
+     * @return The unique ID assigned to the file
+     * @throws IOException If there is an error storing the file
+     */
    public String storeBytes(byte[] bytes, String originalName) throws IOException {
-        FileStore.Stored stored = fileStore.store(new ByteArrayInputStream(bytes), originalName);
-        log.debug("Stored byte array with ID: {}", stored.fileId());
-        return stored.fileId();
+        String fileId = generateFileId();
+        Path filePath = getFilePath(fileId);
+
+        // Ensure the directory exists
+        Files.createDirectories(filePath.getParent());
+
+        // Write the bytes to the file
+        Files.write(filePath, bytes);
+
+        log.debug("Stored byte array with ID: {}", fileId);
+        return fileId;
    }

+    /**
+     * Retrieve a file by its ID as a MultipartFile
+     *
+     * @param fileId The ID of the file to retrieve
+     * @return The file as a MultipartFile
+     * @throws IOException If the file doesn't exist or can't be read
+     */
    public MultipartFile retrieveFile(String fileId) throws IOException {
-        byte[] fileData = fileStore.retrieveBytes(fileId);
+        Path filePath = getFilePath(fileId);
+
+        if (!Files.exists(filePath)) {
+            throw new IOException("File not found with ID: " + fileId);
+        }
+
+        byte[] fileData = Files.readAllBytes(filePath);
        return fileOrUploadService.toMockMultipartFile(fileId, fileData);
    }

+    /**
+     * Retrieve a file by its ID as a byte array
+     *
+     * @param fileId The ID of the file to retrieve
+     * @return The file as a byte array
+     * @throws IOException If the file doesn't exist or can't be read
+     */
    public byte[] retrieveBytes(String fileId) throws IOException {
-        return fileStore.retrieveBytes(fileId);
+        Path filePath = getFilePath(fileId);
+
+        if (!Files.exists(filePath)) {
+            throw new IOException("File not found with ID: " + fileId);
+        }
+
+        return Files.readAllBytes(filePath);
    }

+    /**
+     * Retrieve a file by its ID as a streaming InputStream. The caller is responsible for closing
+     * the returned stream.
+     *
+     * @param fileId The ID of the file to retrieve
+     * @return A buffered InputStream for the file
+     * @throws IOException If the file doesn't exist or can't be read
+     */
    public InputStream retrieveInputStream(String fileId) throws IOException {
-        return fileStore.retrieve(fileId);
+        Path filePath = getFilePath(fileId);
+        // Let Files.newInputStream throw NoSuchFileException naturally — avoids TOCTOU race
+        // between exists-check and open when another thread may delete concurrently.
+        return new BufferedInputStream(Files.newInputStream(filePath));
    }

+    /**
+     * Store data from an InputStream as a file and return its unique ID and byte count. Streams
+     * directly to disk without buffering the entire content in heap.
+     *
+     * @param inputStream The input stream to read from
+     * @param originalName The original name of the file (unused, kept for API symmetry)
+     * @return A {@link StoredFile} containing the file ID and the number of bytes written
+     * @throws IOException If there is an error storing the file
+     */
    public StoredFile storeInputStream(InputStream inputStream, String originalName)
            throws IOException {
-        FileStore.Stored stored = fileStore.store(inputStream, originalName);
-        log.debug("Stored input stream with ID: {}", stored.fileId());
-        return new StoredFile(stored.fileId(), stored.size());
+        String fileId = generateFileId();
+        Path filePath = getFilePath(fileId);
+        Files.createDirectories(filePath.getParent());
+        long size = Files.copy(inputStream, filePath);
+        log.debug("Stored input stream with ID: {}", fileId);
+        return new StoredFile(fileId, size);
    }

    public String storeFromStreamingBody(StreamingResponseBody body, String originalName)
            throws IOException {
-        // Hold Throwable not IOException: an unchecked failure (NPE, IllegalState, OOM, etc.)
-        // from the body writer would otherwise close the pipe with EOF and the consumer would
-        // return a truncated file with no error surfaced to the caller.
-        AtomicReference<Throwable> bodyError = new AtomicReference<>();
-        try (PipedOutputStream out = new PipedOutputStream();
-                PipedInputStream in = new PipedInputStream(out, 8192)) {
-            var executor = Executors.newSingleThreadExecutor(Thread.ofVirtual().factory());
-            java.util.concurrent.Future<?> task = null;
-            try {
-                task =
-                        executor.submit(
-                                () -> {
-                                    try {
-                                        body.writeTo(out);
-                                    } catch (Throwable ex) {
-                                        bodyError.set(ex);
-                                    } finally {
-                                        try {
-                                            out.close();
-                                        } catch (IOException ignored) {
-                                            // closed on the consumer side too
-                                        }
-                                    }
-                                });
-                FileStore.Stored stored = fileStore.store(in, originalName);
-                Throwable writerErr = bodyError.get();
-                if (writerErr != null) {
-                    // Body failed mid-write: the FileStore persisted a truncated entry.
-                    // Best-effort delete so we don't leak partial files; never let cleanup
-                    // mask the original writer error.
-                    try {
-                        fileStore.delete(stored.fileId());
-                    } catch (RuntimeException cleanupEx) {
-                        log.warn(
-                                "Failed to delete partial file {} after writer error: {}",
-                                stored.fileId(),
-                                cleanupEx.getMessage());
-                    }
-                    if (writerErr instanceof IOException ioe) {
-                        throw ioe;
-                    }
-                    throw new IOException(
-                            "StreamingResponseBody writer failed: " + writerErr.getMessage(),
-                            writerErr);
-                }
-                log.debug("Stored StreamingResponseBody with ID: {}", stored.fileId());
-                return stored.fileId();
-            } finally {
-                // Interrupt and join the writer task: shutdown() alone returns immediately and a
-                // failed store leaves the writer running, leaking a thread per failed upload.
-                if (task != null && !task.isDone()) {
-                    task.cancel(true);
-                }
-                executor.shutdown();
+        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) {
                try {
-                    if (!executor.awaitTermination(5, java.util.concurrent.TimeUnit.SECONDS)) {
-                        executor.shutdownNow();
-                    }
-                } catch (InterruptedException ie) {
-                    executor.shutdownNow();
-                    Thread.currentThread().interrupt();
+                    Files.deleteIfExists(filePath);
+                } catch (IOException cleanupEx) {
+                    log.warn(
+                            "Failed to clean up partial file {} after store failure",
+                            filePath,
+                            cleanupEx);
                }
            }
        }
+        log.debug("Stored StreamingResponseBody with ID: {}", fileId);
+        return fileId;
    }

+    /**
+     * Persist a {@link Resource} body to disk, returning the generated file ID. Used by the async
+     * job pipeline to capture {@code ResponseEntity<Resource>} results produced by controllers.
+     */
    public String storeFromResource(Resource resource, String originalName) throws IOException {
+        String fileId = generateFileId();
+        Path filePath = getFilePath(fileId);
+        Files.createDirectories(filePath.getParent());
+        boolean success = false;
        try (InputStream in = resource.getInputStream()) {
-            FileStore.Stored stored = fileStore.store(in, originalName);
-            log.debug("Stored Resource with ID: {}", stored.fileId());
-            return stored.fileId();
+            Files.copy(in, filePath);
+            success = true;
+        } finally {
+            if (!success) {
+                try {
+                    Files.deleteIfExists(filePath);
+                } catch (IOException cleanupEx) {
+                    log.warn(
+                            "Failed to clean up partial file {} after store failure",
+                            filePath,
+                            cleanupEx);
+                }
+            }
+        }
+        log.debug("Stored Resource with ID: {}", fileId);
+        return fileId;
+    }
+
+    /**
+     * Delete a file by its ID
+     *
+     * @param fileId The ID of the file to delete
+     * @return true if the file was deleted, false otherwise
+     */
+    public boolean deleteFile(String fileId) {
+        try {
+            Path filePath = getFilePath(fileId);
+            return Files.deleteIfExists(filePath);
+        } catch (IOException e) {
+            log.error("Error deleting file with ID: {}", fileId, e);
+            return false;
        }
    }

-    public boolean deleteFile(String fileId) {
-        return fileStore.delete(fileId);
-    }
-
+    /**
+     * Check if a file exists by its ID
+     *
+     * @param fileId The ID of the file to check
+     * @return true if the file exists, false otherwise
+     */
    public boolean fileExists(String fileId) {
-        return fileStore.exists(fileId);
+        Path filePath = getFilePath(fileId);
+        return Files.exists(filePath);
    }

+    /**
+     * Get the size of a file by its ID without loading the content into memory
+     *
+     * @param fileId The ID of the file
+     * @return The size of the file in bytes
+     * @throws IOException If the file doesn't exist or can't be read
+     */
    public long getFileSize(String fileId) throws IOException {
-        return fileStore.size(fileId);
+        Path filePath = getFilePath(fileId);
+
+        if (!Files.exists(filePath)) {
+            throw new IOException("File not found with ID: " + fileId);
+        }
+
+        return Files.size(filePath);
+    }
+
+    /**
+     * Get the path for a file ID
+     *
+     * @param fileId The ID of the file
+     * @return The path to the file
+     * @throws IllegalArgumentException if fileId contains path traversal characters or resolves
+     *     outside base directory
+     */
+    private Path getFilePath(String fileId) {
+        // Validate fileId to prevent path traversal
+        if (fileId.contains("..") || fileId.contains("/") || fileId.contains("\\")) {
+            throw new IllegalArgumentException("Invalid file ID");
+        }
+
+        Path basePath = Path.of(tempDirPath).normalize().toAbsolutePath();
+        Path resolvedPath = basePath.resolve(fileId).normalize();
+
+        // Ensure resolved path is within the base directory
+        if (!resolvedPath.startsWith(basePath)) {
+            throw new IllegalArgumentException("File ID resolves to an invalid path");
+        }
+
+        return resolvedPath;
+    }
+
+    /**
+     * Generate a unique file ID
+     *
+     * @return A unique file ID
+     */
+    private String generateFileId() {
+        return UUID.randomUUID().toString();
    }
 }
@@ -1,91 +0,0 @@
-package stirling.software.common.service;
-
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.List;
-import java.util.Locale;
-import java.util.concurrent.TimeUnit;
-
-import org.springframework.stereotype.Service;
-
-import jakarta.annotation.PostConstruct;
-
-import lombok.extern.slf4j.Slf4j;
-
-import stirling.software.common.util.ProcessExecutor;
-
-/**
- * Converts PDFs to Markdown by invoking the {@code pymupdf-convert} CLI tool as a separate
- * subprocess.
- */
-@Slf4j
-@Service
-public class PyMuPdfConverter {
-
-    private boolean available;
-
-    @PostConstruct
-    void init() {
-        available = probe();
-        if (available) {
-            log.info("pymupdf-convert found — PyMuPDF Markdown conversion enabled.");
-        } else {
-            log.info("pymupdf-convert not found — PyMuPDF Markdown conversion disabled.");
-        }
-    }
-
-    public boolean isAvailable() {
-        return available;
-    }
-
-    private boolean probe() {
-        boolean isWindows =
-                System.getProperty("os.name").toLowerCase(Locale.ROOT).contains("windows");
-        List<String> cmd =
-                isWindows
-                        ? List.of("where", "pymupdf-convert")
-                        : List.of("which", "pymupdf-convert");
-        try {
-            Process p = new ProcessBuilder(cmd).redirectErrorStream(true).start();
-            boolean done = p.waitFor(5, TimeUnit.SECONDS);
-            return done && p.exitValue() == 0;
-        } catch (Exception e) {
-            log.debug("pymupdf-convert availability check failed: {}", e.getMessage());
-            return false;
-        }
-    }
-
-    /**
-     * Convert a PDF to Markdown by invoking {@code pymupdf-convert} as a subprocess.
-     *
-     * @throws IOException on process failure or if the tool is not installed
-     */
-    public String convertToMarkdown(byte[] pdfBytes, String filename) throws IOException {
-        String safeName =
-                (filename == null || filename.isBlank())
-                        ? "document.pdf"
-                        : filename.replace("\"", "");
-        Path tempDir = Files.createTempDirectory("stirling-pymupdf-");
-        Path inputPdf = tempDir.resolve(safeName);
-        Path outputMd = tempDir.resolve("output.md");
-        try {
-            Files.write(inputPdf, pdfBytes);
-            ProcessExecutor.getInstance(ProcessExecutor.Processes.PYMUPDF_CONVERT)
-                    .runCommandWithOutputHandling(
-                            List.of(
-                                    "pymupdf-convert",
-                                    inputPdf.toAbsolutePath().toString(),
-                                    outputMd.toAbsolutePath().toString()));
-            return Files.readString(outputMd, StandardCharsets.UTF_8);
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-            throw new IOException("PyMuPDF conversion interrupted", e);
-        } finally {
-            Files.deleteIfExists(inputPdf);
-            Files.deleteIfExists(outputMd);
-            Files.deleteIfExists(tempDir);
-        }
-    }
-}
@@ -3,13 +3,9 @@ package stirling.software.common.service;
 import java.io.BufferedInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.time.Duration;
-import java.time.Instant;
 import java.time.LocalDateTime;
-import java.time.ZoneId;
 import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -20,7 +16,6 @@ import java.util.concurrent.TimeUnit;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;

-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Service;
@@ -31,10 +26,6 @@ import jakarta.annotation.PreDestroy;

 import lombok.extern.slf4j.Slf4j;

-import stirling.software.common.cluster.ClusterBackplane;
-import stirling.software.common.cluster.JobStore;
-import stirling.software.common.cluster.JobStoreEntry;
-import stirling.software.common.cluster.JobStoreEntry.JobState;
 import stirling.software.common.model.job.JobResult;
 import stirling.software.common.model.job.JobStats;
 import stirling.software.common.model.job.ResultFile;
@@ -49,20 +40,20 @@ public class TaskManager {
    private int jobResultExpiryMinutes = 30;

    private final FileStorage fileStorage;
-    private final JobStore jobStore;
-    private final ClusterBackplane clusterBackplane;
    private final ScheduledExecutorService cleanupExecutor =
            Executors.newSingleThreadScheduledExecutor(
                    Thread.ofVirtual().name("task-cleanup-", 0).factory());

-    @Autowired
-    public TaskManager(
-            FileStorage fileStorage, JobStore jobStore, ClusterBackplane clusterBackplane) {
+    /** Initialize the task manager and start the cleanup scheduler */
+    public TaskManager(FileStorage fileStorage) {
        this.fileStorage = fileStorage;
-        this.jobStore = jobStore;
-        this.clusterBackplane = clusterBackplane;

-        cleanupExecutor.scheduleAtFixedRate(this::cleanupOldJobs, 10, 10, TimeUnit.MINUTES);
+        // Schedule periodic cleanup of old job results
+        cleanupExecutor.scheduleAtFixedRate(
+                this::cleanupOldJobs,
+                10, // Initial delay
+                10, // Interval
+                TimeUnit.MINUTES);

        log.debug(
                "Task manager initialized with job result expiry of {} minutes",
@@ -75,9 +66,7 @@ public class TaskManager {
     * @param jobId The job ID
     */
    public void createTask(String jobId) {
-        JobResult result = JobResult.createNew(jobId);
-        jobResults.put(jobId, result);
-        writeThrough(jobId, result);
+        jobResults.put(jobId, JobResult.createNew(jobId));
        log.debug("Created task with job ID: {}", jobId);
    }

@@ -90,7 +79,6 @@ public class TaskManager {
    public void setResult(String jobId, Object result) {
        JobResult jobResult = getOrCreateJobResult(jobId);
        jobResult.completeWithResult(result);
-        writeThrough(jobId, jobResult);
        log.debug("Set result for job ID: {}", jobId);
    }

@@ -113,7 +101,6 @@ public class TaskManager {
                        extractZipToIndividualFiles(fileId, originalFileName);
                if (!extractedFiles.isEmpty()) {
                    jobResult.completeWithFiles(extractedFiles);
-                    writeThrough(jobId, jobResult);
                    log.debug(
                            "Set multiple file results for job ID: {} with {} files extracted from"
                                    + " ZIP",
@@ -140,7 +127,6 @@ public class TaskManager {
                    "Failed to get file size for job {}: {}. Using size 0.", jobId, e.getMessage());
            jobResult.completeWithSingleFile(fileId, originalFileName, contentType, 0);
        }
-        writeThrough(jobId, jobResult);
    }

    /**
@@ -152,7 +138,6 @@ public class TaskManager {
    public void setMultipleFileResults(String jobId, List<ResultFile> resultFiles) {
        JobResult jobResult = getOrCreateJobResult(jobId);
        jobResult.completeWithFiles(resultFiles);
-        writeThrough(jobId, jobResult);
        log.debug(
                "Set multiple file results for job ID: {} with {} files",
                jobId,
@@ -168,7 +153,6 @@ public class TaskManager {
    public void setError(String jobId, String error) {
        JobResult jobResult = getOrCreateJobResult(jobId);
        jobResult.failWithError(error);
-        writeThrough(jobId, jobResult);
        log.debug("Set error for job ID: {}: {}", jobId, error);
    }

@@ -185,7 +169,6 @@ public class TaskManager {
            // If no result or error has been set, mark it as complete with an empty result
            jobResult.completeWithResult("Task completed successfully");
        }
-        writeThrough(jobId, jobResult);
        log.debug("Marked job ID: {} as complete", jobId);
    }

@@ -222,7 +205,6 @@ public class TaskManager {
        JobResult jobResult = jobResults.get(jobId);
        if (jobResult != null) {
            jobResult.addNote(note);
-            writeThrough(jobId, jobResult);
            log.debug("Added note to job ID: {}: {}", jobId, note);
            return true;
        }
@@ -313,11 +295,8 @@ public class TaskManager {
        return jobResults.computeIfAbsent(jobId, JobResult::createNew);
    }

-    /** Clean up old completed job results. No-op in cluster mode; the backplane TTL owns expiry. */
+    /** Clean up old completed job results */
    public void cleanupOldJobs() {
-        if (clusterBackplane != null && !clusterBackplane.shouldRunLocalCleanup()) {
-            return;
-        }
        LocalDateTime expiryThreshold =
                LocalDateTime.now().minus(jobResultExpiryMinutes, ChronoUnit.MINUTES);
        int removedCount = 0;
@@ -336,9 +315,6 @@ public class TaskManager {

                    // Remove the job result
                    jobResults.remove(entry.getKey());
-                    if (jobStore != null) {
-                        jobStore.delete(entry.getKey());
-                    }
                    removedCount++;
                }
            }
@@ -351,53 +327,6 @@ public class TaskManager {
        }
    }

-    /** Mirror the in-memory {@code JobResult} into the cluster-visible {@link JobStore}. */
-    private void writeThrough(String jobId, JobResult result) {
-        if (jobStore == null) {
-            return;
-        }
-        try {
-            jobStore.put(toEntry(jobId, result), Duration.ofMinutes(jobResultExpiryMinutes));
-        } catch (RuntimeException ex) {
-            log.warn("JobStore write-through failed for job {}: {}", jobId, ex.getMessage());
-        }
-    }
-
-    private JobStoreEntry toEntry(String jobId, JobResult result) {
-        JobState state;
-        if (result.isComplete()) {
-            state = result.getError() != null ? JobState.FAILED : JobState.COMPLETE;
-        } else {
-            state = JobState.PENDING;
-        }
-        Instant createdAt = toInstant(result.getCreatedAt());
-        Instant completedAt = toInstant(result.getCompletedAt());
-        List<String> fileIds = new ArrayList<>();
-        if (result.hasFiles()) {
-            for (ResultFile rf : result.getAllResultFiles()) {
-                fileIds.add(rf.getFileId());
-            }
-        }
-        Map<String, String> meta = new HashMap<>();
-        if (result.getNotes() != null && !result.getNotes().isEmpty()) {
-            meta.put("notesCount", Integer.toString(result.getNotes().size()));
-        }
-        String owningNodeId = clusterBackplane == null ? "local" : clusterBackplane.localNodeId();
-        return new JobStoreEntry(
-                jobId,
-                state,
-                owningNodeId,
-                createdAt,
-                completedAt,
-                result.getError(),
-                fileIds,
-                meta);
-    }
-
-    private Instant toInstant(LocalDateTime ldt) {
-        return ldt == null ? null : ldt.atZone(ZoneId.systemDefault()).toInstant();
-    }
-
    /** Shutdown the cleanup executor */
    @PreDestroy
    public void shutdown() {
@@ -441,7 +370,7 @@ public class TaskManager {
            while ((entry = zipIn.getNextEntry()) != null) {
                if (!entry.isDirectory()) {
                    String contentType = determineContentType(entry.getName());
-                    // storeInputStream returns the fileId and byte count - no extra stat needed
+                    // storeInputStream returns the fileId and byte count — no extra stat needed
                    FileStorage.StoredFile stored =
                            fileStorage.storeInputStream(zipIn, entry.getName());

@@ -529,8 +458,7 @@ public class TaskManager {
    }

    /**
-     * Find the job key that owns a given file ID. Checks the local in-memory map first, then falls
-     * back to the cluster-visible {@link JobStore}.
+     * Find the job key that owns a given file ID.
     *
     * @param fileId file identifier to look up
     * @return scoped job key if found, otherwise null
@@ -546,18 +474,6 @@ public class TaskManager {
                }
            }
        }
-        if (jobStore != null) {
-            // Propagate JobStore failures: returning null on a backplane outage would conflate
-            // "no such file" with "lookup unavailable" and the caller would respond 404 to a
-            // transient blip that should be retried. Let Spring's exception handler surface a
-            // 5xx so clients know to retry.
-            try {
-                return jobStore.findJobIdByFileId(fileId).orElse(null);
-            } catch (RuntimeException e) {
-                log.warn("JobStore findJobIdByFileId failed for {}: {}", fileId, e.getMessage());
-                throw e;
-            }
-        }
        return null;
    }
 }
@@ -4,7 +4,6 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -31,7 +30,6 @@ import io.github.pixee.security.Filenames;
 import lombok.extern.slf4j.Slf4j;

 import stirling.software.common.configuration.RuntimePathConfig;
-import stirling.software.common.service.PyMuPdfConverter;
 import stirling.software.common.util.ProcessExecutor.ProcessExecutorResult;

@Slf4j
@@ -161,57 +159,6 @@ public class PDFToFile {
                finalOut, fileName, MediaType.APPLICATION_OCTET_STREAM);
    }

-    /**
-     * PDF-&gt;Markdown with optional PyMuPDF acceleration.
-     *
-     * <p>When {@code pymupdf-convert} is installed and on PATH, conversion is delegated to it as a
-     * subprocess. On any failure — or when the tool is absent — this transparently falls back to
-     * the bundled {@code pdftohtml}-based converter.
-     */
-    public ResponseEntity<Resource> processPdfToMarkdown(
-            MultipartFile inputFile, PyMuPdfConverter pyMuPdfConverter)
-            throws IOException, InterruptedException {
-        if (!MediaType.APPLICATION_PDF_VALUE.equals(inputFile.getContentType())) {
-            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
-        }
-
-        if (pyMuPdfConverter != null && pyMuPdfConverter.isAvailable()) {
-            try {
-                String originalName = Filenames.toSimpleFileName(inputFile.getOriginalFilename());
-                String baseName = originalName;
-                if (originalName != null && originalName.contains(".")) {
-                    baseName = originalName.substring(0, originalName.lastIndexOf('.'));
-                }
-                String markdown =
-                        pyMuPdfConverter.convertToMarkdown(inputFile.getBytes(), originalName);
-                return buildMarkdownZipResponse(markdown, baseName);
-            } catch (IOException e) {
-                log.warn(
-                        "PyMuPDF conversion failed; falling back to pdftohtml converter: {}",
-                        e.getMessage());
-            }
-        }
-        return processPdfToMarkdown(inputFile);
-    }
-
-    private ResponseEntity<Resource> buildMarkdownZipResponse(String markdown, String pdfBaseName)
-            throws IOException {
-        String fileName = pdfBaseName + "ToMarkdown.zip";
-        TempFile finalOut = tempFileManager.createManagedTempFile(".zip");
-        try (OutputStream fos = Files.newOutputStream(finalOut.getPath());
-                ZipOutputStream zipOutputStream = new ZipOutputStream(fos)) {
-            ZipEntry mdEntry = new ZipEntry(pdfBaseName + ".md");
-            zipOutputStream.putNextEntry(mdEntry);
-            zipOutputStream.write(markdown.getBytes(StandardCharsets.UTF_8));
-            zipOutputStream.closeEntry();
-        } catch (Exception e) {
-            finalOut.close();
-            throw e;
-        }
-        return WebResponseUtils.fileToWebResponse(
-                finalOut, fileName, MediaType.APPLICATION_OCTET_STREAM);
-    }
-
    /**
     * Updates image references in markdown to point to the images/ folder. Matches patterns like
     * ![alt](filename.png) and converts to ![alt](images/filename.png)
@@ -115,11 +115,6 @@ public class ProcessExecutor {
                                                .getProcessExecutor()
                                                .getSessionLimit()
                                                .getFfmpegSessionLimit();
-                                case PYMUPDF_CONVERT ->
-                                        applicationProperties
-                                                .getProcessExecutor()
-                                                .getSessionLimit()
-                                                .getPyMuPdfConvertSessionLimit();
                            };

                    long timeoutMinutes =
@@ -185,11 +180,6 @@ public class ProcessExecutor {
                                                .getProcessExecutor()
                                                .getTimeoutMinutes()
                                                .getFfmpegTimeoutMinutes();
-                                case PYMUPDF_CONVERT ->
-                                        applicationProperties
-                                                .getProcessExecutor()
-                                                .getTimeoutMinutes()
-                                                .getPyMuPdfConvertTimeoutMinutes();
                            };
                    return new ProcessExecutor(
                            processType, semaphoreLimit, liveUpdates, timeoutMinutes);
@@ -560,8 +550,7 @@ public class ProcessExecutor {
        GHOSTSCRIPT,
        OCR_MY_PDF,
        CFF_CONVERTER,
-        FFMPEG,
-        PYMUPDF_CONVERT
+        FFMPEG
    }

    @Setter
@@ -83,16 +83,7 @@ public class RequestUriUtils {
            return false;
        }

-        // Blocklist of backend/non-frontend paths that should still go through filters.
-        //
-        // `/files` was historically a backend route; it is now a frontend route
-        // owned by HomePage / FileManagerView. Direct-nav or refresh on /files
-        // (or /files/<folder-uuid>) was returning the Spring auth filter's 401
-        // JSON instead of serving index.html, so the SPA never got a chance to
-        // mount and the user saw a raw error response. There are no `/files`
-        // backend mappings at the servlet root - the real storage endpoints
-        // live under `/api/v1/storage/files`, which is filtered out a few lines
-        // up by the `startsWith("/api/")` guard.
+        // Blocklist of backend/non-frontend paths that should still go through filters
        String[] backendOnlyPrefixes = {
            "/register",
            "/pipeline",
@@ -100,6 +91,7 @@ public class RequestUriUtils {
            "/pdfjs-legacy",
            "/fonts",
            "/images",
+            "/files",
            "/css",
            "/js",
            "/swagger",
@@ -180,7 +172,7 @@ public class RequestUriUtils {
                        "/api/v1/ui-data/footer-info") // Public footer configuration
                || trimmedUri.startsWith("/api/v1/invite/validate")
                || trimmedUri.startsWith("/api/v1/invite/accept")
-                // Health Endpoints
+                // Health Endoints
                || trimmedUri.startsWith("/actuator/health")
                || trimmedUri.startsWith("/health")
                || trimmedUri.startsWith("/healthz")
@@ -189,7 +181,7 @@ public class RequestUriUtils {
                || 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
+                // Workflow participant endpoints — access controlled by share tokens, not login
                || trimmedUri.startsWith("/api/v1/workflow/participant/")
                // Share-link SPA bootstrap; data APIs remain protected
                || trimmedUri.matches("^/share/[^/]+/?$");
@@ -56,17 +56,4 @@ class ArchitectureTest {
                        .resideInAPackage("stirling.software.saas..");
        rule.check(commonClasses);
    }
-
-    @Test
-    void clusterInterfacesHaveNoImplementationDependencies() {
-        ArchRule rule =
-                noClasses()
-                        .that()
-                        .resideInAPackage("stirling.software.common.cluster..")
-                        .should()
-                        .dependOnClassesThat()
-                        .resideInAnyPackage(
-                                "stirling.software.proprietary..", "stirling.software.saas..");
-        rule.check(commonClasses);
-    }
 }
@@ -1,51 +0,0 @@
-package stirling.software.common.cluster;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import java.time.Instant;
-import java.util.List;
-import java.util.Map;
-
-import org.junit.jupiter.api.Test;
-
-class BackplaneContractCompilationTest {
-
-    @Test
-    void jobStoreEntryRecordRoundTrips() {
-        Instant now = Instant.now();
-        JobStoreEntry entry =
-                new JobStoreEntry(
-                        "job-1",
-                        JobStoreEntry.JobState.PENDING,
-                        "node-a",
-                        now,
-                        null,
-                        null,
-                        List.of("file-1"),
-                        Map.of("k", "v"));
-        assertEquals("job-1", entry.jobId());
-        assertEquals(JobStoreEntry.JobState.PENDING, entry.state());
-        assertEquals("node-a", entry.owningNodeId());
-        assertEquals(now, entry.createdAt());
-        assertEquals(List.of("file-1"), entry.fileIds());
-        assertEquals("v", entry.resultMeta().get("k"));
-    }
-
-    @Test
-    void clusterNodeRecordRoundTrips() {
-        Instant heartbeat = Instant.now();
-        ClusterNode node = new ClusterNode("node-a", "10.0.0.1:8080", heartbeat, "BOTH");
-        assertEquals("node-a", node.nodeId());
-        assertEquals("10.0.0.1:8080", node.internalAddress());
-        assertEquals(heartbeat, node.lastHeartbeat());
-        assertEquals("BOTH", node.role());
-    }
-
-    @Test
-    void rateLimitDecisionRecordRoundTrips() {
-        RateLimitStore.RateLimitDecision d = new RateLimitStore.RateLimitDecision(true, 7, 0L);
-        assertEquals(true, d.allowed());
-        assertEquals(7, d.remainingTokens());
-        assertEquals(0L, d.nanosToWaitForRefill());
-    }
-}
@@ -1,65 +0,0 @@
-package stirling.software.common.cluster;
-
-import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-import java.lang.reflect.Method;
-
-import org.junit.jupiter.api.Test;
-
-import stirling.software.common.model.ApplicationProperties;
-import stirling.software.common.model.ApplicationProperties.Cluster;
-
-class ClusterConfigValidationTest {
-
-    @Test
-    void validationPassesWhenDisabled() {
-        ApplicationProperties props = new ApplicationProperties();
-        ClusterConfig config = new ClusterConfig(props);
-        assertDoesNotThrow(() -> invokeValidate(config));
-    }
-
-    @Test
-    void validationFailsWhenValkeyEnabledWithoutUrl() {
-        ApplicationProperties props = new ApplicationProperties();
-        Cluster cluster = props.getCluster();
-        cluster.setEnabled(true);
-        cluster.setBackplane("valkey");
-        ClusterConfig config = new ClusterConfig(props);
-        assertThrows(IllegalStateException.class, () -> invokeValidate(config));
-    }
-
-    @Test
-    void validationPassesWhenValkeyEnabledWithUrl() {
-        ApplicationProperties props = new ApplicationProperties();
-        Cluster cluster = props.getCluster();
-        cluster.setEnabled(true);
-        cluster.setBackplane("valkey");
-        cluster.getValkey().setUrl("redis://localhost:6379");
-        ClusterConfig config = new ClusterConfig(props);
-        assertDoesNotThrow(() -> invokeValidate(config));
-    }
-
-    @Test
-    void validationPassesWhenInProcessEnabled() {
-        ApplicationProperties props = new ApplicationProperties();
-        Cluster cluster = props.getCluster();
-        cluster.setEnabled(true);
-        cluster.setBackplane("inprocess");
-        ClusterConfig config = new ClusterConfig(props);
-        assertDoesNotThrow(() -> invokeValidate(config));
-    }
-
-    private void invokeValidate(ClusterConfig config) throws Exception {
-        Method m = ClusterConfig.class.getDeclaredMethod("validate");
-        m.setAccessible(true);
-        try {
-            m.invoke(config);
-        } catch (java.lang.reflect.InvocationTargetException ex) {
-            if (ex.getCause() instanceof RuntimeException re) {
-                throw re;
-            }
-            throw ex;
-        }
-    }
-}
@@ -1,62 +0,0 @@
-package stirling.software.common.cluster;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
-import org.junit.jupiter.api.Test;
-
-import stirling.software.common.model.ApplicationProperties;
-import stirling.software.common.model.ApplicationProperties.Cluster;
-
-class ClusterPropertiesTest {
-
-    @Test
-    void defaultsAreDisabledAndInprocess() {
-        Cluster props = new ApplicationProperties().getCluster();
-        assertFalse(props.isEnabled());
-        assertEquals("inprocess", props.getBackplane());
-        assertEquals("local", props.getArtifactStore());
-        assertEquals(Cluster.NodeRole.BOTH, props.resolvedRole());
-        assertEquals("", props.getValkey().getUrl());
-        assertFalse(props.getValkey().getTls().isSkipCertVerification());
-        assertEquals("both", props.getNode().getRole());
-        assertEquals("http", props.getNode().getScheme());
-        assertEquals(5000L, props.getNode().getHeartbeatIntervalMs());
-    }
-
-    @Test
-    void resolvedRoleParsesCaseInsensitively() {
-        Cluster props = new ApplicationProperties().getCluster();
-        props.getNode().setRole("WEB");
-        assertEquals(Cluster.NodeRole.WEB, props.resolvedRole());
-
-        props.getNode().setRole("web");
-        assertEquals(Cluster.NodeRole.WEB, props.resolvedRole());
-
-        props.getNode().setRole("Worker");
-        assertEquals(Cluster.NodeRole.WORKER, props.resolvedRole());
-
-        props.getNode().setRole("garbage");
-        assertEquals(Cluster.NodeRole.BOTH, props.resolvedRole());
-
-        props.getNode().setRole(null);
-        assertEquals(Cluster.NodeRole.BOTH, props.resolvedRole());
-    }
-
-    @Test
-    void resolvedNodeIdIsStableAcrossCalls() {
-        Cluster props = new ApplicationProperties().getCluster();
-        String first = props.resolvedNodeId();
-        String second = props.resolvedNodeId();
-        assertNotNull(first);
-        assertEquals(first, second);
-    }
-
-    @Test
-    void resolvedNodeIdHonoursExplicitId() {
-        Cluster props = new ApplicationProperties().getCluster();
-        props.getNode().setId("abc");
-        assertEquals("abc", props.resolvedNodeId());
-    }
-}
@@ -1,90 +0,0 @@
-package stirling.software.common.cluster;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
-import org.springframework.boot.test.context.runner.ApplicationContextRunner;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-import stirling.software.common.cluster.inprocess.InProcessClusterConfiguration;
-import stirling.software.common.model.ApplicationProperties;
-
-/**
- * Verifies the {@link InProcessClusterConfiguration} conditional wiring: in-process beans wire when
- * cluster mode is off or {@code backplane=inprocess}, and are skipped when {@code
- * backplane=valkey}.
- */
-class InProcessConfigurationConditionalTest {
-
-    private final ApplicationContextRunner runner =
-            new ApplicationContextRunner()
-                    .withConfiguration(
-                            org.springframework.boot.autoconfigure.AutoConfigurations.of(
-                                    PropertyPlaceholderAutoConfiguration.class))
-                    .withUserConfiguration(
-                            TestAppPropertiesConfig.class,
-                            ClusterConfig.class,
-                            InProcessClusterConfiguration.class);
-
-    @Test
-    void inProcessBeansWireWhenClusterDisabled() {
-        runner.run(
-                context ->
-                        assertThat(context)
-                                .hasNotFailed()
-                                .hasSingleBean(ClusterBackplane.class)
-                                .hasSingleBean(JobStore.class)
-                                .hasSingleBean(RateLimitStore.class)
-                                .hasSingleBean(DistributedLock.class)
-                                .hasSingleBean(KeyValueCache.class)
-                                .hasSingleBean(InstanceRegistry.class));
-    }
-
-    @Test
-    void inProcessBeansWireWhenEnabledWithInProcessBackplane() {
-        runner.withPropertyValues("cluster.enabled=true", "cluster.backplane=inprocess")
-                .run(
-                        context ->
-                                assertThat(context)
-                                        .hasNotFailed()
-                                        .hasSingleBean(ClusterBackplane.class)
-                                        .hasSingleBean(JobStore.class)
-                                        .hasSingleBean(RateLimitStore.class)
-                                        .hasSingleBean(DistributedLock.class)
-                                        .hasSingleBean(KeyValueCache.class)
-                                        .hasSingleBean(InstanceRegistry.class));
-    }
-
-    @Test
-    void inProcessBeansSkippedWhenEnabledWithDistributedBackplane() {
-        runner.withPropertyValues(
-                        "cluster.enabled=true",
-                        "cluster.backplane=valkey",
-                        "cluster.valkey.url=redis://localhost:6379")
-                .run(
-                        context ->
-                                assertThat(context)
-                                        .hasNotFailed()
-                                        .doesNotHaveBean(ClusterBackplane.class)
-                                        .doesNotHaveBean(JobStore.class)
-                                        .doesNotHaveBean(RateLimitStore.class)
-                                        .doesNotHaveBean(DistributedLock.class)
-                                        .doesNotHaveBean(KeyValueCache.class)
-                                        .doesNotHaveBean(InstanceRegistry.class));
-    }
-
-    /**
-     * Hand-rolled {@link ApplicationProperties} bean: the production class loads YAML at startup
-     * via a {@code @PostConstruct} hook that isn't appropriate for the slice runner, so we wire a
-     * defaults-only instance here.
-     */
-    @Configuration
-    static class TestAppPropertiesConfig {
-        @Bean
-        ApplicationProperties applicationProperties() {
-            return new ApplicationProperties();
-        }
-    }
-}
@@ -1,167 +0,0 @@
-package stirling.software.common.cluster.inprocess;
-
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import java.time.Duration;
-import java.util.Optional;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import org.junit.jupiter.api.Test;
-
-import stirling.software.common.cluster.DistributedLock;
-
-class InProcessDistributedLockTest {
-
-    @Test
-    void acquireReleaseAcquire() {
-        DistributedLock lock = new InProcessDistributedLock();
-        DistributedLock.LockHandle h1 = lock.tryAcquire("k", Duration.ofSeconds(30)).orElseThrow();
-        h1.release();
-        assertTrue(lock.tryAcquire("k", Duration.ofSeconds(30)).isPresent());
-    }
-
-    @Test
-    void reentryFromSameThreadFails() {
-        DistributedLock lock = new InProcessDistributedLock();
-        DistributedLock.LockHandle h1 = lock.tryAcquire("k", Duration.ofSeconds(30)).orElseThrow();
-        Optional<DistributedLock.LockHandle> reentry = lock.tryAcquire("k", Duration.ofSeconds(30));
-        assertFalse(reentry.isPresent(), "in-process lock must be non-reentrant");
-        h1.release();
-        // After release, anyone can acquire again.
-        assertTrue(lock.tryAcquire("k", Duration.ofSeconds(30)).isPresent());
-    }
-
-    @Test
-    void secondAcquireFromAnotherThreadFails() throws InterruptedException {
-        DistributedLock lock = new InProcessDistributedLock();
-        DistributedLock.LockHandle h1 = lock.tryAcquire("k", Duration.ofSeconds(30)).orElseThrow();
-
-        CountDownLatch done = new CountDownLatch(1);
-        AtomicBoolean acquired = new AtomicBoolean(true);
-        Thread t =
-                new Thread(
-                        () -> {
-                            Optional<DistributedLock.LockHandle> attempt =
-                                    lock.tryAcquire("k", Duration.ofSeconds(30));
-                            acquired.set(attempt.isPresent());
-                            attempt.ifPresent(DistributedLock.LockHandle::release);
-                            done.countDown();
-                        });
-        t.start();
-        assertTrue(done.await(2, TimeUnit.SECONDS));
-        assertFalse(acquired.get());
-        h1.release();
-    }
-
-    @Test
-    void leaseExpiryAllowsTakeoverEvenWithoutRelease() throws InterruptedException {
-        // Acquire with a short lease, never call release, then try to acquire again after the
-        // lease has elapsed. Matches Redis SET-NX-EX semantics - the second caller gets the lock
-        // because the first lease auto-expired. 250ms lease + 350ms wait gives CI generous slack.
-        DistributedLock lock = new InProcessDistributedLock();
-        DistributedLock.LockHandle h1 = lock.tryAcquire("k", Duration.ofMillis(250)).orElseThrow();
-        Thread.sleep(350);
-        Optional<DistributedLock.LockHandle> takeover =
-                lock.tryAcquire("k", Duration.ofSeconds(30));
-        assertTrue(
-                takeover.isPresent(),
-                "expired lease must release the lock so a new caller can take over");
-        // Calling release() on the original handle after takeover must be a no-op (token check).
-        h1.release();
-        // The takeover holder is still the legitimate owner.
-        assertFalse(lock.tryAcquire("k", Duration.ofSeconds(30)).isPresent());
-        takeover.get().release();
-    }
-
-    @Test
-    void renewExtendsLease() throws InterruptedException {
-        // Acquire with a short lease, renew it before it expires, then verify the lock is still
-        // held past the original expiry point. 200ms initial + renew to 2s + wait 350ms.
-        DistributedLock lock = new InProcessDistributedLock();
-        DistributedLock.LockHandle h1 = lock.tryAcquire("k", Duration.ofMillis(200)).orElseThrow();
-        assertTrue(h1.renew(Duration.ofSeconds(2)), "renew on a held lease must succeed");
-        Thread.sleep(350);
-        assertFalse(
-                lock.tryAcquire("k", Duration.ofSeconds(30)).isPresent(),
-                "renew should have pushed expiry well past the original 200ms");
-        h1.release();
-    }
-
-    @Test
-    void renewAfterReleaseFails() {
-        DistributedLock lock = new InProcessDistributedLock();
-        DistributedLock.LockHandle h1 = lock.tryAcquire("k", Duration.ofSeconds(30)).orElseThrow();
-        h1.release();
-        assertFalse(h1.renew(Duration.ofSeconds(30)), "renew on a released handle must fail");
-    }
-
-    /**
-     * Concurrency stress: many threads contending on the same key with each holder respecting the
-     * lease (hold &lt;&lt; lease). The lock behaves as a strict mutex in this regime so asserting
-     * mutual exclusion is meaningful. A separate test ({@link
-     * #leaseExpiryAllowsTakeoverEvenWithoutRelease}) covers the takeover-across-expiry branch,
-     * which legitimately allows two holders momentarily and is split-brain behaviour inherent to
-     * any lease-based lock.
-     */
-    @Test
-    void concurrentContentionPreservesMutualExclusion() throws InterruptedException {
-        DistributedLock lock = new InProcessDistributedLock();
-        int threads = 16;
-        int attemptsPerThread = 200;
-        // Lease far exceeds any plausible hold time, so the takeover branch never triggers in
-        // this test and the lock acts as a strict mutex.
-        Duration lease = Duration.ofSeconds(5);
-        java.util.concurrent.atomic.AtomicInteger concurrentHolders =
-                new java.util.concurrent.atomic.AtomicInteger();
-        java.util.concurrent.atomic.AtomicInteger maxConcurrent =
-                new java.util.concurrent.atomic.AtomicInteger();
-        java.util.concurrent.atomic.AtomicInteger acquires =
-                new java.util.concurrent.atomic.AtomicInteger();
-        java.util.concurrent.atomic.AtomicReference<Throwable> firstFailure =
-                new java.util.concurrent.atomic.AtomicReference<>();
-        CountDownLatch start = new CountDownLatch(1);
-        CountDownLatch done = new CountDownLatch(threads);
-
-        for (int i = 0; i < threads; i++) {
-            new Thread(
-                            () -> {
-                                try {
-                                    start.await();
-                                    for (int j = 0; j < attemptsPerThread; j++) {
-                                        Optional<DistributedLock.LockHandle> h =
-                                                lock.tryAcquire("hot", lease);
-                                        if (h.isPresent()) {
-                                            int now = concurrentHolders.incrementAndGet();
-                                            maxConcurrent.accumulateAndGet(now, Math::max);
-                                            acquires.incrementAndGet();
-                                            // Trivial critical section; well within lease.
-                                            concurrentHolders.decrementAndGet();
-                                            h.get().release();
-                                        }
-                                    }
-                                } catch (Throwable t) {
-                                    firstFailure.compareAndSet(null, t);
-                                } finally {
-                                    done.countDown();
-                                }
-                            },
-                            "lock-stress-" + i)
-                    .start();
-        }
-        start.countDown();
-        assertTrue(done.await(30, TimeUnit.SECONDS), "stress workers must finish in time");
-        org.junit.jupiter.api.Assertions.assertNull(firstFailure.get(), "no worker may throw");
-        org.junit.jupiter.api.Assertions.assertEquals(
-                1,
-                maxConcurrent.get(),
-                "mutual exclusion violated: more than one holder observed simultaneously");
-        assertTrue(
-                acquires.get() > 0,
-                "at least some acquires must succeed under contention (saw "
-                        + acquires.get()
-                        + ")");
-    }
-}
@@ -1,28 +0,0 @@
-package stirling.software.common.cluster.inprocess;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import java.time.Duration;
-import java.time.Instant;
-
-import org.junit.jupiter.api.Test;
-
-import stirling.software.common.cluster.ClusterNode;
-
-class InProcessInstanceRegistryTest {
-
-    @Test
-    void registerThenLookupAndActiveNodes() {
-        InProcessInstanceRegistry registry = new InProcessInstanceRegistry();
-        ClusterNode node = new ClusterNode("node-1", "127.0.0.1:8080", Instant.now(), "BOTH");
-        registry.register(node, Duration.ofSeconds(30));
-
-        assertTrue(registry.lookup("node-1").isPresent());
-        assertEquals("node-1", registry.lookup("node-1").get().nodeId());
-        assertEquals(1, registry.activeNodes().size());
-
-        registry.deregister("node-1");
-        assertTrue(registry.lookup("node-1").isEmpty());
-    }
-}
@@ -1,91 +0,0 @@
-package stirling.software.common.cluster.inprocess;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import java.time.Duration;
-import java.time.Instant;
-import java.util.List;
-import java.util.Map;
-
-import org.junit.jupiter.api.Test;
-
-import stirling.software.common.cluster.JobStoreEntry;
-
-class InProcessJobStoreTest {
-
-    private final InProcessJobStore store = new InProcessJobStore();
-
-    @Test
-    void putGetDeleteExistsRoundTrip() {
-        JobStoreEntry entry = entry("job-1");
-        store.put(entry, Duration.ofMinutes(30));
-
-        assertTrue(store.exists("job-1"));
-        assertEquals(entry, store.get("job-1").orElseThrow());
-
-        store.delete("job-1");
-        assertFalse(store.exists("job-1"));
-    }
-
-    @Test
-    void ttlExpiry() throws InterruptedException {
-        store.put(entry("job-2"), Duration.ofMillis(50));
-        Thread.sleep(100);
-        assertFalse(store.get("job-2").isPresent());
-    }
-
-    @Test
-    void purgeExpiredRemovesOnlyStaleEntries() throws InterruptedException {
-        store.put(entry("job-fresh"), Duration.ofMinutes(30));
-        store.put(entry("job-stale"), Duration.ofMillis(20));
-        Thread.sleep(80);
-
-        int removed = store.purgeExpired();
-        assertEquals(1, removed);
-        assertTrue(store.exists("job-fresh"));
-    }
-
-    @Test
-    void findJobIdByFileIdReturnsTheRightJob() {
-        store.put(
-                new JobStoreEntry(
-                        "job-a",
-                        JobStoreEntry.JobState.COMPLETE,
-                        "node-1",
-                        Instant.now(),
-                        Instant.now(),
-                        null,
-                        List.of("file-1", "file-2"),
-                        Map.of()),
-                Duration.ofMinutes(30));
-        store.put(
-                new JobStoreEntry(
-                        "job-b",
-                        JobStoreEntry.JobState.COMPLETE,
-                        "node-1",
-                        Instant.now(),
-                        Instant.now(),
-                        null,
-                        List.of("file-3"),
-                        Map.of()),
-                Duration.ofMinutes(30));
-
-        assertEquals("job-a", store.findJobIdByFileId("file-1").orElseThrow());
-        assertEquals("job-b", store.findJobIdByFileId("file-3").orElseThrow());
-        assertFalse(store.findJobIdByFileId("missing").isPresent());
-    }
-
-    private JobStoreEntry entry(String id) {
-        return new JobStoreEntry(
-                id,
-                JobStoreEntry.JobState.PENDING,
-                "node-1",
-                Instant.now(),
-                null,
-                null,
-                List.of(),
-                Map.of());
-    }
-}
@@ -1,41 +0,0 @@
-package stirling.software.common.cluster.inprocess;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-
-import java.time.Duration;
-
-import org.junit.jupiter.api.Test;
-
-import stirling.software.common.cluster.KeyValueCache;
-
-class InProcessKeyValueCacheTest {
-
-    @Test
-    void putGetEvict() {
-        KeyValueCache cache = new InProcessKeyValueCache();
-        cache.put("apikey", "a", "userA", Duration.ofMinutes(1));
-        assertEquals("userA", cache.get("apikey", "a").orElseThrow());
-
-        cache.evict("apikey", "a");
-        assertFalse(cache.get("apikey", "a").isPresent());
-    }
-
-    @Test
-    void ttlExpiry() throws InterruptedException {
-        KeyValueCache cache = new InProcessKeyValueCache();
-        cache.put("ns", "k", "v", Duration.ofMillis(40));
-        Thread.sleep(80);
-        assertFalse(cache.get("ns", "k").isPresent());
-    }
-
-    @Test
-    void evictNamespace() {
-        KeyValueCache cache = new InProcessKeyValueCache();
-        cache.put("ns", "a", "1", Duration.ofMinutes(1));
-        cache.put("ns", "b", "2", Duration.ofMinutes(1));
-        cache.evictNamespace("ns");
-        assertFalse(cache.get("ns", "a").isPresent());
-        assertFalse(cache.get("ns", "b").isPresent());
-    }
-}
@@ -1,56 +0,0 @@
-package stirling.software.common.cluster.inprocess;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import java.time.Duration;
-
-import org.junit.jupiter.api.Test;
-
-import stirling.software.common.cluster.RateLimitStore;
-import stirling.software.common.cluster.RateLimitStore.RateLimitDecision;
-
-class InProcessRateLimitStoreTest {
-
-    @Test
-    void firstNConsumesAllowed() {
-        RateLimitStore store = new InProcessRateLimitStore();
-        for (int i = 0; i < 5; i++) {
-            assertTrue(store.tryConsume("k", 5, Duration.ofSeconds(60)).allowed(), "i=" + i);
-        }
-        assertFalse(store.tryConsume("k", 5, Duration.ofSeconds(60)).allowed());
-    }
-
-    @Test
-    void remainingTokensDecrements() {
-        RateLimitStore store = new InProcessRateLimitStore();
-        RateLimitDecision d1 = store.tryConsume("k", 5, Duration.ofSeconds(60));
-        RateLimitDecision d2 = store.tryConsume("k", 5, Duration.ofSeconds(60));
-        assertTrue(d1.allowed());
-        assertTrue(d2.allowed());
-        assertEquals(4, d1.remainingTokens());
-        assertEquals(3, d2.remainingTokens());
-    }
-
-    @Test
-    void refillRestoresTokens() throws InterruptedException {
-        RateLimitStore store = new InProcessRateLimitStore();
-        // Capacity 2 with smooth refill over 100 ms -> ~1 token per 50 ms.
-        for (int i = 0; i < 2; i++) {
-            assertTrue(store.tryConsume("k", 2, Duration.ofMillis(100)).allowed());
-        }
-        assertFalse(store.tryConsume("k", 2, Duration.ofMillis(100)).allowed());
-        Thread.sleep(150);
-        assertTrue(store.tryConsume("k", 2, Duration.ofMillis(100)).allowed());
-    }
-
-    @Test
-    void deniedConsumeReportsWaitNanos() {
-        RateLimitStore store = new InProcessRateLimitStore();
-        assertTrue(store.tryConsume("wait", 1, Duration.ofSeconds(10)).allowed());
-        RateLimitDecision denied = store.tryConsume("wait", 1, Duration.ofSeconds(10));
-        assertFalse(denied.allowed());
-        assertTrue(denied.nanosToWaitForRefill() > 0L);
-    }
-}
@@ -1,42 +0,0 @@
-package stirling.software.common.cluster.inprocess;
-
-import static org.junit.jupiter.api.Assertions.assertArrayEquals;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.nio.file.Path;
-
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.io.TempDir;
-
-import stirling.software.common.cluster.FileStore;
-
-class LocalDiskFileStoreTest {
-
-    @Test
-    void storeRetrieveSizeDeleteExistsRoundTrip(@TempDir Path dir) throws IOException {
-        LocalDiskFileStore store = new LocalDiskFileStore(dir.toString());
-        byte[] payload = "hello-bytes".getBytes();
-
-        FileStore.Stored stored = store.store(new ByteArrayInputStream(payload), "x.txt");
-        assertEquals(payload.length, stored.size());
-        assertTrue(store.exists(stored.fileId()));
-        assertEquals(payload.length, store.size(stored.fileId()));
-        assertArrayEquals(payload, store.retrieveBytes(stored.fileId()));
-
-        assertTrue(store.delete(stored.fileId()));
-        assertFalse(store.exists(stored.fileId()));
-    }
-
-    @Test
-    void traversalIdsAreRejected(@TempDir Path dir) {
-        LocalDiskFileStore store = new LocalDiskFileStore(dir.toString());
-        assertThrows(IllegalArgumentException.class, () -> store.resolve("../foo"));
-        assertThrows(IllegalArgumentException.class, () -> store.resolve("a/b"));
-        assertThrows(IllegalArgumentException.class, () -> store.resolve("a\\b"));
-    }
-}
@@ -1,95 +0,0 @@
-package stirling.software.common.configuration;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-import org.junit.jupiter.api.Test;
-import org.snakeyaml.engine.v2.api.LoadSettings;
-
-import stirling.software.common.util.YamlHelper;
-
-class ConfigInitializerTest {
-
-    private static final LoadSettings LOAD_SETTINGS =
-            LoadSettings.builder()
-                    .setUseMarks(true)
-                    .setMaxAliasesForCollections(Integer.MAX_VALUE)
-                    .setAllowRecursiveKeys(true)
-                    .setParseComments(true)
-                    .build();
-
-    // Mirrors the proFeatures block of settings.yml.template after the camelCase rename.
-    private static final String CAMEL_CASE_TEMPLATE =
-            """
-            premium:
-              proFeatures:
-                ssoAutoLogin: false
-                customMetadata:
-                  autoUpdateMetadata: false
-                  author: username
-                  creator: Stirling-PDF
-                  producer: Stirling-PDF
-            """;
-
-    @Test
-    void migrateProFeaturesKeyCasing_carriesForwardLegacyPascalCaseValues() {
-        // An existing install whose settings.yml still uses the old PascalCase keys.
-        String legacy =
-                """
-                premium:
-                  proFeatures:
-                    SSOAutoLogin: true
-                    CustomMetadata:
-                      autoUpdateMetadata: true
-                      author: alice
-                      creator: bob
-                      producer: carol
-                """;
-        YamlHelper template = new YamlHelper(LOAD_SETTINGS, CAMEL_CASE_TEMPLATE);
-        YamlHelper existing = new YamlHelper(LOAD_SETTINGS, legacy);
-
-        new ConfigInitializer().migrateProFeaturesKeyCasing(existing, template);
-
-        assertEquals(
-                "true", template.getValueByExactKeyPath("premium", "proFeatures", "ssoAutoLogin"));
-        assertEquals(
-                "true",
-                template.getValueByExactKeyPath(
-                        "premium", "proFeatures", "customMetadata", "autoUpdateMetadata"));
-        assertEquals(
-                "alice",
-                template.getValueByExactKeyPath(
-                        "premium", "proFeatures", "customMetadata", "author"));
-        assertEquals(
-                "bob",
-                template.getValueByExactKeyPath(
-                        "premium", "proFeatures", "customMetadata", "creator"));
-        assertEquals(
-                "carol",
-                template.getValueByExactKeyPath(
-                        "premium", "proFeatures", "customMetadata", "producer"));
-    }
-
-    @Test
-    void migrateProFeaturesKeyCasing_withoutLegacyKeys_keepsTemplateDefaults() {
-        // No PascalCase keys present -> this migration step must be a no-op.
-        String alreadyCamel =
-                """
-                premium:
-                  proFeatures:
-                    ssoAutoLogin: true
-                    customMetadata:
-                      author: dave
-                """;
-        YamlHelper template = new YamlHelper(LOAD_SETTINGS, CAMEL_CASE_TEMPLATE);
-        YamlHelper existing = new YamlHelper(LOAD_SETTINGS, alreadyCamel);
-
-        new ConfigInitializer().migrateProFeaturesKeyCasing(existing, template);
-
-        assertEquals(
-                "false", template.getValueByExactKeyPath("premium", "proFeatures", "ssoAutoLogin"));
-        assertEquals(
-                "username",
-                template.getValueByExactKeyPath(
-                        "premium", "proFeatures", "customMetadata", "author"));
-    }
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Anthony Stirling	ca40fecd4a	audit: jpdfium split	2026-05-22 10:04:53 +01:00
Anthony Stirling	9c2c39256a	impl migration to pdfium for split	2026-05-22 09:43:18 +01:00
Anthony Stirling	2f1fe2c80c	Delete MergeBenchmark	2026-05-21 23:00:00 +01:00
Anthony Stirling	1051f28c52	Drop remaining why/how comments	2026-05-21 19:11:52 +01:00
Anthony Stirling	29ccbf7ae6	Trim verbose comments across JPDFium integration	2026-05-21 19:03:31 +01:00
Anthony Stirling	007c8e17de	Exclude JPDFium native cache from temp-file regression check	2026-05-21 17:46:46 +01:00
Anthony Stirling	81dbb29be3	Iterative addBookmarkFlat with depth + cycle + node-count guards	2026-05-21 17:17:06 +01:00
Anthony Stirling	caef0477a9	Merge remote-tracking branch 'origin/main' into feat/jpdfium-integration # Conflicts: # app/common/build.gradle	2026-05-21 16:55:18 +01:00
Anthony Stirling	7682a0dd54	sign-jpdfium-dylibs: sign both Gradle and Tauri bootJar copies	2026-05-21 16:26:52 +01:00
Anthony Stirling	f90ed4657a	Apply spotless; bash 3.2-compatible array handling in sign-jpdfium-dylibs	2026-05-21 15:53:28 +01:00
Anthony Stirling	a6c7a68242	Move sign-jpdfium-dylibs-in-bootjar.sh into frontend/scripts/	2026-05-21 15:21:25 +01:00
Anthony Stirling	a184b394d6	Strip rationale-history comments from JDK 25 references	2026-05-21 15:20:11 +01:00
Anthony Stirling	302d04c201	Merge remote-tracking branch 'origin/main' into feat/jpdfium-integration # Conflicts: # build.gradle	2026-05-21 15:05:51 +01:00
Anthony Stirling	68ae9d52fb	Bump JPDFium dep to 1.0.0; drop snapshot repo	2026-05-21 14:46:10 +01:00
Anthony Stirling	6552ba905c	Cleanup: drop local mavenLocal hack; gate MergeBenchmark with -Dmerge.bench=true	2026-05-21 11:58:43 +01:00
Anthony Stirling	ee36b6f616	MergeController: preserve source bookmarks through merge (PDFium drops them)	2026-05-21 11:39:59 +01:00
Anthony Stirling	627091f8df	MergeController: use JPDFium native merge (94% less heap on 5-doc merge)	2026-05-21 10:37:01 +01:00
Anthony Stirling	67a37d3291	Filter JPDFium natives per Tauri target OS (saves ~45 MB per bundle)	2026-05-21 00:28:31 +01:00
Anthony Stirling	4b6d4885f4	sign-jpdfium-dylibs: resolve native-jar paths via `jar tf` first `jar xf <jar> <path>` doesn't expand glob patterns in <path> the way `unzip` does — paths must be exact. My initial script passed `BOOT-INF/lib/jpdfium-natives-darwin-x64-*.jar` as a literal path, which matched nothing, so the script always reported "No JPDFium darwin natives in bootJar; nothing to sign" and exited without actually signing anything. Fix: `jar tf` to LIST the bootJar's contents, grep with a regex for the snapshot-versioned native-jar paths, then `jar xf` those exact paths. The natives jars are normally: BOOT-INF/lib/jpdfium-natives-darwin-x64-1.0.0-SNAPSHOT.jar BOOT-INF/lib/jpdfium-natives-darwin-arm64-1.0.0-SNAPSHOT.jar …but the version number floats with the snapshot timestamp, hence the regex match instead of a fixed path.	2026-05-20 09:46:07 +01:00
Anthony Stirling	2a151b65f7	Move JPDFium dylib signing step AFTER cert import My first placement put the sign-jpdfium-dylibs-in-bootjar step at the wrong point in the workflow: BEFORE the "Verify Certificate" step that sets APPLE_SIGNING_IDENTITY in GITHUB_ENV. So the gate `if: ... && env.APPLE_SIGNING_IDENTITY != ''` always evaluated to false and the step silently skipped, leaving the dylibs unsigned and notarytool still rejecting the .app. Move it to right after Verify Certificate (which sets the env var from the keychain identity). Also switch the gate to checking env.APPLE_CERTIFICATE (the secret that's set at job level and available from step 1) rather than env.APPLE_SIGNING_IDENTITY (set mid-workflow via GITHUB_ENV) — the latter is fine in `run:` blocks but flaky in `if:` evaluation depending on GH Actions evaluation timing.	2026-05-20 09:08:37 +01:00
Anthony Stirling	9458fcd0e2	Re-run CI against JPDFium with Windows ICU trim + harfbuzz-no-glib	2026-05-20 00:45:22 +01:00
Anthony Stirling	1e8c41425b	Sign JPDFium dylibs in bootJar before Tauri notarization (macOS) Tauri-build macos-universal has been failing notarytool because the .dylib files inside the JPDFium native jars (jpdfium-natives-darwin- x64-.jar / -arm64-.jar) ship unsigned — JPDFium's publish workflow has no Apple Developer credentials, so it can't sign during publish. Apple's notarytool walks INTO nested .jars in the .app and reports: "The binary is not signed." path: Stirling-PDF.zip/Stirling-PDF.app/Contents/Resources/libs/ stirling-pdf-.jar/BOOT-INF/lib/ jpdfium-natives-darwin-x64-1.0.0-SNAPSHOT.jar/natives/darwin-x64/ libjpdfium.dylib Tauri's own codesign walk doesn't open .jars, so the fix has to happen here before tauri-action runs. New step between `task desktop:prepare` (builds bootJar) and `tauri-action` (builds .app + notarizes): scripts/sign-jpdfium-dylibs-in-bootjar.sh 1. jar xf bootJar BOOT-INF/lib/jpdfium-natives-darwin-.jar 2. for each native jar, explode it, codesign every .dylib with APPLE_SIGNING_IDENTITY + --options runtime + --timestamp 3. jar cfM0 to repack the natives jar (stored, no deflate — matches Spring Boot's preferred layout) 4. jar uf bootJar to replace the natives jars in the outer bootJar with the freshly-signed versions Gated on macOS-15 + APPLE_SIGNING_IDENTITY being set, so PR builds from forks (no secret) fall through and the existing "binary not signed" failure persists — no regression vs current.	2026-05-19 23:32:09 +01:00
Anthony Stirling	b3277a18c8	Re-run CI: pick up Rust-LTO-trimmed JPDFium snapshot	2026-05-19 18:56:29 +01:00
Anthony Stirling	5ca1586976	Re-run CI: pick up smaller (ICU+qpdf trim) JPDFium snapshot	2026-05-19 18:18:21 +01:00
Anthony Stirling	ce47a4e3af	Re-run CI: pick up ICU-trimmed JPDFium snapshot	2026-05-19 17:08:17 +01:00
Anthony Stirling	859a2d97c2	Always re-resolve JPDFium snapshots in CI PR rerun against new JPDFium snapshots kept using Gradle's cached versions from earlier runs. Gradle caches 'changing modules' (anything ending in -SNAPSHOT) for 24h by default, and gh run rerun --failed reuses the existing run's Gradle home — so even after publishing a fresh com.stirling:jpdfium-natives-*:1.0.0-SNAPSHOT, the bootJar kept embedding the old natives. cacheChangingModulesFor 0 means every Gradle invocation re-checks the snapshot's maven-metadata.xml and pulls a newer timestamped build if present. cacheDynamicVersionsFor 0 does the same for non-snapshot dynamic versions (e.g. '1.+'). Both are scoped to the subprojects.configurations.all block alongside the existing security force-versions. Trade-off: every Gradle invocation in CI does a HEAD against Maven Central per snapshot dep (4 natives + 1 main jpdfium = 5 small requests). Negligible compared to a download. Reverts naturally when JPDFium ships a tagged release.	2026-05-19 15:00:02 +01:00
Anthony Stirling	a422deecdb	Re-add jpdfium-natives-darwin-x64 (Intel Mac) runtime dep The publish-github-packages workflow's restored darwin-x64 build now cross-compiles from macos-14 under Rosetta + a second Homebrew, so the natives jar is available again. Adding it back to the bootJar classpath lets the tauri-build macos-15 universal binary cover Intel Macs too.	2026-05-19 10:15:16 +01:00
Anthony Stirling	7f8f09c899	Native-access via bootJar manifest, not CLI flags everywhere JDK 22+ honors an 'Enable-Native-Access' attribute on the executable jar's manifest (JEP 472). Setting it once on the Spring Boot bootJar removes the need to remember --enable-native-access=ALL-UNNAMED in: - Docker init script's JAVA_BASE_OPTS injection - Tauri Rust launcher's java_options vector - Anywhere else somebody runs the bootJar …and also future-proofs against JDK 26's hard-fail behavior without each launch point having to track the flag. app/core/build.gradle: add 'Enable-Native-Access': 'ALL-UNNAMED' to the bootJar manifest attributes block. build.gradle (bootRun jvmArgs): keep --enable-native-access=ALL-UNNAMED because bootRun launches from classfiles, not the bootJar — the manifest mechanism doesn't apply to that codepath, only to 'java -jar'. scripts/init-without-ocr.sh: drop the FFM injection. frontend/src-tauri/src/commands/backend.rs: drop the CLI arg.	2026-05-18 21:35:06 +01:00
Anthony Stirling	96920b1186	build.gradle: modernJavaVersion 21 -> 25 This was the actual culprit behind 'JVM runtime version 21 vs 25' Gradle variant-attribute mismatch errors during PR CI. modernJavaVersion drives: - options.release on JavaCompile.configureEach across all subprojects - restart-helper compile target Even though sourceCompatibility / targetCompatibility were already bumped to VERSION_25 in an earlier commit, --release 21 on javac overrode them and made Gradle's compileClasspath declare org.gradle.jvm.version=21, which then refused to resolve com.stirling:jpdfium:1.0.0-SNAPSHOT (published as JVM 25). Bumping modernJavaVersion to 25 aligns everything.	2026-05-18 19:09:28 +01:00
Anthony Stirling	3626319685	docs+ci: scrub remaining JDK 21 references JPDFium's published artifacts target JVM 25 and Stirling-PDF's main sources are now compiled with sourceCompatibility = VERSION_25, so JDK 21 is no longer supported. Update header comments and developer-facing docs to reflect the hard floor. - backend-build.yml header: 'JDK 21/25 \xc3\x97 spring-security' -> 'JDK 25 \xc3\x97 spring-security' - AGENTS.md Important Notes: minimum 21 -> requires 25 - DeveloperGuide.md prerequisites + setup steps: drop 'or later, 25 recommended' language, say 'JDK 25' outright.	2026-05-18 19:07:11 +01:00
Anthony Stirling	755f270a31	ci: drop JDK 21 from backend build matrix JPDFium's published artifacts carry org.gradle.jvm.version=25 (FFM is finalized at JDK 22+; JPDFium picks 25 as the source target). Gradle's variant attribute matching refuses to resolve the dep on JDK 21 targets, so the 21 cells in this matrix were guaranteed to fail. Now that targetCompatibility is bumped to 25 across the project, JDK 25 is the only supported toolchain.	2026-05-18 19:04:59 +01:00
Anthony Stirling	6e1a7454ca	Integrate Stirling-Tools JPDFium for PDF operations This is a bring-up branch to validate JPDFium consumption across all Stirling-PDF release targets (server jar, Docker, Tauri desktop). Open as PR for cross-platform CI validation. Source dep - com.stirling:jpdfium:1.0.0-SNAPSHOT (pulled from Maven Central snapshots, fully anonymous — no PAT or GitHub Packages auth needed) - Per-platform natives: linux-x64, linux-arm64, darwin-arm64, windows-x64 All four are added as runtimeOnly so the bootJar carries every platform and NativeLoader picks the right one at startup. The natives jars are hermetic — each bundles its bridge, PDFium component libs, and the third-party deps (pcre2/freetype/harfbuzz/icu/qpdf/pugixml/libunibreak), so no system package install is required at runtime. - TODO follow-up: jpdfium-natives-darwin-x64 (Intel Mac) — dropped from the upstream publish matrix while cross-compile-on-macos-14 setup lands. JDK 25 enforcement - Bump root + subprojects from sourceCompatibility / targetCompatibility 21 -> 25. JPDFium publishes with org.gradle.jvm.version=25 (FFM is final in JDK 22+; JPDFium picks 25 as the floor), and a 21-targeted Stirling-PDF jar would fail Gradle's variant attribute match at compile time. - bootRun jvmArgs: add --enable-native-access=ALL-UNNAMED. JDK 25 warns on restricted FFM methods without it; JDK 26 will hard-fail. Docker - scripts/init-without-ocr.sh: prepend --enable-native-access=ALL-UNNAMED to JAVA_BASE_OPTS so the JAVA_TOOL_OPTIONS env var that the container sets includes it for the running JVM. Idempotent — won't duplicate if already present. Tauri - frontend/src-tauri/src/commands/backend.rs: the sidecar Java spawn now passes --enable-native-access=ALL-UNNAMED. The bundled jlink JRE's module list (desktop.yml JLINK_MODULES) already includes java.desktop and java.net.http which is everything JPDFium's module-info requires. Smoke test - app/common/src/test/java/stirling/software/common/jpdfium/JPDFiumSmokeTest.java Opens the existing common test resource example.pdf via PdfDocument.open and asserts a positive page count. Confirms the dep resolves, the right natives jar lands on the classpath, the bridge + PDFium component libs + third-party deps all load, and the FFM bindings parse a real PDF end-to-end. Runs as part of :common:test on each platform's CI runner.	2026-05-18 18:31:37 +01:00