[pull] main from microsoft:main

.eslint-plugin-local/code-no-telemetry-common-property.ts

@@ -0,0 +1,103 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as eslint from 'eslint';
+import type * as ESTree from 'estree';
+
+const telemetryMethods = new Set(['publicLog', 'publicLog2', 'publicLogError', 'publicLogError2']);
+
+/**
+ * Common telemetry property names that are automatically added to every event.
+ * Telemetry events must not set these because they would collide with / be
+ * overwritten by the common properties that the telemetry pipeline injects.
+ *
+ * Collected from:
+ *   - src/vs/platform/telemetry/common/commonProperties.ts  (resolveCommonProperties)
+ *   - src/vs/workbench/services/telemetry/common/workbenchCommonProperties.ts
+ *   - src/vs/workbench/services/telemetry/browser/workbenchCommonProperties.ts
+ */
+const commonTelemetryProperties = new Set([
+	'common.machineid',
+	'common.sqmid',
+	'common.devdeviceid',
+	'sessionid',
+	'commithash',
+	'version',
+	'common.releasedate',
+	'common.platformversion',
+	'common.platform',
+	'common.nodeplatform',
+	'common.nodearch',
+	'common.product',
+	'common.msftinternal',
+	'timestamp',
+	'common.timesincesessionstart',
+	'common.sequence',
+	'common.snap',
+	'common.platformdetail',
+	'common.version.shell',
+	'common.version.renderer',
+	'common.firstsessiondate',
+	'common.lastsessiondate',
+	'common.isnewsession',
+	'common.remoteauthority',
+	'common.cli',
+	'common.useragent',
+	'common.istouchdevice',
+]);
+
+export default new class NoTelemetryCommonProperty implements eslint.Rule.RuleModule {
+
+	readonly meta: eslint.Rule.RuleMetaData = {
+		messages: {
+			noCommonProperty: 'Telemetry events must not contain the common property "{{name}}". Common properties are automatically added by the telemetry pipeline and will be dropped.',
+		},
+		schema: false,
+	};
+
+	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
+
+		/**
+		 * Check whether any property key in an object expression is a reserved common telemetry property.
+		 */
+		function checkObjectForCommonProperties(node: ESTree.ObjectExpression) {
+			for (const prop of node.properties) {
+				if (prop.type === 'Property') {
+					let name: string | undefined;
+					if (prop.key.type === 'Identifier') {
+						name = prop.key.name;
+					} else if (prop.key.type === 'Literal' && typeof prop.key.value === 'string') {
+						name = prop.key.value;
+					}
+					if (name && commonTelemetryProperties.has(name.toLowerCase())) {
+						context.report({
+							node: prop.key,
+							messageId: 'noCommonProperty',
+							data: { name },
+						});
+					}
+				}
+			}
+		}
+
+		return {
+			['CallExpression[callee.property.type="Identifier"]'](node: ESTree.CallExpression) {
+				const callee = node.callee;
+				if (callee.type !== 'MemberExpression') {
+					return;
+				}
+				const prop = callee.property;
+				if (prop.type !== 'Identifier' || !telemetryMethods.has(prop.name)) {
+					return;
+				}
+				// The data argument is the second argument for publicLog/publicLog2/publicLogError/publicLogError2
+				const dataArg = node.arguments[1];
+				if (dataArg && dataArg.type === 'ObjectExpression') {
+					checkObjectForCommonProperties(dataArg);
+				}
+			},
+		};
+	}
+};

.github/prompts/fix-error.prompt.md

@@ -23,16 +23,32 @@ After the fix is validated (compilation clean, tests pass):
 1. **Create a branch**: `git checkout -b <github-username>/<short-description>` (e.g., `bryanchen-d/fix-notebook-index-error`).
 2. **Commit**: Stage changed files and commit with a message like `fix: <brief description> (#<issue-number>)`.
 3. **Push**: `git push -u origin <branch-name>`.
-4. **Create a draft PR** with a description that includes:
-   - A summary of the change.
-   - `Fixes #<issue-number>` so GitHub auto-closes the issue when the PR merges.
-   - What scenarios may trigger the error.
-   - The code flow explaining why the error gets thrown and goes unhandled.
-   - Steps a user can follow to manually validate the fix.
-   - How the fix addresses the issue, with a brief note per changed file.
-5. **Monitor the PR** for Copilot review comments. Wait 1-2 minutes after each push for Copilot to leave its review, then check for new comments. Evaluate each comment:
-   - If valid, apply the fix in a new commit, push, and **resolve the comment thread** using the GitHub GraphQL API (`resolveReviewThread` mutation with the thread's node ID).
-   - If not applicable, leave a reply explaining why.
-   - After addressing comments, update the PR description if the changes affect the summary, code flow explanation, or per-file notes.
-6. **Repeat monitoring** after each push: wait 1-2 minutes, check for new Copilot comments, and address them. Continue this loop until no new comments appear.
-7. **Re-run tests** after addressing review comments to confirm nothing regressed.
+4. **Create a draft PR** with a description that includes these sections:
+   - **Summary**: A concise description of what was changed and why.
+   - **Issue link**: `Fixes #<issue-number>` so GitHub auto-closes the issue when the PR merges.
+   - **Trigger scenarios**: What user actions or system conditions cause this error to surface.
+   - **Code flow diagram**: A Mermaid swimlane/sequence diagram showing the call chain from trigger to error. Use participant labels for the key components (e.g., classes, modules, processes). Example:
+     ````
+     ```mermaid
+     sequenceDiagram
+         participant A as CallerComponent
+         participant B as MiddleLayer
+         participant C as LowLevelUtil
+         A->>B: someOperation(data)
+         B->>C: validate(data)
+         C-->>C: data is invalid
+         C->>B: throws "error message"
+         B->>A: unhandled error propagates
+     ```
+     ````
+   - **Manual validation steps**: Concrete, step-by-step instructions a reviewer can follow to reproduce the original error and verify the fix. Include specific setup requirements (e.g., file types to open, settings to change, actions to perform). If the error cannot be easily reproduced manually, explain why and describe what alternative validation was performed (e.g., unit tests, code inspection).
+   - **How the fix works**: A brief explanation of the fix approach, with a note per changed file.
+5. **Monitor the PR — BLOCKING**: You MUST NOT complete the task until the monitoring loop below is done.
+   - Wait 2 minutes after each push, then check for Copilot review comments using `gh pr view <number> --json reviews,comments` and `gh api repos/{owner}/{repo}/pulls/{number}/comments`.
+   - If there are review comments, evaluate each one:
+     - If valid, apply the fix in a new commit, push, and **resolve the comment thread** using the GitHub GraphQL API (`resolveReviewThread` mutation with the thread's node ID).
+     - If not applicable, leave a reply explaining why.
+     - After addressing comments, update the PR description if the changes affect the summary, diagram, or per-file notes.
+   - **Re-run tests** after addressing review comments to confirm nothing regressed.
+   - After each push, repeat the wait-and-check cycle. Continue until **two consecutive checks return zero new comments**.
+6. **Verify CI**: After the monitoring loop is done, check that CI checks are passing using `gh pr checks <number>`. If any required checks fail, investigate and fix. Do NOT complete the task with failing CI.

.vscode/extensions/vscode-extras/src/npmUpToDateFeature.ts

@@ -112,7 +112,7 @@ export class NpmUpToDateFeature extends vscode.Disposable {
 		}
 		try {
 			const script = path.join(workspaceRoot, 'build', 'npm', 'installStateHash.ts');
-			const output = cp.execFileSync(process.execPath, [script], {
+			const output = cp.execFileSync(process.execPath, [script, '--ignore-node-version'], {
 				cwd: workspaceRoot,
 				timeout: 10_000,
 				encoding: 'utf8',

.vscode/notebooks/my-endgame.github-issues

@@ -7,7 +7,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$MILESTONE=milestone:\"1.112.0\"\n\n$MINE=assignee:@me"
+    "value": "$MILESTONE=milestone:\"1.113.0\"\n\n$MINE=assignee:@me"
   },
   {
     "kind": 2,

.vscode/notebooks/my-work.github-issues

@@ -7,7 +7,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "// list of repos we work in\n$REPOS=repo:microsoft/lsprotocol repo:microsoft/monaco-editor repo:microsoft/vscode repo:microsoft/vscode-anycode repo:microsoft/vscode-autopep8 repo:microsoft/vscode-black-formatter repo:microsoft/vscode-copilot repo:microsoft/vscode-copilot-release repo:microsoft/vscode-dev repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-flake8 repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-hexeditor repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-isort repo:microsoft/vscode-js-debug repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-l10n repo:microsoft/vscode-livepreview repo:microsoft/vscode-markdown-languageservice repo:microsoft/vscode-markdown-tm-grammar repo:microsoft/vscode-mypy repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-pylint repo:microsoft/vscode-python repo:microsoft/vscode-python-debugger repo:microsoft/vscode-python-tools-extension-template repo:microsoft/vscode-references-view repo:microsoft/vscode-remote-release repo:microsoft/vscode-remote-repositories-github repo:microsoft/vscode-remote-tunnels repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-unpkg repo:microsoft/vscode-vsce repo:microsoft/vscode-copilot-issues repo:microsoft/vscode-extension-samples\n\n// current milestone name\n$MILESTONE=milestone:\"March 2026\"\n"
+    "value": "// list of repos we work in\n$REPOS=repo:microsoft/lsprotocol repo:microsoft/monaco-editor repo:microsoft/vscode repo:microsoft/vscode-anycode repo:microsoft/vscode-autopep8 repo:microsoft/vscode-black-formatter repo:microsoft/vscode-copilot repo:microsoft/vscode-copilot-release repo:microsoft/vscode-dev repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-flake8 repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-hexeditor repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-isort repo:microsoft/vscode-js-debug repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-l10n repo:microsoft/vscode-livepreview repo:microsoft/vscode-markdown-languageservice repo:microsoft/vscode-markdown-tm-grammar repo:microsoft/vscode-mypy repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-pylint repo:microsoft/vscode-python repo:microsoft/vscode-python-debugger repo:microsoft/vscode-python-tools-extension-template repo:microsoft/vscode-references-view repo:microsoft/vscode-remote-release repo:microsoft/vscode-remote-repositories-github repo:microsoft/vscode-remote-tunnels repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-unpkg repo:microsoft/vscode-vsce repo:microsoft/vscode-copilot-issues repo:microsoft/vscode-extension-samples\n\n// current milestone name\n$MILESTONE=milestone:\"1.113.0\"\n"
   },
   {
     "kind": 1,

build/azure-pipelines/win32/product-build-win32-cli.yml

@@ -120,6 +120,9 @@ jobs:
             SYSTEM_ACCESSTOKEN: $(System.AccessToken)
           displayName: ✍️ Codesign
 
+        - powershell: Remove-Item -Path "$(Build.ArtifactStagingDirectory)/sign/CodeSignSummary*.md" -Force -ErrorAction SilentlyContinue
+          displayName: Remove CodeSignSummary
+
         - task: ArchiveFiles@2
           displayName: Archive signed CLI
           inputs:

build/next/index.ts

@@ -129,6 +129,7 @@ const serverEntryPoints = [
 	'vs/workbench/api/node/extensionHostProcess',
 	'vs/platform/files/node/watcher/watcherMain',
 	'vs/platform/terminal/node/ptyHostMain',
+	'vs/platform/agentHost/node/agentHostMain',
 ];
 
 // Bootstrap files per target

build/npm/installStateHash.ts

@@ -87,7 +87,7 @@ function hashContent(content: string): string {
 	return hash.digest('hex');
 }
 
-export function computeState(): PostinstallState {
+export function computeState(options?: { ignoreNodeVersion?: boolean }): PostinstallState {
 	const fileHashes: Record<string, string> = {};
 	for (const filePath of collectInputFiles()) {
 		const key = path.relative(root, filePath);
@@ -97,7 +97,7 @@ export function computeState(): PostinstallState {
 			// file may not be readable
 		}
 	}
-	return { nodeVersion: process.versions.node, fileHashes };
+	return { nodeVersion: options?.ignoreNodeVersion ? '' : process.versions.node, fileHashes };
 }
 
 export function computeContents(): Record<string, string> {
@@ -141,18 +141,23 @@ export function readSavedContents(): Record<string, string> | undefined {
 
 // When run directly, output state as JSON for tooling (e.g. the vscode-extras extension).
 if (import.meta.filename === process.argv[1]) {
-	if (process.argv[2] === '--normalize-file') {
-		const filePath = process.argv[3];
+	const args = new Set(process.argv.slice(2));
+
+	if (args.has('--normalize-file')) {
+		const filePath = process.argv[process.argv.indexOf('--normalize-file') + 1];
 		if (!filePath) {
 			process.exit(1);
 		}
 		process.stdout.write(normalizeFileContent(filePath));
 	} else {
+		const ignoreNodeVersion = args.has('--ignore-node-version');
+		const current = computeState({ ignoreNodeVersion });
+		const saved = readSavedState();
 		console.log(JSON.stringify({
 			root,
 			stateContentsFile,
-			current: computeState(),
-			saved: readSavedState(),
+			current,
+			saved: saved && ignoreNodeVersion ? { nodeVersion: '', fileHashes: saved.fileHashes } : saved,
 			files: [...collectInputFiles(), stateFile],
 		}));
 	}

cli/Cargo.toml

@@ -53,7 +53,7 @@ cfg-if = "1.0.0"
 pin-project = "1.1.0"
 console = "0.15.7"
 bytes = "1.11.1"
-tar = "0.4.38"
+tar = "0.4.45"
 
 [build-dependencies]
 serde = { version="1.0.163", features = ["derive"] }