Merge branch 'main' into agents/fix-bracket-notation-workbench-services

Author: dmitrivMS

.eslint-allowed-bracket-notation-files

@@ -529,4 +529,23 @@ test/unit/electron/preload.js
 test/unit/electron/renderer.js
 
 # Default account service tests (1 file)
+# Workbench UI and remaining services (23 files)
+src/vs/workbench/browser/parts/editor/editor.ts
+src/vs/workbench/browser/parts/editor/editorGroupView.ts
+src/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration.ts
+src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEditPane.ts
+src/vs/workbench/contrib/callHierarchy/browser/callHierarchyPeek.ts
+src/vs/workbench/contrib/issue/electron-browser/nativeGitHubUploadService.ts
+src/vs/workbench/contrib/localization/electron-browser/localization.contribution.ts
+src/vs/workbench/contrib/policyExport/electron-browser/policyExport.contribution.ts
+src/vs/workbench/contrib/policyExport/test/node/policyExport.integrationTest.ts
+src/vs/workbench/contrib/search/browser/replaceService.ts
+src/vs/workbench/contrib/tags/electron-browser/workspaceTags.ts
+src/vs/workbench/contrib/tags/electron-browser/workspaceTagsService.ts
+src/vs/workbench/contrib/themes/browser/themes.contribution.ts
+src/vs/workbench/contrib/themes/test/node/colorRegistry.releaseTest.ts
+src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchyPeek.ts
+src/vs/workbench/contrib/update/common/updateInfoParser.ts
+src/vs/workbench/contrib/webview/browser/pre/service-worker.js
+src/vs/workbench/contrib/welcomeWalkthrough/browser/walkThroughInput.ts
 src/vs/workbench/services/accounts/test/browser/defaultAccount.test.ts

.github/workflows/chat-lib-package.yml

@@ -2,6 +2,9 @@ name: chat-lib tests
 
 on:
   pull_request:
+    branches:
+      - main
+      - 'release/*'
   workflow_dispatch:
 
 permissions:

.github/workflows/copilot-setup-steps.yml

@@ -8,6 +8,9 @@ on:
     paths:
       - .github/workflows/copilot-setup-steps.yml
   pull_request:
+    branches:
+      - main
+      - 'release/*'
     paths:
       - .github/workflows/copilot-setup-steps.yml
 

.github/workflows/monaco-editor.yml

@@ -68,6 +68,9 @@ jobs:
       - name: Run Monaco Editor Checks
         run: npm run monaco-compile-check
 
+      - name: Check generated Monaco declarations
+        run: npm run gulp monacodts-check
+
       - name: Editor Distro & ESM
         run: npm run gulp editor-distro
 

.github/workflows/telemetry.yml

@@ -1,5 +1,11 @@
 name: 'Telemetry'
-on: pull_request
+
+on:
+  pull_request:
+    branches:
+      - main
+      - 'release/*'
+
 permissions: {}
 jobs:
   check-metadata:

build/azure-pipelines/product-build-ado-ci.yml

@@ -83,7 +83,7 @@ parameters:
   - name: VSCODE_CLI_CANARY_VERSION
     displayName: "Product @github/copilot runtime version ('auto' = infer from an SDK override)"
     type: string
-    default: 1.0.84-canary.67.g6496fad.unsigned
+    default: 1.0.84-canary.70.gdb75d0d.unsigned
 
 variables:
   - name: VSCODE_PRIVATE_BUILD

build/azure-pipelines/product-build.yml

@@ -136,7 +136,7 @@ parameters:
   - name: VSCODE_CLI_CANARY_VERSION
     displayName: "Product @github/copilot runtime version ('auto' = infer from an SDK override)"
     type: string
-    default: 1.0.84-canary.67.g6496fad.unsigned
+    default: 1.0.84-canary.70.gdb75d0d.unsigned
 
 variables:
   - name: VSCODE_BUILD_TITLE_PREFIX

build/gulpfile.editor.ts

@@ -20,6 +20,7 @@ import { createReporter } from './lib/reporter.ts';
 import monacoPackage from './monaco/package.json' with { type: 'json' };
 
 const root = path.dirname(import.meta.dirname);
+const standaloneEnumsPath = path.join(root, 'src/vs/editor/common/standalone/standaloneEnums.ts');
 const sha1 = getVersion(root);
 const semver = monacoPackage.version;
 const headerVersion = semver + '(' + sha1 + ')';
@@ -226,7 +227,18 @@ task.task('editor-distro',
 task.task('monacodts', task.define('monacodts', () => {
 	const result = monacoapi.execute();
 	fs.writeFileSync(result.filePath, result.content);
-	fs.writeFileSync(path.join(root, 'src/vs/editor/common/standalone/standaloneEnums.ts'), result.enums);
+	fs.writeFileSync(standaloneEnumsPath, result.enums);
+	return Promise.resolve(true);
+}));
+
+task.task('monacodts-check', task.define('monacodts-check', () => {
+	const result = monacoapi.execute();
+	const currentEnums = fs.readFileSync(standaloneEnumsPath).toString();
+	const normalizedCurrentEnums = currentEnums.replace(/\r\n/g, '\n');
+	const normalizedGeneratedEnums = result.enums.replace(/\r\n/g, '\n');
+	if (!result.isTheSame || normalizedCurrentEnums !== normalizedGeneratedEnums) {
+		throw new Error('Monaco declarations are no longer up to date. Run `npm run gulp monacodts` and commit the generated files.');
+	}
 	return Promise.resolve(true);
 }));
 

extensions/copilot/package.json

@@ -92,6 +92,7 @@
     "agentsWindowConfiguration",
     "chatDebug",
     "chatHooks",
+    "envIsConnectionMetered",
     "extensionsAny",
     "newSymbolNamesProvider",
     "interactive",

extensions/copilot/src/extension/completions-core/vscode-node/extension/src/vscodeInlineCompletionItemProvider.ts

@@ -6,6 +6,7 @@
 import { basename } from 'path';
 import {
 	CancellationToken,
+	env,
 	InlineCompletionContext,
 	InlineCompletionEndOfLifeReason,
 	InlineCompletionItemProvider,
@@ -102,6 +103,10 @@ export class CopilotInlineCompletionItemProvider extends Disposable implements I
 		token: CancellationToken
 	): Promise<GhostTextCompletionList | undefined> {
 
+		if (context.triggerKind === InlineCompletionTriggerKind.Automatic && env.isMeteredConnection) {
+			return;
+		}
+
 		// it's ok to return an undefined here because we don't want telemetry for when automatic completions are disabled
 		if (context.triggerKind === InlineCompletionTriggerKind.Automatic) {
 			if (!this.instantiationService.invokeFunction(isCompletionEnabledForDocument, doc)) {