[pull] main from microsoft:main

build/gulpfile.vscode.ts

@@ -100,6 +100,7 @@ const vscodeResourceIncludes = [
 	// Sessions
 	'out-build/vs/sessions/contrib/chat/browser/media/*.svg',
 	'out-build/vs/sessions/prompts/*.prompt.md',
+	'out-build/vs/sessions/skills/**/SKILL.md',
 
 	// Extensions
 	'out-build/vs/workbench/contrib/extensions/browser/media/{theme-icon.png,language-icon.svg}',

extensions/css-language-features/package.json

@@ -218,7 +218,7 @@
             },
             "scope": "resource",
             "default": [],
-            "description": "%css.lint.validProperties.desc%"
+            "markdownDescription": "%css.lint.validProperties.desc%"
           },
           "css.lint.ieHack": {
             "type": "string",
@@ -534,7 +534,7 @@
             },
             "scope": "resource",
             "default": [],
-            "description": "%scss.lint.validProperties.desc%"
+            "markdownDescription": "%scss.lint.validProperties.desc%"
           },
           "scss.lint.ieHack": {
             "type": "string",
@@ -840,7 +840,7 @@
             },
             "scope": "resource",
             "default": [],
-            "description": "%less.lint.validProperties.desc%"
+            "markdownDescription": "%less.lint.validProperties.desc%"
           },
           "less.lint.ieHack": {
             "type": "string",

extensions/css-language-features/package.nls.json

@@ -33,7 +33,7 @@
 	"css.format.enable.desc": "Enable/disable default CSS formatter.",
 	"css.format.newlineBetweenSelectors.desc": "Separate selectors with a new line.",
 	"css.format.newlineBetweenRules.desc": "Separate rulesets by a blank line.",
-	"css.format.spaceAroundSelectorSeparator.desc": "Ensure a space character around selector separators '>', '+', '~' (e.g. `a > b`).",
+	"css.format.spaceAroundSelectorSeparator.desc": "Ensure a space character around selector separators `>`, `+`, `~` (e.g. `a > b`).",
 	"css.format.braceStyle.desc": "Put braces on the same line as rules (`collapse`) or put braces on own line (`expand`).",
 	"css.format.preserveNewLines.desc": "Whether existing line breaks before rules and declarations should be preserved.",
 	"css.format.maxPreserveNewLines.desc": "Maximum number of line breaks to be preserved in one chunk, when `#css.format.preserveNewLines#` is enabled.",
@@ -67,7 +67,7 @@
 	"less.format.enable.desc": "Enable/disable default LESS formatter.",
 	"less.format.newlineBetweenSelectors.desc": "Separate selectors with a new line.",
 	"less.format.newlineBetweenRules.desc": "Separate rulesets by a blank line.",
-	"less.format.spaceAroundSelectorSeparator.desc": "Ensure a space character around selector separators '>', '+', '~' (e.g. `a > b`).",
+	"less.format.spaceAroundSelectorSeparator.desc": "Ensure a space character around selector separators `>`, `+`, `~` (e.g. `a > b`).",
 	"less.format.braceStyle.desc": "Put braces on the same line as rules (`collapse`) or put braces on own line (`expand`).",
 	"less.format.preserveNewLines.desc": "Whether existing line breaks before rules and declarations should be preserved.",
 	"less.format.maxPreserveNewLines.desc": "Maximum number of line breaks to be preserved in one chunk, when `#less.format.preserveNewLines#` is enabled.",
@@ -101,7 +101,7 @@
 	"scss.format.enable.desc": "Enable/disable default SCSS formatter.",
 	"scss.format.newlineBetweenSelectors.desc": "Separate selectors with a new line.",
 	"scss.format.newlineBetweenRules.desc": "Separate rulesets by a blank line.",
-	"scss.format.spaceAroundSelectorSeparator.desc": "Ensure a space character around selector separators '>', '+', '~' (e.g. `a > b`).",
+	"scss.format.spaceAroundSelectorSeparator.desc": "Ensure a space character around selector separators `>`, `+`, `~` (e.g. `a > b`).",
 	"scss.format.braceStyle.desc": "Put braces on the same line as rules (`collapse`) or put braces on own line (`expand`).",
 	"scss.format.preserveNewLines.desc": "Whether existing line breaks before rules and declarations should be preserved.",
 	"scss.format.maxPreserveNewLines.desc": "Maximum number of line breaks to be preserved in one chunk, when `#scss.format.preserveNewLines#` is enabled.",

extensions/emmet/package.nls.json

@@ -50,10 +50,10 @@
 	"emmetPreferencesFormatNoIndentTags": "An array of tag names that should never get inner indentation.",
 	"emmetPreferencesFormatForceIndentTags": "An array of tag names that should always get inner indentation.",
 	"emmetPreferencesAllowCompactBoolean": "If `true`, compact notation of boolean attributes are produced.",
-	"emmetPreferencesCssWebkitProperties": "Comma separated CSS properties that get the 'webkit' vendor prefix when used in Emmet abbreviation that starts with `-`. Set to empty string to always avoid the 'webkit' prefix.",
-	"emmetPreferencesCssMozProperties": "Comma separated CSS properties that get the 'moz' vendor prefix when used in Emmet abbreviation that starts with `-`. Set to empty string to always avoid the 'moz' prefix.",
-	"emmetPreferencesCssOProperties": "Comma separated CSS properties that get the 'o' vendor prefix when used in Emmet abbreviation that starts with `-`. Set to empty string to always avoid the 'o' prefix.",
-	"emmetPreferencesCssMsProperties": "Comma separated CSS properties that get the 'ms' vendor prefix when used in Emmet abbreviation that starts with `-`. Set to empty string to always avoid the 'ms' prefix.",
+	"emmetPreferencesCssWebkitProperties": "Comma separated CSS properties that get the `webkit` vendor prefix when used in Emmet abbreviation that starts with `-`. Set to empty string to always avoid the `webkit` prefix.",
+	"emmetPreferencesCssMozProperties": "Comma separated CSS properties that get the `moz` vendor prefix when used in Emmet abbreviation that starts with `-`. Set to empty string to always avoid the `moz` prefix.",
+	"emmetPreferencesCssOProperties": "Comma separated CSS properties that get the `o` vendor prefix when used in Emmet abbreviation that starts with `-`. Set to empty string to always avoid the `o` prefix.",
+	"emmetPreferencesCssMsProperties": "Comma separated CSS properties that get the `ms` vendor prefix when used in Emmet abbreviation that starts with `-`. Set to empty string to always avoid the `ms` prefix.",
 	"emmetPreferencesCssFuzzySearchMinScore": "The minimum score (from 0 to 1) that fuzzy-matched abbreviation should achieve. Lower values may produce many false-positive matches, higher values may reduce possible matches.",
 	"emmetOptimizeStylesheetParsing": "When set to `false`, the whole file is parsed to determine if current position is valid for expanding Emmet abbreviations. When set to `true`, only the content around the current position in CSS/SCSS/Less files is parsed.",
 	"emmetPreferencesOutputInlineBreak": "The number of sibling inline elements needed for line breaks to be placed between those elements. If `0`, inline elements are always expanded onto a single line.",

extensions/json-language-features/package.json

@@ -59,17 +59,17 @@
               "url": {
                 "type": "string",
                 "default": "/user.schema.json",
-                "description": "%json.schemas.url.desc%"
+                "markdownDescription": "%json.schemas.url.desc%"
               },
               "fileMatch": {
                 "type": "array",
                 "items": {
                   "type": "string",
                   "default": "MyFile.json",
-                  "description": "%json.schemas.fileMatch.item.desc%"
+                  "markdownDescription": "%json.schemas.fileMatch.item.desc%"
                 },
                 "minItems": 1,
-                "description": "%json.schemas.fileMatch.desc%"
+                "markdownDescription": "%json.schemas.fileMatch.desc%"
               },
               "schema": {
                 "$ref": "http://json-schema.org/draft-07/schema#",
@@ -141,7 +141,7 @@
           "additionalProperties": {
             "type": "boolean"
           },
-          "description": "%json.schemaDownload.trustedDomains.desc%",
+          "markdownDescription": "%json.schemaDownload.trustedDomains.desc%",
           "tags": [
             "usesOnlineServices"
           ]

extensions/json-language-features/package.nls.json

@@ -2,12 +2,12 @@
 	"displayName": "JSON Language Features",
 	"description": "Provides rich language support for JSON files.",
 	"json.schemas.desc": "Associate schemas to JSON files in the current project.",
-	"json.schemas.url.desc": "A URL or absolute file path to a schema. Can be a relative path (starting with './') in workspace and workspace folder settings.",
-	"json.schemas.fileMatch.desc": "An array of file patterns to match against when resolving JSON files to schemas. `*` and '**' can be used as a wildcard. Exclusion patterns can also be defined and start with '!'. A file matches when there is at least one matching pattern and the last matching pattern is not an exclusion pattern.",
-	"json.schemas.fileMatch.item.desc": "A file pattern that can contain '*' and '**' to match against when resolving JSON files to schemas. When beginning with '!', it defines an exclusion pattern.",
+	"json.schemas.url.desc": "A URL or absolute file path to a schema. Can be a relative path (starting with `./`) in workspace and workspace folder settings.",
+	"json.schemas.fileMatch.desc": "An array of file patterns to match against when resolving JSON files to schemas. `*` and `**` can be used as a wildcard. Exclusion patterns can also be defined and start with `!`. A file matches when there is at least one matching pattern and the last matching pattern is not an exclusion pattern.",
+	"json.schemas.fileMatch.item.desc": "A file pattern that can contain `*` and `**` to match against when resolving JSON files to schemas. When beginning with `!`, it defines an exclusion pattern.",
 	"json.schemas.schema.desc": "The schema definition for the given URL. The schema only needs to be provided to avoid accesses to the schema URL.",
 	"json.format.enable.desc": "Enable/disable default JSON formatter",
-	"json.format.keepLines.desc" : "Keep all existing new lines when formatting.",
+	"json.format.keepLines.desc": "Keep all existing new lines when formatting.",
 	"json.validate.enable.desc": "Enable/disable JSON validation.",
 	"json.tracing.desc": "Traces the communication between VS Code and the JSON language server.",
 	"json.colorDecorators.enable.desc": "Enables or disables color decorators",
@@ -20,5 +20,5 @@
 	"json.command.clearCache": "Clear Schema Cache",
 	"json.command.sort": "Sort Document",
 	"json.workspaceTrust": "The extension requires workspace trust to load schemas from http and https.",
-	"json.schemaDownload.trustedDomains.desc": "List of trusted domains for downloading JSON schemas over http(s). Use '*' to trust all domains. '*' can also be used as a wildcard in domain names."
+	"json.schemaDownload.trustedDomains.desc": "List of trusted domains for downloading JSON schemas over http(s). Use `*` to trust all domains. `*` can also be used as a wildcard in domain names."
 }

extensions/npm/package.json

@@ -295,7 +295,7 @@
           "default": false,
           "scope": "resource",
           "deprecationMessage": "The NPM Script Explorer is now available in 'Views' menu in the Explorer in all folders.",
-          "description": "%config.npm.enableScriptExplorer%"
+          "markdownDescription": "%config.npm.enableScriptExplorer%"
         },
         "npm.enableRunFromFolder": {
           "type": "boolean",
@@ -333,7 +333,7 @@
         },
         "npm.scriptHover": {
           "type": "boolean",
-          "description": "%config.npm.scriptHover%",
+          "markdownDescription": "%config.npm.scriptHover%",
           "default": true,
           "scope": "window"
         }

extensions/npm/package.nls.json

@@ -19,12 +19,12 @@
 	"config.npm.scriptRunner.node": "Use Node.js as the script runner.",
 	"config.npm.scriptRunner.auto": "Auto-detect which script runner to use based on lock files and installed package managers.",
 	"config.npm.exclude": "Configure glob patterns for folders that should be excluded from automatic script detection.",
-	"config.npm.enableScriptExplorer": "Enable an explorer view for npm scripts when there is no top-level 'package.json' file.",
+	"config.npm.enableScriptExplorer": "Enable an explorer view for npm scripts when there is no top-level `package.json` file.",
 	"config.npm.scriptExplorerAction": "The default click action used in the NPM Scripts Explorer: `open` or `run`, the default is `open`.",
 	"config.npm.scriptExplorerExclude": "An array of regular expressions that indicate which scripts should be excluded from the NPM Scripts view.",
 	"config.npm.enableRunFromFolder": "Enable running npm scripts contained in a folder from the Explorer context menu.",
 	"config.npm.fetchOnlinePackageInfo": "Fetch data from https://registry.npmjs.org and https://registry.bower.io to provide auto-completion and information on hover features on npm dependencies.",
-	"config.npm.scriptHover": "Display hover with 'Run' and 'Debug' commands for scripts.",
+	"config.npm.scriptHover": "Display hover with `Run` and `Debug` commands for scripts.",
 	"npm.parseError": "Npm task detection: failed to parse the file {0}",
 	"taskdef.script": "The npm script to customize.",
 	"taskdef.path": "The path to the folder of the package.json file that provides the script. Can be omitted.",

extensions/typescript-language-features/package.json

@@ -2423,15 +2423,15 @@
           },
           "js/ts.tsserver.node.path": {
             "type": "string",
-            "description": "%configuration.tsserver.nodePath%",
+            "markdownDescription": "%configuration.tsserver.nodePath%",
             "scope": "window",
             "keywords": [
               "TypeScript"
             ]
           },
           "typescript.tsserver.nodePath": {
             "type": "string",
-            "description": "%configuration.tsserver.nodePath%",
+            "markdownDescription": "%configuration.tsserver.nodePath%",
             "markdownDeprecationMessage": "%configuration.tsserver.nodePath.unifiedDeprecationMessage%",
             "scope": "window"
           },

extensions/typescript-language-features/package.nls.json

@@ -317,7 +317,7 @@
 	"configuration.tsserver.web.projectWideIntellisense.suppressSemanticErrors.unifiedDeprecationMessage": "This setting is deprecated. Use `#js/ts.tsserver.web.projectWideIntellisense.suppressSemanticErrors#` instead.",
 	"configuration.tsserver.web.typeAcquisition.enabled": "Enable/disable package acquisition on the web. This enables IntelliSense for imported packages. Requires `#js/ts.tsserver.web.projectWideIntellisense.enabled#`. Currently not supported for Safari.",
 	"configuration.tsserver.web.typeAcquisition.enabled.unifiedDeprecationMessage": "This setting is deprecated. Use `#js/ts.tsserver.web.typeAcquisition.enabled#` instead.",
-	"configuration.tsserver.nodePath": "Run TS Server on a custom Node installation. This can be a path to a Node executable, or 'node' if you want VS Code to detect a Node installation.",
+	"configuration.tsserver.nodePath": "Run TS Server on a custom Node installation. This can be a path to a Node executable, or `node` if you want VS Code to detect a Node installation.",
 	"configuration.tsserver.nodePath.unifiedDeprecationMessage": "This setting is deprecated. Use `#js/ts.tsserver.node.path#` instead.",
 	"configuration.tsserver.watchOptions.unifiedDeprecationMessage": "This setting is deprecated. Use `#js/ts.tsserver.watchOptions#` instead.",
 	"configuration.updateImportsOnPaste": "Automatically update imports when pasting code. Requires TypeScript 5.6+.",

package.json

@@ -122,7 +122,7 @@
     "open": "^10.1.2",
     "playwright-core": "1.59.0-alpha-2026-02-20",
     "tas-client": "0.3.1",
-    "undici": "^7.18.2",
+    "undici": "^7.24.0",
     "v8-inspect-profiler": "^0.1.1",
     "vscode-oniguruma": "1.7.0",
     "vscode-regexpp": "^3.1.0",

product.json

@@ -52,8 +52,8 @@
 		},
 		{
 			"name": "ms-vscode.js-debug",
-			"version": "1.110.0",
-			"sha256": "ad3f7d935b64f4ee123853c464b47b3cba13e5018edef831770ae9c3eb218f5b",
+			"version": "1.112.0",
+			"sha256": "c24322931434940938f8cf76ebc3dac1e95a5539b9625b165b6672d7f7eafea8",
 			"repo": "https://github.com/microsoft/vscode-js-debug",
 			"metadata": {
 				"id": "25629058-ddac-4e17-abba-74678e126c5d",

src/vs/sessions/contrib/aiCustomizationTreeView/browser/aiCustomizationTreeView.contribution.ts

@@ -14,7 +14,7 @@ import { Codicon } from '../../../../base/common/codicons.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.js';
 import { URI } from '../../../../base/common/uri.js';
 import { IEditorService } from '../../../../workbench/services/editor/common/editorService.js';
-import { IFileService } from '../../../../platform/files/common/files.js';
+import { IFileService, FileSystemProviderCapabilities } from '../../../../platform/files/common/files.js';
 import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.js';
 import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
 
@@ -108,7 +108,8 @@ registerAction2(class extends Action2 {
 		});
 
 		if (confirmation.confirmed) {
-			await fileService.del(uri, { useTrash: true, recursive: true });
+			const useTrash = fileService.hasCapability(uri, FileSystemProviderCapabilities.Trash);
+			await fileService.del(uri, { useTrash, recursive: true });
 		}
 	}
 });

src/vs/sessions/contrib/aiCustomizationTreeView/browser/aiCustomizationTreeViewViews.ts

@@ -410,6 +410,7 @@ class UnifiedAICustomizationDataSource implements IAsyncDataSource<RootElement,
 			const workspaceSkills = cached.skills.filter(s => s.storage === PromptsStorage.local);
 			const userSkills = cached.skills.filter(s => s.storage === PromptsStorage.user);
 			const extensionSkills = cached.skills.filter(s => s.storage === PromptsStorage.extension);
+			const builtinSkills = cached.skills.filter(s => s.storage === BUILTIN_STORAGE);
 
 			if (workspaceSkills.length > 0) {
 				groups.push(this.createGroupItem(promptType, PromptsStorage.local, workspaceSkills.length));
@@ -420,6 +421,9 @@ class UnifiedAICustomizationDataSource implements IAsyncDataSource<RootElement,
 			if (extensionSkills.length > 0) {
 				groups.push(this.createGroupItem(promptType, PromptsStorage.extension, extensionSkills.length));
 			}
+			if (builtinSkills.length > 0) {
+				groups.push(this.createGroupItem(promptType, BUILTIN_STORAGE, builtinSkills.length));
+			}
 
 			return groups;
 		}