chat: restore GitHub issue and PR context attachments (#334544)

* chat: restore GitHub issue and PR context attachments

Revert compact inline references for pasted GitHub issue and pull request URLs until attachment rendering is unified. Restore automatic context attachment synchronization in the Agents composer.\n\nRefs #334542\n\nCo-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* chat: attach pasted GitHub links as context

Keep pasted issue and pull request URLs in the prompt while adding context attachments in regular Chat. Share URL parsing with the Agents composer and preserve undo behavior.\n\nRefs #334548\n\nCo-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* chat: use semantic icons for GitHub context

Represent pasted GitHub links as generic context so issue and pull request pills render their respective Codicons without generic pasted-content chrome.\n\nRefs #334548\n\nCo-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* chat: preserve request link interactions

Reject invalid GitHub issue and pull request URL continuations, and keep nested request links keyboard- and pointer-operable when inline request editing is enabled.\n\nRefs #334548\n\nCo-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* test: avoid forwarding flatMap index as metadata

Wrap the GitHub attachment parser callback so Array.prototype.flatMap does not pass its numeric index into the optional metadata parameter.\n\nRefs #334548\n\nCo-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: meganrogge

src/vs/sessions/contrib/chat/browser/media/chatInput.css

@@ -145,10 +145,6 @@
 	background-color: var(--vscode-agentsChatInput-background) !important;
 }
 
-.sessions-chat-editor .monaco-editor .mtk1 {
-	color: var(--vscode-input-foreground);
-}
-
 /* Inline decoration highlights for the new-session input editor: slash commands,
  * onboarding prompt placeholders, `#file:` variable references, and agent-host
  * completion references. */

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

@@ -20,7 +20,6 @@ import type { IManagedHoverContent } from '../../../../base/browser/ui/hover/hov
 import { IMenuEntryActionViewItemOptions, MenuEntryActionViewItem } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
 import { CodeEditorWidget, ICodeEditorWidgetOptions } from '../../../../editor/browser/widget/codeEditor/codeEditorWidget.js';
 import { EditorExtensionsRegistry } from '../../../../editor/browser/editorExtensions.js';
-import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
 import { IEditorConstructionOptions } from '../../../../editor/browser/config/editorConfiguration.js';
 import { ITextModel } from '../../../../editor/common/model.js';
 import { IModelService } from '../../../../editor/common/services/model.js';
@@ -30,7 +29,6 @@ import { EditorOptions } from '../../../../editor/common/config/editorOptions.js
 import { SuggestController } from '../../../../editor/contrib/suggest/browser/suggestController.js';
 import { SnippetController2 } from '../../../../editor/contrib/snippet/browser/snippetController2.js';
 import { CopyPasteController } from '../../../../editor/contrib/dropOrPasteInto/browser/copyPasteController.js';
-import { LinkDetector } from '../../../../editor/contrib/links/browser/links.js';
 import { PlaceholderTextContribution } from '../../../../editor/contrib/placeholderText/browser/placeholderTextContribution.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { ContextKeyExpr, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
@@ -109,9 +107,8 @@ import { IChatStatusItemService } from '../../../../workbench/contrib/chat/brows
 import { handleTerminalCommandPaste, isTerminalCommandInput } from '../../../../workbench/contrib/chat/browser/chatTerminalCommandPaste.js';
 import { compactCodiconsIn } from '../../../../workbench/contrib/chat/browser/chatIcons.js';
 import { IChatPasteTargetService } from '../../../../workbench/contrib/chat/browser/chat.js';
-import { ChatDynamicVariableModel } from '../../../../workbench/contrib/chat/browser/attachments/chatDynamicVariables.js';
+import { getGitHubIssueOrPullRequestAttachments } from '../../../../workbench/contrib/chat/browser/widget/input/editor/chatPasteProviders.js';
 import { NewChatInputPasteTarget } from './newChatInputPasteTarget.js';
-import { registerChatInputReferenceDecorationType } from '../../../../workbench/contrib/chat/browser/widget/input/editor/chatInputReferenceDecorations.js';
 import { getChatSessionType } from '../../../../workbench/contrib/chat/common/model/chatUri.js';
 import { ChatSpeechToTextState, DictationSettingId, IChatSpeechToTextService } from '../../../../workbench/contrib/chat/browser/speechToText/chatSpeechToTextService.js';
 import { setupDictationMicGlow } from '../../../../workbench/contrib/chat/browser/speechToText/dictationMicGlow.js';
@@ -134,6 +131,7 @@ import { animatePromptTyping, IPromptTypingAnimation } from './promptTypingAnima
 import { PromptTemplatePlaceholderController } from './promptTemplatePlaceholder.js';
 import { INewSessionComposer, INewSessionPromptOptionsController, NEW_SESSION_PROMPT_TYPING_DURATION_MS, NewSessionPromptOptionsState, NewSessionWorkspacePreselectionSource } from './newSessionComposerService.js';
 import { NewSessionPromptOptionsWidget } from './newSessionPromptOptions.js';
+import { isInputGitHubContext, toInputGitHubContextMetadata } from '../common/newChatContextIds.js';
 
 
 const OPEN_OTEL_SETTINGS_COMMAND = 'github.copilot.chat.otel.openSettings';
@@ -213,13 +211,16 @@ KeybindingsRegistry.registerKeybindingRule({
 interface IDraftState {
 	inputText: string;
 	attachments: readonly IChatRequestVariableEntry[];
-	contrib?: Record<string, unknown>;
 }
 
 export function hasSendableNewChatContent(query: string, attachments: readonly IChatRequestVariableEntry[], hasAdditionalSendContent = false): boolean {
 	return !!query.trim() || attachments.some(isExplicitFileOrImageVariableEntry) || hasAdditionalSendContent;
 }
 
+function getInputGitHubContextAttachments(input: string): readonly IChatRequestVariableEntry[] {
+	return getGitHubIssueOrPullRequestAttachments(input, toInputGitHubContextMetadata());
+}
+
 class NewChatInputStatusActionViewItem extends MenuEntryActionViewItem {
 	private readonly hoverContentDisposables = this._register(new MutableDisposable<DisposableStore>());
 	private _container: HTMLElement | undefined;
@@ -448,7 +449,6 @@ export class NewChatInputWidget extends Disposable implements IHistoryNavigation
 	// Input
 	private _editor!: CodeEditorWidget;
 	private _editorContainer!: HTMLElement;
-	private _dynamicVariableModel!: ChatDynamicVariableModel;
 	private _sessionControlsContainer: HTMLElement | undefined;
 	private readonly _promptTemplatePlaceholder = this._register(new MutableDisposable<PromptTemplatePlaceholderController>());
 	private readonly _promptOptionsWidget = this._register(new MutableDisposable<NewSessionPromptOptionsWidget>());
@@ -524,7 +524,6 @@ export class NewChatInputWidget extends Disposable implements IHistoryNavigation
 		@IModelService private readonly modelService: IModelService,
 		@ITextModelService private readonly textModelService: ITextModelService,
 		@IChatPasteTargetService private readonly chatPasteTargetService: IChatPasteTargetService,
-		@ICodeEditorService private readonly codeEditorService: ICodeEditorService,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
 		@IContextKeyService private readonly contextKeyService: IContextKeyService,
 		@ILogService private readonly logService: ILogService,
@@ -551,7 +550,6 @@ export class NewChatInputWidget extends Disposable implements IHistoryNavigation
 		@ILanguageModelsService private readonly languageModelsService: ILanguageModelsService,
 	) {
 		super();
-		this._register(registerChatInputReferenceDecorationType(this.codeEditorService));
 		this._modelSelection = this._register(this.instantiationService.createInstance(SessionModelSelection, this.options.session));
 		this._canSendRequest = derived(this, reader => {
 			if (this.options.canSubmitWithoutSession?.read(reader)) {
@@ -896,6 +894,7 @@ export class NewChatInputWidget extends Disposable implements IHistoryNavigation
 		const editorOptions: IEditorConstructionOptions = {
 			...getSimpleEditorOptions(this.configurationService),
 			readOnly: false,
+			// Match the workbench chat input so the post-paste selector is offered.
 			pasteAs: EditorOptions.pasteAs.defaultValue,
 			ariaLabel: this._getAriaLabel(),
 			placeholder: this.options.placeholder ?? getRandomChatInputPlaceholder(),
@@ -932,7 +931,6 @@ export class NewChatInputWidget extends Disposable implements IHistoryNavigation
 				SnippetController2.ID,
 				PlaceholderTextContribution.ID,
 				CopyPasteController.ID,
-				LinkDetector.ID,
 			]),
 		};
 
@@ -1068,26 +1066,17 @@ export class NewChatInputWidget extends Disposable implements IHistoryNavigation
 			AgentHostInputCompletionHandler, this._editor, this._contextAttachments,
 		));
 
-		const contextAttachments = this._contextAttachments;
-		this._dynamicVariableModel = this._register(this._scopedInstantiationService.createInstance(ChatDynamicVariableModel, {
-			inputEditor: this._editor,
-			get attachments() { return contextAttachments.attachments; },
-			onDidChangeActiveInputEditor: Event.None,
-			onDidChangeAttachments: contextAttachments.onDidChangeContext,
-			refreshParsedInput: () => { },
-		}));
-		this._register(this._dynamicVariableModel.onDidChangeReferences(() => this._updateDraftState()));
 		this._register(this.chatPasteTargetService.registerTarget(textModel.uri, new NewChatInputPasteTarget(
 			this._editor,
 			this._contextAttachments,
 			this._agentHostInputCompletionHandler,
-			this._dynamicVariableModel,
 			() => this._getTerminalCommandPrefix(),
 			() => this.options.session.get()?.resource,
 			textModel.uri,
 		)));
 
 		this._register(this._editor.onDidChangeModelContent(() => {
+			this._syncInputGitHubContext();
 			this._updateDraftState();
 			this._updateSendButtonState();
 			this._updateEditorFontFamily();
@@ -1480,14 +1469,9 @@ export class NewChatInputWidget extends Disposable implements IHistoryNavigation
 	}
 
 	private _updateDraftState(): void {
-		const contrib: Record<string, unknown> = {};
-		if (this._dynamicVariableModel?.variables.length) {
-			this._dynamicVariableModel.getInputState(contrib);
-		}
 		this._draftState = {
 			inputText: this._editor?.getModel()?.getValue() ?? '',
 			attachments: [...this._contextAttachments.attachments],
-			...(Object.keys(contrib).length ? { contrib } : {}),
 		};
 	}
 
@@ -1499,13 +1483,32 @@ export class NewChatInputWidget extends Disposable implements IHistoryNavigation
 		this.saveState();
 	}
 
+	private _syncInputGitHubContext(): void {
+		const inputAttachments = getInputGitHubContextAttachments(this._editor?.getValue() ?? '');
+		const inputAttachmentIds = new Set(inputAttachments.map(attachment => attachment.id));
+		const attachments = this._contextAttachments.attachments.filter(attachment =>
+			!isInputGitHubContext(attachment) || inputAttachmentIds.has(attachment.id)
+		);
+		const attachmentIds = new Set(attachments.map(attachment => attachment.id));
+		for (const attachment of inputAttachments) {
+			if (!attachmentIds.has(attachment.id)) {
+				attachments.push(attachment);
+				attachmentIds.add(attachment.id);
+			}
+		}
+		if (attachments.length !== this._contextAttachments.attachments.length
+			|| attachments.some((attachment, index) => attachment !== this._contextAttachments.attachments[index])) {
+			this._contextAttachments.setAttachments(attachments);
+		}
+	}
+
 	private _toHistoryEntry(draft: IDraftState): IChatModelInputState {
 		return {
 			...draft,
 			mode: { id: ChatModeKind.Agent, kind: ChatModeKind.Agent },
 			selectedModel: undefined,
 			selections: [],
-			contrib: draft.contrib ?? {},
+			contrib: {},
 		};
 	}
 
@@ -1515,7 +1518,6 @@ export class NewChatInputWidget extends Disposable implements IHistoryNavigation
 		if (entry) {
 			this._editor?.getModel()?.setValue(inputText);
 			this._contextAttachments.setAttachments(entry.attachments);
-			this._dynamicVariableModel.setInputState(entry.contrib);
 		}
 		aria.status(inputText);
 		if (previous) {
@@ -1538,11 +1540,10 @@ export class NewChatInputWidget extends Disposable implements IHistoryNavigation
 
 	private async _send(background = false): Promise<boolean> {
 		const rawQuery = this._editor.getModel()?.getValue() ?? '';
-		const displayQuery = rawQuery.trim();
+		const query = rawQuery.trim();
 		const queryOffset = rawQuery.length - rawQuery.trimStart().length;
-		const query = this._dynamicVariableModel?.getPromptText(displayQuery, queryOffset) ?? displayQuery;
 		const hasAdditionalSendContent = this.options.hasAdditionalSendContent?.get() ?? false;
-		if (!hasSendableNewChatContent(displayQuery, this._contextAttachments.attachments, hasAdditionalSendContent) || this._sending) {
+		if (!hasSendableNewChatContent(query, this._contextAttachments.attachments, hasAdditionalSendContent) || this._sending) {
 			return false;
 		}
 
@@ -1568,7 +1569,7 @@ export class NewChatInputWidget extends Disposable implements IHistoryNavigation
 			return true;
 		}
 
-		const attachments = this._agentHostInputCompletionHandler?.getAttachmentsForSend(displayQuery, queryOffset) ?? [...this._contextAttachments.attachments];
+		const attachments = this._agentHostInputCompletionHandler?.getAttachmentsForSend(query, queryOffset) ?? [...this._contextAttachments.attachments];
 		const attachedContext = attachments.length > 0
 			? attachments
 			: undefined;
@@ -1638,7 +1639,7 @@ export class NewChatInputWidget extends Disposable implements IHistoryNavigation
 			if (draft.attachments?.length) {
 				this._contextAttachments.setAttachments(draft.attachments.map(IChatRequestVariableEntry.fromExport));
 			}
-			this._dynamicVariableModel.setInputState(draft.contrib ?? {});
+			this._syncInputGitHubContext();
 		}
 		this._updateSendButtonState();
 	}

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

@@ -3,34 +3,35 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from '../../../../base/common/uri.js';
 import { ICodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { URI } from '../../../../base/common/uri.js';
 import { IRange, Range } from '../../../../editor/common/core/range.js';
 import { OffsetRange } from '../../../../editor/common/core/ranges/offsetRange.js';
-import { ChatDynamicVariableModel } from '../../../../workbench/contrib/chat/browser/attachments/chatDynamicVariables.js';
 import { IChatPasteTarget } from '../../../../workbench/contrib/chat/browser/chat.js';
 import { isTerminalCommandPaste } from '../../../../workbench/contrib/chat/browser/chatTerminalCommandPaste.js';
 import { IChatRequestVariableEntry } from '../../../../workbench/contrib/chat/common/attachments/chatVariableEntries.js';
 import { IDynamicVariable } from '../../../../workbench/contrib/chat/common/attachments/chatVariables.js';
 import { AgentHostInputCompletionHandler } from './agentHostInputCompletions.js';
 import { INewChatAttachments } from './newChatContextAttachments.js';
 
-type PasteCompletionHandler = Pick<AgentHostInputCompletionHandler, 'acceptCompletion' | 'forgetReference'>;
-
-/** Adapts the Agents composer to the shared Chat paste providers. */
+/**
+ * Exposes the Agents window composer to the shared chat paste pipeline. Inline
+ * references are tracked by the completion handler, which owns their decorations
+ * and outbound ranges.
+ */
 export class NewChatInputPasteTarget implements IChatPasteTarget {
 
 	constructor(
 		private readonly editor: ICodeEditor,
 		private readonly contextAttachments: INewChatAttachments,
-		private readonly completionHandler: PasteCompletionHandler,
-		private readonly dynamicVariableModel: ChatDynamicVariableModel,
+		private readonly completionHandler: AgentHostInputCompletionHandler,
 		private readonly getTerminalCommandPrefix: () => string | undefined,
 		private readonly getSessionResource: () => URI | undefined,
 		private readonly inputUri: URI,
 	) { }
 
 	get sessionResource(): URI {
+		// A composer draft has no session yet, so its input scopes the cleanup.
 		return this.getSessionResource() ?? this.inputUri;
 	}
 
@@ -39,7 +40,7 @@ export class NewChatInputPasteTarget implements IChatPasteTarget {
 	}
 
 	get inlineReferences(): readonly IDynamicVariable[] {
-		return this.dynamicVariableModel.variables;
+		return [];
 	}
 
 	addAttachments(entries: readonly IChatRequestVariableEntry[]): void {
@@ -58,12 +59,9 @@ export class NewChatInputPasteTarget implements IChatPasteTarget {
 		this.completionHandler.acceptCompletion({ ...entry, range: offsetRange }, text, offsetRange);
 	}
 
-	addInlineReference(reference: IDynamicVariable, expectedText?: string, expectedRangeOffset?: number): void {
-		this.dynamicVariableModel.addReference(reference, expectedText, expectedRangeOffset);
-	}
-
-	removeInlineReference(reference: IDynamicVariable): void {
-		this.dynamicVariableModel.removeReference(reference);
+	addInlineReference(_reference: IDynamicVariable): void {
+		// The composer has no dynamic-variable model; references that are not
+		// backed by an attachment are not surfaced here.
 	}
 
 	isTerminalCommandPaste(text: string, range: IRange): boolean {

src/vs/sessions/contrib/chat/common/newChatContextIds.ts

@@ -7,6 +7,11 @@ import { URI } from '../../../../base/common/uri.js';
 
 export const ADDITIONAL_FOLDER_CONTEXT_ID_PREFIX = 'sessions-additional-folder:';
 export const ADDITIONAL_REPOSITORY_CONTEXT_ID_PREFIX = 'sessions-additional-repository:';
+const INPUT_GITHUB_CONTEXT_METADATA_KEY = 'sessionsInputGitHubContext';
+
+interface IHasInputGitHubContextMetadata {
+	readonly _meta?: Record<string, unknown>;
+}
 
 export function getAdditionalFolderContextId(uri: URI): string {
 	return `${ADDITIONAL_FOLDER_CONTEXT_ID_PREFIX}${uri.toString()}`;
@@ -19,3 +24,12 @@ export function getAdditionalRepositoryContextId(uri: URI): string {
 export function isAdditionalWorkspaceContextId(id: string): boolean {
 	return id.startsWith(ADDITIONAL_FOLDER_CONTEXT_ID_PREFIX) || id.startsWith(ADDITIONAL_REPOSITORY_CONTEXT_ID_PREFIX);
 }
+
+export function isInputGitHubContext(source: IHasInputGitHubContextMetadata): boolean {
+	// eslint-disable-next-line local/code-no-untyped-meta-access -- sanctioned first hop into the input GitHub context slot.
+	return source._meta?.[INPUT_GITHUB_CONTEXT_METADATA_KEY] === true;
+}
+
+export function toInputGitHubContextMetadata(): Record<string, unknown> {
+	return { [INPUT_GITHUB_CONTEXT_METADATA_KEY]: true };
+}