Merge branch 'main' into eli/empty-add

Author: eli-w-king

.github/CODEOWNERS

@@ -29,12 +29,25 @@ 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
+src/vs/platform/editor/** @bpasero @benibenj
 src/vs/platform/files/** @bpasero @deepak1556
 src/vs/base/node/pfs.ts @bpasero @deepak1556
 src/vs/code/** @bpasero @deepak1556
-src/vs/workbench/contrib/update/browser/releaseNotesEditor.ts @alexr00 @joaomoreno
+src/vs/workbench/services/auxiliaryWindow/** @bpasero
+src/vs/workbench/services/editor/** @bpasero @benibenj
+src/vs/workbench/services/files/** @bpasero
+src/vs/workbench/services/history/** @bpasero
+src/vs/workbench/services/host/** @bpasero
+src/vs/workbench/services/layout/** @bpasero @benibenj
+src/vs/workbench/services/lifecycle/** @bpasero
+src/vs/workbench/services/notification/** @bpasero
+src/vs/workbench/services/untitled/** @bpasero
 src/vs/workbench/services/textfile/** @bpasero
 src/vs/workbench/services/workingCopy/** @bpasero
+src/vs/workbench/common/** @bpasero @benibenj @sandy081
+src/vs/workbench/browser/** @bpasero @benibenj @sandy081
+src/vs/workbench/electron-browser/** @bpasero @benibenj @sandy081
+src/vs/workbench/contrib/update/browser/releaseNotesEditor.ts @alexr00 @joaomoreno
 
 # ensure the API police is aware of changes to the vscode-dts file
 # this is only about the final API, not about proposed API changes

.github/chatmodes/Plan.chatmode.md

@@ -1,17 +1,18 @@
 ---
 description: Research and draft an implementation plan
-tools: ['search', 'executeTask', 'usages', 'problems', 'get_issue', 'get_issue_comments', 'fetch', 'githubRepo']
+tools: ['executePrompt', 'usages', 'problems', 'githubRepo', 'github.vscode-pull-request-github/activePullRequest', 'search', 'github/get_issue', 'github/get_issue_comments', 'github/get_issue', 'github/get_issue_comments', 'fetch']
 ---
 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:
+1. Context gathering and research:
+	- MUST run `execute_prompt` tool: Instruct the agent to work autonomously without pausing for user feedback, following <plan_research> to gather context and writing a complete <plan_draft> to return to you.
+	- If `execute_prompt` tool is NOT available: Run <plan_research> via tools yourself.
+2. 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.
+	- Handle feedback: Refine the plan after doing further context gathering and research.
 </workflow>
 
 <plan_research>
@@ -24,10 +25,10 @@ Comprehensive information gathering using read-only tools:
 </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
+- Style:
+	- Clear, concise, non-repetitive, and high-signal; optimized for quick human review
+	- Rich in references to specific/related files, symbols, and documentation; while avoiding excessive code snippets
+	- Tailored to the task and context: Higher complexity requires more detail, higher ambiguity more alternative approaches, etc.
 - 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

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

@@ -1,7 +1,7 @@
 ---
 mode: Plan
-description: Deep plan
+description: Clarify before planning in more detail
 ---
-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*.
+Before doing your research look up related code (max 5 tool calls!) to get a high-level overview, then ask 3 clarifying questions. Once the user answered, go to *Context gathering and research*.
 
 Be extra detailed in your planning draft.

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

@@ -1,5 +1,5 @@
 ---
 mode: Plan
-description: Fast plan
+description: Iterate quicker on simple tasks
 ---
-Research as usual, but draft a much more shorter implementation plan.
+Planning for faster iteration: Research as usual, but draft a much more shorter implementation plan that focused on just the main steps

.github/prompts/plan.prompt.md

@@ -1,7 +1,7 @@
 ---
 mode: agent
 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']
+tools: ['runNotebooks/getNotebookSummary', 'runNotebooks/readNotebookCellOutput', 'search', 'runCommands/getTerminalOutput', 'runCommands/terminalSelection', 'runCommands/terminalLastCommand', 'usages', 'vscodeAPI', 'think', 'problems', 'changes', 'testFailure', 'fetch', 'githubRepo', 'todos', 'github/get_issue', 'github/get_issue_comments', 'github/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:
 * Understand the context of the bug or feature by reading the issue description and comments.

.npmrc

@@ -1,6 +1,6 @@
 disturl="https://electronjs.org/headers"
-target="37.5.1"
-ms_build_id="12409799"
+target="37.6.0"
+ms_build_id="12502201"
 runtime="electron"
 build_from_source="true"
 legacy-peer-deps="true"

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

@@ -9,6 +9,11 @@
     "language": "github-issues",
     "value": "$MILESTONE=milestone:\"September 2025\"\n\n$MINE=assignee:@me"
   },
+  {
+    "kind": 2,
+    "language": "github-issues",
+    "value": "$NOT_TEAM_MEMBERS=-author:aeschli -author:alexdima -author:alexr00 -author:AmandaSilver -author:bamurtaugh -author:bpasero -author:chrmarti -author:Chuxel -author:claudiaregio -author:connor4312 -author:dbaeumer -author:deepak1556 -author:devinvalenciano -author:digitarald -author:DonJayamanne -author:egamma -author:fiveisprime -author:ntrogh -author:hediet -author:isidorn -author:joaomoreno -author:jrieken -author:kieferrm -author:lramos15 -author:lszomoru -author:meganrogge -author:misolori -author:mjbvz -author:rebornix -author:roblourens -author:rzhao271 -author:sandy081 -author:sbatten -author:stevencl -author:TylerLeonhardt -author:Tyriar -author:weinand -author:amunger -author:karthiknadig -author:eleanorjboyd -author:Yoyokrazy  -author:ulugbekna -author:aiday-mar -author:bhavyaus -author:justschen -author:benibenj -author:luabud -author:anthonykim1 -author:joshspicer -author:osortega -author:hawkticehurst -author:pierceboggan -author:benvillalobos -author:dileepyavan -author:dineshc-msft -author:dmitrivMS -author:eli-w-king -author:jo-oikawa -author:jruales -author:jytjyt05 -author:kycutler -author:mrleemurray -author:pwang347 -author:vijayupadya"
+  },
   {
     "kind": 1,
     "language": "markdown",
@@ -157,7 +162,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "org:microsoft $MILESTONE -$MINE is:issue is:closed reason:completed sort:updated-asc label:bug -label:unreleased -label:verified -label:z-author-verified -label:on-testplan -label:*duplicate -label:duplicate -label:invalid -label:*as-designed -label:*out-of-scope -label:error-telemetry -label:verification-steps-needed -label:verification-found -author:aeschli -author:alexdima -author:alexr00 -author:AmandaSilver -author:andreamah -author:bamurtaugh -author:bpasero -author:chrmarti -author:Chuxel -author:claudiaregio -author:connor4312 -author:dbaeumer -author:deepak1556 -author:devinvalenciano -author:digitarald -author:DonJayamanne -author:egamma -author:fiveisprime -author:ntrogh -author:hediet -author:isidorn -author:joaomoreno -author:jrieken -author:kieferrm -author:lramos15 -author:lszomoru -author:meganrogge -author:misolori -author:mjbvz -author:rebornix -author:roblourens -author:rzhao271 -author:sandy081 -author:sbatten -author:stevencl -author:tanhakabir -author:TylerLeonhardt -author:Tyriar -author:weinand -author:amunger -author:karthiknadig -author:eleanorjboyd -author:Yoyokrazy -author:paulacamargo25 -author:ulugbekna -author:aiday-mar -author:bhavyaus -author:justschen -author:benibenj -author:luabud -author:anthonykim1 -author:joshspicer -author:osortega -author:hawkticehurst -author:pierceboggan"
+    "value": "org:microsoft $MILESTONE -$MINE is:issue is:closed reason:completed sort:updated-asc label:bug -label:unreleased -label:verified -label:z-author-verified -label:on-testplan -label:*duplicate -label:duplicate -label:invalid -label:*as-designed -label:*out-of-scope -label:error-telemetry -label:verification-steps-needed -label:verification-found $NOT_TEAM_MEMBERS"
   },
   {
     "kind": 1,