Skip to content

[pull] main from microsoft:main #1149

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 16 commits into from
Apr 15, 2026
Merged

[pull] main from microsoft:main #1149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
7e07af9
feat(macOS): enable cross app update (#309812)
deepak1556 Apr 15, 2026
0ca67ba
Use model id from endpoint which is always set (#298236)
chrmarti Apr 15, 2026
6054333
fix opening sessions (#310112)
sandy081 Apr 15, 2026
8da5ade
Switch to VS Code ACR and add Agents app coverage (#309834)
dmitrivMS Apr 15, 2026
938197b
Agents - add editor part into the layout (#310111)
lszomoru Apr 15, 2026
aa6cff9
fix: update menu border color to use default fallback
mrleemurray Apr 15, 2026
902c28b
Update src/vs/platform/theme/browser/defaultStyles.ts
mrleemurray Apr 15, 2026
bb93f9d
output monitor fixes (#310145)
meganrogge Apr 15, 2026
ac028c6
remove deprecated chat customization APIs (#310139)
aeschli Apr 15, 2026
03dd400
Adopt CodeAction type for built-in css server (#310055)
yogeshwaran-c Apr 15, 2026
a05e069
Merge pull request #310151 from microsoft/mrleemurray/romantic-salmon…
mrleemurray Apr 15, 2026
4c482dc
make dependency hovers in package.json faster (#310140)
aeschli Apr 15, 2026
b604f47
Git - fix the default branch protection when workspace folders change…
lszomoru Apr 15, 2026
e647683
Agents: Fix padding for collapsed customization toolbar (#310152)
mrleemurray Apr 15, 2026
8379a04
Fix listener leak in terminal tool progress parts, execute strategies…
meganrogge Apr 15, 2026
4b5765f
Include terminal output in sendToTerminal result and improve notific…
meganrogge Apr 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .npmrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
disturl="https://electronjs.org/headers"
target="39.8.7"
ms_build_id="13797146"
ms_build_id="13841579"
runtime="electron"
ignore-scripts=false
build_from_source="true"
Expand Down
34 changes: 7 additions & 27 deletions build/azure-pipelines/common/sanity-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@ parameters:
- name: arch
type: string
default: amd64
- name: baseImage
type: string
default: ""
- name: args
type: string
default: ""
Expand All @@ -42,8 +39,6 @@ jobs:
TEST_DIR: $(Build.SourcesDirectory)/test/sanity
LOG_FILE: $(TEST_DIR)/results.xml
SCREENSHOTS_DIR: $(TEST_DIR)/screenshots
DOCKER_CACHE_DIR: $(Pipeline.Workspace)/docker-cache
DOCKER_CACHE_FILE: $(DOCKER_CACHE_DIR)/${{ parameters.container }}.tar
steps:
- checkout: self
fetchDepth: 1
Expand Down Expand Up @@ -94,10 +89,9 @@ jobs:
displayName: Install Node.js (Windows ARM64)

- ${{ else }}:
- task: NodeTool@0
- task: UseNode@1
inputs:
versionSource: fromFile
versionFilePath: .nvmrc
version: '22.22.0'
displayName: Install Node.js

- script: npm config set registry "$(NPM_REGISTRY)" --location=project
Expand Down Expand Up @@ -153,25 +147,17 @@ jobs:

# Linux Docker container
- ${{ if ne(parameters.container, '') }}:
- task: Cache@2
- task: Docker@1
displayName: Login to Container Registry
inputs:
key: 'docker-v3 | "${{ parameters.container }}" | "${{ parameters.arch }}" | "$(Agent.OS)" | $(TEST_DIR)/containers/${{ parameters.container }}.dockerfile'
path: $(DOCKER_CACHE_DIR)
restoreKeys: docker-v3 | "${{ parameters.container }}" | "${{ parameters.arch }}" | "$(Agent.OS)"
cacheHitVar: DOCKER_CACHE_HIT
displayName: Download Docker Image

- bash: |
docker load -i "$(DOCKER_CACHE_FILE)"
rm -f "$(DOCKER_CACHE_FILE)"
condition: eq(variables.DOCKER_CACHE_HIT, 'true')
displayName: Load Docker Image
azureSubscriptionEndpoint: vscode
azureContainerRegistry: vscodehub.azurecr.io
command: login

- bash: |
$(TEST_DIR)/scripts/run-docker.sh \
--container "${{ parameters.container }}" \
--arch "${{ parameters.arch }}" \
--base-image "${{ parameters.baseImage }}" \
--quality "$(BUILD_QUALITY)" \
--commit "$(BUILD_COMMIT)" \
--test-results "/root/results.xml" \
Expand All @@ -184,12 +170,6 @@ jobs:
GITHUB_ACCOUNT: $(sanity-tests-account)
GITHUB_PASSWORD: $(sanity-tests-password)

- bash: |
mkdir -p "$(DOCKER_CACHE_DIR)"
docker save -o "$(DOCKER_CACHE_FILE)" "${{ parameters.container }}"
condition: and(succeeded(), ne(variables.DOCKER_CACHE_HIT, 'true'))
displayName: Save Docker Image

- ${{ if eq(parameters.os, 'windows') }}:
- script: |
@echo off
Expand Down
30 changes: 10 additions & 20 deletions build/azure-pipelines/product-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -578,8 +578,7 @@ extends:
name: fedora_36_amd64
displayName: Fedora 36 amd64
poolName: 1es-ubuntu-22.04-x64
container: fedora
baseImage: fedora:36
container: fedora-36
arch: amd64

- ${{ if eq(parameters.VSCODE_BUILD_LINUX_ARM64, true) }}:
Expand All @@ -588,8 +587,7 @@ extends:
name: fedora_36_arm64
displayName: Fedora 36 arm64
poolName: 1es-azure-linux-3-arm64
container: fedora
baseImage: fedora:36
container: fedora-36
arch: arm64

# Fedora 40
Expand All @@ -599,8 +597,7 @@ extends:
name: fedora_40_amd64
displayName: Fedora 40 amd64
poolName: 1es-ubuntu-22.04-x64
container: fedora
baseImage: fedora:40
container: fedora-40
arch: amd64

- ${{ if eq(parameters.VSCODE_BUILD_LINUX_ARM64, true) }}:
Expand All @@ -609,8 +606,7 @@ extends:
name: fedora_40_arm64
displayName: Fedora 40 arm64
poolName: 1es-azure-linux-3-arm64
container: fedora
baseImage: fedora:40
container: fedora-40
arch: arm64

# openSUSE Leap 16.0
Expand Down Expand Up @@ -667,8 +663,7 @@ extends:
name: ubuntu_22_04_amd64
displayName: Ubuntu 22.04 amd64
poolName: 1es-ubuntu-22.04-x64
container: ubuntu
baseImage: ubuntu:22.04
container: ubuntu-22
arch: amd64

- ${{ if eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true) }}:
Expand All @@ -677,8 +672,7 @@ extends:
name: ubuntu_22_04_arm32
displayName: Ubuntu 22.04 arm32
poolName: 1es-azure-linux-3-arm64
container: ubuntu
baseImage: ubuntu:22.04
container: ubuntu-22
arch: arm

- ${{ if eq(parameters.VSCODE_BUILD_LINUX_ARM64, true) }}:
Expand All @@ -687,8 +681,7 @@ extends:
name: ubuntu_22_04_arm64
displayName: Ubuntu 22.04 arm64
poolName: 1es-azure-linux-3-arm64
container: ubuntu
baseImage: ubuntu:22.04
container: ubuntu-22
arch: arm64

# Ubuntu 24.04
Expand All @@ -698,8 +691,7 @@ extends:
name: ubuntu_24_04_amd64
displayName: Ubuntu 24.04 amd64
poolName: 1es-ubuntu-22.04-x64
container: ubuntu
baseImage: ubuntu:24.04
container: ubuntu-24
arch: amd64

- ${{ if eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true) }}:
Expand All @@ -708,8 +700,7 @@ extends:
name: ubuntu_24_04_arm32
displayName: Ubuntu 24.04 arm32
poolName: 1es-azure-linux-3-arm64
container: ubuntu
baseImage: ubuntu:24.04
container: ubuntu-24
arch: arm

- ${{ if eq(parameters.VSCODE_BUILD_LINUX_ARM64, true) }}:
Expand All @@ -718,8 +709,7 @@ extends:
name: ubuntu_24_04_arm64
displayName: Ubuntu 24.04 arm64
poolName: 1es-azure-linux-3-arm64
container: ubuntu
baseImage: ubuntu:24.04
container: ubuntu-24
arch: arm64

- ${{ if and(parameters.VSCODE_RELEASE, eq(variables['VSCODE_PRIVATE_BUILD'], false), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'))) }}:
Expand Down
30 changes: 10 additions & 20 deletions build/azure-pipelines/product-sanity-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,17 +184,15 @@ extends:
name: fedora_36_amd64
displayName: Fedora 36 amd64
poolName: 1es-ubuntu-22.04-x64
container: fedora
baseImage: fedora:36
container: fedora-36
arch: amd64

- template: build/azure-pipelines/common/sanity-tests.yml@self
parameters:
name: fedora_36_arm64
displayName: Fedora 36 arm64
poolName: 1es-azure-linux-3-arm64
container: fedora
baseImage: fedora:36
container: fedora-36
arch: arm64

# Fedora 40
Expand All @@ -203,17 +201,15 @@ extends:
name: fedora_40_amd64
displayName: Fedora 40 amd64
poolName: 1es-ubuntu-22.04-x64
container: fedora
baseImage: fedora:40
container: fedora-40
arch: amd64

- template: build/azure-pipelines/common/sanity-tests.yml@self
parameters:
name: fedora_40_arm64
displayName: Fedora 40 arm64
poolName: 1es-azure-linux-3-arm64
container: fedora
baseImage: fedora:40
container: fedora-40
arch: arm64

# openSUSE Leap 16.0
Expand Down Expand Up @@ -264,26 +260,23 @@ extends:
name: ubuntu_22_04_amd64
displayName: Ubuntu 22.04 amd64
poolName: 1es-ubuntu-22.04-x64
container: ubuntu
baseImage: ubuntu:22.04
container: ubuntu-22
arch: amd64

- template: build/azure-pipelines/common/sanity-tests.yml@self
parameters:
name: ubuntu_22_04_arm32
displayName: Ubuntu 22.04 arm32
poolName: 1es-azure-linux-3-arm64
container: ubuntu
baseImage: ubuntu:22.04
container: ubuntu-22
arch: arm

- template: build/azure-pipelines/common/sanity-tests.yml@self
parameters:
name: ubuntu_22_04_arm64
displayName: Ubuntu 22.04 arm64
poolName: 1es-azure-linux-3-arm64
container: ubuntu
baseImage: ubuntu:22.04
container: ubuntu-22
arch: arm64

# Ubuntu 24.04
Expand All @@ -292,24 +285,21 @@ extends:
name: ubuntu_24_04_amd64
displayName: Ubuntu 24.04 amd64
poolName: 1es-ubuntu-22.04-x64
container: ubuntu
baseImage: ubuntu:24.04
container: ubuntu-24
arch: amd64

- template: build/azure-pipelines/common/sanity-tests.yml@self
parameters:
name: ubuntu_24_04_arm32
displayName: Ubuntu 24.04 arm32
poolName: 1es-azure-linux-3-arm64
container: ubuntu
baseImage: ubuntu:24.04
container: ubuntu-24
arch: arm

- template: build/azure-pipelines/common/sanity-tests.yml@self
parameters:
name: ubuntu_24_04_arm64
displayName: Ubuntu 24.04 arm64
poolName: 1es-azure-linux-3-arm64
container: ubuntu
baseImage: ubuntu:24.04
container: ubuntu-24
arch: arm64
2 changes: 1 addition & 1 deletion extensions/copilot/src/extension/prompt/node/chatMLFetcher.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1118,7 +1118,7 @@ export class ChatMLFetcherImpl extends AbstractChatMLFetcher {
this._telemetryService.sendGHTelemetryEvent('request.sent', telemetryData.properties, telemetryData.measurements);

const requestStart = Date.now();
const handle = connection.sendRequest(request, { userInitiated: !!userInitiatedRequest, turnId, requestId: ourRequestId, countTokens, tokenCountMax: chatEndpointInfo.maxOutputTokens, modelMaxPromptTokens: chatEndpointInfo.modelMaxPromptTokens, summarizedAtRoundId }, cancellationToken);
const handle = connection.sendRequest(request, { userInitiated: !!userInitiatedRequest, turnId, requestId: ourRequestId, model: chatEndpointInfo.model, countTokens, tokenCountMax: chatEndpointInfo.maxOutputTokens, modelMaxPromptTokens: chatEndpointInfo.modelMaxPromptTokens, summarizedAtRoundId }, cancellationToken);

const extendedBaseTelemetryData = baseTelemetryData.extendedBy({ modelCallId });
const processor = this._instantiationService.createInstance(OpenAIResponsesProcessor, extendedBaseTelemetryData, this._telemetryService, modelRequestId.headerRequestId, modelRequestId.gitHubRequestId, modelRequestId.serverExperiments, getResponsesApiCompactionThresholdFromBody(request));
Expand Down
7 changes: 4 additions & 3 deletions extensions/copilot/src/platform/networking/node/chatWebSocketManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ export interface IChatWebSocketRequestOptions {
userInitiated: boolean;
turnId: string;
requestId: string;
model: string;
countTokens: () => Promise<number>;
tokenCountMax: number;
modelMaxPromptTokens: number;
Expand Down Expand Up @@ -596,7 +597,7 @@ class ChatWebSocketConnection extends Disposable implements IChatWebSocketConnec
const promptTokenCountPromise = options.countTokens();
let promptTokenCount = -1;
promptTokenCountPromise.then(count => { promptTokenCount = count; }, () => { promptTokenCount = -2; });
const request = new ChatWebSocketActiveRequest(requestId, body.model, options.summarizedAtRoundId, this._configurationService, this._logService);
const request = new ChatWebSocketActiveRequest(requestId, options.model, options.summarizedAtRoundId, this._configurationService, this._logService);
request.onDidSettle(({ outcome, closeCode, closeReason, serverErrorMessage, serverErrorCode }) => {
if (this._activeRequest === request) {
this._activeRequest = undefined;
Expand All @@ -615,7 +616,7 @@ class ChatWebSocketConnection extends Disposable implements IChatWebSocketConnec
hadActiveRequest,
requestId,
gitHubRequestId: this.gitHubRequestId,
modelId: body.model,
modelId: options.model,
requestOutcome: outcome,
statefulMarkerMatched,
previousResponseIdUnset,
Expand Down Expand Up @@ -674,7 +675,7 @@ class ChatWebSocketConnection extends Disposable implements IChatWebSocketConnec
hadActiveRequest,
requestId,
gitHubRequestId: this.gitHubRequestId,
modelId: body.model,
modelId: options.model,
statefulMarkerMatched,
previousResponseIdUnset,
hasCompactionData,
Expand Down
Loading
Loading