Don't try to show enterprise avatars

Author: alexr00

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

@@ -248,6 +248,8 @@ declare module 'vscode' {
 		toolResultMessage?: string | MarkdownString;
 		toolResultDetails?: Array<Uri | Location>;
 		toolMetadata?: unknown;
+		/** Whether there was an error calling the tool. The tool may still have partially succeeded. */
+		hasError?: boolean;
 	}
 
 	// #region Chat participant detection

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

@@ -152,11 +152,13 @@ declare module 'vscode' {
 
 		/**
 		 * Options configured for this session as key-value pairs.
-		 * Keys correspond to option group IDs (e.g., 'models', 'subagents')
-		 * and values are the selected option item IDs.
+		 * Keys correspond to option group IDs (e.g., 'models', 'subagents').
+		 * Values can be either:
+		 * - A string (the option item ID) for backwards compatibility
+		 * - A ChatSessionProviderOptionItem object to include metadata like locked state
 		 * TODO: Strongly type the keys
 		 */
-		readonly options?: Record<string, string>;
+		readonly options?: Record<string, string | ChatSessionProviderOptionItem>;
 
 		/**
 		 * Callback invoked by the editor for a currently running response. This allows the session to push items for the
@@ -245,10 +247,6 @@ declare module 'vscode' {
 
 	export interface ChatContext {
 		readonly chatSessionContext?: ChatSessionContext;
-		readonly chatSummary?: {
-			readonly prompt?: string;
-			readonly history?: string;
-		};
 	}
 
 	export interface ChatSessionContext {
@@ -276,6 +274,13 @@ declare module 'vscode' {
 		 * Human-readable name displayed in the UI.
 		 */
 		readonly name: string;
+
+		/**
+		 * When true, this option is locked and cannot be changed by the user.
+		 * The option will still be visible in the UI but will be disabled.
+		 * Use this when an option is set but cannot be hot-swapped (e.g., model already initialized).
+		 */
+		readonly locked?: boolean;
 	}
 
 	/**

src/common/uri.ts

@@ -324,9 +324,11 @@ export namespace DataUri {
 					if (!response.ok) {
 						throw new Error(`HTTP ${response.status}: ${response.statusText}`);
 					}
-					const buffer = await response.arrayBuffer();
-					await writeAvatarToCache(context, user, new Uint8Array(buffer));
-					innerImageContents = Buffer.from(buffer);
+					if (response.headers.get('content-type')?.startsWith('image/')) {
+						const buffer = await response.arrayBuffer();
+						await writeAvatarToCache(context, user, new Uint8Array(buffer));
+						innerImageContents = Buffer.from(buffer);
+					}
 				};
 				try {
 					await doFetch();

src/github/copilotRemoteAgent.ts

@@ -163,8 +163,8 @@ export class CopilotRemoteAgentManager extends Disposable {
 			/* Generate new coding agent session from an 'untitled' session */
 			const number = await startSession(
 				'untitledChatSession',
-				context.chatSummary?.prompt ?? request.prompt,
-				context.chatSummary?.history,
+				request.prompt,
+				undefined,
 				request.references
 			);
 			if (!number) {
@@ -239,8 +239,8 @@ export class CopilotRemoteAgentManager extends Disposable {
 				{
 					step: 'create',
 					metadata: {
-						prompt: context.chatSummary?.prompt ?? request.prompt,
-						history: context.chatSummary?.history,
+						prompt: request.prompt,
+						history: undefined,
 						references: request.references,
 					}
 				},

webviews/components/user.tsx

@@ -9,7 +9,7 @@ import { IAccount, IActor, ITeam, reviewerLabel } from '../../src/github/interfa
 
 const InnerAvatar = ({ for: author }: { for: Partial<IAccount> }) => (
 	<>
-		{author.avatarUrl ? (
+		{author.avatarUrl && author.avatarUrl.includes('githubusercontent.com') ? (
 			<img className="avatar" src={author.avatarUrl} alt="" role="presentation" aria-hidden="true"/>
 		) : (
 			<Icon className="avatar-icon" src={require('../../resources/icons/dark/github.svg')} />