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): treat raw HTML img replies as deliveries

Dash06f7cfd5a3e6
diff --git a/apps/desktop/src/renderer/__tests__/workGroupDeliveryProse.test.ts b/apps/desktop/src/renderer/__tests__/workGroupDeliveryProse.test.ts
index 4226e4acfd..9bee3cc146 100644
--- a/apps/desktop/src/renderer/__tests__/workGroupDeliveryProse.test.ts
+++ b/apps/desktop/src/renderer/__tests__/workGroupDeliveryProse.test.ts
@@ -152,6 +152,14 @@ describe('交付正文不被收尾动作顶进「已工作 Xs」', () => {
expect(topLevelMessageIds(items)).toEqual(['u1', 'brief', 'wrap']);
});
+ it('内嵌 raw HTML <img> 的短正文平铺', () => {
+ const pictured = '缩略图:<img src="https://example.com/thumb.png" width="150">';
+
+ const items = groupWorkRuns(buildRenderItems(briefThenNotifyTurn(pictured)).items, false);
+
+ expect(topLevelMessageIds(items)).toEqual(['u1', 'brief', 'wrap']);
+ });
+
it('带图片 / 文件附件的短正文平铺', () => {
const messages = briefThenNotifyTurn('报告在附件里。').map((message) =>
message.clientId === 'brief'
@@ -187,6 +195,14 @@ describe('进度旁白仍然折进「已工作 Xs」', () => {
expect(topLevelMessageIds(items)).toEqual(['u1', 'wrap']);
});
+ it('不带 src 的 img 或自定义 <img-wrapper> 元素不算图片,仍折叠', () => {
+ for (const body of ['说明里提到 <img> 标签。', '<img-wrapper src="https://example.com/a.png">']) {
+ const items = groupWorkRuns(buildRenderItems(briefThenNotifyTurn(body)).items, false);
+
+ expect(topLevelMessageIds(items)).toEqual(['u1', 'wrap']);
+ }
+ });
+
it('只有 2 项列表的旁白不算交付,仍折叠', () => {
const items = groupWorkRuns(
buildRenderItems(briefThenNotifyTurn('接下来两件事:\n- 读 diff\n- 写简报')).items,
diff --git a/packages/maker-shared/src/__tests__/messageRender.test.ts b/packages/maker-shared/src/__tests__/messageRender.test.ts
index 56d2f4b028..6ec7a9ad04 100644
--- a/packages/maker-shared/src/__tests__/messageRender.test.ts
+++ b/packages/maker-shared/src/__tests__/messageRender.test.ts
@@ -204,7 +204,7 @@ describe('message render shared model', () => {
expect(todo.todos).toEqual([{ content: 'Implement', status: 'completed', activeForm: undefined }]);
});
- function backgroundContinuation(mainSummary: string): MessageRenderItem<FixtureSource>[] {
+ function backgroundContinuation(mainSummary: string): MessageRenderItem<FixtureMessage>[] {
return buildMessageRenderItems([
message({ kind: 'user', source: source('user', 'start', 1), body: 'start', label: 'user' }),
message({
diff --git a/packages/maker-shared/src/messageRender.ts b/packages/maker-shared/src/messageRender.ts
index 6bbf45a8e7..6d530d3830 100644
--- a/packages/maker-shared/src/messageRender.ts
+++ b/packages/maker-shared/src/messageRender.ts
@@ -1611,14 +1611,19 @@ const MARKDOWN_LIST_ITEM_RE = /^[ \t]{0,3}(?:[-*+][ \t]+|\d{1,3}[.)][ \t]+)\S/gm
/** 列表要 ≥3 项才算交付结构:「我要做两件事」这类旁白也会顺手列两条。 */
const DELIVERY_PROSE_MIN_LIST_ITEMS = 3;
-/** 正文里的 markdown 图片:配一句短说明发出的图也是交付成果。 */
+/**
+ * 正文里的图片:配一句短说明发出的图也是交付成果。两端渲染器都支持 `![alt](url)` 与
+ * 带 src 的单个 raw HTML `<img>`(桌面 remarkHtmlImages、手机 messageMarkdown)。
+ * 只决定是否折叠,偶尔多认(如代码块里的 <img>)只会多显示一条,方向安全。
+ */
const MARKDOWN_IMAGE_RE = /!\[[^\]\n]*\]\([^)\s]+(?:\s[^)]*)?\)/;
+const HTML_IMAGE_RE = /<img(?=[\s/>])[^<>]*\ssrc\s*=\s*["']?[^\s"'<>]+[^<>]*>/i;
/**
* 这段 assistant 正文是不是「交付内容」(而非进度旁白)。
*
* 判据刻意与位置无关:长度达阈值,或带块级 markdown 结构(标题 / 表格 /
- * ≥3 项列表),或内嵌 markdown 图片。两端共用这一份口径,不各自实现。
+ * ≥3 项列表),或内嵌图片。两端共用这一份口径,不各自实现。
*/
export function isDeliveryProseText(text: string): boolean {
const trimmed = text.trim();
@@ -1626,7 +1631,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;
+ if (MARKDOWN_IMAGE_RE.test(trimmed) || HTML_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;