fix: preserve complete consultation replies and recover retained history

tests/e2e/fixtures/teacher-reply-api.ts

@@ -1,5 +1,6 @@
 // Deterministic responses for layout/interaction tests only; never imported by the app.
 import type { TeacherDefinition, TeacherTopic, TeacherSend } from '../../../shared/coding-teacher';
+import { parseTeacherReply } from '../../../shared/teacher-reply';
 const definition: TeacherDefinition = { schema_version: 1, teacher_id: 'coding-teacher', name: '麦洛智能体', description: '', avatar_id: 'avatar-01', welcome_message: '', suggested_questions: [], system_prompt: '测试', skills: [], model: { model_id: 'fixture', reasoning_choice: { mode: 'default' } }, limits: { max_input_tokens: 8000, max_output_tokens: 1500 } };
 const samples: Record<string, unknown> = {
   ideas: { kind: 'ideas', title: '我的小狗世界', items: [{ id: 'dog', text: '养一只自己的小狗', state: 'kept' }, { id: 'breed', parentId: 'dog', text: '是一只柯基', state: 'kept' }, { id: 'garden', text: '有一片可以种东西的花园', state: 'kept' }, { id: 'food', parentId: 'garden', text: '种出来的东西可以喂小狗', state: 'suggested' }] },
@@ -10,6 +11,17 @@ const samples: Record<string, unknown> = {
 const scenario = new URLSearchParams(location.search).get('kind') ?? 'ideas';
 let current: TeacherTopic = { schemaVersion: 1, revision: 1, id: 'discussion-fixture', accountId: 'fixture', projectId: 'fixture', sourceConversationId: 'project', definition, version: 1, createdAt: 'now', updatedAt: 'now', requests: Array.from({ length: 8 }, (_, i) => ({ id: `r${i}`, text: i === 7 ? '我还没想好，我们边聊边想。' : '我希望这个游戏更有意思。', references: [], createdAt: 'now', sourceCursor: { workerGeneration: 0, seq: i }, sourceCapturedAt: 'now', includedSourceMessageIds: [], omittedMessages: 0, status: 'completed', response: i === 7 ? '可以，我们先把已经想到的放在一起。哪里还不确定，就留着继续聊。' : '先从你最在意的一个小地方开始想。', ...(i === 7 ? { suggestedQuestions: ['有什么好玩的想法？'] } : {}) })), ...(samples[scenario] ? { discussion: { id: 'tool', revision: 1, status: 'active', content: structuredClone(samples[scenario]) } } : {}) };
 const stream = Object.assign(new EventTarget(), { close() {}, onerror: null, onopen: null });
+if (scenario === 'recovered' || scenario === 'incomplete') {
+  const raw = '{"reply":"它早就不是"刚搭好架子"那种阶段了——骨架、玩法、成长线都在跑。\n现在的阶段是「能玩，正在调手感」。'
+    + (scenario === 'recovered' ? '","quickReplies":[],"tool":{"kind":"structure","nodes":[]}}' : '');
+  const parsed = parseTeacherReply(raw);
+  current.requests = [{
+    ...current.requests[0], text: '现在项目是什么阶段？', sourceConversationId: 'original-source',
+    references: [{ messageId: 'original-message', text: '原来的项目记录', role: 'assistant' }],
+    response: parsed.reply, replyIncomplete: parsed.incomplete, replyParseError: parsed.parseError,
+    suggestedQuestions: parsed.quickReplies, unparsedResponse: raw,
+  }];
+}
 if (scenario === 'retry') {
   const status = new URLSearchParams(location.search).get('status') === 'cancelled' ? 'cancelled' : 'failed';
   current.requests = [{

tests/e2e/pi-coding-first-chat.spec.ts

@@ -22,6 +22,7 @@ type HostConnection = {
 };
 
 type TeacherCatalogFixture = {
+  nextTeacherReplyIncomplete?: boolean;
   teacherCatalog: TeacherCatalog;
   teacherCatalogFailure: boolean;
   holdTeacherCatalog: boolean;
@@ -575,6 +576,12 @@ async function installCodingFirstChatHost(
           const suggestionRequest = body!.intent === 'suggestions';
           const teacherResponse = suggestionRequest ? '我们可以从你最近试过的地方聊起。' : '先理解状态如何随点击变化，再修改代码。';
           consultationTopics[consultationPath]={...currentTopic,revision:Number(currentTopic?.revision??0)+1,requests:[...(currentTopic?.requests as unknown[]??[]),{id:body!.requestId,text:body!.text,intent:body!.intent,references:body!.references??[],createdAt:now,sourceCursor:{workerGeneration:1,seq:1},sourceCapturedAt:now,includedSourceMessageIds:[],omittedMessages:0,truncatedMessages:1,status:'completed',response:teacherResponse,...(suggestionRequest?{suggestedQuestions:['怎样观察别人玩游戏？','我该先试哪个想法？']}:{})}]};
+          if (state.nextTeacherReplyIncomplete) {
+            state.nextTeacherReplyIncomplete = false;
+            const reply = (consultationTopics[consultationPath].requests as Record<string, unknown>[]).at(-1)!;
+            Object.assign(reply, { response: '它早就不是', replyIncomplete: true, replyParseError: '格式不完整',
+              sourceConversationId: body!.sourceConversationId, unparsedResponse: '{"reply":"它早就不是"刚搭好架子' });
+          }
           return respond(consultationTopics[consultationPath],202);
         }
         if (path.endsWith(`${topicBase}/${topicId}`)) return respond(currentTopic);
@@ -1894,6 +1901,50 @@ test('project consultations preserve student drafts and switch between work and
 });
 
 
+test('incomplete consultation replies retry only on click and preserve both drafts', async ({ launchElectronApp }) => {
+  const app = await launchElectronApp({ skipSetup: true });
+  let page = await getStableWindow(app);
+  const connection = await page.evaluate(async () => ({
+    token: await window.electron.ipcRenderer.invoke('hostapi:token') as string,
+    baseUrl: await window.electron.ipcRenderer.invoke('hostapi:base-url') as string,
+  }));
+  await installCodingFirstChatHost(app, connection, true);
+  await settleSnapshot(app);
+  await disableCodingEventSource(page);
+  await app.evaluate(() => {
+    (globalThis as typeof globalThis & { __makelorePiFirstChatE2E: TeacherCatalogFixture })
+      .__makelorePiFirstChatE2E.nextTeacherReplyIncomplete = true;
+  });
+  try {
+    await page.reload();
+    page = await getStableWindow(app);
+    await page.getByTestId('ai-module-option-programming').click();
+    await page.evaluate(() => { window.location.hash = '/chat'; });
+    const mainDraft = page.getByTestId('coding-message-composer').getByRole('textbox', { includeHidden: true });
+    await mainDraft.fill('主对话草稿');
+    await page.getByRole('button', { name: '与代码智能体聊天', exact: true }).click();
+    const teacher = page.getByTestId('teacher-chat-panel');
+    const draft = teacher.getByRole('textbox', { name: '向智能体提问' });
+    await draft.fill('现在项目是什么阶段？');
+    await teacher.getByRole('button', { name: '提问', exact: true }).click();
+    await expect(teacher.getByRole('status')).toHaveText('这次回复未能完整显示');
+    await expect(teacher.getByTestId('teacher-reply')).toHaveCount(0);
+    await expect(teacher.getByText('查看收到的原始内容').locator('..')).not.toHaveAttribute('open');
+    const sends = async () => (await readState(app)).captured.filter(item => item.path.endsWith('/messages') && item.method === 'POST');
+    expect(await sends()).toHaveLength(1);
+    await draft.fill('咨询里还没写完的草稿');
+    await teacher.getByRole('button', { name: '重新回答' }).click();
+    await expect(teacher.getByText('先理解状态如何随点击变化，再修改代码。')).toBeVisible();
+    await expect(draft).toHaveValue('咨询里还没写完的草稿');
+    await expect(mainDraft).toHaveValue('主对话草稿');
+    const inputs = await sends();
+    expect(inputs).toHaveLength(2);
+    expect(inputs[1].path).toBe(inputs[0].path);
+    expect(inputs[1].body).toEqual({ ...inputs[0].body, requestId: expect.any(String) });
+    expect(inputs[1].body!.requestId).not.toBe(inputs[0].body!.requestId);
+  } finally { await releaseSnapshot(app); }
+});
+
 test('manual agent refresh updates the catalog and retries failures without replacing the open topic or drafts', async ({ launchElectronApp }) => {
   const electronApp = await launchElectronApp({ skipSetup: true });
   let page = await getStableWindow(electronApp);

tests/e2e/teacher-reply-layout.spec.ts

@@ -47,6 +47,40 @@ test('retry stickers stay readable and preserve drafts in a 319px consultation',
 });
 
 for (const width of [319, 508]) {
+  test(`quoted replies recover fully and incomplete replies retry without losing the draft at ${width}px`, async ({ page }) => {
+    await page.setViewportSize({ width: 1180, height: 800 });
+    const sent = () => page.evaluate(() => (window as unknown as { __teacherReplyInputs: unknown[] }).__teacherReplyInputs);
+    await page.goto(`${url}?kind=recovered&width=${width}`);
+    const panel = page.getByTestId('teacher-chat-panel');
+    const body = page.getByTestId('teacher-reply');
+    await expect(body).toContainText('它早就不是"刚搭好架子"那种阶段了');
+    await expect(body).toContainText('现在的阶段是「能玩，正在调手感」。');
+    await expect(page.getByText('查看收到的原始内容').locator('..')).not.toHaveAttribute('open');
+    await expect(page.getByRole('button', { name: '重新回答' })).toHaveCount(0);
+    expect(await sent()).toEqual([]);
+    expect(await body.evaluate(el => el.scrollWidth <= el.clientWidth)).toBe(true);
+    await panel.screenshot({ path: test.info().outputPath(`recovered-${width}.png`) });
+
+    await page.goto(`${url}?kind=incomplete&width=${width}`);
+    await expect(page.getByRole('status')).toHaveText('这次回复未能完整显示');
+    await expect(page.getByTestId('teacher-reply')).toHaveCount(0);
+    expect(await sent()).toEqual([]);
+    const input = page.getByRole('textbox', { name: '向智能体提问' });
+    await input.fill('我还在写的新想法');
+    const retry = page.getByRole('button', { name: '重新回答' });
+    const bounds = (await retry.boundingBox())!;
+    expect(bounds.height).toBeGreaterThanOrEqual(44);
+    expect(await panel.evaluate(el => el.scrollWidth <= el.clientWidth)).toBe(true);
+    await panel.screenshot({ path: test.info().outputPath(`incomplete-${width}.png`) });
+    await retry.click();
+    await expect(page.getByText('好，我们就从这一个问题聊起。')).toBeVisible();
+    await expect(input).toHaveValue('我还在写的新想法');
+    expect(await sent()).toEqual([{
+      requestId: expect.any(String), text: '现在项目是什么阶段？',
+      sourceConversationId: 'original-source', references: [{ messageId: 'original-message', text: '原来的项目记录', role: 'assistant' }],
+    }]);
+  });
+
   test(`empty-composer hint stays readable and keeps the send position stable at ${width}px`, async ({ page }) => {
     await page.setViewportSize({ width: 1180, height: 800 });
     await page.goto(`${url}?kind=ordinary&width=${width}`);