Improve Agent Merge status presentation - #333839
Merged
Benjamin Christopher Simmonds (benibenj) merged 6 commits intoSep 2, 2026
Merged
Improve Agent Merge status presentation#333839Benjamin Christopher Simmonds (benibenj) merged 6 commits into
Benjamin Christopher Simmonds (benibenj) merged 6 commits into
Conversation
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot started reviewing on behalf of
Benjamin Christopher Simmonds (benibenj)
September 1, 2026 19:13
View session
Contributor
There was a problem hiding this comment.
Copilot review overview
Review tier: Balanced
Findings: 1
New issues introduced by this change (1)
| Severity | Finding |
|---|---|
 |
src/vs/sessions/browser/sessionAgentMerge.ts — The error icon can represent multiple simultaneous blockers, but this branch ignores unresolved… |
What changed in this PR
Improves Agent Merge status presentation and preserves visible notification responses while hiding carrier requests.
Changes:
- Adds request-only transcript hiding across protocol, models, persistence, and restoration.
- Introduces lazy observable Agent Merge session state.
- Adapts PR icons and banners to Agent Merge repair ownership.
| File | Description |
|---|---|
src/vs/workbench/contrib/chat/test/common/chatService/chatService.test.ts |
Tests request-only hiding persistence. |
src/vs/workbench/contrib/chat/test/browser/agentSessions/stateToProgressAdapter.test.ts |
Tests protocol history conversion. |
src/vs/workbench/contrib/chat/test/browser/agentSessions/agentHostChatContribution.test.ts |
Tests live hidden carrier requests. |
src/vs/workbench/contrib/chat/common/model/chatViewModel.ts |
Filters request-only hidden rows. |
src/vs/workbench/contrib/chat/common/model/chatSessionOperationLog.ts |
Persists request-only hiding. |
src/vs/workbench/contrib/chat/common/model/chatModel.ts |
Models and serializes hiding state. |
src/vs/workbench/contrib/chat/common/chatSessionsService.ts |
Extends session request contracts. |
src/vs/workbench/contrib/chat/common/chatService/chatServiceImpl.ts |
Restores and streams hiding state. |
src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/stateToProgressAdapter.ts |
Converts protocol hiding metadata. |
src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostSessionHandler.ts |
Propagates live request visibility. |
src/vs/sessions/contrib/sessions/test/browser/sessionsListTestUtils.ts |
Updates list test stubs. |
src/vs/sessions/contrib/sessions/test/browser/sessionsList.test.ts |
Tests Agent Merge-aware icons. |
src/vs/sessions/contrib/sessions/browser/views/sessionsList.ts |
Adapts session-row PR icons. |
src/vs/sessions/contrib/sessionInputBanners/test/browser/sessionInputBanners.test.ts |
Tests action-specific banners. |
src/vs/sessions/contrib/sessionInputBanners/browser/sessionInputBanners.ts |
Suppresses handled PR blockers. |
src/vs/sessions/contrib/providers/agentHost/test/browser/localAgentHostSessionsProvider.test.ts |
Tests lazy subscription lifecycle. |
src/vs/sessions/contrib/providers/agentHost/browser/baseAgentHostSessionsProvider.ts |
Provides cached Agent Merge observables. |
src/vs/sessions/contrib/providers/agentHost/browser/agentMergeActions.ts |
Uses shared effective configuration. |
src/vs/sessions/contrib/providers/agentHost/AGENT_HOST_SESSIONS_PROVIDER.md |
Documents observable merge state. |
src/vs/sessions/contrib/github/test/browser/githubReferenceActionViewItems.test.ts |
Tests PR pill icon adaptation. |
src/vs/sessions/contrib/github/browser/pullRequestActions.ts |
Applies Agent Merge-aware pill icons. |
src/vs/sessions/contrib/chat/test/browser/chatView.test.ts |
Tests initial transcript context. |
src/vs/sessions/contrib/chat/browser/chatView.ts |
Handles hidden carriers in transcript UI. |
src/vs/sessions/common/agentHostSessionsProvider.ts |
Extends the provider contract. |
src/vs/sessions/browser/sessionAgentMerge.ts |
Centralizes presentation configuration and icons. |
src/vs/platform/agentHost/test/node/agentService.test.ts |
Tests visible notice responses. |
src/vs/platform/agentHost/node/agentService.ts |
Hides only notice carrier requests. |
src/vs/platform/agentHost/common/state/sessionState.ts |
Adds request-only hiding metadata helpers. |
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
Contributor
Screenshot ChangesBase: Changed (2)
|
| Before | After |
|---|---|
 |
 |
chat/chatAgentMergeNotice/Enabled/Light
| Before | After |
|---|---|
 |
 |
Added (4)
chat/chatAgentMergeNotice/EnabledExpanded/Dark
chat/chatAgentMergeNotice/EnabledExpanded/Light
chat/chatAgentMergeNotice/ConfigurationChanged/Dark
chat/chatAgentMergeNotice/ConfigurationChanged/Light
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Henning Dieterichs (hediet)
previously approved these changes
Sep 1, 2026
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
roblourens
previously approved these changes
Sep 1, 2026
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
roblourens
previously approved these changes
Sep 1, 2026
Keep the status summary visible while placing Agent Merge behavior details in an accessible, reusable disclosure with bulleted content. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Apply the repository formatter's continuation indentation so Compile & Hygiene accepts the session helper. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Michael Lively (Yoyokrazy)
approved these changes
Sep 1, 2026
Benjamin Christopher Simmonds (benibenj)
merged commit Sep 2, 2026
fb4a02b
into
main
60 of 61 checks passed
Benjamin Christopher Simmonds (benibenj)
deleted the
benibenj/agents/agent-merge-session-icon-update
branch
September 2, 2026 06:50
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary
Validation
npm run typecheck-clientnpm run valid-layers-check