merge: master into codex/bark-battle

server-rs/crates/shared-contracts/src/match3d_works.rs

@@ -151,6 +151,8 @@ pub struct Match3DWorkSummaryResponse {
     #[serde(default)]
     pub published_at: Option<String>,
     pub publish_ready: bool,
+    #[serde(default)]
+    pub generation_status: Option<String>,
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub background_prompt: Option<String>,
     #[serde(default, skip_serializing_if = "Option::is_none")]
@@ -282,4 +284,36 @@ mod tests {
         assert_eq!(payload["gameName"], json!("水果抓大鹅"));
         assert_eq!(payload["clearCount"], json!(4));
     }
+
+    #[test]
+    fn match3d_work_summary_uses_camel_case_generation_status() {
+        let payload = serde_json::to_value(Match3DWorkSummaryResponse {
+            work_id: "work-1".to_string(),
+            profile_id: "profile-1".to_string(),
+            owner_user_id: "user-1".to_string(),
+            source_session_id: Some("session-1".to_string()),
+            game_name: "水果抓大鹅".to_string(),
+            theme_text: "水果".to_string(),
+            summary: "水果主题".to_string(),
+            tags: vec!["水果".to_string()],
+            cover_image_src: None,
+            reference_image_src: None,
+            clear_count: 4,
+            difficulty: 5,
+            publication_status: "draft".to_string(),
+            play_count: 0,
+            updated_at: "2026-05-01T00:00:00Z".to_string(),
+            published_at: None,
+            publish_ready: false,
+            generation_status: Some("generating".to_string()),
+            background_prompt: None,
+            background_image_src: None,
+            background_image_object_key: None,
+            generated_background_asset: None,
+            generated_item_assets: Vec::new(),
+        })
+        .expect("payload should serialize");
+
+        assert_eq!(payload["generationStatus"], json!("generating"));
+    }
 }

server-rs/crates/shared-contracts/src/puzzle_agent.rs

@@ -49,6 +49,8 @@ pub struct ExecutePuzzleAgentActionRequest {
     #[serde(default)]
     pub candidate_count: Option<u32>,
     #[serde(default)]
+    pub should_auto_name_level: Option<bool>,
+    #[serde(default)]
     pub candidate_id: Option<String>,
     #[serde(default)]
     pub level_id: Option<String>,

server-rs/crates/shared-contracts/src/puzzle_gallery.rs

@@ -6,6 +6,21 @@ use crate::puzzle_works::{PuzzleWorkProfileResponse, PuzzleWorkSummaryResponse};
 #[serde(rename_all = "camelCase")]
 pub struct PuzzleGalleryResponse {
     pub items: Vec<PuzzleWorkSummaryResponse>,
+    #[serde(default)]
+    pub preview_refs: Vec<PuzzleGalleryWorkRefResponse>,
+    #[serde(default)]
+    pub has_more: bool,
+    #[serde(default)]
+    pub next_cursor: Option<String>,
+    #[serde(default)]
+    pub total_count: u32,
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)]
+#[serde(rename_all = "camelCase")]
+pub struct PuzzleGalleryWorkRefResponse {
+    pub work_id: String,
+    pub profile_id: String,
 }
 
 #[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]

server-rs/crates/shared-contracts/src/puzzle_works.rs

@@ -57,6 +57,8 @@ pub struct PuzzleWorkSummaryResponse {
     pub point_incentive_claimable_points: u64,
     pub publish_ready: bool,
     #[serde(default)]
+    pub generation_status: Option<String>,
+    #[serde(default)]
     pub levels: Vec<PuzzleDraftLevelResponse>,
 }
 
@@ -91,6 +93,7 @@ mod tests {
             point_incentive_total_points: 1.5,
             point_incentive_claimable_points: 0,
             publish_ready: true,
+            generation_status: Some("ready".to_string()),
             levels: Vec::new(),
         })
         .expect("payload should serialize");
@@ -99,6 +102,7 @@ mod tests {
         assert_eq!(payload["pointIncentiveClaimedPoints"], 1);
         assert_eq!(payload["pointIncentiveTotalPoints"], 1.5);
         assert_eq!(payload["pointIncentiveClaimablePoints"], 0);
+        assert_eq!(payload["generationStatus"], "ready");
     }
 }