From dcbf02bbda4227045ab08a789146e2294232656b Mon Sep 17 00:00:00 2001
From: kdletters <kdletters@qq.com>
Date: Fri, 5 Jun 2026 22:49:07 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A4=B1=E8=B4=A5=E8=8D=89=E7=A8=BF?=
 =?UTF-8?q?=E9=87=8D=E8=AF=95=E5=A4=8D=E7=94=A8=E5=8E=9F=E4=BC=9A=E8=AF=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .hermes/shared-memory/pitfalls.md             |  10 +-
 ...�玩法创作】平�入�与玩法链路-2026-05-15.md |   2 +-
 .../PlatformEntryFlowShellImpl.tsx            |  42 ++--
 ...gEntryFlowShell.agent.interaction.test.tsx | 216 ++++++++++++++++++
 4 files changed, 255 insertions(+), 15 deletions(-)

diff --git a/.hermes/shared-memory/pitfalls.md b/.hermes/shared-memory/pitfalls.md
index 694eb853..e0a1b1c8 100644
--- a/.hermes/shared-memory/pitfalls.md
+++ b/.hermes/shared-memory/pitfalls.md
@@ -1601,10 +1601,18 @@
 
 - 现象：拼图生�页已�收到 VectorEngine 图片编辑失败并进入�试�，但用户返回�稿 Tab �，�一�稿�显示“生�中�；连续触�多个拼图生�时，失败�还�能�剩一�新增�稿，或者�看到标题为“第1关�的���空壳；抓大鹅��失败时也�能没有任何通知，点击�稿���新开始生�。
 - 原因：�端失败 notice �更新生�页局部状�，pending 作�架�目在失败时被清掉或被� `generating` 状�误映射为 `ready`；�端作�摘�也�能短暂�是 `generationStatus=generating`。如果失败消�没有写入 notice，用户离开生�页��会弹出 `PlatformErrorDialog`；如果打开�稿�看�久化 `generating`，就会绕过失败���。
-- 处�：失败时按 session �留 pending 作�架�目并标记 `failed`，失败 notice �存错误消�并触�带��的 `PlatformErrorDialog`；拼图契约没有 `failed` 枚举，pending 拼图映射为 `idle`，�时用本地失败 notice 覆盖�久化生�中状�和旧的“正在生��摘�。点击失败�稿应优先用 notice / �端 session / fallback payload 组装失败生�页，�能�新从 0 秒�动新进度；拼图失败���没有有效 `workTitle` 时，作�架标题回退为“拼图�稿�。
+- 处�：失败时按 session �留 pending 作�架�目并标记 `failed`，失败 notice �存错误消�并触�带��的 `PlatformErrorDialog`；拼图契约没有 `failed` 枚举，pending 拼图映射为 `idle`，�时用本地失败 notice 覆盖�久化生�中状�和旧的“正在生��摘�。点击失败�稿应优先用 notice / �端 session / fallback payload 组装失败生�页，�能�新从 0 秒�动新进度；失败页点击�新生�必须优先�用当� `sessionId` 执行编译 action，�得因存在表�缓存 payload 就调用 create-session。拼图失败���没有有效 `workTitle` 时，作�架标题回退为“拼图�稿�。
 - 验�：`node node_modules/vitest/vitest.mjs run src/components/rpg-entry/RpgEntryFlowShell.agent.interaction.test.tsx -t "failed parallel puzzle|background match3d"`。
 - 关�：`src/components/platform-entry/PlatformEntryFlowShellImpl.tsx`�`src/components/custom-world-home/creationWorkShelf.ts`�`docs/�玩法创作】平�入�与玩法链路-2026-05-15.md`。
 
+## 生�失败�试��走新建�稿
+
+- 现象：拼图或抓大鹅生�失败�，在失败页点击“�新生��，作�架里多出一份新的�稿，原失败�稿�留在列表里。
+- 原因：�试 handler 曾优先读�缓存的表� payload 并调用 create-session 路径；失败�稿按 session 留在作�架是正确行为，于是�试动作�外创建了第二份�稿。
+- 处�：��当�失败页还能��到原 `sessionId`，�试就走该 session 的 compile action；�有没有��� session 时，��许用表� payload �新创建�稿。
+- 验�：`npm run test -- src/components/rpg-entry/RpgEntryFlowShell.agent.interaction.test.tsx -t "failed .* draft retry reuses current session"`。
+- 关�：`src/components/platform-entry/PlatformEntryFlowShellImpl.tsx`�`src/components/rpg-entry/RpgEntryFlowShell.agent.interaction.test.tsx`�`docs/�玩法创作】平�入�与玩法链路-2026-05-15.md`。
+
 ## 汪汪声浪�稿试玩��写正� run
 
 - 现象：如果�稿结果页试玩和�布� runtime 共用�一写�绩路径，未�布或未确认资�的�稿试玩会污染正��局�排行榜和作�统计。
diff --git a/docs/�玩法创作】平�入�与玩法链路-2026-05-15.md b/docs/�玩法创作】平�入�与玩法链路-2026-05-15.md
index 063f48f8..0258cda0 100644
--- a/docs/�玩法创作】平�入�与玩法链路-2026-05-15.md
+++ b/docs/�玩法创作】平�入�与玩法链路-2026-05-15.md
@@ -54,7 +54,7 @@
 4. 生�中作�在整�上加等待�罩，但�移除作�基础信�。
 5. 生�中状��能�存在�端内存 notice。�端作�摘�必须下����的 `generationStatus`；�端刷新或退出产��，作�架优先用摘�状���等待�罩，本轮内存 notice �作为�时�馈。
 6. 点击 `generationStatus=generating` 的�稿�必须��对应玩法的生�进度页，�能进入空白结果页或普通工作区；��生�页的 `startedAtMs` 优先使用�端 session 的 `updatedAt`，没有 session 时�使用作�摘� `updatedAt`，�得因�新进入页�从 0 秒�新计时。
-7. 生�失败必须按 session 独立记录，�能用一个失败打断或覆盖�玩法的其它生�任务。失败 notice 需��存错误消�并覆盖作�架本地状�：�使�端摘�暂时�是 `generationStatus=generating` 或�写出���投影，�稿�也�得继续显示“生�中�，点击�必须进入失败 / �试生�页，�能�新创建一轮生�；拼图这类失败���若没有有效 `workTitle`，作�架标题回退为“拼图�稿�，�暴露“第1关�空壳。
+7. 生�失败必须按 session 独立记录，�能用一个失败打断或覆盖�玩法的其它生�任务。失败 notice 需��存错误消�并覆盖作�架本地状�：�使�端摘�暂时�是 `generationStatus=generating` 或�写出���投影，�稿�也�得继续显示“生�中�，点击�必须进入失败 / �试生�页，�能�新创建一轮生�。失败页点击�新生�时必须优先�用当���� `sessionId` 执行编译 action；�有没有��� session 时��许回退到新建�稿。拼图这类失败���若没有有效 `workTitle`，作�架标题回退为“拼图�稿�，�暴露“第1关�空壳。
 8. 从�稿 Tab 作�架打开�稿工作区�生�页或结果页时，返回按钮必须回到�稿 Tab 的�一作�架语境；从创作 Tab 新建或直接进入创作链路时�回到创作 Tab。平�壳层需�显�记录本次创作�的返回��，�能让结果页返回动作固定跳到创作入�。
 9. �有 generated 图片必须通过 `ResolvedAssetImage` / `/api/assets/read-url` �签读�。
 10. 敲木鱼作�架读�当�用户作�列表时走 `GET /api/creation/wooden-fish/works`；�布�功�平�壳必须�时刷新作�架与公开广场，��作�刚�布时��留在旧列表。
diff --git a/src/components/platform-entry/PlatformEntryFlowShellImpl.tsx b/src/components/platform-entry/PlatformEntryFlowShellImpl.tsx
index b4d77e98..86e77d3c 100644
--- a/src/components/platform-entry/PlatformEntryFlowShellImpl.tsx
+++ b/src/components/platform-entry/PlatformEntryFlowShellImpl.tsx
@@ -9449,20 +9449,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(() => {
@@ -10336,15 +10342,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) {
diff --git a/src/components/rpg-entry/RpgEntryFlowShell.agent.interaction.test.tsx b/src/components/rpg-entry/RpgEntryFlowShell.agent.interaction.test.tsx
index 64d065a3..d1323f12 100644
--- a/src/components/rpg-entry/RpgEntryFlowShell.agent.interaction.test.tsx
+++ b/src/components/rpg-entry/RpgEntryFlowShell.agent.interaction.test.tsx
@@ -4228,6 +4228,115 @@ test('background match3d draft failure notifies and reopens failed retry page',
   expect(match3dCreationClient.executeAction).toHaveBeenCalledTimes(1);
 });
 
+test('failed match3d draft retry reuses current session instead of creating another draft', async () => {
+  const user = userEvent.setup();
+  const failedSession = buildMockMatch3DAgentSession({
+    sessionId: 'match3d-retry-failed-session',
+    draft: null,
+    stage: 'collecting_config',
+    updatedAt: '2026-05-18T12:05:00.000Z',
+  });
+  const persistedFailedWork: Match3DWorkSummary = {
+    workId: 'match3d-retry-failed-work',
+    profileId: 'match3d-retry-failed-profile',
+    ownerUserId: 'user-1',
+    sourceSessionId: failedSession.sessionId,
+    gameName: '�试抓鹅',
+    themeText: '霓虹水果摊',
+    summary: '抓大鹅素�生�失败，��新打开处�。',
+    tags: ['水果', '抓大鹅'],
+    coverImageSrc: null,
+    referenceImageSrc: null,
+    clearCount: 12,
+    difficulty: 4,
+    publicationStatus: 'draft',
+    playCount: 0,
+    updatedAt: '2026-05-18T12:05:00.000Z',
+    publishedAt: null,
+    publishReady: false,
+    generationStatus: 'generating',
+    generatedItemAssets: [],
+  };
+  let rejectCompile!: (reason?: unknown) => void;
+  vi.mocked(match3dCreationClient.createSession).mockResolvedValue({
+    session: failedSession,
+  });
+  vi.mocked(match3dCreationClient.executeAction).mockReturnValueOnce(
+    new Promise((_, reject) => {
+      rejectCompile = reject;
+    }),
+  );
+  vi.mocked(match3dCreationClient.getSession).mockResolvedValue({
+    session: failedSession,
+  });
+
+  render(<TestWrapper withAuth />);
+
+  await openCreateTemplateHub(user);
+  await user.click(await findCreationTypeButton('抓大鹅'));
+  await user.click(
+    await screen.findByRole('button', { name: '生�抓大鹅�稿' }),
+  );
+  await screen.findByRole('progressbar', { name: '抓大鹅�稿生�进度' });
+  await user.click(screen.getByRole('button', { name: '返回创作中心' }));
+  await openDraftHub(user);
+  vi.mocked(listMatch3DWorks).mockResolvedValue({
+    items: [persistedFailedWork],
+  });
+
+  await act(async () => {
+    rejectCompile(new Error('抓大鹅素��务失败'));
+    await Promise.resolve();
+  });
+  const failureDialog = await screen.findByRole('dialog', {
+    name: '�生错误',
+  });
+  await user.click(within(failureDialog).getByRole('button', { name: '关闭' }));
+
+  const draftPanel = getPlatformTabPanel('saves');
+  await user.click(
+    await within(draftPanel).findByRole('button', {
+      name: /继续创作《(?:�试抓鹅|抓大鹅�稿)》/u,
+    }),
+  );
+  const reopenedFailureDialog = await screen.findByRole('dialog', {
+    name: '�生错误',
+  });
+  await user.click(
+    within(reopenedFailureDialog).getByRole('button', { name: '关闭' }),
+  );
+  vi.mocked(match3dCreationClient.executeAction).mockResolvedValueOnce({
+    session: buildMockMatch3DAgentSession({
+      sessionId: failedSession.sessionId,
+      stage: 'draft_ready',
+      draft: {
+        profileId: persistedFailedWork.profileId,
+        gameName: persistedFailedWork.gameName,
+        themeText: persistedFailedWork.themeText,
+        summary: persistedFailedWork.summary,
+        tags: persistedFailedWork.tags,
+        coverImageSrc: null,
+        referenceImageSrc: null,
+        clearCount: persistedFailedWork.clearCount,
+        difficulty: persistedFailedWork.difficulty,
+        generatedItemAssets: [],
+      },
+    }),
+  });
+
+  await user.click(await screen.findByRole('button', { name: '�新生��稿' }));
+
+  await waitFor(() => {
+    expect(match3dCreationClient.executeAction).toHaveBeenCalledTimes(2);
+  });
+  expect(match3dCreationClient.createSession).toHaveBeenCalledTimes(1);
+  expect(match3dCreationClient.executeAction).toHaveBeenNthCalledWith(
+    2,
+    failedSession.sessionId,
+    expect.objectContaining({ action: 'match3d_compile_draft' }),
+  );
+});
+
 test('running match3d persisted draft reopens progress instead of unfinished result', async () => {
   const user = userEvent.setup();
   const runningSession = buildMockMatch3DAgentSession({
@@ -4921,6 +5030,113 @@ test('failed parallel puzzle generations stay as separate non-generating drafts'
     .toBeTruthy();
 });
 
+test('failed puzzle draft retry reuses current session instead of creating another draft', async () => {
+  const user = userEvent.setup();
+  const failedSession = buildMockPuzzleAgentSession({
+    sessionId: 'puzzle-retry-failed-session',
+    draft: null,
+    stage: 'collecting_anchors',
+    updatedAt: '2026-05-18T12:00:00.000Z',
+  });
+  const persistedFailedWork: PuzzleWorkSummary = {
+    workId: `puzzle-work-${failedSession.sessionId}`,
+    profileId: `puzzle-profile-${failedSession.sessionId}`,
+    ownerUserId: 'user-1',
+    sourceSessionId: failedSession.sessionId,
+    authorDisplayName: '测试玩家',
+    workTitle: '',
+    workDescription: '一套雨夜猫街主题拼图。',
+    levelName: '第1关',
+    summary: '一套雨夜猫街主题拼图。',
+    themeTags: [],
+    coverImageSrc: null,
+    coverAssetId: null,
+    publicationStatus: 'draft',
+    updatedAt: '2026-05-18T12:00:00.000Z',
+    publishedAt: null,
+    playCount: 0,
+    remixCount: 0,
+    likeCount: 0,
+    publishReady: false,
+    generationStatus: 'failed',
+    levels: [],
+  };
+  let rejectCompile!: (reason?: unknown) => void;
+  vi.mocked(createPuzzleAgentSession).mockResolvedValue({
+    session: failedSession,
+  });
+  vi.mocked(getPuzzleAgentSession).mockResolvedValue({
+    session: failedSession,
+  });
+  vi.mocked(executePuzzleAgentAction).mockReturnValueOnce(
+    new Promise((_, reject) => {
+      rejectCompile = reject;
+    }),
+  );
+
+  render(<TestWrapper withAuth />);
+
+  await openCreateTemplateHub(user);
+  await user.click(await findCreationTypeButton('拼图'));
+  await user.click(await screen.findByRole('button', { name: '生��稿' }));
+  await screen.findByRole('progressbar', { name: '拼图图片生�进度' });
+  await user.click(screen.getByRole('button', { name: '返回创作中心' }));
+  await openDraftHub(user);
+  vi.mocked(listPuzzleWorks).mockResolvedValue({
+    items: [persistedFailedWork],
+  });
+
+  await act(async () => {
+    rejectCompile(new Error('拼图图片生�失败'));
+    await Promise.resolve();
+  });
+  const failureDialog = await screen.findByRole('dialog', {
+    name: '�生错误',
+  });
+  await user.click(within(failureDialog).getByRole('button', { name: '关闭' }));
+
+  const draftPanel = getPlatformTabPanel('saves');
+  await user.click(
+    await within(draftPanel).findByRole('button', {
+      name: /继续创作《[^》]+》/u,
+    }),
+  );
+  const reopenedFailureDialog = await screen.findByRole('dialog', {
+    name: '�生错误',
+  });
+  await user.click(
+    within(reopenedFailureDialog).getByRole('button', { name: '关闭' }),
+  );
+  vi.mocked(executePuzzleAgentAction).mockResolvedValueOnce({
+    operation: {
+      operationId: 'compile-puzzle-retry',
+      type: 'compile_puzzle_draft',
+      status: 'completed',
+      phaseLabel: '已完�',
+      phaseDetail: '�稿已生�',
+      progress: 1,
+    },
+    session: buildMockPuzzleAgentSession({
+      sessionId: failedSession.sessionId,
+      stage: 'ready_to_publish',
+      progressPercent: 100,
+      draft: buildReadyPuzzleDraft(),
+    }),
+  });
+
+  await user.click(await screen.findByRole('button', { name: '�新生�图片' }));
+
+  await waitFor(() => {
+    expect(executePuzzleAgentAction).toHaveBeenCalledTimes(2);
+  });
+  expect(createPuzzleAgentSession).toHaveBeenCalledTimes(1);
+  expect(executePuzzleAgentAction).toHaveBeenNthCalledWith(
+    2,
+    failedSession.sessionId,
+    expect.objectContaining({ action: 'compile_puzzle_draft' }),
+  );
+});
+
 test('running puzzle draft opens generation progress from draft tab', async () => {
   const user = userEvent.setup();
   const runningSession = buildMockPuzzleAgentSession({