Skip to content

armgit / cindy

Public Imported from GitHub
0

Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。

fix(chat): keep earlier sealed deliveries whole and every seal's action bar

Dash61e907082ede
diff --git a/apps/desktop/src/renderer/__tests__/buildRenderItemsKeyStability.test.ts b/apps/desktop/src/renderer/__tests__/buildRenderItemsKeyStability.test.ts
index beb1d6bff8..cf56345841 100644
--- a/apps/desktop/src/renderer/__tests__/buildRenderItemsKeyStability.test.ts
+++ b/apps/desktop/src/renderer/__tests__/buildRenderItemsKeyStability.test.ts
@@ -459,7 +459,7 @@ describe('collectTurnFinalAssistantClientIds', () => {
expect(finals.has('a2-draft')).toBe(false);
});
- it('marks only the last sealed SDK turn when background work auto-continues without a user boundary', () => {
+ it('marks every sealed SDK turn when background work auto-continues without a user boundary', () => {
const messages = [
mkUser('u1'),
{ ...mkAssistant('main-summary'), turnCompleted: true },
@@ -467,21 +467,9 @@ describe('collectTurnFinalAssistantClientIds', () => {
{ ...mkAssistant('gate-followup'), turnCompleted: true },
];
- expect(collectTurnFinalAssistantClientIds(messages)).toEqual(new Set(['gate-followup']));
- });
-
- it('keeps an earlier sealed delivery-prose summary as a turn final', () => {
- const report = '## 结论\n\n- 第一条\n- 第二条\n- 第三条';
- const messages = [
- mkUser('u1'),
- { ...mkAssistant('main-summary', report), turnCompleted: true },
- mkTool('gate', 'Bash'),
- { ...mkAssistant('gate-followup'), turnCompleted: true },
- ];
-
- expect(collectTurnFinalAssistantClientIds(messages)).toEqual(
- new Set(['main-summary', 'gate-followup']),
- );
+ const finals = collectTurnFinalAssistantClientIds(messages);
+ expect([...finals]).toEqual(expect.arrayContaining(['main-summary', 'gate-followup']));
+ expect(finals.size).toBe(2);
});
it('does not add an unsealed progress message once the user turn contains sealed answers', () => {
@@ -492,7 +480,9 @@ describe('collectTurnFinalAssistantClientIds', () => {
{ ...mkAssistant('gate-followup'), turnCompleted: true },
];
- expect(collectTurnFinalAssistantClientIds(messages)).toEqual(new Set(['gate-followup']));
+ const finals = collectTurnFinalAssistantClientIds(messages);
+ expect([...finals]).toEqual(expect.arrayContaining(['main-summary', 'gate-followup']));
+ expect(finals.has('unsealed-progress')).toBe(false);
});
it('does not treat steer messages as turn boundaries', () => {
diff --git a/apps/desktop/src/renderer/__tests__/workGroupDeliveryProse.test.ts b/apps/desktop/src/renderer/__tests__/workGroupDeliveryProse.test.ts
index 7b828aea4b..4226e4acfd 100644
--- a/apps/desktop/src/renderer/__tests__/workGroupDeliveryProse.test.ts
+++ b/apps/desktop/src/renderer/__tests__/workGroupDeliveryProse.test.ts
@@ -143,6 +143,26 @@ describe('交付正文不被收尾动作顶进「已工作 Xs」', () => {
expect(topLevelMessageIds(items)).toEqual(['u1', 'brief', 'wrap']);
});
+
+ it('内嵌 markdown 图片的短正文平铺', () => {
+ const pictured = '图表如下 ![chart](https://example.com/chart.png)';
+
+ const items = groupWorkRuns(buildRenderItems(briefThenNotifyTurn(pictured)).items, false);
+
+ expect(topLevelMessageIds(items)).toEqual(['u1', 'brief', 'wrap']);
+ });
+
+ it('带图片 / 文件附件的短正文平铺', () => {
+ const messages = briefThenNotifyTurn('报告在附件里。').map((message) =>
+ message.clientId === 'brief'
+ ? { ...message, files: [{ name: 'report.pdf', path: '/tmp/report.pdf' }] }
+ : message,
+ );
+
+ const items = groupWorkRuns(buildRenderItems(messages).items, false);
+
+ expect(topLevelMessageIds(items)).toEqual(['u1', 'brief', 'wrap']);
+ });
});
// ── 不回归:短进度旁白照旧折叠 ────────────────────────────────────────────────
@@ -158,6 +178,15 @@ describe('进度旁白仍然折进「已工作 Xs」', () => {
expect(isFoldedIntoWorkGroup(items, 'brief')).toBe(true);
});
+ it('普通 markdown 链接不算图片,仍折叠', () => {
+ const items = groupWorkRuns(
+ buildRenderItems(briefThenNotifyTurn('先看 [PR](https://github.com/x/y/pull/1) 的 diff。')).items,
+ false,
+ );
+
+ expect(topLevelMessageIds(items)).toEqual(['u1', 'wrap']);
+ });
+
it('只有 2 项列表的旁白不算交付,仍折叠', () => {
const items = groupWorkRuns(
buildRenderItems(briefThenNotifyTurn('接下来两件事:\n- 读 diff\n- 写简报')).items,
diff --git a/apps/desktop/src/renderer/__tests__/workGroupProjectionParity.test.ts b/apps/desktop/src/renderer/__tests__/workGroupProjectionParity.test.ts
index 7e24b9fee7..f24837ebd6 100644
--- a/apps/desktop/src/renderer/__tests__/workGroupProjectionParity.test.ts
+++ b/apps/desktop/src/renderer/__tests__/workGroupProjectionParity.test.ts
@@ -222,6 +222,25 @@ const cases: Array<{ name: string; events: Event[]; streaming?: boolean; expecte
['final'],
],
},
+ {
+ name: 'an earlier seal keeps its intro together with the delivery report',
+ events: [
+ user(),
+ tool('read', 1, 2),
+ answer('intro', 3),
+ answer('report', 4, true, '# Report\nThe result'),
+ thinking('next', 5),
+ answer('final', 6, true),
+ ],
+ expected: [
+ ['u'],
+ ['work-read', [['read']]],
+ ['intro'],
+ ['report'],
+ ['work-next', [['next']]],
+ ['final'],
+ ],
+ },
{
name: 'an earlier delivery-prose seal stays visible through continuation',
events: [
diff --git a/apps/desktop/src/renderer/__tests__/workGroupRunningSubagent.test.ts b/apps/desktop/src/renderer/__tests__/workGroupRunningSubagent.test.ts
index 64cf79cdd5..73ff9988da 100644
--- a/apps/desktop/src/renderer/__tests__/workGroupRunningSubagent.test.ts
+++ b/apps/desktop/src/renderer/__tests__/workGroupRunningSubagent.test.ts
@@ -20,11 +20,7 @@
*/
import { describe, it, expect } from 'vitest';
-import {
- buildRenderItems,
- collectTurnFinalAssistantClientIds,
- groupWorkRuns,
-} from '../components/chat/MessageStream';
+import { buildRenderItems, groupWorkRuns } from '../components/chat/MessageStream';
import type { AgentTaskUpdate, ChatMessage } from '@/lib/makerChatStore';
// ── 工厂 ───────────────────────────────────────────────────────────────────
@@ -229,10 +225,9 @@ describe('后台任务自动续跑 — 只有最后一次 seal 是收尾正文',
expect(topLevelMessages).toEqual(['u1', 'final']);
expect(workGroups(items)).toHaveLength(1);
- expect(collectTurnFinalAssistantClientIds(messages)).toEqual(new Set(['final']));
});
- it('更早的交付正文 seal 仍留在组外并保留操作行', () => {
+ it('更早的交付正文 seal 仍留在组外', () => {
const messages: ChatMessage[] = [
mkUser('u1'),
mkTool('work', 'Bash'),
@@ -250,7 +245,48 @@ describe('后台任务自动续跑 — 只有最后一次 seal 是收尾正文',
.map((item) => item.message.clientId);
expect(topLevelMessages).toEqual(['u1', 'early-report', 'final']);
- expect(collectTurnFinalAssistantClientIds(messages)).toEqual(new Set(['early-report', 'final']));
+ });
+
+ it('更早 seal 的引言与交付正文作为一段整体留在组外,不被拆开', () => {
+ const messages: ChatMessage[] = [
+ mkUser('u1'),
+ mkTool('work', 'Bash'),
+ mkResult('work-result', 'tu-work'),
+ mkAssistant('intro', '先给结论。'),
+ mkAssistant('report', formalSummary, true),
+ mkTool('check', 'Bash'),
+ mkResult('check-result', 'tu-check'),
+ mkAssistant('final', '后台核对也通过了。', true),
+ ];
+
+ const items = groupWorkRuns(buildRenderItems(messages).items, false);
+ const topLevelMessages = items
+ .filter((item) => item.type === 'message')
+ .map((item) => item.message.clientId);
+
+ expect(topLevelMessages).toEqual(['u1', 'intro', 'report', 'final']);
+ });
+
+ it('更早 seal 只带图片 / 文件附件和一句短说明时仍留在组外', () => {
+ const messages: ChatMessage[] = [
+ mkUser('u1'),
+ mkTool('render', 'Bash'),
+ mkResult('render-result', 'tu-render'),
+ {
+ ...mkAssistant('chart', '图表在这里。', true),
+ images: [{ url: '/chart.png', mimeType: 'image/png', originalName: 'chart.png' }],
+ },
+ mkTool('check', 'Bash'),
+ mkResult('check-result', 'tu-check'),
+ mkAssistant('final', '后台核对也通过了。', true),
+ ];
+
+ const items = groupWorkRuns(buildRenderItems(messages).items, false);
+ const topLevelMessages = items
+ .filter((item) => item.type === 'message')
+ .map((item) => item.message.clientId);
+
+ expect(topLevelMessages).toEqual(['u1', 'chart', 'final']);
});
it('同一 sealed SDK turn 的连续多段正式正文都留在组外', () => {
diff --git a/apps/desktop/src/renderer/components/chat/MessageStream.tsx b/apps/desktop/src/renderer/components/chat/MessageStream.tsx
index 123430296a..b06a8d7ad3 100644
--- a/apps/desktop/src/renderer/components/chat/MessageStream.tsx
+++ b/apps/desktop/src/renderer/components/chat/MessageStream.tsx
@@ -68,7 +68,6 @@ import {
findMessageTodoInsertions,
getLatestMessageTodoState,
isAgentPlanToolName,
- isDeliveryProseText,
isPlanUserBoundary,
isSubagentParentToolUseId,
} from '@cindy/maker-shared/message-render';
@@ -910,9 +909,7 @@ export function collectTurnFinalAssistantClientIds(messages: readonly ChatMessag
continue;
}
if (isCompletedAssistantMessage(message)) {
- // 后台唤醒会让同一 user turn 盖多次 seal:只有最后一次是收尾正文,更早的
- // 只在作为交付正文留在折叠组外时保留操作行(与 groupWorkRuns 同口径)。
- if (!sealedAnswerFound || isDeliveryProseText(message.content)) out.add(message.clientId);
+ out.add(message.clientId);
sealedAnswerFound = true;
pendingLegacyFallback = null;
continue;
diff --git a/apps/desktop/src/renderer/components/chat/messageWorkGroups.ts b/apps/desktop/src/renderer/components/chat/messageWorkGroups.ts
index 14f4a8404c..d468b3b368 100644
--- a/apps/desktop/src/renderer/components/chat/messageWorkGroups.ts
+++ b/apps/desktop/src/renderer/components/chat/messageWorkGroups.ts
@@ -231,15 +231,16 @@ function isWorkActivityItem(it: RenderItem): it is WorkChildItem {
* 元数据留在消息流里(实例:2026-07-31 定时巡检的产品决策简报 3250 字被折,
* 外面只剩 110 字的「已触发通知」)。
*
- * 判据(长度 / 块级 markdown 结构)由 maker-shared 的 isDeliveryProseText 单一
- * 提供,两端不各写一份。
+ * 正文判据(长度 / 块级 markdown 结构 / 内嵌图片)由 maker-shared 的 isDeliveryProseText
+ * 单一提供,两端不各写一份;桌面消息另带 images / files 附件,附件本身就是交付成果。
*/
function isDeliveryProseItem(it: RenderItem): boolean {
return (
it.type === 'message' &&
it.message.role === 'assistant' &&
!it.message.systemCardType &&
- isDeliveryProseText(it.message.content)
+ (Boolean(it.message.images?.length || it.message.files?.length) ||
+ isDeliveryProseText(it.message.content))
);
}
diff --git a/apps/mobile/src/__tests__/messageRenderModel.test.ts b/apps/mobile/src/__tests__/messageRenderModel.test.ts
index d7c89040c5..dadf9e7de9 100644
--- a/apps/mobile/src/__tests__/messageRenderModel.test.ts
+++ b/apps/mobile/src/__tests__/messageRenderModel.test.ts
@@ -559,10 +559,23 @@ describe('messageRenderModel', () => {
it('folds an earlier short sealed reply when a background task auto-continues the user request', () => {
const items = backgroundContinuation('还有一个后台任务在跑。');
- expect(turnFinalKeys(items)).toEqual(['gate-followup']);
+ // 折进「已工作」后仍是一次 SDK turn 的收尾正文,展开可见其操作行。
+ expect(turnFinalKeys(items)).toEqual(['main-summary', 'gate-followup']);
expect(items.map((item) => item.type)).toEqual(['message', 'work_group', 'message']);
});
+ it('keeps an earlier sealed reply with a markdown image visible across a background auto-continuation', () => {
+ const items = backgroundContinuation('图表如下 ![chart](https://example.com/chart.png)');
+
+ expect(items.map((item) => item.type)).toEqual([
+ 'message',
+ 'work_group',
+ 'message',
+ 'work_group',
+ 'message',
+ ]);
+ });
+
it('keeps an earlier sealed delivery-prose summary visible across a background auto-continuation', () => {
const items = backgroundContinuation('## 正式总结\n\n- 第一条\n- 第二条\n- 第三条');
diff --git a/apps/mobile/src/session/messageNormalize.ts b/apps/mobile/src/session/messageNormalize.ts
index 51418e8b7e..a0deba83eb 100644
--- a/apps/mobile/src/session/messageNormalize.ts
+++ b/apps/mobile/src/session/messageNormalize.ts
@@ -105,7 +105,7 @@ export interface NormalizedRemoteMessage {
*/
settledAt?: string;
isStreaming?: boolean;
- /** Host 在 SDK done 边界写入;后台自动续跑时每个 sealed assistant 都是正式回复。 */
+ /** Host 在 SDK done 边界写入;后台自动续跑时同一 turn 可有多次 seal,最后一次是最终答复。 */
turnCompleted?: boolean;
turnMoney?: RemoteMoney;
/** 旧 Desktop 消息兼容字段。 */
diff --git a/apps/mobile/src/session/messageRenderModel.ts b/apps/mobile/src/session/messageRenderModel.ts
index dc2829e91f..88ef759f7d 100644
--- a/apps/mobile/src/session/messageRenderModel.ts
+++ b/apps/mobile/src/session/messageRenderModel.ts
@@ -3,7 +3,6 @@ import {
buildMessageRenderItems,
extractTodosFromSourceMessage,
formatDuration,
- isDeliveryProseText,
type MessageRenderAgentTaskItem,
type MessageRenderItem,
type MessageRenderOptions,
@@ -166,12 +165,12 @@ export function markTurnFinalAssistants(
): void {
const suppressTailFinalAssistant = isSessionStreaming && hasActiveLoadedTail(normalized);
let lastCandidate: NormalizedRemoteMessage | null = null;
- let lastSealed: NormalizedRemoteMessage | null = null;
+ let sealedAnswerFound = false;
for (const message of normalized) {
if (message.kind === 'user' && message.label === 'user' && !isSubagentChildMessage(message)) {
- if (!lastSealed && lastCandidate) lastCandidate.isTurnFinalAssistant = true;
+ if (!sealedAnswerFound && lastCandidate) lastCandidate.isTurnFinalAssistant = true;
lastCandidate = null;
- lastSealed = null;
+ sealedAnswerFound = false;
continue;
}
if (
@@ -181,17 +180,12 @@ export function markTurnFinalAssistants(
) {
lastCandidate = message;
if (message.turnCompleted === true) {
- // 后台唤醒会让同一 turn 盖多次 seal:只有最后一次是收尾正文,更早的只在
- // 作为交付正文留在折叠组外时保留操作行(与 groupWorkRuns 同口径)。
- if (lastSealed && !isDeliveryProseText(lastSealed.body)) {
- delete lastSealed.isTurnFinalAssistant;
- }
message.isTurnFinalAssistant = true;
- lastSealed = message;
+ sealedAnswerFound = true;
}
}
}
- if (!lastSealed && lastCandidate && !suppressTailFinalAssistant) {
+ if (!sealedAnswerFound && lastCandidate && !suppressTailFinalAssistant) {
lastCandidate.isTurnFinalAssistant = true;
}
}
diff --git a/packages/maker-shared/src/messageRender.ts b/packages/maker-shared/src/messageRender.ts
index 68d39af699..6bbf45a8e7 100644
--- a/packages/maker-shared/src/messageRender.ts
+++ b/packages/maker-shared/src/messageRender.ts
@@ -102,7 +102,7 @@ export interface MessageRenderNormalizedMessage<
settledAt?: string;
/** Durable terminal lifecycle for an Agent/Task tool call. */
agentTaskStatus?: AgentTaskTerminalStatus;
- /** Host 在 SDK done 边界写入;每个 true 都是一条不应折入工作过程的正式回复。 */
+ /** Host 在 SDK done 边界写入。同一 user turn 的最后一次 seal 是最终答复;更早的 seal 只在带交付内容时留在工作过程外。 */
turnCompleted?: boolean;
/** tool 消息专用:配对 tool_result 提取出的产出媒体(驱动 tool_media 独立渲染项)。 */
media?: readonly MessageRenderToolMediaLike[];
@@ -1611,11 +1611,14 @@ const MARKDOWN_LIST_ITEM_RE = /^[ \t]{0,3}(?:[-*+][ \t]+|\d{1,3}[.)][ \t]+)\S/gm
/** 列表要 ≥3 项才算交付结构:「我要做两件事」这类旁白也会顺手列两条。 */
const DELIVERY_PROSE_MIN_LIST_ITEMS = 3;
+/** 正文里的 markdown 图片:配一句短说明发出的图也是交付成果。 */
+const MARKDOWN_IMAGE_RE = /!\[[^\]\n]*\]\([^)\s]+(?:\s[^)]*)?\)/;
+
/**
* 这段 assistant 正文是不是「交付内容」(而非进度旁白)。
*
* 判据刻意与位置无关:长度达阈值,或带块级 markdown 结构(标题 / 表格 /
- * ≥3 项列表)。两端共用这一份口径,不各自实现。
+ * ≥3 项列表),或内嵌 markdown 图片。两端共用这一份口径,不各自实现。
*/
export function isDeliveryProseText(text: string): boolean {
const trimmed = text.trim();
@@ -1623,6 +1626,7 @@ export function isDeliveryProseText(text: string): boolean {
if (trimmed.length >= DELIVERY_PROSE_MIN_LENGTH) return true;
if (MARKDOWN_HEADING_RE.test(trimmed)) return true;
if (MARKDOWN_TABLE_DIVIDER_RE.test(trimmed)) return true;
+ if (MARKDOWN_IMAGE_RE.test(trimmed)) return true;
// /g 正则不用 test():lastIndex 会在调用之间残留。
const listItems = trimmed.match(MARKDOWN_LIST_ITEM_RE);
return (listItems?.length ?? 0) >= DELIVERY_PROSE_MIN_LIST_ITEMS;
diff --git a/packages/maker-shared/src/workRunGrouping.ts b/packages/maker-shared/src/workRunGrouping.ts
index 86e0ad950a..ad22d0a631 100644
--- a/packages/maker-shared/src/workRunGrouping.ts
+++ b/packages/maker-shared/src/workRunGrouping.ts
@@ -166,36 +166,48 @@ function groupAnsweredTurn<TItem, TChild extends TItem>(
adapter: WorkRunGroupingAdapter<TItem, TChild>,
): TItem[] | null {
const answers = new Set<number>();
+ const sealed: number[] = [];
let lastAnswer = -1;
- let lastSealed = -1;
for (let index = 0; index < items.length; index++) {
if (!adapter.isAnswer(items[index])) continue;
lastAnswer = index;
- if (adapter.isSealedAnswer(items[index])) lastSealed = index;
+ if (adapter.isSealedAnswer(items[index])) sealed.push(index);
}
if (lastAnswer < 0) return null;
- if (lastSealed >= 0) {
+ if (sealed.length > 0) {
// Background wake-ups (async agents, background shells) seal several SDK turns under
- // one user row; only the last seal is the turn's answer. Earlier seals fold like any
- // progress text unless isArchivable keeps them visible as delivery prose.
- const sealedIndex = lastSealed;
- let lastActivity = -1;
- for (let index = sealedIndex - 1; index >= 0; index--) {
- if (adapter.isActivity(items[index])) {
- lastActivity = index;
- break;
+ // one user row. The last seal is the turn's answer; an earlier seal stays visible only
+ // when its contiguous answer run carries a delivery (a non-archivable answer), and then
+ // the whole run stays together so an intro is never split from its report.
+ let segmentStart = 0;
+ for (const sealedIndex of sealed) {
+ let lastActivity = -1;
+ for (let index = sealedIndex - 1; index >= segmentStart; index--) {
+ if (adapter.isActivity(items[index])) {
+ lastActivity = index;
+ break;
+ }
}
- }
- let answerStart = sealedIndex;
- while (
- answerStart > lastActivity + 1 &&
- adapter.isAnswer(items[answerStart - 1])
- ) {
- answerStart--;
- }
- for (let index = answerStart; index <= sealedIndex; index++) {
- if (adapter.isAnswer(items[index])) answers.add(index);
+ let answerStart = sealedIndex;
+ while (
+ answerStart > lastActivity + 1 &&
+ answerStart > segmentStart &&
+ adapter.isAnswer(items[answerStart - 1])
+ ) {
+ answerStart--;
+ }
+ let keep = sealedIndex === sealed[sealed.length - 1];
+ for (let index = answerStart; index <= sealedIndex && !keep; index++) {
+ keep =
+ adapter.isAnswer(items[index]) && !adapter.isArchivable(items[index]);
+ }
+ if (keep) {
+ for (let index = answerStart; index <= sealedIndex; index++) {
+ if (adapter.isAnswer(items[index])) answers.add(index);
+ }
+ }
+ segmentStart = sealedIndex + 1;
}
} else {
if (