同步 PR 137 最新主分支合并

纳入 PR 137 最新 head bb16c41938\n保留 PR 135、PR 137 与 master 的既有冲突解法

# Conflicts:
#	server-rs/crates/api-server/src/external_generation_worker.rs
#	src/services/image-editor/editorProjectClient.test.ts
This commit is contained in:
2026-08-08 22:10:23 +08:00
6 changed files with 18 additions and 16 deletions
@@ -2348,7 +2348,6 @@ describe('useImageCanvasGenerationSubmissionWorkflow', () => {
render(
<SubmissionWorkflowHarness
currentUserId="user-a"
projectId="editor-project-sfx"
initialDialog={{
id: 'dialog-sfx-claim',
mode: 'audio-sound-effect',