fix: preserve complete consultation replies and recover retained history

This commit is contained in:
鲨鱼辣椒
2026-09-28 17:38:31 +08:00
parent dda2f0a3be
commit d530abe580
14 changed files with 643 additions and 38 deletions

View File

@@ -158,6 +158,122 @@ describe('teacher side chat', () => {
expect(details?.querySelector('script')).toBeNull();
});
it('marks an incomplete completed reply instead of displaying a half sentence as a finished answer', async () => {
const raw = '{"reply":"它早就不是"刚搭好架子"那种阶段了——还有后面的回答';
const bringBack = vi.fn();
api.read.mockResolvedValue({ ...first, requests: [request({
text: '现在项目是什么阶段?', response: '它早就不是', replyIncomplete: true,
replyParseError: 'format error', unparsedResponse: raw, suggestedQuestions: ['尚未确认的建议'],
})] });
render(<TeacherChatPanel projectId="p" sourceId="c" onBringBack={bringBack} />);
await ready();
expect(screen.getByRole('status')).toHaveTextContent('这次回复未能完整显示');
expect(screen.queryByTestId('teacher-reply')).not.toBeInTheDocument();
expect(screen.queryByRole('button', { name: '尚未确认的建议' })).not.toBeInTheDocument();
expect(screen.queryByRole('button', { name: '带回主会话草稿' })).not.toBeInTheDocument();
expect(screen.getByRole('button', { name: '重新回答' })).toBeEnabled();
const details = screen.getByText('查看收到的原始内容').closest('details');
expect(details).not.toHaveAttribute('open');
expect(details?.querySelector('pre')?.textContent).toBe(raw);
expect(api.create).not.toHaveBeenCalled();
expect(api.send).not.toHaveBeenCalled();
expect(bringBack).not.toHaveBeenCalled();
});
it('keeps complete Markdown visible when only auxiliary fields could not be recovered', async () => {
api.read.mockResolvedValue({ ...first, requests: [request({
response: '**它早就不是"刚搭好架子"那种阶段了。** 后面的回答也已经收到。',
replyParseError: 'invalid quickReplies', unparsedResponse: '{"reply":"完整回答","quickReplies":',
})] });
render(<TeacherChatPanel projectId="p" sourceId="c" />);
await ready();
expect(screen.getByTestId('teacher-reply')).toHaveTextContent('它早就不是"刚搭好架子"那种阶段了。 后面的回答也已经收到。');
expect(screen.getByText('回答正文已保留,部分附加内容未能显示。')).toBeVisible();
expect(screen.queryByText('这次回复未能完整显示')).not.toBeInTheDocument();
expect(screen.queryByRole('button', { name: '重新回答' })).not.toBeInTheDocument();
expect(api.send).not.toHaveBeenCalled();
});
it.each(['question', 'suggestions', 'guided-help'] as const)('retries an incomplete %s only on click with its original input while preserving the current draft', async intent => {
const originalReferences = [{ messageId: 'original-message', text: '原来的引用', role: 'assistant' as const }];
const currentQuote = { messageId: 'current-message', text: '草稿里的新引用', role: 'assistant' as const };
const incomplete = request({
intent, text: '现在项目是什么阶段?', sourceConversationId: 'original-source', references: originalReferences,
response: '它早就不是', replyIncomplete: true,
});
const before = { ...first, requests: [incomplete] };
api.read.mockResolvedValue(before);
let finish!: (topic: TeacherTopic) => void;
api.send.mockImplementation(() => new Promise<TeacherTopic>(resolve => { finish = resolve; }));
render(<TeacherChatPanel projectId="p" sourceId="different-source" quote={currentQuote} />);
await ready();
const input = screen.getByLabelText('向智能体提问');
fireEvent.change(input, { target: { value: '还没说完的新想法' } });
expect(api.send).not.toHaveBeenCalled();
const retry = screen.getByRole('button', { name: '重新回答' });
fireEvent.click(retry);
fireEvent.click(retry);
expect(api.send).toHaveBeenCalledTimes(1);
const sent = api.send.mock.calls[0][2] as TeacherSend;
expect(sent).toEqual({ requestId: expect.any(String), text: incomplete.text, intent, references: originalReferences, sourceConversationId: 'original-source' });
expect(sent.requestId).not.toBe(incomplete.id);
expect(retry).toBeDisabled();
fireEvent.change(input, { target: { value: '等待时又补充了想法' } });
await act(async () => finish({ ...before, revision: 2, requests: [...before.requests, request({ id: sent.requestId, text: sent.text, response: '这次的完整回答。' })] }));
expect(screen.getByText('这次的完整回答。')).toBeVisible();
expect(input).toHaveValue('等待时又补充了想法');
expect(screen.getByText('草稿里的新引用')).toBeVisible();
expect(JSON.parse(localStorage.getItem('makelore-consultation-draft:signed-out:p:teacher')!)).toMatchObject({ text: '等待时又补充了想法', references: [currentQuote] });
});
it('keeps the retry id and draft after an uncertain send failure and uses the original topic source for older replies', async () => {
const incomplete = request({ text: '原来的问题', response: '', replyIncomplete: true });
const before = { ...first, sourceConversationId: 'older-source', requests: [incomplete] };
api.read.mockResolvedValue(before);
api.send.mockRejectedValueOnce(new Error('暂时没连上')).mockImplementation(async (_base, _id, sent: TeacherSend) => ({
...before, revision: 2, requests: [incomplete, request({ id: sent.requestId, text: sent.text, response: '完整回答' })],
}));
render(<TeacherChatPanel projectId="p" sourceId="new-source" />);
await ready();
fireEvent.change(screen.getByLabelText('向智能体提问'), { target: { value: '草稿不能丢' } });
fireEvent.click(screen.getByRole('button', { name: '重新回答' }));
await screen.findByRole('alert');
expect(screen.getByLabelText('向智能体提问')).toHaveValue('草稿不能丢');
fireEvent.click(screen.getByRole('button', { name: '重新回答' }));
await screen.findByText('完整回答');
expect(api.send).toHaveBeenCalledTimes(2);
expect(api.send.mock.calls[0][2]).toEqual(api.send.mock.calls[1][2]);
expect(api.send.mock.calls[1][2]).toMatchObject({ text: '原来的问题', sourceConversationId: 'older-source', references: [] });
expect(screen.getByLabelText('向智能体提问')).toHaveValue('草稿不能丢');
});
it('retries a project-only historical question without attaching another conversation or the project sentinel', async () => {
const incomplete = request({ text: '原来的问题', replyIncomplete: true });
const before = { ...first, sourceConversationId: 'project', requests: [incomplete] };
api.read.mockResolvedValue(before);
api.send.mockResolvedValue(before);
render(<TeacherChatPanel projectId="p" sourceId="different-source" />);
await ready();
fireEvent.click(screen.getByRole('button', { name: '重新回答' }));
await waitFor(() => expect(api.send).toHaveBeenCalledTimes(1));
expect(api.send.mock.calls[0][2]).not.toHaveProperty('sourceConversationId');
});
it('does not retry an incomplete reply from a disabled Agent or turn a check-in into a normal question', async () => {
const archived = { ...first, definition: { ...definition, config_id: 'unavailable-agent' }, requests: [
request({ response: '', replyIncomplete: true }),
request({ id: 'check-in', intent: 'check-in', text: '', response: '', replyIncomplete: true }),
] };
api.read.mockResolvedValue(archived);
render(<TeacherChatPanel projectId="p" sourceId="c" />);
await ready();
expect(screen.getAllByText('这次回复未能完整显示')).toHaveLength(2);
expect(screen.getAllByRole('button', { name: '重新回答' })).toHaveLength(1);
expect(screen.getByRole('button', { name: '重新回答' })).toBeDisabled();
fireEvent.click(screen.getByRole('button', { name: '重新回答' }));
expect(api.send).not.toHaveBeenCalled();
});
it('renders formulas and preserves code escapes while rejecting executable links and HTML', async () => {
api.read.mockResolvedValue({ ...first, requests: [request({
response: '$E=mc^2$\n\n```js\nconst value = "\\n";\n```\n\n[危险](javascript:alert)\n\n<script>alert(1)</script>\n\n![本地图片](file:///C:/secret.png)\n\n![坏图片](https://example.com/missing.png)',

View File

@@ -4,6 +4,7 @@ import { mkdtemp, readFile, rm, stat, writeFile } from 'node:fs/promises';
import { tmpdir } from 'node:os';
import path from 'node:path';
import { TeacherTopicStore } from '../../electron/coding-teacher/store';
import { applyTeacherReply } from '../../electron/coding-teacher/reply';
import { compileTeacherContext, teacherHistoryMessages } from '../../electron/coding-teacher/context';
import { createTeacherReadTools } from '../../electron/coding-teacher/read-tools';
import type { TeacherDefinition, TeacherRequest, TeacherSourceContext, TeacherTopic } from '../../shared/coding-teacher';
@@ -206,3 +207,162 @@ describe('passive teacher reply history compatibility', () => {
await f.unchanged();
});
});
describe('local repair of retained teacher replies', () => {
const completeReply = '它早就不是"刚搭好架子"那种阶段了——骨架、玩法、成长线都在跑。\n现在更需要打磨细节。';
const quoteRaw = '{"reply":"' + completeReply
+ '","quickReplies":["看看接下来做什么"],"tool":{"kind":"structure","nodes":[{"id":"core","label":"完整结构"}]}}';
it('repairs the screenshot-style quoted prose in a cached read without rewriting or replaying history', async () => {
const original = topic(archivedCases[4]);
original.requests[0] = request({ ...original.requests[0], response: '它早就不是',
unparsedResponse: quoteRaw, replyParseError: '旧解析错误', replyIncomplete: true,
usage: { inputTokens: 20, outputTokens: 40, cacheReadTokens: 5, cacheWriteTokens: 3 } });
const f = await fixture(original);
const loaded = await f.store.read(original.id);
const repaired = loaded.requests[0];
expect(repaired).toEqual({ ...original.requests[0], response: completeReply,
suggestedQuestions: ['看看接下来做什么'], discussionError: undefined,
replyParseError: undefined, replyIncomplete: undefined });
expect(loaded).toEqual({ ...original, requests: [repaired] });
expect(repaired.unparsedResponse).toBe(quoteRaw);
expect(repaired.status).toBe('completed');
expect(repaired.discussionContext).toEqual(original.requests[0].discussionContext);
expect(repaired.discussionSnapshot).toEqual(original.requests[0].discussionSnapshot);
expect(await f.store.read(original.id)).toBe(loaded);
expect(await new TeacherTopicStore(f.root).read(original.id)).toEqual(loaded);
await f.unchanged();
// A later ordinary save can retain the repaired projection, with the exact
// original response and all opaque data still available for diagnosis.
await f.store.save(loaded);
const persisted = JSON.parse(await readFile(f.file, 'utf8'));
expect(persisted.requests[0].unparsedResponse).toBe(quoteRaw);
expect(persisted.requests[0].response).toBe(completeReply);
expect(await new TeacherTopicStore(f.root).read(original.id)).toEqual(persisted);
});
it('keeps complete prose when auxiliary suggestions or legacy payloads remain invalid', async () => {
const original = topic();
const raw = '{"reply":"这是一段完整回答。","quickReplies":[42],"tool":';
original.requests[0] = request({ response: '这是一段完整回答。', unparsedResponse: raw,
replyParseError: '旧解析错误', replyIncomplete: true });
const f = await fixture(original);
const loaded = await f.store.read(original.id);
expect(loaded.requests[0]).toMatchObject({ status: 'completed', response: '这是一段完整回答。',
suggestedQuestions: [], unparsedResponse: raw, replyParseError: expect.any(String) });
expect(loaded.requests[0].replyIncomplete).toBeUndefined();
expect(await new TeacherTopicStore(f.root).read(original.id)).toEqual(loaded);
await f.unchanged();
});
it('repairs display after saving restart recovery without rewriting a completed reply on disk', async () => {
const original = topic();
original.requests[0] = request({ response: '它早就不是', unparsedResponse: quoteRaw });
original.requests.push(request({ id: 'running-turn', status: 'running', response: '' }));
const f = await fixture(original);
const loaded = await f.store.read(original.id);
expect(loaded.requests[0].response).toBe(completeReply);
expect(loaded.requests[1].status).toBe('interrupted');
const persisted = JSON.parse(await readFile(f.file, 'utf8'));
expect(persisted.requests[0]).toEqual(original.requests[0]);
expect(persisted.requests[1].status).toBe('interrupted');
expect(persisted.revision).toBe(original.revision + 1);
expect((await new TeacherTopicStore(f.root).read(original.id)).requests[0].response).toBe(completeReply);
});
it('keeps the question but excludes incomplete prose and suggestions from model context and read tools', async () => {
const original = topic();
original.requests[0] = request({ response: '它早就不是',
unparsedResponse: '{"reply":"它早就不是"刚搭好架子', suggestedQuestions: ['尚未确认的建议'] });
const f = await fixture(original);
const loaded = await f.store.read(original.id);
expect(loaded.requests[0].replyIncomplete).toBe(true);
expect(teacherHistoryMessages(loaded.requests)).toEqual([
{ id: 'teacher:completed-turn:user', role: 'user', text: original.requests[0].text },
]);
const context = JSON.stringify(compileTeacherContext(definition, source, loaded.requests, '重新看看', []).messages);
expect(context).toContain(original.requests[0].text);
expect(context).not.toMatch(/它早就不是|尚未确认的建议/);
const tools = createTeacherReadTools({ projectPath: f.root, source, history: loaded.requests, assertCurrent: vi.fn() });
const signal = new AbortController().signal;
const index = await tools.execute('read_conversation', '{}', signal);
expect(index).toContain('teacher:completed-turn:user');
expect(index).not.toContain('teacher:completed-turn:assistant');
const assistant = await tools.executeResult('read_conversation', JSON.stringify({ message_id: 'teacher:completed-turn:assistant' }), signal);
expect(assistant.status).toBe('error');
expect(assistant.content).not.toContain('它早就不是');
await f.unchanged();
});
it('marks truly truncated prose incomplete without replacing the saved text or raw evidence', async () => {
const original = topic();
original.requests[0] = request({ response: '它早就不是',
unparsedResponse: '{"reply":"它早就不是"刚搭好架子', replyParseError: '旧解析错误' });
const f = await fixture(original);
const loaded = await f.store.read(original.id);
expect(loaded.requests[0]).toEqual({ ...original.requests[0], replyIncomplete: true });
expect(await new TeacherTopicStore(f.root).read(original.id)).toEqual(loaded);
await f.unchanged();
});
it.each(['failed', 'cancelled', 'interrupted'] as const)('does not salvage a %s request as success', async status => {
const original = topic();
original.requests[0] = request({ status, response: '它早就不是', unparsedResponse: quoteRaw,
error: '该请求未完成', replyParseError: '旧解析错误' });
const f = await fixture(original);
expect(await f.store.read(original.id)).toEqual(original);
await f.unchanged();
});
it.each(['preparing', 'running'] as const)('keeps restart recovery for %s without accepting its received bytes', async status => {
const original = topic();
original.requests[0] = request({ status, response: '它早就不是', unparsedResponse: quoteRaw,
replyParseError: '旧解析错误' });
const f = await fixture(original);
const loaded = await f.store.read(original.id);
expect(loaded.requests[0]).toEqual({ ...original.requests[0], status: 'interrupted',
error: '应用已重启,本次回复中断。' });
expect(loaded.revision).toBe(original.revision + 1);
expect(await new TeacherTopicStore(f.root).read(original.id)).toMatchObject({ requests: loaded.requests });
});
it('does not replace useful prose with different content from a stale raw archive', async () => {
const original = topic();
original.requests[0] = request({ response: '已经保存的完整回答。', unparsedResponse: quoteRaw });
const f = await fixture(original);
expect(await f.store.read(original.id)).toEqual(original);
await f.unchanged();
});
it('also repairs the legacy intro/questions envelope while leaving its tool snapshot opaque', async () => {
const original = topic();
const raw = '{"intro":"它早就不是"刚搭好架子"了。","questions":["继续"],"tool":{"kind":"ideas"}}';
original.requests[0] = request({ response: '它早就不是', unparsedResponse: raw });
const f = await fixture(original);
const loaded = await f.store.read(original.id);
expect(loaded.requests[0]).toMatchObject({ response: '它早就不是"刚搭好架子"了。',
suggestedQuestions: ['继续'], unparsedResponse: raw });
expect(loaded.requests[0].discussionError).toBeUndefined();
expect(loaded.requests[0].discussionSnapshot).toEqual(original.requests[0].discussionSnapshot);
await f.unchanged();
});
it('propagates incomplete results and retains diagnostics for recovered new replies', () => {
const current = request({ replyIncomplete: true, replyParseError: '旧解析错误' });
applyTeacherReply(current, '{"reply":"还没有说完');
expect(current.replyIncomplete).toBe(true);
expect(current.replyParseError).toBeTruthy();
expect(current.unparsedResponse).toBe('{"reply":"还没有说完');
applyTeacherReply(current, quoteRaw);
expect(current.response).toBe(completeReply);
expect(current.replyIncomplete).toBeUndefined();
expect(current.replyParseError).toBeUndefined();
expect(current.discussionError).toBeUndefined();
expect(current.unparsedResponse).toBe(quoteRaw);
const recovered = structuredClone(current);
applyTeacherReply(current, quoteRaw);
expect(current).toEqual(recovered);
});
});

View File

@@ -122,11 +122,61 @@ describe('teacher text and suggestions transport', () => {
it('marks multiple envelopes or duplicate fields as ambiguous without showing legacy JSON', () => {
const parsed = parseTeacherReply(JSON.stringify(envelope) + '\n{"reply":"第二份","tool":{"kind":"ideas"}}');
expect(parsed).toMatchObject({ ...envelope, parseError: expect.any(String) });
expect(parsed).toMatchObject({ incomplete: true, quickReplies: [], parseError: expect.any(String) });
expect(parsed.reply).not.toContain('tool');
expect(parseTeacherReply('{"reply":"第一份","reply":"第二份"}').parseError).toBeTruthy();
});
it('recovers the complete screenshot reply around internal unescaped quotes', () => {
const reply = '它早就不是"刚搭好架子"那种阶段了——骨架、玩法、成长线都在跑。\n现在的阶段是「能玩,正在调手感」。';
const raw = '{"reply":"' + reply + '","quickReplies":[],"tool":{"kind":"structure","nodes":[{"id":"core","label":"旧结构"}]}}';
expect(parseTeacherReply(raw)).toEqual({ reply, quickReplies: [], recovered: true });
});
it.each([
'他说"再看一下",然后按 "继续"。',
'第一行\n第二行\r\n制表符\t与 "引号" 一起保留。',
'示例代码:\n```js\nconst text = "hello";\nif (ready) { show(text); }\n```\n然后继续说明。',
])('repairs only prose escaping without rewriting its content: %s', reply => {
expect(parseTeacherReply('{"reply":"' + reply + '","quickReplies":["继续"]}'))
.toEqual({ reply, quickReplies: ['继续'], recovered: true });
});
it('leaves correctly encoded quotes, backslashes, code and Unicode untouched', () => {
const reply = '它早就不是"刚搭好架子"了。\\路径\\\n```json\n{"reply":"代码例子"}\n```\n🍎 继续。';
expect(parseTeacherReply(JSON.stringify({ reply, quickReplies: [] })))
.toEqual({ reply, quickReplies: [] });
});
it('does not label a quoted prefix or a genuinely interrupted string as complete', () => {
for (const raw of [
'{"reply":"它早就不是"刚搭好架子',
'{"reply":"它早就不是"刚搭好架子"那种阶段了',
'{"reply":"它早就不是"',
'{"reply":"半句", ordinary words are still part of broken prose',
'{"reply":"引号 \\q 无效","quickReplies":[]}',
]) {
expect(parseTeacherReply(raw)).toMatchObject({ incomplete: true, quickReplies: [], parseError: expect.any(String) });
expect(parseTeacherReply(raw).reply).not.toMatch(/它早就不是|半句|ordinary words|无效/);
}
});
it('keeps complete prose when suggestions fail without swallowing their bytes', () => {
for (const tail of ['["断在按钮里', 'null}', '[13]}', '["坏" }']) {
const parsed = parseTeacherReply('{"reply":"完整回答,包含 \\"正确引号\\"。","quickReplies":' + tail);
expect(parsed).toMatchObject({ reply: '完整回答,包含 "正确引号"。', quickReplies: [], parseError: expect.any(String) });
expect(parsed.incomplete).toBeUndefined();
expect(parsed.reply).not.toContain('quickReplies');
}
});
it('refuses to guess across ambiguous prose/auxiliary boundaries or duplicate bodies', () => {
const raw = '{"reply":"代码里有 "text", "tool": {"reply":"不能冒充正文"} 后面还有正文。","quickReplies":[]}';
expect(parseTeacherReply(raw)).toMatchObject({ incomplete: true });
expect(parseTeacherReply('{"reply":"第一句","reply":"第二句"}')).toMatchObject({ incomplete: true });
expect(parseTeacherReply(raw).reply).not.toContain('不能冒充正文');
});
it.each([
'{"reply":"正文保留。"},"tool":{"kind":"ideas","items":[]}',
'{"reply":"正文保留。"}}',