Changes before error encountered

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

Author: Copilot

package.json

@@ -1990,6 +1990,10 @@
 					"command": "pr.dismissNotification",
 					"when": "false"
 				},
+				{
+					"command": "pr.markAllCopilotNotificationsAsRead",
+					"when": "false"
+				},
 				{
 					"command": "pr.resetViewedFiles",
 					"when": "github:inReviewMode"
@@ -2781,6 +2785,7 @@
 				{
 					"command": "pr.markAllCopilotNotificationsAsRead",
 					"when": "view == pr:github && viewItem =~ /copilot-query/",
+					"enablement": "viewItem == copilot-query-with-notifications",
 					"group": "0_category@1"
 				},
 				{

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

@@ -3,6 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+// version: 2
+
 declare module 'vscode' {
 	/**
 	 * Represents the status of a chat session.
@@ -34,6 +36,13 @@ declare module 'vscode' {
 		readonly onDidChangeChatSessionItems: Event<void>;
 
 		/**
+		 * Event that the provider can fire to signal that the current (original) chat session should be replaced with a new (modified) chat session.
+		 * The UI can use this information to gracefully migrate the user to the new session.
+		 */
+		readonly onDidCommitChatSessionItem: Event<{ original: ChatSessionItem /** untitled */; modified: ChatSessionItem /** newly created */ }>;
+
+		/**
+		 * DEPRECATED: Will be removed!
 		 * Creates a new chat session.
 		 *
 		 * @param options Options for the new session including an optional initial prompt and history
@@ -46,16 +55,6 @@ declare module 'vscode' {
 			 */
 			readonly request: ChatRequest;
 
-			/**
-			 * Initial prompt to initiate the session
-			 */
-			readonly prompt?: string;
-
-			/**
-			 * History to initialize the session with
-			 */
-			readonly history?: ReadonlyArray<ChatRequestTurn | ChatResponseTurn>;
-
 			/**
 			 * Additional metadata to use for session creation
 			 */
@@ -190,7 +189,16 @@ declare module 'vscode' {
 		 *
 		 * @returns A disposable that unregisters the provider when disposed.
 		 */
-		export function registerChatSessionContentProvider(chatSessionType: string, provider: ChatSessionContentProvider, capabilities?: ChatSessionCapabilities): Disposable;
+		export function registerChatSessionContentProvider(chatSessionType: string, provider: ChatSessionContentProvider, chatParticipant: ChatParticipant, capabilities?: ChatSessionCapabilities): Disposable;
+	}
+
+	export interface ChatContext {
+		readonly chatSessionContext?: ChatSessionContext;
+	}
+
+	export interface ChatSessionContext {
+		readonly chatSessionItem: ChatSessionItem; // Maps to URI of chat session editor (could be 'untitled-1', etc..)
+		readonly isUntitled: boolean;
 	}
 
 	export interface ChatSessionCapabilities {

src/commands.ts

@@ -919,8 +919,9 @@ export function registerCommands(
 
 	context.subscriptions.push(
 		vscode.commands.registerCommand('pr.markAllCopilotNotificationsAsRead', node => {
-			if (node instanceof CategoryTreeNode && node.isCopilot) {
-				copilotRemoteAgentManager.clearAllNotifications();
+			if (node instanceof CategoryTreeNode && node.isCopilot && node.folderRepoManager.gitHubRepositories.length > 0) {
+				const repo = node.folderRepoManager.gitHubRepositories[0];
+				copilotRemoteAgentManager.clearAllNotifications(repo.remote.owner, repo.remote.repositoryName);
 				tree.refresh(node);
 			}
 		}),

src/github/copilotPrWatcher.ts

@@ -105,16 +105,34 @@ export class CopilotStateModel extends Disposable {
 		}
 	}
 
-	clearAllNotifications(): void {
+	clearAllNotifications(owner?: string, repo?: string): void {
 		if (this._showNotification.size > 0) {
 			const items: PullRequestModel[] = [];
-			for (const key of this._showNotification.keys()) {
-				const item = this._states.get(key)?.item;
-				if (item) {
-					items.push(item);
+			
+			// If owner and repo are specified, only clear notifications for that repo
+			if (owner && repo) {
+				const keysToRemove: string[] = [];
+				for (const key of this._showNotification.keys()) {
+					if (key.startsWith(`${owner}/${repo}#`)) {
+						const item = this._states.get(key)?.item;
+						if (item) {
+							items.push(item);
+						}
+						keysToRemove.push(key);
+					}
+				}
+				keysToRemove.forEach(key => this._showNotification.delete(key));
+			} else {
+				// Clear all notifications
+				for (const key of this._showNotification.keys()) {
+					const item = this._states.get(key)?.item;
+					if (item) {
+						items.push(item);
+					}
 				}
+				this._showNotification.clear();
 			}
-			this._showNotification.clear();
+			
 			if (items.length > 0) {
 				this._onDidChangeNotifications.fire(items);
 			}

src/github/copilotRemoteAgent.ts

@@ -747,8 +747,19 @@ export class CopilotRemoteAgentManager extends Disposable {
 		return this._stateModel.notifications.size;
 	}
 
-	public clearAllNotifications(): void {
-		this._stateModel.clearAllNotifications();
+	getNotificationsCountForRepo(owner: string, repo: string): number {
+		let count = 0;
+		const prefix = `${owner}/${repo}#`;
+		for (const key of this._stateModel.notifications.keys()) {
+			if (key.startsWith(prefix)) {
+				count++;
+			}
+		}
+		return count;
+	}
+
+	public clearAllNotifications(owner?: string, repo?: string): void {
+		this._stateModel.clearAllNotifications(owner, repo);
 	}
 
 	hasNotification(owner: string, repo: string, pullRequestNumber: number): boolean {

src/view/treeNodes/categoryNode.ts

@@ -327,6 +327,24 @@ export class CategoryTreeNode extends TreeNode implements vscode.TreeItem {
 
 	getTreeItem(): vscode.TreeItem {
 		this.description = this._getDescription();
+		
+		// Update contextValue based on current notification state
+		if (this._categoryQuery) {
+			const hasNotifications = this.isCopilot && this._hasNotificationsForRepo();
+			this.contextValue = this.isCopilot ? 
+				(hasNotifications ? 'copilot-query-with-notifications' : 'copilot-query') : 
+				'query';
+		}
+		
 		return this;
 	}
+
+	private _hasNotificationsForRepo(): boolean {
+		if (!this.isCopilot || this.folderRepoManager.gitHubRepositories.length === 0) {
+			return false;
+		}
+		
+		const repo = this.folderRepoManager.gitHubRepositories[0];
+		return this._copilotManager.getNotificationsCountForRepo(repo.remote.owner, repo.remote.repositoryName) > 0;
+	}
 }