1

src/components/rpg-entry/useRpgCreationEnterWorld.ts

@@ -1,6 +1,7 @@
 import { useCallback } from 'react';
 
 import type { CustomWorldAgentSessionSnapshot } from '../../../packages/shared/src/contracts/customWorldAgent';
+import type { CustomWorldRuntimeLaunchOptions } from '../platform-entry/platformEntryTypes';
 import { rpgCreationPreviewAdapter } from '../../services/rpg-creation/rpgCreationPreviewAdapter';
 import type { CustomWorldProfile } from '../../types';
 
@@ -10,14 +11,17 @@ type UseRpgCreationEnterWorldParams = {
   generatedCustomWorldProfile: CustomWorldProfile | null;
   agentSessionProfile: CustomWorldProfile | null;
   agentSession: CustomWorldAgentSessionSnapshot | null;
-  handleCustomWorldSelect: (customWorldProfile: CustomWorldProfile) => void;
+  handleCustomWorldSelect: (
+    customWorldProfile: CustomWorldProfile,
+    options?: CustomWorldRuntimeLaunchOptions,
+  ) => void;
   executePublishWorld: () => Promise<CustomWorldAgentSessionSnapshot | null>;
   setGeneratedCustomWorldProfile: (profile: CustomWorldProfile | null) => void;
 };
 
 /**
  * 统一“进入世界”前的最终同步策略。
- * Agent 草稿结果进入游戏时只读 session.draftProfile，不再把结果页快照回写成新的运行时 profile。
+ * Agent 草稿结果进入游戏时只读当前结果页 profile，不再静默回退到基础 draftProfile。
  */
 export function useRpgCreationEnterWorld(
   params: UseRpgCreationEnterWorldParams,
@@ -39,13 +43,22 @@ export function useRpgCreationEnterWorld(
     }
 
     if (!isAgentDraftResultView || !activeAgentSessionId) {
-      handleCustomWorldSelect(generatedCustomWorldProfile);
+      handleCustomWorldSelect(generatedCustomWorldProfile, {
+        mode: 'test',
+        returnStage: 'custom-world-result',
+      });
       return;
     }
 
-    const latestProfile = agentSessionProfile ?? generatedCustomWorldProfile;
-    setGeneratedCustomWorldProfile(latestProfile);
-    handleCustomWorldSelect(latestProfile);
+    if (!agentSessionProfile) {
+      return;
+    }
+
+    setGeneratedCustomWorldProfile(agentSessionProfile);
+    handleCustomWorldSelect(agentSessionProfile, {
+      mode: 'test',
+      returnStage: 'custom-world-result',
+    });
   }, [
     activeAgentSessionId,
     agentSessionProfile,
@@ -64,8 +77,11 @@ export function useRpgCreationEnterWorld(
       return generatedCustomWorldProfile;
     }
 
-    const latestProfile = agentSessionProfile ?? generatedCustomWorldProfile;
-    setGeneratedCustomWorldProfile(latestProfile);
+    if (!agentSessionProfile) {
+      return null;
+    }
+
+    setGeneratedCustomWorldProfile(agentSessionProfile);
 
     const latestSession = agentSession;
     const canEnterPublishedWorld =
@@ -73,13 +89,13 @@ export function useRpgCreationEnterWorld(
       latestSession.resultPreview?.canEnterWorld;
 
     if (canEnterPublishedWorld) {
-      return latestProfile;
+      return agentSessionProfile;
     }
 
     const publishedSession = await executePublishWorld();
     const publishedProfile =
       rpgCreationPreviewAdapter.buildPreviewFromSession(publishedSession) ??
-      latestProfile;
+      agentSessionProfile;
 
     setGeneratedCustomWorldProfile(publishedProfile);
     return publishedProfile;
@@ -89,7 +105,6 @@ export function useRpgCreationEnterWorld(
     agentSessionProfile,
     executePublishWorld,
     generatedCustomWorldProfile,
-    handleCustomWorldSelect,
     isAgentDraftResultView,
     setGeneratedCustomWorldProfile,
   ]);