Skip to content

Conversation

@timtmok
Copy link

@timtmok timtmok commented Oct 14, 2025

Merges the branch into main. positron is currently pointing to this branch so it'll need to be updated.

This pulls in the changes from upstream to the last commit that supported 1.104.

There was one change to how the extension is built to adopt the change to the extension.webpack.config.js

lramos15 and others added 30 commits August 22, 2025 13:08
* Consume new version of BYOK API

* Implement auto mode refresh
…tand (microsoft#719)

* Ensure notebook tool fails with descriptive error for model to understand

* Fix typo

* Fix error
* wip: clone copilot-client to src

* ok

* use fork of completions

* ok

* refactor: update pre-release pipeline to mixin completions core repo and clean up files

* add to gitignore

* add conditions

* move completions core commit to package.json

* GhostTextProvider behind exp

* update to latest completions core

* Add completions-core to ignore

* No need to remove esbuild.ts anymore

* update release yml

* No need to remove esbuild.ts

---------

Co-authored-by: João Moreno <[email protected]>
Co-authored-by: BeniBenj <[email protected]>
* Revert engine bump
We are doing another release today

* And this
* Add prompt-tsx instructions

* Remove prepare
…crosoft#729)

I noticed Sonnet 4 trying to do this sometimes, so we should allow it. We also now return a better error message if the file doesn't exist otherwise.
#262760
- Show summaries
- Save space in context window for reasoning tokens
- Handle summaries for byok

BYOK doesn't fully work, needs microsoft/vscode#262994
* Codex agent test

* more

* Fix model server for openai

* Some improvements

* Fix tool calling

* Get it building again

* Add output delta event

* stuff

* Add claude-code dependency

* Fix

* Clean up copied anthropic types, and message conversion code

* Update cc sdk

* Set up permission MCP server

* Basic mcp permission tool

* Bump version

* Use a chat session provider for claude code

* Use IChatEndpoint instead of ext api lm

* Cleanup

* Bump engine version

* Delete codex tool

* try to fix paths
* Cleanups

* Delete OpenAIAdapter, simplify

* More cleanup

* Revert this
* Additional telemetry for Notebook NES

* Updates
…oft#748)

* nes: clean up enforcing minimum response delay and cancellation handling

* nes: do not enforce minimum response delay for NES in 2 cases

    1. for NES that's a subsequent edit (ie non-first edit in a set of multiple edits that come from a single model request)
    2. for NES that was cached and is returned again after rebasing on user edits
ulugbekna and others added 27 commits September 9, 2025 14:29
* enable image uploads by default for everyone

* expose setting for now

* it was still in internal oops

* fix config keys
* add message.added event

* fix message.added event logging

* fix message.added event logging

* fix message.added event logging

* fix message.added event logging

* fix message.added event logging

* fix message.added event logging

* fix message.added event logging

* fix message.added event logging

* fix message.added event logging

* chunk modelCall messages list

* Revert "chunk modelCall messages list"

This reverts commit 8e7197e.

* skip retry calls

* add trajectory id

* add trajectory id

* another try on trajectoryId

* Revert "another try on trajectoryId"

This reverts commit 8c68089.

* Revert "add trajectory id"

This reverts commit 8ff9ff5.

* Revert "add trajectory id"

This reverts commit 0991682.

* chunk messageUuids list into 8000 chars

* adding request.options events

* chunk request options

* save only unique request options

* save only unique request options

* convert maps to LRUcacheto avoid memory accumulation

* change json.stringify() to vscode hash() for hashing

* add turn Data to modelCalls event

* add engine.request.added with model request non specific info

* remove modelCallId from engine.request.added

* change new events names from engine. to model.

* reorganize added functions

* filer outmessageSource  XtabProvider and api. from model. telemetry events

* substitute request.option.tools by its length in engine.message.length

* do not save request if undefined headerRequestId

* add conversation headerRequestId to nonconversation calls

* fix conversation tracker

* add headerRequestId to  model.message.added hash

* rename conversatinTracker to mainHeaderRequestIdTracker

* add headerRequestIdTracker

* fix headerRequestIdTracker

* add conversationTrucker and remove redundant preocessedHeaderRequest
IdTrucker

* remove redundant isRetry check from sendNewRequestAddedTelemetry

* remove logservice messages

* change conversationTracker to allow for parallel conversations

* Disable internal MSFT telemetry event as it is the same but duplicated version of new model... events

Comment out the internal MSFT telemetry event sending.

* Comment out legacy telemetry event for testing

Comment out the old telemetry event sending method for testing.

---------

Co-authored-by: Yevhen Mohylevskyy <[email protected]>
Co-authored-by: Yevhen Mohylevskyy <[email protected]>
Co-authored-by: Ubuntu <yevhen@ubuntu22-vm.1kpbk2tnedsetibfv2d2keui5d.xx.internal.cloudapp.net>
* send panel.edit.feedback to msft internal telemetry

* add logservice

* removed logging

---------

Co-authored-by: Yevhen Mohylevskyy <[email protected]>
* Nudge model to avoid giving notebook JSON into edit tool

* Nudge model to avoid giving notebook JSON into edit tool
…icrosoft#1002)

* .

* nes: refactor: make `getUserPrompt` leaner to make it more testable
* VSCodeWorkspace cleanup

* Fixes missing import
…icrosoft#1013)

* fix #264387

* Update .github/copilot-instructions.md

Co-authored-by: Copilot <[email protected]>

---------

Co-authored-by: Copilot <[email protected]>
)

* Git - wire up the codelens and command for merge conflict resolution

* Refactor code so that we are not using a codelens

* Rename folder

* Cleanup a change that is not needed

* Reorder imports

* Some code cleanup

* Update src/extension/git/vscode/mergeConflictParser.ts

Co-authored-by: Copilot <[email protected]>

* Fix compilation error

* Attempt to fix tests

---------

Co-authored-by: Copilot <[email protected]>
* update contributing.md

* Update CONTRIBUTING.md

Co-authored-by: Copilot <[email protected]>

---------

Co-authored-by: Copilot <[email protected]>
* enable auto only when editor preview features are ON

refs microsoft/vscode#265902

* better error handling
* chat - towards experimental anonymous access

* rename to `devDeviceId`

* remove unused change

* Cleanup some session stuff

* add proposal

* lipstick

* get sku

* Fix multiplier renderering

* wrap up

---------

Co-authored-by: Logan Ramos <[email protected]>
@timtmok timtmok requested a review from jmcphers October 14, 2025 13:58
@jmcphers jmcphers merged commit f09caac into main Oct 15, 2025
0 of 4 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.