合并主分支

解决合并冲突

server-rs/crates/api-server/src/editor_generation_queue.rs

@@ -321,6 +321,15 @@ async fn enqueue_serialized_editor_generation_job_with_identity(
     job_id: String,
     dedupe_key: String,
 ) -> Result<ExternalGenerationJobRecord, AppError> {
+    #[cfg(test)]
+    if state.record_test_editor_generation_enqueue_attempt() {
+        return Err(
+            AppError::from_status(StatusCode::BAD_GATEWAY).with_details(json!({
+                "provider": EDITOR_GENERATION_QUEUE_PROVIDER,
+                "message": "测试已在 SpacetimeDB 写入前截获编辑器生成入队",
+            })),
+        );
+    }
     let now_micros = current_utc_micros();
     state
         .spacetime_client()