Merge codex/sse-stream-architecture into architecture adjustment

src/components/custom-world-home/CustomWorldCreationHub.interaction.test.tsx

@@ -10,7 +10,7 @@ import type { BabyObjectMatchDraft } from '../../../packages/shared/src/contract
 import type { SquareHoleWorkSummary } from '../../../packages/shared/src/contracts/squareHoleWorks';
 import type { CreationEntryConfig } from '../../services/creationEntryConfigService';
 import { derivePlatformCreationTypes } from '../platform-entry/platformEntryCreationTypes';
-import { CustomWorldCreationHub } from './CustomWorldCreationHub';
+import { CustomWorldCreationHub } from './CustomWorldCreationHub.testAdapter';
 
 const noopCreateType = () => {};
 

src/components/custom-world-home/CustomWorldCreationHub.test.tsx

@@ -4,7 +4,7 @@ import { expect, test } from 'vitest';
 import type { CreationEntryConfig } from '../../services/creationEntryConfigService';
 import { derivePlatformCreationTypes } from '../platform-entry/platformEntryCreationTypes';
 import { buildCreationWorkShelfItems } from './creationWorkShelf';
-import { CustomWorldCreationHub } from './CustomWorldCreationHub';
+import { CustomWorldCreationHub } from './CustomWorldCreationHub.testAdapter';
 
 const noopCreateType = () => {};
 const DAY_MS = 24 * 60 * 60 * 1000;

src/components/custom-world-home/CustomWorldCreationHub.testAdapter.tsx

@@ -0,0 +1,128 @@
+import { isPlatformCreationTypeVisible } from '../platform-entry/platformEntryCreationTypes';
+import {
+  buildCreationWorkShelfItems,
+  type CreationWorkShelfItem,
+} from './creationWorkShelf';
+import {
+  CustomWorldCreationHub as CustomWorldCreationHubView,
+} from './CustomWorldCreationHub';
+
+type ShelfBuilderParams = Parameters<typeof buildCreationWorkShelfItems>[0];
+type HubViewProps = Parameters<typeof CustomWorldCreationHubView>[0];
+
+type LegacyCustomWorldCreationHubProps = Omit<HubViewProps, 'shelfItems'> &
+  Partial<
+    Omit<ShelfBuilderParams, 'rpgItems' | 'bigFishItems' | 'puzzleItems'>
+  > & {
+    shelfItems?: CreationWorkShelfItem[];
+    items?: ShelfBuilderParams['rpgItems'];
+    bigFishItems?: ShelfBuilderParams['bigFishItems'];
+    puzzleItems?: ShelfBuilderParams['puzzleItems'];
+    onOpenDraft?: ShelfBuilderParams['onOpenRpgDraft'];
+    onEnterPublished?: ShelfBuilderParams['onEnterRpgPublished'];
+    onDeletePublished?: ShelfBuilderParams['onDeleteRpg'] | null;
+    getWorkState?: ShelfBuilderParams['getItemState'];
+  };
+
+/** 测试用 Adapter：旧 fixture 先转成 shelfItems，生产 Hub Interface 保持窄面。 */
+export function CustomWorldCreationHub({
+  shelfItems,
+  items = [],
+  rpgLibraryEntries = [],
+  bigFishItems = [],
+  match3dItems = [],
+  squareHoleItems = [],
+  jumpHopItems = [],
+  woodenFishItems = [],
+  puzzleItems = [],
+  babyObjectMatchItems = [],
+  barkBattleItems = [],
+  visualNovelItems = [],
+  onOpenDraft,
+  onEnterPublished,
+  onDeletePublished = null,
+  onOpenBigFishDetail,
+  onDeleteBigFish,
+  onOpenMatch3DDetail,
+  onDeleteMatch3D,
+  onOpenSquareHoleDetail,
+  onDeleteSquareHole,
+  onOpenJumpHopDetail,
+  onDeleteJumpHop,
+  onOpenWoodenFishDetail,
+  onDeleteWoodenFish,
+  onOpenPuzzleDetail,
+  onDeletePuzzle,
+  onClaimPuzzlePointIncentive,
+  onOpenBabyObjectMatchDetail,
+  onDeleteBabyObjectMatch,
+  onOpenBarkBattleDetail,
+  onDeleteBarkBattle,
+  onOpenVisualNovelDetail,
+  onDeleteVisualNovel,
+  getItemState,
+  getWorkState,
+  creationTypes,
+  ...props
+}: LegacyCustomWorldCreationHubProps) {
+  const isSquareHoleCreationVisible = isPlatformCreationTypeVisible(
+    creationTypes,
+    'square-hole',
+  );
+  const resolvedShelfItems =
+    shelfItems ??
+    buildCreationWorkShelfItems({
+      rpgItems: items,
+      rpgLibraryEntries,
+      bigFishItems,
+      match3dItems,
+      squareHoleItems: isSquareHoleCreationVisible ? squareHoleItems : [],
+      jumpHopItems,
+      woodenFishItems,
+      puzzleItems,
+      babyObjectMatchItems,
+      barkBattleItems,
+      visualNovelItems,
+      canDeleteRpg: Boolean(onDeletePublished),
+      canDeleteBigFish: Boolean(onDeleteBigFish),
+      canDeleteMatch3D: Boolean(onDeleteMatch3D),
+      canDeleteSquareHole: Boolean(onDeleteSquareHole),
+      canDeleteJumpHop: Boolean(onDeleteJumpHop),
+      canDeleteWoodenFish: Boolean(onDeleteWoodenFish),
+      canDeletePuzzle: Boolean(onDeletePuzzle),
+      canDeleteBabyObjectMatch: Boolean(onDeleteBabyObjectMatch),
+      canDeleteBarkBattle: Boolean(onDeleteBarkBattle),
+      canDeleteVisualNovel: Boolean(onDeleteVisualNovel),
+      onOpenRpgDraft: onOpenDraft,
+      onEnterRpgPublished: onEnterPublished,
+      onDeleteRpg: onDeletePublished ?? undefined,
+      onOpenBigFishDetail,
+      onDeleteBigFish,
+      onOpenMatch3DDetail,
+      onDeleteMatch3D,
+      onOpenSquareHoleDetail,
+      onDeleteSquareHole,
+      onOpenJumpHopDetail,
+      onDeleteJumpHop,
+      onOpenWoodenFishDetail,
+      onDeleteWoodenFish,
+      onOpenPuzzleDetail,
+      onDeletePuzzle,
+      onClaimPuzzlePointIncentive,
+      onOpenBabyObjectMatchDetail,
+      onDeleteBabyObjectMatch,
+      onOpenBarkBattleDetail,
+      onDeleteBarkBattle,
+      onOpenVisualNovelDetail,
+      onDeleteVisualNovel,
+      getItemState: getItemState ?? getWorkState,
+    });
+
+  return (
+    <CustomWorldCreationHubView
+      {...props}
+      creationTypes={creationTypes}
+      shelfItems={resolvedShelfItems}
+    />
+  );
+}

src/components/custom-world-home/CustomWorldCreationHub.tsx

@@ -1,30 +1,14 @@
 import { useEffect, useMemo, useState } from 'react';
 
-import type { BarkBattleWorkSummary } from '../../../packages/shared/src/contracts/barkBattle';
-import type { BigFishWorkSummary } from '../../../packages/shared/src/contracts/bigFishWorkSummary';
-import type { CustomWorldWorkSummary } from '../../../packages/shared/src/contracts/customWorldAgent';
-import type { BabyObjectMatchDraft } from '../../../packages/shared/src/contracts/edutainmentBabyObject';
-import type { JumpHopWorkSummaryResponse } from '../../../packages/shared/src/contracts/jumpHop';
-import type { Match3DWorkSummary } from '../../../packages/shared/src/contracts/match3dWorks';
-import type { PuzzleClearWorkSummaryResponse } from '../../../packages/shared/src/contracts/puzzleClear';
-import type { PuzzleWorkSummary } from '../../../packages/shared/src/contracts/puzzleWorkSummary';
-import type { WoodenFishWorkSummaryResponse } from '../../../packages/shared/src/contracts/woodenFish';
-import type { CustomWorldLibraryEntry } from '../../../packages/shared/src/contracts/runtime';
-import type { SquareHoleWorkSummary } from '../../../packages/shared/src/contracts/squareHoleWorks';
-import type { VisualNovelWorkSummary } from '../../../packages/shared/src/contracts/visualNovel';
 import type { CreationEntryConfig } from '../../services/creationEntryConfigService';
-import type { CustomWorldProfile } from '../../types';
 import type {
   PlatformCreationTypeCard,
   PlatformCreationTypeId,
 } from '../platform-entry/platformEntryCreationTypes';
-import { isPlatformCreationTypeVisible } from '../platform-entry/platformEntryCreationTypes';
 import {
-  buildCreationWorkShelfItems,
-  getCreationWorkShelfItemTime,
   type CreationWorkShelfItem,
   type CreationWorkShelfMetricId,
-  type CreationWorkShelfRuntimeState,
+  getCreationWorkShelfItemTime,
 } from './creationWorkShelf';
 import {
   CustomWorldCreationStartCard,
@@ -48,7 +32,7 @@ type WorkMetricSnapshot = Record<
 >;
 
 type CustomWorldCreationHubProps = {
-  items: CustomWorldWorkSummary[];
+  shelfItems: CreationWorkShelfItem[];
   loading: boolean;
   error: string | null;
   onRetry: () => void;
@@ -56,48 +40,8 @@ type CustomWorldCreationHubProps = {
   entryConfig: CreationEntryConfig;
   creationTypes: readonly PlatformCreationTypeCard[];
   onCreateType: (type: PlatformCreationTypeId) => void;
-  onOpenDraft: (item: CustomWorldWorkSummary) => void;
-  onEnterPublished: (profileId: string) => void;
-  onDeletePublished?: ((item: CustomWorldWorkSummary) => void) | null;
   deletingWorkId?: string | null;
-  rpgLibraryEntries?: CustomWorldLibraryEntry<CustomWorldProfile>[];
-  bigFishItems?: BigFishWorkSummary[];
-  onOpenBigFishDetail?: (item: BigFishWorkSummary) => void;
-  onDeleteBigFish?: ((item: BigFishWorkSummary) => void) | null;
-  match3dItems?: Match3DWorkSummary[];
-  onOpenMatch3DDetail?: (item: Match3DWorkSummary) => void;
-  onDeleteMatch3D?: ((item: Match3DWorkSummary) => void) | null;
-  squareHoleItems?: SquareHoleWorkSummary[];
-  onOpenSquareHoleDetail?: (item: SquareHoleWorkSummary) => void;
-  onDeleteSquareHole?: ((item: SquareHoleWorkSummary) => void) | null;
-  jumpHopItems?: JumpHopWorkSummaryResponse[];
-  onOpenJumpHopDetail?: (item: JumpHopWorkSummaryResponse) => void;
-  onDeleteJumpHop?: ((item: JumpHopWorkSummaryResponse) => void) | null;
-  woodenFishItems?: WoodenFishWorkSummaryResponse[];
-  onOpenWoodenFishDetail?:
-    | ((item: WoodenFishWorkSummaryResponse) => void)
-    | null;
-  onDeleteWoodenFish?: ((item: WoodenFishWorkSummaryResponse) => void) | null;
-  puzzleClearItems?: PuzzleClearWorkSummaryResponse[];
-  onOpenPuzzleClearDetail?: ((item: PuzzleClearWorkSummaryResponse) => void) | null;
-  onDeletePuzzleClear?: ((item: PuzzleClearWorkSummaryResponse) => void) | null;
-  puzzleItems?: PuzzleWorkSummary[];
-  onOpenPuzzleDetail?: (item: PuzzleWorkSummary) => void;
-  onDeletePuzzle?: ((item: PuzzleWorkSummary) => void) | null;
-  onClaimPuzzlePointIncentive?: ((item: PuzzleWorkSummary) => void) | null;
   claimingPuzzleProfileId?: string | null;
-  babyObjectMatchItems?: BabyObjectMatchDraft[];
-  onOpenBabyObjectMatchDetail?: ((item: BabyObjectMatchDraft) => void) | null;
-  onDeleteBabyObjectMatch?: ((item: BabyObjectMatchDraft) => void) | null;
-  barkBattleItems?: BarkBattleWorkSummary[];
-  onOpenBarkBattleDetail?: ((item: BarkBattleWorkSummary) => void) | null;
-  onDeleteBarkBattle?: ((item: BarkBattleWorkSummary) => void) | null;
-  visualNovelItems?: VisualNovelWorkSummary[];
-  onOpenVisualNovelDetail?: ((item: VisualNovelWorkSummary) => void) | null;
-  onDeleteVisualNovel?: ((item: VisualNovelWorkSummary) => void) | null;
-  getWorkState?: (
-    item: CreationWorkShelfItem,
-  ) => CreationWorkShelfRuntimeState | null;
   onOpenShelfItem?: (item: CreationWorkShelfItem) => void;
   // 中文注释：底部加号入口可传入后端作品架摘要，用于推导最近使用过的模板。
   recentWorkItems?: CreationWorkShelfItem[];
@@ -169,7 +113,7 @@ function writeWorkMetricSnapshot(items: CreationWorkShelfItem[]) {
 
 /** 渲染底部加号创作入口页与草稿作品架，最近创作复用最近使用过的模板入口。 */
 export function CustomWorldCreationHub({
-  items,
+  shelfItems,
   loading,
   error,
   onRetry,
@@ -177,147 +121,14 @@ export function CustomWorldCreationHub({
   entryConfig,
   creationTypes,
   onCreateType,
-  onOpenDraft,
-  onEnterPublished,
-  onDeletePublished = null,
   deletingWorkId = null,
-  rpgLibraryEntries = [],
-  bigFishItems = [],
-  onOpenBigFishDetail,
-  onDeleteBigFish = null,
-  match3dItems = [],
-  onOpenMatch3DDetail,
-  onDeleteMatch3D = null,
-  squareHoleItems = [],
-  onOpenSquareHoleDetail,
-  onDeleteSquareHole = null,
-  jumpHopItems = [],
-  onOpenJumpHopDetail,
-  onDeleteJumpHop = null,
-  woodenFishItems = [],
-  onOpenWoodenFishDetail = null,
-  onDeleteWoodenFish = null,
-  puzzleClearItems = [],
-  onOpenPuzzleClearDetail = null,
-  onDeletePuzzleClear = null,
-  puzzleItems = [],
-  onOpenPuzzleDetail,
-  onDeletePuzzle = null,
-  onClaimPuzzlePointIncentive = null,
   claimingPuzzleProfileId = null,
-  babyObjectMatchItems = [],
-  onOpenBabyObjectMatchDetail = null,
-  onDeleteBabyObjectMatch = null,
-  barkBattleItems = [],
-  onOpenBarkBattleDetail = null,
-  onDeleteBarkBattle = null,
-  visualNovelItems = [],
-  onOpenVisualNovelDetail = null,
-  onDeleteVisualNovel = null,
-  getWorkState,
   onOpenShelfItem,
   recentWorkItems: recentWorkSourceItems,
   mode = 'full',
 }: CustomWorldCreationHubProps) {
   const [activeFilter, setActiveFilter] =
     useState<CustomWorldWorkFilter>('all');
-  const isSquareHoleCreationVisible = isPlatformCreationTypeVisible(
-    creationTypes,
-    'square-hole',
-  );
-  const shelfItems = useMemo(
-    () =>
-      buildCreationWorkShelfItems({
-        rpgItems: items,
-        rpgLibraryEntries,
-        bigFishItems,
-        match3dItems,
-        squareHoleItems: isSquareHoleCreationVisible ? squareHoleItems : [],
-        jumpHopItems,
-        woodenFishItems,
-        puzzleClearItems,
-        puzzleItems,
-        babyObjectMatchItems,
-        barkBattleItems,
-        visualNovelItems,
-        canDeleteRpg: Boolean(onDeletePublished),
-        canDeleteBigFish: Boolean(onDeleteBigFish),
-        canDeleteMatch3D: Boolean(onDeleteMatch3D),
-        canDeleteSquareHole:
-          isSquareHoleCreationVisible && Boolean(onDeleteSquareHole),
-        canDeleteJumpHop: Boolean(onDeleteJumpHop),
-        canDeleteWoodenFish: Boolean(onDeleteWoodenFish),
-        canDeletePuzzleClear: Boolean(onDeletePuzzleClear),
-        canDeletePuzzle: Boolean(onDeletePuzzle),
-        canDeleteBabyObjectMatch: Boolean(onDeleteBabyObjectMatch),
-        canDeleteBarkBattle: Boolean(onDeleteBarkBattle),
-        canDeleteVisualNovel: Boolean(onDeleteVisualNovel),
-        onOpenRpgDraft: onOpenDraft,
-        onEnterRpgPublished: onEnterPublished,
-        onDeleteRpg: onDeletePublished ?? undefined,
-        onOpenBigFishDetail,
-        onDeleteBigFish: onDeleteBigFish ?? undefined,
-        onOpenMatch3DDetail,
-        onDeleteMatch3D: onDeleteMatch3D ?? undefined,
-        onOpenSquareHoleDetail,
-        onDeleteSquareHole: onDeleteSquareHole ?? undefined,
-        onOpenJumpHopDetail: onOpenJumpHopDetail ?? undefined,
-        onDeleteJumpHop: onDeleteJumpHop ?? undefined,
-        onOpenWoodenFishDetail: onOpenWoodenFishDetail ?? undefined,
-        onDeleteWoodenFish: onDeleteWoodenFish ?? undefined,
-        onOpenPuzzleClearDetail: onOpenPuzzleClearDetail ?? undefined,
-        onDeletePuzzleClear: onDeletePuzzleClear ?? undefined,
-        onOpenPuzzleDetail,
-        onDeletePuzzle: onDeletePuzzle ?? undefined,
-        onClaimPuzzlePointIncentive: onClaimPuzzlePointIncentive ?? undefined,
-        onOpenBabyObjectMatchDetail: onOpenBabyObjectMatchDetail ?? undefined,
-        onDeleteBabyObjectMatch: onDeleteBabyObjectMatch ?? undefined,
-        onOpenBarkBattleDetail: onOpenBarkBattleDetail ?? undefined,
-        onDeleteBarkBattle: onDeleteBarkBattle ?? undefined,
-        onOpenVisualNovelDetail: onOpenVisualNovelDetail ?? undefined,
-        onDeleteVisualNovel: onDeleteVisualNovel ?? undefined,
-        getItemState: getWorkState,
-      }),
-    [
-      bigFishItems,
-      isSquareHoleCreationVisible,
-      babyObjectMatchItems,
-      barkBattleItems,
-      items,
-      match3dItems,
-      onDeleteBigFish,
-      onDeleteMatch3D,
-      onDeleteSquareHole,
-      onDeletePublished,
-      onDeletePuzzle,
-      onDeleteBabyObjectMatch,
-      onDeleteBarkBattle,
-      onDeleteVisualNovel,
-      onDeleteJumpHop,
-      onDeleteWoodenFish,
-      onDeletePuzzleClear,
-      onClaimPuzzlePointIncentive,
-      onOpenBigFishDetail,
-      onOpenDraft,
-      onOpenMatch3DDetail,
-      onOpenBabyObjectMatchDetail,
-      onOpenBarkBattleDetail,
-      onOpenPuzzleDetail,
-      onOpenSquareHoleDetail,
-      onOpenVisualNovelDetail,
-      onOpenWoodenFishDetail,
-      onOpenPuzzleClearDetail,
-      onEnterPublished,
-      getWorkState,
-      puzzleClearItems,
-      puzzleItems,
-      rpgLibraryEntries,
-      onOpenJumpHopDetail,
-      jumpHopItems,
-      woodenFishItems,
-      visualNovelItems,
-    ],
-  );
   const [metricSnapshot] = useState<WorkMetricSnapshot>(() =>
     readWorkMetricSnapshot(),
   );
@@ -355,47 +166,8 @@ export function CustomWorldCreationHub({
 
   function handleOpenShelfItem(item: CreationWorkShelfItem) {
     onOpenShelfItem?.(item);
-    switch (item.source.kind) {
-      case 'puzzle':
-        onOpenPuzzleDetail?.(item.source.item);
-        return;
-      case 'baby-object-match':
-        onOpenBabyObjectMatchDetail?.(item.source.item);
-        return;
-      case 'visual-novel':
-        onOpenVisualNovelDetail?.(item.source.item);
-        return;
-      case 'bark-battle':
-        onOpenBarkBattleDetail?.(item.source.item);
-        return;
-      case 'big-fish':
-        onOpenBigFishDetail?.(item.source.item);
-        return;
-      case 'match3d':
-        onOpenMatch3DDetail?.(item.source.item);
-        return;
-      case 'square-hole':
-        onOpenSquareHoleDetail?.(item.source.item);
-        return;
-      case 'jump-hop':
-        onOpenJumpHopDetail?.(item.source.item);
-        return;
-      case 'wooden-fish':
-        onOpenWoodenFishDetail?.(item.source.item);
-        return;
-      case 'puzzle-clear':
-        onOpenPuzzleClearDetail?.(item.source.item);
-        return;
-      case 'rpg':
-        if (item.status === 'draft') {
-          onOpenDraft(item.source.item);
-          return;
-        }
-
-        if (item.source.item.profileId) {
-          onEnterPublished(item.source.item.profileId);
-        }
-    }
+    // 中文注释：玩法差异由 Work Shelf Adapter 承载，Hub 只负责响应卡片点击。
+    item.actions.open();
   }
 
   function buildDeleteAction(item: CreationWorkShelfItem) {

src/components/custom-world-home/creationWorkShelf.test.ts

@@ -5,10 +5,11 @@ import { expect, test, vi } from 'vitest';
 import type { BabyObjectMatchDraft } from '../../../packages/shared/src/contracts/edutainmentBabyObject';
 import {
   buildCreationWorkShelfItems,
+  buildCreationWorkShelfItemsFromSources,
+  type CreationWorkShelfItem,
   getCreationWorkShelfItemTime,
   hasBarkBattleRequiredImages,
   isPersistedBarkBattleDraftGenerating,
-  type CreationWorkShelfItem,
 } from './creationWorkShelf';
 import { CustomWorldWorkCard } from './CustomWorldWorkCard';
 
@@ -56,6 +57,86 @@ test('buildCreationWorkShelfItems maps visual novel items with VN public code',
   expect(items[1]?.publicWorkCode).toBeNull();
 });
 
+test('buildCreationWorkShelfItemsFromSources flattens source adapters and applies runtime state', () => {
+  const [staleRpgItem] = buildCreationWorkShelfItems({
+    rpgItems: [
+      {
+        workId: 'draft:rpg-source-adapter',
+        sourceType: 'agent_session',
+        status: 'draft',
+        title: '旧 RPG 草稿',
+        subtitle: '待完善',
+        summary: '通过 source adapter 输入。',
+        coverImageSrc: null,
+        updatedAt: '2026-05-01T00:00:00.000Z',
+        publishedAt: null,
+        stage: 'clarifying',
+        stageLabel: '待完善',
+        playableNpcCount: 0,
+        landmarkCount: 0,
+        sessionId: 'rpg-source-adapter',
+        profileId: null,
+        canResume: true,
+        canEnterWorld: false,
+      },
+    ],
+    bigFishItems: [],
+    puzzleItems: [],
+  });
+  const [freshPuzzleItem] = buildCreationWorkShelfItems({
+    rpgItems: [],
+    bigFishItems: [],
+    puzzleItems: [
+      {
+        workId: 'puzzle:source-adapter',
+        profileId: 'puzzle-source-adapter',
+        ownerUserId: 'user-1',
+        authorDisplayName: '拼图作者',
+        levelName: '新拼图',
+        summary: '新近拼图。',
+        themeTags: ['灯塔'],
+        coverImageSrc: null,
+        publicationStatus: 'draft',
+        updatedAt: '2026-05-03T00:00:00.000Z',
+        publishedAt: null,
+        playCount: 0,
+        remixCount: 0,
+        likeCount: 0,
+        publishReady: false,
+      },
+    ],
+  });
+
+  const items = buildCreationWorkShelfItemsFromSources({
+    sources: [
+      {
+        kind: 'rpg',
+        buildItems: () => (staleRpgItem ? [staleRpgItem] : []),
+      },
+      {
+        kind: 'puzzle',
+        buildItems: () => (freshPuzzleItem ? [freshPuzzleItem] : []),
+      },
+    ],
+    getItemState: (item) =>
+      item.id === staleRpgItem?.id
+        ? {
+            isGenerating: true,
+            hasUnreadUpdate: true,
+            titleOverride: '生成中 RPG 草稿',
+          }
+        : null,
+  });
+
+  expect(items.map((item) => item.id)).toEqual([
+    'puzzle:source-adapter',
+    'draft:rpg-source-adapter',
+  ]);
+  expect(items[1]?.title).toBe('生成中 RPG 草稿');
+  expect(items[1]?.isGenerating).toBe(true);
+  expect(items[1]?.hasUnreadUpdate).toBe(true);
+});
+
 test('buildCreationWorkShelfItems maps wooden fish items with WF public code', () => {
   const onOpenWoodenFishDetail = vi.fn();
   const woodenFishWork = {

src/components/custom-world-home/creationWorkShelf.ts

@@ -2,20 +2,20 @@ import type { BarkBattleWorkSummary } from '../../../packages/shared/src/contrac
 import type { BigFishWorkSummary } from '../../../packages/shared/src/contracts/bigFishWorkSummary';
 import type { CustomWorldWorkSummary } from '../../../packages/shared/src/contracts/customWorldAgent';
 import type { BabyObjectMatchDraft } from '../../../packages/shared/src/contracts/edutainmentBabyObject';
+import type { JumpHopWorkSummaryResponse } from '../../../packages/shared/src/contracts/jumpHop';
 import type { Match3DWorkSummary } from '../../../packages/shared/src/contracts/match3dWorks';
 import type { PuzzleClearWorkSummaryResponse } from '../../../packages/shared/src/contracts/puzzleClear';
 import type { PuzzleWorkSummary } from '../../../packages/shared/src/contracts/puzzleWorkSummary';
 import type { CustomWorldLibraryEntry } from '../../../packages/shared/src/contracts/runtime';
 import type { SquareHoleWorkSummary } from '../../../packages/shared/src/contracts/squareHoleWorks';
 import type { VisualNovelWorkSummary } from '../../../packages/shared/src/contracts/visualNovel';
-import type { JumpHopWorkSummaryResponse } from '../../../packages/shared/src/contracts/jumpHop';
 import type { WoodenFishWorkSummaryResponse } from '../../../packages/shared/src/contracts/woodenFish';
 import { buildPublicWorkStagePath } from '../../routing/appPageRoutes';
 import {
   buildBabyObjectMatchPublicWorkCode,
-  buildCustomWorldPublicWorkCode,
   buildBarkBattlePublicWorkCode,
   buildBigFishPublicWorkCode,
+  buildCustomWorldPublicWorkCode,
   buildJumpHopPublicWorkCode,
   buildMatch3DPublicWorkCode,
   buildPuzzleClearPublicWorkCode,
@@ -164,6 +164,11 @@ export type CreationWorkShelfRuntimeState = {
   summaryOverride?: string;
 };
 
+export type CreationWorkShelfSourceAdapter = {
+  kind: CreationWorkShelfKind;
+  buildItems: () => readonly CreationWorkShelfItem[];
+};
+
 export function buildCreationWorkShelfItems(params: {
   rpgItems: CustomWorldWorkSummary[];
   rpgLibraryEntries?: CustomWorldLibraryEntry<CustomWorldProfile>[];
@@ -267,76 +272,135 @@ export function buildCreationWorkShelfItems(params: {
     getItemState,
   } = params;
 
-  return [
-    ...rpgItems.map((item) =>
-      mapRpgWorkToShelfItem(item, canDeleteRpg, rpgLibraryEntries, {
-        onOpenDraft: onOpenRpgDraft,
-        onEnterPublished: onEnterRpgPublished,
-        onDelete: onDeleteRpg,
-      }),
-    ),
-    ...bigFishItems.map((item) =>
-      mapBigFishWorkToShelfItem(item, canDeleteBigFish, {
-        onOpen: onOpenBigFishDetail,
-        onDelete: onDeleteBigFish,
-      }),
-    ),
-    ...match3dItems.map((item) =>
-      mapMatch3DWorkToShelfItem(item, canDeleteMatch3D, {
-        onOpen: onOpenMatch3DDetail,
-        onDelete: onDeleteMatch3D,
-      }),
-    ),
-    ...squareHoleItems.map((item) =>
-      mapSquareHoleWorkToShelfItem(item, canDeleteSquareHole, {
-        onOpen: onOpenSquareHoleDetail,
-        onDelete: onDeleteSquareHole,
-      }),
-    ),
-    ...jumpHopItems.map((item) =>
-      mapJumpHopWorkToShelfItem(item, canDeleteJumpHop, {
-        onOpen: onOpenJumpHopDetail,
-        onDelete: onDeleteJumpHop,
-      }),
-    ),
-    ...woodenFishItems.map((item) =>
-      mapWoodenFishWorkToShelfItem(item, canDeleteWoodenFish, {
-        onOpen: onOpenWoodenFishDetail,
-        onDelete: onDeleteWoodenFish,
-      }),
-    ),
-    ...puzzleClearItems.map((item) =>
-      mapPuzzleClearWorkToShelfItem(item, canDeletePuzzleClear, {
-        onOpen: onOpenPuzzleClearDetail,
-        onDelete: onDeletePuzzleClear,
-      }),
-    ),
-    ...puzzleItems.map((item) =>
-      mapPuzzleWorkToShelfItem(item, canDeletePuzzle, {
-        onOpen: onOpenPuzzleDetail,
-        onDelete: onDeletePuzzle,
-        onClaimPointIncentive: onClaimPuzzlePointIncentive,
-      }),
-    ),
-    ...babyObjectMatchItems.map((item) =>
-      mapBabyObjectMatchDraftToShelfItem(item, canDeleteBabyObjectMatch, {
-        onOpen: onOpenBabyObjectMatchDetail,
-        onDelete: onDeleteBabyObjectMatch,
-      }),
-    ),
-    ...mergeBarkBattleShelfSourceItems(barkBattleItems).map((item) =>
-      mapBarkBattleWorkToShelfItem(item, canDeleteBarkBattle, {
-        onOpen: onOpenBarkBattleDetail,
-        onDelete: onDeleteBarkBattle,
-      }),
-    ),
-    ...visualNovelItems.map((item) =>
-      mapVisualNovelWorkToShelfItem(item, canDeleteVisualNovel, {
-        onOpen: onOpenVisualNovelDetail,
-        onDelete: onDeleteVisualNovel,
-      }),
-    ),
-  ]
+  return buildCreationWorkShelfItemsFromSources({
+    sources: [
+      {
+        kind: 'rpg',
+        buildItems: () =>
+          rpgItems.map((item) =>
+            mapRpgWorkToShelfItem(item, canDeleteRpg, rpgLibraryEntries, {
+              onOpenDraft: onOpenRpgDraft,
+              onEnterPublished: onEnterRpgPublished,
+              onDelete: onDeleteRpg,
+            }),
+          ),
+      },
+      {
+        kind: 'big-fish',
+        buildItems: () =>
+          bigFishItems.map((item) =>
+            mapBigFishWorkToShelfItem(item, canDeleteBigFish, {
+              onOpen: onOpenBigFishDetail,
+              onDelete: onDeleteBigFish,
+            }),
+          ),
+      },
+      {
+        kind: 'match3d',
+        buildItems: () =>
+          match3dItems.map((item) =>
+            mapMatch3DWorkToShelfItem(item, canDeleteMatch3D, {
+              onOpen: onOpenMatch3DDetail,
+              onDelete: onDeleteMatch3D,
+            }),
+          ),
+      },
+      {
+        kind: 'square-hole',
+        buildItems: () =>
+          squareHoleItems.map((item) =>
+            mapSquareHoleWorkToShelfItem(item, canDeleteSquareHole, {
+              onOpen: onOpenSquareHoleDetail,
+              onDelete: onDeleteSquareHole,
+            }),
+          ),
+      },
+      {
+        kind: 'jump-hop',
+        buildItems: () =>
+          jumpHopItems.map((item) =>
+            mapJumpHopWorkToShelfItem(item, canDeleteJumpHop, {
+              onOpen: onOpenJumpHopDetail,
+              onDelete: onDeleteJumpHop,
+            }),
+          ),
+      },
+      {
+        kind: 'wooden-fish',
+        buildItems: () =>
+          woodenFishItems.map((item) =>
+            mapWoodenFishWorkToShelfItem(item, canDeleteWoodenFish, {
+              onOpen: onOpenWoodenFishDetail,
+              onDelete: onDeleteWoodenFish,
+            }),
+          ),
+      },
+      {
+        kind: 'puzzle',
+        buildItems: () =>
+          puzzleItems.map((item) =>
+            mapPuzzleWorkToShelfItem(item, canDeletePuzzle, {
+              onOpen: onOpenPuzzleDetail,
+              onDelete: onDeletePuzzle,
+              onClaimPointIncentive: onClaimPuzzlePointIncentive,
+            }),
+          ),
+      },
+      {
+        kind: 'baby-object-match',
+        buildItems: () =>
+          babyObjectMatchItems.map((item) =>
+            mapBabyObjectMatchDraftToShelfItem(
+              item,
+              canDeleteBabyObjectMatch,
+              {
+                onOpen: onOpenBabyObjectMatchDetail,
+                onDelete: onDeleteBabyObjectMatch,
+              },
+            ),
+          ),
+      },
+      {
+        kind: 'bark-battle',
+        buildItems: () =>
+          mergeBarkBattleShelfSourceItems(barkBattleItems).map((item) =>
+            mapBarkBattleWorkToShelfItem(item, canDeleteBarkBattle, {
+              onOpen: onOpenBarkBattleDetail,
+              onDelete: onDeleteBarkBattle,
+            }),
+          ),
+      },
+      {
+        kind: 'visual-novel',
+        buildItems: () =>
+          visualNovelItems.map((item) =>
+            mapVisualNovelWorkToShelfItem(item, canDeleteVisualNovel, {
+              onOpen: onOpenVisualNovelDetail,
+              onDelete: onDeleteVisualNovel,
+            }),
+          ),
+      },
+    ],
+    getItemState,
+  });
+}
+
+export function buildCreationWorkShelfItemsFromSources(params: {
+  sources: readonly CreationWorkShelfSourceAdapter[];
+  getItemState?: (
+    item: CreationWorkShelfItem,
+  ) => CreationWorkShelfRuntimeState | null;
+}) {
+  const { sources, getItemState } = params;
+  const sourceItems = sources.reduce<CreationWorkShelfItem[]>(
+    (items, source) => {
+      items.push(...source.buildItems());
+      return items;
+    },
+    [],
+  );
+
+  return sourceItems
     .map((item) => {
       const state = getItemState?.(item);
       const persistedIsGenerating = isPersistedCreationWorkGenerating(item);