Skip to content

[pull] main from microsoft:main#1166

Merged
pull[bot] merged 17 commits intocode:mainfrom
microsoft:main
Apr 20, 2026
Merged

[pull] main from microsoft:main#1166
pull[bot] merged 17 commits intocode:mainfrom
microsoft:main

Conversation

@pull
Copy link
Copy Markdown

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

cwebster-99 and others added 17 commits April 17, 2026 15:39
Co-authored-by: Copilot <copilot@github.com>
…gic (#311270)

* clean up confirmationc carousel

* Update src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatToolConfirmationCarouselPart.ts

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

* Update src/vs/workbench/contrib/chat/browser/widget/chatContentParts/media/chatToolConfirmationCarousel.css

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

* Update src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatToolConfirmationCarouselPart.ts

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

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Update padding for multiDiffEntry in editor to enhance layout

Co-authored-by: mrleemurray <mrleemurray@users.noreply.github.com>
* Fix disposed SCM source control retention

Remove disposed source controls from extension-host SCM bookkeeping so they no longer retain repository state after unregistering from the main thread.

(Written by Copilot)

* Add logging for consistency

---------

Co-authored-by: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
…rajectory check (#310969)

nes: consolidate speculative request cancellation

Introduces SpeculativeRequestManager that owns the lifecycle of NES
speculative requests (the in-flight 'pending' bet on a post-accept
document state, plus the 'scheduled' speculative deferred until its
originating stream completes). All cancellation now goes through one
path with a typed SpeculativeCancelReason logged on the request's
log context, and pairs cancel() with dispose() on the token source
to release listeners.

Adds these cancellation triggers that previously leaked the speculative:

- CacheCleared: clearCache() now cancels in-flight speculatives — they
  would otherwise land into a cache that was meant to be empty.

- DocumentClosed: when a doc is removed from openDocuments, any
  speculative targeting it is cancelled — its cached result could
  never be hit again.

- Disposed: provider dispose now cancels all speculatives.

Also removes the special-case in handleIgnored for the superseded
branch — the trajectory check on the document change that caused the
supersede is the authoritative signal.
…g dialogs (#311262)

* Add 'Don't show again' to autopilot/bypass approvals warning dialogs

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

* Add developer command to reset chat permission warning dialogs

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

* Always show AutoApprove warning independently of Autopilot

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

* Extract permission storage keys to shared constants module

Move AUTOPILOT_DONT_SHOW_AGAIN_KEY and AUTO_APPROVE_DONT_SHOW_AGAIN_KEY
to chat/common/chatPermissionStorageKeys.ts so both chatDeveloperActions
and permissionPickerActionItem import from a lightweight shared module.
This avoids chatDeveloperActions pulling in heavy widget/UI dependencies
at startup via the permissionPickerActionItem import.

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

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
* Copilot - add session parentId to metadata

* Fix build

* Fix test
agentHost: adopt eager activeClient announcement
@pull pull Bot locked and limited conversation to collaborators Apr 20, 2026
@pull pull Bot added the ⤵️ pull label Apr 20, 2026
@pull pull Bot merged commit abdc25a into code:main Apr 20, 2026
18 of 23 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.

8 participants