- name: Download documentation
   uses: actions/download-artifact@v4
   with:
     name: documentation
-    path: docs/api
+    path: .

 - name: Download grid packages
   uses: actions/download-artifact@v4
   with:
     name: nightly-grid
-    path: build/dist
+    path: .

 - name: Download release packages
   uses: actions/download-artifact@v4
   with:
     name: release-packages
-    path: build/dist
+    path: .

 - name: Save git diff
   if: always() && inputs.artifact-name != '' && inputs.artifact-path == ''
-  run: git diff > changes.patch
+  run: |
+    git diff --binary > changes.patch
+    git diff --cached --binary >> changes.patch
+    [ -s changes.patch ] || rm -f changes.patch
 - name: Upload artifact
   if: always() && inputs.artifact-name != ''

 - name: Save git diff
-  if: inputs.artifact-name != '' && inputs.artifact-path == ''
+  if: always() && inputs.artifact-name != '' && inputs.artifact-path == ''
   run: git diff > changes.patch
 - name: Upload artifact
-  if: inputs.artifact-name != ''
+  if: always() && inputs.artifact-name != ''
   uses: actions/upload-artifact@v4
   with:
     name: ${{ inputs.artifact-name }}
     path: ${{ inputs.artifact-path || 'changes.patch' }}
     retention-days: 6
     if-no-files-found: ${{ inputs.artifact-path != '' && 'error' || 'warn' }}

 commit-fixes:
   name: Commit fixes
   needs: format
   if: failure() && github.event_name == 'pull_request'
   runs-on: ubuntu-latest
   permissions:
     contents: write
     actions: read
   steps:
     - name: Check Permissions
       if: github.event.pull_request.head.repo.fork == true
       run: |
         echo "::error::Code needs formatting. Run ./scripts/format.sh locally and push changes."
         exit 1
     - name: Checkout PR
       uses: actions/checkout@v4
       with:
         ref: ${{ github.event.pull_request.head.ref }}
     - name: Download format changes
       uses: actions/download-artifact@v4
       with:
         name: format-changes
+      continue-on-error: true
     - name: Apply and commit fixes
       id: apply
       run: |
-        if [ -s changes.patch ]; then
+        if [ -f changes.patch ] && [ -s changes.patch ]; then
           git apply changes.patch
           rm changes.patch
           git config --local user.name "Selenium CI Bot"
           git config --local user.email "selenium-ci@users.noreply.github.com"
           git add -A
           git commit -m "Auto-format code"
           echo "has_changes=true" >> "$GITHUB_OUTPUT"
         else
-          echo "::notice::No formatting changes needed."
+          echo "::notice::No formatting patch artifact found; nothing to apply."
+          echo "has_changes=false" >> "$GITHUB_OUTPUT"
         fi
     - name: Push fixes
       if: steps.apply.outputs.has_changes == 'true'
       run: |
         git push
         echo "::notice::Auto-formatted and pushed. New CI run will start."

 run: |
-  COMMITS="${{ join(github.event.commits.*.message, ' ') }}"
+  COMMITS_JSON='${{ toJSON(join(github.event.commits.*.message, " ")) }}'
+  COMMITS="${COMMITS_JSON%\"}"; COMMITS="${COMMITS#\"}"
+  COMMITS="${COMMITS//\\n/ }"; COMMITS="${COMMITS//\\r/ }"
   if [[ "$COMMITS" == *"[java]"* ]]; then
     RULES_JVM_EXTERNAL_REPIN=1 bazel run @maven//:pin
   fi
   if [[ "$COMMITS" == *"[rust]"* ]]; then
     CARGO_BAZEL_REPIN=true bazel run @crates//:all
   fi
   if [[ "$COMMITS" == *"[js]"* ]]; then
     bazel run -- @pnpm//:pnpm install --dir "$PWD" --lockfile-only
   fi
   if [[ "$COMMITS" == *"[dotnet]"* ]]; then
     ./dotnet/update-deps.sh
   fi
   if [[ "$COMMITS" == *"[py]"* ]]; then
     bazel run //py:requirements.update
   fi
   if [[ "$COMMITS" == *"[rb]"* ]]; then
     ./go rb:pin
   fi

 read-targets:
   name: Read Targets
   needs: check
   runs-on: ubuntu-latest
   outputs:
     targets: ${{ steps.read.outputs.targets }}
   steps:
     - name: Download targets
       uses: actions/download-artifact@v4
       with:
         name: check-targets
     - name: Read targets
       id: read
       run: |
-        {
-          echo "targets<<EOF"
-          cat bazel-targets.txt
-          echo "EOF"
-        } >> "$GITHUB_OUTPUT"
+        if [ -s bazel-targets.txt ]; then
+          {
+            echo "targets<<EOF"
+            cat bazel-targets.txt
+            echo "EOF"
+          } >> "$GITHUB_OUTPUT"
+        else
+          echo "targets=" >> "$GITHUB_OUTPUT"
+        fi

 push-rust-version:
   name: Push Rust Version
   needs: generate-rust-version
   runs-on: ubuntu-latest
   steps:
     - name: Checkout repo
       uses: actions/checkout@v4
       with:
         token: ${{ secrets.SELENIUM_CI_TOKEN }}
         fetch-depth: 0
     - name: Download rust version patch
       uses: actions/download-artifact@v4
       with:
         name: rust-version
     - name: Apply patch
-      run: git apply --index changes.patch
+      run: |
+        if [ -s changes.patch ]; then
+          git apply --index changes.patch
+          echo "CHANGES_APPLIED=true" >> "$GITHUB_ENV"
+        fi
     - name: Prep git
+      if: env.CHANGES_APPLIED == 'true'
       run: |
         git config --local user.email "selenium-ci@users.noreply.github.com"
         git config --local user.name "Selenium CI Bot"
     - name: Push changes
+      if: env.CHANGES_APPLIED == 'true'
       run: |
         git commit -m "update selenium manager version and rust changelog"
         git push origin HEAD:rust-release-${{ inputs.version }} --force

 - name: Checkout source tree
   uses: actions/checkout@v4
   with:
     ref: ${{ inputs.ref || github.ref }}
+    fetch-depth: 0

 - name: Apply patch
-  run: git apply --index changes.patch || echo "No changes to apply"
+  shell: bash
+  run: |
+    if [ ! -f changes.patch ] || [ ! -s changes.patch ]; then
+      echo "No changes to apply"
+      exit 0
+    fi
+    git apply --index changes.patch