sessions: preserve recorded PR titles in editor chat

Carry pull request artifact labels into regular editor and panel pill dropdowns, accessible names, and compact tooltips to match the Agents Window.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: chryw

src/vs/sessions/contrib/chat/browser/sessionChatInputToolbar.ts

@@ -112,6 +112,7 @@ export function buildSessionPullRequestSections(pullRequests: readonly IResolved
 			})],
 			...getChatPillResourceLocation(ref.uri, label),
 			ariaDescription: localize('sessionChatPills.pullRequestDescription', "{0}. {1}", stateDescription, ref.uri.toString(true)),
+			...(!pullRequest && ref.title ? { tooltip: `${label}\n${ref.uri.toString(true)}` } : {}),
 			...(pullRequest ? {
 				pillHover: {
 					element: () => createPullRequestHoverElement({

src/vs/sessions/contrib/chat/test/browser/sessionChatInputToolbar.test.ts

@@ -155,6 +155,7 @@ suite('SessionChatInputToolbar', () => {
 			repo: 'vscode',
 			number: 332982,
 			uri: URI.parse('https://github.com/microsoft/vscode/pull/332982'),
+			title: 'Recorded pull request title',
 		};
 		const pullRequest: IGitHubPullRequest = {
 			number: pullRequestRef.number,
@@ -236,11 +237,15 @@ suite('SessionChatInputToolbar', () => {
 
 		assert.deepStrictEqual({
 			pullRequest: {
+				label: pullRequestEntry?.label,
 				className: pullRequestHover?.className,
 				repository: pullRequestHover?.querySelector('.sessions-pr-hover-repository')?.textContent,
 				title: pullRequestHover?.querySelector('.sessions-pr-hover-title')?.textContent,
 				description: pullRequestHover?.querySelector('.sessions-pr-hover-description-content')?.textContent,
 				branches: [...pullRequestHover?.querySelectorAll('.sessions-pr-hover-branch') ?? []].map(element => element.textContent),
+				unresolvedLabel: unresolvedPullRequestEntry?.label,
+				unresolvedAriaLabel: unresolvedPullRequestEntry?.ariaLabel,
+				unresolvedTooltip: unresolvedPullRequestEntry?.tooltip,
 				unresolvedHover: unresolvedPullRequestEntry?.pillHover,
 			},
 			issue: {
@@ -257,11 +262,15 @@ suite('SessionChatInputToolbar', () => {
 			},
 		}, {
 			pullRequest: {
+				label: 'Pull Request #332982: Restore rich pill hovers',
 				className: 'sessions-pr-hover',
 				repository: 'microsoft/vscode',
 				title: 'Restore rich pill hovers',
 				description: 'Provides detailed pull request context.',
 				branches: ['main', 'feature/rich-hover'],
+				unresolvedLabel: 'Pull Request #332982: Recorded pull request title',
+				unresolvedAriaLabel: 'Open Pull Request #332982: Recorded pull request title',
+				unresolvedTooltip: 'Pull Request #332982: Recorded pull request title\nhttps://github.com/microsoft/vscode/pull/332982',
 				unresolvedHover: undefined,
 			},
 			issue: {

src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostSessionInputPills.ts

@@ -67,6 +67,7 @@ const artifactSectionOrder: readonly { readonly type: SessionArtifactType; reado
 
 export interface IAgentHostSessionPillMetadata {
 	readonly pullRequestUrls: readonly string[];
+	readonly pullRequestTitles: ReadonlyMap<string, string>;
 	readonly issueUrls: readonly string[];
 	readonly issueTitles: ReadonlyMap<string, string>;
 	readonly artifacts: readonly ISessionArtifact[];
@@ -112,16 +113,18 @@ function isPromotedArtifact(artifact: ISessionArtifact, type: SessionArtifactTyp
 export function getAgentHostSessionPillMetadata(meta: SessionSummaryMeta | undefined): IAgentHostSessionPillMetadata {
 	const entries = readSessionArtifactsNewestFirst(meta);
 	const github = readSessionGitHubState(meta);
-	const artifactPullRequests = entries.filter(entry => isPromotedArtifact(entry, SessionArtifactType.PullRequest)).map(entry => entry.link);
+	const artifactPullRequests = entries.filter(entry => isPromotedArtifact(entry, SessionArtifactType.PullRequest));
 	const artifactIssues = entries.filter(entry => isPromotedArtifact(entry, SessionArtifactType.Issue));
 	// Recorded pull requests lead discovered ones, as in the Agents Window.
-	const pullRequestUrls = dedupeLinks(artifactPullRequests, getSessionRelatedPullRequestUrls(github));
+	const pullRequestUrls = dedupeLinks(artifactPullRequests.map(entry => entry.link), getSessionRelatedPullRequestUrls(github));
+	const pullRequestTitles = new Map(artifactPullRequests.map(entry => [linkKey(entry.link), entry.label]));
 	const issueUrls = dedupeLinks(artifactIssues.map(entry => entry.link));
 	const issueTitles = new Map(artifactIssues.map(entry => [linkKey(entry.link), entry.label]));
 	const promotedLinks = new Set([...pullRequestUrls, ...issueUrls].map(linkKey));
 	const remaining = entries.filter(entry => !entry.link || !promotedLinks.has(linkKey(entry.link)));
 	return {
 		pullRequestUrls,
+		pullRequestTitles,
 		issueUrls,
 		issueTitles,
 		artifacts: remaining.filter(entry => entry.isArtifact),
@@ -210,16 +213,21 @@ function parseUri(value: string | undefined): URI | undefined {
 function referenceLabel(link: string, kind: 'pullRequest' | 'issue', title?: string): string {
 	const resource = parseUri(link);
 	const number = resource ? githubReferenceNumber(resource, kind) : undefined;
-	if (kind === 'pullRequest') {
-		return number
-			? localize('agentHostSessionPills.pullRequest.number', "Pull Request #{0}", number)
-			: localize('agentHostSessionPills.pullRequest', "Pull Request");
-	}
 	if (title) {
+		if (kind === 'pullRequest') {
+			return number
+				? localize('agentHostSessionPills.pullRequest.numberWithTitle', "Pull Request #{0}: {1}", number, title)
+				: title;
+		}
 		return number
 			? localize('agentHostSessionPills.issue.numberWithTitle', "Issue #{0}: {1}", number, title)
 			: title;
 	}
+	if (kind === 'pullRequest') {
+		return number
+			? localize('agentHostSessionPills.pullRequest.number', "Pull Request #{0}", number)
+			: localize('agentHostSessionPills.pullRequest', "Pull Request");
+	}
 	return number
 		? localize('agentHostSessionPills.issue.number', "Issue #{0}", number)
 		: localize('agentHostSessionPills.issue', "Issue");
@@ -353,7 +361,10 @@ export class AgentHostSessionInputPills extends Disposable {
 				: new Set();
 		});
 
-		const pullRequestSections = derived(this, reader => this._buildReferenceSections(metadata.read(reader).pullRequestUrls, 'pullRequest', gitHubState.read(reader)));
+		const pullRequestSections = derived(this, reader => {
+			const currentMetadata = metadata.read(reader);
+			return this._buildReferenceSections(currentMetadata.pullRequestUrls, 'pullRequest', gitHubState.read(reader), currentMetadata.pullRequestTitles);
+		});
 		const pullRequestIcon = derived(this, reader => {
 			const icons = getChatPillEntries(pullRequestSections.read(reader)).map(entry => entry.icon);
 			return getHighestPriorityPullRequestIcon(icons) ?? computePullRequestIcon('open');
@@ -445,7 +456,7 @@ export class AgentHostSessionInputPills extends Disposable {
 					run: () => this._clipboardService.writeText(resource.toString(true)),
 				})],
 				...getChatPillResourceLocation(resource, label),
-				...(kind === 'issue' && title ? { tooltip: `${label}\n${resource.toString(true)}` } : {}),
+				...(title ? { tooltip: `${label}\n${resource.toString(true)}` } : {}),
 				open: () => this._openExternal(resource),
 			};
 		}).filter(isDefined);

src/vs/workbench/contrib/chat/test/browser/agentHost/agentHostSessionInputPills.test.ts

@@ -12,6 +12,7 @@ import { mock, upcastPartial } from '../../../../../../base/test/common/mock.js'
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
 import { IAgentHostConnectionsService } from '../../../../../../platform/agentHost/common/agentHostConnectionsService.js';
 import { IAgentConnection } from '../../../../../../platform/agentHost/common/agentService.js';
+import { IActionWidgetService } from '../../../../../../platform/actionWidget/browser/actionWidget.js';
 import { ChangesetKind } from '../../../../../../platform/agentHost/common/changesetUri.js';
 import { IAgentSubscription } from '../../../../../../platform/agentHost/common/state/agentSubscription.js';
 import { ISessionArtifact, SessionArtifactType, withSessionArtifacts } from '../../../../../../platform/agentHost/common/sessionArtifacts.js';
@@ -66,6 +67,18 @@ class StaticAgentConnection extends mock<IAgentConnection>() {
 	}
 }
 
+class TestOpenerService extends mock<IOpenerService>() {
+	readonly opened: { readonly resource: URI; readonly openExternal: boolean | undefined }[] = [];
+
+	override async open(resource: URI | string, options?: Parameters<IOpenerService['open']>[1]): Promise<boolean> {
+		this.opened.push({
+			resource: typeof resource === 'string' ? URI.parse(resource) : resource,
+			openExternal: options && 'openExternal' in options ? options.openExternal : undefined,
+		});
+		return true;
+	}
+}
+
 suite('AgentHostSessionInputPills', () => {
 	const store = ensureNoDisposablesAreLeakedInTestSuite();
 
@@ -89,6 +102,7 @@ suite('AgentHostSessionInputPills', () => {
 
 		assert.deepStrictEqual({
 			pullRequestUrls: metadata.pullRequestUrls,
+			pullRequestTitles: [...metadata.pullRequestTitles],
 			issueUrls: metadata.issueUrls,
 			issueTitles: [...metadata.issueTitles],
 			artifactIds: metadata.artifacts.map(artifact => artifact.id),
@@ -98,6 +112,7 @@ suite('AgentHostSessionInputPills', () => {
 				'https://github.com/microsoft/vscode/pull/2',
 				'https://github.com/microsoft/vscode/pull/1',
 			],
+			pullRequestTitles: [['https://github.com/microsoft/vscode/pull/2', 'Created PR']],
 			issueUrls: ['https://github.com/microsoft/vscode/issues/3'],
 			issueTitles: [['https://github.com/microsoft/vscode/issues/3', 'Created Issue']],
 			artifactIds: ['website'],
@@ -122,6 +137,7 @@ suite('AgentHostSessionInputPills', () => {
 
 		assert.deepStrictEqual({
 			pullRequestUrls: metadata.pullRequestUrls,
+			pullRequestTitles: [...metadata.pullRequestTitles],
 			issueUrls: metadata.issueUrls,
 			issueTitles: [...metadata.issueTitles],
 			artifactIds: metadata.artifacts.map(artifact => artifact.id),
@@ -131,6 +147,10 @@ suite('AgentHostSessionInputPills', () => {
 				'https://github.com/microsoft/vscode/pull/2',
 				'https://github.com/microsoft/vscode/pull/1',
 			],
+			pullRequestTitles: [
+				['https://github.com/microsoft/vscode/pull/2', 'New PR'],
+				['https://github.com/microsoft/vscode/pull/1', 'Old PR'],
+			],
 			issueUrls: [
 				'https://github.com/microsoft/vscode/issues/2',
 				'https://github.com/microsoft/vscode/issues/1',
@@ -144,23 +164,43 @@ suite('AgentHostSessionInputPills', () => {
 		});
 	});
 
-	test('renders recorded issue titles in editor and panel pills', () => {
+	test('renders recorded GitHub titles in editor and panel pills', () => {
 		const instantiationService = workbenchInstantiationService(undefined, store);
 		const sessionResource = URI.parse('agent-host-copilot:/session');
 		const backendSession = URI.parse('copilot:/session');
 		const issueUrl = 'https://github.com/microsoft/vscode/issues/335383';
+		const firstPullRequestUrl = 'https://github.com/microsoft/vscode/pull/335387';
+		const secondPullRequestUrl = 'https://github.com/microsoft/vscode/pull/332982';
 		const connection = new StaticAgentConnection(new Map<StateComponents, SessionState | ChangesetState>([
 			[StateComponents.Session, {
 				defaultChat: buildDefaultChatUri(backendSession),
 				chats: [],
-				_meta: withSessionArtifacts(undefined, [{
-					id: 'issue',
-					type: SessionArtifactType.Issue,
-					label: 'Agent Window issue pill discards the recorded issue title',
-					link: issueUrl,
-					isGitHub: true,
-					isArtifact: true,
-				}]),
+				_meta: withSessionArtifacts(undefined, [
+					{
+						id: 'issue',
+						type: SessionArtifactType.Issue,
+						label: 'Agent Window issue pill discards the recorded issue title',
+						link: issueUrl,
+						isGitHub: true,
+						isArtifact: true,
+					},
+					{
+						id: 'first-pr',
+						type: SessionArtifactType.PullRequest,
+						label: 'sessions: preserve recorded issue titles in pills',
+						link: firstPullRequestUrl,
+						isGitHub: true,
+						isArtifact: true,
+					},
+					{
+						id: 'second-pr',
+						type: SessionArtifactType.PullRequest,
+						label: 'Chat: unify Agent Host status pills across chat surfaces',
+						link: secondPullRequestUrl,
+						isGitHub: true,
+						isArtifact: true,
+					},
+				]),
 			} as unknown as SessionState],
 		]));
 		const persistentContent = document.createElement('div');
@@ -187,18 +227,22 @@ suite('AgentHostSessionInputPills', () => {
 		});
 		const visibility = store.add(instantiationService.createInstance(SessionChatPillVisibility));
 		instantiationService.stub(ISessionChatPillVisibilityService, visibility);
+		let dropdownLabels: readonly string[] = [];
+		instantiationService.stub(IActionWidgetService, upcastPartial<IActionWidgetService>({
+			isVisible: false,
+			show: (_user, _supportsPreview, items) => {
+				dropdownLabels = items.map(item => item.label ?? '');
+			},
+			hide: () => { },
+			updateItems: () => { },
+			focusItemById: () => { },
+		}));
 		const [clipboardService, configurationService, editorService] = instantiationService.invokeFunction(accessor => [
 			accessor.get(IClipboardService),
 			accessor.get(IConfigurationService),
 			accessor.get(IEditorService),
 		] as const);
-		const opened: { readonly resource: URI; readonly openExternal: boolean | undefined }[] = [];
-		const openerService = upcastPartial<IOpenerService>({
-			open: async (resource, options) => {
-				opened.push({ resource, openExternal: options?.openExternal });
-				return true;
-			},
-		});
+		const openerService = new TestOpenerService();
 
 		store.add(new AgentHostSessionInputPills(
 			widget,
@@ -213,17 +257,37 @@ suite('AgentHostSessionInputPills', () => {
 			visibility,
 		));
 
-		const button = persistentContent.querySelector<HTMLElement>('.chat-dropdown-pill-button');
-		button?.click();
+		const buttons = [...persistentContent.querySelectorAll<HTMLElement>('.chat-dropdown-pill-button')];
+		const [pullRequestButton, issueButton] = buttons;
+		pullRequestButton?.click();
+		issueButton?.click();
 		assert.deepStrictEqual({
-			label: button?.querySelector('.chat-pill-label')?.textContent,
-			ariaLabel: button?.getAttribute('aria-label'),
-			ariaDescription: button?.getAttribute('aria-description'),
-			opened: opened.map(({ resource, openExternal }) => ({ resource: resource.toString(true), openExternal })),
+			pullRequests: {
+				label: pullRequestButton?.querySelector('.chat-pill-label')?.textContent,
+				ariaLabel: pullRequestButton?.getAttribute('aria-label'),
+				dropdownLabels,
+			},
+			issue: {
+				label: issueButton?.querySelector('.chat-pill-label')?.textContent,
+				ariaLabel: issueButton?.getAttribute('aria-label'),
+				ariaDescription: issueButton?.getAttribute('aria-description'),
+			},
+			opened: openerService.opened.map(({ resource, openExternal }) => ({ resource: resource.toString(true), openExternal })),
 		}, {
-			label: 'Issue #335383: Agent Window issue pill discards the recorded issue title',
-			ariaLabel: 'Open Issue #335383: Agent Window issue pill discards the recorded issue title',
-			ariaDescription: issueUrl,
+			pullRequests: {
+				label: '2 Pull Requests',
+				ariaLabel: 'Show 2 pull requests',
+				dropdownLabels: [
+					'Pull Requests',
+					'Pull Request #332982: Chat: unify Agent Host status pills across chat surfaces',
+					'Pull Request #335387: sessions: preserve recorded issue titles in pills',
+				],
+			},
+			issue: {
+				label: 'Issue #335383: Agent Window issue pill discards the recorded issue title',
+				ariaLabel: 'Open Issue #335383: Agent Window issue pill discards the recorded issue title',
+				ariaDescription: issueUrl,
+			},
 			opened: [{ resource: issueUrl, openExternal: true }],
 		});
 	});
@@ -575,13 +639,7 @@ suite('AgentHostSessionInputPills', () => {
 			accessor.get(IConfigurationService),
 			accessor.get(IEditorService),
 		] as const);
-		const opened: { readonly resource: URI; readonly openExternal: boolean | undefined }[] = [];
-		const openerService = upcastPartial<IOpenerService>({
-			open: async (resource, options) => {
-				opened.push({ resource, openExternal: options?.openExternal });
-				return true;
-			},
-		});
+		const openerService = new TestOpenerService();
 
 		store.add(new AgentHostSessionInputPills(
 			widget,
@@ -632,7 +690,7 @@ suite('AgentHostSessionInputPills', () => {
 			multiple,
 			filteredLabel,
 			single,
-			opened: opened.map(({ resource, openExternal }) => ({ resource: resource.toString(true), openExternal })),
+			opened: openerService.opened.map(({ resource, openExternal }) => ({ resource: resource.toString(true), openExternal })),
 			filteredOnly: persistentContent.querySelector('.chat-dropdown-pill-button'),
 			canConfigure: persistentContent.querySelector('.chat-pills-row')?.classList.contains('empty'),
 		}, {