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): wait for desktop image decoding before fading in

Dash0470acef271d
diff --git a/apps/desktop/src/renderer/__tests__/chatImageView.test.ts b/apps/desktop/src/renderer/__tests__/chatImageView.test.ts
index 80abb0d28a..4ad025f9de 100644
--- a/apps/desktop/src/renderer/__tests__/chatImageView.test.ts
+++ b/apps/desktop/src/renderer/__tests__/chatImageView.test.ts
@@ -39,14 +39,21 @@ afterEach(() => {
describe('ChatImageView', () => {
describe.each(['user-attached', 'tool-output'] as const)('%s diagnostics', (variant) => {
- it('keeps a loading frame until decode and resets it for a different source', () => {
+ it('keeps a loading frame until decode and resets it for a different source', async () => {
const props = { filename: 'a.png', variant };
const { rerender } = render(React.createElement(ChatImageView, {
...props, src: 'cindy-remote-media://m/device/a',
}));
expect(screen.getByRole('status').getAttribute('aria-label')).toBe('chat.imageMissing.loading');
expect(screen.getByAltText('a.png').style.display).toBe('none');
- fireEvent.load(screen.getByAltText('a.png'));
+ const image = screen.getByAltText('a.png') as HTMLImageElement;
+ let finishDecode!: () => void;
+ image.decode = vi.fn(() => new Promise<void>((resolve) => { finishDecode = resolve; }));
+ fireEvent.load(image);
+ expect(image.decode).toHaveBeenCalledOnce();
+ expect(screen.getByRole('status')).toBeTruthy();
+ expect(image.style.display).toBe('none');
+ await act(async () => { finishDecode(); });
expect(screen.queryByRole('status')).toBeNull();
expect(screen.getByRole('button', { name: 'a.png' }).style.display).toBe('');
rerender(React.createElement(ChatImageView, {
@@ -58,6 +65,41 @@ describe('ChatImageView', () => {
expect(screen.queryByRole('status')).toBeNull();
});
+ it.each(['resolve', 'reject'] as const)('ignores a late decode %s after changing source', async (outcome) => {
+ const props = { filename: 'a.png', variant };
+ const { rerender } = render(React.createElement(ChatImageView, {
+ ...props, src: 'cindy-remote-media://m/device/a',
+ }));
+ const oldImage = screen.getByAltText('a.png') as HTMLImageElement;
+ let finishDecode!: () => void;
+ oldImage.decode = vi.fn(() => new Promise<void>((resolve, reject) => {
+ finishDecode = outcome === 'resolve' ? resolve : () => reject(new Error('Stale decode'));
+ }));
+ fireEvent.load(oldImage);
+ rerender(React.createElement(ChatImageView, {
+ ...props, src: 'cindy-remote-media://m/device/b',
+ }));
+ await act(async () => { finishDecode(); });
+ expect(screen.queryByTestId('image-failure')).toBeNull();
+ expect(screen.getByRole('status')).toBeTruthy();
+ expect(screen.getByAltText('a.png').getAttribute('src')).toBe('cindy-remote-media://m/device/b');
+ fireEvent.load(screen.getByAltText('a.png'));
+ expect(screen.queryByRole('status')).toBeNull();
+ });
+
+ it('routes decode failure through the existing image diagnostics', async () => {
+ const read = vi.fn().mockRejectedValue(new Error('[NOT_FOUND] Image file not found'));
+ vi.stubGlobal('electronAPI', { readCachedImageAsBase64: read });
+ const src = 'cindy-media://blobs/a.png';
+ render(React.createElement(ChatImageView, { src, filename: 'a.png', variant }));
+ const image = screen.getByAltText('a.png') as HTMLImageElement;
+ image.decode = vi.fn().mockRejectedValue(new Error('Decode failed'));
+ fireEvent.load(image);
+ await waitFor(() => expect(screen.getByTestId('image-failure').dataset.status).toBe('missing'));
+ expect(screen.queryByRole('status')).toBeNull();
+ expect(read).toHaveBeenCalledExactlyOnceWith({ url: src });
+ });
+
it.each(['xdt-image://images/a.png', 'cindy-media://blobs/a.png'])(
'confirms missing bytes via preload for %s',
async (src) => {
diff --git a/apps/desktop/src/renderer/components/chat/ChatLoadingImage.tsx b/apps/desktop/src/renderer/components/chat/ChatLoadingImage.tsx
index 3fcb153803..a91677195e 100644
--- a/apps/desktop/src/renderer/components/chat/ChatLoadingImage.tsx
+++ b/apps/desktop/src/renderer/components/chat/ChatLoadingImage.tsx
@@ -32,7 +32,23 @@ function ImageLoad({ onLoad, style, className, ...props }: ComponentProps<'img'>
)}
style={loaded ? style : { ...style, display: 'none' }}
onLoad={(event) => {
- setLoaded(true);
+ const image = event.currentTarget;
+ if (typeof image.decode === 'function') {
+ void image.decode().then(
+ () => {
+ if (image.isConnected) setLoaded(true);
+ },
+ () => {
+ // Reuse the existing error/retry path; a replaced image must not
+ // report a late decode failure against the new source.
+ if (!image.isConnected) return;
+ setLoaded(true);
+ image.dispatchEvent(new Event('error'));
+ },
+ );
+ } else {
+ setLoaded(true);
+ }
onLoad?.(event);
}}
/>
diff --git a/apps/desktop/src/renderer/components/chat/__tests__/imageClipboardInteractions.test.tsx b/apps/desktop/src/renderer/components/chat/__tests__/imageClipboardInteractions.test.tsx
index a195e5842a..7be4a1423c 100644
--- a/apps/desktop/src/renderer/components/chat/__tests__/imageClipboardInteractions.test.tsx
+++ b/apps/desktop/src/renderer/components/chat/__tests__/imageClipboardInteractions.test.tsx
@@ -270,7 +270,7 @@ describe('shared production image interactions', () => {
expect(screen.getByRole('status').getAttribute('aria-label')).toBe(label('chat.imageMissing.loading'));
expect(img.style.display).toBe('none');
fireEvent.load(img);
- expect(screen.queryByRole('status')).toBeNull();
+ await waitFor(() => expect(screen.queryByRole('status')).toBeNull());
expect(img.style.display).toBe('');
await copyFromMenu(img);
await waitFor(() => expect(nativeCopy).toHaveBeenCalled());