Merge pull request microsoft#256616 from microsoft/osortega/fix-import

Fix import

Author: rebornix

src/vs/workbench/api/browser/mainThreadChatSessions.ts

@@ -5,6 +5,7 @@
 
 import { CancellationToken } from '../../../base/common/cancellation.js';
 import { Disposable, DisposableMap } from '../../../base/common/lifecycle.js';
+import { URI, UriComponents } from '../../../base/common/uri.js';
 import { ILogService } from '../../../platform/log/common/log.js';
 import { IChatSessionContent, IChatSessionsProvider, IChatSessionsService } from '../../contrib/chat/common/chatSessionsService.js';
 import { extHostNamedCustomer, IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
@@ -35,7 +36,12 @@ export class MainThreadChatSessions extends Disposable implements MainThreadChat
 
 		try {
 			// Get all results as an array from the RPC call
-			return await proxy.$provideChatSessions(handle, token);
+			const sessions = await proxy.$provideChatSessions(handle, token);
+			return sessions.map(session => ({
+				...session,
+				uri: URI.revive(session.uri),
+				iconPath: session.iconPath ? this._reviveIconPath(session.iconPath) : undefined
+			}));
 		} catch (error) {
 			this._logService.error('Error providing chat sessions:', error);
 		}
@@ -45,4 +51,27 @@ export class MainThreadChatSessions extends Disposable implements MainThreadChat
 	$unregisterChatSessionsProvider(handle: number): void {
 		this._registrations.deleteAndDispose(handle);
 	}
+
+
+	private _reviveIconPath(
+		iconPath: UriComponents | { light: UriComponents; dark: UriComponents } | { id: string; color?: { id: string } | undefined })
+		: IChatSessionContent['iconPath'] {
+		if (!iconPath) {
+			return undefined;
+		}
+
+		// Handle ThemeIcon (has id property)
+		if (typeof iconPath === 'object' && 'id' in iconPath) {
+			return iconPath; // ThemeIcon doesn't need conversion
+		}
+
+		// Handle light/dark theme icons
+		if (typeof iconPath === 'object' && ('light' in iconPath && 'dark' in iconPath)) {
+			return {
+				light: URI.revive(iconPath.light),
+				dark: URI.revive(iconPath.dark)
+			};
+		}
+		return undefined;
+	}
 }

src/vs/workbench/api/common/extHost.protocol.ts

@@ -3,7 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ChatSessionContent } from 'vscode';
 import { VSBuffer } from '../../../base/common/buffer.js';
 import { CancellationToken } from '../../../base/common/cancellation.js';
 import { IRemoteConsoleLog } from '../../../base/common/console.js';
@@ -59,6 +58,7 @@ import { ICodeMapperRequest, ICodeMapperResult } from '../../contrib/chat/common
 import { IChatRelatedFile, IChatRelatedFileProviderMetadata as IChatRelatedFilesProviderMetadata, IChatRequestDraft } from '../../contrib/chat/common/chatEditingService.js';
 import { IChatProgressHistoryResponseContent } from '../../contrib/chat/common/chatModel.js';
 import { IChatContentInlineReference, IChatFollowup, IChatNotebookEdit, IChatProgress, IChatTask, IChatTaskDto, IChatUserActionEvent, IChatVoteAction } from '../../contrib/chat/common/chatService.js';
+import { IChatSessionContent } from '../../contrib/chat/common/chatSessionsService.js';
 import { IChatRequestVariableValue } from '../../contrib/chat/common/chatVariables.js';
 import { ChatAgentLocation } from '../../contrib/chat/common/constants.js';
 import { IChatMessage, IChatResponseFragment, ILanguageModelChatMetadata, ILanguageModelChatSelector, ILanguageModelsChangeEvent } from '../../contrib/chat/common/languageModels.js';
@@ -3107,7 +3107,7 @@ export interface MainThreadChatSessionsShape extends IDisposable {
 }
 
 export interface ExtHostChatSessionsShape {
-	$provideChatSessions(handle: number, token: CancellationToken): Promise<ChatSessionContent[]>;
+	$provideChatSessions(handle: number, token: CancellationToken): Promise<IChatSessionContent[]>;
 }
 
 // --- proxy identifiers

src/vs/workbench/contrib/chat/common/chatSessionsService.ts

@@ -8,13 +8,16 @@ import { CancellationToken } from '../../../../base/common/cancellation.js';
 import { ILogService } from '../../../../platform/log/common/log.js';
 import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
 import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
-import { IconPath } from '../../../../editor/common/languages.js';
-import { UriComponents } from '../../../../base/common/uri.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
 
 export interface IChatSessionContent {
-	uri: UriComponents;
+	uri: URI;
 	label: string;
-	iconPath?: IconPath;
+	iconPath?: URI | {
+		light: URI;
+		dark: URI;
+	} | ThemeIcon;
 }
 
 export interface IChatSessionsProvider {

src/vscode-dts/vscode.proposed.chatSessionsProvider.d.ts

@@ -8,6 +8,10 @@ declare module 'vscode' {
 	 * Provides a list of chat sessions
 	 */
 	export interface ChatSessionsProvider extends Disposable {
+		/**
+		 * Type to identify providers.
+		 */
+		readonly chatSessionType: string;
 
 		/**
 		 * Fired when chat sessions change.