Merge remote-tracking branch 'origin/master' into dev-jenken

# Conflicts:
#	.hermes/shared-memory/pitfalls.md
#	server-rs/crates/api-server/src/modules/jump_hop.rs
#	src/components/rpg-entry/RpgEntryFlowShell.agent.interaction.test.tsx
#	src/services/jump-hop/jumpHopClient.test.ts

server-rs/crates/spacetime-module/src/jump_hop/tables.rs

@@ -56,6 +56,12 @@ pub struct JumpHopWorkProfileRow {
     // 后台可见性开关；默认显示，隐藏后不进入公开列表。
     #[default(WORK_VISIBLE_DEFAULT)]
     pub(crate) visible: bool,
+    // 跳一跳生成主题独立于作品标题；旧行按 work_title 兜底。
+    #[default(None::<String>)]
+    pub(crate) theme_text: Option<String>,
+    // 跳一跳左上角真实可点击返回按钮的独立透明资产快照；旧行为空时运行态使用样式兜底。
+    #[default(None::<String>)]
+    pub(crate) back_button_asset_json: Option<String>,
 }
 
 #[spacetimedb::table(
@@ -77,6 +83,9 @@ pub struct JumpHopRuntimeRunRow {
     pub(crate) snapshot_json: String,
     pub(crate) created_at: Timestamp,
     pub(crate) updated_at: Timestamp,
+    // draft / published，用于隔离试玩统计和公开排行榜；旧行按 published 兜底。
+    #[default(None::<String>)]
+    pub(crate) runtime_mode: Option<String>,
 }
 
 #[spacetimedb::table(
@@ -94,3 +103,19 @@ pub struct JumpHopEventRow {
     pub(crate) result: String,
     pub(crate) occurred_at: Timestamp,
 }
+
+#[spacetimedb::table(
+    accessor = jump_hop_leaderboard_entry,
+    index(accessor = by_jump_hop_leaderboard_profile_id, btree(columns = [profile_id])),
+    index(accessor = by_jump_hop_leaderboard_player_profile, btree(columns = [player_id, profile_id]))
+)]
+pub struct JumpHopLeaderboardEntryRow {
+    #[primary_key]
+    pub(crate) entry_id: String,
+    pub(crate) profile_id: String,
+    pub(crate) player_id: String,
+    pub(crate) successful_jump_count: u32,
+    pub(crate) duration_ms: u64,
+    pub(crate) run_id: String,
+    pub(crate) updated_at: Timestamp,
+}

server-rs/crates/spacetime-module/src/jump_hop/types.rs

@@ -14,6 +14,8 @@ pub const JUMP_HOP_GENERATION_READY: &str = "ready";
 pub const JUMP_HOP_EVENT_RUN_STARTED: &str = "run-started";
 pub const JUMP_HOP_EVENT_RUN_RESTARTED: &str = "run-restarted";
 pub const JUMP_HOP_EVENT_JUMP: &str = "jump";
+pub const JUMP_HOP_RUNTIME_MODE_DRAFT: &str = "draft";
+pub const JUMP_HOP_RUNTIME_MODE_PUBLISHED: &str = "published";
 
 #[derive(Clone, Debug, PartialEq, Eq, SpacetimeType)]
 pub struct JumpHopAgentSessionCreateInput {
@@ -54,6 +56,7 @@ pub struct JumpHopDraftCompileInput {
     pub tile_atlas_asset_json: Option<String>,
     pub tile_assets_json: Option<String>,
     pub cover_composite: Option<String>,
+    pub back_button_asset_json: Option<String>,
     pub generation_status: Option<String>,
     pub compiled_at_micros: i64,
 }
@@ -102,6 +105,7 @@ pub struct JumpHopRunStartInput {
     pub run_id: String,
     pub owner_user_id: String,
     pub profile_id: String,
+    pub runtime_mode: String,
     pub client_event_id: String,
     pub started_at_ms: i64,
 }
@@ -112,11 +116,13 @@ pub struct JumpHopRunGetInput {
     pub owner_user_id: String,
 }
 
-#[derive(Clone, Debug, PartialEq, Eq, SpacetimeType)]
+#[derive(Clone, Debug, PartialEq, SpacetimeType)]
 pub struct JumpHopRunJumpInput {
     pub run_id: String,
     pub owner_user_id: String,
-    pub charge_ms: u32,
+    pub drag_distance: f32,
+    pub drag_vector_x: Option<f32>,
+    pub drag_vector_y: Option<f32>,
     pub client_event_id: String,
     pub jumped_at_ms: i64,
 }
@@ -158,6 +164,31 @@ pub struct JumpHopRunProcedureResult {
     pub error_message: Option<String>,
 }
 
+#[derive(Clone, Debug, PartialEq, SpacetimeType)]
+pub struct JumpHopLeaderboardEntrySnapshot {
+    pub rank: u32,
+    pub player_id: String,
+    pub successful_jump_count: u32,
+    pub duration_ms: u64,
+    pub updated_at_micros: i64,
+}
+
+#[derive(Clone, Debug, PartialEq, SpacetimeType)]
+pub struct JumpHopLeaderboardGetInput {
+    pub profile_id: String,
+    pub viewer_player_id: String,
+    pub limit: u32,
+}
+
+#[derive(Clone, Debug, PartialEq, SpacetimeType)]
+pub struct JumpHopLeaderboardProcedureResult {
+    pub ok: bool,
+    pub profile_id: String,
+    pub items: Vec<JumpHopLeaderboardEntrySnapshot>,
+    pub viewer_best: Option<JumpHopLeaderboardEntrySnapshot>,
+    pub error_message: Option<String>,
+}
+
 #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, SpacetimeType)]
 #[serde(rename_all = "camelCase")]
 pub struct JumpHopCreatorConfigSnapshot {
@@ -187,10 +218,16 @@ pub struct JumpHopCharacterAssetSnapshot {
 #[serde(rename_all = "camelCase")]
 pub struct JumpHopTileAssetSnapshot {
     pub tile_type: String,
+    #[serde(default)]
+    pub tile_id: Option<String>,
     pub image_src: String,
     pub image_object_key: String,
     pub asset_object_id: String,
     pub source_atlas_cell: String,
+    #[serde(default)]
+    pub atlas_row: Option<u32>,
+    #[serde(default)]
+    pub atlas_col: Option<u32>,
     pub visual_width: u32,
     pub visual_height: u32,
     pub top_surface_radius: f32,
@@ -203,6 +240,8 @@ pub struct JumpHopDraftSnapshot {
     pub template_id: String,
     pub template_name: String,
     pub profile_id: Option<String>,
+    #[serde(default)]
+    pub theme_text: String,
     pub work_title: String,
     pub work_description: String,
     pub theme_tags: Vec<String>,
@@ -216,6 +255,7 @@ pub struct JumpHopDraftSnapshot {
     pub tile_assets: Vec<JumpHopTileAssetSnapshot>,
     pub path: Option<module_jump_hop::JumpHopPath>,
     pub cover_composite: Option<String>,
+    pub back_button_asset: Option<JumpHopCharacterAssetSnapshot>,
     pub generation_status: String,
 }
 
@@ -244,6 +284,7 @@ pub struct JumpHopWorkSnapshot {
     pub owner_user_id: String,
     pub source_session_id: String,
     pub author_display_name: String,
+    pub theme_text: String,
     pub work_title: String,
     pub work_description: String,
     pub theme_tags: Vec<String>,
@@ -258,6 +299,7 @@ pub struct JumpHopWorkSnapshot {
     pub path: module_jump_hop::JumpHopPath,
     pub cover_image_src: String,
     pub cover_composite: Option<String>,
+    pub back_button_asset: Option<JumpHopCharacterAssetSnapshot>,
     pub publication_status: String,
     pub publish_ready: bool,
     pub play_count: u32,