Split consolidation proposal DTOs

packages/elf-service/src/consolidation/types.rs

@@ -1,254 +1,24 @@
+mod proposals;
 mod runs;
 
-pub use runs::{
-	ConsolidationRunCreateRequest, ConsolidationRunCreateResponse, ConsolidationRunGetRequest,
-	ConsolidationRunResponse, ConsolidationRunsListRequest, ConsolidationRunsListResponse,
+pub use self::{
+	proposals::{
+		ConsolidationProposalGetRequest, ConsolidationProposalInput, ConsolidationProposalResponse,
+		ConsolidationProposalReviewEventResponse, ConsolidationProposalReviewRequest,
+		ConsolidationProposalsListRequest, ConsolidationProposalsListResponse,
+	},
+	runs::{
+		ConsolidationRunCreateRequest, ConsolidationRunCreateResponse, ConsolidationRunGetRequest,
+		ConsolidationRunResponse, ConsolidationRunsListRequest, ConsolidationRunsListResponse,
+	},
 };
 
-use serde::{Deserialize, Serialize};
+use serde::Deserialize;
 use serde_json::{Map, Value};
-use time::OffsetDateTime;
-use uuid::Uuid;
-
-use elf_domain::consolidation::{
-	ConsolidationApplyIntent, ConsolidationInputRef, ConsolidationLineage, ConsolidationMarkers,
-	ConsolidationProposalContract, ConsolidationProposalDiff, ConsolidationReviewAction,
-	ConsolidationReviewState, ConsolidationUnsupportedClaimFlag,
-};
-use elf_storage::models::{ConsolidationProposal, ConsolidationProposalReviewEvent};
 
 pub(super) const DEFAULT_LIST_LIMIT: i64 = 50;
 pub(super) const MAX_LIST_LIMIT: i64 = 200;
 
-/// Fixture proposal input for a consolidation run.
-#[derive(Clone, Debug, Deserialize)]
-pub struct ConsolidationProposalInput {
-	/// Proposal kind, such as `derived_note` or `knowledge_page`.
-	pub proposal_kind: String,
-	/// Derived-output apply intent.
-	pub apply_intent: ConsolidationApplyIntent,
-	/// Source references directly supporting the proposal.
-	pub source_refs: Vec<ConsolidationInputRef>,
-	#[serde(default = "empty_object")]
-	/// Aggregate source snapshot metadata for reviewer inspection.
-	pub source_snapshot: Value,
-	/// Proposal lineage.
-	pub lineage: ConsolidationLineage,
-	/// Fixture confidence in the proposal.
-	pub confidence: f32,
-	#[serde(default)]
-	/// Unsupported claims reviewers must inspect before accepting the proposal.
-	pub unsupported_claim_flags: Vec<ConsolidationUnsupportedClaimFlag>,
-	#[serde(default)]
-	/// Review markers for contradiction and staleness checks.
-	pub markers: ConsolidationMarkers,
-	/// Reviewable derived-output diff.
-	pub diff: ConsolidationProposalDiff,
-	#[serde(default = "empty_object")]
-	/// Derived target reference, when the target already exists.
-	pub target_ref: Value,
-	#[serde(default = "empty_object")]
-	/// Proposed derived output payload.
-	pub proposed_payload: Value,
-}
-impl ConsolidationProposalInput {
-	pub(super) fn into_contract(self) -> ConsolidationProposalContract {
-		ConsolidationProposalContract {
-			proposal_kind: self.proposal_kind,
-			apply_intent: self.apply_intent,
-			source_refs: self.source_refs,
-			source_snapshot: self.source_snapshot,
-			lineage: self.lineage,
-			confidence: self.confidence,
-			unsupported_claim_flags: self.unsupported_claim_flags,
-			markers: self.markers,
-			diff: self.diff,
-			target_ref: self.target_ref,
-			proposed_payload: self.proposed_payload,
-		}
-	}
-}
-
-/// Request to get one consolidation proposal.
-#[derive(Clone, Debug, Deserialize)]
-pub struct ConsolidationProposalGetRequest {
-	/// Tenant that owns the proposal.
-	pub tenant_id: String,
-	/// Project that owns the proposal.
-	pub project_id: String,
-	/// Proposal identifier.
-	pub proposal_id: Uuid,
-}
-
-/// Request to list consolidation proposals.
-#[derive(Clone, Debug, Deserialize)]
-pub struct ConsolidationProposalsListRequest {
-	/// Tenant that owns the proposals.
-	pub tenant_id: String,
-	/// Project that owns the proposals.
-	pub project_id: String,
-	/// Optional run filter.
-	pub run_id: Option<Uuid>,
-	/// Optional review-state filter.
-	pub review_state: Option<ConsolidationReviewState>,
-	/// Maximum number of proposals to return.
-	pub limit: Option<u32>,
-}
-
-/// Response returned by consolidation proposal listing.
-#[derive(Clone, Debug, Serialize)]
-pub struct ConsolidationProposalsListResponse {
-	/// Returned proposals.
-	pub proposals: Vec<ConsolidationProposalResponse>,
-}
-
-/// Request to apply one proposal review action.
-#[derive(Clone, Debug, Deserialize)]
-pub struct ConsolidationProposalReviewRequest {
-	/// Tenant that owns the proposal.
-	pub tenant_id: String,
-	/// Project that owns the proposal.
-	pub project_id: String,
-	/// Agent performing the review action.
-	pub reviewer_agent_id: String,
-	/// Proposal identifier.
-	pub proposal_id: Uuid,
-	/// Requested review action.
-	pub review_action: ConsolidationReviewAction,
-	/// Optional reviewer comment.
-	pub review_comment: Option<String>,
-}
-
-/// Public consolidation proposal review audit DTO.
-#[derive(Clone, Debug, Serialize)]
-pub struct ConsolidationProposalReviewEventResponse {
-	/// Review event identifier.
-	pub review_id: Uuid,
-	/// Reviewed proposal identifier.
-	pub proposal_id: Uuid,
-	/// Parent consolidation run identifier.
-	pub run_id: Uuid,
-	/// Tenant that owns the proposal.
-	pub tenant_id: String,
-	/// Project that owns the proposal.
-	pub project_id: String,
-	/// Agent that performed the review action.
-	pub reviewer_agent_id: String,
-	/// Review action requested by the reviewer.
-	pub action: String,
-	/// Review state before the transition.
-	pub from_review_state: String,
-	/// Review state after the transition.
-	pub to_review_state: String,
-	/// Optional reviewer comment.
-	pub review_comment: Option<String>,
-	/// Creation timestamp.
-	pub created_at: OffsetDateTime,
-}
-impl From<ConsolidationProposalReviewEvent> for ConsolidationProposalReviewEventResponse {
-	fn from(event: ConsolidationProposalReviewEvent) -> Self {
-		Self {
-			review_id: event.review_id,
-			proposal_id: event.proposal_id,
-			run_id: event.run_id,
-			tenant_id: event.tenant_id,
-			project_id: event.project_id,
-			reviewer_agent_id: event.reviewer_agent_id,
-			action: event.action,
-			from_review_state: event.from_review_state,
-			to_review_state: event.to_review_state,
-			review_comment: event.review_comment,
-			created_at: event.created_at,
-		}
-	}
-}
-
-/// Public consolidation proposal DTO.
-#[derive(Clone, Debug, Serialize)]
-pub struct ConsolidationProposalResponse {
-	/// Consolidation proposal identifier.
-	pub proposal_id: Uuid,
-	/// Parent consolidation run identifier.
-	pub run_id: Uuid,
-	/// Tenant that owns the proposal.
-	pub tenant_id: String,
-	/// Project that owns the proposal.
-	pub project_id: String,
-	/// Agent that registered the proposal.
-	pub agent_id: String,
-	/// Versioned consolidation contract schema.
-	pub contract_schema: String,
-	/// Proposal kind, such as derived_note or knowledge_page.
-	pub proposal_kind: String,
-	/// Derived-output apply intent.
-	pub apply_intent: String,
-	/// Current review state.
-	pub review_state: String,
-	/// Serialized source references.
-	pub source_refs: Value,
-	/// Aggregate source snapshot metadata.
-	pub source_snapshot: Value,
-	/// Serialized proposal lineage.
-	pub lineage: Value,
-	/// Serialized reviewable diff.
-	pub diff: Value,
-	/// Proposal confidence score.
-	pub confidence: f32,
-	/// Serialized unsupported-claim flags.
-	pub unsupported_claim_flags: Value,
-	/// Serialized contradiction markers.
-	pub contradiction_markers: Value,
-	/// Serialized staleness markers.
-	pub staleness_markers: Value,
-	/// Serialized derived target reference.
-	pub target_ref: Value,
-	/// Serialized proposed derived output payload.
-	pub proposed_payload: Value,
-	/// Agent that last reviewed the proposal.
-	pub reviewer_agent_id: Option<String>,
-	/// Optional reviewer comment.
-	pub review_comment: Option<String>,
-	/// Timestamp of the last review transition.
-	pub reviewed_at: Option<OffsetDateTime>,
-	/// Creation timestamp.
-	pub created_at: OffsetDateTime,
-	/// Last update timestamp.
-	pub updated_at: OffsetDateTime,
-	/// Append-only review events for detail readback.
-	pub review_events: Vec<ConsolidationProposalReviewEventResponse>,
-}
-impl From<ConsolidationProposal> for ConsolidationProposalResponse {
-	fn from(proposal: ConsolidationProposal) -> Self {
-		Self {
-			proposal_id: proposal.proposal_id,
-			run_id: proposal.run_id,
-			tenant_id: proposal.tenant_id,
-			project_id: proposal.project_id,
-			agent_id: proposal.agent_id,
-			contract_schema: proposal.contract_schema,
-			proposal_kind: proposal.proposal_kind,
-			apply_intent: proposal.apply_intent,
-			review_state: proposal.review_state,
-			source_refs: proposal.source_refs,
-			source_snapshot: proposal.source_snapshot,
-			lineage: proposal.lineage,
-			diff: proposal.diff,
-			confidence: proposal.confidence,
-			unsupported_claim_flags: proposal.unsupported_claim_flags,
-			contradiction_markers: proposal.contradiction_markers,
-			staleness_markers: proposal.staleness_markers,
-			target_ref: proposal.target_ref,
-			proposed_payload: proposal.proposed_payload,
-			reviewer_agent_id: proposal.reviewer_agent_id,
-			review_comment: proposal.review_comment,
-			reviewed_at: proposal.reviewed_at,
-			created_at: proposal.created_at,
-			updated_at: proposal.updated_at,
-			review_events: Vec::new(),
-		}
-	}
-}
-
 #[derive(Clone, Debug, Deserialize)]
 pub(super) struct PromotedMemoryPayload {
 	#[serde(rename = "type")]