Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(desktop): 原图丢失退回烧录图时保留标注身份
Dashb098897ebff7
diff --git a/apps/desktop/src/renderer/__tests__/messageAttachmentPayload.test.ts b/apps/desktop/src/renderer/__tests__/messageAttachmentPayload.test.tsindex 2ce94ac3b1..65b71b475c 100644--- a/apps/desktop/src/renderer/__tests__/messageAttachmentPayload.test.ts+++ b/apps/desktop/src/renderer/__tests__/messageAttachmentPayload.test.ts@@ -105,6 +105,22 @@ describe('messageAttachmentPayload', () => {expect(payload.serializedFiles?.[1]).not.toHaveProperty('annotationRegions');});+ it('sends a base-annotated image (lost source, burned pixels) as annotated without regions', () => {+ const fallback = attachment({+ id: 'fallback',+ name: 'shot-annotated.png',+ ext: '.png',+ category: 'image',+ mimeType: 'image/png',+ url: 'cindy-media://blobs/burned.png',+ baseAnnotated: true,+ });+ const [file] = buildUserMessageAttachmentPayload([fallback]).serializedFiles ?? [];+ expect(file).toMatchObject({ annotated: true });+ expect(file).not.toHaveProperty('annotationRegions');+ expect(file).not.toHaveProperty('baseAnnotated');+ });+it('uses base64 only for image fallback and keeps it out of persisted refs', () => {const image = attachment({name: 'fallback.png',diff --git a/apps/desktop/src/renderer/__tests__/rewindDraftAttachments.test.ts b/apps/desktop/src/renderer/__tests__/rewindDraftAttachments.test.tsindex 19ff785cb7..d3e5a0a752 100644--- a/apps/desktop/src/renderer/__tests__/rewindDraftAttachments.test.ts+++ b/apps/desktop/src/renderer/__tests__/rewindDraftAttachments.test.ts@@ -270,11 +270,14 @@ describe('dropMissingAnnotationSources', () => {url: 'cindy-media://blobs/burned.png',mimeType: 'image/png',originalName: 'shot-annotated.png',+ // 烧录图本身带红线:保留标注身份。+ baseAnnotated: true,});const [attachment] = buildRewindDraftAttachments({ images: [images[1]] });expect(attachment).toMatchObject({url: 'cindy-media://blobs/burned.png',path: 'cindy-media://blobs/burned.png',+ baseAnnotated: true,});expect(attachment.annotationStrokes).toBeUndefined();expect(attachment.cacheUrlShared).toBeUndefined();@@ -313,7 +316,12 @@ describe('startRewindSourceProbe (rewind draft timing)', () => {await new Promise((resolve) => setTimeout(resolve, 0));// 探测完成后(例如确认框还开着时)再提交:丢失的原图退回烧录图。expect(handle.imagesForDraft()).toEqual([- { url: 'cindy-media://blobs/burned.png', mimeType: 'image/png', originalName: 'shot-annotated.png' },+ {+ url: 'cindy-media://blobs/burned.png',+ mimeType: 'image/png',+ originalName: 'shot-annotated.png',+ baseAnnotated: true,+ },]);});diff --git a/apps/desktop/src/renderer/components/chat/ImageLightbox.tsx b/apps/desktop/src/renderer/components/chat/ImageLightbox.tsxindex 86c9db777f..7d321eb401 100644--- a/apps/desktop/src/renderer/components/chat/ImageLightbox.tsx+++ b/apps/desktop/src/renderer/components/chat/ImageLightbox.tsx@@ -1408,6 +1408,15 @@ export function ImageLightbox({}}}+ // 历史标注图的原图已丢失、当前显示的是烧录图:底图本身带红线,转发后仍是+ // 标注图(模型照常收到标注说明)。+ if (+ currentItem.annotationSourceUrl &&+ currentItem.annotationStrokes?.length &&+ failedAnnotationSources.has(currentItem.annotationSourceUrl)+ ) {+ attached = { ...attached, baseAnnotated: true };+ }const existing = getDraft(chatSessionId);saveDraft(chatSessionId,diff --git a/apps/desktop/src/renderer/lib/__tests__/annotationBurnInMaterialize.test.ts b/apps/desktop/src/renderer/lib/__tests__/annotationBurnInMaterialize.test.tsindex b14df9f174..a446672a98 100644--- a/apps/desktop/src/renderer/lib/__tests__/annotationBurnInMaterialize.test.ts+++ b/apps/desktop/src/renderer/lib/__tests__/annotationBurnInMaterialize.test.ts@@ -122,6 +122,17 @@ describe('materializeAnnotatedAttachmentsForSend', () => {expect(result.path).toBe('/Users/sam/shot.png');});+ it('burns new strokes onto a base-annotated image without describing regions', async () => {+ const [result] =+ (await materializeAnnotatedAttachmentsForSend(+ [imageFile({ annotationStrokes: strokes, baseAnnotated: true })],+ 's1',+ )) ?? [];+ expect(result).toMatchObject({ annotated: true, baseAnnotated: true });+ // 旧红线位置不可知:只描述新笔迹会与图上红线不符,故不带区域。+ expect(result.annotationRegions).toBeUndefined();+ });+it('is idempotent for already-burned attachments (auth-retry resend)', async () => {const burned = imageFile({url: 'cindy-media://blobs/burned.png',diff --git a/apps/desktop/src/renderer/lib/annotationBurnIn.ts b/apps/desktop/src/renderer/lib/annotationBurnIn.tsindex 21ee12216e..87c567c05f 100644--- a/apps/desktop/src/renderer/lib/annotationBurnIn.ts+++ b/apps/desktop/src/renderer/lib/annotationBurnIn.ts@@ -348,7 +348,9 @@ async function persistBurnedAttachment(const { blob, mimeType } = burned;const ext = mimeType === 'image/jpeg' ? '.jpg' : '.png';const name = annotatedFileName(f.originalName ?? f.name, ext, Date.now());- const regions = summarizeAnnotationRegions(strokes);+ // 底图本身已带旧红线(baseAnnotated)时只知道新笔迹的位置,只描述新笔迹会与+ // 图上红线不符——不带区域,退回固定说明。+ const regions = f.baseAnnotated ? [] : summarizeAnnotationRegions(strokes);const annotationRegions = regions.length > 0 ? { annotationRegions: regions } : {};if (f.url) {const cached = await window.electronAPI.cacheImageFromBuffer({diff --git a/apps/desktop/src/renderer/lib/composerDraftStore.ts b/apps/desktop/src/renderer/lib/composerDraftStore.tsindex cbfa1c805b..1f12391ed4 100644--- a/apps/desktop/src/renderer/lib/composerDraftStore.ts+++ b/apps/desktop/src/renderer/lib/composerDraftStore.ts@@ -120,6 +120,7 @@ const ATTACHED_FILE_SNAPSHOT_KEYS = ['textContent','truncated','annotated',+ 'baseAnnotated','annotationSourceUrl','cacheUrlShared','stagedPathShared',diff --git a/apps/desktop/src/renderer/lib/fileTypes.ts b/apps/desktop/src/renderer/lib/fileTypes.tsindex f3bf872daa..f6de81b887 100644--- a/apps/desktop/src/renderer/lib/fileTypes.ts+++ b/apps/desktop/src/renderer/lib/fileTypes.ts@@ -100,6 +100,13 @@ export interface AttachedFile {* buildMakerUserMessage 据此给模型注入"红色笔迹是用户标注"的固定说明。*/annotated?: boolean;+ /**+ * 底图像素本身已含烧录的标注红线(历史标注图的未烧录原图已被清理,退回烧录图+ * 继续使用 / 编辑时)。仅 renderer 内使用、不上 wire:序列化时并入 `annotated`,+ * 让模型照常收到"红色笔迹是用户标注"的说明;旧红线位置已不可知,故不带+ * `annotationRegions`(与 mobile 的 baseAnnotated 同一规则)。+ */+ baseAnnotated?: boolean;/*** 非破坏性标注:发送物化(烧录)后才存在——`url` 已是烧录位图,这里记录未烧录* **原图**的缓存 url(xdt-image:// / cindy-media://),随消息持久化进 ImageRef,diff --git a/apps/desktop/src/renderer/lib/makerChatStore.ts b/apps/desktop/src/renderer/lib/makerChatStore.tsindex e1b6b84d91..b028c40c45 100644--- a/apps/desktop/src/renderer/lib/makerChatStore.ts+++ b/apps/desktop/src/renderer/lib/makerChatStore.ts@@ -13828,6 +13828,7 @@ function queueEditFilesMatch(textContent: file.textContent,truncated: file.truncated,annotated: file.annotated,+ baseAnnotated: file.baseAnnotated,annotationSourceUrl: file.annotationSourceUrl,annotationStrokes: file.annotationStrokes,}));diff --git a/apps/desktop/src/renderer/lib/messageAttachmentPayload.ts b/apps/desktop/src/renderer/lib/messageAttachmentPayload.tsindex c198fe4da2..5a65ca11ff 100644--- a/apps/desktop/src/renderer/lib/messageAttachmentPayload.ts+++ b/apps/desktop/src/renderer/lib/messageAttachmentPayload.ts@@ -85,7 +85,8 @@ export function serializeAttachedFiles(mimeType: file.mimeType,originalName: file.originalName ?? file.name,...(file.url ? { url: file.url } : {}),- ...(file.annotated ? { annotated: true } : {}),+ // baseAnnotated:底图本身已带标注红线(原图丢失后退回烧录图),同样是标注图。+ ...(file.annotated || file.baseAnnotated ? { annotated: true } : {}),// 标注区域只随烧录产物(annotated)上 wire;缺省时被控端退回纯说明。...(file.annotated && file.annotationRegions?.length? { annotationRegions: file.annotationRegions }diff --git a/apps/desktop/src/renderer/lib/rewindDraftAttachments.ts b/apps/desktop/src/renderer/lib/rewindDraftAttachments.tsindex e1d18e81a9..ae4eb1e94d 100644--- a/apps/desktop/src/renderer/lib/rewindDraftAttachments.ts+++ b/apps/desktop/src/renderer/lib/rewindDraftAttachments.ts@@ -9,7 +9,10 @@ import type { FileRef, ImageRef } from '@/lib/imageRef';import { toEditableAnnotatedAttachment } from '@/lib/annotationRestore';export type RewindDraftImage =- | ImageRef+ | (ImageRef & {+ /** 未烧录原图已丢失、退回烧录图:底图本身带标注红线(见 AttachedFile.baseAnnotated)。 */+ baseAnnotated?: boolean;+ })| { base64: string; mimeType: string; originalName?: string };function extForMime(mimeType: string): string {@@ -102,7 +105,9 @@ export function buildRewindDraftAttachments(input: {continue;}attachments.push(- 'url' in image ? { ...common, url: image.url } : { ...common, base64: image.base64 },+ 'url' in image+ ? { ...common, url: image.url, ...(image.baseAnnotated ? { baseAnnotated: true } : {}) }+ : { ...common, base64: image.base64 },);}@@ -179,7 +184,8 @@ export async function dropMissingAnnotationSources<T extends RewindDraftImage>(exists = true;}if (exists) return image;- const burnedOnly: ImageRef = { ...image };+ // 烧录图本身带着红线:保留标注身份,重发时模型仍会收到标注说明。+ const burnedOnly: ImageRef & { baseAnnotated?: boolean } = { ...image, baseAnnotated: true };delete burnedOnly.annotationSourceUrl;delete burnedOnly.annotationStrokes;return burnedOnly as T;