Skip to content

[pull] main from microsoft:main#1284

Merged
pull[bot] merged 23 commits into
code:mainfrom
microsoft:main
May 22, 2026
Merged

[pull] main from microsoft:main#1284
pull[bot] merged 23 commits into
code:mainfrom
microsoft:main

Conversation

@pull
Copy link
Copy Markdown

@pull pull Bot commented May 22, 2026

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.4)

Can you help keep this open source service alive? 💖 Please sponsor : )

vritant24 and others added 23 commits May 21, 2026 16:10
…ion.agents (#317848)

* use getCustomAgents

* itemProvider.provideCustomAgents to get agents from SessionCustomization.agents

* update tests
Add new chat tip for opening the Agents window with context conditions
* Polish multiDiffEntry styles for improved layout and interaction

Co-authored-by: Copilot <copilot@github.com>

* Enhance multiDiffEntry header styles for better visibility and interaction

Co-authored-by: Copilot <copilot@github.com>

* Polish diff-hidden-lines styling for improved visual clarity and rounded corners

Co-authored-by: Copilot <copilot@github.com>

---------

Co-authored-by: mrleemurray <mrleemurray@users.noreply.github.com>
Co-authored-by: Copilot <copilot@github.com>
* sessions: add rich hover for titlebar and session list items

- Add inline diff stats (+insertions -deletions) to the titlebar pill
- Improve pill truncation so title shrinks first, keeping metadata visible
- Add a beacon-style hover on the titlebar pill showing:
  - Session icon + bold title
  - Folder/worktree icon + full path · git branch
  - File count + colored diff stats
  - Provider name
- Add the same rich hover to session list items, positioned to the right
  with instant transition between items (groupId)
- Extract reusable buildSessionHoverContent() returning MarkdownString
  so both titlebar and session list share the same hover content

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

* address CCR feedback

- Drop `isTrusted: true` from session hover MarkdownString (avoid command-link
  execution risk with workspace-derived values)
- Use appendText for user-controlled values (folder path, branch) so markdown
  characters are properly escaped
- Extract getSessionDiffStats helper into sessionHoverContent.ts and reuse it
  from the titlebar widget to avoid duplicated diff aggregation logic

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

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: mrleemurray <mrleemurray@users.noreply.github.com>
Extract local chat sessions into standalone provider

Move the local harness (in-process VS Code chat sessions) from
CopilotChatSessionsProvider into its own LocalChatSessionsProvider
under contrib/providers/localChatSessions/.

The new provider uses IChatService directly instead of the agent
sessions model:
- startNewLocalSession() for creating chat models
- sendRequest() for sending messages
- IGitService for git state resolution

Changes:
- New LocalChatSessionsProvider implementing ISessionsProvider
- New localChatSessions.contribution.ts with setting registration
  and ForkConversationAction override
- Removed LocalNewSession class from copilotChatSessionsProvider
- Removed LOCAL_SESSION_ENABLED_SETTING from copilot provider
- Updated copilotChatSessionsActions to import LocalSessionType
  from new provider
- Updated sessions.common.main.ts entry point

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

Co-authored-by: hediet <2931520+hediet@users.noreply.github.com>
Add editorTextFocus.toNegated() to the when clause of Go Back and Go Forward
keybindings so they work everywhere in the Agents window except when a text
editor has focus, preventing conflicts with editor shortcuts.

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

* Add home copilot instructions discovery

Co-authored-by: aeschli <6461412+aeschli@users.noreply.github.com>

* update

* Potential fix for pull request finding

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

* Potential fix for pull request finding

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: aeschli <6461412+aeschli@users.noreply.github.com>
Co-authored-by: Martin Aeschlimann <martinae@microsoft.com>
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
…zationItemSource (#317989)

* customization UI: all itemProvider accesses go through the IAICustomizationItemSource

* Potential fix for pull request finding

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

* Potential fix for pull request finding

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

* Reset cachedPromise on rejection in fetchProviderItems so transient errors can recover

Co-authored-by: aeschli <6461412+aeschli@users.noreply.github.com>

* update

---------

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: aeschli <6461412+aeschli@users.noreply.github.com>
* Support longer context

* Context picker selector
…abels

Fix option display labels in enum quick picks for language model configuration
…ker (#317988)

* sessions: only show provider name for duplicated session types in picker

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

* sessions: show provider title for all items in providers with duplicated labels

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

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Add margin for the visibility toggle in the Manage Models view
@pull pull Bot locked and limited conversation to collaborators May 22, 2026
@pull pull Bot added the ⤵️ pull label May 22, 2026
@pull pull Bot merged commit 7b57c95 into code:main May 22, 2026
6 of 7 checks passed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

10 participants