Skip to content

Merge upstream for 1.108.0#10

Merged
timtmok merged 629 commits intomainfrom
merge/1.108.0
Feb 9, 2026
Merged

Merge upstream for 1.108.0#10
timtmok merged 629 commits intomainfrom
merge/1.108.0

Conversation

@timtmok
Copy link

@timtmok timtmok commented Jan 27, 2026

Merges in tag v0.36.2026010701

ulugbekna and others added 30 commits December 5, 2025 13:26
* nes: model picker: fix: correct init and model picking order

    nes: fetched models should check if they're already known as well

    nes: fix: ensure to update undesired models before updating preferred model

    this's important because there's code that reacts to preferred model change and needs to know latest undesired models

    nes: minimize failure possibility

    nes: fix: make sure to init undesiredModelsManager earlier than observables use them

    nes: don't memorize if exp-configured model is picked

    nes: joint: support model picker

* nes: model picker: support in JointCompletionsProvider

* nes: enable model picker for the team
…Response` (microsoft#2435)

* `CopilotInteractiveEditorResponse.kind` is always 'ok' -> remove it

fixes microsoft/vscode#280959
…ft#2431)

* nes: fetched models should check if they're already known as well

* nes: fix: ensure to update undesired models before updating preferred model

this's important because there's code that reacts to preferred model change and needs to know latest undesired models

* nes: minimize failure possibility

* nes: fix: make sure to init undesiredModelsManager earlier than observables use them

* nes: don't memorize if exp-configured model is picked
* nes: model picker: fix: correct init and model picking order

    nes: fetched models should check if they're already known as well

    nes: fix: ensure to update undesired models before updating preferred model

    this's important because there's code that reacts to preferred model change and needs to know latest undesired models

    nes: minimize failure possibility

    nes: fix: make sure to init undesiredModelsManager earlier than observables use them

    nes: don't memorize if exp-configured model is picked

    nes: joint: support model picker

* nes: model picker: support in JointCompletionsProvider

* nes: enable model picker for the team
…lazier-position-offset-transformer

chore: adopt from core lazier/faster PositionOffsetTransformer
* initial pass at untracked file changes, testing next

* add final trailing \n

* unit tests for function

* fix test execution

* tweak some comments and formattting

* another comment tweak after testing

* small change to handling fully empty files

* copilot PR feedback

---------

Co-authored-by: Ian Huff <ianhuff@Ians-MacBook-Pro-2.local>
Co-authored-by: Ian Huff <ianhuff@Mac.home>
* Run local eslint rules directly as typescript

Remove the need to use `tsx`

* Bump required node version

Matches the version we use in vscode repo

* Align node versions

* Always use `/`

* Try fixing windows

* Try another fix for windows

* Fix new rule after merge
Enables the same `no-unexternalized-strings` with have in `vscode` in this repo. This make sure we have a more consistent style across repos and when generating edits
* Disable thinking for anthropic models on continuation.

* reduce code duplication

---------

Co-authored-by: SteVen Batten <sbatten@microsoft.com>
* Send abexp context

* Spelling
… (microsoft#2451)

* Disable thinking for anthropic models on continuation.

* reduce code duplication

---------

Co-authored-by: Bhavya U <bhavyau@microsoft.com>
vijayupadya and others added 27 commits January 2, 2026 19:26
* Add thoughtSignature

* Use LanguageModelThinkingPart to store thoughtSignature

* use metadata to store signature

* remove any

* formatting

---------

Co-authored-by: vijay upadya <vj@example.com>
* Improve formatting of tool args

* Update comments
…#2706)

* Ensure version of node is in sync with that in vscode repo

* Update other verions
* Show error msg

* minor update

---------

Co-authored-by: vijay upadya <vj@example.com>
* nes: support patch-based model response format

* nes: support <NO_EDIT> response and update post-script in user message

* fix off by one

model uses 0-based line numbers, so we should convert to 1-based for LineRange

* make a method private
* nes: long: respect old setting if coming from exp

* nes: rename public setting for cursor jump and fixes

make it bool-valued, and respect old exp config and backward-compat value
@timtmok timtmok marked this pull request as ready for review February 2, 2026 16:26
@timtmok timtmok requested a review from jmcphers February 2, 2026 16:26
@timtmok timtmok merged commit 1640676 into main Feb 9, 2026
3 of 8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.