Merge branch 'master' of http://82.157.175.59:3000/GenarrativeAI/Genarrative

src/components/platform-entry/PlatformEntryCreationTypeModal.tsx

@@ -12,6 +12,7 @@ export interface PlatformEntryCreationTypeModalProps {
   onSelectRpg: () => void;
   onSelectBigFish: () => void;
   onSelectMatch3D: () => void;
+  onSelectSquareHole: () => void;
   onSelectPuzzle: () => void;
 }
 
@@ -74,6 +75,7 @@ export function PlatformEntryCreationTypeModal({
   onSelectRpg,
   onSelectBigFish,
   onSelectMatch3D,
+  onSelectSquareHole,
   onSelectPuzzle,
 }: PlatformEntryCreationTypeModalProps) {
   if (!isOpen) {
@@ -93,7 +95,7 @@ export function PlatformEntryCreationTypeModal({
       closeDisabled={isBusy}
       size="lg"
     >
-      <div className="grid gap-3 sm:grid-cols-5">
+      <div className="grid gap-3 sm:grid-cols-2 lg:grid-cols-3">
         {visibleCreationTypes.map((item) => (
           <CreationTypeCard
             key={item.id}
@@ -109,6 +111,9 @@ export function PlatformEntryCreationTypeModal({
               if (item.id === 'match3d') {
                 onSelectMatch3D();
               }
+              if (item.id === 'square-hole') {
+                onSelectSquareHole();
+              }
               if (item.id === 'puzzle') {
                 onSelectPuzzle();
               }

src/components/platform-entry/PlatformWorkDetailView.tsx

@@ -60,6 +60,9 @@ function getSourceLabel(entry: PlatformPublicGalleryCard) {
   if ('sourceType' in entry && entry.sourceType === 'match3d') {
     return '抓大鹅';
   }
+  if ('sourceType' in entry && entry.sourceType === 'square-hole') {
+    return '方洞挑战';
+  }
   return 'RPG';
 }
 

src/components/platform-entry/platformEntryCreationTypes.test.ts

@@ -37,6 +37,7 @@ test('new work entry config controls visibility and open order', () => {
   expect(visibleIds[0]).toBe('puzzle');
   expect(visibleIds).toEqual([
     'puzzle',
+    'square-hole',
     'airp',
     'visual-novel',
   ]);

src/components/platform-entry/platformEntryTypes.ts

@@ -25,6 +25,9 @@ export type SelectionStage =
   | 'match3d-agent-workspace'
   | 'match3d-result'
   | 'match3d-runtime'
+  | 'square-hole-agent-workspace'
+  | 'square-hole-result'
+  | 'square-hole-runtime'
   | 'puzzle-agent-workspace'
   | 'puzzle-generating'
   | 'puzzle-result'

src/components/platform-entry/usePlatformCreationAgentFlowController.test.tsx

@@ -0,0 +1,137 @@
+/* @vitest-environment jsdom */
+
+import { act, render, screen, waitFor } from '@testing-library/react';
+import { useEffect } from 'react';
+import { expect, test, vi } from 'vitest';
+
+import { usePlatformCreationAgentFlowController } from './usePlatformCreationAgentFlowController';
+
+type TestSession = {
+  sessionId: string;
+  messages: Array<{
+    id: string;
+    role: string;
+    kind?: string;
+    text: string;
+    createdAt?: string;
+  }>;
+};
+
+type TestMessagePayload = {
+  clientMessageId: string;
+  text: string;
+};
+
+function TestHarness({
+  streamMessage,
+}: {
+  streamMessage: (
+    sessionId: string,
+    payload: TestMessagePayload,
+    options?: { onUpdate?: (text: string) => void },
+  ) => Promise<TestSession>;
+}) {
+  const flow = usePlatformCreationAgentFlowController<
+    TestSession,
+    Record<string, never>,
+    { session: TestSession },
+    TestMessagePayload,
+    { action: string },
+    { session: TestSession }
+  >({
+    client: {
+      createSession: async () => ({
+        session: {
+          sessionId: 'session-1',
+          messages: [],
+        },
+      }),
+      getSession: async () => ({
+        session: {
+          sessionId: 'session-1',
+          messages: [],
+        },
+      }),
+      streamMessage,
+      executeAction: async () => ({
+        session: {
+          sessionId: 'session-1',
+          messages: [],
+        },
+      }),
+      selectSession: (response) => response.session,
+    },
+    createPayload: {},
+    workspaceStage: 'match3d-agent-workspace',
+    resultStage: 'match3d-result',
+    platformStage: 'platform',
+    isCompileAction: () => false,
+    resolveErrorMessage: (error, fallback) =>
+      error instanceof Error ? error.message : fallback,
+    errorMessages: {
+      open: '打开失败',
+      restoreMissingSession: '缺少会话',
+      restore: '恢复失败',
+      submit: '发送失败',
+      execute: '执行失败',
+    },
+    enterCreateTab: () => {},
+    setSelectionStage: () => {},
+  });
+
+  useEffect(() => {
+    void flow.openWorkspace({});
+  }, []);
+
+  return (
+    <div>
+      <button
+        type="button"
+        onClick={() => {
+          void flow.submitMessage({
+            clientMessageId: 'client-message-1',
+            text: '做一个办公室文具方洞挑战',
+          });
+        }}
+      >
+        发送
+      </button>
+      <div data-testid="messages">
+        {flow.session?.messages.map((message) => (
+          <div key={message.id}>{`${message.role}:${message.kind}:${message.text}`}</div>
+        ))}
+      </div>
+      {flow.error ? <div>{flow.error}</div> : null}
+    </div>
+  );
+}
+
+test('creation agent flow preserves streamed assistant text when stream fails', async () => {
+  const streamMessage = vi.fn(async (_sessionId, _payload, options) => {
+    options?.onUpdate?.('先把方洞万能的反差定住。');
+    throw new Error('方洞挑战聊天生成失败：LLM 请求超时');
+  });
+
+  render(<TestHarness streamMessage={streamMessage} />);
+
+  await waitFor(() => {
+    expect(screen.getByRole('button', { name: '发送' })).toBeTruthy();
+  });
+
+  await act(async () => {
+    screen.getByRole('button', { name: '发送' }).click();
+  });
+
+  await waitFor(() => {
+    expect(
+      screen.getByText('方洞挑战聊天生成失败：LLM 请求超时'),
+    ).toBeTruthy();
+  });
+
+  expect(screen.getByTestId('messages').textContent).toContain(
+    'user:chat:做一个办公室文具方洞挑战',
+  );
+  expect(screen.getByTestId('messages').textContent).toContain(
+    'assistant:warning:先把方洞万能的反差定住。',
+  );
+});

src/components/platform-entry/usePlatformCreationAgentFlowController.ts

@@ -1,4 +1,4 @@
-import { useCallback, useState } from 'react';
+import { useCallback, useRef, useState } from 'react';
 
 import type { TextStreamOptions } from '../../services/aiTypes';
 import type { SelectionStage } from './platformEntryTypes';
@@ -104,6 +104,16 @@ function buildOptimisticMessage<TMessagePayload extends CreationAgentMessageLike
   };
 }
 
+function buildInterruptedAssistantMessage(text: string) {
+  return {
+    id: `assistant-interrupted-${Date.now().toString(36)}`,
+    role: 'assistant',
+    kind: 'warning',
+    text: text.trim(),
+    createdAt: new Date().toISOString(),
+  };
+}
+
 /**
  * 轻量作品 Agent 创作流程的通用前端控制器。
  * 这里只处理跨玩法一致的会话、流式消息、忙碌态与草稿恢复，玩法结果页和运行态动作留给外层。
@@ -130,6 +140,18 @@ export function usePlatformCreationAgentFlowController<
   const [isBusy, setIsBusy] = useState(false);
   const [streamingReplyText, setStreamingReplyText] = useState('');
   const [isStreamingReply, setIsStreamingReply] = useState(false);
+  const latestStreamingReplyTextRef = useRef('');
+
+  const updateStreamingReplyText = useCallback((text: string) => {
+    latestStreamingReplyTextRef.current = text;
+    setStreamingReplyText(text);
+  }, []);
+
+  const resetStreamingReply = useCallback(() => {
+    latestStreamingReplyTextRef.current = '';
+    setStreamingReplyText('');
+    setIsStreamingReply(false);
+  }, []);
 
   const openWorkspace = useCallback(async (createPayload?: TCreatePayload) => {
     if (isBusy) {
@@ -138,8 +160,7 @@ export function usePlatformCreationAgentFlowController<
 
     setIsBusy(true);
     setError(null);
-    setStreamingReplyText('');
-    setIsStreamingReply(false);
+    resetStreamingReply();
 
     try {
       const response = await options.client.createSession(
@@ -159,7 +180,7 @@ export function usePlatformCreationAgentFlowController<
     } finally {
       setIsBusy(false);
     }
-  }, [isBusy, options]);
+  }, [isBusy, options, resetStreamingReply]);
 
   const restoreDraft = useCallback(
     async (sessionId: string | null | undefined) => {
@@ -171,8 +192,7 @@ export function usePlatformCreationAgentFlowController<
 
       setIsBusy(true);
       setError(null);
-      setStreamingReplyText('');
-      setIsStreamingReply(false);
+      resetStreamingReply();
 
       try {
         const response = await options.client.getSession(normalizedSessionId);
@@ -194,7 +214,7 @@ export function usePlatformCreationAgentFlowController<
         setIsBusy(false);
       }
     },
-    [options],
+    [options, resetStreamingReply],
   );
 
   const submitMessage = useCallback(
@@ -206,7 +226,7 @@ export function usePlatformCreationAgentFlowController<
       const optimisticMessage = buildOptimisticMessage(payload);
 
       setError(null);
-      setStreamingReplyText('');
+      updateStreamingReplyText('');
       setIsStreamingReply(true);
       setSession((current) =>
         current
@@ -223,12 +243,28 @@ export function usePlatformCreationAgentFlowController<
           session.sessionId,
           payload,
           {
-            onUpdate: setStreamingReplyText,
+            onUpdate: updateStreamingReplyText,
           },
         );
         setSession(nextSession);
-        setStreamingReplyText('');
+        updateStreamingReplyText('');
       } catch (caughtError) {
+        const interruptedReplyText =
+          latestStreamingReplyTextRef.current.trim();
+        // 上游流可能在已经吐出可读回复后才失败；把这段回复落进本地消息列表，避免 UI 收尾时突然消失。
+        if (interruptedReplyText) {
+          const interruptedMessage =
+            buildInterruptedAssistantMessage(interruptedReplyText);
+          setSession((current) =>
+            current
+              ? {
+                  ...current,
+                  messages: [...current.messages, interruptedMessage],
+                  updatedAt: interruptedMessage.createdAt,
+                }
+              : current,
+          );
+        }
         setError(
           options.resolveErrorMessage(caughtError, options.errorMessages.submit),
         );
@@ -236,7 +272,7 @@ export function usePlatformCreationAgentFlowController<
         setIsStreamingReply(false);
       }
     },
-    [isStreamingReply, options, session],
+    [isStreamingReply, options, session, updateStreamingReplyText],
   );
 
   const executeAction = useCallback(
@@ -284,17 +320,15 @@ export function usePlatformCreationAgentFlowController<
 
   const leaveFlow = useCallback(() => {
     setError(null);
-    setStreamingReplyText('');
-    setIsStreamingReply(false);
+    resetStreamingReply();
     options.enterCreateTab();
     options.setSelectionStage(options.platformStage);
-  }, [options]);
+  }, [options, resetStreamingReply]);
 
   const resetTransientState = useCallback(() => {
     setError(null);
-    setStreamingReplyText('');
-    setIsStreamingReply(false);
-  }, []);
+    resetStreamingReply();
+  }, [resetStreamingReply]);
 
   return {
     session,