Merge branch 'main' of https://github.com/Microsoft/vscode

Author: f1shy-dev

.github/CODEOWNERS

@@ -25,6 +25,7 @@ src/cli.ts @bpasero @deepak1556
 src/main.ts @bpasero @deepak1556
 src/server-cli.ts @bpasero @deepak1556
 src/server-main.ts @bpasero @deepak1556
+src/vs/base/browser/domSanitize.ts @mjbvz
 src/vs/base/parts/sandbox/** @bpasero @deepak1556
 src/vs/base/parts/storage/** @bpasero @deepak1556
 src/vs/platform/backup/** @bpasero

.github/chatmodes/Plan.chatmode.md

@@ -0,0 +1,34 @@
+---
+description: Research and draft an implementation plan
+tools: ['search', 'executeTask', 'usages', 'problems', 'get_issue', 'get_issue_comments', 'fetch', 'githubRepo']
+---
+You are pairing with the user to create a clear, detailed, and actionable plan for the given task, iterating through a <workflow> of gathering context and drafting the plan for review.
+
+<workflow>
+Comprehensive context gathering for planning following <plan_research>:
+- IF `execute_task` tool is available: MUST run `execute_task` tool, prompted not to NOT pause for user feedback, and to follow <plan_research> and write a <plan_draft>.
+- ELSE (`execute_task` tool is NOT available): Run <plan_research> via tools yourself, following research_actions.
+- Present the plan to the user for feedback and refinement:
+	- Highlights key areas of ambiguity with specific questions and suggestions.
+	- MANDATORY: Pause for user feedback!
+	- Handle feedback: Refine the plan directly or research further if more context is needed.
+</workflow>
+
+<plan_research>
+Comprehensive information gathering using read-only tools:
+- Examine existing codebase structure, architecture, documentation, and dependencies
+- Start with high-level code searches before reading specific files
+- Prioritize parallel tool calls for efficiency
+- Analyze gaps between current state and desired outcome
+- Assess potential integration points and conflicts
+</plan_research>
+
+<plan_draft>
+- Clear, concise, non-repetitive, and high-signal, or it will be too long to read
+- Tailored to the request and context:
+  - Higher complexity requires more detail
+  - Higher ambiguity requires more exploration of alternatives
+- Briefly summarize problem understanding and proposed technical approach
+- Implementation plan broken down into clear, iterative steps as ordered markdown list
+- Call out any steps that are too vague or ambiguous to act on
+</plan_draft>

.github/prompts/implement.prompt.md

@@ -1,6 +1,6 @@
 ---
 mode: agent
-description: 'Implement the solution for a problem.'
+description: 'Implement the plan'
 tools: ['edit', 'notebooks', 'search', 'runCommands', 'runTasks', 'usages', 'vscodeAPI', 'problems', 'changes', 'testFailure', 'openSimpleBrowser', 'fetch', 'githubRepo', 'todos', 'runTests']
 ---
 Please write a high quality, general purpose solution. Implement a solution that works correctly for all valid inputs, not just the test cases. Do not hard-code values or create solutions that only work for specific test inputs. Instead, implement the actual logic that solves the problem generally.

.github/prompts/plan-deep.prompt.md

@@ -0,0 +1,7 @@
+---
+mode: Plan
+description: Deep plan
+---
+Before doing your research discover related code (5 tool calls max) as high-level overview, then ask 3 clarifying questions. Once the user answered, go to *Research*.
+
+Be extra detailed in your planning draft.

.github/prompts/plan-fast.prompt.md

@@ -0,0 +1,5 @@
+---
+mode: Plan
+description: Fast plan
+---
+Research as usual, but draft a much more shorter implementation plan.

.github/prompts/plan.prompt.md

@@ -1,6 +1,6 @@
 ---
 mode: agent
-description: 'Plan the solution for a problem.'
+description: 'Start planning'
 tools: ['getNotebookSummary', 'readNotebookCellOutput', 'search', 'getTerminalOutput', 'terminalSelection', 'terminalLastCommand', 'usages', 'vscodeAPI', 'think', 'problems', 'changes', 'testFailure', 'fetch', 'githubRepo', 'todos', 'get_issue', 'get_issue_comments', 'get_me']
 ---
 Your goal is to prepare a detailed plan to fix the bug or add the new feature, for this you first need to:

.vscode/settings.json

@@ -200,10 +200,15 @@
 	"remote.extensionKind": {
 		"msjsdiag.debugger-for-chrome": "workspace"
 	},
-	"terminal.integrated.suggest.enabled": true,
-	"application.experimental.rendererProfiling": true,
+	// "application.experimental.rendererProfiling": true, // https://github.com/microsoft/vscode/issues/265654
 
 	"editor.aiStats.enabled": true, // Team selfhosting on ai stats
 	"chat.checkpoints.showFileChanges": true,
-	"svg.preview.background": "white"
+	"svg.preview.background": "white",
+	"chat.emptyState.history.enabled": true,
+	"github.copilot.chat.advanced.taskTools.enabled": true,
+	"chat.promptFilesRecommendations": {
+		"plan-fast": true,
+		"plan-deep": true
+	}
 }

build/azure-pipelines/common/publish-artifact.yml

@@ -18,6 +18,9 @@ parameters:
   - name: sbomPackageVersion
     type: string
     default: ""
+  - name: isProduction
+    type: boolean
+    default: true
   - name: condition
     type: string
     default: succeeded()
@@ -77,6 +80,7 @@ steps:
       targetPath: ${{ parameters.targetPath }}
       artifactName: $(ARTIFACT_NAME)
       sbomEnabled: ${{ parameters.sbomEnabled }}
+      isProduction: ${{ parameters.isProduction }}
       ${{ if ne(parameters.sbomBuildDropPath, '') }}:
         sbomBuildDropPath: ${{ parameters.sbomBuildDropPath }}
       ${{ if ne(parameters.sbomPackageName, '') }}:

build/azure-pipelines/darwin/product-build-darwin-test.yml

@@ -132,6 +132,7 @@ steps:
       ${{ else }}:
         artifactName: crash-dump-macos-$(VSCODE_ARCH)-${{ parameters.VSCODE_TEST_ARTIFACT_NAME }}-$(System.JobAttempt)
       displayName: "Publish Crash Reports"
+      isProduction: false
       sbomEnabled: false
       continueOnError: true
       condition: failed()
@@ -146,6 +147,7 @@ steps:
       ${{ else }}:
         artifactName: node-modules-macos-$(VSCODE_ARCH)-${{ parameters.VSCODE_TEST_ARTIFACT_NAME }}-$(System.JobAttempt)
       displayName: "Publish Node Modules"
+      isProduction: false
       sbomEnabled: false
       continueOnError: true
       condition: failed()
@@ -158,6 +160,7 @@ steps:
       ${{ else }}:
         artifactName: logs-macos-$(VSCODE_ARCH)-${{ parameters.VSCODE_TEST_ARTIFACT_NAME }}-$(System.JobAttempt)
       displayName: "Publish Log Files"
+      isProduction: false
       sbomEnabled: false
       continueOnError: true
       condition: succeededOrFailed()

build/azure-pipelines/linux/product-build-linux-test.yml

@@ -147,6 +147,7 @@ steps:
       ${{ else }}:
         artifactName: crash-dump-linux-$(VSCODE_ARCH)-${{ parameters.VSCODE_TEST_ARTIFACT_NAME }}-$(System.JobAttempt)
       displayName: "Publish Crash Reports"
+      isProduction: false
       sbomEnabled: false
       continueOnError: true
       condition: failed()
@@ -161,6 +162,7 @@ steps:
       ${{ else }}:
         artifactName: node-modules-linux-$(VSCODE_ARCH)-${{ parameters.VSCODE_TEST_ARTIFACT_NAME }}-$(System.JobAttempt)
       displayName: "Publish Node Modules"
+      isProduction: false
       sbomEnabled: false
       continueOnError: true
       condition: failed()
@@ -173,6 +175,7 @@ steps:
       ${{ else }}:
         artifactName: logs-linux-$(VSCODE_ARCH)-${{ parameters.VSCODE_TEST_ARTIFACT_NAME }}-$(System.JobAttempt)
       displayName: "Publish Log Files"
+      isProduction: false
       sbomEnabled: false
       continueOnError: true
       condition: succeededOrFailed()