fix #302202 fix #301997 Deduplicate consecutive carousel images and add title fallback

src/vs/workbench/contrib/chat/browser/chatImageCarouselService.ts

@@ -11,7 +11,7 @@ import { localize } from '../../../../nls.js';
 import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.js';
 import { IFileService } from '../../../../platform/files/common/files.js';
-import { extractImagesFromChatRequest, extractImagesFromChatResponse } from '../common/chatImageExtraction.js';
+import { extractImagesFromChatRequest, extractImagesFromChatResponse, IChatExtractedImage } from '../common/chatImageExtraction.js';
 import { IChatRequestViewModel, IChatResponseViewModel, isRequestVM, isResponseVM } from '../common/model/chatViewModel.js';
 import { IChatWidgetService } from './chat.js';
 
@@ -95,10 +95,11 @@ export async function collectCarouselSections(
 		const requestImages = request ? extractImagesFromChatRequest(request) : [];
 
 		const allImages = [...requestImages, ...responseImages];
-		if (allImages.length > 0) {
+		const dedupedImages = deduplicateConsecutiveImages(allImages);
+		if (dedupedImages.length > 0) {
 			sections.push({
 				title: request?.messageText ?? extractedTitle,
-				images: allImages.map(({ id, name, mimeType, data }) => ({ id, name, mimeType, data: data.buffer }))
+				images: dedupedImages.map(({ id, name, mimeType, data }) => ({ id, name, mimeType, data: data.buffer }))
 			});
 		}
 	}
@@ -112,17 +113,31 @@ export async function collectCarouselSections(
 			continue;
 		}
 		const requestImages = extractImagesFromChatRequest(item);
-		if (requestImages.length > 0) {
+		const dedupedImages = deduplicateConsecutiveImages(requestImages);
+		if (dedupedImages.length > 0) {
 			sections.push({
 				title: item.messageText,
-				images: requestImages.map(({ id, name, mimeType, data }) => ({ id, name, mimeType, data: data.buffer }))
+				images: dedupedImages.map(({ id, name, mimeType, data }) => ({ id, name, mimeType, data: data.buffer }))
 			});
 		}
 	}
 
 	return sections;
 }
 
+/**
+ * Removes consecutive images with the same URI, keeping only the first occurrence
+ * of each run of duplicates.
+ */
+function deduplicateConsecutiveImages(images: IChatExtractedImage[]): IChatExtractedImage[] {
+	return images.filter((img, index) => {
+		if (index === 0) {
+			return true;
+		}
+		return !isEqual(images[index - 1].uri, img.uri);
+	});
+}
+
 /**
  * Finds the global index of the clicked image across all carousel sections.
  * Tries URI string match, then parsed URI equality, then data buffer equality.
@@ -187,12 +202,13 @@ export function buildCollectionArgs(
 	sessionResource: URI,
 ): ICarouselCollectionArgs {
 	const collectionId = sessionResource.toString() + '_carousel';
+	const defaultTitle = localize('chatImageCarousel.allImages', "Conversation Images");
 	return {
 		collection: {
 			id: collectionId,
 			title: sections.length === 1
-				? sections[0].title
-				: localize('chatImageCarousel.allImages', "Conversation Images"),
+				? (sections[0].title || defaultTitle)
+				: defaultTitle,
 			sections,
 		},
 		startIndex: clickedGlobalIndex,

src/vs/workbench/contrib/chat/test/browser/chatImageCarouselService.test.ts

@@ -42,6 +42,7 @@ suite('ChatImageCarouselService helpers', () => {
 			sessionResource: URI.parse('chat-session://test/session'),
 			response: { value: [] },
 			session: { getItems: () => [] },
+			setVote: () => { },
 		} as unknown as IChatResponseViewModel;
 	}
 
@@ -129,6 +130,15 @@ suite('ChatImageCarouselService helpers', () => {
 			assert.strictEqual(result.collection.title, 'Conversation Images');
 			assert.strictEqual(result.startIndex, 1);
 		});
+
+		test('falls back to default title when single section has empty title', () => {
+			const sections: ICarouselSection[] = [{
+				title: '',
+				images: [makeImage(URI.file('/img.png').toString())],
+			}];
+			const result = buildCollectionArgs(sections, 0, URI.file('/session'));
+			assert.strictEqual(result.collection.title, 'Conversation Images');
+		});
 	});
 
 	suite('buildSingleImageArgs', () => {
@@ -223,6 +233,55 @@ suite('ChatImageCarouselService helpers', () => {
 			assert.strictEqual(result.length, 1);
 			assert.strictEqual(result[0].images.length, 1);
 		});
+
+		test('deduplicates consecutive images with the same URI', async () => {
+			const uri = URI.file('/screenshot.png');
+			const request = makeRequest('req-1', [
+				makeImageVariableEntry({
+					value: new Uint8Array([1, 2, 3]),
+					references: [{ reference: uri, kind: 'reference' }],
+				}),
+				makeImageVariableEntry({
+					id: 'img-2',
+					value: new Uint8Array([1, 2, 3]),
+					references: [{ reference: uri, kind: 'reference' }],
+				}),
+			], 'Two same images');
+			const response = makeResponse('req-1');
+
+			const result = await collectCarouselSections([request, response], async () => new Uint8Array());
+
+			assert.strictEqual(result.length, 1);
+			assert.strictEqual(result[0].images.length, 1);
+		});
+
+		test('keeps non-consecutive images with the same URI', async () => {
+			const uri = URI.file('/screenshot.png');
+			const otherUri = URI.file('/other.png');
+			const request = makeRequest('req-1', [
+				makeImageVariableEntry({
+					value: new Uint8Array([1, 2, 3]),
+					references: [{ reference: uri, kind: 'reference' }],
+				}),
+				makeImageVariableEntry({
+					id: 'img-2',
+					name: 'other.png',
+					value: new Uint8Array([4, 5, 6]),
+					references: [{ reference: otherUri, kind: 'reference' }],
+				}),
+				makeImageVariableEntry({
+					id: 'img-3',
+					value: new Uint8Array([1, 2, 3]),
+					references: [{ reference: uri, kind: 'reference' }],
+				}),
+			], 'Non-consecutive duplicates');
+			const response = makeResponse('req-1');
+
+			const result = await collectCarouselSections([request, response], async () => new Uint8Array());
+
+			assert.strictEqual(result.length, 1);
+			assert.strictEqual(result[0].images.length, 3);
+		});
 	});
 
 });