Merge remote-tracking branch 'origin/master' into feat/recommend-runtime-guest

# Conflicts:
#	docs/【玩法创作】平台入口与玩法链路-2026-05-15.md

src/services/wooden-fish/woodenFishClient.ts

@@ -27,6 +27,8 @@ import {
 const WOODEN_FISH_API_BASE = '/api/creation/wooden-fish/sessions';
 const WOODEN_FISH_WORKS_API_BASE = '/api/creation/wooden-fish/works';
 const WOODEN_FISH_RUNTIME_API_BASE = '/api/runtime/wooden-fish';
+// 中文注释：敲木鱼创作会串行等待多次 image2 与 OSS 写入，前端请求窗口需要覆盖完整生成链路。
+const WOODEN_FISH_GENERATION_TIMEOUT_MS = 20 * 60 * 1000;
 const WOODEN_FISH_RUNTIME_READ_RETRY: ApiRetryOptions = {
   maxRetries: 1,
   baseDelayMs: 120,
@@ -78,6 +80,8 @@ const woodenFishCreationClient = createCreationAgentClient<
     streamIncomplete: '敲木鱼共创消息流式结果不完整',
     executeAction: '执行敲木鱼共创操作失败',
   },
+  createSessionTimeoutMs: WOODEN_FISH_GENERATION_TIMEOUT_MS,
+  executeActionTimeoutMs: WOODEN_FISH_GENERATION_TIMEOUT_MS,
 });
 
 type FlattenedWoodenFishWorkProfileResponse = Omit<
@@ -120,6 +124,8 @@ function normalizeWoodenFishWorkProfile(
     hitObjectAsset: flattened.hitObjectAsset,
     backgroundAsset:
       flattened.backgroundAsset ?? flattened.draft?.backgroundAsset ?? null,
+    backButtonAsset:
+      flattened.backButtonAsset ?? flattened.draft?.backButtonAsset ?? null,
     hitSoundAsset: flattened.hitSoundAsset,
     floatingWords: flattened.floatingWords,
   };