Skip to content

[pull] main from microsoft:main#1025

Merged
pull[bot] merged 34 commits intocode:mainfrom
microsoft:main
Mar 12, 2026
Merged

[pull] main from microsoft:main#1025
pull[bot] merged 34 commits intocode:mainfrom
microsoft:main

Conversation

@pull
Copy link

@pull pull bot commented Mar 12, 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 : )

Copilot AI and others added 30 commits January 2, 2026 03:01
Co-authored-by: rebornix <876920+rebornix@users.noreply.github.com>
Co-authored-by: rebornix <876920+rebornix@users.noreply.github.com>
Co-authored-by: rebornix <876920+rebornix@users.noreply.github.com>
Co-authored-by: rebornix <876920+rebornix@users.noreply.github.com>
During terminal disposal, DecorationAddon._dispose() was calling
clearDecorations() which individually disposed each xterm IDecoration.
Each disposal triggered DecorationService.onDecorationRemoved events
that caused the OverviewRulerRenderer to queue requestAnimationFrame
callbacks. These callbacks fired after the renderer was disposed,
crashing when accessing RenderService.dimensions (since the underlying
renderer MutableDisposable returned undefined).

Fix: Only clean up VS Code-side resources (event listeners, context
menus, etc.) during disposal. xterm handles its own decoration cleanup
when the terminal is disposed.

Fixes: Cannot read properties of undefined (reading 'dimensions')

Co-authored-by: bryanchen-d <41454397+bryanchen-d@users.noreply.github.com>
Co-authored-by: bryanchen-d <41454397+bryanchen-d@users.noreply.github.com>
…bsolute paths

The fileRegex character class didn't include `@`, causing scoped npm
package paths (e.g. @xterm/xterm) to split the match and prevent proper
node_modules detection. Additionally, nodeModulesRegex only matched
paths starting with node_modules/, but full absolute paths like
/Users/.../node_modules/... don't start with node_modules/.

Added `@` to fileRegex character class and a new embeddedNodeModulesRegex
to detect node_modules anywhere in a path, preserving the node_modules/...
suffix while redacting the user-specific prefix.

Co-authored-by: bryanchen-d <41454397+bryanchen-d@users.noreply.github.com>
…re _ in fileRegex

- Merged embeddedNodeModulesRegex into nodeModulesRegex to handle
  node_modules at any position in the path with a single regex
- Reordered logic to check vscode extension paths first, then node_modules
- Restored explicit _ in fileRegex character class for clarity
- Updated tests to match new consistent redaction behavior

Co-authored-by: bryanchen-d <41454397+bryanchen-d@users.noreply.github.com>
* Browser Zoom

* Remove logic from editor

* Feedback

* Small comment change

* Zoom factors, not percentages

* Comment on keybinding

* Add keybindings back to actions

* Add browserZoomLabel helper for zoom percentage display

* First AI changes

* AI pass with zoom level hierarchy

* Fix zoom not applying to other origins after default zoom change

* Promote per-origin zoom to user setting workbench.browser.zoom.perOriginZoomLevels

* Remove unnecessary configuration migration for zoom setting

* Add 'Match VS Code' default zoom level option for Integrated Browser

* Add missing localize import to platform/browserView/common/browserView.ts

* Switch per-origin zoom tracking to per-host (http/https only)

* Rename zoom settings: defaultZoomLevel→pageZoom, perHostZoomLevels→zoomLevels; mark zoomLevels as advanced

* Update setting description and scope

* Improve zoom service: lazy synchronizer, pre-computed label map, RunOnceScheduler, always forceApply on navigate

* Remove self-evident and redundant comments

* Refactor zoom to two independent cascades (ephemeral/persistent each fall back to default independently)

* Use IStorageService for per-host browser zoom instead of settings

* Remove VS Code product name from browser zoom code
…em (#300926)

* Simplify chat auto-reply: skip questions instead of LLM-answering them

When `chat.autoReply` is enabled, the questions tool now returns the
same 'user is not available, use your best judgment' response used in
autopilot mode — instead of sending questions to a separate LLM call
for answer resolution.

This removes ~450 lines of LLM prompt engineering, JSON parsing with
retry, fuzzy option matching, fallback answer generation, and opt-in
dialog management.

* Address review: skip in-flight carousels when auto-reply is enabled mid-session

Listen for chat.autoReply config changes in chatListRenderer and skip
all pending question carousels when the setting becomes enabled. This
handles the edge case where a carousel is already awaiting user input
and the user enables auto-reply or switches to autopilot afterward.
It seems like the sessions experience _can_ run in the VS Code world, so we actually do need these strings.
* plugins: support openplugin format

Generally just our existing stuff with minor tweaks

* compile
* /yolo -> switches to bypass mode, /autopilot switches to autopilot

* in collapsed mode, make sure headers are updated with more info

* Revert "in collapsed mode, make sure headers are updated with more info"

This reverts commit 104db39.

* Revert "/yolo -> switches to bypass mode, /autopilot switches to autopilot"

This reverts commit ded22ec.

* in collapsed mode, make sure headers are updated with more info

* better todos and fix comments
…ror-dimensions

Fix telemetry path redaction to preserve node_modules paths
* support for parent repo folders for all chat customizations

* update
BUMP THAT DISTRO
- Rename chatImageSlideshow -> imageCarousel as a generic workbench contrib
- Remove editor resolver and collection store (direct EditorInput creation)
- Remove F1 command (single entry point via internal command)
- Fix response matching: only open collection containing clicked image
- Add registerOpenEditorListeners for keyboard/accessibility parity
- Localize all user-facing strings
- Add chat.imageCarousel.enabled preview setting (default: false)
- Rename command to workbench.action.chat.openImageInCarousel
- Use h() helper for declarative DOM, getMediaMime() for MIME types
- Editor not restorable (canSerialize returns false)
justschen and others added 4 commits March 12, 2026 02:47
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Fix: Correct comment references to supportedAuthorizationServers field
@pull pull bot locked and limited conversation to collaborators Mar 12, 2026
@pull pull bot added the ⤵️ pull label Mar 12, 2026
@pull pull bot merged commit 8ca4fb2 into code:main Mar 12, 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.