Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(agent-island): 保留组件示例并提交独立换行摘要
Dash43fe8a7a3ca0
diff --git a/apps/desktop/src/main/agent-island/__tests__/activityTextStream.test.ts b/apps/desktop/src/main/agent-island/__tests__/activityTextStream.test.tsindex 598eb503d0..d9577b33d9 100644--- a/apps/desktop/src/main/agent-island/__tests__/activityTextStream.test.ts+++ b/apps/desktop/src/main/agent-island/__tests__/activityTextStream.test.ts@@ -154,6 +154,21 @@ describe('Agent Island activity text stream', () => {.toBe(example + ' 继续说明');});+ // #7566 review, unit: extracted code/Markdown is display content, not a+ // second protocol document. Existing quoted-fence cases had no outer rich node.+ it.each(['code', 'markdown'] as const)('does not execute a rich %s example during projection', kind => {+ const example = JSON.stringify({ version: 1, seq: 1, op: 'create', id: 'inner',+ kind: 'text', props: { text: '不应执行' } });+ const source = '```cindy-ui\n' + JSON.stringify({ version: 1, seq: 1, op: 'create', id: 'example', kind,+ props: { language: 'cindy-ui', text: kind === 'code' ? example : '```cindy-ui\n' + example + '\n```' } }) + '\n```';+ for (const input of [source, JSON.stringify({ content: source })]) {+ expect(normalizeActivityText(input)).toBe(example);+ expect(normalizeRemoteActivityText(input)).toBe(example);+ const stream = createActivityTextStreamState();+ expect(appendActivityTextStream(stream, input)).toBe(example);+ }+ });+// Deterministic work assertion plus visible result; no wall-clock timing.it.each(['', '{"content":"'])('does not parse an unchanged formatted streaming prefix again (%s)', prefix => {const parse = vi.spyOn(previewText, 'streamingMarkdownPreviewText');diff --git a/apps/desktop/src/main/agent-island/__tests__/state.test.ts b/apps/desktop/src/main/agent-island/__tests__/state.test.tsindex a39746c7fc..ebb5dff0c9 100644--- a/apps/desktop/src/main/agent-island/__tests__/state.test.ts+++ b/apps/desktop/src/main/agent-island/__tests__/state.test.ts@@ -1156,6 +1156,35 @@ describe('Agent Island display state', () => {expect(completed?.activityLines.at(-1)?.text).toBe('文档 测试已通过');});+ // #7566 review, unit: whitespace-only deltas commit rich lines without a+ // final-text repair. Exercise create, patch, closing fence and both terminals.+ it.each([+ { newline: '\n', terminal: 'done' },+ { newline: '\r\n', terminal: 'status' },+ ])('commits rich lines across standalone newlines (%j)', ({ newline, terminal }) => {+ const state = createAgentIslandState();+ const meta = { sessionId: 'rich-lines' };+ applyAgentIslandEvent(state, meta, statusEvent(true, 'Generating...'), 1_000);+ const create = JSON.stringify({ version: 1, seq: 1, op: 'create', id: 'a', kind: 'text', props: { text: '初步结果' } });+ const patch = JSON.stringify({ seq: 2, op: 'patch', id: 'a', props: { text: '检查完成' } });+ const send = (delta: string) => applyAgentIslandEvent(state, meta, textDeltaEvent(delta), 1_100);+ send('```cindy-ui' + newline + create.slice(0, 40));+ send(create.slice(40));+ send(newline);+ expect(buildAgentIslandDisplayState(state, 1_200).sessions[0]?.activityLines.at(-1)?.text).toBe('初步结果');+ send(patch.slice(0, 20));+ send(patch.slice(20));+ expect(buildAgentIslandDisplayState(state, 1_200).sessions[0]?.activityLines.at(-1)?.text).toBe('初步结果');+ send(newline);+ expect(buildAgentIslandDisplayState(state, 1_200).sessions[0]?.messagePreview?.text).toBe('检查完成');+ send('```');+ send(newline + '后续说明');+ applyAgentIslandEvent(state, meta, terminal === 'done' ? doneEvent() : statusEvent(false, 'Done'), 1_300);+ const completed = buildAgentIslandDisplayState(state, 1_400).sessions[0];+ expect(completed).toMatchObject({ phase: 'completed', compactDetail: '检查完成 后续说明' });+ expect(completed?.activityLines.at(-1)?.text).toBe('检查完成 后续说明');+ });+// Review regression: a removed/emptied rich node must retract this message's// streamed line from both the activity log and active/queued preview (unit tier).it.each([diff --git a/apps/desktop/src/main/agent-island/activityTextStream.ts b/apps/desktop/src/main/agent-island/activityTextStream.tsindex 0d6b210cdf..50d4a9331a 100644--- a/apps/desktop/src/main/agent-island/activityTextStream.ts+++ b/apps/desktop/src/main/agent-island/activityTextStream.ts@@ -1,5 +1,5 @@import { richAnswerText, splitRichAnswer } from '@cindy/maker-shared/rich-answer';-import { markdownPreviewText, streamingMarkdownPreviewText } from '../../shared/markdownPreviewText.js';+import { markdownTextPreview, streamingMarkdownPreviewText } from '../../shared/markdownPreviewText.js';export const AGENT_ISLAND_ACTIVITY_TEXT_MAX_LENGTH = 280;// Match the rich-answer parser's source ceiling, separately from visible text.@@ -61,10 +61,12 @@ export function appendActivityTextStream(metrics?: ActivityTextStreamMetrics,): string {const previousPreview = state.rawPreview;+ const previousNewline = state.rawPreviewHasPendingNewline;appendRawPreview(state, chunk, metrics);const destinationOnly = state.rawPreviewPendingLink && !/[\s\\()[\]<>`"']/.test(chunk);- const uncommittedRich = state.rawPreviewPendingRich && !/[\r\n]/.test(chunk);- const previewChanged = state.rawPreview !== previousPreview && !destinationOnly && !uncommittedRich;+ const richLineBoundary = state.rawPreviewPendingRich && /[\r\n]/.test(chunk);+ const uncommittedRich = state.rawPreviewPendingRich && !richLineBoundary && !previousNewline;+ const previewChanged = (state.rawPreview !== previousPreview || richLineBoundary) && !destinationOnly && !uncommittedRich;if (state.mode === 'plain') {return rawPreviewText(state, previewChanged);@@ -273,7 +275,9 @@ function rawPreviewText(state: ActivityTextStreamState, changed = true): stringif (!changed) return state.displayText;// A fence header may itself arrive in several deltas. Do not leave that// temporary header as the last visible activity when the rich block is empty.- let source = state.rawPreview;+ // A standalone newline commits an operation even before another non-space+ // character flushes the accumulator's pending whitespace.+ let source = state.rawPreview + (state.rawPreviewHasPendingNewline ? '\n' : '');const tail = source.match(/(^|\n)(`+|~+)([^\n]*)$/);if (tail && 'cindy-ui'.startsWith(tail[3].trim())) {const start = tail.index! + tail[1].length;@@ -302,7 +306,7 @@ function rawPreviewText(state: ActivityTextStreamState, changed = true): stringfunction normalizePlainActivityText(text: string): string {// Keep the hot path for plain bounded streaming prefixes cheap; formatted// answers use the same projection as notifications and the session list.- const plain = /[*_`~<>!#|&\n\r]|\](?:\(|\[)|^\s*(?:[-+] |\d+[.)] )/.test(text) ? markdownPreviewText(text) : text;+ const plain = /[*_`~<>!#|&\n\r]|\](?:\(|\[)|^\s*(?:[-+] |\d+[.)] )/.test(text) ? markdownTextPreview(text) : text;return boundActivityText(plain);}diff --git a/apps/desktop/src/shared/markdownPreviewText.ts b/apps/desktop/src/shared/markdownPreviewText.tsindex 719c645104..7ea9c2e10b 100644--- a/apps/desktop/src/shared/markdownPreviewText.ts+++ b/apps/desktop/src/shared/markdownPreviewText.ts@@ -12,11 +12,19 @@ const previewParser = unified().use(remarkParse).use(remarkGfm);export function markdownPreviewText(markdown: string,options: { includeImageAlt?: boolean; imageFallback?: string } = {},+): string {+ return markdownTextPreview(richAnswerText(markdown), options);+}++/** Project already-extracted Markdown; fenced examples are literal code. */+export function markdownTextPreview(+ markdown: string,+ options: { includeImageAlt?: boolean; imageFallback?: string } = {},): string {return projectMarkdownPreview(markdown, options).text;}-/** Streaming only: let the Markdown parser recognize an unfinished destination.+/** Streaming already-extracted Markdown: recognize an unfinished destination.* Synthetic closers never enter the source or final projection, and code nodes* remain code. The flag lets a stream skip parsing ordinary URL characters. */export function streamingMarkdownPreviewText(markdown: string): { text: string; pendingLink: boolean } {@@ -30,7 +38,7 @@ function projectMarkdownPreview(): { text: string; pendingLink: boolean } {// Marked's link regex can backtrack for minutes on short bracketed code spans.// These previews run on Main after DB replies, so use the existing remark parser.- const source = richAnswerText(markdown);+ const source = markdown;let root = previewParser.parse(source);let pendingLink = false;if (streaming && source.includes('](')) {