Merge branch 'main' into codex/backlog-1548-protocols-workspace-lints

ci(protocols): inherit workspace lint policy
2026-08-02 11:29:17 +00:00 · 2026-07-29 22:35:01 +08:00 · 2026-07-29 21:45:10 +08:00
430 changed files with 7959 additions and 77134 deletions
@@ -10,16 +10,10 @@ never weaken a check to get green.

 ## `check_layer_dependencies.sh` — layer DAG in `rustfs/src`

-Enforces `composition (server, startup/init) → interface (admin,
-storage/ecfs, storage/s3_api) → app → infra`; no upward imports. Server source
-files are composition roots, while imports of their exported HTTP contracts
-are classified as interface dependencies. Known legacy violations live in
+Enforces `interface (admin, storage/ecfs, storage/s3_api) → app → infra`; no
+upward imports. Known legacy violations live in
 `scripts/layer-dependency-baseline.txt`.

-Dedicated `*_test.rs` and `tests/` modules are outside this production guard.
-Inline `#[cfg(test)]` imports remain checked under their source file's layer;
-move architecture-crossing test scaffolding into a dedicated test module.
-
 - **New violation**: restructure your change so the dependency points
  downward (move the shared type/function to the lower layer).
 - **You legitimately removed a baseline entry**: run
@@ -1,21 +1,19 @@
 ---
 name: rustfs-release-publish
-description: "End-to-end RustFS release pipeline: first publish any merged-but-unreleased rustfs/console changes and wait for its latest Release asset, then bump RustFS version files on main directly to the final target, publish a visible GitHub prerelease from a preview tag without updating latest channels, validate it, and publish the final tag on the SAME commit. Use whenever the user wants to release/publish a RustFS version (发版/发布)."
+description: "End-to-end RustFS release pipeline: bump version files on main directly to the final target version, cut a preview tag on that commit, verify the CI build and release artifacts, run the downloaded binary locally and exercise the console, validate the server with the latest rc client, then publish the final tag on the SAME validated commit — never a new bump commit, never latest main. Use whenever the user wants to release/publish a RustFS version (发版/发布)."
 ---
 # RustFS Release Publish (preview-validated pipeline)

 This skill orchestrates a full release. It wraps `rustfs-release-version-bump` (which only edits version files and opens the PR) with a mandatory preview-tag validation loop before the final tag is published.

-Core design: **version files never carry a `-preview.N` suffix**. The preview suffix exists only in tag names. A preview tag creates a visible GitHub Release marked Prerelease and uploads versioned assets, but it never becomes GitHub Latest and never updates `*-latest`, `latest.json`, R2, Docker, or Helm channels. This works because the binary self-reports the git tag it was built from (`build::TAG` via shadow_rs, see `rustfs/src/config/cli.rs` `SHORT_VERSION`), and `build.yml` derives artifact names and preview classification from the tag name — Cargo.toml's version is only a no-tag fallback. Therefore the preview tag and the final tag can (and MUST) point at the exact same commit: what you validated is byte-for-byte the source that ships.
+Core design: **version files never carry a `-preview.N` suffix**. The preview suffix exists only in tag names. This works because the binary self-reports the git tag it was built from (`build::TAG` via shadow_rs, see `rustfs/src/config/cli.rs` `SHORT_VERSION`), and `build.yml` derives artifact names and prerelease classification from the tag name — Cargo.toml's version is only a no-tag fallback. Therefore the preview tag and the final tag can (and MUST) point at the exact same commit: what you validated is byte-for-byte the source that ships.

 Pipeline shape:

 ```
-check console main against its latest Release
-  -> if ahead: publish console -> wait for Release asset + latest API
-  -> bump RustFS version files to <target> (final version, ONE commit) -> merge
+bump version files to <target> (final version, ONE commit) -> merge
  -> tag <preview-tag> at that commit -> CI green
-  -> verify preview Release assets -> run binary locally + console checks
+  -> verify release artifacts -> run binary locally + console checks
  -> validate with latest rc client
  -> tag <target> at the SAME commit (zero delta) -> re-verify CI/release
 ```
@@ -25,7 +23,7 @@ On validation failure: fix lands on main via normal PR (version files are alread
 ## Required inputs

 - Final target version, for example `1.0.0-beta.10`.
- Preview iteration `N` (default: next unused preview tag for that target; check with `git tag -l '<target>-preview.*'` after `git fetch --tags`).
+- Preview iteration `N` (default: next unused preview tag for that target; check with `git tag -l '<target>-preview.*'` — and for stable targets `git tag -l '<target>-rc.*'` — after `git fetch --tags`).

 If the target version is missing or ambiguous, stop and ask before doing anything (see the semver gate below).

@@ -47,18 +45,14 @@ Rules:

 ## Preview tag naming

- Use `<target>-preview.N` for every target, e.g. `1.0.0-beta.10-preview.3` or `1.1.0-preview.1`.
- The canonical suffix is exactly `-preview.<digits>`. `build.yml` recognizes it before alpha/beta/rc classification and routes it to the preview-only path; any other tag containing `-preview` fails closed instead of being treated as a release.
- A preview Release MUST be published with `isPrerelease=true` and `isLatest=false`. Any `*-latest` preview asset or preview-triggered `latest.json`, R2, Docker, or Helm publication is a pipeline failure.
+- Prerelease target (contains `alpha`/`beta`/`rc`): preview tag is `<target>-preview.N`, e.g. `1.0.0-beta.10-preview.3`. It contains `beta`, so `build.yml`'s substring-based classification marks it prerelease — safe.
+- **Stable** target (e.g. `1.1.0`): NEVER tag `1.1.0-preview.N` — `build.yml` marks a tag prerelease only if its name contains `alpha`, `beta`, or `rc`, so `1.1.0-preview.N` would be treated as a stable release and overwrite `latest.json` as stable. Use `1.1.0-rc.N` as the preview tag instead.

 ## Hard rules

 - Version files (Cargo.toml, Cargo.lock, README, flake.nix, Chart.yaml, rustfs.spec) are bumped ONCE, directly to `<target>`. Never write a `-preview.N` suffix into any version file. If `rustfs-release-version-bump` is ever asked for a `-preview` version, that is a pipeline bug — stop.
- Preview Release assets are versioned and intentionally visible on the Releases page. Do not label them Latest or use them to update any latest distribution channel.
 - Tags have no `v` prefix. Always annotated: `git tag -a <tag> -m "Release <tag>"`.
 - The final tag MUST point at exactly `PREVIEW_HASH` — the commit the validated preview tag points at. Never tag current `main` HEAD (commits merged after validation are unvalidated), and never create an extra version-bump commit between preview and final.
- When a previous deliverable exists, GitHub Release notes for the preview and final tags MUST use it as their shared comparison baseline: the most recently published non-preview Release before the target. Internal `-preview.N` Releases are explicitly excluded from that selection, even when they point at the same commit as the final tag. If no previous deliverable exists, omit `previous_tag_name` and record that GitHub's default baseline fallback was used.
- Generated Release notes carry a workflow-management marker so retries can repair them. Before manually curating a generated body, remove that marker; unmarked non-placeholder notes are preserved by later workflow runs.
 - Phases run in order; a failure in any phase blocks everything after it. After the fix lands on main, restart from Phase 2 with the next preview iteration against the new `origin/main` hash — do not resume mid-pipeline against a stale hash.
 - If the release is abandoned after Phase 1 merged, main's version files claim a version that was never tagged. Either revert the bump PR or leave it to be overwritten by the next release — but tell the user explicitly and record the decision.
 - User-facing status updates in Chinese; commits, PR titles/bodies, and tag messages in English. No hard-wrapping in commit messages, PR bodies, or documentation prose — one logical line per sentence/paragraph, let soft wrap handle display.
@@ -69,61 +63,6 @@ Rules:
 - `gh auth status` works; confirm you can view `gh release list -L 3`.
 - Confirm the exact final target version with the user if not explicit.

-### Console release gate
-
-Complete this gate before changing any RustFS version file or creating any RustFS tag. RustFS `build.yml` downloads the asset returned by `repos/rustfs/console/releases/latest`, so a successful Console build alone is insufficient.
-
-1. Read the latest published Console tag and compare it with Console `main`:
-
-```bash
-CONSOLE_REPO="rustfs/console"
-CONSOLE_LATEST=$(gh api "repos/${CONSOLE_REPO}/releases/latest" --jq .tag_name)
-gh api "repos/${CONSOLE_REPO}/compare/${CONSOLE_LATEST}...main" \
-  --jq '{status, ahead_by, behind_by, commits: [.commits[] | {sha, message: .commit.message}]}'
-```
-
- `ahead_by == 0`: no merged Console change is waiting for release. Still verify the current latest asset using step 4, then continue to Phase 1.
- `ahead_by > 0` and `behind_by == 0`: publish Console before continuing. Report the merged commits and select the next unused `vX.Y.Z` tag. Default to the next patch version when the changes are fixes or backward-compatible UI work; stop for confirmation if a minor/major bump is plausible.
- Any diverged history or `behind_by > 0`: stop and resolve the Console release baseline explicitly. Do not guess a range or publish RustFS.
-
-2. Clone/fetch `rustfs/console` into a scratch directory and record its exact `main` commit. Before creating a tag, check for a `v*` tag or Release workflow already associated with that hash. If one is in progress, wait for it instead of creating another version:
-
-```bash
-CONSOLE_SCRATCH=$(mktemp -d)
-gh repo clone "$CONSOLE_REPO" "$CONSOLE_SCRATCH/console"
-git -C "$CONSOLE_SCRATCH/console" fetch origin main --tags
-CONSOLE_HASH=$(git -C "$CONSOLE_SCRATCH/console" rev-parse origin/main)
-git -C "$CONSOLE_SCRATCH/console" tag --points-at "$CONSOLE_HASH" 'v*'
-gh run list -R "$CONSOLE_REPO" --workflow release.yml --commit "$CONSOLE_HASH" --limit 5
-```
-
-If no release exists or is running for `CONSOLE_HASH`, create the selected annotated tag at that exact hash and push it:
-
-```bash
-git -C "$CONSOLE_SCRATCH/console" tag -a "<console-tag>" -m "Release <console-tag>" "$CONSOLE_HASH"
-git -C "$CONSOLE_SCRATCH/console" push origin "<console-tag>"
-```
-
-Console tags include the `v` prefix. Pushing the tag triggers `.github/workflows/release.yml` (`🚀 Release`). Remove `CONSOLE_SCRATCH` after the gate completes.
-
-3. Find the exact tag run and wait for completion:
-
-```bash
-gh run list -R "$CONSOLE_REPO" --workflow release.yml --branch "<console-tag>" --limit 1
-gh run watch -R "$CONSOLE_REPO" "<console-run-id>" --exit-status
-```
-
-4. Block until the published Release is non-draft, the latest endpoint returns the expected tag, and `rustfs-console-<console-tag>.zip` is uploaded, non-empty, and carries a `sha256:` digest:
-
-```bash
-gh release view -R "$CONSOLE_REPO" "<console-tag>" --json isDraft,isPrerelease,assets,url
-test "$(gh api "repos/${CONSOLE_REPO}/releases/latest" --jq .tag_name)" = "<console-tag>"
-test "$(gh api "repos/${CONSOLE_REPO}/releases/tags/<console-tag>" \
-  --jq '[.assets[] | select(.name == "rustfs-console-<console-tag>.zip" and .state == "uploaded" and .size > 0 and (.digest | startswith("sha256:")))] | length')" -eq 1
-```
-
-Treat a missing/mismatched asset, digest, latest tag, or failed/cancelled workflow as BLOCKED. Do not start Phase 1 until the Console gate passes. Record `CONSOLE_TAG`, `CONSOLE_HASH`, Console run URL, and Release URL for the final report.
-
 ## Phase 1 — Version bump to the final target (once)

 - If main's version files already read `<target>` (e.g. this is a restart after a failed preview), verify with `rg -n "<target>" Cargo.toml rustfs.spec helm/rustfs/Chart.yaml` and skip to Phase 2.
@@ -146,17 +85,16 @@ git push origin "<preview-tag>"

 Pushing the tag triggers `.github/workflows/build.yml` ("Build and Release"); `docker.yml` chains off it via `workflow_run`.

-The preview run builds versioned artifacts and publishes them in a GitHub prerelease. Its latest-channel, R2, Docker, and Helm jobs must be skipped. Those publication paths run only after the final tag is pushed.
-
 On a restart (N+1), refresh `PREVIEW_HASH=$(git rev-parse origin/main)` first — it must contain the fix — and re-report it.

-## Phase 3 — CI and preview Release verification
+## Phase 3 — CI and artifact verification

- Find and watch the tag build: `gh run list --workflow build.yml --branch "<preview-tag>" --limit 1` then `gh run watch <run-id>`. Every build matrix target must succeed (linux x86_64/aarch64 × musl/gnu, macos-aarch64, windows-x86_64).
- Confirm the Release publication jobs (`create-release`, `upload-release-assets`, and `publish-release`) succeed while `update-latest-version` is skipped.
- Verify `gh release view "<preview-tag>" --json isPrerelease,assets,url`: `isPrerelease` must be `true`, and the Release must contain all 6 versioned platform zips, checksums, SBOM, and provenance with no `-latest` assets. Confirm `gh api repos/{owner}/{repo}/releases/latest --jq .tag_name` does not return `<preview-tag>`.
- Record `PREVIOUS_DELIVERABLE`, selected from published Releases by `publishedAt` after excluding the current tag and every `-preview.N` tag. Verify `gh release view "<preview-tag>" --json body --jq .body` contains `## What's Changed` and, when `PREVIOUS_DELIVERABLE` exists, `**Full Changelog**: https://github.com/rustfs/rustfs/compare/<PREVIOUS_DELIVERABLE>...<preview-tag>`. For a repository with no previous deliverable, verify a Full Changelog link exists and record the GitHub baseline fallback.
- Confirm preview-triggered Docker and Helm jobs are skipped. Preview validation covers the built RustFS binaries, embedded console, and rc compatibility; Docker image construction and Helm publication are deferred to the final tag because the Dockerfiles consume GitHub Release assets.
+- Watch the tag build: `gh run list --workflow build.yml --limit 5` then `gh run watch <run-id>`. Every matrix target must succeed (linux x86_64/aarch64 × musl/gnu, macos-aarch64, windows-x86_64) plus the release and latest.json jobs.
+- Verify the GitHub release: `gh release view "<preview-tag>" --json isPrerelease,assets`
+  - `isPrerelease` must be `true`.
+  - Assets must include all 6 platform zips in both versioned (`rustfs-<platform>-v<tag>.zip`) and `-latest` forms, plus `SHA256SUMS`, `SHA512SUMS`, `rustfs-<tag>.sbom.cdx.json`, `rustfs-<tag>.provenance.json`.
+- Verify the chained Docker run succeeded: `gh run list --workflow docker.yml --limit 3`.
+- Checksum spot-check for the platform you will run locally: download the zip and `SHA256SUMS`, verify with `shasum -a 256 -c` (grep to one line).

 ## Phase 4 — Run the artifact locally, verify the console

@@ -219,15 +157,13 @@ git push origin "<target>"
 ```

 - CI rebuilds from the same source; the only changed input is the tag name, so the binary now self-reports `<target>`.
- Verify the final tag's complete publication path: all matrix and release jobs green; `gh release view "<target>"` shows the full versioned and `-latest` asset set plus checksums, SBOM, and provenance; Docker and Helm workflows succeed; `latest.json` points to `<target>`. A stable target must have `isPrerelease=false` and `isLatest=true`. An alpha/beta/rc target must have `isPrerelease=true`; GitHub does not permit prereleases to be Latest, but the project `latest.json` still advances to the final non-preview target.
- Verify the final Release body contains `## What's Changed` and a Full Changelog link. When `PREVIOUS_DELIVERABLE` exists, the link MUST be `https://github.com/rustfs/rustfs/compare/<PREVIOUS_DELIVERABLE>...<target>` and the baseline MUST equal the preview Release baseline; for example, both `1.0.0-beta.12-preview.1` and `1.0.0-beta.12` compare from `1.0.0-beta.11`.
+- Re-run the Phase 3 verification against the final tag: all matrix jobs green; `gh release view "<target>"` shows the full asset set; for a prerelease target `isPrerelease` is `true`, for a stable target it must be `false` and `latest.json` must be updated.
 - Optionally spot-check `./rustfs --version` from a final-tag artifact — it must report `<target>`.

 ## Output contract

 Always report:

- Console gate result: previous/latest Console tags, whether merged changes required a release, `CONSOLE_HASH`, and Console run/Release URLs when a release was published.
 - Target version, preview tag(s) used, `PREVIEW_HASH` (which both tags point at).
- Per-phase result (PASS/FAIL/BLOCKED) with key evidence: preview and final Release URLs, preview `isPrerelease`/`isLatest` state, final latest-channel state, console check results, and the rc command matrix.
+- Per-phase result (PASS/FAIL/BLOCKED) with key evidence: CI run URLs, release URLs, console check results, the rc command matrix.
 - Any deviation from this pipeline and why the user approved it.
@@ -18,7 +18,7 @@ Validated baseline: release pattern used in PR `#2957`.

 If target version is missing or ambiguous, stop and ask before editing.

-Reject any target version containing `-preview`: preview identifiers are tag-only (see `rustfs-release-publish`) and must never be written into version files. If asked for one, stop and point to the release pipeline instead of editing.
+Reject any target version containing a `-preview.` suffix: preview identifiers are tag-only (see `rustfs-release-publish`) and must never be written into version files. If asked for one, stop and point to the release pipeline instead of editing.

 ## Read before editing

@@ -28,8 +28,6 @@ script-tests: ## Run shell script tests
 	./scripts/test_entrypoint_credentials.sh
 	./scripts/test_internode_grpc_ab_bench.sh
 	./scripts/test_object_batch_bench_enhanced.sh
-	./scripts/test_hotpath_warp_ab_gate.sh
-	./scripts/test_hotpath_warp_abba.sh
 	./scripts/test_exact_1mib_handoff_abba.sh
 	./scripts/test_pinned_paired_abba_bench.sh
 	./scripts/test_manual_transition_runbooks.sh
@@ -300,6 +300,9 @@ path = "junit.xml"
 # negative-path siblings of each family stay in as regression guards.
 #   * rustfs#4843 — over-limit archive entry paths hard-reject the whole
 #     archive even under ignore-errors semantics.
+#   * rustfs#4846 — distributed-lock quorum tests misclassify as timeout
+#     under parallel load (multi-node in-process clusters; natural home is
+#     ci-7's nightly cluster lane).
 [profile.e2e-full]
 default-filter = """
    package(e2e_test)
@@ -308,6 +311,7 @@ default-filter = """
    & !test(/^replication_extension_test::/)
    & !test(/^multipart_auth_test::test_signed_put_object_extract_skips_invalid_entry_when_ignore_errors_enabled$/)
    & !test(/^snowball_auto_extract_test::tests::snowball_auto_extract_(ignores_invalid_entries_when_requested|supports_standard_headers_with_combined_extract_options)$/)
+    & !test(/^reliant::lock::test_distributed_lock_(2_nodes_grpc_read_survives_failed_node|4_nodes_grpc_read_write_quorum_split_with_two_failed_nodes)$/)
 """
 fail-fast = false

@@ -60,16 +60,6 @@ The file `prometheus-rules/rustfs-get-optimization-alerts.yaml` contains pre-con
 | `CodecStreamingFallbackSpike` | Warning | Codec streaming fallback > 10x baseline for 10m |
 | `IoQueueSaturation` | Warning | IO queue utilization > 90% for 5m |

-The file `prometheus-rules/rustfs-kms-alerts.yml` contains alerting rules for the KMS backend operation metrics. Thresholds are conservative defaults pending staging baseline calibration; response procedures live in `docs/operations/kms-observability-runbook.md`, and the matching dashboard is `deploy/observability/grafana/rustfs-kms-observability.json`.
-
-| Alert | Severity | Condition |
-|-------|----------|-----------|
-| `KmsBackendFatalErrors` | Critical | Fatal (non-retryable) attempt failures > 0 for 5m |
-| `KmsBackendHighErrorRate` | Critical | Non-success operation ratio > 5% for 10m (with traffic guard) |
-| `KmsBackendP99LatencyHigh` | Warning | Operation p99 duration (incl. retries) > 2s for 10m |
-| `KmsBackendAttemptFailureSpike` | Warning | Attempt failure rate > 0.5/s for 10m |
-| `KmsBackendRetryBudgetExhausted` | Warning | budget_exhausted / deadline_exceeded outcomes > 0.05/s for 10m |
-
 ### Enabling Alert Rules

 Add the alert rules file to your Prometheus configuration:
@@ -60,16 +60,6 @@
 | `CodecStreamingFallbackSpike` | 警告 | Codec streaming 回退 > 10x 基线，持续 10 分钟 |
 | `IoQueueSaturation` | 警告 | IO 队列利用率 > 90%，持续 5 分钟 |

-文件 `prometheus-rules/rustfs-kms-alerts.yml` 包含 KMS 后端操作指标的告警规则。阈值为保守默认值，待 staging 基线校准；响应流程见 `docs/operations/kms-observability-runbook.md`，配套仪表盘为 `deploy/observability/grafana/rustfs-kms-observability.json`。
-
-| 告警 | 级别 | 条件 |
-|------|------|------|
-| `KmsBackendFatalErrors` | 严重 | fatal（不可重试）尝试失败 > 0，持续 5 分钟 |
-| `KmsBackendHighErrorRate` | 严重 | 非 success 操作占比 > 5%，持续 10 分钟（含流量下限保护） |
-| `KmsBackendP99LatencyHigh` | 警告 | 操作 p99 耗时（含重试）> 2s，持续 10 分钟 |
-| `KmsBackendAttemptFailureSpike` | 警告 | 尝试失败率 > 0.5/s，持续 10 分钟 |
-| `KmsBackendRetryBudgetExhausted` | 警告 | budget_exhausted / deadline_exceeded 结果 > 0.05/s，持续 10 分钟 |
-
 ### 启用告警规则

 在 Prometheus 配置中添加告警规则文件：
@@ -1,188 +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.
-
-# =============================================================================
-# RustFS KMS backend — Prometheus alerting rules
-# =============================================================================
-#
-# Metric source: the KMS operation-policy choke point in
-# crates/kms/src/policy.rs. All label values are static enum strings
-# (operation, op_class, outcome, error_class); key identifiers, key material,
-# and tokens never appear in labels.
-#
-# Response procedures: docs/operations/kms-observability-runbook.md
-#
-# IMPORTANT — threshold status: every numeric threshold below is a
-# conservative default chosen without a production baseline. Calibrate against
-# a staging baseline before relying on these alerts for paging, and prefer
-# loosening over tightening until the baseline exists. Formal SLO targets are
-# deliberately not encoded here (see rustfs/backlog#1584).
-#
-# NOTE: prometheus.yml loads /etc/prometheus/rules/*.yml — keep the .yml
-# extension or the file is silently ignored by the docker-compose stack.
-#
-# Validate: promtool check rules rustfs-kms-alerts.yml
-# =============================================================================
-
-groups:
-  # ==========================================================================
-  # Critical alerts — immediate action required
-  # ==========================================================================
-  - name: rustfs-kms-critical
-    interval: 30s
-    rules:
-      # ------------------------------------------------------------------
-      # 1. KmsBackendFatalErrors
-      #    Any attempt failure classified as fatal (non-retryable): auth
-      #    or permission errors, malformed requests, missing keys. The
-      #    policy never retries these, so even a low rate means real
-      #    operations are failing right now.
-      # ------------------------------------------------------------------
-      - alert: KmsBackendFatalErrors
-        expr: |
-          sum by (operation) (rate(rustfs_kms_backend_attempt_failures_total{error_class="fatal"}[5m])) > 0
-        for: 5m
-        labels:
-          severity: critical
-          component: kms
-        annotations:
-          summary: "KMS backend fatal errors on operation {{ $labels.operation }}"
-          description: >-
-            Attempt failures classified as fatal are occurring at
-            {{ $value | printf "%.3f" }}/s on operation
-            {{ $labels.operation }}. Fatal failures are not retried:
-            each one is a KMS backend call that failed permanently
-            (authentication, permissions, malformed request, or a
-            missing key/version).
-          runbook_url: "https://github.com/rustfs/rustfs/blob/main/docs/operations/kms-observability-runbook.md#kmsbackendfatalerrors"
-
-      # ------------------------------------------------------------------
-      # 2. KmsBackendHighErrorRate
-      #    Sustained share of operations terminating without success
-      #    (fatal, budget_exhausted, deadline_exceeded). The cancelled
-      #    outcome is excluded because shutdowns legitimately produce it.
-      #    The traffic guard keeps a single failure on a near-idle
-      #    cluster from firing the alert.
-      #    Threshold: 5% for 10m — conservative default, calibrate
-      #    against a staging baseline.
-      # ------------------------------------------------------------------
-      - alert: KmsBackendHighErrorRate
-        expr: |
-          (
-            sum(rate(rustfs_kms_backend_operations_total{outcome!~"success|cancelled"}[5m]))
-            /
-            clamp_min(sum(rate(rustfs_kms_backend_operations_total[5m])), 1e-9)
-          ) > 0.05
-          and
-          sum(rate(rustfs_kms_backend_operations_total[5m])) > 0.02
-        for: 10m
-        labels:
-          severity: critical
-          component: kms
-        annotations:
-          summary: "KMS backend non-success ratio above 5% for 10m"
-          description: >-
-            {{ $value | humanizePercentage }} of KMS backend operations
-            are terminating in fatal, budget_exhausted, or
-            deadline_exceeded. Object encryption and decryption paths
-            depending on the KMS are degraded or failing.
-          runbook_url: "https://github.com/rustfs/rustfs/blob/main/docs/operations/kms-observability-runbook.md#kmsbackendhigherrorrate"
-
-  # ==========================================================================
-  # Warning alerts — investigation needed
-  # ==========================================================================
-  - name: rustfs-kms-warning
-    interval: 30s
-    rules:
-      # ------------------------------------------------------------------
-      # 3. KmsBackendP99LatencyHigh
-      #    p99 wall-clock duration of whole operations (attempts plus
-      #    backoff) is sustained above 2 seconds. Because the histogram
-      #    includes retries, a high p99 usually means the retry policy
-      #    is absorbing backend failures, not that every call is slow.
-      #    Threshold: 2s for 10m — conservative default, calibrate
-      #    against a staging baseline.
-      # ------------------------------------------------------------------
-      - alert: KmsBackendP99LatencyHigh
-        expr: |
-          histogram_quantile(0.99,
-            sum by (le) (rate(rustfs_kms_backend_operation_duration_seconds_bucket[5m]))
-          ) > 2
-        for: 10m
-        labels:
-          severity: warning
-          component: kms
-        annotations:
-          summary: "KMS backend operation p99 latency above 2s for 10m"
-          description: >-
-            The 99th-percentile KMS backend operation duration is
-            {{ $value | humanizeDuration }}, including retries and
-            backoff. Encryption and decryption latency is leaking into
-            S3 request latency.
-          runbook_url: "https://github.com/rustfs/rustfs/blob/main/docs/operations/kms-observability-runbook.md#kmsbackendp99latencyhigh"
-
-      # ------------------------------------------------------------------
-      # 4. KmsBackendAttemptFailureSpike
-      #    Aggregate attempt-failure rate (all error classes) sustained
-      #    above an absolute floor. An absolute threshold is used instead
-      #    of an offset-1d baseline ratio because fresh deployments have
-      #    no baseline and an empty offset vector would keep a ratio
-      #    alert from ever firing; switch to a baseline-relative form
-      #    (see rustfs-get-optimization-alerts.yaml for the pattern)
-      #    once a stable staging baseline exists.
-      #    Threshold: 0.5/s for 10m — conservative default, calibrate
-      #    against a staging baseline.
-      # ------------------------------------------------------------------
-      - alert: KmsBackendAttemptFailureSpike
-        expr: |
-          sum(rate(rustfs_kms_backend_attempt_failures_total[5m])) > 0.5
-        for: 10m
-        labels:
-          severity: warning
-          component: kms
-        annotations:
-          summary: "KMS backend attempt failures above 0.5/s for 10m"
-          description: >-
-            KMS backend attempts are failing at
-            {{ $value | printf "%.2f" }}/s across all error classes.
-            The retry policy may still be masking these from callers —
-            check the error-class breakdown before it stops absorbing
-            them.
-          runbook_url: "https://github.com/rustfs/rustfs/blob/main/docs/operations/kms-observability-runbook.md#kmsbackendattemptfailurespike"
-
-      # ------------------------------------------------------------------
-      # 5. KmsBackendRetryBudgetExhausted
-      #    Operations are running out of retry budget (budget_exhausted)
-      #    or operation deadline (deadline_exceeded). These surface to
-      #    callers as failed KMS operations even though every individual
-      #    failure was retryable — the backend is unhealthy for longer
-      #    than the policy can bridge.
-      #    Threshold: 0.05/s for 10m — conservative default, calibrate
-      #    against a staging baseline.
-      # ------------------------------------------------------------------
-      - alert: KmsBackendRetryBudgetExhausted
-        expr: |
-          sum by (outcome) (rate(rustfs_kms_backend_operations_total{outcome=~"budget_exhausted|deadline_exceeded"}[5m])) > 0.05
-        for: 10m
-        labels:
-          severity: warning
-          component: kms
-        annotations:
-          summary: "KMS backend operations exhausting retry budget ({{ $labels.outcome }})"
-          description: >-
-            KMS backend operations are terminating as
-            {{ $labels.outcome }} at {{ $value | printf "%.3f" }}/s.
-            Retryable failures are outlasting the retry budget, so
-            callers are seeing hard failures.
-          runbook_url: "https://github.com/rustfs/rustfs/blob/main/docs/operations/kms-observability-runbook.md#kmsbackendretrybudgetexhausted"
@@ -25,13 +25,9 @@ inputs:
    required: false
    default: "rustfs-deps"
  cache-save-if:
-    description: >-
-      Whether to save the cache. The fail-safe default is 'false': a caller that
-      wants to populate a cache must opt in explicitly, so a forgotten input
-      costs a cold cache (minutes) rather than silently consuming the
-      repository-wide 10GB Actions cache quota and evicting other lanes.
+    description: "Condition for saving cache"
    required: false
-    default: "false"
+    default: "true"
  install-cross-tools:
    description: "Install cross-compilation tools"
    required: false
@@ -40,43 +36,28 @@ inputs:
    description: "Target architecture to add"
    required: false
    default: ""
-  install-build-packaging-tools:
-    description: >-
-      Install musl-tools/zip/unzip, needed for musl linking and release
-      packaging. Off for CI test lanes, which use none of them.
+  github-token:
+    description: "GitHub token for API access"
    required: false
-    default: "true"
-  install-test-tools:
-    description: >-
-      Install cargo-nextest and the rustfmt/clippy components. Off for release
-      and audit lanes, which run no tests and no lints.
-    required: false
-    default: "true"
+    default: ""

 runs:
  using: "composite"
  steps:
-    # protobuf-compiler is deliberately absent: the setup-protoc step below
-    # installs 34.1 into the tool cache and prepends it to PATH, so the apt
-    # build (older, and never version-matched) was shadowed on every run and
-    # simply never used.
    - name: Install system dependencies (Ubuntu)
      if: runner.os == 'Linux'
      shell: bash
      run: |
        sudo apt-get update
        sudo apt-get install -y \
+          musl-tools \
          build-essential \
          pkg-config \
          libssl-dev \
-          ripgrep
-
-    # musl-gcc is needed by the native musl release leg, and zip/unzip by the
-    # release packaging steps. No CI test lane touches any of them.
-    - name: Install packaging and cross-linking dependencies (Ubuntu)
-      if: runner.os == 'Linux' && inputs.install-build-packaging-tools == 'true'
-      shell: bash
-      run: sudo apt-get install -y musl-tools zip unzip
+          ripgrep \
+          unzip \
+          zip \
+          protobuf-compiler

    - name: Install protoc
      uses: rustfs/setup-protoc@a3705324d8f9bf5b6c3573fb6cf8ae421db55dd6 # v3.0.1
@@ -94,7 +75,7 @@ runs:
      with:
        toolchain: ${{ inputs.rust-version }}
        targets: ${{ inputs.target }}
-        components: ${{ inputs.install-test-tools == 'true' && 'rustfmt, clippy' || '' }}
+        components: rustfmt, clippy

    - name: Install Zig
      if: inputs.install-cross-tools == 'true'
@@ -105,24 +86,12 @@ runs:
      uses: taiki-e/install-action@a21ae4029b089b9ddc45704028756f51ab8abe48 # cargo-zigbuild

    - name: Install cargo-nextest
-      if: inputs.install-test-tools == 'true'
      uses: taiki-e/install-action@96c7780c1d8a2b8723e12031def873a434d39d8d # nextest

    - name: Setup Rust cache
      uses: Swatinem/rust-cache@e18b497796c12c097a38f9edb9d0641fb99eee32 # v2
      with:
-        # false is rust-cache's own default. With true, cleanup.ts returns
-        # *before* pruning ~/.cargo/registry/src, and config.ts archives the
-        # whole registry — so every cache carried the unpacked source tree of
-        # every dependency, not just "a few extra crates".
-        #
-        # No coverage is lost: getPackages runs `cargo metadata --all-features`,
-        # a strict superset of any single lane's feature closure, and -sys crates
-        # are explicitly exempted from pruning (their src timestamps would
-        # otherwise trigger rebuilds). Anything pruned is re-unpacked from the
-        # .crate files still in registry/cache, whose mtimes crates.io
-        # normalises, so cargo fingerprints stay valid.
-        cache-all-crates: false
+        cache-all-crates: true
        cache-on-failure: true
        shared-key: ${{ inputs.cache-shared-key }}
        save-if: ${{ inputs.cache-save-if }}
@@ -37,7 +37,6 @@ jobs:
    name: Cancel Closed PR Runs
    if: github.event_name == 'pull_request' && github.event.action == 'closed'
    runs-on: ubuntu-latest
-    timeout-minutes: 10
    steps:
      - name: Explain cancellation run
        run: echo "PR closed; this run only cancels older runs in the same concurrency group."
@@ -46,11 +45,8 @@ jobs:
    name: Architecture Migration Rules
    if: github.event_name != 'pull_request' || github.event.action != 'closed'
    runs-on: ubuntu-latest
-    timeout-minutes: 10
    steps:
      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
-        with:
-          persist-credentials: false

      - name: Install ripgrep
        run: |
@@ -23,8 +23,6 @@ on:
      - 'deny.toml'
      - '.github/actions/**'
      - '.github/workflows/**'
-      - 'scripts/release/create_or_update_release.sh'
-      - 'scripts/security/check_preview_release_workflow.sh'
      - 'scripts/security/check_workflow_pins.sh'
  pull_request:
    types: [ opened, synchronize, reopened, closed ]
@@ -35,16 +33,9 @@ on:
      - 'deny.toml'
      - '.github/actions/**'
      - '.github/workflows/**'
-      - 'scripts/release/create_or_update_release.sh'
-      - 'scripts/security/check_preview_release_workflow.sh'
      - 'scripts/security/check_workflow_pins.sh'
  schedule:
-    # Daily, not weekly. This schedule exists to catch RustSec advisories
-    # published against an unchanged dependency tree; at weekly cadence a new
-    # advisory could sit unnoticed for seven days. The check list is unchanged —
-    # splitting it into a light daily advisories-only run and a weekly full run
-    # would create runs where sources/bans/licenses go unverified.
-    - cron: '0 3 * * *' # Daily 03:00 UTC (staggered after the midnight ci/build crons)
+    - cron: '0 3 * * 0' # Weekly on Sunday 03:00 UTC (staggered after the midnight ci/build crons)
  workflow_dispatch:

 permissions:
@@ -64,7 +55,6 @@ jobs:
    name: Cancel Closed PR Runs
    if: github.event_name == 'pull_request' && github.event.action == 'closed'
    runs-on: ubuntu-latest
-    timeout-minutes: 10
    steps:
      - name: Explain cancellation run
        run: echo "PR closed; this run only cancels older runs in the same concurrency group."
@@ -80,32 +70,11 @@ jobs:
    steps:
      - name: Checkout repository
        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
-        with:
-          persist-credentials: false

-      # cargo-deny compiles nothing, so the full setup composite (apt packages,
-      # protoc, flatc, nextest, rustfmt/clippy) was pure overhead here. It does
-      # still need a real cargo: `cargo deny check` runs `cargo metadata`, and
-      # Cargo.toml pins datafusion and s3s as git dependencies, which must be
-      # materialised into ~/.cargo/git — a cold clone is hundreds of MB, so the
-      # cache stays.
-      - name: Install Rust toolchain
-        uses: dtolnay/rust-toolchain@29eef336d9b2848a0b548edc03f92a220660cdb8 # stable
-
-      # Was relying on the composite's default, which used to be "true": every
-      # PR touching Cargo.toml/Cargo.lock saved a second, PR-scoped copy of this
-      # cache and pushed the main-scoped lanes out of the 10GB quota. The
-      # default is now "false", but state it explicitly — see
-      # scripts/security/check_cache_save_if.sh.
-      - name: Setup Rust cache
-        uses: Swatinem/rust-cache@e18b497796c12c097a38f9edb9d0641fb99eee32 # v2
+      - name: Setup Rust environment
+        uses: ./.github/actions/setup
        with:
-          # Same reasoning as the setup composite: true archives every
-          # dependency's unpacked source tree.
-          cache-all-crates: false
-          cache-on-failure: true
-          shared-key: rustfs-cargo-deny
-          save-if: ${{ github.ref == 'refs/heads/main' }}
+          cache-shared-key: rustfs-cargo-deny

      - name: Install cargo-deny
        uses: taiki-e/install-action@bffeee26d4db9be238a4ea78d8826604ebcb594d # v2
@@ -123,28 +92,13 @@ jobs:
    steps:
      - name: Checkout repository
        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
-        with:
-          persist-credentials: false

      - name: Report unpinned GitHub Actions
        run: ./scripts/security/check_workflow_pins.sh --enforce

-      - name: Check setup cache-save-if is explicit
-        run: ./scripts/security/check_cache_save_if.sh
-
-      - name: Check every job declares a timeout
-        run: ./scripts/security/check_job_timeouts.sh
-
-      - name: Check checkouts clear their credentials
-        run: ./scripts/security/check_persist_credentials.sh
-
-      - name: Check preview release workflow policy
-        run: ./scripts/security/check_preview_release_workflow.sh
-
  dependency-review:
    name: Dependency Review
    runs-on: ubuntu-latest
-    timeout-minutes: 30
    if: github.event_name == 'pull_request' && github.event.action != 'closed'
    permissions:
      contents: read
@@ -152,8 +106,6 @@ jobs:
    steps:
      - name: Checkout repository
        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
-        with:
-          persist-credentials: false

      - name: Dependency Review
        uses: actions/dependency-review-action@a1d282b36b6f3519aa1f3fc636f609c47dddb294 # v5
@@ -166,28 +118,3 @@ jobs:
          # conscious re-review of the license/provenance claim (backlog#1181).
          allow-dependencies-licenses: pkg:cargo/rustfs-uring@0.1.0
          comment-summary-in-pr: always
-
-  alert-on-failure:
-    name: Alert on scheduled failure
-    # dependency-review is deliberately excluded: it only runs on pull_request,
-    # so it can never contribute a failure to a scheduled run.
-    needs: [cargo-deny, workflow-pin-report]
-    # A scheduled cargo-deny failure usually means the dependency tree just
-    # matched a newly published advisory — the single most important signal this
-    # workflow produces, and until now it was only visible to whoever happened to
-    # open the Actions tab. Same ci-8 mechanism coverage.yml and
-    # e2e-replication-nightly.yml already use.
-    if: always() && github.event_name == 'schedule' && contains(needs.*.result, 'failure')
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-    permissions:
-      contents: read
-      issues: write
-    steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
-        with:
-          persist-credentials: false
-      - name: Open or update failure-tracking issue
-        uses: ./.github/actions/schedule-failure-issue
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
@@ -50,18 +50,12 @@ on:
      - "**/*.svg"
      - ".gitignore"
      - ".dockerignore"
-      - "flake.lock"
  schedule:
    - cron: "0 1 * * 0" # Weekly on Sunday 01:00 UTC (staggered after the ci.yml midnight cron)
  workflow_dispatch:
    inputs:
      build_docker:
-        # Advisory only. docker.yml triggers on workflow_run and its job-level
-        # condition requires the triggering event to be a tag push, so a manual
-        # dispatch of this workflow never produces images regardless of this
-        # value. Kept because the summary step reports it; wiring it up would
-        # mean teaching docker.yml's version parser a second event shape.
-        description: "Build and push Docker images after binary build (ignored: dispatch runs never reach docker.yml)"
+        description: "Build and push Docker images after binary build"
        required: false
        default: true
        type: boolean
@@ -89,7 +83,6 @@ jobs:
  build-check:
    name: Build Strategy Check
    runs-on: ubuntu-latest
-    timeout-minutes: 30
    outputs:
      should_build: ${{ steps.check.outputs.should_build }}
      build_type: ${{ steps.check.outputs.build_type }}
@@ -99,8 +92,6 @@ jobs:
    steps:
      - name: Checkout repository
        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
-        with:
-          persist-credentials: false

      - name: Determine build strategy
        id: check
@@ -116,21 +107,13 @@ jobs:

          # Determine build type based on trigger
          if [[ "${{ startsWith(github.ref, 'refs/tags/') }}" == "true" ]]; then
-            # Tag push - preview, release, or prerelease
+            # Tag push - release or prerelease
            should_build=true
            tag_name="${GITHUB_REF#refs/tags/}"
            version="${tag_name}"

-            # Preview tags publish a GitHub prerelease for validation, but
-            # must not update any latest channel.
-            if [[ "$tag_name" =~ -preview\.[0-9]+$ ]]; then
-              build_type="preview"
-              is_prerelease=true
-              echo "🔍 Preview build detected: $tag_name"
-            elif [[ "$tag_name" == *"-preview"* ]]; then
-              echo "❌ Invalid preview tag: $tag_name (expected suffix: -preview.<number>)" >&2
-              exit 1
-            elif [[ "$tag_name" == *"alpha"* ]] || [[ "$tag_name" == *"beta"* ]] || [[ "$tag_name" == *"rc"* ]]; then
+            # Check if this is a prerelease
+            if [[ "$tag_name" == *"alpha"* ]] || [[ "$tag_name" == *"beta"* ]] || [[ "$tag_name" == *"rc"* ]]; then
              build_type="prerelease"
              is_prerelease=true
              echo "🚀 Prerelease build detected: $tag_name"
@@ -173,7 +156,6 @@ jobs:
    name: Prepare Platform Matrix
    needs: build-check
    runs-on: ubuntu-latest
-    timeout-minutes: 30
    outputs:
      matrix: ${{ steps.select.outputs.matrix }}
      selected: ${{ steps.select.outputs.selected }}
@@ -181,14 +163,10 @@ jobs:
      - name: Select target platforms
        id: select
        shell: bash
-        env:
-          # via env, not interpolation: a dispatch input is free-form text and
-          # would otherwise be pasted into the script for bash to evaluate.
-          RAW_PLATFORMS: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.platforms || 'all' }}
        run: |
          set -euo pipefail

-          selected="$RAW_PLATFORMS"
+          selected="${{ github.event_name == 'workflow_dispatch' && github.event.inputs.platforms || 'all' }}"
          selected="$(echo "${selected}" | tr -d '[:space:]')"
          if [[ -z "${selected}" ]]; then
            selected="all"
@@ -259,7 +237,6 @@ jobs:
      - name: Checkout repository
        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
        with:
-          persist-credentials: false
          fetch-depth: 0

      - name: Setup Rust environment
@@ -268,17 +245,9 @@ jobs:
          rust-version: stable
          target: ${{ matrix.target }}
          cache-shared-key: build-${{ matrix.target }}
-          # main only. A cache saved on refs/tags/X is scoped to that tag: no
-          # other tag, no main run and no PR can restore it, so every release
-          # cycle wrote up to 12 entries of 1-2GB (preview tag plus final tag,
-          # six legs each) that nobody could read, evicting the hot lanes from
-          # the repo-wide 10GB quota. Tag builds still restore the main-scoped
-          # cache, since default-branch caches are readable from every ref.
-          # The one real cost: re-running a failed leg of the same tag no longer
-          # finds that tag's own warm cache and falls back to main's.
-          cache-save-if: ${{ github.ref == 'refs/heads/main' }}
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          cache-save-if: ${{ github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/') }}
          install-cross-tools: ${{ matrix.cross }}
-          install-test-tools: 'false'

      - name: Download static console assets
        shell: bash
@@ -725,14 +694,9 @@ jobs:
    needs: [ build-check, build-rustfs ]
    if: always() && needs.build-check.outputs.should_build == 'true'
    runs-on: ubuntu-latest
-    timeout-minutes: 10
    steps:
      - name: Build completion summary
        shell: bash
-        env:
-          # dispatch input via env: free-form text must not be pasted into the
-          # script for bash to evaluate.
-          INPUT_BUILD_DOCKER: ${{ github.event.inputs.build_docker }}
        run: |
          BUILD_TYPE="${{ needs.build-check.outputs.build_type }}"
          VERSION="${{ needs.build-check.outputs.version }}"
@@ -750,10 +714,6 @@ jobs:
          echo ""

          case "$BUILD_TYPE" in
-            "preview")
-              echo "🔍 Preview artifacts are published in a GitHub prerelease"
-              echo "⏭️  Preview releases do not update latest channels"
-              ;;
            "development")
              echo "🛠️  Development build artifacts have been uploaded to OSS dev directory"
              echo "⚠️  This is a development build - not suitable for production use"
@@ -772,9 +732,7 @@ jobs:

          echo ""
          echo "🐳 Docker Images:"
-          if [[ "$BUILD_TYPE" == "preview" ]]; then
-            echo "⏭️  Preview tags do not publish Docker images"
-          elif [[ "$INPUT_BUILD_DOCKER" == "false" ]]; then
+          if [[ "${{ github.event.inputs.build_docker }}" == "false" ]]; then
            echo "⏭️  Docker image build was skipped (binary only build)"
          elif [[ "$BUILD_STATUS" == "success" ]]; then
            echo "🔄 Docker images will be built and pushed automatically via workflow_run event"
@@ -782,13 +740,12 @@ jobs:
            echo "❌ Docker image build will be skipped due to build failure"
          fi

-  # Create GitHub Release for every valid release tag, including previews
+  # Create GitHub Release (only for tag pushes)
  create-release:
    name: Create GitHub Release
    needs: [ build-check, build-rustfs ]
-    if: startsWith(github.ref, 'refs/tags/') && (needs.build-check.outputs.build_type == 'preview' || needs.build-check.outputs.build_type == 'release' || needs.build-check.outputs.build_type == 'prerelease')
+    if: startsWith(github.ref, 'refs/tags/') && needs.build-check.outputs.build_type != 'development'
    runs-on: ubuntu-latest
-    timeout-minutes: 30
    permissions:
      contents: write
    outputs:
@@ -798,7 +755,6 @@ jobs:
      - name: Checkout repository
        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
        with:
-          persist-credentials: false
          fetch-depth: 0

      - name: Create GitHub Release
@@ -811,12 +767,9 @@ jobs:
          VERSION="${{ needs.build-check.outputs.version }}"
          IS_PRERELEASE="${{ needs.build-check.outputs.is_prerelease }}"
          BUILD_TYPE="${{ needs.build-check.outputs.build_type }}"
-          TARGET_COMMITISH=$(git rev-parse --verify "refs/tags/${TAG}^{commit}")

          # Determine release type for title
-          if [[ "$BUILD_TYPE" == "preview" ]]; then
-            RELEASE_TYPE="preview"
-          elif [[ "$BUILD_TYPE" == "prerelease" ]]; then
+          if [[ "$BUILD_TYPE" == "prerelease" ]]; then
            if [[ "$TAG" == *"alpha"* ]]; then
              RELEASE_TYPE="alpha"
            elif [[ "$TAG" == *"beta"* ]]; then
@@ -830,34 +783,61 @@ jobs:
            RELEASE_TYPE="release"
          fi

-          # Create release title
-          if [[ "$IS_PRERELEASE" == "true" ]]; then
-            TITLE="RustFS $VERSION (${RELEASE_TYPE})"
+          # Check if release already exists
+          if gh release view "$TAG" >/dev/null 2>&1; then
+            echo "Release $TAG already exists"
+            RELEASE_ID=$(gh release view "$TAG" --json databaseId --jq '.databaseId')
+            RELEASE_URL=$(gh release view "$TAG" --json url --jq '.url')
          else
-            TITLE="RustFS $VERSION"
+            # Get release notes from tag message
+            RELEASE_NOTES=$(git tag -l --format='%(contents)' "${TAG}")
+            if [[ -z "$RELEASE_NOTES" || "$RELEASE_NOTES" =~ ^[[:space:]]*$ ]]; then
+              if [[ "$IS_PRERELEASE" == "true" ]]; then
+                RELEASE_NOTES="Pre-release ${VERSION} (${RELEASE_TYPE})"
+              else
+                RELEASE_NOTES="Release ${VERSION}"
+              fi
+            fi
+
+            # Create release title
+            if [[ "$IS_PRERELEASE" == "true" ]]; then
+              TITLE="RustFS $VERSION (${RELEASE_TYPE})"
+            else
+              TITLE="RustFS $VERSION"
+            fi
+
+            # Create the release
+            PRERELEASE_FLAG=""
+            if [[ "$IS_PRERELEASE" == "true" ]]; then
+              PRERELEASE_FLAG="--prerelease"
+            fi
+
+            gh release create "$TAG" \
+              --title "$TITLE" \
+              --notes "$RELEASE_NOTES" \
+              $PRERELEASE_FLAG \
+              --draft
+
+            RELEASE_ID=$(gh release view "$TAG" --json databaseId --jq '.databaseId')
+            RELEASE_URL=$(gh release view "$TAG" --json url --jq '.url')
          fi

-          ./scripts/release/create_or_update_release.sh \
-            "$TAG" \
-            "$TARGET_COMMITISH" \
-            "$TITLE" \
-            "$IS_PRERELEASE"
+          echo "release_id=$RELEASE_ID" >> "$GITHUB_OUTPUT"
+          echo "release_url=$RELEASE_URL" >> "$GITHUB_OUTPUT"
+          echo "Created release: $RELEASE_URL"

  # Prepare and upload release assets
  upload-release-assets:
    name: Upload Release Assets
    needs: [ build-check, build-rustfs, create-release ]
-    if: startsWith(github.ref, 'refs/tags/') && (needs.build-check.outputs.build_type == 'preview' || needs.build-check.outputs.build_type == 'release' || needs.build-check.outputs.build_type == 'prerelease')
+    if: startsWith(github.ref, 'refs/tags/') && needs.build-check.outputs.build_type != 'development'
    runs-on: ubuntu-latest
-    timeout-minutes: 30
    permissions:
      contents: write
      actions: read
    steps:
      - name: Checkout repository
        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
-        with:
-          persist-credentials: false

      - name: Download all build artifacts
        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7
@@ -940,10 +920,9 @@ jobs:
  # the pointed-to version is a prerelease.
  update-latest-version:
    name: Update Latest Version
-    needs: [ build-check, publish-release ]
-    if: startsWith(github.ref, 'refs/tags/') && (needs.build-check.outputs.build_type == 'release' || needs.build-check.outputs.build_type == 'prerelease')
+    needs: [ build-check, upload-release-assets ]
+    if: startsWith(github.ref, 'refs/tags/')
    runs-on: ubuntu-latest
-    timeout-minutes: 30
    steps:
      - name: Update latest.json
        env:
@@ -1001,34 +980,51 @@ jobs:
  publish-release:
    name: Publish Release
    needs: [ build-check, create-release, upload-release-assets ]
-    if: startsWith(github.ref, 'refs/tags/') && (needs.build-check.outputs.build_type == 'preview' || needs.build-check.outputs.build_type == 'release' || needs.build-check.outputs.build_type == 'prerelease')
+    if: startsWith(github.ref, 'refs/tags/') && needs.build-check.outputs.build_type != 'development'
    runs-on: ubuntu-latest
-    timeout-minutes: 30
    permissions:
      contents: write
    steps:
-      - name: Publish release
+      - name: Checkout repository
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
+
+      - name: Update release notes and publish
        env:
          GH_TOKEN: ${{ github.token }}
        shell: bash
        run: |
          TAG="${{ needs.build-check.outputs.version }}"
+          VERSION="${{ needs.build-check.outputs.version }}"
+          IS_PRERELEASE="${{ needs.build-check.outputs.is_prerelease }}"
          BUILD_TYPE="${{ needs.build-check.outputs.build_type }}"
-          RELEASE_ID="${{ needs.create-release.outputs.release_id }}"

-          # Publish the release and correct its channel state on retries.
-          # Only a stable final release may become GitHub Latest.
-          if [[ "$BUILD_TYPE" == "release" ]]; then
-            gh api --method PATCH "repos/${GITHUB_REPOSITORY}/releases/${RELEASE_ID}" \
-              -F draft=false \
-              -F prerelease=false \
-              -f make_latest=true >/dev/null
+          # Determine release type
+          if [[ "$BUILD_TYPE" == "prerelease" ]]; then
+            if [[ "$TAG" == *"alpha"* ]]; then
+              RELEASE_TYPE="alpha"
+            elif [[ "$TAG" == *"beta"* ]]; then
+              RELEASE_TYPE="beta"
+            elif [[ "$TAG" == *"rc"* ]]; then
+              RELEASE_TYPE="rc"
+            else
+              RELEASE_TYPE="prerelease"
+            fi
          else
-            gh api --method PATCH "repos/${GITHUB_REPOSITORY}/releases/${RELEASE_ID}" \
-              -F draft=false \
-              -F prerelease=true \
-              -f make_latest=false >/dev/null
+            RELEASE_TYPE="release"
          fi

+          # Get original release notes from tag
+          ORIGINAL_NOTES=$(git tag -l --format='%(contents)' "${TAG}")
+          if [[ -z "$ORIGINAL_NOTES" || "$ORIGINAL_NOTES" =~ ^[[:space:]]*$ ]]; then
+            if [[ "$IS_PRERELEASE" == "true" ]]; then
+              ORIGINAL_NOTES="Pre-release ${VERSION} (${RELEASE_TYPE})"
+            else
+              ORIGINAL_NOTES="Release ${VERSION}"
+            fi
+          fi
+
+          # Publish the release (remove draft status)
+          gh release edit "$TAG" --draft=false
+
          echo "🎉 Released $TAG successfully!"
          echo "📄 Release URL: ${{ needs.create-release.outputs.release_url }}"
@@ -1,265 +0,0 @@
-# Copyright 2026 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.
-
-# Sole writer of the Rust dependency caches that ci.yml restores.
-#
-# Why this is a separate workflow rather than steps inside ci.yml: ci.yml's
-# concurrency group cancels in-progress runs on main pushes, and merges land far
-# faster than its 70-minute pipeline. Measured over 15 consecutive main pushes:
-# 12 cancelled, 2 failed, 0 succeeded. A cancelled run never reaches
-# Swatinem/rust-cache's post step (cache-on-failure does not cover cancellation),
-# so the writer lanes were saving nothing and every PR paid a cold restore —
-# 11.8-20.9 minutes of "Setup Rust environment" against 0.7-3.4 warm.
-#
-# Splitting cache writing out of the test pipeline lets ci.yml keep cancelling
-# superseded runs (which is correct — nobody needs test results for a commit
-# that is already three merges behind) while the caches still get written.
-#
-# The group below deliberately does NOT cancel in progress; see the comment on
-# it for how that bounds concurrency and why it is scoped by event.
-#
-# Each job below owns exactly one shared-key and is the only place that sets
-# cache-save-if to anything but 'false' for it; every lane in ci.yml reads.
-# scripts/security/check_cache_save_if.sh keeps the declarations explicit.
-#
-# The builds are supersets of what the reading lanes compile, because a reader
-# restores only what the writer saved. Feature resolution matters here: a lane
-# built with e2e-test-hooks resolves dependency features differently, which
-# changes -Cmetadata, so the plain build does not cover it. See
-# rustfs/backlog#1600.
-
-name: Cache Warm
-
-on:
-  push:
-    branches: [ main ]
-    # Mirrors ci.yml's push paths-ignore: if a commit cannot change what ci.yml
-    # compiles, it cannot change what ci.yml needs restored either.
-    paths-ignore:
-      - "**.md"
-      - "docs/**"
-      - "deploy/**"
-      - "scripts/dev_*.sh"
-      - "scripts/probe.sh"
-      - "LICENSE*"
-      - ".gitignore"
-      - ".dockerignore"
-      - "README*"
-      - "**/*.png"
-      - "**/*.jpg"
-      - "**/*.svg"
-      - ".github/workflows/build.yml"
-      - ".github/workflows/docker.yml"
-      - ".github/workflows/audit.yml"
-  workflow_dispatch:
-    inputs:
-      emit_timings:
-        description: >-
-          Also emit cargo --timings for the ci-dev build and upload it. Used to
-          decide whether sccache is worth adopting (rustfs/backlog#1601 gate).
-        required: false
-        default: false
-        type: boolean
-
-permissions:
-  contents: read
-
-# Scoped by event. A push run and a dispatch run do not compete: GitHub keeps
-# one running plus one pending per group, so with a single shared group a
-# manually dispatched run was displaced as pending by the next merge and
-# cancelled — observed three times in a row, which made the --timings gate in
-# rustfs/backlog#1601 effectively impossible to trigger while main was busy.
-#
-# Still no cancel-in-progress: a burst of merges collapses into "current run
-# finishes, newest queued run follows" rather than a pile-up, which is what
-# bounds this workflow to one self-hosted runner per event type.
-#
-# The two paths can now overlap and race to save the same key. That is benign:
-# the loser finds the key already present and skips, and both builds produce the
-# same artifacts from the same commit.
-concurrency:
-  group: cache-warm-${{ github.event_name }}
-  cancel-in-progress: false
-
-env:
-  CARGO_TERM_COLOR: always
-
-jobs:
-  # Readers: test-and-lint, test-ilm-integration-serial, build-rustfs-debug-binary,
-  # e2e-tests, e2e-full.
-  warm-ci-dev:
-    name: Warm ci-dev
-    runs-on: sm-standard-4
-    timeout-minutes: 90
-    env:
-      FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: "true"
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
-        with:
-          persist-credentials: false
-
-      - name: Setup Rust environment
-        uses: ./.github/actions/setup
-        with:
-          rust-version: stable
-          cache-shared-key: ci-dev
-          cache-save-if: 'true'
-          install-build-packaging-tools: 'false'
-
-      # rustfs/backlog#1601 gate. sccache can only cache compilation units whose
-      # --emit includes link, so it covers workspace rlibs and nothing else:
-      # clippy is metadata-only, and the ~100 test binaries, the rustfs bin and
-      # every build script invoke the system linker. Before spending a bucket,
-      # credentials and a supply-chain boundary on it, measure how much of the
-      # build is actually rlib codegen.
-      #
-      # Read from the report: workspace lib codegen as a share of the build, and
-      # s3select-query's own rlib as a share. The plan adopts sccache only above
-      # 50% and 25% respectively; if linking dominates instead, the answer is
-      # mold/lld plus split-debuginfo, which is exactly the part sccache cannot
-      # touch. Off by default — this doubles the ci-dev build.
-      - name: Build ci-dev superset (with --timings)
-        if: inputs.emit_timings
-        env:
-          CARGO_BUILD_JOBS: "2"
-        run: cargo build --workspace --all-targets --timings
-
-      - name: Upload cargo timings report
-        if: inputs.emit_timings
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6
-        with:
-          name: cargo-timings-ci-dev
-          path: target/cargo-timings/
-          retention-days: 30
-          if-no-files-found: error
-
-      # --all-targets covers the test binaries nextest builds, including
-      # e2e_test, which test-and-lint's own run excludes. The second build adds
-      # the e2e-test-hooks feature resolution that build-rustfs-debug-binary uses
-      # and that no lint lane enables.
-      - name: Build ci-dev superset
-        env:
-          # Same limit ci.yml puts on its nextest step: this builds the same
-          # ~100 workspace test binaries, and three concurrent links saturate the
-          # self-hosted runner's overlay I/O and can wedge Cargo (#5394).
-          CARGO_BUILD_JOBS: "2"
-        run: |
-          cargo build --workspace --all-targets
-          cargo build -p rustfs --bins --features e2e-test-hooks
-
-      # Runs before rust-cache's post step, so these are the sizes it is about
-      # to archive. Reported so the cache-all-crates decision stays evidence-led:
-      # registry/src is what that flag prunes, registry/cache is what the pruned
-      # sources are re-unpacked from. See rustfs/backlog#1600.
-      - name: Report cache input sizes
-        if: always()
-        run: |
-          # tee, not a plain redirect: sent only to $GITHUB_STEP_SUMMARY these
-          # numbers are readable in the UI but absent from the job log, and the
-          # REST API exposes the log, not the summary — which made the figures
-          # unreachable for exactly the scripted comparison they exist for.
-          sizes="$(du -sh ~/.cargo/registry/src ~/.cargo/registry/cache \
-                          ~/.cargo/registry/index ~/.cargo/git target 2>/dev/null || true)"
-          echo "cache-input-sizes-begin"
-          printf '%s\n' "$sizes"
-          echo "cache-input-sizes-end"
-          {
-            echo "### Cache input sizes (ci-dev)"
-            echo '```'
-            printf '%s\n' "$sizes"
-            echo '```'
-          } >> "$GITHUB_STEP_SUMMARY"
-
-  # Readers: test-and-lint-rio-v2, build-rustfs-debug-binary-rio-v2.
-  warm-ci-feat-rio:
-    name: Warm ci-feat-rio
-    runs-on: sm-standard-4
-    timeout-minutes: 90
-    env:
-      FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: "true"
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
-        with:
-          persist-credentials: false
-
-      - name: Setup Rust environment
-        uses: ./.github/actions/setup
-        with:
-          rust-version: stable
-          cache-shared-key: ci-feat-rio
-          cache-save-if: 'true'
-          install-build-packaging-tools: 'false'
-
-      - name: Build ci-feat-rio superset
-        run: |
-          cargo build -p rustfs -p rustfs-ecstore --all-targets --features rio-v2
-          cargo build -p rustfs --bins --features rio-v2,e2e-test-hooks
-
-  # Readers: the swift and sftp legs of test-and-lint-protocols. Built in
-  # sequence rather than as `--features swift,sftp`, which is a combination no
-  # lane actually compiles; running both leaves the union in target/.
-  warm-ci-feat-proto:
-    name: Warm ci-feat-proto
-    runs-on: sm-standard-4
-    timeout-minutes: 90
-    env:
-      FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: "true"
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
-        with:
-          persist-credentials: false
-
-      - name: Setup Rust environment
-        uses: ./.github/actions/setup
-        with:
-          rust-version: stable
-          cache-shared-key: ci-feat-proto
-          cache-save-if: 'true'
-          install-build-packaging-tools: 'false'
-
-      - name: Build ci-feat-proto superset
-        run: |
-          cargo build -p rustfs -p rustfs-protocols --all-targets --features swift
-          cargo build -p rustfs -p rustfs-protocols --all-targets --features sftp
-
-  # Reader: uring-integration. Runs on ubuntu-latest to match it: rust-cache's
-  # key covers runner.os and arch but not the runner label or image, so a cache
-  # written on sm-standard-4 would be restored by the hosted runner as if it
-  # belonged to it.
-  warm-ci-uring:
-    name: Warm ci-uring
-    runs-on: ubuntu-latest
-    timeout-minutes: 60
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
-        with:
-          persist-credentials: false
-
-      - name: Setup Rust environment
-        uses: ./.github/actions/setup
-        with:
-          rust-version: stable
-          cache-shared-key: ci-uring
-          cache-save-if: 'true'
-          install-build-packaging-tools: 'false'
-
-      - name: Install build dependencies
-        run: sudo apt-get update && sudo apt-get install -y protobuf-compiler
-
-      - name: Build ci-uring superset
-        run: cargo build -p rustfs-ecstore --all-targets
@@ -12,24 +12,18 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-# Companion to ci.yml for required status checks.
+# Companion to ci.yml for the required "Test and Lint" status check.
 #
-# 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.
+# 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 that check forever. This workflow triggers on
+# exactly the paths ci.yml ignores and reports an instant 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.
+# in ci.yml.

 name: Continuous Integration (docs only)

@@ -53,82 +47,17 @@ on:
      - ".github/workflows/build.yml"
      - ".github/workflows/docker.yml"
      - ".github/workflows/audit.yml"
-      - "flake.lock"

 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
-    timeout-minutes: 10
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
-        with:
-          persist-credentials: false
-
-      - name: Install ripgrep
-        run: sudo apt-get update && sudo apt-get install -y ripgrep
-
-      - 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 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 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
    runs-on: ubuntu-latest
-    timeout-minutes: 10
    steps:
      - name: Checkout repository
        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
-        with:
-          persist-credentials: false

      # Docs-only PRs skip the full code CI, but they are exactly where a
      # planning-type document could be slipped in (git add -f bypasses
@@ -33,7 +33,6 @@ on:
      - ".github/workflows/build.yml"
      - ".github/workflows/docker.yml"
      - ".github/workflows/audit.yml"
-      - "flake.lock"
  pull_request:
    types: [ opened, synchronize, reopened, closed ]
    branches: [ main ]
@@ -55,7 +54,6 @@ on:
      - ".github/workflows/build.yml"
      - ".github/workflows/docker.yml"
      - ".github/workflows/audit.yml"
-      - "flake.lock"
  merge_group:
    types: [ checks_requested ]
  schedule:
@@ -83,7 +81,6 @@ jobs:
    name: Cancel Closed PR Runs
    if: github.event_name == 'pull_request' && github.event.action == 'closed'
    runs-on: ubuntu-latest
-    timeout-minutes: 10
    steps:
      - name: Explain cancellation run
        run: echo "PR closed; this run only cancels older runs in the same concurrency group."
@@ -92,20 +89,13 @@ jobs:
    name: Typos
    if: github.event_name != 'pull_request' || github.event.action != 'closed'
    runs-on: ubuntu-latest
-    timeout-minutes: 10
    steps:
      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
-        with:
-          persist-credentials: false
      - name: Typos check with custom config file
        uses: crate-ci/typos@37bb98842b0d8c4ffebdb75301a13db0267cef89 # master

  # 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'
@@ -114,8 +104,6 @@ jobs:
    steps:
      - name: Checkout repository
        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
-        with:
-          persist-credentials: false

      - name: Install ripgrep
        run: sudo apt-get update && sudo apt-get install -y ripgrep
@@ -149,48 +137,24 @@ jobs:
      - 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
    if: github.event_name != 'pull_request' || github.event.action != 'closed'
-    needs: [ quick-checks ]
    runs-on: sm-standard-4
    timeout-minutes: 90
-    # Both lines are required. Job-level `permissions` replaces the workflow
-    # block rather than merging with it, so declaring only `actions: write`
-    # would drop `contents: read` and break this job's checkout and the
-    # repo-token the setup action hands to setup-protoc.
-    permissions:
-      contents: read
-      actions: write
    env:
      FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: "true"
    steps:
      - name: Checkout repository
        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
-        with:
-          # This job's token can cancel runs and delete Actions caches. Checkout
-          # otherwise writes it into .git/config, where a PR's own build.rs or
-          # proc-macro could read it back out.
-          persist-credentials: false

      - name: Setup Rust environment
        uses: ./.github/actions/setup
        with:
          rust-version: stable
-          # Every lane in this workflow reads its cache and none writes it.
-          # cache-warm.yml is the sole writer for all four keys: this workflow
-          # cancels superseded runs on main, and a cancelled run never reaches
-          # rust-cache's post step, so writing from here saved nothing (12 of 15
-          # consecutive main-push runs were cancelled). See rustfs/backlog#1600.
-          cache-shared-key: ci-dev
-          cache-save-if: 'false'
-          install-build-packaging-tools: 'false'
+          cache-shared-key: ci-test
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          cache-save-if: ${{ github.ref == 'refs/heads/main' }}

      - name: Prepare test evidence
        run: |
@@ -205,54 +169,39 @@ jobs:
      # Clippy runs before the test pass: lint failures are the most common
      # CI-only breakage and should surface in minutes, not after 20+ minutes
      # of tests.
-      # Sampled too: clippy is the natural control arm for any CARGO_BUILD_JOBS
-      # experiment, since --all-targets is check-only for workspace members and
-      # never links the ~100 test binaries the limit exists to throttle.
      - name: Run clippy lints
-        run: |
-          ./scripts/ci/resource_sampler.sh start clippy
-          trap './scripts/ci/resource_sampler.sh stop' EXIT
-          cargo clippy --all-targets -- -D warnings
+        run: cargo clippy --all-targets -- -D warnings

      - name: Run nextest tests
-        env:
-          # #5394 mitigation, now under a measured experiment (backlog#1601).
-          #
-          # 2 was chosen when three concurrent workspace test links were believed
-          # to saturate the runner's overlay I/O and wedge Cargo until the 75m
-          # timeout. cgroup v2 readings from the sampler show the pod actually
-          # has 14 CPUs and 28GB (peak use 2.1GB), so 2 throttles compilation to
-          # a seventh of what is available and memory was never the constraint —
-          # the label name "sm-standard-4" had led everyone, including the
-          # original mitigation, to assume 4 cores.
-          #
-          # Raised to 3 on main pushes and manual dispatches; PRs keep 2 so the
-          # merge path is untouched while the experiment runs.
-          #
-          # Dispatch is included because push alone cannot supply the samples:
-          # this workflow cancels superseded runs on main, and only 4 of the last
-          # 20 push-triggered Test and Lint jobs reached a terminal state — at
-          # that rate ten samples would take roughly fifty merges. The
-          # concurrency group is scoped by event_name, so a dispatched run has
-          # its own group and is not cancelled by merge traffic, which makes the
-          # sample collectable on demand rather than by waiting.
-          #
-          # Baseline over 17 samples at 2:
-          # median nextest/clippy step ratio 1.95, spread 1.85-2.06. The gate-2
-          # criterion is that ratio dropping at least 10% (below ~1.76) with no
-          # 75m timeout and no run showing three consecutive samples of
-          # rustc/collect2/rust-lld in D state. If it does not, the conclusion is
-          # "this limit is not the bottleneck" — fix it back at 2 and record the
-          # experiment, which is a result, not a failure.
-          #
-          # Must stay step-level: rust-cache hashes CARGO/CC/CFLAGS/CXX/CMAKE/RUST
-          # prefixed variables from process.env into the cache key, so promoting
-          # this to job level would rotate every key on this lane.
-          CARGO_BUILD_JOBS: ${{ (github.event_name == 'push' || github.event_name == 'workflow_dispatch') && '3' || '2' }}
        run: |
          mkdir -p artifacts/test-and-lint
-          ./scripts/ci/resource_sampler.sh start nextest
-          trap './scripts/ci/resource_sampler.sh stop' EXIT
+          # Evidence sampler for issue #5394: the post-mortem pgrep below runs
+          # only after `timeout` has already TERM'd the whole cargo process
+          # group, so it cannot name a wedged process. Sample system and
+          # process state every 60s instead; the last samples before the
+          # timeout show what was stuck (rustc, linker, build script, memory
+          # pressure, ...). The log rides along in the existing artifact.
+          (
+            while true; do
+              {
+                echo "=== $(date --utc --iso-8601=seconds)"
+                echo "--- load";  cat /proc/loadavg
+                echo "--- psi";   grep -H . /proc/pressure/* 2>/dev/null || true
+                echo "--- mem";   free -m
+                echo "--- disk";  df -h / /home/runner 2>/dev/null || df -h /
+                echo "--- top-rss"
+                ps -eo pid,ppid,stat,etime,rss,pcpu,args --sort=-rss | head -15
+                echo "--- build/test processes"
+                ps -eo pid,ppid,stat,etime,rss,pcpu,args | grep -E '[c]argo|[r]ustc|[n]extest|[c]ollect2|rust-ll[d]|[b]uild-script|deps[/]' || true
+                echo "--- d-state (uninterruptible IO)"
+                ps -eo pid,stat,etime,args | awk 'NR > 1 && $2 ~ /D/' || true
+                echo
+              } >> artifacts/test-and-lint/sampler.log 2>&1 || true
+              sleep 60
+            done
+          ) &
+          sampler_pid=$!
+          trap 'kill "${sampler_pid}" 2>/dev/null || true' EXIT
          set +e
          NEXTEST_HIDE_PROGRESS_BAR=1 timeout --verbose --signal=TERM --kill-after=30s 75m \
            cargo nextest run --profile ci --all --exclude e2e_test \
@@ -324,48 +273,6 @@ jobs:
      - name: Run rebalance/decommission migration proofs
        run: ./scripts/check_migration_gate_count.sh

-      # Early stop. Once this job has failed the PR cannot merge, so the sibling
-      # lanes are burning runners on a result nobody can act on: on run
-      # 30674613104 three lanes had already failed while Test and Lint and the
-      # rio-v2 variant kept going past 70 minutes.
-      #
-      # Only this job may cancel. The lanes that are NOT required checks
-      # (protocols, ILM, e2e, s3-tests) must never hold that power: a flake in
-      # one of them would turn the required "Test and Lint" into `cancelled`,
-      # which blocks the merge. Today a maintainer can merge with sftp red, and
-      # that has to stay true.
-      #
-      # These steps run last so the `if: always()` artifact upload above still
-      # captures logs and diagnostics before the run goes away.
-      - name: Annotate early-stop reason
-        if: failure() && github.event_name == 'pull_request'
-        run: |
-          echo "## CI early-stop" >> "$GITHUB_STEP_SUMMARY"
-          echo "Job \`${GITHUB_JOB}\` (Test and Lint) failed; cancelling run ${GITHUB_RUN_ID} to free runners." >> "$GITHUB_STEP_SUMMARY"
-          echo "Sibling jobs showing **cancelled** were stopped by this job, not by their own failure." >> "$GITHUB_STEP_SUMMARY"
-
-      # curl rather than `gh`: every existing `gh` call in this repo runs on
-      # ubuntu-latest, and the sm-standard-* images are custom and trimmed (they
-      # ship no C toolchain, see the e2e job below), so `gh` is not known to
-      # exist here.
-      #
-      # Fork PRs are excluded explicitly instead of relying on the error path:
-      # their GITHUB_TOKEN is forced read-only and job-level permissions cannot
-      # raise it, so the call would always 403. Skipping keeps their logs clean.
-      - name: Cancel run on failure (same-repo PR only)
-        if: >-
-          failure() && github.event_name == 'pull_request'
-          && github.event.pull_request.head.repo.full_name == github.repository
-        continue-on-error: true
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          curl -fsS -X POST \
-            -H "Authorization: Bearer ${GH_TOKEN}" \
-            -H "Accept: application/vnd.github+json" \
-            -H "X-GitHub-Api-Version: 2022-11-28" \
-            "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}/cancel" || true
-
  # Dedicated serial lane for the ILM / lifecycle integration tests. These tests
  # drive the object layer through process-global singletons (the GLOBAL_ENV
  # ECStore, the global tier-config manager, background-expiry workers) and bind
@@ -379,7 +286,6 @@ jobs:
  test-ilm-integration-serial:
    name: ILM Integration (serial)
    if: github.event_name != 'pull_request' || github.event.action != 'closed'
-    needs: [ quick-checks ]
    runs-on: sm-standard-4
    timeout-minutes: 45
    env:
@@ -387,16 +293,14 @@ jobs:
    steps:
      - name: Checkout repository
        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
-        with:
-          persist-credentials: false

      - name: Setup Rust environment
        uses: ./.github/actions/setup
        with:
          rust-version: stable
-          cache-shared-key: ci-dev
-          cache-save-if: 'false'
-          install-build-packaging-tools: 'false'
+          cache-shared-key: ci-ilm-serial
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          cache-save-if: ${{ github.ref == 'refs/heads/main' }}

      # test_transition_and_restore_flows was re-enabled by rustfs/backlog#1303:
      # its "missing xl.meta on disk2" was a test-util bug (open_disk hardcoded
@@ -419,7 +323,6 @@ jobs:
  test-and-lint-rio-v2:
    name: Test and Lint (rio-v2)
    if: github.event_name != 'pull_request' || github.event.action != 'closed'
-    needs: [ quick-checks ]
    runs-on: sm-standard-4
    timeout-minutes: 60
    env:
@@ -427,16 +330,14 @@ jobs:
    steps:
      - name: Checkout repository
        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
-        with:
-          persist-credentials: false

      - name: Setup Rust environment
        uses: ./.github/actions/setup
        with:
          rust-version: stable
-          cache-shared-key: ci-feat-rio
-          cache-save-if: 'false'
-          install-build-packaging-tools: 'false'
+          cache-shared-key: ci-test-rio-v2
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          cache-save-if: ${{ github.ref == 'refs/heads/main' }}

      - name: Run rio-v2 clippy lints
        run: cargo clippy -p rustfs -p rustfs-ecstore --all-targets --features rio-v2 -- -D warnings
@@ -449,17 +350,10 @@ jobs:
  test-and-lint-protocols:
    name: "Test and Lint (${{ matrix.features.name }})"
    if: github.event_name != 'pull_request' || github.event.action != 'closed'
-    needs: [ quick-checks ]
    runs-on: sm-standard-4
    timeout-minutes: 60
    strategy:
-      # On a PR, one failing protocol leg is enough to know the PR is not ready,
-      # so stop the sibling leg instead of paying another ~40 minutes for it.
-      # Everywhere else (main pushes, the merge queue, the weekly schedule) keep
-      # the full signal: there we want to know whether swift AND sftp are broken,
-      # not just whichever failed first. This is the only part of the early-stop
-      # work that also covers fork PRs, since it needs no token.
-      fail-fast: ${{ github.event_name == 'pull_request' }}
+      fail-fast: false
      matrix:
        features:
          - name: swift
@@ -471,16 +365,14 @@ jobs:
    steps:
      - name: Checkout repository
        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
-        with:
-          persist-credentials: false

      - name: Setup Rust environment
        uses: ./.github/actions/setup
        with:
          rust-version: stable
-          cache-shared-key: ci-feat-proto
-          cache-save-if: 'false'
-          install-build-packaging-tools: 'false'
+          cache-shared-key: ci-test-${{ matrix.features.name }}
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          cache-save-if: ${{ github.ref == 'refs/heads/main' }}

      - name: Run clippy with ${{ matrix.features.name }}
        run: |
@@ -493,7 +385,6 @@ jobs:
  build-rustfs-debug-binary:
    name: Build RustFS Debug Binary
    if: github.event_name != 'pull_request' || github.event.action != 'closed'
-    needs: [ quick-checks ]
    runs-on: sm-standard-4
    timeout-minutes: 30
    env:
@@ -501,16 +392,14 @@ jobs:
    steps:
      - name: Checkout repository
        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
-        with:
-          persist-credentials: false

      - name: Setup Rust environment
        uses: ./.github/actions/setup
        with:
          rust-version: stable
-          cache-shared-key: ci-dev
-          cache-save-if: 'false'
-          install-build-packaging-tools: 'false'
+          cache-shared-key: ci-rustfs-debug-binary
+          cache-save-if: ${{ github.ref == 'refs/heads/main' }}
+          github-token: ${{ secrets.GITHUB_TOKEN }}

      - name: Build debug binary
        run: cargo build -p rustfs --bins --features e2e-test-hooks
@@ -526,7 +415,6 @@ jobs:
  build-rustfs-debug-binary-rio-v2:
    name: Build RustFS Debug Binary (rio-v2)
    if: github.event_name != 'pull_request' || github.event.action != 'closed'
-    needs: [ quick-checks ]
    runs-on: sm-standard-4
    timeout-minutes: 30
    env:
@@ -534,16 +422,14 @@ jobs:
    steps:
      - name: Checkout repository
        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
-        with:
-          persist-credentials: false

      - name: Setup Rust environment
        uses: ./.github/actions/setup
        with:
          rust-version: stable
-          cache-shared-key: ci-feat-rio
-          cache-save-if: 'false'
-          install-build-packaging-tools: 'false'
+          cache-shared-key: ci-rustfs-debug-binary-rio-v2
+          cache-save-if: ${{ github.ref == 'refs/heads/main' }}
+          github-token: ${{ secrets.GITHUB_TOKEN }}

      - name: Build debug binary with rio-v2
        run: cargo build -p rustfs --bins --features rio-v2,e2e-test-hooks
@@ -558,14 +444,6 @@ jobs:

  uring-integration:
    name: io_uring Integration (real)
-    # The pull_request trigger includes `closed` purely so the concurrency
-    # group cancels in-flight runs of a closed PR; every other job opts out of
-    # that run with this guard (or is skipped through its `needs` chain). This
-    # job had neither, so each closed/merged PR really ran the whole io_uring
-    # suite (measured 4m17s / 7m19s / 7m31s on runs 30678272341 / 30678117601 /
-    # 30662728539) and kept the cancellation run in progress for minutes.
-    if: github.event_name != 'pull_request' || github.event.action != 'closed'
-    needs: [ quick-checks ]
    # GitHub-hosted ubuntu-latest runs a recent kernel with io_uring and, unlike
    # a container, applies no seccomp filter that would block io_uring_setup — so
    # the probe succeeds and the tests exercise the real UringBackend/FdCache/
@@ -576,24 +454,17 @@ jobs:
    steps:
      - name: Checkout repository
        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
-        with:
-          persist-credentials: false

      - name: Setup Rust environment
        uses: ./.github/actions/setup
        with:
          rust-version: stable
-          # Keeps its own key rather than joining ci-dev. rust-cache's key is
-          # built from runner.os/arch plus rustc and lockfile fingerprints — it
-          # does NOT include the runner label or image. ubuntu-latest and
-          # sm-standard-4 are therefore indistinguishable to it, so sharing a key
-          # would let two different system images overwrite each other's
-          # artifacts, and would make a 2-core hosted runner unpack ci-dev's ~3GB
-          # instead of this lane's ~1.3GB. cache-warm.yml warms this key on
-          # ubuntu-latest for the same reason.
          cache-shared-key: ci-uring
-          cache-save-if: 'false'
-          install-build-packaging-tools: 'false'
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          cache-save-if: ${{ github.ref == 'refs/heads/main' }}
+
+      - name: Install build dependencies
+        run: sudo apt-get update && sudo apt-get install -y protobuf-compiler

      # ext4 supports O_DIRECT; the runner's default TMPDIR may sit on tmpfs or
      # overlayfs, where open(O_DIRECT) returns EINVAL/EOPNOTSUPP and the native
@@ -620,17 +491,7 @@ jobs:
          RUSTFS_IO_URING_READ_ENABLE: "true"
          RUSTFS_URING_TESTS_MUST_RUN: "1"
          TMPDIR: /mnt/rustfs-odirect
-        # --lib narrows what gets compiled, not what gets run: every selected
-        # test lives in the lib target. The 7 integration binaries under
-        # crates/ecstore/tests/ each reported "running 0 tests" here, so they
-        # were compiled and linked for nothing.
-        #
-        # The `uring_` filter must stay exactly as it is. libtest matches on
-        # substring, so it also selects names containing `during_` — 6 of the 18
-        # selected tests are such incidental matches. Narrowing the filter to
-        # `io_uring` would silently drop them, which is a coverage change.
-        # scripts/check_uring_lane_lib_only.sh guards the --lib precondition.
-        run: cargo test -p rustfs-ecstore --lib uring_ -- --test-threads=1 --nocapture
+        run: cargo test -p rustfs-ecstore uring_ -- --test-threads=1 --nocapture

  e2e-tests:
    name: End-to-End Tests
@@ -640,8 +501,6 @@ jobs:
    steps:
      - name: Checkout repository
        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
-        with:
-          persist-credentials: false

      # Full setup with dependency caching: the smoke-suite step below
      # compiles the e2e_test crate, which pulls in most of the workspace.
@@ -650,9 +509,9 @@ jobs:
        uses: ./.github/actions/setup
        with:
          rust-version: stable
-          cache-shared-key: ci-dev
-          cache-save-if: 'false'
-          install-build-packaging-tools: 'false'
+          cache-shared-key: ci-e2e
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          cache-save-if: ${{ github.ref == 'refs/heads/main' }}

      # Download after the cache restore so the freshly built binary from the
      # build job always wins over anything restored into target/debug.
@@ -726,16 +585,14 @@ jobs:
    steps:
      - name: Checkout repository
        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
-        with:
-          persist-credentials: false

      - name: Setup Rust environment
        uses: ./.github/actions/setup
        with:
          rust-version: stable
-          cache-shared-key: ci-dev
-          cache-save-if: 'false'
-          install-build-packaging-tools: 'false'
+          cache-shared-key: ci-e2e
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          cache-save-if: ${{ github.ref == 'refs/heads/main' }}

      # Download after the cache restore so the freshly built binary from the
      # build job always wins over anything restored into target/debug.
@@ -771,8 +628,6 @@ jobs:
    steps:
      - name: Checkout repository
        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
-        with:
-          persist-credentials: false

      - name: Clean up previous test run
        run: |
@@ -827,8 +682,6 @@ jobs:
    steps:
      - name: Checkout repository
        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
-        with:
-          persist-credentials: false

      - name: Download debug binary
        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7
@@ -889,20 +742,12 @@ jobs:
  # evaluates ILM within ~2s of the due time, well inside the poll window.
  s3-lifecycle-behavior-tests:
    name: S3 Lifecycle Behavior Tests
-    # Also gated on e2e-tests, matching s3-implemented-tests: when the e2e smoke
-    # suite is already red this lane cannot tell us anything new, and it holds a
-    # sm-standard-4 for up to 30 minutes doing so. Both lanes only download the
-    # prebuilt debug binary (no cargo build), and s3-implemented-tests — which
-    # already waits on e2e-tests — finishes later anyway, so a green PR's total
-    # wall clock is unchanged.
-    needs: [ build-rustfs-debug-binary, e2e-tests ]
+    needs: [ build-rustfs-debug-binary ]
    runs-on: sm-standard-4
    timeout-minutes: 30
    steps:
      - name: Checkout repository
        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
-        with:
-          persist-credentials: false

      - name: Download debug binary
        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7
@@ -22,18 +22,11 @@ on:
  issue_comment:
    types: [created, edited]

-# Least privilege at the top, widened per job below. This workflow runs on
-# pull_request_target and issue_comment, so it holds full secrets on every fork
-# PR and on any comment anyone writes — the one place in this repository where a
-# compromised action would be handed a repo-write token. It does not check out
-# or execute PR code, so there is no pwn-request path today, but the blast
-# radius should not depend on that staying true.
-#
-# contents: write in particular was never used: the signature records are
-# written to rustfs/cla through the scoped app token created below, and nothing
-# here writes to this repository's contents.
 permissions:
-  contents: read
+  contents: write
+  pull-requests: write
+  issues: write
+  checks: write

 concurrency:
  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.event.issue.number || github.ref }}
@@ -43,26 +36,14 @@ jobs:
  cancel-closed-pr-runs:
    name: Cancel Closed PR Runs
    if: github.event_name == 'pull_request_target' && github.event.action == 'closed'
-    # Echoes one line; the run exists only so the concurrency group cancels the
-    # in-flight run of a closed PR.
-    permissions: {}
    runs-on: ubuntu-latest
-    timeout-minutes: 10
    steps:
      - name: Explain cancellation run
        run: echo "PR closed; this run only cancels older runs in the same concurrency group."

  cla:
    if: ${{ (github.event_name != 'issue_comment' || github.event.issue.pull_request) && (github.event_name != 'pull_request_target' || github.event.action != 'closed') }}
-    # checks: write reports the merge-queue check run; pull-requests and issues
-    # let cla-bot comment and label. contents stays read — see the note above.
-    permissions:
-      contents: read
-      checks: write
-      issues: write
-      pull-requests: write
    runs-on: ubuntu-latest
-    timeout-minutes: 30
    steps:
      - name: Report CLA result for merge queue
        if: github.event_name == 'merge_group'
@@ -62,16 +62,14 @@ jobs:
    steps:
      - name: Checkout repository
        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
-        with:
-          persist-credentials: false

      - name: Setup Rust environment
        uses: ./.github/actions/setup
        with:
          rust-version: stable
          cache-shared-key: ci-coverage
+          github-token: ${{ secrets.GITHUB_TOKEN }}
          cache-save-if: ${{ github.ref == 'refs/heads/main' }}
-          install-build-packaging-tools: 'false'

      - name: Install cargo-llvm-cov
        uses: taiki-e/install-action@bffeee26d4db9be238a4ea78d8826604ebcb594d # v2
@@ -118,8 +116,6 @@ jobs:
      issues: write
    steps:
      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
-        with:
-          persist-credentials: false
      - name: Open or update failure-tracking issue
        uses: ./.github/actions/schedule-failure-issue
        with:
@@ -82,10 +82,8 @@ jobs:
      github.event_name == 'workflow_dispatch' ||
      (github.event.workflow_run.conclusion == 'success' &&
       github.event.workflow_run.event == 'push' &&
-       github.event.workflow_run.head_branch != 'main' &&
-       !contains(github.event.workflow_run.head_branch, '-preview'))
+       github.event.workflow_run.head_branch != 'main')
    runs-on: ubuntu-latest
-    timeout-minutes: 30
    outputs:
      should_build: ${{ steps.check.outputs.should_build }}
      should_push: ${{ steps.check.outputs.should_push }}
@@ -98,18 +96,11 @@ jobs:
      - name: Checkout repository
        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
        with:
-          persist-credentials: false
          # For workflow_run events, checkout the specific commit that triggered the workflow
          ref: ${{ github.event.workflow_run.head_sha || github.sha }}

      - name: Check build conditions
        id: check
-        env:
-          # dispatch inputs via env, not `${{ }}` interpolation: they are
-          # free-form strings and would otherwise be evaluated by bash.
-          INPUT_VERSION: ${{ github.event.inputs.version }}
-          INPUT_PUSH_IMAGES: ${{ github.event.inputs.push_images }}
-          INPUT_FORCE_REBUILD: ${{ github.event.inputs.force_rebuild }}
        run: |
          should_build=false
          should_push=false
@@ -210,9 +201,9 @@ jobs:

          elif [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
            # Manual trigger
-            input_version="$INPUT_VERSION"
+            input_version="${{ github.event.inputs.version }}"
            version="${input_version}"
-            should_push="$INPUT_PUSH_IMAGES"
+            should_push="${{ github.event.inputs.push_images }}"
            should_build=true

            # Get short SHA
@@ -220,7 +211,7 @@ jobs:

            echo "🎯 Manual Docker build triggered:"
            echo "   📋 Requested version: $input_version"
-            echo "   🔧 Force rebuild: $INPUT_FORCE_REBUILD"
+            echo "   🔧 Force rebuild: ${{ github.event.inputs.force_rebuild }}"
            echo "   🚀 Push images: $should_push"

            case "$input_version" in
@@ -229,13 +220,6 @@ jobs:
                create_latest=true
                echo "🚀 Building with latest stable release version"
                ;;
-              *-preview*)
-                build_type="preview"
-                is_prerelease=true
-                should_build=false
-                should_push=false
-                echo "⏭️  Preview tags do not publish Docker images"
-                ;;
              # Prerelease versions (must match first, more specific)
              v*alpha*|v*beta*|v*rc*|*alpha*|*beta*|*rc*)
                build_type="prerelease"
@@ -306,8 +290,6 @@ jobs:
    steps:
      - name: Checkout repository
        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
-        with:
-          persist-credentials: false

      - name: Login to Docker Hub
        uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3
@@ -343,28 +325,32 @@ jobs:
          CREATE_LATEST="${{ needs.build-check.outputs.create_latest }}"
          VARIANT_SUFFIX="${{ matrix.suffix }}"

-          # Convert version format for Dockerfile compatibility. The former
-          # DOCKER_CHANNEL was "release" down every branch and was passed as a
-          # build-arg no Dockerfile declares, so it is gone.
+          # Convert version format for Dockerfile compatibility
          case "$VERSION" in
            "latest")
+              # For stable latest, use RELEASE=latest + release CHANNEL
              DOCKER_RELEASE="latest"
+              DOCKER_CHANNEL="release"
              ;;
            v*)
              # For versioned releases (v1.0.0), remove 'v' prefix for Dockerfile
              DOCKER_RELEASE="${VERSION#v}"
+              DOCKER_CHANNEL="release"
              ;;
            *)
              # For other versions, pass as-is
              DOCKER_RELEASE="${VERSION}"
+              DOCKER_CHANNEL="release"
              ;;
          esac

          echo "docker_release=$DOCKER_RELEASE" >> "$GITHUB_OUTPUT"
+          echo "docker_channel=$DOCKER_CHANNEL" >> "$GITHUB_OUTPUT"

          echo "🐳 Docker build parameters:"
          echo "  - Original version: $VERSION"
          echo "  - Docker RELEASE: $DOCKER_RELEASE"
+          echo "  - Docker CHANNEL: $DOCKER_CHANNEL"

          # Generate tags based on build type
          # Only support release and prerelease builds (no development builds)
@@ -418,24 +404,18 @@ jobs:
          push: ${{ needs.build-check.outputs.should_push == 'true' }}
          tags: ${{ steps.meta.outputs.tags }}
          labels: ${{ steps.meta.outputs.labels }}
-          # No layer cache. This build compiles nothing — it downloads a
-          # release zip and runs apk/apt — so the cache could only save the
-          # minute or two those take, while creating a correctness problem: with
-          # RELEASE=latest the binary URL is resolved by curl *inside* a RUN
-          # layer, and the layer key does not include what that resolved to. A
-          # rebuild at the same RELEASE value (dispatch with version=latest, or
-          # a re-run of the same version) would hit the old layer and ship the
-          # previous release's binary. mode=max also consumed the same 10GB
-          # Actions cache quota the Rust lanes are fighting over.
-          #
-          # Only RELEASE is passed: it is the sole build-arg the Dockerfiles
-          # declare besides TARGETARCH. BUILDTIME, VERSION, BUILD_TYPE, REVISION
-          # and CHANNEL were never read by any stage (and BUILDTIME's $(date ...)
-          # was a literal here, not a shell substitution). BUILD_DATE and VCS_REF
-          # are declared by the Dockerfiles but deliberately left unset —
-          # supplying them would change the published image labels.
+          cache-from: |
+            type=gha,scope=docker-${{ matrix.variant }}
+          cache-to: |
+            type=gha,mode=max,scope=docker-${{ matrix.variant }}
          build-args: |
+            BUILDTIME=$(date -u +'%Y-%m-%dT%H:%M:%SZ')
+            VERSION=${{ needs.build-check.outputs.version }}
+            BUILD_TYPE=${{ needs.build-check.outputs.build_type }}
+            REVISION=${{ github.sha }}
            RELEASE=${{ steps.meta.outputs.docker_release }}
+            CHANNEL=${{ steps.meta.outputs.docker_channel }}
+            BUILDKIT_INLINE_CACHE=1
          provenance: true
          sbom: true
          # Add retry mechanism by splitting the build process
@@ -451,7 +431,6 @@ jobs:
    needs: [ build-check, build-docker ]
    if: needs.build-check.outputs.should_build == 'true' && needs.build-check.outputs.should_push == 'true'
    runs-on: ubuntu-latest
-    timeout-minutes: 30
    permissions:
      contents: read
      security-events: write
@@ -506,7 +485,6 @@ jobs:
    needs: [ build-check, build-docker ]
    if: always() && needs.build-check.outputs.should_build == 'true'
    runs-on: ubuntu-latest
-    timeout-minutes: 10
    steps:
      - name: Docker build completion summary
        run: |
@@ -64,16 +64,14 @@ jobs:
    steps:
      - name: Checkout repository
        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
-        with:
-          persist-credentials: false

      - name: Setup Rust environment
        uses: ./.github/actions/setup
        with:
          rust-version: stable
          cache-shared-key: ci-e2e-repl
+          github-token: ${{ secrets.GITHUB_TOKEN }}
          cache-save-if: ${{ github.ref == 'refs/heads/main' }}
-          install-build-packaging-tools: 'false'

      # awscurl lets the STS dual-node test actually exercise its path. Without
      # it the test skips gracefully with a visible log line
@@ -126,8 +124,6 @@ jobs:
      issues: write
    steps:
      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
-        with:
-          persist-credentials: false
      - name: Open or update failure-tracking issue
        uses: ./.github/actions/schedule-failure-issue
        with:
@@ -45,13 +45,6 @@
 # The PR gate (ci.yml s3-implemented-tests) is unaffected: it avoids Docker
 # via DEPLOY_MODE=binary and defers all pip setup to run.sh's self-bootstrap.

-# DISABLED. This workflow is switched off in the repository's Actions settings
-# (state: disabled_manually) and does not run on any trigger, including its cron
-# and workflow_dispatch. That state lives in GitHub's UI and is invisible when
-# reading this file, which has already misled at least one audit — hence this
-# banner. Re-enabling is a UI action; anyone doing so should first check that the
-# workflow still matches the current CI layout. See rustfs/backlog#1603.
-#
 name: e2e-s3tests

 on:
@@ -142,8 +135,6 @@ jobs:
      TEST_MODE: ${{ matrix.test-mode }}
    steps:
      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
-        with:
-          persist-credentials: false

      # Provision Python explicitly rather than trusting the runner image to
      # ship a working pip (ci-1: a bare python3 without pip is what broke the
@@ -363,8 +354,6 @@ jobs:
      issues: write
    steps:
      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
-        with:
-          persist-credentials: false
      - name: Open or update failure-tracking issue
        uses: ./.github/actions/schedule-failure-issue
        with:
@@ -12,13 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-# DISABLED. This workflow is switched off in the repository's Actions settings
-# (state: disabled_manually) and does not run on any trigger, including its cron
-# and workflow_dispatch. That state lives in GitHub's UI and is invisible when
-# reading this file, which has already misled at least one audit — hence this
-# banner. Re-enabling is a UI action; anyone doing so should first check that the
-# workflow still matches the current CI layout. See rustfs/backlog#1603.
-#
 name: Fuzz

 on:
@@ -66,7 +59,6 @@ jobs:
    name: Cancel Closed PR Runs
    if: github.event_name == 'pull_request' && github.event.action == 'closed'
    runs-on: ubuntu-latest
-    timeout-minutes: 10
    steps:
      - name: Explain cancellation run
        run: echo "PR closed; this run only cancels older runs in the same concurrency group."
@@ -87,14 +79,13 @@ jobs:
    steps:
      - name: Checkout repository
        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
-        with:
-          persist-credentials: false

      - name: Setup Rust environment
        uses: ./.github/actions/setup
        with:
          rust-version: nightly
          cache-shared-key: fuzz-${{ hashFiles('fuzz/Cargo.lock') }}
+          github-token: ${{ secrets.GITHUB_TOKEN }}
          cache-save-if: ${{ github.ref == 'refs/heads/main' || github.event_name == 'schedule' }}

      - name: Install cargo-fuzz
@@ -154,8 +145,6 @@ jobs:
    steps:
      - name: Checkout repository
        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
-        with:
-          persist-credentials: false

      - name: Download prebuilt fuzz binaries
        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7
@@ -211,8 +200,6 @@ jobs:
    steps:
      - name: Checkout repository
        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
-        with:
-          persist-credentials: false

      - name: Download prebuilt fuzz binaries
        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7
@@ -260,8 +247,6 @@ jobs:
      issues: write
    steps:
      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
-        with:
-          persist-credentials: false
      - name: Open or update failure-tracking issue
        uses: ./.github/actions/schedule-failure-issue
        with:
@@ -32,14 +32,12 @@ permissions:
 jobs:
  build-helm-package:
    runs-on: ubuntu-latest
-    timeout-minutes: 30
    if: |
-      (github.event_name == 'workflow_dispatch' && !contains(github.event.inputs.version, '-preview')) ||
+      github.event_name == 'workflow_dispatch' ||
      (
        github.event.workflow_run.conclusion == 'success' &&
        github.event.workflow_run.event == 'push' &&
-        contains(github.event.workflow_run.head_branch, '.') &&
-        !contains(github.event.workflow_run.head_branch, '-preview')
+        contains(github.event.workflow_run.head_branch, '.')
      )

    outputs:
@@ -50,26 +48,16 @@ jobs:
    steps:
      - name: Checkout helm chart repo
        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
-        with:
-          persist-credentials: false

-      # Both inputs reach the shell through env rather than `${{ }}`
-      # interpolation. A git ref name may contain `$(...)` — anything without a
-      # space is a legal tag — and interpolation pastes it into the script
-      # verbatim, where bash would run it. Reading "$RAW_INPUT" instead makes it
-      # data.
      - name: Normalize release version
        id: version
-        env:
-          RAW_INPUT: ${{ github.event.inputs.version }}
-          RAW_BRANCH: ${{ github.event.workflow_run.head_branch }}
        run: |
          set -eux

          if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
-            RAW="$RAW_INPUT"
+            RAW="${{ github.event.inputs.version }}"
          else
-            RAW="$RAW_BRANCH"
+            RAW="${{ github.event.workflow_run.head_branch }}"
          fi

          case "$RAW" in
@@ -84,13 +72,10 @@ jobs:
          ./scripts/helm_chart_version.sh "$RAW_TAG"

      - name: Replace chart version and app version
-        env:
-          CHART_VERSION: ${{ steps.version.outputs.chart_version }}
-          APP_VERSION: ${{ steps.version.outputs.app_version }}
        run: |
          set -eux
-          sed -i -E "s/^version:.*/version: \"${CHART_VERSION}\"/" helm/rustfs/Chart.yaml
-          sed -i -E "s/^appVersion:.*/appVersion: \"${APP_VERSION}\"/" helm/rustfs/Chart.yaml
+          sed -i -E 's/^version:.*/version: "${{ steps.version.outputs.chart_version }}"/' helm/rustfs/Chart.yaml
+          sed -i -E 's/^appVersion:.*/appVersion: "${{ steps.version.outputs.app_version }}"/' helm/rustfs/Chart.yaml

      - name: Set up Helm
        uses: azure/setup-helm@b9e51907a09c216f16ebe8536097933489208112 # v4.3.0
@@ -115,7 +100,6 @@ jobs:

  publish-helm-package:
    runs-on: ubuntu-latest
-    timeout-minutes: 30
    needs: [ build-helm-package ]
    if: needs.build-helm-package.result == 'success'

@@ -123,8 +107,6 @@ jobs:
      - name: Checkout helm package repo
        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
        with:
-          # persist-credentials-exempt: this checkout's token IS the push credential —
-          # the job git-pushes to rustfs/helm below. Clearing it breaks chart publishing.
          repository: rustfs/helm
          token: ${{ secrets.RUSTFS_HELM_PACKAGE }}

@@ -140,19 +122,11 @@ jobs:
      - name: Generate index
        run: helm repo index . --url https://charts.rustfs.com

-      # app_version is derived from the triggering tag name, and this job holds
-      # the cross-repository push token with rustfs/helm already checked out —
-      # the worst place in the repo to paste an attacker-influenced string into
-      # a shell line. Passed through env so bash treats it as data.
      - name: Push helm package and index file
-        env:
-          GIT_USERNAME: ${{ secrets.USERNAME }}
-          GIT_EMAIL: ${{ secrets.EMAIL_ADDRESS }}
-          APP_VERSION: ${{ needs.build-helm-package.outputs.app_version }}
        run: |
          set -eux
-          git config --global user.name "${GIT_USERNAME}"
-          git config --global user.email "${GIT_EMAIL}"
+          git config --global user.name "${{ secrets.USERNAME }}"
+          git config --global user.email "${{ secrets.EMAIL_ADDRESS }}"
          git add .
-          git commit -m "Update rustfs helm package with ${APP_VERSION}." || echo "No changes to commit"
+          git commit -m "Update rustfs helm package with ${{ needs.build-helm-package.outputs.app_version }}." || echo "No changes to commit"
          git push origin main
@@ -12,13 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-# DISABLED. This workflow is switched off in the repository's Actions settings
-# (state: disabled_manually) and does not run on any trigger, including its cron
-# and workflow_dispatch. That state lives in GitHub's UI and is invisible when
-# reading this file, which has already misled at least one audit — hence this
-# banner. Re-enabling is a UI action; anyone doing so should first check that the
-# workflow still matches the current CI layout. See rustfs/backlog#1603.
-#
 name: "issue-translator"
 on:
  issue_comment:
@@ -33,7 +26,6 @@ permissions:
 jobs:
  build:
    runs-on: ubuntu-latest
-    timeout-minutes: 10
    steps:
      - uses: usthe/issues-translate-action@b41f55ddc81d7d54bd542a4f289fe28ec081898e # v2.7
        with:
@@ -18,25 +18,11 @@
 # This is NOT a PR gate. The fixtures are real MinIO backend trees generated on
 # the fly (they are gitignored, never committed), so the job regenerates them
 # each run with Docker and then runs the `#[ignore]` reader tests in
-# rustfs/src/storage/minio_generated_read_test.rs.
-#
-# Scope: end-to-end MinIO-to-RustFS SSE interop is NOT implemented yet. Both
-# envelope parsers reject MinIO's own wrapped-DEK shape — see
-# `is_data_key_envelope` in crates/kms/src/encryption/dek.rs and the
-# `deny_unknown_fields` `LocalSseDekEnvelope` in rustfs/src/storage/sse.rs — and
-# closing that gap is tracked in rustfs/backlog#1638. Treat this job as the
-# harness for #1638, not as standing evidence that a MinIO migration reads back.
+# crates/ecstore/tests/minio_generated_read_test.rs.
 #
 # Runner: GitHub-hosted `ubuntu-latest`. It reliably ships Docker + Python,
 # unlike the self-hosted fleet, whose pods drift in Docker/pip availability
 # (see the infra note in e2e-s3tests.yml). Nightly + manual only.
-# DISABLED. This workflow is switched off in the repository's Actions settings
-# (state: disabled_manually) and does not run on any trigger, including its cron
-# and workflow_dispatch. That state lives in GitHub's UI and is invisible when
-# reading this file, which has already misled at least one audit — hence this
-# banner. Re-enabling is a UI action; anyone doing so should first check that the
-# workflow still matches the current CI layout. See rustfs/backlog#1603.
-#
 name: minio-interop

 on:
@@ -62,58 +48,23 @@ jobs:
    env:
      # Fixed 32-byte test KMS key baked into the fixture lab; not a secret.
      RUSTFS_MINIO_STATIC_KMS_KEY_B64: IyqsU3kMFloCNup4BsZtf/rmfHVcTgznO2F25CkEH1g=
-      # Single definition of "the interop tests", shared by the guard step and
-      # the run step so the two cannot drift apart.
-      #
-      # These used to live in crates/ecstore/tests/minio_generated_read_test.rs
-      # and were selected with `-p rustfs-ecstore -E
-      # 'binary(minio_generated_read_test)'`. #5435 moved them into the `rustfs`
-      # crate as a `#[cfg(test)] mod`, which deleted that test binary; the
-      # selector was never updated and has selected zero interop tests ever
-      # since (cargo-nextest 0.9.140 now rejects it outright: "operator didn't
-      # match any binary names", exit 94).
-      INTEROP_PACKAGE: rustfs
-      INTEROP_FEATURES: rio-v2
-      INTEROP_FILTER: "test(minio_generated_read_test::)"
    steps:
      - name: Checkout repository
        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
-        with:
-          persist-credentials: false

      - name: Setup Rust environment
        uses: ./.github/actions/setup
        with:
          rust-version: stable
          cache-shared-key: ci-minio-interop
+          github-token: ${{ secrets.GITHUB_TOKEN }}
          cache-save-if: ${{ github.ref == 'refs/heads/main' }}

      - name: Generate real MinIO fixtures via Docker
        run: bash crates/rio-v2/tests/minio_fixture_lab/capture_via_docker.sh

-      # `binary(...)` at least dies loudly when nothing matches, but `test(...)`
-      # is a perfectly valid filterset that matches zero tests, so the next
-      # rename or module move would leave this job selecting nothing and
-      # reporting success without executing a single interop assertion. Count
-      # the selection and fail with a reason instead.
-      #
-      # Count only `filter-match.status == "matches"`: the top-level
-      # `test-count` in the JSON is the package total and ignores `-E` entirely.
-      - name: Assert the interop selector still matches tests
-        run: |
-          set -euo pipefail
-          count="$(cargo nextest list --run-ignored all \
-            -p "$INTEROP_PACKAGE" --features "$INTEROP_FEATURES" \
-            -E "$INTEROP_FILTER" --message-format json \
-            | python3 -c 'import json,sys; d=json.load(sys.stdin); print(sum(1 for s in d.get("rust-suites", {}).values() for t in s.get("testcases", {}).values() if t.get("filter-match", {}).get("status") == "matches"))')"
-          echo "interop tests selected: ${count}"
-          if [ "${count}" -eq 0 ]; then
-            echo "::error::Selector '${INTEROP_FILTER}' in package '${INTEROP_PACKAGE}' matched 0 tests. The MinIO interop reader tests have moved or been renamed again; fix the selector instead of letting this job pass without running them. Context: rustfs/backlog#1638."
-            exit 1
-          fi
-
      - name: Run MinIO interop reader tests
        run: |
-          cargo nextest run --run-ignored ignored-only --no-tests=fail \
-            -p "$INTEROP_PACKAGE" --features "$INTEROP_FEATURES" \
-            -E "$INTEROP_FILTER"
+          cargo nextest run --run-ignored ignored-only \
+            -p rustfs-ecstore --features rio-v2 \
+            -E 'binary(minio_generated_read_test)'
@@ -45,13 +45,6 @@
 # docker-capable self-hosted `dind-sm-standard-2` label was the alternative but
 # has fewer cores and reintroduces fleet-state risk for no reliability gain.

-# DISABLED. This workflow is switched off in the repository's Actions settings
-# (state: disabled_manually) and does not run on any trigger, including its cron
-# and workflow_dispatch. That state lives in GitHub's UI and is invisible when
-# reading this file, which has already misled at least one audit — hence this
-# banner. Re-enabling is a UI action; anyone doing so should first check that the
-# workflow still matches the current CI layout. See rustfs/backlog#1603.
-#
 name: mint

 on:
@@ -125,8 +118,6 @@ jobs:
    timeout-minutes: 120
    steps:
      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
-        with:
-          persist-credentials: false

      - name: Enable buildx
        uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3
@@ -272,8 +263,6 @@ jobs:
      issues: write
    steps:
      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
-        with:
-          persist-credentials: false
      - name: Open or update failure-tracking issue
        uses: ./.github/actions/schedule-failure-issue
        with:
@@ -1,57 +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: Nightly GNU Build
-
-on:
-  schedule:
-    - cron: "0 0 * * *"
-      timezone: "Asia/Shanghai"
-  workflow_dispatch:
-
-permissions:
-  contents: read
-
-concurrency:
-  group: nightly-gnu-build-main-${{ github.event_name }}
-  cancel-in-progress: ${{ github.event_name == 'workflow_dispatch' }}
-
-env:
-  CARGO_TERM_COLOR: always
-  RUST_BACKTRACE: 1
-
-jobs:
-  build:
-    name: Build x86_64 GNU
-    runs-on: sm-standard-2
-    timeout-minutes: 150
-    env:
-      FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: "true"
-    steps:
-      - name: Checkout main branch
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
-        with:
-          persist-credentials: false
-          ref: main
-
-      - name: Setup Rust environment
-        uses: ./.github/actions/setup
-        with:
-          cache-shared-key: build-x86_64-unknown-linux-gnu
-          cache-save-if: 'false'
-          install-build-packaging-tools: 'false'
-          install-test-tools: 'false'
-
-      - name: Build RustFS
-        run: cargo build --release --locked --target x86_64-unknown-linux-gnu -p rustfs --bins
@@ -19,12 +19,9 @@ on:
  schedule:
    - cron: '0 5 * * 0' # Weekly on Sunday 05:00 UTC (staggered after the midnight ci/build crons)

-# GITHUB_TOKEN only needs to read the repository here: the branch push and the
-# pull request are both created by update-flake-lock using the
-# FLAKE_UPDATE_TOKEN PAT below, not by this token. Leaving write on it hands a
-# repo-write credential to an unattended weekly job that does not use it.
 permissions:
-  contents: read
+  contents: write
+  pull-requests: write

 concurrency:
  group: ${{ github.workflow }}-${{ github.ref }}
@@ -40,10 +37,6 @@ jobs:
    steps:
      - name: Checkout repository
        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
-        # persist-credentials-exempt: update-flake-lock pushes the branch and opens
-        # the PR. It passes FLAKE_UPDATE_TOKEN to create-pull-request itself rather
-        # than reusing .git/config, but that is unverified — exempt until a
-        # workflow_dispatch run confirms it (rustfs/backlog#1602).

      - name: Install Nix
        uses: DeterminateSystems/determinate-nix-action@629b284231c2a82554b724e357e47fc6020833c8 # v3
@@ -12,13 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-# DISABLED. This workflow is switched off in the repository's Actions settings
-# (state: disabled_manually) and does not run on any trigger, including its cron
-# and workflow_dispatch. That state lives in GitHub's UI and is invisible when
-# reading this file, which has already misled at least one audit — hence this
-# banner. Re-enabling is a UI action; anyone doing so should first check that the
-# workflow still matches the current CI layout. See rustfs/backlog#1603.
-#
 name: Nix CI

 on:
@@ -53,7 +46,6 @@ jobs:
    name: Cancel Closed PR Runs
    if: github.event_name == 'pull_request' && github.event.action == 'closed'
    runs-on: ubuntu-latest
-    timeout-minutes: 10
    steps:
      - name: Explain cancellation run
        run: echo "PR closed; this run only cancels older runs in the same concurrency group."
@@ -71,8 +63,6 @@ jobs:
    steps:
      - name: Checkout repository
        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
-        with:
-          persist-credentials: false

      - name: Install Nix
        uses: DeterminateSystems/determinate-nix-action@4eea0b33e3d1f02ecfe37cf16e7204c424009606 # v3.21.0
@@ -22,13 +22,6 @@
 # a deliberate correctness cost (e.g. the #4221 fsync durability fix) is
 # recorded but does not block (rustfs/backlog#935 correction 1).

-# DISABLED. This workflow is switched off in the repository's Actions settings
-# (state: disabled_manually) and does not run on any trigger, including its cron
-# and workflow_dispatch. That state lives in GitHub's UI and is invisible when
-# reading this file, which has already misled at least one audit — hence this
-# banner. Re-enabling is a UI action; anyone doing so should first check that the
-# workflow still matches the current CI layout. See rustfs/backlog#1603.
-#
 name: Performance A/B

 on:
@@ -99,8 +92,6 @@ jobs:
    steps:
      - name: Checkout repository
        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
-        with:
-          persist-credentials: false

      - name: Setup Rust environment
        uses: ./.github/actions/setup
@@ -108,6 +99,7 @@ jobs:
          rust-version: stable
          cache-shared-key: warp-ab-${{ hashFiles('**/Cargo.lock') }}
          cache-save-if: ${{ github.ref == 'refs/heads/main' }}
+          github-token: ${{ secrets.GITHUB_TOKEN }}

      - name: Build release rustfs
        run: cargo build --release --bin rustfs
@@ -150,7 +142,6 @@ jobs:
      - name: Checkout repository
        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
        with:
-          persist-credentials: false
          fetch-depth: 0 # baseline is built from origin/main

      - name: Setup Rust environment
@@ -159,6 +150,7 @@ jobs:
          rust-version: stable
          cache-shared-key: warp-ab-${{ hashFiles('**/Cargo.lock') }}
          cache-save-if: ${{ github.ref == 'refs/heads/main' }}
+          github-token: ${{ secrets.GITHUB_TOKEN }}

      - name: Install warp
        run: |
@@ -170,15 +162,13 @@ jobs:

      - name: Decide exemption
        id: exempt
-        env:
-          INPUT_ALLOW_REGRESSION: ${{ github.event.inputs.allow_regression }}
        run: |
          allow="false"
          if [[ "${{ github.event_name }}" == "pull_request" ]] \
            && ${{ contains(github.event.pull_request.labels.*.name, 'perf-deliberate-tradeoff') }}; then
            allow="true"
          fi
-          if [[ "$INPUT_ALLOW_REGRESSION" == "true" ]]; then
+          if [[ "${{ github.event.inputs.allow_regression }}" == "true" ]]; then
            allow="true"
          fi
          echo "allow_regression=$allow" >> "$GITHUB_OUTPUT"
@@ -225,34 +215,8 @@ jobs:
          cp target/release/rustfs baseline-bin/rustfs
          echo "built=true" >> "$GITHUB_OUTPUT"

-      - name: Build baseline on cache miss (different candidate)
-        id: baseline_build
-        if: >-
-          steps.baseline_cache.outputs.cache-hit != 'true' &&
-          steps.commits.outputs.baseline_sha != steps.commits.outputs.candidate_sha
-        run: |
-          set -euo pipefail
-          baseline_root="$RUNNER_TEMP/rustfs-baseline-${{ github.run_id }}"
-          baseline_target="$RUNNER_TEMP/rustfs-baseline-target-${{ github.run_id }}"
-          git worktree add --detach "$baseline_root" "${{ steps.commits.outputs.baseline_sha }}"
-          cargo build --release --manifest-path "$baseline_root/Cargo.toml" --bin rustfs --target-dir "$baseline_target"
-          mkdir -p baseline-bin
-          cp "$baseline_target/release/rustfs" baseline-bin/rustfs
-          git worktree remove --force "$baseline_root"
-          echo "built=true" >> "$GITHUB_OUTPUT"
-
-      - name: Build candidate binary
-        id: candidate_build
-        if: steps.commits.outputs.baseline_sha != steps.commits.outputs.candidate_sha
-        run: |
-          set -euo pipefail
-          cargo build --release --bin rustfs
-          mkdir -p candidate-bin
-          cp target/release/rustfs candidate-bin/rustfs
-          echo "built=true" >> "$GITHUB_OUTPUT"
-
      - name: Save self-healed baseline to cache
-        if: steps.selfheal.outputs.built == 'true' || steps.baseline_build.outputs.built == 'true'
+        if: steps.selfheal.outputs.built == 'true'
        uses: actions/cache/save@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6
        with:
          path: baseline-bin/rustfs
@@ -260,58 +224,54 @@ jobs:

      - name: Run warp A/B and gate
        id: ab
-        env:
-          INPUT_DURATION: ${{ github.event.inputs.duration }}
        run: |
          set -euo pipefail
-          # The formal runner executes A1 baseline -> B1 candidate -> B2 candidate
-          # -> A2 baseline for each workload and drive-sync cell. It requires three
-          # rounds per leg to emit tail latency and error-rate evidence.
+          # Budget note: with perf-3's cached baseline the nightly does no source
+          # build on a cache hit, so the wall-clock is dominated by the short warp
+          # matrix — duration/rounds/cooldown are kept small to fit all 24 cells
+          # (6 workloads x 2 phases x 2 drive-sync) rather than dropping cells.
          # --health-timeout 180 outlasts the server's own 120s startup-readiness
          # budget, which the rig's previous 60s health poll undershot (the first
          # two nightly failures). perf-6 recalibrates these once the noise study
          # lands.
-          duration="${INPUT_DURATION:-12s}"
+          duration="${{ github.event.inputs.duration || '12s' }}"
          baseline_sha="${{ steps.commits.outputs.baseline_sha }}"
          candidate_sha="${{ steps.commits.outputs.candidate_sha }}"
          baseline_hit="${{ steps.baseline_cache.outputs.cache-hit }}"
          selfheal_built="${{ steps.selfheal.outputs.built }}"
-          baseline_built="${{ steps.baseline_build.outputs.built }}"
-          candidate_built="${{ steps.candidate_build.outputs.built }}"

-          args=(--duration "$duration" --rounds 3 --cooldown 5 --health-timeout 180 --baseline-revision "$baseline_sha" --candidate-revision "$candidate_sha")
+          args=(--duration "$duration" --rounds 2 --cooldown 5 --health-timeout 180)

-          if [[ "$baseline_hit" == "true" || "$selfheal_built" == "true" || "$baseline_built" == "true" ]]; then
+          if [[ "$baseline_hit" == "true" || "$selfheal_built" == "true" ]]; then
            chmod +x baseline-bin/rustfs
            base_bin="$PWD/baseline-bin/rustfs"
            args+=(--baseline-bin "$base_bin")
            if [[ "$baseline_hit" == "true" ]]; then
              base_src="actions-cache (rustfs-baseline-$baseline_sha)"
-            elif [[ "$selfheal_built" == "true" ]]; then
-              base_src="source build (cache self-heal, saved as rustfs-baseline-$baseline_sha)"
            else
-              base_src="isolated origin/main source build (saved as rustfs-baseline-$baseline_sha)"
+              base_src="source build (cache self-heal, saved as rustfs-baseline-$baseline_sha)"
            fi
            if [[ "$candidate_sha" == "$baseline_sha" ]]; then
              # Nightly on main: the candidate is the same commit as the baseline,
              # so reuse the one binary for both phases and skip all builds.
-              args+=(--candidate-bin "$base_bin")
+              args+=(--candidate-bin "$base_bin" --skip-build)
              cand_src="same binary as baseline (same commit)"
-            elif [[ "$candidate_built" == "true" ]]; then
-              chmod +x candidate-bin/rustfs
-              args+=(--candidate-bin "$PWD/candidate-bin/rustfs")
-              cand_src="source build of the checked-out ref"
            else
-              echo "::error::candidate binary was not built" >&2
-              exit 2
+              cand_src="source build of the checked-out ref"
            fi
          else
-            echo "::error::baseline binary was not restored or built" >&2
-            exit 2
+            # Cache miss with candidate != baseline (opt-in PR gate only): fall
+            # back to the source double-build. With the post-#4806 LTO profile
+            # this will overrun the job budget and alert; rerun once the push
+            # cache build for origin/main has completed, or wait for perf-7's
+            # merge-base caching.
+            args+=(--baseline-ref origin/main)
+            base_src="source build of origin/main (cache miss)"
+            cand_src="source build of the checked-out ref"
          fi

-          echo "baseline binary: $base_src"
-          echo "candidate binary: $cand_src"
+          args+=(--provenance-note "baseline commit: $baseline_sha - $base_src")
+          args+=(--provenance-note "candidate commit: $candidate_sha - $cand_src")

          if [[ "${{ steps.exempt.outputs.allow_regression }}" == "true" ]]; then
            args+=(--allow-regression --exemption-reason "labeled perf-deliberate-tradeoff / dispatch override")
@@ -319,7 +279,7 @@ jobs:
          # Do not let a gate FAIL abort the job here; capture status and surface
          # it after the PR comment is posted.
          set +e
-          bash scripts/run_hotpath_warp_abba.sh "${args[@]}"
+          bash scripts/run_hotpath_warp_ab.sh "${args[@]}"
          echo "status=$?" >> "$GITHUB_OUTPUT"
          set -e
          # Locate the newest run dir + gate.md for the summary/comment/artifact
@@ -327,10 +287,10 @@ jobs:
          # holds server-logs/ for diagnosis.
          # Run dirs are UTC-timestamp names (no special chars); ls is safe here.
          # shellcheck disable=SC2012
-          run_dir="$(ls -td target/hotpath-abba/*/ 2>/dev/null | head -n1 || true)"
+          run_dir="$(ls -td target/hotpath-ab/*/ 2>/dev/null | head -n1 || true)"
          echo "run_dir=${run_dir%/}" >> "$GITHUB_OUTPUT"
          # shellcheck disable=SC2012
-          gate_md="$(ls -t target/hotpath-abba/*/candidate_gate.md 2>/dev/null | head -n1 || true)"
+          gate_md="$(ls -t target/hotpath-ab/*/gate.md 2>/dev/null | head -n1 || true)"
          echo "gate_md=$gate_md" >> "$GITHUB_OUTPUT"

      - name: Upload A/B results
@@ -338,10 +298,10 @@ jobs:
        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6
        with:
          name: hotpath-warp-ab-${{ github.run_number }}
-          # Includes per-cell median_summary.csv / baseline_compare.csv, both gates,
+          # Includes per-cell median_summary.csv / baseline_compare.csv, gate.md,
          # and server-logs/ (rustfs.log + startup env per phase) so a failed run
          # is diagnosable. Short retention: this is churny nightly debug data.
-          path: target/hotpath-abba/
+          path: target/hotpath-ab/
          if-no-files-found: warn
          retention-days: 14

@@ -425,8 +385,6 @@ jobs:
      issues: write
    steps:
      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
-        with:
-          persist-credentials: false
      - name: Open or update failure-tracking issue
        uses: ./.github/actions/schedule-failure-issue
        with:
@@ -1,81 +0,0 @@
-# Copyright 2026 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.
-
-# Asserts that the self-hosted runners are still ephemeral — one job per pod.
-#
-# This repository is public and its pull_request jobs run on those runners,
-# executing the PR's own build.rs, proc-macros and tests. The only thing keeping
-# that code from reaching a later job is that each ARC pod handles exactly one
-# job and is then destroyed. That guarantee lives in the ARC scale-set
-# configuration, outside this repository, where it can be changed without any PR
-# — so it is asserted here from the outside, against real run data, instead of
-# being assumed.
-#
-# Monthly rather than per-PR: the property changes only when someone
-# reconfigures the scale set, and the check costs a few dozen API calls.
-# See docs/ci/runners.md and rustfs/backlog#1602.
-
-name: Runner Hygiene
-
-on:
-  schedule:
-    - cron: "0 6 1 * *" # Monthly, 1st at 06:00 UTC (after the daily audit cron)
-  workflow_dispatch:
-
-permissions:
-  contents: read
-
-concurrency:
-  group: runner-hygiene
-  cancel-in-progress: false
-
-jobs:
-  check-ephemerality:
-    name: Check runner ephemerality
-    runs-on: ubuntu-latest
-    timeout-minutes: 15
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
-        with:
-          persist-credentials: false
-
-      # Exit 2 (inconclusive / broken) is deliberately not a pass: a window
-      # where every sm-* job was still queued would otherwise look identical to
-      # a clean bill of health.
-      - name: Assert one job per self-hosted runner
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: ./scripts/ci/check_runner_ephemerality.sh 40
-
-  alert-on-failure:
-    name: Alert on scheduled failure
-    needs: [check-ephemerality]
-    # Same ci-8 mechanism as coverage.yml, audit.yml and the nightly lanes:
-    # scheduled runs file a tracking issue, manual dispatch stays quiet so
-    # debugging never produces a spurious alert.
-    if: always() && github.event_name == 'schedule' && contains(needs.*.result, 'failure')
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-    permissions:
-      contents: read
-      issues: write
-    steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
-        with:
-          persist-credentials: false
-      - name: Open or update failure-tracking issue
-        uses: ./.github/actions/schedule-failure-issue
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
@@ -24,13 +24,6 @@
 # The run itself is expected to end red (the forced failure); only the
 # alert-on-failure job result matters.

-# DISABLED. This workflow is switched off in the repository's Actions settings
-# (state: disabled_manually) and does not run on any trigger, including its cron
-# and workflow_dispatch. That state lives in GitHub's UI and is invisible when
-# reading this file, which has already misled at least one audit — hence this
-# banner. Re-enabling is a UI action; anyone doing so should first check that the
-# workflow still matches the current CI layout. See rustfs/backlog#1603.
-#
 name: Schedule Failure Alert Drill

 on:
@@ -63,8 +56,6 @@ jobs:
      issues: write
    steps:
      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
-        with:
-          persist-credentials: false
      - name: Open or update failure-tracking issue
        uses: ./.github/actions/schedule-failure-issue
        with:
@@ -12,13 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-# DISABLED. This workflow is switched off in the repository's Actions settings
-# (state: disabled_manually) and does not run on any trigger, including its cron
-# and workflow_dispatch. That state lives in GitHub's UI and is invisible when
-# reading this file, which has already misled at least one audit — hence this
-# banner. Re-enabling is a UI action; anyone doing so should first check that the
-# workflow still matches the current CI layout. See rustfs/backlog#1603.
-#
 name: "Mark stale issues"
 on:
  schedule:
@@ -27,7 +20,6 @@ on:
 jobs:
  stale:
    runs-on: ubuntu-latest
-    timeout-minutes: 30
    steps:
      - uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639 # v9
        with:
@@ -15,7 +15,6 @@ concurrency:
 jobs:
  update:
    runs-on: ubuntu-latest
-    timeout-minutes: 10
    steps:
      - uses: overtrue/repo-visuals-action@72f34d24769ff5d341956da2f23952594ef2f1e2 # v1.3.0
        with:
@@ -21,22 +21,6 @@ If repo-level instructions conflict, follow the nearest file and keep behavior a
 - Avoid redundant file reads, repeated commands, and unnecessary exploratory work once enough context is available.
 - A good result is a minimal diff with clear assumptions, no over-engineering, and independent verification that survives Adversarial Validation (below).

-## Worktree and Disk Hygiene
-
- Unless the requester explicitly says otherwise, treat every new implementation task as isolated work: fetch the latest `origin/main`, confirm the requested change is not already present there, and create a dedicated feature branch and worktree from that exact upstream commit before editing. Do not implement new work directly in the primary checkout or reuse a worktree from another task.
- Check available disk space before creating the worktree or starting dependency downloads, builds, tests, coverage, or other artifact-heavy commands. For long-running or artifact-heavy work, re-check disk usage at natural phase boundaries and before broad validation; if remaining space may not safely accommodate the next command, stop and reclaim task-owned artifacts before continuing.
- Keep cleanup scoped and safe: remove generated build/test/coverage artifacts and temporary files created by the task when they are no longer needed, and never delete another task's worktree or uncommitted files. Prefer shared dependency caches where supported instead of duplicating large artifacts across worktrees.
- At handoff, report the disk-space checks, cleanup performed, and any retained worktree or artifacts with the reason they are still needed.
-
-## PR Lifecycle Monitoring
-
- Creating or updating a PR is not the terminal state. Unless the requester explicitly limits the task to PR creation, monitor the PR through its terminal state: merged, closed, or explicitly handed off because progress requires user or maintainer action.
- While the task is active, monitor CI/check runs, review decisions and unresolved threads, mergeability and conflicts, and unexpected head/base changes. Prefer event-driven or bounded waits provided by the current environment over frequent polling; report only state changes, actionable failures, or meaningful prolonged delays.
- Investigate every failing check and review comment before changing code. Fix failures attributable to the task, run the verification required for the new diff, push the update, respond to or resolve the corresponding review threads, and resume monitoring. Do not weaken checks, dismiss valid feedback, or retry flaky failures merely to obtain a green result.
- Treat opening, green CI, approval, and mergeability as intermediate states. Never merge without the required reviewer approval or explicit authority. If progress depends on credentials, infrastructure, a maintainer decision, or another external action, report the exact blocker and the evidence already collected.
- If the current execution environment cannot remain active until the next PR event, use a supported automation, monitor, or thread wakeup when available and within scope. Otherwise leave an explicit handoff containing the PR, current state, next event to observe, and pending cleanup; do not imply that background monitoring exists when none is scheduled.
- After observing a merge, verify the commits are preserved on the upstream base, ensure the worktree is clean, remove the dedicated worktree, prune stale worktree metadata, and delete the local task branch when it is no longer in use. For a closed or abandoned PR, preserve any unmerged work unless deletion was explicitly authorized. Do not delete remote branches unless explicitly requested or repository automation owns that cleanup.
-
 ## Autonomy and Approval Boundaries

 - Inquiry tasks (answer, explain, review, diagnose, plan): report findings; do not change files unless a fix is explicitly requested.
@@ -121,78 +105,33 @@ CI) fails the build if anything is committed under `docs/superpowers/`, even via

 ## Verification Before PR

-Convert changes into independently verifiable outcomes. This section controls
-agent-run local validation; preparing a commit or PR does not by itself require
-the broadest gate. Inspect only the final task-owned diff, classify it by
-behavioral impact rather than line count or path alone, and run the smallest
-set of checks that provides meaningful coverage. Do not let unrelated
-worktree changes or a generic contributor checklist expand the scope.
-Non-exempt changes must also pass Adversarial Validation (next section) before
-the checks below count as completion.
+Convert changes into independently verifiable outcomes. Prefer focused tests for behavior changes and run the relevant checks before declaring completion.
+Non-exempt changes must also pass Adversarial Validation (next section) before the checks below count as completion.

-### Validation floor
+For code changes, run and pass the following before opening a PR:

- Every change that is not documentation-only must finish with
-  `cargo fmt --all --check` passing. An umbrella gate that runs this exact
-  check satisfies the requirement; do not run it twice. Use `cargo fmt --all`
-  only when formatting needs to be fixed. Run the configured formatter or
-  validator for other changed languages when one exists.
- Documentation-only or instruction-only means all task-owned changes are
-  prose or documentation assets and cannot affect runtime, builds, CI,
-  dependencies, generated code, or tests. Run `git diff --check` and any
-  relevant documentation guard, but skip Cargo formatting, compilation,
-  Clippy, tests, `make pre-commit`, and `make pre-pr`.
- Behavior changes require relevant existing or new tests. Prefer the most
-  focused test or affected package. A passing targeted test can also provide
-  sufficient compilation coverage when it builds every changed target and
-  feature involved; do not add a redundant `cargo check` in that case.
- `cargo check` supplements compilation coverage; it never substitutes for a
-  behavioral test. If a relevant test cannot reasonably be added or run, use
-  the narrowest compilation check and report the reason and remaining risk.
+```bash
+make pre-pr
+```

-### Validation tiers
+Before committing code changes, prefer focused verification for the touched
+surface and use the faster local gate when a broad smoke check is needed:

-1. **Documentation/instruction-only:** Apply the exemption above. Run a guard
-   such as `make doc-paths-check` only when it is relevant to the edited text.
-2. **Non-behavioral source change:** For comments, formatting, or another
-   demonstrably non-executable change, run the formatting floor. Compilation,
-   Clippy, and tests may be skipped only when the edit cannot affect
-   compilation or runtime behavior; run targeted doctests if executable
-   documentation examples changed.
-3. **Localized or bounded behavior change:** Run the formatting floor and the
-   narrowest relevant tests. Add package-scoped `cargo check` or Clippy only
-   for changed targets, features, APIs, error handling, async behavior, or
-   control flow not already covered. When several crates are affected but the
-   dependency set is identifiable, validate those packages and known
-   dependents instead of the whole workspace. Use `make pre-commit` only when
-   a repository-wide fast gate adds useful confidence beyond those checks.
-4. **Broad or high-risk change:** Run `make pre-pr` only when targeted coverage
-   cannot bound the impact, including:
-   - dependency, feature, build-script, procedural-macro, code-generation,
-     toolchain, or CI changes that alter compilation or the test matrix;
-   - cross-crate public APIs, shared foundational code, or broad refactors with
-     an unbounded dependent set;
-   - locking, storage durability or formats, erasure coding, replication,
-     RPC/protocol compatibility, IAM/KMS/auth, cryptography, or other
-     security-sensitive behavior;
-   - a targeted check that reveals wider impact, an explicit user request, or
-     a release policy that requires the full gate.
+```bash
+make pre-commit
+```

-Documentation-only and non-behavioral classifications take precedence over
-path-based triggers. A small diff can still be high-risk, while a CI comment,
-manifest comment, or release-note edit does not require full validation.
+For migration batches, do not run the full `make pre-pr` gate before every
+intermediate commit. Use focused tests and `make pre-commit` during
+development, then reserve `make pre-pr` for the final PR-ready branch.

-`make pre-pr` includes `make pre-commit` coverage. Never run both for the same
-unchanged diff, and do not repeat equivalent checks during PR preparation or
-because a local hook already ran them. Rerun only checks whose scope is affected
-by later edits. Full workspace checks do not replace a relevant integration or
-E2E test for changed behavior; run that focused test when required and
-available, or report why it was not run and the remaining risk.
+Before pushing code changes, make sure formatting is clean:

-If `make` is unavailable, run the equivalent checks defined under
-`.config/make/`. At handoff, list the checks actually run, checks intentionally
-skipped, and the reason for the selected tier.
+- Run `cargo fmt --all`.
+- Run `cargo fmt --all --check` and ensure no files are modified unexpectedly.

+If `make` is unavailable, run the equivalent checks defined under `.config/make/`.
+Documentation-only or instruction-only changes are exempt from the verification commands above (including the `.config/make/` equivalents), though any locally installed git pre-commit hooks may still run on commit unless explicitly skipped.
 After build-based verification completes, clean generated build artifacts before wrapping up to avoid unnecessary disk usage.
 Do not open a PR with code changes when the required checks fail.
 Make a failing check pass by fixing the cause, never by weakening the gate:
@@ -69,7 +69,7 @@ edition = "2024"
 license = "Apache-2.0"
 repository = "https://github.com/rustfs/rustfs"
 rust-version = "1.97.1"
-version = "1.0.0-beta.12"
+version = "1.0.0-beta.11"
 homepage = "https://rustfs.com"
 description = "RustFS is a high-performance distributed object storage software built using Rust, one of the most popular languages worldwide. "
 keywords = ["RustFS", "Minio", "object-storage", "filesystem", "s3"]
@@ -86,58 +86,58 @@ redundant_clone = "warn"

 [workspace.dependencies]
 # RustFS Internal Crates
-rustfs = { path = "./rustfs", version = "1.0.0-beta.12" }
-rustfs-heal = { path = "crates/heal", version = "1.0.0-beta.12" }
-rustfs-audit = { path = "crates/audit", version = "1.0.0-beta.12" }
-rustfs-checksums = { path = "crates/checksums", version = "1.0.0-beta.12" }
-rustfs-common = { path = "crates/common", version = "1.0.0-beta.12" }
-rustfs-data-usage = { path = "crates/data-usage", version = "1.0.0-beta.12" }
-rustfs-config = { path = "./crates/config", version = "1.0.0-beta.12" }
-rustfs-concurrency = { path = "./crates/concurrency", version = "1.0.0-beta.12" }
-rustfs-credentials = { path = "crates/credentials", version = "1.0.0-beta.12" }
-rustfs-crypto = { path = "crates/crypto", version = "1.0.0-beta.12" }
-rustfs-ecstore = { path = "crates/ecstore", version = "1.0.0-beta.12" }
-rustfs-filemeta = { path = "crates/filemeta", version = "1.0.0-beta.12" }
-rustfs-iam = { path = "crates/iam", version = "1.0.0-beta.12" }
-rustfs-keystone = { path = "crates/keystone", version = "1.0.0-beta.12" }
-rustfs-lifecycle = { path = "crates/lifecycle", version = "1.0.0-beta.12" }
-rustfs-kms = { path = "crates/kms", version = "1.0.0-beta.12" }
-rustfs-lock = { path = "crates/lock", version = "1.0.0-beta.12" }
-rustfs-madmin = { path = "crates/madmin", version = "1.0.0-beta.12" }
-rustfs-notify = { path = "crates/notify", version = "1.0.0-beta.12" }
-rustfs-io-metrics = { path = "crates/io-metrics", version = "1.0.0-beta.12" }
-rustfs-io-core = { path = "crates/io-core", version = "1.0.0-beta.12" }
-rustfs-object-capacity = { path = "crates/object-capacity", version = "1.0.0-beta.12" }
-rustfs-object-data-cache = { path = "crates/object-data-cache", version = "1.0.0-beta.12" }
-rustfs-log-analyzer = { path = "crates/log-analyzer", version = "1.0.0-beta.12" }
-rustfs-obs = { path = "crates/obs", version = "1.0.0-beta.12" }
-rustfs-policy = { path = "crates/policy", version = "1.0.0-beta.12" }
-rustfs-protos = { path = "crates/protos", version = "1.0.0-beta.12" }
-rustfs-protocols = { path = "crates/protocols", version = "1.0.0-beta.12" }
-rustfs-replication = { path = "crates/replication", version = "1.0.0-beta.12" }
-rustfs-rio = { path = "crates/rio", version = "1.0.0-beta.12" }
-rustfs-rio-v2 = { path = "crates/rio-v2", version = "1.0.0-beta.12" }
-rustfs-s3-types = { path = "crates/s3-types", version = "1.0.0-beta.12" }
-rustfs-s3-ops = { path = "crates/s3-ops", version = "1.0.0-beta.12" }
-rustfs-s3select-api = { path = "crates/s3select-api", version = "1.0.0-beta.12" }
-rustfs-s3select-query = { path = "crates/s3select-query", version = "1.0.0-beta.12" }
-rustfs-scanner = { path = "crates/scanner", version = "1.0.0-beta.12" }
-rustfs-security-governance = { path = "crates/security-governance", version = "1.0.0-beta.12" }
-rustfs-extension-schema = { path = "crates/extension-schema", version = "1.0.0-beta.12" }
-rustfs-signer = { path = "crates/signer", version = "1.0.0-beta.12" }
-rustfs-storage-api = { path = "crates/storage-api", version = "1.0.0-beta.12" }
-rustfs-trusted-proxies = { path = "crates/trusted-proxies", version = "1.0.0-beta.12" }
-rustfs-targets = { path = "crates/targets", version = "1.0.0-beta.12" }
-rustfs-test-utils = { path = "crates/test-utils", version = "1.0.0-beta.12" }
-rustfs-tls-runtime = { path = "crates/tls-runtime", version = "1.0.0-beta.12" }
-rustfs-utils = { path = "crates/utils", version = "1.0.0-beta.12" }
-rustfs-zip = { path = "./crates/zip", version = "1.0.0-beta.12" }
+rustfs = { path = "./rustfs", version = "1.0.0-beta.11" }
+rustfs-heal = { path = "crates/heal", version = "1.0.0-beta.11" }
+rustfs-audit = { path = "crates/audit", version = "1.0.0-beta.11" }
+rustfs-checksums = { path = "crates/checksums", version = "1.0.0-beta.11" }
+rustfs-common = { path = "crates/common", version = "1.0.0-beta.11" }
+rustfs-data-usage = { path = "crates/data-usage", version = "1.0.0-beta.11" }
+rustfs-config = { path = "./crates/config", version = "1.0.0-beta.11" }
+rustfs-concurrency = { path = "./crates/concurrency", version = "1.0.0-beta.11" }
+rustfs-credentials = { path = "crates/credentials", version = "1.0.0-beta.11" }
+rustfs-crypto = { path = "crates/crypto", version = "1.0.0-beta.11" }
+rustfs-ecstore = { path = "crates/ecstore", version = "1.0.0-beta.11" }
+rustfs-filemeta = { path = "crates/filemeta", version = "1.0.0-beta.11" }
+rustfs-iam = { path = "crates/iam", version = "1.0.0-beta.11" }
+rustfs-keystone = { path = "crates/keystone", version = "1.0.0-beta.11" }
+rustfs-lifecycle = { path = "crates/lifecycle", version = "1.0.0-beta.11" }
+rustfs-kms = { path = "crates/kms", version = "1.0.0-beta.11" }
+rustfs-lock = { path = "crates/lock", version = "1.0.0-beta.11" }
+rustfs-madmin = { path = "crates/madmin", version = "1.0.0-beta.11" }
+rustfs-notify = { path = "crates/notify", version = "1.0.0-beta.11" }
+rustfs-io-metrics = { path = "crates/io-metrics", version = "1.0.0-beta.11" }
+rustfs-io-core = { path = "crates/io-core", version = "1.0.0-beta.11" }
+rustfs-object-capacity = { path = "crates/object-capacity", version = "1.0.0-beta.11" }
+rustfs-object-data-cache = { path = "crates/object-data-cache", version = "1.0.0-beta.11" }
+rustfs-log-analyzer = { path = "crates/log-analyzer", version = "1.0.0-beta.11" }
+rustfs-obs = { path = "crates/obs", version = "1.0.0-beta.11" }
+rustfs-policy = { path = "crates/policy", version = "1.0.0-beta.11" }
+rustfs-protos = { path = "crates/protos", version = "1.0.0-beta.11" }
+rustfs-protocols = { path = "crates/protocols", version = "1.0.0-beta.11" }
+rustfs-replication = { path = "crates/replication", version = "1.0.0-beta.11" }
+rustfs-rio = { path = "crates/rio", version = "1.0.0-beta.11" }
+rustfs-rio-v2 = { path = "crates/rio-v2", version = "1.0.0-beta.11" }
+rustfs-s3-types = { path = "crates/s3-types", version = "1.0.0-beta.11" }
+rustfs-s3-ops = { path = "crates/s3-ops", version = "1.0.0-beta.11" }
+rustfs-s3select-api = { path = "crates/s3select-api", version = "1.0.0-beta.11" }
+rustfs-s3select-query = { path = "crates/s3select-query", version = "1.0.0-beta.11" }
+rustfs-scanner = { path = "crates/scanner", version = "1.0.0-beta.11" }
+rustfs-security-governance = { path = "crates/security-governance", version = "1.0.0-beta.11" }
+rustfs-extension-schema = { path = "crates/extension-schema", version = "1.0.0-beta.11" }
+rustfs-signer = { path = "crates/signer", version = "1.0.0-beta.11" }
+rustfs-storage-api = { path = "crates/storage-api", version = "1.0.0-beta.11" }
+rustfs-trusted-proxies = { path = "crates/trusted-proxies", version = "1.0.0-beta.11" }
+rustfs-targets = { path = "crates/targets", version = "1.0.0-beta.11" }
+rustfs-test-utils = { path = "crates/test-utils", version = "1.0.0-beta.11" }
+rustfs-tls-runtime = { path = "crates/tls-runtime", version = "1.0.0-beta.11" }
+rustfs-utils = { path = "crates/utils", version = "1.0.0-beta.11" }
+rustfs-zip = { path = "./crates/zip", version = "1.0.0-beta.11" }

 # Async Runtime and Networking
 async-channel = "2.5.0"
 async_zip = { default-features = false, version = "0.0.18" }
 mysql_async = { default-features = false, version = "0.37" }
-async-compression = { version = "0.4.43" }
+async-compression = { version = "0.4.42" }
 async-recursion = "1.1.1"
 async-trait = "0.1.91"
 async-nats = { version = "0.50.0", default-features = false }
@@ -152,7 +152,7 @@ lapin = { default-features = false, version = "4.10.0" }
 hyper = { version = "1.11.0" }
 hyper-rustls = { default-features = false, version = "0.27.9" }
 hyper-util = { version = "0.1.20" }
-http = "1.5.0"
+http = "1.4.2"
 http-body = "1.1.0"
 http-body-util = "0.1.4"
 minlz = "1.2.3"
@@ -173,7 +173,7 @@ tower-http = { version = "0.7.0" }
 # Serialization and Data Formats
 apache-avro = "0.21.0"
 bytes = { version = "1.12.1" }
-bytesize = "2.6.0"
+bytesize = "2.4.2"
 byteorder = "1.5.0"
 flatbuffers = "25.12.19"
 form_urlencoded = "1.2.2"
@@ -200,7 +200,7 @@ jsonwebtoken = { version = "11.0.0" }
 openidconnect = { default-features = false, version = "4.0" }
 pbkdf2 = "0.13.0"
 rsa = { version = "=0.10.0-rc.18" }
-rustls = { default-features = false, version = "0.23.43" }
+rustls = { default-features = false, version = "0.23.42" }
 rustls-native-certs = "0.8"
 rustls-pki-types = "1.15.1"
 sha1 = "0.11.0"
@@ -227,7 +227,6 @@ atoi = "3.1.0"
 atomic_enum = "0.3.0"
 aws-config = { version = "1.10.1" }
 aws-credential-types = { version = "1.3.0" }
-aws-sdk-kms = { default-features = false, version = "1.114.0" }
 aws-sdk-s3 = { default-features = false, version = "1.140.0" }
 aws-sdk-sts = { default-features = false, version = "1.110.0" }
 aws-smithy-http-client = { default-features = false, version = "1.2.0" }
@@ -236,7 +235,7 @@ aws-smithy-types = { version = "1.6.1" }
 base64 = "0.23.0"
 base64-simd = "0.8.0"
 brotli = "8.0.4"
-clap = { version = "4.6.5" }
+clap = { version = "4.6.4" }
 const-str = { version = "1.1.0" }
 convert_case = "0.11.0"
 criterion = { version = "0.8" }
@@ -251,13 +250,12 @@ enumset = "1.1.14"
 faster-hex = "0.10.0"
 flate2 = "1.1.9"
 glob = "0.3.4"
-google-cloud-storage = "1.17.0"
-google-cloud-auth = "1.15.0"
+google-cloud-storage = "1.16.0"
+google-cloud-auth = "1.14.0"
 hashbrown = { version = "0.17.1" }
 hex = "0.4.3"
 hex-simd = "0.8.0"
 highway = { version = "1.3.0" }
-hostname = "0.4.2"
 ipnetwork = { version = "0.21.1" }
 lazy_static = "1.5.0"
 libc = "0.2.189"
@@ -285,8 +283,7 @@ reed-solomon-erasure = { package = "rustfs-erasure-codec", version = "8.0.2" }
 reed-solomon-simd = "3.1.0"
 regex = { version = "1.13.1" }
 rumqttc = { package = "rumqttc-next", version = "0.33.3" }
-redis = { version = "1.5.0" }
-rustify = { version = "0.7", default-features = false }
+redis = { version = "1.4.1" }
 rustix = { version = "1.1.4" }
 rust-embed = { version = "8.12.0" }
 rustc-hash = { version = "2.1.3" }
@@ -306,7 +303,6 @@ test-case = "3.3.1"
 thiserror = "2.0.19"
 tracing = { version = "0.1.44" }
 tracing-appender = "0.2.5"
-tracing-core = "0.1.36"
 tracing-error = "0.2.1"
 tracing-opentelemetry = { version = "0.33" }
 tracing-subscriber = { version = "0.3.23" }
@@ -317,9 +313,7 @@ uuid = { version = "1.24.0" }
 vaultrs = { version = "0.8.0" }
 tar = "0.4.46"
 walkdir = "2.5.0"
-winapi-util = "0.1.11"
 windows = { version = "0.62.2" }
-windows-sys = "0.61.2"
 xxhash-rust = { version = "0.8.18" }
 zip = "8.6.0"
 zstd = "0.13.3"
@@ -341,16 +335,15 @@ libunftp = { version = "0.23.0" }
 unftp-core = "0.1.0"
 suppaftp = { version = "10.0.1" }
 rcgen = { version = "0.14.8", default-features = false, features = ["aws_lc_rs", "crypto", "pem"] }
-russh = { version = "0.62.5" }
+russh = { version = "0.62.4" }
 russh-sftp = "2.3.0"

 # WebDAV
 dav-server = "0.11.0"

 # Performance Analysis and Memory Profiling
-mimalloc = { version = "0.1.52", git = "https://github.com/xonatius/mimalloc_rust.git", rev = "1cdadea43e9c5a0f054b65be21200ce580e4eb13" }
-libmimalloc-sys = { version = "0.1.49", git = "https://github.com/xonatius/mimalloc_rust.git", rev = "1cdadea43e9c5a0f054b65be21200ce580e4eb13", features = ["extended"] }
-hotpath = { version = "0.22.0", default-features = false }
+mimalloc = "0.1.52"
+hotpath = "0.22.0"
 # Snapshot testing for output format regression detection
 insta = { version = "1.48" }

@@ -116,7 +116,7 @@ chown -R 10001:10001 data logs
 docker run -d -p 9000:9000 -p 9001:9001 -v $(pwd)/data:/data -v $(pwd)/logs:/logs rustfs/rustfs:latest

 # Using specific version
-docker run -d -p 9000:9000 -p 9001:9001 -v $(pwd)/data:/data -v $(pwd)/logs:/logs rustfs/rustfs:1.0.0-beta.12
+docker run -d -p 9000:9000 -p 9001:9001 -v $(pwd)/data:/data -v $(pwd)/logs:/logs rustfs/rustfs:1.0.0-beta.11
 ```

 If you use [podman](https://github.com/containers/podman) instead of docker, you can install the RustFS with the below command
@@ -113,7 +113,7 @@ chown -R 10001:10001 data logs
 docker run -d -p 9000:9000 -p 9001:9001 -v $(pwd)/data:/data -v $(pwd)/logs:/logs rustfs/rustfs:latest

 # 使用指定版本运行
-docker run -d -p 9000:9000 -p 9001:9001 -v $(pwd)/data:/data -v $(pwd)/logs:/logs rustfs/rustfs:1.0.0-beta.12
+docker run -d -p 9000:9000 -p 9001:9001 -v $(pwd)/data:/data -v $(pwd)/logs:/logs rustfs/rustfs:1.0.0-beta.11
 ```

 如果您通过绑定挂载启用 TLS 证书目录，也请用同样方式准备该目录：
@@ -47,9 +47,6 @@ consts = "consts"
 Hashi = "Hashi"  # HashiCorp
 # Accept alternate spelling used in parser/XML comments.
 unparseable = "unparseable"
-# Disaster-recovery objectives: recovery time and recovery point.
-RTO = "RTO"
-rto = "rto"

 [files]
 extend-exclude = []
@@ -25,33 +25,7 @@ documentation = "https://docs.rs/rustfs-audit/latest/rustfs_audit/"
 keywords = ["audit", "target", "management", "fan-out", "RustFS"]
 categories = ["web-programming", "development-tools", "asynchronous", "api-bindings"]

-[features]
-default = []
-hotpath = [
-    "hotpath/hotpath",
-    "hotpath/tokio",
-    "hotpath/futures",
-    "rustfs-config/hotpath",
-    "rustfs-s3-types/hotpath",
-    "rustfs-targets/hotpath",
-]
-hotpath-alloc = [
-    "hotpath",
-    "hotpath/hotpath-alloc",
-    "rustfs-config/hotpath-alloc",
-    "rustfs-s3-types/hotpath-alloc",
-    "rustfs-targets/hotpath-alloc",
-]
-hotpath-cpu = [
-    "hotpath",
-    "hotpath/hotpath-cpu",
-    "rustfs-config/hotpath-cpu",
-    "rustfs-s3-types/hotpath-cpu",
-    "rustfs-targets/hotpath-cpu",
-]
-
 [dependencies]
-hotpath.workspace = true
 rustfs-targets = { workspace = true }
 rustfs-config = { workspace = true, features = ["audit", "server-config-model"] }
 rustfs-s3-types = { workspace = true }
@@ -28,14 +28,7 @@ documentation = "https://docs.rs/rustfs-checksums/latest/rustfs_checksum/"
 [lints]
 workspace = true

-[features]
-default = []
-hotpath = ["hotpath/hotpath"]
-hotpath-alloc = ["hotpath", "hotpath/hotpath-alloc"]
-hotpath-cpu = ["hotpath", "hotpath/hotpath-cpu"]
-
 [dependencies]
-hotpath.workspace = true
 bytes = { workspace = true, features = ["serde"] }
 crc-fast = { workspace = true }
 http = { workspace = true }
@@ -27,14 +27,7 @@ categories = ["web-programming", "development-tools", "data-structures"]
 [lints]
 workspace = true

-[features]
-default = []
-hotpath = ["hotpath/hotpath", "hotpath/tokio"]
-hotpath-alloc = ["hotpath", "hotpath/hotpath-alloc"]
-hotpath-cpu = ["hotpath", "hotpath/hotpath-cpu"]
-
 [dependencies]
-hotpath.workspace = true
 tokio = { workspace = true, features = ["fs", "rt-multi-thread"] }
 tonic = { workspace = true, features = ["gzip", "deflate"] }
 uuid = { workspace = true, features = ["v4", "fast-rng", "macro-diagnostics"] }
@@ -13,14 +13,7 @@ categories = ["concurrency", "filesystem"]
 [lints]
 workspace = true

-[features]
-default = []
-hotpath = ["hotpath/hotpath", "hotpath/tokio", "rustfs-io-core/hotpath"]
-hotpath-alloc = ["hotpath", "hotpath/hotpath-alloc", "rustfs-io-core/hotpath-alloc"]
-hotpath-cpu = ["hotpath", "hotpath/hotpath-cpu", "rustfs-io-core/hotpath-cpu"]
-
 [dependencies]
-hotpath.workspace = true
 # Internal crates
 rustfs-io-core = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
@@ -25,7 +25,6 @@ keywords = ["configuration", "settings", "management", "rustfs", "Minio"]
 categories = ["web-programming", "development-tools", "config"]

 [dependencies]
-hotpath.workspace = true
 const-str = { workspace = true, optional = true, features = ["std", "proc"] }
 serde = { workspace = true, optional = true, features = ["derive"] }
 serde_json = { workspace = true, optional = true, features = ["raw_value"] }
@@ -35,9 +34,6 @@ workspace = true

 [features]
 default = ["constants"]
-hotpath = ["hotpath/hotpath"]
-hotpath-alloc = ["hotpath", "hotpath/hotpath-alloc"]
-hotpath-cpu = ["hotpath", "hotpath/hotpath-cpu"]
 audit = ["dep:const-str", "constants"]
 constants = ["dep:const-str"]
 notify = ["dep:const-str", "constants"]
@@ -66,10 +66,6 @@ Current guidance:

 - `RUSTFS_BROWSER_REDIRECT_URL` sets the externally reachable browser origin used for OIDC callback, console success redirect, and logout fallback URLs. Configure it to the public scheme and authority without a path, for example `https://console.example.com`. In load-balancer deployments, keep OIDC authorize and callback requests on the same backend node because the in-flight OIDC `state` is local to the RustFS node.

-## Distributed endpoint locality
-
- `RUSTFS_LOCAL_ENDPOINT_HOST` identifies this server's host in a distributed `RUSTFS_VOLUMES` topology without resolving every peer during startup. Set it to exactly one host, without a scheme, port, or path. It is accepted only for orchestrated URL topologies and must match at least one endpoint on the RustFS server port; invalid or unmatched values fail startup. Leave it unset to retain DNS-based locality discovery.
-
 ## Scanner environment aliases

 - `RUSTFS_SCANNER_SPEED` (canonical, also accepts `MINIO_SCANNER_SPEED`)
@@ -131,10 +131,6 @@ pub const ENV_RUSTFS_ADDRESS: &str = "RUSTFS_ADDRESS";
 /// Environment variable for server volumes.
 pub const ENV_RUSTFS_VOLUMES: &str = "RUSTFS_VOLUMES";

-/// Environment variable identifying this server's host in distributed endpoint
-/// lists without relying on DNS locality discovery.
-pub const ENV_LOCAL_ENDPOINT_HOST: &str = "RUSTFS_LOCAL_ENDPOINT_HOST";
-
 /// Environment variable to explicitly bypass local physical disk independence checks.
 pub const ENV_UNSAFE_BYPASS_DISK_CHECK: &str = "RUSTFS_UNSAFE_BYPASS_DISK_CHECK";

@@ -230,19 +226,6 @@ pub const ENV_RUSTFS_KMS_ENABLE: &str = "RUSTFS_KMS_ENABLE";
 /// Default value: false
 pub const DEFAULT_KMS_ENABLE: bool = false;

-/// Environment variable enabling per-key KMS authorization on the SSE-KMS data path.
-///
-/// When enabled, an SSE-KMS write additionally requires `kms:GenerateDataKey` and an
-/// SSE-KMS read additionally requires `kms:Decrypt` on the resolved key, evaluated as
-/// the requesting identity. SSE-S3 and SSE-C are unaffected.
-pub const ENV_RUSTFS_KMS_ENFORCE_SSE_KEY_POLICY: &str = "RUSTFS_KMS_ENFORCE_SSE_KEY_POLICY";
-
-/// Default per-key KMS authorization mode for the SSE-KMS data path.
-///
-/// Off for now so deployments whose identity policies only grant s3 actions keep
-/// working; the default flips to on in a later release.
-pub const DEFAULT_KMS_ENFORCE_SSE_KEY_POLICY: bool = false;
-
 /// Environment variable for server KMS backend.
 pub const ENV_RUSTFS_KMS_BACKEND: &str = "RUSTFS_KMS_BACKEND";

@@ -158,33 +158,17 @@ pub const DEFAULT_INTERNODE_RPC_BODY_DIGEST_STRICT: bool = false;
 // rolling upgrades until the fleet-wide body-digest fallback counter reads zero.
 const _: () = assert!(!DEFAULT_INTERNODE_RPC_BODY_DIGEST_STRICT);

-/// Require the replay-scoped internode RPC signature after the fleet has converged on it.
-///
-/// The default keeps v1/v2 peers available during a rolling upgrade. Operators may set this only
-/// after `rustfs_system_network_internode_replay_scope_fallback_total` remains zero for a full
-/// release window. The node still accepts a v2-authenticated `Ping` carrying an epoch challenge:
-/// that narrowly scoped bootstrap lets an upgraded client learn the receiving process epoch and
-/// immediately retry with the replay-scoped signature after a peer restart.
-pub const ENV_INTERNODE_RPC_REPLAY_SCOPE_STRICT: &str = "RUSTFS_INTERNODE_RPC_REPLAY_SCOPE_STRICT";
-pub const DEFAULT_INTERNODE_RPC_REPLAY_SCOPE_STRICT: bool = false;
-
-// Compile-time invariant: mixed-version clusters must remain available until operators make the
-// observed fallback counter an explicit strictness decision.
-const _: () = assert!(!DEFAULT_INTERNODE_RPC_REPLAY_SCOPE_STRICT);
-
 /// Capacity (distinct nonces) of the process-local internode RPC replay cache that enforces
-/// one-time consumption of authenticated RPC signatures.
+/// one-time consumption of body-bound v2 signatures.
 ///
-/// The cache retains each nonce for the ~10-minute signature freshness envelope. Once peers use
-/// replay-scoped v3 authentication, every authenticated RPC consumes one entry, so the steady
-/// state holds roughly `authenticated RPC RPS x 601s` entries. The default sustains about 1,700
-/// authenticated RPCs per second (about 120 MiB worst case, allocated only under sustained load);
-/// operators must size it for the node's aggregate peak RPC rate before enabling strict replay
-/// scope. Overflow fails closed — legitimate signed traffic is the only thing that can fill the
-/// cache (replays are rejected before insertion, and an attacker cannot mint valid nonces without
-/// the shared secret) — and increments
+/// The cache retains each nonce for the ~10-minute signature freshness envelope, so the steady
+/// state holds roughly `mutating RPS x 601s` entries; the default sustains ~1,700 body-bound
+/// mutating RPCs per second (about 120 MiB worst case, allocated only under sustained load).
+/// Overflow fails closed — legitimate signed traffic is the only thing that can fill the cache
+/// (replays are rejected before insertion, and an attacker cannot mint valid nonces without the
+/// shared secret) — and increments
 /// `rustfs_system_network_internode_replay_cache_overflow_total`, so a sustained non-zero overflow
-/// counter means this capacity is undersized for the node's peak authenticated RPC rate.
+/// counter means this capacity is undersized for the node's peak mutation rate.
 pub const ENV_INTERNODE_RPC_REPLAY_CACHE_CAPACITY: &str = "RUSTFS_INTERNODE_RPC_REPLAY_CACHE_CAPACITY";
 pub const DEFAULT_INTERNODE_RPC_REPLAY_CACHE_CAPACITY: usize = 1_048_576;

@@ -370,12 +354,6 @@ mod tests {
        assert_eq!(ENV_INTERNODE_RPC_BODY_DIGEST_STRICT, "RUSTFS_INTERNODE_RPC_BODY_DIGEST_STRICT");
    }

-    #[test]
-    fn internode_replay_scope_strict_env_name_is_stable() {
-        // The fail-open default invariant is asserted at compile time next to the definition.
-        assert_eq!(ENV_INTERNODE_RPC_REPLAY_SCOPE_STRICT, "RUSTFS_INTERNODE_RPC_REPLAY_SCOPE_STRICT");
-    }
-
    #[test]
    fn internode_replay_cache_capacity_defaults_and_env_name() {
        assert_eq!(ENV_INTERNODE_RPC_REPLAY_CACHE_CAPACITY, "RUSTFS_INTERNODE_RPC_REPLAY_CACHE_CAPACITY");
@@ -24,14 +24,7 @@ description = "Credentials management utilities for RustFS, enabling secure hand
 keywords = ["rustfs", "Minio", "credentials", "authentication", "authorization"]
 categories = ["web-programming", "development-tools", "data-structures", "security"]

-[features]
-default = []
-hotpath = ["hotpath/hotpath"]
-hotpath-alloc = ["hotpath", "hotpath/hotpath-alloc"]
-hotpath-cpu = ["hotpath", "hotpath/hotpath-cpu"]
-
 [dependencies]
-hotpath.workspace = true
 base64-simd = { workspace = true }
 hmac = { workspace = true }
 rand = { workspace = true, features = ["serde"] }
@@ -29,7 +29,6 @@ documentation = "https://docs.rs/rustfs-crypto/latest/rustfs_crypto/"
 workspace = true

 [dependencies]
-hotpath.workspace = true
 aes-gcm = { workspace = true, optional = true, features = ["rand_core"] }
 argon2 = { workspace = true, optional = true }
 chacha20poly1305 = { workspace = true, optional = true }
@@ -50,9 +49,6 @@ time = { workspace = true, features = ["parsing", "formatting", "macros", "serde

 [features]
 default = ["crypto", "fips"]
-hotpath = ["hotpath/hotpath"]
-hotpath-alloc = ["hotpath", "hotpath/hotpath-alloc"]
-hotpath-cpu = ["hotpath", "hotpath/hotpath-cpu"]
 fips = []
 crypto = [
    "dep:aes-gcm",
@@ -27,15 +27,9 @@ categories = ["data-structures", "filesystem"]
 [lints]
 workspace = true

-[features]
-default = []
-hotpath = ["hotpath/hotpath", "rustfs-filemeta/hotpath"]
-hotpath-alloc = ["hotpath", "hotpath/hotpath-alloc", "rustfs-filemeta/hotpath-alloc"]
-hotpath-cpu = ["hotpath", "hotpath/hotpath-cpu", "rustfs-filemeta/hotpath-cpu"]
-
 [dependencies]
-hotpath.workspace = true
 serde = { workspace = true, features = ["derive"] }
+path-clean = { workspace = true }
 rmp-serde = { workspace = true }
 async-trait = { workspace = true }
 rustfs-filemeta = { workspace = true }
@@ -12,10 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

+use path_clean::PathClean;
 use serde::{Deserialize, Serialize};
 use std::{
    collections::{HashMap, HashSet},
    hash::{DefaultHasher, Hash, Hasher},
+    path::Path,
    time::{Duration, SystemTime},
 };

@@ -332,7 +334,7 @@ impl<'de> Deserialize<'de> for SizeHistogram {
 impl SizeHistogram {
    pub fn add(&mut self, size: u64) {
        let intervals = [
-            (0, 1024 - 1),                              // LESS_THAN_1024_B
+            (0, 1024),                                  // LESS_THAN_1024_B
            (1024, 64 * 1024 - 1),                      // BETWEEN_1024_B_AND_64_KB
            (64 * 1024, 256 * 1024 - 1),                // BETWEEN_64_KB_AND_256_KB
            (256 * 1024, 512 * 1024 - 1),               // BETWEEN_256_KB_AND_512_KB
@@ -360,7 +362,7 @@ impl SizeHistogram {
        // the sub-ranges in [1 KiB, 512 KiB).
        const ONE_MIB: u64 = 1024 * 1024;
        let intervals = [
-            (0, 1024 - 1),                      // LESS_THAN_1024_B
+            (0, 1024),                          // LESS_THAN_1024_B
            (1024, 64 * 1024 - 1),              // BETWEEN_1024_B_AND_64_KB
            (64 * 1024, 256 * 1024 - 1),        // BETWEEN_64_KB_AND_256_KB
            (256 * 1024, 512 * 1024 - 1),       // BETWEEN_256_KB_AND_512_KB
@@ -1108,39 +1110,9 @@ fn mark(duc: &DataUsageCache, entry: &DataUsageEntry, found: &mut HashSet<String
    }
 }

-fn clean_data_usage_path(data: &str) -> String {
-    let rooted = data.starts_with('/');
-    let mut parts = Vec::new();
-
-    for part in data.split('/') {
-        match part {
-            "" | "." => {}
-            ".." => {
-                if parts.last().is_some_and(|last| *last != "..") {
-                    parts.pop();
-                } else if !rooted {
-                    parts.push(part);
-                }
-            }
-            _ => parts.push(part),
-        }
-    }
-
-    let clean = parts.join("/");
-    match (rooted, clean.is_empty()) {
-        (true, true) => "/".to_string(),
-        (true, false) => format!("/{clean}"),
-        (false, true) => ".".to_string(),
-        (false, false) => clean,
-    }
-}
-
-/// Hash a slash-separated path for data usage caching.
-///
-/// Cache identifiers are persisted and exchanged across nodes, so their
-/// normalization must not depend on the host operating system.
+/// Hash a path for data usage caching
 pub fn hash_path(data: &str) -> DataUsageHash {
-    DataUsageHash(clean_data_usage_path(data))
+    DataUsageHash(Path::new(&data).clean().to_string_lossy().to_string())
 }

 impl DataUsageInfo {
@@ -1525,23 +1497,6 @@ mod tests {
        buckets_count: u64,
    }

-    #[test]
-    fn hash_path_uses_portable_slash_semantics() {
-        for (input, expected) in [
-            ("", "."),
-            (".", "."),
-            ("/", "/"),
-            ("//bucket///prefix/", "/bucket/prefix"),
-            ("bucket/./prefix//object", "bucket/prefix/object"),
-            ("bucket/a/../b", "bucket/b"),
-            ("../bucket/..", ".."),
-            ("/../../bucket", "/bucket"),
-            ("bucket\\prefix/object", "bucket\\prefix/object"),
-        ] {
-            assert_eq!(hash_path(input).key(), expected, "unexpected portable cache key for {input:?}");
-        }
-    }
-
    #[test]
    fn completeness_marker_is_additive_for_legacy_named_readers() {
        let current = DataUsageInfo {
@@ -1646,49 +1601,6 @@ mod tests {
        assert_eq!(map["BETWEEN_512_KB_AND_1_MB"], 1);
    }

-    #[test]
-    fn test_size_histogram_classifies_adjacent_boundaries_once() {
-        let cases = [
-            (1023, 0),
-            (1024, 1),
-            (64 * 1024 - 1, 1),
-            (64 * 1024, 2),
-            (256 * 1024 - 1, 2),
-            (256 * 1024, 3),
-            (512 * 1024 - 1, 3),
-            (512 * 1024, 4),
-            (1024 * 1024 - 1, 4),
-            (1024 * 1024, 6),
-            (10 * 1024 * 1024 - 1, 6),
-            (10 * 1024 * 1024, 7),
-            (64 * 1024 * 1024 - 1, 7),
-            (64 * 1024 * 1024, 8),
-            (128 * 1024 * 1024 - 1, 8),
-            (128 * 1024 * 1024, 9),
-            (512 * 1024 * 1024 - 1, 9),
-            (512 * 1024 * 1024, 10),
-        ];
-
-        for (size, expected_bucket) in cases {
-            let mut hist = SizeHistogram::default();
-            hist.add(size);
-
-            assert_eq!(hist.0.iter().sum::<u64>(), 1, "size {size} must have exactly one physical bucket");
-            assert_eq!(hist.0[expected_bucket], 1, "size {size} must select the expected bucket");
-        }
-    }
-
-    #[test]
-    fn test_size_histogram_1024_bytes_contributes_to_compat_rollup() {
-        let mut hist = SizeHistogram::default();
-        hist.add(1024);
-
-        let map = hist.to_map();
-        assert_eq!(map["LESS_THAN_1024_B"], 0);
-        assert_eq!(map["BETWEEN_1024_B_AND_64_KB"], 1);
-        assert_eq!(map["BETWEEN_1024B_AND_1_MB"], 1);
-    }
-
    #[test]
    fn test_size_histogram_compat_rollup_saturates_on_corrupt_counts() {
        let mut hist = SizeHistogram::default();
@@ -25,58 +25,10 @@ workspace = true

 [features]
 default = []
-hotpath = [
-    "hotpath/hotpath",
-    "hotpath/tokio",
-    "hotpath/futures",
-    "hotpath/reqwest-0-13",
-    "rustfs-config/hotpath",
-    "rustfs-credentials/hotpath",
-    "rustfs-data-usage/hotpath",
-    "rustfs-ecstore/hotpath",
-    "rustfs-filemeta/hotpath",
-    "rustfs-lock/hotpath",
-    "rustfs-madmin/hotpath",
-    "rustfs-protos/hotpath",
-    "rustfs-rio/hotpath",
-    "rustfs-signer/hotpath",
-    "rustfs-utils/hotpath",
-]
-hotpath-alloc = [
-    "hotpath",
-    "hotpath/hotpath-alloc",
-    "rustfs-config/hotpath-alloc",
-    "rustfs-credentials/hotpath-alloc",
-    "rustfs-data-usage/hotpath-alloc",
-    "rustfs-ecstore/hotpath-alloc",
-    "rustfs-filemeta/hotpath-alloc",
-    "rustfs-lock/hotpath-alloc",
-    "rustfs-madmin/hotpath-alloc",
-    "rustfs-protos/hotpath-alloc",
-    "rustfs-rio/hotpath-alloc",
-    "rustfs-signer/hotpath-alloc",
-    "rustfs-utils/hotpath-alloc",
-]
-hotpath-cpu = [
-    "hotpath",
-    "hotpath/hotpath-cpu",
-    "rustfs-config/hotpath-cpu",
-    "rustfs-credentials/hotpath-cpu",
-    "rustfs-data-usage/hotpath-cpu",
-    "rustfs-ecstore/hotpath-cpu",
-    "rustfs-filemeta/hotpath-cpu",
-    "rustfs-lock/hotpath-cpu",
-    "rustfs-madmin/hotpath-cpu",
-    "rustfs-protos/hotpath-cpu",
-    "rustfs-rio/hotpath-cpu",
-    "rustfs-signer/hotpath-cpu",
-    "rustfs-utils/hotpath-cpu",
-]
 ftps = []
 sftp = []

 [dependencies]
-hotpath.workspace = true
 rustfs-config = { workspace = true, features = ["constants"] }
 rustfs-credentials.workspace = true
 rustfs-ecstore.workspace = true
@@ -26,16 +26,75 @@
 //! Later batches tracked on backlog#1154: config get/set, info, pools status,
 //! group lifecycle, import/export IAM.

-use crate::common::{RustFSTestEnvironment, admin_ok, admin_request, init_logging};
+use crate::common::{RustFSTestEnvironment, init_logging, local_http_client};
 use aws_sdk_s3::config::{Credentials, Region};
 use aws_sdk_s3::primitives::ByteStream;
 use aws_sdk_s3::{Client, Config};
+use http::header::{CONTENT_TYPE, HOST};
 use reqwest::StatusCode;
+use rustfs_signer::constants::UNSIGNED_PAYLOAD;
+use rustfs_signer::sign_v4;
+use s3s::Body;
 use serial_test::serial;
 use std::error::Error;
 use tokio::time::{Duration, sleep};

 type TestResult = Result<(), Box<dyn Error + Send + Sync>>;
+type BoxError = Box<dyn Error + Send + Sync>;
+
+/// Signs and sends an admin HTTP request with the given credential, returning
+/// status and body. Native `/rustfs/admin/v3` requests and responses are plain
+/// JSON (the MinIO-compat encryption applies only to `/minio/admin/v3` paths).
+async fn admin_request(
+    base_url: &str,
+    method: http::Method,
+    path_and_query: &str,
+    body: Option<String>,
+    access_key: &str,
+    secret_key: &str,
+) -> Result<(StatusCode, String), BoxError> {
+    let url = format!("{base_url}{path_and_query}");
+    let uri = url.parse::<http::Uri>()?;
+    let authority = uri.authority().ok_or("admin URL missing authority")?.to_string();
+    let mut builder = http::Request::builder()
+        .method(method.clone())
+        .uri(uri)
+        .header(HOST, authority)
+        .header("x-amz-content-sha256", UNSIGNED_PAYLOAD);
+    if body.is_some() {
+        builder = builder.header(CONTENT_TYPE, "application/json");
+    }
+
+    let content_len = body.as_ref().map(|b| b.len() as i64).unwrap_or_default();
+    let signed = sign_v4(builder.body(Body::empty())?, content_len, access_key, secret_key, "", "us-east-1");
+
+    let reqwest_method = reqwest::Method::from_bytes(method.as_str().as_bytes())?;
+    let mut request = local_http_client().request(reqwest_method, &url);
+    for (name, value) in signed.headers() {
+        request = request.header(name, value);
+    }
+    if let Some(body) = body {
+        request = request.body(body);
+    }
+    let response = request.send().await?;
+    let status = response.status();
+    let text = response.text().await.unwrap_or_default();
+    Ok((status, text))
+}
+
+/// Root-credential admin request that must succeed; returns the response body.
+async fn admin_ok(
+    env: &RustFSTestEnvironment,
+    method: http::Method,
+    path_and_query: &str,
+    body: Option<String>,
+) -> Result<String, BoxError> {
+    let (status, text) = admin_request(&env.url, method.clone(), path_and_query, body, &env.access_key, &env.secret_key).await?;
+    if !status.is_success() {
+        return Err(format!("{method} {path_and_query} failed: {status} {text}").into());
+    }
+    Ok(text)
+}

 fn build_s3_client(url: &str, access_key: &str, secret_key: &str) -> Client {
    let config = Config::builder()
@@ -24,12 +24,7 @@
 use aws_sdk_s3::config::{Credentials, Region};
 use aws_sdk_s3::{Client, Config};
 use aws_smithy_http_client::Builder as SmithyHttpClientBuilder;
-use http::header::{CONTENT_TYPE, HOST};
 use reqwest::Client as HttpClient;
-use reqwest::StatusCode;
-use rustfs_signer::constants::UNSIGNED_PAYLOAD;
-use rustfs_signer::sign_v4;
-use s3s::Body;
 use std::ffi::OsStr;
 use std::fs as stdfs;
 use std::path::{Path, PathBuf};
@@ -80,58 +75,6 @@ pub fn local_http_client() -> HttpClient {
        .expect("failed to build local reqwest client")
 }

-/// Signs and sends an admin HTTP request with the given credentials.
-pub(crate) async fn admin_request(
-    base_url: &str,
-    method: http::Method,
-    path_and_query: &str,
-    body: Option<String>,
-    access_key: &str,
-    secret_key: &str,
-) -> Result<(StatusCode, String), Box<dyn std::error::Error + Send + Sync>> {
-    let url = format!("{base_url}{path_and_query}");
-    let uri = url.parse::<http::Uri>()?;
-    let authority = uri.authority().ok_or("admin URL missing authority")?.to_string();
-    let mut request = http::Request::builder()
-        .method(method.clone())
-        .uri(uri)
-        .header(HOST, authority)
-        .header("x-amz-content-sha256", UNSIGNED_PAYLOAD);
-    if body.is_some() {
-        request = request.header(CONTENT_TYPE, "application/json");
-    }
-
-    let content_length = i64::try_from(body.as_ref().map_or(0, String::len)).map_err(|_| "admin request body is too large")?;
-    let signed = sign_v4(request.body(Body::empty())?, content_length, access_key, secret_key, "", "us-east-1");
-
-    let mut request = local_http_client().request(method, &url);
-    for (name, value) in signed.headers() {
-        request = request.header(name, value);
-    }
-    if let Some(body) = body {
-        request = request.body(body);
-    }
-    let response = request.send().await?;
-    let status = response.status();
-    let body = response.text().await?;
-    Ok((status, body))
-}
-
-/// Sends a root-credential admin request and returns its successful response body.
-pub(crate) async fn admin_ok(
-    env: &RustFSTestEnvironment,
-    method: http::Method,
-    path_and_query: &str,
-    body: Option<String>,
-) -> Result<String, Box<dyn std::error::Error + Send + Sync>> {
-    let (status, response_body) =
-        admin_request(&env.url, method.clone(), path_and_query, body, &env.access_key, &env.secret_key).await?;
-    if !status.is_success() {
-        return Err(format!("{method} {path_and_query} failed: {status} {response_body}").into());
-    }
-    Ok(response_body)
-}
-
 /// Resolve the RustFS binary relative to the workspace.
 pub fn rustfs_binary_path() -> PathBuf {
    rustfs_binary_path_with_features(requested_rustfs_build_features().as_deref())
@@ -117,14 +117,9 @@ mod tests {
            .key("assets/explicit-copy.js")
            .copy_source(format!("{bucket}/{key}"))
            .metadata_directive(MetadataDirective::Copy)
-            .customize()
-            .mutate_request(|request| {
-                request.headers_mut().insert("content-type", "application/octet-stream");
-                request.headers_mut().insert("x-amz-meta-request-only", "ignored");
-            })
            .send()
            .await
-            .expect("explicit COPY directive with request metadata failed");
+            .expect("explicit COPY directive failed");
        let explicit_copy_head = client
            .head_object()
            .bucket(bucket)
@@ -133,18 +128,6 @@ mod tests {
            .await
            .expect("HEAD failed after explicit COPY");
        assert_eq!(explicit_copy_head.cache_control(), Some("max-age=60"));
-        assert_eq!(explicit_copy_head.content_type(), Some("text/javascript; charset=utf-8"));
-        assert_eq!(
-            explicit_copy_head.metadata().and_then(|metadata| metadata.get("mtime")),
-            Some(&"1777992333".to_string())
-        );
-        assert_eq!(
-            explicit_copy_head
-                .metadata()
-                .and_then(|metadata| metadata.get("request-only")),
-            None,
-            "COPY must ignore request metadata"
-        );
        assert_eq!(
            explicit_copy_head.website_redirect_location(),
            None,
@@ -588,6 +571,20 @@ mod tests {
            Some("InvalidArgument")
        );

+        let ignored_replacement = client
+            .copy_object()
+            .bucket(bucket)
+            .key(key)
+            .copy_source(format!("{bucket}/{key}"))
+            .content_type("application/ignored")
+            .send()
+            .await
+            .expect_err("Replacement fields without REPLACE should be rejected");
+        assert_eq!(
+            ignored_replacement.as_service_error().and_then(|error| error.code()),
+            Some("InvalidRequest")
+        );
+
        let unchanged = client
            .get_object()
            .bucket(bucket)
@@ -56,21 +56,6 @@ mod tests {
        );
    }

-    async fn assert_current_list_hides_delete_marker(client: &Client, bucket: &str, key: &str) {
-        let listed = client
-            .list_objects_v2()
-            .bucket(bucket)
-            .prefix(key)
-            .send()
-            .await
-            .expect("list current objects after delete marker");
-
-        assert!(
-            listed.contents().iter().all(|object| object.key() != Some(key)),
-            "ListObjectsV2 must hide an object whose latest version is a delete marker"
-        );
-    }
-
    #[tokio::test]
    #[serial]
    async fn test_versioning_only_delete_marker_has_minio_compatible_visibility_for_migration_proof() {
@@ -109,7 +94,6 @@ mod tests {
        assert_eq!(markers[0].version_id(), Some(delete_marker_version_id));
        assert_eq!(markers[0].is_latest(), Some(true));
        assert_current_get_is_delete_marker_not_found(&client, bucket, key).await;
-        assert_current_list_hides_delete_marker(&client, bucket, key).await;
    }

    #[tokio::test]
@@ -134,17 +118,6 @@ mod tests {
            .await
            .expect("put historical version");
        let data_version_id = put.version_id().expect("put should return data version id");
-        let listed_before_delete = client
-            .list_objects_v2()
-            .bucket(bucket)
-            .prefix(key)
-            .send()
-            .await
-            .expect("list current object before creating delete marker");
-        assert!(
-            listed_before_delete.contents().iter().any(|object| object.key() == Some(key)),
-            "ListObjectsV2 must include the current object before it is deleted"
-        );

        let delete_marker = client
            .delete_object()
@@ -172,7 +145,6 @@ mod tests {
        assert_eq!(markers[0].version_id(), Some(delete_marker_version_id));
        assert_eq!(markers[0].is_latest(), Some(true));
        assert_current_get_is_delete_marker_not_found(&client, bucket, key).await;
-        assert_current_list_hides_delete_marker(&client, bucket, key).await;

        let historical = client
            .get_object()
@@ -2136,20 +2136,11 @@ async fn four_node_manual_transition_distributed_admission_conflict_reports_stat
    assert_eq!(terminal["bucket"].as_str(), Some(bucket.as_str()));
    assert_eq!(terminal["prefix"].as_str(), Some(prefix));
    assert_eq!(terminal["dry_run"].as_bool(), Some(false));
-    let terminal_status = terminal["status"].as_str();
-    assert!(
-        matches!(terminal_status, Some("partial" | "unknown")),
+    assert_eq!(
+        terminal["status"].as_str(),
+        Some("partial"),
        "small transition queue should surface terminal backpressure: {terminal}"
    );
-    if terminal_status == Some("unknown") {
-        let failure_reason = terminal["failure_reason"]
-            .as_str()
-            .ok_or_else(|| format!("unknown terminal status omitted failure_reason: {terminal}"))?;
-        assert!(
-            failure_reason.contains("worker result was not persisted before the transition queue drained"),
-            "unknown terminal status should identify lost worker-result persistence: {terminal}"
-        );
-    }
    let skipped_queue_full = terminal["report"]["skipped_queue_full"]
        .as_u64()
        .ok_or_else(|| format!("terminal status omitted report.skipped_queue_full: {terminal}"))?;
@@ -13,9 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-//! Cross-process replay / tamper acceptance for internode NodeService RPC
-//! signatures (<https://github.com/rustfs/backlog/issues/1327>,
-//! <https://github.com/rustfs/backlog/issues/1542>).
+//! Cross-process replay / tamper acceptance for the internode NodeService v2 RPC
+//! signature (<https://github.com/rustfs/backlog/issues/1327>).
 //!
 //! # Why this exists on top of the in-process tests
 //!
@@ -79,8 +78,6 @@
 //! | mixed version: legacy-only still served, not blocked | [`legacy_only_signature_is_accepted_in_default_posture`] |
 //! | strict flip closes the signature downgrade | [`signature_strict_rejects_legacy_only_downgrade`] |
 //! | strict flip closes the body-digest downgrade, incl. v1 | [`body_digest_strict_rejects_digestless_mutation`] |
-//! | replay scope binds every RPC and rejects restart replay | [`replay_scope_rejects_replay_path_transplant_and_stale_epoch_e2e`] |
-//! | strict replay scope allows only Ping bootstrap before v3 | [`replay_scope_strict_requires_v3_after_ping_bootstrap_e2e`] |
 //!
 //! Two acceptance items are deliberately left to the in-process tests. A stale
 //! timestamp cannot be forged from outside — it is inside the HMAC — so
@@ -91,20 +88,18 @@

 use crate::common::{RustFSTestEnvironment, init_logging};
 use crate::storage_api::internode_rpc_signature::{
-    TONIC_RPC_PREFIX, gen_signature_headers, gen_tonic_replay_scope_headers, gen_tonic_signature_headers,
-    node_service_time_out_client_no_auth, verify_tonic_boot_epoch_response,
+    TONIC_RPC_PREFIX, gen_signature_headers, gen_tonic_signature_headers, node_service_time_out_client_no_auth,
 };
 use http::{HeaderMap, Method};
 use rustfs_config::{
-    ENV_INTERNODE_RPC_BODY_DIGEST_STRICT, ENV_INTERNODE_RPC_REPLAY_CACHE_CAPACITY, ENV_INTERNODE_RPC_REPLAY_SCOPE_STRICT,
-    ENV_INTERNODE_RPC_SIGNATURE_STRICT,
+    ENV_INTERNODE_RPC_BODY_DIGEST_STRICT, ENV_INTERNODE_RPC_REPLAY_CACHE_CAPACITY, ENV_INTERNODE_RPC_SIGNATURE_STRICT,
 };
 use rustfs_protos::canonical_make_volume_request_body;
-use rustfs_protos::proto_gen::node_service::{MakeVolumeRequest, MakeVolumeResponse, PingRequest, PingResponse};
+use rustfs_protos::proto_gen::node_service::{MakeVolumeRequest, MakeVolumeResponse};
 use serial_test::serial;
 use sha2::{Digest, Sha256};
 use std::error::Error;
-use tonic::{Code, Request, Response, Status};
+use tonic::{Code, Request, Status};
 use uuid::Uuid;

 type TestResult = Result<(), Box<dyn Error + Send + Sync>>;
@@ -120,14 +115,12 @@ const TEST_RPC_SECRET: &str = "rustfs-internode-signature-e2e-secret";
 /// clears authentication stops harmlessly at `find_disk`.
 const ABSENT_DISK: &str = "/nonexistent/rustfs-signature-e2e-disk";

-/// Wire names of the v2 and replay-scope headers these black-box tests edit. They are
-/// `pub(crate)` in ecstore, so they are repeated here rather than imported.
-/// [`overwrite_header`] asserts the header it replaces was actually present, which turns a
-/// rename into a loud failure instead of silently reducing an attack to a no-op.
+/// Wire names of the two v2 headers these tests edit. They are `pub(crate)` in
+/// ecstore, so they are repeated here rather than imported — [`overwrite_header`]
+/// asserts the header it replaces was actually present, which turns a rename
+/// into a loud failure instead of silently reducing an attack to a no-op.
 const CONTENT_SHA256_HEADER: &str = "x-rustfs-content-sha256";
 const NONCE_HEADER: &str = "x-rustfs-rpc-nonce";
-const TIMESTAMP_HEADER: &str = "x-rustfs-timestamp";
-const BOOT_EPOCH_CHALLENGE_HEADER: &str = "x-rustfs-rpc-boot-epoch-challenge";

 /// gRPC service name carried in the signed scope, i.e. `TONIC_RPC_PREFIX`
 /// without its leading `/`.
@@ -162,28 +155,19 @@ fn align_rpc_secret_with_server() {
 ///
 /// Uses the no-cleanup spawn so a `pkill` pattern cannot reap servers belonging
 /// to other tests running in the same binary.
-fn server_env(extra_env: &[(&'static str, &'static str)]) -> Vec<(&'static str, &'static str)> {
+async fn start_server(extra_env: &[(&str, &str)]) -> Result<RustFSTestEnvironment, Box<dyn Error + Send + Sync>> {
+    let mut env = RustFSTestEnvironment::new().await?;
    let mut child_env = vec![
        ("RUSTFS_RPC_SECRET", TEST_RPC_SECRET),
        (ENV_INTERNODE_RPC_SIGNATURE_STRICT, "false"),
        (ENV_INTERNODE_RPC_BODY_DIGEST_STRICT, "false"),
-        (ENV_INTERNODE_RPC_REPLAY_SCOPE_STRICT, "false"),
        (ENV_INTERNODE_RPC_REPLAY_CACHE_CAPACITY, "1048576"),
    ];
    child_env.extend_from_slice(extra_env);
-    child_env
-}
-
-async fn start_server_with_env(child_env: &[(&str, &str)]) -> Result<RustFSTestEnvironment, Box<dyn Error + Send + Sync>> {
-    let mut env = RustFSTestEnvironment::new().await?;
-    env.start_rustfs_server_without_cleanup_with_env(child_env).await?;
+    env.start_rustfs_server_without_cleanup_with_env(&child_env).await?;
    Ok(env)
 }

-async fn start_server(extra_env: &[(&'static str, &'static str)]) -> Result<RustFSTestEnvironment, Box<dyn Error + Send + Sync>> {
-    start_server_with_env(&server_env(extra_env)).await
-}
-
 /// Stop the child and drop the cached gRPC channel for its address.
 ///
 /// `node_service_time_out_client_no_auth` memoises channels in a process-global
@@ -254,83 +238,12 @@ fn overwrite_header(headers: &mut HeaderMap, name: &'static str, value: &str) {
 /// and nothing else — no interceptor adds or rewrites auth metadata, so the
 /// bytes on the wire are the ones the test chose.
 async fn call_make_volume(url: &str, request: MakeVolumeRequest, headers: HeaderMap) -> Result<MakeVolumeResponse, Status> {
-    call_make_volume_response(url, request, headers)
-        .await
-        .map(Response::into_inner)
-}
-
-async fn call_make_volume_response(
-    url: &str,
-    request: MakeVolumeRequest,
-    headers: HeaderMap,
-) -> Result<Response<MakeVolumeResponse>, Status> {
    let mut client = node_service_time_out_client_no_auth(&url.to_string())
        .await
        .map_err(|err| Status::unavailable(format!("cannot reach the node service: {err}")))?;
    let mut rpc_request = Request::new(request);
    rpc_request.metadata_mut().as_mut().extend(headers);
-    client.make_volume(rpc_request).await
-}
-
-async fn call_ping_response(url: &str, headers: HeaderMap) -> Result<Response<PingResponse>, Status> {
-    let mut client = node_service_time_out_client_no_auth(&url.to_string())
-        .await
-        .map_err(|err| Status::unavailable(format!("cannot reach the node service: {err}")))?;
-    let mut rpc_request = Request::new(PingRequest {
-        version: 1,
-        body: bytes::Bytes::new(),
-    });
-    rpc_request.metadata_mut().as_mut().extend(headers);
-    client.ping(rpc_request).await
-}
-
-fn attach_boot_epoch_challenge(headers: &mut HeaderMap) -> Uuid {
-    let challenge = Uuid::new_v4();
-    headers.insert(
-        BOOT_EPOCH_CHALLENGE_HEADER,
-        challenge.to_string().parse().expect("UUID must be a valid header value"),
-    );
-    challenge
-}
-
-fn mint_replay_scope_headers(audience: &str, path: &str, content_sha256: &str, boot_epoch: Uuid) -> HeaderMap {
-    let mut headers = mint_v2_headers(audience, "MakeVolume", Some(content_sha256));
-    let timestamp = headers
-        .get(TIMESTAMP_HEADER)
-        .and_then(|value| value.to_str().ok())
-        .expect("v2 headers must carry a timestamp")
-        .to_string();
-    headers.extend(
-        gen_tonic_replay_scope_headers(audience, path, &timestamp, content_sha256, boot_epoch)
-            .expect("replay-scope headers must mint with the aligned RPC secret"),
-    );
-    headers
-}
-
-async fn learn_boot_epoch_from_make_volume(url: &str, audience: &str) -> Uuid {
-    let request = make_volume_request("signature-e2e-epoch-bootstrap");
-    let mut headers = mint_v2_headers(audience, "MakeVolume", Some(&canonical_digest(&request)));
-    let challenge = attach_boot_epoch_challenge(&mut headers);
-    let response = call_make_volume_response(url, request, headers)
-        .await
-        .expect("v2 request with epoch challenge must clear default authentication");
-    let boot_epoch = verify_tonic_boot_epoch_response(audience, challenge, response.metadata().as_ref())
-        .expect("server must HMAC-authenticate the advertised boot epoch");
-    assert_authenticated(
-        Ok(response.into_inner()),
-        "a v2 epoch-challenge request in the default replay-scope posture",
-    );
-    boot_epoch
-}
-
-async fn learn_boot_epoch_from_ping(url: &str, audience: &str) -> Uuid {
-    let mut headers = mint_v2_headers(audience, "Ping", None);
-    let challenge = attach_boot_epoch_challenge(&mut headers);
-    let response = call_ping_response(url, headers)
-        .await
-        .expect("v2 Ping with an epoch challenge must bootstrap strict replay scope");
-    verify_tonic_boot_epoch_response(audience, challenge, response.metadata().as_ref())
-        .expect("strict replay-scope Ping must return a valid boot epoch proof")
+    client.make_volume(rpc_request).await.map(|response| response.into_inner())
 }

 /// Assert a call cleared authentication.
@@ -419,122 +332,6 @@ async fn internode_rpc_signature_default_posture_e2e() -> TestResult {
    Ok(())
 }

-/// A replay-scoped signature is usable exactly once against the exact gRPC path and the server
-/// process epoch that minted it. This crosses the child-process boundary twice: the HMAC-protected
-/// epoch is learned from a real response, then the same server is restarted in place to prove its
-/// replacement epoch rejects the captured request even though the nonce cache is necessarily new.
-#[tokio::test]
-#[serial]
-async fn replay_scope_rejects_replay_path_transplant_and_stale_epoch_e2e() -> TestResult {
-    init_logging();
-    align_rpc_secret_with_server();
-    let child_env = server_env(&[]);
-    let mut env = start_server_with_env(&child_env).await?;
-    let url = env.url.clone();
-    let audience = audience_of(&env);
-    let boot_epoch = learn_boot_epoch_from_make_volume(&url, &audience).await;
-
-    let request = make_volume_request("replay-scope-e2e-once");
-    let captured = mint_replay_scope_headers(
-        &audience,
-        &format!("{TONIC_RPC_PREFIX}/MakeVolume"),
-        &canonical_digest(&request),
-        boot_epoch,
-    );
-    assert_authenticated(
-        call_make_volume(&url, request.clone(), captured.clone()).await,
-        "the first replay-scoped mutation delivery",
-    );
-    assert_rejected(
-        call_make_volume(&url, request.clone(), captured).await,
-        Code::Unauthenticated,
-        None,
-        "the same replay-scoped mutation delivered twice",
-    );
-
-    let transplanted =
-        mint_replay_scope_headers(&audience, &format!("{TONIC_RPC_PREFIX}/Ping"), &canonical_digest(&request), boot_epoch);
-    assert_rejected(
-        call_make_volume(&url, request.clone(), transplanted).await,
-        Code::Unauthenticated,
-        None,
-        "a replay-scoped Ping signature transplanted onto MakeVolume",
-    );
-
-    let stale_epoch = mint_replay_scope_headers(
-        &audience,
-        &format!("{TONIC_RPC_PREFIX}/MakeVolume"),
-        &canonical_digest(&request),
-        boot_epoch,
-    );
-    env.restart_server_preserving_data(Vec::new(), &child_env).await?;
-    rustfs_protos::evict_failed_connection(&url).await;
-    assert_rejected(
-        call_make_volume(&url, request.clone(), stale_epoch).await,
-        Code::Unauthenticated,
-        None,
-        "a replay-scoped signature captured before the receiving process restart",
-    );
-
-    let restarted_epoch = learn_boot_epoch_from_make_volume(&url, &audience).await;
-    assert_ne!(boot_epoch, restarted_epoch, "a restarted child process must advertise a new boot epoch");
-    let fresh_epoch = mint_replay_scope_headers(
-        &audience,
-        &format!("{TONIC_RPC_PREFIX}/MakeVolume"),
-        &canonical_digest(&request),
-        restarted_epoch,
-    );
-    assert_authenticated(
-        call_make_volume(&url, request, fresh_epoch).await,
-        "a replay-scoped mutation signed with the replacement process epoch",
-    );
-
-    stop_server(env, &url).await;
-    Ok(())
-}
-
-/// Strict replay scope leaves one authenticated v2 bootstrap: `Ping` carrying a fresh challenge.
-/// A mutating v2 request cannot use that lane; once the epoch proof is returned, the first v3
-/// mutation succeeds. This protects a server restart without reopening a general downgrade path.
-#[tokio::test]
-#[serial]
-async fn replay_scope_strict_requires_v3_after_ping_bootstrap_e2e() -> TestResult {
-    init_logging();
-    align_rpc_secret_with_server();
-    let env = start_server(&[(ENV_INTERNODE_RPC_REPLAY_SCOPE_STRICT, "true")]).await?;
-    let url = env.url.clone();
-    let audience = audience_of(&env);
-
-    let v2_request = make_volume_request("replay-scope-e2e-strict-v2");
-    assert_rejected(
-        call_make_volume(
-            &url,
-            v2_request.clone(),
-            mint_v2_headers(&audience, "MakeVolume", Some(&canonical_digest(&v2_request))),
-        )
-        .await,
-        Code::Unauthenticated,
-        None,
-        "a v2 mutation after replay-scope strictness is enabled",
-    );
-
-    let boot_epoch = learn_boot_epoch_from_ping(&url, &audience).await;
-    let request = make_volume_request("replay-scope-e2e-strict-v3");
-    let replay_scoped = mint_replay_scope_headers(
-        &audience,
-        &format!("{TONIC_RPC_PREFIX}/MakeVolume"),
-        &canonical_digest(&request),
-        boot_epoch,
-    );
-    assert_authenticated(
-        call_make_volume(&url, request, replay_scoped).await,
-        "a replay-scoped mutation after Ping bootstrap under strict replay scope",
-    );
-
-    stop_server(env, &url).await;
-    Ok(())
-}
-
 /// Baseline: correctly signed mutations are accepted, both with and without a
 /// body digest.
 ///
@@ -126,55 +126,7 @@ async fn assert_key_deletion_lifecycle(base_url: &str, access_key: &str, secret_
    assert_eq!(cancelled["success"], true);
    assert_eq!(cancelled["key_metadata"]["key_state"], "Enabled");

-    // A window outside 7-30 days is refused at the endpoint, whatever the
-    // backend: the bound is enforced once in the service, so no backend can
-    // stretch or skip it (rustfs/backlog#1585).
-    for days in [6, 31] {
-        let refused = kms_admin_request(
-            base_url,
-            http::Method::DELETE,
-            "/rustfs/admin/v3/kms/keys/delete",
-            Some(
-                &serde_json::json!({
-                    "key_id": key_id,
-                    "pending_window_in_days": days
-                })
-                .to_string(),
-            ),
-            access_key,
-            secret_key,
-        )
-        .await
-        .err()
-        .ok_or_else(|| format!("a {days}-day deletion window must be refused"))?;
-        assert!(
-            refused.to_string().contains("400 Bad Request"),
-            "a {days}-day deletion window must report a client error: {refused}"
-        );
-    }
-
-    // Immediate deletion is no longer reachable through the query string, so it
-    // fails before the service gate is even consulted.
-    let refused = kms_admin_request(
-        base_url,
-        http::Method::DELETE,
-        &format!("/rustfs/admin/v3/kms/keys/delete?keyId={key_id}&force_immediate=true"),
-        None,
-        access_key,
-        secret_key,
-    )
-    .await
-    .err()
-    .ok_or("immediate KMS key deletion must not be reachable through the query string")?;
-    assert!(
-        refused.to_string().contains("400 Bad Request"),
-        "a query-string immediate deletion must report a client error: {refused}"
-    );
-
-    // A default server refuses to skip the waiting window (rustfs/backlog#1585):
-    // immediate deletion is unrecoverable and takes every object encrypted under
-    // the key with it, so the endpoint must reject it rather than honour it.
-    let refused = kms_admin_request(
+    let removed = kms_admin_request(
        base_url,
        http::Method::DELETE,
        "/rustfs/admin/v3/kms/keys/delete",
@@ -188,49 +140,37 @@ async fn assert_key_deletion_lifecycle(base_url: &str, access_key: &str, secret_
        access_key,
        secret_key,
    )
-    .await
-    .err()
-    .ok_or("immediate KMS key deletion must be refused on a default server")?;
-    assert!(
-        refused.to_string().contains("400 Bad Request"),
-        "refused immediate deletion must report a client error: {refused}"
-    );
-
-    // The refused requests left the key alone, so the window-bounded path still
-    // has something to schedule.
-    let described = kms_admin_request(
-        base_url,
-        http::Method::GET,
-        &format!("/rustfs/admin/v3/kms/keys/{key_id}"),
-        None,
-        access_key,
-        secret_key,
-    )
    .await?;
-    let described: serde_json::Value = serde_json::from_str(&described)?;
-    assert_eq!(
-        described["key_metadata"]["key_state"], "Enabled",
-        "a refused immediate deletion must leave the key usable"
-    );
+    let removed: serde_json::Value = serde_json::from_str(&removed)?;
+    assert_eq!(removed["success"], true);

-    let rescheduled = kms_admin_request(
-        base_url,
-        http::Method::DELETE,
-        "/rustfs/admin/v3/kms/keys/delete",
-        Some(
-            &serde_json::json!({
-                "key_id": key_id,
-                "pending_window_in_days": 7
-            })
-            .to_string(),
-        ),
-        access_key,
-        secret_key,
-    )
-    .await?;
-    let rescheduled: serde_json::Value = serde_json::from_str(&rescheduled)?;
-    assert_eq!(rescheduled["success"], true);
-    assert!(rescheduled["deletion_date"].is_string());
+    let listed =
+        kms_admin_request(base_url, http::Method::GET, "/rustfs/admin/v3/kms/keys", None, access_key, secret_key).await?;
+    let listed: serde_json::Value = serde_json::from_str(&listed)?;
+    assert_eq!(listed["success"], true);
+    let keys = listed["keys"]
+        .as_array()
+        .ok_or("list KMS keys response omitted keys after deletion")?;
+    if let Some(key) = keys.iter().find(|key| key["key_id"] == key_id) {
+        assert_eq!(key["status"], "PendingDeletion", "a retained force-deleted key must be pending deletion");
+        let removed = kms_admin_request(
+            base_url,
+            http::Method::DELETE,
+            "/rustfs/admin/v3/kms/keys/delete",
+            Some(
+                &serde_json::json!({
+                    "key_id": key_id,
+                    "force_immediate": true
+                })
+                .to_string(),
+            ),
+            access_key,
+            secret_key,
+        )
+        .await?;
+        let removed: serde_json::Value = serde_json::from_str(&removed)?;
+        assert_eq!(removed["success"], true);
+    }

    let listed =
        kms_admin_request(base_url, http::Method::GET, "/rustfs/admin/v3/kms/keys", None, access_key, secret_key).await?;
@@ -239,11 +179,10 @@ async fn assert_key_deletion_lifecycle(base_url: &str, access_key: &str, secret_
    let keys = listed["keys"]
        .as_array()
        .ok_or("final list KMS keys response omitted keys after deletion")?;
-    let key = keys
-        .iter()
-        .find(|key| key["key_id"] == key_id)
-        .ok_or("a key awaiting its deletion window must still be listed")?;
-    assert_eq!(key["status"], "PendingDeletion", "a scheduled key must be pending deletion");
+    assert!(
+        keys.iter().all(|key| key["key_id"] != key_id),
+        "force-deleted KMS key must no longer appear in list"
+    );
    Ok(())
 }

@@ -1,483 +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.
-
-//! Negative authorization matrix for per-key KMS access control.
-//!
-//! Every case here is an end-to-end denial that the pre-`kms` resource server
-//! allowed, so a regression that reopens one of them fails this file rather than
-//! only a unit test. The matrix varies one dimension at a time:
-//!
-//! - **wrong identity**: a caller holding S3 rights but no `kms` grant at all
-//! - **wrong key**: a caller scoped to key A naming key B
-//! - **wrong action**: a caller holding `kms:GenerateDataKey` but not `kms:Decrypt`
-//!   (and, on the admin plane, `kms:DisableKey` but not `kms:RotateKey`)
-//! - **wrong context**: an explicit `Deny` beating a wildcard `Allow`, and SSE-S3
-//!   staying exempt from `kms` authorization
-//!
-//! Each matrix opens with a positive control. Without it a denial proves nothing:
-//! an identity whose policy has not propagated yet is denied everything.
-
-use super::common::{LocalKMSTestEnvironment, create_key_with_specific_id};
-use crate::common::{admin_ok, admin_request, init_logging};
-use aws_sdk_s3::Client;
-use aws_sdk_s3::config::{Config, Credentials, Region};
-use aws_sdk_s3::error::ProvideErrorMetadata;
-use aws_sdk_s3::primitives::ByteStream;
-use aws_sdk_s3::types::ServerSideEncryption;
-use serial_test::serial;
-use std::time::Duration;
-use tracing::info;
-
-type TestResult = Result<(), Box<dyn std::error::Error + Send + Sync>>;
-
-const ALLOWED_KEY: &str = "kms-matrix-allowed-key";
-const OTHER_KEY: &str = "kms-matrix-other-key";
-const BUCKET: &str = "kms-authz-matrix";
-const SECRET: &str = "kms-matrix-secret";
-const PAYLOAD: &[u8] = b"kms authorization matrix payload";
-
-/// How long an identity change may take to reach the request path.
-const IAM_PROPAGATION: Duration = Duration::from_secs(20);
-
-fn s3_client(url: &str, access_key: &str, secret_key: &str) -> Client {
-    let config = Config::builder()
-        .credentials_provider(Credentials::new(access_key, secret_key, None, None, "kms-authz-matrix"))
-        .region(Region::new("us-east-1"))
-        .endpoint_url(url)
-        .force_path_style(true)
-        .behavior_version_latest()
-        .build();
-    Client::from_conf(config)
-}
-
-/// Start a server whose SSE-KMS data path authorizes against the named key.
-///
-/// The enforcement switch defaults to off for compatibility, so it has to be set
-/// explicitly; without it every negative case below would silently pass as an allow.
-async fn start_enforcing_server(env: &mut LocalKMSTestEnvironment, extra_env: &[(&str, &str)]) -> TestResult {
-    create_key_with_specific_id(&env.kms_keys_dir, ALLOWED_KEY).await?;
-    create_key_with_specific_id(&env.kms_keys_dir, OTHER_KEY).await?;
-
-    let key_dir = env.kms_keys_dir.clone();
-    let args = vec![
-        "--kms-enable",
-        "--kms-backend",
-        "local",
-        "--kms-key-dir",
-        key_dir.as_str(),
-        "--kms-default-key-id",
-        ALLOWED_KEY,
-    ];
-
-    let mut envs = vec![("RUSTFS_KMS_ALLOW_INSECURE_DEV_DEFAULTS", "true")];
-    envs.extend_from_slice(extra_env);
-
-    env.base_env.start_rustfs_server_with_env(args, &envs).await?;
-    Ok(())
-}
-
-/// Create `user` with `policy_document` attached under a canned policy of the same name.
-async fn provision_user(env: &LocalKMSTestEnvironment, user: &str, policy_document: &str) -> TestResult {
-    admin_ok(
-        &env.base_env,
-        http::Method::PUT,
-        &format!("/rustfs/admin/v3/add-canned-policy?name={user}"),
-        Some(policy_document.to_string()),
-    )
-    .await?;
-    provision_user_with_policy(env, user, user).await
-}
-
-/// Create `user` and attach an existing policy (built-in or canned) by name.
-async fn provision_user_with_policy(env: &LocalKMSTestEnvironment, user: &str, policy_name: &str) -> TestResult {
-    admin_ok(
-        &env.base_env,
-        http::Method::PUT,
-        &format!("/rustfs/admin/v3/add-user?accessKey={user}"),
-        Some(serde_json::json!({ "secretKey": SECRET, "status": "enabled" }).to_string()),
-    )
-    .await?;
-    admin_ok(
-        &env.base_env,
-        http::Method::PUT,
-        &format!("/rustfs/admin/v3/set-user-or-group-policy?policyName={policy_name}&userOrGroup={user}&isGroup=false"),
-        None,
-    )
-    .await?;
-    Ok(())
-}
-
-/// The S3 half of every data-path policy below: full object access, no KMS grant.
-fn s3_full_access_statement() -> serde_json::Value {
-    serde_json::json!({
-        "Effect": "Allow",
-        "Action": ["s3:*"],
-        "Resource": ["arn:aws:s3:::*"]
-    })
-}
-
-fn policy_document(statements: Vec<serde_json::Value>) -> String {
-    serde_json::json!({ "Version": "2012-10-17", "Statement": statements }).to_string()
-}
-
-async fn put_sse_kms(client: &Client, key: &str, kms_key_id: &str) -> Result<(), aws_sdk_s3::Error> {
-    client
-        .put_object()
-        .bucket(BUCKET)
-        .key(key)
-        .body(ByteStream::from_static(PAYLOAD))
-        .server_side_encryption(ServerSideEncryption::AwsKms)
-        .ssekms_key_id(kms_key_id)
-        .send()
-        .await
-        .map(|_| ())
-        .map_err(aws_sdk_s3::Error::from)
-}
-
-/// Assert the operation failed with `AccessDenied` rather than any other error.
-///
-/// A bare `is_err` would also accept `KMSKeyDisabled` or an internal error, which
-/// would hide both a leak of key state and an outage masquerading as a denial.
-fn assert_access_denied<T: std::fmt::Debug>(result: Result<T, aws_sdk_s3::Error>, what: &str) {
-    let error = result.expect_err(&format!("{what} must be denied"));
-    assert_eq!(error.code(), Some("AccessDenied"), "{what} must fail with AccessDenied: {error:?}");
-}
-
-/// Retry an SSE-KMS write until the identity's policy has reached the request path.
-async fn wait_for_sse_kms_write(client: &Client, key: &str, kms_key_id: &str) -> TestResult {
-    let deadline = tokio::time::Instant::now() + IAM_PROPAGATION;
-    loop {
-        match put_sse_kms(client, key, kms_key_id).await {
-            Ok(()) => return Ok(()),
-            Err(error) if tokio::time::Instant::now() >= deadline => {
-                return Err(format!("positive control never became authorized: {error:?}").into());
-            }
-            Err(_) => tokio::time::sleep(Duration::from_millis(500)).await,
-        }
-    }
-}
-
-/// Retry an admin call until it stops returning 403, i.e. the policy is live.
-async fn wait_for_admin_success(
-    env: &LocalKMSTestEnvironment,
-    user: &str,
-    method: http::Method,
-    path: &str,
-    body: Option<String>,
-) -> TestResult {
-    let deadline = tokio::time::Instant::now() + IAM_PROPAGATION;
-    loop {
-        let (status, response) = admin_request(&env.base_env.url, method.clone(), path, body.clone(), user, SECRET).await?;
-        if status.is_success() {
-            return Ok(());
-        }
-        if tokio::time::Instant::now() >= deadline {
-            return Err(format!("positive control never became authorized: {method} {path} -> {status} {response}").into());
-        }
-        tokio::time::sleep(Duration::from_millis(500)).await;
-    }
-}
-
-async fn assert_admin_denied(
-    env: &LocalKMSTestEnvironment,
-    user: &str,
-    method: http::Method,
-    path: &str,
-    body: Option<String>,
-    what: &str,
-) -> TestResult {
-    let (status, response) = admin_request(&env.base_env.url, method, path, body, user, SECRET).await?;
-    assert_eq!(status.as_u16(), 403, "{what} must be denied, got {status}: {response}");
-    assert!(response.contains("AccessDenied"), "{what} must carry AccessDenied: {response}");
-    Ok(())
-}
-
-fn disable_body(key_id: &str) -> String {
-    serde_json::json!({ "key_id": key_id }).to_string()
-}
-
-/// Data-path matrix: SSE-KMS writes and reads are authorized against the resolved key.
-#[tokio::test]
-#[serial]
-async fn sse_kms_per_key_authorization_negative_matrix() -> TestResult {
-    init_logging();
-
-    let mut env = LocalKMSTestEnvironment::new().await?;
-    start_enforcing_server(&mut env, &[("RUSTFS_KMS_ENFORCE_SSE_KEY_POLICY", "true")]).await?;
-    env.base_env.create_test_bucket(BUCKET).await?;
-
-    // Scoped to ALLOWED_KEY only.
-    provision_user(
-        &env,
-        "kmsmatrixscoped",
-        &policy_document(vec![
-            s3_full_access_statement(),
-            serde_json::json!({
-                "Effect": "Allow",
-                "Action": ["kms:GenerateDataKey", "kms:Decrypt"],
-                "Resource": [format!("arn:aws:kms:::key/{ALLOWED_KEY}")]
-            }),
-        ]),
-    )
-    .await?;
-    // S3 rights only: the identity shape that existed before per-key authorization.
-    provision_user(&env, "kmsmatrixs3only", &policy_document(vec![s3_full_access_statement()])).await?;
-    // May wrap a data key but may never unwrap one.
-    provision_user(
-        &env,
-        "kmsmatrixwriter",
-        &policy_document(vec![
-            s3_full_access_statement(),
-            serde_json::json!({
-                "Effect": "Allow",
-                "Action": ["kms:GenerateDataKey"],
-                "Resource": ["arn:aws:kms:::*"]
-            }),
-        ]),
-    )
-    .await?;
-    // Wildcard allow, explicit deny on one key.
-    provision_user(
-        &env,
-        "kmsmatrixdenied",
-        &policy_document(vec![
-            s3_full_access_statement(),
-            serde_json::json!({
-                "Effect": "Allow",
-                "Action": ["kms:*"],
-                "Resource": ["arn:aws:kms:::*"]
-            }),
-            serde_json::json!({
-                "Effect": "Deny",
-                "Action": ["kms:*"],
-                "Resource": [format!("arn:aws:kms:::key/{OTHER_KEY}")]
-            }),
-        ]),
-    )
-    .await?;
-
-    let scoped = s3_client(&env.base_env.url, "kmsmatrixscoped", SECRET);
-    let s3_only = s3_client(&env.base_env.url, "kmsmatrixs3only", SECRET);
-    let writer = s3_client(&env.base_env.url, "kmsmatrixwriter", SECRET);
-    let denied = s3_client(&env.base_env.url, "kmsmatrixdenied", SECRET);
-
-    // --- positive control -----------------------------------------------------
-    wait_for_sse_kms_write(&scoped, "scoped/allowed", ALLOWED_KEY).await?;
-    let read = scoped.get_object().bucket(BUCKET).key("scoped/allowed").send().await?;
-    assert_eq!(read.body.collect().await?.into_bytes().as_ref(), PAYLOAD);
-    info!("positive control: scoped identity may write and read under its own key");
-
-    // --- wrong key ------------------------------------------------------------
-    assert_access_denied(
-        put_sse_kms(&scoped, "scoped/other", OTHER_KEY).await,
-        "SSE-KMS write under a key outside the identity's scope",
-    );
-
-    // --- wrong identity -------------------------------------------------------
-    assert_access_denied(
-        put_sse_kms(&s3_only, "s3only/allowed", ALLOWED_KEY).await,
-        "SSE-KMS write by an identity holding no kms grant",
-    );
-    // The object the scoped identity wrote is readable by its owner only.
-    assert_access_denied(
-        s3_only
-            .get_object()
-            .bucket(BUCKET)
-            .key("scoped/allowed")
-            .send()
-            .await
-            .map(|_| ())
-            .map_err(aws_sdk_s3::Error::from),
-        "SSE-KMS read by an identity holding no kms grant",
-    );
-
-    // --- wrong action ---------------------------------------------------------
-    wait_for_sse_kms_write(&writer, "writer/allowed", ALLOWED_KEY).await?;
-    assert_access_denied(
-        writer
-            .get_object()
-            .bucket(BUCKET)
-            .key("writer/allowed")
-            .send()
-            .await
-            .map(|_| ())
-            .map_err(aws_sdk_s3::Error::from),
-        "SSE-KMS read by an identity holding kms:GenerateDataKey but not kms:Decrypt",
-    );
-
-    // --- wrong context: explicit Deny beats a wildcard Allow -------------------
-    wait_for_sse_kms_write(&denied, "denied/allowed", ALLOWED_KEY).await?;
-    assert_access_denied(
-        put_sse_kms(&denied, "denied/other", OTHER_KEY).await,
-        "SSE-KMS write under a key covered by an explicit Deny",
-    );
-
-    // --- wrong context: SSE-S3 is out of scope --------------------------------
-    // SSE-S3 wraps its data key with a server-owned key the caller never names, so
-    // it must stay reachable for an identity with no kms grant at all.
-    s3_only
-        .put_object()
-        .bucket(BUCKET)
-        .key("s3only/sse-s3")
-        .body(ByteStream::from_static(PAYLOAD))
-        .server_side_encryption(ServerSideEncryption::Aes256)
-        .send()
-        .await?;
-    let sse_s3_read = s3_only.get_object().bucket(BUCKET).key("s3only/sse-s3").send().await?;
-    assert_eq!(sse_s3_read.body.collect().await?.into_bytes().as_ref(), PAYLOAD);
-
-    // ... and so must an unencrypted object.
-    s3_only
-        .put_object()
-        .bucket(BUCKET)
-        .key("s3only/plain")
-        .body(ByteStream::from_static(PAYLOAD))
-        .send()
-        .await?;
-    s3_only.get_object().bucket(BUCKET).key("s3only/plain").send().await?;
-
-    Ok(())
-}
-
-/// Admin-plane matrix: KMS key endpoints are authorized against the key they name.
-///
-/// Runs without the SSE enforcement switch: admin scoping is unconditional, and
-/// leaving the switch off proves the two planes are independent.
-#[tokio::test]
-#[serial]
-async fn kms_admin_per_key_authorization_negative_matrix() -> TestResult {
-    init_logging();
-
-    let mut env = LocalKMSTestEnvironment::new().await?;
-    start_enforcing_server(&mut env, &[]).await?;
-
-    // Built-in role templates, attached by name.
-    provision_user_with_policy(&env, "kmsmatrixkeyadmin", "KMSKeyAdministrator").await?;
-    provision_user_with_policy(&env, "kmsmatrixauditor", "KMSAuditor").await?;
-    // A narrowed copy of the administrator template, scoped to one key.
-    provision_user(
-        &env,
-        "kmsmatrixscopedadmin",
-        &policy_document(vec![serde_json::json!({
-            "Effect": "Allow",
-            "Action": ["kms:DisableKey", "kms:EnableKey"],
-            "Resource": [format!("arn:aws:kms:::key/{ALLOWED_KEY}")]
-        })]),
-    )
-    .await?;
-
-    // --- positive control -----------------------------------------------------
-    wait_for_admin_success(
-        &env,
-        "kmsmatrixkeyadmin",
-        http::Method::POST,
-        "/rustfs/admin/v3/kms/keys/disable",
-        Some(disable_body(OTHER_KEY)),
-    )
-    .await?;
-    admin_request(
-        &env.base_env.url,
-        http::Method::POST,
-        "/rustfs/admin/v3/kms/keys/enable",
-        Some(disable_body(OTHER_KEY)),
-        "kmsmatrixkeyadmin",
-        SECRET,
-    )
-    .await?;
-
-    // --- wrong action: the administrator template withholds service-wide powers -
-    assert_admin_denied(
-        &env,
-        "kmsmatrixkeyadmin",
-        http::Method::GET,
-        "/rustfs/admin/v3/kms/config",
-        None,
-        "KMSKeyAdministrator reading the KMS backend configuration (kms:Configure)",
-    )
-    .await?;
-    assert_admin_denied(
-        &env,
-        "kmsmatrixkeyadmin",
-        http::Method::GET,
-        "/rustfs/admin/v3/kms/backup",
-        None,
-        "KMSKeyAdministrator exporting a backup bundle (kms:Backup)",
-    )
-    .await?;
-    // Separation of duties: managing a key never implies using it.
-    assert_admin_denied(
-        &env,
-        "kmsmatrixkeyadmin",
-        http::Method::POST,
-        "/rustfs/admin/v3/kms/generate-data-key",
-        Some(serde_json::json!({ "key_id": ALLOWED_KEY }).to_string()),
-        "KMSKeyAdministrator generating a data key (kms:GenerateDataKey)",
-    )
-    .await?;
-
-    // --- wrong action: the auditor template is read-only ----------------------
-    wait_for_admin_success(&env, "kmsmatrixauditor", http::Method::GET, "/rustfs/admin/v3/kms/keys", None).await?;
-    assert_admin_denied(
-        &env,
-        "kmsmatrixauditor",
-        http::Method::POST,
-        "/rustfs/admin/v3/kms/keys/disable",
-        Some(disable_body(ALLOWED_KEY)),
-        "KMSAuditor disabling a key (kms:DisableKey)",
-    )
-    .await?;
-
-    // --- wrong key ------------------------------------------------------------
-    wait_for_admin_success(
-        &env,
-        "kmsmatrixscopedadmin",
-        http::Method::POST,
-        "/rustfs/admin/v3/kms/keys/disable",
-        Some(disable_body(ALLOWED_KEY)),
-    )
-    .await?;
-    assert_admin_denied(
-        &env,
-        "kmsmatrixscopedadmin",
-        http::Method::POST,
-        "/rustfs/admin/v3/kms/keys/disable",
-        Some(disable_body(OTHER_KEY)),
-        "key-scoped administrator disabling a key outside its scope",
-    )
-    .await?;
-    // --- wrong action, same key ----------------------------------------------
-    assert_admin_denied(
-        &env,
-        "kmsmatrixscopedadmin",
-        http::Method::POST,
-        "/rustfs/admin/v3/kms/keys/rotate",
-        Some(disable_body(ALLOWED_KEY)),
-        "key-scoped administrator rotating a key it may only enable and disable",
-    )
-    .await?;
-
-    // --- wrong identity -------------------------------------------------------
-    provision_user(&env, "kmsmatrixnokms", &policy_document(vec![s3_full_access_statement()])).await?;
-    assert_admin_denied(
-        &env,
-        "kmsmatrixnokms",
-        http::Method::POST,
-        "/rustfs/admin/v3/kms/keys/disable",
-        Some(disable_body(ALLOWED_KEY)),
-        "identity holding no kms grant disabling a key",
-    )
-    .await?;
-
-    Ok(())
-}
@@ -417,22 +417,6 @@ async fn test_vault_kms_key_crud(

    info!("✅ Read: Successfully listed keys, found test key");

-    // A waiting window outside 7-30 days is refused at the endpoint for this
-    // backend too: the bound is enforced once in the service (rustfs/backlog#1585).
-    for days in [6, 31] {
-        let window_error = crate::common::execute_awscurl(
-            &format!("{base_url}/rustfs/admin/v3/kms/keys/delete?keyId={key_id}&pending_window_in_days={days}"),
-            "DELETE",
-            None,
-            access_key,
-            secret_key,
-        )
-        .await
-        .err()
-        .ok_or_else(|| format!("A {days}-day deletion window must be refused"))?;
-        info!("✅ Delete window {} correctly refused: {}", days, window_error);
-    }
-
    // Delete
    let delete_response = crate::common::execute_awscurl(
        &format!("{base_url}/rustfs/admin/v3/kms/keys/delete?keyId={key_id}"),
@@ -465,32 +449,29 @@ async fn test_vault_kms_key_crud(

    info!("✅ Delete verification: Key state correctly changed to: {}", key_state);

-    // Force Delete - the query string can no longer ask for immediate deletion,
-    // and a default server refuses it in any case (rustfs/backlog#1585):
-    // destroying the key material immediately would take every object encrypted
-    // under the key with it.
-    let force_delete_error = crate::common::execute_awscurl(
+    // Force Delete - Force immediate deletion for PendingDeletion key
+    let force_delete_response = crate::common::execute_awscurl(
        &format!("{base_url}/rustfs/admin/v3/kms/keys/delete?keyId={key_id}&force_immediate=true"),
        "DELETE",
        None,
        access_key,
        secret_key,
    )
-    .await
-    .expect_err("Immediate KMS key deletion must be refused on a default server");
-    info!("✅ Force Delete: correctly refused for key {}: {}", key_id, force_delete_error);
+    .await?;

-    // The refused request must leave the key exactly as it was: still present,
-    // still pending deletion, still recoverable through cancel-deletion.
-    let describe_after_refusal =
-        crate::common::awscurl_get(&format!("{base_url}/rustfs/admin/v3/kms/keys/{key_id}"), access_key, secret_key).await?;
-    let describe_after_refusal: serde_json::Value = serde_json::from_str(&describe_after_refusal)?;
-    assert_eq!(
-        describe_after_refusal["key_metadata"]["key_state"], "PendingDeletion",
-        "A refused immediate deletion must leave the key pending deletion"
-    );
+    // Parse and validate the force delete response
+    let force_delete_result: serde_json::Value = serde_json::from_str(&force_delete_response)?;
+    assert_eq!(force_delete_result["success"], true, "Force delete operation must return success=true");
+    info!("✅ Force Delete: Successfully force deleted key: {}", key_id);

-    info!("✅ Force Delete verification: Key survived the refused immediate deletion");
+    // Verify key no longer exists after force deletion (should return error)
+    let describe_force_deleted_result =
+        crate::common::awscurl_get(&format!("{base_url}/rustfs/admin/v3/kms/keys/{key_id}"), access_key, secret_key).await;
+
+    // After force deletion, key should not be found (GET should fail)
+    assert!(describe_force_deleted_result.is_err(), "Force deleted key should not be found");
+
+    info!("✅ Force Delete verification: Key was permanently deleted and is no longer accessible");

    info!("Vault KMS key CRUD operations completed successfully");
    Ok(())
@@ -53,6 +53,3 @@ mod copy_object_version_restore_sse_test;

 #[cfg(test)]
 mod configured_roundtrip_test;
-
-#[cfg(test)]
-mod kms_authorization_negative_matrix_test;
@@ -21,22 +21,18 @@
 //! function, never as an S3 event sink.
 //!
 //! Coverage:
-//!   * PUT / multipart-complete / DeleteObject / DeleteObjects each deliver one event with the correct
+//!   * PUT / multipart-complete / DELETE each deliver one event with the correct
 //!     eventName, bucket, key, versionId and eTag.
 //!   * prefix/suffix filters drop non-matching keys (rule-engine gate).
 //!   * an event queued while the target endpoint is unreachable is redelivered
 //!     from the on-disk store once the endpoint recovers (store-and-forward).
-//!   * responseElements and the S3 response use the canonical request ID while
-//!     requestParameters preserve a conflicting client-supplied value.

 use crate::common::{RustFSTestEnvironment, init_logging};
 use aws_sdk_s3::Client;
-use aws_sdk_s3::operation::RequestId;
 use aws_sdk_s3::primitives::ByteStream;
 use aws_sdk_s3::types::{
-    BucketVersioningStatus, CompletedMultipartUpload, CompletedPart, Delete, Event, FilterRule, FilterRuleName,
-    NotificationConfiguration, NotificationConfigurationFilter, ObjectIdentifier, QueueConfiguration, S3KeyFilter,
-    VersioningConfiguration,
+    BucketVersioningStatus, CompletedMultipartUpload, CompletedPart, Event, FilterRule, FilterRuleName,
+    NotificationConfiguration, NotificationConfigurationFilter, QueueConfiguration, S3KeyFilter, VersioningConfiguration,
 };
 use http::header::{CONTENT_TYPE, HOST};
 use local_ip_address::local_ip;
@@ -44,12 +40,10 @@ use reqwest::StatusCode;
 use rustfs_signer::constants::UNSIGNED_PAYLOAD;
 use rustfs_signer::sign_v4;
 use rustfs_utils::egress::ENV_OUTBOUND_ALLOW_ORIGINS;
-use rustfs_utils::http::headers::{AMZ_REQUEST_ID, REQUEST_ID_HEADER};
 use s3s::Body;
 use serde_json::Value;
 use serial_test::serial;
 use std::error::Error;
-use std::io::Cursor;
 use std::path::Path;
 use std::sync::{
    Arc, Once,
@@ -69,8 +63,6 @@ type BoxError = Box<dyn Error + Send + Sync>;
 /// for target lookup (see `process_queue_configurations`), so the region is
 /// nominal, but it must be present for `ARN::parse` to succeed.
 const NOTIFY_REGION: &str = "us-east-1";
-const CLIENT_REQUEST_ID: &str = "client-supplied-request-id";
-const CLIENT_AMZ_REQUEST_ID: &str = "client-supplied-amz-request-id";

 /// Webhook targets are registered as `TargetID { id: <name>, name: "webhook" }`,
 /// so the ARN a notification rule references is
@@ -587,36 +579,6 @@ fn trimmed_etag(value: Option<&str>) -> Option<String> {
    value.map(|e| e.trim_matches('"').to_string())
 }

-fn assert_conflicting_request_id_correlation(record: &Value, server_request_id: &str) {
-    assert_eq!(
-        record["requestParameters"][REQUEST_ID_HEADER].as_str(),
-        Some(CLIENT_REQUEST_ID),
-        "notification request parameters should retain the actual client header: {record}"
-    );
-    assert_eq!(
-        record["requestParameters"][AMZ_REQUEST_ID].as_str(),
-        Some(CLIENT_AMZ_REQUEST_ID),
-        "notification request parameters should retain the actual client header: {record}"
-    );
-    assert_eq!(
-        record["responseElements"][AMZ_REQUEST_ID].as_str(),
-        Some(server_request_id),
-        "notification response elements should use the canonical request ID: {record}"
-    );
-}
-
-fn assert_generated_request_id_correlation(record: &Value, request_id: &str) {
-    assert!(
-        record["requestParameters"][AMZ_REQUEST_ID].is_null(),
-        "notification request parameters must not invent a client request header: {record}"
-    );
-    assert_eq!(
-        record["responseElements"][AMZ_REQUEST_ID].as_str(),
-        Some(request_id),
-        "notification response elements should match the S3 response request ID: {record}"
-    );
-}
-
 // ---------------------------------------------------------------------------
 // Tests
 // ---------------------------------------------------------------------------
@@ -709,17 +671,8 @@ async fn test_webhook_event_delivery_and_filtering() -> TestResult {
        .bucket(bucket)
        .key(put_key)
        .body(ByteStream::from_static(b"peri-1 put body"))
-        .customize()
-        .mutate_request(|request| {
-            request.headers_mut().insert(REQUEST_ID_HEADER, CLIENT_REQUEST_ID);
-            request.headers_mut().insert(AMZ_REQUEST_ID, CLIENT_AMZ_REQUEST_ID);
-        })
        .send()
        .await?;
-    let put_request_id = put.request_id().ok_or("PUT response missing request ID")?.to_owned();
-    assert!(uuid::Uuid::parse_str(&put_request_id).is_ok());
-    assert_ne!(put_request_id, CLIENT_REQUEST_ID);
-    assert_ne!(put_request_id, CLIENT_AMZ_REQUEST_ID);
    let put_version = put
        .version_id()
        .ok_or("PUT response missing versionId (versioning not enabled?)")?;
@@ -739,7 +692,6 @@ async fn test_webhook_event_delivery_and_filtering() -> TestResult {
        "record eventName: {record}"
    );
    assert_eq!(record["s3"]["bucket"]["name"].as_str(), Some(bucket), "bucket in event: {record}");
-    assert_conflicting_request_id_correlation(record, &put_request_id);
    assert_eq!(object["versionId"].as_str(), Some(put_version), "versionId in event: {object}");
    assert_eq!(
        trimmed_etag(object["eTag"].as_str()),
@@ -792,35 +744,6 @@ async fn test_webhook_event_delivery_and_filtering() -> TestResult {
        "multipart eTag in event: {mp_record}"
    );

-    // --- Snowball extract: direct notification path keeps response correlation
-    let snowball_key = "uploads/snowball.dat";
-    let snowball_body = b"snowball notification body";
-    let mut archive_builder = tokio_tar::Builder::new(Cursor::new(Vec::new()));
-    let mut archive_header = tokio_tar::Header::new_gnu();
-    archive_header.set_size(u64::try_from(snowball_body.len()).expect("snowball fixture length should fit in u64"));
-    archive_header.set_mode(0o644);
-    archive_header.set_cksum();
-    archive_builder
-        .append_data(&mut archive_header, snowball_key, Cursor::new(snowball_body))
-        .await?;
-    let archive = archive_builder.into_inner().await?.into_inner();
-    let snowball = client
-        .put_object()
-        .bucket(bucket)
-        .key("snowball-fixture.tar")
-        .body(ByteStream::from(archive))
-        .customize()
-        .mutate_request(|request| {
-            request.headers_mut().insert("x-amz-meta-snowball-auto-extract", "true");
-        })
-        .send()
-        .await?;
-    let snowball_request_id = snowball.request_id().ok_or("Snowball response missing request ID")?;
-
-    let snowball_event = wait_for_event(&mut rx, snowball_key, "s3:ObjectCreated:", Duration::from_secs(20)).await?;
-    let snowball_record = &snowball_event["Records"][0];
-    assert_generated_request_id_correlation(snowball_record, snowball_request_id);
-
    // --- Filter: non-matching prefix and suffix must never be delivered ------
    let wrong_prefix = "logs/report.dat"; // right suffix, wrong prefix
    let wrong_suffix = "uploads/report.txt"; // right prefix, wrong suffix
@@ -849,32 +772,7 @@ async fn test_webhook_event_delivery_and_filtering() -> TestResult {
        "wrong-suffix key {wrong_suffix} bypassed the filter; saw {seen:?}"
    );

-    // --- DeleteObjects: direct notification path keeps response correlation --
-    let delete_many_key = "uploads/delete-many.dat";
-    client
-        .put_object()
-        .bucket(bucket)
-        .key(delete_many_key)
-        .body(ByteStream::from_static(b"delete objects notification body"))
-        .send()
-        .await?;
-    wait_for_event(&mut rx, delete_many_key, "s3:ObjectCreated:", Duration::from_secs(20)).await?;
-
-    let delete_many = client
-        .delete_objects()
-        .bucket(bucket)
-        .delete(
-            Delete::builder()
-                .objects(ObjectIdentifier::builder().key(delete_many_key).build()?)
-                .build()?,
-        )
-        .send()
-        .await?;
-    let delete_many_request_id = delete_many.request_id().ok_or("DeleteObjects response missing request ID")?;
-    let delete_many_event = wait_for_event(&mut rx, delete_many_key, "s3:ObjectRemoved:", Duration::from_secs(20)).await?;
-    assert_generated_request_id_correlation(&delete_many_event["Records"][0], delete_many_request_id);
-
-    // --- DeleteObject on a versioned bucket: delete-marker version ----------
+    // --- DELETE on a versioned bucket: ObjectRemoved:* with delete-marker version
    let delete = client.delete_object().bucket(bucket).key(put_key).send().await?;
    let removed = wait_for_event(&mut rx, put_key, "s3:ObjectRemoved:", Duration::from_secs(20)).await?;
    let removed_record = &removed["Records"][0];
@@ -26,7 +26,6 @@

 use super::common::*;
 use aws_sdk_s3::Client;
-use aws_sdk_s3::error::ProvideErrorMetadata;
 use aws_sdk_s3::primitives::{ByteStream, DateTimeFormat};
 use aws_sdk_s3::types::{
    CompletedMultipartUpload, CompletedPart, Delete, MetadataDirective, ObjectIdentifier, ObjectLockLegalHoldStatus,
@@ -2121,127 +2120,6 @@ async fn test_multipart_default_retention_fixed_at_create() {
 // Versioning Auto-Enable Tests
 // ============================================================================

-#[tokio::test]
-#[serial]
-async fn test_unretained_object_lock_object_delete_and_bucket_cleanup() {
-    init_logging();
-    info!("🧪 Test: Unretained Object Lock object delete and bucket cleanup (Issue #5339)");
-
-    let mut env = ObjectLockTestEnvironment::new()
-        .await
-        .expect("failed to create Object Lock test environment");
-    env.start_rustfs().await.expect("failed to start RustFS");
-
-    let bucket = "test-object-lock-delete-cleanup";
-    let key = "unretained-object";
-
-    env.create_object_lock_bucket(bucket)
-        .await
-        .expect("failed to create Object Lock bucket");
-    let client = env.s3_client();
-
-    let put_response = client
-        .put_object()
-        .bucket(bucket)
-        .key(key)
-        .body(ByteStream::from_static(b"unretained data"))
-        .send()
-        .await
-        .expect("failed to upload unretained object");
-    let object_version_id = put_response
-        .version_id()
-        .expect("Object Lock buckets must create versioned objects")
-        .to_string();
-
-    let delete_response = client
-        .delete_object()
-        .bucket(bucket)
-        .key(key)
-        .send()
-        .await
-        .expect("failed to create delete marker");
-    assert_eq!(delete_response.delete_marker(), Some(true));
-    let delete_marker_version_id = delete_response
-        .version_id()
-        .expect("Deleting without a version ID must create a delete marker")
-        .to_string();
-
-    let get_error = client
-        .get_object()
-        .bucket(bucket)
-        .key(key)
-        .send()
-        .await
-        .expect_err("GET must not return an object hidden by a delete marker");
-    assert_eq!(get_error.raw_response().map(|response| response.status().as_u16()), Some(404));
-    assert_eq!(get_error.as_service_error().and_then(|error| error.code()), Some("NoSuchKey"));
-
-    let listed_objects = client
-        .list_objects_v2()
-        .bucket(bucket)
-        .send()
-        .await
-        .expect("failed to list current objects");
-    assert!(
-        listed_objects.contents().iter().all(|object| object.key() != Some(key)),
-        "ListObjectsV2 must hide objects whose latest version is a delete marker"
-    );
-
-    let listed_versions = client
-        .list_object_versions()
-        .bucket(bucket)
-        .send()
-        .await
-        .expect("failed to list object versions");
-    assert!(
-        listed_versions
-            .versions()
-            .iter()
-            .any(|version| version.key() == Some(key) && version.version_id() == Some(object_version_id.as_str())),
-        "The data version must remain until it is explicitly deleted"
-    );
-    assert!(
-        listed_versions
-            .delete_markers()
-            .iter()
-            .any(|marker| marker.key() == Some(key) && marker.version_id() == Some(delete_marker_version_id.as_str())),
-        "ListObjectVersions must expose the delete marker"
-    );
-
-    client
-        .delete_object()
-        .bucket(bucket)
-        .key(key)
-        .version_id(object_version_id)
-        .send()
-        .await
-        .expect("failed to delete the data version");
-    client
-        .delete_object()
-        .bucket(bucket)
-        .key(key)
-        .version_id(delete_marker_version_id)
-        .send()
-        .await
-        .expect("failed to delete the delete marker");
-
-    let remaining_versions = client
-        .list_object_versions()
-        .bucket(bucket)
-        .send()
-        .await
-        .expect("failed to list versions after cleanup");
-    assert!(remaining_versions.versions().is_empty());
-    assert!(remaining_versions.delete_markers().is_empty());
-
-    client
-        .delete_bucket()
-        .bucket(bucket)
-        .send()
-        .await
-        .expect("Deleting every version must remove xl.meta so the bucket can be deleted normally");
-}
-
 #[tokio::test]
 #[serial]
 async fn test_versioning_auto_enabled_with_object_lock() {
@@ -24,7 +24,7 @@ use rustfs_protos::proto_gen::node_service::{BatchGenerallyLockRequest, Generall
 use tonic::Request;
 use tracing::{info, warn};

-use crate::storage_api::grpc_lock::{AuthenticatedChannel, TonicInterceptor, node_service_time_out_client_no_auth};
+use crate::storage_api::grpc_lock::{TonicInterceptor, node_service_time_out_client_no_auth};

 /// gRPC lock client without authentication for testing
 /// Similar to RemoteClient but uses no_auth client
@@ -42,7 +42,7 @@ impl GrpcLockClient {
        &self,
    ) -> Result<
        rustfs_protos::proto_gen::node_service::node_service_client::NodeServiceClient<
-            tonic::service::interceptor::InterceptedService<AuthenticatedChannel, TonicInterceptor>,
+            tonic::service::interceptor::InterceptedService<tonic::transport::Channel, TonicInterceptor>,
        >,
    > {
        node_service_time_out_client_no_auth(&self.addr)
@@ -15,7 +15,9 @@

 use super::{grpc_lock_client::GrpcLockClient, grpc_lock_server::spawn_lock_server};
 use rustfs_lock::client::{LockClient, local::LocalClient};
-use rustfs_lock::{GlobalLockManager, LockInfo, LockRequest, LockResponse, LockStats, LockType, NamespaceLock, ObjectKey};
+use rustfs_lock::{
+    GlobalLockManager, LockError, LockInfo, LockRequest, LockResponse, LockStats, LockType, NamespaceLock, ObjectKey,
+};
 use std::sync::Arc;
 use std::time::Duration;

@@ -33,11 +35,7 @@ struct FailingClient;
 #[async_trait::async_trait]
 impl rustfs_lock::LockClient for FailingClient {
    async fn acquire_lock(&self, _request: &rustfs_lock::LockRequest) -> rustfs_lock::Result<LockResponse> {
-        // Match RemoteClient's transport-failure response so the coordinator can count this node toward quorum loss.
-        Ok(LockResponse::failure(
-            "Remote lock RPC failed: simulated gRPC node failure",
-            Duration::ZERO,
-        ))
+        Err(LockError::internal("simulated gRPC node failure"))
    }

    async fn release(&self, _lock_id: &rustfs_lock::LockId) -> rustfs_lock::Result<bool> {
@@ -382,6 +382,7 @@ struct ManualTransitionRunReport {
    skipped_delete_marker: u64,
    skipped_directory: u64,
    skipped_replication: u64,
+    skipped_already_transitioned: u64,
    skipped_already_in_flight: u64,
    skipped_queue_full: u64,
    skipped_queue_closed: u64,
@@ -407,6 +408,41 @@ fn assert_completed_or_in_flight_partial(state: &str, report: &ManualTransitionR
    }
 }

+fn assert_conflict_winner_report(state: &str, report: &ManualTransitionRunReport, expected_objects: u64, context: &str) {
+    assert_completed_or_in_flight_partial(state, report, context);
+    if report.skipped_already_in_flight > 0 {
+        assert!(
+            report.scanned <= expected_objects,
+            "{context}: scanned more objects than the conflict scope contains: {report:#?}"
+        );
+        assert!(
+            report.eligible <= expected_objects,
+            "{context}: marked more objects eligible than the conflict scope contains: {report:#?}"
+        );
+        assert_eq!(
+            report.enqueued + report.skipped_already_in_flight,
+            report.eligible,
+            "{context}: partial in-flight accounting must cover every eligible object: {report:#?}"
+        );
+    } else {
+        assert_eq!(report.scanned, expected_objects, "{context}: {report:#?}");
+        assert_eq!(
+            report.eligible + report.skipped_already_transitioned,
+            expected_objects,
+            "{context}: {report:#?}"
+        );
+        assert_eq!(
+            report.enqueued + report.skipped_already_in_flight,
+            expected_objects,
+            "{context}: {report:#?}"
+        );
+    }
+    assert_eq!(
+        report.transition_completed, report.enqueued,
+        "{context}: winner must wait for all queued transitions: {report:#?}"
+    );
+}
+
 #[derive(Debug, Deserialize)]
 struct ManualTransitionQueueSnapshot {
    queue_capacity: u64,
@@ -1240,15 +1276,8 @@ async fn test_manual_transition_async_scope_conflicts_report_active_job() -> Tes
    cold_client.create_bucket().bucket(TIER_BUCKET).send().await?;

    let mut hot = RustFSTestEnvironment::new().await?;
-    hot.start_rustfs_server_with_env(
-        vec![],
-        &[
-            ("RUSTFS_SCANNER_ENABLED", "false"),
-            ("RUSTFS_SCANNER_CYCLE", "3600"),
-            (MANUAL_TRANSITION_CANCEL_BARRIER_ENV, "1"),
-        ],
-    )
-    .await?;
+    hot.start_rustfs_server_with_env(vec![], &[("RUSTFS_SCANNER_ENABLED", "false"), ("RUSTFS_SCANNER_CYCLE", "3600")])
+        .await?;
    let hot_client = hot.create_s3_client();
    add_rustfs_tier(&hot, &cold).await?;

@@ -1318,21 +1347,20 @@ async fn test_manual_transition_async_scope_conflicts_report_active_job() -> Tes
    assert_eq!(conflict.cancel_endpoint, status_endpoint);
    assert!(!conflict.scope_key.is_empty());

-    manual_transition_job_cancel(&hot, cancel_endpoint).await?;
-
    let terminal = wait_for_manual_transition_job_terminal(&hot, status_endpoint, MANUAL_ASYNC_CONFLICT_TERMINAL_TIMEOUT).await?;
    assert_eq!(terminal.job_id, job_id);
-    assert_eq!(terminal.status, "cancelled", "terminal conflict winner response: {terminal:#?}");
    assert!(!terminal.report.dry_run);
    assert_eq!(terminal.report.bucket, MANUAL_ASYNC_CONFLICT_BUCKET);
    assert_eq!(terminal.report.prefix, accepted.report.prefix);
-    assert!(terminal.report.cancelled, "terminal conflict winner response: {terminal:#?}");
-    assert_eq!(terminal.report.scanned, 0, "terminal conflict winner response: {terminal:#?}");
-    assert_eq!(terminal.report.enqueued, 0, "terminal conflict winner response: {terminal:#?}");
-    assert_eq!(
-        terminal.report.transition_completed, 0,
-        "terminal conflict winner response: {terminal:#?}"
+    assert_conflict_winner_report(
+        &terminal.status,
+        &terminal.report,
+        MANUAL_ASYNC_CONFLICT_OBJECTS as u64,
+        "terminal conflict winner response",
    );
+    assert_eq!(terminal.report.dry_run_eligible, 0, "terminal conflict winner response: {terminal:#?}");
+    assert_eq!(terminal.report.transition_failed, 0, "terminal conflict winner response: {terminal:#?}");
+    assert_eq!(terminal.report.tier_failure, 0, "terminal conflict winner response: {terminal:#?}");
    let after_remote_count = cold_tier_object_count(&cold_client).await?;
    assert!(after_remote_count >= before_remote_count);
    assert!(after_remote_count <= before_remote_count + MANUAL_ASYNC_CONFLICT_OBJECTS);
@@ -29,9 +29,8 @@ use aws_sdk_s3::types::{
 use aws_sdk_s3::{Client, Config};
 use base64::{Engine, engine::general_purpose::STANDARD as BASE64_STANDARD};
 use bytes::Bytes;
-use flate2::read::GzDecoder;
 use futures::{Stream, StreamExt};
-use http::header::{CONTENT_ENCODING, CONTENT_TYPE, HOST};
+use http::header::{CONTENT_TYPE, HOST};
 use http_body_util::{BodyExt, Full};
 use hyper::body::Incoming;
 use hyper::server::conn::http1;
@@ -39,10 +38,6 @@ use hyper::service::service_fn;
 use hyper::{Request, Response};
 use hyper_util::rt::TokioIo;
 use local_ip_address::local_ip;
-use opentelemetry_proto::tonic::collector::metrics::v1::ExportMetricsServiceRequest;
-use opentelemetry_proto::tonic::common::v1::{KeyValue, any_value::Value as AnyValue};
-use opentelemetry_proto::tonic::metrics::v1::{Metric, metric, number_data_point};
-use prost::Message;
 use rcgen::{
    BasicConstraints, CertificateParams, CertifiedIssuer, DnType, ExtendedKeyUsagePurpose, IsCa, KeyPair, KeyUsagePurpose,
    SanType, generate_simple_self_signed,
@@ -61,7 +56,6 @@ use sha2::{Digest, Sha256};
 use std::collections::BTreeMap;
 use std::convert::Infallible;
 use std::error::Error;
-use std::io::Read;
 use std::net::IpAddr;
 use std::path::Path;
 use std::process::Command;
@@ -70,13 +64,11 @@ use std::sync::atomic::{AtomicU64, Ordering};
 use time::{Duration as TimeDuration, OffsetDateTime};
 use tokio::fs;
 use tokio::net::TcpListener;
-use tokio::sync::{Mutex, watch};
-use tokio::task::JoinHandle;
+use tokio::sync::watch;
 use tokio::task::JoinSet;
 use tokio::time::{Duration, sleep, timeout};

 type TestResult = Result<(), Box<dyn Error + Send + Sync>>;
-type BacklogMetricPoints = Arc<Mutex<BTreeMap<String, BTreeMap<String, (u64, f64)>>>>;

 /// A replication source server validates the remote target endpoint, and the e2e
 /// target runs on loopback (127.0.0.1), which RustFS's SSRF egress guard rejects by
@@ -115,252 +107,6 @@ const REPL17_KMS_KEY_ID: &str = "repl17-local-key";
 const REPL17_SSEC_KEY: &str = "01234567890123456789012345678901";
 const REPLICATION_FAILED_EVENT: &str = "s3:Replication:OperationFailedReplication";
 const REPLICATION_EVENT_MAX_BUFFER_BYTES: usize = 1024 * 1024;
-const OTLP_METRICS_BODY_LIMIT: u64 = 4 * 1024 * 1024;
-const BUCKET_LABEL: &str = "bucket";
-const TOTAL_FAILED_COUNT_METRIC: &str = "rustfs_bucket_replication_total_failed_count";
-const CURRENT_BACKLOG_COUNT_METRIC: &str = "rustfs_bucket_replication_current_backlog_count";
-const CURRENT_BACKLOG_BYTES_METRIC: &str = "rustfs_bucket_replication_current_backlog_bytes";
-const MRF_PENDING_COUNT_METRIC: &str = "rustfs_bucket_replication_mrf_pending_count";
-const MRF_PENDING_BYTES_METRIC: &str = "rustfs_bucket_replication_mrf_pending_bytes";
-
-struct ReplicationBacklogMetricCollector {
-    endpoint: String,
-    values: BacklogMetricPoints,
-    task: JoinHandle<()>,
-}
-
-impl ReplicationBacklogMetricCollector {
-    async fn start() -> Result<Self, Box<dyn Error + Send + Sync>> {
-        let listener = TcpListener::bind("127.0.0.1:0").await?;
-        let endpoint = format!("http://{}/v1/metrics", listener.local_addr()?);
-        let values = Arc::new(Mutex::new(BTreeMap::new()));
-        let task_values = values.clone();
-        let task = tokio::spawn(async move {
-            loop {
-                let Ok((stream, _)) = listener.accept().await else {
-                    break;
-                };
-                let values = task_values.clone();
-                tokio::spawn(async move {
-                    let _ = http1::Builder::new()
-                        .serve_connection(
-                            TokioIo::new(stream),
-                            service_fn(move |request| handle_backlog_metric_export(request, values.clone())),
-                        )
-                        .await;
-                });
-            }
-        });
-
-        Ok(Self { endpoint, values, task })
-    }
-
-    fn root_endpoint(&self) -> &str {
-        self.endpoint.trim_end_matches("/v1/metrics")
-    }
-
-    async fn bucket_metric_value(&self, metric: &str, bucket: &str) -> f64 {
-        self.values
-            .lock()
-            .await
-            .get(metric)
-            .and_then(|buckets| buckets.get(bucket))
-            .map(|(_, value)| *value)
-            .unwrap_or_default()
-    }
-
-    async fn wait_for_bucket_metric(
-        &self,
-        metric: &str,
-        bucket: &str,
-        expected: impl Fn(f64) -> bool,
-        description: &str,
-    ) -> Result<f64, Box<dyn Error + Send + Sync>> {
-        let deadline = tokio::time::Instant::now() + Duration::from_secs(30);
-        loop {
-            let value = self.bucket_metric_value(metric, bucket).await;
-            if expected(value) {
-                return Ok(value);
-            }
-            if tokio::time::Instant::now() >= deadline {
-                let snapshot = self.values.lock().await.clone();
-                return Err(format!("timed out waiting for {metric} on bucket {bucket} to satisfy {description}; last={value}, snapshot={snapshot:?}").into());
-            }
-            sleep(Duration::from_millis(200)).await;
-        }
-    }
-}
-
-impl Drop for ReplicationBacklogMetricCollector {
-    fn drop(&mut self) {
-        self.task.abort();
-    }
-}
-
-async fn handle_backlog_metric_export(
-    request: Request<Incoming>,
-    values: BacklogMetricPoints,
-) -> Result<Response<Full<Bytes>>, Infallible> {
-    if request.uri().path() != "/v1/metrics" {
-        return Ok(empty_http_response(StatusCode::NOT_FOUND));
-    }
-
-    let gzip = request
-        .headers()
-        .get(CONTENT_ENCODING)
-        .and_then(|value| value.to_str().ok())
-        .is_some_and(|value| value.eq_ignore_ascii_case("gzip"));
-    let Ok(collected) = request.into_body().collect().await else {
-        return Ok(empty_http_response(StatusCode::BAD_REQUEST));
-    };
-    let body = collected.to_bytes();
-    if body.len() as u64 > OTLP_METRICS_BODY_LIMIT {
-        return Ok(empty_http_response(StatusCode::PAYLOAD_TOO_LARGE));
-    }
-    let payload = if gzip {
-        let mut decoder = GzDecoder::new(body.as_ref());
-        let mut decoded = Vec::new();
-        if decoder
-            .by_ref()
-            .take(OTLP_METRICS_BODY_LIMIT + 1)
-            .read_to_end(&mut decoded)
-            .is_err()
-            || decoded.len() as u64 > OTLP_METRICS_BODY_LIMIT
-        {
-            return Ok(empty_http_response(StatusCode::BAD_REQUEST));
-        }
-        decoded
-    } else {
-        body.to_vec()
-    };
-
-    match ExportMetricsServiceRequest::decode(payload.as_slice()) {
-        Ok(export) => {
-            let mut values = values.lock().await;
-            record_backlog_metrics(&export, &mut values);
-            Ok(empty_http_response(StatusCode::OK))
-        }
-        Err(_) => Ok(empty_http_response(StatusCode::BAD_REQUEST)),
-    }
-}
-
-fn empty_http_response(status: StatusCode) -> Response<Full<Bytes>> {
-    Response::builder()
-        .status(status)
-        .body(Full::new(Bytes::new()))
-        .expect("static HTTP response is valid")
-}
-
-fn record_backlog_metrics(export: &ExportMetricsServiceRequest, values: &mut BTreeMap<String, BTreeMap<String, (u64, f64)>>) {
-    for resource_metrics in &export.resource_metrics {
-        for scope_metrics in &resource_metrics.scope_metrics {
-            for metric in &scope_metrics.metrics {
-                record_backlog_metric(metric, values);
-            }
-        }
-    }
-}
-
-fn record_backlog_metric(metric: &Metric, values: &mut BTreeMap<String, BTreeMap<String, (u64, f64)>>) {
-    if ![
-        TOTAL_FAILED_COUNT_METRIC,
-        CURRENT_BACKLOG_COUNT_METRIC,
-        CURRENT_BACKLOG_BYTES_METRIC,
-        MRF_PENDING_COUNT_METRIC,
-        MRF_PENDING_BYTES_METRIC,
-    ]
-    .contains(&metric.name.as_str())
-    {
-        return;
-    }
-
-    let points = match &metric.data {
-        Some(metric::Data::Gauge(gauge)) => gauge.data_points.as_slice(),
-        Some(metric::Data::Sum(sum)) => sum.data_points.as_slice(),
-        _ => return,
-    };
-    for point in points {
-        let Some(bucket) = attribute_string(&point.attributes, BUCKET_LABEL) else {
-            continue;
-        };
-        let Some(value) = number_point_value(point.value.as_ref()) else {
-            continue;
-        };
-        values
-            .entry(metric.name.clone())
-            .or_default()
-            .entry(bucket.to_string())
-            .and_modify(|current| {
-                if point.time_unix_nano >= current.0 {
-                    *current = (point.time_unix_nano, value);
-                }
-            })
-            .or_insert((point.time_unix_nano, value));
-    }
-}
-
-fn number_point_value(value: Option<&number_data_point::Value>) -> Option<f64> {
-    match value? {
-        number_data_point::Value::AsDouble(value) => Some(*value),
-        number_data_point::Value::AsInt(value) => Some(*value as f64),
-    }
-}
-
-fn attribute_string<'a>(attributes: &'a [KeyValue], wanted_key: &str) -> Option<&'a str> {
-    attributes.iter().find_map(|attribute| {
-        if attribute.key != wanted_key {
-            return None;
-        }
-        match attribute.value.as_ref()?.value.as_ref()? {
-            AnyValue::StringValue(value) => Some(value.as_str()),
-            _ => None,
-        }
-    })
-}
-
-struct SlowReplicationTargetGuard {
-    task: Option<JoinHandle<()>>,
-}
-
-impl SlowReplicationTargetGuard {
-    async fn bind(address: &str, response_delay: Duration) -> Result<Self, Box<dyn Error + Send + Sync>> {
-        let listener = TcpListener::bind(address).await?;
-        let task = tokio::spawn(async move {
-            loop {
-                let Ok((stream, _)) = listener.accept().await else {
-                    break;
-                };
-                tokio::spawn(async move {
-                    let _ = http1::Builder::new()
-                        .serve_connection(
-                            TokioIo::new(stream),
-                            service_fn(move |_request| async move {
-                                sleep(response_delay).await;
-                                Ok::<_, Infallible>(empty_http_response(StatusCode::SERVICE_UNAVAILABLE))
-                            }),
-                        )
-                        .await;
-                });
-            }
-        });
-        Ok(Self { task: Some(task) })
-    }
-
-    async fn stop(mut self) {
-        if let Some(task) = self.task.take() {
-            task.abort();
-            let _ = task.await;
-        }
-    }
-}
-
-impl Drop for SlowReplicationTargetGuard {
-    fn drop(&mut self) {
-        if let Some(task) = self.task.take() {
-            task.abort();
-        }
-    }
-}

 #[derive(Debug, Clone, serde::Deserialize)]
 struct ReplicationResetStatusResponse {
@@ -1507,10 +1253,6 @@ async fn build_sse_replication_pair(
            ("RUSTFS_KMS_KEY_DIR", source_kms_key_dir.as_str()),
            ("RUSTFS_KMS_DEFAULT_KEY_ID", REPL17_KMS_KEY_ID),
            ("RUSTFS_KMS_ALLOW_INSECURE_DEV_DEFAULTS", "true"),
-            // Per-key KMS authorization is on so this contract is pinned in the
-            // configuration replication will eventually ship with: the replication
-            // worker carries no request identity and must stay exempt.
-            ("RUSTFS_KMS_ENFORCE_SSE_KEY_POLICY", "true"),
        ]);
    }
    source_env.start_rustfs_server_with_env(vec![], &source_process_env).await?;
@@ -1523,7 +1265,6 @@ async fn build_sse_replication_pair(
            ("RUSTFS_KMS_KEY_DIR", target_kms_key_dir.as_str()),
            ("RUSTFS_KMS_DEFAULT_KEY_ID", REPL17_KMS_KEY_ID),
            ("RUSTFS_KMS_ALLOW_INSECURE_DEV_DEFAULTS", "true"),
-            ("RUSTFS_KMS_ENFORCE_SSE_KEY_POLICY", "true"),
        ]);
    }
    target_env
@@ -1945,28 +1686,6 @@ async fn wait_for_remote_target_arn(env: &RustFSTestEnvironment, bucket: &str) -
    Err(format!("site replication did not configure a remote target for bucket {bucket} in time").into())
 }

-async fn wait_for_remote_target_health_check(
-    env: &RustFSTestEnvironment,
-    bucket: &str,
-    arn: &str,
-) -> Result<(), Box<dyn Error + Send + Sync>> {
-    for _ in 0..40 {
-        let response = list_replication_targets_request(env, Some(bucket)).await?;
-        if response.status() == StatusCode::OK {
-            let targets: Vec<serde_json::Value> = response.json().await?;
-            if targets.iter().any(|target| {
-                target.get("arn").and_then(|value| value.as_str()) == Some(arn)
-                    && target.get("lastOnline").is_some_and(|value| !value.is_null())
-            }) {
-                return Ok(());
-            }
-        }
-        sleep(Duration::from_millis(250)).await;
-    }
-
-    Err(format!("replication target {arn} did not complete a successful health check in time").into())
-}
-
 async fn site_replication_add(
    env: &RustFSTestEnvironment,
    sites: &[PeerSite],
@@ -2934,8 +2653,6 @@ async fn test_set_remote_target_allows_self_signed_https_target_with_skip_tls_ve
    let target_bucket = "replication-self-signed-ok-dst";
    let object_key = "self-signed-replication.txt";
    let body = "replication over self-signed https should succeed";
-    let post_health_check_key = "self-signed-replication-after-health-check.txt";
-    let post_health_check_body = "replication should remain available after the target health check";

    let source_client = source_env.create_s3_client();
    source_client
@@ -2984,24 +2701,6 @@ async fn test_set_remote_target_allows_self_signed_https_target_with_skip_tls_ve

    wait_for_replicated_object_over_https(&https_client, &target_env, target_bucket, object_key, body).await?;

-    wait_for_remote_target_health_check(&source_env, source_bucket, &target_arn).await?;
-    source_client
-        .put_object()
-        .bucket(source_bucket)
-        .key(post_health_check_key)
-        .body(ByteStream::from(post_health_check_body.as_bytes().to_vec()))
-        .send()
-        .await?;
-
-    wait_for_replicated_object_over_https(
-        &https_client,
-        &target_env,
-        target_bucket,
-        post_health_check_key,
-        post_health_check_body,
-    )
-    .await?;
-
    Ok(())
 }

@@ -3960,139 +3659,6 @@ async fn test_bucket_replication_recovers_after_target_outage() -> TestResult {
    Ok(())
 }

-/// backlog#1610 - black-box bucket replication backlog observability.
-///
-/// The source exports metrics through the same OTLP path production uses. A slow
-/// loopback target keeps replication workers occupied long enough for the metrics
-/// runtime to publish non-zero bucket backlog gauges; after the real target
-/// returns, replication must converge and the exported current/MRF pending gauges
-/// must settle back to zero even though the historical failed counter remains
-/// non-zero.
-#[tokio::test]
-#[serial]
-async fn test_bucket_replication_backlog_metrics_observe_outage_and_recovery() -> TestResult {
-    init_logging();
-
-    let collector = ReplicationBacklogMetricCollector::start().await?;
-    let mut source_env = RustFSTestEnvironment::new().await?;
-    let metric_root = collector.root_endpoint().to_string();
-    let metric_endpoint = collector.endpoint.clone();
-    let mut source_env_vars: Vec<(&str, &str)> = replication_fast_env().into_iter().collect();
-    source_env_vars.extend_from_slice(LOOPBACK_REPLICATION_TARGET_ENV);
-    source_env_vars.extend_from_slice(FAST_SCANNER_ENV);
-    source_env_vars.extend_from_slice(&[
-        ("RUSTFS_OBS_ENDPOINT", metric_root.as_str()),
-        ("RUSTFS_OBS_METRIC_ENDPOINT", metric_endpoint.as_str()),
-        ("RUSTFS_OBS_METRICS_EXPORT_ENABLED", "true"),
-        ("RUSTFS_OBS_TRACES_EXPORT_ENABLED", "false"),
-        ("RUSTFS_OBS_LOGS_EXPORT_ENABLED", "false"),
-        ("RUSTFS_OBS_METER_INTERVAL", "1"),
-        ("RUSTFS_OBS_USE_STDOUT", "false"),
-        ("RUSTFS_METRICS_BUCKET_REPLICATION_BANDWIDTH_INTERVAL_SEC", "1"),
-    ]);
-    source_env.start_rustfs_server_with_env(vec![], &source_env_vars).await?;
-
-    let mut target_env = RustFSTestEnvironment::new().await?;
-    target_env.start_rustfs_server_without_cleanup(vec![]).await?;
-
-    let source_bucket = "repl-backlog-metrics-src";
-    let target_bucket = "repl-backlog-metrics-dst";
-    let source_client = source_env.create_s3_client();
-    let target_client = target_env.create_s3_client();
-
-    source_client.create_bucket().bucket(source_bucket).send().await?;
-    target_client.create_bucket().bucket(target_bucket).send().await?;
-    enable_bucket_versioning(&source_env, source_bucket).await?;
-    enable_bucket_versioning(&target_env, target_bucket).await?;
-
-    let target_arn = set_replication_target(&source_env, source_bucket, &target_env, target_bucket).await?;
-    put_bucket_replication(&source_env, source_bucket, &target_arn).await?;
-
-    source_client
-        .put_object()
-        .bucket(source_bucket)
-        .key("before-outage.txt")
-        .body(ByteStream::from_static(b"baseline written before backlog metrics outage"))
-        .send()
-        .await?;
-    assert_replication_converged(&source_client, source_bucket, &target_client, target_bucket).await?;
-
-    target_env.stop_server();
-    let slow_target = SlowReplicationTargetGuard::bind(&target_env.address, Duration::from_secs(5)).await?;
-
-    let outage_keys = ["metrics-outage-1.txt", "metrics-outage-2.txt", "metrics-outage-3.txt"];
-    for key in outage_keys {
-        source_client
-            .put_object()
-            .bucket(source_bucket)
-            .key(key)
-            .body(ByteStream::from(
-                format!("written while backlog metrics target was slow: {key}").into_bytes(),
-            ))
-            .send()
-            .await?;
-    }
-
-    let current_backlog = collector
-        .wait_for_bucket_metric(
-            CURRENT_BACKLOG_COUNT_METRIC,
-            source_bucket,
-            |value| value >= 1.0,
-            "be at least 1 during outage",
-        )
-        .await?;
-    let current_bytes = collector
-        .wait_for_bucket_metric(
-            CURRENT_BACKLOG_BYTES_METRIC,
-            source_bucket,
-            |value| value > 0.0,
-            "report bytes during outage",
-        )
-        .await?;
-    assert!(
-        current_bytes >= current_backlog,
-        "backlog bytes should be at least the object count while queued; count={current_backlog}, bytes={current_bytes}"
-    );
-    let failed_count = collector
-        .wait_for_bucket_metric(
-            TOTAL_FAILED_COUNT_METRIC,
-            source_bucket,
-            |value| value >= 1.0,
-            "record at least one failed replication attempt during outage",
-        )
-        .await?;
-
-    slow_target.stop().await;
-    target_env.restart_server_preserving_data(vec![], &[]).await?;
-
-    assert_replication_converged(&source_client, source_bucket, &target_client, target_bucket).await?;
-    for metric in [
-        CURRENT_BACKLOG_COUNT_METRIC,
-        CURRENT_BACKLOG_BYTES_METRIC,
-        MRF_PENDING_COUNT_METRIC,
-        MRF_PENDING_BYTES_METRIC,
-    ] {
-        collector
-            .wait_for_bucket_metric(metric, source_bucket, |value| value == 0.0, "settle back to zero after recovery")
-            .await?;
-    }
-    let final_failed_count = collector.bucket_metric_value(TOTAL_FAILED_COUNT_METRIC, source_bucket).await;
-    assert!(
-        final_failed_count >= failed_count,
-        "historical failed counter should remain non-zero after recovery while current backlog is zero; before={failed_count}, after={final_failed_count}"
-    );
-
-    let target_state = list_replication_state(&target_client, target_bucket).await?;
-    for key in ["before-outage.txt"].into_iter().chain(outage_keys) {
-        assert!(
-            target_state.iter().any(|entry| entry.key == key && !entry.delete_marker),
-            "target missing object {key} after backlog metrics recovery; state={target_state:?}"
-        );
-    }
-
-    Ok(())
-}
-
 /// backlog#1147 repl-5, scenario (b) — failure state survives a source restart
 /// (mirrors backlog#858 delete-decision re-derivation and #859 no-drop).
 ///
@@ -16,12 +16,9 @@
 pub(crate) use rustfs_ecstore::api::bucket::bucket_target_sys::BucketTargetSys;
 #[cfg(test)]
 pub(crate) use rustfs_ecstore::api::disk::{VolumeInfo, WalkDirOptions};
-pub(crate) use rustfs_ecstore::api::rpc::{AuthenticatedChannel, TonicInterceptor, node_service_time_out_client_no_auth};
 #[cfg(test)]
-pub(crate) use rustfs_ecstore::api::rpc::{
-    TONIC_RPC_PREFIX, gen_signature_headers, gen_tonic_replay_scope_headers, gen_tonic_signature_headers,
-    verify_tonic_boot_epoch_response,
-};
+pub(crate) use rustfs_ecstore::api::rpc::{TONIC_RPC_PREFIX, gen_signature_headers, gen_tonic_signature_headers};
+pub(crate) use rustfs_ecstore::api::rpc::{TonicInterceptor, node_service_time_out_client_no_auth};
 #[cfg(test)]
 pub(crate) use rustfs_ecstore::api::rpc::{gen_tonic_signature_interceptor, node_service_time_out_client};

@@ -33,7 +30,7 @@ pub(crate) mod node_interact {
 }

 pub(crate) mod grpc_lock {
-    pub(crate) use super::{AuthenticatedChannel, TonicInterceptor, node_service_time_out_client_no_auth};
+    pub(crate) use super::{TonicInterceptor, node_service_time_out_client_no_auth};
 }

 /// Signing/transport surface used by the cross-process internode RPC signature
@@ -43,8 +40,7 @@ pub(crate) mod grpc_lock {
 #[cfg(test)]
 pub(crate) mod internode_rpc_signature {
    pub(crate) use super::{
-        TONIC_RPC_PREFIX, gen_signature_headers, gen_tonic_replay_scope_headers, gen_tonic_signature_headers,
-        node_service_time_out_client_no_auth, verify_tonic_boot_epoch_response,
+        TONIC_RPC_PREFIX, gen_signature_headers, gen_tonic_signature_headers, node_service_time_out_client_no_auth,
    };
 }

@@ -12,35 +12,22 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-use crate::common::{RustFSTestEnvironment, admin_ok, init_logging};
+use crate::common::{RustFSTestEnvironment, init_logging, local_http_client};
 use aws_sdk_sts::config::retry::RetryConfig;
 use aws_sdk_sts::config::{Credentials, Region};
 use aws_sdk_sts::error::ProvideErrorMetadata;
 use aws_sdk_sts::operation::RequestId;
 use aws_sdk_sts::{Client, Config};
 use aws_smithy_http_client::Builder as SmithyHttpClientBuilder;
-use bytes::Bytes;
-use http::header::{AUTHORIZATION, CONTENT_TYPE};
-use http::{Request, Response};
-use http_body_util::{BodyExt, Full};
-use hyper::body::Incoming;
-use hyper::server::conn::http1;
-use hyper::service::service_fn;
-use hyper_util::rt::TokioIo;
-use serde_json::Value;
+use http::header::{CONTENT_TYPE, HOST};
+use rustfs_signer::constants::UNSIGNED_PAYLOAD;
+use rustfs_signer::sign_v4;
+use s3s::Body;
 use serial_test::serial;
-use std::collections::BTreeSet;
-use std::convert::Infallible;
 use std::error::Error;
-use std::sync::Arc;
-use tokio::net::TcpListener;
-use tokio::sync::{Notify, mpsc};
-use tokio::task::{JoinHandle, JoinSet};
-use tokio::time::{Duration, timeout};

 type BoxError = Box<dyn Error + Send + Sync>;
 type TestResult = Result<(), BoxError>;
-const OPA_AUTH_TOKEN: &str = "sts-opa-token";

 fn sts_client(url: &str, access_key: &str, secret_key: &str, session_token: Option<&str>) -> Client {
    let mut config = Config::builder()
@@ -62,14 +49,32 @@ fn sts_client(url: &str, access_key: &str, secret_key: &str, session_token: Opti
 }

 async fn create_root_service_account(env: &RustFSTestEnvironment) -> Result<(String, String), BoxError> {
-    let body = admin_ok(
-        env,
-        http::Method::PUT,
-        "/rustfs/admin/v3/add-service-accounts",
-        Some(serde_json::json!({ "targetUser": env.access_key.clone() }).to_string()),
-    )
-    .await?;
-    let response: Value = serde_json::from_str(&body)?;
+    let path = "/rustfs/admin/v3/add-service-accounts";
+    let url = format!("{}{path}", env.url);
+    let uri = url.parse::<http::Uri>()?;
+    let authority = uri.authority().ok_or("admin URL missing authority")?.to_string();
+    let body = serde_json::json!({ "targetUser": env.access_key.clone() }).to_string();
+    let request = http::Request::builder()
+        .method(http::Method::PUT)
+        .uri(uri)
+        .header(HOST, authority)
+        .header(CONTENT_TYPE, "application/json")
+        .header("x-amz-content-sha256", UNSIGNED_PAYLOAD)
+        .body(Body::empty())?;
+    let content_length = i64::try_from(body.len()).map_err(|_| "service account request body is too large")?;
+    let signed = sign_v4(request, content_length, &env.access_key, &env.secret_key, "", "us-east-1");
+    let mut request = local_http_client().put(&url);
+    for (name, value) in signed.headers() {
+        request = request.header(name, value);
+    }
+    let response = request.body(body).send().await?;
+    let status = response.status();
+    let body = response.text().await?;
+    if !status.is_success() {
+        return Err(format!("create service account failed: {status} {body}").into());
+    }
+
+    let response: serde_json::Value = serde_json::from_str(&body)?;
    let access_key = response["credentials"]["accessKey"]
        .as_str()
        .ok_or("service account response should contain credentials.accessKey")?
@@ -81,237 +86,28 @@ async fn create_root_service_account(env: &RustFSTestEnvironment) -> Result<(Str
    Ok((access_key, secret_key))
 }

-async fn create_user_with_policy(
-    env: &RustFSTestEnvironment,
-    user: &str,
-    secret: &str,
-    policy_name: &str,
-    statements: Value,
-) -> TestResult {
-    create_user(env, user, secret).await?;
-    admin_ok(
-        env,
-        http::Method::PUT,
-        &format!("/rustfs/admin/v3/add-canned-policy?name={policy_name}"),
-        Some(
-            serde_json::json!({
-                "Version": "2012-10-17",
-                "Statement": statements,
-            })
-            .to_string(),
-        ),
-    )
-    .await?;
-    admin_ok(
-        env,
-        http::Method::POST,
-        "/rustfs/admin/v3/idp/builtin/policy/attach",
-        Some(serde_json::json!({ "policies": [policy_name], "user": user }).to_string()),
-    )
-    .await?;
-    Ok(())
-}
-
-async fn create_user(env: &RustFSTestEnvironment, user: &str, secret: &str) -> TestResult {
-    admin_ok(
-        env,
-        http::Method::PUT,
-        &format!("/rustfs/admin/v3/add-user?accessKey={user}"),
-        Some(serde_json::json!({ "secretKey": secret, "status": "enabled" }).to_string()),
-    )
-    .await?;
-    Ok(())
-}
-
-async fn assert_access_denied(client: &Client, context: &str) -> TestResult {
+async fn assert_chaining_denied(client: &Client, credential_kind: &str) -> TestResult {
    let error = client
        .assume_role()
        .role_arn("arn:aws:iam::123456789012:role/test")
        .role_session_name("sts-query-compat-e2e")
        .send()
        .await
-        .expect_err("AssumeRole must be denied");
+        .expect_err("credential chaining must be denied");
    let service_error = error
        .as_service_error()
-        .ok_or_else(|| format!("{context} should deserialize as an STS service error: {error:?}"))?;
+        .ok_or_else(|| format!("{credential_kind} denial should deserialize as an STS service error: {error:?}"))?;

    assert_eq!(error.raw_response().map(|response| response.status().as_u16()), Some(403));
    assert_eq!(service_error.code(), Some("AccessDenied"));
    assert_eq!(service_error.message(), Some("Access Denied"));
    assert!(
        error.request_id().is_some_and(|request_id| !request_id.is_empty()),
-        "{context} should include a request ID"
+        "{credential_kind} denial should include a request ID"
    );
    Ok(())
 }

-async fn handle_opa_request(
-    request: Request<Incoming>,
-    requests: mpsc::UnboundedSender<Value>,
-    validation_started: mpsc::UnboundedSender<()>,
-    validation_mode: OpaValidationMode,
-    expected_authorization: Option<String>,
-) -> Result<Response<Full<Bytes>>, Infallible> {
-    if let Some(expected_authorization) = expected_authorization
-        && request.headers().get(AUTHORIZATION).and_then(|value| value.to_str().ok()) != Some(expected_authorization.as_str())
-    {
-        return Ok(Response::builder()
-            .status(401)
-            .body(Full::new(Bytes::new()))
-            .expect("static OPA unauthorized response must be valid"));
-    }
-
-    let body = match request.into_body().collect().await {
-        Ok(body) => body.to_bytes(),
-        Err(error) => {
-            return Ok(Response::builder()
-                .status(400)
-                .body(Full::new(Bytes::from(error.to_string())))
-                .expect("static OPA error response must be valid"));
-        }
-    };
-
-    let payload = if body.is_empty() {
-        None
-    } else {
-        match serde_json::from_slice::<Value>(&body) {
-            Ok(payload) => Some(payload),
-            Err(error) => {
-                return Ok(Response::builder()
-                    .status(400)
-                    .body(Full::new(Bytes::from(error.to_string())))
-                    .expect("static OPA error response must be valid"));
-            }
-        }
-    };
-    if payload.is_none() {
-        let _ = validation_started.send(());
-        if let OpaValidationMode::DelayedUnavailable(release) = validation_mode {
-            release.notified().await;
-            return Ok(Response::builder()
-                .status(503)
-                .body(Full::new(Bytes::new()))
-                .expect("static OPA unavailable response must be valid"));
-        }
-    }
-    let allow = match payload.as_ref().and_then(|value| value.pointer("/input/identity/account")) {
-        Some(Value::String(account)) if account == "opaallow" => payload
-            .as_ref()
-            .and_then(|value| value.pointer("/input/context/deny_only"))
-            .and_then(Value::as_bool)
-            .unwrap_or(false),
-        Some(Value::String(account)) if account == "opadeny" => false,
-        None => true,
-        _ => false,
-    };
-    if let Some(payload) = payload {
-        let _ = requests.send(payload);
-    }
-    let body =
-        serde_json::to_vec(&serde_json::json!({ "result": { "allow": allow } })).expect("static OPA response must serialize");
-    Ok(Response::builder()
-        .header(CONTENT_TYPE, "application/json")
-        .body(Full::new(Bytes::from(body)))
-        .expect("static OPA response must be valid"))
-}
-
-#[derive(Clone)]
-enum OpaValidationMode {
-    Ready,
-    DelayedUnavailable(Arc<Notify>),
-}
-
-struct OpaMock {
-    url: String,
-    requests: mpsc::UnboundedReceiver<Value>,
-    validation_started: mpsc::UnboundedReceiver<()>,
-    validation_release: Option<Arc<Notify>>,
-    task: JoinHandle<()>,
-}
-
-impl OpaMock {
-    async fn start() -> Result<Self, BoxError> {
-        Self::start_with_mode(OpaValidationMode::Ready, Some(OPA_AUTH_TOKEN)).await
-    }
-
-    async fn start_delayed_unavailable() -> Result<Self, BoxError> {
-        let release = Arc::new(Notify::new());
-        Self::start_with_mode(OpaValidationMode::DelayedUnavailable(release), None).await
-    }
-
-    async fn start_with_mode(validation_mode: OpaValidationMode, auth_token: Option<&str>) -> Result<Self, BoxError> {
-        let listener = TcpListener::bind("127.0.0.1:0").await?;
-        let url = format!("http://{}/v1/data/rustfs/authz/allow", listener.local_addr()?);
-        let (requests_tx, requests) = mpsc::unbounded_channel();
-        let (validation_started_tx, validation_started) = mpsc::unbounded_channel();
-        let expected_authorization = auth_token.map(|token| format!("Bearer {token}"));
-        let validation_release = match &validation_mode {
-            OpaValidationMode::Ready => None,
-            OpaValidationMode::DelayedUnavailable(release) => Some(Arc::clone(release)),
-        };
-        let task = tokio::spawn(async move {
-            let mut connections = JoinSet::new();
-            loop {
-                tokio::select! {
-                    accepted = listener.accept() => {
-                        let Ok((stream, _)) = accepted else { break };
-                        let requests = requests_tx.clone();
-                        let validation_started = validation_started_tx.clone();
-                        let validation_mode = validation_mode.clone();
-                        let expected_authorization = expected_authorization.clone();
-                        connections.spawn(async move {
-                            let handler = service_fn(move |request| {
-                                handle_opa_request(
-                                    request,
-                                    requests.clone(),
-                                    validation_started.clone(),
-                                    validation_mode.clone(),
-                                    expected_authorization.clone(),
-                                )
-                            });
-                            let _ = http1::Builder::new()
-                                .serve_connection(TokioIo::new(stream), handler)
-                                .await;
-                        });
-                    }
-                    _ = connections.join_next(), if !connections.is_empty() => {}
-                }
-            }
-        });
-        Ok(Self {
-            url,
-            requests,
-            validation_started,
-            validation_release,
-            task,
-        })
-    }
-
-    async fn next_request(&mut self) -> Result<Value, BoxError> {
-        timeout(Duration::from_secs(5), self.requests.recv())
-            .await?
-            .ok_or_else(|| "OPA request channel closed".into())
-    }
-
-    async fn wait_for_validation(&mut self) -> TestResult {
-        timeout(Duration::from_secs(5), self.validation_started.recv())
-            .await?
-            .ok_or_else(|| "OPA validation channel closed".into())
-    }
-
-    fn release_validation(&self) {
-        if let Some(release) = &self.validation_release {
-            release.notify_one();
-        }
-    }
-}
-
-impl Drop for OpaMock {
-    fn drop(&mut self) {
-        self.task.abort();
-    }
-}
-
 #[tokio::test]
 #[serial]
 async fn test_sts_query_responses_are_aws_sdk_compatible() -> TestResult {
@@ -359,7 +155,7 @@ async fn test_sts_query_responses_are_aws_sdk_compatible() -> TestResult {
        "signature rejection should include a request ID"
    );

-    assert_access_denied(
+    assert_chaining_denied(
        &sts_client(
            &env.url,
            temporary.access_key_id(),
@@ -371,187 +167,7 @@ async fn test_sts_query_responses_are_aws_sdk_compatible() -> TestResult {
    .await?;

    let (service_access_key, service_secret_key) = create_root_service_account(&env).await?;
-    assert_access_denied(
-        &sts_client(&env.url, &service_access_key, &service_secret_key, None),
-        "service-account denial",
-    )
-    .await?;
-
-    let implicit_user = "stsimplicit";
-    let explicit_allow_user = "stsallow";
-    let explicit_deny_user = "stsdeny";
-    let policyless_user = "stspolicyless";
-    let secret = "stsAuthzSecret123";
-    create_user(&env, policyless_user, secret).await?;
-    assert_access_denied(&sts_client(&env.url, policyless_user, secret, None), "policyless user").await?;
-    create_user_with_policy(
-        &env,
-        implicit_user,
-        secret,
-        "sts-implicit-policy",
-        serde_json::json!([{
-            "Effect": "Allow",
-            "Action": ["s3:ListAllMyBuckets"],
-            "Resource": ["arn:aws:s3:::*"],
-        }]),
-    )
-    .await?;
-    create_user_with_policy(
-        &env,
-        explicit_allow_user,
-        secret,
-        "sts-allow-policy",
-        serde_json::json!([{
-            "Effect": "Allow",
-            "Action": ["sts:AssumeRole"],
-            "Resource": ["arn:aws:s3:::*"],
-        }]),
-    )
-    .await?;
-    create_user_with_policy(
-        &env,
-        explicit_deny_user,
-        secret,
-        "sts-deny-policy",
-        serde_json::json!([
-            {
-                "Effect": "Allow",
-                "Action": ["sts:AssumeRole"],
-                "Resource": ["arn:aws:s3:::*"],
-            },
-            {
-                "Effect": "Deny",
-                "Action": ["sts:AssumeRole"],
-                "Resource": ["arn:aws:s3:::*"],
-            }
-        ]),
-    )
-    .await?;
-
-    for user in [implicit_user, explicit_allow_user] {
-        let output = sts_client(&env.url, user, secret, None)
-            .assume_role()
-            .role_arn("arn:aws:iam::123456789012:role/test")
-            .role_session_name("sts-authz-e2e")
-            .send()
-            .await
-            .map_err(|error| format!("{user} should be allowed to call AssumeRole: {error:?}"))?;
-        let credentials = output
-            .credentials()
-            .ok_or_else(|| format!("{user} AssumeRole response should contain credentials"))?;
-        assert!(!credentials.access_key_id().is_empty());
-        assert!(!credentials.secret_access_key().is_empty());
-        assert!(!credentials.session_token().is_empty());
-    }
-    assert_access_denied(&sts_client(&env.url, explicit_deny_user, secret, None), "explicit sts:AssumeRole Deny").await?;
-
-    env.stop_server();
-    Ok(())
-}
-
-#[tokio::test]
-#[serial]
-async fn test_sts_assume_role_opa_contract() -> TestResult {
-    init_logging();
-
-    let mut opa = OpaMock::start().await?;
-    let mut env = RustFSTestEnvironment::new().await?;
-    env.start_rustfs_server_with_env(
-        vec![],
-        &[
-            ("RUSTFS_POLICY_PLUGIN_URL", opa.url.as_str()),
-            ("RUSTFS_POLICY_PLUGIN_AUTH_TOKEN", OPA_AUTH_TOKEN),
-        ],
-    )
-    .await?;
-
-    let secret = "stsOpaSecret123";
-    create_user_with_policy(
-        &env,
-        "opaallow",
-        secret,
-        "sts-opa-local-deny-policy",
-        serde_json::json!([{
-            "Effect": "Deny",
-            "Action": ["sts:AssumeRole"],
-            "Resource": ["arn:aws:s3:::*"],
-        }]),
-    )
-    .await?;
-    create_user_with_policy(
-        &env,
-        "opadeny",
-        secret,
-        "sts-opa-local-allow-policy",
-        serde_json::json!([{
-            "Effect": "Allow",
-            "Action": ["sts:AssumeRole"],
-            "Resource": ["arn:aws:s3:::*"],
-        }]),
-    )
-    .await?;
-
-    sts_client(&env.url, "opaallow", secret, None)
-        .assume_role()
-        .role_arn("arn:aws:iam::123456789012:role/test")
-        .role_session_name("sts-opa-contract")
-        .send()
-        .await
-        .map_err(|error| format!("OPA allow should override the local explicit Deny: {error:?}"))?;
-    assert_access_denied(
-        &sts_client(&env.url, "opadeny", secret, None),
-        "OPA denial despite local sts:AssumeRole Allow",
-    )
-    .await?;
-
-    let mut accounts = BTreeSet::new();
-    for _ in 0..2 {
-        let request = opa.next_request().await?;
-        assert_eq!(request.pointer("/input/action").and_then(Value::as_str), Some("sts:AssumeRole"));
-        assert_eq!(request.pointer("/input/context/deny_only").and_then(Value::as_bool), Some(true));
-        let account = request
-            .pointer("/input/identity/account")
-            .and_then(Value::as_str)
-            .ok_or("OPA input should include identity.account")?;
-        accounts.insert(account.to_owned());
-    }
-    assert_eq!(accounts, BTreeSet::from(["opaallow".to_owned(), "opadeny".to_owned()]));
-
-    env.stop_server();
-    Ok(())
-}
-
-#[tokio::test]
-#[serial]
-async fn test_sts_assume_role_fails_closed_while_opa_is_unavailable() -> TestResult {
-    init_logging();
-
-    let mut opa = OpaMock::start_delayed_unavailable().await?;
-    let mut env = RustFSTestEnvironment::new().await?;
-    env.start_rustfs_server_with_env(vec![], &[("RUSTFS_POLICY_PLUGIN_URL", opa.url.as_str())])
-        .await?;
-    opa.wait_for_validation().await?;
-
-    let user = "opaunavailable";
-    let secret = "stsOpaUnavailableSecret123";
-    create_user_with_policy(
-        &env,
-        user,
-        secret,
-        "sts-opa-unavailable-local-policy",
-        serde_json::json!([{
-            "Effect": "Allow",
-            "Action": ["s3:ListAllMyBuckets"],
-            "Resource": ["arn:aws:s3:::*"],
-        }]),
-    )
-    .await?;
-
-    assert_access_denied(&sts_client(&env.url, user, secret, None), "configured OPA initialization").await?;
-
-    opa.release_validation();
-    tokio::time::sleep(Duration::from_millis(200)).await;
-    assert_access_denied(&sts_client(&env.url, user, secret, None), "configured OPA validation failure").await?;
+    assert_chaining_denied(&sts_client(&env.url, &service_access_key, &service_secret_key, None), "service account").await?;

    env.stop_server();
    Ok(())
@@ -33,98 +33,14 @@ workspace = true
 [features]
 default = []
 rio-v2 = ["dep:rustfs-rio-v2"]
-hotpath = [
-    "hotpath/hotpath",
-    "hotpath/tokio",
-    "hotpath/futures",
-    "hotpath/async-channel",
-    "hotpath/parking_lot",
-    "hotpath/reqwest-0-13",
-    "rustfs-checksums/hotpath",
-    "rustfs-common/hotpath",
-    "rustfs-concurrency/hotpath",
-    "rustfs-config/hotpath",
-    "rustfs-credentials/hotpath",
-    "rustfs-data-usage/hotpath",
-    "rustfs-filemeta/hotpath",
-    "rustfs-io-metrics/hotpath",
-    "rustfs-lifecycle/hotpath",
-    "rustfs-lock/hotpath",
-    "rustfs-madmin/hotpath",
-    "rustfs-object-capacity/hotpath",
-    "rustfs-policy/hotpath",
-    "rustfs-protos/hotpath",
-    "rustfs-replication/hotpath",
-    "rustfs-rio/hotpath",
-    "rustfs-rio-v2?/hotpath",
-    "rustfs-s3-types/hotpath",
-    "rustfs-signer/hotpath",
-    "rustfs-storage-api/hotpath",
-    "rustfs-tls-runtime/hotpath",
-    "rustfs-utils/hotpath",
-    "rustfs-crypto/hotpath",
-]
-hotpath-alloc = [
-    "hotpath",
-    "hotpath/hotpath-alloc",
-    "rustfs-checksums/hotpath-alloc",
-    "rustfs-common/hotpath-alloc",
-    "rustfs-concurrency/hotpath-alloc",
-    "rustfs-config/hotpath-alloc",
-    "rustfs-credentials/hotpath-alloc",
-    "rustfs-data-usage/hotpath-alloc",
-    "rustfs-filemeta/hotpath-alloc",
-    "rustfs-io-metrics/hotpath-alloc",
-    "rustfs-lifecycle/hotpath-alloc",
-    "rustfs-lock/hotpath-alloc",
-    "rustfs-madmin/hotpath-alloc",
-    "rustfs-object-capacity/hotpath-alloc",
-    "rustfs-policy/hotpath-alloc",
-    "rustfs-protos/hotpath-alloc",
-    "rustfs-replication/hotpath-alloc",
-    "rustfs-rio/hotpath-alloc",
-    "rustfs-rio-v2?/hotpath-alloc",
-    "rustfs-s3-types/hotpath-alloc",
-    "rustfs-signer/hotpath-alloc",
-    "rustfs-storage-api/hotpath-alloc",
-    "rustfs-tls-runtime/hotpath-alloc",
-    "rustfs-utils/hotpath-alloc",
-    "rustfs-crypto/hotpath-alloc",
-]
-hotpath-cpu = [
-    "hotpath",
-    "hotpath/hotpath-cpu",
-    "rustfs-checksums/hotpath-cpu",
-    "rustfs-common/hotpath-cpu",
-    "rustfs-concurrency/hotpath-cpu",
-    "rustfs-config/hotpath-cpu",
-    "rustfs-credentials/hotpath-cpu",
-    "rustfs-data-usage/hotpath-cpu",
-    "rustfs-filemeta/hotpath-cpu",
-    "rustfs-io-metrics/hotpath-cpu",
-    "rustfs-lifecycle/hotpath-cpu",
-    "rustfs-lock/hotpath-cpu",
-    "rustfs-madmin/hotpath-cpu",
-    "rustfs-object-capacity/hotpath-cpu",
-    "rustfs-policy/hotpath-cpu",
-    "rustfs-protos/hotpath-cpu",
-    "rustfs-replication/hotpath-cpu",
-    "rustfs-rio/hotpath-cpu",
-    "rustfs-rio-v2?/hotpath-cpu",
-    "rustfs-s3-types/hotpath-cpu",
-    "rustfs-signer/hotpath-cpu",
-    "rustfs-storage-api/hotpath-cpu",
-    "rustfs-tls-runtime/hotpath-cpu",
-    "rustfs-utils/hotpath-cpu",
-    "rustfs-crypto/hotpath-cpu",
-]
+hotpath = ["dep:hotpath", "hotpath/hotpath", "rustfs-filemeta/hotpath", "rustfs-rio/hotpath"]
 # Exposes shared lifecycle/tier test utilities (MockWarmBackend, fault
 # injection, xl.meta transition assertions) via `api::tier::test_util`.
 # Enable only from `[dev-dependencies]` (rustfs/backlog#1148 ilm-6).
 test-util = []

 [dependencies]
-hotpath.workspace = true
+hotpath = { workspace = true, optional = true }
 rustfs-filemeta.workspace = true
 rustfs-utils = { workspace = true, features = ["full"] }
 rustfs-rio.workspace = true
@@ -141,6 +57,7 @@ rustfs-policy.workspace = true
 rustfs-protos.workspace = true
 rustfs-replication.workspace = true
 rustfs-lifecycle.workspace = true
+rustfs-kms.workspace = true
 rustfs-s3-types = { workspace = true }
 rustfs-data-usage.workspace = true
 rustfs-object-capacity.workspace = true
@@ -188,7 +105,6 @@ tempfile.workspace = true
 hyper = { workspace = true, features = ["http2", "http1", "server"] }
 hyper-util = { workspace = true, features = ["tokio", "server-auto", "server-graceful", "tracing"] }
 hyper-rustls = { workspace = true, default-features = false, features = ["native-tokio", "http1", "tls12", "logging", "http2", "aws-lc-rs"] }
-hostname.workspace = true
 rustls = { workspace = true, default-features = false, features = ["aws-lc-rs", "logging", "tls12", "prefer-post-quantum", "std"] }
 rustls-pki-types.workspace = true
 tokio = { workspace = true, features = ["io-util", "sync", "signal", "fs", "rt-multi-thread"] }
@@ -208,6 +124,8 @@ libc.workspace = true
 rustix = { workspace = true, features = ["process", "fs"] }
 rustfs-madmin.workspace = true
 reqwest = { workspace = true }
+aes-gcm = { workspace = true, features = ["rand_core"] }
+chacha20poly1305.workspace = true
 aws-sdk-s3 = { workspace = true, default-features = false, features = ["sigv4a", "default-https-client", "rt-tokio"] }
 urlencoding = { workspace = true }
 smallvec = { workspace = true, features = ["serde"] }
@@ -235,18 +153,11 @@ metrics = { workspace = true }
 [target.'cfg(target_os = "linux")'.dependencies]
 rustfs-uring = "0.2.1"

-[target.'cfg(windows)'.dependencies]
-winapi-util.workspace = true
-windows-sys = { workspace = true, features = ["Win32_Foundation", "Win32_Storage_FileSystem"] }
-
 [dev-dependencies]
 tokio = { workspace = true, features = ["rt-multi-thread", "macros", "test-util", "fs"] }
 criterion = { workspace = true, features = ["html_reports"] }
 temp-env = { workspace = true, features = ["async_closure"] }
 tracing-subscriber = { workspace = true, features = ["json", "env-filter", "time"] }
-# Only for `pin_callsite_interest_for_test`, which registers a `NoSubscriber`
-# dispatcher to keep tracing's process-global callsite-interest cache honest.
-tracing-core = { workspace = true }
 serial_test = { workspace = true }
 opentelemetry_sdk = { workspace = true, features = ["rt-tokio"] }
 proptest = "1"
@@ -67,14 +67,6 @@ pub mod bucket {
            };
        }

-        pub mod transition_transaction {
-            pub use crate::bucket::lifecycle::transition_transaction::{
-                TransitionOperatorDeleteResult, TransitionOperatorError, TransitionOperatorProbe, TransitionOperatorStatus,
-                delete_transition_candidate_for_operator, finalize_missing_transition_transaction_for_operator,
-                inspect_transition_transaction_for_operator,
-            };
-        }
-
        pub mod evaluator {
            pub use crate::bucket::lifecycle::evaluator::Evaluator;
        }
@@ -130,13 +122,13 @@ pub mod bucket {

    pub mod metadata_sys {
        pub use crate::bucket::metadata_sys::{
-            BucketMetadataSys, acquire_bucket_metadata_transaction_lock, delete, get, get_accelerate_config, get_bucket_policy,
+            BucketMetadataSys, acquire_bucket_targets_transaction_lock, delete, 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_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_under_transaction_lock,
+            update, update_bucket_targets_under_transaction_lock, update_config_with,
        };
    }

@@ -172,26 +164,20 @@ pub mod bucket {
    }

    pub mod replication {
-        pub use crate::bucket::replication::replication_pool::{
-            DurableMrfBacklogSummary, DurableMrfBucketBacklog, DurableMrfTargetBacklog, MrfBacklogObservabilitySummary,
-            MrfBucketBacklogObservability, durable_mrf_backlog_summary_snapshot, durable_mrf_target_backlog_snapshot,
-            mrf_backlog_observability_snapshot,
-        };
        pub use crate::bucket::replication::{
-            BucketReplicationResyncStatus, BucketStats, DeleteReplicationConfigSnapshot, DeletedObjectReplicationInfo,
-            DurableMrfBacklog, DynReplicationPool, MrfOpKind, MrfReplicateEntry, MustReplicateOptions, ObjectOpts,
-            REPLICATE_INCOMING_DELETE, ReplicateDecision, ReplicateObjectInfo, ReplicationConfig, ReplicationConfigurationExt,
-            ReplicationDeleteScheduleInput, ReplicationDeleteStateSource, ReplicationHealQueueResult, ReplicationObjectBridge,
-            ReplicationObjectIO, ReplicationOperation, ReplicationPoolTrait, ReplicationPriority, ReplicationQueueAdmission,
-            ReplicationScannerBridge, ReplicationState, ReplicationStats, ReplicationStatusType, ReplicationStorage,
-            ReplicationTargetValidationError, ReplicationType, ResyncOpts, ResyncStatusType, RuntimeReplicationTargetBacklog,
-            TargetReplicationResyncStatus, VersionPurgeStatusType, delete_replication_state_from_config,
-            delete_replication_version_id, get_global_replication_pool, get_global_replication_stats,
-            init_background_replication, invalid_replication_config_status_field, read_durable_mrf_backlog,
-            replication_state_to_filemeta, replication_status_to_filemeta, replication_statuses_map, replication_target_arns,
-            resync_start_conflict_id, should_remove_replication_target, should_schedule_delete_replication,
-            should_use_existing_delete_replication_info, should_use_existing_delete_replication_source,
-            unsupported_replication_config_field, validate_replication_config_target_arns, version_purge_status_to_filemeta,
+            BucketReplicationResyncStatus, BucketStats, DeletedObjectReplicationInfo, DurableMrfBacklog, DynReplicationPool,
+            MrfOpKind, MrfReplicateEntry, MustReplicateOptions, ObjectOpts, REPLICATE_INCOMING_DELETE, ReplicateDecision,
+            ReplicateObjectInfo, ReplicationConfig, ReplicationConfigurationExt, ReplicationDeleteScheduleInput,
+            ReplicationDeleteStateSource, ReplicationHealQueueResult, ReplicationObjectBridge, ReplicationObjectIO,
+            ReplicationOperation, ReplicationPoolTrait, ReplicationPriority, ReplicationQueueAdmission, ReplicationScannerBridge,
+            ReplicationState, ReplicationStats, ReplicationStatusType, ReplicationStorage, ReplicationTargetValidationError,
+            ReplicationType, ResyncOpts, ResyncStatusType, TargetReplicationResyncStatus, VersionPurgeStatusType,
+            delete_replication_state_from_config, delete_replication_version_id, get_global_replication_pool,
+            get_global_replication_stats, init_background_replication, read_durable_mrf_backlog, replication_state_to_filemeta,
+            replication_status_to_filemeta, replication_statuses_map, replication_target_arns, resync_start_conflict_id,
+            should_remove_replication_target, should_schedule_delete_replication, should_use_existing_delete_replication_info,
+            should_use_existing_delete_replication_source, validate_replication_config_target_arns,
+            version_purge_status_to_filemeta,
        };
    }

@@ -273,13 +259,12 @@ pub mod config {
    pub mod com {
        pub use crate::config::com::{
            COMMA_SEPARATED_LISTS, CONFIG_PREFIX, ENV_CONFIG_RECOVER_ON_CORRUPTION, STORAGE_CLASS_SUB_SYS,
-            ServerConfigCorruptError, ServerConfigSaveResult, ServerConfigSnapshot, delete_config,
-            is_server_config_corrupt_error, lookup_configs, read_config, read_config_no_lock, read_config_with_metadata,
-            read_config_without_migrate, read_config_without_migrate_no_lock, read_existing_server_config_no_lock,
-            read_server_config_snapshot, save_config, save_config_no_lock, save_config_with_opts, save_server_config,
-            save_server_config_no_lock, save_server_config_snapshot, save_server_config_snapshot_with_generation,
-            server_config_path, try_migrate_server_config, with_config_object_read_lock, with_config_object_write_lock,
-            with_server_config_read_lock, with_server_config_write_lock,
+            ServerConfigCorruptError, ServerConfigSnapshot, delete_config, is_server_config_corrupt_error, lookup_configs,
+            read_config, read_config_no_lock, read_config_with_metadata, read_config_without_migrate,
+            read_config_without_migrate_no_lock, read_existing_server_config_no_lock, read_server_config_snapshot, save_config,
+            save_config_no_lock, save_config_with_opts, save_server_config, save_server_config_no_lock,
+            save_server_config_snapshot, server_config_path, try_migrate_server_config, with_config_object_read_lock,
+            with_config_object_write_lock, with_server_config_read_lock, with_server_config_write_lock,
        };
    }

@@ -392,18 +377,15 @@ pub mod metrics {
 pub mod notification {
    pub use crate::services::notification_sys::{
        NotificationPeerErr, NotificationSys, get_global_notification_sys, new_global_notification_sys,
-        start_remote_version_state_fleet_probe,
    };
 }

 pub mod object {
    pub use crate::object_api::{
-        BLOCK_SIZE_V2, ERASURE_ALGORITHM, EncryptionResolutionError, EncryptionResolutionErrorKind, GetObjectBodyCacheHook,
-        GetObjectBodyCacheHookLookup, GetObjectBodySource, GetObjectReader, ObjectEncryptionResolver, ObjectInfo,
-        ObjectMutationHook, ObjectOptions, PutObjReader, RangedDecompressReader, ReadEncryptionMaterial, ReadEncryptionMode,
-        ReadEncryptionRequest, 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,
+        BLOCK_SIZE_V2, ERASURE_ALGORITHM, GetObjectBodyCacheHook, GetObjectBodyCacheHookLookup, GetObjectBodySource,
+        GetObjectReader, ObjectInfo, ObjectMutationHook, ObjectOptions, PutObjReader, RangedDecompressReader, 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::PreparedGetObjectReader;
 }
@@ -425,15 +407,13 @@ pub mod rio {

 pub mod rpc {
    pub use crate::cluster::rpc::{
-        AuthenticatedChannel, KMS_SIGNAL_SUBSYSTEM, LocalPeerS3Client, PEER_RESTDRY_RUN, PEER_RESTSIGNAL, PEER_RESTSUB_SYS,
-        PeerRestClient, PeerS3Client, S3PeerSys, SERVICE_SIGNAL_REFRESH_CONFIG, SERVICE_SIGNAL_RELOAD_DYNAMIC,
-        ScannerBucketListing, ScannerPeerActivity, TONIC_RPC_PREFIX, TonicInterceptor, gen_signature_headers,
-        gen_tonic_replay_scope_headers, gen_tonic_signature_headers, gen_tonic_signature_interceptor,
+        LocalPeerS3Client, PEER_RESTDRY_RUN, PEER_RESTSIGNAL, PEER_RESTSUB_SYS, PeerRestClient, PeerS3Client, S3PeerSys,
+        SERVICE_SIGNAL_REFRESH_CONFIG, SERVICE_SIGNAL_RELOAD_DYNAMIC, ScannerBucketListing, ScannerPeerActivity,
+        TONIC_RPC_PREFIX, TonicInterceptor, gen_signature_headers, gen_tonic_signature_headers, gen_tonic_signature_interceptor,
        node_service_time_out_client, node_service_time_out_client_no_auth, normalize_tonic_rpc_audience,
-        set_tonic_canonical_body_digest, sign_ns_scanner_capability, sign_tonic_rpc_response_proof, tonic_boot_epoch_challenge,
-        tonic_boot_epoch_response_headers, verify_rpc_signature, verify_tonic_boot_epoch_response,
+        set_tonic_canonical_body_digest, sign_ns_scanner_capability, sign_tonic_rpc_response_proof, verify_rpc_signature,
        verify_tonic_canonical_body_digest, verify_tonic_mutation_body_digest, verify_tonic_rpc_response_proof,
-        verify_tonic_rpc_signature, verify_tonic_rpc_signature_with_bootstrap,
+        verify_tonic_rpc_signature,
    };
 }

@@ -44,7 +44,6 @@ use aws_smithy_runtime_api::client::http::{
 use aws_smithy_runtime_api::client::orchestrator::{HttpRequest, HttpResponse};
 use aws_smithy_runtime_api::client::result::ConnectorError;
 use aws_smithy_types::body::SdkBody;
-use futures::{StreamExt, stream};
 use http::{HeaderMap, HeaderName, HeaderValue, StatusCode, Uri};
 use hyper_util::client::legacy::Client as HyperClient;
 use hyper_util::rt::{TokioExecutor, TokioTimer};
@@ -69,7 +68,6 @@ use std::path::Path;
 use std::str::FromStr as _;
 use std::sync::Arc;
 use std::sync::OnceLock;
-use std::sync::Weak;
 use std::time::{Duration, Instant};
 use time::{OffsetDateTime, format_description::well_known::Rfc3339};
 use tokio::sync::Mutex;
@@ -81,7 +79,6 @@ use url::Url;
 use uuid::Uuid;

 const DEFAULT_HEALTH_CHECK_RELOAD_DURATION: Duration = Duration::from_secs(30 * 60);
-const MAX_CONCURRENT_TARGET_HEALTH_CHECKS: usize = 16;
 const REDACTED_CREDENTIAL: &str = "<redacted>";

 pub static GLOBAL_BUCKET_TARGET_SYS: OnceLock<BucketTargetSys> = OnceLock::new();
@@ -258,16 +255,6 @@ fn endpoint_health_key(url: &Url) -> String {
    }
 }

-fn target_health(target: &TargetClient) -> EpHealth {
-    let url = target.to_url();
-    EpHealth {
-        endpoint: endpoint_health_key(&url),
-        scheme: url.scheme().to_string(),
-        online: true,
-        ..Default::default()
-    }
-}
-
 fn update_endpoint_health(health: &mut EpHealth, online: bool, latency: Duration, now: OffsetDateTime) {
    let prev_online = health.online;
    health.online = online;
@@ -285,26 +272,14 @@ fn update_endpoint_health(health: &mut EpHealth, online: bool, latency: Duration
    health.offline_duration += latency;
 }

-#[cfg(test)]
-#[derive(Clone, Debug)]
-struct TargetClientBuildProbe {
-    arn: String,
-    started: Arc<tokio::sync::Semaphore>,
-    release: Arc<tokio::sync::Semaphore>,
-}
-
 #[derive(Debug, Default)]
 pub struct BucketTargetSys {
    pub arn_remotes_map: Arc<RwLock<HashMap<String, ArnTarget>>>,
    pub targets_map: Arc<RwLock<HashMap<String, Vec<BucketTarget>>>>,
    pub h_mutex: Arc<RwLock<HashMap<String, EpHealth>>>,
-    target_h_mutex: Arc<RwLock<HashMap<String, EpHealth>>>,
    pub hc_client: Arc<HttpClient>,
    pub a_mutex: Arc<Mutex<HashMap<String, ArnErrs>>>,
    pub arn_errs_map: Arc<RwLock<HashMap<String, ArnErrs>>>,
-    target_update_mutexes: Arc<Mutex<HashMap<String, Weak<Mutex<()>>>>>,
-    #[cfg(test)]
-    target_client_build_probe: Arc<Mutex<Option<TargetClientBuildProbe>>>,
    heartbeat_started: OnceLock<()>,
 }

@@ -318,13 +293,9 @@ impl BucketTargetSys {
            arn_remotes_map: Arc::new(RwLock::new(HashMap::new())),
            targets_map: Arc::new(RwLock::new(HashMap::new())),
            h_mutex: Arc::new(RwLock::new(HashMap::new())),
-            target_h_mutex: Arc::new(RwLock::new(HashMap::new())),
            hc_client: Arc::new(HttpClient::new()),
            a_mutex: Arc::new(Mutex::new(HashMap::new())),
            arn_errs_map: Arc::new(RwLock::new(HashMap::new())),
-            target_update_mutexes: Arc::new(Mutex::new(HashMap::new())),
-            #[cfg(test)]
-            target_client_build_probe: Arc::new(Mutex::new(None)),
            heartbeat_started: OnceLock::new(),
        }
    }
@@ -339,17 +310,6 @@ impl BucketTargetSys {
        });
    }

-    async fn target_update_mutex(&self, bucket: &str) -> Arc<Mutex<()>> {
-        let mut mutexes = self.target_update_mutexes.lock().await;
-        mutexes.retain(|_, mutex| mutex.strong_count() > 0);
-        if let Some(mutex) = mutexes.get(bucket).and_then(Weak::upgrade) {
-            return mutex;
-        }
-        let mutex = Arc::new(Mutex::new(()));
-        mutexes.insert(bucket.to_string(), Arc::downgrade(&mutex));
-        mutex
-    }
-
    pub async fn is_offline(&self, url: &Url) -> bool {
        let key = endpoint_health_key(url);
        {
@@ -358,6 +318,7 @@ impl BucketTargetSys {
                return !health.online;
            }
        }
+        // Initialize health check if not exists
        self.init_hc(url).await;
        false
    }
@@ -384,121 +345,42 @@ impl BucketTargetSys {
        );
    }

-    pub(crate) async fn is_target_offline(&self, target: &Arc<TargetClient>) -> bool {
-        // Lock order: arn_remotes_map, then target_h_mutex. A stale client must not
-        // read or initialize the health state of its replacement.
-        let remotes = self.arn_remotes_map.read().await;
-        let Some(current) = remotes.get(&target.arn).and_then(|remote| remote.client.as_ref()) else {
-            return true;
-        };
-        if !Arc::ptr_eq(current, target) {
-            return true;
-        }
-        {
-            let health_map = self.target_h_mutex.read().await;
-            if let Some(health) = health_map.get(&target.arn) {
-                return !health.online;
-            }
-        }
-        let mut health_map = self.target_h_mutex.write().await;
-        let health = health_map.entry(target.arn.clone()).or_insert_with(|| target_health(target));
-        !health.online
-    }
-
-    pub(crate) async fn mark_target_offline(&self, target: &Arc<TargetClient>) {
-        // Lock order: arn_remotes_map, then target_h_mutex. Ignore failures reported
-        // by a client that has already been replaced.
-        let remotes = self.arn_remotes_map.read().await;
-        let Some(current) = remotes.get(&target.arn).and_then(|remote| remote.client.as_ref()) else {
-            return;
-        };
-        if !Arc::ptr_eq(current, target) {
-            return;
-        }
-        let mut health_map = self.target_h_mutex.write().await;
-        let health = health_map.entry(target.arn.clone()).or_insert_with(|| target_health(target));
-        update_endpoint_health(health, false, Duration::from_secs(0), OffsetDateTime::now_utc());
-    }
-
-    #[cfg(test)]
-    async fn init_target_health(&self, target: &TargetClient) {
-        let mut health_map = self.target_h_mutex.write().await;
-        health_map.insert(target.arn.clone(), target_health(target));
-        drop(health_map);
-        self.init_hc(&target.to_url()).await;
-    }
-
    pub async fn heartbeat(&self) {
        // Probe interval: `RUSTFS_REPL_HEALTH_CHECK_INTERVAL_MS` (default 5000ms,
        // clamped to >=10ms), read once when the heartbeat task starts.
        let mut interval = tokio::time::interval(crate::bucket::replication::replication_timing::health_check_interval());
        loop {
            interval.tick().await;
-            self.heartbeat_once().await;
-        }
-    }

-    async fn heartbeat_once(&self) {
-        let targets = {
-            let remotes = self.arn_remotes_map.read().await;
-            remotes
-                .values()
-                .filter_map(|target| target.client.clone())
-                .collect::<Vec<_>>()
-        };
+            let endpoints = {
+                let health_map = self.h_mutex.read().await;
+                health_map
+                    .iter()
+                    .map(|(endpoint, health)| (endpoint.clone(), health.scheme.clone()))
+                    .collect::<Vec<_>>()
+            };

-        let checks = stream::iter(targets.into_iter().map(|target| async move {
-            let start = Instant::now();
-            let online = Self::check_endpoint_health(&target).await;
-            (target, online, start.elapsed())
-        }));
-        let mut checks = checks.buffer_unordered(MAX_CONCURRENT_TARGET_HEALTH_CHECKS);
-        let mut endpoint_checks = HashMap::<String, (String, bool, Duration)>::new();
+            for (endpoint, scheme) in endpoints {
+                // Perform health check
+                let start = Instant::now();
+                let online = self.check_endpoint_health(&endpoint, &scheme).await;
+                let duration = start.elapsed();

-        while let Some((target, online, duration)) = checks.next().await {
-            let url = target.to_url();
-
-            {
-                // Lock order: arn_remotes_map, then target_h_mutex. Keeping the remote
-                // read guard prevents a replaced client from receiving stale health.
-                let remotes = self.arn_remotes_map.read().await;
-                let Some(current) = remotes.get(&target.arn).and_then(|remote| remote.client.as_ref()) else {
-                    continue;
-                };
-                if !Arc::ptr_eq(current, &target) {
-                    continue;
+                {
+                    let mut health_map = self.h_mutex.write().await;
+                    if let Some(health) = health_map.get_mut(&endpoint) {
+                        update_endpoint_health(health, online, duration, OffsetDateTime::now_utc());
+                    }
                }
-                let mut health_map = self.target_h_mutex.write().await;
-                let health = health_map.entry(target.arn.clone()).or_insert_with(|| target_health(&target));
-                update_endpoint_health(health, online, duration, OffsetDateTime::now_utc());
            }
-
-            let endpoint = endpoint_health_key(&url);
-            endpoint_checks
-                .entry(endpoint)
-                .and_modify(|(_, endpoint_online, endpoint_duration)| {
-                    *endpoint_online |= online;
-                    *endpoint_duration = (*endpoint_duration).max(duration);
-                })
-                .or_insert_with(|| (url.scheme().to_string(), online, duration));
-        }
-
-        let mut health_map = self.h_mutex.write().await;
-        for (endpoint, (scheme, online, duration)) in endpoint_checks {
-            let health = health_map.entry(endpoint.clone()).or_insert_with(|| EpHealth {
-                endpoint,
-                scheme,
-                online: true,
-                ..Default::default()
-            });
-            update_endpoint_health(health, online, duration, OffsetDateTime::now_utc());
        }
    }

-    async fn check_endpoint_health(target: &TargetClient) -> bool {
-        match tokio::time::timeout(Duration::from_secs(3), target.client.head_bucket().bucket(&target.bucket).send()).await {
-            Ok(Ok(_)) => true,
-            Ok(Err(err)) => err.raw_response().is_some_and(|response| response.status().as_u16() < 500),
+    async fn check_endpoint_health(&self, endpoint: &str, scheme: &str) -> bool {
+        let scheme = if scheme.is_empty() { "https" } else { scheme };
+        let url = format!("{scheme}://{endpoint}/");
+        match self.hc_client.get(url).timeout(Duration::from_secs(3)).send().await {
+            Ok(response) => response.status().as_u16() < 500,
            Err(_) => false,
        }
    }
@@ -508,20 +390,15 @@ impl BucketTargetSys {
        health_map.clone()
    }

-    async fn target_health_stats(&self) -> HashMap<String, EpHealth> {
-        let health_map = self.target_h_mutex.read().await;
-        health_map.clone()
-    }
-
    pub async fn list_targets(&self, bucket: &str, arn_type: &str) -> Vec<BucketTarget> {
-        let health_stats = self.target_health_stats().await;
+        let health_stats = self.health_stats().await;
        let mut targets = Vec::new();

        if !bucket.is_empty() {
            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) {
+                        if let Some(health) = health_stats.get(&target.endpoint) {
                            target.total_downtime = health.offline_duration;
                            target.online = health.online;
                            target.last_online = health.last_online;
@@ -543,7 +420,7 @@ impl BucketTargetSys {
        for bucket_targets in targets_map.values() {
            for mut target in bucket_targets.iter().cloned() {
                if arn_type.is_empty() || target.target_type.to_string() == arn_type {
-                    if let Some(health) = health_stats.get(&target.arn) {
+                    if let Some(health) = health_stats.get(&target.endpoint) {
                        target.total_downtime = health.offline_duration;
                        target.online = health.online;
                        target.last_online = health.last_online;
@@ -576,18 +453,12 @@ impl BucketTargetSys {
    }

    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: targets_map, then arn_remotes_map, then target_h_mutex.
        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;

        if let Some(targets) = targets_map.remove(bucket) {
            for target in targets {
                arn_remotes_map.remove(&target.arn);
-                health_map.remove(&target.arn);
            }
        }
    }
@@ -819,22 +690,6 @@ impl BucketTargetSys {
    }

    pub async fn get_remote_target_client_internal(&self, target: &BucketTarget) -> Result<TargetClient, BucketTargetError> {
-        #[cfg(test)]
-        {
-            let probe = self.target_client_build_probe.lock().await.clone();
-            if let Some(probe) = probe
-                && probe.arn == target.arn
-            {
-                probe.started.add_permits(1);
-                probe
-                    .release
-                    .acquire()
-                    .await
-                    .expect("test probe semaphore should remain open")
-                    .forget();
-            }
-        }
-
        let Some(credentials) = &target.credentials else {
            return Err(BucketTargetError::BucketRemoteTargetNotFound {
                bucket: target.target_bucket.clone(),
@@ -937,25 +792,12 @@ impl BucketTargetSys {
    }

    pub async fn update_all_targets(&self, bucket: &str, targets: Option<&BucketTargets>) {
-        let update_mutex = self.target_update_mutex(bucket).await;
-        let _update_guard = update_mutex.lock().await;
-
-        let mut clients = Vec::new();
-        if let Some(new_targets) = targets {
-            for target in &new_targets.targets {
-                clients.push((target, self.get_remote_target_client_internal(target).await.map(Arc::new)));
-            }
-        }
-
-        // Lock order: targets_map, then arn_remotes_map, then target_h_mutex.
        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;
        // Remove existing targets
        if let Some(existing_targets) = targets_map.remove(bucket) {
            for target in existing_targets {
                arn_remotes_map.remove(&target.arn);
-                health_map.remove(&target.arn);
                self.update_bandwidth_limit(bucket, &target.arn, 0);
            }
        }
@@ -964,17 +806,16 @@ impl BucketTargetSys {
        if let Some(new_targets) = targets
            && !new_targets.is_empty()
        {
-            for (target, client) in clients {
-                match client {
+            for target in &new_targets.targets {
+                match self.get_remote_target_client_internal(target).await {
                    Ok(client) => {
                        arn_remotes_map.insert(
                            target.arn.clone(),
                            ArnTarget {
-                                client: Some(client.clone()),
+                                client: Some(Arc::new(client)),
                                last_refresh: OffsetDateTime::now_utc(),
                            },
                        );
-                        health_map.insert(client.arn.clone(), target_health(&client));
                        self.update_bandwidth_limit(bucket, &target.arn, target.bandwidth_limit);
                    }
                    // The target stays in `targets_map`, so it keeps showing up in
@@ -1004,7 +845,25 @@ impl BucketTargetSys {
            return;
        }

-        self.update_all_targets(bucket, Some(config)).await;
+        for target in config.targets.iter() {
+            let cli = match self.get_remote_target_client_internal(target).await {
+                Ok(cli) => cli,
+                Err(e) => {
+                    warn!("get_remote_target_client_internal error:{}", e);
+                    continue;
+                }
+            };
+
+            {
+                let arn_target = ArnTarget::with_client(Arc::new(cli));
+                let mut arn_remotes_map = self.arn_remotes_map.write().await;
+                arn_remotes_map.insert(target.arn.clone(), arn_target);
+            }
+            self.update_bandwidth_limit(bucket, &target.arn, target.bandwidth_limit);
+        }
+
+        let mut targets_map = self.targets_map.write().await;
+        targets_map.insert(bucket.to_string(), config.targets.clone());
    }

    // getRemoteARN gets existing ARN for an endpoint or generates a new one.
@@ -2136,50 +1995,7 @@ mod tests {
    use super::*;
    use rcgen::generate_simple_self_signed;

-    #[derive(Clone, Debug)]
-    struct RecordingHttpConnector {
-        request_uris: Arc<std::sync::Mutex<Vec<String>>>,
-    }
-
-    impl SmithyHttpConnector for RecordingHttpConnector {
-        fn call(&self, request: HttpRequest) -> HttpConnectorFuture {
-            self.request_uris
-                .lock()
-                .expect("recorded request lock should not be poisoned")
-                .push(request.uri().to_string());
-            HttpConnectorFuture::ready(Ok(HttpResponse::new(
-                aws_smithy_runtime_api::http::StatusCode::try_from(204_u16).expect("204 should be a valid response status"),
-                SdkBody::empty(),
-            )))
-        }
-    }
-
-    fn recording_target_client() -> (TargetClient, Arc<std::sync::Mutex<Vec<String>>>) {
-        let request_uris = Arc::new(std::sync::Mutex::new(Vec::new()));
-        let connector = SharedHttpConnector::new(RecordingHttpConnector {
-            request_uris: Arc::clone(&request_uris),
-        });
-        let http_client = http_client_fn(move |_settings, _components| connector.clone());
-        let client = s3_client_for_test(443, Some(http_client));
-        (
-            TargetClient {
-                endpoint: "https://localhost:443".to_string(),
-                credentials: None,
-                bucket: "target-bucket".to_string(),
-                storage_class: String::new(),
-                disable_proxy: false,
-                arn: "arn:rustfs:replication:us-east-1:target:bucket".to_string(),
-                reset_id: String::new(),
-                secure: true,
-                health_check_duration: Duration::from_secs(5),
-                replicate_sync: false,
-                client: Arc::new(client),
-            },
-            request_uris,
-        )
-    }
-
-    fn spawn_https_server(cert: &rcgen::CertifiedKey<rcgen::KeyPair>, requests: usize) -> (u16, std::thread::JoinHandle<()>) {
+    fn spawn_single_request_https_server(cert: &rcgen::CertifiedKey<rcgen::KeyPair>) -> (u16, std::thread::JoinHandle<()>) {
        use std::io::{Read, Write};

        ensure_rustls_crypto_provider();
@@ -2198,116 +2014,42 @@ mod tests {
            .expect("test TLS server config should build");

        let handle = std::thread::spawn(move || {
-            let server_config = Arc::new(server_config);
-            for _ in 0..requests {
-                let (stream, _) = listener.accept().expect("test TLS client should connect");
-                stream
-                    .set_read_timeout(Some(Duration::from_secs(10)))
-                    .expect("test TLS read timeout should configure");
-                stream
-                    .set_write_timeout(Some(Duration::from_secs(10)))
-                    .expect("test TLS write timeout should configure");
-                let connection = rustls::ServerConnection::new(server_config.clone()).expect("test TLS connection should build");
-                let mut stream = rustls::StreamOwned::new(connection, stream);
-                let mut request = [0_u8; 8192];
-                if stream.read(&mut request).is_err() {
-                    continue;
-                }
-                stream
-                    .write_all(b"HTTP/1.1 200 OK\r\nContent-Length: 0\r\nConnection: close\r\n\r\n")
-                    .expect("test TLS response should be written");
-                stream.flush().expect("test TLS response should flush");
-            }
-        });
-
-        (port, handle)
-    }
-
-    fn spawn_http_status_server(status: u16) -> (u16, std::thread::JoinHandle<()>) {
-        use std::io::{Read, Write};
-
-        let listener = std::net::TcpListener::bind(("127.0.0.1", 0)).expect("test HTTP listener should bind");
-        let port = listener
-            .local_addr()
-            .expect("test HTTP listener should have an address")
-            .port();
-        let handle = std::thread::spawn(move || {
-            let (mut stream, _) = listener.accept().expect("test HTTP client should connect");
-            let mut request = [0_u8; 8192];
-            let bytes_read = stream.read(&mut request).expect("test HTTP request should be read");
-            assert!(bytes_read > 0, "test HTTP request should not be empty");
-            write!(stream, "HTTP/1.1 {status} Test\r\nContent-Length: 0\r\nConnection: close\r\n\r\n")
-                .expect("test HTTP response should be written");
-        });
-        (port, handle)
-    }
-
-    fn spawn_delayed_http_server() -> (
-        u16,
-        tokio::sync::oneshot::Receiver<()>,
-        std::sync::mpsc::Sender<()>,
-        std::thread::JoinHandle<()>,
-    ) {
-        use std::io::{Read, Write};
-
-        let listener = std::net::TcpListener::bind(("127.0.0.1", 0)).expect("test HTTP listener should bind");
-        let port = listener
-            .local_addr()
-            .expect("test HTTP listener should have an address")
-            .port();
-        let (accepted_tx, accepted_rx) = tokio::sync::oneshot::channel();
-        let (release_tx, release_rx) = std::sync::mpsc::channel();
-        let handle = std::thread::spawn(move || {
-            let (mut stream, _) = listener.accept().expect("test HTTP client should connect");
-            let mut request = [0_u8; 8192];
-            let bytes_read = stream.read(&mut request).expect("test HTTP request should be read");
-            assert!(bytes_read > 0, "test HTTP request should not be empty");
-            accepted_tx.send(()).expect("test should wait for request");
-            release_rx.recv().expect("test should release response");
+            let (stream, _) = listener.accept().expect("test TLS client should connect");
            stream
-                .write_all(b"HTTP/1.1 500 Test\r\nContent-Length: 0\r\nConnection: close\r\n\r\n")
-                .expect("test HTTP response should be written");
+                .set_read_timeout(Some(Duration::from_secs(10)))
+                .expect("test TLS read timeout should configure");
+            stream
+                .set_write_timeout(Some(Duration::from_secs(10)))
+                .expect("test TLS write timeout should configure");
+            let connection = rustls::ServerConnection::new(Arc::new(server_config)).expect("test TLS connection should build");
+            let mut stream = rustls::StreamOwned::new(connection, stream);
+            let mut request = [0_u8; 8192];
+            let _ = stream.read(&mut request).expect("test TLS request should be readable");
+            stream
+                .write_all(b"HTTP/1.1 200 OK\r\nContent-Length: 0\r\nConnection: close\r\n\r\n")
+                .expect("test TLS response should be written");
+            stream.flush().expect("test TLS response should flush");
        });
-        (port, accepted_rx, release_tx, handle)
+
+        (port, handle)
    }

-    fn s3_client_for_test(port: u16, http_client: Option<SharedHttpClient>) -> S3Client {
-        s3_client_for_endpoint_test(format!("https://localhost:{port}"), http_client)
-    }
-
-    fn s3_client_for_endpoint_test(endpoint: String, http_client: Option<SharedHttpClient>) -> S3Client {
+    fn s3_client_with_http_client(port: u16, http_client: SharedHttpClient) -> S3Client {
        let credentials = SdkCredentials::builder()
            .access_key_id("test-access")
            .secret_access_key("test-secret")
            .provider_name("bucket_target_tls_test")
            .build();
-        let mut config = S3Config::builder()
-            .endpoint_url(endpoint)
+        let config = S3Config::builder()
+            .endpoint_url(format!("https://localhost:{port}"))
            .credentials_provider(SharedCredentialsProvider::new(credentials))
            .region(SdkRegion::new("us-east-1"))
            .force_path_style(true)
-            .behavior_version(aws_sdk_s3::config::BehaviorVersion::latest());
-        if let Some(http_client) = http_client {
-            config = config.http_client(http_client);
-        }
+            .behavior_version(aws_sdk_s3::config::BehaviorVersion::latest())
+            .http_client(http_client)
+            .build();

-        S3Client::from_conf(config.build())
-    }
-
-    fn target_client_for_test(arn: &str, endpoint: String, client: S3Client) -> Arc<TargetClient> {
-        Arc::new(TargetClient {
-            endpoint,
-            credentials: None,
-            bucket: "target-bucket".to_string(),
-            storage_class: String::new(),
-            disable_proxy: false,
-            arn: arn.to_string(),
-            reset_id: String::new(),
-            secure: true,
-            health_check_duration: Duration::from_secs(5),
-            replicate_sync: false,
-            client: Arc::new(client),
-        })
+        S3Client::from_conf(config)
    }

    #[test]
@@ -2427,32 +2169,17 @@ mod tests {
    }

    #[tokio::test]
-    async fn list_targets_applies_health_stats_by_arn_and_preserves_endpoint_port() {
+    async fn list_targets_applies_health_stats_for_endpoint_with_port() {
        let sys = BucketTargetSys::default();
-        let arn = "arn:rustfs:replication:us-east-1:bucket:id";
-        let endpoint = "https://remote.example:9443".to_string();
-        let client = target_client_for_test(
-            arn,
-            endpoint.clone(),
-            S3Client::from_conf(
-                S3Config::builder()
-                    .endpoint_url(endpoint)
-                    .behavior_version(aws_sdk_s3::config::BehaviorVersion::latest())
-                    .build(),
-            ),
-        );
-        sys.arn_remotes_map
-            .write()
-            .await
-            .insert(arn.to_string(), ArnTarget::with_client(client.clone()));
-        sys.init_target_health(&client).await;
-        sys.mark_target_offline(&client).await;
+        let url = Url::parse("https://remote.example:9443").expect("url should parse");
+        sys.init_hc(&url).await;
+        sys.mark_offline(&url).await;

        sys.targets_map.write().await.insert(
            "bucket".to_string(),
            vec![BucketTarget {
                endpoint: "remote.example:9443".to_string(),
-                arn: arn.to_string(),
+                arn: "arn:rustfs:replication:us-east-1:bucket:id".to_string(),
                target_type: BucketTargetType::ReplicationService,
                ..Default::default()
            }],
@@ -2463,97 +2190,6 @@ mod tests {
        assert_eq!(targets.len(), 1);
        assert!(!targets[0].online);
        assert_eq!(targets[0].offline_count, 1);
-        assert_eq!(sys.target_health_stats().await[arn].endpoint, "remote.example:9443");
-    }
-
-    #[tokio::test]
-    async fn target_health_is_isolated_by_arn_for_shared_endpoint() {
-        let sys = BucketTargetSys::default();
-        let endpoint = "https://shared.example:9443".to_string();
-        let config = || {
-            S3Config::builder()
-                .endpoint_url(endpoint.clone())
-                .behavior_version(aws_sdk_s3::config::BehaviorVersion::latest())
-                .build()
-        };
-        let first = target_client_for_test("arn:first", endpoint.clone(), S3Client::from_conf(config()));
-        let second = target_client_for_test("arn:second", endpoint.clone(), S3Client::from_conf(config()));
-
-        sys.arn_remotes_map
-            .write()
-            .await
-            .insert(first.arn.clone(), ArnTarget::with_client(first.clone()));
-        sys.arn_remotes_map
-            .write()
-            .await
-            .insert(second.arn.clone(), ArnTarget::with_client(second.clone()));
-        sys.init_target_health(&first).await;
-        sys.init_target_health(&second).await;
-        sys.mark_target_offline(&first).await;
-
-        assert!(sys.is_target_offline(&first).await);
-        assert!(!sys.is_target_offline(&second).await);
-    }
-
-    #[tokio::test]
-    async fn stale_client_cannot_change_replacement_health_for_same_arn() {
-        let sys = BucketTargetSys::default();
-        let arn = "arn:replacement";
-        let config = |endpoint: &str| {
-            S3Config::builder()
-                .endpoint_url(endpoint)
-                .behavior_version(aws_sdk_s3::config::BehaviorVersion::latest())
-                .build()
-        };
-        let stale = target_client_for_test(
-            arn,
-            "https://stale.example:9443".to_string(),
-            S3Client::from_conf(config("https://stale.example:9443")),
-        );
-        let current = target_client_for_test(
-            arn,
-            "https://current.example:9443".to_string(),
-            S3Client::from_conf(config("https://current.example:9443")),
-        );
-        sys.arn_remotes_map
-            .write()
-            .await
-            .insert(arn.to_string(), ArnTarget::with_client(current.clone()));
-        sys.init_target_health(&current).await;
-
-        sys.mark_target_offline(&stale).await;
-
-        assert!(sys.is_target_offline(&stale).await);
-        assert!(!sys.is_target_offline(&current).await);
-    }
-
-    #[tokio::test]
-    async fn delete_removes_target_health_by_arn() {
-        let sys = BucketTargetSys::default();
-        let arn = "arn:delete";
-        let endpoint = "https://delete.example:9443".to_string();
-        let client = target_client_for_test(
-            arn,
-            endpoint.clone(),
-            S3Client::from_conf(
-                S3Config::builder()
-                    .endpoint_url(endpoint)
-                    .behavior_version(aws_sdk_s3::config::BehaviorVersion::latest())
-                    .build(),
-            ),
-        );
-        sys.targets_map.write().await.insert(
-            "bucket".to_string(),
-            vec![BucketTarget {
-                arn: arn.to_string(),
-                ..Default::default()
-            }],
-        );
-        sys.init_target_health(&client).await;
-
-        sys.delete("bucket").await;
-
-        assert!(!sys.target_health_stats().await.contains_key(arn));
    }

    #[test]
@@ -2649,32 +2285,6 @@ mod tests {
        assert_eq!(got.as_deref(), Some(vid.as_str()));
    }

-    #[tokio::test]
-    async fn remove_object_writes_null_purge_and_omits_marker_creation_version_queries() {
-        let (client, request_uris) = recording_target_client();
-        client
-            .remove_object("target-bucket", "object", Some("null".to_string()), remove_opts(true, false))
-            .await
-            .expect("explicit null version purge should reach the target client");
-        client
-            .remove_object("target-bucket", "object", Some(Uuid::new_v4().to_string()), remove_opts(true, true))
-            .await
-            .expect("delete marker creation should reach the target client");
-
-        let request_uris = request_uris.lock().expect("recorded request lock should not be poisoned");
-        assert_eq!(request_uris.len(), 2);
-        assert!(
-            request_uris[0].contains("versionId=null"),
-            "an explicit null purge must be emitted as a target versionId query: {}",
-            request_uris[0]
-        );
-        assert!(
-            !request_uris[1].contains("versionId="),
-            "delete marker creation must omit the target versionId query: {}",
-            request_uris[1]
-        );
-    }
-
    #[test]
    fn put_object_headers_include_non_empty_source_etag_only() {
        let mut opts = PutObjectOptions::default();
@@ -2765,216 +2375,6 @@ mod tests {
        assert_eq!(client.endpoint, "https://192.168.1.10:9000");
    }

-    #[tokio::test]
-    async fn target_health_check_rejects_untrusted_self_signed_certificate() {
-        let cert = generate_simple_self_signed(vec!["localhost".to_string()]).expect("certificate should generate");
-        let (port, server) = spawn_https_server(&cert, 1);
-        let target =
-            target_client_for_test("arn:default-tls", format!("https://localhost:{port}"), s3_client_for_test(port, None));
-
-        assert!(!BucketTargetSys::check_endpoint_health(&target).await);
-        server.join().expect("test TLS server should stop");
-    }
-
-    #[tokio::test]
-    async fn target_health_check_honors_skip_tls_verify_client() {
-        let cert = generate_simple_self_signed(vec!["localhost".to_string()]).expect("certificate should generate");
-        let (port, server) = spawn_https_server(&cert, 1);
-        let target = target_client_for_test(
-            "arn:skip-tls",
-            format!("https://localhost:{port}"),
-            s3_client_for_test(port, Some(build_insecure_aws_s3_http_client())),
-        );
-
-        assert!(BucketTargetSys::check_endpoint_health(&target).await);
-        server.join().expect("test TLS server should stop");
-    }
-
-    #[tokio::test]
-    async fn target_health_check_honors_custom_ca_client() {
-        let cert = generate_simple_self_signed(vec!["localhost".to_string()]).expect("certificate should generate");
-        let http_client = build_aws_s3_http_client_from_target_ca_pem(&cert.cert.pem())
-            .await
-            .expect("custom CA client should build");
-        let (port, server) = spawn_https_server(&cert, 1);
-        let target = target_client_for_test(
-            "arn:custom-ca",
-            format!("https://localhost:{port}"),
-            s3_client_for_test(port, Some(http_client)),
-        );
-
-        assert!(BucketTargetSys::check_endpoint_health(&target).await);
-        server.join().expect("test TLS server should stop");
-    }
-
-    #[tokio::test]
-    async fn target_health_check_treats_client_errors_as_online_and_server_errors_as_offline() {
-        for (status, expected_online) in [(403, true), (500, false)] {
-            let (port, server) = spawn_http_status_server(status);
-            let endpoint = format!("http://127.0.0.1:{port}");
-            let target = target_client_for_test(
-                &format!("arn:http-{status}"),
-                endpoint.clone(),
-                s3_client_for_endpoint_test(endpoint, None),
-            );
-
-            assert_eq!(BucketTargetSys::check_endpoint_health(&target).await, expected_online);
-            server.join().expect("test HTTP server should stop");
-        }
-    }
-
-    #[tokio::test]
-    async fn heartbeat_keeps_tls_health_isolated_by_arn_for_shared_endpoint() {
-        let sys = BucketTargetSys::default();
-        let cert = generate_simple_self_signed(vec!["localhost".to_string()]).expect("certificate should generate");
-        let (port, server) = spawn_https_server(&cert, 2);
-        let endpoint = format!("https://localhost:{port}");
-        let strict = target_client_for_test("arn:strict", endpoint.clone(), s3_client_for_test(port, None));
-        let insecure = target_client_for_test(
-            "arn:insecure",
-            endpoint,
-            s3_client_for_test(port, Some(build_insecure_aws_s3_http_client())),
-        );
-        {
-            let mut remotes = sys.arn_remotes_map.write().await;
-            remotes.insert(strict.arn.clone(), ArnTarget::with_client(strict.clone()));
-            remotes.insert(insecure.arn.clone(), ArnTarget::with_client(insecure.clone()));
-        }
-
-        sys.heartbeat_once().await;
-
-        assert!(sys.is_target_offline(&strict).await);
-        assert!(!sys.is_target_offline(&insecure).await);
-        server.join().expect("test TLS server should stop");
-    }
-
-    #[tokio::test]
-    async fn heartbeat_discards_result_from_replaced_client_with_same_arn() {
-        let sys = Arc::new(BucketTargetSys::default());
-        let (port, accepted, release, server) = spawn_delayed_http_server();
-        let endpoint = format!("http://127.0.0.1:{port}");
-        let stale = target_client_for_test("arn:replacement", endpoint.clone(), s3_client_for_endpoint_test(endpoint, None));
-        sys.arn_remotes_map
-            .write()
-            .await
-            .insert(stale.arn.clone(), ArnTarget::with_client(stale));
-        let heartbeat_sys = sys.clone();
-        let heartbeat = tokio::spawn(async move { heartbeat_sys.heartbeat_once().await });
-        accepted.await.expect("heartbeat request should reach test server");
-
-        let replacement_endpoint = "https://replacement.example:9443".to_string();
-        let replacement = target_client_for_test(
-            "arn:replacement",
-            replacement_endpoint.clone(),
-            S3Client::from_conf(
-                S3Config::builder()
-                    .endpoint_url(replacement_endpoint)
-                    .behavior_version(aws_sdk_s3::config::BehaviorVersion::latest())
-                    .build(),
-            ),
-        );
-        sys.arn_remotes_map
-            .write()
-            .await
-            .insert(replacement.arn.clone(), ArnTarget::with_client(replacement.clone()));
-        sys.init_target_health(&replacement).await;
-        release.send(()).expect("stale heartbeat response should be released");
-        heartbeat.await.expect("heartbeat should finish");
-
-        assert!(!sys.is_target_offline(&replacement).await);
-        server.join().expect("test HTTP server should stop");
-    }
-
-    #[tokio::test]
-    async fn target_update_mutex_reuses_live_lock_and_reclaims_dead_entries() {
-        let sys = BucketTargetSys::default();
-        let first = sys.target_update_mutex("first").await;
-        let same = sys.target_update_mutex("first").await;
-        assert!(Arc::ptr_eq(&first, &same));
-        drop(first);
-        drop(same);
-
-        let _second = sys.target_update_mutex("second").await;
-        let mutexes = sys.target_update_mutexes.lock().await;
-        assert!(!mutexes.contains_key("first"));
-        assert!(mutexes.contains_key("second"));
-    }
-
-    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn target_updates_serialize_client_build_through_publication_per_bucket() {
-        let sys = Arc::new(BucketTargetSys::default());
-        let started = Arc::new(tokio::sync::Semaphore::new(0));
-        let release = Arc::new(tokio::sync::Semaphore::new(0));
-        *sys.target_client_build_probe.lock().await = Some(TargetClientBuildProbe {
-            arn: "arn:first".to_string(),
-            started: started.clone(),
-            release: release.clone(),
-        });
-        let target = |arn: &str| BucketTarget {
-            arn: arn.to_string(),
-            endpoint: "192.168.1.10:9000".to_string(),
-            target_bucket: "target-bucket".to_string(),
-            region: "us-east-1".to_string(),
-            credentials: Some(Credentials {
-                access_key: "access".to_string(),
-                secret_key: "secret".to_string(),
-                session_token: None,
-                expiration: None,
-            }),
-            ..Default::default()
-        };
-        let first_targets = BucketTargets {
-            targets: vec![target("arn:first")],
-        };
-        let second_targets = BucketTargets {
-            targets: vec![target("arn:second")],
-        };
-        let first_sys = sys.clone();
-        let first = tokio::spawn(async move {
-            first_sys.update_all_targets("bucket", Some(&first_targets)).await;
-        });
-        tokio::time::timeout(Duration::from_secs(2), started.acquire())
-            .await
-            .expect("first client build should start")
-            .expect("first started semaphore should remain open")
-            .forget();
-        let second_started = Arc::new(tokio::sync::Semaphore::new(0));
-        let second_release = Arc::new(tokio::sync::Semaphore::new(0));
-        *sys.target_client_build_probe.lock().await = Some(TargetClientBuildProbe {
-            arn: "arn:second".to_string(),
-            started: second_started.clone(),
-            release: second_release.clone(),
-        });
-        let second_sys = sys.clone();
-        let second = tokio::spawn(async move {
-            second_sys.update_all_targets("bucket", Some(&second_targets)).await;
-        });
-        assert!(
-            tokio::time::timeout(Duration::from_millis(50), second_started.acquire())
-                .await
-                .is_err()
-        );
-        assert!(!sys.targets_map.read().await.contains_key("bucket"));
-
-        release.add_permits(1);
-        tokio::time::timeout(Duration::from_secs(2), first)
-            .await
-            .expect("first target update should not stall")
-            .expect("first target update should finish");
-        tokio::time::timeout(Duration::from_secs(1), second_started.acquire())
-            .await
-            .expect("second client build should start after first update publishes")
-            .expect("second started semaphore should remain open")
-            .forget();
-        second_release.add_permits(1);
-        tokio::time::timeout(Duration::from_secs(2), second)
-            .await
-            .expect("second target update should not stall")
-            .expect("second target update should finish");
-        let targets = sys.targets_map.read().await;
-        assert_eq!(targets["bucket"][0].arn, "arn:second");
-    }
-
    #[tokio::test]
    async fn replication_trust_store_composes_system_global_and_target_roots_for_real_tls() {
        let tls_dir = tempfile::tempdir().expect("temporary TLS directory should be created");
@@ -2996,8 +2396,8 @@ mod tests {
        );
        let http_client = build_aws_s3_http_client_with_trust_store(trust_store).expect("composed TLS client should build");

-        let (global_port, global_server) = spawn_https_server(&global_ca, 1);
-        s3_client_for_test(global_port, Some(http_client.clone()))
+        let (global_port, global_server) = spawn_single_request_https_server(&global_ca);
+        s3_client_with_http_client(global_port, http_client.clone())
            .head_bucket()
            .bucket("test-bucket")
            .send()
@@ -3005,8 +2405,8 @@ mod tests {
            .expect("global RUSTFS_TLS_PATH CA should authenticate its TLS server");
        global_server.join().expect("global CA TLS server should finish");

-        let (target_port, target_server) = spawn_https_server(&target_ca, 1);
-        s3_client_for_test(target_port, Some(http_client))
+        let (target_port, target_server) = spawn_single_request_https_server(&target_ca);
+        s3_client_with_http_client(target_port, http_client)
            .head_bucket()
            .bucket("test-bucket")
            .send()
@@ -23,7 +23,6 @@ use uuid::Uuid;
 use crate::bucket::lifecycle::config_boundary;
 use crate::bucket::lifecycle::lifecycle::TRANSITION_COMPLETE;
 use crate::bucket::lifecycle::tier_sweeper::{
-    delete_confirmed_transition_candidate_exact_with_lease_idempotent,
    delete_confirmed_transition_candidate_exact_with_manager_and_identity,
    delete_object_from_remote_tier_idempotent_with_manager_and_identity,
 };
@@ -617,199 +616,6 @@ pub enum TransitionTransactionRecoveryOutcome {
    Retained,
 }

-#[derive(Debug, Clone, PartialEq, Eq, Serialize)]
-#[serde(rename_all = "snake_case")]
-pub enum TransitionOperatorProbe {
-    Missing,
-    UnversionedPresent,
-    VersionedPresent(String),
-    Ambiguous,
-    Unsupported,
-}
-
-impl From<TransitionCandidateProbe> for TransitionOperatorProbe {
-    fn from(value: TransitionCandidateProbe) -> Self {
-        match value {
-            TransitionCandidateProbe::Missing => Self::Missing,
-            TransitionCandidateProbe::UnversionedPresent => Self::UnversionedPresent,
-            TransitionCandidateProbe::VersionedPresent(version_id) => Self::VersionedPresent(version_id),
-            TransitionCandidateProbe::Ambiguous => Self::Ambiguous,
-            TransitionCandidateProbe::Unsupported => Self::Unsupported,
-        }
-    }
-}
-
-#[derive(Debug, Clone, PartialEq, Eq, Serialize)]
-pub struct TransitionOperatorStatus {
-    pub transaction_id: Uuid,
-    pub state: TransitionTransactionState,
-    pub tier_name: String,
-    pub remote_object: String,
-    pub not_after_unix_nanos: i64,
-    pub probe: TransitionOperatorProbe,
-}
-
-#[derive(Debug, Clone, PartialEq, Eq, Serialize)]
-pub struct TransitionOperatorDeleteResult {
-    pub status: TransitionOperatorStatus,
-    pub journal_observed_after_delete: bool,
-}
-
-#[derive(Debug, thiserror::Error)]
-pub enum TransitionOperatorError {
-    #[error("transition transaction was not found")]
-    NotFound,
-    #[error("transition transaction is still inside its active ownership window")]
-    NotExpired,
-    #[error("transition transaction state is not eligible for operator reconciliation: {0:?}")]
-    InvalidState(TransitionTransactionState),
-    #[error("an exact non-empty remote version is required")]
-    RemoteVersionRequired,
-    #[error("remote candidate is not proven missing: {0:?}")]
-    CandidateNotMissing(TransitionOperatorProbe),
-    #[error("remote candidate version does not match requested exact version: expected {expected}, observed {actual:?}")]
-    CandidateVersionMismatch {
-        expected: String,
-        actual: TransitionOperatorProbe,
-    },
-    #[error("transition transaction store failed: {0}")]
-    Store(#[source] Error),
-    #[error("remote tier reconciliation failed: {0}")]
-    Remote(#[source] std::io::Error),
-}
-
-type TransitionOperatorResult<T> = std::result::Result<T, TransitionOperatorError>;
-
-fn validate_operator_reconcile_transaction(
-    transaction: &TransitionTransaction,
-    now_unix_nanos: i128,
-) -> TransitionOperatorResult<()> {
-    transaction
-        .validate()
-        .map_err(|err| TransitionOperatorError::Store(Error::other(err)))?;
-    if transaction.state != TransitionTransactionState::UploadOutcomeUnknown {
-        return Err(TransitionOperatorError::InvalidState(transaction.state));
-    }
-    if now_unix_nanos < i128::from(transaction.not_after_unix_nanos) {
-        return Err(TransitionOperatorError::NotExpired);
-    }
-    Ok(())
-}
-
-async fn load_operator_reconcile_transaction(
-    api: Arc<ECStore>,
-    transaction_id: Uuid,
-) -> TransitionOperatorResult<TransitionTransaction> {
-    match load_transition_transaction_record(api, transaction_id).await {
-        Ok(transaction) => Ok(transaction),
-        Err(Error::ConfigNotFound) => Err(TransitionOperatorError::NotFound),
-        Err(err) => Err(TransitionOperatorError::Store(err)),
-    }
-}
-
-async fn operator_probe_transition_candidate(
-    api: Arc<ECStore>,
-    transaction: &TransitionTransaction,
-) -> TransitionOperatorResult<TransitionOperatorProbe> {
-    let lease = TierConfigMgr::acquire_operation_lease_for_backend_identity(
-        &api.tier_config_mgr(),
-        &transaction.tier_name,
-        transaction.backend_fingerprint,
-    )
-    .await
-    .map_err(|err| TransitionOperatorError::Remote(std::io::Error::other(err)))?;
-    lease
-        .probe_transition_candidate_for(&transaction.remote_object, transaction.transaction_id)
-        .await
-        .map(TransitionOperatorProbe::from)
-        .map_err(TransitionOperatorError::Remote)
-}
-
-pub async fn inspect_transition_transaction_for_operator(
-    api: Arc<ECStore>,
-    transaction_id: Uuid,
-) -> TransitionOperatorResult<TransitionOperatorStatus> {
-    let transaction = load_operator_reconcile_transaction(api.clone(), transaction_id).await?;
-    validate_operator_reconcile_transaction(&transaction, time::OffsetDateTime::now_utc().unix_timestamp_nanos())?;
-    let probe = operator_probe_transition_candidate(api, &transaction).await?;
-    Ok(TransitionOperatorStatus {
-        transaction_id,
-        state: transaction.state,
-        tier_name: transaction.tier_name,
-        remote_object: transaction.remote_object,
-        not_after_unix_nanos: transaction.not_after_unix_nanos,
-        probe,
-    })
-}
-
-pub async fn delete_transition_candidate_for_operator(
-    api: Arc<ECStore>,
-    transaction_id: Uuid,
-    remote_version_id: &str,
-) -> TransitionOperatorResult<TransitionOperatorDeleteResult> {
-    if remote_version_id.is_empty() {
-        return Err(TransitionOperatorError::RemoteVersionRequired);
-    }
-    let transaction = load_operator_reconcile_transaction(api.clone(), transaction_id).await?;
-    validate_operator_reconcile_transaction(&transaction, time::OffsetDateTime::now_utc().unix_timestamp_nanos())?;
-    let lease = TierConfigMgr::acquire_operation_lease_for_backend_identity(
-        &api.tier_config_mgr(),
-        &transaction.tier_name,
-        transaction.backend_fingerprint,
-    )
-    .await
-    .map_err(|err| TransitionOperatorError::Remote(std::io::Error::other(err)))?;
-    lease
-        .validate_remote_version_id(remote_version_id)
-        .map_err(TransitionOperatorError::Remote)?;
-    let before_delete_probe = lease
-        .probe_transition_candidate_for(&transaction.remote_object, transaction.transaction_id)
-        .await
-        .map(TransitionOperatorProbe::from)
-        .map_err(TransitionOperatorError::Remote)?;
-    if !matches!(&before_delete_probe, TransitionOperatorProbe::VersionedPresent(version_id) if version_id == remote_version_id) {
-        return Err(TransitionOperatorError::CandidateVersionMismatch {
-            expected: remote_version_id.to_string(),
-            actual: before_delete_probe,
-        });
-    }
-    delete_confirmed_transition_candidate_exact_with_lease_idempotent(&transaction.remote_object, remote_version_id, &lease)
-        .await
-        .map_err(TransitionOperatorError::Remote)?;
-    let probe = operator_probe_transition_candidate(api.clone(), &transaction).await?;
-    let journal_observed_after_delete = match load_transition_transaction_record(api, transaction_id).await {
-        Ok(_) => true,
-        Err(Error::ConfigNotFound) => false,
-        Err(err) => return Err(TransitionOperatorError::Store(err)),
-    };
-    Ok(TransitionOperatorDeleteResult {
-        status: TransitionOperatorStatus {
-            transaction_id,
-            state: transaction.state,
-            tier_name: transaction.tier_name,
-            remote_object: transaction.remote_object,
-            not_after_unix_nanos: transaction.not_after_unix_nanos,
-            probe,
-        },
-        journal_observed_after_delete,
-    })
-}
-
-pub async fn finalize_missing_transition_transaction_for_operator(
-    api: Arc<ECStore>,
-    transaction_id: Uuid,
-) -> TransitionOperatorResult<()> {
-    let transaction = load_operator_reconcile_transaction(api.clone(), transaction_id).await?;
-    validate_operator_reconcile_transaction(&transaction, time::OffsetDateTime::now_utc().unix_timestamp_nanos())?;
-    let probe = operator_probe_transition_candidate(api.clone(), &transaction).await?;
-    if probe != TransitionOperatorProbe::Missing {
-        return Err(TransitionOperatorError::CandidateNotMissing(probe));
-    }
-    delete_transition_transaction_record(api, transaction_id)
-        .await
-        .map_err(TransitionOperatorError::Store)
-}
-
 pub(crate) fn decode_transition_transaction_record(object: &str, data: &[u8]) -> Result<TransitionTransaction> {
    let transaction_id = transition_transaction_id_from_record_object_name(object)?;
    TransitionTransaction::decode(transaction_id, data)
@@ -894,7 +700,7 @@ async fn recover_unknown_upload_outcome(
    .map_err(Error::other)?;

    match lease
-        .probe_transition_candidate_for(&transaction.remote_object, transaction.transaction_id)
+        .probe_transition_candidate(&transaction.remote_object)
        .await
        .map_err(Error::other)?
    {
@@ -1291,27 +1097,6 @@ mod tests {
            .expect("upload state change should succeed")
    }

-    #[test]
-    fn operator_reconcile_requires_expired_unknown_upload_outcome() {
-        let mut transaction = new_transaction();
-        let active_deadline = transaction.not_after_unix_nanos;
-
-        assert!(matches!(
-            validate_operator_reconcile_transaction(&transaction, i128::from(active_deadline) + 1),
-            Err(TransitionOperatorError::InvalidState(TransitionTransactionState::UploadStarted))
-        ));
-
-        transaction
-            .advance(transaction.fence(), TransitionTransactionState::UploadOutcomeUnknown, None)
-            .expect("unknown upload outcome should be recorded");
-        assert!(matches!(
-            validate_operator_reconcile_transaction(&transaction, i128::from(active_deadline) - 1),
-            Err(TransitionOperatorError::NotExpired)
-        ));
-        validate_operator_reconcile_transaction(&transaction, i128::from(active_deadline))
-            .expect("expired unknown upload outcome should be eligible");
-    }
-
    fn cleanup_proof(transaction: &TransitionTransaction, decision: TransitionCleanupDecision) -> TransitionCleanupProof {
        TransitionCleanupProof {
            transaction_id: transaction.transaction_id,
@@ -16,7 +16,6 @@ use super::msgp_decode::{read_msgp_ext8_time, skip_msgp_value, write_msgp_time};
 use super::object_lock::ObjectLockApi;
 use super::versioning::VersioningApi;
 use super::{quota::BucketQuota, target::BucketTargets};
-use crate::bucket::replication::invalid_replication_config_status_field;
 use crate::bucket::utils::deserialize;
 use crate::config::com::{read_config, save_config};
 use crate::disk::BUCKET_META_PREFIX;
@@ -26,9 +25,9 @@ use crate::store::ECStore;
 use byteorder::{BigEndian, ByteOrder, LittleEndian};
 use rustfs_policy::policy::BucketPolicy;
 use s3s::dto::{
-    AccelerateConfiguration, BucketLifecycleConfiguration, BucketLoggingStatus, BucketVersioningStatus, CORSConfiguration,
-    NotificationConfiguration, ObjectLockConfiguration, PublicAccessBlockConfiguration, ReplicationConfiguration,
-    RequestPaymentConfiguration, ServerSideEncryptionConfiguration, Tagging, VersioningConfiguration, WebsiteConfiguration,
+    AccelerateConfiguration, BucketLifecycleConfiguration, BucketLoggingStatus, CORSConfiguration, NotificationConfiguration,
+    ObjectLockConfiguration, PublicAccessBlockConfiguration, ReplicationConfiguration, RequestPaymentConfiguration,
+    ServerSideEncryptionConfiguration, Tagging, VersioningConfiguration, WebsiteConfiguration,
 };
 use serde::Serializer;
 use sha2::{Digest, Sha256};
@@ -752,33 +751,11 @@ impl BucketMetadata {
                self.object_lock_config_updated_at = updated;
            }
            BUCKET_VERSIONING_CONFIG => {
-                let config = if data.is_empty() {
-                    None
-                } else {
-                    let config = deserialize::<VersioningConfiguration>(&data)?;
-                    if config.status.as_ref().is_some_and(|status| {
-                        !matches!(status.as_str(), BucketVersioningStatus::ENABLED | BucketVersioningStatus::SUSPENDED)
-                    }) {
-                        return Err(Error::other("bucket versioning configuration has an invalid status"));
-                    }
-                    Some(config)
-                };
                self.versioning_config_xml = data;
-                self.versioning_config = config;
                self.versioning_config_updated_at = updated;
            }
            BUCKET_REPLICATION_CONFIG => {
-                let config = if data.is_empty() {
-                    None
-                } else {
-                    let config = deserialize::<ReplicationConfiguration>(&data)?;
-                    if let Some(field) = invalid_replication_config_status_field(&config) {
-                        return Err(Error::other(format!("replication field {field} has an invalid status")));
-                    }
-                    Some(config)
-                };
                self.replication_config_xml = data;
-                self.replication_config = config;
                self.replication_config_updated_at = updated;
            }
            BUCKET_TARGETS_FILE => {
@@ -848,6 +825,7 @@ impl BucketMetadata {
    /// ambient (first) one. [`BucketMetadata::save`] keeps the ambient default.
    pub async fn save_with_store(&mut self, store: std::sync::Arc<crate::store::ECStore>) -> Result<()> {
        self.parse_all_configs()?;
+
        let mut buf: Vec<u8> = vec![0; 4];

        LittleEndian::write_u16(&mut buf[0..2], BUCKET_METADATA_FORMAT);
@@ -928,7 +906,6 @@ impl BucketMetadata {
                "Failed to parse bucket metadata config"
            );
        }
-        self.versioning_config = None;
        if !self.versioning_config_xml.is_empty()
            && let Err(e) =
                deserialize::<VersioningConfiguration>(&self.versioning_config_xml).map(|c| self.versioning_config = Some(c))
@@ -983,7 +960,6 @@ impl BucketMetadata {
                "Failed to parse bucket metadata config"
            );
        }
-        self.replication_config = None;
        if !self.replication_config_xml.is_empty()
            && let Err(e) =
                deserialize::<ReplicationConfiguration>(&self.replication_config_xml).map(|c| self.replication_config = Some(c))
@@ -1369,66 +1345,6 @@ mod test {
        assert!(bm.tagging_config.is_none());
    }

-    #[test]
-    fn delete_admission_configs_update_parsed_state_atomically() {
-        let mut bm = BucketMetadata::new("test-bucket");
-        let versioning_xml = b"<VersioningConfiguration><Status>Enabled</Status></VersioningConfiguration>";
-        let replication_xml = b"<ReplicationConfiguration><Role>arn:aws:s3:::target-bucket</Role><Rule><ID>rule1</ID><Status>Enabled</Status><Prefix></Prefix><Destination><Bucket>arn:aws:s3:::target-bucket</Bucket></Destination></Rule></ReplicationConfiguration>";
-
-        bm.update_config(BUCKET_VERSIONING_CONFIG, versioning_xml.to_vec())
-            .expect("valid versioning config should update parsed state");
-        bm.update_config(BUCKET_REPLICATION_CONFIG, replication_xml.to_vec())
-            .expect("valid replication config should update parsed state");
-
-        assert!(bm.versioning_config.as_ref().is_some_and(VersioningConfiguration::enabled));
-        assert_eq!(
-            bm.replication_config.as_ref().map(|config| config.role.as_str()),
-            Some("arn:aws:s3:::target-bucket")
-        );
-
-        assert!(
-            bm.update_config(BUCKET_VERSIONING_CONFIG, b"<VersioningConfiguration>".to_vec())
-                .is_err()
-        );
-        assert!(
-            bm.update_config(BUCKET_REPLICATION_CONFIG, b"<ReplicationConfiguration>".to_vec())
-                .is_err()
-        );
-
-        assert_eq!(bm.versioning_config_xml, versioning_xml);
-        assert_eq!(bm.replication_config_xml, replication_xml);
-        assert!(bm.versioning_config.as_ref().is_some_and(VersioningConfiguration::enabled));
-        assert_eq!(
-            bm.replication_config.as_ref().map(|config| config.role.as_str()),
-            Some("arn:aws:s3:::target-bucket")
-        );
-
-        assert!(
-            bm.update_config(
-                BUCKET_VERSIONING_CONFIG,
-                b"<VersioningConfiguration><Status>Enabld</Status></VersioningConfiguration>".to_vec(),
-            )
-            .is_err()
-        );
-        assert!(
-            bm.update_config(
-                BUCKET_REPLICATION_CONFIG,
-                b"<ReplicationConfiguration><Role>arn:aws:s3:::target-bucket</Role><Rule><ID>rule1</ID><Status>Enabld</Status><Prefix></Prefix><Destination><Bucket>arn:aws:s3:::target-bucket</Bucket></Destination></Rule></ReplicationConfiguration>".to_vec(),
-            )
-            .is_err()
-        );
-        assert_eq!(bm.versioning_config_xml, versioning_xml);
-        assert_eq!(bm.replication_config_xml, replication_xml);
-
-        bm.versioning_config_xml = b"<VersioningConfiguration>".to_vec();
-        bm.replication_config_xml = b"<ReplicationConfiguration>".to_vec();
-        bm.parse_all_configs()
-            .expect("bulk config parsing reports malformed fields through cleared typed state");
-
-        assert!(bm.versioning_config.is_none());
-        assert!(bm.replication_config.is_none());
-    }
-
    #[tokio::test]
    async fn marshal_msg_complete_example() {
        // Create a complete BucketMetadata with various configurations
@@ -242,138 +242,73 @@ pub(crate) async fn remove_bucket_metadata_in(ctx: &crate::runtime::instance::In
    Ok(lock.remove(bucket).await)
 }

-/// Rewrite one config file of a bucket's metadata, serialized cluster-wide.
-///
-/// See [`acquire_bucket_metadata_transaction_lock`] for why every config
-/// write — not just the replication-targets one — has to hold that lock.
 pub async fn update(bucket: &str, config_file: &str, data: Vec<u8>) -> Result<OffsetDateTime> {
-    update_with_sys(get_bucket_metadata_sys()?, bucket, config_file, data).await
-}
-
-pub async fn delete(bucket: &str, config_file: &str) -> Result<OffsetDateTime> {
-    delete_with_sys(get_bucket_metadata_sys()?, bucket, config_file).await
-}
-
-/// [`update`] against an explicitly supplied metadata system.
-///
-/// The free functions resolve the instance's own system; this variant takes
-/// it as an argument so a test can drive two independent systems over one
-/// backing store — the in-process stand-in for two nodes, which is the only
-/// configuration where the transaction lock is what does the serializing.
-async fn update_with_sys(
-    sys: Arc<RwLock<BucketMetadataSys>>,
-    bucket: &str,
-    config_file: &str,
-    data: Vec<u8>,
-) -> Result<OffsetDateTime> {
-    let (_transaction_guard, mut sys) = acquire_config_write_guards(sys, bucket).await?;
-    sys.update(bucket, 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> {
-    let (_transaction_guard, mut sys) = acquire_config_write_guards(sys, bucket).await?;
-    sys.delete(bucket, config_file).await
-}
-
-/// Take, in the one order every config write uses, the two guards a
-/// read-modify-write of a bucket's metadata needs: the cluster-wide
-/// transaction lock first, then this process's metadata-system write guard.
-///
-/// The order is load-bearing. Acquiring the process-local guard first would
-/// park every local reader and writer of *every* bucket behind a lock whose
-/// holder may be another node, turning remote contention into a local stall.
-async fn acquire_config_write_guards(
-    sys: Arc<RwLock<BucketMetadataSys>>,
-    bucket: &str,
-) -> Result<(rustfs_lock::NamespaceLockGuard, tokio::sync::OwnedRwLockWriteGuard<BucketMetadataSys>)> {
-    let transaction_guard = acquire_transaction_lock_with_sys(&sys, bucket).await?;
-    let sys_guard = sys.write_owned().await;
-    Ok((transaction_guard, sys_guard))
-}
-
-/// Rewrite one config file while the caller already holds this bucket's
-/// transaction lock.
-///
-/// [`update`] would deadlock here: the lock is not reentrant, so a holder
-/// that called it would block until its own guard timed out.
-pub async fn update_under_transaction_lock(bucket: &str, config_file: &str, data: Vec<u8>) -> Result<OffsetDateTime> {
    let bucket_meta_sys_lock = get_bucket_metadata_sys()?;
+    let _targets_guard = if config_file == BUCKET_TARGETS_FILE {
+        Some(acquire_bucket_targets_transaction_lock(bucket).await?)
+    } else {
+        None
+    };
    let mut bucket_meta_sys = bucket_meta_sys_lock.write().await;
+
    bucket_meta_sys.update(bucket, config_file, data).await
 }

 pub async fn update_bucket_targets_under_transaction_lock(bucket: &str, data: Vec<u8>) -> Result<OffsetDateTime> {
-    update_under_transaction_lock(bucket, BUCKET_TARGETS_FILE, data).await
+    let bucket_meta_sys_lock = get_bucket_metadata_sys()?;
+    let mut bucket_meta_sys = bucket_meta_sys_lock.write().await;
+    bucket_meta_sys.update(bucket, BUCKET_TARGETS_FILE, data).await
 }

-/// Read-modify-write one bucket config file under both guards a config
-/// write takes.
+/// Read-modify-write one bucket config file under the metadata system's
+/// outer write guard.
 ///
 /// `mutate` sees the freshly loaded on-disk metadata and returns the
 /// replacement payload for `config_file` (empty clears it, like
 /// [`delete`]). Both the read and the persisted write happen inside the
-/// same guards [`update`] takes, so the rewrite can neither clobber a
-/// concurrent update to another config file nor lose a concurrent write to
-/// the same one — unlike caching a mutated clone of previously read
-/// metadata.
+/// same guard that [`update`] uses, so within this process the rewrite can
+/// neither clobber a concurrent update to another config file nor lose a
+/// concurrent write to the same one — unlike caching a mutated clone of
+/// previously read metadata.
 ///
-/// That exclusion is cluster-wide, not merely process-local: the transaction
-/// lock is now taken for every config file rather than only the replication
-/// targets one, so a writer on another node cannot land a whole-file save in
-/// the middle of this read-modify-write.
+/// This guard is process-local. Writers on other nodes still race, exactly
+/// as they do for [`update`]: each rewrites the whole metadata file, so the
+/// later save wins. What this narrows is the window — from "as stale as the
+/// local cache" down to a single metadata read plus write.
 pub async fn update_config_with<F>(bucket: &str, config_file: &str, mutate: F) -> Result<OffsetDateTime>
 where
    F: FnOnce(&BucketMetadata) -> Result<Vec<u8>> + Send,
 {
-    let (_transaction_guard, mut sys) = acquire_config_write_guards(get_bucket_metadata_sys()?, bucket).await?;
-    sys.update_config_with(bucket, config_file, mutate).await
+    let bucket_meta_sys_lock = get_bucket_metadata_sys()?;
+    let _targets_guard = if config_file == BUCKET_TARGETS_FILE {
+        Some(acquire_bucket_targets_transaction_lock(bucket).await?)
+    } else {
+        None
+    };
+    let mut bucket_meta_sys = bucket_meta_sys_lock.write().await;
+    bucket_meta_sys.update_config_with(bucket, config_file, mutate).await
 }

-/// Acquire a bucket's metadata transaction lock, held across a whole
-/// read-modify-write of its metadata file.
-///
-/// Every config write loads the entire [`BucketMetadata`] blob, replaces one
-/// field, and saves the whole thing back. The namespace locks inside
-/// `read_config`/`save_config` are taken and released separately, so they do
-/// not span that cycle: two nodes updating *different* config files of one
-/// bucket both load the same blob, each set their own field, and the later
-/// save drops the other's — with both clients already told 2xx. This is not
-/// last-writer-wins on one document; an orthogonal config silently vanishes.
-///
-/// So the lock is per bucket, not per config file: a per-file key would let
-/// exactly that pair run concurrently.
-///
-/// Callers that hold this guard must use [`update_under_transaction_lock`]
-/// rather than [`update`] — see that function.
-pub async fn acquire_bucket_metadata_transaction_lock(bucket: &str) -> Result<rustfs_lock::NamespaceLockGuard> {
-    acquire_transaction_lock_with_sys(&get_bucket_metadata_sys()?, bucket).await
-}
-
-async fn acquire_transaction_lock_with_sys(
-    sys: &Arc<RwLock<BucketMetadataSys>>,
-    bucket: &str,
-) -> Result<rustfs_lock::NamespaceLockGuard> {
-    // Resolve the store under a short-lived read guard: this runs before the
-    // write guard in `acquire_config_write_guards`, and must not still hold a
-    // read guard when the namespace lock is awaited.
-    let api = sys.read().await.object_store();
+pub async fn acquire_bucket_targets_transaction_lock(bucket: &str) -> Result<rustfs_lock::NamespaceLockGuard> {
+    let bucket_meta_sys_lock = get_bucket_metadata_sys()?;
+    let api = bucket_meta_sys_lock.read().await.object_store();
    let lock = api
-        .new_ns_lock(RUSTFS_META_BUCKET, &bucket_metadata_transaction_lock_key(bucket))
+        .new_ns_lock(RUSTFS_META_BUCKET, &bucket_targets_transaction_lock_key(bucket))
        .await?;
    Ok(lock.get_write_lock(crate::set_disk::get_lock_acquire_timeout()).await?)
 }

-/// The lock resource name is deliberately still the `bucket-targets` one it
-/// had when only replication-target writes took it. The key is what nodes
-/// agree on, so renaming it would leave a mixed-version cluster with two
-/// disjoint keys — and old and new nodes would stop excluding each other on
-/// the very writes that are serialized today.
-fn bucket_metadata_transaction_lock_key(bucket: &str) -> String {
+fn bucket_targets_transaction_lock_key(bucket: &str) -> String {
    format!("bucket-targets/{bucket}/transaction.lock")
 }

+pub async fn delete(bucket: &str, config_file: &str) -> Result<OffsetDateTime> {
+    let bucket_meta_sys_lock = get_bucket_metadata_sys()?;
+    let mut bucket_meta_sys = bucket_meta_sys_lock.write().await;
+
+    bucket_meta_sys.delete(bucket, config_file).await
+}
+
 pub async fn get_bucket_policy(bucket: &str) -> Result<(BucketPolicy, OffsetDateTime)> {
    let bucket_meta_sys_lock = get_bucket_metadata_sys()?;
    let bucket_meta_sys = bucket_meta_sys_lock.read().await;
@@ -579,26 +514,8 @@ pub struct BucketMetadataSys {
    /// Serializes metadata-map commits and their derived cache updates for one
    /// bucket. Namespace locks, when present, are acquired before this lock.
    metadata_publish_locks: Arc<MetadataPublishLockRegistry>,
-    /// Deduplicates concurrent lazy loads of one bucket's metadata, so N
-    /// simultaneous cache misses issue a single disk read instead of N.
-    ///
-    /// This is the `singleflight` that upstream applies to its own lazy
-    /// `GetConfig`. Without it the namespace *read* lock the load holds is no
-    /// help: read locks are shared, so it excludes concurrent config writers
-    /// but not concurrent readers, and every caller still pays a full
-    /// erasure-set metadata fanout. A separate registry from
-    /// `metadata_publish_locks`, reusing the same per-bucket lock machinery.
-    ///
-    /// Lock order: this lock, then the namespace lock, then the publish lock,
-    /// then the metadata map. It is only ever taken as the first of those, so
-    /// it cannot invert against a path that already holds one of the others.
-    lazy_load_locks: Arc<MetadataPublishLockRegistry>,
    #[cfg(test)]
    lazy_load_lock_probe: std::sync::atomic::AtomicBool,
-    /// Counts disk loads taken by the lazy `get_config` path, so a test can
-    /// prove concurrent misses collapse into one.
-    #[cfg(test)]
-    lazy_disk_loads: std::sync::atomic::AtomicUsize,
    /// Buckets recently observed to have no persisted metadata. Serving the
    /// fabricated default from here (instead of re-reading disk) keeps the
    /// per-request cost of repeated lookups for such names bounded — without
@@ -617,13 +534,8 @@ impl BucketMetadataSys {
            metadata_publish_locks: Arc::new(MetadataPublishLockRegistry {
                locks: StdMutex::new(HashMap::new()),
            }),
-            lazy_load_locks: Arc::new(MetadataPublishLockRegistry {
-                locks: StdMutex::new(HashMap::new()),
-            }),
            #[cfg(test)]
            lazy_load_lock_probe: std::sync::atomic::AtomicBool::new(false),
-            #[cfg(test)]
-            lazy_disk_loads: std::sync::atomic::AtomicUsize::new(0),
            absent_metadata: moka::future::Cache::builder()
                .max_capacity(ABSENT_BUCKET_METADATA_MAX_ENTRIES)
                .time_to_live(ABSENT_BUCKET_METADATA_TTL)
@@ -638,22 +550,16 @@ impl BucketMetadataSys {
    }

    fn metadata_publish_lock(&self, bucket: &str) -> Arc<Mutex<MetadataPublishLockState>> {
-        Self::bucket_lock_in(&self.metadata_publish_locks, bucket)
-    }
-
-    /// Per-bucket gate for the lazy `get_config` disk load. See
-    /// [`Self::lazy_load_locks`].
-    fn lazy_load_lock(&self, bucket: &str) -> Arc<Mutex<MetadataPublishLockState>> {
-        Self::bucket_lock_in(&self.lazy_load_locks, bucket)
-    }
-
-    fn bucket_lock_in(registry: &Arc<MetadataPublishLockRegistry>, bucket: &str) -> Arc<Mutex<MetadataPublishLockState>> {
-        let mut locks = registry.locks.lock().unwrap_or_else(|poisoned| poisoned.into_inner());
+        let mut locks = self
+            .metadata_publish_locks
+            .locks
+            .lock()
+            .unwrap_or_else(|poisoned| poisoned.into_inner());
        locks.get(bucket).and_then(Weak::upgrade).unwrap_or_else(|| {
            let lock = Arc::new_cyclic(|lock| {
                Mutex::new(MetadataPublishLockState {
                    bucket: bucket.to_string(),
-                    registry: Arc::downgrade(registry),
+                    registry: Arc::downgrade(&self.metadata_publish_locks),
                    lock: lock.clone(),
                })
            });
@@ -958,11 +864,11 @@ impl BucketMetadataSys {
    }

    async fn update_and_parse(&mut self, bucket: &str, config_file: &str, data: Vec<u8>, parse: bool) -> 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
-        // read and the write of a single read-modify-write able to target
-        // different instances.
-        let mut bm = Self::load_bucket_metadata_for_update(self.api.clone(), bucket, parse).await?;
+        let Some(store) = runtime_sources::object_store_handle() else {
+            return Err(Error::other("errServerNotInitialized"));
+        };
+
+        let mut bm = Self::load_bucket_metadata_for_update(store, bucket, parse).await?;

        let updated = bm.update_config(config_file, data)?;

@@ -1027,6 +933,7 @@ impl BucketMetadataSys {
    /// server's metadata never leaks into the ambient (first) instance.
    pub(crate) async fn persist_and_set(&self, bm: BucketMetadata) -> Result<()> {
        let mut bm = bm;
+
        bm.save_with_store(self.api.clone()).await?;

        self.set(bm.name.clone(), Arc::new(bm)).await;
@@ -1107,27 +1014,6 @@ impl BucketMetadataSys {
                return Ok((Arc::new(bm), true));
            }

-            // Collapse concurrent misses for this bucket into one disk load.
-            // Taken before the namespace lock — see `lazy_load_locks` for the
-            // ordering rule.
-            let load_lock = self.lazy_load_lock(bucket);
-            let _load_guard = load_lock.lock_owned().await;
-
-            // Re-check both caches: whoever held the gate before us may have
-            // already answered this exact question, and repeating the fanout
-            // is the whole cost this gate exists to avoid.
-            if let Some(bm) = self.metadata_map.read().await.get(bucket).cloned() {
-                return Ok((bm, true));
-            }
-            if self.absent_metadata.get(bucket).await.is_some() {
-                let mut bm = BucketMetadata::new(bucket);
-                bm.default_timestamps();
-                return Ok((Arc::new(bm), true));
-            }
-
-            #[cfg(test)]
-            self.lazy_disk_loads.fetch_add(1, std::sync::atomic::Ordering::Relaxed);
-
            let lock = self.api.new_ns_lock(bucket, bucket).await?;
            let guard = lock.get_read_lock(crate::set_disk::get_lock_acquire_timeout()).await?;
            #[cfg(test)]
@@ -1220,9 +1106,7 @@ impl BucketMetadataSys {
            }
        };

-        if !bm.versioning_config_xml.is_empty() && bm.versioning_config.is_none() {
-            Err(Error::other("persisted bucket versioning configuration is invalid"))
-        } else if let Some(config) = &bm.versioning_config {
+        if let Some(config) = &bm.versioning_config {
            Ok((config.clone(), bm.versioning_config_updated_at))
        } else {
            Ok((VersioningConfiguration::default(), bm.versioning_config_updated_at))
@@ -1408,9 +1292,7 @@ impl BucketMetadataSys {
    pub async fn get_replication_config(&self, bucket: &str) -> Result<(ReplicationConfiguration, OffsetDateTime)> {
        let (bm, _) = self.get_config(bucket).await?;

-        if !bm.replication_config_xml.is_empty() && bm.replication_config.is_none() {
-            Err(Error::other("persisted bucket replication configuration is invalid"))
-        } else if let Some(config) = &bm.replication_config {
+        if let Some(config) = &bm.replication_config {
            Ok((config.clone(), bm.replication_config_updated_at))
        } else {
            Err(Error::ConfigNotFound)
@@ -1484,65 +1366,6 @@ mod tests {
    use serial_test::serial;
    use tokio::time::timeout;

-    #[tokio::test]
-    async fn malformed_delete_configs_are_not_treated_as_absent() {
-        let (_dirs, ecstore) = isolated_store_over_temp_disks().await;
-        let sys = BucketMetadataSys::new(ecstore);
-        let bucket = "malformed-delete-config";
-        let mut metadata = BucketMetadata::new(bucket);
-        metadata.versioning_config_xml = b"<VersioningConfiguration>".to_vec();
-        metadata.versioning_config = None;
-        metadata.replication_config_xml = b"<ReplicationConfiguration>".to_vec();
-        metadata.replication_config = None;
-        sys.set(bucket.to_string(), Arc::new(metadata)).await;
-
-        assert!(
-            sys.get_versioning_config(bucket).await.is_err(),
-            "malformed versioning metadata must block destructive requests"
-        );
-        assert!(
-            sys.get_replication_config(bucket).await.is_err(),
-            "malformed replication metadata must not be reported as ConfigNotFound"
-        );
-    }
-
-    /// Concurrent cache misses for one bucket must collapse into a single disk
-    /// load.
-    ///
-    /// The namespace read lock the lazy path already holds does not provide
-    /// this: read locks are shared, so it excludes concurrent config writers
-    /// but not concurrent readers. Without the dedup gate every caller pays its
-    /// own namespace-lock acquisition plus a full erasure-set metadata fanout —
-    /// and the paths that reach `get_config` are per-request, so the multiplier
-    /// is request concurrency.
-    #[tokio::test]
-    async fn concurrent_lazy_loads_of_one_bucket_issue_a_single_disk_read() {
-        use std::sync::atomic::Ordering;
-
-        let (_dirs, ecstore) = isolated_store_over_temp_disks().await;
-        let sys = Arc::new(BucketMetadataSys::new(ecstore));
-
-        // A name with no persisted metadata: every caller misses the map, and
-        // the absent-cache entry does not exist until the first load records it.
-        let bucket = "singleflight-bucket";
-        let waiters = 8;
-
-        let results = futures::future::join_all((0..waiters).map(|_| {
-            let sys = Arc::clone(&sys);
-            async move { sys.get_config(bucket).await.map(|(bm, _)| bm.name.clone()) }
-        }))
-        .await;
-
-        for result in results {
-            assert_eq!(result.expect("every caller must get an answer"), bucket);
-        }
-        assert_eq!(
-            sys.lazy_disk_loads.load(Ordering::Relaxed),
-            1,
-            "concurrent misses for one bucket must share a single disk load"
-        );
-    }
-
    /// Pins the fail-closed caching contract of the lazy `get_config` path
    /// and the refresh no-replace rule: fabricated defaults are returned but
    /// never served by the map-only `get()`, persisted metadata is cached on
@@ -1992,160 +1815,6 @@ mod tests {
        );
    }

-    /// Two metadata systems over one backing store: the in-process stand-in
-    /// for two nodes. They share no `RwLock`, so nothing but the transaction
-    /// lock can serialize them — exactly the cross-node case.
-    async fn two_nodes_over_one_store() -> (Vec<tempfile::TempDir>, Arc<RwLock<BucketMetadataSys>>, Arc<RwLock<BucketMetadataSys>>)
-    {
-        let (dirs, ecstore) = isolated_store_over_temp_disks().await;
-        let node_a = Arc::new(RwLock::new(BucketMetadataSys::new(ecstore.clone())));
-        let node_b = Arc::new(RwLock::new(BucketMetadataSys::new(ecstore)));
-        (dirs, node_a, node_b)
-    }
-
-    /// Writers on different nodes updating *different* config files of one
-    /// bucket must both survive. Each rewrites the whole metadata blob, so
-    /// without a lock spanning the read-modify-write the later save carries
-    /// the earlier writer's field back to its pre-update value — losing an
-    /// orthogonal config while both clients were told the write succeeded.
-    #[tokio::test(flavor = "multi_thread", worker_threads = 4)]
-    #[serial]
-    async fn concurrent_config_writes_from_separate_nodes_do_not_lose_writes() {
-        use crate::bucket::metadata::{BUCKET_POLICY_CONFIG, BUCKET_TAGGING_CONFIG};
-
-        let (_dirs, node_a, node_b) = two_nodes_over_one_store().await;
-        let bucket = "cross-node-config-writes";
-        node_a
-            .read()
-            .await
-            .persist_and_set(BucketMetadata::new(bucket))
-            .await
-            .expect("initial metadata should persist");
-
-        // Several rounds: a single pass can serialize by luck, but a lost
-        // update only needs one interleaving to show up.
-        const ROUNDS: usize = 8;
-        for round in 0..ROUNDS {
-            let tagging = format!("<Tagging><Round>{round}</Round></Tagging>").into_bytes();
-            let policy = format!(r#"{{"Version":"2012-10-17","Round":{round}}}"#).into_bytes();
-
-            let start = Arc::new(tokio::sync::Barrier::new(2));
-            let tagging_writer = {
-                let (node, start, tagging) = (node_a.clone(), start.clone(), tagging.clone());
-                tokio::spawn(async move {
-                    start.wait().await;
-                    update_with_sys(node, bucket, BUCKET_TAGGING_CONFIG, tagging).await
-                })
-            };
-            let policy_writer = {
-                let (node, start, policy) = (node_b.clone(), start.clone(), policy.clone());
-                tokio::spawn(async move {
-                    start.wait().await;
-                    update_with_sys(node, bucket, BUCKET_POLICY_CONFIG, policy).await
-                })
-            };
-
-            tagging_writer
-                .await
-                .expect("tagging writer should join")
-                .expect("tagging update should succeed");
-            policy_writer
-                .await
-                .expect("policy writer should join")
-                .expect("policy update should succeed");
-
-            // Disk truth, not either node's cache: the losing write is the one
-            // that never reached the metadata file.
-            let persisted = node_a
-                .read()
-                .await
-                .get_config_from_disk(bucket)
-                .await
-                .expect("metadata should load from disk");
-            assert_eq!(
-                persisted.tagging_config_xml, tagging,
-                "round {round}: the policy write clobbered the concurrent tagging write"
-            );
-            assert_eq!(
-                persisted.policy_config_json, policy,
-                "round {round}: the tagging write clobbered the concurrent policy write"
-            );
-        }
-    }
-
-    /// The guard has to cover the load as well as the save. If it were taken
-    /// only around the save, a second node could load between the two and
-    /// still overwrite with pre-update state.
-    #[tokio::test(flavor = "multi_thread", worker_threads = 4)]
-    #[serial]
-    async fn bucket_metadata_transaction_lock_blocks_a_concurrent_config_write() {
-        use crate::bucket::metadata::BUCKET_TAGGING_CONFIG;
-
-        let (_dirs, node_a, node_b) = two_nodes_over_one_store().await;
-        let bucket = "cross-node-transaction-lock";
-        node_a
-            .read()
-            .await
-            .persist_and_set(BucketMetadata::new(bucket))
-            .await
-            .expect("initial metadata should persist");
-
-        let held = acquire_transaction_lock_with_sys(&node_a, bucket)
-            .await
-            .expect("transaction lock should be acquirable");
-
-        let blocked = tokio::spawn({
-            let node_b = node_b.clone();
-            async move { update_with_sys(node_b, bucket, BUCKET_TAGGING_CONFIG, b"<Tagging/>".to_vec()).await }
-        });
-
-        // Long enough for the write to have finished had it not waited: the
-        // whole read-modify-write against temp disks is far quicker than this.
-        tokio::time::sleep(Duration::from_millis(500)).await;
-        assert!(
-            !blocked.is_finished(),
-            "a config write must not proceed while another node holds the bucket's transaction lock"
-        );
-
-        drop(held);
-
-        let updated = timeout(Duration::from_secs(10), blocked)
-            .await
-            .expect("the blocked write should proceed once the lock is released")
-            .expect("blocked writer should join");
-        updated.expect("the write should succeed after acquiring the lock");
-    }
-
-    /// A holder of the transaction lock must not call the locking entry
-    /// point: the namespace lock is not reentrant, so it would block on
-    /// itself until the acquire timeout.
-    #[tokio::test(flavor = "multi_thread", worker_threads = 4)]
-    #[serial]
-    async fn transaction_lock_is_not_reentrant() {
-        let (_dirs, node_a, node_b) = two_nodes_over_one_store().await;
-        let bucket = "transaction-lock-reentrancy";
-
-        let held = acquire_transaction_lock_with_sys(&node_a, bucket)
-            .await
-            .expect("first acquisition should succeed");
-
-        // Same store, hence the same locker owner: exclusion must not depend
-        // on the two acquisitions coming from different owners. Either
-        // outcome is acceptable — still waiting, or refused — as long as no
-        // second guard is handed out.
-        let reacquired = timeout(Duration::from_millis(500), acquire_transaction_lock_with_sys(&node_b, bucket)).await;
-        assert!(
-            !matches!(reacquired, Ok(Ok(_))),
-            "the transaction lock must exclude a second holder even under the same owner"
-        );
-
-        drop(held);
-        timeout(Duration::from_secs(10), acquire_transaction_lock_with_sys(&node_b, bucket))
-            .await
-            .expect("re-acquisition should not time out once released")
-            .expect("the lock should be acquirable after release");
-    }
-
    fn target(bucket: &str, id: &str) -> BucketTarget {
        BucketTarget {
            source_bucket: bucket.to_string(),
@@ -45,9 +45,8 @@ mod runtime_boundary;

 pub use datatypes::ResyncStatusType;
 pub use replication_config_boundary::{
-    ObjectOpts, ReplicationConfigurationExt, ReplicationTargetValidationError, invalid_replication_config_status_field,
-    replication_target_arns, should_remove_replication_target, unsupported_replication_config_field,
-    validate_replication_config_target_arns,
+    ObjectOpts, ReplicationConfigurationExt, ReplicationTargetValidationError, replication_target_arns,
+    should_remove_replication_target, validate_replication_config_target_arns,
 };
 #[cfg(test)]
 pub(crate) use replication_filemeta_boundary::ReplicateTargetDecision;
@@ -63,7 +62,7 @@ pub(crate) use replication_filemeta_boundary::{
 pub(crate) use replication_lifecycle_bridge::{ReplicationLifecycleBridge, ReplicationLifecycleConfig};
 pub(crate) use replication_migration_bridge::ReplicationMigrationBridge;
 pub use replication_object_bridge::ReplicationObjectBridge;
-pub use replication_object_config::{DeleteReplicationConfigSnapshot, ReplicationConfig};
+pub use replication_object_config::ReplicationConfig;
 pub use replication_object_decision_boundary::{
    MustReplicateOptions, ReplicationDeleteScheduleInput, ReplicationDeleteStateSource, delete_replication_state_from_config,
    delete_replication_version_id, should_schedule_delete_replication, should_use_existing_delete_replication_info,
@@ -79,7 +78,7 @@ pub use replication_queue_boundary::{
 };
 pub use replication_resync_boundary::{BucketReplicationResyncStatus, ResyncOpts, TargetReplicationResyncStatus};
 pub use replication_scanner_bridge::ReplicationScannerBridge;
-pub use replication_state::{ReplicationStats, RuntimeReplicationTargetBacklog};
+pub use replication_state::ReplicationStats;
 pub use replication_stats_boundary::BucketStats;
 pub use replication_storage_boundary::{ReplicationObjectIO, ReplicationStorage};
 pub(crate) use replication_target_config_bridge::ReplicationTargetConfigBridge;
@@ -13,7 +13,6 @@
 // limitations under the License.

 pub use rustfs_replication::{
-    ObjectOpts, ReplicationConfigurationExt, ReplicationRuleExt, ReplicationTargetValidationError,
-    invalid_replication_config_status_field, replication_target_arns, should_remove_replication_target,
-    unsupported_replication_config_field, validate_replication_config_target_arns,
+    ObjectOpts, ReplicationConfigurationExt, ReplicationTargetValidationError, replication_target_arns,
+    should_remove_replication_target, validate_replication_config_target_arns,
 };
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-pub(crate) use rustfs_filemeta::NULL_VERSION_ID;
 pub use rustfs_replication::{MrfOpKind, MrfReplicateEntry};
 pub(crate) use rustfs_replication::{
    REPLICATE_EXISTING, REPLICATE_EXISTING_DELETE, REPLICATE_HEAL_DELETE, ReplicateTargetDecision, ReplicatedInfos,
@@ -12,19 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-use std::sync::Arc;
-
-use crate::bucket::{metadata::BucketMetadata, metadata_sys};
+use crate::bucket::metadata_sys;
 use crate::disk::{BUCKET_META_PREFIX, RUSTFS_META_BUCKET};
-use crate::runtime::instance::InstanceContext;
 use rustfs_utils::path::path_join_buf;
 use s3s::dto::ReplicationConfiguration;
 use time::OffsetDateTime;

 use super::replication_error_boundary::{Error, Result};

-pub(crate) type ReplicationInstanceContext = InstanceContext;
-
 const REPLICATION_DIR: &str = ".replication";
 const RESYNC_FILE_NAME: &str = "resync.bin";

@@ -50,20 +45,6 @@ impl ReplicationMetadataStore {
        Ok(config)
    }

-    pub(crate) async fn delete_metadata(bucket: &str) -> Result<Arc<BucketMetadata>> {
-        let sys = metadata_sys::get_bucket_metadata_sys()?;
-        let sys = sys.read().await;
-        Ok(sys.get_config(bucket).await?.0)
-    }
-
-    pub(crate) async fn delete_metadata_in(ctx: &ReplicationInstanceContext, bucket: &str) -> Result<Arc<BucketMetadata>> {
-        let sys = ctx
-            .bucket_metadata_sys()
-            .ok_or_else(|| Error::other("request instance bucket metadata system is not initialized"))?;
-        let sys = sys.read().await;
-        Ok(sys.get_config(bucket).await?.0)
-    }
-
    pub(crate) fn rustfs_meta_bucket() -> &'static str {
        RUSTFS_META_BUCKET
    }
@@ -14,19 +14,13 @@

 use std::{collections::HashMap, sync::Arc};

-use super::replication_error_boundary::Result;
 use super::replication_filemeta_boundary::{ReplicateDecision, ReplicationStatusType, ReplicationType};
-use super::replication_metadata_boundary::ReplicationInstanceContext;
-use super::replication_object_config::{
-    DeleteReplicationConfigSnapshot, check_replicate_delete, check_replicate_delete_strict, check_replicate_delete_with_snapshot,
-    get_must_replicate_options, load_delete_replication_config_in, load_delete_request_config_in, must_replicate,
-};
+use super::replication_object_config::{check_replicate_delete, get_must_replicate_options, must_replicate};
 use super::replication_object_decision_boundary::MustReplicateOptions;
 use super::replication_pool::{schedule_replication, schedule_replication_delete};
 use super::replication_queue_boundary::DeletedObjectReplicationInfo;
 use super::replication_storage_boundary::{
-    DeletedObject, ObjectInfo, ObjectOptions, ObjectToDelete, ReplicationObjectStore, ReplicationStorage,
-    deleted_object_for_replication,
+    DeletedObject, ObjectInfo, ObjectOptions, ObjectToDelete, ReplicationStorage, deleted_object_for_replication,
 };

 pub struct ReplicationObjectBridge;
@@ -56,49 +50,6 @@ impl ReplicationObjectBridge {
        check_replicate_delete(bucket, object, source, opts, get_error).await
    }

-    pub async fn check_delete_strict(
-        bucket: &str,
-        object: &ObjectToDelete,
-        source: &ObjectInfo,
-        opts: &ObjectOptions,
-        get_error: Option<String>,
-    ) -> Result<ReplicateDecision> {
-        check_replicate_delete_strict(bucket, object, source, opts, get_error).await
-    }
-
-    pub async fn delete_request_config(api: &ReplicationObjectStore, bucket: &str) -> Result<DeleteReplicationConfigSnapshot> {
-        load_delete_request_config_in(&api.ctx, bucket).await
-    }
-
-    pub(crate) async fn delete_request_config_in(
-        ctx: &ReplicationInstanceContext,
-        bucket: &str,
-    ) -> Result<DeleteReplicationConfigSnapshot> {
-        load_delete_request_config_in(ctx, bucket).await
-    }
-
-    pub(crate) async fn delete_config_snapshot_in(
-        ctx: &ReplicationInstanceContext,
-        bucket: &str,
-        opts: &ObjectOptions,
-    ) -> Result<DeleteReplicationConfigSnapshot> {
-        load_delete_replication_config_in(ctx, bucket, opts).await
-    }
-
-    pub fn has_active_delete_rule(snapshot: &DeleteReplicationConfigSnapshot, object: &str) -> bool {
-        snapshot.has_active_rule(object)
-    }
-
-    pub fn check_delete_with_snapshot(
-        object: &ObjectToDelete,
-        source: &ObjectInfo,
-        opts: &ObjectOptions,
-        source_error: bool,
-        snapshot: &DeleteReplicationConfigSnapshot,
-    ) -> ReplicateDecision {
-        check_replicate_delete_with_snapshot(object, source, opts, source_error, snapshot)
-    }
-
    pub async fn schedule_object<S: ReplicationStorage>(
        object: ObjectInfo,
        storage: Arc<S>,
@@ -12,26 +12,23 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-use std::{collections::HashMap, fmt, sync::Arc};
+use std::collections::HashMap;

-use crate::bucket::metadata::BucketMetadata;
 use rustfs_utils::http::AMZ_BUCKET_REPLICATION_STATUS;
-use s3s::dto::{BucketVersioningStatus, ReplicationConfiguration, ReplicationRuleStatus, VersioningConfiguration};
+use s3s::dto::ReplicationConfiguration;
 use serde::{Deserialize, Serialize};
 use tracing::error;

-use super::replication_config_boundary::{
-    ObjectOpts, ReplicationConfigurationExt as _, ReplicationRuleExt as _, invalid_replication_config_status_field,
-};
+use super::replication_config_boundary::{ObjectOpts, ReplicationConfigurationExt as _};
 use super::replication_error_boundary::Result;
 use super::replication_filemeta_boundary::{
    ReplicateDecision, ReplicateTargetDecision, ReplicationStatusType, ReplicationType, ResyncDecision,
 };
 use super::replication_logging::{EVENT_RESYNC_CONFIG_LOOKUP_SKIPPED, LOG_COMPONENT_ECSTORE, LOG_SUBSYSTEM_REPLICATION_RESYNC};
-use super::replication_metadata_boundary::{ReplicationInstanceContext, ReplicationMetadataStore};
+use super::replication_metadata_boundary::ReplicationMetadataStore;
 use super::replication_object_decision_boundary::{
    MustReplicateOptions, ReplicationDeleteSource, ReplicationResyncTargetObject, delete_replication_missing_source_decision,
-    delete_replication_object_opts, heal_uses_delete_replication_path, resync_target_for_object,
+    delete_replication_object_opts, resync_target_for_object,
 };
 use super::replication_storage_boundary::{ObjectInfo, ObjectOptions, ObjectToDelete, object_to_delete_for_replication};
 use super::replication_target_boundary::{BucketTargets, ReplicationTargetStore};
@@ -39,197 +36,7 @@ use super::replication_versioning_boundary::ReplicationVersioningStore;
 use super::runtime_boundary as runtime_sources;

 pub(crate) async fn get_replication_config(bucket: &str) -> Result<Option<ReplicationConfiguration>> {
-    let config = ReplicationMetadataStore::optional_replication_config(bucket).await?;
-    validate_delete_replication_config(&VersioningConfiguration::default(), config.as_ref())?;
-    Ok(config)
-}
-
-#[derive(Default)]
-pub struct DeleteReplicationConfigSnapshot {
-    metadata: Option<Arc<BucketMetadata>>,
-    versioning: VersioningConfiguration,
-}
-
-impl fmt::Debug for DeleteReplicationConfigSnapshot {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("DeleteReplicationConfigSnapshot")
-            .field("has_replication_config", &self.replication_config().is_some())
-            .field("versioning_status", &self.versioning.status)
-            .finish()
-    }
-}
-
-impl DeleteReplicationConfigSnapshot {
-    #[cfg(test)]
-    pub(crate) fn from_configs_for_test(
-        versioning: VersioningConfiguration,
-        replication: Option<ReplicationConfiguration>,
-    ) -> Self {
-        let metadata = replication.map(|config| {
-            let mut metadata = BucketMetadata::new("test-bucket");
-            metadata.replication_config = Some(config);
-            Arc::new(metadata)
-        });
-        Self { metadata, versioning }
-    }
-
-    pub fn versioning_config(&self) -> &VersioningConfiguration {
-        &self.versioning
-    }
-
-    pub fn replication_config(&self) -> Option<&ReplicationConfiguration> {
-        self.metadata
-            .as_ref()
-            .and_then(|metadata| metadata.replication_config.as_ref())
-    }
-
-    pub(crate) fn has_active_rule(&self, object: &str) -> bool {
-        self.replication_config()
-            .is_some_and(|config| config.has_active_rules(object, true))
-    }
-
-    pub(crate) fn active_delete_marker_rules_require_tags(&self, object: &str) -> bool {
-        self.replication_config().is_some_and(|config| {
-            config.rules.iter().any(|rule| {
-                if rule.status == ReplicationRuleStatus::from_static(ReplicationRuleStatus::DISABLED) {
-                    return false;
-                }
-                if !object.starts_with(rule.prefix()) {
-                    return false;
-                }
-                rule.filter.as_ref().is_some_and(|filter| {
-                    filter.tag.is_some()
-                        || filter
-                            .and
-                            .as_ref()
-                            .and_then(|and| and.tags.as_ref())
-                            .is_some_and(|tags| !tags.is_empty())
-                })
-            })
-        })
-    }
-}
-
-fn validate_delete_replication_config(
-    versioning: &VersioningConfiguration,
-    config: Option<&ReplicationConfiguration>,
-) -> Result<()> {
-    if versioning
-        .status
-        .as_ref()
-        .is_some_and(|status| !matches!(status.as_str(), BucketVersioningStatus::ENABLED | BucketVersioningStatus::SUSPENDED))
-    {
-        return Err(super::replication_error_boundary::Error::other(
-            "bucket versioning configuration has an invalid status",
-        ));
-    }
-
-    if let Some(config) = config {
-        if let Some(field) = invalid_replication_config_status_field(config) {
-            return Err(super::replication_error_boundary::Error::other(format!(
-                "replication field {field} has an invalid status"
-            )));
-        }
-
-        let role = config.role.trim();
-        let mut role_destination = None;
-        for rule in &config.rules {
-            if rule.status.as_str() == ReplicationRuleStatus::ENABLED {
-                let destination = rule.destination.bucket.trim();
-                if role.is_empty() && destination.is_empty() {
-                    return Err(super::replication_error_boundary::Error::other(
-                        "enabled replication rule has no destination ARN",
-                    ));
-                }
-                if !role.is_empty() && !destination.is_empty() {
-                    match role_destination {
-                        Some(existing) if existing != destination => {
-                            return Err(super::replication_error_boundary::Error::other(
-                                "replication role cannot address multiple active destinations",
-                            ));
-                        }
-                        None => role_destination = Some(destination),
-                        _ => {}
-                    }
-                }
-            }
-        }
-    }
-
-    Ok(())
-}
-
-fn replication_config_from_metadata(metadata: &BucketMetadata) -> Result<Option<&ReplicationConfiguration>> {
-    if !metadata.replication_config_xml.is_empty() && metadata.replication_config.is_none() {
-        return Err(super::replication_error_boundary::Error::other(
-            "persisted bucket replication configuration is invalid",
-        ));
-    }
-    Ok(metadata.replication_config.as_ref())
-}
-
-fn delete_request_snapshot_from_metadata(metadata: Arc<BucketMetadata>) -> Result<DeleteReplicationConfigSnapshot> {
-    if !metadata.versioning_config_xml.is_empty() && metadata.versioning_config.is_none() {
-        return Err(super::replication_error_boundary::Error::other(
-            "persisted bucket versioning configuration is invalid",
-        ));
-    }
-
-    let versioning = metadata.versioning_config.clone().unwrap_or_default();
-    let has_config = {
-        let config = replication_config_from_metadata(&metadata)?;
-        if versioning.status.is_none() && config.is_some() {
-            return Err(super::replication_error_boundary::Error::other(
-                "bucket replication configuration requires versioning",
-            ));
-        }
-        validate_delete_replication_config(&versioning, config)?;
-        config.is_some()
-    };
-    Ok(DeleteReplicationConfigSnapshot {
-        metadata: has_config.then_some(metadata),
-        versioning,
-    })
-}
-
-fn delete_snapshot_from_metadata(metadata: Arc<BucketMetadata>) -> Result<DeleteReplicationConfigSnapshot> {
-    let has_config = {
-        let config = replication_config_from_metadata(&metadata)?;
-        validate_delete_replication_config(&VersioningConfiguration::default(), config)?;
-        config.is_some()
-    };
-    Ok(DeleteReplicationConfigSnapshot {
-        metadata: has_config.then_some(metadata),
-        versioning: VersioningConfiguration::default(),
-    })
-}
-
-pub(crate) async fn load_delete_request_config_in(
-    ctx: &ReplicationInstanceContext,
-    bucket: &str,
-) -> Result<DeleteReplicationConfigSnapshot> {
-    delete_request_snapshot_from_metadata(ReplicationMetadataStore::delete_metadata_in(ctx, bucket).await?)
-}
-
-pub(crate) async fn load_delete_replication_config(
-    bucket: &str,
-    opts: &ObjectOptions,
-) -> Result<DeleteReplicationConfigSnapshot> {
-    if opts.replication_request || (!opts.versioned && !opts.version_suspended) {
-        return Ok(DeleteReplicationConfigSnapshot::default());
-    }
-    delete_snapshot_from_metadata(ReplicationMetadataStore::delete_metadata(bucket).await?)
-}
-
-pub(crate) async fn load_delete_replication_config_in(
-    ctx: &ReplicationInstanceContext,
-    bucket: &str,
-    opts: &ObjectOptions,
-) -> Result<DeleteReplicationConfigSnapshot> {
-    if opts.replication_request || (!opts.versioned && !opts.version_suspended) {
-        return Ok(DeleteReplicationConfigSnapshot::default());
-    }
-    delete_snapshot_from_metadata(ReplicationMetadataStore::delete_metadata_in(ctx, bucket).await?)
+    ReplicationMetadataStore::optional_replication_config(bucket).await
 }

 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
@@ -247,31 +54,10 @@ impl ReplicationConfig {
        self.config.is_none()
    }

-    pub(crate) fn validate(&self) -> Result<()> {
-        validate_delete_replication_config(&VersioningConfiguration::default(), self.config.as_ref())
-    }
-
    pub fn replicate(&self, obj: &ObjectOpts) -> bool {
        self.config.as_ref().is_some_and(|config| config.replicate(obj))
    }

-    pub(crate) fn check_delete_for_heal(
-        &self,
-        object: &ObjectToDelete,
-        source: &ObjectInfo,
-        opts: &ObjectOptions,
-    ) -> ReplicateDecision {
-        check_replicate_delete_with_config(
-            object,
-            source,
-            opts,
-            false,
-            self.config.as_ref(),
-            source.delete_marker && source.version_purge_status.is_empty(),
-            true,
-        )
-    }
-
    pub async fn resync(
        &self,
        oi: ObjectInfo,
@@ -284,34 +70,30 @@ impl ReplicationConfig {

        let mut dsc = dsc;

-        if heal_uses_delete_replication_path(oi.delete_marker, &oi.version_purge_status) {
-            if !dsc.targets_map.is_empty() {
-                return self.resync_internal(oi, dsc, status);
-            }
+        if oi.delete_marker {
            let opts = ObjectOpts {
                name: oi.name.clone(),
-                version_id: if oi.version_purge_status.is_empty() {
-                    None
-                } else {
-                    oi.version_id
-                },
-                delete_marker: oi.delete_marker,
+                version_id: oi.version_id,
+                delete_marker: true,
                op_type: ReplicationType::Delete,
                existing_object: true,
                ..Default::default()
            };
-            let targets = self
+            let arns = self
                .config
                .as_ref()
-                .map(|config| config.filter_target_replication_decisions(&opts))
+                .map(|config| config.filter_target_arns(&opts))
                .unwrap_or_default();

-            if targets.is_empty() {
+            if arns.is_empty() {
                return ResyncDecision::default();
            }

-            for (arn, replicate) in targets {
-                dsc.set(ReplicateTargetDecision::new(arn, replicate, false));
+            for arn in arns {
+                let mut opts = opts.clone();
+                opts.target_arn = arn;
+
+                dsc.set(ReplicateTargetDecision::new(opts.target_arn.clone(), self.replicate(&opts), false));
            }

            return self.resync_internal(oi, dsc, status);
@@ -387,10 +169,9 @@ pub(crate) async fn check_replicate_delete(
    del_opts: &ObjectOptions,
    gerr: Option<String>,
 ) -> ReplicateDecision {
-    match load_delete_replication_config(bucket, del_opts).await {
-        Ok(snapshot) => {
-            check_replicate_delete_with_config(dobj, oi, del_opts, gerr.is_some(), snapshot.replication_config(), false, false)
-        }
+    let rcfg = match get_replication_config(bucket).await {
+        Ok(Some(config)) => config,
+        Ok(None) => return ReplicateDecision::default(),
        Err(err) => {
            error!(
                event = EVENT_RESYNC_CONFIG_LOOKUP_SKIPPED,
@@ -401,110 +182,61 @@ pub(crate) async fn check_replicate_delete(
                error = %err,
                "Failed to look up replication config for delete replication"
            );
-            ReplicateDecision::default()
+            return ReplicateDecision::default();
        }
-    }
-}
-
-pub(crate) async fn check_replicate_delete_strict(
-    bucket: &str,
-    dobj: &ObjectToDelete,
-    oi: &ObjectInfo,
-    del_opts: &ObjectOptions,
-    gerr: Option<String>,
-) -> Result<ReplicateDecision> {
-    let Some(config) = get_replication_config(bucket).await? else {
-        return Ok(ReplicateDecision::default());
    };
-    let mut decision = check_replicate_delete_with_config(dobj, oi, del_opts, gerr.is_some(), Some(&config), false, false);
-    if gerr.is_some() {
-        return Ok(decision);
-    }

-    for target in decision.targets_map.values_mut() {
-        if let Some(client) = ReplicationTargetStore::remote_target_client(bucket, &target.arn).await {
-            target.synchronous = client.replicate_sync;
-        } else {
-            target.replicate = false;
-            target.synchronous = false;
-        }
-    }
-    Ok(decision)
-}
-
-pub(crate) fn check_replicate_delete_with_snapshot(
-    dobj: &ObjectToDelete,
-    oi: &ObjectInfo,
-    del_opts: &ObjectOptions,
-    source_error: bool,
-    snapshot: &DeleteReplicationConfigSnapshot,
-) -> ReplicateDecision {
-    check_replicate_delete_with_config(dobj, oi, del_opts, source_error, snapshot.replication_config(), false, false)
-}
-
-fn check_replicate_delete_with_config(
-    dobj: &ObjectToDelete,
-    oi: &ObjectInfo,
-    del_opts: &ObjectOptions,
-    source_error: bool,
-    config: Option<&ReplicationConfiguration>,
-    existing_delete_marker: bool,
-    trust_persisted_replica_status: bool,
-) -> ReplicateDecision {
    if del_opts.replication_request {
        return ReplicateDecision::default();
    }

-    if !del_opts.versioned && !del_opts.version_suspended {
+    if !del_opts.versioned {
        return ReplicateDecision::default();
    }

-    let Some(rcfg) = config else {
-        return ReplicateDecision::default();
-    };
-
    let replication_delete = object_to_delete_for_replication(dobj);
-    let missing_source_marker = source_error && dobj.version_id.is_none();
-    let mut opts = delete_replication_object_opts(
+    let opts = delete_replication_object_opts(
        &replication_delete,
        &ReplicationDeleteSource {
            user_defined: oi.user_defined.as_ref(),
            user_tags: oi.user_tags.as_str(),
-            delete_marker: oi.delete_marker || missing_source_marker,
-            replication_status: if trust_persisted_replica_status {
-                oi.replication_status.clone()
-            } else {
-                ReplicationStatusType::Empty
-            },
+            delete_marker: oi.delete_marker,
+            replication_status: oi.replication_status.clone(),
        },
    );
-    if existing_delete_marker {
-        opts.version_id = None;
-    }

-    let target_decisions = rcfg.filter_target_replication_decisions(&opts);
+    let tgt_arns = rcfg.filter_target_arns(&opts);
    let mut dsc = ReplicateDecision::new();

-    if target_decisions.is_empty() {
+    if tgt_arns.is_empty() {
        return dsc;
    }

-    for (tgt_arn, replicate) in target_decisions {
-        let effective_replicate = if source_error {
-            delete_replication_missing_source_decision(
-                oi.delete_marker || missing_source_marker,
+    for tgt_arn in tgt_arns {
+        let mut opts = opts.clone();
+        opts.target_arn = tgt_arn.clone();
+        let replicate = rcfg.replicate(&opts);
+        let sync = false;
+
+        if gerr.is_some() {
+            if let Some(replicate) = delete_replication_missing_source_decision(
+                oi.delete_marker,
                oi.target_replication_status(&tgt_arn),
                replicate,
                &oi.version_purge_status,
-            )
-        } else {
-            Some(replicate)
-        };
-        let Some(effective_replicate) = effective_replicate else {
+            ) {
+                dsc.set(ReplicateTargetDecision::new(tgt_arn, replicate, sync));
+            }
            continue;
-        };
+        }

-        dsc.set(ReplicateTargetDecision::new(tgt_arn, effective_replicate, false));
+        let tgt = ReplicationTargetStore::remote_target_client(bucket, &tgt_arn).await;
+        let tgt_dsc = if let Some(tgt) = tgt {
+            ReplicateTargetDecision::new(tgt_arn, replicate, tgt.replicate_sync)
+        } else {
+            ReplicateTargetDecision::new(tgt_arn, false, false)
+        };
+        dsc.set(tgt_dsc);
    }

    dsc
@@ -567,13 +299,8 @@ pub(crate) async fn must_replicate(bucket: &str, object: &str, mopts: MustReplic

 #[cfg(test)]
 mod tests {
-    use s3s::dto::{
-        DeleteMarkerReplication, DeleteMarkerReplicationStatus, DeleteReplication, DeleteReplicationStatus, Destination,
-        ReplicaModifications, ReplicationRule, ReplicationRuleFilter, ReplicationRuleStatus, SourceSelectionCriteria, Tag,
-    };
+    use s3s::dto::{Destination, ReplicationRule, ReplicationRuleStatus};

-    use super::super::replication_filemeta_boundary::VersionPurgeStatusType;
-    use super::super::replication_target_boundary::BucketTarget;
    use super::*;

    fn replication_rule() -> ReplicationRule {
@@ -633,379 +360,4 @@ mod tests {
        assert!(options.is_replication_request());
        assert_eq!(options.user_tags(), "env=prod");
    }
-
-    #[test]
-    fn delete_snapshot_rejects_enabled_rules_without_a_destination() {
-        let mut rule = replication_rule();
-        rule.destination.bucket.clear();
-        let config = ReplicationConfiguration {
-            role: String::new(),
-            rules: vec![rule],
-        };
-
-        let err = validate_delete_replication_config(&VersioningConfiguration::default(), Some(&config))
-            .expect_err("an enabled rule without a destination must fail closed");
-
-        assert!(err.to_string().contains("destination ARN"));
-    }
-
-    #[test]
-    fn delete_snapshot_rejects_role_with_multiple_destinations() {
-        let first = replication_rule();
-        let mut second = replication_rule();
-        second.destination.bucket = "arn:aws:s3:::other-target".to_string();
-        let config = ReplicationConfiguration {
-            role: "arn:aws:s3:::role-target".to_string(),
-            rules: vec![first, second],
-        };
-
-        assert!(validate_delete_replication_config(&VersioningConfiguration::default(), Some(&config)).is_err());
-    }
-
-    #[test]
-    fn delete_snapshot_rejects_unknown_status_values() {
-        let invalid_versioning = VersioningConfiguration {
-            status: Some("Enabld".to_string().into()),
-            ..Default::default()
-        };
-        assert!(validate_delete_replication_config(&invalid_versioning, None).is_err());
-
-        let mut invalid_rule = replication_rule();
-        invalid_rule.status = "Enabld".to_string().into();
-        let config = ReplicationConfiguration {
-            role: String::new(),
-            rules: vec![invalid_rule],
-        };
-        assert!(validate_delete_replication_config(&VersioningConfiguration::default(), Some(&config)).is_err());
-
-        let mut invalid_delete = replication_rule();
-        invalid_delete.delete_replication = Some(DeleteReplication {
-            status: "Enabld".to_string().into(),
-        });
-        let config = ReplicationConfiguration {
-            role: String::new(),
-            rules: vec![invalid_delete],
-        };
-        assert!(validate_delete_replication_config(&VersioningConfiguration::default(), Some(&config)).is_err());
-
-        let mut invalid_delete_marker = replication_rule();
-        invalid_delete_marker.delete_marker_replication = Some(DeleteMarkerReplication {
-            status: Some("Enabld".to_string().into()),
-        });
-        let config = ReplicationConfiguration {
-            role: String::new(),
-            rules: vec![invalid_delete_marker],
-        };
-        assert!(validate_delete_replication_config(&VersioningConfiguration::default(), Some(&config)).is_err());
-
-        let mut invalid_replica_modifications = replication_rule();
-        invalid_replica_modifications.source_selection_criteria = Some(SourceSelectionCriteria {
-            replica_modifications: Some(ReplicaModifications {
-                status: "Enabld".to_string().into(),
-            }),
-            sse_kms_encrypted_objects: None,
-        });
-        let config = ReplicationConfiguration {
-            role: String::new(),
-            rules: vec![invalid_replica_modifications],
-        };
-        assert!(validate_delete_replication_config(&VersioningConfiguration::default(), Some(&config)).is_err());
-    }
-
-    #[test]
-    fn request_snapshot_borrows_cached_replication_config() {
-        let mut metadata = BucketMetadata::new("bucket");
-        metadata.versioning_config_xml = b"configured".to_vec();
-        metadata.versioning_config = Some(VersioningConfiguration {
-            status: Some(BucketVersioningStatus::from_static(BucketVersioningStatus::ENABLED)),
-            ..Default::default()
-        });
-        metadata.replication_config_xml = b"configured".to_vec();
-        metadata.replication_config = Some(ReplicationConfiguration {
-            role: String::new(),
-            rules: vec![replication_rule()],
-        });
-        let metadata = Arc::new(metadata);
-        let cached_config = metadata.replication_config.as_ref().expect("cached config") as *const _;
-
-        let snapshot = delete_request_snapshot_from_metadata(Arc::clone(&metadata)).expect("valid snapshot");
-
-        assert_eq!(snapshot.replication_config().expect("snapshot config") as *const _, cached_config);
-    }
-
-    #[test]
-    fn delete_snapshot_debug_redacts_bucket_target_credentials() {
-        let secret = "snapshot-secret-must-not-be-formatted";
-        let mut metadata = BucketMetadata::new("bucket");
-        metadata.bucket_targets_config_json = format!(r#"{{"secretKey":"{secret}"}}"#).into_bytes();
-        let opts = ObjectOptions {
-            delete_replication_config_snapshot: Some(Arc::new(DeleteReplicationConfigSnapshot {
-                metadata: Some(Arc::new(metadata)),
-                versioning: VersioningConfiguration::default(),
-            })),
-            ..Default::default()
-        };
-
-        let debug = format!("{opts:?}");
-        assert!(!debug.contains(secret), "delete tracing must not expose replication target credentials");
-        assert!(debug.contains("has_replication_config"));
-    }
-
-    #[test]
-    fn request_snapshot_rejects_replication_without_versioning_status() {
-        let mut malformed = BucketMetadata::new("bucket");
-        malformed.replication_config_xml = b"<ReplicationConfiguration>".to_vec();
-        assert!(
-            delete_request_snapshot_from_metadata(Arc::new(malformed)).is_err(),
-            "malformed replication metadata must fail closed even when versioning has no status"
-        );
-
-        let mut inconsistent = BucketMetadata::new("bucket");
-        inconsistent.replication_config = Some(ReplicationConfiguration {
-            role: String::new(),
-            rules: vec![replication_rule()],
-        });
-        assert!(
-            delete_request_snapshot_from_metadata(Arc::new(inconsistent)).is_err(),
-            "replication metadata without an enabled or suspended versioning state must fail closed"
-        );
-    }
-
-    #[test]
-    fn missing_source_marker_creation_is_still_admitted() {
-        let arn = "arn:rustfs:replication:us-east-1:target:bucket";
-        let mut rule = replication_rule();
-        rule.destination.bucket = arn.to_string();
-        rule.delete_marker_replication = Some(DeleteMarkerReplication {
-            status: Some(DeleteMarkerReplicationStatus::from_static(DeleteMarkerReplicationStatus::ENABLED)),
-        });
-        let mut metadata = BucketMetadata::new("bucket");
-        metadata.replication_config = Some(ReplicationConfiguration {
-            role: String::new(),
-            rules: vec![rule],
-        });
-        let snapshot = DeleteReplicationConfigSnapshot {
-            metadata: Some(Arc::new(metadata)),
-            ..Default::default()
-        };
-
-        let decision = check_replicate_delete_with_snapshot(
-            &ObjectToDelete {
-                object_name: "object".to_string(),
-                ..Default::default()
-            },
-            &ObjectInfo::default(),
-            &ObjectOptions {
-                versioned: true,
-                ..Default::default()
-            },
-            true,
-            &snapshot,
-        );
-
-        assert!(decision.replicate_any());
-        assert!(decision.targets_map.get(arn).is_some_and(|target| target.replicate));
-    }
-
-    #[test]
-    fn delete_marker_source_read_is_required_only_for_tag_filtered_rules() {
-        let mut prefix_rule = replication_rule();
-        prefix_rule.prefix = Some("logs/".to_string());
-        prefix_rule.delete_marker_replication = Some(DeleteMarkerReplication {
-            status: Some(DeleteMarkerReplicationStatus::from_static(DeleteMarkerReplicationStatus::ENABLED)),
-        });
-
-        let prefix_snapshot = DeleteReplicationConfigSnapshot::from_configs_for_test(
-            VersioningConfiguration {
-                status: Some(BucketVersioningStatus::from_static(BucketVersioningStatus::ENABLED)),
-                ..Default::default()
-            },
-            Some(ReplicationConfiguration {
-                role: String::new(),
-                rules: vec![prefix_rule],
-            }),
-        );
-
-        let mut tag_rule = replication_rule();
-        tag_rule.delete_marker_replication = Some(DeleteMarkerReplication {
-            status: Some(DeleteMarkerReplicationStatus::from_static(DeleteMarkerReplicationStatus::ENABLED)),
-        });
-        tag_rule.filter = Some(ReplicationRuleFilter {
-            tag: Some(Tag {
-                key: Some("class".to_string()),
-                value: Some("audit".to_string()),
-            }),
-            ..Default::default()
-        });
-        let tag_snapshot = DeleteReplicationConfigSnapshot::from_configs_for_test(
-            VersioningConfiguration {
-                status: Some(BucketVersioningStatus::from_static(BucketVersioningStatus::ENABLED)),
-                ..Default::default()
-            },
-            Some(ReplicationConfiguration {
-                role: String::new(),
-                rules: vec![tag_rule],
-            }),
-        );
-
-        assert!(!prefix_snapshot.active_delete_marker_rules_require_tags("logs/2026/app.log"));
-        assert!(tag_snapshot.active_delete_marker_rules_require_tags("logs/2026/app.log"));
-    }
-
-    #[test]
-    fn heal_uses_delete_switch_for_pending_purges_and_marker_switch_for_stored_markers() {
-        let arn = "arn:rustfs:replication:us-east-1:target:bucket";
-        let mut rule = replication_rule();
-        rule.destination.bucket = arn.to_string();
-        rule.delete_replication = Some(DeleteReplication {
-            status: DeleteReplicationStatus::from_static(DeleteReplicationStatus::ENABLED),
-        });
-        rule.delete_marker_replication = Some(DeleteMarkerReplication {
-            status: Some(DeleteMarkerReplicationStatus::from_static(DeleteMarkerReplicationStatus::DISABLED)),
-        });
-        let config = ReplicationConfig::new(
-            Some(ReplicationConfiguration {
-                role: String::new(),
-                rules: vec![rule],
-            }),
-            None,
-        );
-        let object = ObjectToDelete {
-            object_name: "object".to_string(),
-            version_id: Some(uuid::Uuid::new_v4()),
-            ..Default::default()
-        };
-        let opts = ObjectOptions {
-            versioned: true,
-            ..Default::default()
-        };
-
-        let purge = ObjectInfo {
-            version_id: object.version_id,
-            version_purge_status: VersionPurgeStatusType::Pending,
-            ..Default::default()
-        };
-        assert!(config.check_delete_for_heal(&object, &purge, &opts).replicate_any());
-
-        let marker = ObjectInfo {
-            delete_marker: true,
-            version_id: object.version_id,
-            ..Default::default()
-        };
-        assert!(!config.check_delete_for_heal(&object, &marker, &opts).replicate_any());
-    }
-
-    #[test]
-    fn live_delete_does_not_trust_persisted_replica_status() {
-        let mut rule = replication_rule();
-        rule.delete_replication = Some(DeleteReplication {
-            status: DeleteReplicationStatus::from_static(DeleteReplicationStatus::ENABLED),
-        });
-        rule.source_selection_criteria = Some(SourceSelectionCriteria {
-            replica_modifications: Some(ReplicaModifications {
-                status: s3s::dto::ReplicaModificationsStatus::from_static(s3s::dto::ReplicaModificationsStatus::DISABLED),
-            }),
-            sse_kms_encrypted_objects: None,
-        });
-        let replication = ReplicationConfiguration {
-            role: String::new(),
-            rules: vec![rule],
-        };
-        let snapshot = DeleteReplicationConfigSnapshot::from_configs_for_test(
-            VersioningConfiguration {
-                status: Some(BucketVersioningStatus::from_static(BucketVersioningStatus::ENABLED)),
-                ..Default::default()
-            },
-            Some(replication.clone()),
-        );
-        let object = ObjectToDelete {
-            object_name: "object".to_string(),
-            version_id: Some(uuid::Uuid::new_v4()),
-            ..Default::default()
-        };
-        let source = ObjectInfo {
-            replication_status: ReplicationStatusType::Replica,
-            ..Default::default()
-        };
-        let opts = ObjectOptions {
-            versioned: true,
-            ..Default::default()
-        };
-
-        assert!(
-            check_replicate_delete_with_snapshot(&object, &source, &opts, false, &snapshot).replicate_any(),
-            "an ordinary authenticated delete must not inherit replica identity from object metadata"
-        );
-        assert!(
-            !ReplicationConfig::new(Some(replication), None)
-                .check_delete_for_heal(&object, &source, &opts)
-                .replicate_any(),
-            "heal must still honor the persisted replica identity"
-        );
-    }
-
-    #[tokio::test]
-    async fn resync_keeps_marker_version_purges_separate_from_marker_creation() {
-        let arn = "arn:rustfs:replication:us-east-1:target:bucket";
-        let mut rule = replication_rule();
-        rule.destination.bucket = arn.to_string();
-        rule.delete_replication = Some(DeleteReplication {
-            status: DeleteReplicationStatus::from_static(DeleteReplicationStatus::ENABLED),
-        });
-        rule.delete_marker_replication = Some(DeleteMarkerReplication {
-            status: Some(DeleteMarkerReplicationStatus::from_static(DeleteMarkerReplicationStatus::DISABLED)),
-        });
-        let config = ReplicationConfig::new(
-            Some(ReplicationConfiguration {
-                role: String::new(),
-                rules: vec![rule],
-            }),
-            Some(BucketTargets {
-                targets: vec![BucketTarget {
-                    arn: arn.to_string(),
-                    ..Default::default()
-                }],
-            }),
-        );
-        let marker = ObjectInfo {
-            name: "object".to_string(),
-            delete_marker: true,
-            version_id: Some(uuid::Uuid::new_v4()),
-            ..Default::default()
-        };
-
-        let purge = config
-            .resync(
-                ObjectInfo {
-                    version_purge_status: VersionPurgeStatusType::Pending,
-                    ..marker.clone()
-                },
-                ReplicateDecision::default(),
-                &HashMap::new(),
-            )
-            .await;
-        assert!(purge.targets.get(arn).is_some_and(|target| target.replicate));
-
-        let mut object_purge_decision = ReplicateDecision::default();
-        object_purge_decision.set(ReplicateTargetDecision::new(arn.to_string(), true, false));
-        let object_purge = config
-            .resync(
-                ObjectInfo {
-                    name: "object".to_string(),
-                    version_id: Some(uuid::Uuid::new_v4()),
-                    version_purge_status: VersionPurgeStatusType::Pending,
-                    ..Default::default()
-                },
-                object_purge_decision,
-                &HashMap::new(),
-            )
-            .await;
-        assert!(
-            object_purge.targets.get(arn).is_some_and(|target| target.replicate),
-            "non-marker PENDING purges must stay on the delete resync path"
-        );
-
-        let stored_marker = config.resync(marker, ReplicateDecision::default(), &HashMap::new()).await;
-        assert!(!stored_marker.targets.contains_key(arn));
-    }
 }
@@ -18,16 +18,16 @@ use super::replication_config_store::ReplicationConfigStore;
 use super::replication_error_boundary::{Result, is_err_object_not_found, is_err_version_not_found};
 use super::replication_event_sink::{EventArgs, send_event, send_local_event};
 use super::replication_filemeta_boundary::{
-    NULL_VERSION_ID, REPLICATE_EXISTING, REPLICATE_EXISTING_DELETE, ReplicateDecision, ReplicateObjectInfo, ReplicatedInfos,
-    ReplicatedTargetInfo, ReplicationAction, ReplicationStatusType, ReplicationType, VersionPurgeStatusType,
-    get_replication_state, parse_replicate_decision, replication_statuses_map, target_reset_header, version_purge_statuses_map,
+    REPLICATE_EXISTING, REPLICATE_EXISTING_DELETE, ReplicateDecision, ReplicateObjectInfo, ReplicatedInfos, ReplicatedTargetInfo,
+    ReplicationAction, ReplicationStatusType, ReplicationType, VersionPurgeStatusType, get_replication_state,
+    parse_replicate_decision, replication_statuses_map, target_reset_header, version_purge_statuses_map,
 };
 use super::replication_lock_boundary::ReplicationLockTiming;
 use super::replication_logging::{EVENT_RESYNC_CONFIG_LOOKUP_SKIPPED, LOG_COMPONENT_ECSTORE, LOG_SUBSYSTEM_REPLICATION_RESYNC};
 use super::replication_metadata_boundary::ReplicationMetadataStore;
 #[cfg(test)]
 use super::replication_msgp_boundary::ReplicationMsgpCodec;
-use super::replication_object_config::{ReplicationConfig, get_replication_config, must_replicate};
+use super::replication_object_config::{ReplicationConfig, check_replicate_delete, get_replication_config, must_replicate};
 use super::replication_object_decision_boundary::{
    MustReplicateOptions, ReplicationMultipartPartInput, heal_uses_delete_replication_path,
    is_retryable_delete_replication_head_error, is_version_delete_replication, replication_etags_match,
@@ -210,7 +210,7 @@ fn is_replication_target_offline_error(err: &(impl Display + ?Sized)) -> bool {
        .any(|marker| message.contains(marker))
 }

-async fn mark_replication_target_offline_if_needed(target_client: &Arc<TargetClient>, err: &(impl Display + ?Sized)) {
+async fn mark_replication_target_offline_if_needed(target_client: &TargetClient, err: &(impl Display + ?Sized)) {
    if is_replication_target_offline_error(err) {
        ReplicationTargetStore::mark_target_offline(target_client).await;
    }
@@ -642,21 +642,6 @@ impl ReplicationResyncer {
        };

        let rcfg = ReplicationConfig::new(cfg.clone(), Some(targets));
-        if let Err(err) = rcfg.validate() {
-            error!(
-                event = EVENT_RESYNC_CONFIG_LOOKUP_SKIPPED,
-                component = LOG_COMPONENT_ECSTORE,
-                subsystem = LOG_SUBSYSTEM_REPLICATION_RESYNC,
-                bucket = %opts.bucket,
-                arn = %opts.arn,
-                error = %err,
-                reason = "replication_config_invalid",
-                "Replication resync config is invalid"
-            );
-            self.resync_bucket_mark_status(ResyncStatusType::ResyncFailed, opts.clone(), storage.clone())
-                .await;
-            return;
-        }

        let target_arns = if let Some(cfg) = cfg {
            cfg.filter_target_arns(&ObjectOpts {
@@ -997,36 +982,7 @@ impl ReplicationResyncer {
            }
            last_checkpoint = None;

-            let roi = match get_heal_replicate_object_info(&object, &rcfg).await {
-                Ok(roi) => roi,
-                Err(err) => {
-                    error!(
-                        event = EVENT_RESYNC_CONFIG_LOOKUP_SKIPPED,
-                        component = LOG_COMPONENT_ECSTORE,
-                        subsystem = LOG_SUBSYSTEM_REPLICATION_RESYNC,
-                        bucket = %opts.bucket,
-                        arn = %opts.arn,
-                        object = %object.name,
-                        error = %err,
-                        "Failed to classify object for replication resync"
-                    );
-                    let worker_failed = finish_resync_workers(worker_txs, results_tx, futures, false).await;
-                    if worker_failed {
-                        error!(
-                            event = EVENT_RESYNC_TASK_FAILED,
-                            component = LOG_COMPONENT_ECSTORE,
-                            subsystem = LOG_SUBSYSTEM_REPLICATION_RESYNC,
-                            bucket = %opts.bucket,
-                            arn = %opts.arn,
-                            reason = "worker_join_failed_after_classification_error",
-                            "Replication resync worker cleanup observed task failure"
-                        );
-                    }
-                    self.resync_bucket_mark_status(ResyncStatusType::ResyncFailed, opts.clone(), storage.clone())
-                        .await;
-                    return;
-                }
-            };
+            let roi = get_heal_replicate_object_info(&object, &rcfg).await;
            if !roi.existing_obj_resync.must_resync() {
                continue;
            }
@@ -1081,25 +1037,18 @@ impl ReplicationResyncer {
    }
 }

-pub async fn get_heal_replicate_object_info(oi: &ObjectInfo, rcfg: &ReplicationConfig) -> Result<ReplicateObjectInfo> {
+pub async fn get_heal_replicate_object_info(oi: &ObjectInfo, rcfg: &ReplicationConfig) -> ReplicateObjectInfo {
    let mut oi = oi.clone();
    let mut user_defined = (*oi.user_defined).clone();
-    let delete_path = heal_uses_delete_replication_path(oi.delete_marker, &oi.version_purge_status);
-    let stored_delete_decision = if delete_path && !oi.replication_decision.is_empty() {
-        Some(parse_replicate_decision(&oi.bucket, &oi.replication_decision)?)
-    } else {
-        None
-    };
-    let has_stored_delete_decision = stored_delete_decision.is_some();

    if let Some(rc) = rcfg.config.as_ref()
        && !rc.role.is_empty()
    {
-        if oi.version_purge_status_internal.is_none() && !oi.version_purge_status.is_empty() {
+        if !oi.version_purge_status.is_empty() {
            oi.version_purge_status_internal = Some(format!("{}={};", rc.role, oi.version_purge_status.as_str()));
        }

-        if oi.replication_status_internal.is_none() && !oi.replication_status.is_empty() {
+        if !oi.replication_status.is_empty() {
            oi.replication_status_internal = Some(format!("{}={};", rc.role, oi.replication_status.as_str()));
        }

@@ -1115,31 +1064,23 @@ pub async fn get_heal_replicate_object_info(oi: &ObjectInfo, rcfg: &ReplicationC
        }
    }

-    let delete_state = if delete_path && !has_stored_delete_decision {
-        ReplicationVersioningStore::prefix_state(&oi.bucket, &oi.name).await?
-    } else {
-        (false, false)
-    };
-    let dsc = if let Some(decision) = stored_delete_decision {
-        decision
-    } else if delete_path {
-        if !delete_state.0 && !delete_state.1 {
-            ReplicateDecision::default()
-        } else {
-            rcfg.check_delete_for_heal(
-                &ObjectToDelete {
-                    object_name: oi.name.clone(),
-                    version_id: oi.version_id,
-                    ..Default::default()
-                },
-                &oi,
-                &ObjectOptions {
-                    versioned: delete_state.0,
-                    version_suspended: delete_state.1,
-                    ..Default::default()
-                },
-            )
-        }
+    let dsc = if heal_uses_delete_replication_path(oi.delete_marker, &oi.version_purge_status) {
+        check_replicate_delete(
+            oi.bucket.as_str(),
+            &ObjectToDelete {
+                object_name: oi.name.clone(),
+                version_id: oi.version_id,
+                ..Default::default()
+            },
+            &oi,
+            &ObjectOptions {
+                versioned: ReplicationVersioningStore::prefix_enabled(&oi.bucket, &oi.name).await,
+                version_suspended: ReplicationVersioningStore::prefix_suspended(&oi.bucket, &oi.name).await,
+                ..Default::default()
+            },
+            None,
+        )
+        .await
    } else {
        must_replicate(
            oi.bucket.as_str(),
@@ -1151,16 +1092,12 @@ pub async fn get_heal_replicate_object_info(oi: &ObjectInfo, rcfg: &ReplicationC

    let target_statuses = replication_statuses_map(&oi.replication_status_internal.clone().unwrap_or_default());
    let target_purge_statuses = version_purge_statuses_map(&oi.version_purge_status_internal.clone().unwrap_or_default());
-    let existing_obj_resync = if delete_path && !has_stored_delete_decision && !delete_state.0 && !delete_state.1 {
-        Default::default()
-    } else {
-        rcfg.resync(oi.clone(), dsc.clone(), &target_statuses).await
-    };
+    let existing_obj_resync = rcfg.resync(oi.clone(), dsc.clone(), &target_statuses).await;
    let mut replication_state = oi.replication_state();
    replication_state.replicate_decision_str = dsc.to_string();
    let actual_size = oi.get_actual_size().unwrap_or_default();

-    Ok(ReplicateObjectInfo {
+    ReplicateObjectInfo {
        name: oi.name.clone(),
        size: oi.size,
        actual_size,
@@ -1185,7 +1122,7 @@ pub async fn get_heal_replicate_object_info(oi: &ObjectInfo, rcfg: &ReplicationC
        user_tags: (*oi.user_tags).clone(),
        checksum: oi.checksum.clone(),
        retry_count: 0,
-    })
+    }
 }

 pub(crate) async fn save_resync_status<S: ReplicationObjectIO>(
@@ -1214,6 +1151,60 @@ pub async fn replicate_delete<S: ReplicationStorage>(dobj: DeletedObjectReplicat
        dobj.delete_object.version_id
    };

+    let _rcfg = match get_replication_config(&bucket).await {
+        Ok(Some(config)) => config,
+        Ok(None) => {
+            debug!(
+                event = EVENT_REPLICATION_DELETE_SKIPPED,
+                component = LOG_COMPONENT_ECSTORE,
+                subsystem = LOG_SUBSYSTEM_REPLICATION_RESYNC,
+                bucket = %bucket,
+                reason = "replication_config_missing",
+                "Skipping replication delete because replication config is missing"
+            );
+            send_local_event(EventArgs {
+                event_name: EventName::ObjectReplicationNotTracked.to_string(),
+                bucket_name: bucket.clone(),
+                object: ObjectInfo {
+                    bucket: bucket.clone(),
+                    name: dobj.delete_object.object_name.clone(),
+                    version_id,
+                    delete_marker: dobj.delete_object.delete_marker,
+                    ..Default::default()
+                },
+                user_agent: "Internal: [Replication]".to_string(),
+                ..Default::default()
+            });
+
+            return;
+        }
+        Err(err) => {
+            debug!(
+                event = EVENT_REPLICATION_DELETE_SKIPPED,
+                component = LOG_COMPONENT_ECSTORE,
+                subsystem = LOG_SUBSYSTEM_REPLICATION_RESYNC,
+                bucket = %bucket,
+                error = %err,
+                reason = "replication_config_lookup_failed",
+                "Skipping replication delete because replication config lookup failed"
+            );
+            send_local_event(EventArgs {
+                event_name: EventName::ObjectReplicationNotTracked.to_string(),
+                bucket_name: bucket.clone(),
+                object: ObjectInfo {
+                    bucket: bucket.clone(),
+                    name: dobj.delete_object.object_name.clone(),
+                    version_id,
+                    delete_marker: dobj.delete_object.delete_marker,
+                    ..Default::default()
+                },
+                user_agent: "Internal: [Replication]".to_string(),
+                ..Default::default()
+            });
+            return;
+        }
+    };
+
    if dobj.delete_object.delete_marker
        && let Some(delete_marker_version_id) = dobj.delete_object.delete_marker_version_id
    {
@@ -1629,7 +1620,7 @@ async fn replicate_delete_marker_purge_to_targets(bucket: &str, dobj: &DeletedOb
            .remove_object(
                &tgt_client.bucket,
                &dobj.delete_object.object_name,
-                target_delete_version_id(delete_marker_version_id, true),
+                Some(delete_marker_version_id.to_string()),
                replication_delete_marker_purge_remove_options(dobj.delete_object.delete_marker_mtime),
            )
            .await;
@@ -1859,14 +1850,6 @@ async fn replicate_force_delete_to_targets<S: ReplicationStorage>(dobj: &Deleted
    }
 }

-fn target_delete_version_id(version_id: Uuid, version_purge: bool) -> Option<String> {
-    if version_id.is_nil() {
-        version_purge.then(|| NULL_VERSION_ID.to_string())
-    } else {
-        Some(version_id.to_string())
-    }
-}
-
 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()
@@ -1906,7 +1889,11 @@ async fn replicate_delete_to_target(dobj: &DeletedObjectReplicationInfo, tgt_cli
        return rinfo;
    }

-    let version_id = target_delete_version_id(version_id, is_version_purge);
+    let version_id = if version_id.is_nil() {
+        None
+    } else {
+        Some(version_id.to_string())
+    };

    if dobj.delete_object.delete_marker && dobj.delete_object.delete_marker_version_id.is_some() {
        match head_object_with_proxy_stats(
@@ -3155,17 +3142,12 @@ async fn replicate_object_with_multipart<S: ReplicationObjectIO>(ctx: MultipartR

 #[cfg(test)]
 mod tests {
-    use super::super::replication_target_boundary::{BucketTarget, BucketTargets};
    use super::*;
-    use s3s::dto::{
-        BucketVersioningStatus, DeleteReplication, DeleteReplicationStatus, Destination, ExcludedPrefix, ReplicationRule,
-        ReplicationRuleStatus, VersioningConfiguration,
-    };
    use std::collections::HashMap;
    use time::OffsetDateTime;
    use uuid::Uuid;

-    fn test_target_client(endpoint: String) -> Arc<TargetClient> {
+    fn test_target_client(endpoint: String) -> TargetClient {
        let config = aws_sdk_s3::Config::builder()
            .endpoint_url(endpoint.clone())
            .region(aws_sdk_s3::config::Region::new("us-east-1"))
@@ -3175,7 +3157,7 @@ mod tests {
            .behavior_version(aws_sdk_s3::config::BehaviorVersion::latest())
            .build();

-        Arc::new(TargetClient {
+        TargetClient {
            endpoint,
            credentials: None,
            bucket: "target-bucket".to_string(),
@@ -3187,11 +3169,7 @@ mod tests {
            health_check_duration: std::time::Duration::from_secs(5),
            replicate_sync: false,
            client: Arc::new(aws_sdk_s3::Client::from_conf(config)),
-        })
-    }
-
-    async fn register_test_target(target: &Arc<TargetClient>) {
-        ReplicationTargetStore::register_test_target(target).await;
+        }
    }

    #[test]
@@ -3207,7 +3185,6 @@ mod tests {
    async fn replication_target_network_failure_marks_target_offline() {
        let endpoint = format!("http://network-failure-{}.example:9000", Uuid::new_v4());
        let target_client = test_target_client(endpoint);
-        register_test_target(&target_client).await;

        assert!(!ReplicationTargetStore::target_is_offline(&target_client).await);

@@ -3221,7 +3198,6 @@ mod tests {
    async fn replication_target_service_failure_keeps_target_online() {
        let endpoint = format!("http://service-failure-{}.example:9000", Uuid::new_v4());
        let target_client = test_target_client(endpoint);
-        register_test_target(&target_client).await;

        assert!(!ReplicationTargetStore::target_is_offline(&target_client).await);

@@ -3608,9 +3584,7 @@ mod tests {
            ..Default::default()
        };
        let rcfg = ReplicationConfig::new(None, None);
-        let roi = get_heal_replicate_object_info(&oi, &rcfg)
-            .await
-            .expect("non-delete heal classification should succeed");
+        let roi = get_heal_replicate_object_info(&oi, &rcfg).await;

        assert_eq!(roi.replication_status, ReplicationStatusType::Failed);
        assert_eq!(roi.op_type, ReplicationType::Heal);
@@ -3635,9 +3609,7 @@ mod tests {
        };
        let rcfg = ReplicationConfig::new(None, None);

-        let roi = get_heal_replicate_object_info(&oi, &rcfg)
-            .await
-            .expect("non-delete heal classification should succeed");
+        let roi = get_heal_replicate_object_info(&oi, &rcfg).await;

        assert!(roi.ssec);
        assert_eq!(roi.checksum, Some(checksum));
@@ -3653,7 +3625,6 @@ mod tests {
            version_purge_status: VersionPurgeStatusType::Pending,
            version_id: Some(Uuid::nil()),
            mod_time: Some(OffsetDateTime::now_utc()),
-            replication_decision: format!("{role}=true;false;{role};"),
            ..Default::default()
        };
        let rcfg = ReplicationConfig::new(
@@ -3663,176 +3634,13 @@ mod tests {
            }),
            None,
        );
-        let roi = get_heal_replicate_object_info(&oi, &rcfg)
-            .await
-            .expect("stored purge admission should classify without a live versioning lookup");
+        let roi = get_heal_replicate_object_info(&oi, &rcfg).await;

        assert_eq!(roi.replication_status_internal, None);
        assert_eq!(roi.version_purge_status_internal.as_deref(), Some(format!("{role}=PENDING;").as_str()));
        assert_eq!(roi.target_purge_statuses.get(role), Some(&VersionPurgeStatusType::Pending));
    }

-    #[tokio::test]
-    async fn heal_pending_purge_reads_one_versioning_generation() {
-        let bucket = format!("heal-versioning-snapshot-{}", Uuid::new_v4());
-        let object = "archive/object";
-        let arn = "arn:rustfs:replication:us-east-1:target:bucket";
-        ReplicationVersioningStore::install_prefix_state_test_config(
-            &bucket,
-            VersioningConfiguration {
-                status: Some(BucketVersioningStatus::from_static(BucketVersioningStatus::ENABLED)),
-                excluded_prefixes: Some(vec![ExcludedPrefix {
-                    prefix: Some("archive/".to_string()),
-                }]),
-                ..Default::default()
-            },
-        );
-        let rcfg = ReplicationConfig::new(
-            Some(ReplicationConfiguration {
-                role: String::new(),
-                rules: vec![ReplicationRule {
-                    delete_marker_replication: None,
-                    delete_replication: Some(DeleteReplication {
-                        status: DeleteReplicationStatus::from_static(DeleteReplicationStatus::ENABLED),
-                    }),
-                    destination: Destination {
-                        bucket: arn.to_string(),
-                        ..Default::default()
-                    },
-                    existing_object_replication: None,
-                    filter: None,
-                    id: Some("delete".to_string()),
-                    prefix: Some(String::new()),
-                    priority: Some(1),
-                    source_selection_criteria: None,
-                    status: ReplicationRuleStatus::from_static(ReplicationRuleStatus::ENABLED),
-                }],
-            }),
-            Some(BucketTargets {
-                targets: vec![BucketTarget {
-                    arn: arn.to_string(),
-                    ..Default::default()
-                }],
-            }),
-        );
-        let oi = ObjectInfo {
-            bucket,
-            name: object.to_string(),
-            version_id: Some(Uuid::nil()),
-            version_purge_status: VersionPurgeStatusType::Pending,
-            ..Default::default()
-        };
-
-        let roi = get_heal_replicate_object_info(&oi, &rcfg)
-            .await
-            .expect("pending null purge classification should succeed");
-
-        assert!(roi.dsc.targets_map.get(arn).is_some_and(|target| target.replicate));
-        assert!(
-            roi.existing_obj_resync
-                .targets
-                .get(arn)
-                .is_some_and(|target| target.replicate)
-        );
-    }
-
-    #[tokio::test]
-    async fn heal_pending_purge_preserves_the_persisted_admission_decision() {
-        let admitted_arn = "arn:rustfs:replication:us-east-1:target:admitted";
-        let current_role = "arn:rustfs:replication:us-east-1:target:current";
-        let rcfg = ReplicationConfig::new(
-            Some(ReplicationConfiguration {
-                role: current_role.to_string(),
-                rules: vec![ReplicationRule {
-                    delete_marker_replication: None,
-                    delete_replication: Some(DeleteReplication {
-                        status: DeleteReplicationStatus::from_static(DeleteReplicationStatus::DISABLED),
-                    }),
-                    destination: Destination {
-                        bucket: current_role.to_string(),
-                        ..Default::default()
-                    },
-                    existing_object_replication: None,
-                    filter: None,
-                    id: Some("delete".to_string()),
-                    prefix: Some(String::new()),
-                    priority: Some(1),
-                    source_selection_criteria: None,
-                    status: ReplicationRuleStatus::from_static(ReplicationRuleStatus::ENABLED),
-                }],
-            }),
-            Some(BucketTargets {
-                targets: vec![
-                    BucketTarget {
-                        arn: admitted_arn.to_string(),
-                        ..Default::default()
-                    },
-                    BucketTarget {
-                        arn: current_role.to_string(),
-                        ..Default::default()
-                    },
-                ],
-            }),
-        );
-        let oi = ObjectInfo {
-            bucket: "heal-persisted-delete-decision".to_string(),
-            name: "object".to_string(),
-            version_id: Some(Uuid::new_v4()),
-            version_purge_status: VersionPurgeStatusType::Pending,
-            version_purge_status_internal: Some(format!("{admitted_arn}=PENDING;")),
-            replication_decision: format!("{admitted_arn}=true;false;{admitted_arn};"),
-            ..Default::default()
-        };
-
-        let roi = get_heal_replicate_object_info(&oi, &rcfg)
-            .await
-            .expect("persisted delete admission should survive live rule disablement");
-
-        assert_eq!(
-            roi.version_purge_status_internal.as_deref(),
-            Some(format!("{admitted_arn}=PENDING;").as_str())
-        );
-        assert!(roi.dsc.targets_map.get(admitted_arn).is_some_and(|target| target.replicate));
-        assert!(!roi.dsc.targets_map.contains_key(current_role));
-        assert!(
-            roi.existing_obj_resync
-                .targets
-                .get(admitted_arn)
-                .is_some_and(|target| target.replicate)
-        );
-        assert!(!roi.existing_obj_resync.targets.contains_key(current_role));
-    }
-
-    #[tokio::test]
-    async fn heal_rejects_semantically_invalid_replication_config() {
-        let rcfg = ReplicationConfig::new(
-            Some(ReplicationConfiguration {
-                role: String::new(),
-                rules: vec![ReplicationRule {
-                    delete_marker_replication: None,
-                    delete_replication: None,
-                    destination: Destination {
-                        bucket: "arn:rustfs:replication:us-east-1:target:bucket".to_string(),
-                        ..Default::default()
-                    },
-                    existing_object_replication: None,
-                    filter: None,
-                    id: Some("invalid".to_string()),
-                    prefix: Some(String::new()),
-                    priority: Some(1),
-                    source_selection_criteria: None,
-                    status: ReplicationRuleStatus::from_static("Enabld"),
-                }],
-            }),
-            Some(BucketTargets::default()),
-        );
-        let err = rcfg
-            .validate()
-            .expect_err("invalid string-backed statuses must fail before heal classification loop");
-
-        assert!(err.to_string().contains("Rule.Status"));
-    }
-
    #[tokio::test]
    async fn test_cancel_marks_only_matching_bucket_target_token() {
        let resyncer = ReplicationResyncer::new().await;
@@ -3999,13 +3807,4 @@ mod tests {
        assert_eq!(resync_status_duration(ResyncStatusType::ResyncStarted, Some(start), end), None);
        assert_eq!(resync_status_duration(ResyncStatusType::ResyncFailed, None, end), None);
    }
-
-    #[test]
-    fn target_delete_version_id_preserves_explicit_null_purges() {
-        let version_id = Uuid::new_v4();
-
-        assert_eq!(target_delete_version_id(version_id, true), Some(version_id.to_string()));
-        assert_eq!(target_delete_version_id(Uuid::nil(), true).as_deref(), Some(NULL_VERSION_ID));
-        assert_eq!(target_delete_version_id(Uuid::nil(), false), None);
-    }
 }
@@ -22,9 +22,9 @@ use super::replication_stats_boundary::{
    QueueCache, ReplicationMetricScope, SRMetricsSummary, XferStats,
 };
 use super::runtime_boundary as runtime_sources;
-use std::collections::{HashMap, hash_map::Entry};
+use std::collections::HashMap;
+use std::sync::Arc;
 use std::sync::atomic::{AtomicI64, Ordering};
-use std::sync::{Arc, LazyLock, Mutex as StdMutex, Weak};
 use std::time::{Duration, SystemTime};
 use tokio::sync::{Mutex, RwLock};
 use tokio::time::interval;
@@ -143,7 +143,7 @@ pub struct ReplicationStats {
    // Active worker statistics
    pub workers: Arc<Mutex<ActiveWorkerStat>>,
    // Queue statistics cache
-    pub q_cache: Arc<StdMutex<QueueCache>>,
+    pub q_cache: Arc<Mutex<QueueCache>>,
    // Proxy statistics cache
    pub p_cache: Arc<Mutex<ProxyStatsCache>>,
    // MRF backlog statistics (simplified)
@@ -153,89 +153,12 @@ pub struct ReplicationStats {
    pub most_recent_stats: Arc<Mutex<HashMap<String, BucketStats>>>,
 }

-#[derive(Debug, Clone, Default, PartialEq, Eq)]
-pub struct RuntimeReplicationTargetBacklog {
-    pub bucket: String,
-    pub target_arn: String,
-    pub count: u64,
-    pub bytes: u64,
-}
-
-type TargetQueueKey = (String, String);
-type TargetQueueCache = HashMap<TargetQueueKey, InQueueMetric>;
-
-struct TargetQueueCacheSlot {
-    owner: Weak<StdMutex<QueueCache>>,
-    metrics: TargetQueueCache,
-}
-
-impl TargetQueueCacheSlot {
-    fn new(owner: &Arc<StdMutex<QueueCache>>) -> Self {
-        Self {
-            owner: Arc::downgrade(owner),
-            metrics: TargetQueueCache::default(),
-        }
-    }
-
-    fn belongs_to(&self, owner: &Arc<StdMutex<QueueCache>>) -> bool {
-        self.owner.upgrade().is_some_and(|current| Arc::ptr_eq(&current, owner))
-    }
-}
-
-// Keep runtime target counters outside ReplicationStats to preserve its public struct shape.
-static TARGET_QUEUE_CACHES: LazyLock<StdMutex<Vec<TargetQueueCacheSlot>>> = LazyLock::new(|| StdMutex::new(Vec::new()));
-
-fn i64_to_u64_floor_zero(value: i64) -> u64 {
-    u64::try_from(value.max(0)).unwrap_or(0)
-}
-
-fn normalized_target_arns(target_arns: &[String]) -> Vec<&str> {
-    let mut target_arns = target_arns
-        .iter()
-        .map(String::as_str)
-        .filter(|target_arn| !target_arn.is_empty())
-        .collect::<Vec<_>>();
-    target_arns.sort_unstable();
-    target_arns.dedup();
-    target_arns
-}
-
-fn target_queue_cache_snapshot(cache: &TargetQueueCache) -> Vec<RuntimeReplicationTargetBacklog> {
-    cache
-        .iter()
-        .filter_map(|((bucket, target_arn), metric)| {
-            let count = i64_to_u64_floor_zero(metric.curr.get_current_count());
-            let bytes = i64_to_u64_floor_zero(metric.curr.get_current_bytes());
-            (count > 0 || bytes > 0).then(|| RuntimeReplicationTargetBacklog {
-                bucket: bucket.clone(),
-                target_arn: target_arn.clone(),
-                count,
-                bytes,
-            })
-        })
-        .collect()
-}
-
-fn prune_stale_target_queue_caches(caches: &mut Vec<TargetQueueCacheSlot>) {
-    caches.retain(|slot| slot.owner.strong_count() > 0);
-}
-
-fn with_target_queue_caches<T>(f: impl FnOnce(&mut Vec<TargetQueueCacheSlot>) -> T) -> T {
-    match TARGET_QUEUE_CACHES.lock() {
-        Ok(mut caches) => f(&mut caches),
-        Err(poisoned) => {
-            let mut caches = poisoned.into_inner();
-            f(&mut caches)
-        }
-    }
-}
-
 impl ReplicationStats {
    pub fn new() -> Self {
        Self {
            sr_stats: Arc::new(SRStats::new()),
            workers: Arc::new(Mutex::new(ActiveWorkerStat::new())),
-            q_cache: Arc::new(StdMutex::new(QueueCache::new())),
+            q_cache: Arc::new(Mutex::new(QueueCache::new())),
            p_cache: Arc::new(Mutex::new(ProxyStatsCache::new())),
            mrf_stats: HashMap::new(),
            cache: Arc::new(RwLock::new(HashMap::new())),
@@ -275,9 +198,8 @@ impl ReplicationStats {
            let mut interval = interval(Duration::from_secs(2));
            loop {
                interval.tick().await;
-                if let Ok(mut cache) = q_cache_clone.lock() {
-                    cache.update();
-                }
+                let mut cache = q_cache_clone.lock().await;
+                cache.update();
            }
        });
    }
@@ -469,13 +391,12 @@ impl ReplicationStats {
        drop(cache);

        {
-            if let Ok(q_cache) = self.q_cache.lock() {
-                for (bucket, queue_stats) in &q_cache.bucket_stats {
-                    let bucket_stats = result.entry(bucket.clone()).or_insert_with(BucketReplicationStats::new);
-                    bucket_stats.q_stat = queue_stats.snapshot();
-                    bucket_stats.mark_node_local_provider_available();
-                    bucket_stats.queue_scope = ReplicationMetricScope::NodeLocal;
-                }
+            let q_cache = self.q_cache.lock().await;
+            for (bucket, queue_stats) in &q_cache.bucket_stats {
+                let bucket_stats = result.entry(bucket.clone()).or_insert_with(BucketReplicationStats::new);
+                bucket_stats.q_stat = queue_stats.snapshot();
+                bucket_stats.mark_node_local_provider_available();
+                bucket_stats.queue_scope = ReplicationMetricScope::NodeLocal;
            }
        }

@@ -508,11 +429,8 @@ impl ReplicationStats {
        let boot_time = SystemTime::UNIX_EPOCH; // simplified implementation
        let uptime = SystemTime::now().duration_since(boot_time).unwrap_or_default().as_secs() as i64;

-        let queued = self
-            .q_cache
-            .lock()
-            .map(|q_cache| q_cache.get_site_stats())
-            .unwrap_or_default();
+        let q_cache = self.q_cache.lock().await;
+        let queued = q_cache.get_site_stats();

        let p_cache = self.p_cache.lock().await;
        let proxied = p_cache.get_site_stats();
@@ -715,9 +633,8 @@ impl ReplicationStats {
        drop(cache);

        {
-            if let Ok(q_cache) = self.q_cache.lock()
-                && let Some(queue_stats) = q_cache.bucket_stats.get(bucket)
-            {
+            let q_cache = self.q_cache.lock().await;
+            if let Some(queue_stats) = q_cache.bucket_stats.get(bucket) {
                replication_stats.q_stat = queue_stats.snapshot();
            }
        }
@@ -748,79 +665,31 @@ impl ReplicationStats {
    }

    /// Increase queue statistics
-    pub fn inc_q(&self, bucket: &str, size: i64, _is_delete_repl: bool, _op_type: ReplicationType) {
-        if let Ok(mut q_cache) = self.q_cache.lock() {
-            q_cache.inc(bucket, size);
-        }
+    pub async fn inc_q(&self, bucket: &str, size: i64, _is_delete_repl: bool, _op_type: ReplicationType) {
+        let mut q_cache = self.q_cache.lock().await;
+        let stats = q_cache
+            .bucket_stats
+            .entry(bucket.to_string())
+            .or_insert_with(InQueueMetric::default);
+        stats.curr.now_bytes.fetch_add(size, Ordering::Relaxed);
+        stats.curr.now_count.fetch_add(1, Ordering::Relaxed);
+
+        q_cache.sr_queue_stats.curr.now_bytes.fetch_add(size, Ordering::Relaxed);
+        q_cache.sr_queue_stats.curr.now_count.fetch_add(1, Ordering::Relaxed);
    }

    /// Decrease queue statistics
-    pub fn dec_q(&self, bucket: &str, size: i64, _is_del_marker: bool, _op_type: ReplicationType) {
-        if let Ok(mut q_cache) = self.q_cache.lock() {
-            q_cache.dec(bucket, size);
-        }
-    }
+    pub async fn dec_q(&self, bucket: &str, size: i64, _is_del_marker: bool, _op_type: ReplicationType) {
+        let mut q_cache = self.q_cache.lock().await;
+        let stats = q_cache
+            .bucket_stats
+            .entry(bucket.to_string())
+            .or_insert_with(InQueueMetric::default);
+        stats.curr.now_bytes.fetch_sub(size, Ordering::Relaxed);
+        stats.curr.now_count.fetch_sub(1, Ordering::Relaxed);

-    pub(crate) fn inc_target_q(&self, bucket: &str, target_arns: &[String], size: i64) {
-        let target_arns = normalized_target_arns(target_arns);
-        if target_arns.is_empty() {
-            return;
-        }
-        with_target_queue_caches(|caches| {
-            prune_stale_target_queue_caches(caches);
-            let slot_index = match caches.iter().position(|slot| slot.belongs_to(&self.q_cache)) {
-                Some(index) => index,
-                None => {
-                    caches.push(TargetQueueCacheSlot::new(&self.q_cache));
-                    caches.len() - 1
-                }
-            };
-            let slot = &mut caches[slot_index];
-            let bucket = bucket.to_string();
-            for target_arn in target_arns {
-                let metric = match slot.metrics.entry((bucket.clone(), target_arn.to_string())) {
-                    Entry::Occupied(entry) => entry.into_mut(),
-                    Entry::Vacant(entry) => entry.insert(InQueueMetric::default()),
-                };
-                metric.curr.add_current(size, 1);
-            }
-        });
-    }
-
-    pub(crate) fn dec_target_q(&self, bucket: &str, target_arns: &[String], size: i64) {
-        let target_arns = normalized_target_arns(target_arns);
-        if target_arns.is_empty() {
-            return;
-        }
-        with_target_queue_caches(|caches| {
-            prune_stale_target_queue_caches(caches);
-            if let Some(slot) = caches.iter_mut().find(|slot| slot.belongs_to(&self.q_cache)) {
-                let bucket = bucket.to_string();
-                for target_arn in target_arns {
-                    if let Some(metric) = slot.metrics.get_mut(&(bucket.clone(), target_arn.to_string())) {
-                        metric.curr.subtract_current(size, 1);
-                    }
-                }
-                slot.metrics
-                    .retain(|_, metric| metric.curr.get_current_count() > 0 || metric.curr.get_current_bytes() > 0);
-            }
-        });
-    }
-
-    pub fn runtime_target_backlog_snapshot(&self) -> Vec<RuntimeReplicationTargetBacklog> {
-        let mut snapshot = with_target_queue_caches(|caches| {
-            caches
-                .iter()
-                .find(|slot| slot.belongs_to(&self.q_cache))
-                .map(|slot| target_queue_cache_snapshot(&slot.metrics))
-                .unwrap_or_default()
-        });
-        snapshot.sort_by(|left, right| {
-            left.bucket
-                .cmp(&right.bucket)
-                .then_with(|| left.target_arn.cmp(&right.target_arn))
-        });
-        snapshot
+        q_cache.sr_queue_stats.curr.now_bytes.fetch_sub(size, Ordering::Relaxed);
+        q_cache.sr_queue_stats.curr.now_count.fetch_sub(1, Ordering::Relaxed);
    }

    /// Increase proxy metrics
@@ -846,94 +715,6 @@ impl Default for ReplicationStats {
 mod tests {
    use super::*;

-    #[test]
-    fn runtime_target_backlog_snapshot_tracks_targets() {
-        let stats = ReplicationStats::new();
-        stats.inc_target_q(
-            "photos",
-            &[
-                "arn:rustfs:replication:target-b".to_string(),
-                "arn:rustfs:replication:target-a".to_string(),
-                "arn:rustfs:replication:target-a".to_string(),
-            ],
-            1024,
-        );
-
-        let snapshot = stats.runtime_target_backlog_snapshot();
-
-        assert_eq!(
-            snapshot,
-            vec![
-                RuntimeReplicationTargetBacklog {
-                    bucket: "photos".to_string(),
-                    target_arn: "arn:rustfs:replication:target-a".to_string(),
-                    count: 1,
-                    bytes: 1024,
-                },
-                RuntimeReplicationTargetBacklog {
-                    bucket: "photos".to_string(),
-                    target_arn: "arn:rustfs:replication:target-b".to_string(),
-                    count: 1,
-                    bytes: 1024,
-                },
-            ]
-        );
-    }
-
-    #[test]
-    fn runtime_target_backlog_ignores_empty_targets() {
-        let stats = ReplicationStats::new();
-        stats.inc_target_q("photos", &["".to_string()], 1024);
-
-        assert!(stats.runtime_target_backlog_snapshot().is_empty());
-    }
-
-    #[test]
-    fn runtime_target_backlog_is_scoped_to_stats_instance() {
-        let first = ReplicationStats::new();
-        let second = ReplicationStats::new();
-        first.inc_target_q("photos", &["arn:rustfs:replication:target-a".to_string()], 1024);
-
-        assert!(second.runtime_target_backlog_snapshot().is_empty());
-        assert_eq!(first.runtime_target_backlog_snapshot()[0].count, 1);
-    }
-
-    #[test]
-    fn runtime_target_backlog_decrements_with_saturation() {
-        let stats = ReplicationStats::new();
-        let target_arns = ["arn:rustfs:replication:target-a".to_string()];
-        stats.inc_target_q("photos", &target_arns, 1024);
-        stats.dec_target_q("photos", &target_arns, 2048);
-
-        assert!(stats.runtime_target_backlog_snapshot().is_empty());
-    }
-
-    #[test]
-    fn runtime_target_backlog_prunes_stale_sidecar_on_next_access() {
-        {
-            let stats = ReplicationStats::new();
-            stats.inc_target_q("photos", &["arn:rustfs:replication:target-a".to_string()], 1024);
-            assert!(
-                TARGET_QUEUE_CACHES
-                    .lock()
-                    .expect("target queue cache mutex")
-                    .iter()
-                    .any(|slot| slot.owner.strong_count() > 0)
-            );
-        }
-
-        let stats = ReplicationStats::new();
-        stats.inc_target_q("photos", &["arn:rustfs:replication:target-b".to_string()], 1024);
-
-        assert!(
-            TARGET_QUEUE_CACHES
-                .lock()
-                .expect("target queue cache mutex")
-                .iter()
-                .all(|slot| slot.owner.strong_count() > 0)
-        );
-    }
-
    #[tokio::test]
    async fn test_replication_stats_new() {
        let stats = ReplicationStats::new();
@@ -1020,14 +801,14 @@ mod tests {
    async fn latest_stats_include_queue_until_drained() {
        let stats = ReplicationStats::new();

-        stats.inc_q("queued-bucket", 4096, false, ReplicationType::Object);
+        stats.inc_q("queued-bucket", 4096, false, ReplicationType::Object).await;
        let queued = stats.get_latest_replication_stats("queued-bucket").await;
        assert!(queued.replication_stats.provider_available);
        assert_eq!(queued.replication_stats.q_stat.curr.count, 1);
        assert_eq!(queued.replication_stats.q_stat.curr.bytes, 4096);
        assert_eq!(queued.replication_stats.queue_scope, ReplicationMetricScope::NodeLocal);

-        stats.dec_q("queued-bucket", 4096, false, ReplicationType::Object);
+        stats.dec_q("queued-bucket", 4096, false, ReplicationType::Object).await;
        let drained = stats.get_latest_replication_stats("queued-bucket").await;
        assert_eq!(drained.replication_stats.q_stat.curr.count, 0);
        assert_eq!(drained.replication_stats.q_stat.curr.bytes, 0);
@@ -1130,7 +911,7 @@ mod tests {
        for _ in 0..32 {
            let stats = Arc::clone(&stats);
            tasks.push(tokio::spawn(async move {
-                stats.inc_q("concurrent-bucket", 7, false, ReplicationType::Object);
+                stats.inc_q("concurrent-bucket", 7, false, ReplicationType::Object).await;
            }));
        }
        for task in tasks {
@@ -35,8 +35,6 @@ use time::format_description::well_known::Rfc3339;
 pub(crate) use crate::bucket::bucket_target_sys::{
    AdvancedPutOptions, PutObjectOptions, PutObjectPartOptions, RemoveObjectOptions, TargetClient,
 };
-#[cfg(test)]
-pub(crate) use crate::bucket::target::BucketTarget;
 pub(crate) use crate::bucket::target::BucketTargets;

 use super::replication_config_store::ReplicationConfigStore;
@@ -95,20 +93,12 @@ impl ReplicationTargetStore {
        BucketTargetSys::get().get_remote_target_client(bucket, arn).await
    }

-    pub(crate) async fn target_is_offline(target_client: &Arc<TargetClient>) -> bool {
-        BucketTargetSys::get().is_target_offline(target_client).await
+    pub(crate) async fn target_is_offline(target_client: &TargetClient) -> bool {
+        BucketTargetSys::get().is_offline(&target_client.to_url()).await
    }

-    pub(crate) async fn mark_target_offline(target_client: &Arc<TargetClient>) {
-        BucketTargetSys::get().mark_target_offline(target_client).await
-    }
-
-    #[cfg(test)]
-    pub(crate) async fn register_test_target(target_client: &Arc<TargetClient>) {
-        BucketTargetSys::get().arn_remotes_map.write().await.insert(
-            target_client.arn.clone(),
-            crate::bucket::bucket_target_sys::ArnTarget::with_client(target_client.clone()),
-        );
+    pub(crate) async fn mark_target_offline(target_client: &TargetClient) {
+        BucketTargetSys::get().mark_offline(&target_client.to_url()).await
    }
 }

@@ -12,28 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-use super::replication_error_boundary::Result;
-use crate::bucket::{versioning::VersioningApi as _, versioning_sys::BucketVersioningSys};
-#[cfg(test)]
-use s3s::dto::VersioningConfiguration;
-#[cfg(test)]
-use std::{collections::HashMap, sync::LazyLock, sync::Mutex};
-
-#[cfg(test)]
-static PREFIX_STATE_TEST_CONFIGS: LazyLock<Mutex<HashMap<String, VersioningConfiguration>>> =
-    LazyLock::new(|| Mutex::new(HashMap::new()));
+use crate::bucket::versioning_sys::BucketVersioningSys;

 pub(crate) struct ReplicationVersioningStore;

 impl ReplicationVersioningStore {
-    #[cfg(test)]
-    pub(crate) fn install_prefix_state_test_config(bucket: &str, config: VersioningConfiguration) {
-        PREFIX_STATE_TEST_CONFIGS
-            .lock()
-            .expect("replication versioning test config lock should not be poisoned")
-            .insert(bucket.to_string(), config);
-    }
-
    pub(crate) async fn prefix_enabled(bucket: &str, prefix: &str) -> bool {
        BucketVersioningSys::prefix_enabled(bucket, prefix).await
    }
@@ -41,18 +24,4 @@ impl ReplicationVersioningStore {
    pub(crate) async fn prefix_suspended(bucket: &str, prefix: &str) -> bool {
        BucketVersioningSys::prefix_suspended(bucket, prefix).await
    }
-
-    pub(crate) async fn prefix_state(bucket: &str, prefix: &str) -> Result<(bool, bool)> {
-        #[cfg(test)]
-        if let Some(config) = PREFIX_STATE_TEST_CONFIGS
-            .lock()
-            .expect("replication versioning test config lock should not be poisoned")
-            .remove(bucket)
-        {
-            return Ok((config.prefix_enabled(prefix), config.prefix_suspended(prefix)));
-        }
-
-        let config = BucketVersioningSys::get(bucket).await?;
-        Ok((config.prefix_enabled(prefix), config.prefix_suspended(prefix)))
-    }
 }
@@ -19,9 +19,6 @@ pub trait VersioningApi {
    fn enabled(&self) -> bool;
    fn prefix_enabled(&self, prefix: &str) -> bool;
    fn prefix_suspended(&self, prefix: &str) -> bool;
-    fn delete_state(&self, prefix: &str) -> (bool, bool) {
-        (self.prefix_enabled(prefix), self.suspended())
-    }
    fn versioned(&self, prefix: &str) -> bool;
    fn suspended(&self) -> bool;
 }
@@ -95,60 +92,3 @@ impl VersioningApi for VersioningConfiguration {
        self.status == Some(BucketVersioningStatus::from_static(BucketVersioningStatus::SUSPENDED))
    }
 }
-
-#[cfg(test)]
-mod tests {
-    use s3s::dto::{BucketVersioningStatus, ExcludedPrefix};
-
-    use super::*;
-
-    struct LegacyVersioning;
-
-    impl VersioningApi for LegacyVersioning {
-        fn enabled(&self) -> bool {
-            false
-        }
-
-        fn prefix_enabled(&self, _prefix: &str) -> bool {
-            false
-        }
-
-        fn prefix_suspended(&self, _prefix: &str) -> bool {
-            false
-        }
-
-        fn versioned(&self, _prefix: &str) -> bool {
-            false
-        }
-
-        fn suspended(&self) -> bool {
-            false
-        }
-    }
-
-    #[test]
-    fn delete_state_has_a_backward_compatible_default() {
-        assert_eq!(LegacyVersioning.delete_state("object"), (false, false));
-    }
-
-    #[test]
-    fn delete_state_treats_excluded_prefixes_as_unversioned() {
-        let config = VersioningConfiguration {
-            status: Some(BucketVersioningStatus::from_static(BucketVersioningStatus::ENABLED)),
-            excluded_prefixes: Some(vec![ExcludedPrefix {
-                prefix: Some("archive/".to_string()),
-            }]),
-            ..Default::default()
-        };
-
-        assert_eq!(config.delete_state("archive/object"), (false, false));
-        assert!(config.prefix_suspended("archive/object"));
-        assert_eq!(config.delete_state("live/object"), (true, false));
-
-        let suspended = VersioningConfiguration {
-            status: Some(BucketVersioningStatus::from_static(BucketVersioningStatus::SUSPENDED)),
-            ..Default::default()
-        };
-        assert_eq!(suspended.delete_state("archive/object"), (false, true));
-    }
-}
@@ -172,7 +172,7 @@ impl ProviderVersionCapabilities {
    }
 }

-pub(crate) fn validate_remote_version_id(version_id: &str) -> Result<(), Error> {
+fn validate_remote_version_id(version_id: &str) -> Result<(), Error> {
    if version_id.is_empty() {
        return Err(Error::new(
            ErrorKind::InvalidData,
@@ -46,6 +46,16 @@ lazy_static! {
        m.insert("x-amz-replication-status".to_string(), true);
        m
    };
+    static ref SSE_HEADERS: HashMap<String, bool> = {
+        let mut m = HashMap::new();
+        m.insert("x-amz-server-side-encryption".to_string(), true);
+        m.insert("x-amz-server-side-encryption-aws-kms-key-id".to_string(), true);
+        m.insert("x-amz-server-side-encryption-context".to_string(), true);
+        m.insert("x-amz-server-side-encryption-customer-algorithm".to_string(), true);
+        m.insert("x-amz-server-side-encryption-customer-key".to_string(), true);
+        m.insert("x-amz-server-side-encryption-customer-key-md5".to_string(), true);
+        m
+    };
 }

 pub fn is_standard_query_value(qs_key: &str) -> bool {
@@ -60,12 +70,16 @@ pub fn is_standard_header(header_key: &str) -> bool {
    *SUPPORTED_HEADERS.get(&header_key.to_lowercase()).unwrap_or(&false)
 }

+pub fn is_sse_header(header_key: &str) -> bool {
+    *SSE_HEADERS.get(&header_key.to_lowercase()).unwrap_or(&false)
+}
+
 pub fn is_amz_header(header_key: &str) -> bool {
    let key = header_key.to_lowercase();
    key.starts_with("x-amz-meta-")
        || key.starts_with("x-amz-grant-")
        || key == "x-amz-acl"
-        || rustfs_utils::http::is_sse_header(header_key)
+        || is_sse_header(header_key)
        || key.starts_with("x-amz-checksum-")
 }

@@ -12,20 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-#[cfg(test)]
-use crate::cluster::rpc::http_auth::RPC_REPLAY_SCOPE_VERSION_HEADER;
-use crate::cluster::rpc::http_auth::{
-    RPC_AUTH_VERSION_HEADER, RPC_AUTH_VERSION_V2, RPC_BOOT_EPOCH_CHALLENGE_HEADER, RPC_BOOT_EPOCH_HEADER,
-    RPC_BOOT_EPOCH_PROOF_HEADER, RPC_CONTENT_SHA256_HEADER, TIMESTAMP_HEADER,
-};
-use crate::cluster::rpc::{
-    gen_tonic_replay_scope_headers, gen_tonic_signature_headers, normalize_tonic_rpc_audience, verify_tonic_boot_epoch_response,
-};
-#[cfg(test)]
-use crate::cluster::rpc::{tonic_boot_epoch_challenge, tonic_boot_epoch_response_headers};
+use crate::cluster::rpc::http_auth::RPC_CONTENT_SHA256_HEADER;
+use crate::cluster::rpc::{gen_tonic_signature_headers, normalize_tonic_rpc_audience};
 use crate::disk::error::{DiskError, Error as DiskErrorType, RpcStatusError};
 use crate::runtime::sources as runtime_sources;
-use http::{Request as HttpRequest, Response as HttpResponse, Uri};
+use http::Uri;
 use rustfs_protos::{
    ChannelClass, create_new_channel, get_channel_for_class,
    proto_gen::node_service::{
@@ -33,19 +24,9 @@ use rustfs_protos::{
        tier_mutation_control_service_client::TierMutationControlServiceClient,
    },
 };
-use std::{
-    collections::HashMap,
-    error::Error,
-    future::Future,
-    io::ErrorKind,
-    pin::Pin,
-    sync::{LazyLock, Mutex},
-    task::{Context, Poll},
-};
+use std::{error::Error, io::ErrorKind};
 use tonic::{service::interceptor::InterceptedService, transport::Channel};
-use tower::Service;
 use tracing::debug;
-use uuid::Uuid;

 use super::context_propagation::{inject_request_id_into_metadata, inject_trace_context_into_metadata};

@@ -54,7 +35,7 @@ use super::context_propagation::{inject_request_id_into_metadata, inject_trace_c
 pub async fn node_service_time_out_client(
    addr: &String,
    interceptor: TonicInterceptor,
-) -> Result<NodeServiceClient<InterceptedService<AuthenticatedChannel, TonicInterceptor>>, Box<dyn Error>> {
+) -> Result<NodeServiceClient<InterceptedService<Channel, TonicInterceptor>>, Box<dyn Error>> {
    // Default to the latency-sensitive control channel; bulk `bytes` RPCs opt in via the
    // `_for_class` variant below (grpc-optimization P1).
    node_service_time_out_client_for_class(addr, interceptor, ChannelClass::Control).await
@@ -63,14 +44,13 @@ pub async fn node_service_time_out_client(
 pub async fn heal_control_time_out_client(
    addr: &str,
    interceptor: TonicInterceptor,
-) -> Result<HealControlServiceClient<InterceptedService<AuthenticatedChannel, TonicInterceptor>>, Box<dyn Error>> {
+) -> Result<HealControlServiceClient<InterceptedService<Channel, TonicInterceptor>>, Box<dyn Error>> {
    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?,
    };
    let max_message_size = rustfs_protos::HEAL_CONTROL_RPC_MAX_MESSAGE_SIZE;
-    let channel = ReplayScopeChannel::new(channel, interceptor.replay_scope_audience());
    Ok(HealControlServiceClient::with_interceptor(channel, interceptor)
        .max_decoding_message_size(max_message_size)
        .max_encoding_message_size(max_message_size))
@@ -79,14 +59,13 @@ pub async fn heal_control_time_out_client(
 pub async fn tier_mutation_control_time_out_client(
    addr: &str,
    interceptor: TonicInterceptor,
-) -> Result<TierMutationControlServiceClient<InterceptedService<AuthenticatedChannel, TonicInterceptor>>, Box<dyn Error>> {
+) -> Result<TierMutationControlServiceClient<InterceptedService<Channel, TonicInterceptor>>, Box<dyn Error>> {
    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?,
    };
    let max_message_size = rustfs_protos::TIER_MUTATION_RPC_MAX_MESSAGE_SIZE;
-    let channel = ReplayScopeChannel::new(channel, interceptor.replay_scope_audience());
    Ok(TierMutationControlServiceClient::with_interceptor(channel, interceptor)
        .max_decoding_message_size(max_message_size)
        .max_encoding_message_size(max_message_size))
@@ -102,7 +81,7 @@ pub async fn node_service_time_out_client_for_class(
    addr: &String,
    interceptor: TonicInterceptor,
    class: ChannelClass,
-) -> Result<NodeServiceClient<InterceptedService<AuthenticatedChannel, TonicInterceptor>>, Box<dyn Error>> {
+) -> Result<NodeServiceClient<InterceptedService<Channel, TonicInterceptor>>, Box<dyn Error>> {
    let interceptor = interceptor.with_rpc_audience(addr)?;
    let channel = match class {
        ChannelClass::Control => match runtime_sources::cached_node_channel(addr).await {
@@ -117,7 +96,6 @@ pub async fn node_service_time_out_client_for_class(
    };

    let max_message_size = rustfs_protos::internode_rpc_max_message_size();
-    let channel = ReplayScopeChannel::new(channel, interceptor.replay_scope_audience());
    Ok(NodeServiceClient::with_interceptor(channel, interceptor)
        .max_decoding_message_size(max_message_size)
        .max_encoding_message_size(max_message_size))
@@ -125,7 +103,7 @@ pub async fn node_service_time_out_client_for_class(

 pub async fn node_service_time_out_client_no_auth(
    addr: &String,
-) -> Result<NodeServiceClient<InterceptedService<AuthenticatedChannel, TonicInterceptor>>, Box<dyn Error>> {
+) -> Result<NodeServiceClient<InterceptedService<Channel, TonicInterceptor>>, Box<dyn Error>> {
    node_service_time_out_client(addr, TonicInterceptor::NoOp(NoOpInterceptor)).await
 }

@@ -221,104 +199,6 @@ pub(crate) fn is_network_like_disk_error(err: &DiskErrorType) -> bool {
    }
 }

-/// The transport service that learns an authenticated peer boot epoch and adds the replay-scoped
-/// signature only after one has been observed. The v1/v2 interceptor stays inside this wrapper so
-/// old servers continue receiving precisely the metadata they understand.
-#[derive(Clone, Debug)]
-pub struct ReplayScopeChannel<S> {
-    inner: S,
-    audience: Option<String>,
-}
-
-/// The channel type used by internode clients after v2 authentication and replay-scope handling.
-pub type AuthenticatedChannel = ReplayScopeChannel<Channel>;
-
-static PEER_BOOT_EPOCHS: LazyLock<Mutex<HashMap<String, Uuid>>> = LazyLock::new(|| Mutex::new(HashMap::new()));
-
-impl<S> ReplayScopeChannel<S> {
-    fn new(inner: S, audience: Option<String>) -> Self {
-        Self { inner, audience }
-    }
-}
-
-fn cached_peer_boot_epoch(audience: &str) -> Option<Uuid> {
-    PEER_BOOT_EPOCHS.lock().ok().and_then(|epochs| epochs.get(audience).copied())
-}
-
-fn remember_peer_boot_epoch(audience: String, epoch: Uuid) {
-    if let Ok(mut epochs) = PEER_BOOT_EPOCHS.lock() {
-        epochs.insert(audience, epoch);
-    }
-}
-
-impl<S, ReqBody, ResBody> Service<HttpRequest<ReqBody>> for ReplayScopeChannel<S>
-where
-    S: Service<HttpRequest<ReqBody>, Response = HttpResponse<ResBody>>,
-    S::Error: Send + 'static,
-    S::Future: Send + 'static,
-    ReqBody: Send + 'static,
-    ResBody: Send + 'static,
-{
-    type Response = HttpResponse<ResBody>;
-    type Error = S::Error;
-    type Future = Pin<Box<dyn Future<Output = Result<Self::Response, Self::Error>> + Send>>;
-
-    fn poll_ready(&mut self, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
-        self.inner.poll_ready(cx)
-    }
-
-    fn call(&mut self, mut request: HttpRequest<ReqBody>) -> Self::Future {
-        let authenticated = self.audience.as_ref().is_some_and(|_| {
-            request
-                .headers()
-                .get(RPC_AUTH_VERSION_HEADER)
-                .and_then(|value| value.to_str().ok())
-                == Some(RPC_AUTH_VERSION_V2)
-        });
-        let challenge = authenticated.then(Uuid::new_v4);
-        if let (Some(audience), Some(challenge)) = (self.audience.as_deref(), challenge) {
-            // The challenge is independently HMAC-authenticated by the response proof. It is not
-            // part of v2 so old peers ignore it, while a new peer can safely advertise its epoch.
-            request.headers_mut().insert(
-                RPC_BOOT_EPOCH_CHALLENGE_HEADER,
-                challenge.to_string().parse().expect("UUID must be a valid header value"),
-            );
-            if let (Some(boot_epoch), Some(timestamp), Some(content_sha256)) = (
-                cached_peer_boot_epoch(audience),
-                request.headers().get(TIMESTAMP_HEADER).and_then(|value| value.to_str().ok()),
-                request
-                    .headers()
-                    .get(RPC_CONTENT_SHA256_HEADER)
-                    .and_then(|value| value.to_str().ok()),
-            ) {
-                match gen_tonic_replay_scope_headers(audience, request.uri().path(), timestamp, content_sha256, boot_epoch) {
-                    Ok(headers) => request.headers_mut().extend(headers),
-                    Err(error) => debug!(error = %error, "could not attach replay-scoped RPC signature"),
-                }
-            }
-        }
-
-        let audience = self.audience.clone();
-        let future = self.inner.call(request);
-        Box::pin(async move {
-            let response = future.await?;
-            if let (Some(audience), Some(challenge)) = (audience, challenge) {
-                match verify_tonic_boot_epoch_response(&audience, challenge, response.headers()) {
-                    Ok(epoch) => remember_peer_boot_epoch(audience, epoch),
-                    Err(error)
-                        if response.headers().contains_key(RPC_BOOT_EPOCH_HEADER)
-                            || response.headers().contains_key(RPC_BOOT_EPOCH_PROOF_HEADER) =>
-                    {
-                        debug!(error = %error, "peer boot epoch response proof was rejected")
-                    }
-                    Err(_) => {}
-                }
-            }
-            Ok(response)
-        })
-    }
-}
-
 pub struct TonicSignatureInterceptor {
    audience: Option<String>,
 }
@@ -377,13 +257,6 @@ impl TonicInterceptor {
        }
        Ok(self)
    }
-
-    fn replay_scope_audience(&self) -> Option<String> {
-        match self {
-            Self::Signature(interceptor) => interceptor.audience.clone(),
-            Self::NoOp(_) => None,
-        }
-    }
 }

 impl tonic::service::Interceptor for TonicInterceptor {
@@ -406,38 +279,6 @@ mod tests {
    use tracing_opentelemetry::OpenTelemetrySpanExt;
    use tracing_subscriber::{Registry, layer::SubscriberExt};

-    #[derive(Clone)]
-    struct EpochProofService {
-        audience: String,
-        seen_headers: std::sync::Arc<Mutex<Vec<http::HeaderMap>>>,
-    }
-
-    impl Service<HttpRequest<()>> for EpochProofService {
-        type Response = HttpResponse<()>;
-        type Error = std::convert::Infallible;
-        type Future = std::future::Ready<Result<Self::Response, Self::Error>>;
-
-        fn poll_ready(&mut self, _cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
-            Poll::Ready(Ok(()))
-        }
-
-        fn call(&mut self, request: HttpRequest<()>) -> Self::Future {
-            self.seen_headers
-                .lock()
-                .expect("test header capture lock must not be poisoned")
-                .push(request.headers().clone());
-            let challenge = tonic_boot_epoch_challenge(request.headers())
-                .expect("client challenge must be syntactically valid")
-                .expect("authenticated client request must carry a boot epoch challenge");
-            let mut response = HttpResponse::new(());
-            response.headers_mut().extend(
-                tonic_boot_epoch_response_headers(&self.audience, challenge)
-                    .expect("test server must be able to sign an epoch proof"),
-            );
-            std::future::ready(Ok(response))
-        }
-    }
-
    fn ensure_test_rpc_secret() {
        runtime_sources::ensure_test_rpc_secret();
    }
@@ -579,52 +420,6 @@ mod tests {
        assert_eq!(interceptor.audience.as_deref(), Some("node-a:9000"));
    }

-    #[test]
-    fn replay_scope_channel_uses_epoch_proof_before_sending_v3() {
-        ensure_test_rpc_secret();
-        let audience = "replay-scope-client-test:9000";
-        PEER_BOOT_EPOCHS
-            .lock()
-            .expect("peer epoch cache lock must not be poisoned")
-            .remove(audience);
-        let seen_headers = std::sync::Arc::new(Mutex::new(Vec::new()));
-        let service = EpochProofService {
-            audience: audience.to_string(),
-            seen_headers: seen_headers.clone(),
-        };
-        let mut channel = ReplayScopeChannel::new(service, Some(audience.to_string()));
-        let make_request = || {
-            let mut request = HttpRequest::builder()
-                .uri("/node_service.NodeService/Ping")
-                .body(())
-                .expect("test RPC request must build");
-            request.headers_mut().extend(
-                gen_tonic_signature_headers(audience, "node_service.NodeService", "Ping", None)
-                    .expect("v2 test headers must mint"),
-            );
-            request
-        };
-
-        futures::executor::block_on(channel.call(make_request())).expect("first request must complete");
-        futures::executor::block_on(channel.call(make_request())).expect("second request must complete");
-
-        let headers = seen_headers.lock().expect("test header capture lock must not be poisoned");
-        assert_eq!(headers.len(), 2);
-        assert!(headers[0].contains_key(RPC_BOOT_EPOCH_CHALLENGE_HEADER));
-        assert!(
-            !headers[0].contains_key(RPC_REPLAY_SCOPE_VERSION_HEADER),
-            "the first request must remain v2-compatible until the peer proves its epoch"
-        );
-        assert!(
-            headers[1].contains_key(RPC_REPLAY_SCOPE_VERSION_HEADER),
-            "the second request must carry the replay-scoped v3 signature"
-        );
-        PEER_BOOT_EPOCHS
-            .lock()
-            .expect("peer epoch cache lock must not be poisoned")
-            .remove(audience);
-    }
-
    #[test]
    fn test_signature_interceptor_requires_generated_method_metadata() {
        ensure_test_rpc_secret();
@@ -20,8 +20,8 @@
 //! rustfs/rustfs#4402) is anchored by the `ghsa_r5qv_*` tests in the module
 //! below, plus the broader negative-signature suite. The advisory class is: a
 //! node must never accept an RPC whose auth is missing, malformed, or signed
-//! with the default/empty shared secret. Body-bound v2 requests and all replay-scoped v3
-//! requests additionally receive process-local replay protection. See
+//! with the default/empty shared secret. Body-bound v2 requests additionally
+//! receive process-local replay protection. See
 //! `docs/testing/security-regressions.md` for the full advisory -> test map.
 //!
 //! Advisory: <https://github.com/rustfs/rustfs/security/advisories/GHSA-r5qv-rc46-hv8q>
@@ -50,22 +50,13 @@ use uuid::Uuid;
 type HmacSha256 = Hmac<Sha256>;

 const SIGNATURE_HEADER: &str = "x-rustfs-signature";
-pub(crate) const TIMESTAMP_HEADER: &str = "x-rustfs-timestamp";
-pub(crate) const RPC_AUTH_VERSION_HEADER: &str = "x-rustfs-rpc-auth-version";
+const TIMESTAMP_HEADER: &str = "x-rustfs-timestamp";
+const RPC_AUTH_VERSION_HEADER: &str = "x-rustfs-rpc-auth-version";
 const RPC_SIGNATURE_V2_HEADER: &str = "x-rustfs-rpc-signature-v2";
 const RPC_NONCE_HEADER: &str = "x-rustfs-rpc-nonce";
 pub(crate) const RPC_CONTENT_SHA256_HEADER: &str = "x-rustfs-content-sha256";
-pub(crate) const RPC_AUTH_VERSION_V2: &str = "2";
-pub const RPC_REPLAY_SCOPE_VERSION_HEADER: &str = "x-rustfs-rpc-replay-scope-version";
-pub const RPC_REPLAY_SCOPE_SIGNATURE_HEADER: &str = "x-rustfs-rpc-signature-v3";
-pub const RPC_REPLAY_SCOPE_NONCE_HEADER: &str = "x-rustfs-rpc-replay-nonce";
-pub const RPC_BOOT_EPOCH_HEADER: &str = "x-rustfs-rpc-boot-epoch";
-pub const RPC_BOOT_EPOCH_CHALLENGE_HEADER: &str = "x-rustfs-rpc-boot-epoch-challenge";
-pub const RPC_BOOT_EPOCH_PROOF_HEADER: &str = "x-rustfs-rpc-boot-epoch-proof";
-const RPC_REPLAY_SCOPE_VERSION_V3: &str = "3";
+const RPC_AUTH_VERSION_V2: &str = "2";
 const RPC_RESPONSE_PROOF_DOMAIN: &[u8] = b"rustfs-rpc-response-proof-v1\0";
-const RPC_REPLAY_SCOPE_DOMAIN: &[u8] = b"rustfs-rpc-replay-scope-v3\0";
-const RPC_BOOT_EPOCH_PROOF_DOMAIN: &[u8] = b"rustfs-rpc-boot-epoch-proof-v1\0";
 const UNSIGNED_PAYLOAD: &str = "UNSIGNED-PAYLOAD";
 const UNSIGNED_PAYLOAD_NONCE: &str = "unsigned";
 const SIGNATURE_VALID_DURATION: i64 = 300; // 5 minutes
@@ -84,15 +75,9 @@ static INTERNODE_RPC_BODY_DIGEST_STRICT: LazyLock<bool> = LazyLock::new(|| {
        rustfs_config::DEFAULT_INTERNODE_RPC_BODY_DIGEST_STRICT,
    )
 });
-static INTERNODE_RPC_REPLAY_SCOPE_STRICT: LazyLock<bool> = LazyLock::new(|| {
-    get_env_bool(
-        rustfs_config::ENV_INTERNODE_RPC_REPLAY_SCOPE_STRICT,
-        rustfs_config::DEFAULT_INTERNODE_RPC_REPLAY_SCOPE_STRICT,
-    )
-});
-// Sized for peak legitimate authenticated RPC RPS x the retention window once replay scope is
-// active; overflow fails closed and increments the replay-cache overflow counter. Clamped to at
-// least 1 so a misconfigured zero cannot disable replay protection by rejecting every request.
+// Sized for peak legitimate body-bound mutation RPS x the retention window; overflow fails closed
+// and increments the replay-cache overflow counter. Clamped to at least 1 so a misconfigured zero
+// cannot disable replay protection by rejecting every body-bound request.
 static REPLAY_CACHE_CAPACITY: LazyLock<usize> = LazyLock::new(|| {
    rustfs_utils::get_env_usize(
        rustfs_config::ENV_INTERNODE_RPC_REPLAY_CACHE_CAPACITY,
@@ -101,7 +86,6 @@ static REPLAY_CACHE_CAPACITY: LazyLock<usize> = LazyLock::new(|| {
    .max(1)
 });
 static RPC_SECRET_RESOLUTION_LOG_ONCE: Once = Once::new();
-static RPC_BOOT_EPOCH: LazyLock<Uuid> = LazyLock::new(Uuid::new_v4);

 #[derive(Default)]
 struct RpcNonceCache {
@@ -329,189 +313,6 @@ fn verify_signature_v2(secret: &str, scope: SignatureV2Scope<'_>, signature: &st
    mac.verify_slice(&signature).is_ok()
 }

-#[derive(Clone, Copy)]
-struct ReplayScope<'a> {
-    audience: &'a str,
-    path: &'a str,
-    timestamp: &'a str,
-    nonce: Uuid,
-    content_sha256: &'a str,
-    boot_epoch: Uuid,
-}
-
-fn update_replay_scope(mac: &mut HmacSha256, scope: ReplayScope<'_>) {
-    mac.update(RPC_REPLAY_SCOPE_DOMAIN);
-    for part in [
-        scope.audience.as_bytes(),
-        b"|",
-        scope.path.as_bytes(),
-        b"|POST|",
-        scope.timestamp.as_bytes(),
-        b"|",
-        scope.nonce.as_bytes(),
-        b"|",
-        scope.content_sha256.as_bytes(),
-        b"|",
-        scope.boot_epoch.as_bytes(),
-    ] {
-        mac.update(part);
-    }
-}
-
-fn generate_replay_scope_signature(secret: &str, scope: ReplayScope<'_>) -> std::io::Result<String> {
-    let mut mac =
-        <HmacSha256 as KeyInit>::new_from_slice(secret.as_bytes()).map_err(|_| std::io::Error::other("Invalid RPC HMAC key"))?;
-    update_replay_scope(&mut mac, scope);
-    Ok(general_purpose::STANDARD.encode(mac.finalize().into_bytes()))
-}
-
-fn verify_replay_scope_signature(secret: &str, scope: ReplayScope<'_>, signature: &str) -> bool {
-    let Ok(signature) = general_purpose::STANDARD.decode(signature) else {
-        return false;
-    };
-    let Ok(mut mac) = <HmacSha256 as KeyInit>::new_from_slice(secret.as_bytes()) else {
-        return false;
-    };
-    update_replay_scope(&mut mac, scope);
-    mac.verify_slice(&signature).is_ok()
-}
-
-fn update_boot_epoch_proof(mac: &mut HmacSha256, audience: &str, challenge: Uuid, boot_epoch: Uuid) {
-    mac.update(RPC_BOOT_EPOCH_PROOF_DOMAIN);
-    mac.update(audience.as_bytes());
-    mac.update(b"|");
-    mac.update(challenge.as_bytes());
-    mac.update(boot_epoch.as_bytes());
-}
-
-fn generate_boot_epoch_proof(secret: &str, audience: &str, challenge: Uuid, boot_epoch: Uuid) -> std::io::Result<String> {
-    if audience.is_empty() || challenge.is_nil() || boot_epoch.is_nil() {
-        return Err(std::io::Error::other("Invalid RPC boot epoch proof scope"));
-    }
-    let mut mac =
-        <HmacSha256 as KeyInit>::new_from_slice(secret.as_bytes()).map_err(|_| std::io::Error::other("Invalid RPC HMAC key"))?;
-    update_boot_epoch_proof(&mut mac, audience, challenge, boot_epoch);
-    Ok(general_purpose::STANDARD.encode(mac.finalize().into_bytes()))
-}
-
-fn verify_boot_epoch_proof(secret: &str, audience: &str, challenge: Uuid, boot_epoch: Uuid, proof: &str) -> std::io::Result<()> {
-    if audience.is_empty() || challenge.is_nil() || boot_epoch.is_nil() {
-        return Err(std::io::Error::other("Invalid RPC boot epoch proof scope"));
-    }
-    let proof = general_purpose::STANDARD
-        .decode(proof)
-        .map_err(|_| std::io::Error::other("Invalid RPC boot epoch proof"))?;
-    let mut mac =
-        <HmacSha256 as KeyInit>::new_from_slice(secret.as_bytes()).map_err(|_| std::io::Error::other("Invalid RPC HMAC key"))?;
-    update_boot_epoch_proof(&mut mac, audience, challenge, boot_epoch);
-    mac.verify_slice(&proof)
-        .map_err(|_| std::io::Error::new(std::io::ErrorKind::PermissionDenied, "Invalid RPC boot epoch proof"))
-}
-
-fn non_nil_uuid(value: &str, name: &str) -> std::io::Result<Uuid> {
-    let value = Uuid::parse_str(value).map_err(|_| std::io::Error::other(format!("Invalid {name}")))?;
-    (!value.is_nil())
-        .then_some(value)
-        .ok_or_else(|| std::io::Error::other(format!("Invalid {name}")))
-}
-
-fn parse_tonic_rpc_path(path: &str) -> std::io::Result<(&str, &str)> {
-    path.strip_prefix('/')
-        .and_then(|path| path.split_once('/'))
-        .filter(|(service, rpc_method)| !service.is_empty() && !rpc_method.is_empty() && !rpc_method.contains('/'))
-        .ok_or_else(|| std::io::Error::other("Invalid RPC request path"))
-}
-
-/// The process-unique epoch included in every replay-scoped server verification.
-///
-/// A fresh process gets a fresh value, so a signature captured before a server restart cannot be
-/// admitted even though the bounded in-memory nonce cache necessarily starts empty again.
-pub fn tonic_rpc_boot_epoch() -> Uuid {
-    *RPC_BOOT_EPOCH
-}
-
-/// Build the additive replay-scope headers for a request that already carries rolling-upgrade-safe
-/// v1/v2 metadata. `timestamp` and `content_sha256` are deliberately reused from the v2 scope so
-/// old servers can continue validating the same request unchanged.
-pub fn gen_tonic_replay_scope_headers(
-    audience: &str,
-    path: &str,
-    timestamp: &str,
-    content_sha256: &str,
-    boot_epoch: Uuid,
-) -> std::io::Result<HeaderMap> {
-    if audience.is_empty() || !path.starts_with('/') || !valid_content_sha256(content_sha256) || boot_epoch.is_nil() {
-        return Err(std::io::Error::other("Invalid replay-scoped RPC signing scope"));
-    }
-    parse_tonic_rpc_path(path)?;
-    timestamp
-        .parse::<i64>()
-        .map_err(|_| std::io::Error::other("Invalid timestamp format"))?;
-
-    let nonce = Uuid::new_v4();
-    let signature = generate_replay_scope_signature(
-        &get_shared_secret()?,
-        ReplayScope {
-            audience,
-            path,
-            timestamp,
-            nonce,
-            content_sha256,
-            boot_epoch,
-        },
-    )?;
-    let mut headers = HeaderMap::new();
-    headers.insert(RPC_REPLAY_SCOPE_VERSION_HEADER, HeaderValue::from_static(RPC_REPLAY_SCOPE_VERSION_V3));
-    headers.insert(
-        RPC_REPLAY_SCOPE_SIGNATURE_HEADER,
-        header_value(&signature, RPC_REPLAY_SCOPE_SIGNATURE_HEADER)?,
-    );
-    headers.insert(
-        RPC_REPLAY_SCOPE_NONCE_HEADER,
-        header_value(&nonce.to_string(), RPC_REPLAY_SCOPE_NONCE_HEADER)?,
-    );
-    headers.insert(RPC_BOOT_EPOCH_HEADER, header_value(&boot_epoch.to_string(), RPC_BOOT_EPOCH_HEADER)?);
-    Ok(headers)
-}
-
-/// Parse the optional client challenge used to authenticate a server boot-epoch advertisement.
-pub fn tonic_boot_epoch_challenge(headers: &HeaderMap) -> std::io::Result<Option<Uuid>> {
-    headers
-        .get(RPC_BOOT_EPOCH_CHALLENGE_HEADER)
-        .map(|value| {
-            value
-                .to_str()
-                .map_err(|_| std::io::Error::other("Invalid RPC boot epoch challenge"))
-                .and_then(|value| non_nil_uuid(value, "RPC boot epoch challenge"))
-        })
-        .transpose()
-}
-
-/// Build the authenticated response headers for a client boot-epoch challenge.
-pub fn tonic_boot_epoch_response_headers(audience: &str, challenge: Uuid) -> std::io::Result<HeaderMap> {
-    let boot_epoch = tonic_rpc_boot_epoch();
-    let proof = generate_boot_epoch_proof(&get_shared_secret()?, audience, challenge, boot_epoch)?;
-    let mut headers = HeaderMap::new();
-    headers.insert(RPC_BOOT_EPOCH_HEADER, header_value(&boot_epoch.to_string(), RPC_BOOT_EPOCH_HEADER)?);
-    headers.insert(RPC_BOOT_EPOCH_PROOF_HEADER, header_value(&proof, RPC_BOOT_EPOCH_PROOF_HEADER)?);
-    Ok(headers)
-}
-
-/// Verify the server boot-epoch response for a challenge generated by this client.
-pub fn verify_tonic_boot_epoch_response(audience: &str, challenge: Uuid, headers: &HeaderMap) -> std::io::Result<Uuid> {
-    let boot_epoch = headers
-        .get(RPC_BOOT_EPOCH_HEADER)
-        .and_then(|value| value.to_str().ok())
-        .ok_or_else(|| std::io::Error::other("Missing RPC boot epoch"))
-        .and_then(|value| non_nil_uuid(value, "RPC boot epoch"))?;
-    let proof = headers
-        .get(RPC_BOOT_EPOCH_PROOF_HEADER)
-        .and_then(|value| value.to_str().ok())
-        .ok_or_else(|| std::io::Error::other("Missing RPC boot epoch proof"))?;
-    verify_boot_epoch_proof(&get_shared_secret()?, audience, challenge, boot_epoch, proof)?;
-    Ok(boot_epoch)
-}
-
 fn valid_content_sha256(value: &str) -> bool {
    value == UNSIGNED_PAYLOAD
        || (value.len() == 64
@@ -730,17 +531,6 @@ fn has_v2_auth_headers(headers: &HeaderMap) -> bool {
    .any(|name| headers.contains_key(*name))
 }

-fn has_replay_scope_headers(headers: &HeaderMap) -> bool {
-    [
-        RPC_REPLAY_SCOPE_VERSION_HEADER,
-        RPC_REPLAY_SCOPE_SIGNATURE_HEADER,
-        RPC_REPLAY_SCOPE_NONCE_HEADER,
-        RPC_BOOT_EPOCH_HEADER,
-    ]
-    .iter()
-    .any(|name| headers.contains_key(*name))
-}
-
 /// Whether the server requires target-bound v2 authentication on every internode gRPC request,
 /// rejecting the legacy constant-target fallback instead of accepting it. Default-off rollout
 /// lever gated on the v1-fallback counter reading zero fleet-wide; see
@@ -750,127 +540,9 @@ fn internode_rpc_signature_strict() -> bool {
    *INTERNODE_RPC_SIGNATURE_STRICT
 }

-fn internode_rpc_replay_scope_strict() -> bool {
-    *INTERNODE_RPC_REPLAY_SCOPE_STRICT
-}
-
-fn verify_tonic_replay_scope_signature(audience: &str, path: &str, headers: &HeaderMap) -> std::io::Result<()> {
-    if audience.is_empty() {
-        return Err(std::io::Error::other("Missing RPC audience"));
-    }
-    parse_tonic_rpc_path(path)?;
-
-    let version = headers
-        .get(RPC_REPLAY_SCOPE_VERSION_HEADER)
-        .and_then(|value| value.to_str().ok())
-        .ok_or_else(|| std::io::Error::other("Missing RPC replay scope version"))?;
-    if version != RPC_REPLAY_SCOPE_VERSION_V3 {
-        return Err(std::io::Error::other("Unsupported RPC replay scope version"));
-    }
-    let signature = headers
-        .get(RPC_REPLAY_SCOPE_SIGNATURE_HEADER)
-        .and_then(|value| value.to_str().ok())
-        .ok_or_else(|| std::io::Error::other("Missing RPC replay scope signature"))?;
-    let timestamp = headers
-        .get(TIMESTAMP_HEADER)
-        .and_then(|value| value.to_str().ok())
-        .ok_or_else(|| std::io::Error::other("Missing timestamp header"))?;
-    let signed_at = timestamp
-        .parse::<i64>()
-        .map_err(|_| std::io::Error::other("Invalid timestamp format"))?;
-    check_timestamp(signed_at)?;
-    let nonce = headers
-        .get(RPC_REPLAY_SCOPE_NONCE_HEADER)
-        .and_then(|value| value.to_str().ok())
-        .ok_or_else(|| std::io::Error::other("Missing RPC replay scope nonce"))
-        .and_then(|value| non_nil_uuid(value, "RPC replay scope nonce"))?;
-    let content_sha256 = headers
-        .get(RPC_CONTENT_SHA256_HEADER)
-        .and_then(|value| value.to_str().ok())
-        .ok_or_else(|| std::io::Error::other("Missing RPC content SHA-256"))?;
-    if !valid_content_sha256(content_sha256) {
-        return Err(std::io::Error::other("Invalid RPC content SHA-256"));
-    }
-    let boot_epoch = headers
-        .get(RPC_BOOT_EPOCH_HEADER)
-        .and_then(|value| value.to_str().ok())
-        .ok_or_else(|| std::io::Error::other("Missing RPC boot epoch"))
-        .and_then(|value| non_nil_uuid(value, "RPC boot epoch"))?;
-    let secret = get_shared_secret()?;
-    if !verify_replay_scope_signature(
-        &secret,
-        ReplayScope {
-            audience,
-            path,
-            timestamp,
-            nonce,
-            content_sha256,
-            boot_epoch,
-        },
-        signature,
-    ) {
-        return Err(std::io::Error::other("Invalid RPC replay scope signature"));
-    }
-    if boot_epoch != tonic_rpc_boot_epoch() {
-        return Err(std::io::Error::other("RPC boot epoch is stale"));
-    }
-    check_and_record_nonce(nonce, signed_at)
-}
-
 /// Verify gRPC authentication, preferring v2 without downgrade on malformed v2 metadata.
 pub fn verify_tonic_rpc_signature(audience: &str, path: &str, headers: &HeaderMap) -> std::io::Result<()> {
-    verify_tonic_rpc_signature_with_policy(
-        audience,
-        path,
-        headers,
-        internode_rpc_signature_strict(),
-        internode_rpc_replay_scope_strict(),
-        false,
-    )
-}
-
-/// Verify gRPC authentication while allowing the narrowly scoped v2 `Ping` bootstrap used to
-/// obtain an authenticated server boot epoch when replay-scope strictness is enabled.
-pub fn verify_tonic_rpc_signature_with_bootstrap(
-    audience: &str,
-    path: &str,
-    headers: &HeaderMap,
-    allow_replay_scope_bootstrap: bool,
-) -> std::io::Result<()> {
-    verify_tonic_rpc_signature_with_policy(
-        audience,
-        path,
-        headers,
-        internode_rpc_signature_strict(),
-        internode_rpc_replay_scope_strict(),
-        allow_replay_scope_bootstrap,
-    )
-}
-
-fn verify_tonic_rpc_signature_with_policy(
-    audience: &str,
-    path: &str,
-    headers: &HeaderMap,
-    signature_strict: bool,
-    replay_scope_strict: bool,
-    allow_replay_scope_bootstrap: bool,
-) -> std::io::Result<()> {
-    if has_replay_scope_headers(headers) {
-        return verify_tonic_replay_scope_signature(audience, path, headers);
-    }
-
-    // Only a method-bound v2 Ping with a syntactically valid challenge may bootstrap a strict
-    // client after its peer restarts. Legacy metadata never gets this exception.
-    let bootstrap = allow_replay_scope_bootstrap
-        && has_v2_auth_headers(headers)
-        && tonic_boot_epoch_challenge(headers).is_ok_and(|challenge| challenge.is_some());
-    if replay_scope_strict && !bootstrap {
-        return Err(std::io::Error::other("RPC replay-scoped authentication required"));
-    }
-
-    verify_tonic_rpc_signature_with_strictness(audience, path, headers, signature_strict)?;
-    global_internode_metrics().record_replay_scope_fallback();
-    Ok(())
+    verify_tonic_rpc_signature_with_strictness(audience, path, headers, internode_rpc_signature_strict())
 }

 /// [`verify_tonic_rpc_signature`] with the strict gate injected as a parameter, so both rollout
@@ -1601,104 +1273,6 @@ mod tests {
        assert_eq!(error.to_string(), "Invalid RPC v2 signature");
    }

-    #[test]
-    fn replay_scope_binds_path_epoch_and_random_nonce() {
-        ensure_test_rpc_secret();
-        let path = "/node_service.NodeService/Ping";
-        let mut headers = gen_tonic_signature_headers("node-a:9000", "node_service.NodeService", "Ping", None)
-            .expect("v2 compatibility headers should build");
-        let timestamp = headers
-            .get(TIMESTAMP_HEADER)
-            .and_then(|value| value.to_str().ok())
-            .expect("v2 timestamp")
-            .to_string();
-        let content_sha256 = headers
-            .get(RPC_CONTENT_SHA256_HEADER)
-            .and_then(|value| value.to_str().ok())
-            .expect("v2 content digest")
-            .to_string();
-        headers.extend(
-            gen_tonic_replay_scope_headers("node-a:9000", path, &timestamp, &content_sha256, tonic_rpc_boot_epoch())
-                .expect("replay-scope headers should build"),
-        );
-
-        assert!(
-            verify_tonic_rpc_signature_with_policy("node-a:9000", path, &headers, false, false, false).is_ok(),
-            "the first replay-scoped request must be accepted"
-        );
-        let replay = verify_tonic_rpc_signature_with_policy("node-a:9000", path, &headers, false, false, false)
-            .expect_err("the random replay-scope nonce must be single-use");
-        assert_eq!(replay.to_string(), "RPC request replay detected");
-
-        let path_error = verify_tonic_replay_scope_signature("node-a:9000", "/node_service.NodeService/SignalService", &headers)
-            .expect_err("a replay-scoped signature must not move to another method");
-        assert_eq!(path_error.to_string(), "Invalid RPC replay scope signature");
-    }
-
-    #[test]
-    fn replay_scope_rejects_partial_metadata_and_stale_epoch_without_fallback() {
-        ensure_test_rpc_secret();
-        let path = "/node_service.NodeService/Ping";
-        let mut partial = gen_tonic_signature_headers("node-a:9000", "node_service.NodeService", "Ping", None)
-            .expect("v2 compatibility headers should build");
-        partial.insert(RPC_REPLAY_SCOPE_VERSION_HEADER, HeaderValue::from_static(RPC_REPLAY_SCOPE_VERSION_V3));
-        let error = verify_tonic_rpc_signature_with_policy("node-a:9000", path, &partial, false, false, false)
-            .expect_err("partial replay-scope metadata must never downgrade to v2");
-        assert_eq!(error.to_string(), "Missing RPC replay scope signature");
-
-        let timestamp = partial
-            .get(TIMESTAMP_HEADER)
-            .and_then(|value| value.to_str().ok())
-            .expect("v2 timestamp")
-            .to_string();
-        let content_sha256 = partial
-            .get(RPC_CONTENT_SHA256_HEADER)
-            .and_then(|value| value.to_str().ok())
-            .expect("v2 content digest")
-            .to_string();
-        let stale_epoch = Uuid::new_v4();
-        partial.extend(
-            gen_tonic_replay_scope_headers("node-a:9000", path, &timestamp, &content_sha256, stale_epoch)
-                .expect("replay-scope headers should build"),
-        );
-        let stale = verify_tonic_rpc_signature_with_policy("node-a:9000", path, &partial, false, false, false)
-            .expect_err("a signature from a prior server boot epoch must be rejected");
-        assert_eq!(stale.to_string(), "RPC boot epoch is stale");
-    }
-
-    #[test]
-    fn replay_scope_strictness_allows_only_authenticated_ping_bootstrap() {
-        ensure_test_rpc_secret();
-        let mut headers = gen_tonic_signature_headers("node-a:9000", "node_service.NodeService", "Ping", None)
-            .expect("v2 compatibility headers should build");
-        let rejected =
-            verify_tonic_rpc_signature_with_policy("node-a:9000", "/node_service.NodeService/Ping", &headers, false, true, false)
-                .expect_err("strict replay scope must reject stripped new metadata");
-        assert_eq!(rejected.to_string(), "RPC replay-scoped authentication required");
-
-        headers.insert(
-            RPC_BOOT_EPOCH_CHALLENGE_HEADER,
-            HeaderValue::from_str(&Uuid::new_v4().to_string()).expect("UUID header"),
-        );
-        assert!(
-            verify_tonic_rpc_signature_with_policy("node-a:9000", "/node_service.NodeService/Ping", &headers, false, true, true,)
-                .is_ok(),
-            "only the signed Ping bootstrap may obtain a new server epoch in strict mode"
-        );
-    }
-
-    #[test]
-    fn boot_epoch_response_proof_binds_audience_challenge_and_epoch() {
-        ensure_test_rpc_secret();
-        let challenge = Uuid::new_v4();
-        let headers = tonic_boot_epoch_response_headers("node-a:9000", challenge).expect("proof headers should build");
-        let epoch =
-            verify_tonic_boot_epoch_response("node-a:9000", challenge, &headers).expect("matching proof headers should verify");
-        assert_eq!(epoch, tonic_rpc_boot_epoch());
-        assert!(verify_tonic_boot_epoch_response("node-b:9000", challenge, &headers).is_err());
-        assert!(verify_tonic_boot_epoch_response("node-a:9000", Uuid::new_v4(), &headers).is_err());
-    }
-
    #[test]
    fn malformed_v2_auth_does_not_downgrade_to_valid_legacy_signature() {
        ensure_test_rpc_secret();
@@ -26,25 +26,20 @@ pub(crate) mod runtime_sources;
 pub use background_monitor::shutdown_background_monitors;
 pub(crate) use background_monitor::spawn_background_monitor;
 pub use client::{
-    AuthenticatedChannel, TonicInterceptor, gen_tonic_signature_interceptor, node_service_time_out_client,
-    node_service_time_out_client_no_auth,
+    TonicInterceptor, gen_tonic_signature_interceptor, node_service_time_out_client, node_service_time_out_client_no_auth,
 };
-// Re-exported through `api::rpc`; not every item is consumed inside this crate.
-#[allow(unused_imports)]
 pub use http_auth::{
-    TONIC_RPC_PREFIX, build_auth_headers, gen_signature_headers, gen_tonic_replay_scope_headers, gen_tonic_signature_headers,
-    normalize_tonic_rpc_audience, set_tonic_canonical_body_digest, set_tonic_mutation_body_digest, sign_ns_scanner_capability,
-    sign_tonic_rpc_response_proof, tonic_boot_epoch_challenge, tonic_boot_epoch_response_headers, verify_ns_scanner_capability,
-    verify_rpc_signature, verify_tonic_boot_epoch_response, verify_tonic_canonical_body_digest,
-    verify_tonic_mutation_body_digest, verify_tonic_rpc_response_proof, verify_tonic_rpc_signature,
-    verify_tonic_rpc_signature_with_bootstrap,
+    TONIC_RPC_PREFIX, build_auth_headers, gen_signature_headers, gen_tonic_signature_headers, normalize_tonic_rpc_audience,
+    set_tonic_canonical_body_digest, set_tonic_mutation_body_digest, sign_ns_scanner_capability, sign_tonic_rpc_response_proof,
+    verify_ns_scanner_capability, verify_rpc_signature, verify_tonic_canonical_body_digest, verify_tonic_mutation_body_digest,
+    verify_tonic_rpc_response_proof, verify_tonic_rpc_signature,
 };
 #[cfg(test)]
 pub(crate) use internode_data_transport::TcpHttpInternodeDataTransport;
 pub use internode_data_transport::build_internode_data_transport_from_env;
 pub(crate) use peer_rest_client::TierConfigReloadOutcome;
 pub use peer_rest_client::{
-    KMS_SIGNAL_SUBSYSTEM, PEER_RESTDRY_RUN, PEER_RESTSIGNAL, PEER_RESTSUB_SYS, PeerRestClient, SERVICE_SIGNAL_REFRESH_CONFIG,
+    PEER_RESTDRY_RUN, PEER_RESTSIGNAL, PEER_RESTSUB_SYS, PeerRestClient, SERVICE_SIGNAL_REFRESH_CONFIG,
    SERVICE_SIGNAL_RELOAD_DYNAMIC, ScannerPeerActivity,
 };
 pub(crate) use peer_s3_client::heal_bucket_local_on_disks;
@@ -13,7 +13,7 @@
 // limitations under the License.

 use crate::cluster::rpc::client::{
-    AuthenticatedChannel, TonicInterceptor, embedded_tonic_status, gen_tonic_signature_interceptor, heal_control_time_out_client,
+    TonicInterceptor, embedded_tonic_status, gen_tonic_signature_interceptor, heal_control_time_out_client,
    is_network_like_status, message_has_network_needle, node_service_time_out_client, tier_mutation_control_time_out_client,
 };
 use crate::cluster::rpc::{set_tonic_canonical_body_digest, set_tonic_mutation_body_digest, verify_tonic_rpc_response_proof};
@@ -45,9 +45,9 @@ use rustfs_protos::proto_gen::node_service::{
    HealControlRequest, LoadBucketMetadataRequest, LoadGroupRequest, LoadPolicyMappingRequest, LoadPolicyRequest,
    LoadRebalanceMetaRequest, LoadServiceAccountRequest, LoadTransitionTierConfigRequest, LoadUserRequest,
    LocalStorageInfoRequest, Mss, ReloadPoolMetaRequest, ReloadSiteReplicationConfigRequest, ScannerActivityRequest,
-    ScannerActivityResponse, ServerInfoRequest, SignalServiceRequest, SignalServiceResponse, StartDecommissionRequest,
-    StartProfilingRequest, StopRebalanceRequest, TierMutationAbortRequest, TierMutationCommitRequest,
-    TierMutationControlResponse, TierMutationPeerState, TierMutationPrepareRequest, node_service_client::NodeServiceClient,
+    ScannerActivityResponse, ServerInfoRequest, SignalServiceRequest, StartDecommissionRequest, StartProfilingRequest,
+    StopRebalanceRequest, TierMutationAbortRequest, TierMutationCommitRequest, TierMutationControlResponse,
+    TierMutationPeerState, TierMutationPrepareRequest, node_service_client::NodeServiceClient,
    tier_mutation_control_service_client::TierMutationControlServiceClient,
 };
 pub use rustfs_protos::{PEER_RESTDRY_RUN, PEER_RESTSIGNAL, PEER_RESTSUB_SYS};
@@ -58,7 +58,7 @@ use std::{
    collections::HashMap,
    io::Cursor,
    sync::{
-        Arc, Weak,
+        Arc,
        atomic::{AtomicBool, Ordering},
    },
    time::SystemTime,
@@ -66,17 +66,12 @@ use std::{
 use tokio::{net::TcpStream, time::Duration};
 use tonic::Request;
 use tonic::service::interceptor::InterceptedService;
+use tonic::transport::Channel;
 use tracing::{debug, info, warn};
 use uuid::Uuid;

 pub const SERVICE_SIGNAL_REFRESH_CONFIG: u64 = 1;
 pub const SERVICE_SIGNAL_RELOAD_DYNAMIC: u64 = 2;
-/// Dynamic config subsystem for the cluster-persisted KMS configuration.
-///
-/// KMS configuration lives in its own cluster object rather than in the server
-/// config document, so it is not a `ServerConfig` subsystem; it only shares the
-/// reload signal transport.
-pub const KMS_SIGNAL_SUBSYSTEM: &str = "kms";
 const BACKGROUND_HEAL_STATUS_MAX_MESSAGE_SIZE: usize = 64 * 1024;
 const HEAL_CONTROL_FINGERPRINT_MAX_SIZE: usize = 256;
 const HEAL_CONTROL_PAYLOAD_MAX_SIZE: usize = 64 * 1024;
@@ -105,13 +100,8 @@ fn decode_bucket_stats_response(response: GetBucketStatsDataResponse) -> Result<
 }

 fn validate_signal_service_protocol(sig: u64, sub_sys: &str, protocol_version: u32) -> Result<()> {
-    // The version stays pinned to DYNAMIC_CONFIG_PROTOCOL_VERSION rather than
-    // being bumped per subsystem: the comparison is shared, so raising it would
-    // retire peers that already converge scanner and heal config correctly.
-    // Subsystems added after a peer was built are rejected by that peer's own
-    // subsystem allow-list, which surfaces as an explicit failed signal.
    if sig == SERVICE_SIGNAL_RELOAD_DYNAMIC
-        && matches!(sub_sys, SCANNER_SUB_SYS | HEAL_SUB_SYS | KMS_SIGNAL_SUBSYSTEM)
+        && matches!(sub_sys, SCANNER_SUB_SYS | HEAL_SUB_SYS)
        && protocol_version < rustfs_protos::DYNAMIC_CONFIG_PROTOCOL_VERSION
    {
        return Err(Error::other(format!("peer does not support dynamic {sub_sys} config convergence")));
@@ -232,21 +222,6 @@ fn validate_heal_control_response_proof(canonical_response: &[u8], proof: &[u8])
        .map_err(|_| Error::other("peer returned an invalid heal control response proof"))
 }

-fn decode_remote_version_state_capability(expected_member: &str, result: &[u8]) -> Result<Uuid> {
-    let (topology_member, process_epoch) = rustfs_protos::decode_remote_version_state_capability(result).map_err(Error::other)?;
-    if topology_member != expected_member {
-        return Err(Error::other(
-            "peer returned a remote version state capability for a different topology member",
-        ));
-    }
-    let server_epoch =
-        Uuid::from_slice(process_epoch).map_err(|_| Error::other("peer returned an invalid remote version state epoch"))?;
-    if server_epoch.is_nil() {
-        return Err(Error::other("peer returned a nil remote version state epoch"));
-    }
-    Ok(server_epoch)
-}
-
 #[derive(Clone, Debug)]
 pub struct PeerLiveEventsBatch {
    pub events: Vec<u8>,
@@ -258,7 +233,6 @@ pub struct PeerLiveEventsBatch {
 pub struct PeerRestClient {
    pub host: XHost,
    pub grid_host: String,
-    topology_member: String,
    offline: Arc<AtomicBool>,
    recovery_running: Arc<AtomicBool>,
 }
@@ -351,54 +325,14 @@ impl PeerRestClient {
    }

    pub fn new(host: XHost, grid_host: String) -> Self {
-        let topology_member = host.to_string();
        Self {
            host,
            grid_host,
-            topology_member,
            offline: Arc::new(AtomicBool::new(false)),
            recovery_running: Arc::new(AtomicBool::new(false)),
        }
    }

-    fn parse_topology_host(peer_host_port: &str, grid_host: &str) -> Result<XHost> {
-        let url = url::Url::parse(grid_host).map_err(|_| Error::other("peer grid host is not a valid URL"))?;
-        if !matches!(url.scheme(), "http" | "https")
-            || !url.username().is_empty()
-            || url.password().is_some()
-            || url.query().is_some()
-            || url.fragment().is_some()
-            || url.path() != "/"
-        {
-            return Err(Error::other("peer grid host has an invalid URL shape"));
-        }
-        let url_host = url.host().ok_or_else(|| Error::other("peer grid host is missing a host"))?;
-        let topology_host = match url.port() {
-            Some(port) => format!("{url_host}:{port}"),
-            None => url_host.to_string(),
-        };
-        let explicit_port = url.port();
-        let name = match url_host {
-            url::Host::Domain(domain) => domain.to_string(),
-            url::Host::Ipv4(address) => address.to_string(),
-            url::Host::Ipv6(address) if explicit_port.is_none() => format!("[{address}]"),
-            url::Host::Ipv6(address) => address.to_string(),
-        };
-        let port = url
-            .port_or_known_default()
-            .filter(|port| *port > 0)
-            .ok_or_else(|| Error::other("peer grid host is missing a valid port"))?;
-        let host = XHost {
-            name,
-            port,
-            is_port_set: explicit_port.is_some(),
-        };
-        if topology_host != peer_host_port {
-            return Err(Error::other("peer topology host does not match its grid URL"));
-        }
-        Ok(host)
-    }
-
    fn build_clients_from_slots(
        slots: Vec<(String, Option<String>, bool)>,
    ) -> (Vec<Option<Self>>, Vec<Option<Self>>, Vec<String>) {
@@ -412,14 +346,10 @@ impl PeerRestClient {
            }

            let client = match grid_host {
-                Some(grid_host) => match Self::parse_topology_host(&peer_host_port, &grid_host) {
-                    Ok(host) => {
-                        let mut client = PeerRestClient::new(host, grid_host);
-                        client.topology_member = peer_host_port.clone();
-                        Some(client)
-                    }
+                Some(grid_host) => match XHost::try_from(peer_host_port.clone()) {
+                    Ok(host) => Some(PeerRestClient::new(host, grid_host)),
                    Err(err) => {
-                        warn!(peer = %peer_host_port, "peer topology host parse failed while constructing peer client: {err:?}");
+                        warn!(peer = %peer_host_port, "Xhost parse failed while constructing peer client: {err:?}");
                        None
                    }
                },
@@ -460,7 +390,7 @@ impl PeerRestClient {
        (remote, all, remote_topology_hosts)
    }

-    pub async fn get_client(&self) -> Result<NodeServiceClient<InterceptedService<AuthenticatedChannel, TonicInterceptor>>> {
+    pub async fn get_client(&self) -> Result<NodeServiceClient<InterceptedService<Channel, TonicInterceptor>>> {
        if self.offline.load(Ordering::Acquire) {
            self.mark_offline_and_spawn_recovery();
            return Err(Error::other(format!("peer {} is temporarily offline", self.grid_host)));
@@ -481,7 +411,7 @@ impl PeerRestClient {
        &self,
    ) -> Result<
        rustfs_protos::proto_gen::node_service::heal_control_service_client::HealControlServiceClient<
-            InterceptedService<AuthenticatedChannel, TonicInterceptor>,
+            InterceptedService<Channel, TonicInterceptor>,
        >,
    > {
        if self.offline.load(Ordering::Acquire) {
@@ -502,7 +432,7 @@ impl PeerRestClient {

    async fn get_tier_mutation_control_client(
        &self,
-    ) -> Result<TierMutationControlServiceClient<InterceptedService<AuthenticatedChannel, TonicInterceptor>>> {
+    ) -> Result<TierMutationControlServiceClient<InterceptedService<Channel, TonicInterceptor>>> {
        if self.offline.load(Ordering::Acquire) {
            self.mark_offline_and_spawn_recovery();
            return Err(Error::other(format!("peer {} is temporarily offline", self.grid_host)));
@@ -568,8 +498,9 @@ impl PeerRestClient {
        }

        let grid_host = self.grid_host.clone();
-        let offline = Arc::downgrade(&self.offline);
-        let recovery_running = Arc::downgrade(&self.recovery_running);
+        let offline = Arc::clone(&self.offline);
+        let recovery_running = Arc::clone(&self.recovery_running);
+        let span = Self::recovery_monitor_span(&grid_host);
        // The offline flag and its recovery are the silent half of
        // rustfs/backlog#888: log the monitor's start and its success so an
        // "offline then back" episode leaves a trace on the observing node.
@@ -578,34 +509,13 @@ impl PeerRestClient {
            grid_host = %self.grid_host,
            "peer RPC connection marked offline after a network-like failure; starting background recovery monitor"
        );
-        drop(Self::spawn_recovery_monitor(grid_host, offline, recovery_running));
-    }
-
-    fn spawn_recovery_monitor(
-        grid_host: String,
-        offline: Weak<AtomicBool>,
-        recovery_running: Weak<AtomicBool>,
-    ) -> tokio::task::JoinHandle<()> {
-        let span = Self::recovery_monitor_span(&grid_host);
        super::spawn_background_monitor(span, async move {
            let mut delay = get_drive_active_check_interval();
            let connect_timeout = get_drive_active_check_timeout();

            for attempt in 1..=PEER_REST_RECOVERY_MAX_ATTEMPTS {
-                if offline.strong_count() == 0 || recovery_running.strong_count() == 0 {
-                    return;
-                }
                tokio::time::sleep(delay).await;
-                if offline.strong_count() == 0 || recovery_running.strong_count() == 0 {
-                    return;
-                }
                if Self::perform_connectivity_check(&grid_host, connect_timeout).await.is_ok() {
-                    let Some(offline) = offline.upgrade() else {
-                        return;
-                    };
-                    let Some(recovery_running) = recovery_running.upgrade() else {
-                        return;
-                    };
                    offline.store(false, Ordering::Release);
                    recovery_running.store(false, Ordering::Release);
                    info!(
@@ -625,10 +535,8 @@ impl PeerRestClient {
                attempts = PEER_REST_RECOVERY_MAX_ATTEMPTS,
                "peer recovery monitor reached max attempts; will retry on next request"
            );
-            if let Some(recovery_running) = recovery_running.upgrade() {
-                recovery_running.store(false, Ordering::Release);
-            }
-        })
+            recovery_running.store(false, Ordering::Release);
+        });
    }

    #[cfg(test)]
@@ -1246,15 +1154,6 @@ impl PeerRestClient {
        validate_heal_control_capability_proof(&canonical_ack, &proof)
    }

-    pub async fn probe_remote_version_state(&self, topology_fingerprint: String) -> Result<(String, Uuid)> {
-        let probe = rustfs_protos::remote_version_state_capability_probe(Uuid::new_v4().as_bytes());
-        let result = self
-            .heal_control(rustfs_protos::HEAL_CONTROL_PROTOCOL_VERSION, topology_fingerprint, probe)
-            .await?;
-        let epoch = decode_remote_version_state_capability(&self.topology_member, &result)?;
-        Ok((self.topology_member.clone(), epoch))
-    }
-
    pub async fn load_bucket_metadata(&self, bucket: &str, scanner_maintenance_change: bool) -> Result<()> {
        self.finalize_result(
            async {
@@ -1511,22 +1410,6 @@ impl PeerRestClient {
    }

    pub async fn signal_service(&self, sig: u64, sub_sys: &str, dry_run: bool, _exec_at: SystemTime) -> Result<()> {
-        self.signal_service_checked(sig, sub_sys, dry_run).await.map(|_| ())
-    }
-
-    /// Report the KMS configuration fingerprint the peer is currently running.
-    ///
-    /// Sent as a dry-run reload signal so the peer answers without swapping its
-    /// own configuration. `None` means the peer has no KMS configuration. The
-    /// fingerprint is advisory and feeds cluster status reporting only, so the
-    /// response is not proof-signed.
-    pub async fn kms_config_fingerprint(&self) -> Result<Option<String>> {
-        self.signal_service_checked(SERVICE_SIGNAL_RELOAD_DYNAMIC, KMS_SIGNAL_SUBSYSTEM, true)
-            .await
-            .map(|response| response.config_fingerprint)
-    }
-
-    async fn signal_service_checked(&self, sig: u64, sub_sys: &str, dry_run: bool) -> Result<SignalServiceResponse> {
        self.finalize_result(
            async {
                let mut client = self.get_client().await?;
@@ -1547,7 +1430,7 @@ impl PeerRestClient {
                    return Err(Error::other(""));
                }
                validate_signal_service_protocol(sig, sub_sys, response.protocol_version)?;
-                Ok(response)
+                Ok(())
            }
            .await,
        )
@@ -1894,13 +1777,9 @@ fn tier_config_reload_status_outcome(status: tonic::Status) -> TierConfigReloadO
 mod tests {
    use super::*;
    use crate::config::com::STORAGE_CLASS_SUB_SYS;
-    use crate::layout::{disks_layout::DisksLayout, endpoints::SetupType};
-    use rustfs_config::{ENV_KUBERNETES_SERVICE_HOST, ENV_LOCAL_ENDPOINT_HOST, ENV_STARTUP_TOPOLOGY_WAIT_MODE};
    use serde_json::Value;
-    use serial_test::serial;
    use std::io::{self, Write};
    use std::sync::{Arc, Mutex};
-    use temp_env::async_with_vars;
    use tracing_subscriber::{Registry, fmt::MakeWriter, layer::SubscriberExt};

    #[test]
@@ -2018,115 +1897,30 @@ mod tests {
    fn build_clients_from_slots_preserves_missing_remote_topology_slots() {
        let slots = vec![
            ("127.0.0.1:9000".to_string(), None, true),
-            (
-                "rustfs-1.invalid:9001".to_string(),
-                Some("http://rustfs-1.invalid:9001".to_string()),
-                false,
-            ),
-            ("rustfs-2.invalid".to_string(), Some("http://rustfs-2.invalid".to_string()), false),
+            ("127.0.0.1:9001".to_string(), Some("http://127.0.0.1:9001".to_string()), false),
            ("127.0.0.1:notaport".to_string(), Some("http://127.0.0.1:notaport".to_string()), false),
            ("127.0.0.1:9003".to_string(), None, false),
        ];

        let (remote, all, remote_topology_hosts) = PeerRestClient::build_clients_from_slots(slots);

-        assert_eq!(remote.len(), 4, "local node is excluded but remote slots are not compacted away");
-        assert_eq!(all.len(), 5, "all slots preserve the sorted cluster topology shape");
+        assert_eq!(remote.len(), 3, "local node is excluded but remote slots are not compacted away");
+        assert_eq!(all.len(), 4, "all slots preserve the sorted cluster topology shape");
        assert_eq!(
            remote_topology_hosts,
            vec![
-                "rustfs-1.invalid:9001".to_string(),
-                "rustfs-2.invalid".to_string(),
+                "127.0.0.1:9001".to_string(),
                "127.0.0.1:notaport".to_string(),
                "127.0.0.1:9003".to_string()
            ]
        );
-        let unresolved = remote[0]
-            .as_ref()
-            .expect("temporarily unresolved remote peer should retain a client");
-        assert_eq!(unresolved.host.to_string(), "rustfs-1.invalid:9001");
-        let default_port = remote[1]
-            .as_ref()
-            .expect("temporarily unresolved scheme-default remote peer should retain a client");
-        assert_eq!(default_port.host.to_string(), "rustfs-2.invalid");
-        assert_eq!(default_port.host.port, 80);
-        assert!(!default_port.host.is_port_set);
-        assert!(remote[2].is_none(), "unparseable remote peer should remain observable as a missing slot");
-        assert!(remote[3].is_none(), "missing grid host should remain observable as a missing slot");
+        assert!(remote[0].is_some(), "valid remote peer should get a client");
+        assert!(remote[1].is_none(), "unparseable remote peer should remain observable as a missing slot");
+        assert!(remote[2].is_none(), "missing grid host should remain observable as a missing slot");
        assert!(all[0].is_none(), "local node is represented by the local server_info row");
        assert!(all[1].is_some());
-        assert!(all[2].is_some());
+        assert!(all[2].is_none());
        assert!(all[3].is_none());
-        assert!(all[4].is_none());
-    }
-
-    #[test]
-    fn topology_host_parser_preserves_names_and_bracketed_ipv6() {
-        let domain = PeerRestClient::parse_topology_host("rustfs-1.invalid", "https://rustfs-1.invalid")
-            .expect("unresolved HTTPS topology host should parse without DNS");
-        assert_eq!(domain.to_string(), "rustfs-1.invalid");
-        assert_eq!(domain.port, 443);
-        assert!(!domain.is_port_set);
-
-        let ipv6 = PeerRestClient::parse_topology_host("[2001:db8::1]:9000", "http://[2001:db8::1]:9000")
-            .expect("bracketed IPv6 topology host should parse without changing its identity");
-        assert_eq!(ipv6.to_string(), "[2001:db8::1]:9000");
-
-        let default_port_ipv6 = PeerRestClient::parse_topology_host("[2001:db8::2]", "http://[2001:db8::2]")
-            .expect("scheme-default IPv6 topology host should parse without DNS");
-        assert_eq!(default_port_ipv6.to_string(), "[2001:db8::2]");
-        assert_eq!(default_port_ipv6.port, 80);
-        assert!(!default_port_ipv6.is_port_set);
-
-        assert!(PeerRestClient::parse_topology_host("peer.invalid:0", "http://peer.invalid:0").is_err());
-        assert!(PeerRestClient::parse_topology_host("peer-a.invalid:9000", "http://peer-b.invalid:9000").is_err());
-        assert!(PeerRestClient::parse_topology_host("peer.invalid:9000", "http://peer.invalid:9000/unexpected").is_err());
-    }
-
-    #[tokio::test]
-    #[serial]
-    async fn unresolved_default_port_endpoint_topology_retains_all_peer_clients() {
-        let volumes = (0..4)
-            .map(|index| format!("http://rustfs-{index}.invalid:80/data{index}"))
-            .collect::<Vec<_>>();
-        let layout = DisksLayout::from_volumes(&volumes).expect("distributed default-port topology should parse");
-
-        async_with_vars(
-            [
-                (ENV_STARTUP_TOPOLOGY_WAIT_MODE, Some("orchestrated")),
-                (ENV_LOCAL_ENDPOINT_HOST, Some("rustfs-0.invalid")),
-                (ENV_KUBERNETES_SERVICE_HOST, None),
-            ],
-            async {
-                let (server_pools, setup_type) = EndpointServerPools::create_server_endpoints("0.0.0.0:80", &layout)
-                    .await
-                    .expect("explicit local identity should avoid peer DNS during endpoint construction");
-                assert_eq!(setup_type, SetupType::DistErasure);
-
-                let (remote, all, remote_topology_hosts) =
-                    PeerRestClient::build_clients_from_slots(server_pools.peer_grid_host_slots_sorted());
-                assert_eq!(remote.len(), 3);
-                assert!(
-                    remote.iter().all(Option::is_some),
-                    "unresolved remote peers must retain reconnectable clients"
-                );
-                assert_eq!(all.len(), 4);
-                assert_eq!(all.iter().filter(|client| client.is_none()).count(), 1);
-                assert_eq!(remote_topology_hosts.len(), 3);
-                assert!(
-                    remote_topology_hosts.iter().all(|host| !host.contains(':')),
-                    "scheme-default ports must preserve the legacy topology identity"
-                );
-                assert!(
-                    remote
-                        .iter()
-                        .flatten()
-                        .all(|client| client.host.port == 80 && !client.host.is_port_set),
-                    "scheme-default peers must retain the effective dial port"
-                );
-            },
-        )
-        .await;
    }

    #[test]
@@ -2374,19 +2168,6 @@ mod tests {
            .expect("full refresh compatibility is guarded by its scanner preflight");
    }

-    #[test]
-    fn dynamic_kms_config_requires_versioned_peer_acknowledgement() {
-        let err = validate_signal_service_protocol(SERVICE_SIGNAL_RELOAD_DYNAMIC, KMS_SIGNAL_SUBSYSTEM, 0)
-            .expect_err("an unversioned peer must not claim KMS config convergence");
-        assert!(err.to_string().contains("does not support dynamic"));
-        validate_signal_service_protocol(
-            SERVICE_SIGNAL_RELOAD_DYNAMIC,
-            KMS_SIGNAL_SUBSYSTEM,
-            rustfs_protos::DYNAMIC_CONFIG_PROTOCOL_VERSION,
-        )
-        .expect("a current peer should support dynamic KMS config");
-    }
-
    #[test]
    fn peer_rest_client_marks_network_like_errors() {
        assert!(PeerRestClient::is_network_like_error(&Error::other("transport error")));
@@ -2689,22 +2470,6 @@ mod tests {
        }
    }

-    #[test]
-    fn remote_version_state_capability_decoder_fails_closed() {
-        let epoch = Uuid::new_v4();
-        let result = rustfs_protos::encode_remote_version_state_capability("node-a:9000", epoch.as_bytes())
-            .expect("small capability response should encode");
-        assert_eq!(
-            decode_remote_version_state_capability("node-a:9000", &result).expect("valid epoch should decode"),
-            epoch
-        );
-        assert!(decode_remote_version_state_capability("node-b:9000", &result).is_err());
-        assert!(decode_remote_version_state_capability("node-a:9000", &result[..result.len() - 1]).is_err());
-        let nil = rustfs_protos::encode_remote_version_state_capability("node-a:9000", Uuid::nil().as_bytes())
-            .expect("small capability response should encode");
-        assert!(decode_remote_version_state_capability("node-a:9000", &nil).is_err());
-    }
-
    struct TierMutationResponseFixture<'a> {
        version: u32,
        phase: TierMutationRpcPhase,
@@ -2929,31 +2694,6 @@ mod tests {
        assert!(!client.offline.load(Ordering::Acquire));
    }

-    #[tokio::test(start_paused = true)]
-    async fn dropped_peer_client_releases_and_stops_its_recovery_monitor() {
-        let client = test_peer_client();
-        client.offline.store(true, Ordering::Release);
-        client.recovery_running.store(true, Ordering::Release);
-        let offline = Arc::downgrade(&client.offline);
-        let recovery_running = Arc::downgrade(&client.recovery_running);
-        let handle = PeerRestClient::spawn_recovery_monitor(client.grid_host.clone(), offline.clone(), recovery_running.clone());
-        let started = tokio::time::Instant::now();
-
-        drop(client);
-
-        assert!(offline.upgrade().is_none(), "detached recovery must not retain offline state");
-        assert!(
-            recovery_running.upgrade().is_none(),
-            "detached recovery must not retain its running state"
-        );
-        handle.await.expect("recovery monitor should not panic");
-        assert_eq!(
-            tokio::time::Instant::now(),
-            started,
-            "recovery monitor should stop before advancing to its first delayed probe"
-        );
-    }
-
    #[tokio::test]
    async fn peer_rest_client_finalize_result_keeps_online_for_app_errors_mentioning_unavailable() {
        // Regression: application error text containing "unavailable" (a
@@ -3001,11 +2741,6 @@ mod tests {
                .with_span_list(true),
        );
        let _guard = tracing::subscriber::set_default(subscriber);
-        // The `recovery-monitor` callsite is shared with the production
-        // `mark_offline_and_spawn_recovery` path that sibling tests exercise from
-        // subscriber-less threads; without this the span can be cached as
-        // `Interest::never()` and silently degrade to `Span::none()`.
-        let _callsite_pin = crate::test_tracing::pin_callsite_interest_for_test();

        let client = test_peer_client();
        let span = tracing::info_span!("request-span", request_id = "req-peer-rest");
@@ -14,8 +14,7 @@

 use crate::bucket::metadata_sys;
 use crate::cluster::rpc::client::{
-    AuthenticatedChannel, TonicInterceptor, gen_tonic_signature_interceptor, is_network_like_disk_error,
-    node_service_time_out_client,
+    TonicInterceptor, gen_tonic_signature_interceptor, is_network_like_disk_error, node_service_time_out_client,
 };
 use crate::cluster::rpc::set_tonic_mutation_body_digest;
 use crate::disk::error::DiskError;
@@ -41,84 +40,16 @@ use rustfs_protos::proto_gen::node_service::node_service_client::NodeServiceClie
 use rustfs_protos::proto_gen::node_service::{
    DeleteBucketRequest, GetBucketInfoRequest, HealBucketRequest, ListBucketRequest, MakeBucketRequest,
 };
-#[cfg(test)]
-use std::sync::{
-    Mutex as StdMutex,
-    atomic::{AtomicBool, Ordering},
-};
 use std::{collections::HashMap, fmt::Debug, sync::Arc, time::Duration};
-#[cfg(test)]
-use tokio::sync::Notify;
 use tokio::{net::TcpStream, sync::RwLock, time};
 use tokio_util::sync::CancellationToken;
 use tonic::Request;
 use tonic::service::interceptor::InterceptedService;
+use tonic::transport::Channel;
 use tracing::{debug, info, warn};

 type Client = Arc<Box<dyn PeerS3Client>>;

-#[cfg(test)]
-#[derive(Default)]
-pub(crate) struct DeleteBucketEmptyScanBarrier {
-    arrived: AtomicBool,
-    arrived_notify: Notify,
-    released: AtomicBool,
-    release_notify: Notify,
-}
-
-#[cfg(test)]
-impl DeleteBucketEmptyScanBarrier {
-    pub(crate) async fn wait_until_paused(&self) {
-        loop {
-            let notified = self.arrived_notify.notified();
-            if self.arrived.load(Ordering::Acquire) {
-                return;
-            }
-            notified.await;
-        }
-    }
-
-    pub(crate) fn release(&self) {
-        self.released.store(true, Ordering::Release);
-        self.release_notify.notify_waiters();
-    }
-
-    async fn pause(&self) {
-        self.arrived.store(true, Ordering::Release);
-        self.arrived_notify.notify_waiters();
-        loop {
-            let notified = self.release_notify.notified();
-            if self.released.load(Ordering::Acquire) {
-                return;
-            }
-            notified.await;
-        }
-    }
-}
-
-#[cfg(test)]
-static DELETE_BUCKET_EMPTY_SCAN_BARRIER: StdMutex<Option<Arc<DeleteBucketEmptyScanBarrier>>> = StdMutex::new(None);
-
-#[cfg(test)]
-pub(crate) fn install_delete_bucket_empty_scan_barrier() -> Arc<DeleteBucketEmptyScanBarrier> {
-    let barrier = Arc::new(DeleteBucketEmptyScanBarrier::default());
-    *DELETE_BUCKET_EMPTY_SCAN_BARRIER
-        .lock()
-        .expect("empty scan barrier lock should not be poisoned") = Some(barrier.clone());
-    barrier
-}
-
-#[cfg(test)]
-async fn pause_after_delete_bucket_empty_scan() {
-    let barrier = DELETE_BUCKET_EMPTY_SCAN_BARRIER
-        .lock()
-        .expect("empty scan barrier lock should not be poisoned")
-        .take();
-    if let Some(barrier) = barrier {
-        barrier.pause().await;
-    }
-}
-
 #[derive(Clone, Debug)]
 pub struct ScannerBucketListing {
    pub buckets: Vec<BucketInfo>,
@@ -719,22 +650,24 @@ impl PeerS3Client for LocalPeerS3Client {
            return Err(Error::ErasureWriteQuorum);
        }

-        if opts.force_if_empty && !opts.force {
+        let force = if opts.force_if_empty && !opts.force {
            for disk in local_disks.iter() {
                if has_xlmeta_files(&disk.path().join(bucket)).await.map_err(Error::Io)? {
                    return Err(Error::VolumeNotEmpty);
                }
            }
-            #[cfg(test)]
-            pause_after_delete_bucket_empty_scan().await;
-        }
+            true
+        } else {
+            opts.force
+        };

        let mut futures = Vec::with_capacity(local_disks.len());

        for disk in local_disks.iter() {
-            // `force_if_empty` is validation-only. Passing it as force would let
-            // a PutObject committed after the scan be removed recursively.
-            futures.push(disk.delete_volume(bucket, opts.force));
+            // Non-force delete refuses a non-empty bucket (VolumeNotEmpty), which
+            // the recreate loop below turns into BucketNotEmpty; only an explicit
+            // force delete removes recursively (backlog#799 B1).
+            futures.push(disk.delete_volume(bucket, force));
        }

        let results = join_all(futures).await;
@@ -797,15 +730,6 @@ pub struct RemotePeerS3Client {
 }

 impl RemotePeerS3Client {
-    fn encode_delete_bucket_options(opts: &DeleteBucketOptions) -> Result<String> {
-        let mut remote_opts = opts.clone();
-        // Older peers promote `force_if_empty` to recursive force after their
-        // metadata scan. Keep this coordinator-only hint off the wire so a
-        // mixed-version delete fails closed on non-empty directory remnants.
-        remote_opts.force_if_empty = false;
-        serde_json::to_string(&remote_opts).map_err(Into::into)
-    }
-
    fn recovery_monitor_span(addr: &str) -> tracing::Span {
        tracing::info_span!(
            "recovery-monitor",
@@ -832,7 +756,7 @@ impl RemotePeerS3Client {
        client
    }

-    pub async fn get_client(&self) -> Result<NodeServiceClient<InterceptedService<AuthenticatedChannel, TonicInterceptor>>> {
+    pub async fn get_client(&self) -> Result<NodeServiceClient<InterceptedService<Channel, TonicInterceptor>>> {
        node_service_time_out_client(&self.addr, TonicInterceptor::Signature(gen_tonic_signature_interceptor()))
            .await
            .map_err(|err| Error::other(format!("can not get client, err: {err}")))
@@ -1116,7 +1040,7 @@ impl PeerS3Client for RemotePeerS3Client {
    async fn delete_bucket(&self, bucket: &str, opts: &DeleteBucketOptions) -> Result<()> {
        self.execute_with_timeout(
            || async {
-                let options = Self::encode_delete_bucket_options(opts)?;
+                let options = serde_json::to_string(opts)?;
                let mut client = self.get_client().await?;

                let mut request = Request::new(DeleteBucketRequest {
@@ -1490,49 +1414,6 @@ mod tests {
        }
    }

-    #[test]
-    fn remote_delete_bucket_options_fail_closed_for_legacy_peers() {
-        let encoded = RemotePeerS3Client::encode_delete_bucket_options(&DeleteBucketOptions {
-            no_lock: true,
-            no_recreate: true,
-            force_if_empty: true,
-            ..Default::default()
-        })
-        .expect("remote delete options should serialize");
-        let legacy_opts: DeleteBucketOptions =
-            serde_json::from_str(&encoded).expect("legacy peer should decode remote delete options");
-
-        assert!(legacy_opts.no_lock);
-        assert!(legacy_opts.no_recreate);
-        assert!(!legacy_opts.force);
-        assert!(!legacy_opts.force_if_empty);
-
-        let legacy_recursive_force = if legacy_opts.force_if_empty && !legacy_opts.force {
-            true
-        } else {
-            legacy_opts.force
-        };
-        assert!(
-            !legacy_recursive_force,
-            "legacy peer must not upgrade empty-only delete to recursive force"
-        );
-    }
-
-    #[test]
-    fn remote_delete_bucket_options_preserve_explicit_force() {
-        let encoded = RemotePeerS3Client::encode_delete_bucket_options(&DeleteBucketOptions {
-            force: true,
-            force_if_empty: true,
-            ..Default::default()
-        })
-        .expect("remote force-delete options should serialize");
-        let remote_opts: DeleteBucketOptions =
-            serde_json::from_str(&encoded).expect("remote peer should decode force-delete options");
-
-        assert!(remote_opts.force);
-        assert!(!remote_opts.force_if_empty);
-    }
-
    #[tokio::test]
    async fn test_execute_with_timeout_marks_remote_peer_faulty_on_network_like_error() {
        let client = test_remote_peer("http://peer-network-error:9000");
@@ -1690,54 +1571,6 @@ mod tests {
        reset_local_disk_test_state().await;
    }

-    #[tokio::test]
-    #[serial]
-    async fn local_peer_force_if_empty_preserves_unclassified_file_in_selected_pool() {
-        reset_local_disk_test_state().await;
-
-        let temp_dir = TempDir::new().expect("create temp dir for empty-only delete regression");
-        let disks = init_test_local_disks_for_pools(
-            &temp_dir,
-            &[(0, 1), (1, 1)],
-            "local-peer-force-if-empty-preserves-unclassified-file",
-        )
-        .await;
-        let bucket = "empty-only-delete-bucket";
-        let marker = "object/commit-marker";
-        let data = bytes::Bytes::from_static(b"committed object data");
-
-        disks[1]
-            .make_volume(bucket)
-            .await
-            .expect("bucket should be created in the selected pool");
-        disks[1]
-            .write_all(bucket, marker, data.clone())
-            .await
-            .expect("unclassified committed file should be written");
-
-        let err = LocalPeerS3Client::new_with_local_disks(None, Some(vec![1]), disks.clone())
-            .delete_bucket(
-                bucket,
-                &DeleteBucketOptions {
-                    force_if_empty: true,
-                    ..Default::default()
-                },
-            )
-            .await
-            .expect_err("empty-only delete must not recursively remove an unclassified file");
-
-        assert_eq!(err, Error::VolumeNotEmpty);
-        assert_eq!(
-            disks[1]
-                .read_all(bucket, marker)
-                .await
-                .expect("unclassified committed file should be preserved"),
-            data
-        );
-
-        reset_local_disk_test_state().await;
-    }
-
    #[tokio::test]
    #[serial]
    async fn heal_bucket_local_recreates_missing_bucket_volumes() {
@@ -13,8 +13,8 @@
 // limitations under the License.

 use crate::cluster::rpc::client::{
-    AuthenticatedChannel, TonicInterceptor, gen_tonic_signature_interceptor, is_network_like_disk_error,
-    node_service_time_out_client, node_service_time_out_client_for_class, node_service_time_out_client_no_auth,
+    TonicInterceptor, gen_tonic_signature_interceptor, is_network_like_disk_error, node_service_time_out_client,
+    node_service_time_out_client_for_class, node_service_time_out_client_no_auth,
 };
 use crate::cluster::rpc::http_auth::set_tonic_canonical_body_digest;
 use crate::cluster::rpc::internode_data_transport::{
@@ -71,7 +71,7 @@ use tokio::{
    time::timeout,
 };
 use tokio_util::sync::CancellationToken;
-use tonic::{Code, Request, service::interceptor::InterceptedService};
+use tonic::{Code, Request, service::interceptor::InterceptedService, transport::Channel};
 use tracing::{debug, trace, warn};
 use uuid::Uuid;

@@ -1083,7 +1083,7 @@ impl RemoteDisk {
        internode_offline_bypass_reason(&self.addr).map(Error::other)
    }

-    async fn get_client(&self) -> Result<NodeServiceClient<InterceptedService<AuthenticatedChannel, TonicInterceptor>>> {
+    async fn get_client(&self) -> Result<NodeServiceClient<InterceptedService<Channel, TonicInterceptor>>> {
        if let Some(err) = self.offline_bypass_error() {
            return Err(err);
        }
@@ -1096,7 +1096,7 @@ impl RemoteDisk {
    /// Routes onto the isolated bulk channel pool so large transfers cannot head-of-line block
    /// lock/health RPCs (grpc-optimization P1). Falls back to the control channel when isolation
    /// is disabled.
-    async fn get_bulk_client(&self) -> Result<NodeServiceClient<InterceptedService<AuthenticatedChannel, TonicInterceptor>>> {
+    async fn get_bulk_client(&self) -> Result<NodeServiceClient<InterceptedService<Channel, TonicInterceptor>>> {
        if let Some(err) = self.offline_bypass_error() {
            return Err(err);
        }
@@ -3005,7 +3005,6 @@ mod tests {
    use crate::cluster::rpc::internode_data_transport::{InternodeDataTransportCapabilities, TcpHttpInternodeDataTransport};
    use crate::runtime::sources as runtime_sources;
    use serde_json::Value;
-    use serial_test::serial;
    use std::io::{self as std_io, Write};
    use std::pin::Pin;
    use std::sync::{Arc, Mutex, Mutex as StdMutex, Once};
@@ -3019,20 +3018,6 @@ mod tests {

    static INIT: Once = Once::new();

-    // `#[serial(internode_metrics)]` marks every test that observes
-    // `global_internode_metrics()`. Those counters are a process-wide singleton:
-    // some of these tests snapshot a counter, run one decode, and assert on the
-    // delta, while others deliberately record decode errors or call
-    // `reset_internode_metrics_for_test()`. Run concurrently in one process they
-    // corrupt each other's deltas — a sibling's error bumps the "no decode error"
-    // assertion off zero, and a sibling's reset can drive an `after > before`
-    // assertion backwards.
-    //
-    // The marker only takes effect under the `cargo test` fallback; nextest
-    // already isolates each test in its own process, so every test there gets its
-    // own copy of the counters (see `docs/testing/README.md`). Any new test that
-    // reads or mutates the global internode metrics belongs in this group.
-
    #[test]
    fn snapshot_lease_response_requires_current_protocol_and_valid_token() {
        let token = SnapshotLeaseToken::new();
@@ -3321,7 +3306,6 @@ mod tests {
    }

    #[test]
-    #[serial(internode_metrics)]
    fn read_multiple_response_decode_prefers_msgpack_payloads() {
        let endpoint = sample_remote_endpoint();
        let msgpack_resp = sample_read_multiple_resp("msgpack", b"binary");
@@ -3344,7 +3328,6 @@ mod tests {
    }

    #[test]
-    #[serial(internode_metrics)]
    fn read_multiple_response_decode_falls_back_to_json_payloads() {
        let endpoint = sample_remote_endpoint();
        let json_resp = sample_read_multiple_resp("json", b"fallback");
@@ -3366,7 +3349,6 @@ mod tests {
    }

    #[test]
-    #[serial(internode_metrics)]
    fn rename_data_response_accepts_legacy_json_without_decode_error() {
        crate::cluster::rpc::runtime_sources::reset_internode_metrics_for_test();
        let response = RenameDataResp {
@@ -3518,7 +3500,6 @@ mod tests {
    }

    #[test]
-    #[serial(internode_metrics)]
    fn read_multiple_response_decode_reports_corrupt_msgpack_item() {
        let endpoint = sample_remote_endpoint();
        let response = ReadMultipleResponse {
@@ -3544,7 +3525,6 @@ mod tests {
    }

    #[test]
-    #[serial(internode_metrics)]
    fn read_multiple_response_decode_reports_corrupt_json_item() {
        let endpoint = sample_remote_endpoint();
        let response = ReadMultipleResponse {
@@ -3585,7 +3565,6 @@ mod tests {
    }

    #[test]
-    #[serial(internode_metrics)]
    fn batch_read_version_response_decode_prefers_msgpack_payloads() {
        let endpoint = sample_remote_endpoint();
        let msgpack_resp = sample_batch_read_version_resp(7, "msgpack-object", true);
@@ -3606,7 +3585,6 @@ mod tests {
    }

    #[test]
-    #[serial(internode_metrics)]
    fn batch_read_version_response_rejects_invalid_success_metadata() {
        let endpoint = sample_remote_endpoint();
        let mut response_item = sample_batch_read_version_resp(0, "invalid-object", true);
@@ -3626,7 +3604,6 @@ mod tests {
    }

    #[test]
-    #[serial(internode_metrics)]
    fn batch_read_version_response_decode_reports_corrupt_msgpack_item() {
        let endpoint = sample_remote_endpoint();
        let response = BatchReadVersionResponse {
@@ -3653,7 +3630,6 @@ mod tests {
    }

    #[test]
-    #[serial(internode_metrics)]
    fn batch_read_version_response_decode_reports_corrupt_json_item() {
        let endpoint = sample_remote_endpoint();
        let response = BatchReadVersionResponse {
@@ -4443,7 +4419,6 @@ mod tests {
    }

    #[tokio::test]
-    #[serial(internode_metrics)]
    async fn test_remote_disk_create_file_retries_once_on_retryable_open_write_error() {
        let transport = RetryingOpenWriteInternodeDataTransport::with_steps(vec![
            OpenWriteTestStep::Error(DiskError::from(rustfs_rio::new_test_internode_http_io_error(
@@ -4482,7 +4457,6 @@ mod tests {
    }

    #[tokio::test]
-    #[serial(internode_metrics)]
    async fn test_remote_disk_read_file_stream_retries_once_on_retryable_open_read_error() {
        // A transient reset-by-peer on a shard read during the read-after-write window must be
        // absorbed by one re-dial rather than eroding read quorum (issue #2761).
@@ -4814,11 +4788,9 @@ mod tests {
    async fn test_remote_disk_endpoints_with_different_schemes() {
        let test_cases = vec![
            ("http://server:9000", "server:9000"),
-            ("http://plain-server:80", "plain-server"),
-            ("http://plain-server", "plain-server"),
-            ("https://secure-server:443", "secure-server"),
+            ("https://secure-server:443", "secure-server"), // Default HTTPS port is omitted
            ("http://192.168.1.100:8080", "192.168.1.100:8080"),
-            ("https://secure-server", "secure-server"),
+            ("https://secure-server", "secure-server"), // No port specified
        ];

        for (url_str, expected_hostname) in test_cases {
@@ -5334,11 +5306,6 @@ mod tests {
                .with_span_list(true),
        );
        let _guard = tracing::subscriber::set_default(subscriber);
-        // The `recovery-monitor` span and the monitor's own log events are
-        // production callsites that sibling tests exercise from subscriber-less
-        // threads; without this they can be cached as `Interest::never()` and go
-        // silently missing here.
-        let _callsite_pin = crate::test_tracing::pin_callsite_interest_for_test();

        let endpoint = Endpoint {
            url: url::Url::parse("http://127.0.0.1:59996/data").expect("endpoint URL should parse"),
@@ -5393,11 +5360,6 @@ mod tests {
                .with_span_list(true),
        );
        let _guard = tracing::subscriber::set_default(subscriber);
-        // The `recovery-monitor` span and the monitor's own log events are
-        // production callsites that sibling tests exercise from subscriber-less
-        // threads; without this they can be cached as `Interest::never()` and go
-        // silently missing here.
-        let _callsite_pin = crate::test_tracing::pin_callsite_interest_for_test();

        let addr = "http://127.0.0.1:59997".to_string();
        let endpoint = Endpoint {
@@ -12,9 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-use crate::cluster::rpc::client::{
-    AuthenticatedChannel, TonicInterceptor, gen_tonic_signature_interceptor, node_service_time_out_client,
-};
+use crate::cluster::rpc::client::{TonicInterceptor, gen_tonic_signature_interceptor, node_service_time_out_client};
 use crate::cluster::rpc::set_tonic_mutation_body_digest;
 use async_trait::async_trait;
 use bytes::Bytes;
@@ -31,6 +29,7 @@ use std::time::Duration;
 use tokio::time::timeout;
 use tonic::Request;
 use tonic::service::interceptor::InterceptedService;
+use tonic::transport::Channel;
 use tracing::{debug, info, warn};

 /// Remote lock client implementation
@@ -79,7 +78,7 @@ impl RemoteClient {
        }
    }

-    pub async fn get_client(&self) -> Result<NodeServiceClient<InterceptedService<AuthenticatedChannel, TonicInterceptor>>> {
+    pub async fn get_client(&self) -> Result<NodeServiceClient<InterceptedService<Channel, TonicInterceptor>>> {
        // P3-2 offline bypass (now covering the lock path too): fast-fail a peer already marked
        // offline instead of paying the connect timeout, so dsync reaches quorum sooner. Does not
        // change quorum; the self-healing re-probe keeps the peer recoverable.
@@ -53,14 +53,12 @@ use std::sync::LazyLock;
 use std::sync::{Arc, RwLock};
 use tokio::sync::{OwnedRwLockWriteGuard, RwLock as AsyncRwLock};
 use tracing::{debug, error, info, instrument, warn};
-use uuid::Uuid;

 pub const CONFIG_PREFIX: &str = "config";
 const SERVER_CONFIG_OBJECT: &str = "config/config.json";
-const CONFIG_TRANSACTION_LOCK_SUFFIX: &str = ".transaction.lock";

-// Server-config lock order: SERVER_CONFIG_LOCK -> transaction lock ->
-// SERVER_CONFIG_OBJECT. Readers and writers must never reverse this order.
+// Server-config lock order: SERVER_CONFIG_LOCK -> distributed namespace lock
+// for SERVER_CONFIG_OBJECT. Readers and writers must never reverse this order.
 static SERVER_CONFIG_LOCK: LazyLock<Arc<AsyncRwLock<()>>> = LazyLock::new(|| Arc::new(AsyncRwLock::new(())));

 fn config_task_join_error(operation: &'static str, error: tokio::task::JoinError) -> Error {
@@ -78,11 +76,8 @@ where
    T: Send + 'static,
 {
    tokio::spawn(async move {
-        // Lock order: SERVER_CONFIG_LOCK -> transaction lock -> object lock.
+        // Lock order: SERVER_CONFIG_LOCK -> namespace write lock.
        let _local_guard = SERVER_CONFIG_LOCK.write().await;
-        let transaction_lock = server_config_transaction_lock_path();
-        let transaction_lock = store.new_ns_lock(RUSTFS_META_BUCKET, &transaction_lock).await?;
-        let _transaction_guard = transaction_lock.get_write_lock(get_lock_acquire_timeout()).await?;
        let namespace_lock = store.new_ns_lock(RUSTFS_META_BUCKET, SERVER_CONFIG_OBJECT).await?;
        let _write_guard = namespace_lock.get_write_lock(get_lock_acquire_timeout()).await?;
        Ok(operation().await)
@@ -101,11 +96,8 @@ where
    T: Send + 'static,
 {
    tokio::spawn(async move {
-        // Lock order: SERVER_CONFIG_LOCK -> transaction lock -> object lock.
+        // Lock order: SERVER_CONFIG_LOCK -> namespace read lock.
        let _local_guard = SERVER_CONFIG_LOCK.read().await;
-        let transaction_lock = server_config_transaction_lock_path();
-        let transaction_lock = store.new_ns_lock(RUSTFS_META_BUCKET, &transaction_lock).await?;
-        let _transaction_guard = transaction_lock.get_read_lock(get_lock_acquire_timeout()).await?;
        let namespace_lock = store.new_ns_lock(RUSTFS_META_BUCKET, SERVER_CONFIG_OBJECT).await?;
        let _read_guard = namespace_lock.get_read_lock(get_lock_acquire_timeout()).await?;
        Ok(operation().await)
@@ -575,21 +567,6 @@ where
 }

 pub async fn save_config_with_opts<S>(api: Arc<S>, file: &str, data: Vec<u8>, opts: &ObjectOptions) -> Result<()>
-where
-    S: ObjectIO<
-            Error = Error,
-            RangeSpec = HTTPRangeSpec,
-            HeaderMap = HeaderMap,
-            ObjectOptions = ObjectOptions,
-            ObjectInfo = ObjectInfo,
-            GetObjectReader = GetObjectReader,
-            PutObjectReader = PutObjReader,
-        >,
-{
-    save_config_with_opts_and_metadata(api, file, data, opts).await.map(|_| ())
-}
-
-async fn save_config_with_opts_and_metadata<S>(api: Arc<S>, file: &str, data: Vec<u8>, opts: &ObjectOptions) -> Result<ObjectInfo>
 where
    S: ObjectIO<
            Error = Error,
@@ -602,13 +579,11 @@ where
        >,
 {
    let mut put_data = PutObjReader::from_vec(data);
-    match api.put_object(RUSTFS_META_BUCKET, file, &mut put_data, opts).await {
-        Ok(object_info) => Ok(object_info),
-        Err(err) => {
-            error!("save_config_with_opts: err: {:?}, file: {}", err, file);
-            Err(err)
-        }
+    if let Err(err) = api.put_object(RUSTFS_META_BUCKET, file, &mut put_data, opts).await {
+        error!("save_config_with_opts: err: {:?}, file: {}", err, file);
+        return Err(err);
    }
+    Ok(())
 }

 fn new_server_config() -> Config {
@@ -619,12 +594,8 @@ async fn new_and_save_server_config<S>(api: Arc<S>) -> Result<Config>
 where
    S: EcstoreObjectIO + StorageAdminApi + NamespaceLocking<Error = Error, NamespaceLock = rustfs_lock::NamespaceLockWrapper>,
 {
-    let snapshot = read_server_config_snapshot(api.clone()).await?;
-    if snapshot.object_exists() {
-        return Ok(snapshot.config.clone());
-    }
    let cfg = new_server_config();
-    save_server_config_snapshot(api, &cfg, &snapshot).await?;
+    save_server_config(api, &cfg).await?;

    Ok(cfg)
 }
@@ -646,10 +617,6 @@ pub fn server_config_path() -> String {
    SERVER_CONFIG_OBJECT.to_string()
 }

-fn server_config_transaction_lock_path() -> String {
-    format!("{}{CONFIG_TRANSACTION_LOCK_SUFFIX}", server_config_path())
-}
-
 fn storage_class_kvs_mut(cfg: &mut Config) -> &mut KVS {
    let sub_cfg = cfg.0.entry(STORAGE_CLASS_SUB_SYS.to_string()).or_insert_with(|| {
        let mut section = HashMap::new();
@@ -852,9 +819,6 @@ fn apply_external_scalar_config_map(
    let Some(config_value) = root.get(descriptor.subsystem_key) else {
        return Ok(false);
    };
-    if descriptor.subsystem_key == HEAL_SUB_SYS && config_value.is_null() {
-        return Ok(false);
-    }
    let overrides = decode_scalar_config_value(config_value, descriptor)?;

    if overrides.is_empty() {
@@ -1499,142 +1463,21 @@ fn build_audit_object(cfg: &Config) -> Map<String, Value> {
    build_target_object(cfg, &audit_target_descriptors())
 }

-fn sync_rendered_target_instance(existing: Value, rendered: Option<&Value>, valid_keys: &[&str]) -> Option<Value> {
-    match existing {
-        Value::Object(mut instance) => {
-            for key in valid_keys {
-                instance.remove(*key);
-            }
-            if let Some(Value::Object(rendered)) = rendered {
-                instance.extend(rendered.clone());
-            }
-            (!instance.is_empty()).then_some(Value::Object(instance))
-        }
-        Value::Array(entries) => {
-            let mut pending = rendered
-                .and_then(Value::as_object)
-                .map(|rendered| {
-                    rendered
-                        .iter()
-                        .filter_map(|(key, value)| parse_target_scalar_value(key, value).map(|value| (key.clone(), value)))
-                        .collect::<HashMap<_, _>>()
-                })
-                .unwrap_or_default();
-            let mut updated = Vec::with_capacity(entries.len().saturating_add(pending.len()));
-            for entry in entries {
-                let Some(entry_obj) = entry.as_object() else {
-                    updated.push(entry);
-                    continue;
-                };
-                let Some(key) = entry_obj.get("key").and_then(Value::as_str) else {
-                    updated.push(entry);
-                    continue;
-                };
-                if !valid_keys.contains(&key) {
-                    updated.push(entry);
-                    continue;
-                }
-                let Some(value) = pending.remove(key) else {
-                    continue;
-                };
-                let mut entry_obj = entry_obj.clone();
-                entry_obj.insert("value".to_string(), Value::String(value));
-                updated.push(Value::Object(entry_obj));
-            }
-            updated.extend(rendered_scalar_config_kvs_entries(&pending));
-            (!updated.is_empty()).then_some(Value::Array(updated))
-        }
-        value if rendered.is_none() => Some(value),
-        _ => rendered.cloned(),
-    }
-}
-
 fn sync_rendered_target_object(
    target_obj: &mut Map<String, Value>,
    rendered_target: &Map<String, Value>,
    descriptors: &[TargetConfigDescriptor],
 ) {
    for descriptor in descriptors {
-        let existing = target_obj.remove(descriptor.external_key);
-        let alias = target_obj.remove(descriptor.subsystem_key);
-        let mut section = existing
-            .or(alias)
-            .and_then(|value| value.as_object().cloned())
-            .unwrap_or_default();
-        let rendered = rendered_target.get(descriptor.external_key).and_then(Value::as_object);
-
-        if is_target_instance_shorthand(&section, descriptor.valid_keys) {
-            let has_named_instances = rendered.is_some_and(|instances| instances.keys().any(|name| name != "default"));
-            if !has_named_instances {
-                if let Some(section) = sync_rendered_target_instance(
-                    Value::Object(section),
-                    rendered.and_then(|instances| instances.get("default")),
-                    descriptor.valid_keys,
-                ) {
-                    target_obj.insert(descriptor.external_key.to_string(), section);
-                }
-                continue;
+        match rendered_target.get(descriptor.external_key) {
+            Some(Value::Object(v)) => {
+                target_obj.insert(descriptor.external_key.to_string(), Value::Object(v.clone()));
+                target_obj.remove(descriptor.subsystem_key);
            }
-
-            let mut nested = Map::new();
-            if let Some(default) = sync_rendered_target_instance(
-                Value::Object(section),
-                rendered.and_then(|instances| instances.get("default")),
-                descriptor.valid_keys,
-            ) {
-                nested.insert("default".to_string(), default);
+            _ => {
+                target_obj.remove(descriptor.external_key);
+                target_obj.remove(descriptor.subsystem_key);
            }
-            if let Some(rendered) = rendered {
-                for (instance_name, instance) in rendered {
-                    if instance_name != "default" {
-                        nested.insert(instance_name.clone(), instance.clone());
-                    }
-                }
-            }
-            if !nested.is_empty() {
-                target_obj.insert(descriptor.external_key.to_string(), Value::Object(nested));
-            }
-            continue;
-        }
-
-        if let Some(default_alias) = section.remove(DEFAULT_DELIMITER) {
-            if let Some(default) = section.get_mut("default") {
-                if let Some(alias) = sync_rendered_target_instance(default_alias, None, descriptor.valid_keys) {
-                    match (default, alias) {
-                        (Value::Object(default), Value::Object(alias)) => {
-                            for (key, value) in alias {
-                                default.entry(key).or_insert(value);
-                            }
-                        }
-                        (Value::Array(default), Value::Array(alias)) => default.extend(alias),
-                        _ => {}
-                    }
-                }
-            } else {
-                section.insert("default".to_string(), default_alias);
-            }
-        }
-
-        let mut merged = Map::new();
-        for (instance_name, instance) in section {
-            if let Some(instance) = sync_rendered_target_instance(
-                instance,
-                rendered.and_then(|instances| instances.get(&instance_name)),
-                descriptor.valid_keys,
-            ) {
-                merged.insert(instance_name, instance);
-            }
-        }
-        if let Some(rendered) = rendered {
-            for (instance_name, instance) in rendered {
-                if !merged.contains_key(instance_name) {
-                    merged.insert(instance_name.clone(), instance.clone());
-                }
-            }
-        }
-
-        if !merged.is_empty() {
-            target_obj.insert(descriptor.external_key.to_string(), Value::Object(merged));
        }
    }
 }
@@ -1653,14 +1496,6 @@ fn encode_server_config_blob(cfg: &Config, seed: Option<&[u8]>) -> Result<Vec<u8
        Some(Value::Object(v)) => v,
        _ => Map::new(),
    };
-    for key in [
-        storageclass::CLASS_STANDARD,
-        storageclass::CLASS_RRS,
-        storageclass::OPTIMIZE,
-        storageclass::INLINE_BLOCK,
-    ] {
-        sc_obj.remove(key);
-    }
    for (k, v) in build_storageclass_object(cfg) {
        sc_obj.insert(k, v);
    }
@@ -1668,10 +1503,7 @@ fn encode_server_config_blob(cfg: &Config, seed: Option<&[u8]>) -> Result<Vec<u8
    root.remove("storage_class");

    for descriptor in [scanner_config_descriptor(), heal_config_descriptor()] {
-        let mut existing = root.remove(descriptor.subsystem_key);
-        if descriptor.subsystem_key == HEAL_SUB_SYS && existing.as_ref().is_some_and(Value::is_null) {
-            existing = None;
-        }
+        let existing = root.remove(descriptor.subsystem_key);
        let rendered = build_scalar_config_object(cfg, descriptor);
        if let Some(config_value) = sync_rendered_scalar_config_value(existing, &rendered, descriptor)? {
            root.insert(descriptor.subsystem_key.to_string(), config_value);
@@ -1728,7 +1560,6 @@ fn is_standard_object_server_config(data: &[u8]) -> bool {
    matches!(root.get("version"), Some(Value::String(v)) if !v.trim().is_empty())
        && matches!(root.get("storageclass"), Some(Value::Object(_)))
        && !root.contains_key("storage_class")
-        && !matches!(root.get(HEAL_SUB_SYS), Some(Value::Null))
 }

 fn configs_semantically_equal(lhs: &Config, rhs: &Config) -> bool {
@@ -1762,7 +1593,7 @@ where
            FileInfo = FileInfo,
            ObjectToDelete = ObjectToDelete,
            DeletedObject = DeletedObject,
-        > + NamespaceLocking<Error = Error, NamespaceLock = rustfs_lock::NamespaceLockWrapper>,
+        >,
 {
    if let Some(decrypt) = &decrypt_fn {
        register_server_config_decrypt_fn(decrypt.clone());
@@ -1770,7 +1601,14 @@ where

    let config_file = server_config_path();
    match api
-        .get_object_info(RUSTFS_META_BUCKET, &config_file, &ObjectOptions::default())
+        .get_object_info(
+            RUSTFS_META_BUCKET,
+            &config_file,
+            &ObjectOptions {
+                no_lock: true,
+                ..Default::default()
+            },
+        )
        .await
    {
        Ok(_) => {
@@ -1786,6 +1624,7 @@ where

    let opts = ObjectOptions {
        max_parity: true,
+        no_lock: true,
        ..Default::default()
    };

@@ -1838,33 +1677,7 @@ where
        }
    };

-    let snapshot = match read_server_config_snapshot(api.clone()).await {
-        Ok(snapshot) => snapshot,
-        Err(err) => {
-            warn!("recheck target server config failed, skip migration: {:?}", err);
-            return;
-        }
-    };
-    if snapshot.object_exists() {
-        debug!("server config was created while legacy migration was preparing, skip migration");
-        return;
-    }
-
-    match save_config_with_opts(
-        api,
-        &config_file,
-        normalized,
-        &ObjectOptions {
-            max_parity: true,
-            http_preconditions: Some(HTTPPreconditions {
-                if_none_match: Some("*".to_string()),
-                ..Default::default()
-            }),
-            ..Default::default()
-        },
-    )
-    .await
-    {
+    match save_config(api, &config_file, normalized).await {
        Ok(()) => {
            info!("Migrated compatible server config from legacy metadata bucket");
        }
@@ -1956,13 +1769,8 @@ where
 {
    let config_file = server_config_path();

-    // Try to read the configuration file.
-    let data = if namespace_lock_held {
-        read_config_no_lock(api.clone(), &config_file).await
-    } else {
-        read_config(api.clone(), &config_file).await
-    };
-    match data {
+    // Try to read the configuration file
+    match read_config_no_lock(api.clone(), &config_file).await {
        Ok(data) => read_server_config(api, &data, namespace_lock_held).await,
        Err(Error::ConfigNotFound) => handle_missing_config(api, "Read the main configuration", namespace_lock_held).await,
        Err(err) => handle_config_read_error(err, &config_file),
@@ -1979,12 +1787,7 @@ where
        warn!("Received empty configuration data, try to reread from '{}'", config_file);

        // Try to read the configuration again
-        let data = if namespace_lock_held {
-            read_config_no_lock(api.clone(), &config_file).await
-        } else {
-            read_config(api.clone(), &config_file).await
-        };
-        match data {
+        match read_config_no_lock(api.clone(), &config_file).await {
            Ok(cfg_data) => {
                let cfg = decode_persisted_server_config(&cfg_data)?;
                return Ok(cfg.merge());
@@ -2233,16 +2036,11 @@ pub struct ServerConfigSnapshot {
    raw: Option<Vec<u8>>,
    seed: Option<Vec<u8>>,
    etag: Option<String>,
-    generation: Option<Uuid>,
    _local_guard: OwnedRwLockWriteGuard<()>,
    _guard: rustfs_lock::NamespaceLockGuard,
 }

 impl ServerConfigSnapshot {
-    pub fn object_exists(&self) -> bool {
-        self.raw.is_some()
-    }
-
    pub fn ensure_lock_held(&self) -> Result<()> {
        if self._guard.is_lock_lost() {
            return Err(Error::other("server config transaction lock was lost"));
@@ -2253,34 +2051,12 @@ impl ServerConfigSnapshot {
    pub fn is_lock_lost(&self) -> bool {
        self._guard.is_lock_lost()
    }
-
-    pub fn generation(&self) -> Option<Uuid> {
-        self.generation
-    }
 }

-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct ServerConfigSaveResult {
-    persisted: bool,
-    generation: Option<Uuid>,
-}
-
-impl ServerConfigSaveResult {
-    pub fn persisted(&self) -> bool {
-        self.persisted
-    }
-
-    pub fn generation(&self) -> Option<Uuid> {
-        self.generation
-    }
-}
-
-/// Read a server config transaction snapshot while holding a dedicated
-/// transaction lock. The config object's normal namespace lock remains
-/// available to fence reads and the conditional write at commit time.
-/// The transaction guard remains live until the snapshot is dropped,
-/// serializing persistence and history ordering across admin nodes. Runtime
-/// state is reloaded from the durable object after this guard is released.
+/// Read a server config transaction snapshot while holding the same local and
+/// distributed write locks used by every other server-config writer. Internal
+/// reads and the later conditional write use no-lock object I/O; the guards
+/// remain live until the snapshot is dropped.
 pub async fn read_server_config_snapshot<S>(api: Arc<S>) -> Result<ServerConfigSnapshot>
 where
    S: ObjectIO<
@@ -2295,10 +2071,12 @@ where
 {
    let config_file = server_config_path();
    let local_guard = SERVER_CONFIG_LOCK.clone().write_owned().await;
-    let transaction_lock = server_config_transaction_lock_path();
-    let lock = api.new_ns_lock(RUSTFS_META_BUCKET, &transaction_lock).await?;
+    let lock = api.new_ns_lock(RUSTFS_META_BUCKET, &config_file).await?;
    let guard = lock.get_write_lock(get_lock_acquire_timeout()).await?;
-    let read_options = ObjectOptions::default();
+    let read_options = ObjectOptions {
+        no_lock: true,
+        ..Default::default()
+    };
    match read_config_with_metadata_inner(api, &config_file, &read_options, true).await {
        Ok((raw, object_info)) => {
            let (config, seed) = decode_persisted_server_config_with_seed(&raw)?;
@@ -2307,7 +2085,6 @@ where
                raw: Some(raw),
                seed: Some(seed),
                etag: object_info.etag,
-                generation: object_info.data_dir.filter(|generation| !generation.is_nil()),
                _local_guard: local_guard,
                _guard: guard,
            })
@@ -2317,7 +2094,6 @@ where
            raw: None,
            seed: None,
            etag: None,
-            generation: None,
            _local_guard: local_guard,
            _guard: guard,
        }),
@@ -2332,27 +2108,6 @@ where
 /// lock, so a concurrent update or transaction lease loss cannot commit an
 /// unfenced overwrite.
 pub async fn save_server_config_snapshot<S>(api: Arc<S>, cfg: &Config, snapshot: &ServerConfigSnapshot) -> Result<bool>
-where
-    S: ObjectIO<
-            Error = Error,
-            RangeSpec = HTTPRangeSpec,
-            HeaderMap = HeaderMap,
-            ObjectOptions = ObjectOptions,
-            ObjectInfo = ObjectInfo,
-            GetObjectReader = GetObjectReader,
-            PutObjectReader = PutObjReader,
-        > + NamespaceLocking<Error = Error, NamespaceLock = rustfs_lock::NamespaceLockWrapper>,
-{
-    save_server_config_snapshot_with_generation(api, cfg, snapshot)
-        .await
-        .map(|result| result.persisted())
-}
-
-pub async fn save_server_config_snapshot_with_generation<S>(
-    api: Arc<S>,
-    cfg: &Config,
-    snapshot: &ServerConfigSnapshot,
-) -> Result<ServerConfigSaveResult>
 where
    S: ObjectIO<
            Error = Error,
@@ -2371,19 +2126,13 @@ where
        && configs_semantically_equal(&snapshot.config, cfg)
    {
        debug!("server config unchanged and already in standard object shape, skip write");
-        return Ok(ServerConfigSaveResult {
-            persisted: false,
-            generation: snapshot.generation(),
-        });
+        return Ok(false);
    }

    let data = encode_server_config_blob(cfg, snapshot.seed.as_deref())?;
    if snapshot.raw.as_deref().is_some_and(|current| current == data.as_slice()) {
        debug!("server config bytes unchanged after encode, skip write");
-        return Ok(ServerConfigSaveResult {
-            persisted: false,
-            generation: snapshot.generation(),
-        });
+        return Ok(false);
    }

    let http_preconditions = if snapshot.raw.is_some() {
@@ -2403,22 +2152,19 @@ where
        }
    };

-    snapshot.ensure_lock_held()?;
-    let object_info = save_config_with_opts_and_metadata(
+    save_config_with_opts(
        api,
        &config_file,
        data,
        &ObjectOptions {
            max_parity: true,
+            no_lock: true,
            http_preconditions: Some(http_preconditions),
            ..Default::default()
        },
    )
    .await?;
-    Ok(ServerConfigSaveResult {
-        persisted: true,
-        generation: object_info.data_dir.filter(|generation| !generation.is_nil()),
-    })
+    Ok(true)
 }

 /// Saves the server config while an upper layer holds the namespace write
@@ -2555,9 +2301,8 @@ mod tests {
    use super::{
        SERVER_CONFIG_LOCK, ServerConfigSnapshot, apply_dynamic_config_for_sub_sys_with, config_task_join_error,
        configs_semantically_equal, decode_server_config_blob, encode_server_config_blob, is_standard_object_server_config,
-        lookup_configs, new_and_save_server_config, read_config, read_config_preserve_empty, read_config_with_metadata,
-        read_config_without_migrate, read_server_config_snapshot, save_server_config, save_server_config_snapshot,
-        save_server_config_snapshot_with_generation, server_config_transaction_lock_path, storage_class_kvs_mut,
+        lookup_configs, read_config, read_config_preserve_empty, read_config_with_metadata, read_config_without_migrate,
+        read_server_config_snapshot, save_server_config, save_server_config_snapshot, server_config_path, storage_class_kvs_mut,
    };
    use crate::config::{audit, heal, notify, oidc, scanner};
    use crate::disk::endpoint::Endpoint;
@@ -2566,9 +2311,7 @@ mod tests {
    use crate::object_api::{GetObjectReader, ObjectInfo, ObjectOptions, PutObjReader};
    use crate::runtime::sources as runtime_sources;
    use crate::set_disk::SetDisks;
-    use crate::storage_api_contracts::{
-        admin::StorageAdminApi, namespace::NamespaceLocking as _, object::HTTPPreconditions, range::HTTPRangeSpec,
-    };
+    use crate::storage_api_contracts::{admin::StorageAdminApi, namespace::NamespaceLocking as _, range::HTTPRangeSpec};
    use http::HeaderMap;
    use rustfs_config::audit::{AUDIT_AMQP_SUB_SYS, AUDIT_KAFKA_SUB_SYS, AUDIT_MQTT_SUB_SYS, AUDIT_WEBHOOK_SUB_SYS};
    use rustfs_config::notify::{
@@ -3361,85 +3104,6 @@ mod tests {
        );
    }

-    #[test]
-    fn root_heal_null_decodes_as_no_override_and_is_canonicalized_on_save() {
-        let seed = br#"{
-          "version":"33",
-          "storageclass":{"standard":"","rrs":""},
-          "heal":null,
-          "future_root":{"mode":"keep"},
-          "openid":{"default":{
-            "config_url":"https://issuer.example/.well-known/openid-configuration",
-            "client_id":"console",
-            "client_secret":"oidc-secret",
-            "future_provider_control":"keep"
-          }},
-          "notify":{"webhook":{"primary":{
-            "enable":true,
-            "endpoint":"https://notify.example/hook",
-            "auth_token":"notify-secret",
-            "future_notify_control":"keep"
-          }}},
-          "logger":{"webhook":{"primary":{
-            "enable":true,
-            "endpoint":"https://audit.example/hook",
-            "auth_token":"audit-secret",
-            "future_audit_control":"keep"
-          }}}
-        }"#;
-
-        let cfg = decode_server_config_blob(seed).expect("root heal null should mean no persisted override");
-        assert!(cfg.get_value(HEAL_SUB_SYS, DEFAULT_DELIMITER).is_none());
-        assert!(!is_standard_object_server_config(seed));
-
-        let encoded = encode_server_config_blob(&cfg, Some(seed)).expect("legacy seed should canonicalize on an authorized save");
-        let value: Value = serde_json::from_slice(&encoded).expect("canonical config should be valid JSON");
-        assert!(value.get(HEAL_SUB_SYS).is_none());
-        assert_eq!(value["future_root"]["mode"].as_str(), Some("keep"));
-        assert_eq!(value["openid"]["default"]["client_secret"].as_str(), Some("oidc-secret"));
-        assert_eq!(value["openid"]["default"]["future_provider_control"].as_str(), Some("keep"));
-        assert_eq!(value["notify"]["webhook"]["primary"]["auth_token"].as_str(), Some("notify-secret"));
-        assert_eq!(value["notify"]["webhook"]["primary"]["future_notify_control"].as_str(), Some("keep"));
-        assert_eq!(value["logger"]["webhook"]["primary"]["auth_token"].as_str(), Some("audit-secret"));
-        assert_eq!(value["logger"]["webhook"]["primary"]["future_audit_control"].as_str(), Some("keep"));
-        assert!(is_standard_object_server_config(&encoded));
-    }
-
-    #[test]
-    fn invalid_scalar_and_nested_null_config_shapes_remain_rejected() {
-        let invalid_sections = [
-            r#""scanner":null"#,
-            r#""heal":"""#,
-            r#""heal":false"#,
-            r#""heal":0"#,
-            r#""heal":{"default":null}"#,
-            r#""heal":{"_":null}"#,
-            r#""heal":{"bitrot_cycle":null}"#,
-            r#""heal":[{"key":"bitrot_cycle","value":null}]"#,
-        ];
-
-        for section in invalid_sections {
-            let input = format!(r#"{{"version":"33","storageclass":{{"standard":"","rrs":""}},{section}}}"#);
-            let err = decode_server_config_blob(input.as_bytes()).expect_err("invalid scalar shape must remain rejected");
-            assert!(
-                err.to_string().contains("expected"),
-                "invalid section {section} returned an unrelated error: {err}"
-            );
-        }
-    }
-
-    #[test]
-    fn valid_heal_object_and_kvs_array_shapes_remain_accepted() {
-        let empty_object = br#"{"version":"33","storageclass":{"standard":"","rrs":""},"heal":{}}"#;
-        let cfg = decode_server_config_blob(empty_object).expect("empty heal object should decode as no override");
-        assert!(cfg.get_value(HEAL_SUB_SYS, DEFAULT_DELIMITER).is_none());
-
-        let kvs_array =
-            br#"{"version":"33","storageclass":{"standard":"","rrs":""},"heal":[{"key":"bitrot_cycle","value":"off"}]}"#;
-        let cfg = decode_server_config_blob(kvs_array).expect("heal KVS array should decode");
-        assert!(cfg.get_value(HEAL_SUB_SYS, DEFAULT_DELIMITER).is_some());
-    }
-
    #[test]
    fn scanner_update_preserves_unknown_root_and_oidc_provider_fields() {
        let seed = br#"{
@@ -3467,171 +3131,6 @@ mod tests {
        assert_eq!(value["openid"]["default"]["client_id"].as_str(), Some("console"));
    }

-    #[test]
-    fn storageclass_reset_removes_stale_inline_block_from_seed() {
-        let seed = br#"{
-          "version":"33",
-          "storageclass":{
-            "standard":"EC:2",
-            "rrs":"EC:1",
-            "optimize":"availability",
-            "inline_block":"64KiB",
-            "future_storage_control":"keep"
-          }
-        }"#;
-
-        let encoded = encode_server_config_blob(&Config::new(), Some(seed)).expect("storageclass reset should encode");
-        let value: Value = serde_json::from_slice(&encoded).expect("encoded config should be valid json");
-        let storageclass = value["storageclass"].as_object().expect("storageclass object");
-
-        assert!(storageclass.get(crate::config::storageclass::INLINE_BLOCK).is_none());
-        assert_eq!(storageclass["future_storage_control"].as_str(), Some("keep"));
-    }
-
-    #[test]
-    fn target_update_preserves_unknown_fields_without_restoring_removed_instances() {
-        let seed = br#"{
-          "version":"33",
-          "storageclass":{"standard":"","rrs":""},
-          "notify":{"webhook":{
-            "primary":{
-              "enable":true,
-              "endpoint":"https://notify.example/old",
-              "auth_token":"notify-secret",
-              "future_control":"keep"
-            },
-            "removed":{"enable":true,"endpoint":"https://notify.example/removed"},
-            "retained":{"enable":true,"endpoint":"https://notify.example/retained","future_control":"keep"},
-            "enable":{"enable":true,"endpoint":"https://notify.example/named-enable","future_control":"keep"}
-          }}
-        }"#;
-        let mut cfg = decode_server_config_blob(seed).expect("target seed should decode");
-        let webhook = cfg
-            .0
-            .get_mut(NOTIFY_WEBHOOK_SUB_SYS)
-            .expect("notify webhook subsystem should exist");
-        webhook
-            .get_mut("primary")
-            .expect("primary target should exist")
-            .insert(rustfs_config::WEBHOOK_ENDPOINT.to_string(), "https://notify.example/new".to_string());
-        webhook.remove("removed");
-        webhook.remove("retained");
-
-        let encoded = encode_server_config_blob(&cfg, Some(seed)).expect("target update should encode");
-        let value: Value = serde_json::from_slice(&encoded).expect("encoded config should be valid json");
-        let webhook = value["notify"]["webhook"].as_object().expect("webhook section");
-
-        assert_eq!(webhook["primary"]["endpoint"].as_str(), Some("https://notify.example/new"));
-        assert_eq!(webhook["primary"]["auth_token"].as_str(), Some("notify-secret"));
-        assert_eq!(webhook["primary"]["future_control"].as_str(), Some("keep"));
-        assert!(webhook.get("removed").is_none());
-        assert_eq!(webhook["retained"]["future_control"].as_str(), Some("keep"));
-        assert!(webhook["retained"].get("enable").is_none());
-        assert!(webhook["retained"].get("endpoint").is_none());
-        assert_eq!(webhook["enable"]["endpoint"].as_str(), Some("https://notify.example/named-enable"));
-        assert_eq!(webhook["enable"]["future_control"].as_str(), Some("keep"));
-    }
-
-    #[test]
-    fn shorthand_target_update_preserves_shape_and_unknown_nested_fields() {
-        let seed = br#"{
-          "version":"33",
-          "storageclass":{"standard":"","rrs":""},
-          "notify":{"webhook":{
-            "enable":true,
-            "endpoint":"https://notify.example/old",
-            "future_control":{"endpoint":"leave-untouched","mode":"keep"}
-          }}
-        }"#;
-        let mut cfg = decode_server_config_blob(seed).expect("shorthand target should decode");
-        cfg.0
-            .get_mut(NOTIFY_WEBHOOK_SUB_SYS)
-            .and_then(|targets| targets.get_mut(DEFAULT_DELIMITER))
-            .expect("default webhook target should exist")
-            .insert(rustfs_config::WEBHOOK_ENDPOINT.to_string(), "https://notify.example/new".to_string());
-
-        let encoded = encode_server_config_blob(&cfg, Some(seed)).expect("shorthand target update should encode");
-        let value: Value = serde_json::from_slice(&encoded).expect("encoded config should be valid json");
-        let webhook = value["notify"]["webhook"].as_object().expect("webhook shorthand object");
-
-        assert_eq!(webhook["endpoint"].as_str(), Some("https://notify.example/new"));
-        assert!(webhook.get("default").is_none());
-        assert_eq!(webhook["future_control"]["endpoint"].as_str(), Some("leave-untouched"));
-        assert_eq!(webhook["future_control"]["mode"].as_str(), Some("keep"));
-        let decoded = decode_server_config_blob(&encoded).expect("updated shorthand target should remain decodable");
-        assert_eq!(
-            decoded
-                .get_value(NOTIFY_WEBHOOK_SUB_SYS, DEFAULT_DELIMITER)
-                .expect("updated default webhook target")
-                .get(rustfs_config::WEBHOOK_ENDPOINT),
-            "https://notify.example/new"
-        );
-    }
-
-    #[test]
-    fn target_kvs_update_preserves_unknown_entries_and_attributes() {
-        let seed = br#"{
-          "version":"33",
-          "storageclass":{"standard":"","rrs":""},
-          "notify":{"webhook":{"primary":[
-            {"key":"enable","value":"on","hidden_if_empty":false},
-            {"key":"endpoint","value":"https://notify.example/old","future_attribute":"keep-endpoint"},
-            {"key":"future_control","value":"keep","future_attribute":"keep-control"}
-          ]}}
-        }"#;
-        let mut cfg = decode_server_config_blob(seed).expect("target KVS seed should decode");
-        cfg.0
-            .get_mut(NOTIFY_WEBHOOK_SUB_SYS)
-            .and_then(|targets| targets.get_mut("primary"))
-            .expect("primary webhook target should exist")
-            .insert(rustfs_config::WEBHOOK_ENDPOINT.to_string(), "https://notify.example/new".to_string());
-
-        let encoded = encode_server_config_blob(&cfg, Some(seed)).expect("target KVS update should encode");
-        let value: Value = serde_json::from_slice(&encoded).expect("encoded config should be valid json");
-        let entries = value["notify"]["webhook"]["primary"]
-            .as_array()
-            .expect("target KVS shape should be preserved");
-        let endpoint = entries
-            .iter()
-            .find(|entry| entry["key"].as_str() == Some(rustfs_config::WEBHOOK_ENDPOINT))
-            .expect("endpoint entry should remain");
-        let future = entries
-            .iter()
-            .find(|entry| entry["key"].as_str() == Some("future_control"))
-            .expect("unknown target entry should remain");
-
-        assert_eq!(endpoint["value"].as_str(), Some("https://notify.example/new"));
-        assert_eq!(endpoint["future_attribute"].as_str(), Some("keep-endpoint"));
-        assert_eq!(future["value"].as_str(), Some("keep"));
-        assert_eq!(future["future_attribute"].as_str(), Some("keep-control"));
-    }
-
-    #[test]
-    fn target_default_alias_is_canonicalized_without_losing_unknown_fields() {
-        let seed = br#"{
-          "version":"33",
-          "storageclass":{"standard":"","rrs":""},
-          "notify":{"webhook":{
-            "_":{"enable":false,"endpoint":"https://notify.example/alias","future_alias":"keep"},
-            "default":{"enable":true,"endpoint":"https://notify.example/default","future_default":"keep"}
-          }}
-        }"#;
-        let cfg = decode_server_config_blob(seed).expect("dual default aliases should decode");
-        let expected_endpoint = cfg
-            .get_value(NOTIFY_WEBHOOK_SUB_SYS, DEFAULT_DELIMITER)
-            .expect("default webhook target should exist")
-            .get(rustfs_config::WEBHOOK_ENDPOINT);
-
-        let encoded = encode_server_config_blob(&cfg, Some(seed)).expect("default alias should canonicalize");
-        let value: Value = serde_json::from_slice(&encoded).expect("encoded config should be valid json");
-        let webhook = value["notify"]["webhook"].as_object().expect("webhook section");
-
-        assert!(webhook.get(DEFAULT_DELIMITER).is_none());
-        assert_eq!(webhook["default"]["endpoint"].as_str(), Some(expected_endpoint.as_str()));
-        assert_eq!(webhook["default"]["future_alias"].as_str(), Some("keep"));
-        assert_eq!(webhook["default"]["future_default"].as_str(), Some("keep"));
-    }
-
    #[test]
    fn test_scanner_config_changes_are_semantically_significant() {
        let baseline = Config::new();
@@ -4625,7 +4124,6 @@ mod tests {

    /// What reads of the config object currently return.
    enum RecoveryReadState {
-        Missing,
        Blob(Vec<u8>),
        QuorumError,
    }
@@ -4638,7 +4136,6 @@ mod tests {
        heal_calls: AtomicUsize,
        write_calls: AtomicUsize,
        last_put_no_lock: AtomicBool,
-        last_put_preconditions: Mutex<Option<HTTPPreconditions>>,
        revision: AtomicUsize,
        drive_counts: Vec<usize>,
        lock_manager: Arc<rustfs_lock::GlobalLockManager>,
@@ -4653,7 +4150,6 @@ mod tests {
                heal_calls: AtomicUsize::new(0),
                write_calls: AtomicUsize::new(0),
                last_put_no_lock: AtomicBool::new(false),
-                last_put_preconditions: Mutex::new(None),
                revision: AtomicUsize::new(1),
                drive_counts: vec![2],
                lock_manager: Arc::new(rustfs_lock::GlobalLockManager::new()),
@@ -4710,7 +4206,6 @@ mod tests {
            _opts: &ObjectOptions,
        ) -> Result<GetObjectReader> {
            let data = match &*self.state.lock().expect("state lock poisoned") {
-                RecoveryReadState::Missing => return Err(Error::ConfigNotFound),
                RecoveryReadState::Blob(data) => data.clone(),
                RecoveryReadState::QuorumError => return Err(Error::ErasureReadQuorum),
            };
@@ -4718,9 +4213,6 @@ mod tests {
                size: data.len() as i64,
                actual_size: data.len() as i64,
                etag: Some(format!("config-{}", self.revision.load(Ordering::SeqCst))),
-                data_dir: Some(uuid::Uuid::from_u128(
-                    u128::try_from(self.revision.load(Ordering::SeqCst)).expect("test revision should fit in u128"),
-                )),
                ..Default::default()
            };
            Ok(GetObjectReader {
@@ -4739,19 +4231,15 @@ mod tests {
            opts: &ObjectOptions,
        ) -> Result<ObjectInfo> {
            let current_etag = format!("config-{}", self.revision.load(Ordering::SeqCst));
-            let object_exists = matches!(&*self.state.lock().expect("state lock poisoned"), RecoveryReadState::Blob(_));
            if let Some(preconditions) = &opts.http_preconditions
-                && (preconditions
-                    .if_match_value()
-                    .is_some_and(|etag| !object_exists || etag != current_etag)
-                    || (object_exists && preconditions.if_none_match_value() == Some("*")))
+                && (preconditions.if_match_value().is_some_and(|etag| etag != current_etag)
+                    || preconditions.if_none_match_value() == Some("*"))
            {
                return Err(Error::PreconditionFailed);
            }
            let mut body = Vec::new();
            data.stream.read_to_end(&mut body).await?;
            self.last_put_no_lock.store(opts.no_lock, Ordering::SeqCst);
-            *self.last_put_preconditions.lock().expect("preconditions lock poisoned") = opts.http_preconditions.clone();
            self.write_calls.fetch_add(1, Ordering::SeqCst);
            *self.state.lock().expect("state lock poisoned") = RecoveryReadState::Blob(body.clone());
            let revision = self.revision.fetch_add(1, Ordering::SeqCst) + 1;
@@ -4759,7 +4247,6 @@ mod tests {
                size: i64::try_from(body.len()).expect("test config should fit in i64"),
                actual_size: i64::try_from(body.len()).expect("test config should fit in i64"),
                etag: Some(format!("config-{revision}")),
-                data_dir: Some(uuid::Uuid::from_u128(u128::try_from(revision).expect("test revision should fit in u128"))),
                ..Default::default()
            })
        }
@@ -4797,18 +4284,10 @@ mod tests {
            .expect("scanner-only config change should be persisted");

        assert_eq!(store.write_calls.load(Ordering::SeqCst), 1);
-        assert!(!store.last_put_no_lock.load(Ordering::SeqCst));
-        let preconditions = store
-            .last_put_preconditions
-            .lock()
-            .expect("preconditions lock poisoned")
-            .clone()
-            .expect("existing config update must be conditional");
-        assert_eq!(preconditions.if_match_value(), Some("config-1"));
-        assert_eq!(preconditions.if_none_match_value(), None);
+        assert!(store.last_put_no_lock.load(Ordering::SeqCst));
        assert_eq!(
            store.lock_resources.lock().expect("lock resources mutex poisoned").as_slice(),
-            &[server_config_transaction_lock_path()]
+            &[server_config_path()]
        );
        let decoded = read_config_without_migrate(store)
            .await
@@ -4822,73 +4301,6 @@ mod tests {
        );
    }

-    #[tokio::test]
-    async fn server_config_snapshot_save_returns_committed_generation() {
-        let baseline = encode_server_config_blob(&Config::new(), None).expect("baseline config should encode");
-        let store = Arc::new(RecoveryMockStore::new(RecoveryReadState::Blob(baseline), None));
-        let snapshot = read_server_config_snapshot(store.clone())
-            .await
-            .expect("server config snapshot");
-
-        let result = save_server_config_snapshot_with_generation(store, &config_with_scanner_cycle("61"), &snapshot)
-            .await
-            .expect("conditional config save");
-
-        assert!(result.persisted());
-        assert_eq!(result.generation(), Some(uuid::Uuid::from_u128(2)));
-    }
-
-    #[tokio::test]
-    async fn missing_server_config_is_created_with_if_none_match() {
-        let store = Arc::new(RecoveryMockStore::new(RecoveryReadState::Missing, None));
-        let cfg = config_with_scanner_cycle("61");
-
-        save_server_config(store.clone(), &cfg)
-            .await
-            .expect("missing config should be created conditionally");
-
-        assert_eq!(store.write_calls.load(Ordering::SeqCst), 1);
-        assert!(!store.last_put_no_lock.load(Ordering::SeqCst));
-        let preconditions = store
-            .last_put_preconditions
-            .lock()
-            .expect("preconditions lock poisoned")
-            .clone()
-            .expect("missing config create must be conditional");
-        assert_eq!(preconditions.if_match_value(), None);
-        assert_eq!(preconditions.if_none_match_value(), Some("*"));
-        let persisted = read_config_without_migrate(store)
-            .await
-            .expect("created config should reload");
-        assert_eq!(
-            persisted
-                .get_value(SCANNER_SUB_SYS, DEFAULT_DELIMITER)
-                .expect("persisted scanner config")
-                .get(SCANNER_CYCLE),
-            "61"
-        );
-    }
-
-    #[tokio::test]
-    async fn missing_config_initialization_recheck_preserves_concurrent_config() {
-        let existing = config_with_scanner_cycle("73");
-        let baseline = encode_server_config_blob(&existing, None).expect("existing config should encode");
-        let store = Arc::new(RecoveryMockStore::new(RecoveryReadState::Blob(baseline), None));
-
-        let observed = new_and_save_server_config(store.clone())
-            .await
-            .expect("initialization recheck should return the config created by another writer");
-
-        assert_eq!(store.write_calls.load(Ordering::SeqCst), 0);
-        assert_eq!(
-            observed
-                .get_value(SCANNER_SUB_SYS, DEFAULT_DELIMITER)
-                .expect("concurrent scanner config")
-                .get(SCANNER_CYCLE),
-            "73"
-        );
-    }
-
    #[tokio::test]
    async fn stale_server_config_snapshot_cannot_overwrite_newer_update() {
        let baseline = encode_server_config_blob(&Config::new(), None).expect("baseline config should encode");
@@ -4945,7 +4357,7 @@ mod tests {
        let lock = rustfs_lock::NamespaceLock::new("server-config-lease-loss".to_string(), client.clone());
        let guard = lock
            .lock_guard(
-                rustfs_lock::ObjectKey::new(crate::disk::RUSTFS_META_BUCKET, server_config_transaction_lock_path()),
+                rustfs_lock::ObjectKey::new(crate::disk::RUSTFS_META_BUCKET, server_config_path()),
                "server-config-lease-loss",
                std::time::Duration::from_secs(1),
                std::time::Duration::from_millis(120),
@@ -4960,7 +4372,6 @@ mod tests {
            raw: Some(baseline.clone()),
            seed: None,
            etag: Some("config-0".to_string()),
-            generation: Some(uuid::Uuid::from_u128(1)),
            _local_guard: local_guard,
            _guard: guard,
        };
@@ -37,9 +37,7 @@ use crate::{
    runtime::instance::{InstanceContext, bootstrap_ctx},
    runtime::sources as runtime_sources,
    set_disk::{PreparedGetObjectMetadata, SetDisks},
-    store::init_format::{
-        check_format_erasure_values, load_format_erasure_all, save_format_file, select_format_erasure_in_quorum,
-    },
+    store::init_format::{check_format_erasure_values, get_format_erasure_in_quorum, load_format_erasure_all, save_format_file},
 };
 use futures::{
    future::join_all,
@@ -615,7 +613,7 @@ impl crate::storage_api_contracts::object::ObjectOperations for Sets {
        self.get_disks_by_key(object).delete_object(bucket, object, opts).await
    }

-    #[tracing::instrument(skip(self, objects, opts))]
+    #[tracing::instrument(skip(self))]
    async fn delete_objects(
        &self,
        bucket: &str,
@@ -949,7 +947,7 @@ impl crate::storage_api_contracts::heal::HealOperations for Sets {

    #[tracing::instrument(skip(self))]
    async fn heal_format(&self, dry_run: bool) -> Result<(HealResultItem, Option<Error>)> {
-        let (disks, init_errs) = init_storage_disks_with_errors(
+        let (disks, _) = init_storage_disks_with_errors(
            &self.endpoints.endpoints,
            &DiskOption {
                cleanup: false,
@@ -957,36 +955,15 @@ impl crate::storage_api_contracts::heal::HealOperations for Sets {
            },
        )
        .await;
-        let (formats, mut errs) = load_format_erasure_all(&disks, true).await;
-        for (err, init_err) in errs.iter_mut().zip(init_errs) {
-            if init_err.is_some() {
-                *err = init_err;
-            }
-        }
-        if errs.iter().any(|err| {
-            matches!(
-                err,
-                Some(DiskError::InconsistentDisk | DiskError::CorruptedFormat | DiskError::CorruptedBackend)
-            )
-        }) {
-            return Ok((HealResultItem::default(), Some(StorageError::CorruptedFormat)));
-        }
+        let (formats, errs) = load_format_erasure_all(&disks, true).await;
        if let Err(err) = check_format_erasure_values(&formats, self.set_drive_count) {
            info!("failed to check formats erasure values: {}", err);
            return Ok((HealResultItem::default(), Some(err)));
        }
-        let (ref_format, quorum_members) = match select_format_erasure_in_quorum(&formats, 0) {
-            Ok((format, members)) if format.shared_identity() == self.format.shared_identity() => (format, members),
-            Ok(_) => return Ok((HealResultItem::default(), Some(StorageError::CorruptedFormat))),
+        let ref_format = match get_format_erasure_in_quorum(&formats) {
+            Ok(format) => format,
            Err(err) => return Ok((HealResultItem::default(), Some(err))),
        };
-        if formats
-            .iter()
-            .zip(quorum_members)
-            .any(|(format, member)| format.is_some() && !member)
-        {
-            return Ok((HealResultItem::default(), Some(StorageError::CorruptedFormat)));
-        }
        let mut res = HealResultItem {
            heal_item_type: HealItemType::Metadata.to_string(),
            detail: "disk-format".to_string(),
@@ -1008,6 +985,11 @@ impl crate::storage_api_contracts::heal::HealOperations for Sets {
            return Ok((res, Some(StorageError::NoHealRequired)));
        }

+        // if !self.format.eq(&ref_format) {
+        //     info!("format ({:?}) not eq ref_format ({:?})", self.format, ref_format);
+        //     return Ok((res, Some(Error::new(DiskError::CorruptedFormat))));
+        // }
+
        let (new_format_sets, _) = new_heal_format_sets(&ref_format, self.set_count, self.set_drive_count, &formats, &errs);
        if !dry_run {
            let mut tmp_new_formats = vec![None; self.set_count * self.set_drive_count];
@@ -1316,7 +1298,7 @@ mod tests {
        assert_eq!(result, (Some(3), Some(1), Some(0)));
    }

-    async fn two_set_test_sets() -> (Vec<tempfile::TempDir>, Arc<Sets>) {
+    async fn multipart_listing_test_sets() -> (Vec<tempfile::TempDir>, Arc<Sets>) {
        let format = FormatV3::new(2, 2);
        let mut temp_dirs = Vec::new();
        let mut all_endpoints = Vec::new();
@@ -1357,8 +1339,8 @@ mod tests {
                    Arc::new(RwLock::new(disks)),
                    2,
                    1,
-                    set_index,
                    0,
+                    set_index,
                    endpoints,
                    format.clone(),
                    vec![Arc::new(LocalClient::new()), Arc::new(LocalClient::new())],
@@ -1391,114 +1373,11 @@ mod tests {
        (temp_dirs, sets)
    }

-    #[tokio::test]
-    async fn set_format_heal_accepts_quorum_from_a_nonzero_set() {
-        let (_temp_dirs, sets) = two_set_test_sets().await;
-
-        let (result, err) = sets.disk_set[1]
-            .heal_format(false)
-            .await
-            .expect("the second erasure set should load its own format quorum");
-
-        assert!(matches!(err, Some(StorageError::NoHealRequired)), "unexpected heal result: {err:?}");
-        assert_eq!(result.disk_count, 2);
-        assert_eq!(result.set_count, 1);
-    }
-
-    #[tokio::test]
-    async fn format_heal_rejects_foreign_majorities_at_set_and_pool_scopes() {
-        let (_temp_dirs, _canonical_format, sets) = setup_heal_format_sets(2, true).await;
-        let set_disks = set_level_heal_view(&sets).await;
-
-        let (_, set_err) = set_disks
-            .heal_format(false)
-            .await
-            .expect("set format heal should report a typed mismatch");
-        assert!(
-            matches!(set_err, Some(StorageError::CorruptedFormat)),
-            "foreign set majority must not replace the cached format: {set_err:?}"
-        );
-
-        let (_, pool_err) = sets
-            .heal_format(false)
-            .await
-            .expect("pool format heal should report a typed mismatch");
-        assert!(
-            matches!(pool_err, Some(StorageError::CorruptedFormat)),
-            "foreign pool majority must not replace the cached format: {pool_err:?}"
-        );
-    }
-
-    #[tokio::test]
-    async fn pool_format_heal_rejects_a_wrong_slot_minority() {
-        let (_temp_dirs, canonical_format, sets) = setup_heal_format_sets(3, false).await;
-        let mut poisoned_format = canonical_format.clone();
-        poisoned_format.erasure.this = canonical_format.erasure.sets[0][0];
-        replace_heal_test_format(&sets, 2, &poisoned_format).await;
-        let probe_err = new_disk(
-            &sets.endpoints.endpoints.as_ref()[2],
-            &DiskOption {
-                cleanup: false,
-                health_check: false,
-            },
-        )
-        .await
-        .expect_err("a wrong-slot local format must fail disk initialization");
-        assert_eq!(probe_err, DiskError::InconsistentDisk);
-
-        let (_, pool_err) = sets
-            .heal_format(false)
-            .await
-            .expect("pool format heal should report a typed slot mismatch");
-        assert!(
-            matches!(pool_err, Some(StorageError::CorruptedFormat)),
-            "a wrong-slot minority must not be reported as no-heal-required: {pool_err:?}"
-        );
-        assert_eq!(
-            read_heal_test_format(&sets, 2).await,
-            poisoned_format,
-            "format heal must not overwrite a wrong-slot disk"
-        );
-    }
-
-    #[tokio::test]
-    async fn format_heal_rejects_a_foreign_minority_at_set_and_pool_scopes() {
-        let (_temp_dirs, canonical_format, sets) = setup_heal_format_sets(3, false).await;
-        let mut poisoned_format = canonical_format.clone();
-        poisoned_format.id = Uuid::new_v4();
-        poisoned_format.erasure.this = poisoned_format.erasure.sets[0][2];
-        replace_heal_test_format(&sets, 2, &poisoned_format).await;
-        let set_disks = set_level_heal_view(&sets).await;
-
-        let (_, set_err) = set_disks
-            .heal_format(false)
-            .await
-            .expect("set format heal should report a typed identity mismatch");
-        assert!(
-            matches!(set_err, Some(StorageError::CorruptedFormat)),
-            "a foreign minority must not be reported as no-heal-required: {set_err:?}"
-        );
-
-        let (_, pool_err) = sets
-            .heal_format(false)
-            .await
-            .expect("pool format heal should report a typed identity mismatch");
-        assert!(
-            matches!(pool_err, Some(StorageError::CorruptedFormat)),
-            "a foreign minority must not be reported as no-heal-required: {pool_err:?}"
-        );
-        assert_eq!(
-            read_heal_test_format(&sets, 2).await,
-            poisoned_format,
-            "format heal must not overwrite a foreign disk"
-        );
-    }
-
    #[tokio::test(flavor = "multi_thread")]
    #[serial]
    async fn list_multipart_uploads_merges_all_sets_without_pagination_loss() {
        let _setup_type_guard = SetupTypeGuard::switch_to(SetupType::Erasure).await;
-        let (_temp_dirs, sets) = two_set_test_sets().await;
+        let (_temp_dirs, sets) = multipart_listing_test_sets().await;
        let bucket = format!("multipart-list-{}", Uuid::new_v4().simple());
        sets.make_bucket(&bucket, &MakeBucketOptions::default())
            .await
@@ -1737,15 +1616,11 @@ mod tests {
    // formatting the first `num_formatted` of them against a shared reference
    // format and leaving the rest unformatted. Returns the live TempDir handles
    // (must be kept alive), the reference format, and the assembled `Sets`.
-    // `disk_set` is intentionally empty: these tests only exercise paths that
-    // return before pool-level healing delegates into a set.
-    async fn setup_heal_format_sets(num_formatted: usize, foreign_identity: bool) -> (Vec<tempfile::TempDir>, FormatV3, Sets) {
+    // `disk_set` is intentionally empty: these tests only drive `heal_format`
+    // with `dry_run == true`, which never touches `disk_set`.
+    async fn setup_heal_format_sets(num_formatted: usize) -> (Vec<tempfile::TempDir>, FormatV3, Sets) {
        const SET_DRIVE_COUNT: usize = 3;
        let ref_format = FormatV3::new(1, SET_DRIVE_COUNT);
-        let mut stored_format = ref_format.clone();
-        if foreign_identity {
-            stored_format.id = Uuid::new_v4();
-        }

        let mut dirs = Vec::with_capacity(SET_DRIVE_COUNT);
        let mut endpoints = Vec::with_capacity(SET_DRIVE_COUNT);
@@ -1770,8 +1645,8 @@ mod tests {
            )
            .await
            .expect("disk should be created");
-            let mut disk_format = stored_format.clone();
-            disk_format.erasure.this = stored_format.erasure.sets[0][i];
+            let mut disk_format = ref_format.clone();
+            disk_format.erasure.this = ref_format.erasure.sets[0][i];
            save_format_file(&Some(disk), &Some(disk_format))
                .await
                .expect("format should be saved");
@@ -1802,60 +1677,6 @@ mod tests {
        (dirs, ref_format, sets)
    }

-    async fn set_level_heal_view(sets: &Sets) -> Arc<SetDisks> {
-        let endpoints = sets.endpoints.endpoints.as_ref().clone();
-        let mut disks = Vec::with_capacity(endpoints.len());
-        for endpoint in &endpoints {
-            disks.push(Some(
-                new_disk(
-                    endpoint,
-                    &DiskOption {
-                        cleanup: false,
-                        health_check: false,
-                    },
-                )
-                .await
-                .expect("fresh set-level disk handle should open"),
-            ));
-        }
-
-        SetDisks::new(
-            "test-owner".to_string(),
-            Arc::new(RwLock::new(disks)),
-            endpoints.len(),
-            1,
-            0,
-            0,
-            endpoints,
-            sets.format.clone(),
-            Vec::new(),
-        )
-        .await
-    }
-
-    async fn replace_heal_test_format(sets: &Sets, disk_index: usize, format: &FormatV3) {
-        let disk = new_disk(
-            &sets.endpoints.endpoints.as_ref()[disk_index],
-            &DiskOption {
-                cleanup: false,
-                health_check: false,
-            },
-        )
-        .await
-        .expect("heal test disk should open");
-        save_format_file(&Some(disk.clone()), &Some(format.clone()))
-            .await
-            .expect("poisoned test format should be written");
-    }
-
-    async fn read_heal_test_format(sets: &Sets, disk_index: usize) -> FormatV3 {
-        let path = std::path::Path::new(&sets.endpoints.endpoints.as_ref()[disk_index].get_file_path())
-            .join(crate::disk::RUSTFS_META_BUCKET)
-            .join(crate::disk::FORMAT_CONFIG_FILE);
-        let data = tokio::fs::read(path).await.expect("test format should be readable");
-        FormatV3::try_from(data.as_slice()).expect("test format should parse")
-    }
-
    // Regression for #956 (NoHealRequired path): with every disk already
    // formatted, `heal_format` reports exactly one drive record per disk
    // (N = set_count * set_drive_count), each carrying a real endpoint. Before
@@ -1864,7 +1685,7 @@ mod tests {
    #[tokio::test]
    #[serial]
    async fn heal_format_no_heal_required_reports_one_record_per_disk() {
-        let (_dirs, _ref_format, sets) = setup_heal_format_sets(3, false).await;
+        let (_dirs, _ref_format, sets) = setup_heal_format_sets(3).await;

        let (res, err) = sets.heal_format(true).await.expect("heal_format should succeed");
        // All disks formatted -> NoHealRequired early return, still returns `res`.
@@ -1894,7 +1715,7 @@ mod tests {
    #[serial]
    async fn heal_format_heal_path_reports_one_record_per_disk_aligned() {
        // Disks 0 and 1 formatted (quorum), disk 2 unformatted.
-        let (_dirs, _ref_format, sets) = setup_heal_format_sets(2, false).await;
+        let (_dirs, _ref_format, sets) = setup_heal_format_sets(2).await;

        let (res, err) = sets.heal_format(true).await.expect("heal_format should succeed");
        // Unformatted disk present -> heal path, not NoHealRequired.
@@ -1049,10 +1049,6 @@ impl LocalDiskWrapper {
        Ok(())
    }

-    pub(crate) async fn set_disk_id_state(&self, id: Option<Uuid>) {
-        *self.disk_id.write().await = id;
-    }
-
    /// Get the current disk ID
    pub async fn get_current_disk_id(&self) -> Option<Uuid> {
        *self.disk_id.read().await
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Zhengchao An	830055ba9c	Merge branch 'main' into codex/backlog-1548-protocols-workspace-lints	2026-07-29 22:35:01 +08:00
overtrue	a8c2e3e253	ci(protocols): inherit workspace lint policy	2026-07-29 21:45:10 +08:00