Merge branch 'master' of http://82.157.175.59:3000/GenarrativeAI/Genarrative

server-rs/crates/spacetime-module/src/big_fish/assets.rs

@@ -112,13 +112,6 @@ pub(crate) fn generate_big_fish_asset_tx(
         updated_at,
     };
     replace_big_fish_session(ctx, &session, next_session);
-    append_big_fish_system_message(
-        ctx,
-        &input.session_id,
-        format!("big-fish-message-asset-{}", input.generated_at_micros),
-        reply,
-        input.generated_at_micros,
-    );
 
     get_big_fish_session_tx(
         ctx,

server-rs/crates/spacetime-module/src/big_fish/runtime.rs

@@ -77,8 +77,12 @@ fn start_big_fish_run_tx(
         .big_fish_creation_session()
         .session_id()
         .find(&input.session_id)
-        .filter(|row| row.owner_user_id == input.owner_user_id)
         .ok_or_else(|| "big_fish_creation_session 不存在".to_string())?;
+    if session.owner_user_id != input.owner_user_id
+        && session.stage != BigFishCreationStage::Published
+    {
+        return Err("big_fish_creation_session 不存在".to_string());
+    }
     let draft = session
         .draft_json
         .as_deref()
@@ -124,8 +128,12 @@ fn submit_big_fish_input_tx(
         .big_fish_creation_session()
         .session_id()
         .find(&run.session_id)
-        .filter(|row| row.owner_user_id == input.owner_user_id)
         .ok_or_else(|| "big_fish_creation_session 不存在".to_string())?;
+    if session.owner_user_id != input.owner_user_id
+        && session.stage != BigFishCreationStage::Published
+    {
+        return Err("big_fish_creation_session 不存在".to_string());
+    }
     let draft = session
         .draft_json
         .as_deref()

server-rs/crates/spacetime-module/src/big_fish/session.rs

@@ -239,6 +239,10 @@ pub(crate) fn list_big_fish_works_tx(
         .big_fish_creation_session()
         .iter()
         .filter(|row| {
+            if input.published_only {
+                return row.stage == BigFishCreationStage::Published;
+            }
+
             row.owner_user_id == input.owner_user_id && should_include_big_fish_work(ctx, row)
         })
         .map(|row| build_big_fish_work_summary(ctx, &row))
@@ -330,6 +334,7 @@ pub(crate) fn delete_big_fish_work_tx(
         ctx,
         BigFishWorksListInput {
             owner_user_id: input.owner_user_id,
+            published_only: false,
         },
     )
 }
@@ -538,13 +543,6 @@ pub(crate) fn compile_big_fish_draft_tx(
         updated_at: compiled_at,
     };
     replace_big_fish_session(ctx, &session, next_session);
-    append_big_fish_system_message(
-        ctx,
-        &input.session_id,
-        format!("big-fish-message-compile-{}", input.compiled_at_micros),
-        reply,
-        input.compiled_at_micros,
-    );
 
     get_big_fish_session_tx(
         ctx,
@@ -649,6 +647,7 @@ pub(crate) fn build_big_fish_work_summary(
     Ok(BigFishWorkSummarySnapshot {
         work_id: format!("big-fish-work-{}", row.session_id),
         source_session_id: row.session_id.clone(),
+        owner_user_id: row.owner_user_id.clone(),
         title,
         subtitle,
         summary,
@@ -682,32 +681,6 @@ pub(crate) fn replace_big_fish_session(
     ctx.db.big_fish_creation_session().insert(next);
 }
 
-pub(crate) fn append_big_fish_system_message(
-    ctx: &ReducerContext,
-    session_id: &str,
-    message_id: String,
-    text: String,
-    created_at_micros: i64,
-) {
-    if ctx
-        .db
-        .big_fish_agent_message()
-        .message_id()
-        .find(&message_id)
-        .is_some()
-    {
-        return;
-    }
-    ctx.db.big_fish_agent_message().insert(BigFishAgentMessage {
-        message_id,
-        session_id: session_id.to_string(),
-        role: BigFishAgentMessageRole::Assistant,
-        kind: BigFishAgentMessageKind::ActionResult,
-        text,
-        created_at: Timestamp::from_micros_since_unix_epoch(created_at_micros),
-    });
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;

server-rs/crates/spacetime-module/src/puzzle.rs

@@ -659,12 +659,6 @@ fn compile_puzzle_agent_draft_tx(
             updated_at: compiled_at,
         },
     );
-    append_system_message(
-        ctx,
-        &row.session_id,
-        input.compiled_at_micros,
-        "拼图结果页草稿已生成。",
-    )?;
     get_puzzle_agent_session_tx(
         ctx,
         PuzzleAgentSessionGetInput {
@@ -1260,25 +1254,6 @@ fn build_puzzle_suggested_actions(
     }
 }
 
-fn append_system_message(
-    ctx: &TxContext,
-    session_id: &str,
-    created_at_micros: i64,
-    text: &str,
-) -> Result<(), String> {
-    let message_id = format!("{session_id}-system-{created_at_micros}");
-    ensure_message_missing(ctx, &message_id)?;
-    ctx.db.puzzle_agent_message().insert(PuzzleAgentMessageRow {
-        message_id,
-        session_id: session_id.to_string(),
-        role: PuzzleAgentMessageRole::Assistant,
-        kind: PuzzleAgentMessageKind::ActionResult,
-        text: text.to_string(),
-        created_at: Timestamp::from_micros_since_unix_epoch(created_at_micros),
-    });
-    Ok(())
-}
-
 fn ensure_session_missing(ctx: &TxContext, session_id: &str) -> Result<(), String> {
     if ctx
         .db