Resolve spacetime client binding merge conflicts

server-rs/crates/module-custom-world/src/lib.rs

@@ -562,6 +562,21 @@ pub struct CustomWorldAgentOperationGetInput {
     pub operation_id: String,
 }
 
+#[cfg_attr(feature = "spacetime-types", derive(SpacetimeType))]
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
+pub struct CustomWorldAgentOperationProgressInput {
+    pub session_id: String,
+    pub owner_user_id: String,
+    pub operation_id: String,
+    pub operation_type: RpgAgentOperationType,
+    pub operation_status: RpgAgentOperationStatus,
+    pub phase_label: String,
+    pub phase_detail: String,
+    pub operation_progress: u32,
+    pub error_message: Option<String>,
+    pub updated_at_micros: i64,
+}
+
 #[cfg_attr(feature = "spacetime-types", derive(SpacetimeType))]
 #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub struct CustomWorldAgentOperationProcedureResult {
@@ -1205,6 +1220,24 @@ pub fn validate_custom_world_agent_operation_get_input(
     Ok(())
 }
 
+pub fn validate_custom_world_agent_operation_progress_input(
+    input: &CustomWorldAgentOperationProgressInput,
+) -> Result<(), CustomWorldFieldError> {
+    validate_custom_world_agent_operation_get_input(&CustomWorldAgentOperationGetInput {
+        session_id: input.session_id.clone(),
+        owner_user_id: input.owner_user_id.clone(),
+        operation_id: input.operation_id.clone(),
+    })?;
+    validate_custom_world_agent_operation_fields(
+        &input.operation_id,
+        &input.session_id,
+        &input.phase_label,
+        input.operation_progress,
+    )?;
+
+    Ok(())
+}
+
 pub fn validate_custom_world_works_list_input(
     input: &CustomWorldWorksListInput,
 ) -> Result<(), CustomWorldFieldError> {