chat: allow collapsing queued chat requests #335208
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,6 +8,7 @@ import { renderFormattedText } from '../../../../../base/browser/formattedTextRe | |
| import { StandardKeyboardEvent } from '../../../../../base/browser/keyboardEvent.js'; | ||
| import { IActionViewItemOptions } from '../../../../../base/browser/ui/actionbar/actionViewItems.js'; | ||
| import { alert } from '../../../../../base/browser/ui/aria/aria.js'; | ||
| import { ButtonWithIcon } from '../../../../../base/browser/ui/button/button.js'; | ||
| import { getDefaultHoverDelegate } from '../../../../../base/browser/ui/hover/hoverDelegateFactory.js'; | ||
| import { IManagedHover } from '../../../../../base/browser/ui/hover/hover.js'; | ||
| import { CachedListVirtualDelegate, IListElementRenderDetails } from '../../../../../base/browser/ui/list/list.js'; | ||
|
|
@@ -740,6 +741,7 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch | |
| * by screen readers | ||
| */ | ||
| private readonly _announcedToolProgressKeys = new Set<string>(); | ||
| private readonly requestExpansionState = new Map<string, boolean>(); | ||
|
|
||
| constructor( | ||
| editorOptions: ChatEditorOptions, | ||
|
|
@@ -912,6 +914,7 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch | |
| if (!isRequestVM(element) | ||
| || element.isSystemInitiated | ||
| || !!element.confirmation | ||
| || (this.getRequestExpansionState(element) === false && element.id !== this.viewModel?.editing?.id) | ||
| || !this.requestHasStickyScrollContent(element)) { | ||
| return undefined; | ||
| } | ||
|
|
@@ -951,6 +954,9 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch | |
| } | ||
|
|
||
| updateViewModel(viewModel: IChatViewModel | undefined): void { | ||
| if (!isEqual(this.viewModel?.sessionResource, viewModel?.sessionResource)) { | ||
| this.requestExpansionState.clear(); | ||
| } | ||
| this.viewModel = viewModel; | ||
| this._announcedToolProgressKeys.clear(); | ||
| this._notifiedQuestionCarousels.clear(); | ||
|
|
@@ -1355,7 +1361,7 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch | |
|
|
||
| // Clear pending-related classes and drag handle from previous renders | ||
| // Do this before element-type checks to ensure dividers also get cleaned up | ||
| templateData.rowContainer.classList.remove('pending-item', 'pending-divider', 'pending-request', 'chat-pending-dragging', 'chat-request-collapsed', 'terminal-command-request', 'chat-system-notification-response'); | ||
| templateData.dragHandle?.remove(); | ||
| templateData.dragHandle = undefined; | ||
| delete templateData.rowContainer.dataset.pendingRequestId; | ||
|
|
@@ -2336,6 +2342,10 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch | |
| stickyScrollSourcePart.addDisposable(this.registerSynchronizedRequestBubbleHover(element.id, templateData, templateData.stickyScrollSource)); | ||
| } | ||
|
|
||
| if (!isStickyScrollRow && !element.confirmation && element.id !== this.viewModel?.editing?.id && (element.pendingKind || this.getRequestExpansionState(element) !== undefined)) { | ||
| this.renderRequestCollapseControl(element, templateData); | ||
| } | ||
|
|
||
| if (!isStickyScrollRow && !element.pendingKind && !element.confirmation && this.rendererOptions.renderStyle !== 'minimal' && templateData.value.childElementCount > 0) { | ||
| const timestamp = renderChatRequestTimestamp(templateData.requestTimestampContainer, element.requestTimestamp); | ||
| if (timestamp?.hoverText) { | ||
|
|
@@ -2374,6 +2384,62 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch | |
| } | ||
| } | ||
|
|
||
| private getRequestExpansionState(element: IChatRequestViewModel): boolean | undefined { | ||
| let expanded = this.requestExpansionState.get(element.id); | ||
| // A combined steering request inherits any explicit collapse choice from | ||
| // its pending messages. Consume those choices so later toggles take effect. | ||
| for (const pendingId of element.pendingRequestIds ?? []) { | ||
| if (pendingId === element.id) { | ||
| continue; | ||
| } | ||
| const pendingExpanded = this.requestExpansionState.get(pendingId); | ||
| if (pendingExpanded !== undefined) { | ||
| expanded = expanded === undefined ? pendingExpanded : expanded && pendingExpanded; | ||
| this.requestExpansionState.delete(pendingId); | ||
| } | ||
| } | ||
| if (expanded !== undefined) { | ||
| this.requestExpansionState.set(element.id, expanded); | ||
| } | ||
| return expanded; | ||
| } | ||
|
|
||
| private renderRequestCollapseControl(element: IChatRequestViewModel, templateData: IChatListItemTemplate): void { | ||
| const contentElements = Array.from(templateData.value.children).filter(dom.isHTMLElement).map(element => ({ element, display: element.style.display })); | ||
| const control = dom.$('.chat-request-collapse-control.chat-used-context-label'); | ||
| templateData.value.prepend(control); | ||
| const button = templateData.elementDisposables.add(new ButtonWithIcon(control, {})); | ||
| button.iconElement.setAttribute('aria-hidden', 'true'); | ||
| const preview = element.messageText.replace(/\s+/g, ' ').trim() || localize('requestCollapseMessage', "Message"); | ||
| let expanded = this.getRequestExpansionState(element) ?? true; | ||
| const update = () => { | ||
| templateData.rowContainer.classList.toggle('chat-request-collapsed', !expanded); | ||
| for (const content of contentElements) { | ||
| content.element.style.display = expanded ? content.display : 'none'; | ||
| } | ||
| button.label = expanded ? localize('requestCollapseMessage', "Message") : preview; | ||
| button.icon = expanded ? Codicon.chevronDownCompact : Codicon.chevronRightCompact; | ||
| button.element.ariaExpanded = String(expanded); | ||
| button.element.ariaLabel = expanded | ||
| ? localize('collapseRequest', "Collapse Message") | ||
| : localize('expandRequest', "Expand Message: {0}", preview); | ||
| }; | ||
| update(); | ||
| templateData.elementDisposables.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('element'), button.element, () => expanded | ||
| ? localize('collapseRequest', "Collapse Message") | ||
| : localize('expandRequestTooltip', "Expand Message: {0}", preview))); | ||
| templateData.elementDisposables.add(button.onDidClick(e => { | ||
| dom.EventHelper.stop(e, true); | ||
| control.dispatchEvent(new CustomEvent(ChatCollapsibleContentPart.userToggleEvent, { bubbles: true })); | ||
| expanded = !expanded; | ||
| // Pending view models are recreated on updates. Keep the choice by request ID, | ||
| // including when the same request moves into the transcript. | ||
| this.requestExpansionState.set(element.id, expanded); | ||
|
Comment on lines
+2435
to
+2437
There was a problem hiding this comment. Fixed in 49af945. The real dequeue path now preserves the pending request ID. Merged steering requests also carry their source IDs into the model/view model, so a collapse choice from any source transfers to the combined prompt; later expansion survives rerenders. Added service regressions using the public queue/dequeue APIs, including automatic queued/steering dispatch, merged steering, slash commands and retries, and blocked troubleshoot requests. The renderer tests now complement those service tests instead of being the only evidence for the transition. All 101 ChatService tests and 70 renderer tests pass (one existing renderer test remains skipped). |
||
| update(); | ||
| this.fireItemHeightChange(templateData); | ||
| })); | ||
| } | ||
|
|
||
| private getRequestMarkdown(element: IChatRequestViewModel, explicitFileOrImageVariables = element.variables.filter(isExplicitFileOrImageVariableEntry)): string | undefined { | ||
| const markdown = isChatFollowup(element.message) | ||
| ? element.message.message | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed in 49af945: added a localized paragraph to the existing Chat Accessibility Help explaining Tab/Shift+Tab navigation, Enter/Space activation, and independent queued-message collapse states. Scoped ESLint and hygiene checks pass.