From e9f5842f29b890579846b045601cde1ab132e30c Mon Sep 17 00:00:00 2001 From: Kit Langton Date: Tue, 11 Aug 2026 10:39:42 -0400 Subject: [PATCH] refactor: simplify attachment identity tracking (#41756) --- packages/core/src/session/runner/to-llm-message.ts | 10 +++++----- packages/tui/src/prompt/attachment.ts | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/packages/core/src/session/runner/to-llm-message.ts b/packages/core/src/session/runner/to-llm-message.ts index 90900c38e34..cedd6aac5bd 100644 --- a/packages/core/src/session/runner/to-llm-message.ts +++ b/packages/core/src/session/runner/to-llm-message.ts @@ -65,15 +65,15 @@ const userAttachmentContent = (files: readonly FileAttachment[]) => { ) if (eligible.length < 2) return files.flatMap(attachmentContent) - const seen = new Map() + const seen = new Map>() return files.flatMap((file) => { if (!imageMimes.has(file.mime) || file.source.type !== "inline" || !file.mention?.text) return attachmentContent(file) const metadata = JSON.stringify([file.mime, file.name ?? null, file.description ?? null, file.mention.text]) - const matches = seen.get(metadata) - if (matches?.includes(file.data)) return [] - if (matches) matches.push(file.data) - if (!matches) seen.set(metadata, [file.data]) + const payloads = seen.get(metadata) ?? new Set() + if (payloads.has(file.data)) return [] + payloads.add(file.data) + seen.set(metadata, payloads) return attachmentContent(file) }) } diff --git a/packages/tui/src/prompt/attachment.ts b/packages/tui/src/prompt/attachment.ts index 4ebc6c31544..edaaaf11252 100644 --- a/packages/tui/src/prompt/attachment.ts +++ b/packages/tui/src/prompt/attachment.ts @@ -25,14 +25,14 @@ function deduplicateByIdentity( items: readonly T[], identity: (item: T) => { metadata: string; payload: string } | undefined, ) { - const seen = new Map() + const seen = new Map>() return items.filter((item) => { const key = identity(item) if (!key) return true - const matches = seen.get(key.metadata) - if (matches?.includes(key.payload)) return false - if (matches) matches.push(key.payload) - if (!matches) seen.set(key.metadata, [key.payload]) + const payloads = seen.get(key.metadata) ?? new Set() + if (payloads.has(key.payload)) return false + payloads.add(key.payload) + seen.set(key.metadata, payloads) return true }) } @@ -42,7 +42,7 @@ export function deduplicatePromptImages(files: readonly PromptFile[] | undefined return deduplicateByIdentity(files, (file) => file.uri.startsWith("data:image/") && file.mention?.text ? { - metadata: JSON.stringify([attachmentMetadata(file), file.mention.text]), + metadata: JSON.stringify([file.name ?? null, file.description ?? null, file.mention.text]), payload: file.uri, } : undefined,