Skip to content

Evenfire is an intelligence layer platform for running LLM agents that take real actions, on your infrastructure

TypeScript

fix(desktop-app): preserve image bytes across chat reconciliation

M64fab3e78366
diff --git a/desktop-app/src/__tests__/chatMessageMerge.test.ts b/desktop-app/src/__tests__/chatMessageMerge.test.ts
index df7533f1d..f5d7ced17 100644
--- a/desktop-app/src/__tests__/chatMessageMerge.test.ts
+++ b/desktop-app/src/__tests__/chatMessageMerge.test.ts
@@ -2,7 +2,160 @@ import { describe, expect, it } from 'vitest'
import fc from 'fast-check'
import { mergeAuthoritativeServerMessages, messageServerTurnNumber } from '../chatMessageMerge.js'
import { type ServerTurn, turnsToChatMessages } from '../serverTurnAdapter.js'
-import type { ChatMessage } from '../types.js'
+import type { ChatMessage, ChatMessageAttachment } from '../types.js'
+
+const imageWithBytes: ChatMessageAttachment = {
+ id: 'local-image',
+ type: 'uploaded_file',
+ label: 'chart.png',
+ filename: 'chart.png',
+ mimeType: 'image/png',
+ encoding: 'base64',
+ dataBase64: 'AQID',
+ sizeBytes: 3,
+}
+
+describe('mergeAuthoritativeServerMessages image byte gap-fill', () => {
+ it('keeps server reference chips and enriches a matching image during live-task replacement', () => {
+ const serverPlugin: ChatMessageAttachment = {
+ id: 'server-plugin',
+ type: 'plugin',
+ label: 'profits/revenue',
+ }
+ const serverImage: ChatMessageAttachment = {
+ id: 'parsed-uploaded-file-chart',
+ type: 'uploaded_file',
+ label: 'chart.png',
+ }
+ const merged = mergeAuthoritativeServerMessages(
+ [
+ {
+ id: 'optimistic-user',
+ role: 'user',
+ content: 'Analyze the chart',
+ timestamp: 1,
+ task_id: 'task-1',
+ attachments: [imageWithBytes, { id: 'local-plugin', type: 'plugin', label: 'revenue' }],
+ },
+ ],
+ [
+ {
+ id: 'turn-1-user',
+ role: 'user',
+ content: 'Analyze the chart',
+ timestamp: 2,
+ serverTurnNumber: 1,
+ task_id: 'task-1',
+ attachments: [serverPlugin, serverImage],
+ },
+ ],
+ { activeTaskIds: new Set(['task-1']) }
+ )
+
+ expect(merged).toHaveLength(1)
+ expect(merged[0]?.attachments).toEqual([
+ serverPlugin,
+ {
+ ...serverImage,
+ filename: 'chart.png',
+ mimeType: 'image/png',
+ encoding: 'base64',
+ dataBase64: 'AQID',
+ sizeBytes: 3,
+ },
+ ])
+ expect(mergeAuthoritativeServerMessages(merged, [merged[0]!])).toEqual(merged)
+ })
+
+ it('matches an uploaded file by ID when its server label differs from the local name', () => {
+ const serverImage: ChatMessageAttachment = {
+ id: imageWithBytes.id,
+ type: 'uploaded_file',
+ label: 'server chart label',
+ }
+ const merged = mergeAuthoritativeServerMessages(
+ [
+ {
+ id: 'optimistic-user',
+ role: 'user',
+ content: 'Chart',
+ timestamp: 1,
+ task_id: 'task-id',
+ attachments: [imageWithBytes],
+ },
+ ],
+ [
+ {
+ id: 'turn-1-user',
+ role: 'user',
+ content: 'Chart',
+ timestamp: 2,
+ serverTurnNumber: 1,
+ task_id: 'task-id',
+ attachments: [serverImage],
+ },
+ ],
+ { activeTaskIds: new Set(['task-id']) }
+ )
+ expect(merged[0]?.attachments).toEqual([
+ {
+ ...serverImage,
+ filename: 'chart.png',
+ mimeType: 'image/png',
+ encoding: 'base64',
+ dataBase64: 'AQID',
+ sizeBytes: 3,
+ },
+ ])
+ })
+
+ it('appends a local-only image with bytes when a settled echo collapses onto a server reference row', () => {
+ const serverPlugin: ChatMessageAttachment = {
+ id: 'server-plugin',
+ type: 'plugin',
+ label: 'profits/revenue',
+ }
+ const merged = mergeAuthoritativeServerMessages(
+ [
+ { id: 'turn-1-user', role: 'user', content: 'first', timestamp: 1, serverTurnNumber: 1 },
+ {
+ id: 'optimistic-user',
+ role: 'user',
+ content: 'Analyze the chart',
+ timestamp: 2,
+ task_id: 'settled-task',
+ attachments: [
+ imageWithBytes,
+ { id: 'local-only-label', type: 'agent_file', label: 'notes.md' },
+ ],
+ },
+ {
+ id: 'turn-2-user',
+ role: 'user',
+ content: 'Analyze the chart',
+ timestamp: 3,
+ serverTurnNumber: 2,
+ },
+ ],
+ [
+ { id: 'turn-1-user', role: 'user', content: 'first', timestamp: 4, serverTurnNumber: 1 },
+ {
+ id: 'turn-2-user',
+ role: 'user',
+ content: 'Analyze the chart',
+ timestamp: 5,
+ serverTurnNumber: 2,
+ attachments: [serverPlugin],
+ },
+ ],
+ { activeTaskIds: new Set() }
+ )
+
+ expect(merged.map(message => message.id)).toEqual(['turn-1-user', 'turn-2-user'])
+ expect(merged[1]?.attachments).toEqual([serverPlugin, imageWithBytes])
+ expect(merged[1]?.task_id).toBeUndefined()
+ })
+})
describe('mergeAuthoritativeServerMessages', () => {
it('preserves a task-backed in-flight message outside the authoritative turn', () => {
diff --git a/desktop-app/src/chatMessageMerge.ts b/desktop-app/src/chatMessageMerge.ts
index db8416149..4f0d92d8f 100644
--- a/desktop-app/src/chatMessageMerge.ts
+++ b/desktop-app/src/chatMessageMerge.ts
@@ -1,4 +1,4 @@
-import type { ChatMessage } from './types.js'
+import type { ChatMessage, ChatMessageAttachment } from './types.js'
export function messageServerTurnNumber(message: Pick<ChatMessage, 'id' | 'serverTurnNumber'>) {
if (message.serverTurnNumber !== undefined) return message.serverTurnNumber
@@ -14,6 +14,59 @@ function serverSlotKey(message: Pick<ChatMessage, 'id' | 'role' | 'serverTurnNum
return `${messageServerTurnNumber(message)}\u0000${message.role}`
}
+function attachmentName(attachment: ChatMessageAttachment): string {
+ return (attachment.filename || attachment.label).trim()
+}
+
+/** Preserve server chips while recovering bytes that only the optimistic message has. */
+function mergeByteBearingAttachments(
+ server: ChatMessageAttachment[] | undefined,
+ local: ChatMessageAttachment[] | undefined
+): ChatMessageAttachment[] | undefined {
+ if (!server?.length) return local
+ if (!local?.length) return server
+
+ const byteBearing = local.filter(attachment => Boolean(attachment.dataBase64))
+ if (!byteBearing.length) return server
+ const consumed = new Set<ChatMessageAttachment>()
+ const merged = server.map(serverAttachment => {
+ const sameId = byteBearing.find(
+ localAttachment =>
+ !consumed.has(localAttachment) &&
+ localAttachment.type === serverAttachment.type &&
+ localAttachment.id === serverAttachment.id
+ )
+ const name = attachmentName(serverAttachment)
+ const nameCandidates = name
+ ? byteBearing.filter(
+ localAttachment =>
+ !consumed.has(localAttachment) &&
+ localAttachment.type === serverAttachment.type &&
+ attachmentName(localAttachment) === name
+ )
+ : []
+ const serverNameIsUnique =
+ name &&
+ server.filter(
+ attachment =>
+ attachment.type === serverAttachment.type && attachmentName(attachment) === name
+ ).length === 1
+ const match =
+ sameId ?? (serverNameIsUnique && nameCandidates.length === 1 ? nameCandidates[0] : undefined)
+ if (!match) return serverAttachment
+ consumed.add(match)
+ return {
+ ...serverAttachment,
+ filename: serverAttachment.filename ?? match.filename,
+ mimeType: serverAttachment.mimeType ?? match.mimeType,
+ encoding: serverAttachment.encoding ?? match.encoding,
+ dataBase64: serverAttachment.dataBase64 ?? match.dataBase64,
+ sizeBytes: serverAttachment.sizeBytes ?? match.sizeBytes,
+ }
+ })
+ return [...merged, ...byteBearing.filter(attachment => !consumed.has(attachment))]
+}
+
function preferredServerMessage(
server: ChatMessage,
local: ChatMessage | undefined,
@@ -23,7 +76,7 @@ function preferredServerMessage(
return {
...server,
task_id: local.task_id ?? server.task_id,
- attachments: server.attachments?.length ? server.attachments : local.attachments,
+ attachments: mergeByteBearingAttachments(server.attachments, local.attachments),
toolSteps: server.toolSteps?.length ? server.toolSteps : local.toolSteps,
}
}
@@ -363,9 +416,7 @@ export function mergeAuthoritativeServerMessages(
if (collapsedEcho) {
hydrated = {
...hydrated,
- attachments: hydrated.attachments?.length
- ? hydrated.attachments
- : collapsedEcho.attachments,
+ attachments: mergeByteBearingAttachments(hydrated.attachments, collapsedEcho.attachments),
toolSteps: hydrated.toolSteps?.length ? hydrated.toolSteps : collapsedEcho.toolSteps,
}
}