Skip to content

[pull] main from microsoft:main#1132

Merged
pull[bot] merged 38 commits intocode:mainfrom
microsoft:main
Apr 10, 2026
Merged

[pull] main from microsoft:main#1132
pull[bot] merged 38 commits intocode:mainfrom
microsoft:main

Conversation

@pull
Copy link
Copy Markdown

@pull pull Bot commented Apr 10, 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 : )

Aashna Garg and others added 30 commits April 8, 2026 13:51
…metry

The automode.routerDecision event was missing fields to distinguish what
model the router recommended vs. what was actually used after
sticky-provider and vision overrides.

New properties:
- candidateModel: the router's top pick (candidate_models[0]) before
  any same-provider or vision fallback overrides are applied
- stickyOverride: whether the router applied a sticky override (1/0)

This allows analysts to join automode.routerDecision.candidateModel with
response.success.model on conversationId/vscodeRequestId and detect
when the router recommended model A but the client used model B.
…oolbar-icon

fix: Coverage toolbar button missing profile picker dropdown
…-telemetry

Add candidateModel and stickyOverride to automode.routerDecision telemetry
* handle edge cases while updating built in extensions manually

* Update src/vs/platform/extensionManagement/node/extensionManagementService.ts

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

* fix compilation

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Add more correlation ids for external ingest
Revert "feat: enable agents app for stable (#308650)"

This reverts commit b5dd5ac.
…rce-annotation

fix: exclude source annotations from text selection in debug console
#307849)

* Pass only the port to --remote-debugging-port and --inspect-brk-extensions

* Also remove host from --inspect-brk
…309058)

* sessions: show restore button instead of checkmark for done sessions

When a session is already marked as done, the checkmark button in the
command center was still shown but did nothing on click. Now:

- Hide the 'Mark as Done' checkmark when the active session is archived
- Show the existing 'Restore' button (discard icon) in its place
- Track active session archived state via IsActiveSessionArchivedContext

Fixes #307712

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

* fix: track previous archived state for false→true transitions

Use a mutable wasArchived variable instead of a constant so that
openNewSessionView() fires correctly on restore→re-archive flows.

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

---------

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

* feat: add Ctrl+Alt+/ global keyboard shortcut for View -> Browser

Agent-Logs-Url: https://github.com/microsoft/vscode/sessions/ed6dcb73-f7ec-4cc2-a952-695c7d0dcf92

Co-authored-by: jruales <1588988+jruales@users.noreply.github.com>

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: jruales <1588988+jruales@users.noreply.github.com>
Match the sessions new-chat and active-chat input borders with the core chat widget focus treatment.

Also update the sessions docs to describe the focused border behavior.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Adds a keyboard shortcut handler in the new chat view's input editor so that
Cmd+/ (macOS) or Ctrl+/ (Windows/Linux) opens the context attachment picker,
matching the core workbench's AttachContextAction keybinding.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
* chore: cleanup recovery extension publish pipeline

* fix CI
* Stop fetching GHCR pat

* MAKE IT RED
* Cleanup code related to the repository state

* Remove code specific to the Agents app

* HasGitRemote should be computed at the end of each turn to account for sessions that were started before the metadata was added
Too risky, chat model lifecycle is too confusing and there are still some references to this to do things like check the URI after it's disposed
hawkticehurst and others added 8 commits April 10, 2026 16:24
Keep the Sessions header and workspace section titles visible in narrow sidebars by truncating them with ellipsis instead of hiding or overflowing the labels.

This preserves access to the sidebar section actions when repository names are long.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
* Show historical debug sessions in Agent Debug Logs

* Feedback update

* add test
* carousel improvements

* address some comments

* address more comments + fix flickering

* use monaco scrollable element

* address comments
* Filter out Claude customization directories in sessions app

The sessions (Agents) window was incorrectly showing and allowing
creation of customizations in .claude directories. Add protected
hook methods getPromptSourceFolders() and getDefaultSourceFolders()
to PromptFilesLocator, then override them in AgenticPromptFilesLocator
to filter out Claude-specific sources (ClaudePersonal, ClaudeWorkspace,
ClaudeWorkspaceLocal).

This ensures the sessions app only shows .github and .copilot
customization directories.

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

* Address review: path-based Claude filtering and fix JSDoc

- Also filter user-configured .claude paths (Config* source types)
  by checking the path string, not just the PromptFileSource enum
- Fix inaccurate JSDoc comments

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

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
* fix: update OS display name of the agents app

* fix: remove old start menu shortcut

* temp: bump gulp-electron for validation

* temp: bump gulp-electron

* chore: update sign.ts

* fix: entitlements for embedded app helpers

* fix: launch services registration

* chore: bump gulp-electron@1.41.2
Update the GitHub Enterprise auth provider label in product.json to use the shorter GHE name.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…placeholder (#309112)

* fix: AI customization welcome page improvements

- Fix 'New...' button to insert into active session's chat input
  instead of always targeting the new-session view
- Update placeholder text to be more workflow-oriented

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

* fix: register IChatWidgetService mock in fixture

Add missing IChatWidgetService mock to the aiCustomizationManagementEditor
fixture to prevent crash after the new service dependency was added.

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

* chore: rename 'Generate Workflow' to 'Customize Your Agent'

Update the getting started section title, description, and aria labels
to better reflect the purpose of the customization input.

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

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@pull pull Bot locked and limited conversation to collaborators Apr 10, 2026
@pull pull Bot added the ⤵️ pull label Apr 10, 2026
@pull pull Bot merged commit 6e637e5 into code:main Apr 10, 2026
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.