Skip to content

[cherry-pick] sessions: Use global archive filter for nested chats - #338563

Merged
Sandeep Somavarapu (sandy081) merged 4 commits into
release/1.140from
cherry-pick/338535
Sep 29, 2026
Merged

[cherry-pick] sessions: Use global archive filter for nested chats#338563
Sandeep Somavarapu (sandy081) merged 4 commits into
release/1.140from
cherry-pick/338535

Conversation

@vs-code-engineering

@vs-code-engineering vs-code-engineering Bot commented Sep 28, 2026

Copy link
Copy Markdown
Contributor

Cherry-pick of #338535 from main.

⚠️ This cherry-pick has merge conflicts that need manual resolution. Conflict markers (<<<<<<</=======/>>>>>>>) are committed to the branch — check it out locally, resolve, and force-push.

git fetch origin cherry-pick/338535 && git checkout cherry-pick/338535
# resolve conflicts, then:
git add -A && git commit --amend --no-edit && git push --force-with-lease

Conflicting files:

  • src/vs/sessions/contrib/sessions/browser/views/sessionsList.ts
  • src/vs/sessions/contrib/sessions/browser/views/sessionsViewActions.ts
  • src/vs/sessions/contrib/sessions/test/browser/sessionsActions.test.ts
  • src/vs/sessions/contrib/sessions/test/browser/sessionsList.fixture.ts
  • src/vs/sessions/contrib/sessions/test/browser/sessionsListContextMenu.test.ts

Summary

  • remove the per-session Show Archived Chats / Show Done Chats toggle
  • make archived nested chats follow the Sessions filter together with archived sessions
  • update accessibility help, regression coverage, and component fixtures for the global filter behavior

Validation

  • npm run transpile-client
  • 262 focused Sessions tests
  • component fixture render check: 4/4 archived nested-chat variants passed
  • archived nested-chat screenshot stability check passed
  • full compile and hygiene passed before rebasing; after the latest main dependency bump they are locally blocked because the private registry rejects the dependency refresh with E401

@vs-code-engineering vs-code-engineering Bot added the cherry-pick-artifact Auto-generated cherry-pick PR label Sep 28, 2026
Copilot AI balanced review requested due to automatic review settings September 28, 2026 22:21
Copilot AI reviewed Sep 28, 2026
View reviewed changes

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot review overview

🟡 Changes recommended

Unresolved conflict markers prevent compilation, and the new blocking fixture lacks committed screenshot baselines.

Review effort: Balanced
Findings: 4 High severity

Open (4)
What changed in this PR

Updates nested archived chats to follow the global Sessions archive filter.

Changes:

  • Removes per-session archived-chat visibility controls.
  • Updates tests, fixtures, documentation, and accessibility help.
  • Adds global-filter regression coverage, but leaves merge conflicts unresolved.
File Description
test/​componentFixtures/​blocks-ci-screenshots.md Removes obsolete screenshot baselines.
src/​vs/​sessions/​SESSIONS_LIST.md Documents global archive filtering.
src/​vs/​sessions/​contrib/​sessions/​test/​browser/​sessionsRename.test.ts Updates accessibility-help assertions.
src/​vs/​sessions/​contrib/​sessions/​test/​browser/​sessionsListContextMenu.test.ts Removes per-session tests; contains conflicts.
src/​vs/​sessions/​contrib/​sessions/​test/​browser/​sessionsList.test.ts Tests global nested-chat filtering.
src/​vs/​sessions/​contrib/​sessions/​test/​browser/​sessionsList.fixture.ts Adds archived-chat fixtures; contains conflicts.
src/​vs/​sessions/​contrib/​sessions/​test/​browser/​sessionsActions.test.ts Removes obsolete action tests; contains conflicts.
src/​vs/​sessions/​contrib/​sessions/​browser/​views/​sessionsViewActions.ts Removes per-session archive actions; contains conflicts.
src/​vs/​sessions/​contrib/​sessions/​browser/​views/​sessionsList.ts Applies the global filter to nested chats; contains conflicts.
src/​vs/​sessions/​contrib/​chat/​browser/​sessionsChatAccessibilityHelp.ts Documents the global filter workflow.

💡 Configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

Comment thread src/vs/sessions/contrib/sessions/browser/views/sessionsList.ts Outdated
const inGroup = this._sessionGroupsService.getGroupOfSession(element.sessionId) !== undefined;
const contextOverlay: [string, boolean | string][] = [
[IsSessionPinnedContext.key, this.isSessionPinned(element)],
<<<<<<< HEAD
Comment thread src/vs/sessions/contrib/sessions/browser/views/sessionsViewActions.ts Outdated
import { EditorsVisibleContext, EditorAreaFocusContext, FocusedViewContext, IsSessionsWindowContext } from '../../../../../workbench/common/contextkeys.js';
import { SessionsCategories } from '../../../../common/categories.js';
import { ARCHIVE_CHAT_COMMAND_ID, ARCHIVE_SESSION_COMMAND_ID, MARK_SESSION_READ_COMMAND_ID, MARK_SESSION_UNREAD_COMMAND_ID, RENAME_SESSION_COMMAND_ID, UNARCHIVE_CHAT_COMMAND_ID, UNARCHIVE_SESSION_COMMAND_ID } from '../../../../common/sessionCommands.js';
<<<<<<< HEAD
Comment thread src/vs/sessions/contrib/sessions/test/browser/sessionsActions.test.ts Outdated
]);
});

<<<<<<< HEAD
Comment thread src/vs/sessions/contrib/sessions/test/browser/sessionsListContextMenu.test.ts Outdated
}
});

<<<<<<< HEAD
@github-actions

github-actions Bot commented Sep 28, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

Screenshot Changes

Base: 7cbc19db Current: 433ac13f

Removed (4)

sessions/sessionsList/SessionsList_ArchivedNestedChatSessionMenu/Dark

baseline

sessions/sessionsList/SessionsList_ArchivedNestedChatSessionMenu/DarkHighContrast

baseline

sessions/sessionsList/SessionsList_ArchivedNestedChatSessionMenu/Light

baseline

sessions/sessionsList/SessionsList_ArchivedNestedChatSessionMenu/LightHighContrast

baseline

vs-code-engineering Bot and others added 3 commits September 29, 2026 09:53
@vs-code-engineering @sandy081
[cherry-pick] sessions: Use global archive filter for nested chats
1a22a24
@sandy081
sessions: Remove unused release fixture frame
33d4edb 
The release branch does not contain the newer context-menu fixtures, so the cherry-pick conflict resolution leaves no consumer for this frame constant.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@sandy081
sessions: Adapt archive filter backport to release
5ac90c3 
Resolve the updated release branch against the archive-filter backport without bringing main-only multi-selection behavior into the release.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@sandy081
sessions: Remove main-only release fixtures
b41c81a 
Keep the release backport limited to removing the obsolete session-level archive toggle fixture. The newer compact archive fixtures belong to main and caused the release screenshot manifest to diverge.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@sandy081
Sandeep Somavarapu (sandy081) merged commit 76e6796 into release/1.140 Sep 29, 2026
35 checks passed
@sandy081
Sandeep Somavarapu (sandy081) deleted the cherry-pick/338535 branch September 29, 2026 09:01
@vs-code-engineering vs-code-engineering Bot added this to the 1.140.0 milestone Sep 29, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

Copilot code review Copilot
Copilot review effort, defaults to Balanced
Applies to this pull request for everyone.Learn more about Copilot code review.
Copilot left review comments
@chrmarti Christof Marti (chrmarti) chrmarti approved these changes
@sandy081 Sandeep Somavarapu (sandy081) sandy081 approved these changes
@dbaeumer Dirk Bäumer (dbaeumer) dbaeumer left review comments
@dmitrivMS Dmitriy Vasyura (dmitrivMS) dmitrivMS left review comments

Assignees

@sandy081 Sandeep Somavarapu (sandy081)

Labels

cherry-pick-artifact Auto-generated cherry-pick PR

Projects

None yet

Milestone

1.140.0

Development

Successfully merging this pull request may close these issues.

5 participants

@dbaeumer @chrmarti @dmitrivMS @sandy081
Sponsor
SponsoredKunjungi sekarang
Promo