Merge remote-tracking branch 'origin/master' into codex/wooden-fish-template

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

@@ -110,10 +110,28 @@ pub struct Match3DResultDraftResponse {
 pub struct Match3DGeneratedBackgroundAssetResponse {
     pub prompt: String,
     #[serde(default)]
+    pub level_scene_prompt: Option<String>,
+    #[serde(default)]
+    pub level_scene_image_src: Option<String>,
+    #[serde(default)]
+    pub level_scene_image_object_key: Option<String>,
+    #[serde(default)]
     pub image_src: Option<String>,
     #[serde(default)]
     pub image_object_key: Option<String>,
     #[serde(default)]
+    pub ui_spritesheet_prompt: Option<String>,
+    #[serde(default)]
+    pub ui_spritesheet_image_src: Option<String>,
+    #[serde(default)]
+    pub ui_spritesheet_image_object_key: Option<String>,
+    #[serde(default)]
+    pub item_spritesheet_prompt: Option<String>,
+    #[serde(default)]
+    pub item_spritesheet_image_src: Option<String>,
+    #[serde(default)]
+    pub item_spritesheet_image_object_key: Option<String>,
+    #[serde(default)]
     pub container_prompt: Option<String>,
     #[serde(default)]
     pub container_image_src: Option<String>,

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

@@ -170,10 +170,28 @@ pub struct Match3DWorkSummaryResponse {
 pub struct Match3DGeneratedBackgroundAssetResponse {
     pub prompt: String,
     #[serde(default)]
+    pub level_scene_prompt: Option<String>,
+    #[serde(default)]
+    pub level_scene_image_src: Option<String>,
+    #[serde(default)]
+    pub level_scene_image_object_key: Option<String>,
+    #[serde(default)]
     pub image_src: Option<String>,
     #[serde(default)]
     pub image_object_key: Option<String>,
     #[serde(default)]
+    pub ui_spritesheet_prompt: Option<String>,
+    #[serde(default)]
+    pub ui_spritesheet_image_src: Option<String>,
+    #[serde(default)]
+    pub ui_spritesheet_image_object_key: Option<String>,
+    #[serde(default)]
+    pub item_spritesheet_prompt: Option<String>,
+    #[serde(default)]
+    pub item_spritesheet_image_src: Option<String>,
+    #[serde(default)]
+    pub item_spritesheet_image_object_key: Option<String>,
+    #[serde(default)]
     pub container_prompt: Option<String>,
     #[serde(default)]
     pub container_image_src: Option<String>,

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

@@ -174,6 +174,18 @@ pub struct PuzzleDraftLevelResponse {
     #[serde(default)]
     pub ui_background_image_object_key: Option<String>,
     #[serde(default)]
+    pub level_scene_image_src: Option<String>,
+    #[serde(default)]
+    pub level_scene_image_object_key: Option<String>,
+    #[serde(default)]
+    pub ui_spritesheet_image_src: Option<String>,
+    #[serde(default)]
+    pub ui_spritesheet_image_object_key: Option<String>,
+    #[serde(default)]
+    pub level_background_image_src: Option<String>,
+    #[serde(default)]
+    pub level_background_image_object_key: Option<String>,
+    #[serde(default)]
     pub background_music: Option<CreationAudioAsset>,
     pub candidates: Vec<PuzzleGeneratedImageCandidateResponse>,
     #[serde(default)]

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

@@ -122,6 +122,14 @@ pub struct PuzzleRuntimeLevelSnapshotResponse {
     #[serde(default)]
     pub ui_background_image_object_key: Option<String>,
     #[serde(default)]
+    pub level_background_image_src: Option<String>,
+    #[serde(default)]
+    pub level_background_image_object_key: Option<String>,
+    #[serde(default)]
+    pub ui_spritesheet_image_src: Option<String>,
+    #[serde(default)]
+    pub ui_spritesheet_image_object_key: Option<String>,
+    #[serde(default)]
     pub background_music: Option<CreationAudioAsset>,
     pub board: PuzzleBoardSnapshotResponse,
     pub status: String,