refactor(replication): own filemeta wire contracts (#4254)

Cargo.lock

@@ -9617,9 +9617,10 @@ name = "rustfs-replication"
 version = "1.0.0-beta.8"
 dependencies = [
  "byteorder",
+ "bytes",
+ "regex",
  "rmp",
  "rmp-serde",
- "rustfs-filemeta",
  "rustfs-utils",
  "s3s",
  "serde",

crates/ecstore/src/bucket/lifecycle/bucket_lifecycle_ops.rs

@@ -23,8 +23,8 @@ use crate::bucket::lifecycle::lifecycle::{
 };
 use crate::bucket::lifecycle::replication_sink;
 use crate::bucket::lifecycle::replication_sink::{
-    ReplicateDecision, ReplicationState, ReplicationStatusType, VersionPurgeStatusType, replication_statuses_map,
+    ReplicateDecision, ReplicationState, ReplicationStatusType, VersionPurgeStatusType, replication_state_to_filemeta,
-    version_purge_statuses_map,
+    replication_statuses_map, version_purge_statuses_map,
 };
 use crate::bucket::lifecycle::tier_delete_journal::{process_tier_delete_journal_entry, run_tier_delete_journal_recovery_loop};
 use crate::bucket::lifecycle::tier_free_version_recovery::{DEFAULT_FREE_VERSION_RECOVERY_LIMIT, recover_tier_free_versions};
@@ -2881,7 +2881,7 @@ async fn schedule_lifecycle_replication_delete_if_needed(oi: &ObjectInfo, dobj:
         return;
     }
 
-    delete_object.replication_state = replication_state;
+    delete_object.replication_state = replication_state.as_ref().map(replication_state_to_filemeta);
 
     replication_sink::schedule_delete(oi.bucket.clone(), delete_object).await;
 }

crates/ecstore/src/bucket/lifecycle/replication_sink.rs

@@ -18,8 +18,8 @@ use crate::bucket::lifecycle::lifecycle::ObjectOpts;
 #[cfg(test)]
 pub(crate) use crate::bucket::replication::ReplicateTargetDecision;
 pub(crate) use crate::bucket::replication::{
-    ReplicateDecision, ReplicationState, ReplicationStatusType, VersionPurgeStatusType, replication_statuses_map,
+    ReplicateDecision, ReplicationState, ReplicationStatusType, VersionPurgeStatusType, replication_state_to_filemeta,
-    version_purge_statuses_map,
+    replication_statuses_map, version_purge_statuses_map,
 };
 use crate::bucket::replication::{ReplicationLifecycleBridge, ReplicationLifecycleConfig};
 use crate::object_api::{ObjectInfo, ObjectOptions};

crates/ecstore/src/bucket/replication/README.md

@@ -37,11 +37,11 @@ paths.
 | `EcstoreReplicationBoundaryImports` | ECStore-side imports from `rustfs-replication`. | Direct `rustfs-replication` imports under `crates/ecstore/src/bucket/replication` stay in `*_boundary.rs` modules, including config and resync facade re-exports. |
 | `RuntimeReplicationFacadeConsumers` | Runtime owner consumers of replication DTOs and status types. | Scanner, admin, and storage owner facades import replication DTOs/status types through `rustfs-ecstore`; app storage keeps the remaining direct object/delete helper calls behind its local storage API boundary. |
 | `ReplicationResyncContracts` | Resync options, target status, bucket status, status classifiers, and persisted resync/MRF status wire format. | Owned by `crates/replication`; ECStore imports them through `replication_resync_boundary.rs`, which maps crate errors to ECStore errors. |
-| `ReplicationCrateFileMetaFacade` | Replication facade compatibility symbols that still originate in filemeta wire contracts. | `crates/replication/src/filemeta.rs` is the only direct `rustfs-filemeta` import boundary inside `rustfs-replication`. |
+| `ReplicationCrateFileMetaIndependence` | Replication status, decision, MRF, resync, and target-reset wire contracts owned by `rustfs-replication`. | `crates/replication/src/filemeta.rs` owns these contracts; `rustfs-replication` must not import or depend on `rustfs-filemeta`. |
 | `ReplicationConfigStore` | Replication config persistence and config-derived labels used by target options. | Config read/save helpers and storage class labels are exposed through the contract type in `replication_config_store.rs`. |
-| `ReplicationFileMeta` | Replication status, decisions, MRF entries, resync decisions, and target reset helpers. | `rustfs_filemeta` replication contracts are concentrated in `replication_filemeta_boundary.rs`; `FileInfo` remains in the storage boundary for storage trait bindings and walk options. |
+| `ReplicationFileMeta` | ECStore compatibility conversions for filemeta replication state/status. | `rustfs_filemeta` to `rustfs_replication` conversions are concentrated in `replication_filemeta_boundary.rs`; `FileInfo` remains in the storage boundary for storage trait bindings and walk options. |
-| `StorageApiReplicationContracts` | Storage-api delete DTO replication state/status helpers. | The temporary `rustfs-filemeta` dependency is isolated in `crates/storage-api/src/replication.rs` until the wire contracts can move without creating a `rustfs-replication` / `rustfs-storage-api` cycle. |
+| `StorageApiReplicationContracts` | Storage-api delete DTO replication state/status helpers. | Storage-api owner DTOs keep their local replication boundary; ECStore converts them in `replication_storage_boundary.rs` before queueing replication work. |
-| `ReplicationCrateStorageApiBoundary` | Storage API delete DTOs consumed by `rustfs-replication`. | `crates/replication/src/storage_api.rs` is the only direct `rustfs-storage-api` import boundary inside `rustfs-replication`. |
+| `ReplicationCrateStorageApiIndependence` | Delete work DTOs consumed by `rustfs-replication`. | `crates/replication/src/storage_api.rs` owns these DTOs; `rustfs-replication` must not import or depend on `rustfs-storage-api`. |
 | `ReplicationObjectDecisionContracts` | Object replication options, delete replication decisions, resync target projection, multipart planning, and delete-marker retry classifiers. | Owned by `crates/replication`; ECStore imports them through `replication_object_decision_boundary.rs`. |
 | `ReplicationQueueContracts` | Queue admission, heal queue results/actions, worker operations, worker sizing, and backpressure decisions. | Owned by `crates/replication`; ECStore imports them through `replication_queue_boundary.rs`. |
 | `ReplicationStatsContracts` | Bucket stats, replication target stats, queue/proxy metrics, and worker metric snapshots. | Owned by `crates/replication`; ECStore imports them through `replication_stats_boundary.rs`. |
@@ -88,13 +88,12 @@ paths.
 10. Keep ECStore owner modules outside `bucket/replication` behind bridge
     contracts when they need replication codec or config helper behavior.
 11. Keep storage-api replication status/state helpers behind
-    `crates/storage-api/src/replication.rs` until the underlying wire contracts
+    `crates/storage-api/src/replication.rs`; ECStore converts owner DTOs at the
-    can move without a `rustfs-replication` / `rustfs-storage-api` dependency
+    replication storage boundary.
-    cycle.
+12. Keep `rustfs-replication` independent from `rustfs-filemeta`; ECStore
-12. Keep direct `rustfs-filemeta` imports inside `rustfs-replication`
+    compatibility conversions live in `replication_filemeta_boundary.rs`.
-    concentrated in `crates/replication/src/filemeta.rs`.
+13. Keep `rustfs-replication` independent from `rustfs-storage-api`; ECStore
-13. Keep direct `rustfs-storage-api` imports inside `rustfs-replication`
+    compatibility conversions live in `replication_storage_boundary.rs`.
-    concentrated in `crates/replication/src/storage_api.rs`.
 14. Keep direct `rustfs-replication` imports inside ECStore replication
     concentrated in `*_boundary.rs` modules.
 15. Keep scanner, admin, and storage-owner replication status/DTO consumers

crates/ecstore/src/bucket/replication/mod.rs

@@ -52,7 +52,11 @@ pub(crate) use replication_filemeta_boundary::ReplicateTargetDecision;
 pub(crate) use replication_filemeta_boundary::version_purge_statuses_map;
 pub use replication_filemeta_boundary::{
     REPLICATE_INCOMING_DELETE, ReplicateDecision, ReplicateObjectInfo, ReplicationState, ReplicationStatusType, ReplicationType,
-    VersionPurgeStatusType, replication_statuses_map,
+    VersionPurgeStatusType, replication_state_to_filemeta, replication_status_to_filemeta, replication_statuses_map,
+    version_purge_status_to_filemeta,
+};
+pub(crate) use replication_filemeta_boundary::{
+    replication_state_from_filemeta, replication_status_from_filemeta, version_purge_status_from_filemeta,
 };
 pub(crate) use replication_lifecycle_bridge::{ReplicationLifecycleBridge, ReplicationLifecycleConfig};
 pub(crate) use replication_migration_bridge::ReplicationMigrationBridge;

crates/ecstore/src/bucket/replication/replication_filemeta_boundary.rs

@@ -22,3 +22,65 @@ pub use rustfs_replication::{
     REPLICATE_INCOMING_DELETE, ReplicateDecision, ReplicateObjectInfo, ReplicationState, ReplicationStatusType, ReplicationType,
     VersionPurgeStatusType, replication_statuses_map,
 };
+
+pub(crate) fn replication_status_from_filemeta(status: rustfs_filemeta::ReplicationStatusType) -> ReplicationStatusType {
+    ReplicationStatusType::from(status.as_str())
+}
+
+pub(crate) fn version_purge_status_from_filemeta(status: rustfs_filemeta::VersionPurgeStatusType) -> VersionPurgeStatusType {
+    VersionPurgeStatusType::from(status.as_str())
+}
+
+pub(crate) fn replication_state_from_filemeta(state: &rustfs_filemeta::ReplicationState) -> ReplicationState {
+    ReplicationState {
+        replica_timestamp: state.replica_timestamp,
+        replica_status: replication_status_from_filemeta(state.replica_status.clone()),
+        delete_marker: state.delete_marker,
+        replication_timestamp: state.replication_timestamp,
+        replication_status_internal: state.replication_status_internal.clone(),
+        version_purge_status_internal: state.version_purge_status_internal.clone(),
+        replicate_decision_str: state.replicate_decision_str.clone(),
+        targets: state
+            .targets
+            .iter()
+            .map(|(arn, status)| (arn.clone(), replication_status_from_filemeta(status.clone())))
+            .collect(),
+        purge_targets: state
+            .purge_targets
+            .iter()
+            .map(|(arn, status)| (arn.clone(), version_purge_status_from_filemeta(status.clone())))
+            .collect(),
+        reset_statuses_map: state.reset_statuses_map.clone(),
+    }
+}
+
+pub fn replication_status_to_filemeta(status: ReplicationStatusType) -> rustfs_filemeta::ReplicationStatusType {
+    rustfs_filemeta::ReplicationStatusType::from(status.as_str())
+}
+
+pub fn version_purge_status_to_filemeta(status: VersionPurgeStatusType) -> rustfs_filemeta::VersionPurgeStatusType {
+    rustfs_filemeta::VersionPurgeStatusType::from(status.as_str())
+}
+
+pub fn replication_state_to_filemeta(state: &ReplicationState) -> rustfs_filemeta::ReplicationState {
+    rustfs_filemeta::ReplicationState {
+        replica_timestamp: state.replica_timestamp,
+        replica_status: replication_status_to_filemeta(state.replica_status.clone()),
+        delete_marker: state.delete_marker,
+        replication_timestamp: state.replication_timestamp,
+        replication_status_internal: state.replication_status_internal.clone(),
+        version_purge_status_internal: state.version_purge_status_internal.clone(),
+        replicate_decision_str: state.replicate_decision_str.clone(),
+        targets: state
+            .targets
+            .iter()
+            .map(|(arn, status)| (arn.clone(), replication_status_to_filemeta(status.clone())))
+            .collect(),
+        purge_targets: state
+            .purge_targets
+            .iter()
+            .map(|(arn, status)| (arn.clone(), version_purge_status_to_filemeta(status.clone())))
+            .collect(),
+        reset_statuses_map: state.reset_statuses_map.clone(),
+    }
+}

crates/ecstore/src/bucket/replication/replication_storage_boundary.rs

@@ -16,6 +16,7 @@ use rustfs_filemeta::FileInfo;
 use tokio_util::sync::CancellationToken;
 
 use super::replication_error_boundary::Error;
+use super::replication_filemeta_boundary::{replication_state_from_filemeta, version_purge_status_from_filemeta};
 pub(crate) type ReplicationObjectStore = crate::store::ECStore;
 pub(crate) use crate::client::api_get_options::{AdvancedGetOptions, StatObjectOptions};
 pub(crate) use crate::object_api::{GetObjectReader, ObjectInfo, ObjectOptions, PutObjReader};
@@ -101,7 +102,7 @@ pub(crate) fn deleted_object_for_replication(delete_object: DeletedObject) -> Re
         object_name: delete_object.object_name,
         version_id: delete_object.version_id,
         delete_marker_mtime: delete_object.delete_marker_mtime,
-        replication_state: delete_object.replication_state,
+        replication_state: delete_object.replication_state.as_ref().map(replication_state_from_filemeta),
         found: delete_object.found,
         force_delete: delete_object.force_delete,
     }
@@ -112,7 +113,7 @@ pub(crate) fn object_to_delete_for_replication(object: &ObjectToDelete) -> Repli
         object_name: object.object_name.clone(),
         version_id: object.version_id,
         delete_marker_replication_status: object.delete_marker_replication_status.clone(),
-        version_purge_status: object.version_purge_status.clone(),
+        version_purge_status: object.version_purge_status.clone().map(version_purge_status_from_filemeta),
         version_purge_statuses: object.version_purge_statuses.clone(),
         replicate_decision_str: object.replicate_decision_str.clone(),
     }

crates/ecstore/src/client/object_handlers_common.rs

@@ -21,7 +21,7 @@ const EVENT_LIFECYCLE_CLEANUP_SKIPPED: &str = "lifecycle_cleanup_skipped";
 const EVENT_LIFECYCLE_CLEANUP_FAILED: &str = "lifecycle_cleanup_failed";
 
 use crate::bucket::lifecycle::lifecycle;
-use crate::bucket::replication::{ReplicationLifecycleBridge, ReplicationState};
+use crate::bucket::replication::{ReplicationLifecycleBridge, ReplicationState, replication_state_to_filemeta};
 use crate::bucket::versioning::VersioningApi;
 use crate::bucket::versioning_sys::BucketVersioningSys;
 use crate::object_api::ObjectOptions;
@@ -106,7 +106,7 @@ pub async fn delete_object_versions(api: &Arc<ECStore>, bucket: &str, to_del: &[
             let Some(replication_state) = replication_candidates.get(i).and_then(|c| c.clone()) else {
                 continue;
             };
-            deleted_obj.replication_state = Some(replication_state);
+            deleted_obj.replication_state = Some(replication_state_to_filemeta(&replication_state));
             ReplicationLifecycleBridge::schedule_delete(bucket.to_string(), deleted_obj.clone()).await;
         }
 

crates/ecstore/src/core/pools.rs

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+use crate::bucket::replication::replication_state_from_filemeta;
 use crate::bucket::versioning_sys::BucketVersioningSys;
 use crate::bucket::{
     lifecycle::{
@@ -2132,7 +2133,10 @@ fn decommission_delete_marker_opts(
         data_movement: true,
         delete_marker: true,
         skip_decommissioned: true,
-        delete_replication: version.replication_state_internal.clone(),
+        delete_replication: version
+            .replication_state_internal
+            .as_ref()
+            .map(replication_state_from_filemeta),
         ..Default::default()
     }
 }
@@ -4236,12 +4240,12 @@ mod tests {
         let mod_time = OffsetDateTime::now_utc();
         let version = rustfs_filemeta::FileInfo {
             mod_time: Some(mod_time),
-            replication_state_internal: Some(ReplicationState {
+            replication_state_internal: Some(crate::bucket::replication::replication_state_to_filemeta(&ReplicationState {
                 replica_status: ReplicationStatusType::Replica,
                 delete_marker: true,
                 replicate_decision_str: "existing".to_string(),
                 ..Default::default()
-            }),
+            })),
             ..Default::default()
         };
 

crates/ecstore/src/object_api/mod.rs

@@ -17,8 +17,8 @@
 
 use crate::bucket::metadata_sys::get_versioning_config;
 use crate::bucket::replication::{
-    ReplicateDecision, ReplicationState, ReplicationStatusType, VersionPurgeStatusType, replication_statuses_map,
+    ReplicateDecision, ReplicationState, ReplicationStatusType, VersionPurgeStatusType, replication_status_from_filemeta,
-    version_purge_statuses_map,
+    replication_statuses_map, version_purge_status_from_filemeta, version_purge_statuses_map,
 };
 use crate::bucket::versioning::VersioningApi as _;
 use crate::config::storageclass;

crates/ecstore/src/object_api/types.rs

@@ -445,7 +445,7 @@ impl ObjectInfo {
             .map(|v| v.replicate_decision_str.clone())
             .unwrap_or_default();
 
-        let mut replication_status = fi.replication_status();
+        let mut replication_status = replication_status_from_filemeta(fi.replication_status());
         if replication_status.is_empty()
             && let Some(status) = fi.metadata.get(AMZ_BUCKET_REPLICATION_STATUS).cloned()
             && status == ReplicationStatusType::Replica.as_str()
@@ -453,7 +453,7 @@ impl ObjectInfo {
             replication_status = ReplicationStatusType::Replica;
         }
 
-        let version_purge_status = fi.version_purge_status();
+        let version_purge_status = version_purge_status_from_filemeta(fi.version_purge_status());
 
         let transitioned_object = TransitionedObject {
             name: fi.transitioned_objname.clone(),
@@ -1052,10 +1052,10 @@ mod tests {
     #[test]
     fn from_file_info_preserves_replication_decision() {
         let fi = FileInfo {
-            replication_state_internal: Some(ReplicationState {
+            replication_state_internal: Some(crate::bucket::replication::replication_state_to_filemeta(&ReplicationState {
                 replicate_decision_str: "arn=true;false;arn:replication::1:dest;rule-id".to_string(),
                 ..Default::default()
-            }),
+            })),
             ..Default::default()
         };
 

crates/ecstore/src/services/rebalance/migration.rs

@@ -1,4 +1,5 @@
 use super::worker::{is_transient_rebalance_error, rebalance_migration_retry_delay, sleep_rebalance_migration_retry};
+use crate::bucket::replication::replication_state_from_filemeta;
 use crate::data_usage::DATA_USAGE_CACHE_NAME;
 use crate::error::{Error, Result, is_err_object_not_found, is_err_version_not_found};
 use crate::object_api::{GetObjectReader, ObjectInfo, ObjectOptions};
@@ -32,7 +33,10 @@ pub(super) fn rebalance_delete_marker_opts(version: &FileInfo, version_id: Optio
         data_movement: true,
         delete_marker: true,
         skip_decommissioned: true,
-        delete_replication: version.replication_state_internal.clone(),
+        delete_replication: version
+            .replication_state_internal
+            .as_ref()
+            .map(replication_state_from_filemeta),
         ..Default::default()
     }
 }

crates/ecstore/src/services/rebalance/rebalance_unit_tests.rs

@@ -49,7 +49,7 @@ use super::{
     DiskStat, GetObjectReader, ObjectInfo, ObjectOptions, RebalSaveOpt, RebalStatus, RebalanceBucketOutcome,
     RebalanceCleanupWarnings, RebalanceEntryOutcome, RebalanceInfo, RebalanceMeta, RebalanceStats,
 };
-use crate::bucket::replication::{ReplicationState, ReplicationStatusType};
+use crate::bucket::replication::{ReplicationState, ReplicationStatusType, replication_state_to_filemeta};
 use crate::data_movement;
 use crate::data_usage::DATA_USAGE_CACHE_NAME;
 use crate::disk::RUSTFS_META_BUCKET;
@@ -223,12 +223,12 @@ fn test_rebalance_delete_marker_opts_preserves_replication_state() {
     let mod_time = OffsetDateTime::now_utc();
     let version = FileInfo {
         mod_time: Some(mod_time),
-        replication_state_internal: Some(ReplicationState {
+        replication_state_internal: Some(replication_state_to_filemeta(&ReplicationState {
             replica_status: ReplicationStatusType::Replica,
             delete_marker: true,
             replicate_decision_str: "existing".to_string(),
             ..Default::default()
-        }),
+        })),
         ..version_deleted()
     };
 

crates/ecstore/src/set_disk/mod.rs

@@ -22,6 +22,7 @@ use crate::bucket::metadata_sys;
 use crate::bucket::object_lock::objectlock_sys::check_retention_for_modification;
 use crate::bucket::replication::{
     ReplicateDecision, ReplicationObjectBridge, ReplicationState, ReplicationStatusType, VersionPurgeStatusType,
+    replication_state_to_filemeta,
 };
 use crate::bucket::versioning::VersioningApi;
 use crate::bucket::versioning_sys::BucketVersioningSys;
@@ -2944,7 +2945,7 @@ impl crate::storage_api_contracts::object::ObjectIO for SetDisks {
             }
             record_capacity_scope_if_needed(opts.capacity_scope_token, &online_disks);
 
-            fi.replication_state_internal = Some(opts.put_replication_state());
+            fi.replication_state_internal = Some(replication_state_to_filemeta(&opts.put_replication_state()));
 
             fi.is_latest = true;
 
@@ -4152,7 +4153,7 @@ impl crate::storage_api_contracts::object::ObjectOperations for SetDisks {
                 deleted: delete_marker,
                 mark_deleted: mark_delete,
                 mod_time: Some(mod_time),
-                replication_state_internal: opts.delete_replication.clone(),
+                replication_state_internal: opts.delete_replication.as_ref().map(replication_state_to_filemeta),
                 ..Default::default() // TODO: Transition
             };
 
@@ -4190,7 +4191,7 @@ impl crate::storage_api_contracts::object::ObjectOperations for SetDisks {
             mark_deleted: mark_delete,
             deleted: delete_marker,
             mod_time: Some(mod_time),
-            replication_state_internal: opts.delete_replication.clone(),
+            replication_state_internal: opts.delete_replication.as_ref().map(replication_state_to_filemeta),
             ..Default::default()
         };
 

crates/ecstore/src/store/object.rs

@@ -1347,7 +1347,8 @@ mod tests {
     use super::*;
     use crate::bucket::lifecycle::core::TRANSITION_COMPLETE;
     use crate::bucket::replication::{
-        ReplicationState, ReplicationStatusType, VersionPurgeStatusType, replication_statuses_map, version_purge_statuses_map,
+        ReplicationState, ReplicationStatusType, VersionPurgeStatusType, replication_state_to_filemeta, replication_statuses_map,
+        version_purge_statuses_map,
     };
     use crate::layout::{
         endpoints::{Endpoints, PoolEndpoints},
@@ -1513,13 +1514,13 @@ mod tests {
             transitioned_objname: "remote/object".to_string(),
             transition_tier: "WARM".to_string(),
             transition_version_id: Some(transition_version_id),
-            replication_state_internal: Some(ReplicationState {
+            replication_state_internal: Some(replication_state_to_filemeta(&ReplicationState {
                 replication_status_internal: Some("arn:minio:replication:target=COMPLETED;".to_string()),
                 targets: replication_statuses_map("arn:minio:replication:target=COMPLETED;"),
                 version_purge_status_internal: Some("arn:minio:replication:target=PENDING;".to_string()),
                 purge_targets: version_purge_statuses_map("arn:minio:replication:target=PENDING;"),
                 ..Default::default()
-            }),
+            })),
             metadata: HashMap::from([
                 ("etag".to_string(), "etag-value".to_string()),
                 ("x-amz-meta-key".to_string(), "metadata-value".to_string()),

crates/replication/Cargo.toml

@@ -26,10 +26,11 @@ categories = ["web-programming", "development-tools", "filesystem"]
 documentation = "https://docs.rs/rustfs-replication/latest/rustfs_replication/"
 
 [dependencies]
+bytes.workspace = true
 byteorder.workspace = true
+regex.workspace = true
 rmp.workspace = true
 rmp-serde.workspace = true
-rustfs-filemeta.workspace = true
 rustfs-utils = { workspace = true, features = ["http", "path", "string"] }
 s3s.workspace = true
 serde.workspace = true

crates/replication/src/lib.rs

@@ -36,9 +36,10 @@ pub use delete::{
     should_retry_delete_marker_purge,
 };
 pub use filemeta::{
-    REPLICATE_EXISTING, REPLICATE_EXISTING_DELETE, REPLICATE_HEAL, REPLICATE_HEAL_DELETE, REPLICATE_INCOMING_DELETE,
+    REPLICATE_EXISTING, REPLICATE_EXISTING_DELETE, REPLICATE_HEAL, REPLICATE_HEAL_DELETE, REPLICATE_INCOMING,
-    ReplicateDecision, ReplicateObjectInfo, ReplicateTargetDecision, ReplicatedInfos, ReplicatedTargetInfo, ReplicationAction,
+    REPLICATE_INCOMING_DELETE, REPLICATE_MRF, REPLICATE_QUEUED, REPLICATION_RESET, REPLICATION_STATUS, ReplicateDecision,
-    ReplicationState, ReplicationStatusType, ReplicationType, ReplicationWorkerOperation, ResyncDecision, ResyncTargetDecision,
+    ReplicateObjectInfo, ReplicateTargetDecision, ReplicatedInfos, ReplicatedTargetInfo, ReplicationAction, ReplicationState,
+    ReplicationStatusType, ReplicationType, ReplicationWorkerOperation, ResyncDecision, ResyncTargetDecision,
     VersionPurgeStatusType, get_replication_state, parse_replicate_decision, replication_statuses_map, target_reset_header,
     version_purge_statuses_map,
 };

docs/architecture/ecstore-module-split-plan.md

@@ -124,8 +124,9 @@ Current coupling:
 - resync options, bucket/target resync status DTOs, status display labels, and
   the persisted resync status wire format live in `crates/replication`, with
   ECStore retaining only error mapping and MRF persistence locally;
-- `crates/replication/src/filemeta.rs` is the only direct filemeta wire-contract
+- `ReplicationCrateFileMetaIndependence`: replication status, decision, MRF,
-  import boundary inside `rustfs-replication`;
+  resync, and target-reset wire contracts are owned inside `rustfs-replication`
+  instead of importing `rustfs-filemeta`;
 - `ReplicationCrateStorageApiIndependence`: delete work DTOs are owned inside
   `rustfs-replication`; ECStore converts storage-api delete DTOs at the
   replication storage boundary instead of `rustfs-replication` importing
@@ -133,8 +134,8 @@ Current coupling:
 - direct ECStore replication imports from `rustfs-replication` are limited to
   `*_boundary.rs` modules;
 - storage-api delete replication status/state helpers use the local
-  `crates/storage-api/src/replication.rs` contract boundary while the
+  `crates/storage-api/src/replication.rs` contract boundary; ECStore converts
-  underlying wire types remain in `rustfs-filemeta`;
+  those owner DTOs at the replication storage boundary before queueing work;
 - admin replication extension target filtering and resync request construction
   stay behind the admin storage boundary instead of exposing replication work
   DTO construction to handlers;
@@ -175,17 +176,18 @@ Required contracts before crate movement:
   labels are exposed through the contract type in
   `crates/ecstore/src/bucket/replication/replication_config_store.rs`.
 - `ReplicationFileMeta`: replication status, decisions, MRF entries, resync
-  decisions, and target reset helpers. `rustfs_filemeta` replication contracts
+  decisions, and target reset helpers. ECStore concentrates filemeta-to-
-  are concentrated in
+  replication compatibility conversions in
   `crates/ecstore/src/bucket/replication/replication_filemeta_boundary.rs`,
   while `FileInfo` remains in the storage boundary for storage trait bindings
   and walk options.
-- `ReplicationCrateFileMetaFacade`: replication facade compatibility symbols
+- `ReplicationCrateFileMetaIndependence`: filemeta wire contracts consumed by
-  that still originate in filemeta wire contracts are concentrated in
+  replication workers are owned in `crates/replication/src/filemeta.rs`, and
-  `crates/replication/src/filemeta.rs` inside `rustfs-replication`.
+  `rustfs-replication` must not import or depend on `rustfs-filemeta`.
-- `ReplicationCrateStorageApiBoundary`: storage API delete DTOs consumed by
+- `ReplicationCrateStorageApiIndependence`: delete work DTOs consumed by
-  replication delete/queue/operation helpers are concentrated in
+  replication delete/queue/operation helpers are owned in
-  `crates/replication/src/storage_api.rs` inside `rustfs-replication`.
+  `crates/replication/src/storage_api.rs`, and `rustfs-replication` must not
+  import or depend on `rustfs-storage-api`.
 - `EcstoreReplicationBoundaryImports`: ECStore-side imports from
   `rustfs-replication` are concentrated in replication `*_boundary.rs` modules.
 - `RuntimeReplicationFacadeConsumers`: scanner, admin, storage-owner, and app

rustfs/src/app/object_usecase.rs

@@ -41,9 +41,10 @@ use super::storage_api::object_usecase::bucket::{
     quota::QuotaOperation,
     replication::{
         REPLICATE_INCOMING_DELETE, ReplicationStatusType, VersionPurgeStatusType, check_replicate_delete,
-        delete_replication_state_from_config, delete_replication_version_id, must_replicate_object, schedule_object_replication,
+        delete_replication_state_from_config, delete_replication_version_id, deleted_object_has_pending_replication_delete,
-        schedule_replication_delete, should_schedule_delete_replication, should_use_existing_delete_replication_info,
+        must_replicate_object, schedule_object_replication, schedule_replication_delete, set_deleted_object_replication_state,
-        should_use_existing_delete_replication_source,
+        set_object_to_delete_version_purge_status, should_schedule_delete_replication,
+        should_use_existing_delete_replication_info, should_use_existing_delete_replication_source,
     },
     tagging::decode_tags,
     validate_restore_request,
@@ -1528,7 +1529,7 @@ async fn enrich_delete_replication_state_if_needed(
         version_id,
         obj_info.replication_status == ReplicationStatusType::Replica,
     ) {
-        delete_object.replication_state = Some(local_state);
+        set_deleted_object_replication_state(delete_object, &local_state);
     }
 }
 
@@ -4701,7 +4702,7 @@ impl DefaultObjectUsecase {
                 .await;
                 if dsc.replicate_any() {
                     if object.version_id.is_some() {
-                        object.version_purge_status = Some(VersionPurgeStatusType::Pending);
+                        set_object_to_delete_version_purge_status(&mut object, VersionPurgeStatusType::Pending);
                         object.version_purge_statuses = dsc.pending_status();
                     } else {
                         object.delete_marker_replication_status = dsc.pending_status();
@@ -4843,8 +4844,7 @@ impl DefaultObjectUsecase {
         for dobjs in &delete_results {
             if let Some(dobj) = &dobjs.delete_object
                 && replicate_deletes
-                && (dobj.delete_marker_replication_status() == ReplicationStatusType::Pending
+                && deleted_object_has_pending_replication_delete(dobj)
-                    || dobj.version_purge_status() == VersionPurgeStatusType::Pending)
             {
                 let _activity_guard = DeleteTailActivityGuard::new(DeleteTailStage::Replication);
                 let mut dobj = dobj.clone();
@@ -5098,9 +5098,10 @@ impl DefaultObjectUsecase {
                     deleted_object_source.version_id
                 },
                 delete_marker_mtime: deleted_object_source.mod_time,
-                replication_state: Some(replication_state_source.replication_state()),
+                replication_state: None,
                 ..Default::default()
             };
+            set_deleted_object_replication_state(&mut deleted_object, &replication_state_source.replication_state());
             enrich_delete_replication_state_if_needed(&bucket, &mut deleted_object, replication_state_source).await;
             schedule_replication_delete(deleted_object, bucket.clone(), REPLICATE_INCOMING_DELETE.to_string()).await;
         }
@@ -8463,15 +8464,14 @@ mod tests {
 
     #[test]
     fn replica_delete_enrichment_must_not_reuse_upstream_targets() {
-        let delete_object = StorageDeletedObject {
+        let upstream_state = ReplicationState {
-            replication_state: Some(ReplicationState {
+            replicate_decision_str: "arn:aws:s3:::upstream=true;false;arn:aws:s3:::upstream;".to_string(),
-                replicate_decision_str: "arn:aws:s3:::upstream=true;false;arn:aws:s3:::upstream;".to_string(),
+            replication_status_internal: Some("arn:aws:s3:::upstream=COMPLETED;".to_string()),
-                replication_status_internal: Some("arn:aws:s3:::upstream=COMPLETED;".to_string()),
+            targets: replication_statuses_map("arn:aws:s3:::upstream=COMPLETED;"),
-                targets: replication_statuses_map("arn:aws:s3:::upstream=COMPLETED;"),
-                ..Default::default()
-            }),
             ..Default::default()
         };
+        let mut delete_object = StorageDeletedObject::default();
+        set_deleted_object_replication_state(&mut delete_object, &upstream_state);
         let obj_info = ObjectInfo {
             replication_status: ReplicationStatusType::Replica,
             ..Default::default()

rustfs/src/app/storage_api.rs

@@ -677,6 +677,29 @@ pub(crate) mod bucket {
             ReplicationObjectBridge::schedule_storage_delete(delete_object, bucket, event_type).await;
         }
 
+        pub(crate) fn set_deleted_object_replication_state(
+            delete_object: &mut crate::storage::storage_api::StorageDeletedObject,
+            state: &replication_contracts::ReplicationState,
+        ) {
+            delete_object.replication_state = Some(replication_contracts::replication_state_to_filemeta(state));
+        }
+
+        pub(crate) fn set_object_to_delete_version_purge_status(
+            object: &mut crate::storage::storage_api::StorageObjectToDelete,
+            status: VersionPurgeStatusType,
+        ) {
+            object.version_purge_status = Some(replication_contracts::version_purge_status_to_filemeta(status));
+        }
+
+        pub(crate) fn deleted_object_has_pending_replication_delete(
+            deleted_object: &crate::storage::storage_api::StorageDeletedObject,
+        ) -> bool {
+            deleted_object.delete_marker_replication_status()
+                == replication_contracts::replication_status_to_filemeta(ReplicationStatusType::Pending)
+                || deleted_object.version_purge_status()
+                    == replication_contracts::version_purge_status_to_filemeta(VersionPurgeStatusType::Pending)
+        }
+
         pub(crate) fn delete_replication_state_from_config(
             config: &s3s::dto::ReplicationConfiguration,
             obj_info: &crate::storage::storage_api::StorageObjectInfo,

scripts/check_architecture_migration_rules.sh

@@ -86,7 +86,7 @@ require_source_contains "docs/architecture/overview.md" "ecstore-api-facade-inve
 require_source_contains "docs/architecture/ecstore-module-split-plan.md" "ecstore-api-facade-inventory.md" "ECStore split plan facade inventory link"
 require_source_contains "docs/architecture/ecstore-module-split-plan.md" "EcstoreReplicationBoundaryImports" "ECStore split plan replication boundary imports section"
 require_source_contains "docs/architecture/ecstore-module-split-plan.md" "RuntimeReplicationFacadeConsumers" "ECStore split plan runtime replication facade consumer section"
-require_source_contains "docs/architecture/ecstore-module-split-plan.md" "ReplicationCrateFileMetaFacade" "ECStore split plan replication crate filemeta facade section"
+require_source_contains "docs/architecture/ecstore-module-split-plan.md" "ReplicationCrateFileMetaIndependence" "ECStore split plan replication crate filemeta independence section"
 require_source_contains "docs/architecture/ecstore-module-split-plan.md" "ReplicationCrateStorageApiIndependence" "ECStore split plan replication crate storage-api independence section"
 require_source_contains "docs/architecture/ecstore-module-split-plan.md" "StorageApiReplicationContracts" "ECStore split plan storage-api replication contract section"
 require_source_contains "docs/architecture/ecstore-api-facade-inventory.md" "## Facade Group Inventory" "ECStore facade inventory group section"
@@ -976,7 +976,8 @@ fi
       rg -v '^crates/ecstore/src/bucket/replication/' || true
     rg -n -U --with-filename 'use\s+rustfs_filemeta::\{[^}]*\b(ReplicateDecision|ReplicationState|ReplicationStatusType|VersionPurgeStatusType|replication_statuses_map|version_purge_statuses_map)\b|use\s+rustfs_filemeta::(ReplicateDecision|ReplicationState|ReplicationStatusType|VersionPurgeStatusType|replication_statuses_map|version_purge_statuses_map)\b|rustfs_filemeta::(Replicate|Replication|VersionPurge|replication_statuses_map|version_purge_statuses_map)' \
       crates/ecstore/src \
-      --glob '*.rs' || true
+      --glob '*.rs' |
+      rg -v '^crates/ecstore/src/bucket/replication/' || true
   }
 ) >"$ECSTORE_REPLICATION_CONTRACT_BYPASS_HITS_FILE"
 
@@ -2664,14 +2665,14 @@ fi
 
 (
   cd "$ROOT_DIR"
-  rg -n --with-filename 'rustfs_filemeta::|use\s+rustfs_filemeta\b' \
+  {
-    crates/replication/src \
+    rg -n --with-filename 'rustfs_filemeta::|use\s+rustfs_filemeta\b' crates/replication/src --glob '*.rs'
-    --glob '*.rs' |
+    rg -n --with-filename '^rustfs-filemeta\b' crates/replication/Cargo.toml
-    rg -v '^crates/replication/src/filemeta\.rs:' || true
+  } || true
 ) >"$REPLICATION_CRATE_FILEMETA_BYPASS_HITS_FILE"
 
 if [[ -s "$REPLICATION_CRATE_FILEMETA_BYPASS_HITS_FILE" ]]; then
-  report_failure "replication crate filemeta contracts must stay behind crates/replication/src/filemeta.rs: $(paste -sd '; ' "$REPLICATION_CRATE_FILEMETA_BYPASS_HITS_FILE")"
+  report_failure "rustfs-replication must not import or depend on rustfs-filemeta: $(paste -sd '; ' "$REPLICATION_CRATE_FILEMETA_BYPASS_HITS_FILE")"
 fi
 
 (