148bbfdb57
fix(stringEdit): prevent _tryRebase from producing non-disjoint edits
...
## Problem
The `_tryRebase` method could produce edits that violate the sorted/disjoint
invariant required by `StringEdit`, causing a `BugIndicatingError` to be
thrown with the message:
`Edits must be disjoint and sorted. Found [X, X) -> "..." after Y`
## Root Cause
When a base edit deletes significantly more characters than it inserts
(creating a negative offset), subsequent "our" edits can get transformed
to positions that conflict with previously-added edits.
Example scenario:
1. `ourEdit1`: [100, 110) → "A" — added to result, ends at position 110
2. `baseEdit`: [110, 125) → "" — deletes 15 chars, offset becomes -15
3. `ourEdit2`: [120, 120) → "B" — transforms to [105, 105) after offset
Problem: Position 105 is BEFORE 110 (the end of `ourEdit1`), violating
the invariant that edits must be sorted and disjoint.
The original code only checked for direct intersections with base edits,
but missed this case where the cumulative offset transformation causes
an "our" edit to land before the end of a previously-added "our" edit.
## Fix
Track the exclusive end position of the last added edit (`lastEndEx`) and
before adding each transformed edit, verify that its start position is not
before `lastEndEx`. If it is:
- When `noOverlap=true` (tryRebase): return `undefined`
- When `noOverlap=false` (rebaseSkipConflicting): skip the conflicting edit
## Behavior Changes
- `tryRebase()`: Now returns `undefined` for cases that previously crashed
- `rebaseSkipConflicting()`: Skips conflicting edits instead of crashing
- `trySwap()`: Uses `tryRebase` internally, handles edge cases gracefully
These are safe changes since the previous behavior was to throw an error.
Callers of `tryRebase()` already handle `undefined` returns, and
`rebaseSkipConflicting()` is expected to drop conflicting edits.
2026-01-29 19:22:29 +01:00
e710e34297
refactor - remove unused chat issue reporting command ( #291684 )
2026-01-29 18:19:19 +00:00
65b61f6e72
Merge pull request #291674 from microsoft/mrleemurray/moderate-coral-urial
...
Update @vscode/codicons to version 0.0.45-4 and add 'claude' icon
2026-01-29 17:56:09 +00:00
6f458a11a9
Browser: make paused state less jarring ( #291637 )
...
* Browser: make paused state less jarring
* Update src/vs/workbench/contrib/browserView/electron-browser/browserEditor.ts
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com >
* Update src/vs/workbench/contrib/browserView/electron-browser/browserEditor.ts
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com >
* 15%
* fix
---------
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com >
2026-01-29 09:52:38 -08:00
12ce890b0b
Update @vscode/codicons to version 0.0.45-4 and add 'claude' icon to codiconsLibrary
2026-01-29 17:26:06 +00:00
e0e634e326
Bump macOS test timeout to 90 minutes ( #291664 )
...
The owners of this have asked us to try a longer timeout to help them determine if the issues we're seeing are perf degradation or a hang
2026-01-29 17:25:35 +00:00
fe1d4cfca0
chore: update known CSS variabled ( #291663 )
2026-01-29 17:24:06 +00:00
3699d9f2c2
Merge pull request #291633 from microsoft/benibenj/interested-slug
...
Change gutter color to be based on editor hover color
2026-01-29 18:23:23 +01:00
16ef2c1fd2
Merge pull request #291659 from microsoft/mrleemurray/vocational-amethyst-meadowlark
...
Update 2026 theme names
2026-01-29 17:10:01 +00:00
aca1a9779f
Merge pull request #291646 from microsoft/mrleemurray/thin-chocolate-gerbil
...
Update @vscode/codicons to version 0.0.45-2 and add 'openai' icon
2026-01-29 16:59:01 +00:00
f94bca23a3
Merge branch 'main' into benibenj/interested-slug
2026-01-29 17:58:30 +01:00
fe90dba7c1
improve new agent.md default empty tool selection ( #291647 )
2026-01-29 16:55:27 +00:00
46308bc433
Remove unnecessary log statement in JSON client ( #291645 )
...
[json] remove unnecessary og statement
2026-01-29 16:51:13 +00:00
00b43c826d
mcp: update draft typings and announce mcp apps support ( #291654 )
...
Implements https://github.com/modelcontextprotocol/ext-apps/blob/main/specification/2026-01-26/apps.mdx#client-host-capabilities
Updates MCP typings to the latest draft to be able to specify that field.
2026-01-29 16:49:53 +00:00
d9e4d027eb
https://github.com/microsoft/vscode/issues/289753 ( #291644 )
2026-01-29 16:36:55 +00:00
7ba11de8cf
fix: update theme IDs and labels for consistency
2026-01-29 16:35:41 +00:00
d944566c4d
Show chat agents/prompts in extension features list ( #291643 )
2026-01-29 16:34:57 +00:00
5271ac01f0
read cached policy data even before fetching the default account ( #291631 )
2026-01-29 17:33:17 +01:00
a823d7d21c
update distro ( #291635 )
2026-01-29 16:28:04 +00:00
a6f5b3e9a6
Update @vscode/codicons to version 0.0.45-2 and add 'openai' icon to codiconsLibrary
2026-01-29 16:07:23 +00:00
ea32526b0d
Revert "Chat - implement session picker in the chat panel title" ( #291619 )
...
Revert "Chat - implement session picker in the chat panel title (#281051 )"
This reverts commit 653daa0011
2026-01-29 17:06:33 +01:00
a103a120fd
fix: enhance selection validation in InlineChatAffordance ( #291622 )
...
fix https://github.com/microsoft/vscode/issues/290832
2026-01-29 15:44:21 +00:00
6924e8019a
change gutter color to be based on editor hover color
2026-01-29 16:39:47 +01:00
e2a9f36c88
Fix empty hovers due to dom reuse ( #291617 )
2026-01-29 15:24:02 +00:00
16d4fc6d85
Merge pull request #291572 from microsoft/osortega/running-carp
...
Agents welcome view UI fixes
2026-01-29 07:07:01 -08:00
a0fddd4145
Merge pull request #291605 from microsoft/benibenj/naval-turtle
...
Disable session type picker when editing input
2026-01-29 15:54:57 +01:00
c1ccb4b88f
Merge pull request #291573 from microsoft/benibenj/moral-snail
...
only hide word suggestions when inline completions are enabled
2026-01-29 15:37:15 +01:00
144c2e8f6f
disable session type picker when editing input
2026-01-29 15:35:09 +01:00
653daa0011
Chat - implement session picker in the chat panel title ( #281051 )
2026-01-29 15:34:23 +01:00
acc738b25d
Merge pull request #291597 from microsoft/benibenj/unusual-crayfish
...
Improve hover color for action list toolbar
2026-01-29 15:32:57 +01:00
d749f7802a
Merge pull request #291595 from microsoft/tyriar/288589_2
...
Make auto approve rules for flags more speciifc
2026-01-29 06:27:34 -08:00
6655b5f562
Merge pull request #291593 from microsoft/benibenj/frozen-lamprey
...
Agent status and unified agents bar respect command center setting
2026-01-29 15:22:04 +01:00
b488ab464f
Fix command palette auto-close when focus was in inline chat ( #291560 )
...
* Initial plan
* Fix command palette auto-close when focus was in inline chat
Move editor focus logic from InlineChatAffordance into
InlineChatInputWidget._hide() and only focus editor when
focus is still within the editor's DOM. This prevents
stealing focus from command palette when it opens.
Co-authored-by: jrieken <1794099+jrieken@users.noreply.github.com >
---------
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com >
Co-authored-by: jrieken <1794099+jrieken@users.noreply.github.com >
2026-01-29 14:20:25 +00:00
7624fc34ef
Fix bug where a format document command results in an unknown detailed reason
2026-01-29 15:19:23 +01:00
2f13c32474
:listick:
2026-01-29 15:15:17 +01:00
f1308562f4
💄
2026-01-29 15:08:29 +01:00
2a8b28ab9a
better hover color for action list toolbar action
2026-01-29 15:07:19 +01:00
221810991f
Make auto approve rules for flags more speciifc
...
Fixes #288589
2026-01-29 06:04:32 -08:00
acbd49bcaa
agent status and unified agents bar should respect command center setting
2026-01-29 14:57:19 +01:00
076625e93b
Merge pull request #291571 from microsoft/mrleemurray/military-bronze-hamster
...
Refactor 2026 Dark theme colors and enhance tab styling
2026-01-29 13:38:49 +00:00
9bd3edc6be
inline chat: fix placeholder text and remove unused parameter ( #291568 )
...
- Change selection placeholder to 'Modify selected code'
- Remove unused _hover parameter from InlineChatEditorAffordance
- Fix input height reset in show() to use _updateInputHeight()
Fixes #291070 , fixes #291032
2026-01-29 14:34:25 +01:00
1b9472fdb8
Move layout out of if
2026-01-29 12:49:08 +01:00
f9b45cc9d5
fix #290769 ( #291566 )
2026-01-29 11:45:39 +00:00
0f9e720250
only hide word suggestions when inline completions are enabled
2026-01-29 12:44:25 +01:00
f448b54db3
Agents welcome view UI fixes
2026-01-29 12:39:42 +01:00
2427fabdbf
Refactor 2026 Dark theme colors and enhance tab styling
2026-01-29 11:39:25 +00:00
2748529874
Merge pull request #291414 from microsoft/osortega/damp-viper
...
Adding border to chat input in welcome view
2026-01-29 03:31:43 -08:00
35bb52f5c1
fix #290760 ( #291558 )
2026-01-29 11:17:45 +00:00
452a4c7882
Merge pull request #291556 from microsoft/mrleemurray/relevant-indigo-marten
...
Add secondary button border and update related styles and colors
2026-01-29 11:15:52 +00:00
5181d051eb
Add telemetry for tree view concurrent refresh ( #291540 )
...
* Add telemetry for tree view concurrent refresh
* Copilot PR feedback
* Remove retry and instead wait for refresh
2026-01-29 12:09:59 +01:00
ulugbekna
Benjamin Pasero
Lee Murray
Kyle Cutler
mrleemurray
Alex Ross
Johannes Rieken
Benjamin Christopher Simmonds
Martin Aeschlimann
Connor Peet
Sandeep Somavarapu
João Moreno
BeniBenj
Logan Ramos
Osvaldo Ortega
Ladislau Szomoru
Daniel Imms
Copilot
Anthony Stewart
Osvaldo Ortega