[pull] main from microsoft:main

.github/CODENOTIFY

@@ -83,6 +83,7 @@ extensions/vscode-api-tests/src/singlefolder-tests/browser*.test.ts @kycutler @j
 
 # Testing
 test/mcp/** @TylerLeonhardt
+test/scenario/** @bryanchen-d
 test/sanity/** @dmitrivMS
 
 # Agents Workbench

.github/skills/validate-ui-scenario/SKILL.md

@@ -11,15 +11,15 @@ Use this to reproduce a reported bug, to show that a fix works, or to attach a r
 test-plan item. For deterministic regression coverage that runs on every build, write a smoke test
 instead (see the `smoke-tests` skill) — this skill is for one-off, issue-derived validation.
 
-A scenario is a small JavaScript file run by `test/mcp/out/runScenario.js`. Nothing else has to be
+A scenario is a small JavaScript file run by `test/scenario/out/runScenario.js`. Nothing else has to be
 configured: the runner launches VS Code, records video and a trace, captures a screenshot at every
 step boundary, writes the report, and captions the recording with each step and its result.
 
 ## Prepare
 
 ```bash
 npm install                        # once
-npm --prefix test/mcp run compile  # after any change under test/mcp
+npm --prefix test/scenario run compile  # after any change under test/scenario
 ```
 
 Add `ffmpeg` and `ffprobe` to `PATH` to get the caption band on the video. Without them the run still
@@ -130,7 +130,7 @@ Each step receives a `context` with `app`, `workbench`, `code`, `page`, and `ski
 ## Run it
 
 ```bash
-node test/mcp/out/runScenario.js <scenario.cjs> --build "<app-root>"
+node test/scenario/out/runScenario.js <scenario.cjs> --build "<app-root>"
 ```
 
 Exit code `0` means every step passed, `1` means the run failed or was aborted, `2` a usage error.
@@ -149,7 +149,7 @@ Evidence is written to `.build/vscode-playwright-mcp/evidence/<run-id>/`:
 The caption band is added **above** the recorded frame rather than drawn over it, so no recorded
 pixel is hidden and the recording keeps its original length. Each caption carries the step number
 and id, its status, the step title, and the validation detail the step reported. Re-render after
-editing a manifest with `node test/mcp/out/renderEvidenceChapters.js <run-dir>`.
+editing a manifest with `node test/scenario/out/renderEvidenceChapters.js <run-dir>`.
 
 ## What makes evidence trustworthy
 

build/.cachesalt

@@ -1 +1 @@
-2026-08-05T23:47:14.698Z
+2026-08-20T17:32:07.583Z

build/azure-pipelines/alpine/product-build-alpine-node-modules.yml

@@ -61,6 +61,11 @@ jobs:
         condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none'))
         displayName: Setup NPM Authentication
 
+      - template: ../common/foundry-local.yml@self
+        parameters:
+          phase: prepare
+          onlyOnNodeModulesCacheMiss: true
+
       - task: Docker@1
         inputs:
           azureSubscriptionEndpoint: vscode
@@ -128,6 +133,11 @@ jobs:
         displayName: Install dependencies
         condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
 
+      - template: ../common/foundry-local.yml@self
+        parameters:
+          phase: install
+          onlyOnNodeModulesCacheMiss: true
+
       - script: node build/azure-pipelines/common/checkNativeOptionalDeps.ts
         condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
         displayName: Verify native optional dependency binaries

build/azure-pipelines/common/foundry-local.yml

@@ -4,15 +4,24 @@ parameters:
     values:
       - prepare
       - install
+  - name: onlyOnNodeModulesCacheMiss
+    type: boolean
+    default: false
 
 steps:
   - ${{ if eq(parameters.phase, 'prepare') }}:
     - task: NuGetAuthenticate@1
+      ${{ if eq(parameters.onlyOnNodeModulesCacheMiss, true) }}:
+        condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none'))
       displayName: Setup NuGet Authentication
 
     - script: node build/azure-pipelines/common/disableFoundryLocalInstall.ts
+      ${{ if eq(parameters.onlyOnNodeModulesCacheMiss, true) }}:
+        condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none'))
       displayName: Disable Foundry Local Native Install
 
   - ${{ if eq(parameters.phase, 'install') }}:
     - script: node build/azure-pipelines/common/foundryLocalInstall.ts
+      ${{ if eq(parameters.onlyOnNodeModulesCacheMiss, true) }}:
+        condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none'))
       displayName: Install Foundry Local Native Dependencies

build/azure-pipelines/darwin/product-build-darwin-node-modules.yml

@@ -75,6 +75,11 @@ jobs:
         condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
         displayName: Setup PyPI Authentication
 
+      - template: ../common/foundry-local.yml@self
+        parameters:
+          phase: prepare
+          onlyOnNodeModulesCacheMiss: true
+
       - script: |
           set -e
           c++ --version
@@ -102,6 +107,11 @@ jobs:
         displayName: Install dependencies
         condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
 
+      - template: ../common/foundry-local.yml@self
+        parameters:
+          phase: install
+          onlyOnNodeModulesCacheMiss: true
+
       - script: node build/azure-pipelines/common/checkNativeOptionalDeps.ts
         condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
         displayName: Verify native optional dependency binaries

build/azure-pipelines/linux/product-build-linux-node-modules.yml

@@ -82,6 +82,11 @@ jobs:
         condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none'))
         displayName: Setup NPM Authentication
 
+      - template: ../common/foundry-local.yml@self
+        parameters:
+          phase: prepare
+          onlyOnNodeModulesCacheMiss: true
+
       - script: |
           set -e
 
@@ -142,6 +147,11 @@ jobs:
         displayName: Install dependencies
         condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
 
+      - template: ../common/foundry-local.yml@self
+        parameters:
+          phase: install
+          onlyOnNodeModulesCacheMiss: true
+
       - script: node build/azure-pipelines/common/checkNativeOptionalDeps.ts
         condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
         displayName: Verify native optional dependency binaries

build/azure-pipelines/web/product-build-web-node-modules.yml

@@ -54,6 +54,11 @@ jobs:
         condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none'))
         displayName: Setup NPM Authentication
 
+      - template: ../common/foundry-local.yml@self
+        parameters:
+          phase: prepare
+          onlyOnNodeModulesCacheMiss: true
+
       - script: |
           set -e
           ./build/azure-pipelines/linux/apt-retry.sh sudo apt-get update
@@ -79,6 +84,11 @@ jobs:
         displayName: Install dependencies
         condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
 
+      - template: ../common/foundry-local.yml@self
+        parameters:
+          phase: install
+          onlyOnNodeModulesCacheMiss: true
+
       - script: node build/azure-pipelines/common/checkNativeOptionalDeps.ts
         condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
         displayName: Verify native optional dependency binaries

build/azure-pipelines/win32/product-build-win32-node-modules.yml

@@ -71,6 +71,11 @@ jobs:
         condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none'))
         displayName: Setup NPM Authentication
 
+      - template: ../common/foundry-local.yml@self
+        parameters:
+          phase: prepare
+          onlyOnNodeModulesCacheMiss: true
+
       - powershell: |
           . build/azure-pipelines/win32/exec.ps1
           $ErrorActionPreference = "Stop"
@@ -85,6 +90,11 @@ jobs:
         displayName: Install dependencies
         condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
 
+      - template: ../common/foundry-local.yml@self
+        parameters:
+          phase: install
+          onlyOnNodeModulesCacheMiss: true
+
       - powershell: node build/azure-pipelines/common/checkNativeOptionalDeps.ts
         condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
         displayName: Verify native optional dependency binaries

build/lib/stylelint/vscode-known-variables.json

@@ -1086,6 +1086,9 @@
 		"--modern-ui-editor-tab-unfocused-hover-foreground",
 		"--modern-ui-editor-tab-unfocused-inactive-background",
 		"--modern-ui-editor-tab-unfocused-inactive-foreground",
+		"--modern-ui-notifications-block-end-inset",
+		"--modern-ui-notifications-block-start-inset",
+		"--modern-ui-notifications-inline-inset",
 		"--modern-ui-shell-background",
 		"--modern-ui-tab-active-background",
 		"--modern-ui-tab-hover-background",

build/npm/dirs.ts

@@ -59,6 +59,7 @@ export const dirs = [
 	'test/integration/browser',
 	'test/monaco',
 	'test/smoke',
+	'test/scenario',
 	'test/mcp',
 	'.vscode/extensions/vscode-selfhost-import-aid',
 	'.vscode/extensions/vscode-selfhost-test-provider',

eslint.config.js

@@ -2329,10 +2329,22 @@ export default defineConfig(
 						'*' // node modules
 					]
 				},
+				{
+					'target': 'test/scenario/**',
+					'restrictions': [
+						'test/automation',
+						'test/scenario/**',
+						'@vscode/*',
+						'@parcel/*',
+						'@playwright/*',
+						'*' // node modules
+					]
+				},
 				{
 					'target': 'test/mcp/**',
 					'restrictions': [
 						'test/automation',
+						'test/scenario',
 						'test/mcp/**',
 						'@vscode/*',
 						'@parcel/*',

extensions/copilot/package.json

@@ -81,6 +81,7 @@
     "onStartupFinished",
     "onLanguageModelChat:copilot",
     "onUri",
+    "onCommand:_github.copilot.chat.reportModelFeedbackSurvey",
     "onFileSystem:ccreq",
     "onFileSystem:ccsettings"
   ],
@@ -4341,6 +4342,23 @@
       {
         "id": "advanced",
         "properties": {
+          "github.copilot.chat.chatCompletionsTokenParameter": {
+            "type": "string",
+            "enum": [
+              "max_completion_tokens",
+              "max_tokens"
+            ],
+            "enumDescriptions": [
+              "%github.copilot.config.chatCompletionsTokenParameter.maxCompletionTokens%",
+              "%github.copilot.config.chatCompletionsTokenParameter.maxTokens%"
+            ],
+            "default": "max_tokens",
+            "markdownDescription": "%github.copilot.config.chatCompletionsTokenParameter%",
+            "tags": [
+              "advanced",
+              "onExp"
+            ]
+          },
           "github.copilot.chat.inlineEdits.xtabProvider.modelConfiguration": {
             "type": [
               "object",

extensions/copilot/package.nls.json

@@ -277,6 +277,9 @@
 	"github.copilot.tools.githubTextSearch.userDescription": "Text search a GitHub repository or organization for files containing specific keywords or code patterns.",
 	"github.copilot.config.autoFix": "Automatically fix diagnostics for edited files.",
 	"github.copilot.config.rateLimitAutoSwitchToAuto": "Automatically switch to the Auto model and retry when you hit a per-model rate limit.",
+	"github.copilot.config.chatCompletionsTokenParameter": "Controls the output token limit parameter sent to custom Chat Completions APIs. Use `max_completion_tokens` for endpoints that do not support `max_tokens`.",
+	"github.copilot.config.chatCompletionsTokenParameter.maxCompletionTokens": "Send `max_completion_tokens`.",
+	"github.copilot.config.chatCompletionsTokenParameter.maxTokens": "Send the legacy `max_tokens` parameter for compatibility.",
 	"github.copilot.tools.createNewWorkspace.userDescription": "Scaffold a new workspace in VS Code",
 	"github.copilot.chat.tools.grepSearch.outputFormat": "The output format for the grep search tool. Can be either 'grep' or 'tag'. The default is 'grep'.",
 	"github.copilot.chat.tools.grepSearch.defaultMaxResults": "The default maximum number of results to return from the grep search tool. The default is 100.",

extensions/copilot/src/extension/extension/vscode/contributions.ts

@@ -8,6 +8,7 @@ import { asContributionFactory, IExtensionContributionFactory } from '../../comm
 import * as contextContribution from '../../context/vscode/context.contribution';
 import { LifecycleTelemetryContrib } from '../../telemetry/common/lifecycleTelemetryContrib';
 import { GithubTelemetryForwardingContrib } from '../../telemetry/vscode/githubTelemetryForwardingContrib';
+import { ChatModelFeedbackSurveyForwardingContrib } from '../../telemetry/vscode/chatModelFeedbackSurveyForwardingContrib';
 
 // ###############################################################################
 // ###                                                                         ###
@@ -21,6 +22,7 @@ const vscodeContributions: IExtensionContributionFactory[] = [
 	asContributionFactory(LifecycleTelemetryContrib),
 	asContributionFactory(NesActivationTelemetryContribution),
 	asContributionFactory(GithubTelemetryForwardingContrib),
+	asContributionFactory(ChatModelFeedbackSurveyForwardingContrib),
 	contextContribution,
 ];