diff --git a/apps/ai-game-creator-shell/src-tauri/src/commands.rs b/apps/ai-game-creator-shell/src-tauri/src/commands.rs
index 6b00b2ff1..9de008de2 100644
--- a/apps/ai-game-creator-shell/src-tauri/src/commands.rs
+++ b/apps/ai-game-creator-shell/src-tauri/src/commands.rs
@@ -5170,7 +5170,12 @@ pub(crate) fn create_game_creator_agent_session(
     let root = Path::new(project_path.trim());
     enforce_project_permission_policy(root, "conversation.read")?;
     enforce_project_permission_policy(root, "conversation.write")?;
-    let _lock = acquire_project_write_lock(root, "conversation.write")?;
+    // 首轮策划消息可能紧跟项目初始化写入到达；对话保存应等待这段短暂的
+    // 项目锁竞争，避免把可恢复的初始化竞态直接显示成保存失败。
+    let _lock = acquire_game_creator_agent_runtime_project_write_lock_with_wait(
+        root,
+        "conversation.write",
+    )?;
     create_game_creator_agent_session_at(root, agent_id.trim(), title.trim())
 }