Merge remote-tracking branch 'origin/master' into codex/pr57-p0-p2

# Conflicts:
#	docs/【玩法创作】平台入口与玩法链路-2026-05-15.md
#	docs/【项目基线】当前产品与工程约束-2026-05-15.md

src/components/platform-entry/PlatformEntryFlowShellImpl.tsx

@@ -547,6 +547,7 @@ type BabyObjectMatchGenerationPhase = 'generating' | 'ready' | 'failed';
 
 type RecommendRuntimeState = {
   activeKind: RecommendRuntimeKind | null;
+  barkBattlePublishedConfig: BarkBattlePublishedConfig | null;
   babyObjectMatchDraft: BabyObjectMatchDraft | null;
   bigFishRun: BigFishRuntimeSnapshotResponse | null;
   jumpHopRun: JumpHopRunResponse['run'] | null;
@@ -713,7 +714,7 @@ function isRecommendRuntimeReadyForEntry(
     return Boolean(state.visualNovelRun);
   }
   if (expectedKind === 'bark-battle') {
-    return true;
+    return Boolean(state.barkBattlePublishedConfig);
   }
   if (expectedKind === 'edutainment') {
     return Boolean(state.babyObjectMatchDraft);
@@ -9431,20 +9432,26 @@ export function PlatformEntryFlowShellImpl({
   const executeSquareHoleAction = squareHoleFlow.executeAction;
 
   const retryMatch3DDraftGeneration = useCallback(() => {
-    if (match3dFormDraftPayload && !match3dSession?.draft?.profileId) {
-      void createMatch3DDraftFromForm(match3dFormDraftPayload);
+    if (match3dSession?.sessionId) {
+      const retryPayload =
+        match3dFormDraftPayload ??
+        buildMatch3DFormPayloadFromSession(match3dSession);
+      void executeMatch3DAction({
+        action: 'match3d_compile_draft',
+        generateClickSound: retryPayload.generateClickSound,
+      });
       return;
     }
 
-    void executeMatch3DAction({
-      action: 'match3d_compile_draft',
-      generateClickSound: match3dFormDraftPayload?.generateClickSound,
-    });
+    if (match3dFormDraftPayload) {
+      void createMatch3DDraftFromForm(match3dFormDraftPayload);
+      return;
+    }
   }, [
     createMatch3DDraftFromForm,
     executeMatch3DAction,
     match3dFormDraftPayload,
-    match3dSession?.draft?.profileId,
+    match3dSession,
   ]);
 
   const retrySquareHoleAssetGeneration = useCallback(() => {
@@ -10318,15 +10325,25 @@ export function PlatformEntryFlowShellImpl({
   );
 
   const retryPuzzleDraftGeneration = useCallback(() => {
-    if (puzzleFormDraftPayload) {
-      void createPuzzleDraftFromForm(puzzleFormDraftPayload);
+    if (puzzleSession?.sessionId) {
+      const retryPayload =
+        puzzleFormDraftPayload ??
+        buildPuzzleFormPayloadFromSession(puzzleSession);
+      void executePuzzleAction(
+        buildPuzzleCompileActionFromFormPayload(retryPayload),
+      );
       return;
     }
 
-    void executePuzzleAction(
-      buildPuzzleCompileActionFromFormPayload(puzzleFormDraftPayload),
-    );
-  }, [createPuzzleDraftFromForm, executePuzzleAction, puzzleFormDraftPayload]);
+    if (puzzleFormDraftPayload) {
+      void createPuzzleDraftFromForm(puzzleFormDraftPayload);
+    }
+  }, [
+    createPuzzleDraftFromForm,
+    executePuzzleAction,
+    puzzleFormDraftPayload,
+    puzzleSession,
+  ]);
 
   const retryVisualNovelDraftGeneration = useCallback(() => {
     if (!visualNovelFormDraftPayload) {
@@ -15134,6 +15151,29 @@ export function PlatformEntryFlowShellImpl({
     isDesktopLayout,
   ]);
 
+  const activeRecommendEntry =
+    activeRecommendEntryKey && !isDesktopLayout
+      ? (recommendRuntimeEntries.find(
+          (entry) =>
+            getPlatformPublicGalleryEntryKey(entry) ===
+            activeRecommendEntryKey,
+        ) ?? null)
+      : null;
+  const isActiveRecommendRuntimeReady =
+    activeRecommendEntry !== null &&
+    isRecommendRuntimeReadyForEntry(activeRecommendEntry, {
+      activeKind: activeRecommendRuntimeKind,
+      barkBattlePublishedConfig,
+      babyObjectMatchDraft,
+      bigFishRun,
+      jumpHopRun,
+      match3dRun,
+      puzzleRun,
+      squareHoleRun,
+      visualNovelRun,
+      woodenFishRun,
+    });
+
   useEffect(() => {
     if (
       isDesktopLayout ||
@@ -15151,25 +15191,6 @@ export function PlatformEntryFlowShellImpl({
       return;
     }
 
-    const activeRecommendEntry = activeRecommendEntryKey
-      ? (recommendRuntimeEntries.find(
-          (entry) =>
-            getPlatformPublicGalleryEntryKey(entry) === activeRecommendEntryKey,
-        ) ?? null)
-      : null;
-    const isActiveRecommendRuntimeReady =
-      activeRecommendEntry !== null &&
-      isRecommendRuntimeReadyForEntry(activeRecommendEntry, {
-        activeKind: activeRecommendRuntimeKind,
-        babyObjectMatchDraft,
-        bigFishRun,
-        jumpHopRun,
-        match3dRun,
-        puzzleRun,
-        squareHoleRun,
-        visualNovelRun,
-        woodenFishRun,
-      });
     if (
       (activeRecommendEntry !== null && isActiveRecommendRuntimeReady) ||
       isStartingRecommendEntry
@@ -15185,9 +15206,12 @@ export function PlatformEntryFlowShellImpl({
   }, [
     activeRecommendEntryKey,
     activeRecommendRuntimeKind,
+    activeRecommendEntry,
+    barkBattlePublishedConfig,
     babyObjectMatchDraft,
     bigFishRun,
     jumpHopRun,
+    isActiveRecommendRuntimeReady,
     isStartingRecommendEntry,
     match3dRun,
     platformBootstrap.isLoadingPlatform,
@@ -16541,6 +16565,7 @@ export function PlatformEntryFlowShellImpl({
               onOpenRecommendGalleryDetail={openRecommendGalleryDetail}
               recommendRuntimeContent={recommendRuntimeContent}
               activeRecommendEntryKey={activeRecommendEntryKey}
+              isRecommendRuntimeReady={isActiveRecommendRuntimeReady}
               isStartingRecommendEntry={
                 isStartingRecommendEntry ||
                 isBigFishBusy ||