Fix avatar display in comment widget for GitHub Enterprise

Apply isGitHubDotComAvatar check to comment widget code to prevent
broken avatar display for GitHub Enterprise users. For enterprise
avatars (non-githubusercontent.com URLs), skip fetching the avatar
and show no icon instead of a broken image.

Fixes:
- setReplyAuthor() in utils.ts (reply area avatar)
- TemporaryComment constructor in prComment.ts
- GHPRComment constructor in prComment.ts

Co-authored-by: alexr00 <38270282+alexr00@users.noreply.github.com>

Author: Copilot

src/@types/vscode.proposed.chatParticipantAdditions.d.ts

@@ -223,16 +223,6 @@ declare module 'vscode' {
 		};
 		language: string;
 
-		/**
-		 * Overrides for how the command is presented in the UI.
-		 * For example, when a `cd <dir> && <command>` prefix is detected,
-		 * the presentation can show only the actual command.
-		 */
-		presentationOverrides?: {
-			commandLine: string;
-			language?: string;
-		};
-
 		/**
 		 * Terminal command output. Displayed when the terminal is no longer available.
 		 */
@@ -1030,6 +1020,8 @@ declare module 'vscode' {
 		readonly rawInput?: unknown;
 
 		readonly chatRequestId?: string;
+		/** @deprecated Use {@link chatSessionResource} instead */
+		readonly chatSessionId?: string;
 		readonly chatSessionResource?: Uri;
 		readonly chatInteractionId?: string;
 	}
@@ -1063,9 +1055,5 @@ declare module 'vscode' {
 		readonly content: string;
 		readonly toolReferences?: readonly ChatLanguageModelToolReference[];
 		readonly metadata?: Record<string, boolean | string | number>;
-		/**
-		 * Whether the mode is a builtin mode (e.g. Ask, Edit, Agent) rather than a user or extension-defined custom mode.
-		 */
-		readonly isBuiltin?: boolean;
 	}
 }

src/@types/vscode.proposed.chatParticipantPrivate.d.ts

@@ -176,15 +176,10 @@ declare module 'vscode' {
 		 */
 		readonly editedFileEvents?: ChatRequestEditedFileEvent[];
 
-		/**
-		 * The identifier of the language model that was used for this request, if known.
-		 */
-		readonly modelId?: string;
-
 		/**
 		 * @hidden
 		 */
-		constructor(prompt: string, command: string | undefined, references: ChatPromptReference[], participant: string, toolReferences: ChatLanguageModelToolReference[], editedFileEvents: ChatRequestEditedFileEvent[] | undefined, id: string | undefined, modelId: string | undefined);
+		constructor(prompt: string, command: string | undefined, references: ChatPromptReference[], participant: string, toolReferences: ChatLanguageModelToolReference[], editedFileEvents: ChatRequestEditedFileEvent[] | undefined, id: string | undefined);
 	}
 
 	export class ChatResponseTurn2 {
@@ -267,6 +262,8 @@ declare module 'vscode' {
 
 	export interface LanguageModelToolInvocationOptions<T> {
 		chatRequestId?: string;
+		/** @deprecated Use {@link chatSessionResource} instead */
+		chatSessionId?: string;
 		chatSessionResource?: Uri;
 		chatInteractionId?: string;
 		terminalCommand?: string;
@@ -292,6 +289,8 @@ declare module 'vscode' {
 		 */
 		input: T;
 		chatRequestId?: string;
+		/** @deprecated Use {@link chatSessionResource} instead */
+		chatSessionId?: string;
 		chatSessionResource?: Uri;
 		chatInteractionId?: string;
 		/**

src/@types/vscode.proposed.chatSessionsProvider.d.ts

@@ -35,8 +35,6 @@ declare module 'vscode' {
 		/**
 		 * Registers a new {@link ChatSessionItemProvider chat session item provider}.
 		 *
-		 * @deprecated Use {@linkcode createChatSessionItemController} instead.
-		 *
 		 * To use this, also make sure to also add `chatSessions` contribution in the `package.json`.
 		 *
 		 * @param chatSessionType The type of chat session the provider is for.
@@ -48,21 +46,12 @@ declare module 'vscode' {
 
 		/**
 		 * Creates a new {@link ChatSessionItemController chat session item controller} with the given unique identifier.
-		 *
-		 * To use this, also make sure to also add `chatSessions` contribution in the `package.json`.
-		 *
-		 * @param chatSessionType The type of chat session the provider is for.
-		 * @param refreshHandler The controller's {@link ChatSessionItemController.refreshHandler refresh handler}.
-		 *
-		 * @returns A new controller instance that can be used to manage chat session items for the given chat session type.
 		 */
-		export function createChatSessionItemController(chatSessionType: string, refreshHandler: ChatSessionItemControllerRefreshHandler): ChatSessionItemController;
+		export function createChatSessionItemController(id: string, refreshHandler: (token: CancellationToken) => Thenable<void>): ChatSessionItemController;
 	}
 
 	/**
 	 * Provides a list of information about chat sessions.
-	 *
-	 * @deprecated Use {@linkcode ChatSessionItemController} instead.
 	 */
 	export interface ChatSessionItemProvider {
 		/**
@@ -88,21 +77,7 @@ declare module 'vscode' {
 	}
 
 	/**
-	 * Extension callback invoked to refresh the collection of chat session items for a {@linkcode ChatSessionItemController}.
-	 */
-	export type ChatSessionItemControllerRefreshHandler = (token: CancellationToken) => Thenable<void>;
-
-	export interface ChatSessionItemControllerNewItemHandlerContext {
-		readonly request: ChatRequest;
-	}
-
-	/**
-	 * Extension callback invoked when a new chat session is started.
-	 */
-	export type ChatSessionItemControllerNewItemHandler = (context: ChatSessionItemControllerNewItemHandlerContext, token: CancellationToken) => Thenable<ChatSessionItem>;
-
-	/**
-	 * Manages chat sessions for a specific chat session type
+	 * Provides a list of information about chat sessions.
 	 */
 	export interface ChatSessionItemController {
 		readonly id: string;
@@ -118,7 +93,7 @@ declare module 'vscode' {
 		readonly items: ChatSessionItemCollection;
 
 		/**
-		 * Creates a new managed chat session item that can be added to the collection.
+		 * Creates a new managed chat session item that be added to the collection.
 		 */
 		createChatSessionItem(resource: Uri, label: string): ChatSessionItem;
 
@@ -127,16 +102,7 @@ declare module 'vscode' {
 		 *
 		 * This is also called on first load to get the initial set of items.
 		 */
-		readonly refreshHandler: ChatSessionItemControllerRefreshHandler;
-
-		/**
-		 * Invoked when a new chat session is started.
-		 *
-		 * This allows the controller to initialize the chat session item with information from the initial request.
-		 *
-		 * The returned chat session is added to the collection and shown in the UI.
-		 */
-		newChatSessionItemHandler?: ChatSessionItemControllerNewItemHandler;
+		readonly refreshHandler: (token: CancellationToken) => Thenable<void>;
 
 		/**
 		 * Fired when an item's archived state changes.
@@ -155,8 +121,7 @@ declare module 'vscode' {
 
 		/**
 		 * Replaces the items stored by the collection.
-		 *
-		 * @param items Items to store. If two items have the same resource URI, the last one will be used.
+		 * @param items Items to store.
 		 */
 		replace(items: readonly ChatSessionItem[]): void;
 
@@ -171,42 +136,31 @@ declare module 'vscode' {
 		/**
 		 * Adds the chat session item to the collection. If an item with the same resource URI already
 		 * exists, it'll be replaced.
-		 *
 		 * @param item Item to add.
 		 */
 		add(item: ChatSessionItem): void;
 
 		/**
 		 * Removes a single chat session item from the collection.
-		 *
 		 * @param resource Item resource to delete.
 		 */
 		delete(resource: Uri): void;
 
 		/**
 		 * Efficiently gets a chat session item by resource, if it exists, in the collection.
-		 *
 		 * @param resource Item resource to get.
-		 *
 		 * @returns The found item or undefined if it does not exist.
 		 */
 		get(resource: Uri): ChatSessionItem | undefined;
 	}
 
-	/**
-	 * A chat session show in the UI.
-	 *
-	 * This should be created by calling a {@link ChatSessionItemController.createChatSessionItem createChatSessionItem}
-	 * method on the controller. The item can then be added to the controller's {@link ChatSessionItemController.items items collection}
-	 * to show it in the UI.
-	 */
 	export interface ChatSessionItem {
 		/**
 		 * The resource associated with the chat session.
 		 *
 		 * This is uniquely identifies the chat session and is used to open the chat session.
 		 */
-		readonly resource: Uri;
+		resource: Uri;
 
 		/**
 		 * Human readable name of the session shown in the UI
@@ -346,15 +300,6 @@ declare module 'vscode' {
 	}
 
 	export interface ChatSession {
-		/**
-		 * An optional title for the chat session.
-		 *
-		 * When provided, this title is used as the display name for the session
-		 * (e.g. in the editor tab). When not provided, the title defaults to
-		 * the first user message in the session history.
-		 */
-		readonly title?: string;
-
 		/**
 		 * The full history of the session
 		 *
@@ -390,7 +335,6 @@ declare module 'vscode' {
 		 */
 		// TODO: Should we introduce our own type for `ChatRequestHandler` since not all field apply to chat sessions?
 		// TODO: Revisit this to align with code.
-		// TODO: pass in options?
 		readonly requestHandler: ChatRequestHandler | undefined;
 	}
 
@@ -456,8 +400,9 @@ declare module 'vscode' {
 
 		/**
 		 * Called as soon as you register (call me once)
+		 * @param token
 		 */
-		provideChatSessionProviderOptions?(token: CancellationToken): Thenable<ChatSessionProviderOptions>;
+		provideChatSessionProviderOptions?(token: CancellationToken): Thenable<ChatSessionProviderOptions | ChatSessionProviderOptions>;
 	}
 
 	export interface ChatSessionOptionUpdate {
@@ -490,15 +435,7 @@ declare module 'vscode' {
 
 	export interface ChatSessionContext {
 		readonly chatSessionItem: ChatSessionItem; // Maps to URI of chat session editor (could be 'untitled-1', etc..)
-
-		/** @deprecated This will be removed along with the concept of `untitled-` sessions.  */
 		readonly isUntitled: boolean;
-
-		/**
-		 * The initial option selections for the session, provided with the first request.
-		 * Contains the options the user selected (or defaults) before the session was created.
-		 */
-		readonly initialSessionOptions?: ReadonlyArray<{ optionId: string; value: string | ChatSessionProviderOptionItem }>;
 	}
 
 	export interface ChatSessionCapabilities {
@@ -614,13 +551,6 @@ declare module 'vscode' {
 		 * Provider-defined option groups (0-2 groups supported).
 		 * Examples: models picker, sub-agents picker, etc.
 		 */
-		readonly optionGroups?: readonly ChatSessionProviderOptionGroup[];
-
-		/**
-		 * The set of default options used for new chat sessions, provided as key-value pairs.
-		 *
-		 * Keys correspond to option group IDs (e.g., 'models', 'subagents').
-		 */
-		readonly newSessionOptions?: Record<string, string | ChatSessionProviderOptionItem>;
+		optionGroups?: ChatSessionProviderOptionGroup[];
 	}
 }

src/github/prComment.ts

@@ -175,7 +175,7 @@ export class TemporaryComment extends CommentBase {
 		this.mode = vscode.CommentMode.Preview;
 		this.originalAuthor = {
 			name: currentUser.specialDisplayName ?? currentUser.login,
-			iconPath: currentUser.avatarUrl ? vscode.Uri.parse(`${currentUser.avatarUrl}&s=64`) : undefined,
+			iconPath: currentUser.avatarUrl && DataUri.isGitHubDotComAvatar(currentUser.avatarUrl) ? vscode.Uri.parse(`${currentUser.avatarUrl}&s=64`) : undefined,
 		};
 		this.label = isDraft ? vscode.l10n.t('Pending') : undefined;
 		this.state = isDraft ? vscode.CommentState.Draft : vscode.CommentState.Published;
@@ -238,12 +238,12 @@ export class GHPRComment extends CommentBase {
 		this.rawComment = comment;
 		this.originalAuthor = {
 			name: comment.user?.specialDisplayName ?? comment.user!.login,
-			iconPath: comment.user && comment.user.avatarUrl ? vscode.Uri.parse(comment.user.avatarUrl) : undefined,
+			iconPath: comment.user && comment.user.avatarUrl && DataUri.isGitHubDotComAvatar(comment.user.avatarUrl) ? vscode.Uri.parse(comment.user.avatarUrl) : undefined,
 		};
 		const url = vscode.Uri.parse(comment.url);
 		this.githubRepository = githubRepositories?.find(repo => repo.remote.host === url.authority);
 
-		const avatarUrisPromise = comment.user ? DataUri.avatarCirclesAsImageDataUris(context, [comment.user], 28, 28) : Promise.resolve([]);
+		const avatarUrisPromise = (comment.user && DataUri.isGitHubDotComAvatar(comment.user.avatarUrl)) ? DataUri.avatarCirclesAsImageDataUris(context, [comment.user], 28, 28) : Promise.resolve([]);
 		this.doSetBody(comment.body, !comment.user).then(async () => { // only refresh if there's no user. If there's a user, we'll refresh in the then.
 			const avatarUris = await avatarUrisPromise;
 			if (avatarUris.length > 0) {

src/github/utils.ts

@@ -104,6 +104,10 @@ export function threadRange(startLine: number, endLine: number, endCharacter?: n
 export async function setReplyAuthor(thread: vscode.CommentThread | vscode.CommentThread2, currentUser: IAccount, context: vscode.ExtensionContext) {
 	if (currentUser.avatarUrl) {
 		const thread2 = thread as vscode.CommentThread2;
+		if (!DataUri.isGitHubDotComAvatar(currentUser.avatarUrl)) {
+			thread2.canReply = { name: currentUser.name ?? currentUser.login, iconPath: undefined };
+			return;
+		}
 		thread2.canReply = { name: currentUser.name ?? currentUser.login, iconPath: vscode.Uri.parse(currentUser.avatarUrl) };
 		const uri = await DataUri.avatarCirclesAsImageDataUris(context, [currentUser], 28, 28);
 		thread2.canReply = { name: currentUser.name ?? currentUser.login, iconPath: uri[0] };