[pull] main from microsoft:main

.github/workflows/screenshot-test.yml

@@ -1,4 +1,4 @@
-name: Screenshot Tests
+name: Checking Component Screenshots
 
 on:
   push:
@@ -20,6 +20,7 @@ concurrency:
 
 jobs:
   screenshots:
+    name: Checking Component Screenshots
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -95,37 +96,40 @@ jobs:
           REPORT="test/componentFixtures/.screenshots/report/report.json"
           if [ -f "$REPORT" ]; then
             CHANGED=$(node -e "const r = require('./$REPORT'); console.log(r.summary.added + r.summary.removed + r.summary.changed)")
-            TITLE="${CHANGED} screenshots changed"
+            TITLE="📸 ${CHANGED} screenshots changed"
+            CONCLUSION="neutral"
           else
-            TITLE="Screenshots match"
+            TITLE="📸 Screenshots match"
+            CONCLUSION="success"
           fi
 
           SHA="${{ github.event.pull_request.head.sha || github.sha }}"
-          CHECK_RUN_ID=$(gh api "repos/${{ github.repository }}/commits/$SHA/check-runs" \
-            --jq '.check_runs[] | select(.name == "screenshots") | .id')
-
           DETAILS_URL="https://hediet-ghartifactpreview.azurewebsites.net/${{ github.repository }}/run/${{ github.run_id }}/component-explorer/___explorer.html?report=./screenshot-report/report.json"
 
-          if [ -n "$CHECK_RUN_ID" ]; then
-            gh api "repos/${{ github.repository }}/check-runs/$CHECK_RUN_ID" \
-              -X PATCH --input - <<EOF || echo "::warning::Could not update check run (expected for fork PRs)"
-          {"details_url":"$DETAILS_URL","output":{"title":"$TITLE","summary":"$TITLE"}}
+          EXPLORER_PUSHED=false
+          if gh api "repos/${{ github.repository }}/check-runs" \
+            --input - <<EOF; then
+          {"name":"Component Screenshots","head_sha":"$SHA","status":"completed","conclusion":"$CONCLUSION","details_url":"$DETAILS_URL","output":{"title":"$TITLE","summary":"$TITLE"}}
           EOF
+            EXPLORER_PUSHED=true
+          else
+            echo "::warning::Could not create check run (expected for fork PRs)"
           fi
 
-          DETAILS_URL="https://hediet-ghartifactpreview.azurewebsites.net/${{ github.repository }}/run/${{ github.run_id }}/component-explorer/___explorer.html?report=./screenshot-report/report.json"
-          gh api "repos/${{ github.repository }}/statuses/$SHA" \
-            --input - <<EOF || echo "::warning::Could not create commit status (expected for fork PRs)"
-          {"state":"success","target_url":"$DETAILS_URL","description":"$TITLE","context":"screenshots / explorer"}
-          EOF
+          CHECK_RUN_ID=$(gh api "repos/${{ github.repository }}/commits/$SHA/check-runs" \
+            --jq '.check_runs[] | select(.name == "Checking Component Screenshots / screenshots") | .id')
 
-      - name: Post summary
-        run: |
-          if [ -f test/componentFixtures/.screenshots/report/report.md ]; then
-            cat test/componentFixtures/.screenshots/report/report.md >> $GITHUB_STEP_SUMMARY
+          if [ "$EXPLORER_PUSHED" = true ]; then
+            CHECK_TITLE="Screenshots"
           else
-            echo "## Screenshots ✅" >> $GITHUB_STEP_SUMMARY
-            echo "No visual changes detected." >> $GITHUB_STEP_SUMMARY
+            CHECK_TITLE="$TITLE"
+          fi
+
+          if [ -n "$CHECK_RUN_ID" ]; then
+            gh api "repos/${{ github.repository }}/check-runs/$CHECK_RUN_ID" \
+              -X PATCH --input - <<EOF || echo "::warning::Could not update check run (expected for fork PRs)"
+          {"details_url":"$DETAILS_URL","output":{"title":"$CHECK_TITLE","summary":"$CHECK_TITLE"}}
+          EOF
           fi
 
       # - name: Post PR comment

.vscode/tasks.json

@@ -385,6 +385,11 @@
 					"file": 1,
 					"line": 2,
 					"column": 3
+				},
+				"background": {
+					"activeOnStart": true,
+					"beginsPattern": ".*Setting up sessions.*",
+					"endsPattern": "Redirection server listening on.*"
 				}
 			}
 		}

build/vite/vite.config.ts

@@ -143,11 +143,8 @@ const logger = createLogger();
 const loggerWarn = logger.warn;
 
 logger.warn = (msg, options) => {
-	// amdX and the baseUrl code cannot be analyzed by vite.
-	// However, they are not needed, so it is okay to silence the warning.
-	if (msg.indexOf('vs/amdX.ts') !== -1) {
-		return;
-	}
+	// the baseUrl code cannot be analyzed by vite.
+	// However, it is not needed, so it is okay to silence the warning.
 	if (msg.indexOf('await import(new URL(`vs/workbench/workbench.desktop.main.js`, baseUrl).href)') !== -1) {
 		return;
 	}

extensions/theme-2026/themes/styles.css

@@ -394,10 +394,11 @@
 }
 
 .monaco-workbench .defineKeybindingWidget {
-	box-shadow: var(--shadow-lg);
+	box-shadow: var(--shadow-lg) !important;
 	border-radius: var(--radius-lg);
 	backdrop-filter: var(--backdrop-blur-md);
 	-webkit-backdrop-filter: var(--backdrop-blur-md);
+	background-color: color-mix(in srgb, var(--vscode-editorHoverWidget-background) 60%, transparent) !important;
 }
 
 .monaco-workbench.vs-dark .defineKeybindingWidget {
@@ -723,6 +724,17 @@
 	background: var(--vscode-notifications-background) !important;
 }
 
+.monaco-workbench.monaco-reduce-transparency .notifications-list-container {
+	-webkit-backdrop-filter: none;
+	backdrop-filter: none;
+	background: var(--vscode-notifications-background) !important;
+}
+
+.monaco-workbench.monaco-reduce-transparency .notification-list-item,
+.monaco-workbench.monaco-reduce-transparency .notifications-center-header {
+	background: var(--vscode-notifications-background) !important;
+}
+
 .monaco-workbench.monaco-reduce-transparency .notifications-center {
 	-webkit-backdrop-filter: none;
 	backdrop-filter: none;
@@ -786,6 +798,7 @@
 .monaco-workbench.monaco-reduce-transparency .defineKeybindingWidget {
 	-webkit-backdrop-filter: none;
 	backdrop-filter: none;
+	background: var(--vscode-editorHoverWidget-background) !important;
 }
 
 /* Chat Editor Overlay */

package.json

@@ -1,7 +1,7 @@
 {
   "name": "code-oss-dev",
   "version": "1.110.0",
-  "distro": "fdfb55bde654559f3a3baea839e9797107b4e92e",
+  "distro": "11e5d56acfb25db3d8e0088b0150ce2488eddb53",
   "author": {
     "name": "Microsoft Corporation"
   },
@@ -250,4 +250,4 @@
   "optionalDependencies": {
     "windows-foreground-love": "0.6.1"
   }
-}
+}

src/vs/amdX.ts

@@ -171,15 +171,15 @@ class AMDModuleImporter {
 		if (this._amdPolicy) {
 			scriptSrc = this._amdPolicy.createScriptURL(scriptSrc) as unknown as string;
 		}
-		await import(scriptSrc);
+		await import(/* @vite-ignore */ scriptSrc);
 		return this._defineCalls.pop();
 	}
 
 	private async _nodeJSLoadScript(scriptSrc: string): Promise<DefineCall | undefined> {
 		try {
-			const fs = (await import(`${'fs'}`)).default;
-			const vm = (await import(`${'vm'}`)).default;
-			const module = (await import(`${'module'}`)).default;
+			const fs = (await import(/* @vite-ignore */ `${'fs'}`)).default;
+			const vm = (await import(/* @vite-ignore */ `${'vm'}`)).default;
+			const module = (await import(/* @vite-ignore */ `${'module'}`)).default;
 
 			const filePath = URI.parse(scriptSrc).fsPath;
 			const content = fs.readFileSync(filePath).toString();

src/vs/base/common/defaultAccount.ts

@@ -48,6 +48,11 @@ export interface IPolicyData {
 	readonly mcpAccess?: 'allow_all' | 'registry_only';
 }
 
+export interface ICopilotTokenInfo {
+	readonly sn?: string;
+	readonly fcv1?: string;
+}
+
 export interface IDefaultAccountAuthenticationProvider {
 	readonly id: string;
 	readonly name: string;

src/vs/editor/contrib/inlineCompletions/test/browser/utils.ts

@@ -5,34 +5,34 @@
 
 import { timeout } from '../../../../../base/common/async.js';
 import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { BugIndicatingError } from '../../../../../base/common/errors.js';
+import { Emitter, Event } from '../../../../../base/common/event.js';
 import { Disposable, DisposableStore, IReference } from '../../../../../base/common/lifecycle.js';
-import { CoreEditingCommands, CoreNavigationCommands } from '../../../../browser/coreCommands.js';
-import { Position } from '../../../../common/core/position.js';
-import { ITextModel } from '../../../../common/model.js';
-import { IInlineCompletionChangeHint, InlineCompletion, InlineCompletionContext, InlineCompletions, InlineCompletionsProvider } from '../../../../common/languages.js';
-import { ITestCodeEditor, TestCodeEditorInstantiationOptions, withAsyncTestCodeEditor } from '../../../../test/browser/testCodeEditor.js';
-import { InlineCompletionsModel } from '../../browser/model/inlineCompletionsModel.js';
 import { autorun, derived } from '../../../../../base/common/observable.js';
+import { URI } from '../../../../../base/common/uri.js';
 import { runWithFakedTimers } from '../../../../../base/test/common/timeTravelScheduler.js';
 import { IAccessibilitySignalService } from '../../../../../platform/accessibilitySignal/browser/accessibilitySignalService.js';
+import { IDefaultAccountService } from '../../../../../platform/defaultAccount/common/defaultAccount.js';
+import { SyncDescriptor } from '../../../../../platform/instantiation/common/descriptors.js';
 import { ServiceCollection } from '../../../../../platform/instantiation/common/serviceCollection.js';
+import { CoreEditingCommands, CoreNavigationCommands } from '../../../../browser/coreCommands.js';
+import { IBulkEditService } from '../../../../browser/services/bulkEditService.js';
+import { IRenameSymbolTrackerService, NullRenameSymbolTrackerService } from '../../../../browser/services/renameSymbolTrackerService.js';
+import { TextEdit } from '../../../../common/core/edits/textEdit.js';
+import { Position } from '../../../../common/core/position.js';
+import { Range } from '../../../../common/core/range.js';
+import { PositionOffsetTransformer } from '../../../../common/core/text/positionToOffset.js';
+import { IInlineCompletionChangeHint, InlineCompletion, InlineCompletionContext, InlineCompletions, InlineCompletionsProvider } from '../../../../common/languages.js';
+import { ITextModel } from '../../../../common/model.js';
 import { ILanguageFeaturesService } from '../../../../common/services/languageFeatures.js';
 import { LanguageFeaturesService } from '../../../../common/services/languageFeaturesService.js';
+import { IModelService } from '../../../../common/services/model.js';
+import { IResolvedTextEditorModel, ITextModelService } from '../../../../common/services/resolverService.js';
 import { ViewModel } from '../../../../common/viewModel/viewModelImpl.js';
+import { ITestCodeEditor, TestCodeEditorInstantiationOptions, withAsyncTestCodeEditor } from '../../../../test/browser/testCodeEditor.js';
 import { InlineCompletionsController } from '../../browser/controller/inlineCompletionsController.js';
-import { Range } from '../../../../common/core/range.js';
-import { TextEdit } from '../../../../common/core/edits/textEdit.js';
-import { BugIndicatingError } from '../../../../../base/common/errors.js';
-import { PositionOffsetTransformer } from '../../../../common/core/text/positionToOffset.js';
+import { InlineCompletionsModel } from '../../browser/model/inlineCompletionsModel.js';
 import { InlineSuggestionsView } from '../../browser/view/inlineSuggestionsView.js';
-import { IBulkEditService } from '../../../../browser/services/bulkEditService.js';
-import { IDefaultAccountService } from '../../../../../platform/defaultAccount/common/defaultAccount.js';
-import { Emitter, Event } from '../../../../../base/common/event.js';
-import { IRenameSymbolTrackerService, NullRenameSymbolTrackerService } from '../../../../browser/services/renameSymbolTrackerService.js';
-import { ITextModelService, IResolvedTextEditorModel } from '../../../../common/services/resolverService.js';
-import { IModelService } from '../../../../common/services/model.js';
-import { URI } from '../../../../../base/common/uri.js';
-import { SyncDescriptor } from '../../../../../platform/instantiation/common/descriptors.js';
 
 export class MockInlineCompletionsProvider implements InlineCompletionsProvider {
 	private returnValue: InlineCompletion[] = [];
@@ -274,6 +274,8 @@ export async function withAsyncTestCodeEditorAndInlineCompletionsModel<T>(
 					onDidChangeDefaultAccount: Event.None,
 					onDidChangePolicyData: Event.None,
 					policyData: null,
+					copilotTokenInfo: null,
+					onDidChangeCopilotTokenInfo: Event.None,
 					getDefaultAccount: async () => null,
 					setDefaultAccountProvider: () => { },
 					getDefaultAccountAuthenticationProvider: () => { return { id: 'mockProvider', name: 'Mock Provider', enterprise: false }; },