[orion]FIX: update branch and fix conflicts

Author: AidCheng

api-model/src/buck2/api.rs

@@ -15,12 +15,14 @@ use crate::buck2::{status::Status, types::ProjectRelativePath};
 
 /// Parameters required to build a task.
 #[allow(dead_code)]
-#[derive(Debug, Deserialize, Serialize)]
+#[derive(Debug, Deserialize, Serialize, ToSchema)]
 pub struct TaskBuildRequest {
     /// The repository base path
     pub repo: String,
     /// The change list link (URL)
     pub cl_link: String,
+    //TODO: for old database only, delete after updated
+    pub cl_id: i64,
     /// The list of file diff changes
     pub changes: Vec<Status<ProjectRelativePath>>,
     /// Buck2 target path (e.g. //app:server). Optional for backward compatibility.
@@ -39,21 +41,26 @@ impl TaskBuildRequest {
 pub struct RetryBuildRequest {
     pub build_id: String,
     pub cl_link: String,
-    pub cl: i64,
+    pub cl_id: i64,
     pub changes: Vec<Status<ProjectRelativePath>>,
+    pub targets: Option<Vec<String>>,
 }
 
 /// Result of a task build operation containing status and metadata. Used by Orion-Server
 #[allow(dead_code)]
-#[derive(Debug, Deserialize, Serialize)]
-pub struct TaskBuildResult {
-    /// Whether the build operation was successful
-    pub success: bool,
+#[derive(Debug, Deserialize, Serialize, ToSchema)]
+pub struct OrionBuildResult {
     /// Unique identifier for the build task
-    pub id: String,
-    /// Process exit code (None if not yet completed)
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub exit_code: Option<i32>,
+    pub build_id: String,
+    /// Current status of the build (e.g., "queued", "running", "success", "failure")
+    pub status: String,
     /// Human-readable status or error message
     pub message: String,
 }
+
+/// Response structure for build-related API endpoints in Orion-Server
+#[derive(Debug, Deserialize, Serialize, ToSchema)]
+pub struct OrionServerResponse {
+    pub task_id: String,
+    pub results: Vec<OrionBuildResult>,
+}

api-model/src/buck2/ws.rs

@@ -13,15 +13,15 @@ use crate::buck2::{
 #[serde(tag = "type")]
 pub enum WSMessage {
     // Server -> Worker messages
-    Task {
-        id: String,
+    TaskBuild {
+        build_id: String,
         repo: String,
         cl_link: String,
         changes: Vec<Status<ProjectRelativePath>>,
     },
 
-    TaskWithTargets {
-        id: String,
+    TaskBuildWithTargets {
+        build_id: String,
         repo: String,
         cl_link: String,
         // targets: Vec<Target>,
@@ -38,23 +38,23 @@ pub enum WSMessage {
     Heartbeat,
 
     TaskPhaseUpdate {
-        id: String,
+        build_id: String,
         phase: TaskPhase,
     },
 
     TaskAck {
-        id: String,
+        build_id: String,
         success: bool,
         message: String,
     },
 
     TaskBuildOutput {
-        id: String,
+        build_id: String,
         output: String,
     },
 
     TaskBuildComplete {
-        id: String,
+        build_id: String,
         success: bool,
         exit_code: Option<i32>,
         message: String,

jupiter/callisto/src/build_events.rs

@@ -20,23 +20,24 @@ pub struct Model {
 #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
 pub enum Relation {
     #[sea_orm(
-        belongs_to = "super::tasks::Entity",
+        belongs_to = "super::orion_tasks::Entity",
         from = "Column::TaskId",
-        to = "super::tasks::Column::Id",
+        to = "super::orion_tasks::Column::Id",
         on_update = "Cascade",
         on_delete = "Cascade"
     )]
-    Tasks,
+    OrionTasks,
 }
 
-impl Related<super::tasks::Entity> for Entity {
+impl Related<super::orion_tasks::Entity> for Entity {
     fn to() -> RelationDef {
-        Relation::Tasks.def()
+        Relation::OrionTasks.def()
     }
 }
 
 impl ActiveModelBehavior for ActiveModel {}
 
+#[allow(dead_code)]
 trait BuildModel {
     /// Crete a new build event ActiveModel for database insertion
     fn create_build_event(

jupiter/callisto/src/builds.rs

@@ -24,18 +24,18 @@ pub struct Model {
 #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
 pub enum Relation {
     #[sea_orm(
-        belongs_to = "super::tasks::Entity",
+        belongs_to = "super::orion_tasks::Entity",
         from = "Column::TaskId",
-        to = "super::tasks::Column::Id",
+        to = "super::orion_tasks::Column::Id",
         on_update = "NoAction",
         on_delete = "Cascade"
     )]
-    Tasks,
+    OrionTasks,
 }
 
-impl Related<super::tasks::Entity> for Entity {
+impl Related<super::orion_tasks::Entity> for Entity {
     fn to() -> RelationDef {
-        Relation::Tasks.def()
+        Relation::OrionTasks.def()
     }
 }
 

jupiter/callisto/src/mega_code_review_thread.rs

@@ -3,7 +3,7 @@
 use sea_orm::entity::prelude::*;
 use serde::{Deserialize, Serialize};
 
-use super::sea_orm_active_enums::{ThreadStatusEnum};
+use super::sea_orm_active_enums::ThreadStatusEnum;
 
 #[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
 #[sea_orm(table_name = "mega_code_review_thread")]