feat(tier): inspect legacy transition state safely

fix(tier): probe legacy transition version state
2026-09-05 19:55:37 +00:00 · 2026-09-04 20:45:24 +08:00 · 2026-09-04 19:56:14 +08:00
249 changed files with 7900 additions and 40276 deletions
@@ -1,2 +1,2 @@
 sha256-darwin=a881fd7d3f5cb94654221ca85b8b30cce1b95e608824a55a15339cbc294e6d34
-sha256-linux=a2933d83dfe74ffa03410a0959333a1c48288b8469ca9f17273d449d7510c24b
+sha256-linux=e9a8d64e73f627c4d26c236dbbba690c9ee03a9e26d42a4244515b4439365535
@@ -1,72 +0,0 @@
-{
-  "lane": "ci/test-and-lint",
-  "tests": [
-    {
-      "invariant": "write-quorum",
-      "suite": "rustfs-ecstore",
-      "name": "set_disk::ops::object::inline_put_commit_path_tests::inline_put_direct_commit_accepts_exact_quorum_and_rejects_quorum_minus_one"
-    },
-    {
-      "invariant": "metadata-rollback",
-      "suite": "rustfs-ecstore",
-      "name": "set_disk::core::io_primitives::tests::write_unique_file_info_reverts_metadata_when_write_quorum_fails"
-    },
-    {
-      "invariant": "stale-writer",
-      "suite": "rustfs-ecstore",
-      "name": "set_disk::ops::object::put_object_tmp_cleanup_tests::put_object_no_lock_aborts_after_outer_namespace_lock_loss"
-    },
-    {
-      "invariant": "range-body",
-      "suite": "rustfs-ecstore",
-      "name": "set_disk::ops::object::transition_upload_integrity_tests::transitioned_compressed_object_range_get_returns_plaintext_slice"
-    },
-    {
-      "invariant": "multipart-cancellation",
-      "suite": "rustfs-ecstore",
-      "name": "set_disk::ops::multipart::tests::cancelled_complete_keeps_upload_lock_through_tail_cleanup"
-    },
-    {
-      "invariant": "list-uncommitted-version",
-      "suite": "rustfs-filemeta",
-      "name": "metacache::tests::resolve_with_write_quorum_slack_keeps_partial_latest_hidden_during_merge"
-    },
-    {
-      "invariant": "minio-object-fixture",
-      "suite": "rustfs-filemeta",
-      "name": "filemeta::test::parses_real_minio_object_xlmeta"
-    },
-    {
-      "invariant": "corrupt-part-arrays",
-      "suite": "rustfs-filemeta",
-      "name": "filemeta::test::crc_valid_but_part_arrays_corrupt_into_fileinfo_errors_not_panics"
-    }
-  ],
-  "fixtures": [
-    {
-      "path": "crates/filemeta/tests/fixtures/minio/object_large_bin.xlmeta.hex",
-      "sha256": "e8093767806d701e639b48d023190e858fbc4cde69bcfd83c22af8cba8452ce5",
-      "source": "MinIO RELEASE.2025-07-23T15-54-02Z; crates/ecstore/tests/fixtures/minio/README.md"
-    },
-    {
-      "path": "crates/filemeta/tests/fixtures/minio/object_small_txt.xlmeta.hex",
-      "sha256": "2a415ad3a3be5a9440035d4026ff880e0e8c1ec1701be9f4e077734e8dce03da",
-      "source": "MinIO RELEASE.2025-07-23T15-54-02Z; crates/ecstore/tests/fixtures/minio/README.md"
-    },
-    {
-      "path": "crates/filemeta/tests/fixtures/minio/object_versioned_txt.xlmeta.hex",
-      "sha256": "7f21f50c326dd8b0228deb6dbdb7052b3d0a3f8ee6c85d43486f0e6bb7a97261",
-      "source": "MinIO RELEASE.2025-07-23T15-54-02Z; crates/ecstore/tests/fixtures/minio/README.md"
-    },
-    {
-      "path": "crates/ecstore/tests/fixtures/minio/bucket_metadata.blob.hex",
-      "sha256": "f2b6e260aff106adf6039feb1c645686e84e75404ff725491fb18668be5db203",
-      "source": "MinIO RELEASE.2025-07-23T15-54-02Z; crates/ecstore/tests/fixtures/minio/README.md"
-    },
-    {
-      "path": "crates/ecstore/tests/fixtures/minio/bucket_metadata_full.xlmeta.hex",
-      "sha256": "3b6de589519c08a1614c8bd409bb8199c17d42043861b07bce513075e6fbfc12",
-      "source": "MinIO RELEASE.2025-07-23T15-54-02Z; crates/ecstore/tests/fixtures/minio/README.md"
-    }
-  ]
-}
@@ -3,10 +3,9 @@
 .NOTPARALLEL: pre-commit pre-pr dev-check

 .PHONY: setup-hooks
-setup-hooks: ## Install the configured pre-commit hooks
+setup-hooks: ## Set up git hooks
 	@echo "🔧 Setting up git hooks..."
-	pre-commit validate-config
-	pre-commit install
+	chmod +x .git/hooks/pre-commit
 	@echo "✅ Git hooks setup complete!"

 .PHONY: doc-paths-check
@@ -40,8 +40,6 @@ script-tests: ## Run shell script tests
 	$(RUSTFS_PYTHON_BIN) ./scripts/check_test_wiring.py --self-test
 	$(RUSTFS_PYTHON_BIN) ./scripts/check_security_coverage.py --self-test
 	$(RUSTFS_PYTHON_BIN) ./scripts/check_scheduled_validation_freshness.py --self-test
-	$(RUSTFS_PYTHON_BIN) ./scripts/test_security_workflow.py
-	$(RUSTFS_PYTHON_BIN) ./scripts/test_nightly_candidate.py
 	$(RUSTFS_PYTHON_BIN) ./scripts/s3-tests/test_report_compat.py
 	bash -n ./scripts/validate_object_data_cache_cold_stampede.sh
 	$(RUSTFS_PYTHON_BIN) ./scripts/check_object_data_cache_follower_samples.py --self-test
@@ -69,7 +69,7 @@ filter = 'package(rustfs-ecstore) & test(/^(bucket::lifecycle::bucket_lifecycle_
 setup = 'ecstore-large-stack'

 [[profile.default.scripts]]
-filter = 'package(rustfs-ecstore) | package(rustfs-s3select-api) | package(rustfs-scanner) | (package(rustfs) & test(/^(app::multipart_usecase::tests::concurrent_completions_share_durable_bucket_quota_reservations|app::object::delete::tests::compressed_delete_requests_update_observed_usage_without_releasing_quota_floor|app::object::internal_put::tests::internal_multipart_roundtrip_completes_and_abort_leaves_nothing|app::object::restore::tests::execute_restore_object_maps_failures_to_typed_s3_errors|storage::access::tests::(delete_object_access_captures_authorized_bucket_incarnation|copy_operations_reject_recreated_source_bucket_after_authorization|request_slot_keeps_bucket_policy_bound_to_its_store))$/))'
+filter = 'package(rustfs-ecstore) | package(rustfs-s3select-api) | package(rustfs-scanner) | (package(rustfs) & test(/^(app::multipart_usecase::tests::concurrent_completions_share_durable_bucket_quota_reservations|app::object::delete::tests::compressed_delete_requests_update_observed_usage_without_releasing_quota_floor|app::object::internal_put::tests::internal_multipart_roundtrip_completes_and_abort_leaves_nothing|storage::access::tests::(delete_object_access_captures_authorized_bucket_incarnation|copy_operations_reject_recreated_source_bucket_after_authorization|request_slot_keeps_bucket_policy_bound_to_its_store))$/))'
 setup = 'ecstore-base-stack'

 [[profile.default.scripts]]
@@ -210,7 +210,7 @@ filter = 'package(rustfs-ecstore) & test(/^(bucket::lifecycle::bucket_lifecycle_
 setup = 'ecstore-large-stack'

 [[profile.ci.scripts]]
-filter = 'package(rustfs-ecstore) | package(rustfs-s3select-api) | package(rustfs-scanner) | (package(rustfs) & test(/^(app::multipart_usecase::tests::concurrent_completions_share_durable_bucket_quota_reservations|app::object::delete::tests::compressed_delete_requests_update_observed_usage_without_releasing_quota_floor|app::object::internal_put::tests::internal_multipart_roundtrip_completes_and_abort_leaves_nothing|app::object::restore::tests::execute_restore_object_maps_failures_to_typed_s3_errors|storage::access::tests::(delete_object_access_captures_authorized_bucket_incarnation|copy_operations_reject_recreated_source_bucket_after_authorization|request_slot_keeps_bucket_policy_bound_to_its_store))$/))'
+filter = 'package(rustfs-ecstore) | package(rustfs-s3select-api) | package(rustfs-scanner) | (package(rustfs) & test(/^(app::multipart_usecase::tests::concurrent_completions_share_durable_bucket_quota_reservations|app::object::delete::tests::compressed_delete_requests_update_observed_usage_without_releasing_quota_floor|app::object::internal_put::tests::internal_multipart_roundtrip_completes_and_abort_leaves_nothing|storage::access::tests::(delete_object_access_captures_authorized_bucket_incarnation|copy_operations_reject_recreated_source_bucket_after_authorization|request_slot_keeps_bucket_policy_bound_to_its_store))$/))'
 setup = 'ecstore-base-stack'

 [[profile.ci.scripts]]
@@ -1,120 +0,0 @@
-# Copyright 2024 RustFS Team
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-name: Quick Checks
-description: Run the shared compile-free RustFS quality checks.
-
-runs:
-  using: composite
-  steps:
-    - name: Install quality tools
-      uses: taiki-e/install-action@bffeee26d4db9be238a4ea78d8826604ebcb594d # v2
-      with:
-        tool: |
-          ripgrep@15.2.0
-          shellcheck@0.11.0
-
-    - name: Install actionlint
-      shell: bash
-      run: |
-        actionlint_dir="$(mktemp -d "${RUNNER_TEMP}/actionlint.XXXXXX")"
-        curl --fail --location --silent --show-error \
-          --output "$actionlint_dir/actionlint.tar.gz" \
-          https://github.com/rhysd/actionlint/releases/download/v1.7.12/actionlint_1.7.12_linux_amd64.tar.gz
-        echo "8aca8db96f1b94770f1b0d72b6dddcb1ebb8123cb3712530b08cc387b349a3d8  $actionlint_dir/actionlint.tar.gz" | sha256sum --check --status
-        tar -xzf "$actionlint_dir/actionlint.tar.gz" -C "$actionlint_dir" actionlint
-        rm "$actionlint_dir/actionlint.tar.gz"
-        echo "$actionlint_dir" >> "$GITHUB_PATH"
-
-    - name: Install Rust toolchain
-      uses: dtolnay/rust-toolchain@29eef336d9b2848a0b548edc03f92a220660cdb8 # stable
-      with:
-        components: rustfmt
-
-    - name: Check workflow syntax and shell scripts
-      shell: bash
-      run: shellcheck --version && actionlint
-
-    - name: Check code formatting
-      shell: bash
-      run: cargo fmt --all --check
-
-    - name: Check unsafe code allowances
-      shell: bash
-      run: ./scripts/check_unsafe_code_allowances.sh
-
-    - name: Check layered dependencies
-      shell: bash
-      run: ./scripts/check_layer_dependencies.sh
-
-    - name: Check architecture migration rules
-      shell: bash
-      run: ./scripts/check_architecture_migration_rules.sh
-
-    - name: Check logging guardrails
-      shell: bash
-      run: ./scripts/check_logging_guardrails.sh
-
-    - name: Check error other(format!) ratchet
-      shell: bash
-      run: ./scripts/check_error_other_format_ratchet.sh
-
-    - name: Check tokio io-uring feature guard
-      shell: bash
-      run: ./scripts/check_no_tokio_io_uring.sh
-
-    - name: Check extension schema boundaries
-      shell: bash
-      run: ./scripts/check_extension_schema_boundaries.sh
-
-    - name: Check body-cache whitelist guard
-      shell: bash
-      run: ./scripts/check_body_cache_whitelist.sh
-
-    - name: Check s3s footprint ratchet
-      shell: bash
-      run: ./scripts/check_s3s_footprint.sh
-
-    - name: Check cryptographic capability wording
-      shell: bash
-      run: ./scripts/check_fips_wording.sh
-
-    - name: Check no embedded secret material
-      shell: bash
-      run: ./scripts/check_embedded_secrets.sh
-
-    - name: Run script contract tests
-      shell: bash
-      run: make script-tests
-
-    - name: Check test wiring
-      shell: bash
-      run: |
-        python3 ./scripts/check_test_wiring.py --self-test
-        python3 ./scripts/check_scheduled_validation_freshness.py --self-test
-        python3 ./scripts/test_security_workflow.py
-        python3 ./scripts/test_nightly_candidate.py
-        python3 ./scripts/check_test_wiring.py
-
-    - name: Check no planning docs committed
-      shell: bash
-      run: ./scripts/check_no_planning_docs.sh
-
-    - name: Check CI paths stay in sync
-      shell: bash
-      run: ./scripts/check_ci_paths_sync.sh
-
-    - name: Check io_uring lane --lib precondition
-      shell: bash
-      run: ./scripts/check_uring_lane_lib_only.sh
@@ -10,16 +10,16 @@ Use N/A when there is no related issue.

 ## Summary of Changes
 <!--
-Describe the concrete problem and resulting behavior. For a behavior change, name the input or state that triggers it and the expected outcome. Explain any new dependency or abstraction that the change needs.
+Briefly explain what changed and why reviewers should accept it.
+Focus on behavior, compatibility, and review-relevant context.
 -->

 ## Verification
 <!--
-Give 1–3 concrete pieces of evidence for the changed behavior: the test or command, its observed result, and the regression it catches. For a bug fix, record a failing-before/passing-after check or explain why it was unavailable.
+List the commands or checks you ran, for example:
+- `make pre-commit`

-Identify the tested commit and any local changes. When testing a prebuilt binary or external service, include its source/version and artifact identity; a successful run against a different build is not evidence for this change.
-
-List relevant checks not run and the remaining risk. Use the validation tier in AGENTS.md; do not run broader checks solely to fill this section. For documentation-only changes, list the applicable documentation checks. Use N/A only when verification is not applicable.
+Use N/A only when verification is not applicable.
 -->

 ## Impact
@@ -12,10 +12,24 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-# Reports the existing required checks for paths excluded by ci.yml.
-# Mixed PRs can trigger both workflows; their Quick Checks jobs use one shared
-# action to keep validation coverage aligned. Keep this paths list in sync with
-# ci.yml's pull_request.paths-ignore via scripts/check_ci_paths_sync.sh.
+# Companion to ci.yml for required status checks.
+#
+# ci.yml skips docs-only pull requests via paths-ignore, but the branch ruleset
+# requires a check named "Test and Lint" — without this workflow a docs-only PR
+# would wait on it forever. This workflow triggers on exactly the paths ci.yml
+# ignores and reports success under the same job name. Mixed PRs trigger both
+# workflows and the real check still gates: a required check with any failing
+# run blocks the merge.
+# https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/troubleshooting-required-status-checks#handling-skipped-but-required-checks
+#
+# "Quick Checks" is mirrored here ahead of the ruleset change that will make it
+# required too (rustfs/backlog#1599). Until that change lands this job is
+# inert; mirroring it first is what lets the ruleset change happen without
+# stranding docs-only PRs on a check nobody reports.
+#
+# Keep the paths list below in sync with the pull_request paths-ignore list
+# in ci.yml, and keep the quick-checks steps below byte-identical to the
+# quick-checks job in ci.yml.

 name: Continuous Integration (docs only)

@@ -45,6 +59,19 @@ permissions:
  contents: read

 jobs:
+  # Deliberately NOT a bare `echo`. Once "Quick Checks" becomes a required
+  # check, ci.yml gates every expensive job behind it, so a mixed PR reports
+  # two check runs with this name: the real one (45-51s) and this companion.
+  # GitHub has no written contract for how it picks between same-named
+  # required check runs ("latest wins" vs "any failure blocks"), so instead of
+  # relying on ordering we make both runs execute the same commands against
+  # the same merge ref — their conclusions are then necessarily identical and
+  # the choice does not matter. Keep these steps byte-identical to the
+  # quick-checks job in ci.yml (a guard script that asserts this, and the paths
+  # sync below, is tracked in rustfs/backlog#1603).
+  #
+  # For a genuinely docs-only PR this adds no strictness (no code changed, so
+  # fmt and the guards always pass) and costs ~50s of ubuntu-latest.
  quick-checks:
    name: Quick Checks
    runs-on: ubuntu-latest
@@ -55,8 +82,63 @@ jobs:
        with:
          persist-credentials: false

-      - name: Run shared quick checks
-        uses: ./.github/actions/quick-checks
+      - name: Install ripgrep
+        uses: taiki-e/install-action@bffeee26d4db9be238a4ea78d8826604ebcb594d # v2
+        with:
+          tool: ripgrep@15.2.0
+
+      - name: Install Rust toolchain
+        uses: dtolnay/rust-toolchain@29eef336d9b2848a0b548edc03f92a220660cdb8 # stable
+        with:
+          components: rustfmt
+
+      - name: Check code formatting
+        run: cargo fmt --all --check
+
+      - name: Check unsafe code allowances
+        run: ./scripts/check_unsafe_code_allowances.sh
+
+      - name: Check layered dependencies
+        run: ./scripts/check_layer_dependencies.sh
+
+      - name: Check architecture migration rules
+        run: ./scripts/check_architecture_migration_rules.sh
+
+      - name: Check logging guardrails
+        run: ./scripts/check_logging_guardrails.sh
+
+      - name: Check tokio io-uring feature guard
+        run: ./scripts/check_no_tokio_io_uring.sh
+
+      - name: Check extension schema boundaries
+        run: ./scripts/check_extension_schema_boundaries.sh
+
+      - name: Check body-cache whitelist guard
+        run: ./scripts/check_body_cache_whitelist.sh
+
+      - name: Check s3s footprint ratchet
+        run: ./scripts/check_s3s_footprint.sh
+
+      - name: Check cryptographic capability wording
+        run: ./scripts/check_fips_wording.sh
+
+      - name: Check no embedded secret material
+        run: ./scripts/check_embedded_secrets.sh
+
+      - name: Check test wiring
+        run: |
+          python3 ./scripts/check_test_wiring.py --self-test
+          python3 ./scripts/check_scheduled_validation_freshness.py --self-test
+          python3 ./scripts/check_test_wiring.py
+
+      - name: Check no planning docs committed
+        run: ./scripts/check_no_planning_docs.sh
+
+      - name: Check CI paths stay in sync
+        run: ./scripts/check_ci_paths_sync.sh
+
+      - name: Check io_uring lane --lib precondition
+        run: ./scripts/check_uring_lane_lib_only.sh

  test-and-lint:
    name: Test and Lint
@@ -100,7 +100,12 @@ jobs:
      - name: Typos check with custom config file
        uses: crate-ci/typos@37bb98842b0d8c4ffebdb75301a13db0267cef89 # master

-  # Fail early with compile-free checks shared with docs-only CI.
+  # Fast, compile-free checks that fail early so contributors get feedback in
+  # ~1 minute instead of waiting for the full test job.
+  #
+  # These steps are mirrored byte-for-byte in ci-docs-only.yml so that a mixed
+  # PR, which reports two check runs named "Quick Checks", cannot get one red
+  # and one green. Edit both jobs together.
  quick-checks:
    name: Quick Checks
    if: github.event_name != 'pull_request' || github.event.action != 'closed'
@@ -112,8 +117,66 @@ jobs:
        with:
          persist-credentials: false

-      - name: Run shared quick checks
-        uses: ./.github/actions/quick-checks
+      - name: Install ripgrep
+        uses: taiki-e/install-action@bffeee26d4db9be238a4ea78d8826604ebcb594d # v2
+        with:
+          tool: ripgrep@15.2.0
+
+      - name: Install Rust toolchain
+        uses: dtolnay/rust-toolchain@29eef336d9b2848a0b548edc03f92a220660cdb8 # stable
+        with:
+          components: rustfmt
+
+      - name: Check code formatting
+        run: cargo fmt --all --check
+
+      - name: Check unsafe code allowances
+        run: ./scripts/check_unsafe_code_allowances.sh
+
+      - name: Check layered dependencies
+        run: ./scripts/check_layer_dependencies.sh
+
+      - name: Check architecture migration rules
+        run: ./scripts/check_architecture_migration_rules.sh
+
+      - name: Check logging guardrails
+        run: ./scripts/check_logging_guardrails.sh
+
+      - name: Check error other(format!) ratchet
+        run: ./scripts/check_error_other_format_ratchet.sh
+
+      - name: Check tokio io-uring feature guard
+        run: ./scripts/check_no_tokio_io_uring.sh
+
+      - name: Check extension schema boundaries
+        run: ./scripts/check_extension_schema_boundaries.sh
+
+      - name: Check body-cache whitelist guard
+        run: ./scripts/check_body_cache_whitelist.sh
+
+      - name: Check s3s footprint ratchet
+        run: ./scripts/check_s3s_footprint.sh
+
+      - name: Check cryptographic capability wording
+        run: ./scripts/check_fips_wording.sh
+
+      - name: Check no embedded secret material
+        run: ./scripts/check_embedded_secrets.sh
+
+      - name: Check test wiring
+        run: |
+          python3 ./scripts/check_test_wiring.py --self-test
+          python3 ./scripts/check_scheduled_validation_freshness.py --self-test
+          python3 ./scripts/check_test_wiring.py
+
+      - name: Check no planning docs committed
+        run: ./scripts/check_no_planning_docs.sh
+
+      - name: Check CI paths stay in sync
+        run: ./scripts/check_ci_paths_sync.sh
+
+      - name: Check io_uring lane --lib precondition
+        run: ./scripts/check_uring_lane_lib_only.sh

  test-and-lint:
    name: Test and Lint
@@ -206,7 +269,6 @@ jobs:
          CARGO_BUILD_JOBS: ${{ (github.event_name == 'push' || github.event_name == 'workflow_dispatch') && '3' || '2' }}
        run: |
          mkdir -p artifacts/test-and-lint
-          rm -f target/nextest/ci/junit.xml
          ./scripts/ci/resource_sampler.sh start nextest
          trap './scripts/ci/resource_sampler.sh stop' EXIT
          set +e
@@ -215,12 +277,6 @@ jobs:
            --status-level all --final-status-level all \
            2>&1 | tee artifacts/test-and-lint/nextest.log
          status=${PIPESTATUS[0]}
-          if [[ "${status}" -eq 0 ]]; then
-            cargo nextest list --profile ci --all --exclude e2e_test --message-format json \
-              > artifacts/test-and-lint/core-test-listing.json \
-              && python3 scripts/check_test_wiring.py --check-core artifacts/test-and-lint/core-test-listing.json \
-              && test -s target/nextest/ci/junit.xml || status=$?
-          fi
          {
            echo "command=cargo nextest run --profile ci --all --exclude e2e_test"
            echo "exit_status=${status}"
@@ -19,9 +19,7 @@ on:
    paths:
      - ".github/workflows/e2e-upgrade.yml"
      - "crates/e2e_test/src/common.rs"
-      - "crates/e2e_test/src/fake_s3_target/**"
      - "crates/e2e_test/src/lib.rs"
-      - "crates/e2e_test/src/replication_extension_test.rs"
      - "crates/e2e_test/src/upgrade_compatibility_test.rs"
      - "crates/ecstore/**"
      - "crates/filemeta/**"
@@ -46,9 +44,9 @@ concurrency:
 env:
  CARGO_TERM_COLOR: always
  RUST_BACKTRACE: 1
-  UPGRADE_SOURCE_VERSION: 1.0.0-rc.5
-  UPGRADE_SOURCE_ASSET: rustfs-linux-x86_64-gnu-v1.0.0-rc.5.zip
-  UPGRADE_SOURCE_SHA256: 3ee8df71e8edcfada533be452c4135868f697bc515460ae97b027313eade7a3d
+  UPGRADE_SOURCE_VERSION: 1.0.0-rc.2
+  UPGRADE_SOURCE_ASSET: rustfs-linux-x86_64-gnu-v1.0.0-rc.2.zip
+  UPGRADE_SOURCE_SHA256: 7c789386bf85278f865b8e0d359bf4edb84d5aa408cc3fa54a18c25ca74cd6e7

 jobs:
  upgrade:
@@ -57,31 +55,14 @@ jobs:
      fail-fast: false
      matrix:
        include:
-          # The two `_from_rc2_` tests keep their names: they assert
-          # release-independent object contracts and pass unchanged against the
-          # newer pinned source, so renaming them would only churn history and
-          # the CI required-check names. UPGRADE_SOURCE_VERSION above is the
-          # single source of truth for which release they actually run against.
-          - name: Direct upgrade from the previous release
+          - name: Direct upgrade from rc.2
            cache_key: e2e-direct-upgrade
            test: direct_upgrade_from_rc2_preserves_object_contracts
            artifact: direct-upgrade
-          - name: Mixed-version rolling upgrade from the previous release
+          - name: Mixed-version rolling upgrade from rc.2
            cache_key: e2e-mixed-version-upgrade
            test: rolling_upgrade_from_rc2_preserves_mixed_version_contracts
            artifact: mixed-version-upgrade
-          - name: Bucket configuration survives the upgrade
-            cache_key: e2e-bucket-config-upgrade
-            test: direct_upgrade_from_previous_release_preserves_bucket_configuration
-            artifact: bucket-config-upgrade
-          - name: Rollback reads current bucket metadata
-            cache_key: e2e-bucket-config-rollback
-            test: rollback_to_previous_release_reads_current_bucket_metadata
-            artifact: bucket-config-rollback
-          - name: ODM configuration recovery after rc.5 rollback
-            cache_key: e2e-odm-config-rollback
-            test: rc5_rollback_requires_restoring_odm_configuration
-            artifact: odm-config-rollback
    runs-on: ubuntu-latest
    timeout-minutes: 60
    env:
@@ -166,9 +166,8 @@ jobs:
      # e.g. https://dl.rustfs.com/artifacts/rustfs/packages/nightly/... .
      # Skipped when the R2 secrets are not configured (artifact-only mode).
      - name: Upload DEB to Cloudflare R2
-        id: publish
+        if: env.R2_ACCESS_KEY_ID != ''
        env:
-          DEB_FILE: ${{ steps.deb.outputs.deb_file }}
          R2_ACCESS_KEY_ID: ${{ secrets.R2_ACCESS_KEY_ID }}
          R2_SECRET_ACCESS_KEY: ${{ secrets.R2_SECRET_ACCESS_KEY }}
          R2_ENDPOINT: ${{ secrets.R2_ENDPOINT }}
@@ -183,70 +182,28 @@ jobs:
            exit 0
          fi

+          if ! command -v aws >/dev/null 2>&1; then
+            sudo apt-get update && sudo apt-get install -y -qq awscli
+          fi
+
          export AWS_ACCESS_KEY_ID="$R2_ACCESS_KEY_ID"
          export AWS_SECRET_ACCESS_KEY="$R2_SECRET_ACCESS_KEY"
          export AWS_DEFAULT_REGION="auto"

-          SOURCE_SHA="$(git rev-parse HEAD)"
-          if [[ "${SOURCE_SHA}" != "${GITHUB_SHA}" ]]; then
-            echo "Checkout SHA does not match the nightly build run" >&2
-            exit 1
-          fi
-          DEB_SHA256="$(sha256sum "${DEB_FILE}" | cut -d ' ' -f 1)"
-          CANDIDATE_KEY="artifacts/rustfs/packages/nightly/runs/${GITHUB_RUN_ID}/${GITHUB_RUN_ATTEMPT}/${DEB_SHA256}/rustfs.deb"
-          CANDIDATE_URL="https://dl.rustfs.com/${CANDIDATE_KEY}"
-
-          # Old AWS CLI models lack conditional PutObject support. Never fall
-          # back to an overwriting upload for a candidate.
-          AWS_CLI=aws
-          if ! "${AWS_CLI}" s3api put-object --generate-cli-skeleton input | jq -e 'has("IfNoneMatch")' >/dev/null; then
-            sudo apt-get update
-            sudo apt-get install -y -qq python3-venv
-            AWS_CLI_DIR="$(mktemp -d "${RUNNER_TEMP}/nightly-awscli.XXXXXX")"
-            trap 'rm -rf "${AWS_CLI_DIR}"' EXIT
-            python3 -m venv "${AWS_CLI_DIR}"
-            "${AWS_CLI_DIR}/bin/python" -m pip install --disable-pip-version-check 'awscli==1.44.79'
-            AWS_CLI="${AWS_CLI_DIR}/bin/aws"
-          fi
-          "${AWS_CLI}" s3api put-object --generate-cli-skeleton input | jq -e 'has("IfNoneMatch")' >/dev/null
-          "${AWS_CLI}" --version
-          "${AWS_CLI}" s3api put-object --bucket "${R2_BUCKET}" --key "${CANDIDATE_KEY}" \
-            --body "${DEB_FILE}" --if-none-match '*' --endpoint-url "${R2_ENDPOINT}"
-          PUBLISHED_SHA256="$(curl -fsSL --retry 3 --connect-timeout 15 --max-time 300 "${CANDIDATE_URL}" | sha256sum | cut -d ' ' -f 1)"
-          if [[ "${PUBLISHED_SHA256}" != "${DEB_SHA256}" ]]; then
-            echo "Published candidate checksum does not match the built package" >&2
-            exit 1
-          fi
-
+          DEB_FILE="${{ steps.deb.outputs.deb_file }}"
          R2_PREFIX="s3://${R2_BUCKET}/artifacts/rustfs/packages/nightly/"

          echo "📤 Uploading ${DEB_FILE} to ${R2_PREFIX}"
-          "${AWS_CLI}" s3 cp "${DEB_FILE}" "${R2_PREFIX}" --endpoint-url "$R2_ENDPOINT" --only-show-errors
+          aws s3 cp "${DEB_FILE}" "${R2_PREFIX}" --endpoint-url "$R2_ENDPOINT" --only-show-errors

          # Stable "latest" alias so tests can fetch the newest nightly
          # without knowing today's date.
          echo "📤 Uploading latest alias"
-          "${AWS_CLI}" s3 cp "${DEB_FILE}" "${R2_PREFIX}rustfs-nightly-latest.deb" \
+          aws s3 cp "${DEB_FILE}" "${R2_PREFIX}rustfs-nightly-latest.deb" \
            --endpoint-url "$R2_ENDPOINT" --only-show-errors

          echo "✅ R2 upload complete"

-          CANDIDATE_FILE="${RUNNER_TEMP}/nightly-candidate-${GITHUB_RUN_ID}-${GITHUB_RUN_ATTEMPT}.json"
-          jq -n --arg source_sha "${SOURCE_SHA}" \
-            --argjson build_run_id "${GITHUB_RUN_ID}" --argjson build_run_attempt "${GITHUB_RUN_ATTEMPT}" \
-            --arg package_url "${CANDIDATE_URL}" --arg package_sha256 "${DEB_SHA256}" \
-            '{schema: 1, source_sha: $source_sha, build_run_id: $build_run_id, build_run_attempt: $build_run_attempt, package_url: $package_url, package_sha256: $package_sha256}' \
-            > "${CANDIDATE_FILE}"
-          echo "candidate_file=${CANDIDATE_FILE}" >> "${GITHUB_OUTPUT}"
-
-      - name: Upload nightly candidate manifest
-        if: ${{ steps.publish.outputs.candidate_file != '' }}
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6
-        with:
-          name: nightly-candidate-${{ github.run_id }}-${{ github.run_attempt }}
-          path: ${{ steps.publish.outputs.candidate_file }}
-          if-no-files-found: error
-
  # Live-Vault lane for the rustfs-kms suite (rustfs/backlog#1774).
  #
  # RUSTFS_KMS_VAULT_TOKEN is the single switch that adds the Vault KV2 and
@@ -14,8 +14,8 @@

 # Functional chain driver: runs the ten functional suites in a fixed order
 # (upgrade -> s3 -> kms -> tier -> storage -> heal -> pool -> security ->
-# replication -> performance). Each suite attempts the next handoff even
-# when its tests fail.
+# replication, with performance on its own runner in parallel) and guarantees
+# the chain keeps moving even when individual suites fail.
 #
 # Each suite workflow can still be dispatched standalone (workflow_dispatch);
 # only chain-triggered runs forward to the next suite via repository_dispatch,
@@ -59,3 +59,16 @@ jobs:
          gh api --method POST repos/rustfs/rustfs/dispatches \
            -f event_type='rustfs-chain-upgrade' \
            -F 'client_payload[from_suite]=nightly-build'
+
+      - name: Dispatch performance suite (parallel, own runner)
+        env:
+          GH_TOKEN: ${{ secrets.PF_TESTING_GH_TOKEN }}
+        run: |
+          set -euo pipefail
+          if [ -z "${GH_TOKEN:-}" ]; then
+            echo "PF_TESTING_GH_TOKEN is not configured; cannot dispatch performance" >&2
+            exit 1
+          fi
+          gh api --method POST repos/rustfs/rustfs/dispatches \
+            -f event_type='rustfs-chain-performance' \
+            -F 'client_payload[from_suite]=nightly-build'
@@ -54,26 +54,14 @@ env:
 jobs:
  heal-test:
    runs-on: smoke-testing
+    # Requirement: a failing suite must not fail the workflow; failures
+    # are filed to rustfs/backlog and the chain continues.
+    continue-on-error: true
    timeout-minutes: 480
    # Standalone manual run, or one link of the nightly functional chain
    # (storage -> heal -> pool). Pool expansion no longer re-runs heal.
    if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' }}
    steps:
-      - name: Initialize functional evidence
-        id: evidence
-        run: |
-          set -euo pipefail
-          umask 077
-          FUNCTIONAL_ARTIFACTS_DIR="${RUNNER_TEMP}/rustfs-heal-${GITHUB_RUN_ID}-${GITHUB_RUN_ATTEMPT}"
-          mkdir -- "${FUNCTIONAL_ARTIFACTS_DIR}" "${FUNCTIONAL_ARTIFACTS_DIR}-scratch"
-          {
-            printf 'FUNCTIONAL_ARTIFACTS_DIR=%s\n' "${FUNCTIONAL_ARTIFACTS_DIR}"
-            printf 'LOG_FILE=%s/suite.log\n' "${FUNCTIONAL_ARTIFACTS_DIR}"
-            printf 'RUSTFS_WARP_LOG_FILE=%s/warp.log\n' "${FUNCTIONAL_ARTIFACTS_DIR}"
-            printf 'REPORT_FILE=%s/report.md\n' "${FUNCTIONAL_ARTIFACTS_DIR}"
-            printf 'TMPDIR=%s-scratch\n' "${FUNCTIONAL_ARTIFACTS_DIR}"
-          } >> "${GITHUB_ENV}"
-
      # auto-testing is private: clone it with the dedicated PF token (not
      # GITHUB_TOKEN) and retry transient GitHub/network failures.
      - name: Checkout auto-testing scripts (with retry)
@@ -129,7 +117,7 @@ jobs:
          else
            ARGS+=(--package-url "${{ env.RUSTFS_NIGHTLY_PACKAGE_URL }}")
          fi
-          ./auto-testing/rustfs_heal_test.sh "${ARGS[@]}" --log-file "${LOG_FILE}"
+          ./auto-testing/rustfs_heal_test.sh "${ARGS[@]}"

      - name: Preflight checks
        run: |
@@ -139,7 +127,7 @@ jobs:
          else
            ARGS+=(--package-url "${{ env.RUSTFS_NIGHTLY_PACKAGE_URL }}")
          fi
-          ./auto-testing/rustfs_heal_test.sh "${ARGS[@]}" --log-file "${LOG_FILE}"
+          ./auto-testing/rustfs_heal_test.sh "${ARGS[@]}"

      - name: Run heal test (write -> outage -> heal -> verify)
        id: test
@@ -149,10 +137,13 @@ jobs:
            --endpoint "${{ env.RUSTFS_API_ENDPOINT }}" \
            --stop-node-gb "${{ inputs.stop_node_gb || '15' }}" \
            --warp-stop-gb "${{ inputs.warp_stop_gb || '40' }}" \
-            --log-file "${LOG_FILE}"
+            --log-file /tmp/rustfs-heal-test.log

      - name: Generate report
-        if: ${{ always() && steps.evidence.outcome == 'success' }}
+        if: always()
+        env:
+          LOG_FILE: /tmp/rustfs-heal-test.log
+          REPORT_FILE: /tmp/rustfs-heal-report.md
        run: |
          set -euo pipefail
          PACKAGE_URL='${{ inputs.package_url }}'
@@ -161,99 +152,27 @@ jobs:
          else
            PACKAGE_SOURCE="${RUSTFS_NIGHTLY_PACKAGE_URL}"
          fi
-          STEPS_TABLE="${FUNCTIONAL_ARTIFACTS_DIR}/steps.md"
-          CASE_RESULT=success
-          python3 - "${LOG_FILE}" "${STEPS_TABLE}" <<'PY' || CASE_RESULT=failure
-          import re
-          import sys
-
-          log_file, out_file = sys.argv[1], sys.argv[2]
-          ansi = re.compile(r'\x1b\[[0-9;]*m')
-          step_re = re.compile(r'^\[HEAL-STEP\]\s+(\d+)\s+(.+?)\s+(PASS|FAIL|SKIP)\s*$')
-          ver_re = re.compile(r'^\[HEAL-VERSION\]\s+(\S+)(?:\s+\(node\s+(\S+)\))?\s*$')
-          result_re = re.compile(r'^\[HEAL-RESULT\]\s+(PASS|FAIL)\s+(.*)$')
-
-          steps = {}
-          order = []
-          status_rank = {'SKIP': 0, 'PASS': 1, 'FAIL': 2}
-          version = None
-          version_node = None
-          verdict = None
-          verdict_detail = ''
-          try:
-              with open(log_file, 'r', encoding='utf-8', errors='replace') as fh:
-                  for raw in fh:
-                      line = ansi.sub('', raw).strip()
-                      m = step_re.match(line)
-                      if m:
-                          n, desc, status = m.group(1), m.group(2), m.group(3)
-                          if n not in steps:
-                              order.append(n)
-                          if n not in steps or status_rank[status] > status_rank[steps[n][1]]:
-                              steps[n] = (desc, status)
-                          continue
-                      m = ver_re.match(line)
-                      if m:
-                          version, version_node = m.group(1), m.group(2)
-                          continue
-                      m = result_re.match(line)
-                      if m and verdict != 'FAIL':
-                          verdict, verdict_detail = m.group(1), m.group(2)
-          except FileNotFoundError:
-              pass
-
-          with open(out_file, 'w', encoding='utf-8') as out:
-              out.write('## Step Results\n\n')
-              if version:
-                  node_note = f' (captured via `rustfs --version` on {version_node})' if version_node else ''
-                  out.write(f'- Version under test: **{version}**{node_note}\n')
-              if verdict:
-                  out.write(f'- Overall result: **{verdict}** — {verdict_detail}\n')
-              out.write('\n')
-              out.write('| Step | Description | Result |\n')
-              out.write('| --- | --- | --- |\n')
-              for n in sorted(order, key=int):
-                  desc, status = steps[n]
-                  out.write(f'| {n} | {desc} | {status} |\n')
-              if not order:
-                  out.write('| - | - | NOT RUN (no step result lines found) |\n')
-          complete = set(steps) == {str(n) for n in range(1, 8)}
-          sys.exit(0 if complete and verdict != 'FAIL' and all(status == 'PASS' for _, status in steps.values()) else 1)
-          PY
-          RESULT=failure
-          if [ '${{ steps.test.outcome }}' = 'success' ] && [ "${CASE_RESULT}" = 'success' ]; then
-            RESULT=success
-          fi
          {
            echo "# RustFS heal test report"
            echo ""
            echo "- Run: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
-            echo "- Attempt: ${GITHUB_RUN_ATTEMPT}"
-            echo "- Workflow Commit: ${GITHUB_SHA}"
            echo "- Trigger: ${{ github.event_name }}"
            echo "- Package: ${PACKAGE_SOURCE}"
-            echo "- Test Step Outcome: ${RESULT}"
-            echo "- Suite Step Outcome: ${{ steps.test.outcome }}"
+            echo "- Test Step Outcome: ${{ steps.test.outcome }}"
            echo ""
-            if [ "${RESULT}" = "success" ]; then
-              cat "${STEPS_TABLE}"
-              echo ""
-              echo "## Log tail"
-              echo '```text'
-              tail -n 200 "${LOG_FILE}"
-              echo '```'
-            else
-              echo "The suite or evidence validation failed. See this run's artifact for partial step results and suite.log."
-            fi
+            echo "## Log tail"
+            echo '```text'
+            tail -n 200 "${LOG_FILE}" || true
+            echo '```'
          } | tee "${REPORT_FILE}"
          cat "${REPORT_FILE}" >> "${GITHUB_STEP_SUMMARY}"
-          [ "${RESULT}" = "success" ]

      - name: Upload functional report to dashboard
-        if: ${{ always() && steps.evidence.outcome == 'success' }}
+        if: always()
        continue-on-error: true
        env:
          GH_TOKEN: ${{ env.PF_TESTING_GH_TOKEN }}
+          REPORT_FILE: /tmp/rustfs-heal-report.md
          SUITE: heal
        run: |
          set -euo pipefail
@@ -263,32 +182,28 @@ jobs:
          fi
          DATE="$(date -u +%Y-%m-%d)"
          REPORT_PATH="functional-reports/${SUITE}/${DATE}.md"
-          # Base64-encode the report into a temp file and feed it to jq via
-          # --rawfile: large reports (e.g. pool) exceed the OS argv limit and
-          # make `jq --arg content "${CONTENT}"` fail with "Argument list too long".
-          B64_FILE="$(mktemp)"
-          python3 -c 'import base64,sys;print(base64.b64encode(open(sys.argv[1],"rb").read()).decode())' "${REPORT_FILE}" > "${B64_FILE}"
+          CONTENT="$(python3 -c 'import base64,sys;print(base64.b64encode(open(sys.argv[1],"rb").read()).decode())' "${REPORT_FILE}")"
          SHA="$(gh api "repos/rustfs/dashboard/contents/${REPORT_PATH}" -q '.sha' 2>/dev/null || true)"
          if [ -n "${SHA}" ]; then
-            jq -n --arg msg "report(${SUITE}): ${DATE}" --rawfile content "${B64_FILE}" --arg sha "${SHA}" \
-              '{message:$msg, content:($content|rtrimstr("\n")), sha:$sha}' \
+            jq -n --arg msg "report(${SUITE}): ${DATE}" --arg content "${CONTENT}" --arg sha "${SHA}" \
+              '{message:$msg, content:$content, sha:$sha}' \
              | gh api --method PUT "repos/rustfs/dashboard/contents/${REPORT_PATH}" --input - >/dev/null
          else
-            jq -n --arg msg "report(${SUITE}): ${DATE}" --rawfile content "${B64_FILE}" \
-              '{message:$msg, content:($content|rtrimstr("\n"))}' \
+            jq -n --arg msg "report(${SUITE}): ${DATE}" --arg content "${CONTENT}" \
+              '{message:$msg, content:$content}' \
              | gh api --method PUT "repos/rustfs/dashboard/contents/${REPORT_PATH}" --input - >/dev/null
          fi
-          rm -f "${B64_FILE}"

      - name: File failure issue in rustfs/backlog
        if: ${{ always() && (failure() || steps.test.outcome == 'failure' || steps.test.outcome == 'cancelled') }}
        continue-on-error: true
        env:
          GH_TOKEN: ${{ secrets.PF_TESTING_GH_TOKEN }}
-          EVIDENCE_OUTCOME: ${{ steps.evidence.outcome }}
          SUITE: 'heal'
          SUITE_LABEL: 'Heal'
          RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
+          REPORT_FILE: '/tmp/rustfs-heal-report.md'
+          LOG_FILE: '/tmp/rustfs-heal-test.log'
        run: |
          set -euo pipefail
          if [ -z "${GH_TOKEN:-}" ]; then
@@ -316,16 +231,14 @@ jobs:
            echo ""
            echo "- Suite: \`${SUITE}\`"
            echo "- Run: ${RUN_URL}"
-            echo "- Attempt: ${GITHUB_RUN_ATTEMPT}"
-            echo "- Workflow Commit: ${GITHUB_SHA}"
            echo "- Trigger: ${GITHUB_EVENT_NAME}"
            echo "- Date: $(date -u +%Y-%m-%d)"
            echo ""
            echo "## Report (errors and symptoms)"
            echo ""
-            if [ "${EVIDENCE_OUTCOME}" = "success" ] && [ -s "${REPORT_FILE}" ]; then
+            if [ -s "${REPORT_FILE}" ]; then
              redact < "${REPORT_FILE}"
-            elif [ "${EVIDENCE_OUTCOME}" = "success" ] && [ -s "${LOG_FILE:-}" ]; then
+            elif [ -s "${LOG_FILE:-}" ]; then
              echo "(report file missing; log tail below)"
              echo ""
              tail -n 200 "${LOG_FILE}" | redact
@@ -341,16 +254,14 @@ jobs:
          echo "filed backlog issue for suite ${SUITE}"

      - name: Upload test logs
-        if: ${{ always() && steps.evidence.outcome == 'success' }}
+        if: always()
        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6
        with:
-          name: rustfs-heal-test-${{ github.run_id }}-${{ github.run_attempt }}
+          name: rustfs-heal-test-${{ github.run_id }}
          path: |
-            ${{ env.FUNCTIONAL_ARTIFACTS_DIR }}/report.md
-            ${{ env.FUNCTIONAL_ARTIFACTS_DIR }}/suite.log
-            ${{ env.FUNCTIONAL_ARTIFACTS_DIR }}/warp.log
-            ${{ env.FUNCTIONAL_ARTIFACTS_DIR }}/steps.md
-          if-no-files-found: error
+            /tmp/rustfs-heal-test*.log
+            /tmp/rustfs-warp.*.log
+          if-no-files-found: warn

      - name: Cleanup environment (after)
        if: ${{ always() && inputs.cleanup_after != 'false' }}
@@ -49,28 +49,10 @@ env:
 jobs:
  kms-test:
    runs-on: smoke-testing
+    continue-on-error: true
    timeout-minutes: 420
    if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' }}
    steps:
-      - name: Checkout repository (for report parser)
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
-        with:
-          persist-credentials: false
-
-      - name: Initialize functional evidence
-        id: evidence
-        run: |
-          set -euo pipefail
-          umask 077
-          FUNCTIONAL_ARTIFACTS_DIR="${RUNNER_TEMP}/rustfs-kms-${GITHUB_RUN_ID}-${GITHUB_RUN_ATTEMPT}"
-          mkdir -- "${FUNCTIONAL_ARTIFACTS_DIR}" "${FUNCTIONAL_ARTIFACTS_DIR}-scratch"
-          {
-            printf 'FUNCTIONAL_ARTIFACTS_DIR=%s\n' "${FUNCTIONAL_ARTIFACTS_DIR}"
-            printf 'LOG_FILE=%s/suite.log\n' "${FUNCTIONAL_ARTIFACTS_DIR}"
-            printf 'REPORT_FILE=%s/report.md\n' "${FUNCTIONAL_ARTIFACTS_DIR}"
-            printf 'TMPDIR=%s-scratch\n' "${FUNCTIONAL_ARTIFACTS_DIR}"
-          } >> "${GITHUB_ENV}"
-
      # auto-testing is private: clone it with the dedicated PF token (not
      # GITHUB_TOKEN) and retry transient GitHub/network failures.
      - name: Checkout auto-testing scripts (with retry)
@@ -127,6 +109,9 @@ jobs:

      - name: Run KMS suite
        id: test
+        continue-on-error: true
+        env:
+          LOG_FILE: /tmp/rustfs-kms.log
        run: |
          set -euo pipefail
          chmod +x auto-testing/rustfs-kms-test.sh
@@ -156,7 +141,10 @@ jobs:
          ./auto-testing/rustfs-kms-test.sh "${ARGS[@]}"

      - name: Generate report
-        if: ${{ always() && steps.evidence.outcome == 'success' }}
+        if: always()
+        env:
+          LOG_FILE: /tmp/rustfs-kms.log
+          REPORT_FILE: /tmp/rustfs-kms-report.md
        run: |
          set -euo pipefail
          PACKAGE_URL='${{ inputs.package_url }}'
@@ -168,43 +156,79 @@ jobs:
          else
            PACKAGE_SOURCE="${RUSTFS_NIGHTLY_PACKAGE_URL}"
          fi
-          CASE_TABLE="${FUNCTIONAL_ARTIFACTS_DIR}/cases.md"
-          CASE_RESULT=success
-          python3 scripts/functional_case_report.py "${LOG_FILE}" "${CASE_TABLE}" || CASE_RESULT=failure
-          RESULT=failure
-          if [ '${{ steps.test.outcome }}' = 'success' ] && [ "${CASE_RESULT}" = 'success' ]; then
-            RESULT=success
-          fi
+          CASE_TABLE="/tmp/rustfs-kms-cases.md"
+          python3 - "${LOG_FILE}" "${CASE_TABLE}" <<'PY'
+          import re
+          import sys
+
+          log_file, out_file = sys.argv[1], sys.argv[2]
+          ansi = re.compile(r'\x1b\[[0-9;]*m')
+          start_re = re.compile(r'^---\s+([A-Z]+-[0-9]+)\s+(.+?)\s+---$')
+          done_re = re.compile(r'^\[(PASS|FAIL|UNSUPPORTED)\]\s+([A-Z]+-[0-9]+)\b')
+
+          rows = []
+          index = {}
+          try:
+            with open(log_file, 'r', encoding='utf-8', errors='replace') as fh:
+              for raw in fh:
+                line = ansi.sub('', raw).strip()
+                m = start_re.match(line)
+                if m:
+                  case_id, name = m.group(1), m.group(2)
+                  if case_id not in index:
+                    index[case_id] = len(rows)
+                    rows.append([case_id, name, 'RUNNING'])
+                  continue
+                m = done_re.match(line)
+                if m:
+                  status, case_id = m.group(1), m.group(2)
+                  if case_id in index:
+                    rows[index[case_id]][2] = status
+                  else:
+                    rows.append([case_id, case_id, status])
+                    index[case_id] = len(rows) - 1
+          except FileNotFoundError:
+            rows = []
+
+          counts = {'PASS': 0, 'FAIL': 0, 'UNSUPPORTED': 0, 'RUNNING': 0}
+          for _, _, status in rows:
+            counts[status] = counts.get(status, 0) + 1
+
+          with open(out_file, 'w', encoding='utf-8') as out:
+            out.write('## Case Summary\n\n')
+            out.write(f"- Total: {len(rows)}\\n")
+            out.write(f"- PASS: {counts.get('PASS', 0)}\\n")
+            out.write(f"- FAIL: {counts.get('FAIL', 0)}\\n")
+            out.write(f"- UNSUPPORTED: {counts.get('UNSUPPORTED', 0)}\\n")
+            out.write('\\n')
+            out.write('| Case | Name | Status |\\n')
+            out.write('| --- | --- | --- |\\n')
+            for case_id, name, status in rows:
+              out.write(f'| {case_id} | {name} | {status} |\\n')
+          PY
          {
            echo "# RustFS KMS test report"
            echo ""
            echo "- Run: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
-            echo "- Attempt: ${GITHUB_RUN_ATTEMPT}"
-            echo "- Workflow Commit: ${GITHUB_SHA}"
            echo "- Trigger: ${{ github.event_name }}"
            echo "- Package: ${PACKAGE_SOURCE}"
-            echo "- Test Step Outcome: ${RESULT}"
-            echo "- Suite Step Outcome: ${{ steps.test.outcome }}"
+            echo "- Test Step Outcome: ${{ steps.test.outcome }}"
            echo ""
-            if [ "${RESULT}" = "success" ]; then
-              cat "${CASE_TABLE}"
-              echo ""
-              echo "## Log tail"
-              echo '```text'
-              tail -n 200 "${LOG_FILE}"
-              echo '```'
-            else
-              echo "The suite or evidence validation failed. See this run's artifact for partial case results and suite.log."
-            fi
+            cat "${CASE_TABLE}" || true
+            echo ""
+            echo "## Log tail"
+            echo '```text'
+            tail -n 200 "${LOG_FILE}" || true
+            echo '```'
          } | tee "${REPORT_FILE}"
          cat "${REPORT_FILE}" >> "${GITHUB_STEP_SUMMARY}"
-          [ "${RESULT}" = "success" ]

      - name: Upload functional report to dashboard
-        if: ${{ always() && steps.evidence.outcome == 'success' }}
+        if: always()
        continue-on-error: true
        env:
          GH_TOKEN: ${{ env.PF_TESTING_GH_TOKEN }}
+          REPORT_FILE: /tmp/rustfs-kms-report.md
          SUITE: kms
        run: |
          set -euo pipefail
@@ -214,32 +238,28 @@ jobs:
          fi
          DATE="$(date -u +%Y-%m-%d)"
          REPORT_PATH="functional-reports/${SUITE}/${DATE}.md"
-          # Base64-encode the report into a temp file and feed it to jq via
-          # --rawfile: large reports (e.g. pool) exceed the OS argv limit and
-          # make `jq --arg content "${CONTENT}"` fail with "Argument list too long".
-          B64_FILE="$(mktemp)"
-          python3 -c 'import base64,sys;print(base64.b64encode(open(sys.argv[1],"rb").read()).decode())' "${REPORT_FILE}" > "${B64_FILE}"
+          CONTENT="$(python3 -c 'import base64,sys;print(base64.b64encode(open(sys.argv[1],"rb").read()).decode())' "${REPORT_FILE}")"
          SHA="$(gh api "repos/rustfs/dashboard/contents/${REPORT_PATH}" -q '.sha' 2>/dev/null || true)"
          if [ -n "${SHA}" ]; then
-            jq -n --arg msg "report(${SUITE}): ${DATE}" --rawfile content "${B64_FILE}" --arg sha "${SHA}" \
-              '{message:$msg, content:($content|rtrimstr("\n")), sha:$sha}' \
+            jq -n --arg msg "report(${SUITE}): ${DATE}" --arg content "${CONTENT}" --arg sha "${SHA}" \
+              '{message:$msg, content:$content, sha:$sha}' \
              | gh api --method PUT "repos/rustfs/dashboard/contents/${REPORT_PATH}" --input - >/dev/null
          else
-            jq -n --arg msg "report(${SUITE}): ${DATE}" --rawfile content "${B64_FILE}" \
-              '{message:$msg, content:($content|rtrimstr("\n"))}' \
+            jq -n --arg msg "report(${SUITE}): ${DATE}" --arg content "${CONTENT}" \
+              '{message:$msg, content:$content}' \
              | gh api --method PUT "repos/rustfs/dashboard/contents/${REPORT_PATH}" --input - >/dev/null
          fi
-          rm -f "${B64_FILE}"

      - name: File failure issue in rustfs/backlog
        if: ${{ always() && (failure() || steps.test.outcome == 'failure' || steps.test.outcome == 'cancelled') }}
        continue-on-error: true
        env:
          GH_TOKEN: ${{ secrets.PF_TESTING_GH_TOKEN }}
-          EVIDENCE_OUTCOME: ${{ steps.evidence.outcome }}
          SUITE: 'kms'
          SUITE_LABEL: 'KMS'
          RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
+          REPORT_FILE: '/tmp/rustfs-kms-report.md'
+          LOG_FILE: '/tmp/rustfs-kms.log'
        run: |
          set -euo pipefail
          if [ -z "${GH_TOKEN:-}" ]; then
@@ -267,16 +287,14 @@ jobs:
            echo ""
            echo "- Suite: \`${SUITE}\`"
            echo "- Run: ${RUN_URL}"
-            echo "- Attempt: ${GITHUB_RUN_ATTEMPT}"
-            echo "- Workflow Commit: ${GITHUB_SHA}"
            echo "- Trigger: ${GITHUB_EVENT_NAME}"
            echo "- Date: $(date -u +%Y-%m-%d)"
            echo ""
            echo "## Report (errors and symptoms)"
            echo ""
-            if [ "${EVIDENCE_OUTCOME}" = "success" ] && [ -s "${REPORT_FILE}" ]; then
+            if [ -s "${REPORT_FILE}" ]; then
              redact < "${REPORT_FILE}"
-            elif [ "${EVIDENCE_OUTCOME}" = "success" ] && [ -s "${LOG_FILE:-}" ]; then
+            elif [ -s "${LOG_FILE:-}" ]; then
              echo "(report file missing; log tail below)"
              echo ""
              tail -n 200 "${LOG_FILE}" | redact
@@ -292,15 +310,14 @@ jobs:
          echo "filed backlog issue for suite ${SUITE}"

      - name: Upload report and logs
-        if: ${{ always() && steps.evidence.outcome == 'success' }}
+        if: always()
        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6
        with:
-          name: rustfs-kms-test-${{ github.run_id }}-${{ github.run_attempt }}
+          name: rustfs-kms-test-${{ github.run_id }}
          path: |
-            ${{ env.FUNCTIONAL_ARTIFACTS_DIR }}/report.md
-            ${{ env.FUNCTIONAL_ARTIFACTS_DIR }}/suite.log
-            ${{ env.FUNCTIONAL_ARTIFACTS_DIR }}/cases.md
-          if-no-files-found: error
+            /tmp/rustfs-kms.log
+            /tmp/rustfs-kms-report.md
+          if-no-files-found: warn

      - name: Cleanup environment (after)
        if: always()
@@ -49,16 +49,17 @@ on:
        type: boolean
        default: true
  repository_dispatch:
-    # Chain handoff: dispatched when the replication suite finishes.
+    # Chain entry: dispatched by rustfs-functional-chain.yml (runs on its own
+    # pf-testing runner, in parallel with the shared-VM chain).
    types: [rustfs-chain-performance]

 permissions:
  contents: read

-# The default performance nodes overlap the other suites' remote VMs, even
-# though the runner differs. Hold the shared lock through cleanup as well.
+# Dedicated pf-testing runner/environment: own concurrency group so perf runs
+# never block (or are blocked by) the pool-expansion / heal tests.
 concurrency:
-  group: rustfs-shared-functional-tests
+  group: rustfs-performance-test
  cancel-in-progress: false

 defaults:
@@ -75,33 +76,22 @@ env:
  # Package used by the nightly run (workflow_dispatch inputs are empty for
  # workflow_run events), i.e. the latest nightly deb published by nightly-gnu.yml.
  RUSTFS_NIGHTLY_PACKAGE_URL: ${{ vars.RUSTFS_NIGHTLY_PACKAGE_URL || 'https://dl.rustfs.com/artifacts/rustfs/packages/nightly/rustfs-nightly-latest.deb' }}
+  # Fixed benchmark result directory so later steps can read summary.md
+  RUSTFS_RESULT_DIR: /tmp/rustfs-perf-results
  # Cross-repo token for uploading reports to rustfs/dashboard (set in repo settings)
  PF_TESTING_GH_TOKEN: ${{ secrets.PF_TESTING_GH_TOKEN }}

 jobs:
  performance-test:
    runs-on: pf-testing
+    # Requirement: a failing benchmark must not fail the workflow;
+    # failures are filed to rustfs/backlog.
+    continue-on-error: true
    timeout-minutes: 900
    # Run on manual dispatch, or when the nightly build completed successfully.
    # Skipped when nightly failed.
    if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' }}
    steps:
-      - name: Initialize functional evidence
-        id: evidence
-        run: |
-          set -euo pipefail
-          umask 077
-          FUNCTIONAL_ARTIFACTS_DIR="${RUNNER_TEMP}/rustfs-performance-${GITHUB_RUN_ID}-${GITHUB_RUN_ATTEMPT}"
-          mkdir -- "${FUNCTIONAL_ARTIFACTS_DIR}" "${FUNCTIONAL_ARTIFACTS_DIR}-scratch"
-          {
-            printf 'FUNCTIONAL_ARTIFACTS_DIR=%s\n' "${FUNCTIONAL_ARTIFACTS_DIR}"
-            printf 'LOG_FILE=%s/suite.log\n' "${FUNCTIONAL_ARTIFACTS_DIR}"
-            printf 'REPORT_FILE=%s/report.md\n' "${FUNCTIONAL_ARTIFACTS_DIR}"
-            printf 'TMPDIR=%s-scratch\n' "${FUNCTIONAL_ARTIFACTS_DIR}"
-            printf 'RUSTFS_RESULT_DIR=%s/results\n' "${FUNCTIONAL_ARTIFACTS_DIR}"
-            printf 'VERSION_FILE=%s/version.txt\n' "${FUNCTIONAL_ARTIFACTS_DIR}"
-          } >> "${GITHUB_ENV}"
-
      # auto-testing is private: clone it with the dedicated PF token (not
      # GITHUB_TOKEN) and retry transient GitHub/network failures.
      - name: Checkout auto-testing scripts (with retry)
@@ -133,7 +123,7 @@ jobs:
        if: ${{ inputs.cleanup_before != 'false' }}
        run: |
          chmod +x auto-testing/rustfs_performance_test.sh
-          ./auto-testing/rustfs_performance_test.sh --step 1 -y --log-file "${LOG_FILE:-/dev/null}"
+          ./auto-testing/rustfs_performance_test.sh --step 1 -y

      - name: Install RustFS package & start cluster (4x4)
        run: |
@@ -143,7 +133,7 @@ jobs:
          else
            ARGS+=(--package-url "${{ env.RUSTFS_NIGHTLY_PACKAGE_URL }}")
          fi
-          ./auto-testing/rustfs_performance_test.sh "${ARGS[@]}" --log-file "${LOG_FILE}"
+          ./auto-testing/rustfs_performance_test.sh "${ARGS[@]}"

      - name: Preflight checks
        run: |
@@ -153,7 +143,7 @@ jobs:
          else
            ARGS+=(--package-url "${{ env.RUSTFS_NIGHTLY_PACKAGE_URL }}")
          fi
-          ./auto-testing/rustfs_performance_test.sh "${ARGS[@]}" --log-file "${LOG_FILE}"
+          ./auto-testing/rustfs_performance_test.sh "${ARGS[@]}"

      - name: Run benchmark (GET/PUT/MIXED)
        id: benchmark
@@ -166,15 +156,17 @@ jobs:
            --step 5 -y \
            --warp-duration "${{ inputs.warp_duration || '5m' }}" \
            --warp-concurrency "${{ inputs.warp_concurrency || '64' }}" \
-            --log-file "${LOG_FILE}"
+            --log-file /tmp/rustfs-perf-test.log

      - name: Analyze results
        if: ${{ steps.benchmark.conclusion == 'success' }}
        run: |
-          ./auto-testing/rustfs_performance_test.sh --step 6 -y --log-file "${LOG_FILE:-/dev/null}"
+          ./auto-testing/rustfs_performance_test.sh --step 6 -y

      - name: Collect RustFS version info
        if: ${{ steps.benchmark.conclusion == 'success' }}
+        env:
+          VERSION_FILE: /tmp/rustfs-version.txt
        run: |
          set -euo pipefail
          read -r -a NODES <<< "${RUSTFS_NODES}"
@@ -194,6 +186,7 @@ jobs:
        env:
          GH_TOKEN: ${{ env.PF_TESTING_GH_TOKEN }}
          RESULT_DIR: ${{ env.RUSTFS_RESULT_DIR }}
+          VERSION_FILE: /tmp/rustfs-version.txt
        run: |
          set -euo pipefail
          if [ -z "${GH_TOKEN:-}" ]; then
@@ -201,7 +194,7 @@ jobs:
            exit 0
          fi
          SUMMARY="${RESULT_DIR}/summary.md"
-          [ -s "${SUMMARY}" ] || { echo "summary.md not found at ${SUMMARY}"; exit 1; }
+          [ -f "${SUMMARY}" ] || { echo "summary.md not found at ${SUMMARY}"; exit 1; }
          DATE="$(date -u +%Y-%m-%d)"
          REPORT_PATH="reports/${DATE}.md"
          {
@@ -209,8 +202,6 @@ jobs:
            echo ""
            echo "- **Date**: ${DATE}"
            echo "- **Run**: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
-            echo "- **Attempt**: ${GITHUB_RUN_ATTEMPT}"
-            echo "- **Workflow Commit**: ${GITHUB_SHA}"
            echo "- **Trigger**: ${{ github.event_name }}"
            echo "- **Package**: ${{ inputs.package_url || 'nightly (R2 latest)' }}"
            echo ""
@@ -220,8 +211,8 @@ jobs:
            echo '```text'
            cat "${VERSION_FILE}"
            echo '```'
-          } > "${REPORT_FILE}"
-          CONTENT="$(python3 -c 'import base64,sys; print(base64.b64encode(open(sys.argv[1],"rb").read()).decode())' "${REPORT_FILE}")"
+          } > /tmp/rustfs-perf-report.md
+          CONTENT="$(python3 -c 'import base64; print(base64.b64encode(open("/tmp/rustfs-perf-report.md","rb").read()).decode())')"
          SHA="$(gh api "repos/rustfs/dashboard/contents/${REPORT_PATH}" -q '.sha' 2>/dev/null || true)"
          if [ -n "${SHA}" ]; then
            jq -n --arg msg "report: ${DATE}" --arg content "${CONTENT}" --arg sha "${SHA}" \
@@ -240,10 +231,11 @@ jobs:
        continue-on-error: true
        env:
          GH_TOKEN: ${{ secrets.PF_TESTING_GH_TOKEN }}
-          EVIDENCE_OUTCOME: ${{ steps.evidence.outcome }}
          SUITE: 'performance'
          SUITE_LABEL: 'Performance'
          RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
+          REPORT_FILE: '/tmp/rustfs-perf-report.md'
+          LOG_FILE: '/tmp/rustfs-perf-test.log'
        run: |
          set -euo pipefail
          if [ -z "${GH_TOKEN:-}" ]; then
@@ -271,16 +263,14 @@ jobs:
            echo ""
            echo "- Suite: \`${SUITE}\`"
            echo "- Run: ${RUN_URL}"
-            echo "- Attempt: ${GITHUB_RUN_ATTEMPT}"
-            echo "- Workflow Commit: ${GITHUB_SHA}"
            echo "- Trigger: ${GITHUB_EVENT_NAME}"
            echo "- Date: $(date -u +%Y-%m-%d)"
            echo ""
            echo "## Report (errors and symptoms)"
            echo ""
-            if [ "${EVIDENCE_OUTCOME}" = "success" ] && [ -s "${REPORT_FILE}" ]; then
+            if [ -s "${REPORT_FILE}" ]; then
              redact < "${REPORT_FILE}"
-            elif [ "${EVIDENCE_OUTCOME}" = "success" ] && [ -s "${LOG_FILE:-}" ]; then
+            elif [ -s "${LOG_FILE:-}" ]; then
              echo "(report file missing; log tail below)"
              echo ""
              tail -n 200 "${LOG_FILE}" | redact
@@ -296,26 +286,20 @@ jobs:
          echo "filed backlog issue for suite ${SUITE}"

      - name: Upload test logs & results
-        if: ${{ always() && steps.evidence.outcome == 'success' }}
+        if: always()
        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6
        with:
-          name: rustfs-perf-test-${{ github.run_id }}-${{ github.run_attempt }}
+          name: rustfs-perf-test-${{ github.run_id }}
          path: |
-            ${{ env.FUNCTIONAL_ARTIFACTS_DIR }}/report.md
-            ${{ env.FUNCTIONAL_ARTIFACTS_DIR }}/suite.log
-            ${{ env.FUNCTIONAL_ARTIFACTS_DIR }}/version.txt
-            ${{ env.FUNCTIONAL_ARTIFACTS_DIR }}/results/master.log
-            ${{ env.FUNCTIONAL_ARTIFACTS_DIR }}/results/summary.md
-            ${{ env.FUNCTIONAL_ARTIFACTS_DIR }}/results/summary.tsv
-            ${{ env.FUNCTIONAL_ARTIFACTS_DIR }}/results/get_*.txt
-            ${{ env.FUNCTIONAL_ARTIFACTS_DIR }}/results/put_*.txt
-            ${{ env.FUNCTIONAL_ARTIFACTS_DIR }}/results/mixed_*.txt
-          if-no-files-found: error
+            /tmp/rustfs-perf-test*.log
+            /tmp/rustfs-perf-results/**
+            /tmp/rustfs-version.txt
+          if-no-files-found: warn

      - name: Reset test environment (after)
        if: ${{ always() && inputs.cleanup_after != 'false' }}
        run: |
-          ./auto-testing/rustfs_performance_test.sh --step 7 -y --log-file "${LOG_FILE:-/dev/null}"
+          ./auto-testing/rustfs_performance_test.sh --step 7 -y

      - name: Notify on failure
        if: failure()
@@ -76,6 +76,9 @@ jobs:
  pool-expansion-test:
    name: Pool expansion / decommission test
    runs-on: smoke-testing
+    # Requirement: a failing suite must not fail the workflow; failures
+    # are filed to rustfs/backlog and the chain continues.
+    continue-on-error: true
    timeout-minutes: 360
    if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' }}
    env:
@@ -377,60 +380,6 @@ jobs:
          else
            PACKAGE_SOURCE="${RUSTFS_NIGHTLY_PACKAGE_URL}"
          fi
-          STEPS_TABLE="${POOL_ARTIFACT_DIR}/pool-steps.md"
-          python3 - "${LOG_FILE}" "${STEPS_TABLE}" <<'PY'
-          import re
-          import sys
-
-          log_file, out_file = sys.argv[1], sys.argv[2]
-          ansi = re.compile(r'\x1b\[[0-9;]*m')
-          step_re = re.compile(r'^\[POOL-STEP\]\s+(\d+)\s+(.+?)\s+(PASS|FAIL|SKIP)\s*$')
-          ver_re = re.compile(r'^\[POOL-VERSION\]\s+(\S+)(?:\s+\(node\s+(\S+)\))?\s*$')
-          result_re = re.compile(r'^\[POOL-RESULT\]\s+(PASS|FAIL)\s+(.*)$')
-
-          steps = {}
-          order = []
-          version = None
-          version_node = None
-          verdict = None
-          verdict_detail = ''
-          try:
-              with open(log_file, 'r', encoding='utf-8', errors='replace') as fh:
-                  for raw in fh:
-                      line = ansi.sub('', raw).strip()
-                      m = step_re.match(line)
-                      if m:
-                          n, desc, status = m.group(1), m.group(2), m.group(3)
-                          if n not in steps:
-                              order.append(n)
-                          steps[n] = (desc, status)  # later lines win (fail after pass)
-                          continue
-                      m = ver_re.match(line)
-                      if m:
-                          version, version_node = m.group(1), m.group(2)
-                          continue
-                      m = result_re.match(line)
-                      if m:
-                          verdict, verdict_detail = m.group(1), m.group(2)
-          except FileNotFoundError:
-              pass
-
-          with open(out_file, 'w', encoding='utf-8') as out:
-              out.write('## Step Results\n\n')
-              if version:
-                  node_note = f' (captured via `rustfs --version` on {version_node})' if version_node else ''
-                  out.write(f'- Version under test: **{version}**{node_note}\n')
-              if verdict:
-                  out.write(f'- Overall result: **{verdict}** — {verdict_detail}\n')
-              out.write('\n')
-              out.write('| Step | Description | Result |\n')
-              out.write('| --- | --- | --- |\n')
-              for n in sorted(order, key=int):
-                  desc, status = steps[n]
-                  out.write(f'| {n} | {desc} | {status} |\n')
-              if not order:
-                  out.write('| - | - | NOT RUN (no step result lines found) |\n')
-          PY
          {
            echo "# RustFS pool expansion test report"
            echo ""
@@ -440,8 +389,6 @@ jobs:
            echo "- Warp concurrent: ${{ inputs.warp_concurrent || '32' }}"
            echo "- Test Step Outcome: ${{ steps.pool_test.outcome }}"
            echo ""
-            cat "${STEPS_TABLE}" || true
-            echo ""
            echo "## Log tail"
            echo '```text'
            tail -n 200 "${LOG_FILE}" || true
@@ -539,22 +486,17 @@ jobs:
          fi
          DATE="$(date -u +%Y-%m-%d)"
          REPORT_PATH="functional-reports/${SUITE}/${DATE}.md"
-          # Base64-encode the report into a temp file and feed it to jq via
-          # --rawfile: large reports (e.g. pool) exceed the OS argv limit and
-          # make `jq --arg content "${CONTENT}"` fail with "Argument list too long".
-          B64_FILE="$(mktemp)"
-          python3 -c 'import base64,sys;print(base64.b64encode(open(sys.argv[1],"rb").read()).decode())' "${REPORT_FILE}" > "${B64_FILE}"
+          CONTENT="$(python3 -c 'import base64,sys;print(base64.b64encode(open(sys.argv[1],"rb").read()).decode())' "${REPORT_FILE}")"
          SHA="$(gh api "repos/rustfs/dashboard/contents/${REPORT_PATH}" -q '.sha' 2>/dev/null || true)"
          if [ -n "${SHA}" ]; then
-            jq -n --arg msg "report(${SUITE}): ${DATE}" --rawfile content "${B64_FILE}" --arg sha "${SHA}" \
-              '{message:$msg, content:($content|rtrimstr("\n")), sha:$sha}' \
+            jq -n --arg msg "report(${SUITE}): ${DATE}" --arg content "${CONTENT}" --arg sha "${SHA}" \
+              '{message:$msg, content:$content, sha:$sha}' \
              | gh api --method PUT "repos/rustfs/dashboard/contents/${REPORT_PATH}" --input - >/dev/null
          else
-            jq -n --arg msg "report(${SUITE}): ${DATE}" --rawfile content "${B64_FILE}" \
-              '{message:$msg, content:($content|rtrimstr("\n"))}' \
+            jq -n --arg msg "report(${SUITE}): ${DATE}" --arg content "${CONTENT}" \
+              '{message:$msg, content:$content}' \
              | gh api --method PUT "repos/rustfs/dashboard/contents/${REPORT_PATH}" --input - >/dev/null
          fi
-          rm -f "${B64_FILE}"

      - name: File failure issue in rustfs/backlog
        if: ${{ always() && (failure() || steps.pool_test.outcome == 'failure' || steps.pool_test.outcome == 'cancelled') }}
@@ -34,7 +34,8 @@ on:
          - site
        default: all
  repository_dispatch:
-    # Chain handoff: dispatched when the security suite finishes.
+    # Chain handoff: dispatched when the security suite finishes. This is the
+    # last link of the functional chain.
    types: [rustfs-chain-replication]

 permissions:
@@ -61,28 +62,12 @@ env:
 jobs:
  replication-test:
    runs-on: smoke-testing
+    # A failed replication run must not break the chain or the workflow: the
+    # failure is reported to rustfs/backlog instead (see the issue step).
+    continue-on-error: true
    timeout-minutes: 360
    if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' }}
    steps:
-      - name: Checkout repository (for report parser)
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
-        with:
-          persist-credentials: false
-
-      - name: Initialize functional evidence
-        id: evidence
-        run: |
-          set -euo pipefail
-          umask 077
-          FUNCTIONAL_ARTIFACTS_DIR="${RUNNER_TEMP}/rustfs-replication-${GITHUB_RUN_ID}-${GITHUB_RUN_ATTEMPT}"
-          mkdir -- "${FUNCTIONAL_ARTIFACTS_DIR}" "${FUNCTIONAL_ARTIFACTS_DIR}-scratch"
-          {
-            printf 'FUNCTIONAL_ARTIFACTS_DIR=%s\n' "${FUNCTIONAL_ARTIFACTS_DIR}"
-            printf 'LOG_FILE=%s/suite.log\n' "${FUNCTIONAL_ARTIFACTS_DIR}"
-            printf 'REPORT_FILE=%s/report.md\n' "${FUNCTIONAL_ARTIFACTS_DIR}"
-            printf 'TMPDIR=%s-scratch\n' "${FUNCTIONAL_ARTIFACTS_DIR}"
-          } >> "${GITHUB_ENV}"
-
      # auto-testing is private: clone it with the dedicated PF token (not
      # GITHUB_TOKEN) and retry transient GitHub/network failures.
      - name: Checkout auto-testing scripts (with retry)
@@ -131,6 +116,9 @@ jobs:

      - name: Run replication suite
        id: test
+        continue-on-error: true
+        env:
+          LOG_FILE: /tmp/rustfs-replication.log
        run: |
          set -euo pipefail
          chmod +x auto-testing/rustfs-replication-test.sh
@@ -153,7 +141,10 @@ jobs:
          ./auto-testing/rustfs-replication-test.sh "${ARGS[@]}"

      - name: Generate report
-        if: ${{ always() && steps.evidence.outcome == 'success' }}
+        if: always()
+        env:
+          LOG_FILE: /tmp/rustfs-replication.log
+          REPORT_FILE: /tmp/rustfs-replication-report.md
        run: |
          set -euo pipefail
          PACKAGE_URL='${{ inputs.package_url }}'
@@ -175,44 +166,80 @@ jobs:
              RUSTFS_VERSION_INFO="${DETECTED_VERSION}"
            fi
          fi
-          CASE_TABLE="${FUNCTIONAL_ARTIFACTS_DIR}/cases.md"
-          CASE_RESULT=success
-          python3 scripts/functional_case_report.py "${LOG_FILE}" "${CASE_TABLE}" || CASE_RESULT=failure
-          RESULT=failure
-          if [ '${{ steps.test.outcome }}' = 'success' ] && [ "${CASE_RESULT}" = 'success' ]; then
-            RESULT=success
-          fi
+          CASE_TABLE="/tmp/rustfs-replication-cases.md"
+          python3 - "${LOG_FILE}" "${CASE_TABLE}" <<'PY'
+          import re
+          import sys
+
+          log_file, out_file = sys.argv[1], sys.argv[2]
+          ansi = re.compile(r'\x1b\[[0-9;]*m')
+          start_re = re.compile(r'^---\s+([A-Z0-9]+-[0-9]+)\s+(.+?)\s+---$')
+          done_re = re.compile(r'^\[(PASS|FAIL|UNSUPPORTED)\]\s+([A-Z0-9]+-[0-9]+)\b')
+
+          rows = []
+          index = {}
+          try:
+              with open(log_file, 'r', encoding='utf-8', errors='replace') as fh:
+                  for raw in fh:
+                      line = ansi.sub('', raw).strip()
+                      m = start_re.match(line)
+                      if m:
+                          case_id, name = m.group(1), m.group(2)
+                          if case_id not in index:
+                              index[case_id] = len(rows)
+                              rows.append([case_id, name, 'RUNNING'])
+                          continue
+                      m = done_re.match(line)
+                      if m:
+                          status, case_id = m.group(1), m.group(2)
+                          if case_id in index:
+                              rows[index[case_id]][2] = status
+                          else:
+                              rows.append([case_id, case_id, status])
+                              index[case_id] = len(rows) - 1
+          except FileNotFoundError:
+              rows = []
+
+          counts = {'PASS': 0, 'FAIL': 0, 'UNSUPPORTED': 0, 'RUNNING': 0}
+          for _, _, status in rows:
+              counts[status] = counts.get(status, 0) + 1
+
+          with open(out_file, 'w', encoding='utf-8') as out:
+              out.write('## Case Summary\n\n')
+              out.write(f"- Total: {len(rows)}\\n")
+              out.write(f"- PASS: {counts.get('PASS', 0)}\\n")
+              out.write(f"- FAIL: {counts.get('FAIL', 0)}\\n")
+              out.write(f"- UNSUPPORTED: {counts.get('UNSUPPORTED', 0)}\\n")
+              out.write('\\n')
+              out.write('| Case | Name | Status |\\n')
+              out.write('| --- | --- | --- |\\n')
+              for case_id, name, status in rows:
+                  out.write(f'| {case_id} | {name} | {status} |\\n')
+          PY
          {
            echo "# RustFS replication test report"
            echo ""
            echo "- Run: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
-            echo "- Attempt: ${GITHUB_RUN_ATTEMPT}"
-            echo "- Workflow Commit: ${GITHUB_SHA}"
            echo "- Trigger: ${{ github.event_name }}"
            echo "- Package: ${PACKAGE_SOURCE}"
            echo "- RustFS Version: ${RUSTFS_VERSION_INFO}"
-            echo "- Test Step Outcome: ${RESULT}"
-            echo "- Suite Step Outcome: ${{ steps.test.outcome }}"
+            echo "- Test Step Outcome: ${{ steps.test.outcome }}"
            echo ""
-            if [ "${RESULT}" = "success" ]; then
-              cat "${CASE_TABLE}"
-              echo ""
-              echo "## Log tail"
-              echo '```text'
-              tail -n 200 "${LOG_FILE}"
-              echo '```'
-            else
-              echo "The suite or evidence validation failed. See this run's artifact for partial case results and suite.log."
-            fi
+            cat "${CASE_TABLE}" || true
+            echo ""
+            echo "## Log tail"
+            echo '```text'
+            tail -n 200 "${LOG_FILE}" || true
+            echo '```'
          } | tee "${REPORT_FILE}"
          cat "${REPORT_FILE}" >> "${GITHUB_STEP_SUMMARY}"
-          [ "${RESULT}" = "success" ]

      - name: Upload functional report to dashboard
-        if: ${{ always() && steps.evidence.outcome == 'success' }}
+        if: always()
        continue-on-error: true
        env:
          GH_TOKEN: ${{ env.PF_TESTING_GH_TOKEN }}
+          REPORT_FILE: /tmp/rustfs-replication-report.md
          SUITE: replication
        run: |
          set -euo pipefail
@@ -222,32 +249,28 @@ jobs:
          fi
          DATE="$(date -u +%Y-%m-%d)"
          REPORT_PATH="functional-reports/${SUITE}/${DATE}.md"
-          # Base64-encode the report into a temp file and feed it to jq via
-          # --rawfile: large reports (e.g. pool) exceed the OS argv limit and
-          # make `jq --arg content "${CONTENT}"` fail with "Argument list too long".
-          B64_FILE="$(mktemp)"
-          python3 -c 'import base64,sys;print(base64.b64encode(open(sys.argv[1],"rb").read()).decode())' "${REPORT_FILE}" > "${B64_FILE}"
+          CONTENT="$(python3 -c 'import base64,sys;print(base64.b64encode(open(sys.argv[1],"rb").read()).decode())' "${REPORT_FILE}")"
          SHA="$(gh api "repos/rustfs/dashboard/contents/${REPORT_PATH}" -q '.sha' 2>/dev/null || true)"
          if [ -n "${SHA}" ]; then
-            jq -n --arg msg "report(${SUITE}): ${DATE}" --rawfile content "${B64_FILE}" --arg sha "${SHA}" \
-              '{message:$msg, content:($content|rtrimstr("\n")), sha:$sha}' \
+            jq -n --arg msg "report(${SUITE}): ${DATE}" --arg content "${CONTENT}" --arg sha "${SHA}" \
+              '{message:$msg, content:$content, sha:$sha}' \
              | gh api --method PUT "repos/rustfs/dashboard/contents/${REPORT_PATH}" --input - >/dev/null
          else
-            jq -n --arg msg "report(${SUITE}): ${DATE}" --rawfile content "${B64_FILE}" \
-              '{message:$msg, content:($content|rtrimstr("\n"))}' \
+            jq -n --arg msg "report(${SUITE}): ${DATE}" --arg content "${CONTENT}" \
+              '{message:$msg, content:$content}' \
              | gh api --method PUT "repos/rustfs/dashboard/contents/${REPORT_PATH}" --input - >/dev/null
          fi
-          rm -f "${B64_FILE}"

      - name: File failure issue in rustfs/backlog
        if: ${{ always() && (failure() || steps.test.outcome == 'failure' || steps.test.outcome == 'cancelled') }}
        continue-on-error: true
        env:
          GH_TOKEN: ${{ secrets.PF_TESTING_GH_TOKEN }}
-          EVIDENCE_OUTCOME: ${{ steps.evidence.outcome }}
          SUITE: 'replication'
          SUITE_LABEL: 'Replication (bucket + site)'
          RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
+          REPORT_FILE: '/tmp/rustfs-replication-report.md'
+          LOG_FILE: '/tmp/rustfs-replication.log'
        run: |
          set -euo pipefail
          if [ -z "${GH_TOKEN:-}" ]; then
@@ -275,16 +298,14 @@ jobs:
            echo ""
            echo "- Suite: \`${SUITE}\`"
            echo "- Run: ${RUN_URL}"
-            echo "- Attempt: ${GITHUB_RUN_ATTEMPT}"
-            echo "- Workflow Commit: ${GITHUB_SHA}"
            echo "- Trigger: ${GITHUB_EVENT_NAME}"
            echo "- Date: $(date -u +%Y-%m-%d)"
            echo ""
            echo "## Report (errors and symptoms)"
            echo ""
-            if [ "${EVIDENCE_OUTCOME}" = "success" ] && [ -s "${REPORT_FILE}" ]; then
+            if [ -s "${REPORT_FILE}" ]; then
              redact < "${REPORT_FILE}"
-            elif [ "${EVIDENCE_OUTCOME}" = "success" ] && [ -s "${LOG_FILE:-}" ]; then
+            elif [ -s "${LOG_FILE:-}" ]; then
              echo "(report file missing; log tail below)"
              echo ""
              tail -n 200 "${LOG_FILE}" | redact
@@ -300,15 +321,14 @@ jobs:
          echo "filed backlog issue for suite ${SUITE}"

      - name: Upload report and logs
-        if: ${{ always() && steps.evidence.outcome == 'success' }}
+        if: always()
        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6
        with:
-          name: rustfs-replication-${{ github.run_id }}-${{ github.run_attempt }}
+          name: rustfs-replication-${{ github.run_id }}
          path: |
-            ${{ env.FUNCTIONAL_ARTIFACTS_DIR }}/report.md
-            ${{ env.FUNCTIONAL_ARTIFACTS_DIR }}/suite.log
-            ${{ env.FUNCTIONAL_ARTIFACTS_DIR }}/cases.md
-          if-no-files-found: error
+            /tmp/rustfs-replication.log
+            /tmp/rustfs-replication-report.md
+          if-no-files-found: warn

      - name: Cleanup environment (after)
        if: always()
@@ -329,50 +349,13 @@ jobs:
            '
          done

-      - name: "Continue functional chain (next: Performance)"
+      - name: Chain complete
+        # Replication is the last link of the functional chain: nothing to
+        # dispatch after it. This step just records that the chain finished.
        if: ${{ always() && github.event_name == 'repository_dispatch' }}
-        env:
-          GH_TOKEN: ${{ secrets.PF_TESTING_GH_TOKEN }}
        run: |
-          set -uo pipefail
-          if [ -z "${GH_TOKEN:-}" ]; then
-            echo "PF_TESTING_GH_TOKEN is not configured; cannot dispatch the next suite" >&2
-            exit 1
-          fi
-          DISPATCHED=0
-          for attempt in 1 2 3; do
-            if gh api --method POST repos/rustfs/rustfs/dispatches \
-              -f event_type='rustfs-chain-performance' \
-              -F 'client_payload[from_suite]=replication'; then
-              echo "dispatched next suite Performance (attempt ${attempt})"
-              DISPATCHED=1
-              break
-            fi
-            echo "dispatch attempt ${attempt} failed; retrying in ${attempt}0s" >&2
-            sleep "${attempt}0"
-          done
-          if [ "${DISPATCHED:-0}" -ne 1 ]; then
-            echo "ERROR: functional chain stalled: could not dispatch Performance after 3 attempts" >&2
-            TITLE="[functional][chain] stalled after replication (run ${GITHUB_RUN_ID})"
-            BODY_FILE="$(mktemp)"
-            trap 'rm -f "${BODY_FILE}"' EXIT
-            {
-              echo "The functional chain could not hand off from **replication** to **Performance** after 3 attempts."
-              echo ""
-              echo "- Failed suite job: ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}"
-              echo "- Expected next event: 'rustfs-chain-performance'"
-              echo "- Likely cause: PF_TESTING_GH_TOKEN lacks contents:write on rustfs/rustfs, or the GitHub API was unavailable."
-              echo "- Recovery: re-dispatch manually with"
-              FENCE="$(printf "\x60\x60\x60")"; echo "  ${FENCE}"
-              echo "  gh api --method POST repos/rustfs/rustfs/dispatches -f event_type='rustfs-chain-performance'"
-              FENCE="$(printf "\x60\x60\x60")"; echo "  ${FENCE}"
-            } > "${BODY_FILE}"
-            gh issue create -R rustfs/backlog --title "${TITLE}" \
-              --body-file "${BODY_FILE}" --label functional-test \
-              || gh issue create -R rustfs/backlog --title "${TITLE}" --body-file "${BODY_FILE}" \
-              || echo "could not file the stall alert issue either; check the token" >&2
-            exit 1
-          fi
+          echo "Functional chain complete: replication (final suite) finished."
+          echo "from_suite=security trigger=${{ github.event_name }} outcome=${{ steps.test.outcome }}"

      - name: Notify on failure
        if: failure()
@@ -37,28 +37,10 @@ env:
 jobs:
  s3-compat-test:
    runs-on: smoke-testing
+    continue-on-error: true
    timeout-minutes: 360
    if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' }}
    steps:
-      - name: Checkout repository (for report parser)
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
-        with:
-          persist-credentials: false
-
-      - name: Initialize functional evidence
-        id: evidence
-        run: |
-          set -euo pipefail
-          umask 077
-          FUNCTIONAL_ARTIFACTS_DIR="${RUNNER_TEMP}/rustfs-s3-compat-${GITHUB_RUN_ID}-${GITHUB_RUN_ATTEMPT}"
-          mkdir -- "${FUNCTIONAL_ARTIFACTS_DIR}" "${FUNCTIONAL_ARTIFACTS_DIR}-scratch"
-          {
-            printf 'FUNCTIONAL_ARTIFACTS_DIR=%s\n' "${FUNCTIONAL_ARTIFACTS_DIR}"
-            printf 'LOG_FILE=%s/suite.log\n' "${FUNCTIONAL_ARTIFACTS_DIR}"
-            printf 'REPORT_FILE=%s/report.md\n' "${FUNCTIONAL_ARTIFACTS_DIR}"
-            printf 'TMPDIR=%s-scratch\n' "${FUNCTIONAL_ARTIFACTS_DIR}"
-          } >> "${GITHUB_ENV}"
-
      # auto-testing is private: clone it with the dedicated PF token (not
      # GITHUB_TOKEN) and retry transient GitHub/network failures.
      - name: Checkout auto-testing scripts (with retry)
@@ -106,6 +88,9 @@ jobs:

      - name: Run S3 compatibility suite
        id: test
+        continue-on-error: true
+        env:
+          LOG_FILE: /tmp/rustfs-s3-compat.log
        run: |
          set -euo pipefail
          chmod +x auto-testing/rustfs-s3-compat-test.sh
@@ -122,7 +107,10 @@ jobs:
          ./auto-testing/rustfs-s3-compat-test.sh "${ARGS[@]}"

      - name: Generate report
-        if: ${{ always() && steps.evidence.outcome == 'success' }}
+        if: always()
+        env:
+          LOG_FILE: /tmp/rustfs-s3-compat.log
+          REPORT_FILE: /tmp/rustfs-s3-compat-report.md
        run: |
          set -euo pipefail
          PACKAGE_URL='${{ inputs.package_url }}'
@@ -144,44 +132,83 @@ jobs:
              RUSTFS_VERSION_INFO="${DETECTED_VERSION}"
            fi
          fi
-          CASE_TABLE="${FUNCTIONAL_ARTIFACTS_DIR}/cases.md"
-          CASE_RESULT=success
-          python3 scripts/functional_case_report.py "${LOG_FILE}" "${CASE_TABLE}" || CASE_RESULT=failure
-          RESULT=failure
-          if [ '${{ steps.test.outcome }}' = 'success' ] && [ "${CASE_RESULT}" = 'success' ]; then
-            RESULT=success
-          fi
+          CASE_TABLE="/tmp/rustfs-s3-compat-cases.md"
+          python3 - "${LOG_FILE}" "${CASE_TABLE}" <<'PY'
+          import re
+          import sys
+
+          log_file, out_file = sys.argv[1], sys.argv[2]
+          ansi = re.compile(r'\x1b\[[0-9;]*m')
+          start_re = re.compile(r'^---\s+([A-Z0-9]+-[0-9]+)\s+(.+?)\s+---$')
+          done_re = re.compile(r'^\[(PASS|FAIL|UNSUPPORTED)\]\s+([A-Z0-9]+-[0-9]+)\b')
+
+          rows = []
+          index = {}
+          current = None
+          try:
+            with open(log_file, 'r', encoding='utf-8', errors='replace') as fh:
+              for raw in fh:
+                line = ansi.sub('', raw).strip()
+                m = start_re.match(line)
+                if m:
+                  case_id, name = m.group(1), m.group(2)
+                  current = case_id
+                  if case_id not in index:
+                    index[case_id] = len(rows)
+                    rows.append([case_id, name, 'RUNNING'])
+                  continue
+                m = done_re.match(line)
+                if m:
+                  status, case_id = m.group(1), m.group(2)
+                  if case_id in index:
+                    rows[index[case_id]][2] = status
+                  else:
+                    rows.append([case_id, case_id, status])
+                    index[case_id] = len(rows) - 1
+                  current = None
+          except FileNotFoundError:
+            rows = []
+
+          counts = {'PASS': 0, 'FAIL': 0, 'UNSUPPORTED': 0, 'RUNNING': 0}
+          for _, _, status in rows:
+            counts[status] = counts.get(status, 0) + 1
+
+          with open(out_file, 'w', encoding='utf-8') as out:
+            out.write('## Case Summary\n\n')
+            out.write(f"- Total: {len(rows)}\\n")
+            out.write(f"- PASS: {counts.get('PASS', 0)}\\n")
+            out.write(f"- FAIL: {counts.get('FAIL', 0)}\\n")
+            out.write(f"- UNSUPPORTED: {counts.get('UNSUPPORTED', 0)}\\n")
+            out.write('\\n')
+            out.write('| Case | Name | Status |\\n')
+            out.write('| --- | --- | --- |\\n')
+            for case_id, name, status in rows:
+              out.write(f'| {case_id} | {name} | {status} |\\n')
+          PY
          {
            echo "# RustFS S3 compatibility test report"
            echo ""
            echo "- Run: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
-            echo "- Attempt: ${GITHUB_RUN_ATTEMPT}"
-            echo "- Workflow Commit: ${GITHUB_SHA}"
            echo "- Trigger: ${{ github.event_name }}"
            echo "- Package: ${PACKAGE_SOURCE}"
            echo "- RustFS Version: ${RUSTFS_VERSION_INFO}"
-            echo "- Test Step Outcome: ${RESULT}"
-            echo "- Suite Step Outcome: ${{ steps.test.outcome }}"
+            echo "- Test Step Outcome: ${{ steps.test.outcome }}"
            echo ""
-            if [ "${RESULT}" = "success" ]; then
-              cat "${CASE_TABLE}"
-              echo ""
-              echo "## Log tail"
-              echo '```text'
-              tail -n 200 "${LOG_FILE}"
-              echo '```'
-            else
-              echo "The suite or evidence validation failed. See this run's artifact for partial case results and suite.log."
-            fi
+            cat "${CASE_TABLE}" || true
+            echo ""
+            echo "## Log tail"
+            echo '```text'
+            tail -n 200 "${LOG_FILE}" || true
+            echo '```'
          } | tee "${REPORT_FILE}"
          cat "${REPORT_FILE}" >> "${GITHUB_STEP_SUMMARY}"
-          [ "${RESULT}" = "success" ]

      - name: Upload functional report to dashboard
-        if: ${{ always() && steps.evidence.outcome == 'success' }}
+        if: always()
        continue-on-error: true
        env:
          GH_TOKEN: ${{ env.PF_TESTING_GH_TOKEN }}
+          REPORT_FILE: /tmp/rustfs-s3-compat-report.md
          SUITE: s3
        run: |
          set -euo pipefail
@@ -191,32 +218,28 @@ jobs:
          fi
          DATE="$(date -u +%Y-%m-%d)"
          REPORT_PATH="functional-reports/${SUITE}/${DATE}.md"
-          # Base64-encode the report into a temp file and feed it to jq via
-          # --rawfile: large reports (e.g. pool) exceed the OS argv limit and
-          # make `jq --arg content "${CONTENT}"` fail with "Argument list too long".
-          B64_FILE="$(mktemp)"
-          python3 -c 'import base64,sys;print(base64.b64encode(open(sys.argv[1],"rb").read()).decode())' "${REPORT_FILE}" > "${B64_FILE}"
+          CONTENT="$(python3 -c 'import base64,sys;print(base64.b64encode(open(sys.argv[1],"rb").read()).decode())' "${REPORT_FILE}")"
          SHA="$(gh api "repos/rustfs/dashboard/contents/${REPORT_PATH}" -q '.sha' 2>/dev/null || true)"
          if [ -n "${SHA}" ]; then
-            jq -n --arg msg "report(${SUITE}): ${DATE}" --rawfile content "${B64_FILE}" --arg sha "${SHA}" \
-              '{message:$msg, content:($content|rtrimstr("\n")), sha:$sha}' \
+            jq -n --arg msg "report(${SUITE}): ${DATE}" --arg content "${CONTENT}" --arg sha "${SHA}" \
+              '{message:$msg, content:$content, sha:$sha}' \
              | gh api --method PUT "repos/rustfs/dashboard/contents/${REPORT_PATH}" --input - >/dev/null
          else
-            jq -n --arg msg "report(${SUITE}): ${DATE}" --rawfile content "${B64_FILE}" \
-              '{message:$msg, content:($content|rtrimstr("\n"))}' \
+            jq -n --arg msg "report(${SUITE}): ${DATE}" --arg content "${CONTENT}" \
+              '{message:$msg, content:$content}' \
              | gh api --method PUT "repos/rustfs/dashboard/contents/${REPORT_PATH}" --input - >/dev/null
          fi
-          rm -f "${B64_FILE}"

      - name: File failure issue in rustfs/backlog
        if: ${{ always() && (failure() || steps.test.outcome == 'failure' || steps.test.outcome == 'cancelled') }}
        continue-on-error: true
        env:
          GH_TOKEN: ${{ secrets.PF_TESTING_GH_TOKEN }}
-          EVIDENCE_OUTCOME: ${{ steps.evidence.outcome }}
          SUITE: 's3'
          SUITE_LABEL: 'S3 compatibility'
          RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
+          REPORT_FILE: '/tmp/rustfs-s3-compat-report.md'
+          LOG_FILE: '/tmp/rustfs-s3-compat.log'
        run: |
          set -euo pipefail
          if [ -z "${GH_TOKEN:-}" ]; then
@@ -244,16 +267,14 @@ jobs:
            echo ""
            echo "- Suite: \`${SUITE}\`"
            echo "- Run: ${RUN_URL}"
-            echo "- Attempt: ${GITHUB_RUN_ATTEMPT}"
-            echo "- Workflow Commit: ${GITHUB_SHA}"
            echo "- Trigger: ${GITHUB_EVENT_NAME}"
            echo "- Date: $(date -u +%Y-%m-%d)"
            echo ""
            echo "## Report (errors and symptoms)"
            echo ""
-            if [ "${EVIDENCE_OUTCOME}" = "success" ] && [ -s "${REPORT_FILE}" ]; then
+            if [ -s "${REPORT_FILE}" ]; then
              redact < "${REPORT_FILE}"
-            elif [ "${EVIDENCE_OUTCOME}" = "success" ] && [ -s "${LOG_FILE:-}" ]; then
+            elif [ -s "${LOG_FILE:-}" ]; then
              echo "(report file missing; log tail below)"
              echo ""
              tail -n 200 "${LOG_FILE}" | redact
@@ -269,15 +290,14 @@ jobs:
          echo "filed backlog issue for suite ${SUITE}"

      - name: Upload report and logs
-        if: ${{ always() && steps.evidence.outcome == 'success' }}
+        if: always()
        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6
        with:
-          name: rustfs-s3-compat-${{ github.run_id }}-${{ github.run_attempt }}
+          name: rustfs-s3-compat-${{ github.run_id }}
          path: |
-            ${{ env.FUNCTIONAL_ARTIFACTS_DIR }}/report.md
-            ${{ env.FUNCTIONAL_ARTIFACTS_DIR }}/suite.log
-            ${{ env.FUNCTIONAL_ARTIFACTS_DIR }}/cases.md
-          if-no-files-found: error
+            /tmp/rustfs-s3-compat.log
+            /tmp/rustfs-s3-compat-report.md
+          if-no-files-found: warn

      - name: Cleanup environment (after)
        if: always()
@@ -74,27 +74,10 @@ env:
 jobs:
  security-test:
    runs-on: smoke-testing
+    continue-on-error: true
    timeout-minutes: 360
    if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' }}
    steps:
-      # Checkout the repository into its own subdirectory. Checking out at
-      # the workspace root would wipe the auto-testing clone above (that is
-      # exactly how run 33934141181 lost rustfs-security-test.sh).
-      - name: Checkout repository (for the OIDC live gate script)
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
-        with:
-          persist-credentials: false
-          path: rustfs-repo
-
-      - name: Initialize security evidence
-        id: evidence
-        run: |
-          set -euo pipefail
-          umask 077
-          SECURITY_ARTIFACTS_DIR="${RUNNER_TEMP}/rustfs-security-${GITHUB_RUN_ID}-${GITHUB_RUN_ATTEMPT}"
-          mkdir -- "${SECURITY_ARTIFACTS_DIR}" "${SECURITY_ARTIFACTS_DIR}-scratch"
-          printf 'SECURITY_ARTIFACTS_DIR=%s\n' "${SECURITY_ARTIFACTS_DIR}" >> "${GITHUB_ENV}"
-
      # auto-testing is private: clone it with the dedicated PF token (not
      # GITHUB_TOKEN) and retry transient GitHub/network failures.
      - name: Checkout auto-testing scripts (with retry)
@@ -115,6 +98,11 @@ jobs:
          echo "ERROR: unable to clone rustfs/auto-testing after 5 attempts" >&2
          exit 1

+      - name: Checkout repository (for the OIDC live gate script)
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
+        with:
+          persist-credentials: false
+
      - name: Show environment
        run: |
          uname -a
@@ -147,9 +135,8 @@ jobs:
        id: test
        continue-on-error: true
        env:
-          REPORT_FILE: ${{ env.SECURITY_ARTIFACTS_DIR }}/suite-report.md
-          TMPDIR: ${{ env.SECURITY_ARTIFACTS_DIR }}-scratch
-          RUSTFS_SECURITY_OIDC_LIVE_SCRIPT: ${{ github.workspace }}/rustfs-repo/scripts/test/oidc_keycloak_live.sh
+          REPORT_FILE: /tmp/rustfs-security-report.md
+          RUSTFS_SECURITY_OIDC_LIVE_SCRIPT: ${{ github.workspace }}/scripts/test/oidc_keycloak_live.sh
        run: |
          set -euo pipefail
          chmod +x auto-testing/rustfs-security-test.sh
@@ -172,48 +159,29 @@ jobs:
          else
            ARGS+=(--package-url "${RUSTFS_NIGHTLY_PACKAGE_URL}")
          fi
-          GITHUB_STEP_SUMMARY=/dev/null ./auto-testing/rustfs-security-test.sh "${ARGS[@]}" 2>&1 | tee "${SECURITY_ARTIFACTS_DIR}/suite.log"
+          ./auto-testing/rustfs-security-test.sh "${ARGS[@]}"

      - name: Generate report
-        id: report
-        if: ${{ always() && steps.evidence.outcome == 'success' }}
-        env:
-          TEST_OUTCOME: ${{ steps.test.outcome }}
+        if: always()
        run: |
          set -euo pipefail
-          RESULT=failure
-          if [ "${TEST_OUTCOME}" = "success" ] && [ -s "${SECURITY_ARTIFACTS_DIR}/suite-report.md" ]; then
-            RESULT=success
+          if [ ! -f /tmp/rustfs-security-report.md ]; then
+            {
+              echo "# RustFS security test report"
+              echo ""
+              echo "- Run: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
+              echo "- Trigger: ${{ github.event_name }}"
+              echo "- Test Step Outcome: failure (suite did not produce a report)"
+            } > /tmp/rustfs-security-report.md
          fi
-          {
-            echo "# RustFS security test report"
-            echo ""
-            echo "- Run: ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}"
-            echo "- Attempt: ${GITHUB_RUN_ATTEMPT}"
-            echo "- Workflow Commit: ${GITHUB_SHA}"
-            echo "- Trigger: ${GITHUB_EVENT_NAME}"
-            echo "- Test Step Outcome: ${RESULT}"
-            echo "- Suite Step Outcome: ${TEST_OUTCOME}"
-            echo ""
-            # The dashboard prioritizes case rows over the step outcome.
-            # Keep partial case results in the artifact when the suite fails.
-            if [ "${RESULT}" = "success" ]; then
-              cat "${SECURITY_ARTIFACTS_DIR}/suite-report.md"
-            elif [ -s "${SECURITY_ARTIFACTS_DIR}/suite-report.md" ]; then
-              echo "The suite did not complete successfully. See suite-report.md in this run's artifact for diagnostics."
-            else
-              echo "The suite did not produce a non-empty report."
-            fi
-          } > "${SECURITY_ARTIFACTS_DIR}/report.md"
-          cat "${SECURITY_ARTIFACTS_DIR}/report.md" >> "${GITHUB_STEP_SUMMARY}"
-          [ "${RESULT}" = "success" ]
+          cat /tmp/rustfs-security-report.md >> "${GITHUB_STEP_SUMMARY}"

      - name: Upload functional report to dashboard
-        if: ${{ always() && steps.evidence.outcome == 'success' }}
+        if: always()
        continue-on-error: true
        env:
          GH_TOKEN: ${{ env.PF_TESTING_GH_TOKEN }}
-          REPORT_FILE: ${{ env.SECURITY_ARTIFACTS_DIR }}/report.md
+          REPORT_FILE: /tmp/rustfs-security-report.md
          SUITE: security
        run: |
          set -euo pipefail
@@ -223,22 +191,17 @@ jobs:
          fi
          DATE="$(date -u +%Y-%m-%d)"
          REPORT_PATH="functional-reports/${SUITE}/${DATE}.md"
-          # Base64-encode the report into a temp file and feed it to jq via
-          # --rawfile: large reports (e.g. pool) exceed the OS argv limit and
-          # make `jq --arg content "${CONTENT}"` fail with "Argument list too long".
-          B64_FILE="$(mktemp)"
-          python3 -c 'import base64,sys;print(base64.b64encode(open(sys.argv[1],"rb").read()).decode())' "${REPORT_FILE}" > "${B64_FILE}"
+          CONTENT="$(python3 -c 'import base64,sys;print(base64.b64encode(open(sys.argv[1],"rb").read()).decode())' "${REPORT_FILE}")"
          SHA="$(gh api "repos/rustfs/dashboard/contents/${REPORT_PATH}" -q '.sha' 2>/dev/null || true)"
          if [ -n "${SHA}" ]; then
-            jq -n --arg msg "report(${SUITE}): ${DATE}" --rawfile content "${B64_FILE}" --arg sha "${SHA}" \
-              '{message:$msg, content:($content|rtrimstr("\n")), sha:$sha}' \
+            jq -n --arg msg "report(${SUITE}): ${DATE}" --arg content "${CONTENT}" --arg sha "${SHA}" \
+              '{message:$msg, content:$content, sha:$sha}' \
              | gh api --method PUT "repos/rustfs/dashboard/contents/${REPORT_PATH}" --input - >/dev/null
          else
-            jq -n --arg msg "report(${SUITE}): ${DATE}" --rawfile content "${B64_FILE}" \
-              '{message:$msg, content:($content|rtrimstr("\n"))}' \
+            jq -n --arg msg "report(${SUITE}): ${DATE}" --arg content "${CONTENT}" \
+              '{message:$msg, content:$content}' \
              | gh api --method PUT "repos/rustfs/dashboard/contents/${REPORT_PATH}" --input - >/dev/null
          fi
-          rm -f "${B64_FILE}"

      - name: File failure issue in rustfs/backlog
        if: ${{ always() && (failure() || steps.test.outcome == 'failure' || steps.test.outcome == 'cancelled') }}
@@ -247,9 +210,8 @@ jobs:
          GH_TOKEN: ${{ secrets.PF_TESTING_GH_TOKEN }}
          SUITE: 'security'
          SUITE_LABEL: 'Security'
-          EVIDENCE_OUTCOME: ${{ steps.evidence.outcome }}
          RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
-          REPORT_FILE: ${{ env.SECURITY_ARTIFACTS_DIR }}/report.md
+          REPORT_FILE: '/tmp/rustfs-security-report.md'
          LOG_FILE: ''
        run: |
          set -euo pipefail
@@ -283,7 +245,7 @@ jobs:
            echo ""
            echo "## Report (errors and symptoms)"
            echo ""
-            if [ "${EVIDENCE_OUTCOME}" = "success" ] && [ -s "${REPORT_FILE}" ]; then
+            if [ -s "${REPORT_FILE}" ]; then
              redact < "${REPORT_FILE}"
            elif [ -s "${LOG_FILE:-}" ]; then
              echo "(report file missing; log tail below)"
@@ -301,15 +263,14 @@ jobs:
          echo "filed backlog issue for suite ${SUITE}"

      - name: Upload report and logs
-        if: ${{ always() && steps.evidence.outcome == 'success' }}
+        if: always()
        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6
        with:
-          name: rustfs-security-test-${{ github.run_id }}-${{ github.run_attempt }}
+          name: rustfs-security-test-${{ github.run_id }}
          path: |
-            ${{ env.SECURITY_ARTIFACTS_DIR }}/report.md
-            ${{ env.SECURITY_ARTIFACTS_DIR }}/suite.log
-            ${{ env.SECURITY_ARTIFACTS_DIR }}/suite-report.md
-          if-no-files-found: error
+            /tmp/rustfs-security-report.md
+            /tmp/rustfs-security.*/*
+          if-no-files-found: ignore
          retention-days: 3

      - name: Cleanup environment (after)
@@ -46,28 +46,10 @@ env:
 jobs:
  storage-test:
    runs-on: smoke-testing
+    continue-on-error: true
    timeout-minutes: 360
    if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' }}
    steps:
-      - name: Checkout repository (for report parser)
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
-        with:
-          persist-credentials: false
-
-      - name: Initialize functional evidence
-        id: evidence
-        run: |
-          set -euo pipefail
-          umask 077
-          FUNCTIONAL_ARTIFACTS_DIR="${RUNNER_TEMP}/rustfs-storage-${GITHUB_RUN_ID}-${GITHUB_RUN_ATTEMPT}"
-          mkdir -- "${FUNCTIONAL_ARTIFACTS_DIR}" "${FUNCTIONAL_ARTIFACTS_DIR}-scratch"
-          {
-            printf 'FUNCTIONAL_ARTIFACTS_DIR=%s\n' "${FUNCTIONAL_ARTIFACTS_DIR}"
-            printf 'LOG_FILE=%s/suite.log\n' "${FUNCTIONAL_ARTIFACTS_DIR}"
-            printf 'REPORT_FILE=%s/report.md\n' "${FUNCTIONAL_ARTIFACTS_DIR}"
-            printf 'TMPDIR=%s-scratch\n' "${FUNCTIONAL_ARTIFACTS_DIR}"
-          } >> "${GITHUB_ENV}"
-
      # auto-testing is private: clone it with the dedicated PF token (not
      # GITHUB_TOKEN) and retry transient GitHub/network failures.
      - name: Checkout auto-testing scripts (with retry)
@@ -115,6 +97,9 @@ jobs:

      - name: Run storage engine suite
        id: test
+        continue-on-error: true
+        env:
+          LOG_FILE: /tmp/rustfs-storage.log
        run: |
          set -euo pipefail
          chmod +x auto-testing/rustfs-storage-test.sh
@@ -137,7 +122,10 @@ jobs:
          ./auto-testing/rustfs-storage-test.sh "${ARGS[@]}"

      - name: Generate report
-        if: ${{ always() && steps.evidence.outcome == 'success' }}
+        if: always()
+        env:
+          LOG_FILE: /tmp/rustfs-storage.log
+          REPORT_FILE: /tmp/rustfs-storage-report.md
        run: |
          set -euo pipefail
          PACKAGE_URL='${{ inputs.package_url }}'
@@ -159,44 +147,83 @@ jobs:
              RUSTFS_VERSION_INFO="${DETECTED_VERSION}"
            fi
          fi
-          CASE_TABLE="${FUNCTIONAL_ARTIFACTS_DIR}/cases.md"
-          CASE_RESULT=success
-          python3 scripts/functional_case_report.py "${LOG_FILE}" "${CASE_TABLE}" || CASE_RESULT=failure
-          RESULT=failure
-          if [ '${{ steps.test.outcome }}' = 'success' ] && [ "${CASE_RESULT}" = 'success' ]; then
-            RESULT=success
-          fi
+          CASE_TABLE="/tmp/rustfs-storage-cases.md"
+          python3 - "${LOG_FILE}" "${CASE_TABLE}" <<'PY'
+          import re
+          import sys
+
+          log_file, out_file = sys.argv[1], sys.argv[2]
+          ansi = re.compile(r'\x1b\[[0-9;]*m')
+          start_re = re.compile(r'^---\s+([A-Z0-9]+-[0-9]+)\s+(.+?)\s+---$')
+          done_re = re.compile(r'^\[(PASS|FAIL|UNSUPPORTED)\]\s+([A-Z0-9]+-[0-9]+)\b')
+
+          rows = []
+          index = {}
+          current = None
+          try:
+            with open(log_file, 'r', encoding='utf-8', errors='replace') as fh:
+              for raw in fh:
+                line = ansi.sub('', raw).strip()
+                m = start_re.match(line)
+                if m:
+                  case_id, name = m.group(1), m.group(2)
+                  current = case_id
+                  if case_id not in index:
+                    index[case_id] = len(rows)
+                    rows.append([case_id, name, 'RUNNING'])
+                  continue
+                m = done_re.match(line)
+                if m:
+                  status, case_id = m.group(1), m.group(2)
+                  if case_id in index:
+                    rows[index[case_id]][2] = status
+                  else:
+                    rows.append([case_id, case_id, status])
+                    index[case_id] = len(rows) - 1
+                  current = None
+          except FileNotFoundError:
+            rows = []
+
+          counts = {'PASS': 0, 'FAIL': 0, 'UNSUPPORTED': 0, 'RUNNING': 0}
+          for _, _, status in rows:
+            counts[status] = counts.get(status, 0) + 1
+
+          with open(out_file, 'w', encoding='utf-8') as out:
+            out.write('## Case Summary\n\n')
+            out.write(f"- Total: {len(rows)}\\n")
+            out.write(f"- PASS: {counts.get('PASS', 0)}\\n")
+            out.write(f"- FAIL: {counts.get('FAIL', 0)}\\n")
+            out.write(f"- UNSUPPORTED: {counts.get('UNSUPPORTED', 0)}\\n")
+            out.write('\\n')
+            out.write('| Case | Name | Status |\\n')
+            out.write('| --- | --- | --- |\\n')
+            for case_id, name, status in rows:
+              out.write(f'| {case_id} | {name} | {status} |\\n')
+          PY
          {
            echo "# RustFS storage engine test report"
            echo ""
            echo "- Run: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
-            echo "- Attempt: ${GITHUB_RUN_ATTEMPT}"
-            echo "- Workflow Commit: ${GITHUB_SHA}"
            echo "- Trigger: ${{ github.event_name }}"
            echo "- Package: ${PACKAGE_SOURCE}"
            echo "- RustFS Version: ${RUSTFS_VERSION_INFO}"
-            echo "- Test Step Outcome: ${RESULT}"
-            echo "- Suite Step Outcome: ${{ steps.test.outcome }}"
+            echo "- Test Step Outcome: ${{ steps.test.outcome }}"
            echo ""
-            if [ "${RESULT}" = "success" ]; then
-              cat "${CASE_TABLE}"
-              echo ""
-              echo "## Log tail"
-              echo '```text'
-              tail -n 200 "${LOG_FILE}"
-              echo '```'
-            else
-              echo "The suite or evidence validation failed. See this run's artifact for partial case results and suite.log."
-            fi
+            cat "${CASE_TABLE}" || true
+            echo ""
+            echo "## Log tail"
+            echo '```text'
+            tail -n 200 "${LOG_FILE}" || true
+            echo '```'
          } | tee "${REPORT_FILE}"
          cat "${REPORT_FILE}" >> "${GITHUB_STEP_SUMMARY}"
-          [ "${RESULT}" = "success" ]

      - name: Upload functional report to dashboard
-        if: ${{ always() && steps.evidence.outcome == 'success' }}
+        if: always()
        continue-on-error: true
        env:
          GH_TOKEN: ${{ env.PF_TESTING_GH_TOKEN }}
+          REPORT_FILE: /tmp/rustfs-storage-report.md
          SUITE: storage
        run: |
          set -euo pipefail
@@ -206,32 +233,28 @@ jobs:
          fi
          DATE="$(date -u +%Y-%m-%d)"
          REPORT_PATH="functional-reports/${SUITE}/${DATE}.md"
-          # Base64-encode the report into a temp file and feed it to jq via
-          # --rawfile: large reports (e.g. pool) exceed the OS argv limit and
-          # make `jq --arg content "${CONTENT}"` fail with "Argument list too long".
-          B64_FILE="$(mktemp)"
-          python3 -c 'import base64,sys;print(base64.b64encode(open(sys.argv[1],"rb").read()).decode())' "${REPORT_FILE}" > "${B64_FILE}"
+          CONTENT="$(python3 -c 'import base64,sys;print(base64.b64encode(open(sys.argv[1],"rb").read()).decode())' "${REPORT_FILE}")"
          SHA="$(gh api "repos/rustfs/dashboard/contents/${REPORT_PATH}" -q '.sha' 2>/dev/null || true)"
          if [ -n "${SHA}" ]; then
-            jq -n --arg msg "report(${SUITE}): ${DATE}" --rawfile content "${B64_FILE}" --arg sha "${SHA}" \
-              '{message:$msg, content:($content|rtrimstr("\n")), sha:$sha}' \
+            jq -n --arg msg "report(${SUITE}): ${DATE}" --arg content "${CONTENT}" --arg sha "${SHA}" \
+              '{message:$msg, content:$content, sha:$sha}' \
              | gh api --method PUT "repos/rustfs/dashboard/contents/${REPORT_PATH}" --input - >/dev/null
          else
-            jq -n --arg msg "report(${SUITE}): ${DATE}" --rawfile content "${B64_FILE}" \
-              '{message:$msg, content:($content|rtrimstr("\n"))}' \
+            jq -n --arg msg "report(${SUITE}): ${DATE}" --arg content "${CONTENT}" \
+              '{message:$msg, content:$content}' \
              | gh api --method PUT "repos/rustfs/dashboard/contents/${REPORT_PATH}" --input - >/dev/null
          fi
-          rm -f "${B64_FILE}"

      - name: File failure issue in rustfs/backlog
        if: ${{ always() && (failure() || steps.test.outcome == 'failure' || steps.test.outcome == 'cancelled') }}
        continue-on-error: true
        env:
          GH_TOKEN: ${{ secrets.PF_TESTING_GH_TOKEN }}
-          EVIDENCE_OUTCOME: ${{ steps.evidence.outcome }}
          SUITE: 'storage'
          SUITE_LABEL: 'Storage engine'
          RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
+          REPORT_FILE: '/tmp/rustfs-storage-report.md'
+          LOG_FILE: '/tmp/rustfs-storage.log'
        run: |
          set -euo pipefail
          if [ -z "${GH_TOKEN:-}" ]; then
@@ -259,16 +282,14 @@ jobs:
            echo ""
            echo "- Suite: \`${SUITE}\`"
            echo "- Run: ${RUN_URL}"
-            echo "- Attempt: ${GITHUB_RUN_ATTEMPT}"
-            echo "- Workflow Commit: ${GITHUB_SHA}"
            echo "- Trigger: ${GITHUB_EVENT_NAME}"
            echo "- Date: $(date -u +%Y-%m-%d)"
            echo ""
            echo "## Report (errors and symptoms)"
            echo ""
-            if [ "${EVIDENCE_OUTCOME}" = "success" ] && [ -s "${REPORT_FILE}" ]; then
+            if [ -s "${REPORT_FILE}" ]; then
              redact < "${REPORT_FILE}"
-            elif [ "${EVIDENCE_OUTCOME}" = "success" ] && [ -s "${LOG_FILE:-}" ]; then
+            elif [ -s "${LOG_FILE:-}" ]; then
              echo "(report file missing; log tail below)"
              echo ""
              tail -n 200 "${LOG_FILE}" | redact
@@ -284,15 +305,14 @@ jobs:
          echo "filed backlog issue for suite ${SUITE}"

      - name: Upload report and logs
-        if: ${{ always() && steps.evidence.outcome == 'success' }}
+        if: always()
        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6
        with:
-          name: rustfs-storage-${{ github.run_id }}-${{ github.run_attempt }}
+          name: rustfs-storage-${{ github.run_id }}
          path: |
-            ${{ env.FUNCTIONAL_ARTIFACTS_DIR }}/report.md
-            ${{ env.FUNCTIONAL_ARTIFACTS_DIR }}/suite.log
-            ${{ env.FUNCTIONAL_ARTIFACTS_DIR }}/cases.md
-          if-no-files-found: error
+            /tmp/rustfs-storage.log
+            /tmp/rustfs-storage-report.md
+          if-no-files-found: warn

      - name: Cleanup environment (after)
        if: always()
@@ -61,6 +61,9 @@ env:
 jobs:
  tier-test:
    runs-on: smoke-testing
+    # Requirement: a failing suite must not fail the workflow; failures
+    # are filed to rustfs/backlog and the chain continues.
+    continue-on-error: true
    timeout-minutes: 420
    if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' }}
    steps:
@@ -377,22 +380,17 @@ jobs:
          fi
          DATE="$(date -u +%Y-%m-%d)"
          REPORT_PATH="functional-reports/${SUITE}/${DATE}.md"
-          # Base64-encode the report into a temp file and feed it to jq via
-          # --rawfile: large reports (e.g. pool) exceed the OS argv limit and
-          # make `jq --arg content "${CONTENT}"` fail with "Argument list too long".
-          B64_FILE="$(mktemp)"
-          python3 -c 'import base64,sys;print(base64.b64encode(open(sys.argv[1],"rb").read()).decode())' "${REPORT_FILE}" > "${B64_FILE}"
+          CONTENT="$(python3 -c 'import base64,sys;print(base64.b64encode(open(sys.argv[1],"rb").read()).decode())' "${REPORT_FILE}")"
          SHA="$(gh api "repos/rustfs/dashboard/contents/${REPORT_PATH}" -q '.sha' 2>/dev/null || true)"
          if [ -n "${SHA}" ]; then
-            jq -n --arg msg "report(${SUITE}): ${DATE}" --rawfile content "${B64_FILE}" --arg sha "${SHA}" \
-              '{message:$msg, content:($content|rtrimstr("\n")), sha:$sha}' \
+            jq -n --arg msg "report(${SUITE}): ${DATE}" --arg content "${CONTENT}" --arg sha "${SHA}" \
+              '{message:$msg, content:$content, sha:$sha}' \
              | gh api --method PUT "repos/rustfs/dashboard/contents/${REPORT_PATH}" --input - >/dev/null
          else
-            jq -n --arg msg "report(${SUITE}): ${DATE}" --rawfile content "${B64_FILE}" \
-              '{message:$msg, content:($content|rtrimstr("\n"))}' \
+            jq -n --arg msg "report(${SUITE}): ${DATE}" --arg content "${CONTENT}" \
+              '{message:$msg, content:$content}' \
              | gh api --method PUT "repos/rustfs/dashboard/contents/${REPORT_PATH}" --input - >/dev/null
          fi
-          rm -f "${B64_FILE}"

      - name: Verify required tier evidence
        id: evidence_verify
@@ -18,15 +18,15 @@ on:
  workflow_dispatch:
    inputs:
      from_version:
-        description: 'OLD RustFS release tag, e.g. 1.0.0-rc.3 (its release must ship a .deb asset). Leave empty for the default.'
+        description: 'OLD RustFS release tag (e.g. 1.0.0-rc.4-preview.1)'
        required: false
-        default: '1.0.0-rc.3'
+        default: '1.0.0-rc.4-preview.1'
      from_url:
        description: 'OLD .deb URL. Overrides from_version.'
        required: false
        type: string
      to_version:
-        description: 'NEW RustFS release tag, e.g. 1.0.0-rc.5 (any version with a .deb asset). Leave empty for latest nightly.'
+        description: 'NEW RustFS release tag (leave empty for latest nightly)'
        required: false
      to_url:
        description: 'NEW .deb URL. Overrides to_version / nightly default.'
@@ -79,28 +79,10 @@ env:
 jobs:
  upgrade-test:
    runs-on: smoke-testing
+    continue-on-error: true
    timeout-minutes: 420
    if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' }}
    steps:
-      - name: Checkout repository (for report parser)
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
-        with:
-          persist-credentials: false
-
-      - name: Initialize functional evidence
-        id: evidence
-        run: |
-          set -euo pipefail
-          umask 077
-          FUNCTIONAL_ARTIFACTS_DIR="${RUNNER_TEMP}/rustfs-upgrade-${GITHUB_RUN_ID}-${GITHUB_RUN_ATTEMPT}"
-          mkdir -- "${FUNCTIONAL_ARTIFACTS_DIR}" "${FUNCTIONAL_ARTIFACTS_DIR}-scratch"
-          {
-            printf 'FUNCTIONAL_ARTIFACTS_DIR=%s\n' "${FUNCTIONAL_ARTIFACTS_DIR}"
-            printf 'LOG_FILE=%s/suite.log\n' "${FUNCTIONAL_ARTIFACTS_DIR}"
-            printf 'REPORT_FILE=%s/report.md\n' "${FUNCTIONAL_ARTIFACTS_DIR}"
-            printf 'TMPDIR=%s-scratch\n' "${FUNCTIONAL_ARTIFACTS_DIR}"
-          } >> "${GITHUB_ENV}"
-
      # auto-testing is private: clone it with the dedicated PF token (not
      # GITHUB_TOKEN) and retry transient GitHub/network failures.
      - name: Checkout auto-testing scripts (with retry)
@@ -160,8 +142,9 @@ jobs:

      - name: Run upgrade compatibility suite
        id: test
+        continue-on-error: true
        env:
-          GH_TOKEN: ${{ secrets.PF_TESTING_GH_TOKEN }}
+          LOG_FILE: /tmp/rustfs-upgrade.log
        run: |
          set -euo pipefail
          chmod +x auto-testing/rustfs-upgrade-test.sh
@@ -192,33 +175,13 @@ jobs:
          else
            ARGS+=(--to-url "${RUSTFS_NIGHTLY_PACKAGE_URL}")
          fi
-          # Fail fast with a clear message when a requested release tag has
-          # no .deb asset (e.g. 1.0.0-rc.4 ships only zips), instead of
-          # letting the suite die mid-run on a 404.
-          check_release_asset() {
-            local version="$1" tag asset url
-            [ -n "${version}" ] && [ "${version}" != "null" ] || return 0
-            tag="${version#v}"
-            asset="rustfs_${tag//-/.}_amd64.deb"
-            url="https://github.com/rustfs/rustfs/releases/download/${tag}/${asset}"
-            if ! gh api "repos/rustfs/rustfs/releases/tags/${tag}" --jq '.assets[].name' 2>/dev/null | grep -qxF "${asset}"; then
-              echo "ERROR: release ${tag} has no downloadable asset ${asset}:" >&2
-              echo "       ${url}" >&2
-              echo "Pick a tag whose release ships a .deb (check its release assets)." >&2
-              exit 1
-            fi
-            echo "resolved ${tag} -> ${url}"
-          }
-          if [ -z "${FROM_URL}" ]; then
-            check_release_asset "${FROM_VERSION}"
-          fi
-          if [ -z "${TO_URL}" ]; then
-            check_release_asset "${TO_VERSION}"
-          fi
          ./auto-testing/rustfs-upgrade-test.sh "${ARGS[@]}"

      - name: Generate report
-        if: ${{ always() && steps.evidence.outcome == 'success' }}
+        if: always()
+        env:
+          LOG_FILE: /tmp/rustfs-upgrade.log
+          REPORT_FILE: /tmp/rustfs-upgrade-report.md
        run: |
          set -euo pipefail
          FROM_URL='${{ inputs.from_url }}'
@@ -239,47 +202,80 @@ jobs:
          else
            TO_SOURCE="${RUSTFS_NIGHTLY_PACKAGE_URL}"
          fi
-          CASE_TABLE="${FUNCTIONAL_ARTIFACTS_DIR}/cases.md"
-          MATRIX_TABLE="${FUNCTIONAL_ARTIFACTS_DIR}/matrix.md"
-          CASE_RESULT=success
-          python3 scripts/functional_case_report.py "${LOG_FILE}" "${CASE_TABLE}" "${MATRIX_TABLE}" || CASE_RESULT=failure
-          RESULT=failure
-          if [ '${{ steps.test.outcome }}' = 'success' ] && [ "${CASE_RESULT}" = 'success' ]; then
-            RESULT=success
-          fi
+          CASE_TABLE="/tmp/rustfs-upgrade-cases.md"
+          python3 - "${LOG_FILE}" "${CASE_TABLE}" <<'PY'
+          import re
+          import sys
+
+          log_file, out_file = sys.argv[1], sys.argv[2]
+          ansi = re.compile(r'\x1b\[[0-9;]*m')
+          start_re = re.compile(r'^---\s+([A-Z]+-[0-9]+)\s+(.+?)\s+---$')
+          done_re = re.compile(r'^\[(PASS|FAIL|UNSUPPORTED)\]\s+([A-Z]+-[0-9]+)\b')
+
+          rows = []
+          index = {}
+          try:
+            with open(log_file, 'r', encoding='utf-8', errors='replace') as fh:
+              for raw in fh:
+                line = ansi.sub('', raw).strip()
+                m = start_re.match(line)
+                if m:
+                  case_id, name = m.group(1), m.group(2)
+                  if case_id not in index:
+                    index[case_id] = len(rows)
+                    rows.append([case_id, name, 'RUNNING'])
+                  continue
+                m = done_re.match(line)
+                if m:
+                  status, case_id = m.group(1), m.group(2)
+                  if case_id in index:
+                    rows[index[case_id]][2] = status
+                  else:
+                    rows.append([case_id, case_id, status])
+                    index[case_id] = len(rows) - 1
+          except FileNotFoundError:
+            rows = []
+
+          counts = {'PASS': 0, 'FAIL': 0, 'UNSUPPORTED': 0, 'RUNNING': 0}
+          for _, _, status in rows:
+            counts[status] = counts.get(status, 0) + 1
+
+          with open(out_file, 'w', encoding='utf-8') as out:
+            out.write('## Case Summary\n\n')
+            out.write(f"- Total: {len(rows)}\\n")
+            out.write(f"- PASS: {counts.get('PASS', 0)}\\n")
+            out.write(f"- FAIL: {counts.get('FAIL', 0)}\\n")
+            out.write(f"- UNSUPPORTED: {counts.get('UNSUPPORTED', 0)}\\n")
+            out.write('\\n')
+            out.write('| Case | Name | Status |\\n')
+            out.write('| --- | --- | --- |\\n')
+            for case_id, name, status in rows:
+              out.write(f'| {case_id} | {name} | {status} |\\n')
+          PY
          {
            echo "# RustFS upgrade compatibility report"
            echo ""
            echo "- Run: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
-            echo "- Attempt: ${GITHUB_RUN_ATTEMPT}"
-            echo "- Workflow Commit: ${GITHUB_SHA}"
            echo "- Trigger: ${{ github.event_name }}"
            echo "- From: ${FROM_SOURCE}"
            echo "- To: ${TO_SOURCE}"
-            echo "- Test Step Outcome: ${RESULT}"
-            echo "- Suite Step Outcome: ${{ steps.test.outcome }}"
+            echo "- Test Step Outcome: ${{ steps.test.outcome }}"
            echo ""
-            if [ "${RESULT}" = "success" ]; then
-              cat "${MATRIX_TABLE}"
-              echo ""
-              cat "${CASE_TABLE}"
-              echo ""
-              echo "## Log tail"
-              echo '```text'
-              tail -n 200 "${LOG_FILE}"
-              echo '```'
-            else
-              echo "The suite or evidence validation failed. See this run's artifact for partial case results and suite.log."
-            fi
+            cat "${CASE_TABLE}" || true
+            echo ""
+            echo "## Log tail"
+            echo '```text'
+            tail -n 200 "${LOG_FILE}" || true
+            echo '```'
          } | tee "${REPORT_FILE}"
          cat "${REPORT_FILE}" >> "${GITHUB_STEP_SUMMARY}"
-          [ "${RESULT}" = "success" ]

      - name: Upload functional report to dashboard
-        if: ${{ always() && steps.evidence.outcome == 'success' }}
+        if: always()
        continue-on-error: true
        env:
          GH_TOKEN: ${{ env.PF_TESTING_GH_TOKEN }}
+          REPORT_FILE: /tmp/rustfs-upgrade-report.md
          SUITE: upgrade
        run: |
          set -euo pipefail
@@ -289,32 +285,28 @@ jobs:
          fi
          DATE="$(date -u +%Y-%m-%d)"
          REPORT_PATH="functional-reports/${SUITE}/${DATE}.md"
-          # Base64-encode the report into a temp file and feed it to jq via
-          # --rawfile: large reports (e.g. pool) exceed the OS argv limit and
-          # make `jq --arg content "${CONTENT}"` fail with "Argument list too long".
-          B64_FILE="$(mktemp)"
-          python3 -c 'import base64,sys;print(base64.b64encode(open(sys.argv[1],"rb").read()).decode())' "${REPORT_FILE}" > "${B64_FILE}"
+          CONTENT="$(python3 -c 'import base64,sys;print(base64.b64encode(open(sys.argv[1],"rb").read()).decode())' "${REPORT_FILE}")"
          SHA="$(gh api "repos/rustfs/dashboard/contents/${REPORT_PATH}" -q '.sha' 2>/dev/null || true)"
          if [ -n "${SHA}" ]; then
-            jq -n --arg msg "report(${SUITE}): ${DATE}" --rawfile content "${B64_FILE}" --arg sha "${SHA}" \
-              '{message:$msg, content:($content|rtrimstr("\n")), sha:$sha}' \
+            jq -n --arg msg "report(${SUITE}): ${DATE}" --arg content "${CONTENT}" --arg sha "${SHA}" \
+              '{message:$msg, content:$content, sha:$sha}' \
              | gh api --method PUT "repos/rustfs/dashboard/contents/${REPORT_PATH}" --input - >/dev/null
          else
-            jq -n --arg msg "report(${SUITE}): ${DATE}" --rawfile content "${B64_FILE}" \
-              '{message:$msg, content:($content|rtrimstr("\n"))}' \
+            jq -n --arg msg "report(${SUITE}): ${DATE}" --arg content "${CONTENT}" \
+              '{message:$msg, content:$content}' \
              | gh api --method PUT "repos/rustfs/dashboard/contents/${REPORT_PATH}" --input - >/dev/null
          fi
-          rm -f "${B64_FILE}"

      - name: File failure issue in rustfs/backlog
        if: ${{ always() && (failure() || steps.test.outcome == 'failure' || steps.test.outcome == 'cancelled') }}
        continue-on-error: true
        env:
          GH_TOKEN: ${{ secrets.PF_TESTING_GH_TOKEN }}
-          EVIDENCE_OUTCOME: ${{ steps.evidence.outcome }}
          SUITE: 'upgrade'
          SUITE_LABEL: 'Upgrade compatibility'
          RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
+          REPORT_FILE: '/tmp/rustfs-upgrade-report.md'
+          LOG_FILE: '/tmp/rustfs-upgrade.log'
        run: |
          set -euo pipefail
          if [ -z "${GH_TOKEN:-}" ]; then
@@ -342,16 +334,14 @@ jobs:
            echo ""
            echo "- Suite: \`${SUITE}\`"
            echo "- Run: ${RUN_URL}"
-            echo "- Attempt: ${GITHUB_RUN_ATTEMPT}"
-            echo "- Workflow Commit: ${GITHUB_SHA}"
            echo "- Trigger: ${GITHUB_EVENT_NAME}"
            echo "- Date: $(date -u +%Y-%m-%d)"
            echo ""
            echo "## Report (errors and symptoms)"
            echo ""
-            if [ "${EVIDENCE_OUTCOME}" = "success" ] && [ -s "${REPORT_FILE}" ]; then
+            if [ -s "${REPORT_FILE}" ]; then
              redact < "${REPORT_FILE}"
-            elif [ "${EVIDENCE_OUTCOME}" = "success" ] && [ -s "${LOG_FILE:-}" ]; then
+            elif [ -s "${LOG_FILE:-}" ]; then
              echo "(report file missing; log tail below)"
              echo ""
              tail -n 200 "${LOG_FILE}" | redact
@@ -367,16 +357,14 @@ jobs:
          echo "filed backlog issue for suite ${SUITE}"

      - name: Upload report and logs
-        if: ${{ always() && steps.evidence.outcome == 'success' }}
+        if: always()
        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6
        with:
-          name: rustfs-upgrade-test-${{ github.run_id }}-${{ github.run_attempt }}
+          name: rustfs-upgrade-test-${{ github.run_id }}
          path: |
-            ${{ env.FUNCTIONAL_ARTIFACTS_DIR }}/report.md
-            ${{ env.FUNCTIONAL_ARTIFACTS_DIR }}/suite.log
-            ${{ env.FUNCTIONAL_ARTIFACTS_DIR }}/cases.md
-            ${{ env.FUNCTIONAL_ARTIFACTS_DIR }}/matrix.md
-          if-no-files-found: error
+            /tmp/rustfs-upgrade-report.md
+            /tmp/rustfs-upgrade.*/*
+          if-no-files-found: ignore
          retention-days: 3

      - name: Cleanup environment (after)
@@ -42,7 +42,6 @@ jobs:
      - name: Check latest scheduled runs
        env:
          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          RUSTFS_DEFAULT_BRANCH: ${{ github.event.repository.default_branch }}
        run: |
          set +e
          python3 scripts/check_scheduled_validation_freshness.py \
@@ -33,7 +33,6 @@ profile.json
 *.zst
 .secrets
 *.go
-!crates/zip/tests/fixtures/snowball/**/generate/*.go
 *.pb
 *.svg
 deploy/logs/*.log.*
@@ -3,9 +3,9 @@
 repos:
  - repo: local
    hooks:
-      - id: rustfs-fmt-check
-        name: Rust formatting
-        entry: cargo fmt --all --check
+      - id: rustfs-dev-check
+        name: rustfs dev-check
+        entry: make dev-check
        language: system
        types: [rust]
        pass_filenames: false
@@ -18,10 +18,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
  - Read paths: an object at or below `policy.inline_max_bytes` (16 MiB by default) is teed to the client and to the local store in a single source read; a larger object or a Range read streams through and a background pull stores the whole object. A HEAD miss is proxied to the source and stores nothing (`policy.head = local_only` disables it). Every source-backed response carries `x-rustfs-on-demand-migration: source`
  - Protections: a per-source circuit breaker, a per-key negative cache, singleflight per key, a concurrency limit and a bounded pull queue shared by the inline and background paths, an optional bandwidth limit, an anti-loop request marker, and the shared outbound-endpoint (SSRF) policy
  - Metrics under `rustfs_on_demand_migration_*` (`requests_total`, `pulled_bytes_total`, `pulled_objects_total`, `pull_failures_total`, `inflight_pulls`, `queue_depth`, `source_latency_seconds_*`, `breaker_state`), mirrored per node by the admin status route
-  - Listings: `ListObjects` v1 remains local with ordinary key markers. `ListObjectsV2` can merge source objects when `policy.list_through = true`; this is off by default
-  - Upgrade and rollback: finish upgrading every node before enabling ODM. An rc.5 node that writes bucket configuration drops the ODM fields from metadata; neither a later restart nor moving the service out of ECStore recovers them. Before rollback, disable ODM and securely retain the original full configuration and credentials. After every node returns to a compatible version, restore and validate that configuration. Redacted exports cannot replace the credential backup; source-only objects are unavailable through RustFS while ODM is disabled. See the upgrade and rollback section of `docs/operations/on-demand-migration.md`
-  - Optional Google dependencies: default and `full` server builds retain native GCS support. `cargo build -p rustfs --no-default-features --features ftps,webdav` excludes Google SDKs while preserving configuration decoding and redaction; native GCS ODM and tier operations require the `gcs` feature. Do not use that build with existing GCS-tiered data
-  - Limitations: PUT and DELETE never reach the source; a source object updated after it was pulled is not re-fetched; SSE-C source objects are unsupported and answer 424; `Last-Modified` on a pulled object is the local write time, with the source timestamp kept in metadata
+  - Limitations: listings show only local objects (the source is not merged into `ListObjectsV2`); PUT and DELETE never reach the source; a source object updated after it was pulled is not re-fetched; SSE-C source objects are unsupported and answer 424; `Last-Modified` on a pulled object is the local write time, with the source timestamp kept in metadata
 - **NATS JetStream Publish Path**: Opt-in at-least-once delivery for the NATS notify and audit targets. A NATS Core publish flushes to the connection without awaiting a broker acknowledgement, so an event can be lost across a broker restart or a reconnect after the send queue has already cleared it. A queued event now clears only after the JetStream `PublishAck`, so bucket notifications survive those interruptions. Off by default and byte-identical to the NATS Core path when disabled.
  - Three configuration keys per target: `JETSTREAM_ENABLE`, `JETSTREAM_STREAM_NAME`, and `JETSTREAM_ACK_TIMEOUT_SECS`, under the `RUSTFS_NOTIFY_NATS_` and `RUSTFS_AUDIT_NATS_` prefixes
  - Durable store-and-forward with a stable dedup id sent as the `Nats-Msg-Id` header, so a replay after a crash is collapsed by the server duplicate window
@@ -109,17 +109,24 @@ affected boundaries and risks. CI still runs its configured repository gates.

 ### 🔒 Git Pre-commit Hooks (optional)

-The optional hook uses the checked-in `.pre-commit-config.yaml`. Install [pre-commit](https://pre-commit.com/#installation), then run this from the checkout or a linked worktree:
+Git hooks are **not** versioned in this repository, so a fresh clone has no
+active pre-commit hook. If you add your own `.git/hooks/pre-commit` (a good
+choice is a one-liner that runs `make pre-commit`), you can mark it executable
+with:

 ```bash
 make setup-hooks
 ```

-The hook runs `cargo fmt --all --check` when staged files include Rust source. It does not compile the workspace or run tests. Fix formatting with `cargo fmt --all`, inspect and stage the result, then commit again.
+Or manually:

-`pre-commit install` resolves Git's hook directory for linked worktrees and preserves an existing hook in migration mode. If you use `core.hooksPath`, keep that hook manager and integrate `pre-commit run` there; the installer refuses to silently replace that configuration.
+```bash
+chmod +x .git/hooks/pre-commit
+```

-A local hook provides early formatting feedback. With or without it, follow the verification tiers in `AGENTS.md`, run relevant behavioral tests, and satisfy the CI merge gates. `make pre-commit` and `make dev-check` remain explicit broader commands.
+With or without a hook, follow the verification tiers in `AGENTS.md`. Run the
+applicable scoped checks, and reserve `make pre-pr` for broad cross-module
+changes whose impact cannot be bounded by those checks.

 ### 📝 Formatting Configuration

@@ -131,11 +138,31 @@ fn_call_width = 90
 single_line_let_else_max_width = 100
 ```

+### 🚫 Commit Prevention
+
+If you set up a pre-commit hook and your code doesn't meet the formatting requirements, the hook will:
+
+1. **Block the commit** and show clear error messages
+2. **Provide exact commands** to fix the issues
+3. **Guide you through** the resolution process
+
+Example output when formatting fails:
+
+```
+❌ Code formatting check failed!
+💡 Please run 'cargo fmt --all' to format your code before committing.
+
+🔧 Quick fix:
+   cargo fmt --all
+   git add .
+   git commit
+```
+
 ### 🔄 Development Workflow

 1. **Make your changes**
 2. **Format your code**: `make fmt` or `cargo fmt --all`
-3. **Select relevant checks** using the validation tier in `AGENTS.md`; use `make pre-commit` when its broader fast gate adds useful coverage
+3. **Run the fast gate**: `make pre-commit` (no clippy, no tests)
 4. **Commit your changes**: `git commit -m "your message"`
 5. **Complete the applicable multi-role adversarial review** for non-exempt changes (see `AGENTS.md`)
 6. **Run applicable scoped checks before opening/updating a PR**; consider
@@ -179,12 +206,11 @@ Configure your IDE to:
 #### Pre-commit hook not running?

 ```bash
-pre-commit validate-config
-pre-commit run --all-files
-# Inspect any configured hook manager; do not overwrite it.
-git config --get core.hooksPath
-# Install if no separate hook manager is configured.
-make setup-hooks
+# Check if hook is executable
+ls -la .git/hooks/pre-commit
+
+# Make it executable if needed
+chmod +x .git/hooks/pre-commit
 ```

 #### Formatting issues?
@@ -165,10 +165,10 @@ http-body = "1.1.0"
 http-body-util = "0.1.5"
 minlz = "1.2.3"
 reqwest = "0.13.4"
-rustfs-kafka-async = { version = "1.3.1" }
+rustfs-kafka-async = { version = "1.2.0" }
 socket2 = { version = "0.6.5" }
 tokio = { version = "1.53.1" }
-tokio-rustls = { default-features = false, version = "0.26.5" }
+tokio-rustls = { default-features = false, version = "0.26.4" }
 tokio-stream = { version = "0.1.19" }
 tokio-test = "0.4.5"
 tokio-util = { version = "0.7.19" }
@@ -199,10 +199,10 @@ serde_urlencoded = "0.7.1"
 # matching stable releases are not available yet, while previous stable lines
 # have incompatible APIs. Keep them exact-pinned and monitor upstream for stable
 # releases.
-aes-gcm = { version = "0.11.1" }
-argon2 = { version = "0.6.0" }
-blake2 = "0.11.0"
-chacha20poly1305 = { version = "0.11.0" }
+aes-gcm = { version = "=0.11.1" }
+argon2 = { version = "=0.6.0" }
+blake2 = "=0.11.0"
+chacha20poly1305 = { version = "=0.11.0" }
 crc-fast = "1.10.0"
 hmac = { version = "0.13.0" }
 jsonwebtoken = { version = "11.0.0" }
@@ -234,22 +234,18 @@ tokio-postgres-rustls = "0.14.0"
 # Utilities and Tools
 anyhow = "1.0.104"
 arc-swap = "1.9.2"
-# RUSTFS_COMPAT_TODO(tokio-tar-extension-limits): keep the fork pin while Snowball and Swift still depend on it. Remove after Snowball uses a released tar-codec/tar-framing API that exposes precedence-resolved MinIO vendor records, RustFS preserves cancellation-safe ownership of large streamed members, footerless minio-go input is accepted only at an authenticated complete request boundary, the existing resource-limit, cancellation, and error-fuse regressions pass, and Swift no longer needs this fork.
+# RUSTFS_COMPAT_TODO(tokio-tar-extension-limits): keep the fork pin until every parser hardening used by Snowball is released upstream. Remove after astral-sh/tokio-tar#118 is merged and a published release includes extension, physical-entry, and sparse limits, cancellation-safe sparse parsing, and error-fused entry streams.
 astral-tokio-tar = { git = "https://github.com/cxymds/tokio-tar.git", rev = "603756478b7668436e464519c77ccac22a99ba96" }
-# Candidate Snowball parser versions exercised by rustfs-zip compatibility fixtures.
-tar-codec = "0.0.14"
-tar-framing = "0.0.14"
 atoi = "3.1.0"
 atomic_enum = "0.3.0"
-aws-config = { version = "1.12.0" }
+aws-config = { version = "1.11.0" }
 aws-credential-types = { version = "1.3.0" }
-aws-sdk-kms = { default-features = false, version = "1.118.0" }
-aws-sdk-s3 = { default-features = false, version = "1.145.0" }
-aws-sdk-sts = { default-features = false, version = "1.114.0" }
-aws-smithy-async = { version = "1.3.0" }
+aws-sdk-kms = { default-features = false, version = "1.117.0" }
+aws-sdk-s3 = { default-features = false, version = "1.144.0" }
+aws-sdk-sts = { default-features = false, version = "1.113.0" }
 aws-smithy-http-client = { default-features = false, version = "1.4.0" }
-aws-smithy-runtime-api = { version = "1.16.0" }
-aws-smithy-types = { version = "1.6.3" }
+aws-smithy-runtime-api = { version = "1.15.0" }
+aws-smithy-types = { version = "1.6.2" }
 base64-simd = "0.8.0"
 brotli = "9.0.0"
 clap = { version = "4.6.6" }
@@ -343,7 +339,7 @@ windows = { version = "0.62.2" }
 windows-sys = "0.61.2"
 xxhash-rust = { version = "0.8.18" }
 zip = "8.6.0"
-zstd = "0.14.0"
+zstd = "0.13.3"

 # Observability and Metrics
 metrics = "0.24.6"
@@ -363,16 +359,15 @@ libunftp = { version = "0.23.0" }
 unftp-core = "0.1.0"
 suppaftp = { version = "11.0.0" }
 rcgen = { version = "0.14.10", default-features = false, features = ["aws_lc_rs", "crypto", "pem"] }
-russh = { version = "0.63.2" }
+russh = { version = "0.63.1" }
 russh-sftp = "2.4.0"

 # WebDAV
 dav-server = "0.11.0"

 # Performance Analysis and Memory Profiling
-rustfs-mimalloc = { version = "0.5.3" }
-# Preserve Unicode focus filters until rustfs/backlog#2302 is resolved.
-hotpath = { version = "=0.25.0", default-features = false }
+rustfs-mimalloc = { version = "0.5.2" }
+hotpath = { version = "0.24.0", default-features = false }
 # Snapshot testing for output format regression detection
 insta = { version = "1.48" }

@@ -130,21 +130,6 @@ Scanner cycle budget controls:
  - timeout returns S3 `SlowDown`, so clients should use normal SDK retry handling.
  - this is not a fdatasync or group-commit switch. Track fdatasync batching separately with `rustfs_s3_put_object_rename_fdatasync_batch_files`.

-## Remote tier timeout environment variables
-
- `RUSTFS_TIER_REMOTE_CONNECT_TIMEOUT_SECS`
-  - remote tier TCP connect timeout.
-  - default is `10`.
-  - must be positive; zero fails tier client initialization, while an invalid integer is logged and falls back to the default.
- `RUSTFS_TIER_REMOTE_REQUEST_TIMEOUT_SECS`
-  - remote tier request timeout through response headers.
-  - default is `86400` so large transition uploads keep a production-safe budget.
-  - must be positive; zero fails tier client initialization, while an invalid integer is logged and falls back to the default. Very large values are accepted and act as a correspondingly long budget.
- `RUSTFS_TIER_REMOTE_RESPONSE_BODY_IDLE_TIMEOUT_SECS`
-  - maximum idle time between remote tier response-body chunks.
-  - default is `60`; the timer resets only when non-empty body data keeps progressing.
-  - must be positive; zero fails tier client initialization, while an invalid integer is logged and falls back to the default.
-
 ## Drive timeout environment variables

 - `RUSTFS_DRIVE_METADATA_TIMEOUT_SECS`
@@ -137,28 +137,6 @@ pub const DEFAULT_TIER_REMOTE_VERSION_STATE_FLEET_CONFIRMED: bool = false;
 const _: () = assert!(!DEFAULT_TIER_REMOTE_VERSION_STATE_WRITE);
 const _: () = assert!(!DEFAULT_TIER_REMOTE_VERSION_STATE_FLEET_CONFIRMED);

-/// Environment variable for remote tier TCP connect timeout in seconds.
-pub const ENV_TIER_REMOTE_CONNECT_TIMEOUT_SECS: &str = "RUSTFS_TIER_REMOTE_CONNECT_TIMEOUT_SECS";
-/// Default remote tier TCP connect timeout in seconds.
-pub const DEFAULT_TIER_REMOTE_CONNECT_TIMEOUT_SECS: u64 = 10;
-
-/// Environment variable for the remote tier request timeout in seconds.
-///
-/// This bounds upload/download request progress through response headers. The
-/// default is intentionally large so multi-TiB transition uploads keep their
-/// previous production budget while black-hole remotes no longer wait forever.
-pub const ENV_TIER_REMOTE_REQUEST_TIMEOUT_SECS: &str = "RUSTFS_TIER_REMOTE_REQUEST_TIMEOUT_SECS";
-/// Default remote tier request timeout in seconds.
-pub const DEFAULT_TIER_REMOTE_REQUEST_TIMEOUT_SECS: u64 = 24 * 60 * 60;
-
-/// Environment variable for remote tier response-body idle timeout in seconds.
-///
-/// The timer is re-armed on every non-empty response-body chunk, so slow but
-/// progressing remotes can continue while silent response bodies are cancelled.
-pub const ENV_TIER_REMOTE_RESPONSE_BODY_IDLE_TIMEOUT_SECS: &str = "RUSTFS_TIER_REMOTE_RESPONSE_BODY_IDLE_TIMEOUT_SECS";
-/// Default remote tier response-body idle timeout in seconds.
-pub const DEFAULT_TIER_REMOTE_RESPONSE_BODY_IDLE_TIMEOUT_SECS: u64 = 60;
-
 /// Request the object-transaction fencing contract used by storage-owned
 /// cleanup receipts and lock-window optimizations.
 ///
@@ -834,16 +812,6 @@ mod remote_version_state_tests {
        );
    }

-    #[test]
-    fn remote_tier_timeout_env_names_are_stable() {
-        assert_eq!(super::ENV_TIER_REMOTE_CONNECT_TIMEOUT_SECS, "RUSTFS_TIER_REMOTE_CONNECT_TIMEOUT_SECS");
-        assert_eq!(super::ENV_TIER_REMOTE_REQUEST_TIMEOUT_SECS, "RUSTFS_TIER_REMOTE_REQUEST_TIMEOUT_SECS");
-        assert_eq!(
-            super::ENV_TIER_REMOTE_RESPONSE_BODY_IDLE_TIMEOUT_SECS,
-            "RUSTFS_TIER_REMOTE_RESPONSE_BODY_IDLE_TIMEOUT_SECS"
-        );
-    }
-
    #[test]
    fn data_movement_part_checksum_gate_uses_stable_environment_names() {
        assert_eq!(super::ENV_DATA_MOVEMENT_PART_CHECKSUMS_WRITE, "RUSTFS_DATA_MOVEMENT_PART_CHECKSUMS_WRITE");
@@ -6743,99 +6743,6 @@ async fn test_site_replication_replicates_object_with_bucket_versioning_real_dua
    Ok(())
 }

-#[tokio::test]
-async fn test_site_replication_replays_bucket_created_during_peer_outage_real_dual_node() -> TestResult {
-    init_logging();
-
-    // Keep compilation outside the scenario timeout. Recovery itself waits
-    // for the production 30-second lightweight retry tick.
-    let _rustfs_binary = rustfs_binary_path();
-
-    match timeout(Duration::from_secs(150), async {
-        let mut site_env = replication_fast_env();
-        site_env.extend_from_slice(LOOPBACK_REPLICATION_TARGET_ENV);
-
-        let mut site_a_env = RustFSTestEnvironment::new().await?;
-        site_a_env.start_rustfs_server_with_env(vec![], &site_env).await?;
-
-        let mut site_b_env = RustFSTestEnvironment::new().await?;
-        site_b_env.start_rustfs_server_without_cleanup_with_env(&site_env).await?;
-
-        let site_a_client = site_a_env.create_s3_client();
-        let site_b_client = site_b_env.create_s3_client();
-        let bucket = "site-repl-peer-outage";
-        let key = "after-recovery.txt";
-        let payload = b"site replication recovered the missed bucket".to_vec();
-
-        let add_status = site_replication_add(
-            &site_a_env,
-            &[
-                PeerSite {
-                    name: "outage-site-a".to_string(),
-                    endpoint: site_a_env.url.clone(),
-                    access_key: site_a_env.access_key.clone(),
-                    secret_key: site_a_env.secret_key.clone(),
-                    ..Default::default()
-                },
-                PeerSite {
-                    name: "outage-site-b".to_string(),
-                    endpoint: site_b_env.url.clone(),
-                    access_key: site_b_env.access_key.clone(),
-                    secret_key: site_b_env.secret_key.clone(),
-                    ..Default::default()
-                },
-            ],
-        )
-        .await?;
-        assert!(add_status.success, "unexpected site add result: {add_status:?}");
-        wait_for_site_replication_enabled(&site_a_env, 2).await?;
-        wait_for_site_replication_enabled(&site_b_env, 2).await?;
-
-        site_b_env.stop_server();
-        site_a_client.create_bucket().bucket(bucket).send().await?;
-        site_a_client.head_bucket().bucket(bucket).send().await?;
-
-        let queued = site_replication_info(&site_a_env)
-            .await?
-            .retry_stats
-            .ok_or("peer outage did not persist a site replication retry event")?;
-        assert!(queued.pending + queued.failed > 0, "peer outage retry queue was unexpectedly empty");
-
-        site_b_env.restart_server_preserving_data(vec![], &site_env).await?;
-        let recovery_deadline = tokio::time::Instant::now() + Duration::from_secs(75);
-        loop {
-            let bucket_recovered = site_b_client.head_bucket().bucket(bucket).send().await.is_ok();
-            let queue_empty = site_replication_info(&site_a_env).await?.retry_stats.is_none();
-            if bucket_recovered && queue_empty {
-                break;
-            }
-            if tokio::time::Instant::now() >= recovery_deadline {
-                return Err(format!(
-                    "site replication retry did not settle after peer recovery; bucket_recovered={bucket_recovered}, queue_empty={queue_empty}"
-                )
-                .into());
-            }
-            sleep(Duration::from_millis(250)).await;
-        }
-
-        site_a_client
-            .put_object()
-            .bucket(bucket)
-            .key(key)
-            .body(ByteStream::from(payload.clone()))
-            .send()
-            .await?;
-        assert_eq!(wait_for_object_on_target(&site_b_client, bucket, key).await?, payload);
-
-        Ok(())
-    })
-    .await
-    {
-        Ok(result) => result,
-        Err(_) => Err("site replication peer-outage recovery timed out after 150 seconds".into()),
-    }
-}
-
 /// Re-applying a site's own replication config must not disable the peer's reverse direction.
 ///
 /// `PutBucketReplication` broadcasts the config to every peer — the console's replication
@@ -12,34 +12,21 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-use crate::common::{
-    RustFSTestClusterEnvironment, RustFSTestEnvironment, admin_request, init_logging, replication_fast_env, rustfs_binary_path,
-};
-use crate::fake_s3_target::{BucketMode, FAKE_ACCESS_KEY, FAKE_SECRET_KEY, FakeS3Target};
-use crate::on_demand_migration::common::{ODM_SERVER_ENV, OdmTestEnv, SeedObject};
-use crate::replication_extension_test::{
-    LOOPBACK_REPLICATION_TARGET_ENV, ReplicationTargetOptions, put_bucket_replication, set_replication_target_with_options,
-};
+use crate::common::{RustFSTestClusterEnvironment, RustFSTestEnvironment, init_logging, rustfs_binary_path};
 use aws_sdk_s3::Client;
 use aws_sdk_s3::error::ProvideErrorMetadata;
 use aws_sdk_s3::primitives::ByteStream;
 use aws_sdk_s3::types::{
-    BucketLifecycleConfiguration, BucketVersioningStatus, CompletedMultipartUpload, CompletedPart, DefaultRetention,
-    ExpirationStatus, LifecycleExpiration, LifecycleRule, LifecycleRuleFilter, ObjectLockConfiguration, ObjectLockEnabled,
-    ObjectLockRetentionMode, ObjectLockRule, PublicAccessBlockConfiguration, ServerSideEncryption, ServerSideEncryptionByDefault,
-    ServerSideEncryptionConfiguration, ServerSideEncryptionRule, Tag, Tagging, VersioningConfiguration,
+    BucketVersioningStatus, CompletedMultipartUpload, CompletedPart, ServerSideEncryption, VersioningConfiguration,
 };
-use http::{Method, StatusCode};
 use std::path::{Path, PathBuf};
 use std::time::Duration;
 use tokio::task::JoinSet;
 use tokio::time::{Instant, sleep};

 type TestResult = Result<(), Box<dyn std::error::Error + Send + Sync>>;
-type BoxError = Box<dyn std::error::Error + Send + Sync>;

 const SOURCE_BINARY_ENV: &str = "RUSTFS_UPGRADE_SOURCE_BINARY";
-const RC5_COMMIT: &str = "40a2470feb567201165a5b809b7598bb4b1f68f5";
 const SSE_MASTER_KEY_ENV: &str = "RUSTFS_SSE_S3_MASTER_KEY";
 const SSE_MASTER_KEY: &str = "QkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkI=";
 const PLAIN_BUCKET: &str = "upgrade-plain-data";
@@ -53,32 +40,6 @@ const MULTIPART_UPLOADS_PER_WORKER: usize = 16;
 // comfortably covers that window plus CI scheduling jitter.
 const LISTING_CONVERGENCE_TIMEOUT: Duration = Duration::from_secs(30);

-// Bucket-configuration upgrade/rollback scenarios (rustfs#7172, #7183, #7089).
-const CONFIG_PLAIN_BUCKET: &str = "upgrade-config-plain";
-const CONFIG_ENCRYPTED_BUCKET: &str = "upgrade-config-encrypted";
-const CONFIG_REPLICATED_BUCKET: &str = "upgrade-config-replicated";
-const CONFIG_LOCKED_BUCKET: &str = "upgrade-config-locked";
-const CONFIG_REPLICA_BUCKET: &str = "upgrade-config-replica";
-const ROLLBACK_BUCKET: &str = "rollback-config-data";
-const ROLLBACK_REPLICA_BUCKET: &str = "rollback-config-replica";
-const BUCKET_QUOTA_BYTES: u64 = 64 * 1024 * 1024;
-const LIFECYCLE_RULE_ID: &str = "upgrade-expire-logs";
-const LIFECYCLE_PREFIX: &str = "logs/";
-const LIFECYCLE_DAYS: i32 = 30;
-const BUCKET_TAG_KEY: &str = "owner";
-const BUCKET_TAG_VALUE: &str = "upgrade-compatibility";
-const OBJECT_LOCK_DAYS: i32 = 1;
-// `set-bucket-quota` answers 503 until the scanner has made the bucket's usage
-// authoritative; the quota test uses the same 30s budget.
-const QUOTA_READINESS_TIMEOUT: Duration = Duration::from_secs(30);
-// Quota admission fails closed while a freshly started server has neither
-// authoritative usage nor a persisted degraded baseline for the bucket
-// (rustfs#5716), so a write to a quota-enabled bucket is retryable-503 for that
-// window. It is a restart property, not an upgrade property — the same window
-// opens on the very first start — so the write assertions ride it out instead
-// of treating it as an upgrade failure.
-const QUOTA_ADMISSION_WARMUP_TIMEOUT: Duration = Duration::from_secs(90);
-
 fn source_binary() -> Result<PathBuf, Box<dyn std::error::Error + Send + Sync>> {
    let path = std::env::var_os(SOURCE_BINARY_ENV)
        .map(PathBuf::from)
@@ -279,93 +240,6 @@ async fn exercise_mixed_cluster(
    Ok(())
 }

-/// Pins the published old writer's limitation and the supported recovery
-/// procedure. This is not a promise that mixed-version ODM is supported.
-/// Replace the loss assertion when ODM gains independent persistence;
-/// preserving configuration across rc.5 writes is then an improvement.
-#[tokio::test]
-#[ignore = "requires the pinned 1.0.0-rc.5 release binary"]
-async fn rc5_rollback_requires_restoring_odm_configuration() -> TestResult {
-    init_logging();
-    let previous_binary = source_binary()?;
-    let version = tokio::process::Command::new(&previous_binary)
-        .arg("--version")
-        .output()
-        .await?;
-    assert!(version.status.success(), "previous binary must report its version");
-    assert!(
-        String::from_utf8(version.stdout)?.contains(RC5_COMMIT),
-        "this compatibility scenario requires the published rc.5 writer"
-    );
-    let mut env = OdmTestEnv::start().await?;
-    let bucket = "odm-rc5-rollback";
-    let source_bucket = "odm-rc5-source";
-    env.source.create_bucket_with_mode(source_bucket, BucketMode::Unversioned);
-    env.seed_source(
-        source_bucket,
-        &[SeedObject::new(
-            "source-only",
-            bytes::Bytes::from_static(b"source read after recovery"),
-        )],
-    );
-    env.rustfs.create_test_bucket(bucket).await?;
-    let saved_config = env.fake_source_spec(source_bucket);
-    assert_eq!(env.configure_source(bucket, &saved_config).await?.status, 200);
-    let before = env.get_config(bucket).await?;
-    assert_eq!(before.status, 200);
-    let expected_config = before
-        .json()?
-        .get("config")
-        .cloned()
-        .ok_or("configuration response omitted config")?;
-    env.client
-        .put_object()
-        .bucket(bucket)
-        .key("local")
-        .body(ByteStream::from_static(b"local data survives rollback"))
-        .send()
-        .await?;
-    env.rustfs.restart_server_preserving_data(vec![], ODM_SERVER_ENV).await?;
-    let restarted = env.get_config(bucket).await?;
-    assert_eq!(restarted.status, 200, "a current writer preserves ODM across restart");
-    assert_eq!(restarted.json()?.get("config"), Some(&expected_config));
-
-    restart_from_binary(&mut env.rustfs, &previous_binary, &[]).await?;
-    env.client
-        .put_bucket_tagging()
-        .bucket(bucket)
-        .tagging(
-            Tagging::builder()
-                .tag_set(Tag::builder().key("writer").value("rc5").build()?)
-                .build()?,
-        )
-        .send()
-        .await?;
-    env.rustfs.restart_server_preserving_data(vec![], ODM_SERVER_ENV).await?;
-    let missing = env.get_config(bucket).await?;
-    assert_eq!(missing.status, 404, "rc.5 rewrites metadata without ODM keys");
-    assert!(missing.body.contains("NoSuchConfiguration"));
-    assert_eq!(read_object(&env.client, bucket, "local", None).await?.1, b"local data survives rollback");
-    let tags = env.client.get_bucket_tagging().bucket(bucket).send().await?;
-    assert!(tags.tag_set().iter().any(|tag| tag.key() == "writer" && tag.value() == "rc5"));
-
-    assert_eq!(
-        env.configure_source(bucket, &saved_config).await?.status,
-        200,
-        "restore from saved full configuration"
-    );
-    env.rustfs.restart_server_preserving_data(vec![], ODM_SERVER_ENV).await?;
-    let restored = env.get_config(bucket).await?;
-    assert_eq!(restored.status, 200, "restored ODM configuration persists");
-    assert_eq!(restored.json()?.get("config"), Some(&expected_config));
-    env.wait_until_source_consulted(bucket).await?;
-    assert_eq!(
-        read_object(&env.client, bucket, "source-only", None).await?.1,
-        b"source read after recovery"
-    );
-    Ok(())
-}
-
 #[tokio::test]
 #[ignore = "requires a pinned previous RustFS release binary"]
 async fn direct_upgrade_from_rc2_preserves_object_contracts() -> TestResult {
@@ -555,653 +429,3 @@ async fn rolling_upgrade_from_rc2_preserves_mixed_version_contracts() -> TestRes

    Ok(())
 }
-
-/// Child-process environment shared by both bucket-configuration scenarios.
-///
-/// The replication target is an in-process fake bound to `127.0.0.1`, which
-/// `set-remote-target` rejects as an SSRF risk without the loopback opt-in, and
-/// the proxy bypass keeps a developer's `HTTP_PROXY` from intercepting the
-/// server's outbound health check.
-fn bucket_config_server_env() -> Vec<(&'static str, &'static str)> {
-    let mut env = vec![
-        (SSE_MASTER_KEY_ENV, SSE_MASTER_KEY),
-        ("NO_PROXY", "127.0.0.1,localhost"),
-        ("HTTP_PROXY", ""),
-        ("HTTPS_PROXY", ""),
-        // Shorten the scanner cycle so the bucket's usage becomes authoritative
-        // in seconds; both `set-bucket-quota` and quota admission block on it.
-        ("RUSTFS_SCANNER_CYCLE", "1"),
-        ("RUSTFS_SCANNER_START_DELAY_SECS", "0"),
-    ];
-    env.extend_from_slice(LOOPBACK_REPLICATION_TARGET_ENV);
-    env.extend(replication_fast_env());
-    env
-}
-
-/// Restart `env` in place on the same data directory using an explicit binary.
-///
-/// [`RustFSTestEnvironment::restart_server_preserving_data`] always relaunches
-/// the workspace build, which is the upgrade direction only. The rollback
-/// scenario needs the reverse: stop the current build and bring the pinned
-/// previous release up on the metadata that build just wrote.
-async fn restart_from_binary(env: &mut RustFSTestEnvironment, binary: &Path, server_env: &[(&str, &str)]) -> TestResult {
-    env.stop_server();
-    env.start_rustfs_server_from_binary(binary, vec![], server_env).await
-}
-
-async fn set_bucket_quota(env: &RustFSTestEnvironment, bucket: &str, quota_bytes: u64) -> TestResult {
-    let path = format!("/rustfs/admin/v3/quota/{bucket}");
-    let body = serde_json::json!({ "quota": quota_bytes, "quota_type": "HARD" }).to_string();
-    let deadline = Instant::now() + QUOTA_READINESS_TIMEOUT;
-    loop {
-        let (status, response) =
-            admin_request(&env.url, Method::PUT, &path, Some(body.clone()), &env.access_key, &env.secret_key).await?;
-        if status.is_success() {
-            return Ok(());
-        }
-        if status != StatusCode::SERVICE_UNAVAILABLE || Instant::now() >= deadline {
-            return Err(format!("setting the quota of {bucket} failed: {status} {response}").into());
-        }
-        sleep(Duration::from_millis(500)).await;
-    }
-}
-
-/// PUT into a quota-enabled bucket, riding out the post-start quota-admission
-/// warm-up described on [`QUOTA_ADMISSION_WARMUP_TIMEOUT`].
-///
-/// Only `ServiceUnavailable` is retried: any other failure, and a warm-up that
-/// never ends, is a genuine regression and surfaces as an error.
-async fn put_object_through_quota_warmup(client: &Client, bucket: &str, key: &str, body: &'static [u8]) -> TestResult {
-    let deadline = Instant::now() + QUOTA_ADMISSION_WARMUP_TIMEOUT;
-    loop {
-        let result = client
-            .put_object()
-            .bucket(bucket)
-            .key(key)
-            .body(ByteStream::from_static(body))
-            .send()
-            .await;
-        let error = match result {
-            Ok(_) => return Ok(()),
-            Err(error) => error,
-        };
-        let retryable = error.as_service_error().and_then(ProvideErrorMetadata::code) == Some("ServiceUnavailable");
-        if !retryable || Instant::now() >= deadline {
-            return Err(format!("PUT {bucket}/{key} failed after the quota warm-up window: {error}").into());
-        }
-        sleep(Duration::from_millis(500)).await;
-    }
-}
-
-async fn get_bucket_quota(env: &RustFSTestEnvironment, bucket: &str) -> Result<Option<u64>, BoxError> {
-    let path = format!("/rustfs/admin/v3/quota/{bucket}");
-    let (status, response) = admin_request(&env.url, Method::GET, &path, None, &env.access_key, &env.secret_key).await?;
-    if status != StatusCode::OK {
-        return Err(format!("reading the quota of {bucket} failed: {status} {response}").into());
-    }
-    let quota: serde_json::Value = serde_json::from_str(&response)?;
-    Ok(quota.get("quota").and_then(serde_json::Value::as_u64))
-}
-
-/// `GET /rustfs/admin/v3/list-remote-targets?bucket=...`.
-///
-/// Returns an error for any non-200, because rustfs#7172 made this endpoint
-/// fail closed on a `bucket-targets.json` blob the running build cannot parse.
-/// An upgrade that misreads a blob written by the previous release therefore
-/// shows up here as an error, and a silently dropped target shows up as an
-/// empty list — the caller must distinguish the two.
-async fn list_remote_targets(env: &RustFSTestEnvironment, bucket: &str) -> Result<Vec<serde_json::Value>, BoxError> {
-    let path = format!("/rustfs/admin/v3/list-remote-targets?bucket={}", urlencoding::encode(bucket));
-    let (status, response) = admin_request(&env.url, Method::GET, &path, None, &env.access_key, &env.secret_key).await?;
-    if status != StatusCode::OK {
-        return Err(format!("list-remote-targets for {bucket} failed: {status} {response}").into());
-    }
-    Ok(serde_json::from_str(&response)?)
-}
-
-/// Assert that `bucket` still carries exactly the replication target `arn`.
-async fn assert_remote_target_preserved(env: &RustFSTestEnvironment, bucket: &str, arn: &str, context: &str) -> TestResult {
-    let targets = list_remote_targets(env, bucket).await?;
-    assert_eq!(
-        targets.len(),
-        1,
-        "{context}: list-remote-targets must still report the single configured target, got {targets:?}"
-    );
-    assert_eq!(
-        targets[0].get("arn").and_then(serde_json::Value::as_str),
-        Some(arn),
-        "{context}: the target ARN changed across the restart: {targets:?}"
-    );
-    Ok(())
-}
-
-/// Configure a replication target on `bucket` pointing at the in-process fake,
-/// then attach an enabled replication rule for it. Returns the target ARN.
-async fn configure_replication(
-    env: &RustFSTestEnvironment,
-    bucket: &str,
-    target: &FakeS3Target,
-    target_bucket: &str,
-) -> Result<String, BoxError> {
-    let arn = set_replication_target_with_options(
-        env,
-        bucket,
-        ReplicationTargetOptions {
-            endpoint: &target.address(),
-            access_key: FAKE_ACCESS_KEY,
-            secret_key: FAKE_SECRET_KEY,
-            target_bucket,
-            secure: false,
-            skip_tls_verify: false,
-            ca_cert_pem: None,
-        },
-    )
-    .await?;
-    put_bucket_replication(env, bucket, &arn).await?;
-    Ok(arn)
-}
-
-async fn put_default_sse_s3_encryption(client: &Client, bucket: &str) -> TestResult {
-    let configuration = ServerSideEncryptionConfiguration::builder()
-        .rules(
-            ServerSideEncryptionRule::builder()
-                .apply_server_side_encryption_by_default(
-                    ServerSideEncryptionByDefault::builder()
-                        .sse_algorithm(ServerSideEncryption::Aes256)
-                        .build()?,
-                )
-                .build(),
-        )
-        .build()?;
-    client
-        .put_bucket_encryption()
-        .bucket(bucket)
-        .server_side_encryption_configuration(configuration)
-        .send()
-        .await?;
-    Ok(())
-}
-
-async fn assert_default_sse_s3_encryption(client: &Client, bucket: &str, context: &str) -> TestResult {
-    let response = client.get_bucket_encryption().bucket(bucket).send().await?;
-    let rules = response
-        .server_side_encryption_configuration()
-        .ok_or("GetBucketEncryption omitted the configuration")?
-        .rules();
-    assert_eq!(rules.len(), 1, "{context}: expected exactly one encryption rule, got {rules:?}");
-    assert_eq!(
-        rules[0]
-            .apply_server_side_encryption_by_default()
-            .map(ServerSideEncryptionByDefault::sse_algorithm),
-        Some(&ServerSideEncryption::Aes256),
-        "{context}: the default encryption algorithm changed"
-    );
-    Ok(())
-}
-
-async fn put_bucket_tag(client: &Client, bucket: &str) -> TestResult {
-    let tagging = Tagging::builder()
-        .tag_set(Tag::builder().key(BUCKET_TAG_KEY).value(BUCKET_TAG_VALUE).build()?)
-        .build()?;
-    client.put_bucket_tagging().bucket(bucket).tagging(tagging).send().await?;
-    Ok(())
-}
-
-async fn assert_bucket_tag(client: &Client, bucket: &str, context: &str) -> TestResult {
-    let tags = client.get_bucket_tagging().bucket(bucket).send().await?;
-    let tag_set = tags.tag_set();
-    assert_eq!(tag_set.len(), 1, "{context}: expected exactly one bucket tag, got {tag_set:?}");
-    assert_eq!(tag_set[0].key(), BUCKET_TAG_KEY, "{context}: bucket tag key changed");
-    assert_eq!(tag_set[0].value(), BUCKET_TAG_VALUE, "{context}: bucket tag value changed");
-    Ok(())
-}
-
-async fn assert_versioning_enabled(client: &Client, bucket: &str, context: &str) -> TestResult {
-    let versioning = client.get_bucket_versioning().bucket(bucket).send().await?;
-    assert_eq!(
-        versioning.status(),
-        Some(&BucketVersioningStatus::Enabled),
-        "{context}: versioning is no longer Enabled on {bucket}"
-    );
-    Ok(())
-}
-
-fn bucket_policy_document(bucket: &str) -> serde_json::Value {
-    serde_json::json!({
-        "Version": "2012-10-17",
-        "Statement": [{
-            "Sid": "UpgradePublicRead",
-            "Effect": "Allow",
-            "Principal": { "AWS": ["*"] },
-            "Action": ["s3:GetObject"],
-            "Resource": [format!("arn:aws:s3:::{bucket}/public/*")]
-        }]
-    })
-}
-
-/// `GET .../on-demand-migration/{bucket}/status`.
-///
-/// The migration module defaults on from rustfs#7089, so a bucket that never
-/// configured a source must still answer `configured: false` rather than
-/// engaging the migration path.
-async fn assert_migration_not_configured(env: &RustFSTestEnvironment, bucket: &str) -> TestResult {
-    let path = format!("/rustfs/admin/v3/on-demand-migration/{bucket}/status");
-    let (status, response) = admin_request(&env.url, Method::GET, &path, None, &env.access_key, &env.secret_key).await?;
-    assert_eq!(
-        status,
-        StatusCode::OK,
-        "the migration status endpoint must answer for an unconfigured bucket: {status} {response}"
-    );
-    let body: serde_json::Value = serde_json::from_str(&response)?;
-    assert_eq!(
-        body.get("configured"),
-        Some(&serde_json::Value::Bool(false)),
-        "a bucket upgraded from the previous release must not look migration-configured: {body}"
-    );
-    Ok(())
-}
-
-/// A GET for a key that was never written must be a plain `NoSuchKey`.
-///
-/// With the migration module on by default this is the cheap proof that an
-/// unconfigured bucket never consults a source: any migration engagement would
-/// surface as a different status or error code here.
-async fn assert_missing_key_is_no_such_key(client: &Client, bucket: &str, key: &str) -> TestResult {
-    let error = client
-        .get_object()
-        .bucket(bucket)
-        .key(key)
-        .send()
-        .await
-        .expect_err("a key that was never written must not be readable");
-    assert_eq!(
-        error.raw_response().map(|response| response.status().as_u16()),
-        Some(404),
-        "a missing key must stay a 404 on a bucket with no migration configuration"
-    );
-    assert_eq!(
-        error.as_service_error().and_then(ProvideErrorMetadata::code),
-        Some("NoSuchKey"),
-        "a missing key must stay NoSuchKey on a bucket with no migration configuration"
-    );
-    Ok(())
-}
-
-/// Bucket configuration written by the pinned previous release must survive an
-/// upgrade to the current build unchanged, and must keep working.
-///
-/// This pins the three on-disk surfaces the on-demand-migration series moved:
-///
-/// * `BucketMetadata` grew two msgpack keys (encoded map length 44 -> 46), so
-///   every configuration read below decodes a 44-key blob on 46-key code.
-/// * rustfs#7172 made an unreadable `bucket-targets.json` / encryption /
-///   public-access-block / quota blob "present but unreadable" instead of
-///   silently defaulting, and made `list-remote-targets` fail closed on it. A
-///   replication target configured by the old release must therefore still be
-///   *listed*, not dropped and not an error.
-/// * rustfs#7183 made the object write path refuse a PUT when the bucket's
-///   encryption configuration cannot be read, so a misparsed SSE config would
-///   turn every PUT to that bucket into a 500.
-///
-/// Not covered on purpose: on-demand-migration configuration itself, which the
-/// previous release has no public API for — the reverse direction is asserted
-/// instead (an upgraded bucket reports `configured: false`).
-#[tokio::test]
-#[ignore = "requires a pinned previous RustFS release binary"]
-async fn direct_upgrade_from_previous_release_preserves_bucket_configuration() -> TestResult {
-    init_logging();
-    let previous_binary = source_binary()?;
-
-    // In-process: the fake target outlives both server processes, so the
-    // replication target stays reachable across the upgrade.
-    let replication_target = FakeS3Target::start().await?;
-    replication_target.create_bucket(CONFIG_REPLICA_BUCKET);
-
-    let mut env = RustFSTestEnvironment::new().await?;
-    let server_env = bucket_config_server_env();
-    env.start_rustfs_server_from_binary(&previous_binary, vec![], &server_env)
-        .await?;
-    let old_client = env.create_s3_client();
-
-    env.create_test_bucket(CONFIG_PLAIN_BUCKET).await?;
-    env.create_test_bucket(CONFIG_ENCRYPTED_BUCKET).await?;
-    env.create_test_bucket(CONFIG_REPLICATED_BUCKET).await?;
-    old_client
-        .create_bucket()
-        .bucket(CONFIG_LOCKED_BUCKET)
-        .object_lock_enabled_for_bucket(true)
-        .send()
-        .await?;
-
-    // Plain bucket: policy, tags, lifecycle, quota.
-    let policy = bucket_policy_document(CONFIG_PLAIN_BUCKET);
-    old_client
-        .put_bucket_policy()
-        .bucket(CONFIG_PLAIN_BUCKET)
-        .policy(policy.to_string())
-        .send()
-        .await?;
-    put_bucket_tag(&old_client, CONFIG_PLAIN_BUCKET).await?;
-    old_client
-        .put_bucket_lifecycle_configuration()
-        .bucket(CONFIG_PLAIN_BUCKET)
-        .lifecycle_configuration(
-            BucketLifecycleConfiguration::builder()
-                .rules(
-                    LifecycleRule::builder()
-                        .id(LIFECYCLE_RULE_ID)
-                        .status(ExpirationStatus::Enabled)
-                        .filter(LifecycleRuleFilter::builder().prefix(LIFECYCLE_PREFIX).build())
-                        .expiration(LifecycleExpiration::builder().days(LIFECYCLE_DAYS).build())
-                        .build()?,
-                )
-                .build()?,
-        )
-        .send()
-        .await?;
-    set_bucket_quota(&env, CONFIG_PLAIN_BUCKET, BUCKET_QUOTA_BYTES).await?;
-
-    // Encrypted bucket: SSE-S3 default encryption plus a fully restrictive
-    // public access block, both of which rustfs#7172 now fails closed on.
-    put_default_sse_s3_encryption(&old_client, CONFIG_ENCRYPTED_BUCKET).await?;
-    old_client
-        .put_public_access_block()
-        .bucket(CONFIG_ENCRYPTED_BUCKET)
-        .public_access_block_configuration(
-            PublicAccessBlockConfiguration::builder()
-                .block_public_acls(true)
-                .ignore_public_acls(true)
-                .block_public_policy(true)
-                .restrict_public_buckets(true)
-                .build(),
-        )
-        .send()
-        .await?;
-
-    // Replicated bucket: versioning, a validated remote target, a rule.
-    enable_versioning(&old_client, CONFIG_REPLICATED_BUCKET).await?;
-    let target_arn = configure_replication(&env, CONFIG_REPLICATED_BUCKET, &replication_target, CONFIG_REPLICA_BUCKET).await?;
-    assert_remote_target_preserved(&env, CONFIG_REPLICATED_BUCKET, &target_arn, "before the upgrade").await?;
-
-    // Object-lock bucket: a default GOVERNANCE retention on a fresh bucket.
-    old_client
-        .put_object_lock_configuration()
-        .bucket(CONFIG_LOCKED_BUCKET)
-        .object_lock_configuration(
-            ObjectLockConfiguration::builder()
-                .object_lock_enabled(ObjectLockEnabled::Enabled)
-                .rule(
-                    ObjectLockRule::builder()
-                        .default_retention(
-                            DefaultRetention::builder()
-                                .mode(ObjectLockRetentionMode::Governance)
-                                .days(OBJECT_LOCK_DAYS)
-                                .build(),
-                        )
-                        .build(),
-                )
-                .build(),
-        )
-        .send()
-        .await?;
-
-    let plain_key = "plain/written-by-previous";
-    let plain_bytes = b"plain object written by the previous RustFS release";
-    put_object_through_quota_warmup(&old_client, CONFIG_PLAIN_BUCKET, plain_key, plain_bytes).await?;
-
-    let encrypted_key = "encrypted/written-by-previous";
-    let encrypted_bytes = b"default-encrypted object written by the previous RustFS release";
-    old_client
-        .put_object()
-        .bucket(CONFIG_ENCRYPTED_BUCKET)
-        .key(encrypted_key)
-        .body(ByteStream::from_static(encrypted_bytes))
-        .send()
-        .await?;
-    assert_eq!(
-        read_object(&old_client, CONFIG_ENCRYPTED_BUCKET, encrypted_key, None)
-            .await?
-            .0,
-        Some(ServerSideEncryption::Aes256),
-        "the previous release must apply the bucket default encryption it just accepted"
-    );
-
-    // The multipart object lives in the default-encrypted bucket so the
-    // upgraded build has to reassemble parts *and* re-derive the object key.
-    let multipart_key = "encrypted/multipart-written-by-previous";
-    let multipart_parts = vec![vec![b'm'; 5 * 1024 * 1024], b"final multipart bytes".to_vec()];
-    let multipart_bytes = multipart_parts.concat();
-    write_multipart(&old_client, CONFIG_ENCRYPTED_BUCKET, multipart_key, &multipart_parts).await?;
-
-    let versioned_key = "versioned/written-by-previous";
-    let versioned_bytes = b"versioned object written by the previous RustFS release";
-    let versioned_id = old_client
-        .put_object()
-        .bucket(CONFIG_REPLICATED_BUCKET)
-        .key(versioned_key)
-        .body(ByteStream::from_static(versioned_bytes))
-        .send()
-        .await?
-        .version_id()
-        .ok_or("versioned PUT omitted version ID")?
-        .to_string();
-
-    env.restart_server_preserving_data(vec![], &server_env).await?;
-    let new_client = env.create_s3_client();
-
-    // Every configuration must read back unchanged on the upgraded build.
-    let upgraded_policy = new_client.get_bucket_policy().bucket(CONFIG_PLAIN_BUCKET).send().await?;
-    let upgraded_policy: serde_json::Value =
-        serde_json::from_str(upgraded_policy.policy().ok_or("GetBucketPolicy omitted the document")?)?;
-    assert_eq!(upgraded_policy, policy, "the bucket policy changed across the upgrade");
-    assert_bucket_tag(&new_client, CONFIG_PLAIN_BUCKET, "after the upgrade").await?;
-
-    let lifecycle = new_client
-        .get_bucket_lifecycle_configuration()
-        .bucket(CONFIG_PLAIN_BUCKET)
-        .send()
-        .await?;
-    let rules = lifecycle.rules();
-    assert_eq!(rules.len(), 1, "the lifecycle rule count changed across the upgrade: {rules:?}");
-    assert_eq!(rules[0].id(), Some(LIFECYCLE_RULE_ID));
-    assert_eq!(rules[0].status(), &ExpirationStatus::Enabled);
-    assert_eq!(
-        rules[0].expiration().and_then(LifecycleExpiration::days),
-        Some(LIFECYCLE_DAYS),
-        "the lifecycle expiration changed across the upgrade"
-    );
-
-    assert_eq!(
-        get_bucket_quota(&env, CONFIG_PLAIN_BUCKET).await?,
-        Some(BUCKET_QUOTA_BYTES),
-        "the bucket quota changed across the upgrade"
-    );
-
-    assert_default_sse_s3_encryption(&new_client, CONFIG_ENCRYPTED_BUCKET, "after the upgrade").await?;
-    let public_access_block = new_client
-        .get_public_access_block()
-        .bucket(CONFIG_ENCRYPTED_BUCKET)
-        .send()
-        .await?;
-    let public_access_block = public_access_block
-        .public_access_block_configuration()
-        .ok_or("GetPublicAccessBlock omitted the configuration")?;
-    assert_eq!(public_access_block.block_public_acls(), Some(true));
-    assert_eq!(public_access_block.ignore_public_acls(), Some(true));
-    assert_eq!(public_access_block.block_public_policy(), Some(true));
-    assert_eq!(public_access_block.restrict_public_buckets(), Some(true));
-
-    assert_versioning_enabled(&new_client, CONFIG_REPLICATED_BUCKET, "after the upgrade").await?;
-    // rustfs#7172: neither an empty list nor an error is acceptable here.
-    assert_remote_target_preserved(&env, CONFIG_REPLICATED_BUCKET, &target_arn, "after the upgrade").await?;
-    let replication = new_client
-        .get_bucket_replication()
-        .bucket(CONFIG_REPLICATED_BUCKET)
-        .send()
-        .await?;
-    let replication_rules = replication
-        .replication_configuration()
-        .ok_or("GetBucketReplication omitted the configuration")?
-        .rules();
-    assert_eq!(
-        replication_rules.len(),
-        1,
-        "the replication rule count changed across the upgrade: {replication_rules:?}"
-    );
-    assert_eq!(
-        replication_rules[0].destination().map(|destination| destination.bucket()),
-        Some(target_arn.as_str()),
-        "the replication rule no longer points at the configured target"
-    );
-
-    let object_lock = new_client
-        .get_object_lock_configuration()
-        .bucket(CONFIG_LOCKED_BUCKET)
-        .send()
-        .await?;
-    let object_lock = object_lock
-        .object_lock_configuration()
-        .ok_or("GetObjectLockConfiguration omitted the configuration")?;
-    assert_eq!(object_lock.object_lock_enabled(), Some(&ObjectLockEnabled::Enabled));
-    let retention = object_lock
-        .rule()
-        .and_then(ObjectLockRule::default_retention)
-        .ok_or("the object lock configuration lost its default retention")?;
-    assert_eq!(retention.mode(), Some(&ObjectLockRetentionMode::Governance));
-    assert_eq!(retention.days(), Some(OBJECT_LOCK_DAYS));
-
-    // rustfs#7183: a PUT into the default-encrypted bucket must still succeed
-    // and still come back encrypted.
-    let post_upgrade_encrypted_key = "encrypted/written-after-upgrade";
-    let post_upgrade_encrypted_bytes = b"default-encrypted object written by the current RustFS build";
-    new_client
-        .put_object()
-        .bucket(CONFIG_ENCRYPTED_BUCKET)
-        .key(post_upgrade_encrypted_key)
-        .body(ByteStream::from_static(post_upgrade_encrypted_bytes))
-        .send()
-        .await?;
-    let (encryption, body) = read_object(&new_client, CONFIG_ENCRYPTED_BUCKET, post_upgrade_encrypted_key, None).await?;
-    assert_eq!(
-        encryption,
-        Some(ServerSideEncryption::Aes256),
-        "a PUT after the upgrade lost the bucket default encryption"
-    );
-    assert_eq!(body, post_upgrade_encrypted_bytes);
-
-    let post_upgrade_plain_key = "plain/written-after-upgrade";
-    let post_upgrade_plain_bytes = b"plain object written by the current RustFS build";
-    put_object_through_quota_warmup(&new_client, CONFIG_PLAIN_BUCKET, post_upgrade_plain_key, post_upgrade_plain_bytes).await?;
-    let (encryption, body) = read_object(&new_client, CONFIG_PLAIN_BUCKET, post_upgrade_plain_key, None).await?;
-    assert_eq!(encryption, None, "a bucket without default encryption must not encrypt a PUT");
-    assert_eq!(body, post_upgrade_plain_bytes);
-
-    // Every object written by the previous release reads back byte-identical.
-    assert_eq!(read_object(&new_client, CONFIG_PLAIN_BUCKET, plain_key, None).await?.1, plain_bytes);
-    let (encryption, body) = read_object(&new_client, CONFIG_ENCRYPTED_BUCKET, encrypted_key, None).await?;
-    assert_eq!(encryption, Some(ServerSideEncryption::Aes256));
-    assert_eq!(body, encrypted_bytes);
-    let (encryption, body) = read_object(&new_client, CONFIG_ENCRYPTED_BUCKET, multipart_key, None).await?;
-    assert_eq!(encryption, Some(ServerSideEncryption::Aes256));
-    assert_eq!(body, multipart_bytes, "the multipart object did not survive the upgrade");
-    assert_eq!(
-        read_object(&new_client, CONFIG_REPLICATED_BUCKET, versioned_key, Some(&versioned_id))
-            .await?
-            .1,
-        versioned_bytes
-    );
-
-    // rustfs#7089: the migration module is on by default, but a bucket that
-    // never configured a source behaves exactly as before.
-    assert_migration_not_configured(&env, CONFIG_PLAIN_BUCKET).await?;
-    assert_missing_key_is_no_such_key(&new_client, CONFIG_PLAIN_BUCKET, "plain/never-written").await?;
-
-    replication_target.shutdown().await;
-    Ok(())
-}
-
-/// Rolling back to the pinned previous release must still read the bucket
-/// metadata the current build wrote.
-///
-/// This is the other half of the `BucketMetadata` 44 -> 46 key change: the
-/// current build writes a 46-key msgpack map with `OnDemandMigrationConfigJSON`
-/// and `OnDemandMigrationConfigUpdatedAt`, and the previous release's decoder
-/// has to skip those two unknown keys instead of failing the whole blob. If it
-/// did not, every configuration read below would come back empty or error and
-/// the rollback would silently discard the bucket's configuration.
-#[tokio::test]
-#[ignore = "requires a pinned previous RustFS release binary"]
-async fn rollback_to_previous_release_reads_current_bucket_metadata() -> TestResult {
-    init_logging();
-    let previous_binary = source_binary()?;
-
-    let replication_target = FakeS3Target::start().await?;
-    replication_target.create_bucket(ROLLBACK_REPLICA_BUCKET);
-
-    let mut env = RustFSTestEnvironment::new().await?;
-    let server_env = bucket_config_server_env();
-    env.start_rustfs_server_with_env(vec![], &server_env).await?;
-    let new_client = env.create_s3_client();
-
-    env.create_test_bucket(ROLLBACK_BUCKET).await?;
-    enable_versioning(&new_client, ROLLBACK_BUCKET).await?;
-    put_default_sse_s3_encryption(&new_client, ROLLBACK_BUCKET).await?;
-    put_bucket_tag(&new_client, ROLLBACK_BUCKET).await?;
-    let target_arn = configure_replication(&env, ROLLBACK_BUCKET, &replication_target, ROLLBACK_REPLICA_BUCKET).await?;
-    assert_remote_target_preserved(&env, ROLLBACK_BUCKET, &target_arn, "before the rollback").await?;
-
-    let single_key = "rollback/single";
-    let single_bytes = b"single-part object written by the current RustFS build";
-    let single_version = new_client
-        .put_object()
-        .bucket(ROLLBACK_BUCKET)
-        .key(single_key)
-        .body(ByteStream::from_static(single_bytes))
-        .send()
-        .await?
-        .version_id()
-        .ok_or("versioned PUT omitted version ID")?
-        .to_string();
-
-    let multipart_key = "rollback/multipart";
-    let multipart_parts = vec![vec![b'r'; 5 * 1024 * 1024], b"final rollback bytes".to_vec()];
-    let multipart_bytes = multipart_parts.concat();
-    write_multipart(&new_client, ROLLBACK_BUCKET, multipart_key, &multipart_parts).await?;
-
-    restart_from_binary(&mut env, &previous_binary, &server_env).await?;
-    let old_client = env.create_s3_client();
-
-    assert_versioning_enabled(&old_client, ROLLBACK_BUCKET, "after the rollback").await?;
-    assert_default_sse_s3_encryption(&old_client, ROLLBACK_BUCKET, "after the rollback").await?;
-    assert_bucket_tag(&old_client, ROLLBACK_BUCKET, "after the rollback").await?;
-    assert_remote_target_preserved(&env, ROLLBACK_BUCKET, &target_arn, "after the rollback").await?;
-
-    let (encryption, body) = read_object(&old_client, ROLLBACK_BUCKET, single_key, Some(&single_version)).await?;
-    assert_eq!(encryption, Some(ServerSideEncryption::Aes256));
-    assert_eq!(body, single_bytes);
-    let (encryption, body) = read_object(&old_client, ROLLBACK_BUCKET, multipart_key, None).await?;
-    assert_eq!(encryption, Some(ServerSideEncryption::Aes256));
-    assert_eq!(body, multipart_bytes, "the multipart object did not survive the rollback");
-
-    // A PUT on the rolled-back release must still honour the encryption
-    // configuration it decoded out of the current build's metadata blob.
-    let post_rollback_key = "rollback/written-after-rollback";
-    let post_rollback_bytes = b"object written by the previous RustFS release after the rollback";
-    old_client
-        .put_object()
-        .bucket(ROLLBACK_BUCKET)
-        .key(post_rollback_key)
-        .body(ByteStream::from_static(post_rollback_bytes))
-        .send()
-        .await?;
-    let (encryption, body) = read_object(&old_client, ROLLBACK_BUCKET, post_rollback_key, None).await?;
-    assert_eq!(
-        encryption,
-        Some(ServerSideEncryption::Aes256),
-        "the rolled-back release lost the bucket default encryption"
-    );
-    assert_eq!(body, post_rollback_bytes);
-
-    replication_target.shutdown().await;
-    Ok(())
-}
@@ -31,7 +31,6 @@ workspace = true

 [features]
 default = []
-gcs = ["dep:google-cloud-storage", "dep:google-cloud-auth"]
 # Compiles the controlled list-objects namespace-journal chaos injector into a
 # production binary (it is always available to tests). Off by default so the
 # RUSTFS_LIST_OBJECTS_NAMESPACE_JOURNAL_CHAOS_* env vars cannot rewrite journal
@@ -213,8 +212,8 @@ aws-smithy-runtime-api = { workspace = true, features = ["http-1x"] }
 parking_lot = { workspace = true }
 base64-simd.workspace = true
 serde_urlencoded.workspace = true
-google-cloud-storage = { workspace = true, optional = true }
-google-cloud-auth = { workspace = true, optional = true }
+google-cloud-storage = { workspace = true }
+google-cloud-auth = { workspace = true }
 faster-hex = { workspace = true }
 ratelimit = { workspace = true }
 aws-smithy-http-client = { workspace = true, default-features = false, features = ["rustls-aws-lc"] }
@@ -245,7 +244,6 @@ windows-sys = { workspace = true, features = [
 windows-sys = { workspace = true, features = ["Win32_System_Ioctl"] }

 [dev-dependencies]
-aws-smithy-async.workspace = true
 tokio = { workspace = true, features = ["rt-multi-thread", "macros", "test-util", "fs"] }
 criterion = { workspace = true, features = ["html_reports"] }
 temp-env = { workspace = true, features = ["async_closure"] }
@@ -37,6 +37,16 @@ pub mod bucket {
    }

    pub mod lifecycle {
+        pub mod legacy_transition_state_reconcile {
+            pub use crate::bucket::lifecycle::legacy_transition_state_reconcile::{
+                LegacyTransitionStateCopyRepresentation, LegacyTransitionStateMetadataAlias, LegacyTransitionStateReconcileError,
+                LegacyTransitionStateReconcileOutcome, LegacyTransitionStateReconcileReadiness,
+                LegacyTransitionStateReconcileRequest, LegacyTransitionStateReconcileResponse,
+                LegacyTransitionStateReconcileSelector, LegacyTransitionStateSetRepresentation, LegacyTransitionStateSource,
+                LegacyTransitionStateTarget,
+            };
+        }
+
        pub mod bucket_lifecycle_audit {
            pub use crate::bucket::lifecycle::bucket_lifecycle_audit::LcEventSrc;
        }
@@ -146,25 +156,66 @@ pub mod bucket {
        };
    }

-    pub mod metadata_sys {
-        pub use crate::bucket::metadata_sys::{
-            BUCKET_CONFIG_PUBLISH_HOOK, BucketConfigPublishHook, BucketMetadataMutationGuard, BucketMetadataSys,
-            ObjectLockConfigState, acquire_bucket_metadata_transaction_lock,
-            acquire_bucket_metadata_transaction_lock_for_incarnation, acquire_scanner_bucket_incarnation_fence,
-            capture_bucket_metadata_incarnation, delete, delete_if_incarnation, delete_if_incarnation_at,
-            delete_under_transaction_lock, get, get_accelerate_config, get_bucket_policy, get_bucket_policy_raw,
-            get_bucket_targets_config, get_config_from_disk, get_cors_config, get_durability_config,
-            get_global_bucket_metadata_sys, get_lifecycle_config, get_logging_config, get_notification_config,
-            get_object_lock_config, get_object_lock_config_state, get_on_demand_migration_config,
-            get_on_demand_migration_config_in, get_public_access_block_config, get_quota_config, get_replication_config,
-            get_request_payment_config, get_sse_config, get_tagging_config, get_versioning_config, get_website_config,
-            init_bucket_metadata_sys, list_bucket_targets, reload_bucket_metadata, remove_bucket_metadata, set_bucket_metadata,
-            update, update_bucket_targets_under_transaction_lock, update_config_with, update_if_incarnation,
-            update_if_incarnation_at, update_quota_if_incarnation, update_quota_if_incarnation_at, update_under_transaction_lock,
-            update_under_transaction_lock_at,
+    pub mod on_demand_migration {
+        pub use crate::bucket::on_demand_migration::{
+            ApplyOutcome, BREAKER_FAILURE_THRESHOLD, BREAKER_FAILURE_WINDOW, BREAKER_HALF_OPEN_MAX_PROBES, BREAKER_OPEN_DURATION,
+            Breaker, BreakerState, BreakerTransition, BreakerVerdict, BucketOdmState, GLOBAL_ON_DEMAND_MIGRATION_SYS, GaugeGuard,
+            LastSourceError, LatencyBucketSnapshot, NEGATIVE_CACHE_MAX_ENTRIES, NegativeCache, OdmBucketSnapshot, OdmLookup,
+            OdmOp, OdmOutcome, OdmStateError, OdmStats, OdmStatsSnapshot, OnDemandMigrationSys, PullError, PullFailureReason,
+            PullFollower, PullLeader, PullOutcome, PullPath, PullResult, PullSlot, SOURCE_LATENCY_BUCKET_BOUNDS_MS,
+            SourceLatencySnapshot, source_client_spec,
        };
+        pub use crate::bucket::on_demand_migration::{
+            ConfigPublishHook, FilterConfig, HeadPolicy, ON_DEMAND_MIGRATION_CONFIG_HOOK, ON_DEMAND_MIGRATION_CONFIG_VERSION,
+            OnDemandMigrationConfig, OnDemandMigrationConfigError, PathStyle, PolicyConfig, Provider, RangeGetPolicy,
+            SourceConfig, SourceCredentials, SourceErrorPolicy, SourceTimeout, TlsConfig, ValidationContext,
+        };
+        pub use crate::bucket::on_demand_migration::{
+            EnqueueOutcome, LocalObject, MAX_MULTIPART_PARTS, OdmWriteBack, PULL_MAX_RETRIES, PULL_RETRY_BASE_DELAYS,
+            PullCompletion, PullQueue, PullReason, PullSource, QueuedPullOutcome, SourceBody, SourceIdleGuard, WriteBackBody,
+            WriteBackError, WriteBackOutcome, WriteBackPart, WriteBackRequest, commit_inline, commit_inline_with,
+            idle_guarded_body,
+        };
+        pub use crate::bucket::on_demand_migration::{
+            FetchRequest, LIST_THROUGH_TOKEN_VERSION, ListEntryKey, ListThroughCursor, ListThroughMerger, ListThroughToken,
+            ListThroughTokenError, MAX_LIST_FETCHES_PER_SIDE, MergeOutcome, MergePick, MergeSide, SOURCE_LIST_MAX_RATE_WAIT,
+            SOURCE_LIST_RATE_PER_SEC, SourceListPlan, SourceListRateLimiter, decode_continuation_token, source_list_plan,
+        };
+        pub mod backfill {
+            pub use crate::bucket::on_demand_migration::backfill::{
+                BACKFILL_CHECKPOINT_FILE, BACKFILL_CHECKPOINT_FORMAT_VERSION, BACKFILL_FAILED_KEYS_CAPACITY, BACKFILL_LEASE,
+                BACKFILL_LEASE_LOCK_PREFIX, BACKFILL_LIST_PAGE_SIZE, BACKFILL_RECOVERY_INTERVAL, BACKFILL_SAVE_EVERY_KEYS,
+                BACKFILL_SAVE_INTERVAL, BackfillCheckpoint, BackfillContext, BackfillContextFactory, BackfillError,
+                BackfillLastError, BackfillOwner, BackfillRecoveryStats, BackfillRequest, BackfillRunner, BackfillState,
+                BucketBackfillContext, LocalBackfillObject, PriorityPullPermits, PullPermit, PullPriority, SkipExisting,
+                StoredCheckpoint, SysBackfillContexts, global_backfill_runner, install_global_backfill_runner, key_hash,
+                read_checkpoint, run_backfill_recovery_loop, spawn_backfill_recovery_loop,
+            };
+        }
+        pub mod source_client {
+            pub use crate::bucket::on_demand_migration::source_client::{
+                SourceClient, SourceClientSpec, SourceError, SourceGet, SourceHead, SourceListRequest, SourceObject, SourcePage,
+                SourceProbe, SourceProvider, SourceSse, SourceTimeouts, USER_AGENT_SUFFIX, is_multipart_etag, range_header_value,
+                resolve_path_style,
+            };
+        }
+    }
+
+    pub mod metadata_sys {
        #[cfg(feature = "test-util")]
-        pub use crate::bucket::metadata_sys::{ConfigWriteLockProbe, test_support};
+        pub use crate::bucket::metadata_sys::ConfigWriteLockProbe;
+        pub use crate::bucket::metadata_sys::{
+            BucketMetadataMutationGuard, BucketMetadataSys, ObjectLockConfigState, acquire_bucket_metadata_transaction_lock,
+            acquire_bucket_metadata_transaction_lock_for_incarnation, capture_bucket_metadata_incarnation, delete,
+            delete_if_incarnation, delete_under_transaction_lock, get, get_accelerate_config, get_bucket_policy,
+            get_bucket_policy_raw, get_bucket_targets_config, get_config_from_disk, get_cors_config, get_durability_config,
+            get_global_bucket_metadata_sys, get_lifecycle_config, get_logging_config, get_notification_config,
+            get_object_lock_config, get_object_lock_config_state, get_on_demand_migration_config, get_public_access_block_config,
+            get_quota_config, get_replication_config, get_request_payment_config, get_sse_config, get_tagging_config,
+            get_versioning_config, get_website_config, init_bucket_metadata_sys, list_bucket_targets, reload_bucket_metadata,
+            remove_bucket_metadata, set_bucket_metadata, update, update_bucket_targets_under_transaction_lock,
+            update_config_with, update_if_incarnation, update_quota_if_incarnation, update_under_transaction_lock,
+        };
    }

    pub mod migration {
@@ -207,14 +258,7 @@ pub mod bucket {
    pub mod remote_s3_client {
        pub use crate::bucket::remote_s3_client::{
            PathStyle, RemoteCredentials, RemoteS3ClientError, RemoteS3EndpointSpec, RemoteS3RetryPolicy, build_remote_s3_client,
-            build_remote_s3_config, validate_remote_endpoint, validate_target_ca_pem,
-        };
-    }
-
-    pub mod sealed_credentials {
-        pub use crate::bucket::sealed_credentials::{
-            CredentialSealer, SEALED_CREDENTIAL_VERSION, SealScope, SealedCredential, SealedCredentialError,
-            SealedCredentialStore, credential_sealer, install_credential_sealer, seal_secret, unseal_secret,
+            validate_remote_endpoint,
        };
    }

@@ -438,11 +482,9 @@ pub mod notification {
    #[cfg(any(test, feature = "test-util"))]
    pub use crate::services::notification_sys::rotate_cross_pool_fence_fleet_proof_for_test;
    pub use crate::services::notification_sys::{
-        ClusterTierDailyStats, CrossPoolFenceFleetProofToken, LegacyTransitionStateReconcileFleetProofToken, NotificationPeerErr,
-        NotificationSys, ScannerPublicationLeaseGrant, acquire_cross_pool_fence_fleet_proof,
-        acquire_legacy_transition_state_reconcile_fleet_proof, cross_pool_fence_fleet_proof_matches, get_global_notification_sys,
-        legacy_transition_state_reconcile_fleet_proof_matches, new_global_notification_sys,
-        scanner_peer_transport_error_message_is_retryable, start_remote_version_state_fleet_probe,
+        ClusterTierDailyStats, CrossPoolFenceFleetProofToken, NotificationPeerErr, NotificationSys, ScannerPublicationLeaseGrant,
+        acquire_cross_pool_fence_fleet_proof, cross_pool_fence_fleet_proof_matches, get_global_notification_sys,
+        new_global_notification_sys, scanner_peer_transport_error_message_is_retryable, start_remote_version_state_fleet_probe,
    };
 }

@@ -453,9 +495,9 @@ pub mod object {
        ObjectInfo, ObjectLockConfigSnapshot, ObjectMutationHook, ObjectOptions, PutObjReader, QuotaAdmission,
        RangedDecompressReader, ReadEncryptionMaterial, ReadEncryptionMode, ReadEncryptionRequest,
        SCANNER_PUBLICATION_LEASE_FENCE_METADATA_KEY, ScannerPublicationCommitScope, ScannerPublicationCommitStartError,
-        ScannerPublicationCommitState, StreamConsumer, WriteCompletion, get_object_body_cache_plaintext_len,
-        lookup_get_object_body_cache_hook, register_get_object_body_cache_hook, register_object_mutation_hook,
-        unregister_get_object_body_cache_hook, unregister_object_mutation_hook,
+        ScannerPublicationCommitState, StreamConsumer, get_object_body_cache_plaintext_len, lookup_get_object_body_cache_hook,
+        register_get_object_body_cache_hook, register_object_mutation_hook, unregister_get_object_body_cache_hook,
+        unregister_object_mutation_hook,
    };
    pub use crate::store::{
        PrepareSelectObjectSnapshotError, PreparedGetObjectReader, SelectObjectSnapshot, SelectObjectSnapshotReadError,
@@ -519,12 +561,6 @@ pub mod set_disk {
    pub mod test_util {
        pub use crate::bucket::quota::reservation::fail_next_quota_ledger_save_for_test;
        pub use crate::set_disk::{MultipartCommitBarrier, MultipartCommitPause, PutObjectCommitBarrier, PutObjectCommitPause};
-
-        /// Keep a namespace commit pending until the returned owner is dropped.
-        #[must_use]
-        pub fn hold_namespace_commit(store: &crate::store::ECStore) -> impl Send + Sync {
-            store.ctx.begin_namespace_commit()
-        }
    }
 }

@@ -59,7 +59,7 @@ use rustfs_utils::http::{
    insert_header,
 };
 use serde::{Deserialize, Serialize};
-use std::collections::{HashMap, HashSet};
+use std::collections::HashMap;
 use std::error::Error;
 use std::fmt;
 use std::str::FromStr as _;
@@ -376,11 +376,6 @@ pub struct BucketTargetSys {
    /// [`SsecPassthroughCapability`]; reset alongside `arn_remotes_map`.
    ssec_passthrough_map: Arc<RwLock<HashMap<String, SsecPassthroughRecord>>>,
    pub targets_map: Arc<RwLock<HashMap<String, Vec<BucketTarget>>>>,
-    /// Buckets whose persisted `bucket-targets.json` exists but cannot be
-    /// decoded (rustfs/backlog#2282). Written under the bucket's update mutex
-    /// alongside `targets_map`, and read before it so an unreadable
-    /// configuration surfaces as a typed error instead of an empty target set.
-    unreadable_targets: Arc<RwLock<HashSet<String>>>,
    pub h_mutex: Arc<RwLock<HashMap<String, EpHealth>>>,
    target_h_mutex: Arc<RwLock<HashMap<String, EpHealth>>>,
    pub hc_client: Arc<HttpClient>,
@@ -424,7 +419,6 @@ impl BucketTargetSys {
            arn_remotes_map: Arc::new(RwLock::new(HashMap::new())),
            ssec_passthrough_map: Arc::new(RwLock::new(HashMap::new())),
            targets_map: Arc::new(RwLock::new(HashMap::new())),
-            unreadable_targets: Arc::new(RwLock::new(HashSet::new())),
            h_mutex: Arc::new(RwLock::new(HashMap::new())),
            target_h_mutex: Arc::new(RwLock::new(HashMap::new())),
            hc_client: Arc::new(build_health_check_client()),
@@ -634,40 +628,30 @@ impl BucketTargetSys {
        health_map.clone()
    }

-    /// Targets of one bucket, or of every bucket when `bucket` is empty.
-    ///
-    /// A bucket that simply has no targets yields an empty list; a bucket
-    /// whose persisted configuration cannot be decoded is an error, so an
-    /// admin listing reports the fault instead of an empty list that reads as
-    /// "replication is not configured" (rustfs/backlog#2282).
-    pub async fn list_targets(&self, bucket: &str, arn_type: &str) -> Result<Vec<BucketTarget>, BucketTargetError> {
+    pub async fn list_targets(&self, bucket: &str, arn_type: &str) -> Vec<BucketTarget> {
        let health_stats = self.target_health_stats().await;
        let mut targets = Vec::new();

        if !bucket.is_empty() {
-            match self.list_bucket_targets(bucket).await {
-                Ok(bucket_targets) => {
-                    for mut target in bucket_targets.targets {
-                        if arn_type.is_empty() || target.target_type.to_string() == arn_type {
-                            if let Some(health) = health_stats.get(&target.arn) {
-                                target.total_downtime = health.offline_duration;
-                                target.online = health.online;
-                                target.last_online = health.last_online;
-                                target.latency = target::LatencyStat {
-                                    curr: health.latency.curr,
-                                    avg: health.latency.avg,
-                                    max: health.latency.peak,
-                                };
-                                target.offline_count = health.offline_count;
-                            }
-                            targets.push(target);
+            if let Ok(bucket_targets) = self.list_bucket_targets(bucket).await {
+                for mut target in bucket_targets.targets {
+                    if arn_type.is_empty() || target.target_type.to_string() == arn_type {
+                        if let Some(health) = health_stats.get(&target.arn) {
+                            target.total_downtime = health.offline_duration;
+                            target.online = health.online;
+                            target.last_online = health.last_online;
+                            target.latency = target::LatencyStat {
+                                curr: health.latency.curr,
+                                avg: health.latency.avg,
+                                max: health.latency.peak,
+                            };
+                            target.offline_count = health.offline_count;
                        }
+                        targets.push(target);
                    }
                }
-                Err(BucketTargetError::BucketRemoteTargetNotFound { .. }) => {}
-                Err(err) => return Err(err),
            }
-            return Ok(targets);
+            return targets;
        }

        let targets_map = self.targets_map.read().await;
@@ -690,16 +674,10 @@ impl BucketTargetSys {
            }
        }

-        Ok(targets)
+        targets
    }

    pub async fn list_bucket_targets(&self, bucket: &str) -> Result<BucketTargets, BucketTargetError> {
-        if self.unreadable_targets.read().await.contains(bucket) {
-            return Err(BucketTargetError::BucketRemoteTargetsUnreadable {
-                bucket: bucket.to_string(),
-            });
-        }
-
        let targets_map = self.targets_map.read().await;
        if let Some(targets) = targets_map.get(bucket) {
            Ok(BucketTargets {
@@ -712,30 +690,13 @@ impl BucketTargetSys {
        }
    }

-    /// Record that this bucket's persisted targets configuration exists but
-    /// cannot be decoded (rustfs/backlog#2282).
-    ///
-    /// Any snapshot published from an earlier readable load is deliberately
-    /// left in place: withdrawing it would produce exactly the silent "no
-    /// targets configured" state this marker exists to prevent. The marker is
-    /// cleared by the next successful publish, which is what makes a repaired
-    /// configuration take effect without a restart.
-    pub async fn mark_targets_unreadable(&self, bucket: &str) {
-        let update_mutex = self.target_update_mutex(bucket).await;
-        let _update_guard = update_mutex.lock().await;
-
-        self.unreadable_targets.write().await.insert(bucket.to_string());
-    }
-
    pub async fn delete(&self, bucket: &str) {
        let update_mutex = self.target_update_mutex(bucket).await;
        let _update_guard = update_mutex.lock().await;

-        // Lock order: unreadable_targets, then targets_map, then
-        // arn_remotes_map, then target_h_mutex, then ssec_passthrough_map
-        // (always last; also taken standalone by the capability accessors).
-        self.unreadable_targets.write().await.remove(bucket);
-
+        // Lock order: targets_map, then arn_remotes_map, then target_h_mutex,
+        // then ssec_passthrough_map (always last; also taken standalone by the
+        // capability accessors).
        let mut targets_map = self.targets_map.write().await;
        let mut arn_remotes_map = self.arn_remotes_map.write().await;
        let mut health_map = self.target_h_mutex.write().await;
@@ -1132,11 +1093,6 @@ impl BucketTargetSys {
    /// Keeping persisted-config reads under the same mutex prevents a stale
    /// reload from overwriting a concurrent credential rotation.
    async fn update_all_targets_locked(&self, bucket: &str, targets: Option<&BucketTargets>) {
-        // Reaching here means the persisted configuration decoded, so the
-        // unreadable marker (if any) is stale. Cleared before the maps below
-        // so `unreadable_targets` stays the outermost of this module's locks.
-        self.unreadable_targets.write().await.remove(bucket);
-
        let mut clients = Vec::new();
        if let Some(new_targets) = targets {
            for target in &new_targets.targets {
@@ -1144,9 +1100,9 @@ impl BucketTargetSys {
            }
        }

-        // Lock order: unreadable_targets (above), then targets_map, then
-        // arn_remotes_map, then target_h_mutex, then ssec_passthrough_map
-        // (always last; also taken standalone by the capability accessors).
+        // Lock order: targets_map, then arn_remotes_map, then target_h_mutex,
+        // then ssec_passthrough_map (always last; also taken standalone by the
+        // capability accessors).
        let mut targets_map = self.targets_map.write().await;
        let mut arn_remotes_map = self.arn_remotes_map.write().await;
        let mut health_map = self.target_h_mutex.write().await;
@@ -1205,11 +1161,6 @@ impl BucketTargetSys {
    }

    pub async fn set(&self, bucket: &str, meta: &BucketMetadata) {
-        if meta.bucket_targets_unreadable() {
-            self.mark_targets_unreadable(bucket).await;
-            return;
-        }
-
        let Some(config) = &meta.bucket_target_config else {
            return;
        };
@@ -2325,13 +2276,6 @@ pub enum BucketTargetError {
    BucketRemoteTargetNotFound {
        bucket: String,
    },
-    /// The bucket's persisted targets configuration exists but cannot be
-    /// decoded. Distinct from `BucketRemoteTargetNotFound`, which means the
-    /// bucket genuinely has no targets: callers must not degrade this one to
-    /// an empty target set (rustfs/backlog#2282).
-    BucketRemoteTargetsUnreadable {
-        bucket: String,
-    },
    BucketRemoteArnTypeInvalid {
        bucket: String,
    },
@@ -2365,9 +2309,6 @@ impl fmt::Display for BucketTargetError {
            BucketTargetError::BucketRemoteTargetNotFound { bucket } => {
                write!(f, "Remote target not found for bucket: {bucket}")
            }
-            BucketTargetError::BucketRemoteTargetsUnreadable { bucket } => {
-                write!(f, "Persisted replication target configuration is unreadable for bucket: {bucket}")
-            }
            BucketTargetError::BucketRemoteArnTypeInvalid { bucket } => {
                write!(f, "Invalid ARN type for bucket: {bucket}")
            }
@@ -3315,7 +3256,7 @@ mod tests {
            }],
        );

-        let targets = sys.list_targets("", "").await.expect("listing every bucket's targets");
+        let targets = sys.list_targets("", "").await;

        assert_eq!(targets.len(), 1);
        assert!(!targets[0].online);
@@ -87,12 +87,16 @@ use rustfs_filemeta::{
 use rustfs_scanner_metrics::metrics::{
    IlmAction, Metrics, ScannerLifecycleExpiryStateUpdate, ScannerLifecycleTransitionStateUpdate, global_metrics,
 };
-use rustfs_utils::{get_env_i64, get_env_usize, path::encode_dir_object, string::parse_bool};
+use rustfs_utils::{
+    get_env_i64, get_env_usize,
+    path::encode_dir_object,
+    string::{parse_bool, strings_has_prefix_fold},
+};
 use s3s::dto::{
    BucketLifecycleConfiguration, ExpirationStatus, ObjectLockConfiguration, RestoreRequest, RestoreRequestType, RestoreStatus,
    Timestamp,
 };
-use s3s::header::X_AMZ_RESTORE;
+use s3s::header::{X_AMZ_RESTORE, X_AMZ_SERVER_SIDE_ENCRYPTION};
 use sha2::{Digest, Sha256};
 use std::any::Any;
 use std::collections::{BTreeMap, HashMap, HashSet};
@@ -161,6 +165,7 @@ pub const AMZ_TAG_COUNT: &str = "x-amz-tagging-count";
    reason = "MinIO-parity tier/lifecycle entry point that this port never wired (backlog#1823)"
 )]
 pub const AMZ_TAG_DIRECTIVE: &str = "X-Amz-Tagging-Directive";
+pub const AMZ_ENCRYPTION_AES: &str = "AES256";
 #[allow(
    dead_code,
    reason = "MinIO-parity tier/lifecycle entry point that this port never wired (backlog#1823)"
@@ -660,6 +665,7 @@ fn transition_remote_version_delete_plan(oi: &ObjectInfo) -> Result<TransitionDe
 #[derive(Clone, Copy, Debug, Eq, PartialEq)]
 struct ResolvedTransitionDeleteVersion {
    version_id_exact: bool,
+    verify_missing_after_delete: bool,
    remote_already_missing: bool,
 }

@@ -685,32 +691,41 @@ async fn resolve_transition_delete_version_plan(
    match delete_plan {
        TransitionDeleteVersionPlan::Direct { version_id_exact } => Ok(ResolvedTransitionDeleteVersion {
            version_id_exact,
+            verify_missing_after_delete: false,
            remote_already_missing: false,
        }),
        TransitionDeleteVersionPlan::ProbeLegacyUnknown => {
-            let expected_version = oi.transitioned_object.version_id.as_str();
-            if expected_version.is_empty() {
-                return Err(std::io::Error::new(
-                    std::io::ErrorKind::WouldBlock,
-                    "remote tier cannot safely delete a legacy object without an exact version ID",
-                ));
-            }
-            let probe = lease
-                .probe_transition_version(&oi.transitioned_object.name, expected_version)
-                .await?;
-            match (expected_version, probe) {
+            let probe = lease.probe_transition_candidate(&oi.transitioned_object.name).await?;
+            match (oi.transitioned_object.version_id.as_str(), probe) {
+                ("", crate::services::tier::warm_backend::TransitionCandidateProbe::UnversionedPresent) => {
+                    Ok(ResolvedTransitionDeleteVersion {
+                        version_id_exact: false,
+                        verify_missing_after_delete: true,
+                        remote_already_missing: false,
+                    })
+                }
                (expected, crate::services::tier::warm_backend::TransitionCandidateProbe::VersionedPresent(actual))
-                    if expected == actual =>
+                    if !expected.is_empty() && expected == actual =>
                {
                    lease.validate_remote_version_id(expected)?;
                    Ok(ResolvedTransitionDeleteVersion {
                        version_id_exact: true,
+                        verify_missing_after_delete: false,
+                        remote_already_missing: false,
+                    })
+                }
+                ("null", crate::services::tier::warm_backend::TransitionCandidateProbe::SuspendedNullPresent) => {
+                    lease.validate_remote_version_id("null")?;
+                    Ok(ResolvedTransitionDeleteVersion {
+                        version_id_exact: true,
+                        verify_missing_after_delete: false,
                        remote_already_missing: false,
                    })
                }
                (_, crate::services::tier::warm_backend::TransitionCandidateProbe::Missing) => {
                    Ok(ResolvedTransitionDeleteVersion {
                        version_id_exact: false,
+                        verify_missing_after_delete: false,
                        remote_already_missing: true,
                    })
                }
@@ -741,6 +756,15 @@ async fn execute_resolved_transition_delete(
        )
        .await?;
    }
+    if resolved.verify_missing_after_delete
+        && lease.probe_transition_candidate(&oi.transitioned_object.name).await?
+            != crate::services::tier::warm_backend::TransitionCandidateProbe::Missing
+    {
+        return Err(std::io::Error::new(
+            std::io::ErrorKind::WouldBlock,
+            "remote tier could not confirm legacy unversioned deletion",
+        ));
+    }
    Ok(())
 }

@@ -5025,24 +5049,24 @@ fn attach_tier_operation_lease(mut reader: GetObjectReader, lease: TierOperation
    reader
 }

-/// Resolve the RestoreObject request options.
-///
-/// Returns the typed [`StorageError`]: flattening these into an opaque
-/// `io::Error` string erased the identity the S3 layer needs to answer
-/// InvalidArgument instead of a generic 500 (backlog#2205).
-pub async fn post_restore_opts(version_id: &str, bucket: &str, object: &str) -> Result<ObjectOptions, Error> {
+pub async fn post_restore_opts(version_id: &str, bucket: &str, object: &str) -> Result<ObjectOptions, std::io::Error> {
    let versioned = BucketVersioningSys::prefix_enabled(bucket, object).await;
    let version_suspended = BucketVersioningSys::prefix_suspended(bucket, object).await;
    let vid = version_id.trim();
    if !vid.is_empty() && vid != NULL_VERSION_ID {
        if let Err(_err) = Uuid::parse_str(vid) {
-            return Err(StorageError::InvalidVersionID(bucket.to_string(), object.to_string(), vid.to_string()));
+            return Err(std::io::Error::other(
+                StorageError::InvalidVersionID(bucket.to_string(), object.to_string(), vid.to_string()).to_string(),
+            ));
        }
        if !versioned && !version_suspended {
-            return Err(StorageError::InvalidArgument(
-                bucket.to_string(),
-                object.to_string(),
-                format!("version-id specified {vid} but versioning is not enabled on {bucket}"),
+            return Err(std::io::Error::other(
+                StorageError::InvalidArgument(
+                    bucket.to_string(),
+                    object.to_string(),
+                    format!("version-id specified {} but versioning is not enabled on {}", vid, bucket),
+                )
+                .to_string(),
            ));
        }
    }
@@ -5095,18 +5119,43 @@ pub async fn put_restore_opts(
    }
    meta.insert(X_AMZ_STORAGE_CLASS.as_str().to_lowercase(), sc);*/

-    // A SELECT restore must never reach the restore writer: the caller writes
-    // the retrieved bytes back to the source bucket/object, so building
-    // SELECT output options here produced a source overwrite carrying only
-    // the OutputLocation metadata instead of a write to `OutputLocation.S3`
-    // (backlog#1341). RestoreObject rejects SELECT at the API boundary; this
-    // is the fail-closed backstop for any other caller.
-    if rreq
-        .type_
-        .as_ref()
-        .is_some_and(|type_| type_.as_str() == RestoreRequestType::SELECT)
+    if let Some(type_) = &rreq.type_
+        && type_.as_str() == RestoreRequestType::SELECT
    {
-        return Err(std::io::Error::other("SELECT restore requests are not supported"));
+        let Some(s3) = select_restore_s3_location(rreq)? else {
+            return Err(std::io::Error::other("OutputLocation.S3 required for SELECT requests"));
+        };
+        if let Some(user_metadata) = s3.user_metadata.as_ref() {
+            for metadata in user_metadata {
+                let name = metadata
+                    .name
+                    .as_deref()
+                    .ok_or_else(|| std::io::Error::other("SELECT restore metadata name is required"))?;
+                let value = metadata.value.clone().unwrap_or_default();
+                if strings_has_prefix_fold(name, "x-amz-meta") {
+                    meta.insert(name.to_string(), value);
+                } else {
+                    meta.insert(format!("x-amz-meta-{name}"), value);
+                }
+            }
+        }
+        if let Some(tags) = &s3.tagging {
+            meta.insert(
+                AMZ_OBJECT_TAGGING.to_string(),
+                serde_urlencoded::to_string(tags.tag_set.clone()).unwrap_or_else(|_| "".to_string()),
+            );
+        }
+        if let Some(encryption) = &s3.encryption
+            && encryption.encryption_type.as_str() != ""
+        {
+            meta.insert(X_AMZ_SERVER_SIDE_ENCRYPTION.as_str().to_string(), AMZ_ENCRYPTION_AES.to_string());
+        }
+        return Ok(ObjectOptions {
+            versioned: BucketVersioningSys::prefix_enabled(bucket, object).await,
+            version_suspended: BucketVersioningSys::prefix_suspended(bucket, object).await,
+            user_defined: meta,
+            ..Default::default()
+        });
    }
    for (k, v) in oi.user_defined.iter() {
        meta.insert(k.to_string(), v.clone());
@@ -6925,7 +6974,7 @@ mod tests {

    #[cfg(feature = "test-util")]
    #[tokio::test]
-    async fn free_version_delete_probes_exact_version_hidden_by_current_delete_marker() {
+    async fn free_version_delete_probes_legacy_unknown_exact_version_before_remove() {
        let manager = TierConfigMgr::new();
        let tier = "WARM";
        let backend = register_mock_tier(&manager, tier).await;
@@ -6942,17 +6991,6 @@ mod tests {
            .expect("mock remote object should be stored");
        let mut user_defined = user_defined_with_tier_destination_identity(identity);
        insert_legacy_transition_version_id(&mut user_defined, &remote_version);
-        backend
-            .set_transition_candidate_probe_override(Some(TransitionCandidateProbe::Missing))
-            .await;
-        assert_eq!(
-            backend
-                .probe_transition_candidate_state(&remote_object)
-                .await
-                .expect("current remote view should be readable"),
-            TransitionCandidateProbe::Missing,
-            "a current delete marker must hide the historical data version from an unversioned probe"
-        );
        backend.clear_op_log().await;
        let object_info = ObjectInfo {
            transitioned_object: TransitionedObject {
@@ -6976,13 +7014,13 @@ mod tests {
        assert_eq!(
            backend.op_log().await,
            vec![
-                MockWarmOp::Get {
+                MockWarmOp::Probe {
                    object: remote_object.clone()
                },
                MockWarmOp::Remove {
                    object: remote_object.clone()
                },
-                MockWarmOp::Get {
+                MockWarmOp::Probe {
                    object: remote_object.clone()
                },
            ]
@@ -6995,7 +7033,7 @@ mod tests {

    #[cfg(feature = "test-util")]
    #[tokio::test]
-    async fn free_version_delete_retains_legacy_unknown_unversioned_object() {
+    async fn free_version_delete_probes_legacy_unknown_unversioned_before_remove() {
        let manager = TierConfigMgr::new();
        let tier = "WARM";
        let backend = register_mock_tier(&manager, tier).await;
@@ -7027,34 +7065,40 @@ mod tests {
            ..Default::default()
        };

-        let err = super::delete_free_version_remote_object(&object_info, &manager)
+        super::delete_free_version_remote_object(&object_info, &manager)
            .await
-            .expect_err("legacy unversioned cleanup cannot exclude a versioning-state race");
+            .expect("probe-proven legacy unversioned cleanup should delete the remote object");

-        assert_eq!(err.kind(), std::io::ErrorKind::WouldBlock);
-        assert!(backend.op_log().await.is_empty());
-        assert_eq!(backend.remove_count().await, 0);
-        assert!(backend.remove_versions().await.is_empty());
+        assert_eq!(
+            backend.op_log().await,
+            vec![
+                MockWarmOp::Probe {
+                    object: remote_object.clone()
+                },
+                MockWarmOp::Remove {
+                    object: remote_object.clone()
+                },
+                MockWarmOp::Probe {
+                    object: remote_object.clone()
+                },
+            ]
+        );
+        assert_eq!(backend.remove_versions().await, vec![(remote_object, String::new())]);
    }

    #[cfg(feature = "test-util")]
    #[tokio::test]
-    async fn free_version_delete_does_not_remove_a_different_remote_version() {
+    async fn free_version_delete_retains_legacy_unknown_when_probe_disagrees() {
        let manager = TierConfigMgr::new();
        let tier = "WARM";
        let backend = register_mock_tier(&manager, tier).await;
        let identity = test_tier_destination_identity(&manager, tier).await;
        let remote_object = format!("remote/{}", Uuid::new_v4());
-        backend.set_put_remote_version(Some("different-version".to_string())).await;
        backend
-            .put(
-                &remote_object,
-                ReaderImpl::Body(Bytes::from_static(b"different remote version")),
-                i64::try_from(b"different remote version".len()).expect("body length should fit"),
-            )
-            .await
-            .expect("different remote version should be stored");
-        backend.clear_op_log().await;
+            .set_transition_candidate_probe_override(Some(TransitionCandidateProbe::VersionedPresent(
+                "different-version".to_string(),
+            )))
+            .await;
        let mut user_defined = user_defined_with_tier_destination_identity(identity);
        insert_legacy_transition_version_id(&mut user_defined, "legacy-version");
        let object_info = ObjectInfo {
@@ -7069,13 +7113,13 @@ mod tests {
            ..Default::default()
        };

-        super::delete_free_version_remote_object(&object_info, &manager)
+        let err = super::delete_free_version_remote_object(&object_info, &manager)
            .await
-            .expect("a missing exact legacy version should be an idempotent cleanup success");
+            .expect_err("legacy unknown cleanup must not delete when the probe disagrees");

-        assert_eq!(backend.op_log().await, vec![MockWarmOp::Get { object: remote_object }]);
+        assert_eq!(err.kind(), std::io::ErrorKind::WouldBlock);
+        assert_eq!(backend.op_log().await, vec![MockWarmOp::Probe { object: remote_object }]);
        assert_eq!(backend.remove_count().await, 0);
-        assert!(backend.remove_versions().await.is_empty());
    }

    #[cfg(feature = "test-util")]
@@ -25,7 +25,6 @@ use super::{
    manual_transition_job, tier_delete_journal, transition_transaction,
 };
 use crate::error::{Error, Result};
-use crate::services::tier::tier_probe_intent;

 pub(crate) const ILM_META_PREFIX: &str = "ilm";
 const ILM_META_OBJECT_PREFIX: &str = "ilm/";
@@ -36,7 +35,6 @@ pub(crate) enum DurableIlmRecordKind {
    TierDeleteJournal,
    TierDeleteDispatchManifest,
    TransitionTransaction,
-    TierProbeIntent,
    ManualTransitionJob,
    ManualTransitionScope,
    ManualTransitionTask,
@@ -75,12 +73,6 @@ pub(crate) const TRANSITION_TRANSACTION_NAMESPACE: DurableIlmNamespace = Durable
    max_record_size: transition_transaction::MAX_TRANSITION_TRANSACTION_SIZE,
    kind: DurableIlmRecordKind::TransitionTransaction,
 };
-pub(crate) const TIER_PROBE_INTENT_NAMESPACE: DurableIlmNamespace = DurableIlmNamespace {
-    name: "tier-probe-intent",
-    prefix: tier_probe_intent::TIER_PROBE_INTENT_RECORD_PREFIX,
-    max_record_size: tier_probe_intent::MAX_TIER_PROBE_INTENT_SIZE,
-    kind: DurableIlmRecordKind::TierProbeIntent,
-};
 pub(crate) const MANUAL_TRANSITION_JOB_NAMESPACE: DurableIlmNamespace = DurableIlmNamespace {
    name: "manual-transition-job",
    prefix: "ilm/manual-transition/jobs",
@@ -106,12 +98,11 @@ pub(crate) const MANUAL_TRANSITION_WORKER_RESULT_NAMESPACE: DurableIlmNamespace
    kind: DurableIlmRecordKind::ManualTransitionWorkerResult,
 };

-pub(crate) const DURABLE_ILM_NAMESPACES: [DurableIlmNamespace; 9] = [
+pub(crate) const DURABLE_ILM_NAMESPACES: [DurableIlmNamespace; 8] = [
    TIER_DELETE_JOURNAL_NAMESPACE,
    TIER_DELETE_JOURNAL_V6_NAMESPACE,
    TIER_DELETE_DISPATCH_MANIFEST_NAMESPACE,
    TRANSITION_TRANSACTION_NAMESPACE,
-    TIER_PROBE_INTENT_NAMESPACE,
    MANUAL_TRANSITION_JOB_NAMESPACE,
    MANUAL_TRANSITION_SCOPE_NAMESPACE,
    MANUAL_TRANSITION_TASK_NAMESPACE,
@@ -209,15 +200,6 @@ pub(crate) enum DurableIlmRecordCheckpoint {
        revision: u64,
        state: transition_transaction::TransitionTransactionState,
    },
-    TierProbeIntent {
-        content_sha256: String,
-        identity_sha256: String,
-        remote_version_sha256: String,
-        remote_version_known: bool,
-        owner_fence_sha256: String,
-        revision: u64,
-        state: tier_probe_intent::TierProbeIntentState,
-    },
    ManualTransitionJob {
        content_sha256: String,
        identity_sha256: String,
@@ -250,7 +232,6 @@ impl DurableIlmRecordCheckpoint {
            | Self::TierDeleteDispatchManifest { content_sha256, .. }
            | Self::TierDeleteDispatchParent { content_sha256, .. }
            | Self::TransitionTransaction { content_sha256, .. }
-            | Self::TierProbeIntent { content_sha256, .. }
            | Self::ManualTransitionJob { content_sha256, .. }
            | Self::ManualTransitionScope { content_sha256, .. }
            | Self::ManualTransitionTask { content_sha256 }
@@ -440,32 +421,6 @@ impl DurableIlmRecordCheckpoint {
                        .is_some_and(|expected_revision| *next_revision == expected_revision)
                    && (!previous_remote_version_known || previous_remote_version == next_remote_version)
            }
-            (
-                Self::TierProbeIntent {
-                    identity_sha256: previous_identity,
-                    remote_version_sha256: previous_remote_version,
-                    remote_version_known: previous_remote_version_known,
-                    owner_fence_sha256: previous_owner_fence,
-                    revision: previous_revision,
-                    state: previous_state,
-                    ..
-                },
-                Self::TierProbeIntent {
-                    identity_sha256: next_identity,
-                    remote_version_sha256: next_remote_version,
-                    owner_fence_sha256: next_owner_fence,
-                    revision: next_revision,
-                    state: next_state,
-                    ..
-                },
-            ) => {
-                previous_identity == next_identity
-                    && previous_owner_fence == next_owner_fence
-                    && next_revision
-                        .checked_sub(*previous_revision)
-                        .is_some_and(|distance| distance == 1 && tier_probe_state_reaches(*previous_state, *next_state, distance))
-                    && (!previous_remote_version_known || previous_remote_version == next_remote_version)
-            }
            (
                Self::ManualTransitionJob {
                    content_sha256: previous_content,
@@ -545,14 +500,6 @@ impl DurableIlmRecordCheckpoint {
    /// after the exact terminal ETag and terminal receipt were committed, to
    /// purge older object versions exposed by that deletion.
    pub(crate) fn is_predecessor_of_terminal(&self, terminal: &Self) -> bool {
-        if let Self::TierProbeIntent { state, .. } = terminal
-            && !matches!(
-                state,
-                tier_probe_intent::TierProbeIntentState::AbortedNoRemote | tier_probe_intent::TierProbeIntentState::Completed
-            )
-        {
-            return false;
-        }
        if self == terminal || self.validate_successor(terminal).is_ok() {
            return true;
        }
@@ -621,37 +568,6 @@ impl DurableIlmRecordCheckpoint {
                        }
                    })
            }
-            (
-                Self::TierProbeIntent {
-                    identity_sha256: previous_identity,
-                    remote_version_sha256: previous_remote_version,
-                    remote_version_known: previous_remote_version_known,
-                    owner_fence_sha256: previous_owner_fence,
-                    revision: previous_revision,
-                    state: previous_state,
-                    ..
-                },
-                Self::TierProbeIntent {
-                    identity_sha256: terminal_identity,
-                    remote_version_sha256: terminal_remote_version,
-                    owner_fence_sha256: terminal_owner_fence,
-                    revision: terminal_revision,
-                    state: terminal_state,
-                    ..
-                },
-            ) => {
-                previous_identity == terminal_identity
-                    && previous_owner_fence == terminal_owner_fence
-                    && matches!(
-                        terminal_state,
-                        tier_probe_intent::TierProbeIntentState::AbortedNoRemote
-                            | tier_probe_intent::TierProbeIntentState::Completed
-                    )
-                    && terminal_revision
-                        .checked_sub(*previous_revision)
-                        .is_some_and(|distance| tier_probe_state_reaches(*previous_state, *terminal_state, distance))
-                    && (!previous_remote_version_known || previous_remote_version == terminal_remote_version)
-            }
            _ => false,
        }
    }
@@ -690,23 +606,6 @@ fn transition_state_distance(
    }
 }

-fn tier_probe_state_reaches(
-    from: tier_probe_intent::TierProbeIntentState,
-    to: tier_probe_intent::TierProbeIntentState,
-    revision_distance: u64,
-) -> bool {
-    use tier_probe_intent::TierProbeIntentState::{AbortedNoRemote, CleanupPending, Completed, UploadOutcomeUnknown, Uploaded};
-
-    match (from, to) {
-        (UploadOutcomeUnknown, Uploaded | CleanupPending | AbortedNoRemote) => revision_distance == 1,
-        (UploadOutcomeUnknown, Completed) => matches!(revision_distance, 2 | 3),
-        (Uploaded, CleanupPending) => revision_distance == 1,
-        (Uploaded, Completed) => revision_distance == 2,
-        (CleanupPending, Completed) => revision_distance == 1,
-        _ => false,
-    }
-}
-
 fn manual_job_state_reaches(
    from: manual_transition_job::ManualTransitionJobState,
    to: manual_transition_job::ManualTransitionJobState,
@@ -1183,42 +1082,6 @@ pub(crate) fn validate_durable_ilm_record(path: &str, data: &[u8]) -> Result<Val
                },
            )
        }
-        DurableIlmRecordKind::TierProbeIntent => {
-            let probe_id = tier_probe_intent::tier_probe_intent_id_from_record_object_name(path)
-                .map_err(|err| Error::other(err.to_string()))?;
-            let intent =
-                tier_probe_intent::TierProbeIntent::decode(probe_id, data).map_err(|err| Error::other(err.to_string()))?;
-            let canonical =
-                tier_probe_intent::tier_probe_intent_record_object_name(probe_id).map_err(|err| Error::other(err.to_string()))?;
-            if canonical != path {
-                return Err(Error::other("tier probe intent path is not canonical"));
-            }
-            let identity_sha256 = checkpoint_hash(&(
-                intent.probe_id,
-                &intent.operation,
-                &intent.tier_name,
-                intent.destination_id,
-                &intent.probe_object,
-                &intent.creator_id,
-                intent.creator_epoch,
-                intent.created_at_unix_nanos,
-            ))?;
-            let remote_version_sha256 = checkpoint_hash(&intent.remote_version)?;
-            let owner_fence_sha256 = checkpoint_hash(&intent.owner)?;
-            (
-                "probe_id",
-                probe_id.to_string(),
-                DurableIlmRecordCheckpoint::TierProbeIntent {
-                    content_sha256,
-                    identity_sha256,
-                    remote_version_sha256,
-                    remote_version_known: !intent.remote_version.is_unknown(),
-                    owner_fence_sha256,
-                    revision: intent.revision,
-                    state: intent.state,
-                },
-            )
-        }
        DurableIlmRecordKind::ManualTransitionJob => {
            let job_id = manual_transition_job::manual_transition_job_id_from_record_object_name(path)
                .map_err(|err| Error::other(err.to_string()))?;
@@ -1374,102 +1237,6 @@ mod tests {
        }
    }

-    fn tier_probe_intent_fixture() -> tier_probe_intent::TierProbeIntent {
-        let probe_id = Uuid::parse_str("36e2220e-9ad2-495b-b3bc-c4d2caf70a31").expect("fixture uuid should parse");
-        tier_probe_intent::TierProbeIntent {
-            probe_id,
-            revision: 1,
-            state: tier_probe_intent::TierProbeIntentState::UploadOutcomeUnknown,
-            operation: tier_probe_intent::TierProbeOperationIdentity::Verify {
-                config_etag: "config-etag".to_string(),
-                backend_identity: [1; 32],
-            },
-            tier_name: "COLD-A".to_string(),
-            destination_id: [1; 32],
-            probe_object: tier_probe_intent::tier_probe_object_name(probe_id),
-            creator_id: "node-a".to_string(),
-            creator_epoch: Uuid::parse_str("76746062-c05a-40b7-9e38-d2722d7e0332").expect("fixture creator epoch should parse"),
-            created_at_unix_nanos: 1_780_000_000_000_000_000,
-            owner: tier_probe_intent::TierProbeOwnerFence {
-                owner_id: "node-a".to_string(),
-                owner_epoch: Uuid::parse_str("76746062-c05a-40b7-9e38-d2722d7e0332").expect("fixture owner epoch should parse"),
-                not_after_unix_nanos: 1_780_000_900_000_000_000,
-            },
-            remote_version: tier_probe_intent::TierProbeRemoteVersion::default(),
-        }
-    }
-
-    fn tier_probe_checkpoint(intent: &tier_probe_intent::TierProbeIntent) -> DurableIlmRecordCheckpoint {
-        let path =
-            tier_probe_intent::tier_probe_intent_record_object_name(intent.probe_id).expect("tier probe path should build");
-        let encoded = intent.encode().expect("tier probe intent should encode");
-        let namespace = classify_durable_ilm_record(&path)
-            .expect("tier probe namespace should classify")
-            .expect("tier probe intent should be durable");
-        assert_eq!(namespace, &TIER_PROBE_INTENT_NAMESPACE);
-        validate_durable_ilm_record(&path, &encoded)
-            .expect("tier probe intent should validate")
-            .checkpoint
-    }
-
-    #[test]
-    fn tier_probe_intent_checkpoint_tracks_exact_monotonic_generations() {
-        let initial_intent = tier_probe_intent_fixture();
-        let initial = tier_probe_checkpoint(&initial_intent);
-
-        let mut uploaded_intent = initial_intent;
-        uploaded_intent
-            .advance(
-                tier_probe_intent::TierProbeIntentState::Uploaded,
-                tier_probe_intent::TierProbeRemoteVersion::versioned("opaque-v1"),
-            )
-            .expect("uploaded state should advance");
-        let uploaded = tier_probe_checkpoint(&uploaded_intent);
-        initial
-            .validate_successor(&uploaded)
-            .expect("durable receipt may adopt the exact uploaded generation");
-
-        let mut cleanup_intent = uploaded_intent.clone();
-        cleanup_intent
-            .advance(
-                tier_probe_intent::TierProbeIntentState::CleanupPending,
-                uploaded_intent.remote_version.clone(),
-            )
-            .expect("cleanup state should advance");
-        let cleanup = tier_probe_checkpoint(&cleanup_intent);
-        uploaded
-            .validate_successor(&cleanup)
-            .expect("durable receipt may adopt the exact cleanup generation");
-
-        let mut completed_intent = cleanup_intent.clone();
-        completed_intent
-            .advance(tier_probe_intent::TierProbeIntentState::Completed, cleanup_intent.remote_version.clone())
-            .expect("completed state should advance");
-        let completed = tier_probe_checkpoint(&completed_intent);
-        cleanup
-            .validate_successor(&completed)
-            .expect("durable receipt may adopt the exact terminal generation");
-        assert!(
-            initial.is_predecessor_of_terminal(&completed),
-            "terminal cleanup must recognize the full acknowledged-PUT path"
-        );
-        assert!(
-            initial.validate_successor(&completed).is_err(),
-            "ordinary receipt advancement must not skip intermediate generations"
-        );
-        assert!(
-            !initial.is_predecessor_of_terminal(&uploaded),
-            "a nonterminal generation must not be accepted as terminal proof"
-        );
-
-        let mut rebound = uploaded_intent;
-        rebound.owner.owner_epoch = Uuid::new_v4();
-        assert!(
-            rebound.encode().is_err(),
-            "dormant v1 must reject owner takeover before producing a checkpoint"
-        );
-    }
-
    #[test]
    fn tier_delete_dispatch_manifest_namespace_validates_monotonic_branches() {
        use tier_delete_journal::TierDeleteDispatchManifestState::{Aborted, Aborting, Completed, DispatchAuthorized, Preparing};
@@ -1170,7 +1170,6 @@ pub async fn save_manual_transition_job_record_if_current(
        data.clone(),
        &ObjectOptions {
            max_parity: true,
-            write_completion: crate::object_api::WriteCompletion::TailDrained,
            http_preconditions: Some(HTTPPreconditions {
                if_match: Some(current_etag.to_string()),
                ..Default::default()
@@ -1243,7 +1242,6 @@ pub(crate) async fn save_manual_transition_worker_result_if_absent(
        data,
        &ObjectOptions {
            max_parity: true,
-            write_completion: crate::object_api::WriteCompletion::TailDrained,
            http_preconditions: Some(HTTPPreconditions {
                if_none_match: Some("*".to_string()),
                ..Default::default()
@@ -1272,7 +1270,6 @@ pub(crate) async fn save_manual_transition_task_if_absent(
        data,
        &ObjectOptions {
            max_parity: true,
-            write_completion: crate::object_api::WriteCompletion::TailDrained,
            http_preconditions: Some(HTTPPreconditions {
                if_none_match: Some("*".to_string()),
                ..Default::default()
@@ -1624,7 +1621,6 @@ pub async fn save_manual_transition_scope_admission_if_absent(
        data.clone(),
        &ObjectOptions {
            max_parity: true,
-            write_completion: crate::object_api::WriteCompletion::TailDrained,
            http_preconditions: Some(HTTPPreconditions {
                if_none_match: Some("*".to_string()),
                ..Default::default()
@@ -1676,7 +1672,6 @@ pub async fn save_manual_transition_scope_admission_if_current(
        data.clone(),
        &ObjectOptions {
            max_parity: true,
-            write_completion: crate::object_api::WriteCompletion::TailDrained,
            http_preconditions: Some(HTTPPreconditions {
                if_match: Some(current_etag.to_string()),
                ..Default::default()
@@ -18,6 +18,7 @@ mod config_boundary;
 pub mod core;
 mod durable_namespace;
 pub mod evaluator;
+pub mod legacy_transition_state_reconcile;
 pub mod manual_transition_job;
 mod metadata_boundary;
 pub(crate) use metadata_boundary::{LifecycleExpiryConfigs, get_expiry_configs, get_lifecycle_config};
@@ -1733,7 +1733,6 @@ async fn save_config_if_none_fenced(
        data.clone(),
        &ObjectOptions {
            max_parity: true,
-            write_completion: crate::object_api::WriteCompletion::TailDrained,
            http_preconditions: Some(HTTPPreconditions {
                if_none_match: Some("*".to_string()),
                ..Default::default()
@@ -1833,7 +1832,6 @@ async fn save_decommission_manifest_checkpoint_if_match(

        let mut opts = ObjectOptions {
            max_parity: true,
-            write_completion: crate::object_api::WriteCompletion::TailDrained,
            no_lock: true,
            http_preconditions: Some(HTTPPreconditions {
                if_match: Some(observed_etag),
@@ -1962,7 +1960,6 @@ async fn save_config_if_match_fenced(
        data.clone(),
        &ObjectOptions {
            max_parity: true,
-            write_completion: crate::object_api::WriteCompletion::TailDrained,
            http_preconditions: Some(HTTPPreconditions {
                if_match: Some(etag.to_string()),
                ..Default::default()
@@ -3783,7 +3780,6 @@ where
                data.clone(),
                &ObjectOptions {
                    max_parity: true,
-                    write_completion: crate::object_api::WriteCompletion::TailDrained,
                    http_preconditions: Some(HTTPPreconditions {
                        if_none_match: Some("*".to_string()),
                        ..Default::default()
@@ -3873,7 +3869,6 @@ where
                data.clone(),
                &ObjectOptions {
                    max_parity: true,
-                    write_completion: crate::object_api::WriteCompletion::TailDrained,
                    http_preconditions: Some(HTTPPreconditions {
                        if_match: Some(etag),
                        ..Default::default()
@@ -3898,7 +3893,6 @@ where
                data.clone(),
                &ObjectOptions {
                    max_parity: true,
-                    write_completion: crate::object_api::WriteCompletion::TailDrained,
                    http_preconditions: Some(HTTPPreconditions {
                        if_none_match: Some("*".to_string()),
                        ..Default::default()
@@ -15,6 +15,8 @@
 #![allow(unused_variables)]
 #![allow(unused_mut)]
 #![allow(unused_assignments)]
+#![allow(unused_must_use)]
+#![allow(clippy::all)]

 use super::runtime_boundary as runtime_sources;
 use crate::bucket::lifecycle::bucket_lifecycle_ops::ExpiryOp;
@@ -70,11 +72,9 @@ static REMOTE_DELETE_BREAKER: LazyLock<Mutex<RemoteDeleteBreaker>> = LazyLock::n
 });

 #[cfg(test)]
-type RemoteTierDeleteTestHook = Box<dyn Fn(&str, &str, &str) -> std::io::Result<()> + Send + Sync>;
-
-#[cfg(test)]
-static REMOTE_TIER_DELETE_TEST_HOOK: std::sync::LazyLock<std::sync::Mutex<Option<RemoteTierDeleteTestHook>>> =
-    std::sync::LazyLock::new(|| std::sync::Mutex::new(None));
+static REMOTE_TIER_DELETE_TEST_HOOK: std::sync::LazyLock<
+    std::sync::Mutex<Option<Box<dyn Fn(&str, &str, &str) -> std::io::Result<()> + Send + Sync>>>,
+> = std::sync::LazyLock::new(|| std::sync::Mutex::new(None));

 #[derive(Debug)]
 struct RemoteDeleteBreaker {
@@ -107,7 +107,7 @@ impl RemoteDeleteBreaker {
    fn prune(&mut self, now: Instant) {
        while let Some(ts) = self.failures.front().copied() {
            if now.duration_since(ts) > self.window {
-                let _ = self.failures.pop_front();
+                self.failures.pop_front();
            } else {
                break;
            }
@@ -137,10 +137,10 @@ fn is_signer_header_error(err: &std::io::Error) -> bool {
        return false;
    }

-    if let Some(source) = err.get_ref()
-        && error_chain_contains_signer_header_marker(source)
-    {
-        return true;
+    if let Some(source) = err.get_ref() {
+        if error_chain_contains_signer_header_marker(source) {
+            return true;
+        }
    }

    let message = err.to_string().to_ascii_lowercase();
@@ -205,7 +205,7 @@ impl ObjSweeper {

    #[allow(dead_code, reason = "MinIO-parity surface with no caller in this port (backlog#1823)")]
    pub fn with_version(&mut self, vid: Option<Uuid>) -> &Self {
-        self.version_id = vid;
+        self.version_id = vid.clone();
        self
    }

@@ -219,7 +219,7 @@ impl ObjSweeper {
    #[allow(dead_code, reason = "MinIO-parity surface with no caller in this port (backlog#1823)")]
    pub fn get_opts(&self) -> lifecycle::ObjectOpts {
        let mut opts = ObjectOpts {
-            version_id: self.version_id,
+            version_id: self.version_id.clone(),
            versioned: self.versioned,
            version_suspended: self.suspended,
            ..Default::default()
@@ -388,8 +388,8 @@ impl Jentry {
 impl ExpiryOp for Jentry {
    fn op_hash(&self) -> u64 {
        let mut hasher = Sha256::new();
-        hasher.update(self.tier_name.as_bytes());
-        hasher.update(self.obj_name.as_bytes());
+        hasher.update(format!("{}", self.tier_name).as_bytes());
+        hasher.update(format!("{}", self.obj_name).as_bytes());
        xxh64::xxh64(hasher.finalize().as_slice(), XXHASH_SEED)
    }

@@ -436,7 +436,7 @@ async fn delete_object_from_remote_tier_raw_with_manager(
    tier_name: &str,
    tier_config_mgr: &Arc<tokio::sync::RwLock<TierConfigMgr>>,
 ) -> Result<(), std::io::Error> {
-    let lease = TierConfigMgr::acquire_operation_lease(tier_config_mgr, tier_name)
+    let lease = TierConfigMgr::acquire_operation_lease(&tier_config_mgr, tier_name)
        .await
        .map_err(std::io::Error::other)?;
    delete_object_from_remote_tier_raw_with_lease(obj_name, rv_id, &lease, false, true).await
@@ -612,7 +612,6 @@ pub(crate) async fn save_transition_transaction_record(
        data.clone(),
        &ObjectOptions {
            max_parity: true,
-            write_completion: crate::object_api::WriteCompletion::TailDrained,
            http_preconditions: Some(HTTPPreconditions {
                if_none_match: Some("*".to_string()),
                ..Default::default()
@@ -659,7 +658,6 @@ pub(crate) async fn save_transition_transaction_record_if_current(
        data.clone(),
        &ObjectOptions {
            max_parity: true,
-            write_completion: crate::object_api::WriteCompletion::TailDrained,
            http_preconditions: Some(HTTPPreconditions {
                if_match: Some(etag),
                ..Default::default()
@@ -832,6 +830,7 @@ impl From<TransitionCandidateProbe> for TransitionOperatorProbe {
        match value {
            TransitionCandidateProbe::Missing => Self::Missing,
            TransitionCandidateProbe::UnversionedPresent => Self::UnversionedPresent,
+            TransitionCandidateProbe::SuspendedNullPresent => Self::VersionedPresent("null".to_string()),
            TransitionCandidateProbe::VersionedPresent(version_id) => Self::VersionedPresent(version_id),
            TransitionCandidateProbe::Ambiguous => Self::Ambiguous,
            TransitionCandidateProbe::Unsupported => Self::Unsupported,
@@ -1185,6 +1184,10 @@ async fn recover_unknown_upload_outcome(
        TransitionCandidateProbe::UnversionedPresent => {
            cleanup_recovered_unknown_upload_candidate(api, transaction, TransitionRemoteVersion::unversioned()).await
        }
+        TransitionCandidateProbe::SuspendedNullPresent => {
+            cleanup_recovered_unknown_upload_candidate(api, transaction, TransitionRemoteVersion::versioned("null".to_string()))
+                .await
+        }
        TransitionCandidateProbe::VersionedPresent(version_id)
            if Uuid::parse_str(&version_id).is_ok_and(|version_id| version_id.is_nil()) =>
        {
@@ -1514,6 +1517,14 @@ mod tests {

    const BACKEND_FINGERPRINT: [u8; 32] = [7; 32];

+    #[test]
+    fn suspended_null_probe_preserves_operator_null_version_semantics() {
+        assert_eq!(
+            TransitionOperatorProbe::from(TransitionCandidateProbe::SuspendedNullPresent),
+            TransitionOperatorProbe::VersionedPresent("null".to_string())
+        );
+    }
+
    #[derive(Default)]
    struct MemoryTransactionStore {
        records: HashMap<Uuid, Vec<u8>>,
@@ -477,29 +477,28 @@ impl BucketMetadata {
        !self.table_bucket_config_json.is_empty()
    }

-    /// `bucket-targets.json` is stored for this bucket but this build cannot
-    /// decode it.
-    ///
-    /// Keeps "no replication targets configured" and "the target
-    /// configuration cannot be read" apart, the same distinction the
-    /// `fabricated` marker draws for the bucket metadata as a whole. Only
-    /// meaningful after [`Self::parse_all_configs`] has run; readers must fail
-    /// closed on `true` instead of serving an empty target set.
-    pub fn bucket_targets_unreadable(&self) -> bool {
-        !self.bucket_targets_config_json.is_empty() && self.bucket_target_config.is_none()
-    }
-
-    /// Opaque application-owned configuration with its persisted update time.
-    /// Empty bytes mean absent or cleared; decoding belongs to the consumer.
-    pub fn on_demand_migration_config(&self) -> Option<(&[u8], OffsetDateTime)> {
-        (!self.on_demand_migration_config_json.is_empty()).then_some((
-            self.on_demand_migration_config_json.as_slice(),
-            self.on_demand_migration_config_updated_at,
-        ))
-    }
-
    /// Parsed per-bucket durability override, if a valid one is stored.
-    /// Invalid payloads follow the global mode after logging a parse failure.
+    ///
+    /// Absent/empty/unparsable payloads all mean "no override" (the bucket
+    /// follows the global durability mode); a parse failure is logged so a
+    /// corrupted entry cannot silently change fsync behavior.
+    /// Parsed on-demand migration config, if one is stored.
+    ///
+    /// `Ok(None)` means no config (absent or cleared). A stored payload that
+    /// does not parse is an error, never a default: the runtime must not
+    /// pull from a source it cannot describe.
+    pub fn on_demand_migration_config(
+        &self,
+    ) -> std::result::Result<
+        Option<super::on_demand_migration::OnDemandMigrationConfig>,
+        super::on_demand_migration::OnDemandMigrationConfigError,
+    > {
+        if self.on_demand_migration_config_json.is_empty() {
+            return Ok(None);
+        }
+        super::on_demand_migration::OnDemandMigrationConfig::from_json(&self.on_demand_migration_config_json).map(Some)
+    }
+
    pub fn durability_config(&self) -> Option<super::durability::BucketDurabilityConfig> {
        if self.durability_config_json.is_empty() {
            return None;
@@ -791,22 +790,9 @@ impl BucketMetadata {
        }
    }

-    /// Replace one config payload and stamp its `*_config_updated_at` with the
-    /// local clock. This is the entry for edits that originate here: the
-    /// local write time is the edit's source time.
    pub fn update_config(&mut self, config_file: &str, data: Vec<u8>) -> Result<OffsetDateTime> {
-        self.update_config_at(config_file, data, OffsetDateTime::now_utc())
-    }
+        let updated = OffsetDateTime::now_utc();

-    /// [`Self::update_config`] with an explicit `updated_at` stamp.
-    ///
-    /// For a config replicated from another site the edit's source time is
-    /// the peer's `updated_at`, not the moment it lands here: staleness of
-    /// the next incoming item is judged against the stored stamp, so stamping
-    /// the local apply time would reject a newer source edit that was merely
-    /// delivered late (backlog#2292). Only replication receivers should pass
-    /// a foreign time; local edits keep [`Self::update_config`].
-    pub fn update_config_at(&mut self, config_file: &str, data: Vec<u8>, updated: OffsetDateTime) -> Result<OffsetDateTime> {
        match config_file {
            BUCKET_POLICY_CONFIG => {
                self.policy_config_json = data;
@@ -918,6 +904,13 @@ impl BucketMetadata {
                self.durability_config_updated_at = updated;
            }
            BUCKET_ON_DEMAND_MIGRATION_CONFIG => {
+                // Structural check only (shape, unknown fields); the
+                // deployment-relative rules run in the admin handler with a
+                // `ValidationContext`. A blob this build cannot read must not
+                // be persisted for every later reader to trip over.
+                if !data.is_empty() {
+                    super::on_demand_migration::OnDemandMigrationConfig::from_json(&data).map_err(Error::other)?;
+                }
                self.on_demand_migration_config_json = data;
                self.on_demand_migration_config_updated_at = updated;
            }
@@ -971,32 +964,7 @@ impl BucketMetadata {
        Ok(())
    }

-    /// Decode every stored sub-configuration into its typed field.
-    ///
-    /// A decode failure never fails the whole load: this runs on every bucket
-    /// metadata read, including startup and peer reload, so one bucket's
-    /// corrupt sub-configuration must not make the bucket — or the node —
-    /// unloadable. Instead the failure is *retained*: the raw bytes stay
-    /// untouched and the typed field stays `None`, so `!raw.is_empty() &&
-    /// typed.is_none()` is the durable "exists but cannot be read" signal that
-    /// each accessor keys off. Which accessors must fail closed on it:
-    ///
-    /// | Config | Verdict |
-    /// |---|---|
-    /// | policy | Fails closed: `get_bucket_policy` re-parses the raw JSON and propagates the error; `get_bucket_policy_raw` returns the stored bytes. |
-    /// | object lock | Fails closed in `object_lock_config_state_from_authoritative_metadata`; a retention decision may never be taken on a guess. |
-    /// | versioning | Fails closed in `get_versioning_config`; guessing Unversioned would make delete markers and version ids diverge from what is on disk. |
-    /// | replication | Fails closed in `get_replication_config`. |
-    /// | bucket targets | Fails closed in `get_bucket_targets_config`, and `sync_bucket_target_sys` marks the bucket unreadable in `BucketTargetSys` instead of publishing an empty target set (rustfs/backlog#2282). |
-    /// | encryption | Fails closed in `get_sse_config`: degrading to "no default encryption" stores plaintext objects the operator required to be encrypted. |
-    /// | public access block | Fails closed in `get_public_access_block_config`: degrading grants the anonymous access the operator asked to block. |
-    /// | quota | Fails closed in `get_quota_config`; the enforcement path in `quota::checker` already re-parses the raw JSON and refuses on error. |
-    /// | lifecycle | Safe to degrade: no rules means no expiration and no transition, so nothing is deleted or moved on the strength of an unreadable rule set. The bucket keeps serving reads and writes. |
-    /// | notification | Safe to degrade: events are an outbound side channel; no consumer draws a durability or authorization conclusion from their absence. |
-    /// | tagging | Safe to degrade: bucket tags are cost-allocation labels here; object-level tag conditions come from object metadata, not this blob. |
-    /// | CORS | Safe to degrade: an absent CORS configuration rejects cross-origin browser requests, which is already the restrictive direction. |
-    /// | logging, website, accelerate, request payment, bucket ACL | Safe to degrade: each only shapes an optional response or an optional side channel, and none of them authorizes an action or decides whether data is retained. |
-    pub(super) fn parse_all_configs(&mut self) -> Result<()> {
+    fn parse_all_configs(&mut self) -> Result<()> {
        if let Err(e) = self.parse_policy_config() {
            tracing::warn!(
                event = "bucket_metadata_parse_failed",
@@ -1120,26 +1088,20 @@ impl BucketMetadata {
                "Failed to parse bucket metadata config"
            );
        }
-        // A stored targets blob that cannot be decoded must not collapse into
-        // the empty target set: that is indistinguishable from "no replication
-        // configured", so replication stops and no caller ever sees an error
-        // (rustfs/backlog#2282). Leaving the typed field `None` while the raw
-        // bytes stay non-empty is the retained parse failure every targets
-        // reader keys off; the bytes are preserved so the configuration is
-        // still recoverable.
-        self.bucket_target_config = None;
        if !self.bucket_targets_config_json.is_empty() {
-            match serde_json::from_slice::<BucketTargets>(&self.bucket_targets_config_json) {
-                Ok(targets) => self.bucket_target_config = Some(targets),
-                Err(e) => tracing::error!(
+            if let Err(e) = serde_json::from_slice::<BucketTargets>(&self.bucket_targets_config_json)
+                .map(|t| self.bucket_target_config = Some(t))
+            {
+                tracing::warn!(
                    event = "bucket_metadata_parse_failed",
                    component = "ecstore",
                    subsystem = "bucket_metadata",
                    bucket = %self.name,
                    config = "bucket_targets",
                    error = %e,
-                    "Bucket replication targets are unreadable; replication for this bucket fails closed"
-                ),
+                    "Failed to parse bucket metadata config"
+                );
+                self.bucket_target_config = Some(BucketTargets::default());
            }
        } else {
            self.bucket_target_config = Some(BucketTargets::default());
@@ -1538,39 +1500,6 @@ mod test {
        assert_eq!(metadata.bucket_incarnation_id, incarnation);
    }

-    /// backlog#2292: a replicated config is stamped with the source
-    /// `updated_at` it was given, not the local clock, while the plain
-    /// `update_config` entry keeps stamping the local clock.
-    #[test]
-    fn update_config_at_stamps_the_given_time_and_update_config_stamps_now() {
-        let source_time = OffsetDateTime::now_utc() - time::Duration::hours(3);
-        let mut metadata = BucketMetadata::new("source-stamped");
-
-        let stamped = metadata
-            .update_config_at(BUCKET_POLICY_CONFIG, br#"{"Version":"2012-10-17","Statement":[]}"#.to_vec(), source_time)
-            .unwrap();
-        assert_eq!(stamped, source_time);
-        assert_eq!(metadata.policy_config_updated_at, source_time);
-
-        let tagging = b"<Tagging><TagSet><Tag><Key>k</Key><Value>v</Value></Tag></TagSet></Tagging>".to_vec();
-        let stamped = metadata
-            .update_config_at(BUCKET_TAGGING_CONFIG, tagging, source_time)
-            .unwrap();
-        assert_eq!(stamped, source_time);
-        assert_eq!(metadata.tagging_config_updated_at, source_time);
-
-        let before = OffsetDateTime::now_utc();
-        let stamped = metadata
-            .update_config(BUCKET_POLICY_CONFIG, br#"{"Version":"2012-10-17","Statement":[]}"#.to_vec())
-            .unwrap();
-        assert!(stamped >= before, "a local edit is stamped with the local clock");
-        assert_eq!(metadata.policy_config_updated_at, stamped);
-        assert_eq!(
-            metadata.tagging_config_updated_at, source_time,
-            "restamping one config must not move another config's stamp"
-        );
-    }
-
    #[test]
    fn object_locking_requires_lock_metadata_not_plain_versioning() {
        use s3s::dto::ObjectLockEnabled;
@@ -1606,117 +1535,6 @@ mod test {
        assert_eq!(bucket_targets.targets[0].target_bucket, "target-bucket");
    }

-    /// rustfs/backlog#2282: a stored targets blob this build cannot decode
-    /// must not become the empty target set, and must stay distinguishable
-    /// from a bucket that never configured a target.
-    #[test]
-    fn unreadable_bucket_targets_never_degrade_to_an_empty_target_set() {
-        let truncated = br#"{"targets":[{"endpoint":"s3.example.com","#.to_vec();
-        let mut corrupt = BucketMetadata::new("corrupt-targets");
-        corrupt.bucket_targets_config_json = truncated.clone();
-
-        corrupt
-            .parse_all_configs()
-            .expect("one unreadable sub-config must not fail the whole metadata load");
-
-        assert!(
-            corrupt.bucket_target_config.is_none(),
-            "an undecodable targets blob must not produce a target set at all"
-        );
-        assert!(corrupt.bucket_targets_unreadable());
-        assert_eq!(
-            corrupt.bucket_targets_config_json, truncated,
-            "the raw bytes must survive so the configuration stays recoverable"
-        );
-
-        // The genuinely-absent case is unchanged, and the two now diverge.
-        let mut absent = BucketMetadata::new("no-targets");
-        absent.parse_all_configs().expect("absent targets parse");
-        assert!(
-            absent.bucket_target_config.as_ref().is_some_and(BucketTargets::is_empty),
-            "a bucket that configured no target still reads as an empty target set"
-        );
-        assert!(!absent.bucket_targets_unreadable());
-    }
-
-    /// `Credentials` carries no struct-level `serde(default)`, so one target
-    /// missing `secretKey` is a hard parse error for the whole document. That
-    /// must surface as "unreadable", never as "no targets configured".
-    #[test]
-    fn bucket_targets_missing_secret_key_are_unreadable_not_empty() {
-        let mut bm = BucketMetadata::new("missing-secret-key");
-        bm.bucket_targets_config_json = br#"{"targets":[{"endpoint":"s3.example.com","targetbucket":"remote","arn":"arn:rustfs:replication:us-east-1:src:1","credentials":{"accessKey":"AKIAEXAMPLE"}}]}"#.to_vec();
-
-        bm.parse_all_configs()
-            .expect("a rejected targets document must not fail the whole metadata load");
-
-        assert!(
-            bm.bucket_targets_unreadable(),
-            "a targets document rejected for a missing secretKey is unreadable, not empty"
-        );
-        assert!(bm.bucket_target_config.is_none());
-    }
-
-    /// The invariant every branch of `parse_all_configs` shares: a stored but
-    /// undecodable payload keeps its raw bytes and leaves the typed field
-    /// `None`, so no branch fabricates a value. What a reader may then do with
-    /// that state is decided per config; see the table on `parse_all_configs`.
-    #[test]
-    fn every_config_branch_retains_its_parse_failure_instead_of_defaulting() {
-        let malformed_xml = b"<not-a-valid-document".to_vec();
-        let malformed_json = b"{not-json".to_vec();
-
-        let mut bm = BucketMetadata::new("all-configs-malformed");
-        bm.policy_config_json = malformed_json.clone();
-        bm.quota_config_json = malformed_json.clone();
-        bm.bucket_targets_config_json = malformed_json.clone();
-        bm.notification_config_xml = malformed_xml.clone();
-        bm.lifecycle_config_xml = malformed_xml.clone();
-        bm.object_lock_config_xml = malformed_xml.clone();
-        bm.versioning_config_xml = malformed_xml.clone();
-        bm.encryption_config_xml = malformed_xml.clone();
-        bm.tagging_config_xml = malformed_xml.clone();
-        bm.replication_config_xml = malformed_xml.clone();
-        bm.cors_config_xml = malformed_xml.clone();
-        bm.logging_config_xml = malformed_xml.clone();
-        bm.website_config_xml = malformed_xml.clone();
-        bm.accelerate_config_xml = malformed_xml.clone();
-        bm.request_payment_config_xml = malformed_xml.clone();
-        bm.public_access_block_config_xml = malformed_xml.clone();
-        // `bucket_acl_config_json` is only checked for UTF-8, so only invalid
-        // UTF-8 exercises its failure branch.
-        bm.bucket_acl_config_json = vec![0xff, 0xfe];
-
-        bm.parse_all_configs()
-            .expect("a bucket whose every config is corrupt must still load its metadata");
-
-        let cleared: [(&str, bool); 17] = [
-            ("policy", bm.policy_config.is_none()),
-            ("quota", bm.quota_config.is_none()),
-            ("bucket_targets", bm.bucket_target_config.is_none()),
-            ("notification", bm.notification_config.is_none()),
-            ("lifecycle", bm.lifecycle_config.is_none()),
-            ("object_lock", bm.object_lock_config.is_none()),
-            ("versioning", bm.versioning_config.is_none()),
-            ("encryption", bm.sse_config.is_none()),
-            ("tagging", bm.tagging_config.is_none()),
-            ("replication", bm.replication_config.is_none()),
-            ("cors", bm.cors_config.is_none()),
-            ("logging", bm.logging_config.is_none()),
-            ("website", bm.website_config.is_none()),
-            ("accelerate", bm.accelerate_config.is_none()),
-            ("request_payment", bm.request_payment_config.is_none()),
-            ("public_access_block", bm.public_access_block_config.is_none()),
-            ("bucket_acl", bm.bucket_acl_config.is_none()),
-        ];
-        for (config, is_cleared) in cleared {
-            assert!(is_cleared, "{config}: a corrupt payload must not be replaced by a default");
-        }
-
-        assert_eq!(bm.bucket_targets_config_json, malformed_json, "raw bytes are retained");
-        assert_eq!(bm.lifecycle_config_xml, malformed_xml, "raw bytes are retained");
-    }
-
    #[test]
    fn lifecycle_update_config_clears_parsed_config_on_delete() {
        let mut bm = BucketMetadata::new("test-bucket");
@@ -2006,30 +1824,51 @@ mod test {

    const ODM_JSON: &[u8] = br#"{"version":1,"enabled":true,"source":{"provider":"minio","endpoint":"https://legacy.example.com:9000","region":"auto","bucket":"legacy-bucket","credentials":{"access_key":"AK","secret_key":"SK"}}}"#;

-    /// The metadata codec preserves application-owned bytes and timestamps.
+    /// rustfs/backlog#2148: the on-demand migration config is a RustFS
+    /// extension entry that round-trips through `update_config` and the
+    /// msgpack codec, clears on delete, and never parses corruption into a
+    /// default.
    #[test]
    fn on_demand_migration_config_round_trips_and_tracks_updates() {
+        use crate::bucket::on_demand_migration::{OnDemandMigrationConfig, OnDemandMigrationConfigError};
+
        let mut bm = BucketMetadata::new("odm-bucket");
-        assert_eq!(bm.on_demand_migration_config(), None, "fresh metadata carries no config");
+        assert_eq!(bm.on_demand_migration_config(), Ok(None), "fresh metadata carries no config");
+
+        let expected = OnDemandMigrationConfig::from_json(ODM_JSON).unwrap();
        bm.update_config(BUCKET_ON_DEMAND_MIGRATION_CONFIG, ODM_JSON.to_vec())
-            .expect("opaque config is accepted");
-        let stamped = bm.on_demand_migration_config_updated_at;
-        assert_ne!(stamped, OffsetDateTime::UNIX_EPOCH);
-        assert_eq!(bm.on_demand_migration_config(), Some((ODM_JSON, stamped)));
+            .expect("valid config is accepted");
+        assert_ne!(bm.on_demand_migration_config_updated_at, OffsetDateTime::UNIX_EPOCH);
+        assert_eq!(bm.on_demand_migration_config(), Ok(Some(expected.clone())));
+
        let back = BucketMetadata::unmarshal(&bm.marshal_msg().unwrap()).unwrap();
        assert_eq!(back.on_demand_migration_config_json, bm.on_demand_migration_config_json);
-        assert_eq!(back.on_demand_migration_config_updated_at.unix_timestamp(), stamped.unix_timestamp());
+        assert_eq!(
+            back.on_demand_migration_config_updated_at.unix_timestamp(),
+            bm.on_demand_migration_config_updated_at.unix_timestamp()
+        );
+        assert_eq!(back.on_demand_migration_config(), Ok(Some(expected)));
+
+        // A blob this build cannot read is rejected at the write boundary
+        // rather than persisted for every reader to trip over.
+        let before = bm.on_demand_migration_config_json.clone();
+        assert!(
+            bm.update_config(BUCKET_ON_DEMAND_MIGRATION_CONFIG, br#"{"source":{"provider":"s3"},"bogus":1}"#.to_vec())
+                .is_err()
+        );
+        assert_eq!(bm.on_demand_migration_config_json, before, "a rejected update leaves the blob untouched");
+
+        // Delete clears the entry.
+        let stamped = bm.on_demand_migration_config_updated_at;
        bm.update_config(BUCKET_ON_DEMAND_MIGRATION_CONFIG, Vec::new()).unwrap();
        assert!(bm.on_demand_migration_config_json.is_empty());
-        assert_eq!(bm.on_demand_migration_config(), None);
+        assert_eq!(bm.on_demand_migration_config(), Ok(None));
        assert!(bm.on_demand_migration_config_updated_at >= stamped);
-        bm.update_config(BUCKET_ON_DEMAND_MIGRATION_CONFIG, b"not-json".to_vec())
-            .unwrap();
-        let back = BucketMetadata::unmarshal(&bm.marshal_msg().unwrap()).unwrap();
-        assert_eq!(
-            back.on_demand_migration_config_json, b"not-json",
-            "metadata must not reinterpret application bytes"
-        );
+
+        // Corruption that bypassed `update_config` (disk, another writer)
+        // is a typed error, never a default.
+        bm.on_demand_migration_config_json = b"not-json".to_vec();
+        assert!(matches!(bm.on_demand_migration_config(), Err(OnDemandMigrationConfigError::Malformed(_))));
    }

    /// rustfs/backlog#2148: a `.metadata.bin` written before the on-demand
@@ -2041,7 +1880,7 @@ mod test {
        let mut bm = BucketMetadata::unmarshal(&blob[4..]).expect("unmarshal MinIO bucket metadata");
        assert!(bm.on_demand_migration_config_json.is_empty());
        assert_eq!(bm.on_demand_migration_config_updated_at, OffsetDateTime::UNIX_EPOCH);
-        assert_eq!(bm.on_demand_migration_config(), None);
+        assert_eq!(bm.on_demand_migration_config(), Ok(None));

        bm.default_timestamps();
        assert_ne!(bm.created, OffsetDateTime::UNIX_EPOCH, "fixture must carry a real creation time");
@@ -19,6 +19,7 @@ use super::quota::BucketQuota;
 use super::target::BucketTargets;
 use crate::bucket::bucket_target_sys::BucketTargetSys;
 use crate::bucket::metadata::{load_bucket_metadata_parse, load_bucket_metadata_parse_with_presence};
+use crate::bucket::on_demand_migration::{ON_DEMAND_MIGRATION_CONFIG_HOOK, OnDemandMigrationConfig};
 use crate::bucket::utils::is_meta_bucketname;
 use crate::disk::RUSTFS_META_BUCKET;
 use crate::error::{Error, Result, is_err_bucket_not_found, is_err_strict_volume_not_found};
@@ -48,11 +49,6 @@ use tokio_util::sync::CancellationToken;
 use tracing::{error, warn};
 use uuid::Uuid;

-/// Opaque bucket configuration notifications for application-owned services.
-/// `None` withdraws a configuration; consumers validate nonempty bytes.
-pub type BucketConfigPublishHook = Box<dyn Fn(&str, &str, Option<(&[u8], OffsetDateTime, Uuid)>) + Send + Sync>;
-pub static BUCKET_CONFIG_PUBLISH_HOOK: std::sync::OnceLock<BucketConfigPublishHook> = std::sync::OnceLock::new();
-
 const BUCKET_METADATA_REFRESH_INTERVAL: Duration = Duration::from_secs(15 * 60);

 #[cfg(any(test, feature = "test-util"))]
@@ -364,16 +360,6 @@ async fn refresh_buckets_metadata_once(sys: Arc<RwLock<BucketMetadataSys>>) {
 }

 async fn sync_bucket_target_sys(bucket: &str, bm: &BucketMetadata) {
-    if bm.bucket_targets_unreadable() {
-        // "The configuration cannot be read" is not "no targets configured".
-        // Publishing an empty snapshot here is what silently stopped
-        // replication (rustfs/backlog#2282): mark the bucket instead, so every
-        // targets reader gets a typed error, and leave any snapshot from an
-        // earlier readable load in place rather than withdrawing it.
-        BucketTargetSys::get().mark_targets_unreadable(bucket).await;
-        return;
-    }
-
    BucketTargetSys::get()
        .update_all_targets(bucket, bm.bucket_target_config.as_ref())
        .await;
@@ -399,21 +385,39 @@ fn clear_bucket_durability(bucket: &str) {
    crate::disk::local::bucket_durability::set(bucket, None);
 }

-/// Publish application-owned bytes on every cache install path.
+/// Publish the bucket's on-demand migration config (or its absence) to the
+/// runtime registered in `ON_DEMAND_MIGRATION_CONFIG_HOOK`.
+///
+/// Called from the same five cache-install paths as
+/// [`sync_bucket_durability`]. A stored payload this build cannot parse is
+/// published as `None`: the runtime must stop pulling for that bucket rather
+/// than keep an older config or guess.
 fn sync_on_demand_migration(bucket: &str, bm: &BucketMetadata) {
-    if let Some(hook) = BUCKET_CONFIG_PUBLISH_HOOK.get() {
-        hook(
-            bucket,
-            super::metadata::BUCKET_ON_DEMAND_MIGRATION_CONFIG,
-            bm.on_demand_migration_config()
-                .map(|(bytes, stamp)| (bytes, stamp, bm.bucket_incarnation_id)),
-        );
+    let Some(hook) = ON_DEMAND_MIGRATION_CONFIG_HOOK.get() else {
+        return;
+    };
+    match bm.on_demand_migration_config() {
+        Ok(config) => hook(bucket, config.as_ref()),
+        Err(err) => {
+            warn!(
+                event = "bucket_metadata_parse_failed",
+                component = "ecstore",
+                subsystem = "bucket_metadata",
+                bucket = %bucket,
+                config = "on_demand_migration",
+                error = %err,
+                "Failed to parse bucket metadata config"
+            );
+            hook(bucket, None);
+        }
    }
 }

+/// Withdraw a bucket's on-demand migration config when its metadata leaves
+/// the cache.
 fn clear_on_demand_migration(bucket: &str) {
-    if let Some(hook) = BUCKET_CONFIG_PUBLISH_HOOK.get() {
-        hook(bucket, super::metadata::BUCKET_ON_DEMAND_MIGRATION_CONFIG, None);
+    if let Some(hook) = ON_DEMAND_MIGRATION_CONFIG_HOOK.get() {
+        hook(bucket, None);
    }
 }

@@ -567,32 +571,6 @@ pub async fn update_if_incarnation(
        config_file,
        data,
        Some(expected_incarnation_id),
-        None,
-    ))
-    .await
-}
-
-/// [`update_if_incarnation`] stamping the config with `updated_at` instead of
-/// the local clock.
-///
-/// For a site-replication receiver the edit's source time is the peer's
-/// `updated_at`; persisting it keeps the stored `*_config_updated_at` on the
-/// source clock so the next item's staleness is judged source-time against
-/// source-time (backlog#2292). See [`BucketMetadata::update_config_at`].
-pub async fn update_if_incarnation_at(
-    bucket: &str,
-    config_file: &str,
-    data: Vec<u8>,
-    expected_incarnation_id: Uuid,
-    updated_at: OffsetDateTime,
-) -> Result<OffsetDateTime> {
-    Box::pin(update_with_sys_expected(
-        get_bucket_metadata_sys()?,
-        bucket,
-        config_file,
-        data,
-        Some(expected_incarnation_id),
-        Some(updated_at),
    ))
    .await
 }
@@ -603,30 +581,6 @@ pub async fn delete_if_incarnation(bucket: &str, config_file: &str, expected_inc
        bucket,
        config_file,
        Some(expected_incarnation_id),
-        None,
-    ))
-    .await
-}
-
-/// [`delete_if_incarnation`] stamping the cleared config with `updated_at`
-/// (a replicated deletion's source time) instead of the local clock.
-///
-/// The stamp survives the deletion as the config's `*_config_updated_at`, and
-/// that is what the next incoming item is judged against: a local stamp on
-/// the delete would reject a newer source re-create that was merely delivered
-/// later (backlog#2292). See [`update_if_incarnation_at`].
-pub async fn delete_if_incarnation_at(
-    bucket: &str,
-    config_file: &str,
-    expected_incarnation_id: Uuid,
-    updated_at: OffsetDateTime,
-) -> Result<OffsetDateTime> {
-    Box::pin(delete_with_sys_expected(
-        get_bucket_metadata_sys()?,
-        bucket,
-        config_file,
-        Some(expected_incarnation_id),
-        Some(updated_at),
    ))
    .await
 }
@@ -648,41 +602,34 @@ async fn update_with_sys(
    config_file: &str,
    data: Vec<u8>,
 ) -> Result<OffsetDateTime> {
-    update_with_sys_expected(sys, bucket, config_file, data, None, None).await
+    update_with_sys_expected(sys, bucket, config_file, data, None).await
 }

-/// `updated_at` is the stamp persisted on the config; `None` uses the local
-/// clock (the edit originates here), `Some` carries a replicated edit's
-/// source time (backlog#2292).
 async fn update_with_sys_expected(
    sys: Arc<RwLock<BucketMetadataSys>>,
    bucket: &str,
    config_file: &str,
    data: Vec<u8>,
    expected_incarnation_id: Option<Uuid>,
-    updated_at: Option<OffsetDateTime>,
 ) -> Result<OffsetDateTime> {
    let guard = acquire_config_write_guard_for_incarnation(sys.clone(), bucket, expected_incarnation_id).await?;
-    update_under_config_write_guard(sys, &guard, config_file, data, updated_at).await
+    update_under_config_write_guard(sys, &guard, config_file, data).await
 }

 /// [`delete`] against an explicitly supplied metadata system. See
 /// [`update_with_sys`].
 async fn delete_with_sys(sys: Arc<RwLock<BucketMetadataSys>>, bucket: &str, config_file: &str) -> Result<OffsetDateTime> {
-    delete_with_sys_expected(sys, bucket, config_file, None, None).await
+    delete_with_sys_expected(sys, bucket, config_file, None).await
 }

-/// `updated_at`: `None` stamps the local clock; `Some` persists a replicated
-/// deletion's source time (backlog#2292).
 async fn delete_with_sys_expected(
    sys: Arc<RwLock<BucketMetadataSys>>,
    bucket: &str,
    config_file: &str,
    expected_incarnation_id: Option<Uuid>,
-    updated_at: Option<OffsetDateTime>,
 ) -> Result<OffsetDateTime> {
    let guard = acquire_config_write_guard_for_incarnation(sys.clone(), bucket, expected_incarnation_id).await?;
-    delete_under_config_write_guard(sys, &guard, config_file, updated_at).await
+    delete_under_config_write_guard(sys, &guard, config_file).await
 }

 /// Owns the complete bucket-config mutation fence.
@@ -698,12 +645,6 @@ pub struct BucketMetadataMutationGuard {
 }

 impl BucketMetadataMutationGuard {
-    /// Returns the storage-verified identity while both incarnation fences remain valid.
-    pub fn checked_bucket_incarnation(&self) -> Result<(&str, Uuid)> {
-        self.ensure_valid(&self.bucket)?;
-        Ok((&self.bucket, self.incarnation_id))
-    }
-
    fn ensure_valid(&self, bucket: &str) -> Result<()> {
        if self.bucket != bucket {
            return Err(Error::other("bucket metadata mutation guard does not match bucket"));
@@ -723,29 +664,6 @@ async fn acquire_config_write_guard_for_incarnation(
    sys: Arc<RwLock<BucketMetadataSys>>,
    bucket: &str,
    expected_incarnation_id: Option<Uuid>,
-) -> Result<BucketMetadataMutationGuard> {
-    acquire_config_write_guard_with_migration(sys, bucket, expected_incarnation_id, true).await
-}
-
-/// Scanner probes must not create an incarnation to make a capability available.
-pub async fn acquire_scanner_bucket_incarnation_fence(
-    bucket: &str,
-    expected_incarnation_id: Uuid,
-    expected_owner_id: Uuid,
-) -> Result<BucketMetadataMutationGuard> {
-    super::utils::check_valid_bucket_name(bucket)?;
-    let sys = get_bucket_metadata_sys()?;
-    if expected_owner_id.is_nil() || sys.read().await.api.id != expected_owner_id || expected_incarnation_id.is_nil() {
-        return Err(Error::other("scanner bucket incarnation owner does not match"));
-    }
-    acquire_config_write_guard_with_migration(sys, bucket, Some(expected_incarnation_id), false).await
-}
-
-async fn acquire_config_write_guard_with_migration(
-    sys: Arc<RwLock<BucketMetadataSys>>,
-    bucket: &str,
-    expected_incarnation_id: Option<Uuid>,
-    migrate: bool,
 ) -> Result<BucketMetadataMutationGuard> {
    let metadata_sys = sys.read().await.clone();
    let lifecycle_guard = metadata_sys.api.acquire_bucket_lifecycle_read_lock(bucket).await?;
@@ -753,15 +671,13 @@ async fn acquire_config_write_guard_with_migration(
    // Legacy buckets are migrated while the lifecycle fence prevents a
    // same-name replacement. The second read under the write transaction is
    // the CAS source of truth for the actual rewrite.
-    if migrate {
-        await_bucket_namespace_operation(
-            Some(&lifecycle_guard),
-            bucket,
-            "bucket config incarnation migration",
-            metadata_sys.get_bucket_incarnation_id(bucket),
-        )
-        .await?;
-    }
+    await_bucket_namespace_operation(
+        Some(&lifecycle_guard),
+        bucket,
+        "bucket config incarnation migration",
+        metadata_sys.get_bucket_incarnation_id(bucket),
+    )
+    .await?;
    let transaction_guard = await_bucket_namespace_operation(
        Some(&lifecycle_guard),
        bucket,
@@ -829,21 +745,7 @@ pub async fn update_under_transaction_lock(
    data: Vec<u8>,
 ) -> Result<OffsetDateTime> {
    guard.ensure_valid(bucket)?;
-    update_under_config_write_guard(get_bucket_metadata_sys()?, guard, config_file, data, None).await
-}
-
-/// [`update_under_transaction_lock`] stamping the config with `updated_at`
-/// (a replicated edit's source time) instead of the local clock; see
-/// [`update_if_incarnation_at`] (backlog#2292).
-pub async fn update_under_transaction_lock_at(
-    guard: &BucketMetadataMutationGuard,
-    bucket: &str,
-    config_file: &str,
-    data: Vec<u8>,
-    updated_at: OffsetDateTime,
-) -> Result<OffsetDateTime> {
-    guard.ensure_valid(bucket)?;
-    update_under_config_write_guard(get_bucket_metadata_sys()?, guard, config_file, data, Some(updated_at)).await
+    update_under_config_write_guard(get_bucket_metadata_sys()?, guard, config_file, data).await
 }

 /// Clear one config file while the caller holds this bucket's transaction lock.
@@ -853,7 +755,7 @@ pub async fn delete_under_transaction_lock(
    config_file: &str,
 ) -> Result<OffsetDateTime> {
    guard.ensure_valid(bucket)?;
-    delete_under_config_write_guard(get_bucket_metadata_sys()?, guard, config_file, None).await
+    delete_under_config_write_guard(get_bucket_metadata_sys()?, guard, config_file).await
 }

 pub async fn update_quota_if_incarnation(
@@ -861,29 +763,6 @@ pub async fn update_quota_if_incarnation(
    data: Vec<u8>,
    expected_incarnation_id: Uuid,
    proof: &crate::services::notification_sys::CrossPoolFenceFleetProofToken,
-) -> Result<OffsetDateTime> {
-    update_quota_if_incarnation_stamped(bucket, data, expected_incarnation_id, proof, None).await
-}
-
-/// [`update_quota_if_incarnation`] stamping the quota config with
-/// `updated_at` (a replicated edit's source time) instead of the local
-/// clock; see [`update_if_incarnation_at`] (backlog#2292).
-pub async fn update_quota_if_incarnation_at(
-    bucket: &str,
-    data: Vec<u8>,
-    expected_incarnation_id: Uuid,
-    proof: &crate::services::notification_sys::CrossPoolFenceFleetProofToken,
-    updated_at: OffsetDateTime,
-) -> Result<OffsetDateTime> {
-    update_quota_if_incarnation_stamped(bucket, data, expected_incarnation_id, proof, Some(updated_at)).await
-}
-
-async fn update_quota_if_incarnation_stamped(
-    bucket: &str,
-    data: Vec<u8>,
-    expected_incarnation_id: Uuid,
-    proof: &crate::services::notification_sys::CrossPoolFenceFleetProofToken,
-    updated_at: Option<OffsetDateTime>,
 ) -> Result<OffsetDateTime> {
    let sys = get_bucket_metadata_sys()?;
    let guard = Box::pin(acquire_config_write_guard_for_incarnation(
@@ -901,7 +780,7 @@ async fn update_quota_if_incarnation_stamped(
            achieved: 0,
        });
    }
-    update_under_config_write_guard(sys, &guard, rustfs_config::QUOTA_CONFIG_FILE, data, updated_at).await
+    update_under_config_write_guard(sys, &guard, rustfs_config::QUOTA_CONFIG_FILE, data).await
 }

 pub async fn update_bucket_targets_under_transaction_lock(
@@ -917,7 +796,6 @@ async fn update_under_config_write_guard(
    guard: &BucketMetadataMutationGuard,
    config_file: &str,
    data: Vec<u8>,
-    updated_at: Option<OffsetDateTime>,
 ) -> Result<OffsetDateTime> {
    guard.ensure_valid(&guard.bucket)?;
    let metadata_sys = sys.read().await.clone();
@@ -929,7 +807,7 @@ async fn update_under_config_write_guard(
            Some(&guard.transaction_guard),
            &guard.bucket,
            "bucket config transaction",
-            metadata_sys.update_checked(&guard.bucket, config_file, data, true, guard.incarnation_id, updated_at),
+            metadata_sys.update_checked(&guard.bucket, config_file, data, true, guard.incarnation_id),
        ),
    )
    .await?;
@@ -941,7 +819,6 @@ async fn delete_under_config_write_guard(
    sys: Arc<RwLock<BucketMetadataSys>>,
    guard: &BucketMetadataMutationGuard,
    config_file: &str,
-    updated_at: Option<OffsetDateTime>,
 ) -> Result<OffsetDateTime> {
    guard.ensure_valid(&guard.bucket)?;
    let metadata_sys = sys.read().await.clone();
@@ -953,7 +830,7 @@ async fn delete_under_config_write_guard(
            Some(&guard.transaction_guard),
            &guard.bucket,
            "bucket config deletion transaction",
-            metadata_sys.update_checked(&guard.bucket, config_file, Vec::new(), false, guard.incarnation_id, updated_at),
+            metadata_sys.update_checked(&guard.bucket, config_file, Vec::new(), false, guard.incarnation_id),
        ),
    )
    .await?;
@@ -1131,21 +1008,15 @@ pub async fn get_durability_config(
 }

 /// The bucket's on-demand migration config with its update time, or
-/// `Ok(None)` when the bucket has none. Bytes are opaque to the metadata owner.
-pub async fn get_on_demand_migration_config(bucket: &str) -> Result<Option<(Vec<u8>, OffsetDateTime)>> {
+/// `Ok(None)` when the bucket has none. A stored payload that does not parse
+/// is a typed error (`OnDemandMigrationConfigError` inside `Error::Io`).
+pub async fn get_on_demand_migration_config(bucket: &str) -> Result<Option<(OnDemandMigrationConfig, OffsetDateTime)>> {
    let bucket_meta_sys_lock = get_bucket_metadata_sys()?;
    let bucket_meta_sys = bucket_meta_sys_lock.read().await;

    bucket_meta_sys.get_on_demand_migration_config(bucket).await
 }

-/// Resolve opaque configuration from the store's own metadata system.
-pub async fn get_on_demand_migration_config_in(api: &ECStore, bucket: &str) -> Result<Option<(Vec<u8>, OffsetDateTime)>> {
-    let sys = bucket_metadata_sys_of(&api.ctx)?;
-    let lock = sys.read().await;
-    lock.get_on_demand_migration_config(bucket).await
-}
-
 pub async fn get_quota_config(bucket: &str) -> Result<(BucketQuota, OffsetDateTime)> {
    let bucket_meta_sys_lock = get_bucket_metadata_sys()?;
    let bucket_meta_sys = bucket_meta_sys_lock.read().await;
@@ -1858,17 +1729,15 @@ impl BucketMetadataSys {
    /// `update` and the config read alone). Keep these boxed.
    pub async fn update(&self, bucket: &str, config_file: &str, data: Vec<u8>) -> Result<OffsetDateTime> {
        let incarnation_id = Box::pin(self.get_bucket_incarnation_id(bucket)).await?;
-        Box::pin(self.update_checked(bucket, config_file, data, true, incarnation_id, None)).await
+        Box::pin(self.update_checked(bucket, config_file, data, true, incarnation_id)).await
    }

    pub async fn delete(&self, bucket: &str, config_file: &str) -> Result<OffsetDateTime> {
        let incarnation_id = self.get_bucket_incarnation_id(bucket).await?;
-        self.update_checked(bucket, config_file, Vec::new(), false, incarnation_id, None)
+        self.update_checked(bucket, config_file, Vec::new(), false, incarnation_id)
            .await
    }

-    /// `updated_at`: `None` stamps the local clock; `Some` persists a
-    /// replicated edit's source time (backlog#2292).
    async fn update_checked(
        &self,
        bucket: &str,
@@ -1876,7 +1745,6 @@ impl BucketMetadataSys {
        data: Vec<u8>,
        parse: bool,
        expected_incarnation_id: Uuid,
-        updated_at: Option<OffsetDateTime>,
    ) -> Result<OffsetDateTime> {
        // Load through this system's own store, the one `save` persists to
        // (backlog#1052 S7). Reading from the ambient handle instead made the
@@ -1887,10 +1755,7 @@ impl BucketMetadataSys {
            return Err(Error::BucketNotFound(bucket.to_string()));
        }

-        let updated = match updated_at {
-            Some(updated_at) => bm.update_config_at(config_file, data, updated_at)?,
-            None => bm.update_config(config_file, data)?,
-        };
+        let updated = bm.update_config(config_file, data)?;

        Box::pin(self.save(bm)).await?;

@@ -2253,9 +2118,7 @@ impl BucketMetadataSys {
    pub async fn get_public_access_block_config(&self, bucket: &str) -> Result<(PublicAccessBlockConfiguration, OffsetDateTime)> {
        let (bm, _) = self.get_config(bucket).await?;

-        if !bm.public_access_block_config_xml.is_empty() && bm.public_access_block_config.is_none() {
-            Err(Error::other("persisted bucket public access block configuration is invalid"))
-        } else if let Some(config) = &bm.public_access_block_config {
+        if let Some(config) = &bm.public_access_block_config {
            Ok((config.clone(), bm.public_access_block_config_updated_at))
        } else {
            Err(Error::ConfigNotFound)
@@ -2566,9 +2429,7 @@ impl BucketMetadataSys {
    pub async fn get_sse_config(&self, bucket: &str) -> Result<(ServerSideEncryptionConfiguration, OffsetDateTime)> {
        let (bm, _) = self.get_config(bucket).await?;

-        if !bm.encryption_config_xml.is_empty() && bm.sse_config.is_none() {
-            Err(Error::other("persisted bucket encryption configuration is invalid"))
-        } else if let Some(config) = &bm.sse_config {
+        if let Some(config) = &bm.sse_config {
            Ok((config.clone(), bm.encryption_config_updated_at))
        } else {
            Err(Error::ConfigNotFound)
@@ -2639,9 +2500,7 @@ impl BucketMetadataSys {
    pub async fn get_quota_config(&self, bucket: &str) -> Result<(BucketQuota, OffsetDateTime)> {
        let (bm, _) = self.get_config(bucket).await?;

-        if !bm.quota_config_json.is_empty() && bm.quota_config.is_none() {
-            Err(Error::other("persisted bucket quota configuration is invalid"))
-        } else if let Some(config) = &bm.quota_config {
+        if let Some(config) = &bm.quota_config {
            Ok((config.clone(), bm.quota_config_updated_at))
        } else {
            Err(Error::ConfigNotFound)
@@ -2663,9 +2522,7 @@ impl BucketMetadataSys {
    pub async fn get_bucket_targets_config(&self, bucket: &str) -> Result<BucketTargets> {
        let (bm, _) = self.get_config(bucket).await?;

-        if bm.bucket_targets_unreadable() {
-            Err(Error::other("persisted bucket replication target configuration is invalid"))
-        } else if let Some(config) = &bm.bucket_target_config {
+        if let Some(config) = &bm.bucket_target_config {
            Ok(config.clone())
        } else {
            Err(Error::ConfigNotFound)
@@ -2673,27 +2530,29 @@ impl BucketMetadataSys {
    }

    /// See [`get_on_demand_migration_config`].
-    pub async fn get_on_demand_migration_config(&self, bucket: &str) -> Result<Option<(Vec<u8>, OffsetDateTime)>> {
+    pub async fn get_on_demand_migration_config(
+        &self,
+        bucket: &str,
+    ) -> Result<Option<(OnDemandMigrationConfig, OffsetDateTime)>> {
        let (bm, _) = self.get_config(bucket).await?;

-        Ok(bm
-            .on_demand_migration_config()
-            .map(|(bytes, updated_at)| (bytes.to_vec(), updated_at)))
+        let config = bm.on_demand_migration_config().map_err(Error::other)?;
+        Ok(config.map(|config| (config, bm.on_demand_migration_config_updated_at)))
    }
 }

 /// Test-only fixture shared with sibling modules (e.g. the quota checker
 /// tests): a 4-disk `ECStore` on an isolated instance context, so tests
 /// exercising the metadata system never touch ambient process state.
-#[cfg(any(test, feature = "test-util"))]
-pub mod test_support {
+#[cfg(test)]
+pub(crate) mod test_support {
    use super::*;
    use crate::disk::endpoint::Endpoint;
    use crate::layout::endpoints::{EndpointServerPools, Endpoints, PoolEndpoints};
    use crate::runtime::instance::InstanceContext;
    use crate::store::init_local_disks_with_instance_ctx;

-    pub async fn isolated_store_over_temp_disks() -> (Vec<tempfile::TempDir>, Arc<ECStore>) {
+    pub(crate) async fn isolated_store_over_temp_disks() -> (Vec<tempfile::TempDir>, Arc<ECStore>) {
        let mut dirs = Vec::with_capacity(4);
        let mut endpoints = Vec::with_capacity(4);
        for disk_idx in 0..4 {
@@ -2734,7 +2593,6 @@ pub mod test_support {
 mod tests {
    use super::test_support::isolated_store_over_temp_disks;
    use super::*;
-    use crate::bucket::bucket_target_sys::BucketTargetError;
    use crate::bucket::metadata::{
        BUCKET_ACCELERATE_CONFIG, BUCKET_CORS_CONFIG, BUCKET_LIFECYCLE_CONFIG, BUCKET_LOGGING_CONFIG, BUCKET_NOTIFICATION_CONFIG,
        BUCKET_POLICY_CONFIG, BUCKET_PUBLIC_ACCESS_BLOCK_CONFIG, BUCKET_REPLICATION_CONFIG, BUCKET_REQUEST_PAYMENT_CONFIG,
@@ -2930,36 +2788,6 @@ mod tests {
        );
    }

-    /// The `parse_all_configs` audit (rustfs/backlog#2282): every accessor
-    /// whose configuration grants something — plaintext storage, anonymous
-    /// access, capacity, replication targets — reports a corrupt payload as
-    /// invalid rather than as absent, because "absent" is what grants it.
-    #[tokio::test]
-    async fn malformed_permissive_configs_are_not_reported_as_absent() {
-        let (_dirs, ecstore) = isolated_store_over_temp_disks().await;
-        let sys = BucketMetadataSys::new(ecstore);
-        let bucket = "malformed-permissive-config";
-        let mut metadata = BucketMetadata::new(bucket);
-        metadata.encryption_config_xml = b"<ServerSideEncryptionConfiguration".to_vec();
-        metadata.public_access_block_config_xml = b"<PublicAccessBlockConfiguration".to_vec();
-        metadata.quota_config_json = b"{not-json".to_vec();
-        metadata.bucket_targets_config_json = b"{not-json".to_vec();
-        metadata
-            .parse_all_configs()
-            .expect("a corrupt sub-config must not fail the load");
-        sys.set(bucket.to_string(), Arc::new(metadata)).await;
-
-        for (config, result) in [
-            ("encryption", sys.get_sse_config(bucket).await.err()),
-            ("public access block", sys.get_public_access_block_config(bucket).await.err()),
-            ("quota", sys.get_quota_config(bucket).await.err()),
-            ("bucket targets", sys.get_bucket_targets_config(bucket).await.err()),
-        ] {
-            let err = result.unwrap_or_else(|| panic!("malformed {config} metadata must not read as a value"));
-            assert_ne!(err, Error::ConfigNotFound, "malformed {config} metadata must not be reported as absent");
-        }
-    }
-
    #[tokio::test]
    async fn config_states_distinguish_authoritative_absence_from_fabricated_metadata() {
        use std::sync::atomic::Ordering;
@@ -3299,82 +3127,6 @@ mod tests {
        );
    }

-    #[tokio::test]
-    async fn scoped_dirty_usage_incarnation_probe_does_not_migrate_legacy_metadata() {
-        let (dirs, store) = isolated_store_over_temp_disks().await;
-        let sys = Arc::new(RwLock::new(BucketMetadataSys::new(store.clone())));
-        let bucket = "scoped-ack-legacy";
-        for dir in &dirs {
-            std::fs::create_dir_all(dir.path().join(bucket)).expect("create legacy bucket");
-        }
-        let mut metadata = BucketMetadata::new(bucket);
-        metadata.bucket_incarnation_id = Uuid::nil();
-        sys.read()
-            .await
-            .persist_and_set(metadata)
-            .await
-            .expect("persist legacy metadata");
-        assert!(
-            acquire_config_write_guard_with_migration(sys.clone(), bucket, Some(Uuid::new_v4()), false)
-                .await
-                .is_err()
-        );
-        assert!(load_bucket_incarnation(store, bucket).await.expect("read sidecar").is_none());
-        assert!(
-            sys.read()
-                .await
-                .get_config_from_disk(bucket)
-                .await
-                .expect("read metadata")
-                .bucket_incarnation_id
-                .is_nil()
-        );
-    }
-
-    #[tokio::test(flavor = "multi_thread", worker_threads = 4)]
-    #[serial]
-    async fn scoped_dirty_usage_incarnation_rejects_deleted_and_recreated_bucket() {
-        let (_dirs, store) = isolated_store_over_temp_disks().await;
-        init_bucket_metadata_sys(store.clone(), Vec::new()).await;
-        let sys = bucket_metadata_sys_of(&store.ctx).expect("metadata owner");
-        let bucket = "scoped-ack-recreated";
-        store
-            .make_bucket(bucket, &MakeBucketOptions::default())
-            .await
-            .expect("create bucket");
-        let old = store.bucket_incarnation_id_from_disk(bucket).await.expect("old incarnation");
-        let guard = acquire_config_write_guard_with_migration(sys.clone(), bucket, Some(old), false)
-            .await
-            .expect("trusted incarnation fence");
-        assert_eq!(guard.checked_bucket_incarnation().expect("valid fences"), (bucket, old));
-        drop(guard);
-        store
-            .delete_bucket(bucket, &DeleteBucketOptions::default())
-            .await
-            .expect("delete bucket");
-        assert!(
-            acquire_config_write_guard_with_migration(sys.clone(), bucket, Some(old), false)
-                .await
-                .is_err()
-        );
-        store
-            .make_bucket(bucket, &MakeBucketOptions::default())
-            .await
-            .expect("recreate bucket");
-        let new = store.bucket_incarnation_id_from_disk(bucket).await.expect("new incarnation");
-        assert_ne!(old, new);
-        assert!(
-            acquire_config_write_guard_with_migration(sys.clone(), bucket, Some(old), false)
-                .await
-                .is_err()
-        );
-        assert!(
-            acquire_config_write_guard_with_migration(sys, bucket, Some(new), false)
-                .await
-                .is_ok()
-        );
-    }
-
    #[tokio::test]
    async fn old_node_metadata_rewrite_cannot_replace_bucket_incarnation_sidecar() {
        let (dirs, ecstore) = isolated_store_over_temp_disks().await;
@@ -3857,106 +3609,6 @@ mod tests {
        );
    }

-    /// backlog#2292: the explicit-stamp write path persists the given source
-    /// time as the config's `*_config_updated_at` — through the incarnation
-    /// path and through an already-held transaction guard — and survives a
-    /// reload from disk, while the plain path keeps stamping the local clock.
-    #[tokio::test]
-    async fn explicit_updated_at_is_persisted_as_the_config_stamp() {
-        let (dirs, ecstore) = isolated_store_over_temp_disks().await;
-        let bucket = "source-stamped-config";
-        for dir in &dirs {
-            std::fs::create_dir_all(dir.path().join(bucket)).expect("bucket volume should be created");
-        }
-        let sys = Arc::new(RwLock::new(BucketMetadataSys::new(ecstore)));
-        let source_time = OffsetDateTime::now_utc() - Duration::from_secs(3 * 3600);
-        let policy = br#"{"Version":"2012-10-17","Statement":[]}"#.to_vec();
-        let tagging = b"<Tagging><TagSet><Tag><Key>k</Key><Value>v</Value></Tag></TagSet></Tagging>".to_vec();
-
-        // Incarnation path (`update_if_incarnation_at` minus the ambient lookup).
-        let stamped =
-            update_with_sys_expected(sys.clone(), bucket, BUCKET_POLICY_CONFIG, policy.clone(), None, Some(source_time))
-                .await
-                .expect("source-stamped policy write should persist");
-        assert_eq!(stamped, source_time);
-
-        // Held-guard path (`update_under_transaction_lock_at` minus the ambient lookup).
-        let guard = acquire_config_write_guard(sys.clone(), bucket).await.expect("write guard");
-        let stamped = update_under_config_write_guard(sys.clone(), &guard, BUCKET_TAGGING_CONFIG, tagging, Some(source_time))
-            .await
-            .expect("source-stamped tagging write should persist");
-        drop(guard);
-        assert_eq!(stamped, source_time);
-
-        let metadata_sys = sys.read().await.clone();
-        metadata_sys.metadata_map.write().await.clear();
-        let reloaded = metadata_sys.get_config_from_disk(bucket).await.expect("reload from disk");
-        assert_eq!(reloaded.policy_config_updated_at, source_time);
-        assert_eq!(reloaded.tagging_config_updated_at, source_time);
-
-        // The plain path is unchanged: a local edit is stamped with the local clock.
-        let before = OffsetDateTime::now_utc();
-        let stamped = update_with_sys(sys.clone(), bucket, BUCKET_POLICY_CONFIG, policy)
-            .await
-            .expect("locally stamped policy write should persist");
-        assert!(stamped >= before, "the plain write path must keep stamping the local clock");
-        let reloaded = metadata_sys.get_config_from_disk(bucket).await.expect("reload from disk");
-        assert_eq!(reloaded.policy_config_updated_at, stamped);
-        assert_eq!(
-            reloaded.tagging_config_updated_at, source_time,
-            "an unrelated config keeps its source stamp"
-        );
-    }
-
-    /// backlog#2292: a replicated delete persists the source time as the
-    /// cleared config's `*_config_updated_at`, so the receive-side gate
-    /// (source time against stored stamp) lets a newer source re-create land
-    /// even when the delete was applied later than the re-create's source
-    /// time; the plain delete keeps stamping the local clock.
-    #[tokio::test]
-    async fn explicit_updated_at_is_persisted_by_a_delete() {
-        let (dirs, ecstore) = isolated_store_over_temp_disks().await;
-        let bucket = "source-stamped-delete";
-        for dir in &dirs {
-            std::fs::create_dir_all(dir.path().join(bucket)).expect("bucket volume should be created");
-        }
-        let sys = Arc::new(RwLock::new(BucketMetadataSys::new(ecstore)));
-        let policy = br#"{"Version":"2012-10-17","Statement":[]}"#.to_vec();
-        let created_at = OffsetDateTime::now_utc() - Duration::from_secs(3 * 3600);
-        let deleted_at = created_at + Duration::from_secs(60);
-        let recreated_at = deleted_at + Duration::from_secs(60);
-
-        update_with_sys_expected(sys.clone(), bucket, BUCKET_POLICY_CONFIG, policy.clone(), None, Some(created_at))
-            .await
-            .expect("source-stamped policy write should persist");
-        let stamped = delete_with_sys_expected(sys.clone(), bucket, BUCKET_POLICY_CONFIG, None, Some(deleted_at))
-            .await
-            .expect("source-stamped policy delete should persist");
-        assert_eq!(stamped, deleted_at);
-
-        let metadata_sys = sys.read().await.clone();
-        metadata_sys.metadata_map.write().await.clear();
-        let reloaded = metadata_sys.get_config_from_disk(bucket).await.expect("reload from disk");
-        assert!(reloaded.policy_config_json.is_empty(), "the delete cleared the payload");
-        assert_eq!(reloaded.policy_config_updated_at, deleted_at, "the delete kept the source stamp");
-        assert!(
-            recreated_at >= reloaded.policy_config_updated_at,
-            "a re-create newer than the delete's source time is not stale against the stored stamp"
-        );
-
-        // The plain delete path is unchanged: stamped with the local clock.
-        update_with_sys_expected(sys.clone(), bucket, BUCKET_POLICY_CONFIG, policy, None, Some(recreated_at))
-            .await
-            .expect("re-create should persist");
-        let before = OffsetDateTime::now_utc();
-        let stamped = delete_with_sys_expected(sys.clone(), bucket, BUCKET_POLICY_CONFIG, None, None)
-            .await
-            .expect("locally stamped delete should persist");
-        assert!(stamped >= before, "the plain delete path must keep stamping the local clock");
-        let reloaded = metadata_sys.get_config_from_disk(bucket).await.expect("reload from disk");
-        assert_eq!(reloaded.policy_config_updated_at, stamped);
-    }
-
    /// The load and the persisted write share one write guard, so concurrent
    /// rewrites of the same config compose instead of clobbering each other.
    /// Moving the load outside that guard loses all but the last tag.
@@ -4173,16 +3825,10 @@ mod tests {
        let new_incarnation = store.bucket_incarnation_id_from_disk(bucket).await.unwrap();
        assert_ne!(old_incarnation, new_incarnation);

-        let err = update_with_sys_expected(
-            sys.clone(),
-            bucket,
-            BUCKET_TAGGING_CONFIG,
-            b"<Tagging/>".to_vec(),
-            Some(old_incarnation),
-            None,
-        )
-        .await
-        .expect_err("a request authorized for the deleted incarnation must fail closed");
+        let err =
+            update_with_sys_expected(sys.clone(), bucket, BUCKET_TAGGING_CONFIG, b"<Tagging/>".to_vec(), Some(old_incarnation))
+                .await
+                .expect_err("a request authorized for the deleted incarnation must fail closed");
        assert!(matches!(err, Error::BucketNotFound(name) if name == bucket));

        let persisted = sys.read().await.get_config_from_disk(bucket).await.unwrap();
@@ -4217,7 +3863,7 @@ mod tests {
            }],
        })
        .unwrap();
-        update_under_config_write_guard(sys, &guard, BUCKET_TAGGING_CONFIG, tagging, None)
+        update_under_config_write_guard(sys, &guard, BUCKET_TAGGING_CONFIG, tagging)
            .await
            .unwrap();
        assert!(!delete.is_finished());
@@ -4420,114 +4066,6 @@ mod tests {
        target_sys.delete(bucket).await;
    }

-    /// rustfs/backlog#2282: an unreadable `bucket-targets.json` reaches every
-    /// targets reader as a typed error; it neither withdraws a snapshot a
-    /// previous readable load published, nor collapses into the "no targets
-    /// configured" state that a bucket with an absent configuration reports.
-    #[tokio::test]
-    #[serial]
-    async fn unreadable_bucket_targets_fail_closed_and_stay_distinct_from_absent() {
-        let (_dirs, ecstore) = isolated_store_over_temp_disks().await;
-        let sys = BucketMetadataSys::new(ecstore);
-        let target_sys = BucketTargetSys::get();
-        let unreadable = "targets-unreadable";
-        let absent = "targets-absent";
-        target_sys.delete(unreadable).await;
-        target_sys.delete(absent).await;
-
-        // A readable load publishes this bucket's targets.
-        let mut readable = BucketMetadata::new(unreadable);
-        readable.bucket_target_config = Some(BucketTargets {
-            targets: vec![target(unreadable, "live")],
-        });
-        sync_bucket_target_sys(unreadable, &readable).await;
-        assert_eq!(
-            target_sys
-                .list_bucket_targets(unreadable)
-                .await
-                .expect("readable targets publish")
-                .targets
-                .len(),
-            1
-        );
-
-        // The same bucket reloaded with a blob that cannot be decoded.
-        let mut corrupt = BucketMetadata::new(unreadable);
-        corrupt.bucket_targets_config_json = br#"{"targets":[{"endpoint":"#.to_vec();
-        corrupt
-            .parse_all_configs()
-            .expect("an unreadable targets blob must not fail the metadata load");
-        sys.set(unreadable.to_string(), Arc::new(corrupt)).await;
-
-        assert!(
-            matches!(
-                target_sys.list_bucket_targets(unreadable).await,
-                Err(BucketTargetError::BucketRemoteTargetsUnreadable { .. })
-            ),
-            "an unreadable configuration must not read as an empty or a missing target set"
-        );
-        assert!(
-            target_sys.list_targets(unreadable, "").await.is_err(),
-            "the admin listing must surface the fault instead of an empty list"
-        );
-        let err = sys
-            .get_bucket_targets_config(unreadable)
-            .await
-            .expect_err("an unreadable targets configuration must not read as a value");
-        assert_ne!(err, Error::ConfigNotFound, "unreadable must not be reported as absent");
-
-        // A bucket that never configured a target keeps its previous behavior.
-        let mut no_targets = BucketMetadata::new(absent);
-        no_targets.parse_all_configs().expect("absent targets parse");
-        sys.set(absent.to_string(), Arc::new(no_targets)).await;
-        assert!(
-            matches!(
-                target_sys.list_bucket_targets(absent).await,
-                Err(BucketTargetError::BucketRemoteTargetNotFound { .. })
-            ),
-            "an absent configuration must still report as a missing target set"
-        );
-        assert!(
-            target_sys
-                .list_targets(absent, "")
-                .await
-                .expect("an absent configuration lists no targets")
-                .is_empty()
-        );
-        assert!(
-            sys.get_bucket_targets_config(absent)
-                .await
-                .expect("an absent targets configuration still reads as an empty set")
-                .is_empty(),
-            "the absent path must keep returning an empty target set, exactly as before"
-        );
-
-        // One bucket's unreadable configuration does not reach another bucket.
-        assert!(!matches!(
-            target_sys.list_bucket_targets(absent).await,
-            Err(BucketTargetError::BucketRemoteTargetsUnreadable { .. })
-        ));
-
-        // A repaired configuration takes effect on the next load, no restart.
-        let mut repaired = BucketMetadata::new(unreadable);
-        repaired.bucket_target_config = Some(BucketTargets {
-            targets: vec![target(unreadable, "repaired")],
-        });
-        sync_bucket_target_sys(unreadable, &repaired).await;
-        assert_eq!(
-            target_sys
-                .list_bucket_targets(unreadable)
-                .await
-                .expect("a repaired configuration clears the unreadable marker")
-                .targets
-                .len(),
-            1
-        );
-
-        target_sys.delete(unreadable).await;
-        target_sys.delete(absent).await;
-    }
-
    #[tokio::test]
    #[serial]
    async fn metadata_reload_clears_stale_bucket_targets_when_config_is_removed() {
@@ -4583,26 +4121,19 @@ mod tests {

    const ODM_JSON: &[u8] = br#"{"source":{"provider":"minio","endpoint":"https://legacy.example.com:9000","region":"auto","bucket":"legacy-bucket","credentials":{"access_key":"AK","secret_key":"SK"}}}"#;

-    type RecordedOdmConfig = Option<(Vec<u8>, OffsetDateTime, Uuid)>;
-    type RecordedOdmHookCall = (String, RecordedOdmConfig);
-
    /// Every `(bucket, config)` the recording hook has seen. Tests filter by
    /// their own bucket name; the hook is process-wide and set once.
-    static ODM_HOOK_CALLS: std::sync::Mutex<Vec<RecordedOdmHookCall>> = std::sync::Mutex::new(Vec::new());
+    static ODM_HOOK_CALLS: std::sync::Mutex<Vec<(String, Option<OnDemandMigrationConfig>)>> = std::sync::Mutex::new(Vec::new());

    fn install_recording_odm_hook() {
-        BUCKET_CONFIG_PUBLISH_HOOK.get_or_init(|| {
-            Box::new(|bucket, config_file, config| {
-                assert_eq!(config_file, super::super::metadata::BUCKET_ON_DEMAND_MIGRATION_CONFIG);
-                ODM_HOOK_CALLS.lock().unwrap().push((
-                    bucket.to_string(),
-                    config.map(|(bytes, stamp, incarnation)| (bytes.to_vec(), stamp, incarnation)),
-                ));
+        ON_DEMAND_MIGRATION_CONFIG_HOOK.get_or_init(|| {
+            Box::new(|bucket, config| {
+                ODM_HOOK_CALLS.lock().unwrap().push((bucket.to_string(), config.cloned()));
            })
        });
    }

-    fn odm_hook_calls(bucket: &str) -> Vec<RecordedOdmConfig> {
+    fn odm_hook_calls(bucket: &str) -> Vec<Option<OnDemandMigrationConfig>> {
        ODM_HOOK_CALLS
            .lock()
            .unwrap()
@@ -4612,6 +4143,54 @@ mod tests {
            .collect()
    }

+    /// rustfs/backlog#2148: the accessor reports absence as `Ok(None)` and a
+    /// stored payload it cannot parse as a typed error, never as a default
+    /// and never as `ConfigNotFound`.
+    #[tokio::test]
+    async fn get_on_demand_migration_config_distinguishes_absent_from_corrupt() {
+        use crate::bucket::on_demand_migration::OnDemandMigrationConfigError;
+
+        let (_dirs, ecstore) = isolated_store_over_temp_disks().await;
+        let sys = BucketMetadataSys::new(ecstore);
+        let bucket = "odm-accessor";
+
+        sys.set(bucket.to_string(), Arc::new(BucketMetadata::new(bucket))).await;
+        assert_eq!(sys.get_on_demand_migration_config(bucket).await.unwrap(), None);
+
+        let mut corrupt = BucketMetadata::new(bucket);
+        corrupt.on_demand_migration_config_json = br#"{"source":{"provider":"s3"},"bogus":1}"#.to_vec();
+        sys.set(bucket.to_string(), Arc::new(corrupt)).await;
+        let err = sys
+            .get_on_demand_migration_config(bucket)
+            .await
+            .expect_err("corrupt config must not read as a default");
+        assert_ne!(err, Error::ConfigNotFound, "corruption must not be reported as absence");
+        let typed = match &err {
+            Error::Io(io) => io
+                .get_ref()
+                .and_then(|source| source.downcast_ref::<OnDemandMigrationConfigError>()),
+            _ => None,
+        };
+        assert!(
+            matches!(typed, Some(OnDemandMigrationConfigError::Malformed(_))),
+            "typed parse error must survive the Result boundary, got: {err:?}"
+        );
+
+        let mut valid = BucketMetadata::new(bucket);
+        valid
+            .update_config(crate::bucket::metadata::BUCKET_ON_DEMAND_MIGRATION_CONFIG, ODM_JSON.to_vec())
+            .unwrap();
+        let stamped = valid.on_demand_migration_config_updated_at;
+        sys.set(bucket.to_string(), Arc::new(valid)).await;
+        let (config, updated_at) = sys
+            .get_on_demand_migration_config(bucket)
+            .await
+            .unwrap()
+            .expect("stored config is returned");
+        assert_eq!(config, OnDemandMigrationConfig::from_json(ODM_JSON).unwrap());
+        assert_eq!(updated_at, stamped);
+    }
+
    /// rustfs/backlog#2148: the publish hook fires on every path that
    /// installs bucket metadata into the cache (set, initial load, peer
    /// reload, refresh loop, lazy load) and withdraws on removal, mirroring
@@ -4625,22 +4204,15 @@ mod tests {
        for dir in &dirs {
            std::fs::create_dir_all(dir.path().join(bucket)).expect("physical bucket should exist");
        }
-
-        let incarnation = Uuid::new_v4();
+        let expected = OnDemandMigrationConfig::from_json(ODM_JSON).unwrap();
        let expect_publish = |before: usize, label: &str| {
            let calls = odm_hook_calls(bucket);
            assert_eq!(calls.len(), before + 1, "{label} must publish exactly once");
-            assert_eq!(
-                calls.last().unwrap().as_ref().map(|(bytes, _, _)| bytes.as_slice()),
-                Some(ODM_JSON),
-                "{label} must publish the stored bytes"
-            );
-            assert_eq!(calls.last().unwrap().as_ref().map(|(_, _, id)| *id), Some(incarnation));
+            assert_eq!(calls.last().unwrap().as_ref(), Some(&expected), "{label} must publish the stored config");
        };

        // set (via persist_new_and_set, which installs through `set`).
        let mut bm = BucketMetadata::new(bucket);
-        bm.bucket_incarnation_id = incarnation;
        bm.update_config(crate::bucket::metadata::BUCKET_ON_DEMAND_MIGRATION_CONFIG, ODM_JSON.to_vec())
            .unwrap();
        let writer = BucketMetadataSys::new(ecstore.clone());
@@ -4682,18 +4254,14 @@ mod tests {
        assert_eq!(calls.len(), before + 1, "remove must withdraw exactly once");
        assert_eq!(calls.last().unwrap(), &None);

-        // Opaque bytes reach the application even if they are not valid JSON.
+        // A corrupt payload is withdrawn, never published as a config.
        let mut corrupt = BucketMetadata::new(bucket);
        corrupt.on_demand_migration_config_json = b"not-json".to_vec();
        let before = odm_hook_calls(bucket).len();
        lazy.set(bucket.to_string(), Arc::new(corrupt)).await;
        let calls = odm_hook_calls(bucket);
        assert_eq!(calls.len(), before + 1);
-        assert_eq!(
-            calls.last().unwrap().as_ref().map(|(bytes, _, _)| bytes.as_slice()),
-            Some(b"not-json".as_slice()),
-            "the application validates opaque config bytes"
-        );
+        assert_eq!(calls.last().unwrap(), &None, "unreadable config must publish absence");
    }

    #[tokio::test]
@@ -26,11 +26,11 @@ mod metadata_test;
 pub mod migration;
 mod msgp_decode;
 pub mod object_lock;
+pub mod on_demand_migration;
 pub mod policy_sys;
 pub mod quota;
 pub mod remote_s3_client;
 pub mod replication;
-pub mod sealed_credentials;
 pub mod tagging;
 pub mod target;
 pub mod utils;
@@ -25,8 +25,8 @@
 //!   [`BACKFILL_SAVE_INTERVAL`], and at every page end, with an `If-Match`
 //!   compare-and-set so a concurrent cancel or takeover is never overwritten.
 //! - The `continuation_token` only advances once every pull queued from the
-//!   page before it has succeeded. After a failure it stays at that page,
-//!   so crash recovery cannot skip failed pulls (existing keys are skipped).
+//!   page before it has reported back, so a crash re-lists at most one page
+//!   (already-present keys are then skipped, never re-pulled).
 //! - The owner holds a lease of [`BACKFILL_LEASE`] renewed by every save. The
 //!   recovery loop ([`run_backfill_recovery_loop`]) scans the buckets this
 //!   node has an ODM state for every [`BACKFILL_RECOVERY_INTERVAL`] and takes
@@ -45,12 +45,16 @@

 use super::pull::{EnqueueOutcome, PullReason, QueuedPullOutcome};
 use super::source_client::{SourceError, SourcePage};
-use super::storage_api::{
-    BUCKET_META_PREFIX, ECStore, HTTPPreconditions, NamespaceLocking as _, ObjectOperations as _, ObjectOptions,
-    RUSTFS_META_BUCKET, StorageError, WriteCompletion, get_lock_acquire_timeout, get_on_demand_migration_config_in,
-    local_node_name, read_config_with_metadata, save_config_with_opts,
-};
 use super::sys::{BucketOdmState, OnDemandMigrationSys};
+use crate::bucket::metadata_sys::bucket_metadata_sys_of;
+use crate::config::com::{read_config_with_metadata, save_config_with_opts};
+use crate::disk::{BUCKET_META_PREFIX, RUSTFS_META_BUCKET};
+use crate::error::Error as StorageError;
+use crate::object_api::ObjectOptions;
+use crate::runtime::sources::local_node_name;
+use crate::set_disk::get_lock_acquire_timeout;
+use crate::storage_api_contracts::{namespace::NamespaceLocking as _, object::HTTPPreconditions, object::ObjectOperations as _};
+use crate::store::ECStore;
 use async_trait::async_trait;
 use futures::StreamExt;
 use futures::stream::FuturesUnordered;
@@ -363,15 +367,14 @@ pub struct LocalBackfillObject {
    pub source_etag: Option<String>,
 }

-/// Shared report of a new or coalesced pull; absent only when not admitted.
-pub type PullReport = Option<super::pull::QueuedPullReport>;
+/// Receiver of one queued pull's report; `None` when the pull was coalesced
+/// into one already running.
+pub type PullReport = Option<oneshot::Receiver<QueuedPullOutcome>>;

 /// Everything the job needs from its bucket, so the loop can run against a
 /// mock in unit tests. Production: [`BucketBackfillContext`].
 #[async_trait]
 pub trait BackfillContext: Send + Sync {
-    /// The bucket incarnation captured by this context.
-    fn incarnation_id(&self) -> Uuid;
    /// One source page in the local key namespace.
    async fn list_page(&self, prefix: Option<&str>, token: Option<&str>, max_keys: i32) -> Result<SourcePage, SourceError>;
    /// Whether the breaker admits source traffic right now.
@@ -413,10 +416,6 @@ impl BucketBackfillContext {

 #[async_trait]
 impl BackfillContext for BucketBackfillContext {
-    fn incarnation_id(&self) -> Uuid {
-        self.state.incarnation_id()
-    }
-
    async fn list_page(&self, prefix: Option<&str>, token: Option<&str>, max_keys: i32) -> Result<SourcePage, SourceError> {
        let client = self.state.client().map_err(|err| SourceError::Unsupported(err.to_string()))?;
        let started = Instant::now();
@@ -476,10 +475,12 @@ impl BackfillContext for BucketBackfillContext {
    }

    async fn config_updated_at(&self) -> Result<Option<OffsetDateTime>, StorageError> {
-        Ok(
-            super::config::decode_stored_config(get_on_demand_migration_config_in(&self.api, self.state.bucket()).await?)?
-                .map(|(_, updated_at)| updated_at),
-        )
+        let sys = bucket_metadata_sys_of(&self.api.ctx)?;
+        let guard = sys.read().await;
+        Ok(guard
+            .get_on_demand_migration_config(self.state.bucket())
+            .await?
+            .map(|(_, updated_at)| updated_at))
    }
 }

@@ -667,36 +668,8 @@ pub async fn read_checkpoint(api: &Arc<ECStore>, bucket: &str) -> Result<Option<
 async fn write_checkpoint(
    api: &Arc<ECStore>,
    bucket: &str,
-    incarnation_id: Uuid,
    checkpoint: &BackfillCheckpoint,
    expected_etag: Option<&str>,
-) -> Result<String, BackfillError> {
-    let api = Arc::clone(api);
-    let bucket = bucket.to_string();
-    let checkpoint = checkpoint.clone();
-    let expected_etag = expected_etag.map(str::to_string);
-    // The storage commit owns detached work. Keep its user-bucket fence alive
-    // even when a caller aborts its waiter before the erasure tail has drained.
-    tokio::spawn(async move {
-        let fence = api.acquire_bucket_incarnation_fence(&bucket, incarnation_id).await?;
-        let mut opts = ObjectOptions::default();
-        fence.attach_to_object_options(&mut opts);
-        let result = write_checkpoint_while_fenced(&api, &bucket, &checkpoint, expected_etag.as_deref(), opts).await;
-        drop(fence);
-        result
-    })
-    .await
-    .map_err(|err| StorageError::other(format!("backfill checkpoint task failed: {err}")))?
-}
-
-/// The caller holds the destination bucket's lifecycle fence through the CAS
-/// write and its read-back, including the drained erasure write tail.
-async fn write_checkpoint_while_fenced(
-    api: &Arc<ECStore>,
-    bucket: &str,
-    checkpoint: &BackfillCheckpoint,
-    expected_etag: Option<&str>,
-    mut opts: ObjectOptions,
 ) -> Result<String, BackfillError> {
    let data = checkpoint.to_json()?;
    let preconditions = match expected_etag {
@@ -709,9 +682,11 @@ async fn write_checkpoint_while_fenced(
            ..Default::default()
        },
    };
-    opts.max_parity = true;
-    opts.write_completion = WriteCompletion::TailDrained;
-    opts.http_preconditions = Some(preconditions);
+    let opts = ObjectOptions {
+        max_parity: true,
+        http_preconditions: Some(preconditions),
+        ..Default::default()
+    };
    match save_config_with_opts(Arc::clone(api), &checkpoint_path(bucket), data, &opts).await {
        Ok(()) => {}
        Err(StorageError::PreconditionFailed) => return Err(BackfillError::Conflict(bucket.to_string())),
@@ -882,14 +857,7 @@ impl BackfillRunner {
            });
        }
        let checkpoint = BackfillCheckpoint::new(&request, config_updated_at, &self.node, now);
-        let etag = write_checkpoint(
-            &self.api,
-            bucket,
-            context.incarnation_id(),
-            &checkpoint,
-            stored.as_ref().map(|s| s.etag.as_str()),
-        )
-        .await?;
+        let etag = write_checkpoint(&self.api, bucket, &checkpoint, stored.as_ref().map(|s| s.etag.as_str())).await?;
        info!(
            event = EVENT_ODM_BACKFILL_STATE,
            component = LOG_COMPONENT_ECSTORE,
@@ -924,42 +892,30 @@ impl BackfillRunner {
            }
            return Ok(handle.snapshot.lock().clone());
        }
-        let incarnation_id = self.api.bucket_incarnation_id_from_disk(bucket).await?;
-        let lock = self.lease_lock(bucket, get_lock_acquire_timeout()).await?;
-        let api = Arc::clone(&self.api);
-        let bucket = bucket.to_string();
-        tokio::spawn(async move {
-            let _lock = lock;
-            let fence = api.acquire_bucket_incarnation_fence(&bucket, incarnation_id).await?;
-            let mut opts = ObjectOptions::default();
-            fence.attach_to_object_options(&mut opts);
-            let Some(stored) = read_checkpoint(&api, &bucket).await? else {
-                return Err(BackfillError::NotFound(bucket.to_string()));
-            };
-            if !stored.checkpoint.state.is_active() {
-                return Ok(stored.checkpoint);
-            }
-            let mut checkpoint = stored.checkpoint;
-            let now = OffsetDateTime::now_utc();
-            checkpoint.state = BackfillState::Cancelled;
-            checkpoint.updated_at = now;
-            write_checkpoint_while_fenced(&api, &bucket, &checkpoint, Some(&stored.etag), opts).await?;
-            info!(
-                event = EVENT_ODM_BACKFILL_STATE,
-                component = LOG_COMPONENT_ECSTORE,
-                subsystem = LOG_SUBSYSTEM_ON_DEMAND_MIGRATION,
-                state = checkpoint.state.as_str(),
-                result = "cancelled",
-                bucket = %bucket,
-                job_id = %checkpoint.job_id,
-                owner = %checkpoint.owner.as_ref().map(|o| o.node.as_str()).unwrap_or_default(),
-                "On-demand migration backfill job cancelled remotely"
-            );
-            drop(fence);
-            Ok(checkpoint)
-        })
-        .await
-        .map_err(|err| StorageError::other(format!("backfill cancellation task failed: {err}")))?
+        let _lock = self.lease_lock(bucket, get_lock_acquire_timeout()).await?;
+        let Some(stored) = read_checkpoint(&self.api, bucket).await? else {
+            return Err(BackfillError::NotFound(bucket.to_string()));
+        };
+        if !stored.checkpoint.state.is_active() {
+            return Ok(stored.checkpoint);
+        }
+        let mut checkpoint = stored.checkpoint;
+        let now = OffsetDateTime::now_utc();
+        checkpoint.state = BackfillState::Cancelled;
+        checkpoint.updated_at = now;
+        write_checkpoint(&self.api, bucket, &checkpoint, Some(&stored.etag)).await?;
+        info!(
+            event = EVENT_ODM_BACKFILL_STATE,
+            component = LOG_COMPONENT_ECSTORE,
+            subsystem = LOG_SUBSYSTEM_ON_DEMAND_MIGRATION,
+            state = checkpoint.state.as_str(),
+            result = "cancelled",
+            bucket = %bucket,
+            job_id = %checkpoint.job_id,
+            owner = %checkpoint.owner.as_ref().map(|o| o.node.as_str()).unwrap_or_default(),
+            "On-demand migration backfill job cancelled remotely"
+        );
+        Ok(checkpoint)
    }

    /// Latest checkpoint: the in-memory progress of a local job, else the
@@ -1052,7 +1008,7 @@ impl BackfillRunner {
            checkpoint.state = BackfillState::Cancelled;
            checkpoint.updated_at = now;
            checkpoint.record_failure("config_changed", None, now);
-            write_checkpoint(&self.api, bucket, context.incarnation_id(), &checkpoint, Some(&stored.etag)).await?;
+            write_checkpoint(&self.api, bucket, &checkpoint, Some(&stored.etag)).await?;
            info!(
                event = EVENT_ODM_BACKFILL_STATE,
                component = LOG_COMPONENT_ECSTORE,
@@ -1071,7 +1027,7 @@ impl BackfillRunner {
            node: self.node.clone(),
            lease_until: now + BACKFILL_LEASE,
        });
-        let etag = write_checkpoint(&self.api, bucket, context.incarnation_id(), &checkpoint, Some(&stored.etag)).await?;
+        let etag = write_checkpoint(&self.api, bucket, &checkpoint, Some(&stored.etag)).await?;
        warn!(
            event = EVENT_ODM_BACKFILL_LEASE_TAKEOVER,
            component = LOG_COMPONENT_ECSTORE,
@@ -1234,11 +1190,9 @@ impl Job {
    }

    async fn main_loop(&mut self) -> Result<(), Stop> {
-        let mut cursor = self.checkpoint.continuation_token.clone();
-        let failed_at_resume = self.checkpoint.failed;
        loop {
            self.check_cancel()?;
-            let page = self.list_page(cursor.as_deref()).await?;
+            let page = self.list_page().await?;
            for object in &page.objects {
                self.check_cancel()?;
                self.checkpoint.listed += 1;
@@ -1250,13 +1204,10 @@ impl Job {
                self.drain_ready();
                self.tick(false).await?;
            }
-            // A persisted cursor certifies successful work, not just listing
-            // progress. Keep it at the first failed page for crash recovery.
+            // Only advance the cursor once every pull of this page reported
+            // back, so a takeover re-lists at most this page.
            self.drain_all().await?;
-            cursor = page.next_continuation_token;
-            if self.checkpoint.failed == failed_at_resume {
-                self.checkpoint.continuation_token = cursor.clone();
-            }
+            self.checkpoint.continuation_token = page.next_continuation_token.clone();
            self.tick(true).await?;
            if !page.is_truncated {
                return Ok(());
@@ -1271,7 +1222,7 @@ impl Job {
        }
    }

-    async fn list_page(&mut self, cursor: Option<&str>) -> Result<SourcePage, Stop> {
+    async fn list_page(&mut self) -> Result<SourcePage, Stop> {
        let mut attempt = 0;
        loop {
            while !self.context.source_available() {
@@ -1279,7 +1230,7 @@ impl Job {
                self.tick(false).await?;
            }
            let prefix = self.checkpoint.prefix.clone();
-            let token = cursor.map(str::to_string);
+            let token = self.checkpoint.continuation_token.clone();
            match self
                .context
                .list_page(prefix.as_deref(), token.as_deref(), BACKFILL_LIST_PAGE_SIZE)
@@ -1353,10 +1304,9 @@ impl Job {
        }
        loop {
            match self.context.enqueue(key) {
-                (EnqueueOutcome::Enqueued | EnqueueOutcome::Coalesced, report) => {
+                (EnqueueOutcome::Enqueued, report) => {
                    self.checkpoint.enqueued += 1;
-                    let rx = report.ok_or(Stop::Unavailable)?;
-                    {
+                    if let Some(rx) = report {
                        let key = key.to_string();
                        self.outstanding.push(Box::pin(async move { (key, rx.await) }));
                    }
@@ -1371,6 +1321,11 @@ impl Job {
                    );
                    return Ok(());
                }
+                (EnqueueOutcome::Coalesced, _) => {
+                    // Someone else pulls it; its result is not ours to count.
+                    self.checkpoint.enqueued += 1;
+                    return Ok(());
+                }
                (EnqueueOutcome::QueueFull, _) => {
                    // Wait, never drop: one completion frees a slot.
                    if self.outstanding.is_empty() {
@@ -1510,8 +1465,7 @@ impl Job {
                lease_until: now + BACKFILL_LEASE,
            });
        }
-        let etag =
-            write_checkpoint(&self.api, &self.bucket, self.context.incarnation_id(), &self.checkpoint, Some(&self.etag)).await?;
+        let etag = write_checkpoint(&self.api, &self.bucket, &self.checkpoint, Some(&self.etag)).await?;
        self.etag = etag;
        self.keys_since_save = 0;
        self.last_save = Instant::now();
@@ -1523,7 +1477,7 @@ impl Job {
 /// Spawns [`run_backfill_recovery_loop`] on the store's shutdown token;
 /// `false` (nothing spawned) when the store has no background token.
 pub fn spawn_backfill_recovery_loop(runner: Arc<BackfillRunner>) -> bool {
-    let Some(cancel) = runner.api.background_cancel_token() else {
+    let Some(cancel) = runner.api.ctx.background_cancel_token() else {
        return false;
    };
    tokio::spawn(run_backfill_recovery_loop(runner, cancel));
@@ -1551,13 +1505,10 @@ pub async fn run_backfill_recovery_loop(runner: Arc<BackfillRunner>, cancel: Can

 #[cfg(test)]
 mod tests {
-    use super::super::storage_api::test_support::{
-        BUCKET_LIFECYCLE_LOCK_OBJECT, BucketOperations as _, PutObjectCommitBarrier, PutObjectCommitPause,
-        isolated_store_over_temp_disks,
-    };
    use super::*;
-    use crate::on_demand_migration::source_client::SourceObject;
-    use crate::on_demand_migration::sys::PullError;
+    use crate::bucket::metadata_sys::test_support::isolated_store_over_temp_disks;
+    use crate::bucket::on_demand_migration::source_client::SourceObject;
+    use crate::bucket::on_demand_migration::sys::PullError;
    use std::collections::{BTreeSet, HashSet};
    use std::sync::atomic::AtomicBool;

@@ -1680,7 +1631,6 @@ mod tests {

    /// Scripted source + local store + queue with a controllable report path.
    struct MockContext {
-        incarnation_id: Mutex<Option<Uuid>>,
        objects: Vec<SourceObject>,
        page_size: usize,
        local: Mutex<HashMap<String, LocalBackfillObject>>,
@@ -1689,7 +1639,6 @@ mod tests {
        queue_capacity: usize,
        pending: Mutex<Vec<(String, oneshot::Sender<QueuedPullOutcome>)>>,
        fail_keys: HashSet<String>,
-        coalesced: bool,
        auto_complete: AtomicBool,
        cancel: CancellationToken,
        config_updated_at: Mutex<Option<OffsetDateTime>>,
@@ -1709,7 +1658,6 @@ mod tests {
                })
                .collect();
            Arc::new(Self {
-                incarnation_id: Mutex::new(None),
                objects,
                page_size,
                local: Mutex::new(HashMap::new()),
@@ -1718,7 +1666,6 @@ mod tests {
                queue_capacity: usize::MAX,
                pending: Mutex::new(Vec::new()),
                fail_keys: HashSet::new(),
-                coalesced: false,
                auto_complete: AtomicBool::new(true),
                cancel: CancellationToken::new(),
                config_updated_at: Mutex::new(Some(ts(1_700_000_000))),
@@ -1744,10 +1691,6 @@ mod tests {

    #[async_trait]
    impl BackfillContext for MockContext {
-        fn incarnation_id(&self) -> Uuid {
-            self.incarnation_id.lock().expect("test bucket initialized")
-        }
-
        async fn list_page(&self, prefix: Option<&str>, token: Option<&str>, max_keys: i32) -> Result<SourcePage, SourceError> {
            if let Some(err) = self.list_error.lock().take() {
                return Err(err);
@@ -1802,12 +1745,7 @@ mod tests {
            } else {
                self.pending.lock().push((key.to_string(), tx));
            }
-            let outcome = if self.coalesced {
-                EnqueueOutcome::Coalesced
-            } else {
-                EnqueueOutcome::Enqueued
-            };
-            (outcome, Some(futures::FutureExt::shared(rx)))
+            (EnqueueOutcome::Enqueued, Some(rx))
        }

        fn cancel_token(&self) -> CancellationToken {
@@ -1840,17 +1778,12 @@ mod tests {
        context: Arc<MockContext>,
    ) -> (Vec<tempfile::TempDir>, Arc<ECStore>, Arc<BackfillRunner>) {
        let (dirs, store) = isolated_store_over_temp_disks().await;
-        super::super::storage_api::test_support::init_bucket_metadata_sys(Arc::clone(&store), Vec::new()).await;
-        store
-            .make_bucket(bucket, &Default::default())
-            .await
-            .expect("create test bucket");
-        *context.incarnation_id.lock() = Some(
-            store
-                .bucket_incarnation_id_from_disk(bucket)
-                .await
-                .expect("test bucket identity"),
-        );
+        // The isolated store has no bucket metadata system; the checkpoint
+        // only needs the bucket's directory under the metadata volume.
+        for dir in &dirs {
+            std::fs::create_dir_all(dir.path().join(RUSTFS_META_BUCKET).join(BUCKET_META_PREFIX).join(bucket))
+                .expect("test bucket metadata directory");
+        }
        let runner = runner_on(node, bucket, context, Arc::clone(&store));
        (dirs, store, runner)
    }
@@ -1860,129 +1793,6 @@ mod tests {
        BackfillRunner::new(store, node, Arc::new(contexts))
    }

-    #[tokio::test]
-    async fn cancelled_checkpoint_waiter_keeps_bucket_fenced_until_commit_finishes() {
-        for (suffix, pause) in [
-            ("before", PutObjectCommitPause::BeforeQuotaRename),
-            ("after", PutObjectCommitPause::AfterRenameQuorum),
-        ] {
-            let bucket = format!("backfill-cancel-tail-{suffix}");
-            let context = MockContext::new(0, 1);
-            let (_dirs, store, _runner) = runner_with("node-a", &bucket, Arc::clone(&context)).await;
-            let original_incarnation = context.incarnation_id();
-            let checkpoint = BackfillCheckpoint::new(&BackfillRequest::default(), ts(1_700_000_000), "node-a", ts(1_700_000_001));
-            let barrier = PutObjectCommitBarrier::install(RUSTFS_META_BUCKET, &checkpoint_path(&bucket), pause);
-            let writer_api = Arc::clone(&store);
-            let writer_bucket = bucket.clone();
-            let waiter = tokio::spawn(async move {
-                write_checkpoint(&writer_api, &writer_bucket, original_incarnation, &checkpoint, None).await
-            });
-            barrier.wait_until_paused().await;
-            waiter.abort();
-            assert!(waiter.await.expect_err("caller aborted").is_cancelled());
-
-            let lifecycle_lock = store
-                .new_ns_lock(&bucket, BUCKET_LIFECYCLE_LOCK_OBJECT)
-                .await
-                .expect("lifecycle lock");
-            {
-                let mut probe = Box::pin(lifecycle_lock.get_write_lock(Duration::from_secs(1)));
-                assert!(
-                    futures::poll!(probe.as_mut()).is_pending(),
-                    "lifecycle writer must first try to acquire the lock"
-                );
-                assert!(
-                    tokio::time::timeout(Duration::from_millis(100), probe.as_mut())
-                        .await
-                        .is_err(),
-                    "the checkpoint owner must retain the user bucket lifecycle read lock after caller cancellation"
-                );
-            }
-
-            let delete_api = Arc::clone(&store);
-            let delete_bucket = bucket.clone();
-            let mut deletion = tokio::spawn(async move { delete_api.delete_bucket(&delete_bucket, &Default::default()).await });
-            assert!(
-                tokio::time::timeout(Duration::from_millis(100), &mut deletion).await.is_err(),
-                "DeleteBucket must wait for the checkpoint owner after its caller aborts"
-            );
-            barrier.release();
-            tokio::time::timeout(Duration::from_secs(10), deletion)
-                .await
-                .expect("commit must drain and release its lifecycle guard")
-                .expect("delete task")
-                .expect("delete original bucket");
-            store
-                .make_bucket(&bucket, &Default::default())
-                .await
-                .expect("recreate bucket");
-            assert_ne!(
-                original_incarnation,
-                store.bucket_incarnation_id_from_disk(&bucket).await.expect("new identity")
-            );
-            assert!(
-                read_checkpoint(&store, &bucket)
-                    .await
-                    .expect("read recreated bucket")
-                    .is_none(),
-                "no old checkpoint may outlive bucket deletion"
-            );
-        }
-    }
-
-    #[tokio::test]
-    async fn stale_checkpoint_writer_cannot_resurrect_or_overwrite_a_recreated_bucket() {
-        let bucket = "backfill-incarnation";
-        let context = MockContext::new(0, 1);
-        let (_dirs, store, _runner) = runner_with("node-a", bucket, Arc::clone(&context)).await;
-        let old_incarnation = context.incarnation_id();
-        let old = BackfillCheckpoint::new(&BackfillRequest::default(), ts(1_700_000_000), "node-a", ts(1_700_000_001));
-        let old_etag = write_checkpoint(&store, bucket, old_incarnation, &old, None)
-            .await
-            .expect("old checkpoint");
-
-        store
-            .delete_bucket(bucket, &Default::default())
-            .await
-            .expect("delete original bucket");
-        store.make_bucket(bucket, &Default::default()).await.expect("recreate bucket");
-        let current_incarnation = store.bucket_incarnation_id_from_disk(bucket).await.expect("new identity");
-        assert_ne!(old_incarnation, current_incarnation);
-        assert!(
-            read_checkpoint(&store, bucket)
-                .await
-                .expect("read after recreation")
-                .is_none()
-        );
-        for expected_etag in [None, Some(old_etag.as_str())] {
-            let error = write_checkpoint(&store, bucket, old_incarnation, &old, expected_etag)
-                .await
-                .expect_err("stale writer rejected");
-            assert!(matches!(error, BackfillError::Storage(StorageError::BucketNotFound(_))));
-        }
-        assert!(
-            read_checkpoint(&store, bucket)
-                .await
-                .expect("stale writer left no checkpoint")
-                .is_none()
-        );
-
-        let current = BackfillCheckpoint::new(&BackfillRequest::default(), ts(1_700_000_000), "node-b", ts(1_700_000_002));
-        let current_etag = write_checkpoint(&store, bucket, current_incarnation, &current, None)
-            .await
-            .expect("current checkpoint");
-        let error = write_checkpoint(&store, bucket, old_incarnation, &old, Some(&current_etag))
-            .await
-            .expect_err("old identity cannot overwrite a matching ETag");
-        assert!(matches!(error, BackfillError::Storage(StorageError::BucketNotFound(_))));
-        let stored = read_checkpoint(&store, bucket)
-            .await
-            .expect("read current checkpoint")
-            .expect("current checkpoint remains");
-        assert_eq!(stored.etag, current_etag);
-        assert_eq!(stored.checkpoint, current);
-    }
-
    #[tokio::test]
    async fn full_backfill_lists_pages_and_counts_every_key() {
        let bucket = "backfill-full";
@@ -2101,7 +1911,7 @@ mod tests {
    #[tokio::test]
    async fn failed_pulls_are_counted_hashed_and_finish_with_failures() {
        let bucket = "backfill-failed";
-        let mut context = MockContext::new(5, 2);
+        let mut context = MockContext::new(5, 1000);
        Arc::get_mut(&mut context)
            .expect("unshared")
            .fail_keys
@@ -2116,52 +1926,12 @@ mod tests {
            .checkpoint;
        assert_eq!(cp.state, BackfillState::CompletedWithFailures);
        assert_eq!((cp.pulled, cp.failed), (4, 1));
-        assert_eq!(cp.continuation_token.as_deref(), Some("2"), "retain the first failed page for recovery");
        assert_eq!(cp.failed_keys, vec![key_hash("k/00002")]);
        let last = cp.last_error.expect("last error");
        assert_eq!(last.class, "local_write");
        assert_eq!(last.key_hash.as_deref(), Some(key_hash("k/00002").as_str()));
    }

-    #[tokio::test]
-    async fn coalesced_pulls_block_the_checkpoint_and_report_failures() {
-        let bucket = "backfill-coalesced";
-        let mut context = MockContext::new(1, 1);
-        {
-            let ctx = Arc::get_mut(&mut context).expect("unshared");
-            ctx.coalesced = true;
-            ctx.auto_complete = AtomicBool::new(false);
-            ctx.fail_keys.insert("k/00000".to_string());
-        }
-        let (_dirs, store, runner) = runner_with("node-a", bucket, Arc::clone(&context)).await;
-        runner.start(bucket, BackfillRequest::default()).await.expect("start");
-        tokio::time::timeout(Duration::from_secs(10), async {
-            while context.pending.lock().is_empty() {
-                tokio::task::yield_now().await;
-            }
-        })
-        .await
-        .expect("job enqueued");
-        assert!(runner.is_running_locally(bucket), "coalescing is not completion");
-        let cp = read_checkpoint(&store, bucket)
-            .await
-            .expect("read")
-            .expect("checkpoint")
-            .checkpoint;
-        assert!(cp.state.is_active());
-        assert!(cp.continuation_token.is_none());
-        context.complete_pending();
-        runner.wait_until_idle(bucket).await;
-        let cp = read_checkpoint(&store, bucket)
-            .await
-            .expect("read")
-            .expect("checkpoint")
-            .checkpoint;
-        assert_eq!(cp.state, BackfillState::CompletedWithFailures);
-        assert_eq!((cp.enqueued, cp.pulled, cp.failed), (1, 0, 1));
-        assert_eq!(cp.failed_keys, vec![key_hash("k/00000")]);
-    }
-
    #[tokio::test]
    async fn listing_failure_marks_the_job_failed_with_the_error_class() {
        let bucket = "backfill-list-error";
@@ -2322,7 +2092,7 @@ mod tests {
            node: "node-a".to_string(),
            lease_until: now - Duration::from_secs(120),
        });
-        let etag = write_checkpoint(&store, bucket, context.incarnation_id(), &crashed, None)
+        let etag = write_checkpoint(&store, bucket, &crashed, None)
            .await
            .expect("seed checkpoint");

@@ -2333,7 +2103,7 @@ mod tests {
            lease_until: now + Duration::from_secs(60),
        });
        live.updated_at = now;
-        let etag = write_checkpoint(&store, bucket, context.incarnation_id(), &live, Some(&etag))
+        let etag = write_checkpoint(&store, bucket, &live, Some(&etag))
            .await
            .expect("live lease");
        assert_eq!(runner.recover_once().await.taken_over, 0, "unexpired lease must not be taken over");
@@ -2350,7 +2120,7 @@ mod tests {
            lease_until: now - Duration::from_secs(1),
        });
        expired.updated_at = now + Duration::from_millis(1);
-        write_checkpoint(&store, bucket, context.incarnation_id(), &expired, Some(&etag))
+        write_checkpoint(&store, bucket, &expired, Some(&etag))
            .await
            .expect("expire lease");
        let stats = runner.recover_once().await;
@@ -2374,68 +2144,6 @@ mod tests {
        assert_eq!(runner.recover_once().await.taken_over, 0, "a finished job is not recovered");
    }

-    #[tokio::test]
-    async fn recovery_advances_past_historical_failures_but_pins_new_failures() {
-        let bucket = "backfill-takeover-failed";
-        let mut context = MockContext::new(8, 2);
-        {
-            let ctx = Arc::get_mut(&mut context).expect("unshared");
-            ctx.auto_complete = AtomicBool::new(false);
-            ctx.fail_keys.insert("k/00004".to_string());
-        }
-        let (_dirs, store, runner) = runner_with("node-b", bucket, Arc::clone(&context)).await;
-        let crashed_at = OffsetDateTime::now_utc() - Duration::from_secs(300);
-        let mut crashed = BackfillCheckpoint::new(&BackfillRequest::default(), ts(1_700_000_000), "node-a", crashed_at);
-        crashed.continuation_token = Some("2".to_string());
-        crashed.failed = 1;
-        crashed.record_failure("local_write", Some("k/00002"), crashed_at);
-        write_checkpoint(&store, bucket, context.incarnation_id(), &crashed, None)
-            .await
-            .expect("seed failed page with an expired lease");
-
-        assert_eq!(runner.recover_once().await.taken_over, 1);
-        for (page_start, durable_token, failures) in [(2, "2", 1), (4, "4", 1), (6, "4", 2)] {
-            tokio::time::timeout(Duration::from_secs(10), async {
-                loop {
-                    if context.pending.lock().len() == 2 {
-                        break;
-                    }
-                    tokio::task::yield_now().await;
-                }
-            })
-            .await
-            .expect("resumed page enqueued before its reports complete");
-            assert_eq!(
-                context.pending.lock().iter().map(|(key, _)| key.clone()).collect::<Vec<_>>(),
-                vec![format!("k/{page_start:05}"), format!("k/{:05}", page_start + 1)]
-            );
-            let cp = read_checkpoint(&store, bucket)
-                .await
-                .expect("read persisted page boundary")
-                .expect("checkpoint")
-                .checkpoint;
-            assert_eq!(cp.job_id, crashed.job_id);
-            assert_eq!(cp.owner.as_ref().map(|owner| owner.node.as_str()), Some("node-b"));
-            assert_eq!(cp.continuation_token.as_deref(), Some(durable_token));
-            assert_eq!(cp.failed, failures);
-            context.complete_pending();
-        }
-        runner.wait_until_idle(bucket).await;
-        let cp = read_checkpoint(&store, bucket)
-            .await
-            .expect("read completed checkpoint")
-            .expect("checkpoint")
-            .checkpoint;
-        assert_eq!(cp.state, BackfillState::CompletedWithFailures);
-        assert_eq!((cp.pulled, cp.failed), (5, 2));
-        assert_eq!(cp.continuation_token.as_deref(), Some("4"));
-        assert_eq!(cp.failed_keys, vec![key_hash("k/00002"), key_hash("k/00004")]);
-        assert_eq!(
-            context.list_requests.lock().as_slice(),
-            &[Some("2".to_string()), Some("4".to_string()), Some("6".to_string())]
-        );
-    }
-
    #[tokio::test]
    async fn recovery_cancels_a_job_whose_config_changed_and_reclaims_own_node_jobs() {
        let bucket = "backfill-recovery-config";
@@ -2445,9 +2153,7 @@ mod tests {

        // Same node name, unexpired lease: only a restart can produce this.
        let own = BackfillCheckpoint::new(&BackfillRequest::default(), ts(1_700_000_000), "node-a", now);
-        let etag = write_checkpoint(&store, bucket, context.incarnation_id(), &own, None)
-            .await
-            .expect("seed");
+        let etag = write_checkpoint(&store, bucket, &own, None).await.expect("seed");
        assert_eq!(runner.recover_once().await.taken_over, 1, "own-node running job is reclaimed at once");
        runner.wait_until_idle(bucket).await;
        let cp = read_checkpoint(&store, bucket)
@@ -2465,7 +2171,7 @@ mod tests {
            node: "node-z".to_string(),
            lease_until: now - Duration::from_secs(1),
        });
-        write_checkpoint(&store, bucket, context.incarnation_id(), &stale, Some(&stored.etag))
+        write_checkpoint(&store, bucket, &stale, Some(&stored.etag))
            .await
            .expect("seed stale");
        let stats = runner.recover_once().await;
@@ -86,12 +86,7 @@ impl BreakerVerdict {
            Some(SourceError::Throttled | SourceError::Timeout | SourceError::Connect(_) | SourceError::ServerError(_)) => {
                BreakerVerdict::Failure
            }
-            Some(
-                SourceError::AccessDenied
-                | SourceError::Unsupported(_)
-                | SourceError::InvalidPagination(_)
-                | SourceError::Other(_),
-            ) => BreakerVerdict::Neutral,
+            Some(SourceError::AccessDenied | SourceError::Unsupported(_) | SourceError::Other(_)) => BreakerVerdict::Neutral,
        }
    }
 }
@@ -14,44 +14,22 @@

 //! Bucket-level On-Demand Migration configuration: wire model (JSON stored
 //! under `on-demand-migration.json`), pure validation, credential redaction,
-//! and persisted-config decoding (rustfs/backlog#2148).
+//! and the publish hook the runtime registers into (rustfs/backlog#2148).
 //!
 //! The persisted blob is not encrypted; it shares the trust boundary of
 //! `bucket-targets.json` and `tier-config.bin`.

 use serde::{Deserialize, Serialize};
 use std::fmt;
+use std::sync::OnceLock;
 use url::Url;

-/// Decode bytes only at the service boundary, preserving typed corruption errors.
-pub(super) fn decode_stored_config(
-    stored: Option<(Vec<u8>, time::OffsetDateTime)>,
-) -> Result<Option<(OnDemandMigrationConfig, time::OffsetDateTime)>, super::storage_api::StorageError> {
-    stored
-        .map(|(bytes, updated_at)| {
-            OnDemandMigrationConfig::from_json(&bytes)
-                .map(|config| (config, updated_at))
-                .map_err(super::storage_api::StorageError::other)
-        })
-        .transpose()
-}
-
-pub(crate) async fn get_config(
-    bucket: &str,
-) -> Result<Option<(OnDemandMigrationConfig, time::OffsetDateTime)>, super::storage_api::StorageError> {
-    decode_stored_config(super::storage_api::get_on_demand_migration_config(bucket).await?)
-}
-
 /// The only wire version this build reads and writes.
 pub const ON_DEMAND_MIGRATION_CONFIG_VERSION: u32 = 1;

 const REDACTED: &str = "REDACTED";
 const AUTO_REGION: &str = "auto";
 const AUTO_REGION_FALLBACK: &str = "us-east-1";
-/// Public Azure Blob host suffix; the account name is the first label.
-pub const AZURE_BLOB_SUFFIX: &str = "blob.core.windows.net";
-/// Public Google Cloud Storage endpoint for the native provider.
-pub const GCS_DEFAULT_ENDPOINT: &str = "https://storage.googleapis.com";

 const KIB: u64 = 1024;
 const MIB: u64 = 1024 * KIB;
@@ -97,25 +75,14 @@ pub struct SourceConfig {
    pub bucket: String,
    #[serde(default)]
    pub path_style: PathStyle,
-    /// `None` means anonymous access to a public source bucket. Only the
-    /// SigV4 providers read it; `azure` and `gcs_native` carry their own
-    /// credentials in `azure` / `gcs`.
+    /// `None` means anonymous access to a public source bucket.
    #[serde(default)]
    pub credentials: Option<SourceCredentials>,
    #[serde(default)]
    pub tls: TlsConfig,
-    /// Required for [`Provider::Azure`] and rejected for every other
-    /// provider.
-    #[serde(default)]
-    pub azure: Option<AzureSourceConfig>,
-    /// Required for [`Provider::GcsNative`] and rejected for every other
-    /// provider. [`Provider::Gcs`] keeps using `credentials` because it
-    /// speaks the S3 interoperability API.
-    #[serde(default)]
-    pub gcs: Option<GcsSourceConfig>,
 }

-/// Source vendor family.
+/// Source vendor family. `azure` is deliberately absent from this version.
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
 #[serde(rename_all = "lowercase")]
 pub enum Provider {
@@ -127,12 +94,6 @@ pub enum Provider {
    R2,
    /// GCS XML interoperability API with HMAC keys.
    Gcs,
-    /// Native Azure Blob service; parameters in `source.azure`.
-    Azure,
-    /// Native GCS JSON API with a service-account key; parameters in
-    /// `source.gcs`.
-    #[serde(rename = "gcs_native")]
-    GcsNative,
 }

 impl Provider {
@@ -144,22 +105,13 @@ impl Provider {
            Provider::Rustfs => "rustfs",
            Provider::R2 => "r2",
            Provider::Gcs => "gcs",
-            Provider::Azure => "azure",
-            Provider::GcsNative => "gcs_native",
        }
    }

-    /// Providers that do not speak S3 and therefore ignore `region`,
-    /// `path_style` and `credentials`.
-    pub fn is_native(&self) -> bool {
-        matches!(self, Provider::Azure | Provider::GcsNative)
-    }
-
    /// Providers whose SDKs accept `region = "auto"`; RustFS maps it to
-    /// `us-east-1` for signing. The native providers never sign with a
-    /// region, so they accept it as well.
+    /// `us-east-1` for signing.
    fn accepts_auto_region(&self) -> bool {
-        matches!(self, Provider::R2 | Provider::Minio | Provider::Rustfs) || self.is_native()
+        matches!(self, Provider::R2 | Provider::Minio | Provider::Rustfs)
    }
 }

@@ -212,73 +164,6 @@ impl fmt::Debug for SourceCredentials {
    }
 }

-/// Native Azure Blob source parameters. The container is `source.bucket`,
-/// so a config never carries two names for the same container. Exactly one
-/// of `account_key` and `sas_token` must be set: the account key signs with
-/// Shared Key, the SAS token is appended to every request URL.
-#[derive(Clone, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct AzureSourceConfig {
-    /// Storage account name; also derives the default `blob.core.windows.net`
-    /// endpoint when `source.endpoint` is absent.
-    pub account: String,
-    /// Base64 shared key of the storage account.
-    #[serde(default)]
-    pub account_key: Option<String>,
-    /// SAS query string without the leading `?`.
-    #[serde(default)]
-    pub sas_token: Option<String>,
-}
-
-impl AzureSourceConfig {
-    /// A copy safe to return to admin clients or log: both secrets are
-    /// replaced by `REDACTED`, and whether each is set stays visible.
-    pub fn redacted(&self) -> Self {
-        Self {
-            account: self.account.clone(),
-            account_key: self.account_key.as_ref().map(|_| REDACTED.to_string()),
-            sas_token: self.sas_token.as_ref().map(|_| REDACTED.to_string()),
-        }
-    }
-}
-
-impl fmt::Debug for AzureSourceConfig {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("AzureSourceConfig")
-            .field("account", &self.account)
-            .field("account_key", &self.account_key.as_ref().map(|_| REDACTED))
-            .field("sas_token", &self.sas_token.as_ref().map(|_| REDACTED))
-            .finish()
-    }
-}
-
-/// Native Google Cloud Storage source parameters. The bucket is
-/// `source.bucket`; only the service-account key lives here.
-#[derive(Clone, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct GcsSourceConfig {
-    /// Service-account key JSON, verbatim as downloaded from Google Cloud.
-    pub service_account_json: String,
-}
-
-impl GcsSourceConfig {
-    /// A copy safe to return to admin clients or log: the whole key JSON is
-    /// a secret (it embeds the private key), so it is replaced wholesale.
-    pub fn redacted(&self) -> Self {
-        Self {
-            service_account_json: REDACTED.to_string(),
-        }
-    }
-}
-
-impl fmt::Debug for GcsSourceConfig {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("GcsSourceConfig")
-            .field("service_account_json", &REDACTED)
-            .finish()
-    }
-}
-
 #[derive(Debug, Clone, PartialEq, Eq, Default, Serialize, Deserialize)]
 #[serde(deny_unknown_fields)]
 pub struct TlsConfig {
@@ -469,14 +354,6 @@ pub enum OnDemandMigrationConfigError {
    InvalidBucket(&'static str),
    #[error("source credentials field {0} must not be empty")]
    EmptyCredential(&'static str),
-    #[error("source.{0} is required for provider {1}")]
-    MissingProviderBlock(&'static str, Provider),
-    #[error("source.{0} is not valid for provider {1}")]
-    UnexpectedProviderBlock(&'static str, Provider),
-    /// Carries only the reason: the block holds account keys, SAS tokens and
-    /// service-account JSON, so no value of it is ever echoed.
-    #[error("source.{0} is invalid: {1}")]
-    InvalidProviderBlock(&'static str, &'static str),
    #[error("source tls.ca_cert_pem is not a PEM certificate")]
    InvalidCaCert,
    #[error("filter.{0} must be null or a non-empty string")]
@@ -511,8 +388,6 @@ impl OnDemandMigrationConfig {
    pub fn redacted(&self) -> Self {
        let mut copy = self.clone();
        copy.source.credentials = self.source.credentials.as_ref().map(SourceCredentials::redacted);
-        copy.source.azure = self.source.azure.as_ref().map(AzureSourceConfig::redacted);
-        copy.source.gcs = self.source.gcs.as_ref().map(GcsSourceConfig::redacted);
        copy
    }

@@ -558,12 +433,6 @@ impl SourceConfig {
        match (&self.endpoint, self.provider) {
            (Some(endpoint), _) => endpoint.clone(),
            (None, Provider::Aws) => format!("https://s3.{}.amazonaws.com", self.region),
-            (None, Provider::Azure) => self
-                .azure
-                .as_ref()
-                .map(|azure| format!("https://{}.{AZURE_BLOB_SUFFIX}", azure.account))
-                .unwrap_or_default(),
-            (None, Provider::GcsNative) => GCS_DEFAULT_ENDPOINT.to_string(),
            (None, _) => String::new(),
        }
    }
@@ -579,8 +448,6 @@ impl SourceConfig {
    }

    fn validate(&self) -> Result<(), OnDemandMigrationConfigError> {
-        self.validate_provider_block()?;
-
        if self.region.is_empty() {
            return Err(OnDemandMigrationConfigError::EmptyRegion);
        }
@@ -599,9 +466,6 @@ impl SourceConfig {
                    ));
                }
            }
-            // Both native providers derive a fixed endpoint; Azure's is built
-            // from the account name, already checked by `validate_provider_block`.
-            None if self.provider.is_native() => {}
            None => return Err(OnDemandMigrationConfigError::MissingEndpoint(self.provider)),
        }

@@ -632,84 +496,6 @@ impl SourceConfig {

        Ok(())
    }
-
-    /// The provider-specific block must be present for exactly its own
-    /// provider: a stray `azure` block on an `s3` source would otherwise be
-    /// accepted, stored, and silently ignored by the client builder.
-    fn validate_provider_block(&self) -> Result<(), OnDemandMigrationConfigError> {
-        let missing = OnDemandMigrationConfigError::MissingProviderBlock;
-        let unexpected = OnDemandMigrationConfigError::UnexpectedProviderBlock;
-        let invalid = OnDemandMigrationConfigError::InvalidProviderBlock;
-
-        if self.provider != Provider::Azure && self.azure.is_some() {
-            return Err(unexpected("azure", self.provider));
-        }
-        if self.provider != Provider::GcsNative && self.gcs.is_some() {
-            return Err(unexpected("gcs", self.provider));
-        }
-
-        match self.provider {
-            Provider::Azure => {
-                let azure = self.azure.as_ref().ok_or(missing("azure", self.provider))?;
-                if azure.account.is_empty() {
-                    return Err(invalid("azure", "account must not be empty"));
-                }
-                // The account feeds a hostname when the endpoint is derived:
-                // keep it to label characters so it cannot rewrite the host.
-                if !azure.account.bytes().all(|b| b.is_ascii_alphanumeric() || b == b'-') {
-                    return Err(invalid("azure", "account contains characters outside [A-Za-z0-9-]"));
-                }
-                match (azure.account_key.as_deref(), azure.sas_token.as_deref()) {
-                    (Some(_), Some(_)) => return Err(invalid("azure", "account_key and sas_token are mutually exclusive")),
-                    (None, None) => return Err(invalid("azure", "one of account_key and sas_token is required")),
-                    (Some(key), None) => {
-                        if key.is_empty() {
-                            return Err(invalid("azure", "account_key must not be empty"));
-                        }
-                        // Decoded here so a mistyped key fails at the admin
-                        // boundary instead of on the first source request.
-                        if base64_simd::STANDARD.decode_to_vec(key.as_bytes()).is_err() {
-                            return Err(invalid("azure", "account_key is not base64"));
-                        }
-                    }
-                    (None, Some(sas)) => {
-                        if sas.is_empty() {
-                            return Err(invalid("azure", "sas_token must not be empty"));
-                        }
-                        if sas.starts_with('?') {
-                            return Err(invalid("azure", "sas_token must not start with '?'"));
-                        }
-                        if sas.chars().any(char::is_whitespace) {
-                            return Err(invalid("azure", "sas_token must not contain whitespace"));
-                        }
-                    }
-                }
-            }
-            Provider::GcsNative => {
-                let gcs = self.gcs.as_ref().ok_or(missing("gcs", self.provider))?;
-                let key: serde_json::Value = serde_json::from_str(&gcs.service_account_json)
-                    .map_err(|_| invalid("gcs", "service_account_json is not valid JSON"))?;
-                let Some(object) = key.as_object() else {
-                    return Err(invalid("gcs", "service_account_json is not a JSON object"));
-                };
-                if object.get("type").and_then(serde_json::Value::as_str) != Some("service_account") {
-                    return Err(invalid("gcs", "service_account_json is not a service_account key"));
-                }
-                for field in ["client_email", "private_key"] {
-                    if object
-                        .get(field)
-                        .and_then(serde_json::Value::as_str)
-                        .is_none_or(str::is_empty)
-                    {
-                        return Err(invalid("gcs", "service_account_json is missing client_email or private_key"));
-                    }
-                }
-            }
-            Provider::S3 | Provider::Aws | Provider::Minio | Provider::Rustfs | Provider::R2 | Provider::Gcs => {}
-        }
-
-        Ok(())
-    }
 }

 fn validate_endpoint(endpoint: &str) -> Result<(), OnDemandMigrationConfigError> {
@@ -804,6 +590,16 @@ impl EndpointKey {
    }
 }

+/// Signature of the runtime publish hook: called with the bucket name and
+/// its parsed config (`None` when absent, cleared, or unreadable) every time
+/// the bucket's metadata is installed into or removed from the cache.
+pub type ConfigPublishHook = Box<dyn Fn(&str, Option<&OnDemandMigrationConfig>) + Send + Sync>;
+
+/// Registration point for the runtime (`OnDemandMigrationSys`). Until it is
+/// set, metadata publishes are no-ops for ODM, so this crate carries no
+/// runtime dependency and the config layer stays inert.
+pub static ON_DEMAND_MIGRATION_CONFIG_HOOK: OnceLock<ConfigPublishHook> = OnceLock::new();
+
 #[cfg(test)]
 mod tests {
    use super::*;
@@ -903,15 +699,7 @@ mod tests {
            ),
            (
                "provider enum",
-                r#"{"source":{"provider":"swift","endpoint":"https://h","region":"r","bucket":"b"}}"#,
-            ),
-            (
-                "azure block",
-                r#"{"source":{"provider":"azure","region":"auto","bucket":"b","azure":{"account":"acct","account_key":"a2V5","extra":1}}}"#,
-            ),
-            (
-                "gcs block",
-                r#"{"source":{"provider":"gcs_native","region":"auto","bucket":"b","gcs":{"service_account_json":"{}","extra":1}}}"#,
+                r#"{"source":{"provider":"azure","endpoint":"https://h","region":"r","bucket":"b"}}"#,
            ),
        ] {
            let err = OnDemandMigrationConfig::from_json(json.as_bytes()).expect_err(label);
@@ -1032,201 +820,9 @@ mod tests {
                "{provider}"
            );
        }
-        // The native providers never sign with a region, so "auto" is the
-        // honest value to write for them.
-        for cfg in [azure_cfg(), gcs_native_cfg()] {
-            assert_eq!(cfg.source.region, "auto");
-            cfg.validate(empty_ctx())
-                .unwrap_or_else(|err| panic!("{}: {err}", cfg.source.provider));
-        }
        assert_eq!(sample().source.effective_region(), "us-west-1");
    }

-    const SERVICE_ACCOUNT_JSON: &str = r#"{"type":"service_account","project_id":"p","client_email":"a@b.iam.gserviceaccount.com","private_key":"-----BEGIN PRIVATE KEY-----\nsecret\n-----END PRIVATE KEY-----"}"#;
-
-    fn azure_cfg() -> OnDemandMigrationConfig {
-        let mut cfg = sample();
-        cfg.source.provider = Provider::Azure;
-        cfg.source.endpoint = None;
-        cfg.source.region = "auto".to_string();
-        cfg.source.credentials = None;
-        cfg.source.azure = Some(AzureSourceConfig {
-            account: "legacyaccount".to_string(),
-            account_key: Some("c2VjcmV0LWtleQ==".to_string()),
-            sas_token: None,
-        });
-        cfg
-    }
-
-    fn gcs_native_cfg() -> OnDemandMigrationConfig {
-        let mut cfg = sample();
-        cfg.source.provider = Provider::GcsNative;
-        cfg.source.endpoint = None;
-        cfg.source.region = "auto".to_string();
-        cfg.source.credentials = None;
-        cfg.source.gcs = Some(GcsSourceConfig {
-            service_account_json: SERVICE_ACCOUNT_JSON.to_string(),
-        });
-        cfg
-    }
-
-    #[test]
-    fn native_providers_derive_their_endpoint_and_round_trip_on_the_wire() {
-        let azure = azure_cfg();
-        assert_eq!(azure.source.effective_endpoint(), "https://legacyaccount.blob.core.windows.net");
-        let gcs = gcs_native_cfg();
-        assert_eq!(gcs.source.effective_endpoint(), "https://storage.googleapis.com");
-
-        for cfg in [azure_cfg(), gcs_native_cfg()] {
-            let json = cfg.to_json().expect("config must serialize");
-            assert_eq!(OnDemandMigrationConfig::from_json(&json).expect("config must parse"), cfg);
-        }
-        // The wire labels are part of the admin contract.
-        assert!(
-            String::from_utf8(azure_cfg().to_json().expect("json"))
-                .expect("utf8")
-                .contains(r#""provider":"azure""#)
-        );
-        assert!(
-            String::from_utf8(gcs_native_cfg().to_json().expect("json"))
-                .expect("utf8")
-                .contains(r#""provider":"gcs_native""#)
-        );
-    }
-
-    #[test]
-    fn an_explicit_endpoint_overrides_the_derived_native_one() {
-        // Azurite and fake-gcs-server are addressed this way.
-        let mut cfg = azure_cfg();
-        cfg.source.endpoint = Some("http://azurite.example.com:10000".to_string());
-        cfg.validate(empty_ctx()).expect("an explicit native endpoint is allowed");
-        assert_eq!(cfg.source.effective_endpoint(), "http://azurite.example.com:10000");
-
-        cfg.source.endpoint = Some("http://azurite.example.com:10000/devstoreaccount1".to_string());
-        assert!(
-            matches!(cfg.validate(empty_ctx()), Err(OnDemandMigrationConfigError::InvalidEndpoint(_))),
-            "a native endpoint is still an origin"
-        );
-    }
-
-    #[test]
-    fn a_provider_block_belongs_to_exactly_its_own_provider() {
-        let mut cfg = sample();
-        cfg.source.azure = azure_cfg().source.azure;
-        assert_eq!(
-            cfg.validate(empty_ctx()),
-            Err(OnDemandMigrationConfigError::UnexpectedProviderBlock("azure", Provider::S3))
-        );
-
-        let mut cfg = sample();
-        cfg.source.gcs = gcs_native_cfg().source.gcs;
-        assert_eq!(
-            cfg.validate(empty_ctx()),
-            Err(OnDemandMigrationConfigError::UnexpectedProviderBlock("gcs", Provider::S3))
-        );
-
-        let mut cfg = azure_cfg();
-        cfg.source.azure = None;
-        assert_eq!(
-            cfg.validate(empty_ctx()),
-            Err(OnDemandMigrationConfigError::MissingProviderBlock("azure", Provider::Azure))
-        );
-
-        let mut cfg = gcs_native_cfg();
-        cfg.source.gcs = None;
-        assert_eq!(
-            cfg.validate(empty_ctx()),
-            Err(OnDemandMigrationConfigError::MissingProviderBlock("gcs", Provider::GcsNative))
-        );
-    }
-
-    #[test]
-    fn azure_block_rules() {
-        let with = |account: &str, key: Option<&str>, sas: Option<&str>| {
-            let mut cfg = azure_cfg();
-            cfg.source.azure = Some(AzureSourceConfig {
-                account: account.to_string(),
-                account_key: key.map(str::to_string),
-                sas_token: sas.map(str::to_string),
-            });
-            cfg.validate(empty_ctx())
-        };
-
-        with("legacyaccount", None, Some("sv=2021-08-06&sig=abc%3D")).expect("a SAS token is a complete credential");
-        with("legacyaccount", Some("c2VjcmV0LWtleQ=="), None).expect("an account key is a complete credential");
-
-        for (label, result) in [
-            ("empty account", with("", Some("c2VjcmV0LWtleQ=="), None)),
-            // The account becomes the first label of the derived hostname.
-            ("account with a dot", with("legacy.account", Some("c2VjcmV0LWtleQ=="), None)),
-            ("account with a slash", with("legacy/account", Some("c2VjcmV0LWtleQ=="), None)),
-            ("no credential", with("legacyaccount", None, None)),
-            ("both credentials", with("legacyaccount", Some("c2VjcmV0LWtleQ=="), Some("sv=1"))),
-            ("empty key", with("legacyaccount", Some(""), None)),
-            ("key that is not base64", with("legacyaccount", Some("not base64!"), None)),
-            ("empty sas", with("legacyaccount", None, Some(""))),
-            ("sas with a leading question mark", with("legacyaccount", None, Some("?sv=1"))),
-            ("sas with whitespace", with("legacyaccount", None, Some("sv=1 &sig=a"))),
-        ] {
-            assert!(
-                matches!(result, Err(OnDemandMigrationConfigError::InvalidProviderBlock("azure", _))),
-                "{label}: {result:?}"
-            );
-        }
-    }
-
-    #[test]
-    fn gcs_native_block_requires_a_usable_service_account_key() {
-        let with = |json: &str| {
-            let mut cfg = gcs_native_cfg();
-            cfg.source.gcs = Some(GcsSourceConfig {
-                service_account_json: json.to_string(),
-            });
-            cfg.validate(empty_ctx())
-        };
-
-        with(SERVICE_ACCOUNT_JSON).expect("a service-account key is accepted");
-        for (label, json) in [
-            ("empty", ""),
-            ("not json", "not json"),
-            ("not an object", "[]"),
-            ("wrong type", r#"{"type":"authorized_user","client_email":"a@b","private_key":"k"}"#),
-            ("no private key", r#"{"type":"service_account","client_email":"a@b"}"#),
-            ("empty client email", r#"{"type":"service_account","client_email":"","private_key":"k"}"#),
-        ] {
-            let result = with(json);
-            assert!(
-                matches!(result, Err(OnDemandMigrationConfigError::InvalidProviderBlock("gcs", _))),
-                "{label}: {result:?}"
-            );
-        }
-    }
-
-    #[test]
-    fn native_secrets_never_survive_redaction_or_debug() {
-        let mut azure = azure_cfg();
-        azure.source.azure.as_mut().expect("block").sas_token = Some("sv=2021-08-06&sig=top-secret".to_string());
-        azure.source.azure.as_mut().expect("block").account_key = None;
-        let gcs = gcs_native_cfg();
-
-        for rendered in [
-            format!("{:?}", azure.redacted()),
-            format!("{azure:?}"),
-            String::from_utf8(azure.redacted().to_json().expect("json")).expect("utf8"),
-        ] {
-            assert!(!rendered.contains("top-secret"), "{rendered}");
-            assert!(rendered.contains("legacyaccount"), "the account name is not a secret: {rendered}");
-        }
-        for rendered in [
-            format!("{:?}", gcs.redacted()),
-            format!("{gcs:?}"),
-            String::from_utf8(gcs.redacted().to_json().expect("json")).expect("utf8"),
-        ] {
-            assert!(!rendered.contains("PRIVATE KEY-----"), "{rendered}");
-            assert!(!rendered.contains("gserviceaccount"), "{rendered}");
-        }
-    }
-
    #[test]
    fn bucket_rules() {
        let mut cfg = sample();
@@ -1509,55 +1105,4 @@ mod tests {
        assert!(!rendered.contains("topsecret"), "{rendered}");
        assert!(!rendered.contains("SK"), "{rendered}");
    }
-    /// rustfs/backlog#2148: the accessor reports absence as `Ok(None)` and a
-    /// stored payload it cannot parse as a typed error, never as a default
-    /// and never as `ConfigNotFound`.
-    #[tokio::test]
-    async fn get_on_demand_migration_config_distinguishes_absent_from_corrupt() {
-        use super::super::storage_api::StorageError as Error;
-        use super::super::storage_api::test_support::{
-            BUCKET_ON_DEMAND_MIGRATION_CONFIG, BucketMetadata, BucketMetadataSys, isolated_store_over_temp_disks,
-        };
-        use std::sync::Arc;
-        const ODM_JSON: &[u8] = br#"{"source":{"provider":"minio","endpoint":"https://legacy.example.com:9000","region":"auto","bucket":"legacy-bucket","credentials":{"access_key":"AK","secret_key":"SK"}}}"#;
-
-        let (_dirs, ecstore) = isolated_store_over_temp_disks().await;
-        let sys = BucketMetadataSys::new(ecstore);
-        let bucket = "odm-accessor";
-
-        sys.set(bucket.to_string(), Arc::new(BucketMetadata::new(bucket))).await;
-        assert_eq!(
-            decode_stored_config(sys.get_on_demand_migration_config(bucket).await.unwrap()).unwrap(),
-            None
-        );
-
-        let mut corrupt = BucketMetadata::new(bucket);
-        corrupt.on_demand_migration_config_json = br#"{"source":{"provider":"s3"},"bogus":1}"#.to_vec();
-        sys.set(bucket.to_string(), Arc::new(corrupt)).await;
-        let err = decode_stored_config(sys.get_on_demand_migration_config(bucket).await.unwrap())
-            .expect_err("corrupt config must not read as a default");
-        assert_ne!(err, Error::ConfigNotFound, "corruption must not be reported as absence");
-        let typed = match &err {
-            Error::Io(io) => io
-                .get_ref()
-                .and_then(|source| source.downcast_ref::<OnDemandMigrationConfigError>()),
-            _ => None,
-        };
-        assert!(
-            matches!(typed, Some(OnDemandMigrationConfigError::Malformed(_))),
-            "typed parse error must survive the Result boundary, got: {err:?}"
-        );
-
-        let mut valid = BucketMetadata::new(bucket);
-        valid
-            .update_config(BUCKET_ON_DEMAND_MIGRATION_CONFIG, ODM_JSON.to_vec())
-            .unwrap();
-        let stamped = valid.on_demand_migration_config_updated_at;
-        sys.set(bucket.to_string(), Arc::new(valid)).await;
-        let (config, updated_at) = decode_stored_config(sys.get_on_demand_migration_config(bucket).await.unwrap())
-            .unwrap()
-            .expect("stored config is returned");
-        assert_eq!(config, OnDemandMigrationConfig::from_json(ODM_JSON).unwrap());
-        assert_eq!(updated_at, stamped);
-    }
 }
@@ -25,21 +25,13 @@ use parking_lot::Mutex;
 use serde::{Deserialize, Serialize};
 use std::time::{Duration, Instant};

-/// The continuation-token version used by ordinary progressing pages.
+/// The only continuation-token envelope version this build reads and writes.
 pub const LIST_THROUGH_TOKEN_VERSION: u32 = 1;
-const LIST_THROUGH_PROGRESS_TOKEN_VERSION: u32 = 2;
-
-/// The sixteenth consecutive merged page without a key or new EOF fails.
-/// This also bounds legitimate sparse listings; it is not a cycle detector.
-pub const MAX_LIST_NO_PROGRESS_PAGES: u8 = 16;

 /// Envelope marker. A bucket that is *not* merging hands out the local
 /// listing's own marker, so the decoder needs a positive signal before it
 /// treats an opaque token as a merged one.
 const LIST_THROUGH_TOKEN_TAG: &str = "odm-list";
-// Object keys cannot contain NUL (bucket::utils::is_valid_object_prefix),
-// so this framing cannot collide with a local key used as an opaque marker.
-const LIST_THROUGH_TOKEN_PREFIX: &str = "\0odm-list:";

 /// Pages fetched per side per request: the first page, plus at most one refill
 /// when the first one was mostly consumed by the previous page. Two pages of
@@ -94,7 +86,8 @@ pub struct MergePick {
 }

 /// The continuation-token envelope. Opaque to clients: it is serialized as
-/// framed JSON and then base64-encoded by the same helper as a local marker.
+/// JSON and then base64-encoded by the same helper that encodes a plain local
+/// marker, so the wire shape is `base64(json)`.
 ///
 /// A `null` cursor with `done = false` means "list that side from the start";
 /// `done = true` means the side is finished and must not be listed again.
@@ -118,10 +111,6 @@ pub struct ListThroughToken {
    /// common prefix compares as itself, never as its members.
    #[serde(default)]
    pub last_key: Option<String>,
-    /// Consecutive empty truncated merged pages, present only in v2 tokens.
-    /// Ordinary v1 tokens retain their original serialized shape.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub no_progress: Option<u8>,
 }

 impl ListThroughToken {
@@ -134,14 +123,13 @@ impl ListThroughToken {
            source: source.token,
            source_done: source.done,
            last_key,
-            no_progress: None,
        }
    }

    pub fn encode(&self) -> String {
        // The envelope is built here from owned strings, so serialization
        // cannot fail; the fallback keeps the signature infallible.
-        format!("{LIST_THROUGH_TOKEN_PREFIX}{}", serde_json::to_string(self).unwrap_or_default())
+        serde_json::to_string(self).unwrap_or_default()
    }
 }

@@ -165,35 +153,24 @@ pub enum ListThroughTokenError {

 /// Classifies an already base64-decoded continuation token.
 ///
-/// Only a framed JSON object is read as a merged token;
+/// Only a JSON object carrying the envelope marker is read as a merged token;
 /// anything else is a local marker, so a bucket that turns `list_through` off
 /// keeps paginating with the tokens it handed out. A token that *is* an
 /// envelope but was tampered with (unknown version, unknown field, truncated
 /// JSON) is an error, never a silent fallback.
 pub fn decode_continuation_token(decoded: &str) -> Result<ListThroughCursor, ListThroughTokenError> {
-    let Some(payload) = decoded.strip_prefix(LIST_THROUGH_TOKEN_PREFIX) else {
+    if !decoded.starts_with('{') {
+        return Ok(ListThroughCursor::Local(decoded.to_string()));
+    }
+    let Ok(value) = serde_json::from_str::<serde_json::Value>(decoded) else {
+        // Not JSON at all: an object key may legitimately start with '{'.
        return Ok(ListThroughCursor::Local(decoded.to_string()));
    };
-    let value = serde_json::from_str::<serde_json::Value>(payload).map_err(|_| ListThroughTokenError::Malformed)?;
    if value.get("t").and_then(serde_json::Value::as_str) != Some(LIST_THROUGH_TOKEN_TAG) {
-        return Err(ListThroughTokenError::Malformed);
+        return Ok(ListThroughCursor::Local(decoded.to_string()));
    }
    match value.get("v").and_then(serde_json::Value::as_u64) {
-        Some(version) if version == u64::from(LIST_THROUGH_TOKEN_VERSION) => {
-            // v1 readers reject this field even when it is null or zero.
-            if value.get("no_progress").is_some() {
-                return Err(ListThroughTokenError::Malformed);
-            }
-        }
-        Some(version) if version == u64::from(LIST_THROUGH_PROGRESS_TOKEN_VERSION) => {
-            if !value
-                .get("no_progress")
-                .and_then(serde_json::Value::as_u64)
-                .is_some_and(|count| (1..u64::from(MAX_LIST_NO_PROGRESS_PAGES)).contains(&count))
-            {
-                return Err(ListThroughTokenError::Malformed);
-            }
-        }
+        Some(version) if version == u64::from(LIST_THROUGH_TOKEN_VERSION) => {}
        Some(version) => return Err(ListThroughTokenError::UnsupportedVersion(version.min(u64::from(u32::MAX)) as u32)),
        None => return Err(ListThroughTokenError::Malformed),
    }
@@ -212,8 +189,8 @@ pub enum SourceListPlan {
    /// delimiter — the source's own roll-up boundary matches the request's.
    Page { prefix: String },
    /// `filter.prefix` reaches past a delimiter, so every key the source could
-    /// contribute rolls into this one common prefix. Bounded probes follow
-    /// empty progressing pages until a key proves existence or the source ends.
+    /// contribute rolls into this one common prefix. One bounded probe listing
+    /// decides whether it exists; there is nothing to paginate.
    Folded { probe_prefix: String, common_prefix: String },
 }

@@ -302,31 +279,6 @@ pub struct FetchRequest {
    pub token: Option<String>,
 }

-/// Invalid pagination metadata. Opaque cursor values are never included in errors.
-#[derive(Clone, Copy, Debug, PartialEq, Eq, thiserror::Error)]
-pub enum ListPageError {
-    #[error("truncated listing has no continuation token")]
-    Missing,
-    #[error("truncated listing has an empty continuation token")]
-    Empty,
-    #[error("truncated listing repeats a continuation token")]
-    Repeated,
-    #[error("listing exhausted its consecutive no-progress page budget")]
-    NoProgress(MergeSide),
-}
-
-pub(crate) fn validate_list_page(is_truncated: bool, token: Option<&str>, next_token: Option<&str>) -> Result<(), ListPageError> {
-    if is_truncated {
-        match next_token {
-            None => return Err(ListPageError::Missing),
-            Some("") => return Err(ListPageError::Empty),
-            Some(next) if Some(next) == token => return Err(ListPageError::Repeated),
-            Some(_) => {}
-        }
-    }
-    Ok(())
-}
-
 #[derive(Debug, Default)]
 struct SideState {
    start: SideCursor,
@@ -377,7 +329,6 @@ pub struct MergeOutcome {
 #[derive(Debug)]
 pub struct ListThroughMerger {
    max_keys: usize,
-    no_progress: Option<u8>,
    last_key: Option<String>,
    local: SideState,
    source: SideState,
@@ -397,7 +348,6 @@ impl ListThroughMerger {
        };
        Self {
            max_keys,
-            no_progress: token.and_then(|token| token.no_progress),
            last_key,
            local,
            source,
@@ -414,11 +364,6 @@ impl ListThroughMerger {
    /// or `filter.prefix` excludes it.
    pub fn disable_source(&mut self) {
        self.source.disabled = true;
-        // A refill can fail after a valid first page. A local-only response
-        // must discard both that source payload and its ordering horizon.
-        self.source.entries.clear();
-        self.source.pages.clear();
-        self.source.more = false;
    }

    pub fn next_fetch(&self) -> Option<FetchRequest> {
@@ -433,13 +378,7 @@ impl ListThroughMerger {
    /// Records one fetched page. `entries` must be sorted by `name` and already
    /// filtered with [`Self::accepts`]; the caller keeps the matching payloads
    /// in the same order.
-    pub fn push_page(
-        &mut self,
-        side: MergeSide,
-        entries: Vec<ListEntryKey>,
-        is_truncated: bool,
-        next_token: Option<String>,
-    ) -> Result<(), ListPageError> {
+    pub fn push_page(&mut self, side: MergeSide, entries: Vec<ListEntryKey>, is_truncated: bool, next_token: Option<String>) {
        let state = match side {
            MergeSide::Local => &mut self.local,
            MergeSide::Source => &mut self.source,
@@ -448,33 +387,24 @@ impl ListThroughMerger {
            Some(last) => last.next_token.clone(),
            None => state.start.token.clone(),
        };
-        validate_list_page(is_truncated, token.as_deref(), next_token.as_deref())?;
-        // Also reject a cycle through an earlier page in this bounded fetch.
-        if is_truncated && state.pages.iter().any(|page| page.token == next_token) {
-            return Err(ListPageError::Repeated);
-        }
-        state.more = is_truncated;
+        // A truncated page without a cursor cannot be continued; treating the
+        // side as finished is the only alternative to looping on it forever.
+        state.more = is_truncated && next_token.is_some();
        state.pages.push(FetchedPage {
            token,
            count: entries.len(),
            next_token: is_truncated.then_some(next_token).flatten(),
        });
        state.entries.extend(entries);
-        Ok(())
    }

-    /// `issue_progress_tokens` allows a v1 chain to start carrying a budget.
-    /// An existing v2 budget is always enforced, including on reader-only nodes.
-    /// Borrowing lets a source failure re-merge the fetched local buffers.
-    pub fn finish(&self, issue_progress_tokens: bool) -> Result<MergeOutcome, ListPageError> {
+    pub fn finish(self) -> MergeOutcome {
        let Self {
            max_keys,
-            no_progress,
            last_key,
            local,
            source,
        } = self;
-        let max_keys = *max_keys;

        // A side with more pages behind it can only be trusted up to the last
        // key it handed over: past that horizon the other side's entries could
@@ -540,44 +470,12 @@ impl ListThroughMerger {
        let source_left = !source.disabled && (!source_cursor.done || consumed_source < source.entries.len());
        let is_truncated = local_left || source_left;

-        let reached_eof = (!local.start.done && local_cursor.done) || (!source.start.done && source_cursor.done);
-        let next_no_progress = if !is_truncated || !picks.is_empty() || reached_eof {
-            None
-        } else if max_keys == 0 {
-            // A zero-sized request cannot consume entries. Preserve an existing
-            // budget without spending it or starting a new one.
-            *no_progress
-        } else if issue_progress_tokens || no_progress.is_some() {
-            let count = no_progress.unwrap_or(0).saturating_add(1);
-            if count >= MAX_LIST_NO_PROGRESS_PAGES {
-                // An empty truncated side closes the merge horizon. Local
-                // failure takes precedence; disabling the source cannot fix it.
-                let side = if local.more && local.entries.is_empty() {
-                    MergeSide::Local
-                } else if !source.disabled && source.more && source.entries.is_empty() {
-                    MergeSide::Source
-                } else {
-                    MergeSide::Local
-                };
-                return Err(ListPageError::NoProgress(side));
-            }
-            Some(count)
-        } else {
-            None
-        };
-        let last_key = consumed_key.or_else(|| last_key.clone());
-        Ok(MergeOutcome {
+        let last_key = consumed_key.or(last_key);
+        MergeOutcome {
            picks,
            is_truncated,
-            next_token: is_truncated.then(|| {
-                let mut token = ListThroughToken::new(local_cursor, source_cursor, last_key);
-                if let Some(count) = next_no_progress {
-                    token.v = LIST_THROUGH_PROGRESS_TOKEN_VERSION;
-                    token.no_progress = Some(count);
-                }
-                token
-            }),
-        })
+            next_token: is_truncated.then(|| ListThroughToken::new(local_cursor, source_cursor, last_key)),
+        }
    }
 }

@@ -701,15 +599,9 @@ mod tests {
                let (entries, truncated, next) = reference_page(keys, prefix, delimiter, fetch.token.as_deref(), max_keys);
                let kept: Vec<ListEntryKey> = entries.into_iter().filter(|entry| merger.accepts(&entry.name)).collect();
                buffers[usize::from(fetch.side == MergeSide::Source)].extend(kept.iter().cloned());
-                merger
-                    .push_page(fetch.side, kept, truncated, next)
-                    .expect("reference provider pages must advance");
-            }
-            let outcome = merger.finish(false).expect("valid merge outcome");
-            assert_eq!(outcome.is_truncated, outcome.next_token.is_some());
-            if outcome.is_truncated {
-                assert_ne!(outcome.next_token, token, "every truncated merged page must make progress");
+                merger.push_page(fetch.side, kept, truncated, next);
            }
+            let outcome = merger.finish();
            page_sizes.push(outcome.picks.len());
            for pick in &outcome.picks {
                let entry = buffers[usize::from(pick.side == MergeSide::Source)][pick.index].clone();
@@ -724,25 +616,11 @@ mod tests {
    }

    fn expected(local: &[String], source: &[String], prefix: &str, delimiter: Option<&str>) -> Vec<ListEntryKey> {
-        // This oracle builds the complete namespace independently of the
-        // provider's page/marker helper and the production merger.
-        let mut namespace = std::collections::BTreeMap::new();
-        for key in local.iter().chain(source) {
-            let Some(suffix) = key.strip_prefix(prefix) else {
-                continue;
-            };
-            if let Some(delimiter) = delimiter.filter(|delimiter| !delimiter.is_empty())
-                && let Some((directory, _)) = suffix.split_once(delimiter)
-            {
-                namespace.insert(format!("{prefix}{directory}{delimiter}"), true);
-                continue;
-            }
-            namespace.insert(key.clone(), false);
-        }
-        namespace
-            .into_iter()
-            .map(|(name, is_prefix)| ListEntryKey { name, is_prefix })
-            .collect()
+        let mut all: Vec<String> = local.iter().chain(source.iter()).cloned().collect();
+        all.sort();
+        all.dedup();
+        let (entries, _, _) = reference_page(&all, prefix, delimiter, None, usize::MAX);
+        entries
    }

    #[test]
@@ -784,11 +662,9 @@ mod tests {
                token: None
            })
        );
-        merger
-            .push_page(MergeSide::Local, vec![ListEntryKey::object("a")], false, None)
-            .expect("local EOF is valid");
+        merger.push_page(MergeSide::Local, vec![ListEntryKey::object("a")], false, None);
        assert_eq!(merger.next_fetch(), None);
-        let outcome = merger.finish(false).expect("valid merge outcome");
+        let outcome = merger.finish();
        assert_eq!(outcome.picks.len(), 1);
        assert!(!outcome.is_truncated);
        assert!(outcome.next_token.is_none());
@@ -804,19 +680,16 @@ mod tests {
            source: Some("source-1".to_string()),
            source_done: false,
            last_key: Some("a".to_string()),
-            no_progress: None,
        };
        let mut merger = ListThroughMerger::new(1, Some(&resume));
        merger.disable_source();
-        merger
-            .push_page(
-                MergeSide::Local,
-                vec![ListEntryKey::object("b"), ListEntryKey::object("c")],
-                true,
-                Some("local-2".to_string()),
-            )
-            .expect("local cursor advances");
-        let outcome = merger.finish(false).expect("valid merge outcome");
+        merger.push_page(
+            MergeSide::Local,
+            vec![ListEntryKey::object("b"), ListEntryKey::object("c")],
+            true,
+            Some("local-2".to_string()),
+        );
+        let outcome = merger.finish();
        assert!(outcome.is_truncated);
        let token = outcome.next_token.expect("truncated page carries a token");
        assert_eq!(token.source.as_deref(), Some("source-1"), "the source cursor must not move");
@@ -825,212 +698,6 @@ mod tests {
        assert_eq!(token.local.as_deref(), Some("local-1"), "a partly read page is re-listed");
    }

-    #[test]
-    fn truncated_pages_require_a_nonempty_advancing_cursor() {
-        for side in [MergeSide::Local, MergeSide::Source] {
-            for entries in [vec![], vec![ListEntryKey::object("a")]] {
-                for (next, expected) in [
-                    (None, Err(ListPageError::Missing)),
-                    (Some(""), Err(ListPageError::Empty)),
-                    (Some("stuck"), Err(ListPageError::Repeated)),
-                    (Some("advances"), Ok(())),
-                ] {
-                    let resume = ListThroughToken::new(
-                        SideCursor {
-                            token: Some("stuck".into()),
-                            done: false,
-                        },
-                        SideCursor {
-                            token: Some("stuck".into()),
-                            done: false,
-                        },
-                        None,
-                    );
-                    let mut merger = ListThroughMerger::new(2, Some(&resume));
-                    let result = merger.push_page(side, entries.clone(), true, next.map(str::to_string));
-                    assert_eq!(result, expected, "{side:?}, {entries:?}, {next:?}");
-                    let state = if side == MergeSide::Local {
-                        &merger.local
-                    } else {
-                        &merger.source
-                    };
-                    assert_eq!(state.pages.len(), usize::from(result.is_ok()), "invalid page must not be accepted");
-                }
-            }
-        }
-    }
-
-    #[test]
-    fn repeated_empty_cursor_is_rejected_before_an_identical_page_can_escape() {
-        let resume = ListThroughToken::new(
-            SideCursor { token: None, done: true },
-            SideCursor {
-                token: Some("stuck".into()),
-                done: false,
-            },
-            None,
-        );
-        let mut merger = ListThroughMerger::new(2, Some(&resume));
-        assert_eq!(
-            merger.next_fetch(),
-            Some(FetchRequest {
-                side: MergeSide::Source,
-                token: Some("stuck".into())
-            })
-        );
-        assert_eq!(
-            merger.push_page(MergeSide::Source, vec![], true, Some("stuck".into())),
-            Err(ListPageError::Repeated)
-        );
-    }
-
-    #[test]
-    fn empty_pages_may_advance_within_the_fetch_budget_until_eof() {
-        let mut merger = ListThroughMerger::new(2, None);
-        merger.push_page(MergeSide::Local, vec![], false, None).expect("local EOF");
-        for next in ["opaque-z", "opaque-a"] {
-            assert_eq!(merger.next_fetch().expect("bounded source fetch").side, MergeSide::Source);
-            merger
-                .push_page(MergeSide::Source, vec![], true, Some(next.into()))
-                .expect("opaque cursor advances regardless of sort order");
-        }
-        assert!(merger.next_fetch().is_none(), "two source fetches exhaust the request budget");
-        let outcome = merger.finish(false).expect("valid merge outcome");
-        assert!(outcome.picks.is_empty());
-        assert!(outcome.is_truncated);
-        let token = outcome.next_token.expect("empty progressing page has a cursor");
-        assert_eq!(token.source.as_deref(), Some("opaque-a"));
-        let mut merger = ListThroughMerger::new(2, Some(&token));
-        assert_eq!(merger.next_fetch().expect("source resumes").token.as_deref(), Some("opaque-a"));
-        merger
-            .push_page(MergeSide::Source, vec![ListEntryKey::object("result")], false, None)
-            .expect("source EOF");
-        let outcome = merger.finish(false).expect("valid merge outcome");
-        assert_eq!(
-            outcome.picks,
-            vec![MergePick {
-                side: MergeSide::Source,
-                index: 0
-            }]
-        );
-        assert!(!outcome.is_truncated);
-        assert!(outcome.next_token.is_none());
-    }
-
-    #[test]
-    fn a_cursor_cycle_inside_the_fetch_budget_is_rejected() {
-        let resume = ListThroughToken::new(
-            SideCursor { token: None, done: true },
-            SideCursor {
-                token: Some("first".into()),
-                done: false,
-            },
-            None,
-        );
-        let mut merger = ListThroughMerger::new(2, Some(&resume));
-        merger
-            .push_page(MergeSide::Source, vec![], true, Some("second".into()))
-            .expect("first page advances");
-        assert_eq!(
-            merger.push_page(MergeSide::Source, vec![], true, Some("first".into())),
-            Err(ListPageError::Repeated)
-        );
-    }
-
-    #[test]
-    fn source_refill_failure_discards_buffered_source_entries_and_horizon() {
-        let mut merger = ListThroughMerger::new(2, None);
-        merger
-            .push_page(MergeSide::Local, vec![ListEntryKey::object("z")], false, None)
-            .expect("local EOF");
-        merger
-            .push_page(MergeSide::Source, vec![ListEntryKey::object("a")], true, Some("stuck".into()))
-            .expect("first source page advances");
-        assert_eq!(merger.next_fetch().expect("source refill is required").token.as_deref(), Some("stuck"));
-        assert_eq!(
-            merger.push_page(MergeSide::Source, vec![], true, Some("stuck".into())),
-            Err(ListPageError::Repeated)
-        );
-        merger.disable_source();
-        let outcome = merger.finish(false).expect("valid merge outcome");
-        assert_eq!(
-            outcome.picks,
-            vec![MergePick {
-                side: MergeSide::Local,
-                index: 0
-            }]
-        );
-        assert!(!outcome.is_truncated);
-        assert!(outcome.next_token.is_none());
-    }
-
-    #[test]
-    fn list_through_static_namespace_boundary_matrix() {
-        let corpus = [
-            "a",
-            "a/",
-            "a/b",
-            "a/b/child",
-            "a0",
-            "b",
-            "b/leaf",
-            "quote\"&<",
-            "space key",
-            "z",
-            "é",
-            "中/文",
-        ];
-        for count in [0, 1, 3, 4, corpus.len()] {
-            let keys: Vec<String> = corpus[..count].iter().map(|key| (*key).to_string()).collect();
-            for placement in 0..3 {
-                let (local, source): (Vec<_>, Vec<_>) =
-                    keys.iter()
-                        .enumerate()
-                        .fold((vec![], vec![]), |(mut local, mut source), (index, key)| {
-                            if placement != 1 || index % 2 == 0 {
-                                local.push(key.clone());
-                            }
-                            if placement != 0 || index % 2 == 0 {
-                                source.push(key.clone());
-                            }
-                            (local, source)
-                        });
-                for prefix in ["", "a", "a/", "中/"] {
-                    for delimiter in [None, Some("/")] {
-                        for max_keys in [1, 3, 4] {
-                            let oracle = expected(&local, &source, prefix, delimiter);
-                            let (emitted, sizes) = walk(&local, &source, prefix, delimiter, max_keys);
-                            assert_eq!(
-                                emitted.iter().map(|(entry, _)| entry.clone()).collect::<Vec<_>>(),
-                                oracle,
-                                "count={count}, placement={placement}, prefix={prefix}, delimiter={delimiter:?}, max={max_keys}"
-                            );
-                            let expected_sizes: Vec<_> = if oracle.is_empty() {
-                                vec![0]
-                            } else {
-                                oracle.chunks(max_keys).map(<[ListEntryKey]>::len).collect()
-                            };
-                            assert_eq!(sizes, expected_sizes, "exact max and max+1 boundaries must agree");
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    #[test]
-    fn list_through_large_overlap_walk_keeps_all_5300_keys() {
-        let source: Vec<_> = (0..5000).map(|index| format!("k{index:05}")).collect();
-        let local: Vec<_> = (4800..5300).map(|index| format!("k{index:05}")).collect();
-        let (emitted, sizes) = walk(&local, &source, "", None, 333);
-        assert_eq!(emitted.len(), 5300);
-        for (index, (entry, side)) in emitted.iter().enumerate() {
-            assert_eq!(entry.name, format!("k{index:05}"));
-            assert_eq!(*side, if index >= 4800 { MergeSide::Local } else { MergeSide::Source });
-        }
-        assert_eq!(sizes, [vec![333; 15], vec![305]].concat());
-    }
-
    #[test]
    fn token_round_trips_and_rejects_tampering() {
        let token = ListThroughToken::new(
@@ -1044,287 +711,21 @@ mod tests {
        let encoded = token.encode();
        assert_eq!(decode_continuation_token(&encoded), Ok(ListThroughCursor::Merged(Box::new(token))));

-        let bumped = encoded.replace("\"v\":1", "\"v\":3");
-        assert_eq!(decode_continuation_token(&bumped), Err(ListThroughTokenError::UnsupportedVersion(3)));
+        let bumped = encoded.replace("\"v\":1", "\"v\":2");
+        assert_eq!(decode_continuation_token(&bumped), Err(ListThroughTokenError::UnsupportedVersion(2)));

        let extra = encoded.replace("{", "{\"x\":1,");
        assert_eq!(decode_continuation_token(&extra), Err(ListThroughTokenError::Malformed));

        let truncated = &encoded[..encoded.len() - 3];
-        assert_eq!(decode_continuation_token(truncated), Err(ListThroughTokenError::Malformed));
+        assert_eq!(decode_continuation_token(truncated), Ok(ListThroughCursor::Local(truncated.to_string())));

-        let no_version = "\0odm-list:{\"t\":\"odm-list\"}";
+        let no_version = "{\"t\":\"odm-list\"}";
        assert_eq!(decode_continuation_token(no_version), Err(ListThroughTokenError::Malformed));
    }

-    fn progress_token(count: Option<u8>, local_done: bool, source_done: bool) -> ListThroughToken {
-        let mut token = ListThroughToken::new(
-            SideCursor {
-                token: None,
-                done: local_done,
-            },
-            SideCursor {
-                token: Some("A".into()),
-                done: source_done,
-            },
-            Some("last-key".into()),
-        );
-        if let Some(count) = count {
-            token.v = LIST_THROUGH_PROGRESS_TOKEN_VERSION;
-            token.no_progress = Some(count);
-        }
-        token
-    }
-
-    fn push_empty_pages(merger: &mut ListThroughMerger, side: MergeSide) {
-        for _ in 0..MAX_LIST_FETCHES_PER_SIDE {
-            let fetch = merger.next_fetch().expect("empty truncated side must be fetched");
-            assert_eq!(fetch.side, side);
-            let next = format!("{}:next", fetch.token.unwrap_or_default());
-            merger
-                .push_page(side, vec![], true, Some(next))
-                .expect("opaque cursor advances");
-        }
-    }
-
-    #[test]
-    fn progress_tokens_preserve_v1_bytes_and_validate_v2_counts() {
-        fn framed(payload: &str) -> String {
-            format!("{LIST_THROUGH_TOKEN_PREFIX}{payload}")
-        }
-
-        let token = progress_token(None, true, false);
-        assert_eq!(
-            token.encode(),
-            concat!(
-                "\0odm-list:",
-                r#"{"t":"odm-list","v":1,"local":null,"local_done":true,"source":"A","source_done":false,"last_key":"last-key"}"#
-            )
-        );
-        for count in 1..MAX_LIST_NO_PROGRESS_PAGES {
-            let token = progress_token(Some(count), true, false);
-            assert_eq!(decode_continuation_token(&token.encode()), Ok(ListThroughCursor::Merged(Box::new(token))));
-        }
-        for version in [1, 2] {
-            for value in ["null", "0", "16", "-1", "1.5", "256", "18446744073709551616", "\"1\""] {
-                let encoded = framed(&format!(r#"{{"t":"odm-list","v":{version},"no_progress":{value}}}"#));
-                assert_eq!(decode_continuation_token(&encoded), Err(ListThroughTokenError::Malformed), "{encoded}");
-            }
-        }
-        for payload in [
-            r#"{"t":"odm-list","v":1,"no_progress":1}"#,
-            r#"{"t":"odm-list","v":2}"#,
-            r#"{"t":"odm-list","v":2,"no_progress":1,"extra":true}"#,
-        ] {
-            let encoded = framed(payload);
-            assert_eq!(decode_continuation_token(&encoded), Err(ListThroughTokenError::Malformed), "{encoded}");
-        }
-    }
-
-    #[test]
-    fn reader_only_nodes_do_not_start_a_budget_but_mixed_readers_preserve_one() {
-        let mut token = progress_token(None, true, false);
-        for _ in 0..MAX_LIST_NO_PROGRESS_PAGES {
-            let mut merger = ListThroughMerger::new(2, Some(&token));
-            push_empty_pages(&mut merger, MergeSide::Source);
-            token = merger
-                .finish(false)
-                .expect("reader-only v1 behavior")
-                .next_token
-                .expect("truncated cursor");
-            assert_eq!(token.v, 1);
-            assert_eq!(token.no_progress, None);
-        }
-        for count in 1..=MAX_LIST_NO_PROGRESS_PAGES {
-            let mut merger = ListThroughMerger::new(2, Some(&token));
-            push_empty_pages(&mut merger, MergeSide::Source);
-            assert!(merger.next_fetch().is_none(), "the per-request two-fetch limit stays intact");
-            let outcome = merger.finish(count % 2 == 1);
-            if count == MAX_LIST_NO_PROGRESS_PAGES {
-                assert_eq!(outcome, Err(ListPageError::NoProgress(MergeSide::Source)));
-                break;
-            }
-            token = outcome.expect("budget not exhausted").next_token.expect("truncated cursor");
-            assert_eq!(token.no_progress, Some(count));
-            let ListThroughCursor::Merged(decoded) = decode_continuation_token(&token.encode()).expect("round-trip v2") else {
-                panic!("merged cursor expected");
-            };
-            token = *decoded;
-        }
-    }
-
-    #[test]
-    fn objects_and_common_prefixes_reset_a_budget_at_the_boundary() {
-        for entry in [ListEntryKey::object("result"), ListEntryKey::prefix("result/")] {
-            for issue_tokens in [false, true] {
-                let resume = progress_token(Some(MAX_LIST_NO_PROGRESS_PAGES - 1), true, false);
-                let mut merger = ListThroughMerger::new(2, Some(&resume));
-                merger
-                    .push_page(MergeSide::Source, vec![], true, Some("B".into()))
-                    .expect("empty advancing page");
-                merger
-                    .push_page(MergeSide::Source, vec![entry.clone()], true, Some("C".into()))
-                    .expect("real progress");
-                let outcome = merger
-                    .finish(issue_tokens)
-                    .expect("real progress does not exhaust the budget");
-                assert_eq!(
-                    outcome.picks,
-                    vec![MergePick {
-                        side: MergeSide::Source,
-                        index: 0
-                    }]
-                );
-                let next = outcome.next_token.expect("source remains truncated");
-                assert_eq!(next.last_key.as_deref(), Some(entry.name.as_str()));
-                assert_eq!(next.v, 1);
-                assert_eq!(next.no_progress, None);
-                assert!(!next.encode().contains("no_progress"));
-            }
-        }
-    }
-
-    #[test]
-    fn only_a_new_eof_transition_resets_the_empty_page_budget() {
-        for finished_side in [MergeSide::Local, MergeSide::Source] {
-            let resume = progress_token(Some(MAX_LIST_NO_PROGRESS_PAGES - 1), false, false);
-            let mut merger = ListThroughMerger::new(2, Some(&resume));
-            if finished_side == MergeSide::Local {
-                merger
-                    .push_page(MergeSide::Local, vec![], false, None)
-                    .expect("new local EOF");
-                push_empty_pages(&mut merger, MergeSide::Source);
-            } else {
-                push_empty_pages(&mut merger, MergeSide::Local);
-                merger
-                    .push_page(MergeSide::Source, vec![], false, None)
-                    .expect("new source EOF");
-            }
-            let next = merger
-                .finish(false)
-                .expect("new EOF is progress")
-                .next_token
-                .expect("other side truncated");
-            assert_eq!(next.no_progress, None);
-            assert_eq!(next.v, 1);
-            assert_eq!(next.local_done, finished_side == MergeSide::Local);
-            assert_eq!(next.source_done, finished_side == MergeSide::Source);
-            let mut merger = ListThroughMerger::new(2, Some(&next));
-            let remaining = if finished_side == MergeSide::Local {
-                MergeSide::Source
-            } else {
-                MergeSide::Local
-            };
-            push_empty_pages(&mut merger, remaining);
-            let next = merger
-                .finish(true)
-                .expect("a new budget starts")
-                .next_token
-                .expect("truncated");
-            assert_eq!(next.no_progress, Some(1), "an already-done side cannot reset every page");
-        }
-        let resume = progress_token(Some(MAX_LIST_NO_PROGRESS_PAGES - 1), true, false);
-        let mut merger = ListThroughMerger::new(2, Some(&resume));
-        merger.push_page(MergeSide::Source, vec![], false, None).expect("final EOF");
-        let outcome = merger.finish(false).expect("EOF succeeds at the budget boundary");
-        assert!(!outcome.is_truncated);
-        assert!(outcome.next_token.is_none());
-    }
-
-    #[test]
-    fn filtered_duplicates_cannot_reset_the_no_progress_budget() {
-        let resume = progress_token(Some(MAX_LIST_NO_PROGRESS_PAGES - 1), true, false);
-        let mut merger = ListThroughMerger::new(2, Some(&resume));
-        for next in ["B", "C"] {
-            let entries = [ListEntryKey::object("last-key"), ListEntryKey::object("earlier")]
-                .into_iter()
-                .filter(|entry| merger.accepts(&entry.name))
-                .collect::<Vec<_>>();
-            assert!(entries.is_empty(), "both provider entries were already consumed");
-            merger
-                .push_page(MergeSide::Source, entries, true, Some(next.into()))
-                .expect("advancing cursor");
-        }
-        assert_eq!(merger.finish(false), Err(ListPageError::NoProgress(MergeSide::Source)));
-    }
-
-    #[test]
-    fn no_progress_is_attributed_to_local_when_source_cannot_unblock_it() {
-        for source_mode in ["disabled", "done", "empty", "data"] {
-            let resume = progress_token(Some(MAX_LIST_NO_PROGRESS_PAGES - 1), false, source_mode == "done");
-            let mut merger = ListThroughMerger::new(2, Some(&resume));
-            if source_mode == "disabled" {
-                merger.disable_source();
-            }
-            push_empty_pages(&mut merger, MergeSide::Local);
-            match source_mode {
-                "empty" => push_empty_pages(&mut merger, MergeSide::Source),
-                "data" => merger
-                    .push_page(MergeSide::Source, vec![ListEntryKey::object("source")], false, None)
-                    .expect("source data"),
-                _ => {}
-            }
-            assert_eq!(merger.finish(false), Err(ListPageError::NoProgress(MergeSide::Local)), "{source_mode}");
-        }
-    }
-
-    #[test]
-    fn source_budget_failure_remerges_local_objects_and_prefixes_without_refetching() {
-        let resume = progress_token(Some(MAX_LIST_NO_PROGRESS_PAGES - 1), false, false);
-        let mut merger = ListThroughMerger::new(2, Some(&resume));
-        merger
-            .push_page(MergeSide::Local, vec![ListEntryKey::object("local")], true, Some("L1".into()))
-            .expect("local object");
-        merger
-            .push_page(MergeSide::Local, vec![ListEntryKey::prefix("prefix/")], true, Some("L2".into()))
-            .expect("local prefix");
-        push_empty_pages(&mut merger, MergeSide::Source);
-        assert_eq!(merger.finish(false), Err(ListPageError::NoProgress(MergeSide::Source)));
-        merger.disable_source();
-        assert!(merger.next_fetch().is_none(), "fallback does not perform another fetch");
-        let outcome = merger.finish(false).expect("local data makes progress");
-        assert_eq!(
-            outcome.picks,
-            vec![
-                MergePick {
-                    side: MergeSide::Local,
-                    index: 0
-                },
-                MergePick {
-                    side: MergeSide::Local,
-                    index: 1
-                }
-            ]
-        );
-        let token = outcome.next_token.expect("remaining local page");
-        assert_eq!(token.local.as_deref(), Some("L2"));
-        assert_eq!(token.source.as_deref(), Some("A"));
-        assert_eq!(token.last_key.as_deref(), Some("prefix/"));
-        assert_eq!(token.no_progress, None);
-        assert_eq!(token.v, 1);
-    }
-
-    #[test]
-    fn a_zero_sized_merge_preserves_an_existing_budget() {
-        let resume = progress_token(Some(MAX_LIST_NO_PROGRESS_PAGES - 1), true, false);
-        let mut merger = ListThroughMerger::new(0, Some(&resume));
-        merger
-            .push_page(MergeSide::Source, vec![ListEntryKey::object("result")], true, Some("B".into()))
-            .expect("source page");
-        let outcome = merger.finish(false).expect("a zero-sized request cannot consume entries");
-        assert!(outcome.picks.is_empty());
-        assert_eq!(outcome.next_token.expect("unconsumed source").no_progress, resume.no_progress);
-    }
-
    #[test]
    fn a_plain_local_marker_stays_local() {
-        for marker in [
-            r#"{"t":"odm-list","v":1}"#,
-            r#"{"t":"odm-list","v":2,"local_done":true}"#,
-            r#"{"t":"odm-list"}"#,
-        ] {
-            assert_eq!(decode_continuation_token(marker), Ok(ListThroughCursor::Local(marker.to_string())));
-        }
        assert_eq!(
            decode_continuation_token("photos/2024/01.jpg"),
            Ok(ListThroughCursor::Local("photos/2024/01.jpg".to_string()))
@@ -1395,10 +796,7 @@ mod tests {
    }

    proptest! {
-        #![proptest_config(ProptestConfig {
-            rng_seed: proptest::test_runner::RngSeed::Fixed(0xec5706),
-            ..ProptestConfig::with_cases(256)
-        })]
+        #![proptest_config(ProptestConfig::with_cases(256))]

        /// Full pagination of a merged listing equals the sorted, deduplicated
        /// union of both sides, with every shared key served by local, and no
@@ -19,45 +19,30 @@
 //! client, and the per-node runtime (`sys`) that turns configs into live
 //! clients guarded by a breaker, a negative cache, singleflight and a pull
 //! concurrency limit (rustfs/backlog#2147).
-//!
-//! A source is reached through one `SourceBackend`: the S3 dialect for every
-//! S3-compatible provider, and a native backend for the providers that have no
-//! S3 API (`azure`, `gcs_native`).

-pub mod azure;
-#[cfg(test)]
-mod backend_contract;
 pub mod backfill;
 pub mod breaker;
 pub mod config;
-#[cfg(feature = "gcs")]
-pub mod gcs;
 pub mod list_through;
-mod metrics;
-mod native_http;
 pub mod negative_cache;
 pub mod pull;
 pub mod source_client;
 pub mod stats;
-mod storage_api;
 pub mod sys;
-#[cfg(test)]
-mod test_http_fixture;

 pub use breaker::{
    BREAKER_FAILURE_THRESHOLD, BREAKER_FAILURE_WINDOW, BREAKER_HALF_OPEN_MAX_PROBES, BREAKER_OPEN_DURATION, Breaker,
    BreakerState, BreakerTransition, BreakerVerdict,
 };
 pub use config::{
-    AzureSourceConfig, FilterConfig, GcsSourceConfig, HeadPolicy, ON_DEMAND_MIGRATION_CONFIG_VERSION, OnDemandMigrationConfig,
-    OnDemandMigrationConfigError, PathStyle, PolicyConfig, Provider, RangeGetPolicy, SourceConfig, SourceCredentials,
-    SourceErrorPolicy, SourceTimeout, TlsConfig, ValidationContext,
+    ConfigPublishHook, FilterConfig, HeadPolicy, ON_DEMAND_MIGRATION_CONFIG_HOOK, ON_DEMAND_MIGRATION_CONFIG_VERSION,
+    OnDemandMigrationConfig, OnDemandMigrationConfigError, PathStyle, PolicyConfig, Provider, RangeGetPolicy, SourceConfig,
+    SourceCredentials, SourceErrorPolicy, SourceTimeout, TlsConfig, ValidationContext,
 };
 pub use list_through::{
-    FetchRequest, LIST_THROUGH_TOKEN_VERSION, ListEntryKey, ListPageError, ListThroughCursor, ListThroughMerger,
-    ListThroughToken, ListThroughTokenError, MAX_LIST_FETCHES_PER_SIDE, MAX_LIST_NO_PROGRESS_PAGES, MergeOutcome, MergePick,
-    MergeSide, SOURCE_LIST_MAX_RATE_WAIT, SOURCE_LIST_RATE_PER_SEC, SourceListPlan, SourceListRateLimiter,
-    decode_continuation_token, source_list_plan,
+    FetchRequest, LIST_THROUGH_TOKEN_VERSION, ListEntryKey, ListThroughCursor, ListThroughMerger, ListThroughToken,
+    ListThroughTokenError, MAX_LIST_FETCHES_PER_SIDE, MergeOutcome, MergePick, MergeSide, SOURCE_LIST_MAX_RATE_WAIT,
+    SOURCE_LIST_RATE_PER_SEC, SourceListPlan, SourceListRateLimiter, decode_continuation_token, source_list_plan,
 };
 pub use negative_cache::{NEGATIVE_CACHE_MAX_ENTRIES, NegativeCache};
 pub use pull::{
@@ -65,19 +50,11 @@ pub use pull::{
    PullQueue, PullReason, PullSource, QueuedPullOutcome, SourceBody, SourceIdleGuard, WriteBackBody, WriteBackError,
    WriteBackOutcome, WriteBackPart, WriteBackRequest, commit_inline, commit_inline_with, idle_guarded_body,
 };
-pub use source_client::{
-    SourceClient, SourceError, SourceGet, SourceHead, SourceListRequest, SourceObject, SourcePage, SourceSse, is_multipart_etag,
-};
 pub use stats::{
    GaugeGuard, LastSourceError, LatencyBucketSnapshot, OdmOp, OdmOutcome, OdmStats, OdmStatsSnapshot, PullFailureReason,
    PullPath, SOURCE_LATENCY_BUCKET_BOUNDS_MS, SourceLatencySnapshot,
 };
 pub use sys::{
    ApplyOutcome, BucketOdmState, GLOBAL_ON_DEMAND_MIGRATION_SYS, OdmBucketSnapshot, OdmLookup, OdmStateError,
-    OnDemandMigrationSys, PullError, PullFollower, PullLeader, PullOutcome, PullResult, PullSlot, source_backend_spec,
-    source_client_spec,
+    OnDemandMigrationSys, PullError, PullFollower, PullLeader, PullOutcome, PullResult, PullSlot, source_client_spec,
 };
-
-pub(crate) fn register_metrics() {
-    metrics::register();
-}
@@ -46,10 +46,10 @@ use super::stats::{PullFailureReason, PullPath};
 use super::sys::{BucketOdmState, OnDemandMigrationSys, PullError, PullOutcome, PullSlot};
 use async_trait::async_trait;
 use bytes::Bytes;
-use futures::{FutureExt, Stream, StreamExt, future::Shared};
+use futures::{Stream, StreamExt};
 use parking_lot::Mutex;
 use rand::RngExt;
-use std::collections::HashMap;
+use std::collections::{HashMap, HashSet};
 use std::fmt;
 use std::io;
 use std::pin::Pin;
@@ -133,8 +133,6 @@ pub enum QueuedPullOutcome {
    Failed(PullError),
 }

-pub type QueuedPullReport = Shared<oneshot::Receiver<QueuedPullOutcome>>;
-
 /// Result of [`PullQueue::enqueue`].
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
 pub enum EnqueueOutcome {
@@ -243,8 +241,6 @@ impl PullSource for SourceClient {
 #[derive(Clone, Debug)]
 pub struct WriteBackRequest {
    pub bucket: String,
-    /// Identity captured with the source configuration, retained through cleanup.
-    pub bucket_incarnation_id: uuid::Uuid,
    pub key: String,
    /// Source HEAD/GET of the whole object.
    pub head: SourceHead,
@@ -255,7 +251,6 @@ pub struct WriteBackRequest {
    pub preserve_etag: bool,
    /// `policy.emit_events`.
    pub emit_events: bool,
-    pub respect_delete_marker: bool,
    /// Source tags to copy (`policy.copy_tags`), `None` to skip.
    pub tags: Option<HashMap<String, String>>,
 }
@@ -265,14 +260,12 @@ impl WriteBackRequest {
        let config = state.config();
        Self {
            bucket: state.bucket().to_string(),
-            bucket_incarnation_id: state.incarnation_id(),
            key: key.to_string(),
            head,
            source_label: format!("{}:{}", config.source.provider.as_str(), config.source.bucket),
            pulled_at: OffsetDateTime::now_utc(),
            preserve_etag: config.policy.preserve_etag,
            emit_events: config.policy.emit_events,
-            respect_delete_marker: config.policy.respect_local_delete_marker,
            tags,
        }
    }
@@ -360,7 +353,7 @@ pub trait OdmWriteBack: Send + Sync {
        parts: Vec<WriteBackPart>,
    ) -> Result<WriteBackOutcome, WriteBackError>;

-    async fn abort_multipart_upload(&self, request: &WriteBackRequest, upload_id: &str) -> Result<(), WriteBackError>;
+    async fn abort_multipart_upload(&self, bucket: &str, key: &str, upload_id: &str) -> Result<(), WriteBackError>;
 }

 /// Why the pump stopped feeding the write-back before EOF.
@@ -665,7 +658,9 @@ async fn write_multipart(
        Err(err) => Err(err),
    };
    if completed.is_err()
-        && let Err(abort_err) = write_back.abort_multipart_upload(request, &upload_id).await
+        && let Err(abort_err) = write_back
+            .abort_multipart_upload(&request.bucket, &request.key, &upload_id)
+            .await
    {
        debug!(
            event = EVENT_ODM_PULL_FAILED,
@@ -835,7 +830,7 @@ pub struct PullQueue {
    bucket: String,
    tx: mpsc::Sender<PullJob>,
    /// Keys queued or running; the job removes its key when it ends.
-    pending: Mutex<HashMap<String, QueuedPullReport>>,
+    pending: Mutex<HashSet<String>>,
    capacity: usize,
    cancel: CancellationToken,
    stats: Arc<super::stats::OdmStats>,
@@ -874,7 +869,7 @@ impl PullQueue {
        let queue = Arc::new(Self {
            bucket: state.bucket().to_string(),
            tx,
-            pending: Mutex::new(HashMap::new()),
+            pending: Mutex::new(HashSet::new()),
            capacity,
            cancel: state.cancel_token(),
            stats: Arc::clone(state.stats()),
@@ -908,24 +903,29 @@ impl PullQueue {
        self.enqueue_with_report(key, reason).0
    }

-    /// [`Self::enqueue`] with a shared report, including for coalesced pulls.
-    pub fn enqueue_with_report(&self, key: &str, reason: PullReason) -> (EnqueueOutcome, Option<QueuedPullReport>) {
+    /// [`Self::enqueue`] that also hands back the job's report channel when
+    /// a new job was queued (`Coalesced` pulls report to their first
+    /// requester only).
+    pub fn enqueue_with_report(
+        &self,
+        key: &str,
+        reason: PullReason,
+    ) -> (EnqueueOutcome, Option<oneshot::Receiver<QueuedPullOutcome>>) {
        if self.cancel.is_cancelled() {
            return (EnqueueOutcome::Unavailable, None);
        }
        let mut pending = self.pending.lock();
-        if let Some(report) = pending.get(key) {
-            return (EnqueueOutcome::Coalesced, Some(report.clone()));
+        if pending.contains(key) {
+            return (EnqueueOutcome::Coalesced, None);
        }
        let (report_tx, report_rx) = oneshot::channel();
-        let report_rx = report_rx.shared();
        match self.tx.try_send(PullJob {
            key: key.to_string(),
            reason,
            report: Some(report_tx),
        }) {
            Ok(()) => {
-                pending.insert(key.to_string(), report_rx.clone());
+                pending.insert(key.to_string());
                (EnqueueOutcome::Enqueued, Some(report_rx))
            }
            Err(TrySendError::Full(_)) => {
@@ -1072,7 +1072,7 @@ impl BucketOdmState {
        self: &Arc<Self>,
        key: &str,
        reason: PullReason,
-    ) -> (EnqueueOutcome, Option<QueuedPullReport>) {
+    ) -> (EnqueueOutcome, Option<oneshot::Receiver<QueuedPullOutcome>>) {
        match self.pull_queue() {
            Some(queue) => queue.enqueue_with_report(key, reason),
            None => (EnqueueOutcome::Unavailable, None),
@@ -1094,7 +1094,7 @@ impl OnDemandMigrationSys {
 #[cfg(test)]
 mod tests {
    use super::*;
-    use crate::on_demand_migration::config::{
+    use crate::bucket::on_demand_migration::config::{
        FilterConfig, OnDemandMigrationConfig, PathStyle as ConfigPathStyle, PolicyConfig, Provider, SourceConfig,
        SourceCredentials, TlsConfig,
    };
@@ -1119,8 +1119,6 @@ mod tests {
                    session_token: None,
                }),
                tls: TlsConfig::default(),
-                azure: None,
-                gcs: None,
            },
            filter: FilterConfig::default(),
            policy: PolicyConfig::default(),
@@ -1341,7 +1339,7 @@ mod tests {
            })
        }

-        async fn abort_multipart_upload(&self, _request: &WriteBackRequest, upload_id: &str) -> Result<(), WriteBackError> {
+        async fn abort_multipart_upload(&self, _bucket: &str, _key: &str, upload_id: &str) -> Result<(), WriteBackError> {
            self.aborted.lock().push(upload_id.to_string());
            Ok(())
        }
@@ -1401,21 +1399,13 @@ mod tests {
        assert_eq!(queue.capacity(), 1024);

        let mut outcomes = HashMap::new();
-        let mut shared_report = None;
        for _ in 0..100 {
-            let (outcome, report) = queue.enqueue_with_report("a", PullReason::RangeGet);
-            *outcomes.entry(outcome).or_insert(0) += 1;
-            shared_report = report;
+            *outcomes.entry(queue.enqueue("a", PullReason::RangeGet)).or_insert(0) += 1;
        }
        assert_eq!(outcomes.get(&EnqueueOutcome::Enqueued), Some(&1));
        assert_eq!(outcomes.get(&EnqueueOutcome::Coalesced), Some(&99));
        assert_eq!(queue.pending_keys(), 1);

-        assert_eq!(
-            shared_report.expect("coalesced report").await,
-            Ok(QueuedPullOutcome::Stored { size: 1000 })
-        );
-
        wait_until("first pull to finish", || queue.pending_keys() == 0).await;
        assert_eq!(source.head_calls.load(Ordering::SeqCst), 1);
        assert_eq!(source.get_calls.load(Ordering::SeqCst), 1);
@@ -1448,23 +1438,6 @@ mod tests {
        assert_eq!(queue.enqueue("a", PullReason::RangeGet), EnqueueOutcome::Unavailable);
    }

-    #[tokio::test]
-    async fn coalesced_enqueues_share_failure_reports() {
-        let sys = OnDemandMigrationSys::new();
-        let state = enabled_state(&sys, &config()).await;
-        let source = MockSource::with_object("missing", 1000, BodyKind::Bytes(body_bytes(1000)));
-        let queue = PullQueue::start(Arc::clone(&state), source, Arc::new(MockWriteBack::default()));
-        let (first, first_report) = queue.enqueue_with_report("absent", PullReason::RangeGet);
-        let (second, second_report) = queue.enqueue_with_report("absent", PullReason::Backfill);
-        assert_eq!(first, EnqueueOutcome::Enqueued);
-        assert_eq!(second, EnqueueOutcome::Coalesced);
-        let (first, second) = tokio::join!(first_report.expect("leader report"), second_report.expect("coalesced report"));
-        assert_eq!(first, second);
-        assert!(matches!(first, Ok(QueuedPullOutcome::Failed(_))));
-        sys.remove(BUCKET);
-        queue.wait_until_stopped().await;
-    }
-
    #[tokio::test]
    async fn queue_full_is_reported_and_cancel_drains_without_leaking_tasks() {
        let sys = OnDemandMigrationSys::new();
@@ -1494,23 +1467,16 @@ mod tests {
        wait_until("dispatcher to wait for a slot", || state.stats().queue_depth() == 1).await;
        assert_eq!(queue.enqueue("c", PullReason::LargeObject), EnqueueOutcome::Enqueued);
        assert_eq!(queue.enqueue("d", PullReason::LargeObject), EnqueueOutcome::QueueFull);
-        let (coalesced, canceled_report) = queue.enqueue_with_report("c", PullReason::LargeObject);
-        assert_eq!(coalesced, EnqueueOutcome::Coalesced);
+        assert_eq!(queue.enqueue("c", PullReason::LargeObject), EnqueueOutcome::Coalesced);
        assert_eq!(queue.pending_keys(), 3);
        assert_eq!(failures(&state).get("queue_full"), Some(&1));
        assert!(!queue.is_stopped());

-        assert_eq!(sys.remove(BUCKET), crate::on_demand_migration::ApplyOutcome::Removed);
+        assert_eq!(sys.remove(BUCKET), crate::bucket::on_demand_migration::ApplyOutcome::Removed);
        tokio::time::timeout(Duration::from_secs(5), queue.wait_until_stopped())
            .await
            .expect("dispatcher and in-flight job must exit after cancel");
        assert!(queue.is_stopped());
-        assert!(
-            tokio::time::timeout(Duration::from_secs(5), canceled_report.expect("coalesced cancellation report"))
-                .await
-                .expect("cancellation closes the report")
-                .is_err()
-        );
        assert_eq!(queue.pending_keys(), 0);
        assert_eq!(state.inflight_keys(), 0);
        assert_eq!(state.stats().inflight_pulls(), 0);
@@ -14,9 +14,9 @@

 //! Outbound client for an on-demand migration source bucket.
 //!
-//! `SourceClient` maps local keys onto a read-only `SourceBackend`. The
-//! S3 backend uses the shared remote builder and exposes the surface the
-//! migration path needs (HEAD, ranged streaming GET, ListObjectsV2, GetObjectTagging, a
+//! `SourceClient` wraps an `aws_sdk_s3::Client` built through the shared
+//! remote builder and exposes the read-only surface the migration path
+//! needs (HEAD, ranged streaming GET, ListObjectsV2, GetObjectTagging, a
 //! probe for admin validation). Every request carries the
 //! `source-proxy-request` anti-loop marker in both the `x-rustfs-` and
 //! `x-minio-` prefixes so a RustFS/MinIO source answers locally instead of
@@ -25,14 +25,10 @@
 //! Client-supplied `If-*`, `Authorization`, `Host` and SSE-C headers are never
 //! forwarded: v1 rejects SSE-C source objects outright.

-use super::azure::AzureSourceBackend;
-#[cfg(feature = "gcs")]
-use super::gcs::GcsNativeSourceBackend;
-use super::list_through::{ListPageError, validate_list_page};
-use super::storage_api::HTTPRangeSpec;
-use super::storage_api::remote_s3_client::{
+use crate::bucket::remote_s3_client::{
    PathStyle, RemoteCredentials, RemoteS3ClientError, RemoteS3EndpointSpec, RemoteS3RetryPolicy, build_remote_s3_config,
 };
+use crate::storage_api_contracts::range::HTTPRangeSpec;
 use aws_sdk_s3::Client as S3Client;
 use aws_sdk_s3::error::{ProvideErrorMetadata, SdkError};
 use aws_sdk_s3::operation::get_object::GetObjectOutput;
@@ -68,10 +64,6 @@ pub enum SourceProvider {
    /// Generic S3-compatible service.
    #[default]
    S3,
-    /// Native Azure Blob service; not an S3 dialect.
-    Azure,
-    /// Native GCS JSON API with a service-account key; not an S3 dialect.
-    GcsNative,
 }

 impl SourceProvider {
@@ -83,8 +75,6 @@ impl SourceProvider {
            "minio" => Some(Self::Minio),
            "rustfs" => Some(Self::Rustfs),
            "s3" => Some(Self::S3),
-            "azure" => Some(Self::Azure),
-            "gcs_native" => Some(Self::GcsNative),
            _ => None,
        }
    }
@@ -97,8 +87,6 @@ impl SourceProvider {
            Self::Minio => "minio",
            Self::Rustfs => "rustfs",
            Self::S3 => "s3",
-            Self::Azure => "azure",
-            Self::GcsNative => "gcs_native",
        }
    }

@@ -164,75 +152,12 @@ pub struct SourceClientSpec {
    /// Wire requests one logical source call may cost. The pull pipeline and
    /// the backfill job own the retry budget (`pull.rs` `PULL_MAX_RETRIES`,
    /// `backfill.rs` `LIST_MAX_RETRIES`) and the breaker counts logical calls,
-    /// so ODM declares [`RemoteS3RetryPolicy::Disabled`]. An ambiguous HEAD
-    /// 404 additionally probes the bucket before declaring a key absent.
+    /// so ODM declares [`RemoteS3RetryPolicy::Disabled`] and keeps one counted
+    /// failure equal to one request against a struggling source.
    pub retry: RemoteS3RetryPolicy,
    /// Bytes per second the pull pipeline may consume from this source;
    /// `None` means unlimited. Enforced by the consumer, not by this client.
    pub bandwidth_limit: Option<NonZeroU64>,
-    /// Which [`SourceBackend`] to build. The S3 variant reads `region`,
-    /// `path_style` and `credentials`; the native variants ignore all three
-    /// and carry their own credentials.
-    pub backend: SourceBackendSpec,
-}
-
-/// Provider-specific half of [`SourceClientSpec`].
-#[derive(Clone, Debug, Default, PartialEq, Eq)]
-pub enum SourceBackendSpec {
-    #[default]
-    S3,
-    Azure(AzureSourceSpec),
-    Gcs(GcsSourceSpec),
-}
-
-/// Native Azure Blob parameters. The container is [`SourceClientSpec::bucket`].
-#[derive(Clone, PartialEq, Eq)]
-pub struct AzureSourceSpec {
-    pub account: String,
-    pub auth: AzureAuth,
-}
-
-impl fmt::Debug for AzureSourceSpec {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("AzureSourceSpec")
-            .field("account", &self.account)
-            .field("auth", &self.auth)
-            .finish()
-    }
-}
-
-/// How Azure requests are authorized.
-#[derive(Clone, PartialEq, Eq)]
-pub enum AzureAuth {
-    /// Base64 storage-account key, signed per request with Shared Key.
-    SharedKey(String),
-    /// SAS query string without the leading `?`, appended to every URL.
-    Sas(String),
-}
-
-impl fmt::Debug for AzureAuth {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        // Both variants are secrets; only the scheme may be rendered.
-        f.write_str(match self {
-            Self::SharedKey(_) => "SharedKey(REDACTED)",
-            Self::Sas(_) => "Sas(REDACTED)",
-        })
-    }
-}
-
-/// Native GCS parameters. The bucket is [`SourceClientSpec::bucket`].
-#[derive(Clone, PartialEq, Eq)]
-pub struct GcsSourceSpec {
-    /// Service-account key JSON.
-    pub service_account_json: String,
-}
-
-impl fmt::Debug for GcsSourceSpec {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("GcsSourceSpec")
-            .field("service_account_json", &"REDACTED")
-            .finish()
-    }
 }

 impl SourceClientSpec {
@@ -298,8 +223,6 @@ pub enum SourceError {
    ServerError(u16),
    #[error("unsupported source object: {0}")]
    Unsupported(String),
-    #[error("invalid source listing: {0}")]
-    InvalidPagination(#[from] ListPageError),
    #[error("source request failed: {0}")]
    Other(String),
 }
@@ -322,7 +245,6 @@ impl SourceError {
            SourceError::Connect(_) => "connect",
            SourceError::ServerError(_) => "server_error",
            SourceError::Unsupported(_) => "unsupported",
-            SourceError::InvalidPagination(_) => "invalid_pagination",
            SourceError::Other(_) => "other",
        }
    }
@@ -335,9 +257,8 @@ const THROTTLE_CODES: &[&str] = &[
    "RequestLimitExceeded",
    "TooManyRequests",
    "RequestThrottled",
-    "ServerBusy",
 ];
-const NOT_FOUND_CODES: &[&str] = &["NoSuchKey", "BlobNotFound"];
+const NOT_FOUND_CODES: &[&str] = &["NoSuchKey", "NotFound", "NoSuchBucket", "NoSuchVersion"];
 const ACCESS_DENIED_CODES: &[&str] = &[
    "AccessDenied",
    "InvalidAccessKeyId",
@@ -345,10 +266,9 @@ const ACCESS_DENIED_CODES: &[&str] = &[
    "AllAccessDisabled",
    "ExpiredToken",
    "InvalidToken",
-    "AuthorizationPermissionMismatch",
 ];

-pub(super) fn classify_status(status: u16, code: Option<&str>, message: String) -> SourceError {
+fn classify_status(status: u16, code: Option<&str>, message: String) -> SourceError {
    if let Some(code) = code {
        if THROTTLE_CODES.contains(&code) {
            return SourceError::Throttled;
@@ -361,6 +281,7 @@ pub(super) fn classify_status(status: u16, code: Option<&str>, message: String)
        }
    }
    match status {
+        404 => SourceError::NotFound,
        401 | 403 => SourceError::AccessDenied,
        429 | 503 => SourceError::Throttled,
        500..=599 => SourceError::ServerError(status),
@@ -420,11 +341,6 @@ pub struct SourceHead {
    pub storage_class: Option<String>,
    pub sse: Option<SourceSse>,
    pub is_multipart_etag: bool,
-    /// The provider's ETag is not derived from the object bytes (Azure
-    /// stamps an opaque concurrency token). Such an ETag is recorded for
-    /// provenance but must never be read as a content digest, so the
-    /// write-back path refuses to use it as the expected MD5.
-    pub etag_is_opaque: bool,
 }

 /// Per-operation fields shared by HEAD and GET outputs.
@@ -446,7 +362,7 @@ struct HeadParts {
    sse_customer_algorithm: Option<String>,
 }

-pub(super) fn normalize_etag(etag: Option<String>) -> Option<String> {
+fn normalize_etag(etag: Option<String>) -> Option<String> {
    etag.map(|etag| etag.trim().trim_matches('"').to_string())
        .filter(|etag| !etag.is_empty())
 }
@@ -495,7 +411,6 @@ fn source_head(parts: HeadParts) -> Result<SourceHead, SourceError> {
        storage_class: parts.storage_class,
        sse,
        is_multipart_etag,
-        etag_is_opaque: false,
    })
 }

@@ -596,7 +511,7 @@ pub struct SourceObject {
 #[derive(Clone, Debug, Default, PartialEq, Eq)]
 pub struct SourcePage {
    pub objects: Vec<SourceObject>,
-    /// Rolled-up prefixes, in the same namespace as `objects`; always empty when the
+    /// Rolled-up prefixes, in the local namespace; always empty when the
    /// request carried no delimiter.
    pub common_prefixes: Vec<String>,
    pub is_truncated: bool,
@@ -604,8 +519,7 @@ pub struct SourcePage {
 }

 /// One `ListObjectsV2` page request against the source. Keys are given in the
-/// local namespace at `SourceClient`, and in the source namespace at
-/// `SourceBackend`; `SourceClient` maps them through `source_prefix`.
+/// local namespace; `SourceClient` maps them through `source_prefix`.
 #[derive(Clone, Debug, Default, PartialEq, Eq)]
 pub struct SourceListRequest<'a> {
    pub prefix: Option<&'a str>,
@@ -661,30 +575,8 @@ impl Intercept for SourceProxyMarkerInterceptor {
    }
 }

-/// Read-only provider operations in the source bucket namespace.
-///
-/// Implementations must preserve streaming, honor the requested range and
-/// pagination cursor, and classify failures without including credentials.
-/// `SourceClient` owns prefix mapping so every provider shares the same local
-/// namespace. Continuation tokens are opaque and must never be prefix-mapped.
-#[async_trait::async_trait]
-pub trait SourceBackend: Send + Sync {
-    async fn head(&self, key: &str) -> Result<SourceHead, SourceError>;
-    async fn get(&self, key: &str, range: Option<&HTTPRangeSpec>) -> Result<SourceGet, SourceError>;
-    async fn list(&self, request: &SourceListRequest<'_>) -> Result<SourcePage, SourceError>;
-    async fn tagging(&self, key: &str) -> Result<HashMap<String, String>, SourceError>;
-    /// Verify bucket access; `SourceClient` separately probes a filtered listing.
-    async fn probe(&self) -> Result<(), SourceError>;
-}
-
-/// S3-compatible implementation, including request signing and anti-loop headers.
-pub struct S3SourceBackend {
-    client: S3Client,
-    bucket: String,
-}
-
 pub struct SourceClient {
-    backend: Box<dyn SourceBackend>,
+    client: S3Client,
    endpoint: String,
    bucket: String,
    source_prefix: Option<String>,
@@ -706,62 +598,18 @@ impl fmt::Debug for SourceClient {

 impl SourceClient {
    pub async fn new(spec: &SourceClientSpec) -> Result<Self, RemoteS3ClientError> {
-        match &spec.backend {
-            SourceBackendSpec::S3 => {
-                let endpoint = spec.endpoint_spec()?;
-                let config = build_remote_s3_config(&endpoint).await?;
-                Ok(Self::from_config_builder(config, endpoint.endpoint_url(), spec))
-            }
-            SourceBackendSpec::Azure(azure) => {
-                let backend = AzureSourceBackend::new(
-                    &spec.endpoint,
-                    &spec.bucket,
-                    azure,
-                    spec.timeouts,
-                    spec.skip_tls_verify,
-                    spec.ca_cert_pem.as_deref(),
-                )?;
-                Ok(Self::from_backend(Box::new(backend), spec))
-            }
-            #[cfg(not(feature = "gcs"))]
-            SourceBackendSpec::Gcs(_) => Err(RemoteS3ClientError::BackendNotCompiled("gcs_native")),
-            #[cfg(feature = "gcs")]
-            SourceBackendSpec::Gcs(gcs) => {
-                let backend = GcsNativeSourceBackend::new(
-                    &spec.endpoint,
-                    &spec.bucket,
-                    gcs,
-                    spec.timeouts,
-                    spec.skip_tls_verify,
-                    spec.ca_cert_pem.as_deref(),
-                )?;
-                Ok(Self::from_backend(Box::new(backend), spec))
-            }
-        }
-    }
-
-    /// Wraps a ready backend in the prefix-mapping client. The endpoint is
-    /// kept only for `Debug` and admin status.
-    fn from_backend(backend: Box<dyn SourceBackend>, spec: &SourceClientSpec) -> Self {
-        Self {
-            backend,
-            endpoint: spec.endpoint.clone(),
-            bucket: spec.bucket.clone(),
-            source_prefix: spec.source_prefix.clone().filter(|prefix| !prefix.is_empty()),
-            timeouts: spec.timeouts,
-            bandwidth_limit: spec.bandwidth_limit,
-        }
+        let endpoint = spec.endpoint_spec()?;
+        let config = build_remote_s3_config(&endpoint).await?;
+        Ok(Self::from_config_builder(config, endpoint.endpoint_url(), spec))
    }

    /// `config` must come from [`SourceClientSpec::endpoint_spec`], which is
-    /// where the policy disabling SDK-level retries is declared.
+    /// where the retry policy that keeps one logical call equal to one wire
+    /// request is declared.
    fn from_config_builder(config: aws_sdk_s3::config::Builder, endpoint: String, spec: &SourceClientSpec) -> Self {
        let client = S3Client::from_conf(config.interceptor(SourceProxyMarkerInterceptor::new()).build());
        Self {
-            backend: Box::new(S3SourceBackend {
-                client,
-                bucket: spec.bucket.clone(),
-            }),
+            client,
            endpoint,
            bucket: spec.bucket.clone(),
            source_prefix: spec.source_prefix.clone().filter(|prefix| !prefix.is_empty()),
@@ -804,15 +652,35 @@ impl SourceClient {
    }

    pub async fn head_object(&self, key: &str) -> Result<SourceHead, SourceError> {
-        self.backend.head(&self.source_key(key)).await
+        let output = self
+            .client
+            .head_object()
+            .bucket(&self.bucket)
+            .key(self.source_key(key))
+            .send()
+            .await
+            .map_err(classify_sdk_error)?;
+        source_head_from_head_output(output)
    }

-    /// Streams the object, preserving an optional HTTP byte range.
+    /// Streams the object; `range` is passed through as an HTTP `Range`
+    /// header and omitted entirely when `None`.
    pub async fn get_object(&self, key: &str, range: Option<&HTTPRangeSpec>) -> Result<SourceGet, SourceError> {
-        self.backend.get(&self.source_key(key), range).await
+        let range = range.map(range_header_value).transpose()?;
+        let output = self
+            .client
+            .get_object()
+            .bucket(&self.bucket)
+            .key(self.source_key(key))
+            .set_range(range)
+            .send()
+            .await
+            .map_err(classify_sdk_error)?;
+        source_get_from_output(output)
    }

-    /// Lists one page under the local prefix.
+    /// Lists one page under the local `prefix`. Keys are returned in the
+    /// local namespace; entries outside `source_prefix` are skipped.
    pub async fn list_objects_v2(
        &self,
        prefix: Option<&str>,
@@ -828,83 +696,9 @@ impl SourceClient {
        .await
    }

-    /// Maps keys and common prefixes while leaving opaque cursors untouched.
+    /// [`Self::list_objects_v2`] with the delimiter and start-after the
+    /// list-through merge needs (rustfs/backlog#2164).
    pub async fn list_page(&self, request: &SourceListRequest<'_>) -> Result<SourcePage, SourceError> {
-        let prefix = self.source_key(request.prefix.unwrap_or_default());
-        let start_after = request.start_after.map(|key| self.source_key(key));
-        let mut page = self
-            .backend
-            .list(&SourceListRequest {
-                prefix: Some(&prefix),
-                start_after: start_after.as_deref(),
-                ..*request
-            })
-            .await?;
-        validate_list_page(page.is_truncated, request.continuation_token, page.next_continuation_token.as_deref())?;
-        page.objects = page
-            .objects
-            .into_iter()
-            .filter_map(|object| self.local_object(object))
-            .collect();
-        page.common_prefixes = page
-            .common_prefixes
-            .into_iter()
-            .filter_map(|prefix| self.local_key(&prefix).map(str::to_string))
-            .collect();
-        Ok(page)
-    }
-
-    fn local_object(&self, mut object: SourceObject) -> Option<SourceObject> {
-        object.key = self.local_key(&object.key)?.to_string();
-        Some(object)
-    }
-
-    pub async fn get_object_tagging(&self, key: &str) -> Result<HashMap<String, String>, SourceError> {
-        self.backend.tagging(&self.source_key(key)).await
-    }
-
-    pub async fn probe(&self) -> Result<SourceProbe, SourceError> {
-        self.backend.probe().await?;
-        let page = self.list_objects_v2(None, None, 1).await?;
-        Ok(SourceProbe {
-            sample_object: page.objects.into_iter().next(),
-            has_more_objects: page.is_truncated,
-        })
-    }
-}
-
-#[async_trait::async_trait]
-impl SourceBackend for S3SourceBackend {
-    async fn head(&self, key: &str) -> Result<SourceHead, SourceError> {
-        match self.client.head_object().bucket(&self.bucket).key(key).send().await {
-            Ok(output) => source_head_from_head_output(output),
-            Err(err) if err.raw_response().is_some_and(|response| response.status().as_u16() == 404) => {
-                // HEAD has no error body: a missing bucket must not poison
-                // the per-key negative cache as though only the key was absent.
-                self.probe().await?;
-                Err(SourceError::NotFound)
-            }
-            Err(err) => Err(classify_sdk_error(err)),
-        }
-    }
-
-    /// Streams the object; `range` is passed through as an HTTP `Range`
-    /// header and omitted entirely when `None`.
-    async fn get(&self, key: &str, range: Option<&HTTPRangeSpec>) -> Result<SourceGet, SourceError> {
-        let range = range.map(range_header_value).transpose()?;
-        let output = self
-            .client
-            .get_object()
-            .bucket(&self.bucket)
-            .key(key)
-            .set_range(range)
-            .send()
-            .await
-            .map_err(classify_sdk_error)?;
-        source_get_from_output(output)
-    }
-
-    async fn list(&self, request: &SourceListRequest<'_>) -> Result<SourcePage, SourceError> {
        // `start_after` is silently ignored by S3 once a continuation token is
        // present; refuse the ambiguous pair rather than list from the wrong
        // position.
@@ -917,9 +711,9 @@ impl SourceBackend for S3SourceBackend {
            .client
            .list_objects_v2()
            .bucket(&self.bucket)
-            .prefix(request.prefix.unwrap_or_default())
+            .prefix(self.source_key(request.prefix.unwrap_or_default()))
            .set_delimiter(request.delimiter.map(str::to_string))
-            .set_start_after(request.start_after.map(str::to_string))
+            .set_start_after(request.start_after.map(|after| self.source_key(after)))
            .set_continuation_token(request.continuation_token.map(str::to_string))
            .max_keys(request.max_keys)
            .send()
@@ -928,17 +722,22 @@ impl SourceBackend for S3SourceBackend {

        let is_truncated = output.is_truncated.unwrap_or(false);
        let next_continuation_token = output.next_continuation_token;
+        if is_truncated && next_continuation_token.is_none() {
+            return Err(SourceError::Other(
+                "source reported a truncated listing without a continuation token".to_string(),
+            ));
+        }
        let objects = output
            .contents
            .unwrap_or_default()
            .into_iter()
-            .map(s3_source_object)
-            .collect::<Result<Vec<_>, _>>()?;
+            .filter_map(|object| self.source_object(object))
+            .collect();
        let common_prefixes = output
            .common_prefixes
            .unwrap_or_default()
            .into_iter()
-            .filter_map(|prefix| prefix.prefix)
+            .filter_map(|prefix| Some(self.local_key(prefix.prefix.as_deref()?)?.to_string()))
            .collect();

        Ok(SourcePage {
@@ -949,53 +748,51 @@ impl SourceBackend for S3SourceBackend {
        })
    }

-    async fn tagging(&self, key: &str) -> Result<HashMap<String, String>, SourceError> {
+    fn source_object(&self, object: SdkObject) -> Option<SourceObject> {
+        let key = self.local_key(object.key.as_deref()?)?.to_string();
+        let etag = normalize_etag(object.e_tag);
+        let is_multipart_etag = etag.as_deref().is_some_and(is_multipart_etag);
+        Some(SourceObject {
+            key,
+            etag,
+            size: object.size.and_then(|size| u64::try_from(size).ok()).unwrap_or(0),
+            last_modified: system_time(object.last_modified),
+            storage_class: object.storage_class.map(|class| class.as_str().to_string()),
+            is_multipart_etag,
+        })
+    }
+
+    pub async fn get_object_tagging(&self, key: &str) -> Result<HashMap<String, String>, SourceError> {
        let output = self
            .client
            .get_object_tagging()
            .bucket(&self.bucket)
-            .key(key)
+            .key(self.source_key(key))
            .send()
            .await
            .map_err(classify_sdk_error)?;
        Ok(output.tag_set.into_iter().map(|tag| (tag.key, tag.value)).collect())
    }

-    async fn probe(&self) -> Result<(), SourceError> {
+    /// Admin validation: HeadBucket plus a one-key listing under the prefix.
+    pub async fn probe(&self) -> Result<SourceProbe, SourceError> {
        self.client
            .head_bucket()
            .bucket(&self.bucket)
            .send()
            .await
            .map_err(classify_sdk_error)?;
-        Ok(())
+        let page = self.list_objects_v2(None, None, 1).await?;
+        Ok(SourceProbe {
+            sample_object: page.objects.into_iter().next(),
+            has_more_objects: page.is_truncated,
+        })
    }
 }

-fn s3_source_object(object: SdkObject) -> Result<SourceObject, SourceError> {
-    let key = object
-        .key
-        .ok_or_else(|| SourceError::Other("source listing object has no key".to_string()))?;
-    let size = object
-        .size
-        .and_then(|size| u64::try_from(size).ok())
-        .ok_or_else(|| SourceError::Other("source listing object has no valid size".to_string()))?;
-    let etag = normalize_etag(object.e_tag);
-    let is_multipart_etag = etag.as_deref().is_some_and(is_multipart_etag);
-    Ok(SourceObject {
-        key,
-        etag,
-        size,
-        last_modified: system_time(object.last_modified),
-        storage_class: object.storage_class.map(|class| class.as_str().to_string()),
-        is_multipart_etag,
-    })
-}
-
 #[cfg(test)]
 mod tests {
    use super::*;
-    use crate::on_demand_migration::backend_contract::{BackendCapabilities, OBJECT_MD5, assert_backend_contract};
    use aws_smithy_runtime_api::client::http::{HttpConnector, HttpConnectorFuture, SharedHttpConnector, http_client_fn};
    use aws_smithy_runtime_api::client::orchestrator::HttpRequest;
    use aws_smithy_runtime_api::client::result::ConnectorError;
@@ -1113,32 +910,9 @@ mod tests {
            retry: RemoteS3RetryPolicy::Disabled,
            timeouts: SourceTimeouts::default(),
            bandwidth_limit: NonZeroU64::new(1_000_000),
-            backend: SourceBackendSpec::S3,
        }
    }

-    #[cfg(not(feature = "gcs"))]
-    #[tokio::test]
-    async fn gcs_backend_not_compiled_keeps_hmac_s3_available() {
-        let mut native = spec(None);
-        native.provider = SourceProvider::GcsNative;
-        native.credentials = None;
-        native.backend = SourceBackendSpec::Gcs(GcsSourceSpec {
-            service_account_json: "{}".to_string(),
-        });
-        assert!(matches!(
-            SourceClient::new(&native).await,
-            Err(RemoteS3ClientError::BackendNotCompiled("gcs_native"))
-        ));
-
-        let mut hmac = spec(None);
-        hmac.provider = SourceProvider::Gcs;
-        hmac.endpoint = "https://storage.googleapis.com".to_string();
-        SourceClient::new(&hmac)
-            .await
-            .expect("GCS HMAC uses the always-available S3 backend");
-    }
-
    async fn scripted_client(spec: &SourceClientSpec, responses: Vec<Scripted>) -> (SourceClient, Recorded) {
        let requests: Recorded = Arc::new(Mutex::new(Vec::new()));
        let connector = SharedHttpConnector::new(ScriptedConnector {
@@ -1420,70 +1194,6 @@ mod tests {
        assert!(requests[1].uri.contains("continuation-token=token-1"), "{}", requests[1].uri);
    }

-    #[tokio::test]
-    async fn list_page_maps_delimiter_prefixes_and_start_after_but_not_cursors() {
-        let body = r#"<ListBucketResult xmlns="http://s3.amazonaws.com/doc/2006-03-01/">
-<IsTruncated>true</IsTruncated><NextContinuationToken>data/opaque</NextContinuationToken>
-<CommonPrefixes><Prefix>data/photos/</Prefix></CommonPrefixes>
-<CommonPrefixes><Prefix>outside/</Prefix></CommonPrefixes>
-</ListBucketResult>"#;
-        let next_body = body.replace("data/opaque", "data/next");
-        let (client, requests) =
-            scripted_client(&spec(Some("data/")), vec![ok(Vec::new(), body), ok(Vec::new(), &next_body)]).await;
-        let first = client
-            .list_page(&SourceListRequest {
-                prefix: Some("photos/"),
-                delimiter: Some("/"),
-                start_after: Some("photos/a"),
-                max_keys: 2,
-                ..Default::default()
-            })
-            .await
-            .expect("delimiter listing should succeed");
-        assert_eq!(first.common_prefixes, vec!["photos/"]);
-        assert_eq!(first.next_continuation_token.as_deref(), Some("data/opaque"));
-        let second = client
-            .list_page(&SourceListRequest {
-                continuation_token: first.next_continuation_token.as_deref(),
-                max_keys: 2,
-                ..Default::default()
-            })
-            .await
-            .expect("opaque continuation should succeed");
-        assert_eq!(second.common_prefixes, first.common_prefixes);
-        let requests = recorded(&requests);
-        let query = |request: &RecordedRequest| {
-            Url::parse(&request.uri)
-                .expect("request URI")
-                .query_pairs()
-                .into_owned()
-                .collect::<HashMap<_, _>>()
-        };
-        let first_query = query(&requests[0]);
-        assert_eq!(first_query.get("prefix").map(String::as_str), Some("data/photos/"));
-        assert_eq!(first_query.get("start-after").map(String::as_str), Some("data/photos/a"));
-        assert_eq!(first_query.get("delimiter").map(String::as_str), Some("/"));
-        let second_query = query(&requests[1]);
-        assert_eq!(second_query.get("continuation-token").map(String::as_str), Some("data/opaque"));
-        assert!(!second_query.contains_key("start-after"));
-    }
-
-    #[tokio::test]
-    async fn list_page_rejects_ambiguous_cursor_before_sending() {
-        let (client, requests) = scripted_client(&spec(Some("data/")), vec![]).await;
-        let err = client
-            .list_page(&SourceListRequest {
-                start_after: Some("a"),
-                continuation_token: Some("opaque"),
-                max_keys: 1,
-                ..Default::default()
-            })
-            .await
-            .expect_err("ambiguous list position must fail");
-        assert!(matches!(err, SourceError::Other(_)));
-        assert!(recorded(&requests).is_empty(), "invalid request must never reach the source");
-    }
-
    #[tokio::test]
    async fn list_objects_v2_rejects_truncated_page_without_token() {
        let (client, _) = scripted_client(&spec(None), vec![ok(Vec::new(), LIST_TRUNCATED_WITHOUT_TOKEN)]).await;
@@ -1491,104 +1201,7 @@ mod tests {
            .list_objects_v2(None, None, 10)
            .await
            .expect_err("truncated page without token is corrupt");
-        assert!(matches!(err, SourceError::InvalidPagination(ListPageError::Missing)), "{err:?}");
-    }
-
-    #[tokio::test]
-    async fn list_page_validates_s3_cursor_progress_before_mapping_entries() {
-        for contents in ["", "<Contents><Key>data/a</Key><Size>1</Size></Contents>"] {
-            for (truncated, next, expected) in [
-                (true, None, Some(ListPageError::Missing)),
-                (true, Some(""), Some(ListPageError::Empty)),
-                (true, Some("stuck"), Some(ListPageError::Repeated)),
-                (true, Some("opaque-next"), None),
-                (false, None, None),
-                (false, Some("stuck"), None),
-            ] {
-                let next_xml = next
-                    .map(|next| format!("<NextContinuationToken>{next}</NextContinuationToken>"))
-                    .unwrap_or_default();
-                let body = format!(
-                    "<ListBucketResult xmlns=\"http://s3.amazonaws.com/doc/2006-03-01/\"><IsTruncated>{truncated}</IsTruncated>{next_xml}{contents}</ListBucketResult>"
-                );
-                let (client, requests) = scripted_client(&spec(Some("data/")), vec![ok(Vec::new(), &body)]).await;
-                let result = client
-                    .list_page(&SourceListRequest {
-                        continuation_token: Some("stuck"),
-                        max_keys: 2,
-                        ..Default::default()
-                    })
-                    .await;
-                match expected {
-                    Some(expected) => {
-                        let error = result.expect_err("malformed pagination must fail at the provider boundary");
-                        assert!(
-                            matches!(&error, SourceError::InvalidPagination(actual) if *actual == expected),
-                            "{error:?}"
-                        );
-                        assert_eq!(error.class_label(), "invalid_pagination");
-                        assert!(!error.is_retryable());
-                        assert!(!error.to_string().contains("stuck"), "errors must not echo opaque tokens");
-                    }
-                    None => {
-                        let page = result.expect("progressing empty/nonempty pages and EOF are valid");
-                        assert_eq!(page.is_truncated, truncated);
-                        assert_eq!(page.next_continuation_token.as_deref(), next);
-                        assert_eq!(page.objects.len(), usize::from(!contents.is_empty()));
-                        if let Some(object) = page.objects.first() {
-                            assert_eq!(object.key, "a");
-                        }
-                    }
-                }
-                let requests = recorded(&requests);
-                assert_eq!(requests.len(), 1, "invalid pagination must not be retried");
-                assert!(requests[0].uri.contains("continuation-token=stuck"));
-            }
-        }
-    }
-
-    struct ListOnlyBackend(SourcePage);
-
-    #[async_trait::async_trait]
-    impl SourceBackend for ListOnlyBackend {
-        async fn list(&self, request: &SourceListRequest<'_>) -> Result<SourcePage, SourceError> {
-            assert_eq!(request.continuation_token, Some("stuck"), "opaque cursors reach every provider unchanged");
-            Ok(self.0.clone())
-        }
-
-        async fn head(&self, _key: &str) -> Result<SourceHead, SourceError> {
-            panic!("unexpected HEAD in list test")
-        }
-        async fn get(&self, _key: &str, _range: Option<&HTTPRangeSpec>) -> Result<SourceGet, SourceError> {
-            panic!("unexpected GET in list test")
-        }
-        async fn tagging(&self, _key: &str) -> Result<HashMap<String, String>, SourceError> {
-            panic!("unexpected tagging in list test")
-        }
-        async fn probe(&self) -> Result<(), SourceError> {
-            panic!("unexpected probe in list test")
-        }
-    }
-
-    #[tokio::test]
-    async fn list_page_validates_non_s3_provider_cursors_at_the_common_boundary() {
-        for (next, expected) in [
-            (None, ListPageError::Missing),
-            (Some(""), ListPageError::Empty),
-            (Some("stuck"), ListPageError::Repeated),
-        ] {
-            let mut client = prefix_client(Some("data/".into()));
-            client.backend = Box::new(ListOnlyBackend(SourcePage {
-                is_truncated: true,
-                next_continuation_token: next.map(str::to_string),
-                ..Default::default()
-            }));
-            let error = client
-                .list_objects_v2(None, Some("stuck"), 2)
-                .await
-                .expect_err("all providers must advance pagination");
-            assert!(matches!(error, SourceError::InvalidPagination(actual) if actual == expected));
-        }
+        assert!(matches!(err, SourceError::Other(_)), "{err:?}");
    }

    const TAGGING_BODY: &str = r#"<?xml version="1.0" encoding="UTF-8"?>
@@ -1642,10 +1255,7 @@ mod tests {
    #[tokio::test]
    async fn source_error_classification_covers_every_class() {
        let cases: Vec<(Scripted, &str, bool)> = vec![
-            (status(404, ""), "other", false),
-            (status(404, "<Error><Code>NoSuchKey</Code></Error>"), "not_found", false),
-            (status(404, "<Error><Code>NoSuchBucket</Code></Error>"), "other", false),
-            (status(404, "<Error><Code>NoSuchVersion</Code></Error>"), "other", false),
+            (status(404, ""), "not_found", false),
            (status(403, ACCESS_DENIED_BODY), "access_denied", false),
            (status(401, ""), "access_denied", false),
            (status(429, ""), "throttled", true),
@@ -1668,35 +1278,14 @@ mod tests {
            }
        }

-        let (client, requests) = scripted_client(&spec(None), vec![status(404, ""), status(200, "")]).await;
+        // HEAD carries no error body, so the classification must work from the
+        // status alone as well.
+        let (client, _) = scripted_client(&spec(None), vec![status(404, "")]).await;
        assert!(matches!(client.head_object("missing").await, Err(SourceError::NotFound)));
-        assert_eq!(recorded(&requests).len(), 2, "ambiguous HEAD 404 must check the bucket");
-        let (client, _) = scripted_client(&spec(None), vec![status(404, ""), status(404, "")]).await;
-        assert!(matches!(client.head_object("missing").await, Err(SourceError::Other(_))));
-        let (client, _) = scripted_client(&spec(None), vec![status(404, ""), status(403, "")]).await;
-        assert!(matches!(client.head_object("missing").await, Err(SourceError::AccessDenied)));
        let (client, _) = scripted_client(&spec(None), vec![status(403, "")]).await;
        assert!(matches!(client.head_object("secret").await, Err(SourceError::AccessDenied)));
    }

-    #[test]
-    fn source_listing_rejects_missing_and_negative_sizes() {
-        for size in [None, Some(-1)] {
-            let object = SdkObject::builder().key("key").set_size(size).build();
-            assert!(matches!(s3_source_object(object), Err(SourceError::Other(_))));
-        }
-        assert!(matches!(
-            s3_source_object(SdkObject::builder().size(0).build()),
-            Err(SourceError::Other(_))
-        ));
-        assert_eq!(
-            s3_source_object(SdkObject::builder().key("empty").size(0).build())
-                .expect("empty object")
-                .size,
-            0
-        );
-    }
-
    #[tokio::test]
    async fn source_client_debug_redacts_credentials() {
        let (client, _) = scripted_client(&spec(Some("data/")), Vec::new()).await;
@@ -1763,114 +1352,16 @@ mod tests {
        assert_eq!(resolve_path_style(PathStyle::VirtualHost, Minio, "10.0.0.1"), PathStyle::VirtualHost);
        assert_eq!(resolve_path_style(PathStyle::Path, Aws, "s3.amazonaws.com"), PathStyle::Path);
        assert_eq!(SourceProvider::from_label(" AWS "), Some(Aws));
-        assert_eq!(SourceProvider::from_label(" Azure "), Some(Azure));
-        assert_eq!(SourceProvider::from_label("gcs_native"), Some(GcsNative));
-        assert_eq!(SourceProvider::from_label("swift"), None);
-    }
-
-    const CONTRACT_LIST_PAGE_ONE: &str = r#"<?xml version="1.0" encoding="UTF-8"?>
-<ListBucketResult xmlns="http://s3.amazonaws.com/doc/2006-03-01/">
-  <Name>source-bucket</Name>
-  <IsTruncated>true</IsTruncated>
-  <NextContinuationToken>cursor-1</NextContinuationToken>
-  <Contents>
-    <Key>dir/a.txt</Key>
-    <LastModified>2015-10-21T07:28:00.000Z</LastModified>
-    <ETag>&quot;5d41402abc4b2a76b9719d911017c592&quot;</ETag>
-    <Size>5</Size>
-    <StorageClass>STANDARD</StorageClass>
-  </Contents>
-  <CommonPrefixes><Prefix>dir/sub/</Prefix></CommonPrefixes>
-</ListBucketResult>"#;
-
-    const CONTRACT_LIST_PAGE_TWO: &str = r#"<?xml version="1.0" encoding="UTF-8"?>
-<ListBucketResult xmlns="http://s3.amazonaws.com/doc/2006-03-01/">
-  <Name>source-bucket</Name>
-  <IsTruncated>false</IsTruncated>
-  <Contents>
-    <Key>dir/b.txt</Key>
-    <LastModified>2015-10-21T07:28:00.000Z</LastModified>
-    <ETag>&quot;7d41402abc4b2a76b9719d911017c592&quot;</ETag>
-    <Size>7</Size>
-  </Contents>
-</ListBucketResult>"#;
-
-    const CONTRACT_TAGGING: &str = r#"<?xml version="1.0" encoding="UTF-8"?>
-<Tagging xmlns="http://s3.amazonaws.com/doc/2006-03-01/"><TagSet>
-  <Tag><Key>env</Key><Value>prod</Value></Tag>
-</TagSet></Tagging>"#;
-
-    fn contract_object_headers(content_length: u64) -> Vec<(&'static str, String)> {
-        vec![
-            ("etag", format!("\"{OBJECT_MD5}\"")),
-            ("content-length", content_length.to_string()),
-            ("content-type", "text/plain".to_string()),
-            ("last-modified", "Wed, 21 Oct 2015 07:28:00 GMT".to_string()),
-            ("x-amz-meta-owner", "alice".to_string()),
-            ("x-amz-storage-class", "STANDARD".to_string()),
-        ]
-    }
-
-    /// The S3 backend behind the scripted connector, without the prefix-mapping
-    /// client on top: the contract is a property of the backend itself.
-    async fn scripted_s3_backend(responses: Vec<Scripted>) -> S3SourceBackend {
-        let spec = spec(None);
-        let connector = SharedHttpConnector::new(ScriptedConnector {
-            requests: Arc::new(Mutex::new(Vec::new())),
-            responses: Arc::new(Mutex::new(responses.into_iter().collect())),
-        });
-        let http_client = http_client_fn(move |_settings, _components| connector.clone());
-        let endpoint = spec.endpoint_spec().expect("test spec endpoint should parse");
-        let config = build_remote_s3_config(&endpoint)
-            .await
-            .expect("test spec should build")
-            .http_client(http_client)
-            .interceptor(SourceProxyMarkerInterceptor::new());
-        S3SourceBackend {
-            client: S3Client::from_conf(config.build()),
-            bucket: spec.bucket.clone(),
-        }
-    }
-
-    #[tokio::test]
-    async fn s3_backend_satisfies_the_shared_backend_contract() {
-        let mut ranged = contract_object_headers(3);
-        ranged.push(("content-range", "bytes 1-3/5".to_string()));
-        let backend = scripted_s3_backend(vec![
-            ok(contract_object_headers(5), ""),
-            ok(contract_object_headers(5), "hello"),
-            ok(ranged, "ell"),
-            ok(Vec::new(), CONTRACT_LIST_PAGE_ONE),
-            ok(Vec::new(), CONTRACT_LIST_PAGE_TWO),
-            ok(Vec::new(), CONTRACT_TAGGING),
-            ok(Vec::new(), ""),
-            status(404, ""),
-            ok(Vec::new(), ""),
-            status(403, ACCESS_DENIED_BODY),
-        ])
-        .await;
-
-        assert_backend_contract(
-            &backend,
-            BackendCapabilities {
-                etag_is_opaque: false,
-                supports_start_after: true,
-                supports_tagging: true,
-            },
-        )
-        .await;
+        assert_eq!(SourceProvider::from_label("azure"), None);
    }

    fn prefix_client(prefix: Option<String>) -> SourceClient {
        SourceClient {
-            backend: Box::new(S3SourceBackend {
-                client: S3Client::from_conf(
-                    aws_sdk_s3::Config::builder()
-                        .behavior_version(aws_sdk_s3::config::BehaviorVersion::latest())
-                        .build(),
-                ),
-                bucket: "bucket".to_string(),
-            }),
+            client: S3Client::from_conf(
+                aws_sdk_s3::Config::builder()
+                    .behavior_version(aws_sdk_s3::config::BehaviorVersion::latest())
+                    .build(),
+            ),
            endpoint: "https://source.example.com".to_string(),
            bucket: "bucket".to_string(),
            source_prefix: prefix.filter(|prefix| !prefix.is_empty()),
@@ -177,7 +177,7 @@ impl From<&SourceError> for PullFailureReason {
            SourceError::Connect(_) => PullFailureReason::SourceConnect,
            SourceError::ServerError(_) => PullFailureReason::SourceServerError,
            SourceError::Unsupported(_) => PullFailureReason::SourceUnsupported,
-            SourceError::InvalidPagination(_) | SourceError::Other(_) => PullFailureReason::SourceOther,
+            SourceError::Other(_) => PullFailureReason::SourceOther,
        }
    }
 }
@@ -19,12 +19,13 @@
 //! [`SourceClient`], a circuit breaker, a negative cache, a per-key
 //! singleflight table, a pull concurrency limit and counters. Its lifecycle
 //! follows the bucket metadata cache through the publish hook registered in
-//! [`BUCKET_CONFIG_PUBLISH_HOOK`]; the hook fires on every cache install
+//! [`ON_DEMAND_MIGRATION_CONFIG_HOOK`]; the hook fires on every cache install
 //! path (initial load, admin update, peer reload, refresh loop, lazy load).
 //!
 //! Change detection compares the config by value (`PartialEq`) rather than
-//! by `updated_at`. The bucket incarnation is part of this comparison:
-//! recreating a bucket must cancel old work even with identical configuration.
+//! by `updated_at`: the hook does not carry the timestamp, fetching it would
+//! re-enter the metadata system from inside its own publish path, and a
+//! byte-identical config never needs a new client anyway.
 //!
 //! Client construction is async (TLS material may be read from disk), so
 //! the hook does not build inline: `publish` removes state synchronously and
@@ -40,19 +41,17 @@

 use super::backfill::{PriorityPullPermits, PullPermit, PullPriority};
 use super::breaker::{Breaker, BreakerState, BreakerTransition, BreakerVerdict};
-use super::config::{OnDemandMigrationConfig, PathStyle as ConfigPathStyle, Provider, SourceConfig};
+use super::config::{
+    ON_DEMAND_MIGRATION_CONFIG_HOOK, OnDemandMigrationConfig, PathStyle as ConfigPathStyle, Provider, SourceConfig,
+};
 use super::list_through::{SOURCE_LIST_RATE_PER_SEC, SourceListRateLimiter};
 use super::negative_cache::NegativeCache;
 use super::pull::{OdmWriteBack, PullQueue};
-use super::source_client::{
-    AzureAuth, AzureSourceSpec, GcsSourceSpec, SourceBackendSpec, SourceClient, SourceClientSpec, SourceError, SourceProvider,
-    SourceTimeouts,
-};
+use super::source_client::{SourceClient, SourceClientSpec, SourceError, SourceProvider, SourceTimeouts};
 use super::stats::{GaugeGuard, OdmStats, OdmStatsSnapshot, PullFailureReason};
-use super::storage_api::remote_s3_client::{
+use crate::bucket::remote_s3_client::{
    PathStyle as ClientPathStyle, RemoteCredentials, RemoteS3ClientError, RemoteS3RetryPolicy,
 };
-use super::storage_api::{BUCKET_CONFIG_PUBLISH_HOOK, BUCKET_ON_DEMAND_MIGRATION_CONFIG};
 use parking_lot::{Mutex, RwLock};
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
@@ -83,8 +82,6 @@ pub static GLOBAL_ON_DEMAND_MIGRATION_SYS: OnceLock<OnDemandMigrationSys> = Once
 /// `resolve` as [`OdmLookup::Unavailable`] and through status snapshots.
 #[derive(Clone, Debug, PartialEq, Eq, thiserror::Error)]
 pub enum OdmStateError {
-    #[error("the {0} backend is not included in this build")]
-    BackendNotCompiled(&'static str),
    /// `source.credentials` is `null`; the shared client builder has no
    /// anonymous mode yet (rustfs/backlog#2149 follow-up).
    #[error("anonymous source access is not supported yet; configure source credentials")]
@@ -269,7 +266,6 @@ impl Drop for InflightEntryGuard<'_> {
 /// config change (counters excepted), removed when the config goes away.
 pub struct BucketOdmState {
    bucket: String,
-    incarnation_id: uuid::Uuid,
    config: OnDemandMigrationConfig,
    applied_at: OffsetDateTime,
    endpoint_host: String,
@@ -307,24 +303,21 @@ impl BucketOdmState {
    async fn build(
        bucket: &str,
        config: &OnDemandMigrationConfig,
-        incarnation_id: uuid::Uuid,
        stats: Arc<OdmStats>,
        write_back: Option<Arc<dyn OdmWriteBack>>,
    ) -> Arc<Self> {
        let spec = source_client_spec(config);
-        let client = if config.source.credentials.is_none() && !config.source.provider.is_native() {
+        let client = if config.source.credentials.is_none() {
            Err(OdmStateError::AnonymousUnsupported)
        } else {
            SourceClient::new(&spec).await.map(Arc::new).map_err(|err| match err {
                RemoteS3ClientError::MissingCredentials => OdmStateError::AnonymousUnsupported,
-                RemoteS3ClientError::BackendNotCompiled(provider) => OdmStateError::BackendNotCompiled(provider),
                other => OdmStateError::ClientBuild(other.to_string()),
            })
        };
        let policy = &config.policy;
        Arc::new(Self {
            bucket: bucket.to_string(),
-            incarnation_id,
            endpoint_host: endpoint_host(&config.source),
            config: config.clone(),
            applied_at: OffsetDateTime::now_utc(),
@@ -342,18 +335,10 @@ impl BucketOdmState {
        })
    }

-    pub fn filter_incarnation(self: Arc<Self>, incarnation_id: uuid::Uuid) -> Option<Arc<Self>> {
-        (self.incarnation_id == incarnation_id && !self.is_cancelled()).then_some(self)
-    }
-
    pub fn bucket(&self) -> &str {
        &self.bucket
    }

-    pub fn incarnation_id(&self) -> uuid::Uuid {
-        self.incarnation_id
-    }
-
    pub fn config(&self) -> &OnDemandMigrationConfig {
        &self.config
    }
@@ -634,7 +619,6 @@ pub fn source_client_spec(config: &OnDemandMigrationConfig) -> SourceClientSpec
        // load on a source that is already failing.
        retry: RemoteS3RetryPolicy::Disabled,
        bandwidth_limit: policy.bandwidth_limit_bytes_per_sec.and_then(NonZeroU64::new),
-        backend: source_backend_spec(source),
    }
 }

@@ -646,31 +630,6 @@ fn source_provider(provider: Provider) -> SourceProvider {
        Provider::Rustfs => SourceProvider::Rustfs,
        Provider::R2 => SourceProvider::R2,
        Provider::Gcs => SourceProvider::Gcs,
-        Provider::Azure => SourceProvider::Azure,
-        Provider::GcsNative => SourceProvider::GcsNative,
-    }
-}
-
-/// Which backend the client builds. A native provider whose block is missing
-/// falls back to the S3 spec, where the builder reports the missing
-/// credentials: the config layer already refuses to store that shape, so this
-/// only covers a config written by an older or hand-edited build.
-pub fn source_backend_spec(source: &SourceConfig) -> SourceBackendSpec {
-    match (source.provider, source.azure.as_ref(), source.gcs.as_ref()) {
-        (Provider::Azure, Some(azure), _) => SourceBackendSpec::Azure(AzureSourceSpec {
-            account: azure.account.clone(),
-            auth: match (&azure.account_key, &azure.sas_token) {
-                (Some(key), _) => AzureAuth::SharedKey(key.clone()),
-                (None, Some(sas)) => AzureAuth::Sas(sas.clone()),
-                // Refused by `SourceConfig::validate`; an empty shared key
-                // fails closed at the builder rather than signing with none.
-                (None, None) => AzureAuth::SharedKey(String::new()),
-            },
-        }),
-        (Provider::GcsNative, _, Some(gcs)) => SourceBackendSpec::Gcs(GcsSourceSpec {
-            service_account_json: gcs.service_account_json.clone(),
-        }),
-        _ => SourceBackendSpec::S3,
    }
 }

@@ -749,51 +708,21 @@ impl OnDemandMigrationSys {
    /// Registers `publish` as the bucket-metadata publish hook. Returns
    /// `false` when a hook was already registered.
    pub fn register_config_hook(&'static self) -> bool {
-        BUCKET_CONFIG_PUBLISH_HOOK
-            .set(Box::new(move |bucket, config_file, stored| {
-                if config_file == BUCKET_ON_DEMAND_MIGRATION_CONFIG {
-                    self.publish_stored(bucket, stored.map(|(bytes, _, incarnation)| (bytes, incarnation)));
-                }
-            }))
+        ON_DEMAND_MIGRATION_CONFIG_HOOK
+            .set(Box::new(move |bucket, config| self.publish(bucket, config)))
            .is_ok()
    }

-    /// Corrupt persisted bytes withdraw state synchronously, just like deletion.
-    fn publish_stored(&'static self, bucket: &str, stored: Option<(&[u8], uuid::Uuid)>) {
-        let incarnation_id = stored.map(|(_, id)| id).unwrap_or_default();
-        match stored.map(|(bytes, _)| OnDemandMigrationConfig::from_json(bytes)).transpose() {
-            Ok(config) => self.publish_for_incarnation(bucket, incarnation_id, config.as_ref()),
-            Err(err) => {
-                warn!(
-                    event = EVENT_ODM_BUCKET_STATE_APPLIED,
-                    component = LOG_COMPONENT_ECSTORE,
-                    subsystem = LOG_SUBSYSTEM_ON_DEMAND_MIGRATION,
-                    result = "invalid",
-                    bucket = %bucket,
-                    error = %err,
-                    "Failed to parse on-demand migration config"
-                );
-                self.publish_for_incarnation(bucket, incarnation_id, None);
-            }
-        }
-    }
-
    /// Hook entry point: removals apply immediately, installs are spawned
    /// (client construction is async). Requires a Tokio runtime for the
    /// install path; without one the config is logged and skipped.
-    pub fn publish_for_incarnation(
-        &'static self,
-        bucket: &str,
-        incarnation_id: uuid::Uuid,
-        config: Option<&OnDemandMigrationConfig>,
-    ) {
-        let config = self.desired(config).filter(|_| !incarnation_id.is_nil());
-        let generation = self.reserve_generation(bucket, config.is_some());
-        let Some(config) = config else {
+    pub fn publish(&'static self, bucket: &str, config: Option<&OnDemandMigrationConfig>) {
+        let generation = self.next_generation();
+        let Some(config) = self.desired(config) else {
            self.remove_with_generation(bucket, generation);
            return;
        };
-        if self.is_unchanged(bucket, incarnation_id, config, generation) {
+        if self.is_unchanged(bucket, config, generation) {
            return;
        }
        let Ok(handle) = tokio::runtime::Handle::try_current() else {
@@ -812,49 +741,31 @@ impl OnDemandMigrationSys {
        let bucket = bucket.to_string();
        let config = config.clone();
        handle.spawn(async move {
-            self.apply_with_generation(&bucket, incarnation_id, Some(&config), generation)
-                .await;
+            self.apply_with_generation(&bucket, Some(&config), generation).await;
        });
    }

    /// Installs, rebuilds, or removes the bucket state for `config`.
    /// Idempotent: the same config on an installed bucket is a no-op.
-    #[cfg(test)]
    pub async fn apply(&self, bucket: &str, config: Option<&OnDemandMigrationConfig>) -> ApplyOutcome {
-        self.apply_for_incarnation(bucket, uuid::Uuid::from_u128(1), config).await
-    }
-
-    #[cfg(test)]
-    pub fn publish(&'static self, bucket: &str, config: Option<&OnDemandMigrationConfig>) {
-        self.publish_for_incarnation(bucket, uuid::Uuid::from_u128(1), config);
-    }
-
-    pub async fn apply_for_incarnation(
-        &self,
-        bucket: &str,
-        incarnation_id: uuid::Uuid,
-        config: Option<&OnDemandMigrationConfig>,
-    ) -> ApplyOutcome {
-        let config = self.desired(config).filter(|_| !incarnation_id.is_nil());
-        let generation = self.reserve_generation(bucket, config.is_some());
-        self.apply_with_generation(bucket, incarnation_id, config, generation).await
+        let generation = self.next_generation();
+        self.apply_with_generation(bucket, config, generation).await
    }

    async fn apply_with_generation(
        &self,
        bucket: &str,
-        incarnation_id: uuid::Uuid,
        config: Option<&OnDemandMigrationConfig>,
        generation: u64,
    ) -> ApplyOutcome {
        let Some(config) = self.desired(config) else {
            return self.remove_with_generation(bucket, generation);
        };
-        if self.is_unchanged(bucket, incarnation_id, config, generation) {
+        if self.is_unchanged(bucket, config, generation) {
            return ApplyOutcome::Unchanged;
        }
        let stats = self.state(bucket).map(|state| Arc::clone(&state.stats)).unwrap_or_default();
-        let state = BucketOdmState::build(bucket, config, incarnation_id, stats, self.write_back()).await;
+        let state = BucketOdmState::build(bucket, config, stats, self.write_back()).await;

        let (outcome, previous) = {
            let mut buckets = self.buckets.write();
@@ -898,13 +809,12 @@ impl OnDemandMigrationSys {

    /// Removes a bucket's state (idempotent), cancelling its token.
    pub fn remove(&self, bucket: &str) -> ApplyOutcome {
-        let generation = self.reserve_generation(bucket, false);
+        let generation = self.next_generation();
        self.remove_with_generation(bucket, generation)
    }

    /// One-shot lookup: module switch, bucket state, prefix filter,
    /// client availability, negative cache, breaker, in that order.
-    #[cfg(test)]
    pub fn resolve(&self, bucket: &str, key: &str) -> Option<OdmLookup> {
        if !self.is_module_enabled() {
            return None;
@@ -912,13 +822,6 @@ impl OnDemandMigrationSys {
        self.state(bucket)?.resolve_key(key)
    }

-    pub fn resolve_for_incarnation(&self, bucket: &str, key: &str, incarnation_id: uuid::Uuid) -> Option<OdmLookup> {
-        if !self.is_module_enabled() {
-            return None;
-        }
-        self.state(bucket)?.filter_incarnation(incarnation_id)?.resolve_key(key)
-    }
-
    pub fn state(&self, bucket: &str) -> Option<Arc<BucketOdmState>> {
        self.buckets.read().get(bucket).and_then(|slot| slot.state.clone())
    }
@@ -947,17 +850,8 @@ impl OnDemandMigrationSys {
        snapshots
    }

-    fn reserve_generation(&self, bucket: &str, installing: bool) -> u64 {
-        // Reserve a desired install before its async client build, under the
-        // same lock that orders removals. Unconfigured buckets need no slot.
-        let mut buckets = self.buckets.write();
-        let generation = self.generation.fetch_add(1, Ordering::Relaxed) + 1;
-        if installing {
-            buckets.entry(bucket.to_string()).or_default().generation = generation;
-        } else if let Some(slot) = buckets.get_mut(bucket) {
-            slot.generation = generation;
-        }
-        generation
+    fn next_generation(&self) -> u64 {
+        self.generation.fetch_add(1, Ordering::Relaxed) + 1
    }

    fn desired<'c>(&self, config: Option<&'c OnDemandMigrationConfig>) -> Option<&'c OnDemandMigrationConfig> {
@@ -966,26 +860,15 @@ impl OnDemandMigrationSys {

    /// Claims `generation` for the bucket when the installed state already
    /// matches `config` and has a usable client.
-    fn is_unchanged(&self, bucket: &str, incarnation_id: uuid::Uuid, config: &OnDemandMigrationConfig, generation: u64) -> bool {
+    fn is_unchanged(&self, bucket: &str, config: &OnDemandMigrationConfig, generation: u64) -> bool {
        let mut buckets = self.buckets.write();
        let Some(slot) = buckets.get_mut(bucket) else {
            return false;
        };
-        if slot.generation > generation {
-            return false;
-        }
-        if slot
-            .state
-            .as_ref()
-            .is_some_and(|state| state.incarnation_id != incarnation_id)
-            && let Some(previous) = slot.state.take()
-        {
-            previous.cancel.cancel();
-        }
        let unchanged = slot
            .state
            .as_ref()
-            .is_some_and(|state| state.client.is_ok() && state.incarnation_id == incarnation_id && state.config == *config);
+            .is_some_and(|state| state.client.is_ok() && state.config == *config);
        if unchanged && slot.generation < generation {
            slot.generation = generation;
        }
@@ -1025,8 +908,8 @@ impl OnDemandMigrationSys {
 #[cfg(test)]
 mod tests {
    use super::*;
-    use crate::on_demand_migration::breaker::BREAKER_FAILURE_THRESHOLD;
-    use crate::on_demand_migration::config::{FilterConfig, PolicyConfig, SourceCredentials, SourceTimeout, TlsConfig};
+    use crate::bucket::on_demand_migration::breaker::BREAKER_FAILURE_THRESHOLD;
+    use crate::bucket::on_demand_migration::config::{FilterConfig, PolicyConfig, SourceCredentials, SourceTimeout, TlsConfig};
    use std::sync::atomic::AtomicUsize;
    use tokio::sync::Barrier;

@@ -1046,8 +929,6 @@ mod tests {
                    session_token: None,
                }),
                tls: TlsConfig::default(),
-                azure: None,
-                gcs: None,
            },
            filter: FilterConfig {
                prefix: prefix.map(str::to_string),
@@ -1164,45 +1045,6 @@ mod tests {
        assert_eq!(sys.apply("b", Some(&cfg)).await, ApplyOutcome::Rebuilt);
    }

-    #[tokio::test]
-    async fn native_azure_uses_provider_credentials_without_s3_credentials() {
-        let sys = enabled_sys();
-        let mut cfg = config(None);
-        cfg.source.provider = Provider::Azure;
-        cfg.source.endpoint = None;
-        cfg.source.credentials = None;
-        cfg.source.azure = Some(super::super::config::AzureSourceConfig {
-            account: "legacyaccount".to_string(),
-            account_key: Some("c2VjcmV0LWtleQ==".to_string()),
-            sas_token: None,
-        });
-        assert_eq!(sys.apply("b", Some(&cfg)).await, ApplyOutcome::Installed);
-        let state = ready_state(sys.resolve("b", "k"));
-        assert!(state.client().is_ok(), "native credentials must not be classified as anonymous S3");
-    }
-
-    #[cfg(not(feature = "gcs"))]
-    #[tokio::test]
-    async fn gcs_backend_not_compiled_is_unavailable_not_anonymous() {
-        let sys = enabled_sys();
-        let mut cfg = config(None);
-        cfg.source.provider = Provider::GcsNative;
-        cfg.source.credentials = None;
-        cfg.source.gcs = Some(super::super::config::GcsSourceConfig {
-            service_account_json: "{}".to_string(),
-        });
-        let encoded = cfg.to_json().expect("GCS config is serializable without the backend");
-        let restored: OnDemandMigrationConfig = serde_json::from_slice(&encoded).expect("GCS config stays readable");
-        assert_eq!(restored, cfg);
-        assert_eq!(sys.apply("b", Some(&cfg)).await, ApplyOutcome::Installed);
-        match sys.resolve("b", "k") {
-            Some(OdmLookup::Unavailable { error, .. }) => {
-                assert_eq!(error, OdmStateError::BackendNotCompiled("gcs_native"));
-            }
-            other => panic!("expected unavailable backend, got {other:?}"),
-        }
-    }
-
    #[tokio::test(flavor = "multi_thread", worker_threads = 4)]
    async fn singleflight_admits_one_leader_per_key() {
        let sys = enabled_sys();
@@ -1418,128 +1260,24 @@ mod tests {
        assert!(state.is_cancelled());
    }

-    #[tokio::test]
-    async fn identical_config_on_recreated_bucket_cancels_old_state() {
-        let sys = enabled_sys();
-        let cfg = config(None);
-        let old_id = uuid::Uuid::new_v4();
-        let new_id = uuid::Uuid::new_v4();
-        sys.apply_for_incarnation("recreated", old_id, Some(&cfg)).await;
-        let old = sys.state("recreated").expect("old state installed");
-        assert!(sys.resolve_for_incarnation("recreated", "key", new_id).is_none());
-        sys.apply_for_incarnation("recreated", new_id, Some(&cfg)).await;
-        let replacement = sys.state("recreated").expect("replacement state installed");
-        assert!(old.is_cancelled());
-        assert!(!Arc::ptr_eq(&old, &replacement));
-        assert_eq!(replacement.incarnation_id(), new_id);
-        assert!(sys.resolve_for_incarnation("recreated", "key", old_id).is_none());
-        assert!(sys.resolve_for_incarnation("recreated", "key", new_id).is_some());
-    }
-
-    #[tokio::test]
-    async fn changed_delete_marker_policy_withdraws_the_captured_lookup() {
-        let sys = enabled_sys();
-        let incarnation = uuid::Uuid::new_v4();
-        let mut cfg = config(None);
-        cfg.policy.respect_local_delete_marker = false;
-        sys.apply_for_incarnation("policy-snapshot", incarnation, Some(&cfg)).await;
-        let captured = sys.state("policy-snapshot").expect("policy A installed");
-        assert!(!captured.config().policy.respect_local_delete_marker);
-
-        cfg.policy.respect_local_delete_marker = true;
-        sys.apply_for_incarnation("policy-snapshot", incarnation, Some(&cfg)).await;
-        let replacement = sys.state("policy-snapshot").expect("policy B installed");
-        assert!(replacement.config().policy.respect_local_delete_marker);
-        assert!(captured.is_cancelled());
-        assert!(
-            captured
-                .filter_incarnation(incarnation)
-                .and_then(|state| state.resolve_key("key"))
-                .is_none(),
-            "a request that evaluated policy A cannot continue through policy B"
-        );
-        assert!(
-            replacement
-                .clone()
-                .filter_incarnation(incarnation)
-                .and_then(|state| state.resolve_key("key"))
-                .is_some()
-        );
-        assert_eq!(
-            replacement
-                .stats()
-                .snapshot(replacement.breaker().state())
-                .source_latency
-                .count,
-            0
-        );
-    }
-
-    #[tokio::test]
-    async fn missing_incarnation_cannot_install_or_retain_source_state() {
-        let sys: &'static OnDemandMigrationSys = Box::leak(Box::new(enabled_sys()));
-        let cfg = config(None);
-        assert_eq!(
-            sys.apply_for_incarnation("missing", uuid::Uuid::nil(), Some(&cfg)).await,
-            ApplyOutcome::NotDesired
-        );
-        sys.publish_for_incarnation("missing", uuid::Uuid::nil(), Some(&cfg));
-        assert!(sys.state("missing").is_none());
-
-        sys.apply_for_incarnation("missing", uuid::Uuid::new_v4(), Some(&cfg)).await;
-        let state = sys.state("missing").expect("valid identity installed");
-        sys.publish_for_incarnation("missing", uuid::Uuid::nil(), Some(&cfg));
-        assert!(sys.state("missing").is_none());
-        assert!(state.is_cancelled());
-    }
-
-    #[tokio::test]
-    async fn corrupt_stored_config_withdraws_runtime_state() {
-        let sys: &'static OnDemandMigrationSys = Box::leak(Box::new(enabled_sys()));
-        let cfg = config(None);
-        assert_eq!(sys.apply("corrupt", Some(&cfg)).await, ApplyOutcome::Installed);
-        let state = sys.state("corrupt").expect("state installed");
-        sys.publish_stored("corrupt", Some((b"not-json", uuid::Uuid::from_u128(1))));
-        assert!(sys.state("corrupt").is_none(), "corruption cannot keep an older source active");
-        assert!(state.is_cancelled(), "corruption cancels in-flight work");
-    }
-
-    #[tokio::test]
-    async fn absent_config_updates_do_not_allocate_bucket_slots() {
-        let sys = enabled_sys();
-        for index in 0..1000 {
-            let bucket = format!("unconfigured-{index}");
-            assert_eq!(sys.apply(&bucket, None).await, ApplyOutcome::NotDesired);
-            assert_eq!(sys.remove(&bucket), ApplyOutcome::NotDesired);
-        }
-        assert!(sys.buckets.read().is_empty(), "unconfigured buckets must not accumulate tombstones");
-    }
-
    #[tokio::test]
    async fn stale_install_cannot_overwrite_a_later_removal() {
        let sys = enabled_sys();
        let cfg = config(None);
-        let older = sys.reserve_generation("b", true);
-        let newer = sys.reserve_generation("b", false);
+        let older = sys.next_generation();
+        let newer = sys.next_generation();
        assert_eq!(sys.remove_with_generation("b", newer), ApplyOutcome::NotDesired);
-        assert_eq!(
-            sys.apply_with_generation("b", uuid::Uuid::from_u128(1), Some(&cfg), older)
-                .await,
-            ApplyOutcome::Superseded
-        );
-        assert!(sys.state("b").is_none(), "removal must supersede an in-flight first install");
+        // The removal above did not create a slot; simulate an install that
+        // started before it and finishes after.
+        sys.apply_with_generation("b", Some(&cfg), older).await;
+        assert!(sys.state("b").is_some(), "no slot yet, so the older install lands");

-        assert_eq!(sys.apply("b", Some(&cfg)).await, ApplyOutcome::Installed);
        let installed = sys.state("b").unwrap();
-        let older = sys.reserve_generation("b", true);
-        let newer = sys.reserve_generation("b", false);
+        let older = sys.next_generation();
+        let newer = sys.next_generation();
        assert_eq!(sys.remove_with_generation("b", newer), ApplyOutcome::Removed);
        assert!(installed.is_cancelled());
-        assert_eq!(
-            sys.apply_with_generation("b", uuid::Uuid::from_u128(1), Some(&cfg), older)
-                .await,
-            ApplyOutcome::Superseded
-        );
+        assert_eq!(sys.apply_with_generation("b", Some(&cfg), older).await, ApplyOutcome::Superseded);
        assert!(sys.state("b").is_none(), "the stale install is discarded");
    }

@@ -180,8 +180,6 @@ impl RemoteS3EndpointSpec {

 #[derive(Debug, thiserror::Error)]
 pub enum RemoteS3ClientError {
-    #[error("the {0} backend is not included in this build")]
-    BackendNotCompiled(&'static str),
    #[error("remote endpoint requires credentials")]
    MissingCredentials,
    #[error("{0}")]
@@ -283,7 +281,9 @@ impl Intercept for UserAgentSuffixInterceptor {

 /// Builds the SDK config for `spec` without finalizing it, so callers can add
 /// interceptors or (in tests) swap the HTTP client before `build()`.
-pub async fn build_remote_s3_config(spec: &RemoteS3EndpointSpec) -> Result<aws_sdk_s3::config::Builder, RemoteS3ClientError> {
+pub(crate) async fn build_remote_s3_config(
+    spec: &RemoteS3EndpointSpec,
+) -> Result<aws_sdk_s3::config::Builder, RemoteS3ClientError> {
    let Some(credentials) = &spec.credentials else {
        return Err(RemoteS3ClientError::MissingCredentials);
    };
@@ -523,7 +523,7 @@ fn validate_ca_pem_bundle(ca_cert_pem: &[u8]) -> Result<(), String> {
    Ok(())
 }

-pub fn validate_target_ca_pem(ca_cert_pem: &str) -> Result<(), RemoteS3ClientError> {
+pub(crate) fn validate_target_ca_pem(ca_cert_pem: &str) -> Result<(), RemoteS3ClientError> {
    validate_ca_pem_bundle(ca_cert_pem.as_bytes()).map_err(RemoteS3ClientError::InvalidCaPem)
 }

@@ -652,10 +652,9 @@ async fn build_aws_s3_http_client_from_tls_path() -> Option<SharedHttpClient> {
 #[cfg(test)]
 mod tests {
    use super::*;
-    use aws_smithy_async::time::TimeSource;
    use aws_smithy_runtime_api::http::StatusCode as SmithyStatusCode;
    use std::sync::Mutex;
-    use std::sync::atomic::{AtomicU64, AtomicUsize, Ordering};
+    use std::sync::atomic::{AtomicUsize, Ordering};

    fn spec(endpoint: &str, secure: bool) -> RemoteS3EndpointSpec {
        RemoteS3EndpointSpec {
@@ -825,174 +824,6 @@ mod tests {
        );
    }

-    #[derive(Clone, Debug)]
-    struct ClockSkewTimeSource(Arc<AtomicU64>);
-
-    impl TimeSource for ClockSkewTimeSource {
-        fn now(&self) -> SystemTime {
-            SystemTime::UNIX_EPOCH + Duration::from_secs(self.0.load(Ordering::SeqCst))
-        }
-    }
-
-    #[derive(Clone, Debug)]
-    struct ClockSkewConnector {
-        request_headers: RecordedHeaders,
-        error_code: &'static str,
-        skew_seconds: i64,
-        clock: ClockSkewTimeSource,
-    }
-
-    fn recorded_header<'a>(headers: &'a [(String, String)], name: &str) -> &'a str {
-        headers
-            .iter()
-            .find(|(key, _)| key.eq_ignore_ascii_case(name))
-            .map(|(_, value)| value.as_str())
-            .unwrap_or_else(|| panic!("signed request must contain {name}"))
-    }
-
-    fn signing_time(headers: &[(String, String)]) -> chrono::NaiveDateTime {
-        chrono::NaiveDateTime::parse_from_str(recorded_header(headers, "x-amz-date"), "%Y%m%dT%H%M%SZ")
-            .expect("SDK signing timestamp must use the SigV4 format")
-    }
-
-    impl SmithyHttpConnector for ClockSkewConnector {
-        fn call(&self, request: HttpRequest) -> HttpConnectorFuture {
-            let mut headers = self.request_headers.lock().expect("clock skew request capture lock");
-            assert!(headers.len() < 3, "clock skew fixture must not exceed two GET attempts and one HEAD");
-            headers.push(
-                request
-                    .headers()
-                    .iter()
-                    .map(|(key, value)| (key.to_string(), value.to_string()))
-                    .collect(),
-            );
-            let server_time = chrono::DateTime::<chrono::Utc>::from(self.clock.now()).naive_utc()
-                + chrono::Duration::seconds(self.skew_seconds);
-            let (status, body) = if headers.len() == 1 {
-                (
-                    403,
-                    format!("<Error><Code>{}</Code><Message>Clock skew fixture</Message></Error>", self.error_code),
-                )
-            } else {
-                (200, String::new())
-            };
-            let response = http::Response::builder()
-                .status(status)
-                .header("date", server_time.format("%a, %d %b %Y %H:%M:%S GMT").to_string())
-                .header("content-type", "application/xml")
-                .header("content-length", body.len())
-                .body(SdkBody::from(body))
-                .expect("clock skew fixture response");
-            HttpConnectorFuture::ready(Ok(HttpResponse::try_from(response).expect("Smithy fixture response")))
-        }
-    }
-
-    async fn clock_skew_client(
-        error_code: &'static str,
-        skew_seconds: i64,
-        retry: RemoteS3RetryPolicy,
-    ) -> (S3Client, RecordedHeaders, ClockSkewTimeSource) {
-        let headers: RecordedHeaders = Arc::new(Mutex::new(Vec::new()));
-        let clock = ClockSkewTimeSource(Arc::new(AtomicU64::new(1_700_000_000)));
-        let connector = SharedHttpConnector::new(ClockSkewConnector {
-            request_headers: Arc::clone(&headers),
-            error_code,
-            skew_seconds,
-            clock: clock.clone(),
-        });
-        let mut spec = spec("s3.example.com", true);
-        spec.retry = retry;
-        let config = build_remote_s3_config(&spec)
-            .await
-            .expect("clock skew fixture uses the production outbound configuration")
-            .http_client(http_client_fn(move |_settings, _components| connector.clone()))
-            .time_source(clock.clone())
-            .build();
-        (S3Client::from_conf(config), headers, clock)
-    }
-
-    #[tokio::test(start_paused = true)]
-    async fn remote_s3_clock_skew_retries_resign_and_seed_next_operation() {
-        for error_code in ["RequestTimeTooSkewed", "SignatureDoesNotMatch"] {
-            for skew_seconds in [-600, 600] {
-                let (client, headers, clock) = clock_skew_client(error_code, skew_seconds, REPLICATION_TARGET_RETRY_POLICY).await;
-                let initial = chrono::DateTime::<chrono::Utc>::from(clock.now()).naive_utc();
-                client
-                    .get_object()
-                    .bucket("bucket")
-                    .key("object")
-                    .send()
-                    .await
-                    .expect("clock skew GET must retry successfully");
-                assert_eq!(
-                    headers.lock().expect("captured requests").len(),
-                    2,
-                    "{error_code}: GET needs exactly one retry"
-                );
-                clock.0.fetch_add(17, Ordering::SeqCst);
-                // SDK signing time is independent of Tokio's retry/scheduler clock.
-                tokio::time::advance(Duration::from_secs(61)).await;
-                client
-                    .head_bucket()
-                    .bucket("bucket")
-                    .send()
-                    .await
-                    .expect("subsequent HEAD must use the client's cached skew");
-                let headers = headers.lock().expect("captured signed requests");
-                assert_eq!(headers.len(), 3, "subsequent operation must succeed on its first attempt");
-                assert_eq!(signing_time(&headers[0]), initial, "the first attempt must use the injected clock");
-                assert_eq!(
-                    signing_time(&headers[1]),
-                    initial + chrono::Duration::seconds(skew_seconds),
-                    "{error_code}: retry must apply the measured offset exactly"
-                );
-                assert_eq!(
-                    signing_time(&headers[2]),
-                    initial + chrono::Duration::seconds(skew_seconds + 17),
-                    "{error_code}: the next operation must apply cached skew to the advanced signing clock"
-                );
-                let signature = |index: usize| {
-                    recorded_header(&headers[index], "authorization")
-                        .rsplit_once("Signature=")
-                        .expect("SigV4 authorization contains a signature")
-                        .1
-                };
-                assert_ne!(
-                    signature(0),
-                    signature(1),
-                    "{error_code}: retry must be signed again after adjusting its date"
-                );
-            }
-        }
-    }
-
-    #[tokio::test(start_paused = true)]
-    async fn remote_s3_clock_skew_respects_one_attempt_policy() {
-        use aws_smithy_types::error::metadata::ProvideErrorMetadata;
-
-        for error_code in ["RequestTimeTooSkewed", "SignatureDoesNotMatch"] {
-            for retry in [
-                RemoteS3RetryPolicy::Disabled,
-                RemoteS3RetryPolicy::Standard { max_attempts: 1 },
-            ] {
-                let (client, headers, _clock) = clock_skew_client(error_code, 600, retry).await;
-                let error = client
-                    .get_object()
-                    .bucket("bucket")
-                    .key("object")
-                    .send()
-                    .await
-                    .expect_err("clock skew must not override the caller's one-attempt budget");
-                assert_eq!(error.as_service_error().and_then(ProvideErrorMetadata::code), Some(error_code));
-                assert_eq!(
-                    headers.lock().expect("captured requests").len(),
-                    1,
-                    "{error_code}: {retry:?} must send exactly one request"
-                );
-            }
-        }
-    }
-
    #[test]
    fn path_style_auto_and_path_force_path_style() {
        assert!(PathStyle::Auto.force_path_style());
@@ -20,9 +20,9 @@ pub use rustfs_replication::{
 pub(crate) use rustfs_replication::{
    ReplicationDeleteSource, ReplicationMultipartPartInput, ReplicationResyncTargetObject, delete_marker_purge_mrf_entry,
    delete_marker_purge_version_id, delete_replication_creates_marker, delete_replication_missing_source_decision,
-    delete_replication_object_opts, delete_replication_target_version_id, heal_uses_delete_replication_path,
-    is_object_lock_denied_delete, is_retryable_delete_replication_head_error, is_version_delete_replication,
-    replicate_delete_outcome, replication_etags_match, replication_multipart_complete_actual_size,
-    replication_multipart_part_plan, replication_single_put_size_error, resync_existing_delete_replication_info,
-    resync_target_for_object, should_retry_delete_marker_purge, single_part_replica_etag_mismatch,
+    delete_replication_object_opts, heal_uses_delete_replication_path, is_object_lock_denied_delete,
+    is_retryable_delete_replication_head_error, is_version_delete_replication, replicate_delete_outcome, replication_etags_match,
+    replication_multipart_complete_actual_size, replication_multipart_part_plan, replication_single_put_size_error,
+    resync_existing_delete_replication_info, resync_target_for_object, should_retry_delete_marker_purge,
+    single_part_replica_etag_mismatch, target_delete_version_id,
 };
@@ -46,7 +46,7 @@ use super::replication_storage_boundary::{
    HTTPPreconditions, ObjectInfo, ObjectOptions, ObjectToDelete, ReplicationDeletedObject, ReplicationObjectIO,
    ReplicationStorage,
 };
-use super::replication_target_boundary::{BucketTargetError, ReplicationTargetStore, replication_object_is_ssec_encrypted};
+use super::replication_target_boundary::{ReplicationTargetStore, replication_object_is_ssec_encrypted};
 use super::replication_versioning_boundary::ReplicationVersioningStore;
 use super::runtime_boundary as runtime_sources;
 use futures_util::stream::{self, StreamExt};
@@ -882,20 +882,6 @@ fn reconstructed_heal_delete_info(
 ) -> DeletedObjectReplicationInfo {
    let mut rstate = oi.replication_state();
    rstate.replicate_decision_str = dsc.to_string();
-    // The caller hands us a blank ObjectInfo (the source marker may already be
-    // gone), so the state above carries no target-assigned marker version ids.
-    // Restore them from the journal: `delete_marker_purge_version_id` must hit
-    // the id the target reported, not fall back to the source marker id, which
-    // a target that mints its own ids answers with an idempotent 204 that would
-    // acknowledge the intent while the real marker stays behind (backlog#2290).
-    // The corrupt flag rides along so a refusal stays a refusal after restart.
-    for (arn, version_id) in &entry.target_delete_marker_version_ids {
-        rstate
-            .target_delete_marker_version_ids
-            .entry(arn.clone())
-            .or_insert_with(|| version_id.clone());
-    }
-    rstate.target_delete_marker_version_ids_corrupt |= entry.target_delete_marker_version_ids_corrupt;

    let delete_marker_mtime = entry
        .delete_marker_mtime
@@ -3098,23 +3084,6 @@ pub async fn queue_replication_heal(bucket: &str, oi: ObjectInfo, retry_count: u

    let tgts = match ReplicationTargetStore::list_bucket_targets(bucket).await {
        Ok(targets) => Some(targets),
-        // A bucket whose persisted target configuration cannot be decoded has
-        // an unknown target set, not an empty one: scheduling against `None`
-        // here would drop every heal for it without a trace
-        // (rustfs/backlog#2282). Report it missed so the object is retried
-        // once the configuration is readable again.
-        Err(BucketTargetError::BucketRemoteTargetsUnreadable { .. }) => {
-            warn!(
-                event = EVENT_REPLICATION_CONFIG_LOOKUP_SKIPPED,
-                component = LOG_COMPONENT_ECSTORE,
-                subsystem = LOG_SUBSYSTEM_REPLICATION,
-                bucket,
-                reason = "target_config_unreadable",
-                "Bucket replication targets are unreadable; replication heal queue fails closed"
-            );
-
-            return ReplicationQueueAdmission::Missed;
-        }
        Err(err) => {
            debug!(
                event = EVENT_REPLICATION_CONFIG_LOOKUP_SKIPPED,
@@ -6615,87 +6584,4 @@ mod tests {
            replacement_data
        );
    }
-
-    /// backlog#2290: a delete-marker purge intent that survives a restart
-    /// through the MRF journal addresses the marker version the TARGET
-    /// assigned, exactly as the live watcher does (see the
-    /// `requires_delayed_purge` spawn). The journal carries the per-ARN ids
-    /// (`targetDeleteMarkerVersionIDs`) and replay restores them into the
-    /// reconstructed replication state; without that the replay would fall
-    /// back to the source marker id, which a target that mints its own ids
-    /// answers with an idempotent 204 — the entry would be acknowledged while
-    /// the real marker stayed behind.
-    #[test]
-    fn mrf_delete_marker_purge_replay_preserves_target_assigned_marker_version() {
-        use super::super::replication_object_decision_boundary::{delete_marker_purge_mrf_entry, delete_marker_purge_version_id};
-
-        let arn = "arn:minio:replication::generic-target:photos".to_string();
-        let source_marker = uuid::Uuid::new_v4();
-        let remote_marker = "remote-assigned-marker-version".to_string();
-
-        let live_oi = ObjectInfo {
-            bucket: "photos".to_string(),
-            name: "obj".to_string(),
-            version_id: Some(source_marker),
-            delete_marker: true,
-            ..Default::default()
-        };
-        let mut live_state = live_oi.replication_state();
-        live_state.replicate_decision_str = replicate_decision_for_admitted_targets(std::slice::from_ref(&arn)).to_string();
-        live_state
-            .target_delete_marker_version_ids
-            .insert(arn.clone(), remote_marker.clone());
-        let live = DeletedObjectReplicationInfo {
-            delete_object: ReplicationDeletedObject {
-                object_name: "obj".to_string(),
-                delete_marker: true,
-                delete_marker_version_id: Some(source_marker),
-                replication_state: Some(live_state),
-                ..Default::default()
-            },
-            bucket: "photos".to_string(),
-            ..Default::default()
-        };
-        assert_eq!(
-            delete_marker_purge_version_id(live.delete_object.replication_state.as_ref(), &arn, source_marker),
-            Some(Some(remote_marker.clone())),
-            "the live purge addresses the recorded target version"
-        );
-
-        // Watch window exhausted: persist the intent, restart, replay it.
-        let entry = delete_marker_purge_mrf_entry(&live, vec![arn.clone()]);
-        let replay_oi = ObjectInfo {
-            bucket: entry.bucket.clone(),
-            name: entry.object.clone(),
-            version_id: entry.version_id,
-            delete_marker: entry.delete_marker,
-            ..Default::default()
-        };
-        let dsc = replicate_decision_for_admitted_targets(&entry.target_arns);
-        let replayed = reconstructed_heal_delete_info(&entry, &replay_oi, &dsc);
-
-        assert_eq!(
-            delete_marker_purge_version_id(replayed.delete_object.replication_state.as_ref(), &arn, source_marker),
-            Some(Some(remote_marker)),
-            "the MRF replay must address the target-assigned marker version, not source marker {source_marker}"
-        );
-
-        // A refusal (inconsistent recorded ids) must stay a refusal across the
-        // journal round trip instead of degrading into the source-id fallback.
-        let mut refused = live;
-        refused
-            .delete_object
-            .replication_state
-            .as_mut()
-            .expect("state was set above")
-            .target_delete_marker_version_ids_corrupt = true;
-        let entry = delete_marker_purge_mrf_entry(&refused, vec![arn.clone()]);
-        assert!(entry.target_delete_marker_version_ids_corrupt);
-        let replayed = reconstructed_heal_delete_info(&entry, &replay_oi, &dsc);
-        assert_eq!(
-            delete_marker_purge_version_id(replayed.delete_object.replication_state.as_ref(), &arn, source_marker),
-            None,
-            "the MRF replay must keep refusing to guess when the recorded ids were inconsistent"
-        );
-    }
 }
@@ -32,11 +32,11 @@ use super::replication_msgp_boundary::ReplicationMsgpCodec;
 use super::replication_object_config::{ReplicationConfig, get_replication_config, must_replicate};
 use super::replication_object_decision_boundary::{
    MustReplicateOptions, ReplicationMultipartPartInput, delete_marker_purge_mrf_entry, delete_marker_purge_version_id,
-    delete_replication_creates_marker, delete_replication_target_version_id, heal_uses_delete_replication_path,
-    is_object_lock_denied_delete, is_retryable_delete_replication_head_error, is_version_delete_replication,
-    replicate_delete_outcome, replication_etags_match, replication_multipart_complete_actual_size,
-    replication_multipart_part_plan, replication_single_put_size_error, resync_existing_delete_replication_info,
-    should_retry_delete_marker_purge, single_part_replica_etag_mismatch,
+    delete_replication_creates_marker, heal_uses_delete_replication_path, is_object_lock_denied_delete,
+    is_retryable_delete_replication_head_error, is_version_delete_replication, replicate_delete_outcome, replication_etags_match,
+    replication_multipart_complete_actual_size, replication_multipart_part_plan, replication_single_put_size_error,
+    resync_existing_delete_replication_info, should_retry_delete_marker_purge, single_part_replica_etag_mismatch,
+    target_delete_version_id,
 };
 use super::replication_queue_boundary::{DeletedObjectReplicationInfo, ReplicationQueueAdmission};
 use super::replication_resync_boundary::ResyncStatusType;
@@ -2051,11 +2051,7 @@ pub(crate) async fn replicate_delete_with_outcome<S: ReplicationStorage>(

    let is_version_purge = is_version_delete_replication(&dobj.delete_object);

-    // The watcher exists to purge a replicated marker once the SOURCE marker
-    // vanishes. A version purge is that purge already (its failures reach the
-    // journal as a purge entry), so it must not spawn a second watcher that
-    // journals a duplicate intent (backlog#2290).
-    let requires_delayed_purge = should_retry_delete_marker_purge(&dobj.delete_object) && !is_version_purge;
+    let requires_delayed_purge = should_retry_delete_marker_purge(&dobj.delete_object);

    let (replication_status, prev_status) = if !is_version_purge {
        (
@@ -2765,6 +2761,12 @@ fn unavailable_delete_target_info(dobj: &DeletedObjectReplicationInfo, arn: &str
 }

 async fn replicate_delete_to_target(dobj: &DeletedObjectReplicationInfo, tgt_client: Arc<TargetClient>) -> ReplicatedTargetInfo {
+    let version_id = if let Some(version_id) = &dobj.delete_object.delete_marker_version_id {
+        version_id.to_owned()
+    } else {
+        dobj.delete_object.version_id.unwrap_or_default()
+    };
+
    let mut rinfo = dobj
        .delete_object
        .replication_state
@@ -2797,25 +2799,7 @@ async fn replicate_delete_to_target(dobj: &DeletedObjectReplicationInfo, tgt_cli
        return rinfo;
    }

-    // Purging a replicated delete marker addresses the version the target
-    // assigned (recorded when the marker was created there); see
-    // `delete_replication_target_version_id`. A corrupt record is a failure,
-    // not a guess: the entry stays visible until the metadata is repaired.
-    let Some(version_id) = delete_replication_target_version_id(&dobj.delete_object, &tgt_client.arn) else {
-        warn!(
-            event = EVENT_DELETE_MARKER_PURGE_FAILED,
-            component = LOG_COMPONENT_ECSTORE,
-            subsystem = LOG_SUBSYSTEM_REPLICATION_RESYNC,
-            bucket = tgt_client.bucket,
-            object = dobj.delete_object.object_name,
-            arn = %tgt_client.arn,
-            reason = "recorded_target_version_inconsistent",
-            "Replicated version purge refused: recorded target delete-marker version metadata is inconsistent"
-        );
-        rinfo.version_purge_status = VersionPurgeStatusType::Failed;
-        rinfo.error = Some("recorded target delete-marker version metadata is inconsistent".to_string());
-        return rinfo;
-    };
+    let version_id = target_delete_version_id(version_id, is_version_purge);

    if dobj.delete_object.delete_marker && dobj.delete_object.delete_marker_version_id.is_some() {
        match head_object_for_worker(
@@ -15,8 +15,7 @@
 use std::collections::HashMap;
 use std::sync::Arc;

-pub(crate) use crate::bucket::bucket_target_sys::BucketTargetError;
-use crate::bucket::bucket_target_sys::BucketTargetSys;
+use crate::bucket::bucket_target_sys::{BucketTargetError, BucketTargetSys};
 use aws_sdk_s3::operation::head_object::HeadObjectOutput;
 use aws_sdk_s3::types::{ObjectLockLegalHoldStatus, ObjectLockRetentionMode};
 use http::HeaderMap;
@@ -1,357 +0,0 @@
-// Copyright 2024 RustFS Team
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! Sealed remote credentials shared by the three stores that persist one
-//! (rustfs/backlog#2168): replication targets (`bucket-targets.json`), remote
-//! tiers (`tier-config.bin`) and on-demand migration sources
-//! (`on-demand-migration.json`).
-//!
-//! The design record is `docs/architecture/remote-credential-sealing-adr.md`.
-//! What this module owns: the versioned envelope, the encryption context that
-//! binds a ciphertext to the record owning it, the sealer registration point,
-//! and the fail-closed error type. What it deliberately does not own: any KMS
-//! call (ECStore does not depend on `rustfs-kms`; the binary installs a
-//! sealer, exactly like `ON_DEMAND_MIGRATION_CONFIG_HOOK` and the event
-//! dispatch hook in `crates/ecstore/src/services/event_notification.rs`), and
-//! any decision about which stored field a consumer writes.
-
-use async_trait::async_trait;
-use serde::{Deserialize, Serialize};
-use std::collections::BTreeMap;
-use std::fmt;
-use std::sync::{Arc, OnceLock};
-
-/// Envelope format this build writes. A reader accepts only versions it
-/// knows; an unknown version is a typed error, never a fallback.
-pub const SEALED_CREDENTIAL_VERSION: u8 = 1;
-
-/// Which store a sealed value belongs to. Part of the encryption context, so
-/// a ciphertext cannot be replayed into a different store.
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub enum SealedCredentialStore {
-    /// `bucket-targets.json` (replication and other bucket targets).
-    BucketTargets,
-    /// `tier-config.bin` (remote tiers).
-    TierConfig,
-    /// `on-demand-migration.json` (migration sources).
-    OnDemandMigration,
-}
-
-impl SealedCredentialStore {
-    pub fn as_str(self) -> &'static str {
-        match self {
-            SealedCredentialStore::BucketTargets => "bucket-targets",
-            SealedCredentialStore::TierConfig => "tier-config",
-            SealedCredentialStore::OnDemandMigration => "on-demand-migration",
-        }
-    }
-}
-
-/// Identity of the record a secret belongs to: the store, its owner (bucket
-/// name, tier name, or target ARN) and the field name. Rendered into the KMS
-/// encryption context so a ciphertext moved between buckets, tiers or fields
-/// fails to decrypt instead of silently authorizing a different remote.
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub struct SealScope {
-    pub store: SealedCredentialStore,
-    pub owner: String,
-    pub field: &'static str,
-}
-
-impl SealScope {
-    pub fn new(store: SealedCredentialStore, owner: impl Into<String>, field: &'static str) -> Self {
-        Self {
-            store,
-            owner: owner.into(),
-            field,
-        }
-    }
-
-    /// The encryption context handed to the sealer. Keys are stable: they are
-    /// part of the on-disk contract, because a ciphertext only decrypts under
-    /// the same context.
-    pub fn encryption_context(&self) -> BTreeMap<String, String> {
-        BTreeMap::from([
-            ("rustfs:store".to_string(), self.store.as_str().to_string()),
-            ("rustfs:owner".to_string(), self.owner.clone()),
-            ("rustfs:field".to_string(), self.field.to_string()),
-        ])
-    }
-}
-
-/// A sealed secret as persisted. `Debug` prints no ciphertext: a sealed value
-/// is not a secret, but it is noise in a log line and an operator reading one
-/// should see the key it is wrapped under, not the bytes.
-#[derive(Clone, Serialize, Deserialize, PartialEq, Eq)]
-pub struct SealedCredential {
-    /// Envelope version; see [`SEALED_CREDENTIAL_VERSION`].
-    pub v: u8,
-    /// KMS master key id the data key is wrapped under.
-    pub key_id: String,
-    /// Master key version, when the backend reports one. Carried so the KMS
-    /// re-wrap job (`docs/architecture/kms-bulk-rekey-contract.md`) can tell
-    /// stale envelopes apart; nothing here rotates on its own.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub key_version: Option<String>,
-    /// Algorithm label reported by the sealer, for forensics and migration.
-    pub alg: String,
-    /// Ciphertext blob as produced by the sealer, base64 (standard, padded)
-    /// in the JSON stores and raw inside the tier msgpack payload.
-    pub ct: String,
-}
-
-impl fmt::Debug for SealedCredential {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("SealedCredential")
-            .field("v", &self.v)
-            .field("key_id", &self.key_id)
-            .field("key_version", &self.key_version)
-            .field("alg", &self.alg)
-            .field("ct", &format_args!("<{} bytes sealed>", self.ct.len()))
-            .finish()
-    }
-}
-
-impl SealedCredential {
-    /// Rejects an envelope this build cannot read. Called before every
-    /// unseal so an unknown version fails here rather than inside a backend.
-    pub fn check_version(&self) -> Result<(), SealedCredentialError> {
-        if self.v == SEALED_CREDENTIAL_VERSION {
-            Ok(())
-        } else {
-            Err(SealedCredentialError::UnsupportedVersion(self.v))
-        }
-    }
-}
-
-/// Why a seal or unseal did not produce a usable value. Every variant is
-/// terminal for the record that carried it: a caller reports the remote as
-/// unusable, and never substitutes a default or empty credential.
-#[derive(Clone, Debug, PartialEq, Eq, thiserror::Error)]
-pub enum SealedCredentialError {
-    /// No sealer is installed: KMS is not configured, or the process has not
-    /// finished startup. Reading a sealed record is impossible here.
-    #[error("no credential sealer is installed")]
-    NoSealer,
-    /// The stored envelope is from a newer (or otherwise unknown) format.
-    #[error("unsupported sealed credential envelope version {0}")]
-    UnsupportedVersion(u8),
-    /// The stored bytes are not a well-formed envelope.
-    #[error("malformed sealed credential: {0}")]
-    Malformed(String),
-    /// The sealer refused: wrong encryption context, missing key, revoked
-    /// access, or a failed authentication tag.
-    #[error("sealed credential could not be unsealed: {0}")]
-    Kms(String),
-}
-
-/// The KMS-backed half, installed by the binary at startup.
-#[async_trait]
-pub trait CredentialSealer: Send + Sync + 'static {
-    /// Wraps `plaintext` under the scope's encryption context.
-    async fn seal(&self, plaintext: &str, scope: &SealScope) -> Result<SealedCredential, SealedCredentialError>;
-
-    /// Unwraps a stored envelope. Must fail when the envelope was sealed
-    /// under a different scope.
-    async fn unseal(&self, sealed: &SealedCredential, scope: &SealScope) -> Result<String, SealedCredentialError>;
-}
-
-static CREDENTIAL_SEALER: OnceLock<Arc<dyn CredentialSealer>> = OnceLock::new();
-
-/// Installs the process-wide sealer. Returns `false` when one is already
-/// installed, matching the other ECStore hooks.
-pub fn install_credential_sealer(sealer: Arc<dyn CredentialSealer>) -> bool {
-    CREDENTIAL_SEALER.set(sealer).is_ok()
-}
-
-/// The installed sealer, or `None` when KMS is not wired. Callers that only
-/// need to know whether sealing is possible use this; callers that must have
-/// it use [`seal_secret`] / [`unseal_secret`] and get the typed error.
-pub fn credential_sealer() -> Option<Arc<dyn CredentialSealer>> {
-    CREDENTIAL_SEALER.get().cloned()
-}
-
-/// Seals one secret field. Fails closed: without a sealer the caller must
-/// reject the write rather than persist the secret in clear text after the
-/// operator asked for sealing.
-pub async fn seal_secret(plaintext: &str, scope: &SealScope) -> Result<SealedCredential, SealedCredentialError> {
-    let sealer = credential_sealer().ok_or(SealedCredentialError::NoSealer)?;
-    sealer.seal(plaintext, scope).await
-}
-
-/// Unseals one secret field, rejecting an unknown envelope version first.
-pub async fn unseal_secret(sealed: &SealedCredential, scope: &SealScope) -> Result<String, SealedCredentialError> {
-    sealed.check_version()?;
-    let sealer = credential_sealer().ok_or(SealedCredentialError::NoSealer)?;
-    sealer.unseal(sealed, scope).await
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use parking_lot::Mutex;
-    use std::collections::BTreeMap;
-
-    fn encode_context(context: &BTreeMap<String, String>) -> String {
-        let ordered = context.iter().collect::<BTreeMap<_, _>>();
-        serde_json::to_string(&ordered).expect("context serializes")
-    }
-
-    /// Stands in for the KMS-backed sealer: records the context it was called
-    /// with, and refuses a ciphertext presented under a different one.
-    #[derive(Default)]
-    struct FakeSealer {
-        sealed_contexts: Mutex<Vec<BTreeMap<String, String>>>,
-    }
-
-    #[async_trait]
-    impl CredentialSealer for FakeSealer {
-        async fn seal(&self, plaintext: &str, scope: &SealScope) -> Result<SealedCredential, SealedCredentialError> {
-            let context = scope.encryption_context();
-            self.sealed_contexts.lock().push(context.clone());
-            let mut bound = encode_context(&context);
-            bound.push('|');
-            bound.push_str(plaintext);
-            Ok(SealedCredential {
-                v: SEALED_CREDENTIAL_VERSION,
-                key_id: "key-1".to_string(),
-                key_version: Some("3".to_string()),
-                alg: "AES-256-GCM".to_string(),
-                ct: base64_simd::STANDARD.encode_to_string(bound.as_bytes()),
-            })
-        }
-
-        async fn unseal(&self, sealed: &SealedCredential, scope: &SealScope) -> Result<String, SealedCredentialError> {
-            let raw = base64_simd::STANDARD
-                .decode_to_vec(sealed.ct.as_bytes())
-                .map_err(|err| SealedCredentialError::Malformed(err.to_string()))?;
-            let bound = String::from_utf8(raw).map_err(|err| SealedCredentialError::Malformed(err.to_string()))?;
-            let expected = encode_context(&scope.encryption_context());
-            bound
-                .strip_prefix(&expected)
-                .and_then(|rest| rest.strip_prefix('|'))
-                .map(str::to_string)
-                .ok_or_else(|| SealedCredentialError::Kms("encryption context mismatch".to_string()))
-        }
-    }
-
-    fn scope(owner: &str) -> SealScope {
-        SealScope::new(SealedCredentialStore::OnDemandMigration, owner, "secret_key")
-    }
-
-    #[tokio::test]
-    async fn seal_round_trips_and_binds_the_scope() {
-        let sealer = Arc::new(FakeSealer::default());
-        let sealed = sealer.seal("super-secret", &scope("photos")).await.expect("seal");
-        assert_eq!(sealed.v, SEALED_CREDENTIAL_VERSION);
-        assert_eq!(sealed.key_version.as_deref(), Some("3"));
-        assert_eq!(sealer.unseal(&sealed, &scope("photos")).await.expect("unseal"), "super-secret");
-
-        // The same ciphertext under another bucket must not unseal.
-        let err = sealer
-            .unseal(&sealed, &scope("other-bucket"))
-            .await
-            .expect_err("a ciphertext must not move between owners");
-        assert!(matches!(err, SealedCredentialError::Kms(_)), "{err}");
-
-        // Nor under another field of the same record.
-        let other_field = SealScope::new(SealedCredentialStore::OnDemandMigration, "photos", "session_token");
-        let err = sealer
-            .unseal(&sealed, &other_field)
-            .await
-            .expect_err("a ciphertext must not move between fields");
-        assert!(matches!(err, SealedCredentialError::Kms(_)), "{err}");
-
-        let contexts = sealer.sealed_contexts.lock();
-        assert_eq!(contexts.len(), 1);
-        assert_eq!(contexts[0]["rustfs:store"], "on-demand-migration");
-        assert_eq!(contexts[0]["rustfs:owner"], "photos");
-        assert_eq!(contexts[0]["rustfs:field"], "secret_key");
-    }
-
-    #[tokio::test]
-    async fn an_unknown_envelope_version_is_rejected_before_the_sealer_is_asked() {
-        let sealed = SealedCredential {
-            v: SEALED_CREDENTIAL_VERSION + 1,
-            key_id: "key-1".to_string(),
-            key_version: None,
-            alg: "AES-256-GCM".to_string(),
-            ct: "Zm9v".to_string(),
-        };
-        assert_eq!(
-            sealed.check_version().expect_err("a newer envelope must not be read"),
-            SealedCredentialError::UnsupportedVersion(SEALED_CREDENTIAL_VERSION + 1)
-        );
-        // The global helper reports the version, not "no sealer", even in a
-        // process where none is installed.
-        assert_eq!(
-            unseal_secret(&sealed, &scope("photos")).await.expect_err("version first"),
-            SealedCredentialError::UnsupportedVersion(SEALED_CREDENTIAL_VERSION + 1)
-        );
-    }
-
-    #[tokio::test]
-    async fn without_a_sealer_both_directions_fail_closed() {
-        // This test binary installs no sealer, so the global helpers must
-        // report NoSealer rather than fall back to clear text.
-        assert!(credential_sealer().is_none(), "no sealer is installed in unit tests");
-        assert_eq!(
-            seal_secret("super-secret", &scope("photos")).await.expect_err("seal"),
-            SealedCredentialError::NoSealer
-        );
-        let sealed = SealedCredential {
-            v: SEALED_CREDENTIAL_VERSION,
-            key_id: "key-1".to_string(),
-            key_version: None,
-            alg: "AES-256-GCM".to_string(),
-            ct: "Zm9v".to_string(),
-        };
-        assert_eq!(
-            unseal_secret(&sealed, &scope("photos")).await.expect_err("unseal"),
-            SealedCredentialError::NoSealer
-        );
-    }
-
-    #[test]
-    fn debug_and_serde_keep_the_on_disk_shape_stable() {
-        let sealed = SealedCredential {
-            v: 1,
-            key_id: "key-1".to_string(),
-            key_version: None,
-            alg: "AES-256-GCM".to_string(),
-            ct: "Zm9v".to_string(),
-        };
-        // key_version is omitted when absent, so an envelope from a backend
-        // without version history stays compact.
-        assert_eq!(
-            serde_json::to_string(&sealed).expect("serialize"),
-            r#"{"v":1,"key_id":"key-1","alg":"AES-256-GCM","ct":"Zm9v"}"#
-        );
-        let parsed: SealedCredential = serde_json::from_str(r#"{"v":1,"key_id":"key-1","alg":"AES-256-GCM","ct":"Zm9v"}"#)
-            .expect("an envelope without key_version parses");
-        assert_eq!(parsed, sealed);
-
-        let rendered = format!("{sealed:?}");
-        assert!(rendered.contains("key-1"), "{rendered}");
-        assert!(!rendered.contains("Zm9v"), "Debug must not print the ciphertext: {rendered}");
-    }
-
-    #[test]
-    fn a_malformed_envelope_is_a_typed_error() {
-        let err = serde_json::from_str::<SealedCredential>(r#"{"v":1,"key_id":"key-1"}"#)
-            .map_err(|err| SealedCredentialError::Malformed(err.to_string()))
-            .expect_err("a truncated envelope must not parse");
-        assert!(matches!(err, SealedCredentialError::Malformed(_)), "{err}");
-    }
-}
@@ -30,7 +30,6 @@ use rustfs_protos::{
    ChannelClass, create_new_channel, get_channel_for_class,
    proto_gen::node_service::{
        heal_control_service_client::HealControlServiceClient, node_service_client::NodeServiceClient,
-        scanner_control_service_client::ScannerControlServiceClient,
        tier_mutation_control_service_client::TierMutationControlServiceClient,
    },
 };
@@ -61,24 +60,6 @@ pub async fn node_service_time_out_client(
    node_service_time_out_client_for_class(addr, interceptor, ChannelClass::Control).await
 }

-pub(crate) async fn scanner_control_time_out_client(
-    addr: &str,
-    interceptor: TonicInterceptor,
-) -> crate::error::Result<ScannerControlServiceClient<InterceptedService<AuthenticatedChannel, TonicInterceptor>>> {
-    let interceptor = interceptor.with_rpc_audience(addr)?;
-    let channel = match runtime_sources::cached_node_channel(addr).await {
-        Some(channel) => channel,
-        None => create_new_channel(addr)
-            .await
-            .map_err(|err| crate::error::Error::other(err.to_string()))?,
-    };
-    let channel = ReplayScopeChannel::new(channel, interceptor.replay_scope_audience());
-    let limit = rustfs_protos::scoped_dirty_usage::SCOPED_DIRTY_USAGE_MAX_REQUEST_BYTES as usize;
-    Ok(ScannerControlServiceClient::with_interceptor(channel, interceptor)
-        .max_decoding_message_size(limit)
-        .max_encoding_message_size(limit))
-}
-
 pub async fn heal_control_time_out_client(
    addr: &str,
    interceptor: TonicInterceptor,
@@ -2050,53 +2050,6 @@ impl PeerRestClient {
        .await
    }

-    /// Probe only: scoped ACK production requires a durable per-bucket proof.
-    pub async fn scanner_scoped_dirty_usage_capability(
-        &self,
-        owner_id: String,
-        instance_id: String,
-        entries: Vec<rustfs_protos::proto_gen::node_service::ScannerScopedDirtyUsageEntry>,
-    ) -> Result<bool> {
-        use rustfs_protos::scoped_dirty_usage::*;
-        let payload = rustfs_protos::proto_gen::node_service::ScannerScopedDirtyUsageAckRequest {
-            challenge: Uuid::new_v4().as_bytes().to_vec().into(),
-            protocol_version: SCOPED_DIRTY_USAGE_PROTOCOL_VERSION,
-            owner_id,
-            instance_id,
-            scope: SCOPED_DIRTY_USAGE_BUCKET_SCOPE,
-            probe_only: true,
-            entries,
-        };
-        let canonical = canonical_scoped_dirty_usage_request(&payload).map_err(|err| Error::other(err.to_string()))?;
-        self.finalize_result(
-            async {
-                let mut client = super::client::scanner_control_time_out_client(
-                    &self.grid_host,
-                    TonicInterceptor::Signature(gen_tonic_signature_interceptor()),
-                )
-                .await?;
-                let mut request = Request::new(payload.clone());
-                set_tonic_canonical_body_digest(&mut request, &canonical)?;
-                let response = client.scanner_scoped_dirty_usage_ack(request).await?.into_inner();
-                let body = canonical_scoped_dirty_usage_response(&canonical, &response)
-                    .map_err(|_| Error::other("scoped dirty usage capability response is too large"))?;
-                verify_tonic_rpc_response_proof(&body, response.response_proof.as_ref())?;
-                if response.protocol_version != SCOPED_DIRTY_USAGE_PROTOCOL_VERSION
-                    || response.owner_id != payload.owner_id
-                    || response.instance_id != payload.instance_id
-                    || response.max_entries != SCOPED_DIRTY_USAGE_MAX_ENTRIES
-                    || response.max_request_bytes != SCOPED_DIRTY_USAGE_MAX_REQUEST_BYTES
-                    || response.cleared != 0
-                {
-                    return Err(Error::other("scoped dirty usage capability response does not match request"));
-                }
-                Ok(response.supported)
-            }
-            .await,
-        )
-        .await
-    }
-
    pub async fn acknowledge_scanner_dirty_usage(&self, instance_id: String, generation: u64) -> Result<ScannerPeerActivity> {
        let result = self
            .scanner_activity_request_with_protocol(instance_id.clone(), generation, SCANNER_ACTIVITY_PROTOCOL_VERSION)
@@ -5493,7 +5493,6 @@ where
    fence.ensure_held()?;
    let mut opts = ObjectOptions {
        max_parity: true,
-        write_completion: crate::object_api::WriteCompletion::TailDrained,
        no_lock: true,
        http_preconditions: Some(pool_meta_cas_preconditions(token, object)?),
        ..Default::default()
@@ -14413,7 +14412,6 @@ impl ECStore {
                encoded.clone(),
                &ObjectOptions {
                    max_parity: true,
-                    write_completion: crate::object_api::WriteCompletion::TailDrained,
                    http_preconditions: Some(HTTPPreconditions {
                        if_none_match: Some("*".to_string()),
                        ..Default::default()
@@ -14568,7 +14566,6 @@ impl ECStore {
                encoded,
                &ObjectOptions {
                    max_parity: true,
-                    write_completion: crate::object_api::WriteCompletion::TailDrained,
                    http_preconditions: Some(http_preconditions),
                    ..Default::default()
                },
@@ -14960,7 +14957,6 @@ impl ECStore {
                encoded,
                &ObjectOptions {
                    max_parity: true,
-                    write_completion: crate::object_api::WriteCompletion::TailDrained,
                    http_preconditions: Some(HTTPPreconditions {
                        if_match: Some(etag),
                        ..Default::default()
@@ -317,22 +317,6 @@ impl DiskStoreRenameDataExt for LocalDiskWrapper {
        dst_path: &str,
        external_guard: Option<Arc<dyn Send + Sync>>,
    ) -> Result<RenameDataResp> {
-        self.rename_data_observed(src_volume, src_path, fi, dst_volume, dst_path, external_guard)
-            .await
-            .result
-    }
-}
-
-impl LocalDiskWrapper {
-    pub(in crate::disk) async fn rename_data_observed(
-        &self,
-        src_volume: &str,
-        src_path: &str,
-        fi: &FileInfo,
-        dst_volume: &str,
-        dst_path: &str,
-        external_guard: Option<Arc<dyn Send + Sync>>,
-    ) -> super::RenameDataObservation {
        let operation = self.clone();
        let src_volume = src_volume.to_owned();
        let src_path = src_path.to_owned();
@@ -349,35 +333,22 @@ impl LocalDiskWrapper {
        } else {
            get_max_timeout_duration()
        };
-        let observed = run_owned_mutation(external_guard, move || async move {
-            let mut preflight_rejection = None;
-            let result = operation
+        run_owned_mutation(external_guard, move || async move {
+            operation
                .track_disk_health_mutation(
                    "rename_data",
                    DiskMetricMutation::Write,
                    || async {
-                        // Preserve the former DiskAPI future's single boxing boundary.
-                        let observed =
-                            Box::pin(
-                                operation
-                                    .disk
-                                    .rename_data_observed(&src_volume, &src_path, &fi, &dst_volume, &dst_path),
-                            )
-                            .await;
-                        preflight_rejection = observed.preflight_rejection;
-                        observed.result
+                        operation
+                            .disk
+                            .rename_data_borrowed(&src_volume, &src_path, &fi, &dst_volume, &dst_path)
+                            .await
                    },
                    timeout_duration,
                )
-                .await;
-            // Health tracking must observe the real disk error, not an Ok tuple.
-            Ok(super::RenameDataObservation {
-                result,
-                preflight_rejection,
-            })
+                .await
        })
-        .await;
-        observed.unwrap_or_else(|error| super::RenameDataObservation::unknown(Err(error)))
+        .await
    }
 }

@@ -2617,46 +2588,6 @@ mod tests {
        assert_eq!(wrapper.metrics_snapshot().api_calls.get("unknown"), Some(&1));
    }

-    #[tokio::test]
-    async fn rename_preflight_evidence_preserves_health_errors_and_owned_reply() {
-        for source_exists in [false, true] {
-            for guarded in [false, true] {
-                let dir = tempfile::tempdir().expect("temp dir should be created");
-                let endpoint = Endpoint::try_from(dir.path().to_str().expect("temp dir should be valid UTF-8"))
-                    .expect("endpoint should parse");
-                let disk = Arc::new(LocalDisk::new(&endpoint, false).await.expect("local disk should be created"));
-                if source_exists {
-                    disk.make_volume("source").await.expect("source volume should exist");
-                }
-                let wrapper = LocalDiskWrapper::new(disk, false);
-                let drops = Arc::new(std::sync::atomic::AtomicUsize::new(0));
-                let external_guard = guarded.then(|| Arc::new(DropProbe(Arc::clone(&drops))) as Arc<dyn Send + Sync>);
-                let mut file_info = FileInfo::new("object", 1, 0);
-                file_info.mod_time = Some(::time::OffsetDateTime::now_utc());
-                file_info.erasure.index = 1;
-                let observed = wrapper
-                    .rename_data_observed("source", "object", &file_info, "missing-destination", "object", external_guard)
-                    .await;
-                assert!(observed.rejected_before_publication(), "normal access rejection must carry proof");
-                assert!(matches!(observed.result, Err(DiskError::VolumeNotFound)));
-                let snapshot = wrapper.metrics_snapshot();
-                assert_eq!(snapshot.api_calls.get("rename_data"), Some(&1));
-                assert_eq!(snapshot.total_writes, 0, "health tracking must not observe the rejection as Ok");
-                assert_eq!(drops.load(Ordering::SeqCst), usize::from(guarded));
-
-                wrapper.health.force_runtime_state_for_test(RuntimeDriveHealthState::Offline);
-                let observed = wrapper
-                    .rename_data_observed("source", "object", &file_info, "missing-destination", "object", None)
-                    .await;
-                assert!(!observed.rejected_before_publication(), "wrapper errors carry no local preflight proof");
-                assert!(matches!(observed.result, Err(DiskError::FaultyDisk)));
-                let snapshot = wrapper.metrics_snapshot();
-                assert_eq!(snapshot.total_errors_availability, 1);
-                assert_eq!(snapshot.total_writes, 0);
-            }
-        }
-    }
-
    #[tokio::test]
    async fn local_disk_health_wrapper_counts_returned_availability_errors() {
        let dir = tempfile::tempdir().expect("temp dir should be created");
@@ -75,25 +75,6 @@ use time::OffsetDateTime;
 use tokio::io::{AsyncRead, AsyncWrite};
 use uuid::Uuid;

-/// Local preflight evidence stays outside DiskAPI and the RPC response format.
-pub(crate) struct RenameDataObservation {
-    pub(crate) result: Result<RenameDataResp>,
-    preflight_rejection: Option<local::LocalRenamePreflightRejection>,
-}
-
-impl RenameDataObservation {
-    fn unknown(result: Result<RenameDataResp>) -> Self {
-        Self {
-            result,
-            preflight_rejection: None,
-        }
-    }
-
-    pub(crate) fn rejected_before_publication(&self) -> bool {
-        self.result.is_err() && self.preflight_rejection.is_some()
-    }
-}
-
 const QUOTA_MUTATION_FENCE_PREFIX: &str = "tmp/quota-mutation-fences/";
 pub(crate) const QUOTA_MUTATION_FENCE_METADATA_SUFFIX: &str = "quota-mutation-fence-token";

@@ -730,36 +711,6 @@ impl Disk {
            .await
    }

-    pub(crate) async fn rename_data_borrowed_with_fence_observed(
-        &self,
-        src_volume: &str,
-        src_path: &str,
-        fi: &FileInfo,
-        dst_volume: &str,
-        dst_path: &str,
-        scanner_publication_lease_token: Option<Uuid>,
-    ) -> RenameDataObservation {
-        match self {
-            Disk::Local(local_disk) => {
-                local_disk
-                    .rename_data_observed(src_volume, src_path, fi, dst_volume, dst_path, None)
-                    .await
-            }
-            Disk::Remote(remote_disk) => RenameDataObservation::unknown(
-                remote_disk
-                    .rename_data_borrowed_with_fence(
-                        src_volume,
-                        src_path,
-                        fi,
-                        dst_volume,
-                        dst_path,
-                        scanner_publication_lease_token,
-                    )
-                    .await,
-            ),
-        }
-    }
-
    pub(crate) async fn rename_data_borrowed_with_fence(
        &self,
        src_volume: &str,
@@ -870,18 +870,6 @@ impl TierFreeVersionReceiptSink {
    }
 }

-/// Internal PUT completion boundary; this does not change fsync or write quorum.
-#[doc(hidden)]
-#[derive(Debug, Default, Clone, Copy, PartialEq, Eq)]
-pub enum WriteCompletion {
-    /// Return at write quorum when the commit owner can retain its guards.
-    #[default]
-    Quorum,
-    /// Drain the rename fan-out before returning. Minority failures still heal
-    /// after a successful quorum commit; this does not require every disk to succeed.
-    TailDrained,
-}
-
 #[derive(Default, Clone)]
 pub struct ObjectOptions {
    // Use the maximum parity (N/2), used when saving server configuration files
@@ -908,10 +896,6 @@ pub struct ObjectOptions {
    /// Persisted bucket incarnation observed before authorization.
    pub expected_bucket_incarnation_id: Option<Uuid>,
    pub no_lock: bool,
-    /// Control-plane writers that immediately read or CAS the same namespace
-    /// key use TailDrained without changing namespace lock ownership.
-    #[doc(hidden)]
-    pub write_completion: WriteCompletion,
    /// True when an upper layer already holds the object read lock before
    /// forwarding a no_lock read to the set layer.
    pub metadata_cache_safe: bool,
@@ -956,9 +940,6 @@ pub struct ObjectOptions {
    pub preserve_etag: Option<String>,
    pub metadata_chg: bool,
    pub http_preconditions: Option<HTTPPreconditions>,
-    /// Internal create-only writes may also preserve an acknowledged deletion.
-    /// Evaluated with `http_preconditions` under the namespace commit lock.
-    pub preserve_delete_marker: bool,

    pub delete_replication: Option<ReplicationState>,
    pub delete_replication_config_snapshot: Option<Arc<DeleteReplicationConfigSnapshot>>,
@@ -78,21 +78,6 @@ pub(crate) struct ScannerPublicationLeaseEntry {
    pub(crate) _operation_guard: OwnedRwLockReadGuard<()>,
 }

-pub(crate) struct NamespaceCommitGuard {
-    ctx: Arc<InstanceContext>,
-    counted: bool,
-}
-
-impl Drop for NamespaceCommitGuard {
-    fn drop(&mut self) {
-        if self.counted {
-            // Publish the new generation before a zero-pending publication probe.
-            self.ctx.advance_namespace_commit_generation();
-            self.ctx.namespace_commits.fetch_sub(1, Ordering::AcqRel);
-        }
-    }
-}
-
 /// Runtime state owned by a single `ECStore` instance.
 ///
 /// This is intentionally minimal in the first migration slice; subsequent
@@ -224,13 +209,9 @@ pub struct InstanceContext {
    /// Last storage-owned movement snapshot observed under the operation
    /// gate. SetDisks cache writers fail closed until ECStore refreshes it.
    scanner_publication_state: AtomicU8,
-    namespace_commits: AtomicU64,
-    namespace_commit_generation: AtomicU64,
    /// Resolves object-encryption material at the application boundary.
    object_encryption_resolver: OnceLock<Arc<dyn ObjectEncryptionResolver>>,
    tier_delete_journal_recovery_stores: std::sync::Mutex<HashSet<Uuid>>,
-    #[cfg(test)]
-    suppress_tier_delete_journal_recovery: bool,
    transition_transaction_recovery_stores: std::sync::Mutex<HashSet<Uuid>>,
    tier_delete_journal_recovery_wakeup: tokio::sync::Notify,
 }
@@ -275,12 +256,8 @@ impl InstanceContext {
            data_movement_generation_exhausted: AtomicBool::new(false),
            data_movement_generation_notify: Arc::new(Notify::new()),
            scanner_publication_state: AtomicU8::new(SCANNER_PUBLICATION_STATE_UNKNOWN),
-            namespace_commits: AtomicU64::new(0),
-            namespace_commit_generation: AtomicU64::new(0),
            object_encryption_resolver: OnceLock::new(),
            tier_delete_journal_recovery_stores: std::sync::Mutex::new(HashSet::new()),
-            #[cfg(test)]
-            suppress_tier_delete_journal_recovery: false,
            transition_transaction_recovery_stores: std::sync::Mutex::new(HashSet::new()),
            tier_delete_journal_recovery_wakeup: tokio::sync::Notify::new(),
        }
@@ -408,36 +385,6 @@ impl InstanceContext {
            && self.scanner_publication_state.load(Ordering::Acquire) == SCANNER_PUBLICATION_STATE_ALLOWED
    }

-    pub(crate) fn begin_namespace_commit(self: &Arc<Self>) -> Arc<NamespaceCommitGuard> {
-        let counted = self
-            .namespace_commits
-            .fetch_update(Ordering::AcqRel, Ordering::Acquire, |count| count.checked_add(1))
-            .is_ok();
-        if counted {
-            self.advance_namespace_commit_generation();
-        } else {
-            self.namespace_commit_generation.store(u64::MAX, Ordering::Release);
-        }
-        Arc::new(NamespaceCommitGuard {
-            ctx: Arc::clone(self),
-            counted,
-        })
-    }
-
-    fn advance_namespace_commit_generation(&self) {
-        let _ = self
-            .namespace_commit_generation
-            .fetch_update(Ordering::AcqRel, Ordering::Acquire, |generation| Some(generation.saturating_add(1)));
-    }
-
-    pub(crate) fn namespace_commit_generation(&self) -> u64 {
-        self.namespace_commit_generation.load(Ordering::Acquire)
-    }
-
-    pub(crate) fn namespace_commits_pending(&self) -> bool {
-        self.namespace_commits.load(Ordering::Acquire) != 0 || self.namespace_commit_generation() == u64::MAX
-    }
-
    pub(crate) fn set_scanner_publication_state(&self, blocked: bool) {
        self.scanner_publication_state.store(
            if blocked {
@@ -693,21 +640,12 @@ impl InstanceContext {
    }

    pub(crate) fn mark_tier_delete_journal_recovery_started(&self, store_id: Uuid) -> bool {
-        #[cfg(test)]
-        if self.suppress_tier_delete_journal_recovery {
-            return false;
-        }
        self.tier_delete_journal_recovery_stores
            .lock()
            .unwrap_or_else(std::sync::PoisonError::into_inner)
            .insert(store_id)
    }

-    #[cfg(test)]
-    pub(crate) fn suppress_tier_delete_journal_recovery_for_test(&mut self) {
-        self.suppress_tier_delete_journal_recovery = true;
-    }
-
    pub(crate) fn mark_transition_transaction_recovery_started(&self, store_id: Uuid) -> bool {
        self.transition_transaction_recovery_stores
            .lock()
@@ -818,50 +756,6 @@ pub fn bootstrap_ctx() -> Arc<InstanceContext> {
 mod tests {
    use super::*;

-    #[test]
-    fn namespace_commit_guards_are_instance_local_and_count_until_last_owner() {
-        let first = Arc::new(InstanceContext::new());
-        let other = Arc::new(InstanceContext::new());
-        first.set_scanner_publication_state(false);
-        other.set_scanner_publication_state(false);
-        assert!(first.scanner_publication_state_allowed());
-        let one = first.begin_namespace_commit();
-        let shared_owner = Arc::clone(&one);
-        let two = first.begin_namespace_commit();
-        assert!(first.namespace_commits_pending());
-        assert!(first.scanner_publication_state_allowed(), "pending writes must not block scan admission");
-        assert_eq!(first.namespace_commit_generation(), 2);
-        assert!(!other.namespace_commits_pending());
-        assert_eq!(other.namespace_commit_generation(), 0);
-        assert!(other.scanner_publication_state_allowed());
-        drop(one);
-        assert_eq!(first.namespace_commit_generation(), 2);
-        drop(shared_owner);
-        assert!(first.namespace_commits_pending());
-        assert_eq!(first.namespace_commit_generation(), 3);
-        drop(two);
-        assert!(!first.namespace_commits_pending());
-        assert_eq!(first.namespace_commit_generation(), 4);
-        assert!(first.scanner_publication_state_allowed());
-    }
-
-    #[test]
-    fn namespace_commit_counter_exhaustion_keeps_publication_blocked() {
-        for (count, generation) in [(0, u64::MAX - 1), (u64::MAX, 0)] {
-            let ctx = Arc::new(InstanceContext::new());
-            ctx.set_scanner_publication_state(false);
-            ctx.namespace_commits.store(count, Ordering::Release);
-            ctx.namespace_commit_generation.store(generation, Ordering::Release);
-            let guard = ctx.begin_namespace_commit();
-            assert!(ctx.namespace_commits_pending());
-            assert_eq!(ctx.namespace_commit_generation(), u64::MAX);
-            drop(guard);
-            assert!(ctx.namespace_commits_pending());
-            assert_eq!(ctx.namespace_commit_generation(), u64::MAX);
-            assert_eq!(ctx.namespace_commits.load(Ordering::Acquire), count);
-        }
-    }
-
    // The SetupType inputs must derive the exact (is_erasure,
    // is_dist_erasure, is_erasure_sd) triples that the original three
    // process-global erasure bools produced via update_erasure_type().
@@ -1179,12 +1073,6 @@ mod tests {
        assert!(!ctx_a.mark_tier_delete_journal_recovery_started(store_a));
        assert!(ctx_a.mark_tier_delete_journal_recovery_started(store_b));
        assert!(ctx_b.mark_tier_delete_journal_recovery_started(store_a));
-
-        let mut manual_ctx = InstanceContext::new();
-        manual_ctx.suppress_tier_delete_journal_recovery_for_test();
-        assert!(!manual_ctx.mark_tier_delete_journal_recovery_started(store_a));
-        assert!(!manual_ctx.mark_tier_delete_journal_recovery_started(store_b));
-        assert!(ctx_b.mark_tier_delete_journal_recovery_started(store_b));
    }

    #[test]
@@ -62,27 +62,12 @@ const REMOTE_VERSION_STATE_PROOF_TTL: Duration = Duration::from_secs(30);
 const CROSS_POOL_FENCE_SUPPORTED_VERSION: u32 = 2;
 const TIER_DELETE_JOURNAL_POLICY_SUPPORTED_VERSION: u32 = 3;
 const DECOMMISSION_TARGET_FENCE_POLICY_SUPPORTED_VERSION: u32 = 4;
-// Keep this synchronized with the version served by node_service. Including
-// the local member in the minimum prevents an older coordinator from
-// self-authorizing a policy implemented only by newer remote peers.
-const LOCAL_CROSS_POOL_FENCE_POLICY_SUPPORTED_VERSION: u32 = 4;
-/// Version 5 is reserved for a fleet whose every metadata writer preserves
-/// explicit transition version state and destination identity, and implements
-/// conditional per-generation `xl.meta` writes with strong readback. The node
-/// service must not advertise this version until the conditional writer from
-/// rustfs/backlog#684 is available.
-const LEGACY_TRANSITION_STATE_RECONCILE_POLICY_SUPPORTED_VERSION: u32 = 5;
 type CrossPoolFencePolicyResult = Result<BTreeMap<String, Uuid>>;

 fn cross_pool_fence_policy_results(
    peer_epochs: BTreeMap<String, Uuid>,
    minimum_version: u32,
-) -> (
-    CrossPoolFencePolicyResult,
-    CrossPoolFencePolicyResult,
-    CrossPoolFencePolicyResult,
-    CrossPoolFencePolicyResult,
-) {
+) -> (CrossPoolFencePolicyResult, CrossPoolFencePolicyResult, CrossPoolFencePolicyResult) {
    let journal_result = if minimum_version >= TIER_DELETE_JOURNAL_POLICY_SUPPORTED_VERSION {
        Ok(peer_epochs.clone())
    } else {
@@ -93,18 +78,7 @@ fn cross_pool_fence_policy_results(
    } else {
        Err(Error::other("decommission target fence policy capability version is unsupported"))
    };
-    let legacy_transition_state_reconcile_result =
-        if minimum_version >= LEGACY_TRANSITION_STATE_RECONCILE_POLICY_SUPPORTED_VERSION {
-            Ok(peer_epochs.clone())
-        } else {
-            Err(Error::other("legacy transition state reconcile policy capability version is unsupported"))
-        };
-    (
-        Ok(peer_epochs),
-        journal_result,
-        decommission_target_fence_result,
-        legacy_transition_state_reconcile_result,
-    )
+    (Ok(peer_epochs), journal_result, decommission_target_fence_result)
 }

 #[derive(Clone, Debug)]
@@ -278,21 +252,10 @@ pub(crate) struct TierDeleteJournalFleetProofToken {
    _permit: FleetCapabilityProofPermit,
 }

-/// Effect-window authority for one legacy transition-state reconciliation.
-///
-/// The token intentionally cannot be cloned. Its permit keeps the admitted
-/// fleet generation alive until the caller finishes the final strong
-/// readback, while revocation makes every later validation fail immediately.
-pub struct LegacyTransitionStateReconcileFleetProofToken {
-    token: FleetCapabilityProofToken,
-    _permit: FleetCapabilityProofPermit,
-}
-
 static REMOTE_VERSION_STATE_FLEET_PROOF: OnceLock<std::sync::RwLock<FleetCapabilityProofState>> = OnceLock::new();
 static CROSS_POOL_FENCE_FLEET_PROOF: OnceLock<std::sync::RwLock<FleetCapabilityProofState>> = OnceLock::new();
 static TIER_DELETE_JOURNAL_FLEET_PROOF: OnceLock<std::sync::RwLock<FleetCapabilityProofState>> = OnceLock::new();
 static DECOMMISSION_TARGET_FENCE_FLEET_PROOF: OnceLock<std::sync::RwLock<FleetCapabilityProofState>> = OnceLock::new();
-static LEGACY_TRANSITION_STATE_RECONCILE_FLEET_PROOF: OnceLock<std::sync::RwLock<FleetCapabilityProofState>> = OnceLock::new();
 static REMOTE_VERSION_STATE_PROBE_TOPOLOGY: OnceLock<String> = OnceLock::new();

 fn cross_pool_fence_fleet_proof_slot() -> &'static std::sync::RwLock<FleetCapabilityProofState> {
@@ -311,10 +274,6 @@ fn decommission_target_fence_fleet_proof_slot() -> &'static std::sync::RwLock<Fl
    DECOMMISSION_TARGET_FENCE_FLEET_PROOF.get_or_init(|| std::sync::RwLock::new(FleetCapabilityProofState::default()))
 }

-fn legacy_transition_state_reconcile_fleet_proof_slot() -> &'static std::sync::RwLock<FleetCapabilityProofState> {
-    LEGACY_TRANSITION_STATE_RECONCILE_FLEET_PROOF.get_or_init(|| std::sync::RwLock::new(FleetCapabilityProofState::default()))
-}
-
 fn revoke_fleet_capability_proof_state(state: &mut FleetCapabilityProofState) {
    if let Some(proof) = state.proof.take() {
        proof.generation.revoke();
@@ -485,125 +444,6 @@ pub(crate) fn tier_delete_journal_topology_generation(proof: &TierDeleteJournalF
    stable_tier_delete_journal_topology_generation(&proof.token.topology_fingerprint)
 }

-/// Acquire one non-cloneable authority that must span the complete reconcile
-/// effect window, including its final strong readback.
-pub async fn acquire_legacy_transition_state_reconcile_fleet_proof() -> Option<LegacyTransitionStateReconcileFleetProofToken> {
-    let expected_topology = REMOTE_VERSION_STATE_PROBE_TOPOLOGY.get()?;
-    let proof = {
-        let state = legacy_transition_state_reconcile_fleet_proof_slot()
-            .read()
-            .unwrap_or_else(std::sync::PoisonError::into_inner);
-        acquire_legacy_transition_state_reconcile_fleet_proof_from(&state, expected_topology, Instant::now())?
-    };
-    let observed_peer_epochs = observe_legacy_transition_state_reconcile_fleet(expected_topology).await?;
-    let state = legacy_transition_state_reconcile_fleet_proof_slot()
-        .read()
-        .unwrap_or_else(std::sync::PoisonError::into_inner);
-    legacy_transition_state_reconcile_fleet_proof_matches_observation_at(
-        &state,
-        &proof,
-        expected_topology,
-        &observed_peer_epochs,
-        Instant::now(),
-    )
-    .then_some(proof)
-}
-
-fn acquire_legacy_transition_state_reconcile_fleet_proof_from(
-    state: &FleetCapabilityProofState,
-    expected_topology: &str,
-    now: Instant,
-) -> Option<LegacyTransitionStateReconcileFleetProofToken> {
-    let token = acquire_fleet_capability_proof_from(state, expected_topology, now)?;
-    let permit = state.proof.as_ref()?.generation.try_acquire()?;
-    Some(LegacyTransitionStateReconcileFleetProofToken { token, _permit: permit })
-}
-
-async fn observe_legacy_transition_state_reconcile_fleet(expected_topology: &str) -> Option<BTreeMap<String, Uuid>> {
-    let notification_sys = get_global_notification_sys()?;
-    let (peer_epochs, minimum_version) = timeout(
-        REMOTE_VERSION_STATE_PROBE_TIMEOUT,
-        notification_sys.probe_cross_pool_fence_fleet(expected_topology),
-    )
-    .await
-    .ok()?
-    .ok()?;
-    let (_, _, _, reconcile_result) = cross_pool_fence_policy_results(peer_epochs, minimum_version);
-    reconcile_result.ok()
-}
-
-/// Revalidate the exact fleet generation captured by a reconcile token with a
-/// fresh synchronous observation. Callers must await this before each
-/// conditional metadata write and after the final strong readback.
-pub async fn legacy_transition_state_reconcile_fleet_proof_matches(
-    proof: &LegacyTransitionStateReconcileFleetProofToken,
-) -> bool {
-    let Some(expected_topology) = REMOTE_VERSION_STATE_PROBE_TOPOLOGY.get() else {
-        return false;
-    };
-    legacy_transition_state_reconcile_fleet_proof_matches_with_observer(
-        legacy_transition_state_reconcile_fleet_proof_slot(),
-        proof,
-        expected_topology,
-        || observe_legacy_transition_state_reconcile_fleet(expected_topology),
-    )
-    .await
-}
-
-async fn legacy_transition_state_reconcile_fleet_proof_matches_with_observer<F, Fut>(
-    slot: &std::sync::RwLock<FleetCapabilityProofState>,
-    proof: &LegacyTransitionStateReconcileFleetProofToken,
-    expected_topology: &str,
-    observe: F,
-) -> bool
-where
-    F: FnOnce() -> Fut,
-    Fut: Future<Output = Option<BTreeMap<String, Uuid>>>,
-{
-    {
-        let state = slot.read().unwrap_or_else(std::sync::PoisonError::into_inner);
-        if !legacy_transition_state_reconcile_fleet_proof_matches_at(&state, proof, expected_topology, Instant::now()) {
-            return false;
-        }
-    }
-    let Some(observed_peer_epochs) = observe().await else {
-        return false;
-    };
-    let state = slot.read().unwrap_or_else(std::sync::PoisonError::into_inner);
-    legacy_transition_state_reconcile_fleet_proof_matches_observation_at(
-        &state,
-        proof,
-        expected_topology,
-        &observed_peer_epochs,
-        Instant::now(),
-    )
-}
-
-fn legacy_transition_state_reconcile_fleet_proof_matches_at(
-    state: &FleetCapabilityProofState,
-    proof: &LegacyTransitionStateReconcileFleetProofToken,
-    expected_topology: &str,
-    now: Instant,
-) -> bool {
-    proof._permit.generation.is_accepting()
-        && fleet_capability_proof_matches_at(state, &proof.token, expected_topology, now)
-        && state
-            .proof
-            .as_ref()
-            .is_some_and(|current| Arc::ptr_eq(&current.generation, &proof._permit.generation))
-}
-
-fn legacy_transition_state_reconcile_fleet_proof_matches_observation_at(
-    state: &FleetCapabilityProofState,
-    proof: &LegacyTransitionStateReconcileFleetProofToken,
-    expected_topology: &str,
-    observed_peer_epochs: &BTreeMap<String, Uuid>,
-    now: Instant,
-) -> bool {
-    legacy_transition_state_reconcile_fleet_proof_matches_at(state, proof, expected_topology, now)
-        && proof.token.peer_epochs.as_ref() == observed_peer_epochs
-}
-
 #[cfg(all(test, feature = "test-util"))]
 pub(crate) fn tier_delete_journal_fleet_proof_has_inflight_for_test() -> bool {
    let state = tier_delete_journal_fleet_proof_slot()
@@ -926,7 +766,6 @@ pub fn start_remote_version_state_fleet_probe(topology_fingerprint: String) {
                cross_pool_fence_fleet_proof_slot(),
                tier_delete_journal_fleet_proof_slot(),
                decommission_target_fence_fleet_proof_slot(),
-                legacy_transition_state_reconcile_fleet_proof_slot(),
            ] {
                mark_fleet_capability_topology_conflict(slot);
            }
@@ -959,12 +798,11 @@ pub fn start_remote_version_state_fleet_probe(topology_fingerprint: String) {
                .unwrap_or_else(|_| Err(Error::other("cross-pool fence fleet capability probe timed out"))),
                None => Err(Error::other("cross-pool fence fleet capability notification system is unavailable")),
            };
-            let (fence_result, journal_result, decommission_target_fence_result, reconcile_result) = match fence_probe {
+            let (fence_result, journal_result, decommission_target_fence_result) = match fence_probe {
                Ok((peer_epochs, minimum_version)) => cross_pool_fence_policy_results(peer_epochs, minimum_version),
                Err(err) => {
                    let message = err.to_string();
                    (
-                        Err(Error::other(message.clone())),
                        Err(Error::other(message.clone())),
                        Err(Error::other(message.clone())),
                        Err(Error::other(message)),
@@ -980,7 +818,6 @@ pub fn start_remote_version_state_fleet_probe(topology_fingerprint: String) {
                revoke_fleet_capability_proof(cross_pool_fence_fleet_proof_slot());
                revoke_fleet_capability_proof(tier_delete_journal_fleet_proof_slot());
                revoke_fleet_capability_proof(decommission_target_fence_fleet_proof_slot());
-                revoke_fleet_capability_proof(legacy_transition_state_reconcile_fleet_proof_slot());
            } else if let Some(err) = publish_fleet_capability_probe_result(
                remote_version_state_fleet_proof_slot(),
                &topology_fingerprint,
@@ -1043,24 +880,6 @@ pub fn start_remote_version_state_fleet_probe(topology_fingerprint: String) {
                    "notification capability probe"
                );
            }
-            if !topology_conflict
-                && let Some(err) = publish_fleet_capability_probe_result(
-                    legacy_transition_state_reconcile_fleet_proof_slot(),
-                    &topology_fingerprint,
-                    reconcile_result,
-                    Instant::now(),
-                )
-            {
-                debug!(
-                    event = EVENT_NOTIFICATION_CAPABILITY_PROBE,
-                    component = LOG_COMPONENT_ECSTORE,
-                    subsystem = LOG_SUBSYSTEM_NOTIFICATION,
-                    capability = "legacy_transition_state_reconcile_v1",
-                    state = "failed_closed",
-                    error = %err,
-                    "notification capability probe"
-                );
-            }
            sleep(REMOTE_VERSION_STATE_PROBE_INTERVAL).await;
        }
    });
@@ -1140,7 +959,7 @@ impl NotificationSys {
            client.probe_cross_pool_fence(topology_fingerprint.to_string()).await
        });
        let mut peer_epochs = BTreeMap::new();
-        let mut minimum_version = LOCAL_CROSS_POOL_FENCE_POLICY_SUPPORTED_VERSION;
+        let mut minimum_version = u32::MAX;
        for result in join_all(probes).await {
            let (peer, version, epoch) = result?;
            if version < CROSS_POOL_FENCE_SUPPORTED_VERSION {
@@ -1149,6 +968,11 @@ impl NotificationSys {
            minimum_version = minimum_version.min(version);
            insert_remote_version_state_peer(&mut peer_epochs, peer, epoch)?;
        }
+        // A single-node deployment has no remote member to lower the local
+        // policy version advertised by this binary.
+        if minimum_version == u32::MAX {
+            minimum_version = DECOMMISSION_TARGET_FENCE_POLICY_SUPPORTED_VERSION;
+        }
        Ok((peer_epochs, minimum_version))
    }
 }
@@ -3366,36 +3190,20 @@ mod tests {
    #[test]
    fn cross_pool_policy_versions_authorize_only_their_supported_protocols() {
        let peers = BTreeMap::from([("node-b:9000".to_string(), Uuid::new_v4())]);
-        let (generic_v2, journal_v2, decommission_v2, reconcile_v2) = cross_pool_fence_policy_results(peers.clone(), 2);
+        let (generic_v2, journal_v2, decommission_v2) = cross_pool_fence_policy_results(peers.clone(), 2);
        assert!(generic_v2.is_ok(), "v2 remains valid for existing cross-pool fencing");
        assert!(journal_v2.is_err(), "a mixed v2/v3 fleet must fail closed for journal-v6 deletion");
        assert!(decommission_v2.is_err(), "v2 cannot authorize the sticky per-target decommission fence");
-        assert!(reconcile_v2.is_err(), "v2 cannot authorize legacy transition-state reconciliation");

-        let (generic_v3, journal_v3, decommission_v3, reconcile_v3) = cross_pool_fence_policy_results(peers.clone(), 3);
+        let (generic_v3, journal_v3, decommission_v3) = cross_pool_fence_policy_results(peers.clone(), 3);
        assert!(generic_v3.is_ok());
        assert!(journal_v3.is_ok(), "an all-v3 fleet may authorize journal-v6 deletion");
        assert!(decommission_v3.is_err(), "v3 members do not understand the per-target decommission fence");
-        assert!(reconcile_v3.is_err());

-        let (generic_v4, journal_v4, decommission_v4, reconcile_v4) =
-            cross_pool_fence_policy_results(peers.clone(), LOCAL_CROSS_POOL_FENCE_POLICY_SUPPORTED_VERSION);
+        let (generic_v4, journal_v4, decommission_v4) = cross_pool_fence_policy_results(peers, 4);
        assert!(generic_v4.is_ok());
        assert!(journal_v4.is_ok());
        assert!(decommission_v4.is_ok(), "an all-v4 fleet may create sticky per-target reservations");
-        assert!(
-            reconcile_v4.is_err(),
-            "the current local policy lacks the conditional xl.meta writer required by reconcile"
-        );
-
-        let (generic_v5, journal_v5, decommission_v5, reconcile_v5) = cross_pool_fence_policy_results(peers, 5);
-        assert!(generic_v5.is_ok());
-        assert!(journal_v5.is_ok());
-        assert!(decommission_v5.is_ok());
-        assert!(
-            reconcile_v5.is_ok(),
-            "only an all-v5 fleet preserves destination identity and conditional reconcile writes"
-        );
    }

    #[test]
@@ -3650,234 +3458,6 @@ mod tests {
        );
    }

-    #[test]
-    fn legacy_transition_state_reconcile_admits_only_compatible_single_and_multi_node_fleets() {
-        let now = Instant::now();
-        for peers in [
-            BTreeMap::new(),
-            BTreeMap::from([("peer-a".to_string(), Uuid::new_v4()), ("peer-b".to_string(), Uuid::new_v4())]),
-        ] {
-            let slot = std::sync::RwLock::new(FleetCapabilityProofState::default());
-            let (_, _, _, result) =
-                cross_pool_fence_policy_results(peers, LEGACY_TRANSITION_STATE_RECONCILE_POLICY_SUPPORTED_VERSION);
-            assert!(publish_fleet_capability_probe_result(&slot, "topology-a", result, now).is_none());
-
-            let admitted = {
-                let state = slot.read().expect("reconcile proof slot should not poison");
-                acquire_legacy_transition_state_reconcile_fleet_proof_from(&state, "topology-a", now)
-                    .expect("an all-compatible fleet should admit reconciliation")
-            };
-            let state = slot.read().expect("reconcile proof slot should not poison");
-            assert!(legacy_transition_state_reconcile_fleet_proof_matches_at(
-                &state,
-                &admitted,
-                "topology-a",
-                now,
-            ));
-        }
-    }
-
-    #[test]
-    fn legacy_transition_state_reconcile_restart_drains_concurrent_effect_windows() {
-        let slot = std::sync::RwLock::new(FleetCapabilityProofState::default());
-        let now = Instant::now();
-        let original_peers = BTreeMap::from([("peer-a".to_string(), Uuid::new_v4())]);
-        let (_, _, _, original_result) =
-            cross_pool_fence_policy_results(original_peers, LEGACY_TRANSITION_STATE_RECONCILE_POLICY_SUPPORTED_VERSION);
-        assert!(publish_fleet_capability_probe_result(&slot, "topology-a", original_result, now).is_none());
-
-        let (first, second) = {
-            let state = slot.read().expect("reconcile proof slot should not poison");
-            (
-                acquire_legacy_transition_state_reconcile_fleet_proof_from(&state, "topology-a", now)
-                    .expect("the first reconcile writer should be admitted"),
-                acquire_legacy_transition_state_reconcile_fleet_proof_from(&state, "topology-a", now)
-                    .expect("the second reconcile writer should be admitted"),
-            )
-        };
-
-        let restarted_peers = BTreeMap::from([("peer-a".to_string(), Uuid::new_v4())]);
-        let (_, _, _, restarted_result) =
-            cross_pool_fence_policy_results(restarted_peers.clone(), LEGACY_TRANSITION_STATE_RECONCILE_POLICY_SUPPORTED_VERSION);
-        let blocked =
-            publish_fleet_capability_probe_result(&slot, "topology-a", restarted_result, now + Duration::from_millis(1))
-                .expect("a restarted member must revoke the old generation and wait for both writers");
-        assert!(blocked.to_string().contains("previous generation to drain"));
-        {
-            let state = slot.read().expect("reconcile proof slot should not poison");
-            assert!(state.proof.is_none());
-            assert!(state.draining_generation.is_some());
-            assert!(!legacy_transition_state_reconcile_fleet_proof_matches_at(
-                &state,
-                &first,
-                "topology-a",
-                now + Duration::from_millis(1),
-            ));
-            assert!(!legacy_transition_state_reconcile_fleet_proof_matches_at(
-                &state,
-                &second,
-                "topology-a",
-                now + Duration::from_millis(1),
-            ));
-        }
-
-        drop(first);
-        let (_, _, _, still_blocked_result) =
-            cross_pool_fence_policy_results(restarted_peers.clone(), LEGACY_TRANSITION_STATE_RECONCILE_POLICY_SUPPORTED_VERSION);
-        assert!(
-            publish_fleet_capability_probe_result(&slot, "topology-a", still_blocked_result, now + Duration::from_millis(2),)
-                .is_some(),
-            "one remaining writer must keep the successor generation closed"
-        );
-
-        drop(second);
-        let (_, _, _, admitted_result) =
-            cross_pool_fence_policy_results(restarted_peers, LEGACY_TRANSITION_STATE_RECONCILE_POLICY_SUPPORTED_VERSION);
-        assert!(
-            publish_fleet_capability_probe_result(&slot, "topology-a", admitted_result, now + Duration::from_millis(3),)
-                .is_none(),
-            "the restarted generation may publish only after every old writer drains"
-        );
-    }
-
-    #[test]
-    fn legacy_transition_state_reconcile_fresh_observation_closes_the_polling_window() {
-        let slot = std::sync::RwLock::new(FleetCapabilityProofState::default());
-        let now = Instant::now();
-        let original_peers = BTreeMap::from([("peer-a".to_string(), Uuid::new_v4())]);
-        let (_, _, _, original_result) =
-            cross_pool_fence_policy_results(original_peers.clone(), LEGACY_TRANSITION_STATE_RECONCILE_POLICY_SUPPORTED_VERSION);
-        assert!(publish_fleet_capability_probe_result(&slot, "topology-a", original_result, now).is_none());
-        let admitted = {
-            let state = slot.read().expect("reconcile proof slot should not poison");
-            acquire_legacy_transition_state_reconcile_fleet_proof_from(&state, "topology-a", now)
-                .expect("the original fleet should admit reconciliation")
-        };
-
-        let restarted_peers = BTreeMap::from([("peer-a".to_string(), Uuid::new_v4())]);
-        let state = slot.read().expect("reconcile proof slot should not poison");
-        assert!(
-            legacy_transition_state_reconcile_fleet_proof_matches_at(&state, &admitted, "topology-a", now),
-            "the periodic cache has not observed the restart yet"
-        );
-        assert!(!legacy_transition_state_reconcile_fleet_proof_matches_observation_at(
-            &state,
-            &admitted,
-            "topology-a",
-            &restarted_peers,
-            now,
-        ));
-
-        let (_, _, _, downgraded) = cross_pool_fence_policy_results(original_peers, 4);
-        assert!(
-            downgraded.is_err(),
-            "a synchronous observation of a downgraded peer must fail before any cached proof can authorize a write"
-        );
-    }
-
-    #[tokio::test]
-    async fn legacy_transition_state_reconcile_invalid_token_skips_fleet_observation() {
-        let slot = std::sync::RwLock::new(FleetCapabilityProofState::default());
-        let now = Instant::now();
-        let peers = BTreeMap::from([("peer-a".to_string(), Uuid::new_v4())]);
-        assert!(publish_fleet_capability_probe_result(&slot, "topology-a", Ok(peers), now).is_none());
-        let admitted = {
-            let state = slot.read().expect("reconcile proof slot should not poison");
-            acquire_legacy_transition_state_reconcile_fleet_proof_from(&state, "topology-a", now)
-                .expect("the original fleet should admit reconciliation")
-        };
-        revoke_fleet_capability_proof(&slot);
-
-        assert!(
-            !legacy_transition_state_reconcile_fleet_proof_matches_with_observer(&slot, &admitted, "topology-a", || async {
-                panic!("an invalid local generation must not trigger a fleet observation");
-            },)
-            .await
-        );
-    }
-
-    #[test]
-    fn legacy_transition_state_reconcile_membership_and_topology_changes_revoke_authority() {
-        let now = Instant::now();
-        for replacement in [
-            BTreeMap::from([("peer-a".to_string(), Uuid::new_v4()), ("peer-b".to_string(), Uuid::new_v4())]),
-            BTreeMap::from([("peer-a".to_string(), Uuid::new_v4())]),
-        ] {
-            let slot = std::sync::RwLock::new(FleetCapabilityProofState::default());
-            let original = BTreeMap::from([("peer-a".to_string(), Uuid::new_v4())]);
-            assert!(publish_fleet_capability_probe_result(&slot, "topology-a", Ok(original), now).is_none());
-            let admitted = {
-                let state = slot.read().expect("reconcile proof slot should not poison");
-                acquire_legacy_transition_state_reconcile_fleet_proof_from(&state, "topology-a", now)
-                    .expect("the original fleet should admit reconciliation")
-            };
-
-            assert!(
-                publish_fleet_capability_probe_result(&slot, "topology-a", Ok(replacement), now + Duration::from_millis(1),)
-                    .is_some(),
-                "membership or process-epoch replacement must wait for the admitted writer"
-            );
-            let state = slot.read().expect("reconcile proof slot should not poison");
-            assert!(!legacy_transition_state_reconcile_fleet_proof_matches_at(
-                &state,
-                &admitted,
-                "topology-a",
-                now + Duration::from_millis(1),
-            ));
-        }
-
-        let slot = std::sync::RwLock::new(FleetCapabilityProofState::default());
-        assert!(publish_fleet_capability_probe_result(&slot, "topology-a", Ok(BTreeMap::new()), now).is_none());
-        let admitted = {
-            let state = slot.read().expect("reconcile proof slot should not poison");
-            acquire_legacy_transition_state_reconcile_fleet_proof_from(&state, "topology-a", now)
-                .expect("the original topology should admit reconciliation")
-        };
-        mark_fleet_capability_topology_conflict(&slot);
-        let state = slot.read().expect("reconcile proof slot should not poison");
-        assert!(state.topology_conflict);
-        assert!(!legacy_transition_state_reconcile_fleet_proof_matches_at(
-            &state,
-            &admitted,
-            "topology-a",
-            now,
-        ));
-    }
-
-    #[test]
-    fn legacy_transition_state_reconcile_capability_downgrade_fails_closed() {
-        let slot = std::sync::RwLock::new(FleetCapabilityProofState::default());
-        let now = Instant::now();
-        let peers = BTreeMap::from([("peer-a".to_string(), Uuid::new_v4())]);
-        let (_, _, _, compatible_result) =
-            cross_pool_fence_policy_results(peers.clone(), LEGACY_TRANSITION_STATE_RECONCILE_POLICY_SUPPORTED_VERSION);
-        assert!(publish_fleet_capability_probe_result(&slot, "topology-a", compatible_result, now).is_none());
-        let admitted = {
-            let state = slot.read().expect("reconcile proof slot should not poison");
-            acquire_legacy_transition_state_reconcile_fleet_proof_from(&state, "topology-a", now)
-                .expect("v5 should admit reconciliation")
-        };
-
-        let (_, _, _, downgraded_result) =
-            cross_pool_fence_policy_results(peers, LEGACY_TRANSITION_STATE_RECONCILE_POLICY_SUPPORTED_VERSION - 1);
-        let err = publish_fleet_capability_probe_result(&slot, "topology-a", downgraded_result, now + Duration::from_millis(1))
-            .expect("a v4 member must revoke reconcile authority");
-        assert!(err.to_string().contains("reconcile policy capability version is unsupported"));
-        let state = slot.read().expect("reconcile proof slot should not poison");
-        assert!(state.proof.is_none());
-        assert!(!legacy_transition_state_reconcile_fleet_proof_matches_at(
-            &state,
-            &admitted,
-            "topology-a",
-            now + Duration::from_millis(1),
-        ));
-        assert!(
-            acquire_legacy_transition_state_reconcile_fleet_proof_from(&state, "topology-a", now + Duration::from_millis(1),)
-                .is_none(),
-            "a downgraded fleet must remain inspect-only"
-        );
-    }
-
    #[test]
    fn remote_version_state_fleet_proof_conflict_revokes_atomic_snapshot() {
        let now = Instant::now();
@@ -3959,57 +3539,6 @@ mod tests {
        assert!(err.to_string().contains("incomplete"));
    }

-    #[tokio::test]
-    async fn legacy_transition_state_reconcile_probe_rejects_missing_or_unreachable_members() {
-        let missing = NotificationSys {
-            peer_clients: Vec::new(),
-            all_peer_clients: vec![None],
-            peer_topology_hosts: vec!["peer-a".to_string()],
-            peer_admin_caches: Vec::new(),
-            tier_config_reload_workers: Default::default(),
-        };
-        let missing_err = missing
-            .probe_cross_pool_fence_fleet("topology-a")
-            .await
-            .expect_err("a missing member slot must prevent reconcile capability proof");
-        assert!(missing_err.to_string().contains("incomplete"));
-
-        let unreachable = NotificationSys {
-            peer_clients: vec![None],
-            all_peer_clients: vec![None, None],
-            peer_topology_hosts: vec!["peer-a".to_string()],
-            peer_admin_caches: vec![Mutex::new(PeerAdminCache::new())],
-            tier_config_reload_workers: Default::default(),
-        };
-        let unreachable_err = unreachable
-            .probe_cross_pool_fence_fleet("topology-a")
-            .await
-            .expect_err("an unreachable member must prevent reconcile capability proof");
-        assert!(unreachable_err.to_string().contains("unreachable"));
-    }
-
-    #[tokio::test]
-    async fn legacy_transition_state_reconcile_single_node_stays_closed_before_local_cas_support() {
-        let notification_sys = NotificationSys {
-            peer_clients: Vec::new(),
-            all_peer_clients: vec![None],
-            peer_topology_hosts: Vec::new(),
-            peer_admin_caches: Vec::new(),
-            tier_config_reload_workers: Default::default(),
-        };
-        let (peers, minimum_version) = notification_sys
-            .probe_cross_pool_fence_fleet("topology-a")
-            .await
-            .expect("a single-node capability probe should complete");
-        assert!(peers.is_empty());
-        assert_eq!(minimum_version, LOCAL_CROSS_POOL_FENCE_POLICY_SUPPORTED_VERSION);
-        let (_, _, _, reconcile_result) = cross_pool_fence_policy_results(peers, minimum_version);
-        assert!(
-            reconcile_result.is_err(),
-            "the current node must not self-authorize reconcile before the conditional writer lands"
-        );
-    }
-
    fn build_props(endpoint: &str) -> ServerProperties {
        ServerProperties {
            endpoint: endpoint.to_string(),
@@ -21,11 +21,9 @@ pub mod tier_gen;
 pub mod tier_handlers;
 pub(crate) mod tier_mutation_intent;
 pub mod tier_mutation_peer;
-pub(crate) mod tier_probe_intent;
 pub mod warm_backend;
 pub mod warm_backend_aliyun;
 pub mod warm_backend_azure;
-#[cfg(feature = "gcs")]
 pub mod warm_backend_gcs;
 pub mod warm_backend_huaweicloud;
 pub mod warm_backend_minio;
@@ -792,6 +792,8 @@ impl WarmBackend for MockWarmBackend {
        };
        if stored.remote_version_id.is_empty() {
            Ok(TransitionCandidateProbe::UnversionedPresent)
+        } else if stored.remote_version_id == "null" {
+            Ok(TransitionCandidateProbe::SuspendedNullPresent)
        } else {
            Ok(TransitionCandidateProbe::VersionedPresent(stored.remote_version_id.clone()))
        }
@@ -991,7 +993,7 @@ mod tests {
    use bytes::Bytes;

    #[tokio::test]
-    async fn mock_probe_distinguishes_missing_unversioned_and_versioned_candidates() {
+    async fn mock_probe_distinguishes_all_known_remote_version_states() {
        let backend = MockWarmBackend::new();

        assert_eq!(
@@ -1029,6 +1031,19 @@ mod tests {
            TransitionCandidateProbe::VersionedPresent(remote_version)
        );

+        backend.set_put_remote_version(Some("null".to_string())).await;
+        backend
+            .put("suspended-null", ReaderImpl::Body(Bytes::new()), 0)
+            .await
+            .expect("put suspended null candidate");
+        assert_eq!(
+            backend
+                .probe_transition_candidate_state("suspended-null")
+                .await
+                .expect("probe suspended null candidate"),
+            TransitionCandidateProbe::SuspendedNullPresent
+        );
+
        assert_eq!(
            backend
                .op_log()
@@ -1036,7 +1051,7 @@ mod tests {
                .into_iter()
                .filter(|op| matches!(op, MockWarmOp::Probe { .. }))
                .count(),
-            3
+            4
        );
    }

@@ -15,204 +15,28 @@
 #![allow(unused_variables)]
 #![allow(unused_mut)]
 #![allow(unused_assignments)]
+#![allow(unused_must_use)]
+#![allow(clippy::all)]

-use serde::{Deserialize, Deserializer, Serialize, Serializer, de};
+use serde::{Deserialize, Serialize};

-#[derive(Serialize, Deserialize, Default, Clone)]
-#[serde(default)]
-pub struct TierServicePrincipalAuth {
-    #[serde(rename = "TenantID", alias = "tenantID", alias = "tenant_id")]
-    pub tenant_id: String,
-    #[serde(rename = "ClientID", alias = "clientID", alias = "client_id")]
-    pub client_id: String,
-    #[serde(rename = "ClientSecret", alias = "clientSecret", alias = "client_secret")]
-    pub client_secret: String,
-}
-
-impl TierServicePrincipalAuth {
-    pub(crate) fn is_empty(&self) -> bool {
-        self.tenant_id.is_empty() && self.client_id.is_empty() && self.client_secret.is_empty()
-    }
-}
-
-impl std::fmt::Debug for TierServicePrincipalAuth {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("TierServicePrincipalAuth")
-            .field("tenant_id", &self.tenant_id)
-            .field("client_id", &self.client_id)
-            .field("client_secret", &"REDACTED")
-            .finish()
-    }
-}
-
-#[derive(Serialize, Deserialize, Default, Clone)]
+#[derive(Serialize, Deserialize, Default, Debug, Clone)]
 #[serde(default)]
 pub struct TierCreds {
-    #[serde(rename = "access", alias = "accessKey")]
+    #[serde(rename = "accessKey")]
    pub access_key: String,
-    #[serde(rename = "secret", alias = "secretKey")]
+    #[serde(rename = "secretKey")]
    pub secret_key: String,

-    #[serde(rename = "awsrole", alias = "awsRole")]
+    #[serde(rename = "awsRole")]
    pub aws_role: bool,
-    #[serde(rename = "awsroleWebIdentity", alias = "awsRoleWebIdentityTokenFile")]
+    #[serde(rename = "awsRoleWebIdentityTokenFile")]
    pub aws_role_web_identity_token_file: String,
-    #[serde(rename = "awsroleARN", alias = "awsRoleArn", alias = "awsRoleARN")]
+    #[serde(rename = "awsRoleArn")]
    pub aws_role_arn: String,

-    #[serde(rename = "azSP", alias = "azsp", skip_serializing_if = "TierServicePrincipalAuth::is_empty")]
-    pub azure_service_principal: TierServicePrincipalAuth,
+    //azsp: ServicePrincipalAuth,

-    #[serde(
-        rename = "creds",
-        alias = "credsJson",
-        alias = "credsJSON",
-        alias = "creds_json",
-        default,
-        skip_serializing_if = "Vec::is_empty",
-        with = "base64_bytes"
-    )]
+    //#[serde(rename = "credsJson")]
    pub creds_json: Vec<u8>,
 }
-
-impl std::fmt::Debug for TierCreds {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("TierCreds")
-            .field("access_key", &self.access_key)
-            .field("secret_key", &"REDACTED")
-            .field("aws_role", &self.aws_role)
-            .field(
-                "aws_role_web_identity_token_file",
-                &(!self.aws_role_web_identity_token_file.is_empty()).then_some("REDACTED"),
-            )
-            .field("aws_role_arn", &self.aws_role_arn)
-            .field("azure_service_principal", &self.azure_service_principal)
-            .field("creds_json", &(!self.creds_json.is_empty()).then_some("REDACTED"))
-            .finish()
-    }
-}
-
-mod base64_bytes {
-    use super::*;
-
-    pub(super) fn serialize<S>(value: &[u8], serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        serializer.serialize_str(&base64_simd::STANDARD.encode_to_string(value))
-    }
-
-    pub(super) fn deserialize<'de, D>(deserializer: D) -> Result<Vec<u8>, D::Error>
-    where
-        D: Deserializer<'de>,
-    {
-        #[derive(Deserialize)]
-        #[serde(untagged)]
-        enum EncodedBytes {
-            Base64(String),
-            Legacy(Vec<u8>),
-        }
-
-        match EncodedBytes::deserialize(deserializer)? {
-            EncodedBytes::Base64(value) => base64_simd::STANDARD
-                .decode_to_vec(value.as_bytes())
-                .or_else(|_| base64_simd::STANDARD_NO_PAD.decode_to_vec(value.as_bytes()))
-                .or_else(|_| base64_simd::URL_SAFE.decode_to_vec(value.as_bytes()))
-                .or_else(|_| base64_simd::URL_SAFE_NO_PAD.decode_to_vec(value.as_bytes()))
-                .map_err(de::Error::custom),
-            EncodedBytes::Legacy(value) => Ok(value),
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn tier_creds_accepts_madmin_wire_names_and_base64_gcs_json() {
-        let service_account = r#"{"type":"service_account","project_id":"tier-🚀x"}"#.as_bytes();
-        let encoded = "eyJ0eXBlIjoic2VydmljZV9hY2NvdW50IiwicHJvamVjdF9pZCI6InRpZXIt8J+agHgifQ==";
-        let creds: TierCreds = serde_json::from_value(serde_json::json!({
-            "access": "access",
-            "secret": "secret",
-            "awsrole": false,
-            "creds": encoded,
-        }))
-        .expect("madmin tier credentials should decode");
-
-        assert_eq!(creds.access_key, "access");
-        assert_eq!(creds.secret_key, "secret");
-        assert_eq!(creds.creds_json.as_slice(), service_account);
-
-        let wire = serde_json::to_value(&creds).expect("madmin tier credentials should encode");
-        assert_eq!(wire["access"], "access");
-        assert_eq!(wire["secret"], "secret");
-        assert_eq!(wire["creds"], encoded);
-        assert!(wire.get("accessKey").is_none());
-        assert!(wire.get("secretKey").is_none());
-
-        let legacy: TierCreds = serde_json::from_value(serde_json::json!({
-            "accessKey": "legacy-access",
-            "secretKey": "legacy-secret",
-            "credsJson": service_account,
-        }))
-        .expect("the former RustFS field names and byte-array encoding should remain readable");
-        assert_eq!(legacy.access_key, "legacy-access");
-        assert_eq!(legacy.secret_key, "legacy-secret");
-        assert_eq!(legacy.creds_json.as_slice(), service_account);
-    }
-
-    #[test]
-    fn tier_creds_accepts_all_supported_base64_alphabets_and_padding_modes() {
-        let service_account = r#"{"type":"service_account","project_id":"tier-🚀"}"#.as_bytes();
-        for encoder in [
-            base64_simd::STANDARD,
-            base64_simd::STANDARD_NO_PAD,
-            base64_simd::URL_SAFE,
-            base64_simd::URL_SAFE_NO_PAD,
-        ] {
-            let encoded = encoder.encode_to_string(service_account);
-            let creds: TierCreds = serde_json::from_value(serde_json::json!({ "creds": encoded }))
-                .expect("all supported madmin base64 forms should decode");
-            assert_eq!(creds.creds_json, service_account);
-        }
-    }
-
-    #[test]
-    fn tier_creds_debug_redacts_secret_payloads() {
-        let creds = TierCreds {
-            access_key: "access".to_string(),
-            secret_key: "tier-secret-value".to_string(),
-            aws_role_web_identity_token_file: "/var/run/private-token".to_string(),
-            creds_json: br#"{"private_key":"gcs-private-key-value"}"#.to_vec(),
-            ..Default::default()
-        };
-
-        let rendered = format!("{creds:?}");
-        assert!(!rendered.contains("tier-secret-value"));
-        assert!(!rendered.contains("/var/run/private-token"));
-        assert!(!rendered.contains("gcs-private-key-value"));
-    }
-
-    #[test]
-    fn tier_creds_accepts_canonical_madmin_azure_service_principal_wire_shape() {
-        let creds: TierCreds = serde_json::from_value(serde_json::json!({
-            "azSP": {
-                "TenantID": "tenant",
-                "ClientID": "client",
-                "ClientSecret": "service-principal-secret"
-            }
-        }))
-        .expect("canonical madmin azure service principal credentials should decode");
-
-        assert_eq!(creds.azure_service_principal.tenant_id, "tenant");
-        assert_eq!(creds.azure_service_principal.client_id, "client");
-        assert_eq!(creds.azure_service_principal.client_secret, "service-principal-secret");
-        let wire = serde_json::to_value(&creds).expect("canonical madmin credentials should encode");
-        assert_eq!(wire["azSP"]["TenantID"], "tenant");
-        assert_eq!(wire["azSP"]["ClientID"], "client");
-        assert_eq!(wire["azSP"]["ClientSecret"], "service-principal-secret");
-        assert!(!format!("{creds:?}").contains("service-principal-secret"));
-    }
-}
@@ -42,7 +42,7 @@ const WASABI_ALTERNATIVE_ENDPOINTS: &[(&str, &str)] = &[
 pub enum TierType {
    #[default]
    Unsupported,
-    #[serde(rename = "s3", alias = "S3")]
+    #[serde(rename = "s3")]
    S3,
    #[serde(rename = "wasabi")]
    Wasabi,
@@ -58,7 +58,7 @@ pub enum TierType {
    Huaweicloud,
    #[serde(rename = "azure")]
    Azure,
-    #[serde(rename = "gcs", alias = "GCS")]
+    #[serde(rename = "gcs")]
    GCS,
    #[serde(rename = "r2")]
    R2,
@@ -138,18 +138,16 @@ impl TierType {
    }
 }

-pub(crate) const TIER_CREDENTIAL_REDACTED: &str = "REDACTED";
-
-#[derive(Default, Serialize, Deserialize)]
+#[derive(Default, Debug, Serialize, Deserialize)]
 #[serde(default)]
 pub struct TierConfig {
    #[serde(skip)]
    pub version: String,
-    #[serde(rename = "type", alias = "Type")]
+    #[serde(rename = "type")]
    pub tier_type: TierType,
-    #[serde(rename = "Name", alias = "name", skip_serializing)]
+    #[serde(skip)]
    pub name: String,
-    #[serde(rename = "s3", alias = "S3", skip_serializing_if = "Option::is_none")]
+    #[serde(rename = "s3", skip_serializing_if = "Option::is_none")]
    pub s3: Option<TierS3>,
    #[serde(rename = "wasabi", skip_serializing_if = "Option::is_none")]
    pub wasabi: Option<TierWasabi>,
@@ -161,7 +159,7 @@ pub struct TierConfig {
    pub huaweicloud: Option<TierHuaweicloud>,
    #[serde(rename = "azure", skip_serializing_if = "Option::is_none")]
    pub azure: Option<TierAzure>,
-    #[serde(rename = "gcs", alias = "GCS", skip_serializing_if = "Option::is_none")]
+    #[serde(rename = "gcs", skip_serializing_if = "Option::is_none")]
    pub gcs: Option<TierGCS>,
    #[serde(rename = "r2", skip_serializing_if = "Option::is_none")]
    pub r2: Option<TierR2>,
@@ -172,91 +170,109 @@ pub struct TierConfig {
 }

 impl Clone for TierConfig {
-    fn clone(&self) -> Self {
-        self.redacted()
+    fn clone(&self) -> TierConfig {
+        let mut s3 = None;
+        let mut wasabi = None;
+        let mut r = None;
+        let mut compatible_backend = None;
+        let mut aliyun = None;
+        let mut tencent = None;
+        let mut huaweicloud = None;
+        let mut azure = None;
+        let mut gcs = None;
+        let mut r2 = None;
+        match self.tier_type {
+            TierType::S3 => {
+                if let Some(s3_) = self.s3.as_ref() {
+                    let mut s3_clone = s3_.clone();
+                    s3_clone.secret_key = "REDACTED".to_string();
+                    s3 = Some(s3_clone);
+                }
+            }
+            TierType::Wasabi => {
+                if let Some(wasabi_) = self.wasabi.as_ref() {
+                    let mut wasabi_clone = wasabi_.clone();
+                    wasabi_clone.secret_key = "REDACTED".to_string();
+                    wasabi = Some(wasabi_clone);
+                }
+            }
+            TierType::RustFS => {
+                if let Some(r_) = self.rustfs.as_ref() {
+                    let mut r_clone = r_.clone();
+                    r_clone.secret_key = "REDACTED".to_string();
+                    r = Some(r_clone);
+                }
+            }
+            TierType::MinIO => {
+                if let Some(compatible_backend_) = self.minio.as_ref() {
+                    let mut compatible_backend_clone = compatible_backend_.clone();
+                    compatible_backend_clone.secret_key = "REDACTED".to_string();
+                    compatible_backend = Some(compatible_backend_clone);
+                }
+            }
+            TierType::Aliyun => {
+                if let Some(aliyun_) = self.aliyun.as_ref() {
+                    let mut aliyun_clone = aliyun_.clone();
+                    aliyun_clone.secret_key = "REDACTED".to_string();
+                    aliyun = Some(aliyun_clone);
+                }
+            }
+            TierType::Tencent => {
+                if let Some(tencent_) = self.tencent.as_ref() {
+                    let mut tencent_clone = tencent_.clone();
+                    tencent_clone.secret_key = "REDACTED".to_string();
+                    tencent = Some(tencent_clone);
+                }
+            }
+            TierType::Huaweicloud => {
+                if let Some(huaweicloud_) = self.huaweicloud.as_ref() {
+                    let mut huaweicloud_clone = huaweicloud_.clone();
+                    huaweicloud_clone.secret_key = "REDACTED".to_string();
+                    huaweicloud = Some(huaweicloud_clone);
+                }
+            }
+            TierType::Azure => {
+                if let Some(azure_) = self.azure.as_ref() {
+                    let mut azure_clone = azure_.clone();
+                    azure_clone.secret_key = "REDACTED".to_string();
+                    azure = Some(azure_clone);
+                }
+            }
+            TierType::GCS => {
+                if let Some(gcs_) = self.gcs.as_ref() {
+                    let mut gcs_clone = gcs_.clone();
+                    gcs_clone.creds = "REDACTED".to_string();
+                    gcs = Some(gcs_clone);
+                }
+            }
+            TierType::R2 => {
+                if let Some(r2_) = self.r2.as_ref() {
+                    let mut r2_clone = r2_.clone();
+                    r2_clone.secret_key = "REDACTED".to_string();
+                    r2 = Some(r2_clone);
+                }
+            }
+            _ => (),
+        }
+        TierConfig {
+            version: self.version.clone(),
+            tier_type: self.tier_type.clone(),
+            name: self.name.clone(),
+            s3,
+            wasabi,
+            rustfs: r,
+            minio: compatible_backend,
+            aliyun,
+            tencent,
+            huaweicloud,
+            azure,
+            gcs,
+            r2,
+        }
    }
 }

 impl TierConfig {
-    pub(crate) fn redacted(&self) -> Self {
-        let mut redacted = Self {
-            version: self.version.clone(),
-            tier_type: self.tier_type.clone(),
-            name: self.name.clone(),
-            ..Default::default()
-        };
-        match self.tier_type {
-            TierType::S3 => {
-                redacted.s3 = self.s3.clone().map(|mut backend| {
-                    backend.secret_key = TIER_CREDENTIAL_REDACTED.to_string();
-                    if !backend.aws_role_web_identity_token_file.is_empty() {
-                        backend.aws_role_web_identity_token_file = TIER_CREDENTIAL_REDACTED.to_string();
-                    }
-                    backend
-                });
-            }
-            TierType::Wasabi => {
-                redacted.wasabi = self.wasabi.clone().map(|mut backend| {
-                    backend.secret_key = TIER_CREDENTIAL_REDACTED.to_string();
-                    backend
-                });
-            }
-            TierType::RustFS => {
-                redacted.rustfs = self.rustfs.clone().map(|mut backend| {
-                    backend.secret_key = TIER_CREDENTIAL_REDACTED.to_string();
-                    backend
-                });
-            }
-            TierType::MinIO => {
-                redacted.minio = self.minio.clone().map(|mut backend| {
-                    backend.secret_key = TIER_CREDENTIAL_REDACTED.to_string();
-                    backend
-                });
-            }
-            TierType::Aliyun => {
-                redacted.aliyun = self.aliyun.clone().map(|mut backend| {
-                    backend.secret_key = TIER_CREDENTIAL_REDACTED.to_string();
-                    backend
-                });
-            }
-            TierType::Tencent => {
-                redacted.tencent = self.tencent.clone().map(|mut backend| {
-                    backend.secret_key = TIER_CREDENTIAL_REDACTED.to_string();
-                    backend
-                });
-            }
-            TierType::Huaweicloud => {
-                redacted.huaweicloud = self.huaweicloud.clone().map(|mut backend| {
-                    backend.secret_key = TIER_CREDENTIAL_REDACTED.to_string();
-                    backend
-                });
-            }
-            TierType::Azure => {
-                redacted.azure = self.azure.clone().map(|mut backend| {
-                    backend.secret_key = TIER_CREDENTIAL_REDACTED.to_string();
-                    if !backend.sp_auth.client_secret.is_empty() {
-                        backend.sp_auth.client_secret = TIER_CREDENTIAL_REDACTED.to_string();
-                    }
-                    backend
-                });
-            }
-            TierType::GCS => {
-                redacted.gcs = self.gcs.clone().map(|mut backend| {
-                    backend.creds = TIER_CREDENTIAL_REDACTED.to_string();
-                    backend
-                });
-            }
-            TierType::R2 => {
-                redacted.r2 = self.r2.clone().map(|mut backend| {
-                    backend.secret_key = TIER_CREDENTIAL_REDACTED.to_string();
-                    backend
-                });
-            }
-            TierType::Unsupported => {}
-        }
-        redacted
-    }
-
    pub(crate) fn clone_with_credentials(&self) -> Self {
        Self {
            version: self.version.clone(),
@@ -356,61 +372,31 @@ impl TierConfig {
    }
 }

-impl std::fmt::Debug for TierConfig {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        let redacted = self.redacted();
-        f.debug_struct("TierConfig")
-            .field("version", &redacted.version)
-            .field("tier_type", &redacted.tier_type)
-            .field("name", &redacted.name)
-            .field("s3", &redacted.s3)
-            .field("wasabi", &redacted.wasabi)
-            .field("aliyun", &redacted.aliyun)
-            .field("tencent", &redacted.tencent)
-            .field("huaweicloud", &redacted.huaweicloud)
-            .field("azure", &redacted.azure)
-            .field("gcs", &redacted.gcs)
-            .field("r2", &redacted.r2)
-            .field("rustfs", &redacted.rustfs)
-            .field("minio", &redacted.minio)
-            .finish()
-    }
-}
-
 //type S3Options = impl Fn(TierS3) -> Pin<Box<Result<()>>> + Send + Sync + 'static;

 #[derive(Serialize, Deserialize, Default, Debug, Clone)]
 #[serde(default)]
 pub struct TierS3 {
-    #[serde(alias = "Name")]
    pub name: String,
-    #[serde(alias = "Endpoint")]
    pub endpoint: String,
-    #[serde(rename = "accessKey", alias = "AccessKey")]
+    #[serde(rename = "accessKey")]
    pub access_key: String,
-    #[serde(rename = "secretKey", alias = "SecretKey")]
+    #[serde(rename = "secretKey")]
    pub secret_key: String,
-    #[serde(alias = "Bucket")]
    pub bucket: String,
-    #[serde(alias = "Prefix")]
    pub prefix: String,
-    #[serde(alias = "Region")]
    pub region: String,
-    #[serde(rename = "storageClass", alias = "StorageClass")]
+    #[serde(rename = "storageClass")]
    pub storage_class: String,
-    #[serde(rename = "AWSRole", alias = "awsRole", skip_serializing)]
+    #[serde(skip)]
    pub aws_role: bool,
-    #[serde(
-        rename = "AWSRoleWebIdentityTokenFile",
-        alias = "awsRoleWebIdentityTokenFile",
-        skip_serializing
-    )]
+    #[serde(skip)]
    pub aws_role_web_identity_token_file: String,
-    #[serde(rename = "AWSRoleARN", alias = "awsRoleARN", alias = "awsRoleArn", skip_serializing)]
+    #[serde(skip)]
    pub aws_role_arn: String,
-    #[serde(rename = "AWSRoleSessionName", alias = "awsRoleSessionName", skip_serializing)]
+    #[serde(skip)]
    pub aws_role_session_name: String,
-    #[serde(rename = "AWSRoleDurationSeconds", alias = "awsRoleDurationSeconds", skip_serializing)]
+    #[serde(skip)]
    pub aws_role_duration_seconds: i32,
 }

@@ -637,11 +623,8 @@ pub struct TierHuaweicloud {
 #[derive(Serialize, Deserialize, Default, Debug, Clone)]
 #[serde(default)]
 pub struct ServicePrincipalAuth {
-    #[serde(alias = "TenantID")]
    pub tenant_id: String,
-    #[serde(alias = "ClientID")]
    pub client_id: String,
-    #[serde(alias = "ClientSecret")]
    pub client_secret: String,
 }

@@ -657,9 +640,9 @@ pub struct TierAzure {
    pub bucket: String,
    pub prefix: String,
    pub region: String,
-    #[serde(rename = "storageClass", alias = "StorageClass")]
+    #[serde(rename = "storageClass")]
    pub storage_class: String,
-    #[serde(rename = "spAuth", alias = "SPAuth")]
+    #[serde(rename = "spAuth")]
    pub sp_auth: ServicePrincipalAuth,
 }

@@ -713,19 +696,14 @@ fn AzureStorageClass(sc string) func(az *TierAzure) error {
 #[derive(Serialize, Deserialize, Default, Debug, Clone)]
 #[serde(default)]
 pub struct TierGCS {
-    #[serde(alias = "Name")]
    pub name: String,
-    #[serde(alias = "Endpoint")]
    pub endpoint: String,
-    #[serde(rename = "creds", alias = "Creds")]
+    #[serde(rename = "creds")]
    pub creds: String,
-    #[serde(alias = "Bucket")]
    pub bucket: String,
-    #[serde(alias = "Prefix")]
    pub prefix: String,
-    #[serde(alias = "Region")]
    pub region: String,
-    #[serde(rename = "storageClass", alias = "StorageClass")]
+    #[serde(rename = "storageClass")]
    pub storage_class: String,
 }

@@ -747,43 +725,6 @@ pub struct TierR2 {
 mod tests {
    use super::*;

-    #[test]
-    fn s3_gcs_type_uppercase_aliases_preserve_lowercase_output() {
-        let s3: TierType = serde_json::from_str(r#""S3""#).expect("uppercase S3 wire value should decode");
-        let gcs: TierType = serde_json::from_str(r#""GCS""#).expect("uppercase GCS wire value should decode");
-        assert!(matches!(s3, TierType::S3));
-        assert!(matches!(gcs, TierType::GCS));
-        assert_eq!(serde_json::to_string(&s3).expect("S3 type should encode"), r#""s3""#);
-        assert_eq!(serde_json::to_string(&gcs).expect("GCS type should encode"), r#""gcs""#);
-    }
-
-    #[test]
-    fn azure_service_principal_accepts_canonical_madmin_field_names() {
-        for field in ["TenantID", "ClientID", "ClientSecret"] {
-            let mut sp_auth = serde_json::Map::new();
-            sp_auth.insert(field.to_string(), serde_json::Value::String("present".to_string()));
-            let config: TierConfig = serde_json::from_value(serde_json::json!({
-                "type": "azure",
-                "Name": "COLD-AZURE",
-                "azure": {
-                    "name": "COLD-AZURE",
-                    "endpoint": "https://azure.example.invalid",
-                    "accessKey": "account",
-                    "secretKey": "key",
-                    "bucket": "archive",
-                    "SPAuth": sp_auth
-                }
-            }))
-            .expect("mixed RustFS/madmin Azure payload should decode");
-            let sp_auth = &config.azure.expect("Azure payload should exist").sp_auth;
-
-            assert!(
-                !sp_auth.tenant_id.is_empty() || !sp_auth.client_id.is_empty() || !sp_auth.client_secret.is_empty(),
-                "canonical {field} must not be silently discarded"
-            );
-        }
-    }
-
    fn wasabi_config() -> TierWasabi {
        TierWasabi {
            name: "COLD-WASABI".to_string(),
@@ -897,14 +838,9 @@ mod tests {
        let config = TierConfig {
            tier_type: TierType::Wasabi,
            wasabi: Some(wasabi_config()),
-            rustfs: Some(TierRustFS {
-                access_key: "inactive-access".to_string(),
-                secret_key: "inactive-secret".to_string(),
-                ..Default::default()
-            }),
            ..Default::default()
        };
-        let redacted = config.redacted();
+        let redacted = config.clone();
        assert_eq!(
            redacted
                .wasabi
@@ -913,46 +849,21 @@ mod tests {
                .secret_key,
            "REDACTED"
        );
-        assert!(redacted.rustfs.is_none(), "the external view should retain only the active provider");
-        let cloned = config.clone();
-        assert_eq!(cloned.wasabi.expect("redacted Wasabi clone should remain").secret_key, "REDACTED");
-        assert!(cloned.rustfs.is_none(), "ordinary Clone must retain its redacted API semantics");
-        let preserved = config.clone_with_credentials();
        assert_eq!(
-            preserved
+            config
+                .clone_with_credentials()
                .wasabi
                .as_ref()
-                .expect("credential-bearing Wasabi snapshot should remain")
+                .expect("credential-bearing Wasabi payload should remain")
                .secret_key,
            "secret"
        );
-        assert_eq!(
-            preserved
-                .rustfs
-                .expect("credential-bearing snapshots should preserve inactive provider data")
-                .secret_key,
-            "inactive-secret"
-        );

        let mut debug_config = wasabi_config();
        debug_config.secret_key = "wasabi-debug-secret-value".to_string();
        let debug = format!("{debug_config:?}");
        assert!(debug.contains("REDACTED"));
        assert!(!debug.contains("wasabi-debug-secret-value"));
-
-        let debug = format!(
-            "{:?}",
-            TierConfig {
-                tier_type: TierType::RustFS,
-                rustfs: Some(TierRustFS {
-                    secret_key: "rustfs-debug-secret-value".to_string(),
-                    ..Default::default()
-                }),
-                ..Default::default()
-            }
-        );
-        assert!(debug.contains("REDACTED"));
-        assert!(!debug.contains("rustfs-debug-secret-value"));
    }

    #[test]
@@ -983,7 +894,7 @@ mod tests {
        assert_eq!(encoded, expected);
        let decoded: TierConfig = serde_json::from_value(encoded).expect("Wasabi Admin JSON should decode");
        assert!(matches!(decoded.tier_type, TierType::Wasabi));
-        let redacted = config.redacted();
+        let redacted = config.clone();
        assert_eq!(
            config
                .wasabi
@@ -1005,87 +916,4 @@ mod tests {
            "REDACTED"
        );
    }
-
-    #[test]
-    fn api_serialization_and_debug_redact_s3_gcs_and_azure_credentials() {
-        let cases = [
-            (
-                "s3",
-                TierConfig {
-                    tier_type: TierType::S3,
-                    s3: Some(TierS3 {
-                        secret_key: "s3-secret-bytes".to_string(),
-                        aws_role_web_identity_token_file: "/var/run/s3-private-token".to_string(),
-                        ..Default::default()
-                    }),
-                    ..Default::default()
-                },
-                vec!["s3-secret-bytes", "/var/run/s3-private-token"],
-            ),
-            (
-                "gcs",
-                TierConfig {
-                    tier_type: TierType::GCS,
-                    gcs: Some(TierGCS {
-                        creds: r#"{"type":"service_account","private_key":"gcs-private-key-bytes"}"#.to_string(),
-                        ..Default::default()
-                    }),
-                    ..Default::default()
-                },
-                vec!["gcs-private-key-bytes"],
-            ),
-            (
-                "azure",
-                TierConfig {
-                    tier_type: TierType::Azure,
-                    azure: Some(TierAzure {
-                        secret_key: "azure-account-secret-bytes".to_string(),
-                        sp_auth: ServicePrincipalAuth {
-                            client_secret: "azure-client-secret-bytes".to_string(),
-                            ..Default::default()
-                        },
-                        ..Default::default()
-                    }),
-                    ..Default::default()
-                },
-                vec!["azure-account-secret-bytes", "azure-client-secret-bytes"],
-            ),
-        ];
-
-        for (provider, config, secrets) in cases {
-            let api = serde_json::to_string(&config.redacted()).expect("redacted API config should serialize");
-            let debug = format!("{config:?}");
-            assert!(api.contains(TIER_CREDENTIAL_REDACTED), "{provider} API output should be visibly redacted");
-            assert!(
-                debug.contains(TIER_CREDENTIAL_REDACTED),
-                "{provider} Debug output should be visibly redacted"
-            );
-            for secret in secrets {
-                assert!(!api.contains(secret), "{provider} API output exposed credential bytes");
-                assert!(!debug.contains(secret), "{provider} Debug output exposed credential bytes");
-            }
-        }
-    }
-
-    #[test]
-    fn azure_static_account_redaction_preserves_an_empty_service_principal_secret() {
-        let config = TierConfig {
-            tier_type: TierType::Azure,
-            azure: Some(TierAzure {
-                secret_key: "azure-account-secret-bytes".to_string(),
-                sp_auth: ServicePrincipalAuth::default(),
-                ..Default::default()
-            }),
-            ..Default::default()
-        };
-
-        let api = serde_json::to_value(config.redacted()).expect("redacted Azure API config should serialize");
-        let debug = format!("{config:?}");
-
-        assert_eq!(api["azure"]["secretKey"], TIER_CREDENTIAL_REDACTED);
-        assert_eq!(api["azure"]["spAuth"]["client_secret"], "");
-        assert!(debug.contains("client_secret: \"\""));
-        assert!(!debug.contains("client_secret: \"REDACTED\""));
-        assert!(!debug.contains("azure-account-secret-bytes"));
-    }
 }
@@ -460,7 +460,6 @@ where
        data,
        &ObjectOptions {
            max_parity: true,
-            write_completion: crate::object_api::WriteCompletion::TailDrained,
            http_preconditions: Some(HTTPPreconditions {
                if_none_match: Some("*".to_string()),
                ..Default::default()
@@ -557,7 +556,6 @@ where
        data,
        &ObjectOptions {
            max_parity: true,
-            write_completion: crate::object_api::WriteCompletion::TailDrained,
            http_preconditions: Some(HTTPPreconditions {
                if_match: Some(current_etag.to_string()),
                ..Default::default()
@@ -19,14 +19,13 @@
 #![allow(clippy::all)]

 use crate::error::is_err_bucket_not_found;
-#[cfg(feature = "gcs")]
-use crate::services::tier::warm_backend_gcs::WarmBackendGCS;
 use crate::services::tier::{
-    tier::{ERR_TIER_BACKEND_IN_USE, ERR_TIER_INVALID_CONFIG, ERR_TIER_TYPE_UNSUPPORTED},
+    tier::{ERR_TIER_INVALID_CONFIG, ERR_TIER_TYPE_UNSUPPORTED},
    tier_config::{TierConfig, TierType},
    tier_handlers::{ERR_TIER_BUCKET_NOT_FOUND, ERR_TIER_NOT_FOUND, ERR_TIER_PERM_ERR},
    warm_backend_aliyun::WarmBackendAliyun,
    warm_backend_azure::WarmBackendAzure,
+    warm_backend_gcs::WarmBackendGCS,
    warm_backend_huaweicloud::WarmBackendHuaweicloud,
    warm_backend_minio::WarmBackendMinIO,
    warm_backend_r2::WarmBackendR2,
@@ -38,10 +37,9 @@ use crate::services::tier::{
 use bytes::Bytes;
 use http::StatusCode;
 use rustfs_s3_client::credentials::{Credentials, SignatureType, Static, Value};
-use rustfs_s3_client::transition_api::{BucketLookupType, Options, TransitionClient, TransitionClientTimeouts, TransitionCore};
+use rustfs_s3_client::transition_api::{BucketLookupType, Options, TransitionClient, TransitionCore};
 use rustfs_s3_client::{
    admin_handler_utils::AdminError,
-    api_error_response::to_error_response,
    api_put_object::{AdvancedPutOptions, PutObjectOptions},
    transition_api::{ReadCloser, ReaderImpl},
 };
@@ -50,31 +48,25 @@ use rustfs_utils::egress::validate_outbound_url;
 use rustfs_utils::http::headers::{
    CACHE_CONTROL, CONTENT_DISPOSITION, CONTENT_ENCODING, CONTENT_LANGUAGE, CONTENT_TYPE, EXPIRES, HeaderExt as _,
 };
+use s3s::dto::{ObjectLockLegalHoldStatus, ObjectLockRetentionMode, ReplicationStatus};
 use s3s::header::{
    X_AMZ_OBJECT_LOCK_LEGAL_HOLD, X_AMZ_OBJECT_LOCK_MODE, X_AMZ_OBJECT_LOCK_RETAIN_UNTIL_DATE, X_AMZ_REPLICATION_STATUS,
    X_AMZ_STORAGE_CLASS,
 };
-use s3s::{
-    S3ErrorCode,
-    dto::{ObjectLockLegalHoldStatus, ObjectLockRetentionMode, ReplicationStatus},
-};
 use std::collections::HashMap;
 use std::sync::Arc;
-use std::time::Duration;
 use time::OffsetDateTime;
 use time::format_description::well_known::{Rfc2822, Rfc3339};
-use tokio::io::AsyncReadExt;
 use tracing::{info, warn};

 pub type WarmBackendImpl = Box<dyn WarmBackend + Send + Sync + 'static>;

+const PROBE_OBJECT: &str = "probeobject";
+
 /// Largest object the S3-compatible warm backends accept for a multipart put.
 pub(crate) const MAX_MULTIPART_PUT_OBJECT_SIZE: i64 = 1024 * 1024 * 1024 * 1024 * 5;
 /// Part-count ceiling S3-compatible services impose on a multipart upload.
 pub(crate) const MAX_PARTS_COUNT: i64 = 10000;
-pub(crate) const WARM_BACKEND_PROBE_TIMEOUT: Duration = Duration::from_secs(30);
-const WARM_BACKEND_PROBE_RECONCILE_INTERVAL: Duration = Duration::from_secs(1);
-const WARM_BACKEND_PROBE_FINAL_RECONCILE_TIMEOUT: Duration = Duration::from_secs(1);

 #[derive(Default)]
 pub struct WarmBackendGetOpts {
@@ -86,6 +78,8 @@ pub struct WarmBackendGetOpts {
 pub enum TransitionCandidateProbe {
    Missing,
    UnversionedPresent,
+    /// The provider listed the candidate under the exact S3 `null` version.
+    SuspendedNullPresent,
    VersionedPresent(String),
    Ambiguous,
    Unsupported,
@@ -146,42 +140,6 @@ pub trait WarmBackend {
    async fn probe_transition_candidate(&self, _object: &str) -> Result<TransitionCandidateProbe, std::io::Error> {
        Ok(TransitionCandidateProbe::Unsupported)
    }
-    async fn probe_transition_version(
-        &self,
-        object: &str,
-        remote_version_id: &str,
-    ) -> Result<TransitionCandidateProbe, std::io::Error> {
-        if remote_version_id.is_empty() {
-            return Err(std::io::Error::new(
-                std::io::ErrorKind::InvalidInput,
-                "an exact tier probe requires a remote version ID",
-            ));
-        }
-        self.validate_remote_version_id(remote_version_id)?;
-        match self
-            .get(
-                object,
-                remote_version_id,
-                WarmBackendGetOpts {
-                    start_offset: 0,
-                    length: 1,
-                },
-            )
-            .await
-        {
-            Ok(_) => Ok(TransitionCandidateProbe::VersionedPresent(remote_version_id.to_string())),
-            Err(err) if matches!(to_error_response(&err).code, S3ErrorCode::InvalidRange) => {
-                Ok(TransitionCandidateProbe::VersionedPresent(remote_version_id.to_string()))
-            }
-            Err(err)
-                if err.kind() == std::io::ErrorKind::NotFound
-                    || matches!(to_error_response(&err).code, S3ErrorCode::NoSuchKey | S3ErrorCode::NoSuchVersion) =>
-            {
-                Ok(TransitionCandidateProbe::Missing)
-            }
-            Err(err) => Err(err),
-        }
-    }
    async fn in_use(&self) -> Result<bool, std::io::Error>;
 }

@@ -304,44 +262,6 @@ pub(crate) struct S3CompatibleWarmBackendParams<'a> {
    pub validate_endpoint: fn(&url::Url) -> Result<(), rustfs_utils::egress::OutboundUrlError>,
 }

-/// Return the authority format accepted by `TransitionClient::new` while
-/// retaining an explicitly configured port. `url::Url::host_str()` omits the
-/// brackets needed when an IPv6 literal is combined with a port.
-pub(crate) fn endpoint_authority(url: &url::Url) -> Result<String, std::io::Error> {
-    let host = url
-        .host_str()
-        .ok_or_else(|| std::io::Error::other("Invalid endpoint URL: missing host"))?;
-    let port = url.port().unwrap_or(if url.scheme() == "https" { 443 } else { 80 });
-    if host.starts_with('[') && host.ends_with(']') {
-        Ok(format!("{host}:{port}"))
-    } else if host.contains(':') {
-        Ok(format!("[{host}]:{port}"))
-    } else {
-        Ok(format!("{host}:{port}"))
-    }
-}
-
-fn transition_timeout_from_env(env_key: &str, default_secs: u64) -> Duration {
-    Duration::from_secs(rustfs_utils::get_env_u64(env_key, default_secs))
-}
-
-pub(crate) fn transition_client_timeouts_from_env() -> TransitionClientTimeouts {
-    TransitionClientTimeouts::new(
-        transition_timeout_from_env(
-            rustfs_config::ENV_TIER_REMOTE_CONNECT_TIMEOUT_SECS,
-            rustfs_config::DEFAULT_TIER_REMOTE_CONNECT_TIMEOUT_SECS,
-        ),
-        transition_timeout_from_env(
-            rustfs_config::ENV_TIER_REMOTE_REQUEST_TIMEOUT_SECS,
-            rustfs_config::DEFAULT_TIER_REMOTE_REQUEST_TIMEOUT_SECS,
-        ),
-        transition_timeout_from_env(
-            rustfs_config::ENV_TIER_REMOTE_RESPONSE_BODY_IDLE_TIMEOUT_SECS,
-            rustfs_config::DEFAULT_TIER_REMOTE_RESPONSE_BODY_IDLE_TIMEOUT_SECS,
-        ),
-    )
-}
-
 /// Build the [`WarmBackendS3`] shared by the S3-compatible warm backend providers.
 ///
 /// Credential, bucket, and endpoint validation run in this order because the
@@ -372,7 +292,6 @@ pub(crate) async fn new_s3_compatible_warm_backend(
        signer_type: SignatureType::SignatureV4,
        ..Default::default()
    }));
-    let timeouts = transition_client_timeouts_from_env();
    let opts = Options {
        creds,
        secure: u.scheme() == "https",
@@ -381,11 +300,17 @@ pub(crate) async fn new_s3_compatible_warm_backend(
        bucket_lookup: params.bucket_lookup,
        ..Default::default()
    };
-    let endpoint = endpoint_authority(&u)?;
-    // Run the SSRF guard after the host-presence check so a host-less endpoint
-    // keeps this constructor's stable error text.
+    let scheme = u.scheme();
+    let default_port = if scheme == "https" { 443 } else { 80 };
+    let host = u
+        .host_str()
+        .ok_or_else(|| std::io::Error::other("Invalid endpoint URL: missing host"))?;
+    // Runs after the host-presence check above (not immediately after Url::parse) so a
+    // host-less endpoint still reports this constructor's own "missing host" text instead of
+    // validate_endpoint's differently-worded rejection for the same input.
    (params.validate_endpoint)(&u).map_err(|err| std::io::Error::other(format!("tier endpoint is not allowed: {err}")))?;
-    let client = TransitionClient::new_with_timeouts(&endpoint, opts, params.provider_tag, timeouts).await?;
+    let client =
+        TransitionClient::new(&format!("{}:{}", host, u.port().unwrap_or(default_port)), opts, params.provider_tag).await?;

    let client = Arc::new(client);
    let core = TransitionCore(Arc::clone(&client));
@@ -500,17 +425,6 @@ impl WarmBackend for MeteredWarmBackend {
        Self::record(TierRequestOperation::Probe, result)
    }

-    async fn probe_transition_version(
-        &self,
-        object: &str,
-        remote_version_id: &str,
-    ) -> Result<TransitionCandidateProbe, std::io::Error> {
-        Self::record(
-            TierRequestOperation::Probe,
-            self.inner.probe_transition_version(object, remote_version_id).await,
-        )
-    }
-
    async fn in_use(&self) -> Result<bool, std::io::Error> {
        Self::record(TierRequestOperation::InUse, self.inner.in_use().await)
    }
@@ -539,187 +453,25 @@ impl TransitionCandidateReconciler for MeteredTransitionCandidateReconciler {
    }
 }

-async fn remove_discovered_probe_candidate(
-    w: &WarmBackendImpl,
-    probe_object: &str,
-    candidate: TransitionCandidateProbe,
-) -> Result<bool, std::io::Error> {
-    match candidate {
-        TransitionCandidateProbe::Missing => Ok(false),
-        TransitionCandidateProbe::VersionedPresent(remote_version_id) => {
-            w.remove_exact(probe_object, &remote_version_id).await?;
-            Ok(true)
-        }
-        TransitionCandidateProbe::UnversionedPresent => {
-            w.remove(probe_object, "").await?;
-            Ok(true)
-        }
-        TransitionCandidateProbe::Ambiguous => {
-            Err(std::io::Error::other("remote tier probe PUT produced multiple possible versions"))
-        }
-        TransitionCandidateProbe::Unsupported => Err(std::io::Error::new(
-            std::io::ErrorKind::Unsupported,
-            "remote tier cannot discover the outcome of a probe PUT",
-        )),
-    }
-}
-
-async fn compensate_uncertain_probe_put(
-    w: &WarmBackendImpl,
-    probe_object: &str,
-    settle_deadline: tokio::time::Instant,
-) -> Result<(), std::io::Error> {
-    let final_deadline = settle_deadline + WARM_BACKEND_PROBE_FINAL_RECONCILE_TIMEOUT;
-    let mut removed_any = false;
-    while tokio::time::Instant::now() < settle_deadline {
-        let candidate = match tokio::time::timeout_at(settle_deadline, w.probe_transition_candidate(probe_object)).await {
-            Ok(candidate) => candidate?,
-            Err(_) => break,
-        };
-        if matches!(candidate, TransitionCandidateProbe::Missing) && removed_any {
-            break;
-        }
-        removed_any |= tokio::time::timeout_at(settle_deadline, remove_discovered_probe_candidate(w, probe_object, candidate))
-            .await
-            .map_err(|_| std::io::Error::new(std::io::ErrorKind::TimedOut, "timed out reconciling a remote tier probe PUT"))??;
-
-        let now = tokio::time::Instant::now();
-        if now >= settle_deadline {
-            break;
-        }
-        tokio::time::sleep_until(std::cmp::min(settle_deadline, now + WARM_BACKEND_PROBE_RECONCILE_INTERVAL)).await;
-    }
-
-    let candidate = tokio::time::timeout_at(final_deadline, w.probe_transition_candidate(probe_object))
-        .await
-        .map_err(|_| {
-            std::io::Error::new(std::io::ErrorKind::TimedOut, "timed out confirming the final remote tier probe state")
-        })??;
-    if !tokio::time::timeout_at(final_deadline, remove_discovered_probe_candidate(w, probe_object, candidate))
-        .await
-        .map_err(|_| {
-            std::io::Error::new(std::io::ErrorKind::TimedOut, "timed out removing the final remote tier probe candidate")
-        })??
-    {
-        return Ok(());
-    }
-
-    let final_candidate = tokio::time::timeout_at(final_deadline, w.probe_transition_candidate(probe_object))
-        .await
-        .map_err(|_| std::io::Error::new(std::io::ErrorKind::TimedOut, "timed out confirming remote tier probe cleanup"))??;
-    match final_candidate {
-        TransitionCandidateProbe::Missing => Ok(()),
-        _ => Err(std::io::Error::other("remote tier probe cleanup could not be confirmed")),
-    }
-}
-
-fn probe_cleanup_incomplete_error() -> AdminError {
-    let mut err = ERR_TIER_PERM_ERR.clone();
-    err.message = "Remote tier probe outcome is uncertain; cleanup is incomplete".to_string();
-    err
-}
-
-async fn check_warm_backend_with_deadlines(
-    w: Option<&WarmBackendImpl>,
-    deadline: tokio::time::Instant,
-    cleanup_deadline: tokio::time::Instant,
-) -> Result<(), AdminError> {
+pub async fn check_warm_backend(w: Option<&WarmBackendImpl>) -> Result<(), AdminError> {
    let w = w.ok_or_else(|| ERR_TIER_NOT_FOUND.clone())?;
-    let probe_object = format!("rustfs-tier-probe-{}", uuid::Uuid::new_v4());
-    let timeout_error = || {
-        let mut err = ERR_TIER_BACKEND_IN_USE.clone();
-        err.message = "Timed out validating the remote tier mutation".to_string();
-        err
-    };
-    tokio::time::timeout_at(deadline, w.validate())
+    w.validate().await.map_err(|_| ERR_TIER_INVALID_CONFIG.clone())?;
+    let remote_version_id = w
+        .put(PROBE_OBJECT, ReaderImpl::Body(Bytes::from("RustFS".as_bytes().to_vec())), 5)
        .await
-        .map_err(|_| timeout_error())?
-        .map_err(|_| ERR_TIER_INVALID_CONFIG.clone())?;
-    let put_result =
-        tokio::time::timeout_at(deadline, w.put(&probe_object, ReaderImpl::Body(Bytes::from_static(b"RustFS")), 6)).await;
-    let remote_version_id = match put_result {
-        Ok(Ok(remote_version_id)) => remote_version_id,
-        Ok(Err(_)) => {
-            return Err(match compensate_uncertain_probe_put(w, &probe_object, cleanup_deadline).await {
-                Ok(()) => ERR_TIER_PERM_ERR.clone(),
-                Err(_) => probe_cleanup_incomplete_error(),
-            });
-        }
-        Err(_) => {
-            let err = timeout_error();
-            return Err(match compensate_uncertain_probe_put(w, &probe_object, cleanup_deadline).await {
-                Ok(()) => err,
-                Err(_) => probe_cleanup_incomplete_error(),
-            });
-        }
-    };
+        .map_err(|_| ERR_TIER_PERM_ERR.clone())?;

-    // S3-family backends do not replay a failed request before returning `Ok`,
-    // while GCS discovers every matching generation. The authoritative probe
-    // below therefore closes the acknowledged-PUT path; only an error or
-    // timeout needs the longer visibility reconciliation above.
-    let authoritative_candidate = match tokio::time::timeout_at(deadline, w.probe_transition_candidate(&probe_object)).await {
-        Ok(Ok(candidate)) => candidate,
-        Ok(Err(_)) | Err(_) => {
-            return Err(match compensate_uncertain_probe_put(w, &probe_object, cleanup_deadline).await {
-                Ok(()) => ERR_TIER_INVALID_CONFIG.clone(),
-                Err(_) => probe_cleanup_incomplete_error(),
-            });
-        }
-    };
-    let response_version_is_valid = w.validate_remote_version_id(&remote_version_id).is_ok();
-    let response_matches_candidate = match &authoritative_candidate {
-        TransitionCandidateProbe::UnversionedPresent => remote_version_id.is_empty(),
-        TransitionCandidateProbe::VersionedPresent(candidate_version) => candidate_version == &remote_version_id,
-        TransitionCandidateProbe::Missing | TransitionCandidateProbe::Ambiguous | TransitionCandidateProbe::Unsupported => false,
-    };
-    if !response_version_is_valid || !response_matches_candidate {
-        return Err(match compensate_uncertain_probe_put(w, &probe_object, cleanup_deadline).await {
-            Ok(()) => ERR_TIER_INVALID_CONFIG.clone(),
-            Err(_) => probe_cleanup_incomplete_error(),
-        });
-    }
-
-    let read_result = tokio::time::timeout_at(deadline, async {
-        let mut reader = w
-            .get(
-                &probe_object,
-                &remote_version_id,
-                WarmBackendGetOpts {
-                    start_offset: 0,
-                    length: 7,
-                },
-            )
+    if w.validate_remote_version_id(&remote_version_id).is_err() {
+        w.remove_exact(PROBE_OBJECT, &remote_version_id)
            .await
            .map_err(|_| ERR_TIER_PERM_ERR.clone())?;
-        let mut body = Vec::new();
-        reader
-            .take(7)
-            .read_to_end(&mut body)
-            .await
-            .map_err(|_| ERR_TIER_PERM_ERR.clone())?;
-        if body != b"RustFS" {
-            return Err(ERR_TIER_PERM_ERR.clone());
-        }
-        Ok(())
-    })
-    .await
-    .map_err(|_| timeout_error())
-    .and_then(|result| result);
-    let cleanup_result = tokio::time::timeout_at(cleanup_deadline, async {
-        if !remove_discovered_probe_candidate(w, &probe_object, authoritative_candidate).await? {
-            return Err(std::io::Error::other("remote tier probe disappeared before cleanup"));
-        }
-        match w.probe_transition_candidate(&probe_object).await? {
-            TransitionCandidateProbe::Missing => Ok(()),
-            _ => Err(std::io::Error::other("remote tier probe remained after cleanup")),
-        }
-    })
-    .await;
-    if !matches!(cleanup_result, Ok(Ok(()))) {
-        return Err(probe_cleanup_incomplete_error());
+        return Err(ERR_TIER_INVALID_CONFIG.clone());
    }
-    if let Err(err) = read_result {
+
+    let read_result = w.get(PROBE_OBJECT, &remote_version_id, WarmBackendGetOpts::default()).await;
+    let remove_result = w.remove(PROBE_OBJECT, &remote_version_id).await;
+    //xhttp.DrainBody(r);
+    if read_result.is_err() || remove_result.is_err() {
        //if is_err_bucket_not_found(&err) {
        //    return Err(ERR_TIER_BUCKET_NOT_FOUND);
        //}
@@ -727,28 +479,12 @@ async fn check_warm_backend_with_deadlines(
            return Err(ERR_TIER_MISSING_CREDENTIALS);
        }*/
        //else {
-        return Err(err);
+        return Err(ERR_TIER_PERM_ERR.clone());
        //}
    }
    Ok(())
 }

-/// Validate a backend using a caller-owned deadline while retaining a bounded
-/// reconciliation window for an uncertain probe PUT. The validation future is
-/// kept alive through cleanup so an outer timeout cannot abandon the remote
-/// probe object.
-pub(crate) async fn check_warm_backend_until(
-    w: Option<&WarmBackendImpl>,
-    deadline: tokio::time::Instant,
-) -> Result<(), AdminError> {
-    check_warm_backend_with_deadlines(w, deadline, deadline + WARM_BACKEND_PROBE_FINAL_RECONCILE_TIMEOUT).await
-}
-
-pub async fn check_warm_backend(w: Option<&WarmBackendImpl>) -> Result<(), AdminError> {
-    let deadline = tokio::time::Instant::now() + WARM_BACKEND_PROBE_TIMEOUT;
-    check_warm_backend_with_deadlines(w, deadline, deadline + WARM_BACKEND_PROBE_TIMEOUT).await
-}
-
 pub async fn new_warm_backend(tier: &TierConfig, probe: bool) -> Result<WarmBackendImpl, AdminError> {
    let mut d: Option<WarmBackendImpl> = None;
    match tier.tier_type {
@@ -913,15 +649,6 @@ pub async fn new_warm_backend(tier: &TierConfig, probe: bool) -> Result<WarmBack
                });
            }
        }
-        #[cfg(not(feature = "gcs"))]
-        TierType::GCS => {
-            return Err(AdminError {
-                code: ERR_TIER_TYPE_UNSUPPORTED.code.clone(),
-                message: "This build does not include the GCS backend; rebuild with the gcs feature".to_string(),
-                status_code: StatusCode::NOT_IMPLEMENTED,
-            });
-        }
-        #[cfg(feature = "gcs")]
        TierType::GCS => {
            if let Some(gcs_config) = tier.gcs.as_ref() {
                let dd = WarmBackendGCS::new(gcs_config, &tier.name).await;
@@ -976,7 +703,7 @@ pub async fn new_warm_backend(tier: &TierConfig, probe: bool) -> Result<WarmBack
    let d: WarmBackendImpl = Box::new(MeteredWarmBackend { inner: d });

    if probe {
-        check_warm_backend(Some(&d)).await?;
+        d.validate().await.map_err(|_| ERR_TIER_INVALID_CONFIG.clone())?;
    }
    Ok(d)
 }
@@ -1029,7 +756,6 @@ pub(crate) async fn new_transition_candidate_reconciler(
 #[cfg(test)]
 mod tests {
    use super::*;
-    use crate::services::tier::test_util::{MockWarmBackend, MockWarmOp};
    use crate::services::tier::tier_config::TierWasabi;
    use std::sync::{
        Arc,
@@ -1038,27 +764,6 @@ mod tests {

    const PROBE_VERSION: &str = "remote-v2";

-    #[cfg(not(feature = "gcs"))]
-    #[tokio::test]
-    async fn gcs_backend_not_compiled_preserves_config() {
-        let json = r#"{"name":"ARCHIVE","type":"gcs","gcs":{"bucket":"archive","creds":"secret"}}"#;
-        let tier: TierConfig = serde_json::from_str(json).expect("GCS config remains readable without the backend");
-        assert_eq!(tier.tier_type, TierType::GCS);
-        let encoded = serde_json::to_vec(&tier).expect("GCS config remains writable");
-        let restored: TierConfig = serde_json::from_slice(&encoded).expect("GCS config round trips");
-        assert_eq!(restored.tier_type, TierType::GCS);
-        let restored_gcs = restored.gcs.as_ref().expect("GCS settings preserved");
-        assert_eq!(restored_gcs.bucket, "archive");
-        assert_eq!(restored_gcs.creds, "secret");
-        assert_eq!(tier.redacted().gcs.expect("redacted GCS settings").creds, "REDACTED");
-        let error = match new_warm_backend(&tier, false).await {
-            Ok(_) => panic!("an excluded GCS backend cannot be constructed"),
-            Err(error) => error,
-        };
-        assert_eq!(error.code, ERR_TIER_TYPE_UNSUPPORTED.code);
-        assert_eq!(error.status_code, StatusCode::NOT_IMPLEMENTED);
-    }
-
    struct CountingBackend {
        put_result: fn() -> Result<String, std::io::Error>,
        removes: Arc<AtomicUsize>,
@@ -1217,38 +922,13 @@ mod tests {

    struct RejectingProbeVersionBackend {
        gets: Arc<AtomicUsize>,
-        present: Arc<std::sync::atomic::AtomicBool>,
        removed_versions: Arc<tokio::sync::Mutex<Vec<String>>>,
-        returned_version: String,
    }

    struct RecordingProbeBackend {
        get_versions: Arc<tokio::sync::Mutex<Vec<String>>>,
-        present: Arc<std::sync::atomic::AtomicBool>,
        removed_versions: Arc<tokio::sync::Mutex<Vec<String>>>,
-        remove_clears_candidate: bool,
        fail_get: bool,
-        body: ProbeBody,
-    }
-
-    struct HangingProbePutBackend {
-        put_started: Arc<tokio::sync::Notify>,
-        present: Arc<std::sync::atomic::AtomicBool>,
-        probes: Arc<AtomicUsize>,
-        removed_versions: Arc<tokio::sync::Mutex<Vec<String>>>,
-    }
-
-    struct LateVisibleProbeBackend {
-        visible_at: tokio::time::Instant,
-        removed: Arc<std::sync::atomic::AtomicBool>,
-        probes: Arc<AtomicUsize>,
-        removed_versions: Arc<tokio::sync::Mutex<Vec<String>>>,
-    }
-
-    #[derive(Clone, Copy)]
-    enum ProbeBody {
-        Exact,
-        Mismatch,
    }

    #[async_trait::async_trait]
@@ -1298,7 +978,7 @@ mod tests {
        }

        async fn put(&self, _object: &str, _r: ReaderImpl, _length: i64) -> Result<String, std::io::Error> {
-            Ok(self.returned_version.clone())
+            Ok(uuid::Uuid::nil().to_string())
        }

        async fn put_with_meta(
@@ -1321,19 +1001,10 @@ mod tests {
        }

        async fn remove_exact(&self, _object: &str, rv: &str) -> Result<(), std::io::Error> {
-            self.present.store(false, Ordering::SeqCst);
            self.removed_versions.lock().await.push(rv.to_string());
            Ok(())
        }

-        async fn probe_transition_candidate(&self, _object: &str) -> Result<TransitionCandidateProbe, std::io::Error> {
-            if self.present.load(Ordering::SeqCst) {
-                Ok(TransitionCandidateProbe::VersionedPresent(PROBE_VERSION.to_string()))
-            } else {
-                Ok(TransitionCandidateProbe::Missing)
-            }
-        }
-
        async fn in_use(&self) -> Result<bool, std::io::Error> {
            Ok(false)
        }
@@ -1360,121 +1031,15 @@ mod tests {
            if self.fail_get {
                Err(std::io::Error::other("probe GET failed"))
            } else {
-                match self.body {
-                    ProbeBody::Exact => Ok(ReadCloser::new(std::io::Cursor::new(b"RustFS".to_vec()))),
-                    ProbeBody::Mismatch => Ok(ReadCloser::new(std::io::Cursor::new(b"RustFT".to_vec()))),
-                }
+                Ok(ReadCloser::new(std::io::Cursor::new(Vec::new())))
            }
        }

        async fn remove(&self, _object: &str, rv: &str) -> Result<(), std::io::Error> {
-            if self.remove_clears_candidate {
-                self.present.store(false, Ordering::SeqCst);
-            }
            self.removed_versions.lock().await.push(rv.to_string());
            Ok(())
        }

-        async fn probe_transition_candidate(&self, _object: &str) -> Result<TransitionCandidateProbe, std::io::Error> {
-            if self.present.load(Ordering::SeqCst) {
-                Ok(TransitionCandidateProbe::VersionedPresent(PROBE_VERSION.to_string()))
-            } else {
-                Ok(TransitionCandidateProbe::Missing)
-            }
-        }
-
-        async fn in_use(&self) -> Result<bool, std::io::Error> {
-            Ok(false)
-        }
-    }
-
-    #[async_trait::async_trait]
-    impl WarmBackend for HangingProbePutBackend {
-        async fn put(&self, _object: &str, _r: ReaderImpl, _length: i64) -> Result<String, std::io::Error> {
-            self.put_started.notify_one();
-            std::future::pending().await
-        }
-
-        async fn put_with_meta(
-            &self,
-            object: &str,
-            r: ReaderImpl,
-            length: i64,
-            _meta: HashMap<String, String>,
-        ) -> Result<String, std::io::Error> {
-            self.put(object, r, length).await
-        }
-
-        async fn get(&self, _object: &str, _rv: &str, _opts: WarmBackendGetOpts) -> Result<ReadCloser, std::io::Error> {
-            Err(std::io::Error::other("GET must not run after a timed out probe PUT"))
-        }
-
-        async fn remove(&self, _object: &str, _rv: &str) -> Result<(), std::io::Error> {
-            Err(std::io::Error::other("generic remove must not replace exact probe cleanup"))
-        }
-
-        async fn remove_exact(&self, _object: &str, rv: &str) -> Result<(), std::io::Error> {
-            self.present.store(false, Ordering::SeqCst);
-            self.removed_versions.lock().await.push(rv.to_string());
-            Ok(())
-        }
-
-        async fn probe_transition_candidate(&self, _object: &str) -> Result<TransitionCandidateProbe, std::io::Error> {
-            self.probes.fetch_add(1, Ordering::SeqCst);
-            if self.present.load(Ordering::SeqCst) {
-                Ok(TransitionCandidateProbe::VersionedPresent(PROBE_VERSION.to_string()))
-            } else {
-                Ok(TransitionCandidateProbe::Missing)
-            }
-        }
-
-        async fn in_use(&self) -> Result<bool, std::io::Error> {
-            Ok(false)
-        }
-    }
-
-    #[async_trait::async_trait]
-    impl WarmBackend for LateVisibleProbeBackend {
-        async fn put(&self, _object: &str, _r: ReaderImpl, _length: i64) -> Result<String, std::io::Error> {
-            Err(std::io::Error::new(
-                std::io::ErrorKind::ConnectionReset,
-                "probe PUT response was lost before the object became visible",
-            ))
-        }
-
-        async fn put_with_meta(
-            &self,
-            object: &str,
-            r: ReaderImpl,
-            length: i64,
-            _meta: HashMap<String, String>,
-        ) -> Result<String, std::io::Error> {
-            self.put(object, r, length).await
-        }
-
-        async fn get(&self, _object: &str, _rv: &str, _opts: WarmBackendGetOpts) -> Result<ReadCloser, std::io::Error> {
-            Err(std::io::Error::other("GET must not run after a lost probe PUT response"))
-        }
-
-        async fn remove(&self, _object: &str, _rv: &str) -> Result<(), std::io::Error> {
-            Err(std::io::Error::other("generic remove must not replace exact probe cleanup"))
-        }
-
-        async fn remove_exact(&self, _object: &str, rv: &str) -> Result<(), std::io::Error> {
-            self.removed.store(true, Ordering::SeqCst);
-            self.removed_versions.lock().await.push(rv.to_string());
-            Ok(())
-        }
-
-        async fn probe_transition_candidate(&self, _object: &str) -> Result<TransitionCandidateProbe, std::io::Error> {
-            self.probes.fetch_add(1, Ordering::SeqCst);
-            if tokio::time::Instant::now() >= self.visible_at && !self.removed.load(Ordering::SeqCst) {
-                Ok(TransitionCandidateProbe::VersionedPresent(PROBE_VERSION.to_string()))
-            } else {
-                Ok(TransitionCandidateProbe::Missing)
-            }
-        }
-
        async fn in_use(&self) -> Result<bool, std::io::Error> {
            Ok(false)
        }
@@ -1535,15 +1100,13 @@ mod tests {
        assert_eq!(probe, TransitionCandidateProbe::Unsupported);
    }

-    #[tokio::test(start_paused = true)]
+    #[tokio::test]
    async fn check_warm_backend_removes_exact_probe_when_versioning_drifts() {
        let gets = Arc::new(AtomicUsize::new(0));
        let removed_versions = Arc::new(tokio::sync::Mutex::new(Vec::new()));
        let backend: WarmBackendImpl = Box::new(RejectingProbeVersionBackend {
            gets: gets.clone(),
-            present: Arc::new(std::sync::atomic::AtomicBool::new(true)),
            removed_versions: removed_versions.clone(),
-            returned_version: uuid::Uuid::nil().to_string(),
        });

        let err = check_warm_backend(Some(&backend))
@@ -1552,27 +1115,7 @@ mod tests {

        assert_eq!(err.code, ERR_TIER_INVALID_CONFIG.code);
        assert_eq!(gets.load(Ordering::SeqCst), 0);
-        assert_eq!(removed_versions.lock().await.as_slice(), [PROBE_VERSION]);
-    }
-
-    #[tokio::test(start_paused = true)]
-    async fn check_warm_backend_rejects_empty_put_version_for_a_versioned_candidate() {
-        let gets = Arc::new(AtomicUsize::new(0));
-        let removed_versions = Arc::new(tokio::sync::Mutex::new(Vec::new()));
-        let backend: WarmBackendImpl = Box::new(RejectingProbeVersionBackend {
-            gets: gets.clone(),
-            present: Arc::new(std::sync::atomic::AtomicBool::new(true)),
-            removed_versions: removed_versions.clone(),
-            returned_version: String::new(),
-        });
-
-        let err = check_warm_backend(Some(&backend))
-            .await
-            .expect_err("an empty PUT version must not read or generically delete a versioned object");
-
-        assert_eq!(err.code, ERR_TIER_INVALID_CONFIG.code);
-        assert_eq!(gets.load(Ordering::SeqCst), 0);
-        assert_eq!(removed_versions.lock().await.as_slice(), [PROBE_VERSION]);
+        assert_eq!(removed_versions.lock().await.as_slice(), [uuid::Uuid::nil().to_string()]);
    }

    #[tokio::test]
@@ -1581,11 +1124,8 @@ mod tests {
        let removed_versions = Arc::new(tokio::sync::Mutex::new(Vec::new()));
        let backend: WarmBackendImpl = Box::new(RecordingProbeBackend {
            get_versions: get_versions.clone(),
-            present: Arc::new(std::sync::atomic::AtomicBool::new(true)),
            removed_versions: removed_versions.clone(),
-            remove_clears_candidate: true,
            fail_get: false,
-            body: ProbeBody::Exact,
        });

        check_warm_backend(Some(&backend))
@@ -1602,11 +1142,8 @@ mod tests {
        let removed_versions = Arc::new(tokio::sync::Mutex::new(Vec::new()));
        let backend: WarmBackendImpl = Box::new(RecordingProbeBackend {
            get_versions: get_versions.clone(),
-            present: Arc::new(std::sync::atomic::AtomicBool::new(true)),
            removed_versions: removed_versions.clone(),
-            remove_clears_candidate: true,
            fail_get: true,
-            body: ProbeBody::Exact,
        });

        let err = check_warm_backend(Some(&backend))
@@ -1618,169 +1155,6 @@ mod tests {
        assert_eq!(removed_versions.lock().await.as_slice(), [PROBE_VERSION]);
    }

-    #[tokio::test]
-    async fn check_warm_backend_removes_probe_after_body_mismatch() {
-        let get_versions = Arc::new(tokio::sync::Mutex::new(Vec::new()));
-        let removed_versions = Arc::new(tokio::sync::Mutex::new(Vec::new()));
-        let backend: WarmBackendImpl = Box::new(RecordingProbeBackend {
-            get_versions,
-            present: Arc::new(std::sync::atomic::AtomicBool::new(true)),
-            removed_versions: removed_versions.clone(),
-            remove_clears_candidate: true,
-            fail_get: false,
-            body: ProbeBody::Mismatch,
-        });
-
-        let err = check_warm_backend(Some(&backend))
-            .await
-            .expect_err("a mismatched body should fail after cleanup");
-
-        assert_eq!(err.code, ERR_TIER_PERM_ERR.code);
-        assert_eq!(removed_versions.lock().await.as_slice(), [PROBE_VERSION]);
-    }
-
-    #[tokio::test]
-    async fn check_warm_backend_rejects_a_stale_candidate_after_successful_delete() {
-        let removed_versions = Arc::new(tokio::sync::Mutex::new(Vec::new()));
-        let backend: WarmBackendImpl = Box::new(RecordingProbeBackend {
-            get_versions: Arc::new(tokio::sync::Mutex::new(Vec::new())),
-            present: Arc::new(std::sync::atomic::AtomicBool::new(true)),
-            removed_versions: removed_versions.clone(),
-            remove_clears_candidate: false,
-            fail_get: false,
-            body: ProbeBody::Exact,
-        });
-
-        let err = check_warm_backend(Some(&backend))
-            .await
-            .expect_err("cleanup must not succeed while the deleted candidate remains visible");
-
-        assert_eq!(err.code, ERR_TIER_PERM_ERR.code);
-        assert!(err.message.contains("cleanup is incomplete"));
-        assert_eq!(removed_versions.lock().await.as_slice(), [PROBE_VERSION]);
-    }
-
-    #[tokio::test(start_paused = true)]
-    async fn check_warm_backend_reconciles_a_lost_put_response() {
-        let backend = MockWarmBackend::new();
-        backend.lose_next_put_response();
-        let driver: WarmBackendImpl = Box::new(backend.clone());
-
-        let err = check_warm_backend(Some(&driver))
-            .await
-            .expect_err("a lost probe PUT response must fail after compensation");
-
-        assert_eq!(err.code, ERR_TIER_PERM_ERR.code);
-        assert_eq!(backend.object_count().await, 0);
-        assert_eq!(backend.exact_remove_count(), 1);
-        let operations = backend.op_log().await;
-        let put = operations.iter().find_map(|operation| match operation {
-            MockWarmOp::Put { object } => Some(object),
-            _ => None,
-        });
-        let probe = operations.iter().find_map(|operation| match operation {
-            MockWarmOp::Probe { object } => Some(object),
-            _ => None,
-        });
-        let remove = operations.iter().find_map(|operation| match operation {
-            MockWarmOp::Remove { object } => Some(object),
-            _ => None,
-        });
-        let (Some(put), Some(probe), Some(remove)) = (put, probe, remove) else {
-            panic!("lost-response compensation should PUT, probe, and remove");
-        };
-        assert_eq!(put, probe);
-        assert_eq!(probe, remove);
-    }
-
-    #[tokio::test(start_paused = true)]
-    async fn check_warm_backend_retries_until_a_late_put_becomes_visible() {
-        let probes = Arc::new(AtomicUsize::new(0));
-        let removed_versions = Arc::new(tokio::sync::Mutex::new(Vec::new()));
-        let driver: WarmBackendImpl = Box::new(LateVisibleProbeBackend {
-            visible_at: tokio::time::Instant::now() + Duration::from_secs(5),
-            removed: Arc::new(std::sync::atomic::AtomicBool::new(false)),
-            probes: probes.clone(),
-            removed_versions: removed_versions.clone(),
-        });
-
-        let err = check_warm_backend(Some(&driver))
-            .await
-            .expect_err("a late-visible probe PUT must still report the lost response");
-
-        assert_eq!(err.code, ERR_TIER_PERM_ERR.code);
-        assert!(
-            probes.load(Ordering::SeqCst) > 5,
-            "reconciliation must not stop at the first Missing result"
-        );
-        assert_eq!(removed_versions.lock().await.as_slice(), [PROBE_VERSION]);
-    }
-
-    #[tokio::test]
-    async fn check_warm_backend_reports_incomplete_cleanup_without_guessing() {
-        for candidate in [TransitionCandidateProbe::Unsupported, TransitionCandidateProbe::Ambiguous] {
-            let backend = MockWarmBackend::new();
-            backend.set_transition_candidate_probe_override(Some(candidate)).await;
-            backend.lose_next_put_response();
-            let driver: WarmBackendImpl = Box::new(backend.clone());
-
-            let err = check_warm_backend(Some(&driver))
-                .await
-                .expect_err("an uncertain candidate must fail without a guessed delete");
-
-            assert_eq!(err.code, ERR_TIER_PERM_ERR.code);
-            assert!(err.message.contains("cleanup is incomplete"));
-            assert_eq!(backend.remove_count().await, 0);
-            assert_eq!(backend.object_count().await, 1);
-        }
-    }
-
-    #[tokio::test]
-    async fn check_warm_backend_reports_an_exact_cleanup_failure() {
-        let backend = MockWarmBackend::new();
-        backend.set_remove_failure(true);
-        backend.lose_next_put_response();
-        let driver: WarmBackendImpl = Box::new(backend.clone());
-
-        let err = check_warm_backend(Some(&driver))
-            .await
-            .expect_err("an exact cleanup failure must replace the ambiguous PUT error");
-
-        assert_eq!(err.code, ERR_TIER_PERM_ERR.code);
-        assert!(err.message.contains("cleanup is incomplete"));
-        assert_eq!(backend.exact_remove_count(), 1);
-        assert_eq!(backend.object_count().await, 1);
-    }
-
-    #[tokio::test(start_paused = true)]
-    async fn check_warm_backend_reconciles_a_timed_out_put() {
-        let put_started = Arc::new(tokio::sync::Notify::new());
-        let probes = Arc::new(AtomicUsize::new(0));
-        let removed_versions = Arc::new(tokio::sync::Mutex::new(Vec::new()));
-        let driver: WarmBackendImpl = Box::new(HangingProbePutBackend {
-            put_started: put_started.clone(),
-            present: Arc::new(std::sync::atomic::AtomicBool::new(true)),
-            probes: probes.clone(),
-            removed_versions: removed_versions.clone(),
-        });
-        let check = check_warm_backend(Some(&driver));
-        tokio::pin!(check);
-        tokio::select! {
-            _ = put_started.notified() => {}
-            result = &mut check => panic!("probe completed before the PUT timeout: {result:?}"),
-        }
-
-        tokio::time::advance(WARM_BACKEND_PROBE_TIMEOUT + Duration::from_millis(1)).await;
-        let err = check.await.expect_err("a timed out probe PUT must fail after compensation");
-
-        assert_eq!(err.code, ERR_TIER_BACKEND_IN_USE.code);
-        assert!(
-            probes.load(Ordering::SeqCst) > 1,
-            "timed-out PUT reconciliation must keep checking through the visibility window"
-        );
-        assert_eq!(removed_versions.lock().await.as_slice(), [PROBE_VERSION]);
-    }
-
    #[tokio::test]
    async fn new_wasabi_backend_honors_probe_flag() {
        let tier = TierConfig {
@@ -1926,15 +1300,6 @@ mod tests {
        assert_eq!(insecure.client.endpoint_url.port_or_known_default(), Some(80));
    }

-    #[test]
-    fn endpoint_authority_preserves_ipv6_brackets_and_explicit_port() {
-        let url = url::Url::parse("https://[2001:db8::1]:9443").expect("the IPv6 endpoint should parse");
-        assert_eq!(
-            endpoint_authority(&url).expect("the endpoint should have an authority"),
-            "[2001:db8::1]:9443"
-        );
-    }
-
    #[tokio::test]
    async fn s3_compatible_backend_strips_only_a_trailing_prefix_separator() {
        let mut params = s3_compatible_params("http://tier.example.com:9000");
@@ -15,13 +15,15 @@
 #![allow(unused_variables)]
 #![allow(unused_mut)]
 #![allow(unused_assignments)]
+#![allow(unused_must_use)]
+#![allow(clippy::all)]

 use std::collections::HashMap;

 use crate::services::tier::{
    tier_config::TierAliyun,
    warm_backend::{
-        S3CompatibleWarmBackendParams, TransitionCandidateProbe, WarmBackend, WarmBackendGetOpts, build_transition_put_options,
+        S3CompatibleWarmBackendParams, WarmBackend, WarmBackendGetOpts, build_transition_put_options,
        new_s3_compatible_warm_backend, optimal_part_size,
    },
    warm_backend_s3::WarmBackendS3,
@@ -87,10 +89,6 @@ impl WarmBackend for WarmBackendAliyun {
        self.0.remove(object, rv).await
    }

-    async fn probe_transition_candidate(&self, object: &str) -> Result<TransitionCandidateProbe, std::io::Error> {
-        self.0.probe_transition_candidate(object).await
-    }
-
    async fn in_use(&self) -> Result<bool, std::io::Error> {
        self.0.in_use().await
    }
@@ -15,13 +15,15 @@
 #![allow(unused_variables)]
 #![allow(unused_mut)]
 #![allow(unused_assignments)]
+#![allow(unused_must_use)]
+#![allow(clippy::all)]

 use std::collections::HashMap;

 use crate::services::tier::{
    tier_config::TierAzure,
    warm_backend::{
-        S3CompatibleWarmBackendParams, TransitionCandidateProbe, WarmBackend, WarmBackendGetOpts, build_transition_put_options,
+        S3CompatibleWarmBackendParams, WarmBackend, WarmBackendGetOpts, build_transition_put_options,
        new_s3_compatible_warm_backend, optimal_part_size,
    },
    warm_backend_s3::WarmBackendS3,
@@ -87,16 +89,6 @@ impl WarmBackend for WarmBackendAzure {
        self.0.remove(object, rv).await
    }

-    async fn probe_transition_candidate(&self, object: &str) -> Result<TransitionCandidateProbe, std::io::Error> {
-        // Azure currently uses the shared S3/SigV4 transport, but its normal
-        // object path cannot persist exact remote versions across mixed
-        // RustFS releases. The mutation probe may still detect and precisely
-        // remove a versioned test object before rejecting that configuration.
-        self.0
-            .probe_transition_candidate_with_raw_version_header(object, "x-amz-version-id")
-            .await
-    }
-
    async fn in_use(&self) -> Result<bool, std::io::Error> {
        self.0.in_use().await
    }
@@ -106,23 +98,6 @@ impl WarmBackend for WarmBackendAzure {
 mod tests {
    use super::*;
    use crate::services::tier::tier_config::TierAzure;
-    use rustfs_s3_client::{
-        credentials::{Credentials, SignatureType, Static, Value},
-        transition_api::{Options, TransitionClient, TransitionCore},
-    };
-    use std::sync::Arc;
-    use tokio::io::{AsyncReadExt, AsyncWriteExt};
-
-    async fn read_request_head(stream: &mut tokio::net::TcpStream) -> String {
-        let mut request = Vec::new();
-        let mut buffer = [0_u8; 1024];
-        while !request.windows(4).any(|window| window == b"\r\n\r\n") {
-            let read = stream.read(&mut buffer).await.expect("fixture request should be readable");
-            assert_ne!(read, 0, "connection closed before request headers were received");
-            request.extend_from_slice(&buffer[..read]);
-        }
-        String::from_utf8_lossy(&request).into_owned()
-    }

    /// The SSRF guard itself is exercised once, generically, in
    /// `warm_backend::tests` (see backlog#2040/backlog#2041 and
@@ -144,85 +119,4 @@ mod tests {
            Err(err) => assert!(err.to_string().contains("not allowed")),
        }
    }
-
-    #[tokio::test]
-    async fn versioned_candidate_cleanup_uses_the_exact_s3_version_without_enabling_data_versions() {
-        let listener = match tokio::net::TcpListener::bind("127.0.0.1:0").await {
-            Ok(listener) => listener,
-            Err(err) if err.kind() == std::io::ErrorKind::PermissionDenied => return,
-            Err(err) => panic!("test listener should bind: {err}"),
-        };
-        let endpoint = listener
-            .local_addr()
-            .expect("listener local address should be available")
-            .to_string();
-        let fixture = tokio::spawn(async move {
-            let (mut get_stream, _) = listener.accept().await.expect("fixture should accept candidate GET");
-            let get_request = read_request_head(&mut get_stream).await;
-            get_stream
-                .write_all(
-                    b"HTTP/1.1 206 Partial Content\r\nContent-Length: 1\r\nx-amz-version-id: azure-version\r\nConnection: close\r\n\r\nx",
-                )
-                .await
-                .expect("fixture should write candidate GET response");
-
-            let (mut delete_stream, _) = listener.accept().await.expect("fixture should accept exact DELETE");
-            let delete_request = read_request_head(&mut delete_stream).await;
-            delete_stream
-                .write_all(b"HTTP/1.1 204 No Content\r\nContent-Length: 0\r\nConnection: close\r\n\r\n")
-                .await
-                .expect("fixture should write exact DELETE response");
-            (get_request, delete_request)
-        });
-        let client = Arc::new(
-            TransitionClient::new(
-                &endpoint,
-                Options {
-                    creds: Credentials::new(Static(Value {
-                        access_key_id: "access-key".to_string(),
-                        secret_access_key: "secret-key".to_string(),
-                        signer_type: SignatureType::SignatureV4,
-                        ..Default::default()
-                    })),
-                    region: "us-east-1".to_string(),
-                    bucket_lookup: BucketLookupType::BucketLookupPath,
-                    max_retries: 1,
-                    ..Default::default()
-                },
-                "azure",
-            )
-            .await
-            .expect("fixture client should build"),
-        );
-        let backend = WarmBackendAzure(WarmBackendS3 {
-            core: TransitionCore(Arc::clone(&client)),
-            client,
-            bucket: "bucket".to_string(),
-            prefix: String::new(),
-            storage_class: String::new(),
-        });
-        assert!(
-            !backend.0.client.provider_version_capabilities().exact_get_delete,
-            "probe-only version discovery must not change Azure's persisted data-path contract"
-        );
-
-        let candidate = backend
-            .probe_transition_candidate("probe")
-            .await
-            .expect("Azure candidate should be discovered");
-        assert_eq!(candidate, TransitionCandidateProbe::VersionedPresent("azure-version".to_string()));
-        backend
-            .remove_exact("probe", "azure-version")
-            .await
-            .expect("Azure candidate should be deleted by exact version");
-
-        let (get_request, delete_request) = fixture.await.expect("fixture should join");
-        assert!(get_request.to_ascii_lowercase().contains("\r\nrange: bytes=0-0\r\n"));
-        assert!(
-            delete_request
-                .lines()
-                .next()
-                .is_some_and(|line| line.contains("DELETE /bucket/probe?versionId=azure-version "))
-        );
-    }
 }
@@ -15,14 +15,16 @@
 #![allow(unused_variables)]
 #![allow(unused_mut)]
 #![allow(unused_assignments)]
+#![allow(unused_must_use)]
+#![allow(clippy::all)]

-use std::collections::{HashMap, HashSet};
-use std::future::Future;
+use std::collections::HashMap;
 use std::io::{Error, ErrorKind};
 use std::sync::Arc;

 use bytes::Bytes;
-use google_cloud_auth::credentials::service_account::Builder;
+use google_cloud_auth::credentials::Credentials;
+use google_cloud_auth::credentials::user_account::Builder;
 use google_cloud_storage as gcs;
 use google_cloud_storage::client::Storage;
 use google_cloud_storage::client::StorageControl;
@@ -30,7 +32,7 @@ use std::convert::TryFrom;

 use crate::services::tier::{
    tier_config::TierGCS,
-    warm_backend::{TransitionCandidateProbe, WarmBackend, WarmBackendGetOpts},
+    warm_backend::{WarmBackend, WarmBackendGetOpts},
 };
 use rustfs_s3_client::{
    admin_handler_utils::AdminError,
@@ -41,7 +43,6 @@ use rustfs_utils::egress::validate_outbound_url;
 use tracing::warn;

 const _MAX_PART_SIZE: i64 = 1024 * 1024 * 1024 * 5;
-const MAX_GCS_CANDIDATE_PAGES: usize = 64;

 fn parse_generation(remote_version: &str) -> Result<Option<i64>, Error> {
    if remote_version.is_empty() {
@@ -56,85 +57,6 @@ fn parse_generation(remote_version: &str) -> Result<Option<i64>, Error> {
    Ok(Some(generation))
 }

-fn append_gcs_chunk<E: std::fmt::Display>(
-    contents: &mut Vec<u8>,
-    chunk: Result<Bytes, E>,
-    max_response_bytes: Option<usize>,
-) -> std::io::Result<()> {
-    let chunk = chunk.map_err(|err| std::io::Error::other(err.to_string()))?;
-    if max_response_bytes.is_some_and(|limit| contents.len().saturating_add(chunk.len()) > limit) {
-        return Err(std::io::Error::new(
-            ErrorKind::InvalidData,
-            "GCS object response exceeded the configured byte limit",
-        ));
-    }
-    contents.extend_from_slice(&chunk);
-    Ok(())
-}
-
-fn gcs_bucket_resource_name(bucket: &str) -> String {
-    format!("projects/_/buckets/{bucket}")
-}
-
-struct GcsCandidateObject {
-    name: String,
-    generation: i64,
-}
-
-struct GcsCandidatePage {
-    objects: Vec<GcsCandidateObject>,
-    next_page_token: String,
-}
-
-async fn probe_exact_gcs_candidate<F, Fut>(
-    remote_object: &str,
-    mut fetch_page: F,
-) -> Result<TransitionCandidateProbe, std::io::Error>
-where
-    F: FnMut(String) -> Fut,
-    Fut: Future<Output = Result<GcsCandidatePage, std::io::Error>>,
-{
-    let mut page_token = String::new();
-    let mut seen_page_tokens = HashSet::new();
-    let mut generation = None;
-    let mut pages_seen = 0_usize;
-
-    loop {
-        pages_seen += 1;
-        if pages_seen > MAX_GCS_CANDIDATE_PAGES {
-            return Err(std::io::Error::new(
-                ErrorKind::InvalidData,
-                "GCS candidate listing exceeded the page limit",
-            ));
-        }
-        let response = fetch_page(page_token.clone()).await?;
-        for candidate in response.objects.iter().filter(|candidate| candidate.name == remote_object) {
-            if candidate.generation <= 0 {
-                return Err(std::io::Error::new(
-                    ErrorKind::InvalidData,
-                    "GCS candidate listing returned a non-positive generation",
-                ));
-            }
-            if generation.replace(candidate.generation).is_some() {
-                return Ok(TransitionCandidateProbe::Ambiguous);
-            }
-        }
-
-        if response.next_page_token.is_empty() {
-            break;
-        }
-        if !seen_page_tokens.insert(response.next_page_token.clone()) {
-            return Err(std::io::Error::new(ErrorKind::InvalidData, "GCS candidate listing repeated a page token"));
-        }
-        page_token = response.next_page_token;
-    }
-
-    Ok(match generation {
-        Some(generation) => TransitionCandidateProbe::VersionedPresent(generation.to_string()),
-        None => TransitionCandidateProbe::Missing,
-    })
-}
-
 pub struct WarmBackendGCS {
    pub client: Arc<Storage>,
    pub control: Arc<StorageControl>,
@@ -144,11 +66,11 @@ pub struct WarmBackendGCS {

 impl WarmBackendGCS {
    pub async fn new(conf: &TierGCS, tier: &str) -> Result<Self, std::io::Error> {
-        if conf.creds.is_empty() {
+        if conf.creds == "" {
            return Err(std::io::Error::other("both access and secret keys are required"));
        }

-        if conf.bucket.is_empty() {
+        if conf.bucket == "" {
            return Err(std::io::Error::other("no bucket name was provided"));
        }

@@ -158,8 +80,8 @@ impl WarmBackendGCS {
                .map_err(|err| std::io::Error::other(format!("tier endpoint is not allowed: {err}")))?;
        }

-        let service_account = serde_json::from_str(&conf.creds)?;
-        let credentials = Builder::new(service_account)
+        let authorized_user = serde_json::from_str(&conf.creds)?;
+        let credentials = Builder::new(authorized_user)
            //.with_retry_policy(AlwaysRetry.with_attempt_limit(3))
            //.with_backoff_policy(backoff)
            .build()
@@ -176,11 +98,7 @@ impl WarmBackendGCS {
        let client = Arc::new(client);
        // Control-plane client: the data-plane `Storage` client cannot delete or list objects;
        // delete_object/list_objects live on StorageControl.
-        let mut control_builder = StorageControl::builder().with_credentials(credentials);
-        if !conf.endpoint.is_empty() {
-            control_builder = control_builder.with_endpoint(conf.endpoint.clone());
-        }
-        let Ok(control) = control_builder.build().await else {
+        let Ok(control) = StorageControl::builder().with_credentials(credentials).build().await else {
            return Err(std::io::Error::other("StorageControl::builder error"));
        };
        let control = Arc::new(control);
@@ -193,11 +111,11 @@ impl WarmBackendGCS {
    }

    pub fn get_dest(&self, object: &str) -> String {
-        if self.prefix.is_empty() {
-            object.to_string()
-        } else {
-            format!("{}/{}", self.prefix, object)
+        let mut dest_obj = object.to_string();
+        if self.prefix != "" {
+            dest_obj = format!("{}/{}", &self.prefix, object);
        }
+        return dest_obj;
    }
 }

@@ -218,10 +136,9 @@ impl WarmBackend for WarmBackendGCS {
            ReaderImpl::Body(content_body) => content_body.to_vec(),
            ReaderImpl::ObjectBody(mut content_body) => content_body.read_all().await?,
        };
-        let bucket = gcs_bucket_resource_name(&self.bucket);
        let Ok(res) = Box::pin(
            self.client
-                .write_object(&bucket, self.get_dest(object), Bytes::from(d))
+                .write_object(&self.bucket, &self.get_dest(object), Bytes::from(d))
                .send_buffered(),
        )
        .await
@@ -237,9 +154,7 @@ impl WarmBackend for WarmBackendGCS {
    }

    async fn get(&self, object: &str, rv: &str, opts: WarmBackendGetOpts) -> Result<ReadCloser, std::io::Error> {
-        let bucket = gcs_bucket_resource_name(&self.bucket);
-        let mut req = self.client.read_object(&bucket, self.get_dest(object));
-        let mut max_response_bytes = None;
+        let mut req = self.client.read_object(&self.bucket, &self.get_dest(object));
        if let Some(generation) = parse_generation(rv)? {
            req = req.set_generation(generation);
        }
@@ -255,11 +170,6 @@ impl WarmBackend for WarmBackendGCS {
                .length
                .try_into()
                .map_err(|_| std::io::Error::other("invalid range: negative length"))?;
-            max_response_bytes = Some(
-                opts.length
-                    .try_into()
-                    .map_err(|_| std::io::Error::other("invalid range: length does not fit in memory"))?,
-            );
            req = req.set_read_range(google_cloud_storage::model_ext::ReadRange::segment(offset, count));
        }

@@ -267,8 +177,8 @@ impl WarmBackend for WarmBackendGCS {
            return Err(std::io::Error::other("read_object error"));
        };
        let mut contents = Vec::new();
-        while let Some(chunk) = reader.next().await {
-            append_gcs_chunk(&mut contents, chunk, max_response_bytes)?;
+        while let Ok(Some(chunk)) = reader.next().await.transpose() {
+            contents.extend_from_slice(&chunk);
        }
        Ok(ReadCloser::new(std::io::Cursor::new(contents)))
    }
@@ -280,7 +190,7 @@ impl WarmBackend for WarmBackendGCS {
        let mut req = self
            .control
            .delete_object()
-            .set_bucket(gcs_bucket_resource_name(&self.bucket))
+            .set_bucket(format!("projects/_/buckets/{}", self.bucket))
            .set_object(self.get_dest(object));
        if let Some(generation) = parse_generation(rv)? {
            req = req.set_generation(generation);
@@ -289,47 +199,13 @@ impl WarmBackend for WarmBackendGCS {
        Ok(())
    }

-    async fn probe_transition_candidate(&self, object: &str) -> Result<TransitionCandidateProbe, std::io::Error> {
-        let remote_object = self.get_dest(object);
-        let parent = gcs_bucket_resource_name(&self.bucket);
-        probe_exact_gcs_candidate(&remote_object, |page_token| {
-            let control = self.control.clone();
-            let parent = parent.clone();
-            let prefix = remote_object.clone();
-            async move {
-                let response = control
-                    .list_objects()
-                    .set_parent(parent)
-                    .set_prefix(prefix)
-                    .set_versions(true)
-                    .set_page_size(2)
-                    .set_page_token(page_token)
-                    .send()
-                    .await
-                    .map_err(|err| std::io::Error::other(err.to_string()))?;
-                Ok(GcsCandidatePage {
-                    objects: response
-                        .objects
-                        .into_iter()
-                        .map(|candidate| GcsCandidateObject {
-                            name: candidate.name,
-                            generation: candidate.generation,
-                        })
-                        .collect(),
-                    next_page_token: response.next_page_token,
-                })
-            }
-        })
-        .await
-    }
-
    async fn in_use(&self) -> Result<bool, std::io::Error> {
        // Scope the listing to this tier's prefix (matching the other warm backends) and only
        // need to know whether a single object exists.
        let resp = self
            .control
            .list_objects()
-            .set_parent(gcs_bucket_resource_name(&self.bucket))
+            .set_parent(format!("projects/_/buckets/{}", self.bucket))
            .set_prefix(self.prefix.clone())
            .set_page_size(1)
            .send()
@@ -342,126 +218,10 @@ impl WarmBackend for WarmBackendGCS {

 #[cfg(test)]
 mod tests {
-    use super::GcsCandidateObject;
-    use super::GcsCandidatePage;
-    use super::MAX_GCS_CANDIDATE_PAGES;
    use super::WarmBackendGCS;
-    use super::append_gcs_chunk;
-    use super::gcs_bucket_resource_name;
    use super::parse_generation;
-    use super::probe_exact_gcs_candidate;
    use crate::services::tier::tier_config::TierGCS;
-    use crate::services::tier::warm_backend::{TransitionCandidateProbe, WarmBackend, WarmBackendGetOpts};
-    use google_cloud_auth::credentials::anonymous::Builder as Anonymous;
-    use google_cloud_storage::client::{Storage, StorageControl};
    use std::io::ErrorKind;
-    use std::sync::Arc;
-    use std::time::Duration;
-    use tokio::io::{AsyncReadExt, AsyncWriteExt};
-    use tokio::net::TcpListener;
-
-    async fn serve_data_plane_fixture(listener: TcpListener) -> Vec<String> {
-        let upload_body = r#"{"name":"probe","bucket":"tier-bucket","generation":"123"}"#;
-        let responses = [
-            format!(
-                "HTTP/1.1 200 OK\r\ncontent-type: application/json\r\ncontent-length: {}\r\nconnection: close\r\n\r\n{upload_body}",
-                upload_body.len()
-            ),
-            "HTTP/1.1 206 Partial Content\r\ncontent-type: application/octet-stream\r\ncontent-range: bytes 0-6/7\r\nx-goog-generation: 123\r\ncontent-length: 7\r\nconnection: close\r\n\r\nRustFS!"
-                .to_string(),
-            "HTTP/1.1 206 Partial Content\r\ncontent-type: application/octet-stream\r\ncontent-range: bytes 0-7/8\r\nx-goog-generation: 123\r\ncontent-length: 8\r\nconnection: close\r\n\r\nRustFS!!"
-                .to_string(),
-        ];
-        let mut requests = Vec::new();
-
-        for response in responses {
-            let (mut stream, _) = listener.accept().await.expect("the GCS fixture should accept a request");
-            let mut request = Vec::new();
-            loop {
-                let mut chunk = [0_u8; 1024];
-                let count = stream
-                    .read(&mut chunk)
-                    .await
-                    .expect("the GCS fixture should read request headers");
-                if count == 0 {
-                    break;
-                }
-                request.extend_from_slice(&chunk[..count]);
-                if request.windows(4).any(|window| window == b"\r\n\r\n") {
-                    break;
-                }
-            }
-            let header_end = request
-                .windows(4)
-                .position(|window| window == b"\r\n\r\n")
-                .map(|position| position + 4)
-                .expect("the GCS fixture should receive complete request headers");
-            let headers = String::from_utf8_lossy(&request[..header_end]);
-            if headers.lines().any(|line| line.eq_ignore_ascii_case("expect: 100-continue")) {
-                stream
-                    .write_all(b"HTTP/1.1 100 Continue\r\n\r\n")
-                    .await
-                    .expect("the GCS fixture should acknowledge 100-continue");
-            }
-            let content_length = headers
-                .lines()
-                .find_map(|line| {
-                    let (name, value) = line.split_once(':')?;
-                    name.eq_ignore_ascii_case("content-length")
-                        .then(|| value.trim().parse::<usize>().expect("content-length should be numeric"))
-                })
-                .unwrap_or_default();
-            while request.len() < header_end.saturating_add(content_length) {
-                let mut chunk = [0_u8; 1024];
-                let count = stream
-                    .read(&mut chunk)
-                    .await
-                    .expect("the GCS fixture should read the request body");
-                if count == 0 {
-                    break;
-                }
-                request.extend_from_slice(&chunk[..count]);
-            }
-            requests.push(String::from_utf8_lossy(&request).into_owned());
-            stream
-                .write_all(response.as_bytes())
-                .await
-                .expect("the GCS fixture should write its response");
-        }
-
-        requests
-    }
-
-    fn candidate_page(objects: &[(&str, i64)], next_page_token: &str) -> GcsCandidatePage {
-        GcsCandidatePage {
-            objects: objects
-                .iter()
-                .map(|(name, generation)| GcsCandidateObject {
-                    name: (*name).to_string(),
-                    generation: *generation,
-                })
-                .collect(),
-            next_page_token: next_page_token.to_string(),
-        }
-    }
-
-    async fn probe_candidate_pages(
-        remote_object: &str,
-        pages: Vec<GcsCandidatePage>,
-    ) -> (Result<TransitionCandidateProbe, std::io::Error>, Vec<String>) {
-        let mut pages = pages.into_iter();
-        let mut requested_tokens = Vec::new();
-        let result = probe_exact_gcs_candidate(remote_object, |page_token| {
-            requested_tokens.push(page_token);
-            std::future::ready(
-                pages
-                    .next()
-                    .ok_or_else(|| std::io::Error::new(ErrorKind::UnexpectedEof, "test fixture ran out of GCS pages")),
-            )
-        })
-        .await;
-        (result, requested_tokens)
-    }

    #[test]
    fn generation_parser_preserves_exact_numeric_versions() {
@@ -481,243 +241,6 @@ mod tests {
        }
    }

-    #[test]
-    fn body_collection_propagates_an_error_after_a_complete_prefix() {
-        let mut contents = Vec::new();
-        append_gcs_chunk::<std::io::Error>(&mut contents, Ok(bytes::Bytes::from_static(b"RustFS")), Some(7))
-            .expect("the prefix chunk should be collected");
-        let err = append_gcs_chunk(&mut contents, Err(std::io::Error::other("trailing stream failure")), Some(7))
-            .expect_err("a trailing stream error must not be mistaken for EOF");
-
-        assert_eq!(contents, b"RustFS");
-        assert!(err.to_string().contains("trailing stream failure"));
-    }
-
-    #[test]
-    fn body_collection_rejects_a_chunk_that_exceeds_the_probe_limit() {
-        let mut contents = Vec::new();
-        let err = append_gcs_chunk::<std::io::Error>(&mut contents, Ok(bytes::Bytes::from_static(b"RustFSxx")), Some(7))
-            .expect_err("the GCS collection layer must reject an oversized probe response");
-
-        assert!(contents.is_empty());
-        assert_eq!(err.kind(), ErrorKind::InvalidData);
-    }
-
-    #[tokio::test]
-    async fn candidate_probe_finds_exact_name_on_first_or_later_page() {
-        let (first, first_tokens) =
-            probe_candidate_pages("prefix/object", vec![candidate_page(&[("prefix/object", 7)], "")]).await;
-        assert_eq!(
-            first.expect("an exact first-page object should be discovered"),
-            TransitionCandidateProbe::VersionedPresent("7".to_string())
-        );
-        assert_eq!(first_tokens, [""]);
-
-        let (later, later_tokens) = probe_candidate_pages(
-            "prefix/object",
-            vec![
-                candidate_page(&[("prefix/object-shadow", 8)], "next"),
-                candidate_page(&[("prefix/object", 9)], ""),
-            ],
-        )
-        .await;
-        assert_eq!(
-            later.expect("an exact later-page object should be discovered"),
-            TransitionCandidateProbe::VersionedPresent("9".to_string())
-        );
-        assert_eq!(later_tokens, ["", "next"]);
-    }
-
-    #[tokio::test]
-    async fn candidate_probe_ignores_non_exact_prefix_matches() {
-        let (probe, _) = probe_candidate_pages(
-            "prefix/object",
-            vec![candidate_page(
-                &[("prefix/object-shadow", 8), ("prefix/object/child", 9), ("prefix/object", 7)],
-                "",
-            )],
-        )
-        .await;
-
-        assert_eq!(
-            probe.expect("prefix-only matches should not hide the exact object"),
-            TransitionCandidateProbe::VersionedPresent("7".to_string())
-        );
-    }
-
-    #[tokio::test]
-    async fn candidate_probe_reports_duplicate_exact_names_as_ambiguous() {
-        let (probe, _) = probe_candidate_pages(
-            "prefix/object",
-            vec![
-                candidate_page(&[("prefix/object", 7)], "next"),
-                candidate_page(&[("prefix/object", 8)], ""),
-            ],
-        )
-        .await;
-
-        assert_eq!(
-            probe.expect("multiple exact generations should produce a conservative result"),
-            TransitionCandidateProbe::Ambiguous
-        );
-    }
-
-    #[tokio::test]
-    async fn candidate_probe_reports_missing_without_an_exact_name() {
-        let (probe, _) = probe_candidate_pages("prefix/object", vec![candidate_page(&[("prefix/object-shadow", 8)], "")]).await;
-
-        assert_eq!(
-            probe.expect("a complete listing without an exact name should be definitive"),
-            TransitionCandidateProbe::Missing
-        );
-    }
-
-    #[tokio::test]
-    async fn candidate_probe_rejects_non_positive_generations() {
-        for generation in [0, -1] {
-            let (probe, _) =
-                probe_candidate_pages("prefix/object", vec![candidate_page(&[("prefix/object", generation)], "")]).await;
-            let err = probe.expect_err("a non-positive GCS generation must fail closed");
-            assert_eq!(err.kind(), ErrorKind::InvalidData, "generation {generation}");
-        }
-    }
-
-    #[tokio::test]
-    async fn candidate_probe_rejects_a_page_token_that_does_not_advance() {
-        let (probe, requested_tokens) =
-            probe_candidate_pages("prefix/object", vec![candidate_page(&[], "next"), candidate_page(&[], "next")]).await;
-
-        let err = probe.expect_err("a repeated GCS page token must fail closed");
-        assert_eq!(err.kind(), ErrorKind::InvalidData);
-        assert_eq!(requested_tokens, ["", "next"]);
-    }
-
-    #[tokio::test]
-    async fn candidate_probe_rejects_a_non_adjacent_page_token_cycle() {
-        let (probe, requested_tokens) = probe_candidate_pages(
-            "prefix/object",
-            vec![candidate_page(&[], "a"), candidate_page(&[], "b"), candidate_page(&[], "a")],
-        )
-        .await;
-
-        let err = probe.expect_err("a non-adjacent GCS page token cycle must fail closed");
-        assert_eq!(err.kind(), ErrorKind::InvalidData);
-        assert_eq!(requested_tokens, ["", "a", "b"]);
-    }
-
-    #[tokio::test]
-    async fn candidate_probe_rejects_an_unbounded_unique_token_chain() {
-        let pages = (0..MAX_GCS_CANDIDATE_PAGES)
-            .map(|index| candidate_page(&[], &format!("token-{index}")))
-            .collect();
-        let (probe, requested_tokens) = probe_candidate_pages("prefix/object", pages).await;
-
-        let err = probe.expect_err("an unbounded unique page-token chain must fail closed");
-        assert_eq!(err.kind(), ErrorKind::InvalidData);
-        assert_eq!(requested_tokens.len(), MAX_GCS_CANDIDATE_PAGES);
-    }
-
-    #[tokio::test]
-    async fn plain_bucket_reaches_gcs_put_and_get_transport_with_resource_name() {
-        let listener = TcpListener::bind("127.0.0.1:0")
-            .await
-            .expect("the GCS fixture should bind a loopback port");
-        let endpoint = format!("http://{}", listener.local_addr().expect("the GCS fixture should have a local address"));
-        let fixture = tokio::spawn(serve_data_plane_fixture(listener));
-        let credentials = Anonymous::new().build();
-        let client = Storage::builder()
-            .with_endpoint(endpoint.clone())
-            .with_credentials(credentials.clone())
-            .build()
-            .await
-            .expect("the GCS data client should build");
-        let control = StorageControl::builder()
-            .with_endpoint(endpoint)
-            .with_credentials(credentials)
-            .build()
-            .await
-            .expect("the GCS control client should build");
-        let backend = WarmBackendGCS {
-            client: Arc::new(client),
-            control: Arc::new(control),
-            bucket: "tier-bucket".to_string(),
-            prefix: String::new(),
-        };
-
-        let (version, body, oversized_error_kind, requests) = tokio::time::timeout(Duration::from_secs(5), async {
-            let version = backend
-                .put(
-                    "probe",
-                    rustfs_s3_client::transition_api::ReaderImpl::Body(bytes::Bytes::from_static(b"RustFS")),
-                    6,
-                )
-                .await
-                .expect("a plain configured bucket should reach the GCS upload transport");
-            let mut reader = backend
-                .get(
-                    "probe",
-                    &version,
-                    WarmBackendGetOpts {
-                        start_offset: 0,
-                        length: 7,
-                    },
-                )
-                .await
-                .expect("a plain configured bucket should reach the GCS read transport");
-            let mut body = Vec::new();
-            reader
-                .read_to_end(&mut body)
-                .await
-                .expect("the fixture body should be readable");
-            let oversized_error = match backend
-                .get(
-                    "probe",
-                    &version,
-                    WarmBackendGetOpts {
-                        start_offset: 0,
-                        length: 7,
-                    },
-                )
-                .await
-            {
-                Ok(_) => panic!("an eight-byte response must not pass a seven-byte collection limit"),
-                Err(err) => err,
-            };
-            let requests = fixture.await.expect("the GCS fixture task should finish");
-            (version, body, oversized_error.kind(), requests)
-        })
-        .await
-        .expect("the GCS data-plane requests should not be rejected before transport");
-
-        assert_eq!(gcs_bucket_resource_name("tier-bucket"), "projects/_/buckets/tier-bucket");
-        assert_eq!(version, "123");
-        assert_eq!(body, b"RustFS!");
-        assert_eq!(oversized_error_kind, ErrorKind::InvalidData);
-        assert!(
-            requests[0].starts_with("POST /upload/storage/v1/b/tier-bucket/o?"),
-            "unexpected upload request line: {}",
-            requests[0].lines().next().unwrap_or_default()
-        );
-        assert!(
-            requests[1].starts_with("GET /storage/v1/b/tier-bucket/o/probe?"),
-            "unexpected read request line: {}",
-            requests[1].lines().next().unwrap_or_default()
-        );
-        assert!(
-            requests[1].to_ascii_lowercase().contains("\r\nrange: bytes=0-6\r\n"),
-            "the GCS probe read must preserve its seven-byte range"
-        );
-        assert!(
-            requests[2].starts_with("GET /storage/v1/b/tier-bucket/o/probe?"),
-            "unexpected oversized read request line: {}",
-            requests[2].lines().next().unwrap_or_default()
-        );
-        assert!(
-            requests[2].to_ascii_lowercase().contains("\r\nrange: bytes=0-6\r\n"),
-            "the oversized response must be fetched under the same seven-byte request boundary"
-        );
-    }
-
    #[tokio::test]
    async fn new_rejects_loopback_endpoint_before_credential_setup() {
        let conf = TierGCS {
@@ -15,13 +15,15 @@
 #![allow(unused_variables)]
 #![allow(unused_mut)]
 #![allow(unused_assignments)]
+#![allow(unused_must_use)]
+#![allow(clippy::all)]

 use std::collections::HashMap;

 use crate::services::tier::{
    tier_config::TierHuaweicloud,
    warm_backend::{
-        S3CompatibleWarmBackendParams, TransitionCandidateProbe, WarmBackend, WarmBackendGetOpts, build_transition_put_options,
+        S3CompatibleWarmBackendParams, WarmBackend, WarmBackendGetOpts, build_transition_put_options,
        new_s3_compatible_warm_backend, optimal_part_size,
    },
    warm_backend_s3::WarmBackendS3,
@@ -87,10 +89,6 @@ impl WarmBackend for WarmBackendHuaweicloud {
        self.0.remove(object, rv).await
    }

-    async fn probe_transition_candidate(&self, object: &str) -> Result<TransitionCandidateProbe, std::io::Error> {
-        self.0.probe_transition_candidate(object).await
-    }
-
    async fn in_use(&self) -> Result<bool, std::io::Error> {
        self.0.in_use().await
    }
@@ -15,6 +15,8 @@
 #![allow(unused_variables)]
 #![allow(unused_mut)]
 #![allow(unused_assignments)]
+#![allow(unused_must_use)]
+#![allow(clippy::all)]

 use std::collections::HashMap;

@@ -15,6 +15,8 @@
 #![allow(unused_variables)]
 #![allow(unused_mut)]
 #![allow(unused_assignments)]
+#![allow(unused_must_use)]
+#![allow(clippy::all)]

 use std::collections::HashMap;

@@ -15,6 +15,8 @@
 #![allow(unused_variables)]
 #![allow(unused_mut)]
 #![allow(unused_assignments)]
+#![allow(unused_must_use)]
+#![allow(clippy::all)]

 use std::collections::HashMap;

@@ -26,12 +26,11 @@ use crate::services::tier::{
    tier_config::TierS3,
    warm_backend::{
        TransitionCandidateIdentity, TransitionCandidateProbe, TransitionCandidateReconciler, WarmBackend, WarmBackendGetOpts,
-        build_transition_put_options, endpoint_authority, transition_client_timeouts_from_env,
+        build_transition_put_options,
    },
 };
 use http::HeaderMap;
 use rustfs_s3_client::{
-    api_error_response::to_error_response,
    api_get_options::GetObjectOptions,
    api_list::ListObjectsOptions,
    api_put_object::PutObjectOptions,
@@ -44,7 +43,7 @@ use rustfs_s3_client::{
 };
 use rustfs_utils::egress::validate_outbound_url;
 use rustfs_utils::path::SLASH_SEPARATOR;
-use s3s::{S3ErrorCode, dto::BucketVersioningStatus};
+use s3s::dto::BucketVersioningStatus;

 pub struct WarmBackendS3 {
    pub client: Arc<TransitionClient>,
@@ -75,19 +74,6 @@ fn remote_bucket_versioning_from_status(status: Option<&str>) -> Result<RemoteBu
    })
 }

-fn bounded_get_range(opts: &WarmBackendGetOpts) -> Result<Option<(i64, i64)>, std::io::Error> {
-    if opts.start_offset < 0 || opts.length <= 0 {
-        return Ok(None);
-    }
-    usize::try_from(opts.length)
-        .map_err(|_| std::io::Error::new(std::io::ErrorKind::InvalidInput, "invalid range: length does not fit in memory"))?;
-    let end_offset = opts
-        .start_offset
-        .checked_add(opts.length - 1)
-        .ok_or_else(|| std::io::Error::new(std::io::ErrorKind::InvalidInput, "invalid range: end offset overflow"))?;
-    Ok(Some((opts.start_offset, end_offset)))
-}
-
 impl WarmBackendS3 {
    pub async fn new(conf: &TierS3, _tier: &str) -> Result<Self, std::io::Error> {
        Self::new_with_bucket_lookup(conf, BucketLookupType::BucketLookupAuto, "s3").await
@@ -139,7 +125,6 @@ impl WarmBackendS3 {
        } else {
            return Err(std::io::Error::other("insufficient parameters for S3 backend authentication"));
        }
-        let timeouts = transition_client_timeouts_from_env();
        let opts = Options {
            creds,
            secure: u.scheme() == "https",
@@ -147,8 +132,10 @@ impl WarmBackendS3 {
            bucket_lookup,
            ..Default::default()
        };
-        let endpoint = endpoint_authority(&u)?;
-        let client = TransitionClient::new_with_timeouts(&endpoint, opts, tier_type, timeouts).await?;
+        let host = u
+            .host()
+            .ok_or_else(|| std::io::Error::other("Invalid endpoint URL: missing host"))?;
+        let client = TransitionClient::new(&host.to_string(), opts, tier_type).await?;

        let client = Arc::new(client);
        let core = TransitionCore(Arc::clone(&client));
@@ -190,8 +177,10 @@ impl WarmBackendS3 {
        if !rv.is_empty() {
            gopts.version_id = rv.to_string();
        }
-        if let Some((start_offset, end_offset)) = bounded_get_range(&opts)? {
-            gopts.set_range(start_offset, end_offset)?;
+        if opts.start_offset >= 0 && opts.length > 0 {
+            gopts
+                .set_range(opts.start_offset, opts.start_offset + opts.length - 1)
+                .map_err(std::io::Error::other)?;
        }
        let (_, headers, reader) = self.core.get_object(&self.bucket, &self.get_dest(object), &gopts).await?;
        Ok((headers, reader))
@@ -202,62 +191,35 @@ impl WarmBackendS3 {
        remote_bucket_versioning_from_status(config.status.as_ref().map(|status| status.as_str()))
    }

-    async fn probe_current_transition_candidate_with_header(
+    async fn probe_transition_candidate_versions(
        &self,
        object: &str,
-        raw_version_header: Option<&'static str>,
+        bucket_versioning: RemoteBucketVersioning,
    ) -> Result<TransitionCandidateProbe, std::io::Error> {
-        match self
-            .get_with_headers(
-                object,
-                "",
-                WarmBackendGetOpts {
-                    start_offset: 0,
-                    length: 1,
-                },
-            )
-            .await
-        {
-            Ok((headers, _)) => {
-                let version_id = match raw_version_header {
-                    Some(header_name) => match headers.get(header_name) {
-                        Some(value) => {
-                            let version_id = value.to_str().map_err(|_| {
-                                std::io::Error::new(
-                                    std::io::ErrorKind::InvalidData,
-                                    "remote object version id is not valid ASCII",
-                                )
-                            })?;
-                            validate_remote_version_id(version_id)?;
-                            Some(version_id)
-                        }
-                        None => None,
-                    },
-                    None => self.client.raw_version_id(&headers)?,
-                };
-                Ok(match version_id {
-                    Some(version_id) => TransitionCandidateProbe::VersionedPresent(version_id.to_string()),
-                    None => TransitionCandidateProbe::UnversionedPresent,
-                })
-            }
-            Err(err) => {
-                let response = to_error_response(&err);
-                if response.code == S3ErrorCode::NoSuchKey {
-                    Ok(TransitionCandidateProbe::Missing)
-                } else {
-                    Err(err)
-                }
-            }
-        }
-    }
+        let remote_object = self.get_dest(object);
+        let mut opts = ListObjectsOptions::default();
+        opts.set("prefix", &remote_object);
+        opts.set("max-keys", "1000");

-    pub(crate) async fn probe_transition_candidate_with_raw_version_header(
-        &self,
-        object: &str,
-        raw_version_header: &'static str,
-    ) -> Result<TransitionCandidateProbe, std::io::Error> {
-        self.probe_current_transition_candidate_with_header(object, Some(raw_version_header))
-            .await
+        let mut key_marker = String::new();
+        let mut version_id_marker = String::new();
+        let mut candidates = TransitionCandidateVersions::default();
+        loop {
+            let versions = self
+                .client
+                .list_object_versions_query(&self.bucket, &opts, &key_marker, &version_id_marker, "")
+                .await?;
+            candidates.extend(&remote_object, &versions);
+            if candidates.is_ambiguous() {
+                return Ok(TransitionCandidateProbe::Ambiguous);
+            }
+            if !versions.is_truncated {
+                let confirmed_versioning = self.remote_bucket_versioning().await?;
+                return classify_transition_candidates(candidates, bucket_versioning, confirmed_versioning);
+            }
+
+            advance_version_markers(&mut key_marker, &mut version_id_marker, &versions)?;
+        }
    }

    async fn probe_transition_candidate_identity(
@@ -314,7 +276,8 @@ impl WarmBackendS3 {
                    version_id: matched_version,
                    ambiguous: false,
                };
-                return classify_transition_candidates(candidates, bucket_versioning);
+                let confirmed_versioning = self.remote_bucket_versioning().await?;
+                return classify_transition_candidates(candidates, bucket_versioning, confirmed_versioning);
            }
            advance_version_markers(&mut key_marker, &mut version_id_marker, &versions)?;
        }
@@ -349,9 +312,15 @@ fn transition_candidate_metadata_matches(

 fn classify_transition_candidates(
    candidates: TransitionCandidateVersions,
-    bucket_versioning: RemoteBucketVersioning,
+    initial_versioning: RemoteBucketVersioning,
+    confirmed_versioning: RemoteBucketVersioning,
 ) -> Result<TransitionCandidateProbe, std::io::Error> {
-    let probe = candidates.classify(bucket_versioning);
+    // GetBucketVersioning and ListObjectVersions are separate requests. An
+    // observed state change makes the combined proof unsafe to persist.
+    if initial_versioning != confirmed_versioning {
+        return Ok(TransitionCandidateProbe::Ambiguous);
+    }
+    let probe = candidates.classify(initial_versioning);
    if let TransitionCandidateProbe::VersionedPresent(version_id) = &probe {
        validate_remote_version_id(version_id)?;
    }
@@ -382,7 +351,6 @@ struct TransitionCandidateVersions {
 }

 impl TransitionCandidateVersions {
-    #[cfg(test)]
    fn extend(&mut self, remote_object: &str, versions: &ListVersionsResult) {
        for version in versions.versions.iter().filter(|version| version.key == remote_object) {
            if self.version_id.is_some() {
@@ -393,6 +361,10 @@ impl TransitionCandidateVersions {
        }
    }

+    fn is_ambiguous(&self) -> bool {
+        self.ambiguous
+    }
+
    fn classify(self, bucket_versioning: RemoteBucketVersioning) -> TransitionCandidateProbe {
        if self.ambiguous {
            return TransitionCandidateProbe::Ambiguous;
@@ -402,8 +374,19 @@ impl TransitionCandidateVersions {
        };

        match bucket_versioning {
-            RemoteBucketVersioning::Disabled => TransitionCandidateProbe::UnversionedPresent,
-            RemoteBucketVersioning::Suspended if version_id == "null" => TransitionCandidateProbe::VersionedPresent(version_id),
+            // A never-versioned S3 object may be listed with either an empty
+            // version or the provider's `null` sentinel. Any opaque version is
+            // inconsistent with a disabled bucket and must remain ambiguous.
+            RemoteBucketVersioning::Disabled if version_id.is_empty() || version_id == "null" => {
+                TransitionCandidateProbe::UnversionedPresent
+            }
+            RemoteBucketVersioning::Disabled => TransitionCandidateProbe::Ambiguous,
+            // A `null` version survives a later transition back to Enabled, so
+            // the listed identifier, not only the current bucket status, binds
+            // suspended-null request routing.
+            RemoteBucketVersioning::Suspended | RemoteBucketVersioning::Enabled if version_id == "null" => {
+                TransitionCandidateProbe::SuspendedNullPresent
+            }
            RemoteBucketVersioning::Suspended | RemoteBucketVersioning::Enabled if !version_id.is_empty() => {
                TransitionCandidateProbe::VersionedPresent(version_id)
            }
@@ -416,8 +399,6 @@ impl TransitionCandidateVersions {
 mod tests {
    use super::*;
    use rustfs_s3_client::api_s3_datatypes::{ListVersionsResult, Version};
-    use std::time::Duration;
-    use tokio::io::{AsyncReadExt, AsyncWriteExt};

    #[tokio::test]
    async fn new_rejects_loopback_endpoint_before_network_setup() {
@@ -436,245 +417,6 @@ mod tests {
        }
    }

-    #[tokio::test]
-    async fn new_preserves_an_explicit_endpoint_port() {
-        let conf = TierS3 {
-            endpoint: "https://tier.example.com:9443".to_string(),
-            bucket: "tier-bucket".to_string(),
-            access_key: "access".to_string(),
-            secret_key: "secret".to_string(),
-            region: "us-east-1".to_string(),
-            ..Default::default()
-        };
-
-        let backend = WarmBackendS3::new(&conf, "tier")
-            .await
-            .expect("a well-formed S3 endpoint should initialize without network I/O");
-        assert_eq!(backend.client.endpoint_url.host_str(), Some("tier.example.com"));
-        assert_eq!(backend.client.endpoint_url.port(), Some(9443));
-    }
-
-    #[tokio::test]
-    async fn overflowing_get_range_is_rejected_before_network_io() {
-        let listener = match tokio::net::TcpListener::bind("127.0.0.1:0").await {
-            Ok(listener) => listener,
-            Err(err) if err.kind() == std::io::ErrorKind::PermissionDenied => return,
-            Err(err) => panic!("test listener should bind: {err}"),
-        };
-        let endpoint = listener
-            .local_addr()
-            .expect("listener local address should be available")
-            .to_string();
-        let client = Arc::new(
-            TransitionClient::new(
-                &endpoint,
-                Options {
-                    creds: Credentials::new(Static(Value {
-                        access_key_id: "access-key".to_string(),
-                        secret_access_key: "secret-key".to_string(),
-                        signer_type: SignatureType::SignatureV4,
-                        ..Default::default()
-                    })),
-                    region: "us-east-1".to_string(),
-                    bucket_lookup: BucketLookupType::BucketLookupPath,
-                    max_retries: 1,
-                    ..Default::default()
-                },
-                "s3",
-            )
-            .await
-            .expect("fixture client should build"),
-        );
-        let backend = WarmBackendS3 {
-            core: TransitionCore(Arc::clone(&client)),
-            client,
-            bucket: "bucket".to_string(),
-            prefix: String::new(),
-            storage_class: String::new(),
-        };
-
-        let err = backend
-            .get_with_headers(
-                "probe",
-                "",
-                WarmBackendGetOpts {
-                    start_offset: i64::MAX,
-                    length: 2,
-                },
-            )
-            .await
-            .expect_err("an overflowing range must fail before issuing a GET");
-
-        assert_eq!(err.kind(), std::io::ErrorKind::InvalidInput);
-        assert!(
-            tokio::time::timeout(Duration::from_millis(100), listener.accept())
-                .await
-                .is_err()
-        );
-    }
-
-    async fn candidate_probe_fixture() -> Option<(WarmBackendS3, tokio::task::JoinHandle<Vec<String>>)> {
-        let listener = match tokio::net::TcpListener::bind("127.0.0.1:0").await {
-            Ok(listener) => listener,
-            Err(err) if err.kind() == std::io::ErrorKind::PermissionDenied => return None,
-            Err(err) => panic!("test listener should bind: {err}"),
-        };
-        let endpoint = listener
-            .local_addr()
-            .expect("listener local address should be available")
-            .to_string();
-        let fixture = tokio::spawn(async move {
-            let responses = [
-                "HTTP/1.1 206 Partial Content\r\nContent-Length: 1\r\nx-amz-version-id: opaque-version\r\nConnection: close\r\n\r\nx",
-                "HTTP/1.1 206 Partial Content\r\nContent-Length: 1\r\nConnection: close\r\n\r\nx",
-                "HTTP/1.1 404 Not Found\r\nContent-Type: application/xml\r\nContent-Length: 63\r\nConnection: close\r\n\r\n<Error><Code>NoSuchKey</Code><Message>missing</Message></Error>",
-                "HTTP/1.1 404 Not Found\r\nContent-Type: application/xml\r\nContent-Length: 66\r\nConnection: close\r\n\r\n<Error><Code>NoSuchObject</Code><Message>missing</Message></Error>",
-                "HTTP/1.1 403 Forbidden\r\nContent-Type: application/xml\r\nContent-Length: 65\r\nConnection: close\r\n\r\n<Error><Code>AccessDenied</Code><Message>denied</Message></Error>",
-                "HTTP/1.1 404 Not Found\r\nContent-Type: application/xml\r\nContent-Length: 63\r\nConnection: close\r\n\r\n<Error><Code>NoSuchKey</Code><Message>missing</Message></Error>",
-                "HTTP/1.1 416 Range Not Satisfiable\r\nContent-Type: application/xml\r\nContent-Length: 72\r\nConnection: close\r\n\r\n<Error><Code>InvalidRange</Code><Message>empty version</Message></Error>",
-                "HTTP/1.1 404 Not Found\r\nContent-Type: application/xml\r\nContent-Length: 67\r\nConnection: close\r\n\r\n<Error><Code>NoSuchVersion</Code><Message>missing</Message></Error>",
-                "HTTP/1.1 404 Not Found\r\nContent-Type: application/xml\r\nContent-Length: 63\r\nConnection: close\r\n\r\n<Error><Code>NoSuchKey</Code><Message>missing</Message></Error>",
-            ];
-            let mut requests = Vec::new();
-            for response in responses {
-                let (mut stream, _) = listener.accept().await.expect("fixture should accept candidate GET");
-                let mut request = Vec::new();
-                let mut buffer = [0; 1024];
-                loop {
-                    let read = stream.read(&mut buffer).await.expect("fixture should read request headers");
-                    assert_ne!(read, 0, "connection closed before request headers were received");
-                    request.extend_from_slice(&buffer[..read]);
-                    if request.windows(4).any(|window| window == b"\r\n\r\n") {
-                        break;
-                    }
-                }
-                requests.push(String::from_utf8_lossy(&request).into_owned());
-                stream
-                    .write_all(response.as_bytes())
-                    .await
-                    .expect("fixture should write candidate response");
-            }
-            requests
-        });
-        let client = Arc::new(
-            TransitionClient::new(
-                &endpoint,
-                Options {
-                    creds: Credentials::new(Static(Value {
-                        access_key_id: "access-key".to_string(),
-                        secret_access_key: "secret-key".to_string(),
-                        signer_type: SignatureType::SignatureV4,
-                        ..Default::default()
-                    })),
-                    region: "us-east-1".to_string(),
-                    bucket_lookup: BucketLookupType::BucketLookupPath,
-                    max_retries: 1,
-                    ..Default::default()
-                },
-                "s3",
-            )
-            .await
-            .expect("fixture client should build"),
-        );
-        Some((
-            WarmBackendS3 {
-                core: TransitionCore(Arc::clone(&client)),
-                client,
-                bucket: "bucket".to_string(),
-                prefix: String::new(),
-                storage_class: String::new(),
-            },
-            fixture,
-        ))
-    }
-
-    #[tokio::test]
-    async fn candidate_probe_uses_only_exact_bounded_get_permissions() {
-        let Some((backend, fixture)) = candidate_probe_fixture().await else {
-            return;
-        };
-
-        assert_eq!(
-            backend
-                .probe_transition_candidate("versioned-probe")
-                .await
-                .expect("versioned candidate should be discovered"),
-            TransitionCandidateProbe::VersionedPresent("opaque-version".to_string())
-        );
-        assert_eq!(
-            backend
-                .probe_transition_candidate("unversioned-probe")
-                .await
-                .expect("unversioned candidate should be discovered"),
-            TransitionCandidateProbe::UnversionedPresent
-        );
-        assert_eq!(
-            backend
-                .probe_transition_candidate("missing-probe")
-                .await
-                .expect("a missing key should be classified"),
-            TransitionCandidateProbe::Missing
-        );
-        assert_eq!(
-            backend
-                .probe_transition_candidate("provider-missing-probe")
-                .await
-                .expect("a provider-specific missing code should be classified"),
-            TransitionCandidateProbe::Missing
-        );
-        let err = backend
-            .probe_transition_candidate("forbidden-probe")
-            .await
-            .expect_err("an authorization failure must not be mistaken for a missing key");
-        assert_eq!(to_error_response(&err).code, S3ErrorCode::AccessDenied);
-        assert_eq!(
-            backend
-                .probe_transition_candidate("delete-marker-hidden")
-                .await
-                .expect("a current delete marker should hide the data version"),
-            TransitionCandidateProbe::Missing
-        );
-        assert_eq!(
-            backend
-                .probe_transition_version("delete-marker-hidden", "historical-version")
-                .await
-                .expect("the stored historical version should be probed exactly"),
-            TransitionCandidateProbe::VersionedPresent("historical-version".to_string())
-        );
-        assert_eq!(
-            backend
-                .probe_transition_version("delete-marker-hidden", "missing-version")
-                .await
-                .expect("a missing exact version should be classified"),
-            TransitionCandidateProbe::Missing
-        );
-        assert_eq!(
-            backend
-                .probe_transition_version("missing-object", "historical-version")
-                .await
-                .expect("a missing key for an exact version probe should be classified"),
-            TransitionCandidateProbe::Missing
-        );
-
-        let requests = fixture.await.expect("candidate fixture should join");
-        for request in &requests[..6] {
-            let request = request.to_ascii_lowercase();
-            assert!(request.starts_with("get /bucket/"), "candidate discovery must use object GET");
-            assert!(request.contains("\r\nrange: bytes=0-0\r\n"));
-            assert!(!request.contains("?versioning"));
-            assert!(!request.contains("?versions"));
-        }
-        for request in &requests[6..] {
-            let request = request.to_ascii_lowercase();
-            assert!(request.starts_with("get /bucket/"), "exact discovery must use object GET");
-            assert!(request.contains("\r\nrange: bytes=0-0\r\n"));
-        }
-        assert!(!requests[5].to_ascii_lowercase().contains("versionid="));
-        assert!(requests[6].to_ascii_lowercase().contains("?versionid=historical-version"));
-        assert!(requests[7].to_ascii_lowercase().contains("?versionid=missing-version"));
-        assert!(requests[8].to_ascii_lowercase().contains("?versionid=historical-version"));
-    }
-
    fn list_versions(versions: &[(&str, &str)], delete_markers: &[(&str, &str)], is_truncated: bool) -> ListVersionsResult {
        ListVersionsResult {
            versions: versions
@@ -703,7 +445,8 @@ mod tests {
        for page in pages {
            candidates.extend("archive/object", page);
        }
-        candidates.classify(bucket_versioning)
+        classify_transition_candidates(candidates, bucket_versioning, bucket_versioning)
+            .expect("fixture version identifiers are valid")
    }

    fn candidate_identity() -> TransitionCandidateIdentity {
@@ -782,7 +525,35 @@ mod tests {
                RemoteBucketVersioning::Suspended,
                &[list_versions(&[("archive/object", "null")], &[], false)],
            ),
-            TransitionCandidateProbe::VersionedPresent("null".to_string())
+            TransitionCandidateProbe::SuspendedNullPresent
+        );
+        assert_eq!(
+            classify_pages(
+                RemoteBucketVersioning::Enabled,
+                &[list_versions(&[("archive/object", "null")], &[], false)],
+            ),
+            TransitionCandidateProbe::SuspendedNullPresent
+        );
+        assert_eq!(
+            classify_pages(
+                RemoteBucketVersioning::Suspended,
+                &[list_versions(&[("archive/object", "version-a")], &[], false)],
+            ),
+            TransitionCandidateProbe::VersionedPresent("version-a".to_string())
+        );
+        assert_eq!(
+            classify_pages(
+                RemoteBucketVersioning::Disabled,
+                &[list_versions(&[("archive/object", "null")], &[], false)],
+            ),
+            TransitionCandidateProbe::UnversionedPresent
+        );
+        assert_eq!(
+            classify_pages(
+                RemoteBucketVersioning::Disabled,
+                &[list_versions(&[("archive/object", "unexpected-version")], &[], false)],
+            ),
+            TransitionCandidateProbe::Ambiguous
        );
        assert_eq!(
            classify_pages(RemoteBucketVersioning::Enabled, &[list_versions(&[("archive/object", "")], &[], false)],),
@@ -850,11 +621,23 @@ mod tests {
        let mut candidates = TransitionCandidateVersions::default();
        candidates.extend("archive/object", &list_versions(&[("archive/object", "version\ninjection")], &[], false));

-        let err = classify_transition_candidates(candidates, RemoteBucketVersioning::Enabled)
+        let err = classify_transition_candidates(candidates, RemoteBucketVersioning::Enabled, RemoteBucketVersioning::Enabled)
            .expect_err("control characters in listed version IDs must fail closed");
        assert_eq!(err.kind(), std::io::ErrorKind::InvalidData);
    }

+    #[test]
+    fn transition_candidate_probe_rejects_bucket_versioning_drift() {
+        let mut candidates = TransitionCandidateVersions::default();
+        candidates.extend("archive/object", &list_versions(&[("archive/object", "null")], &[], false));
+
+        assert_eq!(
+            classify_transition_candidates(candidates, RemoteBucketVersioning::Suspended, RemoteBucketVersioning::Enabled,)
+                .expect("observed versioning drift should be a safe probe result"),
+            TransitionCandidateProbe::Ambiguous
+        );
+    }
+
    #[test]
    fn remote_bucket_versioning_status_parser_fails_closed() {
        assert_eq!(
@@ -908,7 +691,8 @@ impl WarmBackend for WarmBackendS3 {
    }

    async fn probe_transition_candidate(&self, object: &str) -> Result<TransitionCandidateProbe, std::io::Error> {
-        self.probe_current_transition_candidate_with_header(object, None).await
+        let bucket_versioning = self.remote_bucket_versioning().await?;
+        self.probe_transition_candidate_versions(object, bucket_versioning).await
    }

    async fn in_use(&self) -> Result<bool, std::io::Error> {
@@ -15,13 +15,15 @@
 #![allow(unused_variables)]
 #![allow(unused_mut)]
 #![allow(unused_assignments)]
+#![allow(unused_must_use)]
+#![allow(clippy::all)]

 use std::collections::HashMap;

 use crate::services::tier::{
    tier_config::TierTencent,
    warm_backend::{
-        S3CompatibleWarmBackendParams, TransitionCandidateProbe, WarmBackend, WarmBackendGetOpts, build_transition_put_options,
+        S3CompatibleWarmBackendParams, WarmBackend, WarmBackendGetOpts, build_transition_put_options,
        new_s3_compatible_warm_backend, optimal_part_size,
    },
    warm_backend_s3::WarmBackendS3,
@@ -87,10 +89,6 @@ impl WarmBackend for WarmBackendTencent {
        self.0.remove(object, rv).await
    }

-    async fn probe_transition_candidate(&self, object: &str) -> Result<TransitionCandidateProbe, std::io::Error> {
-        self.0.probe_transition_candidate(object).await
-    }
-
    async fn in_use(&self) -> Result<bool, std::io::Error> {
        self.0.in_use().await
    }
@@ -23,7 +23,7 @@ use uuid::Uuid;

 use crate::services::tier::{
    tier_config::{TierS3, TierWasabi},
-    warm_backend::{TransitionCandidateProbe, WarmBackend, WarmBackendGetOpts},
+    warm_backend::{WarmBackend, WarmBackendGetOpts},
    warm_backend_s3::WarmBackendS3,
 };
 use rustfs_s3_client::transition_api::{BucketLookupType, ReadCloser, ReaderImpl};
@@ -169,10 +169,6 @@ impl WarmBackend for WarmBackendWasabi {
        self.s3.remove(object, rv).await
    }

-    async fn probe_transition_candidate(&self, object: &str) -> io::Result<TransitionCandidateProbe> {
-        self.s3.probe_transition_candidate(object).await
-    }
-
    async fn in_use(&self) -> io::Result<bool> {
        self.check_remote_bucket_unversioned().await?;
        let in_use = self.s3.in_use().await?;
@@ -1,385 +0,0 @@
-// Copyright 2024 RustFS Team
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! Pure metadata quorum and early-stop decisions for `SetDisks` reads.
-//!
-//! Disk scheduling, coalescing, cancellation, and late shard materialization
-//! remain with their existing owners; this module only classifies observations.
-
-use crate::diagnostics::get::{
-    GET_METADATA_EARLY_STOP_REASON_CONFLICTING_METADATA, GET_METADATA_EARLY_STOP_REASON_DELETE_MARKER,
-    GET_METADATA_EARLY_STOP_REASON_ERROR, GET_METADATA_EARLY_STOP_REASON_INSUFFICIENT_QUORUM,
-    GET_METADATA_EARLY_STOP_REASON_NOT_FOUND, GET_METADATA_EARLY_STOP_REASON_UNSAFE_REQUEST,
-    GET_METADATA_EARLY_STOP_REASON_VALID_QUORUM, GET_METADATA_EARLY_STOP_REASON_VERSION_MATCH_QUORUM,
-    GET_METADATA_EARLY_STOP_REASON_VERSION_NOT_FOUND,
-};
-use crate::disk::error::DiskError;
-use crate::disk::error_reduce::OBJECT_OP_IGNORED_ERRS;
-use crate::set_disk::file_info_is_valid_for_metadata;
-use rustfs_filemeta::FileInfo;
-
-#[derive(Clone, Copy, Debug, Eq, PartialEq)]
-pub(in crate::set_disk) struct MetadataEarlyStopDecision {
-    pub(in crate::set_disk) reason: &'static str,
-}
-
-#[derive(Clone, Debug)]
-pub(in crate::set_disk) struct MetadataQuorumAccumulator {
-    pub(in crate::set_disk) total_disks: usize,
-    pub(in crate::set_disk) default_parity_count: usize,
-    pub(in crate::set_disk) allow_early_stop: bool,
-    pub(in crate::set_disk) valid_responses: usize,
-    pub(in crate::set_disk) not_found_responses: usize,
-    pub(in crate::set_disk) version_not_found_responses: usize,
-    pub(in crate::set_disk) ignored_errors: usize,
-    pub(in crate::set_disk) hard_errors: usize,
-    pub(in crate::set_disk) candidate: Option<FileInfo>,
-    pub(in crate::set_disk) candidate_votes: usize,
-    // Bitset of shard indexes whose metadata matches the candidate. Erasure
-    // layouts are capped at 16 shards, so this stays allocation-free on the
-    // GET metadata hot path.
-    candidate_shard_mask: u16,
-    pub(in crate::set_disk) conflicting_metadata: bool,
-    pub(in crate::set_disk) delete_marker_seen: bool,
-    pub(in crate::set_disk) delete_marker_candidates: Vec<(FileInfo, usize)>,
-    pub(in crate::set_disk) delete_marker_votes: usize,
-    pub(in crate::set_disk) requested_version_id: String,
-    pub(in crate::set_disk) matching_version_votes: usize,
-}
-
-impl MetadataQuorumAccumulator {
-    pub(in crate::set_disk) fn new(total_disks: usize, default_parity_count: usize, allow_early_stop: bool) -> Self {
-        Self {
-            total_disks,
-            default_parity_count,
-            allow_early_stop,
-            valid_responses: 0,
-            not_found_responses: 0,
-            version_not_found_responses: 0,
-            ignored_errors: 0,
-            hard_errors: 0,
-            candidate: None,
-            candidate_votes: 0,
-            candidate_shard_mask: 0,
-            conflicting_metadata: false,
-            delete_marker_seen: false,
-            delete_marker_candidates: Vec::new(),
-            delete_marker_votes: 0,
-            requested_version_id: String::new(),
-            matching_version_votes: 0,
-        }
-    }
-
-    pub(in crate::set_disk) fn with_requested_version_id(mut self, version_id: &str) -> Self {
-        self.requested_version_id = version_id.to_string();
-        self
-    }
-
-    pub(in crate::set_disk) fn observe_file_info(&mut self, file_info: &FileInfo) {
-        self.observe_file_info_with_index(None, file_info);
-    }
-
-    pub(in crate::set_disk) fn observe_file_info_at(&mut self, disk_index: usize, file_info: &FileInfo) {
-        self.observe_file_info_with_index(Some(disk_index), file_info);
-    }
-
-    fn observe_file_info_with_index(&mut self, disk_index: Option<usize>, file_info: &FileInfo) {
-        if !file_info_is_valid_for_metadata(file_info) {
-            self.hard_errors = self.hard_errors.saturating_add(1);
-            return;
-        }
-
-        self.valid_responses = self.valid_responses.saturating_add(1);
-
-        // Track version match for versioned requests
-        if !self.requested_version_id.is_empty()
-            && let Some(ref vid) = file_info.version_id
-            && vid.to_string() == self.requested_version_id
-        {
-            self.matching_version_votes = self.matching_version_votes.saturating_add(1);
-        }
-
-        if file_info.is_canonical_delete_marker() {
-            self.delete_marker_seen = true;
-            if let Some((_, votes)) = self
-                .delete_marker_candidates
-                .iter_mut()
-                .find(|(candidate, _)| metadata_early_stop_candidate_matches(candidate, file_info))
-            {
-                *votes = votes.saturating_add(1);
-            } else {
-                self.delete_marker_candidates.push((file_info.clone(), 1));
-            }
-            self.delete_marker_votes = self
-                .delete_marker_candidates
-                .iter()
-                .map(|(_, votes)| *votes)
-                .max()
-                .unwrap_or_default();
-            self.conflicting_metadata |= self.delete_marker_candidates.len() > 1;
-            return;
-        }
-
-        match &self.candidate {
-            Some(candidate) if metadata_early_stop_candidate_matches(candidate, file_info) => {
-                self.candidate_votes = self.candidate_votes.saturating_add(1);
-                if let Some(disk_index) = disk_index
-                    && let Some(bit) = Self::candidate_shard_bit(candidate, file_info, disk_index)
-                {
-                    self.candidate_shard_mask |= bit;
-                }
-            }
-            Some(_) => {
-                self.conflicting_metadata = true;
-            }
-            None => {
-                self.candidate = Some(file_info.clone());
-                self.candidate_votes = 1;
-                if let Some(disk_index) = disk_index
-                    && let Some(bit) = Self::candidate_shard_bit(file_info, file_info, disk_index)
-                {
-                    self.candidate_shard_mask |= bit;
-                }
-            }
-        }
-    }
-
-    fn candidate_shard_bit(candidate: &FileInfo, file_info: &FileInfo, disk_index: usize) -> Option<u16> {
-        let &erasure_index = candidate.erasure.distribution.get(disk_index)?;
-        if erasure_index == 0 || erasure_index > u16::BITS as usize || file_info.erasure.index != erasure_index {
-            return None;
-        }
-        Some(1u16 << (erasure_index - 1))
-    }
-
-    pub(in crate::set_disk) fn candidate_has_read_reserve(&self) -> bool {
-        self.candidate_read_reserve_target()
-            .is_some_and(|required| self.candidate_shard_mask.count_ones() as usize >= required)
-    }
-
-    pub(in crate::set_disk) fn candidate_read_reserve_target(&self) -> Option<usize> {
-        let candidate = self.candidate.as_ref()?;
-        Some(
-            candidate
-                .erasure
-                .data_blocks
-                .saturating_add(usize::from(candidate.erasure.parity_blocks > 0)),
-        )
-    }
-
-    pub(in crate::set_disk) fn observe_error(&mut self, err: &DiskError) {
-        match err {
-            DiskError::FileNotFound | DiskError::VolumeNotFound => {
-                self.not_found_responses = self.not_found_responses.saturating_add(1);
-            }
-            DiskError::FileVersionNotFound => {
-                self.version_not_found_responses = self.version_not_found_responses.saturating_add(1);
-            }
-            _ if is_metadata_fanout_ignored_error(err) => {
-                self.ignored_errors = self.ignored_errors.saturating_add(1);
-            }
-            _ => {
-                self.hard_errors = self.hard_errors.saturating_add(1);
-            }
-        }
-    }
-
-    pub(in crate::set_disk) fn early_stop_decision(&self) -> Option<MetadataEarlyStopDecision> {
-        if !self.allow_early_stop {
-            return None;
-        }
-        if self.delete_marker_votes >= self.default_write_quorum() {
-            return Some(MetadataEarlyStopDecision {
-                reason: GET_METADATA_EARLY_STOP_REASON_DELETE_MARKER,
-            });
-        }
-        if self.conflicting_metadata
-            || self.delete_marker_seen
-            || self.not_found_responses > 0
-            || self.version_not_found_responses > 0
-            || self.hard_errors > 0
-        {
-            return None;
-        }
-        if self
-            .candidate
-            .as_ref()
-            .and_then(|candidate| self.candidate_latest_quorum(candidate))
-            .is_some_and(|latest_quorum| self.candidate_votes >= latest_quorum)
-        {
-            return Some(MetadataEarlyStopDecision {
-                reason: GET_METADATA_EARLY_STOP_REASON_VALID_QUORUM,
-            });
-        }
-        None
-    }
-
-    /// Check if a versioned request can early-stop because the requested
-    /// version_id has reached quorum across disks.
-    pub(in crate::set_disk) fn version_early_stop_decision(&self) -> Option<MetadataEarlyStopDecision> {
-        if !self.allow_early_stop {
-            return None;
-        }
-        if self.requested_version_id.is_empty() {
-            return None;
-        }
-        if self.conflicting_metadata
-            || self.delete_marker_seen
-            || self.not_found_responses > 0
-            || self.version_not_found_responses > 0
-            || self.hard_errors > 0
-        {
-            return None;
-        }
-        if self.matching_version_votes >= self.read_quorum_for_version() {
-            return Some(MetadataEarlyStopDecision {
-                reason: GET_METADATA_EARLY_STOP_REASON_VERSION_MATCH_QUORUM,
-            });
-        }
-        None
-    }
-
-    pub(in crate::set_disk) fn can_still_reach_early_stop_with_pending(&self, pending: usize) -> bool {
-        if !self.allow_early_stop {
-            return false;
-        }
-        if self.delete_marker_votes.saturating_add(pending) >= self.default_write_quorum() {
-            return true;
-        }
-        if self.conflicting_metadata
-            || self.delete_marker_seen
-            || self.not_found_responses > 0
-            || self.version_not_found_responses > 0
-            || self.hard_errors > 0
-        {
-            return false;
-        }
-        if !self.requested_version_id.is_empty()
-            && self.matching_version_votes.saturating_add(pending) >= self.read_quorum_for_version()
-        {
-            return true;
-        }
-        match &self.candidate {
-            Some(candidate) => self
-                .candidate_latest_quorum(candidate)
-                .is_some_and(|latest_quorum| self.candidate_votes.saturating_add(pending) >= latest_quorum),
-            None => pending >= self.default_write_quorum(),
-        }
-    }
-
-    /// Compute the read quorum threshold for version-aware early-stop.
-    /// Uses `total_disks / 2` (like `missing_response_quorum`) when
-    /// `default_parity_count` is set, otherwise requires all disks.
-    pub(in crate::set_disk) fn read_quorum_for_version(&self) -> usize {
-        self.missing_response_quorum()
-    }
-
-    pub(in crate::set_disk) fn final_miss_reason(&self) -> &'static str {
-        if !self.allow_early_stop {
-            return GET_METADATA_EARLY_STOP_REASON_UNSAFE_REQUEST;
-        }
-        if self.conflicting_metadata {
-            return GET_METADATA_EARLY_STOP_REASON_CONFLICTING_METADATA;
-        }
-        if self.delete_marker_seen {
-            return GET_METADATA_EARLY_STOP_REASON_DELETE_MARKER;
-        }
-        let missing_response_quorum = self.missing_response_quorum();
-        if self.version_not_found_responses >= missing_response_quorum {
-            return GET_METADATA_EARLY_STOP_REASON_VERSION_NOT_FOUND;
-        }
-        if self.not_found_responses >= missing_response_quorum {
-            return GET_METADATA_EARLY_STOP_REASON_NOT_FOUND;
-        }
-        if self.hard_errors > 0 {
-            return GET_METADATA_EARLY_STOP_REASON_ERROR;
-        }
-        if self.ignored_errors > 0 {
-            return GET_METADATA_EARLY_STOP_REASON_INSUFFICIENT_QUORUM;
-        }
-        GET_METADATA_EARLY_STOP_REASON_INSUFFICIENT_QUORUM
-    }
-
-    pub(in crate::set_disk) fn candidate_latest_quorum(&self, candidate: &FileInfo) -> Option<usize> {
-        if self.default_parity_count == 0 {
-            return Some(self.total_disks);
-        }
-        if candidate.is_canonical_delete_marker() || candidate.size == 0 || candidate.erasure.parity_blocks >= self.total_disks {
-            return None;
-        }
-        let data_blocks = candidate.erasure.data_blocks;
-        Some(if data_blocks == candidate.erasure.parity_blocks {
-            data_blocks.saturating_add(1)
-        } else {
-            data_blocks
-        })
-    }
-
-    pub(crate) fn default_write_quorum(&self) -> usize {
-        if self.default_parity_count == 0 || self.default_parity_count >= self.total_disks {
-            return self.total_disks;
-        }
-        let data_blocks = self.total_disks.saturating_sub(self.default_parity_count);
-        if data_blocks == self.default_parity_count {
-            data_blocks.saturating_add(1)
-        } else {
-            data_blocks
-        }
-    }
-
-    pub(in crate::set_disk) fn missing_response_quorum(&self) -> usize {
-        if self.default_parity_count == 0 || self.default_parity_count >= self.total_disks {
-            self.total_disks
-        } else {
-            self.total_disks / 2
-        }
-    }
-}
-
-pub(in crate::set_disk) fn metadata_early_stop_candidate_matches(left: &FileInfo, right: &FileInfo) -> bool {
-    left.volume == right.volume
-        && left.name == right.name
-        && left.version_id == right.version_id
-        && left.is_latest == right.is_latest
-        && left.deleted == right.deleted
-        && left.mark_deleted == right.mark_deleted
-        && left.transition_status == right.transition_status
-        && left.transitioned_objname == right.transitioned_objname
-        && left.transition_tier == right.transition_tier
-        && left.transition_version_id == right.transition_version_id
-        && left.transition_version == right.transition_version
-        && left.transition_version_state == right.transition_version_state
-        && left.expire_restored == right.expire_restored
-        && left.size == right.size
-        && left.mod_time == right.mod_time
-        && left.mode == right.mode
-        && left.written_by_version == right.written_by_version
-        && left.metadata == right.metadata
-        && left.replication_state_internal == right.replication_state_internal
-        && left.parts == right.parts
-        && left.checksum == right.checksum
-        && left.versioned == right.versioned
-        && left.num_versions == right.num_versions
-        && left.successor_mod_time == right.successor_mod_time
-        && left.data_dir == right.data_dir
-        && left.erasure.algorithm == right.erasure.algorithm
-        && left.erasure.data_blocks == right.erasure.data_blocks
-        && left.erasure.parity_blocks == right.erasure.parity_blocks
-        && left.erasure.block_size == right.erasure.block_size
-        && left.erasure.distribution == right.erasure.distribution
-}
-
-pub(in crate::set_disk) fn is_metadata_fanout_ignored_error(err: &DiskError) -> bool {
-    OBJECT_OP_IGNORED_ERRS.iter().any(|ignored| ignored == err)
-}
@@ -18,4 +18,3 @@
 //! duplicating read/write/erasure logic.

 pub(crate) mod io_primitives;
-mod metadata_quorum;
@@ -876,7 +876,7 @@ pub use ops::multipart::{MultipartCommitBarrier, MultipartCommitPause};
 pub(crate) use ops::object::DeleteObjectCommitBarrier;
 #[cfg(any(test, feature = "test-util"))]
 pub(crate) use ops::object::TransitionCleanupStoreBarrier as SetDiskTransitionCleanupStoreBarrier;
-#[cfg(all(test, feature = "test-util"))]
+#[cfg(test)]
 pub(crate) use ops::object::TransitionUploadedCommitBarrier as SetDiskTransitionUploadedCommitBarrier;
 pub(crate) use ops::object::body_cache_plaintext_len;
 #[cfg(all(test, feature = "test-util"))]
@@ -3877,6 +3877,31 @@ pub struct SetDisks {
    >,
 }

+/// Read every available `xl.meta` copy for an exact logical object after
+/// enforcing this set's metadata read quorum. Callers use the individual
+/// buffers only for diagnostics and immutable reconciliation digests; a
+/// missing disk remains visible as `None` and must never be mistaken for an
+/// absent metadata key.
+pub(crate) async fn read_legacy_transition_state_metadata_copies(
+    set: &SetDisks,
+    bucket: &str,
+    object: &str,
+) -> Result<Vec<Option<Vec<u8>>>> {
+    let disk_object = rustfs_utils::path::encode_dir_object(object);
+    let disks = set.get_disks_internal().await;
+    if disks.is_empty() {
+        return Err(to_object_err(StorageError::ErasureReadQuorum, vec![bucket, object]));
+    }
+
+    let read_quorum = disks.len().div_ceil(2).max(1);
+    let (copies, errs) = SetDisks::read_all_raw_file_info(&disks, bucket, disk_object.as_str(), false).await;
+    if let Some(err) = reduce_read_quorum_errs(&errs, OBJECT_OP_IGNORED_ERRS, read_quorum) {
+        return Err(to_object_err(err.into(), vec![bucket, object]));
+    }
+
+    Ok(copies.into_iter().map(|copy| copy.map(|copy| copy.buf)).collect())
+}
+
 // DistributedLock sends the raw ObjectKey to its clients; LockRegistry clones
 // each endpoint's canonical Arc, so an exact Arc set identifies the lock domain.
 pub(crate) fn same_distributed_lock_domain(left: &[Arc<dyn LockClient>], right: &[Arc<dyn LockClient>]) -> bool {
@@ -2490,9 +2490,9 @@ impl crate::storage_api_contracts::heal::HealOperations for SetDisks {
            return Ok((result, err.map(|e| e.into())));
        }

-        // The inner heal and missing-object report read the registry again;
-        // release this snapshot guard before a topology writer can queue between reads.
-        let disks = self.get_disks_internal().await;
+        let disks = self.disks.read().await;
+
+        let disks = disks.clone();
        let (_, errs) = Self::read_all_fileinfo(&disks, "", bucket, object, version_id, false, false, false)
            .await
            .map_err(|e| to_object_err(e.into(), vec![bucket, object]))?;
@@ -3419,366 +3419,6 @@ mod heal_result_report_tests {
        assert_eq!(unformatted, DiskError::UnformattedDisk);
    }

-    #[derive(Clone, Copy)]
-    enum InventoryWriterHealCase {
-        Existing,
-        Missing,
-        MissingVersion,
-    }
-
-    async fn assert_heal_object_inventory_writer(case: InventoryWriterHealCase) {
-        use crate::set_disk::core::io_primitives::disk_call_counters;
-        use std::time::Duration;
-        use tokio::io::AsyncReadExt;
-
-        let (_temp_dirs, disks, set) = hermetic_set_disks_isolated(4).await;
-        let bucket = "heal-inventory-writer-bucket";
-        let object = match case {
-            InventoryWriterHealCase::Existing => "heal-inventory-writer-existing",
-            InventoryWriterHealCase::Missing => "heal-inventory-writer-missing",
-            InventoryWriterHealCase::MissingVersion => "heal-inventory-writer-missing-version",
-        };
-        set.make_bucket(
-            bucket,
-            &MakeBucketOptions {
-                versioning_enabled: true,
-                ..Default::default()
-            },
-        )
-        .await
-        .expect("heal fixture bucket should be created");
-        let body = vec![0x67; 64 * 1024];
-        let stored_version = Uuid::new_v4();
-        let stored_version_string = stored_version.to_string();
-        let published = if matches!(case, InventoryWriterHealCase::Missing) {
-            None
-        } else {
-            let mut reader = PutObjReader::from_vec(body.clone());
-            let info = set
-                .put_object(
-                    bucket,
-                    object,
-                    &mut reader,
-                    &ObjectOptions {
-                        no_lock: true,
-                        versioned: true,
-                        version_id: Some(stored_version_string.clone()),
-                        ..Default::default()
-                    },
-                )
-                .await
-                .expect("full-fanout PUT should seed the heal fixture");
-            for disk in &disks {
-                let metadata = disk
-                    .read_version("", bucket, object, &stored_version_string, &ReadOptions::default())
-                    .await
-                    .expect("the seeded version must be present on every disk");
-                assert_eq!(metadata.version_id, Some(stored_version));
-                assert_eq!(metadata.size, i64::try_from(body.len()).expect("fixture size should fit i64"));
-            }
-            Some(info)
-        };
-        let requested_version = match case {
-            InventoryWriterHealCase::Existing => stored_version_string.clone(),
-            InventoryWriterHealCase::Missing => String::new(),
-            InventoryWriterHealCase::MissingVersion => Uuid::new_v4().to_string(),
-        };
-        let opts = HealOpts {
-            no_lock: true,
-            ..Default::default()
-        };
-        let calls = disk_call_counters::observe(object);
-        let read_gate = set.disks.read().await;
-        // UFCS selects the trait's outer precheck, not the same-named inherent heal.
-        let heal = <SetDisks as crate::storage_api_contracts::heal::HealOperations>::heal_object(
-            set.as_ref(),
-            bucket,
-            object,
-            &requested_version,
-            &opts,
-        );
-        tokio::pin!(heal);
-        assert!(matches!(
-            futures::poll!(tokio::task::unconstrained(heal.as_mut())),
-            std::task::Poll::Pending
-        ));
-        // These tests use the current-thread runtime: full-wait metadata tasks
-        // have been spawned, but cannot run during the single unconstrained poll.
-        assert_eq!(calls.total(disk_call_counters::KIND_READ_VERSION), 0);
-        let writer = set.disks.write();
-        tokio::pin!(writer);
-        assert!(matches!(
-            futures::poll!(tokio::task::unconstrained(writer.as_mut())),
-            std::task::Poll::Pending
-        ));
-        assert!(set.disks.try_read().is_err(), "the writer must already block new inventory readers");
-        tokio::time::timeout(Duration::from_secs(5), async {
-            while calls.total(disk_call_counters::KIND_READ_VERSION) < 4 {
-                tokio::task::yield_now().await;
-            }
-        })
-        .await
-        .expect("the suspended trait heal must have started the real metadata fanout");
-        for disk_index in 0..4 {
-            assert_eq!(calls.for_disk(disk_call_counters::KIND_READ_VERSION, disk_index), 1);
-        }
-        drop(read_gate);
-
-        let (_, outcome) =
-            tokio::time::timeout(Duration::from_secs(5), async { tokio::join!(async { drop(writer.await) }, heal) })
-                .await
-                .expect("trait heal must not deadlock its nested inventory read with the queued writer");
-        let (result, error) = outcome.expect("heal should report the object's outcome");
-        match case {
-            InventoryWriterHealCase::Existing => assert!(error.is_none(), "existing object heal failed: {error:?}"),
-            InventoryWriterHealCase::Missing => assert!(matches!(error, Some(Error::FileNotFound))),
-            InventoryWriterHealCase::MissingVersion => assert!(matches!(error, Some(Error::FileVersionNotFound))),
-        }
-        assert_eq!(result.bucket, bucket);
-        assert_eq!(result.object, object);
-        assert_eq!(result.version_id, requested_version);
-        assert_eq!(result.disk_count, 4);
-        assert_eq!(result.before.drives.len(), 4);
-        assert_eq!(result.after.drives.len(), 4);
-        for disk_index in 0..4 {
-            let endpoint = set.set_endpoints[disk_index].to_string();
-            assert_eq!(result.before.drives[disk_index].endpoint, endpoint);
-            assert_eq!(result.after.drives[disk_index].endpoint, endpoint);
-        }
-        if let Some(published) = published {
-            tokio::time::timeout(Duration::from_secs(10), async {
-                let mut reader = set
-                    .get_object_reader(
-                        bucket,
-                        object,
-                        None,
-                        Default::default(),
-                        &ObjectOptions {
-                            versioned: true,
-                            version_id: Some(stored_version_string),
-                            ..Default::default()
-                        },
-                    )
-                    .await
-                    .expect("the stored version must remain readable after heal");
-                assert_eq!(reader.object_info.etag, published.etag);
-                assert_eq!(reader.object_info.version_id, Some(stored_version));
-                let mut observed_body = Vec::new();
-                reader
-                    .stream
-                    .read_to_end(&mut observed_body)
-                    .await
-                    .expect("stored body should stream");
-                assert_eq!(observed_body, body);
-            })
-            .await
-            .expect("GET must finish after the inventory writer and heal");
-        }
-    }
-
-    #[tokio::test]
-    async fn heal_object_inventory_writer_existing() {
-        assert_heal_object_inventory_writer(InventoryWriterHealCase::Existing).await;
-    }
-
-    #[tokio::test]
-    async fn heal_object_inventory_writer_missing() {
-        assert_heal_object_inventory_writer(InventoryWriterHealCase::Missing).await;
-    }
-
-    #[tokio::test]
-    async fn heal_object_inventory_writer_missing_version() {
-        assert_heal_object_inventory_writer(InventoryWriterHealCase::MissingVersion).await;
-    }
-
-    #[tokio::test]
-    #[serial_test::serial]
-    async fn heal_object_with_queued_disk_renewal() {
-        use crate::layout::endpoints::SetupType;
-        use crate::runtime::instance::InstanceContext;
-        use crate::set_disk::core::io_primitives::disk_call_counters;
-        use std::collections::HashMap;
-        use std::future::Future;
-        use std::task::Poll;
-        use std::time::Duration;
-        use tokio::io::AsyncReadExt;
-
-        // renew_disk still registers local disks on the ambient context. Match
-        // the default serial group used by its other setup/registry fixtures,
-        // and restore only this temporary endpoint, including on a failed join.
-        struct RenewDiskTestState {
-            ctx: Arc<InstanceContext>,
-            was_dist_erasure: bool,
-            map: Arc<RwLock<HashMap<String, Option<DiskStore>>>>,
-            endpoint: String,
-            previous_disk: Option<Option<DiskStore>>,
-        }
-
-        impl Drop for RenewDiskTestState {
-            fn drop(&mut self) {
-                let ctx = self.ctx.clone();
-                let was_dist_erasure = self.was_dist_erasure;
-                let map = self.map.clone();
-                let endpoint = self.endpoint.clone();
-                let previous_disk = self.previous_disk.take();
-                let handle = tokio::runtime::Handle::current();
-                std::thread::spawn(move || {
-                    handle.block_on(async move {
-                        let mut map = map.write().await;
-                        match previous_disk {
-                            Some(disk) => {
-                                map.insert(endpoint, disk);
-                            }
-                            None => {
-                                map.remove(&endpoint);
-                            }
-                        }
-                        drop(map);
-                        if was_dist_erasure {
-                            ctx.update_erasure_type(SetupType::DistErasure).await;
-                        }
-                    });
-                })
-                .join()
-                .expect("renew fixture state restoration should finish");
-            }
-        }
-
-        let (_temp_dirs, disks, set) = hermetic_set_disks_isolated(4).await;
-        let endpoint = set.set_endpoints[0].clone();
-        let ctx = crate::runtime::global::current_ctx();
-        let map = ctx.local_disk_map();
-        let restore = RenewDiskTestState {
-            ctx: ctx.clone(),
-            was_dist_erasure: ctx.is_dist_erasure().await,
-            map: map.clone(),
-            endpoint: endpoint.to_string(),
-            previous_disk: map.read().await.get(&endpoint.to_string()).cloned(),
-        };
-        // Only distributed erasure needs an override to avoid the ambient slot array.
-        if restore.was_dist_erasure {
-            ctx.update_erasure_type(SetupType::Erasure).await;
-        }
-
-        let bucket = "heal-disk-renewal-bucket";
-        let object = "heal-disk-renewal-object";
-        set.make_bucket(bucket, &MakeBucketOptions::default())
-            .await
-            .expect("renew fixture bucket should be created");
-        let body = vec![0x73; 64 * 1024];
-        let mut reader = PutObjReader::from_vec(body.clone());
-        let published = set
-            .put_object(
-                bucket,
-                object,
-                &mut reader,
-                &ObjectOptions {
-                    no_lock: true,
-                    ..Default::default()
-                },
-            )
-            .await
-            .expect("full-fanout PUT should seed the renewal fixture");
-        for disk in &disks {
-            let metadata = disk
-                .read_version("", bucket, object, "", &ReadOptions::default())
-                .await
-                .expect("the seeded object must be present on every disk");
-            assert_eq!(metadata.size, i64::try_from(body.len()).expect("fixture size should fit i64"));
-        }
-
-        let opts = HealOpts {
-            no_lock: true,
-            ..Default::default()
-        };
-        let calls = disk_call_counters::observe(object);
-        let read_gate = set.disks.read().await;
-        let heal = <SetDisks as crate::storage_api_contracts::heal::HealOperations>::heal_object(
-            set.as_ref(),
-            bucket,
-            object,
-            "",
-            &opts,
-        );
-        tokio::pin!(heal);
-        assert!(matches!(futures::poll!(tokio::task::unconstrained(heal.as_mut())), Poll::Pending));
-        assert_eq!(calls.total(disk_call_counters::KIND_READ_VERSION), 0);
-
-        let renew = set.renew_disk(&endpoint);
-        tokio::pin!(renew);
-        tokio::time::timeout(
-            Duration::from_secs(5),
-            futures::future::poll_fn(|cx| {
-                assert!(
-                    std::pin::pin!(tokio::task::unconstrained(renew.as_mut()))
-                        .poll(cx)
-                        .is_pending(),
-                    "renewal must reach its inventory write before returning"
-                );
-                if set.disks.try_read().is_err() {
-                    Poll::Ready(())
-                } else {
-                    Poll::Pending
-                }
-            }),
-        )
-        .await
-        .expect("real renewal must queue its topology writer behind the read gate");
-        let registered = map
-            .read()
-            .await
-            .get(&endpoint.to_string())
-            .cloned()
-            .flatten()
-            .expect("renewal must register the connected disk before its inventory write");
-        assert!(!Arc::ptr_eq(&registered, &disks[0]), "renewal must construct a new disk handle");
-        tokio::time::timeout(Duration::from_secs(5), async {
-            while calls.total(disk_call_counters::KIND_READ_VERSION) < 4 {
-                tokio::task::yield_now().await;
-            }
-        })
-        .await
-        .expect("the suspended trait heal must have started the real metadata fanout");
-        for disk_index in 0..4 {
-            assert_eq!(calls.for_disk(disk_call_counters::KIND_READ_VERSION, disk_index), 1);
-        }
-        drop(read_gate);
-
-        let (_, outcome) = tokio::time::timeout(Duration::from_secs(5), async { tokio::join!(renew, heal) })
-            .await
-            .expect("trait heal and real disk renewal must finish without a nested inventory read deadlock");
-        let (report, error) = outcome.expect("heal should report the existing object");
-        assert!(error.is_none(), "existing object heal failed after renewal: {error:?}");
-        assert_eq!(report.bucket, bucket);
-        assert_eq!(report.object, object);
-        assert_eq!(report.disk_count, 4);
-        let renewed = set.get_disks_internal().await[0]
-            .clone()
-            .expect("the renewed slot must remain online");
-        assert!(Arc::ptr_eq(&renewed, &registered), "the set must publish the newly connected handle");
-        assert_eq!(renewed.endpoint(), endpoint);
-        let format = load_format_erasure(&renewed, false)
-            .await
-            .expect("renewed disk format should remain readable");
-        assert_eq!(format.erasure.this, set.format.erasure.sets[0][0]);
-        tokio::time::timeout(Duration::from_secs(10), async {
-            let mut reader = set
-                .get_object_reader(bucket, object, None, Default::default(), &ObjectOptions::default())
-                .await
-                .expect("the object must remain readable after renewal and heal");
-            assert_eq!(reader.object_info.etag, published.etag);
-            let mut observed_body = Vec::new();
-            reader
-                .stream
-                .read_to_end(&mut observed_body)
-                .await
-                .expect("stored body should stream");
-            assert_eq!(observed_body, body);
-        })
-        .await
-        .expect("GET must finish after renewal and heal");
-    }
-
    // Regression for #955: an offline disk must contribute exactly one drive
    // record. Before the fix the offline branch fell through and pushed a second
    // (Corrupt) record for the same disk, so `before/after.drives` grew to
@@ -2452,9 +2452,10 @@ impl crate::storage_api_contracts::multipart::MultipartOperations for SetDisks {
        let write_quorum = fi.write_quorum(self.default_write_quorum());
        let read_quorum = fi.read_quorum(self.default_read_quorum());

-        // Release the registry guard before recovery and cleanup read it again:
-        // a queued topology writer would otherwise deadlock those nested reads.
-        let disks = self.get_disks_internal().await;
+        let disks = self.disks.read().await;
+
+        let disks = disks.clone();
+        // let disks = Self::shuffle_disks(&disks, &fi.erasure.distribution);

        let part_path = format!("{}/{}/", upload_id_path, fi.data_dir.unwrap_or(Uuid::nil()));
        self.recover_part_transactions(&part_path, read_quorum, write_quorum)
@@ -4050,7 +4051,6 @@ mod tests {
            let _ = drain_global_dirty_scopes();

            let rename_barrier = rename_fanout_barrier::arm(object, 0, rename_fanout_barrier::PHASE_RENAME);
-            let rename_tasks = rename_fanout_barrier::observe_tasks(object);
            let complete_store = Arc::clone(&set_disks);
            let mut complete = tokio::spawn(async move {
                let mut opts = ObjectOptions::default();
@@ -4062,6 +4062,16 @@ mod tests {
            tokio::time::timeout(Duration::from_secs(30), rename_barrier.wait_until_paused())
                .await
                .expect("multipart completion should pause one tail disk during rename");
+            assert!(
+                tokio::time::timeout(Duration::from_millis(100), &mut complete).await.is_err(),
+                "multipart completion must not publish success while a tail rename is still paused"
+            );
+
+            let initial = drain_global_dirty_scopes().into_iter().collect::<HashSet<_>>();
+            assert!(
+                initial.is_empty(),
+                "capacity must not be marked as committed before the full multipart rename finishes"
+            );

            let abort_store = Arc::clone(&set_disks);
            let abort = tokio::spawn(async move {
@@ -4070,46 +4080,21 @@ mod tests {
                    .await
            });
            signaling.wait_for_attempts(2).await;
+            assert!(!abort.is_finished(), "the in-flight completion must retain the multipart upload guard");

-            // A paused rename does not establish that the other disks reached quorum.
-            let retained_staging = tokio::time::timeout(Duration::from_secs(30), async {
-                loop {
-                    let mut retained = 0;
-                    for result in futures::future::join_all(
-                        disk_stores
-                            .iter()
-                            .map(|disk| disk.read_all(RUSTFS_META_MULTIPART_BUCKET, &staged_part)),
-                    )
-                    .await
-                    {
-                        match result {
-                            Ok(_) => retained += 1,
-                            Err(DiskError::FileNotFound) => {}
-                            Err(error) => panic!("staged rename source lookup failed: {error}"),
-                        }
-                    }
-                    if retained <= 1 && rename_tasks.running() == 1 {
-                        break retained;
-                    }
-                    tokio::time::sleep(Duration::from_millis(10)).await;
-                }
-            })
+            let retained_staging = futures::future::join_all(
+                disk_stores
+                    .iter()
+                    .map(|disk| disk.read_all(RUSTFS_META_MULTIPART_BUCKET, &staged_part)),
+            )
            .await
-            .expect("unpaused multipart renames should finish before the tail is released");
+            .into_iter()
+            .filter(|result| result.is_ok())
+            .count();
            assert_eq!(
                retained_staging, 1,
                "only the paused tail disk should still retain the multipart rename source"
            );
-            assert!(
-                tokio::time::timeout(Duration::from_millis(100), &mut complete).await.is_err(),
-                "multipart completion must not publish success while a tail rename is still paused"
-            );
-            let initial = drain_global_dirty_scopes().into_iter().collect::<HashSet<_>>();
-            assert!(
-                initial.is_empty(),
-                "capacity must not be marked as committed before the full multipart rename finishes"
-            );
-            assert!(!abort.is_finished(), "the in-flight completion must retain the multipart upload guard");

            signaling.set_target(rustfs_lock::ObjectKey::new(bucket, object));
            let object_attempt = signaling.attempts.load(Ordering::Acquire) + 1;
@@ -6758,87 +6743,6 @@ mod tests {
        .await;
    }

-    #[tokio::test(flavor = "multi_thread")]
-    #[serial]
-    async fn complete_multipart_releases_disk_snapshot_before_cleanup() {
-        let (temp_dirs, disk_stores, set_disks) = hermetic_set_disks(4).await;
-        let bucket = "multipart-topology-lock-bucket";
-        let object = "object";
-        let body = vec![0x65; 4096];
-        make_bucket_on_all(&disk_stores, bucket).await;
-        let (upload_id, parts) =
-            stage_upload_with_create_opts(&set_disks, bucket, object, &body, &ObjectOptions::default()).await;
-        let upload_id_path = SetDisks::get_upload_id_dir(bucket, object, &upload_id);
-        for dir in &temp_dirs {
-            assert!(
-                dir.path().join(RUSTFS_META_MULTIPART_BUCKET).join(&upload_id_path).exists(),
-                "the test must create real upload staging on every disk"
-            );
-        }
-        let barrier = MultipartCommitBarrier::install(bucket, object, MultipartCommitPause::AfterObjectPublication);
-        let complete_store = set_disks.clone();
-        let complete_upload_id = upload_id.clone();
-        let complete = tokio::spawn(async move {
-            complete_store
-                .complete_multipart_upload(bucket, object, &complete_upload_id, parts, &ObjectOptions::default())
-                .await
-        });
-        barrier.wait_until_paused().await;
-
-        // Hold a separate read gate so the real writer queues even when completion
-        // correctly releases its snapshot guard. Polling Pending proves admission
-        // to Tokio's write-preferring queue before the cleanup attempts another read.
-        let read_gate = set_disks.disks.read().await;
-        let writer = set_disks.disks.write();
-        tokio::pin!(writer);
-        assert!(matches!(
-            futures::poll!(tokio::task::unconstrained(writer.as_mut())),
-            std::task::Poll::Pending
-        ));
-        assert!(
-            set_disks.disks.try_read().is_err(),
-            "the pending writer must already block new readers before the cleanup resumes"
-        );
-        drop(read_gate);
-        barrier.release();
-
-        let writer_guard = tokio::time::timeout(Duration::from_secs(5), writer)
-            .await
-            .expect("a queued topology writer must not deadlock with multipart cleanup's disk snapshot");
-        // A reconnect can publish the same handles; this test isolates admission
-        // order without changing the disks that contain the committed object.
-        drop(writer_guard);
-        tokio::time::timeout(Duration::from_secs(10), complete)
-            .await
-            .expect("multipart cleanup must finish after the topology writer releases")
-            .expect("completion task should not panic")
-            .expect("completion should preserve the successful object commit");
-
-        let mut reader = tokio::time::timeout(
-            Duration::from_secs(10),
-            set_disks.get_object_reader(bucket, object, None, HeaderMap::new(), &ObjectOptions::default()),
-        )
-        .await
-        .expect("GET should finish after completion")
-        .expect("the completed object should remain readable");
-        let mut observed_body = Vec::new();
-        tokio::time::timeout(Duration::from_secs(10), reader.stream.read_to_end(&mut observed_body))
-            .await
-            .expect("the completed object body should finish streaming")
-            .expect("the completed object body should be readable");
-        assert_eq!(observed_body, body);
-        assert!(matches!(
-            set_disks.check_upload_id_exists(bucket, object, &upload_id, false).await,
-            Err(StorageError::InvalidUploadID(..))
-        ));
-        for dir in &temp_dirs {
-            assert!(
-                !dir.path().join(RUSTFS_META_MULTIPART_BUCKET).join(&upload_id_path).exists(),
-                "successful completion must remove its upload staging from every disk"
-            );
-        }
-    }
-
    #[tokio::test(flavor = "multi_thread")]
    #[serial]
    async fn complete_releases_object_lock_before_cleanup_and_keeps_upload_lock() {
@@ -299,11 +299,11 @@ use crate::error::is_err_invalid_upload_id;
 use crate::object_api::{GetObjectBodySource, get_object_body_cache_hook_suppressed};
 use crate::object_api::{
    NamespaceLockFence, ReplicationStatusWritebackCondition, ReplicationStatusWritebackMode,
-    SCANNER_PUBLICATION_LEASE_FENCE_METADATA_KEY, WriteCompletion,
+    SCANNER_PUBLICATION_LEASE_FENCE_METADATA_KEY,
 };
 use crate::services::notification_sys::RemoteVersionStateFleetProofToken;
 use crate::services::tier::tier::{TierConfigMgr, TierDestinationId, TierOperationLease, tier_destination_id_from_metadata};
-use crate::set_disk::core::io_primitives::{RenameRollbackReceipt, RenameTailCleanup, finish_rename_tail_heal};
+use crate::set_disk::core::io_primitives::{RenameTailCleanup, finish_rename_tail_heal};
 #[cfg(test)]
 use crate::storage_api_contracts::namespace::NamespaceLocking;
 #[cfg(test)]
@@ -3548,7 +3548,6 @@ impl SetDisks {
                (None, None, None)
            };
        let mut tmp_cleanup_owned = false;
-        let rollback_receipt = RenameRollbackReceipt::default();
        let operation = async {
            let erasure = Arc::new(erasure_from_file_info(&fi, false)?);

@@ -4257,7 +4256,6 @@ impl SetDisks {
            let commit_bucket = bucket.to_owned();
            let commit_object = object.to_owned();
            let commit_tmp_dir = tmp_dir.clone();
-            let commit_rollback_receipt = rollback_receipt.clone();
            let commit_object_lock_guard = object_lock_guard.take();
            let commit_decommission_object_lock_guard = decommission_object_lock_guard.take();
            let commit_publication_guard = publication_commit_guard.take();
@@ -4268,17 +4266,13 @@ impl SetDisks {
            // complete rename fan-out drains. Keep this path synchronous so
            // its terminal state is known before the coordinator releases
            // remote leases.
-            let commit_owns_namespace_guard = commit_object_lock_guard.is_some()
-                || commit_decommission_object_lock_guard.is_some()
-                || commit_publication_guard.is_some();
-            let commit_allows_early_ack = opts.write_completion == WriteCompletion::Quorum
-                && !(opts.data_movement && opts.has_decommission_capacity_reservation())
-                && commit_owns_namespace_guard
+            let commit_allows_early_ack = !(opts.data_movement && opts.has_decommission_capacity_reservation())
+                && (commit_object_lock_guard.is_some()
+                    || commit_decommission_object_lock_guard.is_some()
+                    || commit_publication_guard.is_some())
                && commit_scanner_publication_scope.is_none();
-            // Full-tail callers also transfer owned guards to the coordinator:
-            // cancelling their ACK waiter must not cancel an in-flight rename.
            let detach_commit_owner = commit_scanner_publication_scope.is_some()
-                || commit_owns_namespace_guard
+                || commit_allows_early_ack
                || commit_bucket_lifecycle_guard.is_some()
                || quota_mutation_fence;
            let commit_write_path_label = write_path.metric_label();
@@ -4458,11 +4452,7 @@ impl SetDisks {
                        write_quorum,
                        commit_scanner_publication_lease_tokens.as_ref(),
                    )
-                    .with_publication_scope(commit_scanner_publication_scope.clone())
-                    .with_rollback_receipt(commit_rollback_receipt.clone())
-                    .with_namespace_commit_guard(
-                        (!is_meta_bucketname(&commit_bucket)).then(|| commit_set.ctx.begin_namespace_commit()),
-                    ),
+                    .with_publication_scope(commit_scanner_publication_scope.clone()),
                )
                .await;
                if let Some(scope) = commit_scanner_publication_scope.as_ref() {
@@ -4595,11 +4585,6 @@ impl SetDisks {
                let rename_commit = match rename_result {
                    Ok(commit) => commit,
                    Err(err) => {
-                        if commit_rollback_receipt.is_incomplete() {
-                            // Incomplete undo retains the staging source and
-                            // rollback backup for recovery; cleanup is unsafe.
-                            return Err(err.into());
-                        }
                        if let Err(cleanup_err) = commit_set.delete_all(RUSTFS_META_TMP_BUCKET, &commit_tmp_dir).await {
                            warn!(tmp_dir = %commit_tmp_dir, error = ?cleanup_err, "failed to cleanup put_object temporary data");
                        } else if issue3031_diag_enabled() {
@@ -4632,8 +4617,9 @@ impl SetDisks {
                    request.object_version_id = committed_version_id
                        .or_else(|| commit_version_suspended.then(Uuid::nil))
                        .map(|version_id| version_id.to_string());
-                    let heal_set = commit_set.clone();
-                    tokio::spawn(async move { heal_set.submit_rename_tail_heal(request).await });
+                    tokio::spawn(async move {
+                        let _ = rustfs_heal_contracts::heal_channel::send_heal_request(request).await;
+                    });
                }

                let rename_stage_elapsed = rename_stage_start.elapsed();
@@ -4899,7 +4885,7 @@ impl SetDisks {
                    );
                }
            });
-        } else if !rollback_receipt.is_incomplete() {
+        } else {
            // Failure path (quorum loss / rollback): keep the cleanup inline so
            // a failed PUT never returns while its tmp shards are still on disk
            // (state-residue hardening tracked by backlog#864 / backlog#898).
@@ -17508,69 +17494,27 @@ mod put_object_tmp_cleanup_tests {
    }

    #[tokio::test]
-    #[serial_test::serial(capacity_dirty_scope)]
    async fn put_object_failure_cleans_tmp_workspace_inline() {
-        temp_env::async_with_vars([(ENV_RUSTFS_PUT_RENAME_EARLY_ACK_ENABLE, Some("true"))], async {
-            for write_completion in [WriteCompletion::Quorum, WriteCompletion::TailDrained] {
-                let (temp_dirs, _disk_stores, set_disks) = hermetic_set_disks(4).await;
-                let bucket = "tmp-clean-missing-bucket";
-                let object = "orphan-object";
-                let barrier = PutObjectCommitBarrier::install(bucket, object, PutObjectCommitPause::BeforeNamespace);
-                let writer = Arc::clone(&set_disks);
-                let put = tokio::spawn(async move {
-                    let mut reader = PutObjReader::from_vec(vec![9u8; TEST_OBJECT_SIZE]);
-                    writer
-                        .put_object(
-                            bucket,
-                            object,
-                            &mut reader,
-                            &ObjectOptions {
-                                write_completion,
-                                ..Default::default()
-                            },
-                        )
-                        .await
-                });
-                tokio::time::timeout(Duration::from_secs(30), barrier.wait_until_paused())
-                    .await
-                    .expect("missing-bucket PUT must stage before rename");
-                let staged = non_trash_tmp_entries(&temp_dirs).await;
-                assert_eq!(staged.len(), 4, "every disk must have a staged workspace before rejection");
-                for workspace in staged {
-                    let mut entries = tokio::fs::read_dir(&workspace)
-                        .await
-                        .expect("staged workspace should be readable");
-                    let mut shards = 0;
-                    while let Some(entry) = entries.next_entry().await.expect("staged data directory should be readable") {
-                        if entry.file_type().await.expect("staged entry type").is_dir() {
-                            let part = tokio::fs::metadata(entry.path().join("part.1"))
-                                .await
-                                .expect("staging must contain an actual erasure shard");
-                            assert!(part.len() > 0, "the shard must be written before the missing-bucket failure");
-                            shards += 1;
-                        }
-                    }
-                    assert_eq!(shards, 1);
-                }
-                assert!(temp_dirs.iter().all(|dir| !dir.path().join(bucket).exists()));
-                barrier.release();
-                let err = tokio::time::timeout(Duration::from_secs(30), put)
-                    .await
-                    .expect("missing-bucket PUT must finish")
-                    .expect("PUT task should join")
-                    .expect_err("put_object into a missing bucket volume must fail");
-                assert!(matches!(err, StorageError::VolumeNotFound), "original disk error expected: {err}");
+        let (temp_dirs, _disk_stores, set_disks) = hermetic_set_disks(4).await;

-                // No polling: known pre-publication rejection must clean staging
-                // inline, before PUT returns (backlog#864 / backlog#898).
-                let leftovers = non_trash_tmp_entries(&temp_dirs).await;
-                assert!(
-                    leftovers.is_empty(),
-                    "failed PUT must not leave tmp shards behind, leftovers: {leftovers:?}, err: {err}"
-                );
-            }
-        })
-        .await;
+        // The bucket volume is never created, so the shards are written into
+        // the tmp workspace and the commit fails at rename_data with a quorum
+        // error — exercising the failure-path cleanup.
+        let mut reader = PutObjReader::from_vec(vec![9u8; TEST_OBJECT_SIZE]);
+        let err = set_disks
+            .put_object("tmp-clean-missing-bucket", "orphan-object", &mut reader, &ObjectOptions::default())
+            .await
+            .expect_err("put_object into a missing bucket volume must fail");
+
+        // No polling: the failure path must clean the tmp workspace inline,
+        // before put_object returns (backlog#864 / backlog#898 hardening).
+        let leftovers = non_trash_tmp_entries(&temp_dirs).await;
+        assert!(
+            leftovers.is_empty(),
+            "failed PUT must not leave tmp shards behind, leftovers: {leftovers:?}, err: {err}"
+        );
+
+        drop(temp_dirs);
    }

    #[tokio::test]
@@ -18213,354 +18157,6 @@ mod put_object_tmp_cleanup_tests {
        .await;
    }

-    async fn make_completion_test_bucket(disks: &[DiskStore], bucket: &str) {
-        for disk in disks {
-            disk.make_volume(bucket)
-                .await
-                .expect("completion test bucket should be created");
-        }
-    }
-
-    /// Observe the actual metadata quorum while the remaining rename is parked.
-    /// A completed task count alone can race tasks that have not started yet.
-    async fn wait_for_paused_tail_metadata_quorum(disks: &[DiskStore], bucket: &str, object: &str) {
-        tokio::time::timeout(Duration::from_secs(30), async {
-            loop {
-                let mut committed = 0;
-                for disk in disks {
-                    match disk.read_version("", bucket, object, "", &ReadOptions::default()).await {
-                        Ok(_) => committed += 1,
-                        Err(DiskError::FileNotFound | DiskError::FileVersionNotFound) => {}
-                        Err(err) => panic!("unexpected metadata error while observing {bucket}/{object}: {err}"),
-                    }
-                }
-                if committed == 3 {
-                    break;
-                }
-                tokio::task::yield_now().await;
-            }
-        })
-        .await
-        .expect("three disks must publish metadata while the fourth rename remains paused");
-    }
-
-    #[tokio::test]
-    #[serial_test::serial(capacity_dirty_scope)]
-    async fn tail_drained_put_waits_for_tail_and_allows_immediate_cas() {
-        temp_env::async_with_vars([(ENV_RUSTFS_PUT_RENAME_EARLY_ACK_ENABLE, Some("true"))], async {
-            for size in [4096, 1024 * 1024] {
-                let (_dirs, disks, set) = hermetic_set_disks(4).await;
-                let bucket = "put-full-tail-cas";
-                let object = "full-tail-cas-object";
-                make_completion_test_bucket(&disks, bucket).await;
-                let tasks = rename_fanout_barrier::observe_tasks(object);
-                let barrier = rename_fanout_barrier::arm(object, 0, rename_fanout_barrier::PHASE_RENAME);
-                let writer = Arc::clone(&set);
-                let put = tokio::spawn(async move {
-                    let mut reader = PutObjReader::from_vec(vec![b'1'; size]);
-                    writer
-                        .put_object(
-                            bucket,
-                            object,
-                            &mut reader,
-                            &ObjectOptions {
-                                write_completion: WriteCompletion::TailDrained,
-                                ..Default::default()
-                            },
-                        )
-                        .await
-                });
-                tokio::time::timeout(Duration::from_secs(30), barrier.wait_until_paused())
-                    .await
-                    .expect("full-tail PUT must reach the rename barrier");
-                wait_for_paused_tail_metadata_quorum(&disks, bucket, object).await;
-                assert!(!put.is_finished(), "full-tail PUT must remain pending after metadata quorum");
-                let mut lock_probe = Box::pin(set.acquire_write_lock_diag("full_tail_probe", bucket, object));
-                assert!(
-                    futures::poll!(lock_probe.as_mut()).is_pending(),
-                    "the owned namespace guard must remain held"
-                );
-                barrier.release();
-                let written = tokio::time::timeout(Duration::from_secs(30), put)
-                    .await
-                    .expect("full-tail PUT should finish after release")
-                    .expect("full-tail PUT task should join")
-                    .expect("full-tail PUT must commit");
-                assert_eq!(tasks.running(), 0, "full-tail response must follow every rename task");
-                drop(
-                    tokio::time::timeout(Duration::from_secs(5), lock_probe)
-                        .await
-                        .expect("same-key lock should be available on return")
-                        .expect("same-key lock probe should succeed"),
-                );
-                for disk in &disks {
-                    disk.read_version("", bucket, object, "", &ReadOptions::default())
-                        .await
-                        .expect("successful full-tail PUT must publish on every healthy disk");
-                }
-                drop(barrier);
-                let mut replacement = PutObjReader::from_vec(b"cas successor".to_vec());
-                set.put_object(
-                    bucket,
-                    object,
-                    &mut replacement,
-                    &ObjectOptions {
-                        write_completion: WriteCompletion::TailDrained,
-                        http_preconditions: Some(HTTPPreconditions {
-                            if_match: written.etag,
-                            ..Default::default()
-                        }),
-                        ..Default::default()
-                    },
-                )
-                .await
-                .expect("immediate same-key CAS must acquire the namespace guard");
-                let mut read = set
-                    .get_object_reader(bucket, object, None, HeaderMap::new(), &ObjectOptions::default())
-                    .await
-                    .expect("CAS successor must be immediately readable");
-                let mut body = Vec::new();
-                read.stream.read_to_end(&mut body).await.expect("successor body must drain");
-                assert_eq!(body, b"cas successor");
-            }
-        })
-        .await;
-    }
-
-    #[tokio::test]
-    #[serial_test::serial(capacity_dirty_scope)]
-    async fn tail_drained_put_preserves_quorum_success_and_heals_failed_tail() {
-        let (_dirs, disks, set) = hermetic_set_disks(4).await;
-        let bucket = "put-full-tail-heal";
-        let object = "full-tail-heal-object";
-        make_completion_test_bucket(&disks, bucket).await;
-        let mut heals = set.capture_test_rename_tail_heals();
-        let tasks = rename_fanout_barrier::observe_tasks(object);
-        let barrier = rename_fanout_barrier::arm(object, 0, rename_fanout_barrier::PHASE_RENAME);
-        let _fault = rename_fault_injection::fail_rename_on(object, &[0]);
-        let writer = Arc::clone(&set);
-        let put = tokio::spawn(async move {
-            let mut reader = PutObjReader::from_vec(vec![b'1'; TEST_OBJECT_SIZE]);
-            writer
-                .put_object(
-                    bucket,
-                    object,
-                    &mut reader,
-                    &ObjectOptions {
-                        write_completion: WriteCompletion::TailDrained,
-                        ..Default::default()
-                    },
-                )
-                .await
-        });
-        tokio::time::timeout(Duration::from_secs(30), barrier.wait_until_paused())
-            .await
-            .expect("failed tail must first reach the rename barrier");
-        wait_for_paused_tail_metadata_quorum(&disks, bucket, object).await;
-        assert!(!put.is_finished(), "committed quorum must still wait for the failing tail");
-        barrier.release();
-        tokio::time::timeout(Duration::from_secs(30), put)
-            .await
-            .expect("failed tail should drain")
-            .expect("PUT task should join")
-            .expect("a minority tail error must not negate committed quorum");
-        assert_eq!(tasks.running(), 0);
-        let heal = tokio::time::timeout(Duration::from_secs(30), heals.recv())
-            .await
-            .expect("failed tail must schedule heal")
-            .expect("heal capture must remain connected");
-        assert_eq!(heal.bucket, bucket);
-        assert_eq!(heal.object_prefix.as_deref(), Some(object));
-        let info = set
-            .get_object_info(bucket, object, &ObjectOptions::default())
-            .await
-            .expect("committed object must remain readable despite the failed tail");
-        assert_eq!(info.size, TEST_OBJECT_SIZE as i64);
-    }
-
-    #[tokio::test]
-    #[serial_test::serial(capacity_dirty_scope)]
-    async fn tail_drained_put_rejects_quorum_minus_one() {
-        let (_dirs, disks, set) = hermetic_set_disks(4).await;
-        let bucket = "put-full-tail-no-quorum";
-        let object = "full-tail-no-quorum-object";
-        make_completion_test_bucket(&disks, bucket).await;
-        let _fault = rename_fault_injection::fail_rename_on(object, &[0, 1]);
-        let tasks = rename_fanout_barrier::observe_tasks(object);
-        let mut reader = PutObjReader::from_vec(vec![b'1'; TEST_OBJECT_SIZE]);
-        let err = set
-            .put_object(
-                bucket,
-                object,
-                &mut reader,
-                &ObjectOptions {
-                    write_completion: WriteCompletion::TailDrained,
-                    ..Default::default()
-                },
-            )
-            .await
-            .expect_err("draining two successful disks cannot satisfy write quorum three");
-        assert!(
-            matches!(err, Error::ErasureWriteQuorum | Error::InsufficientWriteQuorum(_, _)),
-            "original quorum error expected: {err}"
-        );
-        assert_eq!(tasks.running(), 0, "failed fan-out and rollback must complete before return");
-        assert!(
-            set.get_object_info(bucket, object, &ObjectOptions::default()).await.is_err(),
-            "failed fresh write must not become visible"
-        );
-    }
-
-    #[tokio::test]
-    #[serial_test::serial(capacity_dirty_scope)]
-    async fn put_incomplete_rollback_preserves_staging_and_old_version_backup() {
-        use crate::set_disk::core::io_primitives::rollback_fault_injection;
-
-        temp_env::async_with_vars([(ENV_RUSTFS_PUT_RENAME_EARLY_ACK_ENABLE, Some("true"))], async {
-            for write_completion in [WriteCompletion::Quorum, WriteCompletion::TailDrained] {
-                for fault in [
-                    rollback_fault_injection::Fault::Io,
-                    rollback_fault_injection::Fault::VolumeNotFoundAfterRename,
-                ] {
-                    let (dirs, disks, set) = hermetic_set_disks(4).await;
-                    let bucket = "put-incomplete-undo";
-                    let object = "incomplete-undo-object";
-                    make_completion_test_bucket(&disks, bucket).await;
-                    let mut old_reader = PutObjReader::from_vec(vec![b'0'; TEST_OBJECT_SIZE]);
-                    set.put_object(
-                        bucket,
-                        object,
-                        &mut old_reader,
-                        &ObjectOptions {
-                            write_completion: WriteCompletion::TailDrained,
-                            ..Default::default()
-                        },
-                    )
-                    .await
-                    .expect("old generation should be completely committed");
-                    wait_for_tmp_workspace_to_drain(&dirs, "old PUT must leave no unrelated staging").await;
-                    let old = disks[0]
-                        .read_version("", bucket, object, "", &ReadOptions::default())
-                        .await
-                        .expect("old metadata must be readable");
-                    let old_data_dir = old.data_dir.expect("non-inline old version needs a data directory");
-                    let tasks = rename_fanout_barrier::observe_tasks(object);
-                    let barrier = rename_fanout_barrier::arm(object, 0, rename_fanout_barrier::PHASE_RENAME);
-                    let _rename_fault = rename_fault_injection::fail_rename_on(object, &[2, 3]);
-                    let _undo_fault = rollback_fault_injection::arm(object, 0, fault);
-                    let writer = Arc::clone(&set);
-                    let put = tokio::spawn(async move {
-                        let mut reader = PutObjReader::from_vec(vec![b'1'; TEST_OBJECT_SIZE]);
-                        writer
-                            .put_object(
-                                bucket,
-                                object,
-                                &mut reader,
-                                &ObjectOptions {
-                                    write_completion,
-                                    ..Default::default()
-                                },
-                            )
-                            .await
-                    });
-                    tokio::time::timeout(Duration::from_secs(30), barrier.wait_until_paused())
-                        .await
-                        .expect("overwrite must enter the actual rename fan-out before failure injection");
-                    barrier.release();
-                    let err = tokio::time::timeout(Duration::from_secs(30), put)
-                        .await
-                        .expect("incomplete undo must return without hanging")
-                        .expect("PUT task should join")
-                        .expect_err("two renamed disks cannot satisfy write quorum three");
-                    assert!(
-                        matches!(err, Error::ErasureWriteQuorum | Error::InsufficientWriteQuorum(_, _)),
-                        "original quorum error expected: {err}"
-                    );
-                    assert_eq!(tasks.running(), 0, "every rename and undo task must be reaped before return");
-                    let leftovers = non_trash_tmp_entries(&dirs).await;
-                    assert!(!leftovers.is_empty(), "incomplete undo must retain the new staging source for recovery");
-                    let backups = dirs
-                        .iter()
-                        .filter(|dir| {
-                            dir.path()
-                                .join(bucket)
-                                .join(object)
-                                .join(old_data_dir.to_string())
-                                .join(crate::disk::STORAGE_FORMAT_FILE_BACKUP)
-                                .exists()
-                        })
-                        .count();
-                    assert_eq!(backups, 1, "exactly the failed undo disk must retain its old-version backup");
-                    // The remaining three disks still serve the old generation;
-                    // the failed minority must never become an acknowledged write.
-                    let mut read = set
-                        .get_object_reader(bucket, object, None, HeaderMap::new(), &ObjectOptions::default())
-                        .await
-                        .expect("old generation must remain readable after incomplete rollback");
-                    let mut body = Vec::new();
-                    read.stream
-                        .read_to_end(&mut body)
-                        .await
-                        .expect("old generation should stream");
-                    assert_eq!(body, vec![b'0'; TEST_OBJECT_SIZE]);
-                }
-            }
-        })
-        .await;
-    }
-
-    #[tokio::test]
-    #[serial_test::serial(capacity_dirty_scope)]
-    async fn tail_drained_put_owned_commit_survives_waiter_cancellation() {
-        let (dirs, disks, set) = hermetic_set_disks(4).await;
-        let bucket = RUSTFS_META_BUCKET;
-        let object = "full-tail-cancelled-receipt";
-        // Internal config writes do not own a bucket lifecycle guard. The object
-        // guard alone must keep the full-tail coordinator alive after cancellation.
-        let tasks = rename_fanout_barrier::observe_tasks(object);
-        let barrier = rename_fanout_barrier::arm(object, 0, rename_fanout_barrier::PHASE_RENAME);
-        let writer = Arc::clone(&set);
-        let put = tokio::spawn(async move {
-            let mut reader = PutObjReader::from_vec(vec![b'1'; TEST_OBJECT_SIZE]);
-            writer
-                .put_object(
-                    bucket,
-                    object,
-                    &mut reader,
-                    &ObjectOptions {
-                        write_completion: WriteCompletion::TailDrained,
-                        ..Default::default()
-                    },
-                )
-                .await
-        });
-        tokio::time::timeout(Duration::from_secs(30), barrier.wait_until_paused())
-            .await
-            .expect("cancelled receipt must first reach the rename barrier");
-        wait_for_paused_tail_metadata_quorum(&disks, bucket, object).await;
-        put.abort();
-        assert!(put.await.expect_err("ACK waiter should cancel").is_cancelled());
-        let mut lock_probe = Box::pin(set.acquire_write_lock_diag("cancelled_full_tail_probe", bucket, object));
-        assert!(
-            futures::poll!(lock_probe.as_mut()).is_pending(),
-            "owned coordinator must retain the namespace guard after waiter cancellation"
-        );
-        barrier.release();
-        drop(
-            tokio::time::timeout(Duration::from_secs(30), lock_probe)
-                .await
-                .expect("cancelled coordinator must eventually release its guard")
-                .expect("post-commit lock probe should succeed"),
-        );
-        assert_eq!(tasks.running(), 0, "cancelled coordinator must reap every rename task");
-        for disk in &disks {
-            disk.read_version("", bucket, object, "", &ReadOptions::default())
-                .await
-                .expect("caller cancellation must not interrupt committed receipt materialization");
-        }
-        wait_for_tmp_workspace_to_drain(&dirs, "cancelled full-tail commit should release staging ownership").await;
-    }
-
    #[tokio::test]
    #[serial_test::serial(capacity_dirty_scope)]
    async fn no_lock_put_waits_for_rename_tail_under_outer_guard() {
@@ -18588,7 +18184,6 @@ mod put_object_tmp_cleanup_tests {
                        &mut reader,
                        &ObjectOptions {
                            no_lock: true,
-                            write_completion: WriteCompletion::TailDrained,
                            ..Default::default()
                        },
                    )
@@ -18614,18 +18209,7 @@ mod put_object_tmp_cleanup_tests {
            put.await
                .expect("no-lock PUT task should join")
                .expect("no-lock PUT should commit after the rename tail releases");
-            let mut lock_probe = Box::pin(set_disks.acquire_write_lock_diag("borrowed_full_tail_probe", bucket, object));
-            assert!(
-                futures::poll!(lock_probe.as_mut()).is_pending(),
-                "full-tail PUT must not release the caller's outer guard"
-            );
            drop(outer_guard);
-            drop(
-                tokio::time::timeout(Duration::from_secs(5), lock_probe)
-                    .await
-                    .expect("outer owner releasing its guard should unblock the probe")
-                    .expect("post-outer-guard probe should succeed"),
-            );
        })
        .await;
    }
@@ -18,7 +18,6 @@ use super::{
 };
 use crate::bucket::lifecycle::lifecycle::{TRANSITION_COMPLETE, TRANSITION_PENDING, TransitionOptions, expected_expiry_time};
 use crate::ecstore_validation_blackbox::make_local_set_disks;
-use crate::object_api::WriteCompletion;
 use crate::services::tier::test_util::register_mock_tier;
 use crate::storage_api_contracts::bucket::BucketOperations;
 use crate::storage_api_contracts::object::{ObjectIO as _, ObjectOperations as _};
@@ -26,24 +25,19 @@ use rustfs_filemeta::{RestoreStatusOps as _, parse_restore_obj_status};
 use tokio::io::AsyncReadExt;

 async fn prime_metadata_generation(set_disks: &SetDisks, bucket: &str, object: &str) -> GetObjectMetadataCacheKey {
-    tokio::time::timeout(Duration::from_secs(30), async {
-        loop {
-            set_disks
-                .get_object_fileinfo(bucket, object, &ObjectOptions::default(), true, false)
-                .await
-                .expect("object metadata should resolve");
-            let generation = set_disks
-                .get_object_metadata_cache_generation(bucket, object)
-                .expect("metadata generation should be active");
-            let key = GetObjectMetadataCacheKey::new(bucket, object, generation);
-            if set_disks.get_object_metadata_cache.get(&key).await.is_some() {
-                return key;
-            }
-            tokio::task::yield_now().await;
-        }
-    })
-    .await
-    .expect("metadata read should publish the generation under test")
+    set_disks
+        .get_object_fileinfo(bucket, object, &ObjectOptions::default(), true, false)
+        .await
+        .expect("object metadata should resolve");
+    let generation = set_disks
+        .get_object_metadata_cache_generation(bucket, object)
+        .expect("metadata generation should be active");
+    let key = GetObjectMetadataCacheKey::new(bucket, object, generation);
+    assert!(
+        set_disks.get_object_metadata_cache.get(&key).await.is_some(),
+        "metadata read should publish the generation under test"
+    );
+    key
 }

 async fn assert_generation_reclaimed(set_disks: &SetDisks, key: &GetObjectMetadataCacheKey) {
@@ -66,17 +60,8 @@ async fn transition_and_restore_reclaim_prior_metadata_generations() {
        .await
        .expect("bucket should be created");
    let mut reader = PutObjReader::from_vec(payload.clone());
-    // Cache priming must not race a quorum-acknowledged PUT's remaining rename tail.
    let original = set_disks
-        .put_object(
-            bucket,
-            object,
-            &mut reader,
-            &ObjectOptions {
-                write_completion: WriteCompletion::TailDrained,
-                ..Default::default()
-            },
-        )
+        .put_object(bucket, object, &mut reader, &ObjectOptions::default())
        .await
        .expect("source object should be written");
    let source_generation = prime_metadata_generation(&set_disks, bucket, object).await;
@@ -179,17 +164,8 @@ async fn prepared_snapshot_transition_duplicate_and_late_get_use_committed_remot
        .await
        .expect("bucket should be created");
    let mut reader = PutObjReader::from_vec(payload.clone());
-    // Cache priming must not race a quorum-acknowledged PUT's remaining rename tail.
    let original = set_disks
-        .put_object(
-            bucket,
-            object,
-            &mut reader,
-            &ObjectOptions {
-                write_completion: WriteCompletion::TailDrained,
-                ..Default::default()
-            },
-        )
+        .put_object(bucket, object, &mut reader, &ObjectOptions::default())
        .await
        .expect("source object should be written");

@@ -329,11 +329,11 @@ impl ECStore {
    /// reuse its result, which is sound because bucket deletion/recreation
    /// requires the lifecycle WRITE lock and therefore cannot have run while
    /// any read guard was continuously held.
-    pub async fn acquire_bucket_incarnation_fence(
+    pub(crate) async fn acquire_bucket_incarnation_fence(
        &self,
        bucket: &str,
        expected: uuid::Uuid,
-    ) -> Result<super::BucketIncarnationFenceGuard> {
+    ) -> Result<super::bucket_fence::BucketIncarnationFenceGuard> {
        let inner = self.acquire_bucket_lifecycle_read_lock(bucket).await?;
        let pieces = super::bucket_fence::FencePieces {
            registry: self.bucket_fence_registry.clone(),
@@ -1059,7 +1059,6 @@ mod tests {
    use crate::storage_api_contracts::{
        bucket::{BucketOperations as _, BucketOptions, DeleteBucketOptions, MakeBucketOptions, SRBucketDeleteOp},
        list::ListOperations as _,
-        namespace::NamespaceLocking as _,
        object::{ObjectIO as _, ObjectOperations as _},
    };
    use crate::store::{ECStore, init_local_disks_with_instance_ctx};
@@ -1487,19 +1486,10 @@ mod tests {
            .put_object(bucket, object, &mut reader, &ObjectOptions::default())
            .await
            .expect("object should be written");
-        let lock = ecstore.pools[0].disk_set[0]
-            .new_ns_lock(bucket, object)
-            .await
-            .expect("fixture namespace lock should be created");
-        drop(
-            lock.get_write_lock(Duration::from_secs(30))
-                .await
-                .expect("fixture rename tail should finish before checking its generation"),
-        );
        assert_eq!(
            ecstore.scanner_namespace_mutation_generation(),
-            generation_before_put.saturating_add(3),
-            "successful object creation must observe the logical mutation and both fanout boundaries"
+            generation_before_put.saturating_add(1),
+            "successful object creation should advance scanner namespace activity"
        );
        ecstore
            .get_object_info(bucket, object, &ObjectOptions::default())
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
cxymds	748bcd83fd	feat(tier): inspect legacy transition state safely	2026-09-04 20:45:24 +08:00
cxymds	c93a9d0d27	fix(tier): probe legacy transition version state	2026-09-04 19:56:14 +08:00