diff --git a/.eslintignore b/.eslintignore
index 108610063cd..2d9021afbb8 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -30,7 +30,15 @@
 **/src/vs/*/**/*.d.ts
 **/src/vs/base/test/common/filters.perf.data.js
 **/src/vs/loader.js
+**/src2/**/dompurify.js
+**/src2/**/marked.js
+**/src2/**/semver.js
+**/src2/typings/**/*.d.ts
+**/src2/vs/*/**/*.d.ts
+**/src2/vs/base/test/common/filters.perf.data.js
+**/src2/vs/loader.js
 **/test/unit/assert.js
+**/test/unit/assert-esm.js
 **/test/automation/out/**
 **/typings/**
 **/src/react.js
diff --git a/.eslintplugin/code-ensure-no-disposables-leak-in-test.ts b/.eslintplugin/code-ensure-no-disposables-leak-in-test.ts
index ae3089036a6..9d3044f50f4 100644
--- a/.eslintplugin/code-ensure-no-disposables-leak-in-test.ts
+++ b/.eslintplugin/code-ensure-no-disposables-leak-in-test.ts
@@ -12,7 +12,8 @@ export = new class EnsureNoDisposablesAreLeakedInTestSuite implements eslint.Rul
 		type: 'problem',
 		messages: {
 			ensure: 'Suites should include a call to `ensureNoDisposablesAreLeakedInTestSuite()` to ensure no disposables are leaked in tests.'
-		}
+		},
+		fixable: 'code'
 	};
 
 	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
@@ -30,6 +31,10 @@ export = new class EnsureNoDisposablesAreLeakedInTestSuite implements eslint.Rul
 					context.report({
 						node,
 						messageId: 'ensure',
+						fix: (fixer) => {
+							const updatedSrc = src.replace(/(suite\(.*\n)/, '$1\n\tensureNoDisposablesAreLeakedInTestSuite();\n');
+							return fixer.replaceText(node, updatedSrc);
+						}
 					});
 				}
 			},
diff --git a/.eslintrc.json b/.eslintrc.json
index 2b56c505d4f..eecde4d7484 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -792,7 +792,8 @@
 							"vs/base/~",
 							"vs/base/parts/*/~",
 							"vs/platform/*/~",
-							"vs/editor/~"
+							"vs/editor/~",
+							"@vscode/tree-sitter-wasm" // node module allowed even in /common/
 						]
 					},
 					{
@@ -1080,7 +1081,7 @@
 						]
 					},
 					{
-						"target": "src/vs/{loader.d.ts,css.ts,css.build.ts,monaco.d.ts,nls.ts}",
+						"target": "src/vs/{loader.d.ts,css.ts,css.build.ts,monaco.d.ts,nls.messages.ts,nls.ts}",
 						"restrictions": []
 					},
 					{
@@ -1094,7 +1095,7 @@
 					},
 					// --- End Positron ---
 					{
-						"target": "src/{bootstrap-amd.js,bootstrap-fork.js,bootstrap-node.js,bootstrap-window.js,bootstrap.js,cli.js,main.js,server-cli.js,server-main.js}",
+						"target": "src/{bootstrap-amd.js,bootstrap-fork.js,bootstrap-node.js,bootstrap-window.js,cli.js,main.js,server-cli.js,server-main.js,bootstrap-cli.js,bootstrap-server.js}",
 						"restrictions": []
 					}
 				]
diff --git a/.github/commands.json b/.github/commands.json
index 44480916133..38da97915a2 100644
--- a/.github/commands.json
+++ b/.github/commands.json
@@ -156,6 +156,37 @@
 		"addLabel": "confirmation-pending",
 		"removeLabel": "confirmed"
 	},
+	{
+		"type": "comment",
+		"name": "needsMoreInfo",
+		"allowUsers": [
+			"cleidigh",
+			"usernamehw",
+			"gjsjohnmurray",
+			"IllusionMH"
+		],
+		"action": "updateLabels",
+		"addLabel": "~info-needed"
+	},
+	{
+		"type": "comment",
+		"name": "needsPerfInfo",
+		"allowUsers": [
+			"cleidigh",
+			"usernamehw",
+			"gjsjohnmurray",
+			"IllusionMH"
+		],
+		"addLabel": "info-needed",
+		"comment": "Thanks for creating this issue regarding performance! Please follow this guide to help us diagnose performance issues: https://github.com/microsoft/vscode/wiki/Performance-Issues \n\nHappy Coding!"
+	},
+	{
+		"type": "comment",
+		"name": "jsDebugLogs",
+		"action": "updateLabels",
+		"addLabel": "info-needed",
+		"comment": "Please collect trace logs using the following instructions:\n\n> If you're able to, add `\"trace\": true` to your `launch.json` and reproduce the issue. The location of the log file on your disk will be written to the Debug Console. Share that with us.\n>\n> ⚠️ This log file will not contain source code, but will contain file paths. You can drop it into https://microsoft.github.io/vscode-pwa-analyzer/index.html to see what it contains. If you'd rather not share the log publicly, you can email it to connor@xbox.com"
+	},
 	{
 		"type": "comment",
 		"name": "closedWith",
@@ -427,6 +458,32 @@
 		"addLabel": "*caused-by-extension",
 		"comment": "It looks like this is caused by the Copilot extension. Please file the issue in the [Copilot Discussion Forum](https://github.com/community/community/discussions/categories/copilot). Make sure to check their issue reporting template and provide them relevant information such as the extension version you're using. See also our [issue reporting guidelines](https://aka.ms/vscodeissuereporting) for more information.\n\nHappy Coding!"
 	},
+	{
+		"type": "comment",
+		"name": "gifPlease",
+		"allowUsers": [
+			"cleidigh",
+			"usernamehw",
+			"gjsjohnmurray",
+			"IllusionMH"
+		],
+		"action": "comment",
+		"addLabel": "info-needed",
+		"comment": "Thanks for reporting this issue! Unfortunately, it's hard for us to understand what issue you're seeing. Please help us out by providing a screen recording showing exactly what isn't working as expected. While we can work with most standard formats, `.gif` files are preferred as they are displayed inline on GitHub. You may find https://gifcap.dev helpful as a browser-based gif recording tool.\n\nIf the issue depends on keyboard input, you can help us by enabling screencast mode for the recording (`Developer: Toggle Screencast Mode` in the command palette). Lastly, please attach this file via the GitHub web interface as emailed responses will strip files out from the issue.\n\nHappy coding!"
+	},
+	{
+		"type": "comment",
+		"name": "confirmPlease",
+		"allowUsers": [
+			"cleidigh",
+			"usernamehw",
+			"gjsjohnmurray",
+			"IllusionMH"
+		],
+		"action": "comment",
+		"addLabel": "info-needed",
+		"comment": "Please diagnose the root cause of the issue by running the command `F1 > Help: Troubleshoot Issue` and following the instructions. Once you have done that, please update the issue with the results.\n\nHappy Coding!"
+	},
 	{
 		"__comment__": "Allows folks on the team to label issues by commenting: `\\label My-Label` ",
 		"type": "comment",
@@ -457,5 +514,29 @@
 		"addLabel": "verification-steps-needed",
 		"removeLabel": "~verification-steps-needed",
 		"comment": "Friendly ping! Looks like this issue requires some further steps to be verified. Please provide us with the steps necessary to verify this issue."
+	},
+	{
+		"type": "label",
+		"name": "~info-needed",
+		"action": "updateLabels",
+		"addLabel": "info-needed",
+		"removeLabel": "~info-needed",
+		"comment": "Thanks for creating this issue! We figured it's missing some basic information or in some other way doesn't follow our [issue reporting guidelines](https://aka.ms/vscodeissuereporting). Please take the time to review these and update the issue.\n\nHappy Coding!"
+	},
+	{
+		"type": "label",
+		"name": "~version-info-needed",
+		"action": "updateLabels",
+		"addLabel": "info-needed",
+		"removeLabel": "~version-info-needed",
+		"comment": "Thanks for creating this issue! We figured it's missing some basic information, such as a version number, or in some other way doesn't follow our [issue reporting guidelines](https://aka.ms/vscodeissuereporting). Please take the time to review these and update the issue.\n\nHappy Coding!"
+	},
+	{
+		"type": "label",
+		"name": "~confirmation-needed",
+		"action": "updateLabels",
+		"addLabel": "info-needed",
+		"removeLabel": "~confirmation-needed",
+		"comment": "Please diagnose the root cause of the issue by running the command `F1 > Help: Troubleshoot Issue` and following the instructions. Once you have done that, please update the issue with the results.\n\nHappy Coding!"
 	}
 ]
diff --git a/.github/workflows/author-verified.yml b/.github/workflows/author-verified.yml
deleted file mode 100644
index f914be2f71b..00000000000
--- a/.github/workflows/author-verified.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-name: Author Verified
-on:
-  issues:
-    types: [closed]
-
-# also make changes in ./on-label.yml
-jobs:
-  main:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Actions
-        if: contains(github.event.issue.labels.*.name, 'author-verification-requested') && contains(github.event.issue.labels.*.name, 'insiders-released')
-        uses: actions/checkout@v4
-        with:
-          repository: "microsoft/vscode-github-triage-actions"
-          ref: stable
-          path: ./actions
-      - name: Install Actions
-        if: contains(github.event.issue.labels.*.name, 'author-verification-requested') && contains(github.event.issue.labels.*.name, 'insiders-released')
-        run: npm install --production --prefix ./actions
-      - name: Run Author Verified
-        if: contains(github.event.issue.labels.*.name, 'author-verification-requested') && contains(github.event.issue.labels.*.name, 'insiders-released')
-        uses: ./actions/author-verified
-        with:
-          appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}}
-          token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
-          requestVerificationComment: "This bug has been fixed in the latest release of [VS Code Insiders](https://code.visualstudio.com/insiders/)!\n\n@${author}, you can help us out by commenting `/verified` if things are now working as expected.\n\nIf things still don't seem right, please ensure you're on version ${commit} of Insiders (today's or later - you can use `Help: About` in the command palette to check), and leave a comment letting us know what isn't working as expected.\n\nHappy Coding!"
-          releasedLabel: insiders-released
-          verifiedLabel: verified
-          authorVerificationRequestedLabel: author-verification-requested
diff --git a/.github/workflows/bad-tag.yml b/.github/workflows/bad-tag.yml
deleted file mode 100644
index bc964fb0582..00000000000
--- a/.github/workflows/bad-tag.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-name: Bad Tag
-on:
-  create
-
-jobs:
-  main:
-    runs-on: ubuntu-latest
-    if: github.event.ref == '1.999.0'
-    steps:
-      - name: Checkout Actions
-        uses: actions/checkout@v4
-        with:
-          repository: "microsoft/vscode-github-triage-actions"
-          ref: stable
-          path: ./actions
-      - name: Install Actions
-        run: npm install --production --prefix ./actions
-      - name: Run Bad Tag
-        uses: ./actions/tag-alert
-        with:
-          token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
-          tag-name: '1.999.0'
diff --git a/.github/workflows/deep-classifier-assign-monitor.yml b/.github/workflows/deep-classifier-assign-monitor.yml
deleted file mode 100644
index a61f9cfb137..00000000000
--- a/.github/workflows/deep-classifier-assign-monitor.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-name: "Deep Classifier: Assign Monitor"
-on:
-  issues:
-    types: [assigned]
-
-jobs:
-  main:
-    runs-on: ubuntu-latest
-    if: ${{ contains(github.event.issue.labels.*.name, 'triage-needed') }}
-    steps:
-      - name: Checkout Actions
-        uses: actions/checkout@v4
-        with:
-          repository: "microsoft/vscode-github-triage-actions"
-          ref: stable
-          path: ./actions
-      - name: Install Actions
-        run: npm install --production --prefix ./actions
-      - name: "Run Classifier: Monitor"
-        uses: ./actions/classifier-deep/monitor
-        with:
-          botName: VSCodeTriageBot
-          token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
diff --git a/.github/workflows/deep-classifier-unassign-monitor.yml b/.github/workflows/deep-classifier-unassign-monitor.yml
deleted file mode 100644
index 52ac0d3ddcd..00000000000
--- a/.github/workflows/deep-classifier-unassign-monitor.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-name: "Deep Classifier: Unassign Monitor"
-on:
-  issues:
-    types: [unassigned]
-
-jobs:
-  main:
-    runs-on: ubuntu-latest
-    if: ${{ ! contains(github.event.issue.labels.*.name, 'triage-needed') }}
-    steps:
-      - name: Checkout Actions
-        uses: actions/checkout@v4
-        with:
-          repository: "microsoft/vscode-github-triage-actions"
-          ref: stable
-          path: ./actions
-      - name: Install Actions
-        run: npm install --production --prefix ./actions
-      - name: "Run Classifier: Monitor"
-        uses: ./actions/classifier-deep/monitor
-        with:
-          botName: VSCodeTriageBot
-          token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
diff --git a/.github/workflows/english-please.yml b/.github/workflows/english-please.yml
deleted file mode 100644
index 9e04d6d549c..00000000000
--- a/.github/workflows/english-please.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-name: English Please
-on:
-  issues:
-    types: [edited]
-
-# also make changes in ./on-label.yml and ./on-open.yml
-jobs:
-  main:
-    runs-on: ubuntu-latest
-    if: contains(github.event.issue.labels.*.name, '*english-please')
-    steps:
-      - name: Checkout Actions
-        uses: actions/checkout@v4
-        with:
-          repository: "microsoft/vscode-github-triage-actions"
-          ref: stable
-          path: ./actions
-      - name: Install Actions
-        run: npm install --production --prefix ./actions
-      - name: Run English Please
-        uses: ./actions/english-please
-        with:
-          appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}}
-          token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
-          cognitiveServicesAPIKey: ${{secrets.AZURE_TEXT_TRANSLATOR_KEY}}
-          nonEnglishLabel: "*english-please"
-          needsMoreInfoLabel: "info-needed"
-          translatorRequestedLabelPrefix: "translation-required-"
-          translatorRequestedLabelColor: "c29cff"
diff --git a/.github/workflows/feature-request.yml b/.github/workflows/feature-request.yml
deleted file mode 100644
index 7913fc461ec..00000000000
--- a/.github/workflows/feature-request.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-name: Feature Request Manager
-on:
-  repository_dispatch:
-    types: [trigger-feature-request-manager]
-  issues:
-    types: [milestoned]
-
-# also make changes in ./on-label.yml
-jobs:
-  main:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Actions
-        if: github.event_name != 'issues' || contains(github.event.issue.labels.*.name, 'feature-request')
-        uses: actions/checkout@v4
-        with:
-          repository: "microsoft/vscode-github-triage-actions"
-          path: ./actions
-          ref: stable
-      - name: Install Actions
-        if: github.event_name != 'issues' || contains(github.event.issue.labels.*.name, 'feature-request')
-        run: npm install --production --prefix ./actions
-      - name: Run Feature Request Manager
-        if: github.event_name != 'issues' || contains(github.event.issue.labels.*.name, 'feature-request')
-        uses: ./actions/feature-request
-        with:
-          token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
-          repo: "vscode"
-          owner: "microsoft"
-          candidateMilestoneID: 107
-          candidateMilestoneName: Backlog Candidates
-          backlogMilestoneID: 8
-          featureRequestLabel: feature-request
-          upvotesRequired: 20
-          numCommentsOverride: 20
-          initComment: "This feature request is now a candidate for our backlog. The community has 60 days to [upvote](https://github.com/microsoft/vscode/wiki/Issues-Triaging#up-voting-a-feature-request) the issue. If it receives 20 upvotes we will move it to our backlog. If not, we will close it. To learn more about how we handle feature requests, please see our [documentation](https://aka.ms/vscode-issue-lifecycle).\n\nHappy Coding!"
-          warnComment: "This feature request has not yet received the 20 community [upvotes](https://github.com/microsoft/vscode/wiki/Issues-Triaging#up-voting-a-feature-request) it takes to make to our backlog. 10 days to go. To learn more about how we handle feature requests, please see our [documentation](https://aka.ms/vscode-issue-lifecycle).\n\nHappy Coding!"
-          acceptComment: ":slightly_smiling_face: This feature request received a sufficient number of community upvotes and we moved it to our backlog. To learn more about how we handle feature requests, please see our [documentation](https://aka.ms/vscode-issue-lifecycle).\n\nHappy Coding!"
-          rejectComment: ":slightly_frowning_face: In the last 60 days, this feature request has received less than 20 community upvotes and we closed it. Still a big Thank You to you for taking the time to create this issue! To learn more about how we handle feature requests, please see our [documentation](https://aka.ms/vscode-issue-lifecycle).\n\nHappy Coding!"
-          warnDays: 10
-          closeDays: 60
-          milestoneDelaySeconds: 60
diff --git a/.github/workflows/on-comment.yml b/.github/workflows/on-comment.yml
deleted file mode 100644
index 089aa77c1e7..00000000000
--- a/.github/workflows/on-comment.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-name: On Comment
-on:
-  issue_comment:
-    types: [created]
-
-# also make changes in ./on-label.yml
-jobs:
-  main:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Actions
-        uses: actions/checkout@v4
-        with:
-          repository: "microsoft/vscode-github-triage-actions"
-          path: ./actions
-          ref: stable
-      - name: Install Actions
-        run: npm install --production --prefix ./actions
-      - name: Run Commands
-        uses: ./actions/commands
-        with:
-          appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}}
-          token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
-          config-path: commands
-      - name: "Run Release Pipeline Labeler"
-        uses: ./actions/release-pipeline
-        with:
-          token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
-          appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}}
-          notYetReleasedLabel: unreleased
-          insidersReleasedLabel: insiders-released
diff --git a/.github/workflows/on-label.yml b/.github/workflows/on-label.yml
deleted file mode 100644
index bf563734017..00000000000
--- a/.github/workflows/on-label.yml
+++ /dev/null
@@ -1,83 +0,0 @@
-name: On Label
-on:
-  issues:
-    types: [labeled]
-
-jobs:
-  main:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Actions
-        uses: actions/checkout@v4
-        with:
-          repository: "microsoft/vscode-github-triage-actions"
-          ref: stable
-          path: ./actions
-      - name: Install Actions
-        run: npm install --production --prefix ./actions
-
-      # source of truth in ./author-verified.yml
-      - name: Run Author Verified
-        if: contains(github.event.issue.labels.*.name, 'author-verification-requested') && contains(github.event.issue.labels.*.name, 'insiders-released')
-        uses: ./actions/author-verified
-        with:
-          appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}}
-          token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
-          requestVerificationComment: "This bug has been fixed in the latest release of [VS Code Insiders](https://code.visualstudio.com/insiders/)!\n\n@${author}, you can help us out by commenting `/verified` if things are now working as expected.\n\nIf things still don't seem right, please ensure you're on version ${commit} of Insiders (today's or later - you can use `Help: About` in the command palette to check), and leave a comment letting us know what isn't working as expected.\n\nHappy Coding!"
-          releasedLabel: insiders-released
-          verifiedLabel: verified
-          authorVerificationRequestedLabel: author-verification-requested
-
-
-      # also make changes in ./on-comment.yml
-      - name: Run Commands
-        uses: ./actions/commands
-        with:
-          appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}}
-          token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
-          config-path: commands
-
-      # source of truth in ./feature-request.yml
-      - name: Run Feature Request Manager
-        if: contains(github.event.issue.labels.*.name, 'feature-request')
-        uses: ./actions/feature-request
-        with:
-          appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}}
-          token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
-          candidateMilestoneID: 107
-          candidateMilestoneName: Backlog Candidates
-          backlogMilestoneID: 8
-          featureRequestLabel: feature-request
-          upvotesRequired: 20
-          numCommentsOverride: 20
-          initComment: "This feature request is now a candidate for our backlog. The community has 60 days to upvote the issue. If it receives 20 upvotes we will move it to our backlog. If not, we will close it. To learn more about how we handle feature requests, please see our [documentation](https://aka.ms/vscode-issue-lifecycle).\n\nHappy Coding!"
-          warnComment: "This feature request has not yet received the 20 community upvotes it takes to make to our backlog. 10 days to go. To learn more about how we handle feature requests, please see our [documentation](https://aka.ms/vscode-issue-lifecycle).\n\nHappy Coding"
-          acceptComment: ":slightly_smiling_face: This feature request received a sufficient number of community upvotes and we moved it to our backlog. To learn more about how we handle feature requests, please see our [documentation](https://aka.ms/vscode-issue-lifecycle).\n\nHappy Coding!"
-          rejectComment: ":slightly_frowning_face: In the last 60 days, this feature request has received less than 20 community upvotes and we closed it. Still a big Thank You to you for taking the time to create this issue! To learn more about how we handle feature requests, please see our [documentation](https://aka.ms/vscode-issue-lifecycle).\n\nHappy Coding!"
-          warnDays: 10
-          closeDays: 60
-          milestoneDelaySeconds: 60
-
-      # source of truth in ./test-plan-item-validator.yml
-      - name: Run Test Plan Item Validator
-        if: contains(github.event.issue.labels.*.name, 'testplan-item') || contains(github.event.issue.labels.*.name, 'invalid-testplan-item')
-        uses: ./actions/test-plan-item-validator
-        with:
-          token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
-          refLabel: on-testplan
-          label: testplan-item
-          invalidLabel: invalid-testplan-item
-          comment: Invalid test plan item. See errors below and the [test plan item spec](https://github.com/microsoft/vscode/wiki/Writing-Test-Plan-Items) for more information. This comment will go away when the issues are resolved.
-
-      # source of truth in ./english-please.yml
-      - name: Run English Please
-        if: contains(github.event.issue.labels.*.name, '*english-please')
-        uses: ./actions/english-please
-        with:
-          appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}}
-          token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
-          cognitiveServicesAPIKey: ${{secrets.AZURE_TEXT_TRANSLATOR_KEY}}
-          nonEnglishLabel: "*english-please"
-          needsMoreInfoLabel: "info-needed"
-          translatorRequestedLabelPrefix: "translation-required-"
-          translatorRequestedLabelColor: "c29cff"
diff --git a/.github/workflows/on-open.yml b/.github/workflows/on-open.yml
deleted file mode 100644
index 62cdbff683b..00000000000
--- a/.github/workflows/on-open.yml
+++ /dev/null
@@ -1,85 +0,0 @@
-name: On Open
-on:
-  issues:
-    types: [opened]
-
-jobs:
-  main:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Actions
-        uses: actions/checkout@v4
-        with:
-          repository: "microsoft/vscode-github-triage-actions"
-          ref: stable
-          path: ./actions
-      - name: Install Actions
-        run: npm install --production --prefix ./actions
-
-      - name: Check for Validity
-        uses: ./actions/validity-checker
-        with:
-          token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
-
-      - name: Run CopyCat (VSCodeTriageBot/testissues)
-        if: github.event.issue.user.login != 'ghost'
-        uses: ./actions/copycat
-        with:
-          appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}}
-          token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
-          destinationOwner: VSCodeTriageBot
-          destinationRepo: testissues
-
-      - name: Run New Release
-        if: github.event.issue.user.login != 'ghost'
-        uses: ./actions/new-release
-        with:
-          label: new release
-          token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
-          appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}}
-          labelColor: "006b75"
-          labelDescription: Issues found in a recent release of VS Code
-          oldVersionMessage: "Thanks for creating this issue! It looks like you may be using an old version of VS Code, the latest stable release is {currentVersion}. Please try upgrading to the latest version and checking whether this issue remains.\n\nHappy Coding!"
-          days: 5
-
-      - name: Run Clipboard Labeler
-        if: github.event.issue.user.login != 'ghost'
-        uses: ./actions/regex-labeler
-        with:
-          appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}}
-          label: "invalid"
-          mustNotMatch: "^We have written the needed data into your clipboard because it was too large to send\\. Please paste\\.$"
-          comment: "It looks like you're using the VS Code Issue Reporter but did not paste the text generated into the created issue. We've closed this issue, please open a new one containing the text we placed in your clipboard.\n\nHappy Coding!"
-
-      - name: Run Clipboard Labeler (Chinese)
-        if: github.event.issue.user.login != 'ghost'
-        uses: ./actions/regex-labeler
-        with:
-          appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}}
-          label: "invalid"
-          mustNotMatch: "^所需的数据太大，无法直接发送。我们已经将其写入剪贴板，请粘贴。$"
-          comment: "看起来您正在使用 VS Code 问题报告程序，但是没有将生成的文本粘贴到创建的问题中。我们将关闭这个问题，请使用剪贴板中的内容创建一个新的问题。\n\n祝您使用愉快！"
-
-      # source of truth in ./english-please.yml
-      - name: Run English Please
-        if: github.event.issue.user.login != 'ghost'
-        uses: ./actions/english-please
-        with:
-          token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
-          appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}}
-          cognitiveServicesAPIKey: ${{secrets.AZURE_TEXT_TRANSLATOR_KEY}}
-          nonEnglishLabel: "*english-please"
-          needsMoreInfoLabel: "info-needed"
-          translatorRequestedLabelPrefix: "translation-required-"
-          translatorRequestedLabelColor: "c29cff"
-            # source of truth in ./test-plan-item-validator.yml
-      - name: Run Test Plan Item Validator
-        if: github.event.issue.user.login != 'ghost'
-        uses: ./actions/test-plan-item-validator
-        with:
-          token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
-          refLabel: on-testplan
-          label: testplan-item
-          invalidLabel: invalid-testplan-item
-          comment: Invalid test plan item. See errors below and the [test plan item spec](https://github.com/microsoft/vscode/wiki/Writing-Test-Plan-Items) for more information. This comment will go away when the issues are resolved.
-
diff --git a/.github/workflows/on-reopen.yml b/.github/workflows/on-reopen.yml
deleted file mode 100644
index d29de326c53..00000000000
--- a/.github/workflows/on-reopen.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-name: On Reopen
-on:
-  issues:
-    types: [reopened]
-
-jobs:
-  main:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Actions
-        uses: actions/checkout@v4
-        with:
-          repository: "microsoft/vscode-github-triage-actions"
-          ref: stable
-          path: ./actions
-      - name: Install Actions
-        run: npm install --production --prefix ./actions
-
-      - name: Check for Validity
-        uses: ./actions/validity-checker
-        with:
-          token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
diff --git a/.github/workflows/positron-full-test.yml b/.github/workflows/positron-full-test.yml
index 21a95f85aad..b9fe6639910 100644
--- a/.github/workflows/positron-full-test.yml
+++ b/.github/workflows/positron-full-test.yml
@@ -80,9 +80,9 @@ jobs:
           path: |
             extensions
             extensions/**/node_modules
-          key: extensions-v3-${{ runner.os }}-${{ hashFiles('extensions/yarn.lock') }}
+          key: extensions-v4-${{ runner.os }}-${{ hashFiles('extensions/yarn.lock') }}
           restore-keys: |
-            extensions-v3-${{ runner.os }}-
+            extensions-v4-${{ runner.os }}-
 
       - name: Restore cache for remote
         id: cache-remote
diff --git a/.github/workflows/positron-merge-to-main.yml b/.github/workflows/positron-merge-to-main.yml
index 8f345c44b06..8bded3623f9 100644
--- a/.github/workflows/positron-merge-to-main.yml
+++ b/.github/workflows/positron-merge-to-main.yml
@@ -82,9 +82,9 @@ jobs:
           path: |
             extensions
             extensions/**/node_modules
-          key: extensions-v3-${{ runner.os }}-${{ hashFiles('extensions/yarn.lock') }}
+          key: extensions-v4-${{ runner.os }}-${{ hashFiles('extensions/yarn.lock') }}
           restore-keys: |
-            extensions-v3-${{ runner.os }}-
+            extensions-v4-${{ runner.os }}-
 
       - name: Restore cache for remote
         id: cache-remote
@@ -140,7 +140,7 @@ jobs:
           path: |
             extensions
             extensions/**/node_modules
-          key: extensions-v3-${{ runner.os }}-${{ hashFiles('extensions/yarn.lock') }}
+          key: extensions-v4-${{ runner.os }}-${{ hashFiles('extensions/yarn.lock') }}
 
       - name: Cache remote node_modules
         if: always() && steps.cache-remote.outputs.cache-hit != 'true'
diff --git a/.github/workflows/release-pipeline-labeler.yml b/.github/workflows/release-pipeline-labeler.yml
deleted file mode 100644
index 87e188a02ab..00000000000
--- a/.github/workflows/release-pipeline-labeler.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-name: "Release Pipeline Labeler"
-on:
-  issues:
-    types: [closed, reopened]
-  repository_dispatch:
-    types: [released-insider]
-
-jobs:
-  main:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Actions
-        uses: actions/checkout@v4
-        with:
-          repository: "microsoft/vscode-github-triage-actions"
-          ref: stable
-          path: ./actions
-      - name: Checkout Repo
-        if: github.event_name != 'issues'
-        uses: actions/checkout@v4
-        with:
-          path: ./repo
-          fetch-depth: 0
-      - name: Install Actions
-        run: npm install --production --prefix ./actions
-      - name: "Run Release Pipeline Labeler"
-        uses: ./actions/release-pipeline
-        with:
-          token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
-          appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}}
-          notYetReleasedLabel: unreleased
-          insidersReleasedLabel: insiders-released
diff --git a/.github/workflows/telemetry.yml b/.github/workflows/telemetry.yml
index d463a0e2eca..d29ea6c58da 100644
--- a/.github/workflows/telemetry.yml
+++ b/.github/workflows/telemetry.yml
@@ -16,4 +16,4 @@ jobs:
       - name: 'Run vscode-telemetry-extractor'
         run: 'npx --package=@vscode/telemetry-extractor --yes vscode-telemetry-extractor -s .'
         env:
-          GITHUB_TOKEN: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/test-plan-item-validator.yml b/.github/workflows/test-plan-item-validator.yml
deleted file mode 100644
index 117eaf6908a..00000000000
--- a/.github/workflows/test-plan-item-validator.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-name: Test Plan Item Validator
-on:
-  issues:
-    types: [edited]
-
-# also edit in ./on-label.yml and ./on-open.yml
-jobs:
-  main:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Actions
-        if: contains(github.event.issue.labels.*.name, 'testplan-item') || contains(github.event.issue.labels.*.name, 'invalid-testplan-item')
-        uses: actions/checkout@v4
-        with:
-          repository: "microsoft/vscode-github-triage-actions"
-          path: ./actions
-          ref: stable
-      - name: Install Actions
-        if: contains(github.event.issue.labels.*.name, 'testplan-item') || contains(github.event.issue.labels.*.name, 'invalid-testplan-item')
-        run: npm install --production --prefix ./actions
-      - name: Run Test Plan Item Validator
-        if: contains(github.event.issue.labels.*.name, 'testplan-item') || contains(github.event.issue.labels.*.name, 'invalid-testplan-item')
-        uses: ./actions/test-plan-item-validator
-        with:
-          token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
-          refLabel: on-testplan
-          label: testplan-item
-          invalidLabel: invalid-testplan-item
-          comment: Invalid test plan item. See errors below and the [test plan item spec](https://github.com/microsoft/vscode/wiki/Writing-Test-Plan-Items) for more information. This comment will go away when the issues are resolved.
diff --git a/.vscode-test.js b/.vscode-test.js
index 0f623d16dd7..aaa916f465f 100644
--- a/.vscode-test.js
+++ b/.vscode-test.js
@@ -61,8 +61,12 @@ const extensions = [
 		label: 'positron-connections',
 		workspaceFolder: path.join(os.tmpdir(), `positron-connections-${Math.floor(Math.random() * 100000)}`),
 		mocha: { timeout: 60_000 }
-	}
+	},
 	// --- End Positron ---
+	{
+		label: 'microsoft-authentication',
+		mocha: { timeout: 60_000 }
+	}
 ];
 
 
diff --git a/.vscode/extensions/vscode-selfhost-test-provider/src/testOutputScanner.ts b/.vscode/extensions/vscode-selfhost-test-provider/src/testOutputScanner.ts
index f8e70b4d9cd..296ed1e9f12 100644
--- a/.vscode/extensions/vscode-selfhost-test-provider/src/testOutputScanner.ts
+++ b/.vscode/extensions/vscode-selfhost-test-provider/src/testOutputScanner.ts
@@ -290,7 +290,7 @@ export async function scanTestOutput(
 							enqueueExitBlocker(
 								(async () => {
 									const stackInfo = await deriveStackLocations(store, rawErr, tcase!);
-									let message: vscode.TestMessage2;
+									let message: vscode.TestMessage;
 
 									if (hasDiff) {
 										message = new vscode.TestMessage(tryMakeMarkdown(err));
diff --git a/.vscode/extensions/vscode-selfhost-test-provider/tsconfig.json b/.vscode/extensions/vscode-selfhost-test-provider/tsconfig.json
index df98ed3e695..56d6859c3e3 100644
--- a/.vscode/extensions/vscode-selfhost-test-provider/tsconfig.json
+++ b/.vscode/extensions/vscode-selfhost-test-provider/tsconfig.json
@@ -11,7 +11,6 @@
 		"src/**/*",
 		"../../../src/vscode-dts/vscode.d.ts",
 		"../../../src/vscode-dts/vscode.proposed.testObserver.d.ts",
-		"../../../src/vscode-dts/vscode.proposed.testMessageStackTrace.d.ts",
 		"../../../src/vscode-dts/vscode.proposed.testRelatedCode.d.ts",
 		"../../../src/vscode-dts/vscode.proposed.attributableCoverage.d.ts"
 	]
diff --git a/.vscode/notebooks/api.github-issues b/.vscode/notebooks/api.github-issues
index c5dda6b26af..c402cca3836 100644
--- a/.vscode/notebooks/api.github-issues
+++ b/.vscode/notebooks/api.github-issues
@@ -7,7 +7,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$REPO=repo:microsoft/vscode\n$MILESTONE=milestone:\"July 2024\""
+    "value": "$REPO=repo:microsoft/vscode\n$MILESTONE=milestone:\"August 2024\""
   },
   {
     "kind": 1,
diff --git a/.vscode/notebooks/endgame.github-issues b/.vscode/notebooks/endgame.github-issues
index 215d9dcee40..450ba41835f 100644
--- a/.vscode/notebooks/endgame.github-issues
+++ b/.vscode/notebooks/endgame.github-issues
@@ -7,7 +7,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$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\r\n\r\n$MILESTONE=milestone:\"July 2024\""
+    "value": "$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\n\n$MILESTONE=milestone:\"August 2024\""
   },
   {
     "kind": 1,
diff --git a/.vscode/notebooks/my-endgame.github-issues b/.vscode/notebooks/my-endgame.github-issues
index 9bf6b335736..df0f8a92998 100644
--- a/.vscode/notebooks/my-endgame.github-issues
+++ b/.vscode/notebooks/my-endgame.github-issues
@@ -7,7 +7,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$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\n\n$MILESTONE=milestone:\"July 2024\"\n\n$MINE=assignee:@me"
+    "value": "$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\n\n$MILESTONE=milestone:\"August 2024\"\n\n$MINE=assignee:@me"
   },
   {
     "kind": 1,
diff --git a/.vscode/notebooks/my-work.github-issues b/.vscode/notebooks/my-work.github-issues
index 1e539f4c3c1..979180e758a 100644
--- a/.vscode/notebooks/my-work.github-issues
+++ b/.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\n\n// current milestone name\n$MILESTONE=milestone:\"July 2024\"\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\n\n// current milestone name\n$MILESTONE=milestone:\"August 2024\"\n"
   },
   {
     "kind": 1,
diff --git a/.vscode/notebooks/vscode-dev.github-issues b/.vscode/notebooks/vscode-dev.github-issues
index 53fad82e6d9..db480b64bd8 100644
--- a/.vscode/notebooks/vscode-dev.github-issues
+++ b/.vscode/notebooks/vscode-dev.github-issues
@@ -2,7 +2,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$milestone=milestone:\"November 2023\""
+    "value": "$milestone=milestone:\"August 2024\""
   },
   {
     "kind": 1,
diff --git a/.vscode/settings.json b/.vscode/settings.json
index ff39e6ad11e..adf10bc4cd1 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -32,6 +32,7 @@
 		"src/vs/base/test/common/filters.perf.data.js": true,
 		"src/vs/base/test/node/uri.perf.data.txt": true,
 		"src/vs/workbench/api/test/browser/extHostDocumentData.test.perf-data.ts": true,
+		"src/vs/base/test/node/uri.test.data.txt": true,
 		"src/vs/editor/test/node/diffing/fixtures/**": true,
 	},
 	"files.readonlyInclude": {
@@ -50,6 +51,7 @@
 		"test/smoke/out/**": true,
 		"test/automation/out/**": true,
 		"test/integration/browser/out/**": true,
+		"src2/**": true,
 	},
 	"files.readonlyExclude": {
 		"build/builtin/*.js": true,
@@ -169,10 +171,9 @@
 		"editor.wordWrap": "on"
 	},
 	"css.format.spaceAroundSelectorSeparator": true,
-	"inlineChat.mode": "live",
 	"editor.rulers": [
 		100
 	],
-	"inlineChat.experimental.textButtons": true,
-	"typescript.enablePromptUseWorkspaceTsdk": true
+	"typescript.enablePromptUseWorkspaceTsdk": true,
+	"inlineChat.experimental.onlyZoneWidget": true
 }
diff --git a/.vscode/shared.code-snippets b/.vscode/shared.code-snippets
index c30e9160b0e..a6f462b79f2 100644
--- a/.vscode/shared.code-snippets
+++ b/.vscode/shared.code-snippets
@@ -49,5 +49,23 @@
 			"private readonly _onDid$1 = new Emitter<$2>();",
 			"readonly onDid$1: Event<$2> = this._onDid$1.event;"
 		],
+	},
+	"esm-comment": {
+		"scope": "typescript,javascript",
+		"prefix": "esm-comment",
+		"body": [
+			"// ESM-comment-begin",
+			"$SELECTION$0",
+			"// ESM-comment-end",
+		]
+	},
+	"esm-uncomment": {
+		"scope": "typescript,javascript",
+		"prefix": "esm-uncomment",
+		"body": [
+			"// ESM-uncomment-begin",
+			"// $SELECTION$0",
+			"// ESM-uncomment-end",
+		]
 	}
 }
diff --git a/.yarnrc b/.yarnrc
index 6d4a827644c..94e494ee938 100644
--- a/.yarnrc
+++ b/.yarnrc
@@ -1,5 +1,5 @@
 disturl "https://electronjs.org/headers"
-target "30.1.2"
-ms_build_id "9870757"
+target "30.4.0"
+ms_build_id "10073054"
 runtime "electron"
 build_from_source "true"
diff --git a/ThirdPartyNotices.txt b/ThirdPartyNotices.txt
index d050b23f52a..4bcdcc47c9e 100644
--- a/ThirdPartyNotices.txt
+++ b/ThirdPartyNotices.txt
@@ -263,6 +263,34 @@ suitability for any purpose.
 
 ---------------------------------------------------------
 
+cacheable-request 7.0.4 - MIT
+
+
+Copyright (c) cacheable-request authors
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+---------------------------------------------------------
+
+---------------------------------------------------------
+
 Colorsublime-Themes 0.1.0
 https://github.com/Colorsublime/Colorsublime-Themes
 
@@ -890,7 +918,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 ---------------------------------------------------------
 
-JuliaEditorSupport/atom-language-julia 0.22.1 - MIT
+JuliaEditorSupport/atom-language-julia 0.23.0 - MIT
 https://github.com/JuliaEditorSupport/atom-language-julia
 
 The atom-language-julia package is licensed under the MIT "Expat" License:
@@ -1241,7 +1269,7 @@ THE SOFTWARE.
 
 ---------------------------------------------------------
 
-marked 4.1.0 - MIT
+marked 14.0.0 - MIT
 https://github.com/markedjs/marked
 
 information
@@ -1534,7 +1562,7 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-RedCMD/YAML-Syntax-Highlighter 1.0.1 - MIT
+RedCMD/YAML-Syntax-Highlighter 1.1.1 - MIT
 https://github.com/RedCMD/YAML-Syntax-Highlighter
 
 MIT License
diff --git a/build/.cachesalt b/build/.cachesalt
index d7d415d3213..58a1efc1632 100644
--- a/build/.cachesalt
+++ b/build/.cachesalt
@@ -1 +1 @@
-2024-07-04T16:31:11.121Z
+2024-08-14T18:12:43.548Z
diff --git a/build/.moduleignore b/build/.moduleignore
index ed9c0a6497d..e103872345c 100644
--- a/build/.moduleignore
+++ b/build/.moduleignore
@@ -96,10 +96,13 @@ node-pty/lib/*.test.js
 node-pty/tools/**
 node-pty/deps/**
 node-pty/scripts/**
+node-pty/third_party/**
 !node-pty/build/Release/spawn-helper
 !node-pty/build/Release/*.exe
 !node-pty/build/Release/*.dll
 !node-pty/build/Release/*.node
+!node-pty/build/Release/conpty/conpty.dll
+!node-pty/build/Release/conpty/OpenConsole.exe
 
 @parcel/watcher/binding.gyp
 @parcel/watcher/build/**
@@ -163,7 +166,7 @@ typescript/lib/tsserverlibrary.js
 
 jschardet/index.js
 jschardet/src/**
-jschardet/dist/jschardet.js
+# TODO@esm uncomment when we can use jschardet.min.js again jschardet/dist/jschardet.js
 
 es6-promise/lib/**
 
diff --git a/build/.webignore b/build/.webignore
index 15935edce8a..837366b67f7 100644
--- a/build/.webignore
+++ b/build/.webignore
@@ -14,7 +14,7 @@
 
 jschardet/index.js
 jschardet/src/**
-jschardet/dist/jschardet.js
+# TODO@esm uncomment when we can use jschardet.min.js again jschardet/dist/jschardet.js
 
 vscode-textmate/webpack.config.js
 
@@ -38,6 +38,7 @@ vscode-textmate/webpack.config.js
 
 # This makes sure the model is included in the package
 !@vscode/vscode-languagedetection/model/**
+!@vscode/tree-sitter-wasm/wasm/**
 
 # Ensure only the required telemetry pieces are loaded in web to reduce bundle size
 @microsoft/1ds-core-js/**
@@ -45,7 +46,9 @@ vscode-textmate/webpack.config.js
 @microsoft/applicationinsights-core-js/**
 @microsoft/applicationinsights-shims/**
 !@microsoft/1ds-core-js/dist/ms.core.min.js
+!@microsoft/1ds-core-js/bundle/ms.core.min.js
 !@microsoft/1ds-post-js/dist/ms.post.min.js
+!@microsoft/1ds-post-js/bundle/ms.post.min.js
 !@microsoft/applicationinsights-core-js/browser/applicationinsights-core-js.min.js
 !@microsoft/applicationinsights-shims/dist/umd/applicationinsights-shims.min.js
 
diff --git a/build/azure-pipelines/common/publish.js b/build/azure-pipelines/common/publish.js
index c990e3a7146..aa185ed8369 100644
--- a/build/azure-pipelines/common/publish.js
+++ b/build/azure-pipelines/common/publish.js
@@ -389,14 +389,8 @@ function getPlatform(product, os, arch, type, isLegacy) {
                     }
                 }
                 case 'server':
-                    if (arch === 'arm64') {
-                        throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`);
-                    }
                     return `server-win32-${arch}`;
                 case 'web':
-                    if (arch === 'arm64') {
-                        throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`);
-                    }
                     return `server-win32-${arch}-web`;
                 case 'cli':
                     return `cli-win32-${arch}`;
diff --git a/build/azure-pipelines/common/publish.ts b/build/azure-pipelines/common/publish.ts
index 75065ffa2d3..652cd168335 100644
--- a/build/azure-pipelines/common/publish.ts
+++ b/build/azure-pipelines/common/publish.ts
@@ -550,14 +550,8 @@ function getPlatform(product: string, os: string, arch: string, type: string, is
 					}
 				}
 				case 'server':
-					if (arch === 'arm64') {
-						throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`);
-					}
 					return `server-win32-${arch}`;
 				case 'web':
-					if (arch === 'arm64') {
-						throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`);
-					}
 					return `server-win32-${arch}-web`;
 				case 'cli':
 					return `cli-win32-${arch}`;
diff --git a/build/azure-pipelines/darwin/product-build-darwin-test.yml b/build/azure-pipelines/darwin/product-build-darwin-test.yml
index 92fe6eb715e..c5f9dfb0036 100644
--- a/build/azure-pipelines/darwin/product-build-darwin-test.yml
+++ b/build/azure-pipelines/darwin/product-build-darwin-test.yml
@@ -7,6 +7,9 @@ parameters:
     type: boolean
   - name: VSCODE_RUN_SMOKE_TESTS
     type: boolean
+  - name: VSCODE_BUILD_ESM
+    type: boolean
+    default: false
 
 steps:
   - script: yarn npm-run-all -lp "electron $(VSCODE_ARCH)" "playwright-install"
@@ -17,34 +20,56 @@ steps:
 
   - ${{ if eq(parameters.VSCODE_RUN_UNIT_TESTS, true) }}:
     - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}:
-      - script: ./scripts/test.sh --tfs "Unit Tests"
-        displayName: Run unit tests (Electron)
-        timeoutInMinutes: 15
-
-      - script: yarn test-node
-        displayName: Run unit tests (node.js)
-        timeoutInMinutes: 15
-
-      - script: yarn test-browser-no-install --sequential --browser chromium --browser webkit --tfs "Browser Unit Tests"
-        env:
-          DEBUG: "*browser*"
-        displayName: Run unit tests (Browser, Chromium & Webkit)
-        timeoutInMinutes: 30
+      - ${{ if eq(parameters.VSCODE_BUILD_ESM, true) }}:
+        - script: ./scripts/test-esm.sh --tfs "Unit Tests"
+          displayName: Run unit tests (Electron) [ESM]
+          timeoutInMinutes: 15
+        - script: yarn test-node-esm
+          displayName: Run unit tests (node.js) [ESM]
+          timeoutInMinutes: 15
+        - script: yarn test-browser-esm-no-install --sequential --browser chromium --browser webkit --tfs "Browser Unit Tests"
+          env:
+            DEBUG: "*browser*"
+          displayName: Run unit tests (Browser, Chromium & Webkit) [ESM]
+          timeoutInMinutes: 30
+      - ${{ if eq(parameters.VSCODE_BUILD_ESM, false) }}:
+        - script: ./scripts/test.sh --tfs "Unit Tests"
+          displayName: Run unit tests (Electron)
+          timeoutInMinutes: 15
+        - script: yarn test-node
+          displayName: Run unit tests (node.js)
+          timeoutInMinutes: 15
+        - script: yarn test-browser-no-install --sequential --browser chromium --browser webkit --tfs "Browser Unit Tests"
+          env:
+            DEBUG: "*browser*"
+          displayName: Run unit tests (Browser, Chromium & Webkit)
+          timeoutInMinutes: 30
 
     - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-      - script: ./scripts/test.sh --build --tfs "Unit Tests"
-        displayName: Run unit tests (Electron)
-        timeoutInMinutes: 15
-
-      - script: yarn test-node --build
-        displayName: Run unit tests (node.js)
-        timeoutInMinutes: 15
-
-      - script: yarn test-browser-no-install --sequential --build --browser chromium --browser webkit --tfs "Browser Unit Tests"
-        env:
-          DEBUG: "*browser*"
-        displayName: Run unit tests (Browser, Chromium & Webkit)
-        timeoutInMinutes: 30
+      - ${{ if eq(parameters.VSCODE_BUILD_ESM, true) }}:
+        - script: ./scripts/test-esm.sh --build --tfs "Unit Tests"
+          displayName: Run unit tests (Electron) [ESM]
+          timeoutInMinutes: 15
+        - script: yarn test-node-esm --build
+          displayName: Run unit tests (node.js) [ESM]
+          timeoutInMinutes: 15
+        - script: yarn test-browser-esm-no-install --sequential --build --browser chromium --browser webkit --tfs "Browser Unit Tests"
+          env:
+            DEBUG: "*browser*"
+          displayName: Run unit tests (Browser, Chromium & Webkit) [ESM]
+          timeoutInMinutes: 30
+      - ${{ if eq(parameters.VSCODE_BUILD_ESM, false) }}:
+        - script: ./scripts/test.sh --build --tfs "Unit Tests"
+          displayName: Run unit tests (Electron)
+          timeoutInMinutes: 15
+        - script: yarn test-node --build
+          displayName: Run unit tests (node.js)
+          timeoutInMinutes: 15
+        - script: yarn test-browser-no-install --sequential --build --browser chromium --browser webkit --tfs "Browser Unit Tests"
+          env:
+            DEBUG: "*browser*"
+          displayName: Run unit tests (Browser, Chromium & Webkit)
+          timeoutInMinutes: 30
 
   - ${{ if eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true) }}:
     - script: |
@@ -69,24 +94,44 @@ steps:
       displayName: Build integration tests
 
     - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}:
-      - script: ./scripts/test-integration.sh --tfs "Integration Tests"
-        displayName: Run integration tests (Electron)
-        timeoutInMinutes: 20
+      - ${{ if eq(parameters.VSCODE_BUILD_ESM, true) }}:
+        - script: ./scripts/test-integration-esm.sh --tfs "Integration Tests"
+          displayName: Run integration tests (Electron) [ESM]
+          timeoutInMinutes: 20
+      - ${{ if eq(parameters.VSCODE_BUILD_ESM, false) }}:
+        - script: ./scripts/test-integration --tfs "Integration Tests"
+          displayName: Run integration tests (Electron)
+          timeoutInMinutes: 20
 
     - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-      - script: |
-          # Figure out the full absolute path of the product we just built
-          # including the remote server and configure the integration tests
-          # to run with these builds instead of running out of sources.
-          set -e
-          APP_ROOT="$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)"
-          APP_NAME="`ls $APP_ROOT | head -n 1`"
-          INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME/Contents/MacOS/Electron" \
-          ./scripts/test-integration.sh --build --tfs "Integration Tests"
-        env:
-          VSCODE_REMOTE_SERVER_PATH: $(agent.builddirectory)/vscode-server-darwin-$(VSCODE_ARCH)
-        displayName: Run integration tests (Electron)
-        timeoutInMinutes: 20
+      - ${{ if eq(parameters.VSCODE_BUILD_ESM, true) }}:
+        - script: |
+            # Figure out the full absolute path of the product we just built
+            # including the remote server and configure the integration tests
+            # to run with these builds instead of running out of sources.
+            set -e
+            APP_ROOT="$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)"
+            APP_NAME="`ls $APP_ROOT | head -n 1`"
+            INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME/Contents/MacOS/Electron" \
+            ./scripts/test-integration-esm.sh --build --tfs "Integration Tests"
+          env:
+            VSCODE_REMOTE_SERVER_PATH: $(agent.builddirectory)/vscode-server-darwin-$(VSCODE_ARCH)
+          displayName: Run integration tests (Electron) [ESM]
+          timeoutInMinutes: 20
+      - ${{ if eq(parameters.VSCODE_BUILD_ESM, false) }}:
+        - script: |
+            # Figure out the full absolute path of the product we just built
+            # including the remote server and configure the integration tests
+            # to run with these builds instead of running out of sources.
+            set -e
+            APP_ROOT="$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)"
+            APP_NAME="`ls $APP_ROOT | head -n 1`"
+            INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME/Contents/MacOS/Electron" \
+            ./scripts/test-integration.sh --build --tfs "Integration Tests"
+          env:
+            VSCODE_REMOTE_SERVER_PATH: $(agent.builddirectory)/vscode-server-darwin-$(VSCODE_ARCH)
+          displayName: Run integration tests (Electron)
+          timeoutInMinutes: 20
 
       - script: ./scripts/test-web-integration.sh --browser webkit
         env:
diff --git a/build/azure-pipelines/darwin/product-build-darwin.yml b/build/azure-pipelines/darwin/product-build-darwin.yml
index 11f69d735ac..ccb6b5b35e7 100644
--- a/build/azure-pipelines/darwin/product-build-darwin.yml
+++ b/build/azure-pipelines/darwin/product-build-darwin.yml
@@ -9,6 +9,9 @@ parameters:
     type: boolean
   - name: VSCODE_RUN_SMOKE_TESTS
     type: boolean
+  - name: VSCODE_BUILD_ESM
+    type: boolean
+    default: false
 
 steps:
   - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}:
@@ -101,6 +104,11 @@ steps:
       ELECTRON_SKIP_BINARY_DOWNLOAD: 1
       PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
       GITHUB_TOKEN: "$(github-distro-mixin-password)"
+      # Avoid using dlopen to load Kerberos on macOS which can cause missing libraries
+      # https://github.com/mongodb-js/kerberos/commit/04044d2814ad1d01e77f1ce87f26b03d86692cf2
+      # flipped the default to support legacy linux distros which shouldn't happen
+      # on macOS.
+      GYP_DEFINES: "kerberos_use_rtld=false"
     displayName: Install dependencies
     condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
 
@@ -169,6 +177,7 @@ steps:
         VSCODE_RUN_UNIT_TESTS: ${{ parameters.VSCODE_RUN_UNIT_TESTS }}
         VSCODE_RUN_INTEGRATION_TESTS: ${{ parameters.VSCODE_RUN_INTEGRATION_TESTS }}
         VSCODE_RUN_SMOKE_TESTS: ${{ parameters.VSCODE_RUN_SMOKE_TESTS }}
+        VSCODE_BUILD_ESM: ${{ parameters.VSCODE_BUILD_ESM }}
 
   - ${{ elseif and(ne(parameters.VSCODE_CIBUILD, true), ne(parameters.VSCODE_QUALITY, 'oss')) }}:
     - task: DownloadPipelineArtifact@2
diff --git a/build/azure-pipelines/linux/product-build-linux-legacy-server.yml b/build/azure-pipelines/linux/product-build-linux-legacy-server.yml
index 26f02657e10..b3b505c1369 100644
--- a/build/azure-pipelines/linux/product-build-linux-legacy-server.yml
+++ b/build/azure-pipelines/linux/product-build-linux-legacy-server.yml
@@ -5,6 +5,9 @@ parameters:
     type: boolean
   - name: VSCODE_ARCH
     type: string
+  - name: VSCODE_BUILD_ESM
+    type: boolean
+    default: false
 
 steps:
   - task: NodeTool@0
@@ -201,6 +204,7 @@ steps:
         VSCODE_RUN_UNIT_TESTS: false
         VSCODE_RUN_INTEGRATION_TESTS: ${{ parameters.VSCODE_RUN_INTEGRATION_TESTS }}
         VSCODE_RUN_SMOKE_TESTS: false
+        VSCODE_BUILD_ESM: ${{ parameters.VSCODE_BUILD_ESM }}
         ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
           PUBLISH_TASK_NAME: 1ES.PublishPipelineArtifact@1
 
diff --git a/build/azure-pipelines/linux/product-build-linux-test.yml b/build/azure-pipelines/linux/product-build-linux-test.yml
index 43673619b16..0b358a81914 100644
--- a/build/azure-pipelines/linux/product-build-linux-test.yml
+++ b/build/azure-pipelines/linux/product-build-linux-test.yml
@@ -10,6 +10,9 @@ parameters:
   - name: PUBLISH_TASK_NAME
     type: string
     default: PublishPipelineArtifact@0
+  - name: VSCODE_BUILD_ESM
+    type: boolean
+    default: false
 
 steps:
   - script: yarn npm-run-all -lp "electron $(VSCODE_ARCH)" "playwright-install"
@@ -33,36 +36,61 @@ steps:
 
   - ${{ if eq(parameters.VSCODE_RUN_UNIT_TESTS, true) }}:
     - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}:
-      - script: ./scripts/test.sh --tfs "Unit Tests"
-        env:
-          DISPLAY: ":10"
-        displayName: Run unit tests (Electron)
-        timeoutInMinutes: 15
+      - ${{ if eq(parameters.VSCODE_BUILD_ESM, true) }}:
+        - script: ./scripts/test-esm.sh --tfs "Unit Tests"
+          env:
+            DISPLAY: ":10"
+          displayName: Run unit tests (Electron) [ESM]
+          timeoutInMinutes: 15
+        - script: yarn test-node-esm
+          displayName: Run unit tests (node.js) [ESM]
+          timeoutInMinutes: 15
+        - script: yarn test-browser-esm-no-install --browser chromium --tfs "Browser Unit Tests"
+          env:
+            DEBUG: "*browser*"
+          displayName: Run unit tests (Browser, Chromium) [ESM]
+          timeoutInMinutes: 15
+      - ${{ if eq(parameters.VSCODE_BUILD_ESM, false) }}:
+        - script: ./scripts/test.sh --tfs "Unit Tests"
+          env:
+            DISPLAY: ":10"
+          displayName: Run unit tests (Electron)
+          timeoutInMinutes: 15
+        - script: yarn test-node
+          displayName: Run unit tests (node.js)
+          timeoutInMinutes: 15
+        - script: yarn test-browser-no-install --browser chromium --tfs "Browser Unit Tests"
+          env:
+            DEBUG: "*browser*"
+          displayName: Run unit tests (Browser, Chromium)
+          timeoutInMinutes: 15
 
-      - script: yarn test-node
-        displayName: Run unit tests (node.js)
-        timeoutInMinutes: 15
-
-      - script: yarn test-browser-no-install --browser chromium --tfs "Browser Unit Tests"
-        env:
-          DEBUG: "*browser*"
-        displayName: Run unit tests (Browser, Chromium)
-        timeoutInMinutes: 15
 
     - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-      - script: ./scripts/test.sh --build --tfs "Unit Tests"
-        displayName: Run unit tests (Electron)
-        timeoutInMinutes: 15
-
-      - script: yarn test-node --build
-        displayName: Run unit tests (node.js)
-        timeoutInMinutes: 15
-
-      - script: yarn test-browser-no-install --build --browser chromium --tfs "Browser Unit Tests"
-        env:
-          DEBUG: "*browser*"
-        displayName: Run unit tests (Browser, Chromium)
-        timeoutInMinutes: 15
+      - ${{ if eq(parameters.VSCODE_BUILD_ESM, true) }}:
+        - script: ./scripts/test-esm.sh --build --tfs "Unit Tests"
+          displayName: Run unit tests (Electron) [ESM]
+          timeoutInMinutes: 15
+        - script: yarn test-node-esm --build
+          displayName: Run unit tests (node.js) [ESM]
+          timeoutInMinutes: 15
+        - script: yarn test-browser-esm-no-install --build --browser chromium --tfs "Browser Unit Tests"
+          env:
+            DEBUG: "*browser*"
+          displayName: Run unit tests (Browser, Chromium) [ESM]
+          timeoutInMinutes: 15
+      - ${{ if eq(parameters.VSCODE_BUILD_ESM, false) }}:
+        - script: ./scripts/test.sh --build --tfs "Unit Tests"
+          displayName: Run unit tests (Electron)
+          timeoutInMinutes: 15
+        - script: yarn test-node --build
+          displayName: Run unit tests (node.js)
+          timeoutInMinutes: 15
+        - script: yarn test-browser-no-install --build --browser chromium --tfs "Browser Unit Tests"
+          env:
+            DEBUG: "*browser*"
+          displayName: Run unit tests (Browser, Chromium)
+          timeoutInMinutes: 15
 
   - ${{ if eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true) }}:
     - script: |
@@ -88,11 +116,18 @@ steps:
 
   - ${{ if eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true) }}:
     - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}:
-      - script: ./scripts/test-integration.sh --tfs "Integration Tests"
-        env:
-          DISPLAY: ":10"
-        displayName: Run integration tests (Electron)
-        timeoutInMinutes: 20
+      - ${{ if eq(parameters.VSCODE_BUILD_ESM, true) }}:
+        - script: ./scripts/test-integration-esm.sh --tfs "Integration Tests"
+          env:
+            DISPLAY: ":10"
+          displayName: Run integration tests (Electron) [ESM]
+          timeoutInMinutes: 20
+      - ${{ if eq(parameters.VSCODE_BUILD_ESM, false) }}:
+        - script: ./scripts/test-integration.sh --tfs "Integration Tests"
+          env:
+            DISPLAY: ":10"
+          displayName: Run integration tests (Electron)
+          timeoutInMinutes: 20
 
       - script: ./scripts/test-web-integration.sh --browser chromium
         displayName: Run integration tests (Browser, Chromium)
@@ -103,20 +138,36 @@ steps:
         timeoutInMinutes: 20
 
     - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-      - script: |
-          # Figure out the full absolute path of the product we just built
-          # including the remote server and configure the integration tests
-          # to run with these builds instead of running out of sources.
-          set -e
-          APP_ROOT=$(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)
-          APP_NAME=$(node -p "require(\"$APP_ROOT/resources/app/product.json\").applicationName")
-          INTEGRATION_TEST_APP_NAME="$APP_NAME" \
-          INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME" \
-          ./scripts/test-integration.sh --build --tfs "Integration Tests"
-        env:
-          VSCODE_REMOTE_SERVER_PATH: $(agent.builddirectory)/vscode-server-linux-$(VSCODE_ARCH)
-        displayName: Run integration tests (Electron)
-        timeoutInMinutes: 20
+      - ${{ if eq(parameters.VSCODE_BUILD_ESM, true) }}:
+        - script: |
+            # Figure out the full absolute path of the product we just built
+            # including the remote server and configure the integration tests
+            # to run with these builds instead of running out of sources.
+            set -e
+            APP_ROOT=$(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)
+            APP_NAME=$(node -p "require(\"$APP_ROOT/resources/app/product.json\").applicationName")
+            INTEGRATION_TEST_APP_NAME="$APP_NAME" \
+            INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME" \
+            ./scripts/test-integration-esm.sh --build --tfs "Integration Tests"
+          env:
+            VSCODE_REMOTE_SERVER_PATH: $(agent.builddirectory)/vscode-server-linux-$(VSCODE_ARCH)
+          displayName: Run integration tests (Electron) [ESM]
+          timeoutInMinutes: 20
+      - ${{ if eq(parameters.VSCODE_BUILD_ESM, false) }}:
+        - script: |
+            # Figure out the full absolute path of the product we just built
+            # including the remote server and configure the integration tests
+            # to run with these builds instead of running out of sources.
+            set -e
+            APP_ROOT=$(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)
+            APP_NAME=$(node -p "require(\"$APP_ROOT/resources/app/product.json\").applicationName")
+            INTEGRATION_TEST_APP_NAME="$APP_NAME" \
+            INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME" \
+            ./scripts/test-integration.sh --build --tfs "Integration Tests"
+          env:
+            VSCODE_REMOTE_SERVER_PATH: $(agent.builddirectory)/vscode-server-linux-$(VSCODE_ARCH)
+          displayName: Run integration tests (Electron)
+          timeoutInMinutes: 20
 
       - script: ./scripts/test-web-integration.sh --browser chromium
         env:
@@ -150,7 +201,7 @@ steps:
       - script: yarn --cwd test/smoke compile
         displayName: Compile smoke tests
 
-      - script: yarn gulp compile-extension:markdown-language-features compile-extension-media compile-extension:vscode-test-resolver
+      - script: yarn gulp compile-extension:markdown-language-features compile-extension:ipynb compile-extension-media compile-extension:vscode-test-resolver
         displayName: Build extensions for smoke tests
 
       - script: yarn gulp node
diff --git a/build/azure-pipelines/linux/product-build-linux.yml b/build/azure-pipelines/linux/product-build-linux.yml
index d1d6bdb9191..2aa304e4fba 100644
--- a/build/azure-pipelines/linux/product-build-linux.yml
+++ b/build/azure-pipelines/linux/product-build-linux.yml
@@ -11,6 +11,9 @@ parameters:
     type: boolean
   - name: VSCODE_ARCH
     type: string
+  - name: VSCODE_BUILD_ESM
+    type: boolean
+    default: false
 
 steps:
   - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}:
@@ -267,6 +270,7 @@ steps:
         VSCODE_RUN_UNIT_TESTS: ${{ parameters.VSCODE_RUN_UNIT_TESTS }}
         VSCODE_RUN_INTEGRATION_TESTS: ${{ parameters.VSCODE_RUN_INTEGRATION_TESTS }}
         VSCODE_RUN_SMOKE_TESTS: ${{ parameters.VSCODE_RUN_SMOKE_TESTS }}
+        VSCODE_BUILD_ESM: ${{ parameters.VSCODE_BUILD_ESM }}
         ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
           PUBLISH_TASK_NAME: 1ES.PublishPipelineArtifact@1
 
diff --git a/build/azure-pipelines/product-build.yml b/build/azure-pipelines/product-build.yml
index 0c4f98aa511..b0e495b7b73 100644
--- a/build/azure-pipelines/product-build.yml
+++ b/build/azure-pipelines/product-build.yml
@@ -100,6 +100,10 @@ parameters:
     displayName: "Skip tests"
     type: boolean
     default: false
+  - name: VSCODE_BUILD_ESM # TODO@bpasero TODO@esm remove me once ESM is shipped
+    displayName: "️❗ Build as ESM (!FOR TESTING ONLY!) ️❗"
+    type: boolean
+    default: false
 
 variables:
   - name: VSCODE_PRIVATE_BUILD
@@ -110,6 +114,8 @@ variables:
     value: ${{ parameters.CARGO_REGISTRY }}
   - name: VSCODE_QUALITY
     value: ${{ parameters.VSCODE_QUALITY }}
+  - name: VSCODE_BUILD_ESM
+    value: ${{ parameters.VSCODE_BUILD_ESM }}
   - name: VSCODE_BUILD_STAGE_WINDOWS
     value: ${{ or(eq(parameters.VSCODE_BUILD_WIN32, true), eq(parameters.VSCODE_BUILD_WIN32_ARM64, true)) }}
   - name: VSCODE_BUILD_STAGE_LINUX
@@ -148,6 +154,8 @@ variables:
     value: microsoft/vscode-distro
   - name: skipComponentGovernanceDetection
     value: true
+  - name: ComponentDetection.Timeout
+    value: 600
   - name: Codeql.SkipTaskAutoInjection
     value: true
   - name: ARTIFACT_PREFIX
@@ -167,7 +175,7 @@ resources:
       ref: refs/tags/release
 
 extends:
-  template: v1/1ES.Unofficial.PipelineTemplate.yml@1esPipelines
+  template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines
   parameters:
     sdl:
       tsa:
@@ -182,9 +190,10 @@ extends:
           validateToolOutput: None
           allTools: true
       codeql:
+        runSourceLanguagesInSourceAnalysis: true
         compiled:
           enabled: false
-        runSourceLanguagesInSourceAnalysis: true
+          justificationForDisabling: "CodeQL breaks ESRP CodeSign on macOS (ICM #520035761, githubcustomers/microsoft-codeql-support#198)"
       credscan:
         suppressionsFile: $(Build.SourcesDirectory)/build/azure-pipelines/config/CredScanSuppressions.json
       eslint:
@@ -215,6 +224,7 @@ extends:
               - template: build/azure-pipelines/product-compile.yml@self
                 parameters:
                   VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+                  VSCODE_BUILD_ESM: ${{ variables.VSCODE_BUILD_ESM }}
 
       - ${{ if or(eq(parameters.VSCODE_BUILD_LINUX, true),eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true),eq(parameters.VSCODE_BUILD_LINUX_ARM64, true),eq(parameters.VSCODE_BUILD_ALPINE, true),eq(parameters.VSCODE_BUILD_ALPINE_ARM64, true),eq(parameters.VSCODE_BUILD_MACOS, true),eq(parameters.VSCODE_BUILD_MACOS_ARM64, true),eq(parameters.VSCODE_BUILD_WIN32, true),eq(parameters.VSCODE_BUILD_WIN32_ARM64, true)) }}:
         - stage: CompileCLI
@@ -316,17 +326,21 @@ extends:
                       VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
                       VSCODE_BUILD_WIN32_ARM64: ${{ parameters.VSCODE_BUILD_WIN32_ARM64 }}
 
-      - stage: CustomSDL
-        dependsOn: []
-        pool:
-          name: 1es-windows-2019-x64
-          os: windows
-        jobs:
-          - job: WindowsSDL
-            variables:
-              - group: 'API Scan'
-            steps:
-              - template: build/azure-pipelines/sdl-scan.yml@self
+      - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_COMPILE_ONLY, false)) }}:
+        - stage: CustomSDL
+          dependsOn: []
+          pool:
+            name: 1es-windows-2019-x64
+            os: windows
+          jobs:
+            - job: WindowsSDL
+              variables:
+                - group: 'API Scan'
+              steps:
+                - template: build/azure-pipelines/win32/sdl-scan-win32.yml@self
+                  parameters:
+                    VSCODE_ARCH: x64
+                    VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
 
       - ${{ if and(eq(parameters.VSCODE_COMPILE_ONLY, false), eq(variables['VSCODE_BUILD_STAGE_WINDOWS'], true)) }}:
         - stage: Windows
@@ -348,6 +362,7 @@ extends:
                   - template: build/azure-pipelines/win32/product-build-win32.yml@self
                     parameters:
                       VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+                      VSCODE_BUILD_ESM: ${{ variables.VSCODE_BUILD_ESM }}
                       VSCODE_ARCH: x64
                       VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }}
                       VSCODE_RUN_UNIT_TESTS: true
@@ -362,6 +377,7 @@ extends:
                   - template: build/azure-pipelines/win32/product-build-win32.yml@self
                     parameters:
                       VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+                      VSCODE_BUILD_ESM: ${{ variables.VSCODE_BUILD_ESM }}
                       VSCODE_ARCH: x64
                       VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }}
                       VSCODE_RUN_UNIT_TESTS: false
@@ -376,6 +392,7 @@ extends:
                   - template: build/azure-pipelines/win32/product-build-win32.yml@self
                     parameters:
                       VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+                      VSCODE_BUILD_ESM: ${{ variables.VSCODE_BUILD_ESM }}
                       VSCODE_ARCH: x64
                       VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }}
                       VSCODE_RUN_UNIT_TESTS: false
@@ -391,6 +408,7 @@ extends:
                   - template: build/azure-pipelines/win32/product-build-win32.yml@self
                     parameters:
                       VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+                      VSCODE_BUILD_ESM: ${{ variables.VSCODE_BUILD_ESM }}
                       VSCODE_ARCH: x64
                       VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }}
                       VSCODE_RUN_UNIT_TESTS: ${{ eq(parameters.VSCODE_STEP_ON_IT, false) }}
@@ -414,6 +432,7 @@ extends:
                   - template: build/azure-pipelines/win32/product-build-win32.yml@self
                     parameters:
                       VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+                      VSCODE_BUILD_ESM: ${{ variables.VSCODE_BUILD_ESM }}
                       VSCODE_ARCH: arm64
                       VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }}
                       VSCODE_RUN_UNIT_TESTS: false
@@ -442,6 +461,7 @@ extends:
                     parameters:
                       VSCODE_ARCH: x64
                       VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+                      VSCODE_BUILD_ESM: ${{ variables.VSCODE_BUILD_ESM }}
                       VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }}
                       VSCODE_RUN_UNIT_TESTS: true
                       VSCODE_RUN_INTEGRATION_TESTS: false
@@ -457,6 +477,7 @@ extends:
                     parameters:
                       VSCODE_ARCH: x64
                       VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+                      VSCODE_BUILD_ESM: ${{ variables.VSCODE_BUILD_ESM }}
                       VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }}
                       VSCODE_RUN_UNIT_TESTS: false
                       VSCODE_RUN_INTEGRATION_TESTS: true
@@ -472,6 +493,7 @@ extends:
                     parameters:
                       VSCODE_ARCH: x64
                       VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+                      VSCODE_BUILD_ESM: ${{ variables.VSCODE_BUILD_ESM }}
                       VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }}
                       VSCODE_RUN_UNIT_TESTS: false
                       VSCODE_RUN_INTEGRATION_TESTS: false
@@ -489,6 +511,7 @@ extends:
                     parameters:
                       VSCODE_ARCH: x64
                       VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+                      VSCODE_BUILD_ESM: ${{ variables.VSCODE_BUILD_ESM }}
                       VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }}
                       VSCODE_RUN_UNIT_TESTS: ${{ eq(parameters.VSCODE_STEP_ON_IT, false) }}
                       VSCODE_RUN_INTEGRATION_TESTS: ${{ eq(parameters.VSCODE_STEP_ON_IT, false) }}
@@ -514,6 +537,7 @@ extends:
                     parameters:
                       VSCODE_ARCH: armhf
                       VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+                      VSCODE_BUILD_ESM: ${{ variables.VSCODE_BUILD_ESM }}
                       VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }}
                       VSCODE_RUN_UNIT_TESTS: false
                       VSCODE_RUN_INTEGRATION_TESTS: false
@@ -529,6 +553,7 @@ extends:
                     parameters:
                       VSCODE_ARCH: arm64
                       VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+                      VSCODE_BUILD_ESM: ${{ variables.VSCODE_BUILD_ESM }}
                       VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }}
                       VSCODE_RUN_UNIT_TESTS: false
                       VSCODE_RUN_INTEGRATION_TESTS: false
@@ -553,6 +578,7 @@ extends:
                     parameters:
                       VSCODE_ARCH: x64
                       VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+                      VSCODE_BUILD_ESM: ${{ variables.VSCODE_BUILD_ESM }}
                       VSCODE_RUN_INTEGRATION_TESTS: ${{ eq(parameters.VSCODE_STEP_ON_IT, false) }}
 
             - ${{ if eq(parameters.VSCODE_BUILD_LINUX_ARMHF_LEGACY_SERVER, true) }}:
@@ -565,6 +591,7 @@ extends:
                     parameters:
                       VSCODE_ARCH: armhf
                       VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+                      VSCODE_BUILD_ESM: ${{ variables.VSCODE_BUILD_ESM }}
                       VSCODE_RUN_INTEGRATION_TESTS: false
 
             - ${{ if eq(parameters.VSCODE_BUILD_LINUX_ARM64_LEGACY_SERVER, true) }}:
@@ -577,6 +604,7 @@ extends:
                     parameters:
                       VSCODE_ARCH: arm64
                       VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+                      VSCODE_BUILD_ESM: ${{ variables.VSCODE_BUILD_ESM }}
                       VSCODE_RUN_INTEGRATION_TESTS: false
 
       - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_COMPILE_ONLY, false), eq(variables['VSCODE_BUILD_STAGE_ALPINE'], true)) }}:
@@ -629,6 +657,7 @@ extends:
                   - template: build/azure-pipelines/darwin/product-build-darwin.yml@self
                     parameters:
                       VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+                      VSCODE_BUILD_ESM: ${{ variables.VSCODE_BUILD_ESM }}
                       VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }}
                       VSCODE_RUN_UNIT_TESTS: true
                       VSCODE_RUN_INTEGRATION_TESTS: false
@@ -642,6 +671,7 @@ extends:
                   - template: build/azure-pipelines/darwin/product-build-darwin.yml@self
                     parameters:
                       VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+                      VSCODE_BUILD_ESM: ${{ variables.VSCODE_BUILD_ESM }}
                       VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }}
                       VSCODE_RUN_UNIT_TESTS: false
                       VSCODE_RUN_INTEGRATION_TESTS: true
@@ -655,6 +685,7 @@ extends:
                   - template: build/azure-pipelines/darwin/product-build-darwin.yml@self
                     parameters:
                       VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+                      VSCODE_BUILD_ESM: ${{ variables.VSCODE_BUILD_ESM }}
                       VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }}
                       VSCODE_RUN_UNIT_TESTS: false
                       VSCODE_RUN_INTEGRATION_TESTS: false
@@ -669,6 +700,7 @@ extends:
                   - template: build/azure-pipelines/darwin/product-build-darwin.yml@self
                     parameters:
                       VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+                      VSCODE_BUILD_ESM: ${{ variables.VSCODE_BUILD_ESM }}
                       VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }}
                       VSCODE_RUN_UNIT_TESTS: false
                       VSCODE_RUN_INTEGRATION_TESTS: false
@@ -683,6 +715,7 @@ extends:
                     - template: build/azure-pipelines/darwin/product-build-darwin.yml@self
                       parameters:
                         VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+                        VSCODE_BUILD_ESM: ${{ variables.VSCODE_BUILD_ESM }}
                         VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }}
                         VSCODE_RUN_UNIT_TESTS: ${{ eq(parameters.VSCODE_STEP_ON_IT, false) }}
                         VSCODE_RUN_INTEGRATION_TESTS: ${{ eq(parameters.VSCODE_STEP_ON_IT, false) }}
@@ -714,6 +747,7 @@ extends:
                   - template: build/azure-pipelines/darwin/product-build-darwin.yml@self
                     parameters:
                       VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+                      VSCODE_BUILD_ESM: ${{ variables.VSCODE_BUILD_ESM }}
                       VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }}
                       VSCODE_RUN_UNIT_TESTS: false
                       VSCODE_RUN_INTEGRATION_TESTS: false
diff --git a/build/azure-pipelines/product-compile.yml b/build/azure-pipelines/product-compile.yml
index 9a3748ed6fc..46b5dde2492 100644
--- a/build/azure-pipelines/product-compile.yml
+++ b/build/azure-pipelines/product-compile.yml
@@ -1,6 +1,9 @@
 parameters:
   - name: VSCODE_QUALITY
     type: string
+  - name: VSCODE_BUILD_ESM
+    type: boolean
+    default: false
 
 steps:
   - task: NodeTool@0
@@ -98,6 +101,10 @@ steps:
     - script: node build/azure-pipelines/distro/mixin-quality
       displayName: Mixin distro quality
 
+  - ${{ if eq(parameters.VSCODE_BUILD_ESM, true) }}:
+    - script: node migrate.mjs --disable-watch
+      displayName: Migrate to ESM
+
   - template: common/install-builtin-extensions.yml@self
 
   - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}:
diff --git a/build/azure-pipelines/win32/product-build-win32-test.yml b/build/azure-pipelines/win32/product-build-win32-test.yml
index c9b2d6cfa61..fb3f3f4d73b 100644
--- a/build/azure-pipelines/win32/product-build-win32-test.yml
+++ b/build/azure-pipelines/win32/product-build-win32-test.yml
@@ -12,6 +12,9 @@ parameters:
   - name: PUBLISH_TASK_NAME
     type: string
     default: PublishPipelineArtifact@0
+  - name: VSCODE_BUILD_ESM
+    type: boolean
+    default: false
 
 steps:
   - powershell: yarn npm-run-all -lp "electron $(VSCODE_ARCH)" "playwright-install"
@@ -22,30 +25,48 @@ steps:
 
   - ${{ if eq(parameters.VSCODE_RUN_UNIT_TESTS, true) }}:
     - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}:
-      - powershell: .\scripts\test.bat --tfs "Unit Tests"
-        displayName: Run unit tests (Electron)
-        timeoutInMinutes: 15
-
-      - powershell: yarn test-node
-        displayName: Run unit tests (node.js)
-        timeoutInMinutes: 15
-
-      - powershell: node test/unit/browser/index.js --sequential --browser chromium --tfs "Browser Unit Tests"
-        displayName: Run unit tests (Browser, Chromium)
-        timeoutInMinutes: 20
+      - ${{ if eq(parameters.VSCODE_BUILD_ESM, true) }}:
+        - powershell: .\scripts\test-esm.bat --tfs "Unit Tests"
+          displayName: Run unit tests (Electron) [ESM]
+          timeoutInMinutes: 15
+        - powershell: yarn test-node-esm
+          displayName: Run unit tests (node.js) [ESM]
+          timeoutInMinutes: 15
+        - powershell: node test/unit/browser/index.esm.js --sequential --browser chromium --tfs "Browser Unit Tests"
+          displayName: Run unit tests (Browser, Chromium) [ESM]
+          timeoutInMinutes: 20
+      - ${{ if eq(parameters.VSCODE_BUILD_ESM, false) }}:
+        - powershell: .\scripts\test.bat --tfs "Unit Tests"
+          displayName: Run unit tests (Electron)
+          timeoutInMinutes: 15
+        - powershell: yarn test-node
+          displayName: Run unit tests (node.js)
+          timeoutInMinutes: 15
+        - powershell: node test/unit/browser/index.js --sequential --browser chromium --tfs "Browser Unit Tests"
+          displayName: Run unit tests (Browser, Chromium)
+          timeoutInMinutes: 20
 
     - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-      - powershell: .\scripts\test.bat --build --tfs "Unit Tests"
-        displayName: Run unit tests (Electron)
-        timeoutInMinutes: 15
-
-      - powershell: yarn test-node --build
-        displayName: Run unit tests (node.js)
-        timeoutInMinutes: 15
-
-      - powershell: yarn test-browser-no-install --sequential --build --browser chromium --tfs "Browser Unit Tests"
-        displayName: Run unit tests (Browser, Chromium)
-        timeoutInMinutes: 20
+      - ${{ if eq(parameters.VSCODE_BUILD_ESM, true) }}:
+        - powershell: .\scripts\test-esm.bat --build --tfs "Unit Tests"
+          displayName: Run unit tests (Electron) [ESM]
+          timeoutInMinutes: 15
+        - script: yarn test-node-esm --build
+          displayName: Run unit tests (node.js) [ESM]
+          timeoutInMinutes: 15
+        - powershell: yarn test-browser-esm-no-install --sequential --build --browser chromium --tfs "Browser Unit Tests"
+          displayName: Run unit tests (Browser, Chromium) [ESM]
+          timeoutInMinutes: 20
+      - ${{ if eq(parameters.VSCODE_BUILD_ESM, false) }}:
+        - powershell: .\scripts\test.bat --build --tfs "Unit Tests"
+          displayName: Run unit tests (Electron)
+          timeoutInMinutes: 15
+        - powershell: yarn test-node --build
+          displayName: Run unit tests (node.js)
+          timeoutInMinutes: 15
+        - powershell: yarn test-browser-no-install --sequential --build --browser chromium --tfs "Browser Unit Tests"
+          displayName: Run unit tests (Browser, Chromium)
+          timeoutInMinutes: 20
 
   - ${{ if eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true) }}:
     - powershell: |
@@ -77,9 +98,14 @@ steps:
       condition: succeededOrFailed()
 
     - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}:
-      - powershell: .\scripts\test-integration.bat --tfs "Integration Tests"
-        displayName: Run integration tests (Electron)
-        timeoutInMinutes: 20
+      - ${{ if eq(parameters.VSCODE_BUILD_ESM, true) }}:
+        - powershell: .\scripts\test-integration-esm.bat --tfs "Integration Tests"
+          displayName: Run integration tests (Electron) [ESM]
+          timeoutInMinutes: 20
+      - ${{ if eq(parameters.VSCODE_BUILD_ESM, false) }}:
+        - powershell: .\scripts\test-integration.bat --tfs "Integration Tests"
+          displayName: Run integration tests (Electron)
+          timeoutInMinutes: 20
 
       - powershell: .\scripts\test-web-integration.bat --browser firefox
         displayName: Run integration tests (Browser, Firefox)
@@ -90,20 +116,36 @@ steps:
         timeoutInMinutes: 20
 
     - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-      - powershell: |
-          # Figure out the full absolute path of the product we just built
-          # including the remote server and configure the integration tests
-          # to run with these builds instead of running out of sources.
-          . build/azure-pipelines/win32/exec.ps1
-          $ErrorActionPreference = "Stop"
-          $AppRoot = "$(agent.builddirectory)\VSCode-win32-$(VSCODE_ARCH)"
-          $AppProductJson = Get-Content -Raw -Path "$AppRoot\resources\app\product.json" | ConvertFrom-Json
-          $AppNameShort = $AppProductJson.nameShort
-          $env:INTEGRATION_TEST_ELECTRON_PATH = "$AppRoot\$AppNameShort.exe"
-          $env:VSCODE_REMOTE_SERVER_PATH = "$(agent.builddirectory)\vscode-server-win32-$(VSCODE_ARCH)"
-          exec { .\scripts\test-integration.bat --build --tfs "Integration Tests" }
-        displayName: Run integration tests (Electron)
-        timeoutInMinutes: 20
+      - ${{ if eq(parameters.VSCODE_BUILD_ESM, true) }}:
+        - powershell: |
+            # Figure out the full absolute path of the product we just built
+            # including the remote server and configure the integration tests
+            # to run with these builds instead of running out of sources.
+            . build/azure-pipelines/win32/exec.ps1
+            $ErrorActionPreference = "Stop"
+            $AppRoot = "$(agent.builddirectory)\VSCode-win32-$(VSCODE_ARCH)"
+            $AppProductJson = Get-Content -Raw -Path "$AppRoot\resources\app\product.json" | ConvertFrom-Json
+            $AppNameShort = $AppProductJson.nameShort
+            $env:INTEGRATION_TEST_ELECTRON_PATH = "$AppRoot\$AppNameShort.exe"
+            $env:VSCODE_REMOTE_SERVER_PATH = "$(agent.builddirectory)\vscode-server-win32-$(VSCODE_ARCH)"
+            exec { .\scripts\test-integration-esm.bat --build --tfs "Integration Tests" }
+          displayName: Run integration tests (Electron) [ESM]
+          timeoutInMinutes: 20
+      - ${{ if eq(parameters.VSCODE_BUILD_ESM, false) }}:
+        - powershell: |
+            # Figure out the full absolute path of the product we just built
+            # including the remote server and configure the integration tests
+            # to run with these builds instead of running out of sources.
+            . build/azure-pipelines/win32/exec.ps1
+            $ErrorActionPreference = "Stop"
+            $AppRoot = "$(agent.builddirectory)\VSCode-win32-$(VSCODE_ARCH)"
+            $AppProductJson = Get-Content -Raw -Path "$AppRoot\resources\app\product.json" | ConvertFrom-Json
+            $AppNameShort = $AppProductJson.nameShort
+            $env:INTEGRATION_TEST_ELECTRON_PATH = "$AppRoot\$AppNameShort.exe"
+            $env:VSCODE_REMOTE_SERVER_PATH = "$(agent.builddirectory)\vscode-server-win32-$(VSCODE_ARCH)"
+            exec { .\scripts\test-integration.bat --build --tfs "Integration Tests" }
+          displayName: Run integration tests (Electron)
+          timeoutInMinutes: 20
 
       - powershell: |
           . build/azure-pipelines/win32/exec.ps1
diff --git a/build/azure-pipelines/win32/product-build-win32.yml b/build/azure-pipelines/win32/product-build-win32.yml
index d3827b930f8..a67e0ccf4e3 100644
--- a/build/azure-pipelines/win32/product-build-win32.yml
+++ b/build/azure-pipelines/win32/product-build-win32.yml
@@ -11,6 +11,9 @@ parameters:
     type: boolean
   - name: VSCODE_RUN_SMOKE_TESTS
     type: boolean
+  - name: VSCODE_BUILD_ESM
+    type: boolean
+    default: false
 
 steps:
   - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}:
@@ -160,7 +163,6 @@ steps:
       env:
         GITHUB_TOKEN: "$(github-distro-mixin-password)"
       displayName: Build server
-      condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'arm64'))
 
     - powershell: |
         . build/azure-pipelines/win32/exec.ps1
@@ -171,7 +173,6 @@ steps:
       env:
         GITHUB_TOKEN: "$(github-distro-mixin-password)"
       displayName: Build server (web)
-      condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'arm64'))
 
   - ${{ if or(eq(parameters.VSCODE_RUN_UNIT_TESTS, true), eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true), eq(parameters.VSCODE_RUN_SMOKE_TESTS, true)) }}:
     - template: product-build-win32-test.yml@self
@@ -181,6 +182,7 @@ steps:
         VSCODE_RUN_UNIT_TESTS: ${{ parameters.VSCODE_RUN_UNIT_TESTS }}
         VSCODE_RUN_INTEGRATION_TESTS: ${{ parameters.VSCODE_RUN_INTEGRATION_TESTS }}
         VSCODE_RUN_SMOKE_TESTS: ${{ parameters.VSCODE_RUN_SMOKE_TESTS }}
+        VSCODE_BUILD_ESM: ${{ parameters.VSCODE_BUILD_ESM }}
         ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
           PUBLISH_TASK_NAME: 1ES.PublishPipelineArtifact@1
 
@@ -312,7 +314,7 @@ steps:
           sbomBuildDropPath: $(Agent.BuildDirectory)/vscode-server-win32-$(VSCODE_ARCH)
           sbomPackageName: "VS Code Windows $(VSCODE_ARCH) Server"
           sbomPackageVersion: $(Build.SourceVersion)
-        condition: and(succeededOrFailed(), ne(variables['SERVER_PATH'], ''), ne(variables['VSCODE_ARCH'], 'arm64'))
+        condition: and(succeededOrFailed(), ne(variables['SERVER_PATH'], ''))
         displayName: Publish server archive
 
       - task: 1ES.PublishPipelineArtifact@1
@@ -322,7 +324,7 @@ steps:
           sbomBuildDropPath: $(Agent.BuildDirectory)/vscode-server-win32-$(VSCODE_ARCH)-web
           sbomPackageName: "VS Code Windows $(VSCODE_ARCH) Web"
           sbomPackageVersion: $(Build.SourceVersion)
-        condition: and(succeededOrFailed(), ne(variables['WEB_PATH'], ''), ne(variables['VSCODE_ARCH'], 'arm64'))
+        condition: and(succeededOrFailed(), ne(variables['WEB_PATH'], ''))
         displayName: Publish web server archive
 
       - task: 1ES.PublishPipelineArtifact@1
diff --git a/build/azure-pipelines/sdl-scan.yml b/build/azure-pipelines/win32/sdl-scan-win32.yml
similarity index 60%
rename from build/azure-pipelines/sdl-scan.yml
rename to build/azure-pipelines/win32/sdl-scan-win32.yml
index af20a305d9c..81c0258f4ee 100644
--- a/build/azure-pipelines/sdl-scan.yml
+++ b/build/azure-pipelines/win32/sdl-scan-win32.yml
@@ -1,14 +1,8 @@
 parameters:
-  - name: NPM_REGISTRY
-    displayName: "Custom NPM Registry"
-    type: string
-    default: "https://pkgs.dev.azure.com/monacotools/Monaco/_packaging/vscode/npm/registry/"
-  - name: NPM_ARCH
-    type: string
-    default: x64
   - name: VSCODE_ARCH
     type: string
-    default: x64
+  - name: VSCODE_QUALITY
+    type: string
 
 steps:
   - task: NodeTool@0
@@ -17,7 +11,12 @@ steps:
       versionFilePath: .nvmrc
       nodejsMirror: https://github.com/joaomoreno/node-mirror/releases/download
 
-  - template: ./distro/download-distro.yml
+  - task: UsePythonVersion@0
+    inputs:
+      versionSpec: "3.x"
+      addToPath: true
+
+  - template: ../distro/download-distro.yml@self
 
   - task: AzureKeyVault@1
     displayName: "Azure Key Vault: Get Secrets"
@@ -26,40 +25,34 @@ steps:
       KeyVaultName: vscode-build-secrets
       SecretsFilter: "github-distro-mixin-password"
 
+  - powershell: node build/setup-npm-registry.js $env:NPM_REGISTRY
+    condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none'))
+    displayName: Setup NPM Registry
+
   - powershell: |
       . build/azure-pipelines/win32/exec.ps1
       $ErrorActionPreference = "Stop"
-      exec { npm config set registry "${{ parameters.NPM_REGISTRY }}" --location=project }
+      exec { npm config set registry "$env:NPM_REGISTRY" --location=project }
       # npm >v7 deprecated the `always-auth` config option, refs npm/cli@72a7eeb
       # following is a workaround for yarn to send authorization header
       # for GET requests to the registry.
       exec { Add-Content -Path .npmrc -Value "always-auth=true" }
-      exec { yarn config set registry "${{ parameters.NPM_REGISTRY }}" }
-    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne('${{ parameters.NPM_REGISTRY }}', 'none'))
+      exec { yarn config set registry "$env:NPM_REGISTRY" }
+    condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none'))
     displayName: Setup NPM & Yarn
 
   - task: npmAuthenticate@0
     inputs:
       workingFile: .npmrc
-    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne('${{ parameters.NPM_REGISTRY }}', 'none'))
+    condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none'))
     displayName: Setup NPM Authentication
 
-  - powershell: |
-      . build/azure-pipelines/win32/exec.ps1
-      $ErrorActionPreference = "Stop"
-      exec { node build/setup-npm-registry.js "${{ parameters.NPM_REGISTRY }}" }
-    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne('${{ parameters.NPM_REGISTRY }}', 'none'))
-    displayName: Setup NPM Registry
-
   - pwsh: |
       $includes = @'
         {
           'target_defaults': {
             'conditions': [
               ['OS=="win"', {
-                'msvs_configuration_attributes': {
-                  'SpectreMitigation': 'Spectre'
-                },
                 'msvs_settings': {
                   'VCCLCompilerTool': {
                     'AdditionalOptions': [
@@ -91,9 +84,11 @@ steps:
       $ErrorActionPreference = "Stop"
       retry { exec { yarn --frozen-lockfile --check-files } }
     env:
+      npm_config_arch: ${{ parameters.VSCODE_ARCH }}
+      CHILD_CONCURRENCY: 1
+      ELECTRON_SKIP_BINARY_DOWNLOAD: 1
       PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
       GITHUB_TOKEN: "$(github-distro-mixin-password)"
-      CHILD_CONCURRENCY: 1
     displayName: Install dependencies
 
   - script: node build/azure-pipelines/distro/mixin-npm
@@ -102,46 +97,62 @@ steps:
   - script: node build/azure-pipelines/distro/mixin-quality
     displayName: Mixin distro quality
     env:
-      VSCODE_QUALITY: stable
+      VSCODE_QUALITY: ${{ parameters.VSCODE_QUALITY }}
 
   - powershell: yarn compile
     displayName: Compile
 
+  - powershell: |
+      Get-ChildItem '$(Build.SourcesDirectory)' -Recurse -Filter "*.exe"
+      Get-ChildItem '$(Build.SourcesDirectory)' -Recurse -Filter "*.dll"
+      Get-ChildItem '$(Build.SourcesDirectory)' -Recurse -Filter "*.node"
+      Get-ChildItem '$(Build.SourcesDirectory)' -Recurse -Filter "*.pdb"
+    displayName: List files
+
   - powershell: yarn gulp "vscode-symbols-win32-${{ parameters.VSCODE_ARCH }}"
     env:
       GITHUB_TOKEN: "$(github-distro-mixin-password)"
     displayName: Download Symbols
 
+  - powershell: |
+      Get-ChildItem '$(Agent.BuildDirectory)\scanbin' -Recurse -Filter "*.exe"
+      Get-ChildItem '$(Agent.BuildDirectory)\scanbin' -Recurse -Filter "*.dll"
+      Get-ChildItem '$(Agent.BuildDirectory)\scanbin' -Recurse -Filter "*.node"
+      Get-ChildItem '$(Agent.BuildDirectory)\scanbin' -Recurse -Filter "*.pdb"
+    displayName: List files again
+
   - task: BinSkim@4
     inputs:
       InputType: "Basic"
       Function: "analyze"
       TargetPattern: "guardianGlob"
       AnalyzeIgnorePdbLoadError: true
-      AnalyzeTargetGlob: '$(agent.builddirectory)\scanbin\**.dll;$(agent.builddirectory)\scanbin\**.exe;$(agent.builddirectory)\scanbin\**.node'
-      AnalyzeLocalSymbolDirectories: '$(agent.builddirectory)\scanbin\VSCode-win32-${{ parameters.VSCODE_ARCH }}\pdb'
+      AnalyzeTargetGlob: '$(Agent.BuildDirectory)\scanbin\**.dll;$(Agent.BuildDirectory)\scanbin\**.exe;$(Agent.BuildDirectory)\scanbin\**.node'
+      AnalyzeLocalSymbolDirectories: '$(Agent.BuildDirectory)\scanbin\VSCode-win32-${{ parameters.VSCODE_ARCH }}\pdb'
 
   - task: CopyFiles@2
     displayName: 'Collect Symbols for API Scan'
     inputs:
       SourceFolder: $(Agent.BuildDirectory)
       Contents: 'scanbin\**\*.pdb'
-      TargetFolder: '$(agent.builddirectory)\symbols'
+      TargetFolder: '$(Agent.BuildDirectory)\symbols'
       flattenFolders: true
     condition: succeeded()
 
-  # - task: APIScan@2
-  #   inputs:
-  #     softwareFolder: $(agent.builddirectory)\scanbin
-  #     softwareName: 'vscode-client'
-  #     softwareVersionNum: '1'
-  #     symbolsFolder: 'SRV*http://symweb;$(agent.builddirectory)\symbols'
-  #     isLargeApp: false
-  #     toolVersion: 'Latest'
-  #   displayName: Run ApiScan
-  #   condition: succeeded()
-  #   env:
-  #     AzureServicesAuthConnectionString: $(apiscan-connectionstring)
+  - task: APIScan@2
+    inputs:
+      softwareFolder: $(Agent.BuildDirectory)\scanbin
+      softwareName: 'vscode-client'
+      softwareVersionNum: '1'
+      symbolsFolder: 'srv*https://symweb.azurefd.net;$(Agent.BuildDirectory)\symbols'
+      isLargeApp: false
+      toolVersion: 'Latest'
+      azureSubscription: 'vscode-apiscan'
+    displayName: Run ApiScan
+    condition: succeeded()
+    env:
+      AzureServicesAuthConnectionString: $(apiscan-connectionstring)
+      SYSTEM_ACCESSTOKEN: $(System.AccessToken)
 
   - task: PublishSecurityAnalysisLogs@3
     inputs:
diff --git a/build/buildfile.js b/build/buildfile.js
new file mode 100644
index 00000000000..74ac8436ccf
--- /dev/null
+++ b/build/buildfile.js
@@ -0,0 +1,120 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+const { isESM } = require('./lib/esm');
+
+/**
+ * @param {string} name
+ * @param {string[]=} exclude
+ * @returns {import('./lib/bundle').IEntryPoint}
+ */
+function createModuleDescription(name, exclude) {
+
+	let excludes = ['vs/css'];
+	if (Array.isArray(exclude) && exclude.length > 0) {
+		excludes = excludes.concat(exclude);
+	}
+
+	return {
+		name: name,
+		include: [],
+		exclude: excludes
+	};
+}
+
+/**
+ * @param {string} name
+ */
+function createEditorWorkerModuleDescription(name) {
+	const amdVariant = createModuleDescription(name, ['vs/base/common/worker/simpleWorker', 'vs/editor/common/services/editorSimpleWorker']);
+	amdVariant.target = 'amd';
+
+	const esmVariant = { ...amdVariant, dest: undefined };
+	esmVariant.target = 'esm';
+	esmVariant.name = `${esmVariant.name}.esm`;
+
+	return [amdVariant, esmVariant];
+}
+
+// TODO@esm take the editor simple worker top level and rename away from "base"
+exports.base = [
+	{
+		name: 'vs/editor/common/services/editorSimpleWorker',
+		include: ['vs/base/common/worker/simpleWorker'],
+		exclude: [],
+		prepend: [
+			{ path: 'vs/loader.js' },
+			{ path: 'vs/base/worker/workerMain.js' }
+		],
+		dest: 'vs/base/worker/workerMain.js',
+		target: 'amd'
+	},
+	{
+		name: 'vs/editor/common/services/editorSimpleWorker.esm',
+		target: 'esm'
+	},
+	{
+		name: 'vs/base/common/worker/simpleWorker',
+		exclude: [],
+		target: 'amd'
+	}
+];
+
+exports.workerExtensionHost = createEditorWorkerModuleDescription('vs/workbench/api/worker/extensionHostWorker');
+exports.workerNotebook = createEditorWorkerModuleDescription('vs/workbench/contrib/notebook/common/services/notebookSimpleWorker');
+exports.workerLanguageDetection = createEditorWorkerModuleDescription('vs/workbench/services/languageDetection/browser/languageDetectionSimpleWorker');
+exports.workerLocalFileSearch = createEditorWorkerModuleDescription('vs/workbench/services/search/worker/localFileSearch');
+exports.workerProfileAnalysis = createEditorWorkerModuleDescription('vs/platform/profiling/electron-sandbox/profileAnalysisWorker');
+exports.workerOutputLinks = createEditorWorkerModuleDescription('vs/workbench/contrib/output/common/outputLinkComputer');
+exports.workerBackgroundTokenization = createEditorWorkerModuleDescription('vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateTokenizationWorker.worker');
+
+exports.workbenchDesktop = function () {
+	return isESM() ? [
+		createModuleDescription('vs/workbench/contrib/debug/node/telemetryApp'),
+		createModuleDescription('vs/platform/files/node/watcher/watcherMain'),
+		createModuleDescription('vs/platform/terminal/node/ptyHostMain'),
+		createModuleDescription('vs/workbench/api/node/extensionHostProcess'),
+		createModuleDescription('vs/workbench/contrib/issue/electron-sandbox/issueReporterMain'),
+		createModuleDescription('vs/workbench/workbench.desktop.main')
+	] : [
+		...createEditorWorkerModuleDescription('vs/workbench/contrib/output/common/outputLinkComputer'),
+		...createEditorWorkerModuleDescription('vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateTokenizationWorker.worker'),
+		createModuleDescription('vs/workbench/contrib/debug/node/telemetryApp'),
+		createModuleDescription('vs/platform/files/node/watcher/watcherMain'),
+		createModuleDescription('vs/platform/terminal/node/ptyHostMain'),
+		createModuleDescription('vs/workbench/api/node/extensionHostProcess'),
+		createModuleDescription('vs/workbench/contrib/issue/electron-sandbox/issueReporterMain'),
+	];
+};
+
+exports.workbenchWeb = function () {
+	return isESM() ? [
+		createModuleDescription('vs/workbench/workbench.web.main')
+	] : [
+		...createEditorWorkerModuleDescription('vs/workbench/contrib/output/common/outputLinkComputer'),
+		...createEditorWorkerModuleDescription('vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateTokenizationWorker.worker'),
+		createModuleDescription('vs/code/browser/workbench/workbench', ['vs/workbench/workbench.web.main'])
+	];
+};
+
+exports.keyboardMaps = [
+	createModuleDescription('vs/workbench/services/keybinding/browser/keyboardLayouts/layout.contribution.linux'),
+	createModuleDescription('vs/workbench/services/keybinding/browser/keyboardLayouts/layout.contribution.darwin'),
+	createModuleDescription('vs/workbench/services/keybinding/browser/keyboardLayouts/layout.contribution.win')
+];
+
+exports.code = [
+	createModuleDescription('vs/code/electron-main/main'),
+	createModuleDescription('vs/code/node/cli'),
+	createModuleDescription('vs/code/node/cliProcessMain', ['vs/code/node/cli']),
+	createModuleDescription('vs/code/node/sharedProcess/sharedProcessMain'),
+	createModuleDescription('vs/code/electron-sandbox/processExplorer/processExplorerMain')
+];
+
+exports.codeWeb = [
+	createModuleDescription('vs/code/browser/workbench/workbench')
+];
+
+exports.entrypoint = createModuleDescription;
diff --git a/build/checksums/electron.txt b/build/checksums/electron.txt
index 52950abd800..aecf657e571 100644
--- a/build/checksums/electron.txt
+++ b/build/checksums/electron.txt
@@ -1,75 +1,75 @@
-cdf0522dacc5fdf75a9a4ca9a20f049793ef8bae2b04e37f02e8923fcecd4c76 *chromedriver-v30.1.2-darwin-arm64.zip
-f739afd34c48aae18da1d9dffb2332f0c2b2e27ff2056ac619e0a8c9414618f0 *chromedriver-v30.1.2-darwin-x64.zip
-c2a220a316c268984bb8135975f28adecc392cf5cd2244af8cc21d60018a6a10 *chromedriver-v30.1.2-linux-arm64.zip
-fad358f076caff4eecc3d8b63cea2e109cc0ff8b4632bb4edd21a7c7721bc428 *chromedriver-v30.1.2-linux-armv7l.zip
-addc230541e9ee44b311fba9e900c5cb7d8b4d64b79a6d5dae68a71ced1c4611 *chromedriver-v30.1.2-linux-x64.zip
-e2d0876fac8af41e0dd9c1b14c5315b426c55217e54e2b4ca5e28faae1b19557 *chromedriver-v30.1.2-mas-arm64.zip
-c705d0b74a4658c197a87ed1e9e2509e55186769376b40493ec68b7cbb36c312 *chromedriver-v30.1.2-mas-x64.zip
-8bbf9ccb789b236dec3e871d2499c14926a4c2dd3c865f8c7316ba3aa5b3f58f *chromedriver-v30.1.2-win32-arm64.zip
-75af4b07bbd3a8fd7e18d63eb936e11054d01b52d438e4f7b7c5e6b82a41dec3 *chromedriver-v30.1.2-win32-ia32.zip
-2d306df2c66314be12df78b6139ebf2d616463efdf4017473330d87a61954c3a *chromedriver-v30.1.2-win32-x64.zip
-1990fe83ca25b990773ce099b90fb804fc026c1398279731229ba37d02c23000 *electron-api.json
-64360b0db764c1bf16a8ab810a25c03f68873691d2897b360281bc50a645b6bb *electron-v30.1.2-darwin-arm64-dsym-snapshot.zip
-3192307419ee2bafc3c99c62d79dbd2e6cba5815ae245be994f0b1e1d7fedb46 *electron-v30.1.2-darwin-arm64-dsym.zip
-823eadc46a498af7433dae2ace1c8f0b2b0c8cbf98204fed0fdce8110ddafbc1 *electron-v30.1.2-darwin-arm64-symbols.zip
-3c651624b1605411e595a6e9f6e874effb947c80eda4b8d0bb7d2972ff6ff242 *electron-v30.1.2-darwin-arm64.zip
-fa5cbbc3e7760907229fa0753c3faa2b43e09bcb987b6c3f693e0030aa65e62b *electron-v30.1.2-darwin-x64-dsym-snapshot.zip
-d97087f4c7e41fd67b2f0f7aa623ccf1effdbb94133b883dbae1e4c42a576b03 *electron-v30.1.2-darwin-x64-dsym.zip
-a129109ed6ca23f66d625ebff9e57be117bc0a32c4f4348e78c1ad7dd41c4189 *electron-v30.1.2-darwin-x64-symbols.zip
-8645e10af9b047c765a6cc880f9fa53f266e618569eaf65c0ea9fa1058be20f7 *electron-v30.1.2-darwin-x64.zip
-afa016399f57bbbb658238dd715ef2a66790602ff46514e9cd99f2e078789c7d *electron-v30.1.2-linux-arm64-debug.zip
-aec05a3e46a83d7c3e502b04245d3d6d2db8d5789a4dcc991f7cf6e7e3cd7036 *electron-v30.1.2-linux-arm64-symbols.zip
-953c51413abfd62efdba070f99c961202ce5ef5e77c5cee5eaaf097ac2f5bc9b *electron-v30.1.2-linux-arm64.zip
-afa016399f57bbbb658238dd715ef2a66790602ff46514e9cd99f2e078789c7d *electron-v30.1.2-linux-armv7l-debug.zip
-04a6851e218c9a6f70870a341beea1b194a94d2d78f3a283065a34654cce7e30 *electron-v30.1.2-linux-armv7l-symbols.zip
-677d6b4e6721ffb27b0037628c235cd0a9f10104beabb2b6c67d4b0328a9d001 *electron-v30.1.2-linux-armv7l.zip
-1b6d8926e2c7cacbb33e56259ebe908c52e2a6dbbe37f0def043121f228a3a37 *electron-v30.1.2-linux-x64-debug.zip
-dc4b526b02ec028d20836ee4617335d0569170846959761c3e8dc615d668f596 *electron-v30.1.2-linux-x64-symbols.zip
-724aeca4b2f428f544e9b7e5e52e2074458c2e198f588530819cd0318af8599d *electron-v30.1.2-linux-x64.zip
-15b10a6cf6a1ea029792282088647abbf58b415fdb4dd004c2c67c4a8f216ef3 *electron-v30.1.2-mas-arm64-dsym-snapshot.zip
-00dbfc36c8ff6ecfbb8b01b51fee41f876bf3456017a8cc694a0c56608061f5e *electron-v30.1.2-mas-arm64-dsym.zip
-e402b68cad20ee60cce376dacf0e2e72f1fcd0b6359dda7789626dca4b101e8b *electron-v30.1.2-mas-arm64-symbols.zip
-8e59fc7c6df96a029310d6f7769e0c76592dc746d31764b35460de129231d12b *electron-v30.1.2-mas-arm64.zip
-e8bfe6b58d2767dd52a7668df380be9c786abed0b25d642bee70c278758d2e77 *electron-v30.1.2-mas-x64-dsym-snapshot.zip
-418f32558f9a107ebc942666a6ca680874db8ed438ae3f0064255abe0f9ce77e *electron-v30.1.2-mas-x64-dsym.zip
-6d05da37cb39c664a764c879216e762efdb66f97734e42bbaa8f115b11fd3c87 *electron-v30.1.2-mas-x64-symbols.zip
-af7b85a28593227add7e595e01d570e19512b40a29599ec007ef7cd4b5a11435 *electron-v30.1.2-mas-x64.zip
-580c9b9fee6bacfdc4d3a1118953ba0096bcc19d28b1d804d72d40c5caac8d81 *electron-v30.1.2-win32-arm64-pdb.zip
-dbb0ce79933c3688b7fa2bf04ce083d6e8da0a8c07b5104f53805e2e92679cd4 *electron-v30.1.2-win32-arm64-symbols.zip
-7351fa5cb892853a7d4b67d8858d0f9cc6506c554a2e42c9ad7e8d5e29ae2743 *electron-v30.1.2-win32-arm64-toolchain-profile.zip
-1b9035b541999e0cedcfe3893bb3c1497435494279d599c4e9300fe204f4d560 *electron-v30.1.2-win32-arm64.zip
-3cb6869a69d118488dc48ed573b3fc9445bea33cf0a04338ca1b8000b4eaf516 *electron-v30.1.2-win32-ia32-pdb.zip
-3f353849ef21506d5ca7a2c26df84d7c744ef1795acd33307f501764dfbe9bc1 *electron-v30.1.2-win32-ia32-symbols.zip
-7351fa5cb892853a7d4b67d8858d0f9cc6506c554a2e42c9ad7e8d5e29ae2743 *electron-v30.1.2-win32-ia32-toolchain-profile.zip
-431aff46eca9ddb726af3c8d6f4bbb72158e5c872c1b8bee221b3df0a8e94947 *electron-v30.1.2-win32-ia32.zip
-85428715d302d4c97e47ca0b6409497191846baccbc36debf895cde724f9445f *electron-v30.1.2-win32-x64-pdb.zip
-a5156829bc0caab5c70e6cd352941b6fb7b1e396d7869298c1ceaa69d742e3dc *electron-v30.1.2-win32-x64-symbols.zip
-7351fa5cb892853a7d4b67d8858d0f9cc6506c554a2e42c9ad7e8d5e29ae2743 *electron-v30.1.2-win32-x64-toolchain-profile.zip
-d400ed1aca2b7b1093aee8b5a8544b112e9f81a570cf77f6bdfe019ceb003f7f *electron-v30.1.2-win32-x64.zip
-3187cdd642b968e17a768a3fdaff44bedb69954be3d88e7ad55aac9787b70485 *electron.d.ts
-4c8bd4215102f563cf0464ae4edd4022921c53e0ebd4bb6b6f7f7434d50081aa *ffmpeg-v30.1.2-darwin-arm64.zip
-2b8c57755ccb64a64540433d3cfbfecd29d07e28bf23c5f08a2edd0e2333a645 *ffmpeg-v30.1.2-darwin-x64.zip
-c6f69859dc2ca04daa7c218936e5bc044fc19582423db954c5e8664ce7f331df *ffmpeg-v30.1.2-linux-arm64.zip
-12f760ce312e4ee98ddd9496600ca9a1468e28f0ed6d41c6b9284dec841f550f *ffmpeg-v30.1.2-linux-armv7l.zip
-c7207cc057849033d550d6897a53f7abee455f31b8f571c3c57a01f2871ff5af *ffmpeg-v30.1.2-linux-x64.zip
-447b19465677636261ce47cc256f221c660e66cd136b33c3c742b8d23481b924 *ffmpeg-v30.1.2-mas-arm64.zip
-e44fcdb5d0e62d328c0bb5ebeed54f388b09591a33e4dc1698c421e4c9d881dc *ffmpeg-v30.1.2-mas-x64.zip
-b470cc217c4f06b3fe4edf6695b4762e7c926d07c1f41c3cab0ddb1d71ce8ce4 *ffmpeg-v30.1.2-win32-arm64.zip
-92f1743c16210a77d07e9553cf96ccfb4e6985cc50ee831b5b075589aa0ebb05 *ffmpeg-v30.1.2-win32-ia32.zip
-b2fa79b739023651f0551ca06ac5da7b47acaaf8b09ccdedf7081fc3ea824a80 *ffmpeg-v30.1.2-win32-x64.zip
-b2b562a45ae4a2d40bf039ed1c707a7875b9e893fc8c6a0044d536b0f9968629 *hunspell_dictionaries.zip
-08da936356d1321eec550c30a9208750773d86e3be0b7fe4baf36c72a8609c20 *libcxx-objects-v30.1.2-linux-arm64.zip
-8aa302ac17f6ac44f756cb9219f18d01d267d43f9af2dfd8d4626e9d01e584fa *libcxx-objects-v30.1.2-linux-armv7l.zip
-1ab04d6cec407930a2051761e6114cb2cd6418e2103d32e835246d06c696b427 *libcxx-objects-v30.1.2-linux-x64.zip
-4db17e017bdb818cca5d8e08a78fe54fb907c3cf05defd1b8f086b413075357a *libcxx_headers.zip
-209f20bd3ee59fa7c85b0789d8e45168583407c9fb5bd2eba446c1e0796c4a7b *libcxxabi_headers.zip
-4dcc59b7c66b9ccc881dbdfeba9de707f693fd839a8e764d34bb66dec7e3e63c *mksnapshot-v30.1.2-darwin-arm64.zip
-582886552cbc227eb71f5047d00ac62baeb1912a52a8f5132953b94f54d41dd4 *mksnapshot-v30.1.2-darwin-x64.zip
-639fde4957353d48be54b9075c0894b7529210f0bb3a2f9cad81ba2deb415080 *mksnapshot-v30.1.2-linux-arm64-x64.zip
-1fec2ae49a9f03117a5e5b637866e5aa270da2fa3a007d0314c8a39ed392230f *mksnapshot-v30.1.2-linux-armv7l-x64.zip
-494f86a178a2b14101c6deccf7c2ae88c690c7ce8445b63854a2e0525d69aaa0 *mksnapshot-v30.1.2-linux-x64.zip
-bfbb90138b4df3f57fd9fe9cc05b6b8f9b3bf099b66d65215cc9434e2272b0d1 *mksnapshot-v30.1.2-mas-arm64.zip
-d1a6a825628a141fdd73cf208180cc20af32b8e06aeb7f4d36566358cef40a90 *mksnapshot-v30.1.2-mas-x64.zip
-fd523788a380990d589f9461f29a8878b63090146aa124f2debf3197af69929b *mksnapshot-v30.1.2-win32-arm64-x64.zip
-69068d132cd511e33be9aff6dda5df74079c2003657cd89107d4eaaac7e4d997 *mksnapshot-v30.1.2-win32-ia32.zip
-69bfab7461f83a256c0869e2781cca4f5a53f8b6a60d78617b79b8bfc0b554b6 *mksnapshot-v30.1.2-win32-x64.zip
+3e432bd550279c2d58c6a02b0bda048fa2a9a89aef9752e22c39a518a83fe96f *chromedriver-v30.4.0-darwin-arm64.zip
+4d38f40ec33955dd0aef5cc0053b2b07c4744abb9f2614a44780280c4678aca9 *chromedriver-v30.4.0-darwin-x64.zip
+338f2a361448e78aa8c319cd582f2dd6d891d6c0c66b676c628e50511c27514f *chromedriver-v30.4.0-linux-arm64.zip
+8cffae19618fe5f0eaff40378c40084e18f9747bbbe2d87390203a3012c98367 *chromedriver-v30.4.0-linux-armv7l.zip
+7ff1b75defc522f327c0f1bf6f4d13938b041cf5de1d7417b9dc5d1e7026e93c *chromedriver-v30.4.0-linux-x64.zip
+8e93b0892d7d01c38608fa7907f28da1da27de09bb382f261d81a676f8c2ba64 *chromedriver-v30.4.0-mas-arm64.zip
+d306ef0bc651bef046b21ba2e4745e2768be9df1b6c2fc2e7b1a0368f7e10d76 *chromedriver-v30.4.0-mas-x64.zip
+bb7c5db2a20f437e0b398846ecc8111e7e51e2021b78f60db021262daacf7d7c *chromedriver-v30.4.0-win32-arm64.zip
+df4acaa6684e7db07468c6dc8102cb49746884e8db2b53648431b2b61e8debb2 *chromedriver-v30.4.0-win32-ia32.zip
+7a207b29977e52ba052037f00f4ea6284177fdd93e0774dfc39e83ee5a86513d *chromedriver-v30.4.0-win32-x64.zip
+8c876662fd46c37b2dd9487ea8e62fde3f20a729dc95e42f12f7db4986138edc *electron-api.json
+a36786c7d4e30887a6aa1f2adbc23e721266a31ffe84191bf4caddb731cfb973 *electron-v30.4.0-darwin-arm64-dsym-snapshot.zip
+e5edcad107307e97bdd6f69ccab0368df4c3270213f2f42f259f3723d24ca611 *electron-v30.4.0-darwin-arm64-dsym.zip
+cc522e772a1d80f7ec73ce2077dae93de76cd4f6767c467b6a8e01e4a252f15f *electron-v30.4.0-darwin-arm64-symbols.zip
+2238c45a85b2c78aed00aeaf15bbfa2f64b4d13e48cc6b9bc330f24c4d214595 *electron-v30.4.0-darwin-arm64.zip
+48c3197fc36f5ef64eaa913a0a769d2b2d4b79c94e61991ca73e8be2b24bf997 *electron-v30.4.0-darwin-x64-dsym-snapshot.zip
+9b669dc060695e5495573cce7b7916bdadd980d523772fbbf57fd1811bb4feca *electron-v30.4.0-darwin-x64-dsym.zip
+0acd5b74cbb1719a89a310fb42f5ab4282711bb0ccf4e8b242d9c24c8ecc7136 *electron-v30.4.0-darwin-x64-symbols.zip
+6e633bf87be9f8bf46dff9733cfd0d611e018ae5df75f30735747721f91fcf43 *electron-v30.4.0-darwin-x64.zip
+5bc27ceae706116a14fa24da3cda32f00893dd3f51ae2c2d58c4c08f26ce2ac2 *electron-v30.4.0-linux-arm64-debug.zip
+d13970ef6f4ad30dd8268563ed0b768f703d6e4ea1389ee36b8e7eb407b40523 *electron-v30.4.0-linux-arm64-symbols.zip
+aa422122373b84f4eb8ce937937b1b6fe8fb3975c3edafb9df85f7fba449afd4 *electron-v30.4.0-linux-arm64.zip
+5bc27ceae706116a14fa24da3cda32f00893dd3f51ae2c2d58c4c08f26ce2ac2 *electron-v30.4.0-linux-armv7l-debug.zip
+645af6535a3956e263d8ff586bfb45c5d16ec4c07add406e7c2a767eec070e8e *electron-v30.4.0-linux-armv7l-symbols.zip
+3643857e1eec3037ad6f07e755bffc64f033a7196307ff0386bf67c9cc3ec31e *electron-v30.4.0-linux-armv7l.zip
+0f099b597830fd990bac82fbe976720d5610450133dff880b570cbe1ef793742 *electron-v30.4.0-linux-x64-debug.zip
+084566b78797502ad164832e49690d8845c53a8becb28085f271ab1a9fe20942 *electron-v30.4.0-linux-x64-symbols.zip
+b365aac23c61dc0b18002c60937c4842e814cbe6d8e6a34e4dc211774ebaec01 *electron-v30.4.0-linux-x64.zip
+b050b4de0fda4c2fa4ceeb0ecaf452cc426a9b03a9e286686d2167c7ded252f4 *electron-v30.4.0-mas-arm64-dsym-snapshot.zip
+1e9c3f820e809fc2e05434d54862c7309dd04b74406869e06edb1e07faa3e40f *electron-v30.4.0-mas-arm64-dsym.zip
+9b4112c73606d1a0393320178a3d0f172671ec211fe69b2106ad9b04b55b3538 *electron-v30.4.0-mas-arm64-symbols.zip
+10ac65b581c2941fd05b2804055be2eed8d69de4c82b90f7357a3989d8276c9f *electron-v30.4.0-mas-arm64.zip
+9e4cba132474d82894541ab33d02b28894f0452f4c6808e2428878d0b6a55aac *electron-v30.4.0-mas-x64-dsym-snapshot.zip
+33c9c13a8a33ab292db5f14b1d8af1fa7967601badf505a06972fd3cdc9cb6bb *electron-v30.4.0-mas-x64-dsym.zip
+1e8871c34294912bc562861226742dcd2de073ae2dc3fef8065fe86550265bca *electron-v30.4.0-mas-x64-symbols.zip
+055bea26dfd9fa86838e25b77e29fec3967ed21020ce1362ff683be07ac90c45 *electron-v30.4.0-mas-x64.zip
+1fd654358ad895fce4806fcd39be848deeccd20f767e96006ebb5c88ca973d92 *electron-v30.4.0-win32-arm64-pdb.zip
+5cf51db3ece15f155afc066230f844bf7825fe912f0f479b8cf9eb47e46a2278 *electron-v30.4.0-win32-arm64-symbols.zip
+7351fa5cb892853a7d4b67d8858d0f9cc6506c554a2e42c9ad7e8d5e29ae2743 *electron-v30.4.0-win32-arm64-toolchain-profile.zip
+51bc3a21faefe99ccc8e8670dccf2320249af5c185728a31d907a18092542d73 *electron-v30.4.0-win32-arm64.zip
+b4a539c7dbad3db544d7709faaf357d55d7f3349bfd4d42c884b0608725b526d *electron-v30.4.0-win32-ia32-pdb.zip
+ddb355e3e45978eee33c679c42781587533b934f3e98374057d2b0c212062915 *electron-v30.4.0-win32-ia32-symbols.zip
+7351fa5cb892853a7d4b67d8858d0f9cc6506c554a2e42c9ad7e8d5e29ae2743 *electron-v30.4.0-win32-ia32-toolchain-profile.zip
+7260c9f533d5fa0c543d34593bb1a8bc4904943ca872afc5246e15da6f00b43a *electron-v30.4.0-win32-ia32.zip
+2d0d5631158971e0fac9bb7c427c5361177c7e967cca41940ad18183d95c3e23 *electron-v30.4.0-win32-x64-pdb.zip
+0ea8c0b8734bd45cb04ae83390bd7efee407ed6bb30dbaa1030e1a1f03a0f025 *electron-v30.4.0-win32-x64-symbols.zip
+7351fa5cb892853a7d4b67d8858d0f9cc6506c554a2e42c9ad7e8d5e29ae2743 *electron-v30.4.0-win32-x64-toolchain-profile.zip
+9dcf4b5bbdb6c672ba1b3812d4b642999faf4b6f4e2a4e4af314ba61596a62dc *electron-v30.4.0-win32-x64.zip
+c524777653f0b3ba58da6c1e97aa5a3a172caf68d9b24a7d33f733b36c281ce8 *electron.d.ts
+c1586ee3f3960943dfa1c1a3da2ebc327afd95c3c7a160b0646730fbc78731bb *ffmpeg-v30.4.0-darwin-arm64.zip
+7f76a792c8f9ee9611f966956b4b70017253f9357ec73806d35c568808eec470 *ffmpeg-v30.4.0-darwin-x64.zip
+5160348bcae6cb4fce20905338a903475c2eb52511370b44bdfeafef3cbeab6c *ffmpeg-v30.4.0-linux-arm64.zip
+4f7583513d48b48c44a2cbc4430cbc9a33d8f9728622166db688e3de61190821 *ffmpeg-v30.4.0-linux-armv7l.zip
+4f62d246a2ccb904e9f03bdc65fd5806edd69b95099fa2dcba4f148d44ea1bce *ffmpeg-v30.4.0-linux-x64.zip
+c1586ee3f3960943dfa1c1a3da2ebc327afd95c3c7a160b0646730fbc78731bb *ffmpeg-v30.4.0-mas-arm64.zip
+7f76a792c8f9ee9611f966956b4b70017253f9357ec73806d35c568808eec470 *ffmpeg-v30.4.0-mas-x64.zip
+26b82e5943d09eb0765804df27182cd45c45e63e82fe95d60a5a78611d85a926 *ffmpeg-v30.4.0-win32-arm64.zip
+ea688b108cb545bd436621c8d1279696ac6cb0b041d1d3d322dba06f8dd0f295 *ffmpeg-v30.4.0-win32-ia32.zip
+733a522d2095964ff3796f3301591b7aa9cf1ba8dcc545d1928745022ef99e6a *ffmpeg-v30.4.0-win32-x64.zip
+0b82c8db956264c1be4006eff3908b51ae8e48a17176fe61fa86d8ca8c103bf5 *hunspell_dictionaries.zip
+27d5d6d82bd5703342e6a3804ff3c032433cda833ad3881f263035b23193ace9 *libcxx-objects-v30.4.0-linux-arm64.zip
+babe51c929cc77907fdb5af11781938bab4b9f31642a0220b4ce4a35cfb904ff *libcxx-objects-v30.4.0-linux-armv7l.zip
+e6e13dd7c493841c3ab406b147d021b4e5a379e286767c1459d23bd9581c10c9 *libcxx-objects-v30.4.0-linux-x64.zip
+c9ba1b8c0e971cf477f7c0120436cc45a02b72908a41c82cd809ec8014b81e32 *libcxx_headers.zip
+2c4c140bfeb235584f8f7c699d0d95b16ddb959484923aaa59eeb3310dbc161a *libcxxabi_headers.zip
+0cee8848525e0d633d3ccf599d03ac05be6e0bc014b5a77ddce99c3a50941feb *mksnapshot-v30.4.0-darwin-arm64.zip
+0c491f602cfc6fbd81b8b771d3fa28ec1eb77c23c7636479a158265dd7d59977 *mksnapshot-v30.4.0-darwin-x64.zip
+6ea645627b0a0cab88cda80a2fa4d399a491bc5f0d0ff1d007f6dd28728d4592 *mksnapshot-v30.4.0-linux-arm64-x64.zip
+6b33e8bc53281710d9754e3ea88a8c025649f3d7c499e9b8693183bd2b76ea8d *mksnapshot-v30.4.0-linux-armv7l-x64.zip
+092afde6a2ab8ac922524a02b30343cd11f96c01405814019797bf38fa8c634b *mksnapshot-v30.4.0-linux-x64.zip
+dada39480526a46992f2ff0ad8ea72a26565384e9976497867a6c4776705e49f *mksnapshot-v30.4.0-mas-arm64.zip
+4082f5b379b788d300b2a7fc7c84deee80ebc61a34b534c795c1b4594c3f0d1a *mksnapshot-v30.4.0-mas-x64.zip
+01a5e83fe293dd2c52e1d5cc79450fbfc1dfa1e4988146f94bfbf9a9e24cb9d7 *mksnapshot-v30.4.0-win32-arm64-x64.zip
+0bccaa2779f8ce98bd4a2a66be082bcd3c34484aad8000c08de0fed5acb8ad88 *mksnapshot-v30.4.0-win32-ia32.zip
+439c7f5b9fdd0ea19ee95f724773cda42382b27a31494ae8f2aca5c2ec043ec7 *mksnapshot-v30.4.0-win32-x64.zip
diff --git a/build/checksums/nodejs.txt b/build/checksums/nodejs.txt
index 877d8afe243..23a56cdb23b 100644
--- a/build/checksums/nodejs.txt
+++ b/build/checksums/nodejs.txt
@@ -1,7 +1,7 @@
-d2148d79e9ff04d2982d00faeae942ceba488ca327a91065e528235167b9e9d6  node-v20.14.0-darwin-arm64.tar.gz
-1dcc18a199cb5f46d43ed1c3c61b87a247d1a1a11dd6b32a36a9c46ac1088f86  node-v20.14.0-darwin-x64.tar.gz
-d63e83fca4f81801396620c46a42892a2ef26e21a4508f68de373e61a12bd9c5  node-v20.14.0-linux-arm64.tar.gz
-af45ea0d09e55a4f05c0190636532bdf9f70b2eaf0a1c4d7594207cf21284df0  node-v20.14.0-linux-armv7l.tar.gz
-5b9bf40cfc7c21de14a1b4c367650e3c96eb101156bf9368ffc2f947414b6581  node-v20.14.0-linux-x64.tar.gz
-a6ec02119098cf92592539e06289953c4365be20ab15d4ad264669f931000b0c  win-arm64/node.exe
-8f45741ec6ba07be8d199c0cebc838a58c0430c9228dbe50f8ac5d4859e58bae  win-x64/node.exe
+4743bc042f90ba5d9edf09403207290a9cdd2f6061bdccf7caaa0bbfd49f343e  node-v20.15.1-darwin-arm64.tar.gz
+f5379772ffae1404cfd1fcc8cf0c6c5971306b8fb2090d348019047306de39dc  node-v20.15.1-darwin-x64.tar.gz
+8554c91ccd32782351035d3a9b168ad01c6922480800a21870fc5d6d86c2bb70  node-v20.15.1-linux-arm64.tar.gz
+2c16717da7d2d7b00f6af146cdf436a0297cbcee52c85b754e4c9ed7cee34b51  node-v20.15.1-linux-armv7l.tar.gz
+a9db028c0a1c63e3aa0d97de24b0966bc507d8239b3aedc4e752eea6b0580665  node-v20.15.1-linux-x64.tar.gz
+8e3f84e8ec7e41f98a048eb0c1365cfe54426a556ead98c4803df45d29e0335d  win-arm64/node.exe
+229fb64aeb10d3cc18eaaa2f5a4c3f1c81792dd3647c5c4350e142db528d0f89  win-x64/node.exe
diff --git a/build/darwin/create-universal-app.js b/build/darwin/create-universal-app.js
index 16c2b955dfb..3ac0e9d0de0 100644
--- a/build/darwin/create-universal-app.js
+++ b/build/darwin/create-universal-app.js
@@ -3,51 +3,16 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-var path = require("path");
-var fs = require("fs");
-var minimatch = require("minimatch");
-var vscode_universal_bundler_1 = require("vscode-universal-bundler");
-var cross_spawn_promise_1 = require("@malept/cross-spawn-promise");
-var root = path.dirname(path.dirname(__dirname));
+const path = require("path");
+const fs = require("fs");
+const minimatch = require("minimatch");
+const vscode_universal_bundler_1 = require("vscode-universal-bundler");
+const cross_spawn_promise_1 = require("@malept/cross-spawn-promise");
+const esm_1 = require("../lib/esm");
+const root = path.dirname(path.dirname(__dirname));
 // --- Start Positron ---
-var os = require("os");
+const os = require("os");
 // The merging procedure will fail if:
 //
 // (a) It finds x64 files that don't have an arm64 equivalent. For instance the
@@ -67,11 +32,11 @@ var os = require("os");
 // The files to stash away are determined with minimatch patterns. Folders are
 // excluded from matches, so to match a whole folder use `myfolder/**`.
 //
-var stashPatterns = [
+const stashPatterns = [
     // Exclusions from ZeroMQ node module
-    '**/electron.napi.node',
-    '**/node.napi.node',
-    '**/node.napi.glibc.node',
+    '**/electron.napi.node', // ZeroMQ Electron architecture-specific pre-built binary
+    '**/node.napi.node', // ZeroMQ Electron architecture-specific pre-built binary
+    '**/node.napi.glibc.node', // ZeroMQ Electron architecture-specific pre-built binary
     // Exclusions from remote-ssh
     '**/cpufeatures.node',
     '**/sshcrypto.node',
@@ -79,16 +44,16 @@ var stashPatterns = [
     '**/HTML.icns',
     '**/html.icns',
     // Exclusions from Python language pack (positron-python)
-    '**/pydevd/**',
+    '**/pydevd/**', // Cython pre-built binaries for Python debugging
     // Exclusions from R language pack (positron-r)
-    '**/ark',
+    '**/ark', // Compiled R kernel and LSP
     // Exclusions from Quarto
     '**/quarto/bin/tools/**',
 ];
 // Some generated files may end up being different in both distributions.
 // `reconciliationFiles` contains relative paths of files that should be copied
 // from the x64 bundle to the arm64 one so they don't cause a mismatch error.
-var reconciliationFiles = [
+const reconciliationFiles = [
     'Contents/Resources/app/product.json',
     // Definitions of localized strings
     'Contents/Resources/app/out/nls.messages.json',
@@ -110,11 +75,10 @@ var reconciliationFiles = [
     'Contents/Resources/app/out/vs/workbench/workbench.desktop.main.js',
 ];
 function readFiles(dir) {
-    var files = [];
-    var entries = fs.readdirSync(dir, { withFileTypes: true });
-    for (var _i = 0, entries_1 = entries; _i < entries_1.length; _i++) {
-        var entry = entries_1[_i];
-        var fullPath = path.join(dir, entry.name);
+    let files = [];
+    const entries = fs.readdirSync(dir, { withFileTypes: true });
+    for (const entry of entries) {
+        const fullPath = path.join(dir, entry.name);
         // Recurse into directories and only return files
         if (entry.isDirectory()) {
             files = files.concat(readFiles(fullPath));
@@ -126,28 +90,27 @@ function readFiles(dir) {
     return files;
 }
 function ensureDir(file) {
-    var dir = path.dirname(file);
+    const dir = path.dirname(file);
     if (!fs.existsSync(dir)) {
         fs.mkdirSync(dir, { recursive: true });
     }
     return dir;
 }
 function stashFiles(stash, x64Path, arm64Path) {
-    var x64Stash = path.join(stash, 'x64');
-    var arm64Stash = path.join(stash, 'arm64');
+    const x64Stash = path.join(stash, 'x64');
+    const arm64Stash = path.join(stash, 'arm64');
     fs.mkdirSync(x64Stash);
     fs.mkdirSync(arm64Stash);
-    var matches = readFiles(x64Path).
-        filter(function (file) { return stashPatterns.some(function (pat) { return minimatch(file, pat); }); });
-    for (var _i = 0, matches_1 = matches; _i < matches_1.length; _i++) {
-        var x64Source = matches_1[_i];
-        var rel = path.relative(x64Path, x64Source);
-        var arm64Source = path.join(arm64Path, rel);
+    const matches = readFiles(x64Path).
+        filter((file) => stashPatterns.some(pat => minimatch(file, pat)));
+    for (const x64Source of matches) {
+        const rel = path.relative(x64Path, x64Source);
+        const arm64Source = path.join(arm64Path, rel);
         if (!fs.existsSync(arm64Source)) {
-            throw new Error("Cannot find '".concat(rel, "' in arm64 source"));
+            throw new Error(`Cannot find '${rel}' in arm64 source`);
         }
-        var x64Dest = path.join(x64Stash, rel);
-        var arm64Dest = path.join(arm64Stash, rel);
+        const x64Dest = path.join(x64Stash, rel);
+        const arm64Dest = path.join(arm64Stash, rel);
         ensureDir(x64Dest);
         ensureDir(arm64Dest);
         fs.renameSync(x64Source, x64Dest);
@@ -156,113 +119,88 @@ function stashFiles(stash, x64Path, arm64Path) {
 }
 // Copy files to reconcile from the x64 build to the arm64 one
 function reconcileFiles(x64Path, arm64Path) {
-    for (var _i = 0, reconciliationFiles_1 = reconciliationFiles; _i < reconciliationFiles_1.length; _i++) {
-        var file = reconciliationFiles_1[_i];
-        var src = path.join(x64Path, file);
-        var dest = path.join(arm64Path, file);
+    for (const file of reconciliationFiles) {
+        const src = path.join(x64Path, file);
+        const dest = path.join(arm64Path, file);
         fs.copyFileSync(src, dest);
     }
 }
 function restoreFromStash(stash, destRoot) {
-    for (var _i = 0, _a = readFiles(stash); _i < _a.length; _i++) {
-        var src = _a[_i];
-        var rel = path.relative(stash, src);
-        var dest = path.join(destRoot, rel);
+    for (const src of readFiles(stash)) {
+        const rel = path.relative(stash, src);
+        const dest = path.join(destRoot, rel);
         ensureDir(dest);
         fs.renameSync(src, dest);
     }
 }
 // --- End Positron ---
-function main(buildDir) {
-    return __awaiter(this, void 0, void 0, function () {
-        var arch, product, appName, x64AppPath, arm64AppPath, asarRelativePath, outAppPath, productJsonPath, filesToSkip, stash;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    arch = process.env['VSCODE_ARCH'];
-                    if (!buildDir) {
-                        throw new Error('Build dir not provided');
-                    }
-                    product = JSON.parse(fs.readFileSync(path.join(root, 'product.json'), 'utf8'));
-                    appName = product.nameLong + '.app';
-                    x64AppPath = path.join(buildDir, 'VSCode-darwin-x64', appName);
-                    arm64AppPath = path.join(buildDir, 'VSCode-darwin-arm64', appName);
-                    asarRelativePath = path.join('Contents', 'Resources', 'app', 'node_modules.asar');
-                    outAppPath = path.join(buildDir, "VSCode-darwin-".concat(arch), appName);
-                    productJsonPath = path.resolve(outAppPath, 'Contents', 'Resources', 'app', 'product.json');
-                    filesToSkip = [
-                        '**/CodeResources',
-                        '**/Credits.rtf',
-                    ];
-                    stash = fs.mkdtempSync(path.join(os.tmpdir(), 'positron-create-universal'));
-                    _a.label = 1;
-                case 1:
-                    _a.trys.push([1, , 3, 4]);
-                    reconcileFiles(x64AppPath, arm64AppPath);
-                    stashFiles(stash, x64AppPath, arm64AppPath);
-                    return [4 /*yield*/, origMain(x64AppPath, arm64AppPath, asarRelativePath, outAppPath, filesToSkip, productJsonPath)];
-                case 2:
-                    _a.sent();
-                    restoreFromStash(path.join(stash, 'x64'), outAppPath);
-                    return [3 /*break*/, 4];
-                case 3:
-                    fs.rmSync(stash, { recursive: true, force: true });
-                    return [7 /*endfinally*/];
-                case 4: return [2 /*return*/];
-            }
-        });
-    });
+async function main(buildDir) {
+    const arch = process.env['VSCODE_ARCH'];
+    if (!buildDir) {
+        throw new Error('Build dir not provided');
+    }
+    const product = JSON.parse(fs.readFileSync(path.join(root, 'product.json'), 'utf8'));
+    const appName = product.nameLong + '.app';
+    const x64AppPath = path.join(buildDir, 'VSCode-darwin-x64', appName);
+    const arm64AppPath = path.join(buildDir, 'VSCode-darwin-arm64', appName);
+    const asarRelativePath = path.join('Contents', 'Resources', 'app', 'node_modules.asar');
+    const outAppPath = path.join(buildDir, `VSCode-darwin-${arch}`, appName);
+    const productJsonPath = path.resolve(outAppPath, 'Contents', 'Resources', 'app', 'product.json');
+    const filesToSkip = [
+        '**/CodeResources',
+        '**/Credits.rtf',
+    ];
+    // --- Start Positron ---
+    // We split the original main function in two parts so that we can call the
+    // second part in a try block without causing the formatter to increase the
+    // indentation, which would increase the chance of merge conflicts
+    const stash = fs.mkdtempSync(path.join(os.tmpdir(), 'positron-create-universal'));
+    try {
+        reconcileFiles(x64AppPath, arm64AppPath);
+        stashFiles(stash, x64AppPath, arm64AppPath);
+        await origMain(x64AppPath, arm64AppPath, asarRelativePath, outAppPath, filesToSkip, productJsonPath);
+        restoreFromStash(path.join(stash, 'x64'), outAppPath);
+    }
+    finally {
+        fs.rmSync(stash, { recursive: true, force: true });
+    }
 }
-function origMain(x64AppPath, arm64AppPath, asarRelativePath, outAppPath, filesToSkip, productJsonPath) {
-    return __awaiter(this, void 0, void 0, function () {
-        var productJson, findOutput, lipoOutput;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: 
-                // --- End Positron ---
-                return [4 /*yield*/, (0, vscode_universal_bundler_1.makeUniversalApp)({
-                        x64AppPath: x64AppPath,
-                        arm64AppPath: arm64AppPath,
-                        asarPath: asarRelativePath,
-                        outAppPath: outAppPath,
-                        force: true,
-                        mergeASARs: true,
-                        x64ArchFiles: '*/kerberos.node',
-                        filesToSkipComparison: function (file) {
-                            for (var _i = 0, filesToSkip_1 = filesToSkip; _i < filesToSkip_1.length; _i++) {
-                                var expected = filesToSkip_1[_i];
-                                if (minimatch(file, expected)) {
-                                    return true;
-                                }
-                            }
-                            return false;
-                        }
-                    })];
-                case 1:
-                    // --- End Positron ---
-                    _a.sent();
-                    productJson = JSON.parse(fs.readFileSync(productJsonPath, 'utf8'));
-                    Object.assign(productJson, {
-                        darwinUniversalAssetId: 'darwin-universal'
-                    });
-                    fs.writeFileSync(productJsonPath, JSON.stringify(productJson, null, '\t'));
-                    return [4 /*yield*/, (0, cross_spawn_promise_1.spawn)('find', [outAppPath, '-name', 'kerberos.node'])];
-                case 2:
-                    findOutput = _a.sent();
-                    return [4 /*yield*/, (0, cross_spawn_promise_1.spawn)('lipo', ['-archs', findOutput.replace(/\n$/, '')])];
-                case 3:
-                    lipoOutput = _a.sent();
-                    if (lipoOutput.replace(/\n$/, '') !== 'x86_64 arm64') {
-                        throw new Error("Invalid arch, got : ".concat(lipoOutput));
-                    }
-                    return [2 /*return*/];
+async function origMain(x64AppPath, arm64AppPath, asarRelativePath, outAppPath, filesToSkip, productJsonPath) {
+    // --- End Positron ---
+    const canAsar = !(0, esm_1.isESM)('ASAR disabled in universal build'); // TODO@esm ASAR disabled in ESM
+    await (0, vscode_universal_bundler_1.makeUniversalApp)({
+        x64AppPath,
+        arm64AppPath,
+        asarPath: canAsar ? asarRelativePath : undefined,
+        outAppPath,
+        force: true,
+        mergeASARs: canAsar,
+        x64ArchFiles: '*/kerberos.node',
+        filesToSkipComparison: (file) => {
+            for (const expected of filesToSkip) {
+                if (minimatch(file, expected)) {
+                    return true;
+                }
             }
-        });
+            return false;
+        }
     });
+    const productJson = JSON.parse(fs.readFileSync(productJsonPath, 'utf8'));
+    Object.assign(productJson, {
+        darwinUniversalAssetId: 'darwin-universal'
+    });
+    fs.writeFileSync(productJsonPath, JSON.stringify(productJson, null, '\t'));
+    // Verify if native module architecture is correct
+    const findOutput = await (0, cross_spawn_promise_1.spawn)('find', [outAppPath, '-name', 'kerberos.node']);
+    const lipoOutput = await (0, cross_spawn_promise_1.spawn)('lipo', ['-archs', findOutput.replace(/\n$/, '')]);
+    if (lipoOutput.replace(/\n$/, '') !== 'x86_64 arm64') {
+        throw new Error(`Invalid arch, got : ${lipoOutput}`);
+    }
 }
 if (require.main === module) {
-    main(process.argv[2]).catch(function (err) {
+    main(process.argv[2]).catch(err => {
         console.error(err);
         process.exit(1);
     });
 }
+//# sourceMappingURL=create-universal-app.js.map
\ No newline at end of file
diff --git a/build/darwin/create-universal-app.ts b/build/darwin/create-universal-app.ts
index 243e2f57e9f..f4ee4d6bb5a 100644
--- a/build/darwin/create-universal-app.ts
+++ b/build/darwin/create-universal-app.ts
@@ -8,6 +8,7 @@ import * as fs from 'fs';
 import * as minimatch from 'minimatch';
 import { makeUniversalApp } from 'vscode-universal-bundler';
 import { spawn } from '@malept/cross-spawn-promise';
+import { isESM } from '../lib/esm';
 
 const root = path.dirname(path.dirname(__dirname));
 
@@ -210,13 +211,15 @@ async function origMain(
 ) {
 	// --- End Positron ---
 
+	const canAsar = !isESM('ASAR disabled in universal build'); // TODO@esm ASAR disabled in ESM
+
 	await makeUniversalApp({
 		x64AppPath,
 		arm64AppPath,
-		asarPath: asarRelativePath,
+		asarPath: canAsar ? asarRelativePath : undefined,
 		outAppPath,
 		force: true,
-		mergeASARs: true,
+		mergeASARs: canAsar,
 		x64ArchFiles: '*/kerberos.node',
 		filesToSkipComparison: (file: string) => {
 			for (const expected of filesToSkip) {
diff --git a/build/filters.js b/build/filters.js
index 67875742c6c..451143a0e71 100644
--- a/build/filters.js
+++ b/build/filters.js
@@ -87,7 +87,9 @@ module.exports.indentationFilter = [
 	'!src/vs/base/common/semver/semver.js',
 	'!src/vs/base/node/terminateProcess.sh',
 	'!src/vs/base/node/cpuUsage.sh',
+	'!src/vs/editor/common/languages/highlights/*.scm',
 	'!test/unit/assert.js',
+	'!test/unit/assert-esm.js',
 	'!resources/linux/snap/electron-launch',
 	'!build/ext.js',
 	'!build/npm/gyp/patches/gyp_spectre_mitigation_support.patch',
diff --git a/build/gulpfile.compile.js b/build/gulpfile.compile.js
index de8f3c4fb57..c6d7bbded93 100644
--- a/build/gulpfile.compile.js
+++ b/build/gulpfile.compile.js
@@ -9,10 +9,13 @@
 const gulp = require('gulp');
 const util = require('./lib/util');
 const date = require('./lib/date');
+const esm = require('./lib/esm');
 const task = require('./lib/task');
 const compilation = require('./lib/compilation');
 const optimize = require('./lib/optimize');
 
+const isESMBuild = typeof process.env.VSCODE_BUILD_ESM === 'string' && process.env.VSCODE_BUILD_ESM.toLowerCase() === 'true';
+
 /**
  * @param {boolean} disableMangle
  */
@@ -21,8 +24,9 @@ function makeCompileBuildTask(disableMangle) {
 		util.rimraf('out-build'),
 		util.buildWebNodePaths('out-build'),
 		date.writeISODate('out-build'),
+		esm.setESM(isESMBuild),
 		compilation.compileApiProposalNamesTask,
-		compilation.compileTask('src', 'out-build', true, { disableMangle }),
+		compilation.compileTask(isESMBuild ? 'src2' : 'src', 'out-build', true, { disableMangle }),
 		optimize.optimizeLoaderTask('out-build', 'out-build', true)
 	);
 }
diff --git a/build/gulpfile.editor.js b/build/gulpfile.editor.js
index fe29d4fe183..088748b8356 100644
--- a/build/gulpfile.editor.js
+++ b/build/gulpfile.editor.js
@@ -79,7 +79,9 @@ const extractEditorSrcTask = task.define('extract-editor-src', () => {
 		shakeLevel: 2, // 0-Files, 1-InnerFile, 2-ClassMembers
 		importIgnorePattern: /(^vs\/css!)/,
 		destRoot: path.join(root, 'out-editor-src'),
-		redirects: []
+		redirects: {
+			'@vscode/tree-sitter-wasm': '../node_modules/@vscode/tree-sitter-wasm/wasm/tree-sitter-web',
+		}
 	});
 });
 
@@ -133,7 +135,8 @@ const compileEditorESMTask = task.define('compile-editor-esm', () => {
 	let result;
 	if (process.platform === 'win32') {
 		result = cp.spawnSync(`..\\node_modules\\.bin\\tsc.cmd`, {
-			cwd: path.join(__dirname, '../out-editor-esm')
+			cwd: path.join(__dirname, '../out-editor-esm'),
+			shell: true
 		});
 	} else {
 		result = cp.spawnSync(`node`, [`../node_modules/.bin/tsc`], {
diff --git a/build/gulpfile.js b/build/gulpfile.js
index e945c06eed4..785719d3e14 100644
--- a/build/gulpfile.js
+++ b/build/gulpfile.js
@@ -34,11 +34,15 @@ gulp.task(compileClientTask);
 const watchClientTask = task.define('watch-client', task.series(util.rimraf('out'), util.buildWebNodePaths('out'), task.parallel(watchTask('out', false), watchApiProposalNamesTask)));
 gulp.task(watchClientTask);
 
+const watchClientESMTask = task.define('watch-client-esm', task.series(util.rimraf('out'), util.buildWebNodePaths('out'), task.parallel(watchTask('out', false, 'src2'), watchApiProposalNamesTask)));
+gulp.task(watchClientESMTask);
+
 // All
 const _compileTask = task.define('compile', task.parallel(monacoTypecheckTask, compileClientTask, compileExtensionsTask, compileExtensionMediaTask));
 gulp.task(_compileTask);
 
 gulp.task(task.define('watch', task.parallel(/* monacoTypecheckWatchTask, */ watchClientTask, watchExtensionsTask)));
+gulp.task(task.define('watch-esm', task.parallel(/* monacoTypecheckWatchTask, */ watchClientESMTask, watchExtensionsTask)));
 
 // Default
 gulp.task('default', _compileTask);
diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js
index e31e1d78b5f..f3e0a5e1c43 100644
--- a/build/gulpfile.reh.js
+++ b/build/gulpfile.reh.js
@@ -33,6 +33,8 @@ const { vscodeWebEntryPoints, vscodeWebResourceIncludes, createVSCodeWebFileCont
 // --- End Positron ---
 const cp = require('child_process');
 const log = require('fancy-log');
+const { isESM } = require('./lib/esm');
+const buildfile = require('./buildfile');
 
 const REPO_ROOT = path.dirname(__dirname);
 const commit = getVersion(REPO_ROOT);
@@ -46,6 +48,7 @@ const REMOTE_REH_WEB_FOLDER = path.join(REPO_ROOT, 'remote', 'reh-web');
 
 const BUILD_TARGETS = [
 	{ platform: 'win32', arch: 'x64' },
+	{ platform: 'win32', arch: 'arm64' },
 	{ platform: 'darwin', arch: 'x64' },
 	{ platform: 'darwin', arch: 'arm64' },
 	{ platform: 'linux', arch: 'x64' },
@@ -57,7 +60,7 @@ const BUILD_TARGETS = [
 	{ platform: 'linux', arch: 'alpine' },
 ];
 
-const serverResources = [
+const serverResourceIncludes = [
 	// --- Start Positron ---
 	'out-build/react-dom/client.js',
 	// --- End Positron ---
@@ -79,19 +82,40 @@ const serverResources = [
 	'out-build/vs/workbench/contrib/terminal/browser/media/shellIntegration-rc.zsh',
 	'out-build/vs/workbench/contrib/terminal/browser/media/shellIntegration-login.zsh',
 	'out-build/vs/workbench/contrib/terminal/browser/media/fish_xdg_data/fish/vendor_conf.d/shellIntegration.fish',
+];
 
+const serverResourceExcludes = [
+	'!out-build/vs/**/{electron-sandbox,electron-main}/**',
+	'!out-build/vs/editor/standalone/**',
+	'!out-build/vs/workbench/**/*-tb.png',
 	'!**/test/**'
 ];
 
-const serverWithWebResources = [
-
-	// Include all of server...
-	...serverResources,
+const serverResources = [
+	...serverResourceIncludes,
+	...serverResourceExcludes
+];
 
-	// ...and all of web
+const serverWithWebResourceIncludes = isESM() ? [
+	...serverResourceIncludes,
+	'out-build/vs/code/browser/workbench/*.html',
+	...vscodeWebResourceIncludes
+] : [
+	...serverResourceIncludes,
 	...vscodeWebResourceIncludes
 ];
 
+const serverWithWebResourceExcludes = [
+	...serverResourceExcludes,
+	'!out-build/vs/code/**/*-dev.html',
+	'!out-build/vs/code/**/*-dev.esm.html',
+];
+
+const serverWithWebResources = [
+	...serverWithWebResourceIncludes,
+	...serverWithWebResourceExcludes
+];
+
 const serverEntryPoints = [
 	{
 		name: 'vs/server/node/server.main',
@@ -115,14 +139,35 @@ const serverEntryPoints = [
 	}
 ];
 
+const webEntryPoints = isESM() ? [
+	buildfile.base,
+	buildfile.workerExtensionHost,
+	buildfile.workerNotebook,
+	buildfile.workerLanguageDetection,
+	buildfile.workerLocalFileSearch,
+	buildfile.workerOutputLinks,
+	buildfile.workerBackgroundTokenization,
+	buildfile.keyboardMaps,
+	buildfile.codeWeb
+].flat() : [
+	buildfile.entrypoint('vs/workbench/workbench.web.main'),
+	buildfile.base,
+	buildfile.workerExtensionHost,
+	buildfile.workerNotebook,
+	buildfile.workerLanguageDetection,
+	buildfile.workerLocalFileSearch,
+	buildfile.keyboardMaps,
+	buildfile.workbenchWeb()
+].flat();
+
 const serverWithWebEntryPoints = [
 
 	// Include all of server
 	...serverEntryPoints,
 
-	// Include workbench web
-	...vscodeWebEntryPoints
-];
+	// Include all of web
+	...webEntryPoints,
+].flat();
 
 const commonJSEntryPoints = [
 	'out-build/server-main.js',
@@ -298,6 +343,12 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
 		const marketplaceExtensions = JSON.parse(fs.readFileSync(path.join(REPO_ROOT, 'product.json'), 'utf8')).builtInExtensions
 			.filter(entry => !entry.platforms || new Set(entry.platforms).has(platform))
 			.filter(entry => !entry.clientOnly)
+			// --- Start PWB ---
+			// If an entry specifies a type, ensure that the type specified
+			// matches the type we're building. We use this to prevent the
+			// Workbench extension from being bundled in non-web releases.
+			.filter(entry => !entry.type || entry.type === type)
+			// --- End PWB ---
 			.map(entry => entry.name);
 		const extensionPaths = [...localWorkspaceExtensions, ...marketplaceExtensions]
 			.map(name => `.build/extensions/${name}/**`);
@@ -326,7 +377,7 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
 		// Note: The remote/reh-web/package.json is generated/updated in build/npm/postinstall.js
 		const packageJsonBase = type === 'reh-web' ? 'remote/reh-web' : 'remote';
 		const packageJsonStream = gulp.src([`${packageJsonBase}/package.json`], { base: packageJsonBase })
-			.pipe(json({ name, version, dependencies: undefined, optionalDependencies: undefined }))
+			.pipe(json({ name, version, dependencies: undefined, optionalDependencies: undefined, ...(isESM(`Setting 'type: module' in top level package.json`) ? { type: 'module' } : {}) })) // TODO@esm this should be configured in the top level package.json
 			// --- End Positron ---
 			.pipe(es.through(function (file) {
 				packageJsonContents = file.contents.toString();
diff --git a/build/gulpfile.scan.js b/build/gulpfile.scan.js
index 6f8144b0954..127720a0245 100644
--- a/build/gulpfile.scan.js
+++ b/build/gulpfile.scan.js
@@ -26,6 +26,9 @@ const BUILD_TARGETS = [
 	{ platform: 'linux', arch: 'arm64' },
 ];
 
+// The following files do not have PDBs downloaded for them during the download symbols process.
+const excludedCheckList = ['d3dcompiler_47.dll'];
+
 BUILD_TARGETS.forEach(buildTarget => {
 	const dashed = (/** @type {string | null} */ str) => (str ? `-${str}` : ``);
 	const platform = buildTarget.platform;
@@ -46,7 +49,6 @@ BUILD_TARGETS.forEach(buildTarget => {
 	if (platform === 'win32') {
 		tasks.push(
 			() => electron.dest(destinationPdb, { ...config, platform, arch: arch === 'armhf' ? 'arm' : arch, pdbs: true }),
-			util.rimraf(path.join(destinationExe, 'd3dcompiler_47.dll')),
 			() => confirmPdbsExist(destinationExe, destinationPdb)
 		);
 	}
@@ -110,6 +112,10 @@ function nodeModules(destinationExe, destinationPdb, platform) {
 
 function confirmPdbsExist(destinationExe, destinationPdb) {
 	readdirSync(destinationExe).forEach(file => {
+		if (excludedCheckList.includes(file)) {
+			return;
+		}
+
 		if (file.endsWith('.dll') || file.endsWith('.exe')) {
 			const pdb = `${file}.pdb`;
 			if (!existsSync(path.join(destinationPdb, pdb))) {
diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
index 47c4247aa3c..7ec7150b26b 100644
--- a/build/gulpfile.vscode.js
+++ b/build/gulpfile.vscode.js
@@ -17,7 +17,7 @@ const util = require('./lib/util');
 const { getVersion } = require('./lib/getVersion');
 const { readISODate } = require('./lib/date');
 const task = require('./lib/task');
-const buildfile = require('../src/buildfile');
+const buildfile = require('./buildfile');
 const optimize = require('./lib/optimize');
 const { inlineMeta } = require('./lib/inlineMeta');
 const root = path.dirname(__dirname);
@@ -33,6 +33,7 @@ const minimist = require('minimist');
 const { compileBuildTask } = require('./gulpfile.compile');
 const { compileExtensionsBuildTask, compileExtensionMediaBuildTask } = require('./gulpfile.extensions');
 const { promisify } = require('util');
+const { isESM } = require('./lib/esm');
 const glob = promisify(require('glob'));
 const rcedit = promisify(require('rcedit'));
 
@@ -43,7 +44,18 @@ const { getQuartoStream } = require('./lib/quarto');
 // --- End Positron ---
 
 // Build
-const vscodeEntryPoints = [
+const vscodeEntryPoints = isESM() ? [
+	buildfile.base,
+	buildfile.workerExtensionHost,
+	buildfile.workerNotebook,
+	buildfile.workerLanguageDetection,
+	buildfile.workerLocalFileSearch,
+	buildfile.workerProfileAnalysis,
+	buildfile.workerOutputLinks,
+	buildfile.workerBackgroundTokenization,
+	buildfile.workbenchDesktop(),
+	buildfile.code
+].flat() : [
 	buildfile.entrypoint('vs/workbench/workbench.desktop.main'),
 	buildfile.base,
 	buildfile.workerExtensionHost,
@@ -51,19 +63,78 @@ const vscodeEntryPoints = [
 	buildfile.workerLanguageDetection,
 	buildfile.workerLocalFileSearch,
 	buildfile.workerProfileAnalysis,
-	buildfile.workbenchDesktop,
+	buildfile.workbenchDesktop(),
 	buildfile.code
 ].flat();
 
-const vscodeResources = [
+const vscodeResourceIncludes = isESM() ? [
+	// --- Start Positron ---
+	'out-build/react-dom/client.js',
+	// --- End Positron ---
+
+	// NLS
+	'out-build/nls.messages.json',
+	'out-build/nls.keys.json',
+
+	// Workbench
+	'out-build/vs/code/electron-sandbox/workbench/workbench.esm.html',
+
+	// Electron Preload
+	'out-build/vs/base/parts/sandbox/electron-sandbox/preload.js',
+	'out-build/vs/base/parts/sandbox/electron-sandbox/preload-aux.js',
+
+	// Node Scripts
+	'out-build/vs/base/node/{terminateProcess.sh,cpuUsage.sh,ps.sh}',
+
+	// Touchbar
+	'out-build/vs/workbench/browser/parts/editor/media/*.png',
+	'out-build/vs/workbench/contrib/debug/browser/media/*.png',
+
+	// External Terminal
+	'out-build/vs/workbench/contrib/externalTerminal/**/*.scpt',
+
+	// Terminal shell integration
+	'out-build/vs/workbench/contrib/terminal/browser/media/fish_xdg_data/fish/vendor_conf.d/*.fish',
+	'out-build/vs/workbench/contrib/terminal/browser/media/*.ps1',
+	'out-build/vs/workbench/contrib/terminal/browser/media/*.psm1',
+	'out-build/vs/workbench/contrib/terminal/browser/media/*.sh',
+	'out-build/vs/workbench/contrib/terminal/browser/media/*.zsh',
+
+	// Accessibility Signals
+	'out-build/vs/platform/accessibilitySignal/browser/media/*.mp3',
+
+	// Welcome
+	'out-build/vs/workbench/contrib/welcomeGettingStarted/common/media/**/*.{svg,png}',
+
+	// Extensions
+	'out-build/vs/workbench/contrib/extensions/browser/media/{theme-icon.png,language-icon.svg}',
+	'out-build/vs/workbench/services/extensionManagement/common/media/*.{svg,png}',
+
+	// Webview
+	'out-build/vs/workbench/contrib/webview/browser/pre/*.{js,html}',
+
+	// Extension Host Worker
+	'out-build/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.esm.html',
+
+	// Process Explorer
+	'out-build/vs/code/electron-sandbox/processExplorer/processExplorer.esm.html',
+
+	// Tree Sitter highlights
+	'out-build/vs/editor/common/languages/highlights/*.scm',
+
+	// Issue Reporter
+	'out-build/vs/workbench/contrib/issue/electron-sandbox/issueReporter.esm.html'
+] : [
 	// --- Start Positron ---
 	'out-build/react-dom/client.js',
 	// --- End Positron ---
+
 	'out-build/nls.messages.json',
 	'out-build/nls.keys.json',
 	'out-build/vs/**/*.{svg,png,html,jpg,mp3}',
 	'!out-build/vs/code/browser/**/*.html',
 	'!out-build/vs/code/**/*-dev.html',
+	'!out-build/vs/code/**/*-dev.esm.html',
 	'!out-build/vs/editor/standalone/**/*.svg',
 	'out-build/vs/base/node/{stdForkStart.js,terminateProcess.sh,cpuUsage.sh,ps.sh}',
 	'out-build/vs/base/browser/ui/codicons/codicon/**',
@@ -78,21 +149,37 @@ const vscodeResources = [
 	'out-build/vs/workbench/contrib/terminal/browser/media/*.sh',
 	'out-build/vs/workbench/contrib/terminal/browser/media/*.zsh',
 	'out-build/vs/workbench/contrib/webview/browser/pre/*.js',
-	'!out-build/vs/workbench/contrib/issue/browser/*.html',
 	'!out-build/vs/workbench/contrib/issue/**/*-dev.html',
+	'!out-build/vs/workbench/contrib/issue/**/*-dev.esm.html',
+	'out-build/vs/editor/common/languages/highlights/*.scm',
 	'out-build/vs/**/markdown.css',
 	'out-build/vs/workbench/contrib/tasks/**/*.json',
 	'!**/test/**'
 ];
 
+const vscodeResources = [
+
+	// Includes
+	...vscodeResourceIncludes,
+
+	// Excludes
+	'!out-build/vs/code/browser/**',
+	'!out-build/vs/editor/standalone/**',
+	'!out-build/vs/code/**/*-dev.html',
+	'!out-build/vs/code/**/*-dev.esm.html',
+	'!out-build/vs/workbench/contrib/issue/**/*-dev.html',
+	'!out-build/vs/workbench/contrib/issue/**/*-dev.esm.html',
+	'!**/test/**'
+];
+
 // Do not change the order of these files! They will
 // be inlined into the target window file in this order
 // and they depend on each other in this way.
-const windowBootstrapFiles = [
-	'out-build/bootstrap.js',
-	'out-build/vs/loader.js',
-	'out-build/bootstrap-window.js'
-];
+const windowBootstrapFiles = [];
+if (!isESM('Skipping loader.js in window bootstrap files')) {
+	windowBootstrapFiles.push('out-build/vs/loader.js');
+}
+windowBootstrapFiles.push('out-build/bootstrap-window.js');
 
 const commonJSEntryPoints = [
 	'out-build/main.js',
@@ -222,7 +309,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
 			'vs/workbench/workbench.desktop.main.js',
 			'vs/workbench/workbench.desktop.main.css',
 			'vs/workbench/api/node/extensionHostProcess.js',
-			'vs/code/electron-sandbox/workbench/workbench.html',
+			isESM() ? 'vs/code/electron-sandbox/workbench/workbench.esm.html' : 'vs/code/electron-sandbox/workbench/workbench.html',
 			'vs/code/electron-sandbox/workbench/workbench.js'
 		]);
 
@@ -231,6 +318,13 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
 			.pipe(util.setExecutableBit(['**/*.sh']));
 
 		const platformSpecificBuiltInExtensionsExclusions = product.builtInExtensions.filter(ext => {
+			// --- Start PWB ---
+			// Don't bundle reh-web extensions here. We bundle them for the
+			// remote web gulp build targets (see gulpfile.reh.js)
+			if (ext.type === 'reh-web') {
+				return true;
+			}
+			// --- End PWB ---
 			if (!ext.platforms) {
 				return false;
 			}
@@ -264,8 +358,13 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
 			version += '-' + quality;
 		}
 
+		if (isESM() && typeof quality === 'string' && quality !== 'exploration') {
+			// TODO@esm remove this safeguard
+			throw new Error('Refuse to build ESM on quality other than exploration');
+		}
+
 		const name = product.nameShort;
-		const packageJsonUpdates = { name, version };
+		const packageJsonUpdates = { name, version, ...(isESM(`Setting 'type: module' and 'main: out/main.js' in top level package.json`) ? { type: 'module', main: 'out/main.js' } : {}) }; // TODO@esm this should be configured in the top level package.json
 
 		// for linux url handling
 		if (platform === 'linux') {
@@ -333,19 +432,22 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
 		const jsFilter = util.filter(data => !data.isDirectory() && /\.js$/.test(data.path));
 		const root = path.resolve(path.join(__dirname, '..'));
 		const productionDependencies = getProductionDependencies(root);
-		const dependenciesSrc = productionDependencies.map(d => path.relative(root, d.path)).map(d => [`${d}/**`, `!${d}/**/{test,tests}/**`]).flat();
+		const dependenciesSrc = productionDependencies.map(d => path.relative(root, d.path)).map(d => [`${d}/**`, `!${d}/**/{test,tests}/**`, `!**/*.mk`]).flat();
 
-		const deps = gulp.src(dependenciesSrc, { base: '.', dot: true })
+		let deps = gulp.src(dependenciesSrc, { base: '.', dot: true })
 			.pipe(filter(['**', `!**/${config.version}/**`, '!**/bin/darwin-arm64-87/**', '!**/package-lock.json', '!**/yarn.lock', '!**/*.js.map']))
 			.pipe(util.cleanNodeModules(path.join(__dirname, '.moduleignore')))
 			.pipe(util.cleanNodeModules(path.join(__dirname, `.moduleignore.${process.platform}`)))
 			.pipe(jsFilter)
 			.pipe(util.rewriteSourceMappingURL(sourceMappingURLBase))
-			.pipe(jsFilter.restore)
-			.pipe(createAsar(path.join(process.cwd(), 'node_modules'), [
+			.pipe(jsFilter.restore);
+
+		if (!isESM('ASAR disabled in VS Code builds')) { // TODO@esm: ASAR disabled in ESM
+			deps = deps.pipe(createAsar(path.join(process.cwd(), 'node_modules'), [
 				'**/*.node',
 				'**/@vscode/ripgrep/bin/*',
 				'**/node-pty/build/Release/*',
+				'**/node-pty/build/Release/conpty/*',
 				'**/node-pty/lib/worker/conoutSocketWorker.js',
 				'**/node-pty/lib/shared/conout.js',
 				'**/*.wasm',
@@ -353,6 +455,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
 			], [
 				'**/*.mk',
 			], 'node_modules.asar'));
+		}
 
 		let all = es.merge(
 			packageJsonStream,
diff --git a/build/gulpfile.vscode.linux.js b/build/gulpfile.vscode.linux.js
index 9c643fa7e58..2c91446487e 100644
--- a/build/gulpfile.vscode.linux.js
+++ b/build/gulpfile.vscode.linux.js
@@ -121,7 +121,11 @@ function prepareDebPackage(arch) {
 			.pipe(replace('@@NAME@@', product.applicationName))
 			.pipe(rename('DEBIAN/postinst'));
 
-		const all = es.merge(control, postinst, postrm, prerm, desktops, appdata, workspaceMime, icon, bash_completion, zsh_completion, code);
+		const templates = gulp.src('resources/linux/debian/templates.template', { base: '.' })
+			.pipe(replace('@@NAME@@', product.applicationName))
+			.pipe(rename('DEBIAN/templates'));
+
+		const all = es.merge(control, templates, postinst, postrm, prerm, desktops, appdata, workspaceMime, icon, bash_completion, zsh_completion, code);
 
 		return all.pipe(vfs.dest(destination));
 	};
diff --git a/build/gulpfile.vscode.web.js b/build/gulpfile.vscode.web.js
index c705d74d5e2..0296738bd1d 100644
--- a/build/gulpfile.vscode.web.js
+++ b/build/gulpfile.vscode.web.js
@@ -21,6 +21,7 @@ const vfs = require('vinyl-fs');
 const packageJson = require('../package.json');
 const { compileBuildTask } = require('./gulpfile.compile');
 const extensions = require('./lib/extensions');
+const { isESM } = require('./lib/esm');
 
 // --- Start Positron ---
 const child_process = require('child_process');
@@ -38,7 +39,30 @@ const version = (quality && quality !== 'stable') ? `${packageJson.version}-${qu
 const positronVersion = (quality && quality !== 'stable') ? `${product.positronVersion}-${quality}` : product.positronVersion;
 // --- End Positron ---
 
-const vscodeWebResourceIncludes = [
+const vscodeWebResourceIncludes = isESM() ? [
+
+	// NLS
+	'out-build/nls.messages.js',
+
+	// Accessibility Signals
+	'out-build/vs/platform/accessibilitySignal/browser/media/*.mp3',
+
+	// Welcome
+	'out-build/vs/workbench/contrib/welcomeGettingStarted/common/media/**/*.{svg,png}',
+
+	// Extensions
+	'out-build/vs/workbench/contrib/extensions/browser/media/{theme-icon.png,language-icon.svg}',
+	'out-build/vs/workbench/services/extensionManagement/common/media/*.{svg,png}',
+
+	// Webview
+	'out-build/vs/workbench/contrib/webview/browser/pre/*.{js,html}',
+
+	// Tree Sitter highlights
+	'out-build/vs/editor/common/languages/highlights/*.scm',
+
+	// Extension Host Worker
+	'out-build/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.esm.html',
+] : [
 
 	// Workbench
 	'out-build/vs/{base,platform,editor,workbench}/**/*.{svg,png,jpg,mp3}',
@@ -56,6 +80,9 @@ const vscodeWebResourceIncludes = [
 	// Extension Worker
 	'out-build/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html',
 
+	// Tree Sitter highlights
+	'out-build/vs/editor/common/languages/highlights/*.scm',
+
 	// Web node paths (needed for integration tests)
 	'out-build/vs/webPackagePaths.js',
 ];
@@ -70,12 +97,24 @@ const vscodeWebResources = [
 	'!out-build/vs/**/{node,electron-sandbox,electron-main}/**',
 	'!out-build/vs/editor/standalone/**',
 	'!out-build/vs/workbench/**/*-tb.png',
+	'!out-build/vs/code/**/*-dev.html',
+	'!out-build/vs/code/**/*-dev.esm.html',
 	'!**/test/**'
 ];
 
-const buildfile = require('../src/buildfile');
+const buildfile = require('./buildfile');
 
-const vscodeWebEntryPoints = [
+const vscodeWebEntryPoints = isESM() ? [
+	buildfile.base,
+	buildfile.workerExtensionHost,
+	buildfile.workerNotebook,
+	buildfile.workerLanguageDetection,
+	buildfile.workerLocalFileSearch,
+	buildfile.workerOutputLinks,
+	buildfile.workerBackgroundTokenization,
+	buildfile.keyboardMaps,
+	buildfile.workbenchWeb()
+].flat() : [
 	buildfile.entrypoint('vs/workbench/workbench.web.main'),
 	buildfile.base,
 	buildfile.workerExtensionHost,
@@ -83,9 +122,8 @@ const vscodeWebEntryPoints = [
 	buildfile.workerLanguageDetection,
 	buildfile.workerLocalFileSearch,
 	buildfile.keyboardMaps,
-	buildfile.workbenchWeb
+	buildfile.workbenchWeb()
 ].flat();
-exports.vscodeWebEntryPoints = vscodeWebEntryPoints;
 
 // --- Begin Positron ---
 // Use the POSITRON_BUILD_NUMBER var if it's set; otherwise, call show-version to compute it.
diff --git a/build/lib/builtInExtensions.js b/build/lib/builtInExtensions.js
index 284f1d96e41..bf3a3482ae5 100644
--- a/build/lib/builtInExtensions.js
+++ b/build/lib/builtInExtensions.js
@@ -46,6 +46,13 @@ function isUpToDate(extension) {
     }
 }
 function getExtensionDownloadStream(extension) {
+    // --- Start PWB: Bundle PWB extension ---
+    // the PWB extension is a special case because it's not availble from the marketplace or github
+    if (extension.name === 'rstudio.rstudio-workbench') {
+        return ext.fromS3Bucket(extension)
+            .pipe(rename(p => p.dirname = `${extension.name}/${p.dirname}`));
+    }
+    // --- End PWB: Bundle PWB extension ---
     // --- Start Positron ---
     const url = extension.metadata.multiPlatformServiceUrl || productjson.extensionsGallery?.serviceUrl;
     return (url ? ext.fromMarketplace(url, extension) : ext.fromGithub(extension))
@@ -120,6 +127,15 @@ function getBuiltInExtensions() {
     for (const extension of [...builtInExtensions, ...webBuiltInExtensions]) {
         const controlState = control[extension.name] || 'marketplace';
         control[extension.name] = controlState;
+        // --- Start Positron ---
+        // Discard extensions intended for the web. The 'type' field isn't a
+        // formal part of the extension definition but a custom field we use to
+        // filter out web-only extensions (i.e. Posit Workbench)
+        // @ts-ignore
+        if (extension.type === 'reh-web') {
+            continue;
+        }
+        // --- End Positron ---
         streams.push(syncExtension(extension, controlState));
     }
     writeControlFile(control);
diff --git a/build/lib/builtInExtensions.ts b/build/lib/builtInExtensions.ts
index 11de5d676ca..04d6fb6d65c 100644
--- a/build/lib/builtInExtensions.ts
+++ b/build/lib/builtInExtensions.ts
@@ -23,6 +23,9 @@ export interface IExtensionDefinition {
 	sha256: string;
 	repo: string;
 	platforms?: string[];
+	// --- Start PWB: Bundle PWB extension ---
+	s3Bucket?: string;
+	// --- End PWB: Bundle PWB extension ---
 	metadata: {
 		id: string;
 		publisherId: {
@@ -73,6 +76,13 @@ function isUpToDate(extension: IExtensionDefinition): boolean {
 }
 
 function getExtensionDownloadStream(extension: IExtensionDefinition) {
+	// --- Start PWB: Bundle PWB extension ---
+	// the PWB extension is a special case because it's not availble from the marketplace or github
+	if (extension.name === 'rstudio.rstudio-workbench') {
+		return ext.fromS3Bucket(extension)
+			.pipe(rename(p => p.dirname = `${extension.name}/${p.dirname}`));
+	}
+	// --- End PWB: Bundle PWB extension ---
 	// --- Start Positron ---
 	const url = extension.metadata.multiPlatformServiceUrl || productjson.extensionsGallery?.serviceUrl;
 	return (url ? ext.fromMarketplace(url, extension) : ext.fromGithub(extension))
@@ -167,6 +177,16 @@ export function getBuiltInExtensions(): Promise<void> {
 		const controlState = control[extension.name] || 'marketplace';
 		control[extension.name] = controlState;
 
+		// --- Start Positron ---
+		// Discard extensions intended for the web. The 'type' field isn't a
+		// formal part of the extension definition but a custom field we use to
+		// filter out web-only extensions (i.e. Posit Workbench)
+		// @ts-ignore
+		if (extension.type === 'reh-web') {
+			continue;
+		}
+		// --- End Positron ---
+
 		streams.push(syncExtension(extension, controlState));
 	}
 
diff --git a/build/lib/bundle.js b/build/lib/bundle.js
index df7c10fa37e..627b9966700 100644
--- a/build/lib/bundle.js
+++ b/build/lib/bundle.js
@@ -5,7 +5,7 @@
  *--------------------------------------------------------------------------------------------*/
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.bundle = bundle;
-exports.removeDuplicateTSBoilerplate = removeDuplicateTSBoilerplate;
+exports.removeAllTSBoilerplate = removeAllTSBoilerplate;
 const fs = require("fs");
 const path = require("path");
 const vm = require("vm");
@@ -55,9 +55,6 @@ function bundle(entryPoints, config, callback) {
         };
         for (const moduleId in entryPointsMap) {
             const entryPoint = entryPointsMap[moduleId];
-            if (entryPoint.append) {
-                entryPoint.append = entryPoint.append.map(resolvePath);
-            }
             if (entryPoint.prepend) {
                 entryPoint.prepend = entryPoint.prepend.map(resolvePath);
             }
@@ -105,7 +102,7 @@ function emitEntryPoints(modules, entryPoints) {
             return allDependencies[module];
         });
         bundleData.bundles[moduleToBundle] = includedModules;
-        const res = emitEntryPoint(modulesMap, modulesGraph, moduleToBundle, includedModules, info.prepend || [], info.append || [], info.dest);
+        const res = emitEntryPoint(modulesMap, modulesGraph, moduleToBundle, includedModules, info.prepend || [], info.dest);
         result = result.concat(res.files);
         for (const pluginName in res.usedPlugins) {
             usedPlugins[pluginName] = usedPlugins[pluginName] || res.usedPlugins[pluginName];
@@ -226,20 +223,24 @@ function removeAllDuplicateTSBoilerplate(destFiles) {
     });
     return destFiles;
 }
+function removeAllTSBoilerplate(source) {
+    const seen = new Array(BOILERPLATE.length).fill(true, 0, 10);
+    return removeDuplicateTSBoilerplate(source, seen);
+}
+// Taken from typescript compiler => emitFiles
+const BOILERPLATE = [
+    { start: /^var __extends/, end: /^}\)\(\);$/ },
+    { start: /^var __assign/, end: /^};$/ },
+    { start: /^var __decorate/, end: /^};$/ },
+    { start: /^var __metadata/, end: /^};$/ },
+    { start: /^var __param/, end: /^};$/ },
+    { start: /^var __awaiter/, end: /^};$/ },
+    { start: /^var __generator/, end: /^};$/ },
+    { start: /^var __createBinding/, end: /^}\)\);$/ },
+    { start: /^var __setModuleDefault/, end: /^}\);$/ },
+    { start: /^var __importStar/, end: /^};$/ },
+];
 function removeDuplicateTSBoilerplate(source, SEEN_BOILERPLATE = []) {
-    // Taken from typescript compiler => emitFiles
-    const BOILERPLATE = [
-        { start: /^var __extends/, end: /^}\)\(\);$/ },
-        { start: /^var __assign/, end: /^};$/ },
-        { start: /^var __decorate/, end: /^};$/ },
-        { start: /^var __metadata/, end: /^};$/ },
-        { start: /^var __param/, end: /^};$/ },
-        { start: /^var __awaiter/, end: /^};$/ },
-        { start: /^var __generator/, end: /^};$/ },
-        { start: /^var __createBinding/, end: /^}\)\);$/ },
-        { start: /^var __setModuleDefault/, end: /^}\);$/ },
-        { start: /^var __importStar/, end: /^};$/ },
-    ];
     const lines = source.split(/\r\n|\n|\r/);
     const newLines = [];
     let IS_REMOVING_BOILERPLATE = false, END_BOILERPLATE;
@@ -274,7 +275,7 @@ function removeDuplicateTSBoilerplate(source, SEEN_BOILERPLATE = []) {
     }
     return newLines.join('\n');
 }
-function emitEntryPoint(modulesMap, deps, entryPoint, includedModules, prepend, append, dest) {
+function emitEntryPoint(modulesMap, deps, entryPoint, includedModules, prepend, dest) {
     if (!dest) {
         dest = entryPoint + '.js';
     }
@@ -348,8 +349,7 @@ function emitEntryPoint(modulesMap, deps, entryPoint, includedModules, prepend,
         };
     };
     const toPrepend = (prepend || []).map(toIFile);
-    const toAppend = (append || []).map(toIFile);
-    mainResult.sources = toPrepend.concat(mainResult.sources).concat(toAppend);
+    mainResult.sources = toPrepend.concat(mainResult.sources);
     return {
         files: results,
         usedPlugins: usedPlugins
diff --git a/build/lib/bundle.ts b/build/lib/bundle.ts
index 74d37fcce55..6e3f96a5062 100644
--- a/build/lib/bundle.ts
+++ b/build/lib/bundle.ts
@@ -52,8 +52,8 @@ export interface IEntryPoint {
 	include?: string[];
 	exclude?: string[];
 	prepend?: IExtraFile[];
-	append?: IExtraFile[];
 	dest?: string;
+	target?: 'amd' | 'esm';
 }
 
 interface IEntryPointMap {
@@ -157,9 +157,6 @@ export function bundle(entryPoints: IEntryPoint[], config: ILoaderConfig, callba
 		};
 		for (const moduleId in entryPointsMap) {
 			const entryPoint = entryPointsMap[moduleId];
-			if (entryPoint.append) {
-				entryPoint.append = entryPoint.append.map(resolvePath);
-			}
 			if (entryPoint.prepend) {
 				entryPoint.prepend = entryPoint.prepend.map(resolvePath);
 			}
@@ -223,7 +220,6 @@ function emitEntryPoints(modules: IBuildModuleInfo[], entryPoints: IEntryPointMa
 			moduleToBundle,
 			includedModules,
 			info.prepend || [],
-			info.append || [],
 			info.dest
 		);
 
@@ -361,22 +357,26 @@ function removeAllDuplicateTSBoilerplate(destFiles: IConcatFile[]): IConcatFile[
 	return destFiles;
 }
 
-export function removeDuplicateTSBoilerplate(source: string, SEEN_BOILERPLATE: boolean[] = []): string {
+export function removeAllTSBoilerplate(source: string) {
+	const seen = new Array<boolean>(BOILERPLATE.length).fill(true, 0, 10);
+	return removeDuplicateTSBoilerplate(source, seen);
+}
 
-	// Taken from typescript compiler => emitFiles
-	const BOILERPLATE = [
-		{ start: /^var __extends/, end: /^}\)\(\);$/ },
-		{ start: /^var __assign/, end: /^};$/ },
-		{ start: /^var __decorate/, end: /^};$/ },
-		{ start: /^var __metadata/, end: /^};$/ },
-		{ start: /^var __param/, end: /^};$/ },
-		{ start: /^var __awaiter/, end: /^};$/ },
-		{ start: /^var __generator/, end: /^};$/ },
-		{ start: /^var __createBinding/, end: /^}\)\);$/ },
-		{ start: /^var __setModuleDefault/, end: /^}\);$/ },
-		{ start: /^var __importStar/, end: /^};$/ },
-	];
+// Taken from typescript compiler => emitFiles
+const BOILERPLATE = [
+	{ start: /^var __extends/, end: /^}\)\(\);$/ },
+	{ start: /^var __assign/, end: /^};$/ },
+	{ start: /^var __decorate/, end: /^};$/ },
+	{ start: /^var __metadata/, end: /^};$/ },
+	{ start: /^var __param/, end: /^};$/ },
+	{ start: /^var __awaiter/, end: /^};$/ },
+	{ start: /^var __generator/, end: /^};$/ },
+	{ start: /^var __createBinding/, end: /^}\)\);$/ },
+	{ start: /^var __setModuleDefault/, end: /^}\);$/ },
+	{ start: /^var __importStar/, end: /^};$/ },
+];
 
+function removeDuplicateTSBoilerplate(source: string, SEEN_BOILERPLATE: boolean[] = []): string {
 	const lines = source.split(/\r\n|\n|\r/);
 	const newLines: string[] = [];
 	let IS_REMOVING_BOILERPLATE = false, END_BOILERPLATE: RegExp;
@@ -425,7 +425,6 @@ function emitEntryPoint(
 	entryPoint: string,
 	includedModules: string[],
 	prepend: IExtraFile[],
-	append: IExtraFile[],
 	dest: string | undefined
 ): IEmitEntryPointResult {
 	if (!dest) {
@@ -511,9 +510,8 @@ function emitEntryPoint(
 	};
 
 	const toPrepend = (prepend || []).map(toIFile);
-	const toAppend = (append || []).map(toIFile);
 
-	mainResult.sources = toPrepend.concat(mainResult.sources).concat(toAppend);
+	mainResult.sources = toPrepend.concat(mainResult.sources);
 
 	return {
 		files: results,
diff --git a/build/lib/compilation.js b/build/lib/compilation.js
index c49458532bc..aa77a32c04d 100644
--- a/build/lib/compilation.js
+++ b/build/lib/compilation.js
@@ -142,11 +142,11 @@ function compileTask(src, out, build, options = {}) {
     task.taskName = `compile-${path.basename(src)}`;
     return task;
 }
-function watchTask(out, build) {
+function watchTask(out, build, srcPath = 'src') {
     const task = () => {
-        const compile = createCompile('src', { build, emitError: false, transpileOnly: false, preserveEnglish: false });
-        const src = gulp.src('src/**', { base: 'src' });
-        const watchSrc = watch('src/**', { base: 'src', readDelay: 200 });
+        const compile = createCompile(srcPath, { build, emitError: false, transpileOnly: false, preserveEnglish: false });
+        const src = gulp.src(`${srcPath}/**`, { base: srcPath });
+        const watchSrc = watch(`${srcPath}/**`, { base: srcPath, readDelay: 200 });
         const generator = new MonacoGenerator(true);
         generator.execute();
         return watchSrc
diff --git a/build/lib/compilation.ts b/build/lib/compilation.ts
index e2ff72894ea..0e015a8ce9d 100644
--- a/build/lib/compilation.ts
+++ b/build/lib/compilation.ts
@@ -173,13 +173,13 @@ export function compileTask(src: string, out: string, build: boolean, options: {
 	return task;
 }
 
-export function watchTask(out: string, build: boolean): task.StreamTask {
+export function watchTask(out: string, build: boolean, srcPath: string = 'src'): task.StreamTask {
 
 	const task = () => {
-		const compile = createCompile('src', { build, emitError: false, transpileOnly: false, preserveEnglish: false });
+		const compile = createCompile(srcPath, { build, emitError: false, transpileOnly: false, preserveEnglish: false });
 
-		const src = gulp.src('src/**', { base: 'src' });
-		const watchSrc = watch('src/**', { base: 'src', readDelay: 200 });
+		const src = gulp.src(`${srcPath}/**`, { base: srcPath });
+		const watchSrc = watch(`${srcPath}/**`, { base: srcPath, readDelay: 200 });
 
 		const generator = new MonacoGenerator(true);
 		generator.execute();
diff --git a/build/lib/esm.js b/build/lib/esm.js
new file mode 100644
index 00000000000..db2683445a2
--- /dev/null
+++ b/build/lib/esm.js
@@ -0,0 +1,41 @@
+"use strict";
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setESM = setESM;
+exports.isESM = isESM;
+const path = require("path");
+const fs = require("fs");
+// TODO@esm remove this
+const outDirectory = path.join(__dirname, '..', '..', 'out-build');
+const esmMarkerFile = path.join(outDirectory, 'esm');
+function setESM(enabled) {
+    const result = () => new Promise((resolve, _) => {
+        if (enabled) {
+            fs.mkdirSync(outDirectory, { recursive: true });
+            fs.writeFileSync(esmMarkerFile, 'true', 'utf8');
+            console.warn(`Setting build to ESM: true`);
+        }
+        else {
+            console.warn(`Setting build to ESM: false`);
+        }
+        resolve();
+    });
+    result.taskName = 'set-esm';
+    return result;
+}
+function isESM(logWarning) {
+    try {
+        const res = (typeof process.env.VSCODE_BUILD_ESM === 'string' && process.env.VSCODE_BUILD_ESM.toLowerCase() === 'true') || (fs.readFileSync(esmMarkerFile, 'utf8') === 'true');
+        if (res && logWarning) {
+            console.warn(`[esm] ${logWarning}`);
+        }
+        return res;
+    }
+    catch (error) {
+        return false;
+    }
+}
+//# sourceMappingURL=esm.js.map
\ No newline at end of file
diff --git a/build/lib/esm.ts b/build/lib/esm.ts
new file mode 100644
index 00000000000..2fc5215e284
--- /dev/null
+++ b/build/lib/esm.ts
@@ -0,0 +1,40 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as path from 'path';
+import * as fs from 'fs';
+
+// TODO@esm remove this
+
+const outDirectory = path.join(__dirname, '..', '..', 'out-build');
+const esmMarkerFile = path.join(outDirectory, 'esm');
+
+export function setESM(enabled: boolean) {
+	const result = () => new Promise<void>((resolve, _) => {
+		if (enabled) {
+			fs.mkdirSync(outDirectory, { recursive: true });
+			fs.writeFileSync(esmMarkerFile, 'true', 'utf8');
+			console.warn(`Setting build to ESM: true`);
+		} else {
+			console.warn(`Setting build to ESM: false`);
+		}
+
+		resolve();
+	});
+	result.taskName = 'set-esm';
+	return result;
+}
+
+export function isESM(logWarning?: string): boolean {
+	try {
+		const res = (typeof process.env.VSCODE_BUILD_ESM === 'string' && process.env.VSCODE_BUILD_ESM.toLowerCase() === 'true') || (fs.readFileSync(esmMarkerFile, 'utf8') === 'true');
+		if (res && logWarning) {
+			console.warn(`[esm] ${logWarning}`);
+		}
+		return res;
+	} catch (error) {
+		return false;
+	}
+}
diff --git a/build/lib/extensions.js b/build/lib/extensions.js
index a4c1ebca059..e9e653a2379 100644
--- a/build/lib/extensions.js
+++ b/build/lib/extensions.js
@@ -5,6 +5,7 @@
  *--------------------------------------------------------------------------------------------*/
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fromMarketplace = fromMarketplace;
+exports.fromS3Bucket = fromS3Bucket;
 exports.fromGithub = fromGithub;
 exports.packageLocalExtensionsStream = packageLocalExtensionsStream;
 exports.packageMarketplaceExtensionsStream = packageMarketplaceExtensionsStream;
@@ -253,6 +254,29 @@ function fromMarketplace(serviceUrl, { name: extensionName, version, sha256, met
         .pipe(json({ __metadata: metadata }))
         .pipe(packageJsonFilter.restore);
 }
+// --- Start PWB: Bundle PWB extension ---
+function fromS3Bucket({ name: extensionName, version, sha256, s3Bucket, metadata }) {
+    const json = require('gulp-json-editor');
+    const [, name] = extensionName.split('.');
+    const url = `https://${s3Bucket}.s3.amazonaws.com/${name}-${version}.vsix`;
+    fancyLog('Downloading extension from S3:', ansiColors.yellow(`${extensionName}@${version}`), '...');
+    const packageJsonFilter = filter('package.json', { restore: true });
+    return (0, fetch_1.fetchUrls)('', {
+        base: url,
+        nodeFetchOptions: {
+            headers: baseHeaders
+        },
+        checksumSha256: sha256
+    })
+        .pipe(vzip.src())
+        .pipe(filter('extension/**'))
+        .pipe(rename(p => p.dirname = p.dirname.replace(/^extension\/?/, '')))
+        .pipe(packageJsonFilter)
+        .pipe(buffer())
+        .pipe(json({ __metadata: metadata }))
+        .pipe(packageJsonFilter.restore);
+}
+// --- End PWB: Bundle PWB extension ---
 function fromGithub({ name, version, repo, sha256, metadata }) {
     const json = require('gulp-json-editor');
     fancyLog('Downloading extension from GH:', ansiColors.yellow(`${name}@${version}`), '...');
@@ -522,9 +546,6 @@ async function esbuildExtensions(taskName, isWatch, scripts) {
                     return reject(error);
                 }
                 reporter(stderr, script);
-                if (stderr) {
-                    return reject();
-                }
                 return resolve();
             });
             proc.stdout.on('data', (data) => {
diff --git a/build/lib/extensions.ts b/build/lib/extensions.ts
index fa0db4f328a..0e675b4f4a1 100644
--- a/build/lib/extensions.ts
+++ b/build/lib/extensions.ts
@@ -280,6 +280,33 @@ export function fromMarketplace(serviceUrl: string, { name: extensionName, versi
 		.pipe(packageJsonFilter.restore);
 }
 
+// --- Start PWB: Bundle PWB extension ---
+export function fromS3Bucket({ name: extensionName, version, sha256, s3Bucket, metadata }: IExtensionDefinition): Stream {
+	const json = require('gulp-json-editor') as typeof import('gulp-json-editor');
+
+	const [, name] = extensionName.split('.');
+	const url = `https://${s3Bucket}.s3.amazonaws.com/${name}-${version}.vsix`;
+
+	fancyLog('Downloading extension from S3:', ansiColors.yellow(`${extensionName}@${version}`), '...');
+
+	const packageJsonFilter = filter('package.json', { restore: true });
+
+	return fetchUrls('', {
+		base: url,
+		nodeFetchOptions: {
+			headers: baseHeaders
+		},
+		checksumSha256: sha256
+	})
+		.pipe(vzip.src())
+		.pipe(filter('extension/**'))
+		.pipe(rename(p => p.dirname = p.dirname!.replace(/^extension\/?/, '')))
+		.pipe(packageJsonFilter)
+		.pipe(buffer())
+		.pipe(json({ __metadata: metadata }))
+		.pipe(packageJsonFilter.restore);
+}
+// --- End PWB: Bundle PWB extension ---
 
 export function fromGithub({ name, version, repo, sha256, metadata }: IExtensionDefinition): Stream {
 	const json = require('gulp-json-editor') as typeof import('gulp-json-editor');
@@ -603,9 +630,6 @@ async function esbuildExtensions(taskName: string, isWatch: boolean, scripts: {
 					return reject(error);
 				}
 				reporter(stderr, script);
-				if (stderr) {
-					return reject();
-				}
 				return resolve();
 			});
 
diff --git a/build/lib/i18n.js b/build/lib/i18n.js
index a837cbc4ac0..6964616291b 100644
--- a/build/lib/i18n.js
+++ b/build/lib/i18n.js
@@ -316,7 +316,7 @@ globalThis._VSCODE_NLS_LANGUAGE=${JSON.stringify(language.id)};`),
 function processNlsFiles(opts) {
     return (0, event_stream_1.through)(function (file) {
         const fileName = path.basename(file.path);
-        if (fileName === 'bundleInfo.json') { // pick a root level file to put the core bundles
+        if (fileName === 'bundleInfo.json') { // pick a root level file to put the core bundles (TODO@esm this file is not created anymore, pick another)
             try {
                 const json = JSON.parse(fs.readFileSync(path.join(REPO_ROOT_PATH, opts.out, 'nls.keys.json')).toString());
                 if (NLSKeysFormat.is(json)) {
diff --git a/build/lib/i18n.resources.json b/build/lib/i18n.resources.json
index 588724b131f..4fabe233b0f 100644
--- a/build/lib/i18n.resources.json
+++ b/build/lib/i18n.resources.json
@@ -677,6 +677,14 @@
 		{
 			"name": "vs/workbench/contrib/authentication",
 			"project": "vscode-workbench"
+		},
+		{
+			"name": "vs/workbench/contrib/replNotebook",
+			"project": "vscode-workbench"
+		},
+		{
+			"name": "vs/workbench/contrib/list",
+			"project": "vscode-workbench"
 		}
 	]
 }
diff --git a/build/lib/i18n.ts b/build/lib/i18n.ts
index 28f8cc993e6..cd7e522ad36 100644
--- a/build/lib/i18n.ts
+++ b/build/lib/i18n.ts
@@ -387,7 +387,7 @@ globalThis._VSCODE_NLS_LANGUAGE=${JSON.stringify(language.id)};`),
 export function processNlsFiles(opts: { out: string; fileHeader: string; languages: Language[] }): ThroughStream {
 	return through(function (this: ThroughStream, file: File) {
 		const fileName = path.basename(file.path);
-		if (fileName === 'bundleInfo.json') { // pick a root level file to put the core bundles
+		if (fileName === 'bundleInfo.json') { // pick a root level file to put the core bundles (TODO@esm this file is not created anymore, pick another)
 			try {
 				const json = JSON.parse(fs.readFileSync(path.join(REPO_ROOT_PATH, opts.out, 'nls.keys.json')).toString());
 				if (NLSKeysFormat.is(json)) {
diff --git a/build/lib/mangle/index.js b/build/lib/mangle/index.js
index 10e1aeb0d5a..f72d299930b 100644
--- a/build/lib/mangle/index.js
+++ b/build/lib/mangle/index.js
@@ -14,7 +14,8 @@ const ts = require("typescript");
 const url_1 = require("url");
 const workerpool = require("workerpool");
 const staticLanguageServiceHost_1 = require("./staticLanguageServiceHost");
-const buildfile = require('../../../src/buildfile');
+const esm_1 = require("../esm");
+const buildfile = require('../../buildfile');
 class ShortIdent {
     prefix;
     static _keywords = new Set(['await', 'break', 'case', 'catch', 'class', 'const', 'continue', 'debugger',
@@ -247,35 +248,51 @@ function isNameTakenInFile(node, name) {
     }
     return false;
 }
-const skippedExportMangledFiles = [
-    // Build
-    'css.build',
-    // Monaco
-    'editorCommon',
-    'editorOptions',
-    'editorZoom',
-    'standaloneEditor',
-    'standaloneEnums',
-    'standaloneLanguages',
-    // Generated
-    'extensionsApiProposals',
-    // Module passed around as type
-    'pfs',
-    // entry points
-    ...[
-        buildfile.entrypoint('vs/server/node/server.main', []),
-        buildfile.entrypoint('vs/workbench/workbench.desktop.main', []),
-        buildfile.base,
-        buildfile.workerExtensionHost,
-        buildfile.workerNotebook,
-        buildfile.workerLanguageDetection,
-        buildfile.workerLocalFileSearch,
-        buildfile.workerProfileAnalysis,
-        buildfile.workbenchDesktop,
-        buildfile.workbenchWeb,
-        buildfile.code
-    ].flat().map(x => x.name),
-];
+const skippedExportMangledFiles = function () {
+    return [
+        // Build
+        'css.build',
+        // Monaco
+        'editorCommon',
+        'editorOptions',
+        'editorZoom',
+        'standaloneEditor',
+        'standaloneEnums',
+        'standaloneLanguages',
+        // Generated
+        'extensionsApiProposals',
+        // Module passed around as type
+        'pfs',
+        // entry points
+        ...(0, esm_1.isESM)() ? [
+            buildfile.entrypoint('vs/server/node/server.main'),
+            buildfile.base,
+            buildfile.workerExtensionHost,
+            buildfile.workerNotebook,
+            buildfile.workerLanguageDetection,
+            buildfile.workerLocalFileSearch,
+            buildfile.workerProfileAnalysis,
+            buildfile.workerOutputLinks,
+            buildfile.workerBackgroundTokenization,
+            buildfile.workbenchDesktop(),
+            buildfile.workbenchWeb(),
+            buildfile.code,
+            buildfile.codeWeb
+        ].flat().map(x => x.name) : [
+            buildfile.entrypoint('vs/server/node/server.main'),
+            buildfile.entrypoint('vs/workbench/workbench.desktop.main'),
+            buildfile.base,
+            buildfile.workerExtensionHost,
+            buildfile.workerNotebook,
+            buildfile.workerLanguageDetection,
+            buildfile.workerLocalFileSearch,
+            buildfile.workerProfileAnalysis,
+            buildfile.workbenchDesktop(),
+            buildfile.workbenchWeb(),
+            buildfile.code
+        ].flat().map(x => x.name),
+    ];
+};
 const skippedExportMangledProjects = [
     // Test projects
     'vscode-api-tests',
@@ -519,7 +536,7 @@ class Mangler {
         for (const data of this.allExportedSymbols.values()) {
             if (data.fileName.endsWith('.d.ts')
                 || skippedExportMangledProjects.some(proj => data.fileName.includes(proj))
-                || skippedExportMangledFiles.some(file => data.fileName.endsWith(file + '.ts'))) {
+                || skippedExportMangledFiles().some(file => data.fileName.endsWith(file + '.ts'))) {
                 continue;
             }
             if (!data.shouldMangle(data.replacementName)) {
diff --git a/build/lib/mangle/index.ts b/build/lib/mangle/index.ts
index a148c4dd637..7b6c6d20843 100644
--- a/build/lib/mangle/index.ts
+++ b/build/lib/mangle/index.ts
@@ -12,7 +12,8 @@ import * as ts from 'typescript';
 import { pathToFileURL } from 'url';
 import * as workerpool from 'workerpool';
 import { StaticLanguageServiceHost } from './staticLanguageServiceHost';
-const buildfile = require('../../../src/buildfile');
+import { isESM } from '../esm';
+const buildfile = require('../../buildfile');
 
 class ShortIdent {
 
@@ -279,40 +280,55 @@ function isNameTakenInFile(node: ts.Node, name: string): boolean {
 	return false;
 }
 
-
-const skippedExportMangledFiles = [
-	// Build
-	'css.build',
-
-	// Monaco
-	'editorCommon',
-	'editorOptions',
-	'editorZoom',
-	'standaloneEditor',
-	'standaloneEnums',
-	'standaloneLanguages',
-
-	// Generated
-	'extensionsApiProposals',
-
-	// Module passed around as type
-	'pfs',
-
-	// entry points
-	...[
-		buildfile.entrypoint('vs/server/node/server.main', []),
-		buildfile.entrypoint('vs/workbench/workbench.desktop.main', []),
-		buildfile.base,
-		buildfile.workerExtensionHost,
-		buildfile.workerNotebook,
-		buildfile.workerLanguageDetection,
-		buildfile.workerLocalFileSearch,
-		buildfile.workerProfileAnalysis,
-		buildfile.workbenchDesktop,
-		buildfile.workbenchWeb,
-		buildfile.code
-	].flat().map(x => x.name),
-];
+const skippedExportMangledFiles = function () { // using a function() to ensure late isESM() check
+	return [
+		// Build
+		'css.build',
+
+		// Monaco
+		'editorCommon',
+		'editorOptions',
+		'editorZoom',
+		'standaloneEditor',
+		'standaloneEnums',
+		'standaloneLanguages',
+
+		// Generated
+		'extensionsApiProposals',
+
+		// Module passed around as type
+		'pfs',
+
+		// entry points
+		...isESM() ? [
+			buildfile.entrypoint('vs/server/node/server.main'),
+			buildfile.base,
+			buildfile.workerExtensionHost,
+			buildfile.workerNotebook,
+			buildfile.workerLanguageDetection,
+			buildfile.workerLocalFileSearch,
+			buildfile.workerProfileAnalysis,
+			buildfile.workerOutputLinks,
+			buildfile.workerBackgroundTokenization,
+			buildfile.workbenchDesktop(),
+			buildfile.workbenchWeb(),
+			buildfile.code,
+			buildfile.codeWeb
+		].flat().map(x => x.name) : [
+			buildfile.entrypoint('vs/server/node/server.main'),
+			buildfile.entrypoint('vs/workbench/workbench.desktop.main'),
+			buildfile.base,
+			buildfile.workerExtensionHost,
+			buildfile.workerNotebook,
+			buildfile.workerLanguageDetection,
+			buildfile.workerLocalFileSearch,
+			buildfile.workerProfileAnalysis,
+			buildfile.workbenchDesktop(),
+			buildfile.workbenchWeb(),
+			buildfile.code
+		].flat().map(x => x.name),
+	];
+};
 
 const skippedExportMangledProjects = [
 	// Test projects
@@ -609,7 +625,7 @@ export class Mangler {
 		for (const data of this.allExportedSymbols.values()) {
 			if (data.fileName.endsWith('.d.ts')
 				|| skippedExportMangledProjects.some(proj => data.fileName.includes(proj))
-				|| skippedExportMangledFiles.some(file => data.fileName.endsWith(file + '.ts'))
+				|| skippedExportMangledFiles().some(file => data.fileName.endsWith(file + '.ts'))
 			) {
 				continue;
 			}
diff --git a/build/lib/nls.js b/build/lib/nls.js
index ae235a5a534..3fc4ba3ed61 100644
--- a/build/lib/nls.js
+++ b/build/lib/nls.js
@@ -10,6 +10,8 @@ const event_stream_1 = require("event-stream");
 const File = require("vinyl");
 const sm = require("source-map");
 const path = require("path");
+const sort = require("gulp-sort");
+const esm_1 = require("./esm");
 var CollectStepResult;
 (function (CollectStepResult) {
     CollectStepResult[CollectStepResult["Yes"] = 0] = "Yes";
@@ -44,7 +46,9 @@ function clone(object) {
 function nls(options) {
     let base;
     const input = (0, event_stream_1.through)();
-    const output = input.pipe((0, event_stream_1.through)(function (f) {
+    const output = input
+        .pipe(sort()) // IMPORTANT: to ensure stable NLS metadata generation, we must sort the files because NLS messages are globally extracted and indexed across all files
+        .pipe((0, event_stream_1.through)(function (f) {
         if (!f.sourceMap) {
             return this.emit('error', new Error(`File ${f.relative} does not have sourcemaps.`));
         }
@@ -166,13 +170,23 @@ var _nls;
             .filter(n => n.kind === ts.SyntaxKind.ImportEqualsDeclaration)
             .map(n => n)
             .filter(d => d.moduleReference.kind === ts.SyntaxKind.ExternalModuleReference)
-            .filter(d => d.moduleReference.expression.getText() === '\'vs/nls\'');
+            .filter(d => {
+            if ((0, esm_1.isESM)()) {
+                return d.moduleReference.expression.getText().endsWith(`/nls.js'`);
+            }
+            return d.moduleReference.expression.getText() === '\'vs/nls\'';
+        });
         // import ... from 'vs/nls';
         const importDeclarations = imports
             .filter(n => n.kind === ts.SyntaxKind.ImportDeclaration)
             .map(n => n)
             .filter(d => d.moduleSpecifier.kind === ts.SyntaxKind.StringLiteral)
-            .filter(d => d.moduleSpecifier.getText() === '\'vs/nls\'')
+            .filter(d => {
+            if ((0, esm_1.isESM)()) {
+                return d.moduleSpecifier.getText().endsWith(`/nls.js'`);
+            }
+            return d.moduleSpecifier.getText() === '\'vs/nls\'';
+        })
             .filter(d => !!d.importClause && !!d.importClause.namedBindings);
         // `nls.localize(...)` calls
         const nlsLocalizeCallExpressions = importDeclarations
diff --git a/build/lib/nls.ts b/build/lib/nls.ts
index 066dc1440c2..0a60f74a770 100644
--- a/build/lib/nls.ts
+++ b/build/lib/nls.ts
@@ -8,7 +8,9 @@ import * as lazy from 'lazy.js';
 import { duplex, through } from 'event-stream';
 import * as File from 'vinyl';
 import * as sm from 'source-map';
-import * as  path from 'path';
+import * as path from 'path';
+import * as sort from 'gulp-sort';
+import { isESM } from './esm';
 
 declare class FileSourceMap extends File {
 	public sourceMap: sm.RawSourceMap;
@@ -54,62 +56,64 @@ function clone<T extends object>(object: T): T {
 export function nls(options: { preserveEnglish: boolean }): NodeJS.ReadWriteStream {
 	let base: string;
 	const input = through();
-	const output = input.pipe(through(function (f: FileSourceMap) {
-		if (!f.sourceMap) {
-			return this.emit('error', new Error(`File ${f.relative} does not have sourcemaps.`));
-		}
+	const output = input
+		.pipe(sort()) // IMPORTANT: to ensure stable NLS metadata generation, we must sort the files because NLS messages are globally extracted and indexed across all files
+		.pipe(through(function (f: FileSourceMap) {
+			if (!f.sourceMap) {
+				return this.emit('error', new Error(`File ${f.relative} does not have sourcemaps.`));
+			}
 
-		let source = f.sourceMap.sources[0];
-		if (!source) {
-			return this.emit('error', new Error(`File ${f.relative} does not have a source in the source map.`));
-		}
+			let source = f.sourceMap.sources[0];
+			if (!source) {
+				return this.emit('error', new Error(`File ${f.relative} does not have a source in the source map.`));
+			}
 
-		const root = f.sourceMap.sourceRoot;
-		if (root) {
-			source = path.join(root, source);
-		}
+			const root = f.sourceMap.sourceRoot;
+			if (root) {
+				source = path.join(root, source);
+			}
 
-		const typescript = f.sourceMap.sourcesContent![0];
-		if (!typescript) {
-			return this.emit('error', new Error(`File ${f.relative} does not have the original content in the source map.`));
-		}
+			const typescript = f.sourceMap.sourcesContent![0];
+			if (!typescript) {
+				return this.emit('error', new Error(`File ${f.relative} does not have the original content in the source map.`));
+			}
 
-		base = f.base;
-		this.emit('data', _nls.patchFile(f, typescript, options));
-	}, function () {
-		for (const file of [
-			new File({
-				contents: Buffer.from(JSON.stringify({
-					keys: _nls.moduleToNLSKeys,
-					messages: _nls.moduleToNLSMessages,
-				}, null, '\t')),
-				base,
-				path: `${base}/nls.metadata.json`
-			}),
-			new File({
-				contents: Buffer.from(JSON.stringify(_nls.allNLSMessages)),
-				base,
-				path: `${base}/nls.messages.json`
-			}),
-			new File({
-				contents: Buffer.from(JSON.stringify(_nls.allNLSModulesAndKeys)),
-				base,
-				path: `${base}/nls.keys.json`
-			}),
-			new File({
-				contents: Buffer.from(`/*---------------------------------------------------------
+			base = f.base;
+			this.emit('data', _nls.patchFile(f, typescript, options));
+		}, function () {
+			for (const file of [
+				new File({
+					contents: Buffer.from(JSON.stringify({
+						keys: _nls.moduleToNLSKeys,
+						messages: _nls.moduleToNLSMessages,
+					}, null, '\t')),
+					base,
+					path: `${base}/nls.metadata.json`
+				}),
+				new File({
+					contents: Buffer.from(JSON.stringify(_nls.allNLSMessages)),
+					base,
+					path: `${base}/nls.messages.json`
+				}),
+				new File({
+					contents: Buffer.from(JSON.stringify(_nls.allNLSModulesAndKeys)),
+					base,
+					path: `${base}/nls.keys.json`
+				}),
+				new File({
+					contents: Buffer.from(`/*---------------------------------------------------------
  * Copyright (C) Microsoft Corporation. All rights reserved.
  *--------------------------------------------------------*/
 globalThis._VSCODE_NLS_MESSAGES=${JSON.stringify(_nls.allNLSMessages)};`),
-				base,
-				path: `${base}/nls.messages.js`
-			})
-		]) {
-			this.emit('data', file);
-		}
+					base,
+					path: `${base}/nls.messages.js`
+				})
+			]) {
+				this.emit('data', file);
+			}
 
-		this.emit('end');
-	}));
+			this.emit('end');
+		}));
 
 	return duplex(input, output);
 }
@@ -228,14 +232,24 @@ module _nls {
 			.filter(n => n.kind === ts.SyntaxKind.ImportEqualsDeclaration)
 			.map(n => <ts.ImportEqualsDeclaration>n)
 			.filter(d => d.moduleReference.kind === ts.SyntaxKind.ExternalModuleReference)
-			.filter(d => (<ts.ExternalModuleReference>d.moduleReference).expression.getText() === '\'vs/nls\'');
+			.filter(d => {
+				if (isESM()) {
+					return (<ts.ExternalModuleReference>d.moduleReference).expression.getText().endsWith(`/nls.js'`);
+				}
+				return (<ts.ExternalModuleReference>d.moduleReference).expression.getText() === '\'vs/nls\'';
+			});
 
 		// import ... from 'vs/nls';
 		const importDeclarations = imports
 			.filter(n => n.kind === ts.SyntaxKind.ImportDeclaration)
 			.map(n => <ts.ImportDeclaration>n)
 			.filter(d => d.moduleSpecifier.kind === ts.SyntaxKind.StringLiteral)
-			.filter(d => d.moduleSpecifier.getText() === '\'vs/nls\'')
+			.filter(d => {
+				if (isESM()) {
+					return d.moduleSpecifier.getText().endsWith(`/nls.js'`);
+				}
+				return d.moduleSpecifier.getText() === '\'vs/nls\'';
+			})
 			.filter(d => !!d.importClause && !!d.importClause.namedBindings);
 
 		// `nls.localize(...)` calls
diff --git a/build/lib/optimize.js b/build/lib/optimize.js
index 79509e9a2d5..fdf738576c2 100644
--- a/build/lib/optimize.js
+++ b/build/lib/optimize.js
@@ -15,6 +15,7 @@ const filter = require("gulp-filter");
 const fancyLog = require("fancy-log");
 const ansiColors = require("ansi-colors");
 const path = require("path");
+const fs = require("fs");
 const pump = require("pump");
 const VinylFile = require("vinyl");
 const bundle = require("./bundle");
@@ -22,6 +23,9 @@ const i18n_1 = require("./i18n");
 const stats_1 = require("./stats");
 const util = require("./util");
 const postcss_1 = require("./postcss");
+const esbuild = require("esbuild");
+const sourcemaps = require("gulp-sourcemaps");
+const esm_1 = require("./esm");
 const REPO_ROOT_PATH = path.join(__dirname, '../..');
 function log(prefix, message) {
     fancyLog(ansiColors.cyan('[' + prefix + ']'), message);
@@ -148,12 +152,11 @@ const DEFAULT_FILE_HEADER = [
 ].join('\n');
 function optimizeAMDTask(opts) {
     const src = opts.src;
-    const entryPoints = opts.entryPoints;
+    const entryPoints = opts.entryPoints.filter(d => d.target !== 'esm');
     const resources = opts.resources;
     const loaderConfig = opts.loaderConfig;
     const bundledFileHeader = opts.header || DEFAULT_FILE_HEADER;
     const fileContentMapper = opts.fileContentMapper || ((contents, _path) => contents);
-    const sourcemaps = require('gulp-sourcemaps');
     const bundlesStream = es.through(); // this stream will contain the bundled files
     const resourcesStream = es.through(); // this stream will contain the resources
     const bundleInfoStream = es.through(); // this stream will contain bundleInfo.json
@@ -194,8 +197,122 @@ function optimizeAMDTask(opts) {
         languages: opts.languages
     }) : es.through());
 }
+function optimizeESMTask(opts, cjsOpts) {
+    const resourcesStream = es.through(); // this stream will contain the resources
+    const bundlesStream = es.through(); // this stream will contain the bundled files
+    const entryPoints = opts.entryPoints.filter(d => d.target !== 'amd');
+    if (cjsOpts) {
+        cjsOpts.entryPoints.forEach(entryPoint => entryPoints.push({ name: path.parse(entryPoint).name }));
+    }
+    const allMentionedModules = new Set();
+    for (const entryPoint of entryPoints) {
+        allMentionedModules.add(entryPoint.name);
+        entryPoint.include?.forEach(allMentionedModules.add, allMentionedModules);
+        entryPoint.exclude?.forEach(allMentionedModules.add, allMentionedModules);
+    }
+    allMentionedModules.delete('vs/css'); // TODO@esm remove this when vs/css is removed
+    const bundleAsync = async () => {
+        const files = [];
+        const tasks = [];
+        for (const entryPoint of entryPoints) {
+            console.log(`[bundle] '${entryPoint.name}'`);
+            // support for 'dest' via esbuild#in/out
+            const dest = entryPoint.dest?.replace(/\.[^/.]+$/, '') ?? entryPoint.name;
+            // boilerplate massage
+            const banner = { js: '' };
+            const tslibPath = path.join(require.resolve('tslib'), '../tslib.es6.js');
+            banner.js += await fs.promises.readFile(tslibPath, 'utf-8');
+            const boilerplateTrimmer = {
+                name: 'boilerplate-trimmer',
+                setup(build) {
+                    build.onLoad({ filter: /\.js$/ }, async (args) => {
+                        const contents = await fs.promises.readFile(args.path, 'utf-8');
+                        const newContents = bundle.removeAllTSBoilerplate(contents);
+                        return { contents: newContents };
+                    });
+                }
+            };
+            // support for 'preprend' via the esbuild#banner
+            if (entryPoint.prepend?.length) {
+                for (const item of entryPoint.prepend) {
+                    const fullpath = path.join(REPO_ROOT_PATH, opts.src, item.path);
+                    const source = await fs.promises.readFile(fullpath, 'utf8');
+                    banner.js += source + '\n';
+                }
+            }
+            const task = esbuild.build({
+                bundle: true,
+                external: entryPoint.exclude,
+                packages: 'external', // "external all the things", see https://esbuild.github.io/api/#packages
+                platform: 'neutral', // makes esm
+                format: 'esm',
+                plugins: [boilerplateTrimmer],
+                target: ['es2022'],
+                loader: {
+                    '.ttf': 'file',
+                    '.svg': 'file',
+                    '.png': 'file',
+                    '.sh': 'file',
+                },
+                assetNames: 'media/[name]', // moves media assets into a sub-folder "media"
+                banner,
+                entryPoints: [
+                    {
+                        in: path.join(REPO_ROOT_PATH, opts.src, `${entryPoint.name}.js`),
+                        out: dest,
+                    }
+                ],
+                outdir: path.join(REPO_ROOT_PATH, opts.src),
+                write: false, // enables res.outputFiles
+                metafile: true, // enables res.metafile
+            }).then(res => {
+                for (const file of res.outputFiles) {
+                    let contents = file.contents;
+                    if (file.path.endsWith('.js')) {
+                        if (opts.fileContentMapper) {
+                            // UGLY the fileContentMapper is per file but at this point we have all files
+                            // bundled already. So, we call the mapper for the same contents but each file
+                            // that has been included in the bundle...
+                            let newText = file.text;
+                            for (const input of Object.keys(res.metafile.inputs)) {
+                                newText = opts.fileContentMapper(newText, input);
+                            }
+                            contents = Buffer.from(newText);
+                        }
+                    }
+                    files.push(new VinylFile({
+                        contents: Buffer.from(contents),
+                        path: file.path,
+                        base: path.join(REPO_ROOT_PATH, opts.src)
+                    }));
+                }
+            });
+            // await task; // FORCE serial bundling (makes debugging easier)
+            tasks.push(task);
+        }
+        await Promise.all(tasks);
+        return { files };
+    };
+    bundleAsync().then((output) => {
+        // bundle output (JS, CSS, SVG...)
+        es.readArray(output.files).pipe(bundlesStream);
+        // forward all resources
+        gulp.src(opts.resources, { base: `${opts.src}`, allowEmpty: true }).pipe(resourcesStream);
+    });
+    const result = es.merge(bundlesStream, resourcesStream);
+    return result
+        .pipe(sourcemaps.write('./', {
+        sourceRoot: undefined,
+        addComment: true,
+        includeContent: true
+    }))
+        .pipe(opts.languages && opts.languages.length ? (0, i18n_1.processNlsFiles)({
+        out: opts.src,
+        fileHeader: opts.header || DEFAULT_FILE_HEADER,
+        languages: opts.languages
+    }) : es.through());
+}
 function optimizeCommonJSTask(opts) {
-    const esbuild = require('esbuild');
     const src = opts.src;
     const entryPoints = opts.entryPoints;
     return gulp.src(entryPoints, { base: `${src}`, allowEmpty: true })
@@ -226,9 +343,15 @@ function optimizeLoaderTask(src, out, bundleLoader, bundledFileHeader = '', exte
 }
 function optimizeTask(opts) {
     return function () {
-        const optimizers = [optimizeAMDTask(opts.amd)];
-        if (opts.commonJS) {
-            optimizers.push(optimizeCommonJSTask(opts.commonJS));
+        const optimizers = [];
+        if ((0, esm_1.isESM)('Running optimizer in ESM mode')) {
+            optimizers.push(optimizeESMTask(opts.amd, opts.commonJS));
+        }
+        else {
+            optimizers.push(optimizeAMDTask(opts.amd));
+            if (opts.commonJS) {
+                optimizers.push(optimizeCommonJSTask(opts.commonJS));
+            }
         }
         if (opts.manual) {
             optimizers.push(optimizeManualTask(opts.manual));
@@ -237,11 +360,9 @@ function optimizeTask(opts) {
     };
 }
 function minifyTask(src, sourceMapBaseUrl) {
-    const esbuild = require('esbuild');
     const sourceMappingURL = sourceMapBaseUrl ? ((f) => `${sourceMapBaseUrl}/${f.relative}.map`) : undefined;
     return cb => {
         const cssnano = require('cssnano');
-        const sourcemaps = require('gulp-sourcemaps');
         const svgmin = require('gulp-svgmin');
         const jsFilter = filter('**/*.js', { restore: true });
         const cssFilter = filter('**/*.css', { restore: true });
@@ -253,7 +374,7 @@ function minifyTask(src, sourceMapBaseUrl) {
                 sourcemap: 'external',
                 outdir: '.',
                 platform: 'node',
-                target: ['esnext'],
+                target: ['es2022'],
                 write: false
             }).then(res => {
                 const jsFile = res.outputFiles.find(f => /\.js$/.test(f.path));
diff --git a/build/lib/optimize.ts b/build/lib/optimize.ts
index 6f9786b4d1e..c7503213456 100644
--- a/build/lib/optimize.ts
+++ b/build/lib/optimize.ts
@@ -10,6 +10,7 @@ import * as filter from 'gulp-filter';
 import * as fancyLog from 'fancy-log';
 import * as ansiColors from 'ansi-colors';
 import * as path from 'path';
+import * as fs from 'fs';
 import * as pump from 'pump';
 import * as VinylFile from 'vinyl';
 import * as bundle from './bundle';
@@ -17,6 +18,9 @@ import { Language, processNlsFiles } from './i18n';
 import { createStatsStream } from './stats';
 import * as util from './util';
 import { gulpPostcss } from './postcss';
+import * as esbuild from 'esbuild';
+import * as sourcemaps from 'gulp-sourcemaps';
+import { isESM } from './esm';
 
 const REPO_ROOT_PATH = path.join(__dirname, '../..');
 
@@ -213,14 +217,12 @@ const DEFAULT_FILE_HEADER = [
 
 function optimizeAMDTask(opts: IOptimizeAMDTaskOpts): NodeJS.ReadWriteStream {
 	const src = opts.src;
-	const entryPoints = opts.entryPoints;
+	const entryPoints = opts.entryPoints.filter(d => d.target !== 'esm');
 	const resources = opts.resources;
 	const loaderConfig = opts.loaderConfig;
 	const bundledFileHeader = opts.header || DEFAULT_FILE_HEADER;
 	const fileContentMapper = opts.fileContentMapper || ((contents: string, _path: string) => contents);
 
-	const sourcemaps = require('gulp-sourcemaps') as typeof import('gulp-sourcemaps');
-
 	const bundlesStream = es.through(); // this stream will contain the bundled files
 	const resourcesStream = es.through(); // this stream will contain the resources
 	const bundleInfoStream = es.through(); // this stream will contain bundleInfo.json
@@ -271,6 +273,149 @@ function optimizeAMDTask(opts: IOptimizeAMDTaskOpts): NodeJS.ReadWriteStream {
 		}) : es.through());
 }
 
+function optimizeESMTask(opts: IOptimizeAMDTaskOpts, cjsOpts?: IOptimizeCommonJSTaskOpts): NodeJS.ReadWriteStream {
+	const resourcesStream = es.through(); // this stream will contain the resources
+	const bundlesStream = es.through(); // this stream will contain the bundled files
+
+	const entryPoints = opts.entryPoints.filter(d => d.target !== 'amd');
+	if (cjsOpts) {
+		cjsOpts.entryPoints.forEach(entryPoint => entryPoints.push({ name: path.parse(entryPoint).name }));
+	}
+
+	const allMentionedModules = new Set<string>();
+	for (const entryPoint of entryPoints) {
+		allMentionedModules.add(entryPoint.name);
+		entryPoint.include?.forEach(allMentionedModules.add, allMentionedModules);
+		entryPoint.exclude?.forEach(allMentionedModules.add, allMentionedModules);
+	}
+
+	allMentionedModules.delete('vs/css'); // TODO@esm remove this when vs/css is removed
+
+	const bundleAsync = async () => {
+
+		const files: VinylFile[] = [];
+		const tasks: Promise<any>[] = [];
+
+		for (const entryPoint of entryPoints) {
+
+			console.log(`[bundle] '${entryPoint.name}'`);
+
+			// support for 'dest' via esbuild#in/out
+			const dest = entryPoint.dest?.replace(/\.[^/.]+$/, '') ?? entryPoint.name;
+
+			// boilerplate massage
+			const banner = { js: '' };
+			const tslibPath = path.join(require.resolve('tslib'), '../tslib.es6.js');
+			banner.js += await fs.promises.readFile(tslibPath, 'utf-8');
+
+			const boilerplateTrimmer: esbuild.Plugin = {
+				name: 'boilerplate-trimmer',
+				setup(build) {
+					build.onLoad({ filter: /\.js$/ }, async args => {
+						const contents = await fs.promises.readFile(args.path, 'utf-8');
+						const newContents = bundle.removeAllTSBoilerplate(contents);
+						return { contents: newContents };
+					});
+				}
+			};
+
+			// support for 'preprend' via the esbuild#banner
+			if (entryPoint.prepend?.length) {
+				for (const item of entryPoint.prepend) {
+					const fullpath = path.join(REPO_ROOT_PATH, opts.src, item.path);
+					const source = await fs.promises.readFile(fullpath, 'utf8');
+					banner.js += source + '\n';
+				}
+			}
+
+			const task = esbuild.build({
+				bundle: true,
+				external: entryPoint.exclude,
+				packages: 'external', // "external all the things", see https://esbuild.github.io/api/#packages
+				platform: 'neutral', // makes esm
+				format: 'esm',
+				plugins: [boilerplateTrimmer],
+				target: ['es2022'],
+				loader: {
+					'.ttf': 'file',
+					'.svg': 'file',
+					'.png': 'file',
+					'.sh': 'file',
+				},
+				assetNames: 'media/[name]', // moves media assets into a sub-folder "media"
+				banner,
+				entryPoints: [
+					{
+						in: path.join(REPO_ROOT_PATH, opts.src, `${entryPoint.name}.js`),
+						out: dest,
+					}
+				],
+				outdir: path.join(REPO_ROOT_PATH, opts.src),
+				write: false, // enables res.outputFiles
+				metafile: true, // enables res.metafile
+
+			}).then(res => {
+				for (const file of res.outputFiles) {
+
+					let contents = file.contents;
+
+					if (file.path.endsWith('.js')) {
+
+						if (opts.fileContentMapper) {
+							// UGLY the fileContentMapper is per file but at this point we have all files
+							// bundled already. So, we call the mapper for the same contents but each file
+							// that has been included in the bundle...
+							let newText = file.text;
+							for (const input of Object.keys(res.metafile.inputs)) {
+								newText = opts.fileContentMapper(newText, input);
+							}
+							contents = Buffer.from(newText);
+						}
+					}
+
+					files.push(new VinylFile({
+						contents: Buffer.from(contents),
+						path: file.path,
+						base: path.join(REPO_ROOT_PATH, opts.src)
+					}));
+				}
+			});
+
+			// await task; // FORCE serial bundling (makes debugging easier)
+			tasks.push(task);
+		}
+
+		await Promise.all(tasks);
+		return { files };
+	};
+
+	bundleAsync().then((output) => {
+
+		// bundle output (JS, CSS, SVG...)
+		es.readArray(output.files).pipe(bundlesStream);
+
+		// forward all resources
+		gulp.src(opts.resources, { base: `${opts.src}`, allowEmpty: true }).pipe(resourcesStream);
+	});
+
+	const result = es.merge(
+		bundlesStream,
+		resourcesStream
+	);
+
+	return result
+		.pipe(sourcemaps.write('./', {
+			sourceRoot: undefined,
+			addComment: true,
+			includeContent: true
+		}))
+		.pipe(opts.languages && opts.languages.length ? processNlsFiles({
+			out: opts.src,
+			fileHeader: opts.header || DEFAULT_FILE_HEADER,
+			languages: opts.languages
+		}) : es.through());
+}
+
 export interface IOptimizeCommonJSTaskOpts {
 	/**
 	 * The paths to consider for optimizing.
@@ -291,8 +436,6 @@ export interface IOptimizeCommonJSTaskOpts {
 }
 
 function optimizeCommonJSTask(opts: IOptimizeCommonJSTaskOpts): NodeJS.ReadWriteStream {
-	const esbuild = require('esbuild') as typeof import('esbuild');
-
 	const src = opts.src;
 	const entryPoints = opts.entryPoints;
 
@@ -360,9 +503,15 @@ export interface IOptimizeTaskOpts {
 
 export function optimizeTask(opts: IOptimizeTaskOpts): () => NodeJS.ReadWriteStream {
 	return function () {
-		const optimizers = [optimizeAMDTask(opts.amd)];
-		if (opts.commonJS) {
-			optimizers.push(optimizeCommonJSTask(opts.commonJS));
+		const optimizers: NodeJS.ReadWriteStream[] = [];
+		if (isESM('Running optimizer in ESM mode')) {
+			optimizers.push(optimizeESMTask(opts.amd, opts.commonJS));
+		} else {
+			optimizers.push(optimizeAMDTask(opts.amd));
+
+			if (opts.commonJS) {
+				optimizers.push(optimizeCommonJSTask(opts.commonJS));
+			}
 		}
 
 		if (opts.manual) {
@@ -374,12 +523,10 @@ export function optimizeTask(opts: IOptimizeTaskOpts): () => NodeJS.ReadWriteStr
 }
 
 export function minifyTask(src: string, sourceMapBaseUrl?: string): (cb: any) => void {
-	const esbuild = require('esbuild') as typeof import('esbuild');
 	const sourceMappingURL = sourceMapBaseUrl ? ((f: any) => `${sourceMapBaseUrl}/${f.relative}.map`) : undefined;
 
 	return cb => {
 		const cssnano = require('cssnano') as typeof import('cssnano');
-		const sourcemaps = require('gulp-sourcemaps') as typeof import('gulp-sourcemaps');
 		const svgmin = require('gulp-svgmin') as typeof import('gulp-svgmin');
 
 		const jsFilter = filter('**/*.js', { restore: true });
@@ -397,7 +544,7 @@ export function minifyTask(src: string, sourceMapBaseUrl?: string): (cb: any) =>
 					sourcemap: 'external',
 					outdir: '.',
 					platform: 'node',
-					target: ['esnext'],
+					target: ['es2022'],
 					write: false
 				}).then(res => {
 					const jsFile = res.outputFiles.find(f => /\.js$/.test(f.path))!;
diff --git a/build/lib/standalone.js b/build/lib/standalone.js
index cf0e452aff3..78030842569 100644
--- a/build/lib/standalone.js
+++ b/build/lib/standalone.js
@@ -131,7 +131,7 @@ function createESMSourcesAndResources2(options) {
         }
         if (file === 'tsconfig.json') {
             const tsConfig = JSON.parse(fs.readFileSync(path.join(SRC_FOLDER, file)).toString());
-            tsConfig.compilerOptions.module = 'es6';
+            tsConfig.compilerOptions.module = 'es2022';
             tsConfig.compilerOptions.outDir = path.join(path.relative(OUT_FOLDER, OUT_RESOURCES_FOLDER), 'vs').replace(/\\/g, '/');
             write(getDestAbsoluteFilePath(file), JSON.stringify(tsConfig, null, '\t'));
             continue;
diff --git a/build/lib/standalone.ts b/build/lib/standalone.ts
index 9a65bfa7444..e1b9db65e12 100644
--- a/build/lib/standalone.ts
+++ b/build/lib/standalone.ts
@@ -157,7 +157,7 @@ export function createESMSourcesAndResources2(options: IOptions2): void {
 
 		if (file === 'tsconfig.json') {
 			const tsConfig = JSON.parse(fs.readFileSync(path.join(SRC_FOLDER, file)).toString());
-			tsConfig.compilerOptions.module = 'es6';
+			tsConfig.compilerOptions.module = 'es2022';
 			tsConfig.compilerOptions.outDir = path.join(path.relative(OUT_FOLDER, OUT_RESOURCES_FOLDER), 'vs').replace(/\\/g, '/');
 			write(getDestAbsoluteFilePath(file), JSON.stringify(tsConfig, null, '\t'));
 			continue;
diff --git a/build/lib/stylelint/vscode-known-variables.json b/build/lib/stylelint/vscode-known-variables.json
index 8bca0f668d0..dbd1ecbf4db 100644
--- a/build/lib/stylelint/vscode-known-variables.json
+++ b/build/lib/stylelint/vscode-known-variables.json
@@ -35,13 +35,6 @@
 		"--vscode-button-secondaryForeground",
 		"--vscode-button-secondaryHoverBackground",
 		"--vscode-button-separator",
-		"--vscode-radio-inactiveForeground",
-		"--vscode-radio-inactiveBackground",
-		"--vscode-radio-inactiveBorder",
-		"--vscode-radio-activeForeground",
-		"--vscode-radio-activeBackground",
-		"--vscode-radio-activeBorder",
-		"--vscode-radio-inactiveHoverBackground",
 		"--vscode-charts-blue",
 		"--vscode-charts-foreground",
 		"--vscode-charts-green",
@@ -262,6 +255,10 @@
 		"--vscode-editorLightBulb-foreground",
 		"--vscode-editorLightBulbAi-foreground",
 		"--vscode-editorLightBulbAutoFix-foreground",
+		"--vscode-editorActionList-background",
+		"--vscode-editorActionList-foreground",
+		"--vscode-editorActionList-focusForeground",
+		"--vscode-editorActionList-focusBackground",
 		"--vscode-editorLineNumber-activeForeground",
 		"--vscode-editorLineNumber-dimmedForeground",
 		"--vscode-editorLineNumber-foreground",
@@ -346,7 +343,7 @@
 		"--vscode-icon-foreground",
 		"--vscode-inlineChat-background",
 		"--vscode-inlineChat-border",
-		"--vscode-inlineChat-regionHighlight",
+		"--vscode-inlineChat-foreground",
 		"--vscode-inlineChat-shadow",
 		"--vscode-inlineChatDiff-inserted",
 		"--vscode-inlineChatDiff-removed",
@@ -707,7 +704,21 @@
 		"--vscode-quickInputList-focusForeground",
 		"--vscode-quickInputList-focusIconForeground",
 		"--vscode-quickInputTitle-background",
+		"--vscode-radio-activeBackground",
+		"--vscode-radio-activeBorder",
+		"--vscode-radio-activeForeground",
+		"--vscode-radio-inactiveBackground",
+		"--vscode-radio-inactiveBorder",
+		"--vscode-radio-inactiveForeground",
+		"--vscode-radio-inactiveHoverBackground",
 		"--vscode-sash-hoverBorder",
+		"--vscode-scm-historyGraph-green",
+		"--vscode-scm-historyGraph-historyItemGroupBase",
+		"--vscode-scm-historyGraph-historyItemGroupHoverLabelForeground",
+		"--vscode-scm-historyGraph-historyItemGroupLocal",
+		"--vscode-scm-historyGraph-historyItemGroupRemote",
+		"--vscode-scm-historyGraph-red",
+		"--vscode-scm-historyGraph-yellow",
 		"--vscode-scm-historyItemAdditionsForeground",
 		"--vscode-scm-historyItemDeletionsForeground",
 		"--vscode-scm-historyItemSelectedStatisticsBorder",
@@ -887,8 +898,10 @@
 		"--vscode-terminalCommandDecoration-defaultBackground",
 		"--vscode-terminalCommandDecoration-errorBackground",
 		"--vscode-terminalCommandDecoration-successBackground",
+		"--vscode-terminalCommandGuide-foreground",
 		"--vscode-terminalCursor-background",
 		"--vscode-terminalCursor-foreground",
+		"--vscode-terminalOverviewRuler-border",
 		"--vscode-terminalOverviewRuler-cursorForeground",
 		"--vscode-terminalOverviewRuler-findMatchForeground",
 		"--vscode-terminalStickyScroll-background",
@@ -987,6 +1000,7 @@
 		"--testMessageDecorationFontFamily",
 		"--testMessageDecorationFontSize",
 		"--title-border-bottom-color",
+		"--title-wco-width",
 		"--vscode-chat-list-background",
 		"--vscode-editorCodeLens-fontFamily",
 		"--vscode-editorCodeLens-fontFamilyDefault",
diff --git a/build/lib/treeshaking.js b/build/lib/treeshaking.js
index c8e95511877..842f691af8f 100644
--- a/build/lib/treeshaking.js
+++ b/build/lib/treeshaking.js
@@ -100,24 +100,22 @@ function discoverAndReadFiles(ts, options) {
     options.entryPoints.forEach((entryPoint) => enqueue(entryPoint));
     while (queue.length > 0) {
         const moduleId = queue.shift();
-        const dts_filename = path.join(options.sourcesRoot, moduleId + '.d.ts');
+        let redirectedModuleId = moduleId;
+        if (options.redirects[moduleId]) {
+            redirectedModuleId = options.redirects[moduleId];
+        }
+        const dts_filename = path.join(options.sourcesRoot, redirectedModuleId + '.d.ts');
         if (fs.existsSync(dts_filename)) {
             const dts_filecontents = fs.readFileSync(dts_filename).toString();
             FILES[`${moduleId}.d.ts`] = dts_filecontents;
             continue;
         }
-        const js_filename = path.join(options.sourcesRoot, moduleId + '.js');
+        const js_filename = path.join(options.sourcesRoot, redirectedModuleId + '.js');
         if (fs.existsSync(js_filename)) {
             // This is an import for a .js file, so ignore it...
             continue;
         }
-        let ts_filename;
-        if (options.redirects[moduleId]) {
-            ts_filename = path.join(options.sourcesRoot, options.redirects[moduleId] + '.ts');
-        }
-        else {
-            ts_filename = path.join(options.sourcesRoot, moduleId + '.ts');
-        }
+        const ts_filename = path.join(options.sourcesRoot, redirectedModuleId + '.ts');
         const ts_filecontents = fs.readFileSync(ts_filename).toString();
         const info = ts.preProcessFile(ts_filecontents);
         for (let i = info.importedFiles.length - 1; i >= 0; i--) {
diff --git a/build/lib/treeshaking.ts b/build/lib/treeshaking.ts
index 020e567eb72..d01b34d264f 100644
--- a/build/lib/treeshaking.ts
+++ b/build/lib/treeshaking.ts
@@ -155,25 +155,27 @@ function discoverAndReadFiles(ts: typeof import('typescript'), options: ITreeSha
 
 	while (queue.length > 0) {
 		const moduleId = queue.shift()!;
-		const dts_filename = path.join(options.sourcesRoot, moduleId + '.d.ts');
+		let redirectedModuleId: string = moduleId;
+		if (options.redirects[moduleId]) {
+			redirectedModuleId = options.redirects[moduleId];
+		}
+
+		const dts_filename = path.join(options.sourcesRoot, redirectedModuleId + '.d.ts');
 		if (fs.existsSync(dts_filename)) {
 			const dts_filecontents = fs.readFileSync(dts_filename).toString();
 			FILES[`${moduleId}.d.ts`] = dts_filecontents;
 			continue;
 		}
 
-		const js_filename = path.join(options.sourcesRoot, moduleId + '.js');
+
+		const js_filename = path.join(options.sourcesRoot, redirectedModuleId + '.js');
 		if (fs.existsSync(js_filename)) {
 			// This is an import for a .js file, so ignore it...
 			continue;
 		}
 
-		let ts_filename: string;
-		if (options.redirects[moduleId]) {
-			ts_filename = path.join(options.sourcesRoot, options.redirects[moduleId] + '.ts');
-		} else {
-			ts_filename = path.join(options.sourcesRoot, moduleId + '.ts');
-		}
+		const ts_filename = path.join(options.sourcesRoot, redirectedModuleId + '.ts');
+
 		const ts_filecontents = fs.readFileSync(ts_filename).toString();
 		const info = ts.preProcessFile(ts_filecontents);
 		for (let i = info.importedFiles.length - 1; i >= 0; i--) {
diff --git a/build/linux/debian/dep-lists.js b/build/linux/debian/dep-lists.js
index 3a642a72725..3bb58fb1215 100644
--- a/build/linux/debian/dep-lists.js
+++ b/build/linux/debian/dep-lists.js
@@ -40,10 +40,8 @@ exports.referenceGeneratedDepsByArch = {
         'libexpat1 (>= 2.1~beta3)',
         'libgbm1 (>= 17.1.0~rc2)',
         'libglib2.0-0 (>= 2.37.3)',
-        'libgssapi-krb5-2 (>= 1.17)',
         'libgtk-3-0 (>= 3.9.10)',
         'libgtk-3-0 (>= 3.9.10) | libgtk-4-1',
-        'libkrb5-3 (>= 1.6.dfsg.2)',
         'libnspr4 (>= 2:4.9-2~)',
         'libnss3 (>= 2:3.30)',
         'libnss3 (>= 3.26)',
@@ -79,10 +77,8 @@ exports.referenceGeneratedDepsByArch = {
         'libexpat1 (>= 2.1~beta3)',
         'libgbm1 (>= 17.1.0~rc2)',
         'libglib2.0-0 (>= 2.37.3)',
-        'libgssapi-krb5-2 (>= 1.17)',
         'libgtk-3-0 (>= 3.9.10)',
         'libgtk-3-0 (>= 3.9.10) | libgtk-4-1',
-        'libkrb5-3 (>= 1.6.dfsg.2)',
         'libnspr4 (>= 2:4.9-2~)',
         'libnss3 (>= 2:3.30)',
         'libnss3 (>= 3.26)',
@@ -119,10 +115,8 @@ exports.referenceGeneratedDepsByArch = {
         'libexpat1 (>= 2.1~beta3)',
         'libgbm1 (>= 17.1.0~rc2)',
         'libglib2.0-0 (>= 2.37.3)',
-        'libgssapi-krb5-2 (>= 1.17)',
         'libgtk-3-0 (>= 3.9.10)',
         'libgtk-3-0 (>= 3.9.10) | libgtk-4-1',
-        'libkrb5-3 (>= 1.6.dfsg.2)',
         'libnspr4 (>= 2:4.9-2~)',
         'libnss3 (>= 2:3.30)',
         'libnss3 (>= 3.26)',
diff --git a/build/linux/debian/dep-lists.ts b/build/linux/debian/dep-lists.ts
index 86d1de12216..e3d78d1139a 100644
--- a/build/linux/debian/dep-lists.ts
+++ b/build/linux/debian/dep-lists.ts
@@ -40,10 +40,8 @@ export const referenceGeneratedDepsByArch = {
 		'libexpat1 (>= 2.1~beta3)',
 		'libgbm1 (>= 17.1.0~rc2)',
 		'libglib2.0-0 (>= 2.37.3)',
-		'libgssapi-krb5-2 (>= 1.17)',
 		'libgtk-3-0 (>= 3.9.10)',
 		'libgtk-3-0 (>= 3.9.10) | libgtk-4-1',
-		'libkrb5-3 (>= 1.6.dfsg.2)',
 		'libnspr4 (>= 2:4.9-2~)',
 		'libnss3 (>= 2:3.30)',
 		'libnss3 (>= 3.26)',
@@ -79,10 +77,8 @@ export const referenceGeneratedDepsByArch = {
 		'libexpat1 (>= 2.1~beta3)',
 		'libgbm1 (>= 17.1.0~rc2)',
 		'libglib2.0-0 (>= 2.37.3)',
-		'libgssapi-krb5-2 (>= 1.17)',
 		'libgtk-3-0 (>= 3.9.10)',
 		'libgtk-3-0 (>= 3.9.10) | libgtk-4-1',
-		'libkrb5-3 (>= 1.6.dfsg.2)',
 		'libnspr4 (>= 2:4.9-2~)',
 		'libnss3 (>= 2:3.30)',
 		'libnss3 (>= 3.26)',
@@ -119,10 +115,8 @@ export const referenceGeneratedDepsByArch = {
 		'libexpat1 (>= 2.1~beta3)',
 		'libgbm1 (>= 17.1.0~rc2)',
 		'libglib2.0-0 (>= 2.37.3)',
-		'libgssapi-krb5-2 (>= 1.17)',
 		'libgtk-3-0 (>= 3.9.10)',
 		'libgtk-3-0 (>= 3.9.10) | libgtk-4-1',
-		'libkrb5-3 (>= 1.6.dfsg.2)',
 		'libnspr4 (>= 2:4.9-2~)',
 		'libnss3 (>= 2:3.30)',
 		'libnss3 (>= 3.26)',
diff --git a/build/linux/dependencies-generator.js b/build/linux/dependencies-generator.js
index 604094b52b6..ea58140f6c6 100644
--- a/build/linux/dependencies-generator.js
+++ b/build/linux/dependencies-generator.js
@@ -19,6 +19,7 @@ const types_2 = require("./rpm/types");
 // which we don't need.
 // import product = require('../../product.json');
 // --- End Positron --
+const esm_1 = require("../lib/esm");
 // A flag that can easily be toggled.
 // Make sure to compile the build directory after toggling the value.
 // If false, we warn about new dependencies if they show up
@@ -51,7 +52,8 @@ async function getDependencies(packageType, buildDir, applicationName, arch) {
         throw new Error('Invalid RPM arch string ' + arch);
     }
     // Get the files for which we want to find dependencies.
-    const nativeModulesPath = path.join(buildDir, 'resources', 'app', 'node_modules.asar.unpacked');
+    const canAsar = !(0, esm_1.isESM)('ASAR disabled in Linux builds'); // TODO@esm ASAR disabled in ESM
+    const nativeModulesPath = path.join(buildDir, 'resources', 'app', canAsar ? 'node_modules.asar.unpacked' : 'node_modules');
     const findResult = (0, child_process_1.spawnSync)('find', [nativeModulesPath, '-name', '*.node']);
     if (findResult.status) {
         console.error('Error finding files:');
diff --git a/build/linux/dependencies-generator.ts b/build/linux/dependencies-generator.ts
index 20cc15c62e1..5ac87a2a1e2 100644
--- a/build/linux/dependencies-generator.ts
+++ b/build/linux/dependencies-generator.ts
@@ -19,6 +19,7 @@ import { isRpmArchString, RpmArchString } from './rpm/types';
 // which we don't need.
 // import product = require('../../product.json');
 // --- End Positron --
+import { isESM } from '../lib/esm';
 
 // A flag that can easily be toggled.
 // Make sure to compile the build directory after toggling the value.
@@ -55,7 +56,8 @@ export async function getDependencies(packageType: 'deb' | 'rpm', buildDir: stri
 	}
 
 	// Get the files for which we want to find dependencies.
-	const nativeModulesPath = path.join(buildDir, 'resources', 'app', 'node_modules.asar.unpacked');
+	const canAsar = !isESM('ASAR disabled in Linux builds'); // TODO@esm ASAR disabled in ESM
+	const nativeModulesPath = path.join(buildDir, 'resources', 'app', canAsar ? 'node_modules.asar.unpacked' : 'node_modules');
 	const findResult = spawnSync('find', [nativeModulesPath, '-name', '*.node']);
 	if (findResult.status) {
 		console.error('Error finding files:');
diff --git a/build/linux/rpm/dep-lists.js b/build/linux/rpm/dep-lists.js
index 97984514511..fa393808c53 100644
--- a/build/linux/rpm/dep-lists.js
+++ b/build/linux/rpm/dep-lists.js
@@ -73,11 +73,7 @@ exports.referenceGeneratedDepsByArch = {
         'libgio-2.0.so.0()(64bit)',
         'libglib-2.0.so.0()(64bit)',
         'libgobject-2.0.so.0()(64bit)',
-        'libgssapi_krb5.so.2()(64bit)',
-        'libgssapi_krb5.so.2(gssapi_krb5_2_MIT)(64bit)',
         'libgtk-3.so.0()(64bit)',
-        'libkrb5.so.3()(64bit)',
-        'libkrb5.so.3(krb5_3_MIT)(64bit)',
         'libm.so.6()(64bit)',
         'libm.so.6(GLIBC_2.2.5)(64bit)',
         'libnspr4.so()(64bit)',
@@ -166,12 +162,8 @@ exports.referenceGeneratedDepsByArch = {
         'libgio-2.0.so.0',
         'libglib-2.0.so.0',
         'libgobject-2.0.so.0',
-        'libgssapi_krb5.so.2',
-        'libgssapi_krb5.so.2(gssapi_krb5_2_MIT)',
         'libgtk-3.so.0',
         'libgtk-3.so.0()(64bit)',
-        'libkrb5.so.3',
-        'libkrb5.so.3(krb5_3_MIT)',
         'libm.so.6',
         'libm.so.6(GLIBC_2.4)',
         'libnspr4.so',
@@ -264,11 +256,7 @@ exports.referenceGeneratedDepsByArch = {
         'libgio-2.0.so.0()(64bit)',
         'libglib-2.0.so.0()(64bit)',
         'libgobject-2.0.so.0()(64bit)',
-        'libgssapi_krb5.so.2()(64bit)',
-        'libgssapi_krb5.so.2(gssapi_krb5_2_MIT)(64bit)',
         'libgtk-3.so.0()(64bit)',
-        'libkrb5.so.3()(64bit)',
-        'libkrb5.so.3(krb5_3_MIT)(64bit)',
         'libm.so.6()(64bit)',
         'libm.so.6(GLIBC_2.17)(64bit)',
         'libnspr4.so()(64bit)',
diff --git a/build/linux/rpm/dep-lists.ts b/build/linux/rpm/dep-lists.ts
index b79812784bf..9eed3a79f7e 100644
--- a/build/linux/rpm/dep-lists.ts
+++ b/build/linux/rpm/dep-lists.ts
@@ -72,11 +72,7 @@ export const referenceGeneratedDepsByArch = {
 		'libgio-2.0.so.0()(64bit)',
 		'libglib-2.0.so.0()(64bit)',
 		'libgobject-2.0.so.0()(64bit)',
-		'libgssapi_krb5.so.2()(64bit)',
-		'libgssapi_krb5.so.2(gssapi_krb5_2_MIT)(64bit)',
 		'libgtk-3.so.0()(64bit)',
-		'libkrb5.so.3()(64bit)',
-		'libkrb5.so.3(krb5_3_MIT)(64bit)',
 		'libm.so.6()(64bit)',
 		'libm.so.6(GLIBC_2.2.5)(64bit)',
 		'libnspr4.so()(64bit)',
@@ -165,12 +161,8 @@ export const referenceGeneratedDepsByArch = {
 		'libgio-2.0.so.0',
 		'libglib-2.0.so.0',
 		'libgobject-2.0.so.0',
-		'libgssapi_krb5.so.2',
-		'libgssapi_krb5.so.2(gssapi_krb5_2_MIT)',
 		'libgtk-3.so.0',
 		'libgtk-3.so.0()(64bit)',
-		'libkrb5.so.3',
-		'libkrb5.so.3(krb5_3_MIT)',
 		'libm.so.6',
 		'libm.so.6(GLIBC_2.4)',
 		'libnspr4.so',
@@ -263,11 +255,7 @@ export const referenceGeneratedDepsByArch = {
 		'libgio-2.0.so.0()(64bit)',
 		'libglib-2.0.so.0()(64bit)',
 		'libgobject-2.0.so.0()(64bit)',
-		'libgssapi_krb5.so.2()(64bit)',
-		'libgssapi_krb5.so.2(gssapi_krb5_2_MIT)(64bit)',
 		'libgtk-3.so.0()(64bit)',
-		'libkrb5.so.3()(64bit)',
-		'libkrb5.so.3(krb5_3_MIT)(64bit)',
 		'libm.so.6()(64bit)',
 		'libm.so.6(GLIBC_2.17)(64bit)',
 		'libnspr4.so()(64bit)',
diff --git a/build/monaco/monaco.d.ts.recipe b/build/monaco/monaco.d.ts.recipe
index a6eb3b7128f..ef5c2e39ae5 100644
--- a/build/monaco/monaco.d.ts.recipe
+++ b/build/monaco/monaco.d.ts.recipe
@@ -92,7 +92,7 @@ declare namespace monaco.editor {
 #includeAll(vs/editor/standalone/browser/standaloneEditor;languages.Token=>Token):
 #include(vs/editor/standalone/common/standaloneTheme): BuiltinTheme, IStandaloneThemeData, IColors
 #include(vs/editor/common/languages/supports/tokenization): ITokenThemeRule
-#include(vs/editor/browser/services/webWorker): MonacoWebWorker, IWebWorkerOptions
+#include(vs/editor/standalone/browser/standaloneWebWorker): MonacoWebWorker, IWebWorkerOptions
 #include(vs/editor/standalone/browser/standaloneCodeEditor): IActionDescriptor, IGlobalEditorOptions, IStandaloneEditorConstructionOptions, IStandaloneDiffEditorConstructionOptions, IStandaloneCodeEditor, IStandaloneDiffEditor
 export interface ICommandHandler {
 	(...args: any[]): void;
diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js
index dd9aba6bf53..2946d25245b 100644
--- a/build/npm/postinstall.js
+++ b/build/npm/postinstall.js
@@ -129,11 +129,6 @@ for (let dir of dirs) {
 		}
 	}
 
-	if (/^(.build\/distro\/npm\/)?remote/.test(dir) && process.platform === 'win32' && (process.arch === 'arm64' || process.env['npm_config_arch'] === 'arm64')) {
-		// windows arm: do not execute `yarn` on remote folder
-		continue;
-	}
-
 	let opts;
 
 	if (dir === 'build') {
diff --git a/build/npm/preinstall.js b/build/npm/preinstall.js
index fdb01f579d6..f359215ec8e 100644
--- a/build/npm/preinstall.js
+++ b/build/npm/preinstall.js
@@ -73,9 +73,9 @@ function hasSupportedVisualStudioVersion() {
 		const programFiles86Path = process.env['ProgramFiles(x86)'];
 		const programFiles64Path = process.env['ProgramFiles'];
 
+		const vsTypes = ['Enterprise', 'Professional', 'Community', 'Preview', 'BuildTools', 'IntPreview'];
 		if (programFiles64Path) {
 			vsPath = `${programFiles64Path}/Microsoft Visual Studio/${version}`;
-			const vsTypes = ['Enterprise', 'Professional', 'Community', 'Preview', 'BuildTools'];
 			if (vsTypes.some(vsType => fs.existsSync(path.join(vsPath, vsType)))) {
 				availableVersions.push(version);
 				break;
@@ -84,7 +84,6 @@ function hasSupportedVisualStudioVersion() {
 
 		if (programFiles86Path) {
 			vsPath = `${programFiles86Path}/Microsoft Visual Studio/${version}`;
-			const vsTypes = ['Enterprise', 'Professional', 'Community', 'Preview', 'BuildTools'];
 			if (vsTypes.some(vsType => fs.existsSync(path.join(vsPath, vsType)))) {
 				availableVersions.push(version);
 				break;
@@ -123,19 +122,7 @@ function installHeaders() {
 		cp.execFileSync(node_gyp, ['install', '--dist-url', local.disturl, local.target], { shell: true });
 	}
 
-	// Avoid downloading headers for Windows arm64 till we move to Nodejs v19 in remote
-	// which is the first official release with support for the architecture. Downloading
-	// the headers for older versions now redirect to https://origin.nodejs.org/404.html
-	// which causes checksum validation error in node-gyp.
-	//
-	// gyp http 200 https://origin.nodejs.org/404.html
-	// gyp WARN install got an error, rolling back install
-	// gyp ERR! install error
-	// gyp ERR! stack Error: win-arm64/node.lib local checksum 4c62bed7a032f7b36984321b7ffdd60b596fac870672037ff879ae9ac9548fb7 not match remote undefined
-	//
-	if (remote !== undefined && !versions.has(remote.target) &&
-		process.env['npm_config_arch'] !== "arm64" &&
-		process.arch !== "arm64") {
+	if (remote !== undefined && !versions.has(remote.target)) {
 		// Both disturl and target come from a file checked into our repository
 		cp.execFileSync(node_gyp, ['install', '--dist-url', remote.disturl, remote.target], { shell: true });
 	}
diff --git a/build/package.json b/build/package.json
index 1a73af91e6e..c93b66e03dc 100644
--- a/build/package.json
+++ b/build/package.json
@@ -20,6 +20,7 @@
     "@types/gulp-gzip": "^0.0.31",
     "@types/gulp-json-editor": "^2.2.31",
     "@types/gulp-rename": "^0.0.33",
+    "@types/gulp-sort": "^2.0.4",
     "@types/gulp-sourcemaps": "^0.0.32",
     "@types/mime": "0.0.29",
     "@types/minimatch": "^3.0.3",
@@ -44,6 +45,7 @@
     "esbuild": "0.23.0",
     "extract-zip": "^2.0.1",
     "gulp-merge-json": "^2.1.1",
+    "gulp-sort": "^2.0.0",
     "jsonc-parser": "^2.3.0",
     "mime": "^1.4.1",
     "mkdirp": "^1.0.4",
@@ -51,7 +53,7 @@
     "ternary-stream": "^3.0.0",
     "through2": "^4.0.2",
     "tmp": "^0.2.1",
-    "vscode-universal-bundler": "^0.1.0",
+    "vscode-universal-bundler": "^0.1.3",
     "workerpool": "^6.4.0",
     "yauzl": "^2.10.0"
   },
diff --git a/build/secrets/.secrets.baseline b/build/secrets/.secrets.baseline
index 54b8c17f635..b4050b4ef4e 100644
--- a/build/secrets/.secrets.baseline
+++ b/build/secrets/.secrets.baseline
@@ -94,6 +94,10 @@
       "path": "detect_secrets.filters.common.is_baseline_file",
       "filename": "build/secrets/.secrets.baseline"
     },
+    {
+      "path": "detect_secrets.filters.common.is_ignored_due_to_verification_policies",
+      "min_level": 2
+    },
     {
       "path": "detect_secrets.filters.heuristic.is_indirect_reference"
     },
@@ -199,7 +203,7 @@
         "filename": "build/azure-pipelines/darwin/product-build-darwin.yml",
         "hashed_secret": "d8368fc8fec27a14a70083cc2cd6d959085086a9",
         "is_verified": false,
-        "line_number": 33,
+        "line_number": 36,
         "is_secret": false
       }
     ],
@@ -219,7 +223,7 @@
         "filename": "build/azure-pipelines/linux/product-build-linux-legacy-server.yml",
         "hashed_secret": "6bca595fb7e6690f8bacc9e0c1e056cd60e4b7cb",
         "is_verified": false,
-        "line_number": 23,
+        "line_number": 26,
         "is_secret": false
       }
     ],
@@ -229,7 +233,7 @@
         "filename": "build/azure-pipelines/linux/product-build-linux.yml",
         "hashed_secret": "256e334e9cc8b59bb08501110e1c729c9b2edec4",
         "is_verified": false,
-        "line_number": 35,
+        "line_number": 38,
         "is_secret": false
       }
     ],
@@ -239,7 +243,7 @@
         "filename": "build/azure-pipelines/product-compile.yml",
         "hashed_secret": "6bca595fb7e6690f8bacc9e0c1e056cd60e4b7cb",
         "is_verified": false,
-        "line_number": 20,
+        "line_number": 23,
         "is_secret": false
       }
     ],
@@ -253,16 +257,6 @@
         "is_secret": false
       }
     ],
-    "build/azure-pipelines/sdl-scan.yml": [
-      {
-        "type": "Secret Keyword",
-        "filename": "build/azure-pipelines/sdl-scan.yml",
-        "hashed_secret": "6bca595fb7e6690f8bacc9e0c1e056cd60e4b7cb",
-        "is_verified": false,
-        "line_number": 27,
-        "is_secret": false
-      }
-    ],
     "build/azure-pipelines/web/product-build-web.yml": [
       {
         "type": "Secret Keyword",
@@ -279,7 +273,17 @@
         "filename": "build/azure-pipelines/win32/product-build-win32.yml",
         "hashed_secret": "256e334e9cc8b59bb08501110e1c729c9b2edec4",
         "is_verified": false,
-        "line_number": 40,
+        "line_number": 43,
+        "is_secret": false
+      }
+    ],
+    "build/azure-pipelines/win32/sdl-scan-win32.yml": [
+      {
+        "type": "Secret Keyword",
+        "filename": "build/azure-pipelines/win32/sdl-scan-win32.yml",
+        "hashed_secret": "6bca595fb7e6690f8bacc9e0c1e056cd60e4b7cb",
+        "is_verified": false,
+        "line_number": 26,
         "is_secret": false
       }
     ],
@@ -543,7 +547,7 @@
       {
         "type": "Hex High Entropy String",
         "filename": "package.json",
-        "hashed_secret": "328c19cf09eea1574843068faa2eefb00330fd9a",
+        "hashed_secret": "c635602d4b9175ddc1638f98082d7703c4b80f2b",
         "is_verified": false,
         "line_number": 4,
         "is_secret": false
@@ -561,7 +565,7 @@
       {
         "type": "Hex High Entropy String",
         "filename": "product.json",
-        "hashed_secret": "097ac5d8527520960630a51a453626dd781609cc",
+        "hashed_secret": "1b012f829c16ba44801ba646cd54b79048d53ae9",
         "is_verified": false,
         "line_number": 59,
         "is_secret": false
@@ -573,6 +577,14 @@
         "is_verified": false,
         "line_number": 75,
         "is_secret": false
+      },
+      {
+        "type": "Hex High Entropy String",
+        "filename": "product.json",
+        "hashed_secret": "0570cc883d4d190824469556cde84c3f48169c94",
+        "is_verified": false,
+        "line_number": 229,
+        "is_secret": false
       }
     ],
     "scripts/playground-server.ts": [
@@ -591,7 +603,7 @@
         "filename": "src/bootstrap-window.js",
         "hashed_secret": "b6cb3f02e20180320687f4905a9c795d72e0ad3a",
         "is_verified": false,
-        "line_number": 151,
+        "line_number": 133,
         "is_secret": false
       }
     ],
@@ -888,12 +900,28 @@
       }
     ],
     "src/vs/server/node/webClientServer.ts": [
+      {
+        "type": "Base64 High Entropy String",
+        "filename": "src/vs/server/node/webClientServer.ts",
+        "hashed_secret": "66e26ed510af41f1d322d1ebda4389302f4a03c7",
+        "is_verified": false,
+        "line_number": 445,
+        "is_secret": false
+      },
       {
         "type": "Base64 High Entropy String",
         "filename": "src/vs/server/node/webClientServer.ts",
         "hashed_secret": "f769de45d1747b634dfe3d7eb842f6967c4c5e98",
         "is_verified": false,
-        "line_number": 386,
+        "line_number": 445,
+        "is_secret": false
+      },
+      {
+        "type": "Base64 High Entropy String",
+        "filename": "src/vs/server/node/webClientServer.ts",
+        "hashed_secret": "93f2efffc36c6e096cdb21d6aadb7087dc0d7478",
+        "is_verified": false,
+        "line_number": 452,
         "is_secret": false
       }
     ],
@@ -1819,7 +1847,7 @@
       {
         "type": "Base64 High Entropy String",
         "filename": "src/vs/workbench/contrib/webview/browser/pre/index.html",
-        "hashed_secret": "d2ca05efa3869fb799c6229cc3c55a3505bb9c1c",
+        "hashed_secret": "18e28cb104e16a9281ba04f02b3d657de3110053",
         "is_verified": false,
         "line_number": 9,
         "is_secret": false
@@ -1831,7 +1859,17 @@
         "filename": "src/vs/workbench/services/environment/browser/environmentService.ts",
         "hashed_secret": "3a8f125da17a2c187d430daf0045e0fdfa707bdd",
         "is_verified": false,
-        "line_number": 234,
+        "line_number": 273,
+        "is_secret": false
+      }
+    ],
+    "src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.esm.html": [
+      {
+        "type": "Base64 High Entropy String",
+        "filename": "src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.esm.html",
+        "hashed_secret": "b6d602bc7fc2b53ca2a176860f06c731ff0dfaf4",
+        "is_verified": false,
+        "line_number": 7,
         "is_secret": false
       }
     ],
@@ -1839,9 +1877,9 @@
       {
         "type": "Base64 High Entropy String",
         "filename": "src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html",
-        "hashed_secret": "f769de45d1747b634dfe3d7eb842f6967c4c5e98",
+        "hashed_secret": "9d2f1684b9408fdc43d928422965a743ef0f2e9e",
         "is_verified": false,
-        "line_number": 7,
+        "line_number": 8,
         "is_secret": false
       }
     ],
@@ -1874,5 +1912,5 @@
       }
     ]
   },
-  "generated_at": "2024-08-08T06:50:45Z"
+  "generated_at": "2024-09-11T23:58:52Z"
 }
diff --git a/build/yarn.lock b/build/yarn.lock
index 93475761437..1e3928aa0cf 100644
--- a/build/yarn.lock
+++ b/build/yarn.lock
@@ -483,6 +483,14 @@
   dependencies:
     "@types/node" "*"
 
+"@types/gulp-sort@^2.0.4":
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/@types/gulp-sort/-/gulp-sort-2.0.4.tgz#60625bf608dbac8f03644c6785d25c616f1b7d8c"
+  integrity sha512-HUHxH+oMox1ct0SnxPqCXBni0MSws1ygcSAoLO4ISRmR/UuvNIz40rgNveZxwxQk+p78kw09z/qKQkgKJmNUOQ==
+  dependencies:
+    "@types/gulp-util" "*"
+    "@types/node" "*"
+
 "@types/gulp-sourcemaps@^0.0.32":
   version "0.0.32"
   resolved "https://registry.yarnpkg.com/@types/gulp-sourcemaps/-/gulp-sourcemaps-0.0.32.tgz#e79ee617e0cb15729874be4533fe59c07793a175"
@@ -490,6 +498,16 @@
   dependencies:
     "@types/node" "*"
 
+"@types/gulp-util@*":
+  version "3.0.41"
+  resolved "https://registry.yarnpkg.com/@types/gulp-util/-/gulp-util-3.0.41.tgz#52868a6f8b6af55a099fe48ea20736833c02bed4"
+  integrity sha512-BK0kJZ8euQNlISsmD6mBr/1RZkB0mljdtBsz2usv+QHPV10alH2AJw5p05S9LU6S+VdTjbFmGU0OxpH++2W9/Q==
+  dependencies:
+    "@types/node" "*"
+    "@types/through2" "*"
+    "@types/vinyl" "*"
+    chalk "^2.2.0"
+
 "@types/gulp@^4.0.17":
   version "4.0.17"
   resolved "https://registry.yarnpkg.com/@types/gulp/-/gulp-4.0.17.tgz#b314c3762d08d8d69b7c0b86f78d069bafd65009"
@@ -591,6 +609,13 @@
     "@types/glob" "*"
     "@types/node" "*"
 
+"@types/through2@*":
+  version "2.0.41"
+  resolved "https://registry.yarnpkg.com/@types/through2/-/through2-2.0.41.tgz#3e5e1720d71ffdfa03c22f2aad6593d12a47034f"
+  integrity sha512-ryQ0tidWkb1O1JuYvWKyMLYEtOWDqF5mHerJzKz/gQpoAaJq2l/dsMPBF0B5BNVT34rbARYJ5/tsZwLfUi2kwQ==
+  dependencies:
+    "@types/node" "*"
+
 "@types/through2@^2.0.36":
   version "2.0.36"
   resolved "https://registry.yarnpkg.com/@types/through2/-/through2-2.0.36.tgz#35fda0db635827d44c0e08e2c94653e647574a00"
@@ -930,7 +955,7 @@ call-bind@^1.0.0:
     function-bind "^1.1.1"
     get-intrinsic "^1.0.2"
 
-chalk@^2.4.2:
+chalk@^2.2.0, chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -1546,6 +1571,13 @@ gulp-merge-json@^2.1.1:
     through "^2.3.8"
     vinyl "^2.1.0"
 
+gulp-sort@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/gulp-sort/-/gulp-sort-2.0.0.tgz#c6762a2f1f0de0a3fc595a21599d3fac8dba1aca"
+  integrity sha512-MyTel3FXOdh1qhw1yKhpimQrAmur9q1X0ZigLmCOxouQD+BD3za9/89O+HfbgBQvvh4igEbp0/PUWO+VqGYG1g==
+  dependencies:
+    through2 "^2.0.1"
+
 has-flag@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
@@ -2255,6 +2287,19 @@ readable-stream@^2.0.2, readable-stream@^2.3.5:
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
+readable-stream@~2.3.6:
+  version "2.3.8"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.8.tgz#91125e8042bba1b9887f49345f6277027ce8be9b"
+  integrity sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.3"
+    isarray "~1.0.0"
+    process-nextick-args "~2.0.0"
+    safe-buffer "~5.1.1"
+    string_decoder "~1.1.1"
+    util-deprecate "~1.0.1"
+
 readdirp@~3.5.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.5.0.tgz#9ba74c019b15d365278d2e91bb8c48d7b4d42c9e"
@@ -2505,6 +2550,14 @@ ternary-stream@^3.0.0:
     merge-stream "^2.0.0"
     through2 "^3.0.1"
 
+through2@^2.0.1:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
+  integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==
+  dependencies:
+    readable-stream "~2.3.6"
+    xtend "~4.0.1"
+
 through2@^3.0.1:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/through2/-/through2-3.0.2.tgz#99f88931cfc761ec7678b41d5d7336b5b6a07bf4"
@@ -2681,10 +2734,10 @@ vscode-gulp-watch@^5.0.3:
     vinyl "^2.2.0"
     vinyl-file "^3.0.0"
 
-vscode-universal-bundler@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/vscode-universal-bundler/-/vscode-universal-bundler-0.1.0.tgz#1a03d1d16c6ea5065318fafbc2a554b7c2f3bd32"
-  integrity sha512-wtT9IZ/fqIZSirY6cxElu8a6WpNaOjgQjjazt85lMCWBuF/tWVw5nRYX67pTVsUyi6kzQaIvfyyIvxVbBpetBA==
+vscode-universal-bundler@^0.1.3:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/vscode-universal-bundler/-/vscode-universal-bundler-0.1.3.tgz#bd223e61ca0ed1d8ebb1c023d5ad99aab92c3d35"
+  integrity sha512-USXJqgD+ySROqgjl+KrGjlF7MvNnqsI6my1kUOsAXARmNqBjXk38w8g2BF6PEXVOYOQ+npRcTA7athXNU4Jjog==
   dependencies:
     "@electron/asar" "^3.2.7"
     "@malept/cross-spawn-promise" "^2.0.0"
@@ -2747,6 +2800,11 @@ xmlbuilder@~11.0.0:
   resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3"
   integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==
 
+xtend@~4.0.1:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
+  integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
+
 yallist@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
diff --git a/cglicenses.json b/cglicenses.json
index 268a7e1dd1b..1919c9d293c 100644
--- a/cglicenses.json
+++ b/cglicenses.json
@@ -40,12 +40,6 @@
 			"Copyright (c) Microsoft Corporation. All rights reserved."
 		]
 	},
-	{
-		"name": "big-integer",
-		"prependLicenseText": [
-			"Copyright released to public domain"
-		]
-	},
 	{
 		// Reason: The license cannot be found by the tool due to access controls on the repository
 		"name": "vscode-tas-client",
diff --git a/cgmanifest.json b/cgmanifest.json
index aa06f8323b0..dcb4791c791 100644
--- a/cgmanifest.json
+++ b/cgmanifest.json
@@ -516,11 +516,11 @@
 				"git": {
 					"name": "nodejs",
 					"repositoryUrl": "https://github.com/nodejs/node",
-					"commitHash": "fe0f08a5dd68fd72b1652adaa51ab07a4b09f847"
+					"commitHash": "a407d1f0b3669cc82c755700f0d500fb27cc39ea"
 				}
 			},
 			"isOnlyProductionDependency": true,
-			"version": "20.14.0"
+			"version": "20.15.1"
 		},
 		{
 			"component": {
@@ -528,12 +528,12 @@
 				"git": {
 					"name": "electron",
 					"repositoryUrl": "https://github.com/electron/electron",
-					"commitHash": "91de7d0f13208891c5604e00ccd18e4f6826653b"
+					"commitHash": "ff3d3e69443c1c8939c9ba2d10d40cb65f3ff278"
 				}
 			},
 			"isOnlyProductionDependency": true,
 			"license": "MIT",
-			"version": "30.1.2"
+			"version": "30.4.0"
 		},
 		{
 			"component": {
@@ -732,6 +732,39 @@
 				"SOFTWARE."
 			],
 			"license": "MIT"
+		},
+		{
+			"component": {
+				"type": "npm",
+				"npm": {
+					"name": "cacheable-request",
+					"version": "7.0.4"
+				}
+			},
+			"licenseDetail": [
+				"Copyright (c) cacheable-request authors",
+				"",
+				"MIT License",
+				"",
+				"Permission is hereby granted, free of charge, to any person obtaining a copy",
+				"of this software and associated documentation files (the \"Software\"), to",
+				"deal in the Software without restriction, including without limitation the",
+				"rights to use, copy, modify, merge, publish, distribute, sublicense, and/or",
+				"sell copies of the Software, and to permit persons to whom the Software is",
+				"furnished to do so, subject to the following conditions:",
+				"",
+				"The above copyright notice and this permission notice shall be included in",
+				"all copies or substantial portions of the Software.",
+				"",
+				"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR",
+				"IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,",
+				"FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE",
+				"AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER",
+				"LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING",
+				"FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER",
+				"DEALINGS IN THE SOFTWARE."
+			],
+			"license": "MIT"
 		}
 	],
 	"version": 1
diff --git a/cli/ThirdPartyNotices.txt b/cli/ThirdPartyNotices.txt
index 8d04738ba05..4a58801fa12 100644
--- a/cli/ThirdPartyNotices.txt
+++ b/cli/ThirdPartyNotices.txt
@@ -22,31 +22,16 @@ required to debug changes to any libraries licensed under the GNU Lesser General
 addr2line 0.21.0 - Apache-2.0 OR MIT
 https://github.com/gimli-rs/addr2line
 
-Copyright (c) 2016-2018 The gimli Developers
+Licensed under either of
 
-Permission is hereby granted, free of charge, to any
-person obtaining a copy of this software and associated
-documentation files (the "Software"), to deal in the
-Software without restriction, including without
-limitation the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following
-conditions:
+  * Apache License, Version 2.0 ([`LICENSE-APACHE`](./LICENSE-APACHE) or https://www.apache.org/licenses/LICENSE-2.0)
+  * MIT license ([`LICENSE-MIT`](./LICENSE-MIT) or https://opensource.org/licenses/MIT)
 
-The above copyright notice and this permission notice
-shall be included in all copies or substantial portions
-of the Software.
+at your option.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
-ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
-TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
+Unless you explicitly state otherwise, any contribution intentionally submitted
+for inclusion in the work by you, as defined in the Apache-2.0 license, shall be
+dual licensed as above, without any additional terms or conditions.
 ---------------------------------------------------------
 
 ---------------------------------------------------------
@@ -292,27 +277,18 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 async-broadcast 0.5.1 - MIT OR Apache-2.0
 https://github.com/smol-rs/async-broadcast
 
-The MIT License (MIT)
-
-Copyright (c) 2020 Yoshua Wuyts
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+<sup>
+Licensed under either of Apache License, Version
+2.0 (LICENSE-APACHE) or MIT license (LICENSE-MIT) at your option.
+</sup>
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+<br/>
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+<sub>
+Unless you explicitly state otherwise, any contribution intentionally submitted
+for inclusion in this crate by you, as defined in the Apache-2.0 license, shall
+be dual licensed as above, without any additional terms or conditions.
+</sub>
 ---------------------------------------------------------
 
 ---------------------------------------------------------
@@ -320,29 +296,18 @@ SOFTWARE.
 async-channel 2.3.1 - Apache-2.0 OR MIT
 https://github.com/smol-rs/async-channel
 
-Permission is hereby granted, free of charge, to any
-person obtaining a copy of this software and associated
-documentation files (the "Software"), to deal in the
-Software without restriction, including without
-limitation the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following
-conditions:
+Licensed under either of
 
-The above copyright notice and this permission notice
-shall be included in all copies or substantial portions
-of the Software.
+ * Apache License, Version 2.0 ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0)
+ * MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
-ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
-TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
+at your option.
+
+#### Contribution
+
+Unless you explicitly state otherwise, any contribution intentionally submitted
+for inclusion in the work by you, as defined in the Apache-2.0 license, shall be
+dual licensed as above, without any additional terms or conditions.
 ---------------------------------------------------------
 
 ---------------------------------------------------------
@@ -382,29 +347,18 @@ async-lock 2.8.0 - Apache-2.0 OR MIT
 async-lock 3.3.0 - Apache-2.0 OR MIT
 https://github.com/smol-rs/async-lock
 
-Permission is hereby granted, free of charge, to any
-person obtaining a copy of this software and associated
-documentation files (the "Software"), to deal in the
-Software without restriction, including without
-limitation the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following
-conditions:
+Licensed under either of
 
-The above copyright notice and this permission notice
-shall be included in all copies or substantial portions
-of the Software.
+ * Apache License, Version 2.0 ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0)
+ * MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
-ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
-TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
+at your option.
+
+#### Contribution
+
+Unless you explicitly state otherwise, any contribution intentionally submitted
+for inclusion in the work by you, as defined in the Apache-2.0 license, shall be
+dual licensed as above, without any additional terms or conditions.
 ---------------------------------------------------------
 
 ---------------------------------------------------------
@@ -412,29 +366,18 @@ DEALINGS IN THE SOFTWARE.
 async-process 1.8.1 - Apache-2.0 OR MIT
 https://github.com/smol-rs/async-process
 
-Permission is hereby granted, free of charge, to any
-person obtaining a copy of this software and associated
-documentation files (the "Software"), to deal in the
-Software without restriction, including without
-limitation the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following
-conditions:
+Licensed under either of
 
-The above copyright notice and this permission notice
-shall be included in all copies or substantial portions
-of the Software.
+ * Apache License, Version 2.0 ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0)
+ * MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
-ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
-TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
+at your option.
+
+#### Contribution
+
+Unless you explicitly state otherwise, any contribution intentionally submitted
+for inclusion in the work by you, as defined in the Apache-2.0 license, shall be
+dual licensed as above, without any additional terms or conditions.
 ---------------------------------------------------------
 
 ---------------------------------------------------------
@@ -442,29 +385,13 @@ DEALINGS IN THE SOFTWARE.
 async-recursion 1.1.1 - MIT OR Apache-2.0
 https://github.com/dcchut/async-recursion
 
-Permission is hereby granted, free of charge, to any
-person obtaining a copy of this software and associated
-documentation files (the "Software"), to deal in the
-Software without restriction, including without
-limitation the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice
-shall be included in all copies or substantial portions
-of the Software.
+Licensed under either of
+ * Apache License, Version 2.0
+   ([LICENSE-APACHE](LICENSE-APACHE) or <http://www.apache.org/licenses/LICENSE-2.0>)
+ * MIT license
+   ([LICENSE-MIT](LICENSE-MIT) or <http://opensource.org/licenses/MIT>)
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
-ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
-TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
+at your option.
 ---------------------------------------------------------
 
 ---------------------------------------------------------
@@ -502,29 +429,18 @@ DEALINGS IN THE SOFTWARE.
 async-task 4.7.1 - Apache-2.0 OR MIT
 https://github.com/smol-rs/async-task
 
-Permission is hereby granted, free of charge, to any
-person obtaining a copy of this software and associated
-documentation files (the "Software"), to deal in the
-Software without restriction, including without
-limitation the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following
-conditions:
+Licensed under either of
 
-The above copyright notice and this permission notice
-shall be included in all copies or substantial portions
-of the Software.
+ * Apache License, Version 2.0 ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0)
+ * MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
-ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
-TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
+at your option.
+
+#### Contribution
+
+Unless you explicitly state otherwise, any contribution intentionally submitted
+for inclusion in the work by you, as defined in the Apache-2.0 license, shall be
+dual licensed as above, without any additional terms or conditions.
 ---------------------------------------------------------
 
 ---------------------------------------------------------
@@ -4896,7 +4812,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 
 ---------------------------------------------------------
 
-openssl 0.10.64 - Apache-2.0
+openssl 0.10.66 - Apache-2.0
 https://github.com/sfackler/rust-openssl
 
 Copyright 2011-2017 Google Inc.
@@ -4975,7 +4891,7 @@ DEALINGS IN THE SOFTWARE.
 
 ---------------------------------------------------------
 
-openssl-sys 0.9.102 - MIT
+openssl-sys 0.9.103 - MIT
 https://github.com/sfackler/rust-openssl
 
 The MIT License (MIT)
@@ -10791,33 +10707,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 zbus 3.15.2 - MIT
 https://github.com/dbus2/zbus/
 
-The MIT License (MIT)
-
-Copyright (c) 2024 Zeeshan Ali Khan & zbus contributors
-
-Permission is hereby granted, free of charge, to any
-person obtaining a copy of this software and associated
-documentation files (the "Software"), to deal in the
-Software without restriction, including without
-limitation the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice
-shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
-ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
-TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
+LICENSE-MIT
 ---------------------------------------------------------
 
 ---------------------------------------------------------
@@ -10825,33 +10715,7 @@ DEALINGS IN THE SOFTWARE.
 zbus_macros 3.15.2 - MIT
 https://github.com/dbus2/zbus/
 
-The MIT License (MIT)
-
-Copyright (c) 2024 Zeeshan Ali Khan & zbus contributors
-
-Permission is hereby granted, free of charge, to any
-person obtaining a copy of this software and associated
-documentation files (the "Software"), to deal in the
-Software without restriction, including without
-limitation the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice
-shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
-ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
-TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
+LICENSE-MIT
 ---------------------------------------------------------
 
 ---------------------------------------------------------
@@ -10859,33 +10723,7 @@ DEALINGS IN THE SOFTWARE.
 zbus_names 2.6.1 - MIT
 https://github.com/dbus2/zbus/
 
-The MIT License (MIT)
-
-Copyright (c) 2024 Zeeshan Ali Khan & zbus contributors
-
-Permission is hereby granted, free of charge, to any
-person obtaining a copy of this software and associated
-documentation files (the "Software"), to deal in the
-Software without restriction, including without
-limitation the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice
-shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
-ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
-TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
+LICENSE-MIT
 ---------------------------------------------------------
 
 ---------------------------------------------------------
@@ -10978,33 +10816,7 @@ licences; see files named LICENSE.*.txt for details.
 zvariant 3.15.2 - MIT
 https://github.com/dbus2/zbus/
 
-The MIT License (MIT)
-
-Copyright (c) 2024 Zeeshan Ali Khan & zbus contributors
-
-Permission is hereby granted, free of charge, to any
-person obtaining a copy of this software and associated
-documentation files (the "Software"), to deal in the
-Software without restriction, including without
-limitation the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice
-shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
-ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
-TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
+LICENSE-MIT
 ---------------------------------------------------------
 
 ---------------------------------------------------------
@@ -11012,33 +10824,7 @@ DEALINGS IN THE SOFTWARE.
 zvariant_derive 3.15.2 - MIT
 https://github.com/dbus2/zbus/
 
-The MIT License (MIT)
-
-Copyright (c) 2024 Zeeshan Ali Khan & zbus contributors
-
-Permission is hereby granted, free of charge, to any
-person obtaining a copy of this software and associated
-documentation files (the "Software"), to deal in the
-Software without restriction, including without
-limitation the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice
-shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
-ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
-TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
+LICENSE-MIT
 ---------------------------------------------------------
 
 ---------------------------------------------------------
@@ -11046,31 +10832,5 @@ DEALINGS IN THE SOFTWARE.
 zvariant_utils 1.0.1 - MIT
 https://github.com/dbus2/zbus/
 
-The MIT License (MIT)
-
-Copyright (c) 2024 Zeeshan Ali Khan & zbus contributors
-
-Permission is hereby granted, free of charge, to any
-person obtaining a copy of this software and associated
-documentation files (the "Software"), to deal in the
-Software without restriction, including without
-limitation the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice
-shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
-ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
-TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
+LICENSE-MIT
 ---------------------------------------------------------
\ No newline at end of file
diff --git a/cli/src/commands/args.rs b/cli/src/commands/args.rs
index 05e22e0cfb3..101f1eac29f 100644
--- a/cli/src/commands/args.rs
+++ b/cli/src/commands/args.rs
@@ -230,8 +230,8 @@ pub struct CommandShellArgs {
 	#[clap(long)]
 	pub on_socket: bool,
 	/// Listen on a host/port instead of stdin/stdout.
-	#[clap(long, num_args = 0..=1, default_missing_value = "0")]
-	pub on_port: Option<u16>,
+	#[clap(long, num_args = 0..=2, default_missing_value = "0")]
+	pub on_port: Vec<u16>,
 	/// Listen on a host/port instead of stdin/stdout.
 	#[clap[long]]
 	pub on_host: Option<String>,
diff --git a/cli/src/commands/tunnels.rs b/cli/src/commands/tunnels.rs
index 688f603f593..2d0014bca55 100644
--- a/cli/src/commands/tunnels.rs
+++ b/cli/src/commands/tunnels.rs
@@ -155,43 +155,52 @@ pub async fn command_shell(ctx: CommandContext, args: CommandShellArgs) -> Resul
 		code_server_args: (&ctx.args).into(),
 	};
 
-	let mut listener: Box<dyn AsyncRWAccepter> = match (args.on_port, &args.on_host, args.on_socket)
-	{
-		(_, _, true) => {
-			let socket = get_socket_name();
-			let listener = listen_socket_rw_stream(&socket)
-				.await
-				.map_err(|e| wrap(e, "error listening on socket"))?;
-
-			params
-				.log
-				.result(format!("Listening on {}", socket.display()));
-
-			Box::new(listener)
-		}
-		(Some(_), _, _) | (_, Some(_), _) => {
-			let addr = SocketAddr::new(
-				args.on_host
+	let mut listener: Box<dyn AsyncRWAccepter> =
+		match (args.on_port.first(), &args.on_host, args.on_socket) {
+			(_, _, true) => {
+				let socket = get_socket_name();
+				let listener = listen_socket_rw_stream(&socket)
+					.await
+					.map_err(|e| wrap(e, "error listening on socket"))?;
+
+				params
+					.log
+					.result(format!("Listening on {}", socket.display()));
+
+				Box::new(listener)
+			}
+			(Some(_), _, _) | (_, Some(_), _) => {
+				let host = args
+					.on_host
 					.as_ref()
 					.map(|h| h.parse().map_err(CodeError::InvalidHostAddress))
-					.unwrap_or(Ok(IpAddr::V4(Ipv4Addr::LOCALHOST)))?,
-				args.on_port.unwrap_or_default(),
-			);
-			let listener = tokio::net::TcpListener::bind(addr)
-				.await
-				.map_err(|e| wrap(e, "error listening on port"))?;
-
-			params
-				.log
-				.result(format!("Listening on {}", listener.local_addr().unwrap()));
-
-			Box::new(listener)
-		}
-		_ => {
-			serve_stream(tokio::io::stdin(), tokio::io::stderr(), params).await;
-			return Ok(0);
-		}
-	};
+					.unwrap_or(Ok(IpAddr::V4(Ipv4Addr::LOCALHOST)))?;
+
+				let lower_port = args.on_port.first().copied().unwrap_or_default();
+				let port_no = if let Some(upper) = args.on_port.get(1) {
+					find_unused_port(&host, lower_port, *upper)
+						.await
+						.unwrap_or_default()
+				} else {
+					lower_port
+				};
+
+				let addr = SocketAddr::new(host, port_no);
+				let listener = tokio::net::TcpListener::bind(addr)
+					.await
+					.map_err(|e| wrap(e, "error listening on port"))?;
+
+				params
+					.log
+					.result(format!("Listening on {}", listener.local_addr().unwrap()));
+
+				Box::new(listener)
+			}
+			_ => {
+				serve_stream(tokio::io::stdin(), tokio::io::stderr(), params).await;
+				return Ok(0);
+			}
+		};
 
 	let mut servers = FuturesUnordered::new();
 
@@ -216,6 +225,21 @@ pub async fn command_shell(ctx: CommandContext, args: CommandShellArgs) -> Resul
 	}
 }
 
+async fn find_unused_port(host: &IpAddr, start_port: u16, end_port: u16) -> Option<u16> {
+	for port in start_port..=end_port {
+		if is_port_available(*host, port).await {
+			return Some(port);
+		}
+	}
+	None
+}
+
+async fn is_port_available(host: IpAddr, port: u16) -> bool {
+	tokio::net::TcpListener::bind(SocketAddr::new(host, port))
+		.await
+		.is_ok()
+}
+
 pub async fn service(
 	ctx: CommandContext,
 	service_args: TunnelServiceSubCommands,
diff --git a/cli/src/update_service.rs b/cli/src/update_service.rs
index 4bec13d6e86..90339148188 100644
--- a/cli/src/update_service.rs
+++ b/cli/src/update_service.rs
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-use std::{ffi::OsStr, fmt, path::Path};
+use std::{fmt, path::Path};
 
 use serde::{Deserialize, Serialize};
 
@@ -11,10 +11,11 @@ use crate::{
 	constants::VSCODE_CLI_UPDATE_ENDPOINT,
 	debug, log, options, spanf,
 	util::{
-		errors::{AnyError, CodeError, WrappedError},
+		errors::{wrap, AnyError, CodeError, WrappedError},
 		http::{BoxedHttp, SimpleResponse},
 		io::ReportCopyProgress,
-		tar, zipper,
+		tar::{self, has_gzip_header},
+		zipper,
 	},
 };
 
@@ -178,10 +179,10 @@ pub fn unzip_downloaded_release<T>(
 where
 	T: ReportCopyProgress,
 {
-	if compressed_file.extension() == Some(OsStr::new("zip")) {
-		zipper::unzip_file(compressed_file, target_dir, reporter)
-	} else {
-		tar::decompress_tarball(compressed_file, target_dir, reporter)
+	match has_gzip_header(compressed_file) {
+		Ok((f, true)) => tar::decompress_tarball(f, target_dir, reporter),
+		Ok((f, false)) => zipper::unzip_file(f, target_dir, reporter),
+		Err(e) => Err(wrap(e, "error checking for gzip header")),
 	}
 }
 
@@ -249,7 +250,7 @@ impl Platform {
 			Platform::DarwinARM64 => "server-darwin-arm64",
 			Platform::WindowsX64 => "server-win32-x64",
 			Platform::WindowsX86 => "server-win32",
-			Platform::WindowsARM64 => "server-win32-x64", // we don't publish an arm64 server build yet
+			Platform::WindowsARM64 => "server-win32-arm64",
 		}
 		.to_owned()
 	}
diff --git a/cli/src/util/tar.rs b/cli/src/util/tar.rs
index fe4d4269700..10577140325 100644
--- a/cli/src/util/tar.rs
+++ b/cli/src/util/tar.rs
@@ -5,8 +5,8 @@
 use crate::util::errors::{wrap, WrappedError};
 
 use flate2::read::GzDecoder;
-use std::fs;
-use std::io::Seek;
+use std::fs::{self, File};
+use std::io::{Read, Seek};
 use std::path::{Path, PathBuf};
 use tar::Archive;
 
@@ -57,16 +57,13 @@ fn should_skip_first_segment(file: &fs::File) -> Result<(bool, u64), WrappedErro
 }
 
 pub fn decompress_tarball<T>(
-	path: &Path,
+	mut tar_gz: File,
 	parent_path: &Path,
 	mut reporter: T,
 ) -> Result<(), WrappedError>
 where
 	T: ReportCopyProgress,
 {
-	let mut tar_gz = fs::File::open(path)
-		.map_err(|e| wrap(e, format!("error opening file {}", path.display())))?;
-
 	let (skip_first, num_entries) = should_skip_first_segment(&tar_gz)?;
 	let report_progress_every = num_entries / 20;
 	let mut entries_so_far = 0;
@@ -81,7 +78,7 @@ where
 	let mut archive = Archive::new(tar);
 	archive
 		.entries()
-		.map_err(|e| wrap(e, format!("error opening archive {}", path.display())))?
+		.map_err(|e| wrap(e, "error opening archive"))?
 		.filter_map(|e| e.ok())
 		.try_for_each::<_, Result<_, WrappedError>>(|mut entry| {
 			// approximate progress based on where we are in the archive:
@@ -118,3 +115,13 @@ where
 
 	Ok(())
 }
+
+pub fn has_gzip_header(path: &Path) -> std::io::Result<(File, bool)> {
+	let mut file = fs::File::open(path)?;
+	let mut header = [0; 2];
+	let _ = file.read_exact(&mut header);
+
+	file.rewind()?;
+
+	Ok((file, header[0] == 0x1f && header[1] == 0x8b))
+}
diff --git a/cli/src/util/zipper.rs b/cli/src/util/zipper.rs
index 69bcf2d23f6..5521fa42c54 100644
--- a/cli/src/util/zipper.rs
+++ b/cli/src/util/zipper.rs
@@ -44,15 +44,12 @@ fn should_skip_first_segment(archive: &mut ZipArchive<File>) -> bool {
 	archive.len() > 1 // prefix removal is invalid if there's only a single file
 }
 
-pub fn unzip_file<T>(path: &Path, parent_path: &Path, mut reporter: T) -> Result<(), WrappedError>
+pub fn unzip_file<T>(file: File, parent_path: &Path, mut reporter: T) -> Result<(), WrappedError>
 where
 	T: ReportCopyProgress,
 {
-	let file = fs::File::open(path)
-		.map_err(|e| wrap(e, format!("unable to open file {}", path.display())))?;
-
-	let mut archive = zip::ZipArchive::new(file)
-		.map_err(|e| wrap(e, format!("failed to open zip archive {}", path.display())))?;
+	let mut archive =
+		zip::ZipArchive::new(file).map_err(|e| wrap(e, "failed to open zip archive"))?;
 
 	let skip_segments_no = usize::from(should_skip_first_segment(&mut archive));
 	let report_progress_every = archive.len() / 20;
diff --git a/extensions/css-language-features/package.json b/extensions/css-language-features/package.json
index 57cbba323a4..10cbd954154 100644
--- a/extensions/css-language-features/package.json
+++ b/extensions/css-language-features/package.json
@@ -997,7 +997,7 @@
     ]
   },
   "dependencies": {
-    "vscode-languageclient": "^10.0.0-next.8",
+    "vscode-languageclient": "10.0.0-next.8",
     "vscode-uri": "^3.0.8"
   },
   "devDependencies": {
diff --git a/extensions/css-language-features/server/package.json b/extensions/css-language-features/server/package.json
index fe4f64d7c01..329fe57fc57 100644
--- a/extensions/css-language-features/server/package.json
+++ b/extensions/css-language-features/server/package.json
@@ -11,8 +11,8 @@
   "browser": "./dist/browser/cssServerMain",
   "dependencies": {
     "@vscode/l10n": "^0.0.18",
-    "vscode-css-languageservice": "^6.3.0",
-    "vscode-languageserver": "^10.0.0-next.6",
+    "vscode-css-languageservice": "^6.3.1",
+    "vscode-languageserver": "10.0.0-next.6",
     "vscode-uri": "^3.0.8"
   },
   "devDependencies": {
diff --git a/extensions/css-language-features/server/yarn.lock b/extensions/css-language-features/server/yarn.lock
index 59033f770c1..f59aed24630 100644
--- a/extensions/css-language-features/server/yarn.lock
+++ b/extensions/css-language-features/server/yarn.lock
@@ -24,13 +24,13 @@ undici-types@~5.26.4:
   resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
   integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
 
-vscode-css-languageservice@^6.3.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-6.3.0.tgz#51724d193d19b1a9075b1cef5cfeea6a555d2aa4"
-  integrity sha512-nU92imtkgzpCL0xikrIb8WvedV553F2BENzgz23wFuok/HLN5BeQmroMy26pUwFxV2eV8oNRmYCUv8iO7kSMhw==
+vscode-css-languageservice@^6.3.1:
+  version "6.3.1"
+  resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-6.3.1.tgz#56733c90686db56855ccc156a534a68b8c1f2187"
+  integrity sha512-1BzTBuJfwMc3A0uX4JBdJgoxp74cjj4q2mDJdp49yD/GuAq4X0k5WtK6fNcMYr+FfJ9nqgR6lpfCSZDkARJ5qQ==
   dependencies:
     "@vscode/l10n" "^0.0.18"
-    vscode-languageserver-textdocument "^1.0.11"
+    vscode-languageserver-textdocument "^1.0.12"
     vscode-languageserver-types "3.17.5"
     vscode-uri "^3.0.8"
 
@@ -47,10 +47,10 @@ vscode-languageserver-protocol@3.17.6-next.6:
     vscode-jsonrpc "9.0.0-next.4"
     vscode-languageserver-types "3.17.6-next.4"
 
-vscode-languageserver-textdocument@^1.0.11:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.11.tgz#0822a000e7d4dc083312580d7575fe9e3ba2e2bf"
-  integrity sha512-X+8T3GoiwTVlJbicx/sIAF+yuJAqz8VvwJyoMVhwEMoEKE/fkDmrqUgDMyBECcM2A2frVZIUj5HI/ErRXCfOeA==
+vscode-languageserver-textdocument@^1.0.12:
+  version "1.0.12"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.12.tgz#457ee04271ab38998a093c68c2342f53f6e4a631"
+  integrity sha512-cxWNPesCnQCcMPeenjKKsOCKQZ/L6Tv19DTRIGuLWe32lyzWhihGVJ/rcckZXJxfdKCFvRLS3fpBIsV/ZGX4zA==
 
 vscode-languageserver-types@3.17.5:
   version "3.17.5"
@@ -62,7 +62,7 @@ vscode-languageserver-types@3.17.6-next.4:
   resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.6-next.4.tgz#6670939eb98f00aa7b05021dc3dd7fe9aa4453ea"
   integrity sha512-SeJTpH/S14EbxOAVaOUoGVqPToqpRTld5QO5Ghig3AlbFJTFF9Wu7srHMfa85L0SX1RYAuuCSFKJVVCxDIk1/Q==
 
-vscode-languageserver@^10.0.0-next.6:
+vscode-languageserver@10.0.0-next.6:
   version "10.0.0-next.6"
   resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-10.0.0-next.6.tgz#0db118a93fe010c6b40cd04e91a15d09e7b60b60"
   integrity sha512-0Lh1nhQfSxo5Ob+ayYO1QTIsDix2/Lc72Urm1KZrCFxK5zIFYaEh3QFeM9oZih4Rzs0ZkQPXXnoHtpvs5GT+Zw==
diff --git a/extensions/css-language-features/yarn.lock b/extensions/css-language-features/yarn.lock
index eef1c9ab57d..28dc1c05f96 100644
--- a/extensions/css-language-features/yarn.lock
+++ b/extensions/css-language-features/yarn.lock
@@ -52,7 +52,7 @@ vscode-jsonrpc@9.0.0-next.4:
   resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-9.0.0-next.4.tgz#ba403ddb3b82ca578179963dbe08e120a935f50d"
   integrity sha512-zSVIr58lJSMYKIsZ5P7GtBbv1eEx25eNyOf0NmEzxmn1GhUNJAVAb5hkA1poKUwj1FRMwN6CeyWxZypmr8SsQQ==
 
-vscode-languageclient@^10.0.0-next.8:
+vscode-languageclient@10.0.0-next.8:
   version "10.0.0-next.8"
   resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-10.0.0-next.8.tgz#5afa0ced3b2ac68d31cc1c48edc4f289744542a0"
   integrity sha512-D9inIHgqKayO9Tv0MeLb3XIL76yTuWmKdHqcGZKzjtQrMGJgASJDYWTapu+yAjEpDp0gmVOaCYyIlLB86ncDoQ==
diff --git a/extensions/fsharp/cgmanifest.json b/extensions/fsharp/cgmanifest.json
index 0b3c5d112e5..f10f9ca661a 100644
--- a/extensions/fsharp/cgmanifest.json
+++ b/extensions/fsharp/cgmanifest.json
@@ -6,7 +6,7 @@
 				"git": {
 					"name": "ionide/ionide-fsgrammar",
 					"repositoryUrl": "https://github.com/ionide/ionide-fsgrammar",
-					"commitHash": "0100f551f6c32598a58aba97344bf828673fec7a"
+					"commitHash": "7d1b695da917dc4c7a0f7fb4683f42da208f87a2"
 				}
 			},
 			"license": "MIT",
diff --git a/extensions/fsharp/syntaxes/fsharp.tmLanguage.json b/extensions/fsharp/syntaxes/fsharp.tmLanguage.json
index 7806c100eae..41436335cdc 100644
--- a/extensions/fsharp/syntaxes/fsharp.tmLanguage.json
+++ b/extensions/fsharp/syntaxes/fsharp.tmLanguage.json
@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/ionide/ionide-fsgrammar/commit/0100f551f6c32598a58aba97344bf828673fec7a",
+	"version": "https://github.com/ionide/ionide-fsgrammar/commit/7d1b695da917dc4c7a0f7fb4683f42da208f87a2",
 	"name": "fsharp",
 	"scopeName": "source.fsharp",
 	"patterns": [
@@ -841,7 +841,7 @@
 							"name": "keyword.symbol.fsharp"
 						}
 					},
-					"end": "(\\)\\s*(([?[:alpha:]0-9'`^._ ]+))+)",
+					"end": "(\\)\\s*(([?[:alpha:]0-9'`^._ ]+))*)",
 					"endCaptures": {
 						"1": {
 							"name": "keyword.symbol.fsharp"
diff --git a/extensions/git/package.json b/extensions/git/package.json
index fc0002a6313..6bf280b95da 100644
--- a/extensions/git/package.json
+++ b/extensions/git/package.json
@@ -19,6 +19,7 @@
     "contribSourceControlHistoryItemChangesMenu",
     "contribSourceControlHistoryItemGroupMenu",
     "contribSourceControlHistoryItemMenu",
+    "contribSourceControlHistoryTitleMenu",
     "contribSourceControlInputBoxMenu",
     "contribSourceControlTitleMenu",
     "contribViewsWelcome",
@@ -35,7 +36,6 @@
     "scmValidation",
     "tabInputMultiDiff",
     "tabInputTextMerge",
-    "terminalShellIntegration",
     "timeline"
   ],
   "categories": [
@@ -1936,6 +1936,28 @@
           "group": "1_modification@3"
         }
       ],
+      "scm/history/title": [
+        {
+          "command": "git.fetchRef",
+          "group": "navigation@1",
+          "when": "scmProvider == git && scmHistoryItemGroupHasRemote"
+        },
+        {
+          "command": "git.pullRef",
+          "group": "navigation@2",
+          "when": "scmProvider == git && scmHistoryItemGroupHasRemote"
+        },
+        {
+          "command": "git.pushRef",
+          "when": "scmProvider == git && scmHistoryItemGroupHasRemote",
+          "group": "navigation@3"
+        },
+        {
+          "command": "git.publish",
+          "when": "scmProvider == git && !scmHistoryItemGroupHasRemote",
+          "group": "navigation@3"
+        }
+      ],
       "scm/historyItemChanges/title": [
         {
           "command": "git.fetchRef",
diff --git a/extensions/git/src/api/api1.ts b/extensions/git/src/api/api1.ts
index f94ecbab7b0..332c328b2d1 100644
--- a/extensions/git/src/api/api1.ts
+++ b/extensions/git/src/api/api1.ts
@@ -322,6 +322,10 @@ export class ApiImpl implements API {
 	}
 
 	async openRepository(root: Uri): Promise<Repository | null> {
+		if (root.scheme !== 'file') {
+			return null;
+		}
+
 		await this._model.openRepository(root.fsPath);
 		return this.getRepository(root) || null;
 	}
diff --git a/extensions/git/src/api/git.d.ts b/extensions/git/src/api/git.d.ts
index 2abbeaaa14e..17dd192ed95 100644
--- a/extensions/git/src/api/git.d.ts
+++ b/extensions/git/src/api/git.d.ts
@@ -147,6 +147,7 @@ export interface LogOptions {
 	readonly author?: string;
 	readonly refNames?: string[];
 	readonly maxParents?: number;
+	readonly skip?: number;
 }
 
 export interface CommitOptions {
diff --git a/extensions/git/src/git.ts b/extensions/git/src/git.ts
index 957f447e8c2..9940ae535c7 100644
--- a/extensions/git/src/git.ts
+++ b/extensions/git/src/git.ts
@@ -1062,6 +1062,7 @@ export interface PullOptions {
 }
 
 export class Repository {
+	private _isUsingRefTable = false;
 
 	constructor(
 		private _git: Git,
@@ -1169,6 +1170,10 @@ export class Repository {
 			args.push(`--max-parents=${options.maxParents}`);
 		}
 
+		if (typeof options?.skip === 'number') {
+			args.push(`--skip=${options.skip}`);
+		}
+
 		if (options?.refNames) {
 			args.push('--topo-order');
 			args.push('--decorate=full');
@@ -1506,6 +1511,21 @@ export class Repository {
 		return parseGitChanges(this.repositoryRoot, gitResult.stdout);
 	}
 
+	async diffTrees(treeish1: string, treeish2?: string): Promise<Change[]> {
+		const args = ['diff-tree', '-r', '--name-status', '-z', '--diff-filter=ADMR', treeish1];
+
+		if (treeish2) {
+			args.push(treeish2);
+		}
+
+		const gitResult = await this.exec(args);
+		if (gitResult.exitCode) {
+			return [];
+		}
+
+		return parseGitChanges(this.repositoryRoot, gitResult.stdout);
+	}
+
 	async getMergeBase(ref1: string, ref2: string, ...refs: string[]): Promise<string | undefined> {
 		try {
 			const args = ['merge-base'];
@@ -2315,13 +2335,25 @@ export class Repository {
 	}
 
 	async getHEAD(): Promise<Ref> {
-		try {
-			// Attempt to parse the HEAD file
-			const result = await this.getHEADFS();
-			return result;
-		}
-		catch (err) {
-			this.logger.warn(`[Git][getHEAD] Failed to parse HEAD file: ${err.message}`);
+		if (!this._isUsingRefTable) {
+			try {
+				// Attempt to parse the HEAD file
+				const result = await this.getHEADFS();
+
+				// Git 2.45 adds support for a new reference storage backend called "reftable", promising
+				// faster lookups, reads, and writes for repositories with any number of references. For
+				// backwards compatibility the `.git/HEAD` file contains `ref: refs/heads/.invalid`. More
+				// details are available at https://git-scm.com/docs/reftable
+				if (result.name === '.invalid') {
+					this._isUsingRefTable = true;
+					this.logger.warn(`[Git][getHEAD] Failed to parse HEAD file: Repository is using reftable format.`);
+				} else {
+					return result;
+				}
+			}
+			catch (err) {
+				this.logger.warn(`[Git][getHEAD] Failed to parse HEAD file: ${err.message}`);
+			}
 		}
 
 		try {
diff --git a/extensions/git/src/historyProvider.ts b/extensions/git/src/historyProvider.ts
index d4b1d0a39d5..d19311b302f 100644
--- a/extensions/git/src/historyProvider.ts
+++ b/extensions/git/src/historyProvider.ts
@@ -6,11 +6,10 @@
 
 import { Disposable, Event, EventEmitter, FileDecoration, FileDecorationProvider, SourceControlHistoryItem, SourceControlHistoryItemChange, SourceControlHistoryItemGroup, SourceControlHistoryOptions, SourceControlHistoryProvider, ThemeIcon, Uri, window, LogOutputChannel, SourceControlHistoryItemLabel } from 'vscode';
 import { Repository, Resource } from './repository';
-import { IDisposable, dispose, filterEvent } from './util';
+import { IDisposable, dispose } from './util';
 import { toGitUri } from './uri';
-import { Branch, RefType, UpstreamRef } from './api/git';
+import { Branch, LogOptions, RefType, UpstreamRef } from './api/git';
 import { emojify, ensureEmojis } from './emoji';
-import { Operation } from './operation';
 import { Commit } from './git';
 
 export class GitHistoryProvider implements SourceControlHistoryProvider, FileDecorationProvider, IDisposable {
@@ -43,12 +42,10 @@ export class GitHistoryProvider implements SourceControlHistoryProvider, FileDec
 
 	constructor(protected readonly repository: Repository, private readonly logger: LogOutputChannel) {
 		this.disposables.push(repository.onDidRunGitStatus(() => this.onDidRunGitStatus(), this));
-		this.disposables.push(filterEvent(repository.onDidRunOperation, e => e.operation === Operation.Refresh)(() => this.onDidRunGitStatus(true), this));
-
 		this.disposables.push(window.registerFileDecorationProvider(this));
 	}
 
-	private async onDidRunGitStatus(force = false): Promise<void> {
+	private async onDidRunGitStatus(): Promise<void> {
 		this.logger.trace('[GitHistoryProvider][onDidRunGitStatus] HEAD:', JSON.stringify(this._HEAD));
 		this.logger.trace('[GitHistoryProvider][onDidRunGitStatus] repository.HEAD:', JSON.stringify(this.repository.HEAD));
 
@@ -56,8 +53,7 @@ export class GitHistoryProvider implements SourceControlHistoryProvider, FileDec
 		const mergeBase = await this.resolveHEADMergeBase();
 
 		// Check if HEAD has changed
-		if (!force &&
-			this._HEAD?.name === this.repository.HEAD?.name &&
+		if (this._HEAD?.name === this.repository.HEAD?.name &&
 			this._HEAD?.commit === this.repository.HEAD?.commit &&
 			this._HEAD?.upstream?.name === this.repository.HEAD?.upstream?.name &&
 			this._HEAD?.upstream?.remote === this.repository.HEAD?.upstream?.remote &&
@@ -98,7 +94,7 @@ export class GitHistoryProvider implements SourceControlHistoryProvider, FileDec
 			} : undefined
 		};
 
-		this.logger.trace(`[GitHistoryProvider][onDidRunGitStatus] currentHistoryItemGroup(${force}): ${JSON.stringify(this.currentHistoryItemGroup)}`);
+		this.logger.trace(`[GitHistoryProvider][onDidRunGitStatus] currentHistoryItemGroup: ${JSON.stringify(this.currentHistoryItemGroup)}`);
 	}
 
 	async provideHistoryItems(historyItemGroupId: string, options: SourceControlHistoryOptions): Promise<SourceControlHistoryItem[]> {
@@ -137,22 +133,31 @@ export class GitHistoryProvider implements SourceControlHistoryProvider, FileDec
 	}
 
 	async provideHistoryItems2(options: SourceControlHistoryOptions): Promise<SourceControlHistoryItem[]> {
-		if (!this.currentHistoryItemGroup || !options.historyItemGroupIds || typeof options.limit === 'number' || !options.limit?.id) {
+		if (!this.currentHistoryItemGroup || !options.historyItemGroupIds) {
 			return [];
 		}
 
 		// Deduplicate refNames
 		const refNames = Array.from(new Set<string>(options.historyItemGroupIds));
 
+		let logOptions: LogOptions = { refNames, shortStats: true };
+
 		try {
-			// Get the common ancestor commit, and commits
-			const [mergeBaseCommit, commits] = await Promise.all([
-				this.repository.getCommit(options.limit.id),
-				this.repository.log({ range: `${options.limit.id}..`, refNames, shortStats: true })
-			]);
+			if (options.limit === undefined || typeof options.limit === 'number') {
+				logOptions = { ...logOptions, maxEntries: options.limit ?? 50 };
+			} else if (typeof options.limit.id === 'string') {
+				// Get the common ancestor commit, and commits
+				const commit = await this.repository.getCommit(options.limit.id);
+				const commitParentId = commit.parents.length > 0 ? commit.parents[0] : await this.repository.getEmptyTree();
+
+				logOptions = { ...logOptions, range: `${commitParentId}..` };
+			}
 
-			// Add common ancestor commit
-			commits.push(mergeBaseCommit);
+			if (typeof options.skip === 'number') {
+				logOptions = { ...logOptions, skip: options.skip };
+			}
+
+			const commits = await this.repository.log({ ...logOptions, silent: true });
 
 			await ensureEmojis();
 
@@ -160,7 +165,7 @@ export class GitHistoryProvider implements SourceControlHistoryProvider, FileDec
 				const newLineIndex = commit.message.indexOf('\n');
 				const subject = newLineIndex !== -1 ? commit.message.substring(0, newLineIndex) : commit.message;
 
-				const labels = this.resolveHistoryItemLabels(commit, refNames);
+				const labels = this.resolveHistoryItemLabels(commit);
 
 				return {
 					id: commit.hash,
@@ -174,30 +179,24 @@ export class GitHistoryProvider implements SourceControlHistoryProvider, FileDec
 				};
 			});
 		} catch (err) {
-			this.logger.error(`[GitHistoryProvider][provideHistoryItems2] Failed to get history items '${options.limit.id}..': ${err}`);
+			this.logger.error(`[GitHistoryProvider][provideHistoryItems2] Failed to get history items with options '${JSON.stringify(options)}': ${err}`);
 			return [];
 		}
 	}
 
 	async provideHistoryItemSummary(historyItemId: string, historyItemParentId: string | undefined): Promise<SourceControlHistoryItem> {
-		if (!historyItemParentId) {
-			const commit = await this.repository.getCommit(historyItemId);
-			historyItemParentId = commit.parents.length > 0 ? commit.parents[0] : `${historyItemId}^`;
-		}
-
+		historyItemParentId = historyItemParentId ?? await this.repository.getEmptyTree();
 		const allChanges = await this.repository.diffBetweenShortStat(historyItemParentId, historyItemId);
+
 		return { id: historyItemId, parentIds: [historyItemParentId], message: '', statistics: allChanges };
 	}
 
 	async provideHistoryItemChanges(historyItemId: string, historyItemParentId: string | undefined): Promise<SourceControlHistoryItemChange[]> {
-		if (!historyItemParentId) {
-			const commit = await this.repository.getCommit(historyItemId);
-			historyItemParentId = commit.parents.length > 0 ? commit.parents[0] : `${historyItemId}^`;
-		}
+		historyItemParentId = historyItemParentId ?? await this.repository.getEmptyTree();
 
 		const historyItemChangesUri: Uri[] = [];
 		const historyItemChanges: SourceControlHistoryItemChange[] = [];
-		const changes = await this.repository.diffBetween(historyItemParentId, historyItemId);
+		const changes = await this.repository.diffTrees(historyItemParentId, historyItemId);
 
 		for (const change of changes) {
 			const historyItemUri = change.uri.with({
@@ -293,14 +292,10 @@ export class GitHistoryProvider implements SourceControlHistoryProvider, FileDec
 		return this.historyItemDecorations.get(uri.toString());
 	}
 
-	private resolveHistoryItemLabels(commit: Commit, refNames: string[]): SourceControlHistoryItemLabel[] {
+	private resolveHistoryItemLabels(commit: Commit): SourceControlHistoryItemLabel[] {
 		const labels: SourceControlHistoryItemLabel[] = [];
 
 		for (const label of commit.refNames) {
-			if (!label.startsWith('HEAD -> ') && !refNames.includes(label)) {
-				continue;
-			}
-
 			for (const [key, value] of this.historyItemLabels) {
 				if (label.startsWith(key)) {
 					labels.push({
diff --git a/extensions/git/src/operation.ts b/extensions/git/src/operation.ts
index 13370d59bf7..d960cedfdbb 100644
--- a/extensions/git/src/operation.ts
+++ b/extensions/git/src/operation.ts
@@ -158,7 +158,7 @@ export const Operation = {
 	GetRemoteRefs: { kind: OperationKind.GetRemoteRefs, blocking: false, readOnly: true, remote: true, retry: false, showProgress: false } as GetRemoteRefsOperation,
 	HashObject: { kind: OperationKind.HashObject, blocking: false, readOnly: false, remote: false, retry: false, showProgress: true } as HashObjectOperation,
 	Ignore: { kind: OperationKind.Ignore, blocking: false, readOnly: false, remote: false, retry: false, showProgress: true } as IgnoreOperation,
-	Log: { kind: OperationKind.Log, blocking: false, readOnly: true, remote: false, retry: false, showProgress: true } as LogOperation,
+	Log: (showProgress: boolean) => ({ kind: OperationKind.Log, blocking: false, readOnly: true, remote: false, retry: false, showProgress }) as LogOperation,
 	LogFile: { kind: OperationKind.LogFile, blocking: false, readOnly: true, remote: false, retry: false, showProgress: false } as LogFileOperation,
 	Merge: { kind: OperationKind.Merge, blocking: false, readOnly: false, remote: false, retry: false, showProgress: true } as MergeOperation,
 	MergeAbort: { kind: OperationKind.MergeAbort, blocking: false, readOnly: false, remote: false, retry: false, showProgress: true } as MergeAbortOperation,
diff --git a/extensions/git/src/repository.ts b/extensions/git/src/repository.ts
index 5c14345e61a..8ba56b1a1ed 100644
--- a/extensions/git/src/repository.ts
+++ b/extensions/git/src/repository.ts
@@ -718,6 +718,8 @@ export class Repository implements Disposable {
 	private _untrackedGroup: SourceControlResourceGroup;
 	get untrackedGroup(): GitResourceGroup { return this._untrackedGroup as GitResourceGroup; }
 
+	private _EMPTY_TREE: string | undefined;
+
 	private _HEAD: Branch | undefined;
 	get HEAD(): Branch | undefined {
 		return this._HEAD;
@@ -1046,8 +1048,9 @@ export class Repository implements Disposable {
 		return this.run(Operation.Config(false), () => this.repository.config('local', key, value));
 	}
 
-	log(options?: LogOptions): Promise<Commit[]> {
-		return this.run(Operation.Log, () => this.repository.log(options));
+	log(options?: LogOptions & { silent?: boolean }): Promise<Commit[]> {
+		const showProgress = !options || options.silent !== true;
+		return this.run(Operation.Log(showProgress), () => this.repository.log(options));
 	}
 
 	logFile(uri: Uri, options?: LogFileOptions): Promise<Commit[]> {
@@ -1112,6 +1115,10 @@ export class Repository implements Disposable {
 		return this.run(Operation.Diff, () => this.repository.diffBetweenShortStat(ref1, ref2));
 	}
 
+	diffTrees(treeish1: string, treeish2?: string): Promise<Change[]> {
+		return this.run(Operation.Diff, () => this.repository.diffTrees(treeish1, treeish2));
+	}
+
 	getMergeBase(ref1: string, ref2: string, ...refs: string[]): Promise<string | undefined> {
 		return this.run(Operation.MergeBase, () => this.repository.getMergeBase(ref1, ref2, ...refs));
 	}
@@ -1602,6 +1609,15 @@ export class Repository implements Disposable {
 		return await this.repository.getCommit(ref);
 	}
 
+	async getEmptyTree(): Promise<string> {
+		if (!this._EMPTY_TREE) {
+			const result = await this.repository.exec(['hash-object', '-t', 'tree', '/dev/null']);
+			this._EMPTY_TREE = result.stdout.trim();
+		}
+
+		return this._EMPTY_TREE;
+	}
+
 	async getCommitCount(range: string): Promise<{ ahead: number; behind: number }> {
 		return await this.run(Operation.RevList, () => this.repository.getCommitCount(range));
 	}
@@ -1819,7 +1835,7 @@ export class Repository implements Disposable {
 			return true;
 		}
 
-		const maybeRebased = await this.run(Operation.Log, async () => {
+		const maybeRebased = await this.run(Operation.Log(true), async () => {
 			try {
 				const result = await this.repository.exec(['log', '--oneline', '--cherry', `${currentBranch ?? ''}...${currentBranch ?? ''}@{upstream}`, '--']);
 				if (result.exitCode) {
@@ -1943,7 +1959,8 @@ export class Repository implements Disposable {
 		return await this.run(Operation.Ignore, async () => {
 			const ignoreFile = `${this.repository.root}${path.sep}.gitignore`;
 			const textToAppend = files
-				.map(uri => relativePath(this.repository.root, uri.fsPath).replace(/\\/g, '/'))
+				.map(uri => relativePath(this.repository.root, uri.fsPath)
+					.replace(/\\|\[/g, match => match === '\\' ? '/' : `\\${match}`))
 				.join('\n');
 
 			const document = await new Promise(c => fs.exists(ignoreFile, c))
diff --git a/extensions/git/src/terminal.ts b/extensions/git/src/terminal.ts
index 867fddced84..05a4366d0c8 100644
--- a/extensions/git/src/terminal.ts
+++ b/extensions/git/src/terminal.ts
@@ -54,8 +54,8 @@ export class TerminalEnvironmentManager {
 
 export class TerminalShellExecutionManager {
 	private readonly subcommands = new Set<string>([
-		'add', 'branch', 'checkout', 'clean', 'commit',
-		'fetch', 'reset', 'revert', 'pull', 'push', 'switch']);
+		'add', 'branch', 'checkout', 'cherry-pick', 'clean', 'commit', 'fetch', 'merge',
+		'mv', 'rebase', 'reset', 'restore', 'revert', 'rm', 'pull', 'push', 'stash', 'switch']);
 
 	private readonly disposables: IDisposable[] = [];
 
diff --git a/extensions/git/tsconfig.json b/extensions/git/tsconfig.json
index 54d58aac432..75fb8217df7 100644
--- a/extensions/git/tsconfig.json
+++ b/extensions/git/tsconfig.json
@@ -20,7 +20,6 @@
 		"../../src/vscode-dts/vscode.proposed.scmTextDocument.d.ts",
 		"../../src/vscode-dts/vscode.proposed.tabInputMultiDiff.d.ts",
 		"../../src/vscode-dts/vscode.proposed.tabInputTextMerge.d.ts",
-		"../../src/vscode-dts/vscode.proposed.terminalShellIntegration.d.ts",
 		"../../src/vscode-dts/vscode.proposed.timeline.d.ts",
 		"../../src/vscode-dts/vscode.proposed.quickInputButtonLocation.d.ts",
 		"../types/lib.textEncoder.d.ts"
diff --git a/extensions/github-authentication/package.json b/extensions/github-authentication/package.json
index 3306b4b9042..7fcbc7f151c 100644
--- a/extensions/github-authentication/package.json
+++ b/extensions/github-authentication/package.json
@@ -13,9 +13,6 @@
     "Other"
   ],
   "api": "none",
-  "enabledApiProposals": [
-    "authGetSessions"
-  ],
   "extensionKind": [
     "ui",
     "workspace"
diff --git a/extensions/github-authentication/src/github.ts b/extensions/github-authentication/src/github.ts
index 39557dc8e26..ed584c65f8b 100644
--- a/extensions/github-authentication/src/github.ts
+++ b/extensions/github-authentication/src/github.ts
@@ -11,7 +11,7 @@ import { PromiseAdapter, arrayEquals, promiseFromEvent } from './common/utils';
 import { ExperimentationTelemetry } from './common/experimentationService';
 import { Log } from './common/logger';
 import { crypto } from './node/crypto';
-import { CANCELLATION_ERROR, TIMED_OUT_ERROR, USER_CANCELLATION_ERROR } from './common/errors';
+import { TIMED_OUT_ERROR, USER_CANCELLATION_ERROR } from './common/errors';
 
 interface SessionData {
 	id: string;
@@ -316,39 +316,13 @@ export class GitHubAuthenticationProvider implements vscode.AuthenticationProvid
 
 			const sessions = await this._sessionsPromise;
 
-			const forcedLogin = options?.account?.label;
-			const backupLogin = sessions[0]?.account.label;
-			this._logger.info(`Logging in with '${forcedLogin ? forcedLogin : 'any'}' account...`);
+			// First we use the account specified in the options, otherwise we use the first account we have to seed auth.
+			const loginWith = options?.account?.label ?? sessions[0]?.account.label;
+			this._logger.info(`Logging in with '${loginWith ? loginWith : 'any'}' account...`);
 
 			const scopeString = sortedScopes.join(' ');
-			const token = await this._githubServer.login(scopeString, forcedLogin ?? backupLogin);
+			const token = await this._githubServer.login(scopeString, loginWith);
 			const session = await this.tokenToSession(token, scopes);
-
-			// If an account was specified, we should ensure that the token we got back is for that account.
-			if (forcedLogin) {
-				if (session.account.label !== forcedLogin) {
-					const keepNewAccount = vscode.l10n.t('Keep {0}', session.account.label);
-					const tryAgain = vscode.l10n.t('Login with {0}', forcedLogin);
-					const result = await vscode.window.showWarningMessage(
-						vscode.l10n.t('Incorrect account detected'),
-						{ modal: true, detail: vscode.l10n.t('The chosen account, {0}, does not match the requested account, {1}.', session.account.label, forcedLogin) },
-						keepNewAccount,
-						tryAgain
-					);
-					if (result === tryAgain) {
-						return await this.createSession(scopes, {
-							...options,
-							// The id doesn't matter here, we just need to pass the label through
-							account: { id: forcedLogin, label: forcedLogin }
-						});
-					}
-					// Cancelled result
-					if (!result) {
-						throw new Error(CANCELLATION_ERROR);
-					}
-					// Keep result continues on
-				}
-			}
 			this.afterSessionLoad(session);
 
 			const sessionIndex = sessions.findIndex(
diff --git a/extensions/github-authentication/tsconfig.json b/extensions/github-authentication/tsconfig.json
index 70eba984a26..5e4713e9f3b 100644
--- a/extensions/github-authentication/tsconfig.json
+++ b/extensions/github-authentication/tsconfig.json
@@ -12,7 +12,6 @@
 	},
 	"include": [
 		"src/**/*",
-		"../../src/vscode-dts/vscode.d.ts",
-		"../../src/vscode-dts/vscode.proposed.authGetSessions.d.ts"
+		"../../src/vscode-dts/vscode.d.ts"
 	]
 }
diff --git a/extensions/html-language-features/package.json b/extensions/html-language-features/package.json
index ac026b973eb..913826409aa 100644
--- a/extensions/html-language-features/package.json
+++ b/extensions/html-language-features/package.json
@@ -259,7 +259,7 @@
   },
   "dependencies": {
     "@vscode/extension-telemetry": "^0.9.0",
-    "vscode-languageclient": "^10.0.0-next.8",
+    "vscode-languageclient": "10.0.0-next.8",
     "vscode-uri": "^3.0.8"
   },
   "devDependencies": {
diff --git a/extensions/html-language-features/server/package.json b/extensions/html-language-features/server/package.json
index c1ddc242fa4..3698bf8f9a3 100644
--- a/extensions/html-language-features/server/package.json
+++ b/extensions/html-language-features/server/package.json
@@ -10,10 +10,10 @@
   "main": "./out/node/htmlServerMain",
   "dependencies": {
     "@vscode/l10n": "^0.0.18",
-    "vscode-css-languageservice": "^6.3.0",
-    "vscode-html-languageservice": "^5.3.0",
-    "vscode-languageserver": "^10.0.0-next.6",
-    "vscode-languageserver-textdocument": "^1.0.11",
+    "vscode-css-languageservice": "^6.3.1",
+    "vscode-html-languageservice": "^5.3.1",
+    "vscode-languageserver": "10.0.0-next.6",
+    "vscode-languageserver-textdocument": "^1.0.12",
     "vscode-uri": "^3.0.8"
   },
   "devDependencies": {
diff --git a/extensions/html-language-features/server/yarn.lock b/extensions/html-language-features/server/yarn.lock
index caaf929d895..1d915ccf107 100644
--- a/extensions/html-language-features/server/yarn.lock
+++ b/extensions/html-language-features/server/yarn.lock
@@ -24,23 +24,23 @@ undici-types@~5.26.4:
   resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
   integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
 
-vscode-css-languageservice@^6.3.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-6.3.0.tgz#51724d193d19b1a9075b1cef5cfeea6a555d2aa4"
-  integrity sha512-nU92imtkgzpCL0xikrIb8WvedV553F2BENzgz23wFuok/HLN5BeQmroMy26pUwFxV2eV8oNRmYCUv8iO7kSMhw==
+vscode-css-languageservice@^6.3.1:
+  version "6.3.1"
+  resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-6.3.1.tgz#56733c90686db56855ccc156a534a68b8c1f2187"
+  integrity sha512-1BzTBuJfwMc3A0uX4JBdJgoxp74cjj4q2mDJdp49yD/GuAq4X0k5WtK6fNcMYr+FfJ9nqgR6lpfCSZDkARJ5qQ==
   dependencies:
     "@vscode/l10n" "^0.0.18"
-    vscode-languageserver-textdocument "^1.0.11"
+    vscode-languageserver-textdocument "^1.0.12"
     vscode-languageserver-types "3.17.5"
     vscode-uri "^3.0.8"
 
-vscode-html-languageservice@^5.3.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/vscode-html-languageservice/-/vscode-html-languageservice-5.3.0.tgz#298ae5600c6749cbb95838975d07f449c44cb478"
-  integrity sha512-C4Z3KsP5Ih+fjHpiBc5jxmvCl+4iEwvXegIrzu2F5pktbWvQaBT3YkVPk8N+QlSSMk8oCG6PKtZ/Sq2YHb5e8g==
+vscode-html-languageservice@^5.3.1:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/vscode-html-languageservice/-/vscode-html-languageservice-5.3.1.tgz#93cac1cebb42165b52a15220f02c47d1320fc43a"
+  integrity sha512-ysUh4hFeW/WOWz/TO9gm08xigiSsV/FOAZ+DolgJfeLftna54YdmZ4A+lIn46RbdO3/Qv5QHTn1ZGqmrXQhZyA==
   dependencies:
     "@vscode/l10n" "^0.0.18"
-    vscode-languageserver-textdocument "^1.0.11"
+    vscode-languageserver-textdocument "^1.0.12"
     vscode-languageserver-types "^3.17.5"
     vscode-uri "^3.0.8"
 
@@ -57,10 +57,10 @@ vscode-languageserver-protocol@3.17.6-next.6:
     vscode-jsonrpc "9.0.0-next.4"
     vscode-languageserver-types "3.17.6-next.4"
 
-vscode-languageserver-textdocument@^1.0.11:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.11.tgz#0822a000e7d4dc083312580d7575fe9e3ba2e2bf"
-  integrity sha512-X+8T3GoiwTVlJbicx/sIAF+yuJAqz8VvwJyoMVhwEMoEKE/fkDmrqUgDMyBECcM2A2frVZIUj5HI/ErRXCfOeA==
+vscode-languageserver-textdocument@^1.0.12:
+  version "1.0.12"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.12.tgz#457ee04271ab38998a093c68c2342f53f6e4a631"
+  integrity sha512-cxWNPesCnQCcMPeenjKKsOCKQZ/L6Tv19DTRIGuLWe32lyzWhihGVJ/rcckZXJxfdKCFvRLS3fpBIsV/ZGX4zA==
 
 vscode-languageserver-types@3.17.5, vscode-languageserver-types@^3.17.5:
   version "3.17.5"
@@ -72,7 +72,7 @@ vscode-languageserver-types@3.17.6-next.4:
   resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.6-next.4.tgz#6670939eb98f00aa7b05021dc3dd7fe9aa4453ea"
   integrity sha512-SeJTpH/S14EbxOAVaOUoGVqPToqpRTld5QO5Ghig3AlbFJTFF9Wu7srHMfa85L0SX1RYAuuCSFKJVVCxDIk1/Q==
 
-vscode-languageserver@^10.0.0-next.6:
+vscode-languageserver@10.0.0-next.6:
   version "10.0.0-next.6"
   resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-10.0.0-next.6.tgz#0db118a93fe010c6b40cd04e91a15d09e7b60b60"
   integrity sha512-0Lh1nhQfSxo5Ob+ayYO1QTIsDix2/Lc72Urm1KZrCFxK5zIFYaEh3QFeM9oZih4Rzs0ZkQPXXnoHtpvs5GT+Zw==
diff --git a/extensions/html-language-features/yarn.lock b/extensions/html-language-features/yarn.lock
index aa2ea1c6840..46688b667d8 100644
--- a/extensions/html-language-features/yarn.lock
+++ b/extensions/html-language-features/yarn.lock
@@ -154,7 +154,7 @@ vscode-jsonrpc@9.0.0-next.4:
   resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-9.0.0-next.4.tgz#ba403ddb3b82ca578179963dbe08e120a935f50d"
   integrity sha512-zSVIr58lJSMYKIsZ5P7GtBbv1eEx25eNyOf0NmEzxmn1GhUNJAVAb5hkA1poKUwj1FRMwN6CeyWxZypmr8SsQQ==
 
-vscode-languageclient@^10.0.0-next.8:
+vscode-languageclient@10.0.0-next.8:
   version "10.0.0-next.8"
   resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-10.0.0-next.8.tgz#5afa0ced3b2ac68d31cc1c48edc4f289744542a0"
   integrity sha512-D9inIHgqKayO9Tv0MeLb3XIL76yTuWmKdHqcGZKzjtQrMGJgASJDYWTapu+yAjEpDp0gmVOaCYyIlLB86ncDoQ==
diff --git a/extensions/ipynb/src/serializers.ts b/extensions/ipynb/src/serializers.ts
index 3eb6e90eabd..eedad802742 100644
--- a/extensions/ipynb/src/serializers.ts
+++ b/extensions/ipynb/src/serializers.ts
@@ -123,7 +123,10 @@ function createCodeCellFromNotebookCell(cell: NotebookCellData, preferredLanguag
 
 	const codeCell: any = {
 		cell_type: 'code',
-		execution_count: cell.executionSummary?.executionOrder ?? null,
+		// Possible the metadata was edited as part of diff view
+		// In diff view we display execution_count as part of metadata, hence when execution count changes in metadata,
+		// We need to change that here as well, i.e. give preference to any execution_count value in metadata.
+		execution_count: cellMetadata.execution_count ?? cell.executionSummary?.executionOrder ?? null,
 		source: splitMultilineString(cell.value.replace(/\r\n/g, '\n')),
 		outputs: (cell.outputs || []).map(translateCellDisplayOutput),
 		metadata: cellMetadata.metadata
diff --git a/extensions/json-language-features/package.json b/extensions/json-language-features/package.json
index fa8004e2b02..dc9d4a272eb 100644
--- a/extensions/json-language-features/package.json
+++ b/extensions/json-language-features/package.json
@@ -162,8 +162,8 @@
   },
   "dependencies": {
     "@vscode/extension-telemetry": "^0.9.0",
-    "request-light": "^0.7.0",
-    "vscode-languageclient": "^10.0.0-next.8"
+    "request-light": "^0.8.0",
+    "vscode-languageclient": "10.0.0-next.8"
   },
   "devDependencies": {
     "@types/node": "20.x"
diff --git a/extensions/json-language-features/server/package.json b/extensions/json-language-features/server/package.json
index 8472ca618a4..1ac5eb9159d 100644
--- a/extensions/json-language-features/server/package.json
+++ b/extensions/json-language-features/server/package.json
@@ -13,10 +13,10 @@
   "main": "./out/node/jsonServerMain",
   "dependencies": {
     "@vscode/l10n": "^0.0.18",
-    "jsonc-parser": "^3.2.1",
-    "request-light": "^0.7.0",
-    "vscode-json-languageservice": "^5.4.0",
-    "vscode-languageserver": "^10.0.0-next.6",
+    "jsonc-parser": "^3.3.1",
+    "request-light": "^0.8.0",
+    "vscode-json-languageservice": "^5.4.1",
+    "vscode-languageserver": "10.0.0-next.6",
     "vscode-uri": "^3.0.8"
   },
   "devDependencies": {
diff --git a/extensions/json-language-features/server/yarn.lock b/extensions/json-language-features/server/yarn.lock
index 608619637e4..4c7fd8191a7 100644
--- a/extensions/json-language-features/server/yarn.lock
+++ b/extensions/json-language-features/server/yarn.lock
@@ -19,34 +19,29 @@
   resolved "https://registry.yarnpkg.com/@vscode/l10n/-/l10n-0.0.18.tgz#916d3a5e960dbab47c1c56f58a7cb5087b135c95"
   integrity sha512-KYSIHVmslkaCDyw013pphY+d7x1qV8IZupYfeIfzNA+nsaWHbn5uPuQRvdRFsa9zFzGeudPuoGoZ1Op4jrJXIQ==
 
-jsonc-parser@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.2.1.tgz#031904571ccf929d7670ee8c547545081cb37f1a"
-  integrity sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA==
+jsonc-parser@^3.3.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.3.1.tgz#f2a524b4f7fd11e3d791e559977ad60b98b798b4"
+  integrity sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==
 
-jsonc-parser@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.3.0.tgz#030d182672c8ffc2805db95467c83ffc0b033d9d"
-  integrity sha512-RK1Xb5alM78sdXpB2hqqK7jxAE5jTRH05GvUiLWqh7Vbp6OPHuJYlsAMRUDYNYJTAQgkmhHgkdwOEknxwP4ojQ==
-
-request-light@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/request-light/-/request-light-0.7.0.tgz#885628bb2f8040c26401ebf258ec51c4ae98ac2a"
-  integrity sha512-lMbBMrDoxgsyO+yB3sDcrDuX85yYt7sS8BfQd11jtbW/z5ZWgLZRcEGLsLoYw7I0WSUGQBs8CC8ScIxkTX1+6Q==
+request-light@^0.8.0:
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/request-light/-/request-light-0.8.0.tgz#6ec01e4b526638358c2c6353efa1c6aaf057dfa0"
+  integrity sha512-bH6E4PMmsEXYrLX6Kr1vu+xI3HproB1vECAwaPSJeroLE1kpWE3HR27uB4icx+6YORu1ajqBJXxuedv8ZQg5Lw==
 
 undici-types@~5.26.4:
   version "5.26.5"
   resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
   integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
 
-vscode-json-languageservice@^5.4.0:
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/vscode-json-languageservice/-/vscode-json-languageservice-5.4.0.tgz#caf1aabc81b1df9faf6a97e4c34e13a2d10a8cdf"
-  integrity sha512-NCkkCr63OHVkE4lcb0xlUAaix6vE5gHQW4NrswbLEh3ArXj81lrGuFTsGEYEUXlNHdnc53vWPcjeSy/nMTrfXg==
+vscode-json-languageservice@^5.4.1:
+  version "5.4.1"
+  resolved "https://registry.yarnpkg.com/vscode-json-languageservice/-/vscode-json-languageservice-5.4.1.tgz#dc9d3b96c714d8d4feb58a219747b1239d6dd5e6"
+  integrity sha512-5czFGNyVPxz3ZJYl8R3a3SuIj5gjhmGF4Wv05MRPvD4DEnHK6b8km4VbNMJNHBlTCh7A0aHzUbPVzo+0C18mCA==
   dependencies:
     "@vscode/l10n" "^0.0.18"
-    jsonc-parser "^3.3.0"
-    vscode-languageserver-textdocument "^1.0.11"
+    jsonc-parser "^3.3.1"
+    vscode-languageserver-textdocument "^1.0.12"
     vscode-languageserver-types "^3.17.5"
     vscode-uri "^3.0.8"
 
@@ -63,10 +58,10 @@ vscode-languageserver-protocol@3.17.6-next.6:
     vscode-jsonrpc "9.0.0-next.4"
     vscode-languageserver-types "3.17.6-next.4"
 
-vscode-languageserver-textdocument@^1.0.11:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.11.tgz#0822a000e7d4dc083312580d7575fe9e3ba2e2bf"
-  integrity sha512-X+8T3GoiwTVlJbicx/sIAF+yuJAqz8VvwJyoMVhwEMoEKE/fkDmrqUgDMyBECcM2A2frVZIUj5HI/ErRXCfOeA==
+vscode-languageserver-textdocument@^1.0.12:
+  version "1.0.12"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.12.tgz#457ee04271ab38998a093c68c2342f53f6e4a631"
+  integrity sha512-cxWNPesCnQCcMPeenjKKsOCKQZ/L6Tv19DTRIGuLWe32lyzWhihGVJ/rcckZXJxfdKCFvRLS3fpBIsV/ZGX4zA==
 
 vscode-languageserver-types@3.17.6-next.4:
   version "3.17.6-next.4"
@@ -78,7 +73,7 @@ vscode-languageserver-types@^3.17.5:
   resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.5.tgz#3273676f0cf2eab40b3f44d085acbb7f08a39d8a"
   integrity sha512-Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg==
 
-vscode-languageserver@^10.0.0-next.6:
+vscode-languageserver@10.0.0-next.6:
   version "10.0.0-next.6"
   resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-10.0.0-next.6.tgz#0db118a93fe010c6b40cd04e91a15d09e7b60b60"
   integrity sha512-0Lh1nhQfSxo5Ob+ayYO1QTIsDix2/Lc72Urm1KZrCFxK5zIFYaEh3QFeM9oZih4Rzs0ZkQPXXnoHtpvs5GT+Zw==
diff --git a/extensions/json-language-features/yarn.lock b/extensions/json-language-features/yarn.lock
index c825de07683..82a6ebb8e49 100644
--- a/extensions/json-language-features/yarn.lock
+++ b/extensions/json-language-features/yarn.lock
@@ -137,10 +137,10 @@ minimatch@^9.0.3:
   dependencies:
     brace-expansion "^2.0.1"
 
-request-light@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/request-light/-/request-light-0.7.0.tgz#885628bb2f8040c26401ebf258ec51c4ae98ac2a"
-  integrity sha512-lMbBMrDoxgsyO+yB3sDcrDuX85yYt7sS8BfQd11jtbW/z5ZWgLZRcEGLsLoYw7I0WSUGQBs8CC8ScIxkTX1+6Q==
+request-light@^0.8.0:
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/request-light/-/request-light-0.8.0.tgz#6ec01e4b526638358c2c6353efa1c6aaf057dfa0"
+  integrity sha512-bH6E4PMmsEXYrLX6Kr1vu+xI3HproB1vECAwaPSJeroLE1kpWE3HR27uB4icx+6YORu1ajqBJXxuedv8ZQg5Lw==
 
 semver@^7.6.0:
   version "7.6.0"
@@ -159,7 +159,7 @@ vscode-jsonrpc@9.0.0-next.4:
   resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-9.0.0-next.4.tgz#ba403ddb3b82ca578179963dbe08e120a935f50d"
   integrity sha512-zSVIr58lJSMYKIsZ5P7GtBbv1eEx25eNyOf0NmEzxmn1GhUNJAVAb5hkA1poKUwj1FRMwN6CeyWxZypmr8SsQQ==
 
-vscode-languageclient@^10.0.0-next.8:
+vscode-languageclient@10.0.0-next.8:
   version "10.0.0-next.8"
   resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-10.0.0-next.8.tgz#5afa0ced3b2ac68d31cc1c48edc4f289744542a0"
   integrity sha512-D9inIHgqKayO9Tv0MeLb3XIL76yTuWmKdHqcGZKzjtQrMGJgASJDYWTapu+yAjEpDp0gmVOaCYyIlLB86ncDoQ==
diff --git a/extensions/julia/cgmanifest.json b/extensions/julia/cgmanifest.json
index 9daaee1fdd8..b5d8a03be09 100644
--- a/extensions/julia/cgmanifest.json
+++ b/extensions/julia/cgmanifest.json
@@ -6,11 +6,11 @@
 				"git": {
 					"name": "JuliaEditorSupport/atom-language-julia",
 					"repositoryUrl": "https://github.com/JuliaEditorSupport/atom-language-julia",
-					"commitHash": "663bf8d943fd8440f4ae7565f73327dd616bf191"
+					"commitHash": "c686684f18153687886e7d19c1bfc3a33076b1ab"
 				}
 			},
 			"license": "MIT",
-			"version": "0.22.1"
+			"version": "0.23.0"
 		}
 	],
 	"version": 1
diff --git a/extensions/julia/syntaxes/julia.tmLanguage.json b/extensions/julia/syntaxes/julia.tmLanguage.json
index 35a4ea7d927..f66fda97f70 100644
--- a/extensions/julia/syntaxes/julia.tmLanguage.json
+++ b/extensions/julia/syntaxes/julia.tmLanguage.json
@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/JuliaEditorSupport/atom-language-julia/commit/663bf8d943fd8440f4ae7565f73327dd616bf191",
+	"version": "https://github.com/JuliaEditorSupport/atom-language-julia/commit/c686684f18153687886e7d19c1bfc3a33076b1ab",
 	"name": "Julia",
 	"scopeName": "source.julia",
 	"comment": "This grammar is used by Atom (Oniguruma), GitHub (PCRE), and VSCode (Oniguruma),\nso all regexps must be compatible with both engines.\n\nSpecs:\n- https://github.com/kkos/oniguruma/blob/master/doc/RE\n- https://www.pcre.org/current/doc/html/",
@@ -333,7 +333,7 @@
 					"name": "keyword.control.using.julia"
 				},
 				{
-					"match": "(?<=\\w\\s)\\b(as)\\b(?=\\s\\w)",
+					"match": "(?<=\\S\\s+)\\b(as)\\b(?=\\s+\\S)",
 					"name": "keyword.control.as.julia"
 				},
 				{
diff --git a/extensions/latex/cgmanifest.json b/extensions/latex/cgmanifest.json
index b537c48ee8c..3c7203d5d2a 100644
--- a/extensions/latex/cgmanifest.json
+++ b/extensions/latex/cgmanifest.json
@@ -6,7 +6,7 @@
 				"git": {
 					"name": "jlelong/vscode-latex-basics",
 					"repositoryUrl": "https://github.com/jlelong/vscode-latex-basics",
-					"commitHash": "5d7c2a4e451a932b776f6d9342087be6a1e8c0a1"
+					"commitHash": "969429cb9230a63f9155987f069acd4234d10e1a"
 				}
 			},
 			"license": "MIT",
diff --git a/extensions/latex/syntaxes/LaTeX.tmLanguage.json b/extensions/latex/syntaxes/LaTeX.tmLanguage.json
index 76486732195..bc97a73bda8 100644
--- a/extensions/latex/syntaxes/LaTeX.tmLanguage.json
+++ b/extensions/latex/syntaxes/LaTeX.tmLanguage.json
@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/jlelong/vscode-latex-basics/commit/9cd6bc151f4b9df5d9aeb1e39e30071018d3cb2a",
+	"version": "https://github.com/jlelong/vscode-latex-basics/commit/969429cb9230a63f9155987f069acd4234d10e1a",
 	"name": "LaTeX",
 	"scopeName": "text.tex.latex",
 	"patterns": [
@@ -94,7 +94,7 @@
 				"4": {
 					"patterns": [
 						{
-							"include": "#optional-arg"
+							"include": "#optional-arg-bracket"
 						}
 					]
 				},
@@ -1900,7 +1900,7 @@
 				"3": {
 					"patterns": [
 						{
-							"include": "#optional-arg"
+							"include": "#optional-arg-bracket"
 						}
 					]
 				},
@@ -1910,7 +1910,7 @@
 				"5": {
 					"patterns": [
 						{
-							"include": "#optional-arg"
+							"include": "#optional-arg-bracket"
 						}
 					]
 				},
@@ -2368,7 +2368,7 @@
 				"3": {
 					"patterns": [
 						{
-							"include": "#optional-arg"
+							"include": "#optional-arg-bracket"
 						}
 					]
 				},
@@ -2404,7 +2404,7 @@
 				"3": {
 					"patterns": [
 						{
-							"include": "#optional-arg"
+							"include": "#optional-arg-bracket"
 						}
 					]
 				},
@@ -2562,7 +2562,7 @@
 			"name": "meta.scope.item.latex"
 		},
 		{
-			"begin": "((\\\\)(?:[aA]uto|foot|full|no|ref|short|[tT]ext|[pP]aren|[sS]mart)?[cC]ite(?:al)?(?:p|s|t|author|year(?:par)?|title)?[ANP]*\\*?)((?:(?:\\([^\\)]*\\)){0,2}(?:\\[[^\\]]*\\]){0,2}\\{[\\p{Alphabetic}:.]*\\})*)(?:([<\\[])[^\\]<>]*([>\\]]))?(?:(\\[)[^\\]]*(\\]))?(\\{)",
+			"begin": "((\\\\)(?:[aA]uto|foot|full|no|ref|short|[tT]ext|[pP]aren|[sS]mart)?[cC]ite(?:al)?(?:p|s|t|author|year(?:par)?|title)?[ANP]*\\*?)((?:(?:\\([^\\)]*\\)){0,2}(?:\\[[^\\]]*\\]){0,2}\\{[\\p{Alphabetic}\\p{Number}_:.-]*\\})*)(<[^\\]<>]*>)?((?:\\[[^\\]]*\\])*)(\\{)",
 			"captures": {
 				"1": {
 					"name": "keyword.control.cite.latex"
@@ -2578,18 +2578,20 @@
 					]
 				},
 				"4": {
-					"name": "punctuation.definition.arguments.optional.begin.latex"
+					"patterns": [
+						{
+							"include": "#optional-arg-angle-no-highlight"
+						}
+					]
 				},
 				"5": {
-					"name": "punctuation.definition.arguments.optional.end.latex"
+					"patterns": [
+						{
+							"include": "#optional-arg-bracket-no-highlight"
+						}
+					]
 				},
 				"6": {
-					"name": "punctuation.definition.arguments.optional.begin.latex"
-				},
-				"7": {
-					"name": "punctuation.definition.arguments.optional.end.latex"
-				},
-				"8": {
 					"name": "punctuation.definition.arguments.begin.latex"
 				}
 			},
@@ -2602,6 +2604,7 @@
 			"name": "meta.citation.latex",
 			"patterns": [
 				{
+					"match": "((%).*)$",
 					"captures": {
 						"1": {
 							"name": "comment.line.percentage.tex"
@@ -2609,8 +2612,7 @@
 						"2": {
 							"name": "punctuation.definition.comment.tex"
 						}
-					},
-					"match": "((%).*)$"
+					}
 				},
 				{
 					"match": "[\\p{Alphabetic}\\p{Number}:.-]+",
@@ -2740,7 +2742,7 @@
 				"3": {
 					"patterns": [
 						{
-							"include": "#optional-arg"
+							"include": "#optional-arg-bracket"
 						}
 					]
 				},
@@ -2783,7 +2785,7 @@
 				"3": {
 					"patterns": [
 						{
-							"include": "#optional-arg"
+							"include": "#optional-arg-bracket"
 						}
 					]
 				},
@@ -2820,7 +2822,7 @@
 				"3": {
 					"patterns": [
 						{
-							"include": "#optional-arg"
+							"include": "#optional-arg-bracket"
 						}
 					]
 				},
@@ -2867,7 +2869,7 @@
 				"3": {
 					"patterns": [
 						{
-							"include": "#optional-arg"
+							"include": "#optional-arg-bracket"
 						}
 					]
 				},
@@ -3048,7 +3050,7 @@
 					"name": "punctuation.definition.variable.latex"
 				}
 			},
-			"match": "(\\\\)[cgl](?:[_\\p{Alphabetic}@]+)+_[a-z]+",
+			"match": "(\\\\)(?:[cgl]_+[_\\p{Alphabetic}@]+_[a-z]+|[qs]_[_\\p{Alphabetic}@]+[\\p{Alphabetic}@])",
 			"name": "variable.other.latex3.latex"
 		},
 		{
@@ -3073,27 +3075,29 @@
 				{
 					"captures": {
 						"1": {
-							"name": "punctuation.definition.arguments.optional.begin.latex"
+							"patterns": [
+								{
+									"include": "#optional-arg-parenthesis-no-highlight"
+								}
+							]
 						},
 						"2": {
-							"name": "punctuation.definition.arguments.optional.end.latex"
+							"patterns": [
+								{
+									"include": "#optional-arg-bracket-no-highlight"
+								}
+							]
 						},
 						"3": {
-							"name": "punctuation.definition.arguments.optional.begin.latex"
-						},
-						"4": {
-							"name": "punctuation.definition.arguments.optional.end.latex"
-						},
-						"5": {
 							"name": "punctuation.definition.arguments.begin.latex"
 						},
-						"6": {
+						"4": {
 							"name": "constant.other.reference.citation.latex"
 						},
-						"7": {
+						"5": {
 							"name": "punctuation.definition.arguments.end.latex"
 						},
-						"8": {
+						"6": {
 							"patterns": [
 								{
 									"include": "#autocites-arg"
@@ -3101,7 +3105,7 @@
 							]
 						}
 					},
-					"match": "(?:(\\()[^\\)]*(\\))){0,2}(?:(\\[)[^\\]]*(\\])){0,2}(\\{)([\\p{Alphabetic}\\p{Number}:.]+)(\\})(.*)"
+					"match": "((?:\\([^\\)]*\\)){0,2})((?:\\[[^\\]]*\\]){0,2})(\\{)([\\p{Alphabetic}\\p{Number}_:.-]+)(\\})(.*)"
 				}
 			]
 		},
@@ -3159,7 +3163,7 @@
 				"3": {
 					"patterns": [
 						{
-							"include": "#optional-arg"
+							"include": "#optional-arg-bracket"
 						}
 					]
 				},
@@ -3222,7 +3226,7 @@
 				}
 			]
 		},
-		"optional-arg": {
+		"optional-arg-bracket": {
 			"patterns": [
 				{
 					"captures": {
@@ -3240,6 +3244,73 @@
 					"name": "meta.parameter.optional.latex"
 				}
 			]
+		},
+		"optional-arg-parenthesis": {
+			"patterns": [
+				{
+					"captures": {
+						"1": {
+							"name": "punctuation.definition.arguments.optional.begin.latex"
+						},
+						"2": {
+							"name": "variable.parameter.function.latex"
+						},
+						"3": {
+							"name": "punctuation.definition.arguments.optional.end.latex"
+						}
+					},
+					"match": "(\\()([^\\(]*?)(\\))",
+					"name": "meta.parameter.optional.latex"
+				}
+			]
+		},
+		"optional-arg-bracket-no-highlight": {
+			"patterns": [
+				{
+					"captures": {
+						"1": {
+							"name": "punctuation.definition.arguments.optional.begin.latex"
+						},
+						"2": {
+							"name": "punctuation.definition.arguments.optional.end.latex"
+						}
+					},
+					"match": "(\\[)[^\\[]*?(\\])",
+					"name": "meta.parameter.optional.latex"
+				}
+			]
+		},
+		"optional-arg-angle-no-highlight": {
+			"patterns": [
+				{
+					"captures": {
+						"1": {
+							"name": "punctuation.definition.arguments.optional.begin.latex"
+						},
+						"2": {
+							"name": "punctuation.definition.arguments.optional.end.latex"
+						}
+					},
+					"match": "(<)[^<]*?(>)",
+					"name": "meta.parameter.optional.latex"
+				}
+			]
+		},
+		"optional-arg-parenthesis-no-highlight": {
+			"patterns": [
+				{
+					"captures": {
+						"1": {
+							"name": "punctuation.definition.arguments.optional.begin.latex"
+						},
+						"2": {
+							"name": "punctuation.definition.arguments.optional.end.latex"
+						}
+					},
+					"match": "(\\()[^\\(]*?(\\))",
+					"name": "meta.parameter.optional.latex"
+				}
+			]
 		}
 	}
 }
\ No newline at end of file
diff --git a/extensions/less/cgmanifest.json b/extensions/less/cgmanifest.json
index a8d1702aa82..69a66b5d9b5 100644
--- a/extensions/less/cgmanifest.json
+++ b/extensions/less/cgmanifest.json
@@ -6,7 +6,7 @@
 				"git": {
 					"name": "language-less",
 					"repositoryUrl": "https://github.com/radium-v/Better-Less",
-					"commitHash": "b06a4555c711a6ef0d76cf2b4fc8b929a6ce551a"
+					"commitHash": "fb9c21917193746433743a7c971b70230b40bc2b"
 				}
 			},
 			"license": "MIT",
diff --git a/extensions/less/syntaxes/less.tmLanguage.json b/extensions/less/syntaxes/less.tmLanguage.json
index cea782810fb..6f57a48e02d 100644
--- a/extensions/less/syntaxes/less.tmLanguage.json
+++ b/extensions/less/syntaxes/less.tmLanguage.json
@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/radium-v/Better-Less/commit/b06a4555c711a6ef0d76cf2b4fc8b929a6ce551a",
+	"version": "https://github.com/radium-v/Better-Less/commit/fb9c21917193746433743a7c971b70230b40bc2b",
 	"name": "Less",
 	"scopeName": "source.css.less",
 	"patterns": [
@@ -40,6 +40,14 @@
 			"match": "(?i:[-+]?(?:(?:\\d*\\.\\d+(?:[eE](?:[-+]?\\d+))*)|(?:[-+]?\\d+))(deg|grad|rad|turn))\\b",
 			"name": "constant.numeric.less"
 		},
+		"arbitrary-repetition": {
+			"captures": {
+				"1": {
+					"name": "punctuation.definition.arbitrary-repetition.less"
+				}
+			},
+			"match": "\\s*(?:(,))"
+		},
 		"at-charset": {
 			"begin": "\\s*((@)charset\\b)\\s*",
 			"captures": {
@@ -268,6 +276,9 @@
 					"patterns": [
 						{
 							"include": "#keyframe-name"
+						},
+						{
+							"include": "#arbitrary-repetition"
 						}
 					]
 				}
@@ -700,6 +711,9 @@
 						},
 						{
 							"include": "#less-math"
+						},
+						{
+							"include": "#relative-color"
 						}
 					]
 				}
@@ -718,6 +732,7 @@
 							"name": "support.function.color.less"
 						}
 					},
+					"comment": "rgb(), rgba()",
 					"end": "\\)",
 					"endCaptures": {
 						"0": {
@@ -747,6 +762,9 @@
 								{
 									"include": "#comma-delimiter"
 								},
+								{
+									"include": "#value-separator"
+								},
 								{
 									"include": "#percentage-type"
 								},
@@ -758,12 +776,13 @@
 					]
 				},
 				{
-					"begin": "\\b(hs(l|v)a?|hwb)(?=\\()",
+					"begin": "\\b(hsla|hsl|hwb|oklab|oklch|lab|lch)(?=\\()",
 					"beginCaptures": {
 						"1": {
 							"name": "support.function.color.less"
 						}
 					},
+					"comment": "hsla, hsl, hwb, oklab, oklch, lab, lch",
 					"end": "\\)",
 					"endCaptures": {
 						"0": {
@@ -781,6 +800,9 @@
 							},
 							"end": "(?=\\))",
 							"patterns": [
+								{
+									"include": "#color-values"
+								},
 								{
 									"include": "#less-strings"
 								},
@@ -801,6 +823,47 @@
 								},
 								{
 									"include": "#number-type"
+								},
+								{
+									"include": "#calc-function"
+								},
+								{
+									"include": "#value-separator"
+								}
+							]
+						}
+					]
+				},
+				{
+					"begin": "\\b(light-dark)(?=\\()",
+					"beginCaptures": {
+						"1": {
+							"name": "support.function.color.less"
+						}
+					},
+					"comment": "light-dark()",
+					"end": "\\)",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.group.end.less"
+						}
+					},
+					"name": "meta.function-call.less",
+					"patterns": [
+						{
+							"begin": "\\(",
+							"beginCaptures": {
+								"0": {
+									"name": "punctuation.definition.group.begin.less"
+								}
+							},
+							"end": "(?=\\))",
+							"patterns": [
+								{
+									"include": "#color-values"
+								},
+								{
+									"include": "#comma-delimiter"
 								}
 							]
 						}
@@ -845,6 +908,9 @@
 					},
 					"match": "(#)(\\h{3}|\\h{4}|\\h{6}|\\h{8})\\b",
 					"name": "constant.other.color.rgb-value.less"
+				},
+				{
+					"include": "#relative-color"
 				}
 			]
 		},
@@ -1048,12 +1114,16 @@
 			]
 		},
 		"cubic-bezier-function": {
-			"begin": "\\b(cubic-bezier)(?=\\()",
+			"begin": "\\b(cubic-bezier)(\\()",
 			"beginCaptures": {
-				"0": {
+				"1": {
 					"name": "support.function.timing.less"
+				},
+				"2": {
+					"name": "punctuation.definition.group.begin.less"
 				}
 			},
+			"contentName": "meta.group.less",
 			"end": "\\)",
 			"endCaptures": {
 				"0": {
@@ -1063,24 +1133,22 @@
 			"name": "meta.function-call.less",
 			"patterns": [
 				{
-					"begin": "\\(",
-					"beginCaptures": {
-						"0": {
-							"name": "punctuation.definition.group.begin.less"
-						}
-					},
-					"end": "(?=\\))",
-					"patterns": [
-						{
-							"include": "#var-function"
-						},
-						{
-							"include": "#comma-delimiter"
-						},
-						{
-							"include": "#number-type"
-						}
-					]
+					"include": "#less-functions"
+				},
+				{
+					"include": "#calc-function"
+				},
+				{
+					"include": "#less-variables"
+				},
+				{
+					"include": "#var-function"
+				},
+				{
+					"include": "#comma-delimiter"
+				},
+				{
+					"include": "#number-type"
 				}
 			]
 		},
@@ -1105,13 +1173,13 @@
 					"include": "#frequency-type"
 				},
 				{
-					"include": "#length-type"
+					"include": "#time-type"
 				},
 				{
-					"include": "#resolution-type"
+					"include": "#length-type"
 				},
 				{
-					"include": "#time-type"
+					"include": "#resolution-type"
 				}
 			]
 		},
@@ -1611,6 +1679,15 @@
 				}
 			]
 		},
+		"important": {
+			"captures": {
+				"1": {
+					"name": "punctuation.separator.less"
+				}
+			},
+			"match": "(\\!)\\s*important",
+			"name": "keyword.other.important.less"
+		},
 		"integer-type": {
 			"match": "(?:[-+]?\\d+)",
 			"name": "constant.numeric.less"
@@ -1757,6 +1834,7 @@
 							"name": "support.function.color-definition.less"
 						}
 					},
+					"comment": "argb()",
 					"end": "\\)",
 					"endCaptures": {
 						"0": {
@@ -1786,6 +1864,59 @@
 							]
 						}
 					]
+				},
+				{
+					"begin": "\\b(hsva?)(?=\\()",
+					"beginCaptures": {
+						"1": {
+							"name": "support.function.color.less"
+						}
+					},
+					"comment": "hsva(), hsv()",
+					"end": "\\)",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.group.end.less"
+						}
+					},
+					"name": "meta.function-call.less",
+					"patterns": [
+						{
+							"begin": "\\(",
+							"beginCaptures": {
+								"0": {
+									"name": "punctuation.definition.group.begin.less"
+								}
+							},
+							"end": "(?=\\))",
+							"patterns": [
+								{
+									"include": "#integer-type"
+								},
+								{
+									"include": "#percentage-type"
+								},
+								{
+									"include": "#number-type"
+								},
+								{
+									"include": "#less-strings"
+								},
+								{
+									"include": "#less-variables"
+								},
+								{
+									"include": "#var-function"
+								},
+								{
+									"include": "#calc-function"
+								},
+								{
+									"include": "#comma-delimiter"
+								}
+							]
+						}
+					]
 				}
 			]
 		},
@@ -3515,7 +3646,48 @@
 					"name": "support.constant.property-value.less"
 				},
 				{
-					"match": "(?x)\\b(\n  absolute|active|add\n|all(-(petite|small)-caps|-scroll)?\n|alpha(betic)?\n|alternate(-reverse)?\n|always|annotation|antialiased|at\n|auto(hiding-scrollbar)?\n|avoid(-column|-page|-region)?\n|background(-color|-image|-position|-size)?\n|backwards|balance|baseline|below|bevel|bicubic|bidi-override|blink\n|block(-(line-height|start|end))?\n|blur\n|bold(er)?\n|border(-bottom|-left|-right|-top)?-(color|radius|width|style)\n|border-(bottom|top)-(left|right)-radius\n|border-image(-outset|-repeat|-slice|-source|-width)?\n|border(-bottom|-left|-right|-top|-collapse|-spacing|-box)?\n|both|bottom\n|box(-shadow)?\n|break-(all|word|spaces)\n|brightness\n|butt(on)?\n|capitalize\n|cent(er|ral)\n|char(acter-variant)?\n|cjk-ideographic|clip|clone|close-quote\n|closest-(corner|side)\n|col-resize|collapse\n|color(-stop|-burn|-dodge)?\n|column((-count|-gap|-reverse|-rule(-color|-width)?|-width)|s)?\n|common-ligatures|condensed|consider-shifts|contain\n|content(-box|s)?\n|contextual|contrast|cover\n|crisp(-e|E)dges\n|crop\n|cross(hair)?\n|da(rken|shed)\n|default|dense|diagonal-fractions|difference|disabled\n|discard|discretionary-ligatures|disregard-shifts\n|distribute(-all-lines|-letter|-space)?\n|dotted|double|drop-shadow\n|(nwse|nesw|ns|ew|sw|se|nw|ne|w|s|e|n)-resize\n|ease(-in-out|-in|-out)?\n|element|ellipsis|embed|end|EndColorStr|evenodd\n|exclu(de(-ruby)?|sion)\n|expanded\n|(extra|semi|ultra)-(condensed|expanded)\n|farthest-(corner|side)?\n|fill(-box|-opacity)?\n|filter\n|fit-content\n|fixed\n|flat\n|flex((-basis|-end|-grow|-shrink|-start)|box)?\n|flip|flood-color\n|font(-size(-adjust)?|-stretch|-weight)?\n|forwards\n|from(-image)?\n|full-width|gap|geometricPrecision|glyphs|gradient|grayscale\n|grid((-column|-row)?-gap|-height)?\n|groove|hand|hanging|hard-light|height|help|hidden|hide\n|historical-(forms|ligatures)\n|horizontal(-tb)?\n|hue\n|ideograph(-alpha|-numeric|-parenthesis|-space|ic)\n|inactive|include-ruby|infinite|inherit|initial\n|inline(-(block|box|flex(box)?|line-height|table|start|end))?\n|inset|inside\n|inter(-ideograph|-word|sect)\n|invert|isolat(e|ion)|italic\n|jis(04|78|83|90)\n|justify(-all)?\n|keep-all\n|large[r]?\n|last|layout|left|letter-spacing\n|light(e[nr]|ing-color)\n|line(-edge|-height|-through)?\n|linear(-gradient|RGB)?\n|lining-nums|list-item|local|loose|lowercase|lr-tb|ltr\n|lumin(osity|ance)|manual\n|manipulation\n|margin(-bottom|-box|-left|-right|-top)?\n|marker(-offset|s)?\n|match-parent\n|mathematical\n|max-(content|height|lines|size|width)\n|medium|middle\n|min-(content|height|width)\n|miter|mixed|move|multiply|newspaper\n|no-(change|clip|(close|open)-quote|(common|discretionary|historical)-ligatures|contextual|drop|repeat)\n|none|nonzero|normal|not-allowed|nowrap|oblique\n|offset(-after|-before|-end|-start)?\n|oldstyle-nums|opacity|open-quote\n|optimize(Legibility|Precision|Quality|Speed)\n|order|ordinal|ornaments\n|outline(-color|-offset|-width)?\n|outset|outside|over(line|-edge|lay)\n|padding(-bottom|-box|-left|-right|-top|-box)?\n|page|paint(ed)?|paused\n|pan-(x|left|right|y|up|down)\n|perspective-origin\n|petite-caps|pixelated|pointer\n|pinch-zoom\n|pretty\n|pre(-line|-wrap)?\n|preserve(-3d|-breaks|-spaces)?\n|progid:DXImageTransform.Microsoft.(Alpha|Blur|dropshadow|gradient|Shadow)\n|progress\n|proportional-(nums|width)\n|radial-gradient|recto|region|relative\n|repeat(-[xy])?\n|repeating-(linear|radial)-gradient\n|replaced|reset-size|reverse|revert(-layer)?|ridge|right\n|round\n|row(-gap|-resize|-reverse)?\n|rtl|ruby|running|saturat(e|ion)|screen\n|scroll(-position|bar)?\n|separate|sepia\n|scale-down\n|shape-(image-threshold|margin|outside)\n|show\n|sideways(-lr|-rl)?\n|simplified\n|size\n|slashed-zero|slice\n|small(-caps|er)?\n|smooth|snap|solid|soft-light\n|space(-around|-between)?\n|span|sRGB\n|stable\n|stack(ed-fractions)?\n|start(ColorStr)?\n|static\n|step-(end|start)\n|sticky\n|stop-(color|opacity)\n|stretch|strict\n|stroke(-box|-dash(array|offset)|-miterlimit|-opacity|-width)?\n|style(set)?\n|stylistic\n|sub(grid|pixel-antialiased|tract)?\n|super|swash\n|table(-caption|-cell|(-column|-footer|-header|-row)-group|-column|-row)?\n|tabular-nums|tb-rl\n|text((-bottom|-(decoration|emphasis)-color|-indent|-(over|under)-edge|-shadow|-size(-adjust)?|-top)|field)?\n|thi(ck|n)\n|titling-ca(ps|se)\n|to[p]?\n|touch|traditional\n|transform(-origin)?\n|under(-edge|line)?\n|unicase|unset|uppercase|upright\n|use-(glyph-orientation|script)\n|verso\n|vertical(-align|-ideographic|-lr|-rl|-text)?\n|view-box\n|viewport-fill(-opacity)?\n|visibility\n|visible(Fill|Painted|Stroke)?\n|wait|wavy|weight|whitespace|(device-)?width|word-spacing\n|wrap(-reverse)?\n|x{1,2}-(large|small)\n|z-index|zero\n|zoom(-in|-out)?\n|((?xi:arabic-indic|armenian|bengali|cambodian|circle|cjk-decimal|cjk-earthly-branch|cjk-heavenly-stem|decimal-leading-zero|decimal|devanagari|disclosure-closed|disclosure-open|disc|ethiopic-numeric|georgian|gujarati|gurmukhi|hebrew|hiragana-iroha|hiragana|japanese-formal|japanese-informal|kannada|katakana-iroha|katakana|khmer|korean-hangul-formal|korean-hanja-formal|korean-hanja-informal|lao|lower-alpha|lower-armenian|lower-greek|lower-latin|lower-roman|malayalam|mongolian|myanmar|oriya|persian|simp-chinese-formal|simp-chinese-informal|square|tamil|telugu|thai|tibetan|trad-chinese-formal|trad-chinese-informal|upper-alpha|upper-armenian|upper-latin|upper-roman)))\\b",
+					"include": "#cubic-bezier-function"
+				},
+				{
+					"include": "#steps-function"
+				},
+				{
+					"comment": "animation-composition",
+					"match": "\\b(?:replace|add|accumulate)\\b",
+					"name": "support.constant.property-value.less"
+				},
+				{
+					"comment": "animation-direction",
+					"match": "\\b(?:normal|alternate-reverse|alternate|reverse)\\b",
+					"name": "support.constant.property-value.less"
+				},
+				{
+					"comment": "animation-fill-mode",
+					"match": "\\b(?:forwards|backwards|both)\\b",
+					"name": "support.constant.property-value.less"
+				},
+				{
+					"comment": "animation-iteration-count",
+					"match": "\\b(?:infinite)\\b",
+					"name": "support.constant.property-value.less"
+				},
+				{
+					"comment": "animation-play-state",
+					"match": "\\b(?:running|paused)\\b",
+					"name": "support.constant.property-value.less"
+				},
+				{
+					"comment": "animation-range, animation-range-start, animation-range-end",
+					"match": "\\b(?:entry-crossing|exit-crossing|entry|exit)\\b",
+					"name": "support.constant.property-value.less"
+				},
+				{
+					"comment": "animation-timing-function",
+					"match": "\\b(?:linear|ease-in-out|ease-in|ease-out|ease|step-start|step-end)\\b",
+					"name": "support.constant.property-value.less"
+				},
+				{
+					"match": "(?x)\\b(\n  absolute|active|add\n|all(-(petite|small)-caps|-scroll)?\n|alpha(betic)?\n|alternate(-reverse)?\n|always|annotation|antialiased|at\n|auto(hiding-scrollbar)?\n|avoid(-column|-page|-region)?\n|background(-color|-image|-position|-size)?\n|backwards|balance|baseline|below|bevel|bicubic|bidi-override|blink\n|block(-(line-height|start|end))?\n|blur\n|bold(er)?\n|border-top-left-radius\n|border-top-right-radius\n|border-bottom-left-radius\n|border-bottom-right-radius\n|border-end-end-radius\n|border-end-start-radius\n|border-start-end-radius\n|border-start-start-radius\n|border-block-start-color\n|border-block-start-style\n|border-block-start-width\n|border-block-start\n|border-block-end-color\n|border-block-end-style\n|border-block-end-width\n|border-block-end\n|border-block-color\n|border-block-style\n|border-block-width\n|border-block\n|border-inline-start-color\n|border-inline-start-style\n|border-inline-start-width\n|border-inline-start\n|border-inline-end-color\n|border-inline-end-style\n|border-inline-end-width\n|border-inline-end\n|border-inline-color\n|border-inline-style\n|border-inline-width\n|border-inline\n|border-top-color\n|border-top-style\n|border-top-width\n|border-top\n|border-right-color\n|border-right-style\n|border-right-width\n|border-right\n|border-bottom-color\n|border-bottom-style\n|border-bottom-width\n|border-bottom\n|border-left-color\n|border-left-style\n|border-left-width\n|border-left\n|border-image-outset\n|border-image-repeat\n|border-image-slice\n|border-image-source\n|border-image-width\n|border-image\n|border-color\n|border-style\n|border-width\n|border-radius\n|border-collapse\n|border-spacing\n|border\n|both\n|bottom\n|box(-shadow)?\n|break-(all|word|spaces)\n|brightness\n|butt(on)?\n|capitalize\n|cent(er|ral)\n|char(acter-variant)?\n|cjk-ideographic|clip|clone|close-quote\n|closest-(corner|side)\n|col-resize|collapse\n|color(-stop|-burn|-dodge)?\n|column((-count|-gap|-reverse|-rule(-color|-width)?|-width)|s)?\n|common-ligatures|condensed|consider-shifts|contain\n|content(-box|s)?\n|contextual|contrast|cover\n|crisp(-e|E)dges\n|crop\n|cross(hair)?\n|da(rken|shed)\n|default|dense|diagonal-fractions|difference|disabled\n|discard|discretionary-ligatures|disregard-shifts\n|distribute(-all-lines|-letter|-space)?\n|dotted|double|drop-shadow\n|(nwse|nesw|ns|ew|sw|se|nw|ne|w|s|e|n)-resize\n|ease(-in-out|-in|-out)?\n|element|ellipsis|embed|end|EndColorStr|evenodd\n|exclu(de(-ruby)?|sion)\n|expanded\n|(extra|semi|ultra)-(condensed|expanded)\n|farthest-(corner|side)?\n|fill(-box|-opacity)?\n|filter\n|fit-content\n|fixed\n|flat\n|flex((-basis|-end|-grow|-shrink|-start)|box)?\n|flip|flood-color\n|font(-size(-adjust)?|-stretch|-weight)?\n|forwards\n|from(-image)?\n|full-width|gap|geometricPrecision|glyphs|gradient|grayscale\n|grid((-column|-row)?-gap|-height)?\n|groove|hand|hanging|hard-light|height|help|hidden|hide\n|historical-(forms|ligatures)\n|horizontal(-tb)?\n|hue\n|ideograph(-alpha|-numeric|-parenthesis|-space|ic)\n|inactive|include-ruby|infinite|inherit|initial\n|inline(-(block|box|flex(box)?|line-height|table|start|end))?\n|inset|inside\n|inter(-ideograph|-word|sect)\n|invert|isolat(e|ion)|italic\n|jis(04|78|83|90)\n|justify(-all)?\n|keep-all\n|large[r]?\n|last|layout|left|letter-spacing\n|light(e[nr]|ing-color)\n|line(-edge|-height|-through)?\n|linear(-gradient|RGB)?\n|lining-nums|list-item|local|loose|lowercase|lr-tb|ltr\n|lumin(osity|ance)|manual\n|manipulation\n|margin(-bottom|-box|-left|-right|-top)?\n|marker(-offset|s)?\n|match-parent\n|mathematical\n|max-(content|height|lines|size|width)\n|medium|middle\n|min-(content|height|width)\n|miter|mixed|move|multiply|newspaper\n|no-(change|clip|(close|open)-quote|(common|discretionary|historical)-ligatures|contextual|drop|repeat)\n|none|nonzero|normal|not-allowed|nowrap|oblique\n|offset(-after|-before|-end|-start)?\n|oldstyle-nums|opacity|open-quote\n|optimize(Legibility|Precision|Quality|Speed)\n|order|ordinal|ornaments\n|outline(-color|-offset|-width)?\n|outset|outside|over(line|-edge|lay)\n|padding(-bottom|-box|-left|-right|-top|-box)?\n|page|paint(ed)?|paused\n|pan-(x|left|right|y|up|down)\n|perspective-origin\n|petite-caps|pixelated|pointer\n|pinch-zoom\n|pretty\n|pre(-line|-wrap)?\n|preserve(-3d|-breaks|-spaces)?\n|progid:DXImageTransform.Microsoft.(Alpha|Blur|dropshadow|gradient|Shadow)\n|progress\n|proportional-(nums|width)\n|radial-gradient|recto|region|relative\n|repeat(-[xy])?\n|repeating-(linear|radial)-gradient\n|replaced|reset-size|reverse|revert(-layer)?|ridge|right\n|round\n|row(-gap|-resize|-reverse)?\n|rtl|ruby|running|saturat(e|ion)|screen\n|scroll(-position|bar)?\n|separate|sepia\n|scale-down\n|shape-(image-threshold|margin|outside)\n|show\n|sideways(-lr|-rl)?\n|simplified\n|size\n|slashed-zero|slice\n|small(-caps|er)?\n|smooth|snap|solid|soft-light\n|space(-around|-between)?\n|span|sRGB\n|stable\n|stack(ed-fractions)?\n|start(ColorStr)?\n|static\n|step-(end|start)\n|sticky\n|stop-(color|opacity)\n|stretch|strict\n|stroke(-box|-dash(array|offset)|-miterlimit|-opacity|-width)?\n|style(set)?\n|stylistic\n|sub(grid|pixel-antialiased|tract)?\n|super|swash\n|table(-caption|-cell|(-column|-footer|-header|-row)-group|-column|-row)?\n|tabular-nums|tb-rl\n|text((-bottom|-(decoration|emphasis)-color|-indent|-(over|under)-edge|-shadow|-size(-adjust)?|-top)|field)?\n|thi(ck|n)\n|titling-ca(ps|se)\n|to[p]?\n|touch|traditional\n|transform(-origin)?\n|under(-edge|line)?\n|unicase|unset|uppercase|upright\n|use-(glyph-orientation|script)\n|verso\n|vertical(-align|-ideographic|-lr|-rl|-text)?\n|view-box\n|viewport-fill(-opacity)?\n|visibility\n|visible(Fill|Painted|Stroke)?\n|wait|wavy|weight|whitespace|(device-)?width|word-spacing\n|wrap(-reverse)?\n|x{1,2}-(large|small)\n|z-index|zero\n|zoom(-in|-out)?\n|((?xi:arabic-indic|armenian|bengali|cambodian|circle|cjk-decimal|cjk-earthly-branch|cjk-heavenly-stem|decimal-leading-zero|decimal|devanagari|disclosure-closed|disclosure-open|disc|ethiopic-numeric|georgian|gujarati|gurmukhi|hebrew|hiragana-iroha|hiragana|japanese-formal|japanese-informal|kannada|katakana-iroha|katakana|khmer|korean-hangul-formal|korean-hanja-formal|korean-hanja-informal|lao|lower-alpha|lower-armenian|lower-greek|lower-latin|lower-roman|malayalam|mongolian|myanmar|oriya|persian|simp-chinese-formal|simp-chinese-informal|square|tamil|telugu|thai|tibetan|trad-chinese-formal|trad-chinese-informal|upper-alpha|upper-armenian|upper-latin|upper-roman)))\\b",
 					"name": "support.constant.property-value.less"
 				},
 				{
@@ -3566,13 +3738,7 @@
 					"include": "#comma-delimiter"
 				},
 				{
-					"captures": {
-						"1": {
-							"name": "punctuation.separator.less"
-						}
-					},
-					"match": "(\\!)\\s*important",
-					"name": "keyword.other.important.less"
+					"include": "#important"
 				}
 			]
 		},
@@ -3830,6 +3996,18 @@
 				}
 			]
 		},
+		"relative-color": {
+			"patterns": [
+				{
+					"match": "from",
+					"name": "keyword.other.less"
+				},
+				{
+					"match": "\\b[hslawbch]\\b",
+					"name": "keyword.other.less"
+				}
+			]
+		},
 		"resolution-type": {
 			"captures": {
 				"1": {
@@ -3899,6 +4077,41 @@
 						{
 							"include": "#filter-function"
 						},
+						{
+							"begin": "\\b(border((-(bottom|top)-(left|right))|((-(start|end)){2}))?-radius|(border-image(?!-)))\\b",
+							"beginCaptures": {
+								"0": {
+									"name": "support.type.property-name.less"
+								}
+							},
+							"comment": "border-radius and border-image properties utilize a slash as a separator",
+							"end": "\\s*(;)|(?=[})])",
+							"endCaptures": {
+								"1": {
+									"name": "punctuation.terminator.rule.less"
+								}
+							},
+							"patterns": [
+								{
+									"begin": "(((\\+_?)?):)(?=[\\s\\t]*)",
+									"beginCaptures": {
+										"1": {
+											"name": "punctuation.separator.key-value.less"
+										}
+									},
+									"contentName": "meta.property-value.less",
+									"end": "(?=\\s*(;)|(?=[})]))",
+									"patterns": [
+										{
+											"include": "#value-separator"
+										},
+										{
+											"include": "#property-values"
+										}
+									]
+								}
+							]
+						},
 						{
 							"captures": {
 								"1": {
@@ -3951,7 +4164,7 @@
 							]
 						},
 						{
-							"begin": "\\banimation(-(delay|direction|duration|fill-mode|iteration-count|name|play-state|timing-function))?\\b",
+							"begin": "\\banimation-timeline\\b",
 							"beginCaptures": {
 								"0": {
 									"name": "support.type.property-name.less"
@@ -3971,47 +4184,91 @@
 											"name": "punctuation.separator.key-value.less"
 										}
 									},
-									"captures": {
+									"contentName": "meta.property-value.less",
+									"end": "(?=\\s*(;)|(?=[})]))",
+									"patterns": [
+										{
+											"include": "#comment-block"
+										},
+										{
+											"include": "#custom-property-name"
+										},
+										{
+											"include": "#scroll-function"
+										},
+										{
+											"include": "#view-function"
+										},
+										{
+											"include": "#property-values"
+										},
+										{
+											"include": "#less-variables"
+										},
+										{
+											"include": "#arbitrary-repetition"
+										},
+										{
+											"include": "#important"
+										}
+									]
+								}
+							]
+						},
+						{
+							"begin": "\\banimation(?:-name)?(?=(?:\\+_?)?:)\\b",
+							"beginCaptures": {
+								"0": {
+									"name": "support.type.property-name.less"
+								}
+							},
+							"end": "\\s*(;)|(?=[})])",
+							"endCaptures": {
+								"1": {
+									"name": "punctuation.terminator.rule.less"
+								}
+							},
+							"patterns": [
+								{
+									"begin": "(((\\+_?)?):)(?=[\\s\\t]*)",
+									"beginCaptures": {
 										"1": {
-											"name": "punctuation.definition.arbitrary-repetition.less"
+											"name": "punctuation.separator.key-value.less"
 										}
 									},
 									"contentName": "meta.property-value.less",
 									"end": "(?=\\s*(;)|(?=[})]))",
 									"patterns": [
 										{
-											"match": "\\b(linear|ease(-in)?(-out)?|step-(start|end)|none|forwards|backwards|both|normal|alternate(-reverse)?|reverse|running|paused)\\b",
-											"name": "support.constant.property-value.less"
+											"include": "#comment-block"
 										},
 										{
-											"include": "#cubic-bezier-function"
+											"include": "#builtin-functions"
 										},
 										{
-											"include": "#steps-function"
+											"include": "#less-functions"
 										},
 										{
-											"include": "#time-type"
+											"include": "#less-variables"
 										},
 										{
-											"include": "#number-type"
+											"include": "#numeric-values"
+										},
+										{
+											"include": "#property-value-constants"
 										},
 										{
 											"match": "-?(?:[_a-zA-Z]|[^\\x{00}-\\x{7F}]|(?:(:?\\\\[0-9a-f]{1,6}(\\r\\n|[\\s\\t\\r\\n\\f])?)|\\\\[^\\r\\n\\f0-9a-f]))(?:[-_a-zA-Z0-9]|[^\\x{00}-\\x{7F}]|(?:(:?\\\\[0-9a-f]{1,6}(\\r\\n|[\\t\\r\\n\\f])?)|\\\\[^\\r\\n\\f0-9a-f]))*",
-											"name": "variable.other.constant.animation-name.less"
+											"name": "variable.other.constant.animation-name.less string.unquoted.less"
 										},
 										{
-											"include": "#literal-string"
+											"include": "#less-math"
 										},
 										{
-											"include": "#property-values"
+											"include": "#arbitrary-repetition"
 										},
 										{
-											"captures": {
-												"1": {
-													"name": "punctuation.definition.arbitrary-repetition.less"
-												}
-											},
-											"match": "\\s*(?:(,))"
+											"include": "#important"
 										}
 									]
 								}
@@ -4038,11 +4295,6 @@
 											"name": "punctuation.separator.key-value.less"
 										}
 									},
-									"captures": {
-										"1": {
-											"name": "punctuation.definition.arbitrary-repetition.less"
-										}
-									},
 									"contentName": "meta.property-value.less",
 									"end": "(?=\\s*(;)|(?=[})]))",
 									"patterns": [
@@ -4059,12 +4311,7 @@
 											"include": "#steps-function"
 										},
 										{
-											"captures": {
-												"1": {
-													"name": "punctuation.definition.arbitrary-repetition.less"
-												}
-											},
-											"match": "\\s*(?:(,))"
+											"include": "#arbitrary-repetition"
 										}
 									]
 								}
@@ -4140,12 +4387,7 @@
 									"name": "support.constant.property-value.less"
 								},
 								{
-									"captures": {
-										"1": {
-											"name": "punctuation.definition.arbitrary-repetition.less"
-										}
-									},
-									"match": "\\s*(?:(,))"
+									"include": "#arbitrary-repetition"
 								}
 							]
 						},
@@ -4189,7 +4431,7 @@
 							]
 						},
 						{
-							"match": "(?x)\\b( accent-height | align-content | align-items | align-self | alignment-baseline | all | animation-timing-function | animation-play-state | animation-name | animation-iteration-count | animation-fill-mode | animation-duration | animation-direction | animation-delay | animation | appearance | ascent | azimuth | backface-visibility | background-size | background-repeat-y | background-repeat-x | background-repeat | background-position-y | background-position-x | background-position | background-origin | background-image | background-color | background-clip | background-blend-mode | background-attachment | background | baseline-shift | begin | bias | blend-mode | border-((top|right|bottom|left|((block|inline)(-(start|end))?))-)?(width|style|color) | border-((top|bottom)-(right|left)|((start|end)-?){1,2})-radius | border-image-(width|source|slice|repeat|outset) | border-(top|right|bottom|left|collapse|image|radius|spacing|((block|inline)(-(start|end))?)) | border | bottom | box-(align|decoration-break|direction|flex|ordinal-group|orient|pack|shadow|sizing) | break-(after|before|inside) | caption-side | clear | clip-path | clip-rule | clip | color(-(interpolation(-filters)?|profile|rendering))? | columns | column-(break-before|count|fill|gap|(rule(-(color|style|width))?)|span|width) | contain(-intrinsic-((((block|inline)-)?size)|height|width))? | content | counter-(increment|reset) | cursor | (c|d|f)(x|y) | direction | display | divisor | dominant-baseline | dur | elevation | empty-cells | enable-background | end | fallback | fill(-(opacity|rule))? | filter | flex(-(align|basis|direction|flow|grow|item-align|line-pack|negative|order|pack|positive|preferred-size|shrink|wrap))? | float | flood-(color|opacity) | font-display | font-family | font-feature-settings | font-kerning | font-language-override | font-size(-adjust)? | font-smoothing | font-stretch | font-style | font-synthesis | font-variant(-(alternates|caps|east-asian|ligatures|numeric|position))? | font-weight | font | fr | ((column|row)-)?gap | glyph-orientation-(horizontal|vertical) | grid-(area|gap) | grid-auto-(columns|flow|rows) | grid-(column|row)(-(end|gap|start))? | grid-template(-(areas|columns|rows))? | height | hyphens | image-(orientation|rendering|resolution) | inset(-(block|inline))?(-(start|end))? | isolation | justify-content | justify-items | justify-self | kerning | left | letter-spacing | lighting-color | line-(box-contain|break|clamp|height) | list-style(-(image|position|type))? | (margin|padding)(-(bottom|left|right|top)|(-(block|inline)?(-(end|start))?))? | marker(-(end|mid|start))? | mask(-(clip||composite|image|origin|position|repeat|size|type))? | (max|min)-(height|width) | mix-blend-mode | nbsp-mode | negative | object-(fit|position) | opacity | operator | order | orphans | outline(-(color|offset|style|width))? | overflow(-((inline|block)|scrolling|wrap|x|y))? | overscroll-behavior(-block|-(inline|x|y))? | pad(ding(-(bottom|left|right|top))?)? | page(-break-(after|before|inside))? | paint-order | pause(-(after|before))? | perspective(-origin(-(x|y))?)? | pitch(-range)? | place-content | place-self | pointer-events | position | prefix | quotes | range | resize | right | rotate | scale | scroll-behavior | shape-(image-threshold|margin|outside|rendering) | size | speak(-as)? | src | stop-(color|opacity) | stroke(-(dash(array|offset)|line(cap|join)|miterlimit|opacity|width))? | suffix | symbols | system | tab-size | table-layout | tap-highlight-color | text-align(-last)? | text-decoration(-(color|line|style))? | text-emphasis(-(color|position|style))? | text-(anchor|fill-color|height|indent|justify|orientation|overflow|rendering|size-adjust|shadow|transform|underline-position|wrap) | top | touch-action | transform(-origin(-(x|y))?) | transform(-style)? | transition(-(delay|duration|property|timing-function))? | translate | unicode-(bidi|range) | user-(drag|select) | vertical-align | visibility | white-space(-collapse)? | widows | width | will-change | word-(break|spacing|wrap) | writing-mode | z-index | zoom )\\b",
+							"match": "(?x)\\b( accent-height | align-content | align-items | align-self | alignment-baseline | all | animation-timing-function | animation-range-start | animation-range-end | animation-range | animation-play-state | animation-name | animation-iteration-count | animation-fill-mode | animation-duration | animation-direction | animation-delay | animation-composition | animation | appearance | ascent | azimuth | backface-visibility | background-size | background-repeat-y | background-repeat-x | background-repeat | background-position-y | background-position-x | background-position | background-origin | background-image | background-color | background-clip | background-blend-mode | background-attachment | background | baseline-shift | begin | bias | blend-mode | border-top-left-radius | border-top-right-radius | border-bottom-left-radius | border-bottom-right-radius | border-end-end-radius | border-end-start-radius | border-start-end-radius | border-start-start-radius | border-block-start-color | border-block-start-style | border-block-start-width | border-block-start | border-block-end-color | border-block-end-style | border-block-end-width | border-block-end | border-block-color | border-block-style | border-block-width | border-block | border-inline-start-color | border-inline-start-style | border-inline-start-width | border-inline-start | border-inline-end-color | border-inline-end-style | border-inline-end-width | border-inline-end | border-inline-color | border-inline-style | border-inline-width | border-inline | border-top-color | border-top-style | border-top-width | border-top | border-right-color | border-right-style | border-right-width | border-right | border-bottom-color | border-bottom-style | border-bottom-width | border-bottom | border-left-color | border-left-style | border-left-width | border-left | border-image-outset | border-image-repeat | border-image-slice | border-image-source | border-image-width | border-image | border-color | border-style | border-width | border-radius | border-collapse | border-spacing | border | bottom | box-(align|decoration-break|direction|flex|ordinal-group|orient|pack|shadow|sizing) | break-(after|before|inside) | caption-side | clear | clip-path | clip-rule | clip | color(-(interpolation(-filters)?|profile|rendering))? | columns | column-(break-before|count|fill|gap|(rule(-(color|style|width))?)|span|width) | contain(-intrinsic-((((block|inline)-)?size)|height|width))? | content | counter-(increment|reset) | cursor | (c|d|f)(x|y) | direction | display | divisor | dominant-baseline | dur | elevation | empty-cells | enable-background | end | fallback | fill(-(opacity|rule))? | filter | flex(-(align|basis|direction|flow|grow|item-align|line-pack|negative|order|pack|positive|preferred-size|shrink|wrap))? | float | flood-(color|opacity) | font-display | font-family | font-feature-settings | font-kerning | font-language-override | font-size(-adjust)? | font-smoothing | font-stretch | font-style | font-synthesis | font-variant(-(alternates|caps|east-asian|ligatures|numeric|position))? | font-weight | font | fr | ((column|row)-)?gap | glyph-orientation-(horizontal|vertical) | grid-(area|gap) | grid-auto-(columns|flow|rows) | grid-(column|row)(-(end|gap|start))? | grid-template(-(areas|columns|rows))? | height | hyphens | image-(orientation|rendering|resolution) | inset(-(block|inline))?(-(start|end))? | isolation | justify-content | justify-items | justify-self | kerning | left | letter-spacing | lighting-color | line-(box-contain|break|clamp|height) | list-style(-(image|position|type))? | (margin|padding)(-(bottom|left|right|top)|(-(block|inline)?(-(end|start))?))? | marker(-(end|mid|start))? | mask(-(clip||composite|image|origin|position|repeat|size|type))? | (max|min)-(height|width) | mix-blend-mode | nbsp-mode | negative | object-(fit|position) | opacity | operator | order | orphans | outline(-(color|offset|style|width))? | overflow(-((inline|block)|scrolling|wrap|x|y))? | overscroll-behavior(-block|-(inline|x|y))? | pad(ding(-(bottom|left|right|top))?)? | page(-break-(after|before|inside))? | paint-order | pause(-(after|before))? | perspective(-origin(-(x|y))?)? | pitch(-range)? | place-content | place-self | pointer-events | position | prefix | quotes | range | resize | right | rotate | scale | scroll-behavior | shape-(image-threshold|margin|outside|rendering) | size | speak(-as)? | src | stop-(color|opacity) | stroke(-(dash(array|offset)|line(cap|join)|miterlimit|opacity|width))? | suffix | symbols | system | tab-size | table-layout | tap-highlight-color | text-align(-last)? | text-decoration(-(color|line|style))? | text-emphasis(-(color|position|style))? | text-(anchor|fill-color|height|indent|justify|orientation|overflow|rendering|size-adjust|shadow|transform|underline-position|wrap) | top | touch-action | transform(-origin(-(x|y))?) | transform(-style)? | transition(-(delay|duration|property|timing-function))? | translate | unicode-(bidi|range) | user-(drag|select) | vertical-align | visibility | white-space(-collapse)? | widows | width | will-change | word-(break|spacing|wrap) | writing-mode | z-index | zoom )\\b",
 							"name": "support.type.property-name.less"
 						},
 						{
@@ -4237,6 +4479,40 @@
 				}
 			]
 		},
+		"scroll-function": {
+			"begin": "\\b(scroll)(\\()",
+			"beginCaptures": {
+				"1": {
+					"name": "support.function.scroll.less"
+				},
+				"2": {
+					"name": "punctuation.definition.group.begin.less"
+				}
+			},
+			"end": "\\)",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.group.end.less"
+				}
+			},
+			"name": "meta.function-call.less",
+			"patterns": [
+				{
+					"match": "root|nearest|self",
+					"name": "support.constant.scroller.less"
+				},
+				{
+					"match": "block|inline|x|y",
+					"name": "support.constant.axis.less"
+				},
+				{
+					"include": "#less-variables"
+				},
+				{
+					"include": "#var-function"
+				}
+			]
+		},
 		"selector": {
 			"patterns": [
 				{
@@ -4257,13 +4533,7 @@
 							"include": "#less-variable-interpolation"
 						},
 						{
-							"captures": {
-								"1": {
-									"name": "punctuation.separator.less"
-								}
-							},
-							"match": "(\\!)\\s*important",
-							"name": "keyword.other.important.less"
+							"include": "#important"
 						}
 					]
 				}
@@ -4405,12 +4675,7 @@
 					]
 				},
 				{
-					"captures": {
-						"1": {
-							"name": "punctuation.definition.arbitrary-repetition.less"
-						}
-					},
-					"match": "\\s*(?:(,))"
+					"include": "#arbitrary-repetition"
 				},
 				{
 					"match": "\\*",
@@ -4579,12 +4844,16 @@
 			]
 		},
 		"steps-function": {
-			"begin": "\\b(steps)(?=\\()",
+			"begin": "\\b(steps)(\\()",
 			"beginCaptures": {
-				"0": {
+				"1": {
 					"name": "support.function.timing.less"
+				},
+				"2": {
+					"name": "punctuation.definition.group.begin.less"
 				}
 			},
+			"contentName": "meta.group.less",
 			"end": "\\)",
 			"endCaptures": {
 				"0": {
@@ -4594,25 +4863,23 @@
 			"name": "meta.function-call.less",
 			"patterns": [
 				{
-					"begin": "\\(",
-					"beginCaptures": {
-						"0": {
-							"name": "punctuation.definition.group.begin.less"
-						}
-					},
-					"end": "(?=\\))",
-					"patterns": [
-						{
-							"include": "#comma-delimiter"
-						},
-						{
-							"include": "#integer-type"
-						},
-						{
-							"match": "(end|middle|start)",
-							"name": "support.keyword.timing-direction.less"
-						}
-					]
+					"match": "jump-start|jump-end|jump-none|jump-both|start|end",
+					"name": "support.constant.step-position.less"
+				},
+				{
+					"include": "#comma-delimiter"
+				},
+				{
+					"include": "#integer-type"
+				},
+				{
+					"include": "#less-variables"
+				},
+				{
+					"include": "#var-function"
+				},
+				{
+					"include": "#calc-function"
 				}
 			]
 		},
@@ -5085,45 +5352,49 @@
 				}
 			]
 		},
+		"value-separator": {
+			"captures": {
+				"1": {
+					"name": "punctuation.separator.less"
+				}
+			},
+			"match": "\\s*(/)\\s*"
+		},
 		"var-function": {
+			"begin": "\\b(var)(?=\\()",
+			"beginCaptures": {
+				"1": {
+					"name": "support.function.var.less"
+				}
+			},
+			"end": "\\)",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.group.end.less"
+				}
+			},
+			"name": "meta.function-call.less",
 			"patterns": [
 				{
-					"begin": "\\b(var)(?=\\()",
+					"begin": "\\(",
 					"beginCaptures": {
-						"1": {
-							"name": "support.function.var.less"
-						}
-					},
-					"end": "\\)",
-					"endCaptures": {
 						"0": {
-							"name": "punctuation.definition.group.end.less"
+							"name": "punctuation.definition.group.begin.less"
 						}
 					},
-					"name": "meta.function-call.less",
+					"end": "(?=\\))",
 					"patterns": [
 						{
-							"begin": "\\(",
-							"beginCaptures": {
-								"0": {
-									"name": "punctuation.definition.group.begin.less"
-								}
-							},
-							"end": "(?=\\))",
-							"patterns": [
-								{
-									"include": "#comma-delimiter"
-								},
-								{
-									"include": "#custom-property-name"
-								},
-								{
-									"include": "#less-variables"
-								},
-								{
-									"include": "#property-values"
-								}
-							]
+							"include": "#comma-delimiter"
+						},
+						{
+							"include": "#custom-property-name"
+						},
+						{
+							"include": "#less-variables"
+						},
+						{
+							"include": "#property-values"
 						}
 					]
 				}
@@ -5132,6 +5403,56 @@
 		"vendor-prefix": {
 			"match": "-(?:webkit|moz(-osx)?|ms|o)-",
 			"name": "support.type.vendor-prefix.less"
+		},
+		"view-function": {
+			"begin": "\\b(view)(?=\\()",
+			"beginCaptures": {
+				"1": {
+					"name": "support.function.view.less"
+				}
+			},
+			"end": "\\)",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.group.end.less"
+				}
+			},
+			"name": "meta.function-call.less",
+			"patterns": [
+				{
+					"begin": "\\(",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.definition.group.begin.less"
+						}
+					},
+					"end": "(?=\\))",
+					"patterns": [
+						{
+							"match": "block|inline|x|y|auto",
+							"name": "support.constant.property-value.less"
+						},
+						{
+							"include": "#length-type"
+						},
+						{
+							"include": "#percentage-type"
+						},
+						{
+							"include": "#less-variables"
+						},
+						{
+							"include": "#var-function"
+						},
+						{
+							"include": "#calc-function"
+						},
+						{
+							"include": "#arbitrary-repetition"
+						}
+					]
+				}
+			]
 		}
 	}
 }
\ No newline at end of file
diff --git a/extensions/markdown-language-features/package.json b/extensions/markdown-language-features/package.json
index f06dd4233c8..894c1035c39 100644
--- a/extensions/markdown-language-features/package.json
+++ b/extensions/markdown-language-features/package.json
@@ -772,7 +772,7 @@
     "picomatch": "^2.3.1",
     "vscode-languageclient": "^8.0.2",
     "vscode-languageserver-textdocument": "^1.0.11",
-    "vscode-markdown-languageserver": "^0.5.0-alpha.7",
+    "vscode-markdown-languageserver": "^0.5.0-alpha.8",
     "vscode-uri": "^3.0.3"
   },
   "devDependencies": {
diff --git a/extensions/markdown-language-features/src/extension.ts b/extensions/markdown-language-features/src/extension.ts
index b5a42ed9a95..98ea87df069 100644
--- a/extensions/markdown-language-features/src/extension.ts
+++ b/extensions/markdown-language-features/src/extension.ts
@@ -31,6 +31,8 @@ function startServer(context: vscode.ExtensionContext, parser: IMdParser): Promi
 
 	const serverModule = context.asAbsolutePath(
 		isDebugBuild
+			// For local non bundled version of vscode-markdown-languageserver
+			// ? './node_modules/vscode-markdown-languageserver/out/node/workerMain'
 			? './node_modules/vscode-markdown-languageserver/dist/node/workerMain'
 			: './dist/serverWorkerMain'
 	);
diff --git a/extensions/markdown-language-features/yarn.lock b/extensions/markdown-language-features/yarn.lock
index 69f7733816e..525795036ab 100644
--- a/extensions/markdown-language-features/yarn.lock
+++ b/extensions/markdown-language-features/yarn.lock
@@ -453,16 +453,16 @@ vscode-languageserver@^8.1.0:
   dependencies:
     vscode-languageserver-protocol "3.17.3"
 
-vscode-markdown-languageserver@^0.5.0-alpha.7:
-  version "0.5.0-alpha.7"
-  resolved "https://registry.yarnpkg.com/vscode-markdown-languageserver/-/vscode-markdown-languageserver-0.5.0-alpha.7.tgz#7db060e3e2f5ec5afae7801c9a8e77ed92ff09ae"
-  integrity sha512-PkJMlZ4B7dUGSQIaLabXx00Hg2PFYuoi1lp2kAJu51TUEbt/B7J3u/7MhwbDXx3ZQga3TSfrPJ+V/SOBQiP/Xw==
+vscode-markdown-languageserver@^0.5.0-alpha.8:
+  version "0.5.0-alpha.8"
+  resolved "https://registry.yarnpkg.com/vscode-markdown-languageserver/-/vscode-markdown-languageserver-0.5.0-alpha.8.tgz#87ced4b241636b6aeda7aacc41badced0c2cc992"
+  integrity sha512-Bp6YXHy4EMQ8JpsmXpQHa78byLvv83wVnLmhVfTaJsZTBwF8IOJ56NBUasepg9L6QVffUA9T2H/PfBqEOGpeOQ==
   dependencies:
     "@vscode/l10n" "^0.0.11"
     vscode-languageserver "^8.1.0"
     vscode-languageserver-textdocument "^1.0.8"
     vscode-languageserver-types "^3.17.3"
-    vscode-markdown-languageservice "^0.5.0-alpha.6"
+    vscode-markdown-languageservice "^0.5.0-alpha.7"
     vscode-uri "^3.0.7"
 
 vscode-markdown-languageservice@^0.3.0-alpha.3:
@@ -476,10 +476,10 @@ vscode-markdown-languageservice@^0.3.0-alpha.3:
     vscode-languageserver-types "^3.17.1"
     vscode-uri "^3.0.3"
 
-vscode-markdown-languageservice@^0.5.0-alpha.6:
-  version "0.5.0-alpha.6"
-  resolved "https://registry.yarnpkg.com/vscode-markdown-languageservice/-/vscode-markdown-languageservice-0.5.0-alpha.6.tgz#3aa5fc94fea3d5d7f0cd970e64348e2791643dc0"
-  integrity sha512-mA1JCA7aHHSek5gr8Yv7C3esEPo2hRrgxmoZUDRro+pnwbdsJuRaWOKWtCWxejRUVVVhc/5yTK2X64Jx9OCmFQ==
+vscode-markdown-languageservice@^0.5.0-alpha.7:
+  version "0.5.0-alpha.7"
+  resolved "https://registry.yarnpkg.com/vscode-markdown-languageservice/-/vscode-markdown-languageservice-0.5.0-alpha.7.tgz#0cc0939ea803d2afcb7a6e99b55feec664ec1b37"
+  integrity sha512-Iq9S5YGHm3D/UG9Usm8a/O5tYCo9FwaMF7nJsDQCxKgVZu5OzwOj3ixDkhoM+c8GKXiwt23DxhhWRuvI4odkTg==
   dependencies:
     "@vscode/l10n" "^0.0.10"
     node-html-parser "^6.1.5"
diff --git a/extensions/microsoft-authentication/extension-browser.webpack.config.js b/extensions/microsoft-authentication/extension-browser.webpack.config.js
index c0f4b92069f..0d395fc0f96 100644
--- a/extensions/microsoft-authentication/extension-browser.webpack.config.js
+++ b/extensions/microsoft-authentication/extension-browser.webpack.config.js
@@ -23,7 +23,8 @@ module.exports = withBrowserDefaults({
 	resolve: {
 		alias: {
 			'./node/authServer': path.resolve(__dirname, 'src/browser/authServer'),
-			'./node/buffer': path.resolve(__dirname, 'src/browser/buffer')
+			'./node/buffer': path.resolve(__dirname, 'src/browser/buffer'),
+			'./node/authProvider': path.resolve(__dirname, 'src/browser/authProvider'),
 		}
 	}
 });
diff --git a/extensions/microsoft-authentication/package.json b/extensions/microsoft-authentication/package.json
index af46f732d92..ad6a4d5cb71 100644
--- a/extensions/microsoft-authentication/package.json
+++ b/extensions/microsoft-authentication/package.json
@@ -14,8 +14,7 @@
   ],
   "activationEvents": [],
   "enabledApiProposals": [
-    "idToken",
-    "authGetSessions"
+    "idToken"
   ],
   "capabilities": {
     "virtualWorkspaces": true,
@@ -96,6 +95,15 @@
             ]
           }
         }
+      },
+      {
+        "title": "Microsoft",
+        "properties": {
+          "microsoft.useMsal": {
+            "type": "boolean",
+            "description": "%useMsal.description%"
+          }
+        }
       }
     ]
   },
@@ -118,7 +126,9 @@
   },
   "dependencies": {
     "@azure/ms-rest-azure-env": "^2.0.0",
-    "@vscode/extension-telemetry": "^0.9.0"
+    "@azure/msal-node": "^2.13.0",
+    "@vscode/extension-telemetry": "^0.9.0",
+    "vscode-tas-client": "^0.1.84"
   },
   "repository": {
     "type": "git",
diff --git a/extensions/microsoft-authentication/package.nls.json b/extensions/microsoft-authentication/package.nls.json
index 14c625dc762..80cbb32d4ab 100644
--- a/extensions/microsoft-authentication/package.nls.json
+++ b/extensions/microsoft-authentication/package.nls.json
@@ -3,6 +3,7 @@
 	"description": "Microsoft authentication provider",
 	"signIn": "Sign In",
 	"signOut": "Sign Out",
+	"useMsal.description": "Use the Microsoft Authentication Library (MSAL) to sign in with a Microsoft account.",
 	"microsoft-sovereign-cloud.environment.description": {
 		"message": "The Sovereign Cloud to use for authentication. If you select `custom`, you must also set the `#microsoft-sovereign-cloud.customEnvironment#` setting.",
 		"comment": [
diff --git a/extensions/microsoft-authentication/src/UriEventHandler.ts b/extensions/microsoft-authentication/src/UriEventHandler.ts
index 3dc753af835..f525912fa51 100644
--- a/extensions/microsoft-authentication/src/UriEventHandler.ts
+++ b/extensions/microsoft-authentication/src/UriEventHandler.ts
@@ -6,7 +6,14 @@
 import * as vscode from 'vscode';
 
 export class UriEventHandler extends vscode.EventEmitter<vscode.Uri> implements vscode.UriHandler {
-	public handleUri(uri: vscode.Uri) {
+	private _disposable = vscode.window.registerUriHandler(this);
+
+	handleUri(uri: vscode.Uri) {
 		this.fire(uri);
 	}
+
+	override dispose(): void {
+		super.dispose();
+		this._disposable.dispose();
+	}
 }
diff --git a/extensions/microsoft-authentication/src/browser/authProvider.ts b/extensions/microsoft-authentication/src/browser/authProvider.ts
new file mode 100644
index 00000000000..3b4da5b18fa
--- /dev/null
+++ b/extensions/microsoft-authentication/src/browser/authProvider.ts
@@ -0,0 +1,29 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { AuthenticationProvider, AuthenticationProviderAuthenticationSessionsChangeEvent, AuthenticationSession, EventEmitter } from 'vscode';
+
+export class MsalAuthProvider implements AuthenticationProvider {
+	private _onDidChangeSessions = new EventEmitter<AuthenticationProviderAuthenticationSessionsChangeEvent>();
+	onDidChangeSessions = this._onDidChangeSessions.event;
+
+	initialize(): Thenable<void> {
+		throw new Error('Method not implemented.');
+	}
+
+	getSessions(): Thenable<AuthenticationSession[]> {
+		throw new Error('Method not implemented.');
+	}
+	createSession(): Thenable<AuthenticationSession> {
+		throw new Error('Method not implemented.');
+	}
+	removeSession(): Thenable<void> {
+		throw new Error('Method not implemented.');
+	}
+
+	dispose() {
+		this._onDidChangeSessions.dispose();
+	}
+}
diff --git a/extensions/microsoft-authentication/src/common/async.ts b/extensions/microsoft-authentication/src/common/async.ts
index 641faaff0dd..094861518fc 100644
--- a/extensions/microsoft-authentication/src/common/async.ts
+++ b/extensions/microsoft-authentication/src/common/async.ts
@@ -3,7 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationError, CancellationToken, Disposable } from 'vscode';
+import { CancellationError, CancellationToken, Disposable, Event, EventEmitter } from 'vscode';
+
+/**
+ * Can be passed into the Delayed to defer using a microtask
+ */
+export const MicrotaskDelay = Symbol('MicrotaskDelay');
 
 export class SequencerByKey<TKey> {
 
@@ -80,3 +85,473 @@ export function raceTimeoutError<T>(promise: Promise<T>, timeout: number): Promi
 export function raceCancellationAndTimeoutError<T>(promise: Promise<T>, token: CancellationToken, timeout: number): Promise<T> {
 	return raceCancellationError(raceTimeoutError(promise, timeout), token);
 }
+
+interface ILimitedTaskFactory<T> {
+	factory: () => Promise<T>;
+	c: (value: T | Promise<T>) => void;
+	e: (error?: unknown) => void;
+}
+
+export interface ILimiter<T> {
+
+	readonly size: number;
+
+	queue(factory: () => Promise<T>): Promise<T>;
+
+	clear(): void;
+}
+
+/**
+ * A helper to queue N promises and run them all with a max degree of parallelism. The helper
+ * ensures that at any time no more than M promises are running at the same time.
+ */
+export class Limiter<T> implements ILimiter<T> {
+
+	private _size = 0;
+	private _isDisposed = false;
+	private runningPromises: number;
+	private readonly maxDegreeOfParalellism: number;
+	private readonly outstandingPromises: ILimitedTaskFactory<T>[];
+	private readonly _onDrained: EventEmitter<void>;
+
+	constructor(maxDegreeOfParalellism: number) {
+		this.maxDegreeOfParalellism = maxDegreeOfParalellism;
+		this.outstandingPromises = [];
+		this.runningPromises = 0;
+		this._onDrained = new EventEmitter<void>();
+	}
+
+	/**
+	 *
+	 * @returns A promise that resolved when all work is done (onDrained) or when
+	 * there is nothing to do
+	 */
+	whenIdle(): Promise<void> {
+		return this.size > 0
+			? toPromise(this.onDrained)
+			: Promise.resolve();
+	}
+
+	get onDrained(): Event<void> {
+		return this._onDrained.event;
+	}
+
+	get size(): number {
+		return this._size;
+	}
+
+	queue(factory: () => Promise<T>): Promise<T> {
+		if (this._isDisposed) {
+			throw new Error('Object has been disposed');
+		}
+		this._size++;
+
+		return new Promise<T>((c, e) => {
+			this.outstandingPromises.push({ factory, c, e });
+			this.consume();
+		});
+	}
+
+	private consume(): void {
+		while (this.outstandingPromises.length && this.runningPromises < this.maxDegreeOfParalellism) {
+			const iLimitedTask = this.outstandingPromises.shift()!;
+			this.runningPromises++;
+
+			const promise = iLimitedTask.factory();
+			promise.then(iLimitedTask.c, iLimitedTask.e);
+			promise.then(() => this.consumed(), () => this.consumed());
+		}
+	}
+
+	private consumed(): void {
+		if (this._isDisposed) {
+			return;
+		}
+		this.runningPromises--;
+		if (--this._size === 0) {
+			this._onDrained.fire();
+		}
+
+		if (this.outstandingPromises.length > 0) {
+			this.consume();
+		}
+	}
+
+	clear(): void {
+		if (this._isDisposed) {
+			throw new Error('Object has been disposed');
+		}
+		this.outstandingPromises.length = 0;
+		this._size = this.runningPromises;
+	}
+
+	dispose(): void {
+		this._isDisposed = true;
+		this.outstandingPromises.length = 0; // stop further processing
+		this._size = 0;
+		this._onDrained.dispose();
+	}
+}
+
+
+interface IScheduledLater extends Disposable {
+	isTriggered(): boolean;
+}
+
+const timeoutDeferred = (timeout: number, fn: () => void): IScheduledLater => {
+	let scheduled = true;
+	const handle = setTimeout(() => {
+		scheduled = false;
+		fn();
+	}, timeout);
+	return {
+		isTriggered: () => scheduled,
+		dispose: () => {
+			clearTimeout(handle);
+			scheduled = false;
+		},
+	};
+};
+
+const microtaskDeferred = (fn: () => void): IScheduledLater => {
+	let scheduled = true;
+	queueMicrotask(() => {
+		if (scheduled) {
+			scheduled = false;
+			fn();
+		}
+	});
+
+	return {
+		isTriggered: () => scheduled,
+		dispose: () => { scheduled = false; },
+	};
+};
+
+/**
+ * A helper to delay (debounce) execution of a task that is being requested often.
+ *
+ * Following the throttler, now imagine the mail man wants to optimize the number of
+ * trips proactively. The trip itself can be long, so he decides not to make the trip
+ * as soon as a letter is submitted. Instead he waits a while, in case more
+ * letters are submitted. After said waiting period, if no letters were submitted, he
+ * decides to make the trip. Imagine that N more letters were submitted after the first
+ * one, all within a short period of time between each other. Even though N+1
+ * submissions occurred, only 1 delivery was made.
+ *
+ * The delayer offers this behavior via the trigger() method, into which both the task
+ * to be executed and the waiting period (delay) must be passed in as arguments. Following
+ * the example:
+ *
+ * 		const delayer = new Delayer(WAITING_PERIOD);
+ * 		const letters = [];
+ *
+ * 		function letterReceived(l) {
+ * 			letters.push(l);
+ * 			delayer.trigger(() => { return makeTheTrip(); });
+ * 		}
+ */
+export class Delayer<T> implements Disposable {
+
+	private deferred: IScheduledLater | null;
+	private completionPromise: Promise<any> | null;
+	private doResolve: ((value?: any | Promise<any>) => void) | null;
+	private doReject: ((err: any) => void) | null;
+	private task: (() => T | Promise<T>) | null;
+
+	constructor(public defaultDelay: number | typeof MicrotaskDelay) {
+		this.deferred = null;
+		this.completionPromise = null;
+		this.doResolve = null;
+		this.doReject = null;
+		this.task = null;
+	}
+
+	trigger(task: () => T | Promise<T>, delay = this.defaultDelay): Promise<T> {
+		this.task = task;
+		this.cancelTimeout();
+
+		if (!this.completionPromise) {
+			this.completionPromise = new Promise((resolve, reject) => {
+				this.doResolve = resolve;
+				this.doReject = reject;
+			}).then(() => {
+				this.completionPromise = null;
+				this.doResolve = null;
+				if (this.task) {
+					const task = this.task;
+					this.task = null;
+					return task();
+				}
+				return undefined;
+			});
+		}
+
+		const fn = () => {
+			this.deferred = null;
+			this.doResolve?.(null);
+		};
+
+		this.deferred = delay === MicrotaskDelay ? microtaskDeferred(fn) : timeoutDeferred(delay, fn);
+
+		return this.completionPromise;
+	}
+
+	isTriggered(): boolean {
+		return !!this.deferred?.isTriggered();
+	}
+
+	cancel(): void {
+		this.cancelTimeout();
+
+		if (this.completionPromise) {
+			this.doReject?.(new CancellationError());
+			this.completionPromise = null;
+		}
+	}
+
+	private cancelTimeout(): void {
+		this.deferred?.dispose();
+		this.deferred = null;
+	}
+
+	dispose(): void {
+		this.cancel();
+	}
+}
+
+/**
+ * A helper to prevent accumulation of sequential async tasks.
+ *
+ * Imagine a mail man with the sole task of delivering letters. As soon as
+ * a letter submitted for delivery, he drives to the destination, delivers it
+ * and returns to his base. Imagine that during the trip, N more letters were submitted.
+ * When the mail man returns, he picks those N letters and delivers them all in a
+ * single trip. Even though N+1 submissions occurred, only 2 deliveries were made.
+ *
+ * The throttler implements this via the queue() method, by providing it a task
+ * factory. Following the example:
+ *
+ * 		const throttler = new Throttler();
+ * 		const letters = [];
+ *
+ * 		function deliver() {
+ * 			const lettersToDeliver = letters;
+ * 			letters = [];
+ * 			return makeTheTrip(lettersToDeliver);
+ * 		}
+ *
+ * 		function onLetterReceived(l) {
+ * 			letters.push(l);
+ * 			throttler.queue(deliver);
+ * 		}
+ */
+export class Throttler implements Disposable {
+
+	private activePromise: Promise<any> | null;
+	private queuedPromise: Promise<any> | null;
+	private queuedPromiseFactory: (() => Promise<any>) | null;
+
+	private isDisposed = false;
+
+	constructor() {
+		this.activePromise = null;
+		this.queuedPromise = null;
+		this.queuedPromiseFactory = null;
+	}
+
+	queue<T>(promiseFactory: () => Promise<T>): Promise<T> {
+		if (this.isDisposed) {
+			return Promise.reject(new Error('Throttler is disposed'));
+		}
+
+		if (this.activePromise) {
+			this.queuedPromiseFactory = promiseFactory;
+
+			if (!this.queuedPromise) {
+				const onComplete = () => {
+					this.queuedPromise = null;
+
+					if (this.isDisposed) {
+						return;
+					}
+
+					const result = this.queue(this.queuedPromiseFactory!);
+					this.queuedPromiseFactory = null;
+
+					return result;
+				};
+
+				this.queuedPromise = new Promise(resolve => {
+					this.activePromise!.then(onComplete, onComplete).then(resolve);
+				});
+			}
+
+			return new Promise((resolve, reject) => {
+				this.queuedPromise!.then(resolve, reject);
+			});
+		}
+
+		this.activePromise = promiseFactory();
+
+		return new Promise((resolve, reject) => {
+			this.activePromise!.then((result: T) => {
+				this.activePromise = null;
+				resolve(result);
+			}, (err: unknown) => {
+				this.activePromise = null;
+				reject(err);
+			});
+		});
+	}
+
+	dispose(): void {
+		this.isDisposed = true;
+	}
+}
+
+/**
+ * A helper to delay execution of a task that is being requested often, while
+ * preventing accumulation of consecutive executions, while the task runs.
+ *
+ * The mail man is clever and waits for a certain amount of time, before going
+ * out to deliver letters. While the mail man is going out, more letters arrive
+ * and can only be delivered once he is back. Once he is back the mail man will
+ * do one more trip to deliver the letters that have accumulated while he was out.
+ */
+export class ThrottledDelayer<T> {
+
+	private delayer: Delayer<Promise<T>>;
+	private throttler: Throttler;
+
+	constructor(defaultDelay: number) {
+		this.delayer = new Delayer(defaultDelay);
+		this.throttler = new Throttler();
+	}
+
+	trigger(promiseFactory: () => Promise<T>, delay?: number): Promise<T> {
+		return this.delayer.trigger(() => this.throttler.queue(promiseFactory), delay) as unknown as Promise<T>;
+	}
+
+	isTriggered(): boolean {
+		return this.delayer.isTriggered();
+	}
+
+	cancel(): void {
+		this.delayer.cancel();
+	}
+
+	dispose(): void {
+		this.delayer.dispose();
+		this.throttler.dispose();
+	}
+}
+
+/**
+ * A queue is handles one promise at a time and guarantees that at any time only one promise is executing.
+ */
+export class Queue<T> extends Limiter<T> {
+
+	constructor() {
+		super(1);
+	}
+}
+
+/**
+ * Given an event, returns another event which only fires once.
+ *
+ * @param event The event source for the new event.
+ */
+export function once<T>(event: Event<T>): Event<T> {
+	return (listener, thisArgs = null, disposables?) => {
+		// we need this, in case the event fires during the listener call
+		let didFire = false;
+		let result: Disposable | undefined = undefined;
+		result = event(e => {
+			if (didFire) {
+				return;
+			} else if (result) {
+				result.dispose();
+			} else {
+				didFire = true;
+			}
+
+			return listener.call(thisArgs, e);
+		}, null, disposables);
+
+		if (didFire) {
+			result.dispose();
+		}
+
+		return result;
+	};
+}
+
+/**
+ * Creates a promise out of an event, using the {@link Event.once} helper.
+ */
+export function toPromise<T>(event: Event<T>): Promise<T> {
+	return new Promise(resolve => once(event)(resolve));
+}
+
+export type ValueCallback<T = unknown> = (value: T | Promise<T>) => void;
+
+const enum DeferredOutcome {
+	Resolved,
+	Rejected
+}
+
+/**
+ * Creates a promise whose resolution or rejection can be controlled imperatively.
+ */
+export class DeferredPromise<T> {
+
+	private completeCallback!: ValueCallback<T>;
+	private errorCallback!: (err: unknown) => void;
+	private outcome?: { outcome: DeferredOutcome.Rejected; value: any } | { outcome: DeferredOutcome.Resolved; value: T };
+
+	public get isRejected() {
+		return this.outcome?.outcome === DeferredOutcome.Rejected;
+	}
+
+	public get isResolved() {
+		return this.outcome?.outcome === DeferredOutcome.Resolved;
+	}
+
+	public get isSettled() {
+		return !!this.outcome;
+	}
+
+	public get value() {
+		return this.outcome?.outcome === DeferredOutcome.Resolved ? this.outcome?.value : undefined;
+	}
+
+	public readonly p: Promise<T>;
+
+	constructor() {
+		this.p = new Promise<T>((c, e) => {
+			this.completeCallback = c;
+			this.errorCallback = e;
+		});
+	}
+
+	public complete(value: T) {
+		return new Promise<void>(resolve => {
+			this.completeCallback(value);
+			this.outcome = { outcome: DeferredOutcome.Resolved, value };
+			resolve();
+		});
+	}
+
+	public error(err: unknown) {
+		return new Promise<void>(resolve => {
+			this.errorCallback(err);
+			this.outcome = { outcome: DeferredOutcome.Rejected, value: err };
+			resolve();
+		});
+	}
+
+	public cancel() {
+		return this.error(new CancellationError());
+	}
+}
diff --git a/extensions/microsoft-authentication/src/common/cachePlugin.ts b/extensions/microsoft-authentication/src/common/cachePlugin.ts
new file mode 100644
index 00000000000..91b4f0ee6a8
--- /dev/null
+++ b/extensions/microsoft-authentication/src/common/cachePlugin.ts
@@ -0,0 +1,55 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { ICachePlugin, TokenCacheContext } from '@azure/msal-node';
+import { Disposable, EventEmitter, SecretStorage } from 'vscode';
+
+export class SecretStorageCachePlugin implements ICachePlugin {
+	private readonly _onDidChange: EventEmitter<void> = new EventEmitter<void>();
+	readonly onDidChange = this._onDidChange.event;
+
+	private _disposable: Disposable;
+
+	private _value: string | undefined;
+
+	constructor(
+		private readonly _secretStorage: SecretStorage,
+		private readonly _key: string
+	) {
+		this._disposable = Disposable.from(
+			this._onDidChange,
+			this._registerChangeHandler()
+		);
+	}
+
+	private _registerChangeHandler() {
+		return this._secretStorage.onDidChange(e => {
+			if (e.key === this._key) {
+				this._onDidChange.fire();
+			}
+		});
+	}
+
+	async beforeCacheAccess(tokenCacheContext: TokenCacheContext): Promise<void> {
+		const data = await this._secretStorage.get(this._key);
+		this._value = data;
+		if (data) {
+			tokenCacheContext.tokenCache.deserialize(data);
+		}
+	}
+
+	async afterCacheAccess(tokenCacheContext: TokenCacheContext): Promise<void> {
+		if (tokenCacheContext.cacheHasChanged) {
+			const value = tokenCacheContext.tokenCache.serialize();
+			if (value !== this._value) {
+				await this._secretStorage.store(this._key, value);
+			}
+		}
+	}
+
+	dispose() {
+		this._disposable.dispose();
+	}
+}
diff --git a/extensions/microsoft-authentication/src/common/experimentation.ts b/extensions/microsoft-authentication/src/common/experimentation.ts
new file mode 100644
index 00000000000..dd383c4f040
--- /dev/null
+++ b/extensions/microsoft-authentication/src/common/experimentation.ts
@@ -0,0 +1,26 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import * as vscode from 'vscode';
+import { getExperimentationService, IExperimentationService, IExperimentationTelemetry, TargetPopulation } from 'vscode-tas-client';
+
+export async function createExperimentationService(
+	context: vscode.ExtensionContext,
+	experimentationTelemetry: IExperimentationTelemetry,
+	isPreRelease: boolean,
+): Promise<IExperimentationService> {
+	const id = context.extension.id;
+	const version = context.extension.packageJSON['version'];
+
+	const service = getExperimentationService(
+		id,
+		version,
+		isPreRelease ? TargetPopulation.Insiders : TargetPopulation.Public,
+		experimentationTelemetry,
+		context.globalState,
+	) as unknown as IExperimentationService;
+	await service.initializePromise;
+	await service.initialFetch;
+	return service;
+}
diff --git a/extensions/microsoft-authentication/src/common/loggerOptions.ts b/extensions/microsoft-authentication/src/common/loggerOptions.ts
new file mode 100644
index 00000000000..86443c0281f
--- /dev/null
+++ b/extensions/microsoft-authentication/src/common/loggerOptions.ts
@@ -0,0 +1,61 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { LogLevel as MsalLogLevel } from '@azure/msal-node';
+import { env, LogLevel, LogOutputChannel } from 'vscode';
+
+export class MsalLoggerOptions {
+	piiLoggingEnabled = false;
+
+	constructor(private readonly _output: LogOutputChannel) { }
+
+	get logLevel(): MsalLogLevel {
+		return this._toMsalLogLevel(env.logLevel);
+	}
+
+	loggerCallback(level: MsalLogLevel, message: string, containsPii: boolean): void {
+		if (containsPii) {
+			return;
+		}
+
+		switch (level) {
+			case MsalLogLevel.Error:
+				this._output.error(message);
+				return;
+			case MsalLogLevel.Warning:
+				this._output.warn(message);
+				return;
+			case MsalLogLevel.Info:
+				this._output.info(message);
+				return;
+			case MsalLogLevel.Verbose:
+				this._output.debug(message);
+				return;
+			case MsalLogLevel.Trace:
+				this._output.trace(message);
+				return;
+			default:
+				this._output.info(message);
+				return;
+		}
+	}
+
+	private _toMsalLogLevel(logLevel: LogLevel): MsalLogLevel {
+		switch (logLevel) {
+			case LogLevel.Trace:
+				return MsalLogLevel.Trace;
+			case LogLevel.Debug:
+				return MsalLogLevel.Verbose;
+			case LogLevel.Info:
+				return MsalLogLevel.Info;
+			case LogLevel.Warning:
+				return MsalLogLevel.Warning;
+			case LogLevel.Error:
+				return MsalLogLevel.Error;
+			default:
+				return MsalLogLevel.Info;
+		}
+	}
+}
diff --git a/extensions/microsoft-authentication/src/common/loopbackClientAndOpener.ts b/extensions/microsoft-authentication/src/common/loopbackClientAndOpener.ts
new file mode 100644
index 00000000000..4a455ea50f7
--- /dev/null
+++ b/extensions/microsoft-authentication/src/common/loopbackClientAndOpener.ts
@@ -0,0 +1,51 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import type { ILoopbackClient, ServerAuthorizationCodeResponse } from '@azure/msal-node';
+import type { UriEventHandler } from '../UriEventHandler';
+import { env, Uri } from 'vscode';
+import { toPromise } from './async';
+
+export interface ILoopbackClientAndOpener extends ILoopbackClient {
+	openBrowser(url: string): Promise<void>;
+}
+
+export class UriHandlerLoopbackClient implements ILoopbackClientAndOpener {
+	constructor(
+		private readonly _uriHandler: UriEventHandler,
+		private readonly _redirectUri: string
+	) { }
+
+	async listenForAuthCode(successTemplate?: string, errorTemplate?: string): Promise<ServerAuthorizationCodeResponse> {
+		console.log(successTemplate, errorTemplate);
+		const url = await toPromise(this._uriHandler.event);
+		const result = new URL(url.toString(true));
+
+		return {
+			code: result.searchParams.get('code') ?? undefined,
+			state: result.searchParams.get('state') ?? undefined,
+			error: result.searchParams.get('error') ?? undefined,
+			error_description: result.searchParams.get('error_description') ?? undefined,
+			error_uri: result.searchParams.get('error_uri') ?? undefined,
+		};
+	}
+
+	getRedirectUri(): string {
+		// We always return the constant redirect URL because
+		// it will handle redirecting back to the extension
+		return this._redirectUri;
+	}
+
+	closeServer(): void {
+		// No-op
+	}
+
+	async openBrowser(url: string): Promise<void> {
+		const callbackUri = await env.asExternalUri(Uri.parse(`${env.uriScheme}://vscode.microsoft-authentication`));
+
+		const uri = Uri.parse(url + `&state=${encodeURI(callbackUri.toString(true))}`);
+		await env.openExternal(uri);
+	}
+}
diff --git a/extensions/microsoft-authentication/src/common/publicClientCache.ts b/extensions/microsoft-authentication/src/common/publicClientCache.ts
new file mode 100644
index 00000000000..cb9339f926d
--- /dev/null
+++ b/extensions/microsoft-authentication/src/common/publicClientCache.ts
@@ -0,0 +1,21 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import type { AccountInfo, AuthenticationResult, InteractiveRequest, SilentFlowRequest } from '@azure/msal-node';
+import type { Disposable, Event } from 'vscode';
+
+export interface ICachedPublicClientApplication extends Disposable {
+	initialize(): Promise<void>;
+	acquireTokenSilent(request: SilentFlowRequest): Promise<AuthenticationResult>;
+	acquireTokenInteractive(request: InteractiveRequest): Promise<AuthenticationResult>;
+	removeAccount(account: AccountInfo): Promise<void>;
+	accounts: AccountInfo[];
+	clientId: string;
+	authority: string;
+}
+
+export interface ICachedPublicClientApplicationManager {
+	getOrCreate(clientId: string, authority: string): Promise<ICachedPublicClientApplication>;
+	getAll(): ICachedPublicClientApplication[];
+}
diff --git a/extensions/microsoft-authentication/src/common/scopeData.ts b/extensions/microsoft-authentication/src/common/scopeData.ts
new file mode 100644
index 00000000000..148658de343
--- /dev/null
+++ b/extensions/microsoft-authentication/src/common/scopeData.ts
@@ -0,0 +1,78 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+const DEFAULT_CLIENT_ID = 'aebc6443-996d-45c2-90f0-388ff96faa56';
+const DEFAULT_TENANT = 'organizations';
+
+export class ScopeData {
+
+	/**
+	 * The full list of scopes including:
+	 * * the original scopes passed to the constructor
+	 * * internal VS Code scopes (e.g. `VSCODE_CLIENT_ID:...`)
+	 * * the default scopes (`openid`, `email`, `profile`, `offline_access`)
+	 */
+	readonly allScopes: string[];
+
+	/**
+	 * The full list of scopes as a space-separated string. For logging.
+	 */
+	readonly scopeStr: string;
+
+	/**
+	 * The list of scopes to send to the token endpoint. This is the same as `scopes` but without the internal VS Code scopes.
+	 */
+	readonly scopesToSend: string[];
+
+	/**
+	 * The client ID to use for the token request. This is the value of the `VSCODE_CLIENT_ID:...` scope if present, otherwise the default client ID.
+	 */
+	readonly clientId: string;
+
+	/**
+	 * The tenant ID to use for the token request. This is the value of the `VSCODE_TENANT:...` scope if present, otherwise the default tenant ID.
+	 */
+	readonly tenant: string;
+
+	constructor(readonly originalScopes: readonly string[] = []) {
+		const modifiedScopes = [...originalScopes];
+		if (!modifiedScopes.includes('openid')) {
+			modifiedScopes.push('openid');
+		}
+		if (!modifiedScopes.includes('email')) {
+			modifiedScopes.push('email');
+		}
+		if (!modifiedScopes.includes('profile')) {
+			modifiedScopes.push('profile');
+		}
+		if (!modifiedScopes.includes('offline_access')) {
+			modifiedScopes.push('offline_access');
+		}
+		modifiedScopes.sort();
+		this.allScopes = modifiedScopes;
+		this.scopeStr = modifiedScopes.join(' ');
+		this.scopesToSend = this.originalScopes.filter(s => !s.startsWith('VSCODE_'));
+		this.clientId = this.getClientId(this.allScopes);
+		this.tenant = this.getTenantId(this.allScopes);
+	}
+
+	private getClientId(scopes: string[]) {
+		return scopes.reduce<string | undefined>((prev, current) => {
+			if (current.startsWith('VSCODE_CLIENT_ID:')) {
+				return current.split('VSCODE_CLIENT_ID:')[1];
+			}
+			return prev;
+		}, undefined) ?? DEFAULT_CLIENT_ID;
+	}
+
+	private getTenantId(scopes: string[]) {
+		return scopes.reduce<string | undefined>((prev, current) => {
+			if (current.startsWith('VSCODE_TENANT:')) {
+				return current.split('VSCODE_TENANT:')[1];
+			}
+			return prev;
+		}, undefined) ?? DEFAULT_TENANT;
+	}
+}
diff --git a/extensions/microsoft-authentication/src/common/telemetryReporter.ts b/extensions/microsoft-authentication/src/common/telemetryReporter.ts
new file mode 100644
index 00000000000..25ac2623282
--- /dev/null
+++ b/extensions/microsoft-authentication/src/common/telemetryReporter.ts
@@ -0,0 +1,128 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import TelemetryReporter, { TelemetryEventProperties } from '@vscode/extension-telemetry';
+import { IExperimentationTelemetry } from 'vscode-tas-client';
+
+export const enum MicrosoftAccountType {
+	AAD = 'aad',
+	MSA = 'msa',
+	Unknown = 'unknown'
+}
+
+export class MicrosoftAuthenticationTelemetryReporter implements IExperimentationTelemetry {
+	private sharedProperties: Record<string, string> = {};
+	protected _telemetryReporter: TelemetryReporter;
+	constructor(aiKey: string) {
+		this._telemetryReporter = new TelemetryReporter(aiKey);
+	}
+
+	get telemetryReporter(): TelemetryReporter {
+		return this._telemetryReporter;
+	}
+
+	setSharedProperty(name: string, value: string): void {
+		this.sharedProperties[name] = value;
+	}
+
+	postEvent(eventName: string, props: Map<string, string>): void {
+		const eventProperties: TelemetryEventProperties = { ...this.sharedProperties, ...Object.fromEntries(props) };
+		this._telemetryReporter.sendTelemetryEvent(
+			eventName,
+			eventProperties
+		);
+	}
+
+	sendLoginEvent(scopes: readonly string[]): void {
+		/* __GDPR__
+			"login" : {
+				"owner": "TylerLeonhardt",
+				"comment": "Used to determine the usage of the Microsoft Auth Provider.",
+				"scopes": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight", "comment": "Used to determine what scope combinations are being requested." }
+			}
+		*/
+		this._telemetryReporter.sendTelemetryEvent('login', {
+			// Get rid of guids from telemetry.
+			scopes: JSON.stringify(this._scrubGuids(scopes)),
+		});
+	}
+	sendLoginFailedEvent(): void {
+		/* __GDPR__
+			"loginFailed" : { "owner": "TylerLeonhardt", "comment": "Used to determine how often users run into issues with the login flow." }
+		*/
+		this._telemetryReporter.sendTelemetryEvent('loginFailed');
+	}
+	sendLogoutEvent(): void {
+		/* __GDPR__
+			"logout" : { "owner": "TylerLeonhardt", "comment": "Used to determine how often users log out." }
+		*/
+		this._telemetryReporter.sendTelemetryEvent('logout');
+	}
+	sendLogoutFailedEvent(): void {
+		/* __GDPR__
+			"logoutFailed" : { "owner": "TylerLeonhardt", "comment": "Used to determine how often fail to log out." }
+		*/
+		this._telemetryReporter.sendTelemetryEvent('logoutFailed');
+	}
+	/**
+	 * Sends an event for an account type available at startup.
+	 * @param scopes The scopes for the session
+	 * @param accountType The account type for the session
+	 * @todo Remove the scopes since we really don't care about them.
+	 */
+	sendAccountEvent(scopes: string[], accountType: MicrosoftAccountType): void {
+		/* __GDPR__
+			"login" : {
+				"owner": "TylerLeonhardt",
+				"comment": "Used to determine the usage of the Microsoft Auth Provider.",
+				"scopes": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight", "comment": "Used to determine what scope combinations are being requested." },
+				"accountType": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight", "comment": "Used to determine what account types are being used." }
+			}
+		*/
+		this._telemetryReporter.sendTelemetryEvent('account', {
+			// Get rid of guids from telemetry.
+			scopes: JSON.stringify(this._scrubGuids(scopes)),
+			accountType
+		});
+	}
+
+	protected _scrubGuids(scopes: readonly string[]): string[] {
+		return scopes.map(s => s.replace(/[0-9A-F]{8}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{12}/i, '{guid}'));
+	}
+}
+
+export class MicrosoftSovereignCloudAuthenticationTelemetryReporter extends MicrosoftAuthenticationTelemetryReporter {
+	override sendLoginEvent(scopes: string[]): void {
+		/* __GDPR__
+			"loginMicrosoftSovereignCloud" : {
+				"owner": "TylerLeonhardt",
+				"comment": "Used to determine the usage of the Microsoft Auth Provider.",
+				"scopes": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight", "comment": "Used to determine what scope combinations are being requested." }
+			}
+		*/
+		this._telemetryReporter.sendTelemetryEvent('loginMicrosoftSovereignCloud', {
+			// Get rid of guids from telemetry.
+			scopes: JSON.stringify(this._scrubGuids(scopes)),
+		});
+	}
+	override sendLoginFailedEvent(): void {
+		/* __GDPR__
+			"loginMicrosoftSovereignCloudFailed" : { "owner": "TylerLeonhardt", "comment": "Used to determine how often users run into issues with the login flow." }
+		*/
+		this._telemetryReporter.sendTelemetryEvent('loginMicrosoftSovereignCloudFailed');
+	}
+	override sendLogoutEvent(): void {
+		/* __GDPR__
+			"logoutMicrosoftSovereignCloud" : { "owner": "TylerLeonhardt", "comment": "Used to determine how often users log out." }
+		*/
+		this._telemetryReporter.sendTelemetryEvent('logoutMicrosoftSovereignCloud');
+	}
+	override sendLogoutFailedEvent(): void {
+		/* __GDPR__
+			"logoutMicrosoftSovereignCloudFailed" : { "owner": "TylerLeonhardt", "comment": "Used to determine how often fail to log out." }
+		*/
+		this._telemetryReporter.sendTelemetryEvent('logoutMicrosoftSovereignCloudFailed');
+	}
+}
diff --git a/extensions/microsoft-authentication/src/common/test/loopbackClientAndOpener.test.ts b/extensions/microsoft-authentication/src/common/test/loopbackClientAndOpener.test.ts
new file mode 100644
index 00000000000..5c55567d1d0
--- /dev/null
+++ b/extensions/microsoft-authentication/src/common/test/loopbackClientAndOpener.test.ts
@@ -0,0 +1,83 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as assert from 'assert';
+import { env, Uri } from 'vscode';
+import * as sinon from 'sinon';
+import { UriHandlerLoopbackClient } from '../loopbackClientAndOpener';
+import { UriEventHandler } from '../../UriEventHandler';
+
+suite('UriHandlerLoopbackClient', () => {
+	const redirectUri = 'http://localhost';
+	let uriHandler: UriEventHandler;
+	let client: UriHandlerLoopbackClient;
+	let envStub: sinon.SinonStubbedInstance<typeof env>;
+	let callbackUri: Uri;
+
+	setup(async () => {
+		callbackUri = await env.asExternalUri(Uri.parse(`${env.uriScheme}://vscode.microsoft-authentication`));
+		envStub = sinon.stub(env);
+		envStub.openExternal.resolves(true);
+		envStub.asExternalUri.callThrough();
+		uriHandler = new UriEventHandler();
+		client = new UriHandlerLoopbackClient(uriHandler, redirectUri);
+	});
+
+	teardown(() => {
+		sinon.restore();
+		uriHandler.dispose();
+	});
+
+	suite('openBrowser', () => {
+		test('should open browser with correct URL', async () => {
+			const testUrl = 'http://example.com?foo=5';
+
+			await client.openBrowser(testUrl);
+
+			assert.ok(envStub.asExternalUri.calledOnce);
+			assert.ok(envStub.openExternal.calledOnce);
+
+			const expectedUri = Uri.parse(testUrl + `&state=${encodeURI(callbackUri.toString(true))}`);
+			const value = envStub.openExternal.getCalls()[0].args[0];
+			assert.strictEqual(value.toString(true), expectedUri.toString(true));
+		});
+	});
+
+	suite('getRedirectUri', () => {
+		test('should return the redirect URI', () => {
+			const result = client.getRedirectUri();
+			assert.strictEqual(result, redirectUri);
+		});
+	});
+
+	suite('listenForAuthCode', () => {
+		test('should return auth code from URL', async () => {
+			const code = '1234';
+			const state = '5678';
+			const testUrl = Uri.parse(`http://example.com?code=${code}&state=${state}`);
+			const promise = client.listenForAuthCode();
+			uriHandler.handleUri(testUrl);
+			const result = await promise;
+
+			assert.strictEqual(result.code, code);
+			assert.strictEqual(result.state, state);
+		});
+
+		test('should return auth error from URL', async () => {
+			const error = 'access_denied';
+			const errorDescription = 'reason';
+			const errorUri = 'uri';
+			const testUrl = Uri.parse(`http://example.com?error=${error}&error_description=${errorDescription}&error_uri=${errorUri}`);
+
+			const promise = client.listenForAuthCode();
+			uriHandler.handleUri(testUrl);
+			const result = await promise;
+
+			assert.strictEqual(result.error, 'access_denied');
+			assert.strictEqual(result.error_description, 'reason');
+			assert.strictEqual(result.error_uri, 'uri');
+		});
+	});
+});
diff --git a/extensions/microsoft-authentication/src/common/test/scopeData.test.ts b/extensions/microsoft-authentication/src/common/test/scopeData.test.ts
new file mode 100644
index 00000000000..c0b578d4e80
--- /dev/null
+++ b/extensions/microsoft-authentication/src/common/test/scopeData.test.ts
@@ -0,0 +1,54 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as assert from 'assert';
+import { ScopeData } from '../scopeData';
+
+suite('ScopeData', () => {
+	test('should include default scopes if not present', () => {
+		const scopeData = new ScopeData(['custom_scope']);
+		assert.deepStrictEqual(scopeData.allScopes, ['custom_scope', 'email', 'offline_access', 'openid', 'profile']);
+	});
+
+	test('should not duplicate default scopes if already present', () => {
+		const scopeData = new ScopeData(['openid', 'email', 'profile', 'offline_access']);
+		assert.deepStrictEqual(scopeData.allScopes, ['email', 'offline_access', 'openid', 'profile']);
+	});
+
+	test('should sort the scopes alphabetically', () => {
+		const scopeData = new ScopeData(['profile', 'email', 'openid', 'offline_access']);
+		assert.deepStrictEqual(scopeData.allScopes, ['email', 'offline_access', 'openid', 'profile']);
+	});
+
+	test('should create a space-separated string of all scopes', () => {
+		const scopeData = new ScopeData(['custom_scope']);
+		assert.strictEqual(scopeData.scopeStr, 'custom_scope email offline_access openid profile');
+	});
+
+	test('should filter out internal VS Code scopes for scopesToSend', () => {
+		const scopeData = new ScopeData(['custom_scope', 'VSCODE_CLIENT_ID:some_id']);
+		assert.deepStrictEqual(scopeData.scopesToSend, ['custom_scope']);
+	});
+
+	test('should use the default client ID if no VSCODE_CLIENT_ID scope is present', () => {
+		const scopeData = new ScopeData(['custom_scope']);
+		assert.strictEqual(scopeData.clientId, 'aebc6443-996d-45c2-90f0-388ff96faa56');
+	});
+
+	test('should use the VSCODE_CLIENT_ID scope if present', () => {
+		const scopeData = new ScopeData(['custom_scope', 'VSCODE_CLIENT_ID:some_id']);
+		assert.strictEqual(scopeData.clientId, 'some_id');
+	});
+
+	test('should use the default tenant ID if no VSCODE_TENANT scope is present', () => {
+		const scopeData = new ScopeData(['custom_scope']);
+		assert.strictEqual(scopeData.tenant, 'organizations');
+	});
+
+	test('should use the VSCODE_TENANT scope if present', () => {
+		const scopeData = new ScopeData(['custom_scope', 'VSCODE_TENANT:some_tenant']);
+		assert.strictEqual(scopeData.tenant, 'some_tenant');
+	});
+});
diff --git a/extensions/microsoft-authentication/src/extension.ts b/extensions/microsoft-authentication/src/extension.ts
index 87dc94e4c25..3f9b5d3a4d1 100644
--- a/extensions/microsoft-authentication/src/extension.ts
+++ b/extensions/microsoft-authentication/src/extension.ts
@@ -3,179 +3,83 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as vscode from 'vscode';
-import { Environment, EnvironmentParameters } from '@azure/ms-rest-azure-env';
-import { AzureActiveDirectoryService, IStoredSession } from './AADHelper';
-import { BetterTokenStorage } from './betterSecretStorage';
-import { UriEventHandler } from './UriEventHandler';
-import TelemetryReporter from '@vscode/extension-telemetry';
-
-async function initMicrosoftSovereignCloudAuthProvider(context: vscode.ExtensionContext, telemetryReporter: TelemetryReporter, uriHandler: UriEventHandler, tokenStorage: BetterTokenStorage<IStoredSession>): Promise<vscode.Disposable | undefined> {
-	const environment = vscode.workspace.getConfiguration('microsoft-sovereign-cloud').get<string | undefined>('environment');
-	let authProviderName: string | undefined;
-	if (!environment) {
-		return undefined;
+import { commands, env, ExtensionContext, l10n, window, workspace } from 'vscode';
+import * as extensionV1 from './extensionV1';
+import * as extensionV2 from './extensionV2';
+import { createExperimentationService } from './common/experimentation';
+import { MicrosoftAuthenticationTelemetryReporter } from './common/telemetryReporter';
+import { IExperimentationService } from 'vscode-tas-client';
+import Logger from './logger';
+
+function shouldUseMsal(expService: IExperimentationService): boolean {
+	// First check if there is a setting value to allow user to override the default
+	const inspect = workspace.getConfiguration('microsoft').inspect<boolean>('useMsal');
+	if (inspect?.workspaceFolderValue !== undefined) {
+		Logger.debug(`Acquired MSAL enablement value from 'workspaceFolderValue'. Value: ${inspect.workspaceFolderValue}`);
+		return inspect.workspaceFolderValue;
 	}
-
-	if (environment === 'custom') {
-		const customEnv = vscode.workspace.getConfiguration('microsoft-sovereign-cloud').get<EnvironmentParameters>('customEnvironment');
-		if (!customEnv) {
-			const res = await vscode.window.showErrorMessage(vscode.l10n.t('You must also specify a custom environment in order to use the custom environment auth provider.'), vscode.l10n.t('Open settings'));
-			if (res) {
-				await vscode.commands.executeCommand('workbench.action.openSettingsJson', 'microsoft-sovereign-cloud.customEnvironment');
-			}
-			return undefined;
-		}
-		try {
-			Environment.add(customEnv);
-		} catch (e) {
-			const res = await vscode.window.showErrorMessage(vscode.l10n.t('Error validating custom environment setting: {0}', e.message), vscode.l10n.t('Open settings'));
-			if (res) {
-				await vscode.commands.executeCommand('workbench.action.openSettings', 'microsoft-sovereign-cloud.customEnvironment');
-			}
-			return undefined;
-		}
-		authProviderName = customEnv.name;
-	} else {
-		authProviderName = environment;
+	if (inspect?.workspaceValue !== undefined) {
+		Logger.debug(`Acquired MSAL enablement value from 'workspaceValue'. Value: ${inspect.workspaceValue}`);
+		return inspect.workspaceValue;
 	}
-
-	const env = Environment.get(authProviderName);
-	if (!env) {
-		const res = await vscode.window.showErrorMessage(vscode.l10n.t('The environment `{0}` is not a valid environment.', authProviderName), vscode.l10n.t('Open settings'));
-		return undefined;
+	if (inspect?.globalValue !== undefined) {
+		Logger.debug(`Acquired MSAL enablement value from 'globalValue'. Value: ${inspect.globalValue}`);
+		return inspect.globalValue;
 	}
 
-	const aadService = new AzureActiveDirectoryService(
-		vscode.window.createOutputChannel(vscode.l10n.t('Microsoft Sovereign Cloud Authentication'), { log: true }),
-		context,
-		uriHandler,
-		tokenStorage,
-		telemetryReporter,
-		env);
-	await aadService.initialize();
-
-	const disposable = vscode.authentication.registerAuthenticationProvider('microsoft-sovereign-cloud', authProviderName, {
-		onDidChangeSessions: aadService.onDidChangeSessions,
-		getSessions: (scopes: string[]) => aadService.getSessions(scopes),
-		createSession: async (scopes: string[]) => {
-			try {
-				/* __GDPR__
-					"login" : {
-						"owner": "TylerLeonhardt",
-						"comment": "Used to determine the usage of the Microsoft Sovereign Cloud Auth Provider.",
-						"scopes": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight", "comment": "Used to determine what scope combinations are being requested." }
-					}
-				*/
-				telemetryReporter.sendTelemetryEvent('loginMicrosoftSovereignCloud', {
-					// Get rid of guids from telemetry.
-					scopes: JSON.stringify(scopes.map(s => s.replace(/[0-9A-F]{8}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{12}/i, '{guid}'))),
-				});
-
-				return await aadService.createSession(scopes);
-			} catch (e) {
-				/* __GDPR__
-					"loginFailed" : { "owner": "TylerLeonhardt", "comment": "Used to determine how often users run into issues with the login flow." }
-				*/
-				telemetryReporter.sendTelemetryEvent('loginMicrosoftSovereignCloudFailed');
-
-				throw e;
-			}
-		},
-		removeSession: async (id: string) => {
-			try {
-				/* __GDPR__
-					"logout" : { "owner": "TylerLeonhardt", "comment": "Used to determine how often users log out." }
-				*/
-				telemetryReporter.sendTelemetryEvent('logoutMicrosoftSovereignCloud');
-
-				await aadService.removeSessionById(id);
-			} catch (e) {
-				/* __GDPR__
-					"logoutFailed" : { "owner": "TylerLeonhardt", "comment": "Used to determine how often fail to log out." }
-				*/
-				telemetryReporter.sendTelemetryEvent('logoutMicrosoftSovereignCloudFailed');
-			}
-		}
-	}, { supportsMultipleAccounts: true });
+	// Then check if the experiment value
+	const expValue = expService.getTreatmentVariable<boolean>('vscode', 'microsoft.useMsal');
+	if (expValue !== undefined) {
+		Logger.debug(`Acquired MSAL enablement value from 'exp'. Value: ${expValue}`);
+		return expValue;
+	}
 
-	context.subscriptions.push(disposable);
-	return disposable;
+	Logger.debug('Acquired MSAL enablement value from default. Value: false');
+	// If no setting or experiment value is found, default to false
+	return false;
 }
+let useMsal: boolean | undefined;
 
-export async function activate(context: vscode.ExtensionContext) {
-	const aiKey: string = context.extension.packageJSON.aiKey;
-	const telemetryReporter = new TelemetryReporter(aiKey);
-
-	const uriHandler = new UriEventHandler();
-	context.subscriptions.push(uriHandler);
-	context.subscriptions.push(vscode.window.registerUriHandler(uriHandler));
-	const betterSecretStorage = new BetterTokenStorage<IStoredSession>('microsoft.login.keylist', context);
-
-	const loginService = new AzureActiveDirectoryService(
-		vscode.window.createOutputChannel(vscode.l10n.t('Microsoft Authentication'), { log: true }),
+export async function activate(context: ExtensionContext) {
+	const mainTelemetryReporter = new MicrosoftAuthenticationTelemetryReporter(context.extension.packageJSON.aiKey);
+	const expService = await createExperimentationService(
 		context,
-		uriHandler,
-		betterSecretStorage,
-		telemetryReporter,
-		Environment.AzureCloud);
-	await loginService.initialize();
-
-	context.subscriptions.push(vscode.authentication.registerAuthenticationProvider('microsoft', 'Microsoft', {
-		onDidChangeSessions: loginService.onDidChangeSessions,
-		getSessions: (scopes: string[], options?: vscode.AuthenticationProviderSessionOptions) => loginService.getSessions(scopes, options?.account),
-		createSession: async (scopes: string[], options?: vscode.AuthenticationProviderSessionOptions) => {
-			try {
-				/* __GDPR__
-					"login" : {
-						"owner": "TylerLeonhardt",
-						"comment": "Used to determine the usage of the Microsoft Auth Provider.",
-						"scopes": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight", "comment": "Used to determine what scope combinations are being requested." }
-					}
-				*/
-				telemetryReporter.sendTelemetryEvent('login', {
-					// Get rid of guids from telemetry.
-					scopes: JSON.stringify(scopes.map(s => s.replace(/[0-9A-F]{8}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{12}/i, '{guid}'))),
-				});
-
-				return await loginService.createSession(scopes, options?.account);
-			} catch (e) {
-				/* __GDPR__
-					"loginFailed" : { "owner": "TylerLeonhardt", "comment": "Used to determine how often users run into issues with the login flow." }
-				*/
-				telemetryReporter.sendTelemetryEvent('loginFailed');
-
-				throw e;
-			}
-		},
-		removeSession: async (id: string) => {
-			try {
-				/* __GDPR__
-					"logout" : { "owner": "TylerLeonhardt", "comment": "Used to determine how often users log out." }
-				*/
-				telemetryReporter.sendTelemetryEvent('logout');
-
-				await loginService.removeSessionById(id);
-			} catch (e) {
-				/* __GDPR__
-					"logoutFailed" : { "owner": "TylerLeonhardt", "comment": "Used to determine how often fail to log out." }
-				*/
-				telemetryReporter.sendTelemetryEvent('logoutFailed');
-			}
+		mainTelemetryReporter,
+		env.uriScheme !== 'vscode', // isPreRelease
+	);
+	useMsal = shouldUseMsal(expService);
+
+	context.subscriptions.push(workspace.onDidChangeConfiguration(async e => {
+		if (!e.affectsConfiguration('microsoft.useMsal') || useMsal === shouldUseMsal(expService)) {
+			return;
 		}
-	}, { supportsMultipleAccounts: true }));
-
-	let microsoftSovereignCloudAuthProviderDisposable = await initMicrosoftSovereignCloudAuthProvider(context, telemetryReporter, uriHandler, betterSecretStorage);
 
-	context.subscriptions.push(vscode.workspace.onDidChangeConfiguration(async e => {
-		if (e.affectsConfiguration('microsoft-sovereign-cloud')) {
-			microsoftSovereignCloudAuthProviderDisposable?.dispose();
-			microsoftSovereignCloudAuthProviderDisposable = await initMicrosoftSovereignCloudAuthProvider(context, telemetryReporter, uriHandler, betterSecretStorage);
+		const reload = l10n.t('Reload');
+		const result = await window.showInformationMessage(
+			'Reload required',
+			{
+				modal: true,
+				detail: l10n.t('Microsoft Account configuration has been changed.'),
+			},
+			reload
+		);
+
+		if (result === reload) {
+			commands.executeCommand('workbench.action.reloadWindow');
 		}
 	}));
-
-	return;
+	// Only activate the new extension if we are not running in a browser environment
+	if (useMsal && typeof navigator === 'undefined') {
+		await extensionV2.activate(context, mainTelemetryReporter);
+	} else {
+		await extensionV1.activate(context, mainTelemetryReporter.telemetryReporter);
+	}
 }
 
-// this method is called when your extension is deactivated
-export function deactivate() { }
+export function deactivate() {
+	if (useMsal) {
+		extensionV2.deactivate();
+	} else {
+		extensionV1.deactivate();
+	}
+}
diff --git a/extensions/microsoft-authentication/src/extensionV1.ts b/extensions/microsoft-authentication/src/extensionV1.ts
new file mode 100644
index 00000000000..f785adad85c
--- /dev/null
+++ b/extensions/microsoft-authentication/src/extensionV1.ts
@@ -0,0 +1,178 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as vscode from 'vscode';
+import { Environment, EnvironmentParameters } from '@azure/ms-rest-azure-env';
+import { AzureActiveDirectoryService, IStoredSession } from './AADHelper';
+import { BetterTokenStorage } from './betterSecretStorage';
+import { UriEventHandler } from './UriEventHandler';
+import TelemetryReporter from '@vscode/extension-telemetry';
+import Logger from './logger';
+
+async function initMicrosoftSovereignCloudAuthProvider(context: vscode.ExtensionContext, telemetryReporter: TelemetryReporter, uriHandler: UriEventHandler, tokenStorage: BetterTokenStorage<IStoredSession>): Promise<vscode.Disposable | undefined> {
+	const environment = vscode.workspace.getConfiguration('microsoft-sovereign-cloud').get<string | undefined>('environment');
+	let authProviderName: string | undefined;
+	if (!environment) {
+		return undefined;
+	}
+
+	if (environment === 'custom') {
+		const customEnv = vscode.workspace.getConfiguration('microsoft-sovereign-cloud').get<EnvironmentParameters>('customEnvironment');
+		if (!customEnv) {
+			const res = await vscode.window.showErrorMessage(vscode.l10n.t('You must also specify a custom environment in order to use the custom environment auth provider.'), vscode.l10n.t('Open settings'));
+			if (res) {
+				await vscode.commands.executeCommand('workbench.action.openSettingsJson', 'microsoft-sovereign-cloud.customEnvironment');
+			}
+			return undefined;
+		}
+		try {
+			Environment.add(customEnv);
+		} catch (e) {
+			const res = await vscode.window.showErrorMessage(vscode.l10n.t('Error validating custom environment setting: {0}', e.message), vscode.l10n.t('Open settings'));
+			if (res) {
+				await vscode.commands.executeCommand('workbench.action.openSettings', 'microsoft-sovereign-cloud.customEnvironment');
+			}
+			return undefined;
+		}
+		authProviderName = customEnv.name;
+	} else {
+		authProviderName = environment;
+	}
+
+	const env = Environment.get(authProviderName);
+	if (!env) {
+		const res = await vscode.window.showErrorMessage(vscode.l10n.t('The environment `{0}` is not a valid environment.', authProviderName), vscode.l10n.t('Open settings'));
+		return undefined;
+	}
+
+	const aadService = new AzureActiveDirectoryService(
+		vscode.window.createOutputChannel(vscode.l10n.t('Microsoft Sovereign Cloud Authentication'), { log: true }),
+		context,
+		uriHandler,
+		tokenStorage,
+		telemetryReporter,
+		env);
+	await aadService.initialize();
+
+	const disposable = vscode.authentication.registerAuthenticationProvider('microsoft-sovereign-cloud', authProviderName, {
+		onDidChangeSessions: aadService.onDidChangeSessions,
+		getSessions: (scopes: string[]) => aadService.getSessions(scopes),
+		createSession: async (scopes: string[]) => {
+			try {
+				/* __GDPR__
+					"login" : {
+						"owner": "TylerLeonhardt",
+						"comment": "Used to determine the usage of the Microsoft Sovereign Cloud Auth Provider.",
+						"scopes": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight", "comment": "Used to determine what scope combinations are being requested." }
+					}
+				*/
+				telemetryReporter.sendTelemetryEvent('loginMicrosoftSovereignCloud', {
+					// Get rid of guids from telemetry.
+					scopes: JSON.stringify(scopes.map(s => s.replace(/[0-9A-F]{8}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{12}/i, '{guid}'))),
+				});
+
+				return await aadService.createSession(scopes);
+			} catch (e) {
+				/* __GDPR__
+					"loginFailed" : { "owner": "TylerLeonhardt", "comment": "Used to determine how often users run into issues with the login flow." }
+				*/
+				telemetryReporter.sendTelemetryEvent('loginMicrosoftSovereignCloudFailed');
+
+				throw e;
+			}
+		},
+		removeSession: async (id: string) => {
+			try {
+				/* __GDPR__
+					"logout" : { "owner": "TylerLeonhardt", "comment": "Used to determine how often users log out." }
+				*/
+				telemetryReporter.sendTelemetryEvent('logoutMicrosoftSovereignCloud');
+
+				await aadService.removeSessionById(id);
+			} catch (e) {
+				/* __GDPR__
+					"logoutFailed" : { "owner": "TylerLeonhardt", "comment": "Used to determine how often fail to log out." }
+				*/
+				telemetryReporter.sendTelemetryEvent('logoutMicrosoftSovereignCloudFailed');
+			}
+		}
+	}, { supportsMultipleAccounts: true });
+
+	context.subscriptions.push(disposable);
+	return disposable;
+}
+
+export async function activate(context: vscode.ExtensionContext, telemetryReporter: TelemetryReporter) {
+	const uriHandler = new UriEventHandler();
+	context.subscriptions.push(uriHandler);
+	const betterSecretStorage = new BetterTokenStorage<IStoredSession>('microsoft.login.keylist', context);
+
+	const loginService = new AzureActiveDirectoryService(
+		Logger,
+		context,
+		uriHandler,
+		betterSecretStorage,
+		telemetryReporter,
+		Environment.AzureCloud);
+	await loginService.initialize();
+
+	context.subscriptions.push(vscode.authentication.registerAuthenticationProvider('microsoft', 'Microsoft', {
+		onDidChangeSessions: loginService.onDidChangeSessions,
+		getSessions: (scopes: string[], options?: vscode.AuthenticationProviderSessionOptions) => loginService.getSessions(scopes, options?.account),
+		createSession: async (scopes: string[], options?: vscode.AuthenticationProviderSessionOptions) => {
+			try {
+				/* __GDPR__
+					"login" : {
+						"owner": "TylerLeonhardt",
+						"comment": "Used to determine the usage of the Microsoft Auth Provider.",
+						"scopes": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight", "comment": "Used to determine what scope combinations are being requested." }
+					}
+				*/
+				telemetryReporter.sendTelemetryEvent('login', {
+					// Get rid of guids from telemetry.
+					scopes: JSON.stringify(scopes.map(s => s.replace(/[0-9A-F]{8}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{12}/i, '{guid}'))),
+				});
+
+				return await loginService.createSession(scopes, options?.account);
+			} catch (e) {
+				/* __GDPR__
+					"loginFailed" : { "owner": "TylerLeonhardt", "comment": "Used to determine how often users run into issues with the login flow." }
+				*/
+				telemetryReporter.sendTelemetryEvent('loginFailed');
+
+				throw e;
+			}
+		},
+		removeSession: async (id: string) => {
+			try {
+				/* __GDPR__
+					"logout" : { "owner": "TylerLeonhardt", "comment": "Used to determine how often users log out." }
+				*/
+				telemetryReporter.sendTelemetryEvent('logout');
+
+				await loginService.removeSessionById(id);
+			} catch (e) {
+				/* __GDPR__
+					"logoutFailed" : { "owner": "TylerLeonhardt", "comment": "Used to determine how often fail to log out." }
+				*/
+				telemetryReporter.sendTelemetryEvent('logoutFailed');
+			}
+		}
+	}, { supportsMultipleAccounts: true }));
+
+	let microsoftSovereignCloudAuthProviderDisposable = await initMicrosoftSovereignCloudAuthProvider(context, telemetryReporter, uriHandler, betterSecretStorage);
+
+	context.subscriptions.push(vscode.workspace.onDidChangeConfiguration(async e => {
+		if (e.affectsConfiguration('microsoft-sovereign-cloud')) {
+			microsoftSovereignCloudAuthProviderDisposable?.dispose();
+			microsoftSovereignCloudAuthProviderDisposable = await initMicrosoftSovereignCloudAuthProvider(context, telemetryReporter, uriHandler, betterSecretStorage);
+		}
+	}));
+
+	return;
+}
+
+// this method is called when your extension is deactivated
+export function deactivate() { }
diff --git a/extensions/microsoft-authentication/src/extensionV2.ts b/extensions/microsoft-authentication/src/extensionV2.ts
new file mode 100644
index 00000000000..9610af37977
--- /dev/null
+++ b/extensions/microsoft-authentication/src/extensionV2.ts
@@ -0,0 +1,97 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Environment, EnvironmentParameters } from '@azure/ms-rest-azure-env';
+import Logger from './logger';
+import { MsalAuthProvider } from './node/authProvider';
+import { UriEventHandler } from './UriEventHandler';
+import { authentication, commands, ExtensionContext, l10n, window, workspace, Disposable } from 'vscode';
+import { MicrosoftAuthenticationTelemetryReporter, MicrosoftSovereignCloudAuthenticationTelemetryReporter } from './common/telemetryReporter';
+
+async function initMicrosoftSovereignCloudAuthProvider(
+	context: ExtensionContext,
+	uriHandler: UriEventHandler
+): Promise<Disposable | undefined> {
+	const environment = workspace.getConfiguration('microsoft-sovereign-cloud').get<string | undefined>('environment');
+	let authProviderName: string | undefined;
+	if (!environment) {
+		return undefined;
+	}
+
+	if (environment === 'custom') {
+		const customEnv = workspace.getConfiguration('microsoft-sovereign-cloud').get<EnvironmentParameters>('customEnvironment');
+		if (!customEnv) {
+			const res = await window.showErrorMessage(l10n.t('You must also specify a custom environment in order to use the custom environment auth provider.'), l10n.t('Open settings'));
+			if (res) {
+				await commands.executeCommand('workbench.action.openSettingsJson', 'microsoft-sovereign-cloud.customEnvironment');
+			}
+			return undefined;
+		}
+		try {
+			Environment.add(customEnv);
+		} catch (e) {
+			const res = await window.showErrorMessage(l10n.t('Error validating custom environment setting: {0}', e.message), l10n.t('Open settings'));
+			if (res) {
+				await commands.executeCommand('workbench.action.openSettings', 'microsoft-sovereign-cloud.customEnvironment');
+			}
+			return undefined;
+		}
+		authProviderName = customEnv.name;
+	} else {
+		authProviderName = environment;
+	}
+
+	const env = Environment.get(authProviderName);
+	if (!env) {
+		await window.showErrorMessage(l10n.t('The environment `{0}` is not a valid environment.', authProviderName), l10n.t('Open settings'));
+		return undefined;
+	}
+
+	const authProvider = new MsalAuthProvider(
+		context,
+		new MicrosoftSovereignCloudAuthenticationTelemetryReporter(context.extension.packageJSON.aiKey),
+		window.createOutputChannel(l10n.t('Microsoft Sovereign Cloud Authentication'), { log: true }),
+		uriHandler,
+		env
+	);
+	await authProvider.initialize();
+	const disposable = authentication.registerAuthenticationProvider(
+		'microsoft-sovereign-cloud',
+		authProviderName,
+		authProvider,
+		{ supportsMultipleAccounts: true }
+	);
+	context.subscriptions.push(disposable);
+	return disposable;
+}
+
+export async function activate(context: ExtensionContext, mainTelemetryReporter: MicrosoftAuthenticationTelemetryReporter) {
+	const uriHandler = new UriEventHandler();
+	context.subscriptions.push(uriHandler);
+	const authProvider = new MsalAuthProvider(
+		context,
+		mainTelemetryReporter,
+		Logger,
+		uriHandler
+	);
+	await authProvider.initialize();
+	context.subscriptions.push(authentication.registerAuthenticationProvider(
+		'microsoft',
+		'Microsoft',
+		authProvider,
+		{ supportsMultipleAccounts: true }
+	));
+
+	let microsoftSovereignCloudAuthProviderDisposable = await initMicrosoftSovereignCloudAuthProvider(context, uriHandler);
+
+	context.subscriptions.push(workspace.onDidChangeConfiguration(async e => {
+		if (e.affectsConfiguration('microsoft-sovereign-cloud')) {
+			microsoftSovereignCloudAuthProviderDisposable?.dispose();
+			microsoftSovereignCloudAuthProviderDisposable = await initMicrosoftSovereignCloudAuthProvider(context, uriHandler);
+		}
+	}));
+}
+
+export function deactivate() { }
diff --git a/extensions/microsoft-authentication/src/node/authProvider.ts b/extensions/microsoft-authentication/src/node/authProvider.ts
new file mode 100644
index 00000000000..3925f6f58cf
--- /dev/null
+++ b/extensions/microsoft-authentication/src/node/authProvider.ts
@@ -0,0 +1,242 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import { AccountInfo, AuthenticationResult, ServerError } from '@azure/msal-node';
+import { AuthenticationGetSessionOptions, AuthenticationProvider, AuthenticationProviderAuthenticationSessionsChangeEvent, AuthenticationSession, AuthenticationSessionAccountInformation, CancellationError, env, EventEmitter, ExtensionContext, l10n, LogOutputChannel, Memento, SecretStorage, Uri, window } from 'vscode';
+import { Environment } from '@azure/ms-rest-azure-env';
+import { CachedPublicClientApplicationManager } from './publicClientCache';
+import { UriHandlerLoopbackClient } from '../common/loopbackClientAndOpener';
+import { UriEventHandler } from '../UriEventHandler';
+import { ICachedPublicClientApplication } from '../common/publicClientCache';
+import { MicrosoftAccountType, MicrosoftAuthenticationTelemetryReporter } from '../common/telemetryReporter';
+import { loopbackTemplate } from './loopbackTemplate';
+import { ScopeData } from '../common/scopeData';
+
+const redirectUri = 'https://vscode.dev/redirect';
+const MSA_TID = '9188040d-6c67-4c5b-b112-36a304b66dad';
+const MSA_PASSTHRU_TID = 'f8cdef31-a31e-4b4a-93e4-5f571e91255a';
+
+export class MsalAuthProvider implements AuthenticationProvider {
+
+	private readonly _disposables: { dispose(): void }[];
+	private readonly _publicClientManager: CachedPublicClientApplicationManager;
+
+	/**
+	 * Event to signal a change in authentication sessions for this provider.
+	 */
+	private readonly _onDidChangeSessionsEmitter = new EventEmitter<AuthenticationProviderAuthenticationSessionsChangeEvent>();
+
+	/**
+	 * Event to signal a change in authentication sessions for this provider.
+	 *
+	 * NOTE: This event is handled differently in the Microsoft auth provider than "typical" auth providers. Normally,
+	 * this event would fire when the provider's sessions change... which are tied to a specific list of scopes. However,
+	 * since Microsoft identity doesn't care too much about scopes (you can mint a new token from an existing token),
+	 * we just fire this event whenever the account list changes... so essentially there is one session per account.
+	 *
+	 * This is not quite how the API should be used... but this event really is just for signaling that the account list
+	 * has changed.
+	 */
+	onDidChangeSessions = this._onDidChangeSessionsEmitter.event;
+
+	constructor(
+		context: ExtensionContext,
+		private readonly _telemetryReporter: MicrosoftAuthenticationTelemetryReporter,
+		private readonly _logger: LogOutputChannel,
+		private readonly _uriHandler: UriEventHandler,
+		private readonly _env: Environment = Environment.AzureCloud
+	) {
+		this._disposables = context.subscriptions;
+		this._publicClientManager = new CachedPublicClientApplicationManager(
+			context.globalState,
+			context.secrets,
+			this._logger,
+			(e) => this._handleAccountChange(e)
+		);
+		this._disposables.push(this._publicClientManager);
+		this._disposables.push(this._onDidChangeSessionsEmitter);
+
+	}
+
+	async initialize(): Promise<void> {
+		await this._publicClientManager.initialize();
+
+		// Send telemetry for existing accounts
+		for (const cachedPca of this._publicClientManager.getAll()) {
+			for (const account of cachedPca.accounts) {
+				if (!account.idTokenClaims?.tid) {
+					continue;
+				}
+				const tid = account.idTokenClaims.tid;
+				const type = tid === MSA_TID || tid === MSA_PASSTHRU_TID ? MicrosoftAccountType.MSA : MicrosoftAccountType.AAD;
+				this._telemetryReporter.sendAccountEvent([], type);
+			}
+		}
+	}
+
+	/**
+	 * See {@link onDidChangeSessions} for more information on how this is used.
+	 * @param param0 Event that contains the added and removed accounts
+	 */
+	private _handleAccountChange({ added, deleted }: { added: AccountInfo[]; deleted: AccountInfo[] }) {
+		const process = (a: AccountInfo) => ({
+			// This shouldn't be needed
+			accessToken: '1234',
+			id: a.homeAccountId,
+			scopes: [],
+			account: {
+				id: a.homeAccountId,
+				label: a.username
+			},
+			idToken: a.idToken,
+		});
+		this._onDidChangeSessionsEmitter.fire({ added: added.map(process), changed: [], removed: deleted.map(process) });
+	}
+
+	//#region AuthenticationProvider methods
+
+	async getSessions(scopes: string[] | undefined, options?: AuthenticationGetSessionOptions): Promise<AuthenticationSession[]> {
+		const scopeData = new ScopeData(scopes);
+		this._logger.info('[getSessions]', scopes ? scopeData.scopeStr : 'all', 'starting');
+		if (!scopes) {
+			// Do NOT use `scopes` beyond this place in the code. Use `scopeData` instead.
+
+			const allSessions: AuthenticationSession[] = [];
+			for (const cachedPca of this._publicClientManager.getAll()) {
+				const sessions = await this.getAllSessionsForPca(cachedPca, scopeData.originalScopes, scopeData.scopesToSend, options?.account);
+				allSessions.push(...sessions);
+			}
+			return allSessions;
+		}
+
+		const cachedPca = await this.getOrCreatePublicClientApplication(scopeData.clientId, scopeData.tenant);
+		const sessions = await this.getAllSessionsForPca(cachedPca, scopeData.originalScopes, scopeData.scopesToSend, options?.account);
+		this._logger.info(`[getSessions] returned ${sessions.length} sessions`);
+		return sessions;
+
+	}
+
+	async createSession(scopes: readonly string[]): Promise<AuthenticationSession> {
+		const scopeData = new ScopeData(scopes);
+		// Do NOT use `scopes` beyond this place in the code. Use `scopeData` instead.
+
+		this._logger.info('[createSession]', scopeData.scopeStr, 'starting');
+		const cachedPca = await this.getOrCreatePublicClientApplication(scopeData.clientId, scopeData.tenant);
+		let result: AuthenticationResult;
+		try {
+			result = await cachedPca.acquireTokenInteractive({
+				openBrowser: async (url: string) => { await env.openExternal(Uri.parse(url)); },
+				scopes: scopeData.scopesToSend,
+				// The logic for rendering one or the other of these templates is in the
+				// template itself, so we pass the same one for both.
+				successTemplate: loopbackTemplate,
+				errorTemplate: loopbackTemplate
+			});
+		} catch (e) {
+			if (e instanceof CancellationError) {
+				const yes = l10n.t('Yes');
+				const result = await window.showErrorMessage(
+					l10n.t('Having trouble logging in?'),
+					{
+						modal: true,
+						detail: l10n.t('Would you like to try a different way to sign in to your Microsoft account? ({0})', 'protocol handler')
+					},
+					yes
+				);
+				if (!result) {
+					this._telemetryReporter.sendLoginFailedEvent();
+					throw e;
+				}
+			}
+			// This error comes from the backend and is likely not due to the user's machine
+			// failing to open a port or something local that would require us to try the
+			// URL handler loopback client.
+			if (e instanceof ServerError) {
+				this._telemetryReporter.sendLoginFailedEvent();
+				throw e;
+			}
+			const loopbackClient = new UriHandlerLoopbackClient(this._uriHandler, redirectUri);
+			try {
+				result = await cachedPca.acquireTokenInteractive({
+					openBrowser: (url: string) => loopbackClient.openBrowser(url),
+					scopes: scopeData.scopesToSend,
+					loopbackClient
+				});
+			} catch (e) {
+				this._telemetryReporter.sendLoginFailedEvent();
+				throw e;
+			}
+		}
+
+		const session = this.toAuthenticationSession(result, scopeData.originalScopes);
+		this._telemetryReporter.sendLoginEvent(session.scopes);
+		this._logger.info('[createSession]', scopeData.scopeStr, 'returned session');
+		this._onDidChangeSessionsEmitter.fire({ added: [session], changed: [], removed: [] });
+		return session;
+	}
+
+	async removeSession(sessionId: string): Promise<void> {
+		this._logger.info('[removeSession]', sessionId, 'starting');
+		for (const cachedPca of this._publicClientManager.getAll()) {
+			const accounts = cachedPca.accounts;
+			for (const account of accounts) {
+				if (account.homeAccountId === sessionId) {
+					this._telemetryReporter.sendLogoutEvent();
+					try {
+						await cachedPca.removeAccount(account);
+					} catch (e) {
+						this._telemetryReporter.sendLogoutFailedEvent();
+						throw e;
+					}
+					this._logger.info('[removeSession]', sessionId, 'removed session');
+					return;
+				}
+			}
+		}
+		this._logger.info('[removeSession]', sessionId, 'session not found');
+	}
+
+	//#endregion
+
+	private async getOrCreatePublicClientApplication(clientId: string, tenant: string): Promise<ICachedPublicClientApplication> {
+		const authority = new URL(tenant, this._env.activeDirectoryEndpointUrl).toString();
+		return await this._publicClientManager.getOrCreate(clientId, authority);
+	}
+
+	private async getAllSessionsForPca(
+		cachedPca: ICachedPublicClientApplication,
+		originalScopes: readonly string[],
+		scopesToSend: string[],
+		accountFilter?: AuthenticationSessionAccountInformation
+	): Promise<AuthenticationSession[]> {
+		const accounts = accountFilter
+			? cachedPca.accounts.filter(a => a.homeAccountId === accountFilter.id)
+			: cachedPca.accounts;
+		const sessions: AuthenticationSession[] = [];
+		for (const account of accounts) {
+			try {
+				const result = await cachedPca.acquireTokenSilent({ account, scopes: scopesToSend, redirectUri });
+				sessions.push(this.toAuthenticationSession(result, originalScopes));
+			} catch (e) {
+				// If we can't get a token silently, the account is probably in a bad state so we should skip it
+				// MSAL will log this already, so we don't need to log it again
+				continue;
+			}
+		}
+		return sessions;
+	}
+
+	private toAuthenticationSession(result: AuthenticationResult, scopes: readonly string[]): AuthenticationSession & { idToken: string } {
+		return {
+			accessToken: result.accessToken,
+			idToken: result.idToken,
+			id: result.account?.homeAccountId ?? result.uniqueId,
+			account: {
+				id: result.account?.homeAccountId ?? result.uniqueId,
+				label: result.account?.username ?? 'Unknown',
+			},
+			scopes
+		};
+	}
+}
diff --git a/extensions/microsoft-authentication/src/node/loopbackTemplate.ts b/extensions/microsoft-authentication/src/node/loopbackTemplate.ts
new file mode 100644
index 00000000000..60d3cd4d9cc
--- /dev/null
+++ b/extensions/microsoft-authentication/src/node/loopbackTemplate.ts
@@ -0,0 +1,140 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+export const loopbackTemplate = `
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+	<meta charset="utf-8" />
+	<title>Microsoft Account - Sign In</title>
+	<meta name="viewport" content="width=device-width, initial-scale=1">
+	<style>
+		html {
+			height: 100%;
+		}
+
+		body {
+			box-sizing: border-box;
+			min-height: 100%;
+			margin: 0;
+			padding: 15px 30px;
+			display: flex;
+			flex-direction: column;
+			color: white;
+			font-family: "Segoe UI","Helvetica Neue","Helvetica",Arial,sans-serif;
+			background-color: #2C2C32;
+		}
+
+		.branding {
+			background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAJYAAACWCAYAAAA8AXHiAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAhGVYSWZNTQAqAAAACAAFARIAAwAAAAEAAQAAARoABQAAAAEAAABKARsABQAAAAEAAABSASgAAwAAAAEAAgAAh2kABAAAAAEAAABaAAAAAAAAAEgAAAABAAAASAAAAAEAA6ABAAMAAAABAAEAAKACAAQAAAABAAAAlqADAAQAAAABAAAAlgAAAADkcSUjAAAACXBIWXMAAAsTAAALEwEAmpwYAAABWWlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iWE1QIENvcmUgNS40LjAiPgogICA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPgogICAgICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIgogICAgICAgICAgICB4bWxuczp0aWZmPSJodHRwOi8vbnMuYWRvYmUuY29tL3RpZmYvMS4wLyI+CiAgICAgICAgIDx0aWZmOk9yaWVudGF0aW9uPjE8L3RpZmY6T3JpZW50YXRpb24+CiAgICAgIDwvcmRmOkRlc2NyaXB0aW9uPgogICA8L3JkZjpSREY+CjwveDp4bXBtZXRhPgpMwidZAAAxaElEQVR4Ae19CbgdRbXu6j2cecoECTIkICCGzAg+7qeQ9544QFQgiXpVEJTEe59ALsbMwE5AMZCQELgKeSoqDlyiQogCSUAC6FNCQhIwQMALCbNMGc68p37/v7prnz47++yzzzl76OCu851d3dXV1VXVf69atWqtVZaUg397IPJwSCKT46zgx16wh+19XSYnO6PjE7H4MDuZ7BSxXhQJ/On5KTWbTSMm3bYlvHXmJNxj2SatFLFVioeWn5lDDwAgMvOU2NG/3DMo2h691rLtr4bqBtVX1NVJRUOVBIIiyYSI3RkXO9q5NZmU5S98tu7XpmQF2AwAzCoNwMrAMm/CT3HkrgqJTI/KwodOD4ZDa5MVdUPtfe+KxONKiSob6+SIE46XqsYGK5FIBoLVtQEJiSRaWp+xktaNuzpqfirTLcBOZNJtdnjrDCk6wMrA8hOgWJcZoFSrT4nJogfPESu4Dv8AVLTTEqsC9MkSDHB2NIYfkZGnjJOqpiZQrkTCAmWyKqtDgXBAEs0tLyZtWRl7953/u/uiUR0sVgH2xuKERCJJnhc6lIFV6B7OuXyAJrIpqDzVlQ99TUKVt0scAEomQaXskBAONlEFrgpvLdkZk6r6Wjn6IxMx2qVeY0IsSVrhqnCgMiiJA62v4a5Vkmz/4a7PDWtmVXSIfGMSAGYVFGCpGvGh5VCiHohEAiJXi77sKx+eLZU1N0hHCyuTAJCCDqCAKIUCYxv4AcY6YnL0qeOkZuhQSeoo6b5OG+AC4ZJQRThQFQbAWt7Bvf8ZSNg3P3deA8ZUF2AzADCrMAArA4u9XMoQsQMp6nHlH5dKdcMcad+fJGVCCKRAxfMU1XKB1dYpI8acKI0jj5FkDNSti3LpzSgjCQQmrFA4HKiuIMAO2EnrtkBb+8pdXxr2OjOd+bAd2vQ2cro8mXPjwH/LwBp4H/a/hLvuCsr06cpky6KHfiK1jRdJ235M80ClABMtmMMfKJQDNB4j1VCstg4ZcTKANWpkZmCxAJZiABYIhgO1VRwi21HGj63OxI27pje9xGz5BlgZWOzVUgSPjEqufOheqWmcIq37YwBCWKsDDGlQULnAUh6L4CLFAh/fCmCNOSE7sNxi3IilxiUQCAdrayR+oCWBcn4q0eSy56c2PMc80+6yg2t4MEAKVgYWO7HYwcz8Ig9XSTz5kNQ0nC7tB6KoBmZ+bnAZdaVUhIMHVDxWQtQCYI3thWKZ8rrHLICiCwCslmIKFGn/GoPm9S+cW7ddswJgZw4Ta9NkC/n6HsrA6nufDewOV/Ap8x8cggHvMUztTpLO5igkCV2g4hMIJI3dY56mqBdwgXOlWP0DlhbNkhVgtoQDELza7Z1iJ2J3J2P2DX8/r+Evmsm2A2dukkBfAYbZSDkUrQco+IQ0XeY9eKwEraekovYkzP4OBhUrlGLEXYB1q6QnzXPYLUtuJ5SLcei1k62tMYDKDtTWnRusrf5/J9zbcv9xa5snc9aooLJti3xYbsVy1lEOxekBI01f8NBECVnbJVx1hHS2YSrnGf4y1SQTwAyYTJzpvr6lAWA2AWYlW1vidrQjGait/VS4pvaPx9/bvOn43+4/GwCzDcAoC0P+rKNd1ot9q1s5d489YIa/BQ9+Ap/yAxKsgJSJ8gGXUc94I1BD4Og/j91zDodYGFTmvf88VsYnpiWSt7ICNXWcoQoo2uNJ217298/X/8bky7ZcVKZYppcKE0OaDg0FDn9XPfwFCYc3YEYGUEUpTQeFUNTgyZniDBUyfJdecu9hVJjAYS+YbGuJ8z9QXXNaqL5uzQlrm3d88O79X+Ujt860MIu17ExDZJliFealkMJYMn1NQNZATnXlQ9+ScPXNEm3H02zKrZQK9PpoxQ5+PBJ3pVwqbkBJpFhjPiSNx47sWY7V60Nyy4BaQDQhdqCyJgRWX5LNLbuA8xUfaKz7sTtEkkhhMuBoU5QpVm792rdclKbzkyWoFj64WCrrAKo2SNMxhukSjb4CvoZe/pGBebyfP88ZTNx14KQX6BdV4McQSna2JZItLXGrsurEUEPdra8daPnv43934CIy+Qoqth2hDKx8v4hpkKbrAi++3AUbf4AlmqukvTmuiytgWfr3OBdg/bs533cpwMDgJ6BFEQtUVB4dGlz/kxPuab5TH8S2A1z9bGi+6/o+KY/8FKkUw6KH/ktqm/4Ngk8y6UHltvVCH39IrQx1SsXmoI9l5Tc72xS2Y50AWGtnaEjdF46/p3mtPuJqqmOUQ356YMZtYai8xITrfzsGb4Dg8392W6IZ8FOygImXslwe8KOzF0Dti2D8vZbO0KC6z37wdwfm/d2yvu8dvbPfXr7acw8YcULkrw0Sa34EoBovHZCmq3Jez7dlvwKkGMCoqIHn+E8tQtse5n1UwZn37HXVq0nOeO14sj0Ws44tD4U59FjWLEaaPue+IyXWskMqa11QUfCZQgaK6OtxhqeaIkpInjLUyiRBjJKMhRrrqkOh5IXlodB0S3/ilDR9/cngyx+RcOVg6WjtXZqe67OUUqVnJroQsgu+nTzF/oXUlsIUTIk/WaZY/e18A6r5D34MXbkV0vTBEoVKZ1Zpen8flv2+FCHLnq0YV4N2Zwcwb48pU6z+dDfVXiKnRKGh8HksJt+tIp44penZlmj68yBzD6DjRQ8pmQbwWR4u2aSau0oQg2JRT9EaUqZYfep9vEaKFGhFs2DDN6Si8m594Yk4RQyF+0gVMRlgwyTzb9qRIZu51C02+Uzc7WLaSS55eIvJh1WHwnVGWt0O+VM1eFgMg4dIXBY8OF+qar8HlRd0JciHRRutEoXUy/Q836R5kjIemnwmzpjJTcwlD7O6+crAytaZ5ppK013B5/wNy6W6/goIPkmlMBD1V5puCu8h5gs66GV6E7zHPZRRsmSrgOS7ZI3K84O9Bg/zN/wcuulfVYMHZ+3Mw+Hk+bmmuHT8pPgrZki/aG4qfVymWNneAfmp6Y5TDpm34T6s+306v9L0bA/ntSzAMZdK45qht4qXKVaPPeTM/GISWVcjnZV/xPB3mho8WL1ofPZY4AAuGHmWAZMpKv3cpPsgLlOsTC/BLNHMXn+YRAOPglE/ERoK3a1oMt1XrDQdDsne4YEEl/kv1vOzPcetUxlY6Z3kLNFEZdGG42Gk/hh00w9Xg4fedNPTy8n7OdBjgKRl+5RcudUqy7G8ADDS9DkPnApQbYNjjsOlsz1/SzTeZ/V2bKiQiZk/HUvp572VWcTrfaNYVLddvTUkgyYl5Rk2c1NARtRbUkIHX3nrKyNNn/fgp6BCcL8E0DUxuHShNL3ULzBFqVCR1KwwlZi3LshnQbkDizMkS61i2dkmqDa2zMQpr7tuDc3FQyOmNH0TtD4hTZ97/1ckFLxDEniBCbpvUZMofzQjHdzp5/6oZaoWuQHLMLOrXmgQO34hvugzUMJgfMnvIH5I9rXfgRfTJpqv9P4vU63r7cAYPESmx2X+A7NgQLoCtn68q7BLNL3VK3U9DT1pp6lsPjzoBVj8mqFWSzOfW549B7ZwP4W67RB1fgm7ACh24T84DZTsKlm2/WKZOX499Z1l512OdYoPG5yqkho8qBAoIXMf+K5UNiyAch4axbdXwiWaVAU9BwZQqdHPJCAPD82/55aSHbp17BlY/JrXQLVmOoa/VTtnSqjqVuFI2LI3itkJmX6nCLrICVceIRVVD8iNTy2RK6yrtVGGypWshVke7Bg8kCqJzF2/Gk45LoGMynEf5HGPl6WEIl/yAIlPTjstcmWyP86tW+ZZoWvCo65sbvrblVLVcCuGCFtiUb6MCjQshH/oOquAtQJMbgKzp6TUD7lKVjy9Ua57bJAaaUZ2dnd0kb1KxblKXtAYPMxd/zss0VwibTB4sEGlaF7sl8AXZP61TjhxX1qqirYO2alTPx0c3JHetbGbdq6SmqZLpXUfAEUnAo7NWA8NYLNjkFBXQJj4NpxkTpMrJj6ixgXPTLNTXut6uLkoyTR4WD0zpg5kB7+3EbrpZ6g0veQyqh5abyTuRBSP1dsM8iYwnMBTn91ph4afdKw0jDrWtqForq+oh6KKmWyDoegOLO/MbuXOO6V20BekdS9ngRwyu+ftsaZ2DPIfmI8je7Rtvlwx9vuatdRDo/FJNe/3gzDZg8FD3RjH4KE/SzTsinTy0WOH9OFCWrl8hD4GPwZYSSj/wmzBqm2y7Ff23H7cZ856Lzxk6LfjLc30nFw69R1PKwmsrqGQL57iAg6DK3c+CCadoOIyhnoh8dzXy6EVhvvohMQ7bQyN18mNf1sHUURdSYdGCj6pnDd349H4RmDwUD0AULH5hQBVT+WaZwF0YEYkGA5KKGRZrfsWyS++fHGgtvofYEpArArjpLaXl93jZYd5N9SE4oTkM5vAd0yQln1k0vvLI/HLsZXa1TbCX7n1nNyw43z5zujHBZ7iVLhaYHfQqRYbafrcB8ZhDHkEk5BG6YD7oP63LVV04Q8AKhIxGuZjsAOVBZtx4C1JJKYmb/78Y/r8aKLKrsYR1A0NBAtfryxPcIkuPPbajjeUVTuOhBcUfM11E6Aa4iy4sqb9/4fPJVCvNrhADFd+QCqr/irLd8zSCYFjht3zjDRLvft0SakwdniYd/+ZuG+LhMKNKk03fj77VFiJMiuDjnGwuoG860a4ED1RAKojbttSwxrB7zYGHuc1MS55AF4IGUjLIUO46RksuNp/lYpqmC/Bw1x+mVln1mhB07Ju6AoMjf8iL738FTy3UzhrjIzm8/IfyKjTfdCc+6bC1eYa/Z7jMcfggS33BsPamDjTtfQ0c55eFtO95XiPzT0m5jUGU0Z6XhvyQ3g6ViXVtr2LZeWUiOZH2044YVL0dT3x5w8oFhys2rIeqiEwX2rPN6hMqx0n+G37YuDdpsqoY56V67eNV1DphCHSxeuZO/obU/7GMjn7m/PANyFNX6MC3XiCzvgpJjk4mDQTe3P0lMb0TNd4rzfde+wt1+TzXk8d66gWxUYC8P4f2yvtLWfJjQAV9e7JA7NtPg8haTzsPzD7GyUt72GbMqksYH35PWJoxDBbUTUK85ptsvypb8q3x96mz/TOSPtbCTV4wGvlJGTu+kWwSr7GFwYPfWoP51RoA4e+1n2PSqdMlZs/97aKSCKngOJGUvDrXiyTDQnsfqX4Z7bOCqc6DsHwNRcnYGjsgJQbHVE3+FZZ/vQdcC7u7CGDnar6XQUtI+L4aJpz/01gdK8BTwL5Gx9Egwd2vJ//teUY+kIBsCRBgGqpLPvMGXLzZxxQcVbrNCCti5wFBCfRL+2juMGW0QoseAzRd8D30O2fzUlP6+nc5DWxN583jUMSCm2Dw/y6QV+R007aKUu3nqRrkpxMcDjrS6BQ10jT59z/K6luvAyg4syPQ6wLqr4UWIq8Nih5NYe+Vuk48FmAap72Az8YB1Q9VwrdfNA3w9wm3RybOD2d5yakX2N6+nWTZtLNPeYc17lXC10yp93NcxM8uU1Sj7HJa2JvRm+aHjueelsh1qiqOREzx7/Jsh0X6mSC7gY5NOYSyKRz2xC24zv3rccQ8iXsRYOv2/ECnEsRpc2jQ19ch77Ols0ST5woy6as06GPn5f5YLJV0tu1Jp83zRybuKc83uvm2Bt7jzOVwTTmwT9dGu6ERS+TvDSV58UKFViH5EaNAfB6PwXftVofTD6J4oJsQaXpYGRnr6+V79y/GUs0ZykPR9/lbgN9G7NdNjeoDGLoqw2h3jfJDWefJiumvJbaszBX0VTf6Hu2Hs3bNQwT1m+kgiIRiB1KFSxYZFNLghoGdYMvkRuf3iHXbzlOxQUEV6ahcZorTZ/1wAjoiO3AyzkFwx+c8XORHKjiv5+DLRz6sA8h9nZuOzBdbvjMLK1uLkOfn9vl1g3A2r8CM8I9mEFV4qU4MiXvOzHH3th7zIK85+nH5rynfCYdW2ugnJBK/Ctrx0qw6hm5fvsXFFwcGimxN4HS9DUQfH573YfwPTwFg4fjpJM7PKjmhcnlV3Bx1ucOfe07xI6dJDees0Y4pNPFRy5DX1cLfXsUkCtOxxZjyU/Br9M+fEFUiekClwFFeszmpKeZc+8102xeM9dNbPJ5z538FbrkEghWQOZ1pyx7apUmczcqUi/VTQeoZq37H3g9T8J90FDpgMGDoVR8kLdMf1EuZ8ivqgthdWO1LPv0eFn22ZecoY+yKX+syjivYWC/kLxjFjYba3k37RwHbYQ/gU85qgDS977WMgyhZhL1SGJovFSWPf1ReIs7T2aOe1ULunTt2Vgp+L0EQcSiEF1YWDqiSoluDwKGg++HE0vDexhwmfO+1iYv+S0ubVHUksTQ9zVZfvYdWqzK71SU0L+nOFIv517vB9W/0gZ+l9vHkOSCtyIluHz0yxK1x0GV5GmdoeCVDfwpAyqBogJ82Zg1Vtd/RIKBF8B7nSUX/OJf4drz90qVYjHOBimecKgUY90ShOfuMaJU8B6nEgt+gFePpZlqLCBH25/DBzNaQUVAkXfMhwEK21Wath3ceW5d+PIkxSTPH7tXmk+eiOn6I1Dwo2ZDqcHF2nHxNY79jaskWLleRh33S2irQqVQfVIFHSDh3XHWrpQJLdPGeWMee/9ZbFECJkSY7VbVYcWh+eey7AmAaspz+iETUO4uDgOuSUkpcebad8mKuGCrZFlnh2fKsr/9FtP/86TNVfSDWkbmIoqQylljPEaib0lTExaGwra8/lpQosB9GE1QIOEqPxPW0tSUMa9pwEnqnIkmk3s5/1EUCo8V0E0TiBJmyvJzVusj2Mfs6/d5cCiWaSS/IkqxGWaffD70qWBoMIgyIcq4Uq9Irxfzx3myA5t43JKamoCMHClSXw+aSlkoMpihzwyFhKFJ1/vdPE5ZXdfy3Q5oTqFI6E5BRTvW8SK2lx+voNKPNgLWA338TxC6A4sNphRbjSkw/s8+eaa07fsurFhI2dhhfF2lDWTQoaggQVTpA0eJHHY4XiPOwetrDVNgwrnqiBtApRDl5DOtYP78BQ5vAlCFsSxzl7zcClHClB2iyoYAVARrmf8koWso9DZYFfHwdX0Y9oHTRy/CrOxt8AkrIZJALjpcpm51Xl+I9+m9H3MU05UQxEOHiVRXibwO7SRSrwoOjahbgJkQWE0e8oVztmji9Fkj0wcWMPRVVKiKTtuBy+XGsx0xiVKqyYXlVdlG/vshuN2YGVisoH5dnLWoOOImyJPeAc/wC3QcGGa4xnUMLErfFFaltk5k5CiRN94QaW4GuCBrVPGDCyRvLfkC2Hj+6zEO9Nh9MzzOOWhm3hhXteGOlldBTc/HssxmxzrpGbsYQ182omua21OT3FZrFzBPT+e85u0ak8+km3OVxOGkZ2DxDn7iEXQaxREzx/4SDD1M6m3sEAqO2ewQakrU/O6Pvije7p5785hrvGSu89jk8V7PlMdcN/eS0pih8UgMje++LfI2qoklOLXUZkt1wOcDkFfv1x8cI874Vkw+VgCB2RlMHXmsRejegwGIZ8JYjlon1rtfkhUXtOrQNx1C3CIFVstbtfTHZrtm8qbnST9nvkxp6enMw/+DeSzmTA86Y4Qa8eyT16NHT8UMrRVGCWTqM89uTA3MU7zlmWtMM9fT09Lzm3zmHhOn0vGWafJPkAw9TOQoAIygUb8eyJxi6HE9xXchnflT/ywUQctkunPaleY552HStZgJhi3M+uZBNgVVF4CKSzOR4oGKVTG457FfQm7AYm2pm04d9dknPwFqMB4znjexvkjtg6J9mVk7jUBiIPWqw2zxmFGC2SNqh+oRPBnB5QJIQcRjPXDKMYBzzry/zARVH7Q9EXsL1uEfx1rfUkdZ8dBQG/Y2plDHuQOLNTDgumL03/Gmxkln6y61fPYLuFhHMzSGgfkjj3aYezL1pGgMBjA8V+rlUjoDKr3uZE3l7zoFakHLqDbc0bIRVk0nyopzHtO1Pi4eF8ukras+vj3qG7DYDIKLPNd3xr0lweYJ4C0ehx2iX6T0TkcTXAZIFEccBYBxFqgyL2QheMyQmKJkSNc0FpGJenHoCwWx3hfAWl8EVOosWXnuPh36etPwZJH/ZKEX5r2H3lCeC7PFKyzunv1Ruf6pP0BK/xnIvEAaqFvFt1jqgCpw0OLQWN8gMhLKjG+8JtIK/1ecNbKGJGLpNeU9BCbTnWOagsZgMQOFRGiAWPHpECVsVIuZnR+Gh8PpmflM3F6UwDawnvz3S0Bd+k6xTOW5eG10pOaMPRuLxXCuTyl90hkuTL6Sx0AIlxXDIKpHjRQZMsShXPTa56VcqSHQTdcXBbJnQ2BWSWPR1kelDUPfcoBKVXci9vtFd6oQr6j/wGJtqCNFjUeGOWMuxBLQcixekwriO/KRLwHv0Hj4CPBeRzqgov0qAaT8Fqps+C4m2kkYY0BmEa4KghIvlZXnnCG3nveWZ+hT6LHp5XBwD/RvKPSWo0wrZkMMc6zZGBbfgT+t66DRyY6nkagDPM1Qwh+Ci4FDYwMWsisprcfQ2IGhkYw+KRazONloLIq1vvZWiFa+BJP2dchgybQ1MBYt8dCnjfD/z8AolmkfZ0NXA0JcvpgDt0Wdzd/Al45XFODSD4dG/wQCjOCiAcnRI0WaBrtMPb8D12KmAgvIHa2bpS3+IQUVhz6G94nasLalwD8Dp1imgo5ukSulH/NjuQGUywrdA78JQch7yGLmB8TmeQONCS6CbPgRWDSGu5Z/vAF+CkNfTS1mfXtXya1TL9dHqCXQIaLmwm/DBFJe7znT09PMuYl7upfXGdLLc1K7/7p58/+yOWNUccTYtVhS+QgsaPaBcPE5BJd/gndoHDTYlpHHBeB36oC89drZCirObA8VixkltmldmwkE6Wnm3MSmiEzn6Wkmb3rMfPjPP7D4oK3u0/78Z5FX9jhMsVq551o79/5iRDo0gomvAs818liR8ad1PXVa12H5qA89AKqVf2BxrYwCw5lrPieHD31C2jub5OUXk2CCAw7L5UNwcUxMQKHLCjTAKvsPct2Om5Bkq24aqW859LkH8ggsDB1k3uli59/v/jqMYO9Rvj2AmWFHR0BefglMMhza0LKGMzD/hQDUgRyj2fpBl8l12zdL5K9HpuwBVHTvv0r7tUb5AZb6bVoMYEFL8lv3zINu0o/AsBM9CTCMWAbBHCEOATXB1Y7pvU4WcZk5/PXfZTRLy6Cq6ufke09+VsHFehq1bb++TR/Va+CzQjK4EXe/5MvWLoerSeyXDPdBAVCwpOvFlxQqRHBhJrZnt7M4TOU8MzPzUYe4VaG4gS6FatGetfK97ddjaJyLa47RrB+NIQh8PwTOClGXgVEsgsrIdi5f+zOs+l8Bwahj7UuzJz5E//mDgDVcPX9lt8iB/Y7euj+HRdbWMZqNtiakfvAc8F2PSmTHYV1Do7aE+UobONf2C6jYE6gL33b/gUV+KgWqdX+AT6oLoOnARWhnhwcDKM669JhPRSCPxf/XXhHZS01PHPuqZ7SW5of9E3CNZj8mVbJLrtl+loIr4oojTM4Sxn7CFbuB9enfUKhakpNj8h93VUuyGvsl130UVilw323R94MTCCg9YYygp7hI1RQaOpB6vQEDCA6H1PrkOp03v97kgx/HnpL6V1CbqWgCv7hevrttsSy0Ilq7EgtQ2Wump33QW6kq9B1YpiMvvW8YhJ+PqdO0Ds9+yYoj/Ojam56kHqYHmgRwMaZFzVtvOuAaNtzBlR/B5bSAGqPYGAFbi9QPuVq+t+NfJJqcJpEJ+4QuLrlDWjmkeqBvQ6HZ4eGydcdLAO6DKqpPhI4SVZOp6OeARYHhAsekKZjwo8OiJ+Z16kbRAOLNV3nm5NElO5RhyvJLTHea3MiJ/iRq6v+3VFjPy7VPflxBxRmj2mNqK/7pf3IHltnh4fJ7P4IZ3zZoUg6Hdxp+pQ6oTFfqEOieKKBwzDh17AKLwyH/mR/meLJ/L7QN9jhDIvdB9CtTr0qMNneIiKEPhmH7lEfku9vnOoa+WIw3C9amP4oR+/AbzA1Y7Cxanlz++08CCI9DRbcWPgnIqGeWSnvBpR0L8JiYh/qPH+bTf6RREa8FNoFcAqKtoJ/B5bQFewZhO7141IaD3u9DJLFOZu+o1VUHP26np3Uu3k8vwDLSdCzRzFr7ZciiHgAQsPwBuyobfEW2LyVFokxjCCIee8BkQMV02v8RXNSPenk3zOYxwhpBKm/LFkw9TB6eDySY+03MsjIeu3I6qmTXYM+gwfYuWbLlNLULoHZtUYdGVtD8pzc+vfLefOnXvPem5zN5M6V3v9YzsChNp2Ibpemz7p0l4dpfqOeUJFSPnQ0wvTXo4ViR5FxLgYqnBlxpMTuGSnc02SK4OqBST3AZIwfTnvTYeUL3fk3P05dzlsf8DOa+no45a6QzXe4ZFKr6APjOv8o12y4v6p5BWlHvj6m0idMrb/Jma6S5Zu5Nvyc9vft5ZmDpEk3E0em+7N5rIX1eIdFWzGyVq6bgKfdAqmSCF1wpapUJXHgEh8NXXoILoBa/C1JN6+CyqBOUPI7t9AatxKzxLrn0vkp1bPdPODQeDCxdook4QqVZa2/D7GchZDjcL5mwQH7zFfQh5p0KKjc2YPOCy0vF+Koo5+KzXtkNfwz7HHBpAp/r2wALJdSNGyPUNE6DEuGzsuTJcY49JgTKzpYsvq18PivWHVjdpOlrfwvd9RmuM/787Jes4HIB6QUaW6Tgw4+Czb1IqTyZ+NdeFtn3btKR0pMZ85GhxsFvg5V39wyqHgWB6na5ZutMZSnoaIV9XKrQn2+yP/egfV2NNNJ0xjXDN0ql2S8Z0vR8BgLHK0pgxV0cOY/xnDAflU8tGIu+9aYzWRgCt0UJOF9znMH1bVjOZzt6L8vZM4h9zD2Drt3+LxIf97WUz9d8LWSbBYtcAZBrPm/7+noP8jsUS5XzoEc16+4mqR6+RSrqzkjtl8xCc/lnRUw+7zHTTEgde8Bz0LCIzLys/5oPFjPwkxCQDnn+2bPgYO1fwSTjOrh6G4Ya5pn+jDE0grpS5lXb9FUJP7VTIls+5Kw1gnL5wrDXvJz8xpj1oYFUzrt83dGSCMAZf81Y8FQHO+Pv7bkp0CCj95j3mZdujhl7yZSCCyDSYZCXcBzACwnAKLYGxqLxts2QPxwvd39zo8w/+ddQGDxHqR73Rwa3rMX59kc3RjBD44cw690JvusCHRqppVrKobGAfeaIEy5feyImfNg2pOooSNO7lmgK+GAt2lArnihxYkyAYeijAUYl9pjpaF4lt00/TX70lVfVWJSqwgvH/AE5T8eQ2AEzMw7n7jpdOqJxJWPIlC/XtPQCM92XMQ/ccbt7BtU1/QwiidWai+Kc96H6c0C+xh1W7fWQvzTBNVHxQGX6vhu4lGphjxnsLCrJKDZvmp4yw1KLGVBW9RsBd0oLxv4FIJyAOr+NZRXkx7ZsGviie/tnxvQ8uablcl9PecBv2VDj0D2DBl0i127bLpEnjtU26VIQBNLvkxCQ+v1XQJfqGHxNUEjHGthBHZ7eSQU4d7qTbChcLtLbMPaYSdgnyQ/Py7zHjHGntGDscxhaMHS3/re6asy0XYvBi/eFsQnpwdsscy0930DymHsdvha7fWEhu7J2HDZAfxYAm+bsSYih0fjDMHXoT2yeZervPc+WxmeZ6+bYe6+pS7Y0Nw+1PKfiq+dp1wzRFFC8OA5+Co72MfS1H1gtt5w7Xn54/otZ95gx7pTmjH5T4vvGw2nHFvVbZcDFupsO8B6bjjPXTOxtqzfNHDP2BpPONHOcLY+5tysvvdeg3dgzqKr+Llmy/SbNYvYMMvlzibvK7A4M3ptep2xpJq8pL/3ZmdLT09xzzgpH61INfSyYTMWMsYCDWV4Iin5JqDVfAFDN1PbopAJrlNmCDos2BI+TW2Th2FMByg3ujhrZ78tWZlGvweWTs2cQttNrugx81+MQS3xAh0blu3IbGv04ftIqJTOqC93BxtF+pTrafw6mYqNl1bl36CyJ03AytbkE406JM6xF4z8Jge6vAK6wTgDcvWNzKaaEefhxO0NjVd2pON4li7dOUXDx3ZC37CUwmwnmdZrYpDP2ppljE5t86efp96XnY34TzDFjSh//Bv/kvAYd4aIFGFzgj3vMdGCPmSHbR8stU59z/E4BUI4fiNwr43WntHDcl8G/rJJqgIu+rfwtpfe2EbNG1zKouv5eiWxbqv1Au4JeZo0GDObFegvNdC1bPnNvT/eZdJOPsTfNlM09oddgys7ruVEI5hxIsDj0VYKfAwFvb54Jby4XYg3NWeoYiMtFvgCqqZDaLRp/OcB1JZakKOci3YLDD1Ta7/9JWgbBRq6TlkGD5sjiJx+V2X/2n2VQDu8/IC17V2L42A1xA/z64KUXKujQR5eL2F4tFn0RBHI8+KnVOvSpNkWOQ1+2+tGdEgP5s0Xjr8WOW/8GgS9oozqOKCZFzlbL7NccXjfoWAY1fEzqq3fJVds+4YhZImARXF9k3lL89MGwXqhPQH56UQcsts6CuOE93ahR5UF5rimXXshhco+Z9pY1MrTzJLn5vB3gHypSi7PejhrIsUqzAVLKha4afytEF1NVpyug6hLFocoDqT/vdWR7mDU2O5ZBVdUb5KqtEYey4+Pxqj87n9JAn5i/+wkdBGdJZ9WUFyCQxA6rHS/hCyfDxSWd/AwdOuurgHYEFNw7sMfMLZ+frmrOpCrc17lQgcMqeZNF434LmdhkDDHc8zAEgB8iM0b2P3eOhWVQtD0J58FXy5VPbpBZ25oo83r++TfyqxyQ5/fgLOlwEfrm818Vq3U8KNc2LEI74BrYwwBNDH0sK9b5GmZ9p4FKrdJZTr6Gvt7qZ6T0V47ZBHP5SRCr7JMwpfQ+B5f71euXzaGRE522/di0oP4TUpvcJXM3f/z1mUdAhxvB5jDvv+BUiovQpCA3f+WADN1xCuRJD6oEnIx2/4KjdVCFPWY6WtZJdcuJcvO5m3XoUyZbFQn7V3Jf7zJS+oVjnsIEcTx2Z31FKqAtQUGqUmXi32f/rJjWCY1lHeFgCb/caTYGqnsY+OFHAnO3LGJXBMIWWBkeaU498MOPUyVTE4LLyI++dc+vAa4vYvji0EGpfPe85p70mGAM0CoCIR6dJ/953lI99patCUX+4bBICjbvsUFwB/kIpPRj8KL44fhzSCGgGBh3Axn41aQdsGqHWPZbr99+zLgT3gsNGvrtROuBBF5QrzIvLbPQP6jzwWDxOvr41t2rAK5LIWvijIp5s5FdKi9j6KvlUsVbYECnQpTwmA59o6fZUHArPZtJptfwXv8IboT68Bk6xPgRXClg4cALLvZiEjIVKDraiXBo2PB6qR9xmG1z59kMr7PQGMpYPup7MFCcocqRB91y7mUA1VVYLOVyDypuPCBrS1EmYwam47OiFL2zZSPoG4Y+BVWFOg7xA6hYTYKKlJOU66oJZ0rr/rtTS0CHgpReuxs/jmVQCPywI0JxztlC34SDKZapGgWN02H+RaB963ffxHreDzGzwteC3bNtBSTvZZOgkIehjzxkLBqRH5y7WIswWqmmPD/FNIfnFsUMS7bDYKRxBgSqFEVwKOm5T5i/WKELROxl/W7R06RW+g+KJXZnTIYdNVzqh9ONBprjVUEqVj0zPQd1660TIZB7GIaXkAv9+2+mADy3Y2gcgoVTp6E0dCCgOg5g1pe8WH4wbQNkLQHhHjMEpJ8DBY0RvjK8osg27HvduACCYjNcH0zJi90W1Ayd7DyVkbGtzAiswwAsfBeHELCchhnqM+OuRqkIXoD2noEL8LxvvY3GPCTh2B2yYnq7sx3ITH75bo84t/v210uVl2ybBf5wBfhDNAvrpqXeUUN70O1Gwt0w8OnAOhIUa8ShCiwio7dZXW/X/YsuUOVNDlVevA1uBCp+4Qz5HPd1NlyamucCrA53KDykgcXu5Rc+c3VI9g5KymhspE3m//UR2FptBumw+3mV5j0M+KlGHBHZ+ikM7/dj32sMP7EYKBcFqsUP2YCFncu681igWLQcTx8KWUZPzE62awNtLcru6bEDLfrQvJ+m8CpQ3X4q3tzD0PqogXYt5XjFB1cmYPXIvPtvKCw9k+onCBopfWT8ZkjksLzV+aYadqSk9KgsX3gx/k2/pD/LpPs8LgMr/QUZXfprJ2Bh3sK+123P6/JWIVWK0utgzg2ozPkhNL6UgWVemjemAJU8VwT7XjcMHQ8h8eNqqFEIlaKeyB9ngb0FD/ByyN1baXm9fgh9A3ltd26FRWysnVqcHWJW/OR9kNJ/GoLU4vBcBilGzGBil8/iAhkFpEMpIPXhrLBMsbJBzBhqKLAmcjN17HsNXXpHjdu8+mwl9P9apk9eKRR+0p9szvU6HlnK2G1xGVi9vXqvoUZk4oUA140w8KW2B2hGARfWDThYP++x1tckmNjNo9dK/ONWKdN3UeKa+fTxRtecC+pXbZkPcH0PqsPU5GdX5v8DZakMZgg0cZrkXYfC4Yf7bkkn/x3idMf775eAigBEXGFYcgo3U79EQtXQ7cSCKXX6CxIMunoo3KUOPVwtaXIZWH3qfi5Yu4YakQk/go3A51XafUi4U+pTQweWGSpIZWD1pwtVrwtS+iUT1ko8/nFVJaKtZKENNQyFMnF/6l7Ye2wrCIc62GukDKz+drSR0l8z6TG4s5yIPXbew9BIXXqKI7oYbgOCvsbeepl7vWneY/JfDMqH4bhEMRj2hAXjZxCsp8vAcl5J/34NuK4av1OsTpjPte+GQa5jqNG/ErvuUjDhVbmY6bqQ6cgFU6ZLRUyzEdRnbFIeKANroB1vloAiH31VAlEsAbVsd6T0/bZw8tQoJ1Qhvy8m99ysPZxs2d8mVujnZWB5XmO/D7kEREONyEcPyMkTTsEuFX+ERir2boRdZSGDUrVCPqAPZYMFCNbX84Yluy+qe7MMrD70XdasxlCDAtVrJv4vWP+sgadkDIsElzI9uN0gIdfYPNGlXOnFmMsljdFeLNAHmxorE/v33bv7oqalaK4/rWhL2k8DeThFEcaf1ZKJ0+HY4wegXOS5YAuI31zx5OJI8cib9L5UImpojgdS2QHfS0DFrFA4GKxrrEjs3/9fuy8e9DktdbFaQgz4AeUCvD2g5nOuO6VrJv0fDItL4E4JogjVsOUScm7BYMfEB93FC+b/oIuFTEiAcMYx+wsGahvDyVjnq4nmfReDUn1RH6pGKlayPBQW4hUYO0qamV0z8WpYMV0KhUH0tY4Q+ZfSG/AZnBUmTuDTiFsVNcFgbWPIjna8YLfun1H38uvHgVLdnvJN5rbdF9OJQrxbn5RJf1Yw1IDqzZVPfhEbiP5aN1BLUkG9F0MNBQt+UiBxj71rhdCaHno07QoLt1YIgGA7M9BbGC1zM5Bk+4GnwUIt3XNxw69cKixnPmyHNk121Yvcji9TrMIiEEtA6HAqDV4z8U5I6T+hzmyD3GW9Hx5vCDIGAzZzrIn5/eFwhxITVlVdKFBVF7Q7W59IdLSev/viprF7vt74S4JqEtsFlKWDijUpU6z8vo+eS0sZamyBlN7aBEONejXUsGCoYQDjvVvT8GNAZGaEXoqVUvTLH8VS/snCnmvVDQFa/tjR1sdsO3AdwHS/Wz0LgAptnTmJZkGZaq7ZysDyvsxCHxtwLdoxCiPMn2AgewQc2mb2eJMJWAQV0xHzlXZpkA4YWCiNQ5kdCtQ0WuCf4NmscwOmsd/f8/VBD2u3gDKduUmCmahTpm4rAytTrxQyLWW/uGUoKNejMNQ4CTr13cFF8GggenDgpVY89wLr6BHgsQ7DOjidTff5dbI0DnlhAEqSHdjNNh5fiw3Llu75+pC/IB0q2aqoAHcE3XkovZblp881yVJW+VKuPWDcKV36QqU0qJT+dPiN6AIXX7cGHPA4G7COGiF1AFaffDfQsw55KMsCoBok2bqfT7sTz7l+zzcGbdNHc+uVZzZh8jGZwOtzKAOrz12Wpxu8LgkWbr0XUvopEKimGWp4gEUJmAGZl2L1DVgsAYAKhAO19ZJs3o9j+Zkkg8v3XFL/rLaM9frwmbZulj6AppaBNYDOG/CtpApcAmJYuPUnMNS4SNr2gmO2HP/0TDdgMjEBRmDxkjLvOVEs3pWA92hQqDpJtuxrR7k/hl/AFS9f3PQirolAZCBvI9XURxP7/1MGVv/7Lj93upJqLWzh1qWQ0s/pcqdECT6umKGQxwAV05R5j9L8C8A6vMehUAFlBcNhq7oGgNp/wLKTt8bDVatevbDmNT6TIoOtg15MpvyFMTEPoQysPHTigIugTzG5Gowy9OoXPPEdMPTXwykwAUVqxi2KFUwKMgUWKRYYpWhchn/wGGCxAU5BkLWLeQegrATW8cJWVTUB9Q6YqlsqrI4f/P3iEW+zvpNus8Nb3wAVM6sEA25E9wLKwOreHyU8gycf405pwdavwZ3S7ZIAP5+EOyUbUvoUuFxQxeLY76FSjjj+WC+giK6kFa4IWxVVYMr3vQ5ErgzG965+ceZxyqErhXpjUsEAZTqwDCzTE36JzYxx/tZzYFS2DkpzdMHZiRcF7866L5DjFhJE7IhRx8CNfi135COg7EBFdQig4izvJSwdLU80t/7k1SuOamfTCk2h0ruvDKz0HvHDuRGkLtx2OpistXZlw1C7+T2w3xBWwV9yuKpKhh0xApuIYJ+gZDJgVdUGaMQAQD0HfN2w59Wmnxu5kwOoxaBQEfJbRQtlYBWtq/v4IJdyjbx9b1Pzu3uvxXB4QbCmqT4MnqmiBgYL4Mq4aZ7diQleLPokhKM37P5G453mKTrkzcCyi6OuY5KLFpeBVbSu7seDPLKuCffZw5rfjU6OJ2LjIQyFm2S7E2B7MRBI/OmlbwzdbEpXQPWyjmfyFjL+/4JPu45FLkyEAAAAAElFTkSuQmCC');
+			background-size: 24px;
+			background-repeat: no-repeat;
+			background-position: left center;
+			padding-left: 36px;
+			font-size: 20px;
+			letter-spacing: -0.04rem;
+			font-weight: 400;
+			color: white;
+			text-decoration: none;
+		}
+
+		.message-container {
+			flex-grow: 1;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			margin: 0 30px;
+		}
+
+		.message {
+			font-weight: 300;
+			font-size: 1.4rem;
+		}
+
+		body.error .message {
+			display: none;
+		}
+
+		body.error .error-message {
+			display: block;
+		}
+
+		.error-message {
+			display: none;
+			max-width: 800px;
+			font-weight: 300;
+			font-size: 1.3rem;
+		}
+
+		.error-text {
+			color: salmon;
+			font-size: 1rem;
+		}
+
+		@font-face {
+			font-family: 'Segoe UI';
+			src: url("https://c.s-microsoft.com/static/fonts/segoe-ui/west-european/light/latest.eot"),url("https://c.s-microsoft.com/static/fonts/segoe-ui/west-european/light/latest.eot?#iefix") format("embedded-opentype");
+			src: local("Segoe UI Light"),url("https://c.s-microsoft.com/static/fonts/segoe-ui/west-european/light/latest.woff2") format("woff2"),url("https://c.s-microsoft.com/static/fonts/segoe-ui/west-european/light/latest.woff") format("woff"),url("https://c.s-microsoft.com/static/fonts/segoe-ui/west-european/light/latest.ttf") format("truetype"),url("https://c.s-microsoft.com/static/fonts/segoe-ui/west-european/light/latest.svg#web") format("svg");
+			font-weight: 200
+		}
+
+		@font-face {
+			font-family: 'Segoe UI';
+			src: url("https://c.s-microsoft.com/static/fonts/segoe-ui/west-european/semilight/latest.eot"),url("https://c.s-microsoft.com/static/fonts/segoe-ui/west-european/semilight/latest.eot?#iefix") format("embedded-opentype");
+			src: local("Segoe UI Semilight"),url("https://c.s-microsoft.com/static/fonts/segoe-ui/west-european/semilight/latest.woff2") format("woff2"),url("https://c.s-microsoft.com/static/fonts/segoe-ui/west-european/semilight/latest.woff") format("woff"),url("https://c.s-microsoft.com/static/fonts/segoe-ui/west-european/semilight/latest.ttf") format("truetype"),url("https://c.s-microsoft.com/static/fonts/segoe-ui/west-european/semilight/latest.svg#web") format("svg");
+			font-weight: 300
+		}
+
+		@font-face {
+			font-family: 'Segoe UI';
+			src: url("https://c.s-microsoft.com/static/fonts/segoe-ui/west-european/normal/latest.eot"),url("https://c.s-microsoft.com/static/fonts/segoe-ui/west-european/normal/latest.eot?#iefix") format("embedded-opentype");
+			src: local("Segoe UI"),url("https://c.s-microsoft.com/static/fonts/segoe-ui/west-european/normal/latest.woff2") format("woff"),url("https://c.s-microsoft.com/static/fonts/segoe-ui/west-european/normal/latest.woff") format("woff"),url("https://c.s-microsoft.com/static/fonts/segoe-ui/west-european/normal/latest.ttf") format("truetype"),url("https://c.s-microsoft.com/static/fonts/segoe-ui/west-european/normal/latest.svg#web") format("svg");
+			font-weight: 400
+		}
+
+		@font-face {
+			font-family: 'Segoe UI';
+			src: url("https://c.s-microsoft.com/static/fonts/segoe-ui/west-european/semibold/latest.eot"),url("https://c.s-microsoft.com/static/fonts/segoe-ui/west-european/semibold/latest.eot?#iefix") format("embedded-opentype");
+			src: local("Segoe UI Semibold"),url("https://c.s-microsoft.com/static/fonts/segoe-ui/west-european/semibold/latest.woff2") format("woff"),url("https://c.s-microsoft.com/static/fonts/segoe-ui/west-european/semibold/latest.woff") format("woff"),url("https://c.s-microsoft.com/static/fonts/segoe-ui/west-european/semibold/latest.ttf") format("truetype"),url("https://c.s-microsoft.com/static/fonts/segoe-ui/west-european/semibold/latest.svg#web") format("svg");
+			font-weight: 600
+		}
+
+		@font-face {
+			font-family: 'Segoe UI';
+			src: url("https://c.s-microsoft.com/static/fonts/segoe-ui/west-european/bold/latest.eot"),url("https://c.s-microsoft.com/static/fonts/segoe-ui/west-european/bold/latest.eot?#iefix") format("embedded-opentype");
+			src: local("Segoe UI Bold"),url("https://c.s-microsoft.com/static/fonts/segoe-ui/west-european/bold/latest.woff2") format("woff"),url("https://c.s-microsoft.com/static/fonts/segoe-ui/west-european/bold/latest.woff") format("woff"),url("https://c.s-microsoft.com/static/fonts/segoe-ui/west-european/bold/latest.ttf") format("truetype"),url("https://c.s-microsoft.com/static/fonts/segoe-ui/west-european/bold/latest.svg#web") format("svg");
+			font-weight: 700
+		}
+	</style>
+</head>
+
+<body>
+	<a class="branding" href="https://code.visualstudio.com/">
+		Visual Studio Code
+	</a>
+	<div class="message-container">
+		<div class="message">
+			You are signed in now and can close this page.
+		</div>
+		<div class="error-message">
+			An error occurred while signing in:
+			<div class="error-text"></div>
+		</div>
+	</div>
+	<script>
+		var search = new URLSearchParams(window.location.search);
+		var error = search.get('error');
+		if (error) {
+			const description = search.get('error_description');
+			document.querySelector('.error-text')
+				.textContent = error + ' - ' + description;
+			document.querySelector('body')
+				.classList.add('error');
+		}
+	</script>
+</body>
+
+</html>
+`;
diff --git a/extensions/microsoft-authentication/src/node/publicClientCache.ts b/extensions/microsoft-authentication/src/node/publicClientCache.ts
new file mode 100644
index 00000000000..34bf2c3c73b
--- /dev/null
+++ b/extensions/microsoft-authentication/src/node/publicClientCache.ts
@@ -0,0 +1,252 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { AccountInfo, AuthenticationResult, Configuration, InteractiveRequest, PublicClientApplication, SilentFlowRequest } from '@azure/msal-node';
+import { SecretStorageCachePlugin } from '../common/cachePlugin';
+import { SecretStorage, LogOutputChannel, Disposable, SecretStorageChangeEvent, EventEmitter, Memento, window, ProgressLocation, l10n } from 'vscode';
+import { MsalLoggerOptions } from '../common/loggerOptions';
+import { ICachedPublicClientApplication, ICachedPublicClientApplicationManager } from '../common/publicClientCache';
+import { raceCancellationAndTimeoutError } from '../common/async';
+
+export interface IPublicClientApplicationInfo {
+	clientId: string;
+	authority: string;
+}
+
+const _keyPrefix = 'pca:';
+
+export class CachedPublicClientApplicationManager implements ICachedPublicClientApplicationManager {
+	// The key is the clientId and authority stringified
+	private readonly _pcas = new Map<string, CachedPublicClientApplication>();
+
+	private _initialized = false;
+	private _disposable: Disposable;
+
+	constructor(
+		private readonly _globalMemento: Memento,
+		private readonly _secretStorage: SecretStorage,
+		private readonly _logger: LogOutputChannel,
+		private readonly _accountChangeHandler: (e: { added: AccountInfo[]; deleted: AccountInfo[] }) => void
+	) {
+		this._disposable = _secretStorage.onDidChange(e => this._handleSecretStorageChange(e));
+	}
+
+	async initialize() {
+		this._logger.debug('[initialize] Initializing PublicClientApplicationManager');
+		const keys = await this._secretStorage.get('publicClientApplications');
+		if (!keys) {
+			this._initialized = true;
+			return;
+		}
+
+		const promises = new Array<Promise<ICachedPublicClientApplication>>();
+		try {
+			for (const key of JSON.parse(keys) as string[]) {
+				try {
+					const { clientId, authority } = JSON.parse(key) as IPublicClientApplicationInfo;
+					// Load the PCA in memory
+					promises.push(this.getOrCreate(clientId, authority));
+				} catch (e) {
+					// ignore
+				}
+			}
+		} catch (e) {
+			// data is corrupted
+			this._logger.error('[initialize] Error initializing PublicClientApplicationManager:', e);
+			await this._secretStorage.delete('publicClientApplications');
+		}
+
+		// TODO: should we do anything for when this fails?
+		await Promise.allSettled(promises);
+		this._logger.debug('[initialize] PublicClientApplicationManager initialized');
+		this._initialized = true;
+	}
+
+	dispose() {
+		this._disposable.dispose();
+		Disposable.from(...this._pcas.values()).dispose();
+	}
+
+	async getOrCreate(clientId: string, authority: string): Promise<ICachedPublicClientApplication> {
+		if (!this._initialized) {
+			throw new Error('PublicClientApplicationManager not initialized');
+		}
+
+		// Use the clientId and authority as the key
+		const pcasKey = JSON.stringify({ clientId, authority });
+		let pca = this._pcas.get(pcasKey);
+		if (pca) {
+			this._logger.debug(`[getOrCreate] [${clientId}] [${authority}] PublicClientApplicationManager cache hit`);
+			return pca;
+		}
+
+		this._logger.debug(`[getOrCreate] [${clientId}] [${authority}] PublicClientApplicationManager cache miss, creating new PCA...`);
+		pca = new CachedPublicClientApplication(clientId, authority, this._globalMemento, this._secretStorage, this._accountChangeHandler, this._logger);
+		this._pcas.set(pcasKey, pca);
+		await pca.initialize();
+		await this._storePublicClientApplications();
+		this._logger.debug(`[getOrCreate] [${clientId}] [${authority}] PublicClientApplicationManager PCA created`);
+		return pca;
+	}
+
+	getAll(): ICachedPublicClientApplication[] {
+		if (!this._initialized) {
+			throw new Error('PublicClientApplicationManager not initialized');
+		}
+		return Array.from(this._pcas.values());
+	}
+
+	private async _handleSecretStorageChange(e: SecretStorageChangeEvent) {
+		if (!e.key.startsWith(_keyPrefix)) {
+			return;
+		}
+
+		this._logger.debug(`[handleSecretStorageChange] PublicClientApplicationManager secret storage change: ${e.key}`);
+		const result = await this._secretStorage.get(e.key);
+		const pcasKey = e.key.split(_keyPrefix)[1];
+
+		// If the cache was deleted, or the PCA has zero accounts left, remove the PCA
+		if (!result || this._pcas.get(pcasKey)?.accounts.length === 0) {
+			this._logger.debug(`[handleSecretStorageChange] PublicClientApplicationManager removing PCA: ${pcasKey}`);
+			this._pcas.delete(pcasKey);
+			await this._storePublicClientApplications();
+			this._logger.debug(`[handleSecretStorageChange] PublicClientApplicationManager PCA removed: ${pcasKey}`);
+			return;
+		}
+
+		// Load the PCA in memory if it's not already loaded
+		const { clientId, authority } = JSON.parse(pcasKey) as IPublicClientApplicationInfo;
+		this._logger.debug(`[handleSecretStorageChange] PublicClientApplicationManager loading PCA: ${pcasKey}`);
+		await this.getOrCreate(clientId, authority);
+		this._logger.debug(`[handleSecretStorageChange] PublicClientApplicationManager PCA loaded: ${pcasKey}`);
+	}
+
+	private async _storePublicClientApplications() {
+		await this._secretStorage.store(
+			'publicClientApplications',
+			JSON.stringify(Array.from(this._pcas.keys()))
+		);
+	}
+}
+
+class CachedPublicClientApplication implements ICachedPublicClientApplication {
+	private _pca: PublicClientApplication;
+
+	private _accounts: AccountInfo[] = [];
+	private readonly _disposable: Disposable;
+
+	private readonly _loggerOptions = new MsalLoggerOptions(this._logger);
+	private readonly _secretStorageCachePlugin = new SecretStorageCachePlugin(
+		this._secretStorage,
+		// Include the prefix in the key so we can easily identify it later
+		`${_keyPrefix}${JSON.stringify({ clientId: this._clientId, authority: this._authority })}`
+	);
+	private readonly _config: Configuration = {
+		auth: { clientId: this._clientId, authority: this._authority },
+		system: {
+			loggerOptions: {
+				correlationId: `${this._clientId}] [${this._authority}`,
+				loggerCallback: (level, message, containsPii) => this._loggerOptions.loggerCallback(level, message, containsPii),
+			}
+		},
+		cache: {
+			cachePlugin: this._secretStorageCachePlugin
+		}
+	};
+
+	/**
+	 * We keep track of the last time an account was removed so we can recreate the PCA if we detect that an account was removed.
+	 * This is due to MSAL-node not providing a way to detect when an account is removed from the cache. An internal issue has been
+	 * filed to track this. If MSAL-node ever provides a way to detect this or handle this better in the Persistant Cache Plugin,
+	 * we can remove this logic.
+	 */
+	private _lastCreated: Date;
+
+	constructor(
+		private readonly _clientId: string,
+		private readonly _authority: string,
+		private readonly _globalMemento: Memento,
+		private readonly _secretStorage: SecretStorage,
+		private readonly _accountChangeHandler: (e: { added: AccountInfo[]; changed: AccountInfo[]; deleted: AccountInfo[] }) => void,
+		private readonly _logger: LogOutputChannel
+	) {
+		this._pca = new PublicClientApplication(this._config);
+		this._lastCreated = new Date();
+		this._disposable = this._registerOnSecretStorageChanged();
+	}
+
+	get accounts(): AccountInfo[] { return this._accounts; }
+	get clientId(): string { return this._clientId; }
+	get authority(): string { return this._authority; }
+
+	initialize(): Promise<void> {
+		return this._update();
+	}
+
+	dispose(): void {
+		this._disposable.dispose();
+	}
+
+	async acquireTokenSilent(request: SilentFlowRequest): Promise<AuthenticationResult> {
+		this._logger.debug(`[acquireTokenSilent] [${this._clientId}] [${this._authority}] [${request.scopes.join(' ')}]`);
+		const result = await this._pca.acquireTokenSilent(request);
+		if (result.account && !result.fromCache) {
+			this._accountChangeHandler({ added: [], changed: [result.account], deleted: [] });
+		}
+		return result;
+	}
+
+	async acquireTokenInteractive(request: InteractiveRequest): Promise<AuthenticationResult> {
+		this._logger.debug(`[acquireTokenInteractive] [${this._clientId}] [${this._authority}] [${request.scopes?.join(' ')}] loopbackClientOverride: ${request.loopbackClient ? 'true' : 'false'}`);
+		return await window.withProgress(
+			{
+				location: ProgressLocation.Notification,
+				cancellable: true,
+				title: l10n.t('Signing in to Microsoft...')
+			},
+			(_process, token) => raceCancellationAndTimeoutError(
+				this._pca.acquireTokenInteractive(request),
+				token,
+				1000 * 60 * 5
+			), // 5 minutes
+		);
+	}
+
+	removeAccount(account: AccountInfo): Promise<void> {
+		this._globalMemento.update(`lastRemoval:${this._clientId}:${this._authority}`, new Date());
+		return this._pca.getTokenCache().removeAccount(account);
+	}
+
+	private _registerOnSecretStorageChanged() {
+		return this._secretStorageCachePlugin.onDidChange(() => this._update());
+	}
+
+	private async _update() {
+		const before = this._accounts;
+		this._logger.debug(`[update] [${this._clientId}] [${this._authority}] CachedPublicClientApplication update before: ${before.length}`);
+		// Dates are stored as strings in the memento
+		const lastRemovalDate = this._globalMemento.get<string>(`lastRemoval:${this._clientId}:${this._authority}`);
+		if (lastRemovalDate && this._lastCreated && Date.parse(lastRemovalDate) > this._lastCreated.getTime()) {
+			this._logger.debug(`[update] [${this._clientId}] [${this._authority}] CachedPublicClientApplication removal detected... recreating PCA...`);
+			this._pca = new PublicClientApplication(this._config);
+			this._lastCreated = new Date();
+		}
+
+		const after = await this._pca.getAllAccounts();
+		this._accounts = after;
+		this._logger.debug(`[update] [${this._clientId}] [${this._authority}] CachedPublicClientApplication update after: ${after.length}`);
+
+		const beforeSet = new Set(before.map(b => b.homeAccountId));
+		const afterSet = new Set(after.map(a => a.homeAccountId));
+
+		const added = after.filter(a => !beforeSet.has(a.homeAccountId));
+		const deleted = before.filter(b => !afterSet.has(b.homeAccountId));
+		if (added.length > 0 || deleted.length > 0) {
+			this._accountChangeHandler({ added, changed: [], deleted });
+			this._logger.debug(`[update] [${this._clientId}] [${this._authority}] CachedPublicClientApplication accounts changed. added: ${added.length}, deleted: ${deleted.length}`);
+		}
+		this._logger.debug(`[update] [${this._clientId}] [${this._authority}] CachedPublicClientApplication update complete`);
+	}
+}
diff --git a/extensions/microsoft-authentication/tsconfig.json b/extensions/microsoft-authentication/tsconfig.json
index cad76d078bd..4b9d06d1847 100644
--- a/extensions/microsoft-authentication/tsconfig.json
+++ b/extensions/microsoft-authentication/tsconfig.json
@@ -22,7 +22,6 @@
 	"include": [
 		"src/**/*",
 		"../../src/vscode-dts/vscode.d.ts",
-		"../../src/vscode-dts/vscode.proposed.idToken.d.ts",
-		"../../src/vscode-dts/vscode.proposed.authGetSessions.d.ts"
+		"../../src/vscode-dts/vscode.proposed.idToken.d.ts"
 	]
 }
diff --git a/extensions/microsoft-authentication/yarn.lock b/extensions/microsoft-authentication/yarn.lock
index 703d54dd626..d0d70647b75 100644
--- a/extensions/microsoft-authentication/yarn.lock
+++ b/extensions/microsoft-authentication/yarn.lock
@@ -7,6 +7,20 @@
   resolved "https://registry.yarnpkg.com/@azure/ms-rest-azure-env/-/ms-rest-azure-env-2.0.0.tgz#45809f89763a480924e21d3c620cd40866771625"
   integrity sha512-dG76W7ElfLi+fbTjnZVGj+M9e0BIEJmRxU6fHaUQ12bZBe8EJKYb2GV50YWNaP2uJiVQ5+7nXEVj1VN1UQtaEw==
 
+"@azure/msal-common@14.14.1":
+  version "14.14.1"
+  resolved "https://registry.yarnpkg.com/@azure/msal-common/-/msal-common-14.14.1.tgz#62e4569518d2c52e7de1f460d40ab919ca66b99b"
+  integrity sha512-2Q3tqNz/PZLfSr8BvcHZVpRRfSn4MjGSqjj9J+HlBsmbf1Uu4P0WeXnemjTJwwx9KrmplsrN3UkZ/LPOR720rw==
+
+"@azure/msal-node@^2.13.0":
+  version "2.13.0"
+  resolved "https://registry.yarnpkg.com/@azure/msal-node/-/msal-node-2.13.0.tgz#007ffffa84e4f91f00f816b980740837ce6626fe"
+  integrity sha512-DhP97ycs7qlCVzzzWGzJiwAFyFj5okno74E4FUZ61oCLfKh4IxA1kxirqzrWuYZWpBe9HVPL6GA4NvmlEOBN5Q==
+  dependencies:
+    "@azure/msal-common" "14.14.1"
+    jsonwebtoken "^9.0.0"
+    uuid "^8.3.0"
+
 "@microsoft/1ds-core-js@4.0.3", "@microsoft/1ds-core-js@^4.0.3":
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/@microsoft/1ds-core-js/-/1ds-core-js-4.0.3.tgz#c8a92c623745a9595e06558a866658480c33bdf9"
@@ -153,6 +167,11 @@ asynckit@^0.4.0:
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
   integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
 
+buffer-equal-constant-time@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz#f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819"
+  integrity sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==
+
 combined-stream@^1.0.8:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
@@ -165,6 +184,13 @@ delayed-stream@~1.0.0:
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
   integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
 
+ecdsa-sig-formatter@1.0.11:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz#ae0f0fa2d85045ef14a817daa3ce9acd0489e5bf"
+  integrity sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==
+  dependencies:
+    safe-buffer "^5.0.1"
+
 form-data@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.0.tgz#31b7e39c85f1355b7139ee0c647cf0de7f83c682"
@@ -174,6 +200,74 @@ form-data@^3.0.0:
     combined-stream "^1.0.8"
     mime-types "^2.1.12"
 
+jsonwebtoken@^9.0.0:
+  version "9.0.2"
+  resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-9.0.2.tgz#65ff91f4abef1784697d40952bb1998c504caaf3"
+  integrity sha512-PRp66vJ865SSqOlgqS8hujT5U4AOgMfhrwYIuIhfKaoSCZcirrmASQr8CX7cUg+RMih+hgznrjp99o+W4pJLHQ==
+  dependencies:
+    jws "^3.2.2"
+    lodash.includes "^4.3.0"
+    lodash.isboolean "^3.0.3"
+    lodash.isinteger "^4.0.4"
+    lodash.isnumber "^3.0.3"
+    lodash.isplainobject "^4.0.6"
+    lodash.isstring "^4.0.1"
+    lodash.once "^4.0.0"
+    ms "^2.1.1"
+    semver "^7.5.4"
+
+jwa@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/jwa/-/jwa-1.4.1.tgz#743c32985cb9e98655530d53641b66c8645b039a"
+  integrity sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==
+  dependencies:
+    buffer-equal-constant-time "1.0.1"
+    ecdsa-sig-formatter "1.0.11"
+    safe-buffer "^5.0.1"
+
+jws@^3.2.2:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/jws/-/jws-3.2.2.tgz#001099f3639468c9414000e99995fa52fb478304"
+  integrity sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==
+  dependencies:
+    jwa "^1.4.1"
+    safe-buffer "^5.0.1"
+
+lodash.includes@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/lodash.includes/-/lodash.includes-4.3.0.tgz#60bb98a87cb923c68ca1e51325483314849f553f"
+  integrity sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w==
+
+lodash.isboolean@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz#6c2e171db2a257cd96802fd43b01b20d5f5870f6"
+  integrity sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg==
+
+lodash.isinteger@^4.0.4:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz#619c0af3d03f8b04c31f5882840b77b11cd68343"
+  integrity sha512-DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA==
+
+lodash.isnumber@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz#3ce76810c5928d03352301ac287317f11c0b1ffc"
+  integrity sha512-QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw==
+
+lodash.isplainobject@^4.0.6:
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
+  integrity sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==
+
+lodash.isstring@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"
+  integrity sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw==
+
+lodash.once@^4.0.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac"
+  integrity sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==
+
 mime-db@1.44.0:
   version "1.44.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92"
@@ -186,7 +280,39 @@ mime-types@^2.1.12:
   dependencies:
     mime-db "1.44.0"
 
+ms@^2.1.1:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
+  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
+
+safe-buffer@^5.0.1:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
+  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
+
+semver@^7.5.4:
+  version "7.6.2"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.2.tgz#1e3b34759f896e8f14d6134732ce798aeb0c6e13"
+  integrity sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==
+
+tas-client@0.2.33:
+  version "0.2.33"
+  resolved "https://registry.yarnpkg.com/tas-client/-/tas-client-0.2.33.tgz#451bf114a8a64748030ce4068ab7d079958402e6"
+  integrity sha512-V+uqV66BOQnWxvI6HjDnE4VkInmYZUQ4dgB7gzaDyFyFSK1i1nF/j7DpS9UbQAgV9NaF1XpcyuavnM1qOeiEIg==
+
 undici-types@~5.26.4:
   version "5.26.5"
   resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
   integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
+
+uuid@^8.3.0:
+  version "8.3.2"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
+  integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
+
+vscode-tas-client@^0.1.84:
+  version "0.1.84"
+  resolved "https://registry.yarnpkg.com/vscode-tas-client/-/vscode-tas-client-0.1.84.tgz#906bdcfd8c9e1dc04321d6bc0335184f9119968e"
+  integrity sha512-rUTrUopV+70hvx1hW5ebdw1nd6djxubkLvVxjGdyD/r5v/wcVF41LIfiAtbm5qLZDtQdsMH1IaCuDoluoIa88w==
+  dependencies:
+    tas-client "0.2.33"
diff --git a/extensions/npm/package.json b/extensions/npm/package.json
index 545ce102ab5..1deb5d23459 100644
--- a/extensions/npm/package.json
+++ b/extensions/npm/package.json
@@ -35,6 +35,14 @@
     "@types/node": "20.x",
     "@types/which": "^3.0.0"
   },
+  "overrides": {
+    "micromatch": "^4.0.6",
+    "braces": "^3.0.3"
+  },
+  "resolutions": {
+    "micromatch": "^4.0.6",
+    "braces": "^3.0.3"
+  },
   "main": "./out/npmMain",
   "browser": "./dist/browser/npmBrowserMain",
   "activationEvents": [
diff --git a/extensions/npm/src/features/packageJSONContribution.ts b/extensions/npm/src/features/packageJSONContribution.ts
index a2f4fabcfe3..999f39664f1 100644
--- a/extensions/npm/src/features/packageJSONContribution.ts
+++ b/extensions/npm/src/features/packageJSONContribution.ts
@@ -293,7 +293,13 @@ export class PackageJSONContribution implements IJSONContribution {
 			// COREPACK_ENABLE_PROJECT_SPEC makes the npm view command succeed
 			//   even if packageManager specified a package manager other than npm.
 			const env = { ...process.env, COREPACK_ENABLE_AUTO_PIN: '0', COREPACK_ENABLE_PROJECT_SPEC: '0' };
-			cp.execFile(npmCommandPath, args, { cwd, env }, (error, stdout) => {
+			let options: cp.ExecFileOptions = { cwd, env };
+			let commandPath: string = npmCommandPath;
+			if (process.platform === 'win32') {
+				options = { cwd, env, shell: true };
+				commandPath = `"${npmCommandPath}"`;
+			}
+			cp.execFile(commandPath, args, options, (error, stdout) => {
 				if (!error) {
 					try {
 						const content = JSON.parse(stdout);
diff --git a/extensions/npm/yarn.lock b/extensions/npm/yarn.lock
index be4b192c67d..5ae2da4af92 100644
--- a/extensions/npm/yarn.lock
+++ b/extensions/npm/yarn.lock
@@ -38,7 +38,7 @@ brace-expansion@^2.0.1:
   dependencies:
     balanced-match "^1.0.0"
 
-braces@^3.0.1:
+braces@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
   integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
@@ -117,13 +117,13 @@ locate-path@^6.0.0:
   dependencies:
     p-locate "^5.0.0"
 
-micromatch@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259"
-  integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==
+micromatch@^4.0.2, micromatch@^4.0.6:
+  version "4.0.7"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.7.tgz#33e8190d9fe474a9895525f5618eee136d46c2e5"
+  integrity sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==
   dependencies:
-    braces "^3.0.1"
-    picomatch "^2.0.5"
+    braces "^3.0.3"
+    picomatch "^2.3.1"
 
 minimatch@^5.1.6:
   version "5.1.6"
@@ -151,10 +151,10 @@ path-exists@^4.0.0:
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
   integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
 
-picomatch@^2.0.5:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
-  integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==
+picomatch@^2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
+  integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
 
 pify@^4.0.1:
   version "4.0.1"
diff --git a/extensions/positron-python/src/test/interpreters/pythonPathUpdaterFactory.unit.test.ts b/extensions/positron-python/src/test/interpreters/pythonPathUpdaterFactory.unit.test.ts
index 762c23d86c8..67a23fddccf 100644
--- a/extensions/positron-python/src/test/interpreters/pythonPathUpdaterFactory.unit.test.ts
+++ b/extensions/positron-python/src/test/interpreters/pythonPathUpdaterFactory.unit.test.ts
@@ -22,7 +22,7 @@ suite('Python Path Settings Updater', () => {
             .returns(() => workspaceService.object);
         serviceContainer
             .setup((c) => c.get(TypeMoq.It.isValue(IExperimentService)))
-            .returns(() => experimentsManager.object);
+            .returns(() => experimentsManager!.object); // Positron: Add ! to appease TS nightly
         serviceContainer
             .setup((c) => c.get(TypeMoq.It.isValue(IInterpreterPathService)))
             .returns(() => interpreterPathService.object);
diff --git a/extensions/positron-python/src/test/testing/testController/testCancellationRunAdapters.unit.test.ts b/extensions/positron-python/src/test/testing/testController/testCancellationRunAdapters.unit.test.ts
index bddf057d4f0..c94ef095ef7 100644
--- a/extensions/positron-python/src/test/testing/testController/testCancellationRunAdapters.unit.test.ts
+++ b/extensions/positron-python/src/test/testing/testController/testCancellationRunAdapters.unit.test.ts
@@ -72,7 +72,7 @@ suite('Execution Flow Run Adapters', () => {
                 .returns(() => {
                     cancellationToken.cancel();
                     return {
-                        proc: mockProc,
+                        proc: mockProc!, // Positron: Add ! to appease nightly TS
                         out: typeMoq.Mock.ofType<Observable<Output<string>>>().object,
                         dispose: () => {
                             /* no-body */
@@ -150,7 +150,7 @@ suite('Execution Flow Run Adapters', () => {
                 .returns(() => {
                     cancellationToken.cancel();
                     return {
-                        proc: mockProc,
+                        proc: mockProc!, // Positron: Add ! to appease nightly TS
                         out: typeMoq.Mock.ofType<Observable<Output<string>>>().object,
                         dispose: () => {
                             /* no-body */
diff --git a/extensions/positron-r/scripts/install-kernel.ts b/extensions/positron-r/scripts/install-kernel.ts
index 8a5933ec517..1827f8e0382 100644
--- a/extensions/positron-r/scripts/install-kernel.ts
+++ b/extensions/positron-r/scripts/install-kernel.ts
@@ -188,7 +188,7 @@ async function downloadAndReplaceArk(version: string,
 			switch (platform()) {
 				case 'win32': os = 'windows-x64'; break;
 				case 'darwin': os = 'darwin-universal'; break;
-				case 'linux': os = (arch()  === 'arm64' ? 'linux-arm64' : 'linux-x64'); break;
+				case 'linux': os = (arch() === 'arm64' ? 'linux-arm64' : 'linux-x64'); break;
 				default: {
 					console.error(`Unsupported platform ${platform()}.`);
 					return;
diff --git a/extensions/positron-r/src/test/indentation.test.ts b/extensions/positron-r/src/test/indentation.test.ts
index 57b26cce124..2d760a7d5db 100644
--- a/extensions/positron-r/src/test/indentation.test.ts
+++ b/extensions/positron-r/src/test/indentation.test.ts
@@ -1,3 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (C) 2024 Posit Software, PBC. All rights reserved.
+ *  Licensed under the Elastic License 2.0. See LICENSE.txt for license information.
+ *--------------------------------------------------------------------------------------------*/
+
 import * as vscode from 'vscode';
 import * as positron from 'positron';
 import * as assert from 'assert';
@@ -6,6 +11,7 @@ import { CURSOR, type, withFileEditor } from './editor-utils';
 import { EXTENSION_ROOT_DIR } from '../constants';
 import { delay, removeLeadingLines } from '../util';
 import { RSession } from '../session';
+import { env } from 'process';
 
 const snapshotsFolder = `${EXTENSION_ROOT_DIR}/src/test/snapshots`;
 const snippetsPath = `${snapshotsFolder}/indentation-cases.R`;
@@ -31,6 +37,17 @@ suite('Indentation', () => {
 	// run, a failure is emitted. You can either commit the new output or discard
 	// it if that's a bug to fix.
 	test('Regenerate and check', async () => {
+		// ** TODO **
+		//
+		// This test currently causes the entire test suite to be unexpectedly
+		// terminated. It's disabled on CI until we can figure out why.
+		//
+		// We use the `POSITRON_BUILD_NUMBER` environment variable to detect if
+		// we are running on CI; this is always set by the CI environment.
+		if (env['POSITRON_BUILD_NUMBER']) {
+			return;
+		}
+
 		await init();
 
 		// There doesn't seem to be a method that resolves when a language is
@@ -45,7 +62,7 @@ suite('Indentation', () => {
 			}
 		}
 
-		let ses = await positron.runtime.startLanguageRuntime(info!.runtimeId, 'Snapshot tests') as RSession;
+		const ses = await positron.runtime.startLanguageRuntime(info!.runtimeId, 'Snapshot tests') as RSession;
 		await ses.waitLsp();
 
 		const expected = fs.readFileSync(snapshotsPath, 'utf8');
diff --git a/extensions/shellscript/cgmanifest.json b/extensions/shellscript/cgmanifest.json
index 6042de5a644..5535c294093 100644
--- a/extensions/shellscript/cgmanifest.json
+++ b/extensions/shellscript/cgmanifest.json
@@ -6,7 +6,7 @@
 				"git": {
 					"name": "jeff-hykin/better-shell-syntax",
 					"repositoryUrl": "https://github.com/jeff-hykin/better-shell-syntax",
-					"commitHash": "6d0bc37a6b8023a5fddf75bd2b4eb1e1f962e4c2"
+					"commitHash": "35020b0bd79a90d3b262b4c13a8bb0b33adc1f45"
 				}
 			},
 			"license": "MIT",
diff --git a/extensions/shellscript/syntaxes/shell-unix-bash.tmLanguage.json b/extensions/shellscript/syntaxes/shell-unix-bash.tmLanguage.json
index 759e0c59ee0..a3a4d4acf9a 100644
--- a/extensions/shellscript/syntaxes/shell-unix-bash.tmLanguage.json
+++ b/extensions/shellscript/syntaxes/shell-unix-bash.tmLanguage.json
@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/jeff-hykin/better-shell-syntax/commit/6d0bc37a6b8023a5fddf75bd2b4eb1e1f962e4c2",
+	"version": "https://github.com/jeff-hykin/better-shell-syntax/commit/35020b0bd79a90d3b262b4c13a8bb0b33adc1f45",
 	"name": "Shell Script",
 	"scopeName": "source.shell",
 	"patterns": [
@@ -1547,7 +1547,7 @@
 					"include": "#subshell_dollar"
 				},
 				{
-					"begin": "(?<![^ \\t])({)",
+					"begin": "(?<![^ \\t])({)(?!\\w|\\$)",
 					"end": "}",
 					"beginCaptures": {
 						"1": {
diff --git a/extensions/sql/package.json b/extensions/sql/package.json
index c048da78d1c..5c467297f81 100644
--- a/extensions/sql/package.json
+++ b/extensions/sql/package.json
@@ -21,7 +21,8 @@
           ".dsql"
         ],
         "aliases": [
-          "SQL"
+          "MS SQL",
+          "T-SQL"
         ],
         "configuration": "./language-configuration.json"
       }
diff --git a/extensions/theme-defaults/themes/dark_vs.json b/extensions/theme-defaults/themes/dark_vs.json
index e1032471278..da30a00f101 100644
--- a/extensions/theme-defaults/themes/dark_vs.json
+++ b/extensions/theme-defaults/themes/dark_vs.json
@@ -17,6 +17,7 @@
 		"menu.foreground": "#CCCCCC",
 		"menu.separatorBackground": "#454545",
 		"menu.border": "#454545",
+		"menu.selectionBackground": "#0078d4",
 		"statusBarItem.remoteForeground": "#FFF",
 		"statusBarItem.remoteBackground": "#16825D",
 		"ports.iconRunningProcessForeground": "#369432",
diff --git a/extensions/theme-seti/cgmanifest.json b/extensions/theme-seti/cgmanifest.json
index 7e0ad68e317..26ada7ea17a 100644
--- a/extensions/theme-seti/cgmanifest.json
+++ b/extensions/theme-seti/cgmanifest.json
@@ -6,7 +6,7 @@
 				"git": {
 					"name": "seti-ui",
 					"repositoryUrl": "https://github.com/jesseweed/seti-ui",
-					"commitHash": "8eec7f2e37cd8fd91a98c61d129468bb49735a94"
+					"commitHash": "88bcd4a8fca14aa33dd9d50781ad8af3b03c6b90"
 				}
 			},
 			"version": "0.1.0"
diff --git a/extensions/theme-seti/icons/seti.woff b/extensions/theme-seti/icons/seti.woff
index 5069a94ff94..d7a0f3639c7 100644
Binary files a/extensions/theme-seti/icons/seti.woff and b/extensions/theme-seti/icons/seti.woff differ
diff --git a/extensions/theme-seti/icons/vs-seti-icon-theme.json b/extensions/theme-seti/icons/vs-seti-icon-theme.json
index b40d561539e..0a51f2aef8c 100644
--- a/extensions/theme-seti/icons/vs-seti-icon-theme.json
+++ b/extensions/theme-seti/icons/vs-seti-icon-theme.json
@@ -1623,8 +1623,14 @@
 		"class": "_java_1",
 		"classpath": "_java",
 		"js.map": "_javascript",
+		"cjs.map": "_javascript",
+		"mjs.map": "_javascript",
 		"spec.js": "_javascript_1",
+		"spec.cjs": "_javascript_1",
+		"spec.mjs": "_javascript_1",
 		"test.js": "_javascript_1",
+		"test.cjs": "_javascript_1",
+		"test.mjs": "_javascript_1",
 		"es": "_javascript",
 		"es5": "_javascript",
 		"es7": "_javascript",
@@ -1717,6 +1723,7 @@
 		"ttf": "_font",
 		"woff": "_font",
 		"woff2": "_font",
+		"otf": "_font",
 		"avif": "_image",
 		"gif": "_image",
 		"jpg": "_image",
@@ -1784,6 +1791,8 @@
 	"fileNames": {
 		"mix": "_hex",
 		"karma.conf.js": "_karma",
+		"karma.conf.cjs": "_karma",
+		"karma.conf.mjs": "_karma",
 		"karma.conf.coffee": "_karma",
 		"readme.md": "_info",
 		"readme.txt": "_info",
@@ -1814,6 +1823,7 @@
 		"workspace.bazel": "_bazel",
 		"bower.json": "_bower",
 		"docker-healthcheck": "_docker_2",
+		"eslint.config.js": "_eslint",
 		"firebase.json": "_firebase",
 		"geckodriver": "_firefox",
 		"gruntfile.js": "_grunt",
@@ -1828,22 +1838,28 @@
 		"sass-lint.yml": "_sass",
 		"stylelint.config.js": "_stylelint",
 		"stylelint.config.cjs": "_stylelint",
+		"stylelint.config.mjs": "_stylelint",
 		"yarn.clean": "_yarn",
 		"yarn.lock": "_yarn",
 		"webpack.config.js": "_webpack",
 		"webpack.config.cjs": "_webpack",
+		"webpack.config.mjs": "_webpack",
 		"webpack.config.ts": "_webpack",
 		"webpack.config.build.js": "_webpack",
 		"webpack.config.build.cjs": "_webpack",
+		"webpack.config.build.mjs": "_webpack",
 		"webpack.config.build.ts": "_webpack",
 		"webpack.common.js": "_webpack",
 		"webpack.common.cjs": "_webpack",
+		"webpack.common.mjs": "_webpack",
 		"webpack.common.ts": "_webpack",
 		"webpack.dev.js": "_webpack",
 		"webpack.dev.cjs": "_webpack",
+		"webpack.dev.mjs": "_webpack",
 		"webpack.dev.ts": "_webpack",
 		"webpack.prod.js": "_webpack",
 		"webpack.prod.cjs": "_webpack",
+		"webpack.prod.mjs": "_webpack",
 		"webpack.prod.ts": "_webpack",
 		"license": "_license",
 		"licence": "_license",
@@ -2027,8 +2043,14 @@
 			"class": "_java_1_light",
 			"classpath": "_java_light",
 			"js.map": "_javascript_light",
+			"cjs.map": "_javascript_light",
+			"mjs.map": "_javascript_light",
 			"spec.js": "_javascript_1_light",
+			"spec.cjs": "_javascript_1_light",
+			"spec.mjs": "_javascript_1_light",
 			"test.js": "_javascript_1_light",
+			"test.cjs": "_javascript_1_light",
+			"test.mjs": "_javascript_1_light",
 			"es": "_javascript_light",
 			"es5": "_javascript_light",
 			"es7": "_javascript_light",
@@ -2121,6 +2143,7 @@
 			"ttf": "_font_light",
 			"woff": "_font_light",
 			"woff2": "_font_light",
+			"otf": "_font_light",
 			"avif": "_image_light",
 			"gif": "_image_light",
 			"jpg": "_image_light",
@@ -2267,6 +2290,8 @@
 		"fileNames": {
 			"mix": "_hex_light",
 			"karma.conf.js": "_karma_light",
+			"karma.conf.cjs": "_karma_light",
+			"karma.conf.mjs": "_karma_light",
 			"karma.conf.coffee": "_karma_light",
 			"readme.md": "_info_light",
 			"readme.txt": "_info_light",
@@ -2297,6 +2322,7 @@
 			"workspace.bazel": "_bazel_light",
 			"bower.json": "_bower_light",
 			"docker-healthcheck": "_docker_2_light",
+			"eslint.config.js": "_eslint_light",
 			"firebase.json": "_firebase_light",
 			"geckodriver": "_firefox_light",
 			"gruntfile.js": "_grunt_light",
@@ -2311,22 +2337,28 @@
 			"sass-lint.yml": "_sass_light",
 			"stylelint.config.js": "_stylelint_light",
 			"stylelint.config.cjs": "_stylelint_light",
+			"stylelint.config.mjs": "_stylelint_light",
 			"yarn.clean": "_yarn_light",
 			"yarn.lock": "_yarn_light",
 			"webpack.config.js": "_webpack_light",
 			"webpack.config.cjs": "_webpack_light",
+			"webpack.config.mjs": "_webpack_light",
 			"webpack.config.ts": "_webpack_light",
 			"webpack.config.build.js": "_webpack_light",
 			"webpack.config.build.cjs": "_webpack_light",
+			"webpack.config.build.mjs": "_webpack_light",
 			"webpack.config.build.ts": "_webpack_light",
 			"webpack.common.js": "_webpack_light",
 			"webpack.common.cjs": "_webpack_light",
+			"webpack.common.mjs": "_webpack_light",
 			"webpack.common.ts": "_webpack_light",
 			"webpack.dev.js": "_webpack_light",
 			"webpack.dev.cjs": "_webpack_light",
+			"webpack.dev.mjs": "_webpack_light",
 			"webpack.dev.ts": "_webpack_light",
 			"webpack.prod.js": "_webpack_light",
 			"webpack.prod.cjs": "_webpack_light",
+			"webpack.prod.mjs": "_webpack_light",
 			"webpack.prod.ts": "_webpack_light",
 			"license": "_license_light",
 			"licence": "_license_light",
@@ -2350,5 +2382,5 @@
 			"npm-debug.log": "_npm_ignored_light"
 		}
 	},
-	"version": "https://github.com/jesseweed/seti-ui/commit/8eec7f2e37cd8fd91a98c61d129468bb49735a94"
+	"version": "https://github.com/jesseweed/seti-ui/commit/88bcd4a8fca14aa33dd9d50781ad8af3b03c6b90"
 }
\ No newline at end of file
diff --git a/extensions/typescript-language-features/package.json b/extensions/typescript-language-features/package.json
index b41426a1c59..d30b8fd6c3f 100644
--- a/extensions/typescript-language-features/package.json
+++ b/extensions/typescript-language-features/package.json
@@ -1039,6 +1039,22 @@
           "markdownDescription": "%typescript.preferences.autoImportFileExcludePatterns%",
           "scope": "resource"
         },
+        "typescript.preferences.autoImportSpecifierExcludeRegexes": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "markdownDescription": "%typescript.preferences.autoImportSpecifierExcludeRegexes%",
+          "scope": "resource"
+        },
+        "javascript.preferences.autoImportSpecifierExcludeRegexes": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "markdownDescription": "%typescript.preferences.autoImportSpecifierExcludeRegexes%",
+          "scope": "resource"
+        },
         "typescript.preferences.preferTypeOnlyAutoImports": {
           "type": "boolean",
           "default": false,
@@ -1083,6 +1099,146 @@
           "description": "%typescript.preferences.renameMatchingJsxTags%",
           "scope": "language-overridable"
         },
+        "typescript.preferences.organizeImports": {
+          "type": "object",
+          "markdownDescription": "%typescript.preferences.organizeImports%",
+          "properties": {
+            "caseSensitivity": {
+              "type": "string",
+              "enum": [
+                "auto",
+                "caseInsensitive",
+                "caseSensitive"
+              ],
+              "markdownEnumDescriptions": [
+                "%typescript.preferences.organizeImports.caseSensitivity.auto%",
+                "%typescript.preferences.organizeImports.caseSensitivity.insensitive",
+                "%typescript.preferences.organizeImports.caseSensitivity.sensitive%"
+              ],
+              "default": "auto"
+            },
+            "typeOrder": {
+              "type": "string",
+              "enum": [
+                "auto",
+                "last",
+                "inline",
+                "first"
+              ],
+              "default": "auto",
+              "markdownEnumDescriptions": [
+                "%typescript.preferences.organizeImports.typeOrder.auto%",
+                "%typescript.preferences.organizeImports.typeOrder.last%",
+                "%typescript.preferences.organizeImports.typeOrder.inline%",
+                "%typescript.preferences.organizeImports.typeOrder.first%"
+              ]
+            },
+            "unicodeCollation": {
+              "type": "string",
+              "enum": [
+                "ordinal",
+                "unicode"
+              ],
+              "markdownEnumDescriptions": [
+                "%typescript.preferences.organizeImports.unicodeCollation.ordinal%",
+                "%typescript.preferences.organizeImports.unicodeCollation.unicode%"
+              ],
+              "default": "ordinal"
+            },
+            "locale": {
+              "type": "string",
+              "markdownDescription": "%typescript.preferences.organizeImports.locale%"
+            },
+            "numericCollation": {
+              "type": "boolean",
+              "markdownDescription": "%typescript.preferences.organizeImports.numericCollation%"
+            },
+            "accentCollation":{
+              "type": "boolean",
+              "markdownDescription": "%typescript.preferences.organizeImports.accentCollation%"
+            },
+            "caseFirst": {
+              "type": "string",
+              "markdownDescription": "%typescript.preferences.organizeImports.caseFirst%",
+              "enum": [
+                "default",
+                "upper",
+                "lower"
+              ],
+              "default": "default"
+            }
+          }
+        },
+        "javascript.preferences.organizeImports": {
+          "type": "object",
+          "markdownDescription": "%typescript.preferences.organizeImports%",
+          "properties": {
+            "caseSensitivity": {
+              "type": "string",
+              "enum": [
+                "auto",
+                "caseInsensitive",
+                "caseSensitive"
+              ],
+              "markdownEnumDescriptions": [
+                "%typescript.preferences.organizeImports.caseSensitivity.auto%",
+                "%typescript.preferences.organizeImports.caseSensitivity.insensitive",
+                "%typescript.preferences.organizeImports.caseSensitivity.sensitive%"
+              ],
+              "default": "auto"
+            },
+            "typeOrder": {
+              "type": "string",
+              "enum": [
+                "auto",
+                "last",
+                "inline",
+                "first"
+              ],
+              "default": "auto",
+              "markdownEnumDescriptions": [
+                "%typescript.preferences.organizeImports.typeOrder.auto%",
+                "%typescript.preferences.organizeImports.typeOrder.last%",
+                "%typescript.preferences.organizeImports.typeOrder.inline%",
+                "%typescript.preferences.organizeImports.typeOrder.first%"
+              ]
+            },
+            "unicodeCollation": {
+              "type": "string",
+              "enum": [
+                "ordinal",
+                "unicode"
+              ],
+              "markdownEnumDescriptions": [
+                "%typescript.preferences.organizeImports.unicodeCollation.ordinal%",
+                "%typescript.preferences.organizeImports.unicodeCollation.unicode%"
+              ],
+              "default": "ordinal"
+            },
+            "locale": {
+              "type": "string",
+              "markdownDescription": "%typescript.preferences.organizeImports.locale%"
+            },
+            "numericCollation": {
+              "type": "boolean",
+              "markdownDescription": "%typescript.preferences.organizeImports.numericCollation%"
+            },
+            "accentCollation":{
+              "type": "boolean",
+              "markdownDescription": "%typescript.preferences.organizeImports.accentCollation%"
+            },
+            "caseFirst": {
+              "type": "string",
+              "markdownDescription": "%typescript.preferences.organizeImports.caseFirst%",
+              "enum": [
+                "default",
+                "upper",
+                "lower"
+              ],
+              "default": "default"
+            }
+          }
+        },
         "typescript.updateImportsOnFileMove.enabled": {
           "type": "string",
           "enum": [
@@ -1291,13 +1447,13 @@
         },
         "typescript.tsserver.web.projectWideIntellisense.suppressSemanticErrors": {
           "type": "boolean",
-          "default": true,
+          "default": false,
           "description": "%configuration.tsserver.web.projectWideIntellisense.suppressSemanticErrors%",
           "scope": "window"
         },
         "typescript.tsserver.web.typeAcquisition.enabled": {
           "type": "boolean",
-          "default": false,
+          "default": true,
           "description": "%configuration.tsserver.web.typeAcquisition.enabled%",
           "scope": "window"
         },
@@ -1487,23 +1643,8 @@
       "editor/context": [
         {
           "command": "typescript.goToSourceDefinition",
-          "when": "tsSupportsSourceDefinition && resourceLangId == typescript",
-          "group": "navigation@9"
-        },
-        {
-          "command": "typescript.goToSourceDefinition",
-          "when": "tsSupportsSourceDefinition && resourceLangId == typescriptreact",
-          "group": "navigation@9"
-        },
-        {
-          "command": "typescript.goToSourceDefinition",
-          "when": "tsSupportsSourceDefinition && resourceLangId == javascript",
-          "group": "navigation@9"
-        },
-        {
-          "command": "typescript.goToSourceDefinition",
-          "when": "tsSupportsSourceDefinition && resourceLangId == javascriptreact",
-          "group": "navigation@9"
+          "when": "tsSupportsSourceDefinition && (resourceLangId == typescript || resourceLangId == typescriptreact || resourceLangId == javascript || resourceLangId == javascriptreact)",
+          "group": "navigation@1.41"
         }
       ],
       "explorer/context": [
diff --git a/extensions/typescript-language-features/package.nls.json b/extensions/typescript-language-features/package.nls.json
index cba24007314..d2a0ca892fa 100644
--- a/extensions/typescript-language-features/package.nls.json
+++ b/extensions/typescript-language-features/package.nls.json
@@ -155,6 +155,7 @@
 	"typescript.preferences.includePackageJsonAutoImports.on": "Always search dependencies.",
 	"typescript.preferences.includePackageJsonAutoImports.off": "Never search dependencies.",
 	"typescript.preferences.autoImportFileExcludePatterns": "Specify glob patterns of files to exclude from auto imports. Relative paths are resolved relative to the workspace root. Patterns are evaluated using tsconfig.json [`exclude`](https://www.typescriptlang.org/tsconfig#exclude) semantics.",
+	"typescript.preferences.autoImportSpecifierExcludeRegexes": "Specify regular expressions to exclude auto imports with matching import specifiers. Examples:\n\n- `^node:`\n- `lib/internal` (slashes don't need to be escaped...)\n- `/lib\\/internal/i` (...unless including surrounding slashes for `i` or `u` flags)\n- `^lodash$` (only allow subpath imports from lodash)",
 	"typescript.preferences.preferTypeOnlyAutoImports": "Include the `type` keyword in auto-imports whenever possible. Requires using TypeScript 5.3+ in the workspace.",
 	"typescript.workspaceSymbols.excludeLibrarySymbols": "Exclude symbols that come from library files in Go to Symbol in Workspace results. Requires using TypeScript 5.3+ in the workspace.",
 	"typescript.updateImportsOnFileMove.enabled": "Enable/disable automatic updating of import paths when you rename or move a file in VS Code.",
@@ -187,6 +188,21 @@
 	"typescript.preferences.renameShorthandProperties.deprecationMessage": "The setting 'typescript.preferences.renameShorthandProperties' has been deprecated in favor of 'typescript.preferences.useAliasesForRenames'",
 	"typescript.preferences.useAliasesForRenames": "Enable/disable introducing aliases for object shorthand properties during renames.",
 	"typescript.preferences.renameMatchingJsxTags": "When on a JSX tag, try to rename the matching tag instead of renaming the symbol. Requires using TypeScript 5.1+ in the workspace.",
+	"typescript.preferences.organizeImports": "Advanced preferences that control how imports are ordered.",
+	"javascript.preferences.organizeImports": "Advanced preferences that control how imports are ordered.",
+	"typescript.preferences.organizeImports.caseSensitivity.auto": "Detect case-sensitivity for import sorting.",
+	"typescript.preferences.organizeImports.caseSensitivity.insensitive": "Sort imports case-insensitively.",
+	"typescript.preferences.organizeImports.caseSensitivity.sensitive": "Sort imports case-sensitively.",
+	"typescript.preferences.organizeImports.typeOrder.auto": "Detect where type-only named imports should be sorted.",
+	"typescript.preferences.organizeImports.typeOrder.last": "Type only named imports are sorted to the end of the import list.",
+	"typescript.preferences.organizeImports.typeOrder.inline": "Named imports are sorted by name only.",
+	"typescript.preferences.organizeImports.typeOrder.first": "Type only named imports are sorted to the end of the import list.",
+	"typescript.preferences.organizeImports.unicodeCollation.ordinal": "Sort imports using the numeric value of each code point.",
+	"typescript.preferences.organizeImports.unicodeCollation.unicode": "Sort imports using the Unicode code collation.",
+	"typescript.preferences.organizeImports.locale": "Overrides the locale used for collation. Specify `auto` to use the UI locale. Only applies to `organizeImportsCollation: 'unicode'`.",
+	"typescript.preferences.organizeImports.caseFirst": "Indicates whether upper-case comes before lower-case. Only applies to `organizeImportsCollation: 'unicode'`.",
+	"typescript.preferences.organizeImports.numericCollation": "Sort numeric strings by integer value.",
+	"typescript.preferences.organizeImports.accentCollation": "Compare characters with diacritical marks as unequal to base character.",
 	"typescript.workspaceSymbols.scope": "Controls which files are searched by [Go to Symbol in Workspace](https://code.visualstudio.com/docs/editor/editingevolved#_open-symbol-by-name).",
 	"typescript.workspaceSymbols.scope.allOpenProjects": "Search all open JavaScript or TypeScript projects for symbols.",
 	"typescript.workspaceSymbols.scope.currentProject": "Only search for symbols in the current JavaScript or TypeScript project.",
diff --git a/extensions/typescript-language-features/src/configuration/configuration.ts b/extensions/typescript-language-features/src/configuration/configuration.ts
index 639f3d346e0..554fd4dd019 100644
--- a/extensions/typescript-language-features/src/configuration/configuration.ts
+++ b/extensions/typescript-language-features/src/configuration/configuration.ts
@@ -263,11 +263,11 @@ export abstract class BaseServiceConfigurationProvider implements ServiceConfigu
 	}
 
 	private readWebProjectWideIntellisenseSuppressSemanticErrors(configuration: vscode.WorkspaceConfiguration): boolean {
-		return configuration.get<boolean>('typescript.tsserver.web.projectWideIntellisense.suppressSemanticErrors', true);
+		return this.readWebTypeAcquisition(configuration) && configuration.get<boolean>('typescript.tsserver.web.projectWideIntellisense.suppressSemanticErrors', false);
 	}
 
 	private readWebTypeAcquisition(configuration: vscode.WorkspaceConfiguration): boolean {
-		return configuration.get<boolean>('typescript.tsserver.web.typeAcquisition.enabled', false);
+		return configuration.get<boolean>('typescript.tsserver.web.typeAcquisition.enabled', true);
 	}
 
 	private readEnableRegionDiagnostics(configuration: vscode.WorkspaceConfiguration): boolean {
diff --git a/extensions/typescript-language-features/src/extension.browser.ts b/extensions/typescript-language-features/src/extension.browser.ts
index 3e987161325..9ad0867efc9 100644
--- a/extensions/typescript-language-features/src/extension.browser.ts
+++ b/extensions/typescript-language-features/src/extension.browser.ts
@@ -101,7 +101,7 @@ export async function activate(context: vscode.ExtensionContext): Promise<Api> {
 		await startPreloadWorkspaceContentsIfNeeded(context, logger);
 	}));
 
-	context.subscriptions.push(registerAtaSupport());
+	context.subscriptions.push(registerAtaSupport(logger));
 
 	return getExtensionApi(onCompletionAccepted.event, pluginManager);
 }
diff --git a/extensions/typescript-language-features/src/filesystems/ata.ts b/extensions/typescript-language-features/src/filesystems/ata.ts
index 731ad303529..b5e43244e1b 100644
--- a/extensions/typescript-language-features/src/filesystems/ata.ts
+++ b/extensions/typescript-language-features/src/filesystems/ata.ts
@@ -8,8 +8,9 @@ import { conditionalRegistration, requireGlobalConfiguration } from '../language
 import { supportsReadableByteStreams } from '../utils/platform';
 import { AutoInstallerFs } from './autoInstallerFs';
 import { MemFs } from './memFs';
+import { Logger } from '../logging/logger';
 
-export function registerAtaSupport(): vscode.Disposable {
+export function registerAtaSupport(logger: Logger): vscode.Disposable {
 	if (!supportsReadableByteStreams()) {
 		return vscode.Disposable.from();
 	}
@@ -18,11 +19,14 @@ export function registerAtaSupport(): vscode.Disposable {
 		requireGlobalConfiguration('typescript', 'tsserver.web.typeAcquisition.enabled'),
 	], () => {
 		return vscode.Disposable.from(
-			vscode.workspace.registerFileSystemProvider('vscode-global-typings', new MemFs(), {
+			// Ata
+			vscode.workspace.registerFileSystemProvider('vscode-global-typings', new MemFs('global-typings', logger), {
 				isCaseSensitive: true,
-				isReadonly: false
+				isReadonly: false,
 			}),
-			vscode.workspace.registerFileSystemProvider('vscode-node-modules', new AutoInstallerFs(), {
+
+			// Read accesses to node_modules
+			vscode.workspace.registerFileSystemProvider('vscode-node-modules', new AutoInstallerFs(logger), {
 				isCaseSensitive: true,
 				isReadonly: false
 			}));
diff --git a/extensions/typescript-language-features/src/filesystems/autoInstallerFs.ts b/extensions/typescript-language-features/src/filesystems/autoInstallerFs.ts
index 4e69fce8cda..d639b7fe999 100644
--- a/extensions/typescript-language-features/src/filesystems/autoInstallerFs.ts
+++ b/extensions/typescript-language-features/src/filesystems/autoInstallerFs.ts
@@ -3,50 +3,33 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { PackageManager } from '@vscode/ts-package-manager';
+import { basename, join } from 'path';
 import * as vscode from 'vscode';
-import { MemFs } from './memFs';
 import { URI } from 'vscode-uri';
-import { PackageManager, FileSystem, packagePath } from '@vscode/ts-package-manager';
-import { join, basename, dirname } from 'path';
+import { Disposable } from '../utils/dispose';
+import { MemFs } from './memFs';
+import { Logger } from '../logging/logger';
 
 const TEXT_DECODER = new TextDecoder('utf-8');
 const TEXT_ENCODER = new TextEncoder();
 
-export class AutoInstallerFs implements vscode.FileSystemProvider {
-
-	private readonly memfs = new MemFs();
-	private readonly fs: FileSystem;
-	private readonly projectCache = new Map<string, Set<string>>();
-	private readonly watcher: vscode.FileSystemWatcher;
-	private readonly _emitter = new vscode.EventEmitter<vscode.FileChangeEvent[]>();
-
-	readonly onDidChangeFile: vscode.Event<vscode.FileChangeEvent[]> = this._emitter.event;
-
-	constructor() {
-		this.watcher = vscode.workspace.createFileSystemWatcher('**/{package.json,package-lock.json,package-lock.kdl}');
-		const handler = (uri: URI) => {
-			const root = dirname(uri.path);
-			if (this.projectCache.delete(root)) {
-				(async () => {
-					const pm = new PackageManager(this.fs);
-					const opts = await this.getInstallOpts(uri, root);
-					const proj = await pm.resolveProject(root, opts);
-					proj.pruneExtraneous();
-					// TODO: should this fire on vscode-node-modules instead?
-					// NB(kmarchan): This should tell TSServer that there's
-					// been changes inside node_modules and it needs to
-					// re-evaluate things.
-					this._emitter.fire([{
-						type: vscode.FileChangeType.Changed,
-						uri: uri.with({ path: join(root, 'node_modules') })
-					}]);
-				})();
-			}
-		};
-		this.watcher.onDidChange(handler);
-		this.watcher.onDidCreate(handler);
-		this.watcher.onDidDelete(handler);
-		const memfs = this.memfs;
+export class AutoInstallerFs extends Disposable implements vscode.FileSystemProvider {
+
+	private readonly memfs: MemFs;
+	private readonly packageManager: PackageManager;
+	private readonly _projectCache = new Map</* root */ string, Promise<void> | undefined>();
+
+	private readonly _emitter = this._register(new vscode.EventEmitter<vscode.FileChangeEvent[]>());
+	readonly onDidChangeFile = this._emitter.event;
+
+	constructor(
+		private readonly logger: Logger
+	) {
+		super();
+
+		const memfs = new MemFs('auto-installer', logger);
+		this.memfs = memfs;
 		memfs.onDidChangeFile((e) => {
 			this._emitter.fire(e.map(ev => ({
 				type: ev.type,
@@ -54,7 +37,8 @@ export class AutoInstallerFs implements vscode.FileSystemProvider {
 				uri: ev.uri.with({ scheme: 'memfs' })
 			})));
 		});
-		this.fs = {
+
+		this.packageManager = new PackageManager({
 			readDirectory(path: string, _extensions?: readonly string[], _exclude?: readonly string[], _include?: readonly string[], _depth?: number): string[] {
 				return memfs.readDirectory(URI.file(path)).map(([name, _]) => name);
 			},
@@ -87,17 +71,17 @@ export class AutoInstallerFs implements vscode.FileSystemProvider {
 					return undefined;
 				}
 			}
-		};
+		});
 	}
 
 	watch(resource: vscode.Uri): vscode.Disposable {
-		const mapped = URI.file(new MappedUri(resource).path);
-		console.log('watching', mapped);
-		return this.memfs.watch(mapped);
+		this.logger.trace(`AutoInstallerFs.watch. Resource: ${resource.toString()}}`);
+		return this.memfs.watch(resource);
 	}
 
 	async stat(uri: vscode.Uri): Promise<vscode.FileStat> {
-		// console.log('stat', uri.toString());
+		this.logger.trace(`AutoInstallerFs.stat: ${uri}`);
+
 		const mapped = new MappedUri(uri);
 
 		// TODO: case sensitivity configuration
@@ -119,7 +103,8 @@ export class AutoInstallerFs implements vscode.FileSystemProvider {
 	}
 
 	async readDirectory(uri: vscode.Uri): Promise<[string, vscode.FileType][]> {
-		// console.log('readDirectory', uri.toString());
+		this.logger.trace(`AutoInstallerFs.readDirectory: ${uri}`);
+
 		const mapped = new MappedUri(uri);
 		await this.ensurePackageContents(mapped);
 
@@ -127,7 +112,8 @@ export class AutoInstallerFs implements vscode.FileSystemProvider {
 	}
 
 	async readFile(uri: vscode.Uri): Promise<Uint8Array> {
-		// console.log('readFile', uri.toString());
+		this.logger.trace(`AutoInstallerFs.readFile: ${uri}`);
+
 		const mapped = new MappedUri(uri);
 		await this.ensurePackageContents(mapped);
 
@@ -151,8 +137,6 @@ export class AutoInstallerFs implements vscode.FileSystemProvider {
 	}
 
 	private async ensurePackageContents(incomingUri: MappedUri): Promise<void> {
-		// console.log('ensurePackageContents', incomingUri.path);
-
 		// If we're not looking for something inside node_modules, bail early.
 		if (!incomingUri.path.includes('node_modules')) {
 			throw vscode.FileSystemError.FileNotFound();
@@ -163,34 +147,37 @@ export class AutoInstallerFs implements vscode.FileSystemProvider {
 			throw vscode.FileSystemError.FileNotFound();
 		}
 
-		const root = this.getProjectRoot(incomingUri.path);
-
-		const pkgPath = packagePath(incomingUri.path);
-		if (!root || this.projectCache.get(root)?.has(pkgPath)) {
+		const root = await this.getProjectRoot(incomingUri.original);
+		if (!root) {
 			return;
 		}
 
-		const proj = await (new PackageManager(this.fs)).resolveProject(root, await this.getInstallOpts(incomingUri.original, root));
+		this.logger.trace(`AutoInstallerFs.ensurePackageContents. Path: ${incomingUri.path}, Root: ${root}`);
 
-		const restore = proj.restorePackageAt(incomingUri.path);
-		try {
-			await restore;
-		} catch (e) {
-			console.error(`failed to restore package at ${incomingUri.path}: `, e);
-			throw e;
-		}
-		if (!this.projectCache.has(root)) {
-			this.projectCache.set(root, new Set());
+		const existingInstall = this._projectCache.get(root);
+		if (existingInstall) {
+			this.logger.trace(`AutoInstallerFs.ensurePackageContents. Found ongoing install for: ${root}/node_modules`);
+			return existingInstall;
 		}
-		this.projectCache.get(root)!.add(pkgPath);
+
+		const installing = (async () => {
+			const proj = await this.packageManager.resolveProject(root, await this.getInstallOpts(incomingUri.original, root));
+			try {
+				await proj.restore();
+			} catch (e) {
+				console.error(`failed to restore package at ${incomingUri.path}: `, e);
+				throw e;
+			}
+		})();
+		this._projectCache.set(root, installing);
+		await installing;
 	}
 
 	private async getInstallOpts(originalUri: URI, root: string) {
 		const vsfs = vscode.workspace.fs;
-		let pkgJson;
-		try {
-			pkgJson = TEXT_DECODER.decode(await vsfs.readFile(originalUri.with({ path: join(root, 'package.json') })));
-		} catch (e) { }
+
+		// We definitely need a package.json to be there.
+		const pkgJson = TEXT_DECODER.decode(await vsfs.readFile(originalUri.with({ path: join(root, 'package.json') })));
 
 		let kdlLock;
 		try {
@@ -209,13 +196,20 @@ export class AutoInstallerFs implements vscode.FileSystemProvider {
 		};
 	}
 
-	private getProjectRoot(path: string): string | undefined {
-		const pkgPath = path.match(/(^.*)\/node_modules/);
-		return pkgPath?.[1];
+	private async getProjectRoot(incomingUri: URI): Promise<string | undefined> {
+		const vsfs = vscode.workspace.fs;
+		const pkgPath = incomingUri.path.match(/^(.*?)\/node_modules/);
+		const ret = pkgPath?.[1];
+		if (!ret) {
+			return;
+		}
+		try {
+			await vsfs.stat(incomingUri.with({ path: join(ret, 'package.json') }));
+			return ret;
+		} catch (e) {
+			return;
+		}
 	}
-
-	// --- manage file events
-
 }
 
 class MappedUri {
@@ -227,7 +221,7 @@ class MappedUri {
 
 		const parts = uri.path.match(/^\/([^\/]+)\/([^\/]*)(?:\/(.+))?$/);
 		if (!parts) {
-			throw new Error(`Invalid path: ${uri.path}`);
+			throw new Error(`Invalid uri: ${uri.toString()}, ${uri.path}`);
 		}
 
 		const scheme = parts[1];
diff --git a/extensions/typescript-language-features/src/filesystems/memFs.ts b/extensions/typescript-language-features/src/filesystems/memFs.ts
index eeeb60e957d..05c4e7c3db7 100644
--- a/extensions/typescript-language-features/src/filesystems/memFs.ts
+++ b/extensions/typescript-language-features/src/filesystems/memFs.ts
@@ -3,8 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as vscode from 'vscode';
 import { basename, dirname } from 'path';
+import * as vscode from 'vscode';
+import { Logger } from '../logging/logger';
 
 export class MemFs implements vscode.FileSystemProvider {
 
@@ -14,8 +15,13 @@ export class MemFs implements vscode.FileSystemProvider {
 		0,
 	);
 
+	constructor(
+		private readonly id: string,
+		private readonly logger: Logger,
+	) { }
+
 	stat(uri: vscode.Uri): vscode.FileStat {
-		// console.log('stat', uri.toString());
+		this.logger.trace(`MemFs.stat ${this.id}. uri: ${uri}`);
 		const entry = this.getEntry(uri);
 		if (!entry) {
 			throw vscode.FileSystemError.FileNotFound();
@@ -25,7 +31,7 @@ export class MemFs implements vscode.FileSystemProvider {
 	}
 
 	readDirectory(uri: vscode.Uri): [string, vscode.FileType][] {
-		// console.log('readDirectory', uri.toString());
+		this.logger.trace(`MemFs.readDirectory ${this.id}. uri: ${uri}`);
 
 		const entry = this.getEntry(uri);
 		if (!entry) {
@@ -39,7 +45,7 @@ export class MemFs implements vscode.FileSystemProvider {
 	}
 
 	readFile(uri: vscode.Uri): Uint8Array {
-		// console.log('readFile', uri.toString());
+		this.logger.trace(`MemFs.readFile ${this.id}. uri: ${uri}`);
 
 		const entry = this.getEntry(uri);
 		if (!entry) {
@@ -54,7 +60,7 @@ export class MemFs implements vscode.FileSystemProvider {
 	}
 
 	writeFile(uri: vscode.Uri, content: Uint8Array, { create, overwrite }: { create: boolean; overwrite: boolean }): void {
-		// console.log('writeFile', uri.toString());
+		this.logger.trace(`MemFs.writeFile ${this.id}. uri: ${uri}`);
 
 		const dir = this.getParent(uri);
 
@@ -98,7 +104,8 @@ export class MemFs implements vscode.FileSystemProvider {
 	}
 
 	createDirectory(uri: vscode.Uri): void {
-		// console.log('createDirectory', uri.toString());
+		this.logger.trace(`MemFs.createDirectory ${this.id}. uri: ${uri}`);
+
 		const dir = this.getParent(uri);
 		const now = Date.now() / 1000;
 		dir.contents.set(basename(uri.path), new FsDirectoryEntry(new Map(), now, now));
diff --git a/extensions/typescript-language-features/src/languageFeatures/completions.ts b/extensions/typescript-language-features/src/languageFeatures/completions.ts
index 708d7e028dd..1012083a0bf 100644
--- a/extensions/typescript-language-features/src/languageFeatures/completions.ts
+++ b/extensions/typescript-language-features/src/languageFeatures/completions.ts
@@ -58,6 +58,7 @@ class MyCompletionItem extends vscode.CompletionItem {
 		private readonly completionContext: CompletionContext,
 		public readonly metadata: any | undefined,
 		client: ITypeScriptServiceClient,
+		defaultCommitCharacters: readonly string[] | undefined,
 	) {
 		const label = tsEntry.name || (tsEntry.insertText ?? '');
 		super(label, MyCompletionItem.convertKind(tsEntry.kind));
@@ -93,7 +94,7 @@ class MyCompletionItem extends vscode.CompletionItem {
 		this.useCodeSnippet = completionContext.completeFunctionCalls && (this.kind === vscode.CompletionItemKind.Function || this.kind === vscode.CompletionItemKind.Method);
 
 		this.range = this.getRangeFromReplacementSpan(tsEntry, completionContext);
-		this.commitCharacters = MyCompletionItem.getCommitCharacters(completionContext, tsEntry);
+		this.commitCharacters = MyCompletionItem.getCommitCharacters(completionContext, tsEntry, defaultCommitCharacters);
 		this.insertText = isSnippet && tsEntry.insertText ? new vscode.SnippetString(tsEntry.insertText) : tsEntry.insertText;
 		this.filterText = tsEntry.filterText || this.getFilterText(completionContext.line, tsEntry.insertText);
 
@@ -500,7 +501,23 @@ class MyCompletionItem extends vscode.CompletionItem {
 		}
 	}
 
-	private static getCommitCharacters(context: CompletionContext, entry: Proto.CompletionEntry): string[] | undefined {
+	private static getCommitCharacters(
+		context: CompletionContext,
+		entry: Proto.CompletionEntry,
+		defaultCommitCharacters: readonly string[] | undefined,
+	): string[] | undefined {
+		// @ts-expect-error until TS 5.6
+		let commitCharacters = (entry.commitCharacters as string[] | undefined) ?? (defaultCommitCharacters ? Array.from(defaultCommitCharacters) : undefined);
+		if (commitCharacters) {
+			if (context.enableCallCompletions
+				&& !context.isNewIdentifierLocation
+				&& entry.kind !== PConst.Kind.warning
+				&& entry.kind !== PConst.Kind.string) {
+				commitCharacters.push('(');
+			}
+			return commitCharacters;
+		}
+
 		if (entry.kind === PConst.Kind.warning || entry.kind === PConst.Kind.string) { // Ambient JS word based suggestion, strings
 			return undefined;
 		}
@@ -509,7 +526,7 @@ class MyCompletionItem extends vscode.CompletionItem {
 			return undefined;
 		}
 
-		const commitCharacters: string[] = ['.', ',', ';'];
+		commitCharacters = ['.', ',', ';'];
 		if (context.enableCallCompletions) {
 			commitCharacters.push('(');
 		}
@@ -735,52 +752,40 @@ class TypeScriptCompletionItemProvider implements vscode.CompletionItemProvider<
 			triggerKind: typeConverters.CompletionTriggerKind.toProtocolCompletionTriggerKind(context.triggerKind),
 		};
 
-		let isNewIdentifierLocation = true;
-		let isIncomplete = false;
-		let isMemberCompletion = false;
 		let dotAccessorContext: DotAccessorContext | undefined;
-		let entries: ReadonlyArray<Proto.CompletionEntry>;
-		let metadata: any | undefined;
 		let response: ServerResponse.Response<Proto.CompletionInfoResponse> | undefined;
 		let duration: number | undefined;
 		let optionalReplacementRange: vscode.Range | undefined;
-		if (this.client.apiVersion.gte(API.v300)) {
-			const startTime = Date.now();
-			try {
-				response = await this.client.interruptGetErr(() => this.client.execute('completionInfo', args, token));
-			} finally {
-				duration = Date.now() - startTime;
-			}
 
-			if (response.type !== 'response' || !response.body) {
-				this.logCompletionsTelemetry(duration, response);
-				return undefined;
-			}
-			isNewIdentifierLocation = response.body.isNewIdentifierLocation;
-			isMemberCompletion = response.body.isMemberCompletion;
-			if (isMemberCompletion) {
-				const dotMatch = line.text.slice(0, position.character).match(/\??\.\s*$/) || undefined;
-				if (dotMatch) {
-					const range = new vscode.Range(position.translate({ characterDelta: -dotMatch[0].length }), position);
-					const text = document.getText(range);
-					dotAccessorContext = { range, text };
-				}
-			}
-			isIncomplete = !!response.body.isIncomplete || (response.metadata as any)?.isIncomplete;
-			entries = response.body.entries;
-			metadata = response.metadata;
+		const startTime = Date.now();
+		try {
+			response = await this.client.interruptGetErr(() => this.client.execute('completionInfo', args, token));
+		} finally {
+			duration = Date.now() - startTime;
+		}
 
-			if (response.body.optionalReplacementSpan) {
-				optionalReplacementRange = typeConverters.Range.fromTextSpan(response.body.optionalReplacementSpan);
-			}
-		} else {
-			const response = await this.client.interruptGetErr(() => this.client.execute('completions', args, token));
-			if (response.type !== 'response' || !response.body) {
-				return undefined;
+		if (response.type !== 'response' || !response.body) {
+			this.logCompletionsTelemetry(duration, response);
+			return undefined;
+		}
+		const isNewIdentifierLocation = response.body.isNewIdentifierLocation;
+		const isMemberCompletion = response.body.isMemberCompletion;
+		if (isMemberCompletion) {
+			const dotMatch = line.text.slice(0, position.character).match(/\??\.\s*$/) || undefined;
+			if (dotMatch) {
+				const range = new vscode.Range(position.translate({ characterDelta: -dotMatch[0].length }), position);
+				const text = document.getText(range);
+				dotAccessorContext = { range, text };
 			}
+		}
+		const isIncomplete = !!response.body.isIncomplete || (response.metadata as any)?.isIncomplete;
+		const entries = response.body.entries;
+		const metadata = response.metadata;
+		// @ts-expect-error until TS 5.6
+		const defaultCommitCharacters: readonly string[] | undefined = Object.freeze(response.body.defaultCommitCharacters);
 
-			entries = response.body;
-			metadata = response.metadata;
+		if (response.body.optionalReplacementSpan) {
+			optionalReplacementRange = typeConverters.Range.fromTextSpan(response.body.optionalReplacementSpan);
 		}
 
 		const completionContext: CompletionContext = {
@@ -799,7 +804,14 @@ class TypeScriptCompletionItemProvider implements vscode.CompletionItemProvider<
 		const items: MyCompletionItem[] = [];
 		for (const entry of entries) {
 			if (!shouldExcludeCompletionEntry(entry, completionConfiguration)) {
-				const item = new MyCompletionItem(position, document, entry, completionContext, metadata, this.client);
+				const item = new MyCompletionItem(
+					position,
+					document,
+					entry,
+					completionContext,
+					metadata,
+					this.client,
+					defaultCommitCharacters);
 				item.command = {
 					command: ApplyCompletionCommand.ID,
 					title: '',
@@ -856,11 +868,11 @@ class TypeScriptCompletionItemProvider implements vscode.CompletionItemProvider<
 
 	private getTsTriggerCharacter(context: vscode.CompletionContext): Proto.CompletionsTriggerCharacter | undefined {
 		switch (context.triggerCharacter) {
-			case '@': { // Workaround for https://github.com/microsoft/TypeScript/issues/27321
-				return this.client.apiVersion.gte(API.v310) && this.client.apiVersion.lt(API.v320) ? undefined : '@';
+			case '@': {
+				return '@';
 			}
-			case '#': { // Workaround for https://github.com/microsoft/TypeScript/issues/36367
-				return this.client.apiVersion.lt(API.v381) ? undefined : '#';
+			case '#': {
+				return '#';
 			}
 			case ' ': {
 				return this.client.apiVersion.gte(API.v430) ? ' ' : undefined;
diff --git a/extensions/typescript-language-features/src/languageFeatures/fileConfigurationManager.ts b/extensions/typescript-language-features/src/languageFeatures/fileConfigurationManager.ts
index bddd062b3e8..6e1ae9051b1 100644
--- a/extensions/typescript-language-features/src/languageFeatures/fileConfigurationManager.ts
+++ b/extensions/typescript-language-features/src/languageFeatures/fileConfigurationManager.ts
@@ -5,12 +5,12 @@
 
 import * as path from 'path';
 import * as vscode from 'vscode';
-import type * as Proto from '../tsServer/protocol/protocol';
+import * as fileSchemes from '../configuration/fileSchemes';
+import { isTypeScriptDocument } from '../configuration/languageIds';
 import { API } from '../tsServer/api';
+import type * as Proto from '../tsServer/protocol/protocol';
 import { ITypeScriptServiceClient } from '../typescriptService';
 import { Disposable } from '../utils/dispose';
-import * as fileSchemes from '../configuration/fileSchemes';
-import { isTypeScriptDocument } from '../configuration/languageIds';
 import { equals } from '../utils/objects';
 import { ResourceMap } from '../utils/resourceMap';
 
@@ -191,6 +191,8 @@ export default class FileConfigurationManager extends Disposable {
 			includeCompletionsWithClassMemberSnippets: config.get<boolean>('suggest.classMemberSnippets.enabled', true),
 			includeCompletionsWithObjectLiteralMethodSnippets: config.get<boolean>('suggest.objectLiteralMethodSnippets.enabled', true),
 			autoImportFileExcludePatterns: this.getAutoImportFileExcludePatternsPreference(preferencesConfig, vscode.workspace.getWorkspaceFolder(document.uri)?.uri),
+			// @ts-expect-error until 5.6
+			autoImportSpecifierExcludeRegexes: preferencesConfig.get<string[]>('autoImportSpecifierExcludeRegexes'),
 			preferTypeOnlyAutoImports: preferencesConfig.get<boolean>('preferTypeOnlyAutoImports', false),
 			useLabelDetailsInCompletionEntries: true,
 			allowIncompleteCompletions: true,
@@ -199,6 +201,7 @@ export default class FileConfigurationManager extends Disposable {
 			interactiveInlayHints: true,
 			includeCompletionsForModuleExports: config.get<boolean>('suggest.autoImports'),
 			...getInlayHintsPreferences(config),
+			...this.getOrganizeImportsPreferences(preferencesConfig),
 		};
 
 		return preferences;
@@ -208,7 +211,7 @@ export default class FileConfigurationManager extends Disposable {
 		switch (config.get<string>('quoteStyle')) {
 			case 'single': return 'single';
 			case 'double': return 'double';
-			default: return this.client.apiVersion.gte(API.v333) ? 'auto' : undefined;
+			default: return 'auto';
 		}
 	}
 
@@ -227,6 +230,23 @@ export default class FileConfigurationManager extends Disposable {
 						wildcardPrefix + '**' + path.sep + p;
 		});
 	}
+
+	private getOrganizeImportsPreferences(config: vscode.WorkspaceConfiguration): Proto.UserPreferences {
+		return {
+			// More specific settings
+			organizeImportsAccentCollation: config.get<boolean>('organizeImports.accentCollation'),
+			organizeImportsCaseFirst: withDefaultAsUndefined(config.get<'default' | 'upper' | 'lower'>('organizeImports.caseFirst', 'default'), 'default'),
+			organizeImportsCollation: config.get<'ordinal' | 'unicode'>('organizeImports.collation'),
+			organizeImportsIgnoreCase: withDefaultAsUndefined(config.get<'auto' | 'caseInsensitive' | 'caseSensitive'>('organizeImports.caseSensitivity'), 'auto'),
+			organizeImportsLocale: config.get<string>('organizeImports.locale'),
+			organizeImportsNumericCollation: config.get<boolean>('organizeImports.numericCollation'),
+			organizeImportsTypeOrder: withDefaultAsUndefined(config.get<'auto' | 'last' | 'inline' | 'first'>('organizeImports.typeOrder', 'auto'), 'auto'),
+		};
+	}
+}
+
+function withDefaultAsUndefined<T, O extends T>(value: T, def: O): Exclude<T, O> | undefined {
+	return value === def ? undefined : value as Exclude<T, O>;
 }
 
 export class InlayHintSettingNames {
diff --git a/extensions/typescript-language-features/src/languageFeatures/fixAll.ts b/extensions/typescript-language-features/src/languageFeatures/fixAll.ts
index 690439218a8..09ab205d918 100644
--- a/extensions/typescript-language-features/src/languageFeatures/fixAll.ts
+++ b/extensions/typescript-language-features/src/languageFeatures/fixAll.ts
@@ -5,7 +5,6 @@
 
 import * as vscode from 'vscode';
 import { DocumentSelector } from '../configuration/documentSelector';
-import { API } from '../tsServer/api';
 import * as errorCodes from '../tsServer/protocol/errorCodes';
 import * as fixNames from '../tsServer/protocol/fixNames';
 import type * as Proto from '../tsServer/protocol/protocol';
@@ -13,7 +12,7 @@ import * as typeConverters from '../typeConverters';
 import { ClientCapability, ITypeScriptServiceClient } from '../typescriptService';
 import { DiagnosticsManager } from './diagnostics';
 import FileConfigurationManager from './fileConfigurationManager';
-import { conditionalRegistration, requireMinVersion, requireSomeCapability } from './util/dependentRegistration';
+import { conditionalRegistration, requireSomeCapability } from './util/dependentRegistration';
 
 
 interface AutoFix {
@@ -250,7 +249,6 @@ export function register(
 	diagnosticsManager: DiagnosticsManager,
 ) {
 	return conditionalRegistration([
-		requireMinVersion(client, API.v300),
 		requireSomeCapability(client, ClientCapability.Semantic),
 	], () => {
 		const provider = new TypeScriptAutoFixProvider(client, fileConfigurationManager, diagnosticsManager);
diff --git a/extensions/typescript-language-features/src/languageFeatures/rename.ts b/extensions/typescript-language-features/src/languageFeatures/rename.ts
index 19dc5b93c99..5c86190a53e 100644
--- a/extensions/typescript-language-features/src/languageFeatures/rename.ts
+++ b/extensions/typescript-language-features/src/languageFeatures/rename.ts
@@ -36,10 +36,6 @@ class TypeScriptRenameProvider implements vscode.RenameProvider {
 		position: vscode.Position,
 		token: vscode.CancellationToken
 	): Promise<vscode.Range | undefined> {
-		if (this.client.apiVersion.lt(API.v310)) {
-			return undefined;
-		}
-
 		const response = await this.execRename(document, position, token);
 		if (!response) {
 			return undefined;
diff --git a/extensions/typescript-language-features/src/languageFeatures/semanticTokens.ts b/extensions/typescript-language-features/src/languageFeatures/semanticTokens.ts
index 48c9af7a5a5..7f8d60d3875 100644
--- a/extensions/typescript-language-features/src/languageFeatures/semanticTokens.ts
+++ b/extensions/typescript-language-features/src/languageFeatures/semanticTokens.ts
@@ -4,11 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
+import { DocumentSelector } from '../configuration/documentSelector';
 import * as Proto from '../tsServer/protocol/protocol';
-import { API } from '../tsServer/api';
 import { ClientCapability, ITypeScriptServiceClient } from '../typescriptService';
-import { conditionalRegistration, requireMinVersion, requireSomeCapability } from './util/dependentRegistration';
-import { DocumentSelector } from '../configuration/documentSelector';
+import { conditionalRegistration, requireSomeCapability } from './util/dependentRegistration';
 
 // as we don't do deltas, for performance reasons, don't compute semantic tokens for documents above that limit
 const CONTENT_LENGTH_LIMIT = 100000;
@@ -18,7 +17,6 @@ export function register(
 	client: ITypeScriptServiceClient,
 ) {
 	return conditionalRegistration([
-		requireMinVersion(client, API.v370),
 		requireSomeCapability(client, ClientCapability.Semantic),
 	], () => {
 		const provider = new DocumentSemanticTokensProvider(client);
diff --git a/extensions/typescript-language-features/src/languageFeatures/smartSelect.ts b/extensions/typescript-language-features/src/languageFeatures/smartSelect.ts
index 80887d65180..fa6a6096d37 100644
--- a/extensions/typescript-language-features/src/languageFeatures/smartSelect.ts
+++ b/extensions/typescript-language-features/src/languageFeatures/smartSelect.ts
@@ -5,14 +5,11 @@
 
 import * as vscode from 'vscode';
 import { DocumentSelector } from '../configuration/documentSelector';
-import { API } from '../tsServer/api';
 import type * as Proto from '../tsServer/protocol/protocol';
 import * as typeConverters from '../typeConverters';
 import { ITypeScriptServiceClient } from '../typescriptService';
-import { conditionalRegistration, requireMinVersion } from './util/dependentRegistration';
 
 class SmartSelection implements vscode.SelectionRangeProvider {
-	public static readonly minVersion = API.v350;
 
 	public constructor(
 		private readonly client: ITypeScriptServiceClient
@@ -53,9 +50,5 @@ export function register(
 	selector: DocumentSelector,
 	client: ITypeScriptServiceClient,
 ) {
-	return conditionalRegistration([
-		requireMinVersion(client, SmartSelection.minVersion),
-	], () => {
-		return vscode.languages.registerSelectionRangeProvider(selector.syntax, new SmartSelection(client));
-	});
+	return vscode.languages.registerSelectionRangeProvider(selector.syntax, new SmartSelection(client));
 }
diff --git a/extensions/typescript-language-features/src/languageFeatures/tagClosing.ts b/extensions/typescript-language-features/src/languageFeatures/tagClosing.ts
index 45ac08e14a4..6b47feb3d00 100644
--- a/extensions/typescript-language-features/src/languageFeatures/tagClosing.ts
+++ b/extensions/typescript-language-features/src/languageFeatures/tagClosing.ts
@@ -4,17 +4,15 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
-import type * as Proto from '../tsServer/protocol/protocol';
-import { API } from '../tsServer/api';
-import { ITypeScriptServiceClient } from '../typescriptService';
-import { Condition, conditionalRegistration, requireMinVersion } from './util/dependentRegistration';
-import { Disposable } from '../utils/dispose';
 import { DocumentSelector } from '../configuration/documentSelector';
 import { LanguageDescription } from '../configuration/languageDescription';
+import type * as Proto from '../tsServer/protocol/protocol';
 import * as typeConverters from '../typeConverters';
+import { ITypeScriptServiceClient } from '../typescriptService';
+import { Disposable } from '../utils/dispose';
+import { Condition, conditionalRegistration } from './util/dependentRegistration';
 
 class TagClosing extends Disposable {
-	public static readonly minVersion = API.v300;
 
 	private _disposed = false;
 	private _timeout: NodeJS.Timeout | undefined = undefined;
@@ -167,7 +165,6 @@ export function register(
 	client: ITypeScriptServiceClient,
 ) {
 	return conditionalRegistration([
-		requireMinVersion(client, TagClosing.minVersion),
 		requireActiveDocumentSetting(selector.syntax, language)
 	], () => new TagClosing(client));
 }
diff --git a/extensions/typescript-language-features/src/languageFeatures/updatePathsOnRename.ts b/extensions/typescript-language-features/src/languageFeatures/updatePathsOnRename.ts
index 91ca9612e70..bdaa1fc69ff 100644
--- a/extensions/typescript-language-features/src/languageFeatures/updatePathsOnRename.ts
+++ b/extensions/typescript-language-features/src/languageFeatures/updatePathsOnRename.ts
@@ -7,7 +7,6 @@ import * as path from 'path';
 import * as vscode from 'vscode';
 import * as fileSchemes from '../configuration/fileSchemes';
 import { doesResourceLookLikeATypeScriptFile } from '../configuration/languageDescription';
-import { API } from '../tsServer/api';
 import type * as Proto from '../tsServer/protocol/protocol';
 import * as typeConverters from '../typeConverters';
 import { ClientCapability, ITypeScriptServiceClient } from '../typescriptService';
@@ -15,7 +14,7 @@ import { Delayer } from '../utils/async';
 import { nulToken } from '../utils/cancellation';
 import { Disposable } from '../utils/dispose';
 import FileConfigurationManager from './fileConfigurationManager';
-import { conditionalRegistration, requireMinVersion, requireSomeCapability } from './util/dependentRegistration';
+import { conditionalRegistration, requireSomeCapability } from './util/dependentRegistration';
 
 
 const updateImportsOnFileMoveName = 'updateImportsOnFileMove.enabled';
@@ -43,7 +42,6 @@ interface RenameAction {
 }
 
 class UpdateImportsOnFileRenameHandler extends Disposable {
-	public static readonly minVersion = API.v300;
 
 	private readonly _delayer = new Delayer(50);
 	private readonly _pendingRenames = new Set<RenameAction>();
@@ -289,7 +287,6 @@ export function register(
 	handles: (uri: vscode.Uri) => Promise<boolean>,
 ) {
 	return conditionalRegistration([
-		requireMinVersion(client, UpdateImportsOnFileRenameHandler.minVersion),
 		requireSomeCapability(client, ClientCapability.Semantic),
 	], () => {
 		return new UpdateImportsOnFileRenameHandler(client, fileConfigurationManager, handles);
diff --git a/extensions/typescript-language-features/src/languageFeatures/util/textRendering.ts b/extensions/typescript-language-features/src/languageFeatures/util/textRendering.ts
index fe26dd64029..af1a7e601b4 100644
--- a/extensions/typescript-language-features/src/languageFeatures/util/textRendering.ts
+++ b/extensions/typescript-language-features/src/languageFeatures/util/textRendering.ts
@@ -15,24 +15,6 @@ export interface IFilePathToResourceConverter {
 	toResource(filepath: string): vscode.Uri;
 }
 
-function replaceLinks(text: string): string {
-	return text
-		// Http(s) links
-		.replace(/\{@(link|linkplain|linkcode) (https?:\/\/[^ |}]+?)(?:[| ]([^{}\n]+?))?\}/gi, (_, tag: string, link: string, text?: string) => {
-			switch (tag) {
-				case 'linkcode':
-					return `[\`${text ? text.trim() : link}\`](${link})`;
-
-				default:
-					return `[${text ? text.trim() : link}](${link})`;
-			}
-		});
-}
-
-function processInlineTags(text: string): string {
-	return replaceLinks(text);
-}
-
 function getTagBodyText(
 	tag: Proto.JSDocTagInfo,
 	filePathConverter: IFilePathToResourceConverter,
@@ -67,18 +49,19 @@ function getTagBodyText(
 		case 'author': {
 			// fix obsucated email address, #80898
 			const emailMatch = text.match(/(.+)\s<([-.\w]+@[-.\w]+)>/);
-
 			if (emailMatch === null) {
 				return text;
 			} else {
 				return `${emailMatch[1]} ${emailMatch[2]}`;
 			}
 		}
-		case 'default':
+		case 'default': {
 			return makeCodeblock(text);
+		}
+		default: {
+			return text;
+		}
 	}
-
-	return processInlineTags(text);
 }
 
 function getTagDocumentation(
@@ -98,11 +81,10 @@ function getTagDocumentation(
 				if (!doc) {
 					return label;
 				}
-				return label + (doc.match(/\r\n|\n/g) ? '  \n' + processInlineTags(doc) : ` \u2014 ${processInlineTags(doc)}`);
+				return label + (doc.match(/\r\n|\n/g) ? '  \n' + doc : ` \u2014 ${doc}`);
 			}
 			break;
 		}
-
 		case 'return':
 		case 'returns': {
 			// For return(s), we require a non-empty body
@@ -147,7 +129,7 @@ export function asPlainTextWithLinks(
 	parts: readonly Proto.SymbolDisplayPart[] | string,
 	filePathConverter: IFilePathToResourceConverter,
 ): string {
-	return processInlineTags(convertLinkTags(parts, filePathConverter));
+	return convertLinkTags(parts, filePathConverter);
 }
 
 /**
@@ -187,10 +169,10 @@ function convertLinkTags(
 						if (text) {
 							if (/^https?:/.test(text)) {
 								const parts = text.split(' ');
-								if (parts.length === 1) {
+								if (parts.length === 1 && !currentLink.linkcode) {
 									out.push(`<${parts[0]}>`);
-								} else if (parts.length > 1) {
-									const linkText = parts.slice(1).join(' ');
+								} else {
+									const linkText = parts.length > 1 ? parts.slice(1).join(' ') : parts[0];
 									out.push(`[${currentLink.linkcode ? '`' + escapeMarkdownSyntaxTokensForCode(linkText) + '`' : linkText}](${parts[0]})`);
 								}
 							} else {
@@ -224,7 +206,7 @@ function convertLinkTags(
 				break;
 		}
 	}
-	return processInlineTags(out.join(''));
+	return out.join('');
 }
 
 function escapeMarkdownSyntaxTokensForCode(text: string): string {
diff --git a/extensions/typescript-language-features/src/test/unit/textRendering.test.ts b/extensions/typescript-language-features/src/test/unit/textRendering.test.ts
index b13f682f715..c2a8bafb8c0 100644
--- a/extensions/typescript-language-features/src/test/unit/textRendering.test.ts
+++ b/extensions/typescript-language-features/src/test/unit/textRendering.test.ts
@@ -28,17 +28,19 @@ suite('typescript.previewer', () => {
 	test('Should parse url jsdoc @link', () => {
 		assert.strictEqual(
 			documentationToMarkdown(
-				'x {@link http://www.example.com/foo} y {@link https://api.jquery.com/bind/#bind-eventType-eventData-handler} z',
+				// 'x {@link http://www.example.com/foo} y {@link https://api.jquery.com/bind/#bind-eventType-eventData-handler} z',
+				[{ "text": "x ", "kind": "text" }, { "text": "{@link ", "kind": "link" }, { "text": "http://www.example.com/foo", "kind": "linkText" }, { "text": "}", "kind": "link" }, { "text": " y ", "kind": "text" }, { "text": "{@link ", "kind": "link" }, { "text": "https://api.jquery.com/bind/#bind-eventType-eventData-handler", "kind": "linkText" }, { "text": "}", "kind": "link" }, { "text": " z", "kind": "text" }],
 				[],
 				noopToResource, undefined
 			).value,
-			'x [http://www.example.com/foo](http://www.example.com/foo) y [https://api.jquery.com/bind/#bind-eventType-eventData-handler](https://api.jquery.com/bind/#bind-eventType-eventData-handler) z');
+			'x <http://www.example.com/foo> y <https://api.jquery.com/bind/#bind-eventType-eventData-handler> z');
 	});
 
 	test('Should parse url jsdoc @link with text', () => {
 		assert.strictEqual(
 			documentationToMarkdown(
-				'x {@link http://www.example.com/foo abc xyz} y {@link http://www.example.com/bar|b a z} z',
+				// 'x {@link http://www.example.com/foo abc xyz} y {@link http://www.example.com/bar|b a z} z',
+				[{ "text": "x ", "kind": "text" }, { "text": "{@link ", "kind": "link" }, { "text": "http://www.example.com/foo abc xyz", "kind": "linkText" }, { "text": "}", "kind": "link" }, { "text": " y ", "kind": "text" }, { "text": "{@link ", "kind": "link" }, { "text": "http://www.example.com/bar b a z", "kind": "linkText" }, { "text": "}", "kind": "link" }, { "text": " z", "kind": "text" }],
 				[],
 				noopToResource, undefined
 			).value,
@@ -48,11 +50,12 @@ suite('typescript.previewer', () => {
 	test('Should treat @linkcode jsdocs links as monospace', () => {
 		assert.strictEqual(
 			documentationToMarkdown(
-				'x {@linkcode http://www.example.com/foo} y {@linkplain http://www.example.com/bar} z',
+				// 'x {@linkcode http://www.example.com/foo} y {@linkplain http://www.example.com/bar} z',
+				[{ "text": "x ", "kind": "text" }, { "text": "{@linkcode ", "kind": "link" }, { "text": "http://www.example.com/foo", "kind": "linkText" }, { "text": "}", "kind": "link" }, { "text": " y ", "kind": "text" }, { "text": "{@linkplain ", "kind": "link" }, { "text": "http://www.example.com/bar", "kind": "linkText" }, { "text": "}", "kind": "link" }, { "text": " z", "kind": "text" }],
 				[],
 				noopToResource, undefined
 			).value,
-			'x [`http://www.example.com/foo`](http://www.example.com/foo) y [http://www.example.com/bar](http://www.example.com/bar) z');
+			'x [`http://www.example.com/foo`](http://www.example.com/foo) y <http://www.example.com/bar> z');
 	});
 
 	test('Should parse url jsdoc @link in param tag', () => {
@@ -60,22 +63,13 @@ suite('typescript.previewer', () => {
 			tagsToMarkdown([
 				{
 					name: 'param',
-					text: 'a x {@link http://www.example.com/foo abc xyz} y {@link http://www.example.com/bar|b a z} z'
+					// a x {@link http://www.example.com/foo abc xyz} y {@link http://www.example.com/bar|b a z} z
+					text: [{ "text": "a", "kind": "parameterName" }, { "text": " ", "kind": "space" }, { "text": "x ", "kind": "text" }, { "text": "{@link ", "kind": "link" }, { "text": "http://www.example.com/foo abc xyz", "kind": "linkText" }, { "text": "}", "kind": "link" }, { "text": " y ", "kind": "text" }, { "text": "{@link ", "kind": "link" }, { "text": "http://www.example.com/bar b a z", "kind": "linkText" }, { "text": "}", "kind": "link" }, { "text": " z", "kind": "text" }],
 				}
 			], noopToResource),
 			'*@param* `a` — x [abc xyz](http://www.example.com/foo) y [b a z](http://www.example.com/bar) z');
 	});
 
-	test('Should ignore unclosed jsdocs @link', () => {
-		assert.strictEqual(
-			documentationToMarkdown(
-				'x {@link http://www.example.com/foo y {@link http://www.example.com/bar bar} z',
-				[],
-				noopToResource, undefined
-			).value,
-			'x {@link http://www.example.com/foo y [bar](http://www.example.com/bar) z');
-	});
-
 	test('Should support non-ascii characters in parameter name (#90108)', () => {
 		assert.strictEqual(
 			tagsToMarkdown([
diff --git a/extensions/typescript-language-features/src/tsServer/api.ts b/extensions/typescript-language-features/src/tsServer/api.ts
index 4beb29d1b2b..b70810989ec 100644
--- a/extensions/typescript-language-features/src/tsServer/api.ts
+++ b/extensions/typescript-language-features/src/tsServer/api.ts
@@ -13,16 +13,7 @@ export class API {
 	}
 
 	public static readonly defaultVersion = API.fromSimpleString('1.0.0');
-	public static readonly v300 = API.fromSimpleString('3.0.0');
-	public static readonly v310 = API.fromSimpleString('3.1.0');
-	public static readonly v314 = API.fromSimpleString('3.1.4');
-	public static readonly v320 = API.fromSimpleString('3.2.0');
-	public static readonly v333 = API.fromSimpleString('3.3.3');
-	public static readonly v340 = API.fromSimpleString('3.4.0');
-	public static readonly v350 = API.fromSimpleString('3.5.0');
-	public static readonly v370 = API.fromSimpleString('3.7.0');
 	public static readonly v380 = API.fromSimpleString('3.8.0');
-	public static readonly v381 = API.fromSimpleString('3.8.1');
 	public static readonly v390 = API.fromSimpleString('3.9.0');
 	public static readonly v400 = API.fromSimpleString('4.0.0');
 	public static readonly v401 = API.fromSimpleString('4.0.1');
diff --git a/extensions/typescript-language-features/src/tsServer/bufferSyncSupport.ts b/extensions/typescript-language-features/src/tsServer/bufferSyncSupport.ts
index 2bb4d39ef26..356c1703831 100644
--- a/extensions/typescript-language-features/src/tsServer/bufferSyncSupport.ts
+++ b/extensions/typescript-language-features/src/tsServer/bufferSyncSupport.ts
@@ -78,24 +78,14 @@ class BufferSynchronizer {
 	}
 
 	public open(resource: vscode.Uri, args: Proto.OpenRequestArgs) {
-		if (this.supportsBatching) {
-			this.updatePending(resource, new OpenOperation(args, args.scriptKindName));
-		} else {
-			this.client.executeWithoutWaitingForResponse('open', args);
-		}
+		this.updatePending(resource, new OpenOperation(args, args.scriptKindName));
 	}
 
 	/**
 	 * @return Was the buffer open?
 	 */
 	public close(resource: vscode.Uri, filepath: string, scriptKind: ScriptKind | undefined): boolean {
-		if (this.supportsBatching) {
-			return this.updatePending(resource, new CloseOperation(filepath, scriptKind));
-		} else {
-			const args: Proto.FileRequestArgs = { file: filepath };
-			this.client.executeWithoutWaitingForResponse('close', args);
-			return true;
-		}
+		return this.updatePending(resource, new CloseOperation(filepath, scriptKind));
 	}
 
 	public change(resource: vscode.Uri, filepath: string, events: readonly vscode.TextDocumentContentChangeEvent[]) {
@@ -103,24 +93,14 @@ class BufferSynchronizer {
 			return;
 		}
 
-		if (this.supportsBatching) {
-			this.updatePending(resource, new ChangeOperation({
-				fileName: filepath,
-				textChanges: events.map((change): Proto.CodeEdit => ({
-					newText: change.text,
-					start: typeConverters.Position.toLocation(change.range.start),
-					end: typeConverters.Position.toLocation(change.range.end),
-				})).reverse(), // Send the edits end-of-document to start-of-document order
-			}));
-		} else {
-			for (const { range, text } of events) {
-				const args: Proto.ChangeRequestArgs = {
-					insertString: text,
-					...typeConverters.Range.toFormattingRequestArgs(filepath, range)
-				};
-				this.client.executeWithoutWaitingForResponse('change', args);
-			}
-		}
+		this.updatePending(resource, new ChangeOperation({
+			fileName: filepath,
+			textChanges: events.map((change): Proto.CodeEdit => ({
+				newText: change.text,
+				start: typeConverters.Position.toLocation(change.range.start),
+				end: typeConverters.Position.toLocation(change.range.end),
+			})).reverse(), // Send the edits end-of-document to start-of-document order
+		}));
 	}
 
 	public reset(): void {
@@ -136,12 +116,6 @@ class BufferSynchronizer {
 	}
 
 	private flush() {
-		if (!this.supportsBatching) {
-			// We've already eagerly synchronized
-			this._pending.clear();
-			return;
-		}
-
 		if (this._pending.size > 0) {
 			const closedFiles: string[] = [];
 			const openFiles: Proto.OpenRequestArgs[] = [];
@@ -158,10 +132,6 @@ class BufferSynchronizer {
 		}
 	}
 
-	private get supportsBatching(): boolean {
-		return this.client.apiVersion.gte(API.v340);
-	}
-
 	private updatePending(resource: vscode.Uri, op: BufferOperation): boolean {
 		switch (op.type) {
 			case BufferOperationType.Close: {
diff --git a/extensions/typescript-language-features/src/tsServer/spawner.ts b/extensions/typescript-language-features/src/tsServer/spawner.ts
index 364c0f07dae..162fdf6d3d1 100644
--- a/extensions/typescript-language-features/src/tsServer/spawner.ts
+++ b/extensions/typescript-language-features/src/tsServer/spawner.ts
@@ -116,12 +116,9 @@ export class TypeScriptServerSpawner {
 				return CompositeServerType.Single;
 
 			case SyntaxServerConfiguration.Auto:
-				if (version.apiVersion?.gte(API.v340)) {
-					return version.apiVersion?.gte(API.v400)
-						? CompositeServerType.DynamicSeparateSyntax
-						: CompositeServerType.SeparateSyntax;
-				}
-				return CompositeServerType.Single;
+				return version.apiVersion?.gte(API.v400)
+					? CompositeServerType.DynamicSeparateSyntax
+					: CompositeServerType.SeparateSyntax;
 		}
 	}
 
diff --git a/extensions/typescript-language-features/src/tsconfig.ts b/extensions/typescript-language-features/src/tsconfig.ts
index 04f08a128bc..e85c715e875 100644
--- a/extensions/typescript-language-features/src/tsconfig.ts
+++ b/extensions/typescript-language-features/src/tsconfig.ts
@@ -76,6 +76,10 @@ function inferredProjectConfigSnippet(
 	config: TypeScriptServiceConfiguration
 ) {
 	const baseConfig = inferredProjectCompilerOptions(version, projectType, config);
+	if (projectType === ProjectType.TypeScript) {
+		delete baseConfig.allowImportingTsExtensions;
+	}
+
 	const compilerOptions = Object.keys(baseConfig).map(key => `"${key}": ${JSON.stringify(baseConfig[key])}`);
 	return new vscode.SnippetString(`{
 	"compilerOptions": {
diff --git a/extensions/typescript-language-features/src/typescriptServiceClient.ts b/extensions/typescript-language-features/src/typescriptServiceClient.ts
index 59f836524b8..2d3ea9eeda6 100644
--- a/extensions/typescript-language-features/src/typescriptServiceClient.ts
+++ b/extensions/typescript-language-features/src/typescriptServiceClient.ts
@@ -30,6 +30,7 @@ import { TypeScriptVersionManager } from './tsServer/versionManager';
 import { ITypeScriptVersionProvider, TypeScriptVersion } from './tsServer/versionProvider';
 import { ClientCapabilities, ClientCapability, ExecConfig, ITypeScriptServiceClient, ServerResponse, TypeScriptRequests } from './typescriptService';
 import { Disposable, DisposableStore, disposeAll } from './utils/dispose';
+import { hash } from './utils/hash';
 import { isWeb, isWebAndHasSharedArrayBuffers } from './utils/platform';
 
 
@@ -424,22 +425,33 @@ export default class TypeScriptServiceClient extends Disposable implements IType
 		this.serverState = new ServerState.Running(handle, apiVersion, undefined, true);
 		this.lastStart = Date.now();
 
-		const hasGlobalPlugins = this.pluginManager.plugins.length > 0;
+
+		/* __GDPR__FRAGMENT__
+			"TypeScriptServerEnvCommonProperties" : {
+				"hasGlobalPlugins": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+				"globalPluginNameHashes": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+			}
+		*/
+		const typeScriptServerEnvCommonProperties = {
+			hasGlobalPlugins: this.pluginManager.plugins.length > 0,
+			globalPluginNameHashes: JSON.stringify(this.pluginManager.plugins.map(plugin => hash(plugin.name))),
+		};
+
 		/* __GDPR__
 			"tsserver.spawned" : {
 				"owner": "mjbvz",
 				"${include}": [
-					"${TypeScriptCommonProperties}"
+					"${TypeScriptCommonProperties}",
+					"${TypeScriptServerEnvCommonProperties}"
 				],
 				"localTypeScriptVersion": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-				"typeScriptVersionSource": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-				"hasGlobalPlugins": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+				"typeScriptVersionSource": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
 			}
 		*/
 		this.logTelemetry('tsserver.spawned', {
+			...typeScriptServerEnvCommonProperties,
 			localTypeScriptVersion: this.versionProvider.localVersion ? this.versionProvider.localVersion.displayName : '',
 			typeScriptVersionSource: version.source,
-			hasGlobalPlugins,
 		});
 
 		handle.onError((err: Error) => {
@@ -462,12 +474,14 @@ export default class TypeScriptServiceClient extends Disposable implements IType
 				"tsserver.error" : {
 					"owner": "mjbvz",
 					"${include}": [
-						"${TypeScriptCommonProperties}"
-					],
-					"hasGlobalPlugins": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+						"${TypeScriptCommonProperties}",
+						"${TypeScriptServerEnvCommonProperties}"
+					]
 				}
 			*/
-			this.logTelemetry('tsserver.error', { hasGlobalPlugins });
+			this.logTelemetry('tsserver.error', {
+				...typeScriptServerEnvCommonProperties
+			});
 			this.serviceExited(false, apiVersion);
 		});
 
@@ -481,17 +495,17 @@ export default class TypeScriptServiceClient extends Disposable implements IType
 				"tsserver.exitWithCode" : {
 					"owner": "mjbvz",
 					"${include}": [
-						"${TypeScriptCommonProperties}"
+						"${TypeScriptCommonProperties}",
+						"${TypeScriptServerEnvCommonProperties}"
 					],
 					"code" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-					"signal" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-					"hasGlobalPlugins": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+					"signal" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
 				}
 			*/
 			this.logTelemetry('tsserver.exitWithCode', {
+				...typeScriptServerEnvCommonProperties,
 				code: code ?? undefined,
 				signal: signal ?? undefined,
-				hasGlobalPlugins,
 			});
 
 			if (this.token !== mytoken) {
@@ -972,16 +986,16 @@ export default class TypeScriptServiceClient extends Disposable implements IType
 						spans: diagnosticEvent.body.spans,
 					});
 				}
-				break;
+				return;
 			}
 			case EventName.configFileDiag:
 				this._onConfigDiagnosticsReceived.fire(event as Proto.ConfigFileDiagnosticEvent);
-				break;
+				return;
 
 			case EventName.telemetry: {
 				const body = (event as Proto.TelemetryEvent).body;
 				this.dispatchTelemetryEvent(body);
-				break;
+				return;
 			}
 			case EventName.projectLanguageServiceState: {
 				const body = (event as Proto.ProjectLanguageServiceStateEvent).body!;
@@ -989,7 +1003,7 @@ export default class TypeScriptServiceClient extends Disposable implements IType
 					this.serverState.updateLanguageServiceEnabled(body.languageServiceEnabled);
 				}
 				this._onProjectLanguageServiceStateChanged.fire(body);
-				break;
+				return;
 			}
 			case EventName.projectsUpdatedInBackground: {
 				this.loadingIndicator.reset();
@@ -997,56 +1011,66 @@ export default class TypeScriptServiceClient extends Disposable implements IType
 				const body = (event as Proto.ProjectsUpdatedInBackgroundEvent).body;
 				const resources = body.openFiles.map(file => this.toResource(file));
 				this.bufferSyncSupport.getErr(resources);
-				break;
+				return;
 			}
 			case EventName.beginInstallTypes:
 				this._onDidBeginInstallTypings.fire((event as Proto.BeginInstallTypesEvent).body);
-				break;
+				return;
 
 			case EventName.endInstallTypes:
 				this._onDidEndInstallTypings.fire((event as Proto.EndInstallTypesEvent).body);
-				break;
+				return;
 
 			case EventName.typesInstallerInitializationFailed:
 				this._onTypesInstallerInitializationFailed.fire((event as Proto.TypesInstallerInitializationFailedEvent).body);
-				break;
+				return;
 
 			case EventName.surveyReady:
 				this._onSurveyReady.fire((event as Proto.SurveyReadyEvent).body);
-				break;
+				return;
 
 			case EventName.projectLoadingStart:
 				this.loadingIndicator.startedLoadingProject((event as Proto.ProjectLoadingStartEvent).body.projectName);
-				break;
+				return;
 
 			case EventName.projectLoadingFinish:
 				this.loadingIndicator.finishedLoadingProject((event as Proto.ProjectLoadingFinishEvent).body.projectName);
-				break;
+				return;
+
+			case EventName.createDirectoryWatcher: {
+				const path = (event.body as Proto.CreateDirectoryWatcherEventBody).path;
+				if (path.startsWith(inMemoryResourcePrefix)) {
+					return;
+				}
 
-			case EventName.createDirectoryWatcher:
 				this.createFileSystemWatcher(
 					(event.body as Proto.CreateDirectoryWatcherEventBody).id,
 					new vscode.RelativePattern(
-						vscode.Uri.file((event.body as Proto.CreateDirectoryWatcherEventBody).path),
+						vscode.Uri.file(path),
 						(event.body as Proto.CreateDirectoryWatcherEventBody).recursive ? '**' : '*'
 					),
 					(event.body as Proto.CreateDirectoryWatcherEventBody).ignoreUpdate
 				);
-				break;
+				return;
+			}
+			case EventName.createFileWatcher: {
+				const path = (event.body as Proto.CreateFileWatcherEventBody).path;
+				if (path.startsWith(inMemoryResourcePrefix)) {
+					return;
+				}
 
-			case EventName.createFileWatcher:
 				this.createFileSystemWatcher(
 					(event.body as Proto.CreateFileWatcherEventBody).id,
 					new vscode.RelativePattern(
-						vscode.Uri.file((event.body as Proto.CreateFileWatcherEventBody).path),
+						vscode.Uri.file(path),
 						'*'
 					)
 				);
-				break;
-
+				return;
+			}
 			case EventName.closeFileWatcher:
 				this.closeFileSystemWatcher(event.body.id);
-				break;
+				return;
 
 			case EventName.requestCompleted: {
 				// @ts-expect-error until ts 5.6
@@ -1058,12 +1082,12 @@ export default class TypeScriptServiceClient extends Disposable implements IType
 							const resource = this.toResource(fileData.file);
 							return {
 								...fileData,
-								lineCount: this.bufferSyncSupport.lineCount(resource),
+								fileLineCount: this.bufferSyncSupport.lineCount(resource),
 							};
 						})
 					);
 				}
-				break;
+				return;
 			}
 		}
 	}
@@ -1148,13 +1172,9 @@ export default class TypeScriptServiceClient extends Disposable implements IType
 		this.watches.set(id, disposable);
 	}
 
-	private closeFileSystemWatcher(
-		id: number,
-	) {
+	private closeFileSystemWatcher(id: number) {
 		const existing = this.watches.get(id);
-		if (existing) {
-			existing.dispose();
-		}
+		existing?.dispose();
 	}
 
 	private dispatchTelemetryEvent(telemetryData: Proto.TelemetryEventBody): void {
@@ -1188,6 +1208,8 @@ export default class TypeScriptServiceClient extends Disposable implements IType
 				break;
 			}
 		}
+
+		// Add plugin data here
 		if (telemetryData.telemetryEventName === 'projectInfo') {
 			if (this.serverState.type === ServerState.Type.Running) {
 				this.serverState.updateTsserverVersion(properties['version']);
@@ -1210,9 +1232,7 @@ export default class TypeScriptServiceClient extends Disposable implements IType
 	}
 
 	private configurePlugin(pluginName: string, configuration: {}): any {
-		if (this.apiVersion.gte(API.v314)) {
-			this.executeWithoutWaitingForResponse('configurePlugin', { pluginName, configuration });
-		}
+		this.executeWithoutWaitingForResponse('configurePlugin', { pluginName, configuration });
 	}
 }
 
diff --git a/extensions/typescript-language-features/src/ui/activeJsTsEditorTracker.ts b/extensions/typescript-language-features/src/ui/activeJsTsEditorTracker.ts
index 3da1f5a8570..c3cae6321ff 100644
--- a/extensions/typescript-language-features/src/ui/activeJsTsEditorTracker.ts
+++ b/extensions/typescript-language-features/src/ui/activeJsTsEditorTracker.ts
@@ -28,6 +28,7 @@ export class ActiveJsTsEditorTracker extends Disposable {
 
 		this._register(vscode.window.onDidChangeActiveTextEditor(_ => this.update()));
 		this._register(vscode.window.onDidChangeVisibleTextEditors(_ => this.update()));
+		this._register(vscode.window.tabGroups.onDidChangeTabGroups(_ => this.update()));
 
 		this.update();
 	}
diff --git a/extensions/typescript-language-features/src/ui/intellisenseStatus.ts b/extensions/typescript-language-features/src/ui/intellisenseStatus.ts
index 1a6ea63f427..e26e2b3719f 100644
--- a/extensions/typescript-language-features/src/ui/intellisenseStatus.ts
+++ b/extensions/typescript-language-features/src/ui/intellisenseStatus.ts
@@ -43,6 +43,8 @@ namespace IntellisenseState {
 	export type State = typeof None | Pending | Resolved | typeof SyntaxOnly;
 }
 
+type CreateOrOpenConfigCommandArgs = [root: vscode.Uri, projectType: ProjectType];
+
 export class IntellisenseStatus extends Disposable {
 
 	public readonly openOpenConfigCommandId = '_typescript.openConfig';
@@ -62,7 +64,7 @@ export class IntellisenseStatus extends Disposable {
 
 		commandManager.register({
 			id: this.openOpenConfigCommandId,
-			execute: async (root: vscode.Uri, projectType: ProjectType) => {
+			execute: async (...[root, projectType]: CreateOrOpenConfigCommandArgs) => {
 				if (this._state.type === IntellisenseState.Type.Resolved) {
 					await openProjectConfigOrPromptToCreate(projectType, this._client, root, this._state.configFile);
 				} else if (this._state.type === IntellisenseState.Type.Pending) {
@@ -72,7 +74,7 @@ export class IntellisenseStatus extends Disposable {
 		});
 		commandManager.register({
 			id: this.createOrOpenConfigCommandId,
-			execute: async (root: vscode.Uri, projectType: ProjectType) => {
+			execute: async (...[root, projectType]: CreateOrOpenConfigCommandArgs) => {
 				await openOrCreateConfig(this._client.apiVersion, projectType, root, this._client.configuration);
 			},
 		});
@@ -182,7 +184,7 @@ export class IntellisenseStatus extends Disposable {
 						title: this._state.projectType === ProjectType.TypeScript
 							? vscode.l10n.t("Configure tsconfig")
 							: vscode.l10n.t("Configure jsconfig"),
-						arguments: [rootPath],
+						arguments: [rootPath, this._state.projectType] satisfies CreateOrOpenConfigCommandArgs,
 					};
 				} else {
 					statusItem.text = vscode.workspace.asRelativePath(this._state.configFile);
@@ -190,7 +192,7 @@ export class IntellisenseStatus extends Disposable {
 					statusItem.command = {
 						command: this.openOpenConfigCommandId,
 						title: vscode.l10n.t("Open config file"),
-						arguments: [rootPath],
+						arguments: [rootPath, this._state.projectType] satisfies CreateOrOpenConfigCommandArgs,
 					};
 				}
 				break;
diff --git a/extensions/typescript-language-features/src/ui/managedFileContext.ts b/extensions/typescript-language-features/src/ui/managedFileContext.ts
index 0b929f85277..1da4588a334 100644
--- a/extensions/typescript-language-features/src/ui/managedFileContext.ts
+++ b/extensions/typescript-language-features/src/ui/managedFileContext.ts
@@ -10,7 +10,7 @@ import { isSupportedLanguageMode } from '../configuration/languageIds';
 import { Disposable } from '../utils/dispose';
 import { ActiveJsTsEditorTracker } from './activeJsTsEditorTracker';
 
-/**E
+/**
  * When clause context set when the current file is managed by vscode's built-in typescript extension.
  */
 export default class ManagedFileContextManager extends Disposable {
diff --git a/extensions/typescript-language-features/src/utils/async.ts b/extensions/typescript-language-features/src/utils/async.ts
index db92754fd2e..9523d7fe67a 100644
--- a/extensions/typescript-language-features/src/utils/async.ts
+++ b/extensions/typescript-language-features/src/utils/async.ts
@@ -70,3 +70,94 @@ export function setImmediate(callback: (...args: any[]) => void, ...args: any[])
 		return { dispose: () => clearTimeout(handle) };
 	}
 }
+
+
+/**
+ * A helper to prevent accumulation of sequential async tasks.
+ *
+ * Imagine a mail man with the sole task of delivering letters. As soon as
+ * a letter submitted for delivery, he drives to the destination, delivers it
+ * and returns to his base. Imagine that during the trip, N more letters were submitted.
+ * When the mail man returns, he picks those N letters and delivers them all in a
+ * single trip. Even though N+1 submissions occurred, only 2 deliveries were made.
+ *
+ * The throttler implements this via the queue() method, by providing it a task
+ * factory. Following the example:
+ *
+ * 		const throttler = new Throttler();
+ * 		const letters = [];
+ *
+ * 		function deliver() {
+ * 			const lettersToDeliver = letters;
+ * 			letters = [];
+ * 			return makeTheTrip(lettersToDeliver);
+ * 		}
+ *
+ * 		function onLetterReceived(l) {
+ * 			letters.push(l);
+ * 			throttler.queue(deliver);
+ * 		}
+ */
+export class Throttler {
+
+	private activePromise: Promise<any> | null;
+	private queuedPromise: Promise<any> | null;
+	private queuedPromiseFactory: ITask<Promise<any>> | null;
+
+	private isDisposed = false;
+
+	constructor() {
+		this.activePromise = null;
+		this.queuedPromise = null;
+		this.queuedPromiseFactory = null;
+	}
+
+	queue<T>(promiseFactory: ITask<Promise<T>>): Promise<T> {
+		if (this.isDisposed) {
+			return Promise.reject(new Error('Throttler is disposed'));
+		}
+
+		if (this.activePromise) {
+			this.queuedPromiseFactory = promiseFactory;
+
+			if (!this.queuedPromise) {
+				const onComplete = () => {
+					this.queuedPromise = null;
+
+					if (this.isDisposed) {
+						return;
+					}
+
+					const result = this.queue(this.queuedPromiseFactory!);
+					this.queuedPromiseFactory = null;
+
+					return result;
+				};
+
+				this.queuedPromise = new Promise(resolve => {
+					this.activePromise!.then(onComplete, onComplete).then(resolve);
+				});
+			}
+
+			return new Promise((resolve, reject) => {
+				this.queuedPromise!.then(resolve, reject);
+			});
+		}
+
+		this.activePromise = promiseFactory();
+
+		return new Promise((resolve, reject) => {
+			this.activePromise!.then((result: T) => {
+				this.activePromise = null;
+				resolve(result);
+			}, (err: unknown) => {
+				this.activePromise = null;
+				reject(err);
+			});
+		});
+	}
+
+	dispose(): void {
+		this.isDisposed = true;
+	}
+}
diff --git a/extensions/typescript-language-features/src/utils/hash.ts b/extensions/typescript-language-features/src/utils/hash.ts
new file mode 100644
index 00000000000..b009808968d
--- /dev/null
+++ b/extensions/typescript-language-features/src/utils/hash.ts
@@ -0,0 +1,58 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+/**
+ * Return a hash value for an object.
+ */
+export function hash(obj: any, hashVal = 0): number {
+	switch (typeof obj) {
+		case 'object':
+			if (obj === null) {
+				return numberHash(349, hashVal);
+			} else if (Array.isArray(obj)) {
+				return arrayHash(obj, hashVal);
+			}
+			return objectHash(obj, hashVal);
+		case 'string':
+			return stringHash(obj, hashVal);
+		case 'boolean':
+			return booleanHash(obj, hashVal);
+		case 'number':
+			return numberHash(obj, hashVal);
+		case 'undefined':
+			return 937 * 31;
+		default:
+			return numberHash(obj, 617);
+	}
+}
+
+function numberHash(val: number, initialHashVal: number): number {
+	return (((initialHashVal << 5) - initialHashVal) + val) | 0;  // hashVal * 31 + ch, keep as int32
+}
+
+function booleanHash(b: boolean, initialHashVal: number): number {
+	return numberHash(b ? 433 : 863, initialHashVal);
+}
+
+function stringHash(s: string, hashVal: number) {
+	hashVal = numberHash(149417, hashVal);
+	for (let i = 0, length = s.length; i < length; i++) {
+		hashVal = numberHash(s.charCodeAt(i), hashVal);
+	}
+	return hashVal;
+}
+
+function arrayHash(arr: any[], initialHashVal: number): number {
+	initialHashVal = numberHash(104579, initialHashVal);
+	return arr.reduce((hashVal, item) => hash(item, hashVal), initialHashVal);
+}
+
+function objectHash(obj: any, initialHashVal: number): number {
+	initialHashVal = numberHash(181387, initialHashVal);
+	return Object.keys(obj).sort().reduce((hashVal, key) => {
+		hashVal = stringHash(key, hashVal);
+		return hash(obj[key], hashVal);
+	}, initialHashVal);
+}
diff --git a/extensions/typescript-language-features/web/src/fileWatcherManager.ts b/extensions/typescript-language-features/web/src/fileWatcherManager.ts
index 5bbce244688..6ae4472e503 100644
--- a/extensions/typescript-language-features/web/src/fileWatcherManager.ts
+++ b/extensions/typescript-language-features/web/src/fileWatcherManager.ts
@@ -53,9 +53,9 @@ export class FileWatcherManager {
 		this.watchFiles.set(path, { callback, pollingInterval, options });
 		const watchIds = [++this.watchId];
 		this.watchPort.postMessage({ type: 'watchFile', uri: uri, id: watchIds[0] });
-		if (this.enabledExperimentalTypeAcquisition && looksLikeNodeModules(path)) {
+		if (this.enabledExperimentalTypeAcquisition && looksLikeNodeModules(path) && uri.scheme !== 'vscode-global-typings') {
 			watchIds.push(++this.watchId);
-			this.watchPort.postMessage({ type: 'watchFile', uri: mapUri(uri, 'vscode-node-modules'), id: watchIds[1] });
+			this.watchPort.postMessage({ type: 'watchFile', uri: mapUri(uri, 'vscode-global-typings'), id: watchIds[1] });
 		}
 		return {
 			close: () => {
diff --git a/extensions/typescript-language-features/web/src/typingsInstaller/typingsInstaller.ts b/extensions/typescript-language-features/web/src/typingsInstaller/typingsInstaller.ts
index 7c40993d6df..1f7790dc783 100644
--- a/extensions/typescript-language-features/web/src/typingsInstaller/typingsInstaller.ts
+++ b/extensions/typescript-language-features/web/src/typingsInstaller/typingsInstaller.ts
@@ -70,10 +70,12 @@ export class WebTypingsInstallerClient implements ts.server.ITypingsInstaller {
 				break;
 			case 'event::beginInstallTypes':
 			case 'event::endInstallTypes':
+			// TODO(@zkat): maybe do something with this?
+			case 'action::watchTypingLocations':
 				// Don't care.
 				break;
 			default:
-				throw new Error(`unexpected response: ${response}`);
+				throw new Error(`unexpected response: ${JSON.stringify(response)}`);
 		}
 	}
 
diff --git a/extensions/vscode-api-tests/package.json b/extensions/vscode-api-tests/package.json
index 61828a784fb..8a1032fef2c 100644
--- a/extensions/vscode-api-tests/package.json
+++ b/extensions/vscode-api-tests/package.json
@@ -47,7 +47,6 @@
     "telemetry",
     "terminalDataWriteEvent",
     "terminalDimensions",
-    "terminalShellIntegration",
     "testObserver",
     "textSearchProvider",
     "timeline",
diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/chat.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/chat.test.ts
index ca72f39feb8..2b1110c23bf 100644
--- a/extensions/vscode-api-tests/src/singlefolder-tests/chat.test.ts
+++ b/extensions/vscode-api-tests/src/singlefolder-tests/chat.test.ts
@@ -6,7 +6,7 @@
 import * as assert from 'assert';
 import 'mocha';
 import { ChatContext, ChatRequest, ChatResult, ChatVariableLevel, Disposable, Event, EventEmitter, chat, commands } from 'vscode';
-import { DeferredPromise, asPromise, assertNoRpc, closeAllEditors, disposeAll } from '../utils';
+import { DeferredPromise, asPromise, assertNoRpc, closeAllEditors, delay, disposeAll } from '../utils';
 
 suite('chat', () => {
 
@@ -36,7 +36,6 @@ suite('chat', () => {
 		const participant = chat.createChatParticipant(id, (request, context, _progress, _token) => {
 			emitter.fire({ request, context });
 		});
-		participant.isDefault = true;
 		disposables.push(participant);
 		return emitter.event;
 	}
@@ -89,7 +88,6 @@ suite('chat', () => {
 		const participant = chat.createChatParticipant('api-test.participant', (_request, _context, _progress, _token) => {
 			return { metadata: { key: 'value' } };
 		});
-		participant.isDefault = true;
 		participant.followupProvider = {
 			provideFollowups(result, _context, _token) {
 				deferred.complete(result);
@@ -123,4 +121,33 @@ suite('chat', () => {
 		const request3 = await asPromise(onRequest2);
 		assert.strictEqual(request3.context.history.length, 2); // request + response = 2
 	});
+
+	test('title provider is called for first request', async () => {
+		let calls = 0;
+		const deferred = new DeferredPromise<void>();
+		const participant = chat.createChatParticipant('api-test.participant', (_request, _context, _progress, _token) => {
+			return { metadata: { key: 'value' } };
+		});
+		participant.titleProvider = {
+			provideChatTitle(_context, _token) {
+				calls++;
+				deferred.complete();
+				return 'title';
+			}
+		};
+		disposables.push(participant);
+
+		await commands.executeCommand('workbench.action.chat.newChat');
+		commands.executeCommand('workbench.action.chat.open', { query: '@participant /hello friend' });
+
+		// Wait for title provider to be called once
+		await deferred.p;
+		assert.strictEqual(calls, 1);
+
+		commands.executeCommand('workbench.action.chat.open', { query: '@participant /hello friend' });
+		await delay(500);
+
+		// Title provider was not called again
+		assert.strictEqual(calls, 1);
+	});
 });
diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/notebook.api.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/notebook.api.test.ts
index f9d8d6a82db..e4489090017 100644
--- a/extensions/vscode-api-tests/src/singlefolder-tests/notebook.api.test.ts
+++ b/extensions/vscode-api-tests/src/singlefolder-tests/notebook.api.test.ts
@@ -18,6 +18,10 @@ async function openRandomNotebookDocument() {
 	return vscode.workspace.openNotebookDocument(uri);
 }
 
+async function openUntitledNotebookDocument(data?: vscode.NotebookData) {
+	return vscode.workspace.openNotebookDocument('notebookCoreTest', data);
+}
+
 export async function saveAllFilesAndCloseAll() {
 	await saveAllEditors();
 	await closeAllEditors();
@@ -147,6 +151,7 @@ const apiTestSerializer: vscode.NotebookSerializer = {
 	teardown(async function () {
 		disposeAll(testDisposables);
 		testDisposables.length = 0;
+		await revertAllDirty();
 		await saveAllFilesAndCloseAll();
 	});
 
@@ -188,6 +193,27 @@ const apiTestSerializer: vscode.NotebookSerializer = {
 		assert.strictEqual(vscode.window.activeNotebookEditor!.notebook.uri.toString(), document.uri.toString());
 	});
 
+	test('Opening an utitled notebook without content will only open the editor when shown.', async function () {
+		const document = await openUntitledNotebookDocument();
+
+		assert.strictEqual(vscode.window.activeNotebookEditor, undefined);
+
+		// opening a cell-uri opens a notebook editor
+		await vscode.window.showNotebookDocument(document);
+
+		assert.strictEqual(!!vscode.window.activeNotebookEditor, true);
+		assert.strictEqual(vscode.window.activeNotebookEditor!.notebook.uri.toString(), document.uri.toString());
+	});
+
+	test('Opening an untitled notebook with content will open a dirty document.', async function () {
+		const language = 'python';
+		const cell = new vscode.NotebookCellData(vscode.NotebookCellKind.Code, '', language);
+		const data = new vscode.NotebookData([cell]);
+		const doc = await vscode.workspace.openNotebookDocument('jupyter-notebook', data);
+
+		assert.strictEqual(doc.isDirty, true);
+	});
+
 	test('Cannot open notebook from cell-uri with vscode.open-command', async function () {
 
 		const document = await openRandomNotebookDocument();
diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/workspace.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/workspace.test.ts
index 2eb115761d1..e5d9af5791e 100644
--- a/extensions/vscode-api-tests/src/singlefolder-tests/workspace.test.ts
+++ b/extensions/vscode-api-tests/src/singlefolder-tests/workspace.test.ts
@@ -619,6 +619,7 @@ suite('vscode API - workspace', () => {
 
 	test('findFiles2, exclude', () => {
 		return vscode.workspace.findFiles2('**/image.png', { exclude: '**/sub/**' }).then((res) => {
+			res.forEach(r => console.log(r.toString()));
 			assert.strictEqual(res.length, 1);
 		});
 	});
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_less.json b/extensions/vscode-colorize-tests/test/colorize-results/test_less.json
index 08d8b9f4fb5..a66224dd9e6 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_less.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_less.json
@@ -897,16 +897,16 @@
 	},
 	{
 		"c": " ",
-		"t": "source.css.less meta.property-list.less meta.property-value.less",
+		"t": "source.css.less meta.property-list.less meta.property-value.less variable.other.readwrite.less",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"dark_plus": "source.css variable: #9CDCFE",
+			"light_plus": "source.css variable: #E50000",
+			"dark_vs": "source.css variable: #9CDCFE",
+			"light_vs": "source.css variable: #E50000",
+			"hc_black": "source.css variable: #D4D4D4",
+			"dark_modern": "source.css variable: #9CDCFE",
+			"hc_light": "source.css variable: #264F78",
+			"light_modern": "source.css variable: #E50000"
 		}
 	},
 	{
diff --git a/extensions/yaml/cgmanifest.json b/extensions/yaml/cgmanifest.json
index c75a4e52f89..18882ead40a 100644
--- a/extensions/yaml/cgmanifest.json
+++ b/extensions/yaml/cgmanifest.json
@@ -6,7 +6,7 @@
 				"git": {
 					"name": "RedCMD/YAML-Syntax-Highlighter",
 					"repositoryUrl": "https://github.com/RedCMD/YAML-Syntax-Highlighter",
-					"commitHash": "60e2e6e24c63d5a703cb04577678a2e416edd956"
+					"commitHash": "d4dca9f38a654ebbb13c1b72b7881e3c5864a778"
 				}
 			},
 			"licenseDetail": [
@@ -21,7 +21,7 @@
 				"THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
 			],
 			"license": "MIT",
-			"version": "1.0.1"
+			"version": "1.1.1"
 		}
 	],
 	"version": 1
diff --git a/extensions/yaml/package.json b/extensions/yaml/package.json
index d19c507bdfe..2b0ee013964 100644
--- a/extensions/yaml/package.json
+++ b/extensions/yaml/package.json
@@ -57,25 +57,31 @@
         "path": "./syntaxes/yaml.tmLanguage.json"
       },
       {
-				"scopeName": "source.yaml.1.3",
-				"path": "./syntaxes/yaml-1.3.tmLanguage.json"
-			},
-			{
-				"scopeName": "source.yaml.1.2",
-				"path": "./syntaxes/yaml-1.2.tmLanguage.json"
-			},
-			{
-				"scopeName": "source.yaml.1.1",
-				"path": "./syntaxes/yaml-1.1.tmLanguage.json"
-			},
-			{
-				"scopeName": "source.yaml.1.0",
-				"path": "./syntaxes/yaml-1.0.tmLanguage.json"
-			},
+        "scopeName": "source.yaml.1.3",
+        "path": "./syntaxes/yaml-1.3.tmLanguage.json"
+      },
+      {
+        "scopeName": "source.yaml.1.2",
+        "path": "./syntaxes/yaml-1.2.tmLanguage.json"
+      },
+      {
+        "scopeName": "source.yaml.1.1",
+        "path": "./syntaxes/yaml-1.1.tmLanguage.json"
+      },
+      {
+        "scopeName": "source.yaml.1.0",
+        "path": "./syntaxes/yaml-1.0.tmLanguage.json"
+      },
       {
         "language": "yaml",
         "scopeName": "source.yaml",
-        "path": "./syntaxes/yaml.tmLanguage.json"
+        "path": "./syntaxes/yaml.tmLanguage.json",
+        "unbalancedBracketScopes": [
+          "invalid.illegal",
+          "meta.scalar.yaml",
+          "storage.type.tag.shorthand.yaml",
+          "keyword.control.flow"
+        ]
       }
     ],
     "configurationDefaults": {
diff --git a/extensions/yaml/syntaxes/yaml-1.0.tmLanguage.json b/extensions/yaml/syntaxes/yaml-1.0.tmLanguage.json
index 6ca3d9bf1b8..7ae77112860 100644
--- a/extensions/yaml/syntaxes/yaml-1.0.tmLanguage.json
+++ b/extensions/yaml/syntaxes/yaml-1.0.tmLanguage.json
@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/RedCMD/YAML-Syntax-Highlighter/commit/60e2e6e24c63d5a703cb04577678a2e416edd956",
+	"version": "https://github.com/RedCMD/YAML-Syntax-Highlighter/commit/dfd7e5f4f71f9695c5d8697ca57f81240165aa04",
 	"name": "YAML 1.0",
 	"scopeName": "source.yaml.1.0",
 	"comment": "https://yaml.org/spec/1.0/",
@@ -500,7 +500,8 @@
 		},
 		"block-map-value": {
 			"comment": "https://yaml.org/spec/1.2.2/#rule-c-l-block-map-implicit-value",
-			"begin": ":(?=[\\x{85 2028 2029}\r\n\t ])",
+			"//": "Assumming 3rd party preprocessing variables `{{...}}` turn into valid map-keys when inside a block-mapping",
+			"begin": ":(?=[\\x{85 2028 2029}\r\n\t ])|(?<=}})(?=[\t ]++#|[\t ]*+$)",
 			"while": "\\G(?![?:!\"'0-9A-Za-z$()+./;<=\\\\^_~\\[{\\x{A0}-\\x{D7FF}\\x{E000}-\\x{FFFD}\\x{010000}-\\x{10FFFF}&&[^\\x{2028 2029}]]|-[^\\x{85 2028 2029}\r\n\t ])",
 			"beginCaptures": {
 				"0": {
diff --git a/extensions/yaml/syntaxes/yaml-1.1.tmLanguage.json b/extensions/yaml/syntaxes/yaml-1.1.tmLanguage.json
index 3b7974a1a5d..57a96ac1e4f 100644
--- a/extensions/yaml/syntaxes/yaml-1.1.tmLanguage.json
+++ b/extensions/yaml/syntaxes/yaml-1.1.tmLanguage.json
@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/RedCMD/YAML-Syntax-Highlighter/commit/60e2e6e24c63d5a703cb04577678a2e416edd956",
+	"version": "https://github.com/RedCMD/YAML-Syntax-Highlighter/commit/dfd7e5f4f71f9695c5d8697ca57f81240165aa04",
 	"name": "YAML 1.1",
 	"scopeName": "source.yaml.1.1",
 	"comment": "https://yaml.org/spec/1.1/",
@@ -641,7 +641,8 @@
 		},
 		"block-map-value": {
 			"comment": "https://yaml.org/spec/1.2.2/#rule-c-l-block-map-implicit-value",
-			"begin": ":(?=[\\x{85 2028 2029}\r\n\t ])",
+			"//": "Assumming 3rd party preprocessing variables `{{...}}` turn into valid map-keys when inside a block-mapping",
+			"begin": ":(?=[\\x{85 2028 2029}\r\n\t ])|(?<=}})(?=[\t ]++#|[\t ]*+$)",
 			"while": "\\G(?![?:!\"'0-9A-Za-z$()+./;<=\\\\^_~\\[{\\x{A0}-\\x{D7FF}\\x{E000}-\\x{FFFD}\\x{010000}-\\x{10FFFF}&&[^\\x{2028 2029}]]|-[^\\x{85 2028 2029}\r\n\t ])",
 			"beginCaptures": {
 				"0": {
diff --git a/extensions/yaml/syntaxes/yaml-1.2.tmLanguage.json b/extensions/yaml/syntaxes/yaml-1.2.tmLanguage.json
index 711f5c8e422..965b6040816 100644
--- a/extensions/yaml/syntaxes/yaml-1.2.tmLanguage.json
+++ b/extensions/yaml/syntaxes/yaml-1.2.tmLanguage.json
@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/RedCMD/YAML-Syntax-Highlighter/commit/60e2e6e24c63d5a703cb04577678a2e416edd956",
+	"version": "https://github.com/RedCMD/YAML-Syntax-Highlighter/commit/d4dca9f38a654ebbb13c1b72b7881e3c5864a778",
 	"name": "YAML 1.2",
 	"scopeName": "source.yaml.1.2",
 	"comment": "https://yaml.org/spec/1.2.2",
@@ -37,6 +37,7 @@
 					]
 				},
 				{
+					"comment": "For when YAML is embedded inside a Markdown code-block",
 					"begin": "\\G",
 					"while": "\\G",
 					"name": "meta.stream.yaml",
@@ -633,7 +634,8 @@
 		},
 		"block-map-value": {
 			"comment": "https://yaml.org/spec/1.2.2/#rule-c-l-block-map-implicit-value",
-			"begin": ":(?=[\r\n\t ])",
+			"//": "Assumming 3rd party preprocessing variables `{{...}}` turn into valid map-keys when inside a block-mapping",
+			"begin": ":(?=[\r\n\t ])|(?<=}})(?=[\t ]++#|[\t ]*+$)",
 			"while": "\\G(?![?:!\"'0-9A-Za-z$()+./;<=\\\\^_~\\[{\\x{85}\\x{A0}-\\x{D7FF}\\x{E000}-\\x{FFFD}\\x{010000}-\\x{10FFFF}&&[^\\x{FEFF}]]|-[^\r\n\t ])",
 			"beginCaptures": {
 				"0": {
diff --git a/extensions/yaml/syntaxes/yaml.tmLanguage.json b/extensions/yaml/syntaxes/yaml.tmLanguage.json
index 8be76d7a3c5..3a64fbd850e 100644
--- a/extensions/yaml/syntaxes/yaml.tmLanguage.json
+++ b/extensions/yaml/syntaxes/yaml.tmLanguage.json
@@ -4,10 +4,21 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/RedCMD/YAML-Syntax-Highlighter/commit/274009903e20ac6dc37ba5763fb853744e28c9b2",
+	"version": "https://github.com/RedCMD/YAML-Syntax-Highlighter/commit/d4dca9f38a654ebbb13c1b72b7881e3c5864a778",
 	"name": "YAML Ain't Markup Language",
 	"scopeName": "source.yaml",
 	"patterns": [
+		{
+			"comment": "Support legacy FrontMatter integration",
+			"//": "https://github.com/microsoft/vscode-markdown-tm-grammar/pull/162",
+			"begin": "(?<=^-{3,}\\s*+)\\G$",
+			"while": "^(?! {3,0}-{3,}[ \t]*+$|[ \t]*+\\.{3}$)",
+			"patterns": [
+				{
+					"include": "source.yaml.1.2"
+				}
+			]
+		},
 		{
 			"comment": "Default to YAML version 1.2",
 			"include": "source.yaml.1.2"
diff --git a/migrate.mjs b/migrate.mjs
new file mode 100644
index 00000000000..95b0e3d6434
--- /dev/null
+++ b/migrate.mjs
@@ -0,0 +1,364 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+//@ts-check
+
+// *****************************************************************
+// *                                                               *
+// *               AMD-TO-ESM MIGRATION SCRIPT                     *
+// *                                                               *
+// *****************************************************************
+
+import { readFileSync, writeFileSync, unlinkSync } from 'node:fs';
+import { join, extname, dirname, relative } from 'node:path';
+import { preProcessFile } from 'typescript';
+import { existsSync, mkdirSync, readdirSync, statSync } from 'fs';
+import { fileURLToPath } from 'node:url';
+
+// @ts-expect-error
+import watch from './build/lib/watch/index.js';
+
+const enableWatching = !process.argv.includes('--disable-watch');
+const enableInPlace = process.argv.includes('--enable-in-place');
+const esmToAmd = process.argv.includes('--enable-esm-to-amd');
+const amdToEsm = !esmToAmd;
+
+const srcFolder = fileURLToPath(new URL('src', import.meta.url));
+const dstFolder = fileURLToPath(new URL(enableInPlace ? 'src' : 'src2', import.meta.url));
+
+const binaryFileExtensions = new Set([
+	'.svg', '.ttf', '.png', '.sh', '.html', '.json', '.zsh', '.scpt', '.mp3', '.fish', '.ps1', '.psm1', '.md', '.txt', '.zip', '.pdf', '.qwoff', '.jxs', '.tst', '.wuff', '.less', '.utf16le', '.snap', '.actual', '.tsx', '.scm'
+]);
+
+function migrate() {
+	console.log(`~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~`);
+	console.log(`STARTING ${amdToEsm ? 'AMD->ESM' : 'ESM->AMD'} MIGRATION of ${enableInPlace ? 'src in-place' : 'src to src2'}.`);
+
+	// installing watcher quickly to avoid missing early events
+	const watchSrc = enableWatching ? watch('src/**', { base: 'src', readDelay: 200 }) : undefined;
+
+	/** @type {string[]} */
+	const files = [];
+	readdir(srcFolder, files);
+
+	for (const filePath of files) {
+		const fileContents = readFileSync(filePath);
+		migrateOne(filePath, fileContents);
+	}
+
+	if (amdToEsm) {
+		writeFileSync(join(dstFolder, 'package.json'), `{"type": "module"}`);
+	} else {
+		unlinkSync(join(dstFolder, 'package.json'));
+	}
+
+	if (!enableInPlace) {
+		writeFileSync(join(dstFolder, '.gitignore'), `*`);
+	}
+
+	console.log(`~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~`);
+	console.log(`COMPLETED ${amdToEsm ? 'AMD->ESM' : 'ESM->AMD'} MIGRATION of ${enableInPlace ? 'src in-place' : 'src to src2'}. You can now launch yarn watch-esm or yarn watch-client-esm`);
+	if (amdToEsm) {
+		console.log(`Make sure to set the environment variable VSCODE_BUILD_ESM to a string of value 'true' if you want to build VS Code`);
+	}
+
+	if (watchSrc) {
+		console.log(`WATCHING src for changes...`);
+
+		watchSrc.on('data', (e) => {
+			migrateOne(e.path, e.contents);
+			console.log(`Handled change event for ${e.path}.`);
+		});
+	}
+}
+
+/**
+ * @param filePath
+ * @param fileContents
+ */
+function migrateOne(filePath, fileContents) {
+	const fileExtension = extname(filePath);
+
+	if (fileExtension === '.ts') {
+		migrateTS(filePath, fileContents.toString());
+	} else if (filePath.endsWith('tsconfig.base.json')) {
+		const opts = JSON.parse(fileContents.toString());
+		if (amdToEsm) {
+			opts.compilerOptions.module = 'es2022';
+			opts.compilerOptions.allowSyntheticDefaultImports = true;
+		} else {
+			opts.compilerOptions.module = 'amd';
+			delete opts.compilerOptions.allowSyntheticDefaultImports;
+		}
+		writeDestFile(filePath, JSON.stringify(opts, null, '\t'));
+	} else if (fileExtension === '.js' || fileExtension === '.cjs' || fileExtension === '.mjs' || fileExtension === '.css' || binaryFileExtensions.has(fileExtension)) {
+		writeDestFile(filePath, fileContents);
+	} else {
+		console.log(`ignoring ${filePath}`);
+	}
+}
+
+/**
+ * @param fileContents
+ * @typedef {{pos:number;end:number;}} Import
+ * @return
+ */
+function discoverImports(fileContents) {
+	const info = preProcessFile(fileContents);
+	const search = /export .* from ['"]([^'"]+)['"]/g;
+	/** typedef {Import[]} */
+	let result = [];
+	do {
+		const m = search.exec(fileContents);
+		if (!m) {
+			break;
+		}
+		const end = m.index + m[0].length - 2;
+		const pos = end - m[1].length;
+		result.push({ pos, end });
+	} while (true);
+
+	result = result.concat(info.importedFiles);
+
+	result.sort((a, b) => {
+		return a.pos - b.pos;
+	});
+	for (let i = 1; i < result.length; i++) {
+		const prev = result[i - 1];
+		const curr = result[i];
+		if (prev.pos === curr.pos) {
+			result.splice(i, 1);
+			i--;
+		}
+	}
+	return result;
+}
+
+/**
+ * @param filePath
+ * @param fileContents
+ */
+function migrateTS(filePath, fileContents) {
+	if (filePath.endsWith('.d.ts')) {
+		return writeDestFile(filePath, fileContents);
+	}
+
+	const imports = discoverImports(fileContents);
+	/** @type {Replacement[]} */
+	const replacements = [];
+	for (let i = imports.length - 1; i >= 0; i--) {
+		const pos = imports[i].pos + 1;
+		const end = imports[i].end + 1;
+		const importedFilename = fileContents.substring(pos, end);
+
+		/** @type {string|undefined} */
+		let importedFilepath = undefined;
+		if (amdToEsm) {
+			if (/^vs\/css!/.test(importedFilename)) {
+				importedFilepath = importedFilename.substr('vs/css!'.length) + '.css';
+			} else {
+				importedFilepath = importedFilename;
+			}
+		} else {
+			if (importedFilename.endsWith('.css')) {
+				importedFilepath = `vs/css!${importedFilename.substr(0, importedFilename.length - 4)}`;
+			} else if (importedFilename.endsWith('.js')) {
+				importedFilepath = importedFilename.substr(0, importedFilename.length - 3);
+			}
+		}
+
+		if (typeof importedFilepath !== 'string') {
+			continue;
+		}
+
+		/** @type {boolean} */
+		let isRelativeImport;
+		if (amdToEsm) {
+			if (/(^\.\/)|(^\.\.\/)/.test(importedFilepath)) {
+				importedFilepath = join(dirname(filePath), importedFilepath);
+				isRelativeImport = true;
+			} else if (/^vs\//.test(importedFilepath)) {
+				importedFilepath = join(srcFolder, importedFilepath);
+				isRelativeImport = true;
+			} else {
+				importedFilepath = importedFilepath;
+				isRelativeImport = false;
+			}
+		} else {
+			importedFilepath = importedFilepath;
+			isRelativeImport = false;
+		}
+
+		/** @type {string} */
+		let replacementImport;
+
+		if (isRelativeImport) {
+			replacementImport = generateRelativeImport(filePath, importedFilepath);
+		} else {
+			replacementImport = importedFilepath;
+		}
+
+		replacements.push({ pos, end, text: replacementImport });
+	}
+
+	fileContents = applyReplacements(fileContents, replacements);
+
+	writeDestFile(filePath, fileContents);
+}
+
+/**
+ * @param filePath
+ * @param importedFilepath
+ */
+function generateRelativeImport(filePath, importedFilepath) {
+	/** @type {string} */
+	let relativePath;
+	// See https://github.com/microsoft/TypeScript/issues/16577#issuecomment-754941937
+	if (!importedFilepath.endsWith('.css') && !importedFilepath.endsWith('.cjs')) {
+		importedFilepath = `${importedFilepath}.js`;
+	}
+	relativePath = relative(dirname(filePath), `${importedFilepath}`);
+	relativePath = relativePath.replace(/\\/g, '/');
+	if (!/(^\.\/)|(^\.\.\/)/.test(relativePath)) {
+		relativePath = './' + relativePath;
+	}
+	return relativePath;
+}
+
+/** @typedef {{pos:number;end:number;text:string;}} Replacement */
+
+/**
+ * @param str
+ * @param replacements
+ */
+function applyReplacements(str, replacements) {
+	replacements.sort((a, b) => {
+		return a.pos - b.pos;
+	});
+
+	/** @type {string[]} */
+	const result = [];
+	let lastEnd = 0;
+	for (const replacement of replacements) {
+		const { pos, end, text } = replacement;
+		result.push(str.substring(lastEnd, pos));
+		result.push(text);
+		lastEnd = end;
+	}
+	result.push(str.substring(lastEnd, str.length));
+	return result.join('');
+}
+
+/**
+ * @param srcFilePath
+ * @param fileContents
+ */
+function writeDestFile(srcFilePath, fileContents) {
+	const destFilePath = srcFilePath.replace(srcFolder, dstFolder);
+	ensureDir(dirname(destFilePath));
+
+	if (/(\.ts$)|(\.js$)|(\.html$)/.test(destFilePath)) {
+		fileContents = toggleComments(fileContents);
+	}
+
+	/** @type {Buffer | undefined} */
+	let existingFileContents = undefined;
+	try {
+		existingFileContents = readFileSync(destFilePath);
+	} catch (err) { }
+	if (!buffersAreEqual(existingFileContents, fileContents)) {
+		writeFileSync(destFilePath, fileContents);
+	}
+
+	/**
+	 * @param fileContents
+	 */
+	function toggleComments(fileContents) {
+		const lines = String(fileContents).split(/\r\n|\r|\n/);
+		let mode = 0;
+		let didChange = false;
+		for (let i = 0; i < lines.length; i++) {
+			const line = lines[i];
+			if (mode === 0) {
+				if (amdToEsm ? /\/\/ ESM-comment-begin/.test(line) : /\/\/ ESM-uncomment-begin/.test(line)) {
+					mode = 1;
+					continue;
+				}
+				if (amdToEsm ? /\/\/ ESM-uncomment-begin/.test(line) : /\/\/ ESM-comment-begin/.test(line)) {
+					mode = 2;
+					continue;
+				}
+				continue;
+			}
+
+			if (mode === 1) {
+				if (amdToEsm ? /\/\/ ESM-comment-end/.test(line) : /\/\/ ESM-uncomment-end/.test(line)) {
+					mode = 0;
+					continue;
+				}
+				didChange = true;
+				lines[i] = line.replace(/^\s*/, (match) => match + '// ');
+				continue;
+			}
+
+			if (mode === 2) {
+				if (amdToEsm ? /\/\/ ESM-uncomment-end/.test(line) : /\/\/ ESM-comment-end/.test(line)) {
+					mode = 0;
+					continue;
+				}
+				didChange = true;
+				lines[i] = line.replace(/^(\s*)\/\/ ?/, function (_, indent) {
+					return indent;
+				});
+			}
+		}
+
+		if (didChange) {
+			return lines.join('\n');
+		}
+		return fileContents;
+	}
+}
+
+/**
+ * @param existingFileContents
+ * @param fileContents
+ */
+function buffersAreEqual(existingFileContents, fileContents) {
+	if (!existingFileContents) {
+		return false;
+	}
+	if (typeof fileContents === 'string') {
+		fileContents = Buffer.from(fileContents);
+	}
+	return existingFileContents.equals(fileContents);
+}
+
+const ensureDirCache = new Set();
+function ensureDir(dirPath) {
+	if (ensureDirCache.has(dirPath)) {
+		return;
+	}
+	ensureDirCache.add(dirPath);
+	ensureDir(dirname(dirPath));
+	if (!existsSync(dirPath)) {
+		mkdirSync(dirPath);
+	}
+}
+
+function readdir(dirPath, result) {
+	const entries = readdirSync(dirPath);
+	for (const entry of entries) {
+		const entryPath = join(dirPath, entry);
+		const stat = statSync(entryPath);
+		if (stat.isDirectory()) {
+			readdir(join(dirPath, entry), result);
+		} else {
+			result.push(entryPath);
+		}
+	}
+}
+
+migrate();
diff --git a/package.json b/package.json
index f7b8602e902..1f022eaa7d6 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "code-oss-dev",
-  "version": "1.92.0",
-  "distro": "60cee48df7b3ff722654e8f735255b838a86e70b",
+  "version": "1.93.0",
+  "distro": "2560b0e8d341a0b6734d28ef71b08e1920ff2501",
   "author": {
     "name": "Microsoft Corporation"
   },
@@ -11,13 +11,17 @@
   "scripts": {
     "test": "echo Please run any of the test scripts from the scripts folder.",
     "test-browser": "npx playwright install && node test/unit/browser/index.js",
+    "test-browser-esm": "npx playwright install && node test/unit/browser/index.esm.js",
     "test-browser-no-install": "node test/unit/browser/index.js",
+    "test-browser-esm-no-install": "node test/unit/browser/index.esm.js",
     "test-node": "mocha test/unit/node/index.js --delay --ui=tdd --timeout=5000 --exit",
+    "test-node-esm": "mocha test/unit/node/index.mjs --delay --ui=tdd --timeout=5000 --exit",
     "test-extension": "vscode-test",
     "preinstall": "node build/npm/preinstall.js",
     "postinstall": "node build/npm/postinstall.js",
     "compile": "node --max-old-space-size=4095 ./node_modules/gulp/bin/gulp.js compile",
     "watch": "npm-run-all -lp watch-client watch-extensions",
+    "watch-esm": "npm-run-all -lp watch-client-esm watch-extensions",
     "watchd": "deemon yarn watch",
     "watch-webd": "deemon yarn watch-web",
     "kill-watchd": "deemon --kill yarn watch",
@@ -25,6 +29,7 @@
     "restart-watchd": "deemon --restart yarn watch",
     "restart-watch-webd": "deemon --restart yarn watch-web",
     "watch-client": "node --max-old-space-size=4095 ./node_modules/gulp/bin/gulp.js watch-client",
+    "watch-client-esm": "node --max-old-space-size=4095 ./node_modules/gulp/bin/gulp.js watch-client-esm",
     "watch-clientd": "deemon yarn watch-client",
     "kill-watch-clientd": "deemon --kill yarn watch-client",
     "watch-extensions": "node --max-old-space-size=8190 ./node_modules/gulp/bin/gulp.js watch-extensions watch-extension-media",
@@ -79,33 +84,35 @@
     "@vscode/deviceid": "^0.1.1",
     "@vscode/iconv-lite-umd": "0.7.0",
     "@vscode/policy-watcher": "^1.1.4",
-    "@vscode/proxy-agent": "^0.22.0",
+    "@vscode/proxy-agent": "^0.23.0",
     "@vscode/ripgrep": "^1.15.9",
     "@vscode/spdlog": "^0.15.0",
     "@vscode/sqlite3": "5.1.6-vscode",
     "@vscode/sudo-prompt": "9.3.1",
+    "@vscode/tree-sitter-wasm": "^0.0.2",
     "@vscode/vscode-languagedetection": "1.0.21",
     "@vscode/windows-mutex": "^0.5.0",
     "@vscode/windows-process-tree": "^0.6.0",
     "@vscode/windows-registry": "^1.1.0",
-    "@xterm/addon-clipboard": "0.2.0-beta.34",
-    "@xterm/addon-image": "0.9.0-beta.51",
-    "@xterm/addon-search": "0.16.0-beta.51",
-    "@xterm/addon-serialize": "0.14.0-beta.51",
-    "@xterm/addon-unicode11": "0.9.0-beta.51",
-    "@xterm/addon-webgl": "0.19.0-beta.51",
-    "@xterm/headless": "5.6.0-beta.51",
-    "@xterm/xterm": "5.6.0-beta.51",
+    "@xterm/addon-clipboard": "0.2.0-beta.35",
+    "@xterm/addon-image": "0.9.0-beta.52",
+    "@xterm/addon-search": "0.16.0-beta.52",
+    "@xterm/addon-serialize": "0.14.0-beta.52",
+    "@xterm/addon-unicode11": "0.9.0-beta.52",
+    "@xterm/addon-webgl": "0.19.0-beta.52",
+    "@xterm/headless": "5.6.0-beta.52",
+    "@xterm/xterm": "5.6.0-beta.52",
     "he": "^1.2.0",
+    "http-proxy": "^1.18.1",
     "http-proxy-agent": "^7.0.0",
     "https-proxy-agent": "^7.0.2",
     "jschardet": "3.1.3",
-    "kerberos": "2.1.1-alpha.0",
+    "kerberos": "2.1.1",
     "minimist": "^1.2.6",
     "native-is-elevated": "0.7.0",
     "native-keymap": "^3.3.5",
     "native-watchdog": "^1.4.1",
-    "node-pty": "1.1.0-beta11",
+    "node-pty": "1.1.0-beta21",
     "open": "^8.4.2",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
@@ -114,17 +121,18 @@
     "v8-inspect-profiler": "^0.1.1",
     "vscode-oniguruma": "1.7.0",
     "vscode-regexpp": "^3.1.0",
-    "vscode-textmate": "9.0.0",
+    "vscode-textmate": "9.1.0",
     "yauzl": "^3.0.0",
     "yazl": "^2.4.3"
   },
   "devDependencies": {
-    "@playwright/test": "^1.45.0",
+    "@playwright/test": "^1.46.1",
     "@swc/core": "1.3.62",
     "@types/cookie": "^0.3.3",
     "@types/debug": "^4.1.5",
     "@types/gulp-svgmin": "^1.2.1",
     "@types/he": "^1.2.0",
+    "@types/http-proxy": "^1.17.9",
     "@types/http-proxy-agent": "^2.0.1",
     "@types/js-yaml": "^4.0.5",
     "@types/kerberos": "^1.1.2",
@@ -165,7 +173,7 @@
     "cssnano": "^6.0.3",
     "debounce": "^1.0.0",
     "deemon": "^1.8.0",
-    "electron": "30.1.2",
+    "electron": "30.4.0",
     "eslint": "8.36.0",
     "eslint-plugin-header": "3.1.1",
     "eslint-plugin-jsdoc": "^46.5.0",
@@ -231,7 +239,8 @@
     "ts-loader": "^9.4.2",
     "ts-node": "^10.9.1",
     "tsec": "0.2.7",
-    "typescript": "^5.6.0-dev.20240729",
+    "tslib": "^2.6.3",
+    "typescript": "^5.7.0-dev.20240826",
     "util": "^0.12.4",
     "vscode-nls-dev": "^3.3.1",
     "webpack": "^5.91.0",
diff --git a/product.json b/product.json
index 0742ff8495e..821ade3f60d 100644
--- a/product.json
+++ b/product.json
@@ -55,8 +55,8 @@
 		},
 		{
 			"name": "ms-vscode.js-debug",
-			"version": "1.92.0",
-			"sha256": "e5d0a74728292423631f79d076ecb2bc129f9637bcbc2529e48a0fd53baa69cc",
+			"version": "1.93.0",
+			"sha256": "9339cb8e6b77f554df54d79e71f533279cb76b0f9b04c207f633bfd507442b6a",
 			"repo": "https://github.com/microsoft/vscode-js-debug",
 			"metadata": {
 				"id": "25629058-ddac-4e17-abba-74678e126c5d",
@@ -220,6 +220,16 @@
 				},
 				"publisherDisplayName": "Quarto"
 			}
+		},
+		{
+			"name": "rstudio.rstudio-workbench",
+			"version": "1.5.7",
+			"s3Bucket": "rsw-vscode-extension",
+			"type": "reh-web",
+			"sha256": "9ac536b65c91fd86274fe2cbb2ea2c381e13ba309027044bc98438730c4fa66c",
+			"metadata": {
+				"publisherDisplayName": "Posit PBC"
+			}
 		}
 	],
 	"extensionsGallery": {
diff --git a/remote/.yarnrc b/remote/.yarnrc
index 8d07643c18e..748c8d4a77a 100644
--- a/remote/.yarnrc
+++ b/remote/.yarnrc
@@ -1,5 +1,5 @@
 disturl "https://nodejs.org/dist"
-target "20.14.0"
-ms_build_id "282653"
+target "20.15.1"
+ms_build_id "287145"
 runtime "node"
 build_from_source "true"
diff --git a/remote/package.json b/remote/package.json
index 48b849c5928..74f5449bc0e 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -8,36 +8,46 @@
     "@parcel/watcher": "2.1.0",
     "@vscode/deviceid": "^0.1.1",
     "@vscode/iconv-lite-umd": "0.7.0",
-    "@vscode/proxy-agent": "^0.22.0",
+    "@vscode/proxy-agent": "^0.23.0",
     "@vscode/ripgrep": "^1.15.9",
     "@vscode/spdlog": "^0.15.0",
+    "@vscode/tree-sitter-wasm": "^0.0.2",
     "@vscode/vscode-languagedetection": "1.0.21",
     "@vscode/windows-process-tree": "^0.6.0",
     "@vscode/windows-registry": "^1.1.0",
-    "@xterm/addon-clipboard": "0.2.0-beta.34",
-    "@xterm/addon-image": "0.9.0-beta.51",
-    "@xterm/addon-search": "0.16.0-beta.51",
-    "@xterm/addon-serialize": "0.14.0-beta.51",
-    "@xterm/addon-unicode11": "0.9.0-beta.51",
-    "@xterm/addon-webgl": "0.19.0-beta.51",
-    "@xterm/headless": "5.6.0-beta.51",
-    "@xterm/xterm": "5.6.0-beta.51",
+    "@xterm/addon-clipboard": "0.2.0-beta.35",
+    "@xterm/addon-image": "0.9.0-beta.52",
+    "@xterm/addon-search": "0.16.0-beta.52",
+    "@xterm/addon-serialize": "0.14.0-beta.52",
+    "@xterm/addon-unicode11": "0.9.0-beta.52",
+    "@xterm/addon-webgl": "0.19.0-beta.52",
+    "@xterm/headless": "5.6.0-beta.52",
+    "@xterm/xterm": "5.6.0-beta.52",
     "cookie": "^0.4.0",
+    "http-proxy": "^1.18.1",
     "http-proxy-agent": "^7.0.0",
     "https-proxy-agent": "^7.0.2",
     "jschardet": "3.1.3",
-    "kerberos": "2.1.1-alpha.0",
+    "kerberos": "2.1.1",
     "minimist": "^1.2.6",
     "native-watchdog": "^1.4.1",
-    "node-pty": "1.1.0-beta11",
+    "node-pty": "1.1.0-beta21",
     "tas-client-umd": "0.2.0",
     "vscode-oniguruma": "1.7.0",
     "vscode-regexpp": "^3.1.0",
-    "vscode-textmate": "9.0.0",
+    "vscode-textmate": "9.1.0",
     "yauzl": "^3.0.0",
     "yazl": "^2.4.3"
   },
+  "overrides": {
+    "micromatch": "^4.0.6",
+    "braces": "^3.0.3",
+    "follow-redirects": "^1.15.4"
+  },
   "resolutions": {
-    "node-gyp-build": "4.8.1"
+    "micromatch": "^4.0.6",
+    "node-gyp-build": "4.8.1",
+    "braces": "^3.0.3",
+    "follow-redirects": "^1.15.4"
   }
 }
diff --git a/remote/reh-web/package.json b/remote/reh-web/package.json
index 2ad7214361e..14ebf7b1bc2 100644
--- a/remote/reh-web/package.json
+++ b/remote/reh-web/package.json
@@ -8,41 +8,51 @@
 		"@parcel/watcher": "2.1.0",
 		"@vscode/deviceid": "^0.1.1",
 		"@vscode/iconv-lite-umd": "0.7.0",
-		"@vscode/proxy-agent": "^0.22.0",
+		"@vscode/proxy-agent": "^0.23.0",
 		"@vscode/ripgrep": "^1.15.9",
 		"@vscode/spdlog": "^0.15.0",
+		"@vscode/tree-sitter-wasm": "^0.0.2",
 		"@vscode/vscode-languagedetection": "1.0.21",
 		"@vscode/windows-process-tree": "^0.6.0",
 		"@vscode/windows-registry": "^1.1.0",
-		"@xterm/addon-clipboard": "0.2.0-beta.34",
-		"@xterm/addon-image": "0.9.0-beta.51",
-		"@xterm/addon-search": "0.16.0-beta.51",
-		"@xterm/addon-serialize": "0.14.0-beta.51",
-		"@xterm/addon-unicode11": "0.9.0-beta.51",
-		"@xterm/addon-webgl": "0.19.0-beta.51",
-		"@xterm/headless": "5.6.0-beta.51",
-		"@xterm/xterm": "5.6.0-beta.51",
+		"@xterm/addon-clipboard": "0.2.0-beta.35",
+		"@xterm/addon-image": "0.9.0-beta.52",
+		"@xterm/addon-search": "0.16.0-beta.52",
+		"@xterm/addon-serialize": "0.14.0-beta.52",
+		"@xterm/addon-unicode11": "0.9.0-beta.52",
+		"@xterm/addon-webgl": "0.19.0-beta.52",
+		"@xterm/headless": "5.6.0-beta.52",
+		"@xterm/xterm": "5.6.0-beta.52",
 		"cookie": "^0.4.0",
 		"he": "^1.2.0",
+		"http-proxy": "^1.18.1",
 		"http-proxy-agent": "^7.0.0",
 		"https-proxy-agent": "^7.0.2",
 		"jschardet": "3.1.3",
-		"kerberos": "2.1.1-alpha.0",
+		"kerberos": "2.1.1",
 		"minimist": "^1.2.6",
 		"native-watchdog": "^1.4.1",
-		"node-pty": "1.1.0-beta11",
+		"node-pty": "1.1.0-beta21",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"react-window": "^1.8.8",
 		"tas-client-umd": "0.2.0",
 		"vscode-oniguruma": "1.7.0",
 		"vscode-regexpp": "^3.1.0",
-		"vscode-textmate": "9.0.0",
+		"vscode-textmate": "9.1.0",
 		"yauzl": "^3.0.0",
 		"yazl": "^2.4.3"
 	},
+	"overrides": {
+		"micromatch": "^4.0.6",
+		"braces": "^3.0.3",
+		"follow-redirects": "^1.15.4"
+	},
 	"resolutions": {
-		"node-gyp-build": "4.8.1"
+		"micromatch": "^4.0.6",
+		"node-gyp-build": "4.8.1",
+		"braces": "^3.0.3",
+		"follow-redirects": "^1.15.4"
 	},
 	"customEntryPoints": {
 		"react": "umd/react.production.min.js",
diff --git a/remote/reh-web/yarn.lock b/remote/reh-web/yarn.lock
index 02dedb500b5..54d22396454 100644
--- a/remote/reh-web/yarn.lock
+++ b/remote/reh-web/yarn.lock
@@ -73,10 +73,10 @@
   resolved "https://registry.yarnpkg.com/@vscode/iconv-lite-umd/-/iconv-lite-umd-0.7.0.tgz#d2f1e0664ee6036408f9743fee264ea0699b0e48"
   integrity sha512-bRRFxLfg5dtAyl5XyiVWz/ZBPahpOpPrNYnnHpOpUZvam4tKH35wdhP4Kj6PbM0+KdliOsPzbGWpkxcdpNB/sg==
 
-"@vscode/proxy-agent@^0.22.0":
-  version "0.22.0"
-  resolved "https://registry.yarnpkg.com/@vscode/proxy-agent/-/proxy-agent-0.22.0.tgz#bf571509d77c02c684be8c8526b7d0ac238c25cb"
-  integrity sha512-TQrv456pbrjmD6G+iOoXE1Mflm+8Ic/Kny4QU7ioiYe2+0HisvqzJM/CUa3Am5SWrNjMbntTHISjgmSaSlorrA==
+"@vscode/proxy-agent@^0.23.0":
+  version "0.23.0"
+  resolved "https://registry.yarnpkg.com/@vscode/proxy-agent/-/proxy-agent-0.23.0.tgz#1cdcf0b72c2180d705d4e304b807d9594845c90f"
+  integrity sha512-6lgxRrzURdWwBkk6TaB0+EYYjIWQXxry6GlVO0toBN8amIyVd3I7hLPKU9Xf+SOrLIrbdU0CLkmTOBHpPJLf/g==
   dependencies:
     "@tootallnate/once" "^3.0.0"
     agent-base "^7.0.1"
@@ -105,6 +105,11 @@
     mkdirp "^1.0.4"
     node-addon-api "7.1.0"
 
+"@vscode/tree-sitter-wasm@^0.0.2":
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/@vscode/tree-sitter-wasm/-/tree-sitter-wasm-0.0.2.tgz#da21541d343be69bb263e9380d165e3b164ec1f0"
+  integrity sha512-N57MR/kt4jR0H/TXeDsVYeJmvvUiK7avow0fjy+/EeKcyNBJcM2BFhj4XOAaaMbhGsOcIeSvJFouRWctXI7sKw==
+
 "@vscode/vscode-languagedetection@1.0.21":
   version "1.0.21"
   resolved "https://registry.yarnpkg.com/@vscode/vscode-languagedetection/-/vscode-languagedetection-1.0.21.tgz#89b48f293f6aa3341bb888c1118d16ff13b032d3"
@@ -129,47 +134,47 @@
   resolved "https://registry.yarnpkg.com/@vscode/windows-registry/-/windows-registry-1.1.0.tgz#03dace7c29c46f658588b9885b9580e453ad21f9"
   integrity sha512-5AZzuWJpGscyiMOed0IuyEwt6iKmV5Us7zuwCDCFYMIq7tsvooO9BUiciywsvuthGz6UG4LSpeDeCxvgMVhnIw==
 
-"@xterm/addon-clipboard@0.2.0-beta.34":
-  version "0.2.0-beta.34"
-  resolved "https://registry.yarnpkg.com/@xterm/addon-clipboard/-/addon-clipboard-0.2.0-beta.34.tgz#9a753601e69d3f9aad10e6d22b3a3d05be237d6a"
-  integrity sha512-Iduj2jGO37VkFLrRzxK5SkE7b2bAPaIvkvcSnw5JCdsvu9cjmPy7jgJkvUu54Tltzt55X+YTkQQ2GIKHqcor8A==
+"@xterm/addon-clipboard@0.2.0-beta.35":
+  version "0.2.0-beta.35"
+  resolved "https://registry.yarnpkg.com/@xterm/addon-clipboard/-/addon-clipboard-0.2.0-beta.35.tgz#4c9b553ea63ce02a3c8075fea7df1637d52092ef"
+  integrity sha512-B8AulZEjsfvSEaLKp8oyRu7yJ7FJb5R3W0wpPbI/rOMVAuBwxDJsz0CxLvJUXnJX7OJwd5cjnyTnEcXJfMJycA==
   dependencies:
     js-base64 "^3.7.5"
 
-"@xterm/addon-image@0.9.0-beta.51":
-  version "0.9.0-beta.51"
-  resolved "https://registry.yarnpkg.com/@xterm/addon-image/-/addon-image-0.9.0-beta.51.tgz#832be645ab04de3ab1af28aa37d4c3bcc72d9960"
-  integrity sha512-u8f0C8Kae8d8jGo2OGaxy1j4hvXOij41ZUp5fNsGL3quYufwmtVixVHUnc7WfEMVdSaSBNqfDXE+qpV4i3C3ng==
-
-"@xterm/addon-search@0.16.0-beta.51":
-  version "0.16.0-beta.51"
-  resolved "https://registry.yarnpkg.com/@xterm/addon-search/-/addon-search-0.16.0-beta.51.tgz#4595c6294287a2560abe4b76f6ef2f0aafd2f05e"
-  integrity sha512-DhnNDP9bAd/7/9TW+0N3BUaF/6Fpv/6RiIiromlzSu+6g1VDmuWsd8JpeTxErOCoWZuEMLpVVje9ky3yj8pN9A==
-
-"@xterm/addon-serialize@0.14.0-beta.51":
-  version "0.14.0-beta.51"
-  resolved "https://registry.yarnpkg.com/@xterm/addon-serialize/-/addon-serialize-0.14.0-beta.51.tgz#0c9802ba94018e94a727abc9e977a2349279468f"
-  integrity sha512-EjKIOuzSP+HCtk05iwHk0N3jYfsx81bKRv4pfGXKsc3rN0H6gQ+bvx/abSkndtgIjKtee2cy1H8pggMaezmzIA==
-
-"@xterm/addon-unicode11@0.9.0-beta.51":
-  version "0.9.0-beta.51"
-  resolved "https://registry.yarnpkg.com/@xterm/addon-unicode11/-/addon-unicode11-0.9.0-beta.51.tgz#c2f2b1ad14b2481648ca7deaa0bf2923d987e2e6"
-  integrity sha512-6FmA4MOue7SDYjSLmuG8rZC2eeVZ+YjhWEXWiUAAoiZ9X11j9HMdOhWcutca3crAMc6mrHfjx6fNsUxwtELMkQ==
-
-"@xterm/addon-webgl@0.19.0-beta.51":
-  version "0.19.0-beta.51"
-  resolved "https://registry.yarnpkg.com/@xterm/addon-webgl/-/addon-webgl-0.19.0-beta.51.tgz#14cb115d45c140525eb51427e236189dd800c20c"
-  integrity sha512-oO6yVuVA+9kNA47bT2c2IkGj9eLWvV6mEEo8wHKN7WXyYUFgw6ivAgmdrIdnKh679xbCq7th3GfcESwwQFH/sg==
-
-"@xterm/headless@5.6.0-beta.51":
-  version "5.6.0-beta.51"
-  resolved "https://registry.yarnpkg.com/@xterm/headless/-/headless-5.6.0-beta.51.tgz#76ff548a88305fe476a7d3f991331c0393c0af45"
-  integrity sha512-ehd4L3c28mQKVEd5cMmUzR1f1XcAVbJukfR1YiD7ohjphHUxSsg6mYb5qGIh50SsQsDI6wHYuIvmNSjvNgHVOw==
-
-"@xterm/xterm@5.6.0-beta.51":
-  version "5.6.0-beta.51"
-  resolved "https://registry.yarnpkg.com/@xterm/xterm/-/xterm-5.6.0-beta.51.tgz#3b9a5016d9588eb0a05226f6fc090b48a85b7698"
-  integrity sha512-0i9gkiP2hhCMIRk5ACM8LJXHRd1umzC27ZDHD8n14vutrQRgdW4ENvCdmrWHiVJy4Ui1t7m70zdgg72shOgcEA==
+"@xterm/addon-image@0.9.0-beta.52":
+  version "0.9.0-beta.52"
+  resolved "https://registry.yarnpkg.com/@xterm/addon-image/-/addon-image-0.9.0-beta.52.tgz#a3115a50f884e5ba2f8ce09118a3d7e833fceb7b"
+  integrity sha512-1fWhnCIvLeO0aQ3CKqkTB9ye1bUsocpgFdDOgmwfW4XhLXpvu+QcyMGQMtWJHt8JWBN2w0cgR9eyfKw7orN+9Q==
+
+"@xterm/addon-search@0.16.0-beta.52":
+  version "0.16.0-beta.52"
+  resolved "https://registry.yarnpkg.com/@xterm/addon-search/-/addon-search-0.16.0-beta.52.tgz#f8c77629b95ceff7d6b93d95c4b085857f405470"
+  integrity sha512-ZLVh0O91dcjxCjrU3vadl+40Z/mBnYXhKNA58oU/dGWFtFxtUB9SaZoOUtBvnfDpQIloYAK6raC2AfVsKHzD8A==
+
+"@xterm/addon-serialize@0.14.0-beta.52":
+  version "0.14.0-beta.52"
+  resolved "https://registry.yarnpkg.com/@xterm/addon-serialize/-/addon-serialize-0.14.0-beta.52.tgz#19708cdd2895ddbd983b771ae9d14d7bc54cf7c9"
+  integrity sha512-1+ckKya1OURFmELH1Tjjoxz3Gnj78Dxj+NNRrEunfINkvyzaY+n8wT28FQxIlU5gJq+a0VGvlhNgTkMwgOn6aw==
+
+"@xterm/addon-unicode11@0.9.0-beta.52":
+  version "0.9.0-beta.52"
+  resolved "https://registry.yarnpkg.com/@xterm/addon-unicode11/-/addon-unicode11-0.9.0-beta.52.tgz#15afdf03c20d2e46b4eca68bd461eea71c8dd37f"
+  integrity sha512-5tZR/8c+vf0YNSYS6B9pEv8gyWWZpPYOf/BRQDkTGtYAnFf04MzggVE/U7tKUXGDzBhzwTPODq5qPNTX1xpGgw==
+
+"@xterm/addon-webgl@0.19.0-beta.52":
+  version "0.19.0-beta.52"
+  resolved "https://registry.yarnpkg.com/@xterm/addon-webgl/-/addon-webgl-0.19.0-beta.52.tgz#695b20a5fa88ff92e115624149592080fad59594"
+  integrity sha512-kbPO9iR166xW8qgRkYmKX2Vu0kQHXpxYLQ9jY/01e5kvNrI/rqRDV63FIq14ncOi7N3+dmTuUkjvbg8anCpuIw==
+
+"@xterm/headless@5.6.0-beta.52":
+  version "5.6.0-beta.52"
+  resolved "https://registry.yarnpkg.com/@xterm/headless/-/headless-5.6.0-beta.52.tgz#7f934a7d7c5bbf88e2d78c22317cd2464bc9638a"
+  integrity sha512-f4QITQwotblRLW6YOHnK801wHJWfFDnjD7jUEwaaAXtSp32xH3jguWnMP9/uuQX45q9ndjDjnm1t5aXX7gwqBQ==
+
+"@xterm/xterm@5.6.0-beta.52":
+  version "5.6.0-beta.52"
+  resolved "https://registry.yarnpkg.com/@xterm/xterm/-/xterm-5.6.0-beta.52.tgz#ed7456a8b78ea1d00431737d078b5ab0bafbcdfe"
+  integrity sha512-aZh8IBdZPb2N4NjTt/fQ/C90z/PM3Zxkfoqhmlsp5+v3Otmyw5kd3DepeHK1SFW/pz0/xdj4KFgX8t8Y2lDRbA==
 
 agent-base@^7.0.1, agent-base@^7.0.2, agent-base@^7.1.0, agent-base@^7.1.1:
   version "7.1.1"
@@ -260,6 +265,11 @@ end-of-stream@^1.1.0, end-of-stream@^1.4.1:
   dependencies:
     once "^1.4.0"
 
+eventemitter3@^4.0.0:
+  version "4.0.7"
+  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f"
+  integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==
+
 expand-template@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz#6e14b3fcee0f3a6340ecb57d2e8918692052a47c"
@@ -284,6 +294,11 @@ fill-range@^7.1.1:
   dependencies:
     to-regex-range "^5.0.1"
 
+follow-redirects@^1.0.0, follow-redirects@^1.15.4:
+  version "1.15.9"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.9.tgz#a604fa10e443bf98ca94228d9eebcc2e8a2c8ee1"
+  integrity sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==
+
 fs-constants@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
@@ -321,6 +336,15 @@ http-proxy-agent@^7.0.0:
     agent-base "^7.1.0"
     debug "^4.3.4"
 
+http-proxy@^1.18.1:
+  version "1.18.1"
+  resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549"
+  integrity sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==
+  dependencies:
+    eventemitter3 "^4.0.0"
+    follow-redirects "^1.0.0"
+    requires-port "^1.0.0"
+
 https-proxy-agent@^7.0.2:
   version "7.0.5"
   resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz#9e8b5013873299e11fab6fd548405da2d6c602b2"
@@ -398,10 +422,10 @@ jsonfile@^6.0.1:
   optionalDependencies:
     graceful-fs "^4.1.6"
 
-kerberos@2.1.1-alpha.0:
-  version "2.1.1-alpha.0"
-  resolved "https://registry.yarnpkg.com/kerberos/-/kerberos-2.1.1-alpha.0.tgz#c6d377b43c8206340fd184167754f2c81dad5ab1"
-  integrity sha512-II8N/ky/Vpd8y7LTxwCuAYoQ8XeV3HYxuK7IDmyoFacIhDljx4sdt/+sOwqgXEweQyCHlbZSKSaK82upqNM4Hw==
+kerberos@2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/kerberos/-/kerberos-2.1.1.tgz#170fc64d1a23e8c6d6ae2736d01189e2a1dbe0f7"
+  integrity sha512-414s1G/qgK2T60cXnZsHbtRj8Ynjg0DBlQWeY99tkyqQ2e8vGgFHvxRdvjTlLHg/SxBA0zLQcGE6Pk6Dfq/BCA==
   dependencies:
     bindings "^1.5.0"
     node-addon-api "^6.1.0"
@@ -419,10 +443,10 @@ loose-envify@^1.1.0:
   resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-5.2.1.tgz#8337aa3c4335581839ec01c3d594090cebe8f00e"
   integrity sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q==
 
-micromatch@^4.0.5:
-  version "4.0.7"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.7.tgz#33e8190d9fe474a9895525f5618eee136d46c2e5"
-  integrity sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==
+micromatch@^4.0.5, micromatch@^4.0.6:
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202"
+  integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==
   dependencies:
     braces "^3.0.3"
     picomatch "^2.3.1"
@@ -494,10 +518,10 @@ node-gyp-build@4.8.1, node-gyp-build@^4.3.0:
   resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.8.1.tgz#976d3ad905e71b76086f4f0b0d3637fe79b6cda5"
   integrity sha512-OSs33Z9yWr148JZcbZd5WiAXhh/n9z8TxQcdMhIOlpN9AhWpLfvVFO73+m77bBABQMaY9XSvIa+qk0jlI7Gcaw==
 
-node-pty@1.1.0-beta11:
-  version "1.1.0-beta11"
-  resolved "https://registry.yarnpkg.com/node-pty/-/node-pty-1.1.0-beta11.tgz#909d5dd8f9aa2a7857e7b632fd4d2d4768bdf69f"
-  integrity sha512-vTjF+VrvSCfPDILUkIT+YrG1Fdn06/eBRS2fc9a3JzYAvknMB1Ip8aoJhxl8hNpjWAbprmCEiV91mlfNpCD+GQ==
+node-pty@1.1.0-beta21:
+  version "1.1.0-beta21"
+  resolved "https://registry.yarnpkg.com/node-pty/-/node-pty-1.1.0-beta21.tgz#d75c1dfe4ff2c173459c974df72e91a4eae6dc52"
+  integrity sha512-FYpnY9g8qMQLTpqyeY9NVli6YfCWwvG6v6gmaDBbPjlc1VMp/+Zivq0SStDrRr1aciGnFCZzpL0BzdMnmbDnAw==
   dependencies:
     node-addon-api "^7.1.0"
 
@@ -596,6 +620,11 @@ regenerator-runtime@^0.14.0:
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz#356ade10263f685dda125100cd862c1db895327f"
   integrity sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==
 
+requires-port@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
+  integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==
+
 safe-buffer@^5.0.1, safe-buffer@~5.2.0:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
@@ -731,10 +760,10 @@ vscode-regexpp@^3.1.0:
   resolved "https://registry.yarnpkg.com/vscode-regexpp/-/vscode-regexpp-3.1.0.tgz#42d059b6fffe99bd42939c0d013f632f0cad823f"
   integrity sha512-pqtN65VC1jRLawfluX4Y80MMG0DHJydWhe5ZwMHewZD6sys4LbU6lHwFAHxeuaVE6Y6+xZOtAw+9hvq7/0ejkg==
 
-vscode-textmate@9.0.0:
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-9.0.0.tgz#313c6c8792b0507aef35aeb81b6b370b37c44d6c"
-  integrity sha512-Cl65diFGxz7gpwbav10HqiY/eVYTO1sjQpmRmV991Bj7wAoOAjGQ97PpQcXorDE2Uc4hnGWLY17xme+5t6MlSg==
+vscode-textmate@9.1.0:
+  version "9.1.0"
+  resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-9.1.0.tgz#656a6aa163a9578397ba810733952bedb2b47202"
+  integrity sha512-lxKSVp2DkFOx9RDAvpiYUrB9/KT1fAfi1aE8CBGstP8N7rLF+Seifj8kDA198X0mYj1CjQUC+81+nQf8CO0nVA==
 
 wrappy@1:
   version "1.0.2"
diff --git a/remote/web/package.json b/remote/web/package.json
index 646d7f06a3d..4917ee0baff 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -6,14 +6,15 @@
 		"@microsoft/1ds-core-js": "^3.2.13",
 		"@microsoft/1ds-post-js": "^3.2.13",
 		"@vscode/iconv-lite-umd": "0.7.0",
+		"@vscode/tree-sitter-wasm": "^0.0.2",
 		"@vscode/vscode-languagedetection": "1.0.21",
-		"@xterm/addon-clipboard": "0.2.0-beta.34",
-		"@xterm/addon-image": "0.9.0-beta.51",
-		"@xterm/addon-search": "0.16.0-beta.51",
-		"@xterm/addon-serialize": "0.14.0-beta.51",
-		"@xterm/addon-unicode11": "0.9.0-beta.51",
-		"@xterm/addon-webgl": "0.19.0-beta.51",
-		"@xterm/xterm": "5.6.0-beta.51",
+		"@xterm/addon-clipboard": "0.2.0-beta.35",
+		"@xterm/addon-image": "0.9.0-beta.52",
+		"@xterm/addon-search": "0.16.0-beta.52",
+		"@xterm/addon-serialize": "0.14.0-beta.52",
+		"@xterm/addon-unicode11": "0.9.0-beta.52",
+		"@xterm/addon-webgl": "0.19.0-beta.52",
+		"@xterm/xterm": "5.6.0-beta.52",
 		"he": "^1.2.0",
 		"jschardet": "3.1.3",
 		"react": "^18.2.0",
@@ -21,10 +22,9 @@
 		"react-window": "^1.8.8",
 		"tas-client-umd": "0.2.0",
 		"vscode-oniguruma": "1.7.0",
-		"vscode-textmate": "9.0.0"
+		"vscode-textmate": "9.1.0"
 	},
 
-
   "customEntryPoints": {
 		"react": "umd/react.production.min.js",
 		"react-dom": "umd/react-dom.production.min.js",
diff --git a/remote/web/yarn.lock b/remote/web/yarn.lock
index bdad28f01c9..ccc950add2a 100644
--- a/remote/web/yarn.lock
+++ b/remote/web/yarn.lock
@@ -50,47 +50,52 @@
   resolved "https://registry.yarnpkg.com/@vscode/iconv-lite-umd/-/iconv-lite-umd-0.7.0.tgz#d2f1e0664ee6036408f9743fee264ea0699b0e48"
   integrity sha512-bRRFxLfg5dtAyl5XyiVWz/ZBPahpOpPrNYnnHpOpUZvam4tKH35wdhP4Kj6PbM0+KdliOsPzbGWpkxcdpNB/sg==
 
+"@vscode/tree-sitter-wasm@^0.0.2":
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/@vscode/tree-sitter-wasm/-/tree-sitter-wasm-0.0.2.tgz#da21541d343be69bb263e9380d165e3b164ec1f0"
+  integrity sha512-N57MR/kt4jR0H/TXeDsVYeJmvvUiK7avow0fjy+/EeKcyNBJcM2BFhj4XOAaaMbhGsOcIeSvJFouRWctXI7sKw==
+
 "@vscode/vscode-languagedetection@1.0.21":
   version "1.0.21"
   resolved "https://registry.yarnpkg.com/@vscode/vscode-languagedetection/-/vscode-languagedetection-1.0.21.tgz#89b48f293f6aa3341bb888c1118d16ff13b032d3"
   integrity sha512-zSUH9HYCw5qsCtd7b31yqkpaCU6jhtkKLkvOOA8yTrIRfBSOFb8PPhgmMicD7B/m+t4PwOJXzU1XDtrM9Fd3/g==
 
-"@xterm/addon-clipboard@0.2.0-beta.34":
-  version "0.2.0-beta.34"
-  resolved "https://registry.yarnpkg.com/@xterm/addon-clipboard/-/addon-clipboard-0.2.0-beta.34.tgz#9a753601e69d3f9aad10e6d22b3a3d05be237d6a"
-  integrity sha512-Iduj2jGO37VkFLrRzxK5SkE7b2bAPaIvkvcSnw5JCdsvu9cjmPy7jgJkvUu54Tltzt55X+YTkQQ2GIKHqcor8A==
+"@xterm/addon-clipboard@0.2.0-beta.35":
+  version "0.2.0-beta.35"
+  resolved "https://registry.yarnpkg.com/@xterm/addon-clipboard/-/addon-clipboard-0.2.0-beta.35.tgz#4c9b553ea63ce02a3c8075fea7df1637d52092ef"
+  integrity sha512-B8AulZEjsfvSEaLKp8oyRu7yJ7FJb5R3W0wpPbI/rOMVAuBwxDJsz0CxLvJUXnJX7OJwd5cjnyTnEcXJfMJycA==
   dependencies:
     js-base64 "^3.7.5"
 
-"@xterm/addon-image@0.9.0-beta.51":
-  version "0.9.0-beta.51"
-  resolved "https://registry.yarnpkg.com/@xterm/addon-image/-/addon-image-0.9.0-beta.51.tgz#832be645ab04de3ab1af28aa37d4c3bcc72d9960"
-  integrity sha512-u8f0C8Kae8d8jGo2OGaxy1j4hvXOij41ZUp5fNsGL3quYufwmtVixVHUnc7WfEMVdSaSBNqfDXE+qpV4i3C3ng==
+"@xterm/addon-image@0.9.0-beta.52":
+  version "0.9.0-beta.52"
+  resolved "https://registry.yarnpkg.com/@xterm/addon-image/-/addon-image-0.9.0-beta.52.tgz#a3115a50f884e5ba2f8ce09118a3d7e833fceb7b"
+  integrity sha512-1fWhnCIvLeO0aQ3CKqkTB9ye1bUsocpgFdDOgmwfW4XhLXpvu+QcyMGQMtWJHt8JWBN2w0cgR9eyfKw7orN+9Q==
 
-"@xterm/addon-search@0.16.0-beta.51":
-  version "0.16.0-beta.51"
-  resolved "https://registry.yarnpkg.com/@xterm/addon-search/-/addon-search-0.16.0-beta.51.tgz#4595c6294287a2560abe4b76f6ef2f0aafd2f05e"
-  integrity sha512-DhnNDP9bAd/7/9TW+0N3BUaF/6Fpv/6RiIiromlzSu+6g1VDmuWsd8JpeTxErOCoWZuEMLpVVje9ky3yj8pN9A==
+"@xterm/addon-search@0.16.0-beta.52":
+  version "0.16.0-beta.52"
+  resolved "https://registry.yarnpkg.com/@xterm/addon-search/-/addon-search-0.16.0-beta.52.tgz#f8c77629b95ceff7d6b93d95c4b085857f405470"
+  integrity sha512-ZLVh0O91dcjxCjrU3vadl+40Z/mBnYXhKNA58oU/dGWFtFxtUB9SaZoOUtBvnfDpQIloYAK6raC2AfVsKHzD8A==
 
-"@xterm/addon-serialize@0.14.0-beta.51":
-  version "0.14.0-beta.51"
-  resolved "https://registry.yarnpkg.com/@xterm/addon-serialize/-/addon-serialize-0.14.0-beta.51.tgz#0c9802ba94018e94a727abc9e977a2349279468f"
-  integrity sha512-EjKIOuzSP+HCtk05iwHk0N3jYfsx81bKRv4pfGXKsc3rN0H6gQ+bvx/abSkndtgIjKtee2cy1H8pggMaezmzIA==
+"@xterm/addon-serialize@0.14.0-beta.52":
+  version "0.14.0-beta.52"
+  resolved "https://registry.yarnpkg.com/@xterm/addon-serialize/-/addon-serialize-0.14.0-beta.52.tgz#19708cdd2895ddbd983b771ae9d14d7bc54cf7c9"
+  integrity sha512-1+ckKya1OURFmELH1Tjjoxz3Gnj78Dxj+NNRrEunfINkvyzaY+n8wT28FQxIlU5gJq+a0VGvlhNgTkMwgOn6aw==
 
-"@xterm/addon-unicode11@0.9.0-beta.51":
-  version "0.9.0-beta.51"
-  resolved "https://registry.yarnpkg.com/@xterm/addon-unicode11/-/addon-unicode11-0.9.0-beta.51.tgz#c2f2b1ad14b2481648ca7deaa0bf2923d987e2e6"
-  integrity sha512-6FmA4MOue7SDYjSLmuG8rZC2eeVZ+YjhWEXWiUAAoiZ9X11j9HMdOhWcutca3crAMc6mrHfjx6fNsUxwtELMkQ==
+"@xterm/addon-unicode11@0.9.0-beta.52":
+  version "0.9.0-beta.52"
+  resolved "https://registry.yarnpkg.com/@xterm/addon-unicode11/-/addon-unicode11-0.9.0-beta.52.tgz#15afdf03c20d2e46b4eca68bd461eea71c8dd37f"
+  integrity sha512-5tZR/8c+vf0YNSYS6B9pEv8gyWWZpPYOf/BRQDkTGtYAnFf04MzggVE/U7tKUXGDzBhzwTPODq5qPNTX1xpGgw==
 
-"@xterm/addon-webgl@0.19.0-beta.51":
-  version "0.19.0-beta.51"
-  resolved "https://registry.yarnpkg.com/@xterm/addon-webgl/-/addon-webgl-0.19.0-beta.51.tgz#14cb115d45c140525eb51427e236189dd800c20c"
-  integrity sha512-oO6yVuVA+9kNA47bT2c2IkGj9eLWvV6mEEo8wHKN7WXyYUFgw6ivAgmdrIdnKh679xbCq7th3GfcESwwQFH/sg==
+"@xterm/addon-webgl@0.19.0-beta.52":
+  version "0.19.0-beta.52"
+  resolved "https://registry.yarnpkg.com/@xterm/addon-webgl/-/addon-webgl-0.19.0-beta.52.tgz#695b20a5fa88ff92e115624149592080fad59594"
+  integrity sha512-kbPO9iR166xW8qgRkYmKX2Vu0kQHXpxYLQ9jY/01e5kvNrI/rqRDV63FIq14ncOi7N3+dmTuUkjvbg8anCpuIw==
 
-"@xterm/xterm@5.6.0-beta.51":
-  version "5.6.0-beta.51"
-  resolved "https://registry.yarnpkg.com/@xterm/xterm/-/xterm-5.6.0-beta.51.tgz#3b9a5016d9588eb0a05226f6fc090b48a85b7698"
-  integrity sha512-0i9gkiP2hhCMIRk5ACM8LJXHRd1umzC27ZDHD8n14vutrQRgdW4ENvCdmrWHiVJy4Ui1t7m70zdgg72shOgcEA==
+"@xterm/xterm@5.6.0-beta.52":
+  version "5.6.0-beta.52"
+  resolved "https://registry.yarnpkg.com/@xterm/xterm/-/xterm-5.6.0-beta.52.tgz#ed7456a8b78ea1d00431737d078b5ab0bafbcdfe"
+  integrity sha512-aZh8IBdZPb2N4NjTt/fQ/C90z/PM3Zxkfoqhmlsp5+v3Otmyw5kd3DepeHK1SFW/pz0/xdj4KFgX8t8Y2lDRbA==
 
 he@^1.2.0:
   version "1.2.0"
@@ -169,7 +174,7 @@ vscode-oniguruma@1.7.0:
   resolved "https://registry.yarnpkg.com/vscode-oniguruma/-/vscode-oniguruma-1.7.0.tgz#439bfad8fe71abd7798338d1cd3dc53a8beea94b"
   integrity sha512-L9WMGRfrjOhgHSdOYgCt/yRMsXzLDJSL7BPrOZt73gU0iWO4mpqzqQzOz5srxqTvMBaR0XZTSrVWo4j55Rc6cA==
 
-vscode-textmate@9.0.0:
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-9.0.0.tgz#313c6c8792b0507aef35aeb81b6b370b37c44d6c"
-  integrity sha512-Cl65diFGxz7gpwbav10HqiY/eVYTO1sjQpmRmV991Bj7wAoOAjGQ97PpQcXorDE2Uc4hnGWLY17xme+5t6MlSg==
+vscode-textmate@9.1.0:
+  version "9.1.0"
+  resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-9.1.0.tgz#656a6aa163a9578397ba810733952bedb2b47202"
+  integrity sha512-lxKSVp2DkFOx9RDAvpiYUrB9/KT1fAfi1aE8CBGstP8N7rLF+Seifj8kDA198X0mYj1CjQUC+81+nQf8CO0nVA==
diff --git a/remote/yarn.lock b/remote/yarn.lock
index 38f916a284e..cdf3d877185 100644
--- a/remote/yarn.lock
+++ b/remote/yarn.lock
@@ -66,10 +66,10 @@
   resolved "https://registry.yarnpkg.com/@vscode/iconv-lite-umd/-/iconv-lite-umd-0.7.0.tgz#d2f1e0664ee6036408f9743fee264ea0699b0e48"
   integrity sha512-bRRFxLfg5dtAyl5XyiVWz/ZBPahpOpPrNYnnHpOpUZvam4tKH35wdhP4Kj6PbM0+KdliOsPzbGWpkxcdpNB/sg==
 
-"@vscode/proxy-agent@^0.22.0":
-  version "0.22.0"
-  resolved "https://registry.yarnpkg.com/@vscode/proxy-agent/-/proxy-agent-0.22.0.tgz#bf571509d77c02c684be8c8526b7d0ac238c25cb"
-  integrity sha512-TQrv456pbrjmD6G+iOoXE1Mflm+8Ic/Kny4QU7ioiYe2+0HisvqzJM/CUa3Am5SWrNjMbntTHISjgmSaSlorrA==
+"@vscode/proxy-agent@^0.23.0":
+  version "0.23.0"
+  resolved "https://registry.yarnpkg.com/@vscode/proxy-agent/-/proxy-agent-0.23.0.tgz#1cdcf0b72c2180d705d4e304b807d9594845c90f"
+  integrity sha512-6lgxRrzURdWwBkk6TaB0+EYYjIWQXxry6GlVO0toBN8amIyVd3I7hLPKU9Xf+SOrLIrbdU0CLkmTOBHpPJLf/g==
   dependencies:
     "@tootallnate/once" "^3.0.0"
     agent-base "^7.0.1"
@@ -98,6 +98,11 @@
     mkdirp "^1.0.4"
     node-addon-api "7.1.0"
 
+"@vscode/tree-sitter-wasm@^0.0.2":
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/@vscode/tree-sitter-wasm/-/tree-sitter-wasm-0.0.2.tgz#da21541d343be69bb263e9380d165e3b164ec1f0"
+  integrity sha512-N57MR/kt4jR0H/TXeDsVYeJmvvUiK7avow0fjy+/EeKcyNBJcM2BFhj4XOAaaMbhGsOcIeSvJFouRWctXI7sKw==
+
 "@vscode/vscode-languagedetection@1.0.21":
   version "1.0.21"
   resolved "https://registry.yarnpkg.com/@vscode/vscode-languagedetection/-/vscode-languagedetection-1.0.21.tgz#89b48f293f6aa3341bb888c1118d16ff13b032d3"
@@ -122,47 +127,47 @@
   resolved "https://registry.yarnpkg.com/@vscode/windows-registry/-/windows-registry-1.1.0.tgz#03dace7c29c46f658588b9885b9580e453ad21f9"
   integrity sha512-5AZzuWJpGscyiMOed0IuyEwt6iKmV5Us7zuwCDCFYMIq7tsvooO9BUiciywsvuthGz6UG4LSpeDeCxvgMVhnIw==
 
-"@xterm/addon-clipboard@0.2.0-beta.34":
-  version "0.2.0-beta.34"
-  resolved "https://registry.yarnpkg.com/@xterm/addon-clipboard/-/addon-clipboard-0.2.0-beta.34.tgz#9a753601e69d3f9aad10e6d22b3a3d05be237d6a"
-  integrity sha512-Iduj2jGO37VkFLrRzxK5SkE7b2bAPaIvkvcSnw5JCdsvu9cjmPy7jgJkvUu54Tltzt55X+YTkQQ2GIKHqcor8A==
+"@xterm/addon-clipboard@0.2.0-beta.35":
+  version "0.2.0-beta.35"
+  resolved "https://registry.yarnpkg.com/@xterm/addon-clipboard/-/addon-clipboard-0.2.0-beta.35.tgz#4c9b553ea63ce02a3c8075fea7df1637d52092ef"
+  integrity sha512-B8AulZEjsfvSEaLKp8oyRu7yJ7FJb5R3W0wpPbI/rOMVAuBwxDJsz0CxLvJUXnJX7OJwd5cjnyTnEcXJfMJycA==
   dependencies:
     js-base64 "^3.7.5"
 
-"@xterm/addon-image@0.9.0-beta.51":
-  version "0.9.0-beta.51"
-  resolved "https://registry.yarnpkg.com/@xterm/addon-image/-/addon-image-0.9.0-beta.51.tgz#832be645ab04de3ab1af28aa37d4c3bcc72d9960"
-  integrity sha512-u8f0C8Kae8d8jGo2OGaxy1j4hvXOij41ZUp5fNsGL3quYufwmtVixVHUnc7WfEMVdSaSBNqfDXE+qpV4i3C3ng==
-
-"@xterm/addon-search@0.16.0-beta.51":
-  version "0.16.0-beta.51"
-  resolved "https://registry.yarnpkg.com/@xterm/addon-search/-/addon-search-0.16.0-beta.51.tgz#4595c6294287a2560abe4b76f6ef2f0aafd2f05e"
-  integrity sha512-DhnNDP9bAd/7/9TW+0N3BUaF/6Fpv/6RiIiromlzSu+6g1VDmuWsd8JpeTxErOCoWZuEMLpVVje9ky3yj8pN9A==
-
-"@xterm/addon-serialize@0.14.0-beta.51":
-  version "0.14.0-beta.51"
-  resolved "https://registry.yarnpkg.com/@xterm/addon-serialize/-/addon-serialize-0.14.0-beta.51.tgz#0c9802ba94018e94a727abc9e977a2349279468f"
-  integrity sha512-EjKIOuzSP+HCtk05iwHk0N3jYfsx81bKRv4pfGXKsc3rN0H6gQ+bvx/abSkndtgIjKtee2cy1H8pggMaezmzIA==
-
-"@xterm/addon-unicode11@0.9.0-beta.51":
-  version "0.9.0-beta.51"
-  resolved "https://registry.yarnpkg.com/@xterm/addon-unicode11/-/addon-unicode11-0.9.0-beta.51.tgz#c2f2b1ad14b2481648ca7deaa0bf2923d987e2e6"
-  integrity sha512-6FmA4MOue7SDYjSLmuG8rZC2eeVZ+YjhWEXWiUAAoiZ9X11j9HMdOhWcutca3crAMc6mrHfjx6fNsUxwtELMkQ==
-
-"@xterm/addon-webgl@0.19.0-beta.51":
-  version "0.19.0-beta.51"
-  resolved "https://registry.yarnpkg.com/@xterm/addon-webgl/-/addon-webgl-0.19.0-beta.51.tgz#14cb115d45c140525eb51427e236189dd800c20c"
-  integrity sha512-oO6yVuVA+9kNA47bT2c2IkGj9eLWvV6mEEo8wHKN7WXyYUFgw6ivAgmdrIdnKh679xbCq7th3GfcESwwQFH/sg==
-
-"@xterm/headless@5.6.0-beta.51":
-  version "5.6.0-beta.51"
-  resolved "https://registry.yarnpkg.com/@xterm/headless/-/headless-5.6.0-beta.51.tgz#76ff548a88305fe476a7d3f991331c0393c0af45"
-  integrity sha512-ehd4L3c28mQKVEd5cMmUzR1f1XcAVbJukfR1YiD7ohjphHUxSsg6mYb5qGIh50SsQsDI6wHYuIvmNSjvNgHVOw==
-
-"@xterm/xterm@5.6.0-beta.51":
-  version "5.6.0-beta.51"
-  resolved "https://registry.yarnpkg.com/@xterm/xterm/-/xterm-5.6.0-beta.51.tgz#3b9a5016d9588eb0a05226f6fc090b48a85b7698"
-  integrity sha512-0i9gkiP2hhCMIRk5ACM8LJXHRd1umzC27ZDHD8n14vutrQRgdW4ENvCdmrWHiVJy4Ui1t7m70zdgg72shOgcEA==
+"@xterm/addon-image@0.9.0-beta.52":
+  version "0.9.0-beta.52"
+  resolved "https://registry.yarnpkg.com/@xterm/addon-image/-/addon-image-0.9.0-beta.52.tgz#a3115a50f884e5ba2f8ce09118a3d7e833fceb7b"
+  integrity sha512-1fWhnCIvLeO0aQ3CKqkTB9ye1bUsocpgFdDOgmwfW4XhLXpvu+QcyMGQMtWJHt8JWBN2w0cgR9eyfKw7orN+9Q==
+
+"@xterm/addon-search@0.16.0-beta.52":
+  version "0.16.0-beta.52"
+  resolved "https://registry.yarnpkg.com/@xterm/addon-search/-/addon-search-0.16.0-beta.52.tgz#f8c77629b95ceff7d6b93d95c4b085857f405470"
+  integrity sha512-ZLVh0O91dcjxCjrU3vadl+40Z/mBnYXhKNA58oU/dGWFtFxtUB9SaZoOUtBvnfDpQIloYAK6raC2AfVsKHzD8A==
+
+"@xterm/addon-serialize@0.14.0-beta.52":
+  version "0.14.0-beta.52"
+  resolved "https://registry.yarnpkg.com/@xterm/addon-serialize/-/addon-serialize-0.14.0-beta.52.tgz#19708cdd2895ddbd983b771ae9d14d7bc54cf7c9"
+  integrity sha512-1+ckKya1OURFmELH1Tjjoxz3Gnj78Dxj+NNRrEunfINkvyzaY+n8wT28FQxIlU5gJq+a0VGvlhNgTkMwgOn6aw==
+
+"@xterm/addon-unicode11@0.9.0-beta.52":
+  version "0.9.0-beta.52"
+  resolved "https://registry.yarnpkg.com/@xterm/addon-unicode11/-/addon-unicode11-0.9.0-beta.52.tgz#15afdf03c20d2e46b4eca68bd461eea71c8dd37f"
+  integrity sha512-5tZR/8c+vf0YNSYS6B9pEv8gyWWZpPYOf/BRQDkTGtYAnFf04MzggVE/U7tKUXGDzBhzwTPODq5qPNTX1xpGgw==
+
+"@xterm/addon-webgl@0.19.0-beta.52":
+  version "0.19.0-beta.52"
+  resolved "https://registry.yarnpkg.com/@xterm/addon-webgl/-/addon-webgl-0.19.0-beta.52.tgz#695b20a5fa88ff92e115624149592080fad59594"
+  integrity sha512-kbPO9iR166xW8qgRkYmKX2Vu0kQHXpxYLQ9jY/01e5kvNrI/rqRDV63FIq14ncOi7N3+dmTuUkjvbg8anCpuIw==
+
+"@xterm/headless@5.6.0-beta.52":
+  version "5.6.0-beta.52"
+  resolved "https://registry.yarnpkg.com/@xterm/headless/-/headless-5.6.0-beta.52.tgz#7f934a7d7c5bbf88e2d78c22317cd2464bc9638a"
+  integrity sha512-f4QITQwotblRLW6YOHnK801wHJWfFDnjD7jUEwaaAXtSp32xH3jguWnMP9/uuQX45q9ndjDjnm1t5aXX7gwqBQ==
+
+"@xterm/xterm@5.6.0-beta.52":
+  version "5.6.0-beta.52"
+  resolved "https://registry.yarnpkg.com/@xterm/xterm/-/xterm-5.6.0-beta.52.tgz#ed7456a8b78ea1d00431737d078b5ab0bafbcdfe"
+  integrity sha512-aZh8IBdZPb2N4NjTt/fQ/C90z/PM3Zxkfoqhmlsp5+v3Otmyw5kd3DepeHK1SFW/pz0/xdj4KFgX8t8Y2lDRbA==
 
 agent-base@^7.0.1, agent-base@^7.0.2, agent-base@^7.1.0:
   version "7.1.0"
@@ -199,7 +204,7 @@ bl@^4.0.3:
     inherits "^2.0.4"
     readable-stream "^3.4.0"
 
-braces@^3.0.2:
+braces@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
   integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
@@ -260,6 +265,11 @@ end-of-stream@^1.1.0, end-of-stream@^1.4.1:
   dependencies:
     once "^1.4.0"
 
+eventemitter3@^4.0.0:
+  version "4.0.7"
+  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f"
+  integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==
+
 expand-template@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz#6e14b3fcee0f3a6340ecb57d2e8918692052a47c"
@@ -284,6 +294,11 @@ fill-range@^7.1.1:
   dependencies:
     to-regex-range "^5.0.1"
 
+follow-redirects@^1.0.0, follow-redirects@^1.15.4:
+  version "1.15.9"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.9.tgz#a604fa10e443bf98ca94228d9eebcc2e8a2c8ee1"
+  integrity sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==
+
 fs-constants@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
@@ -316,6 +331,15 @@ http-proxy-agent@^7.0.0:
     agent-base "^7.1.0"
     debug "^4.3.4"
 
+http-proxy@^1.18.1:
+  version "1.18.1"
+  resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549"
+  integrity sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==
+  dependencies:
+    eventemitter3 "^4.0.0"
+    follow-redirects "^1.0.0"
+    requires-port "^1.0.0"
+
 https-proxy-agent@^7.0.2:
   version "7.0.2"
   resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.2.tgz#e2645b846b90e96c6e6f347fb5b2e41f1590b09b"
@@ -388,10 +412,10 @@ jsonfile@^6.0.1:
   optionalDependencies:
     graceful-fs "^4.1.6"
 
-kerberos@2.1.1-alpha.0:
-  version "2.1.1-alpha.0"
-  resolved "https://registry.yarnpkg.com/kerberos/-/kerberos-2.1.1-alpha.0.tgz#c6d377b43c8206340fd184167754f2c81dad5ab1"
-  integrity sha512-II8N/ky/Vpd8y7LTxwCuAYoQ8XeV3HYxuK7IDmyoFacIhDljx4sdt/+sOwqgXEweQyCHlbZSKSaK82upqNM4Hw==
+kerberos@2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/kerberos/-/kerberos-2.1.1.tgz#170fc64d1a23e8c6d6ae2736d01189e2a1dbe0f7"
+  integrity sha512-414s1G/qgK2T60cXnZsHbtRj8Ynjg0DBlQWeY99tkyqQ2e8vGgFHvxRdvjTlLHg/SxBA0zLQcGE6Pk6Dfq/BCA==
   dependencies:
     bindings "^1.5.0"
     node-addon-api "^6.1.0"
@@ -404,12 +428,12 @@ lru-cache@^6.0.0:
   dependencies:
     yallist "^4.0.0"
 
-micromatch@^4.0.5:
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
-  integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
+micromatch@^4.0.5, micromatch@^4.0.6:
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202"
+  integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==
   dependencies:
-    braces "^3.0.2"
+    braces "^3.0.3"
     picomatch "^2.3.1"
 
 mimic-response@^3.1.0:
@@ -479,10 +503,10 @@ node-gyp-build@4.8.1, node-gyp-build@^4.3.0:
   resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.8.1.tgz#976d3ad905e71b76086f4f0b0d3637fe79b6cda5"
   integrity sha512-OSs33Z9yWr148JZcbZd5WiAXhh/n9z8TxQcdMhIOlpN9AhWpLfvVFO73+m77bBABQMaY9XSvIa+qk0jlI7Gcaw==
 
-node-pty@1.1.0-beta11:
-  version "1.1.0-beta11"
-  resolved "https://registry.yarnpkg.com/node-pty/-/node-pty-1.1.0-beta11.tgz#909d5dd8f9aa2a7857e7b632fd4d2d4768bdf69f"
-  integrity sha512-vTjF+VrvSCfPDILUkIT+YrG1Fdn06/eBRS2fc9a3JzYAvknMB1Ip8aoJhxl8hNpjWAbprmCEiV91mlfNpCD+GQ==
+node-pty@1.1.0-beta21:
+  version "1.1.0-beta21"
+  resolved "https://registry.yarnpkg.com/node-pty/-/node-pty-1.1.0-beta21.tgz#d75c1dfe4ff2c173459c974df72e91a4eae6dc52"
+  integrity sha512-FYpnY9g8qMQLTpqyeY9NVli6YfCWwvG6v6gmaDBbPjlc1VMp/+Zivq0SStDrRr1aciGnFCZzpL0BzdMnmbDnAw==
   dependencies:
     node-addon-api "^7.1.0"
 
@@ -553,6 +577,11 @@ readable-stream@^3.1.1, readable-stream@^3.4.0:
     string_decoder "^1.1.1"
     util-deprecate "^1.0.1"
 
+requires-port@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
+  integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==
+
 safe-buffer@^5.0.1, safe-buffer@~5.2.0:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
@@ -683,10 +712,10 @@ vscode-regexpp@^3.1.0:
   resolved "https://registry.yarnpkg.com/vscode-regexpp/-/vscode-regexpp-3.1.0.tgz#42d059b6fffe99bd42939c0d013f632f0cad823f"
   integrity sha512-pqtN65VC1jRLawfluX4Y80MMG0DHJydWhe5ZwMHewZD6sys4LbU6lHwFAHxeuaVE6Y6+xZOtAw+9hvq7/0ejkg==
 
-vscode-textmate@9.0.0:
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-9.0.0.tgz#313c6c8792b0507aef35aeb81b6b370b37c44d6c"
-  integrity sha512-Cl65diFGxz7gpwbav10HqiY/eVYTO1sjQpmRmV991Bj7wAoOAjGQ97PpQcXorDE2Uc4hnGWLY17xme+5t6MlSg==
+vscode-textmate@9.1.0:
+  version "9.1.0"
+  resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-9.1.0.tgz#656a6aa163a9578397ba810733952bedb2b47202"
+  integrity sha512-lxKSVp2DkFOx9RDAvpiYUrB9/KT1fAfi1aE8CBGstP8N7rLF+Seifj8kDA198X0mYj1CjQUC+81+nQf8CO0nVA==
 
 wrappy@1:
   version "1.0.2"
diff --git a/resources/linux/debian/postinst.template b/resources/linux/debian/postinst.template
index 16acb1481bf..81b75d97c67 100755
--- a/resources/linux/debian/postinst.template
+++ b/resources/linux/debian/postinst.template
@@ -22,6 +22,12 @@ if hash update-mime-database 2>/dev/null; then
 	update-mime-database /usr/share/mime
 fi
 
+# --- Start Positron ---
+# Skip the rest of this file; it attempts to register Microsoft repositories
+# which aren't needed for Positron.
+exit 0
+# --- End Positron ---
+
 if [ "@@NAME@@" != "code-oss" ]; then
 	# Remove the legacy bin command if this is the stable build
 	if [ "@@NAME@@" = "code" ]; then
@@ -31,24 +37,54 @@ if [ "@@NAME@@" != "code-oss" ]; then
 	# Register apt repository
 	eval $(apt-config shell APT_SOURCE_PARTS Dir::Etc::sourceparts/d)
 	CODE_SOURCE_PART=${APT_SOURCE_PARTS}vscode.list
+	CODE_SOURCE_PART_DEB822=${APT_SOURCE_PARTS}vscode.sources
 
 	eval $(apt-config shell APT_TRUSTED_PARTS Dir::Etc::trustedparts/d)
 	CODE_TRUSTED_PART=${APT_TRUSTED_PARTS}microsoft.gpg
 
-	# Install repository source list
+	RET=true
+	if [ -e '/usr/share/debconf/confmodule' ]; then
+		. /usr/share/debconf/confmodule
+		db_get @@NAME@@/add-microsoft-repo || true
+	fi
+
+	# Determine whether to install the repository source list
 	WRITE_SOURCE=0
-	if [ ! -f $CODE_SOURCE_PART ] && [ ! -f /etc/rpi-issue ]; then
-		# Write source list if it does not exist and we're not running on Raspberry Pi OS
-		WRITE_SOURCE=1
-	elif grep -Eq "http:\/\/packages\.microsoft\.com\/repos\/vscode" $CODE_SOURCE_PART; then
+	if [ "$RET" = false ]; then
+		# The user does not want to add the Microsoft repository
+		WRITE_SOURCE=0
+	elif [ -f "$CODE_SOURCE_PART_DEB822" ]; then
+		# The user has migrated themselves to the DEB822 format
+		WRITE_SOURCE=0
+	elif [ -f "$CODE_SOURCE_PART" ] && (grep -q "http://packages.microsoft.com/repos/vscode" $CODE_SOURCE_PART); then
+		# Migrate from old repository
+		WRITE_SOURCE=2
+	elif [ -f "$CODE_SOURCE_PART" ] && (grep -q "http://packages.microsoft.com/repos/code" $CODE_SOURCE_PART); then
 		# Migrate from old repository
+		WRITE_SOURCE=2
+	elif apt-cache policy | grep -q "https://packages.microsoft.com/repos/code"; then
+		# The user is already on the new repository
+		WRITE_SOURCE=0
+	elif [ ! -f $CODE_SOURCE_PART ] && [ ! -f /etc/rpi-issue ]; then
+		# Write source list if it does not exist and we're not running on Raspberry Pi OS
 		WRITE_SOURCE=1
 	elif grep -q "# disabled on upgrade to" $CODE_SOURCE_PART; then
 		# Write source list if it was disabled by OS upgrade
 		WRITE_SOURCE=1
 	fi
 
-	if [ "$WRITE_SOURCE" -eq "1" ]; then
+	if [ "$WRITE_SOURCE" -eq "1" ] && [ -e '/usr/share/debconf/confmodule' ]; then
+		# Ask the user whether to actually write the source list
+		db_input high @@NAME@@/add-microsoft-repo || true
+		db_go || true
+
+		db_get @@NAME@@/add-microsoft-repo
+		if [ "$RET" = false ]; then
+			WRITE_SOURCE=0
+		fi
+	fi
+
+	if [ "$WRITE_SOURCE" -ne "0" ]; then
 		echo "### THIS FILE IS AUTOMATICALLY CONFIGURED ###
 # You may comment out this entry, but any other modifications may be lost.
 deb [arch=amd64,arm64,armhf] https://packages.microsoft.com/repos/code stable main" > $CODE_SOURCE_PART
diff --git a/resources/linux/debian/postrm.template b/resources/linux/debian/postrm.template
index fb36d522f38..dcbfda95ea0 100755
--- a/resources/linux/debian/postrm.template
+++ b/resources/linux/debian/postrm.template
@@ -14,3 +14,22 @@ fi
 if hash update-mime-database 2>/dev/null; then
 	update-mime-database /usr/share/mime
 fi
+
+RET=true
+if [ -e '/usr/share/debconf/confmodule' ]; then
+	. /usr/share/debconf/confmodule
+	db_get @@NAME@@/add-microsoft-repo || true
+fi
+if [ "$RET" = "true" ]; then
+	eval $(apt-config shell APT_SOURCE_PARTS Dir::Etc::sourceparts/d)
+	CODE_SOURCE_PART=${APT_SOURCE_PARTS}vscode.list
+	rm -f $CODE_SOURCE_PART
+
+	eval $(apt-config shell APT_TRUSTED_PARTS Dir::Etc::trustedparts/d)
+	CODE_TRUSTED_PART=${APT_TRUSTED_PARTS}microsoft.gpg
+	rm -f $CODE_TRUSTED_PART
+fi
+
+if [ "$1" = "purge" ] && [ -e '/usr/share/debconf/confmodule' ]; then
+	db_purge
+fi
diff --git a/resources/linux/debian/templates.template b/resources/linux/debian/templates.template
new file mode 100644
index 00000000000..7be5e039b26
--- /dev/null
+++ b/resources/linux/debian/templates.template
@@ -0,0 +1,6 @@
+Template: @@NAME@@/add-microsoft-repo
+Type: boolean
+Default: true
+Description: Add Microsoft apt repository for Visual Studio Code?
+ The installer would like to add the Microsoft repository and signing
+ key to update VS Code through apt.
diff --git a/scripts/code-web.js b/scripts/code-web.js
index 467f147d027..42fa65aaa4c 100644
--- a/scripts/code-web.js
+++ b/scripts/code-web.js
@@ -74,6 +74,10 @@ async function main() {
 		openSystemBrowser = true;
 	}
 
+	if (fs.existsSync(path.join(APP_ROOT, 'src2')) || fs.existsSync(path.join(APP_ROOT, 'out-build', 'esm'))) {
+		serverArgs.push('--esm');
+	}
+
 	serverArgs.push('--sourcesPath', APP_ROOT);
 
 	serverArgs.push(...process.argv.slice(2).filter(v => !v.startsWith('--playground') && v !== '--no-playground'));
diff --git a/scripts/test-esm.bat b/scripts/test-esm.bat
new file mode 100644
index 00000000000..faeff79007b
--- /dev/null
+++ b/scripts/test-esm.bat
@@ -0,0 +1,31 @@
+@echo off
+setlocal
+
+set ELECTRON_RUN_AS_NODE=
+
+pushd %~dp0\..
+
+:: Get Code.exe location
+for /f "tokens=2 delims=:," %%a in ('findstr /R /C:"\"nameShort\":.*" product.json') do set NAMESHORT=%%~a
+set NAMESHORT=%NAMESHORT: "=%
+set NAMESHORT=%NAMESHORT:"=%.exe
+set CODE=".build\electron\%NAMESHORT%"
+
+:: Download Electron if needed
+call node build\lib\electron.js
+if %errorlevel% neq 0 node .\node_modules\gulp\bin\gulp.js electron
+
+:: Run tests
+set ELECTRON_ENABLE_LOGGING=1
+%CODE% .\test\unit\electron\index.esm.js --crash-reporter-directory=%~dp0\..\.build\crashes %*
+
+popd
+
+endlocal
+
+:: app.exit(0) is exiting with code 255 in Electron 1.7.4.
+:: See https://github.com/microsoft/vscode/issues/28582
+echo errorlevel: %errorlevel%
+if %errorlevel% == 255 set errorlevel=0
+
+exit /b %errorlevel%
diff --git a/scripts/test-esm.sh b/scripts/test-esm.sh
new file mode 100755
index 00000000000..ddb619017a6
--- /dev/null
+++ b/scripts/test-esm.sh
@@ -0,0 +1,43 @@
+#!/usr/bin/env bash
+set -e
+
+if [[ "$OSTYPE" == "darwin"* ]]; then
+	realpath() { [[ $1 = /* ]] && echo "$1" || echo "$PWD/${1#./}"; }
+	ROOT=$(dirname $(dirname $(realpath "$0")))
+else
+	ROOT=$(dirname $(dirname $(readlink -f $0)))
+	# --disable-dev-shm-usage: when run on docker containers where size of /dev/shm
+	# partition < 64MB which causes OOM failure for chromium compositor that uses the partition for shared memory
+	LINUX_EXTRA_ARGS="--disable-dev-shm-usage"
+fi
+
+cd $ROOT
+
+if [[ "$OSTYPE" == "darwin"* ]]; then
+	NAME=`node -p "require('./product.json').nameLong"`
+	CODE="./.build/electron/$NAME.app/Contents/MacOS/Electron"
+else
+	NAME=`node -p "require('./product.json').applicationName"`
+	CODE=".build/electron/$NAME"
+fi
+
+VSCODECRASHDIR=$ROOT/.build/crashes
+
+# Node modules
+test -d node_modules || yarn
+
+# Get electron
+yarn electron
+
+# Unit Tests
+if [[ "$OSTYPE" == "darwin"* ]]; then
+	cd $ROOT ; ulimit -n 4096 ; \
+		ELECTRON_ENABLE_LOGGING=1 \
+		"$CODE" \
+		test/unit/electron/index.esm.js --crash-reporter-directory=$VSCODECRASHDIR "$@"
+else
+	cd $ROOT ; \
+		ELECTRON_ENABLE_LOGGING=1 \
+		"$CODE" \
+		test/unit/electron/index.esm.js --crash-reporter-directory=$VSCODECRASHDIR $LINUX_EXTRA_ARGS "$@"
+fi
diff --git a/scripts/test-integration-esm.bat b/scripts/test-integration-esm.bat
new file mode 100644
index 00000000000..0d12b225179
--- /dev/null
+++ b/scripts/test-integration-esm.bat
@@ -0,0 +1,119 @@
+@echo off
+setlocal
+
+pushd %~dp0\..
+
+set VSCODEUSERDATADIR=%TEMP%\vscodeuserfolder-%RANDOM%-%TIME:~6,2%
+set VSCODECRASHDIR=%~dp0\..\.build\crashes
+set VSCODELOGSDIR=%~dp0\..\.build\logs\integration-tests
+
+:: Figure out which Electron to use for running tests
+if "%INTEGRATION_TEST_ELECTRON_PATH%"=="" (
+	chcp 65001
+	set INTEGRATION_TEST_ELECTRON_PATH=.\scripts\code.bat
+	set VSCODE_BUILD_BUILTIN_EXTENSIONS_SILENCE_PLEASE=1
+
+	echo Running integration tests out of sources.
+) else (
+	set VSCODE_CLI=1
+	set ELECTRON_ENABLE_LOGGING=1
+
+	echo Running integration tests with '%INTEGRATION_TEST_ELECTRON_PATH%' as build.
+)
+
+echo Storing crash reports into '%VSCODECRASHDIR%'.
+echo Storing log files into '%VSCODELOGSDIR%'.
+
+
+:: Tests standalone (AMD)
+
+echo.
+echo ### node.js integration tests
+call .\scripts\test-esm.bat --runGlob **\*.integrationTest.js %*
+if %errorlevel% neq 0 exit /b %errorlevel%
+
+
+:: Tests in the extension host
+
+set API_TESTS_EXTRA_ARGS=--disable-telemetry --skip-welcome --skip-release-notes --crash-reporter-directory=%VSCODECRASHDIR% --logsPath=%VSCODELOGSDIR% --no-cached-data --disable-updates --use-inmemory-secretstorage --disable-extensions --disable-workspace-trust --user-data-dir=%VSCODEUSERDATADIR%
+
+echo.
+echo ### API tests (folder)
+call "%INTEGRATION_TEST_ELECTRON_PATH%" %~dp0\..\extensions\vscode-api-tests\testWorkspace --enable-proposed-api=vscode.vscode-api-tests --extensionDevelopmentPath=%~dp0\..\extensions\vscode-api-tests --extensionTestsPath=%~dp0\..\extensions\vscode-api-tests\out\singlefolder-tests %API_TESTS_EXTRA_ARGS%
+if %errorlevel% neq 0 exit /b %errorlevel%
+
+echo.
+echo ### API tests (workspace)
+call "%INTEGRATION_TEST_ELECTRON_PATH%" %~dp0\..\extensions\vscode-api-tests\testworkspace.code-workspace --enable-proposed-api=vscode.vscode-api-tests --extensionDevelopmentPath=%~dp0\..\extensions\vscode-api-tests --extensionTestsPath=%~dp0\..\extensions\vscode-api-tests\out\workspace-tests %API_TESTS_EXTRA_ARGS%
+if %errorlevel% neq 0 exit /b %errorlevel%
+
+echo.
+echo ### Colorize tests
+call yarn test-extension -l vscode-colorize-tests
+if %errorlevel% neq 0 exit /b %errorlevel%
+
+echo.
+echo ### TypeScript tests
+call "%INTEGRATION_TEST_ELECTRON_PATH%" %~dp0\..\extensions\typescript-language-features\test-workspace --extensionDevelopmentPath=%~dp0\..\extensions\typescript-language-features --extensionTestsPath=%~dp0\..\extensions\typescript-language-features\out\test\unit %API_TESTS_EXTRA_ARGS%
+if %errorlevel% neq 0 exit /b %errorlevel%
+
+echo.
+echo ### Markdown tests
+call yarn test-extension -l markdown-language-features
+if %errorlevel% neq 0 exit /b %errorlevel%
+
+echo.
+echo ### Emmet tests
+call "%INTEGRATION_TEST_ELECTRON_PATH%" %~dp0\..\extensions\emmet\test-workspace --extensionDevelopmentPath=%~dp0\..\extensions\emmet --extensionTestsPath=%~dp0\..\extensions\emmet\out\test %API_TESTS_EXTRA_ARGS%
+if %errorlevel% neq 0 exit /b %errorlevel%
+
+echo.
+echo ### Git tests
+for /f "delims=" %%i in ('node -p "require('fs').realpathSync.native(require('os').tmpdir())"') do set TEMPDIR=%%i
+set GITWORKSPACE=%TEMPDIR%\git-%RANDOM%
+mkdir %GITWORKSPACE%
+call "%INTEGRATION_TEST_ELECTRON_PATH%" %GITWORKSPACE% --extensionDevelopmentPath=%~dp0\..\extensions\git --extensionTestsPath=%~dp0\..\extensions\git\out\test %API_TESTS_EXTRA_ARGS%
+if %errorlevel% neq 0 exit /b %errorlevel%
+
+echo.
+echo ### Ipynb tests
+call yarn test-extension -l ipynb
+if %errorlevel% neq 0 exit /b %errorlevel%
+
+echo.
+echo ### Notebook Output tests
+call yarn test-extension -l notebook-renderers
+if %errorlevel% neq 0 exit /b %errorlevel%
+
+echo.
+echo ### Configuration editing tests
+set CFWORKSPACE=%TEMPDIR%\cf-%RANDOM%
+mkdir %CFWORKSPACE%
+call yarn test-extension -l configuration-editing
+if %errorlevel% neq 0 exit /b %errorlevel%
+
+echo.
+echo ### GitHub Authentication tests
+call yarn test-extension -l github-authentication
+if %errorlevel% neq 0 exit /b %errorlevel%
+
+:: Tests standalone (CommonJS)
+
+echo.
+echo ### CSS tests
+call %~dp0\node-electron.bat %~dp0\..\extensions\css-language-features/server/test/index.js
+if %errorlevel% neq 0 exit /b %errorlevel%
+
+echo.
+echo ### HTML tests
+call %~dp0\node-electron.bat %~dp0\..\extensions\html-language-features/server/test/index.js
+if %errorlevel% neq 0 exit /b %errorlevel%
+
+
+:: Cleanup
+
+rmdir /s /q %VSCODEUSERDATADIR%
+
+popd
+
+endlocal
diff --git a/scripts/test-integration-esm.sh b/scripts/test-integration-esm.sh
new file mode 100755
index 00000000000..dde3bc0520d
--- /dev/null
+++ b/scripts/test-integration-esm.sh
@@ -0,0 +1,136 @@
+#!/usr/bin/env bash
+set -e
+
+if [[ "$OSTYPE" == "darwin"* ]]; then
+	realpath() { [[ $1 = /* ]] && echo "$1" || echo "$PWD/${1#./}"; }
+	ROOT=$(dirname $(dirname $(realpath "$0")))
+else
+	ROOT=$(dirname $(dirname $(readlink -f $0)))
+	# --disable-dev-shm-usage: when run on docker containers where size of /dev/shm
+	# partition < 64MB which causes OOM failure for chromium compositor that uses the partition for shared memory
+	LINUX_EXTRA_ARGS="--disable-dev-shm-usage"
+fi
+
+VSCODEUSERDATADIR=`mktemp -d 2>/dev/null`
+VSCODECRASHDIR=$ROOT/.build/crashes
+VSCODELOGSDIR=$ROOT/.build/logs/integration-tests
+
+cd $ROOT
+
+# Figure out which Electron to use for running tests
+if [ -z "$INTEGRATION_TEST_ELECTRON_PATH" ]
+then
+	INTEGRATION_TEST_ELECTRON_PATH="./scripts/code.sh"
+
+	echo "Running integration tests out of sources."
+else
+	export VSCODE_CLI=1
+	export ELECTRON_ENABLE_LOGGING=1
+
+	echo "Running integration tests with '$INTEGRATION_TEST_ELECTRON_PATH' as build."
+fi
+
+echo "Storing crash reports into '$VSCODECRASHDIR'."
+echo "Storing log files into '$VSCODELOGSDIR'."
+
+
+# Tests standalone (AMD)
+
+echo
+echo "### node.js integration tests"
+echo
+./scripts/test-esm.sh --runGlob **/*.integrationTest.js "$@"
+
+
+# Tests in the extension host
+
+API_TESTS_EXTRA_ARGS="--disable-telemetry --skip-welcome --skip-release-notes --crash-reporter-directory=$VSCODECRASHDIR --logsPath=$VSCODELOGSDIR --no-cached-data --disable-updates --use-inmemory-secretstorage --disable-extensions --disable-workspace-trust --user-data-dir=$VSCODEUSERDATADIR"
+
+if [ -z "$INTEGRATION_TEST_APP_NAME" ]; then
+	kill_app() { true; }
+else
+	kill_app() { killall $INTEGRATION_TEST_APP_NAME || true; }
+fi
+
+echo
+echo "### API tests (folder)"
+echo
+"$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_EXTRA_ARGS $ROOT/extensions/vscode-api-tests/testWorkspace --enable-proposed-api=vscode.vscode-api-tests --extensionDevelopmentPath=$ROOT/extensions/vscode-api-tests --extensionTestsPath=$ROOT/extensions/vscode-api-tests/out/singlefolder-tests $API_TESTS_EXTRA_ARGS
+kill_app
+
+echo
+echo "### API tests (workspace)"
+echo
+"$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_EXTRA_ARGS $ROOT/extensions/vscode-api-tests/testworkspace.code-workspace --enable-proposed-api=vscode.vscode-api-tests --extensionDevelopmentPath=$ROOT/extensions/vscode-api-tests --extensionTestsPath=$ROOT/extensions/vscode-api-tests/out/workspace-tests $API_TESTS_EXTRA_ARGS
+kill_app
+
+echo
+echo "### Colorize tests"
+echo
+yarn test-extension -l vscode-colorize-tests
+kill_app
+
+echo
+echo "### TypeScript tests"
+echo
+"$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_EXTRA_ARGS $ROOT/extensions/typescript-language-features/test-workspace --extensionDevelopmentPath=$ROOT/extensions/typescript-language-features --extensionTestsPath=$ROOT/extensions/typescript-language-features/out/test/unit $API_TESTS_EXTRA_ARGS
+kill_app
+
+echo
+echo "### Markdown tests"
+echo
+yarn test-extension -l markdown-language-features
+kill_app
+
+echo
+echo "### Emmet tests"
+echo
+"$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_EXTRA_ARGS $ROOT/extensions/emmet/test-workspace --extensionDevelopmentPath=$ROOT/extensions/emmet --extensionTestsPath=$ROOT/extensions/emmet/out/test $API_TESTS_EXTRA_ARGS
+kill_app
+
+echo
+echo "### Git tests"
+echo
+"$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_EXTRA_ARGS $(mktemp -d 2>/dev/null) --extensionDevelopmentPath=$ROOT/extensions/git --extensionTestsPath=$ROOT/extensions/git/out/test $API_TESTS_EXTRA_ARGS
+kill_app
+
+echo
+echo "### Ipynb tests"
+echo
+yarn test-extension -l ipynb
+kill_app
+
+echo
+echo "### Notebook Output tests"
+echo
+yarn test-extension -l notebook-renderers
+kill_app
+
+echo
+echo "### Configuration editing tests"
+echo
+yarn test-extension -l configuration-editing
+kill_app
+
+echo
+echo "### GitHub Authentication tests"
+echo
+yarn test-extension -l github-authentication
+kill_app
+
+# Tests standalone (CommonJS)
+
+echo
+echo "### CSS tests"
+echo
+cd $ROOT/extensions/css-language-features/server && $ROOT/scripts/node-electron.sh test/index.js
+
+echo
+echo "### HTML tests"
+echo
+cd $ROOT/extensions/html-language-features/server && $ROOT/scripts/node-electron.sh test/index.js
+
+
+# Cleanup
+
+rm -rf $VSCODEUSERDATADIR
diff --git a/scripts/xterm-update.ps1 b/scripts/xterm-update.ps1
index 11c282de888..2eae7fffe77 100644
--- a/scripts/xterm-update.ps1
+++ b/scripts/xterm-update.ps1
@@ -1 +1,2 @@
-node $PSScriptRoot\xterm-update.js (Get-Location)
+$scriptPath = Join-Path $PSScriptRoot "xterm-update.js"
+node $scriptPath (Get-Location)
diff --git a/src/bootstrap-amd.js b/src/bootstrap-amd.js
index 27b389cbdd1..5a4aa435c8e 100644
--- a/src/bootstrap-amd.js
+++ b/src/bootstrap-amd.js
@@ -11,22 +11,38 @@
  * @import { IProductConfiguration } from './vs/base/common/product'
  */
 
-// ESM-comment-begin
-const isESM = false;
-// ESM-comment-end
 // ESM-uncomment-begin
 // import * as path from 'path';
 // import * as fs from 'fs';
 // import { fileURLToPath } from 'url';
-// import { createRequire } from 'node:module';
+// import { createRequire, register } from 'node:module';
 // import { product, pkg } from './bootstrap-meta.js';
-// import * as bootstrap from './bootstrap.js';
+// import './bootstrap-node.js';
 // import * as performance from './vs/base/common/performance.js';
 //
 // const require = createRequire(import.meta.url);
-// const isESM = true;
+// /** @type any */
 // const module = { exports: {} };
 // const __dirname = path.dirname(fileURLToPath(import.meta.url));
+//
+// // Install a hook to module resolution to map 'fs' to 'original-fs'
+// if (process.env['ELECTRON_RUN_AS_NODE'] || process.versions['electron']) {
+// 	const jsCode = `
+// 	export async function resolve(specifier, context, nextResolve) {
+// 		if (specifier === 'fs') {
+// 			return {
+// 				format: 'builtin',
+// 				shortCircuit: true,
+// 				url: 'node:original-fs'
+// 			};
+// 		}
+
+// 		// Defer to the next hook in the chain, which would be the
+// 		// Node.js default resolve if this is the last user-specified loader.
+// 		return nextResolve(specifier, context);
+// 	}`;
+// 	register(`data:text/javascript;base64,${Buffer.from(jsCode).toString('base64')}`, import.meta.url);
+// }
 // ESM-uncomment-end
 
 // Store the node.js require function in a variable
@@ -78,7 +94,7 @@ globalThis.acquirePositronApi = function () {
 globalThis._VSCODE_FILE_ROOT = __dirname;
 
 // ESM-comment-begin
-const bootstrap = require('./bootstrap');
+const bootstrapNode = require('./bootstrap-node');
 const performance = require(`./vs/base/common/performance`);
 const fs = require('fs');
 // ESM-comment-end
@@ -120,7 +136,6 @@ async function doSetupNLS() {
 				messagesFile = nlsConfig.defaultMessagesFile;
 			}
 
-			// VSCODE_GLOBALS: NLS
 			globalThis._VSCODE_NLS_LANGUAGE = nlsConfig?.resolvedLanguage;
 		} catch (e) {
 			console.error(`Error reading VSCODE_NLS_CONFIG from environment: ${e}`);
@@ -135,7 +150,6 @@ async function doSetupNLS() {
 	}
 
 	try {
-		// VSCODE_GLOBALS: NLS
 		globalThis._VSCODE_NLS_MESSAGES = JSON.parse((await fs.promises.readFile(messagesFile)).toString());
 	} catch (error) {
 		console.error(`Error reading NLS messages file ${messagesFile}: ${error}`);
@@ -152,7 +166,6 @@ async function doSetupNLS() {
 		// Fallback to the default message file to ensure english translation at least
 		if (nlsConfig?.defaultMessagesFile && nlsConfig.defaultMessagesFile !== messagesFile) {
 			try {
-				// VSCODE_GLOBALS: NLS
 				globalThis._VSCODE_NLS_MESSAGES = JSON.parse((await fs.promises.readFile(nlsConfig.defaultMessagesFile)).toString());
 			} catch (error) {
 				console.error(`Error reading default NLS messages file ${nlsConfig.defaultMessagesFile}: ${error}`);
@@ -169,77 +182,77 @@ async function doSetupNLS() {
 
 //#region Loader Config
 
-if (isESM) {
-
-	/**
-	 * @param {string=} entrypoint
-	 * @param {(value: any) => void} [onLoad]
-	 * @param {(err: Error) => void} [onError]
-	 */
-	module.exports.load = function (entrypoint, onLoad, onError) {
-		if (!entrypoint) {
-			return;
-		}
-
-		entrypoint = `./${entrypoint}.js`;
-
-		onLoad = onLoad || function () { };
-		onError = onError || function (err) { console.error(err); };
+// ESM-uncomment-begin
+// /**
+//  * @param {string=} entrypoint
+//  * @param {(value: any) => void} [onLoad]
+//  * @param {(err: Error) => void} [onError]
+//  */
+// module.exports.load = function (entrypoint, onLoad, onError) {
+// 	if (!entrypoint) {
+// 		return;
+// 	}
+
+// 	entrypoint = `./${entrypoint}.js`;
+
+// 	onLoad = onLoad || function () { };
+// 	onError = onError || function (err) { console.error(err); };
+
+// 	setupNLS().then(() => {
+// 		performance.mark(`code/fork/willLoadCode`);
+// 		import(entrypoint).then(onLoad, onError);
+// 	});
+// };
+// ESM-uncomment-end
 
-		setupNLS().then(() => {
-			performance.mark(`code/fork/willLoadCode`);
-			import(entrypoint).then(onLoad, onError);
-		});
-	};
-} else {
-
-	// @ts-ignore
-	const loader = require('./vs/loader');
-
-	loader.config({
-		baseUrl: bootstrap.fileUriFromPath(__dirname, { isWindows: process.platform === 'win32' }),
-		catchError: true,
-		nodeRequire,
-		amdModulesPattern: /^vs\//,
-		recordStats: true
+// ESM-comment-begin
+// @ts-ignore
+const loader = require('./vs/loader');
+
+loader.config({
+	baseUrl: bootstrapNode.fileUriFromPath(__dirname, { isWindows: process.platform === 'win32' }),
+	catchError: true,
+	nodeRequire,
+	amdModulesPattern: /^vs\//,
+	recordStats: true
+});
+
+// Running in Electron
+if (process.env['ELECTRON_RUN_AS_NODE'] || process.versions['electron']) {
+	loader.define('fs', ['original-fs'], function (/** @type {import('fs')} */originalFS) {
+		return originalFS;  // replace the patched electron fs with the original node fs for all AMD code
 	});
+}
 
-	// Running in Electron
-	if (process.env['ELECTRON_RUN_AS_NODE'] || process.versions['electron']) {
-		loader.define('fs', ['original-fs'], function (/** @type {import('fs')} */originalFS) {
-			return originalFS;  // replace the patched electron fs with the original node fs for all AMD code
-		});
+/**
+ * @param {string=} entrypoint
+ * @param {(value: any) => void} [onLoad]
+ * @param {(err: Error) => void} [onError]
+ */
+module.exports.load = function (entrypoint, onLoad, onError) {
+	if (!entrypoint) {
+		return;
 	}
 
-	/**
-	 * @param {string=} entrypoint
-	 * @param {(value: any) => void} [onLoad]
-	 * @param {(err: Error) => void} [onError]
-	 */
-	module.exports.load = function (entrypoint, onLoad, onError) {
-		if (!entrypoint) {
-			return;
-		}
-
-		// code cache config
-		if (process.env['VSCODE_CODE_CACHE_PATH']) {
-			loader.config({
-				nodeCachedData: {
-					path: process.env['VSCODE_CODE_CACHE_PATH'],
-					seed: entrypoint
-				}
-			});
-		}
+	// code cache config
+	if (process.env['VSCODE_CODE_CACHE_PATH']) {
+		loader.config({
+			nodeCachedData: {
+				path: process.env['VSCODE_CODE_CACHE_PATH'],
+				seed: entrypoint
+			}
+		});
+	}
 
-		onLoad = onLoad || function () { };
-		onError = onError || function (err) { console.error(err); };
+	onLoad = onLoad || function () { };
+	onError = onError || function (err) { console.error(err); };
 
-		setupNLS().then(() => {
-			performance.mark('code/fork/willLoadCode');
-			loader([entrypoint], onLoad, onError);
-		});
-	};
-}
+	setupNLS().then(() => {
+		performance.mark('code/fork/willLoadCode');
+		loader([entrypoint], onLoad, onError);
+	});
+};
+// ESM-comment-end
 
 //#endregion
 
diff --git a/src/bootstrap-cli.js b/src/bootstrap-cli.js
new file mode 100644
index 00000000000..8f077a0eeaf
--- /dev/null
+++ b/src/bootstrap-cli.js
@@ -0,0 +1,14 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+//@ts-check
+'use strict';
+
+// Delete `VSCODE_CWD` very early. We have seen
+// reports where `code .` would use the wrong
+// current working directory due to our variable
+// somehow escaping to the parent shell
+// (https://github.com/microsoft/vscode/issues/126399)
+delete process.env['VSCODE_CWD'];
diff --git a/src/bootstrap-fork.js b/src/bootstrap-fork.js
index a95cbf53589..e1826549726 100644
--- a/src/bootstrap-fork.js
+++ b/src/bootstrap-fork.js
@@ -8,13 +8,11 @@
 
 // ESM-comment-begin
 const performance = require('./vs/base/common/performance');
-const bootstrap = require('./bootstrap');
 const bootstrapNode = require('./bootstrap-node');
 const bootstrapAmd = require('./bootstrap-amd');
 // ESM-comment-end
 // ESM-uncomment-begin
 // import * as performance from './vs/base/common/performance.js';
-// import * as bootstrap from './bootstrap.js';
 // import * as bootstrapNode from './bootstrap-node.js';
 // import * as bootstrapAmd from './bootstrap-amd.js';
 // ESM-uncomment-end
@@ -24,14 +22,14 @@ performance.mark('code/fork/start');
 // Crash reporter
 configureCrashReporter();
 
-// Remove global paths from the node module lookup
-bootstrapNode.removeGlobalNodeModuleLookupPaths();
+// Remove global paths from the node module lookup (node.js only)
+bootstrapNode.removeGlobalNodeJsModuleLookupPaths();
 
 // Enable ASAR in our forked processes
-bootstrap.enableASARSupport();
+bootstrapNode.enableASARSupport();
 
-if (process.env['VSCODE_INJECT_NODE_MODULE_LOOKUP_PATH']) {
-	bootstrapNode.injectNodeModuleLookupPath(process.env['VSCODE_INJECT_NODE_MODULE_LOOKUP_PATH']);
+if (process.env['VSCODE_DEV_INJECT_NODE_MODULE_LOOKUP_PATH']) {
+	bootstrapNode.devInjectNodeModuleLookupPath(process.env['VSCODE_DEV_INJECT_NODE_MODULE_LOOKUP_PATH']);
 }
 
 // Configure: pipe logging to parent process
diff --git a/src/bootstrap-import.js b/src/bootstrap-import.js
new file mode 100644
index 00000000000..070b0b93b4b
--- /dev/null
+++ b/src/bootstrap-import.js
@@ -0,0 +1,78 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+//@ts-check
+
+// *********************************************************************
+// *                                                                   *
+// *  We need this to redirect to node_modules from the remote-folder. *
+// *  This ONLY applies  when running out of source.                   *
+// *                                                                   *
+// *********************************************************************
+
+import { fileURLToPath, pathToFileURL } from 'node:url';
+import { promises } from 'node:fs';
+import { join } from 'node:path';
+
+// SEE https://nodejs.org/docs/latest/api/module.html#initialize
+
+/**
+ * @type {Object.<string, string>}
+ */
+const _specifierToUrl = {};
+
+/**
+ * @param {string} injectPath
+ */
+export async function initialize(injectPath) {
+	// populate mappings
+
+	const injectPackageJSONPath = fileURLToPath(new URL('../package.json', pathToFileURL(injectPath)));
+	const packageJSON = JSON.parse(String(await promises.readFile(injectPackageJSONPath)));
+
+	for (const [name] of Object.entries(packageJSON.dependencies)) {
+		try {
+			const path = join(injectPackageJSONPath, `../node_modules/${name}/package.json`);
+			let { main } = JSON.parse(String(await promises.readFile(path)));
+
+			if (!main) {
+				main = 'index.js';
+			}
+			if (!main.endsWith('.js')) {
+				main += '.js';
+			}
+			const mainPath = join(injectPackageJSONPath, `../node_modules/${name}/${main}`);
+			_specifierToUrl[name] = pathToFileURL(mainPath).href;
+
+		} catch (err) {
+			console.error(name);
+			console.error(err);
+		}
+	}
+
+	console.log(`[bootstrap-import] Initialized node_modules redirector for: ${injectPath}`);
+}
+
+/**
+ * @param {string | number} specifier
+ * @param {any} context
+ * @param {(arg0: any, arg1: any) => any} nextResolve
+ */
+export async function resolve(specifier, context, nextResolve) {
+
+	const newSpecifier = _specifierToUrl[specifier];
+	if (newSpecifier !== undefined) {
+		// console.log('[HOOKS]', specifier, '--->', newSpecifier);
+		return {
+			format: 'commonjs',
+			shortCircuit: true,
+			url: newSpecifier
+		};
+	}
+
+	// Defer to the next hook in the chain, which would be the
+	// Node.js default resolve if this is the last user-specified loader.
+	return nextResolve(specifier, context);
+}
diff --git a/src/bootstrap-meta.js b/src/bootstrap-meta.js
index 5415bc5df6a..b437ed75c20 100644
--- a/src/bootstrap-meta.js
+++ b/src/bootstrap-meta.js
@@ -14,6 +14,7 @@
 // import { createRequire } from 'node:module';
 //
 // const require = createRequire(import.meta.url);
+// /** @type any */
 // const module = { exports: {} };
 // ESM-uncomment-end
 
diff --git a/src/bootstrap-node.js b/src/bootstrap-node.js
index 4a829557f0d..8c9af7d924e 100644
--- a/src/bootstrap-node.js
+++ b/src/bootstrap-node.js
@@ -9,8 +9,7 @@
 // ESM-comment-begin
 const path = require('path');
 const fs = require('fs');
-
-const isESM = false;
+const Module = require('module');
 // ESM-comment-end
 // ESM-uncomment-begin
 // import * as path from 'path';
@@ -19,11 +18,29 @@ const isESM = false;
 // import { createRequire } from 'node:module';
 //
 // const require = createRequire(import.meta.url);
-// const isESM = true;
+// /** @type any */
 // const module = { exports: {} };
 // const __dirname = path.dirname(fileURLToPath(import.meta.url));
 // ESM-uncomment-end
 
+// increase number of stack frames(from 10, https://github.com/v8/v8/wiki/Stack-Trace-API)
+Error.stackTraceLimit = 100;
+
+if (!process.env['VSCODE_HANDLES_SIGPIPE']) {
+	// Workaround for Electron not installing a handler to ignore SIGPIPE
+	// (https://github.com/electron/electron/issues/13254)
+	let didLogAboutSIGPIPE = false;
+	process.on('SIGPIPE', () => {
+		// See https://github.com/microsoft/vscode-remote-release/issues/6543
+		// In certain situations, the console itself can be in a broken pipe state
+		// so logging SIGPIPE to the console will cause an infinite async loop
+		if (!didLogAboutSIGPIPE) {
+			didLogAboutSIGPIPE = true;
+			console.error(new Error(`Unexpected SIGPIPE`));
+		}
+	});
+}
+
 // Setup current working directory in all our node & electron processes
 // - Windows: call `process.chdir()` to always set application folder as cwd
 // -  all OS: store the `process.cwd()` inside `VSCODE_CWD` for consistent lookups
@@ -52,43 +69,52 @@ setupCurrentWorkingDirectory();
 /**
  * Add support for redirecting the loading of node modules
  *
+ * Note: only applies when running out of sources.
+ *
  * @param {string} injectPath
  */
-module.exports.injectNodeModuleLookupPath = function (injectPath) {
+module.exports.devInjectNodeModuleLookupPath = function (injectPath) {
+	if (!process.env['VSCODE_DEV']) {
+		return; // only applies running out of sources
+	}
+
 	if (!injectPath) {
 		throw new Error('Missing injectPath');
 	}
 
 	const Module = require('node:module');
-	if (isESM) {
-		// register a loader hook
-		// ESM-uncomment-begin
-		// Module.register('./server-loader.mjs', { parentURL: import.meta.url, data: injectPath });
-		// ESM-uncomment-end
-	} else {
-		const nodeModulesPath = path.join(__dirname, '../node_modules');
+	// ESM-uncomment-begin
+	// // register a loader hook
+	// Module.register('./bootstrap-import.js', { parentURL: import.meta.url, data: injectPath });
+	// ESM-uncomment-end
+	// ESM-comment-begin
+	const nodeModulesPath = path.join(__dirname, '../node_modules');
 
-		// @ts-ignore
-		const originalResolveLookupPaths = Module._resolveLookupPaths;
+	// @ts-ignore
+	const originalResolveLookupPaths = Module._resolveLookupPaths;
 
-		// @ts-ignore
-		Module._resolveLookupPaths = function (moduleName, parent) {
-			const paths = originalResolveLookupPaths(moduleName, parent);
-			if (Array.isArray(paths)) {
-				for (let i = 0, len = paths.length; i < len; i++) {
-					if (paths[i] === nodeModulesPath) {
-						paths.splice(i, 0, injectPath);
-						break;
-					}
+	// @ts-ignore
+	Module._resolveLookupPaths = function (moduleName, parent) {
+		const paths = originalResolveLookupPaths(moduleName, parent);
+		if (Array.isArray(paths)) {
+			for (let i = 0, len = paths.length; i < len; i++) {
+				if (paths[i] === nodeModulesPath) {
+					paths.splice(i, 0, injectPath);
+					break;
 				}
 			}
+		}
 
-			return paths;
-		};
-	}
+		return paths;
+	};
+	// ESM-comment-end
 };
 
-module.exports.removeGlobalNodeModuleLookupPaths = function () {
+module.exports.removeGlobalNodeJsModuleLookupPaths = function () {
+	if (typeof process?.versions?.electron === 'string') {
+		return; // Electron disables global search paths in https://github.com/electron/electron/blob/3186c2f0efa92d275dc3d57b5a14a60ed3846b0e/shell/common/node_bindings.cc#L653
+	}
+
 	const Module = require('module');
 	// @ts-ignore
 	const globalPaths = Module.globalPaths;
@@ -177,8 +203,76 @@ module.exports.configurePortable = function (product) {
 	};
 };
 
+/**
+ * Helper to enable ASAR support.
+ */
+module.exports.enableASARSupport = function () {
+	// ESM-comment-begin
+	const NODE_MODULES_PATH = path.join(__dirname, '../node_modules');
+	const NODE_MODULES_ASAR_PATH = `${NODE_MODULES_PATH}.asar`;
+
+	// @ts-ignore
+	const originalResolveLookupPaths = Module._resolveLookupPaths;
+
+	// @ts-ignore
+	Module._resolveLookupPaths = function (request, parent) {
+		const paths = originalResolveLookupPaths(request, parent);
+		if (Array.isArray(paths)) {
+			for (let i = 0, len = paths.length; i < len; i++) {
+				if (paths[i] === NODE_MODULES_PATH) {
+					paths.splice(i, 0, NODE_MODULES_ASAR_PATH);
+					break;
+				}
+			}
+		}
+
+		return paths;
+	};
+	// ESM-comment-end
+};
+
+/**
+ * Helper to convert a file path to a URI.
+ *
+ * TODO@bpasero TODO@esm check for removal once ESM has landed.
+ *
+ * @param {string} path
+ * @param {{ isWindows?: boolean, scheme?: string, fallbackAuthority?: string }} config
+ * @returns {string}
+ */
+module.exports.fileUriFromPath = function (path, config) {
+
+	// Since we are building a URI, we normalize any backslash
+	// to slashes and we ensure that the path begins with a '/'.
+	let pathName = path.replace(/\\/g, '/');
+	if (pathName.length > 0 && pathName.charAt(0) !== '/') {
+		pathName = `/${pathName}`;
+	}
+
+	/** @type {string} */
+	let uri;
+
+	// Windows: in order to support UNC paths (which start with '//')
+	// that have their own authority, we do not use the provided authority
+	// but rather preserve it.
+	if (config.isWindows && pathName.startsWith('//')) {
+		uri = encodeURI(`${config.scheme || 'file'}:${pathName}`);
+	}
+
+	// Otherwise we optionally add the provided authority if specified
+	else {
+		uri = encodeURI(`${config.scheme || 'file'}://${config.fallbackAuthority || ''}${pathName}`);
+	}
+
+	return uri.replace(/#/g, '%23');
+};
+
+//#endregion
+
 // ESM-uncomment-begin
-// export const injectNodeModuleLookupPath = module.exports.injectNodeModuleLookupPath;
-// export const removeGlobalNodeModuleLookupPaths = module.exports.removeGlobalNodeModuleLookupPaths;
+// export const devInjectNodeModuleLookupPath = module.exports.devInjectNodeModuleLookupPath;
+// export const removeGlobalNodeJsModuleLookupPaths = module.exports.removeGlobalNodeJsModuleLookupPaths;
 // export const configurePortable = module.exports.configurePortable;
+// export const enableASARSupport = module.exports.enableASARSupport;
+// export const fileUriFromPath = module.exports.fileUriFromPath;
 // ESM-uncomment-end
diff --git a/src/bootstrap-server.js b/src/bootstrap-server.js
new file mode 100644
index 00000000000..b84cc6a6ef6
--- /dev/null
+++ b/src/bootstrap-server.js
@@ -0,0 +1,10 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+//@ts-check
+'use strict';
+
+// Keep bootstrap-amd.js from redefining 'fs'.
+delete process.env['ELECTRON_RUN_AS_NODE'];
diff --git a/src/bootstrap-window.js b/src/bootstrap-window.js
index f5fe712fb29..a176820a273 100644
--- a/src/bootstrap-window.js
+++ b/src/bootstrap-window.js
@@ -13,33 +13,18 @@
  * @typedef {any} LoaderConfig
  */
 
-/* eslint-disable no-restricted-globals,  */
+/* eslint-disable no-restricted-globals */
 
-// ESM-comment-begin
-const isESM = false;
-// ESM-comment-end
-// ESM-uncomment-begin
-// const isESM = true;
-// ESM-uncomment-end
-
-// Simple module style to support node.js and browser environments
 (function (factory) {
-
-	// Node.js
-	if (typeof exports === 'object') {
-		module.exports = factory();
-	}
-
-	// Browser
-	else {
-		// @ts-ignore
-		globalThis.MonacoBootstrapWindow = factory();
-	}
+	// @ts-ignore
+	globalThis.MonacoBootstrapWindow = factory();
 }(function () {
-	const bootstrapLib = bootstrap();
 	const preloadGlobals = sandboxGlobals();
 	const safeProcess = preloadGlobals.process;
 
+	// increase number of stack frames(from 10, https://github.com/v8/v8/wiki/Stack-Trace-API)
+	Error.stackTraceLimit = 100;
+
 	/**
 	 * @param {string[]} modulePaths
 	 * @param {(result: unknown, configuration: ISandboxConfiguration) => Promise<unknown> | undefined} resultCallback
@@ -90,7 +75,6 @@ const isESM = false;
 			developerDeveloperKeybindingsDisposable = registerDeveloperKeybindings(disallowReloadKeybinding);
 		}
 
-		// VSCODE_GLOBALS: NLS
 		globalThis._VSCODE_NLS_MESSAGES = configuration.nls.messages;
 		globalThis._VSCODE_NLS_LANGUAGE = configuration.nls.language;
 		let language = configuration.nls.language || 'en';
@@ -104,146 +88,146 @@ const isESM = false;
 
 		window['MonacoEnvironment'] = {};
 
-		if (isESM) {
-
-			// Signal before require()
-			if (typeof options?.beforeRequire === 'function') {
-				options.beforeRequire(configuration);
-			}
-
-			const fileRoot = `${configuration.appRoot}/out`;
-			globalThis._VSCODE_FILE_ROOT = fileRoot;
-
-			// DEV ---------------------------------------------------------------------------------------
-			// DEV: This is for development and enables loading CSS via import-statements via import-maps.
-			// DEV: For each CSS modules that we have we defined an entry in the import map that maps to
-			// DEV: a blob URL that loads the CSS via a dynamic @import-rule.
-			// DEV ---------------------------------------------------------------------------------------
-			if (configuration.cssModules) {
-				performance.mark('code/willAddCssLoader');
-
-				const style = document.createElement('style');
-				style.type = 'text/css';
-				style.media = 'screen';
-				style.id = 'vscode-css-loading';
-				document.head.appendChild(style);
-
-				globalThis._VSCODE_CSS_LOAD = function (url) {
-					style.textContent += `@import url(${url});\n`;
-				};
-
-				const baseUrl = new URL(`vscode-file://vscode-app${fileRoot}/`);
-				/**
-				 * @type { { imports: Record<string, string> }}
-				 */
-				const importMap = { imports: {} };
-				for (const cssModule of configuration.cssModules) {
-					const cssUrl = new URL(cssModule, baseUrl).href;
-					const jsSrc = `globalThis._VSCODE_CSS_LOAD('${cssUrl}');\n`;
-					const blob = new Blob([jsSrc], { type: 'application/javascript' });
-					importMap.imports[cssUrl] = URL.createObjectURL(blob);
-				}
-
-				const ttp = window.trustedTypes?.createPolicy('vscode-bootstrapImportMap', { createScript(value) { return value; }, });
-				const importMapSrc = JSON.stringify(importMap, undefined, 2);
-				const importMapScript = document.createElement('script');
-				importMapScript.type = 'importmap';
-				importMapScript.setAttribute('nonce', '0c6a828f1297');
-				// @ts-ignore
-				importMapScript.textContent = ttp?.createScript(importMapSrc) ?? importMapSrc;
-				document.head.appendChild(importMapScript);
-
-				performance.mark('code/didAddCssLoader');
-			}
-
-			const result = Promise.all(modulePaths.map(modulePath => {
-				if (modulePath.includes('vs/css!')) {
-					// ESM/CSS when seeing the old `vs/css!` prefix we use that as a signal to
-					// load CSS via a <link> tag
-					const cssModule = modulePath.replace('vs/css!', '');
-					const link = document.createElement('link');
-					link.rel = 'stylesheet';
-					link.href = `${configuration.appRoot}/out/${cssModule}.css`;
-					document.head.appendChild(link);
-					return Promise.resolve();
-
-				} else {
-					// ESM/JS module loading
-					return import(`${configuration.appRoot}/out/${modulePath}.js`);
-				}
-			}));
-
-			result.then((res) => invokeResult(res[0]), onUnexpectedError);
-		} else {
-
-			/** @type {LoaderConfig} */
-			const loaderConfig = {
-				baseUrl: `${bootstrapLib.fileUriFromPath(configuration.appRoot, { isWindows: safeProcess.platform === 'win32', scheme: 'vscode-file', fallbackAuthority: 'vscode-app' })}/out`,
-				preferScriptTags: true
-			};
+		// ESM-uncomment-begin
+		// // Signal before require()
+		// if (typeof options?.beforeRequire === 'function') {
+		// 	options.beforeRequire(configuration);
+		// }
+
+		// const baseUrl = new URL(`${fileUriFromPath(configuration.appRoot, { isWindows: safeProcess.platform === 'win32', scheme: 'vscode-file', fallbackAuthority: 'vscode-app' })}/out/`);
+		// globalThis._VSCODE_FILE_ROOT = baseUrl.toString();
+
+		// // DEV ---------------------------------------------------------------------------------------
+		// // DEV: This is for development and enables loading CSS via import-statements via import-maps.
+		// // DEV: For each CSS modules that we have we defined an entry in the import map that maps to
+		// // DEV: a blob URL that loads the CSS via a dynamic @import-rule.
+		// // DEV ---------------------------------------------------------------------------------------
+		// if (Array.isArray(configuration.cssModules) && configuration.cssModules.length > 0) {
+		// 	performance.mark('code/willAddCssLoader');
+
+		// 	const style = document.createElement('style');
+		// 	style.type = 'text/css';
+		// 	style.media = 'screen';
+		// 	style.id = 'vscode-css-loading';
+		// 	document.head.appendChild(style);
+
+		// 	globalThis._VSCODE_CSS_LOAD = function (url) {
+		// 		style.textContent += `@import url(${url});\n`;
+		// 	};
+
+		// 	/**
+		// 	 * @type { { imports: Record<string, string> }}
+		// 	 */
+		// 	const importMap = { imports: {} };
+		// 	for (const cssModule of configuration.cssModules) {
+		// 		const cssUrl = new URL(cssModule, baseUrl).href;
+		// 		const jsSrc = `globalThis._VSCODE_CSS_LOAD('${cssUrl}');\n`;
+		// 		const blob = new Blob([jsSrc], { type: 'application/javascript' });
+		// 		importMap.imports[cssUrl] = URL.createObjectURL(blob);
+		// 	}
+
+		// 	const ttp = window.trustedTypes?.createPolicy('vscode-bootstrapImportMap', { createScript(value) { return value; }, });
+		// 	const importMapSrc = JSON.stringify(importMap, undefined, 2);
+		// 	const importMapScript = document.createElement('script');
+		// 	importMapScript.type = 'importmap';
+		// 	importMapScript.setAttribute('nonce', '0c6a828f1297');
+		// 	// @ts-ignore
+		// 	importMapScript.textContent = ttp?.createScript(importMapSrc) ?? importMapSrc;
+		// 	document.head.appendChild(importMapScript);
+
+		// 	performance.mark('code/didAddCssLoader');
+		// }
+
+		// const result = Promise.all(modulePaths.map(modulePath => {
+		// 	if (modulePath.includes('vs/css!')) {
+		// 		// ESM/CSS when seeing the old `vs/css!` prefix we use that as a signal to
+		// 		// load CSS via a <link> tag
+		// 		const cssModule = modulePath.replace('vs/css!', '');
+		// 		const link = document.createElement('link');
+		// 		link.rel = 'stylesheet';
+		// 		link.href = new URL(`${cssModule}.css`, baseUrl).href;
+		// 		document.head.appendChild(link);
+		// 		return Promise.resolve();
+
+		// 	} else {
+		// 		// ESM/JS module loading
+		// 		return import(new URL(`${modulePath}.js`, baseUrl).href);
+		// 	}
+		// }));
+
+		// result.then((res) => invokeResult(res[0]), onUnexpectedError);
+		// ESM-uncomment-end
+
+		// ESM-comment-begin
+		/** @type {LoaderConfig} */
+		const loaderConfig = {
+			baseUrl: `${fileUriFromPath(configuration.appRoot, { isWindows: safeProcess.platform === 'win32', scheme: 'vscode-file', fallbackAuthority: 'vscode-app' })}/out`,
+			preferScriptTags: true
+		};
 
-			// use a trusted types policy when loading via script tags
-			loaderConfig.trustedTypesPolicy = window.trustedTypes?.createPolicy('amdLoader', {
-				createScriptURL(value) {
-					if (value.startsWith(window.location.origin)) {
-						return value;
-					}
-					throw new Error(`Invalid script url: ${value}`);
+		// use a trusted types policy when loading via script tags
+		loaderConfig.trustedTypesPolicy = window.trustedTypes?.createPolicy('amdLoader', {
+			createScriptURL(value) {
+				if (value.startsWith(window.location.origin)) {
+					return value;
 				}
-			});
-
-			// Teach the loader the location of the node modules we use in renderers
-			// This will enable to load these modules via <script> tags instead of
-			// using a fallback such as node.js require which does not exist in sandbox
-			const baseNodeModulesPath = isDev ? '../node_modules' : '../node_modules.asar';
-			loaderConfig.paths = {
-				'vscode-textmate': `${baseNodeModulesPath}/vscode-textmate/release/main.js`,
-				'vscode-oniguruma': `${baseNodeModulesPath}/vscode-oniguruma/release/main.js`,
-				'vsda': `${baseNodeModulesPath}/vsda/index.js`,
-				'@xterm/xterm': `${baseNodeModulesPath}/@xterm/xterm/lib/xterm.js`,
-				'@xterm/addon-clipboard': `${baseNodeModulesPath}/@xterm/addon-clipboard/lib/addon-clipboard.js`,
-				'@xterm/addon-image': `${baseNodeModulesPath}/@xterm/addon-image/lib/addon-image.js`,
-				'@xterm/addon-search': `${baseNodeModulesPath}/@xterm/addon-search/lib/addon-search.js`,
-				'@xterm/addon-serialize': `${baseNodeModulesPath}/@xterm/addon-serialize/lib/addon-serialize.js`,
-				'@xterm/addon-unicode11': `${baseNodeModulesPath}/@xterm/addon-unicode11/lib/addon-unicode11.js`,
-				'@xterm/addon-webgl': `${baseNodeModulesPath}/@xterm/addon-webgl/lib/addon-webgl.js`,
-				'@vscode/iconv-lite-umd': `${baseNodeModulesPath}/@vscode/iconv-lite-umd/lib/iconv-lite-umd.js`,
-				'jschardet': `${baseNodeModulesPath}/jschardet/dist/jschardet.min.js`,
-				// --- Start Positron ---
-				'he': `${baseNodeModulesPath}/he/he.js`,
-				// -------------------------------------------------------------------------------------
-				// If you need to debug React, you can switch to the development version by temporarily
-				// commenting out production React and uncommenting development React. (The fixup for
-				// loading react-dom/client.js handles this switch, so this is all you need to do.)
-				'react': `${baseNodeModulesPath}/react/umd/react.production.min.js`,
-				'react-dom': `${baseNodeModulesPath}/react-dom/umd/react-dom.production.min.js`,
-				// 'react': `${baseNodeModulesPath}/react/umd/react.development.js`,
-				// 'react-dom': `${baseNodeModulesPath}/react-dom/umd/react-dom.development.js`,
-				// -------------------------------------------------------------------------------------
-				'react-window': `${baseNodeModulesPath}/react-window/dist/index-prod.umd.js`,
-				// --- End Positron ---
-				'@vscode/vscode-languagedetection': `${baseNodeModulesPath}/@vscode/vscode-languagedetection/dist/lib/index.js`,
-				'vscode-regexp-languagedetection': `${baseNodeModulesPath}/vscode-regexp-languagedetection/dist/index.js`,
-				'tas-client-umd': `${baseNodeModulesPath}/tas-client-umd/lib/tas-client-umd.js`
-			};
-
-			// Signal before require.config()
-			if (typeof options?.beforeLoaderConfig === 'function') {
-				options.beforeLoaderConfig(loaderConfig);
+				throw new Error(`Invalid script url: ${value}`);
 			}
+		});
+
+		// Teach the loader the location of the node modules we use in renderers
+		// This will enable to load these modules via <script> tags instead of
+		// using a fallback such as node.js require which does not exist in sandbox
+		const baseNodeModulesPath = isDev ? '../node_modules' : '../node_modules.asar';
+		loaderConfig.paths = {
+			'@vscode/tree-sitter-wasm': `${baseNodeModulesPath}/@vscode/tree-sitter-wasm/wasm/tree-sitter.js`,
+			'vscode-textmate': `${baseNodeModulesPath}/vscode-textmate/release/main.js`,
+			'vscode-oniguruma': `${baseNodeModulesPath}/vscode-oniguruma/release/main.js`,
+			'vsda': `${baseNodeModulesPath}/vsda/index.js`,
+			'@xterm/xterm': `${baseNodeModulesPath}/@xterm/xterm/lib/xterm.js`,
+			'@xterm/addon-clipboard': `${baseNodeModulesPath}/@xterm/addon-clipboard/lib/addon-clipboard.js`,
+			'@xterm/addon-image': `${baseNodeModulesPath}/@xterm/addon-image/lib/addon-image.js`,
+			'@xterm/addon-search': `${baseNodeModulesPath}/@xterm/addon-search/lib/addon-search.js`,
+			'@xterm/addon-serialize': `${baseNodeModulesPath}/@xterm/addon-serialize/lib/addon-serialize.js`,
+			'@xterm/addon-unicode11': `${baseNodeModulesPath}/@xterm/addon-unicode11/lib/addon-unicode11.js`,
+			'@xterm/addon-webgl': `${baseNodeModulesPath}/@xterm/addon-webgl/lib/addon-webgl.js`,
+			'@vscode/iconv-lite-umd': `${baseNodeModulesPath}/@vscode/iconv-lite-umd/lib/iconv-lite-umd.js`,
+			'jschardet': `${baseNodeModulesPath}/jschardet/dist/jschardet.min.js`,
+			// --- Start Positron ---
+			'he': `${baseNodeModulesPath}/he/he.js`,
+			// -------------------------------------------------------------------------------------
+			// If you need to debug React, you can switch to the development version by temporarily
+			// commenting out production React and uncommenting development React. (The fixup for
+			// loading react-dom/client.js handles this switch, so this is all you need to do.)
+			'react': `${baseNodeModulesPath}/react/umd/react.production.min.js`,
+			'react-dom': `${baseNodeModulesPath}/react-dom/umd/react-dom.production.min.js`,
+			// 'react': `${baseNodeModulesPath}/react/umd/react.development.js`,
+			// 'react-dom': `${baseNodeModulesPath}/react-dom/umd/react-dom.development.js`,
+			// -------------------------------------------------------------------------------------
+			'react-window': `${baseNodeModulesPath}/react-window/dist/index-prod.umd.js`,
+			// --- End Positron ---
+			'@vscode/vscode-languagedetection': `${baseNodeModulesPath}/@vscode/vscode-languagedetection/dist/lib/index.js`,
+			'vscode-regexp-languagedetection': `${baseNodeModulesPath}/vscode-regexp-languagedetection/dist/index.js`,
+			'tas-client-umd': `${baseNodeModulesPath}/tas-client-umd/lib/tas-client-umd.js`
+		};
 
-			// Configure loader
-			require.config(loaderConfig);
+		// Signal before require.config()
+		if (typeof options?.beforeLoaderConfig === 'function') {
+			options.beforeLoaderConfig(loaderConfig);
+		}
 
-			// Signal before require()
-			if (typeof options?.beforeRequire === 'function') {
-				options.beforeRequire(configuration);
-			}
+		// Configure loader
+		require.config(loaderConfig);
 
-			// Actually require the main module as specified
-			require(modulePaths, invokeResult, onUnexpectedError);
+		// Signal before require()
+		if (typeof options?.beforeRequire === 'function') {
+			options.beforeRequire(configuration);
 		}
 
+		// Actually require the main module as specified
+		require(modulePaths, invokeResult, onUnexpectedError);
+		// ESM-comment-end
+
 		/**
 		 * @param {any} firstModule
 		 */
@@ -329,11 +313,35 @@ const isESM = false;
 	}
 
 	/**
-	 * @return {{ fileUriFromPath: (path: string, config: { isWindows?: boolean, scheme?: string, fallbackAuthority?: string }) => string; }}
+	 * @param {string} path
+	 * @param {{ isWindows?: boolean, scheme?: string, fallbackAuthority?: string }} config
+	 * @returns {string}
 	 */
-	function bootstrap() {
-		// @ts-ignore (defined in bootstrap.js)
-		return window.MonacoBootstrap;
+	function fileUriFromPath(path, config) {
+
+		// Since we are building a URI, we normalize any backslash
+		// to slashes and we ensure that the path begins with a '/'.
+		let pathName = path.replace(/\\/g, '/');
+		if (pathName.length > 0 && pathName.charAt(0) !== '/') {
+			pathName = `/${pathName}`;
+		}
+
+		/** @type {string} */
+		let uri;
+
+		// Windows: in order to support UNC paths (which start with '//')
+		// that have their own authority, we do not use the provided authority
+		// but rather preserve it.
+		if (config.isWindows && pathName.startsWith('//')) {
+			uri = encodeURI(`${config.scheme || 'file'}:${pathName}`);
+		}
+
+		// Otherwise we optionally add the provided authority if specified
+		else {
+			uri = encodeURI(`${config.scheme || 'file'}://${config.fallbackAuthority || ''}${pathName}`);
+		}
+
+		return uri.replace(/#/g, '%23');
 	}
 
 	/**
diff --git a/src/bootstrap.js b/src/bootstrap.js
deleted file mode 100644
index 63e7501a696..00000000000
--- a/src/bootstrap.js
+++ /dev/null
@@ -1,141 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-//@ts-check
-'use strict';
-
-// TODO@bpasero this file can no longer be used from a non-node.js context and thus should
-// move into bootstrap-node.js and remaining usages (if any) in browser context be replaced.
-
-// ESM-uncomment-begin
-// import * as path from 'path';
-// import { createRequire } from 'node:module';
-// import { fileURLToPath } from 'url';
-//
-// const require = createRequire(import.meta.url);
-// const module = { exports: {} };
-// const __dirname = path.dirname(fileURLToPath(import.meta.url));
-// ESM-uncomment-end
-
-// Simple module style to support node.js and browser environments
-(function (factory) {
-
-	// Node.js
-	if (typeof module === 'object' && typeof module.exports === 'object') {
-		module.exports = factory();
-	}
-
-	// Browser
-	else {
-		// @ts-ignore
-		globalThis.MonacoBootstrap = factory();
-	}
-}(function () {
-	const Module = typeof require === 'function' ? require('module') : undefined;
-	const path = typeof require === 'function' ? require('path') : undefined;
-
-	//#region global bootstrapping
-
-	// increase number of stack frames(from 10, https://github.com/v8/v8/wiki/Stack-Trace-API)
-	Error.stackTraceLimit = 100;
-
-	if (typeof process !== 'undefined' && !process.env['VSCODE_HANDLES_SIGPIPE']) {
-		// Workaround for Electron not installing a handler to ignore SIGPIPE
-		// (https://github.com/electron/electron/issues/13254)
-		let didLogAboutSIGPIPE = false;
-		process.on('SIGPIPE', () => {
-			// See https://github.com/microsoft/vscode-remote-release/issues/6543
-			// We would normally install a SIGPIPE listener in bootstrap.js
-			// But in certain situations, the console itself can be in a broken pipe state
-			// so logging SIGPIPE to the console will cause an infinite async loop
-			if (!didLogAboutSIGPIPE) {
-				didLogAboutSIGPIPE = true;
-				console.error(new Error(`Unexpected SIGPIPE`));
-			}
-		});
-	}
-
-	//#endregion
-
-
-	//#region Add support for using node_modules.asar
-
-	function enableASARSupport() {
-		if (!path || !Module || typeof process === 'undefined') {
-			console.warn('enableASARSupport() is only available in node.js environments');
-			return;
-		}
-
-		const NODE_MODULES_PATH = path.join(__dirname, '../node_modules');
-		const NODE_MODULES_ASAR_PATH = `${NODE_MODULES_PATH}.asar`;
-
-		// @ts-ignore
-		const originalResolveLookupPaths = Module._resolveLookupPaths;
-
-		// @ts-ignore
-		Module._resolveLookupPaths = function (request, parent) {
-			const paths = originalResolveLookupPaths(request, parent);
-			if (Array.isArray(paths)) {
-				for (let i = 0, len = paths.length; i < len; i++) {
-					if (paths[i] === NODE_MODULES_PATH) {
-						paths.splice(i, 0, NODE_MODULES_ASAR_PATH);
-						break;
-					}
-				}
-			}
-
-			return paths;
-		};
-	}
-
-	//#endregion
-
-
-	//#region URI helpers
-
-	/**
-	 * @param {string} path
-	 * @param {{ isWindows?: boolean, scheme?: string, fallbackAuthority?: string }} config
-	 * @returns {string}
-	 */
-	function fileUriFromPath(path, config) {
-
-		// Since we are building a URI, we normalize any backslash
-		// to slashes and we ensure that the path begins with a '/'.
-		let pathName = path.replace(/\\/g, '/');
-		if (pathName.length > 0 && pathName.charAt(0) !== '/') {
-			pathName = `/${pathName}`;
-		}
-
-		/** @type {string} */
-		let uri;
-
-		// Windows: in order to support UNC paths (which start with '//')
-		// that have their own authority, we do not use the provided authority
-		// but rather preserve it.
-		if (config.isWindows && pathName.startsWith('//')) {
-			uri = encodeURI(`${config.scheme || 'file'}:${pathName}`);
-		}
-
-		// Otherwise we optionally add the provided authority if specified
-		else {
-			uri = encodeURI(`${config.scheme || 'file'}://${config.fallbackAuthority || ''}${pathName}`);
-		}
-
-		return uri.replace(/#/g, '%23');
-	}
-
-	//#endregion
-
-	return {
-		enableASARSupport,
-		fileUriFromPath
-	};
-}));
-
-// ESM-uncomment-begin
-// export const enableASARSupport = module.exports.enableASARSupport;
-// export const fileUriFromPath = module.exports.fileUriFromPath;
-// ESM-uncomment-end
diff --git a/src/buildfile.js b/src/buildfile.js
deleted file mode 100644
index cfe4b389e55..00000000000
--- a/src/buildfile.js
+++ /dev/null
@@ -1,84 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-/**
- * @param {string} name
- * @param {string[]=} exclude
- */
-function createModuleDescription(name, exclude) {
-
-	let excludes = ['vs/css'];
-	if (Array.isArray(exclude) && exclude.length > 0) {
-		excludes = excludes.concat(exclude);
-	}
-
-	return {
-		name: name,
-		include: [],
-		exclude: excludes
-	};
-}
-
-/**
- * @param {string} name
- */
-function createEditorWorkerModuleDescription(name) {
-	return createModuleDescription(name, ['vs/base/common/worker/simpleWorker', 'vs/editor/common/services/editorSimpleWorker']);
-}
-
-exports.base = [
-	{
-		name: 'vs/editor/common/services/editorSimpleWorker',
-		include: ['vs/base/common/worker/simpleWorker'],
-		exclude: [],
-		prepend: [
-			{ path: 'vs/loader.js' },
-			{ path: 'vs/base/worker/workerMain.js' }
-		],
-		dest: 'vs/base/worker/workerMain.js'
-	},
-	{
-		name: 'vs/base/common/worker/simpleWorker',
-		exclude: [],
-	}
-];
-
-exports.workerExtensionHost = [createEditorWorkerModuleDescription('vs/workbench/api/worker/extensionHostWorker')];
-exports.workerNotebook = [createEditorWorkerModuleDescription('vs/workbench/contrib/notebook/common/services/notebookSimpleWorker')];
-exports.workerLanguageDetection = [createEditorWorkerModuleDescription('vs/workbench/services/languageDetection/browser/languageDetectionSimpleWorker')];
-exports.workerLocalFileSearch = [createEditorWorkerModuleDescription('vs/workbench/services/search/worker/localFileSearch')];
-exports.workerProfileAnalysis = [createEditorWorkerModuleDescription('vs/platform/profiling/electron-sandbox/profileAnalysisWorker')];
-
-exports.workbenchDesktop = [
-	createEditorWorkerModuleDescription('vs/workbench/contrib/output/common/outputLinkComputer'),
-	createEditorWorkerModuleDescription('vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateTokenizationWorker.worker'),
-	createModuleDescription('vs/workbench/contrib/debug/node/telemetryApp'),
-	createModuleDescription('vs/platform/files/node/watcher/watcherMain'),
-	createModuleDescription('vs/platform/terminal/node/ptyHostMain'),
-	createModuleDescription('vs/workbench/api/node/extensionHostProcess'),
-	createModuleDescription('vs/workbench/contrib/issue/electron-sandbox/issueReporterMain'),
-];
-
-exports.workbenchWeb = [
-	createEditorWorkerModuleDescription('vs/workbench/contrib/output/common/outputLinkComputer'),
-	createEditorWorkerModuleDescription('vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateTokenizationWorker.worker'),
-	createModuleDescription('vs/code/browser/workbench/workbench', ['vs/workbench/workbench.web.main'])
-];
-
-exports.keyboardMaps = [
-	createModuleDescription('vs/workbench/services/keybinding/browser/keyboardLayouts/layout.contribution.linux'),
-	createModuleDescription('vs/workbench/services/keybinding/browser/keyboardLayouts/layout.contribution.darwin'),
-	createModuleDescription('vs/workbench/services/keybinding/browser/keyboardLayouts/layout.contribution.win')
-];
-
-exports.code = [
-	createModuleDescription('vs/code/electron-main/main'),
-	createModuleDescription('vs/code/node/cli'),
-	createModuleDescription('vs/code/node/cliProcessMain', ['vs/code/node/cli']),
-	createModuleDescription('vs/code/node/sharedProcess/sharedProcessMain'),
-	createModuleDescription('vs/code/electron-sandbox/processExplorer/processExplorerMain')
-];
-
-exports.entrypoint = createModuleDescription;
diff --git a/src/cli.js b/src/cli.js
index 6d2a3133322..71919773f48 100644
--- a/src/cli.js
+++ b/src/cli.js
@@ -6,24 +6,22 @@
 //@ts-check
 'use strict';
 
+// ESM-comment-begin
 // Delete `VSCODE_CWD` very early. We have seen
 // reports where `code .` would use the wrong
 // current working directory due to our variable
 // somehow escaping to the parent shell
 // (https://github.com/microsoft/vscode/issues/126399)
 delete process.env['VSCODE_CWD'];
-
-// ESM-comment-begin
-const bootstrap = require('./bootstrap');
 const bootstrapNode = require('./bootstrap-node');
 const bootstrapAmd = require('./bootstrap-amd');
 const { resolveNLSConfiguration } = require('./vs/base/node/nls');
 const product = require('./bootstrap-meta').product;
 // ESM-comment-end
 // ESM-uncomment-begin
+// import './bootstrap-cli.js'; // this MUST come before other imports as it changes global state
 // import * as path from 'path';
 // import { fileURLToPath } from 'url';
-// import * as bootstrap from './bootstrap.js';
 // import * as bootstrapNode from './bootstrap-node.js';
 // import * as bootstrapAmd from './bootstrap-amd.js';
 // import { resolveNLSConfiguration } from './vs/base/node/nls.js';
@@ -43,7 +41,7 @@ async function start() {
 	bootstrapNode.configurePortable(product);
 
 	// Enable ASAR support
-	bootstrap.enableASARSupport();
+	bootstrapNode.enableASARSupport();
 
 	// Signal processes that we got launched as CLI
 	process.env['VSCODE_CLI'] = '1';
diff --git a/src/main.js b/src/main.js
index 041d9d60037..719f51a4e21 100644
--- a/src/main.js
+++ b/src/main.js
@@ -15,7 +15,6 @@
 const path = require('path');
 const fs = require('original-fs');
 const os = require('os');
-const bootstrap = require('./bootstrap');
 const bootstrapNode = require('./bootstrap-node');
 const bootstrapAmd = require('./bootstrap-amd');
 const { getUserDataPath } = require(`./vs/platform/environment/node/userDataPath`);
@@ -30,11 +29,11 @@ const { app, protocol, crashReporter, Menu, contentTracing } = require('electron
 // import * as path from 'path';
 // import * as fs from 'original-fs';
 // import * as os from 'os';
-// import * as bootstrap from './bootstrap.js';
 // import * as bootstrapNode from './bootstrap-node.js';
 // import * as bootstrapAmd from './bootstrap-amd.js';
 // import { fileURLToPath } from 'url';
 // import { app, protocol, crashReporter, Menu, contentTracing } from 'electron';
+// import minimist from 'minimist';
 // import { product } from './bootstrap-meta.js';
 // import { parse } from './vs/base/common/jsonc.js';
 // import { getUserDataPath } from './vs/platform/environment/node/userDataPath.js';
@@ -51,14 +50,11 @@ perf.mark('code/didStartMain');
 const portable = bootstrapNode.configurePortable(product);
 
 // Enable ASAR support
-bootstrap.enableASARSupport();
+bootstrapNode.enableASARSupport();
 
 // ESM-comment-begin
 const minimist = require('minimist'); // !!! IMPORTANT: MUST come after bootstrap#enableASARSupport
 // ESM-comment-end
-// ESM-uncomment-begin
-// import minimist from 'minimist'; // !!! IMPORTANT: MUST come after bootstrap#enableASARSupport
-// ESM-uncomment-end
 
 const args = parseCLIArgs();
 // Configure static command line arguments
@@ -324,8 +320,9 @@ function configureCommandlineSwitchesSync(cliArgs) {
 	app.commandLine.appendSwitch('disable-features', featuresToDisable);
 
 	// Blink features to configure.
+	// `FontMatchingCTMigration` - Siwtch font matching on macOS to Appkit (Refs https://github.com/microsoft/vscode/issues/224496#issuecomment-2270418470).
 	const blinkFeaturesToDisable =
-		`${app.commandLine.getSwitchValue('disable-blink-features')}`;
+		`FontMatchingCTMigration,${app.commandLine.getSwitchValue('disable-blink-features')}`;
 	app.commandLine.appendSwitch('disable-blink-features', blinkFeaturesToDisable);
 
 	// Support JS Flags
diff --git a/src/server-cli.js b/src/server-cli.js
index dc7fa459f03..896e4f4c3b7 100644
--- a/src/server-cli.js
+++ b/src/server-cli.js
@@ -7,6 +7,8 @@
 'use strict';
 
 // ESM-comment-begin
+// Keep bootstrap-amd.js from redefining 'fs'.
+delete process.env['ELECTRON_RUN_AS_NODE'];
 const path = require('path');
 const bootstrapNode = require('./bootstrap-node');
 const bootstrapAmd = require('./bootstrap-amd');
@@ -14,6 +16,7 @@ const { resolveNLSConfiguration } = require('./vs/base/node/nls');
 const product = require('./bootstrap-meta').product;
 // ESM-comment-end
 // ESM-uncomment-begin
+// import './bootstrap-server.js'; // this MUST come before other imports as it changes global state
 // import * as path from 'path';
 // import { fileURLToPath } from 'url';
 // import * as bootstrapNode from './bootstrap-node.js';
@@ -26,9 +29,6 @@ const product = require('./bootstrap-meta').product;
 
 async function start() {
 
-	// Keep bootstrap-amd.js from redefining 'fs'.
-	delete process.env['ELECTRON_RUN_AS_NODE'];
-
 	// NLS
 	const nlsConfiguration = await resolveNLSConfiguration({ userLocale: 'en', osLocale: 'en', commit: product.commit, userDataPath: '', nlsMetadataPath: __dirname });
 	process.env['VSCODE_NLS_CONFIG'] = JSON.stringify(nlsConfiguration); // required for `bootstrap-amd` to pick up NLS messages
@@ -36,10 +36,10 @@ async function start() {
 	if (process.env['VSCODE_DEV']) {
 		// When running out of sources, we need to load node modules from remote/node_modules,
 		// which are compiled against nodejs, not electron
-		process.env['VSCODE_INJECT_NODE_MODULE_LOOKUP_PATH'] = process.env['VSCODE_INJECT_NODE_MODULE_LOOKUP_PATH'] || path.join(__dirname, '..', 'remote', 'node_modules');
-		bootstrapNode.injectNodeModuleLookupPath(process.env['VSCODE_INJECT_NODE_MODULE_LOOKUP_PATH']);
+		process.env['VSCODE_DEV_INJECT_NODE_MODULE_LOOKUP_PATH'] = process.env['VSCODE_DEV_INJECT_NODE_MODULE_LOOKUP_PATH'] || path.join(__dirname, '..', 'remote', 'node_modules');
+		bootstrapNode.devInjectNodeModuleLookupPath(process.env['VSCODE_DEV_INJECT_NODE_MODULE_LOOKUP_PATH']);
 	} else {
-		delete process.env['VSCODE_INJECT_NODE_MODULE_LOOKUP_PATH'];
+		delete process.env['VSCODE_DEV_INJECT_NODE_MODULE_LOOKUP_PATH'];
 	}
 	bootstrapAmd.load('vs/server/node/server.cli');
 }
diff --git a/src/server-main.js b/src/server-main.js
index f1fad8f0b51..93b1a3fc9dd 100644
--- a/src/server-main.js
+++ b/src/server-main.js
@@ -12,6 +12,9 @@
  */
 
 // ESM-comment-begin
+// Keep bootstrap-amd.js from redefining 'fs'.
+delete process.env['ELECTRON_RUN_AS_NODE'];
+
 const path = require('path');
 const http = require('http');
 const os = require('os');
@@ -25,18 +28,19 @@ const perf = require(`./vs/base/common/performance`);
 const minimist = require('minimist');
 // ESM-comment-end
 // ESM-uncomment-begin
+// import './bootstrap-server.js'; // this MUST come before other imports as it changes global state
 // import * as path from 'path';
 // import * as http from 'http';
 // import * as os from 'os';
 // import * as readline from 'readline';
 // import { performance }from 'perf_hooks';
 // import { fileURLToPath } from 'url';
+// import minimist from 'minimist';
 // import * as bootstrapNode from './bootstrap-node.js';
 // import * as bootstrapAmd from './bootstrap-amd.js';
 // import { resolveNLSConfiguration } from './vs/base/node/nls.js';
 // import { product } from './bootstrap-meta.js';
 // import * as perf from './vs/base/common/performance.js';
-// import minimist from 'minimist';
 //
 // const __dirname = path.dirname(fileURLToPath(import.meta.url));
 // ESM-uncomment-end
@@ -50,7 +54,9 @@ async function start() {
 	// Do a quick parse to determine if a server or the cli needs to be started
 	const parsedArgs = minimist(process.argv.slice(2), {
 		boolean: ['start-server', 'list-extensions', 'print-ip-address', 'help', 'version', 'accept-server-license-terms', 'update-extensions'],
-		string: ['install-extension', 'install-builtin-extension', 'uninstall-extension', 'locate-extension', 'socket-path', 'host', 'port', 'compatibility'],
+		// Start PWB:cert - adding cert and cert-key options to string arg list
+		string: ['install-extension', 'install-builtin-extension', 'uninstall-extension', 'locate-extension', 'socket-path', 'host', 'port', 'compatibility', 'cert-key', 'cert'],
+		// End PWB:cert
 		alias: { help: 'h', version: 'v' }
 	});
 	['host', 'port', 'accept-server-license-terms'].forEach(e => {
@@ -92,6 +98,13 @@ async function start() {
 		return _remoteExtensionHostAgentServerPromise;
 	};
 
+	// --- Start PWB ---
+	const fs = require('fs');
+	const http = require('http');
+	const https = require('https');
+	const os = require('os');
+	// --- End PWB ---
+
 	if (Array.isArray(product.serverLicense) && product.serverLicense.length) {
 		console.log(product.serverLicense.join('\n'));
 		if (product.serverLicensePrompt && parsedArgs['accept-server-license-terms'] !== true) {
@@ -116,7 +129,12 @@ async function start() {
 
 	/** @type {string | import('net').AddressInfo | null} */
 	let address = null;
-	const server = http.createServer(async (req, res) => {
+
+	const useSSL = (parsedArgs['cert-key'] && parsedArgs['cert']) ? true : false;
+	const server = (useSSL ? https : http).createServer(useSSL ? {
+		key: fs.readFileSync(parsedArgs['cert-key']),
+		cert: fs.readFileSync(parsedArgs['cert']),
+	} : {}, async (req, res) => {
 		if (firstRequest) {
 			firstRequest = false;
 			perf.mark('code/server/firstRequest');
@@ -124,14 +142,18 @@ async function start() {
 		const remoteExtensionHostAgentServer = await getRemoteExtensionHostAgentServer();
 		return remoteExtensionHostAgentServer.handleRequest(req, res);
 	});
-	server.on('upgrade', async (req, socket) => {
+	// PWB Modify Start: Add upgradedHead parameter to handleUpgrade for server proxy support
+	server.on('upgrade', async (req, socket, upgradeHead) => {
+		// PWB Modify End
 		if (firstWebSocket) {
 			firstWebSocket = false;
 			perf.mark('code/server/firstWebSocket');
 		}
 		const remoteExtensionHostAgentServer = await getRemoteExtensionHostAgentServer();
+		// PWB Modify Start: Add upgradedHead parameter to handleUpgrade for server proxy support
 		// @ts-ignore
-		return remoteExtensionHostAgentServer.handleUpgrade(req, socket);
+		return remoteExtensionHostAgentServer.handleUpgrade(req, socket, upgradeHead);
+		// PWB Modify End
 	});
 	server.on('error', async (err) => {
 		const remoteExtensionHostAgentServer = await getRemoteExtensionHostAgentServer();
@@ -279,13 +301,12 @@ async function findFreePort(host, start, end) {
  */
 function loadCode(nlsConfiguration) {
 	return new Promise((resolve, reject) => {
-		delete process.env['ELECTRON_RUN_AS_NODE']; // Keep bootstrap-amd.js from redefining 'fs'.
 
 		/** @type {INLSConfiguration} */
 		process.env['VSCODE_NLS_CONFIG'] = JSON.stringify(nlsConfiguration); // required for `bootstrap-amd` to pick up NLS messages
 
 		// See https://github.com/microsoft/vscode-remote-release/issues/6543
-		// We would normally install a SIGPIPE listener in bootstrap.js
+		// We would normally install a SIGPIPE listener in bootstrap-node.js
 		// But in certain situations, the console itself can be in a broken pipe state
 		// so logging SIGPIPE to the console will cause an infinite async loop
 		process.env['VSCODE_HANDLES_SIGPIPE'] = 'true';
@@ -293,10 +314,10 @@ function loadCode(nlsConfiguration) {
 		if (process.env['VSCODE_DEV']) {
 			// When running out of sources, we need to load node modules from remote/node_modules,
 			// which are compiled against nodejs, not electron
-			process.env['VSCODE_INJECT_NODE_MODULE_LOOKUP_PATH'] = process.env['VSCODE_INJECT_NODE_MODULE_LOOKUP_PATH'] || path.join(__dirname, '..', 'remote', 'node_modules');
-			bootstrapNode.injectNodeModuleLookupPath(process.env['VSCODE_INJECT_NODE_MODULE_LOOKUP_PATH']);
+			process.env['VSCODE_DEV_INJECT_NODE_MODULE_LOOKUP_PATH'] = process.env['VSCODE_DEV_INJECT_NODE_MODULE_LOOKUP_PATH'] || path.join(__dirname, '..', 'remote', 'node_modules');
+			bootstrapNode.devInjectNodeModuleLookupPath(process.env['VSCODE_DEV_INJECT_NODE_MODULE_LOOKUP_PATH']);
 		} else {
-			delete process.env['VSCODE_INJECT_NODE_MODULE_LOOKUP_PATH'];
+			delete process.env['VSCODE_DEV_INJECT_NODE_MODULE_LOOKUP_PATH'];
 		}
 		bootstrapAmd.load('vs/server/node/server.main', resolve, reject);
 	});
diff --git a/src/tsconfig.json b/src/tsconfig.json
index e7028d7f5db..b1f7254aa6e 100644
--- a/src/tsconfig.json
+++ b/src/tsconfig.json
@@ -26,11 +26,13 @@
 		]
 	},
 	"include": [
-		"./bootstrap.js",
 		"./bootstrap-amd.js",
+		"./bootstrap-cli.js",
 		"./bootstrap-fork.js",
+		"./bootstrap-import.js",
 		"./bootstrap-meta.js",
 		"./bootstrap-node.js",
+		"./bootstrap-server.js",
 		"./bootstrap-window.js",
 		"./cli.js",
 		"./main.js",
diff --git a/src/tsconfig.monaco.json b/src/tsconfig.monaco.json
index bad9fb8cacc..bb4fd1ccc35 100644
--- a/src/tsconfig.monaco.json
+++ b/src/tsconfig.monaco.json
@@ -8,7 +8,7 @@
 		],
 		"paths": {},
 		"module": "amd",
-		"moduleResolution": "classic",
+		"moduleResolution": "node",
 		"removeComments": false,
 		"preserveConstEnums": true,
 		"target": "ES2022",
diff --git a/src/typings/vscode-globals-modules.d.ts b/src/typings/vscode-globals-modules.d.ts
index c538b99b63f..cfeeac71845 100644
--- a/src/typings/vscode-globals-modules.d.ts
+++ b/src/typings/vscode-globals-modules.d.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-// AMD2ESM mirgation relevant
+// AMD2ESM migration relevant
 
 declare global {
 
 	/**
-	 * @deprecated node modules that are in used in a context that
+	 * TODO@esm @deprecated node modules that are in used in a context that
 	 * shouldn't have access to node_modules (node-free renderer or
 	 * shared process)
 	 */
diff --git a/src/typings/vscode-globals-nls.d.ts b/src/typings/vscode-globals-nls.d.ts
index bc480767623..2b5d48e110c 100644
--- a/src/typings/vscode-globals-nls.d.ts
+++ b/src/typings/vscode-globals-nls.d.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-// AMD2ESM mirgation relevant
+// AMD2ESM migration relevant
 
 /**
  * NLS Globals: these need to be defined in all contexts that make
@@ -24,10 +24,14 @@ declare global {
 	 * All NLS messages produced by `localize` and `localize2` calls
 	 * under `src/vs` translated to the language as indicated by
 	 * `_VSCODE_NLS_LANGUAGE`.
+	 *
+	 * Instead of accessing this global variable directly, use function getNLSMessages.
 	 */
 	var _VSCODE_NLS_MESSAGES: string[];
 	/**
 	 * The actual language of the NLS messages (e.g. 'en', de' or 'pt-br').
+	 *
+	 * Instead of accessing this global variable directly, use function getNLSLanguage.
 	 */
 	var _VSCODE_NLS_LANGUAGE: string | undefined;
 }
diff --git a/src/typings/vscode-globals-product.d.ts b/src/typings/vscode-globals-product.d.ts
index f6aa62bfe94..2cd632e77a0 100644
--- a/src/typings/vscode-globals-product.d.ts
+++ b/src/typings/vscode-globals-product.d.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-// AMD2ESM mirgation relevant
+// AMD2ESM migration relevant
 
 declare global {
 
diff --git a/src/typings/vscode-globals-ttp.d.ts b/src/typings/vscode-globals-ttp.d.ts
new file mode 100644
index 00000000000..b91080ec741
--- /dev/null
+++ b/src/typings/vscode-globals-ttp.d.ts
@@ -0,0 +1,16 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+// AMD2ESM migration relevant
+
+declare global {
+
+	var _VSCODE_WEB_PACKAGE_TTP: Pick<TrustedTypePolicy<{
+		createScriptURL(value: string): string;
+	}>, 'name' | 'createScriptURL'> | undefined;
+}
+
+// fake export to make global work
+export { }
diff --git a/src/vs/amdX.ts b/src/vs/amdX.ts
index e467909b6fc..60d61fabd1a 100644
--- a/src/vs/amdX.ts
+++ b/src/vs/amdX.ts
@@ -3,14 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { isESM } from 'vs/base/common/amd';
-import { AppResourcePath, FileAccess, nodeModulesAsarPath, nodeModulesPath } from 'vs/base/common/network';
+import { isESM, canASAR } from 'vs/base/common/amd';
+import { AppResourcePath, FileAccess, nodeModulesAsarPath, nodeModulesPath, Schemas, VSCODE_AUTHORITY } from 'vs/base/common/network';
 import * as platform from 'vs/base/common/platform';
 import { IProductConfiguration } from 'vs/base/common/product';
 import { assertType } from 'vs/base/common/types';
 import { URI } from 'vs/base/common/uri';
 
-
 class DefineCall {
 	constructor(
 		public readonly id: string | null | undefined,
@@ -39,7 +38,7 @@ class AMDModuleImporter {
 		}
 		this._initialized = true;
 
-		(<any>globalThis).define = (id: any, dependencies: any, callback: any) => {
+		(globalThis as any).define = (id: any, dependencies: any, callback: any) => {
 			if (typeof id !== 'string') {
 				callback = dependencies;
 				dependencies = id;
@@ -55,24 +54,24 @@ class AMDModuleImporter {
 			this._defineCalls.push(new DefineCall(id, dependencies, callback));
 		};
 
-		(<any>globalThis).define.amd = true;
+		(globalThis as any).define.amd = true;
 
 		if (this._isRenderer) {
 			// eslint-disable-next-line no-restricted-globals
-			this._amdPolicy = window.trustedTypes?.createPolicy('amdLoader', {
+			this._amdPolicy = (globalThis as any)._VSCODE_WEB_PACKAGE_TTP ?? window.trustedTypes?.createPolicy('amdLoader', {
 				createScriptURL(value) {
 					// eslint-disable-next-line no-restricted-globals
 					if (value.startsWith(window.location.origin)) {
 						return value;
 					}
-					if (value.startsWith('vscode-file://vscode-app')) {
+					if (value.startsWith(`${Schemas.vscodeFileResource}://${VSCODE_AUTHORITY}`)) {
 						return value;
 					}
 					throw new Error(`[trusted_script_src] Invalid script url: ${value}`);
 				}
 			});
 		} else if (this._isWebWorker) {
-			this._amdPolicy = (<any>globalThis).trustedTypes?.createPolicy('amdLoader', {
+			this._amdPolicy = (globalThis as any)._VSCODE_WEB_PACKAGE_TTP ?? (globalThis as any).trustedTypes?.createPolicy('amdLoader', {
 				createScriptURL(value: string) {
 					return value;
 				}
@@ -84,14 +83,31 @@ class AMDModuleImporter {
 		this._initialize();
 		const defineCall = await (this._isWebWorker ? this._workerLoadScript(scriptSrc) : this._isRenderer ? this._rendererLoadScript(scriptSrc) : this._nodeJSLoadScript(scriptSrc));
 		if (!defineCall) {
-			throw new Error(`Did not receive a define call from script ${scriptSrc}`);
+			// throw new Error(`Did not receive a define call from script ${scriptSrc}`);
+			console.warn(`Did not receive a define call from script ${scriptSrc}`);
+			return <T>undefined;
 		}
-		// TODO require, exports, module
-		if (Array.isArray(defineCall.dependencies) && defineCall.dependencies.length > 0) {
-			throw new Error(`Cannot resolve dependencies for script ${scriptSrc}. The dependencies are: ${defineCall.dependencies.join(', ')}`);
+		// TODO require, module
+		const exports = {};
+		const dependencyObjs: any[] = [];
+		const dependencyModules: string[] = [];
+
+		if (Array.isArray(defineCall.dependencies)) {
+
+			for (const mod of defineCall.dependencies) {
+				if (mod === 'exports') {
+					dependencyObjs.push(exports);
+				} else {
+					dependencyModules.push(mod);
+				}
+			}
+		}
+
+		if (dependencyModules.length > 0) {
+			throw new Error(`Cannot resolve dependencies for script ${scriptSrc}. The dependencies are: ${dependencyModules.join(', ')}`);
 		}
 		if (typeof defineCall.callback === 'function') {
-			return defineCall.callback([]);
+			return defineCall.callback(...dependencyObjs) ?? exports;
 		} else {
 			return defineCall.callback;
 		}
@@ -129,25 +145,23 @@ class AMDModuleImporter {
 		});
 	}
 
-	private _workerLoadScript(scriptSrc: string): Promise<DefineCall | undefined> {
-		return new Promise<DefineCall | undefined>((resolve, reject) => {
-			try {
-				if (this._amdPolicy) {
-					scriptSrc = this._amdPolicy.createScriptURL(scriptSrc) as any as string;
-				}
-				importScripts(scriptSrc);
-				resolve(this._defineCalls.pop());
-			} catch (err) {
-				reject(err);
-			}
-		});
+	private async _workerLoadScript(scriptSrc: string): Promise<DefineCall | undefined> {
+		if (this._amdPolicy) {
+			scriptSrc = this._amdPolicy.createScriptURL(scriptSrc) as any as string;
+		}
+		if (isESM) {
+			await import(scriptSrc);
+		} else {
+			importScripts(scriptSrc);
+		}
+		return this._defineCalls.pop();
 	}
 
 	private async _nodeJSLoadScript(scriptSrc: string): Promise<DefineCall | undefined> {
 		try {
-			const fs = <typeof import('fs')>globalThis._VSCODE_NODE_MODULES['fs'];
-			const vm = <typeof import('vm')>globalThis._VSCODE_NODE_MODULES['vm'];
-			const module = <typeof import('module')>globalThis._VSCODE_NODE_MODULES['module'];
+			const fs = (globalThis as any)._VSCODE_NODE_MODULES['fs'];
+			const vm = (globalThis as any)._VSCODE_NODE_MODULES['vm'];
+			const module = (globalThis as any)._VSCODE_NODE_MODULES['module'];
 
 			const filePath = URI.parse(scriptSrc).fsPath;
 			const content = fs.readFileSync(filePath).toString();
@@ -165,11 +179,6 @@ class AMDModuleImporter {
 
 const cache = new Map<string, Promise<any>>();
 
-let _paths: Record<string, string> = {};
-if (typeof globalThis.require === 'object') {
-	_paths = (<Record<string, any>>globalThis.require).paths ?? {};
-}
-
 /**
  * Utility for importing an AMD node module. This util supports AMD and ESM contexts and should be used while the ESM adoption
  * is on its way.
@@ -181,11 +190,7 @@ export async function importAMDNodeModule<T>(nodeModuleName: string, pathInsideN
 
 		if (isBuilt === undefined) {
 			const product = globalThis._VSCODE_PRODUCT_JSON as unknown as IProductConfiguration;
-			isBuilt = Boolean((product ?? (<any>globalThis).vscode?.context?.configuration()?.product)?.commit);
-		}
-
-		if (_paths[nodeModuleName]) {
-			nodeModuleName = _paths[nodeModuleName];
+			isBuilt = Boolean((product ?? (globalThis as any).vscode?.context?.configuration()?.product)?.commit);
 		}
 
 		const nodeModulePath = pathInsideNodeModule ? `${nodeModuleName}/${pathInsideNodeModule}` : nodeModuleName;
@@ -198,7 +203,7 @@ export async function importAMDNodeModule<T>(nodeModuleName: string, pathInsideN
 			// bit of a special case for: src/vs/workbench/services/languageDetection/browser/languageDetectionSimpleWorker.ts
 			scriptSrc = nodeModulePath;
 		} else {
-			const useASAR = (isBuilt && !platform.isWeb);
+			const useASAR = (canASAR && isBuilt && !platform.isWeb);
 			const actualNodeModulesPath = (useASAR ? nodeModulesAsarPath : nodeModulesPath);
 			const resourcePath: AppResourcePath = `${actualNodeModulesPath}/${nodeModulePath}`;
 			scriptSrc = FileAccess.asBrowserUri(resourcePath).toString(true);
@@ -215,8 +220,8 @@ export function resolveAmdNodeModulePath(nodeModuleName: string, pathInsideNodeM
 	assertType(isESM);
 
 	const product = globalThis._VSCODE_PRODUCT_JSON as unknown as IProductConfiguration;
-	const isBuilt = Boolean((product ?? (<any>globalThis).vscode?.context?.configuration()?.product)?.commit);
-	const useASAR = (isBuilt && !platform.isWeb);
+	const isBuilt = Boolean((product ?? (globalThis as any).vscode?.context?.configuration()?.product)?.commit);
+	const useASAR = (canASAR && isBuilt && !platform.isWeb);
 
 	const nodeModulePath = `${nodeModuleName}/${pathInsideNodeModule}`;
 	const actualNodeModulesPath = (useASAR ? nodeModulesAsarPath : nodeModulesPath);
diff --git a/src/vs/base/browser/browser.ts b/src/vs/base/browser/browser.ts
index 87db1c573ed..f3e6b43cda9 100644
--- a/src/vs/base/browser/browser.ts
+++ b/src/vs/base/browser/browser.ts
@@ -136,6 +136,6 @@ export function isWCOEnabled(): boolean {
 
 // Returns the bounding rect of the titlebar area if it is supported and defined
 // See docs at https://developer.mozilla.org/en-US/docs/Web/API/WindowControlsOverlay/getTitlebarAreaRect
-export function getWCOBoundingRect(): DOMRect | undefined {
-	return (navigator as any)?.windowControlsOverlay?.getTitlebarAreaRect();
+export function getWCOTitlebarAreaRect(targetWindow: Window): DOMRect | undefined {
+	return (targetWindow.navigator as any)?.windowControlsOverlay?.getTitlebarAreaRect();
 }
diff --git a/src/vs/base/browser/defaultWorkerFactory.ts b/src/vs/base/browser/defaultWorkerFactory.ts
index 8f077b399ab..9cfd4299271 100644
--- a/src/vs/base/browser/defaultWorkerFactory.ts
+++ b/src/vs/base/browser/defaultWorkerFactory.ts
@@ -5,9 +5,19 @@
 
 import { createTrustedTypesPolicy } from 'vs/base/browser/trustedTypes';
 import { onUnexpectedError } from 'vs/base/common/errors';
-import { COI } from 'vs/base/common/network';
-import { IWorker, IWorkerCallback, IWorkerFactory, logOnceWebWorkerWarning } from 'vs/base/common/worker/simpleWorker';
+import { AppResourcePath, COI, FileAccess } from 'vs/base/common/network';
+import { URI } from 'vs/base/common/uri';
+import { IWorker, IWorkerCallback, IWorkerClient, IWorkerDescriptor, IWorkerFactory, logOnceWebWorkerWarning, SimpleWorkerClient } from 'vs/base/common/worker/simpleWorker';
 import { Disposable, toDisposable } from 'vs/base/common/lifecycle';
+import { coalesce } from 'vs/base/common/arrays';
+import { getNLSLanguage, getNLSMessages } from 'vs/nls';
+
+// ESM-comment-begin
+const isESM = false;
+// ESM-comment-end
+// ESM-uncomment-begin
+// const isESM = true;
+// ESM-uncomment-end
 
 // Reuse the trusted types policy defined from worker bootstrap
 // when available.
@@ -23,10 +33,10 @@ export function createBlobWorker(blobUrl: string, options?: WorkerOptions): Work
 	if (!blobUrl.startsWith('blob:')) {
 		throw new URIError('Not a blob-url: ' + blobUrl);
 	}
-	return new Worker(ttPolicy ? ttPolicy.createScriptURL(blobUrl) as unknown as string : blobUrl, options);
+	return new Worker(ttPolicy ? ttPolicy.createScriptURL(blobUrl) as unknown as string : blobUrl, { ...options, type: isESM ? 'module' : undefined });
 }
 
-function getWorker(label: string): Worker | Promise<Worker> {
+function getWorker(esmWorkerLocation: URI | undefined, label: string): Worker | Promise<Worker> {
 	// Option for hosts to overwrite the worker script (used in the standalone editor)
 	interface IMonacoEnvironment {
 		getWorker?(moduleId: string, label: string): Worker | Promise<Worker>;
@@ -39,57 +49,76 @@ function getWorker(label: string): Worker | Promise<Worker> {
 		}
 		if (typeof monacoEnvironment.getWorkerUrl === 'function') {
 			const workerUrl = monacoEnvironment.getWorkerUrl('workerMain.js', label);
-			return new Worker(ttPolicy ? ttPolicy.createScriptURL(workerUrl) as unknown as string : workerUrl, { name: label });
+			return new Worker(ttPolicy ? ttPolicy.createScriptURL(workerUrl) as unknown as string : workerUrl, { name: label, type: isESM ? 'module' : undefined });
 		}
 	}
 	// ESM-comment-begin
 	if (typeof require === 'function') {
-		// check if the JS lives on a different origin
-		const workerMain = require.toUrl('vs/base/worker/workerMain.js'); // explicitly using require.toUrl(), see https://github.com/microsoft/vscode/issues/107440#issuecomment-698982321
-		const workerUrl = getWorkerBootstrapUrl(workerMain, label);
-		return new Worker(ttPolicy ? ttPolicy.createScriptURL(workerUrl) as unknown as string : workerUrl, { name: label });
+		const workerMainLocation = require.toUrl('vs/base/worker/workerMain.js'); // explicitly using require.toUrl(), see https://github.com/microsoft/vscode/issues/107440#issuecomment-698982321
+		const factoryModuleId = 'vs/base/worker/defaultWorkerFactory.js';
+		const workerBaseUrl = require.toUrl(factoryModuleId).slice(0, -factoryModuleId.length); // explicitly using require.toUrl(), see https://github.com/microsoft/vscode/issues/107440#issuecomment-698982321
+		const workerUrl = getWorkerBootstrapUrl(label, workerMainLocation, workerBaseUrl);
+		return new Worker(ttPolicy ? ttPolicy.createScriptURL(workerUrl) as unknown as string : workerUrl, { name: label, type: isESM ? 'module' : undefined });
 	}
 	// ESM-comment-end
+	if (esmWorkerLocation) {
+		const workerUrl = getWorkerBootstrapUrl(label, esmWorkerLocation.toString(true));
+		const worker = new Worker(ttPolicy ? ttPolicy.createScriptURL(workerUrl) as unknown as string : workerUrl, { name: label, type: isESM ? 'module' : undefined });
+		if (isESM) {
+			return whenESMWorkerReady(worker);
+		} else {
+			return worker;
+		}
+	}
 	throw new Error(`You must define a function MonacoEnvironment.getWorkerUrl or MonacoEnvironment.getWorker`);
 }
 
-// ESM-comment-begin
-export function getWorkerBootstrapUrl(scriptPath: string, label: string): string {
-	if (/^((http:)|(https:)|(file:))/.test(scriptPath) && scriptPath.substring(0, globalThis.origin.length) !== globalThis.origin) {
+function getWorkerBootstrapUrl(label: string, workerScriptUrl: string, workerBaseUrl?: string): string {
+	if (/^((http:)|(https:)|(file:))/.test(workerScriptUrl) && workerScriptUrl.substring(0, globalThis.origin.length) !== globalThis.origin) {
 		// this is the cross-origin case
 		// i.e. the webpage is running at a different origin than where the scripts are loaded from
 	} else {
-		const start = scriptPath.lastIndexOf('?');
-		const end = scriptPath.lastIndexOf('#', start);
+		const start = workerScriptUrl.lastIndexOf('?');
+		const end = workerScriptUrl.lastIndexOf('#', start);
 		const params = start > 0
-			? new URLSearchParams(scriptPath.substring(start + 1, ~end ? end : undefined))
+			? new URLSearchParams(workerScriptUrl.substring(start + 1, ~end ? end : undefined))
 			: new URLSearchParams();
 
 		COI.addSearchParam(params, true, true);
 		const search = params.toString();
 		if (!search) {
-			scriptPath = `${scriptPath}#${label}`;
+			workerScriptUrl = `${workerScriptUrl}#${label}`;
 		} else {
-			scriptPath = `${scriptPath}?${params.toString()}#${label}`;
+			workerScriptUrl = `${workerScriptUrl}?${params.toString()}#${label}`;
 		}
 	}
 
-	const factoryModuleId = 'vs/base/worker/defaultWorkerFactory.js';
-	const workerBaseUrl = require.toUrl(factoryModuleId).slice(0, -factoryModuleId.length); // explicitly using require.toUrl(), see https://github.com/microsoft/vscode/issues/107440#issuecomment-698982321
-	const blob = new Blob([[
+	const blob = new Blob([coalesce([
 		`/*${label}*/`,
-		`globalThis.MonacoEnvironment = { baseUrl: '${workerBaseUrl}' };`,
-		// VSCODE_GLOBALS: NLS
-		`globalThis._VSCODE_NLS_MESSAGES = ${JSON.stringify(globalThis._VSCODE_NLS_MESSAGES)};`,
-		`globalThis._VSCODE_NLS_LANGUAGE = ${JSON.stringify(globalThis._VSCODE_NLS_LANGUAGE)};`,
+		workerBaseUrl ? `globalThis.MonacoEnvironment = { baseUrl: '${workerBaseUrl}' };` : undefined,
+		`globalThis._VSCODE_NLS_MESSAGES = ${JSON.stringify(getNLSMessages())};`,
+		`globalThis._VSCODE_NLS_LANGUAGE = ${JSON.stringify(getNLSLanguage())};`,
+		`globalThis._VSCODE_FILE_ROOT = '${globalThis._VSCODE_FILE_ROOT}';`,
 		`const ttPolicy = globalThis.trustedTypes?.createPolicy('defaultWorkerFactory', { createScriptURL: value => value });`,
 		`globalThis.workerttPolicy = ttPolicy;`,
-		`importScripts(ttPolicy?.createScriptURL('${scriptPath}') ?? '${scriptPath}');`,
+		isESM ? `await import(ttPolicy?.createScriptURL('${workerScriptUrl}') ?? '${workerScriptUrl}');` : `importScripts(ttPolicy?.createScriptURL('${workerScriptUrl}') ?? '${workerScriptUrl}');`, //
+		isESM ? `globalThis.postMessage({ type: 'vscode-worker-ready' });` : undefined, // in ESM signal we are ready after the async import
 		`/*${label}*/`
-	].join('')], { type: 'application/javascript' });
+	]).join('')], { type: 'application/javascript' });
 	return URL.createObjectURL(blob);
 }
-// ESM-comment-end
+
+function whenESMWorkerReady(worker: Worker): Promise<Worker> {
+	return new Promise<Worker>((resolve, reject) => {
+		worker.onmessage = function (e) {
+			if (e.data.type === 'vscode-worker-ready') {
+				worker.onmessage = null;
+				resolve(worker);
+			}
+		};
+		worker.onerror = reject;
+	});
+}
 
 function isPromiseLike<T>(obj: any): obj is PromiseLike<T> {
 	if (typeof obj.then === 'function') {
@@ -108,17 +137,17 @@ class WebWorker extends Disposable implements IWorker {
 	private readonly label: string;
 	private worker: Promise<Worker> | null;
 
-	constructor(moduleId: string, id: number, label: string, onMessageCallback: IWorkerCallback, onErrorCallback: (err: any) => void) {
+	constructor(esmWorkerLocation: URI | undefined, amdModuleId: string, id: number, label: string, onMessageCallback: IWorkerCallback, onErrorCallback: (err: any) => void) {
 		super();
 		this.id = id;
 		this.label = label;
-		const workerOrPromise = getWorker(label);
+		const workerOrPromise = getWorker(esmWorkerLocation, label);
 		if (isPromiseLike(workerOrPromise)) {
 			this.worker = workerOrPromise;
 		} else {
 			this.worker = Promise.resolve(workerOrPromise);
 		}
-		this.postMessage(moduleId, []);
+		this.postMessage(amdModuleId, []);
 		this.worker.then((w) => {
 			w.onmessage = function (ev) {
 				onMessageCallback(ev.data);
@@ -155,29 +184,45 @@ class WebWorker extends Disposable implements IWorker {
 	}
 }
 
-export class DefaultWorkerFactory implements IWorkerFactory {
+export class WorkerDescriptor implements IWorkerDescriptor {
 
-	private static LAST_WORKER_ID = 0;
+	public readonly esmModuleLocation: URI | undefined;
+
+	constructor(
+		public readonly amdModuleId: string,
+		readonly label: string | undefined,
+	) {
+		this.esmModuleLocation = (isESM ? FileAccess.asBrowserUri(`${amdModuleId}.esm.js` as AppResourcePath) : undefined);
+	}
+}
 
-	private _label: string | undefined;
+class DefaultWorkerFactory implements IWorkerFactory {
+
+	private static LAST_WORKER_ID = 0;
 	private _webWorkerFailedBeforeError: any;
 
-	constructor(label: string | undefined) {
-		this._label = label;
+	constructor() {
 		this._webWorkerFailedBeforeError = false;
 	}
 
-	public create(moduleId: string, onMessageCallback: IWorkerCallback, onErrorCallback: (err: any) => void): IWorker {
+	public create(desc: IWorkerDescriptor, onMessageCallback: IWorkerCallback, onErrorCallback: (err: any) => void): IWorker {
 		const workerId = (++DefaultWorkerFactory.LAST_WORKER_ID);
 
 		if (this._webWorkerFailedBeforeError) {
 			throw this._webWorkerFailedBeforeError;
 		}
 
-		return new WebWorker(moduleId, workerId, this._label || 'anonymous' + workerId, onMessageCallback, (err) => {
+		return new WebWorker(desc.esmModuleLocation, desc.amdModuleId, workerId, desc.label || 'anonymous' + workerId, onMessageCallback, (err) => {
 			logOnceWebWorkerWarning(err);
 			this._webWorkerFailedBeforeError = err;
 			onErrorCallback(err);
 		});
 	}
 }
+
+export function createWebWorker<T extends object>(amdModuleId: string, label: string | undefined): IWorkerClient<T>;
+export function createWebWorker<T extends object>(workerDescriptor: IWorkerDescriptor): IWorkerClient<T>;
+export function createWebWorker<T extends object>(arg0: string | IWorkerDescriptor, arg1?: string | undefined): IWorkerClient<T> {
+	const workerDescriptor = (typeof arg0 === 'string' ? new WorkerDescriptor(arg0, arg1) : arg0);
+	return new SimpleWorkerClient<T>(new DefaultWorkerFactory(), workerDescriptor);
+}
diff --git a/src/vs/base/browser/dom.ts b/src/vs/base/browser/dom.ts
index a6acbe7f3a5..5df7c874fce 100644
--- a/src/vs/base/browser/dom.ts
+++ b/src/vs/base/browser/dom.ts
@@ -2521,8 +2521,8 @@ export function trackAttributes(from: Element, to: Element, filter?: string[]):
  * @see https://www.smashingmagazine.com/2023/08/better-context-menus-safe-triangles/ for example
  */
 export class SafeTriangle {
-	// 4 triangles, 2 points (x, y) stored for each
-	private triangles: number[] = [];
+	// 4 points (x, y), 8 length
+	private points = new Int16Array(8);
 
 	constructor(
 		private readonly originX: number,
@@ -2530,34 +2530,28 @@ export class SafeTriangle {
 		target: HTMLElement
 	) {
 		const { top, left, right, bottom } = target.getBoundingClientRect();
-		const t = this.triangles;
+		const t = this.points;
 		let i = 0;
 
 		t[i++] = left;
 		t[i++] = top;
-		t[i++] = right;
-		t[i++] = top;
-
-		t[i++] = left;
-		t[i++] = top;
-		t[i++] = left;
-		t[i++] = bottom;
 
 		t[i++] = right;
 		t[i++] = top;
-		t[i++] = right;
-		t[i++] = bottom;
 
 		t[i++] = left;
 		t[i++] = bottom;
+
 		t[i++] = right;
 		t[i++] = bottom;
 	}
 
 	public contains(x: number, y: number) {
-		const { triangles, originX, originY } = this;
+		const { points, originX, originY } = this;
 		for (let i = 0; i < 4; i++) {
-			if (isPointWithinTriangle(x, y, originX, originY, triangles[2 * i], triangles[2 * i + 1], triangles[2 * i + 2], triangles[2 * i + 3])) {
+			const p1 = 2 * i;
+			const p2 = 2 * ((i + 1) % 4);
+			if (isPointWithinTriangle(x, y, originX, originY, points[p1], points[p1 + 1], points[p2], points[p2 + 1])) {
 				return true;
 			}
 		}
diff --git a/src/vs/base/browser/indexedDB.ts b/src/vs/base/browser/indexedDB.ts
index 6d56022c98c..627348120a3 100644
--- a/src/vs/base/browser/indexedDB.ts
+++ b/src/vs/base/browser/indexedDB.ts
@@ -90,11 +90,73 @@ export class IndexedDB {
 		});
 	}
 
+	// --- Start PWB: Clear browser history
+	static readonly PWB_CHANGED_CONNECTION_KEY = 'pwb-changed-connections';
+	private pwbConnectionOpen: boolean = true;
+	private static readonly PWB_OPEN_CONNECTION_KEY = 'pwb-connections';
+
+	pwbAddToSessionSet(key: string): void {
+		const connectionString = sessionStorage.getItem(key);
+		let connectionSet;
+		if (connectionString) {
+			connectionSet = new Set(JSON.parse(connectionString));
+			if (connectionSet.has(this.name)) {
+				return;
+			}
+		} else {
+			connectionSet = new Set();
+		}
+		connectionSet.add(this.name);
+		sessionStorage.setItem(key, JSON.stringify(Array.from(connectionSet)));
+	}
+
+	pwbRemoveFromSessionSet(key: string): void {
+		const connectionString = sessionStorage.getItem(key);
+		if (connectionString) {
+			const connectionSet = new Set(JSON.parse(connectionString));
+			if (connectionSet.delete(this.name)) {
+				sessionStorage.setItem(key, JSON.stringify(Array.from(connectionSet)));
+			}
+		}
+	}
+
+	pwbSaveDB(): void {
+		this.pwbConnectionOpen = true;
+		this.pwbAddToSessionSet(IndexedDB.PWB_OPEN_CONNECTION_KEY);
+	}
+
+	pwbRemoveDB(): void {
+		this.pwbConnectionOpen = false;
+		this.pwbRemoveFromSessionSet(IndexedDB.PWB_OPEN_CONNECTION_KEY);
+	}
+
+	async pwbOpen(stores: string[]): Promise<void> {
+		if (!this.database) {
+			throw new DBClosedError(this.name);
+		}
+		if (!this.pwbConnectionOpen) {
+			this.database = await IndexedDB.openDatabase(this.name, undefined, stores);
+			this.pwbSaveDB();
+		}
+	}
+
+	pwbClose(): void {
+		if (this.pendingTransactions.length) {
+			this.pendingTransactions.splice(0, this.pendingTransactions.length).forEach(transaction => transaction.abort());
+		}
+		this.database?.close();
+		this.pwbRemoveDB();
+	}
+	// --- End PWB
+
 	private database: IDBDatabase | null = null;
 	private readonly pendingTransactions: IDBTransaction[] = [];
 
 	constructor(database: IDBDatabase, private readonly name: string) {
 		this.database = database;
+		// --- Start PWB: Clear browser history
+		this.pwbSaveDB();
+		// --- End PWB
 	}
 
 	hasPendingTransactions(): boolean {
@@ -106,6 +168,9 @@ export class IndexedDB {
 			this.pendingTransactions.splice(0, this.pendingTransactions.length).forEach(transaction => transaction.abort());
 		}
 		this.database?.close();
+		// --- Start PWB: Clear browser history
+		this.pwbRemoveDB();
+		// --- End PWB
 		this.database = null;
 	}
 
diff --git a/src/vs/base/browser/markdownRenderer.ts b/src/vs/base/browser/markdownRenderer.ts
index a9131ebd13d..73de1a35af4 100644
--- a/src/vs/base/browser/markdownRenderer.ts
+++ b/src/vs/base/browser/markdownRenderer.ts
@@ -18,7 +18,7 @@ import { defaultGenerator } from 'vs/base/common/idGenerator';
 import { KeyCode } from 'vs/base/common/keyCodes';
 import { Lazy } from 'vs/base/common/lazy';
 import { DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { marked } from 'vs/base/common/marked/marked';
+import * as marked from 'vs/base/common/marked/marked';
 import { parse } from 'vs/base/common/marshalling';
 import { FileAccess, Schemas } from 'vs/base/common/network';
 import { cloneAndChange } from 'vs/base/common/objects';
@@ -45,7 +45,7 @@ export interface ISanitizerOptions {
 }
 
 const defaultMarkedRenderers = Object.freeze({
-	image: (href: string | null, title: string | null, text: string): string => {
+	image: ({ href, title, text }: marked.Tokens.Image): string => {
 		let dimensions: string[] = [];
 		let attributes: string[] = [];
 		if (href) {
@@ -64,11 +64,12 @@ const defaultMarkedRenderers = Object.freeze({
 		return '<img ' + attributes.join(' ') + '>';
 	},
 
-	paragraph: (text: string): string => {
-		return `<p>${text}</p>`;
+	paragraph(this: marked.Renderer, { tokens }: marked.Tokens.Paragraph): string {
+		return `<p>${this.parser.parseInline(tokens)}</p>`;
 	},
 
-	link: (href: string | null, title: string | null, text: string): string => {
+	link(this: marked.Renderer, { href, title, tokens }: marked.Tokens.Link): string {
+		let text = this.parser.parseInline(tokens);
 		if (typeof href !== 'string') {
 			return '';
 		}
@@ -162,18 +163,18 @@ export function renderMarkdown(markdown: IMarkdownString, options: MarkdownRende
 	const syncCodeBlocks: [string, HTMLElement][] = [];
 
 	if (options.codeBlockRendererSync) {
-		renderer.code = (code, lang) => {
+		renderer.code = ({ text, lang }: marked.Tokens.Code) => {
 			const id = defaultGenerator.nextId();
-			const value = options.codeBlockRendererSync!(postProcessCodeBlockLanguageId(lang), code);
+			const value = options.codeBlockRendererSync!(postProcessCodeBlockLanguageId(lang), text);
 			syncCodeBlocks.push([id, value]);
-			return `<div class="code" data-code="${id}">${escape(code)}</div>`;
+			return `<div class="code" data-code="${id}">${escape(text)}</div>`;
 		};
 	} else if (options.codeBlockRenderer) {
-		renderer.code = (code, lang) => {
+		renderer.code = ({ text, lang }: marked.Tokens.Code) => {
 			const id = defaultGenerator.nextId();
-			const value = options.codeBlockRenderer!(postProcessCodeBlockLanguageId(lang), code);
+			const value = options.codeBlockRenderer!(postProcessCodeBlockLanguageId(lang), text);
 			codeBlocks.push(value.then(element => [id, element]));
-			return `<div class="code" data-code="${id}">${escape(code)}</div>`;
+			return `<div class="code" data-code="${id}">${escape(text)}</div>`;
 		};
 	}
 
@@ -219,23 +220,16 @@ export function renderMarkdown(markdown: IMarkdownString, options: MarkdownRende
 	}
 
 	if (!markdown.supportHtml) {
-		// TODO: Can we deprecated this in favor of 'supportHtml'?
-
-		// Use our own sanitizer so that we can let through only spans.
-		// Otherwise, we'd be letting all html be rendered.
-		// If we want to allow markdown permitted tags, then we can delete sanitizer and sanitize.
-		// We always pass the output through dompurify after this so that we don't rely on
-		// marked for sanitization.
-		markedOptions.sanitizer = (html: string): string => {
+		// Note: we always pass the output through dompurify after this so that we don't rely on
+		// marked for real sanitization.
+		renderer.html = ({ text }) => {
 			if (options.sanitizerOptions?.replaceWithPlaintext) {
-				return escape(html);
+				return escape(text);
 			}
 
-			const match = markdown.isTrusted ? html.match(/^(<span[^>]+>)|(<\/\s*span>)$/) : undefined;
-			return match ? html : '';
+			const match = markdown.isTrusted ? text.match(/^(<span[^>]+>)|(<\/\s*span>)$/) : undefined;
+			return match ? text : '';
 		};
-		markedOptions.sanitize = true;
-		markedOptions.silent = true;
 	}
 
 	markedOptions.renderer = renderer;
@@ -261,7 +255,7 @@ export function renderMarkdown(markdown: IMarkdownString, options: MarkdownRende
 		const newTokens = fillInIncompleteTokens(tokens);
 		renderedMarkdown = marked.parser(newTokens, opts);
 	} else {
-		renderedMarkdown = marked.parse(value, markedOptions);
+		renderedMarkdown = marked.parse(value, { ...markedOptions, async: false });
 	}
 
 	// Rewrite theme icons
@@ -553,7 +547,7 @@ export function renderMarkdownAsPlaintext(markdown: IMarkdownString, withCodeBlo
 		value = `${value.substr(0, 100_000)}…`;
 	}
 
-	const html = marked.parse(value, { renderer: withCodeBlocks ? plainTextWithCodeBlocksRenderer.value : plainTextRenderer.value }).replace(/&(#\d+|[a-zA-Z]+);/g, m => unescapeInfo.get(m) ?? m);
+	const html = marked.parse(value, { async: false, renderer: withCodeBlocks ? plainTextWithCodeBlocksRenderer.value : plainTextRenderer.value }).replace(/&(#\d+|[a-zA-Z]+);/g, m => unescapeInfo.get(m) ?? m);
 
 	return sanitizeRenderedMarkdown({ isTrusted: false }, html).toString();
 }
@@ -570,64 +564,61 @@ const unescapeInfo = new Map<string, string>([
 function createRenderer(): marked.Renderer {
 	const renderer = new marked.Renderer();
 
-	renderer.code = (code: string): string => {
-		return code;
+	renderer.code = ({ text }: marked.Tokens.Code): string => {
+		return text;
 	};
-	renderer.blockquote = (quote: string): string => {
-		return quote;
+	renderer.blockquote = ({ text }: marked.Tokens.Blockquote): string => {
+		return text + '\n';
 	};
-	renderer.html = (_html: string): string => {
+	renderer.html = (_: marked.Tokens.HTML): string => {
 		return '';
 	};
-	renderer.heading = (text: string, _level: 1 | 2 | 3 | 4 | 5 | 6, _raw: string): string => {
-		return text + '\n';
+	renderer.heading = function ({ tokens }: marked.Tokens.Heading): string {
+		return this.parser.parseInline(tokens) + '\n';
 	};
 	renderer.hr = (): string => {
 		return '';
 	};
-	renderer.list = (body: string, _ordered: boolean): string => {
-		return body;
+	renderer.list = function ({ items }: marked.Tokens.List): string {
+		return items.map(x => this.listitem(x)).join('\n') + '\n';
 	};
-	renderer.listitem = (text: string): string => {
+	renderer.listitem = ({ text }: marked.Tokens.ListItem): string => {
 		return text + '\n';
 	};
-	renderer.paragraph = (text: string): string => {
-		return text + '\n';
+	renderer.paragraph = function ({ tokens }: marked.Tokens.Paragraph): string {
+		return this.parser.parseInline(tokens) + '\n';
 	};
-	renderer.table = (header: string, body: string): string => {
-		return header + body + '\n';
+	renderer.table = function ({ header, rows }: marked.Tokens.Table): string {
+		return header.map(cell => this.tablecell(cell)).join(' ') + '\n' + rows.map(cells => cells.map(cell => this.tablecell(cell)).join(' ')).join('\n') + '\n';
 	};
-	renderer.tablerow = (content: string): string => {
-		return content;
+	renderer.tablerow = ({ text }: marked.Tokens.TableRow): string => {
+		return text;
 	};
-	renderer.tablecell = (content: string, _flags: {
-		header: boolean;
-		align: 'center' | 'left' | 'right' | null;
-	}): string => {
-		return content + ' ';
+	renderer.tablecell = function ({ tokens }: marked.Tokens.TableCell): string {
+		return this.parser.parseInline(tokens);
 	};
-	renderer.strong = (text: string): string => {
+	renderer.strong = ({ text }: marked.Tokens.Strong): string => {
 		return text;
 	};
-	renderer.em = (text: string): string => {
+	renderer.em = ({ text }: marked.Tokens.Em): string => {
 		return text;
 	};
-	renderer.codespan = (code: string): string => {
-		return code;
+	renderer.codespan = ({ text }: marked.Tokens.Codespan): string => {
+		return text;
 	};
-	renderer.br = (): string => {
+	renderer.br = (_: marked.Tokens.Br): string => {
 		return '\n';
 	};
-	renderer.del = (text: string): string => {
+	renderer.del = ({ text }: marked.Tokens.Del): string => {
 		return text;
 	};
-	renderer.image = (_href: string, _title: string, _text: string): string => {
+	renderer.image = (_: marked.Tokens.Image): string => {
 		return '';
 	};
-	renderer.text = (text: string): string => {
+	renderer.text = ({ text }: marked.Tokens.Text): string => {
 		return text;
 	};
-	renderer.link = (_href: string, _title: string, text: string): string => {
+	renderer.link = ({ text }: marked.Tokens.Link): string => {
 		return text;
 	};
 	return renderer;
@@ -635,8 +626,8 @@ function createRenderer(): marked.Renderer {
 const plainTextRenderer = new Lazy<marked.Renderer>((withCodeBlocks?: boolean) => createRenderer());
 const plainTextWithCodeBlocksRenderer = new Lazy<marked.Renderer>(() => {
 	const renderer = createRenderer();
-	renderer.code = (code: string): string => {
-		return `\n\`\`\`\n${code}\n\`\`\`\n`;
+	renderer.code = ({ text }: marked.Tokens.Code): string => {
+		return `\n\`\`\`\n${text}\n\`\`\`\n`;
 	};
 	return renderer;
 });
@@ -807,13 +798,6 @@ function fillInIncompleteTokensOnce(tokens: marked.TokensList): marked.TokensLis
 	let newTokens: marked.Token[] | undefined;
 	for (i = 0; i < tokens.length; i++) {
 		const token = tokens[i];
-		let codeblockStart: RegExpMatchArray | null;
-		if (token.type === 'paragraph' && (codeblockStart = token.raw.match(/(\n|^)(````*)/))) {
-			const codeblockLead = codeblockStart[2];
-			// If the code block was complete, it would be in a type='code'
-			newTokens = completeCodeBlock(tokens.slice(i), codeblockLead);
-			break;
-		}
 
 		if (token.type === 'paragraph' && token.raw.match(/(\n|^)\|/)) {
 			newTokens = completeTable(tokens.slice(i));
@@ -821,7 +805,7 @@ function fillInIncompleteTokensOnce(tokens: marked.TokensList): marked.TokensLis
 		}
 
 		if (i === tokens.length - 1 && token.type === 'list') {
-			const newListToken = completeListItemPattern(token);
+			const newListToken = completeListItemPattern(token as marked.Tokens.List);
 			if (newListToken) {
 				newTokens = [newListToken];
 				break;
@@ -830,7 +814,7 @@ function fillInIncompleteTokensOnce(tokens: marked.TokensList): marked.TokensLis
 
 		if (i === tokens.length - 1 && token.type === 'paragraph') {
 			// Only operates on a single token, because any newline that follows this should break these patterns
-			const newToken = completeSingleLinePattern(token);
+			const newToken = completeSingleLinePattern(token as marked.Tokens.Paragraph);
 			if (newToken) {
 				newTokens = [newToken];
 				break;
@@ -850,10 +834,6 @@ function fillInIncompleteTokensOnce(tokens: marked.TokensList): marked.TokensLis
 	return null;
 }
 
-function completeCodeBlock(tokens: marked.Token[], leader: string): marked.Token[] {
-	const mergedRawText = mergeRawTokenText(tokens);
-	return marked.lexer(mergedRawText + `\n${leader}`);
-}
 
 function completeCodespan(token: marked.Token): marked.Token {
 	return completeWithString(token, '`');
diff --git a/src/vs/base/browser/ui/actionbar/actionbar.ts b/src/vs/base/browser/ui/actionbar/actionbar.ts
index c902616601e..5bf84c083d6 100644
--- a/src/vs/base/browser/ui/actionbar/actionbar.ts
+++ b/src/vs/base/browser/ui/actionbar/actionbar.ts
@@ -167,7 +167,8 @@ export class ActionBar extends Disposable implements IActionRunner {
 			} else if (event.equals(KeyCode.End)) {
 				eventHandled = this.focusLast();
 			} else if (event.equals(KeyCode.Tab) && focusedItem instanceof BaseActionViewItem && focusedItem.trapsArrowNavigation) {
-				eventHandled = this.focusNext();
+				// Tab, so forcibly focus next #219199
+				eventHandled = this.focusNext(undefined, true);
 			} else if (this.isTriggerKeyEvent(event)) {
 				// Staying out of the else branch even if not triggered
 				if (this._triggerKeys.keyDown) {
@@ -485,7 +486,7 @@ export class ActionBar extends Disposable implements IActionRunner {
 		return this.focusPrevious(true);
 	}
 
-	protected focusNext(forceLoop?: boolean): boolean {
+	protected focusNext(forceLoop?: boolean, forceFocus?: boolean): boolean {
 		if (typeof this.focusedItem === 'undefined') {
 			this.focusedItem = this.viewItems.length - 1;
 		} else if (this.viewItems.length <= 1) {
@@ -505,7 +506,7 @@ export class ActionBar extends Disposable implements IActionRunner {
 			item = this.viewItems[this.focusedItem];
 		} while (this.focusedItem !== startIndex && ((this.options.focusOnlyEnabledItems && !item.isEnabled()) || item.action.id === Separator.ID));
 
-		this.updateFocus();
+		this.updateFocus(undefined, undefined, forceFocus);
 		return true;
 	}
 
diff --git a/src/vs/base/browser/ui/button/button.ts b/src/vs/base/browser/ui/button/button.ts
index 30f588f4d49..4095afa6cd8 100644
--- a/src/vs/base/browser/ui/button/button.ts
+++ b/src/vs/base/browser/ui/button/button.ts
@@ -64,6 +64,7 @@ export interface IButton extends IDisposable {
 	set label(value: string | IMarkdownString);
 	set icon(value: ThemeIcon);
 	set enabled(value: boolean);
+	set checked(value: boolean);
 
 	focus(): void;
 	hasFocus(): boolean;
@@ -304,6 +305,20 @@ export class Button extends Disposable implements IButton {
 		return !this._element.classList.contains('disabled');
 	}
 
+	set checked(value: boolean) {
+		if (value) {
+			this._element.classList.add('checked');
+			this._element.setAttribute('aria-checked', 'true');
+		} else {
+			this._element.classList.remove('checked');
+			this._element.setAttribute('aria-checked', 'false');
+		}
+	}
+
+	get checked() {
+		return this._element.classList.contains('checked');
+	}
+
 	setTitle(title: string) {
 		if (!this._hover && title !== '') {
 			this._hover = this._register(getBaseLayerHoverDelegate().setupManagedHover(this.options.hoverDelegate ?? getDefaultHoverDelegate('mouse'), this._element, title));
@@ -412,6 +427,14 @@ export class ButtonWithDropdown extends Disposable implements IButton {
 		return this.button.enabled;
 	}
 
+	set checked(value: boolean) {
+		this.button.checked = value;
+	}
+
+	get checked() {
+		return this.button.checked;
+	}
+
 	focus(): void {
 		this.button.focus();
 	}
@@ -462,6 +485,14 @@ export class ButtonWithDescription implements IButtonWithDescription {
 		this._button.enabled = enabled;
 	}
 
+	set checked(value: boolean) {
+		this._button.checked = value;
+	}
+
+	get checked(): boolean {
+		return this._button.checked;
+	}
+
 	focus(): void {
 		this._button.focus();
 	}
diff --git a/src/vs/base/browser/ui/dialog/dialog.ts b/src/vs/base/browser/ui/dialog/dialog.ts
index 3842592da15..9b5c30731a1 100644
--- a/src/vs/base/browser/ui/dialog/dialog.ts
+++ b/src/vs/base/browser/ui/dialog/dialog.ts
@@ -209,7 +209,7 @@ export class Dialog extends Disposable {
 			// Handle button clicks
 			buttonMap.forEach((entry, index) => {
 				const primary = buttonMap[index].index === 0;
-				const button = this.options.buttonDetails ? this._register(buttonBar.addButtonWithDescription({ title: true, secondary: !primary, ...this.buttonStyles })) : this._register(buttonBar.addButton({ title: true, secondary: !primary, ...this.buttonStyles }));
+				const button = this.options.buttonDetails ? this._register(buttonBar.addButtonWithDescription({ secondary: !primary, ...this.buttonStyles })) : this._register(buttonBar.addButton({ secondary: !primary, ...this.buttonStyles }));
 				button.label = mnemonicButtonLabel(buttonMap[index].label, true);
 				if (button instanceof ButtonWithDescription) {
 					button.description = this.options.buttonDetails![buttonMap[index].index];
diff --git a/src/vs/base/browser/ui/hover/hover.ts b/src/vs/base/browser/ui/hover/hover.ts
index f66ba1ea673..55dfdacf9dc 100644
--- a/src/vs/base/browser/ui/hover/hover.ts
+++ b/src/vs/base/browser/ui/hover/hover.ts
@@ -274,6 +274,7 @@ export type IManagedHoverContent = string | IManagedHoverTooltipMarkdownString |
 export type IManagedHoverContentOrFactory = IManagedHoverContent | (() => IManagedHoverContent);
 
 export interface IManagedHoverOptions extends Pick<IHoverOptions, 'actions' | 'linkHandler' | 'trapFocus'> {
+	appearance?: Pick<IHoverAppearanceOptions, 'showHoverHint'>;
 }
 
 export interface IManagedHover extends IDisposable {
diff --git a/src/vs/base/browser/ui/hover/hoverDelegate.ts b/src/vs/base/browser/ui/hover/hoverDelegate.ts
index 47ea1b77531..0db893817e4 100644
--- a/src/vs/base/browser/ui/hover/hoverDelegate.ts
+++ b/src/vs/base/browser/ui/hover/hoverDelegate.ts
@@ -49,6 +49,13 @@ export interface IHoverDelegateOptions extends IManagedHoverOptions {
 		 * Whether to show the hover pointer
 		 */
 		showPointer?: boolean;
+		/**
+		 * When {@link hideOnHover} is explicitly true or undefined and its auto value is detected to
+		 * hide, show a hint at the bottom of the hover explaining how to mouse over the widget. This
+		 * should be used in the cases where despite the hover having no interactive content, it's
+		 * likely the user may want to interact with it somehow.
+		 */
+		showHoverHint?: boolean;
 		/**
 		 * Whether to skip the fade in animation, this should be used when hovering from one hover to
 		 * another in the same group so it looks like the hover is moving from one element to the other.
diff --git a/src/vs/base/browser/ui/iconLabel/iconLabel.ts b/src/vs/base/browser/ui/iconLabel/iconLabel.ts
index e761b71228e..5439f56710e 100644
--- a/src/vs/base/browser/ui/iconLabel/iconLabel.ts
+++ b/src/vs/base/browser/ui/iconLabel/iconLabel.ts
@@ -45,7 +45,7 @@ export interface IIconLabelValueOptions {
 class FastLabelNode {
 	private disposed: boolean | undefined;
 	private _textContent: string | undefined;
-	private _className: string | undefined;
+	private _classNames: string[] | undefined;
 	private _empty: boolean | undefined;
 
 	constructor(private _element: HTMLElement) {
@@ -64,13 +64,14 @@ class FastLabelNode {
 		this._element.textContent = content;
 	}
 
-	set className(className: string) {
-		if (this.disposed || className === this._className) {
+	set classNames(classNames: string[]) {
+		if (this.disposed || equals(classNames, this._classNames)) {
 			return;
 		}
 
-		this._className = className;
-		this._element.className = className;
+		this._classNames = classNames;
+		this._element.classList.value = '';
+		this._element.classList.add(...classNames);
 	}
 
 	set empty(empty: boolean) {
@@ -169,9 +170,10 @@ export class IconLabel extends Disposable {
 			existingIconNode.remove();
 		}
 
-		this.domNode.className = labelClasses.join(' ');
+		this.domNode.classNames = labelClasses;
 		this.domNode.element.setAttribute('aria-label', ariaLabel);
-		this.labelContainer.className = containerClasses.join(' ');
+		this.labelContainer.classList.value = '';
+		this.labelContainer.classList.add(...containerClasses);
 		this.setupHover(options?.descriptionTitle ? this.labelContainer : this.element, options?.title);
 
 		this.nameNode.setLabel(label, options);
diff --git a/src/vs/base/browser/ui/list/listView.ts b/src/vs/base/browser/ui/list/listView.ts
index 1dcd981388f..6d2af1db1eb 100644
--- a/src/vs/base/browser/ui/list/listView.ts
+++ b/src/vs/base/browser/ui/list/listView.ts
@@ -519,7 +519,7 @@ export class ListView<T> implements IListView<T> {
 
 		if (typeof size === 'undefined') {
 			if (!this.supportDynamicHeights) {
-				console.warn('Dynamic heights not supported');
+				console.warn('Dynamic heights not supported', new Error().stack);
 				return;
 			}
 
@@ -1519,7 +1519,7 @@ export class ListView<T> implements IListView<T> {
 			item.row.domNode.style.height = '';
 			item.size = item.row.domNode.offsetHeight;
 			if (item.size === 0 && !isAncestor(item.row.domNode, getWindow(item.row.domNode).document.body)) {
-				console.warn('Measuring item node that is not in DOM! Add ListView to the DOM before measuring row height!');
+				console.warn('Measuring item node that is not in DOM! Add ListView to the DOM before measuring row height!', new Error().stack);
 			}
 			item.lastDynamicHeightWidth = this.renderWidth;
 			return item.size - size;
diff --git a/src/vs/base/browser/ui/radio/radio.ts b/src/vs/base/browser/ui/radio/radio.ts
index 2f57e4ace30..5ab1edc41b2 100644
--- a/src/vs/base/browser/ui/radio/radio.ts
+++ b/src/vs/base/browser/ui/radio/radio.ts
@@ -11,7 +11,7 @@ import { $ } from 'vs/base/browser/dom';
 import { IHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegate';
 import { Button } from 'vs/base/browser/ui/button/button';
 import { DisposableMap, DisposableStore } from 'vs/base/common/lifecycle';
-import { getDefaultHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
+import { createInstantHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
 
 export interface IRadioStyles {
 	readonly activeForeground?: string;
@@ -53,7 +53,7 @@ export class Radio extends Widget {
 	constructor(opts: IRadioOptions) {
 		super();
 
-		this.hoverDelegate = opts.hoverDelegate ?? getDefaultHoverDelegate('element');
+		this.hoverDelegate = opts.hoverDelegate ?? this._register(createInstantHoverDelegate());
 
 		this.domNode = $('.monaco-custom-radio');
 		this.domNode.setAttribute('role', 'radio');
diff --git a/src/vs/base/browser/ui/table/tableWidget.ts b/src/vs/base/browser/ui/table/tableWidget.ts
index b2c8959c3c5..db00502791d 100644
--- a/src/vs/base/browser/ui/table/tableWidget.ts
+++ b/src/vs/base/browser/ui/table/tableWidget.ts
@@ -193,7 +193,7 @@ export class Table<TRow> implements ISpliceable<TRow>, IDisposable {
 		user: string,
 		container: HTMLElement,
 		private virtualDelegate: ITableVirtualDelegate<TRow>,
-		columns: ITableColumn<TRow, TCell>[],
+		private columns: ITableColumn<TRow, TCell>[],
 		renderers: ITableRenderer<TCell, unknown>[],
 		_options?: ITableOptions<TRow>
 	) {
@@ -231,6 +231,15 @@ export class Table<TRow> implements ISpliceable<TRow>, IDisposable {
 		this.style(unthemedListStyles);
 	}
 
+	getColumnLabels(): string[] {
+		return this.columns.map(c => c.label);
+	}
+
+	resizeColumn(index: number, percentage: number): void {
+		const size = Math.round((percentage / 100.00) * this.cachedWidth);
+		this.splitview.resizeView(index, size);
+	}
+
 	updateOptions(options: ITableOptionsUpdate): void {
 		this.list.updateOptions(options);
 	}
diff --git a/src/vs/base/browser/ui/tree/abstractTree.ts b/src/vs/base/browser/ui/tree/abstractTree.ts
index fc65c6e1673..0223c2d4fd4 100644
--- a/src/vs/base/browser/ui/tree/abstractTree.ts
+++ b/src/vs/base/browser/ui/tree/abstractTree.ts
@@ -36,6 +36,7 @@ import { localize } from 'vs/nls';
 import { IHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegate';
 import { createInstantHoverDelegate, getDefaultHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
 import { autorun, constObservable } from 'vs/base/common/observable';
+import { alert } from 'vs/base/browser/ui/aria/aria';
 
 class TreeElementsDragAndDropData<T, TFilterData, TContext> extends ElementsDragAndDropData<T, TContext> {
 
@@ -1144,6 +1145,7 @@ class FindController<T, TFilterData> implements IDisposable {
 		const noMatches = this.filter.totalCount > 0 && this.filter.matchCount === 0;
 
 		if (this.pattern && noMatches) {
+			alert(localize('replFindNoResults', "No results"));
 			if (this.tree.options.showNotFoundMessage ?? true) {
 				this.widget?.showMessage({ type: MessageType.WARNING, content: localize('not found', "No elements found.") });
 			} else {
@@ -1151,6 +1153,9 @@ class FindController<T, TFilterData> implements IDisposable {
 			}
 		} else {
 			this.widget?.clearMessage();
+			if (this.pattern) {
+				alert(localize('replFindResults', "{0} results", this.filter.matchCount));
+			}
 		}
 	}
 
diff --git a/src/vs/base/common/amd.ts b/src/vs/base/common/amd.ts
index 6d228840331..9e813737127 100644
--- a/src/vs/base/common/amd.ts
+++ b/src/vs/base/common/amd.ts
@@ -5,9 +5,11 @@
 
 // ESM-comment-begin
 export const isESM = false;
+export const canASAR = true;
 // ESM-comment-end
 // ESM-uncomment-begin
 // export const isESM = true;
+// export const canASAR = false; // TODO@esm: ASAR disabled in ESM
 // ESM-uncomment-end
 
 export const enum LoaderEventType {
diff --git a/src/vs/base/common/date.ts b/src/vs/base/common/date.ts
index 2ae03a711af..663f2144596 100644
--- a/src/vs/base/common/date.ts
+++ b/src/vs/base/common/date.ts
@@ -199,6 +199,27 @@ export function fromNow(date: number | Date, appendAgoLabel?: boolean, useFullTi
 	}
 }
 
+export function fromNowByDay(date: number | Date, appendAgoLabel?: boolean, useFullTimeWords?: boolean): string {
+	if (typeof date !== 'number') {
+		date = date.getTime();
+	}
+
+	const todayMidnightTime = new Date();
+	todayMidnightTime.setHours(0, 0, 0, 0);
+	const yesterdayMidnightTime = new Date(todayMidnightTime.getTime());
+	yesterdayMidnightTime.setDate(yesterdayMidnightTime.getDate() - 1);
+
+	if (date > todayMidnightTime.getTime()) {
+		return localize('today', 'Today');
+	}
+
+	if (date > yesterdayMidnightTime.getTime()) {
+		return localize('yesterday', 'Yesterday');
+	}
+
+	return fromNow(date, appendAgoLabel, useFullTimeWords);
+}
+
 /**
  * Gets a readable duration with intelligent/lossy precision. For example "40ms" or "3.040s")
  * @param ms The duration to get in milliseconds.
diff --git a/src/vs/base/common/event.ts b/src/vs/base/common/event.ts
index 0ee09ca546d..95bb4678c83 100644
--- a/src/vs/base/common/event.ts
+++ b/src/vs/base/common/event.ts
@@ -111,6 +111,15 @@ export namespace Event {
 		};
 	}
 
+	/**
+	 * Given an event, returns another event which only fires once, and only when the condition is met.
+	 *
+	 * @param event The event source for the new event.
+	 */
+	export function onceIf<T>(event: Event<T>, condition: (e: T) => boolean): Event<T> {
+		return Event.once(Event.filter(event, condition));
+	}
+
 	/**
 	 * Maps an event of one type into an event of another type using a mapping function, similar to how
 	 * `Array.prototype.map` works.
@@ -661,6 +670,9 @@ export namespace Event {
 			const options: EmitterOptions = {
 				onWillAddFirstListener: () => {
 					_observable.addObserver(this);
+
+					// Communicate to the observable that we received its current value and would like to be notified about future changes.
+					this._observable.reportChanges();
 				},
 				onDidRemoveLastListener: () => {
 					_observable.removeObserver(this);
diff --git a/src/vs/base/common/jsonc.js b/src/vs/base/common/jsonc.js
index 21e3b7eae4f..8f1c75aa51b 100644
--- a/src/vs/base/common/jsonc.js
+++ b/src/vs/base/common/jsonc.js
@@ -9,6 +9,7 @@
 'use strict';
 
 // ESM-uncomment-begin
+// /** @type any */
 // const module = { exports: {} };
 // ESM-uncomment-end
 
diff --git a/src/vs/base/common/marked/cgmanifest.json b/src/vs/base/common/marked/cgmanifest.json
index 4dffc3ff231..2c76256e890 100644
--- a/src/vs/base/common/marked/cgmanifest.json
+++ b/src/vs/base/common/marked/cgmanifest.json
@@ -6,11 +6,11 @@
 				"git": {
 					"name": "marked",
 					"repositoryUrl": "https://github.com/markedjs/marked",
-					"commitHash": "7e2ef307846427650114591f9257b5545868e928"
+					"commitHash": "7972d7f9b578a31b32f469c14fc97c39ceb2b6c6"
 				}
 			},
 			"license": "MIT",
-			"version": "4.1.0"
+			"version": "14.0.0"
 		}
 	],
 	"version": 1
diff --git a/src/vs/base/common/marked/marked.d.ts b/src/vs/base/common/marked/marked.d.ts
index 7aeab2e864d..bbd49c48bef 100644
--- a/src/vs/base/common/marked/marked.d.ts
+++ b/src/vs/base/common/marked/marked.d.ts
@@ -1,600 +1,704 @@
-// Type definitions for Marked 4.0
-// Project: https://github.com/markedjs/marked, https://marked.js.org
-// Definitions by: William Orr <https://github.com/worr>
-//                 BendingBender <https://github.com/BendingBender>
-//                 CrossR <https://github.com/CrossR>
-//                 Mike Wickett <https://github.com/mwickett>
-//                 Hitomi Hatsukaze <https://github.com/htkzhtm>
-//                 Ezra Celli <https://github.com/ezracelli>
-//                 Romain LE BARO <https://github.com/scandinave>
-//                 Sarun Intaralawan <https://github.com/sarunint>
-//                 Tony Brix <https://github.com/UziTech>
-//                 Anatolii Titov <https://github.com/Toliak>
-//                 Jean-Francois Cere <https://github.com/jfcere>
-//                 Mykhaylo Stolyarchuk <https://github.com/MykSto>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
+// Generated by dts-bundle-generator v9.5.1
+
+export type MarkedToken = (Tokens.Space | Tokens.Code | Tokens.Heading | Tokens.Table | Tokens.Hr | Tokens.Blockquote | Tokens.List | Tokens.ListItem | Tokens.Paragraph | Tokens.HTML | Tokens.Text | Tokens.Def | Tokens.Escape | Tokens.Tag | Tokens.Image | Tokens.Link | Tokens.Strong | Tokens.Em | Tokens.Codespan | Tokens.Br | Tokens.Del);
+export type Token = (MarkedToken | Tokens.Generic);
+export declare namespace Tokens {
+	interface Space {
+		type: "space";
+		raw: string;
+	}
+	interface Code {
+		type: "code";
+		raw: string;
+		codeBlockStyle?: "indented" | undefined;
+		lang?: string | undefined;
+		text: string;
+		escaped?: boolean;
+	}
+	interface Heading {
+		type: "heading";
+		raw: string;
+		depth: number;
+		text: string;
+		tokens: Token[];
+	}
+	interface Table {
+		type: "table";
+		raw: string;
+		align: Array<"center" | "left" | "right" | null>;
+		header: TableCell[];
+		rows: TableCell[][];
+	}
+	interface TableRow {
+		text: string;
+	}
+	interface TableCell {
+		text: string;
+		tokens: Token[];
+		header: boolean;
+		align: "center" | "left" | "right" | null;
+	}
+	interface Hr {
+		type: "hr";
+		raw: string;
+	}
+	interface Blockquote {
+		type: "blockquote";
+		raw: string;
+		text: string;
+		tokens: Token[];
+	}
+	interface List {
+		type: "list";
+		raw: string;
+		ordered: boolean;
+		start: number | "";
+		loose: boolean;
+		items: ListItem[];
+	}
+	interface ListItem {
+		type: "list_item";
+		raw: string;
+		task: boolean;
+		checked?: boolean | undefined;
+		loose: boolean;
+		text: string;
+		tokens: Token[];
+	}
+	interface Checkbox {
+		checked: boolean;
+	}
+	interface Paragraph {
+		type: "paragraph";
+		raw: string;
+		pre?: boolean | undefined;
+		text: string;
+		tokens: Token[];
+	}
+	interface HTML {
+		type: "html";
+		raw: string;
+		pre: boolean;
+		text: string;
+		block: boolean;
+	}
+	interface Text {
+		type: "text";
+		raw: string;
+		text: string;
+		tokens?: Token[];
+	}
+	interface Def {
+		type: "def";
+		raw: string;
+		tag: string;
+		href: string;
+		title: string;
+	}
+	interface Escape {
+		type: "escape";
+		raw: string;
+		text: string;
+	}
+	interface Tag {
+		type: "text" | "html";
+		raw: string;
+		inLink: boolean;
+		inRawBlock: boolean;
+		text: string;
+		block: boolean;
+	}
+	interface Link {
+		type: "link";
+		raw: string;
+		href: string;
+		title?: string | null;
+		text: string;
+		tokens: Token[];
+	}
+	interface Image {
+		type: "image";
+		raw: string;
+		href: string;
+		title: string | null;
+		text: string;
+	}
+	interface Strong {
+		type: "strong";
+		raw: string;
+		text: string;
+		tokens: Token[];
+	}
+	interface Em {
+		type: "em";
+		raw: string;
+		text: string;
+		tokens: Token[];
+	}
+	interface Codespan {
+		type: "codespan";
+		raw: string;
+		text: string;
+	}
+	interface Br {
+		type: "br";
+		raw: string;
+	}
+	interface Del {
+		type: "del";
+		raw: string;
+		text: string;
+		tokens: Token[];
+	}
+	interface Generic {
+		[index: string]: any;
+		type: string;
+		raw: string;
+		tokens?: Token[] | undefined;
+	}
+}
+export type Links = Record<string, Pick<Tokens.Link | Tokens.Image, "href" | "title">>;
+export type TokensList = Token[] & {
+	links: Links;
+};
 /**
- * Compiles markdown to HTML synchronously.
- *
- * @param src String of markdown source to be compiled
- * @param options Optional hash of options
- * @return String of compiled HTML
+ * Renderer
  */
-export function marked(src: string, options?: marked.MarkedOptions): string;
-
+declare class _Renderer {
+	options: MarkedOptions;
+	parser: _Parser;
+	constructor(options?: MarkedOptions);
+	space(token: Tokens.Space): string;
+	code({ text, lang, escaped }: Tokens.Code): string;
+	blockquote({ tokens }: Tokens.Blockquote): string;
+	html({ text }: Tokens.HTML | Tokens.Tag): string;
+	heading({ tokens, depth }: Tokens.Heading): string;
+	hr(token: Tokens.Hr): string;
+	list(token: Tokens.List): string;
+	listitem(item: Tokens.ListItem): string;
+	checkbox({ checked }: Tokens.Checkbox): string;
+	paragraph({ tokens }: Tokens.Paragraph): string;
+	table(token: Tokens.Table): string;
+	tablerow({ text }: Tokens.TableRow): string;
+	tablecell(token: Tokens.TableCell): string;
+	/**
+	 * span level renderer
+	 */
+	strong({ tokens }: Tokens.Strong): string;
+	em({ tokens }: Tokens.Em): string;
+	codespan({ text }: Tokens.Codespan): string;
+	br(token: Tokens.Br): string;
+	del({ tokens }: Tokens.Del): string;
+	link({ href, title, tokens }: Tokens.Link): string;
+	image({ href, title, text }: Tokens.Image): string;
+	text(token: Tokens.Text | Tokens.Escape | Tokens.Tag): string;
+}
 /**
- * Compiles markdown to HTML asynchronously.
- *
- * @param src String of markdown source to be compiled
- * @param callback Function called when the markdownString has been fully parsed when using async highlighting
+ * TextRenderer
+ * returns only the textual part of the token
  */
-export function marked(src: string, callback: (error: any, parseResult: string) => void): void;
-
+declare class _TextRenderer {
+	strong({ text }: Tokens.Strong): string;
+	em({ text }: Tokens.Em): string;
+	codespan({ text }: Tokens.Codespan): string;
+	del({ text }: Tokens.Del): string;
+	html({ text }: Tokens.HTML | Tokens.Tag): string;
+	text({ text }: Tokens.Text | Tokens.Escape | Tokens.Tag): string;
+	link({ text }: Tokens.Link): string;
+	image({ text }: Tokens.Image): string;
+	br(): string;
+}
 /**
- * Compiles markdown to HTML asynchronously.
- *
- * @param src String of markdown source to be compiled
- * @param options Hash of options
- * @param callback Function called when the markdownString has been fully parsed when using async highlighting
+ * Parsing & Compiling
  */
-export function marked(
-	src: string,
-	options: marked.MarkedOptions,
-	callback: (error: any, parseResult: string) => void,
-): void;
-
-export class Lexer extends marked.Lexer { }
-export class Parser extends marked.Parser { }
-export class Tokenizer<T = never> extends marked.Tokenizer<T> { }
-export class Renderer<T = never> extends marked.Renderer<T> { }
-export class TextRenderer extends marked.TextRenderer { }
-export class Slugger extends marked.Slugger { }
-
-export namespace marked {
-	const defaults: MarkedOptions;
-
+declare class _Parser {
+	options: MarkedOptions;
+	renderer: _Renderer;
+	textRenderer: _TextRenderer;
+	constructor(options?: MarkedOptions);
 	/**
-	 * @param src String of markdown source to be compiled
-	 * @param options Hash of options
+	 * Static Parse Method
 	 */
-	function lexer(src: string, options?: MarkedOptions): TokensList;
-
+	static parse(tokens: Token[], options?: MarkedOptions): string;
 	/**
-	 * Compiles markdown to HTML.
-	 *
-	 * @param src String of markdown source to be compiled
-	 * @param callback Function called when the markdownString has been fully parsed when using async highlighting
-	 * @return String of compiled HTML
+	 * Static Parse Inline Method
 	 */
-	function parse(src: string, callback: (error: any, parseResult: string) => void): string;
-
+	static parseInline(tokens: Token[], options?: MarkedOptions): string;
 	/**
-	 * Compiles markdown to HTML.
-	 *
-	 * @param src String of markdown source to be compiled
-	 * @param options Hash of options
-	 * @param callback Function called when the markdownString has been fully parsed when using async highlighting
-	 * @return String of compiled HTML
+	 * Parse Loop
 	 */
-	function parse(src: string, options?: MarkedOptions, callback?: (error: any, parseResult: string) => void): string;
-
+	parse(tokens: Token[], top?: boolean): string;
 	/**
-	 * @param src Tokenized source as array of tokens
-	 * @param options Hash of options
+	 * Parse Inline Tokens
 	 */
-	function parser(src: Token[] | TokensList, options?: MarkedOptions): string;
-
+	parseInline(tokens: Token[], renderer?: _Renderer | _TextRenderer): string;
+}
+declare const blockNormal: {
+	blockquote: RegExp;
+	code: RegExp;
+	def: RegExp;
+	fences: RegExp;
+	heading: RegExp;
+	hr: RegExp;
+	html: RegExp;
+	lheading: RegExp;
+	list: RegExp;
+	newline: RegExp;
+	paragraph: RegExp;
+	table: RegExp;
+	text: RegExp;
+};
+export type BlockKeys = keyof typeof blockNormal;
+declare const inlineNormal: {
+	_backpedal: RegExp;
+	anyPunctuation: RegExp;
+	autolink: RegExp;
+	blockSkip: RegExp;
+	br: RegExp;
+	code: RegExp;
+	del: RegExp;
+	emStrongLDelim: RegExp;
+	emStrongRDelimAst: RegExp;
+	emStrongRDelimUnd: RegExp;
+	escape: RegExp;
+	link: RegExp;
+	nolink: RegExp;
+	punctuation: RegExp;
+	reflink: RegExp;
+	reflinkSearch: RegExp;
+	tag: RegExp;
+	text: RegExp;
+	url: RegExp;
+};
+export type InlineKeys = keyof typeof inlineNormal;
+/**
+ * exports
+ */
+export declare const block: {
+	normal: {
+		blockquote: RegExp;
+		code: RegExp;
+		def: RegExp;
+		fences: RegExp;
+		heading: RegExp;
+		hr: RegExp;
+		html: RegExp;
+		lheading: RegExp;
+		list: RegExp;
+		newline: RegExp;
+		paragraph: RegExp;
+		table: RegExp;
+		text: RegExp;
+	};
+	gfm: Record<"code" | "blockquote" | "hr" | "html" | "table" | "text" | "heading" | "list" | "paragraph" | "def" | "fences" | "lheading" | "newline", RegExp>;
+	pedantic: Record<"code" | "blockquote" | "hr" | "html" | "table" | "text" | "heading" | "list" | "paragraph" | "def" | "fences" | "lheading" | "newline", RegExp>;
+};
+export declare const inline: {
+	normal: {
+		_backpedal: RegExp;
+		anyPunctuation: RegExp;
+		autolink: RegExp;
+		blockSkip: RegExp;
+		br: RegExp;
+		code: RegExp;
+		del: RegExp;
+		emStrongLDelim: RegExp;
+		emStrongRDelimAst: RegExp;
+		emStrongRDelimUnd: RegExp;
+		escape: RegExp;
+		link: RegExp;
+		nolink: RegExp;
+		punctuation: RegExp;
+		reflink: RegExp;
+		reflinkSearch: RegExp;
+		tag: RegExp;
+		text: RegExp;
+		url: RegExp;
+	};
+	gfm: Record<"link" | "code" | "url" | "br" | "del" | "text" | "escape" | "tag" | "reflink" | "autolink" | "nolink" | "_backpedal" | "anyPunctuation" | "blockSkip" | "emStrongLDelim" | "emStrongRDelimAst" | "emStrongRDelimUnd" | "punctuation" | "reflinkSearch", RegExp>;
+	breaks: Record<"link" | "code" | "url" | "br" | "del" | "text" | "escape" | "tag" | "reflink" | "autolink" | "nolink" | "_backpedal" | "anyPunctuation" | "blockSkip" | "emStrongLDelim" | "emStrongRDelimAst" | "emStrongRDelimUnd" | "punctuation" | "reflinkSearch", RegExp>;
+	pedantic: Record<"link" | "code" | "url" | "br" | "del" | "text" | "escape" | "tag" | "reflink" | "autolink" | "nolink" | "_backpedal" | "anyPunctuation" | "blockSkip" | "emStrongLDelim" | "emStrongRDelimAst" | "emStrongRDelimUnd" | "punctuation" | "reflinkSearch", RegExp>;
+};
+export interface Rules {
+	block: Record<BlockKeys, RegExp>;
+	inline: Record<InlineKeys, RegExp>;
+}
+/**
+ * Tokenizer
+ */
+declare class _Tokenizer {
+	options: MarkedOptions;
+	rules: Rules;
+	lexer: _Lexer;
+	constructor(options?: MarkedOptions);
+	space(src: string): Tokens.Space | undefined;
+	code(src: string): Tokens.Code | undefined;
+	fences(src: string): Tokens.Code | undefined;
+	heading(src: string): Tokens.Heading | undefined;
+	hr(src: string): Tokens.Hr | undefined;
+	blockquote(src: string): Tokens.Blockquote | undefined;
+	list(src: string): Tokens.List | undefined;
+	html(src: string): Tokens.HTML | undefined;
+	def(src: string): Tokens.Def | undefined;
+	table(src: string): Tokens.Table | undefined;
+	lheading(src: string): Tokens.Heading | undefined;
+	paragraph(src: string): Tokens.Paragraph | undefined;
+	text(src: string): Tokens.Text | undefined;
+	escape(src: string): Tokens.Escape | undefined;
+	tag(src: string): Tokens.Tag | undefined;
+	link(src: string): Tokens.Link | Tokens.Image | undefined;
+	reflink(src: string, links: Links): Tokens.Link | Tokens.Image | Tokens.Text | undefined;
+	emStrong(src: string, maskedSrc: string, prevChar?: string): Tokens.Em | Tokens.Strong | undefined;
+	codespan(src: string): Tokens.Codespan | undefined;
+	br(src: string): Tokens.Br | undefined;
+	del(src: string): Tokens.Del | undefined;
+	autolink(src: string): Tokens.Link | undefined;
+	url(src: string): Tokens.Link | undefined;
+	inlineText(src: string): Tokens.Text | undefined;
+}
+declare class _Hooks {
+	options: MarkedOptions;
+	constructor(options?: MarkedOptions);
+	static passThroughHooks: Set<string>;
 	/**
-	 * Compiles markdown to HTML without enclosing `p` tag.
-	 *
-	 * @param src String of markdown source to be compiled
-	 * @param options Hash of options
-	 * @return String of compiled HTML
+	 * Process markdown before marked
 	 */
-	function parseInline(src: string, options?: MarkedOptions): string;
-
+	preprocess(markdown: string): string;
+	/**
+	 * Process HTML after marked is finished
+	 */
+	postprocess(html: string): string;
+	/**
+	 * Process all tokens before walk tokens
+	 */
+	processAllTokens(tokens: Token[] | TokensList): Token[] | TokensList;
+}
+export interface TokenizerThis {
+	lexer: _Lexer;
+}
+export type TokenizerExtensionFunction = (this: TokenizerThis, src: string, tokens: Token[] | TokensList) => Tokens.Generic | undefined;
+export type TokenizerStartFunction = (this: TokenizerThis, src: string) => number | void;
+export interface TokenizerExtension {
+	name: string;
+	level: "block" | "inline";
+	start?: TokenizerStartFunction | undefined;
+	tokenizer: TokenizerExtensionFunction;
+	childTokens?: string[] | undefined;
+}
+export interface RendererThis {
+	parser: _Parser;
+}
+export type RendererExtensionFunction = (this: RendererThis, token: Tokens.Generic) => string | false | undefined;
+export interface RendererExtension {
+	name: string;
+	renderer: RendererExtensionFunction;
+}
+export type TokenizerAndRendererExtension = TokenizerExtension | RendererExtension | (TokenizerExtension & RendererExtension);
+export type HooksApi = Omit<_Hooks, "constructor" | "options">;
+export type HooksObject = {
+	[K in keyof HooksApi]?: (this: _Hooks, ...args: Parameters<HooksApi[K]>) => ReturnType<HooksApi[K]> | Promise<ReturnType<HooksApi[K]>>;
+};
+export type RendererApi = Omit<_Renderer, "constructor" | "options" | "parser">;
+export type RendererObject = {
+	[K in keyof RendererApi]?: (this: _Renderer, ...args: Parameters<RendererApi[K]>) => ReturnType<RendererApi[K]> | false;
+};
+export type TokenizerApi = Omit<_Tokenizer, "constructor" | "options" | "rules" | "lexer">;
+export type TokenizerObject = {
+	[K in keyof TokenizerApi]?: (this: _Tokenizer, ...args: Parameters<TokenizerApi[K]>) => ReturnType<TokenizerApi[K]> | false;
+};
+export interface MarkedExtension {
+	/**
+	 * True will tell marked to await any walkTokens functions before parsing the tokens and returning an HTML string.
+	 */
+	async?: boolean;
+	/**
+	 * Enable GFM line breaks. This option requires the gfm option to be true.
+	 */
+	breaks?: boolean | undefined;
+	/**
+	 * Add tokenizers and renderers to marked
+	 */
+	extensions?: TokenizerAndRendererExtension[] | undefined | null;
+	/**
+	 * Enable GitHub flavored markdown.
+	 */
+	gfm?: boolean | undefined;
 	/**
-	 * Sets the default options.
+	 * Hooks are methods that hook into some part of marked.
+	 * preprocess is called to process markdown before sending it to marked.
+	 * processAllTokens is called with the TokensList before walkTokens.
+	 * postprocess is called to process html after marked has finished parsing.
+	 */
+	hooks?: HooksObject | undefined | null;
+	/**
+	 * Conform to obscure parts of markdown.pl as much as possible. Don't fix any of the original markdown bugs or poor behavior.
+	 */
+	pedantic?: boolean | undefined;
+	/**
+	 * Type: object Default: new Renderer()
 	 *
-	 * @param options Hash of options
+	 * An object containing functions to render tokens to HTML.
 	 */
-	function options(options: MarkedOptions): typeof marked;
-
+	renderer?: RendererObject | undefined | null;
+	/**
+	 * Shows an HTML error message when rendering fails.
+	 */
+	silent?: boolean | undefined;
+	/**
+	 * The tokenizer defines how to turn markdown text into tokens.
+	 */
+	tokenizer?: TokenizerObject | undefined | null;
+	/**
+	 * The walkTokens function gets called with every token.
+	 * Child tokens are called before moving on to sibling tokens.
+	 * Each token is passed by reference so updates are persisted when passed to the parser.
+	 * The return value of the function is ignored.
+	 */
+	walkTokens?: ((token: Token) => void | Promise<void>) | undefined | null;
+}
+export interface MarkedOptions extends Omit<MarkedExtension, "hooks" | "renderer" | "tokenizer" | "extensions" | "walkTokens"> {
+	/**
+	 * Hooks are methods that hook into some part of marked.
+	 */
+	hooks?: _Hooks | undefined | null;
 	/**
-	 * Sets the default options.
+	 * Type: object Default: new Renderer()
 	 *
-	 * @param options Hash of options
+	 * An object containing functions to render tokens to HTML.
 	 */
-	function setOptions(options: MarkedOptions): typeof marked;
-
+	renderer?: _Renderer | undefined | null;
 	/**
-	 * Gets the original marked default options.
+	 * The tokenizer defines how to turn markdown text into tokens.
 	 */
-	function getDefaults(): MarkedOptions;
-
-	function walkTokens(tokens: Token[] | TokensList, callback: (token: Token) => void): typeof marked;
-
+	tokenizer?: _Tokenizer | undefined | null;
 	/**
-	 * Use Extension
-	 * @param MarkedExtension
+	 * Custom extensions
 	 */
-	function use(...extensions: MarkedExtension[]): void;
-
-	class Tokenizer<T = never> {
-		constructor(options?: MarkedOptions);
-		options: MarkedOptions;
-		space(this: Tokenizer & TokenizerThis, src: string): Tokens.Space | T;
-		code(this: Tokenizer & TokenizerThis, src: string): Tokens.Code | T;
-		fences(this: Tokenizer & TokenizerThis, src: string): Tokens.Code | T;
-		heading(this: Tokenizer & TokenizerThis, src: string): Tokens.Heading | T;
-		hr(this: Tokenizer & TokenizerThis, src: string): Tokens.Hr | T;
-		blockquote(this: Tokenizer & TokenizerThis, src: string): Tokens.Blockquote | T;
-		list(this: Tokenizer & TokenizerThis, src: string): Tokens.List | T;
-		html(this: Tokenizer & TokenizerThis, src: string): Tokens.HTML | T;
-		def(this: Tokenizer & TokenizerThis, src: string): Tokens.Def | T;
-		table(this: Tokenizer & TokenizerThis, src: string): Tokens.Table | T;
-		lheading(this: Tokenizer & TokenizerThis, src: string): Tokens.Heading | T;
-		paragraph(this: Tokenizer & TokenizerThis, src: string): Tokens.Paragraph | T;
-		text(this: Tokenizer & TokenizerThis, src: string): Tokens.Text | T;
-		escape(this: Tokenizer & TokenizerThis, src: string): Tokens.Escape | T;
-		tag(this: Tokenizer & TokenizerThis, src: string): Tokens.Tag | T;
-		link(this: Tokenizer & TokenizerThis, src: string): Tokens.Image | Tokens.Link | T;
-		reflink(
-			this: Tokenizer & TokenizerThis,
-			src: string,
-			links: Tokens.Link[] | Tokens.Image[],
-		): Tokens.Link | Tokens.Image | Tokens.Text | T;
-		emStrong(
-			this: Tokenizer & TokenizerThis,
-			src: string,
-			maskedSrc: string,
-			prevChar: string,
-		): Tokens.Em | Tokens.Strong | T;
-		codespan(this: Tokenizer & TokenizerThis, src: string): Tokens.Codespan | T;
-		br(this: Tokenizer & TokenizerThis, src: string): Tokens.Br | T;
-		del(this: Tokenizer & TokenizerThis, src: string): Tokens.Del | T;
-		autolink(this: Tokenizer & TokenizerThis, src: string, mangle: (cap: string) => string): Tokens.Link | T;
-		url(this: Tokenizer & TokenizerThis, src: string, mangle: (cap: string) => string): Tokens.Link | T;
-		inlineText(this: Tokenizer & TokenizerThis, src: string, smartypants: (cap: string) => string): Tokens.Text | T;
-	}
-
-	type TokenizerObject = Partial<Omit<Tokenizer<false>, 'constructor' | 'options'>>;
-
-	class Renderer<T = never> {
-		constructor(options?: MarkedOptions);
-		options: MarkedOptions;
-		code(this: Renderer | RendererThis, code: string, language: string | undefined, isEscaped: boolean): string | T;
-		blockquote(this: Renderer | RendererThis, quote: string): string | T;
-		html(this: Renderer | RendererThis, html: string): string | T;
-		heading(
-			this: Renderer | RendererThis,
-			text: string,
-			level: 1 | 2 | 3 | 4 | 5 | 6,
-			raw: string,
-			slugger: Slugger,
-		): string | T;
-		hr(this: Renderer | RendererThis): string | T;
-		list(this: Renderer | RendererThis, body: string, ordered: boolean, start: number): string | T;
-		listitem(this: Renderer | RendererThis, text: string, task: boolean, checked: boolean): string | T;
-		checkbox(this: Renderer | RendererThis, checked: boolean): string | T;
-		paragraph(this: Renderer | RendererThis, text: string): string | T;
-		table(this: Renderer | RendererThis, header: string, body: string): string | T;
-		tablerow(this: Renderer | RendererThis, content: string): string | T;
-		tablecell(
-			this: Renderer | RendererThis,
-			content: string,
-			flags: {
-				header: boolean;
-				align: 'center' | 'left' | 'right' | null;
-			},
-		): string | T;
-		strong(this: Renderer | RendererThis, text: string): string | T;
-		em(this: Renderer | RendererThis, text: string): string | T;
-		codespan(this: Renderer | RendererThis, code: string): string | T;
-		br(this: Renderer | RendererThis): string | T;
-		del(this: Renderer | RendererThis, text: string): string | T;
-		link(this: Renderer | RendererThis, href: string | null, title: string | null, text: string): string | T;
-		image(this: Renderer | RendererThis, href: string | null, title: string | null, text: string): string | T;
-		text(this: Renderer | RendererThis, text: string): string | T;
-	}
-
-	type RendererObject = Partial<Omit<Renderer<false>, 'constructor' | 'options'>>;
-
-	class TextRenderer {
-		strong(text: string): string;
-		em(text: string): string;
-		codespan(text: string): string;
-		del(text: string): string;
-		text(text: string): string;
-		link(href: string | null, title: string | null, text: string): string;
-		image(href: string | null, title: string | null, text: string): string;
-		br(): string;
-		html(text: string): string;
-	}
-
-	class Parser {
-		constructor(options?: MarkedOptions);
-		tokens: Token[] | TokensList;
-		token: Token | null;
-		options: MarkedOptions;
-		renderer: Renderer;
-		textRenderer: TextRenderer;
-		slugger: Slugger;
-		static parse(src: Token[] | TokensList, options?: MarkedOptions): string;
-		static parseInline(src: Token[], options?: MarkedOptions): string;
-		parse(src: Token[] | TokensList): string;
-		parseInline(src: Token[], renderer?: Renderer): string;
-		next(): Token;
-	}
-
-	class Lexer {
-		constructor(options?: MarkedOptions);
-		tokens: TokensList;
-		options: MarkedOptions;
-		rules: Rules;
-		static rules: Rules;
-		static lex(src: string, options?: MarkedOptions): TokensList;
-		static lexInline(src: string, options?: MarkedOptions): Token[];
-		lex(src: string): TokensList;
-		blockTokens(src: string, tokens: Token[]): Token[];
-		blockTokens(src: string, tokens: TokensList): TokensList;
-		inline(src: string, tokens?: Token[]): Token[];
-		inlineTokens(src: string, tokens?: Token[]): Token[];
-		state: {
-			inLink: boolean;
-			inRawBlock: boolean;
-			top: boolean;
+	extensions?: null | {
+		renderers: {
+			[name: string]: RendererExtensionFunction;
 		};
-	}
-
-	class Slugger {
-		seen: { [slugValue: string]: number };
-		slug(value: string, options?: SluggerOptions): string;
-	}
-
-	interface SluggerOptions {
-		dryrun: boolean;
-	}
-
-	interface Rules {
-		[ruleName: string]: RegExp | Rules;
-	}
-
-	type TokensList = Token[] & {
-		links: {
-			[key: string]: { href: string | null; title: string | null };
+		childTokens: {
+			[name: string]: string[];
 		};
+		inline?: TokenizerExtensionFunction[];
+		block?: TokenizerExtensionFunction[];
+		startInline?: TokenizerStartFunction[];
+		startBlock?: TokenizerStartFunction[];
 	};
-
-	type Token =
-		| Tokens.Space
-		| Tokens.Code
-		| Tokens.Heading
-		| Tokens.Table
-		| Tokens.Hr
-		| Tokens.Blockquote
-		| Tokens.List
-		| Tokens.ListItem
-		| Tokens.Paragraph
-		| Tokens.HTML
-		| Tokens.Text
-		| Tokens.Def
-		| Tokens.Escape
-		| Tokens.Tag
-		| Tokens.Image
-		| Tokens.Link
-		| Tokens.Strong
-		| Tokens.Em
-		| Tokens.Codespan
-		| Tokens.Br
-		| Tokens.Del;
-
-	namespace Tokens {
-		interface Space {
-			type: 'space';
-			raw: string;
-		}
-
-		interface Code {
-			type: 'code';
-			raw: string;
-			codeBlockStyle?: 'indented' | undefined;
-			lang?: string | undefined;
-			text: string;
-		}
-
-		interface Heading {
-			type: 'heading';
-			raw: string;
-			depth: number;
-			text: string;
-			tokens: Token[];
-		}
-
-		interface Table {
-			type: 'table';
-			raw: string;
-			align: Array<'center' | 'left' | 'right' | null>;
-			header: TableCell[];
-			rows: TableCell[][];
-		}
-
-		interface TableCell {
-			text: string;
-			tokens: Token[];
-		}
-
-		interface Hr {
-			type: 'hr';
-			raw: string;
-		}
-
-		interface Blockquote {
-			type: 'blockquote';
-			raw: string;
-			text: string;
-			tokens: Token[];
-		}
-
-		interface List {
-			type: 'list';
-			raw: string;
-			ordered: boolean;
-			start: number | '';
-			loose: boolean;
-			items: ListItem[];
-		}
-
-		interface ListItem {
-			type: 'list_item';
-			raw: string;
-			task: boolean;
-			checked?: boolean | undefined;
-			loose: boolean;
-			text: string;
-			tokens: Token[];
-		}
-
-		interface Paragraph {
-			type: 'paragraph';
-			raw: string;
-			pre?: boolean | undefined;
-			text: string;
-			tokens: Token[];
-		}
-
-		interface HTML {
-			type: 'html';
-			raw: string;
-			pre: boolean;
-			text: string;
-		}
-
-		interface Text {
-			type: 'text';
-			raw: string;
-			text: string;
-			tokens?: Token[] | undefined;
-		}
-
-		interface Def {
-			type: 'def';
-			raw: string;
-			tag: string;
-			href: string;
-			title: string;
-		}
-
-		interface Escape {
-			type: 'escape';
-			raw: string;
-			text: string;
-		}
-
-		interface Tag {
-			type: 'text' | 'html';
-			raw: string;
-			inLink: boolean;
-			inRawBlock: boolean;
-			text: string;
-		}
-
-		interface Link {
-			type: 'link';
-			raw: string;
-			href: string;
-			title: string;
-			text: string;
-			tokens: Token[];
-		}
-
-		interface Image {
-			type: 'image';
-			raw: string;
-			href: string;
-			title: string;
-			text: string;
-		}
-
-		interface Strong {
-			type: 'strong';
-			raw: string;
-			text: string;
-			tokens: Token[];
-		}
-
-		interface Em {
-			type: 'em';
-			raw: string;
-			text: string;
-			tokens: Token[];
-		}
-
-		interface Codespan {
-			type: 'codespan';
-			raw: string;
-			text: string;
-		}
-
-		interface Br {
-			type: 'br';
-			raw: string;
-		}
-
-		interface Del {
-			type: 'del';
-			raw: string;
-			text: string;
-			tokens: Token[];
-		}
-
-		interface Generic {
-			[index: string]: any;
-			type: string;
-			raw: string;
-			tokens?: Token[] | undefined;
-		}
-	}
-
-	interface TokenizerThis {
-		lexer: Lexer;
-	}
-
-	interface TokenizerExtension {
-		name: string;
-		level: 'block' | 'inline';
-		start?: ((this: TokenizerThis, src: string) => number | void) | undefined;
-		tokenizer: (this: TokenizerThis, src: string, tokens: Token[] | TokensList) => Tokens.Generic | void;
-		childTokens?: string[] | undefined;
-	}
-
-	interface RendererThis {
-		parser: Parser;
-	}
-
-	interface RendererExtension {
-		name: string;
-		renderer: (this: RendererThis, token: Tokens.Generic) => string | false;
-	}
-
-	interface MarkedExtension {
-		/**
-		 * A prefix URL for any relative link.
-		 */
-		baseUrl?: string | undefined;
-
-		/**
-		 * Enable GFM line breaks. This option requires the gfm option to be true.
-		 */
-		breaks?: boolean | undefined;
-
-		/**
-		 * Add tokenizers and renderers to marked
-		 */
-		extensions?:
-		| Array<TokenizerExtension | RendererExtension | (TokenizerExtension & RendererExtension)>
-		| undefined;
-
-		/**
-		 * Enable GitHub flavored markdown.
-		 */
-		gfm?: boolean | undefined;
-
-		/**
-		 * Include an id attribute when emitting headings.
-		 */
-		headerIds?: boolean | undefined;
-
-		/**
-		 * Set the prefix for header tag ids.
-		 */
-		headerPrefix?: string | undefined;
-
-		/**
-		 * A function to highlight code blocks. The function can either be
-		 * synchronous (returning a string) or asynchronous (callback invoked
-		 * with an error if any occurred during highlighting and a string
-		 * if highlighting was successful)
-		 */
-		highlight?(code: string, lang: string, callback?: (error: any, code?: string) => void): string | void;
-
-		/**
-		 * Set the prefix for code block classes.
-		 */
-		langPrefix?: string | undefined;
-
-		/**
-		 * Mangle autolinks (<email@domain.com>).
-		 */
-		mangle?: boolean | undefined;
-
-		/**
-		 * Conform to obscure parts of markdown.pl as much as possible. Don't fix any of the original markdown bugs or poor behavior.
-		 */
-		pedantic?: boolean | undefined;
-
-		/**
-		 * Type: object Default: new Renderer()
-		 *
-		 * An object containing functions to render tokens to HTML.
-		 */
-		renderer?: Renderer | RendererObject | undefined;
-
-		/**
-		 * Sanitize the output. Ignore any HTML that has been input.
-		 */
-		sanitize?: boolean | undefined;
-
-		/**
-		 * Optionally sanitize found HTML with a sanitizer function.
-		 */
-		sanitizer?(html: string): string;
-
-		/**
-		 * Shows an HTML error message when rendering fails.
-		 */
-		silent?: boolean | undefined;
-
-		/**
-		 * Use smarter list behavior than the original markdown. May eventually be default with the old behavior moved into pedantic.
-		 */
-		smartLists?: boolean | undefined;
-
-		/**
-		 * Use "smart" typograhic punctuation for things like quotes and dashes.
-		 */
-		smartypants?: boolean | undefined;
-
-		/**
-		 * The tokenizer defines how to turn markdown text into tokens.
-		 */
-		tokenizer?: Tokenizer | TokenizerObject | undefined;
-
-		/**
-		 * The walkTokens function gets called with every token.
-		 * Child tokens are called before moving on to sibling tokens.
-		 * Each token is passed by reference so updates are persisted when passed to the parser.
-		 * The return value of the function is ignored.
-		 */
-		walkTokens?: ((token: Token) => void) | undefined;
-		/**
-		 * Generate closing slash for self-closing tags (<br/> instead of <br>)
-		 */
-		xhtml?: boolean | undefined;
-	}
-
-	interface MarkedOptions extends Omit<MarkedExtension, 'extensions'> {
-		/**
-		 * Type: object Default: new Renderer()
-		 *
-		 * An object containing functions to render tokens to HTML.
-		 */
-		renderer?: Renderer | undefined;
-
-		/**
-		 * The tokenizer defines how to turn markdown text into tokens.
-		 */
-		tokenizer?: Tokenizer | undefined;
-	}
+	/**
+	 * walkTokens function returns array of values for Promise.all
+	 */
+	walkTokens?: null | ((token: Token) => void | Promise<void> | (void | Promise<void>)[]);
+}
+/**
+ * Block Lexer
+ */
+declare class _Lexer {
+	tokens: TokensList;
+	options: MarkedOptions;
+	state: {
+		inLink: boolean;
+		inRawBlock: boolean;
+		top: boolean;
+	};
+	private tokenizer;
+	private inlineQueue;
+	constructor(options?: MarkedOptions);
+	/**
+	 * Expose Rules
+	 */
+	static get rules(): {
+		block: {
+			normal: {
+				blockquote: RegExp;
+				code: RegExp;
+				def: RegExp;
+				fences: RegExp;
+				heading: RegExp;
+				hr: RegExp;
+				html: RegExp;
+				lheading: RegExp;
+				list: RegExp;
+				newline: RegExp;
+				paragraph: RegExp;
+				table: RegExp;
+				text: RegExp;
+			};
+			gfm: Record<"code" | "blockquote" | "hr" | "html" | "table" | "text" | "heading" | "list" | "paragraph" | "def" | "fences" | "lheading" | "newline", RegExp>;
+			pedantic: Record<"code" | "blockquote" | "hr" | "html" | "table" | "text" | "heading" | "list" | "paragraph" | "def" | "fences" | "lheading" | "newline", RegExp>;
+		};
+		inline: {
+			normal: {
+				_backpedal: RegExp;
+				anyPunctuation: RegExp;
+				autolink: RegExp;
+				blockSkip: RegExp;
+				br: RegExp;
+				code: RegExp;
+				del: RegExp;
+				emStrongLDelim: RegExp;
+				emStrongRDelimAst: RegExp;
+				emStrongRDelimUnd: RegExp;
+				escape: RegExp;
+				link: RegExp;
+				nolink: RegExp;
+				punctuation: RegExp;
+				reflink: RegExp;
+				reflinkSearch: RegExp;
+				tag: RegExp;
+				text: RegExp;
+				url: RegExp;
+			};
+			gfm: Record<"link" | "code" | "url" | "br" | "del" | "text" | "escape" | "tag" | "reflink" | "autolink" | "nolink" | "_backpedal" | "anyPunctuation" | "blockSkip" | "emStrongLDelim" | "emStrongRDelimAst" | "emStrongRDelimUnd" | "punctuation" | "reflinkSearch", RegExp>;
+			breaks: Record<"link" | "code" | "url" | "br" | "del" | "text" | "escape" | "tag" | "reflink" | "autolink" | "nolink" | "_backpedal" | "anyPunctuation" | "blockSkip" | "emStrongLDelim" | "emStrongRDelimAst" | "emStrongRDelimUnd" | "punctuation" | "reflinkSearch", RegExp>;
+			pedantic: Record<"link" | "code" | "url" | "br" | "del" | "text" | "escape" | "tag" | "reflink" | "autolink" | "nolink" | "_backpedal" | "anyPunctuation" | "blockSkip" | "emStrongLDelim" | "emStrongRDelimAst" | "emStrongRDelimUnd" | "punctuation" | "reflinkSearch", RegExp>;
+		};
+	};
+	/**
+	 * Static Lex Method
+	 */
+	static lex(src: string, options?: MarkedOptions): TokensList;
+	/**
+	 * Static Lex Inline Method
+	 */
+	static lexInline(src: string, options?: MarkedOptions): Token[];
+	/**
+	 * Preprocessing
+	 */
+	lex(src: string): TokensList;
+	/**
+	 * Lexing
+	 */
+	blockTokens(src: string, tokens?: Token[], lastParagraphClipped?: boolean): Token[];
+	blockTokens(src: string, tokens?: TokensList, lastParagraphClipped?: boolean): TokensList;
+	inline(src: string, tokens?: Token[]): Token[];
+	/**
+	 * Lexing/Compiling
+	 */
+	inlineTokens(src: string, tokens?: Token[]): Token[];
+}
+/**
+ * Gets the original marked default options.
+ */
+declare function _getDefaults(): MarkedOptions;
+declare let _defaults: MarkedOptions;
+export type MaybePromise = void | Promise<void>;
+export declare class Marked {
+	defaults: MarkedOptions;
+	options: (opt: MarkedOptions) => this;
+	parse: {
+		(src: string, options: MarkedOptions & {
+			async: true;
+		}): Promise<string>;
+		(src: string, options: MarkedOptions & {
+			async: false;
+		}): string;
+		(src: string, options?: MarkedOptions | undefined | null): string | Promise<string>;
+	};
+	parseInline: {
+		(src: string, options: MarkedOptions & {
+			async: true;
+		}): Promise<string>;
+		(src: string, options: MarkedOptions & {
+			async: false;
+		}): string;
+		(src: string, options?: MarkedOptions | undefined | null): string | Promise<string>;
+	};
+	Parser: typeof _Parser;
+	Renderer: typeof _Renderer;
+	TextRenderer: typeof _TextRenderer;
+	Lexer: typeof _Lexer;
+	Tokenizer: typeof _Tokenizer;
+	Hooks: typeof _Hooks;
+	constructor(...args: MarkedExtension[]);
+	/**
+	 * Run callback for every token
+	 */
+	walkTokens(tokens: Token[] | TokensList, callback: (token: Token) => MaybePromise | MaybePromise[]): MaybePromise[];
+	use(...args: MarkedExtension[]): this;
+	setOptions(opt: MarkedOptions): this;
+	lexer(src: string, options?: MarkedOptions): TokensList;
+	parser(tokens: Token[], options?: MarkedOptions): string;
+	private parseMarkdown;
+	private onError;
+}
+/**
+ * Compiles markdown to HTML asynchronously.
+ *
+ * @param src String of markdown source to be compiled
+ * @param options Hash of options, having async: true
+ * @return Promise of string of compiled HTML
+ */
+export declare function marked(src: string, options: MarkedOptions & {
+	async: true;
+}): Promise<string>;
+/**
+ * Compiles markdown to HTML.
+ *
+ * @param src String of markdown source to be compiled
+ * @param options Optional hash of options
+ * @return String of compiled HTML. Will be a Promise of string if async is set to true by any extensions.
+ */
+export declare function marked(src: string, options: MarkedOptions & {
+	async: false;
+}): string;
+export declare function marked(src: string, options: MarkedOptions & {
+	async: true;
+}): Promise<string>;
+export declare function marked(src: string, options?: MarkedOptions | undefined | null): string | Promise<string>;
+export declare namespace marked {
+	var options: (options: MarkedOptions) => typeof marked;
+	var setOptions: (options: MarkedOptions) => typeof marked;
+	var getDefaults: typeof _getDefaults;
+	var defaults: MarkedOptions;
+	var use: (...args: MarkedExtension[]) => typeof marked;
+	var walkTokens: (tokens: Token[] | TokensList, callback: (token: Token) => MaybePromise | MaybePromise[]) => MaybePromise[];
+	var parseInline: {
+		(src: string, options: MarkedOptions & {
+			async: true;
+		}): Promise<string>;
+		(src: string, options: MarkedOptions & {
+			async: false;
+		}): string;
+		(src: string, options?: MarkedOptions | undefined | null): string | Promise<string>;
+	};
+	var Parser: typeof _Parser;
+	var parser: typeof _Parser.parse;
+	var Renderer: typeof _Renderer;
+	var TextRenderer: typeof _TextRenderer;
+	var Lexer: typeof _Lexer;
+	var lexer: typeof _Lexer.lex;
+	var Tokenizer: typeof _Tokenizer;
+	var Hooks: typeof _Hooks;
+	var parse: typeof marked;
 }
+export declare const options: (options: MarkedOptions) => typeof marked;
+export declare const setOptions: (options: MarkedOptions) => typeof marked;
+export declare const use: (...args: MarkedExtension[]) => typeof marked;
+export declare const walkTokens: (tokens: Token[] | TokensList, callback: (token: Token) => MaybePromise | MaybePromise[]) => MaybePromise[];
+export declare const parseInline: {
+	(src: string, options: MarkedOptions & {
+		async: true;
+	}): Promise<string>;
+	(src: string, options: MarkedOptions & {
+		async: false;
+	}): string;
+	(src: string, options?: MarkedOptions | undefined | null): string | Promise<string>;
+};
+export declare const parse: typeof marked;
+export declare const parser: typeof _Parser.parse;
+export declare const lexer: typeof _Lexer.lex;
+
+export {
+	_Hooks as Hooks,
+	_Lexer as Lexer,
+	_Parser as Parser,
+	_Renderer as Renderer,
+	_TextRenderer as TextRenderer,
+	_Tokenizer as Tokenizer,
+	_defaults as defaults,
+	_getDefaults as getDefaults,
+};
+
+export { };
diff --git a/src/vs/base/common/marked/marked.js b/src/vs/base/common/marked/marked.js
index eb8cde82ab4..cfd89402acd 100644
--- a/src/vs/base/common/marked/marked.js
+++ b/src/vs/base/common/marked/marked.js
@@ -1,6 +1,6 @@
 /**
- * marked - a markdown parser
- * Copyright (c) 2011-2022, Christopher Jeffrey. (MIT Licensed)
+ * marked v14.0.0 - a markdown parser
+ * Copyright (c) 2011-2024, Christopher Jeffrey. (MIT Licensed)
  * https://github.com/markedjs/marked
  */
 
@@ -18,3075 +18,2511 @@
 //   define.amd = true;
 // ESM-uncomment-end
 
- (function (global, factory) {
-  typeof define === 'function' && define.amd ? define(['exports'], factory) :
-  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
-  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.marked = {}));
-})(this, (function (exports) { 'use strict';
-
-  function _defineProperties(target, props) {
-    for (var i = 0; i < props.length; i++) {
-      var descriptor = props[i];
-      descriptor.enumerable = descriptor.enumerable || false;
-      descriptor.configurable = true;
-      if ("value" in descriptor) descriptor.writable = true;
-      Object.defineProperty(target, descriptor.key, descriptor);
-    }
-  }
-
-  function _createClass(Constructor, protoProps, staticProps) {
-    if (protoProps) _defineProperties(Constructor.prototype, protoProps);
-    if (staticProps) _defineProperties(Constructor, staticProps);
-    Object.defineProperty(Constructor, "prototype", {
-      writable: false
-    });
-    return Constructor;
-  }
-
-  function _unsupportedIterableToArray(o, minLen) {
-    if (!o) return;
-    if (typeof o === "string") return _arrayLikeToArray(o, minLen);
-    var n = Object.prototype.toString.call(o).slice(8, -1);
-    if (n === "Object" && o.constructor) n = o.constructor.name;
-    if (n === "Map" || n === "Set") return Array.from(o);
-    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
-  }
-
-  function _arrayLikeToArray(arr, len) {
-    if (len == null || len > arr.length) len = arr.length;
-
-    for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
-
-    return arr2;
-  }
-
-  function _createForOfIteratorHelperLoose(o, allowArrayLike) {
-    var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"];
-    if (it) return (it = it.call(o)).next.bind(it);
-
-    if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") {
-      if (it) o = it;
-      var i = 0;
-      return function () {
-        if (i >= o.length) return {
-          done: true
-        };
-        return {
-          done: false,
-          value: o[i++]
-        };
-      };
-    }
-
-    throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-  }
-
-  function getDefaults() {
-    return {
-      async: false,
-      baseUrl: null,
-      breaks: false,
-      extensions: null,
-      gfm: true,
-      headerIds: true,
-      headerPrefix: '',
-      highlight: null,
-      langPrefix: 'language-',
-      mangle: true,
-      pedantic: false,
-      renderer: null,
-      sanitize: false,
-      sanitizer: null,
-      silent: false,
-      smartLists: false,
-      smartypants: false,
-      tokenizer: null,
-      walkTokens: null,
-      xhtml: false
-    };
-  }
-  exports.defaults = getDefaults();
-  function changeDefaults(newDefaults) {
-    exports.defaults = newDefaults;
-  }
-
-  /**
-   * Helpers
-   */
-  var escapeTest = /[&<>"']/;
-  var escapeReplace = /[&<>"']/g;
-  var escapeTestNoEncode = /[<>"']|&(?!#?\w+;)/;
-  var escapeReplaceNoEncode = /[<>"']|&(?!#?\w+;)/g;
-  var escapeReplacements = {
-    '&': '&amp;',
-    '<': '&lt;',
-    '>': '&gt;',
-    '"': '&quot;',
-    "'": '&#39;'
-  };
-
-  var getEscapeReplacement = function getEscapeReplacement(ch) {
-    return escapeReplacements[ch];
-  };
-
-  function escape(html, encode) {
-    if (encode) {
-      if (escapeTest.test(html)) {
-        return html.replace(escapeReplace, getEscapeReplacement);
-      }
-    } else {
-      if (escapeTestNoEncode.test(html)) {
-        return html.replace(escapeReplaceNoEncode, getEscapeReplacement);
-      }
-    }
-
-    return html;
-  }
-  var unescapeTest = /&(#(?:\d+)|(?:#x[0-9A-Fa-f]+)|(?:\w+));?/ig;
-  /**
-   * @param {string} html
-   */
-
-  function unescape(html) {
-    // explicitly match decimal, hex, and named HTML entities
-    return html.replace(unescapeTest, function (_, n) {
-      n = n.toLowerCase();
-      if (n === 'colon') return ':';
-
-      if (n.charAt(0) === '#') {
-        return n.charAt(1) === 'x' ? String.fromCharCode(parseInt(n.substring(2), 16)) : String.fromCharCode(+n.substring(1));
-      }
-
-      return '';
-    });
-  }
-  var caret = /(^|[^\[])\^/g;
-  /**
-   * @param {string | RegExp} regex
-   * @param {string} opt
-   */
-
-  function edit(regex, opt) {
-    regex = typeof regex === 'string' ? regex : regex.source;
-    opt = opt || '';
-    var obj = {
-      replace: function replace(name, val) {
-        val = val.source || val;
-        val = val.replace(caret, '$1');
-        regex = regex.replace(name, val);
-        return obj;
-      },
-      getRegex: function getRegex() {
-        return new RegExp(regex, opt);
-      }
-    };
-    return obj;
-  }
-  var nonWordAndColonTest = /[^\w:]/g;
-  var originIndependentUrl = /^$|^[a-z][a-z0-9+.-]*:|^[?#]/i;
-  /**
-   * @param {boolean} sanitize
-   * @param {string} base
-   * @param {string} href
-   */
-
-  function cleanUrl(sanitize, base, href) {
-    if (sanitize) {
-      var prot;
-
-      try {
-        prot = decodeURIComponent(unescape(href)).replace(nonWordAndColonTest, '').toLowerCase();
-      } catch (e) {
-        return null;
-      }
-
-      if (prot.indexOf('javascript:') === 0 || prot.indexOf('vbscript:') === 0 || prot.indexOf('data:') === 0) {
-        return null;
-      }
-    }
-
-    if (base && !originIndependentUrl.test(href)) {
-      href = resolveUrl(base, href);
-    }
-
-    try {
-      href = encodeURI(href).replace(/%25/g, '%');
-    } catch (e) {
-      return null;
-    }
-
-    return href;
-  }
-  var baseUrls = {};
-  var justDomain = /^[^:]+:\/*[^/]*$/;
-  var protocol = /^([^:]+:)[\s\S]*$/;
-  var domain = /^([^:]+:\/*[^/]*)[\s\S]*$/;
-  /**
-   * @param {string} base
-   * @param {string} href
-   */
-
-  function resolveUrl(base, href) {
-    if (!baseUrls[' ' + base]) {
-      // we can ignore everything in base after the last slash of its path component,
-      // but we might need to add _that_
-      // https://tools.ietf.org/html/rfc3986#section-3
-      if (justDomain.test(base)) {
-        baseUrls[' ' + base] = base + '/';
-      } else {
-        baseUrls[' ' + base] = rtrim(base, '/', true);
-      }
-    }
-
-    base = baseUrls[' ' + base];
-    var relativeBase = base.indexOf(':') === -1;
-
-    if (href.substring(0, 2) === '//') {
-      if (relativeBase) {
-        return href;
-      }
-
-      return base.replace(protocol, '$1') + href;
-    } else if (href.charAt(0) === '/') {
-      if (relativeBase) {
-        return href;
-      }
-
-      return base.replace(domain, '$1') + href;
-    } else {
-      return base + href;
-    }
-  }
-  var noopTest = {
-    exec: function noopTest() {}
-  };
-  function merge(obj) {
-    var i = 1,
-        target,
-        key;
-
-    for (; i < arguments.length; i++) {
-      target = arguments[i];
-
-      for (key in target) {
-        if (Object.prototype.hasOwnProperty.call(target, key)) {
-          obj[key] = target[key];
-        }
-      }
-    }
-
-    return obj;
-  }
-  function splitCells(tableRow, count) {
-    // ensure that every cell-delimiting pipe has a space
-    // before it to distinguish it from an escaped pipe
-    var row = tableRow.replace(/\|/g, function (match, offset, str) {
-      var escaped = false,
-          curr = offset;
-
-      while (--curr >= 0 && str[curr] === '\\') {
-        escaped = !escaped;
-      }
-
-      if (escaped) {
-        // odd number of slashes means | is escaped
-        // so we leave it alone
-        return '|';
-      } else {
-        // add space before unescaped |
-        return ' |';
-      }
-    }),
-        cells = row.split(/ \|/);
-    var i = 0; // First/last cell in a row cannot be empty if it has no leading/trailing pipe
-
-    if (!cells[0].trim()) {
-      cells.shift();
-    }
-
-    if (cells.length > 0 && !cells[cells.length - 1].trim()) {
-      cells.pop();
-    }
-
-    if (cells.length > count) {
-      cells.splice(count);
-    } else {
-      while (cells.length < count) {
-        cells.push('');
-      }
-    }
-
-    for (; i < cells.length; i++) {
-      // leading or trailing whitespace is ignored per the gfm spec
-      cells[i] = cells[i].trim().replace(/\\\|/g, '|');
-    }
-
-    return cells;
-  }
-  /**
-   * Remove trailing 'c's. Equivalent to str.replace(/c*$/, '').
-   * /c*$/ is vulnerable to REDOS.
-   *
-   * @param {string} str
-   * @param {string} c
-   * @param {boolean} invert Remove suffix of non-c chars instead. Default falsey.
-   */
-
-  function rtrim(str, c, invert) {
-    var l = str.length;
-
-    if (l === 0) {
-      return '';
-    } // Length of suffix matching the invert condition.
-
-
-    var suffLen = 0; // Step left until we fail to match the invert condition.
-
-    while (suffLen < l) {
-      var currChar = str.charAt(l - suffLen - 1);
-
-      if (currChar === c && !invert) {
-        suffLen++;
-      } else if (currChar !== c && invert) {
-        suffLen++;
-      } else {
-        break;
-      }
-    }
-
-    return str.slice(0, l - suffLen);
-  }
-  function findClosingBracket(str, b) {
-    if (str.indexOf(b[1]) === -1) {
-      return -1;
-    }
-
-    var l = str.length;
-    var level = 0,
-        i = 0;
-
-    for (; i < l; i++) {
-      if (str[i] === '\\') {
-        i++;
-      } else if (str[i] === b[0]) {
-        level++;
-      } else if (str[i] === b[1]) {
-        level--;
-
-        if (level < 0) {
-          return i;
-        }
-      }
-    }
-
-    return -1;
-  }
-  function checkSanitizeDeprecation(opt) {
-    if (opt && opt.sanitize && !opt.silent) {
-      console.warn('marked(): sanitize and sanitizer parameters are deprecated since version 0.7.0, should not be used and will be removed in the future. Read more here: https://marked.js.org/#/USING_ADVANCED.md#options');
-    }
-  } // copied from https://stackoverflow.com/a/5450113/806777
-
-  /**
-   * @param {string} pattern
-   * @param {number} count
-   */
-
-  function repeatString(pattern, count) {
-    if (count < 1) {
-      return '';
-    }
-
-    var result = '';
-
-    while (count > 1) {
-      if (count & 1) {
-        result += pattern;
-      }
-
-      count >>= 1;
-      pattern += pattern;
-    }
-
-    return result + pattern;
-  }
-
-  function outputLink(cap, link, raw, lexer) {
-    var href = link.href;
-    var title = link.title ? escape(link.title) : null;
-    var text = cap[1].replace(/\\([\[\]])/g, '$1');
-
-    if (cap[0].charAt(0) !== '!') {
-      lexer.state.inLink = true;
-      var token = {
-        type: 'link',
-        raw: raw,
-        href: href,
-        title: title,
-        text: text,
-        tokens: lexer.inlineTokens(text)
-      };
-      lexer.state.inLink = false;
-      return token;
-    }
-
-    return {
-      type: 'image',
-      raw: raw,
-      href: href,
-      title: title,
-      text: escape(text)
-    };
-  }
-
-  function indentCodeCompensation(raw, text) {
-    var matchIndentToCode = raw.match(/^(\s+)(?:```)/);
-
-    if (matchIndentToCode === null) {
-      return text;
-    }
-
-    var indentToCode = matchIndentToCode[1];
-    return text.split('\n').map(function (node) {
-      var matchIndentInNode = node.match(/^\s+/);
-
-      if (matchIndentInNode === null) {
-        return node;
-      }
-
-      var indentInNode = matchIndentInNode[0];
-
-      if (indentInNode.length >= indentToCode.length) {
-        return node.slice(indentToCode.length);
-      }
-
-      return node;
-    }).join('\n');
-  }
-  /**
-   * Tokenizer
-   */
-
-
-  var Tokenizer = /*#__PURE__*/function () {
-    function Tokenizer(options) {
-      this.options = options || exports.defaults;
-    }
-
-    var _proto = Tokenizer.prototype;
-
-    _proto.space = function space(src) {
-      var cap = this.rules.block.newline.exec(src);
-
-      if (cap && cap[0].length > 0) {
-        return {
-          type: 'space',
-          raw: cap[0]
-        };
-      }
-    };
-
-    _proto.code = function code(src) {
-      var cap = this.rules.block.code.exec(src);
-
-      if (cap) {
-        var text = cap[0].replace(/^ {1,4}/gm, '');
-        return {
-          type: 'code',
-          raw: cap[0],
-          codeBlockStyle: 'indented',
-          text: !this.options.pedantic ? rtrim(text, '\n') : text
-        };
-      }
-    };
-
-    _proto.fences = function fences(src) {
-      var cap = this.rules.block.fences.exec(src);
-
-      if (cap) {
-        var raw = cap[0];
-        var text = indentCodeCompensation(raw, cap[3] || '');
-        return {
-          type: 'code',
-          raw: raw,
-          lang: cap[2] ? cap[2].trim() : cap[2],
-          text: text
-        };
-      }
-    };
-
-    _proto.heading = function heading(src) {
-      var cap = this.rules.block.heading.exec(src);
-
-      if (cap) {
-        var text = cap[2].trim(); // remove trailing #s
-
-        if (/#$/.test(text)) {
-          var trimmed = rtrim(text, '#');
-
-          if (this.options.pedantic) {
-            text = trimmed.trim();
-          } else if (!trimmed || / $/.test(trimmed)) {
-            // CommonMark requires space before trailing #s
-            text = trimmed.trim();
-          }
-        }
-
-        return {
-          type: 'heading',
-          raw: cap[0],
-          depth: cap[1].length,
-          text: text,
-          tokens: this.lexer.inline(text)
-        };
-      }
-    };
-
-    _proto.hr = function hr(src) {
-      var cap = this.rules.block.hr.exec(src);
-
-      if (cap) {
-        return {
-          type: 'hr',
-          raw: cap[0]
-        };
-      }
-    };
-
-    _proto.blockquote = function blockquote(src) {
-      var cap = this.rules.block.blockquote.exec(src);
-
-      if (cap) {
-        var text = cap[0].replace(/^ *>[ \t]?/gm, '');
-        return {
-          type: 'blockquote',
-          raw: cap[0],
-          tokens: this.lexer.blockTokens(text, []),
-          text: text
-        };
-      }
-    };
-
-    _proto.list = function list(src) {
-      var cap = this.rules.block.list.exec(src);
-
-      if (cap) {
-        var raw, istask, ischecked, indent, i, blankLine, endsWithBlankLine, line, nextLine, rawLine, itemContents, endEarly;
-        var bull = cap[1].trim();
-        var isordered = bull.length > 1;
-        var list = {
-          type: 'list',
-          raw: '',
-          ordered: isordered,
-          start: isordered ? +bull.slice(0, -1) : '',
-          loose: false,
-          items: []
-        };
-        bull = isordered ? "\\d{1,9}\\" + bull.slice(-1) : "\\" + bull;
-
-        if (this.options.pedantic) {
-          bull = isordered ? bull : '[*+-]';
-        } // Get next list item
-
-
-        var itemRegex = new RegExp("^( {0,3}" + bull + ")((?:[\t ][^\\n]*)?(?:\\n|$))"); // Check if current bullet point can start a new List Item
-
-        while (src) {
-          endEarly = false;
-
-          if (!(cap = itemRegex.exec(src))) {
-            break;
-          }
-
-          if (this.rules.block.hr.test(src)) {
-            // End list if bullet was actually HR (possibly move into itemRegex?)
-            break;
-          }
-
-          raw = cap[0];
-          src = src.substring(raw.length);
-          line = cap[2].split('\n', 1)[0];
-          nextLine = src.split('\n', 1)[0];
-
-          if (this.options.pedantic) {
-            indent = 2;
-            itemContents = line.trimLeft();
-          } else {
-            indent = cap[2].search(/[^ ]/); // Find first non-space char
-
-            indent = indent > 4 ? 1 : indent; // Treat indented code blocks (> 4 spaces) as having only 1 indent
-
-            itemContents = line.slice(indent);
-            indent += cap[1].length;
-          }
-
-          blankLine = false;
-
-          if (!line && /^ *$/.test(nextLine)) {
-            // Items begin with at most one blank line
-            raw += nextLine + '\n';
-            src = src.substring(nextLine.length + 1);
-            endEarly = true;
-          }
-
-          if (!endEarly) {
-            var nextBulletRegex = new RegExp("^ {0," + Math.min(3, indent - 1) + "}(?:[*+-]|\\d{1,9}[.)])((?: [^\\n]*)?(?:\\n|$))");
-            var hrRegex = new RegExp("^ {0," + Math.min(3, indent - 1) + "}((?:- *){3,}|(?:_ *){3,}|(?:\\* *){3,})(?:\\n+|$)");
-            var fencesBeginRegex = new RegExp("^ {0," + Math.min(3, indent - 1) + "}(?:```|~~~)");
-            var headingBeginRegex = new RegExp("^ {0," + Math.min(3, indent - 1) + "}#"); // Check if following lines should be included in List Item
-
-            while (src) {
-              rawLine = src.split('\n', 1)[0];
-              line = rawLine; // Re-align to follow commonmark nesting rules
-
-              if (this.options.pedantic) {
-                line = line.replace(/^ {1,4}(?=( {4})*[^ ])/g, '  ');
-              } // End list item if found code fences
-
-
-              if (fencesBeginRegex.test(line)) {
-                break;
-              } // End list item if found start of new heading
-
-
-              if (headingBeginRegex.test(line)) {
-                break;
-              } // End list item if found start of new bullet
-
-
-              if (nextBulletRegex.test(line)) {
-                break;
-              } // Horizontal rule found
-
-
-              if (hrRegex.test(src)) {
-                break;
-              }
-
-              if (line.search(/[^ ]/) >= indent || !line.trim()) {
-                // Dedent if possible
-                itemContents += '\n' + line.slice(indent);
-              } else if (!blankLine) {
-                // Until blank line, item doesn't need indentation
-                itemContents += '\n' + line;
-              } else {
-                // Otherwise, improper indentation ends this item
-                break;
-              }
-
-              if (!blankLine && !line.trim()) {
-                // Check if current line is blank
-                blankLine = true;
-              }
-
-              raw += rawLine + '\n';
-              src = src.substring(rawLine.length + 1);
-            }
-          }
-
-          if (!list.loose) {
-            // If the previous item ended with a blank line, the list is loose
-            if (endsWithBlankLine) {
-              list.loose = true;
-            } else if (/\n *\n *$/.test(raw)) {
-              endsWithBlankLine = true;
-            }
-          } // Check for task list items
-
-
-          if (this.options.gfm) {
-            istask = /^\[[ xX]\] /.exec(itemContents);
-
-            if (istask) {
-              ischecked = istask[0] !== '[ ] ';
-              itemContents = itemContents.replace(/^\[[ xX]\] +/, '');
-            }
-          }
-
-          list.items.push({
-            type: 'list_item',
-            raw: raw,
-            task: !!istask,
-            checked: ischecked,
-            loose: false,
-            text: itemContents
-          });
-          list.raw += raw;
-        } // Do not consume newlines at end of final item. Alternatively, make itemRegex *start* with any newlines to simplify/speed up endsWithBlankLine logic
-
-
-        list.items[list.items.length - 1].raw = raw.trimRight();
-        list.items[list.items.length - 1].text = itemContents.trimRight();
-        list.raw = list.raw.trimRight();
-        var l = list.items.length; // Item child tokens handled here at end because we needed to have the final item to trim it first
-
-        for (i = 0; i < l; i++) {
-          this.lexer.state.top = false;
-          list.items[i].tokens = this.lexer.blockTokens(list.items[i].text, []);
-          var spacers = list.items[i].tokens.filter(function (t) {
-            return t.type === 'space';
-          });
-          var hasMultipleLineBreaks = spacers.every(function (t) {
-            var chars = t.raw.split('');
-            var lineBreaks = 0;
-
-            for (var _iterator = _createForOfIteratorHelperLoose(chars), _step; !(_step = _iterator()).done;) {
-              var _char = _step.value;
-
-              if (_char === '\n') {
-                lineBreaks += 1;
-              }
-
-              if (lineBreaks > 1) {
-                return true;
-              }
-            }
-
-            return false;
-          });
-
-          if (!list.loose && spacers.length && hasMultipleLineBreaks) {
-            // Having a single line break doesn't mean a list is loose. A single line break is terminating the last list item
-            list.loose = true;
-            list.items[i].loose = true;
-          }
-        }
-
-        return list;
-      }
-    };
-
-    _proto.html = function html(src) {
-      var cap = this.rules.block.html.exec(src);
-
-      if (cap) {
-        var token = {
-          type: 'html',
-          raw: cap[0],
-          pre: !this.options.sanitizer && (cap[1] === 'pre' || cap[1] === 'script' || cap[1] === 'style'),
-          text: cap[0]
-        };
-
-        if (this.options.sanitize) {
-          var text = this.options.sanitizer ? this.options.sanitizer(cap[0]) : escape(cap[0]);
-          token.type = 'paragraph';
-          token.text = text;
-          token.tokens = this.lexer.inline(text);
-        }
-
-        return token;
-      }
-    };
-
-    _proto.def = function def(src) {
-      var cap = this.rules.block.def.exec(src);
-
-      if (cap) {
-        if (cap[3]) cap[3] = cap[3].substring(1, cap[3].length - 1);
-        var tag = cap[1].toLowerCase().replace(/\s+/g, ' ');
-        return {
-          type: 'def',
-          tag: tag,
-          raw: cap[0],
-          href: cap[2],
-          title: cap[3]
-        };
-      }
-    };
-
-    _proto.table = function table(src) {
-      var cap = this.rules.block.table.exec(src);
-
-      if (cap) {
-        var item = {
-          type: 'table',
-          header: splitCells(cap[1]).map(function (c) {
-            return {
-              text: c
-            };
-          }),
-          align: cap[2].replace(/^ *|\| *$/g, '').split(/ *\| */),
-          rows: cap[3] && cap[3].trim() ? cap[3].replace(/\n[ \t]*$/, '').split('\n') : []
-        };
-
-        if (item.header.length === item.align.length) {
-          item.raw = cap[0];
-          var l = item.align.length;
-          var i, j, k, row;
-
-          for (i = 0; i < l; i++) {
-            if (/^ *-+: *$/.test(item.align[i])) {
-              item.align[i] = 'right';
-            } else if (/^ *:-+: *$/.test(item.align[i])) {
-              item.align[i] = 'center';
-            } else if (/^ *:-+ *$/.test(item.align[i])) {
-              item.align[i] = 'left';
-            } else {
-              item.align[i] = null;
-            }
-          }
-
-          l = item.rows.length;
-
-          for (i = 0; i < l; i++) {
-            item.rows[i] = splitCells(item.rows[i], item.header.length).map(function (c) {
-              return {
-                text: c
-              };
-            });
-          } // parse child tokens inside headers and cells
-          // header child tokens
-
-
-          l = item.header.length;
-
-          for (j = 0; j < l; j++) {
-            item.header[j].tokens = this.lexer.inline(item.header[j].text);
-          } // cell child tokens
-
-
-          l = item.rows.length;
-
-          for (j = 0; j < l; j++) {
-            row = item.rows[j];
-
-            for (k = 0; k < row.length; k++) {
-              row[k].tokens = this.lexer.inline(row[k].text);
-            }
-          }
-
-          return item;
-        }
-      }
-    };
-
-    _proto.lheading = function lheading(src) {
-      var cap = this.rules.block.lheading.exec(src);
-
-      if (cap) {
-        return {
-          type: 'heading',
-          raw: cap[0],
-          depth: cap[2].charAt(0) === '=' ? 1 : 2,
-          text: cap[1],
-          tokens: this.lexer.inline(cap[1])
-        };
-      }
-    };
-
-    _proto.paragraph = function paragraph(src) {
-      var cap = this.rules.block.paragraph.exec(src);
-
-      if (cap) {
-        var text = cap[1].charAt(cap[1].length - 1) === '\n' ? cap[1].slice(0, -1) : cap[1];
-        return {
-          type: 'paragraph',
-          raw: cap[0],
-          text: text,
-          tokens: this.lexer.inline(text)
-        };
-      }
-    };
-
-    _proto.text = function text(src) {
-      var cap = this.rules.block.text.exec(src);
-
-      if (cap) {
-        return {
-          type: 'text',
-          raw: cap[0],
-          text: cap[0],
-          tokens: this.lexer.inline(cap[0])
-        };
-      }
-    };
-
-    _proto.escape = function escape$1(src) {
-      var cap = this.rules.inline.escape.exec(src);
-
-      if (cap) {
-        return {
-          type: 'escape',
-          raw: cap[0],
-          text: escape(cap[1])
-        };
-      }
-    };
-
-    _proto.tag = function tag(src) {
-      var cap = this.rules.inline.tag.exec(src);
-
-      if (cap) {
-        if (!this.lexer.state.inLink && /^<a /i.test(cap[0])) {
-          this.lexer.state.inLink = true;
-        } else if (this.lexer.state.inLink && /^<\/a>/i.test(cap[0])) {
-          this.lexer.state.inLink = false;
-        }
-
-        if (!this.lexer.state.inRawBlock && /^<(pre|code|kbd|script)(\s|>)/i.test(cap[0])) {
-          this.lexer.state.inRawBlock = true;
-        } else if (this.lexer.state.inRawBlock && /^<\/(pre|code|kbd|script)(\s|>)/i.test(cap[0])) {
-          this.lexer.state.inRawBlock = false;
-        }
-
-        return {
-          type: this.options.sanitize ? 'text' : 'html',
-          raw: cap[0],
-          inLink: this.lexer.state.inLink,
-          inRawBlock: this.lexer.state.inRawBlock,
-          text: this.options.sanitize ? this.options.sanitizer ? this.options.sanitizer(cap[0]) : escape(cap[0]) : cap[0]
-        };
-      }
-    };
-
-    _proto.link = function link(src) {
-      var cap = this.rules.inline.link.exec(src);
-
-      if (cap) {
-        var trimmedUrl = cap[2].trim();
-
-        if (!this.options.pedantic && /^</.test(trimmedUrl)) {
-          // commonmark requires matching angle brackets
-          if (!/>$/.test(trimmedUrl)) {
-            return;
-          } // ending angle bracket cannot be escaped
-
-
-          var rtrimSlash = rtrim(trimmedUrl.slice(0, -1), '\\');
-
-          if ((trimmedUrl.length - rtrimSlash.length) % 2 === 0) {
-            return;
-          }
-        } else {
-          // find closing parenthesis
-          var lastParenIndex = findClosingBracket(cap[2], '()');
-
-          if (lastParenIndex > -1) {
-            var start = cap[0].indexOf('!') === 0 ? 5 : 4;
-            var linkLen = start + cap[1].length + lastParenIndex;
-            cap[2] = cap[2].substring(0, lastParenIndex);
-            cap[0] = cap[0].substring(0, linkLen).trim();
-            cap[3] = '';
-          }
-        }
-
-        var href = cap[2];
-        var title = '';
-
-        if (this.options.pedantic) {
-          // split pedantic href and title
-          var link = /^([^'"]*[^\s])\s+(['"])(.*)\2/.exec(href);
-
-          if (link) {
-            href = link[1];
-            title = link[3];
-          }
-        } else {
-          title = cap[3] ? cap[3].slice(1, -1) : '';
-        }
-
-        href = href.trim();
-
-        if (/^</.test(href)) {
-          if (this.options.pedantic && !/>$/.test(trimmedUrl)) {
-            // pedantic allows starting angle bracket without ending angle bracket
-            href = href.slice(1);
-          } else {
-            href = href.slice(1, -1);
-          }
-        }
-
-        return outputLink(cap, {
-          href: href ? href.replace(this.rules.inline._escapes, '$1') : href,
-          title: title ? title.replace(this.rules.inline._escapes, '$1') : title
-        }, cap[0], this.lexer);
-      }
-    };
-
-    _proto.reflink = function reflink(src, links) {
-      var cap;
-
-      if ((cap = this.rules.inline.reflink.exec(src)) || (cap = this.rules.inline.nolink.exec(src))) {
-        var link = (cap[2] || cap[1]).replace(/\s+/g, ' ');
-        link = links[link.toLowerCase()];
-
-        if (!link || !link.href) {
-          var text = cap[0].charAt(0);
-          return {
-            type: 'text',
-            raw: text,
-            text: text
-          };
-        }
-
-        return outputLink(cap, link, cap[0], this.lexer);
-      }
-    };
-
-    _proto.emStrong = function emStrong(src, maskedSrc, prevChar) {
-      if (prevChar === void 0) {
-        prevChar = '';
-      }
-
-      var match = this.rules.inline.emStrong.lDelim.exec(src);
-      if (!match) return; // _ can't be between two alphanumerics. \p{L}\p{N} includes non-english alphabet/numbers as well
-
-      if (match[3] && prevChar.match(/(?:[0-9A-Za-z\xAA\xB2\xB3\xB5\xB9\xBA\xBC-\xBE\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0370-\u0374\u0376\u0377\u037A-\u037D\u037F\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u048A-\u052F\u0531-\u0556\u0559\u0560-\u0588\u05D0-\u05EA\u05EF-\u05F2\u0620-\u064A\u0660-\u0669\u066E\u066F\u0671-\u06D3\u06D5\u06E5\u06E6\u06EE-\u06FC\u06FF\u0710\u0712-\u072F\u074D-\u07A5\u07B1\u07C0-\u07EA\u07F4\u07F5\u07FA\u0800-\u0815\u081A\u0824\u0828\u0840-\u0858\u0860-\u086A\u0870-\u0887\u0889-\u088E\u08A0-\u08C9\u0904-\u0939\u093D\u0950\u0958-\u0961\u0966-\u096F\u0971-\u0980\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BD\u09CE\u09DC\u09DD\u09DF-\u09E1\u09E6-\u09F1\u09F4-\u09F9\u09FC\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A59-\u0A5C\u0A5E\u0A66-\u0A6F\u0A72-\u0A74\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABD\u0AD0\u0AE0\u0AE1\u0AE6-\u0AEF\u0AF9\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3D\u0B5C\u0B5D\u0B5F-\u0B61\u0B66-\u0B6F\u0B71-\u0B77\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BD0\u0BE6-\u0BF2\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C39\u0C3D\u0C58-\u0C5A\u0C5D\u0C60\u0C61\u0C66-\u0C6F\u0C78-\u0C7E\u0C80\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBD\u0CDD\u0CDE\u0CE0\u0CE1\u0CE6-\u0CEF\u0CF1\u0CF2\u0D04-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D\u0D4E\u0D54-\u0D56\u0D58-\u0D61\u0D66-\u0D78\u0D7A-\u0D7F\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0DE6-\u0DEF\u0E01-\u0E30\u0E32\u0E33\u0E40-\u0E46\u0E50-\u0E59\u0E81\u0E82\u0E84\u0E86-\u0E8A\u0E8C-\u0EA3\u0EA5\u0EA7-\u0EB0\u0EB2\u0EB3\u0EBD\u0EC0-\u0EC4\u0EC6\u0ED0-\u0ED9\u0EDC-\u0EDF\u0F00\u0F20-\u0F33\u0F40-\u0F47\u0F49-\u0F6C\u0F88-\u0F8C\u1000-\u102A\u103F-\u1049\u1050-\u1055\u105A-\u105D\u1061\u1065\u1066\u106E-\u1070\u1075-\u1081\u108E\u1090-\u1099\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u1369-\u137C\u1380-\u138F\u13A0-\u13F5\u13F8-\u13FD\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16EE-\u16F8\u1700-\u1711\u171F-\u1731\u1740-\u1751\u1760-\u176C\u176E-\u1770\u1780-\u17B3\u17D7\u17DC\u17E0-\u17E9\u17F0-\u17F9\u1810-\u1819\u1820-\u1878\u1880-\u1884\u1887-\u18A8\u18AA\u18B0-\u18F5\u1900-\u191E\u1946-\u196D\u1970-\u1974\u1980-\u19AB\u19B0-\u19C9\u19D0-\u19DA\u1A00-\u1A16\u1A20-\u1A54\u1A80-\u1A89\u1A90-\u1A99\u1AA7\u1B05-\u1B33\u1B45-\u1B4C\u1B50-\u1B59\u1B83-\u1BA0\u1BAE-\u1BE5\u1C00-\u1C23\u1C40-\u1C49\u1C4D-\u1C7D\u1C80-\u1C88\u1C90-\u1CBA\u1CBD-\u1CBF\u1CE9-\u1CEC\u1CEE-\u1CF3\u1CF5\u1CF6\u1CFA\u1D00-\u1DBF\u1E00-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2070\u2071\u2074-\u2079\u207F-\u2089\u2090-\u209C\u2102\u2107\u210A-\u2113\u2115\u2119-\u211D\u2124\u2126\u2128\u212A-\u212D\u212F-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2150-\u2189\u2460-\u249B\u24EA-\u24FF\u2776-\u2793\u2C00-\u2CE4\u2CEB-\u2CEE\u2CF2\u2CF3\u2CFD\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D80-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u2E2F\u3005-\u3007\u3021-\u3029\u3031-\u3035\u3038-\u303C\u3041-\u3096\u309D-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312F\u3131-\u318E\u3192-\u3195\u31A0-\u31BF\u31F0-\u31FF\u3220-\u3229\u3248-\u324F\u3251-\u325F\u3280-\u3289\u32B1-\u32BF\u3400-\u4DBF\u4E00-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA62B\uA640-\uA66E\uA67F-\uA69D\uA6A0-\uA6EF\uA717-\uA71F\uA722-\uA788\uA78B-\uA7CA\uA7D0\uA7D1\uA7D3\uA7D5-\uA7D9\uA7F2-\uA801\uA803-\uA805\uA807-\uA80A\uA80C-\uA822\uA830-\uA835\uA840-\uA873\uA882-\uA8B3\uA8D0-\uA8D9\uA8F2-\uA8F7\uA8FB\uA8FD\uA8FE\uA900-\uA925\uA930-\uA946\uA960-\uA97C\uA984-\uA9B2\uA9CF-\uA9D9\uA9E0-\uA9E4\uA9E6-\uA9FE\uAA00-\uAA28\uAA40-\uAA42\uAA44-\uAA4B\uAA50-\uAA59\uAA60-\uAA76\uAA7A\uAA7E-\uAAAF\uAAB1\uAAB5\uAAB6\uAAB9-\uAABD\uAAC0\uAAC2\uAADB-\uAADD\uAAE0-\uAAEA\uAAF2-\uAAF4\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uAB30-\uAB5A\uAB5C-\uAB69\uAB70-\uABE2\uABF0-\uABF9\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D\uFB1F-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE70-\uFE74\uFE76-\uFEFC\uFF10-\uFF19\uFF21-\uFF3A\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC]|\uD800[\uDC00-\uDC0B\uDC0D-\uDC26\uDC28-\uDC3A\uDC3C\uDC3D\uDC3F-\uDC4D\uDC50-\uDC5D\uDC80-\uDCFA\uDD07-\uDD33\uDD40-\uDD78\uDD8A\uDD8B\uDE80-\uDE9C\uDEA0-\uDED0\uDEE1-\uDEFB\uDF00-\uDF23\uDF2D-\uDF4A\uDF50-\uDF75\uDF80-\uDF9D\uDFA0-\uDFC3\uDFC8-\uDFCF\uDFD1-\uDFD5]|\uD801[\uDC00-\uDC9D\uDCA0-\uDCA9\uDCB0-\uDCD3\uDCD8-\uDCFB\uDD00-\uDD27\uDD30-\uDD63\uDD70-\uDD7A\uDD7C-\uDD8A\uDD8C-\uDD92\uDD94\uDD95\uDD97-\uDDA1\uDDA3-\uDDB1\uDDB3-\uDDB9\uDDBB\uDDBC\uDE00-\uDF36\uDF40-\uDF55\uDF60-\uDF67\uDF80-\uDF85\uDF87-\uDFB0\uDFB2-\uDFBA]|\uD802[\uDC00-\uDC05\uDC08\uDC0A-\uDC35\uDC37\uDC38\uDC3C\uDC3F-\uDC55\uDC58-\uDC76\uDC79-\uDC9E\uDCA7-\uDCAF\uDCE0-\uDCF2\uDCF4\uDCF5\uDCFB-\uDD1B\uDD20-\uDD39\uDD80-\uDDB7\uDDBC-\uDDCF\uDDD2-\uDE00\uDE10-\uDE13\uDE15-\uDE17\uDE19-\uDE35\uDE40-\uDE48\uDE60-\uDE7E\uDE80-\uDE9F\uDEC0-\uDEC7\uDEC9-\uDEE4\uDEEB-\uDEEF\uDF00-\uDF35\uDF40-\uDF55\uDF58-\uDF72\uDF78-\uDF91\uDFA9-\uDFAF]|\uD803[\uDC00-\uDC48\uDC80-\uDCB2\uDCC0-\uDCF2\uDCFA-\uDD23\uDD30-\uDD39\uDE60-\uDE7E\uDE80-\uDEA9\uDEB0\uDEB1\uDF00-\uDF27\uDF30-\uDF45\uDF51-\uDF54\uDF70-\uDF81\uDFB0-\uDFCB\uDFE0-\uDFF6]|\uD804[\uDC03-\uDC37\uDC52-\uDC6F\uDC71\uDC72\uDC75\uDC83-\uDCAF\uDCD0-\uDCE8\uDCF0-\uDCF9\uDD03-\uDD26\uDD36-\uDD3F\uDD44\uDD47\uDD50-\uDD72\uDD76\uDD83-\uDDB2\uDDC1-\uDDC4\uDDD0-\uDDDA\uDDDC\uDDE1-\uDDF4\uDE00-\uDE11\uDE13-\uDE2B\uDE80-\uDE86\uDE88\uDE8A-\uDE8D\uDE8F-\uDE9D\uDE9F-\uDEA8\uDEB0-\uDEDE\uDEF0-\uDEF9\uDF05-\uDF0C\uDF0F\uDF10\uDF13-\uDF28\uDF2A-\uDF30\uDF32\uDF33\uDF35-\uDF39\uDF3D\uDF50\uDF5D-\uDF61]|\uD805[\uDC00-\uDC34\uDC47-\uDC4A\uDC50-\uDC59\uDC5F-\uDC61\uDC80-\uDCAF\uDCC4\uDCC5\uDCC7\uDCD0-\uDCD9\uDD80-\uDDAE\uDDD8-\uDDDB\uDE00-\uDE2F\uDE44\uDE50-\uDE59\uDE80-\uDEAA\uDEB8\uDEC0-\uDEC9\uDF00-\uDF1A\uDF30-\uDF3B\uDF40-\uDF46]|\uD806[\uDC00-\uDC2B\uDCA0-\uDCF2\uDCFF-\uDD06\uDD09\uDD0C-\uDD13\uDD15\uDD16\uDD18-\uDD2F\uDD3F\uDD41\uDD50-\uDD59\uDDA0-\uDDA7\uDDAA-\uDDD0\uDDE1\uDDE3\uDE00\uDE0B-\uDE32\uDE3A\uDE50\uDE5C-\uDE89\uDE9D\uDEB0-\uDEF8]|\uD807[\uDC00-\uDC08\uDC0A-\uDC2E\uDC40\uDC50-\uDC6C\uDC72-\uDC8F\uDD00-\uDD06\uDD08\uDD09\uDD0B-\uDD30\uDD46\uDD50-\uDD59\uDD60-\uDD65\uDD67\uDD68\uDD6A-\uDD89\uDD98\uDDA0-\uDDA9\uDEE0-\uDEF2\uDFB0\uDFC0-\uDFD4]|\uD808[\uDC00-\uDF99]|\uD809[\uDC00-\uDC6E\uDC80-\uDD43]|\uD80B[\uDF90-\uDFF0]|[\uD80C\uD81C-\uD820\uD822\uD840-\uD868\uD86A-\uD86C\uD86F-\uD872\uD874-\uD879\uD880-\uD883][\uDC00-\uDFFF]|\uD80D[\uDC00-\uDC2E]|\uD811[\uDC00-\uDE46]|\uD81A[\uDC00-\uDE38\uDE40-\uDE5E\uDE60-\uDE69\uDE70-\uDEBE\uDEC0-\uDEC9\uDED0-\uDEED\uDF00-\uDF2F\uDF40-\uDF43\uDF50-\uDF59\uDF5B-\uDF61\uDF63-\uDF77\uDF7D-\uDF8F]|\uD81B[\uDE40-\uDE96\uDF00-\uDF4A\uDF50\uDF93-\uDF9F\uDFE0\uDFE1\uDFE3]|\uD821[\uDC00-\uDFF7]|\uD823[\uDC00-\uDCD5\uDD00-\uDD08]|\uD82B[\uDFF0-\uDFF3\uDFF5-\uDFFB\uDFFD\uDFFE]|\uD82C[\uDC00-\uDD22\uDD50-\uDD52\uDD64-\uDD67\uDD70-\uDEFB]|\uD82F[\uDC00-\uDC6A\uDC70-\uDC7C\uDC80-\uDC88\uDC90-\uDC99]|\uD834[\uDEE0-\uDEF3\uDF60-\uDF78]|\uD835[\uDC00-\uDC54\uDC56-\uDC9C\uDC9E\uDC9F\uDCA2\uDCA5\uDCA6\uDCA9-\uDCAC\uDCAE-\uDCB9\uDCBB\uDCBD-\uDCC3\uDCC5-\uDD05\uDD07-\uDD0A\uDD0D-\uDD14\uDD16-\uDD1C\uDD1E-\uDD39\uDD3B-\uDD3E\uDD40-\uDD44\uDD46\uDD4A-\uDD50\uDD52-\uDEA5\uDEA8-\uDEC0\uDEC2-\uDEDA\uDEDC-\uDEFA\uDEFC-\uDF14\uDF16-\uDF34\uDF36-\uDF4E\uDF50-\uDF6E\uDF70-\uDF88\uDF8A-\uDFA8\uDFAA-\uDFC2\uDFC4-\uDFCB\uDFCE-\uDFFF]|\uD837[\uDF00-\uDF1E]|\uD838[\uDD00-\uDD2C\uDD37-\uDD3D\uDD40-\uDD49\uDD4E\uDE90-\uDEAD\uDEC0-\uDEEB\uDEF0-\uDEF9]|\uD839[\uDFE0-\uDFE6\uDFE8-\uDFEB\uDFED\uDFEE\uDFF0-\uDFFE]|\uD83A[\uDC00-\uDCC4\uDCC7-\uDCCF\uDD00-\uDD43\uDD4B\uDD50-\uDD59]|\uD83B[\uDC71-\uDCAB\uDCAD-\uDCAF\uDCB1-\uDCB4\uDD01-\uDD2D\uDD2F-\uDD3D\uDE00-\uDE03\uDE05-\uDE1F\uDE21\uDE22\uDE24\uDE27\uDE29-\uDE32\uDE34-\uDE37\uDE39\uDE3B\uDE42\uDE47\uDE49\uDE4B\uDE4D-\uDE4F\uDE51\uDE52\uDE54\uDE57\uDE59\uDE5B\uDE5D\uDE5F\uDE61\uDE62\uDE64\uDE67-\uDE6A\uDE6C-\uDE72\uDE74-\uDE77\uDE79-\uDE7C\uDE7E\uDE80-\uDE89\uDE8B-\uDE9B\uDEA1-\uDEA3\uDEA5-\uDEA9\uDEAB-\uDEBB]|\uD83C[\uDD00-\uDD0C]|\uD83E[\uDFF0-\uDFF9]|\uD869[\uDC00-\uDEDF\uDF00-\uDFFF]|\uD86D[\uDC00-\uDF38\uDF40-\uDFFF]|\uD86E[\uDC00-\uDC1D\uDC20-\uDFFF]|\uD873[\uDC00-\uDEA1\uDEB0-\uDFFF]|\uD87A[\uDC00-\uDFE0]|\uD87E[\uDC00-\uDE1D]|\uD884[\uDC00-\uDF4A])/)) return;
-      var nextChar = match[1] || match[2] || '';
-
-      if (!nextChar || nextChar && (prevChar === '' || this.rules.inline.punctuation.exec(prevChar))) {
-        var lLength = match[0].length - 1;
-        var rDelim,
-            rLength,
-            delimTotal = lLength,
-            midDelimTotal = 0;
-        var endReg = match[0][0] === '*' ? this.rules.inline.emStrong.rDelimAst : this.rules.inline.emStrong.rDelimUnd;
-        endReg.lastIndex = 0; // Clip maskedSrc to same section of string as src (move to lexer?)
-
-        maskedSrc = maskedSrc.slice(-1 * src.length + lLength);
-
-        while ((match = endReg.exec(maskedSrc)) != null) {
-          rDelim = match[1] || match[2] || match[3] || match[4] || match[5] || match[6];
-          if (!rDelim) continue; // skip single * in __abc*abc__
-
-          rLength = rDelim.length;
-
-          if (match[3] || match[4]) {
-            // found another Left Delim
-            delimTotal += rLength;
-            continue;
-          } else if (match[5] || match[6]) {
-            // either Left or Right Delim
-            if (lLength % 3 && !((lLength + rLength) % 3)) {
-              midDelimTotal += rLength;
-              continue; // CommonMark Emphasis Rules 9-10
-            }
-          }
-
-          delimTotal -= rLength;
-          if (delimTotal > 0) continue; // Haven't found enough closing delimiters
-          // Remove extra characters. *a*** -> *a*
-
-          rLength = Math.min(rLength, rLength + delimTotal + midDelimTotal); // Create `em` if smallest delimiter has odd char count. *a***
-
-          if (Math.min(lLength, rLength) % 2) {
-            var _text = src.slice(1, lLength + match.index + rLength);
-
-            return {
-              type: 'em',
-              raw: src.slice(0, lLength + match.index + rLength + 1),
-              text: _text,
-              tokens: this.lexer.inlineTokens(_text)
-            };
-          } // Create 'strong' if smallest delimiter has even char count. **a***
-
-
-          var text = src.slice(2, lLength + match.index + rLength - 1);
-          return {
-            type: 'strong',
-            raw: src.slice(0, lLength + match.index + rLength + 1),
-            text: text,
-            tokens: this.lexer.inlineTokens(text)
-          };
-        }
-      }
-    };
-
-    _proto.codespan = function codespan(src) {
-      var cap = this.rules.inline.code.exec(src);
-
-      if (cap) {
-        var text = cap[2].replace(/\n/g, ' ');
-        var hasNonSpaceChars = /[^ ]/.test(text);
-        var hasSpaceCharsOnBothEnds = /^ /.test(text) && / $/.test(text);
-
-        if (hasNonSpaceChars && hasSpaceCharsOnBothEnds) {
-          text = text.substring(1, text.length - 1);
-        }
-
-        text = escape(text, true);
-        return {
-          type: 'codespan',
-          raw: cap[0],
-          text: text
-        };
-      }
-    };
-
-    _proto.br = function br(src) {
-      var cap = this.rules.inline.br.exec(src);
-
-      if (cap) {
-        return {
-          type: 'br',
-          raw: cap[0]
-        };
-      }
-    };
-
-    _proto.del = function del(src) {
-      var cap = this.rules.inline.del.exec(src);
-
-      if (cap) {
-        return {
-          type: 'del',
-          raw: cap[0],
-          text: cap[2],
-          tokens: this.lexer.inlineTokens(cap[2])
-        };
-      }
-    };
-
-    _proto.autolink = function autolink(src, mangle) {
-      var cap = this.rules.inline.autolink.exec(src);
-
-      if (cap) {
-        var text, href;
-
-        if (cap[2] === '@') {
-          text = escape(this.options.mangle ? mangle(cap[1]) : cap[1]);
-          href = 'mailto:' + text;
-        } else {
-          text = escape(cap[1]);
-          href = text;
-        }
-
-        return {
-          type: 'link',
-          raw: cap[0],
-          text: text,
-          href: href,
-          tokens: [{
-            type: 'text',
-            raw: text,
-            text: text
-          }]
-        };
-      }
-    };
-
-    _proto.url = function url(src, mangle) {
-      var cap;
-
-      if (cap = this.rules.inline.url.exec(src)) {
-        var text, href;
-
-        if (cap[2] === '@') {
-          text = escape(this.options.mangle ? mangle(cap[0]) : cap[0]);
-          href = 'mailto:' + text;
-        } else {
-          // do extended autolink path validation
-          var prevCapZero;
-
-          do {
-            prevCapZero = cap[0];
-            cap[0] = this.rules.inline._backpedal.exec(cap[0])[0];
-          } while (prevCapZero !== cap[0]);
-
-          text = escape(cap[0]);
-
-          if (cap[1] === 'www.') {
-            href = 'http://' + text;
-          } else {
-            href = text;
-          }
-        }
-
-        return {
-          type: 'link',
-          raw: cap[0],
-          text: text,
-          href: href,
-          tokens: [{
-            type: 'text',
-            raw: text,
-            text: text
-          }]
-        };
-      }
-    };
-
-    _proto.inlineText = function inlineText(src, smartypants) {
-      var cap = this.rules.inline.text.exec(src);
-
-      if (cap) {
-        var text;
-
-        if (this.lexer.state.inRawBlock) {
-          text = this.options.sanitize ? this.options.sanitizer ? this.options.sanitizer(cap[0]) : escape(cap[0]) : cap[0];
-        } else {
-          text = escape(this.options.smartypants ? smartypants(cap[0]) : cap[0]);
-        }
-
-        return {
-          type: 'text',
-          raw: cap[0],
-          text: text
-        };
-      }
-    };
-
-    return Tokenizer;
-  }();
-
-  /**
-   * Block-Level Grammar
-   */
-
-  var block = {
-    newline: /^(?: *(?:\n|$))+/,
-    code: /^( {4}[^\n]+(?:\n(?: *(?:\n|$))*)?)+/,
-    fences: /^ {0,3}(`{3,}(?=[^`\n]*\n)|~{3,})([^\n]*)\n(?:|([\s\S]*?)\n)(?: {0,3}\1[~`]* *(?=\n|$)|$)/,
-    hr: /^ {0,3}((?:-[\t ]*){3,}|(?:_[ \t]*){3,}|(?:\*[ \t]*){3,})(?:\n+|$)/,
-    heading: /^ {0,3}(#{1,6})(?=\s|$)(.*)(?:\n+|$)/,
-    blockquote: /^( {0,3}> ?(paragraph|[^\n]*)(?:\n|$))+/,
-    list: /^( {0,3}bull)([ \t][^\n]+?)?(?:\n|$)/,
-    html: '^ {0,3}(?:' // optional indentation
-    + '<(script|pre|style|textarea)[\\s>][\\s\\S]*?(?:</\\1>[^\\n]*\\n+|$)' // (1)
-    + '|comment[^\\n]*(\\n+|$)' // (2)
-    + '|<\\?[\\s\\S]*?(?:\\?>\\n*|$)' // (3)
-    + '|<![A-Z][\\s\\S]*?(?:>\\n*|$)' // (4)
-    + '|<!\\[CDATA\\[[\\s\\S]*?(?:\\]\\]>\\n*|$)' // (5)
-    + '|</?(tag)(?: +|\\n|/?>)[\\s\\S]*?(?:(?:\\n *)+\\n|$)' // (6)
-    + '|<(?!script|pre|style|textarea)([a-z][\\w-]*)(?:attribute)*? */?>(?=[ \\t]*(?:\\n|$))[\\s\\S]*?(?:(?:\\n *)+\\n|$)' // (7) open tag
-    + '|</(?!script|pre|style|textarea)[a-z][\\w-]*\\s*>(?=[ \\t]*(?:\\n|$))[\\s\\S]*?(?:(?:\\n *)+\\n|$)' // (7) closing tag
-    + ')',
-    def: /^ {0,3}\[(label)\]: *(?:\n *)?<?([^\s>]+)>?(?:(?: +(?:\n *)?| *\n *)(title))? *(?:\n+|$)/,
-    table: noopTest,
-    lheading: /^([^\n]+)\n {0,3}(=+|-+) *(?:\n+|$)/,
-    // regex template, placeholders will be replaced according to different paragraph
-    // interruption rules of commonmark and the original markdown spec:
-    _paragraph: /^([^\n]+(?:\n(?!hr|heading|lheading|blockquote|fences|list|html|table| +\n)[^\n]+)*)/,
-    text: /^[^\n]+/
-  };
-  block._label = /(?!\s*\])(?:\\.|[^\[\]\\])+/;
-  block._title = /(?:"(?:\\"?|[^"\\])*"|'[^'\n]*(?:\n[^'\n]+)*\n?'|\([^()]*\))/;
-  block.def = edit(block.def).replace('label', block._label).replace('title', block._title).getRegex();
-  block.bullet = /(?:[*+-]|\d{1,9}[.)])/;
-  block.listItemStart = edit(/^( *)(bull) */).replace('bull', block.bullet).getRegex();
-  block.list = edit(block.list).replace(/bull/g, block.bullet).replace('hr', '\\n+(?=\\1?(?:(?:- *){3,}|(?:_ *){3,}|(?:\\* *){3,})(?:\\n+|$))').replace('def', '\\n+(?=' + block.def.source + ')').getRegex();
-  block._tag = 'address|article|aside|base|basefont|blockquote|body|caption' + '|center|col|colgroup|dd|details|dialog|dir|div|dl|dt|fieldset|figcaption' + '|figure|footer|form|frame|frameset|h[1-6]|head|header|hr|html|iframe' + '|legend|li|link|main|menu|menuitem|meta|nav|noframes|ol|optgroup|option' + '|p|param|section|source|summary|table|tbody|td|tfoot|th|thead|title|tr' + '|track|ul';
-  block._comment = /<!--(?!-?>)[\s\S]*?(?:-->|$)/;
-  block.html = edit(block.html, 'i').replace('comment', block._comment).replace('tag', block._tag).replace('attribute', / +[a-zA-Z:_][\w.:-]*(?: *= *"[^"\n]*"| *= *'[^'\n]*'| *= *[^\s"'=<>`]+)?/).getRegex();
-  block.paragraph = edit(block._paragraph).replace('hr', block.hr).replace('heading', ' {0,3}#{1,6} ').replace('|lheading', '') // setex headings don't interrupt commonmark paragraphs
-  .replace('|table', '').replace('blockquote', ' {0,3}>').replace('fences', ' {0,3}(?:`{3,}(?=[^`\\n]*\\n)|~{3,})[^\\n]*\\n').replace('list', ' {0,3}(?:[*+-]|1[.)]) ') // only lists starting from 1 can interrupt
-  .replace('html', '</?(?:tag)(?: +|\\n|/?>)|<(?:script|pre|style|textarea|!--)').replace('tag', block._tag) // pars can be interrupted by type (6) html blocks
-  .getRegex();
-  block.blockquote = edit(block.blockquote).replace('paragraph', block.paragraph).getRegex();
-  /**
-   * Normal Block Grammar
-   */
-
-  block.normal = merge({}, block);
-  /**
-   * GFM Block Grammar
-   */
-
-  block.gfm = merge({}, block.normal, {
-    table: '^ *([^\\n ].*\\|.*)\\n' // Header
-    + ' {0,3}(?:\\| *)?(:?-+:? *(?:\\| *:?-+:? *)*)(?:\\| *)?' // Align
-    + '(?:\\n((?:(?! *\\n|hr|heading|blockquote|code|fences|list|html).*(?:\\n|$))*)\\n*|$)' // Cells
-
-  });
-  block.gfm.table = edit(block.gfm.table).replace('hr', block.hr).replace('heading', ' {0,3}#{1,6} ').replace('blockquote', ' {0,3}>').replace('code', ' {4}[^\\n]').replace('fences', ' {0,3}(?:`{3,}(?=[^`\\n]*\\n)|~{3,})[^\\n]*\\n').replace('list', ' {0,3}(?:[*+-]|1[.)]) ') // only lists starting from 1 can interrupt
-  .replace('html', '</?(?:tag)(?: +|\\n|/?>)|<(?:script|pre|style|textarea|!--)').replace('tag', block._tag) // tables can be interrupted by type (6) html blocks
-  .getRegex();
-  block.gfm.paragraph = edit(block._paragraph).replace('hr', block.hr).replace('heading', ' {0,3}#{1,6} ').replace('|lheading', '') // setex headings don't interrupt commonmark paragraphs
-  .replace('table', block.gfm.table) // interrupt paragraphs with table
-  .replace('blockquote', ' {0,3}>').replace('fences', ' {0,3}(?:`{3,}(?=[^`\\n]*\\n)|~{3,})[^\\n]*\\n').replace('list', ' {0,3}(?:[*+-]|1[.)]) ') // only lists starting from 1 can interrupt
-  .replace('html', '</?(?:tag)(?: +|\\n|/?>)|<(?:script|pre|style|textarea|!--)').replace('tag', block._tag) // pars can be interrupted by type (6) html blocks
-  .getRegex();
-  /**
-   * Pedantic grammar (original John Gruber's loose markdown specification)
-   */
-
-  block.pedantic = merge({}, block.normal, {
-    html: edit('^ *(?:comment *(?:\\n|\\s*$)' + '|<(tag)[\\s\\S]+?</\\1> *(?:\\n{2,}|\\s*$)' // closed tag
-    + '|<tag(?:"[^"]*"|\'[^\']*\'|\\s[^\'"/>\\s]*)*?/?> *(?:\\n{2,}|\\s*$))').replace('comment', block._comment).replace(/tag/g, '(?!(?:' + 'a|em|strong|small|s|cite|q|dfn|abbr|data|time|code|var|samp|kbd|sub' + '|sup|i|b|u|mark|ruby|rt|rp|bdi|bdo|span|br|wbr|ins|del|img)' + '\\b)\\w+(?!:|[^\\w\\s@]*@)\\b').getRegex(),
-    def: /^ *\[([^\]]+)\]: *<?([^\s>]+)>?(?: +(["(][^\n]+[")]))? *(?:\n+|$)/,
-    heading: /^(#{1,6})(.*)(?:\n+|$)/,
-    fences: noopTest,
-    // fences not supported
-    paragraph: edit(block.normal._paragraph).replace('hr', block.hr).replace('heading', ' *#{1,6} *[^\n]').replace('lheading', block.lheading).replace('blockquote', ' {0,3}>').replace('|fences', '').replace('|list', '').replace('|html', '').getRegex()
-  });
-  /**
-   * Inline-Level Grammar
-   */
-
-  var inline = {
-    escape: /^\\([!"#$%&'()*+,\-./:;<=>?@\[\]\\^_`{|}~])/,
-    autolink: /^<(scheme:[^\s\x00-\x1f<>]*|email)>/,
-    url: noopTest,
-    tag: '^comment' + '|^</[a-zA-Z][\\w:-]*\\s*>' // self-closing tag
-    + '|^<[a-zA-Z][\\w-]*(?:attribute)*?\\s*/?>' // open tag
-    + '|^<\\?[\\s\\S]*?\\?>' // processing instruction, e.g. <?php ?>
-    + '|^<![a-zA-Z]+\\s[\\s\\S]*?>' // declaration, e.g. <!DOCTYPE html>
-    + '|^<!\\[CDATA\\[[\\s\\S]*?\\]\\]>',
-    // CDATA section
-    link: /^!?\[(label)\]\(\s*(href)(?:\s+(title))?\s*\)/,
-    reflink: /^!?\[(label)\]\[(ref)\]/,
-    nolink: /^!?\[(ref)\](?:\[\])?/,
-    reflinkSearch: 'reflink|nolink(?!\\()',
-    emStrong: {
-      lDelim: /^(?:\*+(?:([punct_])|[^\s*]))|^_+(?:([punct*])|([^\s_]))/,
-      //        (1) and (2) can only be a Right Delimiter. (3) and (4) can only be Left.  (5) and (6) can be either Left or Right.
-      //          () Skip orphan inside strong  () Consume to delim (1) #***                (2) a***#, a***                   (3) #***a, ***a                 (4) ***#              (5) #***#                 (6) a***a
-      rDelimAst: /^[^_*]*?\_\_[^_*]*?\*[^_*]*?(?=\_\_)|[^*]+(?=[^*])|[punct_](\*+)(?=[\s]|$)|[^punct*_\s](\*+)(?=[punct_\s]|$)|[punct_\s](\*+)(?=[^punct*_\s])|[\s](\*+)(?=[punct_])|[punct_](\*+)(?=[punct_])|[^punct*_\s](\*+)(?=[^punct*_\s])/,
-      rDelimUnd: /^[^_*]*?\*\*[^_*]*?\_[^_*]*?(?=\*\*)|[^_]+(?=[^_])|[punct*](\_+)(?=[\s]|$)|[^punct*_\s](\_+)(?=[punct*\s]|$)|[punct*\s](\_+)(?=[^punct*_\s])|[\s](\_+)(?=[punct*])|[punct*](\_+)(?=[punct*])/ // ^- Not allowed for _
-
-    },
-    code: /^(`+)([^`]|[^`][\s\S]*?[^`])\1(?!`)/,
-    br: /^( {2,}|\\)\n(?!\s*$)/,
-    del: noopTest,
-    text: /^(`+|[^`])(?:(?= {2,}\n)|[\s\S]*?(?:(?=[\\<!\[`*_]|\b_|$)|[^ ](?= {2,}\n)))/,
-    punctuation: /^([\spunctuation])/
-  }; // list of punctuation marks from CommonMark spec
-  // without * and _ to handle the different emphasis markers * and _
-
-  inline._punctuation = '!"#$%&\'()+\\-.,/:;<=>?@\\[\\]`^{|}~';
-  inline.punctuation = edit(inline.punctuation).replace(/punctuation/g, inline._punctuation).getRegex(); // sequences em should skip over [title](link), `code`, <html>
-
-  inline.blockSkip = /\[[^\]]*?\]\([^\)]*?\)|`[^`]*?`|<[^>]*?>/g;
-  inline.escapedEmSt = /\\\*|\\_/g;
-  inline._comment = edit(block._comment).replace('(?:-->|$)', '-->').getRegex();
-  inline.emStrong.lDelim = edit(inline.emStrong.lDelim).replace(/punct/g, inline._punctuation).getRegex();
-  inline.emStrong.rDelimAst = edit(inline.emStrong.rDelimAst, 'g').replace(/punct/g, inline._punctuation).getRegex();
-  inline.emStrong.rDelimUnd = edit(inline.emStrong.rDelimUnd, 'g').replace(/punct/g, inline._punctuation).getRegex();
-  inline._escapes = /\\([!"#$%&'()*+,\-./:;<=>?@\[\]\\^_`{|}~])/g;
-  inline._scheme = /[a-zA-Z][a-zA-Z0-9+.-]{1,31}/;
-  inline._email = /[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+(@)[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)+(?![-_])/;
-  inline.autolink = edit(inline.autolink).replace('scheme', inline._scheme).replace('email', inline._email).getRegex();
-  inline._attribute = /\s+[a-zA-Z:_][\w.:-]*(?:\s*=\s*"[^"]*"|\s*=\s*'[^']*'|\s*=\s*[^\s"'=<>`]+)?/;
-  inline.tag = edit(inline.tag).replace('comment', inline._comment).replace('attribute', inline._attribute).getRegex();
-  inline._label = /(?:\[(?:\\.|[^\[\]\\])*\]|\\.|`[^`]*`|[^\[\]\\`])*?/;
-  inline._href = /<(?:\\.|[^\n<>\\])+>|[^\s\x00-\x1f]*/;
-  inline._title = /"(?:\\"?|[^"\\])*"|'(?:\\'?|[^'\\])*'|\((?:\\\)?|[^)\\])*\)/;
-  inline.link = edit(inline.link).replace('label', inline._label).replace('href', inline._href).replace('title', inline._title).getRegex();
-  inline.reflink = edit(inline.reflink).replace('label', inline._label).replace('ref', block._label).getRegex();
-  inline.nolink = edit(inline.nolink).replace('ref', block._label).getRegex();
-  inline.reflinkSearch = edit(inline.reflinkSearch, 'g').replace('reflink', inline.reflink).replace('nolink', inline.nolink).getRegex();
-  /**
-   * Normal Inline Grammar
-   */
-
-  inline.normal = merge({}, inline);
-  /**
-   * Pedantic Inline Grammar
-   */
-
-  inline.pedantic = merge({}, inline.normal, {
-    strong: {
-      start: /^__|\*\*/,
-      middle: /^__(?=\S)([\s\S]*?\S)__(?!_)|^\*\*(?=\S)([\s\S]*?\S)\*\*(?!\*)/,
-      endAst: /\*\*(?!\*)/g,
-      endUnd: /__(?!_)/g
-    },
-    em: {
-      start: /^_|\*/,
-      middle: /^()\*(?=\S)([\s\S]*?\S)\*(?!\*)|^_(?=\S)([\s\S]*?\S)_(?!_)/,
-      endAst: /\*(?!\*)/g,
-      endUnd: /_(?!_)/g
-    },
-    link: edit(/^!?\[(label)\]\((.*?)\)/).replace('label', inline._label).getRegex(),
-    reflink: edit(/^!?\[(label)\]\s*\[([^\]]*)\]/).replace('label', inline._label).getRegex()
-  });
-  /**
-   * GFM Inline Grammar
-   */
-
-  inline.gfm = merge({}, inline.normal, {
-    escape: edit(inline.escape).replace('])', '~|])').getRegex(),
-    _extended_email: /[A-Za-z0-9._+-]+(@)[a-zA-Z0-9-_]+(?:\.[a-zA-Z0-9-_]*[a-zA-Z0-9])+(?![-_])/,
-    url: /^((?:ftp|https?):\/\/|www\.)(?:[a-zA-Z0-9\-]+\.?)+[^\s<]*|^email/,
-    _backpedal: /(?:[^?!.,:;*_~()&]+|\([^)]*\)|&(?![a-zA-Z0-9]+;$)|[?!.,:;*_~)]+(?!$))+/,
-    del: /^(~~?)(?=[^\s~])([\s\S]*?[^\s~])\1(?=[^~]|$)/,
-    text: /^([`~]+|[^`~])(?:(?= {2,}\n)|(?=[a-zA-Z0-9.!#$%&'*+\/=?_`{\|}~-]+@)|[\s\S]*?(?:(?=[\\<!\[`*~_]|\b_|https?:\/\/|ftp:\/\/|www\.|$)|[^ ](?= {2,}\n)|[^a-zA-Z0-9.!#$%&'*+\/=?_`{\|}~-](?=[a-zA-Z0-9.!#$%&'*+\/=?_`{\|}~-]+@)))/
-  });
-  inline.gfm.url = edit(inline.gfm.url, 'i').replace('email', inline.gfm._extended_email).getRegex();
-  /**
-   * GFM + Line Breaks Inline Grammar
-   */
-
-  inline.breaks = merge({}, inline.gfm, {
-    br: edit(inline.br).replace('{2,}', '*').getRegex(),
-    text: edit(inline.gfm.text).replace('\\b_', '\\b_| {2,}\\n').replace(/\{2,\}/g, '*').getRegex()
-  });
-
-  /**
-   * smartypants text replacement
-   * @param {string} text
-   */
-
-  function smartypants(text) {
-    return text // em-dashes
-    .replace(/---/g, "\u2014") // en-dashes
-    .replace(/--/g, "\u2013") // opening singles
-    .replace(/(^|[-\u2014/(\[{"\s])'/g, "$1\u2018") // closing singles & apostrophes
-    .replace(/'/g, "\u2019") // opening doubles
-    .replace(/(^|[-\u2014/(\[{\u2018\s])"/g, "$1\u201C") // closing doubles
-    .replace(/"/g, "\u201D") // ellipses
-    .replace(/\.{3}/g, "\u2026");
-  }
-  /**
-   * mangle email addresses
-   * @param {string} text
-   */
-
-
-  function mangle(text) {
-    var out = '',
-        i,
-        ch;
-    var l = text.length;
-
-    for (i = 0; i < l; i++) {
-      ch = text.charCodeAt(i);
-
-      if (Math.random() > 0.5) {
-        ch = 'x' + ch.toString(16);
-      }
-
-      out += '&#' + ch + ';';
-    }
-
-    return out;
-  }
-  /**
-   * Block Lexer
-   */
-
-
-  var Lexer = /*#__PURE__*/function () {
-    function Lexer(options) {
-      this.tokens = [];
-      this.tokens.links = Object.create(null);
-      this.options = options || exports.defaults;
-      this.options.tokenizer = this.options.tokenizer || new Tokenizer();
-      this.tokenizer = this.options.tokenizer;
-      this.tokenizer.options = this.options;
-      this.tokenizer.lexer = this;
-      this.inlineQueue = [];
-      this.state = {
-        inLink: false,
-        inRawBlock: false,
-        top: true
-      };
-      var rules = {
-        block: block.normal,
-        inline: inline.normal
-      };
-
-      if (this.options.pedantic) {
-        rules.block = block.pedantic;
-        rules.inline = inline.pedantic;
-      } else if (this.options.gfm) {
-        rules.block = block.gfm;
-
-        if (this.options.breaks) {
-          rules.inline = inline.breaks;
-        } else {
-          rules.inline = inline.gfm;
-        }
-      }
-
-      this.tokenizer.rules = rules;
-    }
-    /**
-     * Expose Rules
-     */
-
-
-    /**
-     * Static Lex Method
-     */
-    Lexer.lex = function lex(src, options) {
-      var lexer = new Lexer(options);
-      return lexer.lex(src);
-    }
-    /**
-     * Static Lex Inline Method
-     */
-    ;
-
-    Lexer.lexInline = function lexInline(src, options) {
-      var lexer = new Lexer(options);
-      return lexer.inlineTokens(src);
-    }
-    /**
-     * Preprocessing
-     */
-    ;
-
-    var _proto = Lexer.prototype;
-
-    _proto.lex = function lex(src) {
-      src = src.replace(/\r\n|\r/g, '\n');
-      this.blockTokens(src, this.tokens);
-      var next;
-
-      while (next = this.inlineQueue.shift()) {
-        this.inlineTokens(next.src, next.tokens);
-      }
-
-      return this.tokens;
-    }
-    /**
-     * Lexing
-     */
-    ;
-
-    _proto.blockTokens = function blockTokens(src, tokens) {
-      var _this = this;
-
-      if (tokens === void 0) {
-        tokens = [];
-      }
-
-      if (this.options.pedantic) {
-        src = src.replace(/\t/g, '    ').replace(/^ +$/gm, '');
-      } else {
-        src = src.replace(/^( *)(\t+)/gm, function (_, leading, tabs) {
-          return leading + '    '.repeat(tabs.length);
-        });
-      }
-
-      var token, lastToken, cutSrc, lastParagraphClipped;
-
-      while (src) {
-        if (this.options.extensions && this.options.extensions.block && this.options.extensions.block.some(function (extTokenizer) {
-          if (token = extTokenizer.call({
-            lexer: _this
-          }, src, tokens)) {
-            src = src.substring(token.raw.length);
-            tokens.push(token);
-            return true;
-          }
-
-          return false;
-        })) {
-          continue;
-        } // newline
-
-
-        if (token = this.tokenizer.space(src)) {
-          src = src.substring(token.raw.length);
-
-          if (token.raw.length === 1 && tokens.length > 0) {
-            // if there's a single \n as a spacer, it's terminating the last line,
-            // so move it there so that we don't get unecessary paragraph tags
-            tokens[tokens.length - 1].raw += '\n';
-          } else {
-            tokens.push(token);
-          }
-
-          continue;
-        } // code
-
-
-        if (token = this.tokenizer.code(src)) {
-          src = src.substring(token.raw.length);
-          lastToken = tokens[tokens.length - 1]; // An indented code block cannot interrupt a paragraph.
-
-          if (lastToken && (lastToken.type === 'paragraph' || lastToken.type === 'text')) {
-            lastToken.raw += '\n' + token.raw;
-            lastToken.text += '\n' + token.text;
-            this.inlineQueue[this.inlineQueue.length - 1].src = lastToken.text;
-          } else {
-            tokens.push(token);
-          }
-
-          continue;
-        } // fences
-
-
-        if (token = this.tokenizer.fences(src)) {
-          src = src.substring(token.raw.length);
-          tokens.push(token);
-          continue;
-        } // heading
-
-
-        if (token = this.tokenizer.heading(src)) {
-          src = src.substring(token.raw.length);
-          tokens.push(token);
-          continue;
-        } // hr
-
-
-        if (token = this.tokenizer.hr(src)) {
-          src = src.substring(token.raw.length);
-          tokens.push(token);
-          continue;
-        } // blockquote
-
-
-        if (token = this.tokenizer.blockquote(src)) {
-          src = src.substring(token.raw.length);
-          tokens.push(token);
-          continue;
-        } // list
-
-
-        if (token = this.tokenizer.list(src)) {
-          src = src.substring(token.raw.length);
-          tokens.push(token);
-          continue;
-        } // html
-
-
-        if (token = this.tokenizer.html(src)) {
-          src = src.substring(token.raw.length);
-          tokens.push(token);
-          continue;
-        } // def
-
-
-        if (token = this.tokenizer.def(src)) {
-          src = src.substring(token.raw.length);
-          lastToken = tokens[tokens.length - 1];
-
-          if (lastToken && (lastToken.type === 'paragraph' || lastToken.type === 'text')) {
-            lastToken.raw += '\n' + token.raw;
-            lastToken.text += '\n' + token.raw;
-            this.inlineQueue[this.inlineQueue.length - 1].src = lastToken.text;
-          } else if (!this.tokens.links[token.tag]) {
-            this.tokens.links[token.tag] = {
-              href: token.href,
-              title: token.title
-            };
-          }
-
-          continue;
-        } // table (gfm)
-
-
-        if (token = this.tokenizer.table(src)) {
-          src = src.substring(token.raw.length);
-          tokens.push(token);
-          continue;
-        } // lheading
-
-
-        if (token = this.tokenizer.lheading(src)) {
-          src = src.substring(token.raw.length);
-          tokens.push(token);
-          continue;
-        } // top-level paragraph
-        // prevent paragraph consuming extensions by clipping 'src' to extension start
-
-
-        cutSrc = src;
-
-        if (this.options.extensions && this.options.extensions.startBlock) {
-          (function () {
-            var startIndex = Infinity;
-            var tempSrc = src.slice(1);
-            var tempStart = void 0;
-
-            _this.options.extensions.startBlock.forEach(function (getStartIndex) {
-              tempStart = getStartIndex.call({
-                lexer: this
-              }, tempSrc);
-
-              if (typeof tempStart === 'number' && tempStart >= 0) {
-                startIndex = Math.min(startIndex, tempStart);
-              }
-            });
-
-            if (startIndex < Infinity && startIndex >= 0) {
-              cutSrc = src.substring(0, startIndex + 1);
-            }
-          })();
-        }
-
-        if (this.state.top && (token = this.tokenizer.paragraph(cutSrc))) {
-          lastToken = tokens[tokens.length - 1];
-
-          if (lastParagraphClipped && lastToken.type === 'paragraph') {
-            lastToken.raw += '\n' + token.raw;
-            lastToken.text += '\n' + token.text;
-            this.inlineQueue.pop();
-            this.inlineQueue[this.inlineQueue.length - 1].src = lastToken.text;
-          } else {
-            tokens.push(token);
-          }
-
-          lastParagraphClipped = cutSrc.length !== src.length;
-          src = src.substring(token.raw.length);
-          continue;
-        } // text
-
-
-        if (token = this.tokenizer.text(src)) {
-          src = src.substring(token.raw.length);
-          lastToken = tokens[tokens.length - 1];
-
-          if (lastToken && lastToken.type === 'text') {
-            lastToken.raw += '\n' + token.raw;
-            lastToken.text += '\n' + token.text;
-            this.inlineQueue.pop();
-            this.inlineQueue[this.inlineQueue.length - 1].src = lastToken.text;
-          } else {
-            tokens.push(token);
-          }
-
-          continue;
-        }
-
-        if (src) {
-          var errMsg = 'Infinite loop on byte: ' + src.charCodeAt(0);
-
-          if (this.options.silent) {
-            console.error(errMsg);
-            break;
-          } else {
-            throw new Error(errMsg);
-          }
-        }
-      }
-
-      this.state.top = true;
-      return tokens;
-    };
-
-    _proto.inline = function inline(src, tokens) {
-      if (tokens === void 0) {
-        tokens = [];
-      }
-
-      this.inlineQueue.push({
-        src: src,
-        tokens: tokens
-      });
-      return tokens;
-    }
-    /**
-     * Lexing/Compiling
-     */
-    ;
-
-    _proto.inlineTokens = function inlineTokens(src, tokens) {
-      var _this2 = this;
-
-      if (tokens === void 0) {
-        tokens = [];
-      }
-
-      var token, lastToken, cutSrc; // String with links masked to avoid interference with em and strong
-
-      var maskedSrc = src;
-      var match;
-      var keepPrevChar, prevChar; // Mask out reflinks
-
-      if (this.tokens.links) {
-        var links = Object.keys(this.tokens.links);
-
-        if (links.length > 0) {
-          while ((match = this.tokenizer.rules.inline.reflinkSearch.exec(maskedSrc)) != null) {
-            if (links.includes(match[0].slice(match[0].lastIndexOf('[') + 1, -1))) {
-              maskedSrc = maskedSrc.slice(0, match.index) + '[' + repeatString('a', match[0].length - 2) + ']' + maskedSrc.slice(this.tokenizer.rules.inline.reflinkSearch.lastIndex);
-            }
-          }
-        }
-      } // Mask out other blocks
-
-
-      while ((match = this.tokenizer.rules.inline.blockSkip.exec(maskedSrc)) != null) {
-        maskedSrc = maskedSrc.slice(0, match.index) + '[' + repeatString('a', match[0].length - 2) + ']' + maskedSrc.slice(this.tokenizer.rules.inline.blockSkip.lastIndex);
-      } // Mask out escaped em & strong delimiters
-
-
-      while ((match = this.tokenizer.rules.inline.escapedEmSt.exec(maskedSrc)) != null) {
-        maskedSrc = maskedSrc.slice(0, match.index) + '++' + maskedSrc.slice(this.tokenizer.rules.inline.escapedEmSt.lastIndex);
-      }
-
-      while (src) {
-        if (!keepPrevChar) {
-          prevChar = '';
-        }
-
-        keepPrevChar = false; // extensions
-
-        if (this.options.extensions && this.options.extensions.inline && this.options.extensions.inline.some(function (extTokenizer) {
-          if (token = extTokenizer.call({
-            lexer: _this2
-          }, src, tokens)) {
-            src = src.substring(token.raw.length);
-            tokens.push(token);
-            return true;
-          }
-
-          return false;
-        })) {
-          continue;
-        } // escape
-
-
-        if (token = this.tokenizer.escape(src)) {
-          src = src.substring(token.raw.length);
-          tokens.push(token);
-          continue;
-        } // tag
-
-
-        if (token = this.tokenizer.tag(src)) {
-          src = src.substring(token.raw.length);
-          lastToken = tokens[tokens.length - 1];
-
-          if (lastToken && token.type === 'text' && lastToken.type === 'text') {
-            lastToken.raw += token.raw;
-            lastToken.text += token.text;
-          } else {
-            tokens.push(token);
-          }
-
-          continue;
-        } // link
-
-
-        if (token = this.tokenizer.link(src)) {
-          src = src.substring(token.raw.length);
-          tokens.push(token);
-          continue;
-        } // reflink, nolink
-
-
-        if (token = this.tokenizer.reflink(src, this.tokens.links)) {
-          src = src.substring(token.raw.length);
-          lastToken = tokens[tokens.length - 1];
-
-          if (lastToken && token.type === 'text' && lastToken.type === 'text') {
-            lastToken.raw += token.raw;
-            lastToken.text += token.text;
-          } else {
-            tokens.push(token);
-          }
-
-          continue;
-        } // em & strong
-
-
-        if (token = this.tokenizer.emStrong(src, maskedSrc, prevChar)) {
-          src = src.substring(token.raw.length);
-          tokens.push(token);
-          continue;
-        } // code
-
-
-        if (token = this.tokenizer.codespan(src)) {
-          src = src.substring(token.raw.length);
-          tokens.push(token);
-          continue;
-        } // br
-
-
-        if (token = this.tokenizer.br(src)) {
-          src = src.substring(token.raw.length);
-          tokens.push(token);
-          continue;
-        } // del (gfm)
-
-
-        if (token = this.tokenizer.del(src)) {
-          src = src.substring(token.raw.length);
-          tokens.push(token);
-          continue;
-        } // autolink
-
-
-        if (token = this.tokenizer.autolink(src, mangle)) {
-          src = src.substring(token.raw.length);
-          tokens.push(token);
-          continue;
-        } // url (gfm)
-
-
-        if (!this.state.inLink && (token = this.tokenizer.url(src, mangle))) {
-          src = src.substring(token.raw.length);
-          tokens.push(token);
-          continue;
-        } // text
-        // prevent inlineText consuming extensions by clipping 'src' to extension start
-
-
-        cutSrc = src;
-
-        if (this.options.extensions && this.options.extensions.startInline) {
-          (function () {
-            var startIndex = Infinity;
-            var tempSrc = src.slice(1);
-            var tempStart = void 0;
-
-            _this2.options.extensions.startInline.forEach(function (getStartIndex) {
-              tempStart = getStartIndex.call({
-                lexer: this
-              }, tempSrc);
-
-              if (typeof tempStart === 'number' && tempStart >= 0) {
-                startIndex = Math.min(startIndex, tempStart);
-              }
-            });
-
-            if (startIndex < Infinity && startIndex >= 0) {
-              cutSrc = src.substring(0, startIndex + 1);
-            }
-          })();
-        }
-
-        if (token = this.tokenizer.inlineText(cutSrc, smartypants)) {
-          src = src.substring(token.raw.length);
-
-          if (token.raw.slice(-1) !== '_') {
-            // Track prevChar before string of ____ started
-            prevChar = token.raw.slice(-1);
-          }
-
-          keepPrevChar = true;
-          lastToken = tokens[tokens.length - 1];
-
-          if (lastToken && lastToken.type === 'text') {
-            lastToken.raw += token.raw;
-            lastToken.text += token.text;
-          } else {
-            tokens.push(token);
-          }
-
-          continue;
-        }
-
-        if (src) {
-          var errMsg = 'Infinite loop on byte: ' + src.charCodeAt(0);
-
-          if (this.options.silent) {
-            console.error(errMsg);
-            break;
-          } else {
-            throw new Error(errMsg);
-          }
-        }
-      }
-
-      return tokens;
-    };
-
-    _createClass(Lexer, null, [{
-      key: "rules",
-      get: function get() {
-        return {
-          block: block,
-          inline: inline
-        };
-      }
-    }]);
-
-    return Lexer;
-  }();
-
-  /**
-   * Renderer
-   */
-
-  var Renderer = /*#__PURE__*/function () {
-    function Renderer(options) {
-      this.options = options || exports.defaults;
-    }
-
-    var _proto = Renderer.prototype;
-
-    _proto.code = function code(_code, infostring, escaped) {
-      var lang = (infostring || '').match(/\S*/)[0];
-
-      if (this.options.highlight) {
-        var out = this.options.highlight(_code, lang);
-
-        if (out != null && out !== _code) {
-          escaped = true;
-          _code = out;
-        }
-      }
-
-      _code = _code.replace(/\n$/, '') + '\n';
-
-      if (!lang) {
-        return '<pre><code>' + (escaped ? _code : escape(_code, true)) + '</code></pre>\n';
-      }
-
-      return '<pre><code class="' + this.options.langPrefix + escape(lang, true) + '">' + (escaped ? _code : escape(_code, true)) + '</code></pre>\n';
-    }
-    /**
-     * @param {string} quote
-     */
-    ;
-
-    _proto.blockquote = function blockquote(quote) {
-      return "<blockquote>\n" + quote + "</blockquote>\n";
-    };
-
-    _proto.html = function html(_html) {
-      return _html;
-    }
-    /**
-     * @param {string} text
-     * @param {string} level
-     * @param {string} raw
-     * @param {any} slugger
-     */
-    ;
-
-    _proto.heading = function heading(text, level, raw, slugger) {
-      if (this.options.headerIds) {
-        var id = this.options.headerPrefix + slugger.slug(raw);
-        return "<h" + level + " id=\"" + id + "\">" + text + "</h" + level + ">\n";
-      } // ignore IDs
-
-
-      return "<h" + level + ">" + text + "</h" + level + ">\n";
-    };
-
-    _proto.hr = function hr() {
-      return this.options.xhtml ? '<hr/>\n' : '<hr>\n';
-    };
-
-    _proto.list = function list(body, ordered, start) {
-      var type = ordered ? 'ol' : 'ul',
-          startatt = ordered && start !== 1 ? ' start="' + start + '"' : '';
-      return '<' + type + startatt + '>\n' + body + '</' + type + '>\n';
-    }
-    /**
-     * @param {string} text
-     */
-    ;
-
-    _proto.listitem = function listitem(text) {
-      return "<li>" + text + "</li>\n";
-    };
-
-    _proto.checkbox = function checkbox(checked) {
-      return '<input ' + (checked ? 'checked="" ' : '') + 'disabled="" type="checkbox"' + (this.options.xhtml ? ' /' : '') + '> ';
-    }
-    /**
-     * @param {string} text
-     */
-    ;
-
-    _proto.paragraph = function paragraph(text) {
-      return "<p>" + text + "</p>\n";
-    }
-    /**
-     * @param {string} header
-     * @param {string} body
-     */
-    ;
-
-    _proto.table = function table(header, body) {
-      if (body) body = "<tbody>" + body + "</tbody>";
-      return '<table>\n' + '<thead>\n' + header + '</thead>\n' + body + '</table>\n';
-    }
-    /**
-     * @param {string} content
-     */
-    ;
-
-    _proto.tablerow = function tablerow(content) {
-      return "<tr>\n" + content + "</tr>\n";
-    };
-
-    _proto.tablecell = function tablecell(content, flags) {
-      var type = flags.header ? 'th' : 'td';
-      var tag = flags.align ? "<" + type + " align=\"" + flags.align + "\">" : "<" + type + ">";
-      return tag + content + ("</" + type + ">\n");
-    }
-    /**
-     * span level renderer
-     * @param {string} text
-     */
-    ;
-
-    _proto.strong = function strong(text) {
-      return "<strong>" + text + "</strong>";
-    }
-    /**
-     * @param {string} text
-     */
-    ;
-
-    _proto.em = function em(text) {
-      return "<em>" + text + "</em>";
-    }
-    /**
-     * @param {string} text
-     */
-    ;
-
-    _proto.codespan = function codespan(text) {
-      return "<code>" + text + "</code>";
-    };
-
-    _proto.br = function br() {
-      return this.options.xhtml ? '<br/>' : '<br>';
-    }
-    /**
-     * @param {string} text
-     */
-    ;
-
-    _proto.del = function del(text) {
-      return "<del>" + text + "</del>";
-    }
-    /**
-     * @param {string} href
-     * @param {string} title
-     * @param {string} text
-     */
-    ;
-
-    _proto.link = function link(href, title, text) {
-      href = cleanUrl(this.options.sanitize, this.options.baseUrl, href);
-
-      if (href === null) {
-        return text;
-      }
-
-      var out = '<a href="' + escape(href) + '"';
-
-      if (title) {
-        out += ' title="' + title + '"';
-      }
-
-      out += '>' + text + '</a>';
-      return out;
-    }
-    /**
-     * @param {string} href
-     * @param {string} title
-     * @param {string} text
-     */
-    ;
-
-    _proto.image = function image(href, title, text) {
-      href = cleanUrl(this.options.sanitize, this.options.baseUrl, href);
-
-      if (href === null) {
-        return text;
-      }
-
-      var out = "<img src=\"" + href + "\" alt=\"" + text + "\"";
-
-      if (title) {
-        out += " title=\"" + title + "\"";
-      }
-
-      out += this.options.xhtml ? '/>' : '>';
-      return out;
-    };
-
-    _proto.text = function text(_text) {
-      return _text;
-    };
-
-    return Renderer;
-  }();
-
-  /**
-   * TextRenderer
-   * returns only the textual part of the token
-   */
-  var TextRenderer = /*#__PURE__*/function () {
-    function TextRenderer() {}
-
-    var _proto = TextRenderer.prototype;
-
-    // no need for block level renderers
-    _proto.strong = function strong(text) {
-      return text;
-    };
-
-    _proto.em = function em(text) {
-      return text;
-    };
-
-    _proto.codespan = function codespan(text) {
-      return text;
-    };
-
-    _proto.del = function del(text) {
-      return text;
-    };
-
-    _proto.html = function html(text) {
-      return text;
-    };
-
-    _proto.text = function text(_text) {
-      return _text;
-    };
-
-    _proto.link = function link(href, title, text) {
-      return '' + text;
-    };
-
-    _proto.image = function image(href, title, text) {
-      return '' + text;
-    };
-
-    _proto.br = function br() {
-      return '';
-    };
-
-    return TextRenderer;
-  }();
-
-  /**
-   * Slugger generates header id
-   */
-  var Slugger = /*#__PURE__*/function () {
-    function Slugger() {
-      this.seen = {};
-    }
-    /**
-     * @param {string} value
-     */
-
-
-    var _proto = Slugger.prototype;
-
-    _proto.serialize = function serialize(value) {
-      return value.toLowerCase().trim() // remove html tags
-      .replace(/<[!\/a-z].*?>/ig, '') // remove unwanted chars
-      .replace(/[\u2000-\u206F\u2E00-\u2E7F\\'!"#$%&()*+,./:;<=>?@[\]^`{|}~]/g, '').replace(/\s/g, '-');
-    }
-    /**
-     * Finds the next safe (unique) slug to use
-     * @param {string} originalSlug
-     * @param {boolean} isDryRun
-     */
-    ;
-
-    _proto.getNextSafeSlug = function getNextSafeSlug(originalSlug, isDryRun) {
-      var slug = originalSlug;
-      var occurenceAccumulator = 0;
-
-      if (this.seen.hasOwnProperty(slug)) {
-        occurenceAccumulator = this.seen[originalSlug];
-
-        do {
-          occurenceAccumulator++;
-          slug = originalSlug + '-' + occurenceAccumulator;
-        } while (this.seen.hasOwnProperty(slug));
-      }
-
-      if (!isDryRun) {
-        this.seen[originalSlug] = occurenceAccumulator;
-        this.seen[slug] = 0;
-      }
-
-      return slug;
-    }
-    /**
-     * Convert string to unique id
-     * @param {object} [options]
-     * @param {boolean} [options.dryrun] Generates the next unique slug without
-     * updating the internal accumulator.
-     */
-    ;
-
-    _proto.slug = function slug(value, options) {
-      if (options === void 0) {
-        options = {};
-      }
-
-      var slug = this.serialize(value);
-      return this.getNextSafeSlug(slug, options.dryrun);
-    };
-
-    return Slugger;
-  }();
-
-  /**
-   * Parsing & Compiling
-   */
-
-  var Parser = /*#__PURE__*/function () {
-    function Parser(options) {
-      this.options = options || exports.defaults;
-      this.options.renderer = this.options.renderer || new Renderer();
-      this.renderer = this.options.renderer;
-      this.renderer.options = this.options;
-      this.textRenderer = new TextRenderer();
-      this.slugger = new Slugger();
-    }
-    /**
-     * Static Parse Method
-     */
-
-
-    Parser.parse = function parse(tokens, options) {
-      var parser = new Parser(options);
-      return parser.parse(tokens);
-    }
-    /**
-     * Static Parse Inline Method
-     */
-    ;
-
-    Parser.parseInline = function parseInline(tokens, options) {
-      var parser = new Parser(options);
-      return parser.parseInline(tokens);
-    }
-    /**
-     * Parse Loop
-     */
-    ;
-
-    var _proto = Parser.prototype;
-
-    _proto.parse = function parse(tokens, top) {
-      if (top === void 0) {
-        top = true;
-      }
-
-      var out = '',
-          i,
-          j,
-          k,
-          l2,
-          l3,
-          row,
-          cell,
-          header,
-          body,
-          token,
-          ordered,
-          start,
-          loose,
-          itemBody,
-          item,
-          checked,
-          task,
-          checkbox,
-          ret;
-      var l = tokens.length;
-
-      for (i = 0; i < l; i++) {
-        token = tokens[i]; // Run any renderer extensions
-
-        if (this.options.extensions && this.options.extensions.renderers && this.options.extensions.renderers[token.type]) {
-          ret = this.options.extensions.renderers[token.type].call({
-            parser: this
-          }, token);
-
-          if (ret !== false || !['space', 'hr', 'heading', 'code', 'table', 'blockquote', 'list', 'html', 'paragraph', 'text'].includes(token.type)) {
-            out += ret || '';
-            continue;
-          }
-        }
-
-        switch (token.type) {
-          case 'space':
-            {
-              continue;
-            }
-
-          case 'hr':
-            {
-              out += this.renderer.hr();
-              continue;
-            }
-
-          case 'heading':
-            {
-              out += this.renderer.heading(this.parseInline(token.tokens), token.depth, unescape(this.parseInline(token.tokens, this.textRenderer)), this.slugger);
-              continue;
-            }
-
-          case 'code':
-            {
-              out += this.renderer.code(token.text, token.lang, token.escaped);
-              continue;
-            }
-
-          case 'table':
-            {
-              header = ''; // header
-
-              cell = '';
-              l2 = token.header.length;
-
-              for (j = 0; j < l2; j++) {
-                cell += this.renderer.tablecell(this.parseInline(token.header[j].tokens), {
-                  header: true,
-                  align: token.align[j]
-                });
-              }
-
-              header += this.renderer.tablerow(cell);
-              body = '';
-              l2 = token.rows.length;
-
-              for (j = 0; j < l2; j++) {
-                row = token.rows[j];
-                cell = '';
-                l3 = row.length;
-
-                for (k = 0; k < l3; k++) {
-                  cell += this.renderer.tablecell(this.parseInline(row[k].tokens), {
-                    header: false,
-                    align: token.align[k]
-                  });
-                }
-
-                body += this.renderer.tablerow(cell);
-              }
-
-              out += this.renderer.table(header, body);
-              continue;
-            }
-
-          case 'blockquote':
-            {
-              body = this.parse(token.tokens);
-              out += this.renderer.blockquote(body);
-              continue;
-            }
-
-          case 'list':
-            {
-              ordered = token.ordered;
-              start = token.start;
-              loose = token.loose;
-              l2 = token.items.length;
-              body = '';
-
-              for (j = 0; j < l2; j++) {
-                item = token.items[j];
-                checked = item.checked;
-                task = item.task;
-                itemBody = '';
-
-                if (item.task) {
-                  checkbox = this.renderer.checkbox(checked);
-
-                  if (loose) {
-                    if (item.tokens.length > 0 && item.tokens[0].type === 'paragraph') {
-                      item.tokens[0].text = checkbox + ' ' + item.tokens[0].text;
-
-                      if (item.tokens[0].tokens && item.tokens[0].tokens.length > 0 && item.tokens[0].tokens[0].type === 'text') {
-                        item.tokens[0].tokens[0].text = checkbox + ' ' + item.tokens[0].tokens[0].text;
-                      }
-                    } else {
-                      item.tokens.unshift({
-                        type: 'text',
-                        text: checkbox
-                      });
-                    }
-                  } else {
-                    itemBody += checkbox;
-                  }
-                }
-
-                itemBody += this.parse(item.tokens, loose);
-                body += this.renderer.listitem(itemBody, task, checked);
-              }
-
-              out += this.renderer.list(body, ordered, start);
-              continue;
-            }
-
-          case 'html':
-            {
-              // TODO parse inline content if parameter markdown=1
-              out += this.renderer.html(token.text);
-              continue;
-            }
-
-          case 'paragraph':
-            {
-              out += this.renderer.paragraph(this.parseInline(token.tokens));
-              continue;
-            }
-
-          case 'text':
-            {
-              body = token.tokens ? this.parseInline(token.tokens) : token.text;
-
-              while (i + 1 < l && tokens[i + 1].type === 'text') {
-                token = tokens[++i];
-                body += '\n' + (token.tokens ? this.parseInline(token.tokens) : token.text);
-              }
-
-              out += top ? this.renderer.paragraph(body) : body;
-              continue;
-            }
-
-          default:
-            {
-              var errMsg = 'Token with "' + token.type + '" type was not found.';
-
-              if (this.options.silent) {
-                console.error(errMsg);
-                return;
-              } else {
-                throw new Error(errMsg);
-              }
-            }
-        }
-      }
-
-      return out;
-    }
-    /**
-     * Parse Inline Tokens
-     */
-    ;
-
-    _proto.parseInline = function parseInline(tokens, renderer) {
-      renderer = renderer || this.renderer;
-      var out = '',
-          i,
-          token,
-          ret;
-      var l = tokens.length;
-
-      for (i = 0; i < l; i++) {
-        token = tokens[i]; // Run any renderer extensions
-
-        if (this.options.extensions && this.options.extensions.renderers && this.options.extensions.renderers[token.type]) {
-          ret = this.options.extensions.renderers[token.type].call({
-            parser: this
-          }, token);
-
-          if (ret !== false || !['escape', 'html', 'link', 'image', 'strong', 'em', 'codespan', 'br', 'del', 'text'].includes(token.type)) {
-            out += ret || '';
-            continue;
-          }
-        }
-
-        switch (token.type) {
-          case 'escape':
-            {
-              out += renderer.text(token.text);
-              break;
-            }
-
-          case 'html':
-            {
-              out += renderer.html(token.text);
-              break;
-            }
-
-          case 'link':
-            {
-              out += renderer.link(token.href, token.title, this.parseInline(token.tokens, renderer));
-              break;
-            }
-
-          case 'image':
-            {
-              out += renderer.image(token.href, token.title, token.text);
-              break;
-            }
-
-          case 'strong':
-            {
-              out += renderer.strong(this.parseInline(token.tokens, renderer));
-              break;
-            }
-
-          case 'em':
-            {
-              out += renderer.em(this.parseInline(token.tokens, renderer));
-              break;
-            }
-
-          case 'codespan':
-            {
-              out += renderer.codespan(token.text);
-              break;
-            }
-
-          case 'br':
-            {
-              out += renderer.br();
-              break;
-            }
-
-          case 'del':
-            {
-              out += renderer.del(this.parseInline(token.tokens, renderer));
-              break;
-            }
-
-          case 'text':
-            {
-              out += renderer.text(token.text);
-              break;
-            }
-
-          default:
-            {
-              var errMsg = 'Token with "' + token.type + '" type was not found.';
-
-              if (this.options.silent) {
-                console.error(errMsg);
-                return;
-              } else {
-                throw new Error(errMsg);
-              }
-            }
-        }
-      }
-
-      return out;
-    };
-
-    return Parser;
-  }();
-
-  /**
-   * Marked
-   */
-
-  function marked(src, opt, callback) {
-    // throw error in case of non string input
-    if (typeof src === 'undefined' || src === null) {
-      throw new Error('marked(): input parameter is undefined or null');
-    }
-
-    if (typeof src !== 'string') {
-      throw new Error('marked(): input parameter is of type ' + Object.prototype.toString.call(src) + ', string expected');
-    }
-
-    if (typeof opt === 'function') {
-      callback = opt;
-      opt = null;
-    }
-
-    opt = merge({}, marked.defaults, opt || {});
-    checkSanitizeDeprecation(opt);
-
-    if (callback) {
-      var highlight = opt.highlight;
-      var tokens;
-
-      try {
-        tokens = Lexer.lex(src, opt);
-      } catch (e) {
-        return callback(e);
-      }
-
-      var done = function done(err) {
-        var out;
-
-        if (!err) {
-          try {
-            if (opt.walkTokens) {
-              marked.walkTokens(tokens, opt.walkTokens);
-            }
-
-            out = Parser.parse(tokens, opt);
-          } catch (e) {
-            err = e;
-          }
-        }
-
-        opt.highlight = highlight;
-        return err ? callback(err) : callback(null, out);
-      };
-
-      if (!highlight || highlight.length < 3) {
-        return done();
-      }
-
-      delete opt.highlight;
-      if (!tokens.length) return done();
-      var pending = 0;
-      marked.walkTokens(tokens, function (token) {
-        if (token.type === 'code') {
-          pending++;
-          setTimeout(function () {
-            highlight(token.text, token.lang, function (err, code) {
-              if (err) {
-                return done(err);
-              }
-
-              if (code != null && code !== token.text) {
-                token.text = code;
-                token.escaped = true;
-              }
-
-              pending--;
-
-              if (pending === 0) {
-                done();
-              }
-            });
-          }, 0);
-        }
-      });
-
-      if (pending === 0) {
-        done();
-      }
-
-      return;
-    }
-
-    function onError(e) {
-      e.message += '\nPlease report this to https://github.com/markedjs/marked.';
-
-      if (opt.silent) {
-        return '<p>An error occurred:</p><pre>' + escape(e.message + '', true) + '</pre>';
-      }
-
-      throw e;
-    }
-
-    try {
-      var _tokens = Lexer.lex(src, opt);
-
-      if (opt.walkTokens) {
-        if (opt.async) {
-          return Promise.all(marked.walkTokens(_tokens, opt.walkTokens)).then(function () {
-            return Parser.parse(_tokens, opt);
-          })["catch"](onError);
-        }
-
-        marked.walkTokens(_tokens, opt.walkTokens);
-      }
-
-      return Parser.parse(_tokens, opt);
-    } catch (e) {
-      onError(e);
-    }
-  }
-  /**
-   * Options
-   */
-
-  marked.options = marked.setOptions = function (opt) {
-    merge(marked.defaults, opt);
-    changeDefaults(marked.defaults);
-    return marked;
-  };
-
-  marked.getDefaults = getDefaults;
-  marked.defaults = exports.defaults;
-  /**
-   * Use Extension
-   */
-
-  marked.use = function () {
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
-
-    var opts = merge.apply(void 0, [{}].concat(args));
-    var extensions = marked.defaults.extensions || {
-      renderers: {},
-      childTokens: {}
-    };
-    var hasExtensions;
-    args.forEach(function (pack) {
-      // ==-- Parse "addon" extensions --== //
-      if (pack.extensions) {
-        hasExtensions = true;
-        pack.extensions.forEach(function (ext) {
-          if (!ext.name) {
-            throw new Error('extension name required');
-          }
-
-          if (ext.renderer) {
-            // Renderer extensions
-            var prevRenderer = extensions.renderers ? extensions.renderers[ext.name] : null;
-
-            if (prevRenderer) {
-              // Replace extension with func to run new extension but fall back if false
-              extensions.renderers[ext.name] = function () {
-                for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
-                  args[_key2] = arguments[_key2];
-                }
-
-                var ret = ext.renderer.apply(this, args);
-
-                if (ret === false) {
-                  ret = prevRenderer.apply(this, args);
-                }
-
-                return ret;
-              };
-            } else {
-              extensions.renderers[ext.name] = ext.renderer;
-            }
-          }
-
-          if (ext.tokenizer) {
-            // Tokenizer Extensions
-            if (!ext.level || ext.level !== 'block' && ext.level !== 'inline') {
-              throw new Error("extension level must be 'block' or 'inline'");
-            }
-
-            if (extensions[ext.level]) {
-              extensions[ext.level].unshift(ext.tokenizer);
-            } else {
-              extensions[ext.level] = [ext.tokenizer];
-            }
-
-            if (ext.start) {
-              // Function to check for start of token
-              if (ext.level === 'block') {
-                if (extensions.startBlock) {
-                  extensions.startBlock.push(ext.start);
-                } else {
-                  extensions.startBlock = [ext.start];
-                }
-              } else if (ext.level === 'inline') {
-                if (extensions.startInline) {
-                  extensions.startInline.push(ext.start);
-                } else {
-                  extensions.startInline = [ext.start];
-                }
-              }
-            }
-          }
-
-          if (ext.childTokens) {
-            // Child tokens to be visited by walkTokens
-            extensions.childTokens[ext.name] = ext.childTokens;
-          }
-        });
-      } // ==-- Parse "overwrite" extensions --== //
-
-
-      if (pack.renderer) {
-        (function () {
-          var renderer = marked.defaults.renderer || new Renderer();
-
-          var _loop = function _loop(prop) {
-            var prevRenderer = renderer[prop]; // Replace renderer with func to run extension, but fall back if false
-
-            renderer[prop] = function () {
-              for (var _len3 = arguments.length, args = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
-                args[_key3] = arguments[_key3];
-              }
-
-              var ret = pack.renderer[prop].apply(renderer, args);
-
-              if (ret === false) {
-                ret = prevRenderer.apply(renderer, args);
-              }
-
-              return ret;
-            };
-          };
-
-          for (var prop in pack.renderer) {
-            _loop(prop);
-          }
-
-          opts.renderer = renderer;
-        })();
-      }
-
-      if (pack.tokenizer) {
-        (function () {
-          var tokenizer = marked.defaults.tokenizer || new Tokenizer();
-
-          var _loop2 = function _loop2(prop) {
-            var prevTokenizer = tokenizer[prop]; // Replace tokenizer with func to run extension, but fall back if false
-
-            tokenizer[prop] = function () {
-              for (var _len4 = arguments.length, args = new Array(_len4), _key4 = 0; _key4 < _len4; _key4++) {
-                args[_key4] = arguments[_key4];
-              }
-
-              var ret = pack.tokenizer[prop].apply(tokenizer, args);
-
-              if (ret === false) {
-                ret = prevTokenizer.apply(tokenizer, args);
-              }
-
-              return ret;
-            };
-          };
-
-          for (var prop in pack.tokenizer) {
-            _loop2(prop);
-          }
-
-          opts.tokenizer = tokenizer;
-        })();
-      } // ==-- Parse WalkTokens extensions --== //
-
-
-      if (pack.walkTokens) {
-        var _walkTokens = marked.defaults.walkTokens;
-
-        opts.walkTokens = function (token) {
-          var values = [];
-          values.push(pack.walkTokens.call(this, token));
-
-          if (_walkTokens) {
-            values = values.concat(_walkTokens.call(this, token));
-          }
-
-          return values;
-        };
-      }
-
-      if (hasExtensions) {
-        opts.extensions = extensions;
-      }
-
-      marked.setOptions(opts);
-    });
-  };
-  /**
-   * Run callback for every token
-   */
-
-
-  marked.walkTokens = function (tokens, callback) {
-    var values = [];
-
-    var _loop3 = function _loop3() {
-      var token = _step.value;
-      values = values.concat(callback.call(marked, token));
-
-      switch (token.type) {
-        case 'table':
-          {
-            for (var _iterator2 = _createForOfIteratorHelperLoose(token.header), _step2; !(_step2 = _iterator2()).done;) {
-              var cell = _step2.value;
-              values = values.concat(marked.walkTokens(cell.tokens, callback));
-            }
-
-            for (var _iterator3 = _createForOfIteratorHelperLoose(token.rows), _step3; !(_step3 = _iterator3()).done;) {
-              var row = _step3.value;
-
-              for (var _iterator4 = _createForOfIteratorHelperLoose(row), _step4; !(_step4 = _iterator4()).done;) {
-                var _cell = _step4.value;
-                values = values.concat(marked.walkTokens(_cell.tokens, callback));
-              }
-            }
-
-            break;
-          }
-
-        case 'list':
-          {
-            values = values.concat(marked.walkTokens(token.items, callback));
-            break;
-          }
-
-        default:
-          {
-            if (marked.defaults.extensions && marked.defaults.extensions.childTokens && marked.defaults.extensions.childTokens[token.type]) {
-              // Walk any extensions
-              marked.defaults.extensions.childTokens[token.type].forEach(function (childTokens) {
-                values = values.concat(marked.walkTokens(token[childTokens], callback));
-              });
-            } else if (token.tokens) {
-              values = values.concat(marked.walkTokens(token.tokens, callback));
-            }
-          }
-      }
-    };
-
-    for (var _iterator = _createForOfIteratorHelperLoose(tokens), _step; !(_step = _iterator()).done;) {
-      _loop3();
-    }
-
-    return values;
-  };
-  /**
-   * Parse Inline
-   * @param {string} src
-   */
-
-
-  marked.parseInline = function (src, opt) {
-    // throw error in case of non string input
-    if (typeof src === 'undefined' || src === null) {
-      throw new Error('marked.parseInline(): input parameter is undefined or null');
-    }
-
-    if (typeof src !== 'string') {
-      throw new Error('marked.parseInline(): input parameter is of type ' + Object.prototype.toString.call(src) + ', string expected');
-    }
-
-    opt = merge({}, marked.defaults, opt || {});
-    checkSanitizeDeprecation(opt);
-
-    try {
-      var tokens = Lexer.lexInline(src, opt);
-
-      if (opt.walkTokens) {
-        marked.walkTokens(tokens, opt.walkTokens);
-      }
-
-      return Parser.parseInline(tokens, opt);
-    } catch (e) {
-      e.message += '\nPlease report this to https://github.com/markedjs/marked.';
-
-      if (opt.silent) {
-        return '<p>An error occurred:</p><pre>' + escape(e.message + '', true) + '</pre>';
-      }
-
-      throw e;
-    }
-  };
-  /**
-   * Expose
-   */
-
-
-  marked.Parser = Parser;
-  marked.parser = Parser.parse;
-  marked.Renderer = Renderer;
-  marked.TextRenderer = TextRenderer;
-  marked.Lexer = Lexer;
-  marked.lexer = Lexer.lex;
-  marked.Tokenizer = Tokenizer;
-  marked.Slugger = Slugger;
-  marked.parse = marked;
-  var options = marked.options;
-  var setOptions = marked.setOptions;
-  var use = marked.use;
-  var walkTokens = marked.walkTokens;
-  var parseInline = marked.parseInline;
-  var parse = marked;
-  var parser = Parser.parse;
-  var lexer = Lexer.lex;
-
-  exports.Lexer = Lexer;
-  exports.Parser = Parser;
-  exports.Renderer = Renderer;
-  exports.Slugger = Slugger;
-  exports.TextRenderer = TextRenderer;
-  exports.Tokenizer = Tokenizer;
-  exports.getDefaults = getDefaults;
-  exports.lexer = lexer;
-  exports.marked = marked;
-  exports.options = options;
-  exports.parse = parse;
-  exports.parseInline = parseInline;
-  exports.parser = parser;
-  exports.setOptions = setOptions;
-  exports.use = use;
-  exports.walkTokens = walkTokens;
-
-  Object.defineProperty(exports, '__esModule', { value: true });
-
+(function (global, factory) {
+	typeof define === 'function' && define.amd ? define(['exports'], factory) :
+	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
+	(global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.marked = {}));
+  })(this, (function (exports) {
+	'use strict';
+
+	/**
+	 * Gets the original marked default options.
+	 */
+	function _getDefaults() {
+		return {
+			async: false,
+			breaks: false,
+			extensions: null,
+			gfm: true,
+			hooks: null,
+			pedantic: false,
+			renderer: null,
+			silent: false,
+			tokenizer: null,
+			walkTokens: null,
+		};
+	}
+	exports.defaults = _getDefaults();
+	function changeDefaults(newDefaults) {
+		exports.defaults = newDefaults;
+	}
+
+	/**
+	 * Helpers
+	 */
+	const escapeTest = /[&<>"']/;
+	const escapeReplace = new RegExp(escapeTest.source, 'g');
+	const escapeTestNoEncode = /[<>"']|&(?!(#\d{1,7}|#[Xx][a-fA-F0-9]{1,6}|\w+);)/;
+	const escapeReplaceNoEncode = new RegExp(escapeTestNoEncode.source, 'g');
+	const escapeReplacements = {
+		'&': '&amp;',
+		'<': '&lt;',
+		'>': '&gt;',
+		'"': '&quot;',
+		"'": '&#39;',
+	};
+	const getEscapeReplacement = (ch) => escapeReplacements[ch];
+	function escape$1(html, encode) {
+		if (encode) {
+			if (escapeTest.test(html)) {
+				return html.replace(escapeReplace, getEscapeReplacement);
+			}
+		}
+		else {
+			if (escapeTestNoEncode.test(html)) {
+				return html.replace(escapeReplaceNoEncode, getEscapeReplacement);
+			}
+		}
+		return html;
+	}
+	const caret = /(^|[^\[])\^/g;
+	function edit(regex, opt) {
+		let source = typeof regex === 'string' ? regex : regex.source;
+		opt = opt || '';
+		const obj = {
+			replace: (name, val) => {
+				let valSource = typeof val === 'string' ? val : val.source;
+				valSource = valSource.replace(caret, '$1');
+				source = source.replace(name, valSource);
+				return obj;
+			},
+			getRegex: () => {
+				return new RegExp(source, opt);
+			},
+		};
+		return obj;
+	}
+	function cleanUrl(href) {
+		try {
+			href = encodeURI(href).replace(/%25/g, '%');
+		}
+		catch {
+			return null;
+		}
+		return href;
+	}
+	const noopTest = { exec: () => null };
+	function splitCells(tableRow, count) {
+		// ensure that every cell-delimiting pipe has a space
+		// before it to distinguish it from an escaped pipe
+		const row = tableRow.replace(/\|/g, (match, offset, str) => {
+			let escaped = false;
+			let curr = offset;
+			while (--curr >= 0 && str[curr] === '\\')
+				escaped = !escaped;
+			if (escaped) {
+				// odd number of slashes means | is escaped
+				// so we leave it alone
+				return '|';
+			}
+			else {
+				// add space before unescaped |
+				return ' |';
+			}
+		}), cells = row.split(/ \|/);
+		let i = 0;
+		// First/last cell in a row cannot be empty if it has no leading/trailing pipe
+		if (!cells[0].trim()) {
+			cells.shift();
+		}
+		if (cells.length > 0 && !cells[cells.length - 1].trim()) {
+			cells.pop();
+		}
+		if (count) {
+			if (cells.length > count) {
+				cells.splice(count);
+			}
+			else {
+				while (cells.length < count)
+					cells.push('');
+			}
+		}
+		for (; i < cells.length; i++) {
+			// leading or trailing whitespace is ignored per the gfm spec
+			cells[i] = cells[i].trim().replace(/\\\|/g, '|');
+		}
+		return cells;
+	}
+	/**
+	 * Remove trailing 'c's. Equivalent to str.replace(/c*$/, '').
+	 * /c*$/ is vulnerable to REDOS.
+	 *
+	 * @param str
+	 * @param c
+	 * @param invert Remove suffix of non-c chars instead. Default falsey.
+	 */
+	function rtrim(str, c, invert) {
+		const l = str.length;
+		if (l === 0) {
+			return '';
+		}
+		// Length of suffix matching the invert condition.
+		let suffLen = 0;
+		// Step left until we fail to match the invert condition.
+		while (suffLen < l) {
+			const currChar = str.charAt(l - suffLen - 1);
+			if (currChar === c && !invert) {
+				suffLen++;
+			}
+			else if (currChar !== c && invert) {
+				suffLen++;
+			}
+			else {
+				break;
+			}
+		}
+		return str.slice(0, l - suffLen);
+	}
+	function findClosingBracket(str, b) {
+		if (str.indexOf(b[1]) === -1) {
+			return -1;
+		}
+		let level = 0;
+		for (let i = 0; i < str.length; i++) {
+			if (str[i] === '\\') {
+				i++;
+			}
+			else if (str[i] === b[0]) {
+				level++;
+			}
+			else if (str[i] === b[1]) {
+				level--;
+				if (level < 0) {
+					return i;
+				}
+			}
+		}
+		return -1;
+	}
+
+	function outputLink(cap, link, raw, lexer) {
+		const href = link.href;
+		const title = link.title ? escape$1(link.title) : null;
+		const text = cap[1].replace(/\\([\[\]])/g, '$1');
+		if (cap[0].charAt(0) !== '!') {
+			lexer.state.inLink = true;
+			const token = {
+				type: 'link',
+				raw,
+				href,
+				title,
+				text,
+				tokens: lexer.inlineTokens(text),
+			};
+			lexer.state.inLink = false;
+			return token;
+		}
+		return {
+			type: 'image',
+			raw,
+			href,
+			title,
+			text: escape$1(text),
+		};
+	}
+	function indentCodeCompensation(raw, text) {
+		const matchIndentToCode = raw.match(/^(\s+)(?:```)/);
+		if (matchIndentToCode === null) {
+			return text;
+		}
+		const indentToCode = matchIndentToCode[1];
+		return text
+			.split('\n')
+			.map(node => {
+				const matchIndentInNode = node.match(/^\s+/);
+				if (matchIndentInNode === null) {
+					return node;
+				}
+				const [indentInNode] = matchIndentInNode;
+				if (indentInNode.length >= indentToCode.length) {
+					return node.slice(indentToCode.length);
+				}
+				return node;
+			})
+			.join('\n');
+	}
+	/**
+	 * Tokenizer
+	 */
+	class _Tokenizer {
+		options;
+		rules; // set by the lexer
+		lexer; // set by the lexer
+		constructor(options) {
+			this.options = options || exports.defaults;
+		}
+		space(src) {
+			const cap = this.rules.block.newline.exec(src);
+			if (cap && cap[0].length > 0) {
+				return {
+					type: 'space',
+					raw: cap[0],
+				};
+			}
+		}
+		code(src) {
+			const cap = this.rules.block.code.exec(src);
+			if (cap) {
+				const text = cap[0].replace(/^ {1,4}/gm, '');
+				return {
+					type: 'code',
+					raw: cap[0],
+					codeBlockStyle: 'indented',
+					text: !this.options.pedantic
+						? rtrim(text, '\n')
+						: text,
+				};
+			}
+		}
+		fences(src) {
+			const cap = this.rules.block.fences.exec(src);
+			if (cap) {
+				const raw = cap[0];
+				const text = indentCodeCompensation(raw, cap[3] || '');
+				return {
+					type: 'code',
+					raw,
+					lang: cap[2] ? cap[2].trim().replace(this.rules.inline.anyPunctuation, '$1') : cap[2],
+					text,
+				};
+			}
+		}
+		heading(src) {
+			const cap = this.rules.block.heading.exec(src);
+			if (cap) {
+				let text = cap[2].trim();
+				// remove trailing #s
+				if (/#$/.test(text)) {
+					const trimmed = rtrim(text, '#');
+					if (this.options.pedantic) {
+						text = trimmed.trim();
+					}
+					else if (!trimmed || / $/.test(trimmed)) {
+						// CommonMark requires space before trailing #s
+						text = trimmed.trim();
+					}
+				}
+				return {
+					type: 'heading',
+					raw: cap[0],
+					depth: cap[1].length,
+					text,
+					tokens: this.lexer.inline(text),
+				};
+			}
+		}
+		hr(src) {
+			const cap = this.rules.block.hr.exec(src);
+			if (cap) {
+				return {
+					type: 'hr',
+					raw: rtrim(cap[0], '\n'),
+				};
+			}
+		}
+		blockquote(src) {
+			const cap = this.rules.block.blockquote.exec(src);
+			if (cap) {
+				let lines = rtrim(cap[0], '\n').split('\n');
+				let raw = '';
+				let text = '';
+				const tokens = [];
+				while (lines.length > 0) {
+					let inBlockquote = false;
+					const currentLines = [];
+					let i;
+					for (i = 0; i < lines.length; i++) {
+						// get lines up to a continuation
+						if (/^ {0,3}>/.test(lines[i])) {
+							currentLines.push(lines[i]);
+							inBlockquote = true;
+						}
+						else if (!inBlockquote) {
+							currentLines.push(lines[i]);
+						}
+						else {
+							break;
+						}
+					}
+					lines = lines.slice(i);
+					const currentRaw = currentLines.join('\n');
+					const currentText = currentRaw
+						// precede setext continuation with 4 spaces so it isn't a setext
+						.replace(/\n {0,3}((?:=+|-+) *)(?=\n|$)/g, '\n    $1')
+						.replace(/^ {0,3}>[ \t]?/gm, '');
+					raw = raw ? `${raw}\n${currentRaw}` : currentRaw;
+					text = text ? `${text}\n${currentText}` : currentText;
+					// parse blockquote lines as top level tokens
+					// merge paragraphs if this is a continuation
+					const top = this.lexer.state.top;
+					this.lexer.state.top = true;
+					this.lexer.blockTokens(currentText, tokens, true);
+					this.lexer.state.top = top;
+					// if there is no continuation then we are done
+					if (lines.length === 0) {
+						break;
+					}
+					const lastToken = tokens[tokens.length - 1];
+					if (lastToken?.type === 'code') {
+						// blockquote continuation cannot be preceded by a code block
+						break;
+					}
+					else if (lastToken?.type === 'blockquote') {
+						// include continuation in nested blockquote
+						const oldToken = lastToken;
+						const newText = oldToken.raw + '\n' + lines.join('\n');
+						const newToken = this.blockquote(newText);
+						tokens[tokens.length - 1] = newToken;
+						raw = raw.substring(0, raw.length - oldToken.raw.length) + newToken.raw;
+						text = text.substring(0, text.length - oldToken.text.length) + newToken.text;
+						break;
+					}
+					else if (lastToken?.type === 'list') {
+						// include continuation in nested list
+						const oldToken = lastToken;
+						const newText = oldToken.raw + '\n' + lines.join('\n');
+						const newToken = this.list(newText);
+						tokens[tokens.length - 1] = newToken;
+						raw = raw.substring(0, raw.length - lastToken.raw.length) + newToken.raw;
+						text = text.substring(0, text.length - oldToken.raw.length) + newToken.raw;
+						lines = newText.substring(tokens[tokens.length - 1].raw.length).split('\n');
+						continue;
+					}
+				}
+				return {
+					type: 'blockquote',
+					raw,
+					tokens,
+					text,
+				};
+			}
+		}
+		list(src) {
+			let cap = this.rules.block.list.exec(src);
+			if (cap) {
+				let bull = cap[1].trim();
+				const isordered = bull.length > 1;
+				const list = {
+					type: 'list',
+					raw: '',
+					ordered: isordered,
+					start: isordered ? +bull.slice(0, -1) : '',
+					loose: false,
+					items: [],
+				};
+				bull = isordered ? `\\d{1,9}\\${bull.slice(-1)}` : `\\${bull}`;
+				if (this.options.pedantic) {
+					bull = isordered ? bull : '[*+-]';
+				}
+				// Get next list item
+				const itemRegex = new RegExp(`^( {0,3}${bull})((?:[\t ][^\\n]*)?(?:\\n|$))`);
+				let endsWithBlankLine = false;
+				// Check if current bullet point can start a new List Item
+				while (src) {
+					let endEarly = false;
+					let raw = '';
+					let itemContents = '';
+					if (!(cap = itemRegex.exec(src))) {
+						break;
+					}
+					if (this.rules.block.hr.test(src)) { // End list if bullet was actually HR (possibly move into itemRegex?)
+						break;
+					}
+					raw = cap[0];
+					src = src.substring(raw.length);
+					let line = cap[2].split('\n', 1)[0].replace(/^\t+/, (t) => ' '.repeat(3 * t.length));
+					let nextLine = src.split('\n', 1)[0];
+					let blankLine = !line.trim();
+					let indent = 0;
+					if (this.options.pedantic) {
+						indent = 2;
+						itemContents = line.trimStart();
+					}
+					else if (blankLine) {
+						indent = cap[1].length + 1;
+					}
+					else {
+						indent = cap[2].search(/[^ ]/); // Find first non-space char
+						indent = indent > 4 ? 1 : indent; // Treat indented code blocks (> 4 spaces) as having only 1 indent
+						itemContents = line.slice(indent);
+						indent += cap[1].length;
+					}
+					if (blankLine && /^ *$/.test(nextLine)) { // Items begin with at most one blank line
+						raw += nextLine + '\n';
+						src = src.substring(nextLine.length + 1);
+						endEarly = true;
+					}
+					if (!endEarly) {
+						const nextBulletRegex = new RegExp(`^ {0,${Math.min(3, indent - 1)}}(?:[*+-]|\\d{1,9}[.)])((?:[ \t][^\\n]*)?(?:\\n|$))`);
+						const hrRegex = new RegExp(`^ {0,${Math.min(3, indent - 1)}}((?:- *){3,}|(?:_ *){3,}|(?:\\* *){3,})(?:\\n+|$)`);
+						const fencesBeginRegex = new RegExp(`^ {0,${Math.min(3, indent - 1)}}(?:\`\`\`|~~~)`);
+						const headingBeginRegex = new RegExp(`^ {0,${Math.min(3, indent - 1)}}#`);
+						// Check if following lines should be included in List Item
+						while (src) {
+							const rawLine = src.split('\n', 1)[0];
+							nextLine = rawLine;
+							// Re-align to follow commonmark nesting rules
+							if (this.options.pedantic) {
+								nextLine = nextLine.replace(/^ {1,4}(?=( {4})*[^ ])/g, '  ');
+							}
+							// End list item if found code fences
+							if (fencesBeginRegex.test(nextLine)) {
+								break;
+							}
+							// End list item if found start of new heading
+							if (headingBeginRegex.test(nextLine)) {
+								break;
+							}
+							// End list item if found start of new bullet
+							if (nextBulletRegex.test(nextLine)) {
+								break;
+							}
+							// Horizontal rule found
+							if (hrRegex.test(src)) {
+								break;
+							}
+							if (nextLine.search(/[^ ]/) >= indent || !nextLine.trim()) { // Dedent if possible
+								itemContents += '\n' + nextLine.slice(indent);
+							}
+							else {
+								// not enough indentation
+								if (blankLine) {
+									break;
+								}
+								// paragraph continuation unless last line was a different block level element
+								if (line.search(/[^ ]/) >= 4) { // indented code block
+									break;
+								}
+								if (fencesBeginRegex.test(line)) {
+									break;
+								}
+								if (headingBeginRegex.test(line)) {
+									break;
+								}
+								if (hrRegex.test(line)) {
+									break;
+								}
+								itemContents += '\n' + nextLine;
+							}
+							if (!blankLine && !nextLine.trim()) { // Check if current line is blank
+								blankLine = true;
+							}
+							raw += rawLine + '\n';
+							src = src.substring(rawLine.length + 1);
+							line = nextLine.slice(indent);
+						}
+					}
+					if (!list.loose) {
+						// If the previous item ended with a blank line, the list is loose
+						if (endsWithBlankLine) {
+							list.loose = true;
+						}
+						else if (/\n *\n *$/.test(raw)) {
+							endsWithBlankLine = true;
+						}
+					}
+					let istask = null;
+					let ischecked;
+					// Check for task list items
+					if (this.options.gfm) {
+						istask = /^\[[ xX]\] /.exec(itemContents);
+						if (istask) {
+							ischecked = istask[0] !== '[ ] ';
+							itemContents = itemContents.replace(/^\[[ xX]\] +/, '');
+						}
+					}
+					list.items.push({
+						type: 'list_item',
+						raw,
+						task: !!istask,
+						checked: ischecked,
+						loose: false,
+						text: itemContents,
+						tokens: [],
+					});
+					list.raw += raw;
+				}
+				// Do not consume newlines at end of final item. Alternatively, make itemRegex *start* with any newlines to simplify/speed up endsWithBlankLine logic
+				list.items[list.items.length - 1].raw = list.items[list.items.length - 1].raw.trimEnd();
+				list.items[list.items.length - 1].text = list.items[list.items.length - 1].text.trimEnd();
+				list.raw = list.raw.trimEnd();
+				// Item child tokens handled here at end because we needed to have the final item to trim it first
+				for (let i = 0; i < list.items.length; i++) {
+					this.lexer.state.top = false;
+					list.items[i].tokens = this.lexer.blockTokens(list.items[i].text, []);
+					if (!list.loose) {
+						// Check if list should be loose
+						const spacers = list.items[i].tokens.filter(t => t.type === 'space');
+						const hasMultipleLineBreaks = spacers.length > 0 && spacers.some(t => /\n.*\n/.test(t.raw));
+						list.loose = hasMultipleLineBreaks;
+					}
+				}
+				// Set all items to loose if list is loose
+				if (list.loose) {
+					for (let i = 0; i < list.items.length; i++) {
+						list.items[i].loose = true;
+					}
+				}
+				return list;
+			}
+		}
+		html(src) {
+			const cap = this.rules.block.html.exec(src);
+			if (cap) {
+				const token = {
+					type: 'html',
+					block: true,
+					raw: cap[0],
+					pre: cap[1] === 'pre' || cap[1] === 'script' || cap[1] === 'style',
+					text: cap[0],
+				};
+				return token;
+			}
+		}
+		def(src) {
+			const cap = this.rules.block.def.exec(src);
+			if (cap) {
+				const tag = cap[1].toLowerCase().replace(/\s+/g, ' ');
+				const href = cap[2] ? cap[2].replace(/^<(.*)>$/, '$1').replace(this.rules.inline.anyPunctuation, '$1') : '';
+				const title = cap[3] ? cap[3].substring(1, cap[3].length - 1).replace(this.rules.inline.anyPunctuation, '$1') : cap[3];
+				return {
+					type: 'def',
+					tag,
+					raw: cap[0],
+					href,
+					title,
+				};
+			}
+		}
+		table(src) {
+			const cap = this.rules.block.table.exec(src);
+			if (!cap) {
+				return;
+			}
+			if (!/[:|]/.test(cap[2])) {
+				// delimiter row must have a pipe (|) or colon (:) otherwise it is a setext heading
+				return;
+			}
+			const headers = splitCells(cap[1]);
+			const aligns = cap[2].replace(/^\||\| *$/g, '').split('|');
+			const rows = cap[3] && cap[3].trim() ? cap[3].replace(/\n[ \t]*$/, '').split('\n') : [];
+			const item = {
+				type: 'table',
+				raw: cap[0],
+				header: [],
+				align: [],
+				rows: [],
+			};
+			if (headers.length !== aligns.length) {
+				// header and align columns must be equal, rows can be different.
+				return;
+			}
+			for (const align of aligns) {
+				if (/^ *-+: *$/.test(align)) {
+					item.align.push('right');
+				}
+				else if (/^ *:-+: *$/.test(align)) {
+					item.align.push('center');
+				}
+				else if (/^ *:-+ *$/.test(align)) {
+					item.align.push('left');
+				}
+				else {
+					item.align.push(null);
+				}
+			}
+			for (let i = 0; i < headers.length; i++) {
+				item.header.push({
+					text: headers[i],
+					tokens: this.lexer.inline(headers[i]),
+					header: true,
+					align: item.align[i],
+				});
+			}
+			for (const row of rows) {
+				item.rows.push(splitCells(row, item.header.length).map((cell, i) => {
+					return {
+						text: cell,
+						tokens: this.lexer.inline(cell),
+						header: false,
+						align: item.align[i],
+					};
+				}));
+			}
+			return item;
+		}
+		lheading(src) {
+			const cap = this.rules.block.lheading.exec(src);
+			if (cap) {
+				return {
+					type: 'heading',
+					raw: cap[0],
+					depth: cap[2].charAt(0) === '=' ? 1 : 2,
+					text: cap[1],
+					tokens: this.lexer.inline(cap[1]),
+				};
+			}
+		}
+		paragraph(src) {
+			const cap = this.rules.block.paragraph.exec(src);
+			if (cap) {
+				const text = cap[1].charAt(cap[1].length - 1) === '\n'
+					? cap[1].slice(0, -1)
+					: cap[1];
+				return {
+					type: 'paragraph',
+					raw: cap[0],
+					text,
+					tokens: this.lexer.inline(text),
+				};
+			}
+		}
+		text(src) {
+			const cap = this.rules.block.text.exec(src);
+			if (cap) {
+				return {
+					type: 'text',
+					raw: cap[0],
+					text: cap[0],
+					tokens: this.lexer.inline(cap[0]),
+				};
+			}
+		}
+		escape(src) {
+			const cap = this.rules.inline.escape.exec(src);
+			if (cap) {
+				return {
+					type: 'escape',
+					raw: cap[0],
+					text: escape$1(cap[1]),
+				};
+			}
+		}
+		tag(src) {
+			const cap = this.rules.inline.tag.exec(src);
+			if (cap) {
+				if (!this.lexer.state.inLink && /^<a /i.test(cap[0])) {
+					this.lexer.state.inLink = true;
+				}
+				else if (this.lexer.state.inLink && /^<\/a>/i.test(cap[0])) {
+					this.lexer.state.inLink = false;
+				}
+				if (!this.lexer.state.inRawBlock && /^<(pre|code|kbd|script)(\s|>)/i.test(cap[0])) {
+					this.lexer.state.inRawBlock = true;
+				}
+				else if (this.lexer.state.inRawBlock && /^<\/(pre|code|kbd|script)(\s|>)/i.test(cap[0])) {
+					this.lexer.state.inRawBlock = false;
+				}
+				return {
+					type: 'html',
+					raw: cap[0],
+					inLink: this.lexer.state.inLink,
+					inRawBlock: this.lexer.state.inRawBlock,
+					block: false,
+					text: cap[0],
+				};
+			}
+		}
+		link(src) {
+			const cap = this.rules.inline.link.exec(src);
+			if (cap) {
+				const trimmedUrl = cap[2].trim();
+				if (!this.options.pedantic && /^</.test(trimmedUrl)) {
+					// commonmark requires matching angle brackets
+					if (!(/>$/.test(trimmedUrl))) {
+						return;
+					}
+					// ending angle bracket cannot be escaped
+					const rtrimSlash = rtrim(trimmedUrl.slice(0, -1), '\\');
+					if ((trimmedUrl.length - rtrimSlash.length) % 2 === 0) {
+						return;
+					}
+				}
+				else {
+					// find closing parenthesis
+					const lastParenIndex = findClosingBracket(cap[2], '()');
+					if (lastParenIndex > -1) {
+						const start = cap[0].indexOf('!') === 0 ? 5 : 4;
+						const linkLen = start + cap[1].length + lastParenIndex;
+						cap[2] = cap[2].substring(0, lastParenIndex);
+						cap[0] = cap[0].substring(0, linkLen).trim();
+						cap[3] = '';
+					}
+				}
+				let href = cap[2];
+				let title = '';
+				if (this.options.pedantic) {
+					// split pedantic href and title
+					const link = /^([^'"]*[^\s])\s+(['"])(.*)\2/.exec(href);
+					if (link) {
+						href = link[1];
+						title = link[3];
+					}
+				}
+				else {
+					title = cap[3] ? cap[3].slice(1, -1) : '';
+				}
+				href = href.trim();
+				if (/^</.test(href)) {
+					if (this.options.pedantic && !(/>$/.test(trimmedUrl))) {
+						// pedantic allows starting angle bracket without ending angle bracket
+						href = href.slice(1);
+					}
+					else {
+						href = href.slice(1, -1);
+					}
+				}
+				return outputLink(cap, {
+					href: href ? href.replace(this.rules.inline.anyPunctuation, '$1') : href,
+					title: title ? title.replace(this.rules.inline.anyPunctuation, '$1') : title,
+				}, cap[0], this.lexer);
+			}
+		}
+		reflink(src, links) {
+			let cap;
+			if ((cap = this.rules.inline.reflink.exec(src))
+				|| (cap = this.rules.inline.nolink.exec(src))) {
+				const linkString = (cap[2] || cap[1]).replace(/\s+/g, ' ');
+				const link = links[linkString.toLowerCase()];
+				if (!link) {
+					const text = cap[0].charAt(0);
+					return {
+						type: 'text',
+						raw: text,
+						text,
+					};
+				}
+				return outputLink(cap, link, cap[0], this.lexer);
+			}
+		}
+		emStrong(src, maskedSrc, prevChar = '') {
+			let match = this.rules.inline.emStrongLDelim.exec(src);
+			if (!match)
+				return;
+			// _ can't be between two alphanumerics. \p{L}\p{N} includes non-english alphabet/numbers as well
+			if (match[3] && prevChar.match(/[\p{L}\p{N}]/u))
+				return;
+			const nextChar = match[1] || match[2] || '';
+			if (!nextChar || !prevChar || this.rules.inline.punctuation.exec(prevChar)) {
+				// unicode Regex counts emoji as 1 char; spread into array for proper count (used multiple times below)
+				const lLength = [...match[0]].length - 1;
+				let rDelim, rLength, delimTotal = lLength, midDelimTotal = 0;
+				const endReg = match[0][0] === '*' ? this.rules.inline.emStrongRDelimAst : this.rules.inline.emStrongRDelimUnd;
+				endReg.lastIndex = 0;
+				// Clip maskedSrc to same section of string as src (move to lexer?)
+				maskedSrc = maskedSrc.slice(-1 * src.length + lLength);
+				while ((match = endReg.exec(maskedSrc)) != null) {
+					rDelim = match[1] || match[2] || match[3] || match[4] || match[5] || match[6];
+					if (!rDelim)
+						continue; // skip single * in __abc*abc__
+					rLength = [...rDelim].length;
+					if (match[3] || match[4]) { // found another Left Delim
+						delimTotal += rLength;
+						continue;
+					}
+					else if (match[5] || match[6]) { // either Left or Right Delim
+						if (lLength % 3 && !((lLength + rLength) % 3)) {
+							midDelimTotal += rLength;
+							continue; // CommonMark Emphasis Rules 9-10
+						}
+					}
+					delimTotal -= rLength;
+					if (delimTotal > 0)
+						continue; // Haven't found enough closing delimiters
+					// Remove extra characters. *a*** -> *a*
+					rLength = Math.min(rLength, rLength + delimTotal + midDelimTotal);
+					// char length can be >1 for unicode characters;
+					const lastCharLength = [...match[0]][0].length;
+					const raw = src.slice(0, lLength + match.index + lastCharLength + rLength);
+					// Create `em` if smallest delimiter has odd char count. *a***
+					if (Math.min(lLength, rLength) % 2) {
+						const text = raw.slice(1, -1);
+						return {
+							type: 'em',
+							raw,
+							text,
+							tokens: this.lexer.inlineTokens(text),
+						};
+					}
+					// Create 'strong' if smallest delimiter has even char count. **a***
+					const text = raw.slice(2, -2);
+					return {
+						type: 'strong',
+						raw,
+						text,
+						tokens: this.lexer.inlineTokens(text),
+					};
+				}
+			}
+		}
+		codespan(src) {
+			const cap = this.rules.inline.code.exec(src);
+			if (cap) {
+				let text = cap[2].replace(/\n/g, ' ');
+				const hasNonSpaceChars = /[^ ]/.test(text);
+				const hasSpaceCharsOnBothEnds = /^ /.test(text) && / $/.test(text);
+				if (hasNonSpaceChars && hasSpaceCharsOnBothEnds) {
+					text = text.substring(1, text.length - 1);
+				}
+				text = escape$1(text, true);
+				return {
+					type: 'codespan',
+					raw: cap[0],
+					text,
+				};
+			}
+		}
+		br(src) {
+			const cap = this.rules.inline.br.exec(src);
+			if (cap) {
+				return {
+					type: 'br',
+					raw: cap[0],
+				};
+			}
+		}
+		del(src) {
+			const cap = this.rules.inline.del.exec(src);
+			if (cap) {
+				return {
+					type: 'del',
+					raw: cap[0],
+					text: cap[2],
+					tokens: this.lexer.inlineTokens(cap[2]),
+				};
+			}
+		}
+		autolink(src) {
+			const cap = this.rules.inline.autolink.exec(src);
+			if (cap) {
+				let text, href;
+				if (cap[2] === '@') {
+					text = escape$1(cap[1]);
+					href = 'mailto:' + text;
+				}
+				else {
+					text = escape$1(cap[1]);
+					href = text;
+				}
+				return {
+					type: 'link',
+					raw: cap[0],
+					text,
+					href,
+					tokens: [
+						{
+							type: 'text',
+							raw: text,
+							text,
+						},
+					],
+				};
+			}
+		}
+		url(src) {
+			let cap;
+			if (cap = this.rules.inline.url.exec(src)) {
+				let text, href;
+				if (cap[2] === '@') {
+					text = escape$1(cap[0]);
+					href = 'mailto:' + text;
+				}
+				else {
+					// do extended autolink path validation
+					let prevCapZero;
+					do {
+						prevCapZero = cap[0];
+						cap[0] = this.rules.inline._backpedal.exec(cap[0])?.[0] ?? '';
+					} while (prevCapZero !== cap[0]);
+					text = escape$1(cap[0]);
+					if (cap[1] === 'www.') {
+						href = 'http://' + cap[0];
+					}
+					else {
+						href = cap[0];
+					}
+				}
+				return {
+					type: 'link',
+					raw: cap[0],
+					text,
+					href,
+					tokens: [
+						{
+							type: 'text',
+							raw: text,
+							text,
+						},
+					],
+				};
+			}
+		}
+		inlineText(src) {
+			const cap = this.rules.inline.text.exec(src);
+			if (cap) {
+				let text;
+				if (this.lexer.state.inRawBlock) {
+					text = cap[0];
+				}
+				else {
+					text = escape$1(cap[0]);
+				}
+				return {
+					type: 'text',
+					raw: cap[0],
+					text,
+				};
+			}
+		}
+	}
+
+	/**
+	 * Block-Level Grammar
+	 */
+	const newline = /^(?: *(?:\n|$))+/;
+	const blockCode = /^( {4}[^\n]+(?:\n(?: *(?:\n|$))*)?)+/;
+	const fences = /^ {0,3}(`{3,}(?=[^`\n]*(?:\n|$))|~{3,})([^\n]*)(?:\n|$)(?:|([\s\S]*?)(?:\n|$))(?: {0,3}\1[~`]* *(?=\n|$)|$)/;
+	const hr = /^ {0,3}((?:-[\t ]*){3,}|(?:_[ \t]*){3,}|(?:\*[ \t]*){3,})(?:\n+|$)/;
+	const heading = /^ {0,3}(#{1,6})(?=\s|$)(.*)(?:\n+|$)/;
+	const bullet = /(?:[*+-]|\d{1,9}[.)])/;
+	const lheading = edit(/^(?!bull |blockCode|fences|blockquote|heading|html)((?:.|\n(?!\s*?\n|bull |blockCode|fences|blockquote|heading|html))+?)\n {0,3}(=+|-+) *(?:\n+|$)/)
+		.replace(/bull/g, bullet) // lists can interrupt
+		.replace(/blockCode/g, / {4}/) // indented code blocks can interrupt
+		.replace(/fences/g, / {0,3}(?:`{3,}|~{3,})/) // fenced code blocks can interrupt
+		.replace(/blockquote/g, / {0,3}>/) // blockquote can interrupt
+		.replace(/heading/g, / {0,3}#{1,6}/) // ATX heading can interrupt
+		.replace(/html/g, / {0,3}<[^\n>]+>\n/) // block html can interrupt
+		.getRegex();
+	const _paragraph = /^([^\n]+(?:\n(?!hr|heading|lheading|blockquote|fences|list|html|table| +\n)[^\n]+)*)/;
+	const blockText = /^[^\n]+/;
+	const _blockLabel = /(?!\s*\])(?:\\.|[^\[\]\\])+/;
+	const def = edit(/^ {0,3}\[(label)\]: *(?:\n *)?([^<\s][^\s]*|<.*?>)(?:(?: +(?:\n *)?| *\n *)(title))? *(?:\n+|$)/)
+		.replace('label', _blockLabel)
+		.replace('title', /(?:"(?:\\"?|[^"\\])*"|'[^'\n]*(?:\n[^'\n]+)*\n?'|\([^()]*\))/)
+		.getRegex();
+	const list = edit(/^( {0,3}bull)([ \t][^\n]+?)?(?:\n|$)/)
+		.replace(/bull/g, bullet)
+		.getRegex();
+	const _tag = 'address|article|aside|base|basefont|blockquote|body|caption'
+		+ '|center|col|colgroup|dd|details|dialog|dir|div|dl|dt|fieldset|figcaption'
+		+ '|figure|footer|form|frame|frameset|h[1-6]|head|header|hr|html|iframe'
+		+ '|legend|li|link|main|menu|menuitem|meta|nav|noframes|ol|optgroup|option'
+		+ '|p|param|search|section|summary|table|tbody|td|tfoot|th|thead|title'
+		+ '|tr|track|ul';
+	const _comment = /<!--(?:-?>|[\s\S]*?(?:-->|$))/;
+	const html = edit('^ {0,3}(?:' // optional indentation
+		+ '<(script|pre|style|textarea)[\\s>][\\s\\S]*?(?:</\\1>[^\\n]*\\n+|$)' // (1)
+		+ '|comment[^\\n]*(\\n+|$)' // (2)
+		+ '|<\\?[\\s\\S]*?(?:\\?>\\n*|$)' // (3)
+		+ '|<![A-Z][\\s\\S]*?(?:>\\n*|$)' // (4)
+		+ '|<!\\[CDATA\\[[\\s\\S]*?(?:\\]\\]>\\n*|$)' // (5)
+		+ '|</?(tag)(?: +|\\n|/?>)[\\s\\S]*?(?:(?:\\n *)+\\n|$)' // (6)
+		+ '|<(?!script|pre|style|textarea)([a-z][\\w-]*)(?:attribute)*? */?>(?=[ \\t]*(?:\\n|$))[\\s\\S]*?(?:(?:\\n *)+\\n|$)' // (7) open tag
+		+ '|</(?!script|pre|style|textarea)[a-z][\\w-]*\\s*>(?=[ \\t]*(?:\\n|$))[\\s\\S]*?(?:(?:\\n *)+\\n|$)' // (7) closing tag
+		+ ')', 'i')
+		.replace('comment', _comment)
+		.replace('tag', _tag)
+		.replace('attribute', / +[a-zA-Z:_][\w.:-]*(?: *= *"[^"\n]*"| *= *'[^'\n]*'| *= *[^\s"'=<>`]+)?/)
+		.getRegex();
+	const paragraph = edit(_paragraph)
+		.replace('hr', hr)
+		.replace('heading', ' {0,3}#{1,6}(?:\\s|$)')
+		.replace('|lheading', '') // setext headings don't interrupt commonmark paragraphs
+		.replace('|table', '')
+		.replace('blockquote', ' {0,3}>')
+		.replace('fences', ' {0,3}(?:`{3,}(?=[^`\\n]*\\n)|~{3,})[^\\n]*\\n')
+		.replace('list', ' {0,3}(?:[*+-]|1[.)]) ') // only lists starting from 1 can interrupt
+		.replace('html', '</?(?:tag)(?: +|\\n|/?>)|<(?:script|pre|style|textarea|!--)')
+		.replace('tag', _tag) // pars can be interrupted by type (6) html blocks
+		.getRegex();
+	const blockquote = edit(/^( {0,3}> ?(paragraph|[^\n]*)(?:\n|$))+/)
+		.replace('paragraph', paragraph)
+		.getRegex();
+	/**
+	 * Normal Block Grammar
+	 */
+	const blockNormal = {
+		blockquote,
+		code: blockCode,
+		def,
+		fences,
+		heading,
+		hr,
+		html,
+		lheading,
+		list,
+		newline,
+		paragraph,
+		table: noopTest,
+		text: blockText,
+	};
+	/**
+	 * GFM Block Grammar
+	 */
+	const gfmTable = edit('^ *([^\\n ].*)\\n' // Header
+		+ ' {0,3}((?:\\| *)?:?-+:? *(?:\\| *:?-+:? *)*(?:\\| *)?)' // Align
+		+ '(?:\\n((?:(?! *\\n|hr|heading|blockquote|code|fences|list|html).*(?:\\n|$))*)\\n*|$)') // Cells
+		.replace('hr', hr)
+		.replace('heading', ' {0,3}#{1,6}(?:\\s|$)')
+		.replace('blockquote', ' {0,3}>')
+		.replace('code', ' {4}[^\\n]')
+		.replace('fences', ' {0,3}(?:`{3,}(?=[^`\\n]*\\n)|~{3,})[^\\n]*\\n')
+		.replace('list', ' {0,3}(?:[*+-]|1[.)]) ') // only lists starting from 1 can interrupt
+		.replace('html', '</?(?:tag)(?: +|\\n|/?>)|<(?:script|pre|style|textarea|!--)')
+		.replace('tag', _tag) // tables can be interrupted by type (6) html blocks
+		.getRegex();
+	const blockGfm = {
+		...blockNormal,
+		table: gfmTable,
+		paragraph: edit(_paragraph)
+			.replace('hr', hr)
+			.replace('heading', ' {0,3}#{1,6}(?:\\s|$)')
+			.replace('|lheading', '') // setext headings don't interrupt commonmark paragraphs
+			.replace('table', gfmTable) // interrupt paragraphs with table
+			.replace('blockquote', ' {0,3}>')
+			.replace('fences', ' {0,3}(?:`{3,}(?=[^`\\n]*\\n)|~{3,})[^\\n]*\\n')
+			.replace('list', ' {0,3}(?:[*+-]|1[.)]) ') // only lists starting from 1 can interrupt
+			.replace('html', '</?(?:tag)(?: +|\\n|/?>)|<(?:script|pre|style|textarea|!--)')
+			.replace('tag', _tag) // pars can be interrupted by type (6) html blocks
+			.getRegex(),
+	};
+	/**
+	 * Pedantic grammar (original John Gruber's loose markdown specification)
+	 */
+	const blockPedantic = {
+		...blockNormal,
+		html: edit('^ *(?:comment *(?:\\n|\\s*$)'
+			+ '|<(tag)[\\s\\S]+?</\\1> *(?:\\n{2,}|\\s*$)' // closed tag
+			+ '|<tag(?:"[^"]*"|\'[^\']*\'|\\s[^\'"/>\\s]*)*?/?> *(?:\\n{2,}|\\s*$))')
+			.replace('comment', _comment)
+			.replace(/tag/g, '(?!(?:'
+				+ 'a|em|strong|small|s|cite|q|dfn|abbr|data|time|code|var|samp|kbd|sub'
+				+ '|sup|i|b|u|mark|ruby|rt|rp|bdi|bdo|span|br|wbr|ins|del|img)'
+				+ '\\b)\\w+(?!:|[^\\w\\s@]*@)\\b')
+			.getRegex(),
+		def: /^ *\[([^\]]+)\]: *<?([^\s>]+)>?(?: +(["(][^\n]+[")]))? *(?:\n+|$)/,
+		heading: /^(#{1,6})(.*)(?:\n+|$)/,
+		fences: noopTest, // fences not supported
+		lheading: /^(.+?)\n {0,3}(=+|-+) *(?:\n+|$)/,
+		paragraph: edit(_paragraph)
+			.replace('hr', hr)
+			.replace('heading', ' *#{1,6} *[^\n]')
+			.replace('lheading', lheading)
+			.replace('|table', '')
+			.replace('blockquote', ' {0,3}>')
+			.replace('|fences', '')
+			.replace('|list', '')
+			.replace('|html', '')
+			.replace('|tag', '')
+			.getRegex(),
+	};
+	/**
+	 * Inline-Level Grammar
+	 */
+	const escape = /^\\([!"#$%&'()*+,\-./:;<=>?@\[\]\\^_`{|}~])/;
+	const inlineCode = /^(`+)([^`]|[^`][\s\S]*?[^`])\1(?!`)/;
+	const br = /^( {2,}|\\)\n(?!\s*$)/;
+	const inlineText = /^(`+|[^`])(?:(?= {2,}\n)|[\s\S]*?(?:(?=[\\<!\[`*_]|\b_|$)|[^ ](?= {2,}\n)))/;
+	// list of unicode punctuation marks, plus any missing characters from CommonMark spec
+	const _punctuation = '\\p{P}\\p{S}';
+	const punctuation = edit(/^((?![*_])[\spunctuation])/, 'u')
+		.replace(/punctuation/g, _punctuation).getRegex();
+	// sequences em should skip over [title](link), `code`, <html>
+	const blockSkip = /\[[^[\]]*?\]\([^\(\)]*?\)|`[^`]*?`|<[^<>]*?>/g;
+	const emStrongLDelim = edit(/^(?:\*+(?:((?!\*)[punct])|[^\s*]))|^_+(?:((?!_)[punct])|([^\s_]))/, 'u')
+		.replace(/punct/g, _punctuation)
+		.getRegex();
+	const emStrongRDelimAst = edit('^[^_*]*?__[^_*]*?\\*[^_*]*?(?=__)' // Skip orphan inside strong
+		+ '|[^*]+(?=[^*])' // Consume to delim
+		+ '|(?!\\*)[punct](\\*+)(?=[\\s]|$)' // (1) #*** can only be a Right Delimiter
+		+ '|[^punct\\s](\\*+)(?!\\*)(?=[punct\\s]|$)' // (2) a***#, a*** can only be a Right Delimiter
+		+ '|(?!\\*)[punct\\s](\\*+)(?=[^punct\\s])' // (3) #***a, ***a can only be Left Delimiter
+		+ '|[\\s](\\*+)(?!\\*)(?=[punct])' // (4) ***# can only be Left Delimiter
+		+ '|(?!\\*)[punct](\\*+)(?!\\*)(?=[punct])' // (5) #***# can be either Left or Right Delimiter
+		+ '|[^punct\\s](\\*+)(?=[^punct\\s])', 'gu') // (6) a***a can be either Left or Right Delimiter
+		.replace(/punct/g, _punctuation)
+		.getRegex();
+	// (6) Not allowed for _
+	const emStrongRDelimUnd = edit('^[^_*]*?\\*\\*[^_*]*?_[^_*]*?(?=\\*\\*)' // Skip orphan inside strong
+		+ '|[^_]+(?=[^_])' // Consume to delim
+		+ '|(?!_)[punct](_+)(?=[\\s]|$)' // (1) #___ can only be a Right Delimiter
+		+ '|[^punct\\s](_+)(?!_)(?=[punct\\s]|$)' // (2) a___#, a___ can only be a Right Delimiter
+		+ '|(?!_)[punct\\s](_+)(?=[^punct\\s])' // (3) #___a, ___a can only be Left Delimiter
+		+ '|[\\s](_+)(?!_)(?=[punct])' // (4) ___# can only be Left Delimiter
+		+ '|(?!_)[punct](_+)(?!_)(?=[punct])', 'gu') // (5) #___# can be either Left or Right Delimiter
+		.replace(/punct/g, _punctuation)
+		.getRegex();
+	const anyPunctuation = edit(/\\([punct])/, 'gu')
+		.replace(/punct/g, _punctuation)
+		.getRegex();
+	const autolink = edit(/^<(scheme:[^\s\x00-\x1f<>]*|email)>/)
+		.replace('scheme', /[a-zA-Z][a-zA-Z0-9+.-]{1,31}/)
+		.replace('email', /[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+(@)[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)+(?![-_])/)
+		.getRegex();
+	const _inlineComment = edit(_comment).replace('(?:-->|$)', '-->').getRegex();
+	const tag = edit('^comment'
+		+ '|^</[a-zA-Z][\\w:-]*\\s*>' // self-closing tag
+		+ '|^<[a-zA-Z][\\w-]*(?:attribute)*?\\s*/?>' // open tag
+		+ '|^<\\?[\\s\\S]*?\\?>' // processing instruction, e.g. <?php ?>
+		+ '|^<![a-zA-Z]+\\s[\\s\\S]*?>' // declaration, e.g. <!DOCTYPE html>
+		+ '|^<!\\[CDATA\\[[\\s\\S]*?\\]\\]>') // CDATA section
+		.replace('comment', _inlineComment)
+		.replace('attribute', /\s+[a-zA-Z:_][\w.:-]*(?:\s*=\s*"[^"]*"|\s*=\s*'[^']*'|\s*=\s*[^\s"'=<>`]+)?/)
+		.getRegex();
+	const _inlineLabel = /(?:\[(?:\\.|[^\[\]\\])*\]|\\.|`[^`]*`|[^\[\]\\`])*?/;
+	const link = edit(/^!?\[(label)\]\(\s*(href)(?:\s+(title))?\s*\)/)
+		.replace('label', _inlineLabel)
+		.replace('href', /<(?:\\.|[^\n<>\\])+>|[^\s\x00-\x1f]*/)
+		.replace('title', /"(?:\\"?|[^"\\])*"|'(?:\\'?|[^'\\])*'|\((?:\\\)?|[^)\\])*\)/)
+		.getRegex();
+	const reflink = edit(/^!?\[(label)\]\[(ref)\]/)
+		.replace('label', _inlineLabel)
+		.replace('ref', _blockLabel)
+		.getRegex();
+	const nolink = edit(/^!?\[(ref)\](?:\[\])?/)
+		.replace('ref', _blockLabel)
+		.getRegex();
+	const reflinkSearch = edit('reflink|nolink(?!\\()', 'g')
+		.replace('reflink', reflink)
+		.replace('nolink', nolink)
+		.getRegex();
+	/**
+	 * Normal Inline Grammar
+	 */
+	const inlineNormal = {
+		_backpedal: noopTest, // only used for GFM url
+		anyPunctuation,
+		autolink,
+		blockSkip,
+		br,
+		code: inlineCode,
+		del: noopTest,
+		emStrongLDelim,
+		emStrongRDelimAst,
+		emStrongRDelimUnd,
+		escape,
+		link,
+		nolink,
+		punctuation,
+		reflink,
+		reflinkSearch,
+		tag,
+		text: inlineText,
+		url: noopTest,
+	};
+	/**
+	 * Pedantic Inline Grammar
+	 */
+	const inlinePedantic = {
+		...inlineNormal,
+		link: edit(/^!?\[(label)\]\((.*?)\)/)
+			.replace('label', _inlineLabel)
+			.getRegex(),
+		reflink: edit(/^!?\[(label)\]\s*\[([^\]]*)\]/)
+			.replace('label', _inlineLabel)
+			.getRegex(),
+	};
+	/**
+	 * GFM Inline Grammar
+	 */
+	const inlineGfm = {
+		...inlineNormal,
+		escape: edit(escape).replace('])', '~|])').getRegex(),
+		url: edit(/^((?:ftp|https?):\/\/|www\.)(?:[a-zA-Z0-9\-]+\.?)+[^\s<]*|^email/, 'i')
+			.replace('email', /[A-Za-z0-9._+-]+(@)[a-zA-Z0-9-_]+(?:\.[a-zA-Z0-9-_]*[a-zA-Z0-9])+(?![-_])/)
+			.getRegex(),
+		_backpedal: /(?:[^?!.,:;*_'"~()&]+|\([^)]*\)|&(?![a-zA-Z0-9]+;$)|[?!.,:;*_'"~)]+(?!$))+/,
+		del: /^(~~?)(?=[^\s~])([\s\S]*?[^\s~])\1(?=[^~]|$)/,
+		text: /^([`~]+|[^`~])(?:(?= {2,}\n)|(?=[a-zA-Z0-9.!#$%&'*+\/=?_`{\|}~-]+@)|[\s\S]*?(?:(?=[\\<!\[`*~_]|\b_|https?:\/\/|ftp:\/\/|www\.|$)|[^ ](?= {2,}\n)|[^a-zA-Z0-9.!#$%&'*+\/=?_`{\|}~-](?=[a-zA-Z0-9.!#$%&'*+\/=?_`{\|}~-]+@)))/,
+	};
+	/**
+	 * GFM + Line Breaks Inline Grammar
+	 */
+	const inlineBreaks = {
+		...inlineGfm,
+		br: edit(br).replace('{2,}', '*').getRegex(),
+		text: edit(inlineGfm.text)
+			.replace('\\b_', '\\b_| {2,}\\n')
+			.replace(/\{2,\}/g, '*')
+			.getRegex(),
+	};
+	/**
+	 * exports
+	 */
+	const block = {
+		normal: blockNormal,
+		gfm: blockGfm,
+		pedantic: blockPedantic,
+	};
+	const inline = {
+		normal: inlineNormal,
+		gfm: inlineGfm,
+		breaks: inlineBreaks,
+		pedantic: inlinePedantic,
+	};
+
+	/**
+	 * Block Lexer
+	 */
+	class _Lexer {
+		tokens;
+		options;
+		state;
+		tokenizer;
+		inlineQueue;
+		constructor(options) {
+			// TokenList cannot be created in one go
+			this.tokens = [];
+			this.tokens.links = Object.create(null);
+			this.options = options || exports.defaults;
+			this.options.tokenizer = this.options.tokenizer || new _Tokenizer();
+			this.tokenizer = this.options.tokenizer;
+			this.tokenizer.options = this.options;
+			this.tokenizer.lexer = this;
+			this.inlineQueue = [];
+			this.state = {
+				inLink: false,
+				inRawBlock: false,
+				top: true,
+			};
+			const rules = {
+				block: block.normal,
+				inline: inline.normal,
+			};
+			if (this.options.pedantic) {
+				rules.block = block.pedantic;
+				rules.inline = inline.pedantic;
+			}
+			else if (this.options.gfm) {
+				rules.block = block.gfm;
+				if (this.options.breaks) {
+					rules.inline = inline.breaks;
+				}
+				else {
+					rules.inline = inline.gfm;
+				}
+			}
+			this.tokenizer.rules = rules;
+		}
+		/**
+		 * Expose Rules
+		 */
+		static get rules() {
+			return {
+				block,
+				inline,
+			};
+		}
+		/**
+		 * Static Lex Method
+		 */
+		static lex(src, options) {
+			const lexer = new _Lexer(options);
+			return lexer.lex(src);
+		}
+		/**
+		 * Static Lex Inline Method
+		 */
+		static lexInline(src, options) {
+			const lexer = new _Lexer(options);
+			return lexer.inlineTokens(src);
+		}
+		/**
+		 * Preprocessing
+		 */
+		lex(src) {
+			src = src
+				.replace(/\r\n|\r/g, '\n');
+			this.blockTokens(src, this.tokens);
+			for (let i = 0; i < this.inlineQueue.length; i++) {
+				const next = this.inlineQueue[i];
+				this.inlineTokens(next.src, next.tokens);
+			}
+			this.inlineQueue = [];
+			return this.tokens;
+		}
+		blockTokens(src, tokens = [], lastParagraphClipped = false) {
+			if (this.options.pedantic) {
+				src = src.replace(/\t/g, '    ').replace(/^ +$/gm, '');
+			}
+			else {
+				src = src.replace(/^( *)(\t+)/gm, (_, leading, tabs) => {
+					return leading + '    '.repeat(tabs.length);
+				});
+			}
+			let token;
+			let lastToken;
+			let cutSrc;
+			while (src) {
+				if (this.options.extensions
+					&& this.options.extensions.block
+					&& this.options.extensions.block.some((extTokenizer) => {
+						if (token = extTokenizer.call({ lexer: this }, src, tokens)) {
+							src = src.substring(token.raw.length);
+							tokens.push(token);
+							return true;
+						}
+						return false;
+					})) {
+					continue;
+				}
+				// newline
+				if (token = this.tokenizer.space(src)) {
+					src = src.substring(token.raw.length);
+					if (token.raw.length === 1 && tokens.length > 0) {
+						// if there's a single \n as a spacer, it's terminating the last line,
+						// so move it there so that we don't get unnecessary paragraph tags
+						tokens[tokens.length - 1].raw += '\n';
+					}
+					else {
+						tokens.push(token);
+					}
+					continue;
+				}
+				// code
+				if (token = this.tokenizer.code(src)) {
+					src = src.substring(token.raw.length);
+					lastToken = tokens[tokens.length - 1];
+					// An indented code block cannot interrupt a paragraph.
+					if (lastToken && (lastToken.type === 'paragraph' || lastToken.type === 'text')) {
+						lastToken.raw += '\n' + token.raw;
+						lastToken.text += '\n' + token.text;
+						this.inlineQueue[this.inlineQueue.length - 1].src = lastToken.text;
+					}
+					else {
+						tokens.push(token);
+					}
+					continue;
+				}
+				// fences
+				if (token = this.tokenizer.fences(src)) {
+					src = src.substring(token.raw.length);
+					tokens.push(token);
+					continue;
+				}
+				// heading
+				if (token = this.tokenizer.heading(src)) {
+					src = src.substring(token.raw.length);
+					tokens.push(token);
+					continue;
+				}
+				// hr
+				if (token = this.tokenizer.hr(src)) {
+					src = src.substring(token.raw.length);
+					tokens.push(token);
+					continue;
+				}
+				// blockquote
+				if (token = this.tokenizer.blockquote(src)) {
+					src = src.substring(token.raw.length);
+					tokens.push(token);
+					continue;
+				}
+				// list
+				if (token = this.tokenizer.list(src)) {
+					src = src.substring(token.raw.length);
+					tokens.push(token);
+					continue;
+				}
+				// html
+				if (token = this.tokenizer.html(src)) {
+					src = src.substring(token.raw.length);
+					tokens.push(token);
+					continue;
+				}
+				// def
+				if (token = this.tokenizer.def(src)) {
+					src = src.substring(token.raw.length);
+					lastToken = tokens[tokens.length - 1];
+					if (lastToken && (lastToken.type === 'paragraph' || lastToken.type === 'text')) {
+						lastToken.raw += '\n' + token.raw;
+						lastToken.text += '\n' + token.raw;
+						this.inlineQueue[this.inlineQueue.length - 1].src = lastToken.text;
+					}
+					else if (!this.tokens.links[token.tag]) {
+						this.tokens.links[token.tag] = {
+							href: token.href,
+							title: token.title,
+						};
+					}
+					continue;
+				}
+				// table (gfm)
+				if (token = this.tokenizer.table(src)) {
+					src = src.substring(token.raw.length);
+					tokens.push(token);
+					continue;
+				}
+				// lheading
+				if (token = this.tokenizer.lheading(src)) {
+					src = src.substring(token.raw.length);
+					tokens.push(token);
+					continue;
+				}
+				// top-level paragraph
+				// prevent paragraph consuming extensions by clipping 'src' to extension start
+				cutSrc = src;
+				if (this.options.extensions && this.options.extensions.startBlock) {
+					let startIndex = Infinity;
+					const tempSrc = src.slice(1);
+					let tempStart;
+					this.options.extensions.startBlock.forEach((getStartIndex) => {
+						tempStart = getStartIndex.call({ lexer: this }, tempSrc);
+						if (typeof tempStart === 'number' && tempStart >= 0) {
+							startIndex = Math.min(startIndex, tempStart);
+						}
+					});
+					if (startIndex < Infinity && startIndex >= 0) {
+						cutSrc = src.substring(0, startIndex + 1);
+					}
+				}
+				if (this.state.top && (token = this.tokenizer.paragraph(cutSrc))) {
+					lastToken = tokens[tokens.length - 1];
+					if (lastParagraphClipped && lastToken?.type === 'paragraph') {
+						lastToken.raw += '\n' + token.raw;
+						lastToken.text += '\n' + token.text;
+						this.inlineQueue.pop();
+						this.inlineQueue[this.inlineQueue.length - 1].src = lastToken.text;
+					}
+					else {
+						tokens.push(token);
+					}
+					lastParagraphClipped = (cutSrc.length !== src.length);
+					src = src.substring(token.raw.length);
+					continue;
+				}
+				// text
+				if (token = this.tokenizer.text(src)) {
+					src = src.substring(token.raw.length);
+					lastToken = tokens[tokens.length - 1];
+					if (lastToken && lastToken.type === 'text') {
+						lastToken.raw += '\n' + token.raw;
+						lastToken.text += '\n' + token.text;
+						this.inlineQueue.pop();
+						this.inlineQueue[this.inlineQueue.length - 1].src = lastToken.text;
+					}
+					else {
+						tokens.push(token);
+					}
+					continue;
+				}
+				if (src) {
+					const errMsg = 'Infinite loop on byte: ' + src.charCodeAt(0);
+					if (this.options.silent) {
+						console.error(errMsg);
+						break;
+					}
+					else {
+						throw new Error(errMsg);
+					}
+				}
+			}
+			this.state.top = true;
+			return tokens;
+		}
+		inline(src, tokens = []) {
+			this.inlineQueue.push({ src, tokens });
+			return tokens;
+		}
+		/**
+		 * Lexing/Compiling
+		 */
+		inlineTokens(src, tokens = []) {
+			let token, lastToken, cutSrc;
+			// String with links masked to avoid interference with em and strong
+			let maskedSrc = src;
+			let match;
+			let keepPrevChar, prevChar;
+			// Mask out reflinks
+			if (this.tokens.links) {
+				const links = Object.keys(this.tokens.links);
+				if (links.length > 0) {
+					while ((match = this.tokenizer.rules.inline.reflinkSearch.exec(maskedSrc)) != null) {
+						if (links.includes(match[0].slice(match[0].lastIndexOf('[') + 1, -1))) {
+							maskedSrc = maskedSrc.slice(0, match.index) + '[' + 'a'.repeat(match[0].length - 2) + ']' + maskedSrc.slice(this.tokenizer.rules.inline.reflinkSearch.lastIndex);
+						}
+					}
+				}
+			}
+			// Mask out other blocks
+			while ((match = this.tokenizer.rules.inline.blockSkip.exec(maskedSrc)) != null) {
+				maskedSrc = maskedSrc.slice(0, match.index) + '[' + 'a'.repeat(match[0].length - 2) + ']' + maskedSrc.slice(this.tokenizer.rules.inline.blockSkip.lastIndex);
+			}
+			// Mask out escaped characters
+			while ((match = this.tokenizer.rules.inline.anyPunctuation.exec(maskedSrc)) != null) {
+				maskedSrc = maskedSrc.slice(0, match.index) + '++' + maskedSrc.slice(this.tokenizer.rules.inline.anyPunctuation.lastIndex);
+			}
+			while (src) {
+				if (!keepPrevChar) {
+					prevChar = '';
+				}
+				keepPrevChar = false;
+				// extensions
+				if (this.options.extensions
+					&& this.options.extensions.inline
+					&& this.options.extensions.inline.some((extTokenizer) => {
+						if (token = extTokenizer.call({ lexer: this }, src, tokens)) {
+							src = src.substring(token.raw.length);
+							tokens.push(token);
+							return true;
+						}
+						return false;
+					})) {
+					continue;
+				}
+				// escape
+				if (token = this.tokenizer.escape(src)) {
+					src = src.substring(token.raw.length);
+					tokens.push(token);
+					continue;
+				}
+				// tag
+				if (token = this.tokenizer.tag(src)) {
+					src = src.substring(token.raw.length);
+					lastToken = tokens[tokens.length - 1];
+					if (lastToken && token.type === 'text' && lastToken.type === 'text') {
+						lastToken.raw += token.raw;
+						lastToken.text += token.text;
+					}
+					else {
+						tokens.push(token);
+					}
+					continue;
+				}
+				// link
+				if (token = this.tokenizer.link(src)) {
+					src = src.substring(token.raw.length);
+					tokens.push(token);
+					continue;
+				}
+				// reflink, nolink
+				if (token = this.tokenizer.reflink(src, this.tokens.links)) {
+					src = src.substring(token.raw.length);
+					lastToken = tokens[tokens.length - 1];
+					if (lastToken && token.type === 'text' && lastToken.type === 'text') {
+						lastToken.raw += token.raw;
+						lastToken.text += token.text;
+					}
+					else {
+						tokens.push(token);
+					}
+					continue;
+				}
+				// em & strong
+				if (token = this.tokenizer.emStrong(src, maskedSrc, prevChar)) {
+					src = src.substring(token.raw.length);
+					tokens.push(token);
+					continue;
+				}
+				// code
+				if (token = this.tokenizer.codespan(src)) {
+					src = src.substring(token.raw.length);
+					tokens.push(token);
+					continue;
+				}
+				// br
+				if (token = this.tokenizer.br(src)) {
+					src = src.substring(token.raw.length);
+					tokens.push(token);
+					continue;
+				}
+				// del (gfm)
+				if (token = this.tokenizer.del(src)) {
+					src = src.substring(token.raw.length);
+					tokens.push(token);
+					continue;
+				}
+				// autolink
+				if (token = this.tokenizer.autolink(src)) {
+					src = src.substring(token.raw.length);
+					tokens.push(token);
+					continue;
+				}
+				// url (gfm)
+				if (!this.state.inLink && (token = this.tokenizer.url(src))) {
+					src = src.substring(token.raw.length);
+					tokens.push(token);
+					continue;
+				}
+				// text
+				// prevent inlineText consuming extensions by clipping 'src' to extension start
+				cutSrc = src;
+				if (this.options.extensions && this.options.extensions.startInline) {
+					let startIndex = Infinity;
+					const tempSrc = src.slice(1);
+					let tempStart;
+					this.options.extensions.startInline.forEach((getStartIndex) => {
+						tempStart = getStartIndex.call({ lexer: this }, tempSrc);
+						if (typeof tempStart === 'number' && tempStart >= 0) {
+							startIndex = Math.min(startIndex, tempStart);
+						}
+					});
+					if (startIndex < Infinity && startIndex >= 0) {
+						cutSrc = src.substring(0, startIndex + 1);
+					}
+				}
+				if (token = this.tokenizer.inlineText(cutSrc)) {
+					src = src.substring(token.raw.length);
+					if (token.raw.slice(-1) !== '_') { // Track prevChar before string of ____ started
+						prevChar = token.raw.slice(-1);
+					}
+					keepPrevChar = true;
+					lastToken = tokens[tokens.length - 1];
+					if (lastToken && lastToken.type === 'text') {
+						lastToken.raw += token.raw;
+						lastToken.text += token.text;
+					}
+					else {
+						tokens.push(token);
+					}
+					continue;
+				}
+				if (src) {
+					const errMsg = 'Infinite loop on byte: ' + src.charCodeAt(0);
+					if (this.options.silent) {
+						console.error(errMsg);
+						break;
+					}
+					else {
+						throw new Error(errMsg);
+					}
+				}
+			}
+			return tokens;
+		}
+	}
+
+	/**
+	 * Renderer
+	 */
+	class _Renderer {
+		options;
+		parser; // set by the parser
+		constructor(options) {
+			this.options = options || exports.defaults;
+		}
+		space(token) {
+			return '';
+		}
+		code({ text, lang, escaped }) {
+			const langString = (lang || '').match(/^\S*/)?.[0];
+			const code = text.replace(/\n$/, '') + '\n';
+			if (!langString) {
+				return '<pre><code>'
+					+ (escaped ? code : escape$1(code, true))
+					+ '</code></pre>\n';
+			}
+			return '<pre><code class="language-'
+				+ escape$1(langString)
+				+ '">'
+				+ (escaped ? code : escape$1(code, true))
+				+ '</code></pre>\n';
+		}
+		blockquote({ tokens }) {
+			const body = this.parser.parse(tokens);
+			return `<blockquote>\n${body}</blockquote>\n`;
+		}
+		html({ text }) {
+			return text;
+		}
+		heading({ tokens, depth }) {
+			return `<h${depth}>${this.parser.parseInline(tokens)}</h${depth}>\n`;
+		}
+		hr(token) {
+			return '<hr>\n';
+		}
+		list(token) {
+			const ordered = token.ordered;
+			const start = token.start;
+			let body = '';
+			for (let j = 0; j < token.items.length; j++) {
+				const item = token.items[j];
+				body += this.listitem(item);
+			}
+			const type = ordered ? 'ol' : 'ul';
+			const startAttr = (ordered && start !== 1) ? (' start="' + start + '"') : '';
+			return '<' + type + startAttr + '>\n' + body + '</' + type + '>\n';
+		}
+		listitem(item) {
+			let itemBody = '';
+			if (item.task) {
+				const checkbox = this.checkbox({ checked: !!item.checked });
+				if (item.loose) {
+					if (item.tokens.length > 0 && item.tokens[0].type === 'paragraph') {
+						item.tokens[0].text = checkbox + ' ' + item.tokens[0].text;
+						if (item.tokens[0].tokens && item.tokens[0].tokens.length > 0 && item.tokens[0].tokens[0].type === 'text') {
+							item.tokens[0].tokens[0].text = checkbox + ' ' + item.tokens[0].tokens[0].text;
+						}
+					}
+					else {
+						item.tokens.unshift({
+							type: 'text',
+							raw: checkbox + ' ',
+							text: checkbox + ' ',
+						});
+					}
+				}
+				else {
+					itemBody += checkbox + ' ';
+				}
+			}
+			itemBody += this.parser.parse(item.tokens, !!item.loose);
+			return `<li>${itemBody}</li>\n`;
+		}
+		checkbox({ checked }) {
+			return '<input '
+				+ (checked ? 'checked="" ' : '')
+				+ 'disabled="" type="checkbox">';
+		}
+		paragraph({ tokens }) {
+			return `<p>${this.parser.parseInline(tokens)}</p>\n`;
+		}
+		table(token) {
+			let header = '';
+			// header
+			let cell = '';
+			for (let j = 0; j < token.header.length; j++) {
+				cell += this.tablecell(token.header[j]);
+			}
+			header += this.tablerow({ text: cell });
+			let body = '';
+			for (let j = 0; j < token.rows.length; j++) {
+				const row = token.rows[j];
+				cell = '';
+				for (let k = 0; k < row.length; k++) {
+					cell += this.tablecell(row[k]);
+				}
+				body += this.tablerow({ text: cell });
+			}
+			if (body)
+				body = `<tbody>${body}</tbody>`;
+			return '<table>\n'
+				+ '<thead>\n'
+				+ header
+				+ '</thead>\n'
+				+ body
+				+ '</table>\n';
+		}
+		tablerow({ text }) {
+			return `<tr>\n${text}</tr>\n`;
+		}
+		tablecell(token) {
+			const content = this.parser.parseInline(token.tokens);
+			const type = token.header ? 'th' : 'td';
+			const tag = token.align
+				? `<${type} align="${token.align}">`
+				: `<${type}>`;
+			return tag + content + `</${type}>\n`;
+		}
+		/**
+		 * span level renderer
+		 */
+		strong({ tokens }) {
+			return `<strong>${this.parser.parseInline(tokens)}</strong>`;
+		}
+		em({ tokens }) {
+			return `<em>${this.parser.parseInline(tokens)}</em>`;
+		}
+		codespan({ text }) {
+			return `<code>${text}</code>`;
+		}
+		br(token) {
+			return '<br>';
+		}
+		del({ tokens }) {
+			return `<del>${this.parser.parseInline(tokens)}</del>`;
+		}
+		link({ href, title, tokens }) {
+			const text = this.parser.parseInline(tokens);
+			const cleanHref = cleanUrl(href);
+			if (cleanHref === null) {
+				return text;
+			}
+			href = cleanHref;
+			let out = '<a href="' + href + '"';
+			if (title) {
+				out += ' title="' + title + '"';
+			}
+			out += '>' + text + '</a>';
+			return out;
+		}
+		image({ href, title, text }) {
+			const cleanHref = cleanUrl(href);
+			if (cleanHref === null) {
+				return text;
+			}
+			href = cleanHref;
+			let out = `<img src="${href}" alt="${text}"`;
+			if (title) {
+				out += ` title="${title}"`;
+			}
+			out += '>';
+			return out;
+		}
+		text(token) {
+			return 'tokens' in token && token.tokens ? this.parser.parseInline(token.tokens) : token.text;
+		}
+	}
+
+	/**
+	 * TextRenderer
+	 * returns only the textual part of the token
+	 */
+	class _TextRenderer {
+		// no need for block level renderers
+		strong({ text }) {
+			return text;
+		}
+		em({ text }) {
+			return text;
+		}
+		codespan({ text }) {
+			return text;
+		}
+		del({ text }) {
+			return text;
+		}
+		html({ text }) {
+			return text;
+		}
+		text({ text }) {
+			return text;
+		}
+		link({ text }) {
+			return '' + text;
+		}
+		image({ text }) {
+			return '' + text;
+		}
+		br() {
+			return '';
+		}
+	}
+
+	/**
+	 * Parsing & Compiling
+	 */
+	class _Parser {
+		options;
+		renderer;
+		textRenderer;
+		constructor(options) {
+			this.options = options || exports.defaults;
+			this.options.renderer = this.options.renderer || new _Renderer();
+			this.renderer = this.options.renderer;
+			this.renderer.options = this.options;
+			this.renderer.parser = this;
+			this.textRenderer = new _TextRenderer();
+		}
+		/**
+		 * Static Parse Method
+		 */
+		static parse(tokens, options) {
+			const parser = new _Parser(options);
+			return parser.parse(tokens);
+		}
+		/**
+		 * Static Parse Inline Method
+		 */
+		static parseInline(tokens, options) {
+			const parser = new _Parser(options);
+			return parser.parseInline(tokens);
+		}
+		/**
+		 * Parse Loop
+		 */
+		parse(tokens, top = true) {
+			let out = '';
+			for (let i = 0; i < tokens.length; i++) {
+				const anyToken = tokens[i];
+				// Run any renderer extensions
+				if (this.options.extensions && this.options.extensions.renderers && this.options.extensions.renderers[anyToken.type]) {
+					const genericToken = anyToken;
+					const ret = this.options.extensions.renderers[genericToken.type].call({ parser: this }, genericToken);
+					if (ret !== false || !['space', 'hr', 'heading', 'code', 'table', 'blockquote', 'list', 'html', 'paragraph', 'text'].includes(genericToken.type)) {
+						out += ret || '';
+						continue;
+					}
+				}
+				const token = anyToken;
+				switch (token.type) {
+					case 'space': {
+						out += this.renderer.space(token);
+						continue;
+					}
+					case 'hr': {
+						out += this.renderer.hr(token);
+						continue;
+					}
+					case 'heading': {
+						out += this.renderer.heading(token);
+						continue;
+					}
+					case 'code': {
+						out += this.renderer.code(token);
+						continue;
+					}
+					case 'table': {
+						out += this.renderer.table(token);
+						continue;
+					}
+					case 'blockquote': {
+						out += this.renderer.blockquote(token);
+						continue;
+					}
+					case 'list': {
+						out += this.renderer.list(token);
+						continue;
+					}
+					case 'html': {
+						out += this.renderer.html(token);
+						continue;
+					}
+					case 'paragraph': {
+						out += this.renderer.paragraph(token);
+						continue;
+					}
+					case 'text': {
+						let textToken = token;
+						let body = this.renderer.text(textToken);
+						while (i + 1 < tokens.length && tokens[i + 1].type === 'text') {
+							textToken = tokens[++i];
+							body += '\n' + this.renderer.text(textToken);
+						}
+						if (top) {
+							out += this.renderer.paragraph({
+								type: 'paragraph',
+								raw: body,
+								text: body,
+								tokens: [{ type: 'text', raw: body, text: body }],
+							});
+						}
+						else {
+							out += body;
+						}
+						continue;
+					}
+					default: {
+						const errMsg = 'Token with "' + token.type + '" type was not found.';
+						if (this.options.silent) {
+							console.error(errMsg);
+							return '';
+						}
+						else {
+							throw new Error(errMsg);
+						}
+					}
+				}
+			}
+			return out;
+		}
+		/**
+		 * Parse Inline Tokens
+		 */
+		parseInline(tokens, renderer) {
+			renderer = renderer || this.renderer;
+			let out = '';
+			for (let i = 0; i < tokens.length; i++) {
+				const anyToken = tokens[i];
+				// Run any renderer extensions
+				if (this.options.extensions && this.options.extensions.renderers && this.options.extensions.renderers[anyToken.type]) {
+					const ret = this.options.extensions.renderers[anyToken.type].call({ parser: this }, anyToken);
+					if (ret !== false || !['escape', 'html', 'link', 'image', 'strong', 'em', 'codespan', 'br', 'del', 'text'].includes(anyToken.type)) {
+						out += ret || '';
+						continue;
+					}
+				}
+				const token = anyToken;
+				switch (token.type) {
+					case 'escape': {
+						out += renderer.text(token);
+						break;
+					}
+					case 'html': {
+						out += renderer.html(token);
+						break;
+					}
+					case 'link': {
+						out += renderer.link(token);
+						break;
+					}
+					case 'image': {
+						out += renderer.image(token);
+						break;
+					}
+					case 'strong': {
+						out += renderer.strong(token);
+						break;
+					}
+					case 'em': {
+						out += renderer.em(token);
+						break;
+					}
+					case 'codespan': {
+						out += renderer.codespan(token);
+						break;
+					}
+					case 'br': {
+						out += renderer.br(token);
+						break;
+					}
+					case 'del': {
+						out += renderer.del(token);
+						break;
+					}
+					case 'text': {
+						out += renderer.text(token);
+						break;
+					}
+					default: {
+						const errMsg = 'Token with "' + token.type + '" type was not found.';
+						if (this.options.silent) {
+							console.error(errMsg);
+							return '';
+						}
+						else {
+							throw new Error(errMsg);
+						}
+					}
+				}
+			}
+			return out;
+		}
+	}
+
+	class _Hooks {
+		options;
+		constructor(options) {
+			this.options = options || exports.defaults;
+		}
+		static passThroughHooks = new Set([
+			'preprocess',
+			'postprocess',
+			'processAllTokens',
+		]);
+		/**
+		 * Process markdown before marked
+		 */
+		preprocess(markdown) {
+			return markdown;
+		}
+		/**
+		 * Process HTML after marked is finished
+		 */
+		postprocess(html) {
+			return html;
+		}
+		/**
+		 * Process all tokens before walk tokens
+		 */
+		processAllTokens(tokens) {
+			return tokens;
+		}
+	}
+
+	class Marked {
+		defaults = _getDefaults();
+		options = this.setOptions;
+		parse = this.parseMarkdown(_Lexer.lex, _Parser.parse);
+		parseInline = this.parseMarkdown(_Lexer.lexInline, _Parser.parseInline);
+		Parser = _Parser;
+		Renderer = _Renderer;
+		TextRenderer = _TextRenderer;
+		Lexer = _Lexer;
+		Tokenizer = _Tokenizer;
+		Hooks = _Hooks;
+		constructor(...args) {
+			this.use(...args);
+		}
+		/**
+		 * Run callback for every token
+		 */
+		walkTokens(tokens, callback) {
+			let values = [];
+			for (const token of tokens) {
+				values = values.concat(callback.call(this, token));
+				switch (token.type) {
+					case 'table': {
+						const tableToken = token;
+						for (const cell of tableToken.header) {
+							values = values.concat(this.walkTokens(cell.tokens, callback));
+						}
+						for (const row of tableToken.rows) {
+							for (const cell of row) {
+								values = values.concat(this.walkTokens(cell.tokens, callback));
+							}
+						}
+						break;
+					}
+					case 'list': {
+						const listToken = token;
+						values = values.concat(this.walkTokens(listToken.items, callback));
+						break;
+					}
+					default: {
+						const genericToken = token;
+						if (this.defaults.extensions?.childTokens?.[genericToken.type]) {
+							this.defaults.extensions.childTokens[genericToken.type].forEach((childTokens) => {
+								const tokens = genericToken[childTokens].flat(Infinity);
+								values = values.concat(this.walkTokens(tokens, callback));
+							});
+						}
+						else if (genericToken.tokens) {
+							values = values.concat(this.walkTokens(genericToken.tokens, callback));
+						}
+					}
+				}
+			}
+			return values;
+		}
+		use(...args) {
+			const extensions = this.defaults.extensions || { renderers: {}, childTokens: {} };
+			args.forEach((pack) => {
+				// copy options to new object
+				const opts = { ...pack };
+				// set async to true if it was set to true before
+				opts.async = this.defaults.async || opts.async || false;
+				// ==-- Parse "addon" extensions --== //
+				if (pack.extensions) {
+					pack.extensions.forEach((ext) => {
+						if (!ext.name) {
+							throw new Error('extension name required');
+						}
+						if ('renderer' in ext) { // Renderer extensions
+							const prevRenderer = extensions.renderers[ext.name];
+							if (prevRenderer) {
+								// Replace extension with func to run new extension but fall back if false
+								extensions.renderers[ext.name] = function (...args) {
+									let ret = ext.renderer.apply(this, args);
+									if (ret === false) {
+										ret = prevRenderer.apply(this, args);
+									}
+									return ret;
+								};
+							}
+							else {
+								extensions.renderers[ext.name] = ext.renderer;
+							}
+						}
+						if ('tokenizer' in ext) { // Tokenizer Extensions
+							if (!ext.level || (ext.level !== 'block' && ext.level !== 'inline')) {
+								throw new Error("extension level must be 'block' or 'inline'");
+							}
+							const extLevel = extensions[ext.level];
+							if (extLevel) {
+								extLevel.unshift(ext.tokenizer);
+							}
+							else {
+								extensions[ext.level] = [ext.tokenizer];
+							}
+							if (ext.start) { // Function to check for start of token
+								if (ext.level === 'block') {
+									if (extensions.startBlock) {
+										extensions.startBlock.push(ext.start);
+									}
+									else {
+										extensions.startBlock = [ext.start];
+									}
+								}
+								else if (ext.level === 'inline') {
+									if (extensions.startInline) {
+										extensions.startInline.push(ext.start);
+									}
+									else {
+										extensions.startInline = [ext.start];
+									}
+								}
+							}
+						}
+						if ('childTokens' in ext && ext.childTokens) { // Child tokens to be visited by walkTokens
+							extensions.childTokens[ext.name] = ext.childTokens;
+						}
+					});
+					opts.extensions = extensions;
+				}
+				// ==-- Parse "overwrite" extensions --== //
+				if (pack.renderer) {
+					const renderer = this.defaults.renderer || new _Renderer(this.defaults);
+					for (const prop in pack.renderer) {
+						if (!(prop in renderer)) {
+							throw new Error(`renderer '${prop}' does not exist`);
+						}
+						if (['options', 'parser'].includes(prop)) {
+							// ignore options property
+							continue;
+						}
+						const rendererProp = prop;
+						const rendererFunc = pack.renderer[rendererProp];
+						const prevRenderer = renderer[rendererProp];
+						// Replace renderer with func to run extension, but fall back if false
+						renderer[rendererProp] = (...args) => {
+							let ret = rendererFunc.apply(renderer, args);
+							if (ret === false) {
+								ret = prevRenderer.apply(renderer, args);
+							}
+							return ret || '';
+						};
+					}
+					opts.renderer = renderer;
+				}
+				if (pack.tokenizer) {
+					const tokenizer = this.defaults.tokenizer || new _Tokenizer(this.defaults);
+					for (const prop in pack.tokenizer) {
+						if (!(prop in tokenizer)) {
+							throw new Error(`tokenizer '${prop}' does not exist`);
+						}
+						if (['options', 'rules', 'lexer'].includes(prop)) {
+							// ignore options, rules, and lexer properties
+							continue;
+						}
+						const tokenizerProp = prop;
+						const tokenizerFunc = pack.tokenizer[tokenizerProp];
+						const prevTokenizer = tokenizer[tokenizerProp];
+						// Replace tokenizer with func to run extension, but fall back if false
+						// @ts-expect-error cannot type tokenizer function dynamically
+						tokenizer[tokenizerProp] = (...args) => {
+							let ret = tokenizerFunc.apply(tokenizer, args);
+							if (ret === false) {
+								ret = prevTokenizer.apply(tokenizer, args);
+							}
+							return ret;
+						};
+					}
+					opts.tokenizer = tokenizer;
+				}
+				// ==-- Parse Hooks extensions --== //
+				if (pack.hooks) {
+					const hooks = this.defaults.hooks || new _Hooks();
+					for (const prop in pack.hooks) {
+						if (!(prop in hooks)) {
+							throw new Error(`hook '${prop}' does not exist`);
+						}
+						if (prop === 'options') {
+							// ignore options property
+							continue;
+						}
+						const hooksProp = prop;
+						const hooksFunc = pack.hooks[hooksProp];
+						const prevHook = hooks[hooksProp];
+						if (_Hooks.passThroughHooks.has(prop)) {
+							// @ts-expect-error cannot type hook function dynamically
+							hooks[hooksProp] = (arg) => {
+								if (this.defaults.async) {
+									return Promise.resolve(hooksFunc.call(hooks, arg)).then(ret => {
+										return prevHook.call(hooks, ret);
+									});
+								}
+								const ret = hooksFunc.call(hooks, arg);
+								return prevHook.call(hooks, ret);
+							};
+						}
+						else {
+							// @ts-expect-error cannot type hook function dynamically
+							hooks[hooksProp] = (...args) => {
+								let ret = hooksFunc.apply(hooks, args);
+								if (ret === false) {
+									ret = prevHook.apply(hooks, args);
+								}
+								return ret;
+							};
+						}
+					}
+					opts.hooks = hooks;
+				}
+				// ==-- Parse WalkTokens extensions --== //
+				if (pack.walkTokens) {
+					const walkTokens = this.defaults.walkTokens;
+					const packWalktokens = pack.walkTokens;
+					opts.walkTokens = function (token) {
+						let values = [];
+						values.push(packWalktokens.call(this, token));
+						if (walkTokens) {
+							values = values.concat(walkTokens.call(this, token));
+						}
+						return values;
+					};
+				}
+				this.defaults = { ...this.defaults, ...opts };
+			});
+			return this;
+		}
+		setOptions(opt) {
+			this.defaults = { ...this.defaults, ...opt };
+			return this;
+		}
+		lexer(src, options) {
+			return _Lexer.lex(src, options ?? this.defaults);
+		}
+		parser(tokens, options) {
+			return _Parser.parse(tokens, options ?? this.defaults);
+		}
+		parseMarkdown(lexer, parser) {
+			// eslint-disable-next-line @typescript-eslint/no-explicit-any
+			const parse = (src, options) => {
+				const origOpt = { ...options };
+				const opt = { ...this.defaults, ...origOpt };
+				const throwError = this.onError(!!opt.silent, !!opt.async);
+				// throw error if an extension set async to true but parse was called with async: false
+				if (this.defaults.async === true && origOpt.async === false) {
+					return throwError(new Error('marked(): The async option was set to true by an extension. Remove async: false from the parse options object to return a Promise.'));
+				}
+				// throw error in case of non string input
+				if (typeof src === 'undefined' || src === null) {
+					return throwError(new Error('marked(): input parameter is undefined or null'));
+				}
+				if (typeof src !== 'string') {
+					return throwError(new Error('marked(): input parameter is of type '
+						+ Object.prototype.toString.call(src) + ', string expected'));
+				}
+				if (opt.hooks) {
+					opt.hooks.options = opt;
+				}
+				if (opt.async) {
+					return Promise.resolve(opt.hooks ? opt.hooks.preprocess(src) : src)
+						.then(src => lexer(src, opt))
+						.then(tokens => opt.hooks ? opt.hooks.processAllTokens(tokens) : tokens)
+						.then(tokens => opt.walkTokens ? Promise.all(this.walkTokens(tokens, opt.walkTokens)).then(() => tokens) : tokens)
+						.then(tokens => parser(tokens, opt))
+						.then(html => opt.hooks ? opt.hooks.postprocess(html) : html)
+						.catch(throwError);
+				}
+				try {
+					if (opt.hooks) {
+						src = opt.hooks.preprocess(src);
+					}
+					let tokens = lexer(src, opt);
+					if (opt.hooks) {
+						tokens = opt.hooks.processAllTokens(tokens);
+					}
+					if (opt.walkTokens) {
+						this.walkTokens(tokens, opt.walkTokens);
+					}
+					let html = parser(tokens, opt);
+					if (opt.hooks) {
+						html = opt.hooks.postprocess(html);
+					}
+					return html;
+				}
+				catch (e) {
+					return throwError(e);
+				}
+			};
+			return parse;
+		}
+		onError(silent, async) {
+			return (e) => {
+				e.message += '\nPlease report this to https://github.com/markedjs/marked.';
+				if (silent) {
+					const msg = '<p>An error occurred:</p><pre>'
+						+ escape$1(e.message + '', true)
+						+ '</pre>';
+					if (async) {
+						return Promise.resolve(msg);
+					}
+					return msg;
+				}
+				if (async) {
+					return Promise.reject(e);
+				}
+				throw e;
+			};
+		}
+	}
+
+	const markedInstance = new Marked();
+	function marked(src, opt) {
+		return markedInstance.parse(src, opt);
+	}
+	/**
+	 * Sets the default options.
+	 *
+	 * @param options Hash of options
+	 */
+	marked.options =
+		marked.setOptions = function (options) {
+			markedInstance.setOptions(options);
+			marked.defaults = markedInstance.defaults;
+			changeDefaults(marked.defaults);
+			return marked;
+		};
+	/**
+	 * Gets the original marked default options.
+	 */
+	marked.getDefaults = _getDefaults;
+	marked.defaults = exports.defaults;
+	/**
+	 * Use Extension
+	 */
+	marked.use = function (...args) {
+		markedInstance.use(...args);
+		marked.defaults = markedInstance.defaults;
+		changeDefaults(marked.defaults);
+		return marked;
+	};
+	/**
+	 * Run callback for every token
+	 */
+	marked.walkTokens = function (tokens, callback) {
+		return markedInstance.walkTokens(tokens, callback);
+	};
+	/**
+	 * Compiles markdown to HTML without enclosing `p` tag.
+	 *
+	 * @param src String of markdown source to be compiled
+	 * @param options Hash of options
+	 * @return String of compiled HTML
+	 */
+	marked.parseInline = markedInstance.parseInline;
+	/**
+	 * Expose
+	 */
+	marked.Parser = _Parser;
+	marked.parser = _Parser.parse;
+	marked.Renderer = _Renderer;
+	marked.TextRenderer = _TextRenderer;
+	marked.Lexer = _Lexer;
+	marked.lexer = _Lexer.lex;
+	marked.Tokenizer = _Tokenizer;
+	marked.Hooks = _Hooks;
+	marked.parse = marked;
+	const options = marked.options;
+	const setOptions = marked.setOptions;
+	const use = marked.use;
+	const walkTokens = marked.walkTokens;
+	const parseInline = marked.parseInline;
+	const parse = marked;
+	const parser = _Parser.parse;
+	const lexer = _Lexer.lex;
+
+	exports.Hooks = _Hooks;
+	exports.Lexer = _Lexer;
+	exports.Marked = Marked;
+	exports.Parser = _Parser;
+	exports.Renderer = _Renderer;
+	exports.TextRenderer = _TextRenderer;
+	exports.Tokenizer = _Tokenizer;
+	exports.getDefaults = _getDefaults;
+	exports.lexer = lexer;
+	exports.marked = marked;
+	exports.options = options;
+	exports.parse = parse;
+	exports.parseInline = parseInline;
+	exports.parser = parser;
+	exports.setOptions = setOptions;
+	exports.use = use;
+	exports.walkTokens = walkTokens;
 }));
 
 // ESM-uncomment-begin
 // })();
+// export var Hooks = (__marked_exports.Hooks || exports.Hooks);
 // export var Lexer = (__marked_exports.Lexer || exports.Lexer);
+// export var Marked = (__marked_exports.Marked || exports.Marked);
 // export var Parser = (__marked_exports.Parser || exports.Parser);
 // export var Renderer = (__marked_exports.Renderer || exports.Renderer);
-// export var Slugger = (__marked_exports.Slugger || exports.Slugger);
 // export var TextRenderer = (__marked_exports.TextRenderer || exports.TextRenderer);
 // export var Tokenizer = (__marked_exports.Tokenizer || exports.Tokenizer);
+// export var defaults = (__marked_exports.defaults || exports.defaults);
 // export var getDefaults = (__marked_exports.getDefaults || exports.getDefaults);
 // export var lexer = (__marked_exports.lexer || exports.lexer);
 // export var marked = (__marked_exports.marked || exports.marked);
@@ -3098,3 +2534,5 @@
 // export var use = (__marked_exports.use || exports.use);
 // export var walkTokens = (__marked_exports.walkTokens || exports.walkTokens);
 // ESM-uncomment-end
+
+//# sourceMappingURL=marked.umd.js.map
diff --git a/src/vs/base/common/network.ts b/src/vs/base/common/network.ts
index 5ae261e7910..d43290cc51a 100644
--- a/src/vs/base/common/network.ts
+++ b/src/vs/base/common/network.ts
@@ -63,7 +63,10 @@ export namespace Schemas {
 
 	export const vscodeNotebookCell = 'vscode-notebook-cell';
 	export const vscodeNotebookCellMetadata = 'vscode-notebook-cell-metadata';
+	export const vscodeNotebookCellMetadataDiff = 'vscode-notebook-cell-metadata-diff';
 	export const vscodeNotebookCellOutput = 'vscode-notebook-cell-output';
+	export const vscodeNotebookCellOutputDiff = 'vscode-notebook-cell-output-diff';
+	export const vscodeNotebookMetadata = 'vscode-notebook-metadata';
 	export const vscodeInteractiveInput = 'vscode-interactive-input';
 
 	export const vscodeSettings = 'vscode-settings';
@@ -75,11 +78,6 @@ export namespace Schemas {
 	/** Scheme used for code blocks in chat. */
 	export const vscodeChatCodeBlock = 'vscode-chat-code-block';
 
-	/**
-	 * Scheme used for backing documents created by copilot for chat.
-	 */
-	export const vscodeCopilotBackingChatCodeBlock = 'vscode-copilot-chat-code-block';
-
 	/** Scheme used for LHS of code compare (aka diff) blocks in chat. */
 	export const vscodeChatCodeCompareBlock = 'vscode-chat-code-compare-block';
 
@@ -142,6 +140,11 @@ export namespace Schemas {
 	 * Scheme used for special rendering of settings in the release notes
 	 */
 	export const codeSetting = 'code-setting';
+
+	/**
+	 * Scheme used for output panel resources
+	 */
+	export const outputChannel = 'output';
 }
 
 export function matchesScheme(target: URI | string, scheme: string): boolean {
@@ -268,7 +271,12 @@ class FileAccessImpl {
 	 * **Note:** use `dom.ts#asCSSUrl` whenever the URL is to be used in CSS context.
 	 */
 	asBrowserUri(resourcePath: AppResourcePath | ''): URI {
+		// ESM-comment-begin
 		const uri = this.toUri(resourcePath, require);
+		// ESM-comment-end
+		// ESM-uncomment-begin
+		// const uri = this.toUri(resourcePath);
+		// ESM-uncomment-end
 		return this.uriToBrowserUri(uri);
 	}
 
@@ -315,7 +323,12 @@ class FileAccessImpl {
 	 * is responsible for loading.
 	 */
 	asFileUri(resourcePath: AppResourcePath | ''): URI {
+		// ESM-comment-begin
 		const uri = this.toUri(resourcePath, require);
+		// ESM-comment-end
+		// ESM-uncomment-begin
+		// const uri = this.toUri(resourcePath);
+		// ESM-uncomment-end
 		return this.uriToFileUri(uri);
 	}
 
@@ -340,12 +353,25 @@ class FileAccessImpl {
 		return uri;
 	}
 
-	private toUri(uriOrModule: URI | string, moduleIdToUrl: { toUrl(moduleId: string): string }): URI {
+	private toUri(uriOrModule: URI | string, moduleIdToUrl?: { toUrl(moduleId: string): string }): URI {
 		if (URI.isUri(uriOrModule)) {
 			return uriOrModule;
 		}
 
-		return URI.parse(moduleIdToUrl.toUrl(uriOrModule));
+		if (globalThis._VSCODE_FILE_ROOT) {
+			const rootUriOrPath = globalThis._VSCODE_FILE_ROOT;
+
+			// File URL (with scheme)
+			if (/^\w[\w\d+.-]*:\/\//.test(rootUriOrPath)) {
+				return URI.joinPath(URI.parse(rootUriOrPath, true), uriOrModule);
+			}
+
+			// File Path (no scheme)
+			const modulePath = paths.join(rootUriOrPath, uriOrModule);
+			return URI.file(modulePath);
+		}
+
+		return URI.parse(moduleIdToUrl!.toUrl(uriOrModule));
 	}
 }
 
diff --git a/src/vs/base/common/observableInternal/utils.ts b/src/vs/base/common/observableInternal/utils.ts
index de572e9dbfb..0b19a4a3522 100644
--- a/src/vs/base/common/observableInternal/utils.ts
+++ b/src/vs/base/common/observableInternal/utils.ts
@@ -3,14 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from 'vs/base/common/event';
+import { Event, IValueWithChangeEvent } from 'vs/base/common/event';
 import { DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
 import { autorun, autorunOpts } from 'vs/base/common/observableInternal/autorun';
 import { BaseObservable, ConvenientObservable, IObservable, IObserver, IReader, ITransaction, _setKeepObserved, _setRecomputeInitiallyAndOnChange, observableValue, subtransaction, transaction } from 'vs/base/common/observableInternal/base';
 import { DebugNameData, IDebugNameData, DebugOwner, getDebugName, } from 'vs/base/common/observableInternal/debugName';
 import { derived, derivedOpts } from 'vs/base/common/observableInternal/derived';
 import { getLogger } from 'vs/base/common/observableInternal/logging';
-import { IValueWithChangeEvent } from '../event';
 import { BugIndicatingError } from 'vs/base/common/errors';
 import { EqualityComparer, strictEquals } from 'vs/base/common/equals';
 
diff --git a/src/vs/base/common/performance.js b/src/vs/base/common/performance.js
index cdea4917772..93167c848fa 100644
--- a/src/vs/base/common/performance.js
+++ b/src/vs/base/common/performance.js
@@ -7,6 +7,7 @@
 'use strict';
 
 // ESM-uncomment-begin
+// /** @type any */
 // const module = { exports: {} };
 // ESM-uncomment-end
 
@@ -82,7 +83,7 @@
 		} else if (typeof process === 'object') {
 			// node.js: use the normal polyfill but add the timeOrigin
 			// from the node perf_hooks API as very first mark
-			const timeOrigin = performance?.timeOrigin ?? Math.round((require.__$__nodeRequire || require)('perf_hooks').performance.timeOrigin);
+			const timeOrigin = performance?.timeOrigin;// ?? Math.round((require.__$__nodeRequire ?? require /* TODO@esm this is fishy */)('perf_hooks').performance.timeOrigin);
 			return _definePolyfillMarks(timeOrigin);
 
 		} else {
diff --git a/src/vs/base/common/platform.ts b/src/vs/base/common/platform.ts
index d931e64dfa9..d4ec4909578 100644
--- a/src/vs/base/common/platform.ts
+++ b/src/vs/base/common/platform.ts
@@ -103,8 +103,7 @@ else if (typeof navigator === 'object' && !isElectronRenderer) {
 	_isLinux = _userAgent.indexOf('Linux') >= 0;
 	_isMobile = _userAgent?.indexOf('Mobi') >= 0;
 	_isWeb = true;
-	// VSCODE_GLOBALS: NLS
-	_language = globalThis._VSCODE_NLS_LANGUAGE || LANGUAGE_DEFAULT;
+	_language = nls.getNLSLanguage() || LANGUAGE_DEFAULT;
 	_locale = navigator.language.toLowerCase();
 	_platformLocale = _locale;
 }
diff --git a/src/vs/base/common/process.ts b/src/vs/base/common/process.ts
index 48fcd8acb43..981e5924af3 100644
--- a/src/vs/base/common/process.ts
+++ b/src/vs/base/common/process.ts
@@ -21,7 +21,7 @@ if (typeof vscodeGlobal !== 'undefined' && typeof vscodeGlobal.process !== 'unde
 }
 
 // Native node.js environment
-else if (typeof process !== 'undefined') {
+else if (typeof process !== 'undefined' && typeof process?.versions?.node === 'string') {
 	safeProcess = {
 		get platform() { return process.platform; },
 		get arch() { return process.arch; },
diff --git a/src/vs/base/common/product.ts b/src/vs/base/common/product.ts
index 6910ade9b95..68c1e666e14 100644
--- a/src/vs/base/common/product.ts
+++ b/src/vs/base/common/product.ts
@@ -94,11 +94,10 @@ export interface IProductConfiguration {
 	readonly target?: string;
 	readonly nlsCoreBaseUrl?: string;
 
-	// --- Start Positron ---
-	// Adds support for serving at non-root paths.
-
+	// --- Start PWB: proxy port url ---
 	readonly rootEndpoint?: string;
-	// --- End Positron ---
+	readonly proxyEndpointTemplate?: string;
+	// --- End PWB ---
 
 	readonly settingsSearchBuildId?: number;
 	readonly settingsSearchUrl?: string;
@@ -176,7 +175,6 @@ export interface IProductConfiguration {
 	readonly tunnelApplicationConfig?: ITunnelApplicationConfig;
 
 	readonly npsSurveyUrl?: string;
-	readonly cesSurveyUrl?: string;
 	readonly surveys?: readonly ISurveyData[];
 
 	readonly checksums?: { [path: string]: string };
diff --git a/src/vs/base/common/worker/simpleWorker.ts b/src/vs/base/common/worker/simpleWorker.ts
index 57cc59ee770..cf19e69171a 100644
--- a/src/vs/base/common/worker/simpleWorker.ts
+++ b/src/vs/base/common/worker/simpleWorker.ts
@@ -3,13 +3,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { transformErrorForSerialization } from 'vs/base/common/errors';
+import { CharCode } from 'vs/base/common/charCode';
+import { onUnexpectedError, transformErrorForSerialization } from 'vs/base/common/errors';
 import { Emitter, Event } from 'vs/base/common/event';
 import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
-import { getAllMethodNames } from 'vs/base/common/objects';
+import { AppResourcePath, FileAccess } from 'vs/base/common/network';
 import { isWeb } from 'vs/base/common/platform';
 import * as strings from 'vs/base/common/strings';
+import { URI } from 'vs/base/common/uri';
 
+// ESM-comment-begin
+const isESM = false;
+// ESM-comment-end
+// ESM-uncomment-begin
+// const isESM = true;
+// ESM-uncomment-end
+
+const DEFAULT_CHANNEL = 'default';
 const INITIALIZE = '$initialize';
 
 export interface IWorker extends IDisposable {
@@ -22,7 +32,13 @@ export interface IWorkerCallback {
 }
 
 export interface IWorkerFactory {
-	create(moduleId: string, callback: IWorkerCallback, onErrorCallback: (err: any) => void): IWorker;
+	create(modules: IWorkerDescriptor, callback: IWorkerCallback, onErrorCallback: (err: any) => void): IWorker;
+}
+
+export interface IWorkerDescriptor {
+	readonly amdModuleId: string;
+	readonly esmModuleLocation: URI | undefined;
+	readonly label: string | undefined;
 }
 
 let webWorkerWarningLogged = false;
@@ -50,6 +66,7 @@ class RequestMessage {
 	constructor(
 		public readonly vsWorker: number,
 		public readonly req: string,
+		public readonly channel: string,
 		public readonly method: string,
 		public readonly args: any[]
 	) { }
@@ -68,6 +85,7 @@ class SubscribeEventMessage {
 	constructor(
 		public readonly vsWorker: number,
 		public readonly req: string,
+		public readonly channel: string,
 		public readonly eventName: string,
 		public readonly arg: any
 	) { }
@@ -96,8 +114,8 @@ interface IMessageReply {
 
 interface IMessageHandler {
 	sendMessage(msg: any, transfer?: ArrayBuffer[]): void;
-	handleMessage(method: string, args: any[]): Promise<any>;
-	handleEvent(eventName: string, arg: any): Event<any>;
+	handleMessage(channel: string, method: string, args: any[]): Promise<any>;
+	handleEvent(channel: string, eventName: string, arg: any): Event<any>;
 }
 
 class SimpleWorkerProtocol {
@@ -122,24 +140,24 @@ class SimpleWorkerProtocol {
 		this._workerId = workerId;
 	}
 
-	public sendMessage(method: string, args: any[]): Promise<any> {
+	public sendMessage(channel: string, method: string, args: any[]): Promise<any> {
 		const req = String(++this._lastSentReq);
 		return new Promise<any>((resolve, reject) => {
 			this._pendingReplies[req] = {
 				resolve: resolve,
 				reject: reject
 			};
-			this._send(new RequestMessage(this._workerId, req, method, args));
+			this._send(new RequestMessage(this._workerId, req, channel, method, args));
 		});
 	}
 
-	public listen(eventName: string, arg: any): Event<any> {
+	public listen(channel: string, eventName: string, arg: any): Event<any> {
 		let req: string | null = null;
 		const emitter = new Emitter<any>({
 			onWillAddFirstListener: () => {
 				req = String(++this._lastSentReq);
 				this._pendingEmitters.set(req, emitter);
-				this._send(new SubscribeEventMessage(this._workerId, req, eventName, arg));
+				this._send(new SubscribeEventMessage(this._workerId, req, channel, eventName, arg));
 			},
 			onDidRemoveLastListener: () => {
 				this._pendingEmitters.delete(req!);
@@ -160,6 +178,29 @@ class SimpleWorkerProtocol {
 		this._handleMessage(message);
 	}
 
+	public createProxyToRemoteChannel<T extends object>(channel: string, sendMessageBarrier?: () => Promise<void>): T {
+		const handler = {
+			get: (target: any, name: PropertyKey) => {
+				if (typeof name === 'string' && !target[name]) {
+					if (propertyIsDynamicEvent(name)) { // onDynamic...
+						target[name] = (arg: any): Event<any> => {
+							return this.listen(channel, name, arg);
+						};
+					} else if (propertyIsEvent(name)) { // on...
+						target[name] = this.listen(channel, name, undefined);
+					} else if (name.charCodeAt(0) === CharCode.DollarSign) { // $...
+						target[name] = async (...myArgs: any[]) => {
+							await sendMessageBarrier?.();
+							return this.sendMessage(channel, name, myArgs);
+						};
+					}
+				}
+				return target[name];
+			}
+		};
+		return new Proxy(Object.create(null), handler);
+	}
+
 	private _handleMessage(msg: Message): void {
 		switch (msg.type) {
 			case MessageType.Reply:
@@ -201,7 +242,7 @@ class SimpleWorkerProtocol {
 
 	private _handleRequestMessage(requestMessage: RequestMessage): void {
 		const req = requestMessage.req;
-		const result = this._handler.handleMessage(requestMessage.method, requestMessage.args);
+		const result = this._handler.handleMessage(requestMessage.channel, requestMessage.method, requestMessage.args);
 		result.then((r) => {
 			this._send(new ReplyMessage(this._workerId, req, r, undefined));
 		}, (e) => {
@@ -215,7 +256,7 @@ class SimpleWorkerProtocol {
 
 	private _handleSubscribeEventMessage(msg: SubscribeEventMessage): void {
 		const req = msg.req;
-		const disposable = this._handler.handleEvent(msg.eventName, msg.arg)((event) => {
+		const disposable = this._handler.handleEvent(msg.channel, msg.eventName, msg.arg)((event) => {
 			this._send(new EventMessage(this._workerId, req, event));
 		});
 		this._pendingEvents.set(req, disposable);
@@ -255,35 +296,60 @@ class SimpleWorkerProtocol {
 	}
 }
 
+type ProxiedMethodName = (`$${string}` | `on${string}`);
+
+export type Proxied<T> = { [K in keyof T]: T[K] extends (...args: infer A) => infer R
+	? (
+		K extends ProxiedMethodName
+		? (...args: A) => Promise<Awaited<R>>
+		: never
+	)
+	: never
+};
+
 export interface IWorkerClient<W> {
-	getProxyObject(): Promise<W>;
+	proxy: Proxied<W>;
 	dispose(): void;
+	setChannel<T extends object>(channel: string, handler: T): void;
+	getChannel<T extends object>(channel: string): Proxied<T>;
+}
+
+export interface IWorkerServer {
+	setChannel<T extends object>(channel: string, handler: T): void;
+	getChannel<T extends object>(channel: string): Proxied<T>;
 }
 
 /**
  * Main thread side
  */
-export class SimpleWorkerClient<W extends object, H extends object> extends Disposable implements IWorkerClient<W> {
+export class SimpleWorkerClient<W extends object> extends Disposable implements IWorkerClient<W> {
 
 	private readonly _worker: IWorker;
-	private readonly _onModuleLoaded: Promise<string[]>;
+	private readonly _onModuleLoaded: Promise<void>;
 	private readonly _protocol: SimpleWorkerProtocol;
-	private readonly _lazyProxy: Promise<W>;
+	public readonly proxy: Proxied<W>;
+	private readonly _localChannels: Map<string, object> = new Map();
+	private readonly _remoteChannels: Map<string, object> = new Map();
 
-	constructor(workerFactory: IWorkerFactory, moduleId: string, host: H) {
+	constructor(
+		workerFactory: IWorkerFactory,
+		workerDescriptor: IWorkerDescriptor,
+	) {
 		super();
 
-		let lazyProxyReject: ((err: any) => void) | null = null;
-
 		this._worker = this._register(workerFactory.create(
-			'vs/base/common/worker/simpleWorker',
+			{
+				amdModuleId: 'vs/base/common/worker/simpleWorker',
+				esmModuleLocation: workerDescriptor.esmModuleLocation,
+				label: workerDescriptor.label
+			},
 			(msg: Message) => {
 				this._protocol.handleMessage(msg);
 			},
 			(err: any) => {
 				// in Firefox, web workers fail lazily :(
 				// we will reject the proxy
-				lazyProxyReject?.(err);
+				onUnexpectedError(err);
 			}
 		));
 
@@ -291,33 +357,11 @@ export class SimpleWorkerClient<W extends object, H extends object> extends Disp
 			sendMessage: (msg: any, transfer: ArrayBuffer[]): void => {
 				this._worker.postMessage(msg, transfer);
 			},
-			handleMessage: (method: string, args: any[]): Promise<any> => {
-				if (typeof (host as any)[method] !== 'function') {
-					return Promise.reject(new Error('Missing method ' + method + ' on main thread host.'));
-				}
-
-				try {
-					return Promise.resolve((host as any)[method].apply(host, args));
-				} catch (e) {
-					return Promise.reject(e);
-				}
+			handleMessage: (channel: string, method: string, args: any[]): Promise<any> => {
+				return this._handleMessage(channel, method, args);
 			},
-			handleEvent: (eventName: string, arg: any): Event<any> => {
-				if (propertyIsDynamicEvent(eventName)) {
-					const event = (host as any)[eventName].call(host, arg);
-					if (typeof event !== 'function') {
-						throw new Error(`Missing dynamic event ${eventName} on main thread host.`);
-					}
-					return event;
-				}
-				if (propertyIsEvent(eventName)) {
-					const event = (host as any)[eventName];
-					if (typeof event !== 'function') {
-						throw new Error(`Missing event ${eventName} on main thread host.`);
-					}
-					return event;
-				}
-				throw new Error(`Malformed event name ${eventName}`);
+			handleEvent: (channel: string, eventName: string, arg: any): Event<any> => {
+				return this._handleEvent(channel, eventName, arg);
 			}
 		});
 		this._protocol.setWorkerId(this._worker.getId());
@@ -334,45 +378,67 @@ export class SimpleWorkerClient<W extends object, H extends object> extends Disp
 			loaderConfiguration = (globalThis as any).requirejs.s.contexts._.config;
 		}
 
-		const hostMethods = getAllMethodNames(host);
-
 		// Send initialize message
-		this._onModuleLoaded = this._protocol.sendMessage(INITIALIZE, [
+		this._onModuleLoaded = this._protocol.sendMessage(DEFAULT_CHANNEL, INITIALIZE, [
 			this._worker.getId(),
 			JSON.parse(JSON.stringify(loaderConfiguration)),
-			moduleId,
-			hostMethods,
+			workerDescriptor.amdModuleId,
 		]);
 
-		// Create proxy to loaded code
-		const proxyMethodRequest = (method: string, args: any[]): Promise<any> => {
-			return this._request(method, args);
-		};
-		const proxyListen = (eventName: string, arg: any): Event<any> => {
-			return this._protocol.listen(eventName, arg);
-		};
-
-		this._lazyProxy = new Promise<W>((resolve, reject) => {
-			lazyProxyReject = reject;
-			this._onModuleLoaded.then((availableMethods: string[]) => {
-				resolve(createProxyObject<W>(availableMethods, proxyMethodRequest, proxyListen));
-			}, (e) => {
-				reject(e);
-				this._onError('Worker failed to load ' + moduleId, e);
-			});
+		this.proxy = this._protocol.createProxyToRemoteChannel(DEFAULT_CHANNEL, async () => { await this._onModuleLoaded; });
+		this._onModuleLoaded.catch((e) => {
+			this._onError('Worker failed to load ' + workerDescriptor.amdModuleId, e);
 		});
 	}
 
-	public getProxyObject(): Promise<W> {
-		return this._lazyProxy;
+	private _handleMessage(channelName: string, method: string, args: any[]): Promise<any> {
+		const channel: object | undefined = this._localChannels.get(channelName);
+		if (!channel) {
+			return Promise.reject(new Error(`Missing channel ${channelName} on main thread`));
+		}
+		if (typeof (channel as any)[method] !== 'function') {
+			return Promise.reject(new Error(`Missing method ${method} on main thread channel ${channelName}`));
+		}
+
+		try {
+			return Promise.resolve((channel as any)[method].apply(channel, args));
+		} catch (e) {
+			return Promise.reject(e);
+		}
 	}
 
-	private _request(method: string, args: any[]): Promise<any> {
-		return new Promise<any>((resolve, reject) => {
-			this._onModuleLoaded.then(() => {
-				this._protocol.sendMessage(method, args).then(resolve, reject);
-			}, reject);
-		});
+	private _handleEvent(channelName: string, eventName: string, arg: any): Event<any> {
+		const channel: object | undefined = this._localChannels.get(channelName);
+		if (!channel) {
+			throw new Error(`Missing channel ${channelName} on main thread`);
+		}
+		if (propertyIsDynamicEvent(eventName)) {
+			const event = (channel as any)[eventName].call(channel, arg);
+			if (typeof event !== 'function') {
+				throw new Error(`Missing dynamic event ${eventName} on main thread channel ${channelName}.`);
+			}
+			return event;
+		}
+		if (propertyIsEvent(eventName)) {
+			const event = (channel as any)[eventName];
+			if (typeof event !== 'function') {
+				throw new Error(`Missing event ${eventName} on main thread channel ${channelName}.`);
+			}
+			return event;
+		}
+		throw new Error(`Malformed event name ${eventName}`);
+	}
+
+	public setChannel<T extends object>(channel: string, handler: T): void {
+		this._localChannels.set(channel, handler);
+	}
+
+	public getChannel<T extends object>(channel: string): Proxied<T> {
+		if (!this._remoteChannels.has(channel)) {
+			const inst = this._protocol.createProxyToRemoteChannel(channel, async () => { await this._onModuleLoaded; });
+			this._remoteChannels.set(channel, inst);
+		}
+		return this._remoteChannels.get(channel) as Proxied<T>;
 	}
 
 	private _onError(message: string, error?: any): void {
@@ -391,65 +457,35 @@ function propertyIsDynamicEvent(name: string): boolean {
 	return /^onDynamic/.test(name) && strings.isUpperAsciiLetter(name.charCodeAt(9));
 }
 
-function createProxyObject<T extends object>(
-	methodNames: string[],
-	invoke: (method: string, args: unknown[]) => unknown,
-	proxyListen: (eventName: string, arg: any) => Event<any>
-): T {
-	const createProxyMethod = (method: string): () => unknown => {
-		return function () {
-			const args = Array.prototype.slice.call(arguments, 0);
-			return invoke(method, args);
-		};
-	};
-	const createProxyDynamicEvent = (eventName: string): (arg: any) => Event<any> => {
-		return function (arg) {
-			return proxyListen(eventName, arg);
-		};
-	};
-
-	const result = {} as T;
-	for (const methodName of methodNames) {
-		if (propertyIsDynamicEvent(methodName)) {
-			(<any>result)[methodName] = createProxyDynamicEvent(methodName);
-			continue;
-		}
-		if (propertyIsEvent(methodName)) {
-			(<any>result)[methodName] = proxyListen(methodName, undefined);
-			continue;
-		}
-		(<any>result)[methodName] = createProxyMethod(methodName);
-	}
-	return result;
-}
-
 export interface IRequestHandler {
 	_requestHandlerBrand: any;
 	[prop: string]: any;
 }
 
-export interface IRequestHandlerFactory<H> {
-	(host: H): IRequestHandler;
+export interface IRequestHandlerFactory {
+	(workerServer: IWorkerServer): IRequestHandler;
 }
 
 /**
  * Worker side
  */
-export class SimpleWorkerServer<H extends object> {
+export class SimpleWorkerServer implements IWorkerServer {
 
-	private _requestHandlerFactory: IRequestHandlerFactory<H> | null;
+	private _requestHandlerFactory: IRequestHandlerFactory | null;
 	private _requestHandler: IRequestHandler | null;
 	private _protocol: SimpleWorkerProtocol;
+	private readonly _localChannels: Map<string, object> = new Map();
+	private readonly _remoteChannels: Map<string, object> = new Map();
 
-	constructor(postMessage: (msg: Message, transfer?: ArrayBuffer[]) => void, requestHandlerFactory: IRequestHandlerFactory<H> | null) {
+	constructor(postMessage: (msg: Message, transfer?: ArrayBuffer[]) => void, requestHandlerFactory: IRequestHandlerFactory | null) {
 		this._requestHandlerFactory = requestHandlerFactory;
 		this._requestHandler = null;
 		this._protocol = new SimpleWorkerProtocol({
 			sendMessage: (msg: any, transfer: ArrayBuffer[]): void => {
 				postMessage(msg, transfer);
 			},
-			handleMessage: (method: string, args: any[]): Promise<any> => this._handleMessage(method, args),
-			handleEvent: (eventName: string, arg: any): Event<any> => this._handleEvent(eventName, arg)
+			handleMessage: (channel: string, method: string, args: any[]): Promise<any> => this._handleMessage(channel, method, args),
+			handleEvent: (channel: string, eventName: string, arg: any): Event<any> => this._handleEvent(channel, eventName, arg)
 		});
 	}
 
@@ -457,35 +493,40 @@ export class SimpleWorkerServer<H extends object> {
 		this._protocol.handleMessage(msg);
 	}
 
-	private _handleMessage(method: string, args: any[]): Promise<any> {
-		if (method === INITIALIZE) {
-			return this.initialize(<number>args[0], <any>args[1], <string>args[2], <string[]>args[3]);
+	private _handleMessage(channel: string, method: string, args: any[]): Promise<any> {
+		if (channel === DEFAULT_CHANNEL && method === INITIALIZE) {
+			return this.initialize(<number>args[0], <any>args[1], <string>args[2]);
 		}
 
-		if (!this._requestHandler || typeof this._requestHandler[method] !== 'function') {
-			return Promise.reject(new Error('Missing requestHandler or method: ' + method));
+		const requestHandler: object | null | undefined = (channel === DEFAULT_CHANNEL ? this._requestHandler : this._localChannels.get(channel));
+		if (!requestHandler) {
+			return Promise.reject(new Error(`Missing channel ${channel} on worker thread`));
+		}
+		if (typeof (requestHandler as any)[method] !== 'function') {
+			return Promise.reject(new Error(`Missing method ${method} on worker thread channel ${channel}`));
 		}
 
 		try {
-			return Promise.resolve(this._requestHandler[method].apply(this._requestHandler, args));
+			return Promise.resolve((requestHandler as any)[method].apply(requestHandler, args));
 		} catch (e) {
 			return Promise.reject(e);
 		}
 	}
 
-	private _handleEvent(eventName: string, arg: any): Event<any> {
-		if (!this._requestHandler) {
-			throw new Error(`Missing requestHandler`);
+	private _handleEvent(channel: string, eventName: string, arg: any): Event<any> {
+		const requestHandler: object | null | undefined = (channel === DEFAULT_CHANNEL ? this._requestHandler : this._localChannels.get(channel));
+		if (!requestHandler) {
+			throw new Error(`Missing channel ${channel} on worker thread`);
 		}
 		if (propertyIsDynamicEvent(eventName)) {
-			const event = (this._requestHandler as any)[eventName].call(this._requestHandler, arg);
+			const event = (requestHandler as any)[eventName].call(requestHandler, arg);
 			if (typeof event !== 'function') {
 				throw new Error(`Missing dynamic event ${eventName} on request handler.`);
 			}
 			return event;
 		}
 		if (propertyIsEvent(eventName)) {
-			const event = (this._requestHandler as any)[eventName];
+			const event = (requestHandler as any)[eventName];
 			if (typeof event !== 'function') {
 				throw new Error(`Missing event ${eventName} on request handler.`);
 			}
@@ -494,22 +535,25 @@ export class SimpleWorkerServer<H extends object> {
 		throw new Error(`Malformed event name ${eventName}`);
 	}
 
-	private initialize(workerId: number, loaderConfig: any, moduleId: string, hostMethods: string[]): Promise<string[]> {
-		this._protocol.setWorkerId(workerId);
+	public setChannel<T extends object>(channel: string, handler: T): void {
+		this._localChannels.set(channel, handler);
+	}
 
-		const proxyMethodRequest = (method: string, args: any[]): Promise<any> => {
-			return this._protocol.sendMessage(method, args);
-		};
-		const proxyListen = (eventName: string, arg: any): Event<any> => {
-			return this._protocol.listen(eventName, arg);
-		};
+	public getChannel<T extends object>(channel: string): Proxied<T> {
+		if (!this._remoteChannels.has(channel)) {
+			const inst = this._protocol.createProxyToRemoteChannel(channel);
+			this._remoteChannels.set(channel, inst);
+		}
+		return this._remoteChannels.get(channel) as Proxied<T>;
+	}
 
-		const hostProxy = createProxyObject<H>(hostMethods, proxyMethodRequest, proxyListen);
+	private async initialize(workerId: number, loaderConfig: any, moduleId: string): Promise<void> {
+		this._protocol.setWorkerId(workerId);
 
 		if (this._requestHandlerFactory) {
 			// static request handler
-			this._requestHandler = this._requestHandlerFactory(hostProxy);
-			return Promise.resolve(getAllMethodNames(this._requestHandler));
+			this._requestHandler = this._requestHandlerFactory(this);
+			return;
 		}
 
 		if (loaderConfig) {
@@ -532,7 +576,18 @@ export class SimpleWorkerServer<H extends object> {
 			globalThis.require.config(loaderConfig);
 		}
 
-		return new Promise<string[]>((resolve, reject) => {
+		if (isESM) {
+			const url = FileAccess.asBrowserUri(`${moduleId}.js` as AppResourcePath).toString(true);
+			return import(`${url}`).then((module: { create: IRequestHandlerFactory }) => {
+				this._requestHandler = module.create(this);
+
+				if (!this._requestHandler) {
+					throw new Error(`No RequestHandler!`);
+				}
+			});
+		}
+
+		return new Promise<void>((resolve, reject) => {
 			// Use the global require to be sure to get the global config
 
 			// ESM-comment-begin
@@ -542,24 +597,24 @@ export class SimpleWorkerServer<H extends object> {
 			// const req = globalThis.require;
 			// ESM-uncomment-end
 
-			req([moduleId], (module: { create: IRequestHandlerFactory<H> }) => {
-				this._requestHandler = module.create(hostProxy);
+			req([moduleId], (module: { create: IRequestHandlerFactory }) => {
+				this._requestHandler = module.create(this);
 
 				if (!this._requestHandler) {
 					reject(new Error(`No RequestHandler!`));
 					return;
 				}
 
-				resolve(getAllMethodNames(this._requestHandler));
+				resolve();
 			}, reject);
 		});
 	}
 }
 
 /**
- * Called on the worker side
+ * Defines the worker entry point. Must be exported and named `create`.
  * @skipMangle
  */
-export function create(postMessage: (msg: Message, transfer?: ArrayBuffer[]) => void): SimpleWorkerServer<any> {
+export function create(postMessage: (msg: Message, transfer?: ArrayBuffer[]) => void): SimpleWorkerServer {
 	return new SimpleWorkerServer(postMessage, null);
 }
diff --git a/src/vs/base/common/worker/simpleWorkerBootstrap.ts b/src/vs/base/common/worker/simpleWorkerBootstrap.ts
new file mode 100644
index 00000000000..c776f7331d0
--- /dev/null
+++ b/src/vs/base/common/worker/simpleWorkerBootstrap.ts
@@ -0,0 +1,42 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IRequestHandlerFactory, SimpleWorkerServer } from 'vs/base/common/worker/simpleWorker';
+
+type MessageEvent = {
+	data: any;
+};
+
+declare const globalThis: {
+	postMessage: (message: any) => void;
+	onmessage: (event: MessageEvent) => void;
+};
+
+let initialized = false;
+
+function initialize(factory: IRequestHandlerFactory) {
+	if (initialized) {
+		return;
+	}
+	initialized = true;
+
+	const simpleWorker = new SimpleWorkerServer(
+		msg => globalThis.postMessage(msg),
+		(workerServer) => factory(workerServer)
+	);
+
+	globalThis.onmessage = (e: MessageEvent) => {
+		simpleWorker.onmessage(e.data);
+	};
+}
+
+export function bootstrapSimpleWorker(factory: IRequestHandlerFactory) {
+	globalThis.onmessage = (_e: MessageEvent) => {
+		// Ignore first message in this case and initialize if not yet initialized
+		if (!initialized) {
+			initialize(factory);
+		}
+	};
+}
diff --git a/src/vs/base/node/nls.js b/src/vs/base/node/nls.js
index bcd2a24740a..3752b1ffcea 100644
--- a/src/vs/base/node/nls.js
+++ b/src/vs/base/node/nls.js
@@ -18,6 +18,7 @@
 // import * as fs from 'fs';
 // import * as perf from '../common/performance.js';
 //
+// /** @type any */
 // const module = { exports: {} };
 // ESM-uncomment-end
 
@@ -116,7 +117,7 @@
 				defaultMessagesFile: path.join(nlsMetadataPath, 'nls.messages.json'),
 
 				// NLS: below 2 are a relic from old times only used by vscode-nls and deprecated
-				locale: 'en',
+				locale: userLocale,
 				availableLanguages: {}
 			};
 		}
diff --git a/src/vs/base/node/unc.js b/src/vs/base/node/unc.js
index a9203d79cc3..3284ee4d447 100644
--- a/src/vs/base/node/unc.js
+++ b/src/vs/base/node/unc.js
@@ -3,12 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-/// <reference path="../../../typings/require.d.ts" />
-
 //@ts-check
 'use strict';
 
 // ESM-uncomment-begin
+// /** @type any */
 // const module = { exports: {} };
 // ESM-uncomment-end
 
diff --git a/src/vs/base/parts/request/test/browser/request.test.ts b/src/vs/base/parts/request/test/browser/request.test.ts
index 08ac56dada6..4bac2bc83cb 100644
--- a/src/vs/base/parts/request/test/browser/request.test.ts
+++ b/src/vs/base/parts/request/test/browser/request.test.ts
@@ -12,9 +12,9 @@ import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cance
 import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
 import { request } from 'vs/base/parts/request/browser/request';
 import { streamToBuffer } from 'vs/base/common/buffer';
+import { flakySuite } from 'vs/base/test/common/testUtils';
 
-
-suite('Request', () => {
+flakySuite('Request', () => {
 
 	let port: number;
 	let server: http.Server;
diff --git a/src/vs/base/parts/sandbox/common/electronTypes.ts b/src/vs/base/parts/sandbox/common/electronTypes.ts
index 43fa75079d4..ef8c1026be2 100644
--- a/src/vs/base/parts/sandbox/common/electronTypes.ts
+++ b/src/vs/base/parts/sandbox/common/electronTypes.ts
@@ -217,24 +217,6 @@ export interface FileFilter {
 	name: string;
 }
 
-export interface OpenDevToolsOptions {
-	/**
-	 * Opens the devtools with specified dock state, can be `left`, `right`, `bottom`,
-	 * `undocked`, `detach`. Defaults to last used dock state. In `undocked` mode it's
-	 * possible to dock back. In `detach` mode it's not.
-	 */
-	mode: ('left' | 'right' | 'bottom' | 'undocked' | 'detach');
-	/**
-	 * Whether to bring the opened devtools window to the foreground. The default is
-	 * `true`.
-	 */
-	activate?: boolean;
-	/**
-	 * A title for the DevTools window (only in `undocked` or `detach` mode).
-	 */
-	title?: string;
-}
-
 interface InputEvent {
 
 	// Docs: https://electronjs.org/docs/api/structures/input-event
diff --git a/src/vs/base/parts/sandbox/common/sandboxTypes.ts b/src/vs/base/parts/sandbox/common/sandboxTypes.ts
index d449ad1aa60..17f7d5fe226 100644
--- a/src/vs/base/parts/sandbox/common/sandboxTypes.ts
+++ b/src/vs/base/parts/sandbox/common/sandboxTypes.ts
@@ -72,7 +72,7 @@ export interface ISandboxConfiguration {
 	};
 
 	/**
-	 * DEV time only! All css-modules that we have.
+	 * DEV time only: All CSS-modules that we have.
 	 */
 	cssModules?: string[];
 }
diff --git a/src/vs/base/parts/sandbox/test/electron-sandbox/globals.test.ts b/src/vs/base/parts/sandbox/test/electron-sandbox/globals.test.ts
index 7724c4ed465..69c4d3d51e2 100644
--- a/src/vs/base/parts/sandbox/test/electron-sandbox/globals.test.ts
+++ b/src/vs/base/parts/sandbox/test/electron-sandbox/globals.test.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { context, ipcRenderer, process, webFrame, webUtils } from 'vs/base/parts/sandbox/electron-sandbox/globals';
+import { ipcRenderer, process, webFrame, webUtils } from 'vs/base/parts/sandbox/electron-sandbox/globals';
 import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
 
 suite('Sandbox', () => {
@@ -14,10 +14,6 @@ suite('Sandbox', () => {
 		assert.ok(typeof webFrame.setZoomLevel === 'function');
 		assert.ok(typeof process.platform === 'string');
 		assert.ok(typeof webUtils.getPathForFile === 'function');
-
-		const config = await context.resolveConfiguration();
-		assert.ok(config);
-		assert.ok(context.configuration());
 	});
 
 	ensureNoDisposablesAreLeakedInTestSuite();
diff --git a/src/vs/base/test/browser/dom.test.ts b/src/vs/base/test/browser/dom.test.ts
index 98ad9441a92..61358186e51 100644
--- a/src/vs/base/test/browser/dom.test.ts
+++ b/src/vs/base/test/browser/dom.test.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { $, asCssValueWithDefault, h, multibyteAwareBtoa, trackAttributes, copyAttributes, disposableWindowInterval, getWindows, getWindowsCount, getWindowId, getWindowById, hasWindow, getWindow, getDocument, isHTMLElement } from 'vs/base/browser/dom';
+import { $, asCssValueWithDefault, h, multibyteAwareBtoa, trackAttributes, copyAttributes, disposableWindowInterval, getWindows, getWindowsCount, getWindowId, getWindowById, hasWindow, getWindow, getDocument, isHTMLElement, SafeTriangle } from 'vs/base/browser/dom';
 import { ensureCodeWindow, isAuxiliaryWindow, mainWindow } from 'vs/base/browser/window';
 import { DeferredPromise, timeout } from 'vs/base/common/async';
 import { runWithFakedTimers } from 'vs/base/test/common/timeTravelScheduler';
@@ -407,5 +407,38 @@ suite('dom', () => {
 		});
 	});
 
+	suite('SafeTriangle', () => {
+		const fakeElement = (left: number, right: number, top: number, bottom: number): HTMLElement => {
+			return { getBoundingClientRect: () => ({ left, right, top, bottom }) } as any;
+		};
+
+		test('works', () => {
+			const safeTriangle = new SafeTriangle(0, 0, fakeElement(10, 20, 10, 20));
+
+			assert.strictEqual(safeTriangle.contains(5, 5), true); // in triangle region
+			assert.strictEqual(safeTriangle.contains(15, 5), false);
+			assert.strictEqual(safeTriangle.contains(25, 5), false);
+
+			assert.strictEqual(safeTriangle.contains(5, 15), false);
+			assert.strictEqual(safeTriangle.contains(15, 15), true);
+			assert.strictEqual(safeTriangle.contains(25, 15), false);
+
+			assert.strictEqual(safeTriangle.contains(5, 25), false);
+			assert.strictEqual(safeTriangle.contains(15, 25), false);
+			assert.strictEqual(safeTriangle.contains(25, 25), false);
+		});
+
+		test('other dirations', () => {
+			const a = new SafeTriangle(30, 30, fakeElement(10, 20, 10, 20));
+			assert.strictEqual(a.contains(25, 25), true);
+
+			const b = new SafeTriangle(0, 30, fakeElement(10, 20, 10, 20));
+			assert.strictEqual(b.contains(5, 25), true);
+
+			const c = new SafeTriangle(30, 0, fakeElement(10, 20, 10, 20));
+			assert.strictEqual(c.contains(25, 5), true);
+		});
+	});
+
 	ensureNoDisposablesAreLeakedInTestSuite();
 });
diff --git a/src/vs/base/test/browser/markdownRenderer.test.ts b/src/vs/base/test/browser/markdownRenderer.test.ts
index 4ea38c815c3..ca8fc628848 100644
--- a/src/vs/base/test/browser/markdownRenderer.test.ts
+++ b/src/vs/base/test/browser/markdownRenderer.test.ts
@@ -6,7 +6,7 @@
 import assert from 'assert';
 import { fillInIncompleteTokens, renderMarkdown, renderMarkdownAsPlaintext } from 'vs/base/browser/markdownRenderer';
 import { IMarkdownString, MarkdownString } from 'vs/base/common/htmlContent';
-import { marked } from 'vs/base/common/marked/marked';
+import * as marked from 'vs/base/common/marked/marked';
 import { parse } from 'vs/base/common/marshalling';
 import { isWeb } from 'vs/base/common/platform';
 import { URI } from 'vs/base/common/uri';
@@ -259,8 +259,8 @@ suite('MarkdownRenderer', () => {
 	suite('PlaintextMarkdownRender', () => {
 
 		test('test code, blockquote, heading, list, listitem, paragraph, table, tablerow, tablecell, strong, em, br, del, text are rendered plaintext', () => {
-			const markdown = { value: '`code`\n>quote\n# heading\n- list\n\n\ntable | table2\n--- | --- \none | two\n\n\nbo**ld**\n_italic_\n~~del~~\nsome text' };
-			const expected = 'code\nquote\nheading\nlist\ntable table2 one two \nbold\nitalic\ndel\nsome text\n';
+			const markdown = { value: '`code`\n>quote\n# heading\n- list\n\ntable | table2\n--- | --- \none | two\n\n\nbo**ld**\n_italic_\n~~del~~\nsome text' };
+			const expected = 'code\nquote\nheading\nlist\n\ntable table2\none two\nbold\nitalic\ndel\nsome text\n';
 			const result: string = renderMarkdownAsPlaintext(markdown);
 			assert.strictEqual(result, expected);
 		});
@@ -342,15 +342,15 @@ suite('MarkdownRenderer', () => {
 
 		suite('table', () => {
 			test('complete table', () => {
-				const tokens = marked.lexer(completeTable);
+				const tokens = marked.marked.lexer(completeTable);
 				const newTokens = fillInIncompleteTokens(tokens);
 				assert.equal(newTokens, tokens);
 			});
 
 			test('full header only', () => {
 				const incompleteTable = '| a | b |';
-				const tokens = marked.lexer(incompleteTable);
-				const completeTableTokens = marked.lexer(completeTable);
+				const tokens = marked.marked.lexer(incompleteTable);
+				const completeTableTokens = marked.marked.lexer(completeTable);
 
 				const newTokens = fillInIncompleteTokens(tokens);
 				assert.deepStrictEqual(newTokens, completeTableTokens);
@@ -358,8 +358,8 @@ suite('MarkdownRenderer', () => {
 
 			test('full header only with trailing space', () => {
 				const incompleteTable = '| a | b | ';
-				const tokens = marked.lexer(incompleteTable);
-				const completeTableTokens = marked.lexer(completeTable);
+				const tokens = marked.marked.lexer(incompleteTable);
+				const completeTableTokens = marked.marked.lexer(completeTable);
 
 				const newTokens = fillInIncompleteTokens(tokens);
 				if (newTokens) {
@@ -370,8 +370,8 @@ suite('MarkdownRenderer', () => {
 
 			test('incomplete header', () => {
 				const incompleteTable = '| a | b';
-				const tokens = marked.lexer(incompleteTable);
-				const completeTableTokens = marked.lexer(completeTable);
+				const tokens = marked.marked.lexer(incompleteTable);
+				const completeTableTokens = marked.marked.lexer(completeTable);
 
 				const newTokens = fillInIncompleteTokens(tokens);
 
@@ -383,8 +383,8 @@ suite('MarkdownRenderer', () => {
 
 			test('incomplete header one column', () => {
 				const incompleteTable = '| a ';
-				const tokens = marked.lexer(incompleteTable);
-				const completeTableTokens = marked.lexer(incompleteTable + '|\n| --- |');
+				const tokens = marked.marked.lexer(incompleteTable);
+				const completeTableTokens = marked.marked.lexer(incompleteTable + '|\n| --- |');
 
 				const newTokens = fillInIncompleteTokens(tokens);
 
@@ -396,8 +396,8 @@ suite('MarkdownRenderer', () => {
 
 			test('full header with extras', () => {
 				const incompleteTable = '| a **bold** | b _italics_ |';
-				const tokens = marked.lexer(incompleteTable);
-				const completeTableTokens = marked.lexer(incompleteTable + '\n| --- | --- |');
+				const tokens = marked.marked.lexer(incompleteTable);
+				const completeTableTokens = marked.marked.lexer(incompleteTable + '\n| --- | --- |');
 
 				const newTokens = fillInIncompleteTokens(tokens);
 				assert.deepStrictEqual(newTokens, completeTableTokens);
@@ -406,8 +406,8 @@ suite('MarkdownRenderer', () => {
 			test('full header with leading text', () => {
 				// Parsing this gives one token and one 'text' subtoken
 				const incompleteTable = 'here is a table\n| a | b |';
-				const tokens = marked.lexer(incompleteTable);
-				const completeTableTokens = marked.lexer(incompleteTable + '\n| --- | --- |');
+				const tokens = marked.marked.lexer(incompleteTable);
+				const completeTableTokens = marked.marked.lexer(incompleteTable + '\n| --- | --- |');
 
 				const newTokens = fillInIncompleteTokens(tokens);
 				assert.deepStrictEqual(newTokens, completeTableTokens);
@@ -416,8 +416,8 @@ suite('MarkdownRenderer', () => {
 			test('full header with leading other stuff', () => {
 				// Parsing this gives one token and one 'text' subtoken
 				const incompleteTable = '```js\nconst xyz = 123;\n```\n| a | b |';
-				const tokens = marked.lexer(incompleteTable);
-				const completeTableTokens = marked.lexer(incompleteTable + '\n| --- | --- |');
+				const tokens = marked.marked.lexer(incompleteTable);
+				const completeTableTokens = marked.marked.lexer(incompleteTable + '\n| --- | --- |');
 
 				const newTokens = fillInIncompleteTokens(tokens);
 				assert.deepStrictEqual(newTokens, completeTableTokens);
@@ -425,8 +425,8 @@ suite('MarkdownRenderer', () => {
 
 			test('full header with incomplete separator', () => {
 				const incompleteTable = '| a | b |\n| ---';
-				const tokens = marked.lexer(incompleteTable);
-				const completeTableTokens = marked.lexer(completeTable);
+				const tokens = marked.marked.lexer(incompleteTable);
+				const completeTableTokens = marked.marked.lexer(completeTable);
 
 				const newTokens = fillInIncompleteTokens(tokens);
 				assert.deepStrictEqual(newTokens, completeTableTokens);
@@ -434,8 +434,8 @@ suite('MarkdownRenderer', () => {
 
 			test('full header with incomplete separator 2', () => {
 				const incompleteTable = '| a | b |\n| --- |';
-				const tokens = marked.lexer(incompleteTable);
-				const completeTableTokens = marked.lexer(completeTable);
+				const tokens = marked.marked.lexer(incompleteTable);
+				const completeTableTokens = marked.marked.lexer(completeTable);
 
 				const newTokens = fillInIncompleteTokens(tokens);
 				assert.deepStrictEqual(newTokens, completeTableTokens);
@@ -443,8 +443,8 @@ suite('MarkdownRenderer', () => {
 
 			test('full header with incomplete separator 3', () => {
 				const incompleteTable = '| a | b |\n|';
-				const tokens = marked.lexer(incompleteTable);
-				const completeTableTokens = marked.lexer(completeTable);
+				const tokens = marked.marked.lexer(incompleteTable);
+				const completeTableTokens = marked.marked.lexer(completeTable);
 
 				const newTokens = fillInIncompleteTokens(tokens);
 				assert.deepStrictEqual(newTokens, completeTableTokens);
@@ -452,7 +452,7 @@ suite('MarkdownRenderer', () => {
 
 			test('not a table', () => {
 				const incompleteTable = '| a | b |\nsome text';
-				const tokens = marked.lexer(incompleteTable);
+				const tokens = marked.marked.lexer(incompleteTable);
 
 				const newTokens = fillInIncompleteTokens(tokens);
 				assert.deepStrictEqual(newTokens, tokens);
@@ -460,104 +460,26 @@ suite('MarkdownRenderer', () => {
 
 			test('not a table 2', () => {
 				const incompleteTable = '| a | b |\n| --- |\nsome text';
-				const tokens = marked.lexer(incompleteTable);
+				const tokens = marked.marked.lexer(incompleteTable);
 
 				const newTokens = fillInIncompleteTokens(tokens);
 				assert.deepStrictEqual(newTokens, tokens);
 			});
 		});
 
-		suite('codeblock', () => {
-			test('complete code block', () => {
-				const completeCodeblock = '```js\nconst xyz = 123;\n```';
-				const tokens = marked.lexer(completeCodeblock);
-				const newTokens = fillInIncompleteTokens(tokens);
-				assert.equal(newTokens, tokens);
-			});
-
-			test('code block header only', () => {
-				const incompleteCodeblock = '```js';
-				const tokens = marked.lexer(incompleteCodeblock);
-				const newTokens = fillInIncompleteTokens(tokens);
-
-				const completeCodeblockTokens = marked.lexer(incompleteCodeblock + '\n```');
-				assert.deepStrictEqual(newTokens, completeCodeblockTokens);
-			});
-
-			test('code block header no lang', () => {
-				const incompleteCodeblock = '```';
-				const tokens = marked.lexer(incompleteCodeblock);
-				const newTokens = fillInIncompleteTokens(tokens);
-
-				const completeCodeblockTokens = marked.lexer(incompleteCodeblock + '\n```');
-				assert.deepStrictEqual(newTokens, completeCodeblockTokens);
-			});
-
-			test('code block header and some code', () => {
-				const incompleteCodeblock = '```js\nconst';
-				const tokens = marked.lexer(incompleteCodeblock);
-				const newTokens = fillInIncompleteTokens(tokens);
-
-				const completeCodeblockTokens = marked.lexer(incompleteCodeblock + '\n```');
-				assert.deepStrictEqual(newTokens, completeCodeblockTokens);
-			});
-
-			test('code block header with leading text', () => {
-				const incompleteCodeblock = 'some text\n```js';
-				const tokens = marked.lexer(incompleteCodeblock);
-				const newTokens = fillInIncompleteTokens(tokens);
-
-				const completeCodeblockTokens = marked.lexer(incompleteCodeblock + '\n```');
-				assert.deepStrictEqual(newTokens, completeCodeblockTokens);
-			});
-
-			test('code block header with leading text and some code', () => {
-				const incompleteCodeblock = 'some text\n```js\nconst';
-				const tokens = marked.lexer(incompleteCodeblock);
-				const newTokens = fillInIncompleteTokens(tokens);
-
-				const completeCodeblockTokens = marked.lexer(incompleteCodeblock + '\n```');
-				assert.deepStrictEqual(newTokens, completeCodeblockTokens);
-			});
-
-			test('code block header with more backticks', () => {
-				const incompleteCodeblock = 'some text\n`````js\nconst';
-				const tokens = marked.lexer(incompleteCodeblock);
-				const newTokens = fillInIncompleteTokens(tokens);
-
-				const completeCodeblockTokens = marked.lexer(incompleteCodeblock + '\n`````');
-				assert.deepStrictEqual(newTokens, completeCodeblockTokens);
-			});
-
-			test('code block header containing codeblock', () => {
-				const incompleteCodeblock = `some text
-\`\`\`\`\`js
-const x = 1;
-\`\`\`
-const y = 2;
-\`\`\`
-// foo`;
-				const tokens = marked.lexer(incompleteCodeblock);
-				const newTokens = fillInIncompleteTokens(tokens);
-
-				const completeCodeblockTokens = marked.lexer(incompleteCodeblock + '\n`````');
-				assert.deepStrictEqual(newTokens, completeCodeblockTokens);
-			});
-		});
-
 		function simpleMarkdownTestSuite(name: string, delimiter: string): void {
 			test(`incomplete ${name}`, () => {
 				const incomplete = `${delimiter}code`;
-				const tokens = marked.lexer(incomplete);
+				const tokens = marked.marked.lexer(incomplete);
 				const newTokens = fillInIncompleteTokens(tokens);
 
-				const completeTokens = marked.lexer(incomplete + delimiter);
+				const completeTokens = marked.marked.lexer(incomplete + delimiter);
 				assert.deepStrictEqual(newTokens, completeTokens);
 			});
 
 			test(`complete ${name}`, () => {
 				const text = `leading text ${delimiter}code${delimiter} trailing text`;
-				const tokens = marked.lexer(text);
+				const tokens = marked.marked.lexer(text);
 				const newTokens = fillInIncompleteTokens(tokens);
 
 				assert.deepStrictEqual(newTokens, tokens);
@@ -565,16 +487,16 @@ const y = 2;
 
 			test(`${name} with leading text`, () => {
 				const incomplete = `some text and ${delimiter}some code`;
-				const tokens = marked.lexer(incomplete);
+				const tokens = marked.marked.lexer(incomplete);
 				const newTokens = fillInIncompleteTokens(tokens);
 
-				const completeTokens = marked.lexer(incomplete + delimiter);
+				const completeTokens = marked.marked.lexer(incomplete + delimiter);
 				assert.deepStrictEqual(newTokens, completeTokens);
 			});
 
 			test(`single loose "${delimiter}"`, () => {
 				const text = `some text and ${delimiter}by itself\nmore text here`;
-				const tokens = marked.lexer(text);
+				const tokens = marked.marked.lexer(text);
 				const newTokens = fillInIncompleteTokens(tokens);
 
 				assert.deepStrictEqual(newTokens, tokens);
@@ -582,46 +504,46 @@ const y = 2;
 
 			test(`incomplete ${name} after newline`, () => {
 				const text = `some text\nmore text here and ${delimiter}text`;
-				const tokens = marked.lexer(text);
+				const tokens = marked.marked.lexer(text);
 				const newTokens = fillInIncompleteTokens(tokens);
 
-				const completeTokens = marked.lexer(text + delimiter);
+				const completeTokens = marked.marked.lexer(text + delimiter);
 				assert.deepStrictEqual(newTokens, completeTokens);
 			});
 
 			test(`incomplete after complete ${name}`, () => {
 				const text = `leading text ${delimiter}code${delimiter} trailing text and ${delimiter}another`;
-				const tokens = marked.lexer(text);
+				const tokens = marked.marked.lexer(text);
 				const newTokens = fillInIncompleteTokens(tokens);
 
-				const completeTokens = marked.lexer(text + delimiter);
+				const completeTokens = marked.marked.lexer(text + delimiter);
 				assert.deepStrictEqual(newTokens, completeTokens);
 			});
 
 			test(`incomplete ${name} in list`, () => {
 				const text = `- list item one\n- list item two and ${delimiter}text`;
-				const tokens = marked.lexer(text);
+				const tokens = marked.marked.lexer(text);
 				const newTokens = fillInIncompleteTokens(tokens);
 
-				const completeTokens = marked.lexer(text + delimiter);
+				const completeTokens = marked.marked.lexer(text + delimiter);
 				assert.deepStrictEqual(newTokens, completeTokens);
 			});
 
 			test(`incomplete ${name} in asterisk list`, () => {
 				const text = `* list item one\n* list item two and ${delimiter}text`;
-				const tokens = marked.lexer(text);
+				const tokens = marked.marked.lexer(text);
 				const newTokens = fillInIncompleteTokens(tokens);
 
-				const completeTokens = marked.lexer(text + delimiter);
+				const completeTokens = marked.marked.lexer(text + delimiter);
 				assert.deepStrictEqual(newTokens, completeTokens);
 			});
 
 			test(`incomplete ${name} in numbered list`, () => {
 				const text = `1. list item one\n2. list item two and ${delimiter}text`;
-				const tokens = marked.lexer(text);
+				const tokens = marked.marked.lexer(text);
 				const newTokens = fillInIncompleteTokens(tokens);
 
-				const completeTokens = marked.lexer(text + delimiter);
+				const completeTokens = marked.marked.lexer(text + delimiter);
 				assert.deepStrictEqual(newTokens, completeTokens);
 			});
 		}
@@ -634,7 +556,7 @@ const y = 2;
 	\`\`\`
 - list item two
 `;
-				const tokens = marked.lexer(list);
+				const tokens = marked.marked.lexer(list);
 				const newTokens = fillInIncompleteTokens(tokens);
 
 				assert.deepStrictEqual(newTokens, tokens);
@@ -645,10 +567,10 @@ const y = 2;
 
 	\`\`\`js
 	let x = 1;`;
-				const tokens = marked.lexer(incomplete);
+				const tokens = marked.marked.lexer(incomplete);
 				const newTokens = fillInIncompleteTokens(tokens);
 
-				const completeTokens = marked.lexer(incomplete + '\n	```');
+				const completeTokens = marked.marked.lexer(incomplete + '\n	```');
 				assert.deepStrictEqual(newTokens, completeTokens);
 			});
 
@@ -658,7 +580,7 @@ const y = 2;
 - text
 	newline for some reason
 `;
-				const tokens = marked.lexer(list);
+				const tokens = marked.marked.lexer(list);
 				const newTokens = fillInIncompleteTokens(tokens);
 
 				assert.deepStrictEqual(newTokens, tokens);
@@ -670,7 +592,7 @@ const y = 2;
 2. text
 	newline for some reason
 `;
-				const tokens = marked.lexer(list);
+				const tokens = marked.marked.lexer(list);
 				const newTokens = fillInIncompleteTokens(tokens);
 
 				assert.deepStrictEqual(newTokens, tokens);
@@ -678,7 +600,7 @@ const y = 2;
 
 			test('list with stuff', () => {
 				const list = `- list item one \`codespan\` **bold** [link](http://microsoft.com) more text`;
-				const tokens = marked.lexer(list);
+				const tokens = marked.marked.lexer(list);
 				const newTokens = fillInIncompleteTokens(tokens);
 
 				assert.deepStrictEqual(newTokens, tokens);
@@ -687,70 +609,70 @@ const y = 2;
 			test('list with incomplete link text', () => {
 				const incomplete = `- list item one
 - item two [link`;
-				const tokens = marked.lexer(incomplete);
+				const tokens = marked.marked.lexer(incomplete);
 				const newTokens = fillInIncompleteTokens(tokens);
 
-				const completeTokens = marked.lexer(incomplete + '](https://microsoft.com)');
+				const completeTokens = marked.marked.lexer(incomplete + '](https://microsoft.com)');
 				assert.deepStrictEqual(newTokens, completeTokens);
 			});
 
 			test('list with incomplete link target', () => {
 				const incomplete = `- list item one
 - item two [link](`;
-				const tokens = marked.lexer(incomplete);
+				const tokens = marked.marked.lexer(incomplete);
 				const newTokens = fillInIncompleteTokens(tokens);
 
-				const completeTokens = marked.lexer(incomplete + ')');
+				const completeTokens = marked.marked.lexer(incomplete + ')');
 				assert.deepStrictEqual(newTokens, completeTokens);
 			});
 
 			test('ordered list with incomplete link target', () => {
 				const incomplete = `1. list item one
 2. item two [link](`;
-				const tokens = marked.lexer(incomplete);
+				const tokens = marked.marked.lexer(incomplete);
 				const newTokens = fillInIncompleteTokens(tokens);
 
-				const completeTokens = marked.lexer(incomplete + ')');
+				const completeTokens = marked.marked.lexer(incomplete + ')');
 				assert.deepStrictEqual(newTokens, completeTokens);
 			});
 
 			test('ordered list with extra whitespace', () => {
 				const incomplete = `1. list item one
 2. item two [link](`;
-				const tokens = marked.lexer(incomplete);
+				const tokens = marked.marked.lexer(incomplete);
 				const newTokens = fillInIncompleteTokens(tokens);
 
-				const completeTokens = marked.lexer(incomplete + ')');
+				const completeTokens = marked.marked.lexer(incomplete + ')');
 				assert.deepStrictEqual(newTokens, completeTokens);
 			});
 
 			test('list with extra whitespace', () => {
 				const incomplete = `- list item one
 - item two [link](`;
-				const tokens = marked.lexer(incomplete);
+				const tokens = marked.marked.lexer(incomplete);
 				const newTokens = fillInIncompleteTokens(tokens);
 
-				const completeTokens = marked.lexer(incomplete + ')');
+				const completeTokens = marked.marked.lexer(incomplete + ')');
 				assert.deepStrictEqual(newTokens, completeTokens);
 			});
 
 			test('list with incomplete link with other stuff', () => {
 				const incomplete = `- list item one
 - item two [\`link`;
-				const tokens = marked.lexer(incomplete);
+				const tokens = marked.marked.lexer(incomplete);
 				const newTokens = fillInIncompleteTokens(tokens);
 
-				const completeTokens = marked.lexer(incomplete + '\`](https://microsoft.com)');
+				const completeTokens = marked.marked.lexer(incomplete + '\`](https://microsoft.com)');
 				assert.deepStrictEqual(newTokens, completeTokens);
 			});
 
 			test('ordered list with incomplete link with other stuff', () => {
 				const incomplete = `1. list item one
 1. item two [\`link`;
-				const tokens = marked.lexer(incomplete);
+				const tokens = marked.marked.lexer(incomplete);
 				const newTokens = fillInIncompleteTokens(tokens);
 
-				const completeTokens = marked.lexer(incomplete + '\`](https://microsoft.com)');
+				const completeTokens = marked.marked.lexer(incomplete + '\`](https://microsoft.com)');
 				assert.deepStrictEqual(newTokens, completeTokens);
 			});
 		});
@@ -760,19 +682,19 @@ const y = 2;
 
 			test(`backtick between letters`, () => {
 				const text = 'a`b';
-				const tokens = marked.lexer(text);
+				const tokens = marked.marked.lexer(text);
 				const newTokens = fillInIncompleteTokens(tokens);
 
-				const completeCodespanTokens = marked.lexer(text + '`');
+				const completeCodespanTokens = marked.marked.lexer(text + '`');
 				assert.deepStrictEqual(newTokens, completeCodespanTokens);
 			});
 
 			test(`nested pattern`, () => {
 				const text = 'sldkfjsd `abc __def__ ghi';
-				const tokens = marked.lexer(text);
+				const tokens = marked.marked.lexer(text);
 				const newTokens = fillInIncompleteTokens(tokens);
 
-				const completeTokens = marked.lexer(text + '`');
+				const completeTokens = marked.marked.lexer(text + '`');
 				assert.deepStrictEqual(newTokens, completeTokens);
 			});
 		});
@@ -782,19 +704,19 @@ const y = 2;
 
 			test(`star between letters`, () => {
 				const text = 'sldkfjsd a*b';
-				const tokens = marked.lexer(text);
+				const tokens = marked.marked.lexer(text);
 				const newTokens = fillInIncompleteTokens(tokens);
 
-				const completeTokens = marked.lexer(text + '*');
+				const completeTokens = marked.marked.lexer(text + '*');
 				assert.deepStrictEqual(newTokens, completeTokens);
 			});
 
 			test(`nested pattern`, () => {
 				const text = 'sldkfjsd *abc __def__ ghi';
-				const tokens = marked.lexer(text);
+				const tokens = marked.marked.lexer(text);
 				const newTokens = fillInIncompleteTokens(tokens);
 
-				const completeTokens = marked.lexer(text + '*');
+				const completeTokens = marked.marked.lexer(text + '*');
 				assert.deepStrictEqual(newTokens, completeTokens);
 			});
 		});
@@ -804,10 +726,10 @@ const y = 2;
 
 			test(`double star between letters`, () => {
 				const text = 'a**b';
-				const tokens = marked.lexer(text);
+				const tokens = marked.marked.lexer(text);
 				const newTokens = fillInIncompleteTokens(tokens);
 
-				const completeTokens = marked.lexer(text + '**');
+				const completeTokens = marked.marked.lexer(text + '**');
 				assert.deepStrictEqual(newTokens, completeTokens);
 			});
 		});
@@ -817,7 +739,7 @@ const y = 2;
 
 			test(`underscore between letters`, () => {
 				const text = `this_not_italics`;
-				const tokens = marked.lexer(text);
+				const tokens = marked.marked.lexer(text);
 				const newTokens = fillInIncompleteTokens(tokens);
 
 				assert.deepStrictEqual(newTokens, tokens);
@@ -829,7 +751,7 @@ const y = 2;
 
 			test(`double underscore between letters`, () => {
 				const text = `this__not__bold`;
-				const tokens = marked.lexer(text);
+				const tokens = marked.marked.lexer(text);
 				const newTokens = fillInIncompleteTokens(tokens);
 
 				assert.deepStrictEqual(newTokens, tokens);
@@ -839,115 +761,115 @@ const y = 2;
 		suite('link', () => {
 			test('incomplete link text', () => {
 				const incomplete = 'abc [text';
-				const tokens = marked.lexer(incomplete);
+				const tokens = marked.marked.lexer(incomplete);
 				const newTokens = fillInIncompleteTokens(tokens);
 
-				const completeTokens = marked.lexer(incomplete + '](https://microsoft.com)');
+				const completeTokens = marked.marked.lexer(incomplete + '](https://microsoft.com)');
 				assert.deepStrictEqual(newTokens, completeTokens);
 			});
 
 			test('incomplete link target', () => {
 				const incomplete = 'foo [text](http://microsoft';
-				const tokens = marked.lexer(incomplete);
+				const tokens = marked.marked.lexer(incomplete);
 				const newTokens = fillInIncompleteTokens(tokens);
 
-				const completeTokens = marked.lexer(incomplete + ')');
+				const completeTokens = marked.marked.lexer(incomplete + ')');
 				assert.deepStrictEqual(newTokens, completeTokens);
 			});
 
 			test('incomplete link target 2', () => {
 				const incomplete = 'foo [text](http://microsoft.com';
-				const tokens = marked.lexer(incomplete);
+				const tokens = marked.marked.lexer(incomplete);
 				const newTokens = fillInIncompleteTokens(tokens);
 
-				const completeTokens = marked.lexer(incomplete + ')');
+				const completeTokens = marked.marked.lexer(incomplete + ')');
 				assert.deepStrictEqual(newTokens, completeTokens);
 			});
 
 			test('incomplete link target with extra stuff', () => {
 				const incomplete = '[before `text` after](http://microsoft.com';
-				const tokens = marked.lexer(incomplete);
+				const tokens = marked.marked.lexer(incomplete);
 				const newTokens = fillInIncompleteTokens(tokens);
 
-				const completeTokens = marked.lexer(incomplete + ')');
+				const completeTokens = marked.marked.lexer(incomplete + ')');
 				assert.deepStrictEqual(newTokens, completeTokens);
 			});
 
 			test('incomplete link target with extra stuff and incomplete arg', () => {
 				const incomplete = '[before `text` after](http://microsoft.com "more text ';
-				const tokens = marked.lexer(incomplete);
+				const tokens = marked.marked.lexer(incomplete);
 				const newTokens = fillInIncompleteTokens(tokens);
 
-				const completeTokens = marked.lexer(incomplete + '")');
+				const completeTokens = marked.marked.lexer(incomplete + '")');
 				assert.deepStrictEqual(newTokens, completeTokens);
 			});
 
 			test('incomplete link target with incomplete arg', () => {
 				const incomplete = 'foo [text](http://microsoft.com "more text here ';
-				const tokens = marked.lexer(incomplete);
+				const tokens = marked.marked.lexer(incomplete);
 				const newTokens = fillInIncompleteTokens(tokens);
 
-				const completeTokens = marked.lexer(incomplete + '")');
+				const completeTokens = marked.marked.lexer(incomplete + '")');
 				assert.deepStrictEqual(newTokens, completeTokens);
 			});
 
 			test('incomplete link target with incomplete arg 2', () => {
 				const incomplete = '[text](command:_github.copilot.openRelativePath "arg';
-				const tokens = marked.lexer(incomplete);
+				const tokens = marked.marked.lexer(incomplete);
 				const newTokens = fillInIncompleteTokens(tokens);
 
-				const completeTokens = marked.lexer(incomplete + '")');
+				const completeTokens = marked.marked.lexer(incomplete + '")');
 				assert.deepStrictEqual(newTokens, completeTokens);
 			});
 
 			test('incomplete link target with complete arg', () => {
 				const incomplete = 'foo [text](http://microsoft.com "more text here"';
-				const tokens = marked.lexer(incomplete);
+				const tokens = marked.marked.lexer(incomplete);
 				const newTokens = fillInIncompleteTokens(tokens);
 
-				const completeTokens = marked.lexer(incomplete + ')');
+				const completeTokens = marked.marked.lexer(incomplete + ')');
 				assert.deepStrictEqual(newTokens, completeTokens);
 			});
 
 			test('link text with incomplete codespan', () => {
 				const incomplete = `text [\`codespan`;
-				const tokens = marked.lexer(incomplete);
+				const tokens = marked.marked.lexer(incomplete);
 				const newTokens = fillInIncompleteTokens(tokens);
 
-				const completeTokens = marked.lexer(incomplete + '`](https://microsoft.com)');
+				const completeTokens = marked.marked.lexer(incomplete + '`](https://microsoft.com)');
 				assert.deepStrictEqual(newTokens, completeTokens);
 			});
 
 			test('link text with incomplete stuff', () => {
 				const incomplete = `text [more text \`codespan\` text **bold`;
-				const tokens = marked.lexer(incomplete);
+				const tokens = marked.marked.lexer(incomplete);
 				const newTokens = fillInIncompleteTokens(tokens);
 
-				const completeTokens = marked.lexer(incomplete + '**](https://microsoft.com)');
+				const completeTokens = marked.marked.lexer(incomplete + '**](https://microsoft.com)');
 				assert.deepStrictEqual(newTokens, completeTokens);
 			});
 
 			test('Looks like incomplete link target but isn\'t', () => {
 				const complete = '**bold** `codespan` text](';
-				const tokens = marked.lexer(complete);
+				const tokens = marked.marked.lexer(complete);
 				const newTokens = fillInIncompleteTokens(tokens);
 
-				const completeTokens = marked.lexer(complete);
+				const completeTokens = marked.marked.lexer(complete);
 				assert.deepStrictEqual(newTokens, completeTokens);
 			});
 
 			test.skip('incomplete link in list', () => {
 				const incomplete = '- [text';
-				const tokens = marked.lexer(incomplete);
+				const tokens = marked.marked.lexer(incomplete);
 				const newTokens = fillInIncompleteTokens(tokens);
 
-				const completeTokens = marked.lexer(incomplete + '](https://microsoft.com)');
+				const completeTokens = marked.marked.lexer(incomplete + '](https://microsoft.com)');
 				assert.deepStrictEqual(newTokens, completeTokens);
 			});
 
 			test('square brace between letters', () => {
 				const incomplete = 'a[b';
-				const tokens = marked.lexer(incomplete);
+				const tokens = marked.marked.lexer(incomplete);
 				const newTokens = fillInIncompleteTokens(tokens);
 
 				assert.deepStrictEqual(newTokens, tokens);
@@ -955,7 +877,7 @@ const y = 2;
 
 			test('square brace on previous line', () => {
 				const incomplete = 'text[\nmore text';
-				const tokens = marked.lexer(incomplete);
+				const tokens = marked.marked.lexer(incomplete);
 				const newTokens = fillInIncompleteTokens(tokens);
 
 				assert.deepStrictEqual(newTokens, tokens);
@@ -963,7 +885,7 @@ const y = 2;
 
 			test('complete link', () => {
 				const incomplete = 'text [link](http://microsoft.com)';
-				const tokens = marked.lexer(incomplete);
+				const tokens = marked.marked.lexer(incomplete);
 				const newTokens = fillInIncompleteTokens(tokens);
 
 				assert.deepStrictEqual(newTokens, tokens);
diff --git a/src/vs/base/test/common/date.test.ts b/src/vs/base/test/common/date.test.ts
index 2a140e87747..1e8809c2e65 100644
--- a/src/vs/base/test/common/date.test.ts
+++ b/src/vs/base/test/common/date.test.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { strictEqual } from 'assert';
-import { fromNow, getDurationString } from 'vs/base/common/date';
+import { fromNow, fromNowByDay, getDurationString } from 'vs/base/common/date';
 import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
 
 suite('Date', () => {
@@ -28,6 +28,23 @@ suite('Date', () => {
 		});
 	});
 
+	suite('fromNowByDay', () => {
+		test('today', () => {
+			const now = new Date();
+			strictEqual(fromNowByDay(now), 'Today');
+		});
+		test('yesterday', () => {
+			const yesterday = new Date();
+			yesterday.setDate(yesterday.getDate() - 1);
+			strictEqual(fromNowByDay(yesterday), 'Yesterday');
+		});
+		test('daysAgo', () => {
+			const daysAgo = new Date();
+			daysAgo.setDate(daysAgo.getDate() - 5);
+			strictEqual(fromNowByDay(daysAgo, true), '5 days ago');
+		});
+	});
+
 	suite('getDurationString', () => {
 		test('basic', () => {
 			strictEqual(getDurationString(1), '1ms');
diff --git a/src/vs/base/test/common/observable.test.ts b/src/vs/base/test/common/observable.test.ts
index 62c7579be12..2cfbc025f88 100644
--- a/src/vs/base/test/common/observable.test.ts
+++ b/src/vs/base/test/common/observable.test.ts
@@ -1125,6 +1125,31 @@ suite('observables', () => {
 		]);
 	});
 
+	test('bug: Event.fromObservable always should get events', () => {
+		const emitter = new Emitter();
+		const log = new Log();
+		let i = 0;
+		const obs = observableFromEvent(emitter.event, () => i);
+
+		i++;
+		emitter.fire(1);
+
+		const evt2 = Event.fromObservable(obs);
+		const d = evt2(e => {
+			log.log(`event fired ${e}`);
+		});
+
+		i++;
+		emitter.fire(2);
+		assert.deepStrictEqual(log.getAndClearEntries(), ["event fired 2"]);
+
+		i++;
+		emitter.fire(3);
+		assert.deepStrictEqual(log.getAndClearEntries(), ["event fired 3"]);
+
+		d.dispose();
+	});
+
 	test('dont run autorun after dispose', () => {
 		const log = new Log();
 		const myObservable = new LoggingObservableValue('myObservable', 0, log);
diff --git a/src/vs/base/worker/workerMain.ts b/src/vs/base/worker/workerMain.ts
index 35c685ff771..cb50be48b53 100644
--- a/src/vs/base/worker/workerMain.ts
+++ b/src/vs/base/worker/workerMain.ts
@@ -13,6 +13,7 @@
 		): undefined | Pick<TrustedTypePolicy<Options>, 'name' | Extract<keyof Options, keyof TrustedTypePolicyOptions>>;
 	}
 	const monacoEnvironment: IMonacoEnvironment | undefined = (globalThis as any).MonacoEnvironment;
+
 	const monacoBaseUrl = monacoEnvironment && monacoEnvironment.baseUrl ? monacoEnvironment.baseUrl : '../../../';
 
 	function createTrustedTypesPolicy<Options extends TrustedTypePolicyOptions>(
@@ -111,23 +112,43 @@
 		});
 	}
 
-	function loadCode(moduleId: string) {
-		loadAMDLoader().then(() => {
+	function loadCode(moduleId: string): Promise<SimpleWorkerModule> {
+		// ESM-uncomment-begin
+		// if (typeof loadAMDLoader === 'function') { /* fixes unused import, remove me */}
+		// const moduleUrl = new URL(`${moduleId}.js`, globalThis._VSCODE_FILE_ROOT);
+		// return import(moduleUrl.href);
+		// ESM-uncomment-end
+
+		// ESM-comment-begin
+		return loadAMDLoader().then(() => {
 			configureAMDLoader();
-			require([moduleId], function (ws) {
-				setTimeout(function () {
-					const messageHandler = ws.create((msg: any, transfer?: Transferable[]) => {
-						(<any>globalThis).postMessage(msg, transfer);
-					}, null);
-
-					globalThis.onmessage = (e: MessageEvent) => messageHandler.onmessage(e.data, e.ports);
-					while (beforeReadyMessages.length > 0) {
-						const e = beforeReadyMessages.shift()!;
-						messageHandler.onmessage(e.data, e.ports);
-					}
-				}, 0);
+			return new Promise<SimpleWorkerModule>((resolve, reject) => {
+				require([moduleId], resolve, reject);
 			});
 		});
+		// ESM-comment-end
+	}
+
+	interface MessageHandler {
+		onmessage(msg: any, ports: readonly MessagePort[]): void;
+	}
+
+	// shape of vs/base/common/worker/simpleWorker.ts
+	interface SimpleWorkerModule {
+		create(postMessage: (msg: any, transfer?: Transferable[]) => void): MessageHandler;
+	}
+
+	function setupWorkerServer(ws: SimpleWorkerModule) {
+		setTimeout(function () {
+			const messageHandler = ws.create((msg: any, transfer?: Transferable[]) => {
+				(<any>globalThis).postMessage(msg, transfer);
+			});
+
+			self.onmessage = (e: MessageEvent) => messageHandler.onmessage(e.data, e.ports);
+			while (beforeReadyMessages.length > 0) {
+				self.onmessage(beforeReadyMessages.shift()!);
+			}
+		}, 0);
 	}
 
 	// If the loader is already defined, configure it immediately
@@ -146,6 +167,10 @@
 		}
 
 		isFirstMessage = false;
-		loadCode(message.data);
+		loadCode(message.data).then((ws) => {
+			setupWorkerServer(ws);
+		}, (err) => {
+			console.error(err);
+		});
 	};
 })();
diff --git a/src/vs/code/browser/workbench/constants.ts b/src/vs/code/browser/workbench/constants.ts
new file mode 100644
index 00000000000..40f955cd194
--- /dev/null
+++ b/src/vs/code/browser/workbench/constants.ts
@@ -0,0 +1,4 @@
+/* eslint-disable header/header */
+
+// port tokens for generating secure URLs
+export const kPortToken = process.env.RS_PORT_TOKEN !== undefined ? process.env.RS_PORT_TOKEN : '';
diff --git a/src/vs/code/browser/workbench/rsLoginCheck.js b/src/vs/code/browser/workbench/rsLoginCheck.js
new file mode 100644
index 00000000000..ef09ec7f5ed
--- /dev/null
+++ b/src/vs/code/browser/workbench/rsLoginCheck.js
@@ -0,0 +1,381 @@
+/* eslint-disable header/header */
+
+/* eslint-disable no-var */
+var sCheckInProgress = false;
+var sDialogVisible = false;
+var sLastSessionStatus = null;
+var sLoggedOut = false;
+var sCSRFToken = null;
+var dbDeleteInProgress = false;
+var dbDeleteComplete = false;
+const PWB_OPEN_CONNECTION_KEY = 'pwb-connections';
+const PWB_CHANGED_CONNECTION_KEY = 'pwb-changed-connections';
+const oldConnections = new Set();
+const inProgressDBs = new Set();
+
+function rs_openLoginTab() {
+	window.open(rs_getWorkbenchPrefix() + '/', 'rs_login');
+}
+
+function rs_navigateToWorkbench() {
+	window.location.assign(rs_getWorkbenchPrefix() + '/');
+}
+
+function rs_showLoggedOutDialog() {
+	sLoggedOut = true;
+	rs_showSessionDialog('Posit Workbench Login Required', 'Login expired or signed out from another window.<br>Select "Login" for a new login tab. Return here to resume session.', 'Login', rs_openLoginTab);
+}
+
+function rs_showSessionExitDialog(sessionStatus) {
+	rs_showSessionDialog('Posit Workbench Session Exited', 'Session status: ' + sessionStatus, 'Return to Posit Workbench', rs_navigateToWorkbench);
+}
+
+function rs_hideSessionDialog() {
+	if (!sDialogVisible) {
+		return;
+	}
+
+	var dialogElem = document.getElementById('rs_session_dialog');
+	if (dialogElem !== null) {
+		dialogElem.parentNode.removeChild(dialogElem);
+	}
+	sDialogVisible = false;
+}
+
+function rs_showSessionDialog(hdr, msg, actionName, actionFunc) {
+	if (sDialogVisible) {
+		return;
+	}
+
+	var div = document.createElement('div');
+	div.setAttribute('id', 'rs_session_dialog');
+	div.style.cssText = 'position:fixed;width:100%;height:100%;left:0;top:0;z-index:3000;background:rgba(0,0,0,0.5);display:flex;justify-content:center;align-items:center;font-family:Lato, sans-serif;';
+	div.innerHTML = `<div style='width: 75%; height: 20%; background: rgba(257,258,259,1.0); color: #000; border: 5px solid #ffffff; text-align: center;  padding-top: 2.5%'>
+		<style type='text/css'>.rs-button { cursor: pointer; border-radius: 4px; border: 0; background-color: #4c83b6; color: #f7f8f9; font-size: 135%; padding-left: 10px; padding-right: 10px; height: 30px; verticle-align: middle; }</style>
+		<p style='color:#4c83b6; font-size: 180%;'>${hdr}</p><p style='font-size: 130%; font-weight: regular'>${msg}</p>
+		<button id='rs_action_button' class='rs-button'>${actionName}</button>&nbsp;
+		<button id='rs_dismiss_button' class='rs-button'>Dismiss</button>;
+	</div>`;
+	document.body.appendChild(div);
+	var actionButton = document.getElementById('rs_action_button');
+	actionButton.addEventListener('click', actionFunc);
+	var dismissButton = document.getElementById('rs_dismiss_button');
+	dismissButton.addEventListener('click', rs_hideSessionDialog);
+	sDialogVisible = true;
+}
+
+function rs_getWorkbenchPrefix() {
+	var path = window.location.pathname;
+	// look for prefix, e.g. /rstudio inserted by a proxy server
+	var prefixEnd = path.indexOf("/s/");
+	if (prefixEnd > 0) {
+		return path.substring(0, prefixEnd);
+	}
+	return "";
+}
+
+function rs_checkConnectionRequest() {
+	var xhr = new XMLHttpRequest();
+
+	xhr.onreadystatechange = function () {
+		if (xhr.readyState === 4) {
+			sCheckInProgress = false;
+			if (xhr.status === 200) {
+				var res = JSON.parse(xhr.responseText);
+				if (res.result) {
+					if (sLastSessionStatus !== res.status || sLoggedOut) {
+						sLoggedOut = false;
+						rs_hideSessionDialog();
+						if (res.status !== 'Running') {
+							rs_showSessionExitDialog(res.status);
+							checkIndexedDB();
+						}
+						sLastSessionStatus = res.status;
+					}
+				}
+				else {
+					if (sLastSessionStatus !== 'Quit' || sLoggedOut) {
+						rs_hideSessionDialog();
+						// No job was found for the session so displaying quit
+						rs_showSessionExitDialog('Quit');
+						checkIndexedDB();
+					}
+					sLoggedOut = false;
+					sLastSessionStatus = 'Quit';
+				}
+			}
+			else if (xhr.status === 401) {
+				rs_showLoggedOutDialog();
+				clearVSCodeDb();
+			}
+			else {
+				console.log(`Connection check status not ok: ${xhr.status}: ${xhr.statusText}:\n${xhr.responseText}`);
+			}
+		}
+	};
+
+	var url = '/job_launcher_rpc/session_status';
+	var path = window.location.pathname;
+	// look for prefix, e.g. /rstudio inserted by a proxy server
+	var prefixEnd = path.indexOf("/s/");
+	if (prefixEnd > 0) {
+		var prefix = prefixEnd == 0 ? "" : path.substring(0, prefixEnd);
+		path = path.substring(prefixEnd);
+		url = prefix + url;
+	}
+	else if (prefixEnd == -1)
+		console.error("Unrecognized workbench vscode session path: " + path);
+
+	sCheckInProgress = true;
+	xhr.open('POST', url, true);
+	xhr.setRequestHeader('Content-Type', 'application/json;charset=UTF-8');
+	xhr.setRequestHeader('X-RS-CSRF-Token', sCSRFToken);
+	var sessionId = path.substring(path.length - 9);
+	sessionId = sessionId.substring(0, sessionId.length - 1);
+
+	var jsonBody = JSON.stringify({ 'method': 'session_status', 'params': [sessionId] });
+	xhr.send(jsonBody);
+}
+
+async function clearIndexedDB(name) {
+	return new Promise((resolve, reject) => {
+		// We don't know if we've actually lost data here because databases remain on the in progress list
+		// after their state has been saved and while rserver is processing it
+		if (inProgressDBs.has(name)) {
+			console.warn(`Clearing a database that is currently being saved: ${name}. This may result in state loss.`);
+		}
+
+		const request = indexedDB.open(name);
+		request.onsuccess = function () {
+			const db = request.result;
+			if (!db.objectStoreNames) {
+				resolve();
+				return;
+			}
+			const objectStoreNames = db.objectStoreNames;
+			for (let i = 0; i < objectStoreNames.length; i++) {
+				const objectStoreName = objectStoreNames[i];
+				const objectStore = db.transaction([objectStoreName], 'readwrite').objectStore(objectStoreName);
+				objectStore.clear();
+			}
+			resolve();
+		};
+		request.onerror = function (event) {
+			console.error('Error clearing IndexedDB: ', event);
+			reject();
+		};
+	});
+}
+
+async function clearVSCodeDb() {
+	if (dbDeleteInProgress || dbDeleteComplete) { return; }
+	dbDeleteInProgress = true;
+	try {
+		await checkIndexedDB();
+
+		const openConnections = getConnections(PWB_OPEN_CONNECTION_KEY);
+		const allDBs = new Set([...openConnections, ...oldConnections]);
+
+		const databases = (await indexedDB.databases()).filter(db => db.name && allDBs.has(db.name));
+		const promises = [];
+		for (const db of databases) {
+			promises.push(clearIndexedDB(db.name));
+		}
+		await Promise.allSettled(promises);
+		dbDeleteComplete = true;
+	} catch (error) {
+		console.error('Error accessing IndexedDB: ', error);
+	}
+	dbDeleteInProgress = false;
+}
+
+function rs_initTimer() {
+	// call setTimeout recursively because setInterval has the potential
+	// to stack up calls if the function takes longer than the interval
+	(function loop() {
+		rs_checkConnectionRequest();
+		setTimeout(() => {
+			loop();
+		}, 5000);
+	})();
+}
+
+async function rs_initAsyncTimer() {
+	(async function loop() {
+		if (sLastSessionStatus !== 'Quit' && !sLoggedOut && !dbDeleteInProgress) {
+			await checkIndexedDB();
+		}
+		setTimeout(() => {
+			loop();
+		}, 300000);
+	})();
+}
+
+function rs_loginCheckInit() {
+	var xhr = new XMLHttpRequest();
+	var path = window.location.pathname;
+	var url = rs_getWorkbenchPrefix() + '/';
+
+	xhr.onreadystatechange = function () {
+		if (xhr.readyState === 4) {
+			if (xhr.status === 200) {
+				var txt = xhr.responseText;
+				var pattern = '<meta name="rs-csrf-token" content=';
+				var ix = txt.indexOf(pattern);
+				if (ix === -1) {
+					console.log('Pattern not found for csrf token');
+				} else {
+					var startIx = ix + pattern.length + 1;
+					var endIx = txt.indexOf('"', startIx);
+					if (endIx === -1) {
+						console.log('End of pattern not found for csrf token in: ' + pattern + ' at: ' + startIx);
+					} else {
+						sCSRFToken = txt.substring(startIx, endIx);
+						rs_initTimer();
+						rs_initAsyncTimer();
+					}
+				}
+			}
+			else {
+				console.log('Error response from workspaces request for csrf token: ' + xhr.status + ': ' + xhr.responseText);
+			}
+		}
+	};
+	xhr.open('GET', url, true);
+	xhr.send();
+}
+
+function getConnections(key) {
+	const connectionString = sessionStorage.getItem(key);
+	if (connectionString) {
+		return new Set(JSON.parse(connectionString));
+	}
+	return new Set();
+}
+
+function pwbRemoveFromSessionSet(dbName, key) {
+	const connectionSet = getConnections(key);
+	if (connectionSet.delete(dbName)) {
+		sessionStorage.setItem(key, JSON.stringify(Array.from(connectionSet)));
+	}
+}
+
+function sendVSCodeSessionState(dbName, content) {
+	const xhr = new XMLHttpRequest();
+	xhr.open('POST', rs_getWorkbenchPrefix() + '/storage/vscode_session_state', true);
+	xhr.setRequestHeader('Content-Type', 'application/json;charset=UTF-8');
+	xhr.setRequestHeader('X-RS-CSRF-Token', sCSRFToken);
+	xhr.onreadystatechange = function () {
+		if (xhr.readyState === 4) {
+			if (xhr.status === 200) {
+				inProgressDBs.delete(dbName);
+				if (!getConnections(PWB_OPEN_CONNECTION_KEY).has(dbName) && !getConnections(PWB_CHANGED_CONNECTION_KEY).has(dbName)) {
+					oldConnections.add(dbName);
+				}
+			}
+		}
+	};
+	xhr.onerror = function (error) {
+		console.error('Error saving state content to server: ', error.getMessage());
+	};
+	xhr.send(JSON.stringify({ 'method': 'vscode_session_state', 'params': [dbName, JSON.stringify(content)] }));
+}
+
+async function checkIndexedDB() {
+	if (localStorage.getItem('clear-vscode-db-on-logout') !== 'true') {
+		return;
+	}
+	try {
+		const changedConnections = getConnections(PWB_CHANGED_CONNECTION_KEY);
+		const databases = (await indexedDB.databases()).filter(db => db.name && changedConnections.has(db.name));
+		for (const db of databases) {
+
+			// don't await here, we want to check all DBs in parallel
+			// and any failures will be picked up next time around
+			getDatabaseContents(db.name).then((content) => {
+				if (content && dbDeleteComplete) {
+					dbDeleteComplete = false;
+				}
+				// as soon as we have the DB content, remove it from the changed list to minimize the risk of code server adding it
+				// back to the change list before we've saved these changes
+				pwbRemoveFromSessionSet(db.name, PWB_CHANGED_CONNECTION_KEY);
+				inProgressDBs.add(db.name);
+				sendVSCodeSessionState(db.name, content);
+			});
+		}
+	} catch (error) {
+		console.error('Error accessing IndexedDB: ', error);
+	}
+}
+
+function getDatabaseContents(dbName) {
+	const request = indexedDB.open(dbName);
+	return new Promise((resolve, reject) => {
+		request.onsuccess = () => {
+			const db = request.result;
+			if (!db.objectStoreNames || db.objectStoreNames.length === 0) {
+				resolve([0, {}]);
+				return;
+			}
+			const transaction = db.transaction(db.objectStoreNames, 'readonly');
+			const dbMap = new Map();
+
+			let completedStores = 0;
+			for (const storeName of db.objectStoreNames) {
+				const objectStore = transaction.objectStore(storeName);
+				const cursor = objectStore.openCursor();
+				if (!cursor) { // This means the store is empty
+					continue;
+				}
+
+				// Iterate over the rows of the store
+				const rows = new Map();
+				cursor.onsuccess = () => {
+					if (cursor.result) {
+						rows.set(cursor.result.key.toString(), JSON.stringify(cursor.result.value));
+						cursor.result.continue();
+					} else {
+						completedStores++;
+						if (rows.size !== 0) {
+							dbMap.set(storeName, JSON.stringify(Object.fromEntries(rows)));
+						}
+						// only resolve after iterating through all stores
+						if (completedStores === db.objectStoreNames.length) {
+							resolve(Object.fromEntries(dbMap));
+						}
+					}
+				};
+				cursor.onerror = () => {
+					console.error(`IndexedDB cursor error for store ${storeName}: ${cursor.error} `);
+					completedStores++;
+					if (rows.size !== 0) {
+						dbMap.set(storeName, JSON.stringify(Object.fromEntries(rows)));
+					}
+					if (completedStores === db.objectStoreNames.length) {
+						resolve(Object.fromEntries(dbMap));
+					}
+				};
+			}
+			transaction.onerror = () => {
+				db.close();
+				reject(`IndexedDB transaction error for database ${db.name}: ${transaction.error} `);
+			};
+			transaction.oncomplete = () => {
+				db.close();
+			};
+		};
+
+		request.onblocked = (event) => {
+			reject(event);
+		};
+
+		request.onerror = (event) => {
+			reject(event);
+			const db = request.result;
+			db.close();
+		};
+	});
+}
+
+
+rs_loginCheckInit();
diff --git a/src/vs/code/browser/workbench/urlPorts.ts b/src/vs/code/browser/workbench/urlPorts.ts
new file mode 100644
index 00000000000..6181b793502
--- /dev/null
+++ b/src/vs/code/browser/workbench/urlPorts.ts
@@ -0,0 +1,72 @@
+/* eslint-disable header/header */
+/* This code mimicks rstudio-pro server_core/UriPorts to generate port tokens and obscure ports.
+ * Any functionality changes need to be accounted for there. Logic regarding 'server ports' has
+ * been removed as requests coming from this extension are always 'session ports'.
+ *
+ * Port transformation is done in order to obscure port values in portmapped URLs. This improves
+ * privacy, and makes it more difficult to try to connect to a local service as someone else. The
+ * process works as follows:
+ *
+ * 1. When a proxy is requested for a local server, a port token is generated with 6 random bytes.
+ *    The first two form the multiplier, and the last four are the key.
+ *
+ *    e.g. port-token=a433e59dc087 => multiplier a433, key e59dc087
+ *
+ * 2. To build an obscured port (for constructing a URL), the 6 bytes of the token are mixed with
+ *    the 2 byte port value to create an obscured 4-byte port value, as follows:
+ *
+ *    a. The port number is sent through a modular multiplicative inverse. This doesn't add any
+ *       security; it just obscures common ports in 2-byte space.
+ *
+ *    b. The 2-byte value is multiplied by the 2-byte multiplier to get a 4-byte value.
+ *
+ *    c. The 4 byte value is XOR'ed with the key to form the final 4-byte obscured value.
+ *
+ *    d. A URL is formed using a hex-encoded version of the value and the port token
+ *
+ *     e.g. /p/58fab3e4a433e59dc087
+ *
+ * 3. When processing portmapped URLs, the value from the port-token cookie is used to run the
+ *    algorithm above in reverse to recover the raw port value.
+ *
+ * Note that this system is NOT CRYPTOGRAPHICALLY SECURE; in particular, if it's possible to observe
+ * many obscured values from the same session, information about that session's token can be
+ * inferred. This system is designed only to prevent casual attempts to abuse portmapped URLs by
+ * making them user-specific and difficult to predict without prior knowledge. Any web service
+ * running on the same host as Posit Workbench should implement best practices for cross-site request
+ * forgery (CSRF).
+ */
+
+interface SplitToken {
+	multiplier: bigint;
+	key: bigint;
+}
+
+function obscurePort(x: bigint): bigint {
+	return (x * BigInt(8854)) % BigInt(65535);
+}
+
+function splitToken(token: string): SplitToken | undefined {
+	try {
+		// split the token into the multiplier and the key
+		const multiplier = parseInt(token.slice(0, 4), 16);
+		const key = parseInt(token.slice(4), 16);
+		return {
+			multiplier: BigInt(multiplier),
+			key: BigInt(key),
+		};
+	} catch {
+	}
+	return undefined;
+}
+
+export function transformPort(token: string, port: number): string | undefined {
+	const tokenData = splitToken(token);
+	if (tokenData) {
+		const result: bigint = (obscurePort(BigInt(port)) * tokenData.multiplier) ^ tokenData.key;
+		// Mangled ports are always 8 characters - if the number is shorter than that, we need to pad
+		// the start with 0s.
+		return result.toString(16).padStart(8, '0');
+	}
+	return undefined;
+}
diff --git a/src/vs/code/browser/workbench/workbench-dev.esm.html b/src/vs/code/browser/workbench/workbench-dev.esm.html
new file mode 100644
index 00000000000..140030d8abe
--- /dev/null
+++ b/src/vs/code/browser/workbench/workbench-dev.esm.html
@@ -0,0 +1,67 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<!DOCTYPE html>
+<html>
+	<head>
+		<script>
+			performance.mark('code/didStartRenderer');
+		</script>
+		<meta charset="utf-8" />
+
+		<!-- Mobile tweaks -->
+		<meta name="mobile-web-app-capable" content="yes" />
+		<meta name="apple-mobile-web-app-capable" content="yes" />
+		<meta name="apple-mobile-web-app-title" content="Code">
+		<link rel="apple-touch-icon" href="{{WORKBENCH_WEB_BASE_URL}}/resources/server/code-192.png" />
+
+		<!-- Disable pinch zooming -->
+		<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no">
+
+		<!-- Workbench Configuration -->
+		<meta id="vscode-workbench-web-configuration" data-settings="{{WORKBENCH_WEB_CONFIGURATION}}">
+
+		<!-- Workbench Auth Session -->
+		<meta id="vscode-workbench-auth-session" data-settings="{{WORKBENCH_AUTH_SESSION}}">
+
+		<!-- Builtin Extensions (running out of sources) -->
+		<meta id="vscode-workbench-builtin-extensions" data-settings="{{WORKBENCH_BUILTIN_EXTENSIONS}}">
+
+		<!-- Workbench Icon/Manifest/CSS -->
+		<link rel="icon" href="{{WORKBENCH_WEB_BASE_URL}}/resources/server/favicon.ico" type="image/x-icon" />
+		<link rel="manifest" href="{{WORKBENCH_WEB_BASE_URL}}/resources/server/manifest.json" crossorigin="use-credentials" />
+		<style id="vscode-css-modules" type="text/css" media="screen"></style>
+
+	</head>
+
+	<body aria-label="">
+	</body>
+
+	<!-- Startup (do not modify order of script tags!) -->
+	<script>
+		const baseUrl = new URL('{{WORKBENCH_WEB_BASE_URL}}', window.location.origin).toString();
+		globalThis._VSCODE_FILE_ROOT = baseUrl + '/out/';
+	</script>
+	<script>
+		const sheet = document.getElementById('vscode-css-modules').sheet;
+		globalThis._VSCODE_CSS_LOAD = function (url) {
+			sheet.insertRule(`@import url(${url});`);
+		};
+
+		const importMap = { imports: {} };
+		const cssModules = JSON.parse('{{WORKBENCH_DEV_CSS_MODULES}}');
+		for (const cssModule of cssModules) {
+			const cssUrl = new URL(cssModule, globalThis._VSCODE_FILE_ROOT).href;
+			const jsSrc = `globalThis._VSCODE_CSS_LOAD('${cssUrl}');\n`;
+			const blob = new Blob([jsSrc], { type: 'application/javascript' });
+			importMap.imports[cssUrl] = URL.createObjectURL(blob);
+		}
+		const importMapElement = document.createElement('script');
+		importMapElement.type = 'importmap';
+		importMapElement.setAttribute('nonce', '1nline-m4p')
+		importMapElement.textContent = JSON.stringify(importMap, undefined, 2);
+		document.head.appendChild(importMapElement);
+	</script>
+	<script>
+		performance.mark('code/willLoadWorkbenchMain');
+	</script>
+	<script type="module" src="{{WORKBENCH_WEB_BASE_URL}}/out/vs/code/browser/workbench/workbench.js"></script>
+</html>
diff --git a/src/vs/code/browser/workbench/workbench.esm.html b/src/vs/code/browser/workbench/workbench.esm.html
new file mode 100644
index 00000000000..77881982735
--- /dev/null
+++ b/src/vs/code/browser/workbench/workbench.esm.html
@@ -0,0 +1,48 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<!DOCTYPE html>
+<html>
+	<head>
+		<script>
+			performance.mark('code/didStartRenderer');
+		</script>
+		<meta charset="utf-8" />
+
+		<!-- Mobile tweaks -->
+		<meta name="mobile-web-app-capable" content="yes" />
+		<meta name="apple-mobile-web-app-capable" content="yes" />
+		<meta name="apple-mobile-web-app-title" content="Code">
+		<link rel="apple-touch-icon" href="{{WORKBENCH_WEB_BASE_URL}}/resources/server/code-192.png" />
+
+		<!-- Disable pinch zooming -->
+		<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no">
+
+		<!-- Workbench Configuration -->
+		<meta id="vscode-workbench-web-configuration" data-settings="{{WORKBENCH_WEB_CONFIGURATION}}">
+
+		<!-- Workbench Auth Session -->
+		<meta id="vscode-workbench-auth-session" data-settings="{{WORKBENCH_AUTH_SESSION}}">
+
+		<!-- Workbench Icon/Manifest/CSS -->
+		<link rel="icon" href="{{WORKBENCH_WEB_BASE_URL}}/resources/server/favicon.ico" type="image/x-icon" />
+		<link rel="manifest" href="{{WORKBENCH_WEB_BASE_URL}}/resources/server/manifest.json" crossorigin="use-credentials" />
+		<link rel="stylesheet" href="{{WORKBENCH_WEB_BASE_URL}}/out/vs/code/browser/workbench/workbench.css">
+
+	</head>
+
+	<body aria-label="">
+	</body>
+
+	<!-- Startup (do not modify order of script tags!) -->
+	<script>
+		const baseUrl = new URL('{{WORKBENCH_WEB_BASE_URL}}', window.location.origin).toString();
+		globalThis._VSCODE_FILE_ROOT = baseUrl + '/out/';
+	</script>
+	<script>
+		performance.mark('code/willLoadWorkbenchMain');
+	</script>
+	<!-- always ensure built in english NLS messages -->
+	<script type="module" src="{{WORKBENCH_NLS_FALLBACK_URL}}"></script>
+	<!-- attempt to load NLS messages in case non-english -->
+	<script type="module" src="{{WORKBENCH_NLS_URL}}"></script>
+	<script type="module" src="{{WORKBENCH_WEB_BASE_URL}}/out/vs/code/browser/workbench/workbench.js"></script>
+</html>
diff --git a/src/vs/code/browser/workbench/workbench.html b/src/vs/code/browser/workbench/workbench.html
index db7b6475d75..1e2f0459820 100644
--- a/src/vs/code/browser/workbench/workbench.html
+++ b/src/vs/code/browser/workbench/workbench.html
@@ -40,7 +40,10 @@
 	<script>
 
 		// Packages
-		const baseUrl = new URL('{{WORKBENCH_WEB_BASE_URL}}', window.location.origin).toString();
+		// --- Start PWB ---
+		// const baseUrl = new URL('{{WORKBENCH_WEB_BASE_URL}}', window.location.origin).toString();
+		const baseUrl = new URL('{{WORKBENCH_WEB_BASE_URL}}', window.location).toString();
+		// --- End PWB ---
 		Object.keys(self.webPackagePaths).map(function (key, index) {
 			self.webPackagePaths[key] = `${baseUrl}/node_modules/${key}/${self.webPackagePaths[key]}`;
 		});
@@ -69,4 +72,5 @@
 	<script src="{{WORKBENCH_NLS_URL}}"></script>
 	<script src="{{WORKBENCH_WEB_BASE_URL}}/out/vs/workbench/workbench.web.main.js"></script>
 	<script src="{{WORKBENCH_WEB_BASE_URL}}/out/vs/code/browser/workbench/workbench.js"></script>
+	<script src="{{WORKBENCH_WEB_BASE_URL}}/out/vs/code/browser/workbench/rsLoginCheck.js"></script>
 </html>
diff --git a/src/vs/code/browser/workbench/workbench.ts b/src/vs/code/browser/workbench/workbench.ts
index 8cc2c15e621..e9e78b8ccc4 100644
--- a/src/vs/code/browser/workbench/workbench.ts
+++ b/src/vs/code/browser/workbench/workbench.ts
@@ -21,6 +21,10 @@ import type { IWorkbenchConstructionOptions, IWorkspace, IWorkspaceProvider } fr
 import { AuthenticationSessionInfo } from 'vs/workbench/services/authentication/browser/authenticationService';
 import type { IURLCallbackProvider } from 'vs/workbench/services/url/browser/urlService';
 import { create } from 'vs/workbench/workbench.web.main';
+// --- Start PWB: proxy port url ---
+import { extractLocalHostUriMetaDataForPortMapping, TunnelOptions, TunnelCreationOptions } from 'vs/platform/tunnel/common/tunnel';
+import { transformPort } from './urlPorts';
+// --- End PWB ---
 
 interface ISecretStorageCrypto {
 	seal(data: string): Promise<string>;
@@ -566,11 +570,12 @@ function readCookie(name: string): string | undefined {
 	// Find config by checking for DOM
 	const configElement = mainWindow.document.getElementById('vscode-workbench-web-configuration');
 	const configElementAttribute = configElement ? configElement.getAttribute('data-settings') : undefined;
-
 	if (!configElement || !configElementAttribute) {
 		throw new Error('Missing web configuration element');
 	}
-	const config: IWorkbenchConstructionOptions & { folderUri?: UriComponents; workspaceUri?: UriComponents; callbackRoute: string } = JSON.parse(configElementAttribute);
+	// --- Start PWB ---
+	const config: IWorkbenchConstructionOptions & { folderUri?: UriComponents; workspaceUri?: UriComponents; callbackRoute: string } = { ...JSON.parse(configElementAttribute), remoteAuthority: location.host };
+	// --- End PWB ---
 	const secretStorageKeyPath = readCookie('vscode-secret-key-path');
 	const secretStorageCrypto = secretStorageKeyPath && ServerKeyedAESCrypto.supported()
 		? new ServerKeyedAESCrypto(secretStorageKeyPath) : new TransparentCrypto();
@@ -582,6 +587,58 @@ function readCookie(name: string): string | undefined {
 		settingsSyncOptions: config.settingsSyncOptions ? { enabled: config.settingsSyncOptions.enabled, } : undefined,
 		workspaceProvider: WorkspaceProvider.create(config),
 		urlCallbackProvider: new LocalStorageURLCallbackProvider(config.callbackRoute),
+		// --- PWB Start: proxy port url ---
+		resolveExternalUri: (uri: URI): Promise<URI> => {
+			let resolvedUri = uri;
+			const localhostMatch = extractLocalHostUriMetaDataForPortMapping(resolvedUri);
+			if (localhostMatch && resolvedUri.authority !== location.host) {
+				if (config.productConfiguration && config.productConfiguration.proxyEndpointTemplate) {
+					let template = config.productConfiguration.proxyEndpointTemplate;
+
+					// The proxyEndpointTemplate contains the port token after the last slash.
+					// We extract the port token and remove it from the template.
+					const portToken = template.split('/').pop();
+					template = template.slice(0, template.lastIndexOf('/') + 1);
+
+					let securePort, renderedTemplate;
+					if (portToken !== undefined) {
+						securePort = transformPort(portToken, localhostMatch.port);
+						if (securePort) {
+							renderedTemplate = template.replace('{{port}}', securePort);
+						}
+					}
+					if (!renderedTemplate) {
+						// Fallback to /proxy/{{port}}/ when port token is not available. This only occurs when running
+						// outside of Workbench and is useful for testing.
+						renderedTemplate = template
+							.replace('/p/', '/proxy/')
+							.replace('{{port}}', localhostMatch.port.toString());
+					}
+					resolvedUri = URI.parse(new URL(renderedTemplate, mainWindow.location.href).toString());
+				} else {
+					throw new Error(`Failed to resolve external URI: ${uri.toString()}. Could not determine base url because productConfiguration missing.`);
+				}
+			}
+			return Promise.resolve(resolvedUri);
+		},
+		tunnelProvider: {
+			tunnelFactory: (tunnelOptions: TunnelOptions, tunnelCreationOptions: TunnelCreationOptions) => {
+				const onDidDispose: Emitter<void> = new Emitter();
+				let isDisposed = false;
+				return Promise.resolve({
+					remoteAddress: tunnelOptions.remoteAddress,
+					localAddress: `localhost:${tunnelOptions.remoteAddress.port}`,
+					onDidDispose: onDidDispose.event,
+					dispose: () => {
+						if (!isDisposed) {
+							isDisposed = true;
+							onDidDispose.fire();
+						}
+					}
+				});
+			}
+		},
+		// --- End PWB ---
 		secretStorageProvider: config.remoteAuthority && !secretStorageKeyPath
 			? undefined /* with a remote without embedder-preferred storage, store on the remote */
 			: new LocalStorageSecretStorageProvider(secretStorageCrypto),
diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts
index 3653fc5b01c..390dd233953 100644
--- a/src/vs/code/electron-main/app.ts
+++ b/src/vs/code/electron-main/app.ts
@@ -121,6 +121,8 @@ import { Lazy } from 'vs/base/common/lazy';
 import { IAuxiliaryWindowsMainService } from 'vs/platform/auxiliaryWindow/electron-main/auxiliaryWindows';
 import { AuxiliaryWindowsMainService } from 'vs/platform/auxiliaryWindow/electron-main/auxiliaryWindowsMainService';
 import { normalizeNFC } from 'vs/base/common/normalization';
+import { ICSSDevelopmentService, CSSDevelopmentService } from 'vs/platform/cssDev/node/cssDevService';
+
 /**
  * The main VS Code application. There will only ever be one instance,
  * even if the user starts many instances (e.g. from the command line).
@@ -832,34 +834,38 @@ export class CodeApplication extends Disposable {
 			//   To: vscode-remote://wsl+ubuntu/mnt/c/GitDevelopment/monaco
 
 			const secondSlash = uri.path.indexOf(posix.sep, 1 /* skip over the leading slash */);
+			let authority: string;
+			let path: string;
 			if (secondSlash !== -1) {
-				const authority = uri.path.substring(1, secondSlash);
-				const path = uri.path.substring(secondSlash);
-
-				let query = uri.query;
-				const params = new URLSearchParams(uri.query);
-				if (params.get('windowId') === '_blank') {
-					// Make sure to unset any `windowId=_blank` here
-					// https://github.com/microsoft/vscode/issues/191902
-					params.delete('windowId');
-					query = params.toString();
-				}
+				authority = uri.path.substring(1, secondSlash);
+				path = uri.path.substring(secondSlash);
+			} else {
+				authority = uri.path.substring(1);
+				path = '/';
+			}
 
-				const remoteUri = URI.from({ scheme: Schemas.vscodeRemote, authority, path, query, fragment: uri.fragment });
+			let query = uri.query;
+			const params = new URLSearchParams(uri.query);
+			if (params.get('windowId') === '_blank') {
+				// Make sure to unset any `windowId=_blank` here
+				// https://github.com/microsoft/vscode/issues/191902
+				params.delete('windowId');
+				query = params.toString();
+			}
 
-				if (hasWorkspaceFileExtension(path)) {
-					return { workspaceUri: remoteUri };
-				}
+			const remoteUri = URI.from({ scheme: Schemas.vscodeRemote, authority, path, query, fragment: uri.fragment });
 
-				if (/:[\d]+$/.test(path)) {
-					// path with :line:column syntax
-					return { fileUri: remoteUri };
-				}
+			if (hasWorkspaceFileExtension(path)) {
+				return { workspaceUri: remoteUri };
+			}
 
-				return { folderUri: remoteUri };
+			if (/:[\d]+$/.test(path)) {
+				// path with :line:column syntax
+				return { fileUri: remoteUri };
 			}
-		}
 
+			return { folderUri: remoteUri };
+		}
 		return undefined;
 	}
 
@@ -917,7 +923,7 @@ export class CodeApplication extends Disposable {
 				this.logService.trace('app#handleProtocolUrl() opening protocol url as window:', windowOpenableFromProtocolUrl, uri.toString(true));
 
 				const window = firstOrDefault(await windowsMainService.open({
-					context: OpenContext.API,
+					context: OpenContext.LINK,
 					cli: { ...this.environmentMainService.args },
 					urisToOpen: [windowOpenableFromProtocolUrl],
 					forceNewWindow: shouldOpenInNewWindow,
@@ -936,7 +942,7 @@ export class CodeApplication extends Disposable {
 			this.logService.trace('app#handleProtocolUrl() opening empty window and passing in protocol url:', uri.toString(true));
 
 			const window = firstOrDefault(await windowsMainService.open({
-				context: OpenContext.API,
+				context: OpenContext.LINK,
 				cli: { ...this.environmentMainService.args },
 				forceNewWindow: true,
 				forceEmpty: true,
@@ -1103,6 +1109,9 @@ export class CodeApplication extends Disposable {
 		// Proxy Auth
 		services.set(IProxyAuthService, new SyncDescriptor(ProxyAuthService));
 
+		// Dev Only: CSS service (for ESM)
+		services.set(ICSSDevelopmentService, new SyncDescriptor(CSSDevelopmentService, undefined, true));
+
 		// Init services that require it
 		await Promises.settled([
 			backupMainService.initialize(),
diff --git a/src/vs/code/electron-sandbox/processExplorer/processExplorer-dev.esm.html b/src/vs/code/electron-sandbox/processExplorer/processExplorer-dev.esm.html
new file mode 100644
index 00000000000..19d194fc1c5
--- /dev/null
+++ b/src/vs/code/electron-sandbox/processExplorer/processExplorer-dev.esm.html
@@ -0,0 +1,42 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="utf-8" />
+		<meta
+			http-equiv="Content-Security-Policy"
+			content="
+				default-src
+					'none'
+				;
+				img-src
+					'self'
+					data:
+				;
+				script-src
+					'self'
+					blob:
+					'nonce-0c6a828f1297'
+				;
+				style-src
+					'self'
+					'unsafe-inline'
+				;
+				connect-src
+					'self'
+					https:
+				;
+				font-src
+					'self'
+				;
+		">
+	</head>
+
+	<body aria-label="">
+		<div id="process-list"></div>
+	</body>
+
+	<!-- Startup (do not modify order of script tags!) -->
+	<script src="../../../../bootstrap-window.js"></script>
+	<script src="./processExplorer.js"></script>
+</html>
diff --git a/src/vs/code/electron-sandbox/processExplorer/processExplorer-dev.html b/src/vs/code/electron-sandbox/processExplorer/processExplorer-dev.html
index 55f2c0fe81c..5bdf62c8230 100644
--- a/src/vs/code/electron-sandbox/processExplorer/processExplorer-dev.html
+++ b/src/vs/code/electron-sandbox/processExplorer/processExplorer-dev.html
@@ -35,8 +35,6 @@
 	</body>
 
 	<!-- Startup (do not modify order of script tags!) -->
-	<script src="../../../../bootstrap.js"></script>
-	<script src="../../../../vs/loader.js"></script>
 	<script src="../../../../bootstrap-window.js"></script>
-	<script src="processExplorer.js"></script>
+	<script src="./processExplorer.js"></script>
 </html>
diff --git a/src/vs/code/electron-sandbox/processExplorer/processExplorer.esm.html b/src/vs/code/electron-sandbox/processExplorer/processExplorer.esm.html
new file mode 100644
index 00000000000..d2747202950
--- /dev/null
+++ b/src/vs/code/electron-sandbox/processExplorer/processExplorer.esm.html
@@ -0,0 +1,42 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="utf-8" />
+		<meta
+			http-equiv="Content-Security-Policy"
+			content="
+				default-src
+					'none'
+				;
+				img-src
+					'self'
+					data:
+				;
+				script-src
+					'self'
+					blob:
+					'nonce-0c6a828f1297'
+				;
+				style-src
+					'self'
+					'unsafe-inline'
+				;
+				connect-src
+					'self'
+					https:
+				;
+				font-src
+					'self'
+				;
+		">
+		<link rel="stylesheet" href="./processExplorerMain.css">
+	</head>
+
+	<body aria-label="">
+		<div id="process-list"></div>
+	</body>
+
+	<!-- Startup (do not modify order of script tags!) -->
+	<script src="./processExplorer.js" type="module"></script>
+</html>
diff --git a/src/vs/code/electron-sandbox/workbench/workbench-dev.esm.html b/src/vs/code/electron-sandbox/workbench/workbench-dev.esm.html
new file mode 100644
index 00000000000..ea5cbee848a
--- /dev/null
+++ b/src/vs/code/electron-sandbox/workbench/workbench-dev.esm.html
@@ -0,0 +1,75 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="utf-8" />
+		<meta
+			http-equiv="Content-Security-Policy"
+			content="
+				default-src
+					'none'
+				;
+				img-src
+					'self'
+					data:
+					blob:
+					vscode-remote-resource:
+					vscode-managed-remote-resource:
+					https:
+				;
+				media-src
+					'self'
+				;
+				frame-src
+					'self'
+					vscode-webview:
+				;
+				script-src
+					'self'
+					'unsafe-eval'
+					blob:
+					'nonce-0c6a828f1297'
+				;
+				style-src
+					'self'
+					'unsafe-inline'
+				;
+				connect-src
+					'self'
+					https:
+					ws:
+				;
+				font-src
+					'self'
+					vscode-remote-resource:
+					vscode-managed-remote-resource:
+					https://*.vscode-unpkg.net
+				;
+				require-trusted-types-for
+					'script'
+				;
+				trusted-types
+					vscode-bootstrapImportMap
+					amdLoader
+					cellRendererEditorText
+					defaultWorkerFactory
+					diffEditorWidget
+					diffReview
+					domLineBreaksComputer
+					dompurify
+					editorGhostText
+					editorViewLayer
+					notebookRenderer
+					stickyScrollViewLayer
+					tokenizeToString
+				;
+		"/>
+	</head>
+
+	<body aria-label="">
+	</body>
+
+	<!-- Startup (do not modify order of script tags!) -->
+	<script src="../../../../bootstrap-window.js"></script>
+	<script src="./workbench.js"></script>
+</html>
diff --git a/src/vs/code/electron-sandbox/workbench/workbench-dev.html b/src/vs/code/electron-sandbox/workbench/workbench-dev.html
index fa67acf2a97..c9756bf3708 100644
--- a/src/vs/code/electron-sandbox/workbench/workbench-dev.html
+++ b/src/vs/code/electron-sandbox/workbench/workbench-dev.html
@@ -70,8 +70,7 @@
 	</body>
 
 	<!-- Startup (do not modify order of script tags!) -->
-	<script src="../../../../bootstrap.js"></script>
 	<script src="../../../../vs/loader.js"></script>
 	<script src="../../../../bootstrap-window.js"></script>
-	<script src="workbench.js"></script>
+	<script src="./workbench.js"></script>
 </html>
diff --git a/src/vs/code/electron-sandbox/workbench/workbench.esm.html b/src/vs/code/electron-sandbox/workbench/workbench.esm.html
new file mode 100644
index 00000000000..1e89448e605
--- /dev/null
+++ b/src/vs/code/electron-sandbox/workbench/workbench.esm.html
@@ -0,0 +1,72 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="utf-8" />
+		<meta
+			http-equiv="Content-Security-Policy"
+			content="
+				default-src
+					'none'
+				;
+				img-src
+					'self'
+					data:
+					blob:
+					vscode-remote-resource:
+					vscode-managed-remote-resource:
+					https:
+				;
+				media-src
+					'self'
+				;
+				frame-src
+					'self'
+					vscode-webview:
+				;
+				script-src
+					'self'
+					'unsafe-eval'
+					blob:
+				;
+				style-src
+					'self'
+					'unsafe-inline'
+				;
+				connect-src
+					'self'
+					https:
+					ws:
+				;
+				font-src
+					'self'
+					vscode-remote-resource:
+					vscode-managed-remote-resource:
+					https://*.vscode-unpkg.net
+				;
+				require-trusted-types-for
+					'script'
+				;
+				trusted-types
+					amdLoader
+					cellRendererEditorText
+					defaultWorkerFactory
+					diffEditorWidget
+					diffReview
+					domLineBreaksComputer
+					dompurify
+					editorGhostText
+					editorViewLayer
+					notebookRenderer
+					stickyScrollViewLayer
+					tokenizeToString
+				;
+		"/>
+	</head>
+
+	<body aria-label="">
+	</body>
+
+	<!-- Startup (do not modify order of script tags!) -->
+	<script src="./workbench.js" type="module"></script>
+</html>
diff --git a/src/vs/code/electron-sandbox/workbench/workbench.js b/src/vs/code/electron-sandbox/workbench/workbench.js
index 5ad97839d23..bed16c9f9bd 100644
--- a/src/vs/code/electron-sandbox/workbench/workbench.js
+++ b/src/vs/code/electron-sandbox/workbench/workbench.js
@@ -3,8 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-/// <reference path="../../../../typings/require.d.ts" />
-
 //@ts-check
 'use strict';
 
diff --git a/src/vs/code/node/cli.ts b/src/vs/code/node/cli.ts
index 9acf37f930f..58e39456485 100644
--- a/src/vs/code/node/cli.ts
+++ b/src/vs/code/node/cli.ts
@@ -117,8 +117,7 @@ export async function main(argv: string[]): Promise<any> {
 
 	// Extensions Management
 	else if (shouldSpawnCliProcess(args)) {
-
-		const cli = await import('vs/code/node/cliProcessMain');
+		const cli = await import(['vs', 'code', 'node', 'cliProcessMain'].join('/') /* TODO@esm workaround to prevent esbuild from inlining this */);
 		await cli.main(args);
 
 		return;
@@ -398,7 +397,10 @@ export async function main(argv: string[]): Promise<any> {
 									return false;
 								}
 								if (target.type === 'page') {
-									return target.url.indexOf('workbench/workbench.html') > 0 || target.url.indexOf('workbench/workbench-dev.html') > 0;
+									return target.url.indexOf('workbench/workbench.html') > 0 ||
+										target.url.indexOf('workbench/workbench-dev.html') > 0 ||
+										target.url.indexOf('workbench/workbench.esm.html') > 0 ||
+										target.url.indexOf('workbench/workbench-dev.esm.html') > 0;
 								} else {
 									return true;
 								}
diff --git a/src/vs/editor/browser/controller/mouseHandler.ts b/src/vs/editor/browser/controller/mouseHandler.ts
index 1f70dce4903..55d58d6eef9 100644
--- a/src/vs/editor/browser/controller/mouseHandler.ts
+++ b/src/vs/editor/browser/controller/mouseHandler.ts
@@ -24,7 +24,6 @@ import { MouseWheelClassifier } from 'vs/base/browser/ui/scrollbar/scrollableEle
 
 export interface IPointerHandlerHelper {
 	viewDomNode: HTMLElement;
-	overflowWidgetsDomNode: HTMLElement | null;
 	linesContentDomNode: HTMLElement;
 	viewLinesDomNode: HTMLElement;
 
@@ -63,8 +62,6 @@ export class MouseHandler extends ViewEventHandler {
 	private lastMouseLeaveTime: number;
 	private _height: number;
 	private _mouseLeaveMonitor: IDisposable | null = null;
-	private _mouseOnOverflowWidgetsDomNode: boolean = false;
-	private _mouseOnViewDomNode: boolean = false;
 
 	constructor(context: ViewContext, viewController: ViewController, viewHelper: IPointerHandlerHelper) {
 		super();
@@ -79,7 +76,7 @@ export class MouseHandler extends ViewEventHandler {
 			this.viewController,
 			this.viewHelper,
 			this.mouseTargetFactory,
-			(e, testEventTarget) => this._createMouseTargetForView(e, testEventTarget),
+			(e, testEventTarget) => this._createMouseTarget(e, testEventTarget),
 			(e) => this._getMouseColumn(e)
 		));
 
@@ -91,8 +88,7 @@ export class MouseHandler extends ViewEventHandler {
 		this._register(mouseEvents.onContextMenu(this.viewHelper.viewDomNode, (e) => this._onContextMenu(e, true)));
 
 		this._register(mouseEvents.onMouseMove(this.viewHelper.viewDomNode, (e) => {
-			this._mouseOnViewDomNode = true;
-			this._onMouseMoveOverView(e);
+			this._onMouseMove(e);
 
 			// See https://github.com/microsoft/vscode/issues/138789
 			// When moving the mouse really quickly, the browser sometimes forgets to
@@ -105,12 +101,7 @@ export class MouseHandler extends ViewEventHandler {
 				this._mouseLeaveMonitor = dom.addDisposableListener(this.viewHelper.viewDomNode.ownerDocument, 'mousemove', (e) => {
 					if (!this.viewHelper.viewDomNode.contains(e.target as Node | null)) {
 						// went outside the editor!
-						this._mouseOnViewDomNode = false;
-						setTimeout(() => {
-							if (!this._mouseOnOverflowWidgetsDomNode) {
-								this._onMouseLeave(new EditorMouseEvent(e, false, this.viewHelper.viewDomNode));
-							}
-						}, 0);
+						this._onMouseLeave(new EditorMouseEvent(e, false, this.viewHelper.viewDomNode));
 					}
 				});
 			}
@@ -118,32 +109,7 @@ export class MouseHandler extends ViewEventHandler {
 
 		this._register(mouseEvents.onMouseUp(this.viewHelper.viewDomNode, (e) => this._onMouseUp(e)));
 
-		this._register(mouseEvents.onMouseLeave(this.viewHelper.viewDomNode, (e) => {
-			this._mouseOnViewDomNode = false;
-			setTimeout(() => {
-				if (!this._mouseOnOverflowWidgetsDomNode) {
-					this._onMouseLeave(e);
-				}
-			}, 0);
-		}));
-
-		const overflowWidgetsDomNode = this.viewHelper.overflowWidgetsDomNode;
-		if (overflowWidgetsDomNode) {
-			this._register(mouseEvents.onMouseMove(overflowWidgetsDomNode, (e) => {
-				this._mouseOnOverflowWidgetsDomNode = true;
-				this._mouseLeaveMonitor?.dispose();
-				this._mouseLeaveMonitor = null;
-				this._onMouseMoveOverOverflowWidgetsDomNode(e);
-			}));
-			this._register(mouseEvents.onMouseLeave(overflowWidgetsDomNode, (e) => {
-				this._mouseOnOverflowWidgetsDomNode = false;
-				setTimeout(() => {
-					if (!this._mouseOnViewDomNode) {
-						this._onMouseLeave(e);
-					}
-				}, 0);
-			}));
-		}
+		this._register(mouseEvents.onMouseLeave(this.viewHelper.viewDomNode, (e) => this._onMouseLeave(e)));
 
 		// `pointerdown` events can't be used to determine if there's a double click, or triple click
 		// because their `e.detail` is always 0.
@@ -268,10 +234,10 @@ export class MouseHandler extends ViewEventHandler {
 		}
 
 		const relativePos = createCoordinatesRelativeToEditor(this.viewHelper.viewDomNode, editorPos, pos);
-		return this.mouseTargetFactory.createMouseTargetForView(this.viewHelper.getLastRenderData(), editorPos, pos, relativePos, null);
+		return this.mouseTargetFactory.createMouseTarget(this.viewHelper.getLastRenderData(), editorPos, pos, relativePos, null);
 	}
 
-	protected _createMouseTargetForView(e: EditorMouseEvent, testEventTarget: boolean): IMouseTarget {
+	protected _createMouseTarget(e: EditorMouseEvent, testEventTarget: boolean): IMouseTarget {
 		let target = e.target;
 		if (!this.viewHelper.viewDomNode.contains(target)) {
 			const shadowRoot = dom.getShadowRoot(this.viewHelper.viewDomNode);
@@ -281,11 +247,7 @@ export class MouseHandler extends ViewEventHandler {
 				);
 			}
 		}
-		return this.mouseTargetFactory.createMouseTargetForView(this.viewHelper.getLastRenderData(), e.editorPos, e.pos, e.relativePos, testEventTarget ? target : null);
-	}
-
-	private _createMouseTargetForOverflowWidgetsDomNode(e: EditorMouseEvent): IMouseTarget {
-		return this.mouseTargetFactory.createMouseTargetForOverflowWidgetsDomNode(this.viewHelper.getLastRenderData(), e.editorPos, e.pos, e.relativePos, e.target);
+		return this.mouseTargetFactory.createMouseTarget(this.viewHelper.getLastRenderData(), e.editorPos, e.pos, e.relativePos, testEventTarget ? target : null);
 	}
 
 	private _getMouseColumn(e: EditorMouseEvent): number {
@@ -295,30 +257,11 @@ export class MouseHandler extends ViewEventHandler {
 	protected _onContextMenu(e: EditorMouseEvent, testEventTarget: boolean): void {
 		this.viewController.emitContextMenu({
 			event: e,
-			target: this._createMouseTargetForView(e, testEventTarget)
-		});
-	}
-
-	protected _onMouseMoveOverView(e: EditorMouseEvent): void {
-		this._onMouseMove(e, this._createMouseTargetForView(e, true));
-	}
-
-	private _onMouseMoveOverOverflowWidgetsDomNode(e: EditorMouseEvent): void {
-		this._onMouseMove(e, this._createMouseTargetForOverflowWidgetsDomNode(e));
-	}
-
-	private _onMouseMove(e: EditorMouseEvent, target: IMouseTarget): void {
-		const shouldIgnoreMouseMoveEvent = this._shouldIgnoreMouseMoveEvent(e);
-		if (shouldIgnoreMouseMoveEvent) {
-			return undefined;
-		}
-		this.viewController.emitMouseMove({
-			event: e,
-			target
+			target: this._createMouseTarget(e, testEventTarget)
 		});
 	}
 
-	private _shouldIgnoreMouseMoveEvent(e: EditorMouseEvent): boolean {
+	protected _onMouseMove(e: EditorMouseEvent): void {
 		const targetIsWidget = this.mouseTargetFactory.mouseTargetIsWidget(e);
 		if (!targetIsWidget) {
 			e.preventDefault();
@@ -326,14 +269,18 @@ export class MouseHandler extends ViewEventHandler {
 
 		if (this._mouseDownOperation.isActive()) {
 			// In selection/drag operation
-			return true;
+			return;
 		}
 		const actualMouseMoveTime = e.timestamp;
 		if (actualMouseMoveTime < this.lastMouseLeaveTime) {
 			// Due to throttling, this event occurred before the mouse left the editor, therefore ignore it.
-			return true;
+			return;
 		}
-		return false;
+
+		this.viewController.emitMouseMove({
+			event: e,
+			target: this._createMouseTarget(e, true)
+		});
 	}
 
 	protected _onMouseLeave(e: EditorMouseEvent): void {
@@ -351,12 +298,12 @@ export class MouseHandler extends ViewEventHandler {
 	protected _onMouseUp(e: EditorMouseEvent): void {
 		this.viewController.emitMouseUp({
 			event: e,
-			target: this._createMouseTargetForView(e, true)
+			target: this._createMouseTarget(e, true)
 		});
 	}
 
 	protected _onMouseDown(e: EditorMouseEvent, pointerId: number): void {
-		const t = this._createMouseTargetForView(e, true);
+		const t = this._createMouseTarget(e, true);
 
 		const targetIsContent = (t.type === MouseTargetType.CONTENT_TEXT || t.type === MouseTargetType.CONTENT_EMPTY);
 		const targetIsGutter = (t.type === MouseTargetType.GUTTER_GLYPH_MARGIN || t.type === MouseTargetType.GUTTER_LINE_NUMBERS || t.type === MouseTargetType.GUTTER_LINE_DECORATIONS);
@@ -795,7 +742,7 @@ class TopBottomDragScrollingOperation extends Disposable {
 			const horizontalScrollbarHeight = this._context.configuration.options.get(EditorOption.layoutInfo).horizontalScrollbarHeight;
 			const pos = new PageCoordinates(this._mouseEvent.pos.x, editorPos.y + editorPos.height - horizontalScrollbarHeight - 0.1);
 			const relativePos = createCoordinatesRelativeToEditor(this._viewHelper.viewDomNode, editorPos, pos);
-			mouseTarget = this._mouseTargetFactory.createMouseTargetForView(this._viewHelper.getLastRenderData(), editorPos, pos, relativePos, null);
+			mouseTarget = this._mouseTargetFactory.createMouseTarget(this._viewHelper.getLastRenderData(), editorPos, pos, relativePos, null);
 		}
 		if (!mouseTarget.position || mouseTarget.position.lineNumber !== edgeLineNumber) {
 			if (this._position.outsidePosition === 'above') {
diff --git a/src/vs/editor/browser/controller/mouseTarget.ts b/src/vs/editor/browser/controller/mouseTarget.ts
index c0f66317e9a..4a1addb3fc0 100644
--- a/src/vs/editor/browser/controller/mouseTarget.ts
+++ b/src/vs/editor/browser/controller/mouseTarget.ts
@@ -238,7 +238,6 @@ export class HitTestContext {
 	public readonly viewModel: IViewModel;
 	public readonly layoutInfo: EditorLayoutInfo;
 	public readonly viewDomNode: HTMLElement;
-	public readonly overflowWidgetsDomNode: HTMLElement | null;
 	public readonly lineHeight: number;
 	public readonly stickyTabStops: boolean;
 	public readonly typicalHalfwidthCharacterWidth: number;
@@ -252,7 +251,6 @@ export class HitTestContext {
 		const options = context.configuration.options;
 		this.layoutInfo = options.get(EditorOption.layoutInfo);
 		this.viewDomNode = viewHelper.viewDomNode;
-		this.overflowWidgetsDomNode = viewHelper.overflowWidgetsDomNode ?? null;
 		this.lineHeight = options.get(EditorOption.lineHeight);
 		this.stickyTabStops = options.get(EditorOption.stickyTabStops);
 		this.typicalHalfwidthCharacterWidth = options.get(EditorOption.fontInfo).typicalHalfwidthCharacterWidth;
@@ -415,7 +413,6 @@ class HitTestRequest extends BareHitTestRequest {
 	private _useHitTestTarget: boolean;
 	private _targetPathCacheElement: HTMLElement | null = null;
 	private _targetPathCacheValue: Uint8Array = new Uint8Array(0);
-	private _targetElement: HTMLElement | null = null;
 
 	public get target(): HTMLElement | null {
 		if (this._useHitTestTarget) {
@@ -425,18 +422,17 @@ class HitTestRequest extends BareHitTestRequest {
 	}
 
 	public get targetPath(): Uint8Array {
-		if (this._targetPathCacheElement !== this.target && this._targetElement) {
+		if (this._targetPathCacheElement !== this.target) {
 			this._targetPathCacheElement = this.target;
-			this._targetPathCacheValue = PartFingerprints.collect(this.target, this._targetElement);
+			this._targetPathCacheValue = PartFingerprints.collect(this.target, this._ctx.viewDomNode);
 		}
 		return this._targetPathCacheValue;
 	}
 
-	constructor(ctx: HitTestContext, editorPos: EditorPagePosition, pos: PageCoordinates, relativePos: CoordinatesRelativeToEditor, eventTarget: HTMLElement | null, targetElement: HTMLElement | null = null) {
+	constructor(ctx: HitTestContext, editorPos: EditorPagePosition, pos: PageCoordinates, relativePos: CoordinatesRelativeToEditor, eventTarget: HTMLElement | null) {
 		super(ctx, editorPos, pos, relativePos);
 		this._ctx = ctx;
 		this._eventTarget = eventTarget;
-		this._targetElement = targetElement;
 
 		// If no event target is passed in, we will use the hit test target
 		const hasEventTarget = Boolean(this._eventTarget);
@@ -536,9 +532,9 @@ export class MouseTargetFactory {
 		return false;
 	}
 
-	public createMouseTargetForView(lastRenderData: PointerHandlerLastRenderData, editorPos: EditorPagePosition, pos: PageCoordinates, relativePos: CoordinatesRelativeToEditor, target: HTMLElement | null): IMouseTarget {
+	public createMouseTarget(lastRenderData: PointerHandlerLastRenderData, editorPos: EditorPagePosition, pos: PageCoordinates, relativePos: CoordinatesRelativeToEditor, target: HTMLElement | null): IMouseTarget {
 		const ctx = new HitTestContext(this._context, this._viewHelper, lastRenderData);
-		const request = new HitTestRequest(ctx, editorPos, pos, relativePos, target, ctx.viewDomNode);
+		const request = new HitTestRequest(ctx, editorPos, pos, relativePos, target);
 		try {
 			const r = MouseTargetFactory._createMouseTarget(ctx, request);
 
@@ -559,16 +555,6 @@ export class MouseTargetFactory {
 		}
 	}
 
-	public createMouseTargetForOverflowWidgetsDomNode(lastRenderData: PointerHandlerLastRenderData, editorPos: EditorPagePosition, pos: PageCoordinates, relativePos: CoordinatesRelativeToEditor, target: HTMLElement | null) {
-		const ctx = new HitTestContext(this._context, this._viewHelper, lastRenderData);
-		const request = new HitTestRequest(ctx, editorPos, pos, relativePos, target, ctx.overflowWidgetsDomNode);
-		try {
-			return MouseTargetFactory._createMouseTarget(ctx, request);
-		} catch (err) {
-			return request.fulfillUnknown();
-		}
-	}
-
 	private static _createMouseTarget(ctx: HitTestContext, request: HitTestRequest): IMouseTarget {
 
 		// console.log(`${domHitTestExecuted ? '=>' : ''}CAME IN REQUEST: ${request}`);
diff --git a/src/vs/editor/browser/controller/pointerHandler.ts b/src/vs/editor/browser/controller/pointerHandler.ts
index 258884eafa8..2019016ac4c 100644
--- a/src/vs/editor/browser/controller/pointerHandler.ts
+++ b/src/vs/editor/browser/controller/pointerHandler.ts
@@ -47,7 +47,7 @@ export class PointerEventHandler extends MouseHandler {
 		// PonterEvents
 		const pointerEvents = new EditorPointerEventFactory(this.viewHelper.viewDomNode);
 
-		this._register(pointerEvents.onPointerMove(this.viewHelper.viewDomNode, (e) => this._onMouseMoveOverView(e)));
+		this._register(pointerEvents.onPointerMove(this.viewHelper.viewDomNode, (e) => this._onMouseMove(e)));
 		this._register(pointerEvents.onPointerUp(this.viewHelper.viewDomNode, (e) => this._onMouseUp(e)));
 		this._register(pointerEvents.onPointerLeave(this.viewHelper.viewDomNode, (e) => this._onMouseLeave(e)));
 		this._register(pointerEvents.onPointerDown(this.viewHelper.viewDomNode, (e, pointerId) => this._onMouseDown(e, pointerId)));
@@ -73,7 +73,7 @@ export class PointerEventHandler extends MouseHandler {
 	}
 
 	private _dispatchGesture(event: GestureEvent, inSelectionMode: boolean): void {
-		const target = this._createMouseTargetForView(new EditorMouseEvent(event, false, this.viewHelper.viewDomNode), false);
+		const target = this._createMouseTarget(new EditorMouseEvent(event, false, this.viewHelper.viewDomNode), false);
 		if (target.position) {
 			this.viewController.dispatchMouse({
 				position: target.position,
@@ -119,7 +119,7 @@ class TouchHandler extends MouseHandler {
 
 		this.viewHelper.focusTextArea();
 
-		const target = this._createMouseTargetForView(new EditorMouseEvent(event, false, this.viewHelper.viewDomNode), false);
+		const target = this._createMouseTarget(new EditorMouseEvent(event, false, this.viewHelper.viewDomNode), false);
 
 		if (target.position) {
 			// Send the tap event also to the <textarea> (for input purposes)
diff --git a/src/vs/editor/browser/services/editorWorkerService.ts b/src/vs/editor/browser/services/editorWorkerService.ts
index aa1e41c8985..56204107724 100644
--- a/src/vs/editor/browser/services/editorWorkerService.ts
+++ b/src/vs/editor/browser/services/editorWorkerService.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IntervalTimer, timeout } from 'vs/base/common/async';
-import { Disposable, IDisposable, dispose, toDisposable, DisposableStore } from 'vs/base/common/lifecycle';
+import { timeout } from 'vs/base/common/async';
+import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
 import { URI } from 'vs/base/common/uri';
-import { SimpleWorkerClient, logOnceWebWorkerWarning, IWorkerClient } from 'vs/base/common/worker/simpleWorker';
-import { DefaultWorkerFactory } from 'vs/base/browser/defaultWorkerFactory';
+import { logOnceWebWorkerWarning, IWorkerClient, Proxied, IWorkerDescriptor } from 'vs/base/common/worker/simpleWorker';
+import { createWebWorker } from 'vs/base/browser/defaultWorkerFactory';
 import { Position } from 'vs/editor/common/core/position';
 import { IRange, Range } from 'vs/editor/common/core/range';
 import { ITextModel } from 'vs/editor/common/model';
 import * as languages from 'vs/editor/common/languages';
 import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
 import { EditorSimpleWorker } from 'vs/editor/common/services/editorSimpleWorker';
-import { DiffAlgorithmName, IDiffComputationResult, IEditorWorkerService, ILineChange, IUnicodeHighlightsResult } from 'vs/editor/common/services/editorWorker';
+import { DiffAlgorithmName, IEditorWorkerService, ILineChange, IUnicodeHighlightsResult } from 'vs/editor/common/services/editorWorker';
 import { IModelService } from 'vs/editor/common/services/model';
 import { ITextResourceConfigurationService } from 'vs/editor/common/services/textResourceConfiguration';
 import { isNonEmptyArray } from 'vs/base/common/arrays';
@@ -22,7 +22,6 @@ import { ILogService } from 'vs/platform/log/common/log';
 import { StopWatch } from 'vs/base/common/stopwatch';
 import { canceled, onUnexpectedError } from 'vs/base/common/errors';
 import { UnicodeHighlighterOptions } from 'vs/editor/common/services/unicodeTextModelHighlighter';
-import { IEditorWorkerHost } from 'vs/editor/common/services/editorWorkerHost';
 import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
 import { IChange } from 'vs/editor/common/diff/legacyLinesDiffComputer';
 import { IDocumentDiff, IDocumentDiffProviderOptions } from 'vs/editor/common/diff/documentDiffProvider';
@@ -32,11 +31,8 @@ import { LineRange } from 'vs/editor/common/core/lineRange';
 import { SectionHeader, FindSectionHeaderOptions } from 'vs/editor/common/services/findSectionHeaders';
 import { mainWindow } from 'vs/base/browser/window';
 import { WindowIntervalTimer } from 'vs/base/browser/dom';
-
-/**
- * Stop syncing a model to the worker if it was not needed for 1 min.
- */
-const STOP_SYNC_MODEL_DELTA_TIME_MS = 60 * 1000;
+import { WorkerTextModelSyncClient } from 'vs/editor/common/services/textModelSync/textModelSync.impl';
+import { EditorWorkerHost } from 'vs/editor/common/services/editorWorkerHost';
 
 /**
  * Stop the worker if it was not needed for 5 min.
@@ -54,7 +50,7 @@ function canSyncModel(modelService: IModelService, resource: URI): boolean {
 	return true;
 }
 
-export class EditorWorkerService extends Disposable implements IEditorWorkerService {
+export abstract class EditorWorkerService extends Disposable implements IEditorWorkerService {
 
 	declare readonly _serviceBrand: undefined;
 
@@ -63,29 +59,30 @@ export class EditorWorkerService extends Disposable implements IEditorWorkerServ
 	private readonly _logService: ILogService;
 
 	constructor(
+		workerDescriptor: IWorkerDescriptor,
 		@IModelService modelService: IModelService,
 		@ITextResourceConfigurationService configurationService: ITextResourceConfigurationService,
 		@ILogService logService: ILogService,
-		@ILanguageConfigurationService languageConfigurationService: ILanguageConfigurationService,
+		@ILanguageConfigurationService private readonly _languageConfigurationService: ILanguageConfigurationService,
 		@ILanguageFeaturesService languageFeaturesService: ILanguageFeaturesService,
 	) {
 		super();
 		this._modelService = modelService;
-		this._workerManager = this._register(new WorkerManager(this._modelService, languageConfigurationService));
+		this._workerManager = this._register(new WorkerManager(workerDescriptor, this._modelService));
 		this._logService = logService;
 
 		// register default link-provider and default completions-provider
 		this._register(languageFeaturesService.linkProvider.register({ language: '*', hasAccessToAllModels: true }, {
-			provideLinks: (model, token) => {
+			provideLinks: async (model, token) => {
 				if (!canSyncModel(this._modelService, model.uri)) {
 					return Promise.resolve({ links: [] }); // File too large
 				}
-				return this._workerManager.withWorker().then(client => client.computeLinks(model.uri)).then(links => {
-					return links && { links };
-				});
+				const worker = await this._workerWithResources([model.uri]);
+				const links = await worker.$computeLinks(model.uri.toString());
+				return links && { links };
 			}
 		}));
-		this._register(languageFeaturesService.completionProvider.register('*', new WordBasedCompletionItemProvider(this._workerManager, configurationService, this._modelService, languageConfigurationService)));
+		this._register(languageFeaturesService.completionProvider.register('*', new WordBasedCompletionItemProvider(this._workerManager, configurationService, this._modelService, this._languageConfigurationService)));
 	}
 
 	public override dispose(): void {
@@ -96,12 +93,14 @@ export class EditorWorkerService extends Disposable implements IEditorWorkerServ
 		return canSyncModel(this._modelService, uri);
 	}
 
-	public computedUnicodeHighlights(uri: URI, options: UnicodeHighlighterOptions, range?: IRange): Promise<IUnicodeHighlightsResult> {
-		return this._workerManager.withWorker().then(client => client.computedUnicodeHighlights(uri, options, range));
+	public async computedUnicodeHighlights(uri: URI, options: UnicodeHighlighterOptions, range?: IRange): Promise<IUnicodeHighlightsResult> {
+		const worker = await this._workerWithResources([uri]);
+		return worker.$computeUnicodeHighlights(uri.toString(), options, range);
 	}
 
 	public async computeDiff(original: URI, modified: URI, options: IDocumentDiffProviderOptions, algorithm: DiffAlgorithmName): Promise<IDocumentDiff | null> {
-		const result = await this._workerManager.withWorker().then(client => client.computeDiff(original, modified, options, algorithm));
+		const worker = await this._workerWithResources([original, modified], /* forceLargeModels */true);
+		const result = await worker.$computeDiff(original.toString(), modified.toString(), options, algorithm);
 		if (!result) {
 			return null;
 		}
@@ -137,17 +136,18 @@ export class EditorWorkerService extends Disposable implements IEditorWorkerServ
 		return (canSyncModel(this._modelService, original) && canSyncModel(this._modelService, modified));
 	}
 
-	public computeDirtyDiff(original: URI, modified: URI, ignoreTrimWhitespace: boolean): Promise<IChange[] | null> {
-		return this._workerManager.withWorker().then(client => client.computeDirtyDiff(original, modified, ignoreTrimWhitespace));
+	public async computeDirtyDiff(original: URI, modified: URI, ignoreTrimWhitespace: boolean): Promise<IChange[] | null> {
+		const worker = await this._workerWithResources([original, modified]);
+		return worker.$computeDirtyDiff(original.toString(), modified.toString(), ignoreTrimWhitespace);
 	}
 
-	public computeMoreMinimalEdits(resource: URI, edits: languages.TextEdit[] | null | undefined, pretty: boolean = false): Promise<languages.TextEdit[] | undefined> {
+	public async computeMoreMinimalEdits(resource: URI, edits: languages.TextEdit[] | null | undefined, pretty: boolean = false): Promise<languages.TextEdit[] | undefined> {
 		if (isNonEmptyArray(edits)) {
 			if (!canSyncModel(this._modelService, resource)) {
 				return Promise.resolve(edits); // File too large
 			}
 			const sw = StopWatch.create();
-			const result = this._workerManager.withWorker().then(client => client.computeMoreMinimalEdits(resource, edits, pretty));
+			const result = this._workerWithResources([resource]).then(worker => worker.$computeMoreMinimalEdits(resource.toString(), edits, pretty));
 			result.finally(() => this._logService.trace('FORMAT#computeMoreMinimalEdits', resource.toString(true), sw.elapsed()));
 			return Promise.race([result, timeout(1000).then(() => edits)]);
 
@@ -162,12 +162,16 @@ export class EditorWorkerService extends Disposable implements IEditorWorkerServ
 				return Promise.resolve(edits); // File too large
 			}
 			const sw = StopWatch.create();
-			const result = this._workerManager.withWorker().then(client => client.computeHumanReadableDiff(resource, edits,
-				{ ignoreTrimWhitespace: false, maxComputationTimeMs: 1000, computeMoves: false, })).catch((err) => {
-					onUnexpectedError(err);
-					// In case of an exception, fall back to computeMoreMinimalEdits
-					return this.computeMoreMinimalEdits(resource, edits, true);
-				});
+			const opts: ILinesDiffComputerOptions = { ignoreTrimWhitespace: false, maxComputationTimeMs: 1000, computeMoves: false };
+			const result = (
+				this._workerWithResources([resource])
+					.then(worker => worker.$computeHumanReadableDiff(resource.toString(), edits, opts))
+					.catch((err) => {
+						onUnexpectedError(err);
+						// In case of an exception, fall back to computeMoreMinimalEdits
+						return this.computeMoreMinimalEdits(resource, edits, true);
+					})
+			);
 			result.finally(() => this._logService.trace('FORMAT#computeHumanReadableDiff', resource.toString(true), sw.elapsed()));
 			return result;
 
@@ -180,20 +184,47 @@ export class EditorWorkerService extends Disposable implements IEditorWorkerServ
 		return (canSyncModel(this._modelService, resource));
 	}
 
-	public navigateValueSet(resource: URI, range: IRange, up: boolean): Promise<languages.IInplaceReplaceSupportResult | null> {
-		return this._workerManager.withWorker().then(client => client.navigateValueSet(resource, range, up));
+	public async navigateValueSet(resource: URI, range: IRange, up: boolean): Promise<languages.IInplaceReplaceSupportResult | null> {
+		const model = this._modelService.getModel(resource);
+		if (!model) {
+			return null;
+		}
+		const wordDefRegExp = this._languageConfigurationService.getLanguageConfiguration(model.getLanguageId()).getWordDefinition();
+		const wordDef = wordDefRegExp.source;
+		const wordDefFlags = wordDefRegExp.flags;
+		const worker = await this._workerWithResources([resource]);
+		return worker.$navigateValueSet(resource.toString(), range, up, wordDef, wordDefFlags);
 	}
 
-	canComputeWordRanges(resource: URI): boolean {
+	public canComputeWordRanges(resource: URI): boolean {
 		return canSyncModel(this._modelService, resource);
 	}
 
-	computeWordRanges(resource: URI, range: IRange): Promise<{ [word: string]: IRange[] } | null> {
-		return this._workerManager.withWorker().then(client => client.computeWordRanges(resource, range));
+	public async computeWordRanges(resource: URI, range: IRange): Promise<{ [word: string]: IRange[] } | null> {
+		const model = this._modelService.getModel(resource);
+		if (!model) {
+			return Promise.resolve(null);
+		}
+		const wordDefRegExp = this._languageConfigurationService.getLanguageConfiguration(model.getLanguageId()).getWordDefinition();
+		const wordDef = wordDefRegExp.source;
+		const wordDefFlags = wordDefRegExp.flags;
+		const worker = await this._workerWithResources([resource]);
+		return worker.$computeWordRanges(resource.toString(), range, wordDef, wordDefFlags);
+	}
+
+	public async findSectionHeaders(uri: URI, options: FindSectionHeaderOptions): Promise<SectionHeader[]> {
+		const worker = await this._workerWithResources([uri]);
+		return worker.$findSectionHeaders(uri.toString(), options);
 	}
 
-	public findSectionHeaders(uri: URI, options: FindSectionHeaderOptions): Promise<SectionHeader[]> {
-		return this._workerManager.withWorker().then(client => client.findSectionHeaders(uri, options));
+	public async computeDefaultDocumentColors(uri: URI): Promise<languages.IColorInformation[] | null> {
+		const worker = await this._workerWithResources([uri]);
+		return worker.$computeDefaultDocumentColors(uri.toString());
+	}
+
+	private async _workerWithResources(resources: URI[], forceLargeModels: boolean = false): Promise<Proxied<EditorSimpleWorker>> {
+		const worker = await this._workerManager.withWorker();
+		return await worker.workerWithSyncedResources(resources, forceLargeModels);
 	}
 }
 
@@ -281,7 +312,10 @@ class WorkerManager extends Disposable {
 	private _editorWorkerClient: EditorWorkerClient | null;
 	private _lastWorkerUsedTime: number;
 
-	constructor(modelService: IModelService, private readonly languageConfigurationService: ILanguageConfigurationService) {
+	constructor(
+		private readonly _workerDescriptor: IWorkerDescriptor,
+		@IModelService modelService: IModelService
+	) {
 		super();
 		this._modelService = modelService;
 		this._editorWorkerClient = null;
@@ -335,124 +369,31 @@ class WorkerManager extends Disposable {
 	public withWorker(): Promise<EditorWorkerClient> {
 		this._lastWorkerUsedTime = (new Date()).getTime();
 		if (!this._editorWorkerClient) {
-			this._editorWorkerClient = new EditorWorkerClient(this._modelService, false, 'editorWorkerService', this.languageConfigurationService);
+			this._editorWorkerClient = new EditorWorkerClient(this._workerDescriptor, false, this._modelService);
 		}
 		return Promise.resolve(this._editorWorkerClient);
 	}
 }
 
-class EditorModelManager extends Disposable {
-
-	private readonly _proxy: EditorSimpleWorker;
-	private readonly _modelService: IModelService;
-	private _syncedModels: { [modelUrl: string]: IDisposable } = Object.create(null);
-	private _syncedModelsLastUsedTime: { [modelUrl: string]: number } = Object.create(null);
-
-	constructor(proxy: EditorSimpleWorker, modelService: IModelService, keepIdleModels: boolean) {
-		super();
-		this._proxy = proxy;
-		this._modelService = modelService;
-
-		if (!keepIdleModels) {
-			const timer = new IntervalTimer();
-			timer.cancelAndSet(() => this._checkStopModelSync(), Math.round(STOP_SYNC_MODEL_DELTA_TIME_MS / 2));
-			this._register(timer);
-		}
-	}
-
-	public override dispose(): void {
-		for (const modelUrl in this._syncedModels) {
-			dispose(this._syncedModels[modelUrl]);
-		}
-		this._syncedModels = Object.create(null);
-		this._syncedModelsLastUsedTime = Object.create(null);
-		super.dispose();
-	}
-
-	public ensureSyncedResources(resources: URI[], forceLargeModels: boolean): void {
-		for (const resource of resources) {
-			const resourceStr = resource.toString();
-
-			if (!this._syncedModels[resourceStr]) {
-				this._beginModelSync(resource, forceLargeModels);
-			}
-			if (this._syncedModels[resourceStr]) {
-				this._syncedModelsLastUsedTime[resourceStr] = (new Date()).getTime();
-			}
-		}
-	}
-
-	private _checkStopModelSync(): void {
-		const currentTime = (new Date()).getTime();
-
-		const toRemove: string[] = [];
-		for (const modelUrl in this._syncedModelsLastUsedTime) {
-			const elapsedTime = currentTime - this._syncedModelsLastUsedTime[modelUrl];
-			if (elapsedTime > STOP_SYNC_MODEL_DELTA_TIME_MS) {
-				toRemove.push(modelUrl);
-			}
-		}
-
-		for (const e of toRemove) {
-			this._stopModelSync(e);
-		}
-	}
-
-	private _beginModelSync(resource: URI, forceLargeModels: boolean): void {
-		const model = this._modelService.getModel(resource);
-		if (!model) {
-			return;
-		}
-		if (!forceLargeModels && model.isTooLargeForSyncing()) {
-			return;
-		}
-
-		const modelUrl = resource.toString();
-
-		this._proxy.acceptNewModel({
-			url: model.uri.toString(),
-			lines: model.getLinesContent(),
-			EOL: model.getEOL(),
-			versionId: model.getVersionId()
-		});
-
-		const toDispose = new DisposableStore();
-		toDispose.add(model.onDidChangeContent((e) => {
-			this._proxy.acceptModelChanged(modelUrl.toString(), e);
-		}));
-		toDispose.add(model.onWillDispose(() => {
-			this._stopModelSync(modelUrl);
-		}));
-		toDispose.add(toDisposable(() => {
-			this._proxy.acceptRemovedModel(modelUrl);
-		}));
-
-		this._syncedModels[modelUrl] = toDispose;
-	}
-
-	private _stopModelSync(modelUrl: string): void {
-		const toDispose = this._syncedModels[modelUrl];
-		delete this._syncedModels[modelUrl];
-		delete this._syncedModelsLastUsedTime[modelUrl];
-		dispose(toDispose);
-	}
-}
-
 class SynchronousWorkerClient<T extends IDisposable> implements IWorkerClient<T> {
 	private readonly _instance: T;
-	private readonly _proxyObj: Promise<T>;
+	public readonly proxy: Proxied<T>;
 
 	constructor(instance: T) {
 		this._instance = instance;
-		this._proxyObj = Promise.resolve(this._instance);
+		this.proxy = this._instance as Proxied<T>;
 	}
 
 	public dispose(): void {
 		this._instance.dispose();
 	}
 
-	public getProxyObject(): Promise<T> {
-		return this._proxyObj;
+	public setChannel<T extends object>(channel: string, handler: T): void {
+		throw new Error(`Not supported`);
+	}
+
+	public getChannel<T extends object>(channel: string): Proxied<T> {
+		throw new Error(`Not supported`);
 	}
 }
 
@@ -460,39 +401,22 @@ export interface IEditorWorkerClient {
 	fhr(method: string, args: any[]): Promise<any>;
 }
 
-export class EditorWorkerHost implements IEditorWorkerHost {
-
-	private readonly _workerClient: IEditorWorkerClient;
-
-	constructor(workerClient: IEditorWorkerClient) {
-		this._workerClient = workerClient;
-	}
-
-	// foreign host request
-	public fhr(method: string, args: any[]): Promise<any> {
-		return this._workerClient.fhr(method, args);
-	}
-}
-
 export class EditorWorkerClient extends Disposable implements IEditorWorkerClient {
 
 	private readonly _modelService: IModelService;
 	private readonly _keepIdleModels: boolean;
-	protected _worker: IWorkerClient<EditorSimpleWorker> | null;
-	protected readonly _workerFactory: DefaultWorkerFactory;
-	private _modelManager: EditorModelManager | null;
+	private _worker: IWorkerClient<EditorSimpleWorker> | null;
+	private _modelManager: WorkerTextModelSyncClient | null;
 	private _disposed = false;
 
 	constructor(
-		modelService: IModelService,
+		private readonly _workerDescriptor: IWorkerDescriptor,
 		keepIdleModels: boolean,
-		label: string | undefined,
-		private readonly languageConfigurationService: ILanguageConfigurationService
+		@IModelService modelService: IModelService,
 	) {
 		super();
 		this._modelService = modelService;
 		this._keepIdleModels = keepIdleModels;
-		this._workerFactory = new DefaultWorkerFactory(label);
 		this._worker = null;
 		this._modelManager = null;
 	}
@@ -505,123 +429,59 @@ export class EditorWorkerClient extends Disposable implements IEditorWorkerClien
 	private _getOrCreateWorker(): IWorkerClient<EditorSimpleWorker> {
 		if (!this._worker) {
 			try {
-				this._worker = this._register(new SimpleWorkerClient<EditorSimpleWorker, EditorWorkerHost>(
-					this._workerFactory,
-					'vs/editor/common/services/editorSimpleWorker',
-					new EditorWorkerHost(this)
-				));
+				this._worker = this._register(createWebWorker<EditorSimpleWorker>(this._workerDescriptor));
+				EditorWorkerHost.setChannel(this._worker, this._createEditorWorkerHost());
 			} catch (err) {
 				logOnceWebWorkerWarning(err);
-				this._worker = new SynchronousWorkerClient(new EditorSimpleWorker(new EditorWorkerHost(this), null));
+				this._worker = this._createFallbackLocalWorker();
 			}
 		}
 		return this._worker;
 	}
 
-	protected _getProxy(): Promise<EditorSimpleWorker> {
-		return this._getOrCreateWorker().getProxyObject().then(undefined, (err) => {
+	protected async _getProxy(): Promise<Proxied<EditorSimpleWorker>> {
+		try {
+			const proxy = this._getOrCreateWorker().proxy;
+			await proxy.$ping();
+			return proxy;
+		} catch (err) {
 			logOnceWebWorkerWarning(err);
-			this._worker = new SynchronousWorkerClient(new EditorSimpleWorker(new EditorWorkerHost(this), null));
-			return this._getOrCreateWorker().getProxyObject();
-		});
+			this._worker = this._createFallbackLocalWorker();
+			return this._worker.proxy;
+		}
 	}
 
-	private _getOrCreateModelManager(proxy: EditorSimpleWorker): EditorModelManager {
+	private _createFallbackLocalWorker(): SynchronousWorkerClient<EditorSimpleWorker> {
+		return new SynchronousWorkerClient(new EditorSimpleWorker(this._createEditorWorkerHost(), null));
+	}
+
+	private _createEditorWorkerHost(): EditorWorkerHost {
+		return {
+			$fhr: (method, args) => this.fhr(method, args)
+		};
+	}
+
+	private _getOrCreateModelManager(proxy: Proxied<EditorSimpleWorker>): WorkerTextModelSyncClient {
 		if (!this._modelManager) {
-			this._modelManager = this._register(new EditorModelManager(proxy, this._modelService, this._keepIdleModels));
+			this._modelManager = this._register(new WorkerTextModelSyncClient(proxy, this._modelService, this._keepIdleModels));
 		}
 		return this._modelManager;
 	}
 
-	protected async _withSyncedResources(resources: URI[], forceLargeModels: boolean = false): Promise<EditorSimpleWorker> {
+	public async workerWithSyncedResources(resources: URI[], forceLargeModels: boolean = false): Promise<Proxied<EditorSimpleWorker>> {
 		if (this._disposed) {
 			return Promise.reject(canceled());
 		}
-		return this._getProxy().then((proxy) => {
-			this._getOrCreateModelManager(proxy).ensureSyncedResources(resources, forceLargeModels);
-			return proxy;
-		});
-	}
-
-	public computedUnicodeHighlights(uri: URI, options: UnicodeHighlighterOptions, range?: IRange): Promise<IUnicodeHighlightsResult> {
-		return this._withSyncedResources([uri]).then(proxy => {
-			return proxy.computeUnicodeHighlights(uri.toString(), options, range);
-		});
-	}
-
-	public computeDiff(original: URI, modified: URI, options: IDocumentDiffProviderOptions, algorithm: DiffAlgorithmName): Promise<IDiffComputationResult | null> {
-		return this._withSyncedResources([original, modified], /* forceLargeModels */true).then(proxy => {
-			return proxy.computeDiff(original.toString(), modified.toString(), options, algorithm);
-		});
-	}
-
-	public computeDirtyDiff(original: URI, modified: URI, ignoreTrimWhitespace: boolean): Promise<IChange[] | null> {
-		return this._withSyncedResources([original, modified]).then(proxy => {
-			return proxy.computeDirtyDiff(original.toString(), modified.toString(), ignoreTrimWhitespace);
-		});
-	}
-
-	public computeMoreMinimalEdits(resource: URI, edits: languages.TextEdit[], pretty: boolean): Promise<languages.TextEdit[]> {
-		return this._withSyncedResources([resource]).then(proxy => {
-			return proxy.computeMoreMinimalEdits(resource.toString(), edits, pretty);
-		});
-	}
-
-	public computeHumanReadableDiff(resource: URI, edits: languages.TextEdit[], options: ILinesDiffComputerOptions): Promise<languages.TextEdit[]> {
-		return this._withSyncedResources([resource]).then(proxy => {
-			return proxy.computeHumanReadableDiff(resource.toString(), edits, options);
-		});
-	}
-
-	public computeLinks(resource: URI): Promise<languages.ILink[] | null> {
-		return this._withSyncedResources([resource]).then(proxy => {
-			return proxy.computeLinks(resource.toString());
-		});
-	}
-
-	public computeDefaultDocumentColors(resource: URI): Promise<languages.IColorInformation[] | null> {
-		return this._withSyncedResources([resource]).then(proxy => {
-			return proxy.computeDefaultDocumentColors(resource.toString());
-		});
+		const proxy = await this._getProxy();
+		this._getOrCreateModelManager(proxy).ensureSyncedResources(resources, forceLargeModels);
+		return proxy;
 	}
 
 	public async textualSuggest(resources: URI[], leadingWord: string | undefined, wordDefRegExp: RegExp): Promise<{ words: string[]; duration: number } | null> {
-		const proxy = await this._withSyncedResources(resources);
+		const proxy = await this.workerWithSyncedResources(resources);
 		const wordDef = wordDefRegExp.source;
 		const wordDefFlags = wordDefRegExp.flags;
-		return proxy.textualSuggest(resources.map(r => r.toString()), leadingWord, wordDef, wordDefFlags);
-	}
-
-	computeWordRanges(resource: URI, range: IRange): Promise<{ [word: string]: IRange[] } | null> {
-		return this._withSyncedResources([resource]).then(proxy => {
-			const model = this._modelService.getModel(resource);
-			if (!model) {
-				return Promise.resolve(null);
-			}
-			const wordDefRegExp = this.languageConfigurationService.getLanguageConfiguration(model.getLanguageId()).getWordDefinition();
-			const wordDef = wordDefRegExp.source;
-			const wordDefFlags = wordDefRegExp.flags;
-			return proxy.computeWordRanges(resource.toString(), range, wordDef, wordDefFlags);
-		});
-	}
-
-	public navigateValueSet(resource: URI, range: IRange, up: boolean): Promise<languages.IInplaceReplaceSupportResult | null> {
-		return this._withSyncedResources([resource]).then(proxy => {
-			const model = this._modelService.getModel(resource);
-			if (!model) {
-				return null;
-			}
-			const wordDefRegExp = this.languageConfigurationService.getLanguageConfiguration(model.getLanguageId()).getWordDefinition();
-			const wordDef = wordDefRegExp.source;
-			const wordDefFlags = wordDefRegExp.flags;
-			return proxy.navigateValueSet(resource.toString(), range, up, wordDef, wordDefFlags);
-		});
-	}
-
-	public findSectionHeaders(uri: URI, options: FindSectionHeaderOptions): Promise<SectionHeader[]> {
-		return this._withSyncedResources([uri]).then(proxy => {
-			return proxy.findSectionHeaders(uri.toString(), options);
-		});
+		return proxy.$textualSuggest(resources.map(r => r.toString()), leadingWord, wordDef, wordDefFlags);
 	}
 
 	override dispose(): void {
diff --git a/src/vs/editor/browser/services/hoverService/hoverWidget.ts b/src/vs/editor/browser/services/hoverService/hoverWidget.ts
index ed929bc965c..2d8e9ae9392 100644
--- a/src/vs/editor/browser/services/hoverService/hoverWidget.ts
+++ b/src/vs/editor/browser/services/hoverService/hoverWidget.ts
@@ -222,7 +222,7 @@ export class HoverWidget extends Widget implements IHoverWidget {
 		}
 
 		// Show the hover hint if needed
-		if (hideOnHover && options.appearance?.showHoverHint) {
+		if (options.appearance?.showHoverHint) {
 			const statusBarElement = $('div.hover-row.status-bar');
 			const infoElement = $('div.info');
 			infoElement.textContent = localize('hoverhint', 'Hold {0} key to mouse over', isMacintosh ? 'Option' : 'Alt');
diff --git a/src/vs/editor/browser/services/hoverService/updatableHoverWidget.ts b/src/vs/editor/browser/services/hoverService/updatableHoverWidget.ts
index cf9b355831f..46f7423aa3a 100644
--- a/src/vs/editor/browser/services/hoverService/updatableHoverWidget.ts
+++ b/src/vs/editor/browser/services/hoverService/updatableHoverWidget.ts
@@ -71,14 +71,17 @@ export class ManagedHoverWidget implements IDisposable {
 			const hoverOptions: IHoverDelegateOptions = {
 				content,
 				target: this.target,
+				actions: options?.actions,
+				linkHandler: options?.linkHandler,
+				trapFocus: options?.trapFocus,
 				appearance: {
 					showPointer: this.hoverDelegate.placement === 'element',
 					skipFadeInAnimation: !this.fadeInAnimation || !!oldHoverWidget, // do not fade in if the hover is already showing
+					showHoverHint: options?.appearance?.showHoverHint,
 				},
 				position: {
 					hoverPosition: HoverPosition.BELOW,
 				},
-				...options
 			};
 
 			this._hoverWidget = this.hoverDelegate.showHover(hoverOptions, focus);
diff --git a/src/vs/editor/browser/services/treeSitter/treeSitterParserService.ts b/src/vs/editor/browser/services/treeSitter/treeSitterParserService.ts
new file mode 100644
index 00000000000..ea9c72636a9
--- /dev/null
+++ b/src/vs/editor/browser/services/treeSitter/treeSitterParserService.ts
@@ -0,0 +1,480 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import type { Parser } from '@vscode/tree-sitter-wasm';
+import { AppResourcePath, FileAccess, nodeModulesAsarUnpackedPath, nodeModulesPath } from 'vs/base/common/network';
+import { EDITOR_EXPERIMENTAL_PREFER_TREESITTER, ITreeSitterParserService, ITreeSitterParseResult } from 'vs/editor/common/services/treeSitterParserService';
+import { IModelService } from 'vs/editor/common/services/model';
+import { Disposable, DisposableMap, DisposableStore, dispose, IDisposable } from 'vs/base/common/lifecycle';
+import { ITextModel } from 'vs/editor/common/model';
+import { IFileService } from 'vs/platform/files/common/files';
+import { IModelContentChange } from 'vs/editor/common/textModelEvents';
+import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { ILogService } from 'vs/platform/log/common/log';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { setTimeout0 } from 'vs/base/common/platform';
+import { importAMDNodeModule } from 'vs/amdX';
+import { Emitter, Event } from 'vs/base/common/event';
+import { CancellationToken, cancelOnDispose } from 'vs/base/common/cancellation';
+import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { canASAR } from 'vs/base/common/amd';
+import { CancellationError, isCancellationError } from 'vs/base/common/errors';
+import { PromiseResult } from 'vs/base/common/observableInternal/promise';
+
+const EDITOR_TREESITTER_TELEMETRY = 'editor.experimental.treeSitterTelemetry';
+const MODULE_LOCATION_SUBPATH = `@vscode/tree-sitter-wasm/wasm`;
+const FILENAME_TREESITTER_WASM = `tree-sitter.wasm`;
+
+function getModuleLocation(environmentService: IEnvironmentService): AppResourcePath {
+	return `${(canASAR && environmentService.isBuilt) ? nodeModulesAsarUnpackedPath : nodeModulesPath}/${MODULE_LOCATION_SUBPATH}`;
+}
+
+export class TextModelTreeSitter extends Disposable {
+	private _parseResult: TreeSitterParseResult | undefined;
+
+	get parseResult(): ITreeSitterParseResult | undefined { return this._parseResult; }
+
+	constructor(readonly model: ITextModel,
+		private readonly _treeSitterLanguages: TreeSitterLanguages,
+		private readonly _treeSitterImporter: TreeSitterImporter,
+		private readonly _logService: ILogService,
+		private readonly _telemetryService: ITelemetryService
+	) {
+		super();
+		this._register(Event.runAndSubscribe(this.model.onDidChangeLanguage, (e => this._onDidChangeLanguage(e ? e.newLanguage : this.model.getLanguageId()))));
+	}
+
+	private readonly _languageSessionDisposables = this._register(new DisposableStore());
+	/**
+	 * Be very careful when making changes to this method as it is easy to introduce race conditions.
+	 */
+	private async _onDidChangeLanguage(languageId: string) {
+		this._languageSessionDisposables.clear();
+		this._parseResult = undefined;
+
+		const token = cancelOnDispose(this._languageSessionDisposables);
+		let language: Parser.Language | undefined;
+		try {
+			language = await this._getLanguage(languageId, token);
+		} catch (e) {
+			if (isCancellationError(e)) {
+				return;
+			}
+			throw e;
+		}
+
+		const Parser = await this._treeSitterImporter.getParserClass();
+		if (token.isCancellationRequested) {
+			return;
+		}
+
+		const treeSitterTree = this._languageSessionDisposables.add(new TreeSitterParseResult(new Parser(), language, this._logService, this._telemetryService));
+		this._languageSessionDisposables.add(this.model.onDidChangeContent(e => this._onDidChangeContent(treeSitterTree, e.changes)));
+		await this._onDidChangeContent(treeSitterTree, []);
+		if (token.isCancellationRequested) {
+			return;
+		}
+
+		this._parseResult = treeSitterTree;
+	}
+
+	private _getLanguage(languageId: string, token: CancellationToken): Promise<Parser.Language> {
+		const language = this._treeSitterLanguages.getOrInitLanguage(languageId);
+		if (language) {
+			return Promise.resolve(language);
+		}
+		const disposables: IDisposable[] = [];
+
+		return new Promise((resolve, reject) => {
+			disposables.push(this._treeSitterLanguages.onDidAddLanguage(e => {
+				if (e.id === languageId) {
+					dispose(disposables);
+					resolve(e.language);
+				}
+			}));
+			token.onCancellationRequested(() => {
+				dispose(disposables);
+				reject(new CancellationError());
+			}, undefined, disposables);
+		});
+	}
+
+	private async _onDidChangeContent(treeSitterTree: TreeSitterParseResult, changes: IModelContentChange[]) {
+		return treeSitterTree.onDidChangeContent(this.model, changes);
+	}
+}
+
+const enum TelemetryParseType {
+	Full = 'fullParse',
+	Incremental = 'incrementalParse'
+}
+
+export class TreeSitterParseResult implements IDisposable, ITreeSitterParseResult {
+	private _tree: Parser.Tree | undefined;
+	private _isDisposed: boolean = false;
+	constructor(public readonly parser: Parser,
+		public /** exposed for tests **/ readonly language: Parser.Language,
+		private readonly _logService: ILogService,
+		private readonly _telemetryService: ITelemetryService) {
+		this.parser.setTimeoutMicros(50 * 1000); // 50 ms
+		this.parser.setLanguage(language);
+	}
+	dispose(): void {
+		this._isDisposed = true;
+		this._tree?.delete();
+		this.parser?.delete();
+	}
+	get tree() { return this._tree; }
+	private set tree(newTree: Parser.Tree | undefined) {
+		this._tree?.delete();
+		this._tree = newTree;
+	}
+	get isDisposed() { return this._isDisposed; }
+
+	private _onDidChangeContentQueue: Promise<void> = Promise.resolve();
+	public async onDidChangeContent(model: ITextModel, changes: IModelContentChange[]) {
+		this._applyEdits(model, changes);
+		this._onDidChangeContentQueue = this._onDidChangeContentQueue.then(() => {
+			if (this.isDisposed) {
+				// No need to continue the queue if we are disposed
+				return;
+			}
+			return this._parseAndUpdateTree(model);
+		}).catch((e) => {
+			this._logService.error('Error parsing tree-sitter tree', e);
+		});
+		return this._onDidChangeContentQueue;
+	}
+
+	private _newEdits = true;
+	private _applyEdits(model: ITextModel, changes: IModelContentChange[]) {
+		for (const change of changes) {
+			const newEndOffset = change.rangeOffset + change.text.length;
+			const newEndPosition = model.getPositionAt(newEndOffset);
+
+			this.tree?.edit({
+				startIndex: change.rangeOffset,
+				oldEndIndex: change.rangeOffset + change.rangeLength,
+				newEndIndex: change.rangeOffset + change.text.length,
+				startPosition: { row: change.range.startLineNumber - 1, column: change.range.startColumn - 1 },
+				oldEndPosition: { row: change.range.endLineNumber - 1, column: change.range.endColumn - 1 },
+				newEndPosition: { row: newEndPosition.lineNumber - 1, column: newEndPosition.column - 1 }
+			});
+			this._newEdits = true;
+		}
+	}
+
+	private async _parseAndUpdateTree(model: ITextModel) {
+		const tree = await this._parse(model);
+		if (!this._newEdits) {
+			this.tree = tree;
+		}
+	}
+
+	private _parse(model: ITextModel): Promise<Parser.Tree | undefined> {
+		let parseType: TelemetryParseType = TelemetryParseType.Full;
+		if (this.tree) {
+			parseType = TelemetryParseType.Incremental;
+		}
+		return this._parseAndYield(model, parseType);
+	}
+
+	private async _parseAndYield(model: ITextModel, parseType: TelemetryParseType): Promise<Parser.Tree | undefined> {
+		const language = model.getLanguageId();
+		let tree: Parser.Tree | undefined;
+		let time: number = 0;
+		let passes: number = 0;
+		this._newEdits = false;
+		do {
+			const timer = performance.now();
+			try {
+				tree = this.parser.parse((index: number, position?: Parser.Point) => this._parseCallback(model, index), this.tree);
+			} catch (e) {
+				// parsing can fail when the timeout is reached, will resume upon next loop
+			} finally {
+				time += performance.now() - timer;
+				passes++;
+			}
+
+			// Even if the model changes and edits are applied, the tree parsing will continue correctly after the await.
+			await new Promise<void>(resolve => setTimeout0(resolve));
+
+			if (model.isDisposed() || this.isDisposed) {
+				return;
+			}
+		} while (!tree && !this._newEdits); // exit if there a new edits, as anhy parsing done while there are new edits is throw away work
+		// --- Start Positron ---
+		// Disable telemetry (which leaks into tests and causes failures) by
+		// effectively surrounding it with `if false`; we don't just comment it
+		// out because that results in a TS error due to the unused method.
+		//
+		// this.sendParseTimeTelemetry(parseType, language, time, passes);
+		if (!model) {
+			this.sendParseTimeTelemetry(parseType, language, time, passes);
+		}
+		// --- End Positron ---
+		return tree;
+	}
+
+	private _parseCallback(textModel: ITextModel, index: number): string | null {
+		return textModel.getTextBuffer().getNearestChunk(index);
+	}
+
+	private sendParseTimeTelemetry(parseType: TelemetryParseType, languageId: string, time: number, passes: number): void {
+		this._logService.debug(`Tree parsing (${parseType}) took ${time} ms and ${passes} passes.`);
+		type ParseTimeClassification = {
+			owner: 'alros';
+			comment: 'Used to understand how long it takes to parse a tree-sitter tree';
+			languageId: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The programming language ID.' };
+			time: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; isMeasurement: true; comment: 'The ms it took to parse' };
+			passes: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; isMeasurement: true; comment: 'The number of passes it took to parse' };
+		};
+		if (parseType === TelemetryParseType.Full) {
+			this._telemetryService.publicLog2<{ languageId: string; time: number; passes: number }, ParseTimeClassification>(`treeSitter.fullParse`, { languageId, time, passes });
+		} else {
+			this._telemetryService.publicLog2<{ languageId: string; time: number; passes: number }, ParseTimeClassification>(`treeSitter.incrementalParse`, { languageId, time, passes });
+		}
+	}
+}
+
+export class TreeSitterLanguages extends Disposable {
+	private _languages: AsyncCache<string, Parser.Language | undefined> = new AsyncCache();
+	public /*exposed for tests*/ readonly _onDidAddLanguage: Emitter<{ id: string; language: Parser.Language }> = this._register(new Emitter());
+	/**
+	 * If you're looking for a specific language, make sure to check if it already exists with `getLanguage` as it will kick off the process to add it if it doesn't exist.
+	 */
+	public readonly onDidAddLanguage: Event<{ id: string; language: Parser.Language }> = this._onDidAddLanguage.event;
+
+	constructor(private readonly _treeSitterImporter: TreeSitterImporter,
+		private readonly _fileService: IFileService,
+		private readonly _environmentService: IEnvironmentService,
+		private readonly _registeredLanguages: Map<string, string>,
+	) {
+		super();
+	}
+
+	public getOrInitLanguage(languageId: string): Parser.Language | undefined {
+		if (this._languages.isCached(languageId)) {
+			return this._languages.getSyncIfCached(languageId);
+		} else {
+			// kick off adding the language, but don't wait
+			this._addLanguage(languageId);
+			return undefined;
+		}
+	}
+
+	private async _addLanguage(languageId: string): Promise<void> {
+		const languagePromise = this._languages.get(languageId);
+		if (!languagePromise) {
+			this._languages.set(languageId, this._fetchLanguage(languageId));
+			const language = await this._languages.get(languageId);
+			if (!language) {
+				return undefined;
+			}
+			this._onDidAddLanguage.fire({ id: languageId, language });
+		}
+	}
+
+	private async _fetchLanguage(languageId: string): Promise<Parser.Language | undefined> {
+		const grammarName = this._registeredLanguages.get(languageId);
+		const languageLocation = this._getLanguageLocation(languageId);
+		if (!grammarName || !languageLocation) {
+			return undefined;
+		}
+		const wasmPath: AppResourcePath = `${languageLocation}/${grammarName}.wasm`;
+		const languageFile = await (this._fileService.readFile(FileAccess.asFileUri(wasmPath)));
+		const Parser = await this._treeSitterImporter.getParserClass();
+		return Parser.Language.load(languageFile.value.buffer);
+	}
+
+	private _getLanguageLocation(languageId: string): AppResourcePath | undefined {
+		const grammarName = this._registeredLanguages.get(languageId);
+		if (!grammarName) {
+			return undefined;
+		}
+		return getModuleLocation(this._environmentService);
+	}
+}
+
+export class TreeSitterImporter {
+	private _treeSitterImport: typeof import('@vscode/tree-sitter-wasm') | undefined;
+	private async _getTreeSitterImport() {
+		if (!this._treeSitterImport) {
+			this._treeSitterImport = await importAMDNodeModule<typeof import('@vscode/tree-sitter-wasm')>('@vscode/tree-sitter-wasm', 'wasm/tree-sitter.js');
+		}
+		return this._treeSitterImport;
+	}
+
+	private _parserClass: typeof Parser | undefined;
+	public async getParserClass() {
+		if (!this._parserClass) {
+			this._parserClass = (await this._getTreeSitterImport()).Parser;
+		}
+		return this._parserClass;
+	}
+}
+
+export class TreeSitterTextModelService extends Disposable implements ITreeSitterParserService {
+	readonly _serviceBrand: undefined;
+	private _init!: Promise<boolean>;
+	private _textModelTreeSitters: DisposableMap<ITextModel, TextModelTreeSitter> = this._register(new DisposableMap());
+	private readonly _registeredLanguages: Map<string, string> = new Map();
+	private readonly _treeSitterImporter: TreeSitterImporter = new TreeSitterImporter();
+	private readonly _treeSitterLanguages: TreeSitterLanguages;
+
+	public readonly onDidAddLanguage: Event<{ id: string; language: Parser.Language }>;
+
+	constructor(@IModelService private readonly _modelService: IModelService,
+		@IFileService fileService: IFileService,
+		@ITelemetryService private readonly _telemetryService: ITelemetryService,
+		@ILogService private readonly _logService: ILogService,
+		@IConfigurationService private readonly _configurationService: IConfigurationService,
+		@IEnvironmentService private readonly _environmentService: IEnvironmentService
+	) {
+		super();
+		this._treeSitterLanguages = this._register(new TreeSitterLanguages(this._treeSitterImporter, fileService, this._environmentService, this._registeredLanguages));
+		this.onDidAddLanguage = this._treeSitterLanguages.onDidAddLanguage;
+		this._register(this._configurationService.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration(EDITOR_EXPERIMENTAL_PREFER_TREESITTER)) {
+				this._supportedLanguagesChanged();
+			}
+		}));
+		this._supportedLanguagesChanged();
+	}
+
+	getOrInitLanguage(languageId: string): Parser.Language | undefined {
+		return this._treeSitterLanguages.getOrInitLanguage(languageId);
+	}
+
+	getParseResult(textModel: ITextModel): ITreeSitterParseResult | undefined {
+		const textModelTreeSitter = this._textModelTreeSitters.get(textModel);
+		return textModelTreeSitter?.parseResult;
+	}
+
+	private async _doInitParser() {
+		const Parser = await this._treeSitterImporter.getParserClass();
+		const environmentService = this._environmentService;
+		await Parser.init({
+			locateFile(_file: string, _folder: string) {
+				return FileAccess.asBrowserUri(`${getModuleLocation(environmentService)}/${FILENAME_TREESITTER_WASM}`).toString(true);
+			}
+		});
+		return true;
+	}
+
+	private _hasInit: boolean = false;
+	private async _initParser(hasLanguages: boolean): Promise<boolean> {
+		if (this._hasInit) {
+			return this._init;
+		}
+
+		if (hasLanguages) {
+			this._hasInit = true;
+			this._init = this._doInitParser();
+
+			// New init, we need to deal with all the existing text models and set up listeners
+			this._init.then(() => this._registerModelServiceListeners());
+		} else {
+			this._init = Promise.resolve(false);
+		}
+		return this._init;
+	}
+
+	private async _supportedLanguagesChanged() {
+		const setting = this._getSetting();
+
+		let hasLanguages = true;
+		if (setting.length === 0) {
+			hasLanguages = false;
+		}
+
+		if (await this._initParser(hasLanguages)) {
+			// Eventually, this should actually use an extension point to add tree sitter grammars, but for now they are hard coded in core
+			if (setting.includes('typescript')) {
+				this._addGrammar('typescript', 'tree-sitter-typescript');
+			} else {
+				this._removeGrammar('typescript');
+			}
+		}
+	}
+
+	private _getSetting(): string[] {
+		const setting = this._configurationService.getValue<string[]>(EDITOR_EXPERIMENTAL_PREFER_TREESITTER);
+		if (setting && setting.length > 0) {
+			return setting;
+		} else {
+			const expSetting = this._configurationService.getValue<boolean>(EDITOR_TREESITTER_TELEMETRY);
+			if (expSetting) {
+				return ['typescript'];
+			}
+		}
+		return [];
+	}
+
+	private async _registerModelServiceListeners() {
+		this._register(this._modelService.onModelAdded(model => {
+			this._createTextModelTreeSitter(model);
+		}));
+		this._register(this._modelService.onModelRemoved(model => {
+			this._textModelTreeSitters.deleteAndDispose(model);
+		}));
+		this._modelService.getModels().forEach(model => this._createTextModelTreeSitter(model));
+	}
+
+	private _createTextModelTreeSitter(model: ITextModel) {
+		const textModelTreeSitter = new TextModelTreeSitter(model, this._treeSitterLanguages, this._treeSitterImporter, this._logService, this._telemetryService);
+		this._textModelTreeSitters.set(model, textModelTreeSitter);
+	}
+
+	private _addGrammar(languageId: string, grammarName: string) {
+		if (!this._registeredLanguages.has(languageId)) {
+			this._registeredLanguages.set(languageId, grammarName);
+		}
+	}
+
+	private _removeGrammar(languageId: string) {
+		if (this._registeredLanguages.has(languageId)) {
+			this._registeredLanguages.delete('typescript');
+		}
+	}
+}
+
+class PromiseWithSyncAccess<T> {
+	private _result: PromiseResult<T> | undefined;
+	/**
+	 * Returns undefined if the promise did not resolve yet.
+	 */
+	get result(): PromiseResult<T> | undefined {
+		return this._result;
+	}
+
+	constructor(public readonly promise: Promise<T>) {
+		promise.then(result => {
+			this._result = new PromiseResult(result, undefined);
+		}).catch(e => {
+			this._result = new PromiseResult<T>(undefined, e);
+		});
+	}
+}
+
+class AsyncCache<TKey, T> {
+	private readonly _values = new Map<TKey, PromiseWithSyncAccess<T>>();
+
+	set(key: TKey, promise: Promise<T>) {
+		this._values.set(key, new PromiseWithSyncAccess(promise));
+	}
+
+	get(key: TKey): Promise<T> | undefined {
+		return this._values.get(key)?.promise;
+	}
+
+	getSyncIfCached(key: TKey): T | undefined {
+		return this._values.get(key)?.result?.data;
+	}
+
+	isCached(key: TKey): boolean {
+		return this._values.get(key)?.result !== undefined;
+	}
+}
diff --git a/src/vs/editor/browser/view.ts b/src/vs/editor/browser/view.ts
index 6fd52aabe30..6ff5ac82b97 100644
--- a/src/vs/editor/browser/view.ts
+++ b/src/vs/editor/browser/view.ts
@@ -97,7 +97,6 @@ export class View extends ViewEventHandler {
 	private readonly _linesContent: FastDomNode<HTMLElement>;
 	public readonly domNode: FastDomNode<HTMLElement>;
 	private readonly _overflowGuardContainer: FastDomNode<HTMLElement>;
-	private readonly _overflowWidgetsDomNode: HTMLElement | null;
 
 	// Actual mutable state
 	private _shouldRecomputeGlyphMarginLanes: boolean = false;
@@ -115,7 +114,6 @@ export class View extends ViewEventHandler {
 		super();
 		this._selections = [new Selection(1, 1, 1, 1)];
 		this._renderAnimationFrame = null;
-		this._overflowWidgetsDomNode = overflowWidgetsDomNode ?? null;
 
 		const viewController = new ViewController(configuration, model, userInputEvents, commandDelegate);
 
@@ -280,7 +278,6 @@ export class View extends ViewEventHandler {
 	private _createPointerHandlerHelper(): IPointerHandlerHelper {
 		return {
 			viewDomNode: this.domNode.domNode,
-			overflowWidgetsDomNode: this._overflowWidgetsDomNode,
 			linesContentDomNode: this._linesContent.domNode,
 			viewLinesDomNode: this._viewLines.getDomNode().domNode,
 
@@ -411,7 +408,7 @@ export class View extends ViewEventHandler {
 		if (this._renderAnimationFrame === null) {
 			const rendering = this._createCoordinatedRendering();
 			this._renderAnimationFrame = EditorRenderingCoordinator.INSTANCE.scheduleCoordinatedRendering({
-				window: dom.getWindow(this.domNode.domNode),
+				window: dom.getWindow(this.domNode?.domNode),
 				prepareRenderText: () => {
 					if (this._store.isDisposed) {
 						throw new BugIndicatingError();
diff --git a/src/vs/editor/browser/view/viewLayer.ts b/src/vs/editor/browser/view/viewLayer.ts
index 971d8ae4011..308e0ff54d9 100644
--- a/src/vs/editor/browser/view/viewLayer.ts
+++ b/src/vs/editor/browser/view/viewLayer.ts
@@ -35,13 +35,17 @@ export interface ILine {
 	onTokensChanged(): void;
 }
 
+export interface ILineFactory<T extends ILine> {
+	createLine(): T;
+}
+
 export class RenderedLinesCollection<T extends ILine> {
-	private readonly _createLine: () => T;
 	private _lines!: T[];
 	private _rendLineNumberStart!: number;
 
-	constructor(createLine: () => T) {
-		this._createLine = createLine;
+	constructor(
+		private readonly _lineFactory: ILineFactory<T>,
+	) {
 		this._set(1, []);
 	}
 
@@ -201,7 +205,7 @@ export class RenderedLinesCollection<T extends ILine> {
 		// insert inside the viewport, push out some lines, but not all remaining lines
 		const newLines: T[] = [];
 		for (let i = 0; i < insertCnt; i++) {
-			newLines[i] = this._createLine();
+			newLines[i] = this._lineFactory.createLine();
 		}
 		const insertIndex = insertFromLineNumber - this._rendLineNumberStart;
 		const beforeLines = this._lines.slice(0, insertIndex);
@@ -245,20 +249,14 @@ export class RenderedLinesCollection<T extends ILine> {
 	}
 }
 
-export interface IVisibleLinesHost<T extends IVisibleLine> {
-	createVisibleLine(): T;
-}
-
 export class VisibleLinesCollection<T extends IVisibleLine> {
 
-	private readonly _host: IVisibleLinesHost<T>;
-	public readonly domNode: FastDomNode<HTMLElement>;
-	private readonly _linesCollection: RenderedLinesCollection<T>;
+	public readonly domNode: FastDomNode<HTMLElement> = this._createDomNode();
+	private readonly _linesCollection: RenderedLinesCollection<T> = new RenderedLinesCollection<T>(this._lineFactory);
 
-	constructor(host: IVisibleLinesHost<T>) {
-		this._host = host;
-		this.domNode = this._createDomNode();
-		this._linesCollection = new RenderedLinesCollection<T>(() => this._host.createVisibleLine());
+	constructor(
+		private readonly _lineFactory: ILineFactory<T>
+	) {
 	}
 
 	private _createDomNode(): FastDomNode<HTMLElement> {
@@ -345,7 +343,7 @@ export class VisibleLinesCollection<T extends IVisibleLine> {
 
 		const inp = this._linesCollection._get();
 
-		const renderer = new ViewLayerRenderer<T>(this.domNode.domNode, this._host, viewportData);
+		const renderer = new ViewLayerRenderer<T>(this.domNode.domNode, this._lineFactory, viewportData);
 
 		const ctx: IRendererContext<T> = {
 			rendLineNumberStart: inp.rendLineNumberStart,
@@ -370,14 +368,11 @@ class ViewLayerRenderer<T extends IVisibleLine> {
 
 	private static _ttPolicy = createTrustedTypesPolicy('editorViewLayer', { createHTML: value => value });
 
-	readonly domNode: HTMLElement;
-	readonly host: IVisibleLinesHost<T>;
-	readonly viewportData: ViewportData;
-
-	constructor(domNode: HTMLElement, host: IVisibleLinesHost<T>, viewportData: ViewportData) {
-		this.domNode = domNode;
-		this.host = host;
-		this.viewportData = viewportData;
+	constructor(
+		private readonly _domNode: HTMLElement,
+		private readonly _lineFactory: ILineFactory<T>,
+		private readonly _viewportData: ViewportData,
+	) {
 	}
 
 	public render(inContext: IRendererContext<T>, startLineNumber: number, stopLineNumber: number, deltaTop: number[]): IRendererContext<T> {
@@ -394,7 +389,7 @@ class ViewLayerRenderer<T extends IVisibleLine> {
 			ctx.linesLength = stopLineNumber - startLineNumber + 1;
 			ctx.lines = [];
 			for (let x = startLineNumber; x <= stopLineNumber; x++) {
-				ctx.lines[x - startLineNumber] = this.host.createVisibleLine();
+				ctx.lines[x - startLineNumber] = this._lineFactory.createLine();
 			}
 			this._finishRendering(ctx, true, deltaTop);
 			return ctx;
@@ -461,7 +456,7 @@ class ViewLayerRenderer<T extends IVisibleLine> {
 
 		for (let i = startIndex; i <= endIndex; i++) {
 			const lineNumber = rendLineNumberStart + i;
-			lines[i].layoutLine(lineNumber, deltaTop[lineNumber - deltaLN], this.viewportData.lineHeight);
+			lines[i].layoutLine(lineNumber, deltaTop[lineNumber - deltaLN], this._viewportData.lineHeight);
 		}
 	}
 
@@ -469,7 +464,7 @@ class ViewLayerRenderer<T extends IVisibleLine> {
 		const newLines: T[] = [];
 		let newLinesLen = 0;
 		for (let lineNumber = fromLineNumber; lineNumber <= toLineNumber; lineNumber++) {
-			newLines[newLinesLen++] = this.host.createVisibleLine();
+			newLines[newLinesLen++] = this._lineFactory.createLine();
 		}
 		ctx.lines = newLines.concat(ctx.lines);
 	}
@@ -486,7 +481,7 @@ class ViewLayerRenderer<T extends IVisibleLine> {
 		const newLines: T[] = [];
 		let newLinesLen = 0;
 		for (let lineNumber = fromLineNumber; lineNumber <= toLineNumber; lineNumber++) {
-			newLines[newLinesLen++] = this.host.createVisibleLine();
+			newLines[newLinesLen++] = this._lineFactory.createLine();
 		}
 		ctx.lines = ctx.lines.concat(newLines);
 	}
@@ -505,14 +500,14 @@ class ViewLayerRenderer<T extends IVisibleLine> {
 		if (ViewLayerRenderer._ttPolicy) {
 			newLinesHTML = ViewLayerRenderer._ttPolicy.createHTML(newLinesHTML as string);
 		}
-		const lastChild = <HTMLElement>this.domNode.lastChild;
+		const lastChild = <HTMLElement>this._domNode.lastChild;
 		if (domNodeIsEmpty || !lastChild) {
-			this.domNode.innerHTML = newLinesHTML as string; // explains the ugly casts -> https://github.com/microsoft/vscode/issues/106396#issuecomment-692625393;
+			this._domNode.innerHTML = newLinesHTML as string; // explains the ugly casts -> https://github.com/microsoft/vscode/issues/106396#issuecomment-692625393;
 		} else {
 			lastChild.insertAdjacentHTML('afterend', newLinesHTML as string);
 		}
 
-		let currChild = <HTMLElement>this.domNode.lastChild;
+		let currChild = <HTMLElement>this._domNode.lastChild;
 		for (let i = ctx.linesLength - 1; i >= 0; i--) {
 			const line = ctx.lines[i];
 			if (wasNew[i]) {
@@ -565,7 +560,7 @@ class ViewLayerRenderer<T extends IVisibleLine> {
 					continue;
 				}
 
-				const renderResult = line.renderLine(i + rendLineNumberStart, deltaTop[i], this.viewportData.lineHeight, this.viewportData, sb);
+				const renderResult = line.renderLine(i + rendLineNumberStart, deltaTop[i], this._viewportData.lineHeight, this._viewportData, sb);
 				if (!renderResult) {
 					// line does not need rendering
 					continue;
@@ -595,7 +590,7 @@ class ViewLayerRenderer<T extends IVisibleLine> {
 					continue;
 				}
 
-				const renderResult = line.renderLine(i + rendLineNumberStart, deltaTop[i], this.viewportData.lineHeight, this.viewportData, sb);
+				const renderResult = line.renderLine(i + rendLineNumberStart, deltaTop[i], this._viewportData.lineHeight, this._viewportData, sb);
 				if (!renderResult) {
 					// line does not need rendering
 					continue;
diff --git a/src/vs/editor/browser/view/viewOverlays.ts b/src/vs/editor/browser/view/viewOverlays.ts
index 1041fd58a58..1fd1c011d65 100644
--- a/src/vs/editor/browser/view/viewOverlays.ts
+++ b/src/vs/editor/browser/view/viewOverlays.ts
@@ -6,7 +6,7 @@
 import { FastDomNode, createFastDomNode } from 'vs/base/browser/fastDomNode';
 import { applyFontInfo } from 'vs/editor/browser/config/domFontInfo';
 import { DynamicViewOverlay } from 'vs/editor/browser/view/dynamicViewOverlay';
-import { IVisibleLine, IVisibleLinesHost, VisibleLinesCollection } from 'vs/editor/browser/view/viewLayer';
+import { IVisibleLine, VisibleLinesCollection } from 'vs/editor/browser/view/viewLayer';
 import { ViewPart } from 'vs/editor/browser/view/viewPart';
 import { StringBuilder } from 'vs/editor/common/core/stringBuilder';
 import { RenderingContext, RestrictedRenderingContext } from 'vs/editor/browser/view/renderingContext';
@@ -15,26 +15,24 @@ import * as viewEvents from 'vs/editor/common/viewEvents';
 import { ViewportData } from 'vs/editor/common/viewLayout/viewLinesViewportData';
 import { EditorOption } from 'vs/editor/common/config/editorOptions';
 
-export class ViewOverlays extends ViewPart implements IVisibleLinesHost<ViewOverlayLine> {
-
+export class ViewOverlays extends ViewPart {
 	private readonly _visibleLines: VisibleLinesCollection<ViewOverlayLine>;
 	protected readonly domNode: FastDomNode<HTMLElement>;
-	private _dynamicOverlays: DynamicViewOverlay[];
-	private _isFocused: boolean;
+	private _dynamicOverlays: DynamicViewOverlay[] = [];
+	private _isFocused: boolean = false;
 
 	constructor(context: ViewContext) {
 		super(context);
 
-		this._visibleLines = new VisibleLinesCollection<ViewOverlayLine>(this);
+		this._visibleLines = new VisibleLinesCollection<ViewOverlayLine>({
+			createLine: () => new ViewOverlayLine(this._dynamicOverlays)
+		});
 		this.domNode = this._visibleLines.domNode;
 
 		const options = this._context.configuration.options;
 		const fontInfo = options.get(EditorOption.fontInfo);
 		applyFontInfo(this.domNode, fontInfo);
 
-		this._dynamicOverlays = [];
-		this._isFocused = false;
-
 		this.domNode.setClassName('view-overlays');
 	}
 
@@ -67,14 +65,6 @@ export class ViewOverlays extends ViewPart implements IVisibleLinesHost<ViewOver
 		return this.domNode;
 	}
 
-	// ---- begin IVisibleLinesHost
-
-	public createVisibleLine(): ViewOverlayLine {
-		return new ViewOverlayLine(this._dynamicOverlays);
-	}
-
-	// ---- end IVisibleLinesHost
-
 	public addDynamicOverlay(overlay: DynamicViewOverlay): void {
 		this._dynamicOverlays.push(overlay);
 	}
diff --git a/src/vs/editor/browser/viewParts/lines/viewLines.ts b/src/vs/editor/browser/viewParts/lines/viewLines.ts
index 220ef987255..ce594c13612 100644
--- a/src/vs/editor/browser/viewParts/lines/viewLines.ts
+++ b/src/vs/editor/browser/viewParts/lines/viewLines.ts
@@ -11,7 +11,7 @@ import { Constants } from 'vs/base/common/uint';
 import 'vs/css!./viewLines';
 import { applyFontInfo } from 'vs/editor/browser/config/domFontInfo';
 import { HorizontalPosition, HorizontalRange, IViewLines, LineVisibleRanges, VisibleRanges } from 'vs/editor/browser/view/renderingContext';
-import { IVisibleLinesHost, VisibleLinesCollection } from 'vs/editor/browser/view/viewLayer';
+import { VisibleLinesCollection } from 'vs/editor/browser/view/viewLayer';
 import { PartFingerprint, PartFingerprints, ViewPart } from 'vs/editor/browser/view/viewPart';
 import { DomReadingContext } from 'vs/editor/browser/viewParts/lines/domReadingContext';
 import { ViewLine, ViewLineOptions } from 'vs/editor/browser/viewParts/lines/viewLine';
@@ -87,7 +87,7 @@ class HorizontalRevealSelectionsRequest {
 
 type HorizontalRevealRequest = HorizontalRevealRangeRequest | HorizontalRevealSelectionsRequest;
 
-export class ViewLines extends ViewPart implements IVisibleLinesHost<ViewLine>, IViewLines {
+export class ViewLines extends ViewPart implements IViewLines {
 	/**
 	 * Adds this amount of pixels to the right of lines (no-one wants to type near the edge of the viewport)
 	 */
@@ -122,10 +122,6 @@ export class ViewLines extends ViewPart implements IVisibleLinesHost<ViewLine>,
 
 	constructor(context: ViewContext, linesContent: FastDomNode<HTMLElement>) {
 		super(context);
-		this._linesContent = linesContent;
-		this._textRangeRestingSpot = document.createElement('div');
-		this._visibleLines = new VisibleLinesCollection(this);
-		this.domNode = this._visibleLines.domNode;
 
 		const conf = this._context.configuration;
 		const options = this._context.configuration.options;
@@ -141,6 +137,13 @@ export class ViewLines extends ViewPart implements IVisibleLinesHost<ViewLine>,
 		this._canUseLayerHinting = !options.get(EditorOption.disableLayerHinting);
 		this._viewLineOptions = new ViewLineOptions(conf, this._context.theme.type);
 
+		this._linesContent = linesContent;
+		this._textRangeRestingSpot = document.createElement('div');
+		this._visibleLines = new VisibleLinesCollection({
+			createLine: () => new ViewLine(this._viewLineOptions),
+		});
+		this.domNode = this._visibleLines.domNode;
+
 		PartFingerprints.write(this.domNode, PartFingerprint.ViewLines);
 		this.domNode.setClassName(`view-lines ${MOUSE_CURSOR_TEXT_CSS_CLASS_NAME}`);
 		applyFontInfo(this.domNode, fontInfo);
@@ -173,14 +176,6 @@ export class ViewLines extends ViewPart implements IVisibleLinesHost<ViewLine>,
 		return this.domNode;
 	}
 
-	// ---- begin IVisibleLinesHost
-
-	public createVisibleLine(): ViewLine {
-		return new ViewLine(this._viewLineOptions);
-	}
-
-	// ---- end IVisibleLinesHost
-
 	// ---- begin view event handlers
 
 	public override onConfigurationChanged(e: viewEvents.ViewConfigurationChangedEvent): boolean {
@@ -710,12 +705,10 @@ export class ViewLines extends ViewPart implements IVisibleLinesHost<ViewLine>,
 		let paddingBottom: number = 0;
 
 		if (!shouldIgnoreScrollOff) {
-			const context = Math.min((viewportHeight / this._lineHeight) / 2, this._cursorSurroundingLines);
-			if (this._stickyScrollEnabled) {
-				paddingTop = Math.max(context, this._maxNumberStickyLines) * this._lineHeight;
-			} else {
-				paddingTop = context * this._lineHeight;
-			}
+			const maxLinesInViewport = (viewportHeight / this._lineHeight);
+			const surroundingLines = Math.max(this._cursorSurroundingLines, this._stickyScrollEnabled ? this._maxNumberStickyLines : 0);
+			const context = Math.min(maxLinesInViewport / 2, surroundingLines);
+			paddingTop = context * this._lineHeight;
 			paddingBottom = Math.max(0, (context - 1)) * this._lineHeight;
 		} else {
 			if (!minimalReveal) {
diff --git a/src/vs/editor/browser/viewParts/minimap/minimap.ts b/src/vs/editor/browser/viewParts/minimap/minimap.ts
index 7b49f5b0dea..19db0c6b43a 100644
--- a/src/vs/editor/browser/viewParts/minimap/minimap.ts
+++ b/src/vs/editor/browser/viewParts/minimap/minimap.ts
@@ -445,9 +445,9 @@ class RenderData {
 	) {
 		this.renderedLayout = renderedLayout;
 		this._imageData = imageData;
-		this._renderedLines = new RenderedLinesCollection(
-			() => MinimapLine.INVALID
-		);
+		this._renderedLines = new RenderedLinesCollection({
+			createLine: () => MinimapLine.INVALID
+		});
 		this._renderedLines._set(renderedLayout.startLineNumber, lines);
 	}
 
diff --git a/src/vs/editor/browser/widget/codeEditor/codeEditorWidget.ts b/src/vs/editor/browser/widget/codeEditor/codeEditorWidget.ts
index f8ed64fba6c..660e00eea1c 100644
--- a/src/vs/editor/browser/widget/codeEditor/codeEditorWidget.ts
+++ b/src/vs/editor/browser/widget/codeEditor/codeEditorWidget.ts
@@ -577,7 +577,8 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE
 		if (!this._modelData) {
 			return -1;
 		}
-		return CodeEditorWidget._getVerticalOffsetAfterPosition(this._modelData, lineNumber, 1, includeViewZones);
+		const maxCol = this._modelData.model.getLineMaxColumn(lineNumber);
+		return CodeEditorWidget._getVerticalOffsetAfterPosition(this._modelData, lineNumber, maxCol, includeViewZones);
 	}
 
 	public setHiddenAreas(ranges: IRange[], source?: unknown): void {
diff --git a/src/vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/diffEditorViewZones.ts b/src/vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/diffEditorViewZones.ts
index cfbad5b68b3..3b1b222de0d 100644
--- a/src/vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/diffEditorViewZones.ts
+++ b/src/vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/diffEditorViewZones.ts
@@ -633,7 +633,10 @@ export function allowsTrueInlineDiffRendering(mapping: DetailedLineRangeMapping)
 	if (!mapping.innerChanges) {
 		return false;
 	}
-	return mapping.innerChanges.every(c => rangeIsSingleLine(c.modifiedRange) && rangeIsSingleLine(c.originalRange));
+	return mapping.innerChanges.every(c =>
+		(rangeIsSingleLine(c.modifiedRange) && rangeIsSingleLine(c.originalRange))
+		|| c.originalRange.equalsRange(new Range(1, 1, 1, 1))
+	);
 }
 
 function rangeIsSingleLine(range: Range): boolean {
diff --git a/src/vs/editor/browser/widget/diffEditor/utils/editorGutter.ts b/src/vs/editor/browser/widget/diffEditor/utils/editorGutter.ts
index a301fc6124b..3d76c01e26e 100644
--- a/src/vs/editor/browser/widget/diffEditor/utils/editorGutter.ts
+++ b/src/vs/editor/browser/widget/diffEditor/utils/editorGutter.ts
@@ -118,10 +118,10 @@ export class EditorGutter<T extends IGutterItemInfo = IGutterItemInfo> extends D
 							gutterItem.range.startLineNumber <= this._editor.getModel()!.getLineCount()
 								? this._editor.getTopForLineNumber(gutterItem.range.startLineNumber, true) - scrollTop
 								: this._editor.getBottomForLineNumber(gutterItem.range.startLineNumber - 1, false) - scrollTop;
-						const bottom = gutterItem.range.isEmpty
-							// Don't trust that `getBottomForLineNumber` for the previous line equals `getTopForLineNumber` for the current one.
-							? top
-							: (this._editor.getBottomForLineNumber(gutterItem.range.endLineNumberExclusive - 1, true) - scrollTop);
+						const bottom =
+							gutterItem.range.endLineNumberExclusive === 1 ?
+								Math.max(top, this._editor.getTopForLineNumber(gutterItem.range.startLineNumber, false) - scrollTop)
+								: Math.max(top, this._editor.getBottomForLineNumber(gutterItem.range.endLineNumberExclusive - 1, true) - scrollTop);
 
 						const height = bottom - top;
 						view.domNode.style.top = `${top}px`;
diff --git a/src/vs/editor/browser/widget/multiDiffEditor/colors.ts b/src/vs/editor/browser/widget/multiDiffEditor/colors.ts
index 297e5e86465..c9e2cca5fb6 100644
--- a/src/vs/editor/browser/widget/multiDiffEditor/colors.ts
+++ b/src/vs/editor/browser/widget/multiDiffEditor/colors.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { localize } from 'vs/nls';
-import { registerColor } from 'vs/platform/theme/common/colorRegistry';
+import { registerColor, editorBackground } from 'vs/platform/theme/common/colorRegistry';
 
 export const multiDiffEditorHeaderBackground = registerColor(
 	'multiDiffEditor.headerBackground',
@@ -14,7 +14,7 @@ export const multiDiffEditorHeaderBackground = registerColor(
 
 export const multiDiffEditorBackground = registerColor(
 	'multiDiffEditor.background',
-	'editorBackground',
+	editorBackground,
 	localize('multiDiffEditor.background', 'The background color of the multi file diff editor')
 );
 
diff --git a/src/vs/editor/browser/widget/multiDiffEditor/diffEditorItemTemplate.ts b/src/vs/editor/browser/widget/multiDiffEditor/diffEditorItemTemplate.ts
index 8f7d4a12ab0..d9b726079ea 100644
--- a/src/vs/editor/browser/widget/multiDiffEditor/diffEditorItemTemplate.ts
+++ b/src/vs/editor/browser/widget/multiDiffEditor/diffEditorItemTemplate.ts
@@ -20,6 +20,8 @@ import { MenuId } from 'vs/platform/actions/common/actions';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IObjectData, IPooledObject } from './objectPool';
 import { ActionRunnerWithContext } from './utils';
+import { IContextKeyService, type IScopedContextKeyService } from 'vs/platform/contextkey/common/contextkey';
+import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
 
 export class TemplateData implements IObjectData {
 	constructor(
@@ -94,12 +96,14 @@ export class DiffEditorItemTemplate extends Disposable implements IPooledObject<
 		: undefined;
 
 	private readonly _outerEditorHeight: number;
+	private readonly _contextKeyService: IScopedContextKeyService;
 
 	constructor(
 		private readonly _container: HTMLElement,
 		private readonly _overflowWidgetsDomNode: HTMLElement,
 		private readonly _workbenchUIElementFactory: IWorkbenchUIElementFactory,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+		@IContextKeyService _parentContextKeyService: IContextKeyService,
 	) {
 		super();
 
@@ -155,13 +159,15 @@ export class DiffEditorItemTemplate extends Disposable implements IPooledObject<
 		this._container.appendChild(this._elements.root);
 		this._outerEditorHeight = this._headerHeight;
 
-		this._register(this._instantiationService.createInstance(MenuWorkbenchToolBar, this._elements.actions, MenuId.MultiDiffEditorFileToolbar, {
+		this._contextKeyService = this._register(_parentContextKeyService.createScoped(this._elements.actions));
+		const instantiationService = this._register(this._instantiationService.createChild(new ServiceCollection([IContextKeyService, this._contextKeyService])));
+		this._register(instantiationService.createInstance(MenuWorkbenchToolBar, this._elements.actions, MenuId.MultiDiffEditorFileToolbar, {
 			actionRunner: this._register(new ActionRunnerWithContext(() => (this._viewModel.get()?.modifiedUri))),
 			menuOptions: {
 				shouldForwardArgs: true,
 			},
 			toolbarOptions: { primaryGroup: g => g.startsWith('navigation') },
-			actionViewItemProvider: (action, options) => createActionViewItem(_instantiationService, action, options),
+			actionViewItemProvider: (action, options) => createActionViewItem(instantiationService, action, options),
 		}));
 	}
 
@@ -173,7 +179,7 @@ export class DiffEditorItemTemplate extends Disposable implements IPooledObject<
 		}
 	}
 
-	private readonly _dataStore = new DisposableStore();
+	private readonly _dataStore = this._register(new DisposableStore());
 
 	private _data: TemplateData | undefined;
 
@@ -248,6 +254,12 @@ export class DiffEditorItemTemplate extends Disposable implements IPooledObject<
 				this.setData(undefined);
 			}
 		});
+
+		if (data.viewModel.documentDiffItem.contextKeys) {
+			for (const [key, value] of Object.entries(data.viewModel.documentDiffItem.contextKeys)) {
+				this._contextKeyService.createKey(key, value);
+			}
+		}
 	}
 
 	private readonly _headerHeight = /*this._elements.header.clientHeight*/ 40;
diff --git a/src/vs/editor/browser/widget/multiDiffEditor/model.ts b/src/vs/editor/browser/widget/multiDiffEditor/model.ts
index f2b11dc998c..d3ee5972e8d 100644
--- a/src/vs/editor/browser/widget/multiDiffEditor/model.ts
+++ b/src/vs/editor/browser/widget/multiDiffEditor/model.ts
@@ -26,4 +26,5 @@ export interface IDocumentDiffItem {
 	readonly modified: ITextModel | undefined;
 	readonly options?: IDiffEditorOptions;
 	readonly onOptionsDidChange?: Event<void>;
+	readonly contextKeys?: Record<string, ContextKeyValue>;
 }
diff --git a/src/vs/editor/common/config/editorConfigurationSchema.ts b/src/vs/editor/common/config/editorConfigurationSchema.ts
index 98d82d7f878..ea51e8361fc 100644
--- a/src/vs/editor/common/config/editorConfigurationSchema.ts
+++ b/src/vs/editor/common/config/editorConfigurationSchema.ts
@@ -94,7 +94,7 @@ const editorConfiguration: IConfigurationNode = {
 		},
 		'editor.experimental.asyncTokenization': {
 			type: 'boolean',
-			default: false,
+			default: true,
 			description: nls.localize('editor.experimental.asyncTokenization', "Controls whether the tokenization should happen asynchronously on a web worker."),
 			tags: ['experimental'],
 		},
@@ -109,6 +109,12 @@ const editorConfiguration: IConfigurationNode = {
 			description: nls.localize('editor.experimental.asyncTokenizationVerification', "Controls whether async tokenization should be verified against legacy background tokenization. Might slow down tokenization. For debugging only."),
 			tags: ['experimental'],
 		},
+		'editor.experimental.treeSitterTelemetry': {
+			type: 'boolean',
+			default: false,
+			markdownDescription: nls.localize('editor.experimental.treeSitterTelemetry', "Controls whether tree sitter parsing should be turned on and telemetry collected. Setting `editor.experimental.preferTreeSitter` for specific languages will take precedence."),
+			tags: ['experimental']
+		},
 		'editor.language.brackets': {
 			type: ['array', 'null'],
 			default: null, // We want to distinguish the empty array from not configured.
diff --git a/src/vs/editor/common/config/editorOptions.ts b/src/vs/editor/common/config/editorOptions.ts
index 242f1de8cc4..42b3e9d665c 100644
--- a/src/vs/editor/common/config/editorOptions.ts
+++ b/src/vs/editor/common/config/editorOptions.ts
@@ -2813,7 +2813,7 @@ export type EditorLightbulbOptions = Readonly<Required<IEditorLightbulbOptions>>
 class EditorLightbulb extends BaseEditorOption<EditorOption.lightbulb, IEditorLightbulbOptions, EditorLightbulbOptions> {
 
 	constructor() {
-		const defaults: EditorLightbulbOptions = { enabled: ShowLightbulbIconMode.On };
+		const defaults: EditorLightbulbOptions = { enabled: ShowLightbulbIconMode.OnCode };
 		super(
 			EditorOption.lightbulb, 'lightbulb', defaults,
 			{
diff --git a/src/vs/editor/common/core/editorColorRegistry.ts b/src/vs/editor/common/core/editorColorRegistry.ts
index b7c71f99721..b8c8157b26b 100644
--- a/src/vs/editor/common/core/editorColorRegistry.ts
+++ b/src/vs/editor/common/core/editorColorRegistry.ts
@@ -80,7 +80,7 @@ export const editorBracketHighlightingForeground4 = registerColor('editorBracket
 export const editorBracketHighlightingForeground5 = registerColor('editorBracketHighlight.foreground5', '#00000000', nls.localize('editorBracketHighlightForeground5', 'Foreground color of brackets (5). Requires enabling bracket pair colorization.'));
 export const editorBracketHighlightingForeground6 = registerColor('editorBracketHighlight.foreground6', '#00000000', nls.localize('editorBracketHighlightForeground6', 'Foreground color of brackets (6). Requires enabling bracket pair colorization.'));
 
-export const editorBracketHighlightingUnexpectedBracketForeground = registerColor('editorBracketHighlight.unexpectedBracket.foreground', { dark: new Color(new RGBA(255, 18, 18, 0.8)), light: new Color(new RGBA(255, 18, 18, 0.8)), hcDark: new Color(new RGBA(255, 50, 50, 1)), hcLight: '' }, nls.localize('editorBracketHighlightUnexpectedBracketForeground', 'Foreground color of unexpected brackets.'));
+export const editorBracketHighlightingUnexpectedBracketForeground = registerColor('editorBracketHighlight.unexpectedBracket.foreground', { dark: new Color(new RGBA(255, 18, 18, 0.8)), light: new Color(new RGBA(255, 18, 18, 0.8)), hcDark: 'new Color(new RGBA(255, 50, 50, 1))', hcLight: '#B5200D' }, nls.localize('editorBracketHighlightUnexpectedBracketForeground', 'Foreground color of unexpected brackets.'));
 
 export const editorBracketPairGuideBackground1 = registerColor('editorBracketPairGuide.background1', '#00000000', nls.localize('editorBracketPairGuide.background1', 'Background color of inactive bracket pair guides (1). Requires enabling bracket pair guides.'));
 export const editorBracketPairGuideBackground2 = registerColor('editorBracketPairGuide.background2', '#00000000', nls.localize('editorBracketPairGuide.background2', 'Background color of inactive bracket pair guides (2). Requires enabling bracket pair guides.'));
diff --git a/src/vs/editor/common/cursor/cursor.ts b/src/vs/editor/common/cursor/cursor.ts
index f84b5135d13..242283e7657 100644
--- a/src/vs/editor/common/cursor/cursor.ts
+++ b/src/vs/editor/common/cursor/cursor.ts
@@ -740,7 +740,7 @@ interface ICommandsData {
 	hadTrackedEditOperation: boolean;
 }
 
-class CommandExecutor {
+export class CommandExecutor {
 
 	public static executeCommands(model: ITextModel, selectionsBefore: Selection[], commands: (editorCommon.ICommand | null)[]): Selection[] | null {
 
diff --git a/src/vs/editor/common/languages.ts b/src/vs/editor/common/languages.ts
index f9ce7c9e7fa..09c337312c1 100644
--- a/src/vs/editor/common/languages.ts
+++ b/src/vs/editor/common/languages.ts
@@ -82,6 +82,15 @@ export class EncodedTokenizationResult {
 	}
 }
 
+/**
+ * An intermediate interface for scaffolding the new tree sitter tokenization support. Not final.
+ * @internal
+ */
+export interface ITreeSitterTokenizationSupport {
+	tokenizeEncoded(lineNumber: number, textModel: model.ITextModel): Uint32Array | undefined;
+	captureAtPosition(lineNumber: number, column: number, textModel: model.ITextModel): any;
+}
+
 /**
  * @internal
  */
@@ -1909,7 +1918,7 @@ export interface CommentThread<T = IRange> {
 	range: T | undefined;
 	label: string | undefined;
 	contextValue: string | undefined;
-	comments: Comment[] | undefined;
+	comments: ReadonlyArray<Comment> | undefined;
 	onDidChangeComments: Event<readonly Comment[] | undefined>;
 	collapsibleState?: CommentThreadCollapsibleState;
 	initialCollapsibleState?: CommentThreadCollapsibleState;
@@ -2139,17 +2148,17 @@ export interface ITokenizationSupportChangedEvent {
 /**
  * @internal
  */
-export interface ILazyTokenizationSupport {
-	get tokenizationSupport(): Promise<ITokenizationSupport | null>;
+export interface ILazyTokenizationSupport<TSupport> {
+	get tokenizationSupport(): Promise<TSupport | null>;
 }
 
 /**
  * @internal
  */
-export class LazyTokenizationSupport implements IDisposable, ILazyTokenizationSupport {
-	private _tokenizationSupport: Promise<ITokenizationSupport & IDisposable | null> | null = null;
+export class LazyTokenizationSupport<TSupport = ITokenizationSupport> implements IDisposable, ILazyTokenizationSupport<TSupport> {
+	private _tokenizationSupport: Promise<TSupport & IDisposable | null> | null = null;
 
-	constructor(private readonly createSupport: () => Promise<ITokenizationSupport & IDisposable | null>) {
+	constructor(private readonly createSupport: () => Promise<TSupport & IDisposable | null>) {
 	}
 
 	dispose(): void {
@@ -2162,7 +2171,7 @@ export class LazyTokenizationSupport implements IDisposable, ILazyTokenizationSu
 		}
 	}
 
-	get tokenizationSupport(): Promise<ITokenizationSupport | null> {
+	get tokenizationSupport(): Promise<TSupport | null> {
 		if (!this._tokenizationSupport) {
 			this._tokenizationSupport = this.createSupport();
 		}
@@ -2173,7 +2182,7 @@ export class LazyTokenizationSupport implements IDisposable, ILazyTokenizationSu
 /**
  * @internal
  */
-export interface ITokenizationRegistry {
+export interface ITokenizationRegistry<TSupport> {
 
 	/**
 	 * An event triggered when:
@@ -2191,24 +2200,24 @@ export interface ITokenizationRegistry {
 	/**
 	 * Register a tokenization support.
 	 */
-	register(languageId: string, support: ITokenizationSupport): IDisposable;
+	register(languageId: string, support: TSupport): IDisposable;
 
 	/**
 	 * Register a tokenization support factory.
 	 */
-	registerFactory(languageId: string, factory: ILazyTokenizationSupport): IDisposable;
+	registerFactory(languageId: string, factory: ILazyTokenizationSupport<TSupport>): IDisposable;
 
 	/**
 	 * Get or create the tokenization support for a language.
 	 * Returns `null` if not found.
 	 */
-	getOrCreate(languageId: string): Promise<ITokenizationSupport | null>;
+	getOrCreate(languageId: string): Promise<TSupport | null>;
 
 	/**
 	 * Get the tokenization support for a language.
 	 * Returns `null` if not found.
 	 */
-	get(languageId: string): ITokenizationSupport | null;
+	get(languageId: string): TSupport | null;
 
 	/**
 	 * Returns false if a factory is still pending.
@@ -2228,8 +2237,12 @@ export interface ITokenizationRegistry {
 /**
  * @internal
  */
-export const TokenizationRegistry: ITokenizationRegistry = new TokenizationRegistryImpl();
+export const TokenizationRegistry: ITokenizationRegistry<ITokenizationSupport> = new TokenizationRegistryImpl();
 
+/**
+ * @internal
+ */
+export const TreeSitterTokenizationRegistry: ITokenizationRegistry<ITreeSitterTokenizationSupport> = new TokenizationRegistryImpl();
 
 /**
  * @internal
diff --git a/src/vs/editor/common/languages/highlights/typescript.scm b/src/vs/editor/common/languages/highlights/typescript.scm
new file mode 100644
index 00000000000..e50bc9dec97
--- /dev/null
+++ b/src/vs/editor/common/languages/highlights/typescript.scm
@@ -0,0 +1,271 @@
+; Order matters! Place higher precedence first.
+; Adapted from https://github.com/zed-industries/zed/blob/main/crates/languages/src/typescript/highlights.scm
+
+; Language constants
+
+[
+  (true)
+  (false)
+  (null)
+  (undefined)
+] @constant.language
+
+(namespace_import
+  "*" @constant.language)
+
+; Keywords
+
+[
+  "delete"
+  "in"
+  "infer"
+  "instanceof"
+  "keyof"
+  "of"
+  "typeof"
+] @keyword.operator.expression
+
+[
+  "as"
+  "await"
+  "break"
+  "case"
+  "catch"
+  "continue"
+  "default"
+  "do"
+  "else"
+  "export"
+  "finally"
+  "for"
+  "from"
+  "if"
+  "import"
+  "require"
+  "return"
+  "satisfies"
+  "switch"
+  "throw"
+  "try"
+  "type"
+  "while"
+  "yield"
+] @keyword.control
+
+[
+  "abstract"
+  "async"
+  "declare"
+  "extends"
+  "implements"
+  "override"
+  "private"
+  "protected"
+  "public"
+  "readonly"
+  "static"
+] @storage.modifier
+
+[
+  "=>"
+  "class"
+  "const"
+  "enum"
+  "function"
+  "get"
+  "interface"
+  "let"
+  "namespace"
+  "set"
+  "var"
+] @storage.type
+
+[
+  "debugger"
+  "target"
+  "with"
+] @keyword
+
+; TODO: works in the playground but not here
+(regex_flags) @keyword
+
+[
+  "void"
+] @support.type
+
+[
+  "new"
+] @keyword.operator.new
+
+; Tokens
+
+[
+  ";"
+  "?."
+  "."
+  ","
+  ":"
+  "?"
+] @punctuation.delimiter
+
+[
+  "-"
+  "--"
+  "-="
+  "+"
+  "++"
+  "+="
+  "*"
+  "*="
+  "**"
+  "**="
+  "/"
+  "/="
+  "%"
+  "%="
+  "<"
+  "<="
+  "<<"
+  "<<="
+  "="
+  "=="
+  "==="
+  "!"
+  "!="
+  "!=="
+  "=>"
+  ">"
+  ">="
+  ">>"
+  ">>="
+  ">>>"
+  ">>>="
+  "~"
+  "^"
+  "&"
+  "|"
+  "^="
+  "&="
+  "|="
+  "&&"
+  "||"
+  "??"
+  "&&="
+  "||="
+  "??="
+] @keyword.operator
+
+; Special identifiers
+
+(type_identifier) @entity.name.type
+(predefined_type) @support.type
+
+(("const")
+  (variable_declarator
+  	name: (identifier) @variable.other.constant))
+
+([
+  (identifier)
+  (shorthand_property_identifier)
+  (shorthand_property_identifier_pattern)] @variable.other.constant
+  (#match? @variable.other.constant "^[A-Z][A-Z_]+$"))
+
+(extends_clause
+  value: (identifier) @entity.other.inherited-class)
+
+; Function and method calls
+
+(call_expression
+  function: (identifier) @entity.name.function)
+
+(call_expression
+  function: (member_expression
+    property: (property_identifier) @entity.name.function))
+
+(new_expression
+  constructor: (identifier) @entity.name.function)
+
+; Function and method definitions
+
+(function_expression
+  name: (identifier) @entity.name.function)
+(function_declaration
+  name: (identifier) @entity.name.function)
+(method_definition
+  name: (property_identifier) @storage.type
+  (#eq? @storage.type "constructor"))
+(method_definition
+  name: (property_identifier) @entity.name.function)
+(method_signature
+  name: (property_identifier) @entity.name.function)
+
+(pair
+  key: (property_identifier) @entity.name.function
+  value: [(function_expression) (arrow_function)])
+
+(assignment_expression
+  left: (member_expression
+    property: (property_identifier) @entity.name.function)
+  right: [(function_expression) (arrow_function)])
+
+(variable_declarator
+  name: (identifier) @entity.name.function
+  value: [(function_expression) (arrow_function)])
+
+(assignment_expression
+  left: (identifier) @entity.name.function
+  right: [(function_expression) (arrow_function)])
+
+; Properties
+
+(member_expression
+  object: (this)
+  property: (property_identifier) @variable)
+
+(member_expression
+  property: (property_identifier) @variable.other.constant
+  (#match? @variable.other.constant "^[A-Z][A-Z_]+$"))
+
+[
+  (property_identifier)
+  (shorthand_property_identifier)
+  (shorthand_property_identifier_pattern)] @variable
+
+; Variables
+
+(identifier) @variable
+
+; Template TODO: These don't seem to be working
+
+(template_substitution
+  "${" @punctuation.definition.template-expression.begin
+  "}" @punctuation.definition.template-expression.end)
+
+(template_type
+  "${" @punctuation.definition.template-expression.begin
+  "}" @punctuation.definition.template-expression.end)
+
+(type_arguments
+  "<" @punctuation.bracket
+  ">" @punctuation.bracket)
+
+; Literals
+
+(this) @variable.language
+(super) @variable.language
+
+(comment) @comment
+
+; TODO: This doesn't seem to be working
+(escape_sequence) @constant.character.escape
+
+[
+  (string)
+  (template_string)
+  (template_literal_type)
+] @string
+
+; NOTE: the typescript grammar doesn't break regex into nice parts so as to capture parts of it separately
+(regex) @string.regexp
+(number) @constant.numeric
+
diff --git a/src/vs/editor/common/model.ts b/src/vs/editor/common/model.ts
index 134234bbfe5..fb48c38b1da 100644
--- a/src/vs/editor/common/model.ts
+++ b/src/vs/editor/common/model.ts
@@ -1428,6 +1428,8 @@ export interface IReadonlyTextBuffer {
 	getLineCharCode(lineNumber: number, index: number): number;
 	getCharCode(offset: number): number;
 	getLineLength(lineNumber: number): number;
+	getLineMinColumn(lineNumber: number): number;
+	getLineMaxColumn(lineNumber: number): number;
 	getLineFirstNonWhitespaceColumn(lineNumber: number): number;
 	getLineLastNonWhitespaceColumn(lineNumber: number): number;
 	findMatchesLineByLine(searchRange: Range, searchData: SearchData, captureMatches: boolean, limitResultCount: number): FindMatch[];
diff --git a/src/vs/editor/common/model/textModel.ts b/src/vs/editor/common/model/textModel.ts
index 97b5a483fc3..c5556c15a55 100644
--- a/src/vs/editor/common/model/textModel.ts
+++ b/src/vs/editor/common/model/textModel.ts
@@ -18,7 +18,6 @@ import { URI } from 'vs/base/common/uri';
 import { ISingleEditOperation } from 'vs/editor/common/core/editOperation';
 import { countEOL } from 'vs/editor/common/core/eolCounter';
 import { normalizeIndentation } from 'vs/editor/common/core/indentation';
-import { LineRange } from 'vs/editor/common/core/lineRange';
 import { IPosition, Position } from 'vs/editor/common/core/position';
 import { IRange, Range } from 'vs/editor/common/core/range';
 import { Selection } from 'vs/editor/common/core/selection';
@@ -39,10 +38,12 @@ import { PieceTreeTextBuffer } from 'vs/editor/common/model/pieceTreeTextBuffer/
 import { PieceTreeTextBufferBuilder } from 'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBufferBuilder';
 import { SearchParams, TextModelSearch } from 'vs/editor/common/model/textModelSearch';
 import { TokenizationTextModelPart } from 'vs/editor/common/model/tokenizationTextModelPart';
+import { AttachedViews } from 'vs/editor/common/model/tokens';
 import { IBracketPairsTextModelPart } from 'vs/editor/common/textModelBracketPairs';
 import { IModelContentChangedEvent, IModelDecorationsChangedEvent, IModelOptionsChangedEvent, InternalModelContentChangeEvent, LineInjectedText, ModelInjectedTextChangedEvent, ModelRawChange, ModelRawContentChangedEvent, ModelRawEOLChanged, ModelRawFlush, ModelRawLineChanged, ModelRawLinesDeleted, ModelRawLinesInserted } from 'vs/editor/common/textModelEvents';
 import { IGuidesTextModelPart } from 'vs/editor/common/textModelGuides';
 import { ITokenizationTextModelPart } from 'vs/editor/common/tokenizationTextModelPart';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IColorTheme } from 'vs/platform/theme/common/themeService';
 import { IUndoRedoService, ResourceEditStackSnapshot, UndoRedoGroup } from 'vs/platform/undoRedo/common/undoRedo';
 
@@ -299,6 +300,7 @@ export class TextModel extends Disposable implements model.ITextModel, IDecorati
 		@IUndoRedoService private readonly _undoRedoService: IUndoRedoService,
 		@ILanguageService private readonly _languageService: ILanguageService,
 		@ILanguageConfigurationService private readonly _languageConfigurationService: ILanguageConfigurationService,
+		@IInstantiationService private readonly instantiationService: IInstantiationService
 	) {
 		super();
 
@@ -327,13 +329,11 @@ export class TextModel extends Disposable implements model.ITextModel, IDecorati
 		this._bracketPairs = this._register(new BracketPairsTextModelPart(this, this._languageConfigurationService));
 		this._guidesTextModelPart = this._register(new GuidesTextModelPart(this, this._languageConfigurationService));
 		this._decorationProvider = this._register(new ColorizedBracketPairsDecorationProvider(this));
-		this._tokenizationTextModelPart = new TokenizationTextModelPart(
-			this._languageService,
-			this._languageConfigurationService,
+		this._tokenizationTextModelPart = this.instantiationService.createInstance(TokenizationTextModelPart,
 			this,
 			this._bracketPairs,
 			languageId,
-			this._attachedViews,
+			this._attachedViews
 		);
 
 		const bufferLineCount = this._buffer.getLineCount();
@@ -1989,7 +1989,7 @@ export class TextModel extends Disposable implements model.ITextModel, IDecorati
 	}
 }
 
-function indentOfLine(line: string): number {
+export function indentOfLine(line: string): number {
 	let indent = 0;
 	for (const c of line) {
 		if (c === ' ' || c === '\t') {
@@ -2528,43 +2528,3 @@ class DidChangeContentEmitter extends Disposable {
 		this._slowEmitter.fire(e);
 	}
 }
-
-/**
- * @internal
- */
-export class AttachedViews {
-	private readonly _onDidChangeVisibleRanges = new Emitter<{ view: model.IAttachedView; state: IAttachedViewState | undefined }>();
-	public readonly onDidChangeVisibleRanges = this._onDidChangeVisibleRanges.event;
-
-	private readonly _views = new Set<AttachedViewImpl>();
-
-	public attachView(): model.IAttachedView {
-		const view = new AttachedViewImpl((state) => {
-			this._onDidChangeVisibleRanges.fire({ view, state });
-		});
-		this._views.add(view);
-		return view;
-	}
-
-	public detachView(view: model.IAttachedView): void {
-		this._views.delete(view as AttachedViewImpl);
-		this._onDidChangeVisibleRanges.fire({ view, state: undefined });
-	}
-}
-
-/**
- * @internal
- */
-export interface IAttachedViewState {
-	readonly visibleLineRanges: readonly LineRange[];
-	readonly stabilized: boolean;
-}
-
-class AttachedViewImpl implements model.IAttachedView {
-	constructor(private readonly handleStateChange: (state: IAttachedViewState) => void) { }
-
-	setVisibleLines(visibleLines: { startLineNumber: number; endLineNumber: number }[], stabilized: boolean): void {
-		const visibleLineRanges = visibleLines.map((line) => new LineRange(line.startLineNumber, line.endLineNumber + 1));
-		this.handleStateChange({ visibleLineRanges, stabilized });
-	}
-}
diff --git a/src/vs/editor/common/model/tokenizationTextModelPart.ts b/src/vs/editor/common/model/tokenizationTextModelPart.ts
index 40c6c921afc..47a6656572d 100644
--- a/src/vs/editor/common/model/tokenizationTextModelPart.ts
+++ b/src/vs/editor/common/model/tokenizationTextModelPart.ts
@@ -3,26 +3,27 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { equals } from 'vs/base/common/arrays';
-import { RunOnceScheduler } from 'vs/base/common/async';
 import { CharCode } from 'vs/base/common/charCode';
 import { BugIndicatingError, onUnexpectedError } from 'vs/base/common/errors';
 import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, DisposableMap, MutableDisposable } from 'vs/base/common/lifecycle';
+import { DisposableMap, DisposableStore, MutableDisposable } from 'vs/base/common/lifecycle';
 import { countEOL } from 'vs/editor/common/core/eolCounter';
 import { LineRange } from 'vs/editor/common/core/lineRange';
 import { IPosition, Position } from 'vs/editor/common/core/position';
 import { Range } from 'vs/editor/common/core/range';
 import { IWordAtPosition, getWordAtText } from 'vs/editor/common/core/wordHelper';
 import { StandardTokenType } from 'vs/editor/common/encodedTokenAttributes';
-import { IBackgroundTokenizationStore, IBackgroundTokenizer, ILanguageIdCodec, IState, ITokenizationSupport, TokenizationRegistry } from 'vs/editor/common/languages';
+import { IBackgroundTokenizationStore, IBackgroundTokenizer, ILanguageIdCodec, IState, ITokenizationSupport, TokenizationRegistry, TreeSitterTokenizationRegistry } from 'vs/editor/common/languages';
 import { ILanguageService } from 'vs/editor/common/languages/language';
 import { ILanguageConfigurationService, LanguageConfigurationServiceChangeEvent, ResolvedLanguageConfiguration } from 'vs/editor/common/languages/languageConfigurationRegistry';
 import { IAttachedView } from 'vs/editor/common/model';
 import { BracketPairsTextModelPart } from 'vs/editor/common/model/bracketPairsTextModelPart/bracketPairsImpl';
-import { AttachedViews, IAttachedViewState, TextModel } from 'vs/editor/common/model/textModel';
+import { TextModel } from 'vs/editor/common/model/textModel';
 import { TextModelPart } from 'vs/editor/common/model/textModelPart';
 import { DefaultBackgroundTokenizer, TokenizerWithStateStoreAndTextModel, TrackingTokenizationStateStore } from 'vs/editor/common/model/textModelTokens';
+import { AbstractTokens, AttachedViewHandler, AttachedViews } from 'vs/editor/common/model/tokens';
+import { TreeSitterTokens } from 'vs/editor/common/model/treeSitterTokens';
+import { ITreeSitterParserService } from 'vs/editor/common/services/treeSitterParserService';
 import { IModelContentChangedEvent, IModelLanguageChangedEvent, IModelLanguageConfigurationChangedEvent, IModelTokensChangedEvent } from 'vs/editor/common/textModelEvents';
 import { BackgroundTokenizationState, ITokenizationTextModelPart } from 'vs/editor/common/tokenizationTextModelPart';
 import { ContiguousMultilineTokens } from 'vs/editor/common/tokens/contiguousMultilineTokens';
@@ -44,25 +45,71 @@ export class TokenizationTextModelPart extends TextModelPart implements ITokeniz
 	private readonly _onDidChangeTokens: Emitter<IModelTokensChangedEvent> = this._register(new Emitter<IModelTokensChangedEvent>());
 	public readonly onDidChangeTokens: Event<IModelTokensChangedEvent> = this._onDidChangeTokens.event;
 
-	private readonly grammarTokens = this._register(new GrammarTokens(this._languageService.languageIdCodec, this._textModel, () => this._languageId, this._attachedViews));
+	private _tokens!: AbstractTokens;
+	private readonly _tokensDisposables: DisposableStore = this._register(new DisposableStore());
 
 	constructor(
-		private readonly _languageService: ILanguageService,
-		private readonly _languageConfigurationService: ILanguageConfigurationService,
 		private readonly _textModel: TextModel,
 		private readonly _bracketPairsTextModelPart: BracketPairsTextModelPart,
 		private _languageId: string,
 		private readonly _attachedViews: AttachedViews,
+		@ILanguageService private readonly _languageService: ILanguageService,
+		@ILanguageConfigurationService private readonly _languageConfigurationService: ILanguageConfigurationService,
+		@ITreeSitterParserService private readonly _treeSitterService: ITreeSitterParserService,
 	) {
 		super();
 
-		this._register(this.grammarTokens.onDidChangeTokens(e => {
+		this._register(this._languageConfigurationService.onDidChange(e => {
+			if (e.affects(this._languageId)) {
+				this._onDidChangeLanguageConfiguration.fire({});
+			}
+		}));
+
+		// We just look at registry changes to determine whether to use tree sitter.
+		// This means that removing a language from the setting will not cause a switch to textmate and will require a reload.
+		// Adding a language to the setting will not need a reload, however.
+		this._register(Event.filter(TreeSitterTokenizationRegistry.onDidChange, (e) => e.changedLanguages.includes(this._languageId))(() => {
+			this.createPreferredTokenProvider();
+		}));
+		this.createPreferredTokenProvider();
+	}
+
+	private createGrammarTokens() {
+		return this._register(new GrammarTokens(this._languageService.languageIdCodec, this._textModel, () => this._languageId, this._attachedViews));
+	}
+
+	private createTreeSitterTokens(): AbstractTokens {
+		return this._register(new TreeSitterTokens(this._treeSitterService, this._languageService.languageIdCodec, this._textModel, () => this._languageId));
+	}
+
+	private createTokens(useTreeSitter: boolean): void {
+		const needsReset = this._tokens !== undefined;
+		this._tokens?.dispose();
+		this._tokens = useTreeSitter ? this.createTreeSitterTokens() : this.createGrammarTokens();
+		this._tokensDisposables.clear();
+		this._tokensDisposables.add(this._tokens.onDidChangeTokens(e => {
 			this._emitModelTokensChangedEvent(e);
 		}));
 
-		this._register(this.grammarTokens.onDidChangeBackgroundTokenizationState(e => {
+		this._tokensDisposables.add(this._tokens.onDidChangeBackgroundTokenizationState(e => {
 			this._bracketPairsTextModelPart.handleDidChangeBackgroundTokenizationState();
 		}));
+		if (needsReset) {
+			// We need to reset the tokenization, as the new token provider otherwise won't have a chance to provide tokens until some action happens in the editor.
+			this._tokens.resetTokenization();
+		}
+	}
+
+	private createPreferredTokenProvider() {
+		if (TreeSitterTokenizationRegistry.get(this._languageId)) {
+			if (!(this._tokens instanceof TreeSitterTokens)) {
+				this.createTokens(true);
+			}
+		} else {
+			if (!(this._tokens instanceof GrammarTokens)) {
+				this.createTokens(false);
+			}
+		}
 	}
 
 	_hasListeners(): boolean {
@@ -94,11 +141,11 @@ export class TokenizationTextModelPart extends TextModelPart implements ITokeniz
 			}
 		}
 
-		this.grammarTokens.handleDidChangeContent(e);
+		this._tokens.handleDidChangeContent(e);
 	}
 
 	public handleDidChangeAttached(): void {
-		this.grammarTokens.handleDidChangeAttached();
+		this._tokens.handleDidChangeAttached();
 	}
 
 	/**
@@ -106,7 +153,7 @@ export class TokenizationTextModelPart extends TextModelPart implements ITokeniz
 	 */
 	public getLineTokens(lineNumber: number): LineTokens {
 		this.validateLineNumber(lineNumber);
-		const syntacticTokens = this.grammarTokens.getLineTokens(lineNumber);
+		const syntacticTokens = this._tokens.getLineTokens(lineNumber);
 		return this._semanticTokens.addSparseTokens(lineNumber, syntacticTokens);
 	}
 
@@ -126,43 +173,43 @@ export class TokenizationTextModelPart extends TextModelPart implements ITokeniz
 	}
 
 	public get hasTokens(): boolean {
-		return this.grammarTokens.hasTokens;
+		return this._tokens.hasTokens;
 	}
 
 	public resetTokenization() {
-		this.grammarTokens.resetTokenization();
+		this._tokens.resetTokenization();
 	}
 
 	public get backgroundTokenizationState() {
-		return this.grammarTokens.backgroundTokenizationState;
+		return this._tokens.backgroundTokenizationState;
 	}
 
 	public forceTokenization(lineNumber: number): void {
 		this.validateLineNumber(lineNumber);
-		this.grammarTokens.forceTokenization(lineNumber);
+		this._tokens.forceTokenization(lineNumber);
 	}
 
 	public hasAccurateTokensForLine(lineNumber: number): boolean {
 		this.validateLineNumber(lineNumber);
-		return this.grammarTokens.hasAccurateTokensForLine(lineNumber);
+		return this._tokens.hasAccurateTokensForLine(lineNumber);
 	}
 
 	public isCheapToTokenize(lineNumber: number): boolean {
 		this.validateLineNumber(lineNumber);
-		return this.grammarTokens.isCheapToTokenize(lineNumber);
+		return this._tokens.isCheapToTokenize(lineNumber);
 	}
 
 	public tokenizeIfCheap(lineNumber: number): void {
 		this.validateLineNumber(lineNumber);
-		this.grammarTokens.tokenizeIfCheap(lineNumber);
+		this._tokens.tokenizeIfCheap(lineNumber);
 	}
 
 	public getTokenTypeIfInsertingCharacter(lineNumber: number, column: number, character: string): StandardTokenType {
-		return this.grammarTokens.getTokenTypeIfInsertingCharacter(lineNumber, column, character);
+		return this._tokens.getTokenTypeIfInsertingCharacter(lineNumber, column, character);
 	}
 
 	public tokenizeLineWithEdit(position: IPosition, length: number, newText: string): LineTokens | null {
-		return this.grammarTokens.tokenizeLineWithEdit(position, length, newText);
+		return this._tokens.tokenizeLineWithEdit(position, length, newText);
 	}
 
 	// #endregion
@@ -327,7 +374,8 @@ export class TokenizationTextModelPart extends TextModelPart implements ITokeniz
 		this._languageId = languageId;
 
 		this._bracketPairsTextModelPart.handleDidChangeLanguage(e);
-		this.grammarTokens.resetTokenization();
+		this._tokens.resetTokenization();
+		this.createPreferredTokenProvider();
 		this._onDidChangeLanguage.fire(e);
 		this._onDidChangeLanguageConfiguration.fire({});
 	}
@@ -335,7 +383,7 @@ export class TokenizationTextModelPart extends TextModelPart implements ITokeniz
 	// #endregion
 }
 
-class GrammarTokens extends Disposable {
+class GrammarTokens extends AbstractTokens {
 	private _tokenizer: TokenizerWithStateStoreAndTextModel | null = null;
 	private _defaultBackgroundTokenizer: DefaultBackgroundTokenizer | null = null;
 	private readonly _backgroundTokenizer = this._register(new MutableDisposable<IBackgroundTokenizer>());
@@ -346,28 +394,15 @@ class GrammarTokens extends Disposable {
 
 	private readonly _debugBackgroundTokenizer = this._register(new MutableDisposable<IBackgroundTokenizer>());
 
-	private _backgroundTokenizationState = BackgroundTokenizationState.InProgress;
-	public get backgroundTokenizationState(): BackgroundTokenizationState {
-		return this._backgroundTokenizationState;
-	}
-
-	private readonly _onDidChangeBackgroundTokenizationState = this._register(new Emitter<void>());
-	/** @internal, should not be exposed by the text model! */
-	public readonly onDidChangeBackgroundTokenizationState: Event<void> = this._onDidChangeBackgroundTokenizationState.event;
-
-	private readonly _onDidChangeTokens = this._register(new Emitter<IModelTokensChangedEvent>());
-	/** @internal, should not be exposed by the text model! */
-	public readonly onDidChangeTokens: Event<IModelTokensChangedEvent> = this._onDidChangeTokens.event;
-
 	private readonly _attachedViewStates = this._register(new DisposableMap<IAttachedView, AttachedViewHandler>());
 
 	constructor(
-		private readonly _languageIdCodec: ILanguageIdCodec,
-		private readonly _textModel: TextModel,
-		private getLanguageId: () => string,
+		languageIdCodec: ILanguageIdCodec,
+		textModel: TextModel,
+		getLanguageId: () => string,
 		attachedViews: AttachedViews,
 	) {
-		super();
+		super(languageIdCodec, textModel, getLanguageId);
 
 		this._register(TokenizationRegistry.onDidChange((e) => {
 			const languageId = this.getLanguageId();
@@ -587,12 +622,6 @@ class GrammarTokens extends Disposable {
 		return this._tokenizer.isCheapToTokenize(lineNumber);
 	}
 
-	public tokenizeIfCheap(lineNumber: number): void {
-		if (this.isCheapToTokenize(lineNumber)) {
-			this.forceTokenization(lineNumber);
-		}
-	}
-
 	public getLineTokens(lineNumber: number): LineTokens {
 		const lineText = this._textModel.getLineContent(lineNumber);
 		const result = this._tokens.getTokens(
@@ -639,33 +668,3 @@ class GrammarTokens extends Disposable {
 		return this._tokens.hasTokens;
 	}
 }
-
-class AttachedViewHandler extends Disposable {
-	private readonly runner = this._register(new RunOnceScheduler(() => this.update(), 50));
-
-	private _computedLineRanges: readonly LineRange[] = [];
-	private _lineRanges: readonly LineRange[] = [];
-	public get lineRanges(): readonly LineRange[] { return this._lineRanges; }
-
-	constructor(private readonly _refreshTokens: () => void) {
-		super();
-	}
-
-	private update(): void {
-		if (equals(this._computedLineRanges, this._lineRanges, (a, b) => a.equals(b))) {
-			return;
-		}
-		this._computedLineRanges = this._lineRanges;
-		this._refreshTokens();
-	}
-
-	public handleStateChange(state: IAttachedViewState): void {
-		this._lineRanges = state.visibleLineRanges;
-		if (state.stabilized) {
-			this.runner.cancel();
-			this.update();
-		} else {
-			this.runner.schedule();
-		}
-	}
-}
diff --git a/src/vs/editor/common/model/tokens.ts b/src/vs/editor/common/model/tokens.ts
new file mode 100644
index 00000000000..da46f267c6b
--- /dev/null
+++ b/src/vs/editor/common/model/tokens.ts
@@ -0,0 +1,138 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { equals } from 'vs/base/common/arrays';
+import { RunOnceScheduler } from 'vs/base/common/async';
+import { Emitter, Event } from 'vs/base/common/event';
+import { Disposable } from 'vs/base/common/lifecycle';
+import { LineRange } from 'vs/editor/common/core/lineRange';
+import { IPosition } from 'vs/editor/common/core/position';
+import { StandardTokenType } from 'vs/editor/common/encodedTokenAttributes';
+import { ILanguageIdCodec } from 'vs/editor/common/languages';
+import { IAttachedView } from 'vs/editor/common/model';
+import { TextModel } from 'vs/editor/common/model/textModel';
+import { IModelContentChangedEvent, IModelTokensChangedEvent } from 'vs/editor/common/textModelEvents';
+import { BackgroundTokenizationState } from 'vs/editor/common/tokenizationTextModelPart';
+import { LineTokens } from 'vs/editor/common/tokens/lineTokens';
+
+/**
+ * @internal
+ */
+export class AttachedViews {
+	private readonly _onDidChangeVisibleRanges = new Emitter<{ view: IAttachedView; state: IAttachedViewState | undefined }>();
+	public readonly onDidChangeVisibleRanges = this._onDidChangeVisibleRanges.event;
+
+	private readonly _views = new Set<AttachedViewImpl>();
+
+	public attachView(): IAttachedView {
+		const view = new AttachedViewImpl((state) => {
+			this._onDidChangeVisibleRanges.fire({ view, state });
+		});
+		this._views.add(view);
+		return view;
+	}
+
+	public detachView(view: IAttachedView): void {
+		this._views.delete(view as AttachedViewImpl);
+		this._onDidChangeVisibleRanges.fire({ view, state: undefined });
+	}
+}
+
+/**
+ * @internal
+ */
+export interface IAttachedViewState {
+	readonly visibleLineRanges: readonly LineRange[];
+	readonly stabilized: boolean;
+}
+
+class AttachedViewImpl implements IAttachedView {
+	constructor(private readonly handleStateChange: (state: IAttachedViewState) => void) { }
+
+	setVisibleLines(visibleLines: { startLineNumber: number; endLineNumber: number }[], stabilized: boolean): void {
+		const visibleLineRanges = visibleLines.map((line) => new LineRange(line.startLineNumber, line.endLineNumber + 1));
+		this.handleStateChange({ visibleLineRanges, stabilized });
+	}
+}
+
+
+export class AttachedViewHandler extends Disposable {
+	private readonly runner = this._register(new RunOnceScheduler(() => this.update(), 50));
+
+	private _computedLineRanges: readonly LineRange[] = [];
+	private _lineRanges: readonly LineRange[] = [];
+	public get lineRanges(): readonly LineRange[] { return this._lineRanges; }
+
+	constructor(private readonly _refreshTokens: () => void) {
+		super();
+	}
+
+	private update(): void {
+		if (equals(this._computedLineRanges, this._lineRanges, (a, b) => a.equals(b))) {
+			return;
+		}
+		this._computedLineRanges = this._lineRanges;
+		this._refreshTokens();
+	}
+
+	public handleStateChange(state: IAttachedViewState): void {
+		this._lineRanges = state.visibleLineRanges;
+		if (state.stabilized) {
+			this.runner.cancel();
+			this.update();
+		} else {
+			this.runner.schedule();
+		}
+	}
+}
+
+export abstract class AbstractTokens extends Disposable {
+	protected _backgroundTokenizationState = BackgroundTokenizationState.InProgress;
+	public get backgroundTokenizationState(): BackgroundTokenizationState {
+		return this._backgroundTokenizationState;
+	}
+
+	protected readonly _onDidChangeBackgroundTokenizationState = this._register(new Emitter<void>());
+	/** @internal, should not be exposed by the text model! */
+	public readonly onDidChangeBackgroundTokenizationState: Event<void> = this._onDidChangeBackgroundTokenizationState.event;
+
+	protected readonly _onDidChangeTokens = this._register(new Emitter<IModelTokensChangedEvent>());
+	/** @internal, should not be exposed by the text model! */
+	public readonly onDidChangeTokens: Event<IModelTokensChangedEvent> = this._onDidChangeTokens.event;
+
+	constructor(
+		protected readonly _languageIdCodec: ILanguageIdCodec,
+		protected readonly _textModel: TextModel,
+		protected getLanguageId: () => string,
+	) {
+		super();
+	}
+
+	public abstract resetTokenization(fireTokenChangeEvent?: boolean): void;
+
+	public abstract handleDidChangeAttached(): void;
+
+	public abstract handleDidChangeContent(e: IModelContentChangedEvent): void;
+
+	public abstract forceTokenization(lineNumber: number): void;
+
+	public abstract hasAccurateTokensForLine(lineNumber: number): boolean;
+
+	public abstract isCheapToTokenize(lineNumber: number): boolean;
+
+	public tokenizeIfCheap(lineNumber: number): void {
+		if (this.isCheapToTokenize(lineNumber)) {
+			this.forceTokenization(lineNumber);
+		}
+	}
+
+	public abstract getLineTokens(lineNumber: number): LineTokens;
+
+	public abstract getTokenTypeIfInsertingCharacter(lineNumber: number, column: number, character: string): StandardTokenType;
+
+	public abstract tokenizeLineWithEdit(position: IPosition, length: number, newText: string): LineTokens | null;
+
+	public abstract get hasTokens(): boolean;
+}
diff --git a/src/vs/editor/common/model/treeSitterTokens.ts b/src/vs/editor/common/model/treeSitterTokens.ts
new file mode 100644
index 00000000000..2da4bdc84e0
--- /dev/null
+++ b/src/vs/editor/common/model/treeSitterTokens.ts
@@ -0,0 +1,100 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { ILanguageIdCodec, ITreeSitterTokenizationSupport, TreeSitterTokenizationRegistry } from 'vs/editor/common/languages';
+import { LineTokens } from 'vs/editor/common/tokens/lineTokens';
+import { StandardTokenType } from 'vs/editor/common/encodedTokenAttributes';
+import { TextModel } from 'vs/editor/common/model/textModel';
+import { ITreeSitterParserService } from 'vs/editor/common/services/treeSitterParserService';
+import { IModelContentChangedEvent } from 'vs/editor/common/textModelEvents';
+import { AbstractTokens } from 'vs/editor/common/model/tokens';
+import { IPosition } from 'vs/editor/common/core/position';
+
+export class TreeSitterTokens extends AbstractTokens {
+	private _tokenizationSupport: ITreeSitterTokenizationSupport | null = null;
+	private _lastLanguageId: string | undefined;
+
+	constructor(private readonly _treeSitterService: ITreeSitterParserService,
+		languageIdCodec: ILanguageIdCodec,
+		textModel: TextModel,
+		languageId: () => string) {
+		super(languageIdCodec, textModel, languageId);
+
+		this._initialize();
+	}
+
+	private _initialize() {
+		const newLanguage = this.getLanguageId();
+		if (!this._tokenizationSupport || this._lastLanguageId !== newLanguage) {
+			this._lastLanguageId = newLanguage;
+			this._tokenizationSupport = TreeSitterTokenizationRegistry.get(newLanguage);
+		}
+	}
+
+	public getLineTokens(lineNumber: number): LineTokens {
+		const content = this._textModel.getLineContent(lineNumber);
+		if (this._tokenizationSupport) {
+			const rawTokens = this._tokenizationSupport.tokenizeEncoded(lineNumber, this._textModel);
+			if (rawTokens) {
+				return new LineTokens(rawTokens, content, this._languageIdCodec);
+			}
+		}
+		return LineTokens.createEmpty(content, this._languageIdCodec);
+	}
+
+	public resetTokenization(fireTokenChangeEvent: boolean = true): void {
+		if (fireTokenChangeEvent) {
+			this._onDidChangeTokens.fire({
+				semanticTokensApplied: false,
+				ranges: [
+					{
+						fromLineNumber: 1,
+						toLineNumber: this._textModel.getLineCount(),
+					},
+				],
+			});
+		}
+		this._initialize();
+	}
+
+	public override handleDidChangeAttached(): void {
+		// TODO @alexr00 implement for background tokenization
+	}
+
+	public override handleDidChangeContent(e: IModelContentChangedEvent): void {
+		if (e.isFlush) {
+			// Don't fire the event, as the view might not have got the text change event yet
+			this.resetTokenization(false);
+		}
+	}
+
+	public override forceTokenization(lineNumber: number): void {
+		// TODO @alexr00 implement
+	}
+
+	public override hasAccurateTokensForLine(lineNumber: number): boolean {
+		// TODO @alexr00 update for background tokenization
+		return true;
+	}
+
+	public override isCheapToTokenize(lineNumber: number): boolean {
+		// TODO @alexr00 update for background tokenization
+		return true;
+	}
+
+	public override getTokenTypeIfInsertingCharacter(lineNumber: number, column: number, character: string): StandardTokenType {
+		// TODO @alexr00 implement once we have custom parsing and don't just feed in the whole text model value
+		return StandardTokenType.Other;
+	}
+	public override tokenizeLineWithEdit(position: IPosition, length: number, newText: string): LineTokens | null {
+		// TODO @alexr00 understand what this is for and implement
+		return null;
+	}
+	public override get hasTokens(): boolean {
+		// TODO @alexr00 once we have a token store, implement properly
+		const hasTree = this._treeSitterService.getParseResult(this._textModel) !== undefined;
+		return hasTree;
+	}
+}
diff --git a/src/vs/editor/common/services/editorSimpleWorker.esm.ts b/src/vs/editor/common/services/editorSimpleWorker.esm.ts
new file mode 100644
index 00000000000..5f659c76f8e
--- /dev/null
+++ b/src/vs/editor/common/services/editorSimpleWorker.esm.ts
@@ -0,0 +1,9 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { create } from 'vs/editor/common/services/editorSimpleWorker';
+import { bootstrapSimpleEditorWorker } from './editorWorkerBootstrap';
+
+bootstrapSimpleEditorWorker(create);
diff --git a/src/vs/editor/common/services/editorSimpleWorker.ts b/src/vs/editor/common/services/editorSimpleWorker.ts
index 195a870b0af..4bf19b0d25e 100644
--- a/src/vs/editor/common/services/editorSimpleWorker.ts
+++ b/src/vs/editor/common/services/editorSimpleWorker.ts
@@ -6,18 +6,17 @@
 import { stringDiff } from 'vs/base/common/diff/diff';
 import { IDisposable } from 'vs/base/common/lifecycle';
 import { URI } from 'vs/base/common/uri';
-import { IRequestHandler } from 'vs/base/common/worker/simpleWorker';
-import { IPosition, Position } from 'vs/editor/common/core/position';
+import { IRequestHandler, IWorkerServer } from 'vs/base/common/worker/simpleWorker';
+import { Position } from 'vs/editor/common/core/position';
 import { IRange, Range } from 'vs/editor/common/core/range';
 import { EndOfLineSequence, ITextModel } from 'vs/editor/common/model';
-import { IMirrorTextModel, IModelChangedEvent, MirrorTextModel as BaseMirrorModel } from 'vs/editor/common/model/mirrorTextModel';
-import { ensureValidWordDefinition, getWordAtText, IWordAtPosition } from 'vs/editor/common/core/wordHelper';
+import { IMirrorTextModel, IModelChangedEvent } from 'vs/editor/common/model/mirrorTextModel';
 import { IColorInformation, IInplaceReplaceSupportResult, ILink, TextEdit } from 'vs/editor/common/languages';
-import { ILinkComputerTarget, computeLinks } from 'vs/editor/common/languages/linkComputer';
+import { computeLinks } from 'vs/editor/common/languages/linkComputer';
 import { BasicInplaceReplace } from 'vs/editor/common/languages/supports/inplaceReplaceSupport';
 import { DiffAlgorithmName, IDiffComputationResult, ILineChange, IUnicodeHighlightsResult } from 'vs/editor/common/services/editorWorker';
 import { createMonacoBaseAPI } from 'vs/editor/common/services/editorBaseApi';
-import { IEditorWorkerHost } from 'vs/editor/common/services/editorWorkerHost';
+import { EditorWorkerHost } from './editorWorkerHost';
 import { StopWatch } from 'vs/base/common/stopwatch';
 import { UnicodeTextModelHighlighter, UnicodeHighlighterOptions } from 'vs/editor/common/services/unicodeTextModelHighlighter';
 import { DiffComputer, IChange } from 'vs/editor/common/diff/legacyLinesDiffComputer';
@@ -26,9 +25,19 @@ import { DetailedLineRangeMapping } from '../diff/rangeMapping';
 import { linesDiffComputers } from 'vs/editor/common/diff/linesDiffComputers';
 import { createProxyObject, getAllMethodNames } from 'vs/base/common/objects';
 import { IDocumentDiffProviderOptions } from 'vs/editor/common/diff/documentDiffProvider';
+import { AppResourcePath, FileAccess } from 'vs/base/common/network';
 import { BugIndicatingError } from 'vs/base/common/errors';
-import { IDocumentColorComputerTarget, computeDefaultDocumentColors } from 'vs/editor/common/languages/defaultDocumentColorsComputer';
+import { computeDefaultDocumentColors } from 'vs/editor/common/languages/defaultDocumentColorsComputer';
 import { FindSectionHeaderOptions, SectionHeader, findSectionHeaders } from 'vs/editor/common/services/findSectionHeaders';
+import { IRawModelData, IWorkerTextModelSyncChannelServer } from './textModelSync/textModelSync.protocol';
+import { ICommonModel, WorkerTextModelSyncServer } from 'vs/editor/common/services/textModelSync/textModelSync.impl';
+
+// ESM-comment-begin
+const isESM = false;
+// ESM-comment-end
+// ESM-uncomment-begin
+// const isESM = true;
+// ESM-uncomment-end
 
 export interface IMirrorModel extends IMirrorTextModel {
 	readonly uri: URI;
@@ -47,43 +56,11 @@ export interface IWorkerContext<H = undefined> {
 	getMirrorModels(): IMirrorModel[];
 }
 
-/**
- * @internal
- */
-export interface IRawModelData {
-	url: string;
-	versionId: number;
-	lines: string[];
-	EOL: string;
-}
-
-/**
- * @internal
- */
-export interface ICommonModel extends ILinkComputerTarget, IDocumentColorComputerTarget, IMirrorModel {
-	uri: URI;
-	version: number;
-	eol: string;
-	getValue(): string;
-
-	getLinesContent(): string[];
-	getLineCount(): number;
-	getLineContent(lineNumber: number): string;
-	getLineWords(lineNumber: number, wordDefinition: RegExp): IWordAtPosition[];
-	words(wordDefinition: RegExp): Iterable<string>;
-	getWordUntilPosition(position: IPosition, wordDefinition: RegExp): IWordAtPosition;
-	getValueInRange(range: IRange): string;
-	getWordAtPosition(position: IPosition, wordDefinition: RegExp): Range | null;
-	offsetAt(position: IPosition): number;
-	positionAt(offset: number): IPosition;
-	findMatches(regex: RegExp): RegExpMatchArray[];
-}
-
 /**
  * Range of a word inside a model.
  * @internal
  */
-interface IWordRange {
+export interface IWordRange {
 	/**
 	 * The index where the word starts.
 	 */
@@ -94,246 +71,6 @@ interface IWordRange {
 	readonly end: number;
 }
 
-/**
- * @internal
- */
-class MirrorModel extends BaseMirrorModel implements ICommonModel {
-
-	public get uri(): URI {
-		return this._uri;
-	}
-
-	public get eol(): string {
-		return this._eol;
-	}
-
-	public getValue(): string {
-		return this.getText();
-	}
-
-	public findMatches(regex: RegExp): RegExpMatchArray[] {
-		const matches = [];
-		for (let i = 0; i < this._lines.length; i++) {
-			const line = this._lines[i];
-			const offsetToAdd = this.offsetAt(new Position(i + 1, 1));
-			const iteratorOverMatches = line.matchAll(regex);
-			for (const match of iteratorOverMatches) {
-				if (match.index || match.index === 0) {
-					match.index = match.index + offsetToAdd;
-				}
-				matches.push(match);
-			}
-		}
-		return matches;
-	}
-
-	public getLinesContent(): string[] {
-		return this._lines.slice(0);
-	}
-
-	public getLineCount(): number {
-		return this._lines.length;
-	}
-
-	public getLineContent(lineNumber: number): string {
-		return this._lines[lineNumber - 1];
-	}
-
-	public getWordAtPosition(position: IPosition, wordDefinition: RegExp): Range | null {
-
-		const wordAtText = getWordAtText(
-			position.column,
-			ensureValidWordDefinition(wordDefinition),
-			this._lines[position.lineNumber - 1],
-			0
-		);
-
-		if (wordAtText) {
-			return new Range(position.lineNumber, wordAtText.startColumn, position.lineNumber, wordAtText.endColumn);
-		}
-
-		return null;
-	}
-
-	public getWordUntilPosition(position: IPosition, wordDefinition: RegExp): IWordAtPosition {
-		const wordAtPosition = this.getWordAtPosition(position, wordDefinition);
-		if (!wordAtPosition) {
-			return {
-				word: '',
-				startColumn: position.column,
-				endColumn: position.column
-			};
-		}
-		return {
-			word: this._lines[position.lineNumber - 1].substring(wordAtPosition.startColumn - 1, position.column - 1),
-			startColumn: wordAtPosition.startColumn,
-			endColumn: position.column
-		};
-	}
-
-
-	public words(wordDefinition: RegExp): Iterable<string> {
-
-		const lines = this._lines;
-		const wordenize = this._wordenize.bind(this);
-
-		let lineNumber = 0;
-		let lineText = '';
-		let wordRangesIdx = 0;
-		let wordRanges: IWordRange[] = [];
-
-		return {
-			*[Symbol.iterator]() {
-				while (true) {
-					if (wordRangesIdx < wordRanges.length) {
-						const value = lineText.substring(wordRanges[wordRangesIdx].start, wordRanges[wordRangesIdx].end);
-						wordRangesIdx += 1;
-						yield value;
-					} else {
-						if (lineNumber < lines.length) {
-							lineText = lines[lineNumber];
-							wordRanges = wordenize(lineText, wordDefinition);
-							wordRangesIdx = 0;
-							lineNumber += 1;
-						} else {
-							break;
-						}
-					}
-				}
-			}
-		};
-	}
-
-	public getLineWords(lineNumber: number, wordDefinition: RegExp): IWordAtPosition[] {
-		const content = this._lines[lineNumber - 1];
-		const ranges = this._wordenize(content, wordDefinition);
-		const words: IWordAtPosition[] = [];
-		for (const range of ranges) {
-			words.push({
-				word: content.substring(range.start, range.end),
-				startColumn: range.start + 1,
-				endColumn: range.end + 1
-			});
-		}
-		return words;
-	}
-
-	private _wordenize(content: string, wordDefinition: RegExp): IWordRange[] {
-		const result: IWordRange[] = [];
-		let match: RegExpExecArray | null;
-
-		wordDefinition.lastIndex = 0; // reset lastIndex just to be sure
-
-		while (match = wordDefinition.exec(content)) {
-			if (match[0].length === 0) {
-				// it did match the empty string
-				break;
-			}
-			result.push({ start: match.index, end: match.index + match[0].length });
-		}
-		return result;
-	}
-
-	public getValueInRange(range: IRange): string {
-		range = this._validateRange(range);
-
-		if (range.startLineNumber === range.endLineNumber) {
-			return this._lines[range.startLineNumber - 1].substring(range.startColumn - 1, range.endColumn - 1);
-		}
-
-		const lineEnding = this._eol;
-		const startLineIndex = range.startLineNumber - 1;
-		const endLineIndex = range.endLineNumber - 1;
-		const resultLines: string[] = [];
-
-		resultLines.push(this._lines[startLineIndex].substring(range.startColumn - 1));
-		for (let i = startLineIndex + 1; i < endLineIndex; i++) {
-			resultLines.push(this._lines[i]);
-		}
-		resultLines.push(this._lines[endLineIndex].substring(0, range.endColumn - 1));
-
-		return resultLines.join(lineEnding);
-	}
-
-	public offsetAt(position: IPosition): number {
-		position = this._validatePosition(position);
-		this._ensureLineStarts();
-		return this._lineStarts!.getPrefixSum(position.lineNumber - 2) + (position.column - 1);
-	}
-
-	public positionAt(offset: number): IPosition {
-		offset = Math.floor(offset);
-		offset = Math.max(0, offset);
-
-		this._ensureLineStarts();
-		const out = this._lineStarts!.getIndexOf(offset);
-		const lineLength = this._lines[out.index].length;
-
-		// Ensure we return a valid position
-		return {
-			lineNumber: 1 + out.index,
-			column: 1 + Math.min(out.remainder, lineLength)
-		};
-	}
-
-	private _validateRange(range: IRange): IRange {
-
-		const start = this._validatePosition({ lineNumber: range.startLineNumber, column: range.startColumn });
-		const end = this._validatePosition({ lineNumber: range.endLineNumber, column: range.endColumn });
-
-		if (start.lineNumber !== range.startLineNumber
-			|| start.column !== range.startColumn
-			|| end.lineNumber !== range.endLineNumber
-			|| end.column !== range.endColumn) {
-
-			return {
-				startLineNumber: start.lineNumber,
-				startColumn: start.column,
-				endLineNumber: end.lineNumber,
-				endColumn: end.column
-			};
-		}
-
-		return range;
-	}
-
-	private _validatePosition(position: IPosition): IPosition {
-		if (!Position.isIPosition(position)) {
-			throw new Error('bad position');
-		}
-		let { lineNumber, column } = position;
-		let hasChanged = false;
-
-		if (lineNumber < 1) {
-			lineNumber = 1;
-			column = 1;
-			hasChanged = true;
-
-		} else if (lineNumber > this._lines.length) {
-			lineNumber = this._lines.length;
-			column = this._lines[lineNumber - 1].length + 1;
-			hasChanged = true;
-
-		} else {
-			const maxCharacter = this._lines[lineNumber - 1].length + 1;
-			if (column < 1) {
-				column = 1;
-				hasChanged = true;
-			}
-			else if (column > maxCharacter) {
-				column = maxCharacter;
-				hasChanged = true;
-			}
-		}
-
-		if (!hasChanged) {
-			return position;
-		} else {
-			return { lineNumber, column };
-		}
-	}
-}
-
 /**
  * @internal
  */
@@ -346,55 +83,38 @@ declare const require: any;
 /**
  * @internal
  */
-export class EditorSimpleWorker implements IRequestHandler, IDisposable {
+export class BaseEditorSimpleWorker implements IDisposable, IWorkerTextModelSyncChannelServer, IRequestHandler {
 	_requestHandlerBrand: any;
 
-	protected readonly _host: IEditorWorkerHost;
-	private _models: { [uri: string]: MirrorModel };
-	private readonly _foreignModuleFactory: IForeignModuleFactory | null;
-	private _foreignModule: any;
+	private readonly _workerTextModelSyncServer = new WorkerTextModelSyncServer();
 
-	constructor(host: IEditorWorkerHost, foreignModuleFactory: IForeignModuleFactory | null) {
-		this._host = host;
-		this._models = Object.create(null);
-		this._foreignModuleFactory = foreignModuleFactory;
-		this._foreignModule = null;
+	constructor() {
 	}
 
-	public dispose(): void {
-		this._models = Object.create(null);
+	dispose(): void {
 	}
 
-	protected _getModel(uri: string): ICommonModel {
-		return this._models[uri];
+	protected _getModel(uri: string): ICommonModel | undefined {
+		return this._workerTextModelSyncServer.getModel(uri);
 	}
 
-	private _getModels(): ICommonModel[] {
-		const all: MirrorModel[] = [];
-		Object.keys(this._models).forEach((key) => all.push(this._models[key]));
-		return all;
+	protected _getModels(): ICommonModel[] {
+		return this._workerTextModelSyncServer.getModels();
 	}
 
-	public acceptNewModel(data: IRawModelData): void {
-		this._models[data.url] = new MirrorModel(URI.parse(data.url), data.lines, data.EOL, data.versionId);
+	public $acceptNewModel(data: IRawModelData): void {
+		this._workerTextModelSyncServer.$acceptNewModel(data);
 	}
 
-	public acceptModelChanged(strURL: string, e: IModelChangedEvent): void {
-		if (!this._models[strURL]) {
-			return;
-		}
-		const model = this._models[strURL];
-		model.onEvents(e);
+	public $acceptModelChanged(uri: string, e: IModelChangedEvent): void {
+		this._workerTextModelSyncServer.$acceptModelChanged(uri, e);
 	}
 
-	public acceptRemovedModel(strURL: string): void {
-		if (!this._models[strURL]) {
-			return;
-		}
-		delete this._models[strURL];
+	public $acceptRemovedModel(uri: string): void {
+		this._workerTextModelSyncServer.$acceptRemovedModel(uri);
 	}
 
-	public async computeUnicodeHighlights(url: string, options: UnicodeHighlighterOptions, range?: IRange): Promise<IUnicodeHighlightsResult> {
+	public async $computeUnicodeHighlights(url: string, options: UnicodeHighlighterOptions, range?: IRange): Promise<IUnicodeHighlightsResult> {
 		const model = this._getModel(url);
 		if (!model) {
 			return { ranges: [], hasMore: false, ambiguousCharacterCount: 0, invisibleCharacterCount: 0, nonBasicAsciiCharacterCount: 0 };
@@ -402,7 +122,7 @@ export class EditorSimpleWorker implements IRequestHandler, IDisposable {
 		return UnicodeTextModelHighlighter.computeUnicodeHighlights(model, options, range);
 	}
 
-	public async findSectionHeaders(url: string, options: FindSectionHeaderOptions): Promise<SectionHeader[]> {
+	public async $findSectionHeaders(url: string, options: FindSectionHeaderOptions): Promise<SectionHeader[]> {
 		const model = this._getModel(url);
 		if (!model) {
 			return [];
@@ -412,7 +132,7 @@ export class EditorSimpleWorker implements IRequestHandler, IDisposable {
 
 	// ---- BEGIN diff --------------------------------------------------------------------------
 
-	public async computeDiff(originalUrl: string, modifiedUrl: string, options: IDocumentDiffProviderOptions, algorithm: DiffAlgorithmName): Promise<IDiffComputationResult | null> {
+	public async $computeDiff(originalUrl: string, modifiedUrl: string, options: IDocumentDiffProviderOptions, algorithm: DiffAlgorithmName): Promise<IDiffComputationResult | null> {
 		const original = this._getModel(originalUrl);
 		const modified = this._getModel(modifiedUrl);
 		if (!original || !modified) {
@@ -476,7 +196,7 @@ export class EditorSimpleWorker implements IRequestHandler, IDisposable {
 		return true;
 	}
 
-	public async computeDirtyDiff(originalUrl: string, modifiedUrl: string, ignoreTrimWhitespace: boolean): Promise<IChange[] | null> {
+	public async $computeDirtyDiff(originalUrl: string, modifiedUrl: string, ignoreTrimWhitespace: boolean): Promise<IChange[] | null> {
 		const original = this._getModel(originalUrl);
 		const modified = this._getModel(modifiedUrl);
 		if (!original || !modified) {
@@ -502,7 +222,7 @@ export class EditorSimpleWorker implements IRequestHandler, IDisposable {
 
 	private static readonly _diffLimit = 100000;
 
-	public async computeMoreMinimalEdits(modelUrl: string, edits: TextEdit[], pretty: boolean): Promise<TextEdit[]> {
+	public async $computeMoreMinimalEdits(modelUrl: string, edits: TextEdit[], pretty: boolean): Promise<TextEdit[]> {
 		const model = this._getModel(modelUrl);
 		if (!model) {
 			return edits;
@@ -584,7 +304,7 @@ export class EditorSimpleWorker implements IRequestHandler, IDisposable {
 		return result;
 	}
 
-	public computeHumanReadableDiff(modelUrl: string, edits: TextEdit[], options: ILinesDiffComputerOptions): TextEdit[] {
+	public $computeHumanReadableDiff(modelUrl: string, edits: TextEdit[], options: ILinesDiffComputerOptions): TextEdit[] {
 		const model = this._getModel(modelUrl);
 		if (!model) {
 			return edits;
@@ -684,7 +404,7 @@ export class EditorSimpleWorker implements IRequestHandler, IDisposable {
 
 	// ---- END minimal edits ---------------------------------------------------------------
 
-	public async computeLinks(modelUrl: string): Promise<ILink[] | null> {
+	public async $computeLinks(modelUrl: string): Promise<ILink[] | null> {
 		const model = this._getModel(modelUrl);
 		if (!model) {
 			return null;
@@ -695,7 +415,7 @@ export class EditorSimpleWorker implements IRequestHandler, IDisposable {
 
 	// --- BEGIN default document colors -----------------------------------------------------------
 
-	public async computeDefaultDocumentColors(modelUrl: string): Promise<IColorInformation[] | null> {
+	public async $computeDefaultDocumentColors(modelUrl: string): Promise<IColorInformation[] | null> {
 		const model = this._getModel(modelUrl);
 		if (!model) {
 			return null;
@@ -707,7 +427,7 @@ export class EditorSimpleWorker implements IRequestHandler, IDisposable {
 
 	private static readonly _suggestionsLimit = 10000;
 
-	public async textualSuggest(modelUrls: string[], leadingWord: string | undefined, wordDef: string, wordDefFlags: string): Promise<{ words: string[]; duration: number } | null> {
+	public async $textualSuggest(modelUrls: string[], leadingWord: string | undefined, wordDef: string, wordDefFlags: string): Promise<{ words: string[]; duration: number } | null> {
 
 		const sw = new StopWatch();
 		const wordDefRegExp = new RegExp(wordDef, wordDefFlags);
@@ -738,7 +458,7 @@ export class EditorSimpleWorker implements IRequestHandler, IDisposable {
 
 	//#region -- word ranges --
 
-	public async computeWordRanges(modelUrl: string, range: IRange, wordDef: string, wordDefFlags: string): Promise<{ [word: string]: IRange[] }> {
+	public async $computeWordRanges(modelUrl: string, range: IRange, wordDef: string, wordDefFlags: string): Promise<{ [word: string]: IRange[] }> {
 		const model = this._getModel(modelUrl);
 		if (!model) {
 			return Object.create(null);
@@ -769,7 +489,7 @@ export class EditorSimpleWorker implements IRequestHandler, IDisposable {
 
 	//#endregion
 
-	public async navigateValueSet(modelUrl: string, range: IRange, up: boolean, wordDef: string, wordDefFlags: string): Promise<IInplaceReplaceSupportResult | null> {
+	public async $navigateValueSet(modelUrl: string, range: IRange, up: boolean, wordDef: string, wordDefFlags: string): Promise<IInplaceReplaceSupportResult | null> {
 		const model = this._getModel(modelUrl);
 		if (!model) {
 			return null;
@@ -796,12 +516,31 @@ export class EditorSimpleWorker implements IRequestHandler, IDisposable {
 		const result = BasicInplaceReplace.INSTANCE.navigateValueSet(range, selectionText, wordRange, word, up);
 		return result;
 	}
+}
+
+/**
+ * @internal
+ */
+export class EditorSimpleWorker extends BaseEditorSimpleWorker {
+
+	private _foreignModule: any = null;
+
+	constructor(
+		private readonly _host: EditorWorkerHost,
+		private readonly _foreignModuleFactory: IForeignModuleFactory | null
+	) {
+		super();
+	}
+
+	public async $ping() {
+		return 'pong';
+	}
 
 	// ---- BEGIN foreign module support --------------------------------------------------------------------------
 
-	public loadForeignModule(moduleId: string, createData: any, foreignHostMethods: string[]): Promise<string[]> {
+	public $loadForeignModule(moduleId: string, createData: any, foreignHostMethods: string[]): Promise<string[]> {
 		const proxyMethodRequest = (method: string, args: any[]): Promise<any> => {
-			return this._host.fhr(method, args);
+			return this._host.$fhr(method, args);
 		};
 
 		const foreignHost = createProxyObject(foreignHostMethods, proxyMethodRequest);
@@ -818,24 +557,25 @@ export class EditorSimpleWorker implements IRequestHandler, IDisposable {
 			// static foreing module
 			return Promise.resolve(getAllMethodNames(this._foreignModule));
 		}
-		// ESM-comment-begin
+
 		return new Promise<any>((resolve, reject) => {
-			require([moduleId], (foreignModule: { create: IForeignModuleFactory }) => {
-				this._foreignModule = foreignModule.create(ctx, createData);
 
+			const onModuleCallback = (foreignModule: { create: IForeignModuleFactory }) => {
+				this._foreignModule = foreignModule.create(ctx, createData);
 				resolve(getAllMethodNames(this._foreignModule));
+			};
 
-			}, reject);
+			if (!isESM) {
+				require([`${moduleId}`], onModuleCallback, reject);
+			} else {
+				const url = FileAccess.asBrowserUri(`${moduleId}.js` as AppResourcePath).toString(true);
+				import(`${url}`).then(onModuleCallback).catch(reject);
+			}
 		});
-		// ESM-comment-end
-
-		// ESM-uncomment-begin
-		// return Promise.reject(new Error(`Unexpected usage`));
-		// ESM-uncomment-end
 	}
 
 	// foreign method request
-	public fmr(method: string, args: any[]): Promise<any> {
+	public $fmr(method: string, args: any[]): Promise<any> {
 		if (!this._foreignModule || typeof this._foreignModule[method] !== 'function') {
 			return Promise.reject(new Error('Missing requestHandler or method: ' + method));
 		}
@@ -851,11 +591,12 @@ export class EditorSimpleWorker implements IRequestHandler, IDisposable {
 }
 
 /**
- * Called on the worker side
+ * Defines the worker entry point. Must be exported and named `create`.
+ * @skipMangle
  * @internal
  */
-export function create(host: IEditorWorkerHost): IRequestHandler {
-	return new EditorSimpleWorker(host, null);
+export function create(workerServer: IWorkerServer): IRequestHandler {
+	return new EditorSimpleWorker(EditorWorkerHost.getChannel(workerServer), null);
 }
 
 // This is only available in a Web Worker
diff --git a/src/vs/editor/common/services/editorWorker.ts b/src/vs/editor/common/services/editorWorker.ts
index 7e87024cafc..74fe752bb8c 100644
--- a/src/vs/editor/common/services/editorWorker.ts
+++ b/src/vs/editor/common/services/editorWorker.ts
@@ -7,10 +7,10 @@ import { URI } from 'vs/base/common/uri';
 import { IRange } from 'vs/editor/common/core/range';
 import { IDocumentDiff, IDocumentDiffProviderOptions } from 'vs/editor/common/diff/documentDiffProvider';
 import { IChange } from 'vs/editor/common/diff/legacyLinesDiffComputer';
-import { IInplaceReplaceSupportResult, TextEdit } from 'vs/editor/common/languages';
+import { IColorInformation, IInplaceReplaceSupportResult, TextEdit } from 'vs/editor/common/languages';
 import { UnicodeHighlighterOptions } from 'vs/editor/common/services/unicodeTextModelHighlighter';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import type { EditorSimpleWorker } from 'vs/editor/common/services/editorSimpleWorker';
+import type { BaseEditorSimpleWorker } from 'vs/editor/common/services/editorSimpleWorker';
 import { SectionHeader, FindSectionHeaderOptions } from 'vs/editor/common/services/findSectionHeaders';
 
 export const IEditorWorkerService = createDecorator<IEditorWorkerService>('editorWorkerService');
@@ -23,7 +23,7 @@ export interface IEditorWorkerService {
 	canComputeUnicodeHighlights(uri: URI): boolean;
 	computedUnicodeHighlights(uri: URI, options: UnicodeHighlighterOptions, range?: IRange): Promise<IUnicodeHighlightsResult>;
 
-	/** Implementation in {@link EditorSimpleWorker.computeDiff} */
+	/** Implementation in {@link BaseEditorSimpleWorker.computeDiff} */
 	computeDiff(original: URI, modified: URI, options: IDocumentDiffProviderOptions, algorithm: DiffAlgorithmName): Promise<IDocumentDiff | null>;
 
 	canComputeDirtyDiff(original: URI, modified: URI): boolean;
@@ -39,6 +39,9 @@ export interface IEditorWorkerService {
 	navigateValueSet(resource: URI, range: IRange, up: boolean): Promise<IInplaceReplaceSupportResult | null>;
 
 	findSectionHeaders(uri: URI, options: FindSectionHeaderOptions): Promise<SectionHeader[]>;
+
+	computeDefaultDocumentColors(uri: URI): Promise<IColorInformation[] | null>;
+
 }
 
 export interface IDiffComputationResult {
diff --git a/src/vs/editor/common/services/editorWorkerBootstrap.ts b/src/vs/editor/common/services/editorWorkerBootstrap.ts
new file mode 100644
index 00000000000..160942a1d07
--- /dev/null
+++ b/src/vs/editor/common/services/editorWorkerBootstrap.ts
@@ -0,0 +1,51 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IWorkerServer, SimpleWorkerServer } from 'vs/base/common/worker/simpleWorker';
+import { EditorSimpleWorker } from 'vs/editor/common/services/editorSimpleWorker';
+import { EditorWorkerHost } from 'vs/editor/common/services/editorWorkerHost';
+
+type MessageEvent = {
+	data: any;
+};
+
+declare const globalThis: {
+	postMessage: (message: any) => void;
+	onmessage: (event: MessageEvent) => void;
+};
+
+let initialized = false;
+
+export function initialize(factory: any) {
+	if (initialized) {
+		return;
+	}
+	initialized = true;
+
+	const simpleWorker = new SimpleWorkerServer((msg) => {
+		globalThis.postMessage(msg);
+	}, (workerServer: IWorkerServer) => new EditorSimpleWorker(EditorWorkerHost.getChannel(workerServer), null));
+
+	globalThis.onmessage = (e: MessageEvent) => {
+		simpleWorker.onmessage(e.data);
+	};
+}
+
+globalThis.onmessage = (e: MessageEvent) => {
+	// Ignore first message in this case and initialize if not yet initialized
+	if (!initialized) {
+		initialize(null);
+	}
+};
+
+type CreateFunction<C, D, R = any> = (ctx: C, data: D) => R;
+
+export function bootstrapSimpleEditorWorker<C, D, R>(createFn: CreateFunction<C, D, R>) {
+	globalThis.onmessage = () => {
+		initialize((ctx: C, createData: D) => {
+			return createFn.call(self, ctx, createData);
+		});
+	};
+}
diff --git a/src/vs/editor/common/services/editorWorkerHost.ts b/src/vs/editor/common/services/editorWorkerHost.ts
index df0a6aa1c35..30ceed1833c 100644
--- a/src/vs/editor/common/services/editorWorkerHost.ts
+++ b/src/vs/editor/common/services/editorWorkerHost.ts
@@ -3,7 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-export interface IEditorWorkerHost {
+import { IWorkerServer, IWorkerClient } from 'vs/base/common/worker/simpleWorker';
+
+export abstract class EditorWorkerHost {
+	public static CHANNEL_NAME = 'editorWorkerHost';
+	public static getChannel(workerServer: IWorkerServer): EditorWorkerHost {
+		return workerServer.getChannel<EditorWorkerHost>(EditorWorkerHost.CHANNEL_NAME);
+	}
+	public static setChannel(workerClient: IWorkerClient<any>, obj: EditorWorkerHost): void {
+		workerClient.setChannel<EditorWorkerHost>(EditorWorkerHost.CHANNEL_NAME, obj);
+	}
+
 	// foreign host request
-	fhr(method: string, args: any[]): Promise<any>;
+	abstract $fhr(method: string, args: any[]): Promise<any>;
 }
diff --git a/src/vs/editor/common/services/getIconClasses.ts b/src/vs/editor/common/services/getIconClasses.ts
index 52a1e2633e6..1f3bea995fd 100644
--- a/src/vs/editor/common/services/getIconClasses.ts
+++ b/src/vs/editor/common/services/getIconClasses.ts
@@ -123,5 +123,5 @@ function detectLanguageId(modelService: IModelService, languageService: ILanguag
 }
 
 function cssEscape(str: string): string {
-	return str.replace(/[\x11\x12\x14\x15\x40]/g, '/'); // HTML class names can not contain certain whitespace characters, use / instead, which doesn't exist in file names.
+	return str.replace(/[\s]/g, '/'); // HTML class names can not contain certain whitespace characters (https://dom.spec.whatwg.org/#interface-domtokenlist), use / instead, which doesn't exist in file names.
 }
diff --git a/src/vs/editor/common/services/languageService.ts b/src/vs/editor/common/services/languageService.ts
index 6d96f2a2502..f0a7f835069 100644
--- a/src/vs/editor/common/services/languageService.ts
+++ b/src/vs/editor/common/services/languageService.ts
@@ -11,6 +11,7 @@ import { ILanguageNameIdPair, ILanguageSelection, ILanguageService, ILanguageIco
 import { firstOrDefault } from 'vs/base/common/arrays';
 import { ILanguageIdCodec, TokenizationRegistry } from 'vs/editor/common/languages';
 import { PLAINTEXT_LANGUAGE_ID } from 'vs/editor/common/languages/modesRegistry';
+import { IObservable, observableFromEvent } from 'vs/base/common/observable';
 
 export class LanguageService extends Disposable implements ILanguageService {
 	public _serviceBrand: undefined;
@@ -150,51 +151,15 @@ export class LanguageService extends Disposable implements ILanguageService {
 }
 
 class LanguageSelection implements ILanguageSelection {
+	private readonly _value: IObservable<string>;
+	public readonly onDidChange: Event<string>;
 
-	public languageId: string;
-
-	private _listener: IDisposable | null = null;
-	private _emitter: Emitter<string> | null = null;
-
-	constructor(
-		private readonly _onDidChangeLanguages: Event<void>,
-		private readonly _selector: () => string
-	) {
-		this.languageId = this._selector();
-	}
-
-	private _dispose(): void {
-		if (this._listener) {
-			this._listener.dispose();
-			this._listener = null;
-		}
-		if (this._emitter) {
-			this._emitter.dispose();
-			this._emitter = null;
-		}
+	constructor(onDidChangeLanguages: Event<void>, selector: () => string) {
+		this._value = observableFromEvent(this, onDidChangeLanguages, () => selector());
+		this.onDidChange = Event.fromObservable(this._value);
 	}
 
-	public get onDidChange(): Event<string> {
-		if (!this._listener) {
-			this._listener = this._onDidChangeLanguages(() => this._evaluate());
-		}
-		if (!this._emitter) {
-			this._emitter = new Emitter<string>({
-				onDidRemoveLastListener: () => {
-					this._dispose();
-				}
-			});
-		}
-		return this._emitter.event;
-	}
-
-	private _evaluate(): void {
-		const languageId = this._selector();
-		if (languageId === this.languageId) {
-			// no change
-			return;
-		}
-		this.languageId = languageId;
-		this._emitter?.fire(this.languageId);
+	public get languageId(): string {
+		return this._value.get();
 	}
 }
diff --git a/src/vs/editor/common/services/modelService.ts b/src/vs/editor/common/services/modelService.ts
index 2bbda14a026..00019d6f961 100644
--- a/src/vs/editor/common/services/modelService.ts
+++ b/src/vs/editor/common/services/modelService.ts
@@ -14,7 +14,7 @@ import { TextModel, createTextBuffer } from 'vs/editor/common/model/textModel';
 import { EDITOR_MODEL_DEFAULTS } from 'vs/editor/common/core/textModelDefaults';
 import { IModelLanguageChangedEvent } from 'vs/editor/common/textModelEvents';
 import { PLAINTEXT_LANGUAGE_ID } from 'vs/editor/common/languages/modesRegistry';
-import { ILanguageSelection, ILanguageService } from 'vs/editor/common/languages/language';
+import { ILanguageSelection } from 'vs/editor/common/languages/language';
 import { IModelService } from 'vs/editor/common/services/model';
 import { ITextResourcePropertiesService } from 'vs/editor/common/services/textResourceConfiguration';
 import { IConfigurationChangeEvent, IConfigurationService } from 'vs/platform/configuration/common/configuration';
@@ -23,7 +23,7 @@ import { StringSHA1 } from 'vs/base/common/hash';
 import { isEditStackElement } from 'vs/editor/common/model/editStack';
 import { Schemas } from 'vs/base/common/network';
 import { equals } from 'vs/base/common/objects';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 
 function MODEL_ID(resource: URI): string {
 	return resource.toString();
@@ -107,8 +107,7 @@ export class ModelService extends Disposable implements IModelService {
 		@IConfigurationService private readonly _configurationService: IConfigurationService,
 		@ITextResourcePropertiesService private readonly _resourcePropertiesService: ITextResourcePropertiesService,
 		@IUndoRedoService private readonly _undoRedoService: IUndoRedoService,
-		@ILanguageService private readonly _languageService: ILanguageService,
-		@ILanguageConfigurationService private readonly _languageConfigurationService: ILanguageConfigurationService,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService
 	) {
 		super();
 		this._modelCreationOptionsByLanguageAndResource = Object.create(null);
@@ -314,14 +313,11 @@ export class ModelService extends Disposable implements IModelService {
 	private _createModelData(value: string | ITextBufferFactory, languageIdOrSelection: string | ILanguageSelection, resource: URI | undefined, isForSimpleWidget: boolean): ModelData {
 		// create & save the model
 		const options = this.getCreationOptions(languageIdOrSelection, resource, isForSimpleWidget);
-		const model: TextModel = new TextModel(
+		const model: TextModel = this._instantiationService.createInstance(TextModel,
 			value,
 			languageIdOrSelection,
 			options,
-			resource,
-			this._undoRedoService,
-			this._languageService,
-			this._languageConfigurationService,
+			resource
 		);
 		if (resource && this._disposedModels.has(MODEL_ID(resource))) {
 			const disposedModelData = this._removeDisposedModel(resource)!;
diff --git a/src/vs/editor/common/services/textModelSync/textModelSync.impl.ts b/src/vs/editor/common/services/textModelSync/textModelSync.impl.ts
new file mode 100644
index 00000000000..dc68d666453
--- /dev/null
+++ b/src/vs/editor/common/services/textModelSync/textModelSync.impl.ts
@@ -0,0 +1,427 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IntervalTimer } from 'vs/base/common/async';
+import { Disposable, DisposableStore, dispose, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
+import { URI } from 'vs/base/common/uri';
+import { IWorkerClient, IWorkerServer } from 'vs/base/common/worker/simpleWorker';
+import { IPosition, Position } from 'vs/editor/common/core/position';
+import { IRange, Range } from 'vs/editor/common/core/range';
+import { ensureValidWordDefinition, getWordAtText, IWordAtPosition } from 'vs/editor/common/core/wordHelper';
+import { IDocumentColorComputerTarget } from 'vs/editor/common/languages/defaultDocumentColorsComputer';
+import { ILinkComputerTarget } from 'vs/editor/common/languages/linkComputer';
+import { MirrorTextModel as BaseMirrorModel, IModelChangedEvent } from 'vs/editor/common/model/mirrorTextModel';
+import { IMirrorModel, IWordRange } from 'vs/editor/common/services/editorSimpleWorker';
+import { IModelService } from 'vs/editor/common/services/model';
+import { IRawModelData, IWorkerTextModelSyncChannelServer } from 'vs/editor/common/services/textModelSync/textModelSync.protocol';
+
+/**
+ * Stop syncing a model to the worker if it was not needed for 1 min.
+ */
+export const STOP_SYNC_MODEL_DELTA_TIME_MS = 60 * 1000;
+
+export const WORKER_TEXT_MODEL_SYNC_CHANNEL = 'workerTextModelSync';
+
+export class WorkerTextModelSyncClient extends Disposable {
+
+	public static create(workerClient: IWorkerClient<any>, modelService: IModelService): WorkerTextModelSyncClient {
+		return new WorkerTextModelSyncClient(
+			workerClient.getChannel<IWorkerTextModelSyncChannelServer>(WORKER_TEXT_MODEL_SYNC_CHANNEL),
+			modelService
+		);
+	}
+
+	private readonly _proxy: IWorkerTextModelSyncChannelServer;
+	private readonly _modelService: IModelService;
+	private _syncedModels: { [modelUrl: string]: IDisposable } = Object.create(null);
+	private _syncedModelsLastUsedTime: { [modelUrl: string]: number } = Object.create(null);
+
+	constructor(proxy: IWorkerTextModelSyncChannelServer, modelService: IModelService, keepIdleModels: boolean = false) {
+		super();
+		this._proxy = proxy;
+		this._modelService = modelService;
+
+		if (!keepIdleModels) {
+			const timer = new IntervalTimer();
+			timer.cancelAndSet(() => this._checkStopModelSync(), Math.round(STOP_SYNC_MODEL_DELTA_TIME_MS / 2));
+			this._register(timer);
+		}
+	}
+
+	public override dispose(): void {
+		for (const modelUrl in this._syncedModels) {
+			dispose(this._syncedModels[modelUrl]);
+		}
+		this._syncedModels = Object.create(null);
+		this._syncedModelsLastUsedTime = Object.create(null);
+		super.dispose();
+	}
+
+	public ensureSyncedResources(resources: URI[], forceLargeModels: boolean = false): void {
+		for (const resource of resources) {
+			const resourceStr = resource.toString();
+
+			if (!this._syncedModels[resourceStr]) {
+				this._beginModelSync(resource, forceLargeModels);
+			}
+			if (this._syncedModels[resourceStr]) {
+				this._syncedModelsLastUsedTime[resourceStr] = (new Date()).getTime();
+			}
+		}
+	}
+
+	private _checkStopModelSync(): void {
+		const currentTime = (new Date()).getTime();
+
+		const toRemove: string[] = [];
+		for (const modelUrl in this._syncedModelsLastUsedTime) {
+			const elapsedTime = currentTime - this._syncedModelsLastUsedTime[modelUrl];
+			if (elapsedTime > STOP_SYNC_MODEL_DELTA_TIME_MS) {
+				toRemove.push(modelUrl);
+			}
+		}
+
+		for (const e of toRemove) {
+			this._stopModelSync(e);
+		}
+	}
+
+	private _beginModelSync(resource: URI, forceLargeModels: boolean): void {
+		const model = this._modelService.getModel(resource);
+		if (!model) {
+			return;
+		}
+		if (!forceLargeModels && model.isTooLargeForSyncing()) {
+			return;
+		}
+
+		const modelUrl = resource.toString();
+
+		this._proxy.$acceptNewModel({
+			url: model.uri.toString(),
+			lines: model.getLinesContent(),
+			EOL: model.getEOL(),
+			versionId: model.getVersionId()
+		});
+
+		const toDispose = new DisposableStore();
+		toDispose.add(model.onDidChangeContent((e) => {
+			this._proxy.$acceptModelChanged(modelUrl.toString(), e);
+		}));
+		toDispose.add(model.onWillDispose(() => {
+			this._stopModelSync(modelUrl);
+		}));
+		toDispose.add(toDisposable(() => {
+			this._proxy.$acceptRemovedModel(modelUrl);
+		}));
+
+		this._syncedModels[modelUrl] = toDispose;
+	}
+
+	private _stopModelSync(modelUrl: string): void {
+		const toDispose = this._syncedModels[modelUrl];
+		delete this._syncedModels[modelUrl];
+		delete this._syncedModelsLastUsedTime[modelUrl];
+		dispose(toDispose);
+	}
+}
+
+export class WorkerTextModelSyncServer implements IWorkerTextModelSyncChannelServer {
+
+	private readonly _models: { [uri: string]: MirrorModel };
+
+	constructor() {
+		this._models = Object.create(null);
+	}
+
+	public bindToServer(workerServer: IWorkerServer): void {
+		workerServer.setChannel(WORKER_TEXT_MODEL_SYNC_CHANNEL, this);
+	}
+
+	public getModel(uri: string): ICommonModel | undefined {
+		return this._models[uri];
+	}
+
+	public getModels(): ICommonModel[] {
+		const all: MirrorModel[] = [];
+		Object.keys(this._models).forEach((key) => all.push(this._models[key]));
+		return all;
+	}
+
+	$acceptNewModel(data: IRawModelData): void {
+		this._models[data.url] = new MirrorModel(URI.parse(data.url), data.lines, data.EOL, data.versionId);
+	}
+
+	$acceptModelChanged(uri: string, e: IModelChangedEvent): void {
+		if (!this._models[uri]) {
+			return;
+		}
+		const model = this._models[uri];
+		model.onEvents(e);
+	}
+
+	$acceptRemovedModel(uri: string): void {
+		if (!this._models[uri]) {
+			return;
+		}
+		delete this._models[uri];
+	}
+}
+
+export class MirrorModel extends BaseMirrorModel implements ICommonModel {
+
+	public get uri(): URI {
+		return this._uri;
+	}
+
+	public get eol(): string {
+		return this._eol;
+	}
+
+	public getValue(): string {
+		return this.getText();
+	}
+
+	public findMatches(regex: RegExp): RegExpMatchArray[] {
+		const matches = [];
+		for (let i = 0; i < this._lines.length; i++) {
+			const line = this._lines[i];
+			const offsetToAdd = this.offsetAt(new Position(i + 1, 1));
+			const iteratorOverMatches = line.matchAll(regex);
+			for (const match of iteratorOverMatches) {
+				if (match.index || match.index === 0) {
+					match.index = match.index + offsetToAdd;
+				}
+				matches.push(match);
+			}
+		}
+		return matches;
+	}
+
+	public getLinesContent(): string[] {
+		return this._lines.slice(0);
+	}
+
+	public getLineCount(): number {
+		return this._lines.length;
+	}
+
+	public getLineContent(lineNumber: number): string {
+		return this._lines[lineNumber - 1];
+	}
+
+	public getWordAtPosition(position: IPosition, wordDefinition: RegExp): Range | null {
+
+		const wordAtText = getWordAtText(
+			position.column,
+			ensureValidWordDefinition(wordDefinition),
+			this._lines[position.lineNumber - 1],
+			0
+		);
+
+		if (wordAtText) {
+			return new Range(position.lineNumber, wordAtText.startColumn, position.lineNumber, wordAtText.endColumn);
+		}
+
+		return null;
+	}
+
+	public getWordUntilPosition(position: IPosition, wordDefinition: RegExp): IWordAtPosition {
+		const wordAtPosition = this.getWordAtPosition(position, wordDefinition);
+		if (!wordAtPosition) {
+			return {
+				word: '',
+				startColumn: position.column,
+				endColumn: position.column
+			};
+		}
+		return {
+			word: this._lines[position.lineNumber - 1].substring(wordAtPosition.startColumn - 1, position.column - 1),
+			startColumn: wordAtPosition.startColumn,
+			endColumn: position.column
+		};
+	}
+
+
+	public words(wordDefinition: RegExp): Iterable<string> {
+
+		const lines = this._lines;
+		const wordenize = this._wordenize.bind(this);
+
+		let lineNumber = 0;
+		let lineText = '';
+		let wordRangesIdx = 0;
+		let wordRanges: IWordRange[] = [];
+
+		return {
+			*[Symbol.iterator]() {
+				while (true) {
+					if (wordRangesIdx < wordRanges.length) {
+						const value = lineText.substring(wordRanges[wordRangesIdx].start, wordRanges[wordRangesIdx].end);
+						wordRangesIdx += 1;
+						yield value;
+					} else {
+						if (lineNumber < lines.length) {
+							lineText = lines[lineNumber];
+							wordRanges = wordenize(lineText, wordDefinition);
+							wordRangesIdx = 0;
+							lineNumber += 1;
+						} else {
+							break;
+						}
+					}
+				}
+			}
+		};
+	}
+
+	public getLineWords(lineNumber: number, wordDefinition: RegExp): IWordAtPosition[] {
+		const content = this._lines[lineNumber - 1];
+		const ranges = this._wordenize(content, wordDefinition);
+		const words: IWordAtPosition[] = [];
+		for (const range of ranges) {
+			words.push({
+				word: content.substring(range.start, range.end),
+				startColumn: range.start + 1,
+				endColumn: range.end + 1
+			});
+		}
+		return words;
+	}
+
+	private _wordenize(content: string, wordDefinition: RegExp): IWordRange[] {
+		const result: IWordRange[] = [];
+		let match: RegExpExecArray | null;
+
+		wordDefinition.lastIndex = 0; // reset lastIndex just to be sure
+
+		while (match = wordDefinition.exec(content)) {
+			if (match[0].length === 0) {
+				// it did match the empty string
+				break;
+			}
+			result.push({ start: match.index, end: match.index + match[0].length });
+		}
+		return result;
+	}
+
+	public getValueInRange(range: IRange): string {
+		range = this._validateRange(range);
+
+		if (range.startLineNumber === range.endLineNumber) {
+			return this._lines[range.startLineNumber - 1].substring(range.startColumn - 1, range.endColumn - 1);
+		}
+
+		const lineEnding = this._eol;
+		const startLineIndex = range.startLineNumber - 1;
+		const endLineIndex = range.endLineNumber - 1;
+		const resultLines: string[] = [];
+
+		resultLines.push(this._lines[startLineIndex].substring(range.startColumn - 1));
+		for (let i = startLineIndex + 1; i < endLineIndex; i++) {
+			resultLines.push(this._lines[i]);
+		}
+		resultLines.push(this._lines[endLineIndex].substring(0, range.endColumn - 1));
+
+		return resultLines.join(lineEnding);
+	}
+
+	public offsetAt(position: IPosition): number {
+		position = this._validatePosition(position);
+		this._ensureLineStarts();
+		return this._lineStarts!.getPrefixSum(position.lineNumber - 2) + (position.column - 1);
+	}
+
+	public positionAt(offset: number): IPosition {
+		offset = Math.floor(offset);
+		offset = Math.max(0, offset);
+
+		this._ensureLineStarts();
+		const out = this._lineStarts!.getIndexOf(offset);
+		const lineLength = this._lines[out.index].length;
+
+		// Ensure we return a valid position
+		return {
+			lineNumber: 1 + out.index,
+			column: 1 + Math.min(out.remainder, lineLength)
+		};
+	}
+
+	private _validateRange(range: IRange): IRange {
+
+		const start = this._validatePosition({ lineNumber: range.startLineNumber, column: range.startColumn });
+		const end = this._validatePosition({ lineNumber: range.endLineNumber, column: range.endColumn });
+
+		if (start.lineNumber !== range.startLineNumber
+			|| start.column !== range.startColumn
+			|| end.lineNumber !== range.endLineNumber
+			|| end.column !== range.endColumn) {
+
+			return {
+				startLineNumber: start.lineNumber,
+				startColumn: start.column,
+				endLineNumber: end.lineNumber,
+				endColumn: end.column
+			};
+		}
+
+		return range;
+	}
+
+	private _validatePosition(position: IPosition): IPosition {
+		if (!Position.isIPosition(position)) {
+			throw new Error('bad position');
+		}
+		let { lineNumber, column } = position;
+		let hasChanged = false;
+
+		if (lineNumber < 1) {
+			lineNumber = 1;
+			column = 1;
+			hasChanged = true;
+
+		} else if (lineNumber > this._lines.length) {
+			lineNumber = this._lines.length;
+			column = this._lines[lineNumber - 1].length + 1;
+			hasChanged = true;
+
+		} else {
+			const maxCharacter = this._lines[lineNumber - 1].length + 1;
+			if (column < 1) {
+				column = 1;
+				hasChanged = true;
+			}
+			else if (column > maxCharacter) {
+				column = maxCharacter;
+				hasChanged = true;
+			}
+		}
+
+		if (!hasChanged) {
+			return position;
+		} else {
+			return { lineNumber, column };
+		}
+	}
+}
+
+export interface ICommonModel extends ILinkComputerTarget, IDocumentColorComputerTarget, IMirrorModel {
+	uri: URI;
+	version: number;
+	eol: string;
+	getValue(): string;
+
+	getLinesContent(): string[];
+	getLineCount(): number;
+	getLineContent(lineNumber: number): string;
+	getLineWords(lineNumber: number, wordDefinition: RegExp): IWordAtPosition[];
+	words(wordDefinition: RegExp): Iterable<string>;
+	getWordUntilPosition(position: IPosition, wordDefinition: RegExp): IWordAtPosition;
+	getValueInRange(range: IRange): string;
+	getWordAtPosition(position: IPosition, wordDefinition: RegExp): Range | null;
+	offsetAt(position: IPosition): number;
+	positionAt(offset: number): IPosition;
+	findMatches(regex: RegExp): RegExpMatchArray[];
+}
diff --git a/src/vs/editor/common/services/textModelSync/textModelSync.protocol.ts b/src/vs/editor/common/services/textModelSync/textModelSync.protocol.ts
new file mode 100644
index 00000000000..5ffbf6a0c8c
--- /dev/null
+++ b/src/vs/editor/common/services/textModelSync/textModelSync.protocol.ts
@@ -0,0 +1,21 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IModelChangedEvent } from 'vs/editor/common/model/mirrorTextModel';
+
+export interface IWorkerTextModelSyncChannelServer {
+	$acceptNewModel(data: IRawModelData): void;
+
+	$acceptModelChanged(strURL: string, e: IModelChangedEvent): void;
+
+	$acceptRemovedModel(strURL: string): void;
+}
+
+export interface IRawModelData {
+	url: string;
+	versionId: number;
+	lines: string[];
+	EOL: string;
+}
diff --git a/src/vs/editor/common/services/treeSitterParserService.ts b/src/vs/editor/common/services/treeSitterParserService.ts
new file mode 100644
index 00000000000..aed18b37d4f
--- /dev/null
+++ b/src/vs/editor/common/services/treeSitterParserService.ts
@@ -0,0 +1,25 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import type { Parser } from '@vscode/tree-sitter-wasm';
+import { Event } from 'vs/base/common/event';
+import { ITextModel } from 'vs/editor/common/model';
+import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+
+export const EDITOR_EXPERIMENTAL_PREFER_TREESITTER = 'editor.experimental.preferTreeSitter';
+
+export const ITreeSitterParserService = createDecorator<ITreeSitterParserService>('treeSitterParserService');
+
+export interface ITreeSitterParserService {
+	readonly _serviceBrand: undefined;
+	onDidAddLanguage: Event<{ id: string; language: Parser.Language }>;
+	getOrInitLanguage(languageId: string): Parser.Language | undefined;
+	getParseResult(textModel: ITextModel): ITreeSitterParseResult | undefined;
+}
+
+export interface ITreeSitterParseResult {
+	readonly tree: Parser.Tree | undefined;
+	readonly language: Parser.Language;
+}
diff --git a/src/vs/editor/common/standaloneStrings.ts b/src/vs/editor/common/standaloneStrings.ts
index 4414dd7bea9..458c7247477 100644
--- a/src/vs/editor/common/standaloneStrings.ts
+++ b/src/vs/editor/common/standaloneStrings.ts
@@ -19,14 +19,20 @@ export namespace AccessibilityHelpNLS {
 	export const screenReaderModeEnabled = nls.localize("screenReaderModeEnabled", "Screen Reader Optimized Mode enabled.");
 	export const screenReaderModeDisabled = nls.localize("screenReaderModeDisabled", "Screen Reader Optimized Mode disabled.");
 	export const tabFocusModeOnMsg = nls.localize("tabFocusModeOnMsg", "Pressing Tab in the current editor will move focus to the next focusable element. Toggle this behavior{0}.", '<keybinding:editor.action.toggleTabFocusMode>');
-	export const tabFocusModeOffMsg = nls.localize("tabFocusModeOffMsg", "Pressing Tab in the current editor will insert the tab character. Toggle this behavior{0}", '<keybinding:editor.action.toggleTabFocusMode>');
+	export const tabFocusModeOffMsg = nls.localize("tabFocusModeOffMsg", "Pressing Tab in the current editor will insert the tab character. Toggle this behavior{0}.", '<keybinding:editor.action.toggleTabFocusMode>');
 	export const stickScroll = nls.localize("stickScrollKb", "Focus Sticky Scroll{0} to focus the currently nested scopes.", '<keybinding:editor.action.focusStickyDebugConsole>');
+	export const codeFolding = nls.localize("codeFolding", "Use code folding to collapse blocks of code and focus on the code you're interested in via the Toggle Folding Command{0}.", '<keybinding:editor.toggleFold>');
+	export const intellisense = nls.localize("intellisense", "Use Intellisense to improve coding efficiency and reduce errors. Trigger suggestions{0}.", '<keybinding:editor.action.triggerSuggest>');
+	export const showOrFocusHover = nls.localize("showOrFocusHover", "Show or focus the hover{0} to read information about the current symbol.", '<keybinding:editor.action.showHover>');
+	export const goToSymbol = nls.localize("goToSymbol", "Go to Symbol{0} to quickly navigate between symbols in the current file.", '<keybinding:workbench.action.gotoSymbol>');
 	export const showAccessibilityHelpAction = nls.localize("showAccessibilityHelpAction", "Show Accessibility Help");
 	export const listSignalSounds = nls.localize("listSignalSoundsCommand", "Run the command: List Signal Sounds for an overview of all sounds and their current status.");
 	export const listAlerts = nls.localize("listAnnouncementsCommand", "Run the command: List Signal Announcements for an overview of announcements and their current status.");
 	export const quickChat = nls.localize("quickChatCommand", "Toggle quick chat{0} to open or close a chat session.", '<keybinding:workbench.action.quickchat.toggle>');
 	export const startInlineChat = nls.localize("startInlineChatCommand", "Start inline chat{0} to create an in editor chat session.", '<keybinding:inlineChat.start>');
+	export const startDebugging = nls.localize('debug.startDebugging', "The Debug: Start Debugging command{0} will start a debug session.", '<keybinding:workbench.action.debug.start>');
 	export const setBreakpoint = nls.localize('debugConsole.setBreakpoint', "The Debug: Inline Breakpoint command{0} will set or unset a breakpoint at the current cursor position in the active editor.", '<keybinding:editor.debug.action.toggleInlineBreakpoint>');
+	export const addToWatch = nls.localize('debugConsole.addToWatch', "The Debug: Add to Watch command{0} will add the selected text to the watch view.", '<keybinding:editor.debug.action.selectionToWatch>');
 	export const debugExecuteSelection = nls.localize('debugConsole.executeSelection', "The Debug: Execute Selection command{0} will execute the selected text in the debug console.", '<keybinding:editor.debug.action.selectionToRepl>');
 }
 
@@ -54,7 +60,6 @@ export namespace QuickOutlineNLS {
 
 export namespace StandaloneCodeEditorNLS {
 	export const editorViewAccessibleLabel = nls.localize('editorViewAccessibleLabel', "Editor content");
-	export const accessibilityHelpMessage = nls.localize('accessibilityHelpMessage', "Press Alt+F1 for Accessibility Options.");
 }
 
 export namespace ToggleHighContrastNLS {
diff --git a/src/vs/editor/common/textModelEvents.ts b/src/vs/editor/common/textModelEvents.ts
index 58c720ac87c..7d63afec8e8 100644
--- a/src/vs/editor/common/textModelEvents.ts
+++ b/src/vs/editor/common/textModelEvents.ts
@@ -55,6 +55,9 @@ export interface IModelContentChange {
  * An event describing a change in the text of a model.
  */
 export interface IModelContentChangedEvent {
+	/**
+	 * The changes are ordered from the end of the document to the beginning, so they should be safe to apply in sequence.
+	 */
 	readonly changes: IModelContentChange[];
 	/**
 	 * The (new) end-of-line character.
diff --git a/src/vs/editor/common/tokenizationRegistry.ts b/src/vs/editor/common/tokenizationRegistry.ts
index d9fb1bba82f..15ad1b85159 100644
--- a/src/vs/editor/common/tokenizationRegistry.ts
+++ b/src/vs/editor/common/tokenizationRegistry.ts
@@ -6,13 +6,13 @@
 import { Color } from 'vs/base/common/color';
 import { Emitter, Event } from 'vs/base/common/event';
 import { Disposable, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { ITokenizationRegistry, ITokenizationSupport, ITokenizationSupportChangedEvent, ILazyTokenizationSupport } from 'vs/editor/common/languages';
+import { ITokenizationRegistry, ITokenizationSupportChangedEvent, ILazyTokenizationSupport } from 'vs/editor/common/languages';
 import { ColorId } from 'vs/editor/common/encodedTokenAttributes';
 
-export class TokenizationRegistry implements ITokenizationRegistry {
+export class TokenizationRegistry<TSupport> implements ITokenizationRegistry<TSupport> {
 
-	private readonly _tokenizationSupports = new Map<string, ITokenizationSupport>();
-	private readonly _factories = new Map<string, TokenizationSupportFactoryData>();
+	private readonly _tokenizationSupports = new Map<string, TSupport>();
+	private readonly _factories = new Map<string, TokenizationSupportFactoryData<TSupport>>();
 
 	private readonly _onDidChange = new Emitter<ITokenizationSupportChangedEvent>();
 	public readonly onDidChange: Event<ITokenizationSupportChangedEvent> = this._onDidChange.event;
@@ -30,7 +30,7 @@ export class TokenizationRegistry implements ITokenizationRegistry {
 		});
 	}
 
-	public register(languageId: string, support: ITokenizationSupport): IDisposable {
+	public register(languageId: string, support: TSupport): IDisposable {
 		this._tokenizationSupports.set(languageId, support);
 		this.handleChange([languageId]);
 		return toDisposable(() => {
@@ -42,11 +42,11 @@ export class TokenizationRegistry implements ITokenizationRegistry {
 		});
 	}
 
-	public get(languageId: string): ITokenizationSupport | null {
+	public get(languageId: string): TSupport | null {
 		return this._tokenizationSupports.get(languageId) || null;
 	}
 
-	public registerFactory(languageId: string, factory: ILazyTokenizationSupport): IDisposable {
+	public registerFactory(languageId: string, factory: ILazyTokenizationSupport<TSupport>): IDisposable {
 		this._factories.get(languageId)?.dispose();
 		const myData = new TokenizationSupportFactoryData(this, languageId, factory);
 		this._factories.set(languageId, myData);
@@ -60,7 +60,7 @@ export class TokenizationRegistry implements ITokenizationRegistry {
 		});
 	}
 
-	public async getOrCreate(languageId: string): Promise<ITokenizationSupport | null> {
+	public async getOrCreate(languageId: string): Promise<TSupport | null> {
 		// check first if the support is already set
 		const tokenizationSupport = this.get(languageId);
 		if (tokenizationSupport) {
@@ -112,7 +112,7 @@ export class TokenizationRegistry implements ITokenizationRegistry {
 	}
 }
 
-class TokenizationSupportFactoryData extends Disposable {
+class TokenizationSupportFactoryData<TSupport> extends Disposable {
 
 	private _isDisposed: boolean = false;
 	private _resolvePromise: Promise<void> | null = null;
@@ -123,9 +123,9 @@ class TokenizationSupportFactoryData extends Disposable {
 	}
 
 	constructor(
-		private readonly _registry: TokenizationRegistry,
+		private readonly _registry: TokenizationRegistry<TSupport>,
 		private readonly _languageId: string,
-		private readonly _factory: ILazyTokenizationSupport,
+		private readonly _factory: ILazyTokenizationSupport<TSupport>,
 	) {
 		super();
 	}
diff --git a/src/vs/editor/contrib/codeAction/browser/codeActionController.ts b/src/vs/editor/contrib/codeAction/browser/codeActionController.ts
index 5ac2deed516..862459df98c 100644
--- a/src/vs/editor/contrib/codeAction/browser/codeActionController.ts
+++ b/src/vs/editor/contrib/codeAction/browser/codeActionController.ts
@@ -39,6 +39,7 @@ import { registerThemingParticipant } from 'vs/platform/theme/common/themeServic
 import { CodeActionAutoApply, CodeActionFilter, CodeActionItem, CodeActionKind, CodeActionSet, CodeActionTrigger, CodeActionTriggerSource } from 'vs/editor/contrib/codeAction/common/types';
 import { CodeActionModel, CodeActionsState } from 'vs/editor/contrib/codeAction/browser/codeActionModel';
 import { HierarchicalKind } from 'vs/base/common/hierarchicalKind';
+import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 
 interface IActionShowOptions {
 	readonly includeDisabledActions?: boolean;
@@ -77,12 +78,13 @@ export class CodeActionController extends Disposable implements IEditorContribut
 		@ICommandService private readonly _commandService: ICommandService,
 		@IConfigurationService private readonly _configurationService: IConfigurationService,
 		@IActionWidgetService private readonly _actionWidgetService: IActionWidgetService,
-		@IInstantiationService private readonly _instantiationService: IInstantiationService
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+		@ITelemetryService private readonly _telemetryService: ITelemetryService
 	) {
 		super();
 
 		this._editor = editor;
-		this._model = this._register(new CodeActionModel(this._editor, languageFeaturesService.codeActionProvider, markerService, contextKeyService, progressService, _configurationService));
+		this._model = this._register(new CodeActionModel(this._editor, languageFeaturesService.codeActionProvider, markerService, contextKeyService, progressService, _configurationService, this._telemetryService));
 		this._register(this._model.onDidChangeState(newState => this.update(newState)));
 
 		this._lightBulbWidget = new Lazy(() => {
@@ -178,6 +180,12 @@ export class CodeActionController extends Disposable implements IEditorContribut
 			return;
 		}
 
+
+		const selection = this._editor.getSelection();
+		if (selection?.startLineNumber !== newState.position.lineNumber) {
+			return;
+		}
+
 		this._lightBulbWidget.value?.update(actions, newState.trigger, newState.position);
 
 		if (newState.trigger.type === CodeActionTriggerType.Invoke) {
diff --git a/src/vs/editor/contrib/codeAction/browser/codeActionModel.ts b/src/vs/editor/contrib/codeAction/browser/codeActionModel.ts
index 0e11fef86ab..07c2865996b 100644
--- a/src/vs/editor/contrib/codeAction/browser/codeActionModel.ts
+++ b/src/vs/editor/contrib/codeAction/browser/codeActionModel.ts
@@ -22,6 +22,8 @@ import { IEditorProgressService, Progress } from 'vs/platform/progress/common/pr
 import { CodeActionKind, CodeActionSet, CodeActionTrigger, CodeActionTriggerSource } from '../common/types';
 import { getCodeActions } from './codeAction';
 import { HierarchicalKind } from 'vs/base/common/hierarchicalKind';
+import { StopWatch } from 'vs/base/common/stopwatch';
+import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 
 export const SUPPORTED_CODE_ACTIONS = new RawContextKey<string>('supportedCodeAction', '');
 
@@ -172,6 +174,7 @@ export class CodeActionModel extends Disposable {
 		contextKeyService: IContextKeyService,
 		private readonly _progressService?: IEditorProgressService,
 		private readonly _configurationService?: IConfigurationService,
+		private readonly _telemetryService?: ITelemetryService
 	) {
 		super();
 		this._supportedCodeActions = SUPPORTED_CODE_ACTIONS.bindTo(contextKeyService);
@@ -315,7 +318,35 @@ export class CodeActionModel extends Disposable {
 							}
 						}
 					}
-					// temporarilly hiding here as this is enabled/disabled behind a setting.
+
+					// Case for manual triggers - specifically Source Actions and Refactors
+					if (trigger.trigger.type === CodeActionTriggerType.Invoke) {
+						const sw = new StopWatch();
+						const codeActions = await getCodeActions(this._registry, model, trigger.selection, trigger.trigger, Progress.None, token);
+
+						// Telemetry for duration of each code action on save.
+						if (this._telemetryService) {
+							type RenderActionMenu = {
+								codeActions: number;
+								duration: number;
+							};
+
+							type RenderActionMenuClassification = {
+								owner: 'justschen';
+								comment: 'Information about how long it took for code actions to be received from the provider and shown in the UI.';
+								codeActions: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Number of valid code actions received from TS.' };
+								duration: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Duration it took for TS to return the action to run for each kind. ' };
+							};
+
+							this._telemetryService.publicLog2<RenderActionMenu, RenderActionMenuClassification>('codeAction.invokedDurations', {
+								codeActions: codeActions.validActions.length,
+								duration: sw.elapsed()
+							});
+						}
+
+						return codeActions;
+					}
+
 					return getCodeActions(this._registry, model, trigger.selection, trigger.trigger, Progress.None, token);
 				});
 				if (trigger.trigger.type === CodeActionTriggerType.Invoke) {
diff --git a/src/vs/editor/contrib/codeAction/browser/lightBulbWidget.ts b/src/vs/editor/contrib/codeAction/browser/lightBulbWidget.ts
index 6bc8eb0c1b3..bc71291b49e 100644
--- a/src/vs/editor/contrib/codeAction/browser/lightBulbWidget.ts
+++ b/src/vs/editor/contrib/codeAction/browser/lightBulbWidget.ts
@@ -75,6 +75,14 @@ export class LightBulbWidget extends Disposable implements IContentWidget {
 	private _gutterState: LightBulbState.State = LightBulbState.Hidden;
 	private _iconClasses: string[] = [];
 
+	private readonly lightbulbClasses = [
+		'codicon-' + GUTTER_LIGHTBULB_ICON.id,
+		'codicon-' + GUTTER_LIGHTBULB_AIFIX_AUTO_FIX_ICON.id,
+		'codicon-' + GUTTER_LIGHTBULB_AUTO_FIX_ICON.id,
+		'codicon-' + GUTTER_LIGHTBULB_AIFIX_ICON.id,
+		'codicon-' + GUTTER_SPARKLE_FILLED_ICON.id
+	];
+
 	private _preferredKbLabel?: string;
 	private _quickFixKbLabel?: string;
 
@@ -148,15 +156,8 @@ export class LightBulbWidget extends Disposable implements IContentWidget {
 		}));
 
 		this._register(this._editor.onMouseDown(async (e: IEditorMouseEvent) => {
-			const lightbulbClasses = [
-				'codicon-' + GUTTER_LIGHTBULB_ICON.id,
-				'codicon-' + GUTTER_LIGHTBULB_AIFIX_AUTO_FIX_ICON.id,
-				'codicon-' + GUTTER_LIGHTBULB_AUTO_FIX_ICON.id,
-				'codicon-' + GUTTER_LIGHTBULB_AIFIX_ICON.id,
-				'codicon-' + GUTTER_SPARKLE_FILLED_ICON.id
-			];
-
-			if (!e.target.element || !lightbulbClasses.some(cls => e.target.element && e.target.element.classList.contains(cls))) {
+
+			if (!e.target.element || !this.lightbulbClasses.some(cls => e.target.element && e.target.element.classList.contains(cls))) {
 				return;
 			}
 
@@ -212,6 +213,12 @@ export class LightBulbWidget extends Disposable implements IContentWidget {
 			return this.hide();
 		}
 
+		const hasTextFocus = this._editor.hasTextFocus();
+		if (!hasTextFocus) {
+			this.gutterHide();
+			return this.hide();
+		}
+
 		const options = this._editor.getOptions();
 		if (!options.get(EditorOption.lightbulb).enabled) {
 			this.gutterHide();
@@ -236,6 +243,20 @@ export class LightBulbWidget extends Disposable implements IContentWidget {
 			return lineNumber > 2 && this._editor.getTopForLineNumber(lineNumber) === this._editor.getTopForLineNumber(lineNumber - 1);
 		};
 
+		// Check for glyph margin decorations of any kind
+		const currLineDecorations = this._editor.getLineDecorations(lineNumber);
+		let hasDecoration = false;
+		if (currLineDecorations) {
+			for (const decoration of currLineDecorations) {
+				const glyphClass = decoration.options.glyphMarginClassName;
+
+				if (glyphClass && !this.lightbulbClasses.some(className => glyphClass.includes(className))) {
+					hasDecoration = true;
+					break;
+				}
+			}
+		}
+
 		let effectiveLineNumber = lineNumber;
 		let effectiveColumnNumber = 1;
 		if (!lineHasSpace) {
@@ -253,16 +274,6 @@ export class LightBulbWidget extends Disposable implements IContentWidget {
 				const currLineEmptyOrIndented = isLineEmptyOrIndented(lineNumber);
 				const notEmpty = !nextLineEmptyOrIndented && !prevLineEmptyOrIndented;
 
-				let hasDecoration = false;
-				const currLineDecorations = this._editor.getLineDecorations(lineNumber);
-				if (currLineDecorations) {
-					for (const decoration of currLineDecorations) {
-						if (decoration.options.glyphMarginClassName?.includes(Codicon.debugBreakpoint.id)) {
-							hasDecoration = true;
-						}
-					}
-				}
-
 				// check above and below. if both are blocked, display lightbulb in the gutter.
 				if (!nextLineEmptyOrIndented && !prevLineEmptyOrIndented && !hasDecoration) {
 					this.gutterState = new LightBulbState.Showing(actions, trigger, atPosition, {
@@ -271,7 +282,7 @@ export class LightBulbWidget extends Disposable implements IContentWidget {
 					});
 					this.renderGutterLightbub();
 					return this.hide();
-				} else if (prevLineEmptyOrIndented || endLine || (notEmpty && !currLineEmptyOrIndented)) {
+				} else if (prevLineEmptyOrIndented || endLine || (prevLineEmptyOrIndented && !currLineEmptyOrIndented)) {
 					effectiveLineNumber -= 1;
 				} else if (nextLineEmptyOrIndented || (notEmpty && currLineEmptyOrIndented)) {
 					effectiveLineNumber += 1;
@@ -282,8 +293,13 @@ export class LightBulbWidget extends Disposable implements IContentWidget {
 					position: { lineNumber: effectiveLineNumber, column: effectiveColumnNumber },
 					preference: LightBulbWidget._posPref
 				});
-				this.renderGutterLightbub();
-				return this.hide();
+
+				if (hasDecoration) {
+					this.gutterHide();
+				} else {
+					this.renderGutterLightbub();
+					return this.hide();
+				}
 			} else if ((lineNumber < model.getLineCount()) && !isFolded(lineNumber + 1)) {
 				effectiveLineNumber += 1;
 			} else if (column * fontInfo.spaceWidth < 22) {
diff --git a/src/vs/editor/contrib/colorPicker/browser/colorContributions.ts b/src/vs/editor/contrib/colorPicker/browser/colorContributions.ts
index e7642a17e7d..af1162debe5 100644
--- a/src/vs/editor/contrib/colorPicker/browser/colorContributions.ts
+++ b/src/vs/editor/contrib/colorPicker/browser/colorContributions.ts
@@ -11,7 +11,7 @@ import { Range } from 'vs/editor/common/core/range';
 import { IEditorContribution } from 'vs/editor/common/editorCommon';
 import { ColorDecorationInjectedTextMarker } from 'vs/editor/contrib/colorPicker/browser/colorDetector';
 import { ColorHoverParticipant } from 'vs/editor/contrib/colorPicker/browser/colorHoverParticipant';
-import { HoverController } from 'vs/editor/contrib/hover/browser/hoverController';
+import { ContentHoverController } from 'vs/editor/contrib/hover/browser/contentHoverController2';
 import { HoverStartMode, HoverStartSource } from 'vs/editor/contrib/hover/browser/hoverOperation';
 import { HoverParticipantRegistry } from 'vs/editor/contrib/hover/browser/hoverTypes';
 
@@ -56,7 +56,7 @@ export class ColorContribution extends Disposable implements IEditorContribution
 			return;
 		}
 
-		const hoverController = this._editor.getContribution<HoverController>(HoverController.ID);
+		const hoverController = this._editor.getContribution<ContentHoverController>(ContentHoverController.ID);
 		if (!hoverController) {
 			return;
 		}
diff --git a/src/vs/editor/contrib/colorPicker/browser/defaultDocumentColorProvider.ts b/src/vs/editor/contrib/colorPicker/browser/defaultDocumentColorProvider.ts
index 8bb5e3ad56a..3bd7b848530 100644
--- a/src/vs/editor/contrib/colorPicker/browser/defaultDocumentColorProvider.ts
+++ b/src/vs/editor/contrib/colorPicker/browser/defaultDocumentColorProvider.ts
@@ -7,26 +7,19 @@ import { CancellationToken } from 'vs/base/common/cancellation';
 import { Color, RGBA } from 'vs/base/common/color';
 import { ITextModel } from 'vs/editor/common/model';
 import { DocumentColorProvider, IColor, IColorInformation, IColorPresentation } from 'vs/editor/common/languages';
-import { EditorWorkerClient } from 'vs/editor/browser/services/editorWorkerService';
-import { IModelService } from 'vs/editor/common/services/model';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
 import { registerEditorFeature } from 'vs/editor/common/editorFeatures';
+import { IEditorWorkerService } from 'vs/editor/common/services/editorWorker';
 
 export class DefaultDocumentColorProvider implements DocumentColorProvider {
 
-	private _editorWorkerClient: EditorWorkerClient;
-
 	constructor(
-		modelService: IModelService,
-		languageConfigurationService: ILanguageConfigurationService,
-	) {
-		this._editorWorkerClient = new EditorWorkerClient(modelService, false, 'editorWorkerService', languageConfigurationService);
-	}
+		@IEditorWorkerService private readonly _editorWorkerService: IEditorWorkerService,
+	) { }
 
 	async provideDocumentColors(model: ITextModel, _token: CancellationToken): Promise<IColorInformation[] | null> {
-		return this._editorWorkerClient.computeDefaultDocumentColors(model.uri);
+		return this._editorWorkerService.computeDefaultDocumentColors(model.uri);
 	}
 
 	provideColorPresentations(_model: ITextModel, colorInfo: IColorInformation, _token: CancellationToken): IColorPresentation[] {
@@ -49,12 +42,11 @@ export class DefaultDocumentColorProvider implements DocumentColorProvider {
 
 class DefaultDocumentColorProviderFeature extends Disposable {
 	constructor(
-		@IModelService _modelService: IModelService,
-		@ILanguageConfigurationService _languageConfigurationService: ILanguageConfigurationService,
 		@ILanguageFeaturesService _languageFeaturesService: ILanguageFeaturesService,
+		@IEditorWorkerService editorWorkerService: IEditorWorkerService,
 	) {
 		super();
-		this._register(_languageFeaturesService.colorProvider.register('*', new DefaultDocumentColorProvider(_modelService, _languageConfigurationService)));
+		this._register(_languageFeaturesService.colorProvider.register('*', new DefaultDocumentColorProvider(editorWorkerService)));
 	}
 }
 
diff --git a/src/vs/editor/contrib/colorPicker/browser/standaloneColorPickerWidget.ts b/src/vs/editor/contrib/colorPicker/browser/standaloneColorPickerWidget.ts
index 424448611b1..b5fc34cf6e6 100644
--- a/src/vs/editor/contrib/colorPicker/browser/standaloneColorPickerWidget.ts
+++ b/src/vs/editor/contrib/colorPicker/browser/standaloneColorPickerWidget.ts
@@ -22,11 +22,10 @@ import { EditorContributionInstantiation, registerEditorContribution } from 'vs/
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
 import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { IRange } from 'vs/editor/common/core/range';
-import { IModelService } from 'vs/editor/common/services/model';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
 import { DefaultDocumentColorProvider } from 'vs/editor/contrib/colorPicker/browser/defaultDocumentColorProvider';
 import * as dom from 'vs/base/browser/dom';
 import 'vs/css!./colorPicker';
+import { IEditorWorkerService } from 'vs/editor/common/services/editorWorker';
 
 export class StandaloneColorPickerController extends Disposable implements IEditorContribution {
 
@@ -38,11 +37,7 @@ export class StandaloneColorPickerController extends Disposable implements IEdit
 	constructor(
 		private readonly _editor: ICodeEditor,
 		@IContextKeyService _contextKeyService: IContextKeyService,
-		@IModelService private readonly _modelService: IModelService,
-		@IKeybindingService private readonly _keybindingService: IKeybindingService,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
-		@ILanguageFeaturesService private readonly _languageFeatureService: ILanguageFeaturesService,
-		@ILanguageConfigurationService private readonly _languageConfigurationService: ILanguageConfigurationService
 	) {
 		super();
 		this._standaloneColorPickerVisible = EditorContextKeys.standaloneColorPickerVisible.bindTo(_contextKeyService);
@@ -54,7 +49,12 @@ export class StandaloneColorPickerController extends Disposable implements IEdit
 			return;
 		}
 		if (!this._standaloneColorPickerVisible.get()) {
-			this._standaloneColorPickerWidget = new StandaloneColorPickerWidget(this._editor, this._standaloneColorPickerVisible, this._standaloneColorPickerFocused, this._instantiationService, this._modelService, this._keybindingService, this._languageFeatureService, this._languageConfigurationService);
+			this._standaloneColorPickerWidget = this._instantiationService.createInstance(
+				StandaloneColorPickerWidget,
+				this._editor,
+				this._standaloneColorPickerVisible,
+				this._standaloneColorPickerFocused
+			);
 		} else if (!this._standaloneColorPickerFocused.get()) {
 			this._standaloneColorPickerWidget?.focus();
 		}
@@ -102,10 +102,9 @@ export class StandaloneColorPickerWidget extends Disposable implements IContentW
 		private readonly _standaloneColorPickerVisible: IContextKey<boolean>,
 		private readonly _standaloneColorPickerFocused: IContextKey<boolean>,
 		@IInstantiationService _instantiationService: IInstantiationService,
-		@IModelService private readonly _modelService: IModelService,
 		@IKeybindingService private readonly _keybindingService: IKeybindingService,
 		@ILanguageFeaturesService private readonly _languageFeaturesService: ILanguageFeaturesService,
-		@ILanguageConfigurationService private readonly _languageConfigurationService: ILanguageConfigurationService
+		@IEditorWorkerService private readonly _editorWorkerService: IEditorWorkerService,
 	) {
 		super();
 		this._standaloneColorPickerVisible.set(true);
@@ -205,7 +204,7 @@ export class StandaloneColorPickerWidget extends Disposable implements IContentW
 			range: range,
 			color: { red: 0, green: 0, blue: 0, alpha: 1 }
 		};
-		const colorHoverResult: { colorHover: StandaloneColorPickerHover; foundInEditor: boolean } | null = await this._standaloneColorPickerParticipant.createColorHover(colorInfo, new DefaultDocumentColorProvider(this._modelService, this._languageConfigurationService), this._languageFeaturesService.colorProvider);
+		const colorHoverResult: { colorHover: StandaloneColorPickerHover; foundInEditor: boolean } | null = await this._standaloneColorPickerParticipant.createColorHover(colorInfo, new DefaultDocumentColorProvider(this._editorWorkerService), this._languageFeaturesService.colorProvider);
 		if (!colorHoverResult) {
 			return null;
 		}
diff --git a/src/vs/editor/contrib/dropOrPasteInto/browser/copyPasteController.ts b/src/vs/editor/contrib/dropOrPasteInto/browser/copyPasteController.ts
index ad79eb6a01f..1203f86cdfb 100644
--- a/src/vs/editor/contrib/dropOrPasteInto/browser/copyPasteController.ts
+++ b/src/vs/editor/contrib/dropOrPasteInto/browser/copyPasteController.ts
@@ -135,8 +135,7 @@ export class CopyPasteController extends Disposable implements IEditorContributi
 	}
 
 	private isPasteAsEnabled(): boolean {
-		return this._editor.getOption(EditorOption.pasteAs).enabled
-			&& !this._editor.getOption(EditorOption.readOnly);
+		return this._editor.getOption(EditorOption.pasteAs).enabled;
 	}
 
 	public async finishedPaste(): Promise<void> {
@@ -148,12 +147,10 @@ export class CopyPasteController extends Disposable implements IEditorContributi
 			return;
 		}
 
-		if (platform.isWeb) {
-			// Explicitly clear the web resources clipboard.
-			// This is needed because on web, the browser clipboard is faked out using an in-memory store.
-			// This means the resources clipboard is not properly updated when copying from the editor.
-			this._clipboardService.writeResources([]);
-		}
+		// Explicitly clear the clipboard internal state.
+		// This is needed because on web, the browser clipboard is faked out using an in-memory store.
+		// This means the resources clipboard is not properly updated when copying from the editor.
+		this._clipboardService.clearInternalState?.();
 
 		if (!e.clipboardData || !this.isPasteAsEnabled()) {
 			return;
@@ -248,8 +245,8 @@ export class CopyPasteController extends Disposable implements IEditorContributi
 		}
 
 		if (
-			!this.isPasteAsEnabled()
-			&& !this._pasteAsActionContext // Still enable if paste as was explicitly requested
+			this._editor.getOption(EditorOption.readOnly) // Never enabled if editor is readonly.
+			|| (!this.isPasteAsEnabled() && !this._pasteAsActionContext) // Or feature disabled (but still enable if paste was explicitly requested)
 		) {
 			return;
 		}
diff --git a/src/vs/editor/contrib/find/browser/findController.ts b/src/vs/editor/contrib/find/browser/findController.ts
index bbcc79d0750..a11d534de3b 100644
--- a/src/vs/editor/contrib/find/browser/findController.ts
+++ b/src/vs/editor/contrib/find/browser/findController.ts
@@ -5,7 +5,7 @@
 
 import { Delayer } from 'vs/base/common/async';
 import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { Disposable } from 'vs/base/common/lifecycle';
+import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
 import * as strings from 'vs/base/common/strings';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { EditorAction, EditorCommand, EditorContributionInstantiation, MultiEditorAction, registerEditorAction, registerEditorCommand, registerEditorContribution, registerMultiEditorAction, ServicesAccessor } from 'vs/editor/browser/editorExtensions';
@@ -771,7 +771,8 @@ export class MoveToMatchFindAction extends EditorAction {
 		}
 
 		const quickInputService = accessor.get(IQuickInputService);
-		const inputBox = quickInputService.createInputBox();
+		const disposables = new DisposableStore();
+		const inputBox = disposables.add(quickInputService.createInputBox());
 		inputBox.placeholder = nls.localize('findMatchAction.inputPlaceHolder', "Type a number to go to a specific match (between 1 and {0})", matchesCount);
 
 		const toFindMatchIndex = (value: string): number | undefined => {
@@ -805,11 +806,11 @@ export class MoveToMatchFindAction extends EditorAction {
 				this.clearDecorations(editor);
 			}
 		};
-		inputBox.onDidChangeValue(value => {
+		disposables.add(inputBox.onDidChangeValue(value => {
 			updatePickerAndEditor(value);
-		});
+		}));
 
-		inputBox.onDidAccept(() => {
+		disposables.add(inputBox.onDidAccept(() => {
 			const index = toFindMatchIndex(inputBox.value);
 			if (typeof index === 'number') {
 				controller.goToMatch(index);
@@ -817,12 +818,12 @@ export class MoveToMatchFindAction extends EditorAction {
 			} else {
 				inputBox.validationMessage = nls.localize('findMatchAction.inputValidationMessage', "Please type a number between 1 and {0}", controller.getState().matchesCount);
 			}
-		});
+		}));
 
-		inputBox.onDidHide(() => {
+		disposables.add(inputBox.onDidHide(() => {
 			this.clearDecorations(editor);
-			inputBox.dispose();
-		});
+			disposables.dispose();
+		}));
 
 		inputBox.show();
 	}
diff --git a/src/vs/editor/contrib/folding/browser/folding.ts b/src/vs/editor/contrib/folding/browser/folding.ts
index 25988ac7370..b713765ec80 100644
--- a/src/vs/editor/contrib/folding/browser/folding.ts
+++ b/src/vs/editor/contrib/folding/browser/folding.ts
@@ -17,6 +17,7 @@ import { EditorAction, EditorContributionInstantiation, registerEditorAction, re
 import { ConfigurationChangedEvent, EditorOption } from 'vs/editor/common/config/editorOptions';
 import { IPosition } from 'vs/editor/common/core/position';
 import { IRange } from 'vs/editor/common/core/range';
+import { Selection } from 'vs/editor/common/core/selection';
 import { IEditorContribution, ScrollType } from 'vs/editor/common/editorCommon';
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
 import { ITextModel } from 'vs/editor/common/model';
@@ -328,8 +329,7 @@ export class FoldingController extends Disposable implements IEditorContribution
 
 						// some cursors might have moved into hidden regions, make sure they are in expanded regions
 						const selections = this.editor.getSelections();
-						const selectionLineNumbers = selections ? selections.map(s => s.startLineNumber) : [];
-						foldingModel.update(foldingRanges, selectionLineNumbers);
+						foldingModel.update(foldingRanges, toSelectedLines(selections));
 
 						scrollState?.restore(this.editor);
 
@@ -582,6 +582,29 @@ abstract class FoldingAction<T> extends EditorAction {
 	}
 }
 
+export interface SelectedLines {
+	startsInside(startLine: number, endLine: number): boolean;
+}
+
+export function toSelectedLines(selections: Selection[] | null): SelectedLines {
+	if (!selections || selections.length === 0) {
+		return {
+			startsInside: () => false
+		};
+	}
+	return {
+		startsInside(startLine: number, endLine: number): boolean {
+			for (const s of selections) {
+				const line = s.startLineNumber;
+				if (line >= startLine && line <= endLine) {
+					return true;
+				}
+			}
+			return false;
+		}
+	};
+}
+
 interface FoldingArguments {
 	levels?: number;
 	direction?: 'up' | 'down';
diff --git a/src/vs/editor/contrib/folding/browser/foldingModel.ts b/src/vs/editor/contrib/folding/browser/foldingModel.ts
index b031a05abcc..7b1c6253ac5 100644
--- a/src/vs/editor/contrib/folding/browser/foldingModel.ts
+++ b/src/vs/editor/contrib/folding/browser/foldingModel.ts
@@ -7,6 +7,7 @@ import { Emitter, Event } from 'vs/base/common/event';
 import { IModelDecorationOptions, IModelDecorationsChangeAccessor, IModelDeltaDecoration, ITextModel } from 'vs/editor/common/model';
 import { FoldingRegion, FoldingRegions, ILineRange, FoldRange, FoldSource } from './foldingRanges';
 import { hash } from 'vs/base/common/hash';
+import { SelectedLines } from 'vs/editor/contrib/folding/browser/folding';
 
 export interface IDecorationProvider {
 	getDecorationOption(isCollapsed: boolean, isHidden: boolean, isManual: boolean): IModelDecorationOptions;
@@ -111,9 +112,9 @@ export class FoldingModel {
 		this.updatePost(FoldingRegions.fromFoldRanges(newFoldingRanges));
 	}
 
-	public update(newRegions: FoldingRegions, blockedLineNumers: number[] = []): void {
-		const foldedOrManualRanges = this._currentFoldedOrManualRanges(blockedLineNumers);
-		const newRanges = FoldingRegions.sanitizeAndMerge(newRegions, foldedOrManualRanges, this._textModel.getLineCount());
+	public update(newRegions: FoldingRegions, selection?: SelectedLines): void {
+		const foldedOrManualRanges = this._currentFoldedOrManualRanges(selection);
+		const newRanges = FoldingRegions.sanitizeAndMerge(newRegions, foldedOrManualRanges, this._textModel.getLineCount(), selection);
 		this.updatePost(FoldingRegions.fromFoldRanges(newRanges));
 	}
 
@@ -141,17 +142,7 @@ export class FoldingModel {
 		this._updateEventEmitter.fire({ model: this });
 	}
 
-	private _currentFoldedOrManualRanges(blockedLineNumers: number[] = []): FoldRange[] {
-
-		const isBlocked = (startLineNumber: number, endLineNumber: number) => {
-			for (const blockedLineNumber of blockedLineNumers) {
-				if (startLineNumber < blockedLineNumber && blockedLineNumber <= endLineNumber) { // first line is visible
-					return true;
-				}
-			}
-			return false;
-		};
-
+	private _currentFoldedOrManualRanges(selection?: SelectedLines): FoldRange[] {
 		const foldedRanges: FoldRange[] = [];
 		for (let i = 0, limit = this._regions.length; i < limit; i++) {
 			let isCollapsed = this.regions.isCollapsed(i);
@@ -160,7 +151,7 @@ export class FoldingModel {
 				const foldRange = this._regions.toFoldRange(i);
 				const decRange = this._textModel.getDecorationRange(this._editorDecorationIds[i]);
 				if (decRange) {
-					if (isCollapsed && isBlocked(decRange.startLineNumber, decRange.endLineNumber)) {
+					if (isCollapsed && selection?.startsInside(decRange.startLineNumber + 1, decRange.endLineNumber)) {
 						isCollapsed = false; // uncollapse is the range is blocked
 					}
 					foldedRanges.push({
diff --git a/src/vs/editor/contrib/folding/browser/foldingRanges.ts b/src/vs/editor/contrib/folding/browser/foldingRanges.ts
index ee23abbfc74..1220d014157 100644
--- a/src/vs/editor/contrib/folding/browser/foldingRanges.ts
+++ b/src/vs/editor/contrib/folding/browser/foldingRanges.ts
@@ -3,6 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { SelectedLines } from 'vs/editor/contrib/folding/browser/folding';
+
 export interface ILineRange {
 	startLineNumber: number;
 	endLineNumber: number;
@@ -299,7 +301,10 @@ export class FoldingRegions {
 	public static sanitizeAndMerge(
 		rangesA: FoldingRegions | FoldRange[],
 		rangesB: FoldingRegions | FoldRange[],
-		maxLineNumber: number | undefined): FoldRange[] {
+		maxLineNumber: number | undefined,
+		selection?: SelectedLines
+	): FoldRange[] {
+
 		maxLineNumber = maxLineNumber ?? Number.MAX_VALUE;
 
 		const getIndexedFunction = (r: FoldingRegions | FoldRange[], limit: number) => {
@@ -330,7 +335,8 @@ export class FoldingRegions {
 					} else {
 						// a previously folded range or a (possibly unfolded) recovered range
 						useRange = nextA;
-						useRange.isCollapsed = nextB.isCollapsed && nextA.endLineNumber === nextB.endLineNumber;
+						// stays collapsed if the range still has the same number of lines or the selection is not in the range or after it
+						useRange.isCollapsed = nextB.isCollapsed && (nextA.endLineNumber === nextB.endLineNumber || !selection?.startsInside(nextA.startLineNumber + 1, nextA.endLineNumber + 1));
 						useRange.source = FoldSource.provider;
 					}
 					nextA = getA(++indexA); // not necessary, just for speed
diff --git a/src/vs/editor/contrib/folding/test/browser/foldingModel.test.ts b/src/vs/editor/contrib/folding/test/browser/foldingModel.test.ts
index 1ea615a5bd9..f33f67b3f42 100644
--- a/src/vs/editor/contrib/folding/test/browser/foldingModel.test.ts
+++ b/src/vs/editor/contrib/folding/test/browser/foldingModel.test.ts
@@ -8,8 +8,10 @@ import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/uti
 import { EditOperation } from 'vs/editor/common/core/editOperation';
 import { Position } from 'vs/editor/common/core/position';
 import { Range } from 'vs/editor/common/core/range';
+import { Selection } from 'vs/editor/common/core/selection';
 import { IModelDecorationsChangeAccessor, ITextModel, TrackedRangeStickiness } from 'vs/editor/common/model';
 import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
+import { toSelectedLines } from 'vs/editor/contrib/folding/browser/folding';
 import { FoldingModel, getNextFoldLine, getParentFoldLine, getPreviousFoldLine, setCollapseStateAtLevel, setCollapseStateForMatchingLines, setCollapseStateForRest, setCollapseStateLevelsDown, setCollapseStateLevelsUp, setCollapseStateUp } from 'vs/editor/contrib/folding/browser/foldingModel';
 import { FoldingRegion } from 'vs/editor/contrib/folding/browser/foldingRanges';
 import { computeRanges } from 'vs/editor/contrib/folding/browser/indentRangeProvider';
@@ -288,7 +290,7 @@ suite('Folding Model', () => {
 
 			textModel.applyEdits([EditOperation.delete(new Range(6, 11, 9, 0))]);
 
-			foldingModel.update(computeRanges(textModel, false, undefined));
+			foldingModel.update(computeRanges(textModel, true, undefined), toSelectedLines([new Selection(7, 1, 7, 1)]));
 
 			assertRanges(foldingModel, [r(1, 9, false), r(2, 8, false), r(3, 5, false), r(6, 8, false)]);
 		} finally {
diff --git a/src/vs/editor/contrib/gotoSymbol/browser/goToSymbol.ts b/src/vs/editor/contrib/gotoSymbol/browser/goToSymbol.ts
index 93d144c77f4..1477a394036 100644
--- a/src/vs/editor/contrib/gotoSymbol/browser/goToSymbol.ts
+++ b/src/vs/editor/contrib/gotoSymbol/browser/goToSymbol.ts
@@ -22,7 +22,7 @@ function shouldIncludeLocationLink(sourceModel: ITextModel, loc: LocationLink):
 	}
 
 	// Otherwise filter out locations from internal schemes
-	if (matchesSomeScheme(loc.uri, Schemas.walkThroughSnippet, Schemas.vscodeChatCodeBlock, Schemas.vscodeChatCodeCompareBlock, Schemas.vscodeCopilotBackingChatCodeBlock)) {
+	if (matchesSomeScheme(loc.uri, Schemas.walkThroughSnippet, Schemas.vscodeChatCodeBlock, Schemas.vscodeChatCodeCompareBlock)) {
 		return false;
 	}
 
diff --git a/src/vs/editor/contrib/gotoSymbol/browser/peek/referencesController.ts b/src/vs/editor/contrib/gotoSymbol/browser/peek/referencesController.ts
index 40d344f3e3a..e7691080b89 100644
--- a/src/vs/editor/contrib/gotoSymbol/browser/peek/referencesController.ts
+++ b/src/vs/editor/contrib/gotoSymbol/browser/peek/referencesController.ts
@@ -105,9 +105,14 @@ export abstract class ReferencesController implements IEditorContribution {
 			modelPromise.cancel();
 			if (this._widget) {
 				this._storageService.store(storageKey, JSON.stringify(this._widget.layoutData), StorageScope.PROFILE, StorageTarget.MACHINE);
+				if (!this._widget.isClosing) {
+					// to prevent calling this too many times, check whether it was already closing.
+					this.closeWidget();
+				}
 				this._widget = undefined;
+			} else {
+				this.closeWidget();
 			}
-			this.closeWidget();
 		}));
 
 		this._disposables.add(this._widget.onDidSelectReference(event => {
diff --git a/src/vs/editor/contrib/gotoSymbol/browser/peek/referencesWidget.ts b/src/vs/editor/contrib/gotoSymbol/browser/peek/referencesWidget.ts
index 0941671756d..977e68ec231 100644
--- a/src/vs/editor/contrib/gotoSymbol/browser/peek/referencesWidget.ts
+++ b/src/vs/editor/contrib/gotoSymbol/browser/peek/referencesWidget.ts
@@ -23,9 +23,7 @@ import { ScrollType } from 'vs/editor/common/editorCommon';
 import { IModelDeltaDecoration, TrackedRangeStickiness } from 'vs/editor/common/model';
 import { ModelDecorationOptions, TextModel } from 'vs/editor/common/model/textModel';
 import { Location } from 'vs/editor/common/languages';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
 import { PLAINTEXT_LANGUAGE_ID } from 'vs/editor/common/languages/modesRegistry';
-import { ILanguageService } from 'vs/editor/common/languages/language';
 import { ITextEditorModel, ITextModelService } from 'vs/editor/common/services/resolverService';
 import { AccessibilityProvider, DataSource, Delegate, FileReferencesRenderer, IdentityProvider, OneReferenceRenderer, StringRepresentationProvider, TreeElement } from 'vs/editor/contrib/gotoSymbol/browser/peek/referencesTree';
 import * as peekView from 'vs/editor/contrib/peekView/browser/peekView';
@@ -35,7 +33,6 @@ import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { ILabelService } from 'vs/platform/label/common/label';
 import { IWorkbenchAsyncDataTreeOptions, WorkbenchAsyncDataTree } from 'vs/platform/list/browser/listService';
 import { IColorTheme, IThemeService } from 'vs/platform/theme/common/themeService';
-import { IUndoRedoService } from 'vs/platform/undoRedo/common/undoRedo';
 import { FileReferences, OneReference, ReferencesModel } from '../referencesModel';
 
 class DecorationsManager implements IDisposable {
@@ -214,6 +211,7 @@ export class ReferenceWidget extends peekView.PeekViewWidget {
 	private _previewContainer!: HTMLElement;
 	private _messageContainer!: HTMLElement;
 	private _dim = new dom.Dimension(0, 0);
+	private _isClosing = false; // whether or not a dispose is already in progress
 
 	constructor(
 		editor: ICodeEditor,
@@ -224,10 +222,7 @@ export class ReferenceWidget extends peekView.PeekViewWidget {
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 		@peekView.IPeekViewService private readonly _peekViewService: peekView.IPeekViewService,
 		@ILabelService private readonly _uriLabel: ILabelService,
-		@IUndoRedoService private readonly _undoRedoService: IUndoRedoService,
 		@IKeybindingService private readonly _keybindingService: IKeybindingService,
-		@ILanguageService private readonly _languageService: ILanguageService,
-		@ILanguageConfigurationService private readonly _languageConfigurationService: ILanguageConfigurationService,
 	) {
 		super(editor, { showFrame: false, showArrow: true, isResizeable: true, isAccessible: true, supportOnTitleClick: true }, _instantiationService);
 
@@ -237,7 +232,12 @@ export class ReferenceWidget extends peekView.PeekViewWidget {
 		this.create();
 	}
 
+	get isClosing() {
+		return this._isClosing;
+	}
+
 	override dispose(): void {
+		this._isClosing = true;
 		this.setModel(undefined);
 		this._callOnDispose.dispose();
 		this._disposeOnNewModel.dispose();
@@ -315,7 +315,7 @@ export class ReferenceWidget extends peekView.PeekViewWidget {
 		};
 		this._preview = this._instantiationService.createInstance(EmbeddedCodeEditorWidget, this._previewContainer, options, {}, this.editor);
 		dom.hide(this._previewContainer);
-		this._previewNotAvailableMessage = new TextModel(nls.localize('missingPreviewMessage', "no preview available"), PLAINTEXT_LANGUAGE_ID, TextModel.DEFAULT_CREATION_OPTIONS, null, this._undoRedoService, this._languageService, this._languageConfigurationService);
+		this._previewNotAvailableMessage = this._instantiationService.createInstance(TextModel, nls.localize('missingPreviewMessage', "no preview available"), PLAINTEXT_LANGUAGE_ID, TextModel.DEFAULT_CREATION_OPTIONS, null);
 
 		// tree
 		this._treeContainer = dom.append(containerElement, dom.$('div.ref-tree.inline'));
diff --git a/src/vs/editor/contrib/hover/browser/hoverController.ts b/src/vs/editor/contrib/hover/browser/contentHoverController2.ts
similarity index 79%
rename from src/vs/editor/contrib/hover/browser/hoverController.ts
rename to src/vs/editor/contrib/hover/browser/contentHoverController2.ts
index b6ef34860ca..e4ca28268c7 100644
--- a/src/vs/editor/contrib/hover/browser/hoverController.ts
+++ b/src/vs/editor/contrib/hover/browser/contentHoverController2.ts
@@ -7,22 +7,21 @@ import { DECREASE_HOVER_VERBOSITY_ACTION_ID, INCREASE_HOVER_VERBOSITY_ACTION_ID,
 import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { KeyCode } from 'vs/base/common/keyCodes';
 import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { ICodeEditor, IEditorMouseEvent, IPartialEditorMouseEvent, MouseTargetType } from 'vs/editor/browser/editorBrowser';
+import { ICodeEditor, IEditorMouseEvent, IPartialEditorMouseEvent } from 'vs/editor/browser/editorBrowser';
 import { ConfigurationChangedEvent, EditorOption } from 'vs/editor/common/config/editorOptions';
 import { Range } from 'vs/editor/common/core/range';
 import { IEditorContribution, IScrollEvent } from 'vs/editor/common/editorCommon';
 import { HoverStartMode, HoverStartSource } from 'vs/editor/contrib/hover/browser/hoverOperation';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IHoverWidget } from 'vs/editor/contrib/hover/browser/hoverTypes';
-import { InlineSuggestionHintsContentWidget } from 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsHintsWidget';
+import { InlineSuggestionHintsContentWidget } from 'vs/editor/contrib/inlineCompletions/browser/hintsWidget/inlineCompletionsHintsWidget';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { ResultKind } from 'vs/platform/keybinding/common/keybindingResolver';
 import { HoverVerbosityAction } from 'vs/editor/common/languages';
 import { RunOnceScheduler } from 'vs/base/common/async';
-import { ContentHoverWidget } from 'vs/editor/contrib/hover/browser/contentHoverWidget';
-import { ContentHoverController } from 'vs/editor/contrib/hover/browser/contentHoverController';
+import { isMousePositionWithinElement } from 'vs/editor/contrib/hover/browser/hoverUtils';
+import { ContentHoverWidgetWrapper } from 'vs/editor/contrib/hover/browser/contentHoverWidgetWrapper';
 import 'vs/css!./hover';
-import { MarginHoverWidget } from 'vs/editor/contrib/hover/browser/marginHoverWidget';
 import { Emitter } from 'vs/base/common/event';
 
 // sticky hover widget which doesn't disappear on focus out and such
@@ -41,24 +40,18 @@ interface IHoverState {
 	activatedByDecoratorClick: boolean;
 }
 
-const enum HoverWidgetType {
-	Content,
-	Glyph,
-}
-
-export class HoverController extends Disposable implements IEditorContribution {
+export class ContentHoverController extends Disposable implements IEditorContribution {
 
 	private readonly _onHoverContentsChanged = this._register(new Emitter<void>());
 	public readonly onHoverContentsChanged = this._onHoverContentsChanged.event;
 
-	public static readonly ID = 'editor.contrib.hover';
+	public static readonly ID = 'editor.contrib.contentHover';
 
 	public shouldKeepOpenOnEditorMouseMoveOrLeave: boolean = false;
 
 	private readonly _listenersStore = new DisposableStore();
 
-	private _glyphWidget: MarginHoverWidget | undefined;
-	private _contentWidget: ContentHoverController | undefined;
+	private _contentWidget: ContentHoverWidgetWrapper | undefined;
 
 	private _mouseMoveEvent: IEditorMouseEvent | undefined;
 	private _reactToEditorMouseMoveRunner: RunOnceScheduler;
@@ -89,8 +82,8 @@ export class HoverController extends Disposable implements IEditorContribution {
 		}));
 	}
 
-	static get(editor: ICodeEditor): HoverController | null {
-		return editor.getContribution<HoverController>(HoverController.ID);
+	static get(editor: ICodeEditor): ContentHoverController | null {
+		return editor.getContribution<ContentHoverController>(ContentHoverController.ID);
 	}
 
 	private _hookListeners(): void {
@@ -99,7 +92,7 @@ export class HoverController extends Disposable implements IEditorContribution {
 		this._hoverSettings = {
 			enabled: hoverOpts.enabled,
 			sticky: hoverOpts.sticky,
-			hidingDelay: hoverOpts.delay
+			hidingDelay: hoverOpts.hidingDelay
 		};
 
 		if (hoverOpts.enabled) {
@@ -149,30 +142,15 @@ export class HoverController extends Disposable implements IEditorContribution {
 	}
 
 	private _shouldNotHideCurrentHoverWidget(mouseEvent: IPartialEditorMouseEvent): boolean {
-		if (
-			this._isMouseOnContentHoverWidget(mouseEvent)
-			|| this._isMouseOnMarginHoverWidget(mouseEvent)
-			|| this._isContentWidgetResizing()
-		) {
-			return true;
-		}
-		return false;
-	}
-
-	private _isMouseOnMarginHoverWidget(mouseEvent: IPartialEditorMouseEvent): boolean {
-		const target = mouseEvent.target;
-		if (!target) {
-			return false;
-		}
-		return target.type === MouseTargetType.OVERLAY_WIDGET && target.detail === MarginHoverWidget.ID;
+		return this._isMouseOnContentHoverWidget(mouseEvent) || this._isContentWidgetResizing();
 	}
 
 	private _isMouseOnContentHoverWidget(mouseEvent: IPartialEditorMouseEvent): boolean {
-		const target = mouseEvent.target;
-		if (!target) {
-			return false;
+		const contentWidgetNode = this._contentWidget?.getDomNode();
+		if (contentWidgetNode) {
+			return isMousePositionWithinElement(contentWidgetNode, mouseEvent.event.posx, mouseEvent.event.posy);
 		}
-		return target.type === MouseTargetType.CONTENT_WIDGET && target.detail === ContentHoverWidget.ID;
+		return false;
 	}
 
 	private _onEditorMouseUp(): void {
@@ -200,35 +178,25 @@ export class HoverController extends Disposable implements IEditorContribution {
 
 		const isHoverSticky = this._hoverSettings.sticky;
 
-		const isMouseOnStickyMarginHoverWidget = (mouseEvent: IEditorMouseEvent, isHoverSticky: boolean) => {
-			const isMouseOnMarginHoverWidget = this._isMouseOnMarginHoverWidget(mouseEvent);
-			return isHoverSticky && isMouseOnMarginHoverWidget;
-		};
-		const isMouseOnStickyContentHoverWidget = (mouseEvent: IEditorMouseEvent, isHoverSticky: boolean) => {
+		const isMouseOnStickyContentHoverWidget = (mouseEvent: IEditorMouseEvent, isHoverSticky: boolean): boolean => {
 			const isMouseOnContentHoverWidget = this._isMouseOnContentHoverWidget(mouseEvent);
 			return isHoverSticky && isMouseOnContentHoverWidget;
 		};
-		const isMouseOnColorPicker = (mouseEvent: IEditorMouseEvent) => {
+		const isMouseOnColorPicker = (mouseEvent: IEditorMouseEvent): boolean => {
 			const isMouseOnContentHoverWidget = this._isMouseOnContentHoverWidget(mouseEvent);
-			const isColorPickerVisible = this._contentWidget?.isColorPickerVisible;
+			const isColorPickerVisible = this._contentWidget?.isColorPickerVisible ?? false;
 			return isMouseOnContentHoverWidget && isColorPickerVisible;
 		};
 		// TODO@aiday-mar verify if the following is necessary code
-		const isTextSelectedWithinContentHoverWidget = (mouseEvent: IEditorMouseEvent, sticky: boolean) => {
-			return sticky
+		const isTextSelectedWithinContentHoverWidget = (mouseEvent: IEditorMouseEvent, sticky: boolean): boolean => {
+			return (sticky
 				&& this._contentWidget?.containsNode(mouseEvent.event.browserEvent.view?.document.activeElement)
-				&& !mouseEvent.event.browserEvent.view?.getSelection()?.isCollapsed;
+				&& !mouseEvent.event.browserEvent.view?.getSelection()?.isCollapsed) ?? false;
 		};
 
-		if (
-			isMouseOnStickyMarginHoverWidget(mouseEvent, isHoverSticky)
-			|| isMouseOnStickyContentHoverWidget(mouseEvent, isHoverSticky)
+		return isMouseOnStickyContentHoverWidget(mouseEvent, isHoverSticky)
 			|| isMouseOnColorPicker(mouseEvent)
-			|| isTextSelectedWithinContentHoverWidget(mouseEvent, isHoverSticky)
-		) {
-			return true;
-		}
-		return false;
+			|| isTextSelectedWithinContentHoverWidget(mouseEvent, isHoverSticky);
 	}
 
 	private _onEditorMouseMove(mouseEvent: IEditorMouseEvent): void {
@@ -294,44 +262,20 @@ export class HoverController extends Disposable implements IEditorContribution {
 			return;
 		}
 
-		const contentHoverShowsOrWillShow = this._tryShowHoverWidget(mouseEvent, HoverWidgetType.Content);
+		const contentHoverShowsOrWillShow = this._tryShowHoverWidget(mouseEvent);
 		if (contentHoverShowsOrWillShow) {
 			return;
 		}
 
-		const glyphWidgetShowsOrWillShow = this._tryShowHoverWidget(mouseEvent, HoverWidgetType.Glyph);
-		if (glyphWidgetShowsOrWillShow) {
-			return;
-		}
 		if (_sticky) {
 			return;
 		}
 		this._hideWidgets();
 	}
 
-	private _tryShowHoverWidget(mouseEvent: IEditorMouseEvent, hoverWidgetType: HoverWidgetType): boolean {
+	private _tryShowHoverWidget(mouseEvent: IEditorMouseEvent): boolean {
 		const contentWidget: IHoverWidget = this._getOrCreateContentWidget();
-		const glyphWidget: IHoverWidget = this._getOrCreateGlyphWidget();
-		let currentWidget: IHoverWidget;
-		let otherWidget: IHoverWidget;
-		switch (hoverWidgetType) {
-			case HoverWidgetType.Content:
-				currentWidget = contentWidget;
-				otherWidget = glyphWidget;
-				break;
-			case HoverWidgetType.Glyph:
-				currentWidget = glyphWidget;
-				otherWidget = contentWidget;
-				break;
-			default:
-				throw new Error(`HoverWidgetType ${hoverWidgetType} is unrecognized`);
-		}
-
-		const showsOrWillShow = currentWidget.showsOrWillShow(mouseEvent);
-		if (showsOrWillShow) {
-			otherWidget.hide();
-		}
-		return showsOrWillShow;
+		return contentWidget.showsOrWillShow(mouseEvent);
 	}
 
 	private _onKeyDown(e: IKeyboardEvent): void {
@@ -379,25 +323,17 @@ export class HoverController extends Disposable implements IEditorContribution {
 			return;
 		}
 		this._hoverState.activatedByDecoratorClick = false;
-		this._glyphWidget?.hide();
 		this._contentWidget?.hide();
 	}
 
-	private _getOrCreateContentWidget(): ContentHoverController {
+	private _getOrCreateContentWidget(): ContentHoverWidgetWrapper {
 		if (!this._contentWidget) {
-			this._contentWidget = this._instantiationService.createInstance(ContentHoverController, this._editor);
+			this._contentWidget = this._instantiationService.createInstance(ContentHoverWidgetWrapper, this._editor);
 			this._listenersStore.add(this._contentWidget.onContentsChanged(() => this._onHoverContentsChanged.fire()));
 		}
 		return this._contentWidget;
 	}
 
-	private _getOrCreateGlyphWidget(): MarginHoverWidget {
-		if (!this._glyphWidget) {
-			this._glyphWidget = this._instantiationService.createInstance(MarginHoverWidget, this._editor);
-		}
-		return this._glyphWidget;
-	}
-
 	public hideContentHover(): void {
 		this._hideWidgets();
 	}
@@ -493,7 +429,6 @@ export class HoverController extends Disposable implements IEditorContribution {
 		super.dispose();
 		this._unhookListeners();
 		this._listenersStore.dispose();
-		this._glyphWidget?.dispose();
 		this._contentWidget?.dispose();
 	}
 }
diff --git a/src/vs/editor/contrib/hover/browser/contentHoverController.ts b/src/vs/editor/contrib/hover/browser/contentHoverWidgetWrapper.ts
similarity index 94%
rename from src/vs/editor/contrib/hover/browser/contentHoverController.ts
rename to src/vs/editor/contrib/hover/browser/contentHoverWidgetWrapper.ts
index d79984f24c1..492bce8b7e3 100644
--- a/src/vs/editor/contrib/hover/browser/contentHoverController.ts
+++ b/src/vs/editor/contrib/hover/browser/contentHoverWidgetWrapper.ts
@@ -20,8 +20,9 @@ import { ContentHoverComputer } from 'vs/editor/contrib/hover/browser/contentHov
 import { HoverResult } from 'vs/editor/contrib/hover/browser/contentHoverTypes';
 import { Emitter } from 'vs/base/common/event';
 import { RenderedContentHover } from 'vs/editor/contrib/hover/browser/contentHoverRendered';
+import { isMousePositionWithinElement } from 'vs/editor/contrib/hover/browser/hoverUtils';
 
-export class ContentHoverController extends Disposable implements IHoverWidget {
+export class ContentHoverWidgetWrapper extends Disposable implements IHoverWidget {
 
 	private _currentResult: HoverResult | null = null;
 	private _renderedContentHover: RenderedContentHover | undefined;
@@ -69,11 +70,15 @@ export class ContentHoverController extends Disposable implements IHoverWidget {
 			const messages = (result.hasLoadingMessage ? this._addLoadingMessage(result.value) : result.value);
 			this._withResult(new HoverResult(this._computer.anchor, messages, result.isComplete));
 		}));
-		this._register(dom.addStandardDisposableListener(this._contentHoverWidget.getDomNode(), 'keydown', (e) => {
+		const contentHoverWidgetNode = this._contentHoverWidget.getDomNode();
+		this._register(dom.addStandardDisposableListener(contentHoverWidgetNode, 'keydown', (e) => {
 			if (e.equals(KeyCode.Escape)) {
 				this.hide();
 			}
 		}));
+		this._register(dom.addStandardDisposableListener(contentHoverWidgetNode, 'mouseleave', (e) => {
+			this._onMouseLeave(e);
+		}));
 		this._register(TokenizationRegistry.onDidChange(() => {
 			if (this._contentHoverWidget.position && this._currentResult) {
 				this._setCurrentResult(this._currentResult); // render again
@@ -281,6 +286,14 @@ export class ContentHoverController extends Disposable implements IHoverWidget {
 		return anchorCandidates;
 	}
 
+	private _onMouseLeave(e: MouseEvent): void {
+		const editorDomNode = this._editor.getDomNode();
+		const isMousePositionOutsideOfEditor = !editorDomNode || !isMousePositionWithinElement(editorDomNode, e.x, e.y);
+		if (isMousePositionOutsideOfEditor) {
+			this.hide();
+		}
+	}
+
 	public startShowingAtRange(range: Range, mode: HoverStartMode, source: HoverStartSource, focus: boolean): void {
 		this._startShowingOrUpdateHover(new HoverRangeAnchor(0, range, undefined, undefined), mode, source, focus, null);
 	}
@@ -363,6 +376,10 @@ export class ContentHoverController extends Disposable implements IHoverWidget {
 		this._setCurrentResult(null);
 	}
 
+	public getDomNode(): HTMLElement {
+		return this._contentHoverWidget.getDomNode();
+	}
+
 	public get isColorPickerVisible(): boolean {
 		return this._renderedContentHover?.isColorPickerVisible() ?? false;
 	}
diff --git a/src/vs/editor/contrib/hover/browser/hoverAccessibleViews.ts b/src/vs/editor/contrib/hover/browser/hoverAccessibleViews.ts
index d17df615a84..05eff6acdb5 100644
--- a/src/vs/editor/contrib/hover/browser/hoverAccessibleViews.ts
+++ b/src/vs/editor/contrib/hover/browser/hoverAccessibleViews.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 import { localize } from 'vs/nls';
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { HoverController } from 'vs/editor/contrib/hover/browser/hoverController';
+import { ContentHoverController } from 'vs/editor/contrib/hover/browser/contentHoverController2';
 import { AccessibleViewType, AccessibleViewProviderId, AccessibleContentProvider, IAccessibleViewContentProvider, IAccessibleViewOptions } from 'vs/platform/accessibility/browser/accessibleView';
 import { IAccessibleViewImplentation } from 'vs/platform/accessibility/browser/accessibleViewRegistry';
 import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
@@ -40,7 +40,7 @@ export class HoverAccessibleView implements IAccessibleViewImplentation {
 		if (!codeEditor) {
 			throw new Error('No active or focused code editor');
 		}
-		const hoverController = HoverController.get(codeEditor);
+		const hoverController = ContentHoverController.get(codeEditor);
 		if (!hoverController) {
 			return;
 		}
@@ -62,7 +62,7 @@ export class HoverAccessibilityHelp implements IAccessibleViewImplentation {
 		if (!codeEditor) {
 			throw new Error('No active or focused code editor');
 		}
-		const hoverController = HoverController.get(codeEditor);
+		const hoverController = ContentHoverController.get(codeEditor);
 		if (!hoverController) {
 			return;
 		}
@@ -83,7 +83,7 @@ abstract class BaseHoverAccessibleViewProvider extends Disposable implements IAc
 
 	protected _focusedHoverPartIndex: number = -1;
 
-	constructor(protected readonly _hoverController: HoverController) {
+	constructor(protected readonly _hoverController: ContentHoverController) {
 		super();
 	}
 
@@ -165,7 +165,7 @@ export class HoverAccessibilityHelpProvider extends BaseHoverAccessibleViewProvi
 
 	public readonly options: IAccessibleViewOptions = { type: AccessibleViewType.Help };
 
-	constructor(hoverController: HoverController) {
+	constructor(hoverController: ContentHoverController) {
 		super(hoverController);
 	}
 
@@ -181,7 +181,7 @@ export class HoverAccessibleViewProvider extends BaseHoverAccessibleViewProvider
 	constructor(
 		private readonly _keybindingService: IKeybindingService,
 		private readonly _editor: ICodeEditor,
-		hoverController: HoverController,
+		hoverController: ContentHoverController,
 	) {
 		super(hoverController);
 		this._initializeOptions(this._editor, hoverController);
@@ -221,7 +221,7 @@ export class HoverAccessibleViewProvider extends BaseHoverAccessibleViewProvider
 		});
 	}
 
-	private _initializeOptions(editor: ICodeEditor, hoverController: HoverController): void {
+	private _initializeOptions(editor: ICodeEditor, hoverController: ContentHoverController): void {
 		const helpProvider = this._register(new HoverAccessibilityHelpProvider(hoverController));
 		this.options.language = editor.getModel()?.getLanguageId();
 		this.options.customHelp = () => { return helpProvider.provideContentAtIndex(this._focusedHoverPartIndex, true); };
diff --git a/src/vs/editor/contrib/hover/browser/hoverActions.ts b/src/vs/editor/contrib/hover/browser/hoverActions.ts
index 37eea40441a..5e48e53d6c9 100644
--- a/src/vs/editor/contrib/hover/browser/hoverActions.ts
+++ b/src/vs/editor/contrib/hover/browser/hoverActions.ts
@@ -14,7 +14,7 @@ import { GotoDefinitionAtPositionEditorContribution } from 'vs/editor/contrib/go
 import { HoverStartMode, HoverStartSource } from 'vs/editor/contrib/hover/browser/hoverOperation';
 import { AccessibilitySupport } from 'vs/platform/accessibility/common/accessibility';
 import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { HoverController } from 'vs/editor/contrib/hover/browser/hoverController';
+import { ContentHoverController } from 'vs/editor/contrib/hover/browser/contentHoverController2';
 import { HoverVerbosityAction } from 'vs/editor/common/languages';
 import * as nls from 'vs/nls';
 import 'vs/css!./hover';
@@ -74,7 +74,7 @@ export class ShowOrFocusHoverAction extends EditorAction {
 			return;
 		}
 
-		const controller = HoverController.get(editor);
+		const controller = ContentHoverController.get(editor);
 		if (!controller) {
 			return;
 		}
@@ -128,7 +128,7 @@ export class ShowDefinitionPreviewHoverAction extends EditorAction {
 	}
 
 	public run(accessor: ServicesAccessor, editor: ICodeEditor): void {
-		const controller = HoverController.get(editor);
+		const controller = ContentHoverController.get(editor);
 		if (!controller) {
 			return;
 		}
@@ -176,7 +176,7 @@ export class ScrollUpHoverAction extends EditorAction {
 	}
 
 	public run(accessor: ServicesAccessor, editor: ICodeEditor): void {
-		const controller = HoverController.get(editor);
+		const controller = ContentHoverController.get(editor);
 		if (!controller) {
 			return;
 		}
@@ -209,7 +209,7 @@ export class ScrollDownHoverAction extends EditorAction {
 	}
 
 	public run(accessor: ServicesAccessor, editor: ICodeEditor): void {
-		const controller = HoverController.get(editor);
+		const controller = ContentHoverController.get(editor);
 		if (!controller) {
 			return;
 		}
@@ -242,7 +242,7 @@ export class ScrollLeftHoverAction extends EditorAction {
 	}
 
 	public run(accessor: ServicesAccessor, editor: ICodeEditor): void {
-		const controller = HoverController.get(editor);
+		const controller = ContentHoverController.get(editor);
 		if (!controller) {
 			return;
 		}
@@ -275,7 +275,7 @@ export class ScrollRightHoverAction extends EditorAction {
 	}
 
 	public run(accessor: ServicesAccessor, editor: ICodeEditor): void {
-		const controller = HoverController.get(editor);
+		const controller = ContentHoverController.get(editor);
 		if (!controller) {
 			return;
 		}
@@ -309,7 +309,7 @@ export class PageUpHoverAction extends EditorAction {
 	}
 
 	public run(accessor: ServicesAccessor, editor: ICodeEditor): void {
-		const controller = HoverController.get(editor);
+		const controller = ContentHoverController.get(editor);
 		if (!controller) {
 			return;
 		}
@@ -343,7 +343,7 @@ export class PageDownHoverAction extends EditorAction {
 	}
 
 	public run(accessor: ServicesAccessor, editor: ICodeEditor): void {
-		const controller = HoverController.get(editor);
+		const controller = ContentHoverController.get(editor);
 		if (!controller) {
 			return;
 		}
@@ -377,7 +377,7 @@ export class GoToTopHoverAction extends EditorAction {
 	}
 
 	public run(accessor: ServicesAccessor, editor: ICodeEditor): void {
-		const controller = HoverController.get(editor);
+		const controller = ContentHoverController.get(editor);
 		if (!controller) {
 			return;
 		}
@@ -412,7 +412,7 @@ export class GoToBottomHoverAction extends EditorAction {
 	}
 
 	public run(accessor: ServicesAccessor, editor: ICodeEditor): void {
-		const controller = HoverController.get(editor);
+		const controller = ContentHoverController.get(editor);
 		if (!controller) {
 			return;
 		}
@@ -432,7 +432,7 @@ export class IncreaseHoverVerbosityLevel extends EditorAction {
 	}
 
 	public run(accessor: ServicesAccessor, editor: ICodeEditor, args?: { index: number; focus: boolean }): void {
-		const hoverController = HoverController.get(editor);
+		const hoverController = ContentHoverController.get(editor);
 		if (!hoverController) {
 			return;
 		}
@@ -453,11 +453,11 @@ export class DecreaseHoverVerbosityLevel extends EditorAction {
 	}
 
 	public run(accessor: ServicesAccessor, editor: ICodeEditor, args?: { index: number; focus: boolean }): void {
-		const hoverController = HoverController.get(editor);
+		const hoverController = ContentHoverController.get(editor);
 		if (!hoverController) {
 			return;
 		}
 		const index = args?.index !== undefined ? args.index : hoverController.focusedHoverPartIndex();
-		HoverController.get(editor)?.updateHoverVerbosityLevel(HoverVerbosityAction.Decrease, index, args?.focus);
+		ContentHoverController.get(editor)?.updateHoverVerbosityLevel(HoverVerbosityAction.Decrease, index, args?.focus);
 	}
 }
diff --git a/src/vs/editor/contrib/hover/browser/hoverContribution.ts b/src/vs/editor/contrib/hover/browser/hoverContribution.ts
index bf24cdc1c69..2724c71ddec 100644
--- a/src/vs/editor/contrib/hover/browser/hoverContribution.ts
+++ b/src/vs/editor/contrib/hover/browser/hoverContribution.ts
@@ -10,12 +10,14 @@ import { registerThemingParticipant } from 'vs/platform/theme/common/themeServic
 import { HoverParticipantRegistry } from 'vs/editor/contrib/hover/browser/hoverTypes';
 import { MarkdownHoverParticipant } from 'vs/editor/contrib/hover/browser/markdownHoverParticipant';
 import { MarkerHoverParticipant } from 'vs/editor/contrib/hover/browser/markerHoverParticipant';
-import { HoverController } from 'vs/editor/contrib/hover/browser/hoverController';
+import { ContentHoverController } from 'vs/editor/contrib/hover/browser/contentHoverController2';
+import { MarginHoverController } from 'vs/editor/contrib/hover/browser/marginHoverController';
 import 'vs/css!./hover';
 import { AccessibleViewRegistry } from 'vs/platform/accessibility/browser/accessibleViewRegistry';
 import { ExtHoverAccessibleView, HoverAccessibilityHelp, HoverAccessibleView } from 'vs/editor/contrib/hover/browser/hoverAccessibleViews';
 
-registerEditorContribution(HoverController.ID, HoverController, EditorContributionInstantiation.BeforeFirstInteraction);
+registerEditorContribution(ContentHoverController.ID, ContentHoverController, EditorContributionInstantiation.BeforeFirstInteraction);
+registerEditorContribution(MarginHoverController.ID, MarginHoverController, EditorContributionInstantiation.BeforeFirstInteraction);
 registerEditorAction(ShowOrFocusHoverAction);
 registerEditorAction(ShowDefinitionPreviewHoverAction);
 registerEditorAction(ScrollUpHoverAction);
diff --git a/src/vs/editor/contrib/hover/browser/hoverUtils.ts b/src/vs/editor/contrib/hover/browser/hoverUtils.ts
new file mode 100644
index 00000000000..3f9ab067c1d
--- /dev/null
+++ b/src/vs/editor/contrib/hover/browser/hoverUtils.ts
@@ -0,0 +1,17 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as dom from 'vs/base/browser/dom';
+
+export function isMousePositionWithinElement(element: HTMLElement, posx: number, posy: number): boolean {
+	const elementRect = dom.getDomNodePagePosition(element);
+	if (posx < elementRect.left
+		|| posx > elementRect.left + elementRect.width
+		|| posy < elementRect.top
+		|| posy > elementRect.top + elementRect.height) {
+		return false;
+	}
+	return true;
+}
diff --git a/src/vs/editor/contrib/hover/browser/marginHoverController.ts b/src/vs/editor/contrib/hover/browser/marginHoverController.ts
new file mode 100644
index 00000000000..5b71c6682f1
--- /dev/null
+++ b/src/vs/editor/contrib/hover/browser/marginHoverController.ts
@@ -0,0 +1,232 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
+import { KeyCode } from 'vs/base/common/keyCodes';
+import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
+import { ICodeEditor, IEditorMouseEvent, IPartialEditorMouseEvent } from 'vs/editor/browser/editorBrowser';
+import { ConfigurationChangedEvent, EditorOption } from 'vs/editor/common/config/editorOptions';
+import { IEditorContribution, IScrollEvent } from 'vs/editor/common/editorCommon';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { IHoverWidget } from 'vs/editor/contrib/hover/browser/hoverTypes';
+import { RunOnceScheduler } from 'vs/base/common/async';
+import { isMousePositionWithinElement } from 'vs/editor/contrib/hover/browser/hoverUtils';
+import 'vs/css!./hover';
+import { MarginHoverWidget } from 'vs/editor/contrib/hover/browser/marginHoverWidget';
+
+// sticky hover widget which doesn't disappear on focus out and such
+const _sticky = false
+	// || Boolean("true") // done "weirdly" so that a lint warning prevents you from pushing this
+	;
+
+interface IHoverSettings {
+	readonly enabled: boolean;
+	readonly sticky: boolean;
+	readonly hidingDelay: number;
+}
+
+interface IHoverState {
+	mouseDown: boolean;
+}
+
+export class MarginHoverController extends Disposable implements IEditorContribution {
+
+	public static readonly ID = 'editor.contrib.marginHover';
+
+	public shouldKeepOpenOnEditorMouseMoveOrLeave: boolean = false;
+
+	private readonly _listenersStore = new DisposableStore();
+
+	private _glyphWidget: MarginHoverWidget | undefined;
+	private _mouseMoveEvent: IEditorMouseEvent | undefined;
+	private _reactToEditorMouseMoveRunner: RunOnceScheduler;
+
+	private _hoverSettings!: IHoverSettings;
+	private _hoverState: IHoverState = {
+		mouseDown: false
+	};
+
+	constructor(
+		private readonly _editor: ICodeEditor,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService
+	) {
+		super();
+		this._reactToEditorMouseMoveRunner = this._register(
+			new RunOnceScheduler(
+				() => this._reactToEditorMouseMove(this._mouseMoveEvent), 0
+			)
+		);
+		this._hookListeners();
+		this._register(this._editor.onDidChangeConfiguration((e: ConfigurationChangedEvent) => {
+			if (e.hasChanged(EditorOption.hover)) {
+				this._unhookListeners();
+				this._hookListeners();
+			}
+		}));
+	}
+
+	static get(editor: ICodeEditor): MarginHoverController | null {
+		return editor.getContribution<MarginHoverController>(MarginHoverController.ID);
+	}
+
+	private _hookListeners(): void {
+
+		const hoverOpts = this._editor.getOption(EditorOption.hover);
+		this._hoverSettings = {
+			enabled: hoverOpts.enabled,
+			sticky: hoverOpts.sticky,
+			hidingDelay: hoverOpts.hidingDelay
+		};
+
+		if (hoverOpts.enabled) {
+			this._listenersStore.add(this._editor.onMouseDown((e: IEditorMouseEvent) => this._onEditorMouseDown(e)));
+			this._listenersStore.add(this._editor.onMouseUp(() => this._onEditorMouseUp()));
+			this._listenersStore.add(this._editor.onMouseMove((e: IEditorMouseEvent) => this._onEditorMouseMove(e)));
+			this._listenersStore.add(this._editor.onKeyDown((e: IKeyboardEvent) => this._onKeyDown(e)));
+		} else {
+			this._listenersStore.add(this._editor.onMouseMove((e: IEditorMouseEvent) => this._onEditorMouseMove(e)));
+			this._listenersStore.add(this._editor.onKeyDown((e: IKeyboardEvent) => this._onKeyDown(e)));
+		}
+
+		this._listenersStore.add(this._editor.onMouseLeave((e) => this._onEditorMouseLeave(e)));
+		this._listenersStore.add(this._editor.onDidChangeModel(() => {
+			this._cancelScheduler();
+			this._hideWidgets();
+		}));
+		this._listenersStore.add(this._editor.onDidChangeModelContent(() => this._cancelScheduler()));
+		this._listenersStore.add(this._editor.onDidScrollChange((e: IScrollEvent) => this._onEditorScrollChanged(e)));
+	}
+
+	private _unhookListeners(): void {
+		this._listenersStore.clear();
+	}
+
+	private _cancelScheduler() {
+		this._mouseMoveEvent = undefined;
+		this._reactToEditorMouseMoveRunner.cancel();
+	}
+
+	private _onEditorScrollChanged(e: IScrollEvent): void {
+		if (e.scrollTopChanged || e.scrollLeftChanged) {
+			this._hideWidgets();
+		}
+	}
+
+	private _onEditorMouseDown(mouseEvent: IEditorMouseEvent): void {
+		this._hoverState.mouseDown = true;
+		const shouldNotHideCurrentHoverWidget = this._isMouseOnMarginHoverWidget(mouseEvent);
+		if (shouldNotHideCurrentHoverWidget) {
+			return;
+		}
+		this._hideWidgets();
+	}
+
+	private _isMouseOnMarginHoverWidget(mouseEvent: IPartialEditorMouseEvent): boolean {
+		const marginHoverWidgetNode = this._glyphWidget?.getDomNode();
+		if (marginHoverWidgetNode) {
+			return isMousePositionWithinElement(marginHoverWidgetNode, mouseEvent.event.posx, mouseEvent.event.posy);
+		}
+		return false;
+	}
+
+	private _onEditorMouseUp(): void {
+		this._hoverState.mouseDown = false;
+	}
+
+	private _onEditorMouseLeave(mouseEvent: IPartialEditorMouseEvent): void {
+		if (this.shouldKeepOpenOnEditorMouseMoveOrLeave) {
+			return;
+		}
+
+		this._cancelScheduler();
+		const shouldNotHideCurrentHoverWidget = this._isMouseOnMarginHoverWidget(mouseEvent);
+		if (shouldNotHideCurrentHoverWidget) {
+			return;
+		}
+		if (_sticky) {
+			return;
+		}
+		this._hideWidgets();
+	}
+
+	private _shouldNotRecomputeCurrentHoverWidget(mouseEvent: IEditorMouseEvent): boolean {
+		const isHoverSticky = this._hoverSettings.sticky;
+		const isMouseOnMarginHoverWidget = this._isMouseOnMarginHoverWidget(mouseEvent);
+		return isHoverSticky && isMouseOnMarginHoverWidget;
+	}
+
+	private _onEditorMouseMove(mouseEvent: IEditorMouseEvent): void {
+		if (this.shouldKeepOpenOnEditorMouseMoveOrLeave) {
+			return;
+		}
+
+		this._mouseMoveEvent = mouseEvent;
+		const shouldNotRecomputeCurrentHoverWidget = this._shouldNotRecomputeCurrentHoverWidget(mouseEvent);
+		if (shouldNotRecomputeCurrentHoverWidget) {
+			this._reactToEditorMouseMoveRunner.cancel();
+			return;
+		}
+		this._reactToEditorMouseMove(mouseEvent);
+	}
+
+	private _reactToEditorMouseMove(mouseEvent: IEditorMouseEvent | undefined): void {
+
+		if (!mouseEvent) {
+			return;
+		}
+		const glyphWidgetShowsOrWillShow = this._tryShowHoverWidget(mouseEvent);
+		if (glyphWidgetShowsOrWillShow) {
+			return;
+		}
+		if (_sticky) {
+			return;
+		}
+		this._hideWidgets();
+	}
+
+	private _tryShowHoverWidget(mouseEvent: IEditorMouseEvent): boolean {
+		const glyphWidget: IHoverWidget = this._getOrCreateGlyphWidget();
+		return glyphWidget.showsOrWillShow(mouseEvent);
+	}
+
+	private _onKeyDown(e: IKeyboardEvent): void {
+		if (!this._editor.hasModel()) {
+			return;
+		}
+		if (e.keyCode === KeyCode.Ctrl
+			|| e.keyCode === KeyCode.Alt
+			|| e.keyCode === KeyCode.Meta
+			|| e.keyCode === KeyCode.Shift) {
+			// Do not hide hover when a modifier key is pressed
+			return;
+		}
+		this._hideWidgets();
+	}
+
+	private _hideWidgets(): void {
+		if (_sticky) {
+			return;
+		}
+		this._glyphWidget?.hide();
+	}
+
+	private _getOrCreateGlyphWidget(): MarginHoverWidget {
+		if (!this._glyphWidget) {
+			this._glyphWidget = this._instantiationService.createInstance(MarginHoverWidget, this._editor);
+		}
+		return this._glyphWidget;
+	}
+
+	public hideContentHover(): void {
+		this._hideWidgets();
+	}
+
+	public override dispose(): void {
+		super.dispose();
+		this._unhookListeners();
+		this._listenersStore.dispose();
+		this._glyphWidget?.dispose();
+	}
+}
diff --git a/src/vs/editor/contrib/hover/browser/marginHoverWidget.ts b/src/vs/editor/contrib/hover/browser/marginHoverWidget.ts
index e909575d66e..e6fb9f4ce60 100644
--- a/src/vs/editor/contrib/hover/browser/marginHoverWidget.ts
+++ b/src/vs/editor/contrib/hover/browser/marginHoverWidget.ts
@@ -14,6 +14,7 @@ import { IOpenerService } from 'vs/platform/opener/common/opener';
 import { HoverWidget } from 'vs/base/browser/ui/hover/hoverWidget';
 import { IHoverWidget } from 'vs/editor/contrib/hover/browser/hoverTypes';
 import { IHoverMessage, LaneOrLineNumber, MarginHoverComputer } from 'vs/editor/contrib/hover/browser/marginHoverComputer';
+import { isMousePositionWithinElement } from 'vs/editor/contrib/hover/browser/hoverUtils';
 
 const $ = dom.$;
 
@@ -34,8 +35,8 @@ export class MarginHoverWidget extends Disposable implements IOverlayWidget, IHo
 
 	constructor(
 		editor: ICodeEditor,
-		languageService: ILanguageService,
-		openerService: IOpenerService,
+		@ILanguageService languageService: ILanguageService,
+		@IOpenerService openerService: IOpenerService,
 	) {
 		super();
 		this._editor = editor;
@@ -59,7 +60,9 @@ export class MarginHoverWidget extends Disposable implements IOverlayWidget, IHo
 				this._updateFont();
 			}
 		}));
-
+		this._register(dom.addStandardDisposableListener(this._hover.containerDomNode, 'mouseleave', (e) => {
+			this._onMouseLeave(e);
+		}));
 		this._editor.addOverlayWidget(this);
 	}
 
@@ -181,4 +184,12 @@ export class MarginHoverWidget extends Disposable implements IOverlayWidget, IHo
 		this._hover.containerDomNode.style.left = `${left}px`;
 		this._hover.containerDomNode.style.top = `${Math.max(Math.round(top), 0)}px`;
 	}
+
+	private _onMouseLeave(e: MouseEvent): void {
+		const editorDomNode = this._editor.getDomNode();
+		const isMousePositionOutsideOfEditor = !editorDomNode || !isMousePositionWithinElement(editorDomNode, e.x, e.y);
+		if (isMousePositionOutsideOfEditor) {
+			this.hide();
+		}
+	}
 }
diff --git a/src/vs/editor/contrib/hover/browser/markerHoverParticipant.ts b/src/vs/editor/contrib/hover/browser/markerHoverParticipant.ts
index 86dba6a80e3..033b85ce217 100644
--- a/src/vs/editor/contrib/hover/browser/markerHoverParticipant.ts
+++ b/src/vs/editor/contrib/hover/browser/markerHoverParticipant.ts
@@ -163,9 +163,10 @@ export class MarkerHoverParticipant implements IEditorHoverParticipant<MarkerHov
 					e.stopPropagation();
 					e.preventDefault();
 					if (this._openerService) {
+						const editorOptions: ITextEditorOptions = { selection: { startLineNumber, startColumn } };
 						this._openerService.open(resource, {
 							fromUserGesture: true,
-							editorOptions: <ITextEditorOptions>{ selection: { startLineNumber, startColumn } }
+							editorOptions
 						}).catch(onUnexpectedError);
 					}
 				}));
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/commandIds.ts b/src/vs/editor/contrib/inlineCompletions/browser/controller/commandIds.ts
similarity index 100%
rename from src/vs/editor/contrib/inlineCompletions/browser/commandIds.ts
rename to src/vs/editor/contrib/inlineCompletions/browser/controller/commandIds.ts
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/commands.ts b/src/vs/editor/contrib/inlineCompletions/browser/controller/commands.ts
similarity index 97%
rename from src/vs/editor/contrib/inlineCompletions/browser/commands.ts
rename to src/vs/editor/contrib/inlineCompletions/browser/controller/commands.ts
index ddfde90862d..0c52cfed35d 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/commands.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/controller/commands.ts
@@ -9,9 +9,9 @@ import { asyncTransaction } from 'vs/base/common/observableInternal/base';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { EditorAction, ServicesAccessor } from 'vs/editor/browser/editorExtensions';
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { showNextInlineSuggestionActionId, showPreviousInlineSuggestionActionId, inlineSuggestCommitId } from 'vs/editor/contrib/inlineCompletions/browser/commandIds';
-import { InlineCompletionContextKeys } from 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionContextKeys';
-import { InlineCompletionsController } from 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsController';
+import { showNextInlineSuggestionActionId, showPreviousInlineSuggestionActionId, inlineSuggestCommitId } from 'vs/editor/contrib/inlineCompletions/browser/controller/commandIds';
+import { InlineCompletionContextKeys } from 'vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionContextKeys';
+import { InlineCompletionsController } from 'vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController';
 import { Context as SuggestContext } from 'vs/editor/contrib/suggest/browser/suggest';
 import * as nls from 'vs/nls';
 import { MenuId, Action2 } from 'vs/platform/actions/common/actions';
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionContextKeys.ts b/src/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionContextKeys.ts
similarity index 98%
rename from src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionContextKeys.ts
rename to src/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionContextKeys.ts
index fcbcd62120f..eb881f94fc6 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionContextKeys.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionContextKeys.ts
@@ -6,7 +6,7 @@
 import { IObservable, autorun } from 'vs/base/common/observable';
 import { firstNonWhitespaceIndex } from 'vs/base/common/strings';
 import { CursorColumns } from 'vs/editor/common/core/cursorColumns';
-import { InlineCompletionsModel } from 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsModel';
+import { InlineCompletionsModel } from 'vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel';
 import { RawContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { localize } from 'vs/nls';
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsController.ts b/src/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController.ts
similarity index 96%
rename from src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsController.ts
rename to src/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController.ts
index a7c25e42677..89e2ce519a0 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsController.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController.ts
@@ -22,12 +22,12 @@ import { Range } from 'vs/editor/common/core/range';
 import { CursorChangeReason } from 'vs/editor/common/cursorEvents';
 import { ILanguageFeatureDebounceService } from 'vs/editor/common/services/languageFeatureDebounce';
 import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { inlineSuggestCommitId } from 'vs/editor/contrib/inlineCompletions/browser/commandIds';
-import { GhostTextWidget } from 'vs/editor/contrib/inlineCompletions/browser/ghostTextWidget';
-import { InlineCompletionContextKeys } from 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionContextKeys';
-import { InlineCompletionsHintsWidget, InlineSuggestionHintsContentWidget } from 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsHintsWidget';
-import { InlineCompletionsModel } from 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsModel';
-import { SuggestWidgetAdaptor } from 'vs/editor/contrib/inlineCompletions/browser/suggestWidgetInlineCompletionProvider';
+import { inlineSuggestCommitId } from 'vs/editor/contrib/inlineCompletions/browser/controller/commandIds';
+import { GhostTextView } from 'vs/editor/contrib/inlineCompletions/browser/view/ghostTextView';
+import { InlineCompletionContextKeys } from 'vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionContextKeys';
+import { InlineCompletionsHintsWidget, InlineSuggestionHintsContentWidget } from 'vs/editor/contrib/inlineCompletions/browser/hintsWidget/inlineCompletionsHintsWidget';
+import { InlineCompletionsModel } from 'vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel';
+import { SuggestWidgetAdaptor } from 'vs/editor/contrib/inlineCompletions/browser/model/suggestWidgetAdaptor';
 import { localize } from 'vs/nls';
 import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
 import { AccessibilitySignal, IAccessibilitySignalService } from 'vs/platform/accessibilitySignal/browser/accessibilitySignalService';
@@ -105,7 +105,7 @@ export class InlineCompletionsController extends Disposable {
 	private readonly _stablizedGhostTexts = convertItemsToStableObservables(this._ghostTexts, this._store);
 
 	private readonly _ghostTextWidgets = mapObservableArrayCached(this, this._stablizedGhostTexts, (ghostText, store) =>
-		store.add(this._instantiationService.createInstance(GhostTextWidget, this.editor, {
+		store.add(this._instantiationService.createInstance(GhostTextView, this.editor, {
 			ghostText: ghostText,
 			minReservedLineCount: constObservable(0),
 			targetTextModel: this.model.map(v => v?.textModel),
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/hoverParticipant.ts b/src/vs/editor/contrib/inlineCompletions/browser/hintsWidget/hoverParticipant.ts
similarity index 98%
rename from src/vs/editor/contrib/inlineCompletions/browser/hoverParticipant.ts
rename to src/vs/editor/contrib/inlineCompletions/browser/hintsWidget/hoverParticipant.ts
index 7bcf0ea59f1..c2007e20187 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/hoverParticipant.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/hintsWidget/hoverParticipant.ts
@@ -13,8 +13,8 @@ import { Range } from 'vs/editor/common/core/range';
 import { ILanguageService } from 'vs/editor/common/languages/language';
 import { IModelDecoration } from 'vs/editor/common/model';
 import { HoverAnchor, HoverAnchorType, HoverForeignElementAnchor, IEditorHoverParticipant, IEditorHoverRenderContext, IHoverPart, IRenderedHoverPart, IRenderedHoverParts, RenderedHoverParts } from 'vs/editor/contrib/hover/browser/hoverTypes';
-import { InlineCompletionsController } from 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsController';
-import { InlineSuggestionHintsContentWidget } from 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsHintsWidget';
+import { InlineCompletionsController } from 'vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController';
+import { InlineSuggestionHintsContentWidget } from 'vs/editor/contrib/inlineCompletions/browser/hintsWidget/inlineCompletionsHintsWidget';
 import { MarkdownRenderer } from 'vs/editor/browser/widget/markdownRenderer/browser/markdownRenderer';
 import * as nls from 'vs/nls';
 import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsHintsWidget.css b/src/vs/editor/contrib/inlineCompletions/browser/hintsWidget/inlineCompletionsHintsWidget.css
similarity index 100%
rename from src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsHintsWidget.css
rename to src/vs/editor/contrib/inlineCompletions/browser/hintsWidget/inlineCompletionsHintsWidget.css
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsHintsWidget.ts b/src/vs/editor/contrib/inlineCompletions/browser/hintsWidget/inlineCompletionsHintsWidget.ts
similarity index 99%
rename from src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsHintsWidget.ts
rename to src/vs/editor/contrib/inlineCompletions/browser/hintsWidget/inlineCompletionsHintsWidget.ts
index 2226a1ea265..51b8f92eba1 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsHintsWidget.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/hintsWidget/inlineCompletionsHintsWidget.ts
@@ -21,8 +21,8 @@ import { EditorOption } from 'vs/editor/common/config/editorOptions';
 import { Position } from 'vs/editor/common/core/position';
 import { Command, InlineCompletionTriggerKind } from 'vs/editor/common/languages';
 import { PositionAffinity } from 'vs/editor/common/model';
-import { showNextInlineSuggestionActionId, showPreviousInlineSuggestionActionId } from 'vs/editor/contrib/inlineCompletions/browser/commandIds';
-import { InlineCompletionsModel } from 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsModel';
+import { showNextInlineSuggestionActionId, showPreviousInlineSuggestionActionId } from 'vs/editor/contrib/inlineCompletions/browser/controller/commandIds';
+import { InlineCompletionsModel } from 'vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel';
 import { localize } from 'vs/nls';
 import { MenuEntryActionViewItem, createAndFillInActionBarActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
 import { IMenuWorkbenchToolBarOptions, WorkbenchToolBar } from 'vs/platform/actions/browser/toolbar';
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletions.contribution.ts b/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletions.contribution.ts
index 2819af72061..25670498a01 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletions.contribution.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletions.contribution.ts
@@ -5,10 +5,10 @@
 
 import { EditorContributionInstantiation, registerEditorAction, registerEditorContribution } from 'vs/editor/browser/editorExtensions';
 import { HoverParticipantRegistry } from 'vs/editor/contrib/hover/browser/hoverTypes';
-import { TriggerInlineSuggestionAction, ShowNextInlineSuggestionAction, ShowPreviousInlineSuggestionAction, AcceptNextWordOfInlineCompletion, AcceptInlineCompletion, HideInlineCompletion, ToggleAlwaysShowInlineSuggestionToolbar, AcceptNextLineOfInlineCompletion } from 'vs/editor/contrib/inlineCompletions/browser/commands';
-import { InlineCompletionsHoverParticipant } from 'vs/editor/contrib/inlineCompletions/browser/hoverParticipant';
+import { TriggerInlineSuggestionAction, ShowNextInlineSuggestionAction, ShowPreviousInlineSuggestionAction, AcceptNextWordOfInlineCompletion, AcceptInlineCompletion, HideInlineCompletion, ToggleAlwaysShowInlineSuggestionToolbar, AcceptNextLineOfInlineCompletion } from 'vs/editor/contrib/inlineCompletions/browser/controller/commands';
+import { InlineCompletionsHoverParticipant } from 'vs/editor/contrib/inlineCompletions/browser/hintsWidget/hoverParticipant';
 import { InlineCompletionsAccessibleView } from 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsAccessibleView';
-import { InlineCompletionsController } from 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsController';
+import { InlineCompletionsController } from 'vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController';
 import { AccessibleViewRegistry } from 'vs/platform/accessibility/browser/accessibleViewRegistry';
 import { registerAction2 } from 'vs/platform/actions/common/actions';
 
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsAccessibleView.ts b/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsAccessibleView.ts
index a028db8d081..48226d2a4d7 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsAccessibleView.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsAccessibleView.ts
@@ -6,14 +6,14 @@
 import { Emitter, Event } from 'vs/base/common/event';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { InlineCompletionContextKeys } from 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionContextKeys';
-import { InlineCompletionsController } from 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsController';
+import { InlineCompletionContextKeys } from 'vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionContextKeys';
+import { InlineCompletionsController } from 'vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController';
 import { AccessibleViewType, AccessibleViewProviderId, IAccessibleViewContentProvider } from 'vs/platform/accessibility/browser/accessibleView';
 import { IAccessibleViewImplentation } from 'vs/platform/accessibility/browser/accessibleViewRegistry';
 import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
 import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { Disposable } from 'vs/base/common/lifecycle';
-import { InlineCompletionsModel } from 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsModel';
+import { InlineCompletionsModel } from 'vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel';
 
 export class InlineCompletionsAccessibleView implements IAccessibleViewImplentation {
 	readonly type = AccessibleViewType.View;
@@ -77,4 +77,3 @@ class InlineCompletionsAccessibleViewContentProvider extends Disposable implemen
 		this._editor.focus();
 	}
 }
-
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/ghostText.ts b/src/vs/editor/contrib/inlineCompletions/browser/model/ghostText.ts
similarity index 100%
rename from src/vs/editor/contrib/inlineCompletions/browser/ghostText.ts
rename to src/vs/editor/contrib/inlineCompletions/browser/model/ghostText.ts
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsModel.ts b/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.ts
similarity index 99%
rename from src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsModel.ts
rename to src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.ts
index 92013fd5982..de33bdea119 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsModel.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.ts
@@ -24,10 +24,10 @@ import { ILanguageConfigurationService } from 'vs/editor/common/languages/langua
 import { EndOfLinePreference, ITextModel } from 'vs/editor/common/model';
 import { IFeatureDebounceInformation } from 'vs/editor/common/services/languageFeatureDebounce';
 import { IModelContentChangedEvent } from 'vs/editor/common/textModelEvents';
-import { GhostText, GhostTextOrReplacement, ghostTextOrReplacementEquals, ghostTextsOrReplacementsEqual } from 'vs/editor/contrib/inlineCompletions/browser/ghostText';
-import { InlineCompletionWithUpdatedRange, InlineCompletionsSource } from 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsSource';
-import { computeGhostText, singleTextEditAugments, singleTextRemoveCommonPrefix } from 'vs/editor/contrib/inlineCompletions/browser/singleTextEdit';
-import { SuggestItemInfo } from 'vs/editor/contrib/inlineCompletions/browser/suggestWidgetInlineCompletionProvider';
+import { GhostText, GhostTextOrReplacement, ghostTextOrReplacementEquals, ghostTextsOrReplacementsEqual } from 'vs/editor/contrib/inlineCompletions/browser/model/ghostText';
+import { InlineCompletionWithUpdatedRange, InlineCompletionsSource } from 'vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsSource';
+import { computeGhostText, singleTextEditAugments, singleTextRemoveCommonPrefix } from 'vs/editor/contrib/inlineCompletions/browser/model/singleTextEdit';
+import { SuggestItemInfo } from 'vs/editor/contrib/inlineCompletions/browser/model/suggestWidgetAdaptor';
 import { addPositions, subtractPositions } from 'vs/editor/contrib/inlineCompletions/browser/utils';
 import { SnippetController2 } from 'vs/editor/contrib/snippet/browser/snippetController2';
 import { ICommandService } from 'vs/platform/commands/common/commands';
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsSource.ts b/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsSource.ts
similarity index 99%
rename from src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsSource.ts
rename to src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsSource.ts
index 1eb06aa11c1..7886532f660 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsSource.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsSource.ts
@@ -17,8 +17,8 @@ import { ILanguageConfigurationService } from 'vs/editor/common/languages/langua
 import { EndOfLinePreference, ITextModel } from 'vs/editor/common/model';
 import { IFeatureDebounceInformation } from 'vs/editor/common/services/languageFeatureDebounce';
 import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { InlineCompletionItem, InlineCompletionProviderResult, provideInlineCompletions } from 'vs/editor/contrib/inlineCompletions/browser/provideInlineCompletions';
-import { singleTextRemoveCommonPrefix } from 'vs/editor/contrib/inlineCompletions/browser/singleTextEdit';
+import { InlineCompletionItem, InlineCompletionProviderResult, provideInlineCompletions } from 'vs/editor/contrib/inlineCompletions/browser/model/provideInlineCompletions';
+import { singleTextRemoveCommonPrefix } from 'vs/editor/contrib/inlineCompletions/browser/model/singleTextEdit';
 
 export class InlineCompletionsSource extends Disposable {
 	private readonly _updateOperation = this._register(new MutableDisposable<UpdateOperation>());
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/provideInlineCompletions.ts b/src/vs/editor/contrib/inlineCompletions/browser/model/provideInlineCompletions.ts
similarity index 99%
rename from src/vs/editor/contrib/inlineCompletions/browser/provideInlineCompletions.ts
rename to src/vs/editor/contrib/inlineCompletions/browser/model/provideInlineCompletions.ts
index 25ccf4cd125..b1139b42979 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/provideInlineCompletions.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/model/provideInlineCompletions.ts
@@ -18,7 +18,7 @@ import { ILanguageConfigurationService } from 'vs/editor/common/languages/langua
 import { ITextModel } from 'vs/editor/common/model';
 import { fixBracketsInLine } from 'vs/editor/common/model/bracketPairsTextModelPart/fixBrackets';
 import { SingleTextEdit } from 'vs/editor/common/core/textEdit';
-import { getReadonlyEmptyArray } from './utils';
+import { getReadonlyEmptyArray } from '../utils';
 import { SnippetParser, Text } from 'vs/editor/contrib/snippet/browser/snippetParser';
 
 export async function provideInlineCompletions(
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/singleTextEdit.ts b/src/vs/editor/contrib/inlineCompletions/browser/model/singleTextEdit.ts
similarity index 99%
rename from src/vs/editor/contrib/inlineCompletions/browser/singleTextEdit.ts
rename to src/vs/editor/contrib/inlineCompletions/browser/model/singleTextEdit.ts
index 750eb459829..1cd4b90ae80 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/singleTextEdit.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/model/singleTextEdit.ts
@@ -10,7 +10,7 @@ import { Range } from 'vs/editor/common/core/range';
 import { TextLength } from 'vs/editor/common/core/textLength';
 import { SingleTextEdit } from 'vs/editor/common/core/textEdit';
 import { EndOfLinePreference, ITextModel } from 'vs/editor/common/model';
-import { GhostText, GhostTextPart } from 'vs/editor/contrib/inlineCompletions/browser/ghostText';
+import { GhostText, GhostTextPart } from 'vs/editor/contrib/inlineCompletions/browser/model/ghostText';
 
 export function singleTextRemoveCommonPrefix(edit: SingleTextEdit, model: ITextModel, validModelRange?: Range): SingleTextEdit {
 	const modelRange = validModelRange ? edit.range.intersectRanges(validModelRange) : edit.range;
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/suggestWidgetInlineCompletionProvider.ts b/src/vs/editor/contrib/inlineCompletions/browser/model/suggestWidgetAdaptor.ts
similarity index 99%
rename from src/vs/editor/contrib/inlineCompletions/browser/suggestWidgetInlineCompletionProvider.ts
rename to src/vs/editor/contrib/inlineCompletions/browser/model/suggestWidgetAdaptor.ts
index daf73173ef4..a4167b43a03 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/suggestWidgetInlineCompletionProvider.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/model/suggestWidgetAdaptor.ts
@@ -13,7 +13,7 @@ import { Range } from 'vs/editor/common/core/range';
 import { SingleTextEdit } from 'vs/editor/common/core/textEdit';
 import { CompletionItemInsertTextRule, CompletionItemKind, SelectedSuggestionInfo } from 'vs/editor/common/languages';
 import { ITextModel } from 'vs/editor/common/model';
-import { singleTextEditAugments, singleTextRemoveCommonPrefix } from 'vs/editor/contrib/inlineCompletions/browser/singleTextEdit';
+import { singleTextEditAugments, singleTextRemoveCommonPrefix } from 'vs/editor/contrib/inlineCompletions/browser/model/singleTextEdit';
 import { SnippetParser } from 'vs/editor/contrib/snippet/browser/snippetParser';
 import { SnippetSession } from 'vs/editor/contrib/snippet/browser/snippetSession';
 import { CompletionItem } from 'vs/editor/contrib/suggest/browser/suggest';
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/ghostText.css b/src/vs/editor/contrib/inlineCompletions/browser/view/ghostTextView.css
similarity index 100%
rename from src/vs/editor/contrib/inlineCompletions/browser/ghostText.css
rename to src/vs/editor/contrib/inlineCompletions/browser/view/ghostTextView.css
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/ghostTextWidget.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/ghostTextView.ts
similarity index 98%
rename from src/vs/editor/contrib/inlineCompletions/browser/ghostTextWidget.ts
rename to src/vs/editor/contrib/inlineCompletions/browser/view/ghostTextView.ts
index 450f9549fb7..843a13eca1f 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/ghostTextWidget.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/ghostTextView.ts
@@ -8,7 +8,7 @@ import { Event } from 'vs/base/common/event';
 import { Disposable, toDisposable } from 'vs/base/common/lifecycle';
 import { IObservable, autorun, derived, observableFromEvent, observableSignalFromEvent, observableValue } from 'vs/base/common/observable';
 import * as strings from 'vs/base/common/strings';
-import 'vs/css!./ghostText';
+import 'vs/css!./ghostTextView';
 import { applyFontInfo } from 'vs/editor/browser/config/domFontInfo';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { EditorFontLigatures, EditorOption, IComputedEditorOptions } from 'vs/editor/common/config/editorOptions';
@@ -22,7 +22,7 @@ import { LineTokens } from 'vs/editor/common/tokens/lineTokens';
 import { LineDecoration } from 'vs/editor/common/viewLayout/lineDecorations';
 import { RenderLineInput, renderViewLine } from 'vs/editor/common/viewLayout/viewLineRenderer';
 import { InlineDecorationType } from 'vs/editor/common/viewModel';
-import { GhostText, GhostTextReplacement } from 'vs/editor/contrib/inlineCompletions/browser/ghostText';
+import { GhostText, GhostTextReplacement } from 'vs/editor/contrib/inlineCompletions/browser/model/ghostText';
 import { ColumnRange, applyObservableDecorations } from 'vs/editor/contrib/inlineCompletions/browser/utils';
 
 export const GHOST_TEXT_DESCRIPTION = 'ghost-text';
@@ -32,7 +32,7 @@ export interface IGhostTextWidgetModel {
 	readonly minReservedLineCount: IObservable<number>;
 }
 
-export class GhostTextWidget extends Disposable {
+export class GhostTextView extends Disposable {
 	private readonly isDisposed = observableValue(this, false);
 	private readonly currentTextModel = observableFromEvent(this, this.editor.onDidChangeModel, () => /** @description editor.model */ this.editor.getModel());
 
diff --git a/src/vs/editor/contrib/inlineCompletions/test/browser/inlineCompletionsModel.test.ts b/src/vs/editor/contrib/inlineCompletions/test/browser/inlineCompletionsModel.test.ts
index 63ab19affbe..852b9d3312a 100644
--- a/src/vs/editor/contrib/inlineCompletions/test/browser/inlineCompletionsModel.test.ts
+++ b/src/vs/editor/contrib/inlineCompletions/test/browser/inlineCompletionsModel.test.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
 import { Position } from 'vs/editor/common/core/position';
-import { getSecondaryEdits } from 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsModel';
+import { getSecondaryEdits } from 'vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel';
 import { SingleTextEdit } from 'vs/editor/common/core/textEdit';
 import { createTextModel } from 'vs/editor/test/common/testTextModel';
 import { Range } from 'vs/editor/common/core/range';
diff --git a/src/vs/editor/contrib/inlineCompletions/test/browser/inlineCompletionsProvider.test.ts b/src/vs/editor/contrib/inlineCompletions/test/browser/inlineCompletionsProvider.test.ts
index e318702da15..089471c4acd 100644
--- a/src/vs/editor/contrib/inlineCompletions/test/browser/inlineCompletionsProvider.test.ts
+++ b/src/vs/editor/contrib/inlineCompletions/test/browser/inlineCompletionsProvider.test.ts
@@ -13,8 +13,8 @@ import { InlineCompletionsProvider } from 'vs/editor/common/languages';
 import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
 import { LanguageFeaturesService } from 'vs/editor/common/services/languageFeaturesService';
 import { ViewModel } from 'vs/editor/common/viewModel/viewModelImpl';
-import { InlineCompletionsController } from 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsController';
-import { InlineCompletionsModel } from 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsModel';
+import { InlineCompletionsController } from 'vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController';
+import { InlineCompletionsModel } from 'vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel';
 import { SingleTextEdit } from 'vs/editor/common/core/textEdit';
 import { GhostTextContext, MockInlineCompletionsProvider } from 'vs/editor/contrib/inlineCompletions/test/browser/utils';
 import { ITestCodeEditor, TestCodeEditorInstantiationOptions, withAsyncTestCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
@@ -22,7 +22,7 @@ import { createTextModel } from 'vs/editor/test/common/testTextModel';
 import { IAccessibilitySignalService } from 'vs/platform/accessibilitySignal/browser/accessibilitySignalService';
 import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
 import { Selection } from 'vs/editor/common/core/selection';
-import { computeGhostText } from 'vs/editor/contrib/inlineCompletions/browser/singleTextEdit';
+import { computeGhostText } from 'vs/editor/contrib/inlineCompletions/browser/model/singleTextEdit';
 
 suite('Inline Completions', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
diff --git a/src/vs/editor/contrib/inlineCompletions/test/browser/suggestWidgetModel.test.ts b/src/vs/editor/contrib/inlineCompletions/test/browser/suggestWidgetModel.test.ts
index a860898c64e..11f88ae2fe3 100644
--- a/src/vs/editor/contrib/inlineCompletions/test/browser/suggestWidgetModel.test.ts
+++ b/src/vs/editor/contrib/inlineCompletions/test/browser/suggestWidgetModel.test.ts
@@ -30,8 +30,8 @@ import { ILabelService } from 'vs/platform/label/common/label';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { LanguageFeaturesService } from 'vs/editor/common/services/languageFeaturesService';
 import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { InlineCompletionsModel } from 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsModel';
-import { InlineCompletionsController } from 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsController';
+import { InlineCompletionsModel } from 'vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel';
+import { InlineCompletionsController } from 'vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController';
 import { autorun } from 'vs/base/common/observable';
 import { setUnexpectedErrorHandler } from 'vs/base/common/errors';
 import { IAccessibilitySignalService } from 'vs/platform/accessibilitySignal/browser/accessibilitySignalService';
diff --git a/src/vs/editor/contrib/inlineCompletions/test/browser/utils.ts b/src/vs/editor/contrib/inlineCompletions/test/browser/utils.ts
index 11c24b0b0e6..1c1d7724bb9 100644
--- a/src/vs/editor/contrib/inlineCompletions/test/browser/utils.ts
+++ b/src/vs/editor/contrib/inlineCompletions/test/browser/utils.ts
@@ -11,7 +11,7 @@ import { Position } from 'vs/editor/common/core/position';
 import { ITextModel } from 'vs/editor/common/model';
 import { InlineCompletion, InlineCompletionContext, InlineCompletionsProvider } from 'vs/editor/common/languages';
 import { ITestCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
-import { InlineCompletionsModel } from 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsModel';
+import { InlineCompletionsModel } from 'vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel';
 import { autorun } from 'vs/base/common/observable';
 
 export class MockInlineCompletionsProvider implements InlineCompletionsProvider {
diff --git a/src/vs/editor/contrib/inlineEdit/browser/ghostTextWidget.ts b/src/vs/editor/contrib/inlineEdit/browser/ghostTextWidget.ts
index 0ded87779e8..ca3dc5bc355 100644
--- a/src/vs/editor/contrib/inlineEdit/browser/ghostTextWidget.ts
+++ b/src/vs/editor/contrib/inlineEdit/browser/ghostTextWidget.ts
@@ -13,8 +13,8 @@ import { ILanguageService } from 'vs/editor/common/languages/language';
 import { IModelDeltaDecoration, ITextModel, InjectedTextCursorStops } from 'vs/editor/common/model';
 import { LineDecoration } from 'vs/editor/common/viewLayout/lineDecorations';
 import { InlineDecorationType } from 'vs/editor/common/viewModel';
-import { AdditionalLinesWidget, LineData } from 'vs/editor/contrib/inlineCompletions/browser/ghostTextWidget';
-import { GhostText } from 'vs/editor/contrib/inlineCompletions/browser/ghostText';
+import { AdditionalLinesWidget, LineData } from 'vs/editor/contrib/inlineCompletions/browser/view/ghostTextView';
+import { GhostText } from 'vs/editor/contrib/inlineCompletions/browser/model/ghostText';
 import { ColumnRange, applyObservableDecorations } from 'vs/editor/contrib/inlineCompletions/browser/utils';
 import { diffDeleteDecoration, diffLineDeleteDecorationBackgroundWithIndicator } from 'vs/editor/browser/widget/diffEditor/registrations.contribution';
 
diff --git a/src/vs/editor/contrib/inlineEdit/browser/inlineEditController.ts b/src/vs/editor/contrib/inlineEdit/browser/inlineEditController.ts
index 5ef1693b265..3f47517ce1e 100644
--- a/src/vs/editor/contrib/inlineEdit/browser/inlineEditController.ts
+++ b/src/vs/editor/contrib/inlineEdit/browser/inlineEditController.ts
@@ -15,7 +15,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
 import { IInlineEdit, InlineEditTriggerKind } from 'vs/editor/common/languages';
 import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
 import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { GhostText, GhostTextPart } from 'vs/editor/contrib/inlineCompletions/browser/ghostText';
+import { GhostText, GhostTextPart } from 'vs/editor/contrib/inlineCompletions/browser/model/ghostText';
 import { ICommandService } from 'vs/platform/commands/common/commands';
 import { InlineEditHintsWidget } from 'vs/editor/contrib/inlineEdit/browser/inlineEditHintsWidget';
 import { EditorOption } from 'vs/editor/common/config/editorOptions';
diff --git a/src/vs/editor/contrib/inlineEdits/browser/inlineEditsModel.ts b/src/vs/editor/contrib/inlineEdits/browser/inlineEditsModel.ts
index 812818c85b1..9c03abe689c 100644
--- a/src/vs/editor/contrib/inlineEdits/browser/inlineEditsModel.ts
+++ b/src/vs/editor/contrib/inlineEdits/browser/inlineEditsModel.ts
@@ -22,7 +22,7 @@ import { IFeatureDebounceInformation } from 'vs/editor/common/services/languageF
 import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
 import { IModelService } from 'vs/editor/common/services/model';
 import { IModelContentChangedEvent } from 'vs/editor/common/textModelEvents';
-import { InlineCompletionItem, InlineCompletionProviderResult, provideInlineCompletions } from 'vs/editor/contrib/inlineCompletions/browser/provideInlineCompletions';
+import { InlineCompletionItem, InlineCompletionProviderResult, provideInlineCompletions } from 'vs/editor/contrib/inlineCompletions/browser/model/provideInlineCompletions';
 import { InlineEdit } from 'vs/editor/contrib/inlineEdits/browser/inlineEditsWidget';
 
 export class InlineEditsModel extends Disposable {
diff --git a/src/vs/editor/contrib/quickAccess/browser/editorNavigationQuickAccess.ts b/src/vs/editor/contrib/quickAccess/browser/editorNavigationQuickAccess.ts
index 05c099c63c4..c809937fa72 100644
--- a/src/vs/editor/contrib/quickAccess/browser/editorNavigationQuickAccess.ts
+++ b/src/vs/editor/contrib/quickAccess/browser/editorNavigationQuickAccess.ts
@@ -52,7 +52,7 @@ export abstract class AbstractEditorNavigationQuickAccessProvider implements IQu
 
 	//#region Provider methods
 
-	provide(picker: IQuickPick<IQuickPickItem>, token: CancellationToken, runOptions?: IQuickAccessProviderRunOptions): IDisposable {
+	provide(picker: IQuickPick<IQuickPickItem, { useSeparators: true }>, token: CancellationToken, runOptions?: IQuickAccessProviderRunOptions): IDisposable {
 		const disposables = new DisposableStore();
 
 		// Apply options if any
@@ -78,7 +78,7 @@ export abstract class AbstractEditorNavigationQuickAccessProvider implements IQu
 		return disposables;
 	}
 
-	private doProvide(picker: IQuickPick<IQuickPickItem>, token: CancellationToken, runOptions?: IQuickAccessProviderRunOptions): IDisposable {
+	private doProvide(picker: IQuickPick<IQuickPickItem, { useSeparators: true }>, token: CancellationToken, runOptions?: IQuickAccessProviderRunOptions): IDisposable {
 		const disposables = new DisposableStore();
 
 		// With text control
@@ -134,12 +134,12 @@ export abstract class AbstractEditorNavigationQuickAccessProvider implements IQu
 	/**
 	 * Subclasses to implement to provide picks for the picker when an editor is active.
 	 */
-	protected abstract provideWithTextEditor(context: IQuickAccessTextEditorContext, picker: IQuickPick<IQuickPickItem>, token: CancellationToken, runOptions?: IQuickAccessProviderRunOptions): IDisposable;
+	protected abstract provideWithTextEditor(context: IQuickAccessTextEditorContext, picker: IQuickPick<IQuickPickItem, { useSeparators: true }>, token: CancellationToken, runOptions?: IQuickAccessProviderRunOptions): IDisposable;
 
 	/**
 	 * Subclasses to implement to provide picks for the picker when no editor is active.
 	 */
-	protected abstract provideWithoutTextEditor(picker: IQuickPick<IQuickPickItem>, token: CancellationToken): IDisposable;
+	protected abstract provideWithoutTextEditor(picker: IQuickPick<IQuickPickItem, { useSeparators: true }>, token: CancellationToken): IDisposable;
 
 	protected gotoLocation({ editor }: IQuickAccessTextEditorContext, options: { range: IRange; keyMods: IKeyMods; forceSideBySide?: boolean; preserveFocus?: boolean }): void {
 		editor.setSelection(options.range, TextEditorSelectionSource.JUMP);
diff --git a/src/vs/editor/contrib/quickAccess/browser/gotoLineQuickAccess.ts b/src/vs/editor/contrib/quickAccess/browser/gotoLineQuickAccess.ts
index 6db58ae6cc0..b1ccfa95d51 100644
--- a/src/vs/editor/contrib/quickAccess/browser/gotoLineQuickAccess.ts
+++ b/src/vs/editor/contrib/quickAccess/browser/gotoLineQuickAccess.ts
@@ -24,7 +24,7 @@ export abstract class AbstractGotoLineQuickAccessProvider extends AbstractEditor
 		super({ canAcceptInBackground: true });
 	}
 
-	protected provideWithoutTextEditor(picker: IQuickPick<IGotoLineQuickPickItem>): IDisposable {
+	protected provideWithoutTextEditor(picker: IQuickPick<IGotoLineQuickPickItem, { useSeparators: true }>): IDisposable {
 		const label = localize('cannotRunGotoLine', "Open a text editor first to go to a line.");
 
 		picker.items = [{ label }];
@@ -33,7 +33,7 @@ export abstract class AbstractGotoLineQuickAccessProvider extends AbstractEditor
 		return Disposable.None;
 	}
 
-	protected provideWithTextEditor(context: IQuickAccessTextEditorContext, picker: IQuickPick<IGotoLineQuickPickItem>, token: CancellationToken): IDisposable {
+	protected provideWithTextEditor(context: IQuickAccessTextEditorContext, picker: IQuickPick<IGotoLineQuickPickItem, { useSeparators: true }>, token: CancellationToken): IDisposable {
 		const editor = context.editor;
 		const disposables = new DisposableStore();
 
diff --git a/src/vs/editor/contrib/quickAccess/browser/gotoSymbolQuickAccess.ts b/src/vs/editor/contrib/quickAccess/browser/gotoSymbolQuickAccess.ts
index d34aeb3faf5..9ff33f41802 100644
--- a/src/vs/editor/contrib/quickAccess/browser/gotoSymbolQuickAccess.ts
+++ b/src/vs/editor/contrib/quickAccess/browser/gotoSymbolQuickAccess.ts
@@ -63,13 +63,13 @@ export abstract class AbstractGotoSymbolQuickAccessProvider extends AbstractEdit
 		this.options.canAcceptInBackground = true;
 	}
 
-	protected provideWithoutTextEditor(picker: IQuickPick<IGotoSymbolQuickPickItem>): IDisposable {
+	protected provideWithoutTextEditor(picker: IQuickPick<IGotoSymbolQuickPickItem, { useSeparators: true }>): IDisposable {
 		this.provideLabelPick(picker, localize('cannotRunGotoSymbolWithoutEditor', "To go to a symbol, first open a text editor with symbol information."));
 
 		return Disposable.None;
 	}
 
-	protected provideWithTextEditor(context: IQuickAccessTextEditorContext, picker: IQuickPick<IGotoSymbolQuickPickItem>, token: CancellationToken, runOptions?: IQuickAccessProviderRunOptions): IDisposable {
+	protected provideWithTextEditor(context: IQuickAccessTextEditorContext, picker: IQuickPick<IGotoSymbolQuickPickItem, { useSeparators: true }>, token: CancellationToken, runOptions?: IQuickAccessProviderRunOptions): IDisposable {
 		const editor = context.editor;
 		const model = this.getModel(editor);
 		if (!model) {
@@ -87,7 +87,7 @@ export abstract class AbstractGotoSymbolQuickAccessProvider extends AbstractEdit
 		return this.doProvideWithoutEditorSymbols(context, model, picker, token);
 	}
 
-	private doProvideWithoutEditorSymbols(context: IQuickAccessTextEditorContext, model: ITextModel, picker: IQuickPick<IGotoSymbolQuickPickItem>, token: CancellationToken): IDisposable {
+	private doProvideWithoutEditorSymbols(context: IQuickAccessTextEditorContext, model: ITextModel, picker: IQuickPick<IGotoSymbolQuickPickItem, { useSeparators: true }>, token: CancellationToken): IDisposable {
 		const disposables = new DisposableStore();
 
 		// Generic pick for not having any symbol information
@@ -110,7 +110,7 @@ export abstract class AbstractGotoSymbolQuickAccessProvider extends AbstractEdit
 		return disposables;
 	}
 
-	private provideLabelPick(picker: IQuickPick<IGotoSymbolQuickPickItem>, label: string): void {
+	private provideLabelPick(picker: IQuickPick<IGotoSymbolQuickPickItem, { useSeparators: true }>, label: string): void {
 		picker.items = [{ label, index: 0, kind: SymbolKind.String }];
 		picker.ariaLabel = label;
 	}
@@ -137,7 +137,7 @@ export abstract class AbstractGotoSymbolQuickAccessProvider extends AbstractEdit
 		return symbolProviderRegistryPromise.p;
 	}
 
-	private doProvideWithEditorSymbols(context: IQuickAccessTextEditorContext, model: ITextModel, picker: IQuickPick<IGotoSymbolQuickPickItem>, token: CancellationToken, runOptions?: IQuickAccessProviderRunOptions): IDisposable {
+	private doProvideWithEditorSymbols(context: IQuickAccessTextEditorContext, model: ITextModel, picker: IQuickPick<IGotoSymbolQuickPickItem, { useSeparators: true }>, token: CancellationToken, runOptions?: IQuickAccessProviderRunOptions): IDisposable {
 		const editor = context.editor;
 		const disposables = new DisposableStore();
 
diff --git a/src/vs/editor/contrib/rename/browser/renameWidget.ts b/src/vs/editor/contrib/rename/browser/renameWidget.ts
index b284cd519fd..1f6fcc14106 100644
--- a/src/vs/editor/contrib/rename/browser/renameWidget.ts
+++ b/src/vs/editor/contrib/rename/browser/renameWidget.ts
@@ -318,7 +318,8 @@ export class RenameWidget implements IRenameWidget, IContentWidget, IDisposable
 	}
 
 	afterRender(position: ContentWidgetPositionPreference | null): void {
-		this._trace('invoking afterRender, position: ', position ? 'not null' : 'null');
+		// FIXME@ulugbekna: commenting trace log out until we start unmounting the widget from editor properly - https://github.com/microsoft/vscode/issues/226975
+		// this._trace('invoking afterRender, position: ', position ? 'not null' : 'null');
 		if (position === null) {
 			// cancel rename when input widget isn't rendered anymore
 			this.cancelInput(true, 'afterRender (because position is null)');
@@ -363,7 +364,7 @@ export class RenameWidget implements IRenameWidget, IContentWidget, IDisposable
 	}
 
 	cancelInput(focusEditor: boolean, caller: string): void {
-		this._trace(`invoking cancelInput, caller: ${caller}, _currentCancelInput: ${this._currentAcceptInput ? 'not undefined' : 'undefined'}`);
+		// this._trace(`invoking cancelInput, caller: ${caller}, _currentCancelInput: ${this._currentAcceptInput ? 'not undefined' : 'undefined'}`);
 		this._currentCancelInput?.(focusEditor);
 	}
 
diff --git a/src/vs/editor/contrib/semanticTokens/test/browser/documentSemanticTokens.test.ts b/src/vs/editor/contrib/semanticTokens/test/browser/documentSemanticTokens.test.ts
index 86d3bf5d62d..9eb8d2f0006 100644
--- a/src/vs/editor/contrib/semanticTokens/test/browser/documentSemanticTokens.test.ts
+++ b/src/vs/editor/contrib/semanticTokens/test/browser/documentSemanticTokens.test.ts
@@ -14,6 +14,7 @@ import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/uti
 import { Range } from 'vs/editor/common/core/range';
 import { DocumentSemanticTokensProvider, SemanticTokens, SemanticTokensEdits, SemanticTokensLegend } from 'vs/editor/common/languages';
 import { ILanguageService } from 'vs/editor/common/languages/language';
+import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
 import { ITextModel } from 'vs/editor/common/model';
 import { LanguageFeatureDebounceService } from 'vs/editor/common/services/languageFeatureDebounce';
 import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
@@ -29,6 +30,7 @@ import { TestTextResourcePropertiesService } from 'vs/editor/test/common/service
 import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
 import { TestDialogService } from 'vs/platform/dialogs/test/common/testDialogService';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
 import { NullLogService } from 'vs/platform/log/common/log';
 import { TestNotificationService } from 'vs/platform/notification/test/common/testNotificationService';
 import { ColorScheme } from 'vs/platform/theme/common/theme';
@@ -50,12 +52,14 @@ suite('ModelSemanticColoring', () => {
 		languageFeaturesService = new LanguageFeaturesService();
 		languageService = disposables.add(new LanguageService(false));
 		const semanticTokensStylingService = disposables.add(new SemanticTokensStylingService(themeService, logService, languageService));
+		const instantiationService = new TestInstantiationService();
+		instantiationService.set(ILanguageService, languageService);
+		instantiationService.set(ILanguageConfigurationService, new TestLanguageConfigurationService());
 		modelService = disposables.add(new ModelService(
 			configService,
 			new TestTextResourcePropertiesService(configService),
 			new UndoRedoService(new TestDialogService(), new TestNotificationService()),
-			languageService,
-			new TestLanguageConfigurationService(),
+			instantiationService
 		));
 		const envService = new class extends mock<IEnvironmentService>() {
 			override isBuilt: boolean = true;
diff --git a/src/vs/editor/contrib/suggest/browser/suggest.ts b/src/vs/editor/contrib/suggest/browser/suggest.ts
index 0ca6b0e09d0..535c67c9cb9 100644
--- a/src/vs/editor/contrib/suggest/browser/suggest.ts
+++ b/src/vs/editor/contrib/suggest/browser/suggest.ts
@@ -178,13 +178,13 @@ export class CompletionOptions {
 	) { }
 }
 
-let _snippetSuggestSupport: languages.CompletionItemProvider;
+let _snippetSuggestSupport: languages.CompletionItemProvider | undefined;
 
-export function getSnippetSuggestSupport(): languages.CompletionItemProvider {
+export function getSnippetSuggestSupport(): languages.CompletionItemProvider | undefined {
 	return _snippetSuggestSupport;
 }
 
-export function setSnippetSuggestSupport(support: languages.CompletionItemProvider): languages.CompletionItemProvider {
+export function setSnippetSuggestSupport(support: languages.CompletionItemProvider | undefined): languages.CompletionItemProvider | undefined {
 	const old = _snippetSuggestSupport;
 	_snippetSuggestSupport = support;
 	return old;
diff --git a/src/vs/editor/contrib/suggest/browser/suggestController.ts b/src/vs/editor/contrib/suggest/browser/suggestController.ts
index 0b156d3eeca..a2e3871d0b0 100644
--- a/src/vs/editor/contrib/suggest/browser/suggestController.ts
+++ b/src/vs/editor/contrib/suggest/browser/suggestController.ts
@@ -516,26 +516,42 @@ export class SuggestController implements IEditorContribution {
 
 		// clear only now - after all tasks are done
 		Promise.all(tasks).finally(() => {
-			this._reportSuggestionAcceptedTelemetry(item, model, isResolved, _commandExectionDuration, _additionalEditsAppliedAsync);
+			this._reportSuggestionAcceptedTelemetry(item, model, isResolved, _commandExectionDuration, _additionalEditsAppliedAsync, event.index, event.model.items);
 
 			this.model.clear();
 			cts.dispose();
 		});
 	}
 
-	private _reportSuggestionAcceptedTelemetry(item: CompletionItem, model: ITextModel, itemResolved: boolean, commandExectionDuration: number, additionalEditsAppliedAsync: number) {
-
+	private _reportSuggestionAcceptedTelemetry(item: CompletionItem, model: ITextModel, itemResolved: boolean, commandExectionDuration: number, additionalEditsAppliedAsync: number, index: number, completionItems: CompletionItem[]): void {
 		if (Math.floor(Math.random() * 100) === 0) {
 			// throttle telemetry event because accepting completions happens a lot
 			return;
 		}
 
+		const labelMap = new Map<string, number[]>();
+
+		for (let i = 0; i < Math.min(30, completionItems.length); i++) {
+			const label = completionItems[i].textLabel;
+
+			if (labelMap.has(label)) {
+				labelMap.get(label)!.push(i);
+			} else {
+				labelMap.set(label, [i]);
+			}
+		}
+
+		const firstIndexArray = labelMap.get(item.textLabel);
+		const hasDuplicates = firstIndexArray && firstIndexArray.length > 1;
+		const firstIndex = hasDuplicates ? firstIndexArray[0] : -1;
+
 		type AcceptedSuggestion = {
 			extensionId: string; providerId: string;
 			fileExtension: string; languageId: string; basenameHash: string; kind: number;
 			resolveInfo: number; resolveDuration: number;
 			commandDuration: number;
 			additionalEditsAsync: number;
+			index: number; firstIndex: number;
 		};
 		type AcceptedSuggestionClassification = {
 			owner: 'jrieken';
@@ -550,6 +566,8 @@ export class SuggestController implements IEditorContribution {
 			resolveDuration: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'How long resolving took to finish' };
 			commandDuration: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'How long a completion item command took' };
 			additionalEditsAsync: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Info about asynchronously applying additional edits' };
+			index: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The index of the completion item in the sorted list.' };
+			firstIndex: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'When there are multiple completions, the index of the first instance.' };
 		};
 
 		this._telemetryService.publicLog2<AcceptedSuggestion, AcceptedSuggestionClassification>('suggest.acceptedSuggestion', {
@@ -562,7 +580,9 @@ export class SuggestController implements IEditorContribution {
 			resolveInfo: !item.provider.resolveCompletionItem ? -1 : itemResolved ? 1 : 0,
 			resolveDuration: item.resolveDuration,
 			commandDuration: commandExectionDuration,
-			additionalEditsAsync: additionalEditsAppliedAsync
+			additionalEditsAsync: additionalEditsAppliedAsync,
+			index,
+			firstIndex,
 		});
 	}
 
@@ -1039,13 +1059,13 @@ registerEditorCommand(new SuggestCommand({
 		group: 'right',
 		order: 1,
 		when: ContextKeyExpr.and(SuggestContext.DetailsVisible, SuggestContext.CanResolve),
-		title: nls.localize('detail.more', "show less")
+		title: nls.localize('detail.more', "Show Less")
 	}, {
 		menuId: suggestWidgetStatusbarMenu,
 		group: 'right',
 		order: 1,
 		when: ContextKeyExpr.and(SuggestContext.DetailsVisible.toNegated(), SuggestContext.CanResolve),
-		title: nls.localize('detail.less', "show more")
+		title: nls.localize('detail.less', "Show More")
 	}]
 }));
 
diff --git a/src/vs/editor/contrib/suggest/browser/suggestModel.ts b/src/vs/editor/contrib/suggest/browser/suggestModel.ts
index 3dac5f9ad41..f5196521af9 100644
--- a/src/vs/editor/contrib/suggest/browser/suggestModel.ts
+++ b/src/vs/editor/contrib/suggest/browser/suggestModel.ts
@@ -29,7 +29,7 @@ import { IWordAtPosition } from 'vs/editor/common/core/wordHelper';
 import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
 import { FuzzyScoreOptions } from 'vs/base/common/filters';
 import { assertType } from 'vs/base/common/types';
-import { InlineCompletionContextKeys } from 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionContextKeys';
+import { InlineCompletionContextKeys } from 'vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionContextKeys';
 import { SnippetController2 } from 'vs/editor/contrib/snippet/browser/snippetController2';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 
@@ -230,7 +230,10 @@ export class SuggestModel implements IDisposable {
 				let set = supportsByTriggerCharacter.get(ch);
 				if (!set) {
 					set = new Set();
-					set.add(getSnippetSuggestSupport());
+					const suggestSupport = getSnippetSuggestSupport();
+					if (suggestSupport) {
+						set.add(suggestSupport);
+					}
 					supportsByTriggerCharacter.set(ch, set);
 				}
 				set.add(support);
diff --git a/src/vs/editor/contrib/suggest/test/browser/wordDistance.test.ts b/src/vs/editor/contrib/suggest/test/browser/wordDistance.test.ts
index 15f238b1627..4fe23f5a66d 100644
--- a/src/vs/editor/contrib/suggest/test/browser/wordDistance.test.ts
+++ b/src/vs/editor/contrib/suggest/test/browser/wordDistance.test.ts
@@ -13,9 +13,8 @@ import { IRange } from 'vs/editor/common/core/range';
 import { DEFAULT_WORD_REGEXP } from 'vs/editor/common/core/wordHelper';
 import * as languages from 'vs/editor/common/languages';
 import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { EditorSimpleWorker } from 'vs/editor/common/services/editorSimpleWorker';
+import { BaseEditorSimpleWorker } from 'vs/editor/common/services/editorSimpleWorker';
 import { EditorWorkerService } from 'vs/editor/browser/services/editorWorkerService';
-import { IEditorWorkerHost } from 'vs/editor/common/services/editorWorkerHost';
 import { IModelService } from 'vs/editor/common/services/model';
 import { ITextResourceConfigurationService } from 'vs/editor/common/services/textResourceConfiguration';
 import { CompletionItem } from 'vs/editor/contrib/suggest/browser/suggest';
@@ -63,20 +62,20 @@ suite('suggest, word distance', function () {
 
 		const service = new class extends EditorWorkerService {
 
-			private _worker = new EditorSimpleWorker(new class extends mock<IEditorWorkerHost>() { }, null);
+			private _worker = new BaseEditorSimpleWorker();
 
 			constructor() {
-				super(modelService, new class extends mock<ITextResourceConfigurationService>() { }, new NullLogService(), new TestLanguageConfigurationService(), new LanguageFeaturesService());
-				this._worker.acceptNewModel({
+				super(null!, modelService, new class extends mock<ITextResourceConfigurationService>() { }, new NullLogService(), new TestLanguageConfigurationService(), new LanguageFeaturesService());
+				this._worker.$acceptNewModel({
 					url: model.uri.toString(),
 					lines: model.getLinesContent(),
 					EOL: model.getEOL(),
 					versionId: model.getVersionId()
 				});
-				model.onDidChangeContent(e => this._worker.acceptModelChanged(model.uri.toString(), e));
+				model.onDidChangeContent(e => this._worker.$acceptModelChanged(model.uri.toString(), e));
 			}
 			override computeWordRanges(resource: URI, range: IRange): Promise<{ [word: string]: IRange[] } | null> {
-				return this._worker.computeWordRanges(resource.toString(), range, DEFAULT_WORD_REGEXP.source, DEFAULT_WORD_REGEXP.flags);
+				return this._worker.$computeWordRanges(resource.toString(), range, DEFAULT_WORD_REGEXP.source, DEFAULT_WORD_REGEXP.flags);
 			}
 		};
 
diff --git a/src/vs/editor/contrib/wordHighlighter/browser/textualHighlightProvider.ts b/src/vs/editor/contrib/wordHighlighter/browser/textualHighlightProvider.ts
index 1d7a65695d3..adc31ecd8c0 100644
--- a/src/vs/editor/contrib/wordHighlighter/browser/textualHighlightProvider.ts
+++ b/src/vs/editor/contrib/wordHighlighter/browser/textualHighlightProvider.ts
@@ -5,7 +5,7 @@
 
 import { USUAL_WORD_SEPARATORS } from 'vs/editor/common/core/wordHelper';
 import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { DocumentHighlight, DocumentHighlightKind, MultiDocumentHighlightProvider, ProviderResult } from 'vs/editor/common/languages';
+import { DocumentHighlight, DocumentHighlightKind, DocumentHighlightProvider, MultiDocumentHighlightProvider, ProviderResult } from 'vs/editor/common/languages';
 import { ITextModel } from 'vs/editor/common/model';
 import { Position } from 'vs/editor/common/core/position';
 import { CancellationToken } from 'vs/base/common/cancellation';
@@ -14,10 +14,33 @@ import { ResourceMap } from 'vs/base/common/map';
 import { LanguageFilter } from 'vs/editor/common/languageSelector';
 
 
-class TextualDocumentHighlightProvider implements MultiDocumentHighlightProvider {
+class TextualDocumentHighlightProvider implements DocumentHighlightProvider, MultiDocumentHighlightProvider {
 
 	selector: LanguageFilter = { language: '*' };
 
+	provideDocumentHighlights(model: ITextModel, position: Position, token: CancellationToken): ProviderResult<DocumentHighlight[]> {
+		const result: DocumentHighlight[] = [];
+
+		const word = model.getWordAtPosition({
+			lineNumber: position.lineNumber,
+			column: position.column
+		});
+
+		if (!word) {
+			return Promise.resolve(result);
+		}
+
+		if (model.isDisposed()) {
+			return;
+		}
+
+		const matches = model.findMatches(word.word, true, false, true, USUAL_WORD_SEPARATORS, false);
+		return matches.map(m => ({
+			range: m.range,
+			kind: DocumentHighlightKind.Text
+		}));
+	}
+
 	provideMultiDocumentHighlights(primaryModel: ITextModel, position: Position, otherModels: ITextModel[], token: CancellationToken): ProviderResult<ResourceMap<DocumentHighlight[]>> {
 
 		const result = new ResourceMap<DocumentHighlight[]>();
@@ -57,7 +80,7 @@ export class TextualMultiDocumentHighlightFeature extends Disposable {
 		@ILanguageFeaturesService languageFeaturesService: ILanguageFeaturesService,
 	) {
 		super();
-
+		this._register(languageFeaturesService.documentHighlightProvider.register('*', new TextualDocumentHighlightProvider()));
 		this._register(languageFeaturesService.multiDocumentHighlightProvider.register('*', new TextualDocumentHighlightProvider()));
 	}
 }
diff --git a/src/vs/editor/contrib/wordHighlighter/browser/wordHighlighter.ts b/src/vs/editor/contrib/wordHighlighter/browser/wordHighlighter.ts
index cae43742902..2dfcc17ac53 100644
--- a/src/vs/editor/contrib/wordHighlighter/browser/wordHighlighter.ts
+++ b/src/vs/editor/contrib/wordHighlighter/browser/wordHighlighter.ts
@@ -4,9 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as nls from 'vs/nls';
-import * as arrays from 'vs/base/common/arrays';
 import { alert } from 'vs/base/browser/ui/aria/aria';
-import { CancelablePromise, createCancelablePromise, first, timeout } from 'vs/base/common/async';
+import { CancelablePromise, createCancelablePromise, Delayer, first } from 'vs/base/common/async';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { onUnexpectedError, onUnexpectedExternalError } from 'vs/base/common/errors';
 import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
@@ -23,18 +22,19 @@ import { CursorChangeReason, ICursorPositionChangedEvent } from 'vs/editor/commo
 import { IDiffEditor, IEditorContribution, IEditorDecorationsCollection } from 'vs/editor/common/editorCommon';
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
 import { LanguageFeatureRegistry } from 'vs/editor/common/languageFeatureRegistry';
-import { DocumentHighlight, DocumentHighlightKind, DocumentHighlightProvider, MultiDocumentHighlightProvider } from 'vs/editor/common/languages';
+import { DocumentHighlight, DocumentHighlightProvider, MultiDocumentHighlightProvider } from 'vs/editor/common/languages';
 import { IModelDeltaDecoration, ITextModel, shouldSynchronizeModel } from 'vs/editor/common/model';
 import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
 import { getHighlightDecorationOptions } from 'vs/editor/contrib/wordHighlighter/browser/highlightDecorations';
 import { IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { Schemas } from 'vs/base/common/network';
+import { matchesScheme, Schemas } from 'vs/base/common/network';
 import { ResourceMap } from 'vs/base/common/map';
 import { score } from 'vs/editor/common/languageSelector';
-// import { TextualMultiDocumentHighlightFeature } from 'vs/editor/contrib/wordHighlighter/browser/textualHighlightProvider';
-// import { registerEditorFeature } from 'vs/editor/common/editorFeatures';
+import { isEqual } from 'vs/base/common/resources';
+import { TextualMultiDocumentHighlightFeature } from 'vs/editor/contrib/wordHighlighter/browser/textualHighlightProvider';
+import { registerEditorFeature } from 'vs/editor/common/editorFeatures';
 
 const ctxHasWordHighlights = new RawContextKey<boolean>('hasWordHighlights', false);
 
@@ -43,11 +43,12 @@ export function getOccurrencesAtPosition(registry: LanguageFeatureRegistry<Docum
 
 	// in order of score ask the occurrences provider
 	// until someone response with a good result
-	// (good = none empty array)
+	// (good = non undefined and non null value)
+	// (result of size == 0 is valid, no highlights is a valid/expected result -- not a signal to fall back to other providers)
 	return first<DocumentHighlight[] | null | undefined>(orderedByScore.map(provider => () => {
 		return Promise.resolve(provider.provideDocumentHighlights(model, position, token))
 			.then(undefined, onUnexpectedExternalError);
-	}), arrays.isNonEmptyArray).then(result => {
+	}), (result): result is DocumentHighlight[] => result !== undefined && result !== null).then(result => {
 		if (result) {
 			const map = new ResourceMap<DocumentHighlight[]>();
 			map.set(model.uri, result);
@@ -62,17 +63,17 @@ export function getOccurrencesAcrossMultipleModels(registry: LanguageFeatureRegi
 
 	// in order of score ask the occurrences provider
 	// until someone response with a good result
-	// (good = none empty array)
+	// (good = non undefined and non null ResourceMap)
+	// (result of size == 0 is valid, no highlights is a valid/expected result -- not a signal to fall back to other providers)
 	return first<ResourceMap<DocumentHighlight[]> | null | undefined>(orderedByScore.map(provider => () => {
 		const filteredModels = otherModels.filter(otherModel => {
 			return shouldSynchronizeModel(otherModel);
 		}).filter(otherModel => {
 			return score(provider.selector, otherModel.uri, otherModel.getLanguageId(), true, undefined, undefined) > 0;
 		});
-
 		return Promise.resolve(provider.provideMultiDocumentHighlights(model, position, filteredModels, token))
 			.then(undefined, onUnexpectedExternalError);
-	}), (t: ResourceMap<DocumentHighlight[]> | null | undefined): t is ResourceMap<DocumentHighlight[]> => t instanceof ResourceMap && t.size > 0);
+	}), (result): result is ResourceMap<DocumentHighlight[]> => result !== undefined && result !== null);
 }
 
 interface IOccurenceAtPositionRequest {
@@ -183,76 +184,13 @@ class MultiModelOccurenceRequest extends OccurenceAtPositionRequest {
 	}
 }
 
-class TextualOccurenceRequest extends OccurenceAtPositionRequest {
-
-	private readonly _otherModels: ITextModel[];
-	private readonly _selectionIsEmpty: boolean;
-	private readonly _word: IWordAtPosition | null;
-
-	constructor(model: ITextModel, selection: Selection, word: IWordAtPosition | null, wordSeparators: string, otherModels: ITextModel[]) {
-		super(model, selection, wordSeparators);
-		this._otherModels = otherModels;
-		this._selectionIsEmpty = selection.isEmpty();
-		this._word = word;
-	}
-
-	protected _compute(model: ITextModel, selection: Selection, wordSeparators: string, token: CancellationToken): Promise<ResourceMap<DocumentHighlight[]>> {
-		return timeout(250, token).then(() => {
-			const result = new ResourceMap<DocumentHighlight[]>();
-
-			let wordResult;
-			if (this._word) {
-				wordResult = this._word;
-			} else {
-				wordResult = model.getWordAtPosition(selection.getPosition());
-			}
-
-			if (!wordResult) {
-				return new ResourceMap<DocumentHighlight[]>();
-			}
-
-			const allModels = [model, ...this._otherModels];
-
-			for (const otherModel of allModels) {
-				if (otherModel.isDisposed()) {
-					continue;
-				}
-
-				const matches = otherModel.findMatches(wordResult.word, true, false, true, wordSeparators, false);
-				const highlights = matches.map(m => ({
-					range: m.range,
-					kind: DocumentHighlightKind.Text
-				}));
-
-				if (highlights) {
-					result.set(otherModel.uri, highlights);
-				}
-			}
-			return result;
-		});
-	}
-
-	public override isValid(model: ITextModel, selection: Selection, decorations: IEditorDecorationsCollection): boolean {
-		const currentSelectionIsEmpty = selection.isEmpty();
-		if (this._selectionIsEmpty !== currentSelectionIsEmpty) {
-			return false;
-		}
-		return super.isValid(model, selection, decorations);
-	}
-}
 
 function computeOccurencesAtPosition(registry: LanguageFeatureRegistry<DocumentHighlightProvider>, model: ITextModel, selection: Selection, word: IWordAtPosition | null, wordSeparators: string): IOccurenceAtPositionRequest {
-	if (registry.has(model)) {
-		return new SemanticOccurenceAtPositionRequest(model, selection, wordSeparators, registry);
-	}
-	return new TextualOccurenceRequest(model, selection, word, wordSeparators, []);
+	return new SemanticOccurenceAtPositionRequest(model, selection, wordSeparators, registry);
 }
 
 function computeOccurencesMultiModel(registry: LanguageFeatureRegistry<MultiDocumentHighlightProvider>, model: ITextModel, selection: Selection, word: IWordAtPosition | null, wordSeparators: string, otherModels: ITextModel[]): IOccurenceAtPositionRequest {
-	if (registry.has(model)) {
-		return new MultiModelOccurenceRequest(model, selection, wordSeparators, registry, otherModels);
-	}
-	return new TextualOccurenceRequest(model, selection, word, wordSeparators, otherModels);
+	return new MultiModelOccurenceRequest(model, selection, wordSeparators, registry, otherModels);
 }
 
 registerModelAndPositionCommand('_executeDocumentHighlights', async (accessor, model, position) => {
@@ -266,11 +204,11 @@ class WordHighlighter {
 	private readonly editor: IActiveCodeEditor;
 	private readonly providers: LanguageFeatureRegistry<DocumentHighlightProvider>;
 	private readonly multiDocumentProviders: LanguageFeatureRegistry<MultiDocumentHighlightProvider>;
-	private occurrencesHighlight: string;
 	private readonly model: ITextModel;
 	private readonly decorations: IEditorDecorationsCollection;
 	private readonly toUnhook = new DisposableStore();
 	private readonly codeEditorService: ICodeEditorService;
+	private occurrencesHighlight: string;
 
 	private workerRequestTokenId: number = 0;
 	private workerRequest: IOccurenceAtPositionRequest | null;
@@ -283,7 +221,9 @@ class WordHighlighter {
 	private readonly _hasWordHighlights: IContextKey<boolean>;
 	private _ignorePositionChangeEvent: boolean;
 
-	private static storedDecorations: ResourceMap<string[]> = new ResourceMap();
+	private readonly runDelayer: Delayer<void> = this.toUnhook.add(new Delayer<void>(50));
+
+	private static storedDecorationIDs: ResourceMap<string[]> = new ResourceMap();
 	private static query: IWordHighlighterQuery | null = null;
 
 	constructor(editor: IActiveCodeEditor, providers: LanguageFeatureRegistry<DocumentHighlightProvider>, multiProviders: LanguageFeatureRegistry<MultiDocumentHighlightProvider>, contextKeyService: IContextKeyService, @ICodeEditorService codeEditorService: ICodeEditorService) {
@@ -307,7 +247,7 @@ class WordHighlighter {
 				return;
 			}
 
-			this._onPositionChanged(e);
+			this.runDelayer.trigger(() => { this._onPositionChanged(e); });
 		}));
 		this.toUnhook.add(editor.onDidFocusEditorText((e) => {
 			if (this.occurrencesHighlight === 'off') {
@@ -316,11 +256,13 @@ class WordHighlighter {
 			}
 
 			if (!this.workerRequest) {
-				this._run();
+				this.runDelayer.trigger(() => { this._run(); });
 			}
 		}));
 		this.toUnhook.add(editor.onDidChangeModelContent((e) => {
-			this._stopAll();
+			if (!matchesScheme(this.model.uri, 'output')) {
+				this._stopAll();
+			}
 		}));
 		this.toUnhook.add(editor.onDidChangeModel((e) => {
 			if (!e.newModelUrl && e.oldModelUrl) {
@@ -335,7 +277,22 @@ class WordHighlighter {
 			const newValue = this.editor.getOption(EditorOption.occurrencesHighlight);
 			if (this.occurrencesHighlight !== newValue) {
 				this.occurrencesHighlight = newValue;
-				this._stopAll();
+				switch (newValue) {
+					case 'off':
+						this._stopAll();
+						break;
+					case 'singleFile':
+						this._stopAll(WordHighlighter.query?.modelInfo?.model);
+						break;
+					case 'multiFile':
+						if (WordHighlighter.query) {
+							this._run(true);
+						}
+						break;
+					default:
+						console.warn('Unknown occurrencesHighlight setting value:', newValue);
+						break;
+				}
 			}
 		}));
 
@@ -361,6 +318,8 @@ class WordHighlighter {
 		if (this.occurrencesHighlight === 'off') {
 			return;
 		}
+
+		this.runDelayer.cancel();
 		this._run();
 	}
 
@@ -423,13 +382,13 @@ class WordHighlighter {
 			return;
 		}
 
-		const currentDecorationIDs = WordHighlighter.storedDecorations.get(this.editor.getModel().uri);
+		const currentDecorationIDs = WordHighlighter.storedDecorationIDs.get(this.editor.getModel().uri);
 		if (!currentDecorationIDs) {
 			return;
 		}
 
 		this.editor.removeDecorations(currentDecorationIDs);
-		WordHighlighter.storedDecorations.delete(this.editor.getModel().uri);
+		WordHighlighter.storedDecorationIDs.delete(this.editor.getModel().uri);
 
 		if (this.decorations.length > 0) {
 			this.decorations.clear();
@@ -437,16 +396,16 @@ class WordHighlighter {
 		}
 	}
 
-	private _removeAllDecorations(): void {
+	private _removeAllDecorations(preservedModel?: ITextModel): void {
 		const currentEditors = this.codeEditorService.listCodeEditors();
 		const deleteURI = [];
 		// iterate over editors and store models in currentModels
 		for (const editor of currentEditors) {
-			if (!editor.hasModel()) {
+			if (!editor.hasModel() || isEqual(editor.getModel().uri, preservedModel?.uri)) {
 				continue;
 			}
 
-			const currentDecorationIDs = WordHighlighter.storedDecorations.get(editor.getModel().uri);
+			const currentDecorationIDs = WordHighlighter.storedDecorationIDs.get(editor.getModel().uri);
 			if (!currentDecorationIDs) {
 				continue;
 			}
@@ -467,7 +426,7 @@ class WordHighlighter {
 		}
 
 		for (const uri of deleteURI) {
-			WordHighlighter.storedDecorations.delete(uri);
+			WordHighlighter.storedDecorationIDs.delete(uri);
 		}
 	}
 
@@ -505,11 +464,11 @@ class WordHighlighter {
 		}
 	}
 
-	private _stopAll() {
+	private _stopAll(preservedModel?: ITextModel): void {
 		// Remove any existing decorations
 		// TODO: @Yoyokrazy -- this triggers as notebooks scroll, causing highlights to disappear momentarily.
 		// maybe a nb type check?
-		this._removeAllDecorations();
+		this._removeAllDecorations(preservedModel);
 
 		// Cancel any renderDecorationsTimer
 		if (this.renderDecorationsTimer !== -1) {
@@ -623,13 +582,14 @@ class WordHighlighter {
 		return currentModels;
 	}
 
-	private _run(): void {
+	private _run(multiFileConfigChange?: boolean): void {
 
 		let workerRequestIsValid;
 		const hasTextFocus = this.editor.hasTextFocus();
 
 		if (!hasTextFocus) { // new nb cell scrolled in, didChangeModel fires
 			if (!WordHighlighter.query) { // no previous query, nothing to highlight off of
+				this._stopAll();
 				return;
 			}
 		} else { // has text focus
@@ -689,10 +649,22 @@ class WordHighlighter {
 				this.renderDecorationsTimer = -1;
 				this._beginRenderDecorations();
 			}
-		} else {
+		} else if (isEqual(this.editor.getModel().uri, WordHighlighter.query.modelInfo?.model.uri)) { // only trigger new worker requests from the primary model that initiated the query
 			// case d)
-			// Stop all previous actions and start fresh
-			this._stopAll();
+
+			// check if the new queried word is contained in the range of a stored decoration for this model
+			if (!multiFileConfigChange) {
+				const currentModelDecorationRanges = this.decorations.getRanges();
+				for (const storedRange of currentModelDecorationRanges) {
+					if (storedRange.containsPosition(this.editor.getPosition())) {
+						return;
+					}
+				}
+			}
+
+			// stop all previous actions if new word is highlighted
+			// if we trigger the run off a setting change -> multifile highlighting, we do not want to remove decorations from this model
+			this._stopAll(multiFileConfigChange ? this.model : undefined);
 
 			const myRequestId = ++this.workerRequestTokenId;
 			this.workerRequestCompleted = false;
@@ -703,7 +675,7 @@ class WordHighlighter {
 			// 		1) we have text focus, and a valid query was updated.
 			// 		2) we do not have text focus, and a valid query is cached.
 			// the query will ALWAYS have the correct data for the current highlight request, so it can always be passed to the workerRequest safely
-			if (!WordHighlighter.query.modelInfo || WordHighlighter.query.modelInfo.model.isDisposed()) {
+			if (!WordHighlighter.query || !WordHighlighter.query.modelInfo || WordHighlighter.query.modelInfo.model.isDisposed()) {
 				return;
 			}
 			this.workerRequest = this.computeWithModel(WordHighlighter.query.modelInfo.model, WordHighlighter.query.modelInfo.selection, WordHighlighter.query.word, otherModelsToHighlight);
@@ -757,7 +729,7 @@ class WordHighlighter {
 			const newDecorations: IModelDeltaDecoration[] = [];
 			const uri = editor.getModel()?.uri;
 			if (uri && this.workerRequestValue.has(uri)) {
-				const oldDecorationIDs: string[] | undefined = WordHighlighter.storedDecorations.get(uri);
+				const oldDecorationIDs: string[] | undefined = WordHighlighter.storedDecorationIDs.get(uri);
 				const newDocumentHighlights = this.workerRequestValue.get(uri);
 				if (newDocumentHighlights) {
 					for (const highlight of newDocumentHighlights) {
@@ -775,7 +747,7 @@ class WordHighlighter {
 				editor.changeDecorations((changeAccessor) => {
 					newDecorationIDs = changeAccessor.deltaDecorations(oldDecorationIDs ?? [], newDecorations);
 				});
-				WordHighlighter.storedDecorations = WordHighlighter.storedDecorations.set(uri, newDecorationIDs);
+				WordHighlighter.storedDecorationIDs = WordHighlighter.storedDecorationIDs.set(uri, newDecorationIDs);
 
 				if (newDecorations.length > 0) {
 					editorHighlighterContrib.wordHighlighter?.decorations.set(newDecorations);
@@ -919,7 +891,7 @@ class TriggerWordHighlightAction extends EditorAction {
 			id: 'editor.action.wordHighlight.trigger',
 			label: nls.localize('wordHighlight.trigger.label', "Trigger Symbol Highlight"),
 			alias: 'Trigger Symbol Highlight',
-			precondition: ctxHasWordHighlights.toNegated(),
+			precondition: undefined,
 			kbOpts: {
 				kbExpr: EditorContextKeys.editorTextFocus,
 				primary: 0,
@@ -942,4 +914,4 @@ registerEditorContribution(WordHighlighterContribution.ID, WordHighlighterContri
 registerEditorAction(NextWordHighlightAction);
 registerEditorAction(PrevWordHighlightAction);
 registerEditorAction(TriggerWordHighlightAction);
-// registerEditorFeature(TextualMultiDocumentHighlightFeature);
+registerEditorFeature(TextualMultiDocumentHighlightFeature);
diff --git a/src/vs/editor/editor.worker.ts b/src/vs/editor/editor.worker.ts
index 7c53a6094b2..a50ddd14bad 100644
--- a/src/vs/editor/editor.worker.ts
+++ b/src/vs/editor/editor.worker.ts
@@ -3,30 +3,4 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { SimpleWorkerServer } from 'vs/base/common/worker/simpleWorker';
-import { EditorSimpleWorker } from 'vs/editor/common/services/editorSimpleWorker';
-import { IEditorWorkerHost } from 'vs/editor/common/services/editorWorkerHost';
-
-let initialized = false;
-
-export function initialize(foreignModule: any) {
-	if (initialized) {
-		return;
-	}
-	initialized = true;
-
-	const simpleWorker = new SimpleWorkerServer((msg) => {
-		globalThis.postMessage(msg);
-	}, (host: IEditorWorkerHost) => new EditorSimpleWorker(host, foreignModule));
-
-	globalThis.onmessage = (e: MessageEvent) => {
-		simpleWorker.onmessage(e.data);
-	};
-}
-
-globalThis.onmessage = (e: MessageEvent) => {
-	// Ignore first message in this case and initialize if not yet initialized
-	if (!initialized) {
-		initialize(null);
-	}
-};
+export * from 'vs/editor/common/services/editorWorkerBootstrap';
diff --git a/src/vs/editor/standalone/browser/quickInput/standaloneQuickInputService.ts b/src/vs/editor/standalone/browser/quickInput/standaloneQuickInputService.ts
index e251afa2543..9700eed5a97 100644
--- a/src/vs/editor/standalone/browser/quickInput/standaloneQuickInputService.ts
+++ b/src/vs/editor/standalone/browser/quickInput/standaloneQuickInputService.ts
@@ -111,7 +111,7 @@ export class StandaloneQuickInputService implements IQuickInputService {
 	) {
 	}
 
-	pick<T extends IQuickPickItem, O extends IPickOptions<T>>(picks: Promise<QuickPickInput<T>[]> | QuickPickInput<T>[], options: O = <O>{}, token: CancellationToken = CancellationToken.None): Promise<(O extends { canPickMany: true } ? T[] : T) | undefined> {
+	pick<T extends IQuickPickItem, O extends IPickOptions<T>>(picks: Promise<QuickPickInput<T>[]> | QuickPickInput<T>[], options?: O, token: CancellationToken = CancellationToken.None): Promise<(O extends { canPickMany: true } ? T[] : T) | undefined> {
 		return (this.activeService as unknown as QuickInputController /* TS fail */).pick(picks, options, token);
 	}
 
@@ -119,8 +119,10 @@ export class StandaloneQuickInputService implements IQuickInputService {
 		return this.activeService.input(options, token);
 	}
 
-	createQuickPick<T extends IQuickPickItem>(): IQuickPick<T> {
-		return this.activeService.createQuickPick();
+	createQuickPick<T extends IQuickPickItem>(options: { useSeparators: true }): IQuickPick<T, { useSeparators: true }>;
+	createQuickPick<T extends IQuickPickItem>(options?: { useSeparators: boolean }): IQuickPick<T, { useSeparators: false }>;
+	createQuickPick<T extends IQuickPickItem>(options: { useSeparators: boolean } = { useSeparators: false }): IQuickPick<T, { useSeparators: boolean }> {
+		return this.activeService.createQuickPick(options);
 	}
 
 	createInputBox(): IInputBox {
diff --git a/src/vs/editor/standalone/browser/standaloneCodeEditor.ts b/src/vs/editor/standalone/browser/standaloneCodeEditor.ts
index 84deb53c57d..3ccfa128dc2 100644
--- a/src/vs/editor/standalone/browser/standaloneCodeEditor.ts
+++ b/src/vs/editor/standalone/browser/standaloneCodeEditor.ts
@@ -283,7 +283,6 @@ export class StandaloneCodeEditor extends CodeEditorWidget implements IStandalon
 	) {
 		const options = { ..._options };
 		options.ariaLabel = options.ariaLabel || StandaloneCodeEditorNLS.editorViewAccessibleLabel;
-		options.ariaLabel = options.ariaLabel + ';' + (StandaloneCodeEditorNLS.accessibilityHelpMessage);
 		super(domElement, options, {}, instantiationService, codeEditorService, commandService, contextKeyService, themeService, notificationService, accessibilityService, languageConfigurationService, languageFeaturesService);
 
 		if (keybindingService instanceof StandaloneKeybindingService) {
diff --git a/src/vs/editor/standalone/browser/standaloneEditor.ts b/src/vs/editor/standalone/browser/standaloneEditor.ts
index d1a70eba3d2..fbfe4e18b53 100644
--- a/src/vs/editor/standalone/browser/standaloneEditor.ts
+++ b/src/vs/editor/standalone/browser/standaloneEditor.ts
@@ -12,7 +12,7 @@ import { FontMeasurements } from 'vs/editor/browser/config/fontMeasurements';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { EditorCommand, ServicesAccessor } from 'vs/editor/browser/editorExtensions';
 import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { IWebWorkerOptions, MonacoWebWorker, createWebWorker as actualCreateWebWorker } from 'vs/editor/browser/services/webWorker';
+import { IWebWorkerOptions, MonacoWebWorker, createWebWorker as actualCreateWebWorker } from 'vs/editor/standalone/browser/standaloneWebWorker';
 import { ApplyUpdateResult, ConfigurationChangedEvent, EditorOptions } from 'vs/editor/common/config/editorOptions';
 import { EditorZoom } from 'vs/editor/common/config/editorZoom';
 import { BareFontInfo, FontInfo } from 'vs/editor/common/config/fontInfo';
@@ -21,7 +21,6 @@ import { IRange } from 'vs/editor/common/core/range';
 import { EditorType, IDiffEditor } from 'vs/editor/common/editorCommon';
 import * as languages from 'vs/editor/common/languages';
 import { ILanguageService } from 'vs/editor/common/languages/language';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
 import { PLAINTEXT_LANGUAGE_ID } from 'vs/editor/common/languages/modesRegistry';
 import { NullState, nullTokenize } from 'vs/editor/common/languages/nullTokenize';
 import { FindMatch, ITextModel, TextModelResolvedOptions } from 'vs/editor/common/model';
@@ -333,7 +332,7 @@ export function onDidChangeModelLanguage(listener: (e: { readonly model: ITextMo
  * Specify an AMD module to load that will `create` an object that will be proxied.
  */
 export function createWebWorker<T extends object>(opts: IWebWorkerOptions): MonacoWebWorker<T> {
-	return actualCreateWebWorker<T>(StandaloneServices.get(IModelService), StandaloneServices.get(ILanguageConfigurationService), opts);
+	return actualCreateWebWorker<T>(StandaloneServices.get(IModelService), opts);
 }
 
 /**
diff --git a/src/vs/editor/standalone/browser/standaloneServices.ts b/src/vs/editor/standalone/browser/standaloneServices.ts
index 9682a3cfb0f..e4f06ac453f 100644
--- a/src/vs/editor/standalone/browser/standaloneServices.ts
+++ b/src/vs/editor/standalone/browser/standaloneServices.ts
@@ -3,7 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/editor/common/languages/languageConfigurationRegistry';
 import 'vs/editor/standalone/browser/standaloneCodeEditorService';
 import 'vs/editor/standalone/browser/standaloneLayoutService';
 import 'vs/platform/undoRedo/common/undoRedoService';
@@ -89,12 +88,17 @@ import { IStorageService, InMemoryStorageService } from 'vs/platform/storage/com
 import { DefaultConfiguration } from 'vs/platform/configuration/common/configurations';
 import { WorkspaceEdit } from 'vs/editor/common/languages';
 import { AccessibilitySignal, AccessibilityModality, IAccessibilitySignalService, Sound } from 'vs/platform/accessibilitySignal/browser/accessibilitySignalService';
+import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
+import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
 import { LogService } from 'vs/platform/log/common/logService';
 import { getEditorFeatures } from 'vs/editor/common/editorFeatures';
 import { onUnexpectedError } from 'vs/base/common/errors';
 import { ExtensionKind, IEnvironmentService, IExtensionHostDebugParams } from 'vs/platform/environment/common/environment';
 import { mainWindow } from 'vs/base/browser/window';
 import { ResourceMap } from 'vs/base/common/map';
+import { ITreeSitterParserService } from 'vs/editor/common/services/treeSitterParserService';
+import { StandaloneTreeSitterParserService } from 'vs/editor/standalone/browser/standaloneTreeSitterService';
+import { IWorkerDescriptor } from 'vs/base/common/worker/simpleWorker';
 
 class SimpleModel implements IResolvedTextEditorModel {
 
@@ -1072,6 +1076,24 @@ class StandaloneContextMenuService extends ContextMenuService {
 	}
 }
 
+export const standaloneEditorWorkerDescriptor: IWorkerDescriptor = {
+	amdModuleId: 'vs/editor/common/services/editorSimpleWorker',
+	esmModuleLocation: undefined,
+	label: 'editorWorkerService'
+};
+
+class StandaloneEditorWorkerService extends EditorWorkerService {
+	constructor(
+		@IModelService modelService: IModelService,
+		@ITextResourceConfigurationService configurationService: ITextResourceConfigurationService,
+		@ILogService logService: ILogService,
+		@ILanguageConfigurationService languageConfigurationService: ILanguageConfigurationService,
+		@ILanguageFeaturesService languageFeaturesService: ILanguageFeaturesService,
+	) {
+		super(standaloneEditorWorkerDescriptor, modelService, configurationService, logService, languageConfigurationService, languageFeaturesService);
+	}
+}
+
 class StandaloneAccessbilitySignalService implements IAccessibilitySignalService {
 	_serviceBrand: undefined;
 	async playSignal(cue: AccessibilitySignal, options: {}): Promise<void> {
@@ -1130,7 +1152,7 @@ registerSingleton(IContextKeyService, ContextKeyService, InstantiationType.Eager
 registerSingleton(IProgressService, StandaloneProgressService, InstantiationType.Eager);
 registerSingleton(IEditorProgressService, StandaloneEditorProgressService, InstantiationType.Eager);
 registerSingleton(IStorageService, InMemoryStorageService, InstantiationType.Eager);
-registerSingleton(IEditorWorkerService, EditorWorkerService, InstantiationType.Eager);
+registerSingleton(IEditorWorkerService, StandaloneEditorWorkerService, InstantiationType.Eager);
 registerSingleton(IBulkEditService, StandaloneBulkEditService, InstantiationType.Eager);
 registerSingleton(IWorkspaceTrustManagementService, StandaloneWorkspaceTrustManagementService, InstantiationType.Eager);
 registerSingleton(ITextModelService, StandaloneTextModelService, InstantiationType.Eager);
@@ -1145,6 +1167,7 @@ registerSingleton(IClipboardService, BrowserClipboardService, InstantiationType.
 registerSingleton(IContextMenuService, StandaloneContextMenuService, InstantiationType.Eager);
 registerSingleton(IMenuService, MenuService, InstantiationType.Eager);
 registerSingleton(IAccessibilitySignalService, StandaloneAccessbilitySignalService, InstantiationType.Eager);
+registerSingleton(ITreeSitterParserService, StandaloneTreeSitterParserService, InstantiationType.Eager);
 
 /**
  * We don't want to eagerly instantiate services because embedders get a one time chance
diff --git a/src/vs/editor/standalone/browser/standaloneTreeSitterService.ts b/src/vs/editor/standalone/browser/standaloneTreeSitterService.ts
new file mode 100644
index 00000000000..153a9b887a0
--- /dev/null
+++ b/src/vs/editor/standalone/browser/standaloneTreeSitterService.ts
@@ -0,0 +1,26 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+// eslint-disable-next-line local/code-import-patterns
+import type { Parser } from '@vscode/tree-sitter-wasm';
+import { Event } from 'vs/base/common/event';
+import { ITextModel } from 'vs/editor/common/model';
+import { ITreeSitterParseResult, ITreeSitterParserService } from 'vs/editor/common/services/treeSitterParserService';
+
+/**
+ * The monaco build doesn't like the dynamic import of tree sitter in the real service.
+ * We use a dummy sertive here to make the build happy.
+ */
+export class StandaloneTreeSitterParserService implements ITreeSitterParserService {
+	readonly _serviceBrand: undefined;
+	onDidAddLanguage: Event<{ id: string; language: Parser.Language }> = Event.None;
+
+	getOrInitLanguage(_languageId: string): Parser.Language | undefined {
+		return undefined;
+	}
+	getParseResult(textModel: ITextModel): ITreeSitterParseResult | undefined {
+		return undefined;
+	}
+}
diff --git a/src/vs/editor/browser/services/webWorker.ts b/src/vs/editor/standalone/browser/standaloneWebWorker.ts
similarity index 81%
rename from src/vs/editor/browser/services/webWorker.ts
rename to src/vs/editor/standalone/browser/standaloneWebWorker.ts
index b5757c58865..74b1de918ff 100644
--- a/src/vs/editor/browser/services/webWorker.ts
+++ b/src/vs/editor/standalone/browser/standaloneWebWorker.ts
@@ -5,16 +5,17 @@
 
 import { getAllMethodNames } from 'vs/base/common/objects';
 import { URI } from 'vs/base/common/uri';
+import { IWorkerDescriptor } from 'vs/base/common/worker/simpleWorker';
 import { EditorWorkerClient } from 'vs/editor/browser/services/editorWorkerService';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
 import { IModelService } from 'vs/editor/common/services/model';
+import { standaloneEditorWorkerDescriptor } from 'vs/editor/standalone/browser/standaloneServices';
 
 /**
  * Create a new web worker that has model syncing capabilities built in.
  * Specify an AMD module to load that will `create` an object that will be proxied.
  */
-export function createWebWorker<T extends object>(modelService: IModelService, languageConfigurationService: ILanguageConfigurationService, opts: IWebWorkerOptions): MonacoWebWorker<T> {
-	return new MonacoWebWorkerImpl<T>(modelService, languageConfigurationService, opts);
+export function createWebWorker<T extends object>(modelService: IModelService, opts: IWebWorkerOptions): MonacoWebWorker<T> {
+	return new MonacoWebWorkerImpl<T>(modelService, opts);
 }
 
 /**
@@ -68,8 +69,13 @@ class MonacoWebWorkerImpl<T extends object> extends EditorWorkerClient implement
 	private _foreignModuleCreateData: any | null;
 	private _foreignProxy: Promise<T> | null;
 
-	constructor(modelService: IModelService, languageConfigurationService: ILanguageConfigurationService, opts: IWebWorkerOptions) {
-		super(modelService, opts.keepIdleModels || false, opts.label, languageConfigurationService);
+	constructor(modelService: IModelService, opts: IWebWorkerOptions) {
+		const workerDescriptor: IWorkerDescriptor = {
+			amdModuleId: standaloneEditorWorkerDescriptor.amdModuleId,
+			esmModuleLocation: standaloneEditorWorkerDescriptor.esmModuleLocation,
+			label: opts.label,
+		};
+		super(workerDescriptor, opts.keepIdleModels || false, modelService);
 		this._foreignModuleId = opts.moduleId;
 		this._foreignModuleCreateData = opts.createData || null;
 		this._foreignModuleHost = opts.host || null;
@@ -93,11 +99,11 @@ class MonacoWebWorkerImpl<T extends object> extends EditorWorkerClient implement
 		if (!this._foreignProxy) {
 			this._foreignProxy = this._getProxy().then((proxy) => {
 				const foreignHostMethods = this._foreignModuleHost ? getAllMethodNames(this._foreignModuleHost) : [];
-				return proxy.loadForeignModule(this._foreignModuleId, this._foreignModuleCreateData, foreignHostMethods).then((foreignMethods) => {
+				return proxy.$loadForeignModule(this._foreignModuleId, this._foreignModuleCreateData, foreignHostMethods).then((foreignMethods) => {
 					this._foreignModuleCreateData = null;
 
 					const proxyMethodRequest = (method: string, args: any[]): Promise<any> => {
-						return proxy.fmr(method, args);
+						return proxy.$fmr(method, args);
 					};
 
 					const createProxyMethod = (method: string, proxyMethodRequest: (method: string, args: any[]) => Promise<any>): () => Promise<any> => {
@@ -124,6 +130,6 @@ class MonacoWebWorkerImpl<T extends object> extends EditorWorkerClient implement
 	}
 
 	public withSyncedResources(resources: URI[]): Promise<T> {
-		return this._withSyncedResources(resources).then(_ => this.getProxy());
+		return this.workerWithSyncedResources(resources).then(_ => this.getProxy());
 	}
 }
diff --git a/src/vs/editor/test/browser/services/treeSitterParserService.test.ts b/src/vs/editor/test/browser/services/treeSitterParserService.test.ts
new file mode 100644
index 00000000000..ca9dcaac4e9
--- /dev/null
+++ b/src/vs/editor/test/browser/services/treeSitterParserService.test.ts
@@ -0,0 +1,151 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import assert from 'assert';
+import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { TextModelTreeSitter, TreeSitterImporter, TreeSitterLanguages } from 'vs/editor/browser/services/treeSitter/treeSitterParserService';
+import type { Parser } from '@vscode/tree-sitter-wasm';
+import { createTextModel } from 'vs/editor/test/common/testTextModel';
+import { timeout } from 'vs/base/common/async';
+import { ConsoleMainLogger, ILogService } from 'vs/platform/log/common/log';
+import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { LogService } from 'vs/platform/log/common/logService';
+import { mock } from 'vs/base/test/common/mock';
+
+class MockParser implements Parser {
+	static async init(): Promise<void> { }
+	delete(): void { }
+	parse(input: string | Parser.Input, oldTree?: Parser.Tree, options?: Parser.Options): Parser.Tree {
+		return new MockTree();
+	}
+	getIncludedRanges(): Parser.Range[] {
+		return [];
+	}
+	getTimeoutMicros(): number { return 0; }
+	setTimeoutMicros(timeout: number): void { }
+	reset(): void { }
+	getLanguage(): Parser.Language { return {} as any; }
+	setLanguage(): void { }
+	getLogger(): Parser.Logger {
+		throw new Error('Method not implemented.');
+	}
+	setLogger(logFunc?: Parser.Logger | false | null): void {
+		throw new Error('Method not implemented.');
+	}
+}
+
+class MockTreeSitterImporter extends TreeSitterImporter {
+	public override async getParserClass(): Promise<typeof Parser> {
+		return MockParser as any;
+	}
+}
+
+class MockTree implements Parser.Tree {
+	editorLanguage: string = '';
+	editorContents: string = '';
+	rootNode: Parser.SyntaxNode = {} as any;
+	rootNodeWithOffset(offsetBytes: number, offsetExtent: Parser.Point): Parser.SyntaxNode {
+		throw new Error('Method not implemented.');
+	}
+	copy(): Parser.Tree {
+		throw new Error('Method not implemented.');
+	}
+	delete(): void { }
+	edit(edit: Parser.Edit): Parser.Tree {
+		return this;
+	}
+	walk(): Parser.TreeCursor {
+		throw new Error('Method not implemented.');
+	}
+	getChangedRanges(other: Parser.Tree): Parser.Range[] {
+		throw new Error('Method not implemented.');
+	}
+	getIncludedRanges(): Parser.Range[] {
+		throw new Error('Method not implemented.');
+	}
+	getEditedRange(other: Parser.Tree): Parser.Range {
+		throw new Error('Method not implemented.');
+	}
+	getLanguage(): Parser.Language {
+		throw new Error('Method not implemented.');
+	}
+}
+
+class MockLanguage implements Parser.Language {
+	version: number = 0;
+	fieldCount: number = 0;
+	stateCount: number = 0;
+	nodeTypeCount: number = 0;
+	fieldNameForId(fieldId: number): string | null {
+		throw new Error('Method not implemented.');
+	}
+	fieldIdForName(fieldName: string): number | null {
+		throw new Error('Method not implemented.');
+	}
+	idForNodeType(type: string, named: boolean): number {
+		throw new Error('Method not implemented.');
+	}
+	nodeTypeForId(typeId: number): string | null {
+		throw new Error('Method not implemented.');
+	}
+	nodeTypeIsNamed(typeId: number): boolean {
+		throw new Error('Method not implemented.');
+	}
+	nodeTypeIsVisible(typeId: number): boolean {
+		throw new Error('Method not implemented.');
+	}
+	nextState(stateId: number, typeId: number): number {
+		throw new Error('Method not implemented.');
+	}
+	query(source: string): Parser.Query {
+		throw new Error('Method not implemented.');
+	}
+	lookaheadIterator(stateId: number): Parser.LookaheadIterable | null {
+		throw new Error('Method not implemented.');
+	}
+	languageId: string = '';
+}
+
+suite('TreeSitterParserService', function () {
+	const treeSitterImporter: TreeSitterImporter = new MockTreeSitterImporter();
+	let logService: ILogService;
+	let telemetryService: ITelemetryService;
+	setup(function () {
+		logService = new LogService(new ConsoleMainLogger());
+		telemetryService = new class extends mock<ITelemetryService>() {
+			override async publicLog2() {
+				//
+			}
+		};
+	});
+
+	const store = ensureNoDisposablesAreLeakedInTestSuite();
+
+	test('TextModelTreeSitter race condition: first language is slow to load', async function () {
+		class MockTreeSitterLanguages extends TreeSitterLanguages {
+			private async _fetchJavascript(): Promise<void> {
+				await timeout(200);
+				const language = new MockLanguage();
+				language.languageId = 'javascript';
+				this._onDidAddLanguage.fire({ id: 'javascript', language });
+			}
+			public override getOrInitLanguage(languageId: string): Parser.Language | undefined {
+				if (languageId === 'javascript') {
+					this._fetchJavascript();
+					return undefined;
+				}
+				const language = new MockLanguage();
+				language.languageId = languageId;
+				return language;
+			}
+		}
+
+		const treeSitterParser: TreeSitterLanguages = store.add(new MockTreeSitterLanguages(treeSitterImporter, {} as any, { isBuilt: false } as any, new Map()));
+		const textModel = store.add(createTextModel('console.log("Hello, world!");', 'javascript'));
+		const textModelTreeSitter = store.add(new TextModelTreeSitter(textModel, treeSitterParser, treeSitterImporter, logService, telemetryService));
+		textModel.setLanguage('typescript');
+		await timeout(300);
+		assert.strictEqual((textModelTreeSitter.parseResult?.language as MockLanguage).languageId, 'typescript');
+	});
+});
diff --git a/src/vs/editor/test/browser/testCodeEditor.ts b/src/vs/editor/test/browser/testCodeEditor.ts
index 5fcd0c1bd4c..5a79e483795 100644
--- a/src/vs/editor/test/browser/testCodeEditor.ts
+++ b/src/vs/editor/test/browser/testCodeEditor.ts
@@ -23,9 +23,11 @@ import { LanguageService } from 'vs/editor/common/services/languageService';
 import { IModelService } from 'vs/editor/common/services/model';
 import { ModelService } from 'vs/editor/common/services/modelService';
 import { ITextResourcePropertiesService } from 'vs/editor/common/services/textResourceConfiguration';
+import { ITreeSitterParserService } from 'vs/editor/common/services/treeSitterParserService';
 import { ViewModel } from 'vs/editor/common/viewModel/viewModelImpl';
 import { TestConfiguration } from 'vs/editor/test/browser/config/testConfiguration';
 import { TestCodeEditorService, TestCommandService } from 'vs/editor/test/browser/editorTestServices';
+import { TestTreeSitterParserService } from 'vs/editor/test/common/services/testTreeSitterService';
 import { TestLanguageConfigurationService } from 'vs/editor/test/common/modes/testLanguageConfigurationService';
 import { TestEditorWorkerService } from 'vs/editor/test/common/services/testEditorWorkerService';
 import { TestTextResourcePropertiesService } from 'vs/editor/test/common/services/testTextResourcePropertiesService';
@@ -218,6 +220,7 @@ export function createCodeEditorServices(disposables: DisposableStore, services:
 	});
 	define(ILanguageFeatureDebounceService, LanguageFeatureDebounceService);
 	define(ILanguageFeaturesService, LanguageFeaturesService);
+	define(ITreeSitterParserService, TestTreeSitterParserService);
 
 	const instantiationService = disposables.add(new TestInstantiationService(services, true));
 	disposables.add(toDisposable(() => {
diff --git a/src/vs/editor/test/browser/view/viewLayer.test.ts b/src/vs/editor/test/browser/view/viewLayer.test.ts
index 0f9588d870c..be227dce112 100644
--- a/src/vs/editor/test/browser/view/viewLayer.test.ts
+++ b/src/vs/editor/test/browser/view/viewLayer.test.ts
@@ -45,7 +45,7 @@ suite('RenderedLinesCollection onLinesDeleted', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
 
 	function testOnModelLinesDeleted(deleteFromLineNumber: number, deleteToLineNumber: number, expectedDeleted: string[], expectedState: ILinesCollectionState): void {
-		const col = new RenderedLinesCollection<TestLine>(() => new TestLine('new'));
+		const col = new RenderedLinesCollection<TestLine>({ createLine: () => new TestLine('new') });
 		col._set(6, [
 			new TestLine('old6'),
 			new TestLine('old7'),
@@ -322,7 +322,7 @@ suite('RenderedLinesCollection onLineChanged', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
 
 	function testOnModelLineChanged(changedLineNumber: number, expectedPinged: boolean, expectedState: ILinesCollectionState): void {
-		const col = new RenderedLinesCollection<TestLine>(() => new TestLine('new'));
+		const col = new RenderedLinesCollection<TestLine>({ createLine: () => new TestLine('new') });
 		col._set(6, [
 			new TestLine('old6'),
 			new TestLine('old7'),
@@ -405,7 +405,7 @@ suite('RenderedLinesCollection onLinesInserted', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
 
 	function testOnModelLinesInserted(insertFromLineNumber: number, insertToLineNumber: number, expectedDeleted: string[], expectedState: ILinesCollectionState): void {
-		const col = new RenderedLinesCollection<TestLine>(() => new TestLine('new'));
+		const col = new RenderedLinesCollection<TestLine>({ createLine: () => new TestLine('new') });
 		col._set(6, [
 			new TestLine('old6'),
 			new TestLine('old7'),
@@ -683,7 +683,7 @@ suite('RenderedLinesCollection onTokensChanged', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
 
 	function testOnModelTokensChanged(changedFromLineNumber: number, changedToLineNumber: number, expectedPinged: boolean, expectedState: ILinesCollectionState): void {
-		const col = new RenderedLinesCollection<TestLine>(() => new TestLine('new'));
+		const col = new RenderedLinesCollection<TestLine>({ createLine: () => new TestLine('new') });
 		col._set(6, [
 			new TestLine('old6'),
 			new TestLine('old7'),
diff --git a/src/vs/editor/test/common/services/editorSimpleWorker.test.ts b/src/vs/editor/test/common/services/editorSimpleWorker.test.ts
index 781ff450211..f35928e297f 100644
--- a/src/vs/editor/test/common/services/editorSimpleWorker.test.ts
+++ b/src/vs/editor/test/common/services/editorSimpleWorker.test.ts
@@ -8,14 +8,14 @@ import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/uti
 import { Position } from 'vs/editor/common/core/position';
 import { IRange, Range } from 'vs/editor/common/core/range';
 import { TextEdit } from 'vs/editor/common/languages';
-import { EditorSimpleWorker, ICommonModel } from 'vs/editor/common/services/editorSimpleWorker';
-import { IEditorWorkerHost } from 'vs/editor/common/services/editorWorkerHost';
+import { BaseEditorSimpleWorker } from 'vs/editor/common/services/editorSimpleWorker';
+import { ICommonModel } from 'vs/editor/common/services/textModelSync/textModelSync.impl';
 
 suite('EditorSimpleWorker', () => {
 
 	ensureNoDisposablesAreLeakedInTestSuite();
 
-	class WorkerWithModels extends EditorSimpleWorker {
+	class WorkerWithModels extends BaseEditorSimpleWorker {
 
 		getModel(uri: string) {
 			return this._getModel(uri);
@@ -23,13 +23,13 @@ suite('EditorSimpleWorker', () => {
 
 		addModel(lines: string[], eol: string = '\n') {
 			const uri = 'test:file#' + Date.now();
-			this.acceptNewModel({
+			this.$acceptNewModel({
 				url: uri,
 				versionId: 1,
 				lines: lines,
 				EOL: eol
 			});
-			return this._getModel(uri);
+			return this._getModel(uri)!;
 		}
 	}
 
@@ -37,7 +37,7 @@ suite('EditorSimpleWorker', () => {
 	let model: ICommonModel;
 
 	setup(() => {
-		worker = new WorkerWithModels(<IEditorWorkerHost>null!, null);
+		worker = new WorkerWithModels();
 		model = worker.addModel([
 			'This is line one', //16
 			'and this is line number two', //27
@@ -93,7 +93,7 @@ suite('EditorSimpleWorker', () => {
 
 	test('MoreMinimal', () => {
 
-		return worker.computeMoreMinimalEdits(model.uri.toString(), [{ text: 'This is line One', range: new Range(1, 1, 1, 17) }], false).then(edits => {
+		return worker.$computeMoreMinimalEdits(model.uri.toString(), [{ text: 'This is line One', range: new Range(1, 1, 1, 17) }], false).then(edits => {
 			assert.strictEqual(edits.length, 1);
 			const [first] = edits;
 			assert.strictEqual(first.text, 'O');
@@ -112,7 +112,7 @@ suite('EditorSimpleWorker', () => {
 		], '\n');
 
 
-		const newEdits = await worker.computeMoreMinimalEdits(model.uri.toString(), [
+		const newEdits = await worker.$computeMoreMinimalEdits(model.uri.toString(), [
 			{
 				range: new Range(1, 1, 2, 1),
 				text: 'one\ntwo\nthree\n',
@@ -144,7 +144,7 @@ suite('EditorSimpleWorker', () => {
 			'}'
 		], '\n');
 
-		return worker.computeMoreMinimalEdits(model.uri.toString(), [{ text: '{\r\n\t"a":1\r\n}', range: new Range(1, 1, 3, 2) }], false).then(edits => {
+		return worker.$computeMoreMinimalEdits(model.uri.toString(), [{ text: '{\r\n\t"a":1\r\n}', range: new Range(1, 1, 3, 2) }], false).then(edits => {
 			assert.strictEqual(edits.length, 0);
 		});
 	});
@@ -157,7 +157,7 @@ suite('EditorSimpleWorker', () => {
 			'}'
 		], '\n');
 
-		return worker.computeMoreMinimalEdits(model.uri.toString(), [{ text: '{\r\n\t"b":1\r\n}', range: new Range(1, 1, 3, 2) }], false).then(edits => {
+		return worker.$computeMoreMinimalEdits(model.uri.toString(), [{ text: '{\r\n\t"b":1\r\n}', range: new Range(1, 1, 3, 2) }], false).then(edits => {
 			assert.strictEqual(edits.length, 1);
 			const [first] = edits;
 			assert.strictEqual(first.text, 'b');
@@ -173,7 +173,7 @@ suite('EditorSimpleWorker', () => {
 			'}'				// 3
 		]);
 
-		return worker.computeMoreMinimalEdits(model.uri.toString(), [{ text: '\n', range: new Range(3, 2, 4, 1000) }], false).then(edits => {
+		return worker.$computeMoreMinimalEdits(model.uri.toString(), [{ text: '\n', range: new Range(3, 2, 4, 1000) }], false).then(edits => {
 			assert.strictEqual(edits.length, 1);
 			const [first] = edits;
 			assert.strictEqual(first.text, '\n');
@@ -184,7 +184,7 @@ suite('EditorSimpleWorker', () => {
 	async function testEdits(lines: string[], edits: TextEdit[]): Promise<unknown> {
 		const model = worker.addModel(lines);
 
-		const smallerEdits = await worker.computeHumanReadableDiff(
+		const smallerEdits = await worker.$computeHumanReadableDiff(
 			model.uri.toString(),
 			edits,
 			{ ignoreTrimWhitespace: false, maxComputationTimeMs: 0, computeMoves: false }
@@ -286,7 +286,7 @@ suite('EditorSimpleWorker', () => {
 			'f f'	// 2
 		]);
 
-		return worker.textualSuggest([model.uri.toString()], 'f', '[a-z]+', 'img').then((result) => {
+		return worker.$textualSuggest([model.uri.toString()], 'f', '[a-z]+', 'img').then((result) => {
 			if (!result) {
 				assert.ok(false);
 			}
diff --git a/src/vs/editor/test/common/services/testEditorWorkerService.ts b/src/vs/editor/test/common/services/testEditorWorkerService.ts
index e7d5154f9f6..078cb885e3b 100644
--- a/src/vs/editor/test/common/services/testEditorWorkerService.ts
+++ b/src/vs/editor/test/common/services/testEditorWorkerService.ts
@@ -6,7 +6,7 @@
 import { URI } from 'vs/base/common/uri';
 import { IRange } from 'vs/editor/common/core/range';
 import { DiffAlgorithmName, IEditorWorkerService, IUnicodeHighlightsResult } from 'vs/editor/common/services/editorWorker';
-import { TextEdit, IInplaceReplaceSupportResult } from 'vs/editor/common/languages';
+import { TextEdit, IInplaceReplaceSupportResult, IColorInformation } from 'vs/editor/common/languages';
 import { IDocumentDiff, IDocumentDiffProviderOptions } from 'vs/editor/common/diff/documentDiffProvider';
 import { IChange } from 'vs/editor/common/diff/legacyLinesDiffComputer';
 import { SectionHeader } from 'vs/editor/common/services/findSectionHeaders';
@@ -27,4 +27,5 @@ export class TestEditorWorkerService implements IEditorWorkerService {
 	canNavigateValueSet(resource: URI): boolean { return false; }
 	async navigateValueSet(resource: URI, range: IRange, up: boolean): Promise<IInplaceReplaceSupportResult | null> { return null; }
 	async findSectionHeaders(uri: URI): Promise<SectionHeader[]> { return []; }
+	async computeDefaultDocumentColors(uri: URI): Promise<IColorInformation[] | null> { return null; }
 }
diff --git a/src/vs/editor/test/common/services/testTreeSitterService.ts b/src/vs/editor/test/common/services/testTreeSitterService.ts
new file mode 100644
index 00000000000..e5adcca9f83
--- /dev/null
+++ b/src/vs/editor/test/common/services/testTreeSitterService.ts
@@ -0,0 +1,24 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import type { Parser } from '@vscode/tree-sitter-wasm';
+import { Event } from 'vs/base/common/event';
+import { ITextModel } from 'vs/editor/common/model';
+import { ITreeSitterParserService, ITreeSitterParseResult } from 'vs/editor/common/services/treeSitterParserService';
+
+export class TestTreeSitterParserService implements ITreeSitterParserService {
+	onDidAddLanguage: Event<{ id: string; language: Parser.Language }> = Event.None;
+	_serviceBrand: undefined;
+	getOrInitLanguage(languageId: string): Parser.Language | undefined {
+		throw new Error('Method not implemented.');
+	}
+	waitForLanguage(languageId: string): Promise<Parser.Language | undefined> {
+		throw new Error('Method not implemented.');
+	}
+	getParseResult(textModel: ITextModel): ITreeSitterParseResult | undefined {
+		throw new Error('Method not implemented.');
+	}
+
+}
diff --git a/src/vs/editor/test/common/testTextModel.ts b/src/vs/editor/test/common/testTextModel.ts
index cdab452aa9c..029e58d9188 100644
--- a/src/vs/editor/test/common/testTextModel.ts
+++ b/src/vs/editor/test/common/testTextModel.ts
@@ -34,6 +34,8 @@ import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeat
 import { LanguageFeaturesService } from 'vs/editor/common/services/languageFeaturesService';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { mock } from 'vs/base/test/common/mock';
+import { ITreeSitterParserService } from 'vs/editor/common/services/treeSitterParserService';
+import { TestTreeSitterParserService } from 'vs/editor/test/common/services/testTreeSitterService';
 
 class TestTextModel extends TextModel {
 	public registerDisposable(disposable: IDisposable): void {
@@ -105,5 +107,6 @@ export function createModelServices(disposables: DisposableStore, services: Serv
 		[ILanguageFeatureDebounceService, LanguageFeatureDebounceService],
 		[ILanguageFeaturesService, LanguageFeaturesService],
 		[IModelService, ModelService],
+		[ITreeSitterParserService, TestTreeSitterParserService]
 	]));
 }
diff --git a/src/vs/monaco.d.ts b/src/vs/monaco.d.ts
index 7844ea24aad..b03f1c5ae2e 100644
--- a/src/vs/monaco.d.ts
+++ b/src/vs/monaco.d.ts
@@ -2919,6 +2919,9 @@ declare namespace monaco.editor {
 	 * An event describing a change in the text of a model.
 	 */
 	export interface IModelContentChangedEvent {
+		/**
+		 * The changes are ordered from the end of the document to the beginning, so they should be safe to apply in sequence.
+		 */
 		readonly changes: IModelContentChange[];
 		/**
 		 * The (new) end-of-line character.
diff --git a/src/vs/nls.messages.ts b/src/vs/nls.messages.ts
new file mode 100644
index 00000000000..2e8b096686b
--- /dev/null
+++ b/src/vs/nls.messages.ts
@@ -0,0 +1,17 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+/*
+ * This module exists so that the AMD build of the monaco editor can replace this with an async loader plugin.
+ * If you add new functions to this module make sure that they are also provided in the AMD build of the monaco editor.
+ */
+
+export function getNLSMessages(): string[] {
+	return globalThis._VSCODE_NLS_MESSAGES;
+}
+
+export function getNLSLanguage(): string | undefined {
+	return globalThis._VSCODE_NLS_LANGUAGE;
+}
diff --git a/src/vs/nls.ts b/src/vs/nls.ts
index 5a546325fc7..2e914738989 100644
--- a/src/vs/nls.ts
+++ b/src/vs/nls.ts
@@ -3,8 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-// VSCODE_GLOBALS: NLS
-const isPseudo = globalThis._VSCODE_NLS_LANGUAGE === 'pseudo' || (typeof document !== 'undefined' && document.location && document.location.hash.indexOf('pseudo=true') >= 0);
+// eslint-disable-next-line local/code-import-patterns
+import { getNLSLanguage, getNLSMessages } from 'vs/nls.messages';
+// eslint-disable-next-line local/code-import-patterns
+export { getNLSLanguage, getNLSMessages } from 'vs/nls.messages';
+
+const isPseudo = getNLSLanguage() === 'pseudo' || (typeof document !== 'undefined' && document.location && document.location.hash.indexOf('pseudo=true') >= 0);
 
 export interface ILocalizeInfo {
 	key: string;
@@ -87,8 +91,7 @@ export function localize(data: ILocalizeInfo | string /* | number when built */,
  * depending on the target context.
  */
 function lookupMessage(index: number, fallback: string | null): string {
-	// VSCODE_GLOBALS: NLS
-	const message = globalThis._VSCODE_NLS_MESSAGES?.[index];
+	const message = getNLSMessages()?.[index];
 	if (typeof message !== 'string') {
 		if (typeof fallback === 'string') {
 			return fallback;
diff --git a/src/vs/platform/accessibility/browser/accessibleView.ts b/src/vs/platform/accessibility/browser/accessibleView.ts
index b76e63cce82..071afc8fa1f 100644
--- a/src/vs/platform/accessibility/browser/accessibleView.ts
+++ b/src/vs/platform/accessibility/browser/accessibleView.ts
@@ -121,7 +121,7 @@ export interface IAccessibleViewService {
 	goToSymbol(): void;
 	disableHint(): void;
 	getPosition(id: AccessibleViewProviderId): IPosition | undefined;
-	setPosition(position: IPosition, reveal?: boolean): void;
+	setPosition(position: IPosition, reveal?: boolean, select?: boolean): void;
 	getLastPosition(): IPosition | undefined;
 	/**
 	 * If the setting is enabled, provides the open accessible view hint as a localized string.
diff --git a/src/vs/platform/accessibilitySignal/browser/media/voiceRecordingStarted.mp3 b/src/vs/platform/accessibilitySignal/browser/media/voiceRecordingStarted.mp3
index 488754fdd58..3c7de8ca03b 100644
Binary files a/src/vs/platform/accessibilitySignal/browser/media/voiceRecordingStarted.mp3 and b/src/vs/platform/accessibilitySignal/browser/media/voiceRecordingStarted.mp3 differ
diff --git a/src/vs/platform/accessibilitySignal/browser/media/voiceRecordingStopped.mp3 b/src/vs/platform/accessibilitySignal/browser/media/voiceRecordingStopped.mp3
index 0532cf6b15a..d99bf74152d 100644
Binary files a/src/vs/platform/accessibilitySignal/browser/media/voiceRecordingStopped.mp3 and b/src/vs/platform/accessibilitySignal/browser/media/voiceRecordingStopped.mp3 differ
diff --git a/src/vs/platform/actionWidget/browser/actionWidget.css b/src/vs/platform/actionWidget/browser/actionWidget.css
index 2354e1af5cd..d205c7ab791 100644
--- a/src/vs/platform/actionWidget/browser/actionWidget.css
+++ b/src/vs/platform/actionWidget/browser/actionWidget.css
@@ -12,9 +12,11 @@
 	display: block;
 	width: 100%;
 	border: 1px solid var(--vscode-editorWidget-border) !important;
-	border-radius: 2px;
-	background-color: var(--vscode-editorWidget-background);
-	color: var(--vscode-editorWidget-foreground);
+	border-radius: 5px;
+	background-color: var(--vscode-editorActionList-background);
+	color: var(--vscode-editorActionList-foreground);
+	padding: 4px;
+	box-shadow: 0 2px 8px var(--vscode-widget-shadow);
 }
 
 .context-view-block {
@@ -59,11 +61,12 @@
 	cursor: pointer;
 	touch-action: none;
 	width: 100%;
+	border-radius: 4px;
 }
 
 .action-widget .monaco-list .monaco-list-row.action.focused:not(.option-disabled) {
-	background-color: var(--vscode-quickInputList-focusBackground) !important;
-	color: var(--vscode-quickInputList-focusForeground);
+	background-color: var(--vscode-editorActionList-focusBackground) !important;
+	color: var(--vscode-editorActionList-focusForeground);
 	outline: 1px solid var(--vscode-menu-selectionBorder, transparent);
 	outline-offset: -1px;
 }
@@ -71,6 +74,11 @@
 .action-widget .monaco-list-row.group-header {
 	color: var(--vscode-descriptionForeground) !important;
 	font-weight: 600;
+	font-size: 12px;
+}
+
+.action-widget .monaco-list-row.group-header:not(:first-of-type) {
+	margin-top: 2px;
 }
 
 .action-widget .monaco-list .group-header,
@@ -88,7 +96,7 @@
 
 .action-widget .monaco-list-row.action {
 	display: flex;
-	gap: 6px;
+	gap: 8px;
 	align-items: center;
 }
 
@@ -124,8 +132,9 @@
 /* Action bar */
 
 .action-widget .action-widget-action-bar {
-	background-color: var(--vscode-editorHoverWidget-statusBarBackground);
+	background-color: var(--vscode-editorActionList-background);
 	border-top: 1px solid var(--vscode-editorHoverWidget-border);
+	margin-top: 2px;
 }
 
 .action-widget .action-widget-action-bar::before {
@@ -135,7 +144,7 @@
 }
 
 .action-widget .action-widget-action-bar .actions-container {
-	padding: 0 8px;
+	padding: 3px 8px 0;
 }
 
 .action-widget-action-bar .action-label {
diff --git a/src/vs/platform/actions/browser/buttonbar.ts b/src/vs/platform/actions/browser/buttonbar.ts
index 530b1fe6170..510267bfef9 100644
--- a/src/vs/platform/actions/browser/buttonbar.ts
+++ b/src/vs/platform/actions/browser/buttonbar.ts
@@ -20,7 +20,7 @@ import { IHoverService } from 'vs/platform/hover/browser/hover';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 
-export type IButtonConfigProvider = (action: IAction) => {
+export type IButtonConfigProvider = (action: IAction, index: number) => {
 	showIcon?: boolean;
 	showLabel?: boolean;
 	isSecondary?: boolean;
@@ -90,7 +90,7 @@ export class WorkbenchButtonBar extends ButtonBar {
 				const [first, ...rest] = actionOrSubmenu.actions;
 				action = <MenuItemAction>first;
 				btn = this.addButtonWithDropdown({
-					secondary: conifgProvider(action)?.isSecondary ?? secondary,
+					secondary: conifgProvider(action, i)?.isSecondary ?? secondary,
 					actionRunner: this._actionRunner,
 					actions: rest,
 					contextMenuProvider: this._contextMenuService,
@@ -99,19 +99,20 @@ export class WorkbenchButtonBar extends ButtonBar {
 			} else {
 				action = actionOrSubmenu;
 				btn = this.addButton({
-					secondary: conifgProvider(action)?.isSecondary ?? secondary,
+					secondary: conifgProvider(action, i)?.isSecondary ?? secondary,
 					ariaLabel: action.label
 				});
 			}
 
 			btn.enabled = action.enabled;
+			btn.checked = action.checked ?? false;
 			btn.element.classList.add('default-colors');
-			if (conifgProvider(action)?.showLabel ?? true) {
+			if (conifgProvider(action, i)?.showLabel ?? true) {
 				btn.label = action.label;
 			} else {
 				btn.element.classList.add('monaco-text-button');
 			}
-			if (conifgProvider(action)?.showIcon) {
+			if (conifgProvider(action, i)?.showIcon) {
 				if (action instanceof MenuItemAction && ThemeIcon.isThemeIcon(action.item.icon)) {
 					btn.icon = action.item.icon;
 				} else if (action.class) {
diff --git a/src/vs/platform/actions/common/actions.ts b/src/vs/platform/actions/common/actions.ts
index 106199a1f6e..79a759963fa 100644
--- a/src/vs/platform/actions/common/actions.ts
+++ b/src/vs/platform/actions/common/actions.ts
@@ -66,6 +66,7 @@ export class MenuId {
 	static readonly DebugToolBar = new MenuId('DebugToolBar');
 	static readonly DebugToolBarStop = new MenuId('DebugToolBarStop');
 	static readonly DebugCallStackToolbar = new MenuId('DebugCallStackToolbar');
+	static readonly DebugCreateConfiguration = new MenuId('DebugCreateConfiguration');
 	static readonly EditorContext = new MenuId('EditorContext');
 	static readonly SimpleEditorContext = new MenuId('SimpleEditorContext');
 	static readonly EditorContent = new MenuId('EditorContent');
@@ -137,6 +138,7 @@ export class MenuId {
 	static readonly SCMSourceControl = new MenuId('SCMSourceControl');
 	static readonly SCMSourceControlInline = new MenuId('SCMSourceControlInline');
 	static readonly SCMSourceControlTitle = new MenuId('SCMSourceControlTitle');
+	static readonly SCMHistoryTitle = new MenuId('SCMHistoryTitle');
 	static readonly SCMTitle = new MenuId('SCMTitle');
 	static readonly SearchContext = new MenuId('SearchContext');
 	static readonly SearchActionMenu = new MenuId('SearchActionContext');
diff --git a/src/vs/platform/actions/common/menuService.ts b/src/vs/platform/actions/common/menuService.ts
index 91d9ffdc49d..33abc7acceb 100644
--- a/src/vs/platform/actions/common/menuService.ts
+++ b/src/vs/platform/actions/common/menuService.ts
@@ -166,6 +166,7 @@ type MenuItemGroup = [string, Array<IMenuItem | ISubmenuItem>];
 
 class MenuInfoSnapshot {
 	protected _menuGroups: MenuItemGroup[] = [];
+	private _allMenuIds: Set<MenuId> = new Set();
 	private _structureContextKeys: Set<string> = new Set();
 	private _preconditionContextKeys: Set<string> = new Set();
 	private _toggledContextKeys: Set<string> = new Set();
@@ -177,6 +178,10 @@ class MenuInfoSnapshot {
 		this.refresh();
 	}
 
+	get allMenuIds(): ReadonlySet<MenuId> {
+		return this._allMenuIds;
+	}
+
 	get structureContextKeys(): ReadonlySet<string> {
 		return this._structureContextKeys;
 	}
@@ -193,6 +198,7 @@ class MenuInfoSnapshot {
 
 		// reset
 		this._menuGroups.length = 0;
+		this._allMenuIds.clear();
 		this._structureContextKeys.clear();
 		this._preconditionContextKeys.clear();
 		this._toggledContextKeys.clear();
@@ -209,9 +215,10 @@ class MenuInfoSnapshot {
 			}
 			group[1].push(item);
 
-			// keep keys for eventing
-			this._collectContextKeys(item);
+			// keep keys and submenu ids for eventing
+			this._collectContextKeysAndSubmenuIds(item);
 		}
+		this._allMenuIds.add(this._id);
 	}
 
 	protected _sort(menuItems: (IMenuItem | ISubmenuItem)[]) {
@@ -219,7 +226,7 @@ class MenuInfoSnapshot {
 		return menuItems;
 	}
 
-	private _collectContextKeys(item: IMenuItem | ISubmenuItem): void {
+	private _collectContextKeysAndSubmenuIds(item: IMenuItem | ISubmenuItem): void {
 
 		MenuInfoSnapshot._fillInKbExprKeys(item.when, this._structureContextKeys);
 
@@ -237,7 +244,9 @@ class MenuInfoSnapshot {
 		} else if (this._collectContextKeysForSubmenus) {
 			// recursively collect context keys from submenus so that this
 			// menu fires events when context key changes affect submenus
-			MenuRegistry.getMenuItems(item.submenu).forEach(this._collectContextKeys, this);
+			MenuRegistry.getMenuItems(item.submenu).forEach(this._collectContextKeysAndSubmenuIds, this);
+
+			this._allMenuIds.add(item.submenu);
 		}
 	}
 
@@ -383,8 +392,11 @@ class MenuImpl implements IMenu {
 		}, options.eventDebounceDelay);
 		this._disposables.add(rebuildMenuSoon);
 		this._disposables.add(MenuRegistry.onDidChangeMenu(e => {
-			if (e.has(id)) {
-				rebuildMenuSoon.schedule();
+			for (const id of this._menuInfo.allMenuIds) {
+				if (e.has(id)) {
+					rebuildMenuSoon.schedule();
+					break;
+				}
 			}
 		}));
 
diff --git a/src/vs/platform/auxiliaryWindow/electron-main/auxiliaryWindow.ts b/src/vs/platform/auxiliaryWindow/electron-main/auxiliaryWindow.ts
index 0c49f0ac1e6..5d726261ea4 100644
--- a/src/vs/platform/auxiliaryWindow/electron-main/auxiliaryWindow.ts
+++ b/src/vs/platform/auxiliaryWindow/electron-main/auxiliaryWindow.ts
@@ -10,7 +10,7 @@ import { IEnvironmentMainService } from 'vs/platform/environment/electron-main/e
 import { ILifecycleMainService } from 'vs/platform/lifecycle/electron-main/lifecycleMainService';
 import { ILogService } from 'vs/platform/log/common/log';
 import { IStateService } from 'vs/platform/state/node/state';
-import { hasNativeTitlebar } from 'vs/platform/window/common/window';
+import { hasNativeTitlebar, TitlebarStyle } from 'vs/platform/window/common/window';
 import { IBaseWindow, WindowMode } from 'vs/platform/window/electron-main/window';
 import { BaseWindow } from 'vs/platform/windows/electron-main/windowImpl';
 
@@ -52,7 +52,7 @@ export class AuxiliaryWindow extends BaseWindow implements IAuxiliaryWindow {
 			return; // already disposed
 		}
 
-		this.doTryClaimWindow();
+		this.doTryClaimWindow(options);
 
 		if (options && !this.stateApplied) {
 			this.stateApplied = true;
@@ -72,7 +72,7 @@ export class AuxiliaryWindow extends BaseWindow implements IAuxiliaryWindow {
 		}
 	}
 
-	private doTryClaimWindow(): void {
+	private doTryClaimWindow(options?: BrowserWindowConstructorOptions): void {
 		if (this._win) {
 			return; // already claimed
 		}
@@ -82,11 +82,11 @@ export class AuxiliaryWindow extends BaseWindow implements IAuxiliaryWindow {
 			this.logService.trace('[aux window] Claimed browser window instance');
 
 			// Remember
-			this.setWin(window);
+			this.setWin(window, options);
 
 			// Disable Menu
 			window.setMenu(null);
-			if ((isWindows || isLinux) && hasNativeTitlebar(this.configurationService)) {
+			if ((isWindows || isLinux) && hasNativeTitlebar(this.configurationService, options?.titleBarStyle === 'hidden' ? TitlebarStyle.CUSTOM : undefined /* unknown */)) {
 				window.setAutoHideMenuBar(true); // Fix for https://github.com/microsoft/vscode/issues/200615
 			}
 
diff --git a/src/vs/platform/auxiliaryWindow/electron-main/auxiliaryWindowsMainService.ts b/src/vs/platform/auxiliaryWindow/electron-main/auxiliaryWindowsMainService.ts
index df55a1ce4a2..a5829812e7a 100644
--- a/src/vs/platform/auxiliaryWindow/electron-main/auxiliaryWindowsMainService.ts
+++ b/src/vs/platform/auxiliaryWindow/electron-main/auxiliaryWindowsMainService.ts
@@ -13,7 +13,7 @@ import { IAuxiliaryWindowsMainService } from 'vs/platform/auxiliaryWindow/electr
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { ILogService } from 'vs/platform/log/common/log';
 import { IWindowState, WindowMode, defaultAuxWindowState } from 'vs/platform/window/electron-main/window';
-import { WindowStateValidator, defaultBrowserWindowOptions, getLastFocused } from 'vs/platform/windows/electron-main/windows';
+import { IDefaultBrowserWindowOptionsOverrides, WindowStateValidator, defaultBrowserWindowOptions, getLastFocused } from 'vs/platform/windows/electron-main/windows';
 
 export class AuxiliaryWindowsMainService extends Disposable implements IAuxiliaryWindowsMainService {
 
@@ -88,13 +88,15 @@ export class AuxiliaryWindowsMainService extends Disposable implements IAuxiliar
 	}
 
 	createWindow(details: HandlerDetails): BrowserWindowConstructorOptions {
-		return this.instantiationService.invokeFunction(defaultBrowserWindowOptions, this.validateWindowState(details), {
+		const { state, overrides } = this.computeWindowStateAndOverrides(details);
+		return this.instantiationService.invokeFunction(defaultBrowserWindowOptions, state, overrides, {
 			preload: FileAccess.asFileUri('vs/base/parts/sandbox/electron-sandbox/preload-aux.js').fsPath
 		});
 	}
 
-	private validateWindowState(details: HandlerDetails): IWindowState {
+	private computeWindowStateAndOverrides(details: HandlerDetails): { readonly state: IWindowState; readonly overrides: IDefaultBrowserWindowOptionsOverrides } {
 		const windowState: IWindowState = {};
+		const overrides: IDefaultBrowserWindowOptionsOverrides = {};
 
 		const features = details.features.split(','); // for example: popup=yes,left=270,top=14.5,width=800,height=600
 		for (const feature of features) {
@@ -118,8 +120,11 @@ export class AuxiliaryWindowsMainService extends Disposable implements IAuxiliar
 				case 'window-fullscreen':
 					windowState.mode = WindowMode.Fullscreen;
 					break;
-				case 'titlebar':
-					windowState.mode = WindowMode.Custom;
+				case 'window-disable-fullscreen':
+					overrides.disableFullscreen = true;
+					break;
+				case 'window-native-titlebar':
+					overrides.forceNativeTitlebar = true;
 					break;
 			}
 		}
@@ -128,7 +133,7 @@ export class AuxiliaryWindowsMainService extends Disposable implements IAuxiliar
 
 		this.logService.trace('[aux window] using window state', state);
 
-		return state;
+		return { state, overrides };
 	}
 
 	registerWindow(webContents: WebContents): void {
diff --git a/src/vs/platform/clipboard/browser/clipboardService.ts b/src/vs/platform/clipboard/browser/clipboardService.ts
index a4a5270cf0e..845c83ed29f 100644
--- a/src/vs/platform/clipboard/browser/clipboardService.ts
+++ b/src/vs/platform/clipboard/browser/clipboardService.ts
@@ -15,6 +15,13 @@ import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService
 import { ILayoutService } from 'vs/platform/layout/browser/layoutService';
 import { ILogService } from 'vs/platform/log/common/log';
 
+/**
+ * Custom mime type used for storing a list of uris in the clipboard.
+ *
+ * Requires support for custom web clipboards https://github.com/w3c/clipboard-apis/pull/175
+ */
+const vscodeResourcesMime = 'application/vnd.code.resources';
+
 export class BrowserClipboardService extends Disposable implements IClipboardService {
 
 	declare readonly _serviceBrand: undefined;
@@ -34,7 +41,7 @@ export class BrowserClipboardService extends Disposable implements IClipboardSer
 		// and not in the clipboard, we have to invalidate
 		// that state when the user copies other data.
 		this._register(Event.runAndSubscribe(onDidRegisterWindow, ({ window, disposables }) => {
-			disposables.add(addDisposableListener(window.document, 'copy', () => this.clearResources()));
+			disposables.add(addDisposableListener(window.document, 'copy', () => this.clearResourcesState()));
 		}, { window: mainWindow, disposables: this._store }));
 	}
 
@@ -86,7 +93,7 @@ export class BrowserClipboardService extends Disposable implements IClipboardSer
 	async writeText(text: string, type?: string): Promise<void> {
 
 		// Clear resources given we are writing text
-		this.writeResources([]);
+		this.clearResourcesState();
 
 		// With type: only in-memory is supported
 		if (type) {
@@ -172,8 +179,28 @@ export class BrowserClipboardService extends Disposable implements IClipboardSer
 	private static readonly MAX_RESOURCE_STATE_SOURCE_LENGTH = 1000;
 
 	async writeResources(resources: URI[]): Promise<void> {
+		// Guard access to navigator.clipboard with try/catch
+		// as we have seen DOMExceptions in certain browsers
+		// due to security policies.
+		try {
+			await getActiveWindow().navigator.clipboard.write([
+				new ClipboardItem({
+					[`web ${vscodeResourcesMime}`]: new Blob([
+						JSON.stringify(resources.map(x => x.toJSON()))
+					], {
+						type: vscodeResourcesMime
+					})
+				})
+			]);
+
+			// Continue to write to the in-memory clipboard as well.
+			// This is needed because some browsers allow the paste but then can't read the custom resources.
+		} catch (error) {
+			// Noop
+		}
+
 		if (resources.length === 0) {
-			this.clearResources();
+			this.clearResourcesState();
 		} else {
 			this.resources = resources;
 			this.resourcesStateHash = await this.computeResourcesStateHash();
@@ -181,9 +208,25 @@ export class BrowserClipboardService extends Disposable implements IClipboardSer
 	}
 
 	async readResources(): Promise<URI[]> {
+		// Guard access to navigator.clipboard with try/catch
+		// as we have seen DOMExceptions in certain browsers
+		// due to security policies.
+		try {
+			const items = await getActiveWindow().navigator.clipboard.read();
+			for (const item of items) {
+				if (item.types.includes(`web ${vscodeResourcesMime}`)) {
+					const blob = await item.getType(`web ${vscodeResourcesMime}`);
+					const resources = (JSON.parse(await blob.text()) as URI[]).map(x => URI.from(x));
+					return resources;
+				}
+			}
+		} catch (error) {
+			// Noop
+		}
+
 		const resourcesStateHash = await this.computeResourcesStateHash();
 		if (this.resourcesStateHash !== resourcesStateHash) {
-			this.clearResources(); // state mismatch, resources no longer valid
+			this.clearResourcesState(); // state mismatch, resources no longer valid
 		}
 
 		return this.resources;
@@ -229,10 +272,28 @@ export class BrowserClipboardService extends Disposable implements IClipboardSer
 	}
 
 	async hasResources(): Promise<boolean> {
+		// Guard access to navigator.clipboard with try/catch
+		// as we have seen DOMExceptions in certain browsers
+		// due to security policies.
+		try {
+			const items = await getActiveWindow().navigator.clipboard.read();
+			for (const item of items) {
+				if (item.types.includes(`web ${vscodeResourcesMime}`)) {
+					return true;
+				}
+			}
+		} catch (error) {
+			// Noop
+		}
+
 		return this.resources.length > 0;
 	}
 
-	private clearResources(): void {
+	public clearInternalState(): void {
+		this.clearResourcesState();
+	}
+
+	private clearResourcesState(): void {
 		this.resources = [];
 		this.resourcesStateHash = undefined;
 	}
diff --git a/src/vs/platform/clipboard/common/clipboardService.ts b/src/vs/platform/clipboard/common/clipboardService.ts
index aa3f7b5f916..1fed46895b7 100644
--- a/src/vs/platform/clipboard/common/clipboardService.ts
+++ b/src/vs/platform/clipboard/common/clipboardService.ts
@@ -56,4 +56,11 @@ export interface IClipboardService {
 	 * Find out if resources are copied to the clipboard.
 	 */
 	hasResources(): Promise<boolean>;
+
+	/**
+	 * Resets the internal state of the clipboard (if any) without touching the real clipboard.
+	 *
+	 * Used for implementations such as web which do not always support using the real clipboard.
+	 */
+	clearInternalState?(): void;
 }
diff --git a/src/vs/platform/cssDev/node/cssDevService.ts b/src/vs/platform/cssDev/node/cssDevService.ts
new file mode 100644
index 00000000000..98e73883207
--- /dev/null
+++ b/src/vs/platform/cssDev/node/cssDevService.ts
@@ -0,0 +1,73 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { spawn } from 'child_process';
+import { relative } from 'path';
+import { isESM } from 'vs/base/common/amd';
+import { FileAccess } from 'vs/base/common/network';
+import { StopWatch } from 'vs/base/common/stopwatch';
+import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { ILogService } from 'vs/platform/log/common/log';
+
+export const ICSSDevelopmentService = createDecorator<ICSSDevelopmentService>('ICSSDevelopmentService');
+
+export interface ICSSDevelopmentService {
+	_serviceBrand: undefined;
+	isEnabled: boolean;
+	getCssModules(): Promise<string[]>;
+}
+
+export class CSSDevelopmentService implements ICSSDevelopmentService {
+
+	declare _serviceBrand: undefined;
+
+	private _cssModules?: Promise<string[]>;
+
+	constructor(
+		@IEnvironmentService private readonly envService: IEnvironmentService,
+		@ILogService private readonly logService: ILogService
+	) { }
+
+	get isEnabled(): boolean {
+		return !this.envService.isBuilt && isESM;
+	}
+
+	getCssModules(): Promise<string[]> {
+		this._cssModules ??= this.computeCssModules();
+		return this._cssModules;
+	}
+
+	private async computeCssModules(): Promise<string[]> {
+		if (!this.isEnabled) {
+			return [];
+		}
+
+		const rg = await import('@vscode/ripgrep');
+		return await new Promise<string[]>((resolve) => {
+
+			const sw = StopWatch.create();
+
+			const chunks: string[][] = [];
+			const decoder = new TextDecoder();
+			const basePath = FileAccess.asFileUri('').fsPath;
+			const process = spawn(rg.rgPath, ['-g', '**/*.css', '--files', '--no-ignore', basePath], {});
+
+			process.stdout.on('data', data => {
+				const chunk = decoder.decode(data, { stream: true });
+				chunks.push(chunk.split('\n').filter(Boolean));
+			});
+			process.on('error', err => {
+				this.logService.error('[CSS_DEV] FAILED to compute CSS data', err);
+				resolve([]);
+			});
+			process.on('close', () => {
+				const result = chunks.flat().map(path => relative(basePath, path).replace(/\\/g, '/')).filter(Boolean).sort();
+				resolve(result);
+				this.logService.info(`[CSS_DEV] DONE, ${result.length} css modules (${Math.round(sw.elapsed())}ms)`);
+			});
+		});
+	}
+}
diff --git a/src/vs/platform/diagnostics/node/diagnosticsService.ts b/src/vs/platform/diagnostics/node/diagnosticsService.ts
index 7e0bc1170e0..dca3e1ed463 100644
--- a/src/vs/platform/diagnostics/node/diagnosticsService.ts
+++ b/src/vs/platform/diagnostics/node/diagnosticsService.ts
@@ -28,10 +28,10 @@ interface ConfigFilePatterns {
 	relativePathPattern?: RegExp;
 }
 
-const worksapceStatsCache = new Map<string, Promise<WorkspaceStats>>();
+const workspaceStatsCache = new Map<string, Promise<WorkspaceStats>>();
 export async function collectWorkspaceStats(folder: string, filter: string[]): Promise<WorkspaceStats> {
 	const cacheKey = `${folder}::${filter.join(':')}`;
-	const cached = worksapceStatsCache.get(cacheKey);
+	const cached = workspaceStatsCache.get(cacheKey);
 	if (cached) {
 		return cached;
 	}
@@ -55,7 +55,8 @@ export async function collectWorkspaceStats(folder: string, filter: string[]): P
 		{ tag: 'cmake', filePattern: /^.+\.cmake$/i },
 		{ tag: 'github-actions', filePattern: /^.+\.ya?ml$/i, relativePathPattern: /^\.github(?:\/|\\)workflows$/i },
 		{ tag: 'devcontainer.json', filePattern: /^devcontainer\.json$/i },
-		{ tag: 'dockerfile', filePattern: /^(dockerfile|docker\-compose\.ya?ml)$/i }
+		{ tag: 'dockerfile', filePattern: /^(dockerfile|docker\-compose\.ya?ml)$/i },
+		{ tag: 'cursorrules', filePattern: /^\.cursorrules$/i },
 	];
 
 	const fileTypes = new Map<string, number>();
@@ -150,7 +151,7 @@ export async function collectWorkspaceStats(folder: string, filter: string[]): P
 		});
 	});
 
-	worksapceStatsCache.set(cacheKey, statsPromise);
+	workspaceStatsCache.set(cacheKey, statsPromise);
 	return statsPromise;
 }
 
diff --git a/src/vs/platform/environment/node/userDataPath.js b/src/vs/platform/environment/node/userDataPath.js
index 3661c50a3ba..2248dce2e44 100644
--- a/src/vs/platform/environment/node/userDataPath.js
+++ b/src/vs/platform/environment/node/userDataPath.js
@@ -12,6 +12,7 @@
 // import * as os from 'os';
 // import * as path from 'path';
 //
+// /** @type any */
 // const module = { exports: {} };
 // ESM-uncomment-end
 
diff --git a/src/vs/platform/environment/test/node/nativeModules.integrationTest.ts b/src/vs/platform/environment/test/node/nativeModules.integrationTest.ts
index d2997c2d22b..e9b5ba5c08f 100644
--- a/src/vs/platform/environment/test/node/nativeModules.integrationTest.ts
+++ b/src/vs/platform/environment/test/node/nativeModules.integrationTest.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { isWindows } from 'vs/base/common/platform';
+import { isMacintosh, isWindows } from 'vs/base/common/platform';
 import { flakySuite } from 'vs/base/test/common/testUtils';
 
 function testErrorMessage(module: string): string {
@@ -13,13 +13,33 @@ function testErrorMessage(module: string): string {
 
 flakySuite('Native Modules (all platforms)', () => {
 
-	test('kerberos', async () => {
-		const kerberos = await import('kerberos');
+	(isMacintosh ? test.skip : test)('kerberos', async () => { // Somehow fails on macOS ARM?
+		const { default: kerberos } = await import('kerberos');
 		assert.ok(typeof kerberos.initializeClient === 'function', testErrorMessage('kerberos'));
 	});
 
+	test('minimist', async () => {
+		const { default: minimist } = await import('minimist');
+		assert.ok(typeof minimist === 'function', testErrorMessage('minimist'));
+	});
+
+	test('yauzl', async () => {
+		const { default: yauzl } = await import('yauzl');
+		assert.ok(typeof yauzl.ZipFile === 'function', testErrorMessage('yauzl'));
+	});
+
+	test('yazl', async () => {
+		const { default: yazl } = await import('yazl');
+		assert.ok(typeof yazl.ZipFile === 'function', testErrorMessage('yazl'));
+	});
+
+	test('v8-inspect-profiler', async () => {
+		const { default: profiler } = await import('v8-inspect-profiler');
+		assert.ok(typeof profiler.startProfiling === 'function', testErrorMessage('v8-inspect-profiler'));
+	});
+
 	test('native-is-elevated', async () => {
-		const isElevated = (await import('native-is-elevated')).default;
+		const { default: isElevated } = await import('native-is-elevated');
 		assert.ok(typeof isElevated === 'function', testErrorMessage('native-is-elevated '));
 
 		const result = isElevated();
@@ -28,6 +48,7 @@ flakySuite('Native Modules (all platforms)', () => {
 
 	test('native-keymap', async () => {
 		const keyMap = await import('native-keymap');
+		assert.ok(typeof keyMap.onDidChangeKeyboardLayout === 'function', testErrorMessage('native-keymap'));
 		assert.ok(typeof keyMap.getCurrentKeyboardLayout === 'function', testErrorMessage('native-keymap'));
 
 		const result = keyMap.getCurrentKeyboardLayout();
@@ -39,12 +60,27 @@ flakySuite('Native Modules (all platforms)', () => {
 		assert.ok(typeof watchDog.start === 'function', testErrorMessage('native-watchdog'));
 	});
 
-	(process.type === 'renderer' ? test.skip /* TODO@electron module is not context aware yet and thus cannot load in Electron renderer used by tests */ : test)('node-pty', async () => {
+	test('@vscode/sudo-prompt', async () => {
+		const prompt = await import('@vscode/sudo-prompt');
+		assert.ok(typeof prompt.exec === 'function', testErrorMessage('@vscode/sudo-prompt'));
+	});
+
+	test('@vscode/policy-watcher', async () => {
+		const watcher = await import('@vscode/policy-watcher');
+		assert.ok(typeof watcher.createWatcher === 'function', testErrorMessage('@vscode/policy-watcher'));
+	});
+
+	test('node-pty', async () => {
 		const nodePty = await import('node-pty');
 		assert.ok(typeof nodePty.spawn === 'function', testErrorMessage('node-pty'));
 	});
 
-	(process.type === 'renderer' ? test.skip /* TODO@electron module is not context aware yet and thus cannot load in Electron renderer used by tests */ : test)('@vscode/spdlog', async () => {
+	test('open', async () => {
+		const { default: open } = await import('open');
+		assert.ok(typeof open === 'function', testErrorMessage('open'));
+	});
+
+	test('@vscode/spdlog', async () => {
 		const spdlog = await import('@vscode/spdlog');
 		assert.ok(typeof spdlog.createRotatingLogger === 'function', testErrorMessage('@vscode/spdlog'));
 		assert.ok(typeof spdlog.version === 'number', testErrorMessage('@vscode/spdlog'));
@@ -55,6 +91,21 @@ flakySuite('Native Modules (all platforms)', () => {
 		assert.ok(typeof parcelWatcher.subscribe === 'function', testErrorMessage('@parcel/watcher'));
 	});
 
+	test('@vscode/deviceid', async () => {
+		const deviceIdPackage = await import('@vscode/deviceid');
+		assert.ok(typeof deviceIdPackage.getDeviceId === 'function', testErrorMessage('@vscode/deviceid'));
+	});
+
+	test('@vscode/ripgrep', async () => {
+		const ripgrep = await import('@vscode/ripgrep');
+		assert.ok(typeof ripgrep.rgPath === 'string', testErrorMessage('@vscode/ripgrep'));
+	});
+
+	test('vscode-regexpp', async () => {
+		const regexpp = await import('vscode-regexpp');
+		assert.ok(typeof regexpp.RegExpParser === 'function', testErrorMessage('vscode-regexpp'));
+	});
+
 	test('@vscode/sqlite3', async () => {
 		// ESM-comment-begin
 		const sqlite3 = await import('@vscode/sqlite3');
@@ -65,26 +116,49 @@ flakySuite('Native Modules (all platforms)', () => {
 		assert.ok(typeof sqlite3.Database === 'function', testErrorMessage('@vscode/sqlite3'));
 	});
 
-	test('vsda', async () => {
-		try {
-			const vsda: any = globalThis._VSCODE_NODE_MODULES['vsda'];
-			const signer = new vsda.signer();
-			const signed = await signer.sign('value');
-			assert.ok(typeof signed === 'string', testErrorMessage('vsda'));
-		} catch (error) {
-			if (error.code !== 'MODULE_NOT_FOUND') {
-				throw error;
+	test('http-proxy-agent', async () => {
+		// ESM-comment-begin
+		const mod = await import('http-proxy-agent');
+		// ESM-comment-end
+		// ESM-uncomment-begin
+		// const { default: mod } = await import('http-proxy-agent');
+		// ESM-uncomment-end
+		assert.ok(typeof mod.HttpProxyAgent === 'function', testErrorMessage('http-proxy-agent'));
+	});
+
+	test('https-proxy-agent', async () => {
+		// ESM-comment-begin
+		const mod = await import('https-proxy-agent');
+		// ESM-comment-end
+		// ESM-uncomment-begin
+		// const { default: mod } = await import('https-proxy-agent');
+		// ESM-uncomment-end
+		assert.ok(typeof mod.HttpsProxyAgent === 'function', testErrorMessage('https-proxy-agent'));
+	});
+
+	test('@vscode/proxy-agent', async () => {
+		const proxyAgent = await import('@vscode/proxy-agent');
+		// This call will load `@vscode/proxy-agent` which is a native module that we want to test on Windows
+		const windowsCerts = await proxyAgent.loadSystemCertificates({
+			log: {
+				trace: () => { },
+				debug: () => { },
+				info: () => { },
+				warn: () => { },
+				error: () => { }
 			}
-		}
+		});
+		assert.ok(windowsCerts.length > 0, testErrorMessage('@vscode/proxy-agent'));
 	});
 });
 
 (!isWindows ? suite.skip : suite)('Native Modules (Windows)', () => {
 
-	(process.type === 'renderer' ? test.skip /* TODO@electron module is not context aware yet and thus cannot load in Electron renderer used by tests */ : test)('@vscode/windows-mutex', async () => {
+	test('@vscode/windows-mutex', async () => {
 		const mutex = await import('@vscode/windows-mutex');
 		assert.ok(mutex && typeof mutex.isActive === 'function', testErrorMessage('@vscode/windows-mutex'));
 		assert.ok(typeof mutex.isActive === 'function', testErrorMessage('@vscode/windows-mutex'));
+		assert.ok(typeof mutex.Mutex === 'function', testErrorMessage('@vscode/windows-mutex'));
 	});
 
 	test('windows-foreground-love', async () => {
@@ -117,22 +191,4 @@ flakySuite('Native Modules (all platforms)', () => {
 		const result = windowsRegistry.GetStringRegKey('HKEY_LOCAL_MACHINE', 'SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion', 'EditionID');
 		assert.ok(typeof result === 'string' || typeof result === 'undefined', testErrorMessage('@vscode/windows-registry'));
 	});
-
-	test('@vscode/windows-ca-certs', async () => {
-		// @ts-ignore we do not directly depend on this module anymore
-		// but indirectly from our dependency to `@vscode/proxy-agent`
-		// we still want to ensure this module can work properly.
-		const windowsCerts = await import('@vscode/windows-ca-certs');
-		const store = new windowsCerts.Crypt32();
-		assert.ok(windowsCerts, testErrorMessage('@vscode/windows-ca-certs'));
-		let certCount = 0;
-		try {
-			while (store.next()) {
-				certCount++;
-			}
-		} finally {
-			store.done();
-		}
-		assert(certCount > 0);
-	});
 });
diff --git a/src/vs/platform/extensionManagement/common/extensionEnablementService.ts b/src/vs/platform/extensionManagement/common/extensionEnablementService.ts
index 61c8816e3aa..7637899aea1 100644
--- a/src/vs/platform/extensionManagement/common/extensionEnablementService.ts
+++ b/src/vs/platform/extensionManagement/common/extensionEnablementService.ts
@@ -16,15 +16,15 @@ export class GlobalExtensionEnablementService extends Disposable implements IGlo
 
 	private _onDidChangeEnablement = new Emitter<{ readonly extensions: IExtensionIdentifier[]; readonly source?: string }>();
 	readonly onDidChangeEnablement: Event<{ readonly extensions: IExtensionIdentifier[]; readonly source?: string }> = this._onDidChangeEnablement.event;
-	private readonly storageManger: StorageManager;
+	private readonly storageManager: StorageManager;
 
 	constructor(
 		@IStorageService storageService: IStorageService,
 		@IExtensionManagementService extensionManagementService: IExtensionManagementService,
 	) {
 		super();
-		this.storageManger = this._register(new StorageManager(storageService));
-		this._register(this.storageManger.onDidChange(extensions => this._onDidChangeEnablement.fire({ extensions, source: 'storage' })));
+		this.storageManager = this._register(new StorageManager(storageService));
+		this._register(this.storageManager.onDidChange(extensions => this._onDidChangeEnablement.fire({ extensions, source: 'storage' })));
 		this._register(extensionManagementService.onDidInstallExtensions(e => e.forEach(({ local, operation }) => {
 			if (local && operation === InstallOperation.Migrate) {
 				this._removeFromDisabledExtensions(local.identifier); /* Reset migrated extensions */
@@ -84,11 +84,11 @@ export class GlobalExtensionEnablementService extends Disposable implements IGlo
 	}
 
 	private _getExtensions(storageId: string): IExtensionIdentifier[] {
-		return this.storageManger.get(storageId, StorageScope.PROFILE);
+		return this.storageManager.get(storageId, StorageScope.PROFILE);
 	}
 
 	private _setExtensions(storageId: string, extensions: IExtensionIdentifier[]): void {
-		this.storageManger.set(storageId, extensions, StorageScope.PROFILE);
+		this.storageManager.set(storageId, extensions, StorageScope.PROFILE);
 	}
 
 }
diff --git a/src/vs/platform/extensionManagement/common/extensionGalleryService.ts b/src/vs/platform/extensionManagement/common/extensionGalleryService.ts
index 5017c3753e6..d866f288667 100644
--- a/src/vs/platform/extensionManagement/common/extensionGalleryService.ts
+++ b/src/vs/platform/extensionManagement/common/extensionGalleryService.ts
@@ -12,7 +12,7 @@ import { isWeb, platform } from 'vs/base/common/platform';
 import { arch } from 'vs/base/common/process';
 import { isBoolean } from 'vs/base/common/types';
 import { URI } from 'vs/base/common/uri';
-import { IHeaders, IRequestContext, IRequestOptions } from 'vs/base/parts/request/common/request';
+import { IHeaders, IRequestContext, IRequestOptions, isOfflineError } from 'vs/base/parts/request/common/request';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { getTargetPlatform, IExtensionGalleryService, IExtensionIdentifier, IExtensionInfo, IGalleryExtension, IGalleryExtensionAsset, IGalleryExtensionAssets, IGalleryExtensionVersion, InstallOperation, IQueryOptions, IExtensionsControlManifest, isNotWebExtensionInWebTargetPlatform, isTargetPlatformCompatible, ITranslation, SortBy, SortOrder, StatisticType, toTargetPlatform, WEB_EXTENSION_TAG, IExtensionQueryOptions, IDeprecationInfo, ISearchPrefferedResults, ExtensionGalleryError, ExtensionGalleryErrorCode, IProductVersion } from 'vs/platform/extensionManagement/common/extensionManagement';
@@ -647,6 +647,36 @@ abstract class AbstractExtensionGalleryService implements IExtensionGalleryServi
 	async getExtensions(extensionInfos: ReadonlyArray<IExtensionInfo>, arg1: any, arg2?: any): Promise<IGalleryExtension[]> {
 		const options = CancellationToken.isCancellationToken(arg1) ? {} : arg1 as IExtensionQueryOptions;
 		const token = CancellationToken.isCancellationToken(arg1) ? arg1 : arg2 as CancellationToken;
+		const result = await this.doGetExtensions(extensionInfos, options, token);
+
+		const uuids = result.map(r => r.identifier.uuid);
+		const extensionInfosByName: IExtensionInfo[] = [];
+		for (const e of extensionInfos) {
+			if (e.uuid && !uuids.includes(e.uuid)) {
+				extensionInfosByName.push({ ...e, uuid: undefined });
+			}
+		}
+
+		if (extensionInfosByName.length) {
+			// report telemetry data for additional query
+			this.telemetryService.publicLog2<
+				{ count: number },
+				{
+					owner: 'sandy081';
+					comment: 'Report the query to the the Marketplace for fetching extensions by name';
+					readonly count: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Number of extensions to fetch' };
+				}>('galleryService:additionalQueryByName', {
+					count: extensionInfosByName.length
+				});
+
+			const extensions = await this.doGetExtensions(extensionInfosByName, options, token);
+			result.push(...extensions);
+		}
+
+		return result;
+	}
+
+	private async doGetExtensions(extensionInfos: ReadonlyArray<IExtensionInfo>, options: IExtensionQueryOptions, token: CancellationToken): Promise<IGalleryExtension[]> {
 		const names: string[] = []; const ids: string[] = [], includePreReleases: (IExtensionIdentifier & { includePreRelease: boolean })[] = [], versions: (IExtensionIdentifier & { version: string })[] = [];
 		let isQueryForReleaseVersionFromPreReleaseVersion = true;
 		for (const extensionInfo of extensionInfos) {
@@ -967,7 +997,7 @@ abstract class AbstractExtensionGalleryService implements IExtensionGalleryServi
 				criteria.productVersion)
 			) {
 				if (criteria.compatible && !this.areApiProposalsCompatible(extensionIdentifier, getEnabledApiProposals(rawGalleryExtensionVersion))) {
-					return null;
+					continue;
 				}
 				return toExtension(rawGalleryExtension, rawGalleryExtensionVersion, allTargetPlatforms, queryContext);
 			}
@@ -1047,7 +1077,11 @@ abstract class AbstractExtensionGalleryService implements IExtensionGalleryServi
 				throw e;
 			} else {
 				const errorMessage = getErrorMessage(e);
-				errorCode = errorMessage.startsWith('XHR timeout') ? ExtensionGalleryErrorCode.Timeout : ExtensionGalleryErrorCode.Failed;
+				errorCode = isOfflineError(e)
+					? ExtensionGalleryErrorCode.Offline
+					: errorMessage.startsWith('XHR timeout')
+						? ExtensionGalleryErrorCode.Timeout
+						: ExtensionGalleryErrorCode.Failed;
 				throw new ExtensionGalleryError(errorMessage, errorCode);
 			}
 		} finally {
diff --git a/src/vs/platform/extensionManagement/common/extensionManagement.ts b/src/vs/platform/extensionManagement/common/extensionManagement.ts
index 1dcc4c79e41..83ed0c519ca 100644
--- a/src/vs/platform/extensionManagement/common/extensionManagement.ts
+++ b/src/vs/platform/extensionManagement/common/extensionManagement.ts
@@ -426,6 +426,7 @@ export const enum ExtensionGalleryErrorCode {
 	Cancelled = 'Cancelled',
 	Failed = 'Failed',
 	DownloadFailedWriting = 'DownloadFailedWriting',
+	Offline = 'Offline',
 }
 
 export class ExtensionGalleryError extends Error {
diff --git a/src/vs/platform/extensionManagement/node/extensionSignatureVerificationService.ts b/src/vs/platform/extensionManagement/node/extensionSignatureVerificationService.ts
index cedabb0c126..30d22f4e709 100644
--- a/src/vs/platform/extensionManagement/node/extensionSignatureVerificationService.ts
+++ b/src/vs/platform/extensionManagement/node/extensionSignatureVerificationService.ts
@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { importAMDNodeModule } from 'vs/amdX';
 import { getErrorMessage } from 'vs/base/common/errors';
 import { IGalleryExtension } from 'vs/platform/extensionManagement/common/extensionManagement';
 import { TargetPlatform } from 'vs/platform/extensions/common/extensions';
@@ -95,19 +96,24 @@ export class ExtensionSignatureVerificationService implements IExtensionSignatur
 
 	private vsceSign(): Promise<typeof vsceSign> {
 		if (!this.moduleLoadingPromise) {
-			this.moduleLoadingPromise = new Promise(
-				(resolve, reject) => require(
-					['@vscode/vsce-sign'],
-					async (obj) => {
-						const instance = <typeof vsceSign>obj;
-
-						return resolve(instance);
-					}, reject));
+			this.moduleLoadingPromise = this.resolveVsceSign();
 		}
 
 		return this.moduleLoadingPromise;
 	}
 
+	private async resolveVsceSign(): Promise<typeof vsceSign> {
+		// ESM-uncomment-begin
+		// if (typeof importAMDNodeModule === 'function') { /* fixes unused import, remove me */}
+		// const mod = '@vscode/vsce-sign';
+		// return import(mod);
+		// ESM-uncomment-end
+
+		// ESM-comment-begin
+		return importAMDNodeModule('@vscode/vsce-sign', 'src/main.js');
+		// ESM-comment-end
+	}
+
 	public async verify(extension: IGalleryExtension, vsixFilePath: string, signatureArchiveFilePath: string, clientTargetPlatform?: TargetPlatform): Promise<boolean> {
 		let module: typeof vsceSign;
 		const extensionId = extension.identifier.id;
diff --git a/src/vs/platform/extensionResourceLoader/common/extensionResourceLoader.ts b/src/vs/platform/extensionResourceLoader/common/extensionResourceLoader.ts
index fedd705385a..fb72a1a643b 100644
--- a/src/vs/platform/extensionResourceLoader/common/extensionResourceLoader.ts
+++ b/src/vs/platform/extensionResourceLoader/common/extensionResourceLoader.ts
@@ -15,7 +15,6 @@ import { getServiceMachineId } from 'vs/platform/externalServices/common/service
 import { IStorageService } from 'vs/platform/storage/common/storage';
 import { TelemetryLevel } from 'vs/platform/telemetry/common/telemetry';
 import { getTelemetryLevel, supportsTelemetry } from 'vs/platform/telemetry/common/telemetryUtils';
-import { RemoteAuthorities } from 'vs/base/common/network';
 import { TargetPlatform } from 'vs/platform/extensions/common/extensions';
 
 const WEB_EXTENSION_RESOURCE_END_POINT_SEGMENT = '/web-extension-resource/';
@@ -98,7 +97,9 @@ export abstract class AbstractExtensionResourceLoaderService implements IExtensi
 					: version,
 				path: 'extension'
 			}));
+			// --- Start PWB ---
 			return this._isWebExtensionResourceEndPoint(uri) ? URI.joinPath(URI.parse(window.location.href), uri.path) : uri;
+			// --- End PWB ---
 		}
 		return undefined;
 	}
@@ -140,9 +141,11 @@ export abstract class AbstractExtensionResourceLoaderService implements IExtensi
 	}
 
 	protected _isWebExtensionResourceEndPoint(uri: URI): boolean {
-		const uriPath = uri.path, serverRootPath = RemoteAuthorities.getServerRootPath();
+		// --- Start PWB: Custom extensions gallery ---
+		const uriPath = uri.path;
 		// test if the path starts with the server root path followed by the web extension resource end point segment
-		return uriPath.startsWith(serverRootPath) && uriPath.startsWith(WEB_EXTENSION_RESOURCE_END_POINT_SEGMENT, serverRootPath.length);
+		return uriPath.startsWith(WEB_EXTENSION_RESOURCE_END_POINT_SEGMENT);
+		// --- End PWB: Custom extensions gallery ---
 	}
 
 }
diff --git a/src/vs/platform/extensions/common/extensionsApiProposals.ts b/src/vs/platform/extensions/common/extensionsApiProposals.ts
index 84470c903ed..863e09f4372 100644
--- a/src/vs/platform/extensions/common/extensionsApiProposals.ts
+++ b/src/vs/platform/extensions/common/extensionsApiProposals.ts
@@ -21,9 +21,6 @@ const _allApiProposals = {
 	attributableCoverage: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.attributableCoverage.d.ts',
 	},
-	authGetSessions: {
-		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.authGetSessions.d.ts',
-	},
 	authLearnMore: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.authLearnMore.d.ts',
 	},
@@ -76,6 +73,9 @@ const _allApiProposals = {
 	contribAccessibilityHelpContent: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribAccessibilityHelpContent.d.ts',
 	},
+	contribChatParticipantDetection: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribChatParticipantDetection.d.ts',
+	},
 	contribCommentEditorActionsMenu: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribCommentEditorActionsMenu.d.ts',
 	},
@@ -88,6 +88,9 @@ const _allApiProposals = {
 	contribCommentsViewThreadMenus: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribCommentsViewThreadMenus.d.ts',
 	},
+	contribDebugCreateConfiguration: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribDebugCreateConfiguration.d.ts',
+	},
 	contribDiffEditorGutterToolBarMenus: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribDiffEditorGutterToolBarMenus.d.ts',
 	},
@@ -130,6 +133,9 @@ const _allApiProposals = {
 	contribSourceControlHistoryItemMenu: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribSourceControlHistoryItemMenu.d.ts',
 	},
+	contribSourceControlHistoryTitleMenu: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribSourceControlHistoryTitleMenu.d.ts',
+	},
 	contribSourceControlInputBoxMenu: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribSourceControlInputBoxMenu.d.ts',
 	},
@@ -139,6 +145,9 @@ const _allApiProposals = {
 	contribStatusBarItems: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribStatusBarItems.d.ts',
 	},
+	contribViewContainerTitle: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribViewContainerTitle.d.ts',
+	},
 	contribViewsRemote: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribViewsRemote.d.ts',
 	},
@@ -240,7 +249,7 @@ const _allApiProposals = {
 	},
 	lmTools: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.lmTools.d.ts',
-		version: 2
+		version: 6
 	},
 	mappedEditsProvider: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.mappedEditsProvider.d.ts',
@@ -278,6 +287,9 @@ const _allApiProposals = {
 	notebookMime: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.notebookMime.d.ts',
 	},
+	notebookReplDocument: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.notebookReplDocument.d.ts',
+	},
 	notebookVariableProvider: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.notebookVariableProvider.d.ts',
 	},
@@ -359,12 +371,6 @@ const _allApiProposals = {
 	terminalSelection: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.terminalSelection.d.ts',
 	},
-	terminalShellIntegration: {
-		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.terminalShellIntegration.d.ts',
-	},
-	testMessageStackTrace: {
-		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.testMessageStackTrace.d.ts',
-	},
 	testObserver: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.testObserver.d.ts',
 	},
diff --git a/src/vs/platform/files/browser/htmlFileSystemProvider.ts b/src/vs/platform/files/browser/htmlFileSystemProvider.ts
index 382bb7a7e6c..f43af830a2d 100644
--- a/src/vs/platform/files/browser/htmlFileSystemProvider.ts
+++ b/src/vs/platform/files/browser/htmlFileSystemProvider.ts
@@ -328,6 +328,9 @@ export class HTMLFileSystemProvider implements IFileSystemProviderWithFileReadWr
 		// Remember in IndexDB for future lookup
 		try {
 			await this.indexedDB?.runInTransaction(this.store, 'readwrite', objectStore => objectStore.put(handle, handleId));
+			// --- Start PWB: Clear browser history
+			this.indexedDB?.pwbAddToSessionSet(IndexedDB.PWB_CHANGED_CONNECTION_KEY);
+			// --- End PWB
 		} catch (error) {
 			this.logService.error(error);
 		}
diff --git a/src/vs/platform/files/browser/indexedDBFileSystemProvider.ts b/src/vs/platform/files/browser/indexedDBFileSystemProvider.ts
index a83c046c715..6b43e5f4bc1 100644
--- a/src/vs/platform/files/browser/indexedDBFileSystemProvider.ts
+++ b/src/vs/platform/files/browser/indexedDBFileSystemProvider.ts
@@ -432,6 +432,9 @@ export class IndexedDBFileSystemProvider extends Disposable implements IFileSyst
 				await this.indexedDB.runInTransaction(this.store, 'readwrite', objectStore => fileBatch.map(entry => {
 					return objectStore.put(entry.content, entry.resource.path);
 				}));
+				// --- Start PWB: Clear browser history
+				this.indexedDB.pwbAddToSessionSet(IndexedDB.PWB_CHANGED_CONNECTION_KEY);
+				// -- End PWB
 			} catch (ex) {
 				if (ex instanceof DOMException && ex.name === 'QuotaExceededError') {
 					throw ERR_FILE_EXCEEDS_STORAGE_QUOTA;
@@ -445,11 +448,17 @@ export class IndexedDBFileSystemProvider extends Disposable implements IFileSyst
 	private async deleteKeys(keys: string[]): Promise<void> {
 		if (keys.length) {
 			await this.indexedDB.runInTransaction(this.store, 'readwrite', objectStore => keys.map(key => objectStore.delete(key)));
+			// --- Start PWB: Clear browser history
+			this.indexedDB.pwbAddToSessionSet(IndexedDB.PWB_CHANGED_CONNECTION_KEY);
+			// --- End PWB
 		}
 	}
 
 	async reset(): Promise<void> {
 		await this.indexedDB.runInTransaction(this.store, 'readwrite', objectStore => objectStore.clear());
+		// --- Start PWB: Clear browser history
+		this.indexedDB.pwbAddToSessionSet(IndexedDB.PWB_CHANGED_CONNECTION_KEY);
+		// --- End PWB
 	}
 
 	private reportError(operation: string, error: Error): void {
diff --git a/src/vs/platform/files/node/diskFileSystemProviderServer.ts b/src/vs/platform/files/node/diskFileSystemProviderServer.ts
index a6407715b10..fe86f671567 100644
--- a/src/vs/platform/files/node/diskFileSystemProviderServer.ts
+++ b/src/vs/platform/files/node/diskFileSystemProviderServer.ts
@@ -92,6 +92,9 @@ export abstract class AbstractDiskFileSystemProviderChannel<T> extends Disposabl
 
 	private async readFile(uriTransformer: IURITransformer, _resource: UriComponents, opts?: IFileAtomicReadOptions): Promise<VSBuffer> {
 		const resource = this.transformIncoming(uriTransformer, _resource, true);
+		// --- Start PWB: disable file downloads ---
+		this.logService.trace(`File action: readFile ${resource.path}`);
+		// --- End PWB ---
 		const buffer = await this.provider.readFile(resource, opts);
 
 		return VSBuffer.wrap(buffer);
@@ -110,6 +113,9 @@ export abstract class AbstractDiskFileSystemProviderChannel<T> extends Disposabl
 			}
 		});
 
+		// --- Start PWB: disable file downloads ---
+		this.logService.trace(`File action: readFileStream ${resource.path}`);
+		// --- End PWB ---
 		const fileStream = this.provider.readFileStream(resource, opts, cts.token);
 		listenStream(fileStream, {
 			onData: chunk => emitter.fire(VSBuffer.wrap(chunk)),
@@ -131,6 +137,9 @@ export abstract class AbstractDiskFileSystemProviderChannel<T> extends Disposabl
 	private writeFile(uriTransformer: IURITransformer, _resource: UriComponents, content: VSBuffer, opts: IFileWriteOptions): Promise<void> {
 		const resource = this.transformIncoming(uriTransformer, _resource);
 
+		// --- Start PWB: disable file downloads ---
+		this.logService.trace(`File action: writeFile ${resource.path}`);
+		// --- End PWB ---
 		return this.provider.writeFile(resource, content.buffer, opts);
 	}
 
diff --git a/src/vs/platform/issue/electron-main/issueMainService.ts b/src/vs/platform/issue/electron-main/issueMainService.ts
index 2b42d690c91..cb73c2202fa 100644
--- a/src/vs/platform/issue/electron-main/issueMainService.ts
+++ b/src/vs/platform/issue/electron-main/issueMainService.ts
@@ -11,7 +11,7 @@ import { DisposableStore } from 'vs/base/common/lifecycle';
 import { FileAccess } from 'vs/base/common/network';
 import { IProcessEnvironment, isMacintosh } from 'vs/base/common/platform';
 import { validatedIpcMain } from 'vs/base/parts/ipc/electron-main/ipcMain';
-import { localize } from 'vs/nls';
+import { getNLSLanguage, getNLSMessages, localize } from 'vs/nls';
 import { IDialogMainService } from 'vs/platform/dialogs/electron-main/dialogMainService';
 import { IEnvironmentMainService } from 'vs/platform/environment/electron-main/environmentMainService';
 import { IIssueMainService, OldIssueReporterData, OldIssueReporterWindowConfiguration } from 'vs/platform/issue/common/issue';
@@ -22,6 +22,8 @@ import { IIPCObjectUrl, IProtocolMainService } from 'vs/platform/protocol/electr
 import { zoomLevelToZoomFactor } from 'vs/platform/window/common/window';
 import { ICodeWindow, IWindowState } from 'vs/platform/window/electron-main/window';
 import { IWindowsMainService } from 'vs/platform/windows/electron-main/windows';
+import { isESM } from 'vs/base/common/amd';
+import { ICSSDevelopmentService } from 'vs/platform/cssDev/node/cssDevService';
 
 interface IBrowserWindowOptions {
 	backgroundColor: string | undefined;
@@ -49,6 +51,7 @@ export class IssueMainService implements IIssueMainService {
 		@INativeHostMainService private readonly nativeHostMainService: INativeHostMainService,
 		@IProtocolMainService private readonly protocolMainService: IProtocolMainService,
 		@IWindowsMainService private readonly windowsMainService: IWindowsMainService,
+		@ICSSDevelopmentService private readonly cssDevelopmentService: ICSSDevelopmentService,
 	) { }
 
 	//#region Used by renderer
@@ -83,14 +86,14 @@ export class IssueMainService implements IIssueMainService {
 					},
 					product,
 					nls: {
-						// VSCODE_GLOBALS: NLS
-						messages: globalThis._VSCODE_NLS_MESSAGES,
-						language: globalThis._VSCODE_NLS_LANGUAGE
-					}
+						messages: getNLSMessages(),
+						language: getNLSLanguage()
+					},
+					cssModules: this.cssDevelopmentService.isEnabled ? await this.cssDevelopmentService.getCssModules() : undefined
 				});
 
 				this.issueReporterWindow.loadURL(
-					FileAccess.asBrowserUri(`vs/workbench/contrib/issue/electron-sandbox/issueReporter${this.environmentMainService.isBuilt ? '' : '-dev'}.html`).toString(true)
+					FileAccess.asBrowserUri(`vs/workbench/contrib/issue/electron-sandbox/issueReporter${this.environmentMainService.isBuilt ? '' : '-dev'}.${isESM ? 'esm.' : ''}html`).toString(true)
 				);
 
 				this.issueReporterWindow.on('close', () => {
diff --git a/src/vs/platform/issue/electron-main/processMainService.ts b/src/vs/platform/issue/electron-main/processMainService.ts
index 76da45d897c..52e72f3536d 100644
--- a/src/vs/platform/issue/electron-main/processMainService.ts
+++ b/src/vs/platform/issue/electron-main/processMainService.ts
@@ -10,11 +10,12 @@ import { FileAccess } from 'vs/base/common/network';
 import { IProcessEnvironment, isMacintosh } from 'vs/base/common/platform';
 import { listProcesses } from 'vs/base/node/ps';
 import { validatedIpcMain } from 'vs/base/parts/ipc/electron-main/ipcMain';
-import { localize } from 'vs/nls';
+import { getNLSLanguage, getNLSMessages, localize } from 'vs/nls';
 import { IDiagnosticsService, isRemoteDiagnosticError, PerformanceInfo, SystemInfo } from 'vs/platform/diagnostics/common/diagnostics';
 import { IDiagnosticsMainService } from 'vs/platform/diagnostics/electron-main/diagnosticsMainService';
 import { IDialogMainService } from 'vs/platform/dialogs/electron-main/dialogMainService';
 import { IEnvironmentMainService } from 'vs/platform/environment/electron-main/environmentMainService';
+import { ICSSDevelopmentService } from 'vs/platform/cssDev/node/cssDevService';
 import { IProcessMainService, ProcessExplorerData, ProcessExplorerWindowConfiguration } from 'vs/platform/issue/common/issue';
 import { ILogService } from 'vs/platform/log/common/log';
 import { INativeHostMainService } from 'vs/platform/native/electron-main/nativeHostMainService';
@@ -25,6 +26,7 @@ import { IStateService } from 'vs/platform/state/node/state';
 import { UtilityProcess } from 'vs/platform/utilityProcess/electron-main/utilityProcess';
 import { zoomLevelToZoomFactor } from 'vs/platform/window/common/window';
 import { IWindowState } from 'vs/platform/window/electron-main/window';
+import { isESM } from 'vs/base/common/amd';
 
 const processExplorerWindowState = 'issue.processExplorerWindowState';
 
@@ -57,6 +59,7 @@ export class ProcessMainService implements IProcessMainService {
 		@IProtocolMainService private readonly protocolMainService: IProtocolMainService,
 		@IProductService private readonly productService: IProductService,
 		@IStateService private readonly stateService: IStateService,
+		@ICSSDevelopmentService private readonly cssDevelopmentService: ICSSDevelopmentService
 	) {
 		this.registerListeners();
 	}
@@ -155,14 +158,14 @@ export class ProcessMainService implements IProcessMainService {
 					data,
 					product,
 					nls: {
-						// VSCODE_GLOBALS: NLS
-						messages: globalThis._VSCODE_NLS_MESSAGES,
-						language: globalThis._VSCODE_NLS_LANGUAGE
-					}
+						messages: getNLSMessages(),
+						language: getNLSLanguage()
+					},
+					cssModules: this.cssDevelopmentService.isEnabled ? await this.cssDevelopmentService.getCssModules() : undefined
 				});
 
 				this.processExplorerWindow.loadURL(
-					FileAccess.asBrowserUri(`vs/code/electron-sandbox/processExplorer/processExplorer${this.environmentMainService.isBuilt ? '' : '-dev'}.html`).toString(true)
+					FileAccess.asBrowserUri(`vs/code/electron-sandbox/processExplorer/processExplorer${this.environmentMainService.isBuilt ? '' : '-dev'}.${isESM ? 'esm.' : ''}html`).toString(true)
 				);
 
 				this.processExplorerWindow.on('close', () => {
diff --git a/src/vs/platform/markers/common/markerService.ts b/src/vs/platform/markers/common/markerService.ts
index 692f6ba5cb7..91120aab5b6 100644
--- a/src/vs/platform/markers/common/markerService.ts
+++ b/src/vs/platform/markers/common/markerService.ts
@@ -18,7 +18,6 @@ export const unsupportedSchemas = new Set([
 	Schemas.walkThrough,
 	Schemas.walkThroughSnippet,
 	Schemas.vscodeChatCodeBlock,
-	Schemas.vscodeCopilotBackingChatCodeBlock,
 ]);
 
 class DoubleResourceMap<V> {
diff --git a/src/vs/platform/native/common/native.ts b/src/vs/platform/native/common/native.ts
index bb9f759a244..2ccef65c526 100644
--- a/src/vs/platform/native/common/native.ts
+++ b/src/vs/platform/native/common/native.ts
@@ -6,7 +6,7 @@
 import { VSBuffer } from 'vs/base/common/buffer';
 import { Event } from 'vs/base/common/event';
 import { URI } from 'vs/base/common/uri';
-import { MessageBoxOptions, MessageBoxReturnValue, OpenDevToolsOptions, OpenDialogOptions, OpenDialogReturnValue, SaveDialogOptions, SaveDialogReturnValue } from 'vs/base/parts/sandbox/common/electronTypes';
+import { MessageBoxOptions, MessageBoxReturnValue, OpenDialogOptions, OpenDialogReturnValue, SaveDialogOptions, SaveDialogReturnValue } from 'vs/base/parts/sandbox/common/electronTypes';
 import { ISerializableCommandAction } from 'vs/platform/action/common/action';
 import { INativeOpenDialogOptions } from 'vs/platform/dialogs/common/dialogs';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
@@ -74,6 +74,7 @@ export interface ICommonNativeHostService {
 	getWindows(options: { includeAuxiliaryWindows: false }): Promise<Array<IOpenedMainWindow>>;
 	getWindowCount(): Promise<number>;
 	getActiveWindowId(): Promise<number | undefined>;
+	getActiveWindowPosition(): Promise<IRectangle | undefined>;
 
 	openWindow(options?: IOpenEmptyWindowOptions): Promise<void>;
 	openWindow(toOpen: IWindowOpenable[], options?: IOpenWindowOptions): Promise<void>;
@@ -181,7 +182,7 @@ export interface ICommonNativeHostService {
 	exit(code: number): Promise<void>;
 
 	// Development
-	openDevTools(options?: Partial<OpenDevToolsOptions> & INativeHostOptions): Promise<void>;
+	openDevTools(options?: INativeHostOptions): Promise<void>;
 	toggleDevTools(options?: INativeHostOptions): Promise<void>;
 
 	// Perf Introspection
diff --git a/src/vs/platform/native/electron-main/nativeHostMainService.ts b/src/vs/platform/native/electron-main/nativeHostMainService.ts
index 4f812775773..d0853ebbead 100644
--- a/src/vs/platform/native/electron-main/nativeHostMainService.ts
+++ b/src/vs/platform/native/electron-main/nativeHostMainService.ts
@@ -5,7 +5,7 @@
 
 import * as fs from 'fs';
 import { exec } from 'child_process';
-import { app, BrowserWindow, clipboard, Display, Menu, MessageBoxOptions, MessageBoxReturnValue, OpenDevToolsOptions, OpenDialogOptions, OpenDialogReturnValue, powerMonitor, SaveDialogOptions, SaveDialogReturnValue, screen, shell, webContents } from 'electron';
+import { app, BrowserWindow, clipboard, Display, Menu, MessageBoxOptions, MessageBoxReturnValue, OpenDialogOptions, OpenDialogReturnValue, powerMonitor, SaveDialogOptions, SaveDialogReturnValue, screen, shell, webContents } from 'electron';
 import { arch, cpus, freemem, loadavg, platform, release, totalmem, type } from 'os';
 import { promisify } from 'util';
 import { memoize } from 'vs/base/common/decorators';
@@ -33,7 +33,7 @@ import { IProductService } from 'vs/platform/product/common/productService';
 import { IPartsSplash } from 'vs/platform/theme/common/themeService';
 import { IThemeMainService } from 'vs/platform/theme/electron-main/themeMainService';
 import { ICodeWindow } from 'vs/platform/window/electron-main/window';
-import { IColorScheme, IOpenedAuxiliaryWindow, IOpenedMainWindow, IOpenEmptyWindowOptions, IOpenWindowOptions, IPoint, IRectangle, IWindowOpenable } from 'vs/platform/window/common/window';
+import { IColorScheme, IOpenedAuxiliaryWindow, IOpenedMainWindow, IOpenEmptyWindowOptions, IOpenWindowOptions, IPoint, IRectangle, IWindowOpenable, useWindowControlsOverlay } from 'vs/platform/window/common/window';
 import { IWindowsMainService, OpenContext } from 'vs/platform/windows/electron-main/windows';
 import { isWorkspaceIdentifier, toWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
 import { IWorkspacesManagementMainService } from 'vs/platform/workspaces/electron-main/workspacesManagementMainService';
@@ -184,6 +184,14 @@ export class NativeHostMainService extends Disposable implements INativeHostMain
 		return undefined;
 	}
 
+	async getActiveWindowPosition(): Promise<IRectangle | undefined> {
+		const activeWindow = this.windowsMainService.getFocusedWindow() || this.windowsMainService.getLastActiveWindow();
+		if (activeWindow) {
+			return activeWindow.getBounds();
+		}
+		return undefined;
+	}
+
 	openWindow(windowId: number | undefined, options?: IOpenEmptyWindowOptions): Promise<void>;
 	openWindow(windowId: number | undefined, toOpen: IWindowOpenable[], options?: IOpenWindowOptions): Promise<void>;
 	openWindow(windowId: number | undefined, arg1?: IOpenEmptyWindowOptions | IWindowOpenable[], arg2?: IOpenWindowOptions): Promise<void> {
@@ -512,7 +520,7 @@ export class NativeHostMainService extends Disposable implements INativeHostMain
 		return true;
 	}
 
-	private async openExternalBrowser(url: string, defaultApplication?: string) {
+	private async openExternalBrowser(url: string, defaultApplication?: string): Promise<void> {
 		const configuredBrowser = defaultApplication ?? this.configurationService.getValue<string>('workbench.externalBrowser');
 		if (!configuredBrowser) {
 			return shell.openExternal(url);
@@ -528,7 +536,7 @@ export class NativeHostMainService extends Disposable implements INativeHostMain
 
 		try {
 			const { default: open } = await import('open');
-			await open(url, {
+			const res = await open(url, {
 				app: {
 					// Use `open.apps` helper to allow cross-platform browser
 					// aliases to be looked up properly. Fallback to the
@@ -536,6 +544,11 @@ export class NativeHostMainService extends Disposable implements INativeHostMain
 					name: Object.hasOwn(open.apps, configuredBrowser) ? open.apps[(configuredBrowser as keyof typeof open['apps'])] : configuredBrowser
 				}
 			});
+
+			res.stderr?.once('data', (data: Buffer) => {
+				this.logService.error(`Error openening external URL '${url}' using browser '${configuredBrowser}': ${data.toString()}`);
+				return shell.openExternal(url);
+			});
 		} catch (error) {
 			this.logService.error(`Unable to open external URL '${url}' using browser '${configuredBrowser}' due to ${error}.`);
 			return shell.openExternal(url);
@@ -853,14 +866,28 @@ export class NativeHostMainService extends Disposable implements INativeHostMain
 
 	//#region Development
 
-	async openDevTools(windowId: number | undefined, options?: Partial<OpenDevToolsOptions> & INativeHostOptions): Promise<void> {
+	async openDevTools(windowId: number | undefined, options?: INativeHostOptions): Promise<void> {
 		const window = this.windowById(options?.targetWindowId, windowId);
-		window?.win?.webContents.openDevTools(options?.mode ? { mode: options.mode, activate: options.activate } : undefined);
+
+		let mode: 'bottom' | undefined = undefined;
+		if (isLinux && useWindowControlsOverlay(this.configurationService)) {
+			mode = 'bottom'; // TODO@bpasero WCO and devtools collide with default option 'right'
+		}
+		window?.win?.webContents.openDevTools(mode ? { mode } : undefined);
 	}
 
 	async toggleDevTools(windowId: number | undefined, options?: INativeHostOptions): Promise<void> {
 		const window = this.windowById(options?.targetWindowId, windowId);
-		window?.win?.webContents.toggleDevTools();
+		const webContents = window?.win?.webContents;
+		if (!webContents) {
+			return;
+		}
+
+		if (isLinux && useWindowControlsOverlay(this.configurationService) && !webContents.isDevToolsOpened()) {
+			webContents.openDevTools({ mode: 'bottom' }); // TODO@bpasero WCO and devtools collide with default option 'right'
+		} else {
+			webContents.toggleDevTools();
+		}
 	}
 
 	//#endregion
diff --git a/src/vs/platform/product/common/product.ts b/src/vs/platform/product/common/product.ts
index fc979c9865b..81f9927a994 100644
--- a/src/vs/platform/product/common/product.ts
+++ b/src/vs/platform/product/common/product.ts
@@ -47,6 +47,14 @@ else if (globalThis._VSCODE_PRODUCT_JSON && globalThis._VSCODE_PACKAGE_JSON) {
 			version: pkg.version
 		});
 	}
+
+	// --- Start PWB: Custom extensions gallery
+	if (env['EXTENSIONS_GALLERY']) {
+		Object.assign(product, {
+			extensionsGallery: JSON.parse(env['EXTENSIONS_GALLERY'])
+		});
+	}
+	// --- End PWB: Custom extensions gallery
 }
 
 // Web environment or unknown
diff --git a/src/vs/platform/profiling/electron-sandbox/profileAnalysisWorker.esm.ts b/src/vs/platform/profiling/electron-sandbox/profileAnalysisWorker.esm.ts
new file mode 100644
index 00000000000..4329929cd9c
--- /dev/null
+++ b/src/vs/platform/profiling/electron-sandbox/profileAnalysisWorker.esm.ts
@@ -0,0 +1,9 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { create } from './profileAnalysisWorker';
+import { bootstrapSimpleWorker } from 'vs/base/common/worker/simpleWorkerBootstrap';
+
+bootstrapSimpleWorker(create);
diff --git a/src/vs/platform/profiling/electron-sandbox/profileAnalysisWorker.ts b/src/vs/platform/profiling/electron-sandbox/profileAnalysisWorker.ts
index 14d6a473c09..4d04422e391 100644
--- a/src/vs/platform/profiling/electron-sandbox/profileAnalysisWorker.ts
+++ b/src/vs/platform/profiling/electron-sandbox/profileAnalysisWorker.ts
@@ -6,12 +6,16 @@
 import { basename } from 'vs/base/common/path';
 import { TernarySearchTree } from 'vs/base/common/ternarySearchTree';
 import { URI } from 'vs/base/common/uri';
-import { IRequestHandler } from 'vs/base/common/worker/simpleWorker';
+import { IRequestHandler, IWorkerServer } from 'vs/base/common/worker/simpleWorker';
 import { IV8Profile, Utils } from 'vs/platform/profiling/common/profiling';
 import { IProfileModel, BottomUpSample, buildModel, BottomUpNode, processNode, CdpCallFrame } from 'vs/platform/profiling/common/profilingModel';
 import { BottomUpAnalysis, IProfileAnalysisWorker, ProfilingOutput } from 'vs/platform/profiling/electron-sandbox/profileAnalysisWorkerService';
 
-export function create(): IRequestHandler {
+/**
+ * Defines the worker entry point. Must be exported and named `create`.
+ * @skipMangle
+ */
+export function create(workerServer: IWorkerServer): IRequestHandler {
 	return new ProfileAnalysisWorker();
 }
 
@@ -19,7 +23,7 @@ class ProfileAnalysisWorker implements IRequestHandler, IProfileAnalysisWorker {
 
 	_requestHandlerBrand: any;
 
-	analyseBottomUp(profile: IV8Profile): BottomUpAnalysis {
+	$analyseBottomUp(profile: IV8Profile): BottomUpAnalysis {
 		if (!Utils.isValidProfile(profile)) {
 			return { kind: ProfilingOutput.Irrelevant, samples: [] };
 		}
@@ -37,7 +41,7 @@ class ProfileAnalysisWorker implements IRequestHandler, IProfileAnalysisWorker {
 		return { kind: ProfilingOutput.Interesting, samples };
 	}
 
-	analyseByUrlCategory(profile: IV8Profile, categories: [url: URI, category: string][]): [category: string, aggregated: number][] {
+	$analyseByUrlCategory(profile: IV8Profile, categories: [url: URI, category: string][]): [category: string, aggregated: number][] {
 
 		// build search tree
 		const searchTree = TernarySearchTree.forUris<string>();
diff --git a/src/vs/platform/profiling/electron-sandbox/profileAnalysisWorkerService.ts b/src/vs/platform/profiling/electron-sandbox/profileAnalysisWorkerService.ts
index ad6a25cd679..433200a8b00 100644
--- a/src/vs/platform/profiling/electron-sandbox/profileAnalysisWorkerService.ts
+++ b/src/vs/platform/profiling/electron-sandbox/profileAnalysisWorkerService.ts
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 
-import { DefaultWorkerFactory } from 'vs/base/browser/defaultWorkerFactory';
+import { createWebWorker } from 'vs/base/browser/defaultWorkerFactory';
 import { URI } from 'vs/base/common/uri';
-import { SimpleWorkerClient } from 'vs/base/common/worker/simpleWorker';
+import { Proxied } from 'vs/base/common/worker/simpleWorker';
 import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { ILogService } from 'vs/platform/log/common/log';
@@ -15,7 +15,6 @@ import { BottomUpSample } from 'vs/platform/profiling/common/profilingModel';
 import { reportSample } from 'vs/platform/profiling/common/profilingTelemetrySpec';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 
-
 export const enum ProfilingOutput {
 	Failure,
 	Irrelevant,
@@ -41,8 +40,6 @@ class ProfileAnalysisWorkerService implements IProfileAnalysisWorkerService {
 
 	declare _serviceBrand: undefined;
 
-	private readonly _workerFactory = new DefaultWorkerFactory('CpuProfileAnalysis');
-
 	constructor(
 		@ITelemetryService private readonly _telemetryService: ITelemetryService,
 		@ILogService private readonly _logService: ILogService,
@@ -50,14 +47,13 @@ class ProfileAnalysisWorkerService implements IProfileAnalysisWorkerService {
 
 	private async _withWorker<R>(callback: (worker: Proxied<IProfileAnalysisWorker>) => Promise<R>): Promise<R> {
 
-		const worker = new SimpleWorkerClient<Proxied<IProfileAnalysisWorker>, {}>(
-			this._workerFactory,
+		const worker = createWebWorker<IProfileAnalysisWorker>(
 			'vs/platform/profiling/electron-sandbox/profileAnalysisWorker',
-			{ /* host */ }
+			'CpuProfileAnalysisWorker'
 		);
 
 		try {
-			const r = await callback(await worker.getProxyObject());
+			const r = await callback(worker.proxy);
 			return r;
 		} finally {
 			worker.dispose();
@@ -66,7 +62,7 @@ class ProfileAnalysisWorkerService implements IProfileAnalysisWorkerService {
 
 	async analyseBottomUp(profile: IV8Profile, callFrameClassifier: IScriptUrlClassifier, perfBaseline: number, sendAsErrorTelemtry: boolean): Promise<ProfilingOutput> {
 		return this._withWorker(async worker => {
-			const result = await worker.analyseBottomUp(profile);
+			const result = await worker.$analyseBottomUp(profile);
 			if (result.kind === ProfilingOutput.Interesting) {
 				for (const sample of result.samples) {
 					reportSample({
@@ -82,7 +78,7 @@ class ProfileAnalysisWorkerService implements IProfileAnalysisWorkerService {
 
 	async analyseByLocation(profile: IV8Profile, locations: [location: URI, id: string][]): Promise<[category: string, aggregated: number][]> {
 		return this._withWorker(async worker => {
-			const result = await worker.analyseByUrlCategory(profile, locations);
+			const result = await worker.$analyseByUrlCategory(profile, locations);
 			return result;
 		});
 	}
@@ -103,15 +99,8 @@ export interface CategoryAnalysis {
 }
 
 export interface IProfileAnalysisWorker {
-	analyseBottomUp(profile: IV8Profile): BottomUpAnalysis;
-	analyseByUrlCategory(profile: IV8Profile, categories: [url: URI, category: string][]): [category: string, aggregated: number][];
+	$analyseBottomUp(profile: IV8Profile): BottomUpAnalysis;
+	$analyseByUrlCategory(profile: IV8Profile, categories: [url: URI, category: string][]): [category: string, aggregated: number][];
 }
 
-// TODO@jrieken move into worker logic
-type Proxied<T> = { [K in keyof T]: T[K] extends (...args: infer A) => infer R
-	? (...args: A) => Promise<Awaited<R>>
-	: never
-};
-
-
 registerSingleton(IProfileAnalysisWorkerService, ProfileAnalysisWorkerService, InstantiationType.Delayed);
diff --git a/src/vs/platform/protocol/electron-main/protocolMainService.ts b/src/vs/platform/protocol/electron-main/protocolMainService.ts
index 8b6fd7b5868..4dcb1bcaf7f 100644
--- a/src/vs/platform/protocol/electron-main/protocolMainService.ts
+++ b/src/vs/platform/protocol/electron-main/protocolMainService.ts
@@ -96,7 +96,8 @@ export class ProtocolMainService extends Disposable implements IProtocolMainServ
 
 		let headers: Record<string, string> | undefined;
 		if (this.environmentService.crossOriginIsolated) {
-			if (basename(path) === 'workbench.html' || basename(path) === 'workbench-dev.html') {
+			const pathBasename = basename(path);
+			if (pathBasename === 'workbench.html' || pathBasename === 'workbench-dev.html' || pathBasename === 'workbench.esm.html' || pathBasename === 'workbench-dev.esm.html') {
 				headers = COI.CoopAndCoep;
 			} else {
 				headers = COI.getHeadersFromQuery(request.url);
diff --git a/src/vs/platform/quickinput/browser/helpQuickAccess.ts b/src/vs/platform/quickinput/browser/helpQuickAccess.ts
index 0346fc0b856..0a93158786c 100644
--- a/src/vs/platform/quickinput/browser/helpQuickAccess.ts
+++ b/src/vs/platform/quickinput/browser/helpQuickAccess.ts
@@ -25,7 +25,7 @@ export class HelpQuickAccessProvider implements IQuickAccessProvider {
 		@IKeybindingService private readonly keybindingService: IKeybindingService
 	) { }
 
-	provide(picker: IQuickPick<IHelpQuickAccessPickItem>): IDisposable {
+	provide(picker: IQuickPick<IHelpQuickAccessPickItem, { useSeparators: true }>): IDisposable {
 		const disposables = new DisposableStore();
 
 		// Open a picker with the selected value if picked
diff --git a/src/vs/platform/quickinput/browser/pickerQuickAccess.ts b/src/vs/platform/quickinput/browser/pickerQuickAccess.ts
index 0613c557abc..eded3510549 100644
--- a/src/vs/platform/quickinput/browser/pickerQuickAccess.ts
+++ b/src/vs/platform/quickinput/browser/pickerQuickAccess.ts
@@ -133,7 +133,7 @@ export abstract class PickerQuickAccessProvider<T extends IPickerQuickAccessItem
 		super();
 	}
 
-	provide(picker: IQuickPick<T>, token: CancellationToken, runOptions?: IQuickAccessProviderRunOptions): IDisposable {
+	provide(picker: IQuickPick<T, { useSeparators: true }>, token: CancellationToken, runOptions?: IQuickAccessProviderRunOptions): IDisposable {
 		const disposables = new DisposableStore();
 
 		// Apply options if any
diff --git a/src/vs/platform/quickinput/browser/quickAccess.ts b/src/vs/platform/quickinput/browser/quickAccess.ts
index 7cccc352393..b66289c83c2 100644
--- a/src/vs/platform/quickinput/browser/quickAccess.ts
+++ b/src/vs/platform/quickinput/browser/quickAccess.ts
@@ -20,7 +20,7 @@ export class QuickAccessController extends Disposable implements IQuickAccessCon
 	private readonly lastAcceptedPickerValues = new Map<IQuickAccessProviderDescriptor, string>();
 
 	private visibleQuickAccess: {
-		readonly picker: IQuickPick<IQuickPickItem>;
+		readonly picker: IQuickPick<IQuickPickItem, { useSeparators: true }>;
 		readonly descriptor: IQuickAccessProviderDescriptor | undefined;
 		readonly value: string;
 	} | undefined = undefined;
@@ -99,7 +99,7 @@ export class QuickAccessController extends Disposable implements IQuickAccessCon
 		// Create a picker for the provider to use with the initial value
 		// and adjust the filtering to exclude the prefix from filtering
 		const disposables = new DisposableStore();
-		const picker = disposables.add(this.quickInputService.createQuickPick());
+		const picker = disposables.add(this.quickInputService.createQuickPick({ useSeparators: true }));
 		picker.value = value;
 		this.adjustValueSelection(picker, descriptor, options);
 		picker.placeholder = options?.placeholder ?? descriptor?.placeholder;
@@ -163,7 +163,7 @@ export class QuickAccessController extends Disposable implements IQuickAccessCon
 		}
 	}
 
-	private adjustValueSelection(picker: IQuickPick<IQuickPickItem>, descriptor?: IQuickAccessProviderDescriptor, options?: IQuickAccessOptions): void {
+	private adjustValueSelection(picker: IQuickPick<IQuickPickItem, { useSeparators: true }>, descriptor?: IQuickAccessProviderDescriptor, options?: IQuickAccessOptions): void {
 		let valueSelection: [number, number];
 
 		// Preserve: just always put the cursor at the end
@@ -180,7 +180,7 @@ export class QuickAccessController extends Disposable implements IQuickAccessCon
 	}
 
 	private registerPickerListeners(
-		picker: IQuickPick<IQuickPickItem>,
+		picker: IQuickPick<IQuickPickItem, { useSeparators: true }>,
 		provider: IQuickAccessProvider | undefined,
 		descriptor: IQuickAccessProviderDescriptor | undefined,
 		value: string,
diff --git a/src/vs/platform/quickinput/browser/quickInput.ts b/src/vs/platform/quickinput/browser/quickInput.ts
index 0939ed229d8..afc73c9ec35 100644
--- a/src/vs/platform/quickinput/browser/quickInput.ts
+++ b/src/vs/platform/quickinput/browser/quickInput.ts
@@ -25,13 +25,12 @@ import Severity from 'vs/base/common/severity';
 import { ThemeIcon } from 'vs/base/common/themables';
 import 'vs/css!./media/quickInput';
 import { localize } from 'vs/nls';
-import { IInputBox, IKeyMods, IQuickInput, IQuickInputButton, IQuickInputHideEvent, IQuickInputToggle, IQuickNavigateConfiguration, IQuickPick, IQuickPickDidAcceptEvent, IQuickPickItem, IQuickPickItemButtonEvent, IQuickPickSeparator, IQuickPickSeparatorButtonEvent, IQuickPickWillAcceptEvent, IQuickWidget, ItemActivation, NO_KEY_MODS, QuickInputButtonLocation, QuickInputHideReason, QuickInputType } from 'vs/platform/quickinput/common/quickInput';
+import { IInputBox, IKeyMods, IQuickInput, IQuickInputButton, IQuickInputHideEvent, IQuickInputToggle, IQuickNavigateConfiguration, IQuickPick, IQuickPickDidAcceptEvent, IQuickPickItem, IQuickPickItemButtonEvent, IQuickPickSeparator, IQuickPickSeparatorButtonEvent, IQuickPickWillAcceptEvent, IQuickWidget, ItemActivation, NO_KEY_MODS, QuickInputButtonLocation, QuickInputHideReason, QuickInputType, QuickPickFocus } from 'vs/platform/quickinput/common/quickInput';
 import { QuickInputBox } from './quickInputBox';
 import { quickInputButtonToAction, renderQuickInputDescription } from './quickInputUtils';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IHoverService, WorkbenchHoverDelegate } from 'vs/platform/hover/browser/hover';
 import { QuickInputTree } from 'vs/platform/quickinput/browser/quickInputTree';
-import { QuickPickFocus } from '../common/quickInput';
 import type { IHoverOptions } from 'vs/base/browser/ui/hover/hover';
 import { ContextKeyExpr, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
 
@@ -528,7 +527,7 @@ abstract class QuickInput extends Disposable implements IQuickInput {
 	}
 }
 
-export class QuickPick<T extends IQuickPickItem> extends QuickInput implements IQuickPick<T> {
+export class QuickPick<T extends IQuickPickItem, O extends { useSeparators: boolean } = { useSeparators: false }> extends QuickInput implements IQuickPick<T, O> {
 
 	private static readonly DEFAULT_ARIA_LABEL = localize('quickInputBox.ariaLabel', "Type to narrow down results.");
 
@@ -539,7 +538,7 @@ export class QuickPick<T extends IQuickPickItem> extends QuickInput implements I
 	private readonly onWillAcceptEmitter = this._register(new Emitter<IQuickPickWillAcceptEvent>());
 	private readonly onDidAcceptEmitter = this._register(new Emitter<IQuickPickDidAcceptEvent>());
 	private readonly onDidCustomEmitter = this._register(new Emitter<void>());
-	private _items: Array<T | IQuickPickSeparator> = [];
+	private _items: O extends { useSeparators: true } ? Array<T | IQuickPickSeparator> : Array<T> = [];
 	private itemsUpdated = false;
 	private _canSelectMany = false;
 	private _canAcceptInBackground = false;
@@ -646,7 +645,7 @@ export class QuickPick<T extends IQuickPickItem> extends QuickInput implements I
 		this.ui.list.scrollTop = scrollTop;
 	}
 
-	set items(items: Array<T | IQuickPickSeparator>) {
+	set items(items: O extends { useSeparators: true } ? Array<T | IQuickPickSeparator> : Array<T>) {
 		this._items = items;
 		this.itemsUpdated = true;
 		this.update();
diff --git a/src/vs/platform/quickinput/browser/quickInputController.ts b/src/vs/platform/quickinput/browser/quickInputController.ts
index 801c800f1eb..8941fb5b1ce 100644
--- a/src/vs/platform/quickinput/browser/quickInputController.ts
+++ b/src/vs/platform/quickinput/browser/quickInputController.ts
@@ -16,14 +16,13 @@ import { Disposable, DisposableStore, dispose } from 'vs/base/common/lifecycle';
 import Severity from 'vs/base/common/severity';
 import { isString } from 'vs/base/common/types';
 import { localize } from 'vs/nls';
-import { IInputBox, IInputOptions, IKeyMods, IPickOptions, IQuickInput, IQuickInputButton, IQuickNavigateConfiguration, IQuickPick, IQuickPickItem, IQuickWidget, QuickInputHideReason, QuickPickInput } from 'vs/platform/quickinput/common/quickInput';
+import { IInputBox, IInputOptions, IKeyMods, IPickOptions, IQuickInput, IQuickInputButton, IQuickNavigateConfiguration, IQuickPick, IQuickPickItem, IQuickWidget, QuickInputHideReason, QuickPickInput, QuickPickFocus } from 'vs/platform/quickinput/common/quickInput';
 import { QuickInputBox } from 'vs/platform/quickinput/browser/quickInputBox';
 import { QuickInputUI, Writeable, IQuickInputStyles, IQuickInputOptions, QuickPick, backButton, InputBox, Visibilities, QuickWidget, InQuickInputContextKey, QuickInputTypeContextKey, EndOfQuickInputBoxContextKey } from 'vs/platform/quickinput/browser/quickInput';
 import { ILayoutService } from 'vs/platform/layout/browser/layoutService';
 import { mainWindow } from 'vs/base/browser/window';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { QuickInputTree } from 'vs/platform/quickinput/browser/quickInputTree';
-import { QuickPickFocus } from '../common/quickInput';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import 'vs/platform/quickinput/browser/quickInputActions';
 
@@ -363,7 +362,7 @@ export class QuickInputController extends Disposable {
 		}
 	}
 
-	pick<T extends IQuickPickItem, O extends IPickOptions<T>>(picks: Promise<QuickPickInput<T>[]> | QuickPickInput<T>[], options: O = <O>{}, token: CancellationToken = CancellationToken.None): Promise<(O extends { canPickMany: true } ? T[] : T) | undefined> {
+	pick<T extends IQuickPickItem, O extends IPickOptions<T>>(picks: Promise<QuickPickInput<T>[]> | QuickPickInput<T>[], options: IPickOptions<T> = {}, token: CancellationToken = CancellationToken.None): Promise<(O extends { canPickMany: true } ? T[] : T) | undefined> {
 		type R = (O extends { canPickMany: true } ? T[] : T) | undefined;
 		return new Promise<R>((doResolve, reject) => {
 			let resolve = (result: R) => {
@@ -375,7 +374,7 @@ export class QuickInputController extends Disposable {
 				resolve(undefined);
 				return;
 			}
-			const input = this.createQuickPick<T>();
+			const input = this.createQuickPick<T>({ useSeparators: true });
 			let activeItem: T | undefined;
 			const disposables = [
 				input,
@@ -439,6 +438,9 @@ export class QuickInputController extends Disposable {
 				}),
 			];
 			input.title = options.title;
+			if (options.value) {
+				input.value = options.value;
+			}
 			input.canSelectMany = !!options.canPickMany;
 			input.placeholder = options.placeHolder;
 			input.ignoreFocusOut = !!options.ignoreFocusLost;
@@ -546,9 +548,11 @@ export class QuickInputController extends Disposable {
 
 	backButton = backButton;
 
-	createQuickPick<T extends IQuickPickItem>(): IQuickPick<T> {
+	createQuickPick<T extends IQuickPickItem>(options: { useSeparators: true }): IQuickPick<T, { useSeparators: true }>;
+	createQuickPick<T extends IQuickPickItem>(options?: { useSeparators: boolean }): IQuickPick<T, { useSeparators: false }>;
+	createQuickPick<T extends IQuickPickItem>(options: { useSeparators: boolean } = { useSeparators: false }): IQuickPick<T, { useSeparators: boolean }> {
 		const ui = this.getUI(true);
-		return new QuickPick<T>(ui);
+		return new QuickPick<T, typeof options>(ui);
 	}
 
 	createInputBox(): IInputBox {
diff --git a/src/vs/platform/quickinput/browser/quickInputService.ts b/src/vs/platform/quickinput/browser/quickInputService.ts
index 4727a3f9b52..3c5b30a95e6 100644
--- a/src/vs/platform/quickinput/browser/quickInputService.ts
+++ b/src/vs/platform/quickinput/browser/quickInputService.ts
@@ -149,7 +149,7 @@ export class QuickInputService extends Themable implements IQuickInputService {
 		});
 	}
 
-	pick<T extends IQuickPickItem, O extends IPickOptions<T>>(picks: Promise<QuickPickInput<T>[]> | QuickPickInput<T>[], options: O = <O>{}, token: CancellationToken = CancellationToken.None): Promise<(O extends { canPickMany: true } ? T[] : T) | undefined> {
+	pick<T extends IQuickPickItem, O extends IPickOptions<T>>(picks: Promise<QuickPickInput<T>[]> | QuickPickInput<T>[], options?: O, token: CancellationToken = CancellationToken.None): Promise<(O extends { canPickMany: true } ? T[] : T) | undefined> {
 		return this.controller.pick(picks, options, token);
 	}
 
@@ -157,8 +157,10 @@ export class QuickInputService extends Themable implements IQuickInputService {
 		return this.controller.input(options, token);
 	}
 
-	createQuickPick<T extends IQuickPickItem>(): IQuickPick<T> {
-		return this.controller.createQuickPick();
+	createQuickPick<T extends IQuickPickItem>(options: { useSeparators: true }): IQuickPick<T, { useSeparators: true }>;
+	createQuickPick<T extends IQuickPickItem>(options?: { useSeparators: boolean }): IQuickPick<T, { useSeparators: false }>;
+	createQuickPick<T extends IQuickPickItem>(options: { useSeparators: boolean } = { useSeparators: false }): IQuickPick<T, { useSeparators: boolean }> {
+		return this.controller.createQuickPick(options);
 	}
 
 	createInputBox(): IInputBox {
diff --git a/src/vs/platform/quickinput/browser/quickInputTree.ts b/src/vs/platform/quickinput/browser/quickInputTree.ts
index 232c299a263..74163bd7e36 100644
--- a/src/vs/platform/quickinput/browser/quickInputTree.ts
+++ b/src/vs/platform/quickinput/browser/quickInputTree.ts
@@ -7,13 +7,13 @@ import * as dom from 'vs/base/browser/dom';
 import { Emitter, Event, EventBufferer, IValueWithChangeEvent } from 'vs/base/common/event';
 import { IHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegate';
 import { IListVirtualDelegate } from 'vs/base/browser/ui/list/list';
-import { IObjectTreeElement, ITreeNode, ITreeRenderer } from 'vs/base/browser/ui/tree/tree';
+import { IObjectTreeElement, ITreeNode, ITreeRenderer, TreeVisibility } from 'vs/base/browser/ui/tree/tree';
 import { localize } from 'vs/nls';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { WorkbenchObjectTree } from 'vs/platform/list/browser/listService';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { IQuickPickItem, IQuickPickItemButtonEvent, IQuickPickSeparator, IQuickPickSeparatorButtonEvent, QuickPickItem } from 'vs/platform/quickinput/common/quickInput';
+import { IQuickPickItem, IQuickPickItemButtonEvent, IQuickPickSeparator, IQuickPickSeparatorButtonEvent, QuickPickItem, QuickPickFocus } from 'vs/platform/quickinput/common/quickInput';
 import { IMarkdownString } from 'vs/base/common/htmlContent';
 import { IMatch } from 'vs/base/common/filters';
 import { IListAccessibilityProvider, IListStyles } from 'vs/base/browser/ui/list/listWidget';
@@ -37,9 +37,8 @@ import { RenderIndentGuides } from 'vs/base/browser/ui/tree/abstractTree';
 import { ThrottledDelayer } from 'vs/base/common/async';
 import { isCancellationError } from 'vs/base/common/errors';
 import type { IHoverWidget, IManagedHoverTooltipMarkdownString } from 'vs/base/browser/ui/hover/hover';
-import { QuickPickFocus } from '../common/quickInput';
 import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
-import { observableValue, observableValueOpts } from 'vs/base/common/observable';
+import { observableValue, observableValueOpts, transaction } from 'vs/base/common/observable';
 import { equals } from 'vs/base/common/arrays';
 
 const $ = dom.$;
@@ -554,6 +553,12 @@ class QuickPickSeparatorElementRenderer extends BaseQuickInputListRenderer<Quick
 		return this._visibleSeparatorsFrequency.has(separator);
 	}
 
+	override renderTemplate(container: HTMLElement): IQuickInputItemTemplateData {
+		const data = super.renderTemplate(container);
+		data.checkbox.style.display = 'none';
+		return data;
+	}
+
 	override renderElement(node: ITreeNode<QuickPickSeparatorElement, void>, index: number, data: IQuickInputItemTemplateData): void {
 		const element = node.element;
 		data.element = element;
@@ -707,6 +712,7 @@ export class QuickInputTree extends Disposable {
 	// Elements that apply to the current set of elements
 	private readonly _elementDisposable = this._register(new DisposableStore());
 	private _lastHover: IHoverWidget | undefined;
+	private _lastQueryString: string | undefined;
 
 	constructor(
 		private parent: HTMLElement,
@@ -727,6 +733,24 @@ export class QuickInputTree extends Disposable {
 			new QuickInputItemDelegate(),
 			[this._itemRenderer, this._separatorRenderer],
 			{
+				filter: {
+					filter(element) {
+						return element.hidden
+							? TreeVisibility.Hidden
+							: element instanceof QuickPickSeparatorElement
+								? TreeVisibility.Recurse
+								: TreeVisibility.Visible;
+					},
+				},
+				sorter: {
+					compare: (element, otherElement) => {
+						if (!this.sortByLabel || !this._lastQueryString) {
+							return 0;
+						}
+						const normalizedSearchValue = this._lastQueryString.toLowerCase();
+						return compareEntries(element, otherElement, normalizedSearchValue);
+					},
+				},
 				accessibilityProvider: new QuickInputAccessibilityProvider(),
 				setRowLineHeight: false,
 				multipleSelectionSupport: false,
@@ -1056,6 +1080,7 @@ export class QuickInputTree extends Disposable {
 
 	setElements(inputElements: QuickPickItem[]): void {
 		this._elementDisposable.clear();
+		this._lastQueryString = undefined;
 		this._inputElements = inputElements;
 		this._hasCheckboxes = this.parent.classList.contains('show-checkboxes');
 		let currentSeparatorElement: QuickPickSeparatorElement | undefined;
@@ -1363,6 +1388,7 @@ export class QuickInputTree extends Disposable {
 	}
 
 	filter(query: string): boolean {
+		this._lastQueryString = query;
 		if (!(this._sortByLabel || this._matchOnLabel || this._matchOnDescription || this._matchOnDetail)) {
 			this._tree.layout();
 			return false;
@@ -1388,7 +1414,7 @@ export class QuickInputTree extends Disposable {
 		// Filter by value (since we support icons in labels, use $(..) aware fuzzy matching)
 		else {
 			let currentSeparator: IQuickPickSeparator | undefined;
-			this._elementTree.forEach(element => {
+			this._itemElements.forEach(element => {
 				let labelHighlights: IMatch[] | undefined;
 				if (this.matchOnLabelMode === 'fuzzy') {
 					labelHighlights = this.matchOnLabel ? matchesFuzzyIconAware(query, parseLabelWithIcons(element.saneLabel)) ?? undefined : undefined;
@@ -1419,8 +1445,10 @@ export class QuickInputTree extends Disposable {
 
 				// we can show the separator unless the list gets sorted by match
 				if (!this.sortByLabel) {
-					const previous = element.index && this._inputElements[element.index - 1];
-					currentSeparator = previous && previous.type === 'separator' ? previous : currentSeparator;
+					const previous = element.index && this._inputElements[element.index - 1] || undefined;
+					if (previous?.type === 'separator' && !previous.buttons) {
+						currentSeparator = previous;
+					}
 					if (currentSeparator && !element.hidden) {
 						element.separator = currentSeparator;
 						currentSeparator = undefined;
@@ -1429,33 +1457,12 @@ export class QuickInputTree extends Disposable {
 			});
 		}
 
-		const shownElements = this._elementTree.filter(element => !element.hidden);
-
-		// Sort by value
-		if (this.sortByLabel && query) {
-			const normalizedSearchValue = query.toLowerCase();
-			shownElements.sort((a, b) => {
-				return compareEntries(a, b, normalizedSearchValue);
-			});
-		}
-
-		let currentSeparator: QuickPickSeparatorElement | undefined;
-		const finalElements = shownElements.reduce((result, element, index) => {
-			if (element instanceof QuickPickItemElement) {
-				if (currentSeparator) {
-					currentSeparator.children.push(element);
-				} else {
-					result.push(element);
-				}
-			} else if (element instanceof QuickPickSeparatorElement) {
-				element.children = [];
-				currentSeparator = element;
-				result.push(element);
-			}
-			return result;
-		}, new Array<IQuickPickElement>());
-
-		this._setElementsToTree(finalElements);
+		this._setElementsToTree(this._sortByLabel && query
+			// We don't render any separators if we're sorting so just render the elements
+			? this._itemElements
+			// Render the full tree
+			: this._elementTree
+		);
 		this._tree.layout();
 		return true;
 	}
@@ -1547,10 +1554,12 @@ export class QuickInputTree extends Disposable {
 	}
 
 	private _updateCheckedObservables() {
-		this._allVisibleCheckedObservable.set(this._allVisibleChecked(this._itemElements, false), undefined);
-		const checkedCount = this._itemElements.filter(element => element.checked).length;
-		this._checkedCountObservable.set(checkedCount, undefined);
-		this._checkedElementsObservable.set(this.getCheckedElements(), undefined);
+		transaction((tx) => {
+			this._allVisibleCheckedObservable.set(this._allVisibleChecked(this._itemElements, false), tx);
+			const checkedCount = this._itemElements.filter(element => element.checked).length;
+			this._checkedCountObservable.set(checkedCount, tx);
+			this._checkedElementsObservable.set(this.getCheckedElements(), tx);
+		});
 	}
 
 	/**
diff --git a/src/vs/platform/quickinput/browser/quickPickPin.ts b/src/vs/platform/quickinput/browser/quickPickPin.ts
index 51c8b25d467..7ab79c54f8e 100644
--- a/src/vs/platform/quickinput/browser/quickPickPin.ts
+++ b/src/vs/platform/quickinput/browser/quickPickPin.ts
@@ -8,6 +8,7 @@ import { localize } from 'vs/nls';
 import { IQuickPick, IQuickPickItem, QuickPickItem } from 'vs/platform/quickinput/common/quickInput';
 import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
 import { ThemeIcon } from 'vs/base/common/themables';
+import { DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
 
 const pinButtonClass = ThemeIcon.asClassName(Codicon.pin);
 const pinnedButtonClass = ThemeIcon.asClassName(Codicon.pinned);
@@ -18,30 +19,32 @@ const buttonClasses = [pinButtonClass, pinnedButtonClass];
  * be removed if @param filterDupliates has been provided. Pin and pinned button events trigger updates to the underlying storage.
  * Shows the quickpick once formatted.
  */
-export async function showWithPinnedItems(storageService: IStorageService, storageKey: string, quickPick: IQuickPick<IQuickPickItem>, filterDuplicates?: boolean): Promise<void> {
+export function showWithPinnedItems(storageService: IStorageService, storageKey: string, quickPick: IQuickPick<IQuickPickItem, { useSeparators: true }>, filterDuplicates?: boolean): IDisposable {
 	const itemsWithoutPinned = quickPick.items;
 	let itemsWithPinned = _formatPinnedItems(storageKey, quickPick, storageService, undefined, filterDuplicates);
-	quickPick.onDidTriggerItemButton(async buttonEvent => {
+	const disposables = new DisposableStore();
+	disposables.add(quickPick.onDidTriggerItemButton(async buttonEvent => {
 		const expectedButton = buttonEvent.button.iconClass && buttonClasses.includes(buttonEvent.button.iconClass);
 		if (expectedButton) {
 			quickPick.items = itemsWithoutPinned;
 			itemsWithPinned = _formatPinnedItems(storageKey, quickPick, storageService, buttonEvent.item, filterDuplicates);
 			quickPick.items = quickPick.value ? itemsWithoutPinned : itemsWithPinned;
 		}
-	});
-	quickPick.onDidChangeValue(async value => {
+	}));
+	disposables.add(quickPick.onDidChangeValue(async value => {
 		if (quickPick.items === itemsWithPinned && value) {
 			quickPick.items = itemsWithoutPinned;
 		} else if (quickPick.items === itemsWithoutPinned && !value) {
 			quickPick.items = itemsWithPinned;
 		}
-	});
+	}));
 
 	quickPick.items = quickPick.value ? itemsWithoutPinned : itemsWithPinned;
 	quickPick.show();
+	return disposables;
 }
 
-function _formatPinnedItems(storageKey: string, quickPick: IQuickPick<IQuickPickItem>, storageService: IStorageService, changedItem?: IQuickPickItem, filterDuplicates?: boolean): QuickPickItem[] {
+function _formatPinnedItems(storageKey: string, quickPick: IQuickPick<IQuickPickItem, { useSeparators: true }>, storageService: IStorageService, changedItem?: IQuickPickItem, filterDuplicates?: boolean): QuickPickItem[] {
 	const formattedItems: QuickPickItem[] = [];
 	let pinnedItems;
 	if (changedItem) {
diff --git a/src/vs/platform/quickinput/common/quickAccess.ts b/src/vs/platform/quickinput/common/quickAccess.ts
index 12b7afa785e..987571327d0 100644
--- a/src/vs/platform/quickinput/common/quickAccess.ts
+++ b/src/vs/platform/quickinput/common/quickAccess.ts
@@ -129,7 +129,7 @@ export interface IQuickAccessProvider {
 	 * @return a disposable that will automatically be disposed when the picker
 	 * closes or is replaced by another picker.
 	 */
-	provide(picker: IQuickPick<IQuickPickItem>, token: CancellationToken, options?: IQuickAccessProviderRunOptions): IDisposable;
+	provide(picker: IQuickPick<IQuickPickItem, { useSeparators: true }>, token: CancellationToken, options?: IQuickAccessProviderRunOptions): IDisposable;
 }
 
 export interface IQuickAccessProviderHelp {
diff --git a/src/vs/platform/quickinput/common/quickInput.ts b/src/vs/platform/quickinput/common/quickInput.ts
index b4bfac22752..a3b26fd55c0 100644
--- a/src/vs/platform/quickinput/common/quickInput.ts
+++ b/src/vs/platform/quickinput/common/quickInput.ts
@@ -81,6 +81,11 @@ export interface IPickOptions<T extends IQuickPickItem> {
 	 */
 	title?: string;
 
+	/**
+	 * the value to prefill in the input box
+	 */
+	value?: string;
+
 	/**
 	 * an optional string to show as placeholder in the input box to guide the user what she picks on
 	 */
@@ -418,7 +423,7 @@ export enum QuickPickFocus {
 /**
  * Represents a quick pick control that allows the user to select an item from a list of options.
  */
-export interface IQuickPick<T extends IQuickPickItem> extends IQuickInput {
+export interface IQuickPick<T extends IQuickPickItem, O extends { useSeparators: boolean } = { useSeparators: false }> extends IQuickInput {
 
 	/**
 	 * The type of the quick input.
@@ -505,7 +510,7 @@ export interface IQuickPick<T extends IQuickPickItem> extends IQuickInput {
 	/**
 	 * The items to be displayed in the quick pick.
 	 */
-	items: ReadonlyArray<T | IQuickPickSeparator>;
+	items: O extends { useSeparators: true } ? ReadonlyArray<T | IQuickPickSeparator> : ReadonlyArray<T>;
 
 	/**
 	 * Whether multiple items can be selected. If so, checkboxes will be rendered.
@@ -871,7 +876,8 @@ export interface IQuickInputService {
 	/**
 	 * Provides raw access to the quick pick controller.
 	 */
-	createQuickPick<T extends IQuickPickItem>(): IQuickPick<T>;
+	createQuickPick<T extends IQuickPickItem>(options: { useSeparators: true }): IQuickPick<T, { useSeparators: true }>;
+	createQuickPick<T extends IQuickPickItem>(options?: { useSeparators: boolean }): IQuickPick<T, { useSeparators: false }>;
 
 	/**
 	 * Provides raw access to the input box controller.
diff --git a/src/vs/platform/remote/browser/browserSocketFactory.ts b/src/vs/platform/remote/browser/browserSocketFactory.ts
index e8d40cb8ecc..26272a62f59 100644
--- a/src/vs/platform/remote/browser/browserSocketFactory.ts
+++ b/src/vs/platform/remote/browser/browserSocketFactory.ts
@@ -281,6 +281,9 @@ export class BrowserSocketFactory implements ISocketFactory<RemoteConnectionType
 	connect({ host, port }: WebSocketRemoteConnection, path: string, query: string, debugLabel: string): Promise<ISocket> {
 		return new Promise<ISocket>((resolve, reject) => {
 			const webSocketSchema = (/^https:/.test(mainWindow.location.href) ? 'wss' : 'ws');
+			// Start PWB: path-prefix
+			path = (mainWindow.location.pathname + '/' + path).replace(/\/\/+/g, '/');
+			// End PWB: path-prefix
 			const socket = this._webSocketFactory.create(`${webSocketSchema}://${(/:/.test(host) && !/\[/.test(host)) ? `[${host}]` : host}:${port}${path}?${query}&skipWebSocketFrames=false`, debugLabel);
 			const errorListener = socket.onError(reject);
 			socket.onOpen(() => {
diff --git a/src/vs/platform/remote/node/wsl.ts b/src/vs/platform/remote/node/wsl.ts
index 4bc71a35f0c..637ccff4fb0 100644
--- a/src/vs/platform/remote/node/wsl.ts
+++ b/src/vs/platform/remote/node/wsl.ts
@@ -26,7 +26,11 @@ async function testWSLFeatureInstalled(): Promise<boolean> {
 		const wslExePath = getWSLExecutablePath();
 		if (wslExePath) {
 			return new Promise<boolean>(s => {
-				cp.execFile(wslExePath, ['--status'], err => s(!err));
+				try {
+					cp.execFile(wslExePath, ['--status'], err => s(!err));
+				} catch (e) {
+					s(false);
+				}
 			});
 		}
 	} else {
diff --git a/src/vs/platform/request/node/proxy.ts b/src/vs/platform/request/node/proxy.ts
index 141be5bb796..570854b2d53 100644
--- a/src/vs/platform/request/node/proxy.ts
+++ b/src/vs/platform/request/node/proxy.ts
@@ -49,7 +49,7 @@ export async function getProxyAgent(rawRequestURL: string, env: typeof process.e
 		const mod = await import('http-proxy-agent');
 		// ESM-comment-end
 		// ESM-uncomment-begin
-		// const mod = (await import('http-proxy-agent')).default;
+		// const { default: mod } = await import('http-proxy-agent');
 		// ESM-uncomment-end
 		return new mod.HttpProxyAgent(proxyURL, opts);
 	} else {
@@ -57,7 +57,7 @@ export async function getProxyAgent(rawRequestURL: string, env: typeof process.e
 		const mod = await import('https-proxy-agent');
 		// ESM-comment-end
 		// ESM-uncomment-begin
-		// const mod = (await import('https-proxy-agent')).default;
+		// const { default: mod } = await import('https-proxy-agent');
 		// ESM-uncomment-end
 		return new mod.HttpsProxyAgent(proxyURL, opts);
 	}
diff --git a/src/vs/platform/sign/browser/signService.ts b/src/vs/platform/sign/browser/signService.ts
index a9d699bf3b2..b6b08ebf466 100644
--- a/src/vs/platform/sign/browser/signService.ts
+++ b/src/vs/platform/sign/browser/signService.ts
@@ -3,8 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { importAMDNodeModule, resolveAmdNodeModulePath } from 'vs/amdX';
 import { WindowIntervalTimer } from 'vs/base/browser/dom';
 import { mainWindow } from 'vs/base/browser/window';
+import { isESM } from 'vs/base/common/amd';
 import { memoize } from 'vs/base/common/decorators';
 import { FileAccess } from 'vs/base/common/network';
 import { IProductService } from 'vs/platform/product/common/productService';
@@ -62,7 +64,7 @@ export class SignService extends AbstractSignService implements ISignService {
 		let [wasm] = await Promise.all([
 			this.getWasmBytes(),
 			new Promise<void>((resolve, reject) => {
-				require(['vsda'], resolve, reject);
+				importAMDNodeModule('vsda', 'rust/web/vsda.js').then(() => resolve(), reject);
 
 				// todo@connor4312: there seems to be a bug(?) in vscode-loader with
 				// require() not resolving in web once the script loads, so check manually
@@ -74,7 +76,6 @@ export class SignService extends AbstractSignService implements ISignService {
 			}).finally(() => checkInterval.dispose()),
 		]);
 
-
 		const keyBytes = new TextEncoder().encode(this.productService.serverLicense?.join('\n') || '');
 		for (let i = 0; i + STEP_SIZE < keyBytes.length; i += STEP_SIZE) {
 			const key = await crypto.subtle.importKey('raw', keyBytes.slice(i + IV_SIZE, i + IV_SIZE + KEY_SIZE), { name: 'AES-CBC' }, false, ['decrypt']);
@@ -87,7 +88,10 @@ export class SignService extends AbstractSignService implements ISignService {
 	}
 
 	private async getWasmBytes(): Promise<ArrayBuffer> {
-		const response = await fetch(FileAccess.asBrowserUri('vsda/../vsda_bg.wasm').toString(true));
+		const url = isESM
+			? resolveAmdNodeModulePath('vsda', 'rust/web/vsda_bg.wasm')
+			: FileAccess.asBrowserUri('vsda/../vsda_bg.wasm').toString(true);
+		const response = await fetch(url);
 		if (!response.ok) {
 			throw new Error('error loading vsda');
 		}
diff --git a/src/vs/platform/sign/node/signService.ts b/src/vs/platform/sign/node/signService.ts
index d07ba9cfbe9..d1c7b1325f7 100644
--- a/src/vs/platform/sign/node/signService.ts
+++ b/src/vs/platform/sign/node/signService.ts
@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { importAMDNodeModule } from 'vs/amdX';
 import { AbstractSignService, IVsdaValidator } from 'vs/platform/sign/common/abstractSignService';
 import { ISignService } from 'vs/platform/sign/common/sign';
 
@@ -28,7 +29,16 @@ export class SignService extends AbstractSignService implements ISignService {
 		return this.vsda().then(vsda => new vsda.signer().sign(arg));
 	}
 
-	private vsda(): Promise<typeof vsda> {
-		return new Promise((resolve, reject) => require(['vsda'], resolve, reject));
+	private async vsda(): Promise<typeof vsda> {
+		// ESM-uncomment-begin
+		// if (typeof importAMDNodeModule === 'function') { /* fixes unused import, remove me */}
+		// const mod = 'vsda';
+		// const { default: vsda } = await import(mod);
+		// return vsda;
+		// ESM-uncomment-end
+
+		// ESM-comment-begin
+		return importAMDNodeModule('vsda', 'index.js');
+		// ESM-comment-end
 	}
 }
diff --git a/src/vs/platform/telemetry/common/1dsAppender.ts b/src/vs/platform/telemetry/common/1dsAppender.ts
index 0c2fda8cf54..1d84ad4535a 100644
--- a/src/vs/platform/telemetry/common/1dsAppender.ts
+++ b/src/vs/platform/telemetry/common/1dsAppender.ts
@@ -8,6 +8,7 @@ import type { IChannelConfiguration, IXHROverride, PostChannel } from '@microsof
 import { importAMDNodeModule } from 'vs/amdX';
 import { onUnexpectedError } from 'vs/base/common/errors';
 import { mixin } from 'vs/base/common/objects';
+import { isWeb } from 'vs/base/common/platform';
 import { ITelemetryAppender, validateTelemetryData } from 'vs/platform/telemetry/common/telemetryUtils';
 
 // Interface type which is a subset of @microsoft/1ds-core-js AppInsightsCore.
@@ -26,8 +27,18 @@ const endpointHealthUrl = 'https://0.0.0.0/ping';
 // --- End Positron ---
 
 async function getClient(instrumentationKey: string, addInternalFlag?: boolean, xhrOverride?: IXHROverride): Promise<IAppInsightsCore> {
+	// ESM-comment-begin
+	if (isWeb) { /* fix the import warning */ }
 	const oneDs = await importAMDNodeModule<typeof import('@microsoft/1ds-core-js')>('@microsoft/1ds-core-js', 'dist/ms.core.js');
 	const postPlugin = await importAMDNodeModule<typeof import('@microsoft/1ds-post-js')>('@microsoft/1ds-post-js', 'dist/ms.post.js');
+	// ESM-comment-end
+	// ESM-uncomment-begin
+	// // eslint-disable-next-line local/code-amd-node-module
+	// const oneDs = isWeb ? await importAMDNodeModule<typeof import('@microsoft/1ds-core-js')>('@microsoft/1ds-core-js', 'bundle/ms.core.min.js') : await import('@microsoft/1ds-core-js');
+	// // eslint-disable-next-line local/code-amd-node-module
+	// const postPlugin = isWeb ? await importAMDNodeModule<typeof import('@microsoft/1ds-post-js')>('@microsoft/1ds-post-js', 'bundle/ms.post.min.js'): await import('@microsoft/1ds-post-js');
+	// ESM-uncomment-end
+
 	const appInsightsCore = new oneDs.AppInsightsCore();
 	const collectorChannelPlugin: PostChannel = new postPlugin.PostChannel();
 	// Configure the app insights core to send to collector++ and disable logging of debug info
diff --git a/src/vs/platform/terminal/common/capabilities/commandDetection/promptInputModel.ts b/src/vs/platform/terminal/common/capabilities/commandDetection/promptInputModel.ts
index dbce8f54458..9e7c183bb45 100644
--- a/src/vs/platform/terminal/common/capabilities/commandDetection/promptInputModel.ts
+++ b/src/vs/platform/terminal/common/capabilities/commandDetection/promptInputModel.ts
@@ -23,7 +23,7 @@ const enum PromptInputState {
  * A model of the prompt input state using shell integration and analyzing the terminal buffer. This
  * may not be 100% accurate but provides a best guess.
  */
-export interface IPromptInputModel {
+export interface IPromptInputModel extends IPromptInputModelState {
 	readonly onDidStartInput: Event<IPromptInputModelState>;
 	readonly onDidChangeInput: Event<IPromptInputModelState>;
 	readonly onDidFinishInput: Event<IPromptInputModelState>;
@@ -32,10 +32,6 @@ export interface IPromptInputModel {
 	 */
 	readonly onDidInterrupt: Event<IPromptInputModelState>;
 
-	readonly value: string;
-	readonly cursorIndex: number;
-	readonly ghostTextIndex: number;
-
 	/**
 	 * Gets the prompt input as a user-friendly string where `|` is the cursor position and `[` and
 	 * `]` wrap any ghost text.
@@ -44,8 +40,26 @@ export interface IPromptInputModel {
 }
 
 export interface IPromptInputModelState {
+	/**
+	 * The full prompt input include ghost text.
+	 */
 	readonly value: string;
+	/**
+	 * The prompt input up to the cursor index, this will always exclude the ghost text.
+	 */
+	readonly prefix: string;
+	/**
+	 * The prompt input from the cursor to the end, this _does not_ include ghost text.
+	 */
+	readonly suffix: string;
+	/**
+	 * The index of the cursor in {@link value}.
+	 */
 	readonly cursorIndex: number;
+	/**
+	 * The index of the start of ghost text in {@link value}. This is -1 when there is no ghost
+	 * text.
+	 */
 	readonly ghostTextIndex: number;
 }
 
@@ -69,6 +83,8 @@ export class PromptInputModel extends Disposable implements IPromptInputModel {
 
 	private _value: string = '';
 	get value() { return this._value; }
+	get prefix() { return this._value.substring(0, this._cursorIndex); }
+	get suffix() { return this._value.substring(this._cursorIndex, this._ghostTextIndex === -1 ? undefined : this._ghostTextIndex); }
 
 	private _cursorIndex: number = 0;
 	get cursorIndex() { return this._cursorIndex; }
@@ -462,6 +478,8 @@ export class PromptInputModel extends Disposable implements IPromptInputModel {
 	private _createStateObject(): IPromptInputModelState {
 		return Object.freeze({
 			value: this._value,
+			prefix: this.prefix,
+			suffix: this.suffix,
 			cursorIndex: this._cursorIndex,
 			ghostTextIndex: this._ghostTextIndex
 		});
diff --git a/src/vs/platform/terminal/common/terminal.ts b/src/vs/platform/terminal/common/terminal.ts
index f8e502eb908..62a129b809d 100644
--- a/src/vs/platform/terminal/common/terminal.ts
+++ b/src/vs/platform/terminal/common/terminal.ts
@@ -90,6 +90,7 @@ export const enum TerminalSettingId {
 	EnvWindows = 'terminal.integrated.env.windows',
 	EnvironmentChangesIndicator = 'terminal.integrated.environmentChangesIndicator',
 	EnvironmentChangesRelaunch = 'terminal.integrated.environmentChangesRelaunch',
+	ExperimentalWindowsUseConptyDll = 'terminal.integrated.experimental.windowsUseConptyDll',
 	ShowExitAlert = 'terminal.integrated.showExitAlert',
 	SplitCwd = 'terminal.integrated.splitCwd',
 	WindowsEnableConpty = 'terminal.integrated.windowsEnableConpty',
@@ -127,23 +128,27 @@ export const enum TerminalSettingId {
 }
 
 export const enum PosixShellType {
-	PowerShell = 'pwsh',
 	Bash = 'bash',
 	Fish = 'fish',
 	Sh = 'sh',
 	Csh = 'csh',
 	Ksh = 'ksh',
 	Zsh = 'zsh',
-	Python = 'python'
+
 }
 export const enum WindowsShellType {
 	CommandPrompt = 'cmd',
-	PowerShell = 'pwsh',
 	Wsl = 'wsl',
 	GitBash = 'gitbash',
-	Python = 'python'
 }
-export type TerminalShellType = PosixShellType | WindowsShellType;
+
+export const enum GeneralShellType {
+	PowerShell = 'pwsh',
+	Python = 'python',
+	Julia = 'julia',
+	NuShell = 'nu'
+}
+export type TerminalShellType = PosixShellType | WindowsShellType | GeneralShellType;
 
 export interface IRawTerminalInstanceLayoutInfo<T> {
 	relativeSize: number;
@@ -661,6 +666,7 @@ export interface ITerminalProcessOptions {
 		nonce: string;
 	};
 	windowsEnableConpty: boolean;
+	windowsUseConptyDll: boolean;
 	environmentVariableCollections: ISerializableEnvironmentVariableCollections | undefined;
 	workspaceFolder: IWorkspaceFolder | undefined;
 }
diff --git a/src/vs/platform/terminal/node/terminalProcess.ts b/src/vs/platform/terminal/node/terminalProcess.ts
index e527400cfd0..acd296dfc5f 100644
--- a/src/vs/platform/terminal/node/terminalProcess.ts
+++ b/src/vs/platform/terminal/node/terminalProcess.ts
@@ -14,7 +14,7 @@ import { URI } from 'vs/base/common/uri';
 import { localize } from 'vs/nls';
 import { ILogService, LogLevel } from 'vs/platform/log/common/log';
 import { IProductService } from 'vs/platform/product/common/productService';
-import { FlowControlConstants, IShellLaunchConfig, ITerminalChildProcess, ITerminalLaunchError, IProcessProperty, IProcessPropertyMap as IProcessPropertyMap, ProcessPropertyType, TerminalShellType, IProcessReadyEvent, ITerminalProcessOptions, PosixShellType, IProcessReadyWindowsPty } from 'vs/platform/terminal/common/terminal';
+import { FlowControlConstants, IShellLaunchConfig, ITerminalChildProcess, ITerminalLaunchError, IProcessProperty, IProcessPropertyMap as IProcessPropertyMap, ProcessPropertyType, TerminalShellType, IProcessReadyEvent, ITerminalProcessOptions, PosixShellType, IProcessReadyWindowsPty, GeneralShellType } from 'vs/platform/terminal/common/terminal';
 import { ChildProcessMonitor } from 'vs/platform/terminal/node/childProcessMonitor';
 import { findExecutable, getShellIntegrationInjection, getWindowsBuildNumber, IShellIntegrationConfigInjection } from 'vs/platform/terminal/node/terminalEnvironment';
 import { WindowsShellHelper } from 'vs/platform/terminal/node/windowsShellHelper';
@@ -72,11 +72,16 @@ const posixShellTypeMap = new Map<string, PosixShellType>([
 	['fish', PosixShellType.Fish],
 	['ksh', PosixShellType.Ksh],
 	['sh', PosixShellType.Sh],
-	['pwsh', PosixShellType.PowerShell],
-	['python', PosixShellType.Python],
 	['zsh', PosixShellType.Zsh]
 ]);
 
+const generalShellTypeMap = new Map<string, GeneralShellType>([
+	['pwsh', GeneralShellType.PowerShell],
+	['python', GeneralShellType.Python],
+	['julia', GeneralShellType.Julia],
+	['nu', GeneralShellType.NuShell],
+
+]);
 export class TerminalProcess extends Disposable implements ITerminalChildProcess {
 	readonly id = 0;
 	readonly shouldPersist = false;
@@ -114,7 +119,7 @@ export class TerminalProcess extends Disposable implements ITerminalChildProcess
 	get exitMessage(): string | undefined { return this._exitMessage; }
 
 	get currentTitle(): string { return this._windowsShellHelper?.shellTitle || this._currentTitle; }
-	get shellType(): TerminalShellType | undefined { return isWindows ? this._windowsShellHelper?.shellType : posixShellTypeMap.get(this._currentTitle); }
+	get shellType(): TerminalShellType | undefined { return isWindows ? this._windowsShellHelper?.shellType : posixShellTypeMap.get(this._currentTitle) || generalShellTypeMap.get(this._currentTitle); }
 	get hasChildProcesses(): boolean { return this._childProcessMonitor?.hasChildProcesses || false; }
 
 	private readonly _onProcessData = this._register(new Emitter<string>());
@@ -153,6 +158,7 @@ export class TerminalProcess extends Disposable implements ITerminalChildProcess
 		this._properties[ProcessPropertyType.InitialCwd] = this._initialCwd;
 		this._properties[ProcessPropertyType.Cwd] = this._initialCwd;
 		const useConpty = this._options.windowsEnableConpty && process.platform === 'win32' && getWindowsBuildNumber() >= 18309;
+		const useConptyDll = useConpty && this._options.windowsUseConptyDll;
 		this._ptyOptions = {
 			name,
 			cwd,
@@ -161,6 +167,7 @@ export class TerminalProcess extends Disposable implements ITerminalChildProcess
 			cols,
 			rows,
 			useConpty,
+			useConptyDll,
 			// This option will force conpty to not redraw the whole viewport on launch
 			conptyInheritCursor: useConpty && !!shellLaunchConfig.initialText
 		};
@@ -211,8 +218,8 @@ export class TerminalProcess extends Disposable implements ITerminalChildProcess
 				}
 				if (injection.filesToCopy) {
 					for (const f of injection.filesToCopy) {
-						await fs.promises.mkdir(path.dirname(f.dest), { recursive: true });
 						try {
+							await fs.promises.mkdir(path.dirname(f.dest), { recursive: true });
 							await fs.promises.copyFile(f.source, f.dest);
 						} catch {
 							// Swallow error, this should only happen when multiple users are on the same
@@ -408,9 +415,12 @@ export class TerminalProcess extends Disposable implements ITerminalChildProcess
 		const sanitizedTitle = this.currentTitle.replace(/ \(figterm\)$/g, '');
 
 		if (sanitizedTitle.toLowerCase().startsWith('python')) {
-			this._onDidChangeProperty.fire({ type: ProcessPropertyType.ShellType, value: PosixShellType.Python });
+			this._onDidChangeProperty.fire({ type: ProcessPropertyType.ShellType, value: GeneralShellType.Python });
+		} else if (sanitizedTitle.toLowerCase().startsWith('julia')) {
+			this._onDidChangeProperty.fire({ type: ProcessPropertyType.ShellType, value: GeneralShellType.Julia });
 		} else {
-			this._onDidChangeProperty.fire({ type: ProcessPropertyType.ShellType, value: posixShellTypeMap.get(sanitizedTitle) });
+			const shellTypeValue = posixShellTypeMap.get(sanitizedTitle) || generalShellTypeMap.get(sanitizedTitle);
+			this._onDidChangeProperty.fire({ type: ProcessPropertyType.ShellType, value: shellTypeValue });
 		}
 	}
 
diff --git a/src/vs/platform/terminal/node/windowsShellHelper.ts b/src/vs/platform/terminal/node/windowsShellHelper.ts
index e9fcb6f8130..8768ee7540f 100644
--- a/src/vs/platform/terminal/node/windowsShellHelper.ts
+++ b/src/vs/platform/terminal/node/windowsShellHelper.ts
@@ -8,7 +8,7 @@ import { debounce } from 'vs/base/common/decorators';
 import { Emitter, Event } from 'vs/base/common/event';
 import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
 import { isWindows, platform } from 'vs/base/common/platform';
-import { TerminalShellType, WindowsShellType } from 'vs/platform/terminal/common/terminal';
+import { GeneralShellType, TerminalShellType, WindowsShellType } from 'vs/platform/terminal/common/terminal';
 import type * as WindowsProcessTreeType from '@vscode/windows-process-tree';
 
 export interface IWindowsShellHelper extends IDisposable {
@@ -139,10 +139,14 @@ export class WindowsShellHelper extends Disposable implements IWindowsShellHelpe
 				return WindowsShellType.CommandPrompt;
 			case 'powershell.exe':
 			case 'pwsh.exe':
-				return WindowsShellType.PowerShell;
+				return GeneralShellType.PowerShell;
 			case 'bash.exe':
 			case 'git-cmd.exe':
 				return WindowsShellType.GitBash;
+			case 'julia.exe:':
+				return GeneralShellType.Julia;
+			case 'nu.exe':
+				return GeneralShellType.NuShell;
 			case 'wsl.exe':
 			case 'ubuntu.exe':
 			case 'ubuntu1804.exe':
@@ -153,7 +157,7 @@ export class WindowsShellHelper extends Disposable implements IWindowsShellHelpe
 				return WindowsShellType.Wsl;
 			default:
 				if (executable.match(/python(\d(\.\d{0,2})?)?\.exe/)) {
-					return WindowsShellType.Python;
+					return GeneralShellType.Python;
 				}
 				return undefined;
 		}
diff --git a/src/vs/platform/terminal/test/node/terminalEnvironment.test.ts b/src/vs/platform/terminal/test/node/terminalEnvironment.test.ts
index 5ef7ee9ce94..4d6b00b4d88 100644
--- a/src/vs/platform/terminal/test/node/terminalEnvironment.test.ts
+++ b/src/vs/platform/terminal/test/node/terminalEnvironment.test.ts
@@ -12,9 +12,9 @@ import { IProductService } from 'vs/platform/product/common/productService';
 import { ITerminalProcessOptions } from 'vs/platform/terminal/common/terminal';
 import { getShellIntegrationInjection, getWindowsBuildNumber, IShellIntegrationConfigInjection } from 'vs/platform/terminal/node/terminalEnvironment';
 
-const enabledProcessOptions: ITerminalProcessOptions = { shellIntegration: { enabled: true, suggestEnabled: false, nonce: '' }, windowsEnableConpty: true, environmentVariableCollections: undefined, workspaceFolder: undefined };
-const disabledProcessOptions: ITerminalProcessOptions = { shellIntegration: { enabled: false, suggestEnabled: false, nonce: '' }, windowsEnableConpty: true, environmentVariableCollections: undefined, workspaceFolder: undefined };
-const winptyProcessOptions: ITerminalProcessOptions = { shellIntegration: { enabled: true, suggestEnabled: false, nonce: '' }, windowsEnableConpty: false, environmentVariableCollections: undefined, workspaceFolder: undefined };
+const enabledProcessOptions: ITerminalProcessOptions = { shellIntegration: { enabled: true, suggestEnabled: false, nonce: '' }, windowsEnableConpty: true, windowsUseConptyDll: false, environmentVariableCollections: undefined, workspaceFolder: undefined };
+const disabledProcessOptions: ITerminalProcessOptions = { shellIntegration: { enabled: false, suggestEnabled: false, nonce: '' }, windowsEnableConpty: true, windowsUseConptyDll: false, environmentVariableCollections: undefined, workspaceFolder: undefined };
+const winptyProcessOptions: ITerminalProcessOptions = { shellIntegration: { enabled: true, suggestEnabled: false, nonce: '' }, windowsEnableConpty: false, windowsUseConptyDll: false, environmentVariableCollections: undefined, workspaceFolder: undefined };
 const pwshExe = process.platform === 'win32' ? 'pwsh.exe' : 'pwsh';
 const repoRoot = process.platform === 'win32' ? process.cwd()[0].toLowerCase() + process.cwd().substring(1) : process.cwd();
 const logService = new NullLogService();
diff --git a/src/vs/platform/theme/common/colorUtils.ts b/src/vs/platform/theme/common/colorUtils.ts
index 14ceea8847b..a237166f6f6 100644
--- a/src/vs/platform/theme/common/colorUtils.ts
+++ b/src/vs/platform/theme/common/colorUtils.ts
@@ -159,7 +159,7 @@ class ColorRegistry implements IColorRegistry {
 	public registerColor(id: string, defaults: ColorDefaults | ColorValue | null, description: string, needsTransparency = false, deprecationMessage?: string): ColorIdentifier {
 		const colorContribution: ColorContribution = { id, description, defaults, needsTransparency, deprecationMessage };
 		this.colorsById[id] = colorContribution;
-		const propertySchema: IJSONSchemaWithSnippets = { type: 'string', description, format: 'color-hex', defaultSnippets: [{ body: '${1:#ff0000}' }] };
+		const propertySchema: IJSONSchemaWithSnippets = { type: 'string', format: 'color-hex', defaultSnippets: [{ body: '${1:#ff0000}' }] };
 		if (deprecationMessage) {
 			propertySchema.deprecationMessage = deprecationMessage;
 		}
@@ -168,6 +168,7 @@ class ColorRegistry implements IColorRegistry {
 			propertySchema.patternErrorMessage = nls.localize('transparecyRequired', 'This color must be transparent or it will obscure content');
 		}
 		this.colorSchema.properties[id] = {
+			description,
 			oneOf: [
 				propertySchema,
 				{ type: 'string', const: DEFAULT_COLOR_CONFIG_VALUE, description: nls.localize('useDefault', 'Use the default color.') }
diff --git a/src/vs/platform/theme/common/colors/editorColors.ts b/src/vs/platform/theme/common/colors/editorColors.ts
index cac6dea162c..cebf9ba8f88 100644
--- a/src/vs/platform/theme/common/colors/editorColors.ts
+++ b/src/vs/platform/theme/common/colors/editorColors.ts
@@ -426,7 +426,7 @@ export const overviewRulerCommonContentForeground = registerColor('editorOvervie
 	nls.localize('overviewRulerCommonContentForeground', 'Common ancestor overview ruler foreground for inline merge-conflicts.'));
 
 export const overviewRulerFindMatchForeground = registerColor('editorOverviewRuler.findMatchForeground',
-	{ dark: '#d186167e', light: '#d186167e', hcDark: '#AB5A00', hcLight: '' },
+	{ dark: '#d186167e', light: '#d186167e', hcDark: '#AB5A00', hcLight: '#AB5A00' },
 	nls.localize('overviewRulerFindMatchForeground', 'Overview ruler marker color for find matches. The color must not be opaque so as not to hide underlying decorations.'), true);
 
 export const overviewRulerSelectionHighlightForeground = registerColor('editorOverviewRuler.selectionHighlightForeground',
diff --git a/src/vs/platform/theme/common/colors/listColors.ts b/src/vs/platform/theme/common/colors/listColors.ts
index dd5c405199c..8fb7c4a7819 100644
--- a/src/vs/platform/theme/common/colors/listColors.ts
+++ b/src/vs/platform/theme/common/colors/listColors.ts
@@ -11,7 +11,7 @@ import { registerColor, darken, lighten, transparent, ifDefinedThenElse } from '
 
 // Import the colors we need
 import { foreground, contrastBorder, activeContrastBorder, focusBorder, iconForeground } from 'vs/platform/theme/common/colors/baseColors';
-import { editorWidgetBackground, editorFindMatchHighlightBorder, editorFindMatchHighlight, widgetShadow } from 'vs/platform/theme/common/colors/editorColors';
+import { editorWidgetBackground, editorFindMatchHighlightBorder, editorFindMatchHighlight, widgetShadow, editorWidgetForeground } from 'vs/platform/theme/common/colors/editorColors';
 
 
 export const listFocusBackground = registerColor('list.focusBackground',
@@ -145,3 +145,21 @@ export const tableColumnsBorder = registerColor('tree.tableColumnsBorder',
 export const tableOddRowsBackgroundColor = registerColor('tree.tableOddRowsBackground',
 	{ dark: transparent(foreground, 0.04), light: transparent(foreground, 0.04), hcDark: null, hcLight: null },
 	nls.localize('tableOddRowsBackgroundColor', "Background color for odd table rows."));
+
+// ------ action list
+
+export const editorActionListBackground = registerColor('editorActionList.background',
+	editorWidgetBackground,
+	nls.localize('editorActionListBackground', "Action List background color."));
+
+export const editorActionListForeground = registerColor('editorActionList.foreground',
+	editorWidgetForeground,
+	nls.localize('editorActionListForeground', "Action List foreground color."));
+
+export const editorActionListFocusForeground = registerColor('editorActionList.focusForeground',
+	listActiveSelectionForeground,
+	nls.localize('editorActionListFocusForeground', "Action List foreground color for the focused item."));
+
+export const editorActionListFocusBackground = registerColor('editorActionList.focusBackground',
+	listActiveSelectionBackground,
+	nls.localize('editorActionListFocusBackground', "Action List background color for the focused item."));
diff --git a/src/vs/platform/window/common/window.ts b/src/vs/platform/window/common/window.ts
index 2b7ffc4651f..dc5de9f23ed 100644
--- a/src/vs/platform/window/common/window.ts
+++ b/src/vs/platform/window/common/window.ts
@@ -5,7 +5,7 @@
 
 import { IStringDictionary } from 'vs/base/common/collections';
 import { PerformanceMark } from 'vs/base/common/performance';
-import { isLinux, isMacintosh, isNative, isWeb, isWindows } from 'vs/base/common/platform';
+import { isLinux, isMacintosh, isNative, isWeb } from 'vs/base/common/platform';
 import { URI, UriComponents, UriDto } from 'vs/base/common/uri';
 import { ISandboxConfiguration } from 'vs/base/parts/sandbox/common/sandboxTypes';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
@@ -160,6 +160,7 @@ export interface IWindowSettings {
 	readonly clickThroughInactive: boolean;
 	readonly newWindowProfile: string;
 	readonly density: IDensitySettings;
+	readonly experimentalControlOverlay?: boolean;
 }
 
 export interface IDensitySettings {
@@ -225,14 +226,21 @@ export function getTitleBarStyle(configurationService: IConfigurationService): T
 export const DEFAULT_CUSTOM_TITLEBAR_HEIGHT = 35; // includes space for command center
 
 export function useWindowControlsOverlay(configurationService: IConfigurationService): boolean {
-	if (!isWindows || isWeb) {
-		return false; // only supported on a desktop Windows instance
+	if (isMacintosh || isWeb) {
+		return false; // only supported on a Windows/Linux desktop instances
 	}
 
 	if (hasNativeTitlebar(configurationService)) {
 		return false; // only supported when title bar is custom
 	}
 
+	if (isLinux) {
+		const setting = configurationService.getValue('window.experimentalControlOverlay');
+		if (typeof setting === 'boolean') {
+			return setting;
+		}
+	}
+
 	// Default to true.
 	return true;
 }
diff --git a/src/vs/platform/window/electron-main/window.ts b/src/vs/platform/window/electron-main/window.ts
index 3b36d362642..15fcb1790fe 100644
--- a/src/vs/platform/window/electron-main/window.ts
+++ b/src/vs/platform/window/electron-main/window.ts
@@ -175,8 +175,7 @@ export const enum WindowMode {
 	Maximized,
 	Normal,
 	Minimized, // not used anymore, but also cannot remove due to existing stored UI state (needs migration)
-	Fullscreen,
-	Custom
+	Fullscreen
 }
 
 export interface ILoadEvent {
diff --git a/src/vs/platform/windows/electron-main/windowImpl.ts b/src/vs/platform/windows/electron-main/windowImpl.ts
index 18c8aac36e4..0fa54394d60 100644
--- a/src/vs/platform/windows/electron-main/windowImpl.ts
+++ b/src/vs/platform/windows/electron-main/windowImpl.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import electron from 'electron';
+import electron, { BrowserWindowConstructorOptions } from 'electron';
 import { DeferredPromise, RunOnceScheduler, timeout } from 'vs/base/common/async';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { toErrorMessage } from 'vs/base/common/errorMessage';
@@ -32,7 +32,7 @@ import { IApplicationStorageMainService, IStorageMainService } from 'vs/platform
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { ThemeIcon } from 'vs/base/common/themables';
 import { IThemeMainService } from 'vs/platform/theme/electron-main/themeMainService';
-import { getMenuBarVisibility, IFolderToOpen, INativeWindowConfiguration, IWindowSettings, IWorkspaceToOpen, MenuBarVisibility, hasNativeTitlebar, useNativeFullScreen, useWindowControlsOverlay, DEFAULT_CUSTOM_TITLEBAR_HEIGHT } from 'vs/platform/window/common/window';
+import { getMenuBarVisibility, IFolderToOpen, INativeWindowConfiguration, IWindowSettings, IWorkspaceToOpen, MenuBarVisibility, hasNativeTitlebar, useNativeFullScreen, useWindowControlsOverlay, DEFAULT_CUSTOM_TITLEBAR_HEIGHT, TitlebarStyle } from 'vs/platform/window/common/window';
 import { defaultBrowserWindowOptions, IWindowsMainService, OpenContext, WindowStateValidator } from 'vs/platform/windows/electron-main/windows';
 import { ISingleFolderWorkspaceIdentifier, IWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier, toWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace';
 import { IWorkspacesManagementMainService } from 'vs/platform/workspaces/electron-main/workspacesManagementMainService';
@@ -44,6 +44,7 @@ import { IUserDataProfilesMainService } from 'vs/platform/userDataProfile/electr
 import { ILoggerMainService } from 'vs/platform/log/electron-main/loggerService';
 import { firstOrDefault } from 'vs/base/common/arrays';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { isESM } from 'vs/base/common/amd';
 
 // --- Start Positron ---
 // eslint-disable-next-line no-duplicate-imports
@@ -119,7 +120,7 @@ export abstract class BaseWindow extends Disposable implements IBaseWindow {
 
 	protected _win: electron.BrowserWindow | null = null;
 	get win() { return this._win; }
-	protected setWin(win: electron.BrowserWindow): void {
+	protected setWin(win: electron.BrowserWindow, options?: BrowserWindowConstructorOptions): void {
 		this._win = win;
 
 		// Window Events
@@ -137,13 +138,13 @@ export abstract class BaseWindow extends Disposable implements IBaseWindow {
 		this._register(Event.fromNodeEventEmitter(this._win, 'leave-full-screen')(() => this._onDidLeaveFullScreen.fire()));
 
 		// Sheet Offsets
-		const useCustomTitleStyle = !hasNativeTitlebar(this.configurationService);
+		const useCustomTitleStyle = !hasNativeTitlebar(this.configurationService, options?.titleBarStyle === 'hidden' ? TitlebarStyle.CUSTOM : undefined /* unknown */);
 		if (isMacintosh && useCustomTitleStyle) {
 			win.setSheetOffset(isBigSurOrNewer(release()) ? 28 : 22); // offset dialogs by the height of the custom title bar if we have any
 		}
 
 		// Update the window controls immediately based on cached or default values
-		if (useCustomTitleStyle && ((isWindows && useWindowControlsOverlay(this.configurationService)) || isMacintosh)) {
+		if (useCustomTitleStyle && (useWindowControlsOverlay(this.configurationService) || isMacintosh)) {
 			const cachedWindowControlHeight = this.stateService.getItem<number>((BaseWindow.windowControlHeightStateStorageKey));
 			if (cachedWindowControlHeight) {
 				this.updateWindowControls({ height: cachedWindowControlHeight });
@@ -372,8 +373,8 @@ export abstract class BaseWindow extends Disposable implements IBaseWindow {
 			this.stateService.setItem((CodeWindow.windowControlHeightStateStorageKey), options.height);
 		}
 
-		// Windows: window control overlay (WCO)
-		if (isWindows && this.hasWindowControlOverlay) {
+		// Windows/Linux: window control overlay (WCO)
+		if (this.hasWindowControlOverlay) {
 			win.setTitleBarOverlay({
 				color: options.backgroundColor?.trim() === '' ? undefined : options.backgroundColor,
 				symbolColor: options.foregroundColor?.trim() === '' ? undefined : options.foregroundColor,
@@ -610,7 +611,7 @@ export class CodeWindow extends BaseWindow implements ICodeWindow {
 			this.windowState = state;
 			this.logService.trace('window#ctor: using window state', state);
 
-			const options = instantiationService.invokeFunction(defaultBrowserWindowOptions, this.windowState, {
+			const options = instantiationService.invokeFunction(defaultBrowserWindowOptions, this.windowState, undefined, {
 				preload: FileAccess.asFileUri('vs/base/parts/sandbox/electron-sandbox/preload.js').fsPath,
 				additionalArguments: [`--vscode-window-config=${this.configObjectUrl.resource.toString()}`],
 				v8CacheOptions: this.environmentMainService.useCodeCache ? 'bypassHeatCheck' : 'none',
@@ -630,7 +631,7 @@ export class CodeWindow extends BaseWindow implements ICodeWindow {
 			mark('code/didCreateCodeBrowserWindow');
 
 			this._id = this._win.id;
-			this.setWin(this._win);
+			this.setWin(this._win, options);
 
 			// Apply some state after window creation
 			this.applyState(this.windowState, hasMultipleDisplays);
@@ -1050,7 +1051,7 @@ export class CodeWindow extends BaseWindow implements ICodeWindow {
 		this.readyState = ReadyState.NAVIGATING;
 
 		// Load URL
-		this._win.loadURL(FileAccess.asBrowserUri(`vs/code/electron-sandbox/workbench/workbench${this.environmentMainService.isBuilt ? '' : '-dev'}.html`).toString(true));
+		this._win.loadURL(FileAccess.asBrowserUri(`vs/code/electron-sandbox/workbench/workbench${this.environmentMainService.isBuilt ? '' : '-dev'}.${isESM ? 'esm.' : ''}html`).toString(true));
 
 		// Remember that we did load
 		const wasLoaded = this.wasLoaded;
diff --git a/src/vs/platform/windows/electron-main/windows.ts b/src/vs/platform/windows/electron-main/windows.ts
index cb266b2e5bc..d3cae7ff9d1 100644
--- a/src/vs/platform/windows/electron-main/windows.ts
+++ b/src/vs/platform/windows/electron-main/windows.ts
@@ -17,7 +17,7 @@ import { ServicesAccessor, createDecorator } from 'vs/platform/instantiation/com
 import { ILogService } from 'vs/platform/log/common/log';
 import { IProductService } from 'vs/platform/product/common/productService';
 import { IThemeMainService } from 'vs/platform/theme/electron-main/themeMainService';
-import { IOpenEmptyWindowOptions, IWindowOpenable, IWindowSettings, WindowMinimumSize, hasNativeTitlebar, useNativeFullScreen, useWindowControlsOverlay, zoomLevelToZoomFactor } from 'vs/platform/window/common/window';
+import { IOpenEmptyWindowOptions, IWindowOpenable, IWindowSettings, TitlebarStyle, WindowMinimumSize, hasNativeTitlebar, useNativeFullScreen, useWindowControlsOverlay, zoomLevelToZoomFactor } from 'vs/platform/window/common/window';
 import { ICodeWindow, IWindowState, WindowMode, defaultWindowState } from 'vs/platform/window/electron-main/window';
 
 export const IWindowsMainService = createDecorator<IWindowsMainService>('windowsMainService');
@@ -79,7 +79,10 @@ export const enum OpenContext {
 	DESKTOP,
 
 	// opening through the API
-	API
+	API,
+
+	// opening from a protocol link
+	LINK
 }
 
 export interface IBaseOpenConfiguration {
@@ -115,7 +118,12 @@ export interface IOpenConfiguration extends IBaseOpenConfiguration {
 
 export interface IOpenEmptyConfiguration extends IBaseOpenConfiguration { }
 
-export function defaultBrowserWindowOptions(accessor: ServicesAccessor, windowState: IWindowState, webPreferences?: electron.WebPreferences): electron.BrowserWindowConstructorOptions & { experimentalDarkMode: boolean } {
+export interface IDefaultBrowserWindowOptionsOverrides {
+	forceNativeTitlebar?: boolean;
+	disableFullscreen?: boolean;
+}
+
+export function defaultBrowserWindowOptions(accessor: ServicesAccessor, windowState: IWindowState, overrides?: IDefaultBrowserWindowOptionsOverrides, webPreferences?: electron.WebPreferences): electron.BrowserWindowConstructorOptions & { experimentalDarkMode: boolean } {
 	const themeMainService = accessor.get(IThemeMainService);
 	const productService = accessor.get(IProductService);
 	const configurationService = accessor.get(IConfigurationService);
@@ -163,9 +171,11 @@ export function defaultBrowserWindowOptions(accessor: ServicesAccessor, windowSt
 		}
 	}
 
+	if (overrides?.disableFullscreen) {
+		options.fullscreen = false;
 	// --- Start Positron ---
 	// eslint-disable-next-line react-hooks/rules-of-hooks
-	if (isMacintosh && !useNativeFullScreen(configurationService)) {
+	} else if (isMacintosh && !useNativeFullScreen(configurationService)) {
 		// --- End Positron ---
 		options.fullscreenable = false; // enables simple fullscreen mode
 	}
@@ -175,8 +185,8 @@ export function defaultBrowserWindowOptions(accessor: ServicesAccessor, windowSt
 		options.tabbingIdentifier = productService.nameShort; // this opts in to sierra tabs
 	}
 
-	const hideNativeTitleBar = !hasNativeTitlebar(configurationService);
-	if (hideNativeTitleBar && windowState.mode !== WindowMode.Custom) {
+	const hideNativeTitleBar = !hasNativeTitlebar(configurationService, overrides?.forceNativeTitlebar ? TitlebarStyle.NATIVE : undefined);
+	if (hideNativeTitleBar) {
 		options.titleBarStyle = 'hidden';
 		if (!isMacintosh) {
 			options.frame = false;
diff --git a/src/vs/platform/windows/electron-main/windowsMainService.ts b/src/vs/platform/windows/electron-main/windowsMainService.ts
index 070c7ae05d3..4757e7ee72e 100644
--- a/src/vs/platform/windows/electron-main/windowsMainService.ts
+++ b/src/vs/platform/windows/electron-main/windowsMainService.ts
@@ -22,7 +22,7 @@ import { cwd } from 'vs/base/common/process';
 import { extUriBiasedIgnorePathCase, isEqualAuthority, normalizePath, originalFSPath, removeTrailingPathSeparator } from 'vs/base/common/resources';
 import { assertIsDefined } from 'vs/base/common/types';
 import { URI } from 'vs/base/common/uri';
-import { localize } from 'vs/nls';
+import { getNLSLanguage, getNLSMessages, localize } from 'vs/nls';
 import { IBackupMainService } from 'vs/platform/backup/electron-main/backup';
 import { IEmptyWindowBackupInfo } from 'vs/platform/backup/node/backup';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
@@ -56,6 +56,7 @@ import { IUserDataProfilesMainService } from 'vs/platform/userDataProfile/electr
 import { ILoggerMainService } from 'vs/platform/log/electron-main/loggerService';
 import { IAuxiliaryWindowsMainService } from 'vs/platform/auxiliaryWindow/electron-main/auxiliaryWindows';
 import { IAuxiliaryWindow } from 'vs/platform/auxiliaryWindow/electron-main/auxiliaryWindow';
+import { ICSSDevelopmentService } from 'vs/platform/cssDev/node/cssDevService';
 
 //#region Helper Interfaces
 
@@ -229,7 +230,8 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 		@IFileService private readonly fileService: IFileService,
 		@IProtocolMainService private readonly protocolMainService: IProtocolMainService,
 		@IThemeMainService private readonly themeMainService: IThemeMainService,
-		@IAuxiliaryWindowsMainService private readonly auxiliaryWindowsMainService: IAuxiliaryWindowsMainService
+		@IAuxiliaryWindowsMainService private readonly auxiliaryWindowsMainService: IAuxiliaryWindowsMainService,
+		@ICSSDevelopmentService private readonly cssDevelopmentService: ICSSDevelopmentService
 	) {
 		super();
 
@@ -297,7 +299,7 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 		const emptyWindowsWithBackupsToRestore: IEmptyWindowBackupInfo[] = [];
 
 		let filesToOpen: IFilesToOpen | undefined;
-		let emptyToOpen = 0;
+		let openOneEmptyWindow = false;
 
 		// Identify things to open from open config
 		const pathsToOpen = await this.getPathsToOpen(openConfig);
@@ -321,7 +323,7 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 			} else if (path.backupPath) {
 				emptyWindowsWithBackupsToRestore.push({ backupFolder: basename(path.backupPath), remoteAuthority: path.remoteAuthority });
 			} else {
-				emptyToOpen++;
+				openOneEmptyWindow = true;
 			}
 		}
 
@@ -357,9 +359,9 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 		}
 
 		// Open based on config
-		const { windows: usedWindows, filesOpenedInWindow } = await this.doOpen(openConfig, workspacesToOpen, foldersToOpen, emptyWindowsWithBackupsToRestore, emptyToOpen, filesToOpen, foldersToAdd);
+		const { windows: usedWindows, filesOpenedInWindow } = await this.doOpen(openConfig, workspacesToOpen, foldersToOpen, emptyWindowsWithBackupsToRestore, openOneEmptyWindow, filesToOpen, foldersToAdd);
 
-		this.logService.trace(`windowsManager#open used window count ${usedWindows.length} (workspacesToOpen: ${workspacesToOpen.length}, foldersToOpen: ${foldersToOpen.length}, emptyToRestore: ${emptyWindowsWithBackupsToRestore.length}, emptyToOpen: ${emptyToOpen})`);
+		this.logService.trace(`windowsManager#open used window count ${usedWindows.length} (workspacesToOpen: ${workspacesToOpen.length}, foldersToOpen: ${foldersToOpen.length}, emptyToRestore: ${emptyWindowsWithBackupsToRestore.length}, openOneEmptyWindow: ${openOneEmptyWindow})`);
 
 		// Make sure to pass focus to the most relevant of the windows if we open multiple
 		if (usedWindows.length > 1) {
@@ -458,7 +460,7 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 		workspacesToOpen: IWorkspacePathToOpen[],
 		foldersToOpen: ISingleFolderWorkspacePathToOpen[],
 		emptyToRestore: IEmptyWindowBackupInfo[],
-		emptyToOpen: number,
+		openOneEmptyWindow: boolean,
 		filesToOpen: IFilesToOpen | undefined,
 		foldersToAdd: ISingleFolderWorkspacePathToOpen[]
 	): Promise<{ windows: ICodeWindow[]; filesOpenedInWindow: ICodeWindow | undefined }> {
@@ -506,7 +508,7 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 			// this step.
 			let windowToUseForFiles: ICodeWindow | undefined = undefined;
 			if (fileToCheck?.fileUri && !openFilesInNewWindow) {
-				if (openConfig.context === OpenContext.DESKTOP || openConfig.context === OpenContext.CLI || openConfig.context === OpenContext.DOCK) {
+				if (openConfig.context === OpenContext.DESKTOP || openConfig.context === OpenContext.CLI || openConfig.context === OpenContext.DOCK || openConfig.context === OpenContext.LINK) {
 					windowToUseForFiles = await findWindowOnFile(windows, fileToCheck.fileUri, async workspace => workspace.configPath.scheme === Schemas.file ? this.workspacesManagementMainService.resolveLocalWorkspace(workspace.configPath) : undefined);
 				}
 
@@ -627,20 +629,11 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 			}
 		}
 
-		// Handle empty to open (only if no other window opened)
-		if (usedWindows.length === 0 || filesToOpen) {
-			if (filesToOpen && !emptyToOpen) {
-				emptyToOpen++;
-			}
-
+		// Open empty window either if enforced or when files still have to open
+		if (filesToOpen || openOneEmptyWindow) {
 			const remoteAuthority = filesToOpen ? filesToOpen.remoteAuthority : openConfig.remoteAuthority;
 
-			for (let i = 0; i < emptyToOpen; i++) {
-				addUsedWindow(await this.doOpenEmpty(openConfig, openFolderInNewWindow, remoteAuthority, filesToOpen), !!filesToOpen);
-
-				// any other window to open must open in new window then
-				openFolderInNewWindow = true;
-			}
+			addUsedWindow(await this.doOpenEmpty(openConfig, openFolderInNewWindow, remoteAuthority, filesToOpen), !!filesToOpen);
 		}
 
 		return { windows: distinct(usedWindows), filesOpenedInWindow };
@@ -1445,9 +1438,8 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 			userEnv: { ...this.initialUserEnv, ...options.userEnv },
 
 			nls: {
-				// VSCODE_GLOBALS: NLS
-				messages: globalThis._VSCODE_NLS_MESSAGES,
-				language: globalThis._VSCODE_NLS_LANGUAGE
+				messages: getNLSMessages(),
+				language: getNLSLanguage()
 			},
 
 			filesToOpenOrCreate: options.filesToOpen?.filesToOpenOrCreate,
@@ -1472,7 +1464,9 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 			accessibilitySupport: app.accessibilitySupportEnabled,
 			colorScheme: this.themeMainService.getColorScheme(),
 			policiesData: this.policyService.serialize(),
-			continueOn: this.environmentMainService.continueOn
+			continueOn: this.environmentMainService.continueOn,
+
+			cssModules: this.cssDevelopmentService.isEnabled ? await this.cssDevelopmentService.getCssModules() : undefined
 		};
 
 		// New window
diff --git a/src/vs/server/node/extensionHostConnection.ts b/src/vs/server/node/extensionHostConnection.ts
index f345bd69a2d..d7608e399bf 100644
--- a/src/vs/server/node/extensionHostConnection.ts
+++ b/src/vs/server/node/extensionHostConnection.ts
@@ -125,7 +125,11 @@ export class ExtensionHostConnection extends Disposable {
 		@IConfigurationService private readonly _configurationService: IConfigurationService
 	) {
 		super();
-		this._canSendSocket = (!isWindows || !this._environmentService.args['socket-path']);
+		// --- Start PWB ---
+		// this._canSendSocket = (!isWindows || !this._environmentService.args['socket-path']);
+		this._canSendSocket = ((!isWindows || !this._environmentService.args['socket-path']) &&
+			!(this._environmentService.args['cert'] && this._environmentService.args['cert-key']));
+		// --- End PWB ---
 		this._disposed = false;
 		this._remoteAddress = remoteAddress;
 		this._extensionHostProcess = null;
@@ -190,7 +194,16 @@ export class ExtensionHostConnection extends Disposable {
 		} else {
 			socket = connectionData.socket.socket.socket;
 		}
-		extensionHostProcess.send(msg, socket);
+		// --- Start PWB ---
+		try {
+			extensionHostProcess.send(msg, socket);
+		} catch (error) {
+			console.error('Error occurred while attempting to send socket to extension host');
+			if (error) {
+				console.error(error);
+			}
+		}
+		// --- End PWB ---
 	}
 
 	public shortenReconnectionGraceTimeIfNecessary(): void {
diff --git a/src/vs/server/node/pwbConstants.ts b/src/vs/server/node/pwbConstants.ts
new file mode 100644
index 00000000000..da2cafc92db
--- /dev/null
+++ b/src/vs/server/node/pwbConstants.ts
@@ -0,0 +1,2 @@
+/* eslint-disable header/header */
+export const kProxyRegex = new RegExp('\/proxy\/[0-9]+[^a-zA-Z](\/)?');
diff --git a/src/vs/server/node/remoteExtensionHostAgentServer.ts b/src/vs/server/node/remoteExtensionHostAgentServer.ts
index f8cc22d378c..e11d1edaa8b 100644
--- a/src/vs/server/node/remoteExtensionHostAgentServer.ts
+++ b/src/vs/server/node/remoteExtensionHostAgentServer.ts
@@ -9,7 +9,7 @@ import * as http from 'http';
 import * as net from 'net';
 import { performance } from 'perf_hooks';
 import * as url from 'url';
-import { LoaderStats } from 'vs/base/common/amd';
+import { LoaderStats, isESM } from 'vs/base/common/amd';
 import { VSBuffer } from 'vs/base/common/buffer';
 import { CharCode } from 'vs/base/common/charCode';
 import { isSigPipeError, onUnexpectedError, setUnexpectedErrorHandler } from 'vs/base/common/errors';
@@ -48,6 +48,10 @@ import { validateLicenseKey } from 'vs/server/node/remoteLicenseKey';
 import { MandatoryServerConnectionToken } from 'vs/server/node/serverConnectionToken';
 // --- End Positron ---
 
+// --- Start PWB: Server proxy support ---
+import { kProxyRegex } from 'vs/server/node/pwbConstants';
+// --- End PWB ---
+
 const SHUTDOWN_TIMEOUT = 5 * 60 * 1000;
 
 declare module vsda {
@@ -104,11 +108,6 @@ class RemoteExtensionHostAgentServer extends Disposable implements IServerAPI {
 	}
 
 	public async handleRequest(req: http.IncomingMessage, res: http.ServerResponse): Promise<void> {
-		// Only serve GET requests
-		if (req.method !== 'GET') {
-			return serveError(req, res, 405, `Unsupported method ${req.method}`);
-		}
-
 		if (!req.url) {
 			return serveError(req, res, 400, `Bad request.`);
 		}
@@ -120,6 +119,17 @@ class RemoteExtensionHostAgentServer extends Disposable implements IServerAPI {
 			return serveError(req, res, 400, `Bad request.`);
 		}
 
+		// --- Start PWB: Server proxy support ---
+		// Only serve GET requests unless targeting the proxy server
+		if (req.method !== 'GET') {
+			if (this._webClientServer && kProxyRegex.test(pathname)) {
+				this._webClientServer.handle(req, res, parsedUrl);
+				return;
+			}
+			return serveError(req, res, 405, `Unsupported method ${req.method}`);
+		}
+		// --- End PWB ---
+
 		// for now accept all paths, with or without server root path
 		if (pathname.startsWith(this._serverRootPath) && pathname.charCodeAt(this._serverRootPath.length) === CharCode.Slash) {
 			pathname = pathname.substring(this._serverRootPath.length);
@@ -186,11 +196,16 @@ class RemoteExtensionHostAgentServer extends Disposable implements IServerAPI {
 		return void res.end('Not found');
 	}
 
-	public handleUpgrade(req: http.IncomingMessage, socket: net.Socket) {
+	// PWB Modify Start: Add upgradedHead parameter to handleUpgrade for server proxy support
+	public handleUpgrade(req: http.IncomingMessage, socket: net.Socket, upgradeHead: any) {
+		// PWB Modify End
 		let reconnectionToken = generateUuid();
 		let isReconnection = false;
 		let skipWebSocketFrames = false;
 
+		// --- Start PWB: Server proxy support ---
+		let pathname = null;
+		// --- End PWB ---
 		if (req.url) {
 			const query = url.parse(req.url, true).query;
 			if (typeof query.reconnectionToken === 'string') {
@@ -202,6 +217,10 @@ class RemoteExtensionHostAgentServer extends Disposable implements IServerAPI {
 			if (query.skipWebSocketFrames === 'true') {
 				skipWebSocketFrames = true;
 			}
+
+			// --- Start PWB: Server proxy support ---
+			pathname = url.parse(req.url, true).pathname;
+			// --- End PWB ---
 		}
 
 		if (req.headers['upgrade'] === undefined || req.headers['upgrade'].toLowerCase() !== 'websocket') {
@@ -209,6 +228,15 @@ class RemoteExtensionHostAgentServer extends Disposable implements IServerAPI {
 			return;
 		}
 
+		// --- Start PWB: Server proxy support ---
+		if (pathname) {
+			if (this._webClientServer && kProxyRegex.test(pathname)) {
+				this._webClientServer.handleUpgrade(req, socket, upgradeHead, pathname);
+				return;
+			}
+		}
+		// --- End PWB ---
+
 		// https://tools.ietf.org/html/rfc6455#section-4
 		const requestNonce = req.headers['sec-websocket-key'];
 		const hash = crypto.createHash('sha1');// CodeQL [SM04514] SHA1 must be used here to respect the WebSocket protocol specification
@@ -658,10 +686,12 @@ export interface IServerAPI {
 	 * Do not remove!!. Called from server-main.js
 	 */
 	handleRequest(req: http.IncomingMessage, res: http.ServerResponse): Promise<void>;
+	// PWB Modify Start: Add upgradedHead parameter to handleUpgrade for server proxy support
 	/**
 	 * Do not remove!!. Called from server-main.js
 	 */
-	handleUpgrade(req: http.IncomingMessage, socket: net.Socket): void;
+	handleUpgrade(req: http.IncomingMessage, socket: net.Socket, upgradeHead: any): void;
+	// PWB Modify End
 	/**
 	 * Do not remove!!. Called from server-main.js
 	 */
@@ -724,7 +754,7 @@ export async function createServer(address: string | net.AddressInfo | null, arg
 	let didLogAboutSIGPIPE = false;
 	process.on('SIGPIPE', () => {
 		// See https://github.com/microsoft/vscode-remote-release/issues/6543
-		// We would normally install a SIGPIPE listener in bootstrap.js
+		// We would normally install a SIGPIPE listener in bootstrap-node.js
 		// But in certain situations, the console itself can be in a broken pipe state
 		// so logging SIGPIPE to the console will cause an infinite async loop
 		if (!didLogAboutSIGPIPE) {
@@ -809,12 +839,15 @@ export async function createServer(address: string | net.AddressInfo | null, arg
 		serverBasePath = `/${serverBasePath}`;
 	}
 
-	const hasWebClient = fs.existsSync(FileAccess.asFileUri('vs/code/browser/workbench/workbench.html').fsPath);
+	const hasWebClient = fs.existsSync(FileAccess.asFileUri(`vs/code/browser/workbench/workbench.${isESM ? 'esm.' : ''}html`).fsPath);
 
 	if (hasWebClient && address && typeof address !== 'string') {
 		// ships the web ui!
-		const queryPart = (connectionToken.type !== ServerConnectionTokenType.None ? `?${connectionTokenQueryName}=${connectionToken.value}` : '');
-		console.log(`Web UI available at http://localhost${address.port === 80 ? '' : `:${address.port}`}${serverBasePath ?? ''}${queryPart}`);
+		// -- Start PWB: SSL support
+		const queryPart = (connectionToken.type !== ServerConnectionTokenType.None ? `?${connectionTokenQueryName}=${encodeURIComponent(connectionToken.value)}` : '');
+		const useSSL = (args['cert'] && args['cert-key']) ? true : false;
+		console.log(`Web UI available at http${useSSL ? 's' : ''}://localhost${useSSL ? (address.port === 443 ? '' : `:${address.port}`) : (address.port === 80 ? '' : `:${address.port}`)}/${queryPart}`);
+		// -- End PWB: SSL support
 	}
 
 	const remoteExtensionHostAgentServer = instantiationService.createInstance(RemoteExtensionHostAgentServer, socketServer, connectionToken, vsdaMod, hasWebClient, serverBasePath);
diff --git a/src/vs/server/node/server.main.ts b/src/vs/server/node/server.main.ts
index 469671e5745..d6e4652e519 100644
--- a/src/vs/server/node/server.main.ts
+++ b/src/vs/server/node/server.main.ts
@@ -13,6 +13,10 @@ import { parseArgs, ErrorReporter } from 'vs/platform/environment/node/argv';
 import { join, dirname } from 'vs/base/common/path';
 import { performance } from 'perf_hooks';
 import { serverOptions } from 'vs/server/node/serverEnvironmentService';
+// --- Start PWB ---
+// eslint-disable-next-line no-duplicate-imports
+import { ServerParsedArgs } from 'vs/server/node/serverEnvironmentService';
+// --- End PWB ---
 import product from 'vs/platform/product/common/product';
 import * as perf from 'vs/base/common/performance';
 
@@ -34,38 +38,50 @@ const errorReporter: ErrorReporter = {
 	}
 };
 
-const args = parseArgs(process.argv.slice(2), serverOptions, errorReporter);
+// --- Start PWB ---
+function parse(): ServerParsedArgs {
+	return parseArgs(process.argv.slice(2), serverOptions, errorReporter);
+}
+
+function createDirs(args: ServerParsedArgs): string {
 
-const REMOTE_DATA_FOLDER = args['server-data-dir'] || process.env['VSCODE_AGENT_FOLDER'] || join(os.homedir(), product.serverDataFolderName || '.vscode-remote');
-const USER_DATA_PATH = join(REMOTE_DATA_FOLDER, 'data');
-const APP_SETTINGS_HOME = join(USER_DATA_PATH, 'User');
-const GLOBAL_STORAGE_HOME = join(APP_SETTINGS_HOME, 'globalStorage');
-const LOCAL_HISTORY_HOME = join(APP_SETTINGS_HOME, 'History');
-const MACHINE_SETTINGS_HOME = join(USER_DATA_PATH, 'Machine');
-args['user-data-dir'] = USER_DATA_PATH;
-const APP_ROOT = dirname(FileAccess.asFileUri('').fsPath);
-const BUILTIN_EXTENSIONS_FOLDER_PATH = join(APP_ROOT, 'extensions');
-args['builtin-extensions-dir'] = BUILTIN_EXTENSIONS_FOLDER_PATH;
-args['extensions-dir'] = args['extensions-dir'] || join(REMOTE_DATA_FOLDER, 'extensions');
+	const REMOTE_DATA_FOLDER = args['server-data-dir'] || args['user-data-dir'] || process.env['VSCODE_AGENT_FOLDER'] || join(os.homedir(), product.serverDataFolderName || '.vscode-remote');
+	const USER_DATA_PATH = args['user-data-dir'] || join(REMOTE_DATA_FOLDER, 'data');
+	const APP_SETTINGS_HOME = join(USER_DATA_PATH, 'User');
+	const GLOBAL_STORAGE_HOME = join(APP_SETTINGS_HOME, 'globalStorage');
+	const LOCAL_HISTORY_HOME = join(APP_SETTINGS_HOME, 'History');
+	const MACHINE_SETTINGS_HOME = join(USER_DATA_PATH, 'Machine');
+	args['user-data-dir'] = USER_DATA_PATH;
+	const APP_ROOT = dirname(FileAccess.asFileUri('').fsPath);
+	const BUILTIN_EXTENSIONS_FOLDER_PATH = join(APP_ROOT, 'extensions');
+	args['builtin-extensions-dir'] = BUILTIN_EXTENSIONS_FOLDER_PATH;
+	args['extensions-dir'] = args['extensions-dir'] || join(REMOTE_DATA_FOLDER, 'extensions');
 
-[REMOTE_DATA_FOLDER, args['extensions-dir'], USER_DATA_PATH, APP_SETTINGS_HOME, MACHINE_SETTINGS_HOME, GLOBAL_STORAGE_HOME, LOCAL_HISTORY_HOME].forEach(f => {
-	try {
-		if (!fs.existsSync(f)) {
-			fs.mkdirSync(f, { mode: 0o700 });
-		}
-	} catch (err) { console.error(err); }
-});
+	[REMOTE_DATA_FOLDER, args['extensions-dir'], USER_DATA_PATH, APP_SETTINGS_HOME, MACHINE_SETTINGS_HOME, GLOBAL_STORAGE_HOME, LOCAL_HISTORY_HOME].forEach(f => {
+		try {
+			if (!fs.existsSync(f)) {
+				fs.mkdirSync(f, { mode: 0o700 });
+			}
+		} catch (err) { console.error(err); }
+	});
+	return REMOTE_DATA_FOLDER;
+}
+// --- End PWB ---
 
 /**
  * invoked by server-main.js
  */
-export function spawnCli() {
-	runCli(args, REMOTE_DATA_FOLDER, serverOptions);
+// --- Start PWB ---
+export function spawnCli(args = parse()) {
+	runCli(args, createDirs(args), serverOptions);
+	// --- End PWB ---
 }
 
 /**
  * invoked by server-main.js
  */
-export function createServer(address: string | net.AddressInfo | null): Promise<IServerAPI> {
-	return doCreateServer(address, args, REMOTE_DATA_FOLDER);
+// --- Start PWB ---
+export function createServer(address: string | net.AddressInfo | null, args = parse()): Promise<IServerAPI> {
+	return doCreateServer(address, args, createDirs(args));
+	// --- End PWB ---
 }
diff --git a/src/vs/server/node/serverEnvironmentService.ts b/src/vs/server/node/serverEnvironmentService.ts
index ff1fdb04009..85ba4e734a1 100644
--- a/src/vs/server/node/serverEnvironmentService.ts
+++ b/src/vs/server/node/serverEnvironmentService.ts
@@ -13,11 +13,13 @@ import { memoize } from 'vs/base/common/decorators';
 import { URI } from 'vs/base/common/uri';
 
 export const serverOptions: OptionDescriptions<Required<ServerParsedArgs>> = {
-
 	/* ----- server setup ----- */
-
 	'host': { type: 'string', cat: 'o', args: 'ip-address', description: nls.localize('host', "The host name or IP address the server should listen to. If not set, defaults to 'localhost'.") },
 	'port': { type: 'string', cat: 'o', args: 'port | port range', description: nls.localize('port', "The port the server should listen to. If 0 is passed a random free port is picked. If a range in the format num-num is passed, a free port from the range (end inclusive) is selected.") },
+	// --- Start PWB ---
+	'cert-key': { type: 'string', cat: 'o', args: 'path', description: nls.localize('cert-key', "The path to a private key.") },
+	'cert': { type: 'string', cat: 'o', args: 'path', description: nls.localize('cert', "The path to a certificate.") },
+	// --- End PWB ---
 	'socket-path': { type: 'string', cat: 'o', args: 'path', description: nls.localize('socket-path', "The path to a socket file for the server to listen to.") },
 	'server-base-path': { type: 'string', cat: 'o', args: 'path', description: nls.localize('server-base-path', "The path under which the web UI and the code server is provided. Defaults to '/'.`") },
 	'connection-token': { type: 'string', cat: 'o', args: 'token', deprecates: ['connectionToken'], description: nls.localize('connection-token', "A secret that must be included with all requests.") },
@@ -27,6 +29,10 @@ export const serverOptions: OptionDescriptions<Required<ServerParsedArgs>> = {
 	'print-startup-performance': { type: 'boolean' },
 	'print-ip-address': { type: 'boolean' },
 	'accept-server-license-terms': { type: 'boolean', cat: 'o', description: nls.localize('acceptLicenseTerms', "If set, the user accepts the server license terms and the server will be started without a user prompt.") },
+	// --- Start PWB: disable file downloads ---
+	'disable-file-downloads': { type: 'boolean', cat: 'o', description: nls.localize('disableFileDownloads', "Disables file downloads.") },
+	'disable-file-uploads': { type: 'boolean', cat: 'o', description: nls.localize('disableFileUploads', "Disables file uploads.") },
+	// --- End PWB ---
 	'server-data-dir': { type: 'string', cat: 'o', description: nls.localize('serverDataDir', "Specifies the directory that server data is kept in.") },
 	'telemetry-level': { type: 'string', cat: 'o', args: 'level', description: nls.localize('telemetry-level', "Sets the initial telemetry level. Valid levels are: 'off', 'crash', 'error' and 'all'. If not specified, the server will send telemetry until a client connects, it will then use the clients telemetry setting. Setting this to 'off' is equivalent to --disable-telemetry") },
 
@@ -72,7 +78,6 @@ export const serverOptions: OptionDescriptions<Required<ServerParsedArgs>> = {
 	'pre-release': OPTIONS['pre-release'],
 	'start-server': { type: 'boolean', cat: 'e', description: nls.localize('start-server', "Start the server when installing or uninstalling extensions. To be used in combination with 'install-extension', 'install-builtin-extension' and 'uninstall-extension'.") },
 
-
 	/* ----- remote development options ----- */
 
 	'enable-remote-auto-shutdown': { type: 'boolean' },
@@ -101,6 +106,11 @@ export const serverOptions: OptionDescriptions<Required<ServerParsedArgs>> = {
 
 export interface ServerParsedArgs {
 
+	// --- Start PWB: disable file downloads ---
+	'disable-file-downloads'?: boolean;
+	'disable-file-uploads'?: boolean;
+	// --- End PWB ---
+
 	/* ----- server setup ----- */
 
 	host?: string;
@@ -108,8 +118,11 @@ export interface ServerParsedArgs {
 	 * A port or a port range
 	 */
 	port?: string;
+	// --- Start PWB ---
+	'cert-key'?: string;
+	'cert'?: string;
+	// --- End PWB ---
 	'socket-path'?: string;
-
 	/**
 	 * The path under which the web UI and the code server is provided.
 	 * By defaults it is '/'.`
diff --git a/src/vs/server/node/serverServices.ts b/src/vs/server/node/serverServices.ts
index 46f2f004655..f9ca0e7c399 100644
--- a/src/vs/server/node/serverServices.ts
+++ b/src/vs/server/node/serverServices.ts
@@ -77,6 +77,7 @@ import { RemoteExtensionsScannerChannel, RemoteExtensionsScannerService } from '
 import { RemoteExtensionsScannerChannelName } from 'vs/platform/remote/common/remoteExtensionsScanner';
 import { RemoteUserDataProfilesServiceChannel } from 'vs/platform/userDataProfile/common/userDataProfileIpc';
 import { NodePtyHostStarter } from 'vs/platform/terminal/node/nodePtyHostStarter';
+import { CSSDevelopmentService, ICSSDevelopmentService } from 'vs/platform/cssDev/node/cssDevService';
 
 const eventPrefix = 'monacoworkbench';
 
@@ -131,6 +132,9 @@ export async function setupServerServices(connectionToken: ServerConnectionToken
 	services.set(IUserDataProfilesService, userDataProfilesService);
 	socketServer.registerChannel('userDataProfiles', new RemoteUserDataProfilesServiceChannel(userDataProfilesService, (ctx: RemoteAgentConnectionContext) => getUriTransformer(ctx.remoteAuthority)));
 
+	// Dev Only: CSS service (for ESM)
+	services.set(ICSSDevelopmentService, new SyncDescriptor(CSSDevelopmentService, undefined, true));
+
 	// Initialize
 	const [, , machineId, sqmId, devDeviceId] = await Promise.all([
 		configurationService.initialize(),
diff --git a/src/vs/server/node/webClientServer.ts b/src/vs/server/node/webClientServer.ts
index 5bddd2024f7..62689280aab 100644
--- a/src/vs/server/node/webClientServer.ts
+++ b/src/vs/server/node/webClientServer.ts
@@ -28,6 +28,13 @@ import { IProductConfiguration } from 'vs/base/common/product';
 import { isString } from 'vs/base/common/types';
 import { CharCode } from 'vs/base/common/charCode';
 import { IExtensionManifest } from 'vs/platform/extensions/common/extensions';
+import { isESM } from 'vs/base/common/amd';
+import { ICSSDevelopmentService } from 'vs/platform/cssDev/node/cssDevService';
+
+// --- Start PWB: Server proxy support ---
+const proxyServer = <typeof import('http-proxy')>require.__$__nodeRequire('http-proxy');
+import { kProxyRegex } from 'vs/server/node/pwbConstants';
+// --- End PWB ---
 
 const textMimeType: { [ext: string]: string | undefined } = {
 	'.html': 'text/html',
@@ -98,7 +105,10 @@ export class WebClientServer {
 
 	private readonly _staticRoute: string;
 	private readonly _callbackRoute: string;
+	// --- Start PWB ---
 	private readonly _webExtensionRoute: string;
+	private readonly _proxyServer;
+	// --- End PWB ---
 
 	constructor(
 		private readonly _connectionToken: ServerConnectionToken,
@@ -108,12 +118,29 @@ export class WebClientServer {
 		@ILogService private readonly _logService: ILogService,
 		@IRequestService private readonly _requestService: IRequestService,
 		@IProductService private readonly _productService: IProductService,
+		@ICSSDevelopmentService private readonly _cssDevService: ICSSDevelopmentService
 	) {
 		this._webExtensionResourceUrlTemplate = this._productService.extensionsGallery?.resourceUrlTemplate ? URI.parse(this._productService.extensionsGallery.resourceUrlTemplate) : undefined;
 
 		this._staticRoute = `${serverRootPath}/static`;
 		this._callbackRoute = `${serverRootPath}/callback`;
-		this._webExtensionRoute = `${serverRootPath}/web-extension-resource`;
+		this._webExtensionRoute = `/web-extension-resource`;
+
+		// --- Start PWB: Server proxy support
+		this._proxyServer = proxyServer.createProxyServer({});
+		this._proxyServer.on('proxyRes', (res: http.IncomingMessage, req: http.IncomingMessage) => {
+			const base = req.url?.split('/').slice(0, 3).join('/');
+			if (res.headers.location && res.headers.location.startsWith('/') && base) {
+				res.headers.location = base + res.headers.location;
+			}
+		});
+
+		this._proxyServer.on('error', (err, req, res) => {
+			const message = `Could not proxy ${req.method} request to ${req.url}: ${err.message}`;
+			console.error(message);
+			res.end(message);
+		});
+		// --- End PWB ---
 	}
 
 	/**
@@ -124,7 +151,6 @@ export class WebClientServer {
 	async handle(req: http.IncomingMessage, res: http.ServerResponse, parsedUrl: url.UrlWithParsedQuery): Promise<void> {
 		try {
 			const pathname = parsedUrl.pathname!;
-
 			if (pathname.startsWith(this._staticRoute) && pathname.charCodeAt(this._staticRoute.length) === CharCode.Slash) {
 				return this._handleStatic(req, res, parsedUrl);
 			}
@@ -135,6 +161,16 @@ export class WebClientServer {
 				// callback support
 				return this._handleCallback(res);
 			}
+			// --- PWB Start: Server proxy support ---
+			if (kProxyRegex.test(pathname)) {
+				const path: string = pathname.replace('/proxy/', 'http://0.0.0.0:');
+
+				return this._proxyServer.web(req, res, {
+					ignorePath: true,
+					target: path
+				});
+			}
+			// --- PWB End ---
 			if (pathname.startsWith(this._webExtensionRoute) && pathname.charCodeAt(this._webExtensionRoute.length) === CharCode.Slash) {
 				// extension resource support
 				return this._handleWebExtensionResource(req, res, parsedUrl);
@@ -148,6 +184,20 @@ export class WebClientServer {
 			return serveError(req, res, 500, 'Internal Server Error.');
 		}
 	}
+
+	// PWB Start: Proxy server websocket support
+	/**
+	 * Handle proxy requests for websockets
+	 */
+	async handleUpgrade(req: http.IncomingMessage, socket: any, upgradeHead: any, parsedUrl: string): Promise<void> {
+		const path: string = parsedUrl.replace('/proxy/', 'http://0.0.0.0:');
+		return this._proxyServer.ws(req, socket, upgradeHead, {
+			ignorePath: true,
+			target: path
+		});
+	}
+	// PWB End
+
 	/**
 	 * Handle HTTP requests for /static/*
 	 */
@@ -269,20 +319,10 @@ export class WebClientServer {
 			return void res.end();
 		}
 
-		const getFirstHeader = (headerName: string) => {
-			const val = req.headers[headerName];
-			return Array.isArray(val) ? val[0] : val;
-		};
-
+		// Start PWB: support use as web app (removed code to retrieve removeAuthority from a header)
+		const remoteAuthority = 'remote';
+		// End PWB
 		const useTestResolver = (!this._environmentService.isBuilt && this._environmentService.args['use-test-resolver']);
-		const remoteAuthority = (
-			useTestResolver
-				? 'test+test'
-				: (getFirstHeader('x-original-host') || getFirstHeader('x-forwarded-host') || req.headers.host)
-		);
-		if (!remoteAuthority) {
-			return serveError(req, res, 400, `Bad request.`);
-		}
 
 		function asJSON(value: unknown): string {
 			return JSON.stringify(value).replace(/"/g, '&quot;');
@@ -297,7 +337,7 @@ export class WebClientServer {
 
 		const resolveWorkspaceURI = (defaultLocation?: string) => defaultLocation && URI.file(path.resolve(defaultLocation)).with({ scheme: Schemas.vscodeRemote, authority: remoteAuthority });
 
-		const filePath = FileAccess.asFileUri(this._environmentService.isBuilt ? 'vs/code/browser/workbench/workbench.html' : 'vs/code/browser/workbench/workbench-dev.html').fsPath;
+		const filePath = FileAccess.asFileUri(`vs/code/browser/workbench/workbench${this._environmentService.isBuilt ? '' : '-dev'}.${isESM ? 'esm.' : ''}html`).fsPath;
 		const authSessionInfo = !this._environmentService.isBuilt && this._environmentService.args['github-auth'] ? {
 			id: generateUuid(),
 			providerId: 'github',
@@ -305,25 +345,18 @@ export class WebClientServer {
 			scopes: [['user:email'], ['repo']]
 		} : undefined;
 
-		// --- Start Positron ---
-		// Adds support for serving at non-root paths.
+		// --- Start PWB: add base web prefix ---
 		const base = relativeRoot(req.url!);
-		// --- End Positron ---
-		//
+		const vscodeBase = relativePath(req.url!);
+		// --- End PWB ---
+
 		const productConfiguration = {
 			embedderIdentifier: 'server-distro',
-			// --- Start Positron ---
-			// Adds support for serving at non-root paths.
+			// --- Start PWB: web prefix, proxy port url, custom extensions gallery ---
 			rootEndpoint: base,
-			// --- End Positron ---
-			extensionsGallery: this._webExtensionResourceUrlTemplate && this._productService.extensionsGallery ? {
-				...this._productService.extensionsGallery,
-				resourceUrlTemplate: this._webExtensionResourceUrlTemplate.with({
-					scheme: 'http',
-					authority: remoteAuthority,
-					path: `${this._webExtensionRoute}/${this._webExtensionResourceUrlTemplate.authority}${this._webExtensionResourceUrlTemplate.path}`
-				}).toString(true)
-			} : undefined
+			proxyEndpointTemplate: base + `/p/{{port}}/${process.env.RS_PORT_TOKEN}`,
+			extensionsGallery: this._productService.extensionsGallery,
+			// --- End PWB ---
 		} satisfies Partial<IProductConfiguration>;
 
 		if (!this._environmentService.isBuilt) {
@@ -336,6 +369,16 @@ export class WebClientServer {
 		const workbenchWebConfiguration = {
 			remoteAuthority,
 			serverBasePath: this._basePath,
+			// --- Start PWB: Local storage ---
+			userDataPath: this._environmentService.userDataPath,
+			// --- End PWB ---
+			// --- Start PWB: disable file downloads ---
+			isEnabledFileDownloads: !this._environmentService.args['disable-file-downloads'],
+			isEnabledFileUploads: !this._environmentService.args['disable-file-uploads'],
+			// --- End PWB ---
+			// --- Start PWB: serve same origin ---
+			webviewEndpoint: vscodeBase + this._staticRoute + '/out/vs/workbench/contrib/webview/browser/pre',
+			// --- End PWB: serve same origin ---
 			_wrapWebWorkerExtHostInIframe,
 			developmentOptions: { enableSmokeTestDriver: this._environmentService.args['enable-smoke-test-driver'] ? true : undefined, logLevel: this._logService.getLevel() },
 			settingsSyncOptions: !this._environmentService.isBuilt && this._environmentService.args['enable-sync'] ? { enabled: true } : undefined,
@@ -360,11 +403,27 @@ export class WebClientServer {
 		const values: { [key: string]: string } = {
 			WORKBENCH_WEB_CONFIGURATION: asJSON(workbenchWebConfiguration),
 			WORKBENCH_AUTH_SESSION: authSessionInfo ? asJSON(authSessionInfo) : '',
-			WORKBENCH_WEB_BASE_URL: this._staticRoute,
+			// --- Start PWB ---
+			// WORKBENCH_WEB_BASE_URL: this._staticRoute,
+			WORKBENCH_WEB_BASE_URL: vscodeBase + this._staticRoute,
+			WORKBENCH_NLS_BASE_URL: WORKBENCH_NLS_BASE_URL ?? '',
 			WORKBENCH_NLS_URL,
-			WORKBENCH_NLS_FALLBACK_URL: `${this._staticRoute}/out/nls.messages.js`
+			WORKBENCH_NLS_FALLBACK_URL: `${vscodeBase}${this._staticRoute}/out/nls.messages.js`,
+			BASE: base,
+			VS_BASE: vscodeBase,
+			// --- End PWB ---
 		};
 
+		// DEV ---------------------------------------------------------------------------------------
+		// DEV: This is for development and enables loading CSS via import-statements via import-maps.
+		// DEV: The server needs to send along all CSS modules so that the client can construct the
+		// DEV: import-map.
+		// DEV ---------------------------------------------------------------------------------------
+		if (this._cssDevService.isEnabled) {
+			const cssModules = await this._cssDevService.getCssModules();
+			values['WORKBENCH_DEV_CSS_MODULES'] = JSON.stringify(cssModules);
+		}
+
 		if (useTestResolver) {
 			const bundledExtensions: { extensionPath: string; packageJSON: IExtensionManifest }[] = [];
 			for (const extensionPath of ['vscode-test-resolver', 'github-authentication']) {
@@ -383,13 +442,15 @@ export class WebClientServer {
 			return void res.end('Not found');
 		}
 
-		const webWorkerExtensionHostIframeScriptSHA = 'sha256-V28GQnL3aYxbwgpV3yW1oJ+VKKe/PBSzWntNyH8zVXA=';
+		const webWorkerExtensionHostIframeScriptSHA = isESM ? 'sha256-2Q+j4hfT09+1+imS46J2YlkCtHWQt0/BE79PXjJ0ZJ8=' : 'sha256-V28GQnL3aYxbwgpV3yW1oJ+VKKe/PBSzWntNyH8zVXA=';
 
 		const cspDirectives = [
 			'default-src \'self\';',
 			'img-src \'self\' https: data: blob:;',
 			'media-src \'self\';',
-			`script-src 'self' 'unsafe-eval' ${WORKBENCH_NLS_BASE_URL ?? ''} ${this._getScriptCspHashes(data).join(' ')} '${webWorkerExtensionHostIframeScriptSHA}' ${useTestResolver ? '' : `http://${remoteAuthority}`};`, // the sha is the same as in src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html
+			isESM ?
+				`script-src 'self' 'unsafe-eval' ${WORKBENCH_NLS_BASE_URL ?? ''} blob: 'nonce-1nline-m4p' ${this._getScriptCspHashes(data).join(' ')} '${webWorkerExtensionHostIframeScriptSHA}' 'sha256-/r7rqQ+yrxt57sxLuQ6AMYcy/lUpvAIzHjIJt/OeLWU=' ${useTestResolver ? '' : `http://${remoteAuthority}`};` : // the sha is the same as in src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.esm.html
+				`script-src 'self' 'unsafe-eval' ${WORKBENCH_NLS_BASE_URL ?? ''} ${this._getScriptCspHashes(data).join(' ')} '${webWorkerExtensionHostIframeScriptSHA}' ${useTestResolver ? '' : `http://${remoteAuthority}`};`, // the sha is the same as in src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html
 			'child-src \'self\';',
 			`frame-src 'self' https://*.vscode-cdn.net data:;`,
 			'worker-src \'self\' data: blob:;',
diff --git a/src/vs/workbench/api/browser/mainThreadAuthentication.ts b/src/vs/workbench/api/browser/mainThreadAuthentication.ts
index 28ef23588c6..c1500981d23 100644
--- a/src/vs/workbench/api/browser/mainThreadAuthentication.ts
+++ b/src/vs/workbench/api/browser/mainThreadAuthentication.ts
@@ -19,6 +19,7 @@ import { IAuthenticationUsageService } from 'vs/workbench/services/authenticatio
 import { getAuthenticationProviderActivationEvent } from 'vs/workbench/services/authentication/browser/authenticationService';
 import { URI, UriComponents } from 'vs/base/common/uri';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
+import { CancellationError } from 'vs/base/common/errors';
 
 interface AuthenticationForceNewSessionOptions {
 	detail?: string;
@@ -159,6 +160,31 @@ export class MainThreadAuthentication extends Disposable implements MainThreadAu
 		return result ?? false;
 	}
 
+	private async continueWithIncorrectAccountPrompt(chosenAccountLabel: string, requestedAccountLabel: string): Promise<boolean> {
+		const result = await this.dialogService.prompt({
+			message: nls.localize('incorrectAccount', "Incorrect account detected"),
+			detail: nls.localize('incorrectAccountDetail', "The chosen account, {0}, does not match the requested account, {1}.", chosenAccountLabel, requestedAccountLabel),
+			type: Severity.Warning,
+			cancelButton: true,
+			buttons: [
+				{
+					label: nls.localize('keep', 'Keep {0}', chosenAccountLabel),
+					run: () => chosenAccountLabel
+				},
+				{
+					label: nls.localize('loginWith', 'Login with {0}', requestedAccountLabel),
+					run: () => requestedAccountLabel
+				}
+			],
+		});
+
+		if (!result.result) {
+			throw new CancellationError();
+		}
+
+		return result.result === chosenAccountLabel;
+	}
+
 	private async doGetSession(providerId: string, scopes: string[], extensionId: string, extensionName: string, options: AuthenticationGetSessionOptions): Promise<AuthenticationSession | undefined> {
 		const sessions = await this.authenticationService.getSessions(providerId, scopes, options.account, true);
 		const provider = this.authenticationService.getProvider(providerId);
@@ -212,18 +238,25 @@ export class MainThreadAuthentication extends Disposable implements MainThreadAu
 				throw new Error('User did not consent to login.');
 			}
 
-			let session;
+			let session: AuthenticationSession;
 			if (sessions?.length && !options.forceNewSession) {
 				session = provider.supportsMultipleAccounts && !options.account
 					? await this.authenticationExtensionsService.selectSession(providerId, extensionId, extensionName, scopes, sessions)
 					: sessions[0];
 			} else {
-				let account: AuthenticationSessionAccount | undefined = options.account;
-				if (!account) {
+				let accountToCreate: AuthenticationSessionAccount | undefined = options.account;
+				if (!accountToCreate) {
 					const sessionIdToRecreate = this.authenticationExtensionsService.getSessionPreference(providerId, extensionId, scopes);
-					account = sessionIdToRecreate ? sessions.find(session => session.id === sessionIdToRecreate)?.account : undefined;
+					accountToCreate = sessionIdToRecreate ? sessions.find(session => session.id === sessionIdToRecreate)?.account : undefined;
 				}
-				session = await this.authenticationService.createSession(providerId, scopes, { activateImmediate: true, account });
+
+				do {
+					session = await this.authenticationService.createSession(providerId, scopes, { activateImmediate: true, account: accountToCreate });
+				} while (
+					accountToCreate
+					&& accountToCreate.label !== session.account.label
+					&& !await this.continueWithIncorrectAccountPrompt(session.account.label, accountToCreate.label)
+				);
 			}
 
 			this.authenticationAccessService.updateAllowedExtensions(providerId, session.account.label, [{ id: extensionId, name: extensionName, allowed: true }]);
diff --git a/src/vs/workbench/api/browser/mainThreadChatAgents2.ts b/src/vs/workbench/api/browser/mainThreadChatAgents2.ts
index 35126b7998d..ec9be12fedc 100644
--- a/src/vs/workbench/api/browser/mainThreadChatAgents2.ts
+++ b/src/vs/workbench/api/browser/mainThreadChatAgents2.ts
@@ -21,11 +21,11 @@ import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeat
 import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { ILogService } from 'vs/platform/log/common/log';
-import { ExtHostChatAgentsShape2, ExtHostContext, IChatProgressDto, IDynamicChatAgentProps, IExtensionChatAgentMetadata, MainContext, MainThreadChatAgentsShape2 } from 'vs/workbench/api/common/extHost.protocol';
+import { ExtHostChatAgentsShape2, ExtHostContext, IChatParticipantMetadata, IChatProgressDto, IDynamicChatAgentProps, IExtensionChatAgentMetadata, MainContext, MainThreadChatAgentsShape2 } from 'vs/workbench/api/common/extHost.protocol';
 import { IChatWidgetService } from 'vs/workbench/contrib/chat/browser/chat';
 import { ChatInputPart } from 'vs/workbench/contrib/chat/browser/chatInputPart';
 import { AddDynamicVariableAction, IAddDynamicVariableContext } from 'vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables';
-import { ChatAgentLocation, IChatAgentImplementation, IChatAgentService } from 'vs/workbench/contrib/chat/common/chatAgents';
+import { ChatAgentLocation, IChatAgentHistoryEntry, IChatAgentImplementation, IChatAgentRequest, IChatAgentService } from 'vs/workbench/contrib/chat/common/chatAgents';
 import { ChatRequestAgentPart } from 'vs/workbench/contrib/chat/common/chatParserTypes';
 import { ChatRequestParser } from 'vs/workbench/contrib/chat/common/chatRequestParser';
 import { IChatContentReference, IChatFollowup, IChatProgress, IChatService, IChatTask, IChatWarningMessage } from 'vs/workbench/contrib/chat/common/chatService';
@@ -76,6 +76,8 @@ export class MainThreadChatAgents2 extends Disposable implements MainThreadChatA
 	private readonly _agentCompletionProviders = this._register(new DisposableMap<number, IDisposable>());
 	private readonly _agentIdsToCompletionProviders = this._register(new DisposableMap<string, IDisposable>);
 
+	private readonly _chatParticipantDetectionProviders = this._register(new DisposableMap<number, IDisposable>());
+
 	private readonly _pendingProgress = new Map<string, (part: IChatProgress) => void>();
 	private readonly _proxy: ExtHostChatAgentsShape2;
 
@@ -103,7 +105,7 @@ export class MainThreadChatAgents2 extends Disposable implements MainThreadChatA
 				for (const [handle, agent] of this._agents) {
 					if (agent.id === e.agentId) {
 						if (e.action.kind === 'vote') {
-							this._proxy.$acceptFeedback(handle, e.result ?? {}, e.action.direction);
+							this._proxy.$acceptFeedback(handle, e.result ?? {}, e.action);
 						} else {
 							this._proxy.$acceptAction(handle, e.result || {}, e);
 						}
@@ -161,6 +163,9 @@ export class MainThreadChatAgents2 extends Disposable implements MainThreadChatA
 			provideWelcomeMessage: (location: ChatAgentLocation, token: CancellationToken) => {
 				return this._proxy.$provideWelcomeMessage(handle, location, token);
 			},
+			provideChatTitle: (history, token) => {
+				return this._proxy.$provideChatTitle(handle, history, token);
+			},
 			provideSampleQuestions: (location: ChatAgentLocation, token: CancellationToken) => {
 				return this._proxy.$provideSampleQuestions(handle, location, token);
 			}
@@ -172,7 +177,7 @@ export class MainThreadChatAgents2 extends Disposable implements MainThreadChatA
 			disposable = this._chatAgentService.registerDynamicAgent(
 				{
 					id,
-					name: dynamicProps.name ?? '', // This case is for an API change and can be removed tomorrow
+					name: dynamicProps.name,
 					description: dynamicProps.description,
 					extensionId: extension,
 					extensionDisplayName: extensionDescription?.displayName ?? extension.value,
@@ -181,6 +186,7 @@ export class MainThreadChatAgents2 extends Disposable implements MainThreadChatA
 					fullName: dynamicProps.fullName,
 					metadata: revive(metadata),
 					slashCommands: [],
+					disambiguation: [],
 					locations: [ChatAgentLocation.Panel] // TODO all dynamic participants are panel only?
 				},
 				impl);
@@ -298,6 +304,20 @@ export class MainThreadChatAgents2 extends Disposable implements MainThreadChatA
 		this._agentCompletionProviders.deleteAndDispose(handle);
 		this._agentIdsToCompletionProviders.deleteAndDispose(id);
 	}
+
+	$registerChatParticipantDetectionProvider(handle: number): void {
+		this._chatParticipantDetectionProviders.set(handle, this._chatAgentService.registerChatParticipantDetectionProvider(handle,
+			{
+				provideParticipantDetection: async (request: IChatAgentRequest, history: IChatAgentHistoryEntry[], options: { location: ChatAgentLocation; participants: IChatParticipantMetadata[] }, token: CancellationToken) => {
+					return await this._proxy.$detectChatParticipant(handle, request, { history }, options, token);
+				}
+			}
+		));
+	}
+
+	$unregisterChatParticipantDetectionProvider(handle: number): void {
+		this._chatParticipantDetectionProviders.deleteAndDispose(handle);
+	}
 }
 
 
diff --git a/src/vs/workbench/api/browser/mainThreadComments.ts b/src/vs/workbench/api/browser/mainThreadComments.ts
index 91d33fc9f71..1504c0d2029 100644
--- a/src/vs/workbench/api/browser/mainThreadComments.ts
+++ b/src/vs/workbench/api/browser/mainThreadComments.ts
@@ -69,13 +69,13 @@ export class MainThreadCommentThread<T> implements languages.CommentThread<T> {
 	private readonly _onDidChangeLabel = new Emitter<string | undefined>();
 	readonly onDidChangeLabel: Event<string | undefined> = this._onDidChangeLabel.event;
 
-	private _comments: languages.Comment[] | undefined;
+	private _comments: ReadonlyArray<languages.Comment> | undefined;
 
-	public get comments(): languages.Comment[] | undefined {
+	public get comments(): ReadonlyArray<languages.Comment> | undefined {
 		return this._comments;
 	}
 
-	public set comments(newComments: languages.Comment[] | undefined) {
+	public set comments(newComments: ReadonlyArray<languages.Comment> | undefined) {
 		this._comments = newComments;
 		this._onDidChangeComments.fire(this._comments);
 	}
@@ -204,7 +204,7 @@ export class MainThreadCommentThread<T> implements languages.CommentThread<T> {
 		if (modified('range')) { this._range = changes.range!; }
 		if (modified('label')) { this._label = changes.label; }
 		if (modified('contextValue')) { this._contextValue = changes.contextValue === null ? undefined : changes.contextValue; }
-		if (modified('comments')) { this._comments = changes.comments; }
+		if (modified('comments')) { this.comments = changes.comments; }
 		if (modified('collapseState')) { this.initialCollapsibleState = changes.collapseState; }
 		if (modified('canReply')) { this.canReply = changes.canReply!; }
 		if (modified('state')) { this.state = changes.state!; }
@@ -212,6 +212,10 @@ export class MainThreadCommentThread<T> implements languages.CommentThread<T> {
 		if (modified('isTemplate')) { this._isTemplate = changes.isTemplate!; }
 	}
 
+	hasComments(): boolean {
+		return !!this.comments && this.comments.length > 0;
+	}
+
 	dispose() {
 		this._isDisposed = true;
 		this._onDidChangeCollapsibleState.dispose();
diff --git a/src/vs/workbench/api/browser/mainThreadLanguageFeatures.ts b/src/vs/workbench/api/browser/mainThreadLanguageFeatures.ts
index c3d51b7c102..ce3ce8a5f29 100644
--- a/src/vs/workbench/api/browser/mainThreadLanguageFeatures.ts
+++ b/src/vs/workbench/api/browser/mainThreadLanguageFeatures.ts
@@ -3,7 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { isFalsyOrEmpty } from 'vs/base/common/arrays';
 import { VSBuffer } from 'vs/base/common/buffer';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { createStringDataTransferItem, IReadonlyVSDataTransfer, VSDataTransfer } from 'vs/base/common/dataTransfer';
@@ -321,7 +320,9 @@ export class MainThreadLanguageFeatures extends Disposable implements MainThread
 			selector: selector,
 			provideMultiDocumentHighlights: (model: ITextModel, position: EditorPosition, otherModels: ITextModel[], token: CancellationToken): Promise<Map<URI, languages.DocumentHighlight[]> | undefined> => {
 				return this._proxy.$provideMultiDocumentHighlights(handle, model.uri, position, otherModels.map(model => model.uri), token).then(dto => {
-					if (isFalsyOrEmpty(dto)) {
+					// dto should be non-null + non-undefined
+					// dto length of 0 is valid, just no highlights, pass this through.
+					if (dto === undefined || dto === null) {
 						return undefined;
 					}
 					const result = new ResourceMap<languages.DocumentHighlight[]>();
diff --git a/src/vs/workbench/api/browser/mainThreadLanguageModelTools.ts b/src/vs/workbench/api/browser/mainThreadLanguageModelTools.ts
index fbda6ced5a3..411f581620a 100644
--- a/src/vs/workbench/api/browser/mainThreadLanguageModelTools.ts
+++ b/src/vs/workbench/api/browser/mainThreadLanguageModelTools.ts
@@ -5,8 +5,8 @@
 
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { Disposable, DisposableMap } from 'vs/base/common/lifecycle';
-import { ExtHostLanguageModelToolsShape, ExtHostContext, MainContext, MainThreadLanguageModelToolsShape } from 'vs/workbench/api/common/extHost.protocol';
-import { IToolData, ILanguageModelToolsService } from 'vs/workbench/contrib/chat/common/languageModelToolsService';
+import { ExtHostContext, ExtHostLanguageModelToolsShape, MainContext, MainThreadLanguageModelToolsShape } from 'vs/workbench/api/common/extHost.protocol';
+import { CountTokensCallback, ILanguageModelToolsService, IToolData, IToolInvocation, IToolResult } from 'vs/workbench/contrib/chat/common/languageModelToolsService';
 import { IExtHostContext, extHostNamedCustomer } from 'vs/workbench/services/extensions/common/extHostCustomers';
 
 @extHostNamedCustomer(MainContext.MainThreadLanguageModelTools)
@@ -14,6 +14,7 @@ export class MainThreadLanguageModelTools extends Disposable implements MainThre
 
 	private readonly _proxy: ExtHostLanguageModelToolsShape;
 	private readonly _tools = this._register(new DisposableMap<string>());
+	private readonly _countTokenCallbacks = new Map</* call ID */string, CountTokensCallback>();
 
 	constructor(
 		extHostContext: IExtHostContext,
@@ -22,23 +23,41 @@ export class MainThreadLanguageModelTools extends Disposable implements MainThre
 		super();
 		this._proxy = extHostContext.getProxy(ExtHostContext.ExtHostLanguageModelTools);
 
-		this._register(this._languageModelToolsService.onDidChangeTools(e => this._proxy.$acceptToolDelta(e)));
+		this._register(this._languageModelToolsService.onDidChangeTools(e => this._proxy.$onDidChangeTools([...this._languageModelToolsService.getTools()])));
 	}
 
 	async $getTools(): Promise<IToolData[]> {
 		return Array.from(this._languageModelToolsService.getTools());
 	}
 
-	$invokeTool(name: string, parameters: any, token: CancellationToken): Promise<string> {
-		return this._languageModelToolsService.invokeTool(name, parameters, token);
+	$invokeTool(dto: IToolInvocation, token: CancellationToken): Promise<IToolResult> {
+		return this._languageModelToolsService.invokeTool(
+			dto,
+			(input, token) => this._proxy.$countTokensForInvocation(dto.callId, input, token),
+			token,
+		);
+	}
+
+	$countTokensForInvocation(callId: string, input: string, token: CancellationToken): Promise<number> {
+		const fn = this._countTokenCallbacks.get(callId);
+		if (!fn) {
+			throw new Error(`Tool invocation call ${callId} not found`);
+		}
+
+		return fn(input, token);
 	}
 
 	$registerTool(name: string): void {
 		const disposable = this._languageModelToolsService.registerToolImplementation(
 			name,
 			{
-				invoke: async (parameters, token) => {
-					return await this._proxy.$invokeTool(name, parameters, token);
+				invoke: async (dto, countTokens, token) => {
+					try {
+						this._countTokenCallbacks.set(dto.callId, countTokens);
+						return await this._proxy.$invokeTool(dto, token);
+					} finally {
+						this._countTokenCallbacks.delete(dto.callId);
+					}
 				},
 			});
 		this._tools.set(name, disposable);
diff --git a/src/vs/workbench/api/browser/mainThreadNotebookDocuments.ts b/src/vs/workbench/api/browser/mainThreadNotebookDocuments.ts
index c18d0ac258a..73a5b5a7dba 100644
--- a/src/vs/workbench/api/browser/mainThreadNotebookDocuments.ts
+++ b/src/vs/workbench/api/browser/mainThreadNotebookDocuments.ts
@@ -125,30 +125,45 @@ export class MainThreadNotebookDocuments implements MainThreadNotebookDocumentsS
 		}
 	}
 
-
 	async $tryCreateNotebook(options: { viewType: string; content?: NotebookDataDto }): Promise<UriComponents> {
-		const ref = await this._notebookEditorModelResolverService.resolve({ untitledResource: undefined }, options.viewType);
-
-		// untitled notebooks are disposed when they get saved. we should not hold a reference
-		// to such a disposed notebook and therefore dispose the reference as well
-		ref.object.notebook.onWillDispose(() => {
-			ref.dispose();
-		});
-
-		// untitled notebooks are dirty by default
-		this._proxy.$acceptDirtyStateChanged(ref.object.resource, true);
-
-		// apply content changes... slightly HACKY -> this triggers a change event
 		if (options.content) {
-			const data = NotebookDto.fromNotebookDataDto(options.content);
-			ref.object.notebook.reset(data.cells, data.metadata, ref.object.notebook.transientOptions);
+			const ref = await this._notebookEditorModelResolverService.resolve({ untitledResource: undefined }, options.viewType);
+
+			// untitled notebooks are disposed when they get saved. we should not hold a reference
+			// to such a disposed notebook and therefore dispose the reference as well
+			ref.object.notebook.onWillDispose(() => {
+				ref.dispose();
+			});
+
+			// untitled notebooks with content are dirty by default
+			this._proxy.$acceptDirtyStateChanged(ref.object.resource, true);
+
+			// apply content changes... slightly HACKY -> this triggers a change event
+			if (options.content) {
+				const data = NotebookDto.fromNotebookDataDto(options.content);
+				ref.object.notebook.reset(data.cells, data.metadata, ref.object.notebook.transientOptions);
+			}
+			return ref.object.notebook.uri;
+		} else {
+			// If we aren't adding content, we don't need to resolve the full editor model yet.
+			// This will allow us to adjust settings when the editor is opened, e.g. scratchpad
+			const notebook = await this._notebookEditorModelResolverService.createUntitledNotebookTextModel(options.viewType);
+			return notebook.uri;
 		}
-		return ref.object.resource;
 	}
 
 	async $tryOpenNotebook(uriComponents: UriComponents): Promise<URI> {
 		const uri = URI.revive(uriComponents);
 		const ref = await this._notebookEditorModelResolverService.resolve(uri, undefined);
+
+		if (uriComponents.scheme === 'untitled') {
+			// untitled notebooks are disposed when they get saved. we should not hold a reference
+			// to such a disposed notebook and therefore dispose the reference as well
+			ref.object.notebook.onWillDispose(() => {
+				ref.dispose();
+			});
+		}
+
 		this._modelReferenceCollection.add(uri, ref);
 		return uri;
 	}
diff --git a/src/vs/workbench/api/browser/mainThreadNotebookEditors.ts b/src/vs/workbench/api/browser/mainThreadNotebookEditors.ts
index 0db9edac4d4..95bf3c600f2 100644
--- a/src/vs/workbench/api/browser/mainThreadNotebookEditors.ts
+++ b/src/vs/workbench/api/browser/mainThreadNotebookEditors.ts
@@ -105,6 +105,7 @@ export class MainThreadNotebookEditors implements MainThreadNotebookEditorsShape
 			// preserve pre 1.38 behaviour to not make group active when preserveFocus: true
 			// but make sure to restore the editor to fix https://github.com/microsoft/vscode/issues/79633
 			activation: options.preserveFocus ? EditorActivation.RESTORE : undefined,
+			label: options.label,
 			override: viewType
 		};
 
diff --git a/src/vs/workbench/api/browser/mainThreadQuickOpen.ts b/src/vs/workbench/api/browser/mainThreadQuickOpen.ts
index 001745bf29a..7d8ca24b5d0 100644
--- a/src/vs/workbench/api/browser/mainThreadQuickOpen.ts
+++ b/src/vs/workbench/api/browser/mainThreadQuickOpen.ts
@@ -8,10 +8,12 @@ import { ExtHostContext, MainThreadQuickOpenShape, ExtHostQuickOpenShape, Transf
 import { extHostNamedCustomer, IExtHostContext } from 'vs/workbench/services/extensions/common/extHostCustomers';
 import { URI } from 'vs/base/common/uri';
 import { CancellationToken } from 'vs/base/common/cancellation';
+import { DisposableStore } from 'vs/base/common/lifecycle';
 
 interface QuickInputSession {
 	input: IQuickInput;
 	handlesToItems: Map<number, TransferQuickPickItem>;
+	store: DisposableStore;
 }
 
 function reviveIconPathUris(iconPath: { dark: URI; light?: URI | undefined }) {
@@ -40,6 +42,9 @@ export class MainThreadQuickOpen implements MainThreadQuickOpenShape {
 	}
 
 	public dispose(): void {
+		for (const [_id, session] of this.sessions) {
+			session.store.dispose();
+		}
 	}
 
 	$show(instance: number, options: IPickOptions<TransferQuickPickItem>, token: CancellationToken): Promise<number | number[] | undefined> {
@@ -121,38 +126,40 @@ export class MainThreadQuickOpen implements MainThreadQuickOpenShape {
 		const sessionId = params.id;
 		let session = this.sessions.get(sessionId);
 		if (!session) {
-
+			const store = new DisposableStore();
 			const input = params.type === 'quickPick' ? this._quickInputService.createQuickPick() : this._quickInputService.createInputBox();
-			input.onDidAccept(() => {
+			store.add(input);
+			store.add(input.onDidAccept(() => {
 				this._proxy.$onDidAccept(sessionId);
-			});
-			input.onDidTriggerButton(button => {
+			}));
+			store.add(input.onDidTriggerButton(button => {
 				this._proxy.$onDidTriggerButton(sessionId, (button as TransferQuickInputButton).handle);
-			});
-			input.onDidChangeValue(value => {
+			}));
+			store.add(input.onDidChangeValue(value => {
 				this._proxy.$onDidChangeValue(sessionId, value);
-			});
-			input.onDidHide(() => {
+			}));
+			store.add(input.onDidHide(() => {
 				this._proxy.$onDidHide(sessionId);
-			});
+			}));
 
 			if (params.type === 'quickPick') {
 				// Add extra events specific for quickpick
 				const quickpick = input as IQuickPick<IQuickPickItem>;
-				quickpick.onDidChangeActive(items => {
+				store.add(quickpick.onDidChangeActive(items => {
 					this._proxy.$onDidChangeActive(sessionId, items.map(item => (item as TransferQuickPickItem).handle));
-				});
-				quickpick.onDidChangeSelection(items => {
+				}));
+				store.add(quickpick.onDidChangeSelection(items => {
 					this._proxy.$onDidChangeSelection(sessionId, items.map(item => (item as TransferQuickPickItem).handle));
-				});
-				quickpick.onDidTriggerItemButton((e) => {
+				}));
+				store.add(quickpick.onDidTriggerItemButton((e) => {
 					this._proxy.$onDidTriggerItemButton(sessionId, (e.item as TransferQuickPickItem).handle, (e.button as TransferQuickInputButton).handle);
-				});
+				}));
 			}
 
 			session = {
 				input,
-				handlesToItems: new Map()
+				handlesToItems: new Map(),
+				store
 			};
 			this.sessions.set(sessionId, session);
 		}
@@ -212,7 +219,7 @@ export class MainThreadQuickOpen implements MainThreadQuickOpenShape {
 	$dispose(sessionId: number): Promise<void> {
 		const session = this.sessions.get(sessionId);
 		if (session) {
-			session.input.dispose();
+			session.store.dispose();
 			this.sessions.delete(sessionId);
 		}
 		return Promise.resolve(undefined);
diff --git a/src/vs/workbench/api/browser/mainThreadSCM.ts b/src/vs/workbench/api/browser/mainThreadSCM.ts
index 5801f7845d9..f0feffa0829 100644
--- a/src/vs/workbench/api/browser/mainThreadSCM.ts
+++ b/src/vs/workbench/api/browser/mainThreadSCM.ts
@@ -162,6 +162,9 @@ class MainThreadSCMResource implements ISCMResource {
 class MainThreadSCMHistoryProvider implements ISCMHistoryProvider {
 	readonly currentHistoryItemGroupId = derived<string | undefined>(this, reader => this.currentHistoryItemGroup.read(reader)?.id);
 	readonly currentHistoryItemGroupName = derived<string | undefined>(this, reader => this.currentHistoryItemGroup.read(reader)?.name);
+	readonly currentHistoryItemGroupRevision = derived<string | undefined>(this, reader => this.currentHistoryItemGroup.read(reader)?.revision);
+	readonly currentHistoryItemGroupRemoteId = derived<string | undefined>(this, reader => this.currentHistoryItemGroup.read(reader)?.remote?.id);
+	readonly currentHistoryItemGroupRemoteRevision = derived<string | undefined>(this, reader => this.currentHistoryItemGroup.read(reader)?.remote?.revision);
 
 	private readonly _currentHistoryItemGroup = observableValueOpts<ISCMHistoryItemGroup | undefined>({ owner: this, equalsFn: () => false }, undefined);
 	get currentHistoryItemGroup() { return this._currentHistoryItemGroup; }
diff --git a/src/vs/workbench/api/browser/mainThreadTerminalShellIntegration.ts b/src/vs/workbench/api/browser/mainThreadTerminalShellIntegration.ts
index 21092bb8bfe..3429833aa9c 100644
--- a/src/vs/workbench/api/browser/mainThreadTerminalShellIntegration.ts
+++ b/src/vs/workbench/api/browser/mainThreadTerminalShellIntegration.ts
@@ -60,7 +60,7 @@ export class MainThreadTerminalShellIntegration extends Disposable implements Ma
 			// TerminalShellExecution.createDataStream
 			// Debounce events to reduce the message count - when this listener is disposed the events will be flushed
 			instanceDataListeners.get(instanceId)?.dispose();
-			instanceDataListeners.set(instanceId, Event.accumulate(e.instance.onData, 50, this._store)(events => this._proxy.$shellExecutionData(instanceId, events.join())));
+			instanceDataListeners.set(instanceId, Event.accumulate(e.instance.onData, 50, this._store)(events => this._proxy.$shellExecutionData(instanceId, events.join(''))));
 		}));
 
 		// onDidEndTerminalShellExecution
diff --git a/src/vs/workbench/api/browser/mainThreadTesting.ts b/src/vs/workbench/api/browser/mainThreadTesting.ts
index 7a5d9def972..706feac6e35 100644
--- a/src/vs/workbench/api/browser/mainThreadTesting.ts
+++ b/src/vs/workbench/api/browser/mainThreadTesting.ts
@@ -9,7 +9,7 @@ import { Event } from 'vs/base/common/event';
 import { Disposable, DisposableStore, IDisposable, MutableDisposable, toDisposable } from 'vs/base/common/lifecycle';
 import { ISettableObservable, observableValue, transaction } from 'vs/base/common/observable';
 import { WellDefinedPrefixTree } from 'vs/base/common/prefixTree';
-import { URI } from 'vs/base/common/uri';
+import { URI, UriComponents } from 'vs/base/common/uri';
 import { Range } from 'vs/editor/common/core/range';
 import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
 import { TestCoverage } from 'vs/workbench/contrib/testing/common/testCoverage';
@@ -50,8 +50,8 @@ export class MainThreadTesting extends Disposable implements MainThreadTestingSh
 			getTestsRelatedToCode: (uri, position, token) => this.proxy.$getTestsRelatedToCode(uri, position, token),
 		}));
 
-		this._register(this.testService.onDidCancelTestRun(({ runId }) => {
-			this.proxy.$cancelExtensionTestRun(runId);
+		this._register(this.testService.onDidCancelTestRun(({ runId, taskId }) => {
+			this.proxy.$cancelExtensionTestRun(runId, taskId);
 		}));
 
 		this._register(Event.debounce(testProfiles.onDidChange, (_last, e) => e)(() => {
@@ -310,11 +310,29 @@ export class MainThreadTesting extends Disposable implements MainThreadTestingSh
 			diff.map(d => TestsDiffOp.deserialize(this.uriIdentityService, d)));
 	}
 
+	/**
+	 * @inheritdoc
+	 */
 	public async $runTests(req: ResolvedTestRunRequest, token: CancellationToken): Promise<string> {
 		const result = await this.testService.runResolvedTests(req, token);
 		return result.id;
 	}
 
+	/**
+	 * @inheritdoc
+	 */
+	public async $getCoverageDetails(resultId: string, taskIndex: number, uri: UriComponents, token: CancellationToken): Promise<CoverageDetails.Serialized[]> {
+		const details = await this.resultService.getResult(resultId)
+			?.tasks[taskIndex]
+			?.coverage.get()
+			?.getUri(URI.from(uri))
+			?.details(token);
+
+		// Return empty if nothing. Some failure is always possible here because
+		// results might be cleared in the meantime.
+		return details || [];
+	}
+
 	public override dispose() {
 		super.dispose();
 		for (const subscription of this.testProviderRegistrations.values()) {
diff --git a/src/vs/workbench/api/browser/mainThreadWorkspace.ts b/src/vs/workbench/api/browser/mainThreadWorkspace.ts
index 12441286ddc..880a6026dc7 100644
--- a/src/vs/workbench/api/browser/mainThreadWorkspace.ts
+++ b/src/vs/workbench/api/browser/mainThreadWorkspace.ts
@@ -28,6 +28,7 @@ import { IEditSessionIdentityService } from 'vs/platform/workspace/common/editSe
 import { EditorResourceAccessor, SaveReason, SideBySideEditor } from 'vs/workbench/common/editor';
 import { coalesce, firstOrDefault } from 'vs/base/common/arrays';
 import { ICanonicalUriService } from 'vs/platform/workspace/common/canonicalUri';
+import { revive } from 'vs/base/common/marshalling';
 
 @extHostNamedCustomer(MainContext.MainThreadWorkspace)
 export class MainThreadWorkspace implements MainThreadWorkspaceShape {
@@ -146,7 +147,7 @@ export class MainThreadWorkspace implements MainThreadWorkspaceShape {
 
 		const query = this._queryBuilder.file(
 			includeFolder ? [includeFolder] : workspace.folders,
-			options
+			revive(options)
 		);
 
 		return this._searchService.fileSearch(query, token).then(result => {
@@ -164,7 +165,7 @@ export class MainThreadWorkspace implements MainThreadWorkspaceShape {
 		const workspace = this._contextService.getWorkspace();
 		const folders = folder ? [folder] : workspace.folders.map(folder => folder.uri);
 
-		const query = this._queryBuilder.text(pattern, folders, options);
+		const query = this._queryBuilder.text(pattern, folders, revive(options));
 		query._reason = 'startTextSearch';
 
 		const onProgress = (p: ISearchProgressItem) => {
diff --git a/src/vs/workbench/api/common/extHost.api.impl.ts b/src/vs/workbench/api/common/extHost.api.impl.ts
index 60c35821086..a9c8d66c70c 100644
--- a/src/vs/workbench/api/common/extHost.api.impl.ts
+++ b/src/vs/workbench/api/common/extHost.api.impl.ts
@@ -3,7 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { AsyncIterableObject } from 'vs/base/common/async';
 import { CancellationTokenSource } from 'vs/base/common/cancellation';
 import * as errors from 'vs/base/common/errors';
 import { Emitter, Event } from 'vs/base/common/event';
@@ -107,7 +106,7 @@ import { ExtensionDescriptionRegistry } from 'vs/workbench/services/extensions/c
 import { UIKind } from 'vs/workbench/services/extensions/common/extensionHostProtocol';
 import { checkProposedApiEnabled, isProposedApiEnabled } from 'vs/workbench/services/extensions/common/extensions';
 import { ProxyIdentifier } from 'vs/workbench/services/extensions/common/proxyIdentifier';
-import { ExcludeSettingOptions, oldToNewTextSearchResult, TextSearchCompleteMessageType, TextSearchCompleteMessageTypeNew, TextSearchContextNew, TextSearchMatchNew } from 'vs/workbench/services/search/common/searchExtTypes';
+import { ExcludeSettingOptions, TextSearchCompleteMessageType, TextSearchContextNew, TextSearchMatchNew } from 'vs/workbench/services/search/common/searchExtTypes';
 import type * as vscode from 'vscode';
 
 export interface IExtensionRegistries {
@@ -290,13 +289,9 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 				if (typeof options?.forceNewSession === 'object' && options.forceNewSession.learnMore) {
 					checkProposedApiEnabled(extension, 'authLearnMore');
 				}
-				if (options?.account) {
-					checkProposedApiEnabled(extension, 'authGetSessions');
-				}
 				return extHostAuthentication.getSession(extension, providerId, scopes, options as any);
 			},
 			getAccounts(providerId: string) {
-				checkProposedApiEnabled(extension, 'authGetSessions');
 				return extHostAuthentication.getAccounts(providerId);
 			},
 			// TODO: remove this after GHPR and Codespaces move off of it
@@ -747,15 +742,12 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 				return _asExtensionEvent(extHostTerminalService.onDidExecuteTerminalCommand)(listener, thisArg, disposables);
 			},
 			onDidChangeTerminalShellIntegration(listener, thisArg?, disposables?) {
-				checkProposedApiEnabled(extension, 'terminalShellIntegration');
 				return _asExtensionEvent(extHostTerminalShellIntegration.onDidChangeTerminalShellIntegration)(listener, thisArg, disposables);
 			},
 			onDidStartTerminalShellExecution(listener, thisArg?, disposables?) {
-				checkProposedApiEnabled(extension, 'terminalShellIntegration');
 				return _asExtensionEvent(extHostTerminalShellIntegration.onDidStartTerminalShellExecution)(listener, thisArg, disposables);
 			},
 			onDidEndTerminalShellExecution(listener, thisArg?, disposables?) {
-				checkProposedApiEnabled(extension, 'terminalShellIntegration');
 				return _asExtensionEvent(extHostTerminalShellIntegration.onDidEndTerminalShellExecution)(listener, thisArg, disposables);
 			},
 			get state() {
@@ -973,18 +965,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 			},
 			findFiles2New: (filePattern: vscode.GlobPattern[], options?: vscode.FindFiles2OptionsNew, token?: vscode.CancellationToken): Thenable<vscode.Uri[]> => {
 				checkProposedApiEnabled(extension, 'findFiles2New');
-
-				const oldOptions = {
-					exclude: options?.exclude && options.exclude.length > 0 ? options.exclude[0] : undefined,
-					useDefaultExcludes: !options?.useExcludeSettings || (options?.useExcludeSettings === ExcludeSettingOptions.filesExclude || options?.useExcludeSettings === ExcludeSettingOptions.searchAndFilesExclude),
-					useDefaultSearchExcludes: !options?.useExcludeSettings || (options?.useExcludeSettings === ExcludeSettingOptions.searchAndFilesExclude),
-					maxResults: options?.maxResults,
-					useIgnoreFiles: options?.useIgnoreFiles?.local,
-					useGlobalIgnoreFiles: options?.useIgnoreFiles?.global,
-					useParentIgnoreFiles: options?.useIgnoreFiles?.parent,
-					followSymlinks: options?.followSymlinks,
-				};
-				return extHostWorkspace.findFiles2(filePattern && filePattern.length > 0 ? filePattern[0] : undefined, oldOptions, extension.identifier, token);
+				return extHostWorkspace.findFiles2New(filePattern, options, extension.identifier, token);
 			},
 			findTextInFiles: (query: vscode.TextSearchQuery, optionsOrCallback: vscode.FindTextInFilesOptions | ((result: vscode.TextSearchResult) => void), callbackOrToken?: vscode.CancellationToken | ((result: vscode.TextSearchResult) => void), token?: vscode.CancellationToken) => {
 				checkProposedApiEnabled(extension, 'findTextInFiles');
@@ -1005,56 +986,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 			findTextInFilesNew: (query: vscode.TextSearchQueryNew, options?: vscode.FindTextInFilesOptionsNew, token?: vscode.CancellationToken): vscode.FindTextInFilesResponse => {
 				checkProposedApiEnabled(extension, 'findTextInFilesNew');
 				checkProposedApiEnabled(extension, 'textSearchProviderNew');
-				let oldOptions = {};
-
-
-				if (options) {
-					oldOptions = {
-						include: options.include && options.include.length > 0 ? options.include[0] : undefined,
-						exclude: options.exclude && options.exclude.length > 0 ? options.exclude[0] : undefined,
-						useDefaultExcludes: options.useExcludeSettings === undefined || (options.useExcludeSettings === ExcludeSettingOptions.filesExclude || options.useExcludeSettings === ExcludeSettingOptions.searchAndFilesExclude),
-						useSearchExclude: options.useExcludeSettings === undefined || (options.useExcludeSettings === ExcludeSettingOptions.searchAndFilesExclude),
-						maxResults: options.maxResults,
-						useIgnoreFiles: options.useIgnoreFiles?.local,
-						useGlobalIgnoreFiles: options.useIgnoreFiles?.global,
-						useParentIgnoreFiles: options.useIgnoreFiles?.parent,
-						followSymlinks: options.followSymlinks,
-						encoding: options.encoding,
-						previewOptions: options.previewOptions ? {
-							matchLines: options.previewOptions?.matchLines ?? 100,
-							charsPerLine: options.previewOptions?.charsPerLine ?? 10000,
-						} : undefined,
-						beforeContext: options.surroundingContext,
-						afterContext: options.surroundingContext,
-					} satisfies vscode.FindTextInFilesOptions & { useSearchExclude?: boolean };
-				}
-
-				const complete: Promise<undefined | vscode.TextSearchComplete> = Promise.resolve(undefined);
-
-				const asyncIterable = new AsyncIterableObject<vscode.TextSearchResultNew>(async emitter => {
-					const callback = async (result: vscode.TextSearchResult) => {
-						emitter.emitOne(oldToNewTextSearchResult(result));
-						return result;
-					};
-					await complete.then(e => {
-						return extHostWorkspace.findTextInFiles(
-							query,
-							oldOptions,
-							callback,
-							extension.identifier,
-							token
-						);
-					});
-				});
-
-				return {
-					results: asyncIterable,
-					complete: complete.then((e) => {
-						return {
-							limitHit: e?.limitHit ?? false
-						};
-					}),
-				};
+				return extHostWorkspace.findTextInFilesNew(query, extension.identifier, options || {}, token);
 			},
 			save: (uri) => {
 				return extHostWorkspace.save(uri);
@@ -1109,6 +1041,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 				}
 
 				return uriPromise.then(uri => {
+					extHostLogService.trace(`openTextDocument from ${extension.identifier}`);
 					if (uri.scheme === Schemas.vscodeRemote && !uri.authority) {
 						extHostApiDeprecation.report('workspace.openTextDocument', extension, `A URI of 'vscode-remote' scheme requires an authority.`);
 					}
@@ -1192,31 +1125,31 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 			},
 			registerFileSearchProvider: (scheme: string, provider: vscode.FileSearchProvider) => {
 				checkProposedApiEnabled(extension, 'fileSearchProvider');
-				return extHostSearch.registerFileSearchProvider(scheme, provider);
+				return extHostSearch.registerFileSearchProviderOld(scheme, provider);
 			},
 			registerTextSearchProvider: (scheme: string, provider: vscode.TextSearchProvider) => {
 				checkProposedApiEnabled(extension, 'textSearchProvider');
-				return extHostSearch.registerTextSearchProvider(scheme, provider);
+				return extHostSearch.registerTextSearchProviderOld(scheme, provider);
 			},
 			registerAITextSearchProvider: (scheme: string, provider: vscode.AITextSearchProvider) => {
 				// there are some dependencies on textSearchProvider, so we need to check for both
 				checkProposedApiEnabled(extension, 'aiTextSearchProvider');
 				checkProposedApiEnabled(extension, 'textSearchProvider');
-				return extHostSearch.registerAITextSearchProvider(scheme, provider);
+				return extHostSearch.registerAITextSearchProviderOld(scheme, provider);
 			},
 			registerFileSearchProviderNew: (scheme: string, provider: vscode.FileSearchProviderNew) => {
 				checkProposedApiEnabled(extension, 'fileSearchProviderNew');
-				return { dispose: () => { } };
+				return extHostSearch.registerFileSearchProvider(scheme, provider);
 			},
 			registerTextSearchProviderNew: (scheme: string, provider: vscode.TextSearchProviderNew) => {
 				checkProposedApiEnabled(extension, 'textSearchProviderNew');
-				return { dispose: () => { } };
+				return extHostSearch.registerTextSearchProvider(scheme, provider);
 			},
 			registerAITextSearchProviderNew: (scheme: string, provider: vscode.AITextSearchProviderNew) => {
 				// there are some dependencies on textSearchProvider, so we need to check for both
 				checkProposedApiEnabled(extension, 'aiTextSearchProviderNew');
 				checkProposedApiEnabled(extension, 'textSearchProviderNew');
-				return { dispose: () => { } };
+				return extHostSearch.registerAITextSearchProvider(scheme, provider);
 			},
 			registerRemoteAuthorityResolver: (authorityPrefix: string, resolver: vscode.RemoteAuthorityResolver) => {
 				checkProposedApiEnabled(extension, 'resolvers');
@@ -1470,8 +1403,6 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 
 		// namespace: interactive
 		const interactive: typeof vscode.interactive = {
-			// TODO Can be deleted after another Insiders
-			_version: 1,
 			transferActiveChat(toWorkspace: vscode.Uri) {
 				checkProposedApiEnabled(extension, 'interactive');
 				return extHostChatAgents2.transferActiveChat(toWorkspace);
@@ -1496,10 +1427,6 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 
 		// namespace: chat
 		const chat: typeof vscode.chat = {
-			// IMPORTANT
-			// this needs to be updated whenever the API proposal changes and breaks backwards compatibility
-			_version: 1,
-
 			registerChatResponseProvider(id: string, provider: vscode.ChatResponseProvider, metadata: vscode.ChatResponseProviderMetadata) {
 				checkProposedApiEnabled(extension, 'chatProvider');
 				return extHostLanguageModels.registerLanguageModel(extension, id, provider, metadata);
@@ -1519,6 +1446,10 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 				checkProposedApiEnabled(extension, 'chatParticipantPrivate');
 				return extHostChatAgents2.createDynamicChatAgent(extension, id, dynamicProps, handler);
 			},
+			registerChatParticipantDetectionProvider(provider: vscode.ChatParticipantDetectionProvider) {
+				checkProposedApiEnabled(extension, 'chatParticipantAdditions');
+				return extHostChatAgents2.registerChatParticipantDetectionProvider(provider);
+			},
 		};
 
 		// namespace: lm
@@ -1558,7 +1489,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 				checkProposedApiEnabled(extension, 'lmTools');
 				return extHostLanguageModelTools.registerTool(extension, toolId, tool);
 			},
-			invokeTool(toolId: string, parameters: Object, token: vscode.CancellationToken) {
+			invokeTool(toolId: string, parameters: vscode.LanguageModelToolInvocationOptions, token: vscode.CancellationToken) {
 				checkProposedApiEnabled(extension, 'lmTools');
 				return extHostLanguageModelTools.invokeTool(toolId, parameters, token);
 			},
@@ -1772,7 +1703,6 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 			TestResultState: extHostTypes.TestResultState,
 			TestRunRequest: extHostTypes.TestRunRequest,
 			TestMessage: extHostTypes.TestMessage,
-			TestMessage2: extHostTypes.TestMessage,
 			TestMessageStackFrame: extHostTypes.TestMessageStackFrame,
 			TestTag: extHostTypes.TestTag,
 			TestRunProfileKind: extHostTypes.TestRunProfileKind,
@@ -1827,6 +1757,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 			ChatResponseCommandButtonPart: extHostTypes.ChatResponseCommandButtonPart,
 			ChatResponseDetectedParticipantPart: extHostTypes.ChatResponseDetectedParticipantPart,
 			ChatResponseConfirmationPart: extHostTypes.ChatResponseConfirmationPart,
+			ChatResponseMovePart: extHostTypes.ChatResponseMovePart,
 			ChatResponseReferencePartStatusKind: extHostTypes.ChatResponseReferencePartStatusKind,
 			ChatRequestTurn: extHostTypes.ChatRequestTurn,
 			ChatResponseTurn: extHostTypes.ChatResponseTurn,
@@ -1835,9 +1766,9 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 			ChatRequestNotebookData: extHostTypes.ChatRequestNotebookData,
 			LanguageModelChatMessageRole: extHostTypes.LanguageModelChatMessageRole,
 			LanguageModelChatMessage: extHostTypes.LanguageModelChatMessage,
-			LanguageModelChatMessageFunctionResultPart: extHostTypes.LanguageModelFunctionResultPart,
+			LanguageModelChatMessageToolResultPart: extHostTypes.LanguageModelToolResultPart,
 			LanguageModelChatResponseTextPart: extHostTypes.LanguageModelTextPart,
-			LanguageModelChatResponseFunctionUsePart: extHostTypes.LanguageModelFunctionUsePart,
+			LanguageModelChatResponseToolCallPart: extHostTypes.LanguageModelToolCallPart,
 			LanguageModelError: extHostTypes.LanguageModelError,
 			NewSymbolName: extHostTypes.NewSymbolName,
 			NewSymbolNameTag: extHostTypes.NewSymbolNameTag,
@@ -1847,7 +1778,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 			ExcludeSettingOptions: ExcludeSettingOptions,
 			TextSearchContextNew: TextSearchContextNew,
 			TextSearchMatchNew: TextSearchMatchNew,
-			TextSearchCompleteMessageTypeNew: TextSearchCompleteMessageTypeNew,
+			TextSearchCompleteMessageTypeNew: TextSearchCompleteMessageType,
 		};
 	};
 }
diff --git a/src/vs/workbench/api/common/extHost.protocol.ts b/src/vs/workbench/api/common/extHost.protocol.ts
index 7d3ad1bf826..5f3a3128124 100644
--- a/src/vs/workbench/api/common/extHost.protocol.ts
+++ b/src/vs/workbench/api/common/extHost.protocol.ts
@@ -53,10 +53,10 @@ import { IRevealOptions, ITreeItem, IViewBadge } from 'vs/workbench/common/views
 import { CallHierarchyItem } from 'vs/workbench/contrib/callHierarchy/common/callHierarchy';
 import { ChatAgentLocation, IChatAgentMetadata, IChatAgentRequest, IChatAgentResult } from 'vs/workbench/contrib/chat/common/chatAgents';
 import { IChatProgressResponseContent } from 'vs/workbench/contrib/chat/common/chatModel';
-import { ChatAgentVoteDirection, IChatFollowup, IChatProgress, IChatResponseErrorDetails, IChatTask, IChatTaskDto, IChatUserActionEvent } from 'vs/workbench/contrib/chat/common/chatService';
+import { IChatFollowup, IChatProgress, IChatResponseErrorDetails, IChatTask, IChatTaskDto, IChatUserActionEvent, IChatVoteAction } from 'vs/workbench/contrib/chat/common/chatService';
 import { IChatRequestVariableValue, IChatVariableData, IChatVariableResolverProgress } from 'vs/workbench/contrib/chat/common/chatVariables';
 import { IChatMessage, IChatResponseFragment, ILanguageModelChatMetadata, ILanguageModelChatSelector, ILanguageModelsChangeEvent } from 'vs/workbench/contrib/chat/common/languageModels';
-import { IToolData, IToolDelta } from 'vs/workbench/contrib/chat/common/languageModelToolsService';
+import { IToolData, IToolInvocation, IToolResult } from 'vs/workbench/contrib/chat/common/languageModelToolsService';
 import { DebugConfigurationProviderTriggerKind, IAdapterDescriptor, IConfig, IDebugSessionReplMode, IDebugTestRunReference, IDebugVisualization, IDebugVisualizationContext, IDebugVisualizationTreeItem, MainThreadDebugVisualization } from 'vs/workbench/contrib/debug/common/debug';
 import * as notebookCommon from 'vs/workbench/contrib/notebook/common/notebookCommon';
 import { CellExecutionUpdateType } from 'vs/workbench/contrib/notebook/common/notebookExecutionService';
@@ -81,6 +81,7 @@ import { OutputChannelUpdateMode } from 'vs/workbench/services/output/common/out
 import { CandidatePort } from 'vs/workbench/services/remote/common/tunnelModel';
 import { IFileQueryBuilderOptions, ITextQueryBuilderOptions } from 'vs/workbench/services/search/common/queryBuilder';
 import * as search from 'vs/workbench/services/search/common/search';
+import { TextSearchCompleteMessage } from 'vs/workbench/services/search/common/searchExtTypes';
 import { ISaveProfileResult } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
 import type { TerminalShellExecutionCommandLineConfidence } from 'vscode';
 
@@ -1064,6 +1065,7 @@ export interface INotebookDocumentShowOptions {
 	preserveFocus?: boolean;
 	pinned?: boolean;
 	selections?: ICellRange[];
+	label?: string;
 }
 
 export type INotebookCellStatusBarEntryDto = Dto<notebookCommon.INotebookCellStatusBarItem>;
@@ -1251,6 +1253,8 @@ export interface IDynamicChatAgentProps {
 
 export interface MainThreadChatAgentsShape2 extends IDisposable {
 	$registerAgent(handle: number, extension: ExtensionIdentifier, id: string, metadata: IExtensionChatAgentMetadata, dynamicProps: IDynamicChatAgentProps | undefined): void;
+	$registerChatParticipantDetectionProvider(handle: number): void;
+	$unregisterChatParticipantDetectionProvider(handle: number): void;
 	$registerAgentCompletionsProvider(handle: number, id: string, triggerCharacters: string[]): void;
 	$unregisterAgentCompletionsProvider(handle: number, id: string): void;
 	$updateAgent(handle: number, metadataUpdate: IExtensionChatAgentMetadata): void;
@@ -1285,12 +1289,24 @@ export type IChatAgentHistoryEntryDto = {
 export interface ExtHostChatAgentsShape2 {
 	$invokeAgent(handle: number, request: Dto<IChatAgentRequest>, context: { history: IChatAgentHistoryEntryDto[] }, token: CancellationToken): Promise<IChatAgentResult | undefined>;
 	$provideFollowups(request: Dto<IChatAgentRequest>, handle: number, result: IChatAgentResult, context: { history: IChatAgentHistoryEntryDto[] }, token: CancellationToken): Promise<IChatFollowup[]>;
-	$acceptFeedback(handle: number, result: IChatAgentResult, vote: ChatAgentVoteDirection, reportIssue?: boolean): void;
+	$acceptFeedback(handle: number, result: IChatAgentResult, voteAction: IChatVoteAction): void;
 	$acceptAction(handle: number, result: IChatAgentResult, action: IChatUserActionEvent): void;
 	$invokeCompletionProvider(handle: number, query: string, token: CancellationToken): Promise<IChatAgentCompletionItem[]>;
 	$provideWelcomeMessage(handle: number, location: ChatAgentLocation, token: CancellationToken): Promise<(string | IMarkdownString)[] | undefined>;
+	$provideChatTitle(handle: number, context: IChatAgentHistoryEntryDto[], token: CancellationToken): Promise<string | undefined>;
 	$provideSampleQuestions(handle: number, location: ChatAgentLocation, token: CancellationToken): Promise<IChatFollowup[] | undefined>;
 	$releaseSession(sessionId: string): void;
+	$detectChatParticipant(handle: number, request: Dto<IChatAgentRequest>, context: { history: IChatAgentHistoryEntryDto[] }, options: { participants: IChatParticipantMetadata[]; location: ChatAgentLocation }, token: CancellationToken): Promise<IChatParticipantDetectionResult | null | undefined>;
+}
+export interface IChatParticipantMetadata {
+	participant: string;
+	command?: string;
+	disambiguation: { categoryName: string; description: string; examples: string[] }[];
+}
+
+export interface IChatParticipantDetectionResult {
+	participant: string;
+	command?: string;
 }
 
 export type IChatVariableResolverProgressDto =
@@ -1302,9 +1318,12 @@ export interface MainThreadChatVariablesShape extends IDisposable {
 	$unregisterVariable(handle: number): void;
 }
 
+export type IToolDataDto = Omit<IToolData, 'when'>;
+
 export interface MainThreadLanguageModelToolsShape extends IDisposable {
-	$getTools(): Promise<Dto<IToolData>[]>;
-	$invokeTool(name: string, parameters: any, token: CancellationToken): Promise<string>;
+	$getTools(): Promise<Dto<IToolDataDto>[]>;
+	$invokeTool(dto: IToolInvocation, token: CancellationToken): Promise<IToolResult>;
+	$countTokensForInvocation(callId: string, input: string, token: CancellationToken): Promise<number>;
 	$registerTool(id: string): void;
 	$unregisterTool(name: string): void;
 }
@@ -1316,8 +1335,9 @@ export interface ExtHostChatVariablesShape {
 }
 
 export interface ExtHostLanguageModelToolsShape {
-	$acceptToolDelta(delta: IToolDelta): Promise<void>;
-	$invokeTool(id: string, parameters: any, token: CancellationToken): Promise<string>;
+	$onDidChangeTools(tools: IToolDataDto[]): void;
+	$invokeTool(dto: IToolInvocation, token: CancellationToken): Promise<IToolResult>;
+	$countTokensForInvocation(callId: string, input: string, token: CancellationToken): Promise<number>;
 }
 
 export interface MainThreadUrlsShape extends IDisposable {
@@ -1384,6 +1404,7 @@ export interface ExtHostProfileContentHandlersShape {
 
 export interface ITextSearchComplete {
 	limitHit?: boolean;
+	message?: TextSearchCompleteMessage | TextSearchCompleteMessage[];
 }
 
 export interface MainThreadWorkspaceShape extends IDisposable {
@@ -2742,7 +2763,7 @@ export const enum ExtHostTestingResource {
 export interface ExtHostTestingShape {
 	$runControllerTests(req: IStartControllerTests[], token: CancellationToken): Promise<{ error?: string }[]>;
 	$startContinuousRun(req: ICallProfileRunHandler[], token: CancellationToken): Promise<{ error?: string }[]>;
-	$cancelExtensionTestRun(runId: string | undefined): void;
+	$cancelExtensionTestRun(runId: string | undefined, taskId: string | undefined): void;
 	/** Handles a diff of tests, as a result of a subscribeToDiffs() call */
 	$acceptDiff(diff: TestsDiffOp.Serialized[]): void;
 	/** Expands a test item's children, by the given number of levels. */
@@ -2807,6 +2828,8 @@ export interface MainThreadTestingShape {
 	$unsubscribeFromDiffs(): void;
 	/** Publishes that new tests were available on the given source. */
 	$publishDiff(controllerId: string, diff: TestsDiffOp.Serialized[]): void;
+	/** Gets coverage details from a test result. */
+	$getCoverageDetails(resultId: string, taskIndex: number, uri: UriComponents, token: CancellationToken): Promise<CoverageDetails.Serialized[]>;
 
 	// --- test run configurations:
 
diff --git a/src/vs/workbench/api/common/extHostChatAgents2.ts b/src/vs/workbench/api/common/extHostChatAgents2.ts
index 3960404dfe8..c7fbdfcad37 100644
--- a/src/vs/workbench/api/common/extHostChatAgents2.ts
+++ b/src/vs/workbench/api/common/extHostChatAgents2.ts
@@ -10,7 +10,7 @@ import { toErrorMessage } from 'vs/base/common/errorMessage';
 import { Emitter } from 'vs/base/common/event';
 import { IMarkdownString } from 'vs/base/common/htmlContent';
 import { Iterable } from 'vs/base/common/iterator';
-import { Disposable, DisposableMap, DisposableStore } from 'vs/base/common/lifecycle';
+import { Disposable, DisposableMap, DisposableStore, toDisposable } from 'vs/base/common/lifecycle';
 import { revive } from 'vs/base/common/marshalling';
 import { StopWatch } from 'vs/base/common/stopwatch';
 import { assertType } from 'vs/base/common/types';
@@ -23,8 +23,8 @@ import { CommandsConverter, ExtHostCommands } from 'vs/workbench/api/common/extH
 import { ExtHostDocuments } from 'vs/workbench/api/common/extHostDocuments';
 import * as typeConvert from 'vs/workbench/api/common/extHostTypeConverters';
 import * as extHostTypes from 'vs/workbench/api/common/extHostTypes';
-import { ChatAgentLocation, IChatAgentRequest, IChatAgentResult } from 'vs/workbench/contrib/chat/common/chatAgents';
-import { ChatAgentVoteDirection, IChatContentReference, IChatFollowup, IChatResponseErrorDetails, IChatUserActionEvent } from 'vs/workbench/contrib/chat/common/chatService';
+import { ChatAgentLocation, IChatAgentRequest, IChatAgentResult, IChatAgentResultTimings } from 'vs/workbench/contrib/chat/common/chatAgents';
+import { ChatAgentVoteDirection, IChatContentReference, IChatFollowup, IChatResponseErrorDetails, IChatUserActionEvent, IChatVoteAction } from 'vs/workbench/contrib/chat/common/chatService';
 import { checkProposedApiEnabled, isProposedApiEnabled } from 'vs/workbench/services/extensions/common/extensions';
 import { Dto } from 'vs/workbench/services/extensions/common/proxyIdentifier';
 import type * as vscode from 'vscode';
@@ -48,7 +48,7 @@ class ChatAgentResponseStream {
 		this._isClosed = true;
 	}
 
-	get timings() {
+	get timings(): IChatAgentResultTimings {
 		return {
 			firstProgress: this._firstProgress,
 			totalElapsed: this._stopWatch.elapsed()
@@ -72,7 +72,7 @@ class ChatAgentResponseStream {
 
 			const _report = (progress: IChatProgressDto, task?: (progress: vscode.Progress<vscode.ChatResponseWarningPart | vscode.ChatResponseReferencePart>) => Thenable<string | void>) => {
 				// Measure the time to the first progress update with real markdown content
-				if (typeof this._firstProgress === 'undefined' && 'content' in progress) {
+				if (typeof this._firstProgress === 'undefined' && (progress.kind === 'markdownContent' || progress.kind === 'markdownVuln')) {
 					this._firstProgress = this._stopWatch.elapsed();
 				}
 
@@ -93,7 +93,7 @@ class ChatAgentResponseStream {
 					};
 
 					Promise.all([progressReporterPromise, task?.(progressReporter)]).then(([handle, res]) => {
-						if (handle !== undefined && res !== undefined) {
+						if (handle !== undefined) {
 							this._proxy.$handleProgressChunk(this._request.requestId, typeConvert.ChatTaskResult.from(res), handle);
 						}
 					});
@@ -163,11 +163,11 @@ class ChatAgentResponseStream {
 				reference2(value, iconPath, options) {
 					throwIfDone(this.reference);
 
-					if ('variableName' in value) {
+					if (typeof value === 'object' && 'variableName' in value) {
 						checkProposedApiEnabled(that._extension, 'chatParticipantAdditions');
 					}
 
-					if ('variableName' in value && !value.value) {
+					if (typeof value === 'object' && 'variableName' in value && !value.value) {
 						// The participant used this variable. Does that variable have any references to pull in?
 						const matchingVarData = that._request.variables.variables.find(v => v.name === value.variableName);
 						if (matchingVarData) {
@@ -241,7 +241,8 @@ class ChatAgentResponseStream {
 						part instanceof extHostTypes.ChatResponseDetectedParticipantPart ||
 						part instanceof extHostTypes.ChatResponseWarningPart ||
 						part instanceof extHostTypes.ChatResponseConfirmationPart ||
-						part instanceof extHostTypes.ChatResponseCodeCitationPart
+						part instanceof extHostTypes.ChatResponseCodeCitationPart ||
+						part instanceof extHostTypes.ChatResponseMovePart
 					) {
 						checkProposedApiEnabled(that._extension, 'chatParticipantAdditions');
 					}
@@ -270,6 +271,9 @@ export class ExtHostChatAgents2 extends Disposable implements ExtHostChatAgentsS
 	private readonly _agents = new Map<number, ExtHostChatAgent>();
 	private readonly _proxy: MainThreadChatAgentsShape2;
 
+	private static _participantDetectionProviderIdPool = 0;
+	private readonly _participantDetectionProviders = new Map<number, vscode.ChatParticipantDetectionProvider>();
+
 	private readonly _sessionDisposables: DisposableMap<string, DisposableStore> = this._register(new DisposableMap());
 	private readonly _completionDisposables: DisposableMap<number, DisposableStore> = this._register(new DisposableMap());
 
@@ -305,44 +309,78 @@ export class ExtHostChatAgents2 extends Disposable implements ExtHostChatAgentsS
 		return agent.apiAgent;
 	}
 
+	registerChatParticipantDetectionProvider(provider: vscode.ChatParticipantDetectionProvider): vscode.Disposable {
+		const handle = ExtHostChatAgents2._participantDetectionProviderIdPool++;
+		this._participantDetectionProviders.set(handle, provider);
+		this._proxy.$registerChatParticipantDetectionProvider(handle);
+		return toDisposable(() => {
+			this._participantDetectionProviders.delete(handle);
+			this._proxy.$unregisterChatParticipantDetectionProvider(handle);
+		});
+	}
+
+	async $detectChatParticipant(handle: number, requestDto: Dto<IChatAgentRequest>, context: { history: IChatAgentHistoryEntryDto[] }, options: { location: ChatAgentLocation; participants?: vscode.ChatParticipantMetadata[] }, token: CancellationToken): Promise<vscode.ChatParticipantDetectionResult | null | undefined> {
+		const { request, location, history } = await this._createRequest(requestDto, context);
+
+		const provider = this._participantDetectionProviders.get(handle);
+		if (!provider) {
+			return undefined;
+		}
+
+		return provider.provideParticipantDetection(
+			typeConvert.ChatAgentRequest.to(request, location),
+			{ history },
+			{ participants: options.participants, location: typeConvert.ChatLocation.to(options.location) },
+			token
+		);
+	}
+
+	private async _createRequest(requestDto: Dto<IChatAgentRequest>, context: { history: IChatAgentHistoryEntryDto[] }) {
+		const request = revive<IChatAgentRequest>(requestDto);
+		const convertedHistory = await this.prepareHistoryTurns(request.agentId, context);
+
+		// in-place converting for location-data
+		let location: vscode.ChatRequestEditorData | vscode.ChatRequestNotebookData | undefined;
+		if (request.locationData?.type === ChatAgentLocation.Editor) {
+			// editor data
+			const document = this._documents.getDocument(request.locationData.document);
+			location = new extHostTypes.ChatRequestEditorData(document, typeConvert.Selection.to(request.locationData.selection), typeConvert.Range.to(request.locationData.wholeRange));
+
+		} else if (request.locationData?.type === ChatAgentLocation.Notebook) {
+			// notebook data
+			const cell = this._documents.getDocument(request.locationData.sessionInputUri);
+			location = new extHostTypes.ChatRequestNotebookData(cell);
+
+		} else if (request.locationData?.type === ChatAgentLocation.Terminal) {
+			// TBD
+		}
+
+		return { request, location, history: convertedHistory };
+	}
+
 	async $invokeAgent(handle: number, requestDto: Dto<IChatAgentRequest>, context: { history: IChatAgentHistoryEntryDto[] }, token: CancellationToken): Promise<IChatAgentResult | undefined> {
 		const agent = this._agents.get(handle);
 		if (!agent) {
 			throw new Error(`[CHAT](${handle}) CANNOT invoke agent because the agent is not registered`);
 		}
 
-		const request = revive<IChatAgentRequest>(requestDto);
-
-		// Init session disposables
-		let sessionDisposables = this._sessionDisposables.get(request.sessionId);
-		if (!sessionDisposables) {
-			sessionDisposables = new DisposableStore();
-			this._sessionDisposables.set(request.sessionId, sessionDisposables);
-		}
+		let stream: ChatAgentResponseStream | undefined;
 
-		const stream = new ChatAgentResponseStream(agent.extension, request, this._proxy, this._commands.converter, sessionDisposables);
 		try {
-			const convertedHistory = await this.prepareHistoryTurns(request.agentId, context);
-
-			// in-place converting for location-data
-			let location2: vscode.ChatRequestEditorData | vscode.ChatRequestNotebookData | undefined;
-			if (request.locationData?.type === ChatAgentLocation.Editor) {
-				// editor data
-				const document = this._documents.getDocument(request.locationData.document);
-				location2 = new extHostTypes.ChatRequestEditorData(document, typeConvert.Selection.to(request.locationData.selection), typeConvert.Range.to(request.locationData.wholeRange));
-
-			} else if (request.locationData?.type === ChatAgentLocation.Notebook) {
-				// notebook data
-				const cell = this._documents.getDocument(request.locationData.sessionInputUri);
-				location2 = new extHostTypes.ChatRequestNotebookData(cell);
-
-			} else if (request.locationData?.type === ChatAgentLocation.Terminal) {
-				// TBD
+			const { request, location, history } = await this._createRequest(requestDto, context);
+
+			// Init session disposables
+			let sessionDisposables = this._sessionDisposables.get(request.sessionId);
+			if (!sessionDisposables) {
+				sessionDisposables = new DisposableStore();
+				this._sessionDisposables.set(request.sessionId, sessionDisposables);
 			}
 
+			stream = new ChatAgentResponseStream(agent.extension, request, this._proxy, this._commands.converter, sessionDisposables);
+
 			const task = agent.invoke(
-				typeConvert.ChatAgentRequest.to(request, location2),
-				{ history: convertedHistory },
+				typeConvert.ChatAgentRequest.to(request, location),
+				{ history },
 				stream.apiObject,
 				token
 			);
@@ -354,7 +392,7 @@ export class ExtHostChatAgents2 extends Disposable implements ExtHostChatAgentsS
 					} catch (err) {
 						const msg = `result.metadata MUST be JSON.stringify-able. Got error: ${err.message}`;
 						this._logService.error(`[${agent.extension.identifier.value}] [@${agent.id}] ${msg}`, agent.extension);
-						return { errorDetails: { message: msg }, timings: stream.timings };
+						return { errorDetails: { message: msg }, timings: stream?.timings, nextQuestion: result.nextQuestion };
 					}
 				}
 				let errorDetails: IChatResponseErrorDetails | undefined;
@@ -368,7 +406,7 @@ export class ExtHostChatAgents2 extends Disposable implements ExtHostChatAgentsS
 					checkProposedApiEnabled(agent.extension, 'chatParticipantPrivate');
 				}
 
-				return { errorDetails, timings: stream.timings, metadata: result?.metadata } satisfies IChatAgentResult;
+				return { errorDetails, timings: stream?.timings, metadata: result?.metadata, nextQuestion: result?.nextQuestion } satisfies IChatAgentResult;
 			}), token);
 		} catch (e) {
 			this._logService.error(e, agent.extension);
@@ -380,12 +418,11 @@ export class ExtHostChatAgents2 extends Disposable implements ExtHostChatAgentsS
 			return { errorDetails: { message: toErrorMessage(e), responseIsIncomplete: true } };
 
 		} finally {
-			stream.close();
+			stream?.close();
 		}
 	}
 
 	private async prepareHistoryTurns(agentId: string, context: { history: IChatAgentHistoryEntryDto[] }): Promise<(vscode.ChatRequestTurn | vscode.ChatResponseTurn)[]> {
-
 		const res: (vscode.ChatRequestTurn | vscode.ChatResponseTurn)[] = [];
 
 		for (const h of context.history) {
@@ -397,8 +434,13 @@ export class ExtHostChatAgents2 extends Disposable implements ExtHostChatAgentsS
 			// REQUEST turn
 			const varsWithoutTools = h.request.variables.variables
 				.filter(v => !v.isTool)
-				.map(typeConvert.ChatAgentValueReference.to);
-			res.push(new extHostTypes.ChatRequestTurn(h.request.message, h.request.command, varsWithoutTools, h.request.agentId));
+				.map(typeConvert.ChatPromptReference.to);
+			const toolReferences = h.request.variables.variables
+				.filter(v => v.isTool)
+				.map(typeConvert.ChatLanguageModelToolReference.to);
+			const turn = new extHostTypes.ChatRequestTurn(h.request.message, h.request.command, varsWithoutTools, h.request.agentId);
+			turn.toolReferences = toolReferences;
+			res.push(turn);
 
 			// RESPONSE turn
 			const parts = coalesce(h.response.map(r => typeConvert.ChatResponsePart.toContent(r, this._commands.converter)));
@@ -436,7 +478,7 @@ export class ExtHostChatAgents2 extends Disposable implements ExtHostChatAgentsS
 			.map(f => typeConvert.ChatFollowup.from(f, request));
 	}
 
-	$acceptFeedback(handle: number, result: IChatAgentResult, vote: ChatAgentVoteDirection, reportIssue?: boolean): void {
+	$acceptFeedback(handle: number, result: IChatAgentResult, voteAction: IChatVoteAction): void {
 		const agent = this._agents.get(handle);
 		if (!agent) {
 			return;
@@ -444,7 +486,7 @@ export class ExtHostChatAgents2 extends Disposable implements ExtHostChatAgentsS
 
 		const ehResult = typeConvert.ChatAgentResult.to(result);
 		let kind: extHostTypes.ChatResultFeedbackKind;
-		switch (vote) {
+		switch (voteAction.direction) {
 			case ChatAgentVoteDirection.Down:
 				kind = extHostTypes.ChatResultFeedbackKind.Unhelpful;
 				break;
@@ -452,9 +494,13 @@ export class ExtHostChatAgents2 extends Disposable implements ExtHostChatAgentsS
 				kind = extHostTypes.ChatResultFeedbackKind.Helpful;
 				break;
 		}
-		agent.acceptFeedback(reportIssue ?
-			Object.freeze({ result: ehResult, kind, reportIssue }) :
-			Object.freeze({ result: ehResult, kind }));
+
+		const feedback: vscode.ChatResultFeedback = {
+			result: ehResult,
+			kind,
+			unhelpfulReason: isProposedApiEnabled(agent.extension, 'chatParticipantAdditions') ? voteAction.reason : undefined,
+		};
+		agent.acceptFeedback(Object.freeze(feedback));
 	}
 
 	$acceptAction(handle: number, result: IChatAgentResult, event: IChatUserActionEvent): void {
@@ -502,6 +548,16 @@ export class ExtHostChatAgents2 extends Disposable implements ExtHostChatAgentsS
 		return await agent.provideWelcomeMessage(typeConvert.ChatLocation.to(location), token);
 	}
 
+	async $provideChatTitle(handle: number, context: IChatAgentHistoryEntryDto[], token: CancellationToken): Promise<string | undefined> {
+		const agent = this._agents.get(handle);
+		if (!agent) {
+			return;
+		}
+
+		const history = await this.prepareHistoryTurns(agent.id, { history: context });
+		return await agent.provideTitle({ history }, token);
+	}
+
 	async $provideSampleQuestions(handle: number, location: ChatAgentLocation, token: CancellationToken): Promise<IChatFollowup[] | undefined> {
 		const agent = this._agents.get(handle);
 		if (!agent) {
@@ -517,7 +573,6 @@ class ExtHostChatAgent {
 
 	private _followupProvider: vscode.ChatFollowupProvider | undefined;
 	private _iconPath: vscode.Uri | { light: vscode.Uri; dark: vscode.Uri } | vscode.ThemeIcon | undefined;
-	private _isDefault: boolean | undefined;
 	private _helpTextPrefix: string | vscode.MarkdownString | undefined;
 	private _helpTextVariablesPrefix: string | vscode.MarkdownString | undefined;
 	private _helpTextPostfix: string | vscode.MarkdownString | undefined;
@@ -527,6 +582,7 @@ class ExtHostChatAgent {
 	private _supportIssueReporting: boolean | undefined;
 	private _agentVariableProvider?: { provider: vscode.ChatParticipantCompletionItemProvider; triggerCharacters: string[] };
 	private _welcomeMessageProvider?: vscode.ChatWelcomeMessageProvider | undefined;
+	private _titleProvider?: vscode.ChatTitleProvider | undefined;
 	private _requester: vscode.ChatRequesterInformation | undefined;
 	private _supportsSlowReferences: boolean | undefined;
 
@@ -587,6 +643,14 @@ class ExtHostChatAgent {
 		});
 	}
 
+	async provideTitle(context: vscode.ChatContext, token: CancellationToken): Promise<string | undefined> {
+		if (!this._titleProvider) {
+			return;
+		}
+
+		return await this._titleProvider.provideChatTitle(context, token) ?? undefined;
+	}
+
 	async provideSampleQuestions(location: vscode.ChatLocation, token: CancellationToken): Promise<vscode.ChatFollowup[]> {
 		if (!this._welcomeMessageProvider || !this._welcomeMessageProvider.provideSampleQuestions) {
 			return [];
@@ -659,15 +723,6 @@ class ExtHostChatAgent {
 				that._followupProvider = v;
 				updateMetadataSoon();
 			},
-			get isDefault() {
-				checkProposedApiEnabled(that.extension, 'defaultChatParticipant');
-				return that._isDefault;
-			},
-			set isDefault(v) {
-				checkProposedApiEnabled(that.extension, 'defaultChatParticipant');
-				that._isDefault = v;
-				updateMetadataSoon();
-			},
 			get helpTextPrefix() {
 				checkProposedApiEnabled(that.extension, 'defaultChatParticipant');
 				return that._helpTextPrefix;
@@ -742,6 +797,15 @@ class ExtHostChatAgent {
 				checkProposedApiEnabled(that.extension, 'defaultChatParticipant');
 				return that._welcomeMessageProvider;
 			},
+			set titleProvider(v) {
+				checkProposedApiEnabled(that.extension, 'defaultChatParticipant');
+				that._titleProvider = v;
+				updateMetadataSoon();
+			},
+			get titleProvider() {
+				checkProposedApiEnabled(that.extension, 'defaultChatParticipant');
+				return that._titleProvider;
+			},
 			onDidPerformAction: !isProposedApiEnabled(this.extension, 'chatParticipantAdditions')
 				? undefined!
 				: this._onDidPerformAction.event
diff --git a/src/vs/workbench/api/common/extHostComments.ts b/src/vs/workbench/api/common/extHostComments.ts
index b9742fa976c..05761198ee5 100644
--- a/src/vs/workbench/api/common/extHostComments.ts
+++ b/src/vs/workbench/api/common/extHostComments.ts
@@ -641,11 +641,11 @@ export function createExtHostComments(mainContext: IMainContext, commands: ExtHo
 			return this._activeComment;
 		}
 
-		private _activeThread: vscode.CommentThread2 | undefined;
+		private _activeThread: ExtHostCommentThread | undefined;
 
 		get activeCommentThread(): vscode.CommentThread2 | undefined {
 			checkProposedApiEnabled(this._extension, 'activeComment');
-			return this._activeThread;
+			return this._activeThread?.value;
 		}
 
 		private _localDisposables: types.Disposable[];
diff --git a/src/vs/workbench/api/common/extHostExtensionService.ts b/src/vs/workbench/api/common/extHostExtensionService.ts
index 418b08c2422..97ecf09ea56 100644
--- a/src/vs/workbench/api/common/extHostExtensionService.ts
+++ b/src/vs/workbench/api/common/extHostExtensionService.ts
@@ -498,7 +498,7 @@ export abstract class AbstractExtHostExtensionService extends Disposable impleme
 
 	private _loadExtensionContext(extensionDescription: IExtensionDescription, extensionInternalStore: DisposableStore): Promise<vscode.ExtensionContext> {
 
-		const lanuageModelAccessInformation = this._extHostLanguageModels.createLanguageModelAccessInformation(extensionDescription);
+		const languageModelAccessInformation = this._extHostLanguageModels.createLanguageModelAccessInformation(extensionDescription);
 		const globalState = extensionInternalStore.add(new ExtensionGlobalMemento(extensionDescription, this._storage));
 		const workspaceState = extensionInternalStore.add(new ExtensionMemento(extensionDescription.identifier.value, false, this._storage));
 		const secrets = extensionInternalStore.add(new ExtensionSecrets(extensionDescription, this._secretState));
@@ -527,7 +527,7 @@ export abstract class AbstractExtHostExtensionService extends Disposable impleme
 				workspaceState,
 				secrets,
 				subscriptions: [],
-				get languageModelAccessInformation() { return lanuageModelAccessInformation; },
+				get languageModelAccessInformation() { return languageModelAccessInformation; },
 				get extensionUri() { return extensionDescription.extensionLocation; },
 				get extensionPath() { return extensionDescription.extensionLocation.fsPath; },
 				asAbsolutePath(relativePath: string) { return path.join(extensionDescription.extensionLocation.fsPath, relativePath); },
diff --git a/src/vs/workbench/api/common/extHostLanguageFeatures.ts b/src/vs/workbench/api/common/extHostLanguageFeatures.ts
index a117be1b9a2..ca85561c615 100644
--- a/src/vs/workbench/api/common/extHostLanguageFeatures.ts
+++ b/src/vs/workbench/api/common/extHostLanguageFeatures.ts
@@ -2395,15 +2395,15 @@ export class ExtHostLanguageFeatures implements extHostProtocol.ExtHostLanguageF
 	}
 
 	$provideCodeLenses(handle: number, resource: UriComponents, token: CancellationToken): Promise<extHostProtocol.ICodeLensListDto | undefined> {
-		return this._withAdapter(handle, CodeLensAdapter, adapter => adapter.provideCodeLenses(URI.revive(resource), token), undefined, token);
+		return this._withAdapter(handle, CodeLensAdapter, adapter => adapter.provideCodeLenses(URI.revive(resource), token), undefined, token, resource.scheme === 'output');
 	}
 
 	$resolveCodeLens(handle: number, symbol: extHostProtocol.ICodeLensDto, token: CancellationToken): Promise<extHostProtocol.ICodeLensDto | undefined> {
-		return this._withAdapter(handle, CodeLensAdapter, adapter => adapter.resolveCodeLens(symbol, token), undefined, undefined);
+		return this._withAdapter(handle, CodeLensAdapter, adapter => adapter.resolveCodeLens(symbol, token), undefined, undefined, true);
 	}
 
 	$releaseCodeLenses(handle: number, cacheId: number): void {
-		this._withAdapter(handle, CodeLensAdapter, adapter => Promise.resolve(adapter.releaseCodeLenses(cacheId)), undefined, undefined);
+		this._withAdapter(handle, CodeLensAdapter, adapter => Promise.resolve(adapter.releaseCodeLenses(cacheId)), undefined, undefined, true);
 	}
 
 	// --- declaration
diff --git a/src/vs/workbench/api/common/extHostLanguageModelTools.ts b/src/vs/workbench/api/common/extHostLanguageModelTools.ts
index bd77b53bd44..d792a7bb0f0 100644
--- a/src/vs/workbench/api/common/extHostLanguageModelTools.ts
+++ b/src/vs/workbench/api/common/extHostLanguageModelTools.ts
@@ -3,45 +3,69 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { raceCancellation } from 'vs/base/common/async';
 import { CancellationToken } from 'vs/base/common/cancellation';
+import { CancellationError } from 'vs/base/common/errors';
 import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';
 import { revive } from 'vs/base/common/marshalling';
+import { generateUuid } from 'vs/base/common/uuid';
 import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
-import { ExtHostLanguageModelToolsShape, IMainContext, MainContext, MainThreadLanguageModelToolsShape } from 'vs/workbench/api/common/extHost.protocol';
+import { ExtHostLanguageModelToolsShape, IMainContext, IToolDataDto, MainContext, MainThreadLanguageModelToolsShape } from 'vs/workbench/api/common/extHost.protocol';
 import * as typeConvert from 'vs/workbench/api/common/extHostTypeConverters';
-import { IToolData, IToolDelta } from 'vs/workbench/contrib/chat/common/languageModelToolsService';
+import { IToolInvocation, IToolResult } from 'vs/workbench/contrib/chat/common/languageModelToolsService';
 import type * as vscode from 'vscode';
 
 export class ExtHostLanguageModelTools implements ExtHostLanguageModelToolsShape {
 	/** A map of tools that were registered in this EH */
 	private readonly _registeredTools = new Map<string, { extension: IExtensionDescription; tool: vscode.LanguageModelTool }>();
 	private readonly _proxy: MainThreadLanguageModelToolsShape;
+	private readonly _tokenCountFuncs = new Map</* call ID */string, (text: string, token?: vscode.CancellationToken) => Thenable<number>>();
 
 	/** A map of all known tools, from other EHs or registered in vscode core */
-	private readonly _allTools = new Map<string, IToolData>();
+	private readonly _allTools = new Map<string, IToolDataDto>();
 
 	constructor(mainContext: IMainContext) {
 		this._proxy = mainContext.getProxy(MainContext.MainThreadLanguageModelTools);
 
 		this._proxy.$getTools().then(tools => {
 			for (const tool of tools) {
-				this._allTools.set(tool.name, revive(tool));
+				this._allTools.set(tool.id, revive(tool));
 			}
 		});
 	}
 
-	async invokeTool(name: string, parameters: any, token: CancellationToken): Promise<string> {
-		// Making the round trip here because not all tools were necessarily registered in this EH
-		return await this._proxy.$invokeTool(name, parameters, token);
+	async $countTokensForInvocation(callId: string, input: string, token: CancellationToken): Promise<number> {
+		const fn = this._tokenCountFuncs.get(callId);
+		if (!fn) {
+			throw new Error(`Tool invocation call ${callId} not found`);
+		}
+
+		return await fn(input, token);
 	}
 
-	async $acceptToolDelta(delta: IToolDelta): Promise<void> {
-		if (delta.added) {
-			this._allTools.set(delta.added.name, delta.added);
+	async invokeTool(toolId: string, options: vscode.LanguageModelToolInvocationOptions, token: CancellationToken): Promise<vscode.LanguageModelToolResult> {
+		const callId = generateUuid();
+		if (options.tokenOptions) {
+			this._tokenCountFuncs.set(callId, options.tokenOptions.countTokens);
+		}
+		try {
+			// Making the round trip here because not all tools were necessarily registered in this EH
+			const result = await this._proxy.$invokeTool({
+				toolId,
+				callId,
+				parameters: options.parameters,
+				tokenBudget: options.tokenOptions?.tokenBudget,
+			}, token);
+			return typeConvert.LanguageModelToolResult.to(result);
+		} finally {
+			this._tokenCountFuncs.delete(callId);
 		}
+	}
 
-		if (delta.removed) {
-			this._allTools.delete(delta.removed);
+	$onDidChangeTools(tools: IToolDataDto[]): void {
+		this._allTools.clear();
+		for (const tool of tools) {
+			this._allTools.set(tool.id, tool);
 		}
 	}
 
@@ -50,13 +74,34 @@ export class ExtHostLanguageModelTools implements ExtHostLanguageModelToolsShape
 			.map(tool => typeConvert.LanguageModelToolDescription.to(tool));
 	}
 
-	async $invokeTool(name: string, parameters: any, token: CancellationToken): Promise<string> {
-		const item = this._registeredTools.get(name);
+	async $invokeTool(dto: IToolInvocation, token: CancellationToken): Promise<IToolResult> {
+		const item = this._registeredTools.get(dto.toolId);
 		if (!item) {
-			throw new Error(`Unknown tool ${name}`);
+			throw new Error(`Unknown tool ${dto.toolId}`);
+		}
+
+		const options: vscode.LanguageModelToolInvocationOptions = { parameters: dto.parameters };
+		if (dto.tokenBudget !== undefined) {
+			options.tokenOptions = {
+				tokenBudget: dto.tokenBudget,
+				countTokens: this._tokenCountFuncs.get(dto.callId) || ((value, token = CancellationToken.None) =>
+					this._proxy.$countTokensForInvocation(dto.callId, value, token))
+			};
+		}
+
+		const extensionResult = await raceCancellation(Promise.resolve(item.tool.invoke(options, token)), token);
+		if (!extensionResult) {
+			throw new CancellationError();
+		}
+
+		for (const key of Object.keys(extensionResult)) {
+			const value = extensionResult[key];
+			if (value instanceof Promise) {
+				throw new Error(`Tool result for '${key}' cannot be a Promise`);
+			}
 		}
 
-		return await item.tool.invoke(parameters, token);
+		return typeConvert.LanguageModelToolResult.from(extensionResult);
 	}
 
 	registerTool(extension: IExtensionDescription, name: string, tool: vscode.LanguageModelTool): IDisposable {
diff --git a/src/vs/workbench/api/common/extHostLanguageModels.ts b/src/vs/workbench/api/common/extHostLanguageModels.ts
index b67999350af..dd0ccfc98b0 100644
--- a/src/vs/workbench/api/common/extHostLanguageModels.ts
+++ b/src/vs/workbench/api/common/extHostLanguageModels.ts
@@ -37,13 +37,13 @@ type LanguageModelData = {
 
 class LanguageModelResponseStream {
 
-	readonly stream = new AsyncIterableSource<vscode.LanguageModelChatResponseTextPart | vscode.LanguageModelChatResponseFunctionUsePart>();
+	readonly stream = new AsyncIterableSource<vscode.LanguageModelChatResponseTextPart | vscode.LanguageModelChatResponseToolCallPart>();
 
 	constructor(
 		readonly option: number,
-		stream?: AsyncIterableSource<vscode.LanguageModelChatResponseTextPart | vscode.LanguageModelChatResponseFunctionUsePart>
+		stream?: AsyncIterableSource<vscode.LanguageModelChatResponseTextPart | vscode.LanguageModelChatResponseToolCallPart>
 	) {
-		this.stream = stream ?? new AsyncIterableSource<vscode.LanguageModelChatResponseTextPart | vscode.LanguageModelChatResponseFunctionUsePart>();
+		this.stream = stream ?? new AsyncIterableSource<vscode.LanguageModelChatResponseTextPart | vscode.LanguageModelChatResponseToolCallPart>();
 	}
 }
 
@@ -52,7 +52,7 @@ class LanguageModelResponse {
 	readonly apiObject: vscode.LanguageModelChatResponse;
 
 	private readonly _responseStreams = new Map<number, LanguageModelResponseStream>();
-	private readonly _defaultStream = new AsyncIterableSource<vscode.LanguageModelChatResponseTextPart | vscode.LanguageModelChatResponseFunctionUsePart>();
+	private readonly _defaultStream = new AsyncIterableSource<vscode.LanguageModelChatResponseTextPart | vscode.LanguageModelChatResponseToolCallPart>();
 	private _isDone: boolean = false;
 
 	constructor() {
@@ -100,11 +100,11 @@ class LanguageModelResponse {
 			this._responseStreams.set(fragment.index, res);
 		}
 
-		let out: vscode.LanguageModelChatResponseTextPart | vscode.LanguageModelChatResponseFunctionUsePart;
+		let out: vscode.LanguageModelChatResponseTextPart | vscode.LanguageModelChatResponseToolCallPart;
 		if (fragment.part.type === 'text') {
 			out = new extHostTypes.LanguageModelTextPart(fragment.part.value);
 		} else {
-			out = new extHostTypes.LanguageModelFunctionUsePart(fragment.part.name, fragment.part.parameters);
+			out = new extHostTypes.LanguageModelToolCallPart(fragment.part.name, fragment.part.toolCallId, fragment.part.parameters);
 		}
 		res.stream.emitOne(out);
 	}
@@ -201,8 +201,8 @@ export class ExtHostLanguageModels implements ExtHostLanguageModelsShape {
 			}
 
 			let part: IChatResponsePart | undefined;
-			if (fragment.part instanceof extHostTypes.LanguageModelFunctionUsePart) {
-				part = { type: 'function_use', name: fragment.part.name, parameters: fragment.part.parameters };
+			if (fragment.part instanceof extHostTypes.LanguageModelToolCallPart) {
+				part = { type: 'tool_use', name: fragment.part.name, parameters: fragment.part.parameters, toolCallId: fragment.part.toolCallId };
 			} else if (fragment.part instanceof extHostTypes.LanguageModelTextPart) {
 				part = { type: 'text', value: fragment.part.value };
 			}
@@ -396,7 +396,7 @@ export class ExtHostLanguageModels implements ExtHostLanguageModelsShape {
 			if (message.role as number === extHostTypes.LanguageModelChatMessageRole.System) {
 				checkProposedApiEnabled(extension, 'languageModelSystem');
 			}
-			if (message.content2 instanceof extHostTypes.LanguageModelFunctionResultPart) {
+			if (message.content2.some(part => part instanceof extHostTypes.LanguageModelToolResultPart)) {
 				checkProposedApiEnabled(extension, 'lmTools');
 			}
 			internalMessages.push(typeConvert.LanguageModelChatMessage.from(message));
diff --git a/src/vs/workbench/api/common/extHostNotebook.ts b/src/vs/workbench/api/common/extHostNotebook.ts
index 5b707fc865e..a8c5d9f6205 100644
--- a/src/vs/workbench/api/common/extHostNotebook.ts
+++ b/src/vs/workbench/api/common/extHostNotebook.ts
@@ -145,8 +145,6 @@ export class ExtHostNotebookController implements ExtHostNotebookShape {
 		return result;
 	}
 
-
-
 	private static _convertNotebookRegistrationData(extension: IExtensionDescription, registration: vscode.NotebookRegistrationData | undefined): INotebookContributionData | undefined {
 		if (!registration) {
 			return;
@@ -205,28 +203,25 @@ export class ExtHostNotebookController implements ExtHostNotebookShape {
 		return assertIsDefined(document?.apiNotebook);
 	}
 
-
-	async showNotebookDocument(notebookOrUri: vscode.NotebookDocument | URI, options?: vscode.NotebookDocumentShowOptions): Promise<vscode.NotebookEditor> {
-
-		if (URI.isUri(notebookOrUri)) {
-			notebookOrUri = await this.openNotebookDocument(notebookOrUri);
-		}
-
+	async showNotebookDocument(notebook: vscode.NotebookDocument, options?: vscode.NotebookDocumentShowOptions): Promise<vscode.NotebookEditor> {
 		let resolvedOptions: INotebookDocumentShowOptions;
 		if (typeof options === 'object') {
 			resolvedOptions = {
 				position: typeConverters.ViewColumn.from(options.viewColumn),
 				preserveFocus: options.preserveFocus,
 				selections: options.selections && options.selections.map(typeConverters.NotebookRange.from),
-				pinned: typeof options.preview === 'boolean' ? !options.preview : undefined
+				pinned: typeof options.preview === 'boolean' ? !options.preview : undefined,
+				label: options?.label
 			};
 		} else {
 			resolvedOptions = {
-				preserveFocus: false
+				preserveFocus: false,
+				pinned: true
 			};
 		}
 
-		const editorId = await this._notebookEditorsProxy.$tryShowNotebookDocument(notebookOrUri.uri, notebookOrUri.notebookType, resolvedOptions);
+		const viewType = options?.asRepl ? 'repl' : notebook.notebookType;
+		const editorId = await this._notebookEditorsProxy.$tryShowNotebookDocument(notebook.uri, viewType, resolvedOptions);
 		const editor = editorId && this._editors.get(editorId)?.apiEditor;
 
 		if (editor) {
@@ -234,9 +229,9 @@ export class ExtHostNotebookController implements ExtHostNotebookShape {
 		}
 
 		if (editorId) {
-			throw new Error(`Could NOT open editor for "${notebookOrUri.uri.toString()}" because another editor opened in the meantime.`);
+			throw new Error(`Could NOT open editor for "${notebook.uri.toString()}" because another editor opened in the meantime.`);
 		} else {
-			throw new Error(`Could NOT open editor for "${notebookOrUri.uri.toString()}".`);
+			throw new Error(`Could NOT open editor for "${notebook.uri.toString()}".`);
 		}
 	}
 
diff --git a/src/vs/workbench/api/common/extHostSearch.ts b/src/vs/workbench/api/common/extHostSearch.ts
index f7da534aab8..bf7f4049733 100644
--- a/src/vs/workbench/api/common/extHostSearch.ts
+++ b/src/vs/workbench/api/common/extHostSearch.ts
@@ -15,11 +15,16 @@ import { IRawFileQuery, ISearchCompleteStats, IFileQuery, IRawTextQuery, IRawQue
 import { URI, UriComponents } from 'vs/base/common/uri';
 import { TextSearchManager } from 'vs/workbench/services/search/common/textSearchManager';
 import { CancellationToken } from 'vs/base/common/cancellation';
+import { revive } from 'vs/base/common/marshalling';
+import { OldAITextSearchProviderConverter, OldFileSearchProviderConverter, OldTextSearchProviderConverter } from 'vs/workbench/services/search/common/searchExtConversionTypes';
 
 export interface IExtHostSearch extends ExtHostSearchShape {
-	registerTextSearchProvider(scheme: string, provider: vscode.TextSearchProvider): IDisposable;
-	registerAITextSearchProvider(scheme: string, provider: vscode.AITextSearchProvider): IDisposable;
-	registerFileSearchProvider(scheme: string, provider: vscode.FileSearchProvider): IDisposable;
+	registerTextSearchProviderOld(scheme: string, provider: vscode.TextSearchProvider): IDisposable;
+	registerAITextSearchProviderOld(scheme: string, provider: vscode.AITextSearchProvider): IDisposable;
+	registerFileSearchProviderOld(scheme: string, provider: vscode.FileSearchProvider): IDisposable;
+	registerTextSearchProvider(scheme: string, provider: vscode.TextSearchProviderNew): IDisposable;
+	registerAITextSearchProvider(scheme: string, provider: vscode.AITextSearchProviderNew): IDisposable;
+	registerFileSearchProvider(scheme: string, provider: vscode.FileSearchProviderNew): IDisposable;
 	doInternalFileSearchWithCustomCallback(query: IFileQuery, token: CancellationToken, handleFileMatch: (data: URI[]) => void): Promise<ISearchCompleteStats>;
 }
 
@@ -30,13 +35,13 @@ export class ExtHostSearch implements IExtHostSearch {
 	protected readonly _proxy: MainThreadSearchShape = this.extHostRpc.getProxy(MainContext.MainThreadSearch);
 	protected _handlePool: number = 0;
 
-	private readonly _textSearchProvider = new Map<number, vscode.TextSearchProvider>();
+	private readonly _textSearchProvider = new Map<number, vscode.TextSearchProviderNew>();
 	private readonly _textSearchUsedSchemes = new Set<string>();
 
-	private readonly _aiTextSearchProvider = new Map<number, vscode.AITextSearchProvider>();
+	private readonly _aiTextSearchProvider = new Map<number, vscode.AITextSearchProviderNew>();
 	private readonly _aiTextSearchUsedSchemes = new Set<string>();
 
-	private readonly _fileSearchProvider = new Map<number, vscode.FileSearchProvider>();
+	private readonly _fileSearchProvider = new Map<number, vscode.FileSearchProviderNew>();
 	private readonly _fileSearchUsedSchemes = new Set<string>();
 
 	private readonly _fileSearchManager = new FileSearchManager();
@@ -44,14 +49,30 @@ export class ExtHostSearch implements IExtHostSearch {
 	constructor(
 		@IExtHostRpcService private extHostRpc: IExtHostRpcService,
 		@IURITransformerService protected _uriTransformer: IURITransformerService,
-		@ILogService protected _logService: ILogService
+		@ILogService protected _logService: ILogService,
 	) { }
 
 	protected _transformScheme(scheme: string): string {
 		return this._uriTransformer.transformOutgoingScheme(scheme);
 	}
 
-	registerTextSearchProvider(scheme: string, provider: vscode.TextSearchProvider): IDisposable {
+	registerTextSearchProviderOld(scheme: string, provider: vscode.TextSearchProvider): IDisposable {
+		if (this._textSearchUsedSchemes.has(scheme)) {
+			throw new Error(`a text search provider for the scheme '${scheme}' is already registered`);
+		}
+
+		this._textSearchUsedSchemes.add(scheme);
+		const handle = this._handlePool++;
+		this._textSearchProvider.set(handle, new OldTextSearchProviderConverter(provider));
+		this._proxy.$registerTextSearchProvider(handle, this._transformScheme(scheme));
+		return toDisposable(() => {
+			this._textSearchUsedSchemes.delete(scheme);
+			this._textSearchProvider.delete(handle);
+			this._proxy.$unregisterProvider(handle);
+		});
+	}
+
+	registerTextSearchProvider(scheme: string, provider: vscode.TextSearchProviderNew): IDisposable {
 		if (this._textSearchUsedSchemes.has(scheme)) {
 			throw new Error(`a text search provider for the scheme '${scheme}' is already registered`);
 		}
@@ -67,7 +88,23 @@ export class ExtHostSearch implements IExtHostSearch {
 		});
 	}
 
-	registerAITextSearchProvider(scheme: string, provider: vscode.AITextSearchProvider): IDisposable {
+	registerAITextSearchProviderOld(scheme: string, provider: vscode.AITextSearchProvider): IDisposable {
+		if (this._aiTextSearchUsedSchemes.has(scheme)) {
+			throw new Error(`an AI text search provider for the scheme '${scheme}'is already registered`);
+		}
+
+		this._aiTextSearchUsedSchemes.add(scheme);
+		const handle = this._handlePool++;
+		this._aiTextSearchProvider.set(handle, new OldAITextSearchProviderConverter(provider));
+		this._proxy.$registerAITextSearchProvider(handle, this._transformScheme(scheme));
+		return toDisposable(() => {
+			this._aiTextSearchUsedSchemes.delete(scheme);
+			this._aiTextSearchProvider.delete(handle);
+			this._proxy.$unregisterProvider(handle);
+		});
+	}
+
+	registerAITextSearchProvider(scheme: string, provider: vscode.AITextSearchProviderNew): IDisposable {
 		if (this._aiTextSearchUsedSchemes.has(scheme)) {
 			throw new Error(`an AI text search provider for the scheme '${scheme}'is already registered`);
 		}
@@ -83,7 +120,23 @@ export class ExtHostSearch implements IExtHostSearch {
 		});
 	}
 
-	registerFileSearchProvider(scheme: string, provider: vscode.FileSearchProvider): IDisposable {
+	registerFileSearchProviderOld(scheme: string, provider: vscode.FileSearchProvider): IDisposable {
+		if (this._fileSearchUsedSchemes.has(scheme)) {
+			throw new Error(`a file search provider for the scheme '${scheme}' is already registered`);
+		}
+
+		this._fileSearchUsedSchemes.add(scheme);
+		const handle = this._handlePool++;
+		this._fileSearchProvider.set(handle, new OldFileSearchProviderConverter(provider));
+		this._proxy.$registerFileSearchProvider(handle, this._transformScheme(scheme));
+		return toDisposable(() => {
+			this._fileSearchUsedSchemes.delete(scheme);
+			this._fileSearchProvider.delete(handle);
+			this._proxy.$unregisterProvider(handle);
+		});
+	}
+
+	registerFileSearchProvider(scheme: string, provider: vscode.FileSearchProviderNew): IDisposable {
 		if (this._fileSearchUsedSchemes.has(scheme)) {
 			throw new Error(`a file search provider for the scheme '${scheme}' is already registered`);
 		}
@@ -107,7 +160,7 @@ export class ExtHostSearch implements IExtHostSearch {
 				this._proxy.$handleFileMatch(handle, session, batch.map(p => p.resource));
 			}, token);
 		} else {
-			throw new Error('3 unknown provider: ' + handle);
+			throw new Error('unknown provider: ' + handle);
 		}
 	}
 
@@ -145,14 +198,14 @@ export class ExtHostSearch implements IExtHostSearch {
 
 	$enableExtensionHostSearch(): void { }
 
-	protected createTextSearchManager(query: ITextQuery, provider: vscode.TextSearchProvider): TextSearchManager {
+	protected createTextSearchManager(query: ITextQuery, provider: vscode.TextSearchProviderNew): TextSearchManager {
 		return new TextSearchManager({ query, provider }, {
 			readdir: resource => Promise.resolve([]),
 			toCanonicalName: encoding => encoding
 		}, 'textSearchProvider');
 	}
 
-	protected createAITextSearchManager(query: IAITextQuery, provider: vscode.AITextSearchProvider): TextSearchManager {
+	protected createAITextSearchManager(query: IAITextQuery, provider: vscode.AITextSearchProviderNew): TextSearchManager {
 		return new TextSearchManager({ query, provider }, {
 			readdir: resource => Promise.resolve([]),
 			toCanonicalName: encoding => encoding
@@ -171,8 +224,6 @@ export function reviveQuery<U extends IRawQuery>(rawQuery: U): U extends IRawTex
 }
 
 function reviveFolderQuery(rawFolderQuery: IFolderQuery<UriComponents>): IFolderQuery<URI> {
-	return {
-		...rawFolderQuery,
-		folder: URI.revive(rawFolderQuery.folder)
-	};
+	return revive(rawFolderQuery);
 }
+
diff --git a/src/vs/workbench/api/common/extHostTask.ts b/src/vs/workbench/api/common/extHostTask.ts
index b5829c09af7..99968d5d744 100644
--- a/src/vs/workbench/api/common/extHostTask.ts
+++ b/src/vs/workbench/api/common/extHostTask.ts
@@ -28,6 +28,7 @@ import { ILogService } from 'vs/platform/log/common/log';
 import { IExtHostApiDeprecationService } from 'vs/workbench/api/common/extHostApiDeprecationService';
 import { USER_TASKS_GROUP_KEY } from 'vs/workbench/contrib/tasks/common/tasks';
 import { ErrorNoTelemetry, NotSupportedError } from 'vs/base/common/errors';
+import { asArray } from 'vs/base/common/arrays';
 
 export interface IExtHostTask extends ExtHostTaskShape {
 
@@ -279,7 +280,7 @@ export namespace TaskDTO {
 			isBackground: value.isBackground,
 			group: TaskGroupDTO.from(value.group as vscode.TaskGroup),
 			presentationOptions: TaskPresentationOptionsDTO.from(value.presentationOptions),
-			problemMatchers: value.problemMatchers,
+			problemMatchers: asArray(value.problemMatchers),
 			hasDefinedMatchers: (value as types.Task).hasDefinedMatchers,
 			runOptions: value.runOptions ? value.runOptions : { reevaluateOnRerun: true },
 			detail: value.detail
diff --git a/src/vs/workbench/api/common/extHostTesting.ts b/src/vs/workbench/api/common/extHostTesting.ts
index 7f84ac32866..456816da246 100644
--- a/src/vs/workbench/api/common/extHostTesting.ts
+++ b/src/vs/workbench/api/common/extHostTesting.ts
@@ -399,6 +399,12 @@ export class ExtHostTesting extends Disposable implements ExtHostTestingShape {
 			results
 				.map(r => {
 					const o = Convert.TestResults.to(r);
+					const taskWithCoverage = r.tasks.findIndex(t => t.hasCoverage);
+					if (taskWithCoverage !== -1) {
+						o.getDetailedCoverage = (uri, token = CancellationToken.None) =>
+							this.proxy.$getCoverageDetails(r.id, taskWithCoverage, uri, token).then(r => r.map(Convert.TestCoverage.to));
+					}
+
 					testResultInternalIDs.set(o, r.id);
 					return o;
 				})
@@ -506,11 +512,11 @@ export class ExtHostTesting extends Disposable implements ExtHostTestingShape {
 	/**
 	 * Cancels an ongoing test run.
 	 */
-	public $cancelExtensionTestRun(runId: string | undefined) {
+	public $cancelExtensionTestRun(runId: string | undefined, taskId: string | undefined) {
 		if (runId === undefined) {
 			this.runTracker.cancelAllRuns();
 		} else {
-			this.runTracker.cancelRunById(runId);
+			this.runTracker.cancelRunById(runId, taskId);
 		}
 	}
 
@@ -599,7 +605,7 @@ const enum TestRunTrackerState {
 class TestRunTracker extends Disposable {
 	private state = TestRunTrackerState.Running;
 	private running = 0;
-	private readonly tasks = new Map</* task ID */string, { run: vscode.TestRun }>();
+	private readonly tasks = new Map</* task ID */string, { cts: CancellationTokenSource; run: vscode.TestRun }>();
 	private readonly sharedTestIds = new Set<string>();
 	private readonly cts: CancellationTokenSource;
 	private readonly endEmitter = this._register(new Emitter<void>());
@@ -659,8 +665,10 @@ class TestRunTracker extends Disposable {
 	}
 
 	/** Requests cancellation of the run. On the second call, forces cancellation. */
-	public cancel() {
-		if (this.state === TestRunTrackerState.Running) {
+	public cancel(taskId?: string) {
+		if (taskId) {
+			this.tasks.get(taskId)?.cts.cancel();
+		} else if (this.state === TestRunTrackerState.Running) {
 			this.cts.cancel();
 			this.state = TestRunTrackerState.Cancelling;
 		} else if (this.state === TestRunTrackerState.Cancelling) {
@@ -731,13 +739,15 @@ class TestRunTracker extends Disposable {
 		};
 
 		let ended = false;
+		// tasks are alive for as long as the tracker is alive, so simple this._register is fine:
+		const cts = this._register(new CancellationTokenSource(this.cts.token));
 
 		// one-off map used to associate test items with incrementing IDs in `addCoverage`.
 		// There's no need to include their entire ID, we just want to make sure they're
 		// stable and unique. Normal map is okay since TestRun lifetimes are limited.
 		const run: vscode.TestRun = {
 			isPersisted: this.dto.isPersisted,
-			token: this.cts.token,
+			token: cts.token,
 			name,
 			onDidDispose: this.onDidDispose,
 			addCoverage: (coverage) => {
@@ -815,8 +825,13 @@ class TestRunTracker extends Disposable {
 		};
 
 		this.running++;
-		this.tasks.set(taskId, { run });
-		this.proxy.$startedTestRunTask(runId, { id: taskId, ctrlId: this.dto.controllerId, name, running: true });
+		this.tasks.set(taskId, { run, cts });
+		this.proxy.$startedTestRunTask(runId, {
+			id: taskId,
+			ctrlId: this.dto.controllerId,
+			name: name || this.extension.displayName || this.extension.identifier.value,
+			running: true,
+		});
 
 		return run;
 	}
@@ -921,8 +936,8 @@ export class TestRunCoordinator {
 	/**
 	 * Cancels an existing test run via its cancellation token.
 	 */
-	public cancelRunById(runId: string) {
-		this.trackedById.get(runId)?.cancel();
+	public cancelRunById(runId: string, taskId?: string) {
+		this.trackedById.get(runId)?.cancel(taskId);
 	}
 
 	/**
diff --git a/src/vs/workbench/api/common/extHostTypeConverters.ts b/src/vs/workbench/api/common/extHostTypeConverters.ts
index 6a81c0db675..b0e7f785ff9 100644
--- a/src/vs/workbench/api/common/extHostTypeConverters.ts
+++ b/src/vs/workbench/api/common/extHostTypeConverters.ts
@@ -10,7 +10,7 @@ import { createSingleCallFunction } from 'vs/base/common/functional';
 import * as htmlContent from 'vs/base/common/htmlContent';
 import { DisposableStore } from 'vs/base/common/lifecycle';
 import { ResourceMap, ResourceSet } from 'vs/base/common/map';
-import { marked } from 'vs/base/common/marked/marked';
+import * as marked from 'vs/base/common/marked/marked';
 import { parse, revive } from 'vs/base/common/marshalling';
 import { Mimes } from 'vs/base/common/mime';
 import { cloneAndChange } from 'vs/base/common/objects';
@@ -40,7 +40,8 @@ import { DEFAULT_EDITOR_ASSOCIATION, SaveReason } from 'vs/workbench/common/edit
 import { IViewBadge } from 'vs/workbench/common/views';
 import { ChatAgentLocation, IChatAgentRequest, IChatAgentResult } from 'vs/workbench/contrib/chat/common/chatAgents';
 import { IChatRequestVariableEntry } from 'vs/workbench/contrib/chat/common/chatModel';
-import { IChatAgentDetection, IChatAgentMarkdownContentWithVulnerability, IChatCodeCitation, IChatCommandButton, IChatConfirmation, IChatContentInlineReference, IChatContentReference, IChatFollowup, IChatMarkdownContent, IChatProgressMessage, IChatTaskDto, IChatTaskResult, IChatTextEdit, IChatTreeData, IChatUserActionEvent, IChatWarningMessage } from 'vs/workbench/contrib/chat/common/chatService';
+import { IChatAgentDetection, IChatAgentMarkdownContentWithVulnerability, IChatCodeCitation, IChatCommandButton, IChatConfirmation, IChatContentInlineReference, IChatContentReference, IChatFollowup, IChatMarkdownContent, IChatMoveMessage, IChatProgressMessage, IChatTaskDto, IChatTaskResult, IChatTextEdit, IChatTreeData, IChatUserActionEvent, IChatWarningMessage } from 'vs/workbench/contrib/chat/common/chatService';
+import { IToolData, IToolResult } from 'vs/workbench/contrib/chat/common/languageModelToolsService';
 import * as chatProvider from 'vs/workbench/contrib/chat/common/languageModels';
 import { DebugTreeItemCollapsibleState, IDebugVisualizationTreeItem } from 'vs/workbench/contrib/debug/common/debug';
 import * as notebooks from 'vs/workbench/contrib/notebook/common/notebookCommon';
@@ -53,7 +54,6 @@ import { ACTIVE_GROUP, SIDE_GROUP } from 'vs/workbench/services/editor/common/ed
 import { Dto } from 'vs/workbench/services/extensions/common/proxyIdentifier';
 import type * as vscode from 'vscode';
 import * as types from './extHostTypes';
-import { IToolData } from 'vs/workbench/contrib/chat/common/languageModelToolsService';
 
 export namespace Command {
 
@@ -367,7 +367,7 @@ export namespace MarkdownString {
 		const resUris: { [href: string]: UriComponents } = Object.create(null);
 		res.uris = resUris;
 
-		const collectUri = (href: string): string => {
+		const collectUri = ({ href }: { href: string }): string => {
 			try {
 				let uri = URI.parse(href, true);
 				uri = uri.with({ query: _uriMassage(uri.query, resUris) });
@@ -377,11 +377,16 @@ export namespace MarkdownString {
 			}
 			return '';
 		};
-		const renderer = new marked.Renderer();
-		renderer.link = collectUri;
-		renderer.image = href => typeof href === 'string' ? collectUri(htmlContent.parseHrefAndDimensions(href).href) : '';
 
-		marked(res.value, { renderer });
+		marked.marked.walkTokens(marked.marked.lexer(res.value), token => {
+			if (token.type === 'link') {
+				collectUri({ href: token.href });
+			} else if (token.type === 'image') {
+				if (typeof token.href === 'string') {
+					collectUri(htmlContent.parseHrefAndDimensions(token.href));
+				}
+			}
+		});
 
 		return res;
 	}
@@ -1888,10 +1893,10 @@ export namespace TestMessage {
 			actual: message.actualOutput,
 			contextValue: message.contextValue,
 			location: message.location && ({ range: Range.from(message.location.range), uri: message.location.uri }),
-			stackTrace: (message as vscode.TestMessage2).stackTrace?.map(s => ({
+			stackTrace: message.stackTrace?.map(s => ({
 				label: s.label,
 				position: s.position && Position.from(s.position),
-				uri: s.file && URI.revive(s.file).toJSON(),
+				uri: s.uri && URI.revive(s.uri).toJSON(),
 			})),
 		};
 	}
@@ -2036,6 +2041,43 @@ export namespace TestCoverage {
 		return 'line' in location ? Position.from(location) : Range.from(location);
 	}
 
+	function toLocation(location: IPosition | editorRange.IRange): types.Position | types.Range;
+	function toLocation(location: IPosition | editorRange.IRange | undefined): types.Position | types.Range | undefined;
+	function toLocation(location: IPosition | editorRange.IRange | undefined): types.Position | types.Range | undefined {
+		if (!location) { return undefined; }
+		return 'endLineNumber' in location ? Range.to(location) : Position.to(location);
+	}
+
+	export function to(serialized: CoverageDetails.Serialized): vscode.FileCoverageDetail {
+		if (serialized.type === DetailType.Statement) {
+			const branches: vscode.BranchCoverage[] = [];
+			if (serialized.branches) {
+				for (const branch of serialized.branches) {
+					branches.push({
+						executed: branch.count,
+						location: toLocation(branch.location),
+						label: branch.label
+					});
+				}
+			}
+			return new types.StatementCoverage(
+				serialized.count,
+				toLocation(serialized.location),
+				serialized.branches?.map(b => new types.BranchCoverage(
+					b.count,
+					toLocation(b.location)!,
+					b.label,
+				))
+			);
+		} else {
+			return new types.DeclarationCoverage(
+				serialized.name,
+				serialized.count,
+				toLocation(serialized.location),
+			);
+		}
+	}
+
 	export function fromDetails(coverage: vscode.FileCoverageDetail): CoverageDetails.Serialized {
 		if (typeof coverage.executed === 'number' && coverage.executed < 0) {
 			throw new Error(`Invalid coverage count ${coverage.executed}`);
@@ -2271,18 +2313,19 @@ export namespace LanguageModelChatMessageRole {
 export namespace LanguageModelChatMessage {
 
 	export function to(message: chatProvider.IChatMessage): vscode.LanguageModelChatMessage {
-		let content: string = '';
-		let content2: vscode.LanguageModelChatMessageFunctionResultPart | undefined;
-		if (message.content.type === 'text') {
-			content = message.content.value;
-		} else {
-			content2 = new types.LanguageModelFunctionResultPart(message.content.name, message.content.value, message.content.isError);
-		}
+		const content2 = message.content.map(c => {
+			if (c.type === 'text') {
+				return c.value;
+			} else if (c.type === 'tool_result') {
+				return new types.LanguageModelToolResultPart(c.toolCallId, c.value, c.isError);
+			} else {
+				return new types.LanguageModelToolCallPart(c.name, c.toolCallId, c.parameters);
+			}
+		});
+		const content = content2.find(c => typeof c === 'string') ?? '';
 		const role = LanguageModelChatMessageRole.to(message.role);
 		const result = new types.LanguageModelChatMessage(role, content, message.name);
-		if (content2 !== undefined) {
-			result.content2 = content2;
-		}
+		result.content2 = content2;
 		return result;
 	}
 
@@ -2291,21 +2334,32 @@ export namespace LanguageModelChatMessage {
 		const role = LanguageModelChatMessageRole.from(message.role);
 		const name = message.name;
 
-		let content: chatProvider.IChatMessagePart;
+		const content = message.content2.map((c): chatProvider.IChatMessagePart => {
+			if (c instanceof types.LanguageModelToolResultPart) {
+				return {
+					type: 'tool_result',
+					toolCallId: c.toolCallId,
+					value: c.content,
+					isError: c.isError
+				};
+			} else if (c instanceof types.LanguageModelToolCallPart) {
+				return {
+					type: 'tool_use',
+					toolCallId: c.toolCallId,
+					name: c.name,
+					parameters: c.parameters
+				};
+			} else {
+				if (typeof c !== 'string') {
+					throw new Error('Unexpected chat message content type');
+				}
 
-		if (message.content2 instanceof types.LanguageModelFunctionResultPart) {
-			content = {
-				type: 'function_result',
-				name: message.content2.name,
-				value: message.content2.content,
-				isError: message.content2.isError
-			};
-		} else {
-			content = {
-				type: 'text',
-				value: message.content
-			};
-		}
+				return {
+					type: 'text',
+					value: c
+				};
+			}
+		});
 
 		return {
 			role,
@@ -2449,6 +2503,19 @@ export namespace ChatResponseWarningPart {
 	}
 }
 
+export namespace ChatResponseMovePart {
+	export function from(part: vscode.ChatResponseMovePart): Dto<IChatMoveMessage> {
+		return {
+			kind: 'move',
+			uri: part.uri,
+			range: Range.from(part.range),
+		};
+	}
+	export function to(part: Dto<IChatMoveMessage>): vscode.ChatResponseMovePart {
+		return new types.ChatResponseMovePart(URI.revive(part.uri), Range.to(part.range));
+	}
+}
+
 export namespace ChatTask {
 	export function from(part: vscode.ChatResponseProgressPart2): IChatTaskDto {
 		return {
@@ -2502,7 +2569,8 @@ export namespace ChatResponseReferencePart {
 			: URI.isUri(part.iconPath) ? { light: URI.revive(part.iconPath) }
 				: (part.iconPath && 'light' in part.iconPath && 'dark' in part.iconPath && URI.isUri(part.iconPath.light) && URI.isUri(part.iconPath.dark) ? { light: URI.revive(part.iconPath.light), dark: URI.revive(part.iconPath.dark) }
 					: undefined);
-		if ('variableName' in part.value) {
+
+		if (typeof part.value === 'object' && 'variableName' in part.value) {
 			return {
 				kind: 'reference',
 				reference: {
@@ -2518,7 +2586,7 @@ export namespace ChatResponseReferencePart {
 
 		return {
 			kind: 'reference',
-			reference: URI.isUri(part.value) ?
+			reference: URI.isUri(part.value) || typeof part.value === 'string' ?
 				part.value :
 				Location.from(<vscode.Location>part.value),
 			iconPath,
@@ -2533,7 +2601,7 @@ export namespace ChatResponseReferencePart {
 			Location.to(value);
 
 		return new types.ChatResponseReferencePart(
-			'variableName' in value.reference ? {
+			typeof value.reference === 'string' ? value.reference : 'variableName' in value.reference ? {
 				variableName: value.reference.variableName,
 				value: value.reference.value && mapValue(value.reference.value)
 			} :
@@ -2555,7 +2623,7 @@ export namespace ChatResponseCodeCitationPart {
 
 export namespace ChatResponsePart {
 
-	export function from(part: vscode.ChatResponsePart | vscode.ChatResponseTextEditPart | vscode.ChatResponseMarkdownWithVulnerabilitiesPart | vscode.ChatResponseDetectedParticipantPart | vscode.ChatResponseWarningPart | vscode.ChatResponseConfirmationPart | vscode.ChatResponseReferencePart2, commandsConverter: CommandsConverter, commandDisposables: DisposableStore): extHostProtocol.IChatProgressDto {
+	export function from(part: vscode.ChatResponsePart | vscode.ChatResponseTextEditPart | vscode.ChatResponseMarkdownWithVulnerabilitiesPart | vscode.ChatResponseDetectedParticipantPart | vscode.ChatResponseWarningPart | vscode.ChatResponseConfirmationPart | vscode.ChatResponseReferencePart2 | vscode.ChatResponseMovePart, commandsConverter: CommandsConverter, commandDisposables: DisposableStore): extHostProtocol.IChatProgressDto {
 		if (part instanceof types.ChatResponseMarkdownPart) {
 			return ChatResponseMarkdownPart.from(part);
 		} else if (part instanceof types.ChatResponseAnchorPart) {
@@ -2580,6 +2648,8 @@ export namespace ChatResponsePart {
 			return ChatResponseConfirmationPart.from(part);
 		} else if (part instanceof types.ChatResponseCodeCitationPart) {
 			return ChatResponseCodeCitationPart.from(part);
+		} else if (part instanceof types.ChatResponseMovePart) {
+			return ChatResponseMovePart.from(part);
 		}
 
 		return {
@@ -2616,19 +2686,20 @@ export namespace ChatResponsePart {
 
 export namespace ChatAgentRequest {
 	export function to(request: IChatAgentRequest, location2: vscode.ChatRequestEditorData | vscode.ChatRequestNotebookData | undefined): vscode.ChatRequest {
-		const requestedTools = request.variables.variables.filter(v => v.isTool).map(tool => tool.id);
-		const variablesWithoutTools = request.variables.variables.filter(v => !v.isTool);
+		const toolReferences = request.variables.variables.filter(v => v.isTool);
+		const variableReferences = request.variables.variables.filter(v => !v.isTool);
 		return {
 			prompt: request.message,
 			command: request.command,
 			attempt: request.attempt ?? 0,
 			enableCommandDetection: request.enableCommandDetection ?? true,
-			references: variablesWithoutTools.map(ChatAgentValueReference.to),
+			isParticipantDetected: request.isParticipantDetected ?? false,
+			references: variableReferences.map(ChatPromptReference.to),
+			toolReferences: toolReferences.map(ChatLanguageModelToolReference.to),
 			location: ChatLocation.to(request.location),
 			acceptedConfirmationData: request.acceptedConfirmationData,
 			rejectedConfirmationData: request.rejectedConfirmationData,
 			location2,
-			requestedTools
 		};
 	}
 }
@@ -2653,7 +2724,7 @@ export namespace ChatLocation {
 	}
 }
 
-export namespace ChatAgentValueReference {
+export namespace ChatPromptReference {
 	export function to(variable: IChatRequestVariableEntry): vscode.ChatPromptReference {
 		const value = variable.value;
 		if (!value) {
@@ -2672,6 +2743,20 @@ export namespace ChatAgentValueReference {
 	}
 }
 
+export namespace ChatLanguageModelToolReference {
+	export function to(variable: IChatRequestVariableEntry): vscode.ChatLanguageModelToolReference {
+		const value = variable.value;
+		if (value) {
+			throw new Error('Invalid tool reference');
+		}
+
+		return {
+			id: variable.id,
+			range: variable.range && [variable.range.start, variable.range.endExclusive],
+		};
+	}
+}
+
 export namespace ChatAgentCompletionItem {
 	export function from(item: vscode.ChatCompletionItem, commandsConverter: CommandsConverter, disposables: DisposableStore): extHostProtocol.IChatAgentCompletionItem {
 		return {
@@ -2693,6 +2778,7 @@ export namespace ChatAgentResult {
 		return {
 			errorDetails: result.errorDetails,
 			metadata: result.metadata,
+			nextQuestion: result.nextQuestion,
 		};
 	}
 }
@@ -2723,6 +2809,24 @@ export namespace ChatAgentUserActionEvent {
 	}
 }
 
+export namespace LanguageModelToolResult {
+	export function from(result: vscode.LanguageModelToolResult): IToolResult {
+		return {
+			...result,
+			string: result.toString(),
+		};
+	}
+
+	export function to(result: IToolResult): vscode.LanguageModelToolResult {
+		const copy: vscode.LanguageModelToolResult = {
+			...result,
+			toString: () => result.string,
+		};
+		delete copy.string;
+
+		return copy;
+	}
+}
 
 export namespace TerminalQuickFix {
 	export function from(quickFix: vscode.TerminalQuickFixTerminalCommand | vscode.TerminalQuickFixOpener | vscode.Command, converter: Command.ICommandsConverter, disposables: DisposableStore): extHostProtocol.ITerminalQuickFixTerminalCommandDto | extHostProtocol.ITerminalQuickFixOpenerDto | extHostProtocol.ICommandDto | undefined {
@@ -2775,9 +2879,10 @@ export namespace DebugTreeItem {
 export namespace LanguageModelToolDescription {
 	export function to(item: IToolData): vscode.LanguageModelToolDescription {
 		return {
-			name: item.name,
-			description: item.description,
+			id: item.id,
+			modelDescription: item.modelDescription,
 			parametersSchema: item.parametersSchema,
+			displayName: item.displayName,
 		};
 	}
 }
diff --git a/src/vs/workbench/api/common/extHostTypes.ts b/src/vs/workbench/api/common/extHostTypes.ts
index c244eb6539d..ab21a14a5ec 100644
--- a/src/vs/workbench/api/common/extHostTypes.ts
+++ b/src/vs/workbench/api/common/extHostTypes.ts
@@ -4107,7 +4107,7 @@ export class TestMessageStackFrame {
 	 */
 	constructor(
 		public label: string,
-		public file?: vscode.Uri,
+		public uri?: vscode.Uri,
 		public position?: Position,
 	) { }
 }
@@ -4582,10 +4582,10 @@ export class ChatResponseCommandButtonPart {
 }
 
 export class ChatResponseReferencePart {
-	value: vscode.Uri | vscode.Location | { variableName: string; value?: vscode.Uri | vscode.Location };
+	value: vscode.Uri | vscode.Location | { variableName: string; value?: vscode.Uri | vscode.Location } | string;
 	iconPath?: vscode.Uri | vscode.ThemeIcon | { light: vscode.Uri; dark: vscode.Uri };
 	options?: { status?: { description: string; kind: vscode.ChatResponseReferencePartStatusKind } };
-	constructor(value: vscode.Uri | vscode.Location | { variableName: string; value?: vscode.Uri | vscode.Location }, iconPath?: vscode.Uri | vscode.ThemeIcon | { light: vscode.Uri; dark: vscode.Uri }, options?: { status?: { description: string; kind: vscode.ChatResponseReferencePartStatusKind } }) {
+	constructor(value: vscode.Uri | vscode.Location | { variableName: string; value?: vscode.Uri | vscode.Location } | string, iconPath?: vscode.Uri | vscode.ThemeIcon | { light: vscode.Uri; dark: vscode.Uri }, options?: { status?: { description: string; kind: vscode.ChatResponseReferencePartStatusKind } }) {
 		this.value = value;
 		this.iconPath = iconPath;
 		this.options = options;
@@ -4603,6 +4603,14 @@ export class ChatResponseCodeCitationPart {
 	}
 }
 
+export class ChatResponseMovePart {
+	constructor(
+		public readonly uri: vscode.Uri,
+		public readonly range: vscode.Range,
+	) {
+	}
+}
+
 export class ChatResponseTextEditPart {
 	uri: vscode.Uri;
 	edits: vscode.TextEdit[];
@@ -4613,6 +4621,8 @@ export class ChatResponseTextEditPart {
 }
 
 export class ChatRequestTurn implements vscode.ChatRequestTurn {
+	toolReferences?: vscode.ChatLanguageModelToolReference[];
+
 	constructor(
 		readonly prompt: string,
 		readonly command: string | undefined,
@@ -4664,14 +4674,14 @@ export enum LanguageModelChatMessageRole {
 	System = 3
 }
 
-export class LanguageModelFunctionResultPart implements vscode.LanguageModelChatMessageFunctionResultPart {
+export class LanguageModelToolResultPart implements vscode.LanguageModelChatMessageToolResultPart {
 
-	name: string;
+	toolCallId: string;
 	content: string;
 	isError: boolean;
 
-	constructor(name: string, content: string, isError?: boolean) {
-		this.name = name;
+	constructor(toolCallId: string, content: string, isError?: boolean) {
+		this.toolCallId = toolCallId;
 		this.content = content;
 		this.isError = isError ?? false;
 	}
@@ -4679,9 +4689,9 @@ export class LanguageModelFunctionResultPart implements vscode.LanguageModelChat
 
 export class LanguageModelChatMessage implements vscode.LanguageModelChatMessage {
 
-	static User(content: string | LanguageModelFunctionResultPart, name?: string): LanguageModelChatMessage {
+	static User(content: string | LanguageModelToolResultPart, name?: string): LanguageModelChatMessage {
 		const value = new LanguageModelChatMessage(LanguageModelChatMessageRole.User, typeof content === 'string' ? content : '', name);
-		value.content2 = content;
+		value.content2 = [content];
 		return value;
 	}
 
@@ -4691,23 +4701,25 @@ export class LanguageModelChatMessage implements vscode.LanguageModelChatMessage
 
 	role: vscode.LanguageModelChatMessageRole;
 	content: string;
-	content2: string | vscode.LanguageModelChatMessageFunctionResultPart;
+	content2: (string | vscode.LanguageModelChatMessageToolResultPart | vscode.LanguageModelChatResponseToolCallPart)[];
 	name: string | undefined;
 
 	constructor(role: vscode.LanguageModelChatMessageRole, content: string, name?: string) {
 		this.role = role;
 		this.content = content;
-		this.content2 = content;
+		this.content2 = [content];
 		this.name = name;
 	}
 }
 
-export class LanguageModelFunctionUsePart implements vscode.LanguageModelChatResponseFunctionUsePart {
+export class LanguageModelToolCallPart implements vscode.LanguageModelChatResponseToolCallPart {
 	name: string;
+	toolCallId: string;
 	parameters: any;
 
-	constructor(name: string, parameters: any) {
+	constructor(name: string, toolCallId: string, parameters: any) {
 		this.name = name;
+		this.toolCallId = toolCallId;
 		this.parameters = parameters;
 	}
 }
diff --git a/src/vs/workbench/api/common/extHostWorkspace.ts b/src/vs/workbench/api/common/extHostWorkspace.ts
index a25ff3fe913..951c87d967f 100644
--- a/src/vs/workbench/api/common/extHostWorkspace.ts
+++ b/src/vs/workbench/api/common/extHostWorkspace.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { delta as arrayDelta, mapArrayOrNot } from 'vs/base/common/arrays';
-import { Barrier } from 'vs/base/common/async';
+import { AsyncIterableObject, Barrier } from 'vs/base/common/async';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { AsyncEmitter, Emitter, Event } from 'vs/base/common/event';
 import { toDisposable } from 'vs/base/common/lifecycle';
@@ -28,12 +28,13 @@ import { IExtHostRpcService } from 'vs/workbench/api/common/extHostRpcService';
 import { GlobPattern } from 'vs/workbench/api/common/extHostTypeConverters';
 import { Range } from 'vs/workbench/api/common/extHostTypes';
 import { IURITransformerService } from 'vs/workbench/api/common/extHostUriTransformerService';
-import { IFileQueryBuilderOptions, ITextQueryBuilderOptions } from 'vs/workbench/services/search/common/queryBuilder';
+import { IFileQueryBuilderOptions, ISearchPatternBuilder, ITextQueryBuilderOptions } from 'vs/workbench/services/search/common/queryBuilder';
 import { IRawFileMatch2, ITextSearchResult, resultIsMatch } from 'vs/workbench/services/search/common/search';
-import * as vscode from 'vscode';
+import type * as vscode from 'vscode';
 import { ExtHostWorkspaceShape, IRelativePatternDto, IWorkspaceData, MainContext, MainThreadMessageOptions, MainThreadMessageServiceShape, MainThreadWorkspaceShape } from './extHost.protocol';
 import { revive } from 'vs/base/common/marshalling';
 import { AuthInfo, Credentials } from 'vs/platform/request/common/request';
+import { ExcludeSettingOptions, TextSearchContextNew, TextSearchMatchNew } from 'vs/workbench/services/search/common/searchExtTypes';
 
 export interface IExtHostWorkspaceProvider {
 	getWorkspaceFolder2(uri: vscode.Uri, resolveParent?: boolean): Promise<vscode.WorkspaceFolder | undefined>;
@@ -78,6 +79,11 @@ interface MutableWorkspaceFolder extends vscode.WorkspaceFolder {
 	index: number;
 }
 
+interface QueryOptions<T> {
+	options: T;
+	folder: URI | undefined;
+}
+
 class ExtHostWorkspaceImpl extends Workspace {
 
 	static toExtHostWorkspace(data: IWorkspaceData | null, previousConfirmedWorkspace: ExtHostWorkspaceImpl | undefined, previousUnconfirmedWorkspace: ExtHostWorkspaceImpl | undefined, extHostFileSystemInfo: IExtHostFileSystemInfo): { workspace: ExtHostWorkspaceImpl | null; added: vscode.WorkspaceFolder[]; removed: vscode.WorkspaceFolder[] } {
@@ -460,12 +466,15 @@ export class ExtHostWorkspace implements ExtHostWorkspaceShape, IExtHostWorkspac
 				excludeString = exclude.pattern;
 			}
 		}
+
+		// todo: consider exclude baseURI if available
 		return this._findFilesImpl(include, undefined, {
-			exclude: excludeString,
+			exclude: [excludeString],
 			maxResults,
-			useDefaultExcludes: useFileExcludes,
-			useDefaultSearchExcludes: false,
-			useIgnoreFiles: false
+			useExcludeSettings: useFileExcludes ? ExcludeSettingOptions.FilesExclude : ExcludeSettingOptions.None,
+			useIgnoreFiles: {
+				local: false
+			}
 		}, token);
 	}
 
@@ -474,87 +483,191 @@ export class ExtHostWorkspace implements ExtHostWorkspaceShape, IExtHostWorkspac
 		extensionId: ExtensionIdentifier,
 		token: vscode.CancellationToken = CancellationToken.None): Promise<vscode.Uri[]> {
 		this._logService.trace(`extHostWorkspace#findFiles2: fileSearch, extension: ${extensionId.value}, entryPoint: findFiles2`);
-		return this._findFilesImpl(undefined, filePattern, options, token);
+
+
+		const useDefaultExcludes = options.useDefaultExcludes ?? true;
+		const useDefaultSearchExcludes = options.useDefaultSearchExcludes ?? true;
+		const excludeSetting = useDefaultExcludes ?
+			(useDefaultSearchExcludes ? ExcludeSettingOptions.SearchAndFilesExclude : ExcludeSettingOptions.FilesExclude) :
+			ExcludeSettingOptions.None;
+		const newOptions: vscode.FindFiles2OptionsNew = {
+			exclude: options.exclude ? [options.exclude] : undefined,
+			useIgnoreFiles: {
+				local: options.useIgnoreFiles,
+				global: options.useGlobalIgnoreFiles,
+				parent: options.useParentIgnoreFiles
+			},
+			useExcludeSettings: excludeSetting,
+			followSymlinks: options.followSymlinks,
+			maxResults: options.maxResults,
+		};
+		return this._findFilesImpl(undefined, filePattern !== undefined ? [filePattern] : [], newOptions, token);
+	}
+
+	findFiles2New(filePatterns: vscode.GlobPattern[],
+		options: vscode.FindFiles2OptionsNew = {},
+		extensionId: ExtensionIdentifier,
+		token: vscode.CancellationToken = CancellationToken.None): Promise<vscode.Uri[]> {
+		this._logService.trace(`extHostWorkspace#findFiles2New: fileSearch, extension: ${extensionId.value}, entryPoint: findFiles2New`);
+		return this._findFilesImpl(undefined, filePatterns, options, token);
 	}
 
 	private async _findFilesImpl(
 		// the old `findFiles` used `include` to query, but the new `findFiles2` uses `filePattern` to query.
 		// `filePattern` is the proper way to handle this, since it takes less precedence than the ignore files.
 		include: vscode.GlobPattern | undefined,
-		filePattern: vscode.GlobPattern | undefined,
-		options: vscode.FindFiles2Options,
+		filePatterns: vscode.GlobPattern[] | undefined,
+		options: vscode.FindFiles2OptionsNew,
 		token: vscode.CancellationToken = CancellationToken.None): Promise<vscode.Uri[]> {
 		if (token && token.isCancellationRequested) {
 			return Promise.resolve([]);
 		}
 
-		const excludePattern = (typeof options.exclude === 'string') ? options.exclude :
-			options.exclude ? options.exclude.pattern : undefined;
 
-		const fileQueries: IFileQueryBuilderOptions = {
-			ignoreSymlinks: typeof options.followSymlinks === 'boolean' ? !options.followSymlinks : undefined,
-			disregardIgnoreFiles: typeof options.useIgnoreFiles === 'boolean' ? !options.useIgnoreFiles : undefined,
-			disregardGlobalIgnoreFiles: typeof options.useGlobalIgnoreFiles === 'boolean' ? !options.useGlobalIgnoreFiles : undefined,
-			disregardParentIgnoreFiles: typeof options.useParentIgnoreFiles === 'boolean' ? !options.useParentIgnoreFiles : undefined,
-			disregardExcludeSettings: typeof options.useDefaultExcludes === 'boolean' ? !options.useDefaultExcludes : false,
-			disregardSearchExcludeSettings: typeof options.useDefaultSearchExcludes === 'boolean' ? !options.useDefaultSearchExcludes : false,
-			maxResults: options.maxResults,
-			excludePattern: excludePattern,
-			shouldGlobSearch: typeof options.fuzzy === 'boolean' ? !options.fuzzy : true,
-			_reason: 'startFileSearch'
-		};
-		let folderToUse: URI | undefined;
-		if (include) {
-			const { includePattern, folder } = parseSearchInclude(GlobPattern.from(include));
-			folderToUse = folder;
-			fileQueries.includePattern = includePattern;
-		} else {
-			const { includePattern, folder } = parseSearchInclude(GlobPattern.from(filePattern));
-			folderToUse = folder;
-			fileQueries.filePattern = includePattern;
-		}
+		const filePatternsToUse = include !== undefined ? [include] : filePatterns;
+		const queryOptions: QueryOptions<IFileQueryBuilderOptions>[] = filePatternsToUse?.map(filePattern => {
+
+			const excludePatterns = globsToISearchPatternBuilder(options.exclude);
 
-		return this._proxy.$startFileSearch(
-			folderToUse ?? null,
-			fileQueries,
-			token
-		)
-			.then(data => Array.isArray(data) ? data.map(d => URI.revive(d)) : []);
+			const fileQueries: IFileQueryBuilderOptions = {
+				ignoreSymlinks: typeof options.followSymlinks === 'boolean' ? !options.followSymlinks : undefined,
+				disregardIgnoreFiles: typeof options.useIgnoreFiles?.local === 'boolean' ? !options.useIgnoreFiles.local : undefined,
+				disregardGlobalIgnoreFiles: typeof options.useIgnoreFiles?.global === 'boolean' ? !options.useIgnoreFiles.global : undefined,
+				disregardParentIgnoreFiles: typeof options.useIgnoreFiles?.parent === 'boolean' ? !options.useIgnoreFiles.parent : undefined,
+				disregardExcludeSettings: options.useExcludeSettings !== undefined && options.useExcludeSettings === ExcludeSettingOptions.None,
+				disregardSearchExcludeSettings: options.useExcludeSettings !== undefined && (options.useExcludeSettings !== ExcludeSettingOptions.SearchAndFilesExclude),
+				maxResults: options.maxResults,
+				excludePattern: excludePatterns.length > 0 ? excludePatterns : undefined,
+				_reason: 'startFileSearch',
+				shouldGlobSearch: include ? undefined : true,
+			};
+
+			const parseInclude = parseSearchExcludeInclude(GlobPattern.from(filePattern));
+			const folderToUse = parseInclude?.folder;
+			if (include) {
+				fileQueries.includePattern = parseInclude?.pattern;
+			} else {
+				fileQueries.filePattern = parseInclude?.pattern;
+			}
+			return {
+				folder: folderToUse,
+				options: fileQueries
+			};
+		}) ?? [];
+
+		return this._findFilesBase(queryOptions, token);
 	}
 
-	async findTextInFiles(query: vscode.TextSearchQuery, options: vscode.FindTextInFilesOptions & { useSearchExclude?: boolean }, callback: (result: vscode.TextSearchResult) => void, extensionId: ExtensionIdentifier, token: vscode.CancellationToken = CancellationToken.None): Promise<vscode.TextSearchComplete> {
-		this._logService.trace(`extHostWorkspace#findTextInFiles: textSearch, extension: ${extensionId.value}, entryPoint: findTextInFiles`);
+	private async _findFilesBase(
+		queryOptions: QueryOptions<IFileQueryBuilderOptions>[] | undefined,
+		token: CancellationToken
+	): Promise<vscode.Uri[]> {
+		const result = await Promise.all(queryOptions?.map(option => this._proxy.$startFileSearch(
+			option.folder ?? null,
+			option.options,
+			token).then(data => Array.isArray(data) ? data.map(d => URI.revive(d)) : [])
+		) ?? []);
 
-		const requestId = this._requestIdProvider.getNext();
+		return result.flat();
+	}
 
-		const previewOptions: vscode.TextSearchPreviewOptions = typeof options.previewOptions === 'undefined' ?
-			{
-				matchLines: 100,
-				charsPerLine: 10000
-			} :
-			options.previewOptions;
+	findTextInFilesNew(query: vscode.TextSearchQueryNew, extensionId: ExtensionIdentifier, options?: vscode.FindTextInFilesOptionsNew, token?: vscode.CancellationToken): vscode.FindTextInFilesResponse {
+		this._logService.trace(`extHostWorkspace#findTextInFilesNew: textSearch, extension: ${extensionId.value}, entryPoint: findTextInFilesNew`);
 
-		const { includePattern, folder } = parseSearchInclude(GlobPattern.from(options.include));
-		const excludePattern = (typeof options.exclude === 'string') ? options.exclude :
-			options.exclude ? options.exclude.pattern : undefined;
-		const queryOptions: ITextQueryBuilderOptions = {
-			ignoreSymlinks: typeof options.followSymlinks === 'boolean' ? !options.followSymlinks : undefined,
-			disregardIgnoreFiles: typeof options.useIgnoreFiles === 'boolean' ? !options.useIgnoreFiles : undefined,
-			disregardGlobalIgnoreFiles: typeof options.useGlobalIgnoreFiles === 'boolean' ? !options.useGlobalIgnoreFiles : undefined,
-			disregardParentIgnoreFiles: typeof options.useParentIgnoreFiles === 'boolean' ? !options.useParentIgnoreFiles : undefined,
-			disregardExcludeSettings: typeof options.useDefaultExcludes === 'boolean' ? !options.useDefaultExcludes : true,
-			disregardSearchExcludeSettings: typeof options.useSearchExclude === 'boolean' ? !options.useSearchExclude : true,
-			fileEncoding: options.encoding,
-			maxResults: options.maxResults,
-			previewOptions,
-			afterContext: options.afterContext,
-			beforeContext: options.beforeContext,
 
-			includePattern: includePattern,
-			excludePattern: excludePattern
+		const getOptions = (include: vscode.GlobPattern | undefined): QueryOptions<ITextQueryBuilderOptions> => {
+			if (!options) {
+				return {
+					folder: undefined,
+					options: {}
+				};
+			}
+			const parsedInclude = include ? parseSearchExcludeInclude(GlobPattern.from(include)) : undefined;
+
+			const excludePatterns = globsToISearchPatternBuilder(options.exclude);
+
+			return {
+				options: {
+
+					ignoreSymlinks: typeof options.followSymlinks === 'boolean' ? !options.followSymlinks : undefined,
+					disregardIgnoreFiles: typeof options.useIgnoreFiles === 'boolean' ? !options.useIgnoreFiles : undefined,
+					disregardGlobalIgnoreFiles: typeof options.useIgnoreFiles?.global === 'boolean' ? !options.useIgnoreFiles?.global : undefined,
+					disregardParentIgnoreFiles: typeof options.useIgnoreFiles?.parent === 'boolean' ? !options.useIgnoreFiles?.parent : undefined,
+					disregardExcludeSettings: options.useExcludeSettings !== undefined && options.useExcludeSettings === ExcludeSettingOptions.None,
+					disregardSearchExcludeSettings: options.useExcludeSettings !== undefined && (options.useExcludeSettings !== ExcludeSettingOptions.SearchAndFilesExclude),
+					fileEncoding: options.encoding,
+					maxResults: options.maxResults,
+					previewOptions: options.previewOptions ? {
+						matchLines: options.previewOptions?.numMatchLines ?? 100,
+						charsPerLine: options.previewOptions?.charsPerLine ?? 10000,
+					} : undefined,
+					surroundingContext: options.surroundingContext,
+
+					includePattern: parsedInclude?.pattern,
+					excludePattern: excludePatterns
+				} satisfies ITextQueryBuilderOptions,
+				folder: parsedInclude?.folder
+			} satisfies QueryOptions<ITextQueryBuilderOptions>;
 		};
 
-		const isCanceled = false;
+		const queryOptionsRaw: (QueryOptions<ITextQueryBuilderOptions> | undefined)[] = ((options?.include?.map((include) =>
+			getOptions(include)))) ?? [getOptions(undefined)];
+
+		const queryOptions = queryOptionsRaw.filter((queryOps): queryOps is QueryOptions<ITextQueryBuilderOptions> => !!queryOps);
+
+		const complete: Promise<undefined | vscode.TextSearchComplete> = Promise.resolve(undefined);
+
+		const asyncIterable = new AsyncIterableObject<vscode.TextSearchResultNew>(async emitter => {
+			const progress = (result: ITextSearchResult<URI>, uri: URI) => {
+				if (resultIsMatch(result)) {
+					emitter.emitOne(new TextSearchMatchNew(
+						uri,
+						result.rangeLocations.map((range) => ({
+							previewRange: new Range(range.preview.startLineNumber, range.preview.startColumn, range.preview.endLineNumber, range.preview.endColumn),
+							sourceRange: new Range(range.source.startLineNumber, range.source.startColumn, range.source.endLineNumber, range.source.endColumn)
+						})),
+						result.previewText
+
+					));
+				} else {
+					emitter.emitOne(new TextSearchContextNew(
+						uri,
+						result.text,
+						result.lineNumber
+					));
+
+				}
+				return result;
+			};
+
+			await complete.then(e => {
+				return this.findTextInFilesBase(
+					query,
+					queryOptions,
+					progress,
+					token
+				);
+			});
+		});
+
+		return {
+			results: asyncIterable,
+			complete: complete.then((e) => {
+				return {
+					limitHit: e?.limitHit ?? false
+				};
+			}),
+		};
+	}
+
+
+	async findTextInFilesBase(query: vscode.TextSearchQuery, queryOptions: QueryOptions<ITextQueryBuilderOptions>[] | undefined, callback: (result: ITextSearchResult<URI>, uri: URI) => void, token: vscode.CancellationToken = CancellationToken.None): Promise<vscode.TextSearchComplete> {
+		const requestId = this._requestIdProvider.getNext();
+
+		let isCanceled = false;
+		token.onCancellationRequested(_ => {
+			isCanceled = true;
+		});
 
 		this._activeSearchCallbacks[requestId] = p => {
 			if (isCanceled) {
@@ -564,26 +677,7 @@ export class ExtHostWorkspace implements ExtHostWorkspaceShape, IExtHostWorkspac
 			const uri = URI.revive(p.resource);
 			p.results!.forEach(rawResult => {
 				const result: ITextSearchResult<URI> = revive(rawResult);
-				if (resultIsMatch(result)) {
-					callback({
-						uri,
-						preview: {
-							text: result.preview.text,
-							matches: mapArrayOrNot(
-								result.preview.matches,
-								m => new Range(m.startLineNumber, m.startColumn, m.endLineNumber, m.endColumn))
-						},
-						ranges: mapArrayOrNot(
-							result.ranges,
-							r => new Range(r.startLineNumber, r.startColumn, r.endLineNumber, r.endColumn))
-					} satisfies vscode.TextSearchMatch);
-				} else {
-					callback({
-						uri,
-						text: result.text,
-						lineNumber: result.lineNumber
-					} satisfies vscode.TextSearchContext);
-				}
+				callback(result, uri);
 			});
 		};
 
@@ -592,20 +686,83 @@ export class ExtHostWorkspace implements ExtHostWorkspaceShape, IExtHostWorkspac
 		}
 
 		try {
-			const result = await this._proxy.$startTextSearch(
+			const result = await Promise.all(queryOptions?.map(option => this._proxy.$startTextSearch(
 				query,
-				folder ?? null,
-				queryOptions,
+				option.folder ?? null,
+				option.options,
 				requestId,
-				token);
+				token) || {}
+			) ?? []);
 			delete this._activeSearchCallbacks[requestId];
-			return result || {};
+			return result.reduce((acc, val) => {
+				return {
+					limitHit: acc?.limitHit || (val?.limitHit ?? false),
+					message: [acc?.message ?? [], val?.message ?? []].flat(),
+				};
+			}, {}) ?? { limitHit: false };
+
 		} catch (err) {
 			delete this._activeSearchCallbacks[requestId];
 			throw err;
 		}
 	}
 
+	async findTextInFiles(query: vscode.TextSearchQuery, options: vscode.FindTextInFilesOptions & { useSearchExclude?: boolean }, callback: (result: vscode.TextSearchResult) => void, extensionId: ExtensionIdentifier, token: vscode.CancellationToken = CancellationToken.None): Promise<vscode.TextSearchComplete> {
+		this._logService.trace(`extHostWorkspace#findTextInFiles: textSearch, extension: ${extensionId.value}, entryPoint: findTextInFiles`);
+
+		const previewOptions: vscode.TextSearchPreviewOptions = typeof options.previewOptions === 'undefined' ?
+			{
+				matchLines: 100,
+				charsPerLine: 10000
+			} :
+			options.previewOptions;
+
+		const parsedInclude = parseSearchExcludeInclude(GlobPattern.from(options.include));
+
+		const excludePattern = (typeof options.exclude === 'string') ? options.exclude :
+			options.exclude ? options.exclude.pattern : undefined;
+		const queryOptions: ITextQueryBuilderOptions = {
+			ignoreSymlinks: typeof options.followSymlinks === 'boolean' ? !options.followSymlinks : undefined,
+			disregardIgnoreFiles: typeof options.useIgnoreFiles === 'boolean' ? !options.useIgnoreFiles : undefined,
+			disregardGlobalIgnoreFiles: typeof options.useGlobalIgnoreFiles === 'boolean' ? !options.useGlobalIgnoreFiles : undefined,
+			disregardParentIgnoreFiles: typeof options.useParentIgnoreFiles === 'boolean' ? !options.useParentIgnoreFiles : undefined,
+			disregardExcludeSettings: typeof options.useDefaultExcludes === 'boolean' ? !options.useDefaultExcludes : true,
+			disregardSearchExcludeSettings: typeof options.useSearchExclude === 'boolean' ? !options.useSearchExclude : true,
+			fileEncoding: options.encoding,
+			maxResults: options.maxResults,
+			previewOptions,
+			surroundingContext: options.afterContext, // TODO: remove ability to have before/after context separately
+
+			includePattern: parsedInclude?.pattern,
+			excludePattern: excludePattern ? [{ pattern: excludePattern }] : undefined,
+		};
+
+		const progress = (result: ITextSearchResult<URI>, uri: URI) => {
+			if (resultIsMatch(result)) {
+				callback({
+					uri,
+					preview: {
+						text: result.previewText,
+						matches: mapArrayOrNot(
+							result.rangeLocations,
+							m => new Range(m.preview.startLineNumber, m.preview.startColumn, m.preview.endLineNumber, m.preview.endColumn))
+					},
+					ranges: mapArrayOrNot(
+						result.rangeLocations,
+						r => new Range(r.source.startLineNumber, r.source.startColumn, r.source.endLineNumber, r.source.endColumn))
+				} satisfies vscode.TextSearchMatch);
+			} else {
+				callback({
+					uri,
+					text: result.text,
+					lineNumber: result.lineNumber
+				} satisfies vscode.TextSearchContext);
+			}
+		};
+
+		return this.findTextInFilesBase(query, [{ options: queryOptions, folder: parsedInclude?.folder }], progress, token);
+	}
+
 	$handleTextSearchResult(result: IRawFileMatch2, requestId: number): void {
 		this._activeSearchCallbacks[requestId]?.(result);
 	}
@@ -806,22 +963,23 @@ export class ExtHostWorkspace implements ExtHostWorkspaceShape, IExtHostWorkspac
 export const IExtHostWorkspace = createDecorator<IExtHostWorkspace>('IExtHostWorkspace');
 export interface IExtHostWorkspace extends ExtHostWorkspace, ExtHostWorkspaceShape, IExtHostWorkspaceProvider { }
 
-function parseSearchInclude(include: string | IRelativePatternDto | undefined | null): { includePattern?: string; folder?: URI } {
-	let includePattern: string | undefined;
+function parseSearchExcludeInclude(include: string | IRelativePatternDto | undefined | null): { pattern: string; folder?: URI } | undefined {
+	let pattern: string | undefined;
 	let includeFolder: URI | undefined;
 	if (include) {
 		if (typeof include === 'string') {
-			includePattern = include;
+			pattern = include;
 		} else {
-			includePattern = include.pattern;
+			pattern = include.pattern;
 			includeFolder = URI.revive(include.baseUri);
 		}
-	}
 
-	return {
-		includePattern,
-		folder: includeFolder
-	};
+		return {
+			pattern,
+			folder: includeFolder
+		};
+	}
+	return undefined;
 }
 
 interface IExtensionListener<E> {
@@ -829,3 +987,27 @@ interface IExtensionListener<E> {
 	(e: E): any;
 }
 
+function globsToISearchPatternBuilder(excludes: vscode.GlobPattern[] | undefined): ISearchPatternBuilder[] {
+	return (
+		excludes?.map((exclude): ISearchPatternBuilder | undefined => {
+			if (typeof exclude === 'string') {
+				if (exclude === '') {
+					return undefined;
+				}
+				return {
+					pattern: exclude,
+					uri: undefined
+				} satisfies ISearchPatternBuilder;
+			} else {
+				const parsedExclude = parseSearchExcludeInclude(exclude);
+				if (!parsedExclude) {
+					return undefined;
+				}
+				return {
+					pattern: parsedExclude.pattern,
+					uri: parsedExclude.folder
+				} satisfies ISearchPatternBuilder;
+			}
+		}) ?? []
+	).filter((e): e is ISearchPatternBuilder => !!e);
+}
diff --git a/src/vs/workbench/api/node/extHostExtensionService.ts b/src/vs/workbench/api/node/extHostExtensionService.ts
index 211ffa012d1..7047098c240 100644
--- a/src/vs/workbench/api/node/extHostExtensionService.ts
+++ b/src/vs/workbench/api/node/extHostExtensionService.ts
@@ -126,7 +126,7 @@ export class ExtHostExtensionService extends AbstractExtHostExtensionService {
 			if (extensionId) {
 				performance.mark(`code/extHost/willLoadExtensionCode/${extensionId}`);
 			}
-			r = <T>require.__$__nodeRequire(module.fsPath);
+			r = <T>(require.__$__nodeRequire ?? require /* TODO@esm drop the first */)(module.fsPath);
 		} finally {
 			if (extensionId) {
 				performance.mark(`code/extHost/didLoadExtensionCode/${extensionId}`);
diff --git a/src/vs/workbench/api/node/extHostSearch.ts b/src/vs/workbench/api/node/extHostSearch.ts
index d10dbbb7d99..573aeb08cdc 100644
--- a/src/vs/workbench/api/node/extHostSearch.ts
+++ b/src/vs/workbench/api/node/extHostSearch.ts
@@ -161,7 +161,7 @@ export class NativeExtHostSearch extends ExtHostSearch implements IDisposable {
 		return super.$clearCache(cacheKey);
 	}
 
-	protected override createTextSearchManager(query: ITextQuery, provider: vscode.TextSearchProvider): TextSearchManager {
+	protected override createTextSearchManager(query: ITextQuery, provider: vscode.TextSearchProviderNew): TextSearchManager {
 		return new NativeTextSearchManager(query, provider, undefined, 'textSearchProvider');
 	}
 }
diff --git a/src/vs/workbench/api/test/browser/extHostLanguageFeatures.test.ts b/src/vs/workbench/api/test/browser/extHostLanguageFeatures.test.ts
index 141f114ebfa..ec934301cd9 100644
--- a/src/vs/workbench/api/test/browser/extHostLanguageFeatures.test.ts
+++ b/src/vs/workbench/api/test/browser/extHostLanguageFeatures.test.ts
@@ -517,7 +517,7 @@ suite('ExtHostLanguageFeatures', function () {
 
 		disposables.add(extHost.registerDocumentHighlightProvider(defaultExtension, defaultSelector, new class implements vscode.DocumentHighlightProvider {
 			provideDocumentHighlights(): any {
-				return [];
+				return undefined;
 			}
 		}));
 		disposables.add(extHost.registerDocumentHighlightProvider(defaultExtension, '*', new class implements vscode.DocumentHighlightProvider {
diff --git a/src/vs/workbench/api/test/browser/extHostWorkspace.test.ts b/src/vs/workbench/api/test/browser/extHostWorkspace.test.ts
index 02d795e8e48..60a5f522adf 100644
--- a/src/vs/workbench/api/test/browser/extHostWorkspace.test.ts
+++ b/src/vs/workbench/api/test/browser/extHostWorkspace.test.ts
@@ -590,7 +590,7 @@ suite('ExtHostWorkspace', function () {
 				mainThreadCalled = true;
 				assert.strictEqual(options.includePattern, 'foo');
 				assert.strictEqual(_includeFolder, null);
-				assert.strictEqual(options.excludePattern, '');
+				assert.strictEqual(options.excludePattern, undefined);
 				assert.strictEqual(options.disregardExcludeSettings, false);
 				assert.strictEqual(options.maxResults, 10);
 				return Promise.resolve(null);
@@ -613,7 +613,7 @@ suite('ExtHostWorkspace', function () {
 				mainThreadCalled = true;
 				assert.strictEqual(options.includePattern, 'glob/**');
 				assert.deepStrictEqual(_includeFolder ? URI.from(_includeFolder).toJSON() : null, URI.file('/other/folder').toJSON());
-				assert.strictEqual(options.excludePattern, '');
+				assert.strictEqual(options.excludePattern, undefined);
 				assert.strictEqual(options.disregardExcludeSettings, false);
 				return Promise.resolve(null);
 			}
@@ -643,7 +643,7 @@ suite('ExtHostWorkspace', function () {
 				mainThreadCalled = true;
 				assert.strictEqual(options.includePattern, 'glob/**');
 				assert.deepStrictEqual(URI.revive(_includeFolder!).toString(), URI.file('/other/folder').toString());
-				assert.strictEqual(options.excludePattern, '');
+				assert.strictEqual(options.excludePattern, undefined);
 				assert.strictEqual(options.disregardExcludeSettings, true);
 				return Promise.resolve(null);
 			}
@@ -684,7 +684,8 @@ suite('ExtHostWorkspace', function () {
 			override $startFileSearch(_includeFolder: UriComponents | null, options: IFileQueryBuilderOptions, token: CancellationToken): Promise<URI[] | null> {
 				mainThreadCalled = true;
 				assert.strictEqual(options.disregardExcludeSettings, false);
-				assert.strictEqual(options.excludePattern, 'glob/**'); // Note that the base portion is ignored, see #52651
+				assert.strictEqual(options.excludePattern?.length, 1);
+				assert.strictEqual(options.excludePattern[0].pattern, 'glob/**'); // Note that the base portion is ignored, see #52651
 				return Promise.resolve(null);
 			}
 		});
@@ -801,7 +802,8 @@ suite('ExtHostWorkspace', function () {
 			override $startFileSearch(_includeFolder: UriComponents | null, options: IFileQueryBuilderOptions, token: CancellationToken): Promise<URI[] | null> {
 				mainThreadCalled = true;
 				assert.strictEqual(options.disregardExcludeSettings, false);
-				assert.strictEqual(options.excludePattern, 'glob/**'); // Note that the base portion is ignored, see #52651
+				assert.strictEqual(options.excludePattern?.length, 1);
+				assert.strictEqual(options.excludePattern[0].pattern, 'glob/**'); // Note that the base portion is ignored, see #52651
 				return Promise.resolve(null);
 			}
 		});
@@ -944,7 +946,8 @@ suite('ExtHostWorkspace', function () {
 				assert.strictEqual(query.pattern, 'foo');
 				assert.deepStrictEqual(folder, null);
 				assert.strictEqual(options.includePattern, undefined);
-				assert.strictEqual(options.excludePattern, 'glob/**'); // exclude folder is ignored...
+				assert.strictEqual(options.excludePattern?.length, 1);
+				assert.strictEqual(options.excludePattern[0].pattern, 'glob/**'); // exclude folder is ignored...
 				return null;
 			}
 		});
diff --git a/src/vs/workbench/api/test/browser/mainThreadDocumentsAndEditors.test.ts b/src/vs/workbench/api/test/browser/mainThreadDocumentsAndEditors.test.ts
index f0d0538ce22..17a9049d064 100644
--- a/src/vs/workbench/api/test/browser/mainThreadDocumentsAndEditors.test.ts
+++ b/src/vs/workbench/api/test/browser/mainThreadDocumentsAndEditors.test.ts
@@ -27,11 +27,15 @@ import { TestTextResourcePropertiesService, TestWorkingCopyFileService } from 'v
 import { UriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentityService';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
 import { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/browser/panecomposite';
-import { TestLanguageConfigurationService } from 'vs/editor/test/common/modes/testLanguageConfigurationService';
 import { TextModel } from 'vs/editor/common/model/textModel';
-import { LanguageService } from 'vs/editor/common/services/languageService';
 import { DisposableStore } from 'vs/base/common/lifecycle';
 import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
+import { ILanguageService } from 'vs/editor/common/languages/language';
+import { LanguageService } from 'vs/editor/common/services/languageService';
+import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
+import { TestLanguageConfigurationService } from 'vs/editor/test/common/modes/testLanguageConfigurationService';
+import { IUndoRedoService } from 'vs/platform/undoRedo/common/undoRedo';
 
 suite('MainThreadDocumentsAndEditors', () => {
 
@@ -61,12 +65,15 @@ suite('MainThreadDocumentsAndEditors', () => {
 		const notificationService = new TestNotificationService();
 		const undoRedoService = new UndoRedoService(dialogService, notificationService);
 		const themeService = new TestThemeService();
+		const instantiationService = new TestInstantiationService();
+		instantiationService.set(ILanguageService, disposables.add(new LanguageService()));
+		instantiationService.set(ILanguageConfigurationService, new TestLanguageConfigurationService());
+		instantiationService.set(IUndoRedoService, undoRedoService);
 		modelService = new ModelService(
 			configService,
 			new TestTextResourcePropertiesService(configService),
 			undoRedoService,
-			disposables.add(new LanguageService()),
-			new TestLanguageConfigurationService(),
+			instantiationService
 		);
 		codeEditorService = new TestCodeEditorService(themeService);
 		textFileService = new class extends mock<ITextFileService>() {
diff --git a/src/vs/workbench/api/test/browser/mainThreadEditors.test.ts b/src/vs/workbench/api/test/browser/mainThreadEditors.test.ts
index 1ca165c1b5f..d83a5ebcf42 100644
--- a/src/vs/workbench/api/test/browser/mainThreadEditors.test.ts
+++ b/src/vs/workbench/api/test/browser/mainThreadEditors.test.ts
@@ -16,12 +16,10 @@ import { Position } from 'vs/editor/common/core/position';
 import { Range } from 'vs/editor/common/core/range';
 import { ITextSnapshot } from 'vs/editor/common/model';
 import { IEditorWorkerService } from 'vs/editor/common/services/editorWorker';
-import { LanguageService } from 'vs/editor/common/services/languageService';
 import { IModelService } from 'vs/editor/common/services/model';
 import { ModelService } from 'vs/editor/common/services/modelService';
 import { IResolvedTextEditorModel, ITextModelService } from 'vs/editor/common/services/resolverService';
 import { TestCodeEditorService } from 'vs/editor/test/browser/editorTestServices';
-import { TestLanguageConfigurationService } from 'vs/editor/test/common/modes/testLanguageConfigurationService';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
 import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
@@ -57,6 +55,10 @@ import { ICopyOperation, ICreateFileOperation, ICreateOperation, IDeleteOperatio
 import { IWorkingCopyService } from 'vs/workbench/services/workingCopy/common/workingCopyService';
 import { TestEditorGroupsService, TestEditorService, TestEnvironmentService, TestFileService, TestLifecycleService, TestWorkingCopyService } from 'vs/workbench/test/browser/workbenchTestServices';
 import { TestContextService, TestTextResourcePropertiesService } from 'vs/workbench/test/common/workbenchTestServices';
+import { ILanguageService } from 'vs/editor/common/languages/language';
+import { LanguageService } from 'vs/editor/common/services/languageService';
+import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
+import { TestLanguageConfigurationService } from 'vs/editor/test/common/modes/testLanguageConfigurationService';
 
 suite('MainThreadEditors', () => {
 
@@ -80,19 +82,11 @@ suite('MainThreadEditors', () => {
 		createdResources.clear();
 		deletedResources.clear();
 
-
 		const configService = new TestConfigurationService();
 		const dialogService = new TestDialogService();
 		const notificationService = new TestNotificationService();
 		const undoRedoService = new UndoRedoService(dialogService, notificationService);
 		const themeService = new TestThemeService();
-		modelService = new ModelService(
-			configService,
-			new TestTextResourcePropertiesService(configService),
-			undoRedoService,
-			disposables.add(new LanguageService()),
-			new TestLanguageConfigurationService(),
-		);
 
 		const services = new ServiceCollection();
 		services.set(IBulkEditService, new SyncDescriptor(BulkEditService));
@@ -178,8 +172,18 @@ suite('MainThreadEditors', () => {
 			}
 		});
 
+		services.set(ILanguageService, disposables.add(new LanguageService()));
+		services.set(ILanguageConfigurationService, new TestLanguageConfigurationService());
+
 		const instaService = new InstantiationService(services);
 
+		modelService = new ModelService(
+			configService,
+			new TestTextResourcePropertiesService(configService),
+			undoRedoService,
+			instaService
+		);
+
 		bulkEdits = instaService.createInstance(MainThreadBulkEdits, SingleProxyRPCProtocol(null));
 	});
 
diff --git a/src/vs/workbench/api/test/browser/mainThreadWorkspace.test.ts b/src/vs/workbench/api/test/browser/mainThreadWorkspace.test.ts
index c784f418950..aa9a770ade4 100644
--- a/src/vs/workbench/api/test/browser/mainThreadWorkspace.test.ts
+++ b/src/vs/workbench/api/test/browser/mainThreadWorkspace.test.ts
@@ -56,7 +56,8 @@ suite('MainThreadWorkspace', () => {
 			fileSearch(query: IFileQuery) {
 				assert.strictEqual(query.folderQueries.length, 1);
 				assert.strictEqual(query.folderQueries[0].disregardIgnoreFiles, true);
-				assert.deepStrictEqual(query.folderQueries[0].excludePattern, { 'filesExclude': true });
+				assert.strictEqual(query.folderQueries[0].excludePattern?.length, 1);
+				assert.deepStrictEqual(query.folderQueries[0].excludePattern[0].pattern, { 'filesExclude': true });
 
 				return Promise.resolve({ results: [], messages: [] });
 			}
@@ -76,7 +77,7 @@ suite('MainThreadWorkspace', () => {
 
 		instantiationService.stub(ISearchService, {
 			fileSearch(query: IFileQuery) {
-				assert.deepStrictEqual(query.folderQueries[0].excludePattern, undefined);
+				assert.deepStrictEqual(query.folderQueries[0].excludePattern, []);
 				assert.deepStrictEqual(query.excludePattern, undefined);
 
 				return Promise.resolve({ results: [], messages: [] });
@@ -99,7 +100,7 @@ suite('MainThreadWorkspace', () => {
 			fileSearch(query: IFileQuery) {
 				assert.strictEqual(query.folderQueries.length, 1);
 				assert.strictEqual(query.folderQueries[0].disregardIgnoreFiles, true);
-				assert.deepStrictEqual(query.folderQueries[0].excludePattern, undefined);
+				assert.deepStrictEqual(query.folderQueries[0].excludePattern, []);
 
 				return Promise.resolve({ results: [], messages: [] });
 			}
@@ -112,7 +113,7 @@ suite('MainThreadWorkspace', () => {
 	test('exclude string', () => {
 		instantiationService.stub(ISearchService, {
 			fileSearch(query: IFileQuery) {
-				assert.strictEqual(query.folderQueries[0].excludePattern, undefined);
+				assert.deepStrictEqual(query.folderQueries[0].excludePattern, []);
 				assert.deepStrictEqual({ ...query.excludePattern }, { 'exclude/**': true });
 
 				return Promise.resolve({ results: [], messages: [] });
@@ -120,6 +121,6 @@ suite('MainThreadWorkspace', () => {
 		});
 
 		const mtw = disposables.add(instantiationService.createInstance(MainThreadWorkspace, SingleProxyRPCProtocol({ $initializeWorkspace: () => { } })));
-		return mtw.$startFileSearch(null, { maxResults: 10, includePattern: '', excludePattern: 'exclude/**', disregardSearchExcludeSettings: true }, CancellationToken.None);
+		return mtw.$startFileSearch(null, { maxResults: 10, includePattern: '', excludePattern: [{ pattern: 'exclude/**' }], disregardSearchExcludeSettings: true }, CancellationToken.None);
 	});
 });
diff --git a/src/vs/workbench/api/test/node/extHostSearch.test.ts b/src/vs/workbench/api/test/node/extHostSearch.test.ts
index af20a5e455b..458beed2f58 100644
--- a/src/vs/workbench/api/test/node/extHostSearch.test.ts
+++ b/src/vs/workbench/api/test/node/extHostSearch.test.ts
@@ -16,7 +16,7 @@ import { mock } from 'vs/base/test/common/mock';
 import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
 import { NullLogService } from 'vs/platform/log/common/log';
 import { MainContext, MainThreadSearchShape } from 'vs/workbench/api/common/extHost.protocol';
-import { ExtHostConfigProvider, IExtHostConfiguration } from 'vs/workbench/api/common/extHostConfiguration.js';
+import { ExtHostConfigProvider, IExtHostConfiguration } from 'vs/workbench/api/common/extHostConfiguration';
 import { IExtHostInitDataService } from 'vs/workbench/api/common/extHostInitDataService';
 import { Range } from 'vs/workbench/api/common/extHostTypes';
 import { URITransformerService } from 'vs/workbench/api/common/extHostUriTransformerService';
@@ -76,12 +76,12 @@ suite('ExtHostSearch', () => {
 	const disposables = ensureNoDisposablesAreLeakedInTestSuite();
 
 	async function registerTestTextSearchProvider(provider: vscode.TextSearchProvider, scheme = 'file'): Promise<void> {
-		disposables.add(extHostSearch.registerTextSearchProvider(scheme, provider));
+		disposables.add(extHostSearch.registerTextSearchProviderOld(scheme, provider));
 		await rpcProtocol.sync();
 	}
 
 	async function registerTestFileSearchProvider(provider: vscode.FileSearchProvider, scheme = 'file'): Promise<void> {
-		disposables.add(extHostSearch.registerFileSearchProvider(scheme, provider));
+		disposables.add(extHostSearch.registerFileSearchProviderOld(scheme, provider));
 		await rpcProtocol.sync();
 	}
 
@@ -170,7 +170,7 @@ suite('ExtHostSearch', () => {
 				this._pfs = mockPFS as any;
 			}
 
-			protected override createTextSearchManager(query: ITextQuery, provider: vscode.TextSearchProvider): TextSearchManager {
+			protected override createTextSearchManager(query: ITextQuery, provider: vscode.TextSearchProviderNew): TextSearchManager {
 				return new NativeTextSearchManager(query, provider, this._pfs);
 			}
 		});
@@ -338,9 +338,11 @@ suite('ExtHostSearch', () => {
 						includePattern: {
 							'foo': true
 						},
-						excludePattern: {
-							'bar': true
-						}
+						excludePattern: [{
+							pattern: {
+								'bar': true
+							}
+						}]
 					},
 					{ folder: rootFolderB }
 				]
@@ -377,9 +379,11 @@ suite('ExtHostSearch', () => {
 						includePattern: {
 							'*.jsx': true
 						},
-						excludePattern: {
-							'*.js': false
-						}
+						excludePattern: [{
+							pattern: {
+								'*.js': false
+							}
+						}]
 					}
 				]
 			};
@@ -495,17 +499,21 @@ suite('ExtHostSearch', () => {
 				folderQueries: [
 					{
 						folder: rootFolderA,
-						excludePattern: {
-							'folder/*.css': {
-								when: '$(basename).scss'
+						excludePattern: [{
+							pattern: {
+								'folder/*.css': {
+									when: '$(basename).scss'
+								}
 							}
-						}
+						}]
 					},
 					{
 						folder: rootFolderB,
-						excludePattern: {
-							'*.js': false
-						}
+						excludePattern: [{
+							pattern: {
+								'*.js': false
+							}
+						}]
 					}
 				]
 			};
@@ -738,13 +746,13 @@ suite('ExtHostSearch', () => {
 					if (resultIsMatch(lineResult)) {
 						actualTextSearchResults.push({
 							preview: {
-								text: lineResult.preview.text,
+								text: lineResult.previewText,
 								matches: mapArrayOrNot(
-									lineResult.preview.matches,
+									lineResult.rangeLocations.map(r => r.preview),
 									m => new Range(m.startLineNumber, m.startColumn, m.endLineNumber, m.endColumn))
 							},
 							ranges: mapArrayOrNot(
-								lineResult.ranges,
+								lineResult.rangeLocations.map(r => r.source),
 								r => new Range(r.startLineNumber, r.startColumn, r.endLineNumber, r.endColumn),
 							),
 							uri: fileMatch.resource
@@ -876,9 +884,11 @@ suite('ExtHostSearch', () => {
 						includePattern: {
 							'foo': true
 						},
-						excludePattern: {
-							'bar': true
-						}
+						excludePattern: [{
+							pattern: {
+								'bar': true
+							}
+						}]
 					},
 					{ folder: rootFolderB }
 				]
@@ -915,9 +925,11 @@ suite('ExtHostSearch', () => {
 						includePattern: {
 							'*.jsx': true
 						},
-						excludePattern: {
-							'*.js': false
-						}
+						excludePattern: [{
+							pattern: {
+								'*.js': false
+							}
+						}]
 					}
 				]
 			};
@@ -1041,17 +1053,21 @@ suite('ExtHostSearch', () => {
 				folderQueries: [
 					{
 						folder: rootFolderA,
-						excludePattern: {
-							'folder/*.css': {
-								when: '$(basename).scss'
+						excludePattern: [{
+							pattern: {
+								'folder/*.css': {
+									when: '$(basename).scss'
+								}
 							}
-						}
+						}]
 					},
 					{
 						folder: rootFolderB,
-						excludePattern: {
-							'*.js': false
-						}
+						excludePattern: [{
+							pattern: {
+								'*.js': false
+							}
+						}]
 					}
 				]
 			};
diff --git a/src/vs/workbench/api/worker/extensionHostWorker.esm.ts b/src/vs/workbench/api/worker/extensionHostWorker.esm.ts
new file mode 100644
index 00000000000..10a4278a7e5
--- /dev/null
+++ b/src/vs/workbench/api/worker/extensionHostWorker.esm.ts
@@ -0,0 +1,9 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { create } from './extensionHostWorker';
+
+const data = create();
+self.onmessage = (e) => data.onmessage(e.data);
diff --git a/src/vs/workbench/api/worker/extensionHostWorker.ts b/src/vs/workbench/api/worker/extensionHostWorker.ts
index 86136a080e6..b98117318b7 100644
--- a/src/vs/workbench/api/worker/extensionHostWorker.ts
+++ b/src/vs/workbench/api/worker/extensionHostWorker.ts
@@ -234,6 +234,10 @@ function isInitMessage(a: any): a is IInitMessage {
 	return !!a && typeof a === 'object' && a.type === 'vscode.init' && a.data instanceof Map;
 }
 
+/**
+ * Defines the worker entry point. Must be exported and named `create`.
+ * @skipMangle
+ */
 export function create(): { onmessage: (message: any) => void } {
 	performance.mark(`code/extHost/willConnectToRenderer`);
 	const res = new ExtensionWorker();
diff --git a/src/vs/workbench/browser/actions/layoutActions.ts b/src/vs/workbench/browser/actions/layoutActions.ts
index 4dcf117c7a2..8dd31e65156 100644
--- a/src/vs/workbench/browser/actions/layoutActions.ts
+++ b/src/vs/workbench/browser/actions/layoutActions.ts
@@ -692,7 +692,7 @@ export class ConfigureEditorTabsAction extends Action2 {
 	constructor() {
 		super({
 			id: ConfigureEditorTabsAction.ID,
-			title: localize2('configureTabs', "Configure Tabs ..."),
+			title: localize2('configureTabs', "Configure Tabs"),
 			category: Categories.View,
 		});
 	}
@@ -713,7 +713,7 @@ export class ConfigureEditorAction extends Action2 {
 	constructor() {
 		super({
 			id: ConfigureEditorAction.ID,
-			title: localize2('configureEditor', "Configure Editor ..."),
+			title: localize2('configureEditors', "Configure Editors"),
 			category: Categories.View,
 		});
 	}
@@ -976,13 +976,14 @@ registerAction2(class extends Action2 {
 	}
 
 	private async getView(quickInputService: IQuickInputService, viewDescriptorService: IViewDescriptorService, paneCompositePartService: IPaneCompositePartService, viewId?: string): Promise<string> {
-		const quickPick = quickInputService.createQuickPick();
+		const disposables = new DisposableStore();
+		const quickPick = disposables.add(quickInputService.createQuickPick({ useSeparators: true }));
 		quickPick.placeholder = localize('moveFocusedView.selectView', "Select a View to Move");
 		quickPick.items = this.getViewItems(viewDescriptorService, paneCompositePartService);
 		quickPick.selectedItems = quickPick.items.filter(item => (item as IQuickPickItem).id === viewId) as IQuickPickItem[];
 
 		return new Promise((resolve, reject) => {
-			quickPick.onDidAccept(() => {
+			disposables.add(quickPick.onDidAccept(() => {
 				const viewId = quickPick.selectedItems[0];
 				if (viewId.id) {
 					resolve(viewId.id);
@@ -991,9 +992,12 @@ registerAction2(class extends Action2 {
 				}
 
 				quickPick.hide();
-			});
+			}));
 
-			quickPick.onDidHide(() => reject());
+			disposables.add(quickPick.onDidHide(() => {
+				disposables.dispose();
+				reject();
+			}));
 
 			quickPick.show();
 		});
@@ -1035,7 +1039,8 @@ class MoveFocusedViewAction extends Action2 {
 			return;
 		}
 
-		const quickPick = quickInputService.createQuickPick();
+		const disposables = new DisposableStore();
+		const quickPick = disposables.add(quickInputService.createQuickPick({ useSeparators: true }));
 		quickPick.placeholder = localize('moveFocusedView.selectDestination', "Select a Destination for the View");
 		quickPick.title = localize({ key: 'moveFocusedView.title', comment: ['{0} indicates the title of the view the user has selected to move.'] }, "View: Move {0}", viewDescriptor.name.value);
 
@@ -1130,7 +1135,7 @@ class MoveFocusedViewAction extends Action2 {
 
 		quickPick.items = items;
 
-		quickPick.onDidAccept(() => {
+		disposables.add(quickPick.onDidAccept(() => {
 			const destination = quickPick.selectedItems[0];
 
 			if (destination.id === '_.panel.newcontainer') {
@@ -1148,7 +1153,9 @@ class MoveFocusedViewAction extends Action2 {
 			}
 
 			quickPick.hide();
-		});
+		}));
+
+		disposables.add(quickPick.onDidHide(() => disposables.dispose()));
 
 		quickPick.show();
 	}
@@ -1424,7 +1431,7 @@ for (const { active } of [...ToggleVisibilityActions, ...MoveSideBarActions, ...
 
 registerAction2(class CustomizeLayoutAction extends Action2 {
 
-	private _currentQuickPick?: IQuickPick<IQuickPickItem>;
+	private _currentQuickPick?: IQuickPick<IQuickPickItem, { useSeparators: true }>;
 
 	constructor() {
 		super({
@@ -1524,7 +1531,10 @@ registerAction2(class CustomizeLayoutAction extends Action2 {
 		const commandService = accessor.get(ICommandService);
 		const quickInputService = accessor.get(IQuickInputService);
 		const keybindingService = accessor.get(IKeybindingService);
-		const quickPick = quickInputService.createQuickPick();
+
+		const disposables = new DisposableStore();
+
+		const quickPick = disposables.add(quickInputService.createQuickPick({ useSeparators: true }));
 
 		this._currentQuickPick = quickPick;
 		quickPick.items = this.getItems(contextKeyService, keybindingService);
@@ -1549,7 +1559,6 @@ registerAction2(class CustomizeLayoutAction extends Action2 {
 			closeButton
 		];
 
-		const disposables = new DisposableStore();
 		let selectedItem: CustomizeLayoutItem | undefined = undefined;
 		disposables.add(contextKeyService.onDidChangeContext(changeEvent => {
 			if (changeEvent.affectsSome(LayoutContextKeySet)) {
@@ -1562,7 +1571,7 @@ registerAction2(class CustomizeLayoutAction extends Action2 {
 			}
 		}));
 
-		quickPick.onDidAccept(event => {
+		disposables.add(quickPick.onDidAccept(event => {
 			if (quickPick.selectedItems.length) {
 				selectedItem = quickPick.selectedItems[0] as CustomizeLayoutItem;
 				commandService.executeCommand(selectedItem.id);
@@ -1574,16 +1583,16 @@ registerAction2(class CustomizeLayoutAction extends Action2 {
 				}
 				// --- End Positron ---
 			}
-		});
+		}));
 
-		quickPick.onDidTriggerItemButton(event => {
+		disposables.add(quickPick.onDidTriggerItemButton(event => {
 			if (event.item) {
 				selectedItem = event.item as CustomizeLayoutItem;
 				commandService.executeCommand(selectedItem.id);
 			}
-		});
+		}));
 
-		quickPick.onDidTriggerButton((button) => {
+		disposables.add(quickPick.onDidTriggerButton((button) => {
 			if (button === closeButton) {
 				quickPick.hide();
 			} else if (button === resetButton) {
@@ -1605,16 +1614,16 @@ registerAction2(class CustomizeLayoutAction extends Action2 {
 
 				commandService.executeCommand('workbench.action.alignPanelCenter');
 			}
-		});
+		}));
 
-		quickPick.onDidHide(() => {
+		disposables.add(quickPick.onDidHide(() => {
 			quickPick.dispose();
-		});
+		}));
 
-		quickPick.onDispose(() => {
+		disposables.add(quickPick.onDispose(() => {
 			this._currentQuickPick = undefined;
 			disposables.dispose();
-		});
+		}));
 
 		quickPick.show();
 	}
diff --git a/src/vs/workbench/browser/actions/quickAccessActions.ts b/src/vs/workbench/browser/actions/quickAccessActions.ts
index 9890994cfdf..acf6652d837 100644
--- a/src/vs/workbench/browser/actions/quickAccessActions.ts
+++ b/src/vs/workbench/browser/actions/quickAccessActions.ts
@@ -163,12 +163,13 @@ registerAction2(class QuickAccessAction extends Action2 {
 
 	run(accessor: ServicesAccessor): void {
 		const quickInputService = accessor.get(IQuickInputService);
+		const providerOptions: AnythingQuickAccessProviderRunOptions = {
+			includeHelp: true,
+			from: 'commandCenter',
+		};
 		quickInputService.quickAccess.show(undefined, {
 			preserveValue: true,
-			providerOptions: {
-				includeHelp: true,
-				from: 'commandCenter',
-			} as AnythingQuickAccessProviderRunOptions
+			providerOptions
 		});
 	}
 });
diff --git a/src/vs/workbench/browser/contextkeys.ts b/src/vs/workbench/browser/contextkeys.ts
index aff5aab6fda..6f845cf7a1a 100644
--- a/src/vs/workbench/browser/contextkeys.ts
+++ b/src/vs/workbench/browser/contextkeys.ts
@@ -7,15 +7,18 @@ import { Event } from 'vs/base/common/event';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { IContextKeyService, IContextKey, setConstant as setConstantContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { InputFocusedContext, IsMacContext, IsLinuxContext, IsWindowsContext, IsWebContext, IsMacNativeContext, IsDevelopmentContext, IsIOSContext, ProductQualityContext, IsMobileContext } from 'vs/platform/contextkey/common/contextkeys';
+// --- Start PWB: disable file downloads ---
+// eslint-disable-next-line no-duplicate-imports
+import { IsEnabledFileDownloads, IsEnabledFileUploads } from 'vs/workbench/common/contextkeys';
+// --- End PWB ---
 import { SplitEditorsVertically, InEditorZenModeContext, AuxiliaryBarVisibleContext, SideBarVisibleContext, PanelAlignmentContext, PanelMaximizedContext, PanelVisibleContext, EmbedderIdentifierContext, EditorTabsVisibleContext, IsMainEditorCenteredLayoutContext, MainEditorAreaVisibleContext, DirtyWorkingCopiesContext, EmptyWorkspaceSupportContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, IsMainWindowFullscreenContext, OpenFolderWorkspaceSupportContext, RemoteNameContext, VirtualWorkspaceContext, WorkbenchStateContext, WorkspaceFolderCountContext, PanelPositionContext, TemporaryWorkspaceContext, TitleBarVisibleContext, TitleBarStyleContext, IsAuxiliaryWindowFocusedContext, ActiveEditorGroupEmptyContext, ActiveEditorGroupIndexContext, ActiveEditorGroupLastContext, ActiveEditorGroupLockedContext, MultipleEditorGroupsContext, EditorsVisibleContext } from 'vs/workbench/common/contextkeys';
 import { trackFocus, addDisposableListener, EventType, onDidRegisterWindow, getActiveWindow } from 'vs/base/browser/dom';
 import { preferredSideBySideGroupDirection, GroupDirection, IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-// --- Start Positron ---
-// Add isTemporaryWorkspace to the import.
-import { WorkbenchState, IWorkspaceContextService, isTemporaryWorkspace } from 'vs/platform/workspace/common/workspace';
-// --- End Positron ---
+// --- Start PWB: disable file downloads ---
+import { IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService';
+// --- End PWB ---
+import { WorkbenchState, IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { IWorkbenchLayoutService, Parts, positionToString } from 'vs/workbench/services/layout/browser/layoutService';
 import { getRemoteName } from 'vs/platform/remote/common/remoteHosts';
 import { getVirtualWorkspaceScheme } from 'vs/platform/workspace/common/virtualWorkspace';
@@ -32,6 +35,8 @@ import { IEditorService } from 'vs/workbench/services/editor/common/editorServic
 // --- Start Positron ---
 // eslint-disable-next-line no-duplicate-imports
 import { PositronTopActionBarVisibleContext } from 'vs/workbench/common/contextkeys';
+// eslint-disable-next-line no-duplicate-imports
+import { isTemporaryWorkspace } from 'vs/platform/workspace/common/workspace';
 // --- End Positron ---
 
 export class WorkbenchContextKeysHandler extends Disposable {
@@ -84,7 +89,9 @@ export class WorkbenchContextKeysHandler extends Disposable {
 		@IContextKeyService private readonly contextKeyService: IContextKeyService,
 		@IWorkspaceContextService private readonly contextService: IWorkspaceContextService,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
-		@IWorkbenchEnvironmentService private readonly environmentService: IWorkbenchEnvironmentService,
+		// --- Start PWB: disable file downloads ---
+		@IBrowserWorkbenchEnvironmentService private readonly environmentService: IBrowserWorkbenchEnvironmentService,
+		// --- End PWB ---
 		@IProductService private readonly productService: IProductService,
 		@IEditorGroupsService private readonly editorGroupService: IEditorGroupsService,
 		@IEditorService private readonly editorService: IEditorService,
@@ -219,6 +226,11 @@ export class WorkbenchContextKeysHandler extends Disposable {
 		this.auxiliaryBarVisibleContext = AuxiliaryBarVisibleContext.bindTo(this.contextKeyService);
 		this.auxiliaryBarVisibleContext.set(this.layoutService.isVisible(Parts.AUXILIARYBAR_PART));
 
+		// --- Start PWB: disable file downloads ---
+		IsEnabledFileDownloads.bindTo(this.contextKeyService).set(this.environmentService.isEnabledFileDownloads ?? true);
+		IsEnabledFileUploads.bindTo(this.contextKeyService).set(this.environmentService.isEnabledFileUploads ?? true);
+		// --- End PWB ---
+
 		this.registerListeners();
 	}
 
diff --git a/src/vs/workbench/browser/layout.ts b/src/vs/workbench/browser/layout.ts
index 769086717f9..61422a0c3ac 100644
--- a/src/vs/workbench/browser/layout.ts
+++ b/src/vs/workbench/browser/layout.ts
@@ -19,7 +19,7 @@ import { IConfigurationChangeEvent, IConfigurationService } from 'vs/platform/co
 import { ITitleService } from 'vs/workbench/services/title/browser/titleService';
 import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { StartupKind, ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { getMenuBarVisibility, IPath, hasNativeTitlebar, hasCustomTitlebar, TitleBarSetting } from 'vs/platform/window/common/window';
+import { getMenuBarVisibility, IPath, hasNativeTitlebar, hasCustomTitlebar, TitleBarSetting, CustomTitleBarVisibility, useWindowControlsOverlay } from 'vs/platform/window/common/window';
 import { IHostService } from 'vs/workbench/services/host/browser/host';
 import { IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
@@ -48,7 +48,6 @@ import { AuxiliaryBarPart } from 'vs/workbench/browser/parts/auxiliarybar/auxili
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IAuxiliaryWindowService } from 'vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService';
 import { CodeWindow, mainWindow } from 'vs/base/browser/window';
-import { CustomTitleBarVisibility } from '../../platform/window/common/window';
 
 // --- Start Positron ---
 import { IPositronTopActionBarService } from 'vs/workbench/services/positronTopActionBar/browser/positronTopActionBarService';
@@ -630,7 +629,8 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 	private updateWindowsBorder(skipLayout = false) {
 		if (
 			isWeb ||
-			isWindows || // not working well with zooming and window control overlays
+			isWindows || 											// not working well with zooming (border often not visible)
+			useWindowControlsOverlay(this.configurationService) || 	// not working with WCO (border cannot draw over the overlay)
 			hasNativeTitlebar(this.configurationService)
 		) {
 			return;
@@ -711,7 +711,7 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 		// Layout Initialization State
 		const initialEditorsState = this.getInitialEditorsState();
 		if (initialEditorsState) {
-			this.logService.info('Initial editor state', initialEditorsState);
+			this.logService.trace('Initial editor state', initialEditorsState);
 		}
 		const initialLayoutState: ILayoutInitializationState = {
 			layout: {
diff --git a/src/vs/workbench/browser/parts/editor/editor.contribution.ts b/src/vs/workbench/browser/parts/editor/editor.contribution.ts
index fabc137b0ae..753f4aa8860 100644
--- a/src/vs/workbench/browser/parts/editor/editor.contribution.ts
+++ b/src/vs/workbench/browser/parts/editor/editor.contribution.ts
@@ -385,7 +385,7 @@ MenuRegistry.appendMenuItem(MenuId.EditorActionsPositionSubmenu, { command: { id
 MenuRegistry.appendMenuItem(MenuId.EditorActionsPositionSubmenu, { command: { id: EditorActionsTitleBarAction.ID, title: localize('titleBar', "Title Bar"), toggled: ContextKeyExpr.or(ContextKeyExpr.equals('config.workbench.editor.editorActionsLocation', 'titleBar'), ContextKeyExpr.and(ContextKeyExpr.equals('config.workbench.editor.showTabs', 'none'), ContextKeyExpr.equals('config.workbench.editor.editorActionsLocation', 'default'))) }, group: '1_config', order: 20 });
 MenuRegistry.appendMenuItem(MenuId.EditorActionsPositionSubmenu, { command: { id: HideEditorActionsAction.ID, title: localize('hidden', "Hidden"), toggled: ContextKeyExpr.equals('config.workbench.editor.editorActionsLocation', 'hidden') }, group: '1_config', order: 30 });
 
-MenuRegistry.appendMenuItem(MenuId.EditorTabsBarContext, { command: { id: ConfigureEditorTabsAction.ID, title: localize('configureTabs', "Configure Tabs ...") }, group: '9_configure', order: 10 });
+MenuRegistry.appendMenuItem(MenuId.EditorTabsBarContext, { command: { id: ConfigureEditorTabsAction.ID, title: localize('configureTabs', "Configure Tabs") }, group: '9_configure', order: 10 });
 
 // Editor Title Context Menu
 MenuRegistry.appendMenuItem(MenuId.EditorTitleContext, { command: { id: CLOSE_EDITOR_COMMAND_ID, title: localize('close', "Close") }, group: '1_close', order: 10 });
@@ -416,7 +416,7 @@ MenuRegistry.appendMenuItem(MenuId.EditorTitle, { command: { id: TOGGLE_KEEP_EDI
 MenuRegistry.appendMenuItem(MenuId.EditorTitle, { command: { id: TOGGLE_MAXIMIZE_EDITOR_GROUP, title: localize('maximizeGroup', "Maximize Group") }, group: '8_group_operations', order: 5, when: ContextKeyExpr.and(EditorPartMaximizedEditorGroupContext.negate(), EditorPartMultipleEditorGroupsContext) });
 MenuRegistry.appendMenuItem(MenuId.EditorTitle, { command: { id: TOGGLE_MAXIMIZE_EDITOR_GROUP, title: localize('unmaximizeGroup', "Unmaximize Group") }, group: '8_group_operations', order: 5, when: EditorPartMaximizedEditorGroupContext });
 MenuRegistry.appendMenuItem(MenuId.EditorTitle, { command: { id: TOGGLE_LOCK_GROUP_COMMAND_ID, title: localize('lockGroup', "Lock Group"), toggled: ActiveEditorGroupLockedContext }, group: '8_group_operations', order: 10, when: IsAuxiliaryEditorPartContext.toNegated() /* already a primary action for aux windows */ });
-MenuRegistry.appendMenuItem(MenuId.EditorTitle, { command: { id: ConfigureEditorAction.ID, title: localize('configureEditor', "Configure Editor ...") }, group: '9_configure', order: 10 });
+MenuRegistry.appendMenuItem(MenuId.EditorTitle, { command: { id: ConfigureEditorAction.ID, title: localize('configureEditors', "Configure Editors") }, group: '9_configure', order: 10 });
 
 function appendEditorToolItem(primary: ICommandAction, when: ContextKeyExpression | undefined, order: number, alternative?: ICommandAction, precondition?: ContextKeyExpression | undefined): void {
 	const item: IMenuItem = {
diff --git a/src/vs/workbench/browser/parts/editor/editorAutoSave.ts b/src/vs/workbench/browser/parts/editor/editorAutoSave.ts
index 2b3de674cb9..32f66e1d8b0 100644
--- a/src/vs/workbench/browser/parts/editor/editorAutoSave.ts
+++ b/src/vs/workbench/browser/parts/editor/editorAutoSave.ts
@@ -84,7 +84,7 @@ export class EditorAutoSave extends Disposable implements IWorkbenchContribution
 				) {
 					this.discardAutoSave(workingCopyResult.workingCopy);
 
-					this.logService.info(`[editor auto save] running auto save from condition change event`, workingCopyResult.workingCopy.resource.toString(), workingCopyResult.workingCopy.typeId);
+					this.logService.trace(`[editor auto save] running auto save from condition change event`, workingCopyResult.workingCopy.resource.toString(), workingCopyResult.workingCopy.typeId);
 					workingCopyResult.workingCopy.save({ reason: workingCopyResult.reason });
 				}
 			}
@@ -100,7 +100,7 @@ export class EditorAutoSave extends Disposable implements IWorkbenchContribution
 				) {
 					this.waitingOnConditionAutoSaveEditors.delete(resource);
 
-					this.logService.info(`[editor auto save] running auto save from condition change event with reason ${editorResult.reason}`);
+					this.logService.trace(`[editor auto save] running auto save from condition change event with reason ${editorResult.reason}`);
 					this.editorService.save(editorResult.editor, { reason: editorResult.reason });
 				}
 			}
diff --git a/src/vs/workbench/browser/parts/editor/editorPart.ts b/src/vs/workbench/browser/parts/editor/editorPart.ts
index fbdfd7daf7d..c305eb57158 100644
--- a/src/vs/workbench/browser/parts/editor/editorPart.ts
+++ b/src/vs/workbench/browser/parts/editor/editorPart.ts
@@ -114,7 +114,7 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupsView {
 	private readonly _onDidActivateGroup = this._register(new Emitter<IEditorGroupView>());
 	readonly onDidActivateGroup = this._onDidActivateGroup.event;
 
-	private readonly _onDidAddGroup = this._register(new Emitter<IEditorGroupView>());
+	private readonly _onDidAddGroup = this._register(new PauseableEmitter<IEditorGroupView>());
 	readonly onDidAddGroup = this._onDidAddGroup.event;
 
 	private readonly _onDidRemoveGroup = this._register(new PauseableEmitter<IEditorGroupView>());
@@ -134,6 +134,9 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupsView {
 	private readonly _onDidChangeEditorPartOptions = this._register(new Emitter<IEditorPartOptionsChangeEvent>());
 	readonly onDidChangeEditorPartOptions = this._onDidChangeEditorPartOptions.event;
 
+	private readonly _onWillDispose = this._register(new Emitter<void>());
+	readonly onWillDispose = this._onWillDispose.event;
+
 	//#endregion
 
 	private readonly workspaceMemento = this.getMemento(StorageScope.WORKSPACE, StorageTarget.USER);
@@ -1356,7 +1359,17 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupsView {
 
 	private async doApplyState(state: IEditorPartUIState, options?: IEditorGroupViewOptions): Promise<void> {
 		const groups = await this.doPrepareApplyState();
-		const resumeEvents = this.disposeGroups(true /* suspress events for the duration of applying state */);
+
+		// Pause add/remove events for groups during the duration of applying the state
+		// This ensures that we can do this transition atomically with the new state
+		// being ready when the events are fired. This is important because usually there
+		// is never the state where no groups are present, but for this transition we
+		// need to temporarily dispose all groups to restore the new set.
+
+		this._onDidAddGroup.pause();
+		this._onDidRemoveGroup.pause();
+
+		this.disposeGroups();
 
 		// MRU
 		this.mostRecentActiveGroups = state.mostRecentActiveGroups;
@@ -1365,7 +1378,12 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupsView {
 		try {
 			this.doApplyGridState(state.serializedGrid, state.activeGroup, undefined, options);
 		} finally {
-			resumeEvents();
+			// It is very important to keep this order: first resume the events for
+			// removed groups and then for added groups. Many listeners may store
+			// groups in sets by their identifier and groups can have the same
+			// identifier before and after.
+			this._onDidRemoveGroup.resume();
+			this._onDidAddGroup.resume();
 		}
 
 		// Restore editors that were not closed before and are now opened now
@@ -1439,13 +1457,7 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupsView {
 		};
 	}
 
-	private disposeGroups(): void;
-	private disposeGroups(surpressEvents: boolean): Function;
-	private disposeGroups(surpressEvents?: boolean): Function | void {
-		if (surpressEvents) {
-			this._onDidRemoveGroup.pause();
-		}
-
+	private disposeGroups(): void {
 		for (const group of this.groups) {
 			group.dispose();
 
@@ -1454,14 +1466,13 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupsView {
 
 		this.groupViews.clear();
 		this.mostRecentActiveGroups = [];
-
-		if (surpressEvents) {
-			return () => this._onDidRemoveGroup.resume();
-		}
 	}
 
 	override dispose(): void {
 
+		// Event
+		this._onWillDispose.fire();
+
 		// Forward to all groups
 		this.disposeGroups();
 
diff --git a/src/vs/workbench/browser/parts/editor/editorParts.ts b/src/vs/workbench/browser/parts/editor/editorParts.ts
index 18123131e5b..c04fd7769ac 100644
--- a/src/vs/workbench/browser/parts/editor/editorParts.ts
+++ b/src/vs/workbench/browser/parts/editor/editorParts.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { localize } from 'vs/nls';
-import { EditorGroupLayout, GroupDirection, GroupLocation, GroupOrientation, GroupsArrangement, GroupsOrder, IAuxiliaryEditorPart, IAuxiliaryEditorPartCreateEvent, IEditorGroupContextKeyProvider, IEditorDropTargetDelegate, IEditorGroupsService, IEditorSideGroup, IEditorWorkingSet, IFindGroupScope, IMergeGroupOptions, IEditorWorkingSetOptions } from 'vs/workbench/services/editor/common/editorGroupsService';
+import { EditorGroupLayout, GroupDirection, GroupLocation, GroupOrientation, GroupsArrangement, GroupsOrder, IAuxiliaryEditorPart, IEditorGroupContextKeyProvider, IEditorDropTargetDelegate, IEditorGroupsService, IEditorSideGroup, IEditorWorkingSet, IFindGroupScope, IMergeGroupOptions, IEditorWorkingSetOptions, IEditorPart } from 'vs/workbench/services/editor/common/editorGroupsService';
 import { Emitter } from 'vs/base/common/event';
 import { DisposableMap, DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
 import { GroupIdentifier } from 'vs/workbench/common/editor';
@@ -22,6 +22,8 @@ import { IAuxiliaryWindowOpenOptions, IAuxiliaryWindowService } from 'vs/workben
 import { generateUuid } from 'vs/base/common/uuid';
 import { ContextKeyValue, IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { isHTMLElement } from 'vs/base/browser/dom';
+import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
+import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 
 interface IEditorPartsUIState {
 	readonly auxiliary: IAuxiliaryEditorPartState[];
@@ -70,19 +72,44 @@ export class EditorParts extends MultiWindowParts<EditorPart> implements IEditor
 		return this.instantiationService.createInstance(MainEditorPart, this);
 	}
 
+	//#region Scoped Instantiation Services
+
+	private readonly mapPartToInstantiationService = new Map<number /* window ID */, IInstantiationService>();
+
+	getScopedInstantiationService(part: IEditorPart): IInstantiationService {
+		if (part === this.mainPart) {
+			if (!this.mapPartToInstantiationService.has(part.windowId)) {
+				this.instantiationService.invokeFunction(accessor => {
+					const editorService = accessor.get(IEditorService); // using `invokeFunction` to get hold of `IEditorService` lazily
+
+					this.mapPartToInstantiationService.set(part.windowId, this._register(this.instantiationService.createChild(new ServiceCollection(
+						[IEditorService, editorService.createScoped('main', this._store)]
+					))));
+				});
+			}
+		}
+
+		return this.mapPartToInstantiationService.get(part.windowId) ?? this.instantiationService;
+	}
+
+	//#endregion
+
 	//#region Auxiliary Editor Parts
 
-	private readonly _onDidCreateAuxiliaryEditorPart = this._register(new Emitter<IAuxiliaryEditorPartCreateEvent>());
+	private readonly _onDidCreateAuxiliaryEditorPart = this._register(new Emitter<IAuxiliaryEditorPart>());
 	readonly onDidCreateAuxiliaryEditorPart = this._onDidCreateAuxiliaryEditorPart.event;
 
 	async createAuxiliaryEditorPart(options?: IAuxiliaryEditorPartOpenOptions): Promise<IAuxiliaryEditorPart> {
 		const { part, instantiationService, disposables } = await this.instantiationService.createInstance(AuxiliaryEditorPart, this).create(this.getGroupsLabel(this._parts.size), options);
 
+		// Keep instantiation service
+		this.mapPartToInstantiationService.set(part.windowId, instantiationService);
+		disposables.add(toDisposable(() => this.mapPartToInstantiationService.delete(part.windowId)));
+
 		// Events
 		this._onDidAddGroup.fire(part.activeGroup);
 
-		const eventDisposables = disposables.add(new DisposableStore());
-		this._onDidCreateAuxiliaryEditorPart.fire({ part, instantiationService, disposables: eventDisposables });
+		this._onDidCreateAuxiliaryEditorPart.fire(part);
 
 		return part;
 	}
diff --git a/src/vs/workbench/browser/parts/editor/editorQuickAccess.ts b/src/vs/workbench/browser/parts/editor/editorQuickAccess.ts
index 225330438f6..3a69dbbff43 100644
--- a/src/vs/workbench/browser/parts/editor/editorQuickAccess.ts
+++ b/src/vs/workbench/browser/parts/editor/editorQuickAccess.ts
@@ -60,7 +60,7 @@ export abstract class BaseEditorQuickAccessProvider extends PickerQuickAccessPro
 		);
 	}
 
-	override provide(picker: IQuickPick<IEditorQuickPickItem>, token: CancellationToken): IDisposable {
+	override provide(picker: IQuickPick<IEditorQuickPickItem, { useSeparators: true }>, token: CancellationToken): IDisposable {
 
 		// Reset the pick state for this run
 		this.pickState.reset(!!picker.quickNavigate);
diff --git a/src/vs/workbench/browser/parts/editor/editorStatus.ts b/src/vs/workbench/browser/parts/editor/editorStatus.ts
index 845160784b1..dcef2cf97d9 100644
--- a/src/vs/workbench/browser/parts/editor/editorStatus.ts
+++ b/src/vs/workbench/browser/parts/editor/editorStatus.ts
@@ -55,9 +55,7 @@ import { ServicesAccessor } from 'vs/editor/browser/editorExtensions';
 import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { KeyChord, KeyCode, KeyMod } from 'vs/base/common/keyCodes';
 import { TabFocus } from 'vs/editor/browser/config/tabFocus';
-import { mainWindow } from 'vs/base/browser/window';
-import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
+import { IEditorGroupsService, IEditorPart } from 'vs/workbench/services/editor/common/editorGroupsService';
 
 class SideBySideEditorEncodingSupport implements IEncodingSupport {
 	constructor(private primary: IEncodingSupport, private secondary: IEncodingSupport) { }
@@ -886,22 +884,23 @@ export class EditorStatusContribution extends Disposable implements IWorkbenchCo
 	static readonly ID = 'workbench.contrib.editorStatus';
 
 	constructor(
-		@IInstantiationService instantiationService: IInstantiationService,
-		@IEditorGroupsService editorGroupService: IEditorGroupsService,
-		@IEditorService editorService: IEditorService
+		@IEditorGroupsService private readonly editorGroupService: IEditorGroupsService,
 	) {
 		super();
 
-		// Main Editor Status
-		const mainInstantiationService = this._register(instantiationService.createChild(new ServiceCollection(
-			[IEditorService, editorService.createScoped('main', this._store)]
-		)));
-		this._register(mainInstantiationService.createInstance(EditorStatus, mainWindow.vscodeWindowId));
+		for (const part of editorGroupService.parts) {
+			this.createEditorStatus(part);
+		}
 
-		// Auxiliary Editor Status
-		this._register(editorGroupService.onDidCreateAuxiliaryEditorPart(({ part, instantiationService, disposables }) => {
-			disposables.add(instantiationService.createInstance(EditorStatus, part.windowId));
-		}));
+		this._register(editorGroupService.onDidCreateAuxiliaryEditorPart(part => this.createEditorStatus(part)));
+	}
+
+	private createEditorStatus(part: IEditorPart): void {
+		const disposables = new DisposableStore();
+		Event.once(part.onWillDispose)(() => disposables.dispose());
+
+		const scopedInstantiationService = this.editorGroupService.getScopedInstantiationService(part);
+		disposables.add(scopedInstantiationService.createInstance(EditorStatus, part.windowId));
 	}
 }
 
diff --git a/src/vs/workbench/browser/parts/editor/multiRowEditorTabsControl.ts b/src/vs/workbench/browser/parts/editor/multiRowEditorTabsControl.ts
index 69eb8b77262..caada50149a 100644
--- a/src/vs/workbench/browser/parts/editor/multiRowEditorTabsControl.ts
+++ b/src/vs/workbench/browser/parts/editor/multiRowEditorTabsControl.ts
@@ -20,6 +20,8 @@ export class MultiRowEditorControl extends Disposable implements IEditorTabsCont
 	private readonly stickyEditorTabsControl: IEditorTabsControl;
 	private readonly unstickyEditorTabsControl: IEditorTabsControl;
 
+	private activeControl: IEditorTabsControl | undefined;
+
 	constructor(
 		private readonly parent: HTMLElement,
 		editorPartsView: IEditorPartsView,
@@ -36,10 +38,15 @@ export class MultiRowEditorControl extends Disposable implements IEditorTabsCont
 		this.stickyEditorTabsControl = this._register(this.instantiationService.createInstance(MultiEditorTabsControl, this.parent, editorPartsView, this.groupsView, this.groupView, stickyModel));
 		this.unstickyEditorTabsControl = this._register(this.instantiationService.createInstance(MultiEditorTabsControl, this.parent, editorPartsView, this.groupsView, this.groupView, unstickyModel));
 
-		this.handlePinnedTabsLayoutChange();
+		this.handleTabBarsStateChange();
+	}
+
+	private handleTabBarsStateChange(): void {
+		this.activeControl = this.model.activeEditor ? this.getEditorTabsController(this.model.activeEditor) : undefined;
+		this.handleTabBarsLayoutChange();
 	}
 
-	private handlePinnedTabsLayoutChange(): void {
+	private handleTabBarsLayoutChange(): void {
 		if (this.groupView.count === 0) {
 			// Do nothing as no tab bar is visible
 			return;
@@ -56,12 +63,19 @@ export class MultiRowEditorControl extends Disposable implements IEditorTabsCont
 		}
 	}
 
+	private didActiveControlChange() {
+		return this.activeControl !== (this.model.activeEditor ? this.getEditorTabsController(this.model.activeEditor) : undefined);
+	}
+
 	private getEditorTabsController(editor: EditorInput): IEditorTabsControl {
 		return this.model.isSticky(editor) ? this.stickyEditorTabsControl : this.unstickyEditorTabsControl;
 	}
 
 	openEditor(editor: EditorInput, options: IInternalEditorOpenOptions): boolean {
-		const didChange = this.getEditorTabsController(editor).openEditor(editor, options);
+		const didActiveControlChange = this.didActiveControlChange();
+		const didOpenEditorChange = this.getEditorTabsController(editor).openEditor(editor, options);
+
+		const didChange = didOpenEditorChange || didActiveControlChange;
 		if (didChange) {
 			this.handleOpenedEditors();
 		}
@@ -72,11 +86,11 @@ export class MultiRowEditorControl extends Disposable implements IEditorTabsCont
 		const stickyEditors = editors.filter(e => this.model.isSticky(e));
 		const unstickyEditors = editors.filter(e => !this.model.isSticky(e));
 
+		const didActiveControlChange = this.didActiveControlChange();
 		const didChangeOpenEditorsSticky = this.stickyEditorTabsControl.openEditors(stickyEditors);
 		const didChangeOpenEditorsUnSticky = this.unstickyEditorTabsControl.openEditors(unstickyEditors);
 
-		const didChange = didChangeOpenEditorsSticky || didChangeOpenEditorsUnSticky;
-
+		const didChange = didChangeOpenEditorsSticky || didChangeOpenEditorsUnSticky || didActiveControlChange;
 		if (didChange) {
 			this.handleOpenedEditors();
 		}
@@ -85,7 +99,7 @@ export class MultiRowEditorControl extends Disposable implements IEditorTabsCont
 	}
 
 	private handleOpenedEditors(): void {
-		this.handlePinnedTabsLayoutChange();
+		this.handleTabBarsStateChange();
 	}
 
 	beforeCloseEditor(editor: EditorInput): void {
@@ -111,7 +125,7 @@ export class MultiRowEditorControl extends Disposable implements IEditorTabsCont
 	}
 
 	private handleClosedEditors(): void {
-		this.handlePinnedTabsLayoutChange();
+		this.handleTabBarsStateChange();
 	}
 
 	moveEditor(editor: EditorInput, fromIndex: number, targetIndex: number, stickyStateChange: boolean): void {
@@ -125,7 +139,7 @@ export class MultiRowEditorControl extends Disposable implements IEditorTabsCont
 				this.unstickyEditorTabsControl.openEditor(editor);
 			}
 
-			this.handlePinnedTabsLayoutChange();
+			this.handleTabBarsStateChange();
 
 		} else {
 			if (this.model.isSticky(editor)) {
@@ -144,14 +158,14 @@ export class MultiRowEditorControl extends Disposable implements IEditorTabsCont
 		this.unstickyEditorTabsControl.closeEditor(editor);
 		this.stickyEditorTabsControl.openEditor(editor);
 
-		this.handlePinnedTabsLayoutChange();
+		this.handleTabBarsStateChange();
 	}
 
 	unstickEditor(editor: EditorInput): void {
 		this.stickyEditorTabsControl.closeEditor(editor);
 		this.unstickyEditorTabsControl.openEditor(editor);
 
-		this.handlePinnedTabsLayoutChange();
+		this.handleTabBarsStateChange();
 	}
 
 	setActive(isActive: boolean): void {
diff --git a/src/vs/workbench/browser/parts/notifications/media/notificationsCenter.css b/src/vs/workbench/browser/parts/notifications/media/notificationsCenter.css
index b4ac21708ba..a9e4fd0ebb0 100644
--- a/src/vs/workbench/browser/parts/notifications/media/notificationsCenter.css
+++ b/src/vs/workbench/browser/parts/notifications/media/notificationsCenter.css
@@ -44,14 +44,12 @@
 	justify-content: flex-end;
 }
 
-.monaco-workbench > .notifications-center .notifications-list-container .monaco-list-row[data-last-element="false"] > .notification-list-item {
+.monaco-workbench > .notifications-center .notifications-list-container .monaco-list-row:not(:last-child) > .notification-list-item {
 	border-bottom: 1px solid var(--vscode-notifications-border);
 }
 
-.monaco-workbench > .notifications-center .notifications-list-container,
-.monaco-workbench > .notifications-center .notifications-list-container .monaco-scrollable-element,
-.monaco-workbench > .notifications-center .notifications-list-container .notification-list-item {
-	border-radius: 0;
+.monaco-workbench > .notifications-center .notifications-list-container .monaco-list-row:last-child {
+	border-radius: 0px 0px 4px 4px; /* adopt the border radius at the end of the notifications center */
 }
 
 /* Icons */
diff --git a/src/vs/workbench/browser/parts/notifications/media/notificationsList.css b/src/vs/workbench/browser/parts/notifications/media/notificationsList.css
index 1e46a103a1d..c5b4faf8e49 100644
--- a/src/vs/workbench/browser/parts/notifications/media/notificationsList.css
+++ b/src/vs/workbench/browser/parts/notifications/media/notificationsList.css
@@ -9,7 +9,6 @@
 	color: var(--vscode-notifications-foreground);
 	background: var(--vscode-notifications-background);
 	outline-color: var(--vscode-contrastBorder);
-	border-radius: inherit;
 }
 
 .monaco-workbench .notifications-list-container .notification-list-item {
@@ -19,7 +18,6 @@
 	padding: 10px 5px;
 	height: 100%;
 	box-sizing: border-box;
-	border-radius: 4px;
 }
 
 .monaco-workbench .notifications-list-container .notification-offset-helper {
@@ -29,10 +27,6 @@
 	word-wrap: break-word; /* never overflow long words, but break to next line */
 }
 
-.monaco-workbench .notifications-list-container .monaco-scrollable-element {
-	border-radius: 4px;
-}
-
 /** Notification: Main Row */
 
 .monaco-workbench .notifications-list-container .notification-list-item > .notification-list-item-main-row {
diff --git a/src/vs/workbench/browser/parts/notifications/media/notificationsToasts.css b/src/vs/workbench/browser/parts/notifications/media/notificationsToasts.css
index 89ce01ed02b..d4ef2314bc5 100644
--- a/src/vs/workbench/browser/parts/notifications/media/notificationsToasts.css
+++ b/src/vs/workbench/browser/parts/notifications/media/notificationsToasts.css
@@ -30,6 +30,13 @@
 	transform: translate3d(0px, 100%, 0px); /* move the notification 50px to the bottom (to prevent bleed through) */
 	opacity: 0; /*  fade the toast in */
 	transition:	transform 300ms ease-out, opacity 300ms ease-out;
+}
+
+.monaco-workbench > .notifications-toasts .notifications-list-container,
+.monaco-workbench > .notifications-toasts .notification-toast-container > .notification-toast,
+.monaco-workbench > .notifications-toasts .notification-toast-container > .notification-toast .monaco-scrollable-element,
+.monaco-workbench > .notifications-toasts .notification-toast-container > .notification-toast .monaco-list:not(.element-focused):focus:before,
+.monaco-workbench > .notifications-toasts .notification-toast-container > .notification-toast .monaco-list-row {
 	border-radius: 4px;
 }
 
diff --git a/src/vs/workbench/browser/parts/notifications/notificationsCommands.ts b/src/vs/workbench/browser/parts/notifications/notificationsCommands.ts
index 92b1b45d184..5151fdc18e1 100644
--- a/src/vs/workbench/browser/parts/notifications/notificationsCommands.ts
+++ b/src/vs/workbench/browser/parts/notifications/notificationsCommands.ts
@@ -312,12 +312,12 @@ export function registerNotificationCommands(center: INotificationsCenterControl
 
 		picker.canSelectMany = true;
 		picker.placeholder = localize('selectSources', "Select sources to enable all notifications from");
-		picker.selectedItems = picker.items.filter(item => (item as INotificationSourceFilter).filter === NotificationsFilter.OFF) as (IQuickPickItem & INotificationSourceFilter)[];
+		picker.selectedItems = picker.items.filter(item => item.filter === NotificationsFilter.OFF);
 
 		picker.show();
 
 		disposables.add(picker.onDidAccept(async () => {
-			for (const item of picker.items as (IQuickPickItem & INotificationSourceFilter)[]) {
+			for (const item of picker.items) {
 				notificationService.setFilter({
 					id: item.id,
 					label: item.label,
diff --git a/src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css b/src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css
index d72db6d0b6c..429d733c5fa 100644
--- a/src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css
+++ b/src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css
@@ -138,11 +138,11 @@
 	color: var(--vscode-titleBar-activeForeground);
 }
 
-.monaco-workbench .part.titlebar.inactive > .titlebar-container > .titlebar-center > .window-title > .command-center > .monaco-toolbar > .monaco-action-bar > .actions-container > .action-item > .action-label  {
+.monaco-workbench .part.titlebar.inactive > .titlebar-container > .titlebar-center > .window-title > .command-center > .monaco-toolbar > .monaco-action-bar > .actions-container > .action-item > .action-label {
 	color: var(--vscode-titleBar-inactiveForeground);
 }
 
-.monaco-workbench .part.titlebar > .titlebar-container > .titlebar-center > .window-title > .command-center > .monaco-toolbar > .monaco-action-bar > .actions-container > .action-item > .action-label  {
+.monaco-workbench .part.titlebar > .titlebar-container > .titlebar-center > .window-title > .command-center > .monaco-toolbar > .monaco-action-bar > .actions-container > .action-item > .action-label {
 	color: inherit;
 }
 
@@ -182,7 +182,7 @@
 	text-overflow: ellipsis;
 }
 
-.monaco-workbench .part.titlebar > .titlebar-container > .titlebar-center > .window-title > .command-center .action-item.command-center-center.multiple  {
+.monaco-workbench .part.titlebar > .titlebar-container > .titlebar-center > .window-title > .command-center .action-item.command-center-center.multiple {
 	justify-content: flex-start;
 	padding: 0 12px;
 }
@@ -280,7 +280,7 @@
 	border-left: 1px solid transparent;
 }
 
-/* Window Controls (Minimize, Max/Restore, Close) */
+/* Window Controls Container */
 .monaco-workbench .part.titlebar .window-controls-container {
 	display: flex;
 	flex-grow: 0;
@@ -292,7 +292,12 @@
 	height: 100%;
 }
 
-/* Web WCO Sizing/Ordering */
+.monaco-workbench.fullscreen .part.titlebar .window-controls-container {
+	display: none;
+	background-color: transparent;
+}
+
+/* Window Controls Container Web: Apply WCO environment variables (https://developer.mozilla.org/en-US/docs/Web/CSS/env#titlebar-area-x) */
 .monaco-workbench.web .part.titlebar .titlebar-right .window-controls-container {
 	width: calc(100vw - env(titlebar-area-width, 100vw) - env(titlebar-area-x, 0px));
 	height: env(titlebar-area-height, 35px);
@@ -311,29 +316,31 @@
 	order: 1;
 }
 
-/* Desktop Windows/Linux Window Controls*/
-.monaco-workbench:not(.web):not(.mac) .part.titlebar .window-controls-container.primary {
+/* Window Controls Container Desktop: apply zoom friendly size */
+.monaco-workbench:not(.web):not(.mac) .part.titlebar .window-controls-container {
 	width: calc(138px / var(--zoom-factor, 1));
 }
 
-.monaco-workbench:not(.web):not(.mac) .part.titlebar .titlebar-container.counter-zoom .window-controls-container.primary {
+.monaco-workbench:not(.web):not(.mac) .part.titlebar .titlebar-container.counter-zoom .window-controls-container {
 	width: 138px;
 }
 
+.monaco-workbench.linux:not(.web) .part.titlebar .window-controls-container.wco-enabled {
+	width: calc(var(--title-wco-width, 138px));
+}
+
+.monaco-workbench.linux:not(.web) .part.titlebar .titlebar-container.counter-zoom .window-controls-container.wco-enabled {
+	width: var(--title-wco-width, 138px);
+}
+
 .monaco-workbench:not(.web):not(.mac) .part.titlebar .titlebar-container:not(.counter-zoom) .window-controls-container * {
 	zoom: calc(1 / var(--zoom-factor, 1));
 }
 
-/* Desktop macOS Window Controls */
-.monaco-workbench:not(.web).mac .part.titlebar .window-controls-container.primary {
+.monaco-workbench:not(.web).mac .part.titlebar .window-controls-container {
 	width: 70px;
 }
 
-.monaco-workbench.fullscreen .part.titlebar .window-controls-container {
-	display: none;
-	background-color: transparent;
-}
-
 /* Window Control Icons */
 .monaco-workbench .part.titlebar .window-controls-container > .window-icon {
 	display: flex;
@@ -342,6 +349,11 @@
 	height: 100%;
 	width: 46px;
 	font-size: 16px;
+	color: var(--vscode-titleBar-activeForeground);
+}
+
+.monaco-workbench .part.titlebar.inactive .window-controls-container > .window-icon {
+	color: var(--vscode-titleBar-inactiveForeground);
 }
 
 .monaco-workbench .part.titlebar .window-controls-container > .window-icon::before {
@@ -376,7 +388,6 @@
 	z-index: 2500;
 	-webkit-app-region: no-drag;
 	height: 100%;
-	min-width: 28px;
 }
 
 .monaco-workbench .part.titlebar > .titlebar-container > .titlebar-right > .action-toolbar-container {
@@ -455,11 +466,3 @@
 	border-radius: 16px;
 	text-align: center;
 }
-
-.monaco-workbench .part.titlebar .window-controls-container .window-icon {
-	color: var(--vscode-titleBar-activeForeground);
-}
-
-.monaco-workbench .part.titlebar.inactive .window-controls-container .window-icon {
-	color: var(--vscode-titleBar-inactiveForeground);
-}
diff --git a/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts b/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts
index 2c7519cd0fe..31466ebd0cb 100644
--- a/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts
+++ b/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts
@@ -7,7 +7,7 @@ import 'vs/css!./media/titlebarpart';
 import { localize, localize2 } from 'vs/nls';
 import { MultiWindowParts, Part } from 'vs/workbench/browser/part';
 import { ITitleService } from 'vs/workbench/services/title/browser/titleService';
-import { getWCOBoundingRect, getZoomFactor, isWCOEnabled } from 'vs/base/browser/browser';
+import { getWCOTitlebarAreaRect, getZoomFactor, isWCOEnabled, onDidChangeZoomLevel } from 'vs/base/browser/browser';
 import { MenuBarVisibility, getTitleBarStyle, getMenuBarVisibility, TitlebarStyle, hasCustomTitlebar, hasNativeTitlebar, DEFAULT_CUSTOM_TITLEBAR_HEIGHT } from 'vs/platform/window/common/window';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
@@ -21,7 +21,7 @@ import { isMacintosh, isWindows, isLinux, isWeb, isNative, platformLocale } from
 import { Color } from 'vs/base/common/color';
 import { EventType, EventHelper, Dimension, append, $, addDisposableListener, prepend, reset, getWindow, getWindowId, isAncestor, getActiveDocument, isHTMLElement } from 'vs/base/browser/dom';
 import { CustomMenubarControl } from 'vs/workbench/browser/parts/titlebar/menubarControl';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { Emitter, Event } from 'vs/base/common/event';
 import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
 import { Parts, IWorkbenchLayoutService, ActivityBarPosition, LayoutSettings, EditorActionsLocation, EditorTabsMode } from 'vs/workbench/services/layout/browser/layoutService';
@@ -55,6 +55,7 @@ import { IView } from 'vs/base/browser/ui/grid/grid';
 import { createInstantHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
 import { IBaseActionViewItemOptions } from 'vs/base/browser/ui/actionbar/actionViewItems';
 import { IHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegate';
+import { CommandsRegistry } from 'vs/platform/commands/common/commands';
 
 export interface ITitleVariable {
 	readonly name: string;
@@ -101,6 +102,7 @@ export class BrowserTitleService extends MultiWindowParts<BrowserTitlebarPart> i
 		this._register(this.registerPart(this.mainPart));
 
 		this.registerActions();
+		this.registerAPICommands();
 	}
 
 	protected createMainTitlebarPart(): BrowserTitlebarPart {
@@ -128,6 +130,22 @@ export class BrowserTitleService extends MultiWindowParts<BrowserTitlebarPart> i
 		}));
 	}
 
+	private registerAPICommands(): void {
+		this._register(CommandsRegistry.registerCommand({
+			id: 'registerWindowTitleVariable',
+			handler: (accessor: ServicesAccessor, name: string, contextKey: string) => {
+				this.registerVariables([{ name, contextKey }]);
+			},
+			metadata: {
+				description: 'Registers a new title variable',
+				args: [
+					{ name: 'name', schema: { type: 'string' }, description: 'The name of the variable to register' },
+					{ name: 'contextKey', schema: { type: 'string' }, description: 'The context key to use for the value of the variable' }
+				]
+			}
+		}));
+	}
+
 	//#region Auxiliary Titlebar Parts
 
 	createAuxiliaryTitlebarPart(container: HTMLElement, editorGroupsContainer: IEditorGroupsContainer): IAuxiliaryTitlebarPart {
@@ -149,8 +167,8 @@ export class BrowserTitleService extends MultiWindowParts<BrowserTitlebarPart> i
 			titlebarPart.updateProperties(this.properties);
 		}
 
-		if (this.variables.length) {
-			titlebarPart.registerVariables(this.variables);
+		if (this.variables.size) {
+			titlebarPart.registerVariables(Array.from(this.variables.values()));
 		}
 
 		Event.once(titlebarPart.onWillDispose)(() => disposables.dispose());
@@ -179,13 +197,20 @@ export class BrowserTitleService extends MultiWindowParts<BrowserTitlebarPart> i
 		}
 	}
 
-	private variables: ITitleVariable[] = [];
+	private readonly variables = new Map<string, ITitleVariable>();
 
 	registerVariables(variables: ITitleVariable[]): void {
-		this.variables.push(...variables);
+		const newVariables: ITitleVariable[] = [];
+
+		for (const variable of variables) {
+			if (!this.variables.has(variable.name)) {
+				this.variables.set(variable.name, variable);
+				newVariables.push(variable);
+			}
+		}
 
 		for (const part of this.parts) {
-			part.registerVariables(variables);
+			part.registerVariables(newVariables);
 		}
 	}
 
@@ -203,7 +228,7 @@ export class BrowserTitlebarPart extends Part implements ITitlebarPart {
 		const wcoEnabled = isWeb && isWCOEnabled();
 		let value = this.isCommandCenterVisible || wcoEnabled ? DEFAULT_CUSTOM_TITLEBAR_HEIGHT : 30;
 		if (wcoEnabled) {
-			value = Math.max(value, getWCOBoundingRect()?.height ?? 0);
+			value = Math.max(value, getWCOTitlebarAreaRect(getWindow(this.element))?.height ?? 0);
 		}
 
 		return value / (this.preventZoom ? getZoomFactor(getWindow(this.element)) : 1);
@@ -224,7 +249,7 @@ export class BrowserTitlebarPart extends Part implements ITitlebarPart {
 	//#endregion
 
 	protected rootContainer!: HTMLElement;
-	protected primaryWindowControls: HTMLElement | undefined;
+	protected windowControlsContainer: HTMLElement | undefined;
 	protected dragRegion: HTMLElement | undefined;
 	private title!: HTMLElement;
 
@@ -451,21 +476,49 @@ export class BrowserTitlebarPart extends Part implements ITitlebarPart {
 			this.createActionToolBarMenus();
 		}
 
-		let primaryControlLocation = isMacintosh ? 'left' : 'right';
-		if (isMacintosh && isNative) {
+		// Window Controls Container
+		if (!hasNativeTitlebar(this.configurationService, this.titleBarStyle)) {
+			let primaryWindowControlsLocation = isMacintosh ? 'left' : 'right';
+			if (isMacintosh && isNative) {
 
-			// Check if the locale is RTL, macOS will move traffic lights in RTL locales
-			// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/Locale/textInfo
+				// Check if the locale is RTL, macOS will move traffic lights in RTL locales
+				// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/Locale/textInfo
 
-			const localeInfo = new Intl.Locale(platformLocale) as any;
-			if (localeInfo?.textInfo?.direction === 'rtl') {
-				primaryControlLocation = 'right';
+				const localeInfo = new Intl.Locale(platformLocale) as any;
+				if (localeInfo?.textInfo?.direction === 'rtl') {
+					primaryWindowControlsLocation = 'right';
+				}
 			}
-		}
 
-		if (!hasNativeTitlebar(this.configurationService, this.titleBarStyle)) {
-			this.primaryWindowControls = append(primaryControlLocation === 'left' ? this.leftContent : this.rightContent, $('div.window-controls-container.primary'));
-			append(primaryControlLocation === 'left' ? this.rightContent : this.leftContent, $('div.window-controls-container.secondary'));
+			if (isMacintosh && isNative && primaryWindowControlsLocation === 'left') {
+				// macOS native: controls are on the left and the container is not needed to make room
+				// for something, except for web where a custom menu being supported). not putting the
+				// container helps with allowing to move the window when clicking very close to the
+				// window control buttons.
+			} else {
+				this.windowControlsContainer = append(primaryWindowControlsLocation === 'left' ? this.leftContent : this.rightContent, $('div.window-controls-container'));
+				if (isWeb) {
+					// Web: its possible to have control overlays on both sides, for example on macOS
+					// with window controls on the left and PWA controls on the right.
+					append(primaryWindowControlsLocation === 'left' ? this.rightContent : this.leftContent, $('div.window-controls-container'));
+				}
+
+				if (isWCOEnabled()) {
+					this.windowControlsContainer.classList.add('wco-enabled');
+
+					const updateWCOWidthVariable = () => {
+						const targetWindow = getWindow(this.element);
+						const wcoTitlebarAreaRect = getWCOTitlebarAreaRect(targetWindow);
+						if (wcoTitlebarAreaRect) {
+							const wcoWidth = targetWindow.innerWidth - wcoTitlebarAreaRect.width - wcoTitlebarAreaRect.x;
+							this.windowControlsContainer?.style.setProperty('--title-wco-width', `${wcoWidth}px`);
+						}
+					};
+					updateWCOWidthVariable();
+
+					this._register(onDidChangeZoomLevel(() => setTimeout(() => updateWCOWidthVariable(), 5))); // Somehow it does not get the right size without this timeout :-/
+				}
+			}
 		}
 
 		// Context menu over title bar: depending on the OS and the location of the click this will either be
diff --git a/src/vs/workbench/browser/parts/views/viewPaneContainer.ts b/src/vs/workbench/browser/parts/views/viewPaneContainer.ts
index 9e04c391873..d99e44a2484 100644
--- a/src/vs/workbench/browser/parts/views/viewPaneContainer.ts
+++ b/src/vs/workbench/browser/parts/views/viewPaneContainer.ts
@@ -593,6 +593,9 @@ export class ViewPaneContainer extends Component implements IViewPaneContainer {
 	}
 
 	getActionsContext(): unknown {
+		if (this.isViewMergedWithContainer()) {
+			return this.panes[0].getActionsContext();
+		}
 		return undefined;
 	}
 
diff --git a/src/vs/workbench/browser/web.api.ts b/src/vs/workbench/browser/web.api.ts
index 697e6742183..5d312c1352f 100644
--- a/src/vs/workbench/browser/web.api.ts
+++ b/src/vs/workbench/browser/web.api.ts
@@ -298,6 +298,25 @@ export interface IWorkbenchConstructionOptions {
 	 */
 	readonly configurationDefaults?: Record<string, any>;
 
+	// --- Start PWB: Local storage ---
+	/**
+	 * Path to the user data directory.
+	 */
+	readonly userDataPath?: string;
+	// --- End PWB ---
+  
+	// --- Start PWB: disable file downloads ---
+	/**
+	 * Whether the "Download..." option is enabled for files.
+	 */
+	readonly isEnabledFileDownloads?: boolean;
+
+	/**
+	 * Whether the "Upload..." button is enabled.
+	 */
+	readonly isEnabledFileUploads?: boolean;
+	// --- End PWB ---
+
 	//#endregion
 
 	//#region Profile options
diff --git a/src/vs/workbench/browser/web.main.ts b/src/vs/workbench/browser/web.main.ts
index 1ea687ba1c6..a7772c273ed 100644
--- a/src/vs/workbench/browser/web.main.ts
+++ b/src/vs/workbench/browser/web.main.ts
@@ -588,13 +588,14 @@ export class BrowserMain extends Disposable {
 		}
 	}
 
-	private async getCurrentProfile(workspace: IAnyWorkspaceIdentifier, userDataProfilesService: BrowserUserDataProfilesService, environmentService: IBrowserWorkbenchEnvironmentService): Promise<IUserDataProfile> {
-		if (environmentService.options?.profile) {
-			const profile = userDataProfilesService.profiles.find(p => p.name === environmentService.options?.profile?.name);
+	private async getCurrentProfile(workspace: IAnyWorkspaceIdentifier, userDataProfilesService: BrowserUserDataProfilesService, environmentService: BrowserWorkbenchEnvironmentService): Promise<IUserDataProfile> {
+		const profileName = environmentService.options?.profile?.name ?? environmentService.profile;
+		if (profileName) {
+			const profile = userDataProfilesService.profiles.find(p => p.name === profileName);
 			if (profile) {
 				return profile;
 			}
-			return userDataProfilesService.createNamedProfile(environmentService.options?.profile?.name, undefined, workspace);
+			return userDataProfilesService.createNamedProfile(profileName, undefined, workspace);
 		}
 		return userDataProfilesService.getProfileForWorkspace(workspace) ?? userDataProfilesService.defaultProfile;
 	}
diff --git a/src/vs/workbench/browser/window.ts b/src/vs/workbench/browser/window.ts
index e964af6543e..84c49ea97c8 100644
--- a/src/vs/workbench/browser/window.ts
+++ b/src/vs/workbench/browser/window.ts
@@ -133,9 +133,19 @@ export abstract class BaseWindow extends Disposable {
 					continue; // skip over hidden windows (but never over main window)
 				}
 
-				const handle = (window as any).vscodeOriginalSetTimeout.apply(this, [handlerFn, timeout, ...args]);
+				// we track didClear in case the browser does not properly clear the timeout
+				// this can happen for timeouts on unfocused windows
+				let didClear = false;
+
+				const handle = (window as any).vscodeOriginalSetTimeout.apply(this, [(...args: unknown[]) => {
+					if (didClear) {
+						return;
+					}
+					handlerFn(...args);
+				}, timeout, ...args]);
 
 				const timeoutDisposable = toDisposable(() => {
+					didClear = true;
 					(window as any).vscodeOriginalClearTimeout(handle);
 					timeoutDisposables.delete(timeoutDisposable);
 				});
diff --git a/src/vs/workbench/browser/workbench.contribution.ts b/src/vs/workbench/browser/workbench.contribution.ts
index d83ac066c6e..bf162986ab6 100644
--- a/src/vs/workbench/browser/workbench.contribution.ts
+++ b/src/vs/workbench/browser/workbench.contribution.ts
@@ -295,7 +295,7 @@ const registry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Con
 			},
 			'workbench.editor.enablePreview': {
 				'type': 'boolean',
-				'description': localize('enablePreview', "Controls whether opened editors show as preview editors. Preview editors do not stay open, are reused until explicitly set to be kept open (via double-click or editing), and show file names in italics."),
+				'description': localize('enablePreview', "Controls whether preview mode is used when editors open. There is a maximum of one preview mode editor per editor group. This editor displays its filename in italics on its tab or title label and in the Open Editors view. Its contents will be replaced by the next editor opened in preview mode. Making a change in a preview mode editor will persist it, as will a double-click on its label, or the 'Keep Open' option in its label context menu. Opening a file from Explorer with a double-click persists its editor immediately."),
 				'default': true
 			},
 			'workbench.editor.enablePreviewFromQuickOpen': {
diff --git a/src/vs/workbench/browser/workbench.ts b/src/vs/workbench/browser/workbench.ts
index 5bdfb367e79..ffd74b2b723 100644
--- a/src/vs/workbench/browser/workbench.ts
+++ b/src/vs/workbench/browser/workbench.ts
@@ -50,6 +50,7 @@ import { AccessibilityProgressSignalScheduler } from 'vs/platform/accessibilityS
 import { setProgressAcccessibilitySignalScheduler } from 'vs/base/browser/ui/progressbar/progressAccessibilitySignal';
 import { AccessibleViewRegistry } from 'vs/platform/accessibility/browser/accessibleViewRegistry';
 import { NotificationAccessibleView } from 'vs/workbench/browser/parts/notifications/notificationAccessibleView';
+import { isESM } from 'vs/base/common/amd';
 
 export interface IWorkbenchOptions {
 
@@ -99,21 +100,20 @@ export class Workbench extends Layout {
 		setUnexpectedErrorHandler(error => this.handleUnexpectedError(error, logService));
 
 		// Inform user about loading issues from the loader
-		interface AnnotatedLoadingError extends Error {
-			phase: 'loading';
-			moduleId: string;
-			neededBy: string[];
-		}
-		interface AnnotatedFactoryError extends Error {
-			phase: 'factory';
-			moduleId: string;
-		}
-		interface AnnotatedValidationError extends Error {
-			phase: 'configuration';
-		}
-		type AnnotatedError = AnnotatedLoadingError | AnnotatedFactoryError | AnnotatedValidationError;
-
-		if (typeof mainWindow.require?.config === 'function') {
+		if (!isESM && typeof mainWindow.require?.config === 'function') {
+			interface AnnotatedLoadingError extends Error {
+				phase: 'loading';
+				moduleId: string;
+				neededBy: string[];
+			}
+			interface AnnotatedFactoryError extends Error {
+				phase: 'factory';
+				moduleId: string;
+			}
+			interface AnnotatedValidationError extends Error {
+				phase: 'configuration';
+			}
+			type AnnotatedError = AnnotatedLoadingError | AnnotatedFactoryError | AnnotatedValidationError;
 			mainWindow.require.config({
 				onError: (err: AnnotatedError) => {
 					if (err.phase === 'loading') {
diff --git a/src/vs/workbench/common/contextkeys.ts b/src/vs/workbench/common/contextkeys.ts
index 91376fb1e87..12b0a9da5f5 100644
--- a/src/vs/workbench/common/contextkeys.ts
+++ b/src/vs/workbench/common/contextkeys.ts
@@ -40,6 +40,11 @@ export const HasWebFileSystemAccess = new RawContextKey<boolean>('hasWebFileSyst
 
 export const EmbedderIdentifierContext = new RawContextKey<string | undefined>('embedderIdentifier', undefined, localize('embedderIdentifier', 'The identifier of the embedder according to the product service, if one is defined'));
 
+// --- Start PWB: disable file downloads ---
+export const IsEnabledFileDownloads = new RawContextKey<boolean>('isEnabledFileDownloads', true, true);
+export const IsEnabledFileUploads = new RawContextKey<boolean>('isEnabledFileUploads', true, true);
+// --- End PWB ---
+
 //#endregion
 
 
diff --git a/src/vs/workbench/common/views.ts b/src/vs/workbench/common/views.ts
index 498d313550a..be40f5f4ec8 100644
--- a/src/vs/workbench/common/views.ts
+++ b/src/vs/workbench/common/views.ts
@@ -845,8 +845,8 @@ export class NoTreeViewError extends Error {
 	constructor(treeViewId: string) {
 		super(localize('treeView.notRegistered', 'No tree view with id \'{0}\' registered.', treeViewId));
 	}
-	static is(err: Error): err is NoTreeViewError {
-		return err.name === 'NoTreeViewError';
+	static is(err: unknown): err is NoTreeViewError {
+		return !!err && (err as Error).name === 'NoTreeViewError';
 	}
 }
 
diff --git a/src/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration.ts b/src/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration.ts
index d5ae16134d6..25f14671a23 100644
--- a/src/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration.ts
+++ b/src/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration.ts
@@ -763,9 +763,15 @@ export class DynamicSpeechAccessibilityConfiguration extends Disposable implemen
 					'enumItemLabels': languagesSorted.map(key => languages[key].name)
 				},
 				[AccessibilityVoiceSettingId.AutoSynthesize]: {
-					'type': 'boolean',
+					'type': 'string',
+					'enum': ['on', 'off', 'auto'],
+					'enumDescriptions': [
+						localize('accessibility.voice.autoSynthesize.on', "Enable the feature. When a screen reader is enabled, note that this will disable aria updates."),
+						localize('accessibility.voice.autoSynthesize.off', "Disable the feature."),
+						localize('accessibility.voice.autoSynthesize.auto', "When a screen reader is detected, disable the feature. Otherwise, enable the feature.")
+					],
 					'markdownDescription': localize('autoSynthesize', "Whether a textual response should automatically be read out aloud when speech was used as input. For example in a chat session, a response is automatically synthesized when voice was used as chat request."),
-					'default': this.productService.quality !== 'stable', // TODO@bpasero decide on a default
+					'default': this.productService.quality !== 'stable' ? 'auto' : 'off', // TODO@bpasero decide on a default
 					'tags': ['accessibility']
 				}
 			}
@@ -813,14 +819,24 @@ Registry.as<IConfigurationMigrationRegistry>(WorkbenchExtensions.ConfigurationMi
 			const delayWarning = getDelaysFromConfig(accessor, 'warningAtPosition');
 			const volume = getVolumeFromConfig(accessor);
 			const debouncePositionChanges = getDebouncePositionChangesFromConfig(accessor);
-			return [
-				['accessibility.signalOptions.volume', { value: volume }],
-				['accessibility.signalOptions.debouncePositionChanges', { value: debouncePositionChanges }],
-				['accessibility.signalOptions.experimental.delays.general', { value: delayGeneral }],
-				['accessibility.signalOptions.experimental.delays.errorAtPosition', { value: delayError }],
-				['accessibility.signalOptions.experimental.delays.warningAtPosition', { value: delayWarning }],
-				['accessibility.signalOptions', { value: undefined }],
-			];
+			const result: [key: string, { value: any }][] = [];
+			if (!!volume) {
+				result.push(['accessibility.signalOptions.volume', { value: volume }]);
+			}
+			if (!!delayGeneral) {
+				result.push(['accessibility.signalOptions.experimental.delays.general', { value: delayGeneral }]);
+			}
+			if (!!delayError) {
+				result.push(['accessibility.signalOptions.experimental.delays.errorAtPosition', { value: delayError }]);
+			}
+			if (!!delayWarning) {
+				result.push(['accessibility.signalOptions.experimental.delays.warningAtPosition', { value: delayWarning }]);
+			}
+			if (!!debouncePositionChanges) {
+				result.push(['accessibility.signalOptions.debouncePositionChanges', { value: debouncePositionChanges }]);
+			}
+			result.push(['accessibility.signalOptions', { value: undefined }]);
+			return result;
 		}
 	}]);
 
@@ -859,6 +875,24 @@ function getDebouncePositionChangesFromConfig(accessor: (key: string) => any): n
 	return accessor('accessibility.signalOptions.debouncePositionChanges') || accessor('accessibility.signalOptions')?.debouncePositionChanges || accessor('accessibility.signals.debouncePositionChanges') || accessor('audioCues.debouncePositionChanges');
 }
 
+Registry.as<IConfigurationMigrationRegistry>(WorkbenchExtensions.ConfigurationMigration)
+	.registerConfigurationMigrations([{
+		key: AccessibilityVoiceSettingId.AutoSynthesize,
+		migrateFn: (value: boolean) => {
+			let newValue: string | undefined;
+			if (value === true) {
+				newValue = 'on';
+			} else if (value === false) {
+				newValue = 'off';
+			} else {
+				return [];
+			}
+			return [
+				[AccessibilityVoiceSettingId.AutoSynthesize, { value: newValue }],
+			];
+		}
+	}]);
+
 Registry.as<IConfigurationMigrationRegistry>(WorkbenchExtensions.ConfigurationMigration)
 	.registerConfigurationMigrations([{
 		key: 'accessibility.signals.chatResponsePending',
diff --git a/src/vs/workbench/contrib/accessibility/browser/accessibleView.ts b/src/vs/workbench/contrib/accessibility/browser/accessibleView.ts
index 1264b6b10d2..8af09f2604f 100644
--- a/src/vs/workbench/contrib/accessibility/browser/accessibleView.ts
+++ b/src/vs/workbench/contrib/accessibility/browser/accessibleView.ts
@@ -11,7 +11,7 @@ import { IAction } from 'vs/base/common/actions';
 import { Codicon } from 'vs/base/common/codicons';
 import { KeyCode } from 'vs/base/common/keyCodes';
 import { Disposable, DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
-import { marked } from 'vs/base/common/marked/marked';
+import * as marked from 'vs/base/common/marked/marked';
 import { isMacintosh, isWindows } from 'vs/base/common/platform';
 import { ThemeIcon } from 'vs/base/common/themables';
 import { URI } from 'vs/base/common/uri';
@@ -207,11 +207,17 @@ export class AccessibleView extends Disposable {
 		return this._editorWidget.getPosition() || undefined;
 	}
 
-	setPosition(position: Position, reveal?: boolean): void {
+	setPosition(position: Position, reveal?: boolean, select?: boolean): void {
 		this._editorWidget.setPosition(position);
 		if (reveal) {
 			this._editorWidget.revealPosition(position);
 		}
+		if (select) {
+			const lineLength = this._editorWidget.getModel()?.getLineLength(position.lineNumber) ?? 0;
+			if (lineLength) {
+				this._editorWidget.setSelection({ startLineNumber: position.lineNumber, startColumn: 1, endLineNumber: position.lineNumber, endColumn: lineLength + 1 });
+			}
+		}
 	}
 
 	getCodeBlockContext(): ICodeBlockActionContext | undefined {
@@ -386,7 +392,7 @@ export class AccessibleView extends Disposable {
 			// Symbols haven't been provided and we cannot parse this language
 			return;
 		}
-		const markdownTokens: marked.TokensList | undefined = marked.lexer(this._currentContent);
+		const markdownTokens: marked.TokensList | undefined = marked.marked.lexer(this._currentContent);
 		if (!markdownTokens) {
 			return;
 		}
@@ -408,26 +414,26 @@ export class AccessibleView extends Disposable {
 		if (!items) {
 			return;
 		}
-		const quickPick: IQuickPick<IQuickPickItem> = this._quickInputService.createQuickPick();
-		this._register(quickPick);
+		const disposables = this._register(new DisposableStore());
+		const quickPick: IQuickPick<IQuickPickItem> = disposables.add(this._quickInputService.createQuickPick());
 		quickPick.items = items;
 		quickPick.title = localize('keybindings', 'Configure keybindings');
 		quickPick.placeholder = localize('selectKeybinding', 'Select a command ID to configure a keybinding for it');
 		quickPick.show();
-		quickPick.onDidAccept(async () => {
+		disposables.add(quickPick.onDidAccept(async () => {
 			const item = quickPick.selectedItems[0];
 			if (item) {
 				await this._commandService.executeCommand('workbench.action.openGlobalKeybindings', item.id);
 			}
 			quickPick.dispose();
-		});
-		quickPick.onDidHide(() => {
+		}));
+		disposables.add(quickPick.onDidHide(() => {
 			if (!quickPick.selectedItems.length && provider) {
 				this.show(provider);
 			}
-			quickPick.dispose();
+			disposables.dispose();
 			this._inQuickPick = false;
-		});
+		}));
 	}
 
 	private _convertTokensToSymbols(tokens: marked.TokensList, symbols: IAccessibleViewSymbol[]): void {
@@ -442,12 +448,12 @@ export class AccessibleView extends Disposable {
 						label = token.text;
 						break;
 					case 'list': {
-						const firstItem = token.items?.[0];
+						const firstItem = (token as marked.Tokens.List).items[0];
 						if (!firstItem) {
 							break;
 						}
 						firstListItem = `- ${firstItem.text}`;
-						label = token.items?.map(i => i.text).join(', ');
+						label = (token as marked.Tokens.List).items.map(i => i.text).join(', ');
 						break;
 					}
 				}
@@ -897,12 +903,8 @@ export class AccessibleViewService extends Disposable implements IAccessibleView
 		const lastLine = this._accessibleView?.editorWidget.getModel()?.getLineCount();
 		return lastLine !== undefined && lastLine > 0 ? new Position(lastLine, 1) : undefined;
 	}
-	setPosition(position: Position, reveal?: boolean): void {
-		const editorWidget = this._accessibleView?.editorWidget;
-		editorWidget?.setPosition(position);
-		if (reveal) {
-			editorWidget?.revealLine(position.lineNumber);
-		}
+	setPosition(position: Position, reveal?: boolean, select?: boolean): void {
+		this._accessibleView?.setPosition(position, reveal, select);
 	}
 	getCodeBlockContext(): ICodeBlockActionContext | undefined {
 		return this._accessibleView?.getCodeBlockContext();
@@ -917,7 +919,8 @@ class AccessibleViewSymbolQuickPick {
 
 	}
 	show(provider: AccesibleViewContentProvider): void {
-		const quickPick = this._quickInputService.createQuickPick<IAccessibleViewSymbol>();
+		const disposables = new DisposableStore();
+		const quickPick = disposables.add(this._quickInputService.createQuickPick<IAccessibleViewSymbol>());
 		quickPick.placeholder = localize('accessibleViewSymbolQuickPickPlaceholder', "Type to search symbols");
 		quickPick.title = localize('accessibleViewSymbolQuickPickTitle', "Go to Symbol Accessible View");
 		const picks = [];
@@ -934,16 +937,17 @@ class AccessibleViewSymbolQuickPick {
 		quickPick.canSelectMany = false;
 		quickPick.items = symbols;
 		quickPick.show();
-		quickPick.onDidAccept(() => {
+		disposables.add(quickPick.onDidAccept(() => {
 			this._accessibleView.showSymbol(provider, quickPick.selectedItems[0]);
 			quickPick.hide();
-		});
-		quickPick.onDidHide(() => {
+		}));
+		disposables.add(quickPick.onDidHide(() => {
 			if (quickPick.selectedItems.length === 0) {
 				// this was escaped, so refocus the accessible view
 				this._accessibleView.show(provider);
 			}
-		});
+			disposables.dispose();
+		}));
 	}
 }
 
diff --git a/src/vs/workbench/contrib/accessibility/browser/accessibleViewActions.ts b/src/vs/workbench/contrib/accessibility/browser/accessibleViewActions.ts
index 67df062dfe0..c106847a0aa 100644
--- a/src/vs/workbench/contrib/accessibility/browser/accessibleViewActions.ts
+++ b/src/vs/workbench/contrib/accessibility/browser/accessibleViewActions.ts
@@ -14,7 +14,7 @@ import { AccessibilityCommandId } from 'vs/workbench/contrib/accessibility/commo
 import { accessibilityHelpIsShown, accessibleViewContainsCodeBlocks, accessibleViewCurrentProviderId, accessibleViewGoToSymbolSupported, accessibleViewHasAssignedKeybindings, accessibleViewHasUnassignedKeybindings, accessibleViewIsShown, accessibleViewSupportsNavigation, accessibleViewVerbosityEnabled } from 'vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
 import { AccessibleViewProviderId, IAccessibleViewService } from 'vs/platform/accessibility/browser/accessibleView';
 import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { InlineCompletionsController } from 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsController';
+import { InlineCompletionsController } from 'vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController';
 
 const accessibleViewMenu = {
 	id: MenuId.AccessibleView,
diff --git a/src/vs/workbench/contrib/accessibility/browser/accessibleViewKeybindingResolver.ts b/src/vs/workbench/contrib/accessibility/browser/accessibleViewKeybindingResolver.ts
index c9a2f4051eb..107f60f28ce 100644
--- a/src/vs/workbench/contrib/accessibility/browser/accessibleViewKeybindingResolver.ts
+++ b/src/vs/workbench/contrib/accessibility/browser/accessibleViewKeybindingResolver.ts
@@ -13,7 +13,7 @@ export function resolveContentAndKeybindingItems(keybindingService: IKeybindingS
 	}
 	const configureKeybindingItems: IPickerQuickAccessItem[] = [];
 	const configuredKeybindingItems: IPickerQuickAccessItem[] = [];
-	const matches = value.matchAll(/\<keybinding:(?<commandId>.*)\>/gm);
+	const matches = value.matchAll(/(\<keybinding:(?<commandId>[^\<]*)\>)/gm);
 	for (const match of [...matches]) {
 		const commandId = match?.groups?.commandId;
 		let kbLabel;
diff --git a/src/vs/workbench/contrib/accessibility/browser/editorAccessibilityHelp.ts b/src/vs/workbench/contrib/accessibility/browser/editorAccessibilityHelp.ts
index 3889a3add99..003ee0d115a 100644
--- a/src/vs/workbench/contrib/accessibility/browser/editorAccessibilityHelp.ts
+++ b/src/vs/workbench/contrib/accessibility/browser/editorAccessibilityHelp.ts
@@ -94,9 +94,14 @@ class EditorAccessibilityHelpProvider extends Disposable implements IAccessibleV
 		} else {
 			content.push(AccessibilityHelpNLS.tabFocusModeOffMsg);
 		}
-
+		content.push(AccessibilityHelpNLS.codeFolding);
+		content.push(AccessibilityHelpNLS.intellisense);
+		content.push(AccessibilityHelpNLS.showOrFocusHover);
+		content.push(AccessibilityHelpNLS.goToSymbol);
+		content.push(AccessibilityHelpNLS.startDebugging);
 		content.push(AccessibilityHelpNLS.setBreakpoint);
 		content.push(AccessibilityHelpNLS.debugExecuteSelection);
+		content.push(AccessibilityHelpNLS.addToWatch);
 		return content.join('\n');
 	}
 }
diff --git a/src/vs/workbench/contrib/accessibilitySignals/browser/commands.ts b/src/vs/workbench/contrib/accessibilitySignals/browser/commands.ts
index a20ca9f9dc9..d6e7f159db9 100644
--- a/src/vs/workbench/contrib/accessibilitySignals/browser/commands.ts
+++ b/src/vs/workbench/contrib/accessibilitySignals/browser/commands.ts
@@ -13,6 +13,7 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
 import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { IQuickInputService, IQuickPickItem } from 'vs/platform/quickinput/common/quickInput';
 import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
+import { DisposableStore } from 'vs/base/common/lifecycle';
 
 export class ShowSignalSoundHelp extends Action2 {
 	static readonly ID = 'signals.sounds.help';
@@ -44,10 +45,11 @@ export class ShowSignalSoundHelp extends Action2 {
 				alwaysVisible: true
 			}] : []
 		})).sort((a, b) => a.label.localeCompare(b.label));
-		const qp = quickInputService.createQuickPick<IQuickPickItem & { signal: AccessibilitySignal }>();
+		const disposables = new DisposableStore();
+		const qp = disposables.add(quickInputService.createQuickPick<IQuickPickItem & { signal: AccessibilitySignal }>());
 		qp.items = items;
 		qp.selectedItems = items.filter(i => accessibilitySignalService.isSoundEnabled(i.signal) || userGestureSignals.includes(i.signal) && configurationService.getValue(i.signal.settingsKey + '.sound') !== 'never');
-		qp.onDidAccept(() => {
+		disposables.add(qp.onDidAccept(() => {
 			const enabledSounds = qp.selectedItems.map(i => i.signal);
 			const disabledSounds = qp.items.map(i => (i as any).signal).filter(i => !enabledSounds.includes(i));
 			for (const signal of enabledSounds) {
@@ -67,13 +69,14 @@ export class ShowSignalSoundHelp extends Action2 {
 				configurationService.updateValue(signal.settingsKey, value);
 			}
 			qp.hide();
-		});
-		qp.onDidTriggerItemButton(e => {
+		}));
+		disposables.add(qp.onDidTriggerItemButton(e => {
 			preferencesService.openUserSettings({ jsonEditor: true, revealSetting: { key: e.item.signal.settingsKey, edit: true } });
-		});
-		qp.onDidChangeActive(() => {
+		}));
+		disposables.add(qp.onDidChangeActive(() => {
 			accessibilitySignalService.playSound(qp.activeItems[0].signal.sound.getSound(true), true, AcknowledgeDocCommentsToken);
-		});
+		}));
+		disposables.add(qp.onDidHide(() => disposables.dispose()));
 		qp.placeholder = localize('sounds.help.placeholder', 'Select a sound to play and configure');
 		qp.canSelectMany = true;
 		await qp.show();
@@ -114,11 +117,12 @@ export class ShowAccessibilityAnnouncementHelp extends Action2 {
 				alwaysVisible: true,
 			}] : []
 		})).sort((a, b) => a.label.localeCompare(b.label));
-		const qp = quickInputService.createQuickPick<IQuickPickItem & { signal: AccessibilitySignal }>();
+		const disposables = new DisposableStore();
+		const qp = disposables.add(quickInputService.createQuickPick<IQuickPickItem & { signal: AccessibilitySignal }>());
 		qp.items = items;
 		qp.selectedItems = items.filter(i => accessibilitySignalService.isAnnouncementEnabled(i.signal) || userGestureSignals.includes(i.signal) && configurationService.getValue(i.signal.settingsKey + '.announcement') !== 'never');
 		const screenReaderOptimized = accessibilityService.isScreenReaderOptimized();
-		qp.onDidAccept(() => {
+		disposables.add(qp.onDidAccept(() => {
 			if (!screenReaderOptimized) {
 				// announcements are off by default when screen reader is not active
 				qp.hide();
@@ -139,10 +143,11 @@ export class ShowAccessibilityAnnouncementHelp extends Action2 {
 				configurationService.updateValue(signal.settingsKey, value);
 			}
 			qp.hide();
-		});
-		qp.onDidTriggerItemButton(e => {
+		}));
+		disposables.add(qp.onDidTriggerItemButton(e => {
 			preferencesService.openUserSettings({ jsonEditor: true, revealSetting: { key: e.item.signal.settingsKey, edit: true } });
-		});
+		}));
+		disposables.add(qp.onDidHide(() => disposables.dispose()));
 		qp.placeholder = screenReaderOptimized ? localize('announcement.help.placeholder', 'Select an announcement to configure') : localize('announcement.help.placeholder.disabled', 'Screen reader is not active, announcements are disabled by default.');
 		qp.canSelectMany = true;
 		await qp.show();
diff --git a/src/vs/workbench/contrib/authentication/browser/actions/manageTrustedExtensionsForAccountAction.ts b/src/vs/workbench/contrib/authentication/browser/actions/manageTrustedExtensionsForAccountAction.ts
index 3c3d4b9aee1..1c205fd57ec 100644
--- a/src/vs/workbench/contrib/authentication/browser/actions/manageTrustedExtensionsForAccountAction.ts
+++ b/src/vs/workbench/contrib/authentication/browser/actions/manageTrustedExtensionsForAccountAction.ts
@@ -8,7 +8,7 @@ import { DisposableStore } from 'vs/base/common/lifecycle';
 import { localize, localize2 } from 'vs/nls';
 import { Action2 } from 'vs/platform/actions/common/actions';
 import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
+import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { IProductService } from 'vs/platform/product/common/productService';
 import { IQuickInputService, IQuickPickItem, IQuickPickSeparator } from 'vs/platform/quickinput/common/quickInput';
 import { IAuthenticationAccessService } from 'vs/workbench/services/authentication/browser/authenticationAccessService';
@@ -26,23 +26,51 @@ export class ManageTrustedExtensionsForAccountAction extends Action2 {
 		});
 	}
 
-	override async run(accessor: ServicesAccessor, options?: { providerId: string; accountLabel: string }): Promise<void> {
-		const productService = accessor.get(IProductService);
-		const extensionService = accessor.get(IExtensionService);
-		const dialogService = accessor.get(IDialogService);
-		const quickInputService = accessor.get(IQuickInputService);
-		const authenticationService = accessor.get(IAuthenticationService);
-		const authenticationUsageService = accessor.get(IAuthenticationUsageService);
-		const authenticationAccessService = accessor.get(IAuthenticationAccessService);
+	override run(accessor: ServicesAccessor, options?: { providerId: string; accountLabel: string }): Promise<void> {
+		const instantiationService = accessor.get(IInstantiationService);
+		return instantiationService.createInstance(ManageTrustedExtensionsForAccountActionImpl).run(options);
+	}
+}
 
-		let providerId = options?.providerId;
-		let accountLabel = options?.accountLabel;
+interface TrustedExtensionsQuickPickItem extends IQuickPickItem {
+	extension: AllowedExtension;
+	lastUsed?: number;
+}
 
+class ManageTrustedExtensionsForAccountActionImpl {
+	constructor(
+		@IProductService private readonly _productService: IProductService,
+		@IExtensionService private readonly _extensionService: IExtensionService,
+		@IDialogService private readonly _dialogService: IDialogService,
+		@IQuickInputService private readonly _quickInputService: IQuickInputService,
+		@IAuthenticationService private readonly _authenticationService: IAuthenticationService,
+		@IAuthenticationUsageService private readonly _authenticationUsageService: IAuthenticationUsageService,
+		@IAuthenticationAccessService private readonly _authenticationAccessService: IAuthenticationAccessService
+	) { }
+
+	async run(options?: { providerId: string; accountLabel: string }) {
+		const { providerId, accountLabel } = await this._resolveProviderAndAccountLabel(options?.providerId, options?.accountLabel);
+		if (!providerId || !accountLabel) {
+			return;
+		}
+
+		const items = await this._getItems(providerId, accountLabel);
+		if (!items.length) {
+			return;
+		}
+		const disposables = new DisposableStore();
+		const picker = this._createQuickPick(disposables, providerId, accountLabel);
+		picker.items = items;
+		picker.selectedItems = items.filter((i): i is TrustedExtensionsQuickPickItem => i.type !== 'separator' && !!i.picked);
+		picker.show();
+	}
+
+	private async _resolveProviderAndAccountLabel(providerId: string | undefined, accountLabel: string | undefined) {
 		if (!providerId || !accountLabel) {
 			const accounts = new Array<{ providerId: string; providerLabel: string; accountLabel: string }>();
-			for (const id of authenticationService.getProviderIds()) {
-				const providerLabel = authenticationService.getProvider(id).label;
-				const sessions = await authenticationService.getSessions(id);
+			for (const id of this._authenticationService.getProviderIds()) {
+				const providerLabel = this._authenticationService.getProvider(id).label;
+				const sessions = await this._authenticationService.getSessions(id);
 				const uniqueAccountLabels = new Set<string>();
 				for (const session of sessions) {
 					if (!uniqueAccountLabels.has(session.account.label)) {
@@ -52,7 +80,7 @@ export class ManageTrustedExtensionsForAccountAction extends Action2 {
 				}
 			}
 
-			const pick = await quickInputService.pick(
+			const pick = await this._quickInputService.pick(
 				accounts.map(account => ({
 					providerId: account.providerId,
 					label: account.accountLabel,
@@ -68,12 +96,15 @@ export class ManageTrustedExtensionsForAccountAction extends Action2 {
 				providerId = pick.providerId;
 				accountLabel = pick.label;
 			} else {
-				return;
+				return { providerId: undefined, accountLabel: undefined };
 			}
 		}
+		return { providerId, accountLabel };
+	}
 
-		const allowedExtensions = authenticationAccessService.readAllowedExtensions(providerId, accountLabel);
-		const trustedExtensionAuthAccess = productService.trustedExtensionAuthAccess;
+	private async _getItems(providerId: string, accountLabel: string) {
+		const allowedExtensions = this._authenticationAccessService.readAllowedExtensions(providerId, accountLabel);
+		const trustedExtensionAuthAccess = this._productService.trustedExtensionAuthAccess;
 		const trustedExtensionIds =
 			// Case 1: trustedExtensionAuthAccess is an array
 			Array.isArray(trustedExtensionAuthAccess)
@@ -86,7 +117,7 @@ export class ManageTrustedExtensionsForAccountAction extends Action2 {
 			const allowedExtension = allowedExtensions.find(ext => ext.id === extensionId);
 			if (!allowedExtension) {
 				// Add the extension to the allowedExtensions list
-				const extension = await extensionService.getExtension(extensionId);
+				const extension = await this._extensionService.getExtension(extensionId);
 				if (extension) {
 					allowedExtensions.push({
 						id: extensionId,
@@ -103,21 +134,11 @@ export class ManageTrustedExtensionsForAccountAction extends Action2 {
 		}
 
 		if (!allowedExtensions.length) {
-			dialogService.info(localize('noTrustedExtensions', "This account has not been used by any extensions."));
-			return;
+			this._dialogService.info(localize('noTrustedExtensions', "This account has not been used by any extensions."));
+			return [];
 		}
 
-		interface TrustedExtensionsQuickPickItem extends IQuickPickItem {
-			extension: AllowedExtension;
-			lastUsed?: number;
-		}
-
-		const disposableStore = new DisposableStore();
-		const quickPick = disposableStore.add(quickInputService.createQuickPick<TrustedExtensionsQuickPickItem>());
-		quickPick.canSelectMany = true;
-		quickPick.customButton = true;
-		quickPick.customLabel = localize('manageTrustedExtensions.cancel', 'Cancel');
-		const usages = authenticationUsageService.readAccountUsages(providerId, accountLabel);
+		const usages = this._authenticationUsageService.readAccountUsages(providerId, accountLabel);
 		const trustedExtensions = [];
 		const otherExtensions = [];
 		for (const extension of allowedExtensions) {
@@ -131,34 +152,43 @@ export class ManageTrustedExtensionsForAccountAction extends Action2 {
 		}
 
 		const sortByLastUsed = (a: AllowedExtension, b: AllowedExtension) => (b.lastUsed || 0) - (a.lastUsed || 0);
-		const toQuickPickItem = function (extension: AllowedExtension): IQuickPickItem & { extension: AllowedExtension } {
-			const lastUsed = extension.lastUsed;
-			const description = lastUsed
-				? localize({ key: 'accountLastUsedDate', comment: ['The placeholder {0} is a string with time information, such as "3 days ago"'] }, "Last used this account {0}", fromNow(lastUsed, true))
-				: localize('notUsed', "Has not used this account");
-			let tooltip: string | undefined;
-			let disabled: boolean | undefined;
-			if (extension.trusted) {
-				tooltip = localize('trustedExtensionTooltip', "This extension is trusted by Microsoft and\nalways has access to this account");
-				disabled = true;
-			}
-			return {
-				label: extension.name,
-				extension,
-				description,
-				tooltip,
-				disabled,
-				picked: extension.allowed === undefined || extension.allowed
-			};
-		};
-		const items: Array<TrustedExtensionsQuickPickItem | IQuickPickSeparator> = [
-			...otherExtensions.sort(sortByLastUsed).map(toQuickPickItem),
-			{ type: 'separator', label: localize('trustedExtensions', "Trusted by Microsoft") },
-			...trustedExtensions.sort(sortByLastUsed).map(toQuickPickItem)
+
+		const items = [
+			...otherExtensions.sort(sortByLastUsed).map(this._toQuickPickItem),
+			{ type: 'separator', label: localize('trustedExtensions', "Trusted by Microsoft") } satisfies IQuickPickSeparator,
+			...trustedExtensions.sort(sortByLastUsed).map(this._toQuickPickItem)
 		];
 
-		quickPick.items = items;
-		quickPick.selectedItems = items.filter((item): item is TrustedExtensionsQuickPickItem => item.type !== 'separator' && (item.extension.allowed === undefined || item.extension.allowed));
+		return items;
+	}
+
+	private _toQuickPickItem(extension: AllowedExtension): TrustedExtensionsQuickPickItem {
+		const lastUsed = extension.lastUsed;
+		const description = lastUsed
+			? localize({ key: 'accountLastUsedDate', comment: ['The placeholder {0} is a string with time information, such as "3 days ago"'] }, "Last used this account {0}", fromNow(lastUsed, true))
+			: localize('notUsed', "Has not used this account");
+		let tooltip: string | undefined;
+		let disabled: boolean | undefined;
+		if (extension.trusted) {
+			tooltip = localize('trustedExtensionTooltip', "This extension is trusted by Microsoft and\nalways has access to this account");
+			disabled = true;
+		}
+		return {
+			label: extension.name,
+			extension,
+			description,
+			tooltip,
+			disabled,
+			picked: extension.allowed === undefined || extension.allowed
+		};
+	}
+
+	private _createQuickPick(disposableStore: DisposableStore, providerId: string, accountLabel: string) {
+		const quickPick = disposableStore.add(this._quickInputService.createQuickPick<TrustedExtensionsQuickPickItem>({ useSeparators: true }));
+		quickPick.canSelectMany = true;
+		quickPick.customButton = true;
+		quickPick.customLabel = localize('manageTrustedExtensions.cancel', 'Cancel');
+
 		quickPick.title = localize('manageTrustedExtensions', "Manage Trusted Extensions");
 		quickPick.placeholder = localize('manageExtensions', "Choose which extensions can access this account");
 
@@ -171,7 +201,7 @@ export class ManageTrustedExtensionsForAccountAction extends Action2 {
 			updatedAllowedList.forEach(extension => {
 				extension.allowed = allowedExtensionsSet.has(extension);
 			});
-			authenticationAccessService.updateAllowedExtensions(providerId, accountLabel, updatedAllowedList);
+			this._authenticationAccessService.updateAllowedExtensions(providerId, accountLabel, updatedAllowedList);
 			quickPick.hide();
 		}));
 
@@ -182,8 +212,6 @@ export class ManageTrustedExtensionsForAccountAction extends Action2 {
 		disposableStore.add(quickPick.onDidCustom(() => {
 			quickPick.hide();
 		}));
-
-		quickPick.show();
+		return quickPick;
 	}
-
 }
diff --git a/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEditTree.ts b/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEditTree.ts
index e45a95008c3..45a97a0c67a 100644
--- a/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEditTree.ts
+++ b/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEditTree.ts
@@ -25,13 +25,11 @@ import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { ThemeIcon } from 'vs/base/common/themables';
 import { compare } from 'vs/base/common/strings';
 import { URI } from 'vs/base/common/uri';
-import { IUndoRedoService } from 'vs/platform/undoRedo/common/undoRedo';
 import { ResourceFileEdit } from 'vs/editor/browser/services/bulkEditService';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
-import { ILanguageService } from 'vs/editor/common/languages/language';
 import { PLAINTEXT_LANGUAGE_ID } from 'vs/editor/common/languages/modesRegistry';
 import { SnippetParser } from 'vs/editor/contrib/snippet/browser/snippetParser';
 import { AriaRole } from 'vs/base/browser/ui/aria/aria';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 
 // --- VIEW MODEL
 
@@ -202,9 +200,7 @@ export class BulkEditDataSource implements IAsyncDataSource<BulkFileOperations,
 
 	constructor(
 		@ITextModelService private readonly _textModelService: ITextModelService,
-		@IUndoRedoService private readonly _undoRedoService: IUndoRedoService,
-		@ILanguageService private readonly _languageService: ILanguageService,
-		@ILanguageConfigurationService private readonly _languageConfigurationService: ILanguageConfigurationService,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 	) { }
 
 	hasChildren(element: BulkFileOperations | BulkEditElement): boolean {
@@ -241,7 +237,7 @@ export class BulkEditDataSource implements IAsyncDataSource<BulkFileOperations,
 				textModel = ref.object.textEditorModel;
 				textModelDisposable = ref;
 			} catch {
-				textModel = new TextModel('', PLAINTEXT_LANGUAGE_ID, TextModel.DEFAULT_CREATION_OPTIONS, null, this._undoRedoService, this._languageService, this._languageConfigurationService);
+				textModel = this._instantiationService.createInstance(TextModel, '', PLAINTEXT_LANGUAGE_ID, TextModel.DEFAULT_CREATION_OPTIONS, null);
 				textModelDisposable = textModel;
 			}
 
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatAccessibilityHelp.ts b/src/vs/workbench/contrib/chat/browser/actions/chatAccessibilityHelp.ts
index afa69a96632..bbec346dd71 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatAccessibilityHelp.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatAccessibilityHelp.ts
@@ -40,11 +40,11 @@ export function getAccessibilityHelpText(type: 'panelChat' | 'inlineChat'): stri
 		content.push(localize('workbench.action.chat.focusInput', 'To focus the input box for chat requests, invoke the Focus Chat Input command{0}.', '<keybinding:workbench.action.chat.focusInput>'));
 		content.push(localize('workbench.action.chat.nextCodeBlock', 'To focus the next code block within a response, invoke the Chat: Next Code Block command{0}.', '<keybinding:workbench.action.chat.nextCodeBlock>'));
 		content.push(localize('workbench.action.chat.nextFileTree', 'To focus the next file tree within a response, invoke the Chat: Next File Tree command{0}.', '<keybinding:workbench.action.chat.nextFileTree>'));
-		content.push(localize('workbench.action.chat.clear', 'To clear the request/response list, invoke the Chat Clear command{0}.', '<keybinding:workbench.action.chat.clear>'));
+		content.push(localize('workbench.action.chat.newChat', 'To create a new chat session, invoke the New Chat command{0}.', '<keybinding:workbench.action.chat.new>'));
 	} else {
 		content.push(localize('inlineChat.overview', "Inline chat occurs within a code editor and takes into account the current selection. It is useful for making changes to the current editor. For example, fixing diagnostics, documenting or refactoring code. Keep in mind that AI generated code may be incorrect."));
 		content.push(localize('inlineChat.access', "It can be activated via code actions or directly using the command: Inline Chat: Start Inline Chat{0}.", '<keybinding:inlineChat.start>'));
-		content.push(localize('inlineChat.requestHistory', 'In the input box, use{0} and{1} to navigate your request history. Edit input and use enter or the submit button to run a new request.', '<keybinding:inlineChat.previousFromHistory>', '<keybinding:inlineChat.nextFromHistory>'));
+		content.push(localize('inlineChat.requestHistory', 'In the input box, use Show Previous{0} and Show Next{1} to navigate your request history. Edit input and use enter or the submit button to run a new request.', '<keybinding:history.showPrevious>', '<keybinding:history.showNext>'));
 		content.push(localize('inlineChat.inspectResponse', 'In the input box, inspect the response in the accessible view{0}.', '<keybinding:editor.action.accessibleView>'));
 		content.push(localize('inlineChat.contextActions', "Context menu actions may run a request prefixed with a /. Type / to discover such ready-made commands."));
 		content.push(localize('inlineChat.fix', "If a fix action is invoked, a response will indicate the problem with the current code. A diff editor will be rendered and can be reached by tabbing."));
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
index 29731511a13..d2e60118cdd 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
@@ -3,7 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { coalesce } from 'vs/base/common/arrays';
 import { Codicon } from 'vs/base/common/codicons';
+import { fromNowByDay } from 'vs/base/common/date';
 import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
 import { DisposableStore } from 'vs/base/common/lifecycle';
 import { ThemeIcon } from 'vs/base/common/themables';
@@ -14,14 +16,13 @@ import { Action2, MenuId, registerAction2 } from 'vs/platform/actions/common/act
 import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
 import { IsLinuxContext, IsWindowsContext } from 'vs/platform/contextkey/common/contextkeys';
 import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { IQuickInputButton, IQuickInputService, IQuickPickItem } from 'vs/platform/quickinput/common/quickInput';
+import { IQuickInputButton, IQuickInputService, IQuickPickItem, IQuickPickSeparator } from 'vs/platform/quickinput/common/quickInput';
 import { clearChatEditor } from 'vs/workbench/contrib/chat/browser/actions/chatClear';
 import { CHAT_VIEW_ID, IChatWidgetService, showChatView } from 'vs/workbench/contrib/chat/browser/chat';
 import { IChatEditorOptions } from 'vs/workbench/contrib/chat/browser/chatEditor';
 import { ChatEditorInput } from 'vs/workbench/contrib/chat/browser/chatEditorInput';
 import { ChatViewPane } from 'vs/workbench/contrib/chat/browser/chatViewPane';
-import { ChatAgentLocation } from 'vs/workbench/contrib/chat/common/chatAgents';
-import { CONTEXT_CHAT_ENABLED, CONTEXT_CHAT_INPUT_CURSOR_AT_TOP, CONTEXT_CHAT_LOCATION, CONTEXT_IN_CHAT_INPUT, CONTEXT_IN_CHAT_SESSION } from 'vs/workbench/contrib/chat/common/chatContextKeys';
+import { CONTEXT_CHAT_ENABLED, CONTEXT_CHAT_INPUT_CURSOR_AT_TOP, CONTEXT_IN_CHAT_INPUT, CONTEXT_IN_CHAT_SESSION } from 'vs/workbench/contrib/chat/common/chatContextKeys';
 import { IChatDetail, IChatService } from 'vs/workbench/contrib/chat/common/chatService';
 import { IChatRequestViewModel, IChatResponseViewModel, isRequestVM } from 'vs/workbench/contrib/chat/common/chatViewModel';
 import { IChatWidgetHistoryService } from 'vs/workbench/contrib/chat/common/chatWidgetHistoryService';
@@ -127,57 +128,91 @@ class ChatHistoryAction extends Action2 {
 		const viewsService = accessor.get(IViewsService);
 		const editorService = accessor.get(IEditorService);
 
-		const openInEditorButton: IQuickInputButton = {
-			iconClass: ThemeIcon.asClassName(Codicon.file),
-			tooltip: localize('interactiveSession.history.editor', "Open in Editor"),
-		};
-		const deleteButton: IQuickInputButton = {
-			iconClass: ThemeIcon.asClassName(Codicon.x),
-			tooltip: localize('interactiveSession.history.delete', "Delete"),
-		};
+		const showPicker = () => {
+			const openInEditorButton: IQuickInputButton = {
+				iconClass: ThemeIcon.asClassName(Codicon.file),
+				tooltip: localize('interactiveSession.history.editor', "Open in Editor"),
+			};
+			const deleteButton: IQuickInputButton = {
+				iconClass: ThemeIcon.asClassName(Codicon.x),
+				tooltip: localize('interactiveSession.history.delete', "Delete"),
+			};
+			const renameButton: IQuickInputButton = {
+				iconClass: ThemeIcon.asClassName(Codicon.pencil),
+				tooltip: localize('chat.history.rename', "Rename"),
+			};
 
-		interface IChatPickerItem extends IQuickPickItem {
-			chat: IChatDetail;
-		}
+			interface IChatPickerItem extends IQuickPickItem {
+				chat: IChatDetail;
+			}
 
-		const getPicks = () => {
-			const items = chatService.getHistory();
-			return items.map((i): IChatPickerItem => ({
-				label: i.title,
-				chat: i,
-				buttons: [
-					openInEditorButton,
-					deleteButton
-				]
-			}));
-		};
+			const getPicks = () => {
+				const items = chatService.getHistory();
+				items.sort((a, b) => (b.lastMessageDate ?? 0) - (a.lastMessageDate ?? 0));
 
-		const store = new DisposableStore();
-		const picker = store.add(quickInputService.createQuickPick<IChatPickerItem>());
-		picker.placeholder = localize('interactiveSession.history.pick', "Switch to chat");
-		picker.items = getPicks();
-		store.add(picker.onDidTriggerItemButton(context => {
-			if (context.button === openInEditorButton) {
-				editorService.openEditor({ resource: ChatEditorInput.getNewEditorUri(), options: <IChatEditorOptions>{ target: { sessionId: context.item.chat.sessionId }, pinned: true } }, ACTIVE_GROUP);
-				picker.hide();
-			} else if (context.button === deleteButton) {
-				chatService.removeHistoryEntry(context.item.chat.sessionId);
-				picker.items = getPicks();
-			}
-		}));
-		store.add(picker.onDidAccept(async () => {
-			try {
-				const item = picker.selectedItems[0];
-				const sessionId = item.chat.sessionId;
-				const view = await viewsService.openView(CHAT_VIEW_ID) as ChatViewPane;
-				view.loadSession(sessionId);
-			} finally {
-				picker.hide();
-			}
-		}));
-		store.add(picker.onDidHide(() => store.dispose()));
+				let lastDate: string | undefined = undefined;
+				const picks = items.flatMap((i): [IQuickPickSeparator | undefined, IChatPickerItem] => {
+					const timeAgoStr = fromNowByDay(i.lastMessageDate, true, true);
+					const separator: IQuickPickSeparator | undefined = timeAgoStr !== lastDate ? {
+						type: 'separator', label: timeAgoStr,
+					} : undefined;
+					lastDate = timeAgoStr;
+					return [
+						separator,
+						{
+							label: i.title,
+							description: i.isActive ? `(${localize('currentChatLabel', 'current')})` : '',
+							chat: i,
+							buttons: i.isActive ? [renameButton] : [
+								renameButton,
+								openInEditorButton,
+								deleteButton,
+							]
+						}
+					];
+				});
 
-		picker.show();
+				return coalesce(picks);
+			};
+
+			const store = new DisposableStore();
+			const picker = store.add(quickInputService.createQuickPick<IChatPickerItem>({ useSeparators: true }));
+			picker.placeholder = localize('interactiveSession.history.pick', "Switch to chat");
+			const picks = getPicks();
+			picker.items = picks;
+			store.add(picker.onDidTriggerItemButton(async context => {
+				if (context.button === openInEditorButton) {
+					const options: IChatEditorOptions = { target: { sessionId: context.item.chat.sessionId }, pinned: true };
+					editorService.openEditor({ resource: ChatEditorInput.getNewEditorUri(), options }, ACTIVE_GROUP);
+					picker.hide();
+				} else if (context.button === deleteButton) {
+					chatService.removeHistoryEntry(context.item.chat.sessionId);
+					picker.items = getPicks();
+				} else if (context.button === renameButton) {
+					const title = await quickInputService.input({ title: localize('newChatTitle', "New chat title"), value: context.item.chat.title });
+					if (title) {
+						chatService.setChatSessionTitle(context.item.chat.sessionId, title);
+					}
+
+					// The quick input hides the picker, it gets disposed, so we kick it off from scratch
+					showPicker();
+				}
+			}));
+			store.add(picker.onDidAccept(async () => {
+				try {
+					const item = picker.selectedItems[0];
+					const sessionId = item.chat.sessionId;
+					const view = await viewsService.openView(CHAT_VIEW_ID) as ChatViewPane;
+					view.loadSession(sessionId);
+				} finally {
+					picker.hide();
+				}
+			}));
+			store.add(picker.onDidHide(() => store.dispose()));
+
+			picker.show();
+		};
+		showPicker();
 	}
 }
 
@@ -258,7 +293,7 @@ export function registerChatActions() {
 			super({
 				id: 'chat.action.focus',
 				title: localize2('actions.interactiveSession.focus', 'Focus Chat List'),
-				precondition: ContextKeyExpr.and(CONTEXT_IN_CHAT_INPUT, CONTEXT_CHAT_LOCATION.isEqualTo(ChatAgentLocation.Panel)),
+				precondition: ContextKeyExpr.and(CONTEXT_IN_CHAT_INPUT),
 				category: CHAT_CATEGORY,
 				keybinding: [
 					// On mac, require that the cursor is at the top of the input, to avoid stealing cmd+up to move the cursor to the top
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatCodeblockActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatCodeblockActions.ts
index 0034369dcdf..8aab036d59e 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatCodeblockActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatCodeblockActions.ts
@@ -6,13 +6,14 @@
 import { CancellationTokenSource } from 'vs/base/common/cancellation';
 import { Codicon } from 'vs/base/common/codicons';
 import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
+import { isEqual } from 'vs/base/common/resources';
 import { IActiveCodeEditor, ICodeEditor, isCodeEditor, isDiffEditor } from 'vs/editor/browser/editorBrowser';
 import { ServicesAccessor } from 'vs/editor/browser/editorExtensions';
-import { IBulkEditService, ResourceEdit, ResourceTextEdit } from 'vs/editor/browser/services/bulkEditService';
+import { IBulkEditService, ResourceTextEdit } from 'vs/editor/browser/services/bulkEditService';
 import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
 import { Range } from 'vs/editor/common/core/range';
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { DocumentContextItem, WorkspaceEdit } from 'vs/editor/common/languages';
+import { DocumentContextItem, IWorkspaceFileEdit, IWorkspaceTextEdit } from 'vs/editor/common/languages';
 import { ILanguageService } from 'vs/editor/common/languages/language';
 import { ITextModel } from 'vs/editor/common/model';
 import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
@@ -42,6 +43,9 @@ import { IEditorService } from 'vs/workbench/services/editor/common/editorServic
 import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
 import * as strings from 'vs/base/common/strings';
 import { CharCode } from 'vs/base/common/charCode';
+import { InlineChatController } from 'vs/workbench/contrib/inlineChat/browser/inlineChatController';
+import { coalesce } from 'vs/base/common/arrays';
+import { AsyncIterableObject } from 'vs/base/common/async';
 
 export interface IChatCodeBlockActionContext extends ICodeBlockActionContext {
 	element: IChatResponseViewModel;
@@ -85,6 +89,11 @@ abstract class ChatCodeBlockAction extends Action2 {
 	abstract runWithContext(accessor: ServicesAccessor, context: ICodeBlockActionContext): any;
 }
 
+interface IComputeEditsResult {
+	readonly edits: Array<IWorkspaceTextEdit | IWorkspaceFileEdit>;
+	readonly codeMapper?: string;
+}
+
 abstract class InsertCodeBlockAction extends ChatCodeBlockAction {
 
 	override async runWithContext(accessor: ServicesAccessor, context: ICodeBlockActionContext) {
@@ -140,35 +149,74 @@ abstract class InsertCodeBlockAction extends ChatCodeBlockAction {
 		}
 
 		const languageService = accessor.get(ILanguageService);
+		const chatService = accessor.get(IChatService);
+
 		const focusRange = notebookEditor.getFocus();
 		const next = Math.max(focusRange.end - 1, 0);
 		insertCell(languageService, notebookEditor, next, CellKind.Code, 'below', context.code, true);
-		this.notifyUserAction(accessor, context);
+		this.notifyUserAction(chatService, context);
 	}
 
-	protected async computeEdits(accessor: ServicesAccessor, codeEditor: IActiveCodeEditor, codeBlockActionContext: ICodeBlockActionContext): Promise<ResourceEdit[] | WorkspaceEdit> {
+	protected async computeEdits(accessor: ServicesAccessor, codeEditor: IActiveCodeEditor, codeBlockActionContext: ICodeBlockActionContext): Promise<IComputeEditsResult> {
 		const activeModel = codeEditor.getModel();
 		const range = codeEditor.getSelection() ?? new Range(activeModel.getLineCount(), 1, activeModel.getLineCount(), 1);
 		const text = reindent(codeBlockActionContext.code, activeModel, range.startLineNumber);
-		return [new ResourceTextEdit(activeModel.uri, { range, text })];
+		return { edits: [new ResourceTextEdit(activeModel.uri, { range, text })] };
+	}
+
+	protected get showPreview() {
+		return false;
 	}
 
 	private async handleTextEditor(accessor: ServicesAccessor, codeEditor: IActiveCodeEditor, codeBlockActionContext: ICodeBlockActionContext) {
 		const bulkEditService = accessor.get(IBulkEditService);
 		const codeEditorService = accessor.get(ICodeEditorService);
+		const chatService = accessor.get(IChatService);
 
-		this.notifyUserAction(accessor, codeBlockActionContext);
-		const activeModel = codeEditor.getModel();
+		const result = await this.computeEdits(accessor, codeEditor, codeBlockActionContext);
+		this.notifyUserAction(chatService, codeBlockActionContext, result);
 
-		const mappedEdits = await this.computeEdits(accessor, codeEditor, codeBlockActionContext);
+		if (this.showPreview) {
+			const showWithPreview = await this.applyWithInlinePreview(codeEditorService, result.edits, codeEditor);
+			if (!showWithPreview) {
+				await bulkEditService.apply(result.edits, { showPreview: true });
+				const activeModel = codeEditor.getModel();
+				codeEditorService.listCodeEditors().find(editor => editor.getModel()?.uri.toString() === activeModel.uri.toString())?.focus();
+			}
+		} else {
+			await bulkEditService.apply(result.edits);
+			const activeModel = codeEditor.getModel();
+			codeEditorService.listCodeEditors().find(editor => editor.getModel()?.uri.toString() === activeModel.uri.toString())?.focus();
+		}
+	}
 
-		await bulkEditService.apply(mappedEdits);
-		codeEditorService.listCodeEditors().find(editor => editor.getModel()?.uri.toString() === activeModel.uri.toString())?.focus();
+	private async applyWithInlinePreview(codeEditorService: ICodeEditorService, edits: Array<IWorkspaceTextEdit | IWorkspaceFileEdit>, codeEditor: IActiveCodeEditor) {
+		const firstEdit = edits[0];
+		if (!ResourceTextEdit.is(firstEdit)) {
+			return false;
+		}
+		const resource = firstEdit.resource;
+		const textEdits = coalesce(edits.map(edit => ResourceTextEdit.is(edit) && isEqual(resource, edit.resource) ? edit.textEdit : undefined));
+		if (textEdits.length !== edits.length) { // more than one file has changed
+			return false;
+		}
+		const editorToApply = await codeEditorService.openCodeEditor({ resource }, codeEditor);
+		if (editorToApply) {
+			const inlineChatController = InlineChatController.get(editorToApply);
+			if (inlineChatController) {
+				const cancellationTokenSource = new CancellationTokenSource();
+				try {
+					return await inlineChatController.reviewEdits(textEdits[0].range, AsyncIterableObject.fromArray(textEdits), cancellationTokenSource.token);
+				} finally {
+					cancellationTokenSource.dispose();
+				}
+			}
+		}
+		return false;
 	}
 
-	private notifyUserAction(accessor: ServicesAccessor, context: ICodeBlockActionContext) {
+	private notifyUserAction(chatService: IChatService, context: ICodeBlockActionContext, result?: IComputeEditsResult) {
 		if (isResponseVM(context.element)) {
-			const chatService = accessor.get(IChatService);
 			chatService.notifyUserAction({
 				agentId: context.element.agent?.id,
 				command: context.element.slashCommand?.name,
@@ -179,6 +227,8 @@ abstract class InsertCodeBlockAction extends ChatCodeBlockAction {
 					kind: 'insert',
 					codeBlockIndex: context.codeBlockIndex,
 					totalCharacters: context.code.length,
+					userAction: this.desc.id,
+					codeMapper: result?.codeMapper,
 				}
 			});
 		}
@@ -371,7 +421,7 @@ export function registerChatCodeBlockActions() {
 			});
 		}
 
-		protected override async computeEdits(accessor: ServicesAccessor, codeEditor: IActiveCodeEditor, codeBlockActionContext: ICodeBlockActionContext): Promise<ResourceEdit[] | WorkspaceEdit> {
+		protected override async computeEdits(accessor: ServicesAccessor, codeEditor: IActiveCodeEditor, codeBlockActionContext: ICodeBlockActionContext): Promise<IComputeEditsResult> {
 
 			const progressService = accessor.get(IProgressService);
 			const notificationService = accessor.get(INotificationService);
@@ -404,7 +454,7 @@ export function registerChatCodeBlockActions() {
 
 				const cancellationTokenSource = new CancellationTokenSource();
 				try {
-					const edits = await progressService.withProgress(
+					const edits = await progressService.withProgress<IComputeEditsResult | undefined>(
 						{ location: ProgressLocation.Notification, delay: 500, sticky: true, cancellable: true },
 						async progress => {
 							for (const provider of mappedEditsProviders) {
@@ -416,7 +466,7 @@ export function registerChatCodeBlockActions() {
 									cancellationTokenSource.token
 								);
 								if (mappedEdits) {
-									return mappedEdits;
+									return { edits: mappedEdits.edits, codeMapper: provider.displayName };
 								}
 							}
 							return undefined;
@@ -436,6 +486,11 @@ export function registerChatCodeBlockActions() {
 			// fall back to inserting the code block as is
 			return super.computeEdits(accessor, codeEditor, codeBlockActionContext);
 		}
+
+		protected override get showPreview() {
+			return true;
+		}
+
 	});
 
 	registerAction2(class SmartApplyInEditorAction extends InsertCodeBlockAction {
@@ -503,7 +558,8 @@ export function registerChatCodeBlockActions() {
 						kind: 'insert',
 						codeBlockIndex: context.codeBlockIndex,
 						totalCharacters: context.code.length,
-						newFile: true
+						newFile: true,
+						userAction: this.desc.id,
 					}
 				});
 			}
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
index 0f65c731173..8126b4fd32f 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
@@ -23,10 +23,11 @@ import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegis
 import { AnythingQuickAccessProviderRunOptions } from 'vs/platform/quickinput/common/quickAccess';
 import { IQuickInputService, IQuickPickItem, QuickPickItem } from 'vs/platform/quickinput/common/quickInput';
 import { CHAT_CATEGORY } from 'vs/workbench/contrib/chat/browser/actions/chatActions';
-import { IChatWidget, IChatWidgetService } from 'vs/workbench/contrib/chat/browser/chat';
+import { IChatWidget, IChatWidgetService, IQuickChatService } from 'vs/workbench/contrib/chat/browser/chat';
+import { isQuickChat } from 'vs/workbench/contrib/chat/browser/chatWidget';
 import { ChatContextAttachments } from 'vs/workbench/contrib/chat/browser/contrib/chatContextAttachments';
 import { ChatAgentLocation, IChatAgentService } from 'vs/workbench/contrib/chat/common/chatAgents';
-import { CONTEXT_CHAT_LOCATION, CONTEXT_IN_CHAT_INPUT, CONTEXT_IN_QUICK_CHAT } from 'vs/workbench/contrib/chat/common/chatContextKeys';
+import { CONTEXT_CHAT_LOCATION, CONTEXT_IN_CHAT_INPUT } from 'vs/workbench/contrib/chat/common/chatContextKeys';
 import { IChatRequestVariableEntry } from 'vs/workbench/contrib/chat/common/chatModel';
 import { ChatRequestAgentPart } from 'vs/workbench/contrib/chat/common/chatParserTypes';
 import { IChatVariablesService } from 'vs/workbench/contrib/chat/common/chatVariables';
@@ -68,6 +69,7 @@ export interface IToolQuickPickItem extends IQuickPickItem {
 	kind: 'tool';
 	id: string;
 	name?: string;
+	icon?: ThemeIcon;
 }
 
 export interface IStaticVariableQuickPickItem extends IQuickPickItem {
@@ -147,7 +149,7 @@ class AttachContextAction extends Action2 {
 
 	// used to enable/disable the keybinding and defined menu containment
 	private static _cdt = ContextKeyExpr.or(
-		ContextKeyExpr.and(CONTEXT_CHAT_LOCATION.isEqualTo(ChatAgentLocation.Panel), CONTEXT_IN_QUICK_CHAT.isEqualTo(false)),
+		ContextKeyExpr.and(CONTEXT_CHAT_LOCATION.isEqualTo(ChatAgentLocation.Panel)),
 		ContextKeyExpr.and(CONTEXT_CHAT_LOCATION.isEqualTo(ChatAgentLocation.Editor), ContextKeyExpr.equals('config.chat.experimental.variables.editor', true)),
 		ContextKeyExpr.and(CONTEXT_CHAT_LOCATION.isEqualTo(ChatAgentLocation.Notebook), ContextKeyExpr.equals('config.chat.experimental.variables.notebook', true)),
 		ContextKeyExpr.and(CONTEXT_CHAT_LOCATION.isEqualTo(ChatAgentLocation.Terminal), ContextKeyExpr.equals('config.chat.experimental.variables.terminal', true)),
@@ -240,6 +242,7 @@ class AttachContextAction extends Action2 {
 					name: pick.label,
 					fullName: pick.label,
 					value: undefined,
+					icon: pick.icon,
 					isTool: true
 				});
 			} else {
@@ -266,6 +269,7 @@ class AttachContextAction extends Action2 {
 		const commandService = accessor.get(ICommandService);
 		const widgetService = accessor.get(IChatWidgetService);
 		const languageModelToolsService = accessor.get(ILanguageModelToolsService);
+		const quickChatService = accessor.get(IQuickChatService);
 		const context: { widget?: IChatWidget } | undefined = args[0];
 		const widget = context?.widget ?? widgetService.lastFocusedWidget;
 		if (!widget) {
@@ -308,20 +312,23 @@ class AttachContextAction extends Action2 {
 			}
 		}
 
-		for (const tool of languageModelToolsService.getTools()) {
-			if (tool.canBeInvokedManually) {
-				const item: IToolQuickPickItem = {
-					kind: 'tool',
-					label: tool.displayName ?? tool.name,
-					id: tool.name,
-				};
-				if (ThemeIcon.isThemeIcon(tool.icon)) {
-					item.iconClass = ThemeIcon.asClassName(tool.icon);
-				} else if (tool.icon) {
-					item.iconPath = tool.icon;
-				}
+		if (!usedAgent || usedAgent.agent.supportsToolReferences) {
+			for (const tool of languageModelToolsService.getTools()) {
+				if (tool.canBeInvokedManually) {
+					const item: IToolQuickPickItem = {
+						kind: 'tool',
+						label: tool.displayName ?? tool.name ?? '',
+						id: tool.id,
+						icon: ThemeIcon.isThemeIcon(tool.icon) ? tool.icon : undefined // TODO need to support icon path?
+					};
+					if (ThemeIcon.isThemeIcon(tool.icon)) {
+						item.iconClass = ThemeIcon.asClassName(tool.icon);
+					} else if (tool.icon) {
+						item.iconPath = tool.icon;
+					}
 
-				quickPickItems.push(item);
+					quickPickItems.push(item);
+				}
 			}
 		}
 
@@ -340,7 +347,7 @@ class AttachContextAction extends Action2 {
 			return match ? match[1] : label;
 		}
 
-		this._show(quickInputService, commandService, widget, quickPickItems.sort(function (a, b) {
+		this._show(quickInputService, commandService, widget, quickChatService, quickPickItems.sort(function (a, b) {
 
 			const first = extractTextFromIconLabel(a.label).toUpperCase();
 			const second = extractTextFromIconLabel(b.label).toUpperCase();
@@ -349,7 +356,7 @@ class AttachContextAction extends Action2 {
 		}));
 	}
 
-	private _show(quickInputService: IQuickInputService, commandService: ICommandService, widget: IChatWidget, quickPickItems: (IChatContextQuickPickItem | QuickPickItem)[], query: string = '') {
+	private _show(quickInputService: IQuickInputService, commandService: ICommandService, widget: IChatWidget, quickChatService: IQuickChatService, quickPickItems: (IChatContextQuickPickItem | QuickPickItem)[], query: string = '') {
 
 		quickInputService.quickAccess.show(query, {
 			enabledProviderPrefixes: [
@@ -361,9 +368,12 @@ class AttachContextAction extends Action2 {
 			providerOptions: <AnythingQuickAccessProviderRunOptions>{
 				handleAccept: (item: IChatContextQuickPickItem) => {
 					if ('prefix' in item) {
-						this._show(quickInputService, commandService, widget, quickPickItems, item.prefix);
+						this._show(quickInputService, commandService, widget, quickChatService, quickPickItems, item.prefix);
 					} else {
 						this._attachContext(widget, commandService, item);
+						if (isQuickChat(widget)) {
+							quickChatService.open();
+						}
 					}
 				},
 				additionPicks: quickPickItems,
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatImportExport.ts b/src/vs/workbench/contrib/chat/browser/actions/chatImportExport.ts
index b4d1afffad3..977cf2f7a14 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatImportExport.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatImportExport.ts
@@ -96,7 +96,8 @@ export function registerChatExportActions() {
 					throw new Error('Invalid chat session data');
 				}
 
-				await editorService.openEditor({ resource: ChatEditorInput.getNewEditorUri(), options: { target: { data }, pinned: true } as IChatEditorOptions });
+				const options: IChatEditorOptions = { target: { data }, pinned: true };
+				await editorService.openEditor({ resource: ChatEditorInput.getNewEditorUri(), options });
 			} catch (err) {
 				throw err;
 			}
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatMoveActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatMoveActions.ts
index d04e49d6218..0f960b81e71 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatMoveActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatMoveActions.ts
@@ -96,7 +96,7 @@ async function executeMoveToAction(accessor: ServicesAccessor, moveTo: MoveToNew
 
 	const widget = chatView?.widget ?? widgetService.lastFocusedWidget;
 	if (!widget || !('viewId' in widget.viewContext)) {
-		await editorService.openEditor({ resource: ChatEditorInput.getNewEditorUri(), options: <IChatEditorOptions>{ pinned: true } }, moveTo === MoveToNewLocation.Window ? AUX_WINDOW_GROUP : ACTIVE_GROUP);
+		await editorService.openEditor({ resource: ChatEditorInput.getNewEditorUri(), options: { pinned: true } }, moveTo === MoveToNewLocation.Window ? AUX_WINDOW_GROUP : ACTIVE_GROUP);
 		return;
 	}
 
@@ -109,7 +109,8 @@ async function executeMoveToAction(accessor: ServicesAccessor, moveTo: MoveToNew
 	const viewState = widget.getViewState();
 	widget.clear();
 
-	await editorService.openEditor({ resource: ChatEditorInput.getNewEditorUri(), options: <IChatEditorOptions>{ target: { sessionId }, pinned: true, viewState: viewState } }, moveTo === MoveToNewLocation.Window ? AUX_WINDOW_GROUP : ACTIVE_GROUP);
+	const options: IChatEditorOptions = { target: { sessionId }, pinned: true, viewState: viewState };
+	await editorService.openEditor({ resource: ChatEditorInput.getNewEditorUri(), options }, moveTo === MoveToNewLocation.Window ? AUX_WINDOW_GROUP : ACTIVE_GROUP);
 }
 
 async function moveToSidebar(accessor: ServicesAccessor): Promise<void> {
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatTitleActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatTitleActions.ts
index 9338bf5b51b..9b144077a7f 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatTitleActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatTitleActions.ts
@@ -15,14 +15,17 @@ import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegis
 import { ResourceNotebookCellEdit } from 'vs/workbench/contrib/bulkEdit/browser/bulkCellEdits';
 import { CHAT_CATEGORY } from 'vs/workbench/contrib/chat/browser/actions/chatActions';
 import { IChatWidgetService } from 'vs/workbench/contrib/chat/browser/chat';
-import { CONTEXT_CHAT_RESPONSE_SUPPORT_ISSUE_REPORTING, CONTEXT_IN_CHAT_INPUT, CONTEXT_IN_CHAT_SESSION, CONTEXT_REQUEST, CONTEXT_RESPONSE, CONTEXT_RESPONSE_FILTERED, CONTEXT_RESPONSE_VOTE } from 'vs/workbench/contrib/chat/common/chatContextKeys';
-import { IChatService, ChatAgentVoteDirection } from 'vs/workbench/contrib/chat/common/chatService';
+import { CONTEXT_CHAT_RESPONSE_SUPPORT_ISSUE_REPORTING, CONTEXT_IN_CHAT_INPUT, CONTEXT_IN_CHAT_SESSION, CONTEXT_REQUEST, CONTEXT_RESPONSE, CONTEXT_RESPONSE_ERROR, CONTEXT_RESPONSE_FILTERED, CONTEXT_RESPONSE_VOTE, CONTEXT_VOTE_UP_ENABLED } from 'vs/workbench/contrib/chat/common/chatContextKeys';
+import { IChatService, ChatAgentVoteDirection, ChatAgentVoteDownReason } from 'vs/workbench/contrib/chat/common/chatService';
 import { isRequestVM, isResponseVM } from 'vs/workbench/contrib/chat/common/chatViewModel';
+import { MENU_INLINE_CHAT_WIDGET_SECONDARY } from 'vs/workbench/contrib/inlineChat/common/inlineChat';
 import { INotebookEditor } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { CellEditType, CellKind, NOTEBOOK_EDITOR_ID } from 'vs/workbench/contrib/notebook/common/notebookCommon';
 import { NOTEBOOK_IS_ACTIVE_EDITOR } from 'vs/workbench/contrib/notebook/common/notebookContextKeys';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 
+export const MarkUnhelpfulActionId = 'workbench.action.chat.markUnhelpful';
+
 export function registerChatTitleActions() {
 	registerAction2(class MarkHelpfulAction extends Action2 {
 		constructor() {
@@ -33,12 +36,17 @@ export function registerChatTitleActions() {
 				category: CHAT_CATEGORY,
 				icon: Codicon.thumbsup,
 				toggled: CONTEXT_RESPONSE_VOTE.isEqualTo('up'),
-				menu: {
+				menu: [{
 					id: MenuId.ChatMessageTitle,
 					group: 'navigation',
 					order: 1,
-					when: CONTEXT_RESPONSE
-				}
+					when: ContextKeyExpr.and(CONTEXT_RESPONSE, CONTEXT_VOTE_UP_ENABLED, CONTEXT_RESPONSE_ERROR.negate())
+				}, {
+					id: MENU_INLINE_CHAT_WIDGET_SECONDARY,
+					group: 'navigation',
+					order: 1,
+					when: ContextKeyExpr.and(CONTEXT_RESPONSE, CONTEXT_VOTE_UP_ENABLED, CONTEXT_RESPONSE_ERROR.negate())
+				}]
 			});
 		}
 
@@ -58,27 +66,34 @@ export function registerChatTitleActions() {
 				action: {
 					kind: 'vote',
 					direction: ChatAgentVoteDirection.Up,
+					reason: undefined
 				}
 			});
 			item.setVote(ChatAgentVoteDirection.Up);
+			item.setVoteDownReason(undefined);
 		}
 	});
 
 	registerAction2(class MarkUnhelpfulAction extends Action2 {
 		constructor() {
 			super({
-				id: 'workbench.action.chat.markUnhelpful',
+				id: MarkUnhelpfulActionId,
 				title: localize2('interactive.unhelpful.label', "Unhelpful"),
 				f1: false,
 				category: CHAT_CATEGORY,
 				icon: Codicon.thumbsdown,
 				toggled: CONTEXT_RESPONSE_VOTE.isEqualTo('down'),
-				menu: {
+				menu: [{
 					id: MenuId.ChatMessageTitle,
 					group: 'navigation',
 					order: 2,
-					when: CONTEXT_RESPONSE
-				}
+					when: ContextKeyExpr.and(CONTEXT_RESPONSE, CONTEXT_RESPONSE_ERROR.negate())
+				}, {
+					id: MENU_INLINE_CHAT_WIDGET_SECONDARY,
+					group: 'navigation',
+					order: 2,
+					when: ContextKeyExpr.and(CONTEXT_RESPONSE, CONTEXT_RESPONSE_ERROR.negate())
+				}]
 			});
 		}
 
@@ -88,6 +103,14 @@ export function registerChatTitleActions() {
 				return;
 			}
 
+			const reason = args[1];
+			if (typeof reason !== 'string') {
+				return;
+			}
+
+			item.setVote(ChatAgentVoteDirection.Down);
+			item.setVoteDownReason(reason as ChatAgentVoteDownReason);
+
 			const chatService = accessor.get(IChatService);
 			chatService.notifyUserAction({
 				agentId: item.agent?.id,
@@ -98,9 +121,9 @@ export function registerChatTitleActions() {
 				action: {
 					kind: 'vote',
 					direction: ChatAgentVoteDirection.Down,
+					reason: item.voteDownReason
 				}
 			});
-			item.setVote(ChatAgentVoteDirection.Down);
 		}
 	});
 
@@ -112,12 +135,17 @@ export function registerChatTitleActions() {
 				f1: false,
 				category: CHAT_CATEGORY,
 				icon: Codicon.report,
-				menu: {
+				menu: [{
 					id: MenuId.ChatMessageTitle,
 					group: 'navigation',
 					order: 3,
 					when: ContextKeyExpr.and(CONTEXT_CHAT_RESPONSE_SUPPORT_ISSUE_REPORTING, CONTEXT_RESPONSE)
-				}
+				}, {
+					id: MENU_INLINE_CHAT_WIDGET_SECONDARY,
+					group: 'navigation',
+					order: 3,
+					when: ContextKeyExpr.and(CONTEXT_CHAT_RESPONSE_SUPPORT_ISSUE_REPORTING, CONTEXT_RESPONSE)
+				}]
 			});
 		}
 
diff --git a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
index d2f8311dd0a..be6c4955294 100644
--- a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
+++ b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
@@ -22,7 +22,9 @@ import { ChatAccessibilityHelp } from 'vs/workbench/contrib/chat/browser/actions
 import { registerChatActions } from 'vs/workbench/contrib/chat/browser/actions/chatActions';
 import { ACTION_ID_NEW_CHAT, registerNewChatActions } from 'vs/workbench/contrib/chat/browser/actions/chatClearActions';
 import { registerChatCodeBlockActions, registerChatCodeCompareBlockActions } from 'vs/workbench/contrib/chat/browser/actions/chatCodeblockActions';
+import { registerChatContextActions } from 'vs/workbench/contrib/chat/browser/actions/chatContextActions';
 import { registerChatCopyActions } from 'vs/workbench/contrib/chat/browser/actions/chatCopyActions';
+import { registerChatDeveloperActions } from 'vs/workbench/contrib/chat/browser/actions/chatDeveloperActions';
 import { SubmitAction, registerChatExecuteActions } from 'vs/workbench/contrib/chat/browser/actions/chatExecuteActions';
 import { registerChatFileTreeActions } from 'vs/workbench/contrib/chat/browser/actions/chatFileTreeActions';
 import { registerChatExportActions } from 'vs/workbench/contrib/chat/browser/actions/chatImportExport';
@@ -34,33 +36,31 @@ import { ChatAccessibilityService } from 'vs/workbench/contrib/chat/browser/chat
 import { ChatEditor, IChatEditorOptions } from 'vs/workbench/contrib/chat/browser/chatEditor';
 import { ChatEditorInput, ChatEditorInputSerializer } from 'vs/workbench/contrib/chat/browser/chatEditorInput';
 import { agentSlashCommandToMarkdown, agentToMarkdown } from 'vs/workbench/contrib/chat/browser/chatMarkdownDecorationsRenderer';
-import { ChatExtensionPointHandler } from 'vs/workbench/contrib/chat/browser/chatParticipantContributions';
+import { ChatCompatibilityNotifier, ChatExtensionPointHandler } from 'vs/workbench/contrib/chat/browser/chatParticipantContributions';
 import { QuickChatService } from 'vs/workbench/contrib/chat/browser/chatQuick';
 import { ChatResponseAccessibleView } from 'vs/workbench/contrib/chat/browser/chatResponseAccessibleView';
 import { ChatVariablesService } from 'vs/workbench/contrib/chat/browser/chatVariables';
 import { ChatWidgetService } from 'vs/workbench/contrib/chat/browser/chatWidget';
 import { ChatCodeBlockContextProviderService } from 'vs/workbench/contrib/chat/browser/codeBlockContextProviderService';
-import 'vs/workbench/contrib/chat/browser/contrib/chatInputEditorContrib';
 import 'vs/workbench/contrib/chat/browser/contrib/chatContextAttachments';
 import 'vs/workbench/contrib/chat/browser/contrib/chatInputCompletions';
+import 'vs/workbench/contrib/chat/browser/contrib/chatInputEditorContrib';
 import 'vs/workbench/contrib/chat/browser/contrib/chatInputEditorHover';
 import { ChatAgentLocation, ChatAgentNameService, ChatAgentService, IChatAgentNameService, IChatAgentService } from 'vs/workbench/contrib/chat/common/chatAgents';
 import { chatVariableLeader } from 'vs/workbench/contrib/chat/common/chatParserTypes';
 import { IChatService } from 'vs/workbench/contrib/chat/common/chatService';
 import { ChatService } from 'vs/workbench/contrib/chat/common/chatServiceImpl';
-import { LanguageModelToolsService, ILanguageModelToolsService } from 'vs/workbench/contrib/chat/common/languageModelToolsService';
 import { ChatSlashCommandService, IChatSlashCommandService } from 'vs/workbench/contrib/chat/common/chatSlashCommands';
 import { IChatVariablesService } from 'vs/workbench/contrib/chat/common/chatVariables';
 import { ChatWidgetHistoryService, IChatWidgetHistoryService } from 'vs/workbench/contrib/chat/common/chatWidgetHistoryService';
 import { ILanguageModelsService, LanguageModelsService } from 'vs/workbench/contrib/chat/common/languageModels';
 import { ILanguageModelStatsService, LanguageModelStatsService } from 'vs/workbench/contrib/chat/common/languageModelStats';
+import { ILanguageModelToolsService, LanguageModelToolsService } from 'vs/workbench/contrib/chat/common/languageModelToolsService';
+import { LanguageModelToolsExtensionPointHandler } from 'vs/workbench/contrib/chat/common/tools/languageModelToolsContribution';
 import { IVoiceChatService, VoiceChatService } from 'vs/workbench/contrib/chat/common/voiceChatService';
 import { IEditorResolverService, RegisteredEditorPriority } from 'vs/workbench/services/editor/common/editorResolverService';
 import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
 import '../common/chatColors';
-import { registerChatContextActions } from 'vs/workbench/contrib/chat/browser/actions/chatContextActions';
-import { registerChatDeveloperActions } from 'vs/workbench/contrib/chat/browser/actions/chatDeveloperActions';
-import { LanguageModelToolsExtensionPointHandler } from 'vs/workbench/contrib/chat/common/tools/languageModelToolsContribution';
 
 // Register configuration
 const configurationRegistry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration);
@@ -116,6 +116,11 @@ configurationRegistry.registerConfiguration({
 			description: nls.localize('chat.experimental.variables.terminal', "Enables variables for terminal chat."),
 			default: false
 		},
+		'chat.experimental.detectParticipant.enabled': {
+			type: 'boolean',
+			description: nls.localize('chat.experimental.detectParticipant.enabled', "Enables chat participant autodetection for panel chat."),
+			default: null
+		},
 	}
 });
 Registry.as<IEditorPaneRegistry>(EditorExtensions.EditorPane).registerEditorPane(
@@ -256,6 +261,7 @@ workbenchContributionsRegistry.registerWorkbenchContribution(ChatSlashStaticSlas
 Registry.as<IEditorFactoryRegistry>(EditorExtensions.EditorFactory).registerEditorSerializer(ChatEditorInput.TypeID, ChatEditorInputSerializer);
 registerWorkbenchContribution2(ChatExtensionPointHandler.ID, ChatExtensionPointHandler, WorkbenchPhase.BlockStartup);
 registerWorkbenchContribution2(LanguageModelToolsExtensionPointHandler.ID, LanguageModelToolsExtensionPointHandler, WorkbenchPhase.BlockRestore);
+registerWorkbenchContribution2(ChatCompatibilityNotifier.ID, ChatCompatibilityNotifier, WorkbenchPhase.Eventually);
 
 registerChatActions();
 registerChatCopyActions();
diff --git a/src/vs/workbench/contrib/chat/browser/chat.ts b/src/vs/workbench/contrib/chat/browser/chat.ts
index 6d15c37c9d3..52729be2bea 100644
--- a/src/vs/workbench/contrib/chat/browser/chat.ts
+++ b/src/vs/workbench/contrib/chat/browser/chat.ts
@@ -129,10 +129,10 @@ export interface IChatViewViewContext {
 }
 
 export interface IChatResourceViewContext {
-	resource: boolean;
+	isQuickChat?: boolean;
 }
 
-export type IChatWidgetViewContext = IChatViewViewContext | IChatResourceViewContext;
+export type IChatWidgetViewContext = IChatViewViewContext | IChatResourceViewContext | {};
 
 export interface IChatWidget {
 	readonly onDidChangeViewModel: Event<void>;
diff --git a/src/vs/workbench/contrib/chat/browser/chatAccessibilityService.ts b/src/vs/workbench/contrib/chat/browser/chatAccessibilityService.ts
index 06e0d0e292f..17b9a5e9945 100644
--- a/src/vs/workbench/contrib/chat/browser/chatAccessibilityService.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatAccessibilityService.ts
@@ -12,6 +12,8 @@ import { IChatAccessibilityService } from 'vs/workbench/contrib/chat/browser/cha
 import { IChatResponseViewModel } from 'vs/workbench/contrib/chat/common/chatViewModel';
 import { renderStringAsPlaintext } from 'vs/base/browser/markdownRenderer';
 import { MarkdownString } from 'vs/base/common/htmlContent';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { AccessibilityVoiceSettingId } from 'vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
 
 const CHAT_RESPONSE_PENDING_ALLOWANCE_MS = 4000;
 export class ChatAccessibilityService extends Disposable implements IChatAccessibilityService {
@@ -22,7 +24,11 @@ export class ChatAccessibilityService extends Disposable implements IChatAccessi
 
 	private _requestId: number = 0;
 
-	constructor(@IAccessibilitySignalService private readonly _accessibilitySignalService: IAccessibilitySignalService, @IInstantiationService private readonly _instantiationService: IInstantiationService) {
+	constructor(
+		@IAccessibilitySignalService private readonly _accessibilitySignalService: IAccessibilitySignalService,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+		@IConfigurationService private readonly _configurationService: IConfigurationService
+	) {
 		super();
 	}
 	acceptRequest(): number {
@@ -41,6 +47,8 @@ export class ChatAccessibilityService extends Disposable implements IChatAccessi
 		}
 		const errorDetails = isPanelChat && response.errorDetails ? ` ${response.errorDetails.message}` : '';
 		const plainTextResponse = renderStringAsPlaintext(new MarkdownString(responseContent));
-		status(plainTextResponse + errorDetails);
+		if (this._configurationService.getValue(AccessibilityVoiceSettingId.AutoSynthesize) !== 'on') {
+			status(plainTextResponse + errorDetails);
+		}
 	}
 }
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatAttachmentsContentPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatAttachmentsContentPart.ts
index 407e5d75582..fc3c046ec40 100644
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatAttachmentsContentPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatAttachmentsContentPart.ts
@@ -46,7 +46,7 @@ export class ChatAttachmentsContentPart extends Disposable {
 			const file = URI.isUri(attachment.value) ? attachment.value : attachment.value && typeof attachment.value === 'object' && 'uri' in attachment.value && URI.isUri(attachment.value.uri) ? attachment.value.uri : undefined;
 			const range = attachment.value && typeof attachment.value === 'object' && 'range' in attachment.value && Range.isIRange(attachment.value.range) ? attachment.value.range : undefined;
 
-			const correspondingContentReference = this.contentReferences.find((ref) => 'variableName' in ref.reference && ref.reference.variableName === attachment.name);
+			const correspondingContentReference = this.contentReferences.find((ref) => typeof ref.reference === 'object' && 'variableName' in ref.reference && ref.reference.variableName === attachment.name);
 			const isAttachmentOmitted = correspondingContentReference?.options?.status?.kind === ChatResponseReferencePartStatusKind.Omitted;
 			const isAttachmentPartialOrOmitted = isAttachmentOmitted || correspondingContentReference?.options?.status?.kind === ChatResponseReferencePartStatusKind.Partial;
 
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatConfirmationContentPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatConfirmationContentPart.ts
index 37486118762..a3957178e57 100644
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatConfirmationContentPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatConfirmationContentPart.ts
@@ -48,6 +48,7 @@ export class ChatConfirmationContentPart extends Disposable implements IChatCont
 					{ acceptedConfirmationData: [e.data] };
 				data.agentId = element.agent?.id;
 				data.slashCommand = element.slashCommand?.name;
+				data.confirmation = e.label;
 				if (await this.chatService.sendRequest(element.sessionId, prompt, data)) {
 					confirmation.isUsed = true;
 					confirmationWidget.setShowButtons(false);
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatReferencesContentPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatReferencesContentPart.ts
index 99b28473495..774d651ab07 100644
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatReferencesContentPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatReferencesContentPart.ts
@@ -92,7 +92,7 @@ export class ChatCollapsibleListContentPart extends Disposable implements IChatC
 		this.domNode.appendChild(list.getHTMLElement().parentElement!);
 
 		this._register(list.onDidOpen((e) => {
-			if (e.element && 'reference' in e.element) {
+			if (e.element && 'reference' in e.element && typeof e.element.reference === 'object') {
 				const uriOrLocation = 'variableName' in e.element.reference ? e.element.reference.value : e.element.reference;
 				const uri = URI.isUri(uriOrLocation) ? uriOrLocation :
 					uriOrLocation?.uri;
@@ -174,7 +174,9 @@ export class CollapsibleListPool extends Disposable {
 							return element.content.value;
 						}
 						const reference = element.reference;
-						if ('variableName' in reference) {
+						if (typeof reference === 'string') {
+							return reference;
+						} else if ('variableName' in reference) {
 							return reference.variableName;
 						} else if (URI.isUri(reference)) {
 							return basename(reference.path);
@@ -191,7 +193,7 @@ export class CollapsibleListPool extends Disposable {
 							return null;
 						}
 						const { reference } = element;
-						if ('variableName' in reference) {
+						if (typeof reference === 'string' || 'variableName' in reference) {
 							return null;
 						} else if (URI.isUri(reference)) {
 							return reference.toString();
@@ -274,7 +276,7 @@ class CollapsibleListRenderer implements IListRenderer<IChatCollapsibleListItem,
 		const reference = data.reference;
 		const icon = this.getReferenceIcon(data);
 		templateData.label.element.style.display = 'flex';
-		if ('variableName' in reference) {
+		if (typeof reference === 'object' && 'variableName' in reference) {
 			if (reference.value) {
 				const uri = URI.isUri(reference.value) ? reference.value : reference.value.uri;
 				templateData.label.setResource(
@@ -292,6 +294,9 @@ class CollapsibleListRenderer implements IListRenderer<IChatCollapsibleListItem,
 				const label = `${asThemeIcon}${variable?.fullName ?? asVariableName}`;
 				templateData.label.setLabel(label, asVariableName, { title: data.options?.status?.description ?? variable?.description });
 			}
+		} else if (typeof reference === 'string') {
+			templateData.label.setLabel(reference, undefined, { iconPath: URI.isUri(icon) ? icon : undefined, title: data.options?.status?.description ?? data.title });
+
 		} else {
 			const uri = 'uri' in reference ? reference.uri : reference;
 			if (uri.scheme === 'https' && isEqualAuthority(uri.authority, 'github.com') && uri.path.includes('/tree/')) {
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatTextEditContentPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatTextEditContentPart.ts
index cf8afc4f696..195da7f5959 100644
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatTextEditContentPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatTextEditContentPart.ts
@@ -6,9 +6,10 @@
 import * as dom from 'vs/base/browser/dom';
 import { CancellationTokenSource } from 'vs/base/common/cancellation';
 import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
+import { Disposable, IDisposable, IReference, RefCountedDisposable, toDisposable } from 'vs/base/common/lifecycle';
 import { Schemas } from 'vs/base/common/network';
 import { isEqual } from 'vs/base/common/resources';
+import { assertType } from 'vs/base/common/types';
 import { URI } from 'vs/base/common/uri';
 import { generateUuid } from 'vs/base/common/uuid';
 import { ISingleEditOperation } from 'vs/editor/common/core/editOperation';
@@ -16,10 +17,11 @@ import { TextEdit } from 'vs/editor/common/languages';
 import { createTextBufferFactoryFromSnapshot } from 'vs/editor/common/model/textModel';
 import { IModelService } from 'vs/editor/common/services/model';
 import { DefaultModelSHA1Computer } from 'vs/editor/common/services/modelService';
-import { ITextModelService } from 'vs/editor/common/services/resolverService';
+import { IResolvedTextEditorModel, ITextModelService } from 'vs/editor/common/services/resolverService';
 import { localize } from 'vs/nls';
 import { MenuId } from 'vs/platform/actions/common/actions';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
+import { createDecorator, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IChatListItemRendererOptions } from 'vs/workbench/contrib/chat/browser/chat';
 import { IDisposableReference, ResourcePool } from 'vs/workbench/contrib/chat/browser/chatContentParts/chatCollections';
 import { IChatContentPart, IChatContentPartRenderContext } from 'vs/workbench/contrib/chat/browser/chatContentParts/chatContentParts';
@@ -28,13 +30,20 @@ import { ChatEditorOptions } from 'vs/workbench/contrib/chat/browser/chatOptions
 import { CodeCompareBlockPart, ICodeCompareBlockData, ICodeCompareBlockDiffData } from 'vs/workbench/contrib/chat/browser/codeBlockPart';
 import { IChatProgressRenderableResponseContent, IChatTextEditGroup } from 'vs/workbench/contrib/chat/common/chatModel';
 import { IChatService } from 'vs/workbench/contrib/chat/common/chatService';
-import { isResponseVM } from 'vs/workbench/contrib/chat/common/chatViewModel';
+import { IChatResponseViewModel, isResponseVM } from 'vs/workbench/contrib/chat/common/chatViewModel';
 
 const $ = dom.$;
 
+const ICodeCompareModelService = createDecorator<ICodeCompareModelService>('ICodeCompareModelService');
+
+interface ICodeCompareModelService {
+	_serviceBrand: undefined;
+	createModel(response: IChatResponseViewModel, chatTextEdit: IChatTextEditGroup): Promise<IReference<{ originalSha1: string; original: IResolvedTextEditorModel; modified: IResolvedTextEditorModel }>>;
+}
+
 export class ChatTextEditContentPart extends Disposable implements IChatContentPart {
 	public readonly domNode: HTMLElement;
-	private readonly ref: IDisposableReference<CodeCompareBlockPart> | undefined;
+	private readonly comparePart: IDisposableReference<CodeCompareBlockPart> | undefined;
 
 	private readonly _onDidChangeHeight = this._register(new Emitter<void>());
 	public readonly onDidChangeHeight = this._onDidChangeHeight.event;
@@ -45,18 +54,18 @@ export class ChatTextEditContentPart extends Disposable implements IChatContentP
 		rendererOptions: IChatListItemRendererOptions,
 		diffEditorPool: DiffEditorPool,
 		currentWidth: number,
-		@ITextModelService private readonly textModelService: ITextModelService,
-		@IModelService private readonly modelService: IModelService,
-		@IChatService private readonly chatService: IChatService,
+		@ICodeCompareModelService private readonly codeCompareModelService: ICodeCompareModelService
 	) {
 		super();
 		const element = context.element;
 
+		assertType(isResponseVM(element));
+
 		// TODO@jrieken move this into the CompareCodeBlock and properly say what kind of changes happen
 		if (rendererOptions.renderTextEditsAsSummary?.(chatTextEdit.uri)) {
-			if (isResponseVM(element) && element.response.value.every(item => item.kind === 'textEditGroup')) {
+			if (element.response.value.every(item => item.kind === 'textEditGroup')) {
 				this.domNode = $('.interactive-edits-summary', undefined, !element.isComplete
-					? localize('editsSummary1', "Making changes...")
+					? ''
 					: element.isCanceled
 						? localize('edits0', "Making changes was aborted.")
 						: localize('editsSummary', "Made changes."));
@@ -75,14 +84,13 @@ export class ChatTextEditContentPart extends Disposable implements IChatContentP
 			this._register(toDisposable(() => {
 				isDisposed = true;
 				cts.dispose(true);
-				this.ref?.object.clearModel();
 			}));
 
-			this.ref = this._register(diffEditorPool.get());
+			this.comparePart = this._register(diffEditorPool.get());
 
 			// Attach this after updating text/layout of the editor, so it should only be fired when the size updates later (horizontal scrollbar, wrapping)
 			// not during a renderElement OR a progressive render (when we will be firing this event anyway at the end of the render)
-			this._register(this.ref.object.onDidChangeContentHeight(() => {
+			this._register(this.comparePart.object.onDidChangeContentHeight(() => {
 				this._onDidChangeHeight.fire();
 			}));
 
@@ -91,7 +99,7 @@ export class ChatTextEditContentPart extends Disposable implements IChatContentP
 				edit: chatTextEdit,
 				diffData: (async () => {
 
-					const ref = await this.textModelService.createModelReference(chatTextEdit.uri);
+					const ref = await this.codeCompareModelService.createModel(element, chatTextEdit);
 
 					if (isDisposed) {
 						ref.dispose();
@@ -100,70 +108,21 @@ export class ChatTextEditContentPart extends Disposable implements IChatContentP
 
 					this._register(ref);
 
-					const original = ref.object.textEditorModel;
-					let originalSha1: string = '';
-
-					if (chatTextEdit.state) {
-						originalSha1 = chatTextEdit.state.sha1;
-					} else {
-						const sha1 = new DefaultModelSHA1Computer();
-						if (sha1.canComputeSHA1(original)) {
-							originalSha1 = sha1.computeSHA1(original);
-							chatTextEdit.state = { sha1: originalSha1, applied: 0 };
-						}
-					}
-
-					const modified = this.modelService.createModel(
-						createTextBufferFactoryFromSnapshot(original.createSnapshot()),
-						{ languageId: original.getLanguageId(), onDidChange: Event.None },
-						URI.from({ scheme: Schemas.vscodeChatCodeBlock, path: original.uri.path, query: generateUuid() }),
-						false
-					);
-					const modRef = await this.textModelService.createModelReference(modified.uri);
-					this._register(modRef);
-
-					const editGroups: ISingleEditOperation[][] = [];
-					if (isResponseVM(element)) {
-						const chatModel = this.chatService.getSession(element.sessionId)!;
-
-						for (const request of chatModel.getRequests()) {
-							if (!request.response) {
-								continue;
-							}
-							for (const item of request.response.response.value) {
-								if (item.kind !== 'textEditGroup' || item.state?.applied || !isEqual(item.uri, chatTextEdit.uri)) {
-									continue;
-								}
-								for (const group of item.edits) {
-									const edits = group.map(TextEdit.asEditOperation);
-									editGroups.push(edits);
-								}
-							}
-							if (request.response === element.model) {
-								break;
-							}
-						}
-					}
-
-					for (const edits of editGroups) {
-						modified.pushEditOperations(null, edits, () => null);
-					}
-
 					return {
-						modified,
-						original,
-						originalSha1
+						modified: ref.object.modified.textEditorModel,
+						original: ref.object.original.textEditorModel,
+						originalSha1: ref.object.originalSha1
 					} satisfies ICodeCompareBlockDiffData;
 				})()
 			};
-			this.ref.object.render(data, currentWidth, cts.token);
+			this.comparePart.object.render(data, currentWidth, cts.token);
 
-			this.domNode = this.ref.object.element;
+			this.domNode = this.comparePart.object.element;
 		}
 	}
 
 	layout(width: number): void {
-		this.ref?.object.layout(width);
+		this.comparePart?.object.layout(width);
 	}
 
 	hasSameContent(other: IChatProgressRenderableResponseContent): boolean {
@@ -210,3 +169,87 @@ export class DiffEditorPool extends Disposable {
 		};
 	}
 }
+
+class CodeCompareModelService implements ICodeCompareModelService {
+
+	declare readonly _serviceBrand: undefined;
+
+	constructor(
+		@ITextModelService private readonly textModelService: ITextModelService,
+		@IModelService private readonly modelService: IModelService,
+		@IChatService private readonly chatService: IChatService,
+	) { }
+
+	async createModel(element: IChatResponseViewModel, chatTextEdit: IChatTextEditGroup): Promise<IReference<{ originalSha1: string; original: IResolvedTextEditorModel; modified: IResolvedTextEditorModel }>> {
+
+		const original = await this.textModelService.createModelReference(chatTextEdit.uri);
+
+		const modified = await this.textModelService.createModelReference((this.modelService.createModel(
+			createTextBufferFactoryFromSnapshot(original.object.textEditorModel.createSnapshot()),
+			{ languageId: original.object.textEditorModel.getLanguageId(), onDidChange: Event.None },
+			URI.from({ scheme: Schemas.vscodeChatCodeBlock, path: chatTextEdit.uri.path, query: generateUuid() }),
+			false
+		)).uri);
+
+		const d = new RefCountedDisposable(toDisposable(() => {
+			original.dispose();
+			modified.dispose();
+		}));
+
+		// compute the sha1 of the original model
+		let originalSha1: string = '';
+		if (chatTextEdit.state) {
+			originalSha1 = chatTextEdit.state.sha1;
+		} else {
+			const sha1 = new DefaultModelSHA1Computer();
+			if (sha1.canComputeSHA1(original.object.textEditorModel)) {
+				originalSha1 = sha1.computeSHA1(original.object.textEditorModel);
+				chatTextEdit.state = { sha1: originalSha1, applied: 0 };
+			}
+		}
+
+		// apply edits to the "modified" model
+		const chatModel = this.chatService.getSession(element.sessionId)!;
+		const editGroups: ISingleEditOperation[][] = [];
+		for (const request of chatModel.getRequests()) {
+			if (!request.response) {
+				continue;
+			}
+			for (const item of request.response.response.value) {
+				if (item.kind !== 'textEditGroup' || item.state?.applied || !isEqual(item.uri, chatTextEdit.uri)) {
+					continue;
+				}
+				for (const group of item.edits) {
+					const edits = group.map(TextEdit.asEditOperation);
+					editGroups.push(edits);
+				}
+			}
+			if (request.response === element.model) {
+				break;
+			}
+		}
+		for (const edits of editGroups) {
+			modified.object.textEditorModel.pushEditOperations(null, edits, () => null);
+		}
+
+		// self-acquire a reference to diff models for a short while
+		// because streaming usually means we will be using the original-model
+		// repeatedly and thereby also should reuse the modified-model and just
+		// update it with more edits
+		d.acquire();
+		setTimeout(() => d.release(), 5000);
+
+		return {
+			object: {
+				originalSha1,
+				original: original.object,
+				modified: modified.object
+			},
+			dispose() {
+				d.release();
+			},
+		};
+	}
+}
+
+registerSingleton(ICodeCompareModelService, CodeCompareModelService, InstantiationType.Delayed);
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/media/chatConfirmationWidget.css b/src/vs/workbench/contrib/chat/browser/chatContentParts/media/chatConfirmationWidget.css
index e244f077dd6..bb9d7bc7b7e 100644
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/media/chatConfirmationWidget.css
+++ b/src/vs/workbench/contrib/chat/browser/chatContentParts/media/chatConfirmationWidget.css
@@ -6,10 +6,13 @@
 .chat-confirmation-widget {
 	border: 1px solid var(--vscode-chat-requestBorder);
 	border-radius: 4px;
-	margin-bottom: 16px;
 	padding: 8px 12px 12px;
 }
 
+.chat-confirmation-widget:not(:last-child) {
+	margin-bottom: 16px;
+}
+
 .chat-confirmation-widget .chat-confirmation-widget-title {
 	font-weight: 600;
 }
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditor.ts b/src/vs/workbench/contrib/chat/browser/chatEditor.ts
index 94fe53297a8..3decf975ab9 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditor.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditor.ts
@@ -16,13 +16,13 @@ import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { EditorPane } from 'vs/workbench/browser/parts/editor/editorPane';
 import { IEditorOpenContext } from 'vs/workbench/common/editor';
 import { Memento } from 'vs/workbench/common/memento';
-import { ChatEditorInput } from 'vs/workbench/contrib/chat/browser/chatEditorInput';
-import { IChatViewState, ChatWidget } from 'vs/workbench/contrib/chat/browser/chatWidget';
-import { IChatModel, IExportableChatData, ISerializableChatData } from 'vs/workbench/contrib/chat/common/chatModel';
 import { clearChatEditor } from 'vs/workbench/contrib/chat/browser/actions/chatClear';
-import { IEditorGroup } from 'vs/workbench/services/editor/common/editorGroupsService';
+import { ChatEditorInput } from 'vs/workbench/contrib/chat/browser/chatEditorInput';
+import { ChatWidget, IChatViewState } from 'vs/workbench/contrib/chat/browser/chatWidget';
 import { ChatAgentLocation } from 'vs/workbench/contrib/chat/common/chatAgents';
+import { IChatModel, IExportableChatData, ISerializableChatData } from 'vs/workbench/contrib/chat/common/chatModel';
 import { CHAT_PROVIDER_ID } from 'vs/workbench/contrib/chat/common/chatParticipantContribTypes';
+import { IEditorGroup } from 'vs/workbench/services/editor/common/editorGroupsService';
 
 export interface IChatEditorOptions extends IEditorOptions {
 	target?: { sessionId: string } | { data: IExportableChatData | ISerializableChatData };
@@ -64,7 +64,7 @@ export class ChatEditor extends EditorPane {
 			scopedInstantiationService.createInstance(
 				ChatWidget,
 				ChatAgentLocation.Panel,
-				{ resource: true },
+				undefined,
 				{ supportsFileReferences: true },
 				{
 					listForeground: editorForeground,
diff --git a/src/vs/workbench/contrib/chat/browser/chatFollowups.ts b/src/vs/workbench/contrib/chat/browser/chatFollowups.ts
index 4f59229ff85..4219221b228 100644
--- a/src/vs/workbench/contrib/chat/browser/chatFollowups.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatFollowups.ts
@@ -9,7 +9,7 @@ import { MarkdownString } from 'vs/base/common/htmlContent';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { localize } from 'vs/nls';
 import { ChatAgentLocation, IChatAgentService } from 'vs/workbench/contrib/chat/common/chatAgents';
-import { chatAgentLeader, chatSubcommandLeader } from 'vs/workbench/contrib/chat/common/chatParserTypes';
+import { formatChatQuestion } from 'vs/workbench/contrib/chat/common/chatParserTypes';
 import { IChatFollowup } from 'vs/workbench/contrib/chat/common/chatService';
 
 const $ = dom.$;
@@ -36,18 +36,9 @@ export class ChatFollowups<T extends IChatFollowup> extends Disposable {
 			return;
 		}
 
-		let tooltipPrefix = '';
-		if ('agentId' in followup && followup.agentId && followup.agentId !== this.chatAgentService.getDefaultAgent(this.location)?.id) {
-			const agent = this.chatAgentService.getAgent(followup.agentId);
-			if (!agent) {
-				// Refers to agent that doesn't exist
-				return;
-			}
-
-			tooltipPrefix += `${chatAgentLeader}${agent.name} `;
-			if ('subCommand' in followup && followup.subCommand) {
-				tooltipPrefix += `${chatSubcommandLeader}${followup.subCommand} `;
-			}
+		const tooltipPrefix = formatChatQuestion(this.chatAgentService, this.location, '', followup.agentId, followup.subCommand);
+		if (tooltipPrefix === undefined) {
+			return;
 		}
 
 		const baseTitle = followup.kind === 'reply' ?
diff --git a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
index a0e272e94af..52d7d73bd97 100644
--- a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
@@ -26,7 +26,8 @@ import { IPosition } from 'vs/editor/common/core/position';
 import { Range } from 'vs/editor/common/core/range';
 import { ITextModel } from 'vs/editor/common/model';
 import { IModelService } from 'vs/editor/common/services/model';
-import { HoverController } from 'vs/editor/contrib/hover/browser/hoverController';
+import { ContentHoverController } from 'vs/editor/contrib/hover/browser/contentHoverController2';
+import { MarginHoverController } from 'vs/editor/contrib/hover/browser/marginHoverController';
 import { localize } from 'vs/nls';
 import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
 import { DropdownWithPrimaryActionViewItem } from 'vs/platform/actions/browser/dropdownWithPrimaryActionViewItem';
@@ -56,7 +57,7 @@ import { IChatRequestVariableEntry } from 'vs/workbench/contrib/chat/common/chat
 import { IChatFollowup } from 'vs/workbench/contrib/chat/common/chatService';
 import { IChatResponseViewModel } from 'vs/workbench/contrib/chat/common/chatViewModel';
 import { IChatHistoryEntry, IChatWidgetHistoryService } from 'vs/workbench/contrib/chat/common/chatWidgetHistoryService';
-import { getSimpleCodeEditorWidgetOptions, getSimpleEditorOptions } from 'vs/workbench/contrib/codeEditor/browser/simpleEditorOptions';
+import { getSimpleCodeEditorWidgetOptions, getSimpleEditorOptions, setupSimpleEditorSelectionStyling } from 'vs/workbench/contrib/codeEditor/browser/simpleEditorOptions';
 
 const $ = dom.$;
 
@@ -149,6 +150,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		// private readonly editorOptions: ChatEditorOptions, // TODO this should be used
 		private readonly location: ChatAgentLocation,
 		private readonly options: IChatInputPartOptions,
+		private readonly getInputState: () => any,
 		@IChatWidgetHistoryService private readonly historyService: IChatWidgetHistoryService,
 		@IModelService private readonly modelService: IModelService,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
@@ -234,11 +236,12 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 	}
 
 	showPreviousValue(): void {
+		const inputState = this.getInputState();
 		if (this.history.isAtEnd()) {
-			this.saveCurrentValue();
+			this.saveCurrentValue(inputState);
 		} else {
-			if (!this.history.has({ text: this._inputEditor.getValue(), state: this.history.current().state })) {
-				this.saveCurrentValue();
+			if (!this.history.has({ text: this._inputEditor.getValue(), state: inputState })) {
+				this.saveCurrentValue(inputState);
 				this.history.resetCursor();
 			}
 		}
@@ -247,11 +250,12 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 	}
 
 	showNextValue(): void {
+		const inputState = this.getInputState();
 		if (this.history.isAtEnd()) {
 			return;
 		} else {
-			if (!this.history.has({ text: this._inputEditor.getValue(), state: this.history.current().state })) {
-				this.saveCurrentValue();
+			if (!this.history.has({ text: this._inputEditor.getValue(), state: inputState })) {
+				this.saveCurrentValue(inputState);
 				this.history.resetCursor();
 			}
 		}
@@ -288,12 +292,12 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		this.inputEditor.setPosition({ lineNumber: 1, column: value.length + 1 });
 
 		if (!transient) {
-			this.saveCurrentValue();
+			this.saveCurrentValue(this.getInputState());
 		}
 	}
 
-	private saveCurrentValue(): void {
-		const newEntry = { text: this._inputEditor.getValue(), state: this.history.current().state };
+	private saveCurrentValue(inputState: any): void {
+		const newEntry = { text: this._inputEditor.getValue(), state: inputState };
 		this.history.replaceLast(newEntry);
 	}
 
@@ -312,11 +316,13 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 	async acceptInput(isUserQuery?: boolean): Promise<void> {
 		if (isUserQuery) {
 			const userQuery = this._inputEditor.getValue();
-			const entry: IChatHistoryEntry = { text: userQuery, state: this.history.current().state };
+			const entry: IChatHistoryEntry = { text: userQuery, state: this.getInputState() };
 			this.history.replaceLast(entry);
 			this.history.add({ text: '' });
 		}
 
+		// Clear attached context, fire event to clear input state, and clear the input editor
+		this._attachedContext.clear();
 		this._onDidLoadInputState.fire({});
 		if (this.accessibilityService.isScreenReaderOptimized() && isMacintosh) {
 			this._acceptInputForVoiceover();
@@ -339,14 +345,6 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		this._inputEditor.focus();
 	}
 
-	clearContext(): void {
-		if (this._attachedContext.size > 0) {
-			const removed = Array.from(this._attachedContext);
-			this._attachedContext.clear();
-			this._onDidChangeContext.fire({ removed });
-		}
-	}
-
 	attachContext(overwrite: boolean, ...contentReferences: IChatRequestVariableEntry[]): void {
 		const removed = [];
 		if (overwrite) {
@@ -373,11 +371,20 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		this.container = dom.append(container, $('.interactive-input-part'));
 		this.container.classList.toggle('compact', this.options.renderStyle === 'compact');
 
-		this.followupsContainer = dom.append(this.container, $('.interactive-input-followups'));
-		this.attachedContextContainer = dom.append(this.container, $('.chat-attached-context'));
+		let inputContainer: HTMLElement;
+		let inputAndSideToolbar: HTMLElement;
+		if (this.options.renderStyle === 'compact') {
+			inputAndSideToolbar = dom.append(this.container, $('.interactive-input-and-side-toolbar'));
+			this.followupsContainer = dom.append(this.container, $('.interactive-input-followups'));
+			inputContainer = dom.append(inputAndSideToolbar, $('.interactive-input-and-execute-toolbar'));
+			this.attachedContextContainer = dom.append(this.container, $('.chat-attached-context'));
+		} else {
+			this.followupsContainer = dom.append(this.container, $('.interactive-input-followups'));
+			this.attachedContextContainer = dom.append(this.container, $('.chat-attached-context'));
+			inputAndSideToolbar = dom.append(this.container, $('.interactive-input-and-side-toolbar'));
+			inputContainer = dom.append(inputAndSideToolbar, $('.interactive-input-and-execute-toolbar'));
+		}
 		this.initAttachedContext(this.attachedContextContainer);
-		const inputAndSideToolbar = dom.append(this.container, $('.interactive-input-and-side-toolbar'));
-		const inputContainer = dom.append(inputAndSideToolbar, $('.interactive-input-and-execute-toolbar'));
 
 		const inputScopedContextKeyService = this._register(this.contextKeyService.createScoped(inputContainer));
 		CONTEXT_IN_CHAT_INPUT.bindTo(inputScopedContextKeyService).set(true);
@@ -408,9 +415,9 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		options.scrollbar = { ...(options.scrollbar ?? {}), vertical: 'hidden' };
 		options.stickyScroll = { enabled: false };
 
-		this._inputEditorElement = dom.append(inputContainer, $('.interactive-input-editor'));
+		this._inputEditorElement = dom.append(inputContainer, $(chatInputEditorContainerSelector));
 		const editorOptions = getSimpleCodeEditorWidgetOptions();
-		editorOptions.contributions?.push(...EditorExtensionsRegistry.getSomeEditorContributions([HoverController.ID]));
+		editorOptions.contributions?.push(...EditorExtensionsRegistry.getSomeEditorContributions([ContentHoverController.ID, MarginHoverController.ID]));
 		this._inputEditor = this._register(scopedInstantiationService.createInstance(CodeEditorWidget, this._inputEditorElement, options, editorOptions));
 
 		this._register(this._inputEditor.onDidChangeModelContent(() => {
@@ -435,18 +442,6 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 
 			this._onDidBlur.fire();
 		}));
-		this._register(this._inputEditor.onDidChangeCursorPosition(e => {
-			const model = this._inputEditor.getModel();
-			if (!model) {
-				return;
-			}
-
-			const atTop = e.position.column === 1 && e.position.lineNumber === 1;
-			this.chatCursorAtTop.set(atTop);
-
-			this.historyNavigationBackwardsEnablement.set(atTop);
-			this.historyNavigationForewardsEnablement.set(e.position.equals(getLastPosition(model)));
-		}));
 
 		this.toolbar = this._register(this.instantiationService.createInstance(MenuWorkbenchToolBar, inputContainer, this.options.menus.executeToolbar, {
 			telemetrySource: this.options.menus.telemetrySource,
@@ -499,9 +494,29 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 			const lineNumber = this.inputModel.getLineCount();
 			this._inputEditor.setPosition({ lineNumber, column: this.inputModel.getLineMaxColumn(lineNumber) });
 		}
+
+		const onDidChangeCursorPosition = () => {
+			const model = this._inputEditor.getModel();
+			if (!model) {
+				return;
+			}
+
+			const position = this._inputEditor.getPosition();
+			if (!position) {
+				return;
+			}
+
+			const atTop = position.column === 1 && position.lineNumber === 1;
+			this.chatCursorAtTop.set(atTop);
+
+			this.historyNavigationBackwardsEnablement.set(atTop);
+			this.historyNavigationForewardsEnablement.set(position.equals(getLastPosition(model)));
+		};
+		this._register(this._inputEditor.onDidChangeCursorPosition(e => onDidChangeCursorPosition()));
+		onDidChangeCursorPosition();
 	}
 
-	private initAttachedContext(container: HTMLElement) {
+	private initAttachedContext(container: HTMLElement, isLayout = false) {
 		const oldHeight = container.offsetHeight;
 		dom.clearNode(container);
 		this.attachedContextDisposables.clear();
@@ -563,7 +578,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 			this.attachedContextDisposables.add(disp);
 		});
 
-		if (oldHeight !== container.offsetHeight) {
+		if (oldHeight !== container.offsetHeight && !isLayout) {
 			this._onDidChangeHeight.fire();
 		}
 	}
@@ -594,7 +609,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 
 	private previousInputEditorDimension: IDimension | undefined;
 	private _layout(height: number, width: number, allowRecurse = true): void {
-		this.initAttachedContext(this.attachedContextContainer);
+		this.initAttachedContext(this.attachedContextContainer, true);
 
 		const data = this.getLayoutData();
 
@@ -626,18 +641,19 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 			inputEditorBorder: 2,
 			followupsHeight: this.followupsContainer.offsetHeight,
 			inputPartEditorHeight: Math.min(this._inputEditor.getContentHeight(), this.inputEditorMaxHeight),
-			inputPartHorizontalPadding: this.options.renderStyle === 'compact' ? 8 : 40,
+			inputPartHorizontalPadding: this.options.renderStyle === 'compact' ? 12 : 40,
 			inputPartVerticalPadding: this.options.renderStyle === 'compact' ? 12 : 24,
 			implicitContextHeight: this.attachedContextContainer.offsetHeight,
 			editorBorder: 2,
 			editorPadding: 12,
-			toolbarPadding: 4,
+			toolbarPadding: (this.toolbar.getItemsLength() - 1) * 4,
 			executeToolbarWidth: this.cachedToolbarWidth = this.toolbar.getItemsWidth(),
 			sideToolbarWidth: this.inputSideToolbarContainer ? dom.getTotalWidth(this.inputSideToolbarContainer) + 4 /*gap*/ : 0,
 		};
 	}
 
 	saveState(): void {
+		this.saveCurrentValue(this.getInputState());
 		const inputHistory = [...this.history];
 		this.historyService.saveHistory(this.location, inputHistory);
 	}
@@ -699,3 +715,6 @@ class ChatSubmitDropdownActionItem extends DropdownWithPrimaryActionViewItem {
 		this._register(menu.onDidChange(() => setActions()));
 	}
 }
+
+const chatInputEditorContainerSelector = '.interactive-input-editor';
+setupSimpleEditorSelectionStyling(chatInputEditorContainerSelector);
diff --git a/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts b/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts
index 86d10a0d80a..242ab4e2bb3 100644
--- a/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts
@@ -7,6 +7,7 @@ import * as dom from 'vs/base/browser/dom';
 import { renderFormattedText } from 'vs/base/browser/formattedTextRenderer';
 import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { IActionViewItemOptions } from 'vs/base/browser/ui/actionbar/actionViewItems';
+import { DropdownMenuActionViewItem, IDropdownMenuActionViewItemOptions } from 'vs/base/browser/ui/dropdown/dropdownActionViewItem';
 import { getDefaultHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
 import { IListVirtualDelegate } from 'vs/base/browser/ui/list/list';
 import { ITreeNode, ITreeRenderer } from 'vs/base/browser/ui/tree/tree';
@@ -26,19 +27,21 @@ import { ThemeIcon } from 'vs/base/common/themables';
 import { URI } from 'vs/base/common/uri';
 import { MarkdownRenderer } from 'vs/editor/browser/widget/markdownRenderer/browser/markdownRenderer';
 import { localize } from 'vs/nls';
-import { IMenuEntryActionViewItemOptions, MenuEntryActionViewItem, createActionViewItem } from 'vs/platform/actions/browser/menuEntryActionViewItem';
+import { IMenuEntryActionViewItemOptions, createActionViewItem } from 'vs/platform/actions/browser/menuEntryActionViewItem';
 import { MenuWorkbenchToolBar } from 'vs/platform/actions/browser/toolbar';
 import { MenuId, MenuItemAction } from 'vs/platform/actions/common/actions';
 import { ICommandService } from 'vs/platform/commands/common/commands';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
+import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { IHoverService } from 'vs/platform/hover/browser/hover';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
 import { ILogService } from 'vs/platform/log/common/log';
 import { ColorScheme } from 'vs/platform/theme/common/theme';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { ChatTreeItem, GeneratingPhrase, IChatCodeBlockInfo, IChatFileTreeInfo } from 'vs/workbench/contrib/chat/browser/chat';
+import { MarkUnhelpfulActionId } from 'vs/workbench/contrib/chat/browser/actions/chatTitleActions';
+import { ChatTreeItem, GeneratingPhrase, IChatCodeBlockInfo, IChatFileTreeInfo, IChatListItemRendererOptions } from 'vs/workbench/contrib/chat/browser/chat';
 import { ChatAgentHover, getChatAgentHoverOptions } from 'vs/workbench/contrib/chat/browser/chatAgentHover';
 import { ChatAttachmentsContentPart } from 'vs/workbench/contrib/chat/browser/chatContentParts/chatAttachmentsContentPart';
 import { ChatCodeCitationContentPart } from 'vs/workbench/contrib/chat/browser/chatContentParts/chatCodeCitationContentPart';
@@ -58,15 +61,15 @@ import { ChatMarkdownRenderer } from 'vs/workbench/contrib/chat/browser/chatMark
 import { ChatEditorOptions } from 'vs/workbench/contrib/chat/browser/chatOptions';
 import { ChatCodeBlockContentProvider, CodeBlockPart } from 'vs/workbench/contrib/chat/browser/codeBlockPart';
 import { ChatAgentLocation, IChatAgentMetadata } from 'vs/workbench/contrib/chat/common/chatAgents';
-import { CONTEXT_CHAT_RESPONSE_SUPPORT_ISSUE_REPORTING, CONTEXT_REQUEST, CONTEXT_RESPONSE, CONTEXT_RESPONSE_DETECTED_AGENT_COMMAND, CONTEXT_RESPONSE_FILTERED, CONTEXT_RESPONSE_VOTE } from 'vs/workbench/contrib/chat/common/chatContextKeys';
+import { CONTEXT_CHAT_RESPONSE_SUPPORT_ISSUE_REPORTING, CONTEXT_REQUEST, CONTEXT_RESPONSE, CONTEXT_RESPONSE_DETECTED_AGENT_COMMAND, CONTEXT_RESPONSE_ERROR, CONTEXT_RESPONSE_FILTERED, CONTEXT_RESPONSE_VOTE } from 'vs/workbench/contrib/chat/common/chatContextKeys';
 import { IChatRequestVariableEntry, IChatTextEditGroup } from 'vs/workbench/contrib/chat/common/chatModel';
 import { chatSubcommandLeader } from 'vs/workbench/contrib/chat/common/chatParserTypes';
-import { ChatAgentVoteDirection, IChatConfirmation, IChatContentReference, IChatFollowup, IChatTask, IChatTreeData } from 'vs/workbench/contrib/chat/common/chatService';
-import { IChatCodeCitations, IChatReferences, IChatRendererContent, IChatResponseViewModel, IChatWelcomeMessageViewModel, isRequestVM, isResponseVM, isWelcomeVM } from 'vs/workbench/contrib/chat/common/chatViewModel';
+import { ChatAgentVoteDirection, ChatAgentVoteDownReason, IChatConfirmation, IChatContentReference, IChatFollowup, IChatTask, IChatTreeData } from 'vs/workbench/contrib/chat/common/chatService';
+import { IChatCodeCitations, IChatReferences, IChatRendererContent, IChatRequestViewModel, IChatResponseViewModel, IChatWelcomeMessageViewModel, isRequestVM, isResponseVM, isWelcomeVM } from 'vs/workbench/contrib/chat/common/chatViewModel';
 import { getNWords } from 'vs/workbench/contrib/chat/common/chatWordCounter';
+import { IWorkbenchIssueService } from 'vs/workbench/contrib/issue/common/issue';
 import { annotateSpecialMarkdownContent } from '../common/annotations';
 import { CodeBlockModelCollection } from '../common/codeBlockModelCollection';
-import { IChatListItemRendererOptions } from './chat';
 
 const $ = dom.$;
 
@@ -277,26 +280,6 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 
 		const contextKeyService = templateDisposables.add(this.contextKeyService.createScoped(rowContainer));
 		const scopedInstantiationService = templateDisposables.add(this.instantiationService.createChild(new ServiceCollection([IContextKeyService, contextKeyService])));
-		let titleToolbar: MenuWorkbenchToolBar | undefined;
-		if (this.rendererOptions.noHeader) {
-			header.classList.add('hidden');
-		} else {
-			titleToolbar = templateDisposables.add(scopedInstantiationService.createInstance(MenuWorkbenchToolBar, toolbarParent ?? header, MenuId.ChatMessageTitle, {
-				menuOptions: {
-					shouldForwardArgs: true
-				},
-				toolbarOptions: {
-					shouldInlineSubmenu: submenu => submenu.actions.length <= 1
-				},
-				actionViewItemProvider: (action: IAction, options: IActionViewItemOptions) => {
-					if (action instanceof MenuItemAction && (action.item.id === 'workbench.action.chat.voteDown' || action.item.id === 'workbench.action.chat.voteUp')) {
-						return scopedInstantiationService.createInstance(ChatVoteButton, action, options as IMenuEntryActionViewItemOptions);
-					}
-					return createActionViewItem(scopedInstantiationService, action, options);
-				}
-			}));
-		}
-
 		const agentHover = templateDisposables.add(this.instantiationService.createInstance(ChatAgentHover));
 		const hoverContent = () => {
 			if (isResponseVM(template.currentElement) && template.currentElement.agent && !template.currentElement.agent.isDefault) {
@@ -319,7 +302,29 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 				this.hoverService.hideHover();
 			}
 		}));
-		const template: IChatListItemTemplate = { avatarContainer, username, detail, value, rowContainer, elementDisposables, titleToolbar, templateDisposables, contextKeyService, instantiationService: scopedInstantiationService, agentHover };
+		const template: IChatListItemTemplate = { avatarContainer, username, detail, value, rowContainer, elementDisposables, templateDisposables, contextKeyService, instantiationService: scopedInstantiationService, agentHover };
+
+		if (this.rendererOptions.noHeader) {
+			header.classList.add('hidden');
+		} else {
+			// Have to create the template first because actionViewItemProvider depends on the template and runs immediately
+			(template as any).titleToolbar = templateDisposables.add(scopedInstantiationService.createInstance(MenuWorkbenchToolBar, toolbarParent ?? header, MenuId.ChatMessageTitle, {
+				menuOptions: {
+					shouldForwardArgs: true
+				},
+				toolbarOptions: {
+					shouldInlineSubmenu: submenu => submenu.actions.length <= 1
+				},
+				actionViewItemProvider: (action: IAction, options: IActionViewItemOptions) => {
+					const currentElement = template.currentElement;
+					if (action instanceof MenuItemAction && action.item.id === MarkUnhelpfulActionId && isResponseVM(currentElement)) {
+						return scopedInstantiationService.createInstance(ChatVoteDownButton, action, options as IMenuEntryActionViewItemOptions);
+					}
+					return createActionViewItem(scopedInstantiationService, action, options);
+				}
+			}));
+		}
+
 		return template;
 	}
 
@@ -348,13 +353,13 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 			templateData.titleToolbar.context = element;
 		}
 
+		CONTEXT_RESPONSE_ERROR.bindTo(templateData.contextKeyService).set(isResponseVM(element) && !!element.errorDetails);
 		const isFiltered = !!(isResponseVM(element) && element.errorDetails?.responseIsFiltered);
 		CONTEXT_RESPONSE_FILTERED.bindTo(templateData.contextKeyService).set(isFiltered);
 
 		templateData.rowContainer.classList.toggle('interactive-request', isRequestVM(element));
 		templateData.rowContainer.classList.toggle('interactive-response', isResponseVM(element));
 		templateData.rowContainer.classList.toggle('interactive-welcome', isWelcomeVM(element));
-		templateData.rowContainer.classList.toggle('filtered-response', isFiltered);
 		templateData.rowContainer.classList.toggle('show-detail-progress', isResponseVM(element) && !element.isComplete && !element.progressMessages.length);
 		templateData.username.textContent = element.username;
 		if (!this.rendererOptions.noHeader) {
@@ -366,6 +371,10 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 			this.renderDetail(element, templateData);
 		}
 
+		if (isRequestVM(element) && element.confirmation) {
+			this.renderConfirmationAction(element, templateData);
+		}
+
 		// Do a progressive render if
 		// - This the last response in the list
 		// - And it has some content
@@ -425,6 +434,13 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 		}
 	}
 
+	private renderConfirmationAction(element: IChatRequestViewModel, templateData: IChatListItemTemplate) {
+		dom.clearNode(templateData.detail);
+		if (element.confirmation) {
+			templateData.detail.textContent = localize('chatConfirmationAction', 'selected "{0}"', element.confirmation);
+		}
+	}
+
 	private renderAvatar(element: ChatTreeItem, templateData: IChatListItemTemplate): void {
 		const icon = isResponseVM(element) ?
 			this.getAgentIcon(element.agent?.metadata) :
@@ -453,7 +469,7 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 
 	private basicRenderElement(element: ChatTreeItem, index: number, templateData: IChatListItemTemplate) {
 		let value: IChatRendererContent[] = [];
-		if (isRequestVM(element)) {
+		if (isRequestVM(element) && !element.confirmation) {
 			const markdown = 'message' in element.message ?
 				element.message.message :
 				this.markdownDecorationsRenderer.convertParsedRequestToMarkdown(element.message);
@@ -474,30 +490,37 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 			this.renderDetail(element, templateData);
 		}
 
+		const isFiltered = !!(isResponseVM(element) && element.errorDetails?.responseIsFiltered);
+
 		const parts: IChatContentPart[] = [];
-		value.forEach((data, index) => {
-			const context: IChatContentPartRenderContext = {
-				element,
-				index,
-				content: value,
-				preceedingContentParts: parts,
-			};
-			const newPart = this.renderChatContentPart(data, templateData, context);
-			if (newPart) {
-				templateData.value.appendChild(newPart.domNode);
-				parts.push(newPart);
-			}
-		});
+		if (!isFiltered) {
+			value.forEach((data, index) => {
+				const context: IChatContentPartRenderContext = {
+					element,
+					index,
+					content: value,
+					preceedingContentParts: parts,
+				};
+				const newPart = this.renderChatContentPart(data, templateData, context);
+				if (newPart) {
+					templateData.value.appendChild(newPart.domNode);
+					parts.push(newPart);
+				}
+			});
+		}
+
 		if (templateData.renderedParts) {
 			dispose(templateData.renderedParts);
 		}
 		templateData.renderedParts = parts;
 
-		if (isRequestVM(element) && element.variables.length) {
-			const newPart = this.renderAttachments(element.variables, element.contentReferences, templateData);
-			if (newPart) {
-				templateData.value.appendChild(newPart.domNode);
-				templateData.elementDisposables.add(newPart);
+		if (!isFiltered) {
+			if (isRequestVM(element) && element.variables.length) {
+				const newPart = this.renderAttachments(element.variables, element.contentReferences, templateData);
+				if (newPart) {
+					templateData.value.appendChild(newPart.domNode);
+					templateData.elementDisposables.add(newPart);
+				}
 			}
 		}
 
@@ -932,9 +955,88 @@ export class ChatListDelegate implements IListVirtualDelegate<ChatTreeItem> {
 	}
 }
 
-class ChatVoteButton extends MenuEntryActionViewItem {
+const voteDownDetailLabels: Record<ChatAgentVoteDownReason, string> = {
+	[ChatAgentVoteDownReason.IncorrectCode]: localize('incorrectCode', "Suggested incorrect code"),
+	[ChatAgentVoteDownReason.DidNotFollowInstructions]: localize('didNotFollowInstructions', "Didn't follow instructions"),
+	[ChatAgentVoteDownReason.MissingContext]: localize('missingContext', "Missing context"),
+	[ChatAgentVoteDownReason.OffensiveOrUnsafe]: localize('offensiveOrUnsafe', "Offensive or unsafe"),
+	[ChatAgentVoteDownReason.PoorlyWrittenOrFormatted]: localize('poorlyWrittenOrFormatted', "Poorly written or formatted"),
+	[ChatAgentVoteDownReason.RefusedAValidRequest]: localize('refusedAValidRequest', "Refused a valid request"),
+	[ChatAgentVoteDownReason.IncompleteCode]: localize('incompleteCode', "Incomplete code"),
+	[ChatAgentVoteDownReason.WillReportIssue]: localize('reportIssue', "Report an issue"),
+	[ChatAgentVoteDownReason.Other]: localize('other', "Other"),
+};
+
+export class ChatVoteDownButton extends DropdownMenuActionViewItem {
+	constructor(
+		action: IAction,
+		options: IDropdownMenuActionViewItemOptions | undefined,
+		@ICommandService private readonly commandService: ICommandService,
+		@IWorkbenchIssueService private readonly issueService: IWorkbenchIssueService,
+		@ILogService private readonly logService: ILogService,
+		@IContextMenuService contextMenuService: IContextMenuService,
+	) {
+		super(action,
+			{ getActions: () => this.getActions(), },
+			contextMenuService,
+			{
+				...options,
+				classNames: ThemeIcon.asClassNameArray(Codicon.thumbsdown),
+			});
+	}
+
+	getActions(): readonly IAction[] {
+		return [
+			this.getVoteDownDetailAction(ChatAgentVoteDownReason.IncorrectCode),
+			this.getVoteDownDetailAction(ChatAgentVoteDownReason.DidNotFollowInstructions),
+			this.getVoteDownDetailAction(ChatAgentVoteDownReason.IncompleteCode),
+			this.getVoteDownDetailAction(ChatAgentVoteDownReason.MissingContext),
+			this.getVoteDownDetailAction(ChatAgentVoteDownReason.PoorlyWrittenOrFormatted),
+			this.getVoteDownDetailAction(ChatAgentVoteDownReason.RefusedAValidRequest),
+			this.getVoteDownDetailAction(ChatAgentVoteDownReason.OffensiveOrUnsafe),
+			this.getVoteDownDetailAction(ChatAgentVoteDownReason.Other),
+			{
+				id: 'reportIssue',
+				label: voteDownDetailLabels[ChatAgentVoteDownReason.WillReportIssue],
+				tooltip: '',
+				enabled: true,
+				class: undefined,
+				run: async (context: IChatResponseViewModel) => {
+					if (!isResponseVM(context)) {
+						this.logService.error('ChatVoteDownButton#run: invalid context');
+						return;
+					}
+
+					await this.commandService.executeCommand(MarkUnhelpfulActionId, context, ChatAgentVoteDownReason.WillReportIssue);
+					await this.issueService.openReporter({ extensionId: context.agent?.extensionId.value });
+				}
+			}
+		];
+	}
+
 	override render(container: HTMLElement): void {
 		super.render(container);
-		container.classList.toggle('checked', this.action.checked);
+
+		this.element?.classList.toggle('checked', this.action.checked);
+	}
+
+	private getVoteDownDetailAction(reason: ChatAgentVoteDownReason): IAction {
+		const label = voteDownDetailLabels[reason];
+		return {
+			id: MarkUnhelpfulActionId,
+			label,
+			tooltip: '',
+			enabled: true,
+			checked: (this._context as IChatResponseViewModel).voteDownReason === reason,
+			class: undefined,
+			run: async (context: IChatResponseViewModel) => {
+				if (!isResponseVM(context)) {
+					this.logService.error('ChatVoteDownButton#getVoteDownDetailAction: invalid context');
+					return;
+				}
+
+				await this.commandService.executeCommand(MarkUnhelpfulActionId, context, reason);
+			}
+		};
 	}
 }
diff --git a/src/vs/workbench/contrib/chat/browser/chatMarkdownDecorationsRenderer.ts b/src/vs/workbench/contrib/chat/browser/chatMarkdownDecorationsRenderer.ts
index 9af542462c3..822bbe1c426 100644
--- a/src/vs/workbench/contrib/chat/browser/chatMarkdownDecorationsRenderer.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatMarkdownDecorationsRenderer.ts
@@ -7,10 +7,12 @@ import * as dom from 'vs/base/browser/dom';
 import { Button } from 'vs/base/browser/ui/button/button';
 import { getDefaultHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
 import { toErrorMessage } from 'vs/base/common/errorMessage';
+import { Lazy } from 'vs/base/common/lazy';
 import { DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
 import { revive } from 'vs/base/common/marshalling';
 import { URI } from 'vs/base/common/uri';
 import { Location } from 'vs/editor/common/languages';
+import { ICommandService } from 'vs/platform/commands/common/commands';
 import { IHoverService } from 'vs/platform/hover/browser/hover';
 import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
@@ -21,11 +23,11 @@ import { IChatWidgetService } from 'vs/workbench/contrib/chat/browser/chat';
 import { ChatAgentHover, getChatAgentHoverOptions } from 'vs/workbench/contrib/chat/browser/chatAgentHover';
 import { getFullyQualifiedId, IChatAgentCommand, IChatAgentData, IChatAgentNameService, IChatAgentService } from 'vs/workbench/contrib/chat/common/chatAgents';
 import { chatSlashCommandBackground, chatSlashCommandForeground } from 'vs/workbench/contrib/chat/common/chatColors';
-import { chatAgentLeader, ChatRequestAgentPart, ChatRequestDynamicVariablePart, ChatRequestTextPart, chatSubcommandLeader, IParsedChatRequest } from 'vs/workbench/contrib/chat/common/chatParserTypes';
+import { chatAgentLeader, ChatRequestAgentPart, ChatRequestAgentSubcommandPart, ChatRequestDynamicVariablePart, ChatRequestSlashCommandPart, ChatRequestTextPart, ChatRequestToolPart, ChatRequestVariablePart, chatSubcommandLeader, IParsedChatRequest, IParsedChatRequestPart } from 'vs/workbench/contrib/chat/common/chatParserTypes';
 import { IChatService } from 'vs/workbench/contrib/chat/common/chatService';
 import { contentRefUrl } from '../common/annotations';
-import { Lazy } from 'vs/base/common/lazy';
-import { ICommandService } from 'vs/platform/commands/common/commands';
+import { IChatVariablesService } from 'vs/workbench/contrib/chat/common/chatVariables';
+import { ILanguageModelToolsService } from 'vs/workbench/contrib/chat/common/languageModelToolsService';
 
 /** For rendering slash commands, variables */
 const decorationRefUrl = `http://_vscodedecoration_`;
@@ -68,6 +70,10 @@ interface ISlashCommandWidgetArgs {
 	command: string;
 }
 
+interface IDecorationWidgetArgs {
+	title?: string;
+}
+
 export class ChatMarkdownDecorationsRenderer {
 	constructor(
 		@IKeybindingService private readonly keybindingService: IKeybindingService,
@@ -79,6 +85,8 @@ export class ChatMarkdownDecorationsRenderer {
 		@IChatService private readonly chatService: IChatService,
 		@IChatWidgetService private readonly chatWidgetService: IChatWidgetService,
 		@ICommandService private readonly commandService: ICommandService,
+		@IChatVariablesService private readonly chatVariablesService: IChatVariablesService,
+		@ILanguageModelToolsService private readonly toolsService: ILanguageModelToolsService,
 	) { }
 
 	convertParsedRequestToMarkdown(parsedRequest: IParsedChatRequest): string {
@@ -89,21 +97,29 @@ export class ChatMarkdownDecorationsRenderer {
 			} else if (part instanceof ChatRequestAgentPart) {
 				result += this.instantiationService.invokeFunction(accessor => agentToMarkdown(part.agent, false, accessor));
 			} else {
-				const uri = part instanceof ChatRequestDynamicVariablePart && part.data instanceof URI ?
-					part.data :
-					undefined;
-				const title = uri ? encodeURIComponent(this.labelService.getUriLabel(uri, { relative: true })) :
-					part instanceof ChatRequestAgentPart ? part.agent.id :
-						'';
-
-				const text = part.text;
-				result += `[${text}](${decorationRefUrl}?${title})`;
+				result += this.genericDecorationToMarkdown(part);
 			}
 		}
 
 		return result;
 	}
 
+	private genericDecorationToMarkdown(part: IParsedChatRequestPart): string {
+		const uri = part instanceof ChatRequestDynamicVariablePart && part.data instanceof URI ?
+			part.data :
+			undefined;
+		const title = uri ? this.labelService.getUriLabel(uri, { relative: true }) :
+			part instanceof ChatRequestSlashCommandPart ? part.slashCommand.detail :
+				part instanceof ChatRequestAgentSubcommandPart ? part.command.description :
+					part instanceof ChatRequestVariablePart ? (this.chatVariablesService.getVariable(part.variableName)?.description) :
+						part instanceof ChatRequestToolPart ? (this.toolsService.getTool(part.toolId)?.userDescription) :
+							'';
+
+		const args: IDecorationWidgetArgs = { title };
+		const text = part.text;
+		return `[${text}](${decorationRefUrl}?${encodeURIComponent(JSON.stringify(args))})`;
+	}
+
 	walkTreeAndAnnotateReferenceLinks(element: HTMLElement): IDisposable {
 		const store = new DisposableStore();
 		element.querySelectorAll('a').forEach(a => {
@@ -136,9 +152,13 @@ export class ChatMarkdownDecorationsRenderer {
 							a);
 					}
 				} else if (href.startsWith(decorationRefUrl)) {
-					const title = decodeURIComponent(href.slice(decorationRefUrl.length + 1));
+					let args: IDecorationWidgetArgs | undefined;
+					try {
+						args = JSON.parse(decodeURIComponent(href.slice(decorationRefUrl.length + 1)));
+					} catch (e) { }
+
 					a.parentElement!.replaceChild(
-						this.renderResourceWidget(a.textContent!, title),
+						this.renderResourceWidget(a.textContent!, args, store),
 						a);
 				} else if (href.startsWith(contentRefUrl)) {
 					this.renderFileWidget(href, a);
@@ -172,7 +192,7 @@ export class ChatMarkdownDecorationsRenderer {
 				this.chatService.sendRequest(widget.viewModel!.sessionId, agent.metadata.sampleRequest ?? '', { location: widget.location, agentId: agent.id });
 			}));
 		} else {
-			container = this.renderResourceWidget(nameWithLeader, undefined);
+			container = this.renderResourceWidget(nameWithLeader, undefined, store);
 		}
 
 		const agent = this.chatAgentService.getAgent(args.agentId);
@@ -232,11 +252,11 @@ export class ChatMarkdownDecorationsRenderer {
 	}
 
 
-	private renderResourceWidget(name: string, title: string | undefined): HTMLElement {
+	private renderResourceWidget(name: string, args: IDecorationWidgetArgs | undefined, store: DisposableStore): HTMLElement {
 		const container = dom.$('span.chat-resource-widget');
 		const alias = dom.$('span', undefined, name);
-		if (title) {
-			alias.title = title;
+		if (args?.title) {
+			store.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('element'), container, args.title));
 		}
 
 		container.appendChild(alias);
diff --git a/src/vs/workbench/contrib/chat/browser/chatMarkdownRenderer.ts b/src/vs/workbench/contrib/chat/browser/chatMarkdownRenderer.ts
index 4f08d298d9c..98e84b995ad 100644
--- a/src/vs/workbench/contrib/chat/browser/chatMarkdownRenderer.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatMarkdownRenderer.ts
@@ -4,9 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { MarkdownRenderOptions, MarkedOptions } from 'vs/base/browser/markdownRenderer';
+import { getDefaultHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
 import { IMarkdownString } from 'vs/base/common/htmlContent';
+import { DisposableStore } from 'vs/base/common/lifecycle';
 import { IMarkdownRendererOptions, IMarkdownRenderResult, MarkdownRenderer } from 'vs/editor/browser/widget/markdownRenderer/browser/markdownRenderer';
 import { ILanguageService } from 'vs/editor/common/languages/language';
+import { IHoverService } from 'vs/platform/hover/browser/hover';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
 import { ITrustedDomainService } from 'vs/workbench/contrib/url/browser/trustedDomainService';
 
@@ -56,6 +59,7 @@ export class ChatMarkdownRenderer extends MarkdownRenderer {
 		@ILanguageService languageService: ILanguageService,
 		@IOpenerService openerService: IOpenerService,
 		@ITrustedDomainService private readonly trustedDomainService: ITrustedDomainService,
+		@IHoverService private readonly hoverService: IHoverService,
 	) {
 		super(options ?? {}, languageService, openerService);
 	}
@@ -79,6 +83,26 @@ export class ChatMarkdownRenderer extends MarkdownRenderer {
 				value: `<body>\n\n${markdown.value}</body>`,
 			}
 			: markdown;
-		return super.render(mdWithBody, options, markedOptions);
+		const result = super.render(mdWithBody, options, markedOptions);
+		return this.attachCustomHover(result);
+	}
+
+	private attachCustomHover(result: IMarkdownRenderResult): IMarkdownRenderResult {
+		const store = new DisposableStore();
+		result.element.querySelectorAll('a').forEach((element) => {
+			if (element.title) {
+				const title = element.title;
+				element.title = '';
+				store.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('element'), element, title));
+			}
+		});
+
+		return {
+			element: result.element,
+			dispose: () => {
+				result.dispose();
+				store.dispose();
+			}
+		};
 	}
 }
diff --git a/src/vs/workbench/contrib/chat/browser/chatParticipantContributions.ts b/src/vs/workbench/contrib/chat/browser/chatParticipantContributions.ts
index 0a70c41549a..eb5e004909b 100644
--- a/src/vs/workbench/contrib/chat/browser/chatParticipantContributions.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatParticipantContributions.ts
@@ -3,14 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { isNonEmptyArray } from 'vs/base/common/arrays';
+import { coalesce, isNonEmptyArray } from 'vs/base/common/arrays';
 import { Codicon } from 'vs/base/common/codicons';
-import { Disposable, DisposableMap, DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
+import { DisposableMap, DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
 import * as strings from 'vs/base/common/strings';
 import { localize, localize2 } from 'vs/nls';
+import { ContextKeyExpr, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
 import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
 import { ILogService } from 'vs/platform/log/common/log';
+import { Severity } from 'vs/platform/notification/common/notification';
+import { IProductService } from 'vs/platform/product/common/productService';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { ViewPaneContainer } from 'vs/workbench/browser/parts/views/viewPaneContainer';
 import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
@@ -18,7 +21,10 @@ import { IViewContainersRegistry, IViewDescriptor, IViewsRegistry, ViewContainer
 import { CHAT_VIEW_ID } from 'vs/workbench/contrib/chat/browser/chat';
 import { CHAT_SIDEBAR_PANEL_ID, ChatViewPane } from 'vs/workbench/contrib/chat/browser/chatViewPane';
 import { ChatAgentLocation, IChatAgentData, IChatAgentService } from 'vs/workbench/contrib/chat/common/chatAgents';
+import { CONTEXT_CHAT_EXTENSION_INVALID, CONTEXT_CHAT_PANEL_PARTICIPANT_REGISTERED } from 'vs/workbench/contrib/chat/common/chatContextKeys';
 import { IRawChatParticipantContribution } from 'vs/workbench/contrib/chat/common/chatParticipantContribTypes';
+import { showExtensionsWithIdsCommandId } from 'vs/workbench/contrib/extensions/browser/extensionsActions';
+import { IExtensionsWorkbenchService } from 'vs/workbench/contrib/extensions/common/extensions';
 import { isProposedApiEnabled } from 'vs/workbench/services/extensions/common/extensions';
 import * as extensionsRegistry from 'vs/workbench/services/extensions/common/extensionsRegistry';
 
@@ -40,7 +46,7 @@ const chatParticipantExtensionPoint = extensionsRegistry.ExtensionsRegistry.regi
 				name: {
 					description: localize('chatParticipantName', "User-facing name for this chat participant. The user will use '@' with this name to invoke the participant. Name must not contain whitespace."),
 					type: 'string',
-					pattern: '^[\\w0-9_-]+$'
+					pattern: '^[\\w-]+$'
 				},
 				fullName: {
 					markdownDescription: localize('chatParticipantFullName', "The full name of this chat participant, which is shown as the label for responses coming from this participant. If not provided, {0} is used.", '`name`'),
@@ -62,6 +68,30 @@ const chatParticipantExtensionPoint = extensionsRegistry.ExtensionsRegistry.regi
 					description: localize('chatParticipantWhen', "A condition which must be true to enable this participant."),
 					type: 'string'
 				},
+				disambiguation: {
+					description: localize('chatParticipantDisambiguation', "Metadata to help with automatically routing user questions to this chat participant. You must add `contribChatParticipantDetection` to `enabledApiProposals` to use this API."),
+					type: 'array',
+					items: {
+						additionalProperties: false,
+						type: 'object',
+						defaultSnippets: [{ body: { categoryName: '', description: '', examples: [] } }],
+						required: ['categoryName', 'description', 'examples'],
+						properties: {
+							categoryName: {
+								markdownDescription: localize('chatParticipantDisambiguationCategory', "A detailed name for this category, e.g. `workspace_questions` or `web_questions`."),
+								type: 'string'
+							},
+							description: {
+								description: localize('chatParticipantDisambiguationDescription', "A detailed description of the kinds of questions that are suitable for this chat participant."),
+								type: 'string'
+							},
+							examples: {
+								description: localize('chatParticipantDisambiguationExamples', "A list of representative example questions that are suitable for this chat participant."),
+								type: 'array'
+							},
+						}
+					}
+				},
 				commands: {
 					markdownDescription: localize('chatCommandsDescription', "Commands available for this chat participant, which the user can invoke with a `/`."),
 					type: 'array',
@@ -91,9 +121,37 @@ const chatParticipantExtensionPoint = extensionsRegistry.ExtensionsRegistry.regi
 								description: localize('chatCommandSticky', "Whether invoking the command puts the chat into a persistent mode, where the command is automatically added to the chat input for the next message."),
 								type: 'boolean'
 							},
+							disambiguation: {
+								description: localize('chatCommandDisambiguation', "Metadata to help with automatically routing user questions to this chat command. You must add `contribChatParticipantDetection` to `enabledApiProposals` to use this API."),
+								type: 'array',
+								items: {
+									additionalProperties: false,
+									type: 'object',
+									defaultSnippets: [{ body: { categoryName: '', description: '', examples: [] } }],
+									required: ['categoryName', 'description', 'examples'],
+									properties: {
+										categoryName: {
+											markdownDescription: localize('chatCommandDisambiguationCategory', "A detailed name for this category, e.g. `workspace_questions` or `web_questions`."),
+											type: 'string'
+										},
+										description: {
+											description: localize('chatCommandDisambiguationDescription', "A detailed description of the kinds of questions that are suitable for this chat command."),
+											type: 'string'
+										},
+										examples: {
+											description: localize('chatCommandDisambiguationExamples', "A list of representative example questions that are suitable for this chat command."),
+											type: 'array'
+										},
+									}
+								}
+							}
 						}
 					}
 				},
+				supportsToolReferences: {
+					description: localize('chatParticipantSupportsToolReferences', "Whether this participant supports {0}.", 'ChatRequest#toolReferences'),
+					type: 'boolean'
+				}
 			}
 		}
 	},
@@ -113,9 +171,10 @@ export class ChatExtensionPointHandler implements IWorkbenchContribution {
 
 	constructor(
 		@IChatAgentService private readonly _chatAgentService: IChatAgentService,
-		@ILogService private readonly logService: ILogService,
+		@ILogService private readonly logService: ILogService
 	) {
 		this._viewContainer = this.registerViewContainer();
+		this.registerDefaultParticipantView();
 		this.handleAndRegisterChatExtensions();
 	}
 
@@ -123,8 +182,8 @@ export class ChatExtensionPointHandler implements IWorkbenchContribution {
 		chatParticipantExtensionPoint.setHandler((extensions, delta) => {
 			for (const extension of delta.added) {
 				for (const providerDescriptor of extension.value) {
-					if (!providerDescriptor.name.match(/^[\w0-9_-]+$/)) {
-						this.logService.error(`Extension '${extension.description.identifier.value}' CANNOT register participant with invalid name: ${providerDescriptor.name}. Name must match /^[\\w0-9_-]+$/.`);
+					if (!providerDescriptor.name?.match(/^[\w-]+$/)) {
+						this.logService.error(`Extension '${extension.description.identifier.value}' CANNOT register participant with invalid name: ${providerDescriptor.name}. Name must match /^[\\w-]+$/.`);
 						continue;
 					}
 
@@ -154,11 +213,35 @@ export class ChatExtensionPointHandler implements IWorkbenchContribution {
 						continue;
 					}
 
-					const store = new DisposableStore();
-					if (providerDescriptor.isDefault && (!providerDescriptor.locations || providerDescriptor.locations?.includes(ChatAgentLocation.Panel))) {
-						store.add(this.registerDefaultParticipantView(providerDescriptor));
+					const participantsAndCommandsDisambiguation: {
+						categoryName: string;
+						description: string;
+						examples: string[];
+					}[] = [];
+
+					let hasLoggedParticipantDetectionApiWarning = false;
+					if (providerDescriptor.disambiguation?.length) {
+						if (isProposedApiEnabled(extension.description, 'contribChatParticipantDetection')) {
+							participantsAndCommandsDisambiguation.push(...providerDescriptor.disambiguation);
+						} else if (!hasLoggedParticipantDetectionApiWarning) {
+							this.logService.warn(`'${extension.description.identifier.value}' must add API proposal: 'contribChatParticipantDetection' to 'enabledApiProposals' to contribute disambiguation metadata.`);
+							hasLoggedParticipantDetectionApiWarning = true;
+						}
+					}
+					if (providerDescriptor.commands) {
+						for (const command of providerDescriptor.commands) {
+							if (command.disambiguation?.length) {
+								if (isProposedApiEnabled(extension.description, 'contribChatParticipantDetection')) {
+									participantsAndCommandsDisambiguation.push(...command.disambiguation);
+								} else if (!hasLoggedParticipantDetectionApiWarning) {
+									this.logService.warn(`'${extension.description.identifier.value}' must add API proposal: 'contribChatParticipantDetection' to 'enabledApiProposals' to contribute disambiguation metadata.`);
+									hasLoggedParticipantDetectionApiWarning = true;
+								}
+							}
+						}
 					}
 
+					const store = new DisposableStore();
 					store.add(this._chatAgentService.registerAgent(
 						providerDescriptor.id,
 						{
@@ -179,7 +262,9 @@ export class ChatExtensionPointHandler implements IWorkbenchContribution {
 							locations: isNonEmptyArray(providerDescriptor.locations) ?
 								providerDescriptor.locations.map(ChatAgentLocation.fromRaw) :
 								[ChatAgentLocation.Panel],
-							slashCommands: providerDescriptor.commands ?? []
+							slashCommands: providerDescriptor.commands ?? [],
+							disambiguation: coalesce(participantsAndCommandsDisambiguation.flat()),
+							supportsToolReferences: providerDescriptor.supportsToolReferences,
 						} satisfies IChatAgentData));
 
 					this._participantRegistrationDisposables.set(
@@ -191,7 +276,7 @@ export class ChatExtensionPointHandler implements IWorkbenchContribution {
 
 			for (const extension of delta.removed) {
 				for (const providerDescriptor of extension.value) {
-					this._participantRegistrationDisposables.deleteAndDispose(getParticipantKey(extension.description.identifier, providerDescriptor.name));
+					this._participantRegistrationDisposables.deleteAndDispose(getParticipantKey(extension.description.identifier, providerDescriptor.id));
 				}
 			}
 		});
@@ -215,15 +300,9 @@ export class ChatExtensionPointHandler implements IWorkbenchContribution {
 		return viewContainer;
 	}
 
-	private hasRegisteredDefaultParticipantView = false;
-	private registerDefaultParticipantView(defaultParticipantDescriptor: IRawChatParticipantContribution): IDisposable {
-		if (this.hasRegisteredDefaultParticipantView) {
-			this.logService.warn(`Tried to register a second default chat participant view for "${defaultParticipantDescriptor.id}"`);
-			return Disposable.None;
-		}
-
-		// Register View
-		const name = defaultParticipantDescriptor.fullName ?? defaultParticipantDescriptor.name;
+	private registerDefaultParticipantView(): IDisposable {
+		// Register View. Name must be hardcoded because we want to show it even when the extension fails to load due to an API version incompatibility.
+		const name = 'GitHub Copilot';
 		const viewDescriptor: IViewDescriptor[] = [{
 			id: CHAT_VIEW_ID,
 			containerIcon: this._viewContainer.icon,
@@ -233,12 +312,11 @@ export class ChatExtensionPointHandler implements IWorkbenchContribution {
 			canToggleVisibility: false,
 			canMoveView: true,
 			ctorDescriptor: new SyncDescriptor(ChatViewPane),
+			when: ContextKeyExpr.or(CONTEXT_CHAT_PANEL_PARTICIPANT_REGISTERED, CONTEXT_CHAT_EXTENSION_INVALID)
 		}];
-		this.hasRegisteredDefaultParticipantView = true;
 		Registry.as<IViewsRegistry>(ViewExtensions.ViewsRegistry).registerViews(viewDescriptor, this._viewContainer);
 
 		return toDisposable(() => {
-			this.hasRegisteredDefaultParticipantView = false;
 			Registry.as<IViewsRegistry>(ViewExtensions.ViewsRegistry).deregisterViews(viewDescriptor, this._viewContainer);
 		});
 	}
@@ -247,3 +325,42 @@ export class ChatExtensionPointHandler implements IWorkbenchContribution {
 function getParticipantKey(extensionId: ExtensionIdentifier, participantName: string): string {
 	return `${extensionId.value}_${participantName}`;
 }
+
+export class ChatCompatibilityNotifier implements IWorkbenchContribution {
+	static readonly ID = 'workbench.contrib.chatCompatNotifier';
+
+	constructor(
+		@IExtensionsWorkbenchService extensionsWorkbenchService: IExtensionsWorkbenchService,
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@IChatAgentService chatAgentService: IChatAgentService,
+		@IProductService productService: IProductService,
+	) {
+		// It may be better to have some generic UI for this, for any extension that is incompatible,
+		// but this is only enabled for Copilot Chat now and it needs to be obvious.
+		const isInvalid = CONTEXT_CHAT_EXTENSION_INVALID.bindTo(contextKeyService);
+		extensionsWorkbenchService.queryLocal().then(exts => {
+			const chat = exts.find(ext => ext.identifier.id === 'github.copilot-chat');
+			if (chat?.local?.validations.some(v => v[0] === Severity.Error)) {
+				const showExtensionLabel = localize('showExtension', "Show Extension");
+				const mainMessage = localize('chatFailErrorMessage', "Chat failed to load because the installed version of the {0} extension is not compatible with this version of {1}. Please ensure that the GitHub Copilot Chat extension is up to date.", 'GitHub Copilot Chat', productService.nameLong);
+				const commandButton = `[${showExtensionLabel}](command:${showExtensionsWithIdsCommandId}?${encodeURIComponent(JSON.stringify([['GitHub.copilot-chat']]))})`;
+				const versionMessage = `GitHub Copilot Chat version: ${chat.version}`;
+				const viewsRegistry = Registry.as<IViewsRegistry>(ViewExtensions.ViewsRegistry);
+				viewsRegistry.registerViewWelcomeContent(CHAT_VIEW_ID, {
+					content: [mainMessage, commandButton, versionMessage].join('\n\n'),
+					when: CONTEXT_CHAT_EXTENSION_INVALID,
+				});
+
+				// This catches vscode starting up with the invalid extension, but the extension may still get updated by vscode after this.
+				isInvalid.set(true);
+			}
+		});
+
+		const listener = chatAgentService.onDidChangeAgents(() => {
+			if (chatAgentService.getDefaultAgent(ChatAgentLocation.Panel)) {
+				isInvalid.set(false);
+				listener.dispose();
+			}
+		});
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/chatQuick.ts b/src/vs/workbench/contrib/chat/browser/chatQuick.ts
index f40ad589c60..a3861b5df6f 100644
--- a/src/vs/workbench/contrib/chat/browser/chatQuick.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatQuick.ts
@@ -219,7 +219,7 @@ class QuickChat extends Disposable {
 			scopedInstantiationService.createInstance(
 				ChatWidget,
 				ChatAgentLocation.Panel,
-				{ resource: true },
+				{ isQuickChat: true },
 				{ renderInputOnTop: true, renderStyle: 'compact', menus: { inputSideToolbar: MenuId.ChatInputSide } },
 				{
 					listForeground: quickInputForeground,
diff --git a/src/vs/workbench/contrib/chat/browser/chatResponseAccessibleView.ts b/src/vs/workbench/contrib/chat/browser/chatResponseAccessibleView.ts
index e1f8491a49f..ad6462a3245 100644
--- a/src/vs/workbench/contrib/chat/browser/chatResponseAccessibleView.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatResponseAccessibleView.ts
@@ -5,7 +5,6 @@
 
 import { renderMarkdownAsPlaintext } from 'vs/base/browser/markdownRenderer';
 import { IMarkdownString, MarkdownString } from 'vs/base/common/htmlContent';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
 import { AccessibleViewProviderId, AccessibleViewType, IAccessibleViewContentProvider } from 'vs/platform/accessibility/browser/accessibleView';
 import { IAccessibleViewImplentation } from 'vs/platform/accessibility/browser/accessibleViewRegistry';
 import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
@@ -21,23 +20,15 @@ export class ChatResponseAccessibleView implements IAccessibleViewImplentation {
 	readonly name = 'panelChat';
 	readonly type = AccessibleViewType.View;
 	readonly when = CONTEXT_IN_CHAT_SESSION;
-	private _initialRender = true;
 	getProvider(accessor: ServicesAccessor) {
 		const widgetService = accessor.get(IChatWidgetService);
-		const codeEditorService = accessor.get(ICodeEditorService);
-
 		const widget = widgetService.lastFocusedWidget;
 		if (!widget) {
 			return;
 		}
-		const chatInputFocused = this._initialRender && !!codeEditorService.getFocusedCodeEditor() || false;
-		if (this._initialRender && chatInputFocused) {
+		const chatInputFocused = widget.hasInputFocus();
+		if (chatInputFocused) {
 			widget.focusLastMessage();
-			this._initialRender = false;
-		}
-
-		if (!widget) {
-			return;
 		}
 
 		const verifiedWidget: IChatWidget = widget;
diff --git a/src/vs/workbench/contrib/chat/browser/chatVariables.ts b/src/vs/workbench/contrib/chat/browser/chatVariables.ts
index 72beab2c568..98a72786d7a 100644
--- a/src/vs/workbench/contrib/chat/browser/chatVariables.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatVariables.ts
@@ -15,11 +15,13 @@ import { IChatWidgetService, showChatView } from 'vs/workbench/contrib/chat/brow
 import { ChatDynamicVariableModel } from 'vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables';
 import { ChatAgentLocation } from 'vs/workbench/contrib/chat/common/chatAgents';
 import { IChatModel, IChatRequestVariableData, IChatRequestVariableEntry } from 'vs/workbench/contrib/chat/common/chatModel';
-import { ChatRequestDynamicVariablePart, ChatRequestVariablePart, IParsedChatRequest } from 'vs/workbench/contrib/chat/common/chatParserTypes';
+import { ChatRequestDynamicVariablePart, ChatRequestToolPart, ChatRequestVariablePart, IParsedChatRequest } from 'vs/workbench/contrib/chat/common/chatParserTypes';
 import { IChatContentReference } from 'vs/workbench/contrib/chat/common/chatService';
 import { IChatRequestVariableValue, IChatVariableData, IChatVariableResolver, IChatVariableResolverProgress, IChatVariablesService, IDynamicVariable } from 'vs/workbench/contrib/chat/common/chatVariables';
 import { ChatContextAttachments } from 'vs/workbench/contrib/chat/browser/contrib/chatContextAttachments';
 import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
+import { ILanguageModelToolsService } from 'vs/workbench/contrib/chat/common/languageModelToolsService';
+import { ThemeIcon } from 'vs/base/common/themables';
 
 interface IChatData {
 	data: IChatVariableData;
@@ -34,6 +36,7 @@ export class ChatVariablesService implements IChatVariablesService {
 	constructor(
 		@IChatWidgetService private readonly chatWidgetService: IChatWidgetService,
 		@IViewsService private readonly viewsService: IViewsService,
+		@ILanguageModelToolsService private readonly toolsService: ILanguageModelToolsService,
 	) {
 	}
 
@@ -61,7 +64,12 @@ export class ChatVariablesService implements IChatVariablesService {
 						}).catch(onUnexpectedExternalError));
 					}
 				} else if (part instanceof ChatRequestDynamicVariablePart) {
-					resolvedVariables[i] = { id: part.id, name: part.referenceText, range: part.range, value: part.data };
+					resolvedVariables[i] = { id: part.id, name: part.referenceText, range: part.range, value: part.data, };
+				} else if (part instanceof ChatRequestToolPart) {
+					const tool = this.toolsService.getTool(part.toolId);
+					if (tool) {
+						resolvedVariables[i] = { id: part.toolId, name: part.toolName, range: part.range, value: undefined, isTool: true, icon: ThemeIcon.isThemeIcon(tool.icon) ? tool.icon : undefined, fullName: tool.displayName };
+					}
 				}
 			});
 
diff --git a/src/vs/workbench/contrib/chat/browser/chatViewPane.ts b/src/vs/workbench/contrib/chat/browser/chatViewPane.ts
index 80022029e40..68fb88bd71a 100644
--- a/src/vs/workbench/contrib/chat/browser/chatViewPane.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatViewPane.ts
@@ -88,8 +88,9 @@ export class ChatViewPane extends ViewPane {
 			} else if (this._widget?.viewModel?.initState === ChatModelInitState.Initialized) {
 				// Model is initialized, and the default agent disappeared, so show welcome view
 				this.didUnregisterProvider = true;
-				this._onDidChangeViewWelcomeState.fire();
 			}
+
+			this._onDidChangeViewWelcomeState.fire();
 		}));
 	}
 
@@ -99,7 +100,7 @@ export class ChatViewPane extends ViewPane {
 		};
 	}
 
-	private updateModel(model?: IChatModel | undefined, viewState?: IViewPaneState): void {
+	private updateModel(model?: IChatModel | undefined): void {
 		this.modelDisposables.clear();
 
 		model = model ?? (this.chatService.transferredSessionData?.sessionId
@@ -109,11 +110,15 @@ export class ChatViewPane extends ViewPane {
 			throw new Error('Could not start chat session');
 		}
 
-		this._widget.setModel(model, { ...(viewState ?? this.viewState) });
+		this._widget.setModel(model, { ...this.viewState });
 		this.viewState.sessionId = model.sessionId;
 	}
 
 	override shouldShowWelcome(): boolean {
+		if (!this.chatAgentService.getContributedDefaultAgent(ChatAgentLocation.Panel)) {
+			return true;
+		}
+
 		const noPersistedSessions = !this.chatService.hasSessions();
 		return this.didUnregisterProvider || !this._widget?.viewModel && (noPersistedSessions || this.didProviderRegistrationFail);
 	}
@@ -179,7 +184,10 @@ export class ChatViewPane extends ViewPane {
 		if (this.widget.viewModel) {
 			this.chatService.clearSession(this.widget.viewModel.sessionId);
 		}
-		this.updateModel(undefined, { ...this.viewState, inputValue: undefined });
+
+		// Grab the widget's latest view state because it will be loaded back into the widget
+		this.updateViewState();
+		this.updateModel(undefined);
 	}
 
 	loadSession(sessionId: string): void {
@@ -211,12 +219,16 @@ export class ChatViewPane extends ViewPane {
 			// TODO multiple chat views will overwrite each other
 			this._widget.saveState();
 
-			const widgetViewState = this._widget.getViewState();
-			this.viewState.inputValue = widgetViewState.inputValue;
-			this.viewState.inputState = widgetViewState.inputState;
+			this.updateViewState();
 			this.memento.saveMemento();
 		}
 
 		super.saveState();
 	}
+
+	private updateViewState(): void {
+		const widgetViewState = this._widget.getViewState();
+		this.viewState.inputValue = widgetViewState.inputValue;
+		this.viewState.inputState = widgetViewState.inputState;
+	}
 }
diff --git a/src/vs/workbench/contrib/chat/browser/chatWidget.ts b/src/vs/workbench/contrib/chat/browser/chatWidget.ts
index c9c67a5129b..56b0bf442ef 100644
--- a/src/vs/workbench/contrib/chat/browser/chatWidget.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatWidget.ts
@@ -9,7 +9,7 @@ import { disposableTimeout, timeout } from 'vs/base/common/async';
 import { toErrorMessage } from 'vs/base/common/errorMessage';
 import { Emitter, Event } from 'vs/base/common/event';
 import { Disposable, DisposableStore, IDisposable, MutableDisposable, combinedDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { matchesScheme, Schemas } from 'vs/base/common/network';
+import { Schemas } from 'vs/base/common/network';
 import { extUri, isEqual } from 'vs/base/common/resources';
 import { isDefined } from 'vs/base/common/types';
 import { URI } from 'vs/base/common/uri';
@@ -26,7 +26,7 @@ import { ServiceCollection } from 'vs/platform/instantiation/common/serviceColle
 import { WorkbenchObjectTree } from 'vs/platform/list/browser/listService';
 import { ILogService } from 'vs/platform/log/common/log';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { ChatTreeItem, IChatAccessibilityService, IChatCodeBlockInfo, IChatFileTreeInfo, IChatWidget, IChatWidgetService, IChatWidgetViewContext, IChatWidgetViewOptions } from 'vs/workbench/contrib/chat/browser/chat';
+import { ChatTreeItem, IChatAccessibilityService, IChatCodeBlockInfo, IChatFileTreeInfo, IChatWidget, IChatWidgetService, IChatWidgetViewContext, IChatWidgetViewOptions, IChatListItemRendererOptions } from 'vs/workbench/contrib/chat/browser/chat';
 import { ChatAccessibilityProvider } from 'vs/workbench/contrib/chat/browser/chatAccessibilityProvider';
 import { ChatInputPart } from 'vs/workbench/contrib/chat/browser/chatInputPart';
 import { ChatListDelegate, ChatListItemRenderer, IChatRendererDelegate } from 'vs/workbench/contrib/chat/browser/chatListRenderer';
@@ -34,13 +34,12 @@ import { ChatEditorOptions } from 'vs/workbench/contrib/chat/browser/chatOptions
 import { ChatAgentLocation, IChatAgentCommand, IChatAgentData, IChatAgentService } from 'vs/workbench/contrib/chat/common/chatAgents';
 import { CONTEXT_CHAT_INPUT_HAS_AGENT, CONTEXT_CHAT_LOCATION, CONTEXT_CHAT_REQUEST_IN_PROGRESS, CONTEXT_IN_CHAT_SESSION, CONTEXT_IN_QUICK_CHAT, CONTEXT_RESPONSE_FILTERED } from 'vs/workbench/contrib/chat/common/chatContextKeys';
 import { ChatModelInitState, IChatModel, IChatRequestVariableEntry, IChatResponseModel } from 'vs/workbench/contrib/chat/common/chatModel';
-import { ChatRequestAgentPart, IParsedChatRequest, chatAgentLeader, chatSubcommandLeader } from 'vs/workbench/contrib/chat/common/chatParserTypes';
+import { ChatRequestAgentPart, IParsedChatRequest, chatAgentLeader, chatSubcommandLeader, formatChatQuestion } from 'vs/workbench/contrib/chat/common/chatParserTypes';
 import { ChatRequestParser } from 'vs/workbench/contrib/chat/common/chatRequestParser';
 import { IChatFollowup, IChatLocationData, IChatService } from 'vs/workbench/contrib/chat/common/chatService';
 import { IChatSlashCommandService } from 'vs/workbench/contrib/chat/common/chatSlashCommands';
 import { ChatViewModel, IChatResponseViewModel, isRequestVM, isResponseVM, isWelcomeVM } from 'vs/workbench/contrib/chat/common/chatViewModel';
 import { CodeBlockModelCollection } from 'vs/workbench/contrib/chat/common/codeBlockModelCollection';
-import { IChatListItemRendererOptions } from './chat';
 
 const $ = dom.$;
 
@@ -69,8 +68,6 @@ export interface IChatWidgetContrib extends IDisposable {
 	 */
 	getInputState?(): any;
 
-	onDidChangeInputState?: Event<void>;
-
 	/**
 	 * Called with the result of getInputState when navigating input history.
 	 */
@@ -82,6 +79,10 @@ export interface IChatWidgetLocationOptions {
 	resolveData?(): IChatLocationData | undefined;
 }
 
+export function isQuickChat(widget: IChatWidget): boolean {
+	return 'viewContext' in widget && 'isQuickChat' in widget.viewContext && Boolean(widget.viewContext.isQuickChat);
+}
+
 export class ChatWidget extends Disposable implements IChatWidget {
 	public static readonly CONTRIBS: { new(...args: [IChatWidget, ...any]): IChatWidgetContrib }[] = [];
 
@@ -190,9 +191,11 @@ export class ChatWidget extends Disposable implements IChatWidget {
 		return this._location.location;
 	}
 
+	readonly viewContext: IChatWidgetViewContext;
+
 	constructor(
 		location: ChatAgentLocation | IChatWidgetLocationOptions,
-		readonly viewContext: IChatWidgetViewContext,
+		_viewContext: IChatWidgetViewContext | undefined,
 		private readonly viewOptions: IChatWidgetViewOptions,
 		private readonly styles: IChatWidgetStyles,
 		@ICodeEditorService codeEditorService: ICodeEditorService,
@@ -209,6 +212,8 @@ export class ChatWidget extends Disposable implements IChatWidget {
 	) {
 		super();
 
+		this.viewContext = _viewContext ?? {};
+
 		if (typeof location === 'object') {
 			this._location = location;
 		} else {
@@ -217,7 +222,7 @@ export class ChatWidget extends Disposable implements IChatWidget {
 
 		CONTEXT_IN_CHAT_SESSION.bindTo(contextKeyService).set(true);
 		CONTEXT_CHAT_LOCATION.bindTo(contextKeyService).set(this._location.location);
-		CONTEXT_IN_QUICK_CHAT.bindTo(contextKeyService).set('resource' in viewContext);
+		CONTEXT_IN_QUICK_CHAT.bindTo(contextKeyService).set(isQuickChat(this));
 		this.agentInInput = CONTEXT_CHAT_INPUT_HAS_AGENT.bindTo(contextKeyService);
 		this.requestInProgress = CONTEXT_CHAT_REQUEST_IN_PROGRESS.bindTo(contextKeyService);
 
@@ -226,13 +231,7 @@ export class ChatWidget extends Disposable implements IChatWidget {
 		this._codeBlockModelCollection = this._register(instantiationService.createInstance(CodeBlockModelCollection));
 
 		this._register(codeEditorService.registerCodeEditorOpenHandler(async (input: ITextResourceEditorInput, _source: ICodeEditor | null, _sideBySide?: boolean): Promise<ICodeEditor | null> => {
-			let resource = input.resource;
-
-			// if trying to open backing documents, actually open the real chat code block doc
-			if (matchesScheme(resource, Schemas.vscodeCopilotBackingChatCodeBlock)) {
-				resource = resource.with({ scheme: Schemas.vscodeChatCodeBlock });
-			}
-
+			const resource = input.resource;
 			if (resource.scheme !== Schemas.vscodeChatCodeBlock) {
 				return null;
 			}
@@ -253,18 +252,35 @@ export class ChatWidget extends Disposable implements IChatWidget {
 
 			await timeout(0); // wait for list to actually render
 
-			for (const editor of this.renderer.editorsInUse() ?? []) {
-				if (extUri.isEqual(editor.uri, resource, true)) {
-					const inner = editor.editor;
+			for (const codeBlockPart of this.renderer.editorsInUse()) {
+				if (extUri.isEqual(codeBlockPart.uri, resource, true)) {
+					const editor = codeBlockPart.editor;
+
+					let relativeTop = 0;
+					const editorDomNode = editor.getDomNode();
+					if (editorDomNode) {
+						const row = dom.findParentWithClass(editorDomNode, 'monaco-list-row');
+						if (row) {
+							relativeTop = dom.getTopLeftOffset(editorDomNode).top - dom.getTopLeftOffset(row).top;
+						}
+					}
+
 					if (input.options?.selection) {
-						inner.setSelection({
+						const editorSelectionTopOffset = editor.getTopForPosition(input.options.selection.startLineNumber, input.options.selection.startColumn);
+						relativeTop += editorSelectionTopOffset;
+
+						editor.focus();
+						editor.setSelection({
 							startLineNumber: input.options.selection.startLineNumber,
 							startColumn: input.options.selection.startColumn,
 							endLineNumber: input.options.selection.endLineNumber ?? input.options.selection.startLineNumber,
 							endColumn: input.options.selection.endColumn ?? input.options.selection.startColumn
 						});
 					}
-					return inner;
+
+					this.reveal(item, relativeTop);
+
+					return editor;
 				}
 			}
 			return null;
@@ -337,15 +353,6 @@ export class ChatWidget extends Disposable implements IChatWidget {
 				return undefined;
 			}
 		}).filter(isDefined);
-
-		this.contribs.forEach(c => {
-			if (c.onDidChangeInputState) {
-				this._register(c.onDidChangeInputState(() => {
-					const state = this.collectInputState();
-					this.inputPart.updateState(state);
-				}));
-			}
-		});
 	}
 
 	getContrib<T extends IChatWidgetContrib>(id: string): T | undefined {
@@ -492,7 +499,7 @@ export class ChatWidget extends Disposable implements IChatWidget {
 		this._register(this.renderer.onDidClickRerunWithAgentOrCommandDetection(item => {
 			const request = this.chatService.getSession(item.sessionId)?.getRequests().find(candidate => candidate.id === item.requestId);
 			if (request) {
-				this.chatService.resendRequest(request, { noCommandDetection: true, attempt: request.attempt, location: this.location }).catch(e => this.logService.error('FAILED to rerun request', e));
+				this.chatService.resendRequest(request, { noCommandDetection: true, attempt: request.attempt + 1, location: this.location }).catch(e => this.logService.error('FAILED to rerun request', e));
 			}
 		}));
 
@@ -586,7 +593,8 @@ export class ChatWidget extends Disposable implements IChatWidget {
 				renderStyle: options?.renderStyle === 'minimal' ? 'compact' : options?.renderStyle,
 				menus: { executeToolbar: MenuId.ChatExecute, ...this.viewOptions.menus },
 				editorOverflowWidgetsDomNode: this.viewOptions.editorOverflowWidgetsDomNode,
-			}
+			},
+			() => this.collectInputState()
 		));
 		this.inputPart.render(container, '', this);
 
@@ -711,8 +719,8 @@ export class ChatWidget extends Disposable implements IChatWidget {
 		return this.tree.getFocus()[0] ?? undefined;
 	}
 
-	reveal(item: ChatTreeItem): void {
-		this.tree.reveal(item);
+	reveal(item: ChatTreeItem, relativeTop?: number): void {
+		this.tree.reveal(item, relativeTop);
 	}
 
 	focus(item: ChatTreeItem): void {
@@ -788,12 +796,17 @@ export class ChatWidget extends Disposable implements IChatWidget {
 			if (result) {
 				this.inputPart.acceptInput(isUserQuery);
 				this._onDidSubmitAgent.fire({ agent: result.agent, slashCommand: result.slashCommand });
-				this.inputPart.updateState(this.collectInputState());
-				this.inputPart.clearContext();
 				result.responseCompletePromise.then(() => {
 					const responses = this.viewModel?.getItems().filter(isResponseVM);
 					const lastResponse = responses?.[responses.length - 1];
 					this.chatAccessibilityService.acceptResponse(lastResponse, requestId);
+					if (lastResponse?.result?.nextQuestion) {
+						const { prompt, participant, command } = lastResponse.result.nextQuestion;
+						const question = formatChatQuestion(this.chatAgentService, this.location, prompt, participant, command);
+						if (question) {
+							this.input.setValue(question, false);
+						}
+					}
 				});
 				return result.responseCreatedPromise;
 			}
@@ -801,7 +814,6 @@ export class ChatWidget extends Disposable implements IChatWidget {
 		return undefined;
 	}
 
-
 	setContext(overwrite: boolean, ...contentReferences: IChatRequestVariableEntry[]) {
 		this.inputPart.attachContext(overwrite, ...contentReferences);
 	}
@@ -964,7 +976,6 @@ export class ChatWidget extends Disposable implements IChatWidget {
 	}
 
 	getViewState(): IChatViewState {
-		this.inputPart.saveState();
 		return { inputValue: this.getInput(), inputState: this.collectInputState() };
 	}
 }
diff --git a/src/vs/workbench/contrib/chat/browser/codeBlockPart.css b/src/vs/workbench/contrib/chat/browser/codeBlockPart.css
index 89596f89748..35830daeacb 100644
--- a/src/vs/workbench/contrib/chat/browser/codeBlockPart.css
+++ b/src/vs/workbench/contrib/chat/browser/codeBlockPart.css
@@ -15,7 +15,7 @@
 .interactive-result-code-block .interactive-result-code-block-toolbar > .monaco-action-bar,
 .interactive-result-code-block .interactive-result-code-block-toolbar > .monaco-toolbar {
 	position: absolute;
-	top: -13px;
+	top: -15px;
 	height: 26px;
 	line-height: 26px;
 	background-color: var(--vscode-interactive-result-editor-background-color, var(--vscode-editor-background));
diff --git a/src/vs/workbench/contrib/chat/browser/codeBlockPart.ts b/src/vs/workbench/contrib/chat/browser/codeBlockPart.ts
index d79ce946163..5db94d519a7 100644
--- a/src/vs/workbench/contrib/chat/browser/codeBlockPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/codeBlockPart.ts
@@ -10,8 +10,8 @@ import { renderFormattedText } from 'vs/base/browser/formattedTextRenderer';
 import { Button } from 'vs/base/browser/ui/button/button';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { Codicon } from 'vs/base/common/codicons';
-import { Emitter } from 'vs/base/common/event';
-import { Disposable, DisposableStore, MutableDisposable } from 'vs/base/common/lifecycle';
+import { Emitter, Event } from 'vs/base/common/event';
+import { combinedDisposable, Disposable, DisposableStore, MutableDisposable } from 'vs/base/common/lifecycle';
 import { Schemas } from 'vs/base/common/network';
 import { isEqual } from 'vs/base/common/resources';
 import { URI, UriComponents } from 'vs/base/common/uri';
@@ -24,7 +24,7 @@ import { CodeEditorWidget, ICodeEditorWidgetOptions } from 'vs/editor/browser/wi
 import { DiffEditorWidget } from 'vs/editor/browser/widget/diffEditor/diffEditorWidget';
 import { EDITOR_FONT_DEFAULTS, EditorOption, IEditorOptions } from 'vs/editor/common/config/editorOptions';
 import { IRange, Range } from 'vs/editor/common/core/range';
-import { IDiffEditorViewModel, ScrollType } from 'vs/editor/common/editorCommon';
+import { ScrollType } from 'vs/editor/common/editorCommon';
 import { TextEdit } from 'vs/editor/common/languages';
 import { EndOfLinePreference, ITextModel } from 'vs/editor/common/model';
 import { TextModelText } from 'vs/editor/common/model/textModelText';
@@ -35,7 +35,9 @@ import { BracketMatchingController } from 'vs/editor/contrib/bracketMatching/bro
 import { ColorDetector } from 'vs/editor/contrib/colorPicker/browser/colorDetector';
 import { ContextMenuController } from 'vs/editor/contrib/contextmenu/browser/contextmenu';
 import { GotoDefinitionAtPositionEditorContribution } from 'vs/editor/contrib/gotoSymbol/browser/link/goToDefinitionAtPosition';
-import { HoverController } from 'vs/editor/contrib/hover/browser/hoverController';
+import { ContentHoverController } from 'vs/editor/contrib/hover/browser/contentHoverController2';
+import { MarginHoverController } from 'vs/editor/contrib/hover/browser/marginHoverController';
+import { LinkDetector } from 'vs/editor/contrib/links/browser/links';
 import { MessageController } from 'vs/editor/contrib/message/browser/messageController';
 import { ViewportSemanticTokensContribution } from 'vs/editor/contrib/semanticTokens/browser/viewportSemanticTokens';
 import { SmartSelectController } from 'vs/editor/contrib/smartSelect/browser/smartSelect';
@@ -47,10 +49,13 @@ import { MenuId } from 'vs/platform/actions/common/actions';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
+import { FileKind } from 'vs/platform/files/common/files';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
 import { ILabelService } from 'vs/platform/label/common/label';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
+import { ResourceLabel } from 'vs/workbench/browser/labels';
+import { ResourceContextKey } from 'vs/workbench/common/contextkeys';
 import { AccessibilityVerbositySettingId } from 'vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
 import { ChatTreeItem } from 'vs/workbench/contrib/chat/browser/chat';
 import { IChatRendererDelegate } from 'vs/workbench/contrib/chat/browser/chatListRenderer';
@@ -62,8 +67,7 @@ import { MenuPreventer } from 'vs/workbench/contrib/codeEditor/browser/menuPreve
 import { SelectionClipboardContributionID } from 'vs/workbench/contrib/codeEditor/browser/selectionClipboard';
 import { getSimpleEditorOptions } from 'vs/workbench/contrib/codeEditor/browser/simpleEditorOptions';
 import { IMarkdownVulnerability } from '../common/annotations';
-import { ResourceLabel } from 'vs/workbench/browser/labels';
-import { FileKind } from 'vs/platform/files/common/files';
+import { assertType } from 'vs/base/common/types';
 
 const $ = dom.$;
 
@@ -146,6 +150,8 @@ export class CodeBlockPart extends Disposable {
 	private readonly disposableStore = this._register(new DisposableStore());
 	private isDisposed = false;
 
+	private resourceContextKey: ResourceContextKey;
+
 	constructor(
 		private readonly options: ChatEditorOptions,
 		readonly menuId: MenuId,
@@ -160,6 +166,7 @@ export class CodeBlockPart extends Disposable {
 		super();
 		this.element = $('.interactive-result-code-block');
 
+		this.resourceContextKey = this._register(instantiationService.createInstance(ResourceContextKey));
 		this.contextKeyService = this._register(contextKeyService.createScoped(this.element));
 		const scopedInstantiationService = this._register(instantiationService.createChild(new ServiceCollection([IContextKeyService, this.contextKeyService])));
 		const editorElement = dom.append(this.element, $('.interactive-result-editor'));
@@ -286,10 +293,12 @@ export class CodeBlockPart extends Disposable {
 				ViewportSemanticTokensContribution.ID,
 				BracketMatchingController.ID,
 				SmartSelectController.ID,
-				HoverController.ID,
+				ContentHoverController.ID,
+				MarginHoverController.ID,
 				MessageController.ID,
 				GotoDefinitionAtPositionEditorContribution.ID,
-				ColorDetector.ID
+				ColorDetector.ID,
+				LinkDetector.ID,
 			])
 		}));
 	}
@@ -396,7 +405,8 @@ export class CodeBlockPart extends Disposable {
 	}
 
 	private clearWidgets() {
-		HoverController.get(this.editor)?.hideContentHover();
+		ContentHoverController.get(this.editor)?.hideContentHover();
+		MarginHoverController.get(this.editor)?.hideContentHover();
 	}
 
 	private async updateEditor(data: ICodeBlockData): Promise<void> {
@@ -413,6 +423,7 @@ export class CodeBlockPart extends Disposable {
 			element: data.element,
 			languageId: textModel.getLanguageId()
 		} satisfies ICodeBlockActionContext;
+		this.resourceContextKey.set(textModel.uri);
 	}
 
 	private getVulnerabilitiesLabel(): string {
@@ -473,6 +484,7 @@ export interface ICodeCompareBlockData {
 }
 
 
+// long-lived object that sits in the DiffPool and that gets reused
 export class CodeCompareBlockPart extends Disposable {
 	protected readonly _onDidChangeContentHeight = this._register(new Emitter<void>());
 	public readonly onDidChangeContentHeight = this._onDidChangeContentHeight.event;
@@ -484,7 +496,7 @@ export class CodeCompareBlockPart extends Disposable {
 	readonly element: HTMLElement;
 	private readonly messageElement: HTMLElement;
 
-	private readonly _lastDiffEditorViewModel = this._store.add(new MutableDisposable<IDiffEditorViewModel>());
+	private readonly _lastDiffEditorViewModel = this._store.add(new MutableDisposable());
 	private currentScrollWidth = 0;
 
 	constructor(
@@ -602,7 +614,8 @@ export class CodeCompareBlockPart extends Disposable {
 				ViewportSemanticTokensContribution.ID,
 				BracketMatchingController.ID,
 				SmartSelectController.ID,
-				HoverController.ID,
+				ContentHoverController.ID,
+				MarginHoverController.ID,
 				GotoDefinitionAtPositionEditorContribution.ID,
 			])
 		};
@@ -682,7 +695,9 @@ export class CodeCompareBlockPart extends Disposable {
 	}
 
 	private getContentHeight() {
-		return this.diffEditor.getContentHeight();
+		return this.diffEditor.getModel()
+			? this.diffEditor.getContentHeight()
+			: dom.getTotalHeight(this.messageElement);
 	}
 
 	async render(data: ICodeCompareBlockData, width: number, token: CancellationToken) {
@@ -712,8 +727,10 @@ export class CodeCompareBlockPart extends Disposable {
 	}
 
 	private clearWidgets() {
-		HoverController.get(this.diffEditor.getOriginalEditor())?.hideContentHover();
-		HoverController.get(this.diffEditor.getModifiedEditor())?.hideContentHover();
+		ContentHoverController.get(this.diffEditor.getOriginalEditor())?.hideContentHover();
+		ContentHoverController.get(this.diffEditor.getModifiedEditor())?.hideContentHover();
+		MarginHoverController.get(this.diffEditor.getOriginalEditor())?.hideContentHover();
+		MarginHoverController.get(this.diffEditor.getModifiedEditor())?.hideContentHover();
 	}
 
 	private async updateEditor(data: ICodeCompareBlockData, token: CancellationToken): Promise<void> {
@@ -728,7 +745,8 @@ export class CodeCompareBlockPart extends Disposable {
 
 		this.element.classList.toggle('no-diff', isEditApplied);
 
-		if (data.edit.state?.applied) {
+		if (isEditApplied) {
+			assertType(data.edit.state?.applied);
 
 			const uriLabel = this.labelService.getUriLabel(data.edit.uri, { relative: true, noPrefix: true });
 
@@ -752,15 +770,11 @@ export class CodeCompareBlockPart extends Disposable {
 			});
 
 			dom.reset(this.messageElement, message);
-
 		}
 
 		const diffData = await data.diffData;
-		if (!diffData) {
-			return;
-		}
 
-		if (!isEditApplied) {
+		if (!isEditApplied && diffData) {
 			const viewModel = this.diffEditor.createViewModel({
 				original: diffData.original,
 				modified: diffData.modified
@@ -772,12 +786,18 @@ export class CodeCompareBlockPart extends Disposable {
 				return;
 			}
 
+			const listener = Event.any(diffData.original.onWillDispose, diffData.modified.onWillDispose)(() => {
+				// this a bit weird and basically duplicates https://github.com/microsoft/vscode/blob/7cbcafcbcc88298cfdcd0238018fbbba8eb6853e/src/vs/editor/browser/widget/diffEditor/diffEditorWidget.ts#L328
+				// which cannot call `setModel(null)` without first complaining
+				this.diffEditor.setModel(null);
+			});
 			this.diffEditor.setModel(viewModel);
-			this._lastDiffEditorViewModel.value = viewModel;
+			this._lastDiffEditorViewModel.value = combinedDisposable(listener, viewModel);
 
 		} else {
 			this.diffEditor.setModel(null);
 			this._lastDiffEditorViewModel.value = undefined;
+			this._onDidChangeContentHeight.fire();
 		}
 
 		this.toolbar.context = {
@@ -786,10 +806,6 @@ export class CodeCompareBlockPart extends Disposable {
 			diffEditor: this.diffEditor,
 		} satisfies ICodeCompareBlockActionContext;
 	}
-
-	clearModel() {
-		this.diffEditor.setModel(null);
-	}
 }
 
 export class DefaultChatTextEditor {
diff --git a/src/vs/workbench/contrib/chat/browser/contrib/chatContextAttachments.ts b/src/vs/workbench/contrib/chat/browser/contrib/chatContextAttachments.ts
index 8886027d534..c19bc95305f 100644
--- a/src/vs/workbench/contrib/chat/browser/contrib/chatContextAttachments.ts
+++ b/src/vs/workbench/contrib/chat/browser/contrib/chatContextAttachments.ts
@@ -3,7 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter } from 'vs/base/common/event';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { IChatWidget } from 'vs/workbench/contrib/chat/browser/chat';
 import { ChatWidget, IChatWidgetContrib } from 'vs/workbench/contrib/chat/browser/chatWidget';
@@ -13,9 +12,6 @@ export class ChatContextAttachments extends Disposable implements IChatWidgetCon
 
 	private _attachedContext = new Set<IChatRequestVariableEntry>();
 
-	private readonly _onDidChangeInputState = this._register(new Emitter<void>());
-	readonly onDidChangeInputState = this._onDidChangeInputState.event;
-
 	public static readonly ID = 'chatContextAttachments';
 
 	get id() {
@@ -66,13 +62,11 @@ export class ChatContextAttachments extends Disposable implements IChatWidgetCon
 		}
 
 		this.widget.setContext(overwrite, ...attachments);
-		this._onDidChangeInputState.fire();
 	}
 
 	private _removeContext(attachments: IChatRequestVariableEntry[]) {
 		if (attachments.length) {
 			attachments.forEach(this._attachedContext.delete, this._attachedContext);
-			this._onDidChangeInputState.fire();
 		}
 	}
 
diff --git a/src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables.ts b/src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables.ts
index 0b5712a7979..a81f88f9367 100644
--- a/src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables.ts
+++ b/src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables.ts
@@ -4,7 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { coalesce } from 'vs/base/common/arrays';
-import { Emitter } from 'vs/base/common/event';
 import { IMarkdownString, MarkdownString } from 'vs/base/common/htmlContent';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { basename } from 'vs/base/common/resources';
@@ -39,9 +38,6 @@ export class ChatDynamicVariableModel extends Disposable implements IChatWidgetC
 		return ChatDynamicVariableModel.ID;
 	}
 
-	private _onDidChangeInputState = this._register(new Emitter<void>());
-	readonly onDidChangeInputState = this._onDidChangeInputState.event;
-
 	constructor(
 		private readonly widget: IChatWidget,
 		@ILabelService private readonly labelService: ILabelService,
@@ -50,7 +46,6 @@ export class ChatDynamicVariableModel extends Disposable implements IChatWidgetC
 		this._register(widget.inputEditor.onDidChangeModelContent(e => {
 			e.changes.forEach(c => {
 				// Don't mutate entries in _variables, since they will be returned from the getter
-				let didModifyState = false;
 				this._variables = coalesce(this._variables.map(ref => {
 					const intersection = Range.intersectRanges(ref.range, c.range);
 					if (intersection && !intersection.isEmpty()) {
@@ -63,11 +58,9 @@ export class ChatDynamicVariableModel extends Disposable implements IChatWidgetC
 								text: '',
 							}]);
 						}
-						didModifyState = true;
 						return null;
 					} else if (Range.compareRangesUsingStarts(ref.range, c.range) > 0) {
 						const delta = c.text.length - c.rangeLength;
-						didModifyState = true;
 						return {
 							...ref,
 							range: {
@@ -81,10 +74,6 @@ export class ChatDynamicVariableModel extends Disposable implements IChatWidgetC
 
 					return ref;
 				}));
-
-				if (didModifyState) {
-					this._onDidChangeInputState.fire();
-				}
 			});
 
 			this.updateDecorations();
@@ -107,22 +96,21 @@ export class ChatDynamicVariableModel extends Disposable implements IChatWidgetC
 	addReference(ref: IDynamicVariable): void {
 		this._variables.push(ref);
 		this.updateDecorations();
-		this._onDidChangeInputState.fire();
 	}
 
 	private updateDecorations(): void {
-		this.widget.inputEditor.setDecorationsByType('chat', dynamicVariableDecorationType, this._variables.map(r => (<IDecorationOptions>{
+		this.widget.inputEditor.setDecorationsByType('chat', dynamicVariableDecorationType, this._variables.map((r): IDecorationOptions => ({
 			range: r.range,
 			hoverMessage: this.getHoverForReference(r)
 		})));
 	}
 
-	private getHoverForReference(ref: IDynamicVariable): string | IMarkdownString {
+	private getHoverForReference(ref: IDynamicVariable): IMarkdownString | undefined {
 		const value = ref.data;
 		if (URI.isUri(value)) {
 			return new MarkdownString(this.labelService.getUriLabel(value, { relative: true }));
 		} else {
-			return (value as any).toString();
+			return undefined;
 		}
 	}
 }
@@ -174,11 +162,10 @@ export class SelectAndInsertFileAction extends Action2 {
 		// This of course assumes that the `files` variable has the behavior that it searches
 		// through files in the workspace.
 		if (chatVariablesService.hasVariable(SelectAndInsertFileAction.Name)) {
-			options = {
-				providerOptions: <AnythingQuickAccessProviderRunOptions>{
-					additionPicks: [SelectAndInsertFileAction.Item, { type: 'separator' }]
-				},
+			const providerOptions: AnythingQuickAccessProviderRunOptions = {
+				additionPicks: [SelectAndInsertFileAction.Item, { type: 'separator' }]
 			};
+			options = { providerOptions };
 		}
 		// TODO: have dedicated UX for this instead of using the quick access picker
 		const picks = await quickInputService.quickAccess.pick('', options);
diff --git a/src/vs/workbench/contrib/chat/browser/contrib/chatInputCompletions.ts b/src/vs/workbench/contrib/chat/browser/contrib/chatInputCompletions.ts
index b35822971a1..c0478be24fa 100644
--- a/src/vs/workbench/contrib/chat/browser/contrib/chatInputCompletions.ts
+++ b/src/vs/workbench/contrib/chat/browser/contrib/chatInputCompletions.ts
@@ -22,9 +22,10 @@ import { IChatWidget, IChatWidgetService } from 'vs/workbench/contrib/chat/brows
 import { ChatInputPart } from 'vs/workbench/contrib/chat/browser/chatInputPart';
 import { SelectAndInsertFileAction } from 'vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables';
 import { ChatAgentLocation, getFullyQualifiedId, IChatAgentData, IChatAgentNameService, IChatAgentService } from 'vs/workbench/contrib/chat/common/chatAgents';
-import { ChatRequestAgentPart, ChatRequestAgentSubcommandPart, ChatRequestTextPart, ChatRequestVariablePart, chatAgentLeader, chatSubcommandLeader, chatVariableLeader } from 'vs/workbench/contrib/chat/common/chatParserTypes';
+import { ChatRequestAgentPart, ChatRequestAgentSubcommandPart, ChatRequestTextPart, ChatRequestToolPart, ChatRequestVariablePart, chatAgentLeader, chatSubcommandLeader, chatVariableLeader } from 'vs/workbench/contrib/chat/common/chatParserTypes';
 import { IChatSlashCommandService } from 'vs/workbench/contrib/chat/common/chatSlashCommands';
 import { IChatVariablesService } from 'vs/workbench/contrib/chat/common/chatVariables';
+import { ILanguageModelToolsService } from 'vs/workbench/contrib/chat/common/languageModelToolsService';
 import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
 
 class SlashCommandCompletions extends Disposable {
@@ -318,7 +319,7 @@ class BuiltinDynamicCompletions extends Disposable {
 					return null;
 				}
 
-				const range = computeCompletionRanges(model, position, BuiltinDynamicCompletions.VariableNameDef);
+				const range = computeCompletionRanges(model, position, BuiltinDynamicCompletions.VariableNameDef, true);
 				if (!range) {
 					return null;
 				}
@@ -344,12 +345,19 @@ class BuiltinDynamicCompletions extends Disposable {
 
 Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(BuiltinDynamicCompletions, LifecyclePhase.Eventually);
 
-function computeCompletionRanges(model: ITextModel, position: Position, reg: RegExp): { insert: Range; replace: Range; varWord: IWordAtPosition | null } | undefined {
+function computeCompletionRanges(model: ITextModel, position: Position, reg: RegExp, onlyOnWordStart = false): { insert: Range; replace: Range; varWord: IWordAtPosition | null } | undefined {
 	const varWord = getWordAtText(position.column, reg, model.getLineContent(position.lineNumber), 0);
 	if (!varWord && model.getWordUntilPosition(position).word) {
 		// inside a "normal" word
 		return;
 	}
+	if (varWord && onlyOnWordStart) {
+		const wordBefore = model.getWordUntilPosition({ lineNumber: position.lineNumber, column: varWord.startColumn });
+		if (wordBefore.word) {
+			// inside a word
+			return;
+		}
+	}
 
 	let insert: Range;
 	let replace: Range;
@@ -372,6 +380,7 @@ class VariableCompletions extends Disposable {
 		@IChatWidgetService private readonly chatWidgetService: IChatWidgetService,
 		@IChatVariablesService private readonly chatVariablesService: IChatVariablesService,
 		@IConfigurationService configService: IConfigurationService,
+		@ILanguageModelToolsService toolsService: ILanguageModelToolsService
 	) {
 		super();
 
@@ -379,7 +388,6 @@ class VariableCompletions extends Disposable {
 			_debugDisplayName: 'chatVariables',
 			triggerCharacters: [chatVariableLeader],
 			provideCompletionItems: async (model: ITextModel, position: Position, _context: CompletionContext, _token: CancellationToken) => {
-
 				const locations = new Set<ChatAgentLocation>();
 				locations.add(ChatAgentLocation.Panel);
 
@@ -394,7 +402,7 @@ class VariableCompletions extends Disposable {
 					return null;
 				}
 
-				const range = computeCompletionRanges(model, position, VariableCompletions.VariableNameDef);
+				const range = computeCompletionRanges(model, position, VariableCompletions.VariableNameDef, true);
 				if (!range) {
 					return null;
 				}
@@ -403,9 +411,10 @@ class VariableCompletions extends Disposable {
 				const slowSupported = usedAgent ? usedAgent.agent.metadata.supportsSlowVariables : true;
 
 				const usedVariables = widget.parsedInput.parts.filter((p): p is ChatRequestVariablePart => p instanceof ChatRequestVariablePart);
+				const usedVariableNames = new Set(usedVariables.map(v => v.variableName));
 				const variableItems = Array.from(this.chatVariablesService.getVariables(widget.location))
 					// This doesn't look at dynamic variables like `file`, where multiple makes sense.
-					.filter(v => !usedVariables.some(usedVar => usedVar.variableName === v.name))
+					.filter(v => !usedVariableNames.has(v.name))
 					.filter(v => !v.isSlow || slowSupported)
 					.map((v): CompletionItem => {
 						const withLeader = `${chatVariableLeader}${v.name}`;
@@ -419,8 +428,28 @@ class VariableCompletions extends Disposable {
 						};
 					});
 
+				const usedTools = widget.parsedInput.parts.filter((p): p is ChatRequestToolPart => p instanceof ChatRequestToolPart);
+				const usedToolNames = new Set(usedTools.map(v => v.toolName));
+				const toolItems: CompletionItem[] = [];
+				if (!usedAgent || usedAgent.agent.supportsToolReferences) {
+					toolItems.push(...Array.from(toolsService.getTools())
+						.filter(t => t.canBeInvokedManually)
+						.filter(t => !usedToolNames.has(t.name ?? ''))
+						.map((t): CompletionItem => {
+							const withLeader = `${chatVariableLeader}${t.name}`;
+							return {
+								label: withLeader,
+								range,
+								insertText: withLeader + ' ',
+								detail: t.userDescription,
+								kind: CompletionItemKind.Text,
+								sortText: 'z'
+							};
+						}));
+				}
+
 				return {
-					suggestions: variableItems
+					suggestions: [...variableItems, ...toolItems]
 				};
 			}
 		}));
diff --git a/src/vs/workbench/contrib/chat/browser/contrib/chatInputEditorContrib.ts b/src/vs/workbench/contrib/chat/browser/contrib/chatInputEditorContrib.ts
index b72abe680df..4af488fdf75 100644
--- a/src/vs/workbench/contrib/chat/browser/contrib/chatInputEditorContrib.ts
+++ b/src/vs/workbench/contrib/chat/browser/contrib/chatInputEditorContrib.ts
@@ -16,7 +16,7 @@ import { ChatWidget } from 'vs/workbench/contrib/chat/browser/chatWidget';
 import { dynamicVariableDecorationType } from 'vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables';
 import { IChatAgentCommand, IChatAgentData, IChatAgentService } from 'vs/workbench/contrib/chat/common/chatAgents';
 import { chatSlashCommandBackground, chatSlashCommandForeground } from 'vs/workbench/contrib/chat/common/chatColors';
-import { ChatRequestAgentPart, ChatRequestAgentSubcommandPart, ChatRequestSlashCommandPart, ChatRequestTextPart, ChatRequestVariablePart, IParsedChatRequestPart, chatAgentLeader, chatSubcommandLeader } from 'vs/workbench/contrib/chat/common/chatParserTypes';
+import { ChatRequestAgentPart, ChatRequestAgentSubcommandPart, ChatRequestSlashCommandPart, ChatRequestTextPart, ChatRequestToolPart, ChatRequestVariablePart, IParsedChatRequestPart, chatAgentLeader, chatSubcommandLeader } from 'vs/workbench/contrib/chat/common/chatParserTypes';
 import { ChatRequestParser } from 'vs/workbench/contrib/chat/common/chatRequestParser';
 
 const decorationDescription = 'chat';
@@ -231,6 +231,11 @@ class InputEditorDecorations extends Disposable {
 			varDecorations.push({ range: variable.editorRange });
 		}
 
+		const toolParts = parsedRequest.filter((p): p is ChatRequestToolPart => p instanceof ChatRequestToolPart);
+		for (const tool of toolParts) {
+			varDecorations.push({ range: tool.editorRange });
+		}
+
 		this.widget.inputEditor.setDecorationsByType(decorationDescription, variableTextDecorationType, varDecorations);
 	}
 }
@@ -304,7 +309,7 @@ class ChatTokenDeleter extends Disposable {
 				const previousParsedValue = parser.parseChatRequest(this.widget.viewModel.sessionId, previousInputValue, widget.location, { selectedAgent: previousSelectedAgent });
 
 				// For dynamic variables, this has to happen in ChatDynamicVariableModel with the other bookkeeping
-				const deletableTokens = previousParsedValue.parts.filter(p => p instanceof ChatRequestAgentPart || p instanceof ChatRequestAgentSubcommandPart || p instanceof ChatRequestSlashCommandPart || p instanceof ChatRequestVariablePart);
+				const deletableTokens = previousParsedValue.parts.filter(p => p instanceof ChatRequestAgentPart || p instanceof ChatRequestAgentSubcommandPart || p instanceof ChatRequestSlashCommandPart || p instanceof ChatRequestVariablePart || p instanceof ChatRequestToolPart);
 				deletableTokens.forEach(token => {
 					const deletedRangeOfToken = Range.intersectRanges(token.editorRange, change.range);
 					// Part of this token was deleted, or the space after it was deleted, and the deletion range doesn't go off the front of the token, for simpler math
diff --git a/src/vs/workbench/contrib/chat/browser/media/chat.css b/src/vs/workbench/contrib/chat/browser/media/chat.css
index 36278e96c78..4a8f52ffd62 100644
--- a/src/vs/workbench/contrib/chat/browser/media/chat.css
+++ b/src/vs/workbench/contrib/chat/browser/media/chat.css
@@ -40,6 +40,12 @@
 	display: flex;
 	align-items: center;
 	gap: 8px;
+
+	/*
+	Rendering the avatar icon as round makes it a little larger than the .user container.
+	Add padding so that the focus outline doesn't run into it, and counteract it with a negative margin so it doesn't actually take up any extra space */
+	padding: 2px;
+	margin: -2px;
 }
 
 .interactive-item-container .header .username {
@@ -175,6 +181,16 @@
 	margin-bottom: 8px;
 }
 
+.interactive-item-container .value .rendered-markdown blockquote {
+	margin: 0px;
+	padding: 0px 16px 0 10px;
+	border-left-width: 5px;
+	border-left-style: solid;
+	border-radius: 2px;
+	background: var(--vscode-textBlockQuote-background);
+	border-color: var(--vscode-textBlockQuote-border);
+}
+
 .interactive-item-container .value .rendered-markdown table {
 	width: 100%;
 	text-align: left;
@@ -229,6 +245,14 @@
 	margin-bottom: 0px;
 }
 
+.interactive-item-container .value .rendered-markdown hr {
+	border-color: rgba(0, 0, 0, 0.18);
+}
+
+.vs-dark .interactive-item-container .value .rendered-markdown hr {
+	border-color: rgba(255, 255, 255, 0.18);
+}
+
 .interactive-item-container .value .rendered-markdown h1 {
 	font-size: 20px;
 	font-weight: 600;
@@ -260,14 +284,42 @@
 	margin: 0;
 }
 
+/* #region list indent rules */
 .interactive-item-container .value .rendered-markdown ul {
+	/* Keep this in sync with the values for dedented codeblocks below */
 	padding-inline-start: 24px;
 }
 
 .interactive-item-container .value .rendered-markdown ol {
+	/* Keep this in sync with the values for dedented codeblocks below */
 	padding-inline-start: 28px;
 }
 
+/* NOTE- We want to dedent codeblocks in lists specifically to give them the full width. No more elegant way to do this, these values
+have to be updated for changes to the rules above, or to support more deeply nested lists. */
+.interactive-item-container .value .rendered-markdown ul .interactive-result-code-block {
+	margin-left: -24px;
+}
+
+.interactive-item-container .value .rendered-markdown ul ul .interactive-result-code-block {
+	margin-left: -48px;
+}
+
+.interactive-item-container .value .rendered-markdown ol .interactive-result-code-block {
+	margin-left: -28px;
+}
+
+.interactive-item-container .value .rendered-markdown ol ol .interactive-result-code-block {
+	margin-left: -56px;
+}
+
+.interactive-item-container .value .rendered-markdown ol ul .interactive-result-code-block,
+.interactive-item-container .value .rendered-markdown ul ol .interactive-result-code-block {
+	margin-left: -52px;
+}
+
+/* #endregion list indent rules */
+
 .interactive-item-container .value .rendered-markdown li {
 	line-height: 1.3rem;
 }
@@ -398,7 +450,7 @@
 	border-color: var(--vscode-focusBorder);
 }
 
-.interactive-session .interactive-input-and-execute-toolbar .monaco-editor .mtk1 {
+.interactive-input-and-execute-toolbar .monaco-editor .mtk1 {
 	color: var(--vscode-input-foreground);
 }
 
@@ -558,6 +610,13 @@
 	flex-wrap: wrap;
 }
 
+.interactive-session .interactive-input-part.compact .chat-attached-context {
+	padding-top: 8px;
+	display: flex;
+	gap: 4px;
+	flex-wrap: wrap;
+}
+
 .interactive-session .interactive-item-container.interactive-request .chat-attached-context {
 	margin-top: -8px;
 }
@@ -634,12 +693,6 @@
 	color: var(--vscode-icon-foreground) !important;
 }
 
-.interactive-item-container.filtered-response .value > .rendered-markdown {
-	pointer-events: none;
-	-webkit-mask-image: linear-gradient(rgba(0, 0, 0, 0.75), rgba(0, 0, 0, 0.05) 60%, rgba(0, 0, 0, 0.00) 80%);
-	mask-image: linear-gradient(rgba(0, 0, 0, 0.75), rgba(0, 0, 0, 0.05) 60%, rgba(0, 0, 0, 0.00) 80%);
-}
-
 /* #region Quick Chat */
 
 .quick-input-widget .interactive-session .interactive-input-part {
diff --git a/src/vs/workbench/contrib/chat/common/chatAgents.ts b/src/vs/workbench/contrib/chat/common/chatAgents.ts
index 08d7013d770..5725b2b0850 100644
--- a/src/vs/workbench/contrib/chat/common/chatAgents.ts
+++ b/src/vs/workbench/contrib/chat/common/chatAgents.ts
@@ -24,7 +24,7 @@ import { ILogService } from 'vs/platform/log/common/log';
 import { IProductService } from 'vs/platform/product/common/productService';
 import { asJson, IRequestService } from 'vs/platform/request/common/request';
 import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { CONTEXT_CHAT_ENABLED } from 'vs/workbench/contrib/chat/common/chatContextKeys';
+import { CONTEXT_CHAT_ENABLED, CONTEXT_CHAT_PANEL_PARTICIPANT_REGISTERED } from 'vs/workbench/contrib/chat/common/chatContextKeys';
 import { IChatProgressResponseContent, IChatRequestVariableData, ISerializableChatAgentData } from 'vs/workbench/contrib/chat/common/chatModel';
 import { IRawChatCommandContribution, RawChatParticipantLocation } from 'vs/workbench/contrib/chat/common/chatParticipantContribTypes';
 import { IChatFollowup, IChatLocationData, IChatProgress, IChatResponseErrorDetails, IChatTaskDto } from 'vs/workbench/contrib/chat/common/chatService';
@@ -74,15 +74,33 @@ export interface IChatAgentData {
 	metadata: IChatAgentMetadata;
 	slashCommands: IChatAgentCommand[];
 	locations: ChatAgentLocation[];
+	disambiguation: { categoryName: string; description: string; examples: string[] }[];
+	supportsToolReferences?: boolean;
 }
 
 export interface IChatAgentImplementation {
 	invoke(request: IChatAgentRequest, progress: (part: IChatProgress) => void, history: IChatAgentHistoryEntry[], token: CancellationToken): Promise<IChatAgentResult>;
 	provideFollowups?(request: IChatAgentRequest, result: IChatAgentResult, history: IChatAgentHistoryEntry[], token: CancellationToken): Promise<IChatFollowup[]>;
 	provideWelcomeMessage?(location: ChatAgentLocation, token: CancellationToken): ProviderResult<(string | IMarkdownString)[] | undefined>;
+	provideChatTitle?: (history: IChatAgentHistoryEntry[], token: CancellationToken) => Promise<string | undefined>;
 	provideSampleQuestions?(location: ChatAgentLocation, token: CancellationToken): ProviderResult<IChatFollowup[] | undefined>;
 }
 
+export interface IChatParticipantDetectionResult {
+	participant: string;
+	command?: string;
+}
+
+export interface IChatParticipantMetadata {
+	participant: string;
+	command?: string;
+	disambiguation: { categoryName: string; description: string; examples: string[] }[];
+}
+
+export interface IChatParticipantDetectionProvider {
+	provideParticipantDetection(request: IChatAgentRequest, history: IChatAgentHistoryEntry[], options: { location: ChatAgentLocation; participants: IChatParticipantMetadata[] }, token: CancellationToken): Promise<IChatParticipantDetectionResult | null | undefined>;
+}
+
 export type IChatAgent = IChatAgentData & IChatAgentImplementation;
 
 export interface IChatAgentCommand extends IRawChatCommandContribution {
@@ -123,6 +141,7 @@ export interface IChatAgentRequest {
 	message: string;
 	attempt?: number;
 	enableCommandDetection?: boolean;
+	isParticipantDetected?: boolean;
 	variables: IChatRequestVariableData;
 	location: ChatAgentLocation;
 	locationData?: IChatLocationData;
@@ -130,14 +149,23 @@ export interface IChatAgentRequest {
 	rejectedConfirmationData?: any[];
 }
 
+export interface IChatQuestion {
+	readonly prompt: string;
+	readonly participant?: string;
+	readonly command?: string;
+}
+
+export interface IChatAgentResultTimings {
+	firstProgress?: number;
+	totalElapsed: number;
+}
+
 export interface IChatAgentResult {
 	errorDetails?: IChatResponseErrorDetails;
-	timings?: {
-		firstProgress?: number;
-		totalElapsed: number;
-	};
+	timings?: IChatAgentResultTimings;
 	/** Extra properties that the agent can use to identify a result */
 	readonly metadata?: { readonly [key: string]: any };
+	nextQuestion?: IChatQuestion;
 }
 
 export const IChatAgentService = createDecorator<IChatAgentService>('chatAgentService');
@@ -167,8 +195,12 @@ export interface IChatAgentService {
 	registerDynamicAgent(data: IChatAgentData, agentImpl: IChatAgentImplementation): IDisposable;
 	registerAgentCompletionProvider(id: string, provider: (query: string, token: CancellationToken) => Promise<IChatAgentCompletionItem[]>): IDisposable;
 	getAgentCompletionItems(id: string, query: string, token: CancellationToken): Promise<IChatAgentCompletionItem[]>;
+	registerChatParticipantDetectionProvider(handle: number, provider: IChatParticipantDetectionProvider): IDisposable;
+	detectAgentOrCommand(request: IChatAgentRequest, history: IChatAgentHistoryEntry[], options: { location: ChatAgentLocation }, token: CancellationToken): Promise<{ agent: IChatAgentData; command?: IChatAgentCommand } | undefined>;
+	hasChatParticipantDetectionProviders(): boolean;
 	invokeAgent(agent: string, request: IChatAgentRequest, progress: (part: IChatProgress) => void, history: IChatAgentHistoryEntry[], token: CancellationToken): Promise<IChatAgentResult>;
 	getFollowups(id: string, request: IChatAgentRequest, result: IChatAgentResult, history: IChatAgentHistoryEntry[], token: CancellationToken): Promise<IChatFollowup[]>;
+	getChatTitle(id: string, history: IChatAgentHistoryEntry[], token: CancellationToken): Promise<string | undefined>;
 	getAgent(id: string): IChatAgentData | undefined;
 	getAgentByFullyQualifiedId(id: string): IChatAgentData | undefined;
 	getAgents(): IChatAgentData[];
@@ -201,11 +233,13 @@ export class ChatAgentService implements IChatAgentService {
 	readonly onDidChangeAgents: Event<IChatAgent | undefined> = this._onDidChangeAgents.event;
 
 	private readonly _hasDefaultAgent: IContextKey<boolean>;
+	private readonly _defaultAgentRegistered: IContextKey<boolean>;
 
 	constructor(
 		@IContextKeyService private readonly contextKeyService: IContextKeyService,
 	) {
 		this._hasDefaultAgent = CONTEXT_CHAT_ENABLED.bindTo(this.contextKeyService);
+		this._defaultAgentRegistered = CONTEXT_CHAT_PANEL_PARTICIPANT_REGISTERED.bindTo(this.contextKeyService);
 	}
 
 	registerAgent(id: string, data: IChatAgentData): IDisposable {
@@ -214,6 +248,10 @@ export class ChatAgentService implements IChatAgentService {
 			throw new Error(`Agent already registered: ${JSON.stringify(id)}`);
 		}
 
+		if (data.isDefault) {
+			this._defaultAgentRegistered.set(true);
+		}
+
 		const that = this;
 		const commands = data.slashCommands;
 		data = {
@@ -224,8 +262,13 @@ export class ChatAgentService implements IChatAgentService {
 		};
 		const entry = { data };
 		this._agents.set(id, entry);
+		this._onDidChangeAgents.fire(undefined);
 		return toDisposable(() => {
 			this._agents.delete(id);
+			if (data.isDefault) {
+				this._defaultAgentRegistered.set(false);
+			}
+
 			this._onDidChangeAgents.fire(undefined);
 		});
 	}
@@ -377,6 +420,70 @@ export class ChatAgentService implements IChatAgentService {
 
 		return data.impl.provideFollowups(request, result, history, token);
 	}
+
+	async getChatTitle(id: string, history: IChatAgentHistoryEntry[], token: CancellationToken): Promise<string | undefined> {
+		const data = this._agents.get(id);
+		if (!data?.impl) {
+			throw new Error(`No activated agent with id "${id}"`);
+		}
+
+		if (!data.impl?.provideChatTitle) {
+			return undefined;
+		}
+
+		return data.impl.provideChatTitle(history, token);
+	}
+
+	private _chatParticipantDetectionProviders = new Map<number, IChatParticipantDetectionProvider>();
+	registerChatParticipantDetectionProvider(handle: number, provider: IChatParticipantDetectionProvider) {
+		this._chatParticipantDetectionProviders.set(handle, provider);
+		return toDisposable(() => {
+			this._chatParticipantDetectionProviders.delete(handle);
+		});
+	}
+
+	hasChatParticipantDetectionProviders() {
+		return this._chatParticipantDetectionProviders.size > 0;
+	}
+
+	async detectAgentOrCommand(request: IChatAgentRequest, history: IChatAgentHistoryEntry[], options: { location: ChatAgentLocation }, token: CancellationToken): Promise<{ agent: IChatAgentData; command?: IChatAgentCommand } | undefined> {
+		// TODO@joyceerhl should we have a selector to be able to narrow down which provider to use
+		const provider = Iterable.first(this._chatParticipantDetectionProviders.values());
+		if (!provider) {
+			return;
+		}
+
+		const participants = this.getAgents().reduce<IChatParticipantMetadata[]>((acc, a) => {
+			acc.push({ participant: a.id, disambiguation: a.disambiguation ?? [] });
+			for (const command of a.slashCommands) {
+				acc.push({ participant: a.id, command: command.name, disambiguation: command.disambiguation ?? [] });
+			}
+			return acc;
+		}, []);
+
+		const result = await provider.provideParticipantDetection(request, history, { ...options, participants }, token);
+		if (!result) {
+			return;
+		}
+
+		const agent = this.getAgent(result.participant);
+		if (!agent) {
+			// Couldn't find a participant matching the participant detection result
+			return;
+		}
+
+		if (!result.command) {
+			return { agent };
+		}
+
+		const command = agent?.slashCommands.find(c => c.name === result.command);
+		if (!command) {
+			// Couldn't find a slash command matching the participant detection result
+			return;
+		}
+
+		return { agent, command };
+	}
 }
 
 export class MergedChatAgent implements IChatAgent {
@@ -384,6 +491,9 @@ export class MergedChatAgent implements IChatAgent {
 		private readonly data: IChatAgentData,
 		private readonly impl: IChatAgentImplementation
 	) { }
+	when?: string | undefined;
+	publisherDisplayName?: string | undefined;
+	isDynamic?: boolean | undefined;
 
 	get id(): string { return this.data.id; }
 	get name(): string { return this.data.name ?? ''; }
@@ -397,6 +507,7 @@ export class MergedChatAgent implements IChatAgent {
 	get metadata(): IChatAgentMetadata { return this.data.metadata; }
 	get slashCommands(): IChatAgentCommand[] { return this.data.slashCommands; }
 	get locations(): ChatAgentLocation[] { return this.data.locations; }
+	get disambiguation(): { categoryName: string; description: string; examples: string[] }[] { return this.data.disambiguation; }
 
 	async invoke(request: IChatAgentRequest, progress: (part: IChatProgress) => void, history: IChatAgentHistoryEntry[], token: CancellationToken): Promise<IChatAgentResult> {
 		return this.impl.invoke(request, progress, history, token);
@@ -425,6 +536,10 @@ export class MergedChatAgent implements IChatAgent {
 
 		return undefined;
 	}
+
+	toJSON(): IChatAgentData {
+		return this.data;
+	}
 }
 
 export const IChatAgentNameService = createDecorator<IChatAgentNameService>('chatAgentNameService');
diff --git a/src/vs/workbench/contrib/chat/common/chatContextKeys.ts b/src/vs/workbench/contrib/chat/common/chatContextKeys.ts
index bd51f83ce09..f651a114a44 100644
--- a/src/vs/workbench/contrib/chat/common/chatContextKeys.ts
+++ b/src/vs/workbench/contrib/chat/common/chatContextKeys.ts
@@ -8,9 +8,11 @@ import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { ChatAgentLocation } from 'vs/workbench/contrib/chat/common/chatAgents';
 
 export const CONTEXT_RESPONSE_VOTE = new RawContextKey<string>('chatSessionResponseVote', '', { type: 'string', description: localize('interactiveSessionResponseVote', "When the response has been voted up, is set to 'up'. When voted down, is set to 'down'. Otherwise an empty string.") });
+export const CONTEXT_VOTE_UP_ENABLED = new RawContextKey<boolean>('chatVoteUpEnabled', false, { type: 'boolean', description: localize('chatVoteUpEnabled', "True when the chat vote up action is enabled.") });
 export const CONTEXT_RESPONSE_DETECTED_AGENT_COMMAND = new RawContextKey<boolean>('chatSessionResponseDetectedAgentOrCommand', false, { type: 'boolean', description: localize('chatSessionResponseDetectedAgentOrCommand', "When the agent or command was automatically detected") });
 export const CONTEXT_CHAT_RESPONSE_SUPPORT_ISSUE_REPORTING = new RawContextKey<boolean>('chatResponseSupportsIssueReporting', false, { type: 'boolean', description: localize('chatResponseSupportsIssueReporting', "True when the current chat response supports issue reporting.") });
 export const CONTEXT_RESPONSE_FILTERED = new RawContextKey<boolean>('chatSessionResponseFiltered', false, { type: 'boolean', description: localize('chatResponseFiltered', "True when the chat response was filtered out by the server.") });
+export const CONTEXT_RESPONSE_ERROR = new RawContextKey<boolean>('chatSessionResponseError', false, { type: 'boolean', description: localize('chatResponseErrored', "True when the chat response resulted in an error.") });
 export const CONTEXT_CHAT_REQUEST_IN_PROGRESS = new RawContextKey<boolean>('chatSessionRequestInProgress', false, { type: 'boolean', description: localize('interactiveSessionRequestInProgress', "True when the current request is still in progress.") });
 
 export const CONTEXT_RESPONSE = new RawContextKey<boolean>('chatResponse', false, { type: 'boolean', description: localize('chatResponse', "The chat item is a response.") });
@@ -23,7 +25,9 @@ export const CONTEXT_CHAT_INPUT_HAS_FOCUS = new RawContextKey<boolean>('chatInpu
 export const CONTEXT_IN_CHAT_INPUT = new RawContextKey<boolean>('inChatInput', false, { type: 'boolean', description: localize('inInteractiveInput', "True when focus is in the chat input, false otherwise.") });
 export const CONTEXT_IN_CHAT_SESSION = new RawContextKey<boolean>('inChat', false, { type: 'boolean', description: localize('inChat', "True when focus is in the chat widget, false otherwise.") });
 
-export const CONTEXT_CHAT_ENABLED = new RawContextKey<boolean>('chatIsEnabled', false, { type: 'boolean', description: localize('chatIsEnabled', "True when chat is enabled because a default chat participant is registered.") });
+export const CONTEXT_CHAT_ENABLED = new RawContextKey<boolean>('chatIsEnabled', false, { type: 'boolean', description: localize('chatIsEnabled', "True when chat is enabled because a default chat participant is activated with an implementation.") });
+export const CONTEXT_CHAT_PANEL_PARTICIPANT_REGISTERED = new RawContextKey<boolean>('chatPanelParticipantRegistered', false, { type: 'boolean', description: localize('chatParticipantRegistered', "True when a default chat participant is registered for the panel.") });
+export const CONTEXT_CHAT_EXTENSION_INVALID = new RawContextKey<boolean>('chatExtensionInvalid', false, { type: 'boolean', description: localize('chatExtensionInvalid', "True when the installed chat extension is invalid and needs to be updated.") });
 export const CONTEXT_CHAT_INPUT_CURSOR_AT_TOP = new RawContextKey<boolean>('chatCursorAtTop', false);
 export const CONTEXT_CHAT_INPUT_HAS_AGENT = new RawContextKey<boolean>('chatInputHasAgent', false);
 export const CONTEXT_CHAT_LOCATION = new RawContextKey<ChatAgentLocation>('chatLocation', undefined);
diff --git a/src/vs/workbench/contrib/chat/common/chatModel.ts b/src/vs/workbench/contrib/chat/common/chatModel.ts
index 78284279f60..b9578baed08 100644
--- a/src/vs/workbench/contrib/chat/common/chatModel.ts
+++ b/src/vs/workbench/contrib/chat/common/chatModel.ts
@@ -15,13 +15,14 @@ import { ThemeIcon } from 'vs/base/common/themables';
 import { URI, UriComponents, UriDto, isUriComponents } from 'vs/base/common/uri';
 import { generateUuid } from 'vs/base/common/uuid';
 import { IOffsetRange, OffsetRange } from 'vs/editor/common/core/offsetRange';
+import { IRange } from 'vs/editor/common/core/range';
 import { TextEdit } from 'vs/editor/common/languages';
 import { localize } from 'vs/nls';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { ILogService } from 'vs/platform/log/common/log';
-import { ChatAgentLocation, IChatAgentCommand, IChatAgentData, IChatAgentHistoryEntry, IChatAgentRequest, IChatAgentResult, IChatAgentService, reviveSerializedAgent } from 'vs/workbench/contrib/chat/common/chatAgents';
-import { ChatRequestTextPart, IParsedChatRequest, getPromptText, reviveParsedChatRequest } from 'vs/workbench/contrib/chat/common/chatParserTypes';
-import { ChatAgentVoteDirection, IChatAgentMarkdownContentWithVulnerability, IChatCodeCitation, IChatCommandButton, IChatConfirmation, IChatContentInlineReference, IChatContentReference, IChatFollowup, IChatMarkdownContent, IChatProgress, IChatProgressMessage, IChatResponseProgressFileTreeData, IChatTask, IChatTextEdit, IChatTreeData, IChatUsedContext, IChatWarningMessage, isIUsedContext } from 'vs/workbench/contrib/chat/common/chatService';
+import { ChatAgentLocation, IChatAgentCommand, IChatAgentData, IChatAgentResult, IChatAgentService, reviveSerializedAgent } from 'vs/workbench/contrib/chat/common/chatAgents';
+import { ChatRequestTextPart, IParsedChatRequest, reviveParsedChatRequest } from 'vs/workbench/contrib/chat/common/chatParserTypes';
+import { ChatAgentVoteDirection, ChatAgentVoteDownReason, IChatAgentMarkdownContentWithVulnerability, IChatCodeCitation, IChatCommandButton, IChatConfirmation, IChatContentInlineReference, IChatContentReference, IChatFollowup, IChatLocationData, IChatMarkdownContent, IChatProgress, IChatProgressMessage, IChatResponseProgressFileTreeData, IChatTask, IChatTextEdit, IChatTreeData, IChatUsedContext, IChatWarningMessage, isIUsedContext } from 'vs/workbench/contrib/chat/common/chatService';
 import { IChatRequestVariableValue } from 'vs/workbench/contrib/chat/common/chatVariables';
 
 export interface IChatRequestVariableEntry {
@@ -52,6 +53,9 @@ export interface IChatRequestModel {
 	readonly message: IParsedChatRequest;
 	readonly attempt: number;
 	readonly variableData: IChatRequestVariableData;
+	readonly confirmation?: string;
+	readonly locationData?: IChatLocationData;
+	readonly attachedContext?: IChatRequestVariableEntry[];
 	readonly response?: IChatResponseModel;
 }
 
@@ -107,9 +111,11 @@ export interface IChatResponseModel {
 	/** A stale response is one that has been persisted and rehydrated, so e.g. Commands that have their arguments stored in the EH are gone. */
 	readonly isStale: boolean;
 	readonly vote: ChatAgentVoteDirection | undefined;
+	readonly voteDownReason: ChatAgentVoteDownReason | undefined;
 	readonly followups?: IChatFollowup[] | undefined;
 	readonly result?: IChatAgentResult;
 	setVote(vote: ChatAgentVoteDirection): void;
+	setVoteDownReason(reason: ChatAgentVoteDownReason | undefined): void;
 	setEditApplied(edit: IChatTextEditGroup, editCount: number): boolean;
 }
 
@@ -144,11 +150,26 @@ export class ChatRequestModel implements IChatRequestModel {
 		this._variableData = v;
 	}
 
+	public get confirmation(): string | undefined {
+		return this._confirmation;
+	}
+
+	public get locationData(): IChatLocationData | undefined {
+		return this._locationData;
+	}
+
+	public get attachedContext(): IChatRequestVariableEntry[] | undefined {
+		return this._attachedContext;
+	}
+
 	constructor(
 		private _session: ChatModel,
 		public readonly message: IParsedChatRequest,
 		private _variableData: IChatRequestVariableData,
-		private _attempt: number = 0
+		private _attempt: number = 0,
+		private _confirmation?: string,
+		private _locationData?: IChatLocationData,
+		private _attachedContext?: IChatRequestVariableEntry[]
 	) {
 		this.id = 'request_' + ChatRequestModel.nextId++;
 	}
@@ -158,8 +179,8 @@ export class ChatRequestModel implements IChatRequestModel {
 	}
 }
 
-export class Response implements IResponse {
-	private _onDidChangeValue = new Emitter<void>();
+export class Response extends Disposable implements IResponse {
+	private _onDidChangeValue = this._register(new Emitter<void>());
 	public get onDidChangeValue() {
 		return this._onDidChangeValue.event;
 	}
@@ -183,6 +204,7 @@ export class Response implements IResponse {
 	}
 
 	constructor(value: IMarkdownString | ReadonlyArray<IMarkdownString | IChatResponseProgressFileTreeData | IChatContentInlineReference | IChatAgentMarkdownContentWithVulnerability>) {
+		super();
 		this._responseParts = asArray(value).map((v) => (isMarkdownString(v) ?
 			{ content: v, kind: 'markdownContent' } satisfies IChatMarkdownContent :
 			'kind' in v ? v : { kind: 'treeData', treeData: v }));
@@ -190,7 +212,7 @@ export class Response implements IResponse {
 		this._updateRepr(true);
 	}
 
-	toString(): string {
+	override toString(): string {
 		return this._responseRepr;
 	}
 
@@ -331,6 +353,10 @@ export class ChatResponseModel extends Disposable implements IChatResponseModel
 		return this._vote;
 	}
 
+	public get voteDownReason(): ChatAgentVoteDownReason | undefined {
+		return this._voteDownReason;
+	}
+
 	public get followups(): IChatFollowup[] | undefined {
 		return this._followups;
 	}
@@ -401,6 +427,7 @@ export class ChatResponseModel extends Disposable implements IChatResponseModel
 		private _isComplete: boolean = false,
 		private _isCanceled = false,
 		private _vote?: ChatAgentVoteDirection,
+		private _voteDownReason?: ChatAgentVoteDownReason,
 		private _result?: IChatAgentResult,
 		followups?: ReadonlyArray<IChatFollowup>
 	) {
@@ -410,7 +437,7 @@ export class ChatResponseModel extends Disposable implements IChatResponseModel
 		this._isStale = Array.isArray(_response) && (_response.length !== 0 || isMarkdownString(_response) && _response.value.length !== 0);
 
 		this._followups = followups ? [...followups] : undefined;
-		this._response = new Response(_response);
+		this._response = this._register(new Response(_response));
 		this._register(this._response.onDidChangeValue(() => this._onDidChange.fire()));
 		this.id = 'response_' + ChatResponseModel.nextId++;
 	}
@@ -477,6 +504,11 @@ export class ChatResponseModel extends Disposable implements IChatResponseModel
 		this._onDidChange.fire();
 	}
 
+	setVoteDownReason(reason: ChatAgentVoteDownReason | undefined): void {
+		this._voteDownReason = reason;
+		this._onDidChange.fire();
+	}
+
 	setEditApplied(edit: IChatTextEditGroup, editCount: number): boolean {
 		if (!this.response.value.includes(edit)) {
 			return false;
@@ -528,6 +560,7 @@ export interface ISerializableChatRequestData {
 	followups: ReadonlyArray<IChatFollowup> | undefined;
 	isCanceled: boolean | undefined;
 	vote: ChatAgentVoteDirection | undefined;
+	voteDownReason?: ChatAgentVoteDownReason;
 	/** For backward compat: should be optional */
 	usedContext?: IChatUsedContext;
 	contentReferences?: ReadonlyArray<IChatContentReference>;
@@ -544,10 +577,89 @@ export interface IExportableChatData {
 	responderAvatarIconUri: ThemeIcon | UriComponents | undefined; // Keeping Uri name for backcompat
 }
 
-export interface ISerializableChatData extends IExportableChatData {
+/*
+	NOTE: every time the serialized data format is updated, we need to create a new interface, because we may need to handle any old data format when parsing.
+*/
+
+export interface ISerializableChatData1 extends IExportableChatData {
 	sessionId: string;
 	creationDate: number;
 	isImported: boolean;
+
+	/** Indicates that this session was created in this window. Is cleared after the chat has been written to storage once. Needed to sync chat creations/deletions between empty windows. */
+	isNew?: boolean;
+}
+
+export interface ISerializableChatData2 extends ISerializableChatData1 {
+	version: 2;
+	lastMessageDate: number;
+	computedTitle: string | undefined;
+}
+
+export interface ISerializableChatData3 extends Omit<ISerializableChatData2, 'version' | 'computedTitle'> {
+	version: 3;
+	customTitle: string | undefined;
+}
+
+/**
+ * Chat data that has been parsed and normalized to the current format.
+ */
+export type ISerializableChatData = ISerializableChatData3;
+
+/**
+ * Chat data that has been loaded but not normalized, and could be any format
+ */
+export type ISerializableChatDataIn = ISerializableChatData1 | ISerializableChatData2 | ISerializableChatData3;
+
+/**
+ * Normalize chat data from storage to the current format.
+ * TODO- ChatModel#_deserialize and reviveSerializedAgent also still do some normalization and maybe that should be done in here too.
+ */
+export function normalizeSerializableChatData(raw: ISerializableChatDataIn): ISerializableChatData {
+	normalizeOldFields(raw);
+
+	if (!('version' in raw)) {
+		return {
+			version: 3,
+			...raw,
+			lastMessageDate: raw.creationDate,
+			customTitle: undefined,
+		};
+	}
+
+	if (raw.version === 2) {
+		return {
+			...raw,
+			version: 3,
+			customTitle: raw.computedTitle
+		};
+	}
+
+	return raw;
+}
+
+function normalizeOldFields(raw: ISerializableChatDataIn): void {
+	// Fill in fields that very old chat data may be missing
+	if (!raw.sessionId) {
+		raw.sessionId = generateUuid();
+	}
+
+	if (!raw.creationDate) {
+		raw.creationDate = getLastYearDate();
+	}
+
+	if ('version' in raw && (raw.version === 2 || raw.version === 3)) {
+		if (!raw.lastMessageDate) {
+			// A bug led to not porting creationDate properly, and that was copied to lastMessageDate, so fix that up if missing.
+			raw.lastMessageDate = getLastYearDate();
+		}
+	}
+}
+
+function getLastYearDate(): number {
+	const lastYearDate = new Date();
+	lastYearDate.setFullYear(lastYearDate.getFullYear() - 1);
+	return lastYearDate.getTime();
 }
 
 export function isExportableSessionData(obj: unknown): obj is IExportableChatData {
@@ -570,7 +682,9 @@ export type IChatChangeEvent =
 	| IChatInitEvent
 	| IChatAddRequestEvent | IChatChangedRequestEvent | IChatRemoveRequestEvent
 	| IChatAddResponseEvent
-	| IChatSetAgentEvent;
+	| IChatSetAgentEvent
+	| IChatMoveEvent
+	;
 
 export interface IChatAddRequestEvent {
 	kind: 'addRequest';
@@ -611,6 +725,12 @@ export interface IChatRemoveRequestEvent {
 	reason: ChatRequestRemovalReason;
 }
 
+export interface IChatMoveEvent {
+	kind: 'move';
+	target: URI;
+	range: IRange;
+}
+
 export interface IChatSetAgentEvent {
 	kind: 'setAgent';
 	agent: IChatAgentData;
@@ -659,19 +779,28 @@ export class ChatModel extends Disposable implements IChatModel {
 	}
 
 	get requestInProgress(): boolean {
-		const lastRequest = this._requests[this._requests.length - 1];
-		return !!lastRequest && !!lastRequest.response && !lastRequest.response.isComplete;
+		const lastRequest = this.lastRequest;
+		return !!lastRequest?.response && !lastRequest.response.isComplete;
 	}
 
 	get hasRequests(): boolean {
 		return this._requests.length > 0;
 	}
 
+	get lastRequest(): ChatRequestModel | undefined {
+		return this._requests.at(-1);
+	}
+
 	private _creationDate: number;
 	get creationDate(): number {
 		return this._creationDate;
 	}
 
+	private _lastMessageDate: number;
+	get lastMessageDate(): number {
+		return this._lastMessageDate;
+	}
+
 	private get _defaultAgent() {
 		return this.chatAgentService.getDefaultAgent(ChatAgentLocation.Panel);
 	}
@@ -711,8 +840,13 @@ export class ChatModel extends Disposable implements IChatModel {
 		return this._isImported;
 	}
 
+	private _customTitle: string | undefined;
+	get customTitle(): string | undefined {
+		return this._customTitle;
+	}
+
 	get title(): string {
-		return ChatModel.getDefaultTitle(this._requests);
+		return this._customTitle || ChatModel.getDefaultTitle(this._requests);
 	}
 
 	get initialLocation() {
@@ -732,6 +866,8 @@ export class ChatModel extends Disposable implements IChatModel {
 		this._sessionId = (isSerializableSessionData(initialData) && initialData.sessionId) || generateUuid();
 		this._requests = initialData ? this._deserialize(initialData) : [];
 		this._creationDate = (isSerializableSessionData(initialData) && initialData.creationDate) || Date.now();
+		this._lastMessageDate = (isSerializableSessionData(initialData) && initialData.lastMessageDate) || this._creationDate;
+		this._customTitle = isSerializableSessionData(initialData) ? initialData.customTitle : undefined;
 
 		this._initialRequesterAvatarIconUri = initialData?.requesterAvatarIconUri && URI.revive(initialData.requesterAvatarIconUri);
 		this._initialResponderAvatarIconUri = isUriComponents(initialData?.responderAvatarIconUri) ? URI.revive(initialData.responderAvatarIconUri) : initialData?.responderAvatarIconUri;
@@ -765,8 +901,9 @@ export class ChatModel extends Disposable implements IChatModel {
 
 					// Port entries from old format
 					const result = 'responseErrorDetails' in raw ?
+						// eslint-disable-next-line local/code-no-dangerous-type-assertions
 						{ errorDetails: raw.responseErrorDetails } as IChatAgentResult : raw.result;
-					request.response = new ChatResponseModel(raw.response ?? [new MarkdownString(raw.response)], this, agent, raw.slashCommand, request.id, true, raw.isCanceled, raw.vote, result, raw.followups);
+					request.response = new ChatResponseModel(raw.response ?? [new MarkdownString(raw.response)], this, agent, raw.slashCommand, request.id, true, raw.isCanceled, raw.vote, raw.voteDownReason, result, raw.followups);
 					if (raw.usedContext) { // @ulugbekna: if this's a new vscode sessions, doc versions are incorrect anyway?
 						request.response.applyReference(revive(raw.usedContext));
 					}
@@ -861,22 +998,26 @@ export class ChatModel extends Disposable implements IChatModel {
 		return this._requests;
 	}
 
-	addRequest(message: IParsedChatRequest, variableData: IChatRequestVariableData, attempt: number, chatAgent?: IChatAgentData, slashCommand?: IChatAgentCommand): ChatRequestModel {
-		const request = new ChatRequestModel(this, message, variableData, attempt);
+	addRequest(message: IParsedChatRequest, variableData: IChatRequestVariableData, attempt: number, chatAgent?: IChatAgentData, slashCommand?: IChatAgentCommand, confirmation?: string, locationData?: IChatLocationData, attachments?: IChatRequestVariableEntry[]): ChatRequestModel {
+		const request = new ChatRequestModel(this, message, variableData, attempt, confirmation, locationData, attachments);
 		request.response = new ChatResponseModel([], this, chatAgent, slashCommand, request.id);
 
 		this._requests.push(request);
+		this._lastMessageDate = Date.now();
 		this._onDidChange.fire({ kind: 'addRequest', request });
 		return request;
 	}
 
+	setCustomTitle(title: string): void {
+		this._customTitle = title;
+	}
+
 	updateRequest(request: ChatRequestModel, variableData: IChatRequestVariableData) {
 		request.variableData = variableData;
 		this._onDidChange.fire({ kind: 'changedRequest', request });
 	}
 
 	adoptRequest(request: ChatRequestModel): void {
-
 		// this doesn't use `removeRequest` because it must not dispose the request object
 		const oldOwner = request.session;
 		const index = oldOwner._requests.findIndex(candidate => candidate.id === request.id);
@@ -926,6 +1067,8 @@ export class ChatModel extends Disposable implements IChatModel {
 			}
 		} else if (progress.kind === 'codeCitation') {
 			request.response.applyCodeCitation(progress);
+		} else if (progress.kind === 'move') {
+			this._onDidChange.fire({ kind: 'move', target: progress.uri, range: progress.range });
 		} else {
 			this.logService.error(`Couldn't handle progress: ${JSON.stringify(progress)}`);
 		}
@@ -997,6 +1140,9 @@ export class ChatModel extends Disposable implements IChatModel {
 					...r.message,
 					parts: r.message.parts.map(p => p && 'toJSON' in p ? (p.toJSON as Function)() : p)
 				};
+				const agent = r.response?.agent;
+				const agentJson = agent && 'toJSON' in agent ? (agent.toJSON as Function)() :
+					agent ? { ...agent } : undefined;
 				return {
 					message,
 					variableData: r.variableData,
@@ -1016,7 +1162,8 @@ export class ChatModel extends Disposable implements IChatModel {
 					followups: r.response?.followups,
 					isCanceled: r.response?.isCanceled,
 					vote: r.response?.vote,
-					agent: r.response?.agent ? { ...r.response.agent } : undefined,
+					voteDownReason: r.response?.voteDownReason,
+					agent: agentJson,
 					slashCommand: r.response?.slashCommand,
 					usedContext: r.response?.usedContext,
 					contentReferences: r.response?.contentReferences,
@@ -1028,10 +1175,13 @@ export class ChatModel extends Disposable implements IChatModel {
 
 	toJSON(): ISerializableChatData {
 		return {
+			version: 3,
 			...this.toExport(),
 			sessionId: this.sessionId,
 			creationDate: this._creationDate,
-			isImported: this._isImported
+			isImported: this._isImported,
+			lastMessageDate: this._lastMessageDate,
+			customTitle: this._customTitle
 		};
 	}
 
@@ -1079,35 +1229,6 @@ export class ChatWelcomeMessageModel implements IChatWelcomeMessageModel {
 	}
 }
 
-export function getHistoryEntriesFromModel(model: IChatModel, forAgentId: string | undefined): IChatAgentHistoryEntry[] {
-	const history: IChatAgentHistoryEntry[] = [];
-	for (const request of model.getRequests()) {
-		if (!request.response) {
-			continue;
-		}
-
-		if (forAgentId && forAgentId !== request.response.agent?.id) {
-			// An agent only gets to see requests that were sent to this agent.
-			// The default agent (the undefined case) gets to see all of them.
-			continue;
-		}
-
-		const promptTextResult = getPromptText(request.message);
-		const historyRequest: IChatAgentRequest = {
-			sessionId: model.sessionId,
-			requestId: request.id,
-			agentId: request.response.agent?.id ?? '',
-			message: promptTextResult.message,
-			command: request.response.slashCommand?.name,
-			variables: updateRanges(request.variableData, promptTextResult.diff), // TODO bit of a hack
-			location: ChatAgentLocation.Panel
-		};
-		history.push({ request: historyRequest, response: request.response.response.value, result: request.response.result ?? {} });
-	}
-
-	return history;
-}
-
 export function updateRanges(variableData: IChatRequestVariableData, diff: number): IChatRequestVariableData {
 	return {
 		variables: variableData.variables.map(v => ({
diff --git a/src/vs/workbench/contrib/chat/common/chatParserTypes.ts b/src/vs/workbench/contrib/chat/common/chatParserTypes.ts
index 66bc10c2061..5051dc40a4b 100644
--- a/src/vs/workbench/contrib/chat/common/chatParserTypes.ts
+++ b/src/vs/workbench/contrib/chat/common/chatParserTypes.ts
@@ -6,7 +6,7 @@
 import { revive } from 'vs/base/common/marshalling';
 import { IOffsetRange, OffsetRange } from 'vs/editor/common/core/offsetRange';
 import { IRange } from 'vs/editor/common/core/range';
-import { IChatAgentCommand, IChatAgentData, reviveSerializedAgent } from 'vs/workbench/contrib/chat/common/chatAgents';
+import { ChatAgentLocation, IChatAgentCommand, IChatAgentData, IChatAgentService, reviveSerializedAgent } from 'vs/workbench/contrib/chat/common/chatAgents';
 import { IChatSlashData } from 'vs/workbench/contrib/chat/common/chatSlashCommands';
 import { IChatRequestVariableValue } from 'vs/workbench/contrib/chat/common/chatVariables';
 
@@ -66,6 +66,23 @@ export class ChatRequestVariablePart implements IParsedChatRequestPart {
 	}
 }
 
+/**
+ * An invocation of a tool
+ */
+export class ChatRequestToolPart implements IParsedChatRequestPart {
+	static readonly Kind = 'tool';
+	readonly kind = ChatRequestToolPart.Kind;
+	constructor(readonly range: OffsetRange, readonly editorRange: IRange, readonly toolName: string, readonly toolId: string) { }
+
+	get text(): string {
+		return `${chatVariableLeader}${this.toolName}`;
+	}
+
+	get promptText(): string {
+		return this.text;
+	}
+}
+
 /**
  * An invocation of an agent that can be resolved by the agent service
  */
@@ -150,7 +167,14 @@ export function reviveParsedChatRequest(serialized: IParsedChatRequest): IParsed
 					part.editorRange,
 					(part as ChatRequestVariablePart).variableName,
 					(part as ChatRequestVariablePart).variableArg,
-					(part as ChatRequestVariablePart).variableName || '',
+					(part as ChatRequestVariablePart).variableId || '',
+				);
+			} else if (part.kind === ChatRequestToolPart.Kind) {
+				return new ChatRequestToolPart(
+					new OffsetRange(part.range.start, part.range.endExclusive),
+					part.editorRange,
+					(part as ChatRequestToolPart).toolName,
+					(part as ChatRequestToolPart).toolId
 				);
 			} else if (part.kind === ChatRequestAgentPart.Kind) {
 				let agent = (part as ChatRequestAgentPart).agent;
@@ -194,3 +218,20 @@ export function extractAgentAndCommand(parsed: IParsedChatRequest): { agentPart:
 	const commandPart = parsed.parts.find((r): r is ChatRequestAgentSubcommandPart => r instanceof ChatRequestAgentSubcommandPart);
 	return { agentPart, commandPart };
 }
+
+export function formatChatQuestion(chatAgentService: IChatAgentService, location: ChatAgentLocation, prompt: string, participant: string | null = null, command: string | null = null): string | undefined {
+	let question = '';
+	if (participant && participant !== chatAgentService.getDefaultAgent(location)?.id) {
+		const agent = chatAgentService.getAgent(participant);
+		if (!agent) {
+			// Refers to agent that doesn't exist
+			return undefined;
+		}
+
+		question += `${chatAgentLeader}${agent.name} `;
+		if (command) {
+			question += `${chatSubcommandLeader}${command} `;
+		}
+	}
+	return question + prompt;
+}
diff --git a/src/vs/workbench/contrib/chat/common/chatParticipantContribTypes.ts b/src/vs/workbench/contrib/chat/common/chatParticipantContribTypes.ts
index 638dce2633c..3a3b285a9ff 100644
--- a/src/vs/workbench/contrib/chat/common/chatParticipantContribTypes.ts
+++ b/src/vs/workbench/contrib/chat/common/chatParticipantContribTypes.ts
@@ -10,6 +10,7 @@ export interface IRawChatCommandContribution {
 	isSticky?: boolean;
 	when?: string;
 	defaultImplicitVariables?: string[];
+	disambiguation?: { categoryName: string; description: string; examples: string[] }[];
 }
 
 export type RawChatParticipantLocation = 'panel' | 'terminal' | 'notebook';
@@ -26,6 +27,8 @@ export interface IRawChatParticipantContribution {
 	commands?: IRawChatCommandContribution[];
 	defaultImplicitVariables?: string[];
 	locations?: RawChatParticipantLocation[];
+	disambiguation?: { categoryName: string; description: string; examples: string[] }[];
+	supportsToolReferences?: boolean;
 }
 
 /**
diff --git a/src/vs/workbench/contrib/chat/common/chatRequestParser.ts b/src/vs/workbench/contrib/chat/common/chatRequestParser.ts
index e6492570295..5100fc99495 100644
--- a/src/vs/workbench/contrib/chat/common/chatRequestParser.ts
+++ b/src/vs/workbench/contrib/chat/common/chatRequestParser.ts
@@ -7,9 +7,10 @@ import { OffsetRange } from 'vs/editor/common/core/offsetRange';
 import { IPosition, Position } from 'vs/editor/common/core/position';
 import { Range } from 'vs/editor/common/core/range';
 import { ChatAgentLocation, IChatAgentData, IChatAgentService } from 'vs/workbench/contrib/chat/common/chatAgents';
-import { ChatRequestAgentPart, ChatRequestAgentSubcommandPart, ChatRequestDynamicVariablePart, ChatRequestSlashCommandPart, ChatRequestTextPart, ChatRequestVariablePart, IParsedChatRequest, IParsedChatRequestPart, chatAgentLeader, chatSubcommandLeader, chatVariableLeader } from 'vs/workbench/contrib/chat/common/chatParserTypes';
+import { ChatRequestAgentPart, ChatRequestAgentSubcommandPart, ChatRequestDynamicVariablePart, ChatRequestSlashCommandPart, ChatRequestTextPart, ChatRequestToolPart, ChatRequestVariablePart, IParsedChatRequest, IParsedChatRequestPart, chatAgentLeader, chatSubcommandLeader, chatVariableLeader } from 'vs/workbench/contrib/chat/common/chatParserTypes';
 import { IChatSlashCommandService } from 'vs/workbench/contrib/chat/common/chatSlashCommands';
 import { IChatVariablesService, IDynamicVariable } from 'vs/workbench/contrib/chat/common/chatVariables';
+import { ILanguageModelToolsService } from 'vs/workbench/contrib/chat/common/languageModelToolsService';
 
 const agentReg = /^@([\w_\-\.]+)(?=(\s|$|\b))/i; // An @-agent
 const variableReg = /^#([\w_\-]+)(:\d+)?(?=(\s|$|\b))/i; // A #-variable with an optional numeric : arg (@response:2)
@@ -24,7 +25,8 @@ export class ChatRequestParser {
 	constructor(
 		@IChatAgentService private readonly agentService: IChatAgentService,
 		@IChatVariablesService private readonly variableService: IChatVariablesService,
-		@IChatSlashCommandService private readonly slashCommandService: IChatSlashCommandService
+		@IChatSlashCommandService private readonly slashCommandService: IChatSlashCommandService,
+		@ILanguageModelToolsService private readonly toolsService: ILanguageModelToolsService,
 	) { }
 
 	parseChatRequest(sessionId: string, message: string, location: ChatAgentLocation = ChatAgentLocation.Panel, context?: IChatParserContext): IParsedChatRequest {
@@ -109,11 +111,11 @@ export class ChatRequestParser {
 		}
 
 		// If there is more than one agent with this name, and the user picked it from the suggest widget, then the selected agent should be in the
-		// context and we use that one. Otherwise just pick the first.
+		// context and we use that one.
 		const agent = agents.length > 1 && context?.selectedAgent ?
 			context.selectedAgent :
-			agents[0];
-		if (!agent || !agent.locations.includes(location)) {
+			agents.find((a) => a.locations.includes(location));
+		if (!agent) {
 			return;
 		}
 
@@ -137,7 +139,7 @@ export class ChatRequestParser {
 		return new ChatRequestAgentPart(agentRange, agentEditorRange, agent);
 	}
 
-	private tryToParseVariable(message: string, offset: number, position: IPosition, parts: ReadonlyArray<IParsedChatRequestPart>): ChatRequestAgentPart | ChatRequestVariablePart | undefined {
+	private tryToParseVariable(message: string, offset: number, position: IPosition, parts: ReadonlyArray<IParsedChatRequestPart>): ChatRequestAgentPart | ChatRequestVariablePart | ChatRequestToolPart | undefined {
 		const nextVariableMatch = message.match(variableReg);
 		if (!nextVariableMatch) {
 			return;
@@ -156,6 +158,11 @@ export class ChatRequestParser {
 			return new ChatRequestVariablePart(varRange, varEditorRange, name, variableArg, variable.id);
 		}
 
+		const tool = this.toolsService.getToolByName(name);
+		if (tool && tool.canBeInvokedManually && (!usedAgent || usedAgent.agent.supportsToolReferences)) {
+			return new ChatRequestToolPart(varRange, varEditorRange, name, tool.id);
+		}
+
 		return;
 	}
 
diff --git a/src/vs/workbench/contrib/chat/common/chatService.ts b/src/vs/workbench/contrib/chat/common/chatService.ts
index 6c9be3f767f..7942a114ebc 100644
--- a/src/vs/workbench/contrib/chat/common/chatService.ts
+++ b/src/vs/workbench/contrib/chat/common/chatService.ts
@@ -82,7 +82,7 @@ export enum ChatResponseReferencePartStatusKind {
 }
 
 export interface IChatContentReference {
-	reference: URI | Location | IChatContentVariableReference;
+	reference: URI | Location | IChatContentVariableReference | string;
 	iconPath?: ThemeIcon | { light: URI; dark?: URI };
 	options?: { status?: { description: string; kind: ChatResponseReferencePartStatusKind } };
 	kind: 'reference';
@@ -164,6 +164,12 @@ export interface IChatCommandButton {
 	kind: 'command';
 }
 
+export interface IChatMoveMessage {
+	uri: URI;
+	range: IRange;
+	kind: 'move';
+}
+
 export interface IChatTextEdit {
 	uri: URI;
 	edits: TextEdit[];
@@ -194,6 +200,7 @@ export type IChatProgress =
 	| IChatCommandButton
 	| IChatWarningMessage
 	| IChatTextEdit
+	| IChatMoveMessage
 	| IChatConfirmation;
 
 export interface IChatFollowup {
@@ -210,10 +217,22 @@ export enum ChatAgentVoteDirection {
 	Up = 1
 }
 
+export enum ChatAgentVoteDownReason {
+	IncorrectCode = 'incorrectCode',
+	DidNotFollowInstructions = 'didNotFollowInstructions',
+	IncompleteCode = 'incompleteCode',
+	MissingContext = 'missingContext',
+	PoorlyWrittenOrFormatted = 'poorlyWrittenOrFormatted',
+	RefusedAValidRequest = 'refusedAValidRequest',
+	OffensiveOrUnsafe = 'offensiveOrUnsafe',
+	Other = 'other',
+	WillReportIssue = 'willReportIssue'
+}
+
 export interface IChatVoteAction {
 	kind: 'vote';
 	direction: ChatAgentVoteDirection;
-	reportIssue?: boolean;
+	reason: ChatAgentVoteDownReason | undefined;
 }
 
 export enum ChatCopyKind {
@@ -236,6 +255,8 @@ export interface IChatInsertAction {
 	codeBlockIndex: number;
 	totalCharacters: number;
 	newFile?: boolean;
+	userAction?: string;
+	codeMapper?: string;
 }
 
 export interface IChatTerminalAction {
@@ -295,6 +316,8 @@ export interface IChatCompleteResponse {
 export interface IChatDetail {
 	sessionId: string;
 	title: string;
+	lastMessageDate: number;
+	isActive: boolean;
 }
 
 export interface IChatProviderInfo {
@@ -348,6 +371,11 @@ export interface IChatSendRequestOptions {
 	/** The target agent ID can be specified with this property instead of using @ in 'message' */
 	agentId?: string;
 	slashCommand?: string;
+
+	/**
+	 * The label of the confirmation action that was selected.
+	 */
+	confirmation?: string;
 }
 
 export const IChatService = createDecorator<IChatService>('IChatService');
@@ -375,6 +403,7 @@ export interface IChatService {
 	clearSession(sessionId: string): void;
 	addCompleteRequest(sessionId: string, message: IParsedChatRequest | string, variableData: IChatRequestVariableData | undefined, attempt: number | undefined, response: IChatCompleteResponse): void;
 	getHistory(): IChatDetail[];
+	setChatSessionTitle(sessionId: string, title: string): void;
 	clearAllHistoryEntries(): void;
 	removeHistoryEntry(sessionId: string): void;
 
diff --git a/src/vs/workbench/contrib/chat/common/chatServiceImpl.ts b/src/vs/workbench/contrib/chat/common/chatServiceImpl.ts
index 68a88c6c791..2b6cfac741c 100644
--- a/src/vs/workbench/contrib/chat/common/chatServiceImpl.ts
+++ b/src/vs/workbench/contrib/chat/common/chatServiceImpl.ts
@@ -10,19 +10,22 @@ import { ErrorNoTelemetry } from 'vs/base/common/errors';
 import { Emitter, Event } from 'vs/base/common/event';
 import { MarkdownString } from 'vs/base/common/htmlContent';
 import { Iterable } from 'vs/base/common/iterator';
-import { Disposable, DisposableMap } from 'vs/base/common/lifecycle';
+import { Disposable, DisposableMap, IDisposable } from 'vs/base/common/lifecycle';
 import { revive } from 'vs/base/common/marshalling';
 import { StopWatch } from 'vs/base/common/stopwatch';
 import { URI, UriComponents } from 'vs/base/common/uri';
 import { localize } from 'vs/nls';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { ILogService } from 'vs/platform/log/common/log';
 import { Progress } from 'vs/platform/progress/common/progress';
 import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { ChatAgentLocation, IChatAgent, IChatAgentRequest, IChatAgentResult, IChatAgentService } from 'vs/workbench/contrib/chat/common/chatAgents';
-import { ChatModel, ChatRequestModel, ChatRequestRemovalReason, ChatWelcomeMessageModel, IChatModel, IChatRequestModel, IChatRequestVariableData, IChatResponseModel, IExportableChatData, ISerializableChatData, ISerializableChatsData, getHistoryEntriesFromModel, updateRanges } from 'vs/workbench/contrib/chat/common/chatModel';
+import { ChatAgentLocation, IChatAgent, IChatAgentCommand, IChatAgentData, IChatAgentHistoryEntry, IChatAgentRequest, IChatAgentResult, IChatAgentService } from 'vs/workbench/contrib/chat/common/chatAgents';
+import { CONTEXT_VOTE_UP_ENABLED } from 'vs/workbench/contrib/chat/common/chatContextKeys';
+import { ChatModel, ChatRequestModel, ChatRequestRemovalReason, ChatWelcomeMessageModel, IChatModel, IChatRequestModel, IChatRequestVariableData, IChatResponseModel, IExportableChatData, ISerializableChatData, ISerializableChatDataIn, ISerializableChatsData, normalizeSerializableChatData, updateRanges } from 'vs/workbench/contrib/chat/common/chatModel';
 import { ChatRequestAgentPart, ChatRequestAgentSubcommandPart, ChatRequestSlashCommandPart, IParsedChatRequest, chatAgentLeader, chatSubcommandLeader, getPromptText } from 'vs/workbench/contrib/chat/common/chatParserTypes';
 import { ChatRequestParser } from 'vs/workbench/contrib/chat/common/chatRequestParser';
 import { IChatCompleteResponse, IChatDetail, IChatFollowup, IChatProgress, IChatSendRequestData, IChatSendRequestOptions, IChatSendRequestResponseState, IChatService, IChatTransferredSessionData, IChatUserActionEvent } from 'vs/workbench/contrib/chat/common/chatService';
@@ -30,6 +33,7 @@ import { ChatServiceTelemetry } from 'vs/workbench/contrib/chat/common/chatServi
 import { IChatSlashCommandService } from 'vs/workbench/contrib/chat/common/chatSlashCommands';
 import { IChatVariablesService } from 'vs/workbench/contrib/chat/common/chatVariables';
 import { ChatMessageRole, IChatMessage } from 'vs/workbench/contrib/chat/common/languageModels';
+import { IWorkbenchAssignmentService } from 'vs/workbench/services/assignment/common/assignmentService';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
 
 const serializedChatKey = 'interactive.sessions';
@@ -54,6 +58,8 @@ type ChatProviderInvokedEvent = {
 	slashCommand: string | undefined;
 	location: ChatAgentLocation;
 	citations: number;
+	numCodeBlocks: number;
+	isParticipantDetected: boolean;
 };
 
 type ChatProviderInvokedClassification = {
@@ -67,19 +73,38 @@ type ChatProviderInvokedClassification = {
 	slashCommand?: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The type of slashCommand used.' };
 	location: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The location at which chat request was made.' };
 	citations: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The number of public code citations that were returned with the response.' };
+	numCodeBlocks: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The number of code blocks in the response.' };
+	isParticipantDetected: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether the participant was automatically detected.' };
 	owner: 'roblourens';
 	comment: 'Provides insight into the performance of Chat agents.';
 };
 
 const maxPersistedSessions = 25;
 
+class CancellableRequest implements IDisposable {
+	constructor(
+		public readonly cancellationTokenSource: CancellationTokenSource,
+		public requestId?: string | undefined
+	) { }
+
+	dispose() {
+		this.cancellationTokenSource.dispose();
+	}
+
+	cancel() {
+		this.cancellationTokenSource.cancel();
+	}
+}
+
 export class ChatService extends Disposable implements IChatService {
 	declare _serviceBrand: undefined;
 
 	private readonly _sessionModels = this._register(new DisposableMap<string, ChatModel>());
-	private readonly _pendingRequests = this._register(new DisposableMap<string, CancellationTokenSource>());
+	private readonly _pendingRequests = this._register(new DisposableMap<string, CancellableRequest>());
 	private _persistedSessions: ISerializableChatsData;
 
+	/** Just for empty windows, need to enforce that a chat was deleted, even though other windows still have it */
+	private _deletedChatIds = new Set<string>();
 
 	private _transferredSessionData: IChatTransferredSessionData | undefined;
 	public get transferredSessionData(): IChatTransferredSessionData | undefined {
@@ -105,11 +130,15 @@ export class ChatService extends Disposable implements IChatService {
 		@IChatSlashCommandService private readonly chatSlashCommandService: IChatSlashCommandService,
 		@IChatVariablesService private readonly chatVariablesService: IChatVariablesService,
 		@IChatAgentService private readonly chatAgentService: IChatAgentService,
+		@IWorkbenchAssignmentService workbenchAssignmentService: IWorkbenchAssignmentService,
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@IConfigurationService private readonly configurationService: IConfigurationService
 	) {
 		super();
 
 		this._chatServiceTelemetry = this.instantiationService.createInstance(ChatServiceTelemetry);
-		const sessionData = storageService.get(serializedChatKey, StorageScope.WORKSPACE, '');
+		const isEmptyWindow = !workspaceContextService.getWorkspace().folders.length;
+		const sessionData = storageService.get(serializedChatKey, isEmptyWindow ? StorageScope.APPLICATION : StorageScope.WORKSPACE, '');
 		if (sessionData) {
 			this._persistedSessions = this.deserializeChats(sessionData);
 			const countsForLog = Object.keys(this._persistedSessions).length;
@@ -129,6 +158,10 @@ export class ChatService extends Disposable implements IChatService {
 		}
 
 		this._register(storageService.onWillSaveState(() => this.saveState()));
+
+		const voteUpEnabled = CONTEXT_VOTE_UP_ENABLED.bindTo(contextKeyService);
+		workbenchAssignmentService.getTreatment('chatVoteUpEnabled')
+			.then(value => voteUpEnabled.set(!!value));
 	}
 
 	isEnabled(location: ChatAgentLocation): boolean {
@@ -136,26 +169,85 @@ export class ChatService extends Disposable implements IChatService {
 	}
 
 	private saveState(): void {
-		let allSessions: (ChatModel | ISerializableChatData)[] = Array.from(this._sessionModels.values())
+		const liveChats = Array.from(this._sessionModels.values())
 			.filter(session => session.initialLocation === ChatAgentLocation.Panel)
 			.filter(session => session.getRequests().length > 0);
-		allSessions = allSessions.concat(
-			Object.values(this._persistedSessions)
-				.filter(session => !this._sessionModels.has(session.sessionId))
-				.filter(session => session.requests.length));
-		allSessions.sort((a, b) => (b.creationDate ?? 0) - (a.creationDate ?? 0));
-		allSessions = allSessions.slice(0, maxPersistedSessions);
-		if (allSessions.length) {
-			this.trace('onWillSaveState', `Persisting ${allSessions.length} sessions`);
+
+		const isEmptyWindow = !this.workspaceContextService.getWorkspace().folders.length;
+		if (isEmptyWindow) {
+			this.syncEmptyWindowChats(liveChats);
+		} else {
+			let allSessions: (ChatModel | ISerializableChatData)[] = liveChats;
+			allSessions = allSessions.concat(
+				Object.values(this._persistedSessions)
+					.filter(session => !this._sessionModels.has(session.sessionId))
+					.filter(session => session.requests.length));
+			allSessions.sort((a, b) => (b.creationDate ?? 0) - (a.creationDate ?? 0));
+			allSessions = allSessions.slice(0, maxPersistedSessions);
+			if (allSessions.length) {
+				this.trace('onWillSaveState', `Persisting ${allSessions.length} sessions`);
+			}
+
+			const serialized = JSON.stringify(allSessions);
+
+			if (allSessions.length) {
+				this.trace('onWillSaveState', `Persisting ${serialized.length} chars`);
+			}
+
+			this.storageService.store(serializedChatKey, serialized, StorageScope.WORKSPACE, StorageTarget.MACHINE);
 		}
 
-		const serialized = JSON.stringify(allSessions);
+		this._deletedChatIds.clear();
+	}
+
+	private syncEmptyWindowChats(thisWindowChats: ChatModel[]): void {
+		// Note- an unavoidable race condition exists here. If there are multiple empty windows open, and the user quits the application, then the focused
+		// window may lose active chats, because all windows are reading and writing to storageService at the same time. This can't be fixed without some
+		// kind of locking, but in reality, the focused window will likely have run `saveState` at some point, like on a window focus change, and it will
+		// generally be fine.
+		const sessionData = this.storageService.get(serializedChatKey, StorageScope.APPLICATION, '');
 
-		if (allSessions.length) {
-			this.trace('onWillSaveState', `Persisting ${serialized.length} chars`);
+		const originalPersistedSessions = this._persistedSessions;
+		let persistedSessions: ISerializableChatsData;
+		if (sessionData) {
+			persistedSessions = this.deserializeChats(sessionData);
+			const countsForLog = Object.keys(persistedSessions).length;
+			if (countsForLog > 0) {
+				this.trace('constructor', `Restored ${countsForLog} persisted sessions`);
+			}
+		} else {
+			persistedSessions = {};
+		}
+
+		this._deletedChatIds.forEach(id => delete persistedSessions[id]);
+
+		// Has the chat in this window been updated, and then closed? Overwrite the old persisted chats.
+		Object.values(originalPersistedSessions).forEach(session => {
+			const persistedSession = persistedSessions[session.sessionId];
+			if (persistedSession && session.requests.length > persistedSession.requests.length) {
+				// We will add a 'modified date' at some point, but comparing the number of requests is good enough
+				persistedSessions[session.sessionId] = session;
+			} else if (!persistedSession && session.isNew) {
+				// This session was created in this window, and hasn't been persisted yet
+				session.isNew = false;
+				persistedSessions[session.sessionId] = session;
+			}
+		});
+
+		this._persistedSessions = persistedSessions;
+
+		// Add this window's active chat models to the set to persist.
+		// Having the same session open in two empty windows at the same time can lead to data loss, this is acceptable
+		const allSessions: Record<string, ISerializableChatData | ChatModel> = { ...this._persistedSessions };
+		for (const chat of thisWindowChats) {
+			allSessions[chat.sessionId] = chat;
 		}
 
-		this.storageService.store(serializedChatKey, serialized, StorageScope.WORKSPACE, StorageTarget.MACHINE);
+		let sessionsList = Object.values(allSessions);
+		sessionsList.sort((a, b) => (b.creationDate ?? 0) - (a.creationDate ?? 0));
+		sessionsList = sessionsList.slice(0, maxPersistedSessions);
+		const data = JSON.stringify(sessionsList);
+		this.storageService.store(serializedChatKey, data, StorageScope.APPLICATION, StorageTarget.MACHINE);
 	}
 
 	notifyUserAction(action: IChatUserActionEvent): void {
@@ -163,6 +255,19 @@ export class ChatService extends Disposable implements IChatService {
 		this._onDidPerformUserAction.fire(action);
 	}
 
+	setChatSessionTitle(sessionId: string, title: string): void {
+		const model = this._sessionModels.get(sessionId);
+		if (model) {
+			model.setCustomTitle(title);
+			return;
+		}
+
+		const session = this._persistedSessions[sessionId];
+		if (session) {
+			session.customTitle = title;
+		}
+	}
+
 	private trace(method: string, message?: string): void {
 		if (message) {
 			this.logService.trace(`ChatService#${method}: ${message}`);
@@ -177,7 +282,7 @@ export class ChatService extends Disposable implements IChatService {
 
 	private deserializeChats(sessionData: string): ISerializableChatsData {
 		try {
-			const arrayOfSessions: ISerializableChatData[] = revive(JSON.parse(sessionData)); // Revive serialized URIs in session data
+			const arrayOfSessions: ISerializableChatDataIn[] = revive(JSON.parse(sessionData)); // Revive serialized URIs in session data
 			if (!Array.isArray(arrayOfSessions)) {
 				throw new Error('Expected array');
 			}
@@ -197,7 +302,7 @@ export class ChatService extends Disposable implements IChatService {
 					}
 				}
 
-				acc[session.sessionId] = session;
+				acc[session.sessionId] = normalizeSerializableChatData(session);
 				return acc;
 			}, {});
 			return sessions;
@@ -231,28 +336,45 @@ export class ChatService extends Disposable implements IChatService {
 	 * Imported chat sessions are also excluded from the result.
 	 */
 	getHistory(): IChatDetail[] {
-		const sessions = Object.values(this._persistedSessions)
-			.filter(session => session.requests.length > 0);
-		sessions.sort((a, b) => (b.creationDate ?? 0) - (a.creationDate ?? 0));
+		const persistedSessions = Object.values(this._persistedSessions)
+			.filter(session => session.requests.length > 0)
+			.filter(session => !this._sessionModels.has(session.sessionId));
 
-		return sessions
-			.filter(session => !this._sessionModels.has(session.sessionId))
+		const persistedSessionItems = persistedSessions
+			.filter(session => !session.isImported)
+			.map(session => {
+				const title = session.customTitle ?? ChatModel.getDefaultTitle(session.requests);
+				return {
+					sessionId: session.sessionId,
+					title,
+					lastMessageDate: session.lastMessageDate,
+					isActive: false,
+				} satisfies IChatDetail;
+			});
+		const liveSessionItems = Array.from(this._sessionModels.values())
 			.filter(session => !session.isImported)
-			.map(item => {
-				const title = ChatModel.getDefaultTitle(item.requests);
+			.map(session => {
+				const title = session.title || localize('newChat', "New Chat");
 				return {
-					sessionId: item.sessionId,
-					title
-				};
+					sessionId: session.sessionId,
+					title,
+					lastMessageDate: session.lastMessageDate,
+					isActive: true,
+				} satisfies IChatDetail;
 			});
+		return [...liveSessionItems, ...persistedSessionItems];
 	}
 
 	removeHistoryEntry(sessionId: string): void {
-		delete this._persistedSessions[sessionId];
-		this.saveState();
+		if (this._persistedSessions[sessionId]) {
+			this._deletedChatIds.add(sessionId);
+			delete this._persistedSessions[sessionId];
+			this.saveState();
+		}
 	}
 
 	clearAllHistoryEntries(): void {
+		Object.values(this._persistedSessions).forEach(session => this._deletedChatIds.add(session.sessionId));
 		this._persistedSessions = {};
 		this.saveState();
 	}
@@ -350,13 +472,17 @@ export class ChatService extends Disposable implements IChatService {
 
 		model.removeRequest(request.id, ChatRequestRemovalReason.Resend);
 
-		await this._sendRequestAsync(model, model.sessionId, request.message, attempt, enableCommandDetection, defaultAgent, location, options).responseCompletePromise;
+		const resendOptions: IChatSendRequestOptions = {
+			...options,
+			locationData: request.locationData,
+			attachedContext: request.attachedContext,
+		};
+		await this._sendRequestAsync(model, model.sessionId, request.message, attempt, enableCommandDetection, defaultAgent, location, resendOptions).responseCompletePromise;
 	}
 
 	async sendRequest(sessionId: string, request: string, options?: IChatSendRequestOptions): Promise<IChatSendRequestData | undefined> {
-
 		this.trace('sendRequest', `sessionId: ${sessionId}, message: ${request.substring(0, 20)}${request.length > 20 ? '[...]' : ''}}`);
-		if (!request.trim()) {
+		if (!request.trim() && !options?.slashCommand && !options?.agentId) {
 			this.trace('sendRequest', 'Rejected empty message');
 			return;
 		}
@@ -419,6 +545,7 @@ export class ChatService extends Disposable implements IChatService {
 		const agentPart = 'kind' in parsedRequest ? undefined : parsedRequest.parts.find((r): r is ChatRequestAgentPart => r instanceof ChatRequestAgentPart);
 		const agentSlashCommandPart = 'kind' in parsedRequest ? undefined : parsedRequest.parts.find((r): r is ChatRequestAgentSubcommandPart => r instanceof ChatRequestAgentSubcommandPart);
 		const commandPart = 'kind' in parsedRequest ? undefined : parsedRequest.parts.find((r): r is ChatRequestSlashCommandPart => r instanceof ChatRequestSlashCommandPart);
+		const requests = [...model.getRequests()];
 
 		let gotProgress = false;
 		const requestType = commandPart ? 'slashCommand' : 'string';
@@ -452,6 +579,9 @@ export class ChatService extends Disposable implements IChatService {
 				completeResponseCreated();
 			};
 
+			let detectedAgent: IChatAgentData | undefined;
+			let detectedCommand: IChatAgentCommand | undefined;
+
 			const stopWatch = new StopWatch(false);
 			const listener = token.onCancellationRequested(() => {
 				this.trace('sendRequest', `Request for session ${model.sessionId} was cancelled`);
@@ -466,7 +596,9 @@ export class ChatService extends Disposable implements IChatService {
 					slashCommand: agentSlashCommandPart ? agentSlashCommandPart.command.name : commandPart?.slashCommand.command,
 					chatSessionId: model.sessionId,
 					location,
-					citations: request?.response?.codeCitations.length ?? 0
+					citations: request?.response?.codeCitations.length ?? 0,
+					numCodeBlocks: getCodeBlocks(request.response?.response.toString() ?? '').length,
+					isParticipantDetected: !!detectedAgent
 				});
 
 				model.cancelRequest(request);
@@ -475,39 +607,68 @@ export class ChatService extends Disposable implements IChatService {
 			try {
 				let rawResult: IChatAgentResult | null | undefined;
 				let agentOrCommandFollowups: Promise<IChatFollowup[] | undefined> | undefined = undefined;
+				let chatTitlePromise: Promise<string | undefined> | undefined;
 
 				if (agentPart || (defaultAgent && !commandPart)) {
-					const agent = (agentPart?.agent ?? defaultAgent)!;
+					const prepareChatAgentRequest = async (agent: IChatAgentData, command?: IChatAgentCommand, enableCommandDetection?: boolean, chatRequest?: ChatRequestModel, isParticipantDetected?: boolean) => {
+						const initVariableData: IChatRequestVariableData = { variables: [] };
+						request = chatRequest ?? model.addRequest(parsedRequest, initVariableData, attempt, agent, command, options?.confirmation, options?.locationData, options?.attachedContext);
+
+						// Variables may have changed if the agent and slash command changed, so resolve them again even if we already had a chatRequest
+						const variableData = await this.chatVariablesService.resolveVariables(parsedRequest, request.attachedContext, model, progressCallback, token);
+						model.updateRequest(request, variableData);
+						const promptTextResult = getPromptText(request.message);
+						const updatedVariableData = updateRanges(variableData, promptTextResult.diff); // TODO bit of a hack
+
+						return {
+							sessionId,
+							requestId: request.id,
+							agentId: agent.id,
+							message: promptTextResult.message,
+							command: command?.name,
+							variables: updatedVariableData,
+							enableCommandDetection,
+							isParticipantDetected,
+							attempt,
+							location,
+							locationData: request.locationData,
+							acceptedConfirmationData: options?.acceptedConfirmationData,
+							rejectedConfirmationData: options?.rejectedConfirmationData,
+						} satisfies IChatAgentRequest;
+					};
+
+					if (this.configurationService.getValue('chat.experimental.detectParticipant.enabled') !== false && this.chatAgentService.hasChatParticipantDetectionProviders() && !agentPart && !commandPart && enableCommandDetection) {
+						// We have no agent or command to scope history with, pass the full history to the participant detection provider
+						const defaultAgentHistory = this.getHistoryEntriesFromModel(requests, model.sessionId, location, defaultAgent.id);
+
+						// Prepare the request object that we will send to the participant detection provider
+						const chatAgentRequest = await prepareChatAgentRequest(defaultAgent, agentSlashCommandPart?.command, enableCommandDetection, undefined, false);
+
+						const result = await this.chatAgentService.detectAgentOrCommand(chatAgentRequest, defaultAgentHistory, { location }, token);
+						if (result && this.chatAgentService.getAgent(result.agent.id)?.locations?.includes(location)) {
+							// Update the response in the ChatModel to reflect the detected agent and command
+							request.response?.setAgent(result.agent, result.command);
+							detectedAgent = result.agent;
+							detectedCommand = result.command;
+						}
+					}
+
+					const agent = (detectedAgent ?? agentPart?.agent ?? defaultAgent)!;
+					const command = detectedCommand ?? agentSlashCommandPart?.command;
 					await this.extensionService.activateByEvent(`onChatParticipant:${agent.id}`);
-					const history = getHistoryEntriesFromModel(model, agentPart?.agent.id);
 
-					const initVariableData: IChatRequestVariableData = { variables: [] };
-					request = model.addRequest(parsedRequest, initVariableData, attempt, agent, agentSlashCommandPart?.command);
+					// Recompute history in case the agent or command changed
+					const history = this.getHistoryEntriesFromModel(requests, model.sessionId, location, agent.id);
+					const requestProps = await prepareChatAgentRequest(agent, command, enableCommandDetection, request /* Reuse the request object if we already created it for participant detection */, !!detectedAgent);
+					const pendingRequest = this._pendingRequests.get(sessionId);
+					if (pendingRequest && !pendingRequest.requestId) {
+						pendingRequest.requestId = requestProps.requestId;
+					}
 					completeResponseCreated();
-					const variableData = await this.chatVariablesService.resolveVariables(parsedRequest, options?.attachedContext, model, progressCallback, token);
-					model.updateRequest(request, variableData);
-
-					const promptTextResult = getPromptText(request.message);
-					const updatedVariableData = updateRanges(variableData, promptTextResult.diff); // TODO bit of a hack
-
-					const requestProps: IChatAgentRequest = {
-						sessionId,
-						requestId: request.id,
-						agentId: agent.id,
-						message: promptTextResult.message,
-						command: agentSlashCommandPart?.command.name,
-						variables: updatedVariableData,
-						enableCommandDetection,
-						attempt,
-						location,
-						locationData: options?.locationData,
-						acceptedConfirmationData: options?.acceptedConfirmationData,
-						rejectedConfirmationData: options?.rejectedConfirmationData,
-					};
-
 					const agentResult = await this.chatAgentService.invokeAgent(agent.id, requestProps, progressCallback, history, token);
 					rawResult = agentResult;
 					agentOrCommandFollowups = this.chatAgentService.getFollowups(agent.id, requestProps, agentResult, history, followupsCancelToken);
+					chatTitlePromise = model.getRequests().length === 1 && !model.customTitle ? this.chatAgentService.getChatTitle(defaultAgent.id, this.getHistoryEntriesFromModel(model.getRequests(), model.sessionId, location, agent.id), CancellationToken.None) : undefined;
 				} else if (commandPart && this.chatSlashCommandService.hasCommand(commandPart.slashCommand.command)) {
 					request = model.addRequest(parsedRequest, { variables: [] }, attempt);
 					completeResponseCreated();
@@ -518,8 +679,8 @@ export class ChatService extends Disposable implements IChatService {
 						if (!request.response) {
 							continue;
 						}
-						history.push({ role: ChatMessageRole.User, content: { type: 'text', value: request.message.text } });
-						history.push({ role: ChatMessageRole.Assistant, content: { type: 'text', value: request.response.response.toString() } });
+						history.push({ role: ChatMessageRole.User, content: [{ type: 'text', value: request.message.text }] });
+						history.push({ role: ChatMessageRole.Assistant, content: [{ type: 'text', value: request.response.response.toString() }] });
 					}
 					const message = parsedRequest.text;
 					const commandResult = await this.chatSlashCommandService.executeCommand(commandPart.slashCommand.command, message.substring(commandPart.slashCommand.command.length + 1).trimStart(), new Progress<IChatProgress>(p => {
@@ -544,6 +705,7 @@ export class ChatService extends Disposable implements IChatService {
 						rawResult.errorDetails && gotProgress ? 'errorWithOutput' :
 							rawResult.errorDetails ? 'error' :
 								'success';
+					const commandForTelemetry = agentSlashCommandPart ? agentSlashCommandPart.command.name : commandPart?.slashCommand.command;
 					this.telemetryService.publicLog2<ChatProviderInvokedEvent, ChatProviderInvokedClassification>('interactiveSessionProviderInvoked', {
 						timeToFirstProgress: rawResult.timings?.firstProgress,
 						totalTime: rawResult.timings?.totalElapsed,
@@ -551,10 +713,12 @@ export class ChatService extends Disposable implements IChatService {
 						requestType,
 						agent: agentPart?.agent.id ?? '',
 						agentExtensionId: agentPart?.agent.extensionId.value ?? '',
-						slashCommand: agentSlashCommandPart ? agentSlashCommandPart.command.name : commandPart?.slashCommand.command,
+						slashCommand: commandForTelemetry,
 						chatSessionId: model.sessionId,
+						isParticipantDetected: !!detectedAgent,
 						location,
-						citations: request.response?.codeCitations.length ?? 0
+						citations: request.response?.codeCitations.length ?? 0,
+						numCodeBlocks: getCodeBlocks(request.response?.response.toString() ?? '').length
 					});
 					model.setResponse(request, rawResult);
 					completeResponseCreated();
@@ -564,8 +728,14 @@ export class ChatService extends Disposable implements IChatService {
 					if (agentOrCommandFollowups) {
 						agentOrCommandFollowups.then(followups => {
 							model.setFollowups(request, followups);
+							this._chatServiceTelemetry.retrievedFollowups(agentPart?.agent.id ?? '', commandForTelemetry, followups?.length ?? 0);
 						});
 					}
+					chatTitlePromise?.then(title => {
+						if (title) {
+							model.setCustomTitle(title);
+						}
+					});
 				}
 			} catch (err) {
 				const result = 'error';
@@ -579,7 +749,9 @@ export class ChatService extends Disposable implements IChatService {
 					slashCommand: agentSlashCommandPart ? agentSlashCommandPart.command.name : commandPart?.slashCommand.command,
 					chatSessionId: model.sessionId,
 					location,
-					citations: 0
+					citations: 0,
+					numCodeBlocks: 0,
+					isParticipantDetected: !!detectedAgent
 				});
 				this.logService.error(`Error while handling chat request: ${toErrorMessage(err, true)}`);
 				if (request) {
@@ -593,7 +765,7 @@ export class ChatService extends Disposable implements IChatService {
 			}
 		};
 		const rawResponsePromise = sendRequestInternal();
-		this._pendingRequests.set(model.sessionId, source);
+		this._pendingRequests.set(model.sessionId, new CancellableRequest(source));
 		rawResponsePromise.finally(() => {
 			this._pendingRequests.deleteAndDispose(model.sessionId);
 		});
@@ -603,6 +775,36 @@ export class ChatService extends Disposable implements IChatService {
 		};
 	}
 
+	private getHistoryEntriesFromModel(requests: IChatRequestModel[], sessionId: string, location: ChatAgentLocation, forAgentId: string): IChatAgentHistoryEntry[] {
+		const history: IChatAgentHistoryEntry[] = [];
+		for (const request of requests) {
+			if (!request.response) {
+				continue;
+			}
+
+			const defaultAgentId = this.chatAgentService.getDefaultAgent(location)?.id;
+			if (forAgentId !== request.response.agent?.id && forAgentId !== defaultAgentId) {
+				// An agent only gets to see requests that were sent to this agent.
+				// The default agent (the undefined case) gets to see all of them.
+				continue;
+			}
+
+			const promptTextResult = getPromptText(request.message);
+			const historyRequest: IChatAgentRequest = {
+				sessionId: sessionId,
+				requestId: request.id,
+				agentId: request.response.agent?.id ?? '',
+				message: promptTextResult.message,
+				command: request.response.slashCommand?.name,
+				variables: updateRanges(request.variableData, promptTextResult.diff), // TODO bit of a hack
+				location: ChatAgentLocation.Panel
+			};
+			history.push({ request: historyRequest, response: request.response.response.value, result: request.response.result ?? {} });
+		}
+
+		return history;
+	}
+
 	async removeRequest(sessionId: string, requestId: string): Promise<void> {
 		const model = this._sessionModels.get(sessionId);
 		if (!model) {
@@ -611,6 +813,12 @@ export class ChatService extends Disposable implements IChatService {
 
 		await model.waitForInitialization();
 
+		const pendingRequest = this._pendingRequests.get(sessionId);
+		if (pendingRequest?.requestId === requestId) {
+			pendingRequest.cancel();
+			this._pendingRequests.deleteAndDispose(sessionId);
+		}
+
 		model.removeRequest(requestId);
 	}
 
@@ -631,6 +839,7 @@ export class ChatService extends Disposable implements IChatService {
 		if (request.response && !request.response.isComplete) {
 			const cts = this._pendingRequests.deleteAndLeak(oldOwner.sessionId);
 			if (cts) {
+				cts.requestId = request.id;
 				this._pendingRequests.set(target.sessionId, cts);
 			}
 		}
@@ -680,7 +889,9 @@ export class ChatService extends Disposable implements IChatService {
 		if (model.initialLocation === ChatAgentLocation.Panel) {
 			// Turn all the real objects into actual JSON, otherwise, calling 'revive' may fail when it tries to
 			// assign values to properties that are getters- microsoft/vscode-copilot-release#1233
-			this._persistedSessions[sessionId] = JSON.parse(JSON.stringify(model));
+			const sessionData: ISerializableChatData = JSON.parse(JSON.stringify(model));
+			sessionData.isNew = true;
+			this._persistedSessions[sessionId] = sessionData;
 		}
 
 		this._sessionModels.deleteAndDispose(sessionId);
@@ -711,3 +922,26 @@ export class ChatService extends Disposable implements IChatService {
 		this.trace('transferChatSession', `Transferred session ${model.sessionId} to workspace ${toWorkspace.toString()}`);
 	}
 }
+
+function getCodeBlocks(text: string): string[] {
+	const lines = text.split('\n');
+	const codeBlockLanguages: string[] = [];
+
+	let codeBlockState: undefined | { readonly delimiter: string; readonly languageId: string };
+	for (let i = 0; i < lines.length; i++) {
+		const line = lines[i];
+
+		if (codeBlockState) {
+			if (new RegExp(`^\\s*${codeBlockState.delimiter}\\s*$`).test(line)) {
+				codeBlockLanguages.push(codeBlockState.languageId);
+				codeBlockState = undefined;
+			}
+		} else {
+			const match = line.match(/^(\s*)(`{3,}|~{3,})(\w*)/);
+			if (match) {
+				codeBlockState = { delimiter: match[2], languageId: match[3] };
+			}
+		}
+	}
+	return codeBlockLanguages;
+}
diff --git a/src/vs/workbench/contrib/chat/common/chatServiceTelemetry.ts b/src/vs/workbench/contrib/chat/common/chatServiceTelemetry.ts
index ec8d5aa339e..2b7ff3ccd5b 100644
--- a/src/vs/workbench/contrib/chat/common/chatServiceTelemetry.ts
+++ b/src/vs/workbench/contrib/chat/common/chatServiceTelemetry.ts
@@ -11,12 +11,14 @@ type ChatVoteEvent = {
 	direction: 'up' | 'down';
 	agentId: string;
 	command: string | undefined;
+	reason: string | undefined;
 };
 
 type ChatVoteClassification = {
 	direction: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether the user voted up or down.' };
 	agentId: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The ID of the chat agent that this vote is for.' };
 	command: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The name of the slash command that this vote is for.' };
+	reason: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The reason selected by the user for voting down.' };
 	owner: 'roblourens';
 	comment: 'Provides insight into the performance of Chat agents.';
 };
@@ -39,12 +41,16 @@ type ChatInsertEvent = {
 	newFile: boolean;
 	agentId: string;
 	command: string | undefined;
+	userAction: string | undefined;
+	codeMapper: string | undefined;
 };
 
 type ChatInsertClassification = {
 	newFile: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether the code was inserted into a new untitled file.' };
 	agentId: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The ID of the chat agent that this insertion is for.' };
 	command: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The name of the slash command that this insertion is for.' };
+	userAction: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Id of the UI command that was used to do the insert.' };
+	codeMapper: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The code mapper that wa used to compute the edit.' };
 	owner: 'roblourens';
 	comment: 'Provides insight into the usage of Chat features.';
 };
@@ -63,6 +69,18 @@ type ChatCommandClassification = {
 	comment: 'Provides insight into the usage of Chat features.';
 };
 
+type ChatFollowupEvent = {
+	agentId: string;
+	command: string | undefined;
+};
+
+type ChatFollowupClassification = {
+	agentId: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The ID of the related chat agent.' };
+	command: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The name of the related slash command.' };
+	owner: 'roblourens';
+	comment: 'Provides insight into the usage of Chat features.';
+};
+
 type ChatTerminalEvent = {
 	languageId: string;
 	agentId: string;
@@ -77,6 +95,20 @@ type ChatTerminalClassification = {
 	comment: 'Provides insight into the usage of Chat features.';
 };
 
+type ChatFollowupsRetrievedEvent = {
+	agentId: string;
+	command: string | undefined;
+	numFollowups: number;
+};
+
+type ChatFollowupsRetrievedClassification = {
+	agentId: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The ID of the related chat agent.' };
+	command: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The name of the related slash command.' };
+	numFollowups: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The number of followup prompts returned by the agent.' };
+	owner: 'roblourens';
+	comment: 'Provides insight into the usage of Chat features.';
+};
+
 export class ChatServiceTelemetry {
 	constructor(
 		@ITelemetryService private readonly telemetryService: ITelemetryService,
@@ -88,6 +120,7 @@ export class ChatServiceTelemetry {
 				direction: action.action.direction === ChatAgentVoteDirection.Up ? 'up' : 'down',
 				agentId: action.agentId ?? '',
 				command: action.command,
+				reason: action.action.reason,
 			});
 		} else if (action.action.kind === 'copy') {
 			this.telemetryService.publicLog2<ChatCopyEvent, ChatCopyClassification>('interactiveSessionCopy', {
@@ -98,6 +131,8 @@ export class ChatServiceTelemetry {
 		} else if (action.action.kind === 'insert') {
 			this.telemetryService.publicLog2<ChatInsertEvent, ChatInsertClassification>('interactiveSessionInsert', {
 				newFile: !!action.action.newFile,
+				userAction: action.action.userAction,
+				codeMapper: action.action.codeMapper,
 				agentId: action.agentId ?? '',
 				command: action.command,
 			});
@@ -116,6 +151,19 @@ export class ChatServiceTelemetry {
 				agentId: action.agentId ?? '',
 				command: action.command,
 			});
+		} else if (action.action.kind === 'followUp') {
+			this.telemetryService.publicLog2<ChatFollowupEvent, ChatFollowupClassification>('chatFollowupClicked', {
+				agentId: action.agentId ?? '',
+				command: action.command,
+			});
 		}
 	}
+
+	retrievedFollowups(agentId: string, command: string | undefined, numFollowups: number): void {
+		this.telemetryService.publicLog2<ChatFollowupsRetrievedEvent, ChatFollowupsRetrievedClassification>('chatFollowupsRetrieved', {
+			agentId,
+			command,
+			numFollowups,
+		});
+	}
 }
diff --git a/src/vs/workbench/contrib/chat/common/chatViewModel.ts b/src/vs/workbench/contrib/chat/common/chatViewModel.ts
index fc34fce7ec3..9d52570ef1e 100644
--- a/src/vs/workbench/contrib/chat/common/chatViewModel.ts
+++ b/src/vs/workbench/contrib/chat/common/chatViewModel.ts
@@ -6,7 +6,7 @@
 import { Emitter, Event } from 'vs/base/common/event';
 import { IMarkdownString } from 'vs/base/common/htmlContent';
 import { Disposable } from 'vs/base/common/lifecycle';
-import { marked } from 'vs/base/common/marked/marked';
+import * as marked from 'vs/base/common/marked/marked';
 import { ThemeIcon } from 'vs/base/common/themables';
 import { URI } from 'vs/base/common/uri';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
@@ -15,7 +15,7 @@ import { annotateVulnerabilitiesInText } from 'vs/workbench/contrib/chat/common/
 import { getFullyQualifiedId, IChatAgentCommand, IChatAgentData, IChatAgentNameService, IChatAgentResult } from 'vs/workbench/contrib/chat/common/chatAgents';
 import { ChatModelInitState, IChatModel, IChatProgressRenderableResponseContent, IChatRequestModel, IChatRequestVariableEntry, IChatResponseModel, IChatTextEditGroup, IChatWelcomeMessageContent, IResponse } from 'vs/workbench/contrib/chat/common/chatModel';
 import { IParsedChatRequest } from 'vs/workbench/contrib/chat/common/chatParserTypes';
-import { ChatAgentVoteDirection, IChatCodeCitation, IChatContentReference, IChatFollowup, IChatProgressMessage, IChatResponseErrorDetails, IChatTask, IChatUsedContext } from 'vs/workbench/contrib/chat/common/chatService';
+import { ChatAgentVoteDirection, ChatAgentVoteDownReason, IChatCodeCitation, IChatContentReference, IChatFollowup, IChatProgressMessage, IChatResponseErrorDetails, IChatTask, IChatUsedContext } from 'vs/workbench/contrib/chat/common/chatService';
 import { countWords } from 'vs/workbench/contrib/chat/common/chatWordCounter';
 import { CodeBlockModelCollection } from './codeBlockModelCollection';
 import { hash } from 'vs/base/common/hash';
@@ -72,6 +72,7 @@ export interface IChatRequestViewModel {
 	readonly variables: IChatRequestVariableEntry[];
 	currentRenderedHeight: number | undefined;
 	readonly contentReferences?: ReadonlyArray<IChatContentReference>;
+	readonly confirmation?: string;
 }
 
 export interface IChatResponseMarkdownRenderData {
@@ -168,6 +169,7 @@ export interface IChatResponseViewModel {
 	readonly isCanceled: boolean;
 	readonly isStale: boolean;
 	readonly vote: ChatAgentVoteDirection | undefined;
+	readonly voteDownReason: ChatAgentVoteDownReason | undefined;
 	readonly replyFollowups?: IChatFollowup[];
 	readonly errorDetails?: IChatResponseErrorDetails;
 	readonly result?: IChatAgentResult;
@@ -175,6 +177,7 @@ export interface IChatResponseViewModel {
 	renderData?: IChatResponseRenderData;
 	currentRenderedHeight: number | undefined;
 	setVote(vote: ChatAgentVoteDirection): void;
+	setVoteDownReason(reason: ChatAgentVoteDownReason | undefined): void;
 	usedReferencesExpanded?: boolean;
 	vulnerabilitiesListExpanded: boolean;
 	setEditApplied(edit: IChatTextEditGroup, editCount: number): void;
@@ -305,38 +308,13 @@ export class ChatViewModel extends Disposable implements IChatViewModel {
 		}
 
 		let codeBlockIndex = 0;
-		const renderer = new marked.Renderer();
-		renderer.code = (value, languageId) => {
-			languageId ??= '';
-			this.codeBlockModelCollection.update(this._model.sessionId, model, codeBlockIndex++, { text: value, languageId });
-			return '';
-		};
-
-		marked.parse(this.ensureFencedCodeBlocksTerminated(content), { renderer });
-	}
-
-	/**
-	 * Marked doesn't consistently render fenced code blocks that aren't terminated.
-	 *
-	 * Try to close them ourselves to workaround this.
-	 */
-	private ensureFencedCodeBlocksTerminated(content: string): string {
-		const lines = content.split('\n');
-		let inCodeBlock = false;
-
-		for (let i = 0; i < lines.length; i++) {
-			const line = lines[i];
-			if (line.startsWith('```')) {
-				inCodeBlock = !inCodeBlock;
+		marked.walkTokens(marked.lexer(content), token => {
+			if (token.type === 'code') {
+				const lang = token.lang || '';
+				const text = token.text;
+				this.codeBlockModelCollection.update(this._model.sessionId, model, codeBlockIndex++, { text, languageId: lang });
 			}
-		}
-
-		// If we're still in a code block at the end of the content, add a closing fence
-		if (inCodeBlock) {
-			lines.push('```');
-		}
-
-		return lines.join('\n');
+		});
 	}
 }
 
@@ -381,6 +359,10 @@ export class ChatRequestViewModel implements IChatRequestViewModel {
 		return this._model.response?.contentReferences;
 	}
 
+	get confirmation() {
+		return this._model.confirmation;
+	}
+
 	currentRenderedHeight: number | undefined;
 
 	constructor(
@@ -483,6 +465,10 @@ export class ChatResponseViewModel extends Disposable implements IChatResponseVi
 		return this._model.vote;
 	}
 
+	get voteDownReason() {
+		return this._model.voteDownReason;
+	}
+
 	get requestId() {
 		return this._model.requestId;
 	}
@@ -573,6 +559,11 @@ export class ChatResponseViewModel extends Disposable implements IChatResponseVi
 		this._model.setVote(vote);
 	}
 
+	setVoteDownReason(reason: ChatAgentVoteDownReason | undefined): void {
+		this._modelChangeCount++;
+		this._model.setVoteDownReason(reason);
+	}
+
 	setEditApplied(edit: IChatTextEditGroup, editCount: number) {
 		this._modelChangeCount++;
 		this._model.setEditApplied(edit, editCount);
diff --git a/src/vs/workbench/contrib/chat/common/chatWordCounter.ts b/src/vs/workbench/contrib/chat/common/chatWordCounter.ts
index b81d391186e..c1989d4f997 100644
--- a/src/vs/workbench/contrib/chat/common/chatWordCounter.ts
+++ b/src/vs/workbench/contrib/chat/common/chatWordCounter.ts
@@ -10,13 +10,43 @@ export interface IWordCountResult {
 	isFullString: boolean;
 }
 
+const r = String.raw;
+
+/**
+ * Matches `[text](link title?)` or `[text](<link> title?)`
+ *
+ * Taken from vscode-markdown-languageservice
+ */
+const linkPattern =
+	r`(?<!\\)` + // Must not start with escape
+
+	// text
+	r`(!?\[` + // open prefix match -->
+	/**/r`(?:` +
+	/*****/r`[^\[\]\\]|` + // Non-bracket chars, or...
+	/*****/r`\\.|` + // Escaped char, or...
+	/*****/r`\[[^\[\]]*\]` + // Matched bracket pair
+	/**/r`)*` +
+	r`\])` + // <-- close prefix match
+
+	// Destination
+	r`(\(\s*)` + // Pre href
+	/**/r`(` +
+	/*****/r`[^\s\(\)<](?:[^\s\(\)]|\([^\s\(\)]*?\))*|` + // Link without whitespace, or...
+	/*****/r`<(?:\\[<>]|[^<>])+>` + // In angle brackets
+	/**/r`)` +
+
+	// Title
+	/**/r`\s*(?:"[^"]*"|'[^']*'|\([^\(\)]*\))?\s*` +
+	r`\)`;
+
 export function getNWords(str: string, numWordsToCount: number): IWordCountResult {
 	// This regex matches each word and skips over whitespace and separators. A word is:
 	// A markdown link
 	// One chinese character
 	// One or more + - =, handled so that code like "a=1+2-3" is broken up better
 	// One or more characters that aren't whitepace or any of the above
-	const allWordMatches = Array.from(str.matchAll(/\[([^\]]+)\]\(([^)]+)\)|\p{sc=Han}|=+|\++|-+|[^\s\|\p{sc=Han}|=|\+|\-]+/gu));
+	const allWordMatches = Array.from(str.matchAll(new RegExp(linkPattern + r`|\p{sc=Han}|=+|\++|-+|[^\s\|\p{sc=Han}|=|\+|\-]+`, 'gu')));
 
 	const targetWords = allWordMatches.slice(0, numWordsToCount);
 
diff --git a/src/vs/workbench/contrib/chat/common/codeBlockModelCollection.ts b/src/vs/workbench/contrib/chat/common/codeBlockModelCollection.ts
index d5ed699cd9b..d167cb4b7c4 100644
--- a/src/vs/workbench/contrib/chat/common/codeBlockModelCollection.ts
+++ b/src/vs/workbench/contrib/chat/common/codeBlockModelCollection.ts
@@ -142,6 +142,10 @@ export class CodeBlockModelCollection extends Disposable {
 
 		return {
 			references: chat.contentReferences.map(ref => {
+				if (typeof ref.reference === 'string') {
+					return;
+				}
+
 				const uriOrLocation = 'variableName' in ref.reference ?
 					ref.reference.value :
 					ref.reference;
diff --git a/src/vs/workbench/contrib/chat/common/languageModelToolsService.ts b/src/vs/workbench/contrib/chat/common/languageModelToolsService.ts
index 09e8903a15f..9a951927828 100644
--- a/src/vs/workbench/contrib/chat/common/languageModelToolsService.ts
+++ b/src/vs/workbench/contrib/chat/common/languageModelToolsService.ts
@@ -3,21 +3,26 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { RunOnceScheduler } from 'vs/base/common/async';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { Emitter, Event } from 'vs/base/common/event';
 import { Iterable } from 'vs/base/common/iterator';
 import { IJSONSchema } from 'vs/base/common/jsonSchema';
-import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';
+import { Disposable, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
 import { ThemeIcon } from 'vs/base/common/themables';
 import { URI } from 'vs/base/common/uri';
+import { ContextKeyExpression, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
 
 export interface IToolData {
-	name: string;
+	id: string;
+	name?: string;
 	icon?: { dark: URI; light?: URI } | ThemeIcon;
+	when?: ContextKeyExpression;
 	displayName?: string;
-	description: string;
+	userDescription?: string;
+	modelDescription: string;
 	parametersSchema?: IJSONSchema;
 	canBeInvokedManually?: boolean;
 }
@@ -27,51 +32,85 @@ interface IToolEntry {
 	impl?: IToolImpl;
 }
 
+export interface IToolInvocation {
+	callId: string;
+	toolId: string;
+	parameters: any;
+	tokenBudget?: number;
+}
+
+export interface IToolResult {
+	[contentType: string]: any;
+	string: string;
+}
+
 export interface IToolImpl {
-	invoke(parameters: any, token: CancellationToken): Promise<string>;
+	invoke(dto: IToolInvocation, countTokens: CountTokensCallback, token: CancellationToken): Promise<IToolResult>;
 }
 
 export const ILanguageModelToolsService = createDecorator<ILanguageModelToolsService>('ILanguageModelToolsService');
 
-export interface IToolDelta {
-	added?: IToolData;
-	removed?: string;
-}
+export type CountTokensCallback = (input: string, token: CancellationToken) => Promise<number>;
 
 export interface ILanguageModelToolsService {
 	_serviceBrand: undefined;
-	onDidChangeTools: Event<IToolDelta>;
+	onDidChangeTools: Event<void>;
 	registerToolData(toolData: IToolData): IDisposable;
 	registerToolImplementation(name: string, tool: IToolImpl): IDisposable;
 	getTools(): Iterable<Readonly<IToolData>>;
-	invokeTool(name: string, parameters: any, token: CancellationToken): Promise<string>;
+	getTool(id: string): IToolData | undefined;
+	getToolByName(name: string): IToolData | undefined;
+	invokeTool(dto: IToolInvocation, countTokens: CountTokensCallback, token: CancellationToken): Promise<IToolResult>;
 }
 
-export class LanguageModelToolsService implements ILanguageModelToolsService {
+export class LanguageModelToolsService extends Disposable implements ILanguageModelToolsService {
 	_serviceBrand: undefined;
 
-	private _onDidChangeTools = new Emitter<IToolDelta>();
+	private _onDidChangeTools = new Emitter<void>();
 	readonly onDidChangeTools = this._onDidChangeTools.event;
 
+	/** Throttle tools updates because it sends all tools and runs on context key updates */
+	private _onDidChangeToolsScheduler = new RunOnceScheduler(() => this._onDidChangeTools.fire(), 750);
+
 	private _tools = new Map<string, IToolEntry>();
+	private _toolContextKeys = new Set<string>();
 
 	constructor(
-		@IExtensionService private readonly _extensionService: IExtensionService
-	) { }
+		@IExtensionService private readonly _extensionService: IExtensionService,
+		@IContextKeyService private readonly _contextKeyService: IContextKeyService,
+	) {
+		super();
+
+		this._register(this._contextKeyService.onDidChangeContext(e => {
+			if (e.affectsSome(this._toolContextKeys)) {
+				// Not worth it to compute a delta here unless we have many tools changing often
+				this._onDidChangeToolsScheduler.schedule();
+			}
+		}));
+	}
 
 	registerToolData(toolData: IToolData): IDisposable {
-		if (this._tools.has(toolData.name)) {
-			throw new Error(`Tool "${toolData.name}" is already registered.`);
+		if (this._tools.has(toolData.id)) {
+			throw new Error(`Tool "${toolData.id}" is already registered.`);
 		}
 
-		this._tools.set(toolData.name, { data: toolData });
-		this._onDidChangeTools.fire({ added: toolData });
+		this._tools.set(toolData.id, { data: toolData });
+		this._onDidChangeToolsScheduler.schedule();
+
+		toolData.when?.keys().forEach(key => this._toolContextKeys.add(key));
 
 		return toDisposable(() => {
-			this._tools.delete(toolData.name);
-			this._onDidChangeTools.fire({ removed: toolData.name });
+			this._tools.delete(toolData.id);
+			this._refreshAllToolContextKeys();
+			this._onDidChangeToolsScheduler.schedule();
 		});
+	}
 
+	private _refreshAllToolContextKeys() {
+		this._toolContextKeys.clear();
+		for (const tool of this._tools.values()) {
+			tool.data.when?.keys().forEach(key => this._toolContextKeys.add(key));
+		}
 	}
 
 	registerToolImplementation(name: string, tool: IToolImpl): IDisposable {
@@ -91,25 +130,49 @@ export class LanguageModelToolsService implements ILanguageModelToolsService {
 	}
 
 	getTools(): Iterable<Readonly<IToolData>> {
-		return Iterable.map(this._tools.values(), i => i.data);
+		const toolDatas = Iterable.map(this._tools.values(), i => i.data);
+		return Iterable.filter(toolDatas, toolData => !toolData.when || this._contextKeyService.contextMatchesRules(toolData.when));
+	}
+
+	getTool(id: string): IToolData | undefined {
+		return this._getToolEntry(id)?.data;
+	}
+
+	private _getToolEntry(id: string): IToolEntry | undefined {
+		const entry = this._tools.get(id);
+		if (entry && (!entry.data.when || this._contextKeyService.contextMatchesRules(entry.data.when))) {
+			return entry;
+		} else {
+			return undefined;
+		}
+	}
+
+	getToolByName(name: string): IToolData | undefined {
+		for (const toolData of this.getTools()) {
+			if (toolData.name === name) {
+				return toolData;
+			}
+		}
+		return undefined;
 	}
 
-	async invokeTool(name: string, parameters: any, token: CancellationToken): Promise<string> {
-		let tool = this._tools.get(name);
+	async invokeTool(dto: IToolInvocation, countTokens: CountTokensCallback, token: CancellationToken): Promise<IToolResult> {
+		// When invoking a tool, don't validate the "when" clause. An extension may have invoked a tool just as it was becoming disabled, and just let it go through rather than throw and break the chat.
+		let tool = this._tools.get(dto.toolId);
 		if (!tool) {
-			throw new Error(`Tool ${name} was not contributed`);
+			throw new Error(`Tool ${dto.toolId} was not contributed`);
 		}
 
 		if (!tool.impl) {
-			await this._extensionService.activateByEvent(`onLanguageModelTool:${name}`);
+			await this._extensionService.activateByEvent(`onLanguageModelTool:${dto.toolId}`);
 
 			// Extension should activate and register the tool implementation
-			tool = this._tools.get(name);
+			tool = this._tools.get(dto.toolId);
 			if (!tool?.impl) {
-				throw new Error(`Tool ${name} does not have an implementation registered.`);
+				throw new Error(`Tool ${dto.toolId} does not have an implementation registered.`);
 			}
 		}
 
-		return tool.impl.invoke(parameters, token);
+		return tool.impl.invoke(dto, countTokens, token);
 	}
 }
diff --git a/src/vs/workbench/contrib/chat/common/languageModels.ts b/src/vs/workbench/contrib/chat/common/languageModels.ts
index b19a50e5e44..c63b16331aa 100644
--- a/src/vs/workbench/contrib/chat/common/languageModels.ts
+++ b/src/vs/workbench/contrib/chat/common/languageModels.ts
@@ -27,19 +27,19 @@ export interface IChatMessageTextPart {
 	value: string;
 }
 
-export interface IChatMessageFunctionResultPart {
-	type: 'function_result';
-	name: string;
+export interface IChatMessageToolResultPart {
+	type: 'tool_result';
+	toolCallId: string;
 	value: any;
 	isError?: boolean;
 }
 
-export type IChatMessagePart = IChatMessageTextPart | IChatMessageFunctionResultPart;
+export type IChatMessagePart = IChatMessageTextPart | IChatMessageToolResultPart | IChatResponseToolUsePart;
 
 export interface IChatMessage {
 	readonly name?: string | undefined;
 	readonly role: ChatMessageRole;
-	readonly content: IChatMessagePart;
+	readonly content: IChatMessagePart[];
 }
 
 export interface IChatResponseTextPart {
@@ -47,13 +47,14 @@ export interface IChatResponseTextPart {
 	value: string;
 }
 
-export interface IChatResponceFunctionUsePart {
-	type: 'function_use';
+export interface IChatResponseToolUsePart {
+	type: 'tool_use';
 	name: string;
+	toolCallId: string;
 	parameters: any;
 }
 
-export type IChatResponsePart = IChatResponseTextPart | IChatResponceFunctionUsePart;
+export type IChatResponsePart = IChatResponseTextPart | IChatResponseToolUsePart;
 
 export interface IChatResponseFragment {
 	index: number;
diff --git a/src/vs/workbench/contrib/chat/common/tools/languageModelToolsContribution.ts b/src/vs/workbench/contrib/chat/common/tools/languageModelToolsContribution.ts
index 0c5802da757..03c45c65d6a 100644
--- a/src/vs/workbench/contrib/chat/common/tools/languageModelToolsContribution.ts
+++ b/src/vs/workbench/contrib/chat/common/tools/languageModelToolsContribution.ts
@@ -9,6 +9,7 @@ import { DisposableMap } from 'vs/base/common/lifecycle';
 import { joinPath } from 'vs/base/common/resources';
 import { ThemeIcon } from 'vs/base/common/themables';
 import { localize } from 'vs/nls';
+import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
 import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
 import { ILogService } from 'vs/platform/log/common/log';
 import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
@@ -16,10 +17,13 @@ import { ILanguageModelToolsService, IToolData } from 'vs/workbench/contrib/chat
 import * as extensionsRegistry from 'vs/workbench/services/extensions/common/extensionsRegistry';
 
 interface IRawToolContribution {
-	name: string;
+	id: string;
+	name?: string;
 	icon?: string | { light: string; dark: string };
+	when?: string;
 	displayName?: string;
-	description: string;
+	userDescription?: string;
+	modelDescription: string;
 	parametersSchema?: IJSONSchema;
 	canBeInvokedManually?: boolean;
 }
@@ -28,7 +32,7 @@ const languageModelToolsExtensionPoint = extensionsRegistry.ExtensionsRegistry.r
 	extensionPoint: 'languageModelTools',
 	activationEventsGenerator: (contributions: IRawToolContribution[], result) => {
 		for (const contrib of contributions) {
-			result.push(`onLanguageModelTool:${contrib.name}`);
+			result.push(`onLanguageModelTool:${contrib.id}`);
 		}
 	},
 	jsonSchema: {
@@ -38,18 +42,29 @@ const languageModelToolsExtensionPoint = extensionsRegistry.ExtensionsRegistry.r
 			additionalProperties: false,
 			type: 'object',
 			defaultSnippets: [{ body: { name: '', description: '' } }],
-			required: ['name', 'description'],
+			required: ['id', 'modelDescription'],
 			properties: {
+				id: {
+					description: localize('toolId', "A unique id for this tool."),
+					type: 'string',
+					// Borrow OpenAI's requirement for tool names
+					pattern: '^[\\w-]+$'
+				},
 				name: {
-					description: localize('toolname', "A name for this tool which must be unique across all tools."),
+					description: localize('toolName', "If {0} is enabled for this tool, the user may use '#' with this name to invoke the tool in a query. Otherwise, the name is not required. Name must not contain whitespace.", '`canBeInvokedManually`'),
+					type: 'string',
+					pattern: '^[\\w-]+$'
+				},
+				displayName: {
+					description: localize('toolDisplayName', "A human-readable name for this tool that may be used to describe it in the UI."),
 					type: 'string'
 				},
-				description: {
-					description: localize('toolDescription', "A description of this tool that may be passed to a language model."),
+				userDescription: {
+					description: localize('toolUserDescription', "A description of this tool that may be shown to the user."),
 					type: 'string'
 				},
-				displayName: {
-					description: localize('toolDisplayName', "A human-readable name for this tool that may be used to describe it in the UI."),
+				modelDescription: {
+					description: localize('toolModelDescription', "A description of this tool that may be passed to a language model."),
 					type: 'string'
 				},
 				parametersSchema: {
@@ -79,6 +94,10 @@ const languageModelToolsExtensionPoint = extensionsRegistry.ExtensionsRegistry.r
 							}
 						}
 					}]
+				},
+				when: {
+					markdownDescription: localize('condition', "Condition which must be true for this tool to be enabled. Note that a tool may still be invoked by another extension even when its `when` condition is false."),
+					type: 'string'
 				}
 			}
 		}
@@ -101,8 +120,18 @@ export class LanguageModelToolsExtensionPointHandler implements IWorkbenchContri
 		languageModelToolsExtensionPoint.setHandler((extensions, delta) => {
 			for (const extension of delta.added) {
 				for (const rawTool of extension.value) {
-					if (!rawTool.name || !rawTool.description) {
-						logService.warn(`Invalid tool contribution from ${extension.description.identifier.value}: ${JSON.stringify(rawTool)}`);
+					if (!rawTool.id || !rawTool.modelDescription) {
+						logService.error(`Extension '${extension.description.identifier.value}' CANNOT register tool without name and modelDescription: ${JSON.stringify(rawTool)}`);
+						continue;
+					}
+
+					if (!rawTool.id.match(/^[\w-]+$/)) {
+						logService.error(`Extension '${extension.description.identifier.value}' CANNOT register tool with invalid id: ${rawTool.id}. The id must match /^[\\w-]+$/.`);
+						continue;
+					}
+
+					if (rawTool.canBeInvokedManually && !rawTool.name) {
+						logService.error(`Extension '${extension.description.identifier.value}' CANNOT register tool with 'canBeInvokedManually' set without a name: ${JSON.stringify(rawTool)}`);
 						continue;
 					}
 
@@ -120,18 +149,19 @@ export class LanguageModelToolsExtensionPointHandler implements IWorkbenchContri
 						};
 					}
 
-					const tool = {
+					const tool: IToolData = {
 						...rawTool,
-						icon
+						icon,
+						when: rawTool.when ? ContextKeyExpr.deserialize(rawTool.when) : undefined,
 					};
 					const disposable = languageModelToolsService.registerToolData(tool);
-					this._registrationDisposables.set(toToolKey(extension.description.identifier, rawTool.name), disposable);
+					this._registrationDisposables.set(toToolKey(extension.description.identifier, rawTool.id), disposable);
 				}
 			}
 
 			for (const extension of delta.removed) {
 				for (const tool of extension.value) {
-					this._registrationDisposables.deleteAndDispose(toToolKey(extension.description.identifier, tool.name));
+					this._registrationDisposables.deleteAndDispose(toToolKey(extension.description.identifier, tool.id));
 				}
 			}
 		});
diff --git a/src/vs/workbench/contrib/chat/electron-sandbox/actions/voiceChatActions.ts b/src/vs/workbench/contrib/chat/electron-sandbox/actions/voiceChatActions.ts
index 58586530c70..b0455f490d4 100644
--- a/src/vs/workbench/contrib/chat/electron-sandbox/actions/voiceChatActions.ts
+++ b/src/vs/workbench/contrib/chat/electron-sandbox/actions/voiceChatActions.ts
@@ -43,7 +43,7 @@ import { isResponseVM } from 'vs/workbench/contrib/chat/common/chatViewModel';
 import { IVoiceChatService, VoiceChatInProgress as GlobalVoiceChatInProgress } from 'vs/workbench/contrib/chat/common/voiceChatService';
 import { IExtensionsWorkbenchService } from 'vs/workbench/contrib/extensions/common/extensions';
 import { InlineChatController } from 'vs/workbench/contrib/inlineChat/browser/inlineChatController';
-import { CTX_INLINE_CHAT_FOCUSED } from 'vs/workbench/contrib/inlineChat/common/inlineChat';
+import { CTX_INLINE_CHAT_FOCUSED, MENU_INLINE_CHAT_WIDGET_SECONDARY } from 'vs/workbench/contrib/inlineChat/common/inlineChat';
 import { NOTEBOOK_EDITOR_FOCUSED } from 'vs/workbench/contrib/notebook/common/notebookContextKeys';
 import { HasSpeechProvider, ISpeechService, KeywordRecognitionStatus, SpeechToTextInProgress, SpeechToTextStatus, TextToSpeechStatus, TextToSpeechInProgress as GlobalTextToSpeechInProgress } from 'vs/workbench/contrib/speech/common/speechService';
 import { ITerminalService } from 'vs/workbench/contrib/terminal/browser/terminal';
@@ -388,11 +388,8 @@ class VoiceChatSessions {
 		if (!response) {
 			return;
 		}
-
-		if (
-			!this.accessibilityService.isScreenReaderOptimized() && // do not auto synthesize when screen reader is active
-			this.configurationService.getValue<boolean>(AccessibilityVoiceSettingId.AutoSynthesize) === true
-		) {
+		const autoSynthesize = this.configurationService.getValue<'on' | 'off' | 'auto'>(AccessibilityVoiceSettingId.AutoSynthesize);
+		if (autoSynthesize === 'on' || autoSynthesize === 'auto' && !this.accessibilityService.isScreenReaderOptimized()) {
 			let context: IVoiceChatSessionController | 'focused';
 			if (controller.context === 'inline') {
 				// TODO@bpasero this is ugly, but the lightweight inline chat turns into
@@ -880,7 +877,7 @@ export class ReadChatResponseAloud extends Action2 {
 			title: localize2('workbench.action.chat.readChatResponseAloud', "Read Aloud"),
 			icon: Codicon.unmute,
 			precondition: CanVoiceChat,
-			menu: {
+			menu: [{
 				id: MenuId.ChatMessageTitle,
 				when: ContextKeyExpr.and(
 					CanVoiceChat,
@@ -889,7 +886,16 @@ export class ReadChatResponseAloud extends Action2 {
 					CONTEXT_RESPONSE_FILTERED.negate()		// and not when response is filtered
 				),
 				group: 'navigation'
-			}
+			}, {
+				id: MENU_INLINE_CHAT_WIDGET_SECONDARY,
+				when: ContextKeyExpr.and(
+					CanVoiceChat,
+					CONTEXT_RESPONSE,						// only for responses
+					ScopedChatSynthesisInProgress.negate(),	// but not when already in progress
+					CONTEXT_RESPONSE_FILTERED.negate()		// and not when response is filtered
+				),
+				group: 'navigation'
+			}]
 		});
 	}
 
@@ -968,6 +974,15 @@ export class StopReadChatItemAloud extends Action2 {
 						CONTEXT_RESPONSE_FILTERED.negate()	// but not when response is filtered
 					),
 					group: 'navigation'
+				},
+				{
+					id: MENU_INLINE_CHAT_WIDGET_SECONDARY,
+					when: ContextKeyExpr.and(
+						ScopedChatSynthesisInProgress,		// only when in progress
+						CONTEXT_RESPONSE,					// only for responses
+						CONTEXT_RESPONSE_FILTERED.negate()	// but not when response is filtered
+					),
+					group: 'navigation'
 				}
 			]
 		});
diff --git a/src/vs/workbench/contrib/chat/test/browser/__snapshots__/ChatMarkdownRenderer_supportHtml_with_one-line_markdown.1.snap b/src/vs/workbench/contrib/chat/test/browser/__snapshots__/ChatMarkdownRenderer_supportHtml_with_one-line_markdown.1.snap
index d704b7b322d..b9ca8267b0c 100644
--- a/src/vs/workbench/contrib/chat/test/browser/__snapshots__/ChatMarkdownRenderer_supportHtml_with_one-line_markdown.1.snap
+++ b/src/vs/workbench/contrib/chat/test/browser/__snapshots__/ChatMarkdownRenderer_supportHtml_with_one-line_markdown.1.snap
@@ -1,4 +1,4 @@
 <div class="rendered-markdown"><ol>
-<li><a data-href="https://example.com" href="" title="https://example.com" draggable="false"><em>hello</em></a> test <strong>text</strong></li>
+<li><a data-href="https://example.com" href="" title="" draggable="false"><em>hello</em></a> test <strong>text</strong></li>
 </ol>
 </div>
\ No newline at end of file
diff --git a/src/vs/workbench/contrib/chat/test/browser/chatVariables.test.ts b/src/vs/workbench/contrib/chat/test/browser/chatVariables.test.ts
index 2da25bc9817..2bc3618a100 100644
--- a/src/vs/workbench/contrib/chat/test/browser/chatVariables.test.ts
+++ b/src/vs/workbench/contrib/chat/test/browser/chatVariables.test.ts
@@ -16,8 +16,10 @@ import { ChatAgentService, IChatAgentService } from 'vs/workbench/contrib/chat/c
 import { ChatRequestParser } from 'vs/workbench/contrib/chat/common/chatRequestParser';
 import { IChatService } from 'vs/workbench/contrib/chat/common/chatService';
 import { IChatVariablesService } from 'vs/workbench/contrib/chat/common/chatVariables';
+import { ILanguageModelToolsService } from 'vs/workbench/contrib/chat/common/languageModelToolsService';
 import { MockChatWidgetService } from 'vs/workbench/contrib/chat/test/browser/mockChatWidget';
 import { MockChatService } from 'vs/workbench/contrib/chat/test/common/mockChatService';
+import { MockLanguageModelToolsService } from 'vs/workbench/contrib/chat/test/common/mockLanguageModelToolsService';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
 import { TestViewsService } from 'vs/workbench/test/browser/workbenchTestServices';
 import { TestExtensionService, TestStorageService } from 'vs/workbench/test/common/workbenchTestServices';
@@ -29,7 +31,7 @@ suite('ChatVariables', function () {
 	const testDisposables = ensureNoDisposablesAreLeakedInTestSuite();
 
 	setup(function () {
-		service = new ChatVariablesService(new MockChatWidgetService(), new TestViewsService());
+		service = new ChatVariablesService(new MockChatWidgetService(), new TestViewsService(), new MockLanguageModelToolsService());
 		instantiationService = testDisposables.add(new TestInstantiationService());
 		instantiationService.stub(IStorageService, testDisposables.add(new TestStorageService()));
 		instantiationService.stub(ILogService, new NullLogService());
@@ -37,6 +39,7 @@ suite('ChatVariables', function () {
 		instantiationService.stub(IChatVariablesService, service);
 		instantiationService.stub(IChatService, new MockChatService());
 		instantiationService.stub(IContextKeyService, new MockContextKeyService());
+		instantiationService.stub(ILanguageModelToolsService, new MockLanguageModelToolsService());
 		instantiationService.stub(IChatAgentService, instantiationService.createInstance(ChatAgentService));
 	});
 
diff --git a/src/vs/workbench/contrib/chat/test/browser/languageModelToolsService.test.ts b/src/vs/workbench/contrib/chat/test/browser/languageModelToolsService.test.ts
new file mode 100644
index 00000000000..eecd3d05ebb
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/test/browser/languageModelToolsService.test.ts
@@ -0,0 +1,115 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as assert from 'assert';
+import { CancellationToken } from 'vs/base/common/cancellation';
+import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
+import { ContextKeyService } from 'vs/platform/contextkey/browser/contextKeyService';
+import { ContextKeyEqualsExpr, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
+import { TestExtensionService } from 'vs/workbench/test/common/workbenchTestServices';
+import { IToolData, IToolImpl, IToolInvocation, LanguageModelToolsService } from '../../common/languageModelToolsService';
+
+suite('LanguageModelToolsService', () => {
+	const store = ensureNoDisposablesAreLeakedInTestSuite();
+
+	let contextKeyService: IContextKeyService;
+	let service: LanguageModelToolsService;
+
+	setup(() => {
+		const extensionService = new TestExtensionService();
+		contextKeyService = store.add(new ContextKeyService(new TestConfigurationService()));
+		service = store.add(new LanguageModelToolsService(extensionService, contextKeyService));
+	});
+
+	test('registerToolData', () => {
+		const toolData: IToolData = {
+			id: 'testTool',
+			modelDescription: 'Test Tool'
+		};
+
+		const disposable = service.registerToolData(toolData);
+		assert.strictEqual(service.getTool('testTool')?.id, 'testTool');
+		disposable.dispose();
+		assert.strictEqual(service.getTool('testTool'), undefined);
+	});
+
+	test('registerToolImplementation', () => {
+		const toolData: IToolData = {
+			id: 'testTool',
+			modelDescription: 'Test Tool'
+		};
+
+		store.add(service.registerToolData(toolData));
+
+		const toolImpl: IToolImpl = {
+			invoke: async () => ({ string: 'result' })
+		};
+
+		store.add(service.registerToolImplementation('testTool', toolImpl));
+		assert.strictEqual(service.getTool('testTool')?.id, 'testTool');
+	});
+
+	test('getTools', () => {
+		contextKeyService.createKey('testKey', true);
+		const toolData1: IToolData = {
+			id: 'testTool1',
+			modelDescription: 'Test Tool 1',
+			when: ContextKeyEqualsExpr.create('testKey', false)
+		};
+
+		const toolData2: IToolData = {
+			id: 'testTool2',
+			modelDescription: 'Test Tool 2',
+			when: ContextKeyEqualsExpr.create('testKey', true)
+		};
+
+		const toolData3: IToolData = {
+			id: 'testTool3',
+			modelDescription: 'Test Tool 3'
+		};
+
+		store.add(service.registerToolData(toolData1));
+		store.add(service.registerToolData(toolData2));
+		store.add(service.registerToolData(toolData3));
+
+		const tools = Array.from(service.getTools());
+		assert.strictEqual(tools.length, 2);
+		assert.strictEqual(tools[0].id, 'testTool2');
+		assert.strictEqual(tools[1].id, 'testTool3');
+	});
+
+	test('invokeTool', async () => {
+		const toolData: IToolData = {
+			id: 'testTool',
+			modelDescription: 'Test Tool'
+		};
+
+		store.add(service.registerToolData(toolData));
+
+		const toolImpl: IToolImpl = {
+			invoke: async (invocation) => {
+				assert.strictEqual(invocation.callId, '1');
+				assert.strictEqual(invocation.toolId, 'testTool');
+				assert.deepStrictEqual(invocation.parameters, { a: 1 });
+				return { string: 'result' };
+			}
+		};
+
+		store.add(service.registerToolImplementation('testTool', toolImpl));
+
+		const dto: IToolInvocation = {
+			callId: '1',
+			toolId: 'testTool',
+			tokenBudget: 100,
+			parameters: {
+				a: 1
+			}
+		};
+
+		const result = await service.invokeTool(dto, async () => 0, CancellationToken.None);
+		assert.strictEqual(result.string, 'result');
+	});
+});
diff --git a/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_agent_and_subcommand_after_newline.0.snap b/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_agent_and_subcommand_after_newline.0.snap
index bffaba0f3ea..a71a6928c26 100644
--- a/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_agent_and_subcommand_after_newline.0.snap
+++ b/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_agent_and_subcommand_after_newline.0.snap
@@ -42,7 +42,8 @@
             name: "subCommand",
             description: ""
           }
-        ]
+        ],
+        disambiguation: [  ]
       },
       kind: "agent"
     },
diff --git a/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_agent_and_subcommand_with_leading_whitespace.0.snap b/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_agent_and_subcommand_with_leading_whitespace.0.snap
index b2392476b7c..4ca12379473 100644
--- a/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_agent_and_subcommand_with_leading_whitespace.0.snap
+++ b/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_agent_and_subcommand_with_leading_whitespace.0.snap
@@ -42,7 +42,8 @@
             name: "subCommand",
             description: ""
           }
-        ]
+        ],
+        disambiguation: [  ]
       },
       kind: "agent"
     },
diff --git a/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_agent_with_question_mark.0.snap b/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_agent_with_question_mark.0.snap
index 1965499f050..ca95c7e1cfa 100644
--- a/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_agent_with_question_mark.0.snap
+++ b/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_agent_with_question_mark.0.snap
@@ -28,7 +28,8 @@
             name: "subCommand",
             description: ""
           }
-        ]
+        ],
+        disambiguation: [  ]
       },
       kind: "agent"
     },
diff --git a/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_agent_with_subcommand_after_text.0.snap b/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_agent_with_subcommand_after_text.0.snap
index 4ec681f874b..c062f9c138a 100644
--- a/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_agent_with_subcommand_after_text.0.snap
+++ b/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_agent_with_subcommand_after_text.0.snap
@@ -28,7 +28,8 @@
             name: "subCommand",
             description: ""
           }
-        ]
+        ],
+        disambiguation: [  ]
       },
       kind: "agent"
     },
diff --git a/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_agents__subCommand.0.snap b/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_agents__subCommand.0.snap
index fde8b6955f1..22098b4e0de 100644
--- a/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_agents__subCommand.0.snap
+++ b/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_agents__subCommand.0.snap
@@ -28,7 +28,8 @@
             name: "subCommand",
             description: ""
           }
-        ]
+        ],
+        disambiguation: [  ]
       },
       kind: "agent"
     },
diff --git a/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_agents_and_variables_and_multiline.0.snap b/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_agents_and_variables_and_multiline.0.snap
index 0a210c51cfc..c2d6131922c 100644
--- a/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_agents_and_variables_and_multiline.0.snap
+++ b/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_agents_and_variables_and_multiline.0.snap
@@ -28,7 +28,8 @@
             name: "subCommand",
             description: ""
           }
-        ]
+        ],
+        disambiguation: [  ]
       },
       kind: "agent"
     },
diff --git a/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_agents_and_variables_and_multiline__part2.0.snap b/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_agents_and_variables_and_multiline__part2.0.snap
index 874558504ef..2362eb812d3 100644
--- a/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_agents_and_variables_and_multiline__part2.0.snap
+++ b/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_agents_and_variables_and_multiline__part2.0.snap
@@ -28,7 +28,8 @@
             name: "subCommand",
             description: ""
           }
-        ]
+        ],
+        disambiguation: [  ]
       },
       kind: "agent"
     },
diff --git a/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatService_can_deserialize.0.snap b/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatService_can_deserialize.0.snap
index 9b85a97b4d7..eef26b50f6b 100644
--- a/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatService_can_deserialize.0.snap
+++ b/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatService_can_deserialize.0.snap
@@ -33,7 +33,8 @@
               extensionDisplayName: "",
               locations: [ "panel" ],
               metadata: {  },
-              slashCommands: [  ]
+              slashCommands: [  ],
+              disambiguation: [  ]
             },
             kind: "agent"
           },
@@ -59,6 +60,7 @@
       followups: undefined,
       isCanceled: false,
       vote: undefined,
+      voteDownReason: undefined,
       agent: {
         name: "ChatProviderWithUsedContext",
         id: "ChatProviderWithUsedContext",
@@ -71,7 +73,8 @@
         extensionDisplayName: "",
         locations: [ "panel" ],
         metadata: {  },
-        slashCommands: [  ]
+        slashCommands: [  ],
+        disambiguation: [  ]
       },
       slashCommand: undefined,
       usedContext: {
diff --git a/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatService_can_serialize.1.snap b/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatService_can_serialize.1.snap
index 421835ade92..f739ca6fc07 100644
--- a/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatService_can_serialize.1.snap
+++ b/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatService_can_serialize.1.snap
@@ -32,7 +32,8 @@
               extensionDisplayName: "",
               locations: [ "panel" ],
               metadata: { requester: { name: "test" } },
-              slashCommands: [  ]
+              slashCommands: [  ],
+              disambiguation: [  ]
             },
             kind: "agent"
           },
@@ -56,9 +57,17 @@
       variableData: { variables: [  ] },
       response: [  ],
       result: { metadata: { metadataKey: "value" } },
-      followups: undefined,
+      followups: [
+        {
+          kind: "reply",
+          message: "Something else",
+          agentId: "",
+          tooltip: "a tooltip"
+        }
+      ],
       isCanceled: false,
       vote: undefined,
+      voteDownReason: undefined,
       agent: {
         name: "ChatProviderWithUsedContext",
         id: "ChatProviderWithUsedContext",
@@ -71,7 +80,8 @@
         extensionDisplayName: "",
         locations: [ "panel" ],
         metadata: { requester: { name: "test" } },
-        slashCommands: [  ]
+        slashCommands: [  ],
+        disambiguation: [  ]
       },
       slashCommand: undefined,
       usedContext: {
@@ -93,6 +103,54 @@
       },
       contentReferences: [  ],
       codeCitations: [  ]
+    },
+    {
+      message: {
+        parts: [
+          {
+            range: {
+              start: 0,
+              endExclusive: 14
+            },
+            editorRange: {
+              startLineNumber: 1,
+              startColumn: 1,
+              endLineNumber: 1,
+              endColumn: 15
+            },
+            text: "test request 2",
+            kind: "text"
+          }
+        ],
+        text: "test request 2"
+      },
+      variableData: { variables: [  ] },
+      response: [  ],
+      result: {  },
+      followups: [  ],
+      isCanceled: false,
+      vote: undefined,
+      voteDownReason: undefined,
+      agent: {
+        name: "testAgent",
+        id: "testAgent",
+        extensionId: {
+          value: "nullExtensionDescription",
+          _lower: "nullextensiondescription"
+        },
+        extensionPublisherId: "",
+        publisherDisplayName: "",
+        extensionDisplayName: "",
+        locations: [ "panel" ],
+        metadata: { requester: { name: "test" } },
+        slashCommands: [  ],
+        disambiguation: [  ],
+        isDefault: true
+      },
+      slashCommand: undefined,
+      usedContext: undefined,
+      contentReferences: [  ],
+      codeCitations: [  ]
     }
   ]
 }
\ No newline at end of file
diff --git a/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatService_sendRequest_fails.0.snap b/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatService_sendRequest_fails.0.snap
index d0b833b4c19..357a8c5690a 100644
--- a/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatService_sendRequest_fails.0.snap
+++ b/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatService_sendRequest_fails.0.snap
@@ -32,7 +32,8 @@
               extensionDisplayName: "",
               locations: [ "panel" ],
               metadata: {  },
-              slashCommands: [  ]
+              slashCommands: [  ],
+              disambiguation: [  ]
             },
             kind: "agent"
           },
@@ -59,6 +60,7 @@
       followups: undefined,
       isCanceled: false,
       vote: undefined,
+      voteDownReason: undefined,
       agent: {
         name: "ChatProviderWithUsedContext",
         id: "ChatProviderWithUsedContext",
@@ -71,7 +73,8 @@
         extensionDisplayName: "",
         locations: [ "panel" ],
         metadata: {  },
-        slashCommands: [  ]
+        slashCommands: [  ],
+        disambiguation: [  ]
       },
       slashCommand: undefined,
       usedContext: undefined,
diff --git a/src/vs/workbench/contrib/chat/test/common/chatAgents.test.ts b/src/vs/workbench/contrib/chat/test/common/chatAgents.test.ts
index f14ffdaa651..07684e0c4af 100644
--- a/src/vs/workbench/contrib/chat/test/common/chatAgents.test.ts
+++ b/src/vs/workbench/contrib/chat/test/common/chatAgents.test.ts
@@ -20,6 +20,7 @@ const testAgentData: IChatAgentData = {
 	locations: [],
 	metadata: {},
 	slashCommands: [],
+	disambiguation: [],
 };
 
 suite('ChatAgents', function () {
diff --git a/src/vs/workbench/contrib/chat/test/common/chatModel.test.ts b/src/vs/workbench/contrib/chat/test/common/chatModel.test.ts
index 81efbdca4b6..c37b05e8a89 100644
--- a/src/vs/workbench/contrib/chat/test/common/chatModel.test.ts
+++ b/src/vs/workbench/contrib/chat/test/common/chatModel.test.ts
@@ -17,7 +17,7 @@ import { MockContextKeyService } from 'vs/platform/keybinding/test/common/mockKe
 import { ILogService, NullLogService } from 'vs/platform/log/common/log';
 import { IStorageService } from 'vs/platform/storage/common/storage';
 import { ChatAgentLocation, ChatAgentService, IChatAgentService } from 'vs/workbench/contrib/chat/common/chatAgents';
-import { ChatModel, Response } from 'vs/workbench/contrib/chat/common/chatModel';
+import { ChatModel, ISerializableChatData1, ISerializableChatData2, ISerializableChatData3, normalizeSerializableChatData, Response } from 'vs/workbench/contrib/chat/common/chatModel';
 import { ChatRequestTextPart } from 'vs/workbench/contrib/chat/common/chatParserTypes';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
 import { TestExtensionService, TestStorageService } from 'vs/workbench/test/common/workbenchTestServices';
@@ -154,10 +154,10 @@ suite('ChatModel', () => {
 });
 
 suite('Response', () => {
-	ensureNoDisposablesAreLeakedInTestSuite();
+	const store = ensureNoDisposablesAreLeakedInTestSuite();
 
 	test('mergeable markdown', async () => {
-		const response = new Response([]);
+		const response = store.add(new Response([]));
 		response.updateContent({ content: new MarkdownString('markdown1'), kind: 'markdownContent' });
 		response.updateContent({ content: new MarkdownString('markdown2'), kind: 'markdownContent' });
 		await assertSnapshot(response.value);
@@ -166,7 +166,7 @@ suite('Response', () => {
 	});
 
 	test('not mergeable markdown', async () => {
-		const response = new Response([]);
+		const response = store.add(new Response([]));
 		const md1 = new MarkdownString('markdown1');
 		md1.supportHtml = true;
 		response.updateContent({ content: md1, kind: 'markdownContent' });
@@ -175,10 +175,108 @@ suite('Response', () => {
 	});
 
 	test('inline reference', async () => {
-		const response = new Response([]);
+		const response = store.add(new Response([]));
 		response.updateContent({ content: new MarkdownString('text before'), kind: 'markdownContent' });
 		response.updateContent({ inlineReference: URI.parse('https://microsoft.com'), kind: 'inlineReference' });
 		response.updateContent({ content: new MarkdownString('text after'), kind: 'markdownContent' });
 		await assertSnapshot(response.value);
 	});
 });
+
+suite('normalizeSerializableChatData', () => {
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	test('v1', () => {
+		const v1Data: ISerializableChatData1 = {
+			creationDate: Date.now(),
+			initialLocation: undefined,
+			isImported: false,
+			requesterAvatarIconUri: undefined,
+			requesterUsername: 'me',
+			requests: [],
+			responderAvatarIconUri: undefined,
+			responderUsername: 'bot',
+			sessionId: 'session1',
+			welcomeMessage: []
+		};
+
+		const newData = normalizeSerializableChatData(v1Data);
+		assert.strictEqual(newData.creationDate, v1Data.creationDate);
+		assert.strictEqual(newData.lastMessageDate, v1Data.creationDate);
+		assert.strictEqual(newData.version, 3);
+		assert.ok('customTitle' in newData);
+	});
+
+	test('v2', () => {
+		const v2Data: ISerializableChatData2 = {
+			version: 2,
+			creationDate: 100,
+			lastMessageDate: Date.now(),
+			initialLocation: undefined,
+			isImported: false,
+			requesterAvatarIconUri: undefined,
+			requesterUsername: 'me',
+			requests: [],
+			responderAvatarIconUri: undefined,
+			responderUsername: 'bot',
+			sessionId: 'session1',
+			welcomeMessage: [],
+			computedTitle: 'computed title'
+		};
+
+		const newData = normalizeSerializableChatData(v2Data);
+		assert.strictEqual(newData.version, 3);
+		assert.strictEqual(newData.creationDate, v2Data.creationDate);
+		assert.strictEqual(newData.lastMessageDate, v2Data.lastMessageDate);
+		assert.strictEqual(newData.customTitle, v2Data.computedTitle);
+	});
+
+	test('old bad data', () => {
+		const v1Data: ISerializableChatData1 = {
+			// Testing the scenario where these are missing
+			sessionId: undefined!,
+			creationDate: undefined!,
+
+			initialLocation: undefined,
+			isImported: false,
+			requesterAvatarIconUri: undefined,
+			requesterUsername: 'me',
+			requests: [],
+			responderAvatarIconUri: undefined,
+			responderUsername: 'bot',
+			welcomeMessage: []
+		};
+
+		const newData = normalizeSerializableChatData(v1Data);
+		assert.strictEqual(newData.version, 3);
+		assert.ok(newData.creationDate > 0);
+		assert.ok(newData.lastMessageDate > 0);
+		assert.ok(newData.sessionId);
+	});
+
+	test('v3 with bug', () => {
+		const v3Data: ISerializableChatData3 = {
+			// Test case where old data was wrongly normalized and these fields were missing
+			creationDate: undefined!,
+			lastMessageDate: undefined!,
+
+			version: 3,
+			initialLocation: undefined,
+			isImported: false,
+			requesterAvatarIconUri: undefined,
+			requesterUsername: 'me',
+			requests: [],
+			responderAvatarIconUri: undefined,
+			responderUsername: 'bot',
+			sessionId: 'session1',
+			welcomeMessage: [],
+			customTitle: 'computed title'
+		};
+
+		const newData = normalizeSerializableChatData(v3Data);
+		assert.strictEqual(newData.version, 3);
+		assert.ok(newData.creationDate > 0);
+		assert.ok(newData.lastMessageDate > 0);
+		assert.ok(newData.sessionId);
+	});
+});
diff --git a/src/vs/workbench/contrib/chat/test/common/chatRequestParser.test.ts b/src/vs/workbench/contrib/chat/test/common/chatRequestParser.test.ts
index c0b7a9542a4..7bcd890d170 100644
--- a/src/vs/workbench/contrib/chat/test/common/chatRequestParser.test.ts
+++ b/src/vs/workbench/contrib/chat/test/common/chatRequestParser.test.ts
@@ -16,7 +16,9 @@ import { ChatRequestParser } from 'vs/workbench/contrib/chat/common/chatRequestP
 import { IChatService } from 'vs/workbench/contrib/chat/common/chatService';
 import { IChatSlashCommandService } from 'vs/workbench/contrib/chat/common/chatSlashCommands';
 import { IChatVariablesService } from 'vs/workbench/contrib/chat/common/chatVariables';
+import { ILanguageModelToolsService } from 'vs/workbench/contrib/chat/common/languageModelToolsService';
 import { MockChatService } from 'vs/workbench/contrib/chat/test/common/mockChatService';
+import { MockLanguageModelToolsService } from 'vs/workbench/contrib/chat/test/common/mockLanguageModelToolsService';
 import { IExtensionService, nullExtensionDescription } from 'vs/workbench/services/extensions/common/extensions';
 import { TestExtensionService, TestStorageService } from 'vs/workbench/test/common/workbenchTestServices';
 
@@ -34,6 +36,7 @@ suite('ChatRequestParser', () => {
 		instantiationService.stub(IExtensionService, new TestExtensionService());
 		instantiationService.stub(IChatService, new MockChatService());
 		instantiationService.stub(IContextKeyService, new MockContextKeyService());
+		instantiationService.stub(ILanguageModelToolsService, new MockLanguageModelToolsService());
 		instantiationService.stub(IChatAgentService, instantiationService.createInstance(ChatAgentService));
 
 		varService = mockObject<IChatVariablesService>()({});
@@ -117,7 +120,7 @@ suite('ChatRequestParser', () => {
 	});
 
 	const getAgentWithSlashCommands = (slashCommands: IChatAgentCommand[]) => {
-		return { id: 'agent', name: 'agent', extensionId: nullExtensionDescription.identifier, publisherDisplayName: '', extensionDisplayName: '', extensionPublisherId: '', locations: [ChatAgentLocation.Panel], metadata: {}, slashCommands } satisfies IChatAgentData;
+		return { id: 'agent', name: 'agent', extensionId: nullExtensionDescription.identifier, publisherDisplayName: '', extensionDisplayName: '', extensionPublisherId: '', locations: [ChatAgentLocation.Panel], metadata: {}, slashCommands, disambiguation: [], } satisfies IChatAgentData;
 	};
 
 	test('agent with subcommand after text', async () => {
diff --git a/src/vs/workbench/contrib/chat/test/common/chatService.test.ts b/src/vs/workbench/contrib/chat/test/common/chatService.test.ts
index df32dfed2f4..7701d6b716e 100644
--- a/src/vs/workbench/contrib/chat/test/common/chatService.test.ts
+++ b/src/vs/workbench/contrib/chat/test/common/chatService.test.ts
@@ -9,6 +9,8 @@ import { URI } from 'vs/base/common/uri';
 import { assertSnapshot } from 'vs/base/test/common/snapshot';
 import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
 import { Range } from 'vs/editor/common/core/range';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
 import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
@@ -26,6 +28,8 @@ import { ChatSlashCommandService, IChatSlashCommandService } from 'vs/workbench/
 import { IChatVariablesService } from 'vs/workbench/contrib/chat/common/chatVariables';
 import { MockChatService } from 'vs/workbench/contrib/chat/test/common/mockChatService';
 import { MockChatVariablesService } from 'vs/workbench/contrib/chat/test/common/mockChatVariables';
+import { IWorkbenchAssignmentService } from 'vs/workbench/services/assignment/common/assignmentService';
+import { NullWorkbenchAssignmentService } from 'vs/workbench/services/assignment/test/common/nullAssignmentService';
 import { IExtensionService, nullExtensionDescription } from 'vs/workbench/services/extensions/common/extensions';
 import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
 import { TestContextService, TestExtensionService, TestStorageService } from 'vs/workbench/test/common/workbenchTestServices';
@@ -41,6 +45,7 @@ const chatAgentWithUsedContext: IChatAgent = {
 	locations: [ChatAgentLocation.Panel],
 	metadata: {},
 	slashCommands: [],
+	disambiguation: [],
 	async invoke(request, progress, history, token) {
 		progress({
 			documents: [
@@ -62,6 +67,21 @@ const chatAgentWithUsedContext: IChatAgent = {
 	},
 };
 
+function getAgentData(id: string) {
+	return {
+		name: id,
+		id: id,
+		extensionId: nullExtensionDescription.identifier,
+		extensionPublisherId: '',
+		publisherDisplayName: '',
+		extensionDisplayName: '',
+		locations: [ChatAgentLocation.Panel],
+		metadata: {},
+		slashCommands: [],
+		disambiguation: [],
+	};
+}
+
 suite('ChatService', () => {
 	const testDisposables = ensureNoDisposablesAreLeakedInTestSuite();
 
@@ -73,6 +93,7 @@ suite('ChatService', () => {
 	setup(async () => {
 		instantiationService = testDisposables.add(new TestInstantiationService(new ServiceCollection(
 			[IChatVariablesService, new MockChatVariablesService()],
+			[IWorkbenchAssignmentService, new NullWorkbenchAssignmentService()]
 		)));
 		instantiationService.stub(IStorageService, storageService = testDisposables.add(new TestStorageService()));
 		instantiationService.stub(ILogService, new NullLogService());
@@ -82,18 +103,19 @@ suite('ChatService', () => {
 		instantiationService.stub(IViewsService, new TestExtensionService());
 		instantiationService.stub(IWorkspaceContextService, new TestContextService());
 		instantiationService.stub(IChatSlashCommandService, testDisposables.add(instantiationService.createInstance(ChatSlashCommandService)));
+		instantiationService.stub(IConfigurationService, new TestConfigurationService());
 		instantiationService.stub(IChatService, new MockChatService());
 
 		chatAgentService = instantiationService.createInstance(ChatAgentService);
 		instantiationService.stub(IChatAgentService, chatAgentService);
 
-		const agent = {
+		const agent: IChatAgentImplementation = {
 			async invoke(request, progress, history, token) {
 				return {};
 			},
-		} satisfies IChatAgentImplementation;
-		testDisposables.add(chatAgentService.registerAgent('testAgent', { name: 'testAgent', id: 'testAgent', isDefault: true, extensionId: nullExtensionDescription.identifier, extensionPublisherId: '', publisherDisplayName: '', extensionDisplayName: '', locations: [ChatAgentLocation.Panel], metadata: {}, slashCommands: [] }));
-		testDisposables.add(chatAgentService.registerAgent(chatAgentWithUsedContextId, { name: chatAgentWithUsedContextId, id: chatAgentWithUsedContextId, extensionId: nullExtensionDescription.identifier, extensionPublisherId: '', publisherDisplayName: '', extensionDisplayName: '', locations: [ChatAgentLocation.Panel], metadata: {}, slashCommands: [] }));
+		};
+		testDisposables.add(chatAgentService.registerAgent('testAgent', { ...getAgentData('testAgent'), isDefault: true }));
+		testDisposables.add(chatAgentService.registerAgent(chatAgentWithUsedContextId, getAgentData(chatAgentWithUsedContextId)));
 		testDisposables.add(chatAgentService.registerAgentImplementation('testAgent', agent));
 		chatAgentService.updateAgent('testAgent', { requester: { name: 'test' } });
 	});
@@ -141,6 +163,45 @@ suite('ChatService', () => {
 		await assertSnapshot(model.toExport());
 	});
 
+	test('history', async () => {
+		const historyLengthAgent: IChatAgentImplementation = {
+			async invoke(request, progress, history, token) {
+				return {
+					metadata: { historyLength: history.length }
+				};
+			},
+		};
+
+		testDisposables.add(chatAgentService.registerAgent('defaultAgent', { ...getAgentData('defaultAgent'), isDefault: true }));
+		testDisposables.add(chatAgentService.registerAgent('agent2', getAgentData('agent2')));
+		testDisposables.add(chatAgentService.registerAgentImplementation('defaultAgent', historyLengthAgent));
+		testDisposables.add(chatAgentService.registerAgentImplementation('agent2', historyLengthAgent));
+
+		const testService = testDisposables.add(instantiationService.createInstance(ChatService));
+		const model = testDisposables.add(testService.startSession(ChatAgentLocation.Panel, CancellationToken.None));
+
+		// Send a request to default agent
+		const response = await testService.sendRequest(model.sessionId, `test request`, { agentId: 'defaultAgent' });
+		assert(response);
+		await response.responseCompletePromise;
+		assert.strictEqual(model.getRequests().length, 1);
+		assert.strictEqual(model.getRequests()[0].response?.result?.metadata?.historyLength, 0);
+
+		// Send a request to agent2- it can't see the default agent's message
+		const response2 = await testService.sendRequest(model.sessionId, `test request`, { agentId: 'agent2' });
+		assert(response2);
+		await response2.responseCompletePromise;
+		assert.strictEqual(model.getRequests().length, 2);
+		assert.strictEqual(model.getRequests()[1].response?.result?.metadata?.historyLength, 0);
+
+		// Send a request to defaultAgent - the default agent can see agent2's message
+		const response3 = await testService.sendRequest(model.sessionId, `test request`, { agentId: 'defaultAgent' });
+		assert(response3);
+		await response3.responseCompletePromise;
+		assert.strictEqual(model.getRequests().length, 3);
+		assert.strictEqual(model.getRequests()[2].response?.result?.metadata?.historyLength, 2);
+	});
+
 	test('can serialize', async () => {
 		testDisposables.add(chatAgentService.registerAgentImplementation(chatAgentWithUsedContextId, chatAgentWithUsedContext));
 		chatAgentService.updateAgent(chatAgentWithUsedContextId, { requester: { name: 'test' } });
@@ -154,9 +215,13 @@ suite('ChatService', () => {
 		const response = await testService.sendRequest(model.sessionId, `@${chatAgentWithUsedContextId} test request`);
 		assert(response);
 		await response.responseCompletePromise;
-
 		assert.strictEqual(model.getRequests().length, 1);
 
+		const response2 = await testService.sendRequest(model.sessionId, `test request 2`);
+		assert(response2);
+		await response2.responseCompletePromise;
+		assert.strictEqual(model.getRequests().length, 2);
+
 		await assertSnapshot(model.toExport());
 	});
 
diff --git a/src/vs/workbench/contrib/chat/test/common/chatWordCounter.test.ts b/src/vs/workbench/contrib/chat/test/common/chatWordCounter.test.ts
index 665c2e386b1..a013abded58 100644
--- a/src/vs/workbench/contrib/chat/test/common/chatWordCounter.test.ts
+++ b/src/vs/workbench/contrib/chat/test/common/chatWordCounter.test.ts
@@ -38,6 +38,10 @@ suite('ChatWordCounter', () => {
 				['[hello](https://example.com) world', 2, '[hello](https://example.com) world'],
 				['oh [hello](https://example.com "title") world', 1, 'oh'],
 				['oh [hello](https://example.com "title") world', 2, 'oh [hello](https://example.com "title")'],
+				// Parens in link destination
+				['[hello](https://example.com?()) world', 1, '[hello](https://example.com?())'],
+				// Escaped brackets in link text
+				['[he \\[l\\] \\]lo](https://example.com?()) world', 1, '[he \\[l\\] \\]lo](https://example.com?())'],
 			];
 
 			cases.forEach(([str, nWords, result]) => doTest(str, nWords, result));
diff --git a/src/vs/workbench/contrib/chat/test/common/languageModels.test.ts b/src/vs/workbench/contrib/chat/test/common/languageModels.test.ts
index ebdde0c0d22..4018b862996 100644
--- a/src/vs/workbench/contrib/chat/test/common/languageModels.test.ts
+++ b/src/vs/workbench/contrib/chat/test/common/languageModels.test.ts
@@ -149,7 +149,7 @@ suite('LanguageModels', function () {
 
 		const cts = new CancellationTokenSource();
 
-		const request = await languageModels.sendChatRequest(first, nullExtensionDescription.identifier, [{ role: ChatMessageRole.User, content: { type: 'text', value: 'hello' } }], {}, cts.token);
+		const request = await languageModels.sendChatRequest(first, nullExtensionDescription.identifier, [{ role: ChatMessageRole.User, content: [{ type: 'text', value: 'hello' }] }], {}, cts.token);
 
 		assert.ok(request);
 
diff --git a/src/vs/workbench/contrib/chat/test/common/mockChatService.ts b/src/vs/workbench/contrib/chat/test/common/mockChatService.ts
index c7cc9199757..d7529dec572 100644
--- a/src/vs/workbench/contrib/chat/test/common/mockChatService.ts
+++ b/src/vs/workbench/contrib/chat/test/common/mockChatService.ts
@@ -80,4 +80,8 @@ export class MockChatService implements IChatService {
 	transferChatSession(transferredSessionData: IChatTransferredSessionData, toWorkspace: URI): void {
 		throw new Error('Method not implemented.');
 	}
+
+	setChatSessionTitle(sessionId: string, title: string): void {
+		throw new Error('Method not implemented.');
+	}
 }
diff --git a/src/vs/workbench/contrib/chat/test/common/mockLanguageModelToolsService.ts b/src/vs/workbench/contrib/chat/test/common/mockLanguageModelToolsService.ts
new file mode 100644
index 00000000000..52f91227288
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/test/common/mockLanguageModelToolsService.ts
@@ -0,0 +1,43 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { CancellationToken } from 'vs/base/common/cancellation';
+import { Event } from 'vs/base/common/event';
+import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
+import { CountTokensCallback, ILanguageModelToolsService, IToolData, IToolImpl, IToolInvocation, IToolResult } from 'vs/workbench/contrib/chat/common/languageModelToolsService';
+
+export class MockLanguageModelToolsService implements ILanguageModelToolsService {
+	_serviceBrand: undefined;
+
+	constructor() { }
+
+	onDidChangeTools: Event<void> = Event.None;
+
+	registerToolData(toolData: IToolData): IDisposable {
+		return Disposable.None;
+	}
+
+	registerToolImplementation(name: string, tool: IToolImpl): IDisposable {
+		return Disposable.None;
+	}
+
+	getTools(): Iterable<Readonly<IToolData>> {
+		return [];
+	}
+
+	getTool(id: string): IToolData | undefined {
+		return undefined;
+	}
+
+	getToolByName(name: string): IToolData | undefined {
+		return undefined;
+	}
+
+	async invokeTool(dto: IToolInvocation, countTokens: CountTokensCallback, token: CancellationToken): Promise<IToolResult> {
+		return {
+			string: ''
+		};
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/test/common/voiceChatService.test.ts b/src/vs/workbench/contrib/chat/test/common/voiceChatService.test.ts
index 2ad2f91c6b1..b97a0c0f846 100644
--- a/src/vs/workbench/contrib/chat/test/common/voiceChatService.test.ts
+++ b/src/vs/workbench/contrib/chat/test/common/voiceChatService.test.ts
@@ -12,7 +12,7 @@ import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/uti
 import { ProviderResult } from 'vs/editor/common/languages';
 import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
 import { MockContextKeyService } from 'vs/platform/keybinding/test/common/mockKeybindingService';
-import { ChatAgentLocation, IChatAgent, IChatAgentCommand, IChatAgentCompletionItem, IChatAgentData, IChatAgentHistoryEntry, IChatAgentImplementation, IChatAgentMetadata, IChatAgentRequest, IChatAgentResult, IChatAgentService } from 'vs/workbench/contrib/chat/common/chatAgents';
+import { ChatAgentLocation, IChatAgent, IChatAgentCommand, IChatAgentCompletionItem, IChatAgentData, IChatAgentHistoryEntry, IChatAgentImplementation, IChatAgentMetadata, IChatAgentRequest, IChatAgentResult, IChatAgentService, IChatParticipantDetectionProvider } from 'vs/workbench/contrib/chat/common/chatAgents';
 import { IChatModel } from 'vs/workbench/contrib/chat/common/chatModel';
 import { IChatProgress, IChatFollowup } from 'vs/workbench/contrib/chat/common/chatService';
 import { IVoiceChatSessionOptions, IVoiceChatTextEvent, VoiceChatService } from 'vs/workbench/contrib/chat/common/voiceChatService';
@@ -36,6 +36,19 @@ suite('VoiceChat', () => {
 		constructor(readonly id: string, readonly slashCommands: IChatAgentCommand[]) {
 			this.name = id;
 		}
+		fullName?: string | undefined;
+		description?: string | undefined;
+		when?: string | undefined;
+		publisherDisplayName?: string | undefined;
+		isDefault?: boolean | undefined;
+		isDynamic?: boolean | undefined;
+		disambiguation: { categoryName: string; description: string; examples: string[] }[] = [];
+		provideFollowups?(request: IChatAgentRequest, result: IChatAgentResult, history: IChatAgentHistoryEntry[], token: CancellationToken): Promise<IChatFollowup[]> {
+			throw new Error('Method not implemented.');
+		}
+		provideSampleQuestions?(location: ChatAgentLocation, token: CancellationToken): ProviderResult<IChatFollowup[] | undefined> {
+			throw new Error('Method not implemented.');
+		}
 		invoke(request: IChatAgentRequest, progress: (part: IChatProgress) => void, history: IChatAgentHistoryEntry[], token: CancellationToken): Promise<IChatAgentResult> { throw new Error('Method not implemented.'); }
 		provideWelcomeMessage?(location: ChatAgentLocation, token: CancellationToken): ProviderResult<(string | IMarkdownString)[] | undefined> { throw new Error('Method not implemented.'); }
 		metadata = {};
@@ -52,6 +65,15 @@ suite('VoiceChat', () => {
 	];
 
 	class TestChatAgentService implements IChatAgentService {
+		hasChatParticipantDetectionProviders(): boolean {
+			throw new Error('Method not implemented.');
+		}
+		registerChatParticipantDetectionProvider(handle: number, provider: IChatParticipantDetectionProvider): IDisposable {
+			throw new Error('Method not implemented.');
+		}
+		detectAgentOrCommand(request: IChatAgentRequest, history: IChatAgentHistoryEntry[], options: { location: ChatAgentLocation }, token: CancellationToken): Promise<{ agent: IChatAgentData; command?: IChatAgentCommand } | undefined> {
+			throw new Error('Method not implemented.');
+		}
 		_serviceBrand: undefined;
 		readonly onDidChangeAgents = Event.None;
 		registerAgentImplementation(id: string, agent: IChatAgentImplementation): IDisposable { throw new Error(); }
@@ -71,6 +93,7 @@ suite('VoiceChat', () => {
 		registerAgentCompletionProvider(id: string, provider: (query: string, token: CancellationToken) => Promise<IChatAgentCompletionItem[]>): IDisposable { throw new Error('Method not implemented.'); }
 		getAgentCompletionItems(id: string, query: string, token: CancellationToken): Promise<IChatAgentCompletionItem[]> { throw new Error('Method not implemented.'); }
 		agentHasDupeName(id: string): boolean { throw new Error('Method not implemented.'); }
+		getChatTitle(id: string, history: IChatAgentHistoryEntry[], token: CancellationToken): Promise<string | undefined> { throw new Error('Method not implemented.'); }
 	}
 
 	class TestSpeechService implements ISpeechService {
diff --git a/src/vs/workbench/contrib/codeEditor/browser/inspectEditorTokens/inspectEditorTokens.ts b/src/vs/workbench/contrib/codeEditor/browser/inspectEditorTokens/inspectEditorTokens.ts
index 8b2fa1d6632..535ccd778d8 100644
--- a/src/vs/workbench/contrib/codeEditor/browser/inspectEditorTokens/inspectEditorTokens.ts
+++ b/src/vs/workbench/contrib/codeEditor/browser/inspectEditorTokens/inspectEditorTokens.ts
@@ -16,7 +16,7 @@ import { Position } from 'vs/editor/common/core/position';
 import { Range } from 'vs/editor/common/core/range';
 import { IEditorContribution } from 'vs/editor/common/editorCommon';
 import { ITextModel } from 'vs/editor/common/model';
-import { SemanticTokensLegend, SemanticTokens } from 'vs/editor/common/languages';
+import { SemanticTokensLegend, SemanticTokens, TreeSitterTokenizationRegistry } from 'vs/editor/common/languages';
 import { FontStyle, ColorId, StandardTokenType, TokenMetadata } from 'vs/editor/common/encodedTokenAttributes';
 import { ILanguageService } from 'vs/editor/common/languages/language';
 import { INotificationService } from 'vs/platform/notification/common/notification';
@@ -31,6 +31,9 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
 import { SEMANTIC_HIGHLIGHTING_SETTING_ID, IEditorSemanticHighlightingOptions } from 'vs/editor/contrib/semanticTokens/common/semanticTokensConfig';
 import { Schemas } from 'vs/base/common/network';
 import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
+import { ITreeSitterParserService } from 'vs/editor/common/services/treeSitterParserService';
+// eslint-disable-next-line local/code-import-patterns
+import type { Parser } from '@vscode/tree-sitter-wasm';
 
 const $ = dom.$;
 
@@ -44,6 +47,7 @@ class InspectEditorTokensController extends Disposable implements IEditorContrib
 
 	private _editor: ICodeEditor;
 	private _textMateService: ITextMateTokenizationService;
+	private _treeSitterService: ITreeSitterParserService;
 	private _themeService: IWorkbenchThemeService;
 	private _languageService: ILanguageService;
 	private _notificationService: INotificationService;
@@ -54,6 +58,7 @@ class InspectEditorTokensController extends Disposable implements IEditorContrib
 	constructor(
 		editor: ICodeEditor,
 		@ITextMateTokenizationService textMateService: ITextMateTokenizationService,
+		@ITreeSitterParserService treeSitterService: ITreeSitterParserService,
 		@ILanguageService languageService: ILanguageService,
 		@IWorkbenchThemeService themeService: IWorkbenchThemeService,
 		@INotificationService notificationService: INotificationService,
@@ -63,6 +68,7 @@ class InspectEditorTokensController extends Disposable implements IEditorContrib
 		super();
 		this._editor = editor;
 		this._textMateService = textMateService;
+		this._treeSitterService = treeSitterService;
 		this._themeService = themeService;
 		this._languageService = languageService;
 		this._notificationService = notificationService;
@@ -91,7 +97,7 @@ class InspectEditorTokensController extends Disposable implements IEditorContrib
 			// disable in notebooks
 			return;
 		}
-		this._widget = new InspectEditorTokensWidget(this._editor, this._textMateService, this._languageService, this._themeService, this._notificationService, this._configurationService, this._languageFeaturesService);
+		this._widget = new InspectEditorTokensWidget(this._editor, this._textMateService, this._treeSitterService, this._languageService, this._themeService, this._notificationService, this._configurationService, this._languageFeaturesService);
 	}
 
 	public stop(): void {
@@ -188,6 +194,7 @@ class InspectEditorTokensWidget extends Disposable implements IContentWidget {
 	private readonly _languageService: ILanguageService;
 	private readonly _themeService: IWorkbenchThemeService;
 	private readonly _textMateService: ITextMateTokenizationService;
+	private readonly _treeSitterService: ITreeSitterParserService;
 	private readonly _notificationService: INotificationService;
 	private readonly _configurationService: IConfigurationService;
 	private readonly _languageFeaturesService: ILanguageFeaturesService;
@@ -198,6 +205,7 @@ class InspectEditorTokensWidget extends Disposable implements IContentWidget {
 	constructor(
 		editor: IActiveCodeEditor,
 		textMateService: ITextMateTokenizationService,
+		treeSitterService: ITreeSitterParserService,
 		languageService: ILanguageService,
 		themeService: IWorkbenchThemeService,
 		notificationService: INotificationService,
@@ -210,6 +218,7 @@ class InspectEditorTokensWidget extends Disposable implements IContentWidget {
 		this._languageService = languageService;
 		this._themeService = themeService;
 		this._textMateService = textMateService;
+		this._treeSitterService = treeSitterService;
 		this._notificationService = notificationService;
 		this._configurationService = configurationService;
 		this._languageFeaturesService = languageFeaturesService;
@@ -238,6 +247,7 @@ class InspectEditorTokensWidget extends Disposable implements IContentWidget {
 	private _beginCompute(position: Position): void {
 		const grammar = this._textMateService.createTokenizer(this._model.getLanguageId());
 		const semanticTokens = this._computeSemanticTokens(position);
+		const tree = this._treeSitterService.getParseResult(this._model);
 
 		dom.clearNode(this._domNode);
 		this._domNode.appendChild(document.createTextNode(nls.localize('inspectTMScopesWidget.loading', "Loading...")));
@@ -246,7 +256,7 @@ class InspectEditorTokensWidget extends Disposable implements IContentWidget {
 			if (this._isDisposed) {
 				return;
 			}
-			this._compute(grammar, semanticTokens, position);
+			this._compute(grammar, semanticTokens, tree?.tree, position);
 			this._domNode.style.maxWidth = `${Math.max(this._editor.getLayoutInfo().width * 0.66, 500)}px`;
 			this._editor.layoutContentWidget(this);
 		}, (err) => {
@@ -267,10 +277,11 @@ class InspectEditorTokensWidget extends Disposable implements IContentWidget {
 		return this._themeService.getColorTheme().semanticHighlighting;
 	}
 
-	private _compute(grammar: IGrammar | null, semanticTokens: SemanticTokensResult | null, position: Position) {
+	private _compute(grammar: IGrammar | null, semanticTokens: SemanticTokensResult | null, tree: Parser.Tree | undefined, position: Position) {
 		const textMateTokenInfo = grammar && this._getTokensAtPosition(grammar, position);
 		const semanticTokenInfo = semanticTokens && this._getSemanticTokenAtPosition(semanticTokens, position);
-		if (!textMateTokenInfo && !semanticTokenInfo) {
+		const treeSitterTokenInfo = tree && this._getTreeSitterTokenAtPosition(tree, position);
+		if (!textMateTokenInfo && !semanticTokenInfo && !treeSitterTokenInfo) {
 			dom.reset(this._domNode, 'No grammar or semantic tokens available.');
 			return;
 		}
@@ -389,6 +400,40 @@ class InspectEditorTokensWidget extends Disposable implements IContentWidget {
 				));
 			}
 		}
+
+		if (treeSitterTokenInfo) {
+			dom.append(this._domNode, $('hr.tiw-metadata-separator'));
+			const table = dom.append(this._domNode, $('table.tiw-metadata-table'));
+			const tbody = dom.append(table, $('tbody'));
+
+			dom.append(tbody, $('tr', undefined,
+				$('td.tiw-metadata-key', undefined, 'tree-sitter token' as string),
+				$('td.tiw-metadata-value', undefined, `${treeSitterTokenInfo.text}`)
+			));
+			const scopes = new Array<HTMLElement | string>();
+			let node = treeSitterTokenInfo;
+			while (node.parent) {
+				scopes.push(node.type);
+				node = node.parent;
+				if (node) {
+					scopes.push($('br'));
+				}
+			}
+
+			dom.append(tbody, $('tr', undefined,
+				$('td.tiw-metadata-key', undefined, 'tree-sitter scopes' as string),
+				$('td.tiw-metadata-value.tiw-metadata-scopes', undefined, ...scopes),
+			));
+
+			const tokenizationSupport = TreeSitterTokenizationRegistry.get(this._model.getLanguageId());
+			const captures = tokenizationSupport?.captureAtPosition(position.lineNumber, position.column, this._model);
+			if (captures && captures.length > 0) {
+				dom.append(tbody, $('tr', undefined,
+					$('td.tiw-metadata-key', undefined, 'foreground'),
+					$('td.tiw-metadata-value', undefined, captures[0].name),
+				));
+			}
+		}
 	}
 
 	private _formatMetadata(semantic?: IDecodedMetadata, tm?: IDecodedMetadata): Array<HTMLElement | string> {
@@ -603,6 +648,28 @@ class InspectEditorTokensWidget extends Disposable implements IContentWidget {
 		return null;
 	}
 
+	private _walkTreeforPosition(cursor: Parser.TreeCursor, pos: Position): Parser.SyntaxNode | null {
+		const offset = this._model.getOffsetAt(pos);
+		cursor.gotoFirstChild();
+		let goChild: boolean = false;
+		let lastGoodNode: Parser.SyntaxNode | null = null;
+		do {
+			if (cursor.currentNode.startIndex <= offset && offset < cursor.currentNode.endIndex) {
+				goChild = true;
+				lastGoodNode = cursor.currentNode;
+			} else {
+				goChild = false;
+			}
+		} while (goChild ? cursor.gotoFirstChild() : cursor.gotoNextSibling());
+		return lastGoodNode;
+	}
+
+	private _getTreeSitterTokenAtPosition(tree: Parser.Tree, pos: Position): Parser.SyntaxNode | null {
+		const cursor = tree.walk();
+
+		return this._walkTreeforPosition(cursor, pos);
+	}
+
 	private _renderTokenStyleDefinition(definition: TokenStyleDefinition | undefined, property: keyof TokenStyleData): Array<HTMLElement | string> {
 		const elements = new Array<HTMLElement | string>();
 		if (definition === undefined) {
diff --git a/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess.ts b/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess.ts
index 2a40f9d9413..ab35c780ddc 100644
--- a/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess.ts
+++ b/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess.ts
@@ -123,7 +123,7 @@ export class GotoSymbolQuickAccessProvider extends AbstractGotoSymbolQuickAccess
 
 	//#endregion
 
-	protected override provideWithoutTextEditor(picker: IQuickPick<IGotoSymbolQuickPickItem>): IDisposable {
+	protected override provideWithoutTextEditor(picker: IQuickPick<IGotoSymbolQuickPickItem, { useSeparators: true }>): IDisposable {
 		if (this.canPickWithOutlineService()) {
 			return this.doGetOutlinePicks(picker);
 		}
@@ -134,7 +134,7 @@ export class GotoSymbolQuickAccessProvider extends AbstractGotoSymbolQuickAccess
 		return this.editorService.activeEditorPane ? this.outlineService.canCreateOutline(this.editorService.activeEditorPane) : false;
 	}
 
-	private doGetOutlinePicks(picker: IQuickPick<IGotoSymbolQuickPickItem>): IDisposable {
+	private doGetOutlinePicks(picker: IQuickPick<IGotoSymbolQuickPickItem, { useSeparators: true }>): IDisposable {
 		const pane = this.editorService.activeEditorPane;
 		if (!pane) {
 			return Disposable.None;
diff --git a/src/vs/workbench/contrib/codeEditor/browser/saveParticipants.ts b/src/vs/workbench/contrib/codeEditor/browser/saveParticipants.ts
index b7e5e721a28..53bb342195a 100644
--- a/src/vs/workbench/contrib/codeEditor/browser/saveParticipants.ts
+++ b/src/vs/workbench/contrib/codeEditor/browser/saveParticipants.ts
@@ -6,6 +6,7 @@
 import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
 import { HierarchicalKind } from 'vs/base/common/hierarchicalKind';
 import { Disposable } from 'vs/base/common/lifecycle';
+import { StopWatch } from 'vs/base/common/stopwatch';
 import * as strings from 'vs/base/common/strings';
 import { IActiveCodeEditor, isCodeEditor } from 'vs/editor/browser/editorBrowser';
 import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
@@ -27,6 +28,7 @@ import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IProgress, IProgressStep, Progress } from 'vs/platform/progress/common/progress';
 import { Registry } from 'vs/platform/registry/common/platform';
+import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IWorkbenchContribution, IWorkbenchContributionsRegistry, Extensions as WorkbenchContributionsExtensions } from 'vs/workbench/common/contributions';
 import { SaveReason } from 'vs/workbench/common/editor';
 import { getModifiedRanges } from 'vs/workbench/contrib/format/browser/formatModified';
@@ -278,6 +280,7 @@ class CodeActionOnSaveParticipant extends Disposable implements ITextFileSavePar
 		@IHostService private readonly hostService: IHostService,
 		@IEditorService private readonly editorService: IEditorService,
 		@ICodeEditorService private readonly codeEditorService: ICodeEditorService,
+		@ITelemetryService private readonly telemetryService: ITelemetryService
 	) {
 		super();
 
@@ -408,7 +411,27 @@ class CodeActionOnSaveParticipant extends Disposable implements ITextFileSavePar
 		};
 
 		for (const codeActionKind of codeActionsOnSave) {
+			const sw = new StopWatch();
+
 			const actionsToRun = await this.getActionsToRun(model, codeActionKind, excludes, getActionProgress, token);
+
+			// Telemetry for duration of each code action on save.
+			type CodeActionOnSave = {
+				codeAction: string;
+				duration: number;
+			};
+			type CodeActionOnSaveClassification = {
+				owner: 'justschen';
+				comment: 'Information about the code action that was accepted on save.';
+				codeAction: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Kind of the code action setting that is run.' };
+				duration: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Duration it took for TS to return the action to run for each kind. ' };
+			};
+
+			this.telemetryService.publicLog2<CodeActionOnSave, CodeActionOnSaveClassification>('codeAction.appliedOnSave', {
+				codeAction: codeActionKind.value,
+				duration: sw.elapsed()
+			});
+
 			if (token.isCancellationRequested) {
 				actionsToRun.dispose();
 				return;
diff --git a/src/vs/workbench/contrib/codeEditor/browser/simpleEditorOptions.ts b/src/vs/workbench/contrib/codeEditor/browser/simpleEditorOptions.ts
index f7660482b85..912b9a49299 100644
--- a/src/vs/workbench/contrib/codeEditor/browser/simpleEditorOptions.ts
+++ b/src/vs/workbench/contrib/codeEditor/browser/simpleEditorOptions.ts
@@ -13,6 +13,9 @@ import { SelectionClipboardContributionID } from 'vs/workbench/contrib/codeEdito
 import { TabCompletionController } from 'vs/workbench/contrib/snippets/browser/tabCompletion';
 import { EditorExtensionsRegistry } from 'vs/editor/browser/editorExtensions';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { registerThemingParticipant } from 'vs/platform/theme/common/themeService';
+import { IDisposable } from 'vs/base/common/lifecycle';
+import { selectionBackground, inputBackground, inputForeground, editorSelectionBackground } from 'vs/platform/theme/common/colorRegistry';
 
 export function getSimpleEditorOptions(configurationService: IConfigurationService): IEditorOptions {
 	return {
@@ -60,3 +63,35 @@ export function getSimpleCodeEditorWidgetOptions(): ICodeEditorWidgetOptions {
 		])
 	};
 }
+
+/**
+ * Should be called to set the styling on editors that are appearing as just input boxes
+ * @param editorContainerSelector An element selector that will match the container of the editor
+ */
+export function setupSimpleEditorSelectionStyling(editorContainerSelector: string): IDisposable {
+	// Override styles in selections.ts
+	return registerThemingParticipant((theme, collector) => {
+		const selectionBackgroundColor = theme.getColor(selectionBackground);
+
+		if (selectionBackgroundColor) {
+			// Override inactive selection bg
+			const inputBackgroundColor = theme.getColor(inputBackground);
+			if (inputBackgroundColor) {
+				collector.addRule(`${editorContainerSelector} .monaco-editor-background { background-color: ${inputBackgroundColor}; } `);
+				collector.addRule(`${editorContainerSelector} .monaco-editor .selected-text { background-color: ${inputBackgroundColor.transparent(0.4)}; }`);
+			}
+
+			// Override selected fg
+			const inputForegroundColor = theme.getColor(inputForeground);
+			if (inputForegroundColor) {
+				collector.addRule(`${editorContainerSelector} .monaco-editor .view-line span.inline-selected-text { color: ${inputForegroundColor}; }`);
+			}
+
+			collector.addRule(`${editorContainerSelector} .monaco-editor .focused .selected-text { background-color: ${selectionBackgroundColor}; }`);
+		} else {
+			// Use editor selection color if theme has not set a selection background color
+			collector.addRule(`${editorContainerSelector} .monaco-editor .focused .selected-text { background-color: ${theme.getColor(editorSelectionBackground)}; }`);
+		}
+	});
+
+}
diff --git a/src/vs/workbench/contrib/codeEditor/browser/suggestEnabledInput/suggestEnabledInput.ts b/src/vs/workbench/contrib/codeEditor/browser/suggestEnabledInput/suggestEnabledInput.ts
index e06219499e2..64bfec8be9d 100644
--- a/src/vs/workbench/contrib/codeEditor/browser/suggestEnabledInput/suggestEnabledInput.ts
+++ b/src/vs/workbench/contrib/codeEditor/browser/suggestEnabledInput/suggestEnabledInput.ts
@@ -3,42 +3,41 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./suggestEnabledInput';
 import { $, Dimension, append } from 'vs/base/browser/dom';
+import { DEFAULT_FONT_FAMILY } from 'vs/base/browser/fonts';
+import { IHistoryNavigationWidget } from 'vs/base/browser/history';
 import { Widget } from 'vs/base/browser/ui/widget';
 import { Emitter, Event } from 'vs/base/common/event';
+import { HistoryNavigator } from 'vs/base/common/history';
 import { KeyCode } from 'vs/base/common/keyCodes';
 import { mixin } from 'vs/base/common/objects';
 import { isMacintosh } from 'vs/base/common/platform';
 import { URI as uri } from 'vs/base/common/uri';
+import 'vs/css!./suggestEnabledInput';
+import { IEditorConstructionOptions } from 'vs/editor/browser/config/editorConfiguration';
+import { EditorExtensionsRegistry } from 'vs/editor/browser/editorExtensions';
 import { CodeEditorWidget } from 'vs/editor/browser/widget/codeEditor/codeEditorWidget';
 import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
 import { EditOperation } from 'vs/editor/common/core/editOperation';
 import { Position } from 'vs/editor/common/core/position';
 import { Range } from 'vs/editor/common/core/range';
-import { ITextModel } from 'vs/editor/common/model';
+import { ensureValidWordDefinition, getWordAtText } from 'vs/editor/common/core/wordHelper';
 import * as languages from 'vs/editor/common/languages';
+import { ITextModel } from 'vs/editor/common/model';
+import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
 import { IModelService } from 'vs/editor/common/services/model';
 import { ContextMenuController } from 'vs/editor/contrib/contextmenu/browser/contextmenu';
 import { SnippetController2 } from 'vs/editor/contrib/snippet/browser/snippetController2';
 import { SuggestController } from 'vs/editor/contrib/suggest/browser/suggestController';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
+import { IHistoryNavigationContext, registerAndCreateHistoryNavigationContext } from 'vs/platform/history/browser/contextScopedHistoryWidget';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ColorIdentifier, asCssVariable, asCssVariableWithDefault, editorSelectionBackground, inputBackground, inputBorder, inputForeground, inputPlaceholderForeground, selectionBackground } from 'vs/platform/theme/common/colorRegistry';
-import { registerThemingParticipant } from 'vs/platform/theme/common/themeService';
+import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
+import { ColorIdentifier, asCssVariable, asCssVariableWithDefault, inputBackground, inputBorder, inputForeground, inputPlaceholderForeground } from 'vs/platform/theme/common/colorRegistry';
 import { MenuPreventer } from 'vs/workbench/contrib/codeEditor/browser/menuPreventer';
-import { getSimpleEditorOptions } from 'vs/workbench/contrib/codeEditor/browser/simpleEditorOptions';
 import { SelectionClipboardContributionID } from 'vs/workbench/contrib/codeEditor/browser/selectionClipboard';
-import { EditorExtensionsRegistry } from 'vs/editor/browser/editorExtensions';
-import { DEFAULT_FONT_FAMILY } from 'vs/base/browser/fonts';
-import { HistoryNavigator } from 'vs/base/common/history';
-import { registerAndCreateHistoryNavigationContext, IHistoryNavigationContext } from 'vs/platform/history/browser/contextScopedHistoryWidget';
-import { IHistoryNavigationWidget } from 'vs/base/browser/history';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
-import { IEditorConstructionOptions } from 'vs/editor/browser/config/editorConfiguration';
-import { ensureValidWordDefinition, getWordAtText } from 'vs/editor/common/core/wordHelper';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { getSimpleEditorOptions, setupSimpleEditorSelectionStyling } from 'vs/workbench/contrib/codeEditor/browser/simpleEditorOptions';
 
 export interface SuggestResultsProvider {
 	/**
@@ -462,34 +461,7 @@ export class ContextScopedSuggestEnabledInputWithHistory extends SuggestEnabledI
 	}
 }
 
-// Override styles in selections.ts
-registerThemingParticipant((theme, collector) => {
-	const selectionBackgroundColor = theme.getColor(selectionBackground);
-
-	if (selectionBackgroundColor) {
-		// Override inactive selection bg
-		const inputBackgroundColor = theme.getColor(inputBackground);
-		if (inputBackgroundColor) {
-			collector.addRule(`.suggest-input-container .monaco-editor .selected-text { background-color: ${inputBackgroundColor.transparent(0.4)}; }`);
-		}
-
-		// Override selected fg
-		const inputForegroundColor = theme.getColor(inputForeground);
-		if (inputForegroundColor) {
-			collector.addRule(`.suggest-input-container .monaco-editor .view-line span.inline-selected-text { color: ${inputForegroundColor}; }`);
-		}
-
-		const backgroundColor = theme.getColor(inputBackground);
-		if (backgroundColor) {
-			collector.addRule(`.suggest-input-container .monaco-editor-background { background-color: ${backgroundColor}; } `);
-		}
-		collector.addRule(`.suggest-input-container .monaco-editor .focused .selected-text { background-color: ${selectionBackgroundColor}; }`);
-	} else {
-		// Use editor selection color if theme has not set a selection background color
-		collector.addRule(`.suggest-input-container .monaco-editor .focused .selected-text { background-color: ${theme.getColor(editorSelectionBackground)}; }`);
-	}
-});
-
+setupSimpleEditorSelectionStyling('.suggest-input-container');
 
 function getSuggestEnabledInputOptions(ariaLabel?: string): IEditorOptions {
 	return {
diff --git a/src/vs/workbench/contrib/codeEditor/browser/workbenchEditorWorkerService.ts b/src/vs/workbench/contrib/codeEditor/browser/workbenchEditorWorkerService.ts
new file mode 100644
index 00000000000..af972772662
--- /dev/null
+++ b/src/vs/workbench/contrib/codeEditor/browser/workbenchEditorWorkerService.ts
@@ -0,0 +1,25 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { WorkerDescriptor } from 'vs/base/browser/defaultWorkerFactory';
+import { EditorWorkerService } from 'vs/editor/browser/services/editorWorkerService';
+import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
+import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
+import { IModelService } from 'vs/editor/common/services/model';
+import { ITextResourceConfigurationService } from 'vs/editor/common/services/textResourceConfiguration';
+import { ILogService } from 'vs/platform/log/common/log';
+
+export class WorkbenchEditorWorkerService extends EditorWorkerService {
+	constructor(
+		@IModelService modelService: IModelService,
+		@ITextResourceConfigurationService configurationService: ITextResourceConfigurationService,
+		@ILogService logService: ILogService,
+		@ILanguageConfigurationService languageConfigurationService: ILanguageConfigurationService,
+		@ILanguageFeaturesService languageFeaturesService: ILanguageFeaturesService,
+	) {
+		const workerDescriptor = new WorkerDescriptor('vs/editor/common/services/editorSimpleWorker', 'TextEditorWorker');
+		super(workerDescriptor, modelService, configurationService, logService, languageConfigurationService, languageFeaturesService);
+	}
+}
diff --git a/src/vs/workbench/contrib/codeEditor/test/node/autoindent.test.ts b/src/vs/workbench/contrib/codeEditor/test/node/autoindent.test.ts
index fe3632fb8d0..1bd9688ea69 100644
--- a/src/vs/workbench/contrib/codeEditor/test/node/autoindent.test.ts
+++ b/src/vs/workbench/contrib/codeEditor/test/node/autoindent.test.ts
@@ -23,6 +23,7 @@ import { EncodedTokenizationResult, IState, ITokenizationSupport, TokenizationRe
 import { NullState } from 'vs/editor/common/languages/nullTokenize';
 import { MetadataConsts, StandardTokenType } from 'vs/editor/common/encodedTokenAttributes';
 import { ITextModel } from 'vs/editor/common/model';
+import { FileAccess } from 'vs/base/common/network';
 
 function getIRange(range: IRange): IRange {
 	return {
@@ -56,7 +57,7 @@ function registerLanguageConfiguration(instantiationService: TestInstantiationSe
 	let configPath: string;
 	switch (languageId) {
 		case LanguageId.TypeScript:
-			configPath = path.join('extensions', 'typescript-basics', 'language-configuration.json');
+			configPath = FileAccess.asFileUri('vs/workbench/contrib/codeEditor/test/node/language-configuration.json').fsPath;
 			break;
 		default:
 			throw new Error('Unknown languageId');
diff --git a/src/vs/workbench/contrib/codeEditor/test/node/language-configuration.json b/src/vs/workbench/contrib/codeEditor/test/node/language-configuration.json
new file mode 100644
index 00000000000..25a23685738
--- /dev/null
+++ b/src/vs/workbench/contrib/codeEditor/test/node/language-configuration.json
@@ -0,0 +1,250 @@
+{
+	// Note that this file should stay in sync with 'javascript-language-basics/javascript-language-configuration.json'
+	"comments": {
+		"lineComment": "//",
+		"blockComment": [
+			"/*",
+			"*/"
+		]
+	},
+	"brackets": [
+		[
+			"${",
+			"}"
+		],
+		[
+			"{",
+			"}"
+		],
+		[
+			"[",
+			"]"
+		],
+		[
+			"(",
+			")"
+		]
+	],
+	"autoClosingPairs": [
+		{
+			"open": "{",
+			"close": "}"
+		},
+		{
+			"open": "[",
+			"close": "]"
+		},
+		{
+			"open": "(",
+			"close": ")"
+		},
+		{
+			"open": "'",
+			"close": "'",
+			"notIn": [
+				"string",
+				"comment"
+			]
+		},
+		{
+			"open": "\"",
+			"close": "\"",
+			"notIn": [
+				"string"
+			]
+		},
+		{
+			"open": "`",
+			"close": "`",
+			"notIn": [
+				"string",
+				"comment"
+			]
+		},
+		{
+			"open": "/**",
+			"close": " */",
+			"notIn": [
+				"string"
+			]
+		}
+	],
+	"surroundingPairs": [
+		[
+			"{",
+			"}"
+		],
+		[
+			"[",
+			"]"
+		],
+		[
+			"(",
+			")"
+		],
+		[
+			"'",
+			"'"
+		],
+		[
+			"\"",
+			"\""
+		],
+		[
+			"`",
+			"`"
+		],
+		[
+			"<",
+			">"
+		]
+	],
+	"colorizedBracketPairs": [
+		[
+			"(",
+			")"
+		],
+		[
+			"[",
+			"]"
+		],
+		[
+			"{",
+			"}"
+		],
+		[
+			"<",
+			">"
+		]
+	],
+	"autoCloseBefore": ";:.,=}])>` \n\t",
+	"folding": {
+		"markers": {
+			"start": "^\\s*//\\s*#?region\\b",
+			"end": "^\\s*//\\s*#?endregion\\b"
+		}
+	},
+	"wordPattern": {
+		"pattern": "(-?\\d*\\.\\d\\w*)|([^\\`\\@\\~\\!\\%\\^\\&\\*\\(\\)\\-\\=\\+\\[\\{\\]\\}\\\\\\|\\;\\:\\'\\\"\\,\\.\\<\\>/\\?\\s]+)",
+	},
+	"indentationRules": {
+		"decreaseIndentPattern": {
+			"pattern": "^\\s*[\\}\\]\\)].*$"
+		},
+		"increaseIndentPattern": {
+			"pattern": "^.*(\\{[^}]*|\\([^)]*|\\[[^\\]]*)$"
+		},
+		// e.g.  * ...| or */| or *-----*/|
+		"unIndentedLinePattern": {
+			"pattern": "^(\\t|[ ])*[ ]\\*[^/]*\\*/\\s*$|^(\\t|[ ])*[ ]\\*/\\s*$|^(\\t|[ ])*\\*([ ]([^\\*]|\\*(?!/))*)?$"
+		},
+		"indentNextLinePattern": {
+			"pattern": "^((.*=>\\s*)|((.*[^\\w]+|\\s*)(if|while|for)\\s*\\(.*\\)\\s*))$"
+		}
+	},
+	"onEnterRules": [
+		{
+			// e.g. /** | */
+			"beforeText": {
+				"pattern": "^\\s*/\\*\\*(?!/)([^\\*]|\\*(?!/))*$"
+			},
+			"afterText": {
+				"pattern": "^\\s*\\*/$"
+			},
+			"action": {
+				"indent": "indentOutdent",
+				"appendText": " * "
+			}
+		},
+		{
+			// e.g. /** ...|
+			"beforeText": {
+				"pattern": "^\\s*/\\*\\*(?!/)([^\\*]|\\*(?!/))*$"
+			},
+			"action": {
+				"indent": "none",
+				"appendText": " * "
+			}
+		},
+		{
+			// e.g.  * ...|
+			"beforeText": {
+				"pattern": "^(\\t|[ ])*\\*([ ]([^\\*]|\\*(?!/))*)?$"
+			},
+			"previousLineText": {
+				"pattern": "(?=^(\\s*(/\\*\\*|\\*)).*)(?=(?!(\\s*\\*/)))"
+			},
+			"action": {
+				"indent": "none",
+				"appendText": "* "
+			}
+		},
+		{
+			// e.g.  */|
+			"beforeText": {
+				"pattern": "^(\\t|[ ])*[ ]\\*/\\s*$"
+			},
+			"action": {
+				"indent": "none",
+				"removeText": 1
+			},
+		},
+		{
+			// e.g.  *-----*/|
+			"beforeText": {
+				"pattern": "^(\\t|[ ])*[ ]\\*[^/]*\\*/\\s*$"
+			},
+			"action": {
+				"indent": "none",
+				"removeText": 1
+			},
+		},
+		{
+			"beforeText": {
+				"pattern": "^\\s*(\\bcase\\s.+:|\\bdefault:)$"
+			},
+			"afterText": {
+				"pattern": "^(?!\\s*(\\bcase\\b|\\bdefault\\b))"
+			},
+			"action": {
+				"indent": "indent"
+			}
+		},
+		{
+			// Decrease indentation after single line if/else if/else, for, or while
+			"previousLineText": "^\\s*(((else ?)?if|for|while)\\s*\\(.*\\)\\s*|else\\s*)$",
+			// But make sure line doesn't have braces or is not another if statement
+			"beforeText": "^\\s+([^{i\\s]|i(?!f\\b))",
+			"action": {
+				"indent": "outdent"
+			}
+		},
+		// Indent when pressing enter from inside ()
+		{
+			"beforeText": "^.*\\([^\\)]*$",
+			"afterText": "^\\s*\\).*$",
+			"action": {
+				"indent": "indentOutdent",
+				"appendText": "\t",
+			}
+		},
+		// Indent when pressing enter from inside {}
+		{
+			"beforeText": "^.*\\{[^\\}]*$",
+			"afterText": "^\\s*\\}.*$",
+			"action": {
+				"indent": "indentOutdent",
+				"appendText": "\t",
+			}
+		},
+		// Indent when pressing enter from inside []
+		{
+			"beforeText": "^.*\\[[^\\]]*$",
+			"afterText": "^\\s*\\].*$",
+			"action": {
+				"indent": "indentOutdent",
+				"appendText": "\t",
+			}
+		},
+	]
+}
diff --git a/src/vs/workbench/contrib/comments/browser/commentThreadHeader.ts b/src/vs/workbench/contrib/comments/browser/commentThreadHeader.ts
index 8333654958e..d8bcd057107 100644
--- a/src/vs/workbench/contrib/comments/browser/commentThreadHeader.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentThreadHeader.ts
@@ -7,7 +7,7 @@ import * as dom from 'vs/base/browser/dom';
 import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
 import { Action, ActionRunner } from 'vs/base/common/actions';
 import { Codicon } from 'vs/base/common/codicons';
-import { Disposable, toDisposable } from 'vs/base/common/lifecycle';
+import { Disposable, IDisposable, MutableDisposable, toDisposable } from 'vs/base/common/lifecycle';
 import * as strings from 'vs/base/common/strings';
 import * as languages from 'vs/editor/common/languages';
 import { IRange } from 'vs/editor/common/core/range';
@@ -26,7 +26,11 @@ import { MarshalledCommentThread } from 'vs/workbench/common/comments';
 
 const collapseIcon = registerIcon('review-comment-collapse', Codicon.chevronUp, nls.localize('collapseIcon', 'Icon to collapse a review comment.'));
 const COLLAPSE_ACTION_CLASS = 'expand-review-action ' + ThemeIcon.asClassName(collapseIcon);
+const DELETE_ACTION_CLASS = 'expand-review-action ' + ThemeIcon.asClassName(Codicon.trashcan);
 
+function threadHasComments(comments: ReadonlyArray<languages.Comment> | undefined): comments is ReadonlyArray<languages.Comment> {
+	return !!comments && comments.length > 0;
+}
 
 export class CommentThreadHeader<T = IRange> extends Disposable {
 	private _headElement: HTMLElement;
@@ -63,7 +67,17 @@ export class CommentThreadHeader<T = IRange> extends Disposable {
 
 		this._register(this._actionbarWidget);
 
-		this._collapseAction = new Action('review.expand', nls.localize('label.collapse', "Collapse"), COLLAPSE_ACTION_CLASS, true, () => this._delegate.collapse());
+		const collapseClass = threadHasComments(this._commentThread.comments) ? COLLAPSE_ACTION_CLASS : DELETE_ACTION_CLASS;
+		this._collapseAction = new Action('review.expand', nls.localize('label.collapse', "Collapse"), collapseClass, true, () => this._delegate.collapse());
+		if (!threadHasComments(this._commentThread.comments)) {
+			const commentsChanged: MutableDisposable<IDisposable> = this._register(new MutableDisposable());
+			commentsChanged.value = this._commentThread.onDidChangeComments(() => {
+				if (threadHasComments(this._commentThread.comments)) {
+					this._collapseAction.class = COLLAPSE_ACTION_CLASS;
+					commentsChanged.clear();
+				}
+			});
+		}
 
 		const menu = this._commentMenus.getCommentThreadTitleActions(this._contextKeyService);
 		this._register(menu);
diff --git a/src/vs/workbench/contrib/comments/browser/commentThreadWidget.ts b/src/vs/workbench/contrib/comments/browser/commentThreadWidget.ts
index 4129171b360..2838845b5f6 100644
--- a/src/vs/workbench/contrib/comments/browser/commentThreadWidget.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentThreadWidget.ts
@@ -23,7 +23,7 @@ import { ICommentThreadWidget } from 'vs/workbench/contrib/comments/common/comme
 import { IColorTheme } from 'vs/platform/theme/common/themeService';
 import { contrastBorder, focusBorder, inputValidationErrorBackground, inputValidationErrorBorder, inputValidationErrorForeground, textBlockQuoteBackground, textBlockQuoteBorder, textLinkActiveForeground, textLinkForeground } from 'vs/platform/theme/common/colorRegistry';
 import { PANEL_BORDER } from 'vs/workbench/common/theme';
-import { IRange } from 'vs/editor/common/core/range';
+import { IRange, Range } from 'vs/editor/common/core/range';
 import { commentThreadStateBackgroundColorVar, commentThreadStateColorVar } from 'vs/workbench/contrib/comments/browser/commentColors';
 import { ICellRange } from 'vs/workbench/contrib/notebook/common/notebookRange';
 import { FontInfo } from 'vs/editor/common/config/fontInfo';
@@ -36,10 +36,11 @@ import { AccessibilityVerbositySettingId } from 'vs/workbench/contrib/accessibil
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { AccessibilityCommandId } from 'vs/workbench/contrib/accessibility/common/accessibilityCommands';
 import { LayoutableEditor } from 'vs/workbench/contrib/comments/browser/simpleCommentEditor';
+import { DomEmitter } from 'vs/base/browser/event';
+import { isCodeEditor } from 'vs/editor/browser/editorBrowser';
 
 export const COMMENTEDITOR_DECORATION_KEY = 'commenteditordecoration';
 
-
 export class CommentThreadWidget<T extends IRange | ICellRange = IRange> extends Disposable implements ICommentThreadWidget {
 	private _header!: CommentThreadHeader<T>;
 	private _body: CommentThreadBody<T>;
@@ -156,6 +157,14 @@ export class CommentThreadWidget<T extends IRange | ICellRange = IRange> extends
 		}
 
 		this.currentThreadListeners();
+		this._register(new DomEmitter(this.container, 'keydown').event(e => {
+			if (dom.isKeyboardEvent(e) && e.key === 'Escape') {
+				if (Range.isIRange(this.commentThread.range) && isCodeEditor(this._parentEditor)) {
+					this._parentEditor.setSelection(this.commentThread.range);
+				}
+				this.collapse();
+			}
+		}));
 	}
 
 	private _setAriaLabel(): void {
diff --git a/src/vs/workbench/contrib/comments/browser/commentThreadZoneWidget.ts b/src/vs/workbench/contrib/comments/browser/commentThreadZoneWidget.ts
index a404cd6dfea..5fcfb5a4ef6 100644
--- a/src/vs/workbench/contrib/comments/browser/commentThreadZoneWidget.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentThreadZoneWidget.ts
@@ -333,14 +333,6 @@ export class ReviewZoneWidget extends ZoneWidget implements ICommentThreadWidget
 		return 0;
 	}
 
-	toggleExpand() {
-		if (this._isExpanded) {
-			this._commentThread.collapsibleState = languages.CommentThreadCollapsibleState.Collapsed;
-		} else {
-			this._commentThread.collapsibleState = languages.CommentThreadCollapsibleState.Expanded;
-		}
-	}
-
 	async update(commentThread: languages.CommentThread<IRange>) {
 		if (this._commentThread !== commentThread) {
 			this._commentThreadDisposables.forEach(disposable => disposable.dispose());
diff --git a/src/vs/workbench/contrib/comments/browser/commentsController.ts b/src/vs/workbench/contrib/comments/browser/commentsController.ts
index 0839b097ed4..34d258d02c7 100644
--- a/src/vs/workbench/contrib/comments/browser/commentsController.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentsController.ts
@@ -46,6 +46,7 @@ import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
 import { URI } from 'vs/base/common/uri';
 import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
+import { threadHasMeaningfulComments } from 'vs/workbench/contrib/comments/browser/commentsModel';
 
 export const ID = 'editor.contrib.review';
 
@@ -1015,7 +1016,7 @@ export class CommentController implements IEditorContribution {
 	}
 
 	private async openCommentsView(thread: languages.CommentThread) {
-		if (thread.comments && (thread.comments.length > 0)) {
+		if (thread.comments && (thread.comments.length > 0) && threadHasMeaningfulComments(thread)) {
 			const openViewState = this.configurationService.getValue<ICommentsConfiguration>(COMMENTS_SECTION).openView;
 			if (openViewState === 'file') {
 				return this.viewsService.openView(COMMENTS_VIEW_ID);
diff --git a/src/vs/workbench/contrib/comments/browser/commentsModel.ts b/src/vs/workbench/contrib/comments/browser/commentsModel.ts
index d0701d5f344..624db1d5235 100644
--- a/src/vs/workbench/contrib/comments/browser/commentsModel.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentsModel.ts
@@ -9,6 +9,12 @@ import { CommentThread } from 'vs/editor/common/languages';
 import { localize } from 'vs/nls';
 import { ResourceWithCommentThreads, ICommentThreadChangedEvent } from 'vs/workbench/contrib/comments/common/commentModel';
 import { Disposable } from 'vs/base/common/lifecycle';
+import { isMarkdownString } from 'vs/base/common/htmlContent';
+
+export function threadHasMeaningfulComments(thread: CommentThread): boolean {
+	return !!thread.comments && !!thread.comments.length && thread.comments.some(comment => isMarkdownString(comment.body) ? comment.body.value.length > 0 : comment.body.length > 0);
+
+}
 
 export interface ICommentsModel {
 	hasCommentThreads(): boolean;
@@ -38,9 +44,6 @@ export class CommentsModel extends Disposable implements ICommentsModel {
 				return resource;
 			}).flat();
 		}).flat();
-		this._resourceCommentThreads.sort((a, b) => {
-			return a.resource.toString() > b.resource.toString() ? 1 : -1;
-		});
 	}
 
 	public setCommentThreads(uniqueOwner: string, owner: string, ownerLabel: string, commentThreads: CommentThread[]): void {
@@ -116,7 +119,14 @@ export class CommentsModel extends Disposable implements ICommentsModel {
 	}
 
 	public hasCommentThreads(): boolean {
-		return !!this._resourceCommentThreads.length;
+		// There's a resource with at least one thread
+		return !!this._resourceCommentThreads.length && this._resourceCommentThreads.some(resource => {
+			// At least one of the threads in the the resource has comments
+			return (resource.commentThreads.length > 0) && resource.commentThreads.some(thread => {
+				// At least one of the comments in the thread is not empty
+				return threadHasMeaningfulComments(thread.thread);
+			});
+		});
 	}
 
 	public getMessage(): string {
diff --git a/src/vs/workbench/contrib/comments/browser/commentsTreeViewer.ts b/src/vs/workbench/contrib/comments/browser/commentsTreeViewer.ts
index 7f0dfde0e64..92b28d1a074 100644
--- a/src/vs/workbench/contrib/comments/browser/commentsTreeViewer.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentsTreeViewer.ts
@@ -76,7 +76,7 @@ interface ICommentThreadTemplateData {
 	disposables: IDisposable[];
 }
 
-class CommentsModelVirualDelegate implements IListVirtualDelegate<ResourceWithCommentThreads | CommentNode> {
+class CommentsModelVirtualDelegate implements IListVirtualDelegate<ResourceWithCommentThreads | CommentNode> {
 	private static readonly RESOURCE_ID = 'resource-with-comments';
 	private static readonly COMMENT_ID = 'comment-node';
 
@@ -90,10 +90,10 @@ class CommentsModelVirualDelegate implements IListVirtualDelegate<ResourceWithCo
 
 	public getTemplateId(element: any): string {
 		if (element instanceof ResourceWithCommentThreads) {
-			return CommentsModelVirualDelegate.RESOURCE_ID;
+			return CommentsModelVirtualDelegate.RESOURCE_ID;
 		}
 		if (element instanceof CommentNode) {
-			return CommentsModelVirualDelegate.COMMENT_ID;
+			return CommentsModelVirtualDelegate.COMMENT_ID;
 		}
 
 		return '';
@@ -255,6 +255,9 @@ export class CommentNodeRenderer implements IListRenderer<ITreeNode<CommentNode>
 			textDescription.textContent = image.alt ? nls.localize('imageWithLabel', "Image: {0}", image.alt) : nls.localize('image', "Image");
 			image.parentNode!.replaceChild(textDescription, image);
 		}
+		while ((renderedComment.element.children.length > 1) && (renderedComment.element.firstElementChild?.tagName === 'HR')) {
+			renderedComment.element.removeChild(renderedComment.element.firstElementChild);
+		}
 		return renderedComment;
 	}
 
@@ -450,7 +453,7 @@ export class CommentsList extends WorkbenchObjectTree<CommentsModel | ResourceWi
 		@IContextMenuService private readonly contextMenuService: IContextMenuService,
 		@IKeybindingService private readonly keybindingService: IKeybindingService
 	) {
-		const delegate = new CommentsModelVirualDelegate();
+		const delegate = new CommentsModelVirtualDelegate();
 		const actionViewItemProvider = createActionViewItem.bind(undefined, instantiationService);
 		const menus = instantiationService.createInstance(CommentsMenus);
 		menus.setContextKeyService(contextKeyService);
@@ -484,6 +487,7 @@ export class CommentsList extends WorkbenchObjectTree<CommentsModel | ResourceWi
 				collapseByDefault: false,
 				overrideStyles: options.overrideStyles,
 				filter: options.filter,
+				sorter: options.sorter,
 				findWidgetEnabled: false,
 				multipleSelectionSupport: false,
 			},
diff --git a/src/vs/workbench/contrib/comments/browser/commentsView.ts b/src/vs/workbench/contrib/comments/browser/commentsView.ts
index 429a824d124..75deafec5d3 100644
--- a/src/vs/workbench/contrib/comments/browser/commentsView.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentsView.ts
@@ -24,32 +24,42 @@ import { IOpenerService } from 'vs/platform/opener/common/opener';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
 import { CommentsViewFilterFocusContextKey, ICommentsView } from 'vs/workbench/contrib/comments/browser/comments';
-import { CommentsFilters, CommentsFiltersChangeEvent } from 'vs/workbench/contrib/comments/browser/commentsViewActions';
+import { CommentsFilters, CommentsFiltersChangeEvent, CommentsSortOrder } from 'vs/workbench/contrib/comments/browser/commentsViewActions';
 import { Memento, MementoObject } from 'vs/workbench/common/memento';
 import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
 import { FilterOptions } from 'vs/workbench/contrib/comments/browser/commentsFilterOptions';
 import { CommentThreadApplicability, CommentThreadState } from 'vs/editor/common/languages';
-import { ITreeElement } from 'vs/base/browser/ui/tree/tree';
-import { Iterable } from 'vs/base/common/iterator';
 import { revealCommentThread } from 'vs/workbench/contrib/comments/browser/commentsController';
 import { registerNavigableContainer } from 'vs/workbench/browser/actions/widgetNavigationCommands';
-import { CommentsModel, ICommentsModel } from 'vs/workbench/contrib/comments/browser/commentsModel';
+import { CommentsModel, threadHasMeaningfulComments, type ICommentsModel } from 'vs/workbench/contrib/comments/browser/commentsModel';
 import { IHoverService } from 'vs/platform/hover/browser/hover';
 import { AccessibilityVerbositySettingId } from 'vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
 import { AccessibleViewAction } from 'vs/workbench/contrib/accessibility/browser/accessibleViewActions';
+import type { ITreeElement } from 'vs/base/browser/ui/tree/tree';
+import { IPathService } from 'vs/workbench/services/path/common/pathService';
 
 export const CONTEXT_KEY_HAS_COMMENTS = new RawContextKey<boolean>('commentsView.hasComments', false);
 export const CONTEXT_KEY_SOME_COMMENTS_EXPANDED = new RawContextKey<boolean>('commentsView.someCommentsExpanded', false);
 export const CONTEXT_KEY_COMMENT_FOCUSED = new RawContextKey<boolean>('commentsView.commentFocused', false);
 const VIEW_STORAGE_ID = 'commentsViewState';
 
-function createResourceCommentsIterator(model: ICommentsModel): Iterable<ITreeElement<ResourceWithCommentThreads | CommentNode>> {
-	return Iterable.map(model.resourceCommentThreads, m => {
-		const CommentNodeIt = Iterable.from(m.commentThreads);
-		const children = Iterable.map(CommentNodeIt, r => ({ element: r }));
+type CommentsTreeNode = CommentsModel | ResourceWithCommentThreads | CommentNode;
 
-		return { element: m, children };
-	});
+function createResourceCommentsIterator(model: ICommentsModel): Iterable<ITreeElement<CommentsTreeNode>> {
+	const result: ITreeElement<CommentsTreeNode>[] = [];
+
+	for (const m of model.resourceCommentThreads) {
+		const children = [];
+		for (const r of m.commentThreads) {
+			if (threadHasMeaningfulComments(r.thread)) {
+				children.push({ element: r });
+			}
+		}
+		if (children.length > 0) {
+			result.push({ element: m, children });
+		}
+	}
+	return result;
 }
 
 export class CommentsPanel extends FilterViewPane implements ICommentsView {
@@ -138,7 +148,8 @@ export class CommentsPanel extends FilterViewPane implements ICommentsView {
 		@ITelemetryService telemetryService: ITelemetryService,
 		@IHoverService hoverService: IHoverService,
 		@IUriIdentityService private readonly uriIdentityService: IUriIdentityService,
-		@IStorageService storageService: IStorageService
+		@IStorageService storageService: IStorageService,
+		@IPathService private readonly pathService: IPathService
 	) {
 		const stateMemento = new Memento(VIEW_STORAGE_ID, storageService);
 		const viewState = stateMemento.getMemento(StorageScope.WORKSPACE, StorageTarget.MACHINE);
@@ -161,6 +172,7 @@ export class CommentsPanel extends FilterViewPane implements ICommentsView {
 		this.filters = this._register(new CommentsFilters({
 			showResolved: this.viewState['showResolved'] !== false,
 			showUnresolved: this.viewState['showUnresolved'] !== false,
+			sortBy: this.viewState['sortBy'] ?? CommentsSortOrder.ResourceAscending,
 		}, this.contextKeyService));
 		this.filter = new Filter(new FilterOptions(this.filterWidget.getFilterText(), this.filters.showResolved, this.filters.showUnresolved));
 
@@ -168,6 +180,9 @@ export class CommentsPanel extends FilterViewPane implements ICommentsView {
 			if (event.showResolved || event.showUnresolved) {
 				this.updateFilter();
 			}
+			if (event.sortBy) {
+				this.refresh();
+			}
 		}));
 		this._register(this.filterWidget.onDidChangeFilterText(() => this.updateFilter()));
 	}
@@ -177,6 +192,7 @@ export class CommentsPanel extends FilterViewPane implements ICommentsView {
 		this.viewState['filterHistory'] = this.filterWidget.getHistory();
 		this.viewState['showResolved'] = this.filters.showResolved;
 		this.viewState['showUnresolved'] = this.filters.showUnresolved;
+		this.viewState['sortBy'] = this.filters.sortBy;
 		this.stateMemento.saveMemento();
 		super.saveState();
 	}
@@ -270,10 +286,10 @@ export class CommentsPanel extends FilterViewPane implements ICommentsView {
 		}
 	}
 
-	private async renderComments(): Promise<void> {
+	private renderComments(): void {
 		this.treeContainer.classList.toggle('hidden', !this.commentService.commentsModel.hasCommentThreads());
 		this.renderMessage();
-		await this.tree?.setChildren(null, createResourceCommentsIterator(this.commentService.commentsModel));
+		this.tree?.setChildren(null, createResourceCommentsIterator(this.commentService.commentsModel));
 	}
 
 	public collapseAll() {
@@ -391,8 +407,30 @@ export class CommentsPanel extends FilterViewPane implements ICommentsView {
 			overrideStyles: this.getLocationBasedColors().listOverrideStyles,
 			selectionNavigation: true,
 			filter: this.filter,
+			sorter: {
+				compare: (a: CommentsTreeNode, b: CommentsTreeNode) => {
+					if (a instanceof CommentsModel || b instanceof CommentsModel) {
+						return 0;
+					}
+					if (this.filters.sortBy === CommentsSortOrder.UpdatedAtDescending) {
+						return a.lastUpdatedAt > b.lastUpdatedAt ? -1 : 1;
+					} else if (this.filters.sortBy === CommentsSortOrder.ResourceAscending) {
+						if (a instanceof ResourceWithCommentThreads && b instanceof ResourceWithCommentThreads) {
+							const workspaceScheme = this.pathService.defaultUriScheme;
+							if ((a.resource.scheme !== b.resource.scheme) && (a.resource.scheme === workspaceScheme || b.resource.scheme === workspaceScheme)) {
+								// Workspace scheme should always come first
+								return b.resource.scheme === workspaceScheme ? 1 : -1;
+							}
+							return a.resource.toString() > b.resource.toString() ? 1 : -1;
+						} else if (a instanceof CommentNode && b instanceof CommentNode && a.thread.range && b.thread.range) {
+							return a.thread.range?.startLineNumber > b.thread.range?.startLineNumber ? 1 : -1;
+						}
+					}
+					return 0;
+				},
+			},
 			keyboardNavigationLabelProvider: {
-				getKeyboardNavigationLabel: (item: CommentsModel | ResourceWithCommentThreads | CommentNode) => {
+				getKeyboardNavigationLabel: (item: CommentsTreeNode) => {
 					return undefined;
 				}
 			},
@@ -449,11 +487,8 @@ export class CommentsPanel extends FilterViewPane implements ICommentsView {
 		}
 		if (this.isVisible()) {
 			this.hasCommentsContextKey.set(this.commentService.commentsModel.hasCommentThreads());
-
-			this.treeContainer.classList.toggle('hidden', !this.commentService.commentsModel.hasCommentThreads());
 			this.cachedFilterStats = undefined;
-			this.renderMessage();
-			this.tree?.setChildren(null, createResourceCommentsIterator(this.commentService.commentsModel));
+			this.renderComments();
 
 			if (this.tree.getSelection().length === 0 && this.commentService.commentsModel.hasCommentThreads()) {
 				const firstComment = this.commentService.commentsModel.resourceCommentThreads[0].commentThreads[0];
diff --git a/src/vs/workbench/contrib/comments/browser/commentsViewActions.ts b/src/vs/workbench/contrib/comments/browser/commentsViewActions.ts
index b850d68ac5c..e2494534a05 100644
--- a/src/vs/workbench/contrib/comments/browser/commentsViewActions.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentsViewActions.ts
@@ -7,27 +7,37 @@ import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { localize } from 'vs/nls';
 import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { ContextKeyExpr, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
+import { ContextKeyExpr, IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { Event, Emitter } from 'vs/base/common/event';
 import { CommentsViewFilterFocusContextKey, ICommentsView } from 'vs/workbench/contrib/comments/browser/comments';
-import { registerAction2 } from 'vs/platform/actions/common/actions';
+import { MenuId, MenuRegistry, registerAction2 } from 'vs/platform/actions/common/actions';
 import { ViewAction } from 'vs/workbench/browser/parts/views/viewPane';
 import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { COMMENTS_VIEW_ID } from 'vs/workbench/contrib/comments/browser/commentsTreeViewer';
 import { FocusedViewContext } from 'vs/workbench/common/contextkeys';
 import { viewFilterSubmenu } from 'vs/workbench/browser/parts/views/viewFilter';
+import { Codicon } from 'vs/base/common/codicons';
+
+export const enum CommentsSortOrder {
+	ResourceAscending = 'resourceAscending',
+	UpdatedAtDescending = 'updatedAtDescending',
+}
+
 
 const CONTEXT_KEY_SHOW_RESOLVED = new RawContextKey<boolean>('commentsView.showResolvedFilter', true);
 const CONTEXT_KEY_SHOW_UNRESOLVED = new RawContextKey<boolean>('commentsView.showUnResolvedFilter', true);
+const CONTEXT_KEY_SORT_BY = new RawContextKey<CommentsSortOrder>('commentsView.sortBy', CommentsSortOrder.ResourceAscending);
 
 export interface CommentsFiltersChangeEvent {
 	showResolved?: boolean;
 	showUnresolved?: boolean;
+	sortBy?: CommentsSortOrder;
 }
 
 interface CommentsFiltersOptions {
 	showResolved: boolean;
 	showUnresolved: boolean;
+	sortBy: CommentsSortOrder;
 }
 
 export class CommentsFilters extends Disposable {
@@ -39,6 +49,7 @@ export class CommentsFilters extends Disposable {
 		super();
 		this._showResolved.set(options.showResolved);
 		this._showUnresolved.set(options.showUnresolved);
+		this._sortBy.set(options.sortBy);
 	}
 
 	private readonly _showUnresolved = CONTEXT_KEY_SHOW_UNRESOLVED.bindTo(this.contextKeyService);
@@ -63,6 +74,16 @@ export class CommentsFilters extends Disposable {
 		}
 	}
 
+	private _sortBy: IContextKey<CommentsSortOrder> = CONTEXT_KEY_SORT_BY.bindTo(this.contextKeyService);
+	get sortBy(): CommentsSortOrder {
+		return this._sortBy.get() ?? CommentsSortOrder.ResourceAscending;
+	}
+	set sortBy(sortBy: CommentsSortOrder) {
+		if (this._sortBy.get() !== sortBy) {
+			this._sortBy.set(sortBy);
+			this._onDidChange.fire({ sortBy });
+		}
+	}
 }
 
 registerAction2(class extends ViewAction<ICommentsView> {
@@ -168,3 +189,64 @@ registerAction2(class extends ViewAction<ICommentsView> {
 		view.filters.showResolved = !view.filters.showResolved;
 	}
 });
+
+const commentSortSubmenu = new MenuId('submenu.filter.commentSort');
+MenuRegistry.appendMenuItem(viewFilterSubmenu, {
+	submenu: commentSortSubmenu,
+	title: localize('comment sorts', "Sort By"),
+	group: '2_sort',
+	icon: Codicon.history,
+	when: ContextKeyExpr.equals('view', COMMENTS_VIEW_ID),
+});
+
+registerAction2(class extends ViewAction<ICommentsView> {
+	constructor() {
+		super({
+			id: `workbench.actions.${COMMENTS_VIEW_ID}.toggleSortByUpdatedAt`,
+			title: localize('toggle sorting by updated at', "Updated Time"),
+			category: localize('comments', "Comments"),
+			icon: Codicon.history,
+			viewId: COMMENTS_VIEW_ID,
+			toggled: {
+				condition: ContextKeyExpr.equals(CONTEXT_KEY_SORT_BY.key, CommentsSortOrder.UpdatedAtDescending),
+				title: localize('sorting by updated at', "Updated Time"),
+			},
+			menu: {
+				id: commentSortSubmenu,
+				group: 'navigation',
+				order: 1,
+				isHiddenByDefault: false,
+			},
+		});
+	}
+
+	async runInView(serviceAccessor: ServicesAccessor, view: ICommentsView): Promise<void> {
+		view.filters.sortBy = CommentsSortOrder.UpdatedAtDescending;
+	}
+});
+
+registerAction2(class extends ViewAction<ICommentsView> {
+	constructor() {
+		super({
+			id: `workbench.actions.${COMMENTS_VIEW_ID}.toggleSortByResource`,
+			title: localize('toggle sorting by resource', "Position in File"),
+			category: localize('comments', "Comments"),
+			icon: Codicon.history,
+			viewId: COMMENTS_VIEW_ID,
+			toggled: {
+				condition: ContextKeyExpr.equals(CONTEXT_KEY_SORT_BY.key, CommentsSortOrder.ResourceAscending),
+				title: localize('sorting by position in file', "Position in File"),
+			},
+			menu: {
+				id: commentSortSubmenu,
+				group: 'navigation',
+				order: 0,
+				isHiddenByDefault: false,
+			},
+		});
+	}
+
+	async runInView(serviceAccessor: ServicesAccessor, view: ICommentsView): Promise<void> {
+		view.filters.sortBy = CommentsSortOrder.ResourceAscending;
+	}
+});
diff --git a/src/vs/workbench/contrib/comments/browser/simpleCommentEditor.ts b/src/vs/workbench/contrib/comments/browser/simpleCommentEditor.ts
index 532fa6f5401..15975ce1462 100644
--- a/src/vs/workbench/contrib/comments/browser/simpleCommentEditor.ts
+++ b/src/vs/workbench/contrib/comments/browser/simpleCommentEditor.ts
@@ -31,12 +31,13 @@ import { clamp } from 'vs/base/common/numbers';
 import { CopyPasteController } from 'vs/editor/contrib/dropOrPasteInto/browser/copyPasteController';
 import { CodeActionController } from 'vs/editor/contrib/codeAction/browser/codeActionController';
 import { DropIntoEditorController } from 'vs/editor/contrib/dropOrPasteInto/browser/dropIntoEditorController';
-import { InlineCompletionsController } from 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsController';
+import { InlineCompletionsController } from 'vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController';
 import { LinkDetector } from 'vs/editor/contrib/links/browser/links';
 import { MessageController } from 'vs/editor/contrib/message/browser/messageController';
 import { SelectionClipboardContributionID } from 'vs/workbench/contrib/codeEditor/browser/selectionClipboard';
 import { MenuId } from 'vs/platform/actions/common/actions';
-import { HoverController } from 'vs/editor/contrib/hover/browser/hoverController';
+import { ContentHoverController } from 'vs/editor/contrib/hover/browser/contentHoverController2';
+import { MarginHoverController } from 'vs/editor/contrib/hover/browser/marginHoverController';
 
 export const ctxCommentEditorFocused = new RawContextKey<boolean>('commentEditorFocused', false);
 export const MIN_EDITOR_HEIGHT = 5 * 18;
@@ -78,7 +79,8 @@ export class SimpleCommentEditor extends CodeEditorWidget {
 					DropIntoEditorController.ID,
 					LinkDetector.ID,
 					MessageController.ID,
-					HoverController.ID,
+					ContentHoverController.ID,
+					MarginHoverController.ID,
 					SelectionClipboardContributionID,
 					InlineCompletionsController.ID,
 					CodeActionController.ID,
diff --git a/src/vs/workbench/contrib/comments/common/commentModel.ts b/src/vs/workbench/contrib/comments/common/commentModel.ts
index fbf25f6c06b..716985b311b 100644
--- a/src/vs/workbench/contrib/comments/common/commentModel.ts
+++ b/src/vs/workbench/contrib/comments/common/commentModel.ts
@@ -42,6 +42,23 @@ export class CommentNode {
 	hasReply(): boolean {
 		return this.replies && this.replies.length !== 0;
 	}
+
+	private _lastUpdatedAt: string | undefined;
+
+	get lastUpdatedAt(): string {
+		if (this._lastUpdatedAt === undefined) {
+			let updatedAt = this.comment.timestamp || '';
+			if (this.replies.length) {
+				const reply = this.replies[this.replies.length - 1];
+				const replyUpdatedAt = reply.lastUpdatedAt;
+				if (replyUpdatedAt > updatedAt) {
+					updatedAt = replyUpdatedAt;
+				}
+			}
+			this._lastUpdatedAt = updatedAt;
+		}
+		return this._lastUpdatedAt;
+	}
 }
 
 export class ResourceWithCommentThreads {
@@ -71,5 +88,25 @@ export class ResourceWithCommentThreads {
 
 		return commentNodes[0];
 	}
+
+	private _lastUpdatedAt: string | undefined;
+
+	get lastUpdatedAt() {
+		if (this._lastUpdatedAt === undefined) {
+			let updatedAt = '';
+			// Return result without cahcing as we expect data to arrive later
+			if (!this.commentThreads.length) {
+				return updatedAt;
+			}
+			for (const thread of this.commentThreads) {
+				const threadUpdatedAt = thread.lastUpdatedAt;
+				if (threadUpdatedAt && threadUpdatedAt > updatedAt) {
+					updatedAt = threadUpdatedAt;
+				}
+			}
+			this._lastUpdatedAt = updatedAt;
+		}
+		return this._lastUpdatedAt;
+	}
 }
 
diff --git a/src/vs/workbench/contrib/debug/browser/baseDebugView.ts b/src/vs/workbench/contrib/debug/browser/baseDebugView.ts
index 0515cc780f3..8543d1ac94a 100644
--- a/src/vs/workbench/contrib/debug/browser/baseDebugView.ts
+++ b/src/vs/workbench/contrib/debug/browser/baseDebugView.ts
@@ -22,7 +22,7 @@ import { IContextViewService } from 'vs/platform/contextview/browser/contextView
 import { IHoverService } from 'vs/platform/hover/browser/hover';
 import { defaultInputBoxStyles } from 'vs/platform/theme/browser/defaultStyles';
 import { COPY_EVALUATE_PATH_ID, COPY_VALUE_ID } from 'vs/workbench/contrib/debug/browser/debugCommands';
-import { LinkDetector } from 'vs/workbench/contrib/debug/browser/linkDetector';
+import { DebugLinkHoverBehavior, DebugLinkHoverBehaviorTypeData, LinkDetector } from 'vs/workbench/contrib/debug/browser/linkDetector';
 import { IDebugService, IExpression, IExpressionValue } from 'vs/workbench/contrib/debug/common/debug';
 import { Expression, ExpressionContainer, Variable } from 'vs/workbench/contrib/debug/common/debugModel';
 import { IDebugVisualizerService } from 'vs/workbench/contrib/debug/common/debugVisualizers';
@@ -37,8 +37,7 @@ export interface IRenderValueOptions {
 	showChanged?: boolean;
 	maxValueLength?: number;
 	/** If set, a hover will be shown on the element. Requires a disposable store for usage. */
-	hover?: DisposableStore | {
-		store: DisposableStore;
+	hover?: false | {
 		commands: { id: string; args: unknown[] }[];
 		commandService: ICommandService;
 	};
@@ -62,7 +61,7 @@ export function renderViewTree(container: HTMLElement): HTMLElement {
 	return treeContainer;
 }
 
-export function renderExpressionValue(expressionOrValue: IExpressionValue | string, container: HTMLElement, options: IRenderValueOptions, hoverService: IHoverService): void {
+export function renderExpressionValue(store: DisposableStore, expressionOrValue: IExpressionValue | string, container: HTMLElement, options: IRenderValueOptions, hoverService: IHoverService): void {
 	let value = typeof expressionOrValue === 'string' ? expressionOrValue : expressionOrValue.value;
 
 	// remove stale classes
@@ -100,16 +99,21 @@ export function renderExpressionValue(expressionOrValue: IExpressionValue | stri
 		value = '';
 	}
 
-	if (options.linkDetector) {
+	const session = (expressionOrValue instanceof ExpressionContainer) ? expressionOrValue.getSession() : undefined;
+	// Only use hovers for links if thre's not going to be a hover for the value.
+	const hoverBehavior: DebugLinkHoverBehaviorTypeData = options.hover === false ? { type: DebugLinkHoverBehavior.Rich, store } : { type: DebugLinkHoverBehavior.None };
+	if (expressionOrValue instanceof ExpressionContainer && expressionOrValue.valueLocationReference !== undefined && session && options.linkDetector) {
 		container.textContent = '';
-		const session = (expressionOrValue instanceof ExpressionContainer) ? expressionOrValue.getSession() : undefined;
-		container.appendChild(options.linkDetector.linkify(value, false, session ? session.root : undefined, true));
+		container.appendChild(options.linkDetector.linkifyLocation(value, expressionOrValue.valueLocationReference, session, hoverBehavior));
+	} else if (options.linkDetector) {
+		container.textContent = '';
+		container.appendChild(options.linkDetector.linkify(value, false, session ? session.root : undefined, true, hoverBehavior));
 	} else {
 		container.textContent = value;
 	}
 
-	if (options.hover) {
-		const { store, commands, commandService } = options.hover instanceof DisposableStore ? { store: options.hover, commands: [], commandService: undefined } : options.hover;
+	if (options.hover !== false) {
+		const { commands = [], commandService } = options.hover || {};
 		store.add(hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), container, () => {
 			const container = dom.$('div');
 			const markdownHoverElement = dom.$('div.hover-row');
@@ -159,10 +163,10 @@ export function renderVariable(store: DisposableStore, commandService: ICommandS
 		commands.push({ id: COPY_EVALUATE_PATH_ID, args: [{ variable }] });
 	}
 
-	renderExpressionValue(variable, data.value, {
+	renderExpressionValue(store, variable, data.value, {
 		showChanged,
 		maxValueLength: MAX_VALUE_RENDER_LENGTH_IN_VIEWLET,
-		hover: { store, commands, commandService },
+		hover: { commands, commandService },
 		colorize: true,
 		linkDetector
 	}, hoverService);
diff --git a/src/vs/workbench/contrib/debug/browser/breakpointEditorContribution.ts b/src/vs/workbench/contrib/debug/browser/breakpointEditorContribution.ts
index 94b34ffc4d6..d10b36ff099 100644
--- a/src/vs/workbench/contrib/debug/browser/breakpointEditorContribution.ts
+++ b/src/vs/workbench/contrib/debug/browser/breakpointEditorContribution.ts
@@ -811,61 +811,66 @@ class InlineBreakpointWidget implements IContentWidget, IDisposable {
 }
 
 registerThemingParticipant((theme, collector) => {
+	const scope = '.monaco-editor .glyph-margin-widgets, .monaco-workbench .debug-breakpoints, .monaco-workbench .disassembly-view, .monaco-editor .contentWidgets';
 	const debugIconBreakpointColor = theme.getColor(debugIconBreakpointForeground);
 	if (debugIconBreakpointColor) {
-		collector.addRule(`
-		${icons.allBreakpoints.map(b => `.monaco-workbench ${ThemeIcon.asCSSSelector(b.regular)}`).join(',\n		')},
-		.monaco-workbench ${ThemeIcon.asCSSSelector(icons.debugBreakpointUnsupported)},
-		.monaco-workbench ${ThemeIcon.asCSSSelector(icons.debugBreakpointHint)}:not([class*='codicon-debug-breakpoint']):not([class*='codicon-debug-stackframe']),
-		.monaco-workbench ${ThemeIcon.asCSSSelector(icons.breakpoint.regular)}${ThemeIcon.asCSSSelector(icons.debugStackframeFocused)}::after,
-		.monaco-workbench ${ThemeIcon.asCSSSelector(icons.breakpoint.regular)}${ThemeIcon.asCSSSelector(icons.debugStackframe)}::after {
-			color: ${debugIconBreakpointColor} !important;
-		}
-		`);
+		collector.addRule(`${scope} {
+			${icons.allBreakpoints.map(b => `${ThemeIcon.asCSSSelector(b.regular)}`).join(',\n		')},
+			${ThemeIcon.asCSSSelector(icons.debugBreakpointUnsupported)},
+			${ThemeIcon.asCSSSelector(icons.debugBreakpointHint)}:not([class*='codicon-debug-breakpoint']):not([class*='codicon-debug-stackframe']),
+			${ThemeIcon.asCSSSelector(icons.breakpoint.regular)}${ThemeIcon.asCSSSelector(icons.debugStackframeFocused)}::after,
+			${ThemeIcon.asCSSSelector(icons.breakpoint.regular)}${ThemeIcon.asCSSSelector(icons.debugStackframe)}::after {
+				color: ${debugIconBreakpointColor} !important;
+			}
+		}`);
 
-		collector.addRule(`
-		.monaco-workbench ${ThemeIcon.asCSSSelector(icons.breakpoint.pending)} {
-			color: ${debugIconBreakpointColor} !important;
-			font-size: 12px !important;
-		}
-		`);
+		collector.addRule(`${scope} {
+			${ThemeIcon.asCSSSelector(icons.breakpoint.pending)} {
+				color: ${debugIconBreakpointColor} !important;
+				font-size: 12px !important;
+			}
+		}`);
 	}
 
 	const debugIconBreakpointDisabledColor = theme.getColor(debugIconBreakpointDisabledForeground);
 	if (debugIconBreakpointDisabledColor) {
-		collector.addRule(`
-		${icons.allBreakpoints.map(b => `.monaco-workbench ${ThemeIcon.asCSSSelector(b.disabled)}`).join(',\n		')} {
-			color: ${debugIconBreakpointDisabledColor};
-		}
-		`);
+		collector.addRule(`${scope} {
+			${icons.allBreakpoints.map(b => ThemeIcon.asCSSSelector(b.disabled)).join(',\n		')} {
+				color: ${debugIconBreakpointDisabledColor};
+			}
+		}`);
 	}
 
 	const debugIconBreakpointUnverifiedColor = theme.getColor(debugIconBreakpointUnverifiedForeground);
 	if (debugIconBreakpointUnverifiedColor) {
-		collector.addRule(`
-		${icons.allBreakpoints.map(b => `.monaco-workbench ${ThemeIcon.asCSSSelector(b.unverified)}`).join(',\n		')} {
-			color: ${debugIconBreakpointUnverifiedColor};
-		}
-		`);
+		collector.addRule(`${scope} {
+			${icons.allBreakpoints.map(b => ThemeIcon.asCSSSelector(b.unverified)).join(',\n		')} {
+				color: ${debugIconBreakpointUnverifiedColor};
+			}
+		}`);
 	}
 
 	const debugIconBreakpointCurrentStackframeForegroundColor = theme.getColor(debugIconBreakpointCurrentStackframeForeground);
 	if (debugIconBreakpointCurrentStackframeForegroundColor) {
 		collector.addRule(`
-		.monaco-workbench ${ThemeIcon.asCSSSelector(icons.debugStackframe)},
 		.monaco-editor .debug-top-stack-frame-column {
 			color: ${debugIconBreakpointCurrentStackframeForegroundColor} !important;
 		}
+		${scope} {
+			${ThemeIcon.asCSSSelector(icons.debugStackframe)} {
+				color: ${debugIconBreakpointCurrentStackframeForegroundColor} !important;
+			}
+		}
 		`);
 	}
 
 	const debugIconBreakpointStackframeFocusedColor = theme.getColor(debugIconBreakpointStackframeForeground);
 	if (debugIconBreakpointStackframeFocusedColor) {
-		collector.addRule(`
-		.monaco-workbench ${ThemeIcon.asCSSSelector(icons.debugStackframeFocused)} {
-			color: ${debugIconBreakpointStackframeFocusedColor} !important;
-		}
-		`);
+		collector.addRule(`${scope} {
+			${ThemeIcon.asCSSSelector(icons.debugStackframeFocused)} {
+				color: ${debugIconBreakpointStackframeFocusedColor} !important;
+			}
+		}`);
 	}
 });
 
diff --git a/src/vs/workbench/contrib/debug/browser/breakpointWidget.ts b/src/vs/workbench/contrib/debug/browser/breakpointWidget.ts
index 11a82d72c3a..c002c37848f 100644
--- a/src/vs/workbench/contrib/debug/browser/breakpointWidget.ts
+++ b/src/vs/workbench/contrib/debug/browser/breakpointWidget.ts
@@ -6,6 +6,7 @@
 import * as dom from 'vs/base/browser/dom';
 import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { Button } from 'vs/base/browser/ui/button/button';
+import { getDefaultHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
 import { ISelectOptionItem, SelectBox } from 'vs/base/browser/ui/selectBox/selectBox';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { onUnexpectedError } from 'vs/base/common/errors';
@@ -34,6 +35,7 @@ import * as nls from 'vs/nls';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
+import { IHoverService } from 'vs/platform/hover/browser/hover';
 import { IInstantiationService, createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
@@ -109,6 +111,7 @@ export class BreakpointWidget extends ZoneWidget implements IPrivateBreakpointWi
 		@IKeybindingService private readonly keybindingService: IKeybindingService,
 		@ILabelService private readonly labelService: ILabelService,
 		@ITextModelService private readonly textModelService: ITextModelService,
+		@IHoverService private readonly hoverService: IHoverService
 	) {
 		super(editor, { showFrame: true, showArrow: false, frameWidth: 1, isAccessible: true });
 
@@ -204,12 +207,12 @@ export class BreakpointWidget extends ZoneWidget implements IPrivateBreakpointWi
 
 	protected _fillContainer(container: HTMLElement): void {
 		this.setCssClass('breakpoint-widget');
-		const selectBox = new SelectBox(<ISelectOptionItem[]>[
+		const selectBox = new SelectBox([
 			{ text: nls.localize('expression', "Expression") },
 			{ text: nls.localize('hitCount', "Hit Count") },
 			{ text: nls.localize('logMessage', "Log Message") },
 			{ text: nls.localize('triggeredBy', "Wait for Breakpoint") },
-		], this.context, this.contextViewService, defaultSelectBoxStyles, { ariaLabel: nls.localize('breakpointType', 'Breakpoint Type') });
+		] satisfies ISelectOptionItem[], this.context, this.contextViewService, defaultSelectBoxStyles, { ariaLabel: nls.localize('breakpointType', 'Breakpoint Type') });
 		this.selectContainer = $('.breakpoint-select-container');
 		selectBox.render(dom.append(container, this.selectContainer));
 		selectBox.onDidSelect(e => {
@@ -221,6 +224,7 @@ export class BreakpointWidget extends ZoneWidget implements IPrivateBreakpointWi
 		this.createModesInput(container);
 
 		this.inputContainer = $('.inputContainer');
+		this.toDispose.push(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), this.inputContainer, this.placeholder));
 		this.createBreakpointInput(dom.append(container, this.inputContainer));
 
 		this.input.getModel().setValue(this.getInputValue(this.breakpoint));
diff --git a/src/vs/workbench/contrib/debug/browser/breakpointsView.ts b/src/vs/workbench/contrib/debug/browser/breakpointsView.ts
index ac8dc3ed3d0..9019df75317 100644
--- a/src/vs/workbench/contrib/debug/browser/breakpointsView.ts
+++ b/src/vs/workbench/contrib/debug/browser/breakpointsView.ts
@@ -20,7 +20,7 @@ import { RunOnceScheduler } from 'vs/base/common/async';
 import { Codicon } from 'vs/base/common/codicons';
 import { MarkdownString } from 'vs/base/common/htmlContent';
 import { KeyCode } from 'vs/base/common/keyCodes';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { DisposableStore, IDisposable, dispose } from 'vs/base/common/lifecycle';
 import * as resources from 'vs/base/common/resources';
 import { ThemeIcon } from 'vs/base/common/themables';
 import { Constants } from 'vs/base/common/uint';
@@ -1494,18 +1494,19 @@ abstract class MemoryBreakpointAction extends Action2 {
 
 	private getRange(quickInput: IQuickInputService, defaultValue?: string) {
 		return new Promise<{ address: string; bytes: number } | undefined>(resolve => {
-			const input = quickInput.createInputBox();
+			const disposables = new DisposableStore();
+			const input = disposables.add(quickInput.createInputBox());
 			input.prompt = localize('dataBreakpointMemoryRangePrompt', "Enter a memory range in which to break");
 			input.placeholder = localize('dataBreakpointMemoryRangePlaceholder', 'Absolute range (0x1234 - 0x1300) or range of bytes after an address (0x1234 + 0xff)');
 			if (defaultValue) {
 				input.value = defaultValue;
 				input.valueSelection = [0, defaultValue.length];
 			}
-			input.onDidChangeValue(e => {
+			disposables.add(input.onDidChangeValue(e => {
 				const err = this.parseAddress(e, false);
 				input.validationMessage = err?.error;
-			});
-			input.onDidAccept(() => {
+			}));
+			disposables.add(input.onDidAccept(() => {
 				const r = this.parseAddress(input.value, true);
 				if ('error' in r) {
 					input.validationMessage = r.error;
@@ -1513,11 +1514,11 @@ abstract class MemoryBreakpointAction extends Action2 {
 					resolve(r);
 				}
 				input.dispose();
-			});
-			input.onDidHide(() => {
+			}));
+			disposables.add(input.onDidHide(() => {
 				resolve(undefined);
-				input.dispose();
-			});
+				disposables.dispose();
+			}));
 			input.ignoreFocusOut = true;
 			input.show();
 		});
diff --git a/src/vs/workbench/contrib/debug/browser/callStackWidget.ts b/src/vs/workbench/contrib/debug/browser/callStackWidget.ts
index e8f993a3b59..d02de4fb72f 100644
--- a/src/vs/workbench/contrib/debug/browser/callStackWidget.ts
+++ b/src/vs/workbench/contrib/debug/browser/callStackWidget.ts
@@ -12,20 +12,24 @@ import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cance
 import { Codicon } from 'vs/base/common/codicons';
 import { Emitter, Event } from 'vs/base/common/event';
 import { Disposable, DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { autorun, autorunWithStore, derived, IObservable, ISettableObservable, observableValue } from 'vs/base/common/observable';
+import { autorun, autorunWithStore, derived, IObservable, ISettableObservable, observableValue, transaction } from 'vs/base/common/observable';
 import { ThemeIcon } from 'vs/base/common/themables';
 import { Constants } from 'vs/base/common/uint';
 import { URI } from 'vs/base/common/uri';
 import { generateUuid } from 'vs/base/common/uuid';
 import 'vs/css!./media/callStackWidget';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
+import { EditorContributionCtor, EditorContributionInstantiation, IEditorContributionDescription } from 'vs/editor/browser/editorExtensions';
 import { CodeEditorWidget } from 'vs/editor/browser/widget/codeEditor/codeEditorWidget';
 import { EmbeddedCodeEditorWidget } from 'vs/editor/browser/widget/codeEditor/embeddedCodeEditorWidget';
 import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
+import { Position } from 'vs/editor/common/core/position';
 import { Range } from 'vs/editor/common/core/range';
+import { IWordAtPosition } from 'vs/editor/common/core/wordHelper';
+import { IEditorContribution, IEditorDecorationsCollection } from 'vs/editor/common/editorCommon';
 import { Location } from 'vs/editor/common/languages';
 import { ITextModelService } from 'vs/editor/common/services/resolverService';
+import { ClickLinkGesture, ClickLinkMouseEvent } from 'vs/editor/contrib/gotoSymbol/browser/link/clickLinkGesture';
 import { localize, localize2 } from 'vs/nls';
 import { createActionViewItem } from 'vs/platform/actions/browser/menuEntryActionViewItem';
 import { MenuWorkbenchToolBar } from 'vs/platform/actions/browser/toolbar';
@@ -38,7 +42,7 @@ import { INotificationService } from 'vs/platform/notification/common/notificati
 import { defaultButtonStyles } from 'vs/platform/theme/browser/defaultStyles';
 import { ResourceLabel } from 'vs/workbench/browser/labels';
 import { makeStackFrameColumnDecoration, TOP_STACK_FRAME_DECORATION } from 'vs/workbench/contrib/debug/browser/callStackEditorContribution';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { IEditorService, SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService';
 
 
 export class CallStackFrame {
@@ -74,7 +78,7 @@ interface IFrameLikeItem {
 }
 
 class WrappedCallStackFrame extends CallStackFrame implements IFrameLikeItem {
-	public readonly editorHeight = observableValue('WrappedCallStackFrame.height', 100);
+	public readonly editorHeight = observableValue('WrappedCallStackFrame.height', this.source ? 100 : 0);
 	public readonly collapsed = observableValue('WrappedCallStackFrame.collapsed', false);
 
 	public readonly height = derived(reader => {
@@ -97,6 +101,9 @@ class WrappedCustomStackFrame implements IFrameLikeItem {
 	constructor(public readonly original: CustomStackFrame) { }
 }
 
+const isFrameLike = (item: unknown): item is IFrameLikeItem =>
+	item instanceof WrappedCallStackFrame || item instanceof WrappedCustomStackFrame;
+
 type ListItem = WrappedCallStackFrame | SkippedCallFrames | WrappedCustomStackFrame;
 
 const WIDGET_CLASS_NAME = 'multiCallStackWidget';
@@ -137,6 +144,7 @@ export class CallStackWidget extends Disposable {
 				multipleSelectionSupport: false,
 				mouseSupport: false,
 				keyboardSupport: false,
+				setRowLineHeight: false,
 				accessibilityProvider: instantiationService.createInstance(StackAccessibilityProvider),
 			}
 		) as WorkbenchList<ListItem>);
@@ -157,6 +165,17 @@ export class CallStackWidget extends Disposable {
 		this.layoutEmitter.fire();
 	}
 
+	public collapseAll() {
+		transaction(tx => {
+			for (let i = 0; i < this.list.length; i++) {
+				const frame = this.list.element(i);
+				if (isFrameLike(frame)) {
+					frame.collapsed.set(true, tx);
+				}
+			}
+		});
+	}
+
 	private async loadFrame(replacing: SkippedCallFrames): Promise<void> {
 		if (!this.cts) {
 			return;
@@ -232,7 +251,7 @@ class StackDelegate implements IListVirtualDelegate<ListItem> {
 			return element.height.get();
 		}
 		if (element instanceof SkippedCallFrames) {
-			return 50;
+			return HEADER_HEIGHT;
 		}
 
 		assertNever(element);
@@ -287,7 +306,7 @@ const makeFrameElements = () => dom.h('div.multiCallStackFrame', [
 	])
 ]);
 
-const HEADER_HEIGHT = 32;
+const HEADER_HEIGHT = 24;
 
 interface IAbstractFrameRendererTemplateData {
 	container: HTMLElement;
@@ -356,9 +375,9 @@ abstract class AbstractFrameRenderer<T extends IAbstractFrameRendererTemplateDat
 			collapse.element.ariaExpanded = String(!collapsed);
 			elements.root.classList.toggle('collapsed', collapsed);
 		}));
-		elementStore.add(collapse.onDidClick(() => {
-			item.collapsed.set(!item.collapsed.get(), undefined);
-		}));
+		const toggleCollapse = () => item.collapsed.set(!item.collapsed.get(), undefined);
+		elementStore.add(collapse.onDidClick(toggleCollapse));
+		elementStore.add(dom.addDisposableListener(elements.title, 'click', toggleCollapse));
 	}
 
 	disposeElement(element: ListItem, index: number, templateData: T, height: number | undefined): void {
@@ -382,26 +401,33 @@ class FrameCodeRenderer extends AbstractFrameRenderer<IStackTemplateData> {
 		private readonly containingEditor: ICodeEditor | undefined,
 		private readonly onLayout: Event<void>,
 		@ITextModelService private readonly modelService: ITextModelService,
-		@ICodeEditorService private readonly editorService: ICodeEditorService,
 		@IInstantiationService instantiationService: IInstantiationService,
 	) {
 		super(instantiationService);
 	}
 
 	protected override finishRenderTemplate(data: IAbstractFrameRendererTemplateData): IStackTemplateData {
+		// override default e.g. language contributions, only allow users to click
+		// on code in the call stack to go to its source location
+		const contributions: IEditorContributionDescription[] = [{
+			id: ClickToLocationContribution.ID,
+			instantiation: EditorContributionInstantiation.BeforeFirstInteraction,
+			ctor: ClickToLocationContribution as EditorContributionCtor,
+		}];
+
 		const editor = this.containingEditor
 			? this.instantiationService.createInstance(
 				EmbeddedCodeEditorWidget,
 				data.elements.editor,
 				editorOptions,
-				{ isSimpleWidget: true },
+				{ isSimpleWidget: true, contributions },
 				this.containingEditor,
 			)
 			: this.instantiationService.createInstance(
 				CodeEditorWidget,
 				data.elements.editor,
 				editorOptions,
-				{ isSimpleWidget: true },
+				{ isSimpleWidget: true, contributions },
 			);
 
 		data.templateStore.add(editor);
@@ -423,20 +449,6 @@ class FrameCodeRenderer extends AbstractFrameRenderer<IStackTemplateData> {
 		const uri = item.source!;
 
 		template.label.element.setFile(uri);
-		template.elements.title.role = 'link';
-		elementStore.add(dom.addDisposableListener(template.elements.title, 'click', e => {
-			this.editorService.openCodeEditor({
-				resource: uri,
-				options: {
-					selection: Range.fromPositions({
-						column: item.column ?? 1,
-						lineNumber: item.line ?? 1,
-					}),
-					selectionRevealType: TextEditorSelectionRevealType.CenterIfOutsideViewport,
-				},
-			}, this.containingEditor || null, e.ctrlKey || e.metaKey);
-		}));
-
 		const cts = new CancellationTokenSource();
 		elementStore.add(toDisposable(() => cts.dispose(true)));
 		this.modelService.createModelReference(uri).then(reference => {
@@ -459,9 +471,13 @@ class FrameCodeRenderer extends AbstractFrameRenderer<IStackTemplateData> {
 			const next = editor.getContentHeight();
 			if (next !== prev) {
 				editor.layout({ width: container.clientWidth, height: next });
-				item.editorHeight.set(next, undefined);
 			}
+
+			item.editorHeight.set(next, undefined);
 		};
+		elementStore.add(editor.onDidChangeModelDecorations(layout));
+		elementStore.add(editor.onDidChangeModelContent(layout));
+		elementStore.add(editor.onDidChangeModelOptions(layout));
 		elementStore.add(this.onLayout(layout));
 		layout();
 	}
@@ -510,7 +526,8 @@ class FrameCodeRenderer extends AbstractFrameRenderer<IStackTemplateData> {
 }
 
 interface IMissingTemplateData {
-	container: HTMLElement;
+	elements: ReturnType<typeof makeFrameElements>;
+	label: ResourceLabel;
 }
 
 /** Renderer for a call frame that's missing a URI */
@@ -518,23 +535,33 @@ class MissingCodeRenderer implements IListRenderer<ListItem, IMissingTemplateDat
 	public static readonly templateId = 'm';
 	public readonly templateId = MissingCodeRenderer.templateId;
 
+	constructor(@IInstantiationService private readonly instantiationService: IInstantiationService) { }
+
 	renderTemplate(container: HTMLElement): IMissingTemplateData {
-		return { container };
+		const elements = makeFrameElements();
+		elements.root.classList.add('missing');
+		container.appendChild(elements.root);
+		const label = this.instantiationService.createInstance(ResourceLabel, elements.title, {});
+		return { elements, label };
 	}
 
-	renderElement(element: ListItem, index: number, templateData: IMissingTemplateData, height: number | undefined): void {
-		templateData.container.innerText = (element as CallStackFrame).name;
+	renderElement(element: ListItem, _index: number, templateData: IMissingTemplateData): void {
+		const cast = element as CallStackFrame;
+		templateData.label.element.setResource({
+			name: cast.name,
+			description: localize('stackFrameLocation', 'Line {0} column {1}', cast.line, cast.column),
+			range: { startLineNumber: cast.line, startColumn: cast.column, endColumn: cast.column, endLineNumber: cast.line },
+		}, {
+			icon: Codicon.fileBinary,
+		});
 	}
 
 	disposeTemplate(templateData: IMissingTemplateData): void {
-		dom.clearNode(templateData.container);
+		templateData.label.dispose();
+		templateData.elements.root.remove();
 	}
 }
 
-interface IMissingTemplateData {
-	container: HTMLElement;
-}
-
 /** Renderer for a call frame that's missing a URI */
 class CustomRenderer extends AbstractFrameRenderer<IAbstractFrameRendererTemplateData> {
 	public static readonly templateId = 'c';
@@ -617,6 +644,73 @@ class SkippedRenderer implements IListRenderer<ListItem, ISkippedTemplateData> {
 	}
 }
 
+/** A simple contribution that makes all data in the editor clickable to go to the location */
+class ClickToLocationContribution extends Disposable implements IEditorContribution {
+	public static readonly ID = 'clickToLocation';
+	private readonly linkDecorations: IEditorDecorationsCollection;
+	private current: { line: number; word: IWordAtPosition } | undefined;
+
+	constructor(
+		private readonly editor: ICodeEditor,
+		@IEditorService editorService: IEditorService,
+	) {
+		super();
+		this.linkDecorations = editor.createDecorationsCollection();
+		this._register(toDisposable(() => this.linkDecorations.clear()));
+
+		const clickLinkGesture = this._register(new ClickLinkGesture(editor));
+
+		this._register(clickLinkGesture.onMouseMoveOrRelevantKeyDown(([mouseEvent, keyboardEvent]) => {
+			this.onMove(mouseEvent);
+		}));
+		this._register(clickLinkGesture.onExecute((e) => {
+			const model = this.editor.getModel();
+			if (!this.current || !model) {
+				return;
+			}
+
+			editorService.openEditor({
+				resource: model.uri,
+				options: {
+					selection: Range.fromPositions(new Position(this.current.line, this.current.word.startColumn)),
+					selectionRevealType: TextEditorSelectionRevealType.CenterIfOutsideViewport,
+				},
+			}, e.hasSideBySideModifier ? SIDE_GROUP : undefined);
+		}));
+	}
+
+	private onMove(mouseEvent: ClickLinkMouseEvent) {
+		if (!mouseEvent.hasTriggerModifier) {
+			return this.clear();
+		}
+
+		const position = mouseEvent.target.position;
+		const word = position && this.editor.getModel()?.getWordAtPosition(position);
+		if (!word) {
+			return this.clear();
+		}
+
+		const prev = this.current?.word;
+		if (prev && prev.startColumn === word.startColumn && prev.endColumn === word.endColumn && prev.word === word.word) {
+			return;
+		}
+
+		this.current = { word, line: position.lineNumber };
+		this.linkDecorations.set([{
+			range: new Range(position.lineNumber, word.startColumn, position.lineNumber, word.endColumn),
+			options: {
+				description: 'call-stack-go-to-file-link',
+				inlineClassName: 'call-stack-go-to-file-link',
+			},
+		}]);
+	}
+
+	private clear() {
+		this.linkDecorations.clear();
+		this.current = undefined;
+	}
+}
+
 registerAction2(class extends Action2 {
 	constructor() {
 		super({
diff --git a/src/vs/workbench/contrib/debug/browser/debugAdapterManager.ts b/src/vs/workbench/contrib/debug/browser/debugAdapterManager.ts
index 423316207be..8e1fc260212 100644
--- a/src/vs/workbench/contrib/debug/browser/debugAdapterManager.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugAdapterManager.ts
@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { RunOnceScheduler } from 'vs/base/common/async';
 import { Emitter, Event } from 'vs/base/common/event';
 import { IJSONSchema, IJSONSchemaMap } from 'vs/base/common/jsonSchema';
 import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
@@ -13,13 +14,14 @@ import { IEditorModel } from 'vs/editor/common/editorCommon';
 import { ILanguageService } from 'vs/editor/common/languages/language';
 import { ITextModel } from 'vs/editor/common/model';
 import * as nls from 'vs/nls';
+import { IMenuService, MenuId, MenuItemAction } from 'vs/platform/actions/common/actions';
 import { ICommandService } from 'vs/platform/commands/common/commands';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { Extensions as JSONExtensions, IJSONContributionRegistry } from 'vs/platform/jsonschemas/common/jsonContributionRegistry';
-import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
+import { IQuickInputService, IQuickPickItem } from 'vs/platform/quickinput/common/quickInput';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
 import { Breakpoints } from 'vs/workbench/contrib/debug/common/breakpoints';
@@ -27,6 +29,7 @@ import { CONTEXT_DEBUGGERS_AVAILABLE, CONTEXT_DEBUG_EXTENSION_AVAILABLE, IAdapte
 import { Debugger } from 'vs/workbench/contrib/debug/common/debugger';
 import { breakpointsExtPoint, debuggersExtPoint, launchSchema, presentationSchema } from 'vs/workbench/contrib/debug/common/debugSchemas';
 import { TaskDefinitionRegistry } from 'vs/workbench/contrib/tasks/common/taskDefinitionRegistry';
+import { ITaskService } from 'vs/workbench/contrib/tasks/common/taskService';
 import { launchSchemaId } from 'vs/workbench/services/configuration/common/configuration';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
@@ -49,6 +52,7 @@ export class AdapterManager extends Disposable implements IAdapterManager {
 	private readonly _onDidDebuggersExtPointRead = new Emitter<void>();
 	private breakpointContributions: Breakpoints[] = [];
 	private debuggerWhenKeys = new Set<string>();
+	private taskLabels: string[] = [];
 
 	/** Extensions that were already active before any debugger activation events */
 	private earlyActivatedExtensions: Set<string> | undefined;
@@ -66,7 +70,9 @@ export class AdapterManager extends Disposable implements IAdapterManager {
 		@IContextKeyService private readonly contextKeyService: IContextKeyService,
 		@ILanguageService private readonly languageService: ILanguageService,
 		@IDialogService private readonly dialogService: IDialogService,
-		@ILifecycleService private readonly lifecycleService: ILifecycleService
+		@ILifecycleService private readonly lifecycleService: ILifecycleService,
+		@ITaskService private readonly tasksService: ITaskService,
+		@IMenuService private readonly menuService: IMenuService,
 	) {
 		super();
 		this.adapterDescriptorFactories = [];
@@ -85,12 +91,22 @@ export class AdapterManager extends Disposable implements IAdapterManager {
 		this._register(this.onDidDebuggersExtPointRead(() => {
 			this.debugExtensionsAvailable.set(this.debuggers.length > 0);
 		}));
+
+		// generous debounce since this will end up calling `resolveTask` internally
+		const updateTaskScheduler = this._register(new RunOnceScheduler(() => this.updateTaskLabels(), 5000));
+
+		this._register(Event.any(tasksService.onDidChangeTaskConfig, tasksService.onDidChangeTaskProviders)(() => {
+			updateTaskScheduler.cancel();
+			updateTaskScheduler.schedule();
+		}));
 		this.lifecycleService.when(LifecyclePhase.Eventually)
 			.then(() => this.debugExtensionsAvailable.set(this.debuggers.length > 0)); // If no extensions with a debugger contribution are loaded
 
 		this._register(delegate.onDidNewSession(s => {
 			this.usedDebugTypes.add(s.configuration.type);
 		}));
+
+		updateTaskScheduler.schedule();
 	}
 
 	private registerListeners(): void {
@@ -137,7 +153,14 @@ export class AdapterManager extends Disposable implements IAdapterManager {
 		});
 	}
 
-	private updateDebugAdapterSchema(): void {
+	private updateTaskLabels() {
+		this.tasksService.getKnownTasks().then(tasks => {
+			this.taskLabels = tasks.map(task => task._label);
+			this.updateDebugAdapterSchema();
+		});
+	}
+
+	private updateDebugAdapterSchema() {
 		// update the schema to include all attributes, snippets and types from extensions.
 		const items = (<IJSONSchema>launchSchema.properties!['configurations'].items);
 		const taskSchema = TaskDefinitionRegistry.getJsonSchema();
@@ -160,7 +183,8 @@ export class AdapterManager extends Disposable implements IAdapterManager {
 						}],
 						default: '',
 						defaultSnippets: [{ body: { task: '', type: '' } }],
-						description: nls.localize('debugPrelaunchTask', "Task to run before debug session starts.")
+						description: nls.localize('debugPrelaunchTask', "Task to run before debug session starts."),
+						examples: this.taskLabels,
 					},
 					'postDebugTask': {
 						anyOf: [taskSchema, {
@@ -168,7 +192,8 @@ export class AdapterManager extends Disposable implements IAdapterManager {
 						}],
 						default: '',
 						defaultSnippets: [{ body: { task: '', type: '' } }],
-						description: nls.localize('debugPostDebugTask', "Task to run after debug session ends.")
+						description: nls.localize('debugPostDebugTask', "Task to run after debug session ends."),
+						examples: this.taskLabels,
 					},
 					'presentation': presentationSchema,
 					'internalConsoleOptions': INTERNAL_CONSOLE_OPTIONS_SCHEMA,
@@ -382,7 +407,7 @@ export class AdapterManager extends Disposable implements IAdapterManager {
 			}
 		});
 
-		const picks: { label: string; debugger?: Debugger; type?: string }[] = [];
+		const picks: ({ label: string; debugger?: Debugger; type?: string } | MenuItemAction)[] = [];
 		if (suggestedCandidates.length > 0) {
 			picks.push(
 				{ type: 'separator', label: nls.localize('suggestedDebuggers', "Suggested") },
@@ -401,11 +426,20 @@ export class AdapterManager extends Disposable implements IAdapterManager {
 			{ type: 'separator', label: '' },
 			{ label: languageLabel ? nls.localize('installLanguage', "Install an extension for {0}...", languageLabel) : nls.localize('installExt', "Install extension...") });
 
+		const contributed = this.menuService.getMenuActions(MenuId.DebugCreateConfiguration, this.contextKeyService);
+		for (const [, action] of contributed) {
+			for (const item of action) {
+				picks.push(item);
+			}
+		}
 		const placeHolder = nls.localize('selectDebug', "Select debugger");
-		return this.quickInputService.pick<{ label: string; debugger?: Debugger }>(picks, { activeItem: picks[0], placeHolder })
-			.then(picked => {
-				if (picked && picked.debugger) {
+		return this.quickInputService.pick<{ label: string; debugger?: Debugger } | IQuickPickItem>(picks, { activeItem: picks[0], placeHolder })
+			.then(async picked => {
+				if (picked && 'debugger' in picked && picked.debugger) {
 					return picked.debugger;
+				} else if (picked instanceof MenuItemAction) {
+					picked.run();
+					return;
 				}
 				if (picked) {
 					this.commandService.executeCommand('debug.installAdditionalDebuggers', languageLabel);
diff --git a/src/vs/workbench/contrib/debug/browser/debugCommands.ts b/src/vs/workbench/contrib/debug/browser/debugCommands.ts
index 7db66075458..b657df873d4 100644
--- a/src/vs/workbench/contrib/debug/browser/debugCommands.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugCommands.ts
@@ -36,6 +36,8 @@ import { showLoadedScriptMenu } from 'vs/workbench/contrib/debug/common/loadedSc
 import { showDebugSessionMenu } from 'vs/workbench/contrib/debug/browser/debugSessionPicker';
 import { TEXT_FILE_EDITOR_ID } from 'vs/workbench/contrib/files/common/files';
 import { ILocalizedString } from 'vs/platform/action/common/action';
+import { CONTEXT_IN_CHAT_SESSION } from 'vs/workbench/contrib/chat/common/chatContextKeys';
+import { DisposableStore } from 'vs/base/common/lifecycle';
 
 export const ADD_CONFIGURATION_ID = 'debug.addConfiguration';
 export const TOGGLE_INLINE_BREAKPOINT_ID = 'editor.debug.action.toggleInlineBreakpoint';
@@ -568,11 +570,12 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 			target: DebugProtocol.StepInTarget;
 		}
 
-		const qp = quickInputService.createQuickPick<ITargetItem>();
+		const disposables = new DisposableStore();
+		const qp = disposables.add(quickInputService.createQuickPick<ITargetItem>());
 		qp.busy = true;
 		qp.show();
 
-		qp.onDidChangeActive(([item]) => {
+		disposables.add(qp.onDidChangeActive(([item]) => {
 			if (codeEditor && item && item.target.line !== undefined) {
 				codeEditor.revealLineInCenterIfOutsideViewport(item.target.line);
 				codeEditor.setSelection({
@@ -582,15 +585,15 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 					endColumn: item.target.endColumn || item.target.column || 1,
 				});
 			}
-		});
+		}));
 
-		qp.onDidAccept(() => {
+		disposables.add(qp.onDidAccept(() => {
 			if (qp.activeItems.length) {
 				session.stepIn(frame.thread.threadId, qp.activeItems[0].target.id);
 			}
-		});
+		}));
 
-		qp.onDidHide(() => qp.dispose());
+		disposables.add(qp.onDidHide(() => disposables.dispose()));
 
 		session.stepInTargets(frame.frameId).then(targets => {
 			qp.busy = false;
@@ -1009,7 +1012,11 @@ MenuRegistry.appendMenuItem(MenuId.EditorContext, {
 		title: nls.localize('addInlineBreakpoint', "Add Inline Breakpoint"),
 		category: DEBUG_COMMAND_CATEGORY
 	},
-	when: ContextKeyExpr.and(CONTEXT_IN_DEBUG_MODE, PanelFocusContext.toNegated(), EditorContextKeys.editorTextFocus),
+	when: ContextKeyExpr.and(
+		CONTEXT_IN_DEBUG_MODE,
+		PanelFocusContext.toNegated(),
+		EditorContextKeys.editorTextFocus,
+		CONTEXT_IN_CHAT_SESSION.toNegated()),
 	group: 'debug',
 	order: 1
 });
diff --git a/src/vs/workbench/contrib/debug/browser/debugConfigurationManager.ts b/src/vs/workbench/contrib/debug/browser/debugConfigurationManager.ts
index 7151a0ffa5d..ed6d6ecef5f 100644
--- a/src/vs/workbench/contrib/debug/browser/debugConfigurationManager.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugConfigurationManager.ts
@@ -20,6 +20,7 @@ import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/c
 import { IFileService } from 'vs/platform/files/common/files';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IJSONContributionRegistry, Extensions as JSONExtensions } from 'vs/platform/jsonschemas/common/jsonContributionRegistry';
+import { ILogService } from 'vs/platform/log/common/log';
 import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
@@ -72,7 +73,8 @@ export class ConfigurationManager implements IConfigurationManager {
 		@IExtensionService private readonly extensionService: IExtensionService,
 		@IHistoryService private readonly historyService: IHistoryService,
 		@IUriIdentityService private readonly uriIdentityService: IUriIdentityService,
-		@IContextKeyService contextKeyService: IContextKeyService
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@ILogService private readonly logService: ILogService,
 	) {
 		this.configProviders = [];
 		this.toDispose = [this._onDidChangeConfigurationProviders];
@@ -257,7 +259,18 @@ export class ConfigurationManager implements IConfigurationManager {
 						disposables.add(input.onDidHide(() => resolve(undefined)));
 					});
 
-					const nestedPicks = await Promise.all(picks);
+					let nestedPicks: IDynamicPickItem[][];
+					try {
+						// This await invokes the extension providers, which might fail due to several reasons,
+						// therefore we gate this logic under a try/catch to prevent leaving the Debug Tab
+						// selector in a borked state.
+						nestedPicks = await Promise.all(picks);
+					} catch (err) {
+						this.logService.error(err);
+						disposables.dispose();
+						return;
+					}
+
 					const items = nestedPicks.flat();
 
 					input.items = items;
diff --git a/src/vs/workbench/contrib/debug/browser/debugEditorActions.ts b/src/vs/workbench/contrib/debug/browser/debugEditorActions.ts
index 4f613027aaf..63792065199 100644
--- a/src/vs/workbench/contrib/debug/browser/debugEditorActions.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugEditorActions.ts
@@ -23,6 +23,7 @@ import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation
 import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
 import { PanelFocusContext } from 'vs/workbench/common/contextkeys';
+import { CONTEXT_IN_CHAT_SESSION } from 'vs/workbench/contrib/chat/common/chatContextKeys';
 import { openBreakpointSource } from 'vs/workbench/contrib/debug/browser/breakpointsView';
 import { DisassemblyView } from 'vs/workbench/contrib/debug/browser/disassemblyView';
 import { Repl } from 'vs/workbench/contrib/debug/browser/repl';
@@ -304,7 +305,12 @@ export class RunToCursorAction extends EditorAction {
 			id: RunToCursorAction.ID,
 			label: RunToCursorAction.LABEL.value,
 			alias: 'Debug: Run to Cursor',
-			precondition: ContextKeyExpr.and(CONTEXT_DEBUGGERS_AVAILABLE, PanelFocusContext.toNegated(), ContextKeyExpr.or(EditorContextKeys.editorTextFocus, CONTEXT_DISASSEMBLY_VIEW_FOCUS)),
+			precondition: ContextKeyExpr.and(
+				CONTEXT_DEBUGGERS_AVAILABLE,
+				PanelFocusContext.toNegated(),
+				ContextKeyExpr.or(EditorContextKeys.editorTextFocus, CONTEXT_DISASSEMBLY_VIEW_FOCUS),
+				CONTEXT_IN_CHAT_SESSION.negate()
+			),
 			contextMenuOpts: {
 				group: 'debug',
 				order: 2,
@@ -345,7 +351,10 @@ export class SelectionToReplAction extends EditorAction {
 			id: SelectionToReplAction.ID,
 			label: SelectionToReplAction.LABEL.value,
 			alias: 'Debug: Evaluate in Console',
-			precondition: ContextKeyExpr.and(CONTEXT_IN_DEBUG_MODE, EditorContextKeys.editorTextFocus),
+			precondition: ContextKeyExpr.and(
+				CONTEXT_IN_DEBUG_MODE,
+				EditorContextKeys.editorTextFocus,
+				CONTEXT_IN_CHAT_SESSION.negate()),
 			contextMenuOpts: {
 				group: 'debug',
 				order: 0
@@ -385,7 +394,10 @@ export class SelectionToWatchExpressionsAction extends EditorAction {
 			id: SelectionToWatchExpressionsAction.ID,
 			label: SelectionToWatchExpressionsAction.LABEL.value,
 			alias: 'Debug: Add to Watch',
-			precondition: ContextKeyExpr.and(CONTEXT_IN_DEBUG_MODE, EditorContextKeys.editorTextFocus),
+			precondition: ContextKeyExpr.and(
+				CONTEXT_IN_DEBUG_MODE,
+				EditorContextKeys.editorTextFocus,
+				CONTEXT_IN_CHAT_SESSION.negate()),
 			contextMenuOpts: {
 				group: 'debug',
 				order: 1
diff --git a/src/vs/workbench/contrib/debug/browser/debugEditorContribution.ts b/src/vs/workbench/contrib/debug/browser/debugEditorContribution.ts
index 5e3d5e9d583..96c0952b0f2 100644
--- a/src/vs/workbench/contrib/debug/browser/debugEditorContribution.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugEditorContribution.ts
@@ -37,7 +37,7 @@ import { IModelDeltaDecoration, ITextModel, InjectedTextCursorStops } from 'vs/e
 import { IFeatureDebounceInformation, ILanguageFeatureDebounceService } from 'vs/editor/common/services/languageFeatureDebounce';
 import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
 import { IModelService } from 'vs/editor/common/services/model';
-import { HoverController } from 'vs/editor/contrib/hover/browser/hoverController';
+import { ContentHoverController } from 'vs/editor/contrib/hover/browser/contentHoverController2';
 import { HoverStartMode, HoverStartSource } from 'vs/editor/contrib/hover/browser/hoverOperation';
 import * as nls from 'vs/nls';
 import { CommandsRegistry, ICommandService } from 'vs/platform/commands/common/commands';
@@ -375,7 +375,7 @@ export class DebugEditorContribution implements IDebugEditorContribution {
 			return;
 		}
 
-		const hoverController = this.editor.getContribution<HoverController>(HoverController.ID);
+		const hoverController = this.editor.getContribution<ContentHoverController>(ContentHoverController.ID);
 		hoverController?.hideContentHover();
 
 		this.editor.updateOptions({ hover: { enabled: false } });
@@ -389,7 +389,7 @@ export class DebugEditorContribution implements IDebugEditorContribution {
 	}
 
 	private showEditorHover(position: Position, focus: boolean) {
-		const hoverController = this.editor.getContribution<HoverController>(HoverController.ID);
+		const hoverController = this.editor.getContribution<ContentHoverController>(ContentHoverController.ID);
 		const range = new Range(position.lineNumber, position.column, position.lineNumber, position.column);
 		// enable the editor hover, otherwise the content controller will see it
 		// as disabled and hide it on the first mouse move (#193149)
diff --git a/src/vs/workbench/contrib/debug/browser/debugHover.ts b/src/vs/workbench/contrib/debug/browser/debugHover.ts
index 3b2bf385639..514c22919b0 100644
--- a/src/vs/workbench/contrib/debug/browser/debugHover.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugHover.ts
@@ -83,7 +83,11 @@ export class DebugHoverWidget implements IContentWidget {
 	// editor.IContentWidget.allowEditorOverflow
 	readonly allowEditorOverflow = true;
 
-	private _isVisible: boolean;
+	// todo@connor4312: move more properties that are only valid while a hover
+	// is happening into `_isVisible`
+	private _isVisible?: {
+		store: lifecycle.DisposableStore;
+	};
 	private safeTriangle?: dom.SafeTriangle;
 	private showCancellationSource?: CancellationTokenSource;
 	private domNode!: HTMLElement;
@@ -117,7 +121,6 @@ export class DebugHoverWidget implements IContentWidget {
 	) {
 		this.toDispose = [];
 
-		this._isVisible = false;
 		this.showAtPosition = null;
 		this.positionPreference = [ContentWidgetPositionPreference.ABOVE, ContentWidgetPositionPreference.BELOW];
 		this.debugHoverComputer = this.instantiationService.createInstance(DebugHoverComputer, this.editor);
@@ -215,7 +218,7 @@ export class DebugHoverWidget implements IContentWidget {
 	}
 
 	isVisible(): boolean {
-		return this._isVisible;
+		return !!this._isVisible;
 	}
 
 	willBeVisible(): boolean {
@@ -239,7 +242,7 @@ export class DebugHoverWidget implements IContentWidget {
 	}
 
 	async showAt(position: Position, focus: boolean, mouseEvent?: IMouseEvent): Promise<void | ShowDebugHoverResult> {
-		this.showCancellationSource?.cancel();
+		this.showCancellationSource?.dispose(true);
 		const cancellationSource = this.showCancellationSource = new CancellationTokenSource();
 		const session = this.debugService.getViewModel().focusedSession;
 
@@ -293,14 +296,16 @@ export class DebugHoverWidget implements IContentWidget {
 		}
 
 		this.showAtPosition = position;
-		this._isVisible = true;
+		const store = new lifecycle.DisposableStore();
+		this._isVisible = { store };
 
 		if (!expression.hasChildren) {
 			this.complexValueContainer.hidden = true;
 			this.valueContainer.hidden = false;
-			renderExpressionValue(expression, this.valueContainer, {
+			renderExpressionValue(store, expression, this.valueContainer, {
 				showChanged: false,
-				colorize: true
+				colorize: true,
+				hover: false,
 			}, this.hoverService);
 			this.valueContainer.title = '';
 			this.editor.layoutContentWidget(this);
@@ -381,7 +386,7 @@ export class DebugHoverWidget implements IContentWidget {
 
 	hide(): void {
 		if (this.showCancellationSource) {
-			this.showCancellationSource.cancel();
+			this.showCancellationSource.dispose(true);
 			this.showCancellationSource = undefined;
 		}
 
@@ -392,7 +397,9 @@ export class DebugHoverWidget implements IContentWidget {
 		if (dom.isAncestorOfActiveElement(this.domNode)) {
 			this.editor.focus();
 		}
-		this._isVisible = false;
+		this._isVisible.store.dispose();
+		this._isVisible = undefined;
+
 		this.highlightDecorations.clear();
 		this.editor.layoutContentWidget(this);
 		this.positionPreference = [ContentWidgetPositionPreference.ABOVE, ContentWidgetPositionPreference.BELOW];
diff --git a/src/vs/workbench/contrib/debug/browser/debugSession.ts b/src/vs/workbench/contrib/debug/browser/debugSession.ts
index b07c18d4756..453bcd86f10 100644
--- a/src/vs/workbench/contrib/debug/browser/debugSession.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugSession.ts
@@ -29,7 +29,7 @@ import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity'
 import { IWorkspaceContextService, IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
 import { ViewContainerLocation } from 'vs/workbench/common/views';
 import { RawDebugSession } from 'vs/workbench/contrib/debug/browser/rawDebugSession';
-import { AdapterEndEvent, IBreakpoint, IConfig, IDataBreakpoint, IDataBreakpointInfoResponse, IDebugConfiguration, IDebugService, IDebugSession, IDebugSessionOptions, IDebugger, IExceptionBreakpoint, IExceptionInfo, IFunctionBreakpoint, IInstructionBreakpoint, IMemoryRegion, IRawModelUpdate, IRawStoppedDetails, IReplElement, IStackFrame, IThread, LoadedSourceEvent, State, VIEWLET_ID, isFrameDeemphasized } from 'vs/workbench/contrib/debug/common/debug';
+import { AdapterEndEvent, IBreakpoint, IConfig, IDataBreakpoint, IDataBreakpointInfoResponse, IDebugConfiguration, IDebugLocationReferenced, IDebugService, IDebugSession, IDebugSessionOptions, IDebugger, IExceptionBreakpoint, IExceptionInfo, IFunctionBreakpoint, IInstructionBreakpoint, IMemoryRegion, IRawModelUpdate, IRawStoppedDetails, IReplElement, IStackFrame, IThread, LoadedSourceEvent, State, VIEWLET_ID, isFrameDeemphasized } from 'vs/workbench/contrib/debug/common/debug';
 import { DebugCompoundRoot } from 'vs/workbench/contrib/debug/common/debugCompoundRoot';
 import { DebugModel, ExpressionContainer, MemoryRegion, Thread } from 'vs/workbench/contrib/debug/common/debugModel';
 import { Source } from 'vs/workbench/contrib/debug/common/debugSource';
@@ -906,6 +906,20 @@ export class DebugSession implements IDebugSession, IDisposable {
 		return this.raw.writeMemory({ memoryReference, offset, allowPartial, data });
 	}
 
+	async resolveLocationReference(locationReference: number): Promise<IDebugLocationReferenced> {
+		if (!this.raw) {
+			throw new Error(localize('noDebugAdapter', "No debugger available, can not send '{0}'", 'locations'));
+		}
+
+		const location = await this.raw.locations({ locationReference });
+		if (!location?.body) {
+			throw new Error(localize('noDebugAdapter', "No debugger available, can not send '{0}'", 'locations'));
+		}
+
+		const source = this.getSource(location.body.source);
+		return { column: 1, ...location.body, source };
+	}
+
 	//---- threads
 
 	getThread(threadId: number): Thread | undefined {
@@ -1374,7 +1388,7 @@ export class DebugSession implements IDebugSession, IDisposable {
 					}
 
 					const focusedStackFrame = this.debugService.getViewModel().focusedStackFrame;
-					if (!focusedStackFrame || !isFrameDeemphasized(focusedStackFrame)) {
+					if (!focusedStackFrame || isFrameDeemphasized(focusedStackFrame)) {
 						// The top stack frame can be deemphesized so try to focus again #68616
 						focus();
 					}
diff --git a/src/vs/workbench/contrib/debug/browser/debugSessionPicker.ts b/src/vs/workbench/contrib/debug/browser/debugSessionPicker.ts
index 74ca56b6439..bc2417b216d 100644
--- a/src/vs/workbench/contrib/debug/browser/debugSessionPicker.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugSessionPicker.ts
@@ -21,7 +21,7 @@ export async function showDebugSessionMenu(accessor: ServicesAccessor, selectAnd
 	const commandService = accessor.get(ICommandService);
 
 	const localDisposableStore = new DisposableStore();
-	const quickPick = quickInputService.createQuickPick<IPickerDebugItem>();
+	const quickPick = quickInputService.createQuickPick<IPickerDebugItem>({ useSeparators: true });
 	localDisposableStore.add(quickPick);
 	quickPick.matchOnLabel = quickPick.matchOnDescription = quickPick.matchOnDetail = quickPick.sortByLabel = false;
 	quickPick.placeholder = nls.localize('moveFocusedView.selectView', 'Search debug sessions by name');
diff --git a/src/vs/workbench/contrib/debug/browser/debugTaskRunner.ts b/src/vs/workbench/contrib/debug/browser/debugTaskRunner.ts
index 15de8bc4e40..d9c1fdc9217 100644
--- a/src/vs/workbench/contrib/debug/browser/debugTaskRunner.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugTaskRunner.ts
@@ -3,35 +3,29 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
+import { Action } from 'vs/base/common/actions';
+import { disposableTimeout } from 'vs/base/common/async';
+import { CancellationTokenSource } from 'vs/base/common/cancellation';
+import { createErrorWithActions } from 'vs/base/common/errorMessage';
+import { Emitter, Event } from 'vs/base/common/event';
+import { DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
 import severity from 'vs/base/common/severity';
-import { Event } from 'vs/base/common/event';
-import { Markers } from 'vs/workbench/contrib/markers/common/markers';
-import { ITaskService, ITaskSummary } from 'vs/workbench/contrib/tasks/common/taskService';
+import * as nls from 'vs/nls';
+import { ICommandService } from 'vs/platform/commands/common/commands';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IWorkspaceFolder, IWorkspace } from 'vs/platform/workspace/common/workspace';
-import { ITaskEvent, TaskEventKind, ITaskIdentifier, Task } from 'vs/workbench/contrib/tasks/common/tasks';
 import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
 import { IMarkerService, MarkerSeverity } from 'vs/platform/markers/common/markers';
-import { IDebugConfiguration } from 'vs/workbench/contrib/debug/common/debug';
-import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
+import { IProgressService, ProgressLocation } from 'vs/platform/progress/common/progress';
 import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { createErrorWithActions } from 'vs/base/common/errorMessage';
-import { Action } from 'vs/base/common/actions';
+import { IWorkspace, IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
 import { DEBUG_CONFIGURE_COMMAND_ID, DEBUG_CONFIGURE_LABEL } from 'vs/workbench/contrib/debug/browser/debugCommands';
-import { ICommandService } from 'vs/platform/commands/common/commands';
+import { IDebugConfiguration } from 'vs/workbench/contrib/debug/common/debug';
+import { Markers } from 'vs/workbench/contrib/markers/common/markers';
+import { ConfiguringTask, CustomTask, ITaskEvent, ITaskIdentifier, Task, TaskEventKind } from 'vs/workbench/contrib/tasks/common/tasks';
+import { ITaskService, ITaskSummary } from 'vs/workbench/contrib/tasks/common/taskService';
+import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
 
-function once(match: (e: ITaskEvent) => boolean, event: Event<ITaskEvent>): Event<ITaskEvent> {
-	return (listener, thisArgs = null, disposables?) => {
-		const result = event(e => {
-			if (match(e)) {
-				result.dispose();
-				return listener.call(thisArgs, e);
-			}
-		}, null, disposables);
-		return result;
-	};
-}
+const onceFilter = (event: Event<ITaskEvent>, filter: (e: ITaskEvent) => boolean) => Event.once(Event.filter(event, filter));
 
 export const enum TaskRunResult {
 	Failure,
@@ -39,10 +33,17 @@ export const enum TaskRunResult {
 }
 
 const DEBUG_TASK_ERROR_CHOICE_KEY = 'debug.taskerrorchoice';
+const ABORT_LABEL = nls.localize('abort', "Abort");
+const DEBUG_ANYWAY_LABEL = nls.localize({ key: 'debugAnyway', comment: ['&& denotes a mnemonic'] }, "&&Debug Anyway");
+const DEBUG_ANYWAY_LABEL_NO_MEMO = nls.localize('debugAnywayNoMemo', "Debug Anyway");
 
-export class DebugTaskRunner {
+interface IRunnerTaskSummary extends ITaskSummary {
+	cancelled?: boolean;
+}
+
+export class DebugTaskRunner implements IDisposable {
 
-	private canceled = false;
+	private globalCancellation = new CancellationTokenSource();
 
 	constructor(
 		@ITaskService private readonly taskService: ITaskService,
@@ -51,18 +52,26 @@ export class DebugTaskRunner {
 		@IViewsService private readonly viewsService: IViewsService,
 		@IDialogService private readonly dialogService: IDialogService,
 		@IStorageService private readonly storageService: IStorageService,
-		@ICommandService private readonly commandService: ICommandService
+		@ICommandService private readonly commandService: ICommandService,
+		@IProgressService private readonly progressService: IProgressService,
 	) { }
 
 	cancel(): void {
-		this.canceled = true;
+		this.globalCancellation.dispose(true);
+		this.globalCancellation = new CancellationTokenSource();
 	}
 
-	async runTaskAndCheckErrors(root: IWorkspaceFolder | IWorkspace | undefined, taskId: string | ITaskIdentifier | undefined): Promise<TaskRunResult> {
+	public dispose(): void {
+		this.globalCancellation.dispose(true);
+	}
+
+	async runTaskAndCheckErrors(
+		root: IWorkspaceFolder | IWorkspace | undefined,
+		taskId: string | ITaskIdentifier | undefined,
+	): Promise<TaskRunResult> {
 		try {
-			this.canceled = false;
-			const taskSummary = await this.runTask(root, taskId);
-			if (this.canceled || (taskSummary && taskSummary.exitCode === undefined)) {
+			const taskSummary = await this.runTask(root, taskId, this.globalCancellation.token);
+			if (taskSummary && (taskSummary.exitCode === undefined || taskSummary.cancelled)) {
 				// User canceled, either debugging, or the prelaunch task
 				return TaskRunResult.Failure;
 			}
@@ -101,7 +110,7 @@ export class DebugTaskRunner {
 				message,
 				buttons: [
 					{
-						label: nls.localize({ key: 'debugAnyway', comment: ['&& denotes a mnemonic'] }, "&&Debug Anyway"),
+						label: DEBUG_ANYWAY_LABEL,
 						run: () => DebugChoice.DebugAnyway
 					},
 					{
@@ -110,7 +119,7 @@ export class DebugTaskRunner {
 					}
 				],
 				cancelButton: {
-					label: nls.localize('abort', "Abort"),
+					label: ABORT_LABEL,
 					run: () => DebugChoice.Cancel
 				},
 				checkbox: {
@@ -182,7 +191,7 @@ export class DebugTaskRunner {
 		}
 	}
 
-	async runTask(root: IWorkspace | IWorkspaceFolder | undefined, taskId: string | ITaskIdentifier | undefined): Promise<ITaskSummary | null> {
+	async runTask(root: IWorkspace | IWorkspaceFolder | undefined, taskId: string | ITaskIdentifier | undefined, token = this.globalCancellation.token): Promise<IRunnerTaskSummary | null> {
 		if (!taskId) {
 			return Promise.resolve(null);
 		}
@@ -200,23 +209,42 @@ export class DebugTaskRunner {
 
 		// If a task is missing the problem matcher the promise will never complete, so we need to have a workaround #35340
 		let taskStarted = false;
+		const store = new DisposableStore();
 		const getTaskKey = (t: Task) => t.getKey() ?? t.getMapKey();
 		const taskKey = getTaskKey(task);
-		const inactivePromise: Promise<ITaskSummary | null> = new Promise((c) => once(e => {
-			// When a task isBackground it will go inactive when it is safe to launch.
-			// But when a background task is terminated by the user, it will also fire an inactive event.
-			// This means that we will not get to see the real exit code from running the task (undefined when terminated by the user).
-			// Catch the ProcessEnded event here, which occurs before inactive, and capture the exit code to prevent this.
-			return (e.kind === TaskEventKind.Inactive
-				|| (e.kind === TaskEventKind.ProcessEnded && e.exitCode === undefined))
-				&& getTaskKey(e.__task) === taskKey;
-		}, this.taskService.onDidStateChange)(e => {
-			taskStarted = true;
-			c(e.kind === TaskEventKind.ProcessEnded ? { exitCode: e.exitCode } : null);
-		}));
-
-		const promise: Promise<ITaskSummary | null> = this.taskService.getActiveTasks().then(async (tasks): Promise<ITaskSummary | null> => {
+		const inactivePromise: Promise<ITaskSummary | null> = new Promise((resolve) => store.add(
+			onceFilter(this.taskService.onDidStateChange, e => {
+				// When a task isBackground it will go inactive when it is safe to launch.
+				// But when a background task is terminated by the user, it will also fire an inactive event.
+				// This means that we will not get to see the real exit code from running the task (undefined when terminated by the user).
+				// Catch the ProcessEnded event here, which occurs before inactive, and capture the exit code to prevent this.
+				return (e.kind === TaskEventKind.Inactive
+					|| (e.kind === TaskEventKind.ProcessEnded && e.exitCode === undefined))
+					&& getTaskKey(e.__task) === taskKey;
+			})(e => {
+				taskStarted = true;
+				resolve(e.kind === TaskEventKind.ProcessEnded ? { exitCode: e.exitCode } : null);
+			}),
+		));
+
+		store.add(
+			onceFilter(this.taskService.onDidStateChange, e => ((e.kind === TaskEventKind.Active) || (e.kind === TaskEventKind.DependsOnStarted)) && getTaskKey(e.__task) === taskKey
+			)(() => {
+				// Task is active, so everything seems to be fine, no need to prompt after 10 seconds
+				// Use case being a slow running task should not be prompted even though it takes more than 10 seconds
+				taskStarted = true;
+			})
+		);
+
+		const didAcquireInput = store.add(new Emitter<void>());
+		store.add(onceFilter(
+			this.taskService.onDidStateChange,
+			e => (e.kind === TaskEventKind.AcquiredInput) && getTaskKey(e.__task) === taskKey
+		)(() => didAcquireInput.fire()));
+
+		const taskDonePromise: Promise<ITaskSummary | null> = this.taskService.getActiveTasks().then(async (tasks): Promise<ITaskSummary | null> => {
 			if (tasks.find(t => getTaskKey(t) === taskKey)) {
+				didAcquireInput.fire();
 				// Check that the task isn't busy and if it is, wait for it
 				const busyTasks = await this.taskService.getBusyTasks();
 				if (busyTasks.find(t => getTaskKey(t) === taskKey)) {
@@ -226,11 +254,7 @@ export class DebugTaskRunner {
 				// task is already running and isn't busy - nothing to do.
 				return Promise.resolve(null);
 			}
-			once(e => ((e.kind === TaskEventKind.Active) || (e.kind === TaskEventKind.DependsOnStarted)) && getTaskKey(e.__task) === taskKey, this.taskService.onDidStateChange)(() => {
-				// Task is active, so everything seems to be fine, no need to prompt after 10 seconds
-				// Use case being a slow running task should not be prompted even though it takes more than 10 seconds
-				taskStarted = true;
-			});
+
 			const taskPromise = this.taskService.run(task);
 			if (task.configurationProperties.isBackground) {
 				return inactivePromise;
@@ -239,28 +263,59 @@ export class DebugTaskRunner {
 			return taskPromise.then(x => x ?? null);
 		});
 
-		return new Promise((c, e) => {
-			const waitForInput = new Promise<void>(resolve => once(e => (e.kind === TaskEventKind.AcquiredInput) && getTaskKey(e.__task) === taskKey, this.taskService.onDidStateChange)(() => {
-				resolve();
-			}));
-
-			promise.then(result => {
+		const result = new Promise<IRunnerTaskSummary | null>((resolve, reject) => {
+			taskDonePromise.then(result => {
 				taskStarted = true;
-				c(result);
-			}, error => e(error));
+				resolve(result);
+			}, error => reject(error));
+
+			store.add(token.onCancellationRequested(() => {
+				resolve({ exitCode: undefined, cancelled: true });
+				this.taskService.terminate(task).catch(() => { });
+			}));
 
-			waitForInput.then(() => {
+			// Start the timeouts once a terminal has been acquired
+			store.add(didAcquireInput.event(() => {
 				const waitTime = task.configurationProperties.isBackground ? 5000 : 10000;
 
-				setTimeout(() => {
+				// Error shown if there's a background task with no problem matcher that doesn't exit quickly
+				store.add(disposableTimeout(() => {
 					if (!taskStarted) {
-						const errorMessage = typeof taskId === 'string'
-							? nls.localize('taskNotTrackedWithTaskId', "The task '{0}' cannot be tracked. Make sure to have a problem matcher defined.", taskId)
-							: nls.localize('taskNotTracked', "The task '{0}' cannot be tracked. Make sure to have a problem matcher defined.", JSON.stringify(taskId));
-						e({ severity: severity.Error, message: errorMessage });
+						const errorMessage = nls.localize('taskNotTracked', "The task '{0}' has not exited and doesn't have a 'problemMatcher' defined. Make sure to define a problem matcher for watch tasks.", typeof taskId === 'string' ? taskId : JSON.stringify(taskId));
+						reject({ severity: severity.Error, message: errorMessage });
 					}
-				}, waitTime);
-			});
+				}, waitTime));
+
+				// Notification shown on any task taking a while to resolve
+				store.add(disposableTimeout(() => {
+					const message = nls.localize('runningTask', "Waiting for preLaunchTask '{0}'...", task.configurationProperties.name);
+					const buttons = [DEBUG_ANYWAY_LABEL_NO_MEMO, ABORT_LABEL];
+					const canConfigure = task instanceof CustomTask || task instanceof ConfiguringTask;
+					if (canConfigure) {
+						buttons.splice(1, 0, nls.localize('configureTask', "Configure Task"));
+					}
+
+					this.progressService.withProgress(
+						{ location: ProgressLocation.Notification, title: message, buttons },
+						() => result.catch(() => { }),
+						(choice) => {
+							if (choice === undefined) {
+								// no-op, keep waiting
+							} else if (choice === 0) { // debug anyway
+								resolve({ exitCode: 0 });
+							} else { // abort or configure
+								resolve({ exitCode: undefined, cancelled: true });
+								this.taskService.terminate(task).catch(() => { });
+								if (canConfigure && choice === 1) { // configure
+									this.taskService.openConfig(task as CustomTask);
+								}
+							}
+						}
+					);
+				}, 10_000));
+			}));
 		});
+
+		return result.finally(() => store.dispose());
 	}
 }
diff --git a/src/vs/workbench/contrib/debug/browser/disassemblyView.ts b/src/vs/workbench/contrib/debug/browser/disassemblyView.ts
index 92f139a3721..62923aedc28 100644
--- a/src/vs/workbench/contrib/debug/browser/disassemblyView.ts
+++ b/src/vs/workbench/contrib/debug/browser/disassemblyView.ts
@@ -247,6 +247,8 @@ export class DisassemblyView extends EditorPane {
 			}
 		)) as WorkbenchTable<IDisassembledInstructionEntry>;
 
+		this._disassembledInstructions.domNode.classList.add('disassembly-view');
+
 		if (this.focusedInstructionReference) {
 			this.reloadDisassembly(this.focusedInstructionReference, 0);
 		}
@@ -661,8 +663,7 @@ class BreakpointRenderer implements ITableRenderer<IDisassembledInstructionEntry
 		// align from the bottom so that it lines up with instruction when source code is present.
 		container.style.alignSelf = 'flex-end';
 
-		const icon = append(container, $('.disassembly-view'));
-		icon.classList.add('codicon');
+		const icon = append(container, $('.codicon'));
 		icon.style.display = 'flex';
 		icon.style.alignItems = 'center';
 		icon.style.justifyContent = 'center';
diff --git a/src/vs/workbench/contrib/debug/browser/exceptionWidget.ts b/src/vs/workbench/contrib/debug/browser/exceptionWidget.ts
index 7c9b48503a2..ebece20ffe4 100644
--- a/src/vs/workbench/contrib/debug/browser/exceptionWidget.ts
+++ b/src/vs/workbench/contrib/debug/browser/exceptionWidget.ts
@@ -15,7 +15,7 @@ import { ThemeIcon } from 'vs/base/common/themables';
 import { Color } from 'vs/base/common/color';
 import { registerColor } from 'vs/platform/theme/common/colorRegistry';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { LinkDetector } from 'vs/workbench/contrib/debug/browser/linkDetector';
+import { DebugLinkHoverBehavior, LinkDetector } from 'vs/workbench/contrib/debug/browser/linkDetector';
 import { EditorOption } from 'vs/editor/common/config/editorOptions';
 import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
 import { Action } from 'vs/base/common/actions';
@@ -98,7 +98,7 @@ export class ExceptionWidget extends ZoneWidget {
 		if (this.exceptionInfo.details && this.exceptionInfo.details.stackTrace) {
 			const stackTrace = $('.stack-trace');
 			const linkDetector = this.instantiationService.createInstance(LinkDetector);
-			const linkedStackTrace = linkDetector.linkify(this.exceptionInfo.details.stackTrace, true, this.debugSession ? this.debugSession.root : undefined);
+			const linkedStackTrace = linkDetector.linkify(this.exceptionInfo.details.stackTrace, true, this.debugSession ? this.debugSession.root : undefined, undefined, { type: DebugLinkHoverBehavior.Rich, store: this._disposables });
 			stackTrace.appendChild(linkedStackTrace);
 			dom.append(container, stackTrace);
 			ariaLabel += ', ' + this.exceptionInfo.details.stackTrace;
diff --git a/src/vs/workbench/contrib/debug/browser/linkDetector.ts b/src/vs/workbench/contrib/debug/browser/linkDetector.ts
index 484f3286dba..4fc35f79d6c 100644
--- a/src/vs/workbench/contrib/debug/browser/linkDetector.ts
+++ b/src/vs/workbench/contrib/debug/browser/linkDetector.ts
@@ -3,22 +3,26 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { getWindow } from 'vs/base/browser/dom';
+import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
+import { getDefaultHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
+import { KeyCode } from 'vs/base/common/keyCodes';
+import { DisposableStore } from 'vs/base/common/lifecycle';
 import { Schemas } from 'vs/base/common/network';
 import * as osPath from 'vs/base/common/path';
 import * as platform from 'vs/base/common/platform';
 import { URI } from 'vs/base/common/uri';
+import { localize } from 'vs/nls';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IFileService } from 'vs/platform/files/common/files';
+import { IHoverService } from 'vs/platform/hover/browser/hover';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
+import { ITunnelService } from 'vs/platform/tunnel/common/tunnel';
 import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
+import { IDebugSession } from 'vs/workbench/contrib/debug/common/debug';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
 import { IPathService } from 'vs/workbench/services/path/common/pathService';
-import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { localize } from 'vs/nls';
-import { ITunnelService } from 'vs/platform/tunnel/common/tunnel';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { getWindow } from 'vs/base/browser/dom';
 
 const CONTROL_CODES = '\\u0000-\\u0020\\u007f-\\u009f';
 const WEB_LINK_REGEX = new RegExp('(?:[a-zA-Z][a-zA-Z0-9+.-]{2,}:\\/\\/|data:|www\\.)[^\\s' + CONTROL_CODES + '"]{2,}[^\\s' + CONTROL_CODES + '"\')}\\],:;.!?]', 'ug');
@@ -40,6 +44,22 @@ type LinkPart = {
 	captures: string[];
 };
 
+export const enum DebugLinkHoverBehavior {
+	/** A nice workbench hover */
+	Rich,
+	/**
+	 * Basic browser hover
+	 * @deprecated Consumers should adopt `rich` by propagating disposables appropriately
+	 */
+	Basic,
+	/** No hover */
+	None
+}
+
+/** Store implies HoverBehavior=rich */
+export type DebugLinkHoverBehaviorTypeData = { type: DebugLinkHoverBehavior.None | DebugLinkHoverBehavior.Basic }
+	| { type: DebugLinkHoverBehavior.Rich; store: DisposableStore };
+
 export class LinkDetector {
 	constructor(
 		@IEditorService private readonly editorService: IEditorService,
@@ -48,7 +68,8 @@ export class LinkDetector {
 		@IPathService private readonly pathService: IPathService,
 		@ITunnelService private readonly tunnelService: ITunnelService,
 		@IWorkbenchEnvironmentService private readonly environmentService: IWorkbenchEnvironmentService,
-		@IConfigurationService private readonly configurationService: IConfigurationService
+		@IConfigurationService private readonly configurationService: IConfigurationService,
+		@IHoverService private readonly hoverService: IHoverService,
 	) {
 		// noop
 	}
@@ -59,8 +80,10 @@ export class LinkDetector {
 	 * 'onclick' event is attached to all anchored links that opens them in the editor.
 	 * When splitLines is true, each line of the text, even if it contains no links, is wrapped in a <span>
 	 * and added as a child of the returned <span>.
+	 * If a `hoverBehavior` is passed, hovers may be added using the workbench hover service.
+	 * This should be preferred for new code where hovers are desirable.
 	 */
-	linkify(text: string, splitLines?: boolean, workspaceFolder?: IWorkspaceFolder, includeFulltext?: boolean): HTMLElement {
+	linkify(text: string, splitLines?: boolean, workspaceFolder?: IWorkspaceFolder, includeFulltext?: boolean, hoverBehavior?: DebugLinkHoverBehaviorTypeData): HTMLElement {
 		if (splitLines) {
 			const lines = text.split('\n');
 			for (let i = 0; i < lines.length - 1; i++) {
@@ -88,13 +111,13 @@ export class LinkDetector {
 						container.appendChild(document.createTextNode(part.value));
 						break;
 					case 'web':
-						container.appendChild(this.createWebLink(includeFulltext ? text : undefined, part.value));
+						container.appendChild(this.createWebLink(includeFulltext ? text : undefined, part.value, hoverBehavior));
 						break;
 					case 'path': {
 						const path = part.captures[0];
 						const lineNumber = part.captures[1] ? Number(part.captures[1]) : 0;
 						const columnNumber = part.captures[2] ? Number(part.captures[2]) : 0;
-						container.appendChild(this.createPathLink(includeFulltext ? text : undefined, part.value, path, lineNumber, columnNumber, workspaceFolder));
+						container.appendChild(this.createPathLink(includeFulltext ? text : undefined, part.value, path, lineNumber, columnNumber, workspaceFolder, hoverBehavior));
 						break;
 					}
 				}
@@ -105,7 +128,25 @@ export class LinkDetector {
 		return container;
 	}
 
-	private createWebLink(fulltext: string | undefined, url: string): Node {
+	/**
+	 * Linkifies a location reference.
+	 */
+	linkifyLocation(text: string, locationReference: number, session: IDebugSession, hoverBehavior?: DebugLinkHoverBehaviorTypeData) {
+		const link = this.createLink(text);
+		this.decorateLink(link, undefined, text, hoverBehavior, async (preserveFocus: boolean) => {
+			const location = await session.resolveLocationReference(locationReference);
+			await location.source.openInEditor(this.editorService, {
+				startLineNumber: location.line,
+				startColumn: location.column,
+				endLineNumber: location.endLine ?? location.line,
+				endColumn: location.endColumn ?? location.column,
+			}, preserveFocus);
+		});
+
+		return link;
+	}
+
+	private createWebLink(fulltext: string | undefined, url: string, hoverBehavior?: DebugLinkHoverBehaviorTypeData): Node {
 		const link = this.createLink(url);
 
 		let uri = URI.parse(url);
@@ -119,7 +160,7 @@ export class LinkDetector {
 			});
 		}
 
-		this.decorateLink(link, uri, fulltext, async () => {
+		this.decorateLink(link, uri, fulltext, hoverBehavior, async () => {
 
 			if (uri.scheme === Schemas.file) {
 				// Just using fsPath here is unsafe: https://github.com/microsoft/vscode/issues/109076
@@ -149,7 +190,7 @@ export class LinkDetector {
 		return link;
 	}
 
-	private createPathLink(fulltext: string | undefined, text: string, path: string, lineNumber: number, columnNumber: number, workspaceFolder: IWorkspaceFolder | undefined): Node {
+	private createPathLink(fulltext: string | undefined, text: string, path: string, lineNumber: number, columnNumber: number, workspaceFolder: IWorkspaceFolder | undefined, hoverBehavior?: DebugLinkHoverBehaviorTypeData): Node {
 		if (path[0] === '/' && path[1] === '/') {
 			// Most likely a url part which did not match, for example ftp://path.
 			return document.createTextNode(text);
@@ -162,7 +203,7 @@ export class LinkDetector {
 			}
 			const uri = workspaceFolder.toResource(path);
 			const link = this.createLink(text);
-			this.decorateLink(link, uri, fulltext, (preserveFocus: boolean) => this.editorService.openEditor({ resource: uri, options: { ...options, preserveFocus } }));
+			this.decorateLink(link, uri, fulltext, hoverBehavior, (preserveFocus: boolean) => this.editorService.openEditor({ resource: uri, options: { ...options, preserveFocus } }));
 			return link;
 		}
 
@@ -180,7 +221,7 @@ export class LinkDetector {
 			if (stat.isDirectory) {
 				return;
 			}
-			this.decorateLink(link, uri, fulltext, (preserveFocus: boolean) => this.editorService.openEditor({ resource: uri, options: { ...options, preserveFocus } }));
+			this.decorateLink(link, uri, fulltext, hoverBehavior, (preserveFocus: boolean) => this.editorService.openEditor({ resource: uri, options: { ...options, preserveFocus } }));
 		}).catch(() => {
 			// If the uri can not be resolved we should not spam the console with error, remain quite #86587
 		});
@@ -193,12 +234,19 @@ export class LinkDetector {
 		return link;
 	}
 
-	private decorateLink(link: HTMLElement, uri: URI, fulltext: string | undefined, onClick: (preserveFocus: boolean) => void) {
+	private decorateLink(link: HTMLElement, uri: URI | undefined, fulltext: string | undefined, hoverBehavior: DebugLinkHoverBehaviorTypeData | undefined, onClick: (preserveFocus: boolean) => void) {
 		link.classList.add('link');
-		const followLink = this.tunnelService.canTunnel(uri) ? localize('followForwardedLink', "follow link using forwarded port") : localize('followLink', "follow link");
-		link.title = fulltext
+		const followLink = uri && this.tunnelService.canTunnel(uri) ? localize('followForwardedLink', "follow link using forwarded port") : localize('followLink', "follow link");
+		const title = link.ariaLabel = fulltext
 			? (platform.isMacintosh ? localize('fileLinkWithPathMac', "Cmd + click to {0}\n{1}", followLink, fulltext) : localize('fileLinkWithPath', "Ctrl + click to {0}\n{1}", followLink, fulltext))
 			: (platform.isMacintosh ? localize('fileLinkMac', "Cmd + click to {0}", followLink) : localize('fileLink', "Ctrl + click to {0}", followLink));
+
+		if (hoverBehavior?.type === DebugLinkHoverBehavior.Rich) {
+			hoverBehavior.store.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('element'), link, title));
+		} else if (hoverBehavior?.type !== DebugLinkHoverBehavior.None) {
+			link.title = title;
+		}
+
 		link.onmousemove = (event) => { link.classList.toggle('pointer', platform.isMacintosh ? event.metaKey : event.ctrlKey); };
 		link.onmouseleave = () => link.classList.remove('pointer');
 		link.onclick = (event) => {
diff --git a/src/vs/workbench/contrib/debug/browser/media/callStackWidget.css b/src/vs/workbench/contrib/debug/browser/media/callStackWidget.css
index c8a7b1917d6..e5e0d56e15f 100644
--- a/src/vs/workbench/contrib/debug/browser/media/callStackWidget.css
+++ b/src/vs/workbench/contrib/debug/browser/media/callStackWidget.css
@@ -6,8 +6,9 @@
 .multiCallStackFrame {
 	.header {
 		display: flex;
+
 		align-items: center;
-		height: 32px;
+		height: 24px;
 		background: var(--vscode-multiDiffEditor-headerBackground);
 		border-top: 1px solid var(--vscode-multiDiffEditor-border);
 		color: var(--vscode-foreground);
@@ -23,6 +24,10 @@
 		&[role="link"] {
 			cursor: pointer;
 		}
+
+		.monaco-icon-label::before {
+			height: auto;
+		}
 	}
 
 	&.collapsed {
@@ -36,7 +41,13 @@
 	}
 
 	.collapse-button {
-		cursor: pointer;
+		width: 16px;
+		min-height: 1px; /* show even if empty */
+		line-height: 0;
+
+		a {
+			cursor: pointer;
+		}
 	}
 
 	.actions {
@@ -52,3 +63,9 @@
 		background: none !important;
 	}
 }
+
+.monaco-editor .call-stack-go-to-file-link {
+	text-decoration: underline;
+	cursor: pointer;
+	color: var(--vscode-editorLink-activeForeground) !important;
+}
diff --git a/src/vs/workbench/contrib/debug/browser/rawDebugSession.ts b/src/vs/workbench/contrib/debug/browser/rawDebugSession.ts
index de7be37fe8f..894bde68f10 100644
--- a/src/vs/workbench/contrib/debug/browser/rawDebugSession.ts
+++ b/src/vs/workbench/contrib/debug/browser/rawDebugSession.ts
@@ -484,6 +484,10 @@ export class RawDebugSession implements IDisposable {
 		return this.send<DebugProtocol.SourceResponse>('source', args);
 	}
 
+	locations(args: DebugProtocol.LocationsArguments): Promise<DebugProtocol.LocationsResponse | undefined> {
+		return this.send<DebugProtocol.LocationsResponse>('locations', args);
+	}
+
 	loadedSources(args: DebugProtocol.LoadedSourcesArguments): Promise<DebugProtocol.LoadedSourcesResponse | undefined> {
 		if (this.capabilities.supportsLoadedSourcesRequest) {
 			return this.send<DebugProtocol.LoadedSourcesResponse>('loadedSources', args);
diff --git a/src/vs/workbench/contrib/debug/browser/repl.ts b/src/vs/workbench/contrib/debug/browser/repl.ts
index 4d64d66ad40..eac3df60469 100644
--- a/src/vs/workbench/contrib/debug/browser/repl.ts
+++ b/src/vs/workbench/contrib/debug/browser/repl.ts
@@ -74,6 +74,7 @@ import { AccessibilitySignal, IAccessibilitySignalService } from 'vs/platform/ac
 import { IHoverService } from 'vs/platform/hover/browser/hover';
 import { AccessibilityVerbositySettingId } from 'vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
 import { AccessibilityCommandId } from 'vs/workbench/contrib/accessibility/common/accessibilityCommands';
+import { Codicon } from 'vs/base/common/codicons';
 
 const $ = dom.$;
 
@@ -119,6 +120,7 @@ export class Repl extends FilterViewPane implements IHistoryNavigationWidget {
 	private multiSessionRepl: IContextKey<boolean>;
 	private menu: IMenu;
 	private replDataSource: IAsyncDataSource<IDebugSession, IReplElement> | undefined;
+	private findIsOpen: boolean = false;
 
 	constructor(
 		options: IViewPaneOptions,
@@ -348,6 +350,10 @@ export class Repl extends FilterViewPane implements IHistoryNavigationWidget {
 		this.filterWidget.focus();
 	}
 
+	openFind(): void {
+		this.tree?.openFind();
+	}
+
 	private setMode(): void {
 		if (!this.isVisible()) {
 			return;
@@ -525,6 +531,10 @@ export class Repl extends FilterViewPane implements IHistoryNavigationWidget {
 		this.tree?.collapseAll();
 	}
 
+	getDebugSession(): IDebugSession | undefined {
+		return this.tree?.getInput();
+	}
+
 	getReplInput(): CodeEditorWidget {
 		return this.replInput;
 	}
@@ -660,7 +670,7 @@ export class Repl extends FilterViewPane implements IHistoryNavigationWidget {
 				accessibilityProvider: new ReplAccessibilityProvider(),
 				identityProvider,
 				mouseSupport: false,
-				findWidgetEnabled: false,
+				findWidgetEnabled: true,
 				keyboardNavigationLabelProvider: { getKeyboardNavigationLabel: (e: IReplElement) => e.toString(true) },
 				horizontalScrolling: !wordWrap,
 				setRowLineHeight: false,
@@ -685,11 +695,16 @@ export class Repl extends FilterViewPane implements IHistoryNavigationWidget {
 		}));
 
 		this._register(tree.onContextMenu(e => this.onContextMenu(e)));
+		this._register(tree.onDidChangeFindOpenState((open) => this.findIsOpen = open));
+
 		let lastSelectedString: string;
 		this._register(tree.onMouseClick(() => {
+			if (this.findIsOpen) {
+				return;
+			}
 			const selection = dom.getWindow(this.treeContainer).getSelection();
 			if (!selection || selection.type !== 'Range' || lastSelectedString === selection.toString()) {
-				// only focus the input if the user is not currently selecting.
+				// only focus the input if the user is not currently selecting and find isn't open.
 				this.replInput.focus();
 			}
 			lastSelectedString = selection ? selection.toString() : '';
@@ -909,25 +924,57 @@ class AcceptReplInputAction extends EditorAction {
 	}
 }
 
-class FilterReplAction extends EditorAction {
+class FilterReplAction extends ViewAction<Repl> {
 
 	constructor() {
 		super({
+			viewId: REPL_VIEW_ID,
 			id: 'repl.action.filter',
-			label: localize('repl.action.filter', "Debug Console: Focus Filter"),
-			alias: 'Debug Console: Focus Filter',
+			title: localize('repl.action.filter', "Debug Console: Focus Filter"),
 			precondition: CONTEXT_IN_DEBUG_REPL,
-			kbOpts: {
-				kbExpr: EditorContextKeys.textInputFocus,
+			keybinding: [{
+				when: EditorContextKeys.textInputFocus,
 				primary: KeyMod.CtrlCmd | KeyCode.KeyF,
 				weight: KeybindingWeight.EditorContrib
-			}
+			}]
 		});
 	}
 
-	run(accessor: ServicesAccessor, editor: ICodeEditor): void | Promise<void> {
-		const repl = getReplView(accessor.get(IViewsService));
-		repl?.focusFilter();
+	runInView(accessor: ServicesAccessor, repl: Repl): void | Promise<void> {
+		repl.focusFilter();
+	}
+}
+
+
+class FindReplAction extends ViewAction<Repl> {
+
+	constructor() {
+		super({
+			viewId: REPL_VIEW_ID,
+			id: 'repl.action.find',
+			title: localize('repl.action.find', "Debug Console: Focus Find"),
+			precondition: CONTEXT_IN_DEBUG_REPL,
+			keybinding: [{
+				when: ContextKeyExpr.or(CONTEXT_IN_DEBUG_REPL, ContextKeyExpr.equals('focusedView', 'workbench.panel.repl.view')),
+				primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KeyF,
+				weight: KeybindingWeight.EditorContrib
+			}],
+			icon: Codicon.search,
+			menu: [{
+				id: MenuId.ViewTitle,
+				group: 'navigation',
+				when: ContextKeyExpr.equals('view', REPL_VIEW_ID),
+				order: 15
+			}, {
+				id: MenuId.DebugConsoleContext,
+				group: 'z_commands',
+				order: 25
+			}],
+		});
+	}
+
+	runInView(accessor: ServicesAccessor, view: Repl): void | Promise<void> {
+		view.openFind();
 	}
 }
 
@@ -953,7 +1000,8 @@ class ReplCopyAllAction extends EditorAction {
 
 registerEditorAction(AcceptReplInputAction);
 registerEditorAction(ReplCopyAllAction);
-registerEditorAction(FilterReplAction);
+registerAction2(FilterReplAction);
+registerAction2(FindReplAction);
 
 class SelectReplActionViewItem extends FocusSessionActionViewItem {
 
@@ -1032,7 +1080,15 @@ registerAction2(class extends ViewAction<Repl> {
 				id: MenuId.DebugConsoleContext,
 				group: 'z_commands',
 				order: 20
-			}]
+			}],
+			keybinding: [{
+				primary: 0,
+				mac: { primary: KeyMod.CtrlCmd | KeyCode.KeyK },
+				// Weight is higher than work workbench contributions so the keybinding remains
+				// highest priority when chords are registered afterwards
+				weight: KeybindingWeight.WorkbenchContrib + 1,
+				when: ContextKeyExpr.equals('focusedView', 'workbench.panel.repl.view')
+			}],
 		});
 	}
 
diff --git a/src/vs/workbench/contrib/debug/browser/replAccessibilityHelp.ts b/src/vs/workbench/contrib/debug/browser/replAccessibilityHelp.ts
index ed090eda316..4cf2efbc9ca 100644
--- a/src/vs/workbench/contrib/debug/browser/replAccessibilityHelp.ts
+++ b/src/vs/workbench/contrib/debug/browser/replAccessibilityHelp.ts
@@ -12,7 +12,6 @@ import { getReplView, Repl } from 'vs/workbench/contrib/debug/browser/repl';
 import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
 import { AccessibilityVerbositySettingId } from 'vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
 import { localize } from 'vs/nls';
-import { AccessibilityHelpNLS } from 'vs/editor/common/standaloneStrings';
 
 export class ReplAccessibilityHelp implements IAccessibleViewImplentation {
 	priority = 120;
@@ -53,13 +52,9 @@ class ReplAccessibilityHelpProvider extends Disposable implements IAccessibleVie
 			localize('repl.input', "The debug console input can be navigated to from the output with the Focus Next Widget command{0}.", '<keybinding:widgetNavigation.focusNext>'),
 			localize('repl.history', "The debug console output history can be navigated with the up and down arrow keys."),
 			localize('repl.accessibleView', "The Open Accessible View command{0} will allow character by character navigation of the console output.", '<keybinding:editor.action.accessibleView>'),
-			localize('repl.showRunAndDebug', "The Show Run and Debug view command{0} will open the Run and Debug view.", '<keybinding:workbench.view.debug>'),
-			AccessibilityHelpNLS.setBreakpoint,
+			localize('repl.showRunAndDebug', "The Show Run and Debug view command{0} will open the Run and Debug view and provides more information about debugging.", '<keybinding:workbench.view.debug>'),
+			localize('repl.clear', "The Debug: Clear Console command{0} will clear the console output.", '<keybinding:workbench.debug.panel.action.clearReplAction>'),
 			localize('repl.lazyVariables', "The setting `debug.expandLazyVariables` controls whether variables are evaluated automatically. This is enabled by default when using a screen reader."),
-			localize('repl.continue', "The Debug: Continue command{0} will continue execution until the next breakpoint.", '<keybinding:workbench.action.debug.continue>'),
-			localize('repl.stepInto', "The Debug: Step Into command{0} will step into the next function call.", '<keybinding:workbench.action.debug.stepInto>'),
-			localize('repl.stepOver', "The Debug: Step Over command{0} will step over the current function call.", '<keybinding:workbench.action.debug.stepOver>'),
-			localize('repl.stepOut', "The Debug: Step Out command{0} will step out of the current function call.", '<keybinding:workbench.action.debug.stepOut>'),
 		].join('\n');
 	}
 }
diff --git a/src/vs/workbench/contrib/debug/browser/replAccessibleView.ts b/src/vs/workbench/contrib/debug/browser/replAccessibleView.ts
index 374d321366d..891598edb4b 100644
--- a/src/vs/workbench/contrib/debug/browser/replAccessibleView.ts
+++ b/src/vs/workbench/contrib/debug/browser/replAccessibleView.ts
@@ -5,7 +5,7 @@
 
 import { AccessibleViewProviderId, AccessibleViewType, IAccessibleViewContentProvider, IAccessibleViewService } from 'vs/platform/accessibility/browser/accessibleView';
 import { AccessibilityVerbositySettingId } from 'vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
-import { IDebugService, IReplElement } from 'vs/workbench/contrib/debug/common/debug';
+import { IReplElement } from 'vs/workbench/contrib/debug/common/debug';
 import { IAccessibleViewImplentation } from 'vs/platform/accessibility/browser/accessibleViewRegistry';
 import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { getReplView, Repl } from 'vs/workbench/contrib/debug/browser/repl';
@@ -22,14 +22,14 @@ export class ReplAccessibleView implements IAccessibleViewImplentation {
 	type: AccessibleViewType = AccessibleViewType.View;
 	getProvider(accessor: ServicesAccessor) {
 		const viewsService = accessor.get(IViewsService);
-		const debugService = accessor.get(IDebugService);
 		const accessibleViewService = accessor.get(IAccessibleViewService);
 		const replView = getReplView(viewsService);
 		if (!replView) {
 			return undefined;
 		}
+
 		const focusedElement = replView.getFocusedElement();
-		return new ReplOutputAccessibleViewProvider(replView, focusedElement, debugService, accessibleViewService);
+		return new ReplOutputAccessibleViewProvider(replView, focusedElement, accessibleViewService);
 	}
 }
 
@@ -52,18 +52,16 @@ class ReplOutputAccessibleViewProvider extends Disposable implements IAccessible
 	constructor(
 		private readonly _replView: Repl,
 		private readonly _focusedElement: IReplElement | undefined,
-		@IDebugService private readonly _debugService: IDebugService,
 		@IAccessibleViewService private readonly _accessibleViewService: IAccessibleViewService) {
 		super();
 		this._treeHadFocus = !!_focusedElement;
 	}
 	public provideContent(): string {
-		const viewModel = this._debugService.getViewModel();
-		const focusedDebugSession = viewModel?.focusedSession;
-		if (!focusedDebugSession) {
-			return 'No debug session is active.';
+		const debugSession = this._replView.getDebugSession();
+		if (!debugSession) {
+			return 'No debug session available.';
 		}
-		const elements = focusedDebugSession.getReplElements();
+		const elements = debugSession.getReplElements();
 		if (!elements.length) {
 			return 'No output in the debug console.';
 		}
diff --git a/src/vs/workbench/contrib/debug/browser/replViewer.ts b/src/vs/workbench/contrib/debug/browser/replViewer.ts
index 50d81a8f041..54f4efae1f5 100644
--- a/src/vs/workbench/contrib/debug/browser/replViewer.ts
+++ b/src/vs/workbench/contrib/debug/browser/replViewer.ts
@@ -12,7 +12,7 @@ import { CachedListVirtualDelegate } from 'vs/base/browser/ui/list/list';
 import { IListAccessibilityProvider } from 'vs/base/browser/ui/list/listWidget';
 import { IAsyncDataSource, ITreeNode, ITreeRenderer } from 'vs/base/browser/ui/tree/tree';
 import { createMatches, FuzzyScore } from 'vs/base/common/filters';
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
+import { Disposable, DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
 import { basename } from 'vs/base/common/path';
 import severity from 'vs/base/common/severity';
 import { ThemeIcon } from 'vs/base/common/themables';
@@ -47,6 +47,7 @@ interface IReplGroupTemplateData {
 
 interface IReplEvaluationResultTemplateData {
 	value: HTMLElement;
+	elementStore: DisposableStore;
 }
 
 interface IOutputReplElementTemplateData {
@@ -65,6 +66,7 @@ interface IRawObjectReplTemplateData {
 	name: HTMLElement;
 	value: HTMLElement;
 	label: HighlightedLabel;
+	elementStore: DisposableStore;
 }
 
 export class ReplEvaluationInputsRenderer implements ITreeRenderer<ReplEvaluationInput, FuzzyScore, IReplEvaluationInputTemplateData> {
@@ -141,19 +143,21 @@ export class ReplEvaluationResultsRenderer implements ITreeRenderer<ReplEvaluati
 		const output = dom.append(container, $('.evaluation-result.expression'));
 		const value = dom.append(output, $('span.value'));
 
-		return { value };
+		return { value, elementStore: new DisposableStore() };
 	}
 
 	renderElement(element: ITreeNode<ReplEvaluationResult | Variable, FuzzyScore>, index: number, templateData: IReplEvaluationResultTemplateData): void {
+		templateData.elementStore.clear();
 		const expression = element.element;
-		renderExpressionValue(expression, templateData.value, {
+		renderExpressionValue(templateData.elementStore, expression, templateData.value, {
 			colorize: true,
-			linkDetector: this.linkDetector
+			hover: false,
+			linkDetector: this.linkDetector,
 		}, this.hoverService);
 	}
 
 	disposeTemplate(templateData: IReplEvaluationResultTemplateData): void {
-		// noop
+		templateData.elementStore.dispose();
 	}
 }
 
@@ -245,7 +249,7 @@ export class ReplVariablesRenderer extends AbstractExpressionsRenderer<IExpressi
 		const isReplVariable = expression instanceof ReplVariableElement;
 		if (isReplVariable || !expression.name) {
 			data.label.set('');
-			renderExpressionValue(isReplVariable ? expression.expression : expression, data.value, { colorize: true, linkDetector: this.linkDetector }, this.hoverService);
+			renderExpressionValue(data.elementDisposable, isReplVariable ? expression.expression : expression, data.value, { colorize: true, linkDetector: this.linkDetector, hover: false }, this.hoverService);
 			data.expression.classList.remove('nested-variable');
 		} else {
 			renderVariable(data.elementDisposable, this.commandService, this.hoverService, expression as Variable, data, true, highlights, this.linkDetector);
@@ -278,10 +282,12 @@ export class ReplRawObjectsRenderer implements ITreeRenderer<RawObjectReplElemen
 		const label = new HighlightedLabel(name);
 		const value = dom.append(expression, $('span.value'));
 
-		return { container, expression, name, label, value };
+		return { container, expression, name, label, value, elementStore: new DisposableStore() };
 	}
 
 	renderElement(node: ITreeNode<RawObjectReplElement, FuzzyScore>, index: number, templateData: IRawObjectReplTemplateData): void {
+		templateData.elementStore.clear();
+
 		// key
 		const element = node.element;
 		templateData.label.set(element.name ? `${element.name}:` : '', createMatches(node.filterData));
@@ -292,12 +298,14 @@ export class ReplRawObjectsRenderer implements ITreeRenderer<RawObjectReplElemen
 		}
 
 		// value
-		renderExpressionValue(element.value, templateData.value, {
-			linkDetector: this.linkDetector
+		renderExpressionValue(templateData.elementStore, element.value, templateData.value, {
+			linkDetector: this.linkDetector,
+			hover: false,
 		}, this.hoverService);
 	}
 
 	disposeTemplate(templateData: IRawObjectReplTemplateData): void {
+		templateData.elementStore.dispose();
 		templateData.label.dispose();
 	}
 }
diff --git a/src/vs/workbench/contrib/debug/browser/runAndDebugAccessibilityHelp.ts b/src/vs/workbench/contrib/debug/browser/runAndDebugAccessibilityHelp.ts
index fdc7bb37342..fd4e37133f4 100644
--- a/src/vs/workbench/contrib/debug/browser/runAndDebugAccessibilityHelp.ts
+++ b/src/vs/workbench/contrib/debug/browser/runAndDebugAccessibilityHelp.ts
@@ -14,11 +14,20 @@ import { localize } from 'vs/nls';
 import { ICommandService } from 'vs/platform/commands/common/commands';
 import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
 import { AccessibilityHelpNLS } from 'vs/editor/common/standaloneStrings';
+import { FocusedViewContext, SidebarFocusContext } from 'vs/workbench/common/contextkeys';
+import { BREAKPOINTS_VIEW_ID, CALLSTACK_VIEW_ID, LOADED_SCRIPTS_VIEW_ID, VARIABLES_VIEW_ID, WATCH_VIEW_ID } from 'vs/workbench/contrib/debug/common/debug';
 
 export class RunAndDebugAccessibilityHelp implements IAccessibleViewImplentation {
 	priority = 120;
 	name = 'runAndDebugHelp';
-	when = ContextKeyExpr.equals('activeViewlet', 'workbench.view.debug');
+	when = ContextKeyExpr.or(
+		ContextKeyExpr.and(ContextKeyExpr.equals('activeViewlet', 'workbench.view.debug'), SidebarFocusContext),
+		ContextKeyExpr.equals(FocusedViewContext.key, VARIABLES_VIEW_ID),
+		ContextKeyExpr.equals(FocusedViewContext.key, WATCH_VIEW_ID),
+		ContextKeyExpr.equals(FocusedViewContext.key, CALLSTACK_VIEW_ID),
+		ContextKeyExpr.equals(FocusedViewContext.key, LOADED_SCRIPTS_VIEW_ID),
+		ContextKeyExpr.equals(FocusedViewContext.key, BREAKPOINTS_VIEW_ID)
+	);
 	type: AccessibleViewType = AccessibleViewType.Help;
 	getProvider(accessor: ServicesAccessor) {
 		return new RunAndDebugAccessibilityHelpProvider(accessor.get(ICommandService), accessor.get(IViewsService));
@@ -61,8 +70,12 @@ class RunAndDebugAccessibilityHelpProvider extends Disposable implements IAccess
 		return [
 			localize('debug.showRunAndDebug', "The Show Run and Debug view command{0} will open the current view.", '<keybinding:workbench.view.debug>'),
 			localize('debug.startDebugging', "The Debug: Start Debugging command{0} will start a debug session.", '<keybinding:workbench.action.debug.start>'),
+			localize('debug.help', "Access debug output and evaluate expressions in the debug console, which can be focused with{0}.", '<keybinding:workbench.panel.repl.view.focus>'),
 			AccessibilityHelpNLS.setBreakpoint,
+			AccessibilityHelpNLS.addToWatch,
 			localize('onceDebugging', "Once debugging, the following commands will be available:"),
+			localize('debug.restartDebugging', "- Debug: Restart Debugging command{0} will restart the current debug session.", '<keybinding:workbench.action.debug.restart>'),
+			localize('debug.stopDebugging', "- Debug: Stop Debugging command{0} will stop the current debugging session.", '<keybinding:workbench.action.debug.stop>'),
 			localize('debug.continue', "- Debug: Continue command{0} will continue execution until the next breakpoint.", '<keybinding:workbench.action.debug.continue>'),
 			localize('debug.stepInto', "- Debug: Step Into command{0} will step into the next function call.", '<keybinding:workbench.action.debug.stepInto>'),
 			localize('debug.stepOver', "- Debug: Step Over command{0} will step over the current function call.", '<keybinding:workbench.action.debug.stepOver>'),
@@ -72,7 +85,6 @@ class RunAndDebugAccessibilityHelpProvider extends Disposable implements IAccess
 			localize('debug.focusCallStack', "- Debug: Focus Call Stack View command{0} will focus the call stack view.", '<keybinding:workbench.debug.action.focusCallStackView>'),
 			localize('debug.focusVariables', "- Debug: Focus Variables View command{0} will focus the variables view.", '<keybinding:workbench.debug.action.focusVariablesView>'),
 			localize('debug.focusWatch', "- Debug: Focus Watch View command{0} will focus the watch view.", '<keybinding:workbench.debug.action.focusWatchView>'),
-			localize('debug.help', "The debug console is a Read-Eval-Print-Loop that allows you to evaluate expressions and run commands and can be focused with{0}.", '<keybinding:workbench.panel.repl.view.focus>'),
 			localize('debug.watchSetting', "The setting {0} controls whether watch variable changes are announced.", 'accessibility.debugWatchVariableAnnouncements'),
 		].join('\n');
 	}
diff --git a/src/vs/workbench/contrib/debug/browser/variablesView.ts b/src/vs/workbench/contrib/debug/browser/variablesView.ts
index 7adb71aa317..5511716cfb2 100644
--- a/src/vs/workbench/contrib/debug/browser/variablesView.ts
+++ b/src/vs/workbench/contrib/debug/browser/variablesView.ts
@@ -461,10 +461,9 @@ export class VisualizedVariableRenderer extends AbstractExpressionsRenderer {
 			text += ':';
 		}
 		data.label.set(text, highlights, viz.name);
-		renderExpressionValue(viz, data.value, {
+		renderExpressionValue(data.elementDisposable, viz, data.value, {
 			showChanged: false,
 			maxValueLength: 1024,
-			hover: data.elementDisposable,
 			colorize: true,
 			linkDetector: this.linkDetector
 		}, this.hoverService);
diff --git a/src/vs/workbench/contrib/debug/browser/watchExpressionsView.ts b/src/vs/workbench/contrib/debug/browser/watchExpressionsView.ts
index 22014a4ad96..fcdebfcebf4 100644
--- a/src/vs/workbench/contrib/debug/browser/watchExpressionsView.ts
+++ b/src/vs/workbench/contrib/debug/browser/watchExpressionsView.ts
@@ -87,8 +87,8 @@ export class WatchExpressionsView extends ViewPane {
 		container.classList.add('debug-watch');
 		const treeContainer = renderViewTree(container);
 
-		const expressionsRenderer = this.instantiationService.createInstance(WatchExpressionsRenderer);
 		const linkDetector = this.instantiationService.createInstance(LinkDetector);
+		const expressionsRenderer = this.instantiationService.createInstance(WatchExpressionsRenderer, linkDetector);
 		this.tree = <WorkbenchAsyncDataTree<IDebugService | IExpression, IExpression, FuzzyScore>>this.instantiationService.createInstance(WorkbenchAsyncDataTree, 'WatchExpressions', treeContainer, new WatchExpressionsDelegate(),
 			[
 				expressionsRenderer,
@@ -279,6 +279,7 @@ export class WatchExpressionsRenderer extends AbstractExpressionsRenderer {
 	static readonly ID = 'watchexpression';
 
 	constructor(
+		private readonly linkDetector: LinkDetector,
 		@IMenuService private readonly menuService: IMenuService,
 		@IContextKeyService private readonly contextKeyService: IContextKeyService,
 		@IDebugService debugService: IDebugService,
@@ -329,10 +330,10 @@ export class WatchExpressionsRenderer extends AbstractExpressionsRenderer {
 		}
 
 		data.label.set(text, highlights, title);
-		renderExpressionValue(expression, data.value, {
+		renderExpressionValue(data.elementDisposable, expression, data.value, {
 			showChanged: true,
 			maxValueLength: MAX_VALUE_RENDER_LENGTH_IN_VIEWLET,
-			hover: data.elementDisposable,
+			linkDetector: this.linkDetector,
 			colorize: true
 		}, this.hoverService);
 	}
diff --git a/src/vs/workbench/contrib/debug/common/debug.ts b/src/vs/workbench/contrib/debug/common/debug.ts
index 96785a6403e..c59765f12b8 100644
--- a/src/vs/workbench/contrib/debug/common/debug.ts
+++ b/src/vs/workbench/contrib/debug/common/debug.ts
@@ -352,6 +352,13 @@ export interface IDebugEvaluatePosition {
 	source: DebugProtocol.Source;
 }
 
+export interface IDebugLocationReferenced {
+	line: number;
+	column: number;
+	endLine?: number;
+	endColumn?: number;
+	source: Source;
+}
 
 export interface IDebugSession extends ITreeElement {
 
@@ -432,6 +439,7 @@ export interface IDebugSession extends ITreeElement {
 	sendExceptionBreakpoints(exbpts: IExceptionBreakpoint[]): Promise<void>;
 	breakpointsLocations(uri: uri, lineNumber: number): Promise<IPosition[]>;
 	getDebugProtocolBreakpoint(breakpointId: string): DebugProtocol.Breakpoint | undefined;
+	resolveLocationReference(locationReference: number): Promise<IDebugLocationReferenced>;
 
 	stackTrace(threadId: number, startFrame: number, levels: number, token: CancellationToken): Promise<DebugProtocol.StackTraceResponse | undefined>;
 	exceptionInfo(threadId: number): Promise<IExceptionInfo | undefined>;
diff --git a/src/vs/workbench/contrib/debug/common/debugAccessibilityAnnouncer.ts b/src/vs/workbench/contrib/debug/common/debugAccessibilityAnnouncer.ts
index c557968b086..4c8bfe340e6 100644
--- a/src/vs/workbench/contrib/debug/common/debugAccessibilityAnnouncer.ts
+++ b/src/vs/workbench/contrib/debug/common/debugAccessibilityAnnouncer.ts
@@ -9,6 +9,7 @@ import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
 import { ILogService } from 'vs/platform/log/common/log';
 import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { Expression } from 'vs/workbench/contrib/debug/common/debugModel';
 
 export class DebugWatchAccessibilityAnnouncer extends Disposable implements IWorkbenchContribution {
 	static ID = 'workbench.contrib.debugWatchAccessibilityAnnouncer';
@@ -32,7 +33,7 @@ export class DebugWatchAccessibilityAnnouncer extends Disposable implements IWor
 		const value = this._configurationService.getValue('accessibility.debugWatchVariableAnnouncements');
 		if (value && !this._listener.value) {
 			this._listener.value = this._debugService.getModel().onDidChangeWatchExpressionValue((e) => {
-				if (!e || e.value === 'not available') {
+				if (!e || e.value === Expression.DEFAULT_VALUE) {
 					return;
 				}
 
diff --git a/src/vs/workbench/contrib/debug/common/debugModel.ts b/src/vs/workbench/contrib/debug/common/debugModel.ts
index a49a027f5ba..2d596c14510 100644
--- a/src/vs/workbench/contrib/debug/common/debugModel.ts
+++ b/src/vs/workbench/contrib/debug/common/debugModel.ts
@@ -54,7 +54,8 @@ export class ExpressionContainer implements IExpressionContainer {
 		public indexedVariables: number | undefined = 0,
 		public memoryReference: string | undefined = undefined,
 		private startOfVariables: number | undefined = 0,
-		public presentationHint: DebugProtocol.VariablePresentationHint | undefined = undefined
+		public presentationHint: DebugProtocol.VariablePresentationHint | undefined = undefined,
+		public valueLocationReference: number | undefined = undefined,
 	) { }
 
 	get reference(): number | undefined {
@@ -83,6 +84,7 @@ export class ExpressionContainer implements IExpressionContainer {
 		this.indexedVariables = dummyVar.indexedVariables;
 		this.memoryReference = dummyVar.memoryReference;
 		this.presentationHint = dummyVar.presentationHint;
+		this.valueLocationReference = dummyVar.valueLocationReference;
 		// Also call overridden method to adopt subclass props
 		this.adoptLazyResponse(dummyVar);
 	}
@@ -162,7 +164,7 @@ export class ExpressionContainer implements IExpressionContainer {
 					const count = nameCount.get(v.name) || 0;
 					const idDuplicationIndex = count > 0 ? count.toString() : '';
 					nameCount.set(v.name, count + 1);
-					return new Variable(this.session, this.threadId, this, v.variablesReference, v.name, v.evaluateName, v.value, v.namedVariables, v.indexedVariables, v.memoryReference, v.presentationHint, v.type, v.__vscodeVariableMenuContext, true, 0, idDuplicationIndex);
+					return new Variable(this.session, this.threadId, this, v.variablesReference, v.name, v.evaluateName, v.value, v.namedVariables, v.indexedVariables, v.memoryReference, v.presentationHint, v.type, v.__vscodeVariableMenuContext, true, 0, idDuplicationIndex, v.declarationLocationReference, v.valueLocationReference);
 				}
 				return new Variable(this.session, this.threadId, this, 0, '', undefined, nls.localize('invalidVariableAttributes', "Invalid variable attributes"), 0, 0, undefined, { kind: 'virtual' }, undefined, undefined, false);
 			});
@@ -220,6 +222,7 @@ export class ExpressionContainer implements IExpressionContainer {
 				this.memoryReference = response.body.memoryReference;
 				this.type = response.body.type || this.type;
 				this.presentationHint = response.body.presentationHint;
+				this.valueLocationReference = response.body.valueLocationReference;
 
 				if (!keepLazyVars && response.body.presentationHint?.lazy) {
 					await this.evaluateLazy();
@@ -312,8 +315,9 @@ export class Expression extends ExpressionContainer implements IExpression {
 	}
 
 	async evaluate(session: IDebugSession | undefined, stackFrame: IStackFrame | undefined, context: string, keepLazyVars?: boolean, location?: IDebugEvaluatePosition): Promise<void> {
+		const hadDefaultValue = this.value === Expression.DEFAULT_VALUE;
 		this.available = await this.evaluateExpression(this.name, session, stackFrame, context, keepLazyVars, location);
-		if (this.valueChanged) {
+		if (hadDefaultValue || this.valueChanged) {
 			this._onDidChangeValue.fire(this);
 		}
 	}
@@ -354,8 +358,10 @@ export class Variable extends ExpressionContainer implements IExpression {
 		public readonly available = true,
 		startOfVariables = 0,
 		idDuplicationIndex = '',
+		public readonly declarationLocationReference: number | undefined = undefined,
+		valueLocationReference: number | undefined = undefined,
 	) {
-		super(session, threadId, reference, `variable:${parent.getId()}:${name}:${idDuplicationIndex}`, namedVariables, indexedVariables, memoryReference, startOfVariables, presentationHint);
+		super(session, threadId, reference, `variable:${parent.getId()}:${name}:${idDuplicationIndex}`, namedVariables, indexedVariables, memoryReference, startOfVariables, presentationHint, valueLocationReference);
 		this.value = value || '';
 		this.type = type;
 	}
diff --git a/src/vs/workbench/contrib/debug/common/debugProtocol.d.ts b/src/vs/workbench/contrib/debug/common/debugProtocol.d.ts
index 963e3d553e4..09dd44e76b6 100644
--- a/src/vs/workbench/contrib/debug/common/debugProtocol.d.ts
+++ b/src/vs/workbench/contrib/debug/common/debugProtocol.d.ts
@@ -242,6 +242,11 @@ declare module DebugProtocol {
 			column?: number;
 			/** Additional data to report. For the `telemetry` category the data is sent to telemetry, for the other categories the data is shown in JSON format. */
 			data?: any;
+			/** A reference that allows the client to request the location where the new value is declared. For example, if the logged value is function pointer, the adapter may be able to look up the function's location. This should be present only if the adapter is likely to be able to resolve the location.
+
+				This reference shares the same lifetime as the `variablesReference`. See 'Lifetime of Object References' in the Overview section for details.
+			*/
+			locationReference?: number;
 		};
 	}
 
@@ -294,7 +299,7 @@ declare module DebugProtocol {
 		body: {
 			/** The logical name of the process. This is usually the full path to process's executable file. Example: /home/example/myproj/program.js. */
 			name: string;
-			/** The system process id of the debugged process. This property is missing for non-system processes. */
+			/** The process ID of the debugged process, as assigned by the operating system. This property should be omitted for logical processes that do not map to operating system processes on the machine. */
 			systemProcessId?: number;
 			/** If true, the process is running on the same computer as the debug adapter. */
 			isLocalProcess?: boolean;
@@ -1232,7 +1237,10 @@ declare module DebugProtocol {
 			value: string;
 			/** The type of the new value. Typically shown in the UI when hovering over the value. */
 			type?: string;
-			/** If `variablesReference` is > 0, the new value is structured and its children can be retrieved by passing `variablesReference` to the `variables` request as long as execution remains suspended. See 'Lifetime of Object References' in the Overview section for details. */
+			/** If `variablesReference` is > 0, the new value is structured and its children can be retrieved by passing `variablesReference` to the `variables` request as long as execution remains suspended. See 'Lifetime of Object References' in the Overview section for details.
+
+				If this property is included in the response, any `variablesReference` previously associated with the updated variable, and those of its children, are no longer valid.
+			*/
 			variablesReference?: number;
 			/** The number of named child variables.
 				The client can use this information to present the variables in a paged UI and fetch them in chunks.
@@ -1249,6 +1257,11 @@ declare module DebugProtocol {
 				This attribute may be returned by a debug adapter if corresponding capability `supportsMemoryReferences` is true.
 			*/
 			memoryReference?: string;
+			/** A reference that allows the client to request the location where the new value is declared. For example, if the new value is function pointer, the adapter may be able to look up the function's location. This should be present only if the adapter is likely to be able to resolve the location.
+
+				This reference shares the same lifetime as the `variablesReference`. See 'Lifetime of Object References' in the Overview section for details.
+			*/
+			valueLocationReference?: number;
 		};
 	}
 
@@ -1363,7 +1376,7 @@ declare module DebugProtocol {
 	}
 
 	/** Evaluate request; value of command field is 'evaluate'.
-		Evaluates the given expression in the context of the topmost stack frame.
+		Evaluates the given expression in the context of a stack frame.
 		The expression has access to any variables and arguments that are in scope.
 	*/
 	interface EvaluateRequest extends Request {
@@ -1432,6 +1445,11 @@ declare module DebugProtocol {
 				This attribute may be returned by a debug adapter if corresponding capability `supportsMemoryReferences` is true.
 			*/
 			memoryReference?: string;
+			/** A reference that allows the client to request the location where the returned value is declared. For example, if a function pointer is returned, the adapter may be able to look up the function's location. This should be present only if the adapter is likely to be able to resolve the location.
+
+				This reference shares the same lifetime as the `variablesReference`. See 'Lifetime of Object References' in the Overview section for details.
+			*/
+			valueLocationReference?: number;
 		};
 	}
 
@@ -1486,6 +1504,11 @@ declare module DebugProtocol {
 				This attribute may be returned by a debug adapter if corresponding capability `supportsMemoryReferences` is true.
 			*/
 			memoryReference?: string;
+			/** A reference that allows the client to request the location where the new value is declared. For example, if the new value is function pointer, the adapter may be able to look up the function's location. This should be present only if the adapter is likely to be able to resolve the location.
+
+				This reference shares the same lifetime as the `variablesReference`. See 'Lifetime of Object References' in the Overview section for details.
+			*/
+			valueLocationReference?: number;
 		};
 	}
 
@@ -1700,6 +1723,36 @@ declare module DebugProtocol {
 		};
 	}
 
+	/** Locations request; value of command field is 'locations'.
+		Looks up information about a location reference previously returned by the debug adapter.
+	*/
+	interface LocationsRequest extends Request {
+		// command: 'locations';
+		arguments: LocationsArguments;
+	}
+
+	/** Arguments for `locations` request. */
+	interface LocationsArguments {
+		/** Location reference to resolve. */
+		locationReference: number;
+	}
+
+	/** Response to `locations` request. */
+	interface LocationsResponse extends Response {
+		body?: {
+			/** The source containing the location; either `source.path` or `source.sourceReference` must be specified. */
+			source: Source;
+			/** The line number of the location. The client capability `linesStartAt1` determines whether it is 0- or 1-based. */
+			line: number;
+			/** Position of the location within the `line`. It is measured in UTF-16 code units and the client capability `columnsStartAt1` determines whether it is 0- or 1-based. If no column is given, the first position in the start line is assumed. */
+			column?: number;
+			/** End line of the location, present if the location refers to a range.  The client capability `linesStartAt1` determines whether it is 0- or 1-based. */
+			endLine?: number;
+			/** End position of the location within `endLine`, present if the location refers to a range. It is measured in UTF-16 code units and the client capability `columnsStartAt1` determines whether it is 0- or 1-based. */
+			endColumn?: number;
+		};
+	}
+
 	/** Information about the capabilities of a debug adapter. */
 	interface Capabilities {
 		/** The debug adapter supports the `configurationDone` request. */
@@ -1932,7 +1985,7 @@ declare module DebugProtocol {
 		endLine?: number;
 		/** End position of the range covered by the stack frame. It is measured in UTF-16 code units and the client capability `columnsStartAt1` determines whether it is 0- or 1-based. */
 		endColumn?: number;
-		/** Indicates whether this frame can be restarted with the `restart` request. Clients should only use this if the debug adapter supports the `restart` request and the corresponding capability `supportsRestartRequest` is true. If a debug adapter has this capability, then `canRestart` defaults to `true` if the property is absent. */
+		/** Indicates whether this frame can be restarted with the `restartFrame` request. Clients should only use this if the debug adapter supports the `restart` request and the corresponding capability `supportsRestartFrame` is true. If a debug adapter has this capability, then `canRestart` defaults to `true` if the property is absent. */
 		canRestart?: boolean;
 		/** A memory reference for the current instruction pointer in this frame. */
 		instructionPointerReference?: string;
@@ -1953,9 +2006,10 @@ declare module DebugProtocol {
 			'arguments': Scope contains method arguments.
 			'locals': Scope contains local variables.
 			'registers': Scope contains registers. Only a single `registers` scope should be returned from a `scopes` request.
+			'returnValue': Scope contains one or more return values.
 			etc.
 		*/
-		presentationHint?: 'arguments' | 'locals' | 'registers' | string;
+		presentationHint?: 'arguments' | 'locals' | 'registers' | 'returnValue' | string;
 		/** The variables of this scope can be retrieved by passing the value of `variablesReference` to the `variables` request as long as execution remains suspended. See 'Lifetime of Object References' in the Overview section for details. */
 		variablesReference: number;
 		/** The number of named variables in this scope.
@@ -2020,6 +2074,16 @@ declare module DebugProtocol {
 			This attribute may be returned by a debug adapter if corresponding capability `supportsMemoryReferences` is true.
 		*/
 		memoryReference?: string;
+		/** A reference that allows the client to request the location where the variable is declared. This should be present only if the adapter is likely to be able to resolve the location.
+
+			This reference shares the same lifetime as the `variablesReference`. See 'Lifetime of Object References' in the Overview section for details.
+		*/
+		declarationLocationReference?: number;
+		/** A reference that allows the client to request the location where the variable's value is declared. For example, if the variable contains a function pointer, the adapter may be able to look up the function's location. This should be present only if the adapter is likely to be able to resolve the location.
+
+			This reference shares the same lifetime as the `variablesReference`. See 'Lifetime of Object References' in the Overview section for details.
+		*/
+		valueLocationReference?: number;
 	}
 
 	/** Properties of a variable that can be used to determine how to render the variable in the UI. */
diff --git a/src/vs/workbench/contrib/debug/common/debugUtils.ts b/src/vs/workbench/contrib/debug/common/debugUtils.ts
index 1b193bd9d5d..211dbe69ada 100644
--- a/src/vs/workbench/contrib/debug/common/debugUtils.ts
+++ b/src/vs/workbench/contrib/debug/common/debugUtils.ts
@@ -307,6 +307,9 @@ function convertPaths(msg: DebugProtocol.ProtocolMessage, fixSourcePath: (toDA:
 							di.body?.instructions.forEach(di => fixSourcePath(false, di.location));
 						}
 						break;
+					case 'locations':
+						fixSourcePath(false, (<DebugProtocol.LocationsResponse>response).body?.source);
+						break;
 					default:
 						break;
 				}
diff --git a/src/vs/workbench/contrib/debug/common/loadedScriptsPicker.ts b/src/vs/workbench/contrib/debug/common/loadedScriptsPicker.ts
index 5e9bb1fa33e..1784d05a1d8 100644
--- a/src/vs/workbench/contrib/debug/common/loadedScriptsPicker.ts
+++ b/src/vs/workbench/contrib/debug/common/loadedScriptsPicker.ts
@@ -35,7 +35,7 @@ export async function showLoadedScriptMenu(accessor: ServicesAccessor) {
 	const labelService = accessor.get(ILabelService);
 
 	const localDisposableStore = new DisposableStore();
-	const quickPick = quickInputService.createQuickPick<IPickerDebugItem>();
+	const quickPick = quickInputService.createQuickPick<IPickerDebugItem>({ useSeparators: true });
 	localDisposableStore.add(quickPick);
 	quickPick.matchOnLabel = quickPick.matchOnDescription = quickPick.matchOnDetail = quickPick.sortByLabel = false;
 	quickPick.placeholder = nls.localize('moveFocusedView.selectView', "Search loaded scripts by name");
diff --git a/src/vs/workbench/contrib/debug/test/browser/baseDebugView.test.ts b/src/vs/workbench/contrib/debug/test/browser/baseDebugView.test.ts
index 2f591514d5a..06ae7489aab 100644
--- a/src/vs/workbench/contrib/debug/test/browser/baseDebugView.test.ts
+++ b/src/vs/workbench/contrib/debug/test/browser/baseDebugView.test.ts
@@ -109,37 +109,38 @@ suite('Debug - Base Debug View', () => {
 
 	test('render expression value', () => {
 		let container = $('.container');
-		renderExpressionValue('render \n me', container, {}, NullHoverService);
+		const store = disposables.add(new DisposableStore());
+		renderExpressionValue(store, 'render \n me', container, {}, NullHoverService);
 		assert.strictEqual(container.className, 'value');
 		assert.strictEqual(container.textContent, 'render \n me');
 
 		const expression = new Expression('console');
 		expression.value = 'Object';
 		container = $('.container');
-		renderExpressionValue(expression, container, { colorize: true }, NullHoverService);
+		renderExpressionValue(store, expression, container, { colorize: true }, NullHoverService);
 		assert.strictEqual(container.className, 'value unavailable error');
 
 		expression.available = true;
 		expression.value = '"string value"';
 		container = $('.container');
-		renderExpressionValue(expression, container, { colorize: true, linkDetector }, NullHoverService);
+		renderExpressionValue(store, expression, container, { colorize: true, linkDetector }, NullHoverService);
 		assert.strictEqual(container.className, 'value string');
 		assert.strictEqual(container.textContent, '"string value"');
 
 		expression.type = 'boolean';
 		container = $('.container');
-		renderExpressionValue(expression, container, { colorize: true }, NullHoverService);
+		renderExpressionValue(store, expression, container, { colorize: true }, NullHoverService);
 		assert.strictEqual(container.className, 'value boolean');
 		assert.strictEqual(container.textContent, expression.value);
 
 		expression.value = 'this is a long string';
 		container = $('.container');
-		renderExpressionValue(expression, container, { colorize: true, maxValueLength: 4, linkDetector }, NullHoverService);
+		renderExpressionValue(store, expression, container, { colorize: true, maxValueLength: 4, linkDetector }, NullHoverService);
 		assert.strictEqual(container.textContent, 'this...');
 
 		expression.value = isWindows ? 'C:\\foo.js:5' : '/foo.js:5';
 		container = $('.container');
-		renderExpressionValue(expression, container, { colorize: true, linkDetector }, NullHoverService);
+		renderExpressionValue(store, expression, container, { colorize: true, linkDetector }, NullHoverService);
 		assert.ok(container.querySelector('a'));
 		assert.strictEqual(container.querySelector('a')!.textContent, expression.value);
 	});
diff --git a/src/vs/workbench/contrib/debug/test/browser/debugConfigurationManager.test.ts b/src/vs/workbench/contrib/debug/test/browser/debugConfigurationManager.test.ts
index 6cde637373c..d6b8d2fc244 100644
--- a/src/vs/workbench/contrib/debug/test/browser/debugConfigurationManager.test.ts
+++ b/src/vs/workbench/contrib/debug/test/browser/debugConfigurationManager.test.ts
@@ -61,7 +61,8 @@ suite('debugConfigurationManager', () => {
 			new TestExtensionService(),
 			new TestHistoryService(),
 			new UriIdentityService(fileService),
-			new ContextKeyService(configurationService));
+			new ContextKeyService(configurationService),
+			new NullLogService());
 	});
 
 	teardown(() => disposables.dispose());
diff --git a/src/vs/workbench/contrib/debug/test/browser/watchExpressionView.test.ts b/src/vs/workbench/contrib/debug/test/browser/watchExpressionView.test.ts
index 220e79d6a84..17ea09baa88 100644
--- a/src/vs/workbench/contrib/debug/test/browser/watchExpressionView.test.ts
+++ b/src/vs/workbench/contrib/debug/test/browser/watchExpressionView.test.ts
@@ -97,7 +97,7 @@ suite('Debug - Watch Debug View', () => {
 			}
 		});
 		instantiationService.stub(IConfigurationService, configurationService);
-		watchExpressionsRenderer = instantiationService.createInstance(WatchExpressionsRenderer);
+		watchExpressionsRenderer = instantiationService.createInstance(WatchExpressionsRenderer, null as any);
 		assertWatchVariable(disposables, watchExpressionsRenderer, true);
 	});
 
@@ -108,7 +108,7 @@ suite('Debug - Watch Debug View', () => {
 			}
 		});
 		instantiationService.stub(IConfigurationService, configurationService);
-		watchExpressionsRenderer = instantiationService.createInstance(WatchExpressionsRenderer);
+		watchExpressionsRenderer = instantiationService.createInstance(WatchExpressionsRenderer, null as any);
 		assertWatchVariable(disposables, watchExpressionsRenderer, false);
 	});
 });
diff --git a/src/vs/workbench/contrib/debug/test/common/mockDebug.ts b/src/vs/workbench/contrib/debug/test/common/mockDebug.ts
index 2cbd91f7e6d..e71bad73327 100644
--- a/src/vs/workbench/contrib/debug/test/common/mockDebug.ts
+++ b/src/vs/workbench/contrib/debug/test/common/mockDebug.ts
@@ -13,7 +13,7 @@ import { NullLogService } from 'vs/platform/log/common/log';
 import { IStorageService } from 'vs/platform/storage/common/storage';
 import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
 import { AbstractDebugAdapter } from 'vs/workbench/contrib/debug/common/abstractDebugAdapter';
-import { AdapterEndEvent, IAdapterManager, IBreakpoint, IBreakpointData, IBreakpointUpdateData, IConfig, IConfigurationManager, IDataBreakpoint, IDataBreakpointInfoResponse, IDebugModel, IDebugService, IDebugSession, IDebugSessionOptions, IDebugger, IExceptionBreakpoint, IExceptionInfo, IFunctionBreakpoint, IInstructionBreakpoint, ILaunch, IMemoryRegion, INewReplElementData, IRawModelUpdate, IRawStoppedDetails, IReplElement, IStackFrame, IThread, IViewModel, LoadedSourceEvent, State } from 'vs/workbench/contrib/debug/common/debug';
+import { AdapterEndEvent, IAdapterManager, IBreakpoint, IBreakpointData, IBreakpointUpdateData, IConfig, IConfigurationManager, IDataBreakpoint, IDataBreakpointInfoResponse, IDebugLocationReferenced, IDebugModel, IDebugService, IDebugSession, IDebugSessionOptions, IDebugger, IExceptionBreakpoint, IExceptionInfo, IFunctionBreakpoint, IInstructionBreakpoint, ILaunch, IMemoryRegion, INewReplElementData, IRawModelUpdate, IRawStoppedDetails, IReplElement, IStackFrame, IThread, IViewModel, LoadedSourceEvent, State } from 'vs/workbench/contrib/debug/common/debug';
 import { DebugCompoundRoot } from 'vs/workbench/contrib/debug/common/debugCompoundRoot';
 import { IInstructionBreakpointOptions } from 'vs/workbench/contrib/debug/common/debugModel';
 import { Source } from 'vs/workbench/contrib/debug/common/debugSource';
@@ -451,6 +451,9 @@ export class MockSession implements IDebugSession {
 	goto(threadId: number, targetId: number): Promise<DebugProtocol.GotoResponse> {
 		throw new Error('Method not implemented.');
 	}
+	resolveLocationReference(locationReference: number): Promise<IDebugLocationReferenced> {
+		throw new Error('Method not implemented.');
+	}
 }
 
 export class MockRawSession {
diff --git a/src/vs/workbench/contrib/editSessions/browser/editSessions.contribution.ts b/src/vs/workbench/contrib/editSessions/browser/editSessions.contribution.ts
index deb9b7e7548..2fb635b15da 100644
--- a/src/vs/workbench/contrib/editSessions/browser/editSessions.contribution.ts
+++ b/src/vs/workbench/contrib/editSessions/browser/editSessions.contribution.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable, MutableDisposable } from 'vs/base/common/lifecycle';
+import { Disposable, DisposableStore, MutableDisposable } from 'vs/base/common/lifecycle';
 import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions, IWorkbenchContribution } from 'vs/workbench/common/contributions';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { ILifecycleService, LifecyclePhase, ShutdownReason } from 'vs/workbench/services/lifecycle/common/lifecycle';
@@ -824,7 +824,8 @@ export class EditSessionsContribution extends Disposable implements IWorkbenchCo
 
 		// Prompt the user to use edit sessions if they currently could benefit from using it
 		if (this.hasEditSession()) {
-			const quickpick = this.quickInputService.createQuickPick<IQuickPickItem>();
+			const disposables = new DisposableStore();
+			const quickpick = disposables.add(this.quickInputService.createQuickPick<IQuickPickItem>());
 			quickpick.placeholder = localize('continue with cloud changes', "Select whether to bring your working changes with you");
 			quickpick.ok = false;
 			quickpick.ignoreFocusOut = true;
@@ -833,14 +834,14 @@ export class EditSessionsContribution extends Disposable implements IWorkbenchCo
 			quickpick.items = [withCloudChanges, withoutCloudChanges];
 
 			const continueWithCloudChanges = await new Promise<boolean>((resolve, reject) => {
-				quickpick.onDidAccept(() => {
+				disposables.add(quickpick.onDidAccept(() => {
 					resolve(quickpick.selectedItems[0] === withCloudChanges);
-					quickpick.hide();
-				});
-				quickpick.onDidHide(() => {
+					disposables.dispose();
+				}));
+				disposables.add(quickpick.onDidHide(() => {
 					reject(new CancellationError());
-					quickpick.hide();
-				});
+					disposables.dispose();
+				}));
 				quickpick.show();
 			});
 
@@ -960,7 +961,8 @@ export class EditSessionsContribution extends Disposable implements IWorkbenchCo
 	}
 
 	private async pickContinueEditSessionDestination(): Promise<string | undefined> {
-		const quickPick = this.quickInputService.createQuickPick<ContinueEditSessionItem>();
+		const disposables = new DisposableStore();
+		const quickPick = disposables.add(this.quickInputService.createQuickPick<ContinueEditSessionItem>({ useSeparators: true }));
 
 		const workspaceContext = this.contextService.getWorkbenchState() === WorkbenchState.FOLDER
 			? this.contextService.getWorkspace().folders[0].name
@@ -972,9 +974,12 @@ export class EditSessionsContribution extends Disposable implements IWorkbenchCo
 		});
 
 		const command = await new Promise<string | undefined>((resolve, reject) => {
-			quickPick.onDidHide(() => resolve(undefined));
+			disposables.add(quickPick.onDidHide(() => {
+				disposables.dispose();
+				resolve(undefined);
+			}));
 
-			quickPick.onDidAccept((e) => {
+			disposables.add(quickPick.onDidAccept((e) => {
 				const selection = quickPick.activeItems[0].command;
 
 				if (selection === installAdditionalContinueOnOptionsCommand.id) {
@@ -983,16 +988,16 @@ export class EditSessionsContribution extends Disposable implements IWorkbenchCo
 					resolve(selection);
 					quickPick.hide();
 				}
-			});
+			}));
 
 			quickPick.show();
 
-			quickPick.onDidTriggerItemButton(async (e) => {
+			disposables.add(quickPick.onDidTriggerItemButton(async (e) => {
 				if (e.item.documentation !== undefined) {
 					const uri = URI.isUri(e.item.documentation) ? URI.parse(e.item.documentation) : await this.commandService.executeCommand(e.item.documentation);
 					void this.openerService.open(uri, { openExternal: true });
 				}
-			});
+			}));
 		});
 
 		quickPick.dispose();
diff --git a/src/vs/workbench/contrib/editSessions/browser/editSessionsStorageService.ts b/src/vs/workbench/contrib/editSessions/browser/editSessionsStorageService.ts
index f612c22c3e3..bacd9020f42 100644
--- a/src/vs/workbench/contrib/editSessions/browser/editSessionsStorageService.ts
+++ b/src/vs/workbench/contrib/editSessions/browser/editSessionsStorageService.ts
@@ -311,24 +311,25 @@ export class EditSessionsWorkbenchService extends Disposable implements IEditSes
 	 * Prompts the user to pick an authentication option for storing and getting edit sessions.
 	 */
 	private async getAccountPreference(reason: 'read' | 'write'): Promise<AuthenticationSession & { providerId: string } | undefined> {
-		const quickpick = this.quickInputService.createQuickPick<ExistingSession | AuthenticationProviderOption | IQuickPickItem>();
+		const disposables = new DisposableStore();
+		const quickpick = disposables.add(this.quickInputService.createQuickPick<ExistingSession | AuthenticationProviderOption | IQuickPickItem>({ useSeparators: true }));
 		quickpick.ok = false;
 		quickpick.placeholder = reason === 'read' ? localize('choose account read placeholder', "Select an account to restore your working changes from the cloud") : localize('choose account placeholder', "Select an account to store your working changes in the cloud");
 		quickpick.ignoreFocusOut = true;
 		quickpick.items = await this.createQuickpickItems();
 
 		return new Promise((resolve, reject) => {
-			quickpick.onDidHide((e) => {
+			disposables.add(quickpick.onDidHide((e) => {
 				reject(new CancellationError());
-				quickpick.dispose();
-			});
+				disposables.dispose();
+			}));
 
-			quickpick.onDidAccept(async (e) => {
+			disposables.add(quickpick.onDidAccept(async (e) => {
 				const selection = quickpick.selectedItems[0];
 				const session = 'provider' in selection ? { ...await this.authenticationService.createSession(selection.provider.id, selection.provider.scopes), providerId: selection.provider.id } : ('session' in selection ? selection.session : undefined);
 				resolve(session);
 				quickpick.hide();
-			});
+			}));
 
 			quickpick.show();
 		});
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsViews.ts b/src/vs/workbench/contrib/extensions/browser/extensionsViews.ts
index 933788b162f..f2eea7c616d 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsViews.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsViews.ts
@@ -9,7 +9,7 @@ import { Event, Emitter } from 'vs/base/common/event';
 import { isCancellationError, getErrorMessage } from 'vs/base/common/errors';
 import { createErrorWithActions } from 'vs/base/common/errorMessage';
 import { PagedModel, IPagedModel, IPager, DelayedPagedModel } from 'vs/base/common/paging';
-import { SortOrder, IQueryOptions as IGalleryQueryOptions, SortBy as GallerySortBy, InstallExtensionInfo } from 'vs/platform/extensionManagement/common/extensionManagement';
+import { SortOrder, IQueryOptions as IGalleryQueryOptions, SortBy as GallerySortBy, InstallExtensionInfo, ExtensionGalleryErrorCode, ExtensionGalleryError } from 'vs/platform/extensionManagement/common/extensionManagement';
 import { IExtensionManagementServer, IExtensionManagementServerService, EnablementState, IWorkbenchExtensionManagementService, IWorkbenchExtensionEnablementService } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
 import { IExtensionRecommendationsService } from 'vs/workbench/services/extensionRecommendations/common/extensionRecommendations';
 import { areSameExtensions, getExtensionDependencies } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
@@ -897,10 +897,16 @@ export class ExtensionsListView extends ViewPane {
 				}
 			}
 			if (galleryExtensions.length) {
-				const extensions = await this.extensionsWorkbenchService.getExtensions(galleryExtensions.map(id => ({ id })), { source: options.source }, token);
-				for (const extension of extensions) {
-					if (extension.gallery && !extension.deprecationInfo && (await this.extensionManagementService.canInstall(extension.gallery))) {
-						result.push(extension);
+				try {
+					const extensions = await this.extensionsWorkbenchService.getExtensions(galleryExtensions.map(id => ({ id })), { source: options.source }, token);
+					for (const extension of extensions) {
+						if (extension.gallery && !extension.deprecationInfo && (await this.extensionManagementService.canInstall(extension.gallery))) {
+							result.push(extension);
+						}
+					}
+				} catch (error) {
+					if (!resourceExtensions.length || !this.isOfflineError(error)) {
+						throw error;
 					}
 				}
 			}
@@ -1067,7 +1073,7 @@ export class ExtensionsListView extends ViewPane {
 
 			if (count === 0 && this.isBodyVisible()) {
 				if (error) {
-					if (isOfflineError(error)) {
+					if (this.isOfflineError(error)) {
 						this.bodyTemplate.messageSeverityIcon.className = SeverityIcon.className(Severity.Warning);
 						this.bodyTemplate.messageBox.textContent = localize('offline error', "Unable to search the Marketplace when offline, please check your network connection.");
 					} else {
@@ -1085,6 +1091,13 @@ export class ExtensionsListView extends ViewPane {
 		this.updateSize();
 	}
 
+	private isOfflineError(error: Error): boolean {
+		if (error instanceof ExtensionGalleryError) {
+			return error.code === ExtensionGalleryErrorCode.Offline;
+		}
+		return isOfflineError(error);
+	}
+
 	protected updateSize() {
 		if (this.options.flexibleHeight) {
 			this.maximumBodySize = this.list?.model.length ? Number.POSITIVE_INFINITY : 0;
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsWidgets.ts b/src/vs/workbench/contrib/extensions/browser/extensionsWidgets.ts
index bca3e0d35ac..23b84778def 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsWidgets.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsWidgets.ts
@@ -561,7 +561,18 @@ export class ExtensionHoverWidget extends ExtensionWidget {
 					}, focus);
 				},
 				placement: 'element'
-			}, this.options.target, { markdown: () => Promise.resolve(this.getHoverMarkdown()), markdownNotSupportedFallback: undefined });
+			},
+				this.options.target,
+				{
+					markdown: () => Promise.resolve(this.getHoverMarkdown()),
+					markdownNotSupportedFallback: undefined
+				},
+				{
+					appearance: {
+						showHoverHint: true
+					}
+				}
+			);
 		}
 	}
 
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
index 1518123967e..ba69585c920 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
@@ -80,7 +80,6 @@ type ExtensionsLoadClassification = {
 export class Extension implements IExtension {
 
 	public enablementState: EnablementState = EnablementState.EnabledGlobally;
-	public readonly resourceExtension: IResourceExtension | undefined;
 
 	private galleryResourcesCache = new Map<string, any>();
 
@@ -97,7 +96,23 @@ export class Extension implements IExtension {
 		@IFileService private readonly fileService: IFileService,
 		@IProductService private readonly productService: IProductService
 	) {
-		this.resourceExtension = resourceExtensionInfo?.resourceExtension;
+	}
+
+	get resourceExtension(): IResourceExtension | undefined {
+		if (this.resourceExtensionInfo) {
+			return this.resourceExtensionInfo.resourceExtension;
+		}
+		if (this.local?.isWorkspaceScoped) {
+			return {
+				type: 'resource',
+				identifier: this.local.identifier,
+				location: this.local.location,
+				manifest: this.local.manifest,
+				changelogUri: this.local.changelogUrl,
+				readmeUri: this.local.readmeUrl,
+			};
+		}
+		return undefined;
 	}
 
 	get gallery(): IGalleryExtension | undefined {
@@ -1037,7 +1052,7 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 					this.setEnabledAutoUpdateExtensions([]);
 					this.setDisabledAutoUpdateExtensions([]);
 					this._onChange.fire(undefined);
-					this.extensionManagementService.resetPinnedStateForAllUserExtensions(!isAutoUpdateEnabled);
+					this.updateExtensionsPinnedState(!isAutoUpdateEnabled);
 				}
 				if (isAutoUpdateEnabled) {
 					this.eventuallyAutoUpdateExtensions();
@@ -1057,7 +1072,13 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 		this._register(Event.debounce(this.onChange, () => undefined, 100)(() => this.hasOutdatedExtensionsContextKey.set(this.outdated.length > 0)));
 		this._register(this.updateService.onStateChange(e => {
 			if ((e.type === StateType.CheckingForUpdates && e.explicit) || e.type === StateType.AvailableForDownload || e.type === StateType.Downloaded) {
-				this.eventuallyCheckForUpdates(true);
+				this.telemetryService.publicLog2<{}, {
+					owner: 'sandy081';
+					comment: 'Report when update check is triggered on product update';
+				}>('extensions:updatecheckonproductupdate');
+				if (this.isAutoCheckUpdatesEnabled()) {
+					this.checkForUpdates();
+				}
 			}
 		}));
 
@@ -1166,6 +1187,13 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 		}
 	}
 
+	private updateExtensionsPinnedState(pinned: boolean): Promise<void> {
+		return this.progressService.withProgress({
+			location: ProgressLocation.Extensions,
+			title: nls.localize('updatingExtensions', "Updating Extensions Auto Update State"),
+		}, () => this.extensionManagementService.resetPinnedStateForAllUserExtensions(pinned));
+	}
+
 	private reset(): void {
 		for (const task of this.tasksInProgress) {
 			task.cancel();
@@ -2301,26 +2329,34 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 		}
 
 		const extensionsToUninstall: UninstallExtensionInfo[] = [{ extension: extension.local }];
-		const dependents: IExtension[] = [];
-		for (const local of this.local) {
-			if (local === extension) {
-				continue;
-			}
-			if (!local.local) {
-				continue;
-			}
-			if (local.dependencies.length === 0) {
-				continue;
-			}
-			if (extension.extensionPack.some(id => areSameExtensions({ id }, local.identifier))) {
-				continue;
-			}
-			if (dependents.some(d => d.extensionPack.some(id => areSameExtensions({ id }, local.identifier)))) {
-				continue;
+		for (const packExtension of this.getAllPackExtensionsToUninstall(extension.local, this.local)) {
+			if (!extensionsToUninstall.some(e => areSameExtensions(e.extension.identifier, packExtension.identifier))) {
+				extensionsToUninstall.push({ extension: packExtension });
 			}
-			if (local.dependencies.some(dep => areSameExtensions(extension.identifier, { id: dep }))) {
-				dependents.push(local);
-				extensionsToUninstall.push({ extension: local.local });
+		}
+
+		const dependents: IExtension[] = [];
+		for (const { extension } of extensionsToUninstall) {
+			for (const local of this.local) {
+				if (!local.local) {
+					continue;
+				}
+				if (areSameExtensions(local.identifier, extension.identifier)) {
+					continue;
+				}
+				if (local.dependencies.length === 0) {
+					continue;
+				}
+				if (extension.manifest.extensionPack?.some(id => areSameExtensions({ id }, local.identifier))) {
+					continue;
+				}
+				if (dependents.some(d => d.extensionPack.some(id => areSameExtensions({ id }, local.identifier)))) {
+					continue;
+				}
+				if (local.dependencies.some(dep => areSameExtensions(extension.identifier, { id: dep }))) {
+					dependents.push(local);
+					extensionsToUninstall.push({ extension: local.local });
+				}
 			}
 		}
 
@@ -2349,6 +2385,28 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 		}, () => this.extensionManagementService.uninstallExtensions(extensionsToUninstall).then(() => undefined));
 	}
 
+	private getAllPackExtensionsToUninstall(extension: ILocalExtension, installed: IExtension[], checked: ILocalExtension[] = []): ILocalExtension[] {
+		if (checked.some(e => areSameExtensions(e.identifier, extension.identifier))) {
+			return [];
+		}
+		checked.push(extension);
+		const extensionsPack = extension.manifest.extensionPack ?? [];
+		if (extensionsPack.length) {
+			const packedExtensions: ILocalExtension[] = [];
+			for (const i of installed) {
+				if (i.local && !i.isBuiltin && extensionsPack.some(id => areSameExtensions({ id }, i.identifier))) {
+					packedExtensions.push(i.local);
+				}
+			}
+			const packOfPackedExtensions: ILocalExtension[] = [];
+			for (const packedExtension of packedExtensions) {
+				packOfPackedExtensions.push(...this.getAllPackExtensionsToUninstall(packedExtension, installed, checked));
+			}
+			return [...packedExtensions, ...packOfPackedExtensions];
+		}
+		return [];
+	}
+
 	private getErrorMessageForUninstallingAnExtensionWithDependents(extension: IExtension, dependents: IExtension[]): string {
 		if (dependents.length === 1) {
 			return nls.localize('singleDependentUninstallError', "Cannot uninstall '{0}' extension alone. '{1}' extension depends on this. Do you want to uninstall all these extensions?", extension.displayName, dependents[0].displayName);
diff --git a/src/vs/workbench/contrib/extensions/browser/media/extensionsWidgets.css b/src/vs/workbench/contrib/extensions/browser/media/extensionsWidgets.css
index 9179fa761d3..6a7ab84a23a 100644
--- a/src/vs/workbench/contrib/extensions/browser/media/extensionsWidgets.css
+++ b/src/vs/workbench/contrib/extensions/browser/media/extensionsWidgets.css
@@ -67,7 +67,7 @@
 	bottom: 9px;
 	left: 1px;
 	color: inherit;
-	font-size: 80%;
+	font-size: 80% !important;
 }
 
 .extension-bookmark .recommendation {
diff --git a/src/vs/workbench/contrib/extensions/electron-sandbox/debugExtensionHostAction.ts b/src/vs/workbench/contrib/extensions/electron-sandbox/debugExtensionHostAction.ts
index e47895d7016..47325650b92 100644
--- a/src/vs/workbench/contrib/extensions/electron-sandbox/debugExtensionHostAction.ts
+++ b/src/vs/workbench/contrib/extensions/electron-sandbox/debugExtensionHostAction.ts
@@ -4,36 +4,43 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Action } from 'vs/base/common/actions';
+import { Disposable } from 'vs/base/common/lifecycle';
 import { randomPort } from 'vs/base/common/ports';
 import * as nls from 'vs/nls';
 import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { INativeHostService } from 'vs/platform/native/common/native';
 import { IProductService } from 'vs/platform/product/common/productService';
+import { IProgressService, ProgressLocation } from 'vs/platform/progress/common/progress';
+import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
+import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
 import { IDebugService } from 'vs/workbench/contrib/debug/common/debug';
 import { ExtensionHostKind } from 'vs/workbench/services/extensions/common/extensionHostKind';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
+import { IHostService } from 'vs/workbench/services/host/browser/host';
 
 export class DebugExtensionHostAction extends Action {
 	static readonly ID = 'workbench.extensions.action.debugExtensionHost';
-	static readonly LABEL = nls.localize('debugExtensionHost', "Start Debugging Extension Host");
+	static readonly LABEL = nls.localize('debugExtensionHost', "Start Debugging Extension Host In New Window");
 	static readonly CSS_CLASS = 'debug-extension-host';
 
 	constructor(
-		@IDebugService private readonly _debugService: IDebugService,
 		@INativeHostService private readonly _nativeHostService: INativeHostService,
 		@IDialogService private readonly _dialogService: IDialogService,
 		@IExtensionService private readonly _extensionService: IExtensionService,
-		@IProductService private readonly productService: IProductService
+		@IProductService private readonly productService: IProductService,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+		@IHostService private readonly _hostService: IHostService,
 	) {
 		super(DebugExtensionHostAction.ID, DebugExtensionHostAction.LABEL, DebugExtensionHostAction.CSS_CLASS);
 	}
 
-	override async run(args: unknown): Promise<any> {
+	override async run(_args: unknown): Promise<any> {
 		const inspectPorts = await this._extensionService.getInspectPorts(ExtensionHostKind.LocalProcess, false);
 		if (inspectPorts.length === 0) {
 			const res = await this._dialogService.confirm({
-				message: nls.localize('restart1', "Profile Extensions"),
-				detail: nls.localize('restart2', "In order to profile extensions a restart is required. Do you want to restart '{0}' now?", this.productService.nameLong),
+				message: nls.localize('restart1', "Debug Extensions"),
+				detail: nls.localize('restart2', "In order to debug extensions a restart is required. Do you want to restart '{0}' now?", this.productService.nameLong),
 				primaryButton: nls.localize({ key: 'restart3', comment: ['&& denotes a mnemonic'] }, "&&Restart")
 			});
 			if (res.confirmed) {
@@ -48,14 +55,51 @@ export class DebugExtensionHostAction extends Action {
 			console.warn(`There are multiple extension hosts available for debugging. Picking the first one...`);
 		}
 
-		if (args !== undefined && (args as any)[0].dryRun) {
-			return { inspectPorts };
-		} else {
-			return this._debugService.startDebugging(undefined, {
-				type: 'node',
-				name: nls.localize('debugExtensionHost.launch.name', "Attach Extension Host"),
-				request: 'attach',
-				port: inspectPorts[0].port,
+		const s = this._instantiationService.createInstance(Storage);
+		s.storeDebugOnNewWindow(inspectPorts[0].port);
+
+		this._hostService.openWindow();
+	}
+}
+
+class Storage {
+	constructor(@IStorageService private readonly _storageService: IStorageService,) {
+	}
+
+	storeDebugOnNewWindow(targetPort: number) {
+		this._storageService.store('debugExtensionHost.debugPort', targetPort, StorageScope.APPLICATION, StorageTarget.MACHINE);
+	}
+
+	getAndDeleteDebugPortIfSet(): number | undefined {
+		const port = this._storageService.getNumber('debugExtensionHost.debugPort', StorageScope.APPLICATION);
+		if (port !== undefined) {
+			this._storageService.remove('debugExtensionHost.debugPort', StorageScope.APPLICATION);
+		}
+		return port;
+	}
+}
+
+export class DebugExtensionsContribution extends Disposable implements IWorkbenchContribution {
+	constructor(
+		@IDebugService private readonly _debugService: IDebugService,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+		@IProgressService _progressService: IProgressService,
+	) {
+		super();
+
+		const storage = this._instantiationService.createInstance(Storage);
+		const port = storage.getAndDeleteDebugPortIfSet();
+		if (port !== undefined) {
+			_progressService.withProgress({
+				location: ProgressLocation.Notification,
+				title: nls.localize('debugExtensionHost.progress', "Attaching Debugger To Extension Host"),
+			}, async p => {
+				await this._debugService.startDebugging(undefined, {
+					type: 'node',
+					name: nls.localize('debugExtensionHost.launch.name', "Attach Extension Host"),
+					request: 'attach',
+					port,
+				});
 			});
 		}
 	}
diff --git a/src/vs/workbench/contrib/extensions/electron-sandbox/extensions.contribution.ts b/src/vs/workbench/contrib/extensions/electron-sandbox/extensions.contribution.ts
index ded53b6b99b..024719af399 100644
--- a/src/vs/workbench/contrib/extensions/electron-sandbox/extensions.contribution.ts
+++ b/src/vs/workbench/contrib/extensions/electron-sandbox/extensions.contribution.ts
@@ -13,7 +13,7 @@ import { ServicesAccessor, IInstantiationService } from 'vs/platform/instantiati
 import { EditorPaneDescriptor, IEditorPaneRegistry } from 'vs/workbench/browser/editor';
 import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
 import { RuntimeExtensionsEditor, StartExtensionHostProfileAction, StopExtensionHostProfileAction, CONTEXT_PROFILE_SESSION_STATE, CONTEXT_EXTENSION_HOST_PROFILE_RECORDED, SaveExtensionHostProfileAction, IExtensionHostProfileService } from 'vs/workbench/contrib/extensions/electron-sandbox/runtimeExtensionsEditor';
-import { DebugExtensionHostAction } from 'vs/workbench/contrib/extensions/electron-sandbox/debugExtensionHostAction';
+import { DebugExtensionHostAction, DebugExtensionsContribution } from 'vs/workbench/contrib/extensions/electron-sandbox/debugExtensionHostAction';
 import { IEditorSerializer, IEditorFactoryRegistry, EditorExtensions } from 'vs/workbench/common/editor';
 import { ActiveEditorContext } from 'vs/workbench/common/contextkeys';
 import { EditorInput } from 'vs/workbench/common/editor/editorInput';
@@ -75,6 +75,7 @@ const workbenchRegistry = Registry.as<IWorkbenchContributionsRegistry>(Workbench
 workbenchRegistry.registerWorkbenchContribution(ExtensionsContributions, LifecyclePhase.Restored);
 workbenchRegistry.registerWorkbenchContribution(ExtensionsAutoProfiler, LifecyclePhase.Eventually);
 workbenchRegistry.registerWorkbenchContribution(RemoteExtensionsInitializerContribution, LifecyclePhase.Restored);
+workbenchRegistry.registerWorkbenchContribution(DebugExtensionsContribution, LifecyclePhase.Restored);
 // Register Commands
 
 CommandsRegistry.registerCommand(DebugExtensionHostAction.ID, (accessor: ServicesAccessor, ...args) => {
@@ -109,6 +110,15 @@ MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
 	when: ActiveEditorContext.isEqualTo(RuntimeExtensionsEditor.ID)
 });
 
+MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
+	command: {
+		id: DebugExtensionHostAction.ID,
+		title: localize('debugExtensionHost', "Debug Extensions In New Window"),
+		category: localize('developer', "Developer"),
+		icon: Codicon.debugStart
+	},
+});
+
 MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
 	command: {
 		id: StartExtensionHostProfileAction.ID,
diff --git a/src/vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler.ts b/src/vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler.ts
index 066e0372c6b..a598f8b7b2e 100644
--- a/src/vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler.ts
+++ b/src/vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler.ts
@@ -158,8 +158,8 @@ export class TextFileSaveErrorHandler extends Disposable implements ISaveErrorHa
 			// Save As
 			primaryActions.push(this.instantiationService.createInstance(SaveModelAsAction, model));
 
-			// Discard
-			primaryActions.push(this.instantiationService.createInstance(DiscardModelAction, model));
+			// Revert
+			primaryActions.push(this.instantiationService.createInstance(RevertModelAction, model));
 
 			// Message
 			if (isWriteLocked) {
@@ -306,12 +306,12 @@ class RetrySaveModelAction extends Action {
 	}
 }
 
-class DiscardModelAction extends Action {
+class RevertModelAction extends Action {
 
 	constructor(
 		private model: ITextFileEditorModel
 	) {
-		super('workbench.files.action.discardModel', localize('discard', "Discard"));
+		super('workbench.files.action.revertModel', localize('revert', "Revert"));
 	}
 
 	override async run(): Promise<void> {
diff --git a/src/vs/workbench/contrib/files/browser/explorerService.ts b/src/vs/workbench/contrib/files/browser/explorerService.ts
index 1c67fc0f491..4bc6f717eb5 100644
--- a/src/vs/workbench/contrib/files/browser/explorerService.ts
+++ b/src/vs/workbench/contrib/files/browser/explorerService.ts
@@ -152,6 +152,7 @@ export class ExplorerService implements IExplorerService {
 		return {
 			sortOrder: this.config.sortOrder,
 			lexicographicOptions: this.config.sortOrderLexicographicOptions,
+			reverse: this.config.sortOrderReverse,
 		};
 	}
 
@@ -521,6 +522,11 @@ export class ExplorerService implements IExplorerService {
 		if (this.config.sortOrderLexicographicOptions !== configLexicographicOptions) {
 			shouldRefresh = shouldRefresh || this.config.sortOrderLexicographicOptions !== undefined;
 		}
+		const sortOrderReverse = configuration?.explorer?.sortOrderReverse || false;
+
+		if (this.config.sortOrderReverse !== sortOrderReverse) {
+			shouldRefresh = shouldRefresh || this.config.sortOrderReverse !== undefined;
+		}
 
 		this.config = configuration.explorer;
 
diff --git a/src/vs/workbench/contrib/files/browser/fileActions.contribution.ts b/src/vs/workbench/contrib/files/browser/fileActions.contribution.ts
index 535d137bd4b..32a100021fc 100644
--- a/src/vs/workbench/contrib/files/browser/fileActions.contribution.ts
+++ b/src/vs/workbench/contrib/files/browser/fileActions.contribution.ts
@@ -20,6 +20,10 @@ import { CLOSE_SAVED_EDITORS_COMMAND_ID, CLOSE_EDITORS_IN_GROUP_COMMAND_ID, CLOS
 import { AutoSaveAfterShortDelayContext } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService';
 import { WorkbenchListDoubleSelection } from 'vs/platform/list/browser/listService';
 import { Schemas } from 'vs/base/common/network';
+// --- Start PWB: disable file downloads ---
+// eslint-disable-next-line no-duplicate-imports
+import { IsEnabledFileDownloads, IsEnabledFileUploads } from 'vs/workbench/common/contextkeys';
+// --- End PWB ---
 import { DirtyWorkingCopiesContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, WorkbenchStateContext, WorkspaceFolderCountContext, SidebarFocusContext, ActiveEditorCanRevertContext, ActiveEditorContext, ResourceContextKey, ActiveEditorAvailableEditorIdsContext, MultipleEditorsSelectedInGroupContext, TwoEditorsSelectedInGroupContext, SelectedEditorsInGroupFileOrUntitledResourceContextKey } from 'vs/workbench/common/contextkeys';
 import { IsWebContext } from 'vs/platform/contextkey/common/contextkeys';
 import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
@@ -323,7 +327,12 @@ MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, {
 		id: REOPEN_WITH_COMMAND_ID,
 		title: nls.localize('reopenWith', "Reopen Editor With...")
 	},
-	when: ActiveEditorAvailableEditorIdsContext
+	when: ContextKeyExpr.and(
+		// Editors with Available Choices to Open With
+		ActiveEditorAvailableEditorIdsContext,
+		// Not: editor groups
+		OpenEditorsGroupContext.toNegated()
+	)
 });
 
 MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, {
@@ -584,13 +593,18 @@ MenuRegistry.appendMenuItem(MenuId.ExplorerContext, ({
 		id: DOWNLOAD_COMMAND_ID,
 		title: DOWNLOAD_LABEL
 	},
-	when: ContextKeyExpr.or(
-		// native: for any remote resource
-		ContextKeyExpr.and(IsWebContext.toNegated(), ResourceContextKey.Scheme.notEqualsTo(Schemas.file)),
-		// web: for any files
-		ContextKeyExpr.and(IsWebContext, ExplorerFolderContext.toNegated(), ExplorerRootContext.toNegated()),
-		// web: for any folders if file system API support is provided
-		ContextKeyExpr.and(IsWebContext, HasWebFileSystemAccess)
+	// --- Start PWB: disable file downloads ---
+	when: ContextKeyExpr.and(
+		IsEnabledFileDownloads,
+		ContextKeyExpr.or(
+			// native: for any remote resource
+			ContextKeyExpr.and(IsWebContext.toNegated(), ResourceContextKey.Scheme.notEqualsTo(Schemas.file)),
+			// web: for any files
+			ContextKeyExpr.and(IsWebContext, ExplorerFolderContext.toNegated(), ExplorerRootContext.toNegated()),
+			// web: for any folders if file system API support is provided
+			ContextKeyExpr.and(IsWebContext, HasWebFileSystemAccess)
+		)
+		// --- End PWB ---
 	)
 }));
 
@@ -602,6 +616,9 @@ MenuRegistry.appendMenuItem(MenuId.ExplorerContext, ({
 		title: UPLOAD_LABEL,
 	},
 	when: ContextKeyExpr.and(
+		// --- Start PWB: disable file downloads ---
+		IsEnabledFileUploads,
+		// --- End PWB ---
 		// only in web
 		IsWebContext,
 		// only on folders
diff --git a/src/vs/workbench/contrib/files/browser/fileCommands.ts b/src/vs/workbench/contrib/files/browser/fileCommands.ts
index cb1a6d77051..80ea56544b6 100644
--- a/src/vs/workbench/contrib/files/browser/fileCommands.ts
+++ b/src/vs/workbench/contrib/files/browser/fileCommands.ts
@@ -39,7 +39,7 @@ import { EmbeddedCodeEditorWidget } from 'vs/editor/browser/widget/codeEditor/em
 import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
 import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
 import { isCancellationError } from 'vs/base/common/errors';
-import { toAction } from 'vs/base/common/actions';
+import { IAction, toAction } from 'vs/base/common/actions';
 import { EditorOpenSource, EditorResolution } from 'vs/platform/editor/common/editor';
 import { hash } from 'vs/base/common/hash';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
@@ -208,8 +208,8 @@ CommandsRegistry.registerCommand({
 
 		if (resources.length === 2) {
 			return editorService.openEditor({
-				original: { resource: resources[1] },
-				modified: { resource: resources[0] },
+				original: { resource: resources[0] },
+				modified: { resource: resources[1] },
 				options: { pinned: true }
 			});
 		}
@@ -467,16 +467,17 @@ async function doSaveEditors(accessor: ServicesAccessor, editors: IEditorIdentif
 		await editorService.save(editors, options);
 	} catch (error) {
 		if (!isCancellationError(error)) {
+			const actions: IAction[] = [toAction({ id: 'workbench.action.files.saveEditors', label: nls.localize('retry', "Retry"), run: () => instantiationService.invokeFunction(accessor => doSaveEditors(accessor, editors, options)) })];
+			const editorsToRevert = editors.filter(({ editor }) => !editor.hasCapability(EditorInputCapabilities.Untitled) /* all except untitled to prevent unexpected data-loss */);
+			if (editorsToRevert.length > 0) {
+				actions.push(toAction({ id: 'workbench.action.files.revertEditors', label: editorsToRevert.length > 1 ? nls.localize('revertAll', "Revert All") : nls.localize('revert', "Revert"), run: () => editorService.revert(editorsToRevert) }));
+			}
+
 			notificationService.notify({
 				id: editors.map(({ editor }) => hash(editor.resource?.toString())).join(), // ensure unique notification ID per set of editor
 				severity: Severity.Error,
 				message: nls.localize({ key: 'genericSaveError', comment: ['{0} is the resource that failed to save and {1} the error message'] }, "Failed to save '{0}': {1}", editors.map(({ editor }) => editor.getName()).join(', '), toErrorMessage(error, false)),
-				actions: {
-					primary: [
-						toAction({ id: 'workbench.action.files.saveEditors', label: nls.localize('retry', "Retry"), run: () => instantiationService.invokeFunction(accessor => doSaveEditors(accessor, editors, options)) }),
-						toAction({ id: 'workbench.action.files.revertEditors', label: nls.localize('discard', "Discard"), run: () => editorService.revert(editors) })
-					]
-				}
+				actions: { primary: actions }
 			});
 		}
 	}
diff --git a/src/vs/workbench/contrib/files/browser/files.contribution.ts b/src/vs/workbench/contrib/files/browser/files.contribution.ts
index c3607710cdb..d67442e165e 100644
--- a/src/vs/workbench/contrib/files/browser/files.contribution.ts
+++ b/src/vs/workbench/contrib/files/browser/files.contribution.ts
@@ -536,6 +536,11 @@ configurationRegistry.registerConfiguration({
 			],
 			'description': nls.localize('sortOrderLexicographicOptions', "Controls the lexicographic sorting of file and folder names in the Explorer.")
 		},
+		'explorer.sortOrderReverse': {
+			'type': 'boolean',
+			'description': nls.localize('sortOrderReverse', "Controls whether the file and folder sort order, should be reversed."),
+			'default': false,
+		},
 		'explorer.decorations.colors': {
 			type: 'boolean',
 			description: nls.localize('explorer.decorations.colors', "Controls whether file decorations should use colors."),
diff --git a/src/vs/workbench/contrib/files/browser/views/explorerViewer.ts b/src/vs/workbench/contrib/files/browser/views/explorerViewer.ts
index bda9eb9b2aa..69a9c9654ca 100644
--- a/src/vs/workbench/contrib/files/browser/views/explorerViewer.ts
+++ b/src/vs/workbench/contrib/files/browser/views/explorerViewer.ts
@@ -65,6 +65,9 @@ import { timeout } from 'vs/base/common/async';
 import { IFilesConfigurationService } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService';
 import { mainWindow } from 'vs/base/browser/window';
 import { IExplorerFileContribution, explorerFileContribRegistry } from 'vs/workbench/contrib/files/browser/explorerFileContrib';
+// --- Start PWB: disable file downloads ---
+import { IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService';
+// --- End PWB ---
 
 export class ExplorerDelegate implements IListVirtualDelegate<ExplorerItem> {
 
@@ -880,6 +883,10 @@ export class FileSorter implements ITreeSorter<ExplorerItem> {
 
 		const sortOrder = this.explorerService.sortOrderConfiguration.sortOrder;
 		const lexicographicOptions = this.explorerService.sortOrderConfiguration.lexicographicOptions;
+		const reverse = this.explorerService.sortOrderConfiguration.reverse;
+		if (reverse) {
+			[statA, statB] = [statB, statA];
+		}
 
 		let compareFileNames;
 		let compareFileExtensions;
@@ -1001,7 +1008,10 @@ export class FileDragAndDrop implements ITreeDragAndDrop<ExplorerItem> {
 		@IConfigurationService private configurationService: IConfigurationService,
 		@IInstantiationService private instantiationService: IInstantiationService,
 		@IWorkspaceEditingService private workspaceEditingService: IWorkspaceEditingService,
-		@IUriIdentityService private readonly uriIdentityService: IUriIdentityService
+		@IUriIdentityService private readonly uriIdentityService: IUriIdentityService,
+		// --- Start PWB: disable file downloads ---
+		@IBrowserWorkbenchEnvironmentService protected readonly environmentService: IBrowserWorkbenchEnvironmentService
+		// --- End PWB ---
 	) {
 		const updateDropEnablement = (e: IConfigurationChangeEvent | undefined) => {
 			if (!e || e.affectsConfiguration('explorer.enableDragAndDrop')) {
@@ -1226,15 +1236,19 @@ export class FileDragAndDrop implements ITreeDragAndDrop<ExplorerItem> {
 
 			// External file DND (Import/Upload file)
 			if (data instanceof NativeDragAndDropData) {
-				// Use local file import when supported
-				if (!isWeb || (isTemporaryWorkspace(this.contextService.getWorkspace()) && WebFileSystemAccess.supported(mainWindow))) {
-					const fileImport = this.instantiationService.createInstance(ExternalFileImport);
-					await fileImport.import(resolvedTarget, originalEvent, mainWindow);
-				}
-				// Otherwise fallback to browser based file upload
-				else {
-					const browserUpload = this.instantiationService.createInstance(BrowserFileUpload);
-					await browserUpload.upload(target, originalEvent);
+				// --- Start PWB: disable file downloads ---
+				if (this.environmentService.isEnabledFileUploads) {
+					// Use local file import when supported
+					if (!isWeb || (isTemporaryWorkspace(this.contextService.getWorkspace()) && WebFileSystemAccess.supported(mainWindow))) {
+						const fileImport = this.instantiationService.createInstance(ExternalFileImport);
+						await fileImport.import(resolvedTarget, originalEvent, mainWindow);
+					}
+					// Otherwise fallback to browser based file upload
+					else {
+						const browserUpload = this.instantiationService.createInstance(BrowserFileUpload);
+						await browserUpload.upload(target, originalEvent);
+					}
+					// --- End PWB ---
 				}
 			}
 
diff --git a/src/vs/workbench/contrib/files/common/files.ts b/src/vs/workbench/contrib/files/common/files.ts
index bd0c7a7b525..bf28812f28e 100644
--- a/src/vs/workbench/contrib/files/common/files.ts
+++ b/src/vs/workbench/contrib/files/common/files.ts
@@ -97,6 +97,7 @@ export interface IFilesConfiguration extends PlatformIFilesConfiguration, IWorkb
 		expandSingleFolderWorkspaces: boolean;
 		sortOrder: SortOrder;
 		sortOrderLexicographicOptions: LexicographicOptions;
+		sortOrderReverse: boolean;
 		decorations: {
 			colors: boolean;
 			badges: boolean;
@@ -143,6 +144,7 @@ export const enum LexicographicOptions {
 export interface ISortOrderConfiguration {
 	sortOrder: SortOrder;
 	lexicographicOptions: LexicographicOptions;
+	reverse: boolean;
 }
 
 export class TextFileContentProvider extends Disposable implements ITextModelContentProvider {
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChat.contribution.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChat.contribution.ts
index de45082752f..5e70e522748 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChat.contribution.ts
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChat.contribution.ts
@@ -4,10 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { EditorContributionInstantiation, registerEditorContribution } from 'vs/editor/browser/editorExtensions';
-import { IMenuItem, isIMenuItem, MenuId, MenuRegistry, registerAction2 } from 'vs/platform/actions/common/actions';
+import { IMenuItem, MenuRegistry, registerAction2 } from 'vs/platform/actions/common/actions';
 import { InlineChatController } from 'vs/workbench/contrib/inlineChat/browser/inlineChatController';
 import * as InlineChatActions from 'vs/workbench/contrib/inlineChat/browser/inlineChatActions';
-import { CTX_INLINE_CHAT_CONFIG_TXT_BTNS, CTX_INLINE_CHAT_REQUEST_IN_PROGRESS, INLINE_CHAT_ID, InlineChatConfigKeys, MENU_INLINE_CHAT_CONTENT_STATUS, MENU_INLINE_CHAT_EXECUTE, MENU_INLINE_CHAT_WIDGET_STATUS } from 'vs/workbench/contrib/inlineChat/common/inlineChat';
+import { CTX_INLINE_CHAT_EDITING, CTX_INLINE_CHAT_REQUEST_IN_PROGRESS, INLINE_CHAT_ID, MENU_INLINE_CHAT_CONTENT_STATUS, MENU_INLINE_CHAT_WIDGET_STATUS } from 'vs/workbench/contrib/inlineChat/common/inlineChat';
 import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
@@ -23,9 +23,8 @@ import { CancelAction, SubmitAction } from 'vs/workbench/contrib/chat/browser/ac
 import { localize } from 'vs/nls';
 import { CONTEXT_CHAT_INPUT_HAS_TEXT } from 'vs/workbench/contrib/chat/common/chatContextKeys';
 import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { InlineChatAccessibilityHelp } from 'vs/workbench/contrib/inlineChat/browser/inlineChatAccessibilityHelp';
+import { InlineChatExansionContextKey, InlineChatExpandLineAction } from 'vs/workbench/contrib/inlineChat/browser/inlineChatCurrentLine';
 
 
 // --- browser
@@ -35,24 +34,43 @@ registerSingleton(IInlineChatSavingService, InlineChatSavingServiceImpl, Instant
 
 registerEditorContribution(INLINE_CHAT_ID, InlineChatController, EditorContributionInstantiation.Eager); // EAGER because of notebook dispose/create of editors
 
+registerEditorContribution(InlineChatExansionContextKey.Id, InlineChatExansionContextKey, EditorContributionInstantiation.BeforeFirstInteraction);
+registerAction2(InlineChatExpandLineAction);
+
 // --- MENU special ---
 
-const sendActionMenuItem: IMenuItem = {
+const editActionMenuItem: IMenuItem = {
 	group: '0_main',
 	order: 0,
 	command: {
 		id: SubmitAction.ID,
-		title: localize('edit', "Send"),
+		title: localize('send.edit', "Edit Code"),
 	},
 	when: ContextKeyExpr.and(
 		CONTEXT_CHAT_INPUT_HAS_TEXT,
 		CTX_INLINE_CHAT_REQUEST_IN_PROGRESS.toNegated(),
-		CTX_INLINE_CHAT_CONFIG_TXT_BTNS
+		CTX_INLINE_CHAT_EDITING
 	),
 };
 
-MenuRegistry.appendMenuItem(MENU_INLINE_CHAT_CONTENT_STATUS, sendActionMenuItem);
-MenuRegistry.appendMenuItem(MENU_INLINE_CHAT_WIDGET_STATUS, sendActionMenuItem);
+const generateActionMenuItem: IMenuItem = {
+	group: '0_main',
+	order: 0,
+	command: {
+		id: SubmitAction.ID,
+		title: localize('send.generate', "Generate"),
+	},
+	when: ContextKeyExpr.and(
+		CONTEXT_CHAT_INPUT_HAS_TEXT,
+		CTX_INLINE_CHAT_REQUEST_IN_PROGRESS.toNegated(),
+		CTX_INLINE_CHAT_EDITING.toNegated()
+	),
+};
+
+MenuRegistry.appendMenuItem(MENU_INLINE_CHAT_CONTENT_STATUS, editActionMenuItem);
+MenuRegistry.appendMenuItem(MENU_INLINE_CHAT_CONTENT_STATUS, generateActionMenuItem);
+MenuRegistry.appendMenuItem(MENU_INLINE_CHAT_WIDGET_STATUS, editActionMenuItem);
+MenuRegistry.appendMenuItem(MENU_INLINE_CHAT_WIDGET_STATUS, generateActionMenuItem);
 
 const cancelActionMenuItem: IMenuItem = {
 	group: '0_main',
@@ -89,55 +107,9 @@ registerAction2(InlineChatActions.ViewInChatAction);
 registerAction2(InlineChatActions.ToggleDiffForChange);
 registerAction2(InlineChatActions.AcceptChanges);
 
-registerAction2(InlineChatActions.CopyRecordings);
-
 const workbenchContributionsRegistry = Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench);
 workbenchContributionsRegistry.registerWorkbenchContribution(InlineChatNotebookContribution, LifecyclePhase.Restored);
 
 registerWorkbenchContribution2(InlineChatEnabler.Id, InlineChatEnabler, WorkbenchPhase.AfterRestored);
 AccessibleViewRegistry.register(new InlineChatAccessibleView());
 AccessibleViewRegistry.register(new InlineChatAccessibilityHelp());
-
-
-// MARK - Menu Copier
-// menu copier that we use for text-button mode.
-// When active it filters out the send and cancel actions from the chat menu
-class MenuCopier implements IDisposable {
-
-	static Id = 'inlineChat.menuCopier';
-
-	readonly dispose: () => void;
-
-	constructor(@IConfigurationService configService: IConfigurationService,) {
-
-		const store = new DisposableStore();
-		function updateMenu() {
-			store.clear();
-			for (const item of MenuRegistry.getMenuItems(MenuId.ChatExecute)) {
-				if (configService.getValue<boolean>(InlineChatConfigKeys.ExpTextButtons) && isIMenuItem(item) && (item.command.id === SubmitAction.ID || item.command.id === CancelAction.ID)) {
-					continue;
-				}
-				store.add(MenuRegistry.appendMenuItem(MENU_INLINE_CHAT_EXECUTE, item));
-			}
-		}
-		updateMenu();
-		const listener = MenuRegistry.onDidChangeMenu(e => {
-			if (e.has(MenuId.ChatExecute)) {
-				updateMenu();
-			}
-		});
-		const listener2 = configService.onDidChangeConfiguration(e => {
-			if (e.affectsConfiguration(InlineChatConfigKeys.ExpTextButtons)) {
-				updateMenu();
-			}
-		});
-
-		this.dispose = () => {
-			listener.dispose();
-			listener2.dispose();
-			store.dispose();
-		};
-	}
-}
-
-registerWorkbenchContribution2(MenuCopier.Id, MenuCopier, WorkbenchPhase.AfterRestored);
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatActions.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatActions.ts
index 2009001a7ea..22d6a83fa5d 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatActions.ts
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatActions.ts
@@ -11,24 +11,22 @@ import { EmbeddedDiffEditorWidget } from 'vs/editor/browser/widget/diffEditor/em
 import { EmbeddedCodeEditorWidget } from 'vs/editor/browser/widget/codeEditor/embeddedCodeEditorWidget';
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
 import { InlineChatController, InlineChatRunOptions } from 'vs/workbench/contrib/inlineChat/browser/inlineChatController';
-import { ACTION_ACCEPT_CHANGES, CTX_INLINE_CHAT_HAS_AGENT, CTX_INLINE_CHAT_HAS_STASHED_SESSION, CTX_INLINE_CHAT_FOCUSED, CTX_INLINE_CHAT_INNER_CURSOR_FIRST, CTX_INLINE_CHAT_INNER_CURSOR_LAST, CTX_INLINE_CHAT_VISIBLE, CTX_INLINE_CHAT_OUTER_CURSOR_POSITION, CTX_INLINE_CHAT_USER_DID_EDIT, CTX_INLINE_CHAT_DOCUMENT_CHANGED, CTX_INLINE_CHAT_EDIT_MODE, EditMode, MENU_INLINE_CHAT_WIDGET_STATUS, CTX_INLINE_CHAT_REQUEST_IN_PROGRESS, CTX_INLINE_CHAT_RESPONSE_TYPE, InlineChatResponseType, ACTION_REGENERATE_RESPONSE, MENU_INLINE_CHAT_CONTENT_STATUS, ACTION_VIEW_IN_CHAT, ACTION_TOGGLE_DIFF, CTX_INLINE_CHAT_CHANGE_HAS_DIFF, CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF } from 'vs/workbench/contrib/inlineChat/common/inlineChat';
+import { ACTION_ACCEPT_CHANGES, CTX_INLINE_CHAT_HAS_AGENT, CTX_INLINE_CHAT_HAS_STASHED_SESSION, CTX_INLINE_CHAT_FOCUSED, CTX_INLINE_CHAT_INNER_CURSOR_FIRST, CTX_INLINE_CHAT_INNER_CURSOR_LAST, CTX_INLINE_CHAT_VISIBLE, CTX_INLINE_CHAT_OUTER_CURSOR_POSITION, CTX_INLINE_CHAT_USER_DID_EDIT, CTX_INLINE_CHAT_DOCUMENT_CHANGED, CTX_INLINE_CHAT_EDIT_MODE, EditMode, MENU_INLINE_CHAT_WIDGET_STATUS, CTX_INLINE_CHAT_REQUEST_IN_PROGRESS, CTX_INLINE_CHAT_RESPONSE_TYPE, InlineChatResponseType, ACTION_REGENERATE_RESPONSE, MENU_INLINE_CHAT_CONTENT_STATUS, ACTION_VIEW_IN_CHAT, ACTION_TOGGLE_DIFF, CTX_INLINE_CHAT_CHANGE_HAS_DIFF, CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF, MENU_INLINE_CHAT_ZONE, ACTION_DISCARD_CHANGES } from 'vs/workbench/contrib/inlineChat/common/inlineChat';
 import { localize, localize2 } from 'vs/nls';
 import { Action2, IAction2Options } from 'vs/platform/actions/common/actions';
-import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
 import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
 import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { IQuickInputService, IQuickPickItem } from 'vs/platform/quickinput/common/quickInput';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
-import { fromNow } from 'vs/base/common/date';
-import { IInlineChatSessionService, Recording } from './inlineChatSessionService';
 import { CONTEXT_ACCESSIBILITY_MODE_ENABLED } from 'vs/platform/accessibility/common/accessibility';
 import { CommandsRegistry } from 'vs/platform/commands/common/commands';
 import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
 import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
 import { ILogService } from 'vs/platform/log/common/log';
 import { IChatService } from 'vs/workbench/contrib/chat/common/chatService';
+import { CONTEXT_CHAT_INPUT_HAS_TEXT, CONTEXT_IN_CHAT_INPUT } from 'vs/workbench/contrib/chat/common/chatContextKeys';
+import { HunkInformation } from 'vs/workbench/contrib/inlineChat/browser/inlineChatSession';
 
 CommandsRegistry.registerCommandAlias('interactiveEditor.start', 'inlineChat.start');
 CommandsRegistry.registerCommandAlias('interactive.acceptChanges', ACTION_ACCEPT_CHANGES);
@@ -263,20 +261,25 @@ export class AcceptChanges extends AbstractInlineChatAction {
 				weight: KeybindingWeight.WorkbenchContrib + 10,
 				primary: KeyMod.CtrlCmd | KeyCode.Enter,
 			}],
-			menu: {
+			menu: [{
 				id: MENU_INLINE_CHAT_WIDGET_STATUS,
 				group: '0_main',
 				order: 1,
 				when: ContextKeyExpr.and(
+					CONTEXT_CHAT_INPUT_HAS_TEXT.toNegated(),
 					CTX_INLINE_CHAT_REQUEST_IN_PROGRESS.toNegated(),
 					CTX_INLINE_CHAT_RESPONSE_TYPE.isEqualTo(InlineChatResponseType.MessagesAndEdits)
 				),
-			}
+			}, {
+				id: MENU_INLINE_CHAT_ZONE,
+				group: 'navigation',
+				order: 1,
+			}]
 		});
 	}
 
-	override async runInlineChatCommand(_accessor: ServicesAccessor, ctrl: InlineChatController): Promise<void> {
-		ctrl.acceptHunk();
+	override async runInlineChatCommand(_accessor: ServicesAccessor, ctrl: InlineChatController, _editor: ICodeEditor, hunk?: HunkInformation | any): Promise<void> {
+		ctrl.acceptHunk(hunk);
 	}
 }
 
@@ -284,20 +287,25 @@ export class DiscardHunkAction extends AbstractInlineChatAction {
 
 	constructor() {
 		super({
-			id: 'inlineChat.discardHunkChange',
+			id: ACTION_DISCARD_CHANGES,
 			title: localize('discard', 'Discard'),
-			icon: Codicon.clearAll,
+			icon: Codicon.chromeClose,
 			precondition: CTX_INLINE_CHAT_VISIBLE,
-			menu: {
+			menu: [{
 				id: MENU_INLINE_CHAT_WIDGET_STATUS,
 				group: '0_main',
 				order: 2,
 				when: ContextKeyExpr.and(
+					CONTEXT_CHAT_INPUT_HAS_TEXT.toNegated(),
 					CTX_INLINE_CHAT_REQUEST_IN_PROGRESS.negate(),
 					CTX_INLINE_CHAT_RESPONSE_TYPE.isEqualTo(InlineChatResponseType.MessagesAndEdits),
 					CTX_INLINE_CHAT_EDIT_MODE.isEqualTo(EditMode.Live)
 				),
-			},
+			}, {
+				id: MENU_INLINE_CHAT_ZONE,
+				group: 'navigation',
+				order: 2
+			}],
 			keybinding: {
 				weight: KeybindingWeight.WorkbenchContrib,
 				primary: KeyCode.Escape,
@@ -306,8 +314,8 @@ export class DiscardHunkAction extends AbstractInlineChatAction {
 		});
 	}
 
-	async runInlineChatCommand(_accessor: ServicesAccessor, ctrl: InlineChatController, _editor: ICodeEditor, ..._args: any[]): Promise<void> {
-		return ctrl.discardHunk();
+	async runInlineChatCommand(_accessor: ServicesAccessor, ctrl: InlineChatController, _editor: ICodeEditor, hunk?: HunkInformation | any): Promise<void> {
+		return ctrl.discardHunk(hunk);
 	}
 }
 
@@ -325,6 +333,7 @@ export class RerunAction extends AbstractInlineChatAction {
 				group: '0_main',
 				order: 5,
 				when: ContextKeyExpr.and(
+					CONTEXT_CHAT_INPUT_HAS_TEXT.toNegated(),
 					CTX_INLINE_CHAT_REQUEST_IN_PROGRESS.negate(),
 					CTX_INLINE_CHAT_RESPONSE_TYPE.notEqualsTo(InlineChatResponseType.None)
 				)
@@ -444,42 +453,6 @@ export class MoveToPreviousHunk extends AbstractInlineChatAction {
 	}
 }
 
-export class CopyRecordings extends AbstractInlineChatAction {
-
-	constructor() {
-		super({
-			id: 'inlineChat.copyRecordings',
-			f1: true,
-			title: localize2('copyRecordings', "(Developer) Write Exchange to Clipboard")
-		});
-	}
-
-	override async runInlineChatCommand(accessor: ServicesAccessor): Promise<void> {
-
-		const clipboardService = accessor.get(IClipboardService);
-		const quickPickService = accessor.get(IQuickInputService);
-		const ieSessionService = accessor.get(IInlineChatSessionService);
-
-		const recordings = ieSessionService.recordings().filter(r => r.exchanges.length > 0);
-		if (recordings.length === 0) {
-			return;
-		}
-
-		const picks: (IQuickPickItem & { rec: Recording })[] = recordings.map(rec => {
-			return {
-				rec,
-				label: localize('label', "'{0}' and {1} follow ups ({2})", rec.exchanges[0].prompt, rec.exchanges.length - 1, fromNow(rec.when, true)),
-				tooltip: rec.exchanges.map(ex => ex.prompt).join('\n'),
-			};
-		});
-
-		const pick = await quickPickService.pick(picks, { canPickMany: false });
-		if (pick) {
-			clipboardService.writeText(JSON.stringify(pick.rec, undefined, 2));
-		}
-	}
-}
-
 export class ViewInChatAction extends AbstractInlineChatAction {
 	constructor() {
 		super({
@@ -497,6 +470,7 @@ export class ViewInChatAction extends AbstractInlineChatAction {
 				group: '0_main',
 				order: 1,
 				when: ContextKeyExpr.and(
+					CONTEXT_CHAT_INPUT_HAS_TEXT.toNegated(),
 					CTX_INLINE_CHAT_RESPONSE_TYPE.isEqualTo(InlineChatResponseType.Messages),
 					CTX_INLINE_CHAT_REQUEST_IN_PROGRESS.negate()
 				)
@@ -504,6 +478,7 @@ export class ViewInChatAction extends AbstractInlineChatAction {
 			keybinding: {
 				weight: KeybindingWeight.WorkbenchContrib,
 				primary: KeyMod.CtrlCmd | KeyCode.DownArrow,
+				when: CONTEXT_IN_CHAT_INPUT
 			}
 		});
 	}
@@ -523,16 +498,21 @@ export class ToggleDiffForChange extends AbstractInlineChatAction {
 			toggled: {
 				condition: CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF,
 			},
-			menu: {
+			menu: [{
 				id: MENU_INLINE_CHAT_WIDGET_STATUS,
 				group: 'zzz',
 				when: ContextKeyExpr.and(CTX_INLINE_CHAT_EDIT_MODE.isEqualTo(EditMode.Live)),
 				order: 1,
-			}
+			}, {
+				id: MENU_INLINE_CHAT_ZONE,
+				group: 'navigation',
+				when: CTX_INLINE_CHAT_CHANGE_HAS_DIFF,
+				order: 2
+			}]
 		});
 	}
 
-	override runInlineChatCommand(accessor: ServicesAccessor, ctrl: InlineChatController): void {
-		ctrl.toggleDiff();
+	override runInlineChatCommand(_accessor: ServicesAccessor, ctrl: InlineChatController, _editor: ICodeEditor, hunkInfo: HunkInformation | any): void {
+		ctrl.toggleDiff(hunkInfo);
 	}
 }
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatContentWidget.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatContentWidget.ts
index be23211e5db..7e27344c6fe 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatContentWidget.ts
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatContentWidget.ts
@@ -11,7 +11,7 @@ import { Emitter, Event } from 'vs/base/common/event';
 import { DisposableStore } from 'vs/base/common/lifecycle';
 import { IPosition, Position } from 'vs/editor/common/core/position';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { inlineChatBackground, InlineChatConfigKeys, MENU_INLINE_CHAT_CONTENT_STATUS, MENU_INLINE_CHAT_EXECUTE } from 'vs/workbench/contrib/inlineChat/common/inlineChat';
+import { inlineChatBackground, MENU_INLINE_CHAT_CONTENT_STATUS } from 'vs/workbench/contrib/inlineChat/common/inlineChat';
 import { Session } from 'vs/workbench/contrib/inlineChat/browser/inlineChatSession';
 import { ChatWidget, IChatWidgetLocationOptions } from 'vs/workbench/contrib/chat/browser/chatWidget';
 import { ChatAgentLocation } from 'vs/workbench/contrib/chat/common/chatAgents';
@@ -23,7 +23,7 @@ import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { EditorOption } from 'vs/editor/common/config/editorOptions';
 import { ScrollType } from 'vs/editor/common/editorCommon';
 import { MenuWorkbenchToolBar } from 'vs/platform/actions/browser/toolbar';
-import { MenuItemAction } from 'vs/platform/actions/common/actions';
+import { MenuId, MenuItemAction } from 'vs/platform/actions/common/actions';
 import { TextOnlyMenuEntryActionViewItem } from 'vs/platform/actions/browser/menuEntryActionViewItem';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
@@ -38,7 +38,7 @@ export class InlineChatContentWidget implements IContentWidget {
 	private readonly _inputContainer = document.createElement('div');
 	private readonly _toolbarContainer = document.createElement('div');
 
-	private _position?: IPosition;
+	private _position?: IContentWidgetPosition;
 
 	private readonly _onDidBlur = this._store.add(new Emitter<void>());
 	readonly onDidBlur: Event<void> = this._onDidBlur.event;
@@ -71,7 +71,7 @@ export class InlineChatContentWidget implements IContentWidget {
 		this._widget = scopedInstaService.createInstance(
 			ChatWidget,
 			location,
-			{ resource: true },
+			undefined,
 			{
 				defaultElementHeight: 32,
 				editorOverflowWidgetsDomNode: _editor.getOverflowWidgetsDomNode(),
@@ -81,7 +81,7 @@ export class InlineChatContentWidget implements IContentWidget {
 				supportsFileReferences: configurationService.getValue(`chat.experimental.variables.${location.location}`) === true,
 				menus: {
 					telemetrySource: 'inlineChat-content',
-					executeToolbar: MENU_INLINE_CHAT_EXECUTE,
+					executeToolbar: MenuId.ChatExecute,
 				},
 				filter: _item => false
 			},
@@ -103,10 +103,6 @@ export class InlineChatContentWidget implements IContentWidget {
 		this._domNode.appendChild(this._inputContainer);
 
 		this._toolbarContainer.classList.add('toolbar');
-		if (configurationService.getValue<boolean>(InlineChatConfigKeys.ExpTextButtons)) {
-			this._toolbarContainer.style.display = 'inherit';
-			this._domNode.style.paddingBottom = '4px';
-		}
 		this._domNode.appendChild(this._toolbarContainer);
 
 		const toolbar = this._store.add(scopedInstaService.createInstance(MenuWorkbenchToolBar, this._toolbarContainer, MENU_INLINE_CHAT_CONTENT_STATUS, {
@@ -152,13 +148,7 @@ export class InlineChatContentWidget implements IContentWidget {
 	}
 
 	getPosition(): IContentWidgetPosition | null {
-		if (!this._position) {
-			return null;
-		}
-		return {
-			position: this._position,
-			preference: [ContentWidgetPositionPreference.ABOVE]
-		};
+		return this._position ?? null;
 	}
 
 	beforeRender(): IDimension | null {
@@ -167,7 +157,7 @@ export class InlineChatContentWidget implements IContentWidget {
 		const inputEditorHeight = this._widget.contentHeight;
 
 		const height = Math.min(maxHeight, inputEditorHeight);
-		const width = 390;
+		const width = 400;
 		this._widget.layout(height, width);
 
 		dom.size(this._domNode, width, null);
@@ -195,7 +185,7 @@ export class InlineChatContentWidget implements IContentWidget {
 		return this._widget.inputEditor.getValue();
 	}
 
-	show(position: IPosition) {
+	show(position: IPosition, below: boolean) {
 		if (!this._visible) {
 			this._visible = true;
 			this._focusNext = true;
@@ -204,7 +194,11 @@ export class InlineChatContentWidget implements IContentWidget {
 
 			const wordInfo = this._editor.getModel()?.getWordAtPosition(position);
 
-			this._position = wordInfo ? new Position(position.lineNumber, wordInfo.startColumn) : position;
+			this._position = {
+				position: wordInfo ? new Position(position.lineNumber, wordInfo.startColumn) : position,
+				preference: [below ? ContentWidgetPositionPreference.BELOW : ContentWidgetPositionPreference.ABOVE]
+			};
+
 			this._editor.addContentWidget(this);
 			this._widget.setContext(true);
 			this._widget.setVisible(true);
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatController.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatController.ts
index 782bc3b95bc..233942a24d8 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatController.ts
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatController.ts
@@ -5,23 +5,28 @@
 
 import * as aria from 'vs/base/browser/ui/aria/aria';
 import { Barrier, DeferredPromise, Queue } from 'vs/base/common/async';
-import { CancellationTokenSource } from 'vs/base/common/cancellation';
+import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
 import { toErrorMessage } from 'vs/base/common/errorMessage';
 import { onUnexpectedError } from 'vs/base/common/errors';
 import { Emitter, Event } from 'vs/base/common/event';
 import { Lazy } from 'vs/base/common/lazy';
 import { DisposableStore, MutableDisposable, toDisposable } from 'vs/base/common/lifecycle';
 import { MovingAverage } from 'vs/base/common/numbers';
+import { isEqual } from 'vs/base/common/resources';
 import { StopWatch } from 'vs/base/common/stopwatch';
 import { assertType } from 'vs/base/common/types';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
+import { generateUuid } from 'vs/base/common/uuid';
+import { ICodeEditor, isCodeEditor } from 'vs/editor/browser/editorBrowser';
 import { IPosition, Position } from 'vs/editor/common/core/position';
 import { IRange, Range } from 'vs/editor/common/core/range';
-import { ISelection, Selection } from 'vs/editor/common/core/selection';
+import { ISelection, Selection, SelectionDirection } from 'vs/editor/common/core/selection';
 import { IEditorContribution } from 'vs/editor/common/editorCommon';
 import { TextEdit } from 'vs/editor/common/languages';
+import { IValidEditOperation } from 'vs/editor/common/model';
 import { IEditorWorkerService } from 'vs/editor/common/services/editorWorker';
-import { InlineCompletionsController } from 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsController';
+import { DefaultModelSHA1Computer } from 'vs/editor/common/services/modelService';
+import { InlineCompletionsController } from 'vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController';
+import { MessageController } from 'vs/editor/contrib/message/browser/messageController';
 import { localize } from 'vs/nls';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
@@ -29,33 +34,28 @@ import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
 import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { ILogService } from 'vs/platform/log/common/log';
 import { showChatView } from 'vs/workbench/contrib/chat/browser/chat';
+import { IChatWidgetLocationOptions } from 'vs/workbench/contrib/chat/browser/chatWidget';
+import { ChatAgentLocation } from 'vs/workbench/contrib/chat/common/chatAgents';
+import { ChatModel, ChatRequestRemovalReason, IChatRequestModel, IChatTextEditGroup, IChatTextEditGroupState, IResponse } from 'vs/workbench/contrib/chat/common/chatModel';
 import { IChatService } from 'vs/workbench/contrib/chat/common/chatService';
-import { IInlineChatSavingService } from './inlineChatSavingService';
-import { EmptyResponse, ErrorResponse, ReplyResponse, Session, SessionPrompt } from 'vs/workbench/contrib/inlineChat/browser/inlineChatSession';
-import { IInlineChatSessionService } from './inlineChatSessionService';
-import { EditModeStrategy, IEditObserver, LiveStrategy, PreviewStrategy, ProgressingEditsOptions } from 'vs/workbench/contrib/inlineChat/browser/inlineChatStrategies';
-import { InlineChatZoneWidget } from './inlineChatZoneWidget';
-import { CTX_INLINE_CHAT_REQUEST_IN_PROGRESS, CTX_INLINE_CHAT_RESPONSE_TYPE, CTX_INLINE_CHAT_USER_DID_EDIT, CTX_INLINE_CHAT_VISIBLE, EditMode, INLINE_CHAT_ID, InlineChatConfigKeys, InlineChatResponseType } from 'vs/workbench/contrib/inlineChat/common/inlineChat';
-import { StashedSession } from './inlineChatSession';
-import { IValidEditOperation } from 'vs/editor/common/model';
 import { InlineChatContentWidget } from 'vs/workbench/contrib/inlineChat/browser/inlineChatContentWidget';
-import { MessageController } from 'vs/editor/contrib/message/browser/messageController';
-import { ChatModel, ChatRequestRemovalReason, IChatRequestModel, IChatTextEditGroup, IChatTextEditGroupState, IResponse } from 'vs/workbench/contrib/chat/common/chatModel';
+import { HunkInformation, HunkState, Session, StashedSession } from 'vs/workbench/contrib/inlineChat/browser/inlineChatSession';
 import { InlineChatError } from 'vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl';
-import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
-import { DefaultModelSHA1Computer } from 'vs/editor/common/services/modelService';
-import { generateUuid } from 'vs/base/common/uuid';
-import { isEqual } from 'vs/base/common/resources';
-import { ChatAgentLocation } from 'vs/workbench/contrib/chat/common/chatAgents';
+import { EditModeStrategy, HunkAction, IEditObserver, LiveStrategy, PreviewStrategy, ProgressingEditsOptions } from 'vs/workbench/contrib/inlineChat/browser/inlineChatStrategies';
+import { CTX_INLINE_CHAT_EDITING, CTX_INLINE_CHAT_REQUEST_IN_PROGRESS, CTX_INLINE_CHAT_RESPONSE_TYPE, CTX_INLINE_CHAT_USER_DID_EDIT, CTX_INLINE_CHAT_VISIBLE, EditMode, INLINE_CHAT_ID, InlineChatConfigKeys, InlineChatResponseType } from 'vs/workbench/contrib/inlineChat/common/inlineChat';
 import { INotebookEditorService } from 'vs/workbench/contrib/notebook/browser/services/notebookEditorService';
-import { IChatWidgetLocationOptions } from 'vs/workbench/contrib/chat/browser/chatWidget';
+import { IEditorService, SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService';
+import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
+import { IInlineChatSavingService } from './inlineChatSavingService';
+import { IInlineChatSessionService } from './inlineChatSessionService';
+import { InlineChatZoneWidget } from './inlineChatZoneWidget';
+import { CONTEXT_RESPONSE, CONTEXT_RESPONSE_ERROR } from 'vs/workbench/contrib/chat/common/chatContextKeys';
 
 export const enum State {
 	CREATE_SESSION = 'CREATE_SESSION',
 	INIT_UI = 'INIT_UI',
 	WAIT_FOR_INPUT = 'WAIT_FOR_INPUT',
 	SHOW_REQUEST = 'SHOW_REQUEST',
-	SHOW_RESPONSE = 'SHOW_RESPONSE',
 	PAUSE = 'PAUSE',
 	CANCEL = 'CANCEL',
 	ACCEPT = 'DONE',
@@ -80,6 +80,7 @@ export abstract class InlineChatRunOptions {
 	isUnstashed?: boolean;
 	position?: IPosition;
 	withIntentDetection?: boolean;
+	headless?: boolean;
 
 	static isInlineChatRunOptions(options: any): options is InlineChatRunOptions {
 		const { initialSelection, initialRange, message, autoSend, position, existingSession } = <InlineChatRunOptions>options;
@@ -109,11 +110,16 @@ export class InlineChatController implements IEditorContribution {
 	private readonly _ui: Lazy<{ content: InlineChatContentWidget; zone: InlineChatZoneWidget }>;
 
 	private readonly _ctxVisible: IContextKey<boolean>;
+	private readonly _ctxEditing: IContextKey<boolean>;
 	private readonly _ctxResponseType: IContextKey<undefined | InlineChatResponseType>;
 	private readonly _ctxUserDidEdit: IContextKey<boolean>;
 	private readonly _ctxRequestInProgress: IContextKey<boolean>;
 
-	private _messages = this._store.add(new Emitter<Message>());
+	private readonly _ctxResponse: IContextKey<boolean>;
+
+	private readonly _messages = this._store.add(new Emitter<Message>());
+	protected readonly _onDidEnterState = this._store.add(new Emitter<State>());
+	readonly onDidEnterState = this._onDidEnterState.event;
 
 	private readonly _onWillStartSession = this._store.add(new Emitter<void>());
 	readonly onWillStartSession = this._onWillStartSession.event;
@@ -142,13 +148,18 @@ export class InlineChatController implements IEditorContribution {
 		@IDialogService private readonly _dialogService: IDialogService,
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@IChatService private readonly _chatService: IChatService,
+		@IEditorService private readonly _editorService: IEditorService,
 		@INotebookEditorService notebookEditorService: INotebookEditorService,
 	) {
 		this._ctxVisible = CTX_INLINE_CHAT_VISIBLE.bindTo(contextKeyService);
+		this._ctxEditing = CTX_INLINE_CHAT_EDITING.bindTo(contextKeyService);
 		this._ctxUserDidEdit = CTX_INLINE_CHAT_USER_DID_EDIT.bindTo(contextKeyService);
 		this._ctxResponseType = CTX_INLINE_CHAT_RESPONSE_TYPE.bindTo(contextKeyService);
 		this._ctxRequestInProgress = CTX_INLINE_CHAT_REQUEST_IN_PROGRESS.bindTo(contextKeyService);
 
+		this._ctxResponse = CONTEXT_RESPONSE.bindTo(contextKeyService);
+		CONTEXT_RESPONSE_ERROR.bindTo(contextKeyService);
+
 		this._ui = new Lazy(() => {
 
 			const location: IChatWidgetLocationOptions = {
@@ -214,7 +225,7 @@ export class InlineChatController implements IEditorContribution {
 			}
 		}));
 
-		this._log('NEW controller');
+		this._log(`NEW controller`);
 	}
 
 	dispose(): void {
@@ -232,7 +243,7 @@ export class InlineChatController implements IEditorContribution {
 		if (message instanceof Error) {
 			this._logService.error(message, ...more);
 		} else {
-			this._logService.trace(`[IE] (editor:${this._editor.getId()})${message}`, ...more);
+			this._logService.trace(`[IE] (editor:${this._editor.getId()}) ${message}`, ...more);
 		}
 	}
 
@@ -270,6 +281,7 @@ export class InlineChatController implements IEditorContribution {
 
 		} catch (error) {
 			// this should not happen but when it does make sure to tear down the UI and everything
+			this._log('error during run', error);
 			onUnexpectedError(error);
 			if (this._session) {
 				this._inlineChatSessionService.releaseSession(this._session);
@@ -287,7 +299,9 @@ export class InlineChatController implements IEditorContribution {
 		let nextState: State | void = state;
 		while (nextState && !this._isDisposed) {
 			this._log('setState to ', nextState);
-			nextState = await this[nextState](options);
+			const p: State | Promise<State> | Promise<void> = this[nextState](options);
+			this._onDidEnterState.fire(nextState);
+			nextState = await p;
 		}
 	}
 
@@ -297,14 +311,13 @@ export class InlineChatController implements IEditorContribution {
 
 		let session: Session | undefined = options.existingSession;
 
-
 		let initPosition: Position | undefined;
 		if (options.position) {
 			initPosition = Position.lift(options.position).delta(-1);
 			delete options.position;
 		}
 
-		const widgetPosition = this._showWidget(true, initPosition);
+		const widgetPosition = this._showWidget(options.headless ?? session?.headless, true, initPosition);
 
 		// this._updatePlaceholder();
 		let errorMessage = localize('create.fail', "Failed to start editor chat");
@@ -364,7 +377,7 @@ export class InlineChatController implements IEditorContribution {
 				break;
 			case EditMode.Live:
 			default:
-				this._strategy = this._instaService.createInstance(LiveStrategy, session, this._editor, this._ui.value.zone);
+				this._strategy = this._instaService.createInstance(LiveStrategy, session, this._editor, this._ui.value.zone, session.headless || this._configurationService.getValue<boolean>(InlineChatConfigKeys.ZoneToolbar));
 				break;
 		}
 
@@ -372,7 +385,7 @@ export class InlineChatController implements IEditorContribution {
 		return State.INIT_UI;
 	}
 
-	private async [State.INIT_UI](options: InlineChatRunOptions): Promise<State.WAIT_FOR_INPUT | State.SHOW_RESPONSE> {
+	private async [State.INIT_UI](options: InlineChatRunOptions): Promise<State.WAIT_FOR_INPUT | State.SHOW_REQUEST> {
 		assertType(this._session);
 		assertType(this._strategy);
 
@@ -382,22 +395,30 @@ export class InlineChatController implements IEditorContribution {
 		this._sessionStore.clear();
 
 		const wholeRangeDecoration = this._editor.createDecorationsCollection();
-		const updateWholeRangeDecoration = () => {
+		const handleWholeRangeChange = () => {
 			const newDecorations = this._strategy?.getWholeRangeDecoration() ?? [];
 			wholeRangeDecoration.set(newDecorations);
+
+			this._ctxEditing.set(!this._session?.wholeRange.trackedInitialRange.isEmpty());
 		};
-		this._sessionStore.add(toDisposable(() => wholeRangeDecoration.clear()));
-		this._sessionStore.add(this._session.wholeRange.onDidChange(updateWholeRangeDecoration));
-		updateWholeRangeDecoration();
+		this._sessionStore.add(toDisposable(() => {
+			wholeRangeDecoration.clear();
+			this._ctxEditing.reset();
+		}));
+		this._sessionStore.add(this._session.wholeRange.onDidChange(handleWholeRangeChange));
+		handleWholeRangeChange();
 
 		this._sessionStore.add(this._ui.value.content.onDidBlur(() => this.cancelSession()));
 
 		this._ui.value.content.setSession(this._session);
-		// this._ui.value.zone.widget.updateSlashCommands(this._session.session.slashCommands ?? []);
+		this._ui.value.zone.widget.setChatModel(this._session.chatModel);
 		this._updatePlaceholder();
 
-		this._showWidget(!this._session.chatModel.hasRequests);
+
+		const isModelEmpty = !this._session.chatModel.hasRequests;
 		this._ui.value.zone.widget.updateToolbar(true);
+		this._ui.value.zone.widget.toggleStatus(!isModelEmpty);
+		this._showWidget(this._session.headless, isModelEmpty);
 
 		this._sessionStore.add(this._editor.onDidChangeModel((e) => {
 			const msg = this._session?.chatModel.hasRequests
@@ -444,14 +465,41 @@ export class InlineChatController implements IEditorContribution {
 			}
 		}));
 
+		// apply edits from completed requests that haven't been applied yet
+		const editState = this._createChatTextEditGroupState();
+		let didEdit = false;
+		for (const request of this._session.chatModel.getRequests()) {
+			if (!request.response) {
+				// done when seeing the first request that is still pending (no response).
+				break;
+			}
+			for (const part of request.response.response.value) {
+				if (part.kind !== 'textEditGroup' || !isEqual(part.uri, this._session.textModelN.uri)) {
+					continue;
+				}
+				if (part.state?.applied) {
+					continue;
+				}
+				for (const edit of part.edits) {
+					this._makeChanges(edit, undefined, !didEdit);
+					didEdit = true;
+				}
+				part.state ??= editState;
+			}
+		}
+		if (didEdit) {
+			const diff = await this._editorWorkerService.computeDiff(this._session.textModel0.uri, this._session.textModelN.uri, { computeMoves: false, maxComputationTimeMs: Number.MAX_SAFE_INTEGER, ignoreTrimWhitespace: false }, 'advanced');
+			this._session.wholeRange.fixup(diff?.changes ?? []);
+			await this._session.hunkData.recompute(editState, diff);
 
-		if (!this._session.chatModel.hasRequests) {
-			return State.WAIT_FOR_INPUT;
-		} else if (options.isUnstashed) {
-			delete options.isUnstashed;
-			return State.SHOW_RESPONSE;
+			this._updateCtxResponseType();
+		}
+		options.position = await this._strategy.renderChanges();
+
+		if (this._session.chatModel.requestInProgress) {
+			return State.SHOW_REQUEST;
 		} else {
-			return State.SHOW_RESPONSE;
+			return State.WAIT_FOR_INPUT;
 		}
 	}
 
@@ -465,7 +513,7 @@ export class InlineChatController implements IEditorContribution {
 			this.updateInput(options.message);
 			aria.alert(options.message);
 			delete options.message;
-			this._showWidget(false);
+			this._showWidget(this._session.headless, false);
 		}
 
 		let message = Message.NONE;
@@ -490,7 +538,7 @@ export class InlineChatController implements IEditorContribution {
 
 		if (options.autoSend) {
 			delete options.autoSend;
-			this._showWidget(false);
+			this._showWidget(this._session.headless, false);
 			this._ui.value.zone.widget.chatWidget.acceptInput();
 		}
 
@@ -515,28 +563,28 @@ export class InlineChatController implements IEditorContribution {
 			return State.WAIT_FOR_INPUT;
 		}
 
-		this._session.addInput(new SessionPrompt(request, this._editor.getModel()!.getAlternativeVersionId()));
 
 		return State.SHOW_REQUEST;
 	}
 
 
-	private async [State.SHOW_REQUEST](): Promise<State.SHOW_RESPONSE | State.CANCEL | State.PAUSE | State.ACCEPT | State.WAIT_FOR_INPUT> {
+	private async [State.SHOW_REQUEST](options: InlineChatRunOptions): Promise<State.WAIT_FOR_INPUT | State.CANCEL | State.PAUSE | State.ACCEPT> {
 		assertType(this._session);
+		assertType(this._strategy);
 		assertType(this._session.chatModel.requestInProgress);
 
 		this._ctxRequestInProgress.set(true);
 
 		const { chatModel } = this._session;
-		const request: IChatRequestModel | undefined = chatModel.getRequests().at(-1);
+		const request = chatModel.lastRequest;
 
 		assertType(request);
 		assertType(request.response);
 
-		this._showWidget(false);
-		// this._ui.value.zone.widget.value = request.message.text;
+		this._showWidget(this._session.headless, false);
 		this._ui.value.zone.widget.selectAll(false);
 		this._ui.value.zone.widget.updateInfo('');
+		this._ui.value.zone.widget.toggleStatus(true);
 
 		const { response } = request;
 		const responsePromise = new DeferredPromise<void>();
@@ -548,7 +596,8 @@ export class InlineChatController implements IEditorContribution {
 		const progressiveEditsClock = StopWatch.create();
 		const progressiveEditsQueue = new Queue();
 
-		let next: State.SHOW_RESPONSE | State.SHOW_REQUEST | State.CANCEL | State.PAUSE | State.ACCEPT | State.WAIT_FOR_INPUT = State.SHOW_RESPONSE;
+		let next: State.WAIT_FOR_INPUT | State.SHOW_REQUEST | State.CANCEL | State.PAUSE | State.ACCEPT = State.WAIT_FOR_INPUT;
+
 		store.add(Event.once(this._messages.event)(message => {
 			this._log('state=_makeRequest) message received', message);
 			this._chatService.cancelCurrentRequestForSession(chatModel.sessionId);
@@ -561,7 +610,7 @@ export class InlineChatController implements IEditorContribution {
 			}
 		}));
 
-		store.add(chatModel.onDidChange(e => {
+		store.add(chatModel.onDidChange(async e => {
 			if (e.kind === 'removeRequest' && e.requestId === request.id) {
 				progressiveEditsCts.cancel();
 				responsePromise.complete();
@@ -570,6 +619,50 @@ export class InlineChatController implements IEditorContribution {
 				} else {
 					next = State.CANCEL;
 				}
+				return;
+			}
+			if (e.kind === 'move') {
+				assertType(this._session);
+				const log: typeof this._log = (msg: string, ...args: any[]) => this._log('state=_showRequest) moving inline chat', msg, ...args);
+
+				log('move was requested', e.target, e.range);
+
+				// if there's already a tab open for targetUri, show it and move inline chat to that tab
+				// otherwise, open the tab to the side
+				const initialSelection = Selection.fromRange(Range.lift(e.range), SelectionDirection.LTR);
+				const editorPane = await this._editorService.openEditor({ resource: e.target, options: { selection: initialSelection } }, SIDE_GROUP);
+
+				if (!editorPane) {
+					log('opening editor failed');
+					return;
+				}
+
+				const newEditor = editorPane.getControl();
+				if (!isCodeEditor(newEditor) || !newEditor.hasModel()) {
+					log('new editor is either missing or not a code editor or does not have a model');
+					return;
+				}
+
+				if (this._inlineChatSessionService.getSession(newEditor, e.target)) {
+					log('new editor ALREADY has a session');
+					return;
+				}
+
+				const newSession = await this._inlineChatSessionService.createSession(
+					newEditor,
+					{
+						editMode: this._getMode(),
+						session: this._session,
+					},
+					CancellationToken.None); // TODO@ulugbekna: add proper cancellation?
+
+
+				InlineChatController.get(newEditor)?.run({ existingSession: newSession });
+
+				next = State.CANCEL;
+				responsePromise.complete();
+
+				return;
 			}
 		}));
 
@@ -581,11 +674,7 @@ export class InlineChatController implements IEditorContribution {
 		let lastLength = 0;
 		let isFirstChange = true;
 
-		const sha1 = new DefaultModelSHA1Computer();
-		const textModel0Sha1 = sha1.canComputeSHA1(this._session.textModel0)
-			? sha1.computeSHA1(this._session.textModel0)
-			: generateUuid();
-		const editState: IChatTextEditGroupState = { sha1: textModel0Sha1, applied: 0 };
+		const editState = this._createChatTextEditGroupState();
 		let localEditGroup: IChatTextEditGroup | undefined;
 
 		// apply edits
@@ -604,6 +693,9 @@ export class InlineChatController implements IEditorContribution {
 				const edits = localEditGroup.edits;
 				const newEdits = edits.slice(lastLength);
 				if (newEdits.length > 0) {
+
+					this._log(`${this._session?.textModelN.uri.toString()} received ${newEdits.length} edits`);
+
 					// NEW changes
 					lastLength = edits.length;
 					progressiveEditsAvgDuration.update(progressiveEditsClock.elapsed());
@@ -628,7 +720,7 @@ export class InlineChatController implements IEditorContribution {
 						// reshow the widget if the start position changed or shows at the wrong position
 						const startNow = this._session!.wholeRange.value.getStartPosition();
 						if (!startNow.equals(startThen) || !this._ui.value.zone.position?.equals(startNow)) {
-							this._showWidget(false, startNow.delta(-1));
+							this._showWidget(this._session!.headless, false, startNow.delta(-1));
 						}
 					});
 				}
@@ -650,9 +742,7 @@ export class InlineChatController implements IEditorContribution {
 		await responsePromise.p;
 		await progressiveEditsQueue.whenIdle();
 
-
-		if (response.isCanceled) {
-			//
+		if (response.result?.errorDetails) {
 			await this._session.undoChangesUntil(response.requestId);
 		}
 
@@ -664,52 +754,38 @@ export class InlineChatController implements IEditorContribution {
 
 		this._ctxRequestInProgress.set(false);
 
-		return next;
-	}
-
-	private async[State.SHOW_RESPONSE](): Promise<State.WAIT_FOR_INPUT> {
-		assertType(this._session);
-		assertType(this._strategy);
-
-		const { response } = this._session.lastExchange!;
-
 
 		let newPosition: Position | undefined;
 
-		if (response instanceof EmptyResponse) {
-			// show status message
+		if (response.result?.errorDetails) {
+			// error -> no message, errors are shown with the request
+
+		} else if (response.response.value.length === 0) {
+			// empty -> show message
 			const status = localize('empty', "No results, please refine your input and try again");
 			this._ui.value.zone.widget.updateStatus(status, { classes: ['warn'] });
-			return State.WAIT_FOR_INPUT;
-
-		} else if (response instanceof ErrorResponse) {
-			// show error
-			if (!response.isCancellation) {
-				this._ui.value.zone.widget.updateStatus(response.message, { classes: ['error'] });
-				this._strategy?.cancel();
-			}
 
-		} else if (response instanceof ReplyResponse) {
-			// real response -> complex...
+		} else {
+			// real response -> no message
 			this._ui.value.zone.widget.updateStatus('');
+		}
 
-			const position = await this._strategy.renderChanges();
-			if (position) {
-				// if the selection doesn't start far off we keep the widget at its current position
-				// because it makes reading this nicer
-				const selection = this._editor.getSelection();
-				if (selection?.containsPosition(position)) {
-					if (position.lineNumber - selection.startLineNumber > 8) {
-						newPosition = position;
-					}
-				} else {
+		const position = await this._strategy.renderChanges();
+		if (position) {
+			// if the selection doesn't start far off we keep the widget at its current position
+			// because it makes reading this nicer
+			const selection = this._editor.getSelection();
+			if (selection?.containsPosition(position)) {
+				if (position.lineNumber - selection.startLineNumber > 8) {
 					newPosition = position;
 				}
+			} else {
+				newPosition = position;
 			}
 		}
-		this._showWidget(false, newPosition);
+		this._showWidget(this._session.headless, false, newPosition);
 
-		return State.WAIT_FOR_INPUT;
+		return next;
 	}
 
 	private async[State.PAUSE]() {
@@ -776,7 +852,7 @@ export class InlineChatController implements IEditorContribution {
 
 	// ----
 
-	private _showWidget(initialRender: boolean = false, position?: Position) {
+	private _showWidget(headless: boolean = false, initialRender: boolean = false, position?: Position) {
 		assertType(this._editor.hasModel());
 		this._ctxVisible.set(true);
 
@@ -797,22 +873,22 @@ export class InlineChatController implements IEditorContribution {
 		}
 
 		if (this._session && !position && (this._session.hasChangedText || this._session.chatModel.hasRequests)) {
-			widgetPosition = this._session.wholeRange.value.getStartPosition().delta(-1);
+			widgetPosition = this._session.wholeRange.trackedInitialRange.getStartPosition().delta(-1);
 		}
 
-		if (this._ui.rawValue?.zone?.position) {
-			this._ui.value.zone.updatePositionAndHeight(widgetPosition);
+		if (!headless) {
 
-		} else if (initialRender) {
-			const selection = this._editor.getSelection();
-			widgetPosition = selection.getStartPosition();
-			this._ui.value.content.show(widgetPosition);
+			if (this._ui.rawValue?.zone?.position) {
+				this._ui.value.zone.updatePositionAndHeight(widgetPosition);
 
-		} else {
-			this._ui.value.content.hide();
-			this._ui.value.zone.show(widgetPosition);
-			if (this._session) {
-				this._ui.value.zone.widget.setChatModel(this._session.chatModel);
+			} else if (initialRender && this._configurationService.getValue<boolean>(InlineChatConfigKeys.StartWithOverlayWidget)) {
+				const selection = this._editor.getSelection();
+				widgetPosition = selection.getStartPosition();
+				this._ui.value.content.show(widgetPosition, selection.isEmpty());
+
+			} else {
+				this._ui.value.content.hide();
+				this._ui.value.zone.show(widgetPosition);
 			}
 		}
 
@@ -846,7 +922,7 @@ export class InlineChatController implements IEditorContribution {
 
 		let responseType = InlineChatResponseType.None;
 		for (const request of this._session.chatModel.getRequests()) {
-			if (!request.response) {
+			if (!request.response || request.response.isCanceled) {
 				continue;
 			}
 			responseType = InlineChatResponseType.Messages;
@@ -856,6 +932,21 @@ export class InlineChatController implements IEditorContribution {
 			}
 		}
 		this._ctxResponseType.set(responseType);
+		this._ctxResponse.set(responseType !== InlineChatResponseType.None);
+	}
+
+	private _createChatTextEditGroupState(): IChatTextEditGroupState {
+		assertType(this._session);
+
+		const sha1 = new DefaultModelSHA1Computer();
+		const textModel0Sha1 = sha1.canComputeSHA1(this._session.textModel0)
+			? sha1.computeSHA1(this._session.textModel0)
+			: generateUuid();
+
+		return {
+			sha1: textModel0Sha1,
+			applied: 0
+		};
 	}
 
 	private async _makeChanges(edits: TextEdit[], opts: ProgressingEditsOptions | undefined, undoStopBefore: boolean) {
@@ -899,8 +990,21 @@ export class InlineChatController implements IEditorContribution {
 	// ---- controller API
 
 	showSaveHint(): void {
-		const status = localize('savehint', "Accept or discard changes to continue saving");
+		if (!this._session) {
+			return;
+		}
+
+		const status = localize('savehint', "Accept or discard changes to continue saving.");
 		this._ui.value.zone.widget.updateStatus(status, { classes: ['warn'] });
+
+		if (this._ui.value.zone.position) {
+			this._editor.revealLineInCenterIfOutsideViewport(this._ui.value.zone.position.lineNumber);
+		} else {
+			const hunk = this._session.hunkData.getInfo().find(info => info.getState() === HunkState.Pending);
+			if (hunk) {
+				this._editor.revealLineInCenterIfOutsideViewport(hunk.getRangesN()[0].startLineNumber);
+			}
+		}
 	}
 
 	acceptInput() {
@@ -940,10 +1044,6 @@ export class InlineChatController implements IEditorContribution {
 		return this._ui.value.zone.widget.hasFocus();
 	}
 
-	moveHunk(next: boolean) {
-		this.focus();
-		this._strategy?.move?.(next);
-	}
 
 	async viewInChat() {
 		if (!this._strategy || !this._session) {
@@ -973,6 +1073,7 @@ export class InlineChatController implements IEditorContribution {
 		if (someApplied) {
 			assertType(lastEdit);
 			lastEdit.edits = [doEdits];
+			lastEdit.state!.applied = 0;
 		}
 
 		await this._instaService.invokeFunction(moveToPanelChat, this._session?.chatModel);
@@ -980,10 +1081,6 @@ export class InlineChatController implements IEditorContribution {
 		this.cancelSession();
 	}
 
-	toggleDiff() {
-		this._strategy?.toggleDiff?.();
-	}
-
 	acceptSession(): void {
 		const response = this._session?.chatModel.getRequests().at(-1)?.response;
 		if (response) {
@@ -1002,16 +1099,25 @@ export class InlineChatController implements IEditorContribution {
 		this._messages.fire(Message.ACCEPT_SESSION);
 	}
 
-	acceptHunk() {
-		return this._strategy?.acceptHunk();
+	acceptHunk(hunkInfo?: HunkInformation) {
+		return this._strategy?.performHunkAction(hunkInfo, HunkAction.Accept);
+	}
+
+	discardHunk(hunkInfo?: HunkInformation) {
+		return this._strategy?.performHunkAction(hunkInfo, HunkAction.Discard);
+	}
+
+	toggleDiff(hunkInfo?: HunkInformation) {
+		return this._strategy?.performHunkAction(hunkInfo, HunkAction.ToggleDiff);
 	}
 
-	discardHunk() {
-		return this._strategy?.discardHunk();
+	moveHunk(next: boolean) {
+		this.focus();
+		this._strategy?.performHunkAction(undefined, next ? HunkAction.MoveNext : HunkAction.MovePrev);
 	}
 
 	async cancelSession() {
-		const response = this._session?.chatModel.getRequests().at(-1)?.response;
+		const response = this._session?.chatModel.lastRequest?.response;
 		if (response) {
 			this._chatService.notifyUserAction({
 				sessionId: response.session.sessionId,
@@ -1041,6 +1147,20 @@ export class InlineChatController implements IEditorContribution {
 		}
 	}
 
+	reportIssue() {
+		const response = this._session?.chatModel.lastRequest?.response;
+		if (response) {
+			this._chatService.notifyUserAction({
+				sessionId: response.session.sessionId,
+				requestId: response.requestId,
+				agentId: response.agent?.id,
+				command: response.slashCommand?.name,
+				result: response.result,
+				action: { kind: 'bug' }
+			});
+		}
+	}
+
 	unstashLastSession(): Session | undefined {
 		const result = this._stashedSession.value?.unstash();
 		if (result) {
@@ -1052,6 +1172,37 @@ export class InlineChatController implements IEditorContribution {
 	joinCurrentRun(): Promise<void> | undefined {
 		return this._currentRun;
 	}
+
+	async reviewEdits(anchor: IRange, stream: AsyncIterable<TextEdit>, token: CancellationToken) {
+		if (!this._editor.hasModel()) {
+			return false;
+		}
+
+		const session = await this._inlineChatSessionService.createSession(this._editor, { editMode: EditMode.Live, wholeRange: anchor, headless: true }, token);
+		if (!session) {
+			return false;
+		}
+
+		const request = session.chatModel.addRequest({ text: 'DUMMY', parts: [] }, { variables: [] }, 0);
+		const run = this.run({
+			existingSession: session,
+			headless: true
+		});
+
+		await Event.toPromise(Event.filter(this._onDidEnterState.event, candidate => candidate === State.SHOW_REQUEST));
+
+		for await (const chunk of stream) {
+			session.chatModel.acceptResponseProgress(request, { kind: 'textEdit', uri: this._editor.getModel()!.uri, edits: [chunk] });
+		}
+
+		if (token.isCancellationRequested) {
+			session.chatModel.cancelRequest(request);
+		} else {
+			session.chatModel.completeResponse(request);
+		}
+		await run;
+		return true;
+	}
 }
 
 async function moveToPanelChat(accessor: ServicesAccessor, model: ChatModel | undefined) {
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatCurrentLine.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatCurrentLine.ts
new file mode 100644
index 00000000000..d898993c941
--- /dev/null
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatCurrentLine.ts
@@ -0,0 +1,166 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { DisposableStore, MutableDisposable } from 'vs/base/common/lifecycle';
+import { IActiveCodeEditor, ICodeEditor } from 'vs/editor/browser/editorBrowser';
+import { CursorChangeReason } from 'vs/editor/common/cursorEvents';
+import { IEditorContribution } from 'vs/editor/common/editorCommon';
+import { localize, localize2 } from 'vs/nls';
+import { ContextKeyExpr, IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
+import { IChatAgentService } from 'vs/workbench/contrib/chat/common/chatAgents';
+import { InlineChatController, State } from 'vs/workbench/contrib/inlineChat/browser/inlineChatController';
+import { CTX_INLINE_CHAT_HAS_AGENT, CTX_INLINE_CHAT_VISIBLE } from 'vs/workbench/contrib/inlineChat/common/inlineChat';
+import { EditorAction2, ServicesAccessor } from 'vs/editor/browser/editorExtensions';
+import { EditOperation } from 'vs/editor/common/core/editOperation';
+import { Range } from 'vs/editor/common/core/range';
+import { Position } from 'vs/editor/common/core/position';
+import { AbstractInlineChatAction } from 'vs/workbench/contrib/inlineChat/browser/inlineChatActions';
+import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
+import { IValidEditOperation } from 'vs/editor/common/model';
+
+
+export const CTX_INLINE_CHAT_EXPANSION = new RawContextKey<boolean>('inlineChatExpansion', false, localize('inlineChatExpansion', "Whether the inline chat expansion is enabled when at the end of a just-typed line"));
+
+export class InlineChatExansionContextKey implements IEditorContribution {
+
+	static Id = 'editor.inlineChatExpansion';
+
+	private readonly _store = new DisposableStore();
+	private readonly _editorListener = this._store.add(new MutableDisposable());
+
+	private readonly _ctxInlineChatExpansion: IContextKey<boolean>;
+
+	constructor(
+		editor: ICodeEditor,
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@IChatAgentService chatAgentService: IChatAgentService
+	) {
+		this._ctxInlineChatExpansion = CTX_INLINE_CHAT_EXPANSION.bindTo(contextKeyService);
+
+		const update = () => {
+			if (editor.hasModel() && chatAgentService.getAgents().length > 0) {
+				this._install(editor);
+			} else {
+				this._uninstall();
+			}
+		};
+		this._store.add(chatAgentService.onDidChangeAgents(update));
+		this._store.add(editor.onDidChangeModel(update));
+		update();
+	}
+
+	dispose(): void {
+		this._ctxInlineChatExpansion.reset();
+		this._store.dispose();
+	}
+
+	private _install(editor: IActiveCodeEditor): void {
+
+		const store = new DisposableStore();
+		this._editorListener.value = store;
+
+		const model = editor.getModel();
+		const lastChangeEnds: number[] = [];
+
+		store.add(editor.onDidChangeCursorPosition(e => {
+
+			let enabled = false;
+
+			if (e.reason === CursorChangeReason.NotSet) {
+
+				const position = editor.getPosition();
+				const positionOffset = model.getOffsetAt(position);
+
+				const lineLength = model.getLineLength(position.lineNumber);
+				const firstNonWhitespace = model.getLineFirstNonWhitespaceColumn(position.lineNumber);
+
+				if (firstNonWhitespace !== 0 && position.column > lineLength && lastChangeEnds.includes(positionOffset)) {
+					enabled = true;
+				}
+			}
+
+			lastChangeEnds.length = 0;
+			this._ctxInlineChatExpansion.set(enabled);
+
+		}));
+
+		store.add(editor.onDidChangeModelContent(e => {
+			lastChangeEnds.length = 0;
+			for (const change of e.changes) {
+				const changeEnd = change.rangeOffset + change.text.length;
+				lastChangeEnds.push(changeEnd);
+			}
+			queueMicrotask(() => {
+				if (lastChangeEnds.length > 0) {
+					// this is a signal that onDidChangeCursorPosition didn't run which means some outside change
+					// which means we should disable the context key
+					this._ctxInlineChatExpansion.set(false);
+				}
+			});
+		}));
+	}
+
+	private _uninstall(): void {
+		this._editorListener.clear();
+	}
+}
+
+export class InlineChatExpandLineAction extends EditorAction2 {
+
+	constructor() {
+		super({
+			id: 'inlineChat.startWithCurrentLine',
+			category: AbstractInlineChatAction.category,
+			title: localize2('startWithCurrentLine', "Start in Editor with Current Line"),
+			f1: true,
+			precondition: ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE.negate(), CTX_INLINE_CHAT_HAS_AGENT, EditorContextKeys.writable),
+			// keybinding: {
+			// 	when: CTX_INLINE_CHAT_EXPANSION,
+			// 	weight: KeybindingWeight.EditorContrib,
+			// 	primary: KeyCode.Tab
+			// }
+		});
+	}
+
+	override async runEditorCommand(_accessor: ServicesAccessor, editor: ICodeEditor) {
+		const ctrl = InlineChatController.get(editor);
+		if (!ctrl || !editor.hasModel()) {
+			return;
+		}
+
+		const model = editor.getModel();
+		const lineNumber = editor.getSelection().positionLineNumber;
+		const lineContent = model.getLineContent(lineNumber);
+
+		const startColumn = model.getLineFirstNonWhitespaceColumn(lineNumber);
+		const endColumn = model.getLineMaxColumn(lineNumber);
+
+		// clear the line
+		let undoEdits: IValidEditOperation[] = [];
+		model.pushEditOperations(null, [EditOperation.replace(new Range(lineNumber, startColumn, lineNumber, endColumn), '')], (edits) => {
+			undoEdits = edits;
+			return null;
+		});
+
+		let lastState: State | undefined;
+		const d = ctrl.onDidEnterState(e => lastState = e);
+
+		try {
+			// trigger chat
+			await ctrl.run({
+				autoSend: true,
+				message: lineContent.trim(),
+				position: new Position(lineNumber, startColumn)
+			});
+
+		} finally {
+			d.dispose();
+		}
+
+		if (lastState === State.CANCEL) {
+			model.pushEditOperations(null, undoEdits, () => null);
+		}
+	}
+}
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatNotebook.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatNotebook.ts
index e074c182fc4..64a25c3c56c 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatNotebook.ts
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatNotebook.ts
@@ -12,6 +12,9 @@ import { InlineChatController } from 'vs/workbench/contrib/inlineChat/browser/in
 import { IInlineChatSessionService } from './inlineChatSessionService';
 import { INotebookEditorService } from 'vs/workbench/contrib/notebook/browser/services/notebookEditorService';
 import { CellUri } from 'vs/workbench/contrib/notebook/common/notebookCommon';
+import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { NotebookTextDiffEditor } from 'vs/workbench/contrib/notebook/browser/diff/notebookDiffEditor';
+import { NotebookMultiTextDiffEditor } from 'vs/workbench/contrib/notebook/browser/diff/notebookMultiDiffEditor';
 
 export class InlineChatNotebookContribution {
 
@@ -19,6 +22,7 @@ export class InlineChatNotebookContribution {
 
 	constructor(
 		@IInlineChatSessionService sessionService: IInlineChatSessionService,
+		@IEditorService editorService: IEditorService,
 		@INotebookEditorService notebookEditorService: INotebookEditorService,
 	) {
 
@@ -58,6 +62,11 @@ export class InlineChatNotebookContribution {
 					return fallback;
 				}
 
+				const activeEditor = editorService.activeEditorPane;
+				if (activeEditor && (activeEditor.getId() === NotebookTextDiffEditor.ID || activeEditor.getId() === NotebookMultiTextDiffEditor.ID)) {
+					return `<notebook>${editor.getId()}#${uri}`;
+				}
+
 				throw illegalState('Expected notebook editor');
 			}
 		}));
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatSession.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatSession.ts
index 4d18fe88fce..f5b111e5109 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatSession.ts
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatSession.ts
@@ -5,22 +5,13 @@
 
 import { URI } from 'vs/base/common/uri';
 import { Emitter, Event } from 'vs/base/common/event';
-import { TextEdit } from 'vs/editor/common/languages';
 import { IIdentifiedSingleEditOperation, IModelDecorationOptions, IModelDeltaDecoration, ITextModel, IValidEditOperation, TrackedRangeStickiness } from 'vs/editor/common/model';
 import { EditMode, CTX_INLINE_CHAT_HAS_STASHED_SESSION } from 'vs/workbench/contrib/inlineChat/common/inlineChat';
 import { IRange, Range } from 'vs/editor/common/core/range';
 import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
-import { toErrorMessage } from 'vs/base/common/errorMessage';
-import { isCancellationError } from 'vs/base/common/errors';
 import { EditOperation, ISingleEditOperation } from 'vs/editor/common/core/editOperation';
 import { DetailedLineRangeMapping, LineRangeMapping, RangeMapping } from 'vs/editor/common/diff/rangeMapping';
-import { IUntitledTextEditorModel } from 'vs/workbench/services/untitled/common/untitledTextEditorModel';
-import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { ResourceMap } from 'vs/base/common/map';
-import { Schemas } from 'vs/base/common/network';
-import { isEqual } from 'vs/base/common/resources';
-import { IInlineChatSessionService, Recording } from './inlineChatSessionService';
+import { IInlineChatSessionService } from './inlineChatSessionService';
 import { LineRange } from 'vs/editor/common/core/lineRange';
 import { IEditorWorkerService } from 'vs/editor/common/services/editorWorker';
 import { coalesceInPlace } from 'vs/base/common/arrays';
@@ -30,7 +21,7 @@ import { DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { ILogService } from 'vs/platform/log/common/log';
-import { ChatModel, IChatRequestModel, IChatResponseModel, IChatTextEditGroupState } from 'vs/workbench/contrib/chat/common/chatModel';
+import { ChatModel, IChatRequestModel, IChatTextEditGroupState } from 'vs/workbench/contrib/chat/common/chatModel';
 import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
 import { IChatAgent } from 'vs/workbench/contrib/chat/common/chatAgents';
 import { IDocumentDiff } from 'vs/editor/common/diff/documentDiffProvider';
@@ -128,16 +119,15 @@ export class SessionWholeRange {
 
 export class Session {
 
-	private _lastInput: SessionPrompt | undefined;
 	private _isUnstashed: boolean = false;
-	private readonly _exchanges: SessionExchange[] = [];
 	private readonly _startTime = new Date();
 	private readonly _teldata: TelemetryData;
 
-	readonly textModelNAltVersion: number;
+	private readonly _versionByRequest = new Map<string, number>();
 
 	constructor(
 		readonly editMode: EditMode,
+		readonly headless: boolean,
 		/**
 		 * The URI of the document which is being EditorEdit
 		 */
@@ -154,8 +144,9 @@ export class Session {
 		readonly wholeRange: SessionWholeRange,
 		readonly hunkData: HunkData,
 		readonly chatModel: ChatModel,
+		versionsByRequest?: [string, number][], // DEBT? this is needed when a chat model is "reused" for a new chat session
 	) {
-		this.textModelNAltVersion = textModelN.getAlternativeVersionId();
+
 		this._teldata = {
 			extension: ExtensionIdentifier.toKey(agent.extensionId),
 			startTime: this._startTime.toISOString(),
@@ -170,14 +161,9 @@ export class Session {
 			discardedHunks: 0,
 			responseTypes: ''
 		};
-	}
-
-	addInput(input: SessionPrompt): void {
-		this._lastInput = input;
-	}
-
-	get lastInput() {
-		return this._lastInput;
+		if (versionsByRequest) {
+			this._versionByRequest = new Map(versionsByRequest);
+		}
 	}
 
 	get isUnstashed(): boolean {
@@ -189,36 +175,29 @@ export class Session {
 		this._isUnstashed = true;
 	}
 
-	addExchange(exchange: SessionExchange): void {
-		this._isUnstashed = false;
-		const newLen = this._exchanges.push(exchange);
-		this._teldata.rounds += `${newLen}|`;
-		// this._teldata.responseTypes += `${exchange.response instanceof ReplyResponse ? exchange.response.responseType : InlineChatResponseTypes.Empty}|`;
+	markModelVersion(request: IChatRequestModel) {
+		this._versionByRequest.set(request.id, this.textModelN.getAlternativeVersionId());
 	}
 
-	get lastExchange(): SessionExchange | undefined {
-		return this._exchanges[this._exchanges.length - 1];
+	get versionsByRequest() {
+		return Array.from(this._versionByRequest);
 	}
 
 	async undoChangesUntil(requestId: string): Promise<boolean> {
-		const idx = this._exchanges.findIndex(candidate => candidate.prompt.request.id === requestId);
-		if (idx < 0) {
+
+		const targetAltVersion = this._versionByRequest.get(requestId);
+		if (targetAltVersion === undefined) {
 			return false;
 		}
 		// undo till this point
 		this.hunkData.ignoreTextModelNChanges = true;
 		try {
-			const targetAltVersion = this._exchanges[idx].prompt.modelAltVersionId;
 			while (targetAltVersion < this.textModelN.getAlternativeVersionId() && this.textModelN.canUndo()) {
 				await this.textModelN.undo();
 			}
 		} finally {
 			this.hunkData.ignoreTextModelNChanges = false;
 		}
-		// TODO@jrieken cannot do this yet because some parts still rely on
-		// exchanges being around...
-		// // remove this and following exchanges
-		// this._exchanges.length = idx;
 		return true;
 	}
 
@@ -262,109 +241,8 @@ export class Session {
 		this._teldata.endTime = new Date().toISOString();
 		return this._teldata;
 	}
-
-	asRecording(): Recording {
-		const result: Recording = {
-			session: this.chatModel.sessionId,
-			when: this._startTime,
-			exchanges: []
-		};
-		for (const exchange of this._exchanges) {
-			const response = exchange.response;
-			if (response instanceof ReplyResponse) {
-				result.exchanges.push({ prompt: exchange.prompt.value, res: response.chatResponse });
-			}
-		}
-		return result;
-	}
-}
-
-
-export class SessionPrompt {
-
-	readonly value: string;
-
-	constructor(
-		readonly request: IChatRequestModel,
-		readonly modelAltVersionId: number,
-	) {
-		this.value = request.message.text;
-	}
-}
-
-export class SessionExchange {
-
-	constructor(
-		readonly prompt: SessionPrompt,
-		readonly response: ReplyResponse | EmptyResponse | ErrorResponse
-	) { }
-}
-
-export class EmptyResponse {
-
-}
-
-export class ErrorResponse {
-
-	readonly message: string;
-	readonly isCancellation: boolean;
-
-	constructor(
-		readonly error: any
-	) {
-		this.message = toErrorMessage(error, false);
-		this.isCancellation = isCancellationError(error);
-	}
 }
 
-export class ReplyResponse {
-
-	readonly untitledTextModel: IUntitledTextEditorModel | undefined;
-
-	constructor(
-		localUri: URI,
-		readonly chatRequest: IChatRequestModel,
-		readonly chatResponse: IChatResponseModel,
-		@ITextFileService private readonly _textFileService: ITextFileService,
-		@ILanguageService private readonly _languageService: ILanguageService,
-	) {
-
-		const editsMap = new ResourceMap<TextEdit[][]>();
-
-		for (const item of chatResponse.response.value) {
-			if (item.kind === 'textEditGroup') {
-				const array = editsMap.get(item.uri);
-				for (const group of item.edits) {
-					if (array) {
-						array.push(group);
-					} else {
-						editsMap.set(item.uri, [group]);
-					}
-				}
-			}
-		}
-
-		for (const [uri, edits] of editsMap) {
-
-			const flatEdits = edits.flat();
-			if (flatEdits.length === 0) {
-				editsMap.delete(uri);
-				continue;
-			}
-
-			const isLocalUri = isEqual(uri, localUri);
-			if (uri.scheme === Schemas.untitled && !isLocalUri && !this.untitledTextModel) { //TODO@jrieken the first untitled model WINS
-				const langSelection = this._languageService.createByFilepathOrFirstLine(uri, undefined);
-				const untitledTextModel = this._textFileService.untitled.create({
-					associatedResource: uri,
-					languageId: langSelection.languageId
-				});
-				this.untitledTextModel = untitledTextModel;
-				untitledTextModel.resolve();
-			}
-		}
-	}
-}
 
 export class StashedSession {
 
@@ -385,7 +263,7 @@ export class StashedSession {
 		// keep session for a little bit, only release when user continues to work (type, move cursor, etc.)
 		this._session = session;
 		this._ctxHasStashedSession.set(true);
-		this._listener = Event.once(Event.any(editor.onDidChangeCursorSelection, editor.onDidChangeModelContent, editor.onDidChangeModel))(() => {
+		this._listener = Event.once(Event.any(editor.onDidChangeCursorSelection, editor.onDidChangeModelContent, editor.onDidChangeModel, editor.onDidBlurEditorWidget))(() => {
 			this._session = undefined;
 			this._sessionService.releaseSession(session);
 			this._ctxHasStashedSession.reset();
@@ -482,27 +360,30 @@ export class HunkData {
 		// mirror textModelN changes to textModel0 execept for those that
 		// overlap with a hunk
 
-		type HunkRangePair = { rangeN: Range; range0: Range };
+		type HunkRangePair = { rangeN: Range; range0: Range; markAccepted: () => void };
 		const hunkRanges: HunkRangePair[] = [];
 
 		const ranges0: Range[] = [];
 
-		for (const { textModelNDecorations, textModel0Decorations, state } of this._data.values()) {
+		for (const entry of this._data.values()) {
 
-			if (state === HunkState.Pending) {
+			if (entry.state === HunkState.Pending) {
 				// pending means the hunk's changes aren't "sync'd" yet
-				for (let i = 1; i < textModelNDecorations.length; i++) {
-					const rangeN = this._textModelN.getDecorationRange(textModelNDecorations[i]);
-					const range0 = this._textModel0.getDecorationRange(textModel0Decorations[i]);
+				for (let i = 1; i < entry.textModelNDecorations.length; i++) {
+					const rangeN = this._textModelN.getDecorationRange(entry.textModelNDecorations[i]);
+					const range0 = this._textModel0.getDecorationRange(entry.textModel0Decorations[i]);
 					if (rangeN && range0) {
-						hunkRanges.push({ rangeN, range0 });
+						hunkRanges.push({
+							rangeN, range0,
+							markAccepted: () => entry.state = HunkState.Accepted
+						});
 					}
 				}
 
-			} else if (state === HunkState.Accepted) {
+			} else if (entry.state === HunkState.Accepted) {
 				// accepted means the hunk's changes are also in textModel0
-				for (let i = 1; i < textModel0Decorations.length; i++) {
-					const range = this._textModel0.getDecorationRange(textModel0Decorations[i]);
+				for (let i = 1; i < entry.textModel0Decorations.length; i++) {
+					const range = this._textModel0.getDecorationRange(entry.textModel0Decorations[i]);
 					if (range) {
 						ranges0.push(range);
 					}
@@ -521,16 +402,20 @@ export class HunkData {
 
 			let pendingChangesLen = 0;
 
-			for (const { rangeN, range0 } of hunkRanges) {
-				if (rangeN.getEndPosition().isBefore(Range.getStartPosition(change.range))) {
+			for (const entry of hunkRanges) {
+				if (entry.rangeN.getEndPosition().isBefore(Range.getStartPosition(change.range))) {
 					// pending hunk _before_ this change. When projecting into textModel0 we need to
 					// subtract that. Because diffing is relaxed it might include changes that are not
 					// actual insertions/deletions. Therefore we need to take the length of the original
 					// range into account.
-					pendingChangesLen += this._textModelN.getValueLengthInRange(rangeN);
-					pendingChangesLen -= this._textModel0.getValueLengthInRange(range0);
-
-				} else if (Range.areIntersectingOrTouching(rangeN, change.range)) {
+					pendingChangesLen += this._textModelN.getValueLengthInRange(entry.rangeN);
+					pendingChangesLen -= this._textModel0.getValueLengthInRange(entry.range0);
+
+				} else if (Range.areIntersectingOrTouching(entry.rangeN, change.range)) {
+					// an edit overlaps with a (pending) hunk. We take this as a signal
+					// to mark the hunk as accepted and to ignore the edit. The range of the hunk
+					// will be up-to-date because of decorations created for them
+					entry.markAccepted();
 					isOverlapping = true;
 					break;
 
@@ -569,29 +454,30 @@ export class HunkData {
 
 		diff ??= await this._editorWorkerService.computeDiff(this._textModel0.uri, this._textModelN.uri, { ignoreTrimWhitespace: false, maxComputationTimeMs: Number.MAX_SAFE_INTEGER, computeMoves: false }, 'advanced');
 
-		if (!diff || diff.changes.length === 0) {
-			// return new HunkData([], session);
-			return;
-		}
-
-		// merge changes neighboring changes
-		const mergedChanges = [diff.changes[0]];
-		for (let i = 1; i < diff.changes.length; i++) {
-			const lastChange = mergedChanges[mergedChanges.length - 1];
-			const thisChange = diff.changes[i];
-			if (thisChange.modified.startLineNumber - lastChange.modified.endLineNumberExclusive <= HunkData._HUNK_THRESHOLD) {
-				mergedChanges[mergedChanges.length - 1] = new DetailedLineRangeMapping(
-					lastChange.original.join(thisChange.original),
-					lastChange.modified.join(thisChange.modified),
-					(lastChange.innerChanges ?? []).concat(thisChange.innerChanges ?? [])
-				);
-			} else {
-				mergedChanges.push(thisChange);
+		let mergedChanges: DetailedLineRangeMapping[] = [];
+
+		if (diff && diff.changes.length > 0) {
+			// merge changes neighboring changes
+			mergedChanges = [diff.changes[0]];
+			for (let i = 1; i < diff.changes.length; i++) {
+				const lastChange = mergedChanges[mergedChanges.length - 1];
+				const thisChange = diff.changes[i];
+				if (thisChange.modified.startLineNumber - lastChange.modified.endLineNumberExclusive <= HunkData._HUNK_THRESHOLD) {
+					mergedChanges[mergedChanges.length - 1] = new DetailedLineRangeMapping(
+						lastChange.original.join(thisChange.original),
+						lastChange.modified.join(thisChange.modified),
+						(lastChange.innerChanges ?? []).concat(thisChange.innerChanges ?? [])
+					);
+				} else {
+					mergedChanges.push(thisChange);
+				}
 			}
 		}
 
 		const hunks = mergedChanges.map(change => new RawHunk(change.original, change.modified, change.innerChanges ?? []));
 
+		editState.applied = hunks.length;
+
 		this._textModelN.changeDecorations(accessorN => {
 
 			this._textModel0.changeDecorations(accessor0 => {
@@ -694,6 +580,9 @@ export class HunkData {
 						const edits = this._discardEdits(item);
 						this._textModelN.pushEditOperations(null, edits, () => null);
 						data.state = HunkState.Rejected;
+						if (data.editState.applied > 0) {
+							data.editState.applied -= 1;
+						}
 					}
 				},
 				acceptChanges: () => {
@@ -710,7 +599,6 @@ export class HunkData {
 						}
 						this._textModel0.pushEditOperations(null, edits, () => null);
 						data.state = HunkState.Accepted;
-						data.editState.applied += 1;
 					}
 				}
 			};
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionService.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionService.ts
index 6ab4ea5dbec..221addc3939 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionService.ts
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionService.ts
@@ -2,24 +2,16 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { URI } from 'vs/base/common/uri';
+import { CancellationToken } from 'vs/base/common/cancellation';
 import { Event } from 'vs/base/common/event';
-import { EditMode } from 'vs/workbench/contrib/inlineChat/common/inlineChat';
-import { IRange } from 'vs/editor/common/core/range';
+import { IDisposable } from 'vs/base/common/lifecycle';
+import { URI } from 'vs/base/common/uri';
 import { IActiveCodeEditor, ICodeEditor } from 'vs/editor/browser/editorBrowser';
+import { IRange } from 'vs/editor/common/core/range';
+import { IValidEditOperation } from 'vs/editor/common/model';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { CancellationToken } from 'vs/base/common/cancellation';
+import { EditMode } from 'vs/workbench/contrib/inlineChat/common/inlineChat';
 import { Session, StashedSession } from './inlineChatSession';
-import { IValidEditOperation } from 'vs/editor/common/model';
-import { IChatResponseModel } from 'vs/workbench/contrib/chat/common/chatModel';
-
-
-export type Recording = {
-	when: Date;
-	session: string;
-	exchanges: { prompt: string; res: IChatResponseModel }[];
-};
 
 export interface ISessionKeyComputer {
 	getComparisonKey(editor: ICodeEditor, uri: URI): string;
@@ -44,7 +36,7 @@ export interface IInlineChatSessionService {
 	onDidStashSession: Event<IInlineChatSessionEvent>;
 	onDidEndSession: Event<IInlineChatSessionEndEvent>;
 
-	createSession(editor: IActiveCodeEditor, options: { editMode: EditMode; wholeRange?: IRange }, token: CancellationToken): Promise<Session | undefined>;
+	createSession(editor: IActiveCodeEditor, options: { editMode: EditMode; wholeRange?: IRange; session?: Session; headless?: boolean }, token: CancellationToken): Promise<Session | undefined>;
 
 	moveSession(session: Session, newEditor: ICodeEditor): void;
 
@@ -58,8 +50,5 @@ export interface IInlineChatSessionService {
 
 	registerSessionKeyComputer(scheme: string, value: ISessionKeyComputer): IDisposable;
 
-	//
-	recordings(): readonly Recording[];
-
 	dispose(): void;
 }
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl.ts
index 44aecd6d917..484681d7433 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl.ts
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl.ts
@@ -3,7 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import { CancellationToken } from 'vs/base/common/cancellation';
-import { CancellationError } from 'vs/base/common/errors';
 import { Emitter, Event } from 'vs/base/common/event';
 import { DisposableStore, IDisposable, MutableDisposable, toDisposable } from 'vs/base/common/lifecycle';
 import { Schemas } from 'vs/base/common/network';
@@ -16,6 +15,7 @@ import { createTextBufferFactoryFromSnapshot } from 'vs/editor/common/model/text
 import { IEditorWorkerService } from 'vs/editor/common/services/editorWorker';
 import { IModelService } from 'vs/editor/common/services/model';
 import { ITextModelService } from 'vs/editor/common/services/resolverService';
+import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { ILogService } from 'vs/platform/log/common/log';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
@@ -25,9 +25,11 @@ import { IChatService } from 'vs/workbench/contrib/chat/common/chatService';
 import { CTX_INLINE_CHAT_HAS_AGENT, EditMode } from 'vs/workbench/contrib/inlineChat/common/inlineChat';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { UntitledTextEditorInput } from 'vs/workbench/services/untitled/common/untitledTextEditorInput';
-import { EmptyResponse, ErrorResponse, HunkData, ReplyResponse, Session, SessionExchange, SessionWholeRange, StashedSession, TelemetryData, TelemetryDataClassification } from './inlineChatSession';
-import { IInlineChatSessionEndEvent, IInlineChatSessionEvent, IInlineChatSessionService, ISessionKeyComputer, Recording } from './inlineChatSessionService';
-import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
+import { HunkData, Session, SessionWholeRange, StashedSession, TelemetryData, TelemetryDataClassification } from './inlineChatSession';
+import { IInlineChatSessionEndEvent, IInlineChatSessionEvent, IInlineChatSessionService, ISessionKeyComputer } from './inlineChatSessionService';
+import { isEqual } from 'vs/base/common/resources';
+import { ILanguageService } from 'vs/editor/common/languages/language';
+import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
 
 
 type SessionData = {
@@ -65,8 +67,6 @@ export class InlineChatSessionServiceImpl implements IInlineChatSessionService {
 
 	private readonly _sessions = new Map<string, SessionData>();
 	private readonly _keyComputers = new Map<string, ISessionKeyComputer>();
-	private _recordings: Recording[] = [];
-
 
 	constructor(
 		@ITelemetryService private readonly _telemetryService: ITelemetryService,
@@ -76,6 +76,8 @@ export class InlineChatSessionServiceImpl implements IInlineChatSessionService {
 		@ILogService private readonly _logService: ILogService,
 		@IInstantiationService private readonly _instaService: IInstantiationService,
 		@IEditorService private readonly _editorService: IEditorService,
+		@ITextFileService private readonly _textFileService: ITextFileService,
+		@ILanguageService private readonly _languageService: ILanguageService,
 		@IChatService private readonly _chatService: IChatService,
 		@IChatAgentService private readonly _chatAgentService: IChatAgentService
 	) { }
@@ -86,7 +88,7 @@ export class InlineChatSessionServiceImpl implements IInlineChatSessionService {
 		this._sessions.clear();
 	}
 
-	async createSession(editor: IActiveCodeEditor, options: { editMode: EditMode; wholeRange?: Range }, token: CancellationToken): Promise<Session | undefined> {
+	async createSession(editor: IActiveCodeEditor, options: { editMode: EditMode; headless?: boolean; wholeRange?: Range; session?: Session }, token: CancellationToken): Promise<Session | undefined> {
 
 		const agent = this._chatAgentService.getDefaultAgent(ChatAgentLocation.Editor);
 
@@ -95,7 +97,6 @@ export class InlineChatSessionServiceImpl implements IInlineChatSessionService {
 			return undefined;
 		}
 
-
 		this._onWillStartSession.fire(editor);
 
 		const textModel = editor.getModel();
@@ -104,15 +105,19 @@ export class InlineChatSessionServiceImpl implements IInlineChatSessionService {
 		const store = new DisposableStore();
 		this._logService.trace(`[IE] creating NEW session for ${editor.getId()}, ${agent.extensionId}`);
 
-		const chatModel = this._chatService.startSession(ChatAgentLocation.Editor, token);
+		const chatModel = options.session?.chatModel ?? this._chatService.startSession(ChatAgentLocation.Editor, token);
 		if (!chatModel) {
 			this._logService.trace('[IE] NO chatModel found');
 			return undefined;
 		}
 
 		store.add(toDisposable(() => {
-			this._chatService.clearSession(chatModel.sessionId);
-			chatModel.dispose();
+			const doesOtherSessionUseChatModel = [...this._sessions.values()].some(data => data.session !== session && data.session.chatModel === chatModel);
+
+			if (!doesOtherSessionUseChatModel) {
+				this._chatService.clearSession(chatModel.sessionId);
+				chatModel.dispose();
+			}
 		}));
 
 		const lastResponseListener = store.add(new MutableDisposable());
@@ -123,6 +128,7 @@ export class InlineChatSessionServiceImpl implements IInlineChatSessionService {
 
 			const { response } = e.request;
 
+			session.markModelVersion(e.request);
 			lastResponseListener.value = response.onDidChange(() => {
 
 				if (!response.isComplete) {
@@ -131,34 +137,22 @@ export class InlineChatSessionServiceImpl implements IInlineChatSessionService {
 
 				lastResponseListener.clear(); // ONCE
 
-				let inlineResponse: ErrorResponse | EmptyResponse | ReplyResponse;
-
-				// make an response from the ChatResponseModel
-				if (response.isCanceled) {
-					// error: cancelled
-					inlineResponse = new ErrorResponse(new CancellationError());
-				} else if (response.result?.errorDetails) {
-					// error: "real" error
-					inlineResponse = new ErrorResponse(new Error(response.result.errorDetails.message));
-				} else if (response.response.value.length === 0) {
-					// epmty response
-					inlineResponse = new EmptyResponse();
-				} else {
-					inlineResponse = this._instaService.createInstance(
-						ReplyResponse,
-						session.textModelN.uri,
-						e.request,
-						response
-					);
-				}
-
-				session.addExchange(new SessionExchange(session.lastInput!, inlineResponse));
-
-				if (inlineResponse instanceof ReplyResponse && inlineResponse.untitledTextModel) {
-					this._textModelService.createModelReference(inlineResponse.untitledTextModel.resource).then(ref => {
+				// special handling for untitled files
+				for (const part of response.response.value) {
+					if (part.kind !== 'textEditGroup' || part.uri.scheme !== Schemas.untitled || isEqual(part.uri, session.textModelN.uri)) {
+						continue;
+					}
+					const langSelection = this._languageService.createByFilepathOrFirstLine(part.uri, undefined);
+					const untitledTextModel = this._textFileService.untitled.create({
+						associatedResource: part.uri,
+						languageId: langSelection.languageId
+					});
+					untitledTextModel.resolve();
+					this._textModelService.createModelReference(part.uri).then(ref => {
 						store.add(ref);
 					});
 				}
+
 			});
 		}));
 
@@ -204,13 +198,15 @@ export class InlineChatSessionServiceImpl implements IInlineChatSessionService {
 
 		const session = new Session(
 			options.editMode,
+			options.headless ?? false,
 			targetUri,
 			textModel0,
 			textModelN,
 			agent,
 			store.add(new SessionWholeRange(textModelN, wholeRange)),
 			store.add(new HunkData(this._editorWorkerService, textModel0, textModelN)),
-			chatModel
+			chatModel,
+			options.session?.versionsByRequest,
 		);
 
 		// store: key -> session
@@ -273,7 +269,6 @@ export class InlineChatSessionServiceImpl implements IInlineChatSessionService {
 			return;
 		}
 
-		this._keepRecording(session);
 		this._telemetryService.publicLog2<TelemetryData, TelemetryDataClassification>('interactiveEditor/session', session.asTelemetryData());
 
 		const [key, value] = tuple;
@@ -285,7 +280,6 @@ export class InlineChatSessionServiceImpl implements IInlineChatSessionService {
 	}
 
 	stashSession(session: Session, editor: ICodeEditor, undoCancelEdits: IValidEditOperation[]): StashedSession {
-		this._keepRecording(session);
 		const result = this._instaService.createInstance(StashedSession, editor, session, undoCancelEdits);
 		this._onDidStashSession.fire({ editor, session });
 		this._logService.trace(`[IE] did STASH session for ${editor.getId()}, ${session.agent.extensionId}`);
@@ -318,19 +312,6 @@ export class InlineChatSessionServiceImpl implements IInlineChatSessionService {
 		this._keyComputers.set(scheme, value);
 		return toDisposable(() => this._keyComputers.delete(scheme));
 	}
-
-	// --- debug
-
-	private _keepRecording(session: Session) {
-		const newLen = this._recordings.unshift(session.asRecording());
-		if (newLen > 5) {
-			this._recordings.pop();
-		}
-	}
-
-	recordings(): readonly Recording[] {
-		return this._recordings;
-	}
 }
 
 export class InlineChatEnabler {
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatStrategies.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatStrategies.ts
index 2e2f692cc88..01df414ec2a 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatStrategies.ts
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatStrategies.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { WindowIntervalTimer } from 'vs/base/browser/dom';
+import { getTotalWidth, WindowIntervalTimer } from 'vs/base/browser/dom';
 import { coalesceInPlace } from 'vs/base/common/arrays';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { Emitter, Event } from 'vs/base/common/event';
 import { DisposableStore } from 'vs/base/common/lifecycle';
-import { themeColorFromId } from 'vs/base/common/themables';
-import { ICodeEditor, IViewZone, IViewZoneChangeAccessor } from 'vs/editor/browser/editorBrowser';
+import { themeColorFromId, ThemeIcon } from 'vs/base/common/themables';
+import { ICodeEditor, IOverlayWidget, IOverlayWidgetPosition, IViewZone, IViewZoneChangeAccessor } from 'vs/editor/browser/editorBrowser';
 import { StableEditorScrollState } from 'vs/editor/browser/stableEditorScroll';
 import { LineSource, RenderOptions, renderLines } from 'vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/renderLines';
 import { ISingleEditOperation } from 'vs/editor/common/core/editOperation';
@@ -21,15 +21,13 @@ import { IModelDecorationsChangeAccessor, IModelDeltaDecoration, IValidEditOpera
 import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
 import { IEditorWorkerService } from 'vs/editor/common/services/editorWorker';
 import { InlineDecoration, InlineDecorationType } from 'vs/editor/common/viewModel';
-import { localize } from 'vs/nls';
 import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { Progress } from 'vs/platform/progress/common/progress';
 import { SaveReason } from 'vs/workbench/common/editor';
 import { countWords } from 'vs/workbench/contrib/chat/common/chatWordCounter';
-import { HunkInformation, Session } from 'vs/workbench/contrib/inlineChat/browser/inlineChatSession';
+import { HunkInformation, Session, HunkState } from 'vs/workbench/contrib/inlineChat/browser/inlineChatSession';
 import { InlineChatZoneWidget } from './inlineChatZoneWidget';
-import { CTX_INLINE_CHAT_CHANGE_HAS_DIFF, CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF, CTX_INLINE_CHAT_DOCUMENT_CHANGED, InlineChatConfigKeys, minimapInlineChatDiffInserted, overviewRulerInlineChatDiffInserted } from 'vs/workbench/contrib/inlineChat/common/inlineChat';
-import { HunkState } from './inlineChatSession';
+import { ACTION_TOGGLE_DIFF, CTX_INLINE_CHAT_CHANGE_HAS_DIFF, CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF, CTX_INLINE_CHAT_DOCUMENT_CHANGED, InlineChatConfigKeys, MENU_INLINE_CHAT_ZONE, minimapInlineChatDiffInserted, overviewRulerInlineChatDiffInserted } from 'vs/workbench/contrib/inlineChat/common/inlineChat';
 import { assertType } from 'vs/base/common/types';
 import { IModelService } from 'vs/editor/common/services/model';
 import { performAsyncTextEdit, asProgressiveEdit } from './utils';
@@ -41,19 +39,33 @@ import { Schemas } from 'vs/base/common/network';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { DefaultChatTextEditor } from 'vs/workbench/contrib/chat/browser/codeBlockPart';
 import { isEqual } from 'vs/base/common/resources';
+import { generateUuid } from 'vs/base/common/uuid';
+import { MenuWorkbenchButtonBar } from 'vs/platform/actions/browser/buttonbar';
+import { EditorOption } from 'vs/editor/common/config/editorOptions';
+import { Iterable } from 'vs/base/common/iterator';
+import { ConflictActionsFactory, IContentWidgetAction } from 'vs/workbench/contrib/mergeEditor/browser/view/conflictActions';
+import { observableValue } from 'vs/base/common/observable';
+import { IMenuService, MenuItemAction } from 'vs/platform/actions/common/actions';
 
 export interface IEditObserver {
 	start(): void;
 	stop(): void;
 }
 
+export const enum HunkAction {
+	Accept,
+	Discard,
+	MoveNext,
+	MovePrev,
+	ToggleDiff
+}
+
 export abstract class EditModeStrategy {
 
 	protected static _decoBlock = ModelDecorationOptions.register({
 		description: 'inline-chat',
 		showIfCollapsed: false,
 		isWholeLine: true,
-		className: 'inline-chat-block-selection',
 	});
 
 	protected readonly _store = new DisposableStore();
@@ -64,20 +76,26 @@ export abstract class EditModeStrategy {
 	readonly onDidAccept: Event<void> = this._onDidAccept.event;
 	readonly onDidDiscard: Event<void> = this._onDidDiscard.event;
 
-	toggleDiff?: () => any;
-
 	constructor(
 		protected readonly _session: Session,
 		protected readonly _editor: ICodeEditor,
 		protected readonly _zone: InlineChatZoneWidget,
 		@ITextFileService private readonly _textFileService: ITextFileService,
-		@IInstantiationService private readonly _instaService: IInstantiationService,
+		@IInstantiationService protected readonly _instaService: IInstantiationService,
 	) { }
 
 	dispose(): void {
 		this._store.dispose();
 	}
 
+	performHunkAction(_hunk: HunkInformation | undefined, action: HunkAction) {
+		if (action === HunkAction.Accept) {
+			this._onDidAccept.fire();
+		} else if (action === HunkAction.Discard) {
+			this._onDidDiscard.fire();
+		}
+	}
+
 	protected async _doApplyChanges(ignoreLocal: boolean): Promise<void> {
 
 		const untitledModels: IUntitledTextEditorModel[] = [];
@@ -124,13 +142,7 @@ export abstract class EditModeStrategy {
 		return this._session.hunkData.discardAll();
 	}
 
-	async acceptHunk(): Promise<void> {
-		this._onDidAccept.fire();
-	}
 
-	async discardHunk(): Promise<void> {
-		this._onDidDiscard.fire();
-	}
 
 	abstract makeProgressiveChanges(edits: ISingleEditOperation[], obs: IEditObserver, timings: ProgressingEditsOptions, undoStopBefore: boolean): Promise<void>;
 
@@ -138,8 +150,6 @@ export abstract class EditModeStrategy {
 
 	abstract renderChanges(): Promise<Position | undefined>;
 
-	move?(next: boolean): void;
-
 	abstract hasFocus(): boolean;
 
 	getWholeRangeDecoration(): IModelDeltaDecoration[] {
@@ -209,8 +219,10 @@ type HunkDisplayData = {
 
 	decorationIds: string[];
 
-	viewZoneId: string | undefined;
-	viewZone: IViewZone;
+	diffViewZoneId: string | undefined;
+	diffViewZone: IViewZone;
+
+	lensActionsViewZoneIds?: string[];
 
 	distance: number;
 	position: Position;
@@ -250,19 +262,20 @@ export class LiveStrategy extends EditModeStrategy {
 	private readonly _ctxCurrentChangeShowsDiff: IContextKey<boolean>;
 
 	private readonly _progressiveEditingDecorations: IEditorDecorationsCollection;
+	private readonly _lensActionsFactory: ConflictActionsFactory;
 	private _editCount: number = 0;
 
-	override acceptHunk: () => Promise<void> = () => super.acceptHunk();
-	override discardHunk: () => Promise<void> = () => super.discardHunk();
-
 	constructor(
 		session: Session,
 		editor: ICodeEditor,
 		zone: InlineChatZoneWidget,
+		private readonly _showOverlayToolbar: boolean,
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@IEditorWorkerService protected readonly _editorWorkerService: IEditorWorkerService,
 		@IAccessibilityService private readonly _accessibilityService: IAccessibilityService,
 		@IConfigurationService private readonly _configService: IConfigurationService,
+		@IMenuService private readonly _menuService: IMenuService,
+		@IContextKeyService private readonly _contextService: IContextKeyService,
 		@ITextFileService textFileService: ITextFileService,
 		@IInstantiationService instaService: IInstantiationService
 	) {
@@ -271,6 +284,7 @@ export class LiveStrategy extends EditModeStrategy {
 		this._ctxCurrentChangeShowsDiff = CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF.bindTo(contextKeyService);
 
 		this._progressiveEditingDecorations = this._editor.createDecorationsCollection();
+		this._lensActionsFactory = this._store.add(new ConflictActionsFactory(this._editor));
 
 	}
 
@@ -362,6 +376,67 @@ export class LiveStrategy extends EditModeStrategy {
 		}
 	}
 
+	override performHunkAction(hunk: HunkInformation | undefined, action: HunkAction) {
+		const displayData = this._findDisplayData(hunk);
+
+		if (!displayData) {
+			// no hunks (left or not yet) found, make sure to
+			// finish the sessions
+			if (action === HunkAction.Accept) {
+				this._onDidAccept.fire();
+			} else if (action === HunkAction.Discard) {
+				this._onDidDiscard.fire();
+			}
+			return;
+		}
+
+		if (action === HunkAction.Accept) {
+			displayData.acceptHunk();
+		} else if (action === HunkAction.Discard) {
+			displayData.discardHunk();
+		} else if (action === HunkAction.MoveNext) {
+			displayData.move(true);
+		} else if (action === HunkAction.MovePrev) {
+			displayData.move(false);
+		} else if (action === HunkAction.ToggleDiff) {
+			displayData.toggleDiff?.();
+		}
+	}
+
+	private _findDisplayData(hunkInfo?: HunkInformation) {
+		let result: HunkDisplayData | undefined;
+		if (hunkInfo) {
+			// use context hunk (from tool/buttonbar)
+			result = this._hunkDisplayData.get(hunkInfo);
+		}
+
+		if (!result && this._zone.position) {
+			// find nearest from zone position
+			const zoneLine = this._zone.position.lineNumber;
+			let distance: number = Number.MAX_SAFE_INTEGER;
+			for (const candidate of this._hunkDisplayData.values()) {
+				if (candidate.hunk.getState() !== HunkState.Pending) {
+					continue;
+				}
+				const hunkRanges = candidate.hunk.getRangesN();
+				const myDistance = zoneLine <= hunkRanges[0].startLineNumber
+					? hunkRanges[0].startLineNumber - zoneLine
+					: zoneLine - hunkRanges[0].endLineNumber;
+
+				if (myDistance < distance) {
+					distance = myDistance;
+					result = candidate;
+				}
+			}
+		}
+
+		if (!result) {
+			// fallback: first hunk that is pending
+			result = Iterable.first(Iterable.filter(this._hunkDisplayData.values(), candidate => candidate.hunk.getState() === HunkState.Pending));
+		}
+		return result;
+	}
+
 	private readonly _hunkDisplayData = new Map<HunkInformation, HunkDisplayData>();
 
 	override async renderChanges() {
@@ -421,67 +496,110 @@ export class LiveStrategy extends EditModeStrategy {
 							afterLineNumber: -1,
 							heightInLines: result.heightInLines,
 							domNode,
+							ordinal: 50000 + 2 // more than https://github.com/microsoft/vscode/blob/bf52a5cfb2c75a7327c9adeaefbddc06d529dcad/src/vs/workbench/contrib/inlineChat/browser/inlineChatZoneWidget.ts#L42
 						};
 
 						const toggleDiff = () => {
 							const scrollState = StableEditorScrollState.capture(this._editor);
 							changeDecorationsAndViewZones(this._editor, (_decorationsAccessor, viewZoneAccessor) => {
 								assertType(data);
-								if (!data.viewZoneId) {
+								if (!data.diffViewZoneId) {
 									const [hunkRange] = hunkData.getRangesN();
 									viewZoneData.afterLineNumber = hunkRange.startLineNumber - 1;
-									data.viewZoneId = viewZoneAccessor.addZone(viewZoneData);
+									data.diffViewZoneId = viewZoneAccessor.addZone(viewZoneData);
+									overlay?.updateExtraTop(result.heightInLines);
 								} else {
-									viewZoneAccessor.removeZone(data.viewZoneId!);
-									data.viewZoneId = undefined;
+									viewZoneAccessor.removeZone(data.diffViewZoneId!);
+									overlay?.updateExtraTop(0);
+									data.diffViewZoneId = undefined;
 								}
 							});
-							this._ctxCurrentChangeShowsDiff.set(typeof data?.viewZoneId === 'string');
+							this._ctxCurrentChangeShowsDiff.set(typeof data?.diffViewZoneId === 'string');
 							scrollState.restore(this._editor);
 						};
 
+						const overlay = this._showOverlayToolbar && false
+							? this._instaService.createInstance(InlineChangeOverlay, this._editor, hunkData)
+							: undefined;
+
+
+						let lensActions: DisposableStore | undefined;
+						const lensActionsViewZoneIds: string[] = [];
+
+						if (this._showOverlayToolbar && hunkData.getState() === HunkState.Pending) {
+
+							lensActions = new DisposableStore();
+
+							const menu = this._menuService.createMenu(MENU_INLINE_CHAT_ZONE, this._contextService);
+							const makeActions = () => {
+								const actions: IContentWidgetAction[] = [];
+								const tuples = menu.getActions();
+								for (const [, group] of tuples) {
+									for (const item of group) {
+										if (item instanceof MenuItemAction) {
+
+											let text = item.label;
+
+											if (item.id === ACTION_TOGGLE_DIFF) {
+												text = item.checked ? 'Hide Changes' : 'Show Changes';
+											} else if (ThemeIcon.isThemeIcon(item.item.icon)) {
+												text = `$(${item.item.icon.id}) ${text}`;
+											}
+
+											actions.push({
+												text,
+												tooltip: item.tooltip,
+												action: async () => item.run(),
+											});
+										}
+									}
+								}
+								return actions;
+							};
+
+							const obs = observableValue(this, makeActions());
+							lensActions.add(menu.onDidChange(() => obs.set(makeActions(), undefined)));
+							lensActions.add(menu);
+
+							lensActions.add(this._lensActionsFactory.createWidget(viewZoneAccessor,
+								hunkRanges[0].startLineNumber - 1,
+								obs,
+								lensActionsViewZoneIds
+							));
+						}
+
 						const remove = () => {
 							changeDecorationsAndViewZones(this._editor, (decorationsAccessor, viewZoneAccessor) => {
 								assertType(data);
 								for (const decorationId of data.decorationIds) {
 									decorationsAccessor.removeDecoration(decorationId);
 								}
-								if (data.viewZoneId) {
-									viewZoneAccessor.removeZone(data.viewZoneId);
+								if (data.diffViewZoneId) {
+									viewZoneAccessor.removeZone(data.diffViewZoneId);
 								}
 								data.decorationIds = [];
-								data.viewZoneId = undefined;
+								data.diffViewZoneId = undefined;
+
+								data.lensActionsViewZoneIds?.forEach(viewZoneAccessor.removeZone);
+								data.lensActionsViewZoneIds = undefined;
 							});
+
+							lensActions?.dispose();
+							overlay?.dispose();
 						};
 
 						const move = (next: boolean) => {
-							assertType(widgetData);
-
-							const candidates: Position[] = [];
-							for (const item of this._session.hunkData.getInfo()) {
-								if (item.getState() === HunkState.Pending) {
-									candidates.push(item.getRangesN()[0].getStartPosition().delta(-1));
-								}
-							}
-							if (candidates.length < 2) {
-								return;
-							}
-							for (let i = 0; i < candidates.length; i++) {
-								if (candidates[i].equals(widgetData.position)) {
-									let newPos: Position;
-									if (next) {
-										newPos = candidates[(i + 1) % candidates.length];
-									} else {
-										newPos = candidates[(i + candidates.length - 1) % candidates.length];
-									}
-									this._zone.updatePositionAndHeight(newPos);
-									renderHunks();
-									break;
-								}
+							const keys = Array.from(this._hunkDisplayData.keys());
+							const idx = keys.indexOf(hunkData);
+							const nextIdx = (idx + (next ? 1 : -1) + keys.length) % keys.length;
+							if (nextIdx !== idx) {
+								const nextData = this._hunkDisplayData.get(keys[nextIdx])!;
+								this._zone.updatePositionAndHeight(nextData?.position);
+								renderHunks();
 							}
 						};
 
-						const zoneLineNumber = this._zone.position!.lineNumber;
+						const zoneLineNumber = this._zone.position?.lineNumber ?? this._editor.getPosition()!.lineNumber;
 						const myDistance = zoneLineNumber <= hunkRanges[0].startLineNumber
 							? hunkRanges[0].startLineNumber - zoneLineNumber
 							: zoneLineNumber - hunkRanges[0].endLineNumber;
@@ -489,8 +607,9 @@ export class LiveStrategy extends EditModeStrategy {
 						data = {
 							hunk: hunkData,
 							decorationIds,
-							viewZoneId: '',
-							viewZone: viewZoneData,
+							diffViewZoneId: '',
+							diffViewZone: viewZoneData,
+							lensActionsViewZoneIds,
 							distance: myDistance,
 							position: hunkRanges[0].getStartPosition().delta(-1),
 							acceptHunk,
@@ -507,7 +626,7 @@ export class LiveStrategy extends EditModeStrategy {
 
 					} else {
 						// update distance and position based on modifiedRange-decoration
-						const zoneLineNumber = this._zone.position!.lineNumber;
+						const zoneLineNumber = this._zone.position?.lineNumber ?? this._editor.getPosition()!.lineNumber;
 						const modifiedRangeNow = hunkRanges[0];
 						data.position = modifiedRangeNow.getStartPosition().delta(-1);
 						data.distance = zoneLineNumber <= modifiedRangeNow.startLineNumber
@@ -532,9 +651,6 @@ export class LiveStrategy extends EditModeStrategy {
 			if (widgetData) {
 				this._zone.updatePositionAndHeight(widgetData.position);
 
-				const remainingHunks = this._session.hunkData.pending;
-				this._updateSummaryMessage(remainingHunks, this._session.hunkData.size);
-
 
 				const mode = this._configService.getValue<'on' | 'off' | 'auto'>(InlineChatConfigKeys.AccessibleDiffView);
 				if (mode === 'on' || mode === 'auto' && this._accessibilityService.isScreenReaderOptimized()) {
@@ -542,10 +658,6 @@ export class LiveStrategy extends EditModeStrategy {
 				}
 
 				this._ctxCurrentChangeHasDiff.set(Boolean(widgetData.toggleDiff));
-				this.toggleDiff = widgetData.toggleDiff;
-				this.acceptHunk = async () => widgetData!.acceptHunk();
-				this.discardHunk = async () => widgetData!.discardHunk();
-				this.move = next => widgetData!.move(next);
 
 			} else if (this._hunkDisplayData.size > 0) {
 				// everything accepted or rejected
@@ -569,30 +681,6 @@ export class LiveStrategy extends EditModeStrategy {
 		return renderHunks()?.position;
 	}
 
-	private _updateSummaryMessage(remaining: number, total: number) {
-
-		const needsReview = this._configService.getValue<boolean>(InlineChatConfigKeys.AcceptedOrDiscardBeforeSave);
-		let message: string;
-		if (total === 0) {
-			message = localize('change.0', "Nothing changed.");
-		} else if (remaining === 1) {
-			message = needsReview
-				? localize('review.1', "$(info) Accept or Discard change")
-				: localize('change.1', "1 change");
-		} else {
-			message = needsReview
-				? localize('review.N', "$(info) Accept or Discard {0} changes", remaining)
-				: localize('change.N', "{0} changes", total);
-		}
-
-		let title: string | undefined;
-		if (needsReview) {
-			title = localize('review', "Review (accept or discard) all changes before continuing");
-		}
-
-		this._zone.widget.updateStatus(message, { title });
-	}
-
 	hasFocus(): boolean {
 		return this._zone.widget.hasFocus();
 	}
@@ -610,3 +698,78 @@ function changeDecorationsAndViewZones(editor: ICodeEditor, callback: (accessor:
 		});
 	});
 }
+
+
+class InlineChangeOverlay implements IOverlayWidget {
+
+	readonly allowEditorOverflow: boolean = false;
+
+	private readonly _id: string = `inline-chat-diff-overlay-` + generateUuid();
+	private readonly _domNode: HTMLElement = document.createElement('div');
+	private readonly _store: DisposableStore = new DisposableStore();
+
+	private _extraTopLines: number = 0;
+
+	constructor(
+		private readonly _editor: ICodeEditor,
+		private readonly _hunkInfo: HunkInformation,
+		@IInstantiationService private readonly _instaService: IInstantiationService,
+	) {
+
+		this._domNode.classList.add('inline-chat-diff-overlay');
+
+		if (_hunkInfo.getState() === HunkState.Pending) {
+
+			const menuBar = this._store.add(this._instaService.createInstance(MenuWorkbenchButtonBar, this._domNode, MENU_INLINE_CHAT_ZONE, {
+				menuOptions: { arg: _hunkInfo },
+				telemetrySource: 'inlineChat-changesZone',
+				buttonConfigProvider: (_action, idx) => {
+					return {
+						isSecondary: idx > 0,
+						showIcon: true,
+						showLabel: false
+					};
+				},
+			}));
+
+			this._store.add(menuBar.onDidChange(() => this._editor.layoutOverlayWidget(this)));
+		}
+
+		this._editor.addOverlayWidget(this);
+		this._store.add(Event.any(this._editor.onDidLayoutChange, this._editor.onDidScrollChange)(() => this._editor.layoutOverlayWidget(this)));
+		queueMicrotask(() => this._editor.layoutOverlayWidget(this)); // FUNKY but needed to get the initial layout right
+	}
+
+	dispose(): void {
+		this._editor.removeOverlayWidget(this);
+		this._store.dispose();
+	}
+
+	getId(): string {
+		return this._id;
+	}
+
+	getDomNode(): HTMLElement {
+		return this._domNode;
+	}
+
+	getPosition(): IOverlayWidgetPosition | null {
+
+		const line = this._hunkInfo.getRangesN()[0].startLineNumber;
+		const info = this._editor.getLayoutInfo();
+		const top = this._editor.getTopForLineNumber(line) - this._editor.getScrollTop();
+		const left = info.contentLeft + info.contentWidth - info.verticalScrollbarWidth;
+
+		const extraTop = this._editor.getOption(EditorOption.lineHeight) * this._extraTopLines;
+		const width = getTotalWidth(this._domNode);
+
+		return { preference: { top: top - extraTop, left: left - width } };
+	}
+
+	updateExtraTop(value: number) {
+		if (this._extraTopLines !== value) {
+			this._extraTopLines = value;
+			this._editor.layoutOverlayWidget(this);
+		}
+	}
+}
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatWidget.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatWidget.ts
index 6fdd5cee1e8..e04238505dd 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatWidget.ts
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatWidget.ts
@@ -4,11 +4,15 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Dimension, getActiveElement, getTotalHeight, h, reset, trackFocus } from 'vs/base/browser/dom';
+import { IActionViewItemOptions } from 'vs/base/browser/ui/actionbar/actionViewItems';
+import { getDefaultHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
 import { renderLabelWithIcons } from 'vs/base/browser/ui/iconLabel/iconLabels';
+import { IAction } from 'vs/base/common/actions';
+import { isNonEmptyArray, tail } from 'vs/base/common/arrays';
 import { Emitter, Event } from 'vs/base/common/event';
 import { IMarkdownString, MarkdownString } from 'vs/base/common/htmlContent';
-import { DisposableStore, MutableDisposable } from 'vs/base/common/lifecycle';
-import { ISettableObservable, constObservable, derived, observableValue } from 'vs/base/common/observable';
+import { DisposableStore, MutableDisposable, toDisposable } from 'vs/base/common/lifecycle';
+import { constObservable, derived, ISettableObservable, observableValue } from 'vs/base/common/observable';
 import 'vs/css!./media/inlineChat';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { AccessibleDiffViewer, IAccessibleDiffViewerModel } from 'vs/editor/browser/widget/diffEditor/components/accessibleDiffViewer';
@@ -16,38 +20,39 @@ import { EditorOption, IComputedEditorOptions } from 'vs/editor/common/config/ed
 import { LineRange } from 'vs/editor/common/core/lineRange';
 import { Position } from 'vs/editor/common/core/position';
 import { Range } from 'vs/editor/common/core/range';
+import { Selection } from 'vs/editor/common/core/selection';
 import { DetailedLineRangeMapping, RangeMapping } from 'vs/editor/common/diff/rangeMapping';
 import { ICodeEditorViewState, ScrollType } from 'vs/editor/common/editorCommon';
 import { ITextModel } from 'vs/editor/common/model';
 import { IResolvedTextEditorModel, ITextModelService } from 'vs/editor/common/services/resolverService';
 import { localize } from 'vs/nls';
+import { IAccessibleViewService } from 'vs/platform/accessibility/browser/accessibleView';
 import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
 import { IWorkbenchButtonBarOptions, MenuWorkbenchButtonBar } from 'vs/platform/actions/browser/buttonbar';
-import { HiddenItemStrategy, MenuWorkbenchToolBar } from 'vs/platform/actions/browser/toolbar';
+import { createActionViewItem, IMenuEntryActionViewItemOptions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
+import { MenuWorkbenchToolBar } from 'vs/platform/actions/browser/toolbar';
 import { MenuId, MenuItemAction } from 'vs/platform/actions/common/actions';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
+import { IHoverService } from 'vs/platform/hover/browser/hover';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { asCssVariable, asCssVariableName, editorBackground, inputBackground } from 'vs/platform/theme/common/colorRegistry';
 import { AccessibilityVerbositySettingId } from 'vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
-import { IAccessibleViewService } from 'vs/platform/accessibility/browser/accessibleView';
 import { AccessibilityCommandId } from 'vs/workbench/contrib/accessibility/common/accessibilityCommands';
+import { MarkUnhelpfulActionId } from 'vs/workbench/contrib/chat/browser/actions/chatTitleActions';
+import { IChatWidgetViewOptions } from 'vs/workbench/contrib/chat/browser/chat';
+import { ChatVoteDownButton } from 'vs/workbench/contrib/chat/browser/chatListRenderer';
+import { ChatWidget, IChatWidgetLocationOptions } from 'vs/workbench/contrib/chat/browser/chatWidget';
+import { ChatAgentLocation } from 'vs/workbench/contrib/chat/common/chatAgents';
+import { chatRequestBackground } from 'vs/workbench/contrib/chat/common/chatColors';
+import { CONTEXT_CHAT_RESPONSE_SUPPORT_ISSUE_REPORTING, CONTEXT_RESPONSE, CONTEXT_RESPONSE_ERROR, CONTEXT_RESPONSE_FILTERED, CONTEXT_RESPONSE_VOTE } from 'vs/workbench/contrib/chat/common/chatContextKeys';
 import { ChatModel, IChatModel } from 'vs/workbench/contrib/chat/common/chatModel';
+import { ChatAgentVoteDirection, IChatService } from 'vs/workbench/contrib/chat/common/chatService';
 import { isResponseVM, isWelcomeVM } from 'vs/workbench/contrib/chat/common/chatViewModel';
 import { HunkInformation, Session } from 'vs/workbench/contrib/inlineChat/browser/inlineChatSession';
-import { CTX_INLINE_CHAT_FOCUSED, CTX_INLINE_CHAT_RESPONSE_FOCUSED, inlineChatBackground, InlineChatConfigKeys, inlineChatForeground } from 'vs/workbench/contrib/inlineChat/common/inlineChat';
-import { ChatWidget, IChatWidgetLocationOptions } from 'vs/workbench/contrib/chat/browser/chatWidget';
-import { chatRequestBackground } from 'vs/workbench/contrib/chat/common/chatColors';
-import { Selection } from 'vs/editor/common/core/selection';
-import { ChatAgentLocation } from 'vs/workbench/contrib/chat/common/chatAgents';
-import { isNonEmptyArray, tail } from 'vs/base/common/arrays';
-import { IChatService } from 'vs/workbench/contrib/chat/common/chatService';
-import { getDefaultHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
-import { IChatWidgetViewOptions } from 'vs/workbench/contrib/chat/browser/chat';
-import { TextOnlyMenuEntryActionViewItem } from 'vs/platform/actions/browser/menuEntryActionViewItem';
+import { CTX_INLINE_CHAT_FOCUSED, CTX_INLINE_CHAT_RESPONSE_FOCUSED, inlineChatBackground, inlineChatForeground } from 'vs/workbench/contrib/inlineChat/common/inlineChat';
 
 
 export interface InlineChatWidgetViewState {
@@ -63,6 +68,8 @@ export interface IInlineChatWidgetConstructionOptions {
 	 */
 	statusMenuId: MenuId | { menu: MenuId; options: IWorkbenchButtonBarOptions };
 
+	secondaryMenuId?: MenuId;
+
 	/**
 	 * The options for the chat widget
 	 */
@@ -89,9 +96,9 @@ export class InlineChatWidget {
 			h('div.accessibleViewer@accessibleViewer'),
 			h('div.status@status', [
 				h('div.label.info.hidden@infoLabel'),
-				h('div.actions.text-style.hidden@toolbar1'),
-				h('div.actions.button-style.hidden@toolbar2'),
+				h('div.actions.hidden@toolbar1'),
 				h('div.label.status.hidden@statusLabel'),
+				h('div.actions.secondary.hidden@toolbar2'),
 			]),
 		]
 	);
@@ -139,14 +146,32 @@ export class InlineChatWidget {
 		this._chatWidget = scopedInstaService.createInstance(
 			ChatWidget,
 			location,
-			{ resource: true },
+			undefined,
 			{
 				defaultElementHeight: 32,
 				renderStyle: 'minimal',
 				renderInputOnTop: false,
 				renderFollowups: true,
 				supportsFileReferences: _configurationService.getValue(`chat.experimental.variables.${location.location}`) === true,
-				filter: item => !isWelcomeVM(item),
+				filter: item => {
+					if (isWelcomeVM(item)) {
+						// filter welcome messages
+						return false;
+					}
+					if (isResponseVM(item) && item.isComplete && !item.errorDetails) {
+						// filter responses that
+						// - are just text edits(prevents the "Made Edits")
+						// - are all empty
+						if (item.response.value.length > 0 && item.response.value.every(item => item.kind === 'textEditGroup' && options.chatWidgetViewOptions?.rendererOptions?.renderTextEditsAsSummary?.(item.uri))) {
+							return false;
+						}
+						if (item.response.value.length === 0) {
+							return false;
+						}
+						return true;
+					}
+					return true;
+				},
 				...options.chatWidgetViewOptions
 			},
 			{
@@ -161,13 +186,43 @@ export class InlineChatWidget {
 		this._chatWidget.setVisible(true);
 		this._store.add(this._chatWidget);
 
+		const ctxResponse = CONTEXT_RESPONSE.bindTo(this.scopedContextKeyService);
+		const ctxResponseVote = CONTEXT_RESPONSE_VOTE.bindTo(this.scopedContextKeyService);
+		const ctxResponseSupportIssues = CONTEXT_CHAT_RESPONSE_SUPPORT_ISSUE_REPORTING.bindTo(this.scopedContextKeyService);
+		const ctxResponseError = CONTEXT_RESPONSE_ERROR.bindTo(this.scopedContextKeyService);
+		const ctxResponseErrorFiltered = CONTEXT_RESPONSE_FILTERED.bindTo(this.scopedContextKeyService);
+
 		const viewModelStore = this._store.add(new DisposableStore());
 		this._store.add(this._chatWidget.onDidChangeViewModel(() => {
 			viewModelStore.clear();
+
 			const viewModel = this._chatWidget.viewModel;
-			if (viewModel) {
-				viewModelStore.add(viewModel.onDidChange(() => this._onDidChangeHeight.fire()));
+			if (!viewModel) {
+				return;
 			}
+
+			viewModelStore.add(toDisposable(() => {
+				toolbar2.context = undefined;
+				ctxResponse.reset();
+				ctxResponseVote.reset();
+				ctxResponseError.reset();
+				ctxResponseErrorFiltered.reset();
+				ctxResponseSupportIssues.reset();
+			}));
+
+			viewModelStore.add(viewModel.onDidChange(() => {
+
+				const last = viewModel.getItems().at(-1);
+				toolbar2.context = last;
+
+				ctxResponse.set(isResponseVM(last));
+				ctxResponseVote.set(isResponseVM(last) ? last.vote === ChatAgentVoteDirection.Down ? 'down' : last.vote === ChatAgentVoteDirection.Up ? 'up' : '' : '');
+				ctxResponseError.set(isResponseVM(last) && last.errorDetails !== undefined);
+				ctxResponseErrorFiltered.set((!!(isResponseVM(last) && last.errorDetails?.responseIsFiltered)));
+				ctxResponseSupportIssues.set(isResponseVM(last) && (last.agent?.metadata.supportIssueReporting ?? false));
+
+				this._onDidChangeHeight.fire();
+			}));
 			this._onDidChangeHeight.fire();
 		}));
 
@@ -187,22 +242,9 @@ export class InlineChatWidget {
 
 		const statusMenuId = options.statusMenuId instanceof MenuId ? options.statusMenuId : options.statusMenuId.menu;
 
-		// TEXT-ONLY bar
-		const statusToolbarMenu = scopedInstaService.createInstance(MenuWorkbenchToolBar, this._elements.toolbar1, statusMenuId, {
-			hiddenItemStrategy: HiddenItemStrategy.NoHide,
-			telemetrySource: options.chatWidgetViewOptions?.menus?.telemetrySource,
-			actionViewItemProvider: action => action instanceof MenuItemAction ? this._instantiationService.createInstance(TextOnlyMenuEntryActionViewItem, action, { conversational: true }) : undefined,
-			toolbarOptions: { primaryGroup: '0_main' },
-			menuOptions: { renderShortTitle: true },
-			label: true,
-			icon: false
-		});
-		this._store.add(statusToolbarMenu.onDidChangeMenuItems(() => this._onDidChangeHeight.fire()));
-		this._store.add(statusToolbarMenu);
-
 		// BUTTON bar
 		const statusMenuOptions = options.statusMenuId instanceof MenuId ? undefined : options.statusMenuId.options;
-		const statusButtonBar = scopedInstaService.createInstance(MenuWorkbenchButtonBar, this._elements.toolbar2, statusMenuId, {
+		const statusButtonBar = scopedInstaService.createInstance(MenuWorkbenchButtonBar, this._elements.toolbar1, statusMenuId, {
 			toolbarOptions: { primaryGroup: '0_main' },
 			telemetrySource: options.chatWidgetViewOptions?.menus?.telemetrySource,
 			menuOptions: { renderShortTitle: true },
@@ -211,9 +253,19 @@ export class InlineChatWidget {
 		this._store.add(statusButtonBar.onDidChange(() => this._onDidChangeHeight.fire()));
 		this._store.add(statusButtonBar);
 
-		const toggleToolbar = () => this._elements.status.classList.toggle('text', this._configurationService.getValue(InlineChatConfigKeys.ExpTextButtons));
-		this._store.add(this._configurationService.onDidChangeConfiguration(e => e.affectsConfiguration(InlineChatConfigKeys.ExpTextButtons) && toggleToolbar()));
-		toggleToolbar();
+		// secondary toolbar
+		const toolbar2 = scopedInstaService.createInstance(MenuWorkbenchToolBar, this._elements.toolbar2, options.secondaryMenuId ?? MenuId.for(''), {
+			telemetrySource: options.chatWidgetViewOptions?.menus?.telemetrySource,
+			menuOptions: { renderShortTitle: true, shouldForwardArgs: true },
+			actionViewItemProvider: (action: IAction, options: IActionViewItemOptions) => {
+				if (action instanceof MenuItemAction && action.item.id === MarkUnhelpfulActionId) {
+					return scopedInstaService.createInstance(ChatVoteDownButton, action, options as IMenuEntryActionViewItemOptions);
+				}
+				return createActionViewItem(scopedInstaService, action, options);
+			}
+		});
+		this._store.add(toolbar2.onDidChangeMenuItems(() => this._onDidChangeHeight.fire()));
+		this._store.add(toolbar2);
 
 
 		this._store.add(this._configurationService.onDidChangeConfiguration(e => {
@@ -333,7 +385,7 @@ export class InlineChatWidget {
 	}
 
 	protected _getExtraHeight(): number {
-		return 4 /* padding */ + 2 /*border*/ + 4 /*shadow*/;
+		return 2 /*border*/ + 4 /*shadow*/;
 	}
 
 	get value(): string {
@@ -362,6 +414,14 @@ export class InlineChatWidget {
 		this._chatWidget.setInputPlaceholder(value);
 	}
 
+	toggleStatus(show: boolean) {
+		this._elements.toolbar1.classList.toggle('hidden', !show);
+		this._elements.toolbar2.classList.toggle('hidden', !show);
+		this._elements.status.classList.toggle('hidden', !show);
+		this._elements.infoLabel.classList.toggle('hidden', !show);
+		this._onDidChangeHeight.fire();
+	}
+
 	updateToolbar(show: boolean) {
 		this._elements.root.classList.toggle('toolbar', show);
 		this._elements.toolbar1.classList.toggle('hidden', !show);
@@ -401,16 +461,6 @@ export class InlineChatWidget {
 		this._chatWidget.setModel(chatModel, { inputValue: undefined });
 	}
 
-
-	/**
-	 * @deprecated use `setChatModel` instead
-	 */
-	addToHistory(input: string) {
-		if (this._chatWidget.viewModel?.model === this._defaultChatModel) {
-			this._chatWidget.input.acceptInput(true);
-		}
-	}
-
 	/**
 	 * @deprecated use `setChatModel` instead
 	 */
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatZoneWidget.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatZoneWidget.ts
index adc3b413558..fe7f9881f26 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatZoneWidget.ts
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatZoneWidget.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 import { addDisposableListener, Dimension } from 'vs/base/browser/dom';
 import * as aria from 'vs/base/browser/ui/aria/aria';
-import { toDisposable } from 'vs/base/common/lifecycle';
+import { MutableDisposable, toDisposable } from 'vs/base/common/lifecycle';
 import { assertType } from 'vs/base/common/types';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { EditorLayoutInfo, EditorOption } from 'vs/editor/common/config/editorOptions';
@@ -14,7 +14,7 @@ import { ZoneWidget } from 'vs/editor/contrib/zoneWidget/browser/zoneWidget';
 import { localize } from 'vs/nls';
 import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ACTION_ACCEPT_CHANGES, ACTION_REGENERATE_RESPONSE, ACTION_TOGGLE_DIFF, CTX_INLINE_CHAT_OUTER_CURSOR_POSITION, EditMode, InlineChatConfigKeys, MENU_INLINE_CHAT_EXECUTE, MENU_INLINE_CHAT_WIDGET_STATUS } from 'vs/workbench/contrib/inlineChat/common/inlineChat';
+import { ACTION_REGENERATE_RESPONSE, ACTION_REPORT_ISSUE, ACTION_TOGGLE_DIFF, CTX_INLINE_CHAT_OUTER_CURSOR_POSITION, EditMode, InlineChatConfigKeys, MENU_INLINE_CHAT_WIDGET_SECONDARY, MENU_INLINE_CHAT_WIDGET_STATUS } from 'vs/workbench/contrib/inlineChat/common/inlineChat';
 import { EditorBasedInlineChatWidget } from './inlineChatWidget';
 import { isEqual } from 'vs/base/common/resources';
 import { StableEditorBottomScrollState } from 'vs/editor/browser/stableEditorScroll';
@@ -22,11 +22,14 @@ import { ScrollType } from 'vs/editor/common/editorCommon';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { ILogService } from 'vs/platform/log/common/log';
 import { IChatWidgetLocationOptions } from 'vs/workbench/contrib/chat/browser/chatWidget';
+import { MenuId } from 'vs/platform/actions/common/actions';
+import { isResponseVM } from 'vs/workbench/contrib/chat/common/chatViewModel';
 
 export class InlineChatZoneWidget extends ZoneWidget {
 
 	readonly widget: EditorBasedInlineChatWidget;
 
+	private readonly _scrollUp = this._disposables.add(new ScrollUpState(this.editor));
 	private readonly _ctxCursorPosition: IContextKey<'above' | 'below' | ''>;
 	private _dimension?: Dimension;
 
@@ -38,7 +41,7 @@ export class InlineChatZoneWidget extends ZoneWidget {
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@IConfigurationService configurationService: IConfigurationService,
 	) {
-		super(editor, { showFrame: false, showArrow: false, isAccessible: true, className: 'inline-chat-widget', keepEditorSelection: true, showInHiddenAreas: true, ordinal: 10000 });
+		super(editor, { showFrame: false, showArrow: false, isAccessible: true, className: 'inline-chat-widget', keepEditorSelection: true, showInHiddenAreas: true, ordinal: 50000 });
 
 		this._ctxCursorPosition = CTX_INLINE_CHAT_OUTER_CURSOR_POSITION.bindTo(contextKeyService);
 
@@ -50,20 +53,20 @@ export class InlineChatZoneWidget extends ZoneWidget {
 			statusMenuId: {
 				menu: MENU_INLINE_CHAT_WIDGET_STATUS,
 				options: {
-					buttonConfigProvider: action => {
-						if (new Set([ACTION_REGENERATE_RESPONSE, ACTION_TOGGLE_DIFF]).has(action.id)) {
-							return { isSecondary: true, showIcon: true, showLabel: false };
-						} else if (action.id === ACTION_ACCEPT_CHANGES) {
-							return { isSecondary: false };
+					buttonConfigProvider: (action, index) => {
+						const isSecondary = index > 0;
+						if (new Set([ACTION_REGENERATE_RESPONSE, ACTION_TOGGLE_DIFF, ACTION_REPORT_ISSUE]).has(action.id)) {
+							return { isSecondary, showIcon: true, showLabel: false };
 						} else {
-							return { isSecondary: true };
+							return { isSecondary };
 						}
 					}
 				}
 			},
+			secondaryMenuId: MENU_INLINE_CHAT_WIDGET_SECONDARY,
 			chatWidgetViewOptions: {
 				menus: {
-					executeToolbar: MENU_INLINE_CHAT_EXECUTE,
+					executeToolbar: MenuId.ChatExecute,
 					telemetrySource: 'interactiveEditorWidget-toolbar',
 				},
 				rendererOptions: {
@@ -78,21 +81,20 @@ export class InlineChatZoneWidget extends ZoneWidget {
 		});
 		this._disposables.add(this.widget);
 
-		let scrollState: StableEditorBottomScrollState | undefined;
+		let revealFn: (() => void) | undefined;
 		this._disposables.add(this.widget.chatWidget.onWillMaybeChangeHeight(() => {
 			if (this.position) {
-				scrollState = StableEditorBottomScrollState.capture(this.editor);
+				revealFn = this._createZoneAndScrollRestoreFn(this.position);
 			}
 		}));
 		this._disposables.add(this.widget.onDidChangeHeight(() => {
 			if (this.position) {
 				// only relayout when visible
-				scrollState ??= StableEditorBottomScrollState.capture(this.editor);
+				revealFn ??= this._createZoneAndScrollRestoreFn(this.position);
 				const height = this._computeHeight();
 				this._relayout(height.linesValue);
-				scrollState.restore(this.editor);
-				scrollState = undefined;
-				this._revealTopOfZoneWidget(this.position, height);
+				revealFn();
+				revealFn = undefined;
 			}
 		}));
 
@@ -154,57 +156,70 @@ export class InlineChatZoneWidget extends ZoneWidget {
 	override show(position: Position): void {
 		assertType(this.container);
 
-		const scrollState = StableEditorBottomScrollState.capture(this.editor);
 		const info = this.editor.getLayoutInfo();
 		const marginWithoutIndentation = info.glyphMarginWidth + info.decorationsWidth + info.lineNumbersWidth;
 		this.container.style.marginLeft = `${marginWithoutIndentation}px`;
 
-		const height = this._computeHeight();
-		super.show(position, height.linesValue);
+		const revealZone = this._createZoneAndScrollRestoreFn(position);
+		super.show(position, this._computeHeight().linesValue);
 		this.widget.chatWidget.setVisible(true);
 		this.widget.focus();
 
-		scrollState.restore(this.editor);
-
-		this._revealTopOfZoneWidget(position, height);
+		revealZone();
+		this._scrollUp.enable();
 	}
 
 	override updatePositionAndHeight(position: Position): void {
-		const scrollState = StableEditorBottomScrollState.capture(this.editor);
-		const height = this._computeHeight();
-		super.updatePositionAndHeight(position, height.linesValue);
-		scrollState.restore(this.editor);
-
-		this._revealTopOfZoneWidget(position, height);
+		const revealZone = this._createZoneAndScrollRestoreFn(position);
+		super.updatePositionAndHeight(position, this._computeHeight().linesValue);
+		revealZone();
 	}
 
-	private _revealTopOfZoneWidget(position: Position, height: { linesValue: number; pixelsValue: number }) {
+	private _createZoneAndScrollRestoreFn(position: Position): () => void {
 
-		// reveal top of zone widget
+		const scrollState = StableEditorBottomScrollState.capture(this.editor);
 
 		const lineNumber = position.lineNumber <= 1 ? 1 : 1 + position.lineNumber;
-
 		const scrollTop = this.editor.getScrollTop();
 		const lineTop = this.editor.getTopForLineNumber(lineNumber);
-		const zoneTop = lineTop - height.pixelsValue;
-
-		const editorHeight = this.editor.getLayoutInfo().height;
-		const lineBottom = this.editor.getBottomForLineNumber(lineNumber);
+		const zoneTop = lineTop - this._computeHeight().pixelsValue;
 
-		let newScrollTop = zoneTop;
-		let forceScrollTop = false;
+		const hasResponse = this.widget.chatWidget.viewModel?.getItems().find(candidate => {
+			return isResponseVM(candidate) && candidate.response.value.length > 0;
+		});
 
-		if (lineBottom >= (scrollTop + editorHeight)) {
-			// revealing the top of the zone would pust out the line we are interested it and
-			// therefore we keep the line in the view port
-			newScrollTop = lineBottom - editorHeight;
-			forceScrollTop = true;
+		if (hasResponse && zoneTop < scrollTop || this._scrollUp.didScrollUpOrDown) {
+			// don't reveal the zone if it is already out of view (unless we are still getting ready)
+			// or if an outside scroll-up happened (e.g the user scrolled up/down to see the new content)
+			return this._scrollUp.runIgnored(() => {
+				scrollState.restore(this.editor);
+			});
 		}
 
-		if (newScrollTop < scrollTop || forceScrollTop) {
-			this._logService.trace('[IE] REVEAL zone', { zoneTop, lineTop, lineBottom, scrollTop, newScrollTop, forceScrollTop });
-			this.editor.setScrollTop(newScrollTop, ScrollType.Immediate);
-		}
+		return this._scrollUp.runIgnored(() => {
+			scrollState.restore(this.editor);
+
+			const scrollTop = this.editor.getScrollTop();
+			const lineTop = this.editor.getTopForLineNumber(lineNumber);
+			const zoneTop = lineTop - this._computeHeight().pixelsValue;
+			const editorHeight = this.editor.getLayoutInfo().height;
+			const lineBottom = this.editor.getBottomForLineNumber(lineNumber);
+
+			let newScrollTop = zoneTop;
+			let forceScrollTop = false;
+
+			if (lineBottom >= (scrollTop + editorHeight)) {
+				// revealing the top of the zone would push out the line we are interested in and
+				// therefore we keep the line in the viewport
+				newScrollTop = lineBottom - editorHeight;
+				forceScrollTop = true;
+			}
+
+			if (newScrollTop < scrollTop || forceScrollTop) {
+				this._logService.trace('[IE] REVEAL zone', { zoneTop, lineTop, lineBottom, scrollTop, newScrollTop, forceScrollTop });
+				this.editor.setScrollTop(newScrollTop, ScrollType.Immediate);
+			}
+		});
 	}
 
 	protected override revealRange(range: Range, isLastLine: boolean): void {
@@ -217,6 +232,7 @@ export class InlineChatZoneWidget extends ZoneWidget {
 
 	override hide(): void {
 		const scrollState = StableEditorBottomScrollState.capture(this.editor);
+		this._scrollUp.disable();
 		this._ctxCursorPosition.reset();
 		this.widget.reset();
 		this.widget.chatWidget.setVisible(false);
@@ -225,3 +241,49 @@ export class InlineChatZoneWidget extends ZoneWidget {
 		scrollState.restore(this.editor);
 	}
 }
+
+class ScrollUpState {
+
+	private _didScrollUpOrDown?: boolean;
+	private _ignoreEvents = false;
+
+	private readonly _listener = new MutableDisposable();
+
+	constructor(private readonly _editor: ICodeEditor) { }
+
+	dispose(): void {
+		this._listener.dispose();
+	}
+
+	enable(): void {
+		this._didScrollUpOrDown = undefined;
+		this._listener.value = this._editor.onDidScrollChange(e => {
+			if (!e.scrollTopChanged || this._ignoreEvents) {
+				return;
+			}
+			this._listener.clear();
+			this._didScrollUpOrDown = true;
+		});
+	}
+
+	disable(): void {
+		this._listener.clear();
+		this._didScrollUpOrDown = undefined;
+	}
+
+	runIgnored(callback: () => void): () => void {
+		return () => {
+			this._ignoreEvents = true;
+			try {
+				return callback();
+			} finally {
+				this._ignoreEvents = false;
+			}
+		};
+	}
+
+	get didScrollUpOrDown(): boolean | undefined {
+		return this._didScrollUpOrDown;
+	}
+
+}
diff --git a/src/vs/workbench/contrib/inlineChat/browser/media/inlineChat.css b/src/vs/workbench/contrib/inlineChat/browser/media/inlineChat.css
index a6b855ff046..d8fac56650a 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/media/inlineChat.css
+++ b/src/vs/workbench/contrib/inlineChat/browser/media/inlineChat.css
@@ -20,7 +20,7 @@
 }
 
 .monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-input-part {
-	padding: 4px 6px 0 6px;
+	padding: 2px 6px 0 6px;
 }
 
 .monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-input-part .interactive-execute-toolbar {
@@ -32,6 +32,12 @@
 	border-radius: 2px;
 }
 
+
+.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-input-part .interactive-input-followups .interactive-session-followups {
+	margin: 2px 0 0 4px;
+}
+
+
 .monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-list {
 	padding: 4px 0 0 0;
 }
@@ -60,6 +66,7 @@
 .monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-list .interactive-item-container.minimal > .header {
 	top: 5px;
 	right: 10px;
+	display: none;
 }
 
 
@@ -69,7 +76,15 @@
 	display: flex;
 	justify-content: space-between;
 	align-items: center;
-	padding: 4px 6px 0 6px
+	padding-left: 6px;
+	padding-right: 6px;
+}
+
+.monaco-workbench .inline-chat > .status {
+	.label,
+	.actions {
+		padding-top: 6px;
+	}
 }
 
 .monaco-workbench .inline-chat .status .actions.hidden {
@@ -91,9 +106,12 @@
 
 .monaco-workbench .inline-chat .status .label.status {
 	margin-left: auto;
+	padding-right: 6px;
+	padding-left: 6px;
 }
 
-.monaco-workbench .inline-chat .status .label.hidden {
+.monaco-workbench .inline-chat .status .label.hidden,
+.monaco-workbench .inline-chat .status .label:empty {
 	display: none;
 }
 
@@ -113,7 +131,8 @@
 
 
 .monaco-workbench .inline-chat .status .actions,
-.monaco-workbench .inline-chat-content-widget .toolbar  {
+.monaco-workbench .inline-chat-content-widget .toolbar,
+.monaco-workbench .inline-chat-diff-overlay {
 
 	display: flex;
 	height: 18px;
@@ -122,72 +141,72 @@
 		gap: 3px
 	}
 
-	.action-item.text-only .action-label {
-		font-size: 12px;
-		line-height: 16px;
+	.monaco-button-dropdown > .monaco-dropdown-button {
+		display: flex;
+		align-items: center;
 		padding: 0 4px;
-		border-radius: 2px;
 	}
 
-	.monaco-action-bar .action-item.menu-entry.text-only + .action-item:not(.text-only) > .monaco-dropdown .action-label {
-		font-size: 12px;
-		line-height: 16px;
-		width: unset;
-		height: unset;
+	.monaco-button.codicon {
+		display: flex;
 	}
-}
 
-.monaco-workbench .inline-chat .status .actions,
-.monaco-workbench .inline-chat-content-widget.contents .toolbar  {
-
-	.monaco-action-bar .action-item.menu-entry.text-only:first-of-type .action-label{
+	.monaco-button.codicon::before {
+		align-self: center;
 		color: var(--vscode-button-foreground);
-		background-color: var(--vscode-button-background);
 	}
-}
 
-.monaco-workbench .inline-chat .status {
-	.actions.text-style {
-		display: none;
+	.monaco-button.secondary.codicon::before {
+		align-self: center;
+		color: var(--vscode-button-secondaryForeground);
 	}
-	.actions.button-style {
-		display: inherit;
-	}
-}
 
-.monaco-workbench .inline-chat .status.text {
-	.actions.text-style {
-		display: inherit;
-	}
-	.actions.button-style {
-		display: none;
+	.monaco-text-button {
+		padding: 0 2px;
+		white-space: nowrap;
 	}
 }
 
-.monaco-workbench .inline-chat .status .actions > .monaco-button,
-.monaco-workbench .inline-chat .status .actions > .monaco-button-dropdown {
-	margin-right: 4px;
+.monaco-workbench .inline-chat .status .actions {
+	gap: 4px;
 }
 
-.monaco-workbench .inline-chat .status .actions > .monaco-button-dropdown > .monaco-dropdown-button {
-	display: flex;
-	align-items: center;
-	padding: 0 4px;
+.monaco-workbench .inline-chat .status .actions.secondary {
+	display: none;
 }
 
-.monaco-workbench .inline-chat .status .actions > .monaco-button.codicon {
-	display: flex;
+.monaco-workbench .inline-chat .status:hover .actions.secondary,
+.monaco-workbench .inline-chat:focus .status .actions.secondary,
+.monaco-workbench .inline-chat .status:focus-within .actions.secondary {
+	display: inherit;
 }
 
-.monaco-workbench .inline-chat .status .actions > .monaco-button.codicon::before {
-	align-self: center;
-}
+.monaco-workbench .inline-chat-diff-overlay {
 
-.monaco-workbench .inline-chat .status .actions .monaco-text-button {
-	padding: 0 2px;
-	white-space: nowrap;
+	.monaco-button {
+		border-radius: 0;
+	}
+
+	.monaco-button.secondary.checked {
+		background-color: var(--vscode-button-secondaryHoverBackground);
+	}
+
+	.monaco-button:first-child {
+		border-top-left-radius: 2px;
+		border-bottom-left-radius: 2px;
+	}
+
+	.monaco-button:last-child {
+		border-top-right-radius: 2px;
+		border-bottom-right-radius: 2px;
+	}
+
+	.monaco-button:not(:last-child) {
+		border-right: 1px solid var(--vscode-button-foreground);
+	}
 }
 
+
 /* TODO@jrieken not needed? */
 .monaco-workbench .inline-chat .status .monaco-toolbar .action-label.checked {
 	color: var(--vscode-inputOption-activeForeground);
@@ -230,11 +249,6 @@
 	background-color: var(--vscode-diffEditor-insertedTextBackground);
 }
 
-.monaco-workbench .inline-chat-block-selection {
-	background-color: var(--vscode-inlineChat-regionHighlight);
-}
-
-
 /* gutter decoration */
 
 .monaco-workbench .glyph-margin-widgets .cgmr.codicon-inline-chat-opaque,
diff --git a/src/vs/workbench/contrib/inlineChat/browser/media/inlineChatContentWidget.css b/src/vs/workbench/contrib/inlineChat/browser/media/inlineChatContentWidget.css
index 7da5cc3e97e..07390880a04 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/media/inlineChatContentWidget.css
+++ b/src/vs/workbench/contrib/inlineChat/browser/media/inlineChatContentWidget.css
@@ -5,7 +5,6 @@
 
 .monaco-workbench .inline-chat-content-widget {
 	z-index: 50;
-	padding: 6px;
 	border-radius: 4px;
 	background-color: var(--vscode-inlineChat-background);
 	box-shadow: 0 4px 8px var(--vscode-inlineChat-shadow);
@@ -21,7 +20,7 @@
 }
 
 .monaco-workbench .inline-chat-content-widget.interactive-session .interactive-input-part.compact {
-	padding: 0;
+	padding: 6px;
 }
 
 .monaco-workbench .inline-chat-content-widget.interactive-session .interactive-list {
diff --git a/src/vs/workbench/contrib/inlineChat/common/inlineChat.ts b/src/vs/workbench/contrib/inlineChat/common/inlineChat.ts
index b4c754b1759..f4c87af0d22 100644
--- a/src/vs/workbench/contrib/inlineChat/common/inlineChat.ts
+++ b/src/vs/workbench/contrib/inlineChat/common/inlineChat.ts
@@ -6,7 +6,7 @@
 import { localize } from 'vs/nls';
 import { MenuId } from 'vs/platform/actions/common/actions';
 import { Extensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
-import { ContextKeyExpr, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
+import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { diffInserted, diffRemoved, editorWidgetBackground, editorWidgetBorder, editorWidgetForeground, focusBorder, inputBackground, inputPlaceholderForeground, registerColor, transparent, widgetShadow } from 'vs/platform/theme/common/colorRegistry';
 
@@ -16,9 +16,10 @@ export const enum InlineChatConfigKeys {
 	Mode = 'inlineChat.mode',
 	FinishOnType = 'inlineChat.finishOnType',
 	AcceptedOrDiscardBeforeSave = 'inlineChat.acceptedOrDiscardBeforeSave',
+	StartWithOverlayWidget = 'inlineChat.startWithOverlayWidget',
+	ZoneToolbar = 'inlineChat.experimental.enableZoneToolbar',
 	HoldToSpeech = 'inlineChat.holdToSpeech',
-	AccessibleDiffView = 'inlineChat.accessibleDiffView',
-	ExpTextButtons = 'inlineChat.experimental.textButtons'
+	AccessibleDiffView = 'inlineChat.accessibleDiffView'
 }
 
 export const enum EditMode {
@@ -66,8 +67,13 @@ Registry.as<IConfigurationRegistry>(Extensions.Configuration).registerConfigurat
 				localize('accessibleDiffView.off', "The accessible diff viewer is never enabled."),
 			],
 		},
-		[InlineChatConfigKeys.ExpTextButtons]: {
-			description: localize('txtButtons', "Whether to use textual buttons."),
+		[InlineChatConfigKeys.StartWithOverlayWidget]: {
+			description: localize('onlyZone', "Whether inline chat opens directly as zone widget, between the lines, or as overlay widget which turns into a zone."),
+			default: false,
+			type: 'boolean',
+		},
+		[InlineChatConfigKeys.ZoneToolbar]: {
+			description: localize('zoneToolbar', "Whether to show a toolbar to accept or reject changes in the inline chat changes view."),
 			default: false,
 			type: 'boolean',
 			tags: ['experimental']
@@ -90,6 +96,7 @@ export const enum InlineChatResponseType {
 export const CTX_INLINE_CHAT_HAS_AGENT = new RawContextKey<boolean>('inlineChatHasProvider', false, localize('inlineChatHasProvider', "Whether a provider for interactive editors exists"));
 export const CTX_INLINE_CHAT_VISIBLE = new RawContextKey<boolean>('inlineChatVisible', false, localize('inlineChatVisible', "Whether the interactive editor input is visible"));
 export const CTX_INLINE_CHAT_FOCUSED = new RawContextKey<boolean>('inlineChatFocused', false, localize('inlineChatFocused', "Whether the interactive editor input is focused"));
+export const CTX_INLINE_CHAT_EDITING = new RawContextKey<boolean>('inlineChatEditing', true, localize('inlineChatEditing', "Whether the user is currently editing or generating code in the inline chat"));
 export const CTX_INLINE_CHAT_RESPONSE_FOCUSED = new RawContextKey<boolean>('inlineChatResponseFocused', false, localize('inlineChatResponseFocused', "Whether the interactive widget's response is focused"));
 export const CTX_INLINE_CHAT_EMPTY = new RawContextKey<boolean>('inlineChatEmpty', false, localize('inlineChatEmpty', "Whether the interactive editor input is empty"));
 export const CTX_INLINE_CHAT_INNER_CURSOR_FIRST = new RawContextKey<boolean>('inlineChatInnerCursorFirst', false, localize('inlineChatInnerCursorFirst', "Whether the cursor of the iteractive editor input is on the first line"));
@@ -106,20 +113,21 @@ export const CTX_INLINE_CHAT_EDIT_MODE = new RawContextKey<EditMode>('config.inl
 export const CTX_INLINE_CHAT_REQUEST_IN_PROGRESS = new RawContextKey<boolean>('inlineChatRequestInProgress', false, localize('inlineChatRequestInProgress', "Whether an inline chat request is currently in progress"));
 export const CTX_INLINE_CHAT_RESPONSE_TYPE = new RawContextKey<InlineChatResponseType>('inlineChatResponseType', InlineChatResponseType.None, localize('inlineChatResponseTypes', "What type was the responses have been receieved, nothing yet, just messages, or messaged and local edits"));
 
-export const CTX_INLINE_CHAT_CONFIG_TXT_BTNS = ContextKeyExpr.equals(`config.${[InlineChatConfigKeys.ExpTextButtons]}`, true);
-
 // --- (selected) action identifier
 
 export const ACTION_ACCEPT_CHANGES = 'inlineChat.acceptChanges';
+export const ACTION_DISCARD_CHANGES = 'inlineChat.discardHunkChange';
 export const ACTION_REGENERATE_RESPONSE = 'inlineChat.regenerate';
 export const ACTION_VIEW_IN_CHAT = 'inlineChat.viewInChat';
 export const ACTION_TOGGLE_DIFF = 'inlineChat.toggleDiff';
+export const ACTION_REPORT_ISSUE = 'inlineChat.reportIssue';
 
 // --- menus
 
-export const MENU_INLINE_CHAT_EXECUTE = MenuId.for('inlineChat.execute');
 export const MENU_INLINE_CHAT_CONTENT_STATUS = MenuId.for('inlineChat.content.status');
 export const MENU_INLINE_CHAT_WIDGET_STATUS = MenuId.for('inlineChatWidget.status');
+export const MENU_INLINE_CHAT_WIDGET_SECONDARY = MenuId.for('inlineChatWidget.secondary');
+export const MENU_INLINE_CHAT_ZONE = MenuId.for('inlineChatWidget.changesZone');
 
 // --- colors
 
diff --git a/src/vs/workbench/contrib/inlineChat/test/browser/__snapshots__/InlineChatSession_Apply_Code_s_preview_should_be_easier_to_undo_esc__7537.1.snap b/src/vs/workbench/contrib/inlineChat/test/browser/__snapshots__/InlineChatSession_Apply_Code_s_preview_should_be_easier_to_undo_esc__7537.1.snap
new file mode 100644
index 00000000000..a0379e041b9
--- /dev/null
+++ b/src/vs/workbench/contrib/inlineChat/test/browser/__snapshots__/InlineChatSession_Apply_Code_s_preview_should_be_easier_to_undo_esc__7537.1.snap
@@ -0,0 +1,13 @@
+export function fib(n) {
+	if (n <= 0) return 0;
+	if (n === 1) return 0;
+	if (n === 2) return 1;
+
+	let a = 0, b = 1, c;
+	for (let i = 3; i <= n; i++) {
+		c = a + b;
+		a = b;
+		b = c;
+	}
+	return b;
+}
\ No newline at end of file
diff --git a/src/vs/workbench/contrib/inlineChat/test/browser/__snapshots__/InlineChatSession_Apply_Code_s_preview_should_be_easier_to_undo_esc__7537.2.snap b/src/vs/workbench/contrib/inlineChat/test/browser/__snapshots__/InlineChatSession_Apply_Code_s_preview_should_be_easier_to_undo_esc__7537.2.snap
new file mode 100644
index 00000000000..3d44a421300
--- /dev/null
+++ b/src/vs/workbench/contrib/inlineChat/test/browser/__snapshots__/InlineChatSession_Apply_Code_s_preview_should_be_easier_to_undo_esc__7537.2.snap
@@ -0,0 +1,6 @@
+export function fib(n) {
+	if (n <= 0) return 0;
+	if (n === 1) return 0;
+	if (n === 2) return 1;
+	return fib(n - 1) + fib(n - 2);
+}
\ No newline at end of file
diff --git a/src/vs/workbench/contrib/inlineChat/test/browser/inlineChatController.test.ts b/src/vs/workbench/contrib/inlineChat/test/browser/inlineChatController.test.ts
index cc4ddad6e7a..ca2b5478650 100644
--- a/src/vs/workbench/contrib/inlineChat/test/browser/inlineChatController.test.ts
+++ b/src/vs/workbench/contrib/inlineChat/test/browser/inlineChatController.test.ts
@@ -33,14 +33,10 @@ import { IAccessibleViewService } from 'vs/platform/accessibility/browser/access
 import { IChatAccessibilityService, IChatWidget, IChatWidgetService } from 'vs/workbench/contrib/chat/browser/chat';
 import { ChatAgentLocation, ChatAgentService, IChatAgentData, IChatAgentNameService, IChatAgentService } from 'vs/workbench/contrib/chat/common/chatAgents';
 import { IChatResponseViewModel } from 'vs/workbench/contrib/chat/common/chatViewModel';
-import { InlineChatController, InlineChatRunOptions, State } from 'vs/workbench/contrib/inlineChat/browser/inlineChatController';
+import { InlineChatController, State } from 'vs/workbench/contrib/inlineChat/browser/inlineChatController';
 import { Session } from 'vs/workbench/contrib/inlineChat/browser/inlineChatSession';
 import { CTX_INLINE_CHAT_USER_DID_EDIT, EditMode, InlineChatConfigKeys } from 'vs/workbench/contrib/inlineChat/common/inlineChat';
 import { TestViewsService, workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
-import { IInlineChatSavingService } from '../../browser/inlineChatSavingService';
-import { IInlineChatSessionService } from '../../browser/inlineChatSessionService';
-import { InlineChatSessionServiceImpl } from '../../browser/inlineChatSessionServiceImpl';
-import { TestWorkerService } from './testWorkerService';
 import { IExtensionService, nullExtensionDescription } from 'vs/workbench/services/extensions/common/extensions';
 import { IChatProgress, IChatService } from 'vs/workbench/contrib/chat/common/chatService';
 import { ChatService } from 'vs/workbench/contrib/chat/common/chatServiceImpl';
@@ -63,6 +59,12 @@ import { INotebookEditorService } from 'vs/workbench/contrib/notebook/browser/se
 import { RerunAction } from 'vs/workbench/contrib/inlineChat/browser/inlineChatActions';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { assertType } from 'vs/base/common/types';
+import { IWorkbenchAssignmentService } from 'vs/workbench/services/assignment/common/assignmentService';
+import { NullWorkbenchAssignmentService } from 'vs/workbench/services/assignment/test/common/nullAssignmentService';
+import { IInlineChatSavingService } from 'vs/workbench/contrib/inlineChat/browser/inlineChatSavingService';
+import { IInlineChatSessionService } from 'vs/workbench/contrib/inlineChat/browser/inlineChatSessionService';
+import { InlineChatSessionServiceImpl } from 'vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl';
+import { TestWorkerService } from 'vs/workbench/contrib/inlineChat/test/browser/testWorkerService';
 
 suite('InteractiveChatController', function () {
 
@@ -76,16 +78,17 @@ suite('InteractiveChatController', function () {
 		isDefault: true,
 		locations: [ChatAgentLocation.Editor],
 		metadata: {},
-		slashCommands: []
+		slashCommands: [],
+		disambiguation: [],
 	};
 
 	class TestController extends InlineChatController {
 
 		static INIT_SEQUENCE: readonly State[] = [State.CREATE_SESSION, State.INIT_UI, State.WAIT_FOR_INPUT];
-		static INIT_SEQUENCE_AUTO_SEND: readonly State[] = [...this.INIT_SEQUENCE, State.SHOW_REQUEST, State.SHOW_RESPONSE, State.WAIT_FOR_INPUT];
+		static INIT_SEQUENCE_AUTO_SEND: readonly State[] = [...this.INIT_SEQUENCE, State.SHOW_REQUEST, State.WAIT_FOR_INPUT];
 
-		private readonly _onDidChangeState = new Emitter<State>();
-		readonly onDidChangeState: Event<State> = this._onDidChangeState.event;
+
+		readonly onDidChangeState: Event<State> = this._onDidEnterState.event;
 
 		readonly states: readonly State[] = [];
 
@@ -107,20 +110,6 @@ suite('InteractiveChatController', function () {
 				}, 1000);
 			});
 		}
-
-		protected override async _nextState(state: State, options: InlineChatRunOptions): Promise<void> {
-			let nextState: State | void = state;
-			while (nextState) {
-				this._onDidChangeState.fire(nextState);
-				(<State[]>this.states).push(nextState);
-				nextState = await this[nextState](options);
-			}
-		}
-
-		override dispose() {
-			super.dispose();
-			this._onDidChangeState.dispose();
-		}
 	}
 
 	const store = new DisposableStore();
@@ -196,7 +185,8 @@ suite('InteractiveChatController', function () {
 			}],
 			[INotebookEditorService, new class extends mock<INotebookEditorService>() {
 				override listNotebookEditors() { return []; }
-			}]
+			}],
+			[IWorkbenchAssignmentService, new NullWorkbenchAssignmentService()]
 		);
 
 		instaService = store.add((store.add(workbenchInstantiationService(undefined, store))).createChild(serviceCollection));
@@ -330,7 +320,7 @@ suite('InteractiveChatController', function () {
 
 		ctrl.chatWidget.setInput('GENGEN');
 		ctrl.acceptInput();
-		assert.strictEqual(await ctrl.awaitStates([State.SHOW_REQUEST, State.SHOW_RESPONSE, State.WAIT_FOR_INPUT]), undefined);
+		assert.strictEqual(await ctrl.awaitStates([State.SHOW_REQUEST, State.WAIT_FOR_INPUT]), undefined);
 
 		assert.deepStrictEqual(session.wholeRange.value, new Range(1, 1, 4, 3));
 
@@ -380,7 +370,7 @@ suite('InteractiveChatController', function () {
 		const valueThen = editor.getModel().getValue();
 
 		ctrl = instaService.createInstance(TestController, editor);
-		const p = ctrl.awaitStates([...TestController.INIT_SEQUENCE, State.SHOW_REQUEST, State.SHOW_RESPONSE, State.WAIT_FOR_INPUT]);
+		const p = ctrl.awaitStates([...TestController.INIT_SEQUENCE, State.SHOW_REQUEST, State.WAIT_FOR_INPUT]);
 		const r = ctrl.run({ message: 'Hello', autoSend: true });
 		assert.strictEqual(await p, undefined);
 		ctrl.acceptSession();
@@ -423,7 +413,7 @@ suite('InteractiveChatController', function () {
 			// store.add(editor.getModel().onDidChangeContent(() => { modelChangeCounter++; }));
 
 			ctrl = instaService.createInstance(TestController, editor);
-			const p = ctrl.awaitStates([...TestController.INIT_SEQUENCE, State.SHOW_REQUEST, State.SHOW_RESPONSE, State.WAIT_FOR_INPUT]);
+			const p = ctrl.awaitStates([...TestController.INIT_SEQUENCE, State.SHOW_REQUEST, State.WAIT_FOR_INPUT]);
 			const r = ctrl.run({ message: 'Hello', autoSend: true });
 			assert.strictEqual(await p, undefined);
 
@@ -446,7 +436,7 @@ suite('InteractiveChatController', function () {
 
 		// NO manual edits -> cancel
 		ctrl = instaService.createInstance(TestController, editor);
-		const p = ctrl.awaitStates([...TestController.INIT_SEQUENCE, State.SHOW_REQUEST, State.SHOW_RESPONSE, State.WAIT_FOR_INPUT]);
+		const p = ctrl.awaitStates([...TestController.INIT_SEQUENCE, State.SHOW_REQUEST, State.WAIT_FOR_INPUT]);
 		const r = ctrl.run({ message: 'GENERATED', autoSend: true });
 		assert.strictEqual(await p, undefined);
 
@@ -462,7 +452,7 @@ suite('InteractiveChatController', function () {
 
 		// manual edits -> finish
 		ctrl = instaService.createInstance(TestController, editor);
-		const p = ctrl.awaitStates([...TestController.INIT_SEQUENCE, State.SHOW_REQUEST, State.SHOW_RESPONSE, State.WAIT_FOR_INPUT]);
+		const p = ctrl.awaitStates([...TestController.INIT_SEQUENCE, State.SHOW_REQUEST, State.WAIT_FOR_INPUT]);
 		const r = ctrl.run({ message: 'GENERATED', autoSend: true });
 		assert.strictEqual(await p, undefined);
 
@@ -497,14 +487,14 @@ suite('InteractiveChatController', function () {
 
 		model.setValue('');
 
-		const p = ctrl.awaitStates([...TestController.INIT_SEQUENCE, State.SHOW_REQUEST, State.SHOW_RESPONSE, State.WAIT_FOR_INPUT]);
+		const p = ctrl.awaitStates([...TestController.INIT_SEQUENCE, State.SHOW_REQUEST, State.WAIT_FOR_INPUT]);
 		const r = ctrl.run({ message: 'PROMPT_', autoSend: true });
 		assert.strictEqual(await p, undefined);
 
 
 		assert.strictEqual(model.getValue(), 'PROMPT_1');
 
-		const p2 = ctrl.awaitStates([State.SHOW_REQUEST, State.SHOW_RESPONSE, State.WAIT_FOR_INPUT]);
+		const p2 = ctrl.awaitStates([State.SHOW_REQUEST, State.WAIT_FOR_INPUT]);
 		await instaService.invokeFunction(rerun.runInlineChatCommand, ctrl, editor);
 
 		assert.strictEqual(await p2, undefined);
@@ -538,14 +528,14 @@ suite('InteractiveChatController', function () {
 		model.setValue('');
 
 		// REQUEST 1
-		const p = ctrl.awaitStates([...TestController.INIT_SEQUENCE, State.SHOW_REQUEST, State.SHOW_RESPONSE, State.WAIT_FOR_INPUT]);
+		const p = ctrl.awaitStates([...TestController.INIT_SEQUENCE, State.SHOW_REQUEST, State.WAIT_FOR_INPUT]);
 		const r = ctrl.run({ message: '1', autoSend: true });
 		assert.strictEqual(await p, undefined);
 
 		assert.strictEqual(model.getValue(), 'eins-');
 
 		// REQUEST 2
-		const p2 = ctrl.awaitStates([State.SHOW_REQUEST, State.SHOW_RESPONSE, State.WAIT_FOR_INPUT]);
+		const p2 = ctrl.awaitStates([State.SHOW_REQUEST, State.WAIT_FOR_INPUT]);
 		ctrl.chatWidget.setInput('1');
 		await ctrl.acceptInput();
 		assert.strictEqual(await p2, undefined);
@@ -553,7 +543,7 @@ suite('InteractiveChatController', function () {
 		assert.strictEqual(model.getValue(), 'zwei-eins-');
 
 		// REQUEST 2 - RERUN
-		const p3 = ctrl.awaitStates([State.SHOW_REQUEST, State.SHOW_RESPONSE, State.WAIT_FOR_INPUT]);
+		const p3 = ctrl.awaitStates([State.SHOW_REQUEST, State.WAIT_FOR_INPUT]);
 		await instaService.invokeFunction(rerun.runInlineChatCommand, ctrl, editor);
 		assert.strictEqual(await p3, undefined);
 
@@ -582,7 +572,7 @@ suite('InteractiveChatController', function () {
 		ctrl = instaService.createInstance(TestController, editor);
 
 		// REQUEST 1
-		const p = ctrl.awaitStates([...TestController.INIT_SEQUENCE, State.SHOW_REQUEST, State.SHOW_RESPONSE, State.WAIT_FOR_INPUT]);
+		const p = ctrl.awaitStates([...TestController.INIT_SEQUENCE, State.SHOW_REQUEST, State.WAIT_FOR_INPUT]);
 		ctrl.run({ message: '1', autoSend: true });
 		assert.strictEqual(await p, undefined);
 
@@ -622,14 +612,14 @@ suite('InteractiveChatController', function () {
 		ctrl = instaService.createInstance(TestController, editor);
 
 		// REQUEST 1
-		const p = ctrl.awaitStates([...TestController.INIT_SEQUENCE, State.SHOW_REQUEST, State.SHOW_RESPONSE, State.WAIT_FOR_INPUT]);
+		const p = ctrl.awaitStates([...TestController.INIT_SEQUENCE, State.SHOW_REQUEST, State.WAIT_FOR_INPUT]);
 		ctrl.run({ message: '1', autoSend: true });
 		assert.strictEqual(await p, undefined);
 
 		assert.strictEqual(model.getValue(), 'eins\nHello\nWorld\nHello Again\nHello World\n');
 
 		// REQUEST 2
-		const p2 = ctrl.awaitStates([State.SHOW_REQUEST, State.SHOW_RESPONSE, State.WAIT_FOR_INPUT]);
+		const p2 = ctrl.awaitStates([State.SHOW_REQUEST, State.WAIT_FOR_INPUT]);
 		ctrl.chatWidget.setInput('1');
 		await ctrl.acceptInput();
 		assert.strictEqual(await p2, undefined);
@@ -661,11 +651,14 @@ suite('InteractiveChatController', function () {
 		let count = 0;
 		const commandDetection: (boolean | undefined)[] = [];
 
+		const onDidInvoke = new Emitter<void>();
+
 		store.add(chatAgentService.registerDynamicAgent({
 			id: 'testEditorAgent2',
 			...agentData
 		}, {
 			async invoke(request, progress, history, token) {
+				queueMicrotask(() => onDidInvoke.fire());
 				commandDetection.push(request.enableCommandDetection);
 				progress({ kind: 'textEdit', uri: model.uri, edits: [{ range: new Range(1, 1, 1, 1), text: request.message + (count++) }] });
 
@@ -682,17 +675,23 @@ suite('InteractiveChatController', function () {
 		ctrl = instaService.createInstance(TestController, editor);
 
 		// REQUEST 1
-		const p = ctrl.awaitStates([...TestController.INIT_SEQUENCE, State.SHOW_REQUEST]);
+		// const p = ctrl.awaitStates([...TestController.INIT_SEQUENCE, State.SHOW_REQUEST]);
+		const p = Event.toPromise(onDidInvoke.event);
 		ctrl.run({ message: 'Hello-', autoSend: true });
-		assert.strictEqual(await p, undefined);
+
+		await p;
+
+		// assert.strictEqual(await p, undefined);
 
 		// resend pending request without command detection
 		const request = ctrl.chatWidget.viewModel?.model.getRequests().at(-1);
 		assertType(request);
-		const p2 = ctrl.awaitStates([State.SHOW_REQUEST, State.SHOW_RESPONSE]);
+		const p2 = Event.toPromise(onDidInvoke.event);
+		const p3 = ctrl.awaitStates([State.SHOW_REQUEST, State.WAIT_FOR_INPUT]);
 		chatService.resendRequest(request, { noCommandDetection: true, attempt: request.attempt + 1, location: ChatAgentLocation.Editor });
 
-		assert.strictEqual(await p2, undefined);
+		await p2;
+		assert.strictEqual(await p3, undefined);
 
 		assert.deepStrictEqual(commandDetection, [true, false]);
 		assert.strictEqual(model.getValue(), 'Hello-1');
@@ -718,14 +717,14 @@ suite('InteractiveChatController', function () {
 		ctrl = instaService.createInstance(TestController, editor);
 
 		// REQUEST 1
-		const p = ctrl.awaitStates([...TestController.INIT_SEQUENCE, State.SHOW_REQUEST, State.SHOW_RESPONSE, State.WAIT_FOR_INPUT]);
+		const p = ctrl.awaitStates([...TestController.INIT_SEQUENCE, State.SHOW_REQUEST, State.WAIT_FOR_INPUT]);
 		ctrl.run({ message: 'Hello-', autoSend: true });
 		assert.strictEqual(await p, undefined);
 
 		// resend pending request without command detection
 		const request = ctrl.chatWidget.viewModel?.model.getRequests().at(-1);
 		assertType(request);
-		const p2 = ctrl.awaitStates([State.SHOW_REQUEST, State.SHOW_RESPONSE, State.WAIT_FOR_INPUT]);
+		const p2 = ctrl.awaitStates([State.SHOW_REQUEST, State.WAIT_FOR_INPUT]);
 		chatService.resendRequest(request, { noCommandDetection: true, attempt: request.attempt + 1, location: ChatAgentLocation.Editor });
 
 		assert.strictEqual(await p2, undefined);
@@ -765,10 +764,11 @@ suite('InteractiveChatController', function () {
 		const p = ctrl.awaitStates([...TestController.INIT_SEQUENCE, State.SHOW_REQUEST]);
 		ctrl.run({ message: 'Hello-', autoSend: true });
 		assert.strictEqual(await p, undefined);
+		await timeout(10);
 		assert.deepStrictEqual(attempts, [0]);
 
 		// RERUN (cancel, undo, redo)
-		const p2 = ctrl.awaitStates([State.SHOW_REQUEST, State.SHOW_RESPONSE, State.WAIT_FOR_INPUT]);
+		const p2 = ctrl.awaitStates([State.SHOW_REQUEST, State.WAIT_FOR_INPUT]);
 		const rerun = new RerunAction();
 		await instaService.invokeFunction(rerun.runInlineChatCommand, ctrl, editor);
 		assert.strictEqual(await p2, undefined);
@@ -779,7 +779,7 @@ suite('InteractiveChatController', function () {
 
 	});
 
-	test('Stopping/cancelling a request should undo its changes', async function () {
+	test('Stopping/cancelling a request should NOT undo its changes', async function () {
 
 		model.setValue('World');
 
@@ -803,6 +803,7 @@ suite('InteractiveChatController', function () {
 		// REQUEST 1
 		const p = ctrl.awaitStates([...TestController.INIT_SEQUENCE, State.SHOW_REQUEST]);
 		ctrl.run({ message: 'Hello', autoSend: true });
+		await timeout(10);
 		assert.strictEqual(await p, undefined);
 
 		assertType(progress);
@@ -814,11 +815,98 @@ suite('InteractiveChatController', function () {
 		await modelChange;
 		assert.strictEqual(model.getValue(), 'HelloWorld'); // first word has been streamed
 
-		const p2 = ctrl.awaitStates([State.SHOW_RESPONSE, State.WAIT_FOR_INPUT]);
+		const p2 = ctrl.awaitStates([State.WAIT_FOR_INPUT]);
 		chatService.cancelCurrentRequestForSession(ctrl.chatWidget.viewModel!.model.sessionId);
 		assert.strictEqual(await p2, undefined);
 
-		assert.strictEqual(model.getValue(), 'World');
+		assert.strictEqual(model.getValue(), 'HelloWorld'); // CANCEL just stops the request and progressive typing but doesn't undo
+
+	});
+
+	test('Apply Edits from existing session w/ edits', async function () {
+
+		model.setValue('');
+
+		const newSession = await inlineChatSessionService.createSession(editor, { editMode: EditMode.Live }, CancellationToken.None);
+		assertType(newSession);
+
+		await chatService.sendRequest(newSession.chatModel.sessionId, 'Existing', { location: ChatAgentLocation.Editor });
+
+
+		assert.strictEqual(newSession.chatModel.requestInProgress, true);
+
+		const response = newSession.chatModel.lastRequest?.response;
+		assertType(response);
+
+		await new Promise(resolve => {
+			if (response.isComplete) {
+				resolve(undefined);
+			}
+			const d = response.onDidChange(() => {
+				if (response.isComplete) {
+					d.dispose();
+					resolve(undefined);
+				}
+			});
+		});
+
+		ctrl = instaService.createInstance(TestController, editor);
+		const p = ctrl.awaitStates([...TestController.INIT_SEQUENCE]);
+		ctrl.run({ existingSession: newSession });
+
+		assert.strictEqual(await p, undefined);
+
+		assert.strictEqual(model.getValue(), 'Existing');
+
+	});
+
+	test('Undo on error (2 rounds)', async function () {
 
+		return runWithFakedTimers({}, async () => {
+
+
+			store.add(chatAgentService.registerDynamicAgent({ id: 'testEditorAgent', ...agentData, }, {
+				async invoke(request, progress, history, token) {
+
+					progress({
+						kind: 'textEdit',
+						uri: model.uri,
+						edits: [{
+							range: new Range(1, 1, 1, 1),
+							text: request.message
+						}]
+					});
+
+					if (request.message === 'two') {
+						await timeout(100); // give edit a chance
+						return {
+							errorDetails: { message: 'FAILED' }
+						};
+					}
+					return {};
+				},
+			}));
+
+			model.setValue('');
+
+			// ROUND 1
+
+			ctrl = instaService.createInstance(TestController, editor);
+			const p = ctrl.awaitStates([...TestController.INIT_SEQUENCE, State.SHOW_REQUEST, State.WAIT_FOR_INPUT]);
+			ctrl.run({ autoSend: true, message: 'one' });
+			assert.strictEqual(await p, undefined);
+			assert.strictEqual(model.getValue(), 'one');
+
+
+			// ROUND 2
+
+			const p2 = ctrl.awaitStates([State.SHOW_REQUEST, State.WAIT_FOR_INPUT]);
+			const values = new Set<string>();
+			store.add(model.onDidChangeContent(() => values.add(model.getValue())));
+			ctrl.chatWidget.acceptInput('two'); // WILL Trigger a failure
+			assert.strictEqual(await p2, undefined);
+			assert.strictEqual(model.getValue(), 'one'); // undone
+			assert.ok(values.has('twoone')); // we had but the change got undone
+		});
 	});
 });
diff --git a/src/vs/workbench/contrib/inlineChat/test/browser/inlineChatSession.test.ts b/src/vs/workbench/contrib/inlineChat/test/browser/inlineChatSession.test.ts
index 26e72175e2c..82734a99ef7 100644
--- a/src/vs/workbench/contrib/inlineChat/test/browser/inlineChatSession.test.ts
+++ b/src/vs/workbench/contrib/inlineChat/test/browser/inlineChatSession.test.ts
@@ -56,6 +56,12 @@ import { ChatVariablesService } from 'vs/workbench/contrib/chat/browser/chatVari
 import { ICommandService } from 'vs/platform/commands/common/commands';
 import { TestCommandService } from 'vs/editor/test/browser/editorTestServices';
 import { IAccessibleViewService } from 'vs/platform/accessibility/browser/accessibleView';
+import { IWorkbenchAssignmentService } from 'vs/workbench/services/assignment/common/assignmentService';
+import { NullWorkbenchAssignmentService } from 'vs/workbench/services/assignment/test/common/nullAssignmentService';
+import { ILanguageModelToolsService } from 'vs/workbench/contrib/chat/common/languageModelToolsService';
+import { MockLanguageModelToolsService } from 'vs/workbench/contrib/chat/test/common/mockLanguageModelToolsService';
+import { IChatRequestModel } from 'vs/workbench/contrib/chat/common/chatModel';
+import { assertSnapshot } from 'vs/base/test/common/snapshot';
 
 suite('InlineChatSession', function () {
 
@@ -89,6 +95,7 @@ suite('InlineChatSession', function () {
 			[IDiffProviderFactoryService, new SyncDescriptor(TestDiffProviderFactoryService)],
 			[IInlineChatSessionService, new SyncDescriptor(InlineChatSessionServiceImpl)],
 			[ICommandService, new SyncDescriptor(TestCommandService)],
+			[ILanguageModelToolsService, new MockLanguageModelToolsService()],
 			[IInlineChatSavingService, new class extends mock<IInlineChatSavingService>() {
 				override markChanged(session: Session): void {
 					// noop
@@ -115,7 +122,8 @@ suite('InlineChatSession', function () {
 			[IConfigurationService, new TestConfigurationService()],
 			[IViewDescriptorService, new class extends mock<IViewDescriptorService>() {
 				override onDidChangeLocation = Event.None;
-			}]
+			}],
+			[IWorkbenchAssignmentService, new NullWorkbenchAssignmentService()]
 		);
 
 
@@ -133,7 +141,8 @@ suite('InlineChatSession', function () {
 			isDefault: true,
 			locations: [ChatAgentLocation.Editor],
 			metadata: {},
-			slashCommands: []
+			slashCommands: [],
+			disambiguation: [],
 		}, {
 			async invoke() {
 				return {};
@@ -480,4 +489,90 @@ suite('InlineChatSession', function () {
 
 		inlineChatSessionService.releaseSession(session);
 	});
+
+	test('Pressing Escape after inline chat errored with "response filtered" leaves document dirty #7764', async function () {
+
+		const origValue = `class Foo {
+	private onError(error: string): void {
+		if (/The request timed out|The network connection was lost/i.test(error)) {
+			return;
+		}
+
+		error = error.replace(/See https:\/\/github\.com\/Squirrel\/Squirrel\.Mac\/issues\/182 for more information/, 'This might mean the application was put on quarantine by macOS. See [this link](https://github.com/microsoft/vscode/issues/7426#issuecomment-425093469) for more information');
+
+		this.notificationService.notify({
+			severity: Severity.Error,
+			message: error,
+			source: nls.localize('update service', "Update Service"),
+		});
+	}
+}`;
+		model.setValue(origValue);
+
+		const session = await inlineChatSessionService.createSession(editor, { editMode: EditMode.Live }, CancellationToken.None);
+		assertType(session);
+
+		const fakeRequest = new class extends mock<IChatRequestModel>() {
+			override get id() { return 'one'; }
+		};
+		session.markModelVersion(fakeRequest);
+
+		assert.strictEqual(editor.getModel().getLineCount(), 15);
+
+		await makeEditAsAi([EditOperation.replace(new Range(7, 1, 7, Number.MAX_SAFE_INTEGER), `error = error.replace(
+			/See https:\/\/github\.com\/Squirrel\/Squirrel\.Mac\/issues\/182 for more information/,
+			'This might mean the application was put on quarantine by macOS. See [this link](https://github.com/microsoft/vscode/issues/7426#issuecomment-425093469) for more information'
+		);`)]);
+
+		assert.strictEqual(editor.getModel().getLineCount(), 18);
+
+		// called when a response errors out
+		await session.undoChangesUntil(fakeRequest.id);
+		await session.hunkData.recompute({ applied: 0, sha1: 'fakeSha1' }, undefined);
+
+		assert.strictEqual(editor.getModel().getValue(), origValue);
+
+		session.hunkData.discardAll(); // called when dimissing the session
+		assert.strictEqual(editor.getModel().getValue(), origValue);
+	});
+
+	test('Apply Code\'s preview should be easier to undo/esc #7537', async function () {
+		model.setValue(`export function fib(n) {
+	if (n <= 0) return 0;
+	if (n === 1) return 0;
+	if (n === 2) return 1;
+	return fib(n - 1) + fib(n - 2);
+}`);
+		const session = await inlineChatSessionService.createSession(editor, { editMode: EditMode.Live }, CancellationToken.None);
+		assertType(session);
+
+		await makeEditAsAi([EditOperation.replace(new Range(5, 1, 6, Number.MAX_SAFE_INTEGER), `
+	let a = 0, b = 1, c;
+	for (let i = 3; i <= n; i++) {
+		c = a + b;
+		a = b;
+		b = c;
+	}
+	return b;
+}`)]);
+
+		assert.strictEqual(session.hunkData.size, 1);
+		assert.strictEqual(session.hunkData.pending, 1);
+		assert.ok(session.hunkData.getInfo().every(d => d.getState() === HunkState.Pending));
+
+		await assertSnapshot(editor.getModel().getValue(), { name: '1' });
+
+		await model.undo();
+		await assertSnapshot(editor.getModel().getValue(), { name: '2' });
+
+		// overlapping edits (even UNDO) mark edits as accepted
+		assert.strictEqual(session.hunkData.size, 1);
+		assert.strictEqual(session.hunkData.pending, 0);
+		assert.ok(session.hunkData.getInfo().every(d => d.getState() === HunkState.Accepted));
+
+		// no further change when discarding
+		session.hunkData.discardAll(); // CANCEL
+		await assertSnapshot(editor.getModel().getValue(), { name: '2' });
+	});
+
 });
diff --git a/src/vs/workbench/contrib/inlineChat/test/browser/testWorkerService.ts b/src/vs/workbench/contrib/inlineChat/test/browser/testWorkerService.ts
index d9b64666384..409c170c448 100644
--- a/src/vs/workbench/contrib/inlineChat/test/browser/testWorkerService.ts
+++ b/src/vs/workbench/contrib/inlineChat/test/browser/testWorkerService.ts
@@ -9,7 +9,7 @@ import { IModelService } from 'vs/editor/common/services/model';
 import { assertType } from 'vs/base/common/types';
 import { DiffAlgorithmName, IEditorWorkerService, ILineChange } from 'vs/editor/common/services/editorWorker';
 import { IDocumentDiff, IDocumentDiffProviderOptions } from 'vs/editor/common/diff/documentDiffProvider';
-import { EditorSimpleWorker } from 'vs/editor/common/services/editorSimpleWorker';
+import { BaseEditorSimpleWorker } from 'vs/editor/common/services/editorSimpleWorker';
 import { LineRange } from 'vs/editor/common/core/lineRange';
 import { MovedText } from 'vs/editor/common/diff/linesDiffComputer';
 import { LineRangeMapping, DetailedLineRangeMapping, RangeMapping } from 'vs/editor/common/diff/rangeMapping';
@@ -18,7 +18,7 @@ import { TextEdit } from 'vs/editor/common/languages';
 
 export class TestWorkerService extends mock<IEditorWorkerService>() {
 
-	private readonly _worker = new EditorSimpleWorker(null!, null);
+	private readonly _worker = new BaseEditorSimpleWorker();
 
 	constructor(@IModelService private readonly _modelService: IModelService) {
 		super();
@@ -36,21 +36,21 @@ export class TestWorkerService extends mock<IEditorWorkerService>() {
 		assertType(originalModel);
 		assertType(modifiedModel);
 
-		this._worker.acceptNewModel({
+		this._worker.$acceptNewModel({
 			url: originalModel.uri.toString(),
 			versionId: originalModel.getVersionId(),
 			lines: originalModel.getLinesContent(),
 			EOL: originalModel.getEOL(),
 		});
 
-		this._worker.acceptNewModel({
+		this._worker.$acceptNewModel({
 			url: modifiedModel.uri.toString(),
 			versionId: modifiedModel.getVersionId(),
 			lines: modifiedModel.getLinesContent(),
 			EOL: modifiedModel.getEOL(),
 		});
 
-		const result = await this._worker.computeDiff(originalModel.uri.toString(), modifiedModel.uri.toString(), options, algorithm);
+		const result = await this._worker.$computeDiff(originalModel.uri.toString(), modifiedModel.uri.toString(), options, algorithm);
 		if (!result) {
 			return result;
 		}
diff --git a/src/vs/workbench/contrib/interactive/browser/interactive.contribution.ts b/src/vs/workbench/contrib/interactive/browser/interactive.contribution.ts
index 2109f7ef705..b69ee2a6c21 100644
--- a/src/vs/workbench/contrib/interactive/browser/interactive.contribution.ts
+++ b/src/vs/workbench/contrib/interactive/browser/interactive.contribution.ts
@@ -23,11 +23,10 @@ import { Context as SuggestContext } from 'vs/editor/contrib/suggest/browser/sug
 import { localize, localize2 } from 'vs/nls';
 import { ILocalizedString } from 'vs/platform/action/common/action';
 import { Action2, MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
-import { ICommandService } from 'vs/platform/commands/common/commands';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from 'vs/platform/configuration/common/configurationRegistry';
 import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { EditorActivation, IResourceEditorInput } from 'vs/platform/editor/common/editor';
+import { EditorActivation, ITextResourceEditorInput } from 'vs/platform/editor/common/editor';
 import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
 import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
@@ -55,9 +54,6 @@ import { CellEditType, CellKind, CellUri, INTERACTIVE_WINDOW_EDITOR_ID, Notebook
 import { InteractiveWindowOpen } from 'vs/workbench/contrib/notebook/common/notebookContextKeys';
 import { INotebookKernelService } from 'vs/workbench/contrib/notebook/common/notebookKernelService';
 import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
-import { executeReplInput } from 'vs/workbench/contrib/replNotebook/browser/repl.contribution';
-import { ReplEditor } from 'vs/workbench/contrib/replNotebook/browser/replEditor';
-import { ReplEditorInput } from 'vs/workbench/contrib/replNotebook/browser/replEditorInput';
 import { columnToEditorGroup } from 'vs/workbench/services/editor/common/editorGroupColumn';
 import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
 import { IEditorResolverService, RegisteredEditorPriority } from 'vs/workbench/services/editor/common/editorResolverService';
@@ -99,7 +95,7 @@ export class InteractiveDocumentContribution extends Disposable implements IWork
 				providerDisplayName: 'Interactive Notebook',
 				displayName: 'Interactive',
 				filenamePattern: ['*.interactive'],
-				priority: RegisteredEditorPriority.exclusive
+				priority: RegisteredEditorPriority.builtin
 			}));
 		}
 
@@ -138,17 +134,25 @@ export class InteractiveDocumentContribution extends Disposable implements IWork
 			{
 				createEditorInput: ({ resource, options }) => {
 					const data = CellUri.parse(resource);
-					let cellOptions: IResourceEditorInput | undefined;
-					let IwResource = resource;
+					let cellOptions: ITextResourceEditorInput | undefined;
+					let iwResource = resource;
 
 					if (data) {
 						cellOptions = { resource, options };
-						IwResource = data.notebook;
+						iwResource = data.notebook;
 					}
 
-					const notebookOptions = { ...options, cellOptions } as INotebookEditorOptions;
+					const notebookOptions: INotebookEditorOptions | undefined = {
+						...options,
+						cellOptions,
+						cellRevealType: undefined,
+						cellSelections: undefined,
+						isReadOnly: undefined,
+						viewState: undefined,
+						indexedCellOptions: undefined
+					};
 
-					const editorInput = createEditor(IwResource, this.instantiationService);
+					const editorInput = createEditor(iwResource, this.instantiationService);
 					return {
 						editor: editorInput,
 						options: notebookOptions
@@ -159,13 +163,21 @@ export class InteractiveDocumentContribution extends Disposable implements IWork
 						throw new Error('Interactive window editors must have a resource name');
 					}
 					const data = CellUri.parse(resource);
-					let cellOptions: IResourceEditorInput | undefined;
+					let cellOptions: ITextResourceEditorInput | undefined;
 
 					if (data) {
 						cellOptions = { resource, options };
 					}
 
-					const notebookOptions = { ...options, cellOptions } as INotebookEditorOptions;
+					const notebookOptions: INotebookEditorOptions = {
+						...options,
+						cellOptions,
+						cellRevealType: undefined,
+						cellSelections: undefined,
+						isReadOnly: undefined,
+						viewState: undefined,
+						indexedCellOptions: undefined
+					};
 
 					const editorInput = createEditor(resource, this.instantiationService);
 					return {
@@ -432,25 +444,6 @@ registerAction2(class extends Action2 {
 	}
 });
 
-registerAction2(class extends Action2 {
-	constructor() {
-		super({
-			id: 'interactive.configure',
-			title: localize2('interactive.configExecute', 'Configure input box behavior'),
-			category: interactiveWindowCategory,
-			f1: false,
-			icon: icons.configIcon,
-			menu: {
-				id: MenuId.InteractiveInputConfig
-			}
-		});
-	}
-
-	override run(accessor: ServicesAccessor, ...args: any[]): void {
-		accessor.get(ICommandService).executeCommand('workbench.action.openSettings', '@tag:replExecute');
-	}
-});
-
 registerAction2(class extends Action2 {
 	constructor() {
 		super({
@@ -481,9 +474,6 @@ registerAction2(class extends Action2 {
 				{
 					id: MenuId.InteractiveInputExecute
 				},
-				{
-					id: MenuId.ReplInputExecute
-				}
 			],
 			icon: icons.executeIcon,
 			f1: false,
@@ -506,28 +496,21 @@ registerAction2(class extends Action2 {
 		const historyService = accessor.get(IInteractiveHistoryService);
 		const notebookEditorService = accessor.get(INotebookEditorService);
 		let editorControl: { notebookEditor: NotebookEditorWidget | undefined; codeEditor: CodeEditorWidget } | undefined;
-		let isReplEditor = false;
 		if (context) {
 			const resourceUri = URI.revive(context);
 			const editors = editorService.findEditors(resourceUri);
 			for (const found of editors) {
-				if (found.editor.typeId === ReplEditorInput.ID || found.editor.typeId === InteractiveEditorInput.ID) {
+				if (found.editor.typeId === InteractiveEditorInput.ID) {
 					const editor = await editorService.openEditor(found.editor, found.groupId);
 					editorControl = editor?.getControl() as { notebookEditor: NotebookEditorWidget | undefined; codeEditor: CodeEditorWidget } | undefined;
-					isReplEditor = found.editor.typeId === ReplEditorInput.ID;
 					break;
 				}
 			}
 		}
 		else {
-			const editor = editorService.activeEditorPane;
-			isReplEditor = editor instanceof ReplEditor;
 			editorControl = editorService.activeEditorPane?.getControl() as { notebookEditor: NotebookEditorWidget | undefined; codeEditor: CodeEditorWidget } | undefined;
 		}
 
-		if (editorControl && isReplEditor) {
-			executeReplInput(accessor, editorControl);
-		}
 
 		if (editorControl && editorControl.notebookEditor && editorControl.codeEditor) {
 			const notebookDocument = editorControl.notebookEditor.textModel;
@@ -543,6 +526,7 @@ registerAction2(class extends Action2 {
 					return;
 				}
 
+				historyService.replaceLast(notebookDocument.uri, value);
 				historyService.addToHistory(notebookDocument.uri, '');
 				textModel.setValue('');
 
@@ -648,6 +632,8 @@ registerAction2(class extends Action2 {
 		const historyService = accessor.get(IInteractiveHistoryService);
 		const editorControl = editorService.activeEditorPane?.getControl() as { notebookEditor: NotebookEditorWidget | undefined; codeEditor: CodeEditorWidget } | undefined;
 
+
+
 		if (editorControl && editorControl.notebookEditor && editorControl.codeEditor) {
 			const notebookDocument = editorControl.notebookEditor.textModel;
 			const textModel = editorControl.codeEditor.getModel();
@@ -701,9 +687,9 @@ registerAction2(class extends Action2 {
 			const textModel = editorControl.codeEditor.getModel();
 
 			if (notebookDocument && textModel) {
-				const previousValue = historyService.getNextValue(notebookDocument.uri);
-				if (previousValue) {
-					textModel.setValue(previousValue);
+				const nextValue = historyService.getNextValue(notebookDocument.uri);
+				if (nextValue !== null) {
+					textModel.setValue(nextValue);
 				}
 			}
 		}
diff --git a/src/vs/workbench/contrib/interactive/browser/interactiveEditor.ts b/src/vs/workbench/contrib/interactive/browser/interactiveEditor.ts
index a6b48582111..7dd408cdd16 100644
--- a/src/vs/workbench/contrib/interactive/browser/interactiveEditor.ts
+++ b/src/vs/workbench/contrib/interactive/browser/interactiveEditor.ts
@@ -60,8 +60,10 @@ import { INTERACTIVE_WINDOW_EDITOR_ID } from 'vs/workbench/contrib/notebook/comm
 import 'vs/css!./interactiveEditor';
 import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
 import { deepClone } from 'vs/base/common/objects';
-import { HoverController } from 'vs/editor/contrib/hover/browser/hoverController';
+import { ContentHoverController } from 'vs/editor/contrib/hover/browser/contentHoverController2';
+import { MarginHoverController } from 'vs/editor/contrib/hover/browser/marginHoverController';
 import { ReplInputHintContentWidget } from 'vs/workbench/contrib/interactive/browser/replInputHintContentWidget';
+import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
 
 const DECORATION_KEY = 'interactiveInputDecoration';
 const INTERACTIVE_EDITOR_VIEW_STATE_PREFERENCE_KEY = 'InteractiveEditorViewState';
@@ -88,7 +90,6 @@ export class InteractiveEditor extends EditorPane implements IEditorPaneWithScro
 	private _inputCellContainer!: HTMLElement;
 	private _inputFocusIndicator!: HTMLElement;
 	private _inputRunButtonContainer!: HTMLElement;
-	private _inputConfigContainer!: HTMLElement;
 	private _inputEditorContainer!: HTMLElement;
 	private _codeEditorWidget!: CodeEditorWidget;
 	private _notebookWidgetService: INotebookEditorService;
@@ -146,9 +147,7 @@ export class InteractiveEditor extends EditorPane implements IEditorPaneWithScro
 			themeService,
 			storageService
 		);
-		this._instantiationService = instantiationService;
 		this._notebookWidgetService = notebookWidgetService;
-		this._contextKeyService = contextKeyService;
 		this._configurationService = configurationService;
 		this._notebookKernelService = notebookKernelService;
 		this._languageService = languageService;
@@ -159,6 +158,11 @@ export class InteractiveEditor extends EditorPane implements IEditorPaneWithScro
 		this._notebookExecutionStateService = notebookExecutionStateService;
 		this._extensionService = extensionService;
 
+		this._rootElement = DOM.$('.interactive-editor');
+		this._contextKeyService = this._register(contextKeyService.createScoped(this._rootElement));
+		this._contextKeyService.createKey('isCompositeNotebook', true);
+		this._instantiationService = this._register(instantiationService.createChild(new ServiceCollection([IContextKeyService, this._contextKeyService])));
+
 		this._editorOptions = this._computeEditorOptions();
 		this._register(this._configurationService.onDidChangeConfiguration(e => {
 			if (e.affectsConfiguration('editor') || e.affectsConfiguration('notebook')) {
@@ -189,7 +193,7 @@ export class InteractiveEditor extends EditorPane implements IEditorPaneWithScro
 	}
 
 	protected createEditor(parent: HTMLElement): void {
-		this._rootElement = DOM.append(parent, DOM.$('.interactive-editor'));
+		DOM.append(parent, this._rootElement);
 		this._rootElement.style.position = 'relative';
 		this._notebookEditorContainer = DOM.append(this._rootElement, DOM.$('.notebook-editor-container'));
 		this._inputCellContainer = DOM.append(this._rootElement, DOM.$('.input-cell-container'));
@@ -199,36 +203,9 @@ export class InteractiveEditor extends EditorPane implements IEditorPaneWithScro
 		this._inputRunButtonContainer = DOM.append(this._inputCellContainer, DOM.$('.run-button-container'));
 		this._setupRunButtonToolbar(this._inputRunButtonContainer);
 		this._inputEditorContainer = DOM.append(this._inputCellContainer, DOM.$('.input-editor-container'));
-		this._setupConfigButtonToolbar();
 		this._createLayoutStyles();
 	}
 
-	private _setupConfigButtonToolbar() {
-		this._inputConfigContainer = DOM.append(this._inputEditorContainer, DOM.$('.input-toolbar-container'));
-		this._inputConfigContainer.style.position = 'absolute';
-		this._inputConfigContainer.style.right = '0';
-		this._inputConfigContainer.style.marginTop = '6px';
-		this._inputConfigContainer.style.marginRight = '12px';
-		this._inputConfigContainer.style.zIndex = '1';
-		this._inputConfigContainer.style.display = 'none';
-
-		const menu = this._register(this._menuService.createMenu(MenuId.InteractiveInputConfig, this._contextKeyService));
-		const toolbar = this._register(new ToolBar(this._inputConfigContainer, this._contextMenuService, {
-			getKeyBinding: action => this._keybindingService.lookupKeybinding(action.id),
-			actionViewItemProvider: (action, options) => {
-				return createActionViewItem(this._instantiationService, action, options);
-			},
-			renderDropdownAsChildElement: true
-		}));
-
-		const primary: IAction[] = [];
-		const secondary: IAction[] = [];
-		const result = { primary, secondary };
-
-		createAndFillInActionBarActions(menu, { shouldForwardArgs: true }, result);
-		toolbar.setActions([...primary, ...secondary]);
-	}
-
 	private _setupRunButtonToolbar(runButtonContainer: HTMLElement) {
 		const menu = this._register(this._menuService.createMenu(MenuId.InteractiveInputExecute, this._contextKeyService));
 		this._runbuttonToolbar = this._register(new ToolBar(runButtonContainer, this._contextMenuService, {
@@ -390,7 +367,7 @@ export class InteractiveEditor extends EditorPane implements IEditorPaneWithScro
 
 		this._widgetDisposableStore.clear();
 
-		this._notebookWidget = <IBorrowValue<NotebookEditorWidget>>this._instantiationService.invokeFunction(this._notebookWidgetService.retrieveWidget, this.group, notebookInput, {
+		this._notebookWidget = <IBorrowValue<NotebookEditorWidget>>this._instantiationService.invokeFunction(this._notebookWidgetService.retrieveWidget, this.group.id, notebookInput, {
 			isEmbedded: true,
 			isReadOnly: true,
 			contributions: NotebookEditorExtensionsRegistry.getSomeEditorContributions([
@@ -410,7 +387,8 @@ export class InteractiveEditor extends EditorPane implements IEditorPaneWithScro
 			cellEditorContributions: EditorExtensionsRegistry.getSomeEditorContributions([
 				SelectionClipboardContributionID,
 				ContextMenuController.ID,
-				HoverController.ID,
+				ContentHoverController.ID,
+				MarginHoverController.ID,
 				MarkerController.ID
 			]),
 			options: this._notebookOptions,
@@ -428,7 +406,8 @@ export class InteractiveEditor extends EditorPane implements IEditorPaneWithScro
 					ParameterHintsController.ID,
 					SnippetController2.ID,
 					TabCompletionController.ID,
-					HoverController.ID,
+					ContentHoverController.ID,
+					MarginHoverController.ID,
 					MarkerController.ID
 				])
 			}
@@ -566,8 +545,11 @@ export class InteractiveEditor extends EditorPane implements IEditorPaneWithScro
 
 		this._widgetDisposableStore.add(editorModel.onDidChangeContent(() => {
 			const value = editorModel.getValue();
-			if (this.input?.resource && value !== '') {
-				(this.input as InteractiveEditorInput).historyService.replaceLast(this.input.resource, value);
+			if (this.input?.resource) {
+				const historyService = (this.input as InteractiveEditorInput).historyService;
+				if (!historyService.matchesCurrent(this.input.resource, value)) {
+					historyService.replaceLast(this.input.resource, value);
+				}
 			}
 		}));
 
@@ -683,11 +665,9 @@ export class InteractiveEditor extends EditorPane implements IEditorPaneWithScro
 
 		if (!this._hintElement && !shouldHide) {
 			this._hintElement = this._instantiationService.createInstance(ReplInputHintContentWidget, this._codeEditorWidget);
-			this._inputConfigContainer.style.display = 'block';
 		} else if (this._hintElement && shouldHide) {
 			this._hintElement.dispose();
 			this._hintElement = undefined;
-			this._inputConfigContainer.style.display = 'none';
 		}
 	}
 
diff --git a/src/vs/workbench/contrib/interactive/browser/interactiveHistoryService.ts b/src/vs/workbench/contrib/interactive/browser/interactiveHistoryService.ts
index cdfbf09592b..89fefcf0a35 100644
--- a/src/vs/workbench/contrib/interactive/browser/interactiveHistoryService.ts
+++ b/src/vs/workbench/contrib/interactive/browser/interactiveHistoryService.ts
@@ -14,6 +14,7 @@ export const IInteractiveHistoryService = createDecorator<IInteractiveHistorySer
 export interface IInteractiveHistoryService {
 	readonly _serviceBrand: undefined;
 
+	matchesCurrent(uri: URI, value: string): boolean;
 	addToHistory(uri: URI, value: string): void;
 	getPreviousValue(uri: URI): string | null;
 	getNextValue(uri: URI): string | null;
@@ -32,19 +33,26 @@ export class InteractiveHistoryService extends Disposable implements IInteractiv
 		this._history = new ResourceMap<HistoryNavigator2<string>>();
 	}
 
+	matchesCurrent(uri: URI, value: string): boolean {
+		const history = this._history.get(uri);
+		if (!history) {
+			return false;
+		}
+
+		return history.current() === value;
+	}
+
 	addToHistory(uri: URI, value: string): void {
-		if (!this._history.has(uri)) {
+		const history = this._history.get(uri);
+		if (!history) {
 			this._history.set(uri, new HistoryNavigator2<string>([value], 50));
 			return;
 		}
 
-		const history = this._history.get(uri)!;
-
 		history.resetCursor();
-		if (history?.current() !== value) {
-			history?.add(value);
-		}
+		history.add(value);
 	}
+
 	getPreviousValue(uri: URI): string | null {
 		const history = this._history.get(uri);
 		return history?.previous() ?? null;
@@ -57,16 +65,14 @@ export class InteractiveHistoryService extends Disposable implements IInteractiv
 	}
 
 	replaceLast(uri: URI, value: string) {
-		if (!this._history.has(uri)) {
+		const history = this._history.get(uri);
+		if (!history) {
 			this._history.set(uri, new HistoryNavigator2<string>([value], 50));
 			return;
 		} else {
-			const history = this._history.get(uri);
-			if (history?.current() !== value) {
-				history?.replaceLast(value);
-			}
+			history.replaceLast(value);
+			history.resetCursor();
 		}
-
 	}
 
 	clearHistory(uri: URI) {
diff --git a/src/vs/workbench/contrib/issue/browser/issue.ts b/src/vs/workbench/contrib/issue/browser/baseIssueReporterService.ts
similarity index 85%
rename from src/vs/workbench/contrib/issue/browser/issue.ts
rename to src/vs/workbench/contrib/issue/browser/baseIssueReporterService.ts
index 86bb292aeb0..bb9d3c3afa0 100644
--- a/src/vs/workbench/contrib/issue/browser/issue.ts
+++ b/src/vs/workbench/contrib/issue/browser/baseIssueReporterService.ts
@@ -2,22 +2,25 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { $, createStyleSheet, reset, windowOpenNoOpener } from 'vs/base/browser/dom';
+import { $, createStyleSheet, isHTMLInputElement, isHTMLTextAreaElement, reset, windowOpenNoOpener } from 'vs/base/browser/dom';
 import { Button, unthemedButtonStyles } from 'vs/base/browser/ui/button/button';
 import { renderIcon } from 'vs/base/browser/ui/iconLabel/iconLabels';
 import { mainWindow } from 'vs/base/browser/window';
 import { Delayer, RunOnceScheduler } from 'vs/base/common/async';
 import { Codicon } from 'vs/base/common/codicons';
+import { groupBy } from 'vs/base/common/collections';
 import { debounce } from 'vs/base/common/decorators';
 import { CancellationError } from 'vs/base/common/errors';
 import { Disposable } from 'vs/base/common/lifecycle';
-import { isLinuxSnap } from 'vs/base/common/platform';
+import { isLinuxSnap, isMacintosh } from 'vs/base/common/platform';
 import { IProductConfiguration } from 'vs/base/common/product';
 import { escape } from 'vs/base/common/strings';
+import { ThemeIcon } from 'vs/base/common/themables';
 import { URI } from 'vs/base/common/uri';
 import { localize } from 'vs/nls';
 import { OldIssueReporterData } from 'vs/platform/issue/common/issue';
 import { getIconsStyleSheet } from 'vs/platform/theme/browser/iconsStyleSheet';
+import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { IssueReporterModel, IssueReporterData as IssueReporterModelData } from 'vs/workbench/contrib/issue/browser/issueReporterModel';
 import { IIssueFormService, IssueReporterData, IssueReporterExtensionData, IssueReporterStyles, IssueType } from 'vs/workbench/contrib/issue/common/issue';
 import { normalizeGitHubUrl } from 'vs/workbench/contrib/issue/common/issueReporterUtil';
@@ -63,7 +66,8 @@ export class BaseIssueReporterService extends Disposable {
 		public product: IProductConfiguration,
 		public readonly window: Window,
 		public readonly isWeb: boolean,
-		@IIssueFormService public readonly issueFormService: IIssueFormService
+		@IIssueFormService public readonly issueFormService: IIssueFormService,
+		@IThemeService public readonly themeService: IThemeService,
 	) {
 		super();
 		const targetExtension = data.extensionId ? data.enabledExtensions.find(extension => extension.id.toLocaleLowerCase() === data.extensionId?.toLocaleLowerCase()) : undefined;
@@ -118,8 +122,7 @@ export class BaseIssueReporterService extends Disposable {
 		const codiconStyleSheet = createStyleSheet();
 		codiconStyleSheet.id = 'codiconStyles';
 
-		// TODO: Is there a way to use the IThemeService here instead
-		const iconsStyleSheet = this._register(getIconsStyleSheet(undefined));
+		const iconsStyleSheet = this._register(getIconsStyleSheet(this.themeService));
 		function updateAll() {
 			codiconStyleSheet.textContent = iconsStyleSheet.getCSS();
 		}
@@ -128,6 +131,7 @@ export class BaseIssueReporterService extends Disposable {
 		iconsStyleSheet.onDidChange(() => delayer.schedule());
 		delayer.schedule();
 
+		this.handleExtensionData(data.enabledExtensions);
 		this.setUpTypes();
 		this.applyStyles(data.styles);
 
@@ -242,6 +246,134 @@ export class BaseIssueReporterService extends Disposable {
 		}
 	}
 
+	private handleExtensionData(extensions: IssueReporterExtensionData[]) {
+		const installedExtensions = extensions.filter(x => !x.isBuiltin);
+		const { nonThemes, themes } = groupBy(installedExtensions, ext => {
+			return ext.isTheme ? 'themes' : 'nonThemes';
+		});
+
+		const numberOfThemeExtesions = themes && themes.length;
+		this.issueReporterModel.update({ numberOfThemeExtesions, enabledNonThemeExtesions: nonThemes, allExtensions: installedExtensions });
+		this.updateExtensionTable(nonThemes, numberOfThemeExtesions);
+		if (this.disableExtensions || installedExtensions.length === 0) {
+			(<HTMLButtonElement>this.getElementById('disableExtensions')).disabled = true;
+		}
+
+		this.updateExtensionSelector(installedExtensions);
+	}
+
+	private updateExtensionSelector(extensions: IssueReporterExtensionData[]): void {
+		interface IOption {
+			name: string;
+			id: string;
+		}
+
+		const extensionOptions: IOption[] = extensions.map(extension => {
+			return {
+				name: extension.displayName || extension.name || '',
+				id: extension.id
+			};
+		});
+
+		// Sort extensions by name
+		extensionOptions.sort((a, b) => {
+			const aName = a.name.toLowerCase();
+			const bName = b.name.toLowerCase();
+			if (aName > bName) {
+				return 1;
+			}
+
+			if (aName < bName) {
+				return -1;
+			}
+
+			return 0;
+		});
+
+		const makeOption = (extension: IOption, selectedExtension?: IssueReporterExtensionData): HTMLOptionElement => {
+			const selected = selectedExtension && extension.id === selectedExtension.id;
+			return $<HTMLOptionElement>('option', {
+				'value': extension.id,
+				'selected': selected || ''
+			}, extension.name);
+		};
+
+		const extensionsSelector = this.getElementById<HTMLSelectElement>('extension-selector');
+		if (extensionsSelector) {
+			const { selectedExtension } = this.issueReporterModel.getData();
+			reset(extensionsSelector, this.makeOption('', localize('selectExtension', "Select extension"), true), ...extensionOptions.map(extension => makeOption(extension, selectedExtension)));
+
+			if (!selectedExtension) {
+				extensionsSelector.selectedIndex = 0;
+			}
+
+			this.addEventListener('extension-selector', 'change', async (e: Event) => {
+				this.clearExtensionData();
+				const selectedExtensionId = (<HTMLInputElement>e.target).value;
+				this.selectedExtension = selectedExtensionId;
+				const extensions = this.issueReporterModel.getData().allExtensions;
+				const matches = extensions.filter(extension => extension.id === selectedExtensionId);
+				if (matches.length) {
+					this.issueReporterModel.update({ selectedExtension: matches[0] });
+					const selectedExtension = this.issueReporterModel.getData().selectedExtension;
+					if (selectedExtension) {
+						const iconElement = document.createElement('span');
+						iconElement.classList.add(...ThemeIcon.asClassNameArray(Codicon.loading), 'codicon-modifier-spin');
+						this.setLoading(iconElement);
+						const openReporterData = await this.sendReporterMenu(selectedExtension);
+						if (openReporterData) {
+							if (this.selectedExtension === selectedExtensionId) {
+								this.removeLoading(iconElement, true);
+								// this.configuration.data = openReporterData;
+								this.data = openReporterData;
+							}
+							// else if (this.selectedExtension !== selectedExtensionId) {
+							// }
+						}
+						else {
+							if (!this.loadingExtensionData) {
+								iconElement.classList.remove(...ThemeIcon.asClassNameArray(Codicon.loading), 'codicon-modifier-spin');
+							}
+							this.removeLoading(iconElement);
+							// if not using command, should have no configuration data in fields we care about and check later.
+							this.clearExtensionData();
+
+							// case when previous extension was opened from normal openIssueReporter command
+							selectedExtension.data = undefined;
+							selectedExtension.uri = undefined;
+						}
+						if (this.selectedExtension === selectedExtensionId) {
+							// repopulates the fields with the new data given the selected extension.
+							this.updateExtensionStatus(matches[0]);
+							this.openReporter = false;
+						}
+					} else {
+						this.issueReporterModel.update({ selectedExtension: undefined });
+						this.clearSearchResults();
+						this.clearExtensionData();
+						this.validateSelectedExtension();
+						this.updateExtensionStatus(matches[0]);
+					}
+				}
+			});
+		}
+
+		this.addEventListener('problem-source', 'change', (_) => {
+			this.clearExtensionData();
+			this.validateSelectedExtension();
+		});
+	}
+
+	private async sendReporterMenu(extension: IssueReporterExtensionData): Promise<IssueReporterData | undefined> {
+		try {
+			const data = await this.issueFormService.sendReporterMenu(extension.id);
+			return data;
+		} catch (e) {
+			console.error(e);
+			return undefined;
+		}
+	}
+
 	public setEventHandlers(): void {
 		(['includeSystemInfo', 'includeProcessInfo', 'includeWorkspaceInfo', 'includeExtensions', 'includeExperiments', 'includeExtensionData'] as const).forEach(elementId => {
 			this.addEventListener(elementId, 'click', (event: Event) => {
@@ -344,6 +476,65 @@ export class BaseIssueReporterService extends Disposable {
 			const { fileOnExtension, fileOnMarketplace } = this.issueReporterModel.getData();
 			this.searchIssues(title, fileOnExtension, fileOnMarketplace);
 		});
+
+		this.previewButton.onDidClick(async () => {
+			this.delayedSubmit.trigger(async () => {
+				this.createIssue();
+			});
+		});
+
+		this.addEventListener('disableExtensions', 'click', () => {
+			this.issueFormService.reloadWithExtensionsDisabled();
+		});
+
+		this.addEventListener('extensionBugsLink', 'click', (e: Event) => {
+			const url = (<HTMLElement>e.target).innerText;
+			windowOpenNoOpener(url);
+		});
+
+		this.addEventListener('disableExtensions', 'keydown', (e: Event) => {
+			e.stopPropagation();
+			if ((e as KeyboardEvent).key === 'Enter' || (e as KeyboardEvent).key === ' ') {
+				this.issueFormService.reloadWithExtensionsDisabled();
+			}
+		});
+
+		this.window.document.onkeydown = async (e: KeyboardEvent) => {
+			const cmdOrCtrlKey = isMacintosh ? e.metaKey : e.ctrlKey;
+			// Cmd/Ctrl+Enter previews issue and closes window
+			if (cmdOrCtrlKey && e.key === 'Enter') {
+				this.delayedSubmit.trigger(async () => {
+					if (await this.createIssue()) {
+						this.close();
+					}
+				});
+			}
+
+			// Cmd/Ctrl + w closes issue window
+			if (cmdOrCtrlKey && e.key === 'w') {
+				e.stopPropagation();
+				e.preventDefault();
+
+				const issueTitle = (<HTMLInputElement>this.getElementById('issue-title'))!.value;
+				const { issueDescription } = this.issueReporterModel.getData();
+				if (!this.hasBeenSubmitted && (issueTitle || issueDescription)) {
+					// fire and forget
+					this.issueFormService.showConfirmCloseDialog();
+				} else {
+					this.close();
+				}
+			}
+
+			// With latest electron upgrade, cmd+a is no longer propagating correctly for inputs in this window on mac
+			// Manually perform the selection
+			if (isMacintosh) {
+				if (cmdOrCtrlKey && e.key === 'a' && e.target) {
+					if (isHTMLInputElement(e.target) || isHTMLTextAreaElement(e.target)) {
+						(<HTMLInputElement>e.target).select();
+					}
+				}
+			}
+		};
 	}
 
 	public updatePerformanceInfo(info: Partial<IssueReporterData>) {
@@ -983,7 +1174,7 @@ export class BaseIssueReporterService extends Disposable {
 	public clearExtensionData(): void {
 		this.nonGitHubIssueUrl = false;
 		this.issueReporterModel.update({ extensionData: undefined });
-		this.data.issueBody = undefined;
+		this.data.issueBody = this.data.issueBody || '';
 		this.data.data = undefined;
 		this.data.uri = undefined;
 	}
diff --git a/src/vs/workbench/contrib/issue/browser/issueFormService.ts b/src/vs/workbench/contrib/issue/browser/issueFormService.ts
index 79da646dbdd..3a7b2ef1fdc 100644
--- a/src/vs/workbench/contrib/issue/browser/issueFormService.ts
+++ b/src/vs/workbench/contrib/issue/browser/issueFormService.ts
@@ -3,7 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import { safeInnerHtml } from 'vs/base/browser/dom';
-import { mainWindow } from 'vs/base/browser/window';
 import { DisposableStore } from 'vs/base/common/lifecycle';
 import Severity from 'vs/base/common/severity';
 import 'vs/css!./media/issueReporter';
@@ -15,6 +14,7 @@ import { ExtensionIdentifier, ExtensionIdentifierSet } from 'vs/platform/extensi
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { ILogService } from 'vs/platform/log/common/log';
 import product from 'vs/platform/product/common/product';
+import { IRectangle } from 'vs/platform/window/common/window';
 import BaseHtml from 'vs/workbench/contrib/issue/browser/issueReporterPage';
 import { IssueWebReporter } from 'vs/workbench/contrib/issue/browser/issueReporterService';
 import { IIssueFormService, IssueReporterData } from 'vs/workbench/contrib/issue/common/issue';
@@ -30,46 +30,119 @@ export class IssueFormService implements IIssueFormService {
 
 	readonly _serviceBrand: undefined;
 
-	private issueReporterWindow: Window | null = null;
-	private extensionIdentifierSet: ExtensionIdentifierSet = new ExtensionIdentifierSet();
+	protected currentData: IssueReporterData | undefined;
+
+	protected issueReporterWindow: Window | null = null;
+	protected extensionIdentifierSet: ExtensionIdentifierSet = new ExtensionIdentifierSet();
+
+	protected arch: string = '';
+	protected release: string = '';
+	protected type: string = '';
 
 	constructor(
-		@IInstantiationService private readonly instantiationService: IInstantiationService,
-		@IAuxiliaryWindowService private readonly auxiliaryWindowService: IAuxiliaryWindowService,
-		@IMenuService private readonly menuService: IMenuService,
-		@IContextKeyService private readonly contextKeyService: IContextKeyService,
-		@ILogService private readonly logService: ILogService,
-		@IDialogService private readonly dialogService: IDialogService,
-		@IHostService private readonly hostService: IHostService,
-	) {
-
-		// listen for messages from the main window
-		mainWindow.addEventListener('message', async (event) => {
-			if (event.data && event.data.sendChannel === 'vscode:triggerReporterMenu') {
-				// gets menu actions from contributed
-				const actions = this.menuService.getMenuActions(MenuId.IssueReporter, this.contextKeyService, { renderShortTitle: true }).flatMap(entry => entry[1]);
-
-				// render menu
-				for (const action of actions) {
-					try {
-						if (action.item && 'source' in action.item && action.item.source?.id === event.data.extensionId) {
-							this.extensionIdentifierSet.add(event.data.extensionId);
-							await action.run();
-						}
-					} catch (error) {
-						console.error(error);
-					}
-				}
+		@IInstantiationService protected readonly instantiationService: IInstantiationService,
+		@IAuxiliaryWindowService protected readonly auxiliaryWindowService: IAuxiliaryWindowService,
+		@IMenuService protected readonly menuService: IMenuService,
+		@IContextKeyService protected readonly contextKeyService: IContextKeyService,
+		@ILogService protected readonly logService: ILogService,
+		@IDialogService protected readonly dialogService: IDialogService,
+		@IHostService protected readonly hostService: IHostService
+	) { }
+
+	async openReporter(data: IssueReporterData): Promise<void> {
+		if (this.hasToReload(data)) {
+			return;
+		}
+
+		await this.openAuxIssueReporter(data);
+
+		if (this.issueReporterWindow) {
+			const issueReporter = this.instantiationService.createInstance(IssueWebReporter, false, data, { type: this.type, arch: this.arch, release: this.release }, product, this.issueReporterWindow);
+			issueReporter.render();
+		}
+	}
+
+	async openAuxIssueReporter(data: IssueReporterData, bounds?: IRectangle): Promise<void> {
 
-				if (!this.extensionIdentifierSet.has(event.data.extensionId)) {
-					// send undefined to indicate no action was taken
-					const replyChannel = `vscode:triggerReporterMenuResponse`;
-					mainWindow.postMessage({ replyChannel }, '*');
+		let issueReporterBounds: Partial<IRectangle> = { width: 700, height: 800 };
+
+		// Center Issue Reporter Window based on bounds from native host service
+		if (bounds && bounds.x && bounds.y) {
+			const centerX = bounds.x + bounds.width / 2;
+			const centerY = bounds.y + bounds.height / 2;
+			issueReporterBounds = { ...issueReporterBounds, x: centerX - 350, y: centerY - 400 };
+		}
+
+		const disposables = new DisposableStore();
+
+		// Auxiliary Window
+		const auxiliaryWindow = disposables.add(await this.auxiliaryWindowService.open({ mode: AuxiliaryWindowMode.Normal, bounds: issueReporterBounds, nativeTitlebar: true, disableFullscreen: true }));
+
+		if (auxiliaryWindow) {
+			await auxiliaryWindow.whenStylesHaveLoaded;
+			auxiliaryWindow.window.document.title = 'Issue Reporter';
+			auxiliaryWindow.window.document.body.classList.add('issue-reporter-body');
+
+			// custom issue reporter wrapper
+			const div = document.createElement('div');
+			div.classList.add('monaco-workbench');
+
+			// removes preset monaco-workbench
+			auxiliaryWindow.container.remove();
+			auxiliaryWindow.window.document.body.appendChild(div);
+			safeInnerHtml(div, BaseHtml());
+
+			this.issueReporterWindow = auxiliaryWindow.window;
+		} else {
+			console.error('Failed to open auxiliary window');
+		}
+
+		// handle closing issue reporter
+		this.issueReporterWindow?.addEventListener('beforeunload', () => {
+			auxiliaryWindow.window.close();
+			this.issueReporterWindow = null;
+		});
+	}
+
+	async sendReporterMenu(extensionId: string): Promise<IssueReporterData | undefined> {
+		const menu = this.menuService.createMenu(MenuId.IssueReporter, this.contextKeyService);
+
+		// render menu and dispose
+		const actions = menu.getActions({ renderShortTitle: true }).flatMap(entry => entry[1]);
+		for (const action of actions) {
+			try {
+				if (action.item && 'source' in action.item && action.item.source?.id === extensionId) {
+					this.extensionIdentifierSet.add(extensionId);
+					await action.run();
 				}
+			} catch (error) {
+				console.error(error);
 			}
-		});
+		}
+
+		if (!this.extensionIdentifierSet.has(extensionId)) {
+			// send undefined to indicate no action was taken
+			return undefined;
+		}
+
+		// we found the extension, now we clean up the menu and remove it from the set. This is to ensure that we do duplicate extension identifiers
+		this.extensionIdentifierSet.delete(new ExtensionIdentifier(extensionId));
+		menu.dispose();
+
+		const result = this.currentData;
+
+		// reset current data.
+		this.currentData = undefined;
 
+		return result ?? undefined;
 	}
+
+	//#region used by issue reporter
+
+	async closeReporter(): Promise<void> {
+		this.issueReporterWindow?.close();
+	}
+
 	async reloadWithExtensionsDisabled(): Promise<void> {
 		if (this.issueReporterWindow) {
 			try {
@@ -79,6 +152,7 @@ export class IssueFormService implements IIssueFormService {
 			}
 		}
 	}
+
 	async showConfirmCloseDialog(): Promise<void> {
 		await this.dialogService.prompt({
 			type: Severity.Warning,
@@ -98,6 +172,7 @@ export class IssueFormService implements IIssueFormService {
 			]
 		});
 	}
+
 	async showClipboardDialog(): Promise<boolean> {
 		let result = false;
 
@@ -119,119 +194,18 @@ export class IssueFormService implements IIssueFormService {
 		return result;
 	}
 
-	async openReporter(data: IssueReporterData): Promise<void> {
+	hasToReload(data: IssueReporterData): boolean {
 		if (data.extensionId && this.extensionIdentifierSet.has(data.extensionId)) {
-			const replyChannel = `vscode:triggerReporterMenuResponse`;
-			mainWindow.postMessage({ data, replyChannel }, '*');
-			this.extensionIdentifierSet.delete(new ExtensionIdentifier(data.extensionId));
+			this.currentData = data;
+			this.issueReporterWindow?.focus();
+			return true;
 		}
 
 		if (this.issueReporterWindow) {
-			const getModelData = await this.getIssueData();
-			if (getModelData) {
-				const { issueTitle, issueBody } = getModelData;
-				if (issueTitle || issueBody) {
-					data.issueTitle = data.issueTitle ?? issueTitle;
-					data.issueBody = data.issueBody ?? issueBody;
-
-					// close issue reporter and re-open with new data
-					this.issueReporterWindow.close();
-					this.openAuxIssueReporter(data);
-					return;
-				}
-			}
 			this.issueReporterWindow.focus();
-			return;
-		}
-		this.openAuxIssueReporter(data);
-	}
-
-	async openAuxIssueReporter(data: IssueReporterData): Promise<void> {
-		const disposables = new DisposableStore();
-
-		// Auxiliary Window
-		const auxiliaryWindow = disposables.add(await this.auxiliaryWindowService.open({ mode: AuxiliaryWindowMode.Normal, bounds: { width: 700, height: 800 } }));
-
-		this.issueReporterWindow = auxiliaryWindow.window;
-
-		if (auxiliaryWindow) {
-			await auxiliaryWindow.whenStylesHaveLoaded;
-			auxiliaryWindow.window.document.title = 'Issue Reporter';
-			auxiliaryWindow.window.document.body.classList.add('issue-reporter-body');
-
-			// custom issue reporter wrapper
-			const div = document.createElement('div');
-			div.classList.add('monaco-workbench');
-
-			// removes preset monaco-workbench
-			auxiliaryWindow.container.remove();
-			auxiliaryWindow.window.document.body.appendChild(div);
-			safeInnerHtml(div, BaseHtml());
-
-			// create issue reporter and instantiate
-			const issueReporter = this.instantiationService.createInstance(IssueWebReporter, false, data, { type: '', arch: '', release: '' }, product, auxiliaryWindow.window);
-			issueReporter.render();
-		} else {
-			console.error('Failed to open auxiliary window');
+			return true;
 		}
 
-		// handle closing issue reporter
-		this.issueReporterWindow?.addEventListener('beforeunload', () => {
-			auxiliaryWindow.window.close();
-			this.issueReporterWindow = null;
-		});
-	}
-
-	async sendReporterMenu(extensionId: string, extensionName: string): Promise<IssueReporterData | undefined> {
-		const sendChannel = `vscode:triggerReporterMenu`;
-		mainWindow.postMessage({ sendChannel, extensionId, extensionName }, '*');
-
-		const result = await new Promise((resolve, reject) => {
-			const timeout = setTimeout(() => {
-				mainWindow.removeEventListener('message', listener);
-				reject(new Error('Timeout exceeded'));
-			}, 5000); // Set the timeout value in milliseconds (e.g., 5000 for 5 seconds)
-
-			const listener = (event: MessageEvent) => {
-				const replyChannel = `vscode:triggerReporterMenuResponse`;
-				if (event.data && event.data.replyChannel === replyChannel) {
-					clearTimeout(timeout);
-					mainWindow.removeEventListener('message', listener);
-					resolve(event.data.data);
-				}
-			};
-			mainWindow.addEventListener('message', listener);
-		});
-
-		return result as IssueReporterData | undefined;
-	}
-
-	// Listens to data from the issue reporter model, which is updated regularly
-	async getIssueData(): Promise<IssuePassData | undefined> {
-		const sendChannel = `vscode:triggerIssueData`;
-		mainWindow.postMessage({ sendChannel }, '*');
-
-		const result = await new Promise((resolve, reject) => {
-			const timeout = setTimeout(() => {
-				mainWindow.removeEventListener('message', listener);
-				reject(new Error('Timeout exceeded'));
-			}, 5000); // Set the timeout value in milliseconds (e.g., 5000 for 5 seconds)
-
-			const listener = (event: MessageEvent) => {
-				const replyChannel = `vscode:triggerIssueDataResponse`;
-				if (event.data && event.data.replyChannel === replyChannel) {
-					clearTimeout(timeout);
-					mainWindow.removeEventListener('message', listener);
-					resolve(event.data.data);
-				}
-			};
-			mainWindow.addEventListener('message', listener);
-		});
-
-		return result as IssuePassData | undefined;
-	}
-
-	async closeReporter(): Promise<void> {
-		this.issueReporterWindow?.close();
+		return false;
 	}
 }
diff --git a/src/vs/workbench/contrib/issue/browser/issueReporterPage.ts b/src/vs/workbench/contrib/issue/browser/issueReporterPage.ts
index 3ee281c7f02..1d837461e75 100644
--- a/src/vs/workbench/contrib/issue/browser/issueReporterPage.ts
+++ b/src/vs/workbench/contrib/issue/browser/issueReporterPage.ts
@@ -98,7 +98,7 @@ export default (): string => `
 				<span id="ext-loading" hidden></span>
 				<span class="ext-parens" hidden>(</span><a href="#" class="showInfo" id="extension-id">${escape(localize('show', "show"))}</a><span class="ext-parens" hidden>)</span>
 			</label>
-			<pre class="block-info" id="extension-data" placeholder="${escape(localize('extensionData', "Extension does not have additional data to include."))}" style="white-space: pre-wrap;">
+			<pre class="block-info" id="extension-data" placeholder="${escape(localize('extensionData', "Extension does not have additional data to include."))}" style="white-space: pre-wrap; user-select: text;">
 				<!-- To be dynamically filled -->
 			</pre>
 		</div>
@@ -111,7 +111,7 @@ export default (): string => `
 			</label>
 			<div class="block-info hidden">
 				<!-- To be dynamically filled -->
-			</div>
+		</div>
 		</div>
 		<div class="block block-process">
 			<input class="sendData" aria-label="${sendProcessInfoLabel}" type="checkbox" id="includeProcessInfo" checked/>
diff --git a/src/vs/workbench/contrib/issue/browser/issueReporterService.ts b/src/vs/workbench/contrib/issue/browser/issueReporterService.ts
index 67e1c0cb926..866a12c78d6 100644
--- a/src/vs/workbench/contrib/issue/browser/issueReporterService.ts
+++ b/src/vs/workbench/contrib/issue/browser/issueReporterService.ts
@@ -2,15 +2,11 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { $, isHTMLInputElement, isHTMLTextAreaElement, reset, windowOpenNoOpener } from 'vs/base/browser/dom';
-import { Codicon } from 'vs/base/common/codicons';
-import { groupBy } from 'vs/base/common/collections';
-import { isMacintosh } from 'vs/base/common/platform';
 import { IProductConfiguration } from 'vs/base/common/product';
-import { ThemeIcon } from 'vs/base/common/themables';
 import { localize } from 'vs/nls';
-import { BaseIssueReporterService } from 'vs/workbench/contrib/issue/browser/issue';
-import { IIssueFormService, IssueReporterData, IssueReporterExtensionData } from 'vs/workbench/contrib/issue/common/issue';
+import { IThemeService } from 'vs/platform/theme/common/themeService';
+import { BaseIssueReporterService } from 'vs/workbench/contrib/issue/browser/baseIssueReporterService';
+import { IIssueFormService, IssueReporterData } from 'vs/workbench/contrib/issue/common/issue';
 
 // GitHub has let us know that we could up our limit here to 8k. We chose 7500 to play it safe.
 // ref https://github.com/microsoft/vscode/issues/159191
@@ -26,9 +22,10 @@ export class IssueWebReporter extends BaseIssueReporterService {
 		},
 		product: IProductConfiguration,
 		window: Window,
-		@IIssueFormService issueFormService: IIssueFormService
+		@IIssueFormService issueFormService: IIssueFormService,
+		@IThemeService themeService: IThemeService
 	) {
-		super(disableExtensions, data, os, product, window, true, issueFormService);
+		super(disableExtensions, data, os, product, window, true, issueFormService, themeService);
 
 		const target = this.window.document.querySelector<HTMLElement>('.block-system .block-info');
 
@@ -37,41 +34,14 @@ export class IssueWebReporter extends BaseIssueReporterService {
 			target?.appendChild(this.window.document.createTextNode(webInfo));
 			this.receivedSystemInfo = true;
 			this.issueReporterModel.update({ systemInfoWeb: webInfo });
-
 		}
 
 		this.setEventHandlers();
-		this.handleExtensionData(data.enabledExtensions);
-	}
-
-	private handleExtensionData(extensions: IssueReporterExtensionData[]) {
-		const installedExtensions = extensions.filter(x => !x.isBuiltin);
-		const { nonThemes, themes } = groupBy(installedExtensions, ext => {
-			return ext.isTheme ? 'themes' : 'nonThemes';
-		});
-
-		const numberOfThemeExtesions = themes && themes.length;
-		this.issueReporterModel.update({ numberOfThemeExtesions, enabledNonThemeExtesions: nonThemes, allExtensions: installedExtensions });
-		this.updateExtensionTable(nonThemes, numberOfThemeExtesions);
-		if (this.disableExtensions || installedExtensions.length === 0) {
-			(<HTMLButtonElement>this.getElementById('disableExtensions')).disabled = true;
-		}
-
-		this.updateExtensionSelector(installedExtensions);
-	}
-
-	private async sendReporterMenu(extension: IssueReporterExtensionData): Promise<IssueReporterData | undefined> {
-		try {
-			const data = await this.issueFormService.sendReporterMenu(extension.id, extension.name);
-			return data;
-		} catch (e) {
-			console.error(e);
-			return undefined;
-		}
 	}
 
 	public override setEventHandlers(): void {
 		super.setEventHandlers();
+
 		this.addEventListener('issue-type', 'change', (event: Event) => {
 			const issueType = parseInt((<HTMLInputElement>event.target).value);
 			this.issueReporterModel.update({ issueType: issueType });
@@ -86,159 +56,5 @@ export class IssueWebReporter extends BaseIssueReporterService {
 			this.setSourceOptions();
 			this.render();
 		});
-		this.previewButton.onDidClick(async () => {
-			this.delayedSubmit.trigger(async () => {
-				this.createIssue();
-			});
-		});
-
-		this.addEventListener('disableExtensions', 'click', () => {
-			this.issueFormService.reloadWithExtensionsDisabled();
-		});
-
-		this.addEventListener('extensionBugsLink', 'click', (e: Event) => {
-			const url = (<HTMLElement>e.target).innerText;
-			windowOpenNoOpener(url);
-		});
-
-		this.addEventListener('disableExtensions', 'keydown', (e: Event) => {
-			e.stopPropagation();
-			if ((e as KeyboardEvent).key === 'Enter' || (e as KeyboardEvent).key === ' ') {
-				this.issueFormService.reloadWithExtensionsDisabled();
-			}
-		});
-
-		this.window.document.onkeydown = async (e: KeyboardEvent) => {
-			const cmdOrCtrlKey = isMacintosh ? e.metaKey : e.ctrlKey;
-			// Cmd/Ctrl+Enter previews issue and closes window
-			if (cmdOrCtrlKey && e.key === 'Enter') {
-				this.delayedSubmit.trigger(async () => {
-					if (await this.createIssue()) {
-						this.close();
-					}
-				});
-			}
-
-			// Cmd/Ctrl + w closes issue window
-			if (cmdOrCtrlKey && e.key === 'w') {
-				e.stopPropagation();
-				e.preventDefault();
-
-				const issueTitle = (<HTMLInputElement>this.getElementById('issue-title'))!.value;
-				const { issueDescription } = this.issueReporterModel.getData();
-				if (!this.hasBeenSubmitted && (issueTitle || issueDescription)) {
-					// fire and forget
-					this.issueFormService.showConfirmCloseDialog();
-				} else {
-					this.close();
-				}
-			}
-
-			// With latest electron upgrade, cmd+a is no longer propagating correctly for inputs in this window on mac
-			// Manually perform the selection
-			if (isMacintosh) {
-				if (cmdOrCtrlKey && e.key === 'a' && e.target) {
-					if (isHTMLInputElement(e.target) || isHTMLTextAreaElement(e.target)) {
-						(<HTMLInputElement>e.target).select();
-					}
-				}
-			}
-		};
-	}
-
-	private updateExtensionSelector(extensions: IssueReporterExtensionData[]): void {
-		interface IOption {
-			name: string;
-			id: string;
-		}
-
-		const extensionOptions: IOption[] = extensions.map(extension => {
-			return {
-				name: extension.displayName || extension.name || '',
-				id: extension.id
-			};
-		});
-
-		// Sort extensions by name
-		extensionOptions.sort((a, b) => {
-			const aName = a.name.toLowerCase();
-			const bName = b.name.toLowerCase();
-			if (aName > bName) {
-				return 1;
-			}
-
-			if (aName < bName) {
-				return -1;
-			}
-
-			return 0;
-		});
-
-		const makeOption = (extension: IOption, selectedExtension?: IssueReporterExtensionData): HTMLOptionElement => {
-			const selected = selectedExtension && extension.id === selectedExtension.id;
-			return $<HTMLOptionElement>('option', {
-				'value': extension.id,
-				'selected': selected || ''
-			}, extension.name);
-		};
-
-		const extensionsSelector = this.getElementById<HTMLSelectElement>('extension-selector');
-		if (extensionsSelector) {
-			const { selectedExtension } = this.issueReporterModel.getData();
-			reset(extensionsSelector, this.makeOption('', localize('selectExtension', "Select extension"), true), ...extensionOptions.map(extension => makeOption(extension, selectedExtension)));
-
-			if (!selectedExtension) {
-				extensionsSelector.selectedIndex = 0;
-			}
-
-			this.addEventListener('extension-selector', 'change', async (e: Event) => {
-				this.clearExtensionData();
-				const selectedExtensionId = (<HTMLInputElement>e.target).value;
-				this.selectedExtension = selectedExtensionId;
-				const extensions = this.issueReporterModel.getData().allExtensions;
-				const matches = extensions.filter(extension => extension.id === selectedExtensionId);
-				if (matches.length) {
-					this.issueReporterModel.update({ selectedExtension: matches[0] });
-					const selectedExtension = this.issueReporterModel.getData().selectedExtension;
-					if (selectedExtension) {
-						const iconElement = document.createElement('span');
-						iconElement.classList.add(...ThemeIcon.asClassNameArray(Codicon.loading), 'codicon-modifier-spin');
-						this.setLoading(iconElement);
-						const openReporterData = await this.sendReporterMenu(selectedExtension);
-						if (openReporterData) {
-							if (this.selectedExtension === selectedExtensionId) {
-								this.removeLoading(iconElement, true);
-								this.data = openReporterData;
-							} else if (this.selectedExtension !== selectedExtensionId) {
-							}
-						}
-						else {
-							if (!this.loadingExtensionData) {
-								iconElement.classList.remove(...ThemeIcon.asClassNameArray(Codicon.loading), 'codicon-modifier-spin');
-							}
-							this.removeLoading(iconElement);
-							this.clearExtensionData();
-							selectedExtension.data = undefined;
-							selectedExtension.uri = undefined;
-						}
-						if (this.selectedExtension === selectedExtensionId) {
-							// repopulates the fields with the new data given the selected extension.
-							this.updateExtensionStatus(matches[0]);
-							this.openReporter = false;
-						}
-					} else {
-						this.issueReporterModel.update({ selectedExtension: undefined });
-						this.clearSearchResults();
-						this.clearExtensionData();
-						this.validateSelectedExtension();
-						this.updateExtensionStatus(matches[0]);
-					}
-				}
-			});
-		}
-
-		this.addEventListener('problem-source', 'change', (_) => {
-			this.validateSelectedExtension();
-		});
 	}
 }
diff --git a/src/vs/workbench/contrib/issue/browser/issueService.ts b/src/vs/workbench/contrib/issue/browser/issueService.ts
index 3568d1011cd..0089a78d7a9 100644
--- a/src/vs/workbench/contrib/issue/browser/issueService.ts
+++ b/src/vs/workbench/contrib/issue/browser/issueService.ts
@@ -42,11 +42,6 @@ export class BrowserIssueService implements IWorkbenchIssueService {
 		@IConfigurationService private readonly configurationService: IConfigurationService
 	) { }
 
-	//TODO @TylerLeonhardt @Tyriar to implement a process explorer for the web
-	async openProcessExplorer(): Promise<void> {
-		console.error('openProcessExplorer is not implemented in web');
-	}
-
 	async openReporter(options: Partial<IssueReporterData>): Promise<void> {
 		// If web reporter setting is false open the old GitHub issue reporter
 		if (!this.configurationService.getValue<boolean>('issueReporter.experimental.webReporter')) {
diff --git a/src/vs/workbench/contrib/issue/common/issue.ts b/src/vs/workbench/contrib/issue/common/issue.ts
index 876eb50a18a..978b6fb1886 100644
--- a/src/vs/workbench/contrib/issue/common/issue.ts
+++ b/src/vs/workbench/contrib/issue/common/issue.ts
@@ -133,7 +133,7 @@ export interface IIssueFormService {
 	reloadWithExtensionsDisabled(): Promise<void>;
 	showConfirmCloseDialog(): Promise<void>;
 	showClipboardDialog(): Promise<boolean>;
-	sendReporterMenu(extensionId: string, extensionName: string): Promise<IssueReporterData | undefined>;
+	sendReporterMenu(extensionId: string): Promise<IssueReporterData | undefined>;
 	closeReporter(): Promise<void>;
 }
 
diff --git a/src/vs/workbench/contrib/issue/electron-sandbox/issue.contribution.ts b/src/vs/workbench/contrib/issue/electron-sandbox/issue.contribution.ts
index f46611df07d..bc56d83a366 100644
--- a/src/vs/workbench/contrib/issue/electron-sandbox/issue.contribution.ts
+++ b/src/vs/workbench/contrib/issue/electron-sandbox/issue.contribution.ts
@@ -18,17 +18,17 @@ import { IDisposable } from 'vs/base/common/lifecycle';
 import { IQuickAccessRegistry, Extensions as QuickAccessExtensions } from 'vs/platform/quickinput/common/quickAccess';
 import { IssueQuickAccess } from 'vs/workbench/contrib/issue/browser/issueQuickAccess';
 import { registerSingleton, InstantiationType } from 'vs/platform/instantiation/common/extensions';
-import { IssueFormService2 } from 'vs/workbench/contrib/issue/electron-sandbox/issueFormService';
 import { NativeIssueService } from 'vs/workbench/contrib/issue/electron-sandbox/issueService';
 import 'vs/workbench/contrib/issue/electron-sandbox/issueMainService';
 import 'vs/workbench/contrib/issue/browser/issueTroubleshoot';
 import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from 'vs/platform/configuration/common/configurationRegistry';
+import { NativeIssueFormService } from 'vs/workbench/contrib/issue/electron-sandbox/nativeIssueFormService';
 
 
 //#region Issue Contribution
 
 registerSingleton(IWorkbenchIssueService, NativeIssueService, InstantiationType.Delayed);
-registerSingleton(IIssueFormService, IssueFormService2, InstantiationType.Delayed);
+registerSingleton(IIssueFormService, NativeIssueFormService, InstantiationType.Delayed);
 
 class NativeIssueContribution extends BaseIssueContribution {
 
@@ -61,7 +61,7 @@ class NativeIssueContribution extends BaseIssueContribution {
 			properties: {
 				'issueReporter.experimental.auxWindow': {
 					type: 'boolean',
-					default: productService.quality !== 'stable',
+					default: true,
 					description: 'Enable the new experimental issue reporter in electron.',
 				},
 			}
diff --git a/src/vs/workbench/contrib/issue/electron-sandbox/issueFormService.ts b/src/vs/workbench/contrib/issue/electron-sandbox/issueFormService.ts
deleted file mode 100644
index 0ddec2689dd..00000000000
--- a/src/vs/workbench/contrib/issue/electron-sandbox/issueFormService.ts
+++ /dev/null
@@ -1,224 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import { safeInnerHtml } from 'vs/base/browser/dom';
-import { DisposableStore } from 'vs/base/common/lifecycle';
-import Severity from 'vs/base/common/severity';
-import 'vs/css!./media/newIssueReporter';
-import { localize } from 'vs/nls';
-import { IMenuService, MenuId } from 'vs/platform/actions/common/actions';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { INativeEnvironmentService } from 'vs/platform/environment/common/environment';
-import { ExtensionIdentifier, ExtensionIdentifierSet } from 'vs/platform/extensions/common/extensions';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ILogService } from 'vs/platform/log/common/log';
-import { INativeHostService } from 'vs/platform/native/common/native';
-import product from 'vs/platform/product/common/product';
-import { BrowserWindow } from 'vs/workbench/browser/window';
-import BaseHtml from 'vs/workbench/contrib/issue/browser/issueReporterPage';
-import { IIssueFormService, IssueReporterData, IssueReporterWindowConfiguration } from 'vs/workbench/contrib/issue/common/issue';
-import { IssueReporter2 } from 'vs/workbench/contrib/issue/electron-sandbox/issueReporterService2';
-import { AuxiliaryWindowMode, IAuxiliaryWindowService } from 'vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService';
-
-export class IssueFormService2 implements IIssueFormService {
-
-	private configuration: IssueReporterWindowConfiguration | undefined;
-
-	private extensionIdentifierSet: ExtensionIdentifierSet = new ExtensionIdentifierSet();
-
-	declare readonly _serviceBrand: undefined;
-
-	private currentData: IssueReporterData | undefined;
-
-	private issueReporterWindow: Window | null = null;
-	private issueReporterParentWindow: BrowserWindow | null = null;
-
-	constructor(
-		@IInstantiationService private readonly instantiationService: IInstantiationService,
-		@INativeEnvironmentService private readonly environmentService: INativeEnvironmentService,
-		@ILogService private readonly logService: ILogService,
-		@IDialogService private readonly dialogService: IDialogService,
-		@INativeHostService private readonly nativeHostService: INativeHostService,
-		@IAuxiliaryWindowService private readonly auxiliaryWindowService: IAuxiliaryWindowService,
-		@IMenuService private readonly menuService: IMenuService,
-		@IContextKeyService private readonly contextKeyService: IContextKeyService,
-	) { }
-
-	//#region Used by renderer
-	async openReporter(data: IssueReporterData): Promise<void> {
-		if (data.extensionId && this.extensionIdentifierSet.has(data.extensionId)) {
-			this.currentData = data;
-			this.issueReporterWindow?.focus();
-			return;
-		}
-
-		if (this.issueReporterWindow) {
-			this.issueReporterWindow.focus();
-			return;
-		}
-		this.openAuxIssueReporter(data);
-	}
-
-	async openAuxIssueReporter(data: IssueReporterData): Promise<void> {
-		const disposables = new DisposableStore();
-
-		// Auxiliary Window
-		const auxiliaryWindow = disposables.add(await this.auxiliaryWindowService.open({ mode: AuxiliaryWindowMode.Custom, bounds: { width: 700, height: 800 } }));
-		this.issueReporterWindow = auxiliaryWindow.window;
-
-		if (auxiliaryWindow) {
-			await auxiliaryWindow.whenStylesHaveLoaded;
-			auxiliaryWindow.window.document.title = 'Issue Reporter';
-			auxiliaryWindow.window.document.body.classList.add('issue-reporter-body');
-
-			// custom issue reporter wrapper
-			const div = document.createElement('div');
-			div.classList.add('monaco-workbench');
-
-			// removes preset monaco-workbench
-			auxiliaryWindow.container.remove();
-			auxiliaryWindow.window.document.body.appendChild(div);
-			safeInnerHtml(div, BaseHtml());
-
-			let type = '';
-			let arch = '';
-			let release = '';
-
-			// Get platform information
-			await this.nativeHostService.getOSProperties().then(os => {
-				arch = os.arch;
-				release = os.release;
-				type = os.type;
-			});
-
-			// Store into config object URL
-			this.configuration = {
-				zoomLevel: data.zoomLevel,
-				appRoot: this.environmentService.appRoot,
-				windowId: 0,
-				userEnv: {},
-				data,
-				disableExtensions: !!this.environmentService.disableExtensions,
-				os: {
-					type,
-					arch,
-					release,
-				},
-				product,
-				nls: {
-					// VSCODE_GLOBALS: NLS
-					messages: globalThis._VSCODE_NLS_MESSAGES,
-					language: globalThis._VSCODE_NLS_LANGUAGE
-				}
-			};
-
-			// create issue reporter and instantiate
-			const issueReporter = this.instantiationService.createInstance(IssueReporter2, this.configuration, this.issueReporterWindow);
-			issueReporter.render();
-		} else {
-			console.error('Failed to open auxiliary window');
-		}
-
-		// handle closing issue reporter
-		this.issueReporterWindow?.addEventListener('beforeunload', () => {
-			auxiliaryWindow.window.close();
-			this.issueReporterWindow = null;
-		});
-	}
-
-	//#endregion
-
-	//#region used by issue reporter window
-	async reloadWithExtensionsDisabled(): Promise<void> {
-		if (this.issueReporterParentWindow) {
-			try {
-				await this.nativeHostService.reload({ disableExtensions: true });
-			} catch (error) {
-				this.logService.error(error);
-			}
-		}
-	}
-
-	async showConfirmCloseDialog(): Promise<void> {
-		await this.dialogService.prompt({
-			type: Severity.Warning,
-			message: localize('confirmCloseIssueReporter', "Your input will not be saved. Are you sure you want to close this window?"),
-			buttons: [
-				{
-					label: localize({ key: 'yes', comment: ['&& denotes a mnemonic'] }, "&&Yes"),
-					run: () => {
-						this.closeReporter();
-						this.issueReporterWindow = null;
-					}
-				},
-				{
-					label: localize('cancel', "Cancel"),
-					run: () => { }
-				}
-			]
-		});
-	}
-
-	async showClipboardDialog(): Promise<boolean> {
-		let result = false;
-
-		await this.dialogService.prompt({
-			type: Severity.Warning,
-			message: localize('issueReporterWriteToClipboard', "There is too much data to send to GitHub directly. The data will be copied to the clipboard, please paste it into the GitHub issue page that is opened."),
-			buttons: [
-				{
-					label: localize({ key: 'ok', comment: ['&& denotes a mnemonic'] }, "&&OK"),
-					run: () => { result = true; }
-				},
-				{
-					label: localize('cancel', "Cancel"),
-					run: () => { result = false; }
-				}
-			]
-		});
-
-		return result;
-	}
-
-	async sendReporterMenu(extensionId: string, extensionName: string): Promise<IssueReporterData | undefined> {
-		const menu = this.menuService.createMenu(MenuId.IssueReporter, this.contextKeyService);
-
-		// render menu and dispose
-		const actions = menu.getActions({ renderShortTitle: true }).flatMap(entry => entry[1]);
-		for (const action of actions) {
-			try {
-				if (action.item && 'source' in action.item && action.item.source?.id === extensionId) {
-					this.extensionIdentifierSet.add(extensionId);
-					await action.run();
-				}
-			} catch (error) {
-				console.error(error);
-			}
-		}
-
-		if (!this.extensionIdentifierSet.has(extensionId)) {
-			// send undefined to indicate no action was taken
-			return undefined;
-		}
-
-		// we found the extension, now we clean up the menu and remove it from the set. This is to ensure that we do duplicate extension identifiers
-		this.extensionIdentifierSet.delete(new ExtensionIdentifier(extensionId));
-		menu.dispose();
-
-		const result = this.currentData;
-
-		// reset current data.
-		this.currentData = undefined;
-
-		return result ?? undefined;
-	}
-
-	async closeReporter(): Promise<void> {
-		this.issueReporterWindow?.close();
-	}
-
-	//#endregion
-}
diff --git a/src/vs/workbench/contrib/issue/electron-sandbox/issueReporter-dev.esm.html b/src/vs/workbench/contrib/issue/electron-sandbox/issueReporter-dev.esm.html
new file mode 100644
index 00000000000..f14661a283c
--- /dev/null
+++ b/src/vs/workbench/contrib/issue/electron-sandbox/issueReporter-dev.esm.html
@@ -0,0 +1,46 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="utf-8" />
+		<meta
+			http-equiv="Content-Security-Policy"
+			content="
+				default-src
+					'none'
+				;
+				img-src
+					'self'
+					data:
+				;
+				script-src
+					'self'
+					blob:
+					'nonce-0c6a828f1297'
+				;
+				style-src
+					'self'
+					'unsafe-inline'
+				;
+				connect-src
+					'self'
+					https:
+				;
+				font-src
+					'self'
+				;
+		">
+		<style>
+			body {
+				display: none
+			}
+		</style>
+	</head>
+
+	<body aria-label="">
+	</body>
+
+	<!-- Startup (do not modify order of script tags!) -->
+	<script src="../../../../../bootstrap-window.js"></script>
+	<script src="./issueReporter.js"></script>
+</html>
diff --git a/src/vs/workbench/contrib/issue/electron-sandbox/issueReporter-dev.html b/src/vs/workbench/contrib/issue/electron-sandbox/issueReporter-dev.html
index 455e823692a..9d853e358a0 100644
--- a/src/vs/workbench/contrib/issue/electron-sandbox/issueReporter-dev.html
+++ b/src/vs/workbench/contrib/issue/electron-sandbox/issueReporter-dev.html
@@ -39,8 +39,7 @@
 	</body>
 
 	<!-- Startup (do not modify order of script tags!) -->
-	<script src="../../../../../bootstrap.js"></script>
 	<script src="../../../../../vs/loader.js"></script>
 	<script src="../../../../../bootstrap-window.js"></script>
-	<script src="issueReporter.js"></script>
+	<script src="./issueReporter.js"></script>
 </html>
diff --git a/src/vs/workbench/contrib/issue/electron-sandbox/issueReporter.esm.html b/src/vs/workbench/contrib/issue/electron-sandbox/issueReporter.esm.html
new file mode 100644
index 00000000000..2f87d2489ce
--- /dev/null
+++ b/src/vs/workbench/contrib/issue/electron-sandbox/issueReporter.esm.html
@@ -0,0 +1,45 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="utf-8" />
+		<meta
+			http-equiv="Content-Security-Policy"
+			content="
+				default-src
+					'none'
+				;
+				img-src
+					'self'
+					data:
+				;
+				script-src
+					'self'
+					blob:
+					'nonce-0c6a828f1297'
+				;
+				style-src
+					'self'
+					'unsafe-inline'
+				;
+				connect-src
+					'self'
+					https:
+				;
+				font-src
+					'self'
+				;
+		">
+		<style>
+			body {
+				display: none
+			}
+		</style>
+	</head>
+
+	<body aria-label="">
+	</body>
+
+	<!-- Startup (do not modify order of script tags!) -->
+	<script src="./issueReporter.js" type="module"></script>
+</html>
diff --git a/src/vs/workbench/contrib/issue/electron-sandbox/issueReporter.html b/src/vs/workbench/contrib/issue/electron-sandbox/issueReporter.html
index c6290004d2d..8d0bcc6c87c 100644
--- a/src/vs/workbench/contrib/issue/electron-sandbox/issueReporter.html
+++ b/src/vs/workbench/contrib/issue/electron-sandbox/issueReporter.html
@@ -39,5 +39,5 @@
 	</body>
 
 	<!-- Startup (do not modify order of script tags!) -->
-	<script src="issueReporter.js"></script>
+	<script src="./issueReporter.js"></script>
 </html>
diff --git a/src/vs/workbench/contrib/issue/electron-sandbox/issueReporterService.ts b/src/vs/workbench/contrib/issue/electron-sandbox/issueReporterService.ts
index 0572a5c6aad..1b75a58d9e7 100644
--- a/src/vs/workbench/contrib/issue/electron-sandbox/issueReporterService.ts
+++ b/src/vs/workbench/contrib/issue/electron-sandbox/issueReporterService.ts
@@ -18,11 +18,11 @@ import { ThemeIcon } from 'vs/base/common/themables';
 import { URI } from 'vs/base/common/uri';
 import { localize } from 'vs/nls';
 import { isRemoteDiagnosticError } from 'vs/platform/diagnostics/common/diagnostics';
+import { IIssueMainService, IProcessMainService, OldIssueReporterData, OldIssueReporterExtensionData, OldIssueReporterStyles, OldIssueReporterWindowConfiguration, OldIssueType } from 'vs/platform/issue/common/issue';
 import { INativeHostService } from 'vs/platform/native/common/native';
 import { getIconsStyleSheet } from 'vs/platform/theme/browser/iconsStyleSheet';
 import { applyZoom, zoomIn, zoomOut } from 'vs/platform/window/electron-sandbox/window';
 import { IssueReporterData, IssueReporterModel, IssueReporterData as IssueReporterModelData } from 'vs/workbench/contrib/issue/browser/issueReporterModel';
-import { IProcessMainService, IIssueMainService, OldIssueReporterData, OldIssueReporterExtensionData, OldIssueReporterStyles, OldIssueReporterWindowConfiguration, OldIssueType } from 'vs/platform/issue/common/issue';
 import { normalizeGitHubUrl } from 'vs/workbench/contrib/issue/common/issueReporterUtil';
 
 // GitHub has let us know that we could up our limit here to 8k. We chose 7500 to play it safe.
@@ -1039,9 +1039,6 @@ export class IssueReporter extends Disposable {
 		}
 
 		const gitHubDetails = this.parseGitHubUrl(issueUrl);
-		if (this.configuration.data.githubAccessToken && gitHubDetails) {
-			return this.submitToGitHub(issueTitle, issueBody, gitHubDetails);
-		}
 
 		const baseUrl = this.getIssueUrlWithTitle((<HTMLInputElement>this.getElementById('issue-title')).value, issueUrl);
 		let url = baseUrl + `&body=${encodeURIComponent(issueBody)}`;
@@ -1053,6 +1050,8 @@ export class IssueReporter extends Disposable {
 				console.error('Writing to clipboard failed');
 				return false;
 			}
+		} else if (this.configuration.data.githubAccessToken && gitHubDetails) {
+			return this.submitToGitHub(issueTitle, issueBody, gitHubDetails);
 		}
 
 		await this.nativeHostService.openExternal(url);
diff --git a/src/vs/workbench/contrib/issue/electron-sandbox/issueReporterService2.ts b/src/vs/workbench/contrib/issue/electron-sandbox/issueReporterService2.ts
index 8f48665a97a..49110c6569a 100644
--- a/src/vs/workbench/contrib/issue/electron-sandbox/issueReporterService2.ts
+++ b/src/vs/workbench/contrib/issue/electron-sandbox/issueReporterService2.ts
@@ -2,21 +2,19 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { $, isHTMLInputElement, isHTMLTextAreaElement, reset, windowOpenNoOpener } from 'vs/base/browser/dom';
-import { Codicon } from 'vs/base/common/codicons';
-import { groupBy } from 'vs/base/common/collections';
+import { $, reset } from 'vs/base/browser/dom';
 import { CancellationError } from 'vs/base/common/errors';
-import { isMacintosh } from 'vs/base/common/platform';
-import { ThemeIcon } from 'vs/base/common/themables';
+import { IProductConfiguration } from 'vs/base/common/product';
 import { URI } from 'vs/base/common/uri';
 import { localize } from 'vs/nls';
 import { isRemoteDiagnosticError } from 'vs/platform/diagnostics/common/diagnostics';
 import { IProcessMainService } from 'vs/platform/issue/common/issue';
 import { INativeHostService } from 'vs/platform/native/common/native';
+import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { applyZoom } from 'vs/platform/window/electron-sandbox/window';
-import { BaseIssueReporterService, hide, show } from 'vs/workbench/contrib/issue/browser/issue';
+import { BaseIssueReporterService } from 'vs/workbench/contrib/issue/browser/baseIssueReporterService';
 import { IssueReporterData as IssueReporterModelData } from 'vs/workbench/contrib/issue/browser/issueReporterModel';
-import { IIssueFormService, IssueReporterData, IssueReporterExtensionData, IssueReporterWindowConfiguration, IssueType } from 'vs/workbench/contrib/issue/common/issue';
+import { IIssueFormService, IssueReporterData, IssueType } from 'vs/workbench/contrib/issue/common/issue';
 
 // GitHub has let us know that we could up our limit here to 8k. We chose 7500 to play it safe.
 // ref https://github.com/microsoft/vscode/issues/159191
@@ -26,14 +24,21 @@ const MAX_URL_LENGTH = 7500;
 export class IssueReporter2 extends BaseIssueReporterService {
 	private readonly processMainService: IProcessMainService;
 	constructor(
-		private readonly configuration: IssueReporterWindowConfiguration,
-		public override readonly window: Window,
+		disableExtensions: boolean,
+		data: IssueReporterData,
+		os: {
+			type: string;
+			arch: string;
+			release: string;
+		},
+		product: IProductConfiguration,
+		window: Window,
 		@INativeHostService private readonly nativeHostService: INativeHostService,
 		@IIssueFormService issueFormService: IIssueFormService,
-		@IProcessMainService processMainService: IProcessMainService
+		@IProcessMainService processMainService: IProcessMainService,
+		@IThemeService themeService: IThemeService
 	) {
-		super(configuration.disableExtensions, configuration.data, configuration.os, configuration.product, window, false, issueFormService);
-
+		super(disableExtensions, data, os, product, window, false, issueFormService, themeService);
 		this.processMainService = processMainService;
 		this.processMainService.$getSystemInfo().then(info => {
 			this.issueReporterModel.update({ systemInfo: info });
@@ -42,44 +47,17 @@ export class IssueReporter2 extends BaseIssueReporterService {
 			this.updateSystemInfo(this.issueReporterModel.getData());
 			this.updatePreviewButtonState();
 		});
-		if (configuration.data.issueType === IssueType.PerformanceIssue) {
+		if (this.data.issueType === IssueType.PerformanceIssue) {
 			this.processMainService.$getPerformanceInfo().then(info => {
 				this.updatePerformanceInfo(info as Partial<IssueReporterData>);
 			});
 		}
 
 		this.setEventHandlers();
-		applyZoom(configuration.data.zoomLevel, this.window);
-		this.handleExtensionData(configuration.data.enabledExtensions);
-		this.updateExperimentsInfo(configuration.data.experiments);
-		this.updateRestrictedMode(configuration.data.restrictedMode);
-		this.updateUnsupportedMode(configuration.data.isUnsupported);
-	}
-
-	private handleExtensionData(extensions: IssueReporterExtensionData[]) {
-		const installedExtensions = extensions.filter(x => !x.isBuiltin);
-		const { nonThemes, themes } = groupBy(installedExtensions, ext => {
-			return ext.isTheme ? 'themes' : 'nonThemes';
-		});
-
-		const numberOfThemeExtesions = themes && themes.length;
-		this.issueReporterModel.update({ numberOfThemeExtesions, enabledNonThemeExtesions: nonThemes, allExtensions: installedExtensions });
-		this.updateExtensionTable(nonThemes, numberOfThemeExtesions);
-		if (this.disableExtensions || installedExtensions.length === 0) {
-			(<HTMLButtonElement>this.getElementById('disableExtensions')).disabled = true;
-		}
-
-		this.updateExtensionSelector(installedExtensions);
-	}
-
-	private async sendReporterMenu(extension: IssueReporterExtensionData): Promise<IssueReporterData | undefined> {
-		try {
-			const data = await this.issueFormService.sendReporterMenu(extension.id, extension.name);
-			return data;
-		} catch (e) {
-			console.error(e);
-			return undefined;
-		}
+		applyZoom(this.data.zoomLevel, this.window);
+		this.updateExperimentsInfo(this.data.experiments);
+		this.updateRestrictedMode(this.data.restrictedMode);
+		this.updateUnsupportedMode(this.data.isUnsupported);
 	}
 
 	public override setEventHandlers(): void {
@@ -104,68 +82,6 @@ export class IssueReporter2 extends BaseIssueReporterService {
 			this.setSourceOptions();
 			this.render();
 		});
-
-		// Keep all event listerns involving window and issue creation
-		this.previewButton.onDidClick(async () => {
-			this.delayedSubmit.trigger(async () => {
-				this.createIssue();
-			});
-		});
-
-		this.addEventListener('disableExtensions', 'click', () => {
-			this.issueFormService.reloadWithExtensionsDisabled();
-		});
-
-		this.addEventListener('extensionBugsLink', 'click', (e: Event) => {
-			const url = (<HTMLElement>e.target).innerText;
-			windowOpenNoOpener(url);
-		});
-
-		this.addEventListener('disableExtensions', 'keydown', (e: Event) => {
-			e.stopPropagation();
-			if ((e as KeyboardEvent).keyCode === 13 || (e as KeyboardEvent).keyCode === 32) {
-				this.issueFormService.reloadWithExtensionsDisabled();
-			}
-		});
-
-
-		// THIS IS THE MAIN IMPORTANT PART
-		this.window.document.onkeydown = async (e: KeyboardEvent) => {
-			const cmdOrCtrlKey = isMacintosh ? e.metaKey : e.ctrlKey;
-			// Cmd/Ctrl+Enter previews issue and closes window
-			if (cmdOrCtrlKey && e.key === 'Enter') {
-				this.delayedSubmit.trigger(async () => {
-					if (await this.createIssue()) {
-						this.close();
-					}
-				});
-			}
-
-			// Cmd/Ctrl + w closes issue window
-			if (cmdOrCtrlKey && e.key === 'w') {
-				e.stopPropagation();
-				e.preventDefault();
-
-				const issueTitle = (<HTMLInputElement>this.getElementById('issue-title'))!.value;
-				const { issueDescription } = this.issueReporterModel.getData();
-				if (!this.hasBeenSubmitted && (issueTitle || issueDescription)) {
-					// fire and forget
-					this.issueFormService.showConfirmCloseDialog();
-				} else {
-					this.close();
-				}
-			}
-
-			// With latest electron upgrade, cmd+a is no longer propagating correctly for inputs in this window on mac
-			// Manually perform the selection
-			if (isMacintosh) {
-				if (cmdOrCtrlKey && e.key === 'a' && e.target) {
-					if (isHTMLInputElement(e.target) || isHTMLTextAreaElement(e.target)) {
-						(<HTMLInputElement>e.target).select();
-					}
-				}
-			}
-		};
 	}
 
 	public override async submitToGitHub(issueTitle: string, issueBody: string, gitHubDetails: { owner: string; repositoryName: string }): Promise<boolean> {
@@ -253,9 +169,6 @@ export class IssueReporter2 extends BaseIssueReporterService {
 		}
 
 		const gitHubDetails = this.parseGitHubUrl(issueUrl);
-		if (this.data.githubAccessToken && gitHubDetails) {
-			return this.submitToGitHub(issueTitle, issueBody, gitHubDetails);
-		}
 
 		const baseUrl = this.getIssueUrlWithTitle((<HTMLInputElement>this.getElementById('issue-title')).value, issueUrl);
 		let url = baseUrl + `&body=${encodeURIComponent(issueBody)}`;
@@ -267,6 +180,8 @@ export class IssueReporter2 extends BaseIssueReporterService {
 				console.error('Writing to clipboard failed');
 				return false;
 			}
+		} else if (this.data.githubAccessToken && gitHubDetails) {
+			return this.submitToGitHub(issueTitle, issueBody, gitHubDetails);
 		}
 
 		await this.nativeHostService.openExternal(url);
@@ -364,147 +279,6 @@ export class IssueReporter2 extends BaseIssueReporterService {
 		}
 	}
 
-	public updateExtensionSelector(extensions: IssueReporterExtensionData[]): void {
-		interface IOption {
-			name: string;
-			id: string;
-		}
-
-		const extensionOptions: IOption[] = extensions.map(extension => {
-			return {
-				name: extension.displayName || extension.name || '',
-				id: extension.id
-			};
-		});
-
-		// Sort extensions by name
-		extensionOptions.sort((a, b) => {
-			const aName = a.name.toLowerCase();
-			const bName = b.name.toLowerCase();
-			if (aName > bName) {
-				return 1;
-			}
-
-			if (aName < bName) {
-				return -1;
-			}
-
-			return 0;
-		});
-
-		const makeOption = (extension: IOption, selectedExtension?: IssueReporterExtensionData): HTMLOptionElement => {
-			const selected = selectedExtension && extension.id === selectedExtension.id;
-			return $<HTMLOptionElement>('option', {
-				'value': extension.id,
-				'selected': selected || ''
-			}, extension.name);
-		};
-
-		const extensionsSelector = this.getElementById<HTMLSelectElement>('extension-selector');
-		if (extensionsSelector) {
-			const { selectedExtension } = this.issueReporterModel.getData();
-			reset(extensionsSelector, this.makeOption('', localize('selectExtension', "Select extension"), true), ...extensionOptions.map(extension => makeOption(extension, selectedExtension)));
-
-			if (!selectedExtension) {
-				extensionsSelector.selectedIndex = 0;
-			}
-
-			this.addEventListener('extension-selector', 'change', async (e: Event) => {
-				this.clearExtensionData();
-				const selectedExtensionId = (<HTMLInputElement>e.target).value;
-				this.selectedExtension = selectedExtensionId;
-				const extensions = this.issueReporterModel.getData().allExtensions;
-				const matches = extensions.filter(extension => extension.id === selectedExtensionId);
-				if (matches.length) {
-					this.issueReporterModel.update({ selectedExtension: matches[0] });
-					const selectedExtension = this.issueReporterModel.getData().selectedExtension;
-					if (selectedExtension) {
-						const iconElement = document.createElement('span');
-						iconElement.classList.add(...ThemeIcon.asClassNameArray(Codicon.loading), 'codicon-modifier-spin');
-						this.setLoading(iconElement);
-						const openReporterData = await this.sendReporterMenu(selectedExtension);
-						if (openReporterData) {
-							if (this.selectedExtension === selectedExtensionId) {
-								this.removeLoading(iconElement, true);
-								this.configuration.data = openReporterData;
-								this.data = openReporterData;
-							} else if (this.selectedExtension !== selectedExtensionId) {
-							}
-						}
-						else {
-							if (!this.loadingExtensionData) {
-								iconElement.classList.remove(...ThemeIcon.asClassNameArray(Codicon.loading), 'codicon-modifier-spin');
-							}
-							this.removeLoading(iconElement);
-							// if not using command, should have no configuration data in fields we care about and check later.
-							this.clearExtensionData();
-
-							// case when previous extension was opened from normal openIssueReporter command
-							selectedExtension.data = undefined;
-							selectedExtension.uri = undefined;
-						}
-						if (this.selectedExtension === selectedExtensionId) {
-							// repopulates the fields with the new data given the selected extension.
-							this.updateExtensionStatus(matches[0]);
-							this.openReporter = false;
-						}
-					} else {
-						this.issueReporterModel.update({ selectedExtension: undefined });
-						this.clearSearchResults();
-						this.clearExtensionData();
-						this.validateSelectedExtension();
-						this.updateExtensionStatus(matches[0]);
-					}
-				}
-			});
-		}
-
-		this.addEventListener('problem-source', 'change', (_) => {
-			this.validateSelectedExtension();
-		});
-	}
-
-	public override setLoading(element: HTMLElement) {
-		// Show loading
-		this.openReporter = true;
-		this.loadingExtensionData = true;
-		this.updatePreviewButtonState();
-
-		const extensionDataCaption = this.getElementById('extension-id')!;
-		hide(extensionDataCaption);
-
-		const extensionDataCaption2 = Array.from(this.window.document.querySelectorAll('.ext-parens'));
-		extensionDataCaption2.forEach(extensionDataCaption2 => hide(extensionDataCaption2));
-
-		const showLoading = this.getElementById('ext-loading')!;
-		show(showLoading);
-		while (showLoading.firstChild) {
-			showLoading.firstChild.remove();
-		}
-		showLoading.append(element);
-
-		this.renderBlocks();
-	}
-
-	public override removeLoading(element: HTMLElement, fromReporter: boolean = false) {
-		this.openReporter = fromReporter;
-		this.loadingExtensionData = false;
-		this.updatePreviewButtonState();
-
-		const extensionDataCaption = this.getElementById('extension-id')!;
-		show(extensionDataCaption);
-
-		const extensionDataCaption2 = Array.from(this.window.document.querySelectorAll('.ext-parens'));
-		extensionDataCaption2.forEach(extensionDataCaption2 => show(extensionDataCaption2));
-
-		const hideLoading = this.getElementById('ext-loading')!;
-		hide(hideLoading);
-		if (hideLoading.firstChild) {
-			element.remove();
-		}
-		this.renderBlocks();
-	}
-
 	private updateRestrictedMode(restrictedMode: boolean) {
 		this.issueReporterModel.update({ restrictedMode });
 	}
diff --git a/src/vs/workbench/contrib/issue/electron-sandbox/nativeIssueFormService.ts b/src/vs/workbench/contrib/issue/electron-sandbox/nativeIssueFormService.ts
new file mode 100644
index 00000000000..ee2de28ed40
--- /dev/null
+++ b/src/vs/workbench/contrib/issue/electron-sandbox/nativeIssueFormService.ts
@@ -0,0 +1,60 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import 'vs/css!./media/newIssueReporter';
+import { IMenuService } from 'vs/platform/actions/common/actions';
+import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
+import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
+import { INativeEnvironmentService } from 'vs/platform/environment/common/environment';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { ILogService } from 'vs/platform/log/common/log';
+import { INativeHostService } from 'vs/platform/native/common/native';
+import product from 'vs/platform/product/common/product';
+import { IssueFormService } from 'vs/workbench/contrib/issue/browser/issueFormService';
+import { IIssueFormService, IssueReporterData } from 'vs/workbench/contrib/issue/common/issue';
+import { IssueReporter2 } from 'vs/workbench/contrib/issue/electron-sandbox/issueReporterService2';
+import { IAuxiliaryWindowService } from 'vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService';
+import { IHostService } from 'vs/workbench/services/host/browser/host';
+
+export class NativeIssueFormService extends IssueFormService implements IIssueFormService {
+	constructor(
+		@IInstantiationService instantiationService: IInstantiationService,
+		@IAuxiliaryWindowService auxiliaryWindowService: IAuxiliaryWindowService,
+		@ILogService logService: ILogService,
+		@IDialogService dialogService: IDialogService,
+		@IMenuService menuService: IMenuService,
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@IHostService hostService: IHostService,
+		@INativeHostService private readonly nativeHostService: INativeHostService,
+		@INativeEnvironmentService private readonly environmentService: INativeEnvironmentService,) {
+		super(instantiationService, auxiliaryWindowService, menuService, contextKeyService, logService, dialogService, hostService);
+	}
+
+	// override to grab platform info
+	override async openReporter(data: IssueReporterData): Promise<void> {
+		if (this.hasToReload(data)) {
+			return;
+		}
+
+		const bounds = await this.nativeHostService.getActiveWindowPosition();
+		if (!bounds) {
+			return;
+		}
+
+		await this.openAuxIssueReporter(data, bounds);
+
+		// Get platform information
+		const { arch, release, type } = await this.nativeHostService.getOSProperties();
+		this.arch = arch;
+		this.release = release;
+		this.type = type;
+
+		// create issue reporter and instantiate
+		if (this.issueReporterWindow) {
+			const issueReporter = this.instantiationService.createInstance(IssueReporter2, !!this.environmentService.disableExtensions, data, { type: this.type, arch: this.arch, release: this.release }, product, this.issueReporterWindow);
+			issueReporter.render();
+		}
+	}
+}
diff --git a/src/vs/workbench/contrib/languageRuntime/browser/languageRuntimeActions.ts b/src/vs/workbench/contrib/languageRuntime/browser/languageRuntimeActions.ts
index d1d19a992ab..478c3486f8d 100644
--- a/src/vs/workbench/contrib/languageRuntime/browser/languageRuntimeActions.ts
+++ b/src/vs/workbench/contrib/languageRuntime/browser/languageRuntimeActions.ts
@@ -140,7 +140,9 @@ const selectLanguageRuntime = async (
 
 	// Prompt the user to select a language runtime.
 	return new Promise((resolve) => {
-		const input = quickInputService.createQuickPick<LanguageRuntimeQuickPickItem>();
+		const input = quickInputService.createQuickPick<LanguageRuntimeQuickPickItem>(
+			{ useSeparators: true }
+		);
 		const runtimePicks = new Map<string, LanguageRuntimeQuickPickItem>();
 
 		const addRuntime = (runtimeMetadata: ILanguageRuntimeMetadata) => {
diff --git a/src/vs/workbench/contrib/languageStatus/browser/languageStatus.contribution.ts b/src/vs/workbench/contrib/languageStatus/browser/languageStatus.contribution.ts
index daf83ca4cb0..c4a3d7c41ef 100644
--- a/src/vs/workbench/contrib/languageStatus/browser/languageStatus.contribution.ts
+++ b/src/vs/workbench/contrib/languageStatus/browser/languageStatus.contribution.ts
@@ -28,12 +28,12 @@ import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storag
 import { equals } from 'vs/base/common/arrays';
 import { URI } from 'vs/base/common/uri';
 import { Action2, registerAction2 } from 'vs/platform/actions/common/actions';
-import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
+import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { Categories } from 'vs/platform/action/common/actionCommonCategories';
 import { IAccessibilityInformation } from 'vs/platform/accessibility/common/accessibility';
-import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
+import { IEditorGroupsService, IEditorPart } from 'vs/workbench/services/editor/common/editorGroupsService';
 import { IHoverService, nativeHoverDelegate } from 'vs/platform/hover/browser/hover';
+import { Event } from 'vs/base/common/event';
 
 class LanguageStatusViewModel {
 
@@ -65,22 +65,23 @@ class StoredCounter {
 class LanguageStatusContribution extends Disposable implements IWorkbenchContribution {
 
 	constructor(
-		@IInstantiationService instantiationService: IInstantiationService,
-		@IEditorGroupsService editorGroupService: IEditorGroupsService,
-		@IEditorService editorService: IEditorService
+		@IEditorGroupsService private readonly editorGroupService: IEditorGroupsService,
 	) {
 		super();
 
-		// --- main language status
-		const mainInstantiationService = this._register(instantiationService.createChild(new ServiceCollection(
-			[IEditorService, editorService.createScoped('main', this._store)]
-		)));
-		this._register(mainInstantiationService.createInstance(LanguageStatus));
+		for (const part of editorGroupService.parts) {
+			this.createLanguageStatus(part);
+		}
+
+		this._register(editorGroupService.onDidCreateAuxiliaryEditorPart(part => this.createLanguageStatus(part)));
+	}
+
+	private createLanguageStatus(part: IEditorPart): void {
+		const disposables = new DisposableStore();
+		Event.once(part.onWillDispose)(() => disposables.dispose());
 
-		// --- auxiliary language status
-		this._register(editorGroupService.onDidCreateAuxiliaryEditorPart(({ instantiationService, disposables }) => {
-			disposables.add(instantiationService.createInstance(LanguageStatus));
-		}));
+		const scopedInstantiationService = this.editorGroupService.getScopedInstantiationService(part);
+		disposables.add(scopedInstantiationService.createInstance(LanguageStatus));
 	}
 }
 
diff --git a/src/vs/workbench/contrib/list/browser/list.contribution.ts b/src/vs/workbench/contrib/list/browser/list.contribution.ts
index dffda536058..e89365852d7 100644
--- a/src/vs/workbench/contrib/list/browser/list.contribution.ts
+++ b/src/vs/workbench/contrib/list/browser/list.contribution.ts
@@ -5,6 +5,8 @@
 
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { IWorkbenchContribution, WorkbenchPhase, registerWorkbenchContribution2 } from 'vs/workbench/common/contributions';
+import { registerAction2 } from 'vs/platform/actions/common/actions';
+import { ListResizeColumnAction } from 'vs/workbench/contrib/list/browser/listResizeColumnAction';
 
 export class ListContext implements IWorkbenchContribution {
 
@@ -21,3 +23,5 @@ export class ListContext implements IWorkbenchContribution {
 }
 
 registerWorkbenchContribution2(ListContext.ID, ListContext, WorkbenchPhase.BlockStartup);
+registerAction2(ListResizeColumnAction);
+
diff --git a/src/vs/workbench/contrib/list/browser/listResizeColumnAction.ts b/src/vs/workbench/contrib/list/browser/listResizeColumnAction.ts
new file mode 100644
index 00000000000..9c106b6c3c9
--- /dev/null
+++ b/src/vs/workbench/contrib/list/browser/listResizeColumnAction.ts
@@ -0,0 +1,34 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { TableColumnResizeQuickPick } from 'vs/workbench/contrib/list/browser/tableColumnResizeQuickPick';
+import { Table } from 'vs/base/browser/ui/table/tableWidget';
+import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
+import { IListService, WorkbenchListFocusContextKey } from 'vs/platform/list/browser/listService';
+import { Action2 } from 'vs/platform/actions/common/actions';
+import { localize } from 'vs/nls';
+
+export class ListResizeColumnAction extends Action2 {
+	constructor() {
+		super({
+			id: 'list.resizeColumn',
+			title: { value: localize('list.resizeColumn', "Resize Column"), original: 'Resize Column' },
+			category: { value: localize('list', "List"), original: 'List' },
+			precondition: WorkbenchListFocusContextKey,
+			f1: true
+		});
+	}
+
+	async run(accessor: ServicesAccessor): Promise<void> {
+		const listService = accessor.get(IListService);
+		const instantiationService = accessor.get(IInstantiationService);
+
+		const list = listService.lastFocusedList;
+		if (list instanceof Table) {
+			await instantiationService.createInstance(TableColumnResizeQuickPick, list).show();
+		}
+	}
+}
+
diff --git a/src/vs/workbench/contrib/list/browser/tableColumnResizeQuickPick.ts b/src/vs/workbench/contrib/list/browser/tableColumnResizeQuickPick.ts
new file mode 100644
index 00000000000..370baff0f86
--- /dev/null
+++ b/src/vs/workbench/contrib/list/browser/tableColumnResizeQuickPick.ts
@@ -0,0 +1,56 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Table } from 'vs/base/browser/ui/table/tableWidget';
+import { Disposable } from 'vs/base/common/lifecycle';
+import Severity from 'vs/base/common/severity';
+import { localize } from 'vs/nls';
+import { IQuickInputService, IQuickPickItem } from 'vs/platform/quickinput/common/quickInput';
+
+interface IColumnResizeQuickPickItem extends IQuickPickItem {
+	index: number;
+}
+
+export class TableColumnResizeQuickPick extends Disposable {
+	constructor(
+		private readonly _table: Table<any>,
+		@IQuickInputService private readonly _quickInputService: IQuickInputService,
+	) {
+		super();
+	}
+
+	async show(): Promise<void> {
+		const items: IColumnResizeQuickPickItem[] = [];
+		this._table.getColumnLabels().forEach((label, index) => {
+			if (label) {
+				items.push({ label, index });
+			}
+		});
+		const column = await this._quickInputService.pick<IColumnResizeQuickPickItem>(items, { placeHolder: localize('table.column.selection', "Select the column to resize, type to filter.") });
+		if (!column) {
+			return;
+		}
+		const value = await this._quickInputService.input({
+			placeHolder: localize('table.column.resizeValue.placeHolder', "i.e. 20, 60, 100..."),
+			prompt: localize('table.column.resizeValue.prompt', "Please enter a width in percentage for the '{0}' column.", column.label),
+			validateInput: (input: string) => this._validateColumnResizeValue(input)
+		});
+		const percentageValue = value ? Number.parseInt(value) : undefined;
+		if (!percentageValue) {
+			return;
+		}
+		this._table.resizeColumn(column.index, percentageValue);
+	}
+
+	private async _validateColumnResizeValue(input: string): Promise<string | { content: string; severity: Severity } | null | undefined> {
+		const percentage = Number.parseInt(input);
+		if (input && !Number.isInteger(percentage)) {
+			return localize('table.column.resizeValue.invalidType', "Please enter an integer.");
+		} else if (percentage < 0 || percentage > 100) {
+			return localize('table.column.resizeValue.invalidRange', "Please enter a number greater than 0 and less than or equal to 100.");
+		}
+		return null;
+	}
+}
diff --git a/src/vs/workbench/contrib/localHistory/browser/localHistoryCommands.ts b/src/vs/workbench/contrib/localHistory/browser/localHistoryCommands.ts
index 098357445d0..e4368d9e980 100644
--- a/src/vs/workbench/contrib/localHistory/browser/localHistoryCommands.ts
+++ b/src/vs/workbench/contrib/localHistory/browser/localHistoryCommands.ts
@@ -28,9 +28,13 @@ import { getIconClasses } from 'vs/editor/common/services/getIconClasses';
 import { IModelService } from 'vs/editor/common/services/model';
 import { ILanguageService } from 'vs/editor/common/languages/language';
 import { ILabelService } from 'vs/platform/label/common/label';
-import { firstOrDefault } from 'vs/base/common/arrays';
+import { coalesce, firstOrDefault } from 'vs/base/common/arrays';
 import { getLocalHistoryDateFormatter, LOCAL_HISTORY_ICON_RESTORE, LOCAL_HISTORY_MENU_CONTEXT_KEY } from 'vs/workbench/contrib/localHistory/browser/localHistory';
 import { IPathService } from 'vs/workbench/services/path/common/pathService';
+import { ResourceSet } from 'vs/base/common/map';
+import { IHistoryService } from 'vs/workbench/services/history/common/history';
+import { DisposableStore } from 'vs/base/common/lifecycle';
+import { IEditorOptions } from 'vs/platform/editor/common/editor';
 
 const LOCAL_HISTORY_CATEGORY = localize2('localHistory.category', 'Local History');
 const CTX_LOCAL_HISTORY_ENABLED = ContextKeyExpr.has('config.workbench.localHistory.enabled');
@@ -330,34 +334,49 @@ registerAction2(class extends Action2 {
 		const editorService = accessor.get(IEditorService);
 		const fileService = accessor.get(IFileService);
 		const commandService = accessor.get(ICommandService);
+		const historyService = accessor.get(IHistoryService);
 
 		// Show all resources with associated history entries in picker
 		// with progress because this operation will take longer the more
 		// files have been saved overall.
+		//
+		// Sort the resources by history to put more relevant entries
+		// to the top.
 
-		const resourcePicker = quickInputService.createQuickPick<IQuickPickItem & { resource: URI }>();
+		const resourcePickerDisposables = new DisposableStore();
+		const resourcePicker = resourcePickerDisposables.add(quickInputService.createQuickPick<IQuickPickItem & { resource: URI }>());
 
 		let cts = new CancellationTokenSource();
-		resourcePicker.onDidHide(() => cts.dispose(true));
+		resourcePickerDisposables.add(resourcePicker.onDidHide(() => cts.dispose(true)));
 
 		resourcePicker.busy = true;
 		resourcePicker.show();
 
-		const resources = await workingCopyHistoryService.getAll(cts.token);
+		const resources = new ResourceSet(await workingCopyHistoryService.getAll(cts.token));
+		const recentEditorResources = new ResourceSet(coalesce(historyService.getHistory().map(({ resource }) => resource)));
+
+		const resourcesSortedByRecency: URI[] = [];
+		for (const resource of recentEditorResources) {
+			if (resources.has(resource)) {
+				resourcesSortedByRecency.push(resource);
+				resources.delete(resource);
+			}
+		}
+		resourcesSortedByRecency.push(...[...resources].sort((r1, r2) => r1.fsPath < r2.fsPath ? -1 : 1));
 
 		resourcePicker.busy = false;
 		resourcePicker.placeholder = localize('restoreViaPicker.filePlaceholder', "Select the file to show local history for");
 		resourcePicker.matchOnLabel = true;
 		resourcePicker.matchOnDescription = true;
-		resourcePicker.items = resources.map(resource => ({
+		resourcePicker.items = [...resourcesSortedByRecency].map(resource => ({
 			resource,
 			label: basenameOrAuthority(resource),
 			description: labelService.getUriLabel(dirname(resource), { relative: true }),
 			iconClasses: getIconClasses(modelService, languageService, resource)
-		})).sort((r1, r2) => r1.resource.fsPath < r2.resource.fsPath ? -1 : 1);
+		}));
 
 		await Event.toPromise(resourcePicker.onDidAccept);
-		resourcePicker.dispose();
+		resourcePickerDisposables.dispose();
 
 		const resource = firstOrDefault(resourcePicker.selectedItems)?.resource;
 		if (!resource) {
@@ -367,10 +386,11 @@ registerAction2(class extends Action2 {
 		// Show all entries for the picked resource in another picker
 		// and open the entry in the end that was selected by the user
 
-		const entryPicker = quickInputService.createQuickPick<IQuickPickItem & { entry: IWorkingCopyHistoryEntry }>();
+		const entryPickerDisposables = new DisposableStore();
+		const entryPicker = entryPickerDisposables.add(quickInputService.createQuickPick<IQuickPickItem & { entry: IWorkingCopyHistoryEntry }>());
 
 		cts = new CancellationTokenSource();
-		entryPicker.onDidHide(() => cts.dispose(true));
+		entryPickerDisposables.add(entryPicker.onDidHide(() => cts.dispose(true)));
 
 		entryPicker.busy = true;
 		entryPicker.show();
@@ -378,6 +398,7 @@ registerAction2(class extends Action2 {
 		const entries = await workingCopyHistoryService.getEntries(resource, cts.token);
 
 		entryPicker.busy = false;
+		entryPicker.canAcceptInBackground = true;
 		entryPicker.placeholder = localize('restoreViaPicker.entryPlaceholder', "Select the local history entry to open");
 		entryPicker.matchOnLabel = true;
 		entryPicker.matchOnDescription = true;
@@ -387,20 +408,23 @@ registerAction2(class extends Action2 {
 			description: toLocalHistoryEntryDateLabel(entry.timestamp)
 		}));
 
-		await Event.toPromise(entryPicker.onDidAccept);
-		entryPicker.dispose();
+		entryPickerDisposables.add(entryPicker.onDidAccept(async e => {
+			if (!e.inBackground) {
+				entryPickerDisposables.dispose();
+			}
 
-		const selectedItem = firstOrDefault(entryPicker.selectedItems);
-		if (!selectedItem) {
-			return;
-		}
+			const selectedItem = firstOrDefault(entryPicker.selectedItems);
+			if (!selectedItem) {
+				return;
+			}
 
-		const resourceExists = await fileService.exists(selectedItem.entry.workingCopy.resource);
-		if (resourceExists) {
-			return commandService.executeCommand(API_OPEN_DIFF_EDITOR_COMMAND_ID, ...toDiffEditorArguments(selectedItem.entry, selectedItem.entry.workingCopy.resource));
-		}
+			const resourceExists = await fileService.exists(selectedItem.entry.workingCopy.resource);
+			if (resourceExists) {
+				return commandService.executeCommand(API_OPEN_DIFF_EDITOR_COMMAND_ID, ...toDiffEditorArguments(selectedItem.entry, selectedItem.entry.workingCopy.resource, { preserveFocus: e.inBackground }));
+			}
 
-		return openEntry(selectedItem.entry, editorService);
+			return openEntry(selectedItem.entry, editorService, { preserveFocus: e.inBackground });
+		}));
 	}
 });
 
@@ -429,18 +453,19 @@ registerAction2(class extends Action2 {
 
 		const { entry } = await findLocalHistoryEntry(workingCopyHistoryService, item);
 		if (entry) {
-			const inputBox = quickInputService.createInputBox();
+			const disposables = new DisposableStore();
+			const inputBox = disposables.add(quickInputService.createInputBox());
 			inputBox.title = localize('renameLocalHistoryEntryTitle', "Rename Local History Entry");
 			inputBox.ignoreFocusOut = true;
 			inputBox.placeholder = localize('renameLocalHistoryPlaceholder', "Enter the new name of the local history entry");
 			inputBox.value = SaveSourceRegistry.getSourceLabel(entry.source);
 			inputBox.show();
-			inputBox.onDidAccept(() => {
+			disposables.add(inputBox.onDidAccept(() => {
 				if (inputBox.value) {
 					workingCopyHistoryService.updateEntry(entry, { source: inputBox.value }, CancellationToken.None);
 				}
-				inputBox.dispose();
-			});
+				disposables.dispose();
+			}));
 		}
 	}
 });
@@ -552,19 +577,20 @@ registerAction2(class extends Action2 {
 			return; // only enable for selected schemes
 		}
 
-		const inputBox = quickInputService.createInputBox();
+		const disposables = new DisposableStore();
+		const inputBox = disposables.add(quickInputService.createInputBox());
 		inputBox.title = localize('createLocalHistoryEntryTitle', "Create Local History Entry");
 		inputBox.ignoreFocusOut = true;
 		inputBox.placeholder = localize('createLocalHistoryPlaceholder', "Enter the new name of the local history entry for '{0}'", labelService.getUriBasenameLabel(resource));
 		inputBox.show();
-		inputBox.onDidAccept(async () => {
+		disposables.add(inputBox.onDidAccept(async () => {
 			const entrySource = inputBox.value;
-			inputBox.dispose();
+			disposables.dispose();
 
 			if (entrySource) {
 				await workingCopyHistoryService.addEntry({ resource, source: inputBox.value }, CancellationToken.None);
 			}
-		});
+		}));
 	}
 });
 
@@ -572,12 +598,13 @@ registerAction2(class extends Action2 {
 
 //#region Helpers
 
-async function openEntry(entry: IWorkingCopyHistoryEntry, editorService: IEditorService): Promise<void> {
+async function openEntry(entry: IWorkingCopyHistoryEntry, editorService: IEditorService, options?: IEditorOptions): Promise<void> {
 	const resource = LocalHistoryFileSystemProvider.toLocalHistoryFileSystem({ location: entry.location, associatedResource: entry.workingCopy.resource });
 
 	await editorService.openEditor({
 		resource,
-		label: localize('localHistoryEditorLabel', "{0} ({1} • {2})", entry.workingCopy.name, SaveSourceRegistry.getSourceLabel(entry.source), toLocalHistoryEntryDateLabel(entry.timestamp))
+		label: localize('localHistoryEditorLabel', "{0} ({1} • {2})", entry.workingCopy.name, SaveSourceRegistry.getSourceLabel(entry.source), toLocalHistoryEntryDateLabel(entry.timestamp)),
+		options
 	});
 }
 
@@ -588,9 +615,9 @@ async function closeEntry(entry: IWorkingCopyHistoryEntry, editorService: IEdito
 	await editorService.closeEditors(editors, { preserveFocus: true });
 }
 
-export function toDiffEditorArguments(entry: IWorkingCopyHistoryEntry, resource: URI): unknown[];
-export function toDiffEditorArguments(previousEntry: IWorkingCopyHistoryEntry, entry: IWorkingCopyHistoryEntry): unknown[];
-export function toDiffEditorArguments(arg1: IWorkingCopyHistoryEntry, arg2: IWorkingCopyHistoryEntry | URI): unknown[] {
+export function toDiffEditorArguments(entry: IWorkingCopyHistoryEntry, resource: URI, options?: IEditorOptions): unknown[];
+export function toDiffEditorArguments(previousEntry: IWorkingCopyHistoryEntry, entry: IWorkingCopyHistoryEntry, options?: IEditorOptions): unknown[];
+export function toDiffEditorArguments(arg1: IWorkingCopyHistoryEntry, arg2: IWorkingCopyHistoryEntry | URI, options?: IEditorOptions): unknown[] {
 
 	// Left hand side is always a working copy history entry
 	const originalResource = LocalHistoryFileSystemProvider.toLocalHistoryFileSystem({ location: arg1.location, associatedResource: arg1.workingCopy.resource });
@@ -623,7 +650,7 @@ export function toDiffEditorArguments(arg1: IWorkingCopyHistoryEntry, arg2: IWor
 		originalResource,
 		modifiedResource,
 		label,
-		undefined // important to keep order of arguments in command proper
+		options ? [undefined, options] : undefined
 	];
 }
 
diff --git a/src/vs/workbench/contrib/localization/common/localizationsActions.ts b/src/vs/workbench/contrib/localization/common/localizationsActions.ts
index d9ad34f1c1b..7f2f1f13dec 100644
--- a/src/vs/workbench/contrib/localization/common/localizationsActions.ts
+++ b/src/vs/workbench/contrib/localization/common/localizationsActions.ts
@@ -37,7 +37,8 @@ export class ConfigureDisplayLanguageAction extends Action2 {
 
 		const installedLanguages = await languagePackService.getInstalledLanguages();
 
-		const qp = quickInputService.createQuickPick<ILanguagePackItem>();
+		const disposables = new DisposableStore();
+		const qp = disposables.add(quickInputService.createQuickPick<ILanguagePackItem>({ useSeparators: true }));
 		qp.matchOnDescription = true;
 		qp.placeholder = localize('chooseLocale', "Select Display Language");
 
@@ -46,7 +47,6 @@ export class ConfigureDisplayLanguageAction extends Action2 {
 			qp.items = items.concat(this.withMoreInfoButton(installedLanguages));
 		}
 
-		const disposables = new DisposableStore();
 		const source = new CancellationTokenSource();
 		disposables.add(qp.onDispose(() => {
 			source.cancel();
diff --git a/src/vs/workbench/contrib/logs/common/logsActions.ts b/src/vs/workbench/contrib/logs/common/logsActions.ts
index 86c59a48995..6873d7578e2 100644
--- a/src/vs/workbench/contrib/logs/common/logsActions.ts
+++ b/src/vs/workbench/contrib/logs/common/logsActions.ts
@@ -75,7 +75,7 @@ export class SetLogLevelAction extends Action {
 
 		return new Promise((resolve, reject) => {
 			const disposables = new DisposableStore();
-			const quickPick = this.quickInputService.createQuickPick();
+			const quickPick = disposables.add(this.quickInputService.createQuickPick({ useSeparators: true }));
 			quickPick.placeholder = nls.localize('selectlog', "Set Log Level");
 			quickPick.items = entries;
 			let selectedItem: IQuickPickItem | undefined;
@@ -108,7 +108,7 @@ export class SetLogLevelAction extends Action {
 
 		return new Promise((resolve, reject) => {
 			const disposables = new DisposableStore();
-			const quickPick = this.quickInputService.createQuickPick();
+			const quickPick = disposables.add(this.quickInputService.createQuickPick());
 			quickPick.placeholder = logChannel ? nls.localize('selectLogLevelFor', " {0}: Select log level", logChannel?.label) : nls.localize('selectLogLevel', "Select log level");
 			quickPick.items = entries;
 			quickPick.activeItems = entries.filter((entry) => entry.level === this.loggerService.getLogLevel());
diff --git a/src/vs/workbench/contrib/markdown/browser/markdownDocumentRenderer.ts b/src/vs/workbench/contrib/markdown/browser/markdownDocumentRenderer.ts
index b1c6b962fab..4e417a65291 100644
--- a/src/vs/workbench/contrib/markdown/browser/markdownDocumentRenderer.ts
+++ b/src/vs/workbench/contrib/markdown/browser/markdownDocumentRenderer.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { hookDomPurifyHrefAndSrcSanitizer, basicMarkupHtmlTags } from 'vs/base/browser/dom';
+import { basicMarkupHtmlTags, hookDomPurifyHrefAndSrcSanitizer } from 'vs/base/browser/dom';
 import * as dompurify from 'vs/base/browser/dompurify/dompurify';
 import { allowedMarkdownAttr } from 'vs/base/browser/markdownRenderer';
 import { CancellationToken } from 'vs/base/common/cancellation';
-import { marked } from 'vs/base/common/marked/marked';
+import * as marked from 'vs/base/common/marked/marked';
 import { Schemas } from 'vs/base/common/network';
+import { escape } from 'vs/base/common/strings';
 import { ILanguageService } from 'vs/editor/common/languages/language';
 import { tokenizeToString } from 'vs/editor/common/languages/textToHtmlTokenizer';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { escape } from 'vs/base/common/strings';
 
 export const DEFAULT_MARKDOWN_STYLES = `
 body {
@@ -190,7 +190,7 @@ interface IRenderMarkdownDocumentOptions {
 	readonly token?: CancellationToken;
 }
 
-/**
+/*marked.*
  * Renders a string of markdown as a document.
  *
  * Uses VS Code's syntax highlighting code blocks.
@@ -201,37 +201,115 @@ export async function renderMarkdownDocument(
 	languageService: ILanguageService,
 	options?: IRenderMarkdownDocumentOptions
 ): Promise<string> {
+	const m = new marked.Marked(
+		MarkedHighlight.markedHighlight({
+			async: true,
+			async highlight(code: string, lang: string): Promise<string> {
+				if (typeof lang !== 'string') {
+					return escape(code);
+				}
+
+				await extensionService.whenInstalledExtensionsRegistered();
+				if (options?.token?.isCancellationRequested) {
+					return '';
+				}
+
+				const languageId = languageService.getLanguageIdByLanguageName(lang) ?? languageService.getLanguageIdByLanguageName(lang.split(/\s+|:|,|(?!^)\{|\?]/, 1)[0]);
+				return tokenizeToString(languageService, code, languageId);
+			}
+		})
+	);
+
+	const raw = await m.parse(text, { renderer: options?.renderer, async: true });
+	if (options?.shouldSanitize ?? true) {
+		return sanitize(raw, options?.allowUnknownProtocols ?? false);
+	} else {
+		return raw;
+	}
+}
+
+namespace MarkedHighlight {
+	// Copied from https://github.com/markedjs/marked-highlight/blob/main/src/index.js
 
-	const highlight = (code: string, lang: string | undefined, callback: ((error: any, code: string) => void) | undefined): any => {
-		if (!callback) {
-			return code;
+	export function markedHighlight(options: marked.MarkedOptions & { highlight: (code: string, lang: string, info: string) => string | Promise<string> }) {
+		if (typeof options === 'function') {
+			options = {
+				highlight: options,
+			};
 		}
 
-		if (typeof lang !== 'string') {
-			callback(null, escape(code));
-			return '';
+		if (!options || typeof options.highlight !== 'function') {
+			throw new Error('Must provide highlight function');
 		}
 
-		extensionService.whenInstalledExtensionsRegistered().then(async () => {
-			if (options?.token?.isCancellationRequested) {
-				callback(null, '');
-				return;
+		return {
+			async: !!options.async,
+			walkTokens(token: marked.Token): Promise<void> | void {
+				if (token.type !== 'code') {
+					return;
+				}
+
+				const lang = getLang(token.lang);
+
+				if (options.async) {
+					return Promise.resolve(options.highlight(token.text, lang, token.lang || '')).then(updateToken(token));
+				}
+
+				const code = options.highlight(token.text, lang, token.lang || '');
+				if (code instanceof Promise) {
+					throw new Error('markedHighlight is not set to async but the highlight function is async. Set the async option to true on markedHighlight to await the async highlight function.');
+				}
+				updateToken(token)(code);
+			},
+			renderer: {
+				code({ text, lang, escaped }: marked.Tokens.Code) {
+					const classAttr = lang
+						? ` class="language-${escape(lang)}"`
+						: '';
+					text = text.replace(/\n$/, '');
+					return `<pre><code${classAttr}>${escaped ? text : escape(text, true)}\n</code></pre>`;
+				},
+			} as any,
+		};
+	}
+
+	function getLang(lang: string) {
+		return (lang || '').match(/\S*/)![0];
+	}
+
+	function updateToken(token: any) {
+		return (code: string) => {
+			if (typeof code === 'string' && code !== token.text) {
+				token.escaped = true;
+				token.text = code;
 			}
+		};
+	}
 
-			const languageId = languageService.getLanguageIdByLanguageName(lang) ?? languageService.getLanguageIdByLanguageName(lang.split(/\s+|:|,|(?!^)\{|\?]/, 1)[0]);
-			const html = await tokenizeToString(languageService, code, languageId);
-			callback(null, html);
-		});
-		return '';
+	// copied from marked helpers
+	const escapeTest = /[&<>"']/;
+	const escapeReplace = new RegExp(escapeTest.source, 'g');
+	const escapeTestNoEncode = /[<>"']|&(?!(#\d{1,7}|#[Xx][a-fA-F0-9]{1,6}|\w+);)/;
+	const escapeReplaceNoEncode = new RegExp(escapeTestNoEncode.source, 'g');
+	const escapeReplacement: Record<string, string> = {
+		'&': '&amp;',
+		'<': '&lt;',
+		'>': '&gt;',
+		'"': '&quot;',
+		[`'`]: '&#39;',
 	};
-
-	return new Promise<string>((resolve, reject) => {
-		marked(text, { highlight, renderer: options?.renderer }, (err, value) => err ? reject(err) : resolve(value));
-	}).then(raw => {
-		if (options?.shouldSanitize ?? true) {
-			return sanitize(raw, options?.allowUnknownProtocols ?? false);
+	const getEscapeReplacement = (ch: string) => escapeReplacement[ch];
+	function escape(html: string, encode?: boolean) {
+		if (encode) {
+			if (escapeTest.test(html)) {
+				return html.replace(escapeReplace, getEscapeReplacement);
+			}
 		} else {
-			return raw;
+			if (escapeTestNoEncode.test(html)) {
+				return html.replace(escapeReplaceNoEncode, getEscapeReplacement);
+			}
 		}
-	});
+
+		return html;
+	}
 }
diff --git a/src/vs/workbench/contrib/markdown/browser/markdownSettingRenderer.ts b/src/vs/workbench/contrib/markdown/browser/markdownSettingRenderer.ts
index 71f6b5992de..00dd93a6357 100644
--- a/src/vs/workbench/contrib/markdown/browser/markdownSettingRenderer.ts
+++ b/src/vs/workbench/contrib/markdown/browser/markdownSettingRenderer.ts
@@ -14,6 +14,7 @@ import { IAction } from 'vs/base/common/actions';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
 import { Schemas } from 'vs/base/common/network';
+import { Tokens } from 'vs/base/common/marked/marked';
 
 export class SimpleSettingRenderer {
 	private readonly codeSettingRegex: RegExp;
@@ -40,17 +41,17 @@ export class SimpleSettingRenderer {
 		return result;
 	}
 
-	getHtmlRenderer(): (html: string) => string {
-		return (html): string => {
-			const match = this.codeSettingRegex.exec(html);
+	getHtmlRenderer(): (token: Tokens.HTML) => string {
+		return ({ raw }: Tokens.HTML): string => {
+			const match = this.codeSettingRegex.exec(raw);
 			if (match && match.length === 4) {
 				const settingId = match[2];
 				const rendered = this.render(settingId, match[3]);
 				if (rendered) {
-					html = html.replace(this.codeSettingRegex, rendered);
+					raw = raw.replace(this.codeSettingRegex, rendered);
 				}
 			}
-			return html;
+			return raw;
 		};
 	}
 
diff --git a/src/vs/workbench/contrib/markdown/test/browser/markdownSettingRenderer.test.ts b/src/vs/workbench/contrib/markdown/test/browser/markdownSettingRenderer.test.ts
index 2de1e350b3c..2da36560758 100644
--- a/src/vs/workbench/contrib/markdown/test/browser/markdownSettingRenderer.test.ts
+++ b/src/vs/workbench/contrib/markdown/test/browser/markdownSettingRenderer.test.ts
@@ -79,7 +79,7 @@ suite('Markdown Setting Renderer Test', () => {
 	test('render code setting button with value', () => {
 		const htmlRenderer = settingRenderer.getHtmlRenderer();
 		const htmlNoValue = '<a href="code-oss://settings/example.booleanSetting" codesetting="true">';
-		const renderedHtmlNoValue = htmlRenderer(htmlNoValue);
+		const renderedHtmlNoValue = htmlRenderer({ block: false, raw: htmlNoValue, pre: false, text: '', type: 'html' });
 		assert.strictEqual(renderedHtmlNoValue,
 			`<code tabindex="0"><a href="code-setting://example.booleanSetting/true" class="codesetting" title="View or change setting" aria-role="button"><svg width="14" height="14" viewBox="0 0 15 15" xmlns="http://www.w3.org/2000/svg" fill="currentColor"><path d="M9.1 4.4L8.6 2H7.4l-.5 2.4-.7.3-2-1.3-.9.8 1.3 2-.2.7-2.4.5v1.2l2.4.5.3.8-1.3 2 .8.8 2-1.3.8.3.4 2.3h1.2l.5-2.4.8-.3 2 1.3.8-.8-1.3-2 .3-.8 2.3-.4V7.4l-2.4-.5-.3-.8 1.3-2-.8-.8-2 1.3-.7-.2zM9.4 1l.5 2.4L12 2.1l2 2-1.4 2.1 2.4.4v2.8l-2.4.5L14 12l-2 2-2.1-1.4-.5 2.4H6.6l-.5-2.4L4 13.9l-2-2 1.4-2.1L1 9.4V6.6l2.4-.5L2.1 4l2-2 2.1 1.4.4-2.4h2.8zm.6 7c0 1.1-.9 2-2 2s-2-.9-2-2 .9-2 2-2 2 .9 2 2zM8 9c.6 0 1-.4 1-1s-.4-1-1-1-1 .4-1 1 .4 1 1 1z"/></svg>
 			<span class="separator"></span>
diff --git a/src/vs/workbench/contrib/mergeEditor/browser/view/conflictActions.ts b/src/vs/workbench/contrib/mergeEditor/browser/view/conflictActions.ts
index 8d88a891a5b..3290793d532 100644
--- a/src/vs/workbench/contrib/mergeEditor/browser/view/conflictActions.ts
+++ b/src/vs/workbench/contrib/mergeEditor/browser/view/conflictActions.ts
@@ -54,8 +54,8 @@ export class ConflictActionsFactory extends Disposable {
 			newStyle += `${this._styleClassName} { font-family: var(${fontFamilyVar}), ${EDITOR_FONT_DEFAULTS.fontFamily}}`;
 		}
 		this._styleElement.textContent = newStyle;
-		this._editor.getContainerDomNode().style.setProperty(fontFamilyVar, fontFamily ?? 'inherit');
-		this._editor.getContainerDomNode().style.setProperty(fontFeaturesVar, editorFontInfo.fontFeatureSettings);
+		this._editor.getContainerDomNode().style?.setProperty(fontFamilyVar, fontFamily ?? 'inherit');
+		this._editor.getContainerDomNode().style?.setProperty(fontFeaturesVar, editorFontInfo.fontFeatureSettings);
 	}
 
 	private _getLayoutInfo() {
diff --git a/src/vs/workbench/contrib/mergeEditor/browser/view/fixedZoneWidget.ts b/src/vs/workbench/contrib/mergeEditor/browser/view/fixedZoneWidget.ts
index 3175a1ca927..27a48ee27b9 100644
--- a/src/vs/workbench/contrib/mergeEditor/browser/view/fixedZoneWidget.ts
+++ b/src/vs/workbench/contrib/mergeEditor/browser/view/fixedZoneWidget.ts
@@ -33,6 +33,7 @@ export abstract class FixedZoneWidget extends Disposable {
 			domNode: document.createElement('div'),
 			afterLineNumber: afterLineNumber,
 			heightInPx: height,
+			ordinal: 50000 + 1,
 			onComputedHeight: (height) => {
 				this.widgetDomNode.style.height = `${height}px`;
 			},
diff --git a/src/vs/workbench/contrib/mergeEditor/browser/view/viewModel.ts b/src/vs/workbench/contrib/mergeEditor/browser/view/viewModel.ts
index 1c0f093dc27..2094bfec019 100644
--- a/src/vs/workbench/contrib/mergeEditor/browser/view/viewModel.ts
+++ b/src/vs/workbench/contrib/mergeEditor/browser/view/viewModel.ts
@@ -193,6 +193,7 @@ export class MergeEditorViewModel extends Disposable {
 	): void {
 		this.manuallySetActiveModifiedBaseRange.set({ range: baseRange, counter: this.counter++ }, tx);
 		this.model.setState(baseRange, state, inputNumber, tx);
+		this.lastFocusedEditor.clearCache(tx);
 	}
 
 	private goToConflict(getModifiedBaseRange: (editor: CodeEditorView, curLineNumber: number) => ModifiedBaseRange | undefined): void {
diff --git a/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput.ts b/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput.ts
index 5aafc4bb2f2..dc26b7e6f59 100644
--- a/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput.ts
+++ b/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput.ts
@@ -31,7 +31,7 @@ import { EditorInput, IEditorCloseHandler } from 'vs/workbench/common/editor/edi
 import { MultiDiffEditorIcon } from 'vs/workbench/contrib/multiDiffEditor/browser/icons.contribution';
 import { IMultiDiffSourceResolverService, IResolvedMultiDiffSource, MultiDiffEditorItem } from 'vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService';
 import { IEditorResolverService, RegisteredEditorPriority } from 'vs/workbench/services/editor/common/editorResolverService';
-import { ILanguageSupport, ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
+import { ILanguageSupport, ITextFileEditorModel, ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
 
 export class MultiDiffEditorInput extends EditorInput implements ILanguageSupport {
 	public static fromResourceMultiDiffEditorInput(input: IResourceMultiDiffEditorInput, instantiationService: IInstantiationService): MultiDiffEditorInput {
@@ -174,6 +174,7 @@ export class MultiDiffEditorInput extends EditorInput implements ILanguageSuppor
 				multiDiffEditorItem: r,
 				original: original?.object.textEditorModel,
 				modified: modified?.object.textEditorModel,
+				contextKeys: r.contextKeys,
 				get options() {
 					return {
 						...getReadonlyConfiguration(modified?.object.isReadonly() ?? true),
@@ -233,9 +234,16 @@ export class MultiDiffEditorInput extends EditorInput implements ILanguageSuppor
 	}
 
 	public readonly resources = derived(this, reader => this._resolvedSource.cachedPromiseResult.read(reader)?.data?.resources.read(reader));
+
+	private readonly textFileServiceOnDidChange = new FastEventDispatcher<ITextFileEditorModel, URI>(
+		this._textFileService.files.onDidChangeDirty,
+		item => item.resource.toString(),
+		uri => uri.toString()
+	);
+
 	private readonly _isDirtyObservables = mapObservableArrayCached(this, this.resources.map(r => r ?? []), res => {
-		const isModifiedDirty = res.modifiedUri ? isUriDirty(this._textFileService, res.modifiedUri) : constObservable(false);
-		const isOriginalDirty = res.originalUri ? isUriDirty(this._textFileService, res.originalUri) : constObservable(false);
+		const isModifiedDirty = res.modifiedUri ? isUriDirty(this.textFileServiceOnDidChange, this._textFileService, res.modifiedUri) : constObservable(false);
+		const isOriginalDirty = res.originalUri ? isUriDirty(this.textFileServiceOnDidChange, this._textFileService, res.originalUri) : constObservable(false);
 		return derived(reader => /** @description modifiedDirty||originalDirty */ isModifiedDirty.read(reader) || isOriginalDirty.read(reader));
 	}, i => i.getKey());
 	private readonly _isDirtyObservable = derived(this, reader => this._isDirtyObservables.read(reader).some(isDirty => isDirty.read(reader)))
@@ -290,11 +298,67 @@ export interface IDocumentDiffItemWithMultiDiffEditorItem extends IDocumentDiffI
 	multiDiffEditorItem: MultiDiffEditorItem;
 }
 
-function isUriDirty(textFileService: ITextFileService, uri: URI) {
-	return observableFromEvent(
-		Event.filter(textFileService.files.onDidChangeDirty, e => e.resource.toString() === uri.toString()),
-		() => textFileService.isDirty(uri)
-	);
+/**
+ * Uses a map to efficiently dispatch events to listeners that are interested in a specific key.
+*/
+class FastEventDispatcher<T, TKey> {
+	private _count = 0;
+	private readonly _buckets = new Map<string, Set<(value: T) => void>>();
+
+	private _eventSubscription: IDisposable | undefined;
+
+	constructor(
+		private readonly _event: Event<T>,
+		private readonly _getEventArgsKey: (item: T) => string,
+		private readonly _keyToString: (key: TKey) => string,
+	) {
+	}
+
+	public filteredEvent(filter: TKey): (listener: (e: T) => any) => IDisposable {
+		return listener => {
+			const key = this._keyToString(filter);
+			let bucket = this._buckets.get(key);
+			if (!bucket) {
+				bucket = new Set();
+				this._buckets.set(key, bucket);
+			}
+			bucket.add(listener);
+
+			this._count++;
+			if (this._count === 1) {
+				this._eventSubscription = this._event(this._handleEventChange);
+			}
+
+			return {
+				dispose: () => {
+					bucket!.delete(listener);
+					if (bucket!.size === 0) {
+						this._buckets.delete(key);
+					}
+					this._count--;
+
+					if (this._count === 0) {
+						this._eventSubscription?.dispose();
+						this._eventSubscription = undefined;
+					}
+				}
+			};
+		};
+	}
+
+	private readonly _handleEventChange = (e: T) => {
+		const key = this._getEventArgsKey(e);
+		const bucket = this._buckets.get(key);
+		if (bucket) {
+			for (const listener of bucket) {
+				listener(e);
+			}
+		}
+	};
+}
+
+function isUriDirty(onDidChangeDirty: FastEventDispatcher<ITextFileEditorModel, URI>, textFileService: ITextFileService, uri: URI) {
+	return observableFromEvent(onDidChangeDirty.filteredEvent(uri), () => textFileService.isDirty(uri));
 }
 
 function getReadonlyConfiguration(isReadonly: boolean | IMarkdownString | undefined): { readOnly: boolean; readOnlyMessage: IMarkdownString | undefined } {
diff --git a/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService.ts b/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService.ts
index 44c3da5801d..3fd5aa14d42 100644
--- a/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService.ts
+++ b/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService.ts
@@ -36,6 +36,7 @@ export class MultiDiffEditorItem {
 		readonly originalUri: URI | undefined,
 		readonly modifiedUri: URI | undefined,
 		readonly goToFileUri: URI | undefined,
+		readonly contextKeys?: Record<string, ContextKeyValue>
 	) {
 		if (!originalUri && !modifiedUri) {
 			throw new BugIndicatingError('Invalid arguments');
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/editorStatusBar/editorStatusBar.ts b/src/vs/workbench/contrib/notebook/browser/contrib/editorStatusBar/editorStatusBar.ts
index 197230a61cc..ea1766022d4 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/editorStatusBar/editorStatusBar.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/editorStatusBar/editorStatusBar.ts
@@ -20,8 +20,8 @@ import { NotebookCellsChangeType } from 'vs/workbench/contrib/notebook/common/no
 import { INotebookKernel, INotebookKernelService } from 'vs/workbench/contrib/notebook/common/notebookKernelService';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IStatusbarEntry, IStatusbarEntryAccessor, IStatusbarService, StatusbarAlignment } from 'vs/workbench/services/statusbar/browser/statusbar';
-import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
+import { IEditorGroupsService, IEditorPart } from 'vs/workbench/services/editor/common/editorGroupsService';
+import { Event } from 'vs/base/common/event';
 
 class ImplictKernelSelector implements IDisposable {
 
@@ -340,28 +340,26 @@ export class NotebookEditorStatusContribution extends Disposable implements IWor
 	static readonly ID = 'notebook.contrib.editorStatus';
 
 	constructor(
-		@IInstantiationService instantiationService: IInstantiationService,
-		@IEditorGroupsService editorGroupService: IEditorGroupsService,
-		@IEditorService editorService: IEditorService
+		@IEditorGroupsService private readonly editorGroupService: IEditorGroupsService
 	) {
 		super();
 
-		// Main Editor Status
-		const mainInstantiationService = instantiationService.createChild(new ServiceCollection(
-			[IEditorService, editorService.createScoped('main', this._store)]
-		));
-		this._register(mainInstantiationService.createInstance(KernelStatus));
-		this._register(mainInstantiationService.createInstance(ActiveCellStatus));
-		this._register(mainInstantiationService.createInstance(NotebookIndentationStatus));
-
-		// Auxiliary Editor Status
-		this._register(editorGroupService.onDidCreateAuxiliaryEditorPart(({ part, instantiationService, disposables }) => {
-			disposables.add(instantiationService.createInstance(KernelStatus));
-			disposables.add(instantiationService.createInstance(ActiveCellStatus));
-			disposables.add(instantiationService.createInstance(NotebookIndentationStatus));
-		}));
+		for (const part of editorGroupService.parts) {
+			this.createNotebookStatus(part);
+		}
+
+		this._register(editorGroupService.onDidCreateAuxiliaryEditorPart(part => this.createNotebookStatus(part)));
 	}
-}
 
+	private createNotebookStatus(part: IEditorPart): void {
+		const disposables = new DisposableStore();
+		Event.once(part.onWillDispose)(() => disposables.dispose());
+
+		const scopedInstantiationService = this.editorGroupService.getScopedInstantiationService(part);
+		disposables.add(scopedInstantiationService.createInstance(KernelStatus));
+		disposables.add(scopedInstantiationService.createInstance(ActiveCellStatus));
+		disposables.add(scopedInstantiationService.createInstance(NotebookIndentationStatus));
+	}
+}
 
 registerWorkbenchContribution2(NotebookEditorStatusContribution.ID, NotebookEditorStatusContribution, WorkbenchPhase.AfterRestored);
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/multicursor/notebookMulticursor.ts b/src/vs/workbench/contrib/notebook/browser/contrib/multicursor/notebookMulticursor.ts
new file mode 100644
index 00000000000..1a2621a00c4
--- /dev/null
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/multicursor/notebookMulticursor.ts
@@ -0,0 +1,754 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { localize } from 'vs/nls';
+import { Emitter, Event } from 'vs/base/common/event';
+import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
+import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
+import { ResourceMap } from 'vs/base/common/map';
+import { URI } from 'vs/base/common/uri';
+import { EditorConfiguration } from 'vs/editor/browser/config/editorConfiguration';
+import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
+import { CodeEditorWidget } from 'vs/editor/browser/widget/codeEditor/codeEditorWidget';
+import { IEditorConfiguration } from 'vs/editor/common/config/editorConfiguration';
+import { Position } from 'vs/editor/common/core/position';
+import { Range } from 'vs/editor/common/core/range';
+import { Selection, SelectionDirection } from 'vs/editor/common/core/selection';
+import { IWordAtPosition, USUAL_WORD_SEPARATORS } from 'vs/editor/common/core/wordHelper';
+import { CommandExecutor, CursorsController } from 'vs/editor/common/cursor/cursor';
+import { DeleteOperations } from 'vs/editor/common/cursor/cursorDeleteOperations';
+import { CursorConfiguration, ICursorSimpleModel } from 'vs/editor/common/cursorCommon';
+import { CursorChangeReason } from 'vs/editor/common/cursorEvents';
+import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
+import { IModelDeltaDecoration, ITextModel, PositionAffinity } from 'vs/editor/common/model';
+import { indentOfLine } from 'vs/editor/common/model/textModel';
+import { ITextModelService } from 'vs/editor/common/services/resolverService';
+import { ICoordinatesConverter } from 'vs/editor/common/viewModel';
+import { ViewModelEventsCollector } from 'vs/editor/common/viewModelEventDispatcher';
+import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
+import { MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { ContextKeyExpr, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
+import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
+import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { IPastFutureElements, IUndoRedoElement, IUndoRedoService, UndoRedoElementType } from 'vs/platform/undoRedo/common/undoRedo';
+import { INotebookActionContext, NotebookAction } from 'vs/workbench/contrib/notebook/browser/controller/coreActions';
+import { getNotebookEditorFromEditorPane, ICellViewModel, INotebookEditor, INotebookEditorContribution } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { registerNotebookContribution } from 'vs/workbench/contrib/notebook/browser/notebookEditorExtensions';
+import { CellEditorOptions } from 'vs/workbench/contrib/notebook/browser/view/cellParts/cellEditorOptions';
+import { NOTEBOOK_CELL_EDITOR_FOCUSED, NOTEBOOK_IS_ACTIVE_EDITOR } from 'vs/workbench/contrib/notebook/common/notebookContextKeys';
+import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { RedoCommand, UndoCommand } from 'vs/editor/browser/editorExtensions';
+import { registerWorkbenchContribution2, WorkbenchPhase } from 'vs/workbench/common/contributions';
+
+const NOTEBOOK_ADD_FIND_MATCH_TO_SELECTION_ID = 'notebook.addFindMatchToSelection';
+
+enum NotebookMultiCursorState {
+	Idle,
+	Selecting,
+	Editing,
+}
+
+interface TrackedMatch {
+	cellViewModel: ICellViewModel;
+	initialSelection: Selection;
+	wordSelections: Selection[];
+	config: IEditorConfiguration;
+	decorationIds: string[];
+	undoRedoHistory: IPastFutureElements;
+}
+
+export const NOTEBOOK_MULTI_SELECTION_CONTEXT = {
+	IsNotebookMultiSelect: new RawContextKey<boolean>('isNotebookMultiSelect', false),
+	NotebookMultiSelectState: new RawContextKey<NotebookMultiCursorState>('notebookMultiSelectState', NotebookMultiCursorState.Idle),
+};
+
+export class NotebookMultiCursorController extends Disposable implements INotebookEditorContribution {
+
+	static readonly id: string = 'notebook.multiCursorController';
+
+	private state: NotebookMultiCursorState = NotebookMultiCursorState.Idle;
+
+	private word: string = '';
+	private trackedMatches: TrackedMatch[] = [];
+
+	private readonly _onDidChangeAnchorCell = this._register(new Emitter<void>());
+	readonly onDidChangeAnchorCell: Event<void> = this._onDidChangeAnchorCell.event;
+	private anchorCell: [ICellViewModel, ICodeEditor] | undefined;
+
+	private readonly anchorDisposables = this._register(new DisposableStore());
+	private readonly cursorsDisposables = this._register(new DisposableStore());
+	private cursorsControllers: ResourceMap<CursorsController> = new ResourceMap<CursorsController>();
+
+	private _nbIsMultiSelectSession = NOTEBOOK_MULTI_SELECTION_CONTEXT.IsNotebookMultiSelect.bindTo(this.contextKeyService);
+	private _nbMultiSelectState = NOTEBOOK_MULTI_SELECTION_CONTEXT.NotebookMultiSelectState.bindTo(this.contextKeyService);
+
+
+	constructor(
+		private readonly notebookEditor: INotebookEditor,
+		@IContextKeyService private readonly contextKeyService: IContextKeyService,
+		@ITextModelService private readonly textModelService: ITextModelService,
+		@ILanguageConfigurationService private readonly languageConfigurationService: ILanguageConfigurationService,
+		@IAccessibilityService private readonly accessibilityService: IAccessibilityService,
+		@IConfigurationService private readonly configurationService: IConfigurationService,
+		@IUndoRedoService private readonly undoRedoService: IUndoRedoService,
+	) {
+		super();
+
+		if (!this.configurationService.getValue<boolean>('notebook.multiSelect.enabled')) {
+			return;
+		}
+
+		this.anchorCell = this.notebookEditor.activeCellAndCodeEditor;
+
+		// anchor cell will catch and relay all type, cut, paste events to the cursors controllers
+		// need to create new controllers when the anchor cell changes, then update their listeners
+		// ** cursor controllers need to happen first, because anchor listeners relay to them
+		this._register(this.onDidChangeAnchorCell(() => {
+			this.updateCursorsControllers();
+			this.updateAnchorListeners();
+		}));
+	}
+
+	private updateCursorsControllers() {
+		this.cursorsDisposables.clear();
+		this.trackedMatches.forEach(async match => {
+			const textModelRef = await this.textModelService.createModelReference(match.cellViewModel.uri);
+			const textModel = textModelRef.object.textEditorModel;
+			if (!textModel) {
+				return;
+			}
+
+			const cursorSimpleModel = this.constructCursorSimpleModel(match.cellViewModel);
+			const converter = this.constructCoordinatesConverter();
+			const editorConfig = match.config;
+
+			const controller = this.cursorsDisposables.add(new CursorsController(
+				textModel,
+				cursorSimpleModel,
+				converter,
+				new CursorConfiguration(textModel.getLanguageId(), textModel.getOptions(), editorConfig, this.languageConfigurationService)
+			));
+			controller.setSelections(new ViewModelEventsCollector(), undefined, match.wordSelections, CursorChangeReason.Explicit);
+			this.cursorsControllers.set(match.cellViewModel.uri, controller);
+		});
+	}
+
+	private constructCoordinatesConverter(): ICoordinatesConverter {
+		return {
+			convertViewPositionToModelPosition(viewPosition: Position): Position {
+				return viewPosition;
+			},
+			convertViewRangeToModelRange(viewRange: Range): Range {
+				return viewRange;
+			},
+			validateViewPosition(viewPosition: Position, expectedModelPosition: Position): Position {
+				return viewPosition;
+			},
+			validateViewRange(viewRange: Range, expectedModelRange: Range): Range {
+				return viewRange;
+			},
+			convertModelPositionToViewPosition(modelPosition: Position, affinity?: PositionAffinity, allowZeroLineNumber?: boolean, belowHiddenRanges?: boolean): Position {
+				return modelPosition;
+			},
+			convertModelRangeToViewRange(modelRange: Range, affinity?: PositionAffinity): Range {
+				return modelRange;
+			},
+			modelPositionIsVisible(modelPosition: Position): boolean {
+				return true;
+			},
+			getModelLineViewLineCount(modelLineNumber: number): number {
+				return 1;
+			},
+			getViewLineNumberOfModelPosition(modelLineNumber: number, modelColumn: number): number {
+				return modelLineNumber;
+			}
+		};
+	}
+
+	private constructCursorSimpleModel(cell: ICellViewModel): ICursorSimpleModel {
+		return {
+			getLineCount(): number {
+				return cell.textBuffer.getLineCount();
+			},
+			getLineContent(lineNumber: number): string {
+				return cell.textBuffer.getLineContent(lineNumber);
+			},
+			getLineMinColumn(lineNumber: number): number {
+				return cell.textBuffer.getLineMinColumn(lineNumber);
+			},
+			getLineMaxColumn(lineNumber: number): number {
+				return cell.textBuffer.getLineMaxColumn(lineNumber);
+			},
+			getLineFirstNonWhitespaceColumn(lineNumber: number): number {
+				return cell.textBuffer.getLineFirstNonWhitespaceColumn(lineNumber);
+			},
+			getLineLastNonWhitespaceColumn(lineNumber: number): number {
+				return cell.textBuffer.getLineLastNonWhitespaceColumn(lineNumber);
+			},
+			normalizePosition(position: Position, affinity: PositionAffinity): Position {
+				return position;
+			},
+			getLineIndentColumn(lineNumber: number): number {
+				return indentOfLine(cell.textBuffer.getLineContent(lineNumber)) + 1;
+			}
+		};
+	}
+
+	private updateAnchorListeners() {
+		this.anchorDisposables.clear();
+
+		if (!this.anchorCell) {
+			throw new Error('Anchor cell is undefined');
+		}
+
+		// typing
+		this.anchorDisposables.add(this.anchorCell[1].onWillType((input) => {
+			const collector = new ViewModelEventsCollector();
+			this.trackedMatches.forEach(match => {
+				const controller = this.cursorsControllers.get(match.cellViewModel.uri);
+				if (!controller) {
+					// should not happen
+					return;
+				}
+				if (match.cellViewModel.handle !== this.anchorCell?.[0].handle) { // don't relay to active cell, already has a controller for typing
+					controller.type(collector, input, 'keyboard');
+				}
+			});
+		}));
+
+		this.anchorDisposables.add(this.anchorCell[1].onDidType(() => {
+			this.state = NotebookMultiCursorState.Editing; // typing will continue to work as normal across ranges, just preps for another cmd+d
+			this._nbMultiSelectState.set(NotebookMultiCursorState.Editing);
+
+			const anchorController = this.cursorsControllers.get(this.anchorCell![0].uri);
+			if (!anchorController) {
+				return;
+			}
+			const activeSelections = this.notebookEditor.activeCodeEditor?.getSelections();
+			if (!activeSelections) {
+				return;
+			}
+
+			// need to keep anchor cursor controller in sync manually (for delete usage), since we don't relay type event to it
+			anchorController.setSelections(new ViewModelEventsCollector(), 'keyboard', activeSelections, CursorChangeReason.Explicit);
+
+			this.trackedMatches.forEach(match => {
+				const controller = this.cursorsControllers.get(match.cellViewModel.uri);
+				if (!controller) {
+					return;
+				}
+
+				// this is used upon exiting the multicursor session to set the selections back to the correct cursor state
+				match.initialSelection = controller.getSelection();
+				// clear tracked selection data as it is invalid once typing begins
+				match.wordSelections = [];
+			});
+
+			this.updateLazyDecorations();
+		}));
+
+		// exit mode
+		this.anchorDisposables.add(this.anchorCell[1].onDidChangeCursorSelection((e) => {
+			if (e.source === 'mouse' || e.source === 'deleteRight') {
+				this.resetToIdleState();
+			}
+		}));
+
+		this.anchorDisposables.add(this.anchorCell[1].onDidBlurEditorWidget(() => {
+			if (this.state === NotebookMultiCursorState.Selecting || this.state === NotebookMultiCursorState.Editing) {
+				this.resetToIdleState();
+			}
+		}));
+	}
+
+	private updateFinalUndoRedo() {
+		const anchorCellModel = this.anchorCell?.[1].getModel();
+		if (!anchorCellModel) {
+			// should not happen
+			return;
+		}
+
+		const newElementsMap: ResourceMap<IUndoRedoElement[]> = new ResourceMap<IUndoRedoElement[]>();
+		const resources: URI[] = [];
+
+		this.trackedMatches.forEach(trackedMatch => {
+			const undoRedoState = trackedMatch.undoRedoHistory;
+			if (!undoRedoState) {
+				return;
+			}
+
+			resources.push(trackedMatch.cellViewModel.uri);
+
+			const currentPastElements = this.undoRedoService.getElements(trackedMatch.cellViewModel.uri).past.slice();
+			const oldPastElements = trackedMatch.undoRedoHistory.past.slice();
+			const newElements = currentPastElements.slice(oldPastElements.length);
+			if (newElements.length === 0) {
+				return;
+			}
+
+			newElementsMap.set(trackedMatch.cellViewModel.uri, newElements);
+
+			this.undoRedoService.removeElements(trackedMatch.cellViewModel.uri);
+			oldPastElements.forEach(element => {
+				this.undoRedoService.pushElement(element);
+			});
+		});
+
+		this.undoRedoService.pushElement({
+			type: UndoRedoElementType.Workspace,
+			resources: resources,
+			label: 'Multi Cursor Edit',
+			code: 'multiCursorEdit',
+			confirmBeforeUndo: false,
+			undo: async () => {
+				newElementsMap.forEach(async value => {
+					value.reverse().forEach(async element => {
+						await element.undo();
+					});
+				});
+			},
+			redo: async () => {
+				newElementsMap.forEach(async value => {
+					value.forEach(async element => {
+						await element.redo();
+					});
+				});
+			}
+		});
+	}
+
+	public resetToIdleState() {
+		this.state = NotebookMultiCursorState.Idle;
+		this._nbMultiSelectState.set(NotebookMultiCursorState.Idle);
+		this._nbIsMultiSelectSession.set(false);
+		this.updateFinalUndoRedo();
+
+		this.trackedMatches.forEach(match => {
+			this.clearDecorations(match);
+			match.cellViewModel.setSelections([match.initialSelection]); // correct cursor placement upon exiting cmd-d session
+		});
+
+		this.anchorDisposables.clear();
+		this.cursorsDisposables.clear();
+		this.cursorsControllers.clear();
+		this.trackedMatches = [];
+	}
+
+	public async findAndTrackNextSelection(cell: ICellViewModel): Promise<void> {
+		if (this.state === NotebookMultiCursorState.Idle) { // move cursor to end of the symbol + track it, transition to selecting state
+			const textModel = cell.textModel;
+			if (!textModel) {
+				return;
+			}
+
+			const inputSelection = cell.getSelections()[0];
+			const word = this.getWord(inputSelection, textModel);
+			if (!word) {
+				return;
+			}
+			this.word = word.word;
+
+			const newSelection = new Selection(
+				inputSelection.startLineNumber,
+				word.startColumn,
+				inputSelection.startLineNumber,
+				word.endColumn
+			);
+			cell.setSelections([newSelection]);
+
+			this.anchorCell = this.notebookEditor.activeCellAndCodeEditor;
+			if (!this.anchorCell || this.anchorCell[0].handle !== cell.handle) {
+				throw new Error('Active cell is not the same as the cell passed as context');
+			}
+			if (!(this.anchorCell[1] instanceof CodeEditorWidget)) {
+				throw new Error('Active cell is not an instance of CodeEditorWidget');
+			}
+
+			textModel.pushStackElement();
+
+			this.trackedMatches = [];
+			const editorConfig = this.constructCellEditorOptions(this.anchorCell[0]);
+			const newMatch: TrackedMatch = {
+				cellViewModel: cell,
+				initialSelection: inputSelection,
+				wordSelections: [newSelection],
+				config: editorConfig, // cache this in the match so we can create new cursors controllers with the correct language config
+				decorationIds: [],
+				undoRedoHistory: this.undoRedoService.getElements(cell.uri)
+			};
+			this.trackedMatches.push(newMatch);
+
+			this.initializeMultiSelectDecorations(newMatch);
+			this._nbIsMultiSelectSession.set(true);
+			this.state = NotebookMultiCursorState.Selecting;
+			this._nbMultiSelectState.set(NotebookMultiCursorState.Selecting);
+			this._onDidChangeAnchorCell.fire();
+
+		} else if (this.state === NotebookMultiCursorState.Selecting) { // use the word we stored from idle state transition to find next match, track it
+			const notebookTextModel = this.notebookEditor.textModel;
+			if (!notebookTextModel) {
+				return;
+			}
+
+			const index = this.notebookEditor.getCellIndex(cell);
+			if (index === undefined) {
+				return;
+			}
+
+			const findResult = notebookTextModel.findNextMatch(
+				this.word,
+				{ cellIndex: index, position: cell.getSelections()[cell.getSelections().length - 1].getEndPosition() },
+				false,
+				true,
+				USUAL_WORD_SEPARATORS //! might want to get these from the editor config
+			);
+			if (!findResult) {
+				return; //todo: some sort of message to the user alerting them that there are no more matches? editor does not do this
+			}
+
+			const resultCellViewModel = this.notebookEditor.getCellByHandle(findResult.cell.handle);
+			if (!resultCellViewModel) {
+				return;
+			}
+
+			let newMatch: TrackedMatch;
+			if (findResult.cell.handle !== cell.handle) { // result is in a different cell, move focus there and apply selection, then update anchor
+				await this.notebookEditor.revealRangeInViewAsync(resultCellViewModel, findResult.match.range);
+				this.notebookEditor.focusNotebookCell(resultCellViewModel, 'editor');
+
+				const initialSelection = resultCellViewModel.getSelections()[0];
+				const newSelection = Selection.fromRange(findResult.match.range, SelectionDirection.LTR);
+				resultCellViewModel.setSelections([newSelection]);
+
+				this.anchorCell = this.notebookEditor.activeCellAndCodeEditor;
+				if (!this.anchorCell || !(this.anchorCell[1] instanceof CodeEditorWidget)) {
+					throw new Error('Active cell is not an instance of CodeEditorWidget');
+				}
+
+				const textModel = await resultCellViewModel.resolveTextModel();
+				textModel.pushStackElement();
+
+				newMatch = {
+					cellViewModel: resultCellViewModel,
+					initialSelection: initialSelection,
+					wordSelections: [newSelection],
+					config: this.constructCellEditorOptions(this.anchorCell[0]),
+					decorationIds: [],
+					undoRedoHistory: this.undoRedoService.getElements(resultCellViewModel.uri)
+				} satisfies TrackedMatch;
+				this.trackedMatches.push(newMatch);
+
+				this._onDidChangeAnchorCell.fire();
+
+			} else { // match is in the same cell, find tracked entry, update and set selections
+				newMatch = this.trackedMatches.find(match => match.cellViewModel.handle === findResult.cell.handle)!;
+				newMatch.wordSelections.push(Selection.fromRange(findResult.match.range, SelectionDirection.LTR));
+				resultCellViewModel.setSelections(newMatch.wordSelections);
+			}
+
+			this.initializeMultiSelectDecorations(newMatch);
+		}
+	}
+
+	public async deleteLeft(): Promise<void> {
+		this.trackedMatches.forEach(match => {
+			const controller = this.cursorsControllers.get(match.cellViewModel.uri);
+			if (!controller) {
+				// should not happen
+				return;
+			}
+
+			const [, commands] = DeleteOperations.deleteLeft(
+				controller.getPrevEditOperationType(),
+				controller.context.cursorConfig,
+				controller.context.model,
+				controller.getSelections(),
+				controller.getAutoClosedCharacters(),
+			);
+
+			const delSelections = CommandExecutor.executeCommands(controller.context.model, controller.getSelections(), commands);
+			if (!delSelections) {
+				return;
+			}
+			controller.setSelections(new ViewModelEventsCollector(), undefined, delSelections, CursorChangeReason.Explicit);
+		});
+	}
+
+	async undo() {
+		const models: ITextModel[] = [];
+		for (const match of this.trackedMatches) {
+			const model = await match.cellViewModel.resolveTextModel();
+			if (model) {
+				models.push(model);
+			}
+		}
+
+		await Promise.all(models.map(model => model.undo()));
+	}
+
+	async redo() {
+		const models: ITextModel[] = [];
+		for (const match of this.trackedMatches) {
+			const model = await match.cellViewModel.resolveTextModel();
+			if (model) {
+				models.push(model);
+			}
+		}
+
+		await Promise.all(models.map(model => model.redo()));
+	}
+
+	private constructCellEditorOptions(cell: ICellViewModel): EditorConfiguration {
+		const cellEditorOptions = new CellEditorOptions(this.notebookEditor.getBaseCellEditorOptions(cell.language), this.notebookEditor.notebookOptions, this.configurationService);
+		const options = cellEditorOptions.getUpdatedValue(cell.internalMetadata, cell.uri);
+		return new EditorConfiguration(false, MenuId.EditorContent, options, null, this.accessibilityService);
+	}
+
+	/**
+	 * Updates the multicursor selection decorations for a specific matched cell
+	 *
+	 * @param match -- match object containing the viewmodel + selections
+	 */
+	private initializeMultiSelectDecorations(match: TrackedMatch) {
+		const decorations: IModelDeltaDecoration[] = [];
+
+		match.wordSelections.forEach(selection => {
+			decorations.push({
+				range: selection,
+				options: {
+					description: '',
+					className: 'nb-multicursor-selection',
+				}
+			});
+		});
+
+		match.decorationIds = match.cellViewModel.deltaModelDecorations(
+			match.decorationIds,
+			decorations
+		);
+	}
+
+	private updateLazyDecorations() {
+		// for every tracked match that is not in the visible range, dispose of their decorations and update them based off the cursorcontroller
+		this.trackedMatches.forEach(match => {
+			const cellIndex = this.notebookEditor.getCellIndex(match.cellViewModel);
+			if (cellIndex === undefined) {
+				return;
+			}
+
+			const controller = this.cursorsControllers.get(match.cellViewModel.uri);
+			if (!controller) {
+				// should not happen
+				return;
+			}
+			const selections = controller.getSelections();
+
+
+			const newDecorations = selections?.map(selection => {
+				return {
+					range: selection,
+					options: {
+						description: '',
+						className: 'nb-multicursor-selection',
+					}
+				};
+			});
+
+			match.decorationIds = match.cellViewModel.deltaModelDecorations(
+				match.decorationIds,
+				newDecorations ?? []
+			);
+		});
+	}
+
+	private clearDecorations(match: TrackedMatch) {
+		match.decorationIds = match.cellViewModel.deltaModelDecorations(
+			match.decorationIds,
+			[]
+		);
+	}
+
+	private getWord(selection: Selection, model: ITextModel): IWordAtPosition | null {
+		const lineNumber = selection.startLineNumber;
+		const startColumn = selection.startColumn;
+
+		if (model.isDisposed()) {
+			return null;
+		}
+
+		return model.getWordAtPosition({
+			lineNumber: lineNumber,
+			column: startColumn
+		});
+	}
+
+	override dispose(): void {
+		super.dispose();
+		this.anchorDisposables.dispose();
+		this.cursorsDisposables.dispose();
+
+		this.trackedMatches.forEach(match => {
+			this.clearDecorations(match);
+		});
+		this.trackedMatches = [];
+	}
+
+}
+
+class NotebookAddMatchToMultiSelectionAction extends NotebookAction {
+	constructor() {
+		super({
+			id: NOTEBOOK_ADD_FIND_MATCH_TO_SELECTION_ID,
+			title: localize('addFindMatchToSelection', "Add Find Match to Selection"),
+			keybinding: {
+				when: ContextKeyExpr.and(
+					ContextKeyExpr.equals('config.notebook.multiSelect.enabled', true),
+					NOTEBOOK_IS_ACTIVE_EDITOR,
+					NOTEBOOK_CELL_EDITOR_FOCUSED,
+				),
+				primary: KeyMod.CtrlCmd | KeyCode.KeyD,
+				weight: KeybindingWeight.WorkbenchContrib
+			}
+		});
+	}
+
+	override async runWithContext(accessor: ServicesAccessor, context: INotebookActionContext): Promise<void> {
+		const editorService = accessor.get(IEditorService);
+		const editor = getNotebookEditorFromEditorPane(editorService.activeEditorPane);
+
+		if (!editor) {
+			return;
+		}
+
+		if (!context.cell) {
+			return;
+		}
+
+		const controller = editor.getContribution<NotebookMultiCursorController>(NotebookMultiCursorController.id);
+		controller.findAndTrackNextSelection(context.cell);
+	}
+}
+
+class NotebookExitMultiSelectionAction extends NotebookAction {
+	constructor() {
+		super({
+			id: 'noteMultiCursor.exit',
+			title: localize('exitMultiSelection', "Exit Multi Cursor Mode"),
+			keybinding: {
+				when: ContextKeyExpr.and(
+					ContextKeyExpr.equals('config.notebook.multiSelect.enabled', true),
+					NOTEBOOK_IS_ACTIVE_EDITOR,
+					NOTEBOOK_MULTI_SELECTION_CONTEXT.IsNotebookMultiSelect,
+				),
+				primary: KeyCode.Escape,
+				weight: KeybindingWeight.WorkbenchContrib
+			}
+		});
+	}
+
+	override async runWithContext(accessor: ServicesAccessor, context: INotebookActionContext): Promise<void> {
+		const editorService = accessor.get(IEditorService);
+		const editor = getNotebookEditorFromEditorPane(editorService.activeEditorPane);
+
+		if (!editor) {
+			return;
+		}
+
+		const controller = editor.getContribution<NotebookMultiCursorController>(NotebookMultiCursorController.id);
+		controller.resetToIdleState();
+	}
+}
+
+class NotebookDeleteLeftMultiSelectionAction extends NotebookAction {
+	constructor() {
+		super({
+			id: 'noteMultiCursor.deleteLeft',
+			title: localize('deleteLeftMultiSelection', "Delete Left"),
+			keybinding: {
+				when: ContextKeyExpr.and(
+					ContextKeyExpr.equals('config.notebook.multiSelect.enabled', true),
+					NOTEBOOK_IS_ACTIVE_EDITOR,
+					NOTEBOOK_MULTI_SELECTION_CONTEXT.IsNotebookMultiSelect,
+					ContextKeyExpr.or(
+						NOTEBOOK_MULTI_SELECTION_CONTEXT.NotebookMultiSelectState.isEqualTo(NotebookMultiCursorState.Selecting),
+						NOTEBOOK_MULTI_SELECTION_CONTEXT.NotebookMultiSelectState.isEqualTo(NotebookMultiCursorState.Editing)
+					)
+				),
+				primary: KeyCode.Backspace,
+				weight: KeybindingWeight.WorkbenchContrib
+			}
+		});
+	}
+
+	override async runWithContext(accessor: ServicesAccessor, context: INotebookActionContext): Promise<void> {
+		const editorService = accessor.get(IEditorService);
+		const editor = getNotebookEditorFromEditorPane(editorService.activeEditorPane);
+
+		if (!editor) {
+			return;
+		}
+
+		const controller = editor.getContribution<NotebookMultiCursorController>(NotebookMultiCursorController.id);
+		controller.deleteLeft();
+	}
+}
+
+class NotebookMultiCursorUndoRedoContribution extends Disposable {
+
+	static readonly ID = 'workbench.contrib.notebook.multiCursorUndoRedo';
+
+	constructor(@IEditorService private readonly _editorService: IEditorService, @IConfigurationService private readonly configurationService: IConfigurationService) {
+		super();
+
+		if (!this.configurationService.getValue<boolean>('notebook.multiSelect.enabled')) {
+			return;
+		}
+
+		const PRIORITY = 10005;
+		this._register(UndoCommand.addImplementation(PRIORITY, 'notebook-multicursor-undo-redo', () => {
+			const editor = getNotebookEditorFromEditorPane(this._editorService.activeEditorPane);
+			if (!editor) {
+				return false;
+			}
+
+			if (!editor.hasModel()) {
+				return false;
+			}
+
+			const controller = editor.getContribution<NotebookMultiCursorController>(NotebookMultiCursorController.id);
+
+			return controller.undo();
+		}, ContextKeyExpr.and(
+			ContextKeyExpr.equals('config.notebook.multiSelect.enabled', true),
+			NOTEBOOK_IS_ACTIVE_EDITOR,
+			NOTEBOOK_MULTI_SELECTION_CONTEXT.IsNotebookMultiSelect,
+		)));
+
+		this._register(RedoCommand.addImplementation(PRIORITY, 'notebook-multicursor-undo-redo', () => {
+			const editor = getNotebookEditorFromEditorPane(this._editorService.activeEditorPane);
+			if (!editor) {
+				return false;
+			}
+
+			if (!editor.hasModel()) {
+				return false;
+			}
+
+			const controller = editor.getContribution<NotebookMultiCursorController>(NotebookMultiCursorController.id);
+			return controller.redo();
+		}, ContextKeyExpr.and(
+			ContextKeyExpr.equals('config.notebook.multiSelect.enabled', true),
+			NOTEBOOK_IS_ACTIVE_EDITOR,
+			NOTEBOOK_MULTI_SELECTION_CONTEXT.IsNotebookMultiSelect,
+		)));
+	}
+}
+
+registerNotebookContribution(NotebookMultiCursorController.id, NotebookMultiCursorController);
+registerAction2(NotebookAddMatchToMultiSelectionAction);
+registerAction2(NotebookExitMultiSelectionAction);
+registerAction2(NotebookDeleteLeftMultiSelectionAction);
+registerWorkbenchContribution2(NotebookMultiCursorUndoRedoContribution.ID, NotebookMultiCursorUndoRedoContribution, WorkbenchPhase.BlockRestore);
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariablesTree.ts b/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariablesTree.ts
index 01c0e2b2d4b..3992e68a5b4 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariablesTree.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariablesTree.ts
@@ -66,10 +66,9 @@ export class NotebookVariableRenderer implements ITreeRenderer<INotebookVariable
 		data.name.textContent = text;
 		data.name.title = element.element.type ?? '';
 
-		renderExpressionValue(element.element, data.value, {
+		renderExpressionValue(data.elementDisposables, element.element, data.value, {
 			colorize: true,
-			hover: data.elementDisposables,
-			maxValueLength: MAX_VALUE_RENDER_LENGTH_IN_VIEWLET
+			maxValueLength: MAX_VALUE_RENDER_LENGTH_IN_VIEWLET,
 		}, this._hoverService);
 	}
 
diff --git a/src/vs/workbench/contrib/notebook/browser/controller/cellOperations.ts b/src/vs/workbench/contrib/notebook/browser/controller/cellOperations.ts
index 64c90739dea..e9a7569377b 100644
--- a/src/vs/workbench/contrib/notebook/browser/controller/cellOperations.ts
+++ b/src/vs/workbench/contrib/notebook/browser/controller/cellOperations.ts
@@ -184,7 +184,7 @@ export function runDeleteAction(editor: IActiveNotebookEditor, cell: ICellViewMo
 	}
 }
 
-export async function moveCellRange(context: INotebookCellActionContext, direction: 'up' | 'down'): Promise<void> {
+export async function moveCellRange(context: INotebookActionContext, direction: 'up' | 'down'): Promise<void> {
 	if (!context.notebookEditor.hasModel()) {
 		return;
 	}
@@ -195,9 +195,17 @@ export async function moveCellRange(context: INotebookCellActionContext, directi
 		return;
 	}
 
-	const selections = editor.getSelections();
-	const modelRanges = expandCellRangesWithHiddenCells(editor, selections);
-	const range = modelRanges[0];
+	let range: ICellRange | undefined = undefined;
+
+	if (context.cell) {
+		const idx = editor.getCellIndex(context.cell);
+		range = { start: idx, end: idx + 1 };
+	} else {
+		const selections = editor.getSelections();
+		const modelRanges = expandCellRangesWithHiddenCells(editor, selections);
+		range = modelRanges[0];
+	}
+
 	if (!range || range.start === range.end) {
 		return;
 	}
diff --git a/src/vs/workbench/contrib/notebook/browser/controller/editActions.ts b/src/vs/workbench/contrib/notebook/browser/controller/editActions.ts
index 5fde252d052..defeb5124b8 100644
--- a/src/vs/workbench/contrib/notebook/browser/controller/editActions.ts
+++ b/src/vs/workbench/contrib/notebook/browser/controller/editActions.ts
@@ -7,12 +7,12 @@ import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
 import { Mimes } from 'vs/base/common/mime';
 import { URI } from 'vs/base/common/uri';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorOption } from 'vs/editor/common/config/editorOptions';
 import { Selection } from 'vs/editor/common/core/selection';
-import { ICommand } from 'vs/editor/common/editorCommon';
+import { CommandExecutor } from 'vs/editor/common/cursor/cursor';
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
 import { ILanguageService } from 'vs/editor/common/languages/language';
 import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
+import { TrackedRangeStickiness } from 'vs/editor/common/model';
 import { getIconClasses } from 'vs/editor/common/services/getIconClasses';
 import { IModelService } from 'vs/editor/common/services/model';
 import { LineCommentCommand, Type } from 'vs/editor/contrib/comment/browser/lineCommentCommand';
@@ -646,44 +646,35 @@ registerAction2(class CommentSelectedCellsAction extends NotebookMultiCellAction
 	async runWithContext(accessor: ServicesAccessor, context: INotebookCommandContext): Promise<void> {
 		const languageConfigurationService = accessor.get(ILanguageConfigurationService);
 
-		const selectedCellEditors: ICodeEditor[] = [];
-		context.selectedCells.forEach(cell => {
-			const findContext = { notebookEditor: context.notebookEditor, cell };
-			const foundEditor = findTargetCellEditor(findContext, cell);
-			if (foundEditor) {
-				selectedCellEditors.push(foundEditor);
-			}
-		});
-
-
-		selectedCellEditors.forEach(editor => {
-			if (!editor.hasModel()) {
-				return;
-			}
+		context.selectedCells.forEach(async cellViewModel => {
+			const textModel = await cellViewModel.resolveTextModel();
 
-			const model = editor.getModel();
-			const commands: ICommand[] = [];
-			const modelOptions = model.getOptions();
-			const commentsOptions = editor.getOption(EditorOption.comments);
-
-			const selection = editor.getSelection();
-
-			commands.push(new LineCommentCommand(
+			const commentsOptions = cellViewModel.commentOptions;
+			const cellCommentCommand = new LineCommentCommand(
 				languageConfigurationService,
-				new Selection(1, 1, model.getLineCount(), model.getLineMaxColumn(model.getLineCount())),
-				modelOptions.indentSize,
+				new Selection(1, 1, textModel.getLineCount(), textModel.getLineMaxColumn(textModel.getLineCount())), // comment the entire cell
+				textModel.getOptions().tabSize,
 				Type.Toggle,
-				commentsOptions.insertSpace,
-				commentsOptions.ignoreEmptyLines,
+				commentsOptions.insertSpace ?? true,
+				commentsOptions.ignoreEmptyLines ?? true,
 				false
-			));
+			);
+
+			// store any selections that are in the cell, allows them to be shifted by comments and preserved
+			const cellEditorSelections = cellViewModel.getSelections();
+			const initialTrackedRangesIDs: string[] = cellEditorSelections.map(selection => {
+				return textModel._setTrackedRange(null, selection, TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges);
+			});
 
-			editor.pushUndoStop();
-			editor.executeCommands(COMMENT_SELECTED_CELLS_ID, commands);
-			editor.pushUndoStop();
+			CommandExecutor.executeCommands(textModel, cellEditorSelections, [cellCommentCommand]);
 
-			editor.setSelection(selection);
-		});
+			const newTrackedSelections = initialTrackedRangesIDs.map(i => {
+				return textModel._getTrackedRange(i);
+			}).filter(r => !!r).map((range,) => {
+				return new Selection(range.startLineNumber, range.startColumn, range.endLineNumber, range.endColumn);
+			});
+			cellViewModel.setSelections(newTrackedSelections ?? []);
+		}); // end of cells forEach
 	}
 
 });
diff --git a/src/vs/workbench/contrib/notebook/browser/controller/layoutActions.ts b/src/vs/workbench/contrib/notebook/browser/controller/layoutActions.ts
index 19f30d4185f..db602591cd3 100644
--- a/src/vs/workbench/contrib/notebook/browser/controller/layoutActions.ts
+++ b/src/vs/workbench/contrib/notebook/browser/controller/layoutActions.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Codicon } from 'vs/base/common/codicons';
+import { DisposableStore } from 'vs/base/common/lifecycle';
 import { URI, UriComponents } from 'vs/base/common/uri';
 import { localize, localize2 } from 'vs/nls';
 import { Categories } from 'vs/platform/action/common/actionCommonCategories';
@@ -191,22 +192,23 @@ registerAction2(class SaveMimeTypeDisplayOrder extends Action2 {
 
 	run(accessor: ServicesAccessor) {
 		const service = accessor.get(INotebookService);
-		const qp = accessor.get(IQuickInputService).createQuickPick<IQuickPickItem & { target: ConfigurationTarget }>();
+		const disposables = new DisposableStore();
+		const qp = disposables.add(accessor.get(IQuickInputService).createQuickPick<IQuickPickItem & { target: ConfigurationTarget }>());
 		qp.placeholder = localize('notebook.placeholder', 'Settings file to save in');
 		qp.items = [
 			{ target: ConfigurationTarget.USER, label: localize('saveTarget.machine', 'User Settings') },
 			{ target: ConfigurationTarget.WORKSPACE, label: localize('saveTarget.workspace', 'Workspace Settings') },
 		];
 
-		qp.onDidAccept(() => {
+		disposables.add(qp.onDidAccept(() => {
 			const target = qp.selectedItems[0]?.target;
 			if (target !== undefined) {
 				service.saveMimeDisplayOrder(target);
 			}
 			qp.dispose();
-		});
+		}));
 
-		qp.onDidHide(() => qp.dispose());
+		disposables.add(qp.onDidHide(() => disposables.dispose()));
 
 		qp.show();
 	}
diff --git a/src/vs/workbench/contrib/notebook/browser/diff/diffCellEditorOptions.ts b/src/vs/workbench/contrib/notebook/browser/diff/diffCellEditorOptions.ts
index c2b1d9cf252..1e6544b55ca 100644
--- a/src/vs/workbench/contrib/notebook/browser/diff/diffCellEditorOptions.ts
+++ b/src/vs/workbench/contrib/notebook/browser/diff/diffCellEditorOptions.ts
@@ -6,6 +6,14 @@
 import { IDiffEditorConstructionOptions } from 'vs/editor/browser/editorBrowser';
 import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
 
+/**
+ * Do not leave at 12, when at 12 and we have whitespace and only one line,
+ * then there's not enough space for the button `Show Whitespace Differences`
+ */
+export const fixedEditorPaddingSingleLineCells = {
+	top: 24,
+	bottom: 24
+};
 export const fixedEditorPadding = {
 	top: 12,
 	bottom: 12
@@ -29,8 +37,7 @@ export const fixedEditorOptions: IEditorOptions = {
 	selectOnLineNumbers: false,
 	wordWrap: 'off',
 	lineNumbers: 'off',
-	lineDecorationsWidth: 0,
-	glyphMargin: false,
+	glyphMargin: true,
 	fixedOverflowWidgets: true,
 	minimap: { enabled: false },
 	renderValidationDecorations: 'on',
diff --git a/src/vs/workbench/contrib/notebook/browser/diff/diffComponents.ts b/src/vs/workbench/contrib/notebook/browser/diff/diffComponents.ts
index 263d08b0c14..a8f2c46ccef 100644
--- a/src/vs/workbench/contrib/notebook/browser/diff/diffComponents.ts
+++ b/src/vs/workbench/contrib/notebook/browser/diff/diffComponents.ts
@@ -7,8 +7,8 @@ import * as DOM from 'vs/base/browser/dom';
 import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
 import { Schemas } from 'vs/base/common/network';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { DiffElementViewModelBase, getFormattedMetadataJSON, getFormattedOutputJSON, OutputComparison, outputEqual, OUTPUT_EDITOR_HEIGHT_MAGIC, PropertyFoldingState, SideBySideDiffElementViewModel, SingleSideDiffElementViewModel } from 'vs/workbench/contrib/notebook/browser/diff/diffElementViewModel';
-import { CellDiffSideBySideRenderTemplate, CellDiffSingleSideRenderTemplate, DiffSide, DIFF_CELL_MARGIN, INotebookTextDiffEditor, NOTEBOOK_DIFF_CELL_INPUT, NOTEBOOK_DIFF_CELL_PROPERTY, NOTEBOOK_DIFF_CELL_PROPERTY_EXPANDED } from 'vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser';
+import { DiffElementCellViewModelBase, getFormattedMetadataJSON, getFormattedOutputJSON, OutputComparison, outputEqual, OUTPUT_EDITOR_HEIGHT_MAGIC, PropertyFoldingState, SideBySideDiffElementViewModel, SingleSideDiffElementViewModel, DiffElementPlaceholderViewModel } from 'vs/workbench/contrib/notebook/browser/diff/diffElementViewModel';
+import { CellDiffSideBySideRenderTemplate, CellDiffSingleSideRenderTemplate, DiffSide, DIFF_CELL_MARGIN, INotebookTextDiffEditor, NOTEBOOK_DIFF_CELL_INPUT, NOTEBOOK_DIFF_CELL_PROPERTY, NOTEBOOK_DIFF_CELL_PROPERTY_EXPANDED, CellDiffPlaceholderRenderTemplate, IDiffCellMarginOverlay, NOTEBOOK_DIFF_CELL_IGNORE_WHITESPACE } from 'vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser';
 import { CodeEditorWidget, ICodeEditorWidgetOptions } from 'vs/editor/browser/widget/codeEditor/codeEditorWidget';
 import { IModelService } from 'vs/editor/common/services/model';
 import { ILanguageService } from 'vs/editor/common/languages/language';
@@ -31,18 +31,22 @@ import { SuggestController } from 'vs/editor/contrib/suggest/browser/suggestCont
 import { MenuPreventer } from 'vs/workbench/contrib/codeEditor/browser/menuPreventer';
 import { SelectionClipboardContributionID } from 'vs/workbench/contrib/codeEditor/browser/selectionClipboard';
 import { TabCompletionController } from 'vs/workbench/contrib/snippets/browser/tabCompletion';
-import { renderIcon } from 'vs/base/browser/ui/iconLabel/iconLabels';
+import { renderIcon, renderLabelWithIcons } from 'vs/base/browser/ui/iconLabel/iconLabels';
 import * as editorCommon from 'vs/editor/common/editorCommon';
 import { ITextModelService } from 'vs/editor/common/services/resolverService';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { WorkbenchToolBar } from 'vs/platform/actions/browser/toolbar';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { fixedDiffEditorOptions, fixedEditorOptions, fixedEditorPadding } from 'vs/workbench/contrib/notebook/browser/diff/diffCellEditorOptions';
+import { fixedDiffEditorOptions, fixedEditorOptions, fixedEditorPadding, fixedEditorPaddingSingleLineCells } from 'vs/workbench/contrib/notebook/browser/diff/diffCellEditorOptions';
 import { AccessibilityVerbositySettingId } from 'vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
 import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
 import { DiffEditorWidget } from 'vs/editor/browser/widget/diffEditor/diffEditorWidget';
 import { ICommandService } from 'vs/platform/commands/common/commands';
+import { DiffNestedCellViewModel } from 'vs/workbench/contrib/notebook/browser/diff/diffNestedCellViewModel';
+import { localize } from 'vs/nls';
+import { Emitter } from 'vs/base/common/event';
+import { ITextResourceConfigurationService } from 'vs/editor/common/services/textResourceConfiguration';
 
 export function getOptimizedNestedCodeEditorWidgetOptions(): ICodeEditorWidgetOptions {
 	return {
@@ -58,6 +62,29 @@ export function getOptimizedNestedCodeEditorWidgetOptions(): ICodeEditorWidgetOp
 	};
 }
 
+export class CellDiffPlaceholderElement extends Disposable {
+	constructor(
+		placeholder: DiffElementPlaceholderViewModel,
+		templateData: CellDiffPlaceholderRenderTemplate,
+	) {
+		super();
+		templateData.body.classList.remove('left', 'right', 'full');
+		const text = (placeholder.hiddenCells.length === 1) ?
+			localize('hiddenCell', '{0} hidden cell', placeholder.hiddenCells.length) :
+			localize('hiddenCells', '{0} hidden cells', placeholder.hiddenCells.length);
+		templateData.placeholder.innerText = text;
+
+		this._register(DOM.addDisposableListener(templateData.placeholder, 'dblclick', (e: MouseEvent) => {
+			if (e.button !== 0) {
+				return;
+			}
+			e.preventDefault();
+			placeholder.showHiddenCells();
+		}));
+		this._register(templateData.marginOverlay.onAction(() => placeholder.showHiddenCells()));
+		templateData.marginOverlay.show();
+	}
+}
 
 class PropertyHeader extends Disposable {
 	protected _foldingIndicator!: HTMLElement;
@@ -68,14 +95,14 @@ class PropertyHeader extends Disposable {
 	protected _propertyExpanded?: IContextKey<boolean>;
 
 	constructor(
-		readonly cell: DiffElementViewModelBase,
+		readonly cell: DiffElementCellViewModelBase,
 		readonly propertyHeaderContainer: HTMLElement,
 		readonly notebookEditor: INotebookTextDiffEditor,
 		readonly accessor: {
 			updateInfoRendering: (renderOutput: boolean) => void;
-			checkIfModified: (cell: DiffElementViewModelBase) => false | { reason: string | undefined };
-			getFoldingState: (cell: DiffElementViewModelBase) => PropertyFoldingState;
-			updateFoldingState: (cell: DiffElementViewModelBase, newState: PropertyFoldingState) => void;
+			checkIfModified: (cell: DiffElementCellViewModelBase) => false | { reason: string | undefined };
+			getFoldingState: (cell: DiffElementCellViewModelBase) => PropertyFoldingState;
+			updateFoldingState: (cell: DiffElementCellViewModelBase, newState: PropertyFoldingState) => void;
 			unChangedLabel: string;
 			changedLabel: string;
 			prefix: string;
@@ -159,23 +186,10 @@ class PropertyHeader extends Disposable {
 
 			const target = e.event.target as HTMLElement;
 
-			if (target.classList.contains('codicon-notebook-collapsed') || target.classList.contains('codicon-notebook-expanded')) {
-				const parent = target.parentElement as HTMLElement;
-
-				if (!parent) {
-					return;
-				}
-
-				if (!parent.classList.contains(this.accessor.prefix)) {
-					return;
-				}
-
-				if (!parent.classList.contains('property-folding-indicator')) {
-					return;
-				}
-
-				// folding icon
-
+			if (target === this.propertyHeaderContainer ||
+				target === this._foldingIndicator || this._foldingIndicator.contains(target) ||
+				target === metadataStatus || metadataStatus.contains(target)
+			) {
 				const cellViewModel = e.target;
 
 				if (cellViewModel === this.cell) {
@@ -239,6 +253,9 @@ abstract class AbstractElementRenderer extends Disposable {
 	protected readonly _outputLocalDisposable = this._register(new DisposableStore());
 	protected _ignoreMetadata: boolean = false;
 	protected _ignoreOutputs: boolean = false;
+	protected _cellHeaderContainer!: HTMLElement;
+	protected _editorContainer!: HTMLElement;
+	protected _cellHeader!: PropertyHeader;
 	protected _metadataHeaderContainer!: HTMLElement;
 	protected _metadataHeader!: PropertyHeader;
 	protected _metadataInfoContainer!: HTMLElement;
@@ -267,7 +284,7 @@ abstract class AbstractElementRenderer extends Disposable {
 
 	constructor(
 		readonly notebookEditor: INotebookTextDiffEditor,
-		readonly cell: DiffElementViewModelBase,
+		readonly cell: DiffElementCellViewModelBase,
 		readonly templateData: CellDiffSingleSideRenderTemplate | CellDiffSideBySideRenderTemplate,
 		readonly style: 'left' | 'right' | 'full',
 		protected readonly instantiationService: IInstantiationService,
@@ -280,13 +297,16 @@ abstract class AbstractElementRenderer extends Disposable {
 		protected readonly menuService: IMenuService,
 		protected readonly contextKeyService: IContextKeyService,
 		protected readonly configurationService: IConfigurationService,
+		protected readonly textConfigurationService: ITextResourceConfigurationService
 	) {
 		super();
 		// init
 		this._isDisposed = false;
 		this._metadataEditorDisposeStore = this._register(new DisposableStore());
 		this._outputEditorDisposeStore = this._register(new DisposableStore());
-		this._register(cell.onDidLayoutChange(e => this.layout(e)));
+		this._register(cell.onDidLayoutChange(e => {
+			this.layout(e);
+		}));
 		this._register(cell.onDidLayoutChange(e => this.updateBorders()));
 		this.init();
 		this.buildBody();
@@ -321,6 +341,9 @@ abstract class AbstractElementRenderer extends Disposable {
 
 		this.styleContainer(this._diffEditorContainer);
 		this.updateSourceEditor();
+		if (this.cell.modified) {
+			this._register(this.cell.modified.textModel.onDidChangeContent(() => this._cellHeader.refresh()));
+		}
 
 		this._ignoreMetadata = this.configurationService.getValue('notebook.diff.ignoreMetadata');
 		if (this._ignoreMetadata) {
@@ -510,6 +533,7 @@ abstract class AbstractElementRenderer extends Disposable {
 				originalEditor: getOptimizedNestedCodeEditorWidgetOptions(),
 				modifiedEditor: getOptimizedNestedCodeEditorWidgetOptions()
 			});
+
 			this.layout({ metadataHeight: true });
 			this._metadataEditorDisposeStore.add(this._metadataEditor);
 
@@ -716,10 +740,11 @@ abstract class AbstractElementRenderer extends Disposable {
 }
 
 abstract class SingleSideDiffElement extends AbstractElementRenderer {
-
+	protected _editor!: CodeEditorWidget;
 	override readonly cell: SingleSideDiffElementViewModel;
 	override readonly templateData: CellDiffSingleSideRenderTemplate;
-
+	abstract get nestedCellViewModel(): DiffNestedCellViewModel;
+	abstract get readonly(): boolean;
 	constructor(
 		notebookEditor: INotebookTextDiffEditor,
 		cell: SingleSideDiffElementViewModel,
@@ -735,6 +760,7 @@ abstract class SingleSideDiffElement extends AbstractElementRenderer {
 		menuService: IMenuService,
 		contextKeyService: IContextKeyService,
 		configurationService: IConfigurationService,
+		textConfigurationService: ITextResourceConfigurationService
 	) {
 		super(
 			notebookEditor,
@@ -750,7 +776,8 @@ abstract class SingleSideDiffElement extends AbstractElementRenderer {
 			notificationService,
 			menuService,
 			contextKeyService,
-			configurationService
+			configurationService,
+			textConfigurationService
 		);
 		this.cell = cell;
 		this.templateData = templateData;
@@ -825,9 +852,107 @@ abstract class SingleSideDiffElement extends AbstractElementRenderer {
 		}));
 	}
 
+	override updateSourceEditor(): void {
+		this._cellHeaderContainer = this.templateData.cellHeaderContainer;
+		this._cellHeaderContainer.style.display = 'flex';
+		this._cellHeaderContainer.innerText = '';
+		this._editorContainer = this.templateData.editorContainer;
+		this._editorContainer.classList.add('diff');
+
+		const renderSourceEditor = () => {
+			if (this.cell.cellFoldingState === PropertyFoldingState.Collapsed) {
+				this._editorContainer.style.display = 'none';
+				this.cell.editorHeight = 0;
+				return;
+			}
+
+			const lineCount = this.nestedCellViewModel.textModel.textBuffer.getLineCount();
+			const lineHeight = this.notebookEditor.getLayoutInfo().fontInfo.lineHeight || 17;
+			const editorHeight = lineCount * lineHeight + fixedEditorPadding.top + fixedEditorPadding.bottom;
+
+			this._editorContainer.style.height = `${editorHeight}px`;
+			this._editorContainer.style.display = 'block';
+
+			if (this._editor) {
+				const contentHeight = this._editor.getContentHeight();
+				if (contentHeight >= 0) {
+					this.cell.editorHeight = contentHeight;
+				}
+				return;
+			}
+
+			this._editor = this.templateData.sourceEditor;
+			this._editor.layout(
+				{
+					width: (this.notebookEditor.getLayoutInfo().width - 2 * DIFF_CELL_MARGIN) / 2 - 18,
+					height: editorHeight
+				}
+			);
+			this._editor.updateOptions({ readOnly: this.readonly });
+			this.cell.editorHeight = editorHeight;
+
+			this._register(this._editor.onDidContentSizeChange((e) => {
+				if (this.cell.cellFoldingState === PropertyFoldingState.Expanded && e.contentHeightChanged && this.cell.layoutInfo.editorHeight !== e.contentHeight) {
+					this.cell.editorHeight = e.contentHeight;
+				}
+			}));
+			this._initializeSourceDiffEditor(this.nestedCellViewModel);
+		};
+
+		this._cellHeader = this._register(this.instantiationService.createInstance(
+			PropertyHeader,
+			this.cell,
+			this._cellHeaderContainer,
+			this.notebookEditor,
+			{
+				updateInfoRendering: () => renderSourceEditor(),
+				checkIfModified: (_) => ({ reason: undefined }),
+				getFoldingState: (cell) => cell.cellFoldingState,
+				updateFoldingState: (cell, state) => cell.cellFoldingState = state,
+				unChangedLabel: 'Input',
+				changedLabel: 'Input',
+				prefix: 'input',
+				menuId: MenuId.NotebookDiffCellInputTitle
+			}
+		));
+		this._cellHeader.buildHeader();
+		renderSourceEditor();
+
+		this._initializeSourceDiffEditor(this.nestedCellViewModel);
+	}
+	protected calculateDiagonalFillHeight() {
+		return this.cell.layoutInfo.cellStatusHeight + this.cell.layoutInfo.editorHeight + this.cell.layoutInfo.editorMargin + this.cell.layoutInfo.metadataStatusHeight + this.cell.layoutInfo.metadataHeight + this.cell.layoutInfo.outputTotalHeight + this.cell.layoutInfo.outputStatusHeight;
+	}
+
+	private async _initializeSourceDiffEditor(modifiedCell: DiffNestedCellViewModel) {
+		const modifiedRef = await this.textModelService.createModelReference(modifiedCell.uri);
+
+		if (this._isDisposed) {
+			return;
+		}
+
+		const modifiedTextModel = modifiedRef.object.textEditorModel;
+		this._register(modifiedRef);
+
+		this._editor!.setModel(modifiedTextModel);
+
+		const editorViewState = this.cell.getSourceEditorViewState() as editorCommon.IDiffEditorViewState | null;
+		if (editorViewState) {
+			this._editor!.restoreViewState(editorViewState);
+		}
+
+		const contentHeight = this._editor!.getContentHeight();
+		this.cell.editorHeight = contentHeight;
+		const height = `${this.calculateDiagonalFillHeight()}px`;
+		if (this._diagonalFill!.style.height !== height) {
+			this._diagonalFill!.style.height = height;
+		}
+	}
+
 	_disposeMetadata() {
 		this.cell.metadataStatusHeight = 0;
 		this.cell.metadataHeight = 0;
+		this.templateData.cellHeaderContainer.style.display = 'none';
 		this.templateData.metadataHeaderContainer.style.display = 'none';
 		this.templateData.metadataInfoContainer.style.display = 'none';
 		this._metadataEditor = undefined;
@@ -916,7 +1041,6 @@ abstract class SingleSideDiffElement extends AbstractElementRenderer {
 	}
 }
 export class DeletedElement extends SingleSideDiffElement {
-	private _editor!: CodeEditorWidget;
 	constructor(
 		notebookEditor: INotebookTextDiffEditor,
 		cell: SingleSideDiffElementViewModel,
@@ -931,9 +1055,16 @@ export class DeletedElement extends SingleSideDiffElement {
 		@IMenuService menuService: IMenuService,
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@IConfigurationService configurationService: IConfigurationService,
-
+		@ITextResourceConfigurationService textConfigurationService: ITextResourceConfigurationService,
 	) {
-		super(notebookEditor, cell, templateData, 'left', instantiationService, languageService, modelService, textModelService, contextMenuService, keybindingService, notificationService, menuService, contextKeyService, configurationService);
+		super(notebookEditor, cell, templateData, 'left', instantiationService, languageService, modelService, textModelService, contextMenuService, keybindingService, notificationService, menuService, contextKeyService, configurationService, textConfigurationService);
+	}
+
+	get nestedCellViewModel() {
+		return this.cell.original!;
+	}
+	get readonly() {
+		return true;
 	}
 
 	styleContainer(container: HTMLElement) {
@@ -941,48 +1072,21 @@ export class DeletedElement extends SingleSideDiffElement {
 		container.classList.add('removed');
 	}
 
-	updateSourceEditor(): void {
-		const originalCell = this.cell.original!;
-		const lineCount = originalCell.textModel.textBuffer.getLineCount();
-		const lineHeight = this.notebookEditor.getLayoutInfo().fontInfo.lineHeight || 17;
-		const editorHeight = lineCount * lineHeight + fixedEditorPadding.top + fixedEditorPadding.bottom;
-
-		this._editor = this.templateData.sourceEditor;
-		this._editor.layout({
-			width: (this.notebookEditor.getLayoutInfo().width - 2 * DIFF_CELL_MARGIN) / 2 - 18,
-			height: editorHeight
-		});
-
-		this.cell.editorHeight = editorHeight;
-
-		this._register(this._editor.onDidContentSizeChange((e) => {
-			if (e.contentHeightChanged && this.cell.layoutInfo.editorHeight !== e.contentHeight) {
-				this.cell.editorHeight = e.contentHeight;
-			}
-		}));
-
-		this.textModelService.createModelReference(originalCell.uri).then(ref => {
-			if (this._isDisposed) {
-				return;
-			}
-
-			this._register(ref);
-
-			const textModel = ref.object.textEditorModel;
-			this._editor.setModel(textModel);
-			this.cell.editorHeight = this._editor.getContentHeight();
-		});
-	}
-
 	layout(state: IDiffElementLayoutState) {
 		DOM.scheduleAtNextAnimationFrame(DOM.getWindow(this._diffEditorContainer), () => {
-			if (state.editorHeight || state.outerWidth) {
+			if ((state.editorHeight || state.outerWidth) && this._editor) {
+				this._editorContainer.style.height = `${this.cell.layoutInfo.editorHeight}px`;
 				this._editor.layout({
 					width: this.cell.getComputedCellContainerWidth(this.notebookEditor.getLayoutInfo(), false, false),
 					height: this.cell.layoutInfo.editorHeight
 				});
 			}
 
+			if (state.outerWidth && this._editor) {
+				this._editorContainer.style.height = `${this.cell.layoutInfo.editorHeight}px`;
+				this._editor.layout();
+			}
+
 			if (state.metadataHeight || state.outerWidth) {
 				this._metadataEditor?.layout({
 					width: this.cell.getComputedCellContainerWidth(this.notebookEditor.getLayoutInfo(), false, false),
@@ -998,13 +1102,14 @@ export class DeletedElement extends SingleSideDiffElement {
 			}
 
 			if (this._diagonalFill) {
-				this._diagonalFill.style.height = `${this.cell.layoutInfo.totalHeight - 32}px`;
+				this._diagonalFill.style.height = `${this.calculateDiagonalFillHeight()}px`;
 			}
 
 			this.layoutNotebookCell();
 		});
 	}
 
+
 	_buildOutputRendererContainer() {
 		if (!this._outputViewContainer) {
 			this._outputViewContainer = DOM.append(this._outputInfoContainer, DOM.$('.output-view-container'));
@@ -1068,7 +1173,6 @@ export class DeletedElement extends SingleSideDiffElement {
 }
 
 export class InsertElement extends SingleSideDiffElement {
-	private _editor!: CodeEditorWidget;
 	constructor(
 		notebookEditor: INotebookTextDiffEditor,
 		cell: SingleSideDiffElementViewModel,
@@ -1083,8 +1187,15 @@ export class InsertElement extends SingleSideDiffElement {
 		@IMenuService menuService: IMenuService,
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@IConfigurationService configurationService: IConfigurationService,
+		@ITextResourceConfigurationService textConfigurationService: ITextResourceConfigurationService,
 	) {
-		super(notebookEditor, cell, templateData, 'right', instantiationService, languageService, modelService, textModelService, contextMenuService, keybindingService, notificationService, menuService, contextKeyService, configurationService);
+		super(notebookEditor, cell, templateData, 'right', instantiationService, languageService, modelService, textModelService, contextMenuService, keybindingService, notificationService, menuService, contextKeyService, configurationService, textConfigurationService);
+	}
+	get nestedCellViewModel() {
+		return this.cell.modified!;
+	}
+	get readonly() {
+		return false;
 	}
 
 	styleContainer(container: HTMLElement): void {
@@ -1092,42 +1203,6 @@ export class InsertElement extends SingleSideDiffElement {
 		container.classList.add('inserted');
 	}
 
-	updateSourceEditor(): void {
-		const modifiedCell = this.cell.modified!;
-		const lineCount = modifiedCell.textModel.textBuffer.getLineCount();
-		const lineHeight = this.notebookEditor.getLayoutInfo().fontInfo.lineHeight || 17;
-		const editorHeight = lineCount * lineHeight + fixedEditorPadding.top + fixedEditorPadding.bottom;
-
-		this._editor = this.templateData.sourceEditor;
-		this._editor.layout(
-			{
-				width: (this.notebookEditor.getLayoutInfo().width - 2 * DIFF_CELL_MARGIN) / 2 - 18,
-				height: editorHeight
-			}
-		);
-		this._editor.updateOptions({ readOnly: false });
-		this.cell.editorHeight = editorHeight;
-
-		this._register(this._editor.onDidContentSizeChange((e) => {
-			if (e.contentHeightChanged && this.cell.layoutInfo.editorHeight !== e.contentHeight) {
-				this.cell.editorHeight = e.contentHeight;
-			}
-		}));
-
-		this.textModelService.createModelReference(modifiedCell.uri).then(ref => {
-			if (this._isDisposed) {
-				return;
-			}
-
-			this._register(ref);
-
-			const textModel = ref.object.textEditorModel;
-			this._editor.setModel(textModel);
-			this._editor.restoreViewState(this.cell.getSourceEditorViewState() as editorCommon.ICodeEditorViewState);
-			this.cell.editorHeight = this._editor.getContentHeight();
-		});
-	}
-
 	_buildOutputRendererContainer() {
 		if (!this._outputViewContainer) {
 			this._outputViewContainer = DOM.append(this._outputInfoContainer, DOM.$('.output-view-container'));
@@ -1179,13 +1254,19 @@ export class InsertElement extends SingleSideDiffElement {
 
 	layout(state: IDiffElementLayoutState) {
 		DOM.scheduleAtNextAnimationFrame(DOM.getWindow(this._diffEditorContainer), () => {
-			if (state.editorHeight || state.outerWidth) {
+			if ((state.editorHeight || state.outerWidth) && this._editor) {
+				this._editorContainer.style.height = `${this.cell.layoutInfo.editorHeight}px`;
 				this._editor.layout({
 					width: this.cell.getComputedCellContainerWidth(this.notebookEditor.getLayoutInfo(), false, false),
 					height: this.cell.layoutInfo.editorHeight
 				});
 			}
 
+			if (state.outerWidth && this._editor) {
+				this._editorContainer.style.height = `${this.cell.layoutInfo.editorHeight}px`;
+				this._editor.layout();
+			}
+
 			if (state.metadataHeight || state.outerWidth) {
 				this._metadataEditor?.layout({
 					width: this.cell.getComputedCellContainerWidth(this.notebookEditor.getLayoutInfo(), false, true),
@@ -1203,7 +1284,7 @@ export class InsertElement extends SingleSideDiffElement {
 			this.layoutNotebookCell();
 
 			if (this._diagonalFill) {
-				this._diagonalFill.style.height = `${this.cell.layoutInfo.editorHeight + this.cell.layoutInfo.editorMargin + this.cell.layoutInfo.metadataStatusHeight + this.cell.layoutInfo.metadataHeight + this.cell.layoutInfo.outputTotalHeight + this.cell.layoutInfo.outputStatusHeight}px`;
+				this._diagonalFill.style.height = `${this.calculateDiagonalFillHeight()}px`;
 			}
 		});
 	}
@@ -1220,8 +1301,6 @@ export class InsertElement extends SingleSideDiffElement {
 export class ModifiedElement extends AbstractElementRenderer {
 	private _editor?: DiffEditorWidget;
 	private _editorViewStateChanged: boolean;
-	private _editorContainer!: HTMLElement;
-	private _inputToolbarContainer!: HTMLElement;
 	protected _toolbar!: ToolBar;
 	protected _menu!: IMenu;
 
@@ -1242,8 +1321,9 @@ export class ModifiedElement extends AbstractElementRenderer {
 		@IMenuService menuService: IMenuService,
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@IConfigurationService configurationService: IConfigurationService,
+		@ITextResourceConfigurationService textConfigurationService: ITextResourceConfigurationService,
 	) {
-		super(notebookEditor, cell, templateData, 'full', instantiationService, languageService, modelService, textModelService, contextMenuService, keybindingService, notificationService, menuService, contextKeyService, configurationService);
+		super(notebookEditor, cell, templateData, 'full', instantiationService, languageService, modelService, textModelService, contextMenuService, keybindingService, notificationService, menuService, contextKeyService, configurationService, textConfigurationService);
 		this.cell = cell;
 		this.templateData = templateData;
 		this._editorViewStateChanged = false;
@@ -1256,6 +1336,15 @@ export class ModifiedElement extends AbstractElementRenderer {
 		container.classList.remove('inserted', 'removed');
 	}
 
+	override buildBody(): void {
+		super.buildBody();
+		if (this.cell.displayIconToHideUnmodifiedCells) {
+			this._register(this.templateData.marginOverlay.onAction(() => this.cell.hideUnchangedCells()));
+			this.templateData.marginOverlay.show();
+		} else {
+			this.templateData.marginOverlay.hide();
+		}
+	}
 	_disposeMetadata() {
 		this.cell.metadataStatusHeight = 0;
 		this.cell.metadataHeight = 0;
@@ -1436,6 +1525,7 @@ export class ModifiedElement extends AbstractElementRenderer {
 					originalEditor: getOptimizedNestedCodeEditorWidgetOptions(),
 					modifiedEditor: getOptimizedNestedCodeEditorWidgetOptions()
 				});
+
 				this._register(this._outputMetadataEditor);
 				const originalOutputMetadataSource = JSON.stringify(this.cell.original.outputs[0].metadata ?? {}, undefined, '\t');
 				const modifiedOutputMetadataSource = JSON.stringify(this.cell.modified.outputs[0].metadata ?? {}, undefined, '\t');
@@ -1476,7 +1566,11 @@ export class ModifiedElement extends AbstractElementRenderer {
 
 			this._outputLeftView?.showOutputs();
 			this._outputRightView?.showOutputs();
-			this._outputMetadataEditor?.layout();
+			this._outputMetadataEditor?.layout({
+				width: this._editor?.getViewWidth() || this.cell.getComputedCellContainerWidth(this.notebookEditor.getLayoutInfo(), false, true),
+				height: this.cell.layoutInfo.outputMetadataHeight
+			});
+
 			this._decorate();
 		}
 	}
@@ -1491,63 +1585,117 @@ export class ModifiedElement extends AbstractElementRenderer {
 	}
 
 	updateSourceEditor(): void {
+		this._cellHeaderContainer = this.templateData.cellHeaderContainer;
+		this._cellHeaderContainer.style.display = 'flex';
+		this._cellHeaderContainer.innerText = '';
 		const modifiedCell = this.cell.modified;
-		const lineCount = modifiedCell.textModel.textBuffer.getLineCount();
-		const lineHeight = this.notebookEditor.getLayoutInfo().fontInfo.lineHeight || 17;
-
-		const editorHeight = this.cell.layoutInfo.editorHeight !== 0 ? this.cell.layoutInfo.editorHeight : lineCount * lineHeight + fixedEditorPadding.top + fixedEditorPadding.bottom;
 		this._editorContainer = this.templateData.editorContainer;
-		this._editor = this.templateData.sourceEditor;
-
 		this._editorContainer.classList.add('diff');
 
-		this._editor.layout({
-			width: this.notebookEditor.getLayoutInfo().width - 2 * DIFF_CELL_MARGIN,
-			height: editorHeight
-		});
+		const renderSourceEditor = () => {
+			if (this.cell.cellFoldingState === PropertyFoldingState.Collapsed) {
+				this._editorContainer.style.display = 'none';
+				this.cell.editorHeight = 0;
+				return;
+			}
 
-		this._editorContainer.style.height = `${editorHeight}px`;
+			const lineCount = modifiedCell.textModel.textBuffer.getLineCount();
+			const lineHeight = this.notebookEditor.getLayoutInfo().fontInfo.lineHeight || 17;
+			const editorHeight = this.cell.layoutInfo.editorHeight !== 0 ? this.cell.layoutInfo.editorHeight : (lineCount * lineHeight) + fixedEditorPadding.top + fixedEditorPadding.bottom;
 
-		this._register(this._editor.onDidContentSizeChange((e) => {
-			if (e.contentHeightChanged && this.cell.layoutInfo.editorHeight !== e.contentHeight) {
-				this.cell.editorHeight = e.contentHeight;
+			this._editorContainer.style.height = `${editorHeight}px`;
+			this._editorContainer.style.display = 'block';
+
+			if (this._editor) {
+				const contentHeight = this._editor.getContentHeight();
+				if (contentHeight >= 0) {
+					this.cell.editorHeight = contentHeight;
+				}
+				return;
 			}
-		}));
 
-		this._initializeSourceDiffEditor();
+			this._editor = this.templateData.sourceEditor;
+			// If there is only 1 line, then ensure we have the necessary padding to display the button for whitespaces.
+			// E.g. assume we have a cell with 1 line and we add some whitespace,
+			// Then diff editor displays the button `Show Whitespace Differences`, however with 12 paddings on the top, the
+			// button can get cut off.
+			if (lineCount === 1) {
+				this._editor.updateOptions({
+					padding: fixedEditorPaddingSingleLineCells
+				});
+			}
+			this._editor.layout({
+				width: this.notebookEditor.getLayoutInfo().width - 2 * DIFF_CELL_MARGIN,
+				height: editorHeight
+			});
+			this._register(this._editor.onDidContentSizeChange((e) => {
+				if (this.cell.cellFoldingState === PropertyFoldingState.Expanded && e.contentHeightChanged && this.cell.layoutInfo.editorHeight !== e.contentHeight) {
+					this.cell.editorHeight = e.contentHeight;
+				}
+			}));
+			this._initializeSourceDiffEditor();
+		};
+
+		this._cellHeader = this._register(this.instantiationService.createInstance(
+			PropertyHeader,
+			this.cell,
+			this._cellHeaderContainer,
+			this.notebookEditor,
+			{
+				updateInfoRendering: () => renderSourceEditor(),
+				checkIfModified: (cell) => {
+					return cell.modified?.textModel.getTextBufferHash() !== cell.original?.textModel.getTextBufferHash() ? { reason: undefined } : false;
+				},
+				getFoldingState: (cell) => cell.cellFoldingState,
+				updateFoldingState: (cell, state) => cell.cellFoldingState = state,
+				unChangedLabel: 'Input',
+				changedLabel: 'Input changed',
+				prefix: 'input',
+				menuId: MenuId.NotebookDiffCellInputTitle
+			}
+		));
+		this._cellHeader.buildHeader();
+		renderSourceEditor();
+
 		const scopedContextKeyService = this.contextKeyService.createScoped(this.templateData.inputToolbarContainer);
 		this._register(scopedContextKeyService);
 		const inputChanged = NOTEBOOK_DIFF_CELL_INPUT.bindTo(scopedContextKeyService);
+		inputChanged.set(this.cell.modified.textModel.getTextBufferHash() !== this.cell.original.textModel.getTextBufferHash());
+
+		const ignoreWhitespace = NOTEBOOK_DIFF_CELL_IGNORE_WHITESPACE.bindTo(scopedContextKeyService);
+		const ignore = this.textConfigurationService.getValue<boolean>(this.cell.modified.uri, 'diffEditor.ignoreTrimWhitespace');
+		ignoreWhitespace.set(ignore);
 
-		this._inputToolbarContainer = this.templateData.inputToolbarContainer;
 		this._toolbar = this.templateData.toolbar;
 
 		this._toolbar.context = {
 			cell: this.cell
 		};
 
-		if (this.cell.modified.textModel.getValue() !== this.cell.original.textModel.getValue()) {
-			this._inputToolbarContainer.style.display = 'block';
-			inputChanged.set(true);
-		} else {
-			this._inputToolbarContainer.style.display = 'none';
-			inputChanged.set(false);
-		}
-
-		this._register(this.cell.modified.textModel.onDidChangeContent(() => {
-			if (this.cell.modified.textModel.getValue() !== this.cell.original.textModel.getValue()) {
-				this._inputToolbarContainer.style.display = 'block';
-				inputChanged.set(true);
+		const refreshToolbar = () => {
+			const ignore = this.textConfigurationService.getValue<boolean>(this.cell.modified.uri, 'diffEditor.ignoreTrimWhitespace');
+			ignoreWhitespace.set(ignore);
+			const hasChanges = this.cell.modified.textModel.getTextBufferHash() !== this.cell.original.textModel.getTextBufferHash();
+			inputChanged.set(hasChanges);
+
+			if (hasChanges) {
+				const actions: IAction[] = [];
+				const menu = this.menuService.getMenuActions(MenuId.NotebookDiffCellInputTitle, scopedContextKeyService, { shouldForwardArgs: true });
+				createAndFillInActionBarActions(menu, actions);
+				this._toolbar.setActions(actions);
 			} else {
-				this._inputToolbarContainer.style.display = 'none';
-				inputChanged.set(false);
+				this._toolbar.setActions([]);
 			}
-		}));
+		};
 
-		const menu = this.menuService.getMenuActions(MenuId.NotebookDiffCellInputTitle, scopedContextKeyService, { shouldForwardArgs: true });
-		const actions: IAction[] = [];
-		createAndFillInActionBarActions(menu, actions);
-		this._toolbar.setActions(actions);
+		this._register(this.cell.modified.textModel.onDidChangeContent(() => refreshToolbar()));
+		this._register(this.textConfigurationService.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration(this.cell.modified.uri, 'diffEditor') &&
+				e.affectedKeys.has('diffEditor.ignoreTrimWhitespace')) {
+				refreshToolbar();
+			}
+		}));
+		refreshToolbar();
 	}
 
 	private async _initializeSourceDiffEditor() {
@@ -1568,7 +1716,7 @@ export class ModifiedElement extends AbstractElementRenderer {
 
 		this._editor!.setModel({
 			original: textModel,
-			modified: modifiedTextModel
+			modified: modifiedTextModel,
 		});
 
 		const handleViewStateChange = () => {
@@ -1581,6 +1729,7 @@ export class ModifiedElement extends AbstractElementRenderer {
 			}
 		};
 
+		this.updateEditorOptionsForWhitespace();
 		this._register(this._editor!.getOriginalEditor().onDidChangeCursorSelection(handleViewStateChange));
 		this._register(this._editor!.getOriginalEditor().onDidScrollChange(handleScrollChange));
 		this._register(this._editor!.getModifiedEditor().onDidChangeCursorSelection(handleViewStateChange));
@@ -1594,39 +1743,67 @@ export class ModifiedElement extends AbstractElementRenderer {
 		const contentHeight = this._editor!.getContentHeight();
 		this.cell.editorHeight = contentHeight;
 	}
-
+	private updateEditorOptionsForWhitespace() {
+		const editor = this._editor;
+		if (!editor) {
+			return;
+		}
+		const uri = editor.getModel()?.modified.uri || editor.getModel()?.original.uri;
+		if (!uri) {
+			return;
+		}
+		const ignoreTrimWhitespace = this.textConfigurationService.getValue<boolean>(uri, 'diffEditor.ignoreTrimWhitespace');
+		editor.updateOptions({ ignoreTrimWhitespace });
+
+		this._register(this.textConfigurationService.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration(uri, 'diffEditor') &&
+				e.affectedKeys.has('diffEditor.ignoreTrimWhitespace')) {
+				const ignoreTrimWhitespace = this.textConfigurationService.getValue<boolean>(uri, 'diffEditor.ignoreTrimWhitespace');
+				editor.updateOptions({ ignoreTrimWhitespace });
+			}
+		}));
+	}
 	layout(state: IDiffElementLayoutState) {
 		DOM.scheduleAtNextAnimationFrame(DOM.getWindow(this._diffEditorContainer), () => {
-			if (state.editorHeight) {
+			if (state.editorHeight && this._editor) {
 				this._editorContainer.style.height = `${this.cell.layoutInfo.editorHeight}px`;
-				this._editor!.layout({
+				this._editor.layout({
 					width: this._editor!.getViewWidth(),
 					height: this.cell.layoutInfo.editorHeight
 				});
 			}
 
-			if (state.outerWidth) {
+			if (state.outerWidth && this._editor) {
 				this._editorContainer.style.height = `${this.cell.layoutInfo.editorHeight}px`;
-				this._editor!.layout();
+				this._editor.layout();
 			}
 
 			if (state.metadataHeight || state.outerWidth) {
 				if (this._metadataEditorContainer) {
 					this._metadataEditorContainer.style.height = `${this.cell.layoutInfo.metadataHeight}px`;
-					this._metadataEditor?.layout();
+					this._metadataEditor?.layout({
+						width: this._editor?.getViewWidth() || this.cell.getComputedCellContainerWidth(this.notebookEditor.getLayoutInfo(), false, true),
+						height: this.cell.layoutInfo.metadataHeight
+					});
 				}
 			}
 
 			if (state.outputTotalHeight || state.outerWidth) {
 				if (this._outputEditorContainer) {
 					this._outputEditorContainer.style.height = `${this.cell.layoutInfo.outputTotalHeight}px`;
-					this._outputEditor?.layout();
+					this._outputEditor?.layout({
+						width: this._editor?.getViewWidth() || this.cell.getComputedCellContainerWidth(this.notebookEditor.getLayoutInfo(), false, true),
+						height: this.cell.layoutInfo.outputTotalHeight
+					});
 				}
 
 				if (this._outputMetadataContainer) {
 					this._outputMetadataContainer.style.height = `${this.cell.layoutInfo.outputMetadataHeight}px`;
 					this._outputMetadataContainer.style.top = `${this.cell.layoutInfo.outputTotalHeight - this.cell.layoutInfo.outputMetadataHeight}px`;
-					this._outputMetadataEditor?.layout();
+					this._outputMetadataEditor?.layout({
+						width: this._editor?.getViewWidth() || this.cell.getComputedCellContainerWidth(this.notebookEditor.getLayoutInfo(), false, true),
+						height: this.cell.layoutInfo.outputMetadataHeight
+					});
 				}
 			}
 
@@ -1635,6 +1812,12 @@ export class ModifiedElement extends AbstractElementRenderer {
 	}
 
 	override dispose() {
+		// The editor isn't disposed yet, it can be re-used.
+		// However the model can be disposed before the editor & that causes issues.
+		if (this._editor) {
+			this._editor.setModel(null);
+		}
+
 		if (this._editor && this._editorViewStateChanged) {
 			this.cell.saveSpirceEditorViewState(this._editor.saveViewState());
 		}
@@ -1642,3 +1825,83 @@ export class ModifiedElement extends AbstractElementRenderer {
 		super.dispose();
 	}
 }
+
+
+export class CollapsedCellOverlayWidget extends Disposable implements IDiffCellMarginOverlay {
+	private readonly _nodes = DOM.h('div.diff-hidden-cells', [
+		DOM.h('div.center@content', { style: { display: 'flex' } }, [
+			DOM.$('a', {
+				title: localize('showUnchangedCells', 'Show Unchanged Cells'),
+				role: 'button',
+				onclick: () => { this._action.fire(); }
+			},
+				...renderLabelWithIcons('$(unfold)'))]
+		),
+	]);
+
+	private readonly _action = this._register(new Emitter<void>());
+	public readonly onAction = this._action.event;
+	constructor(
+		private readonly container: HTMLElement
+	) {
+		super();
+
+		this._nodes.root.style.display = 'none';
+		container.appendChild(this._nodes.root);
+	}
+
+	public show() {
+		this._nodes.root.style.display = 'block';
+	}
+
+	public hide() {
+		this._nodes.root.style.display = 'none';
+	}
+
+	public override dispose() {
+		this.hide();
+		this.container.removeChild(this._nodes.root);
+		DOM.reset(this._nodes.root);
+		super.dispose();
+	}
+}
+
+export class UnchangedCellOverlayWidget extends Disposable implements IDiffCellMarginOverlay {
+	private readonly _nodes = DOM.h('div.diff-hidden-cells', [
+		DOM.h('div.center@content', { style: { display: 'flex' } }, [
+			DOM.$('a', {
+				title: localize('hideUnchangedCells', 'Hide Unchanged Cells'),
+				role: 'button',
+				onclick: () => { this._action.fire(); }
+			},
+				...renderLabelWithIcons('$(fold)')
+			),
+		]
+		),
+	]);
+
+	private readonly _action = this._register(new Emitter<void>());
+	public readonly onAction = this._action.event;
+	constructor(
+		private readonly container: HTMLElement
+	) {
+		super();
+
+		this._nodes.root.style.display = 'none';
+		container.appendChild(this._nodes.root);
+	}
+
+	public show() {
+		this._nodes.root.style.display = 'block';
+	}
+
+	public hide() {
+		this._nodes.root.style.display = 'none';
+	}
+	public override dispose() {
+		this.hide();
+		this.container.removeChild(this._nodes.root);
+		DOM.reset(this._nodes.root);
+		super.dispose();
+	}
+}
diff --git a/src/vs/workbench/contrib/notebook/browser/diff/diffElementOutputs.ts b/src/vs/workbench/contrib/notebook/browser/diff/diffElementOutputs.ts
index ea94a04d2ad..9121e3fb3ec 100644
--- a/src/vs/workbench/contrib/notebook/browser/diff/diffElementOutputs.ts
+++ b/src/vs/workbench/contrib/notebook/browser/diff/diffElementOutputs.ts
@@ -6,7 +6,7 @@
 import * as DOM from 'vs/base/browser/dom';
 import * as nls from 'vs/nls';
 import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { DiffElementViewModelBase, SideBySideDiffElementViewModel } from 'vs/workbench/contrib/notebook/browser/diff/diffElementViewModel';
+import { DiffElementCellViewModelBase, SideBySideDiffElementViewModel } from 'vs/workbench/contrib/notebook/browser/diff/diffElementViewModel';
 import { DiffSide, INotebookTextDiffEditor } from 'vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser';
 import { ICellOutputViewModel, IInsetRenderOutput, RenderOutputType } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { NotebookTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookTextModel';
@@ -33,7 +33,7 @@ export class OutputElement extends Disposable {
 		private _notebookTextModel: NotebookTextModel,
 		private _notebookService: INotebookService,
 		private _quickInputService: IQuickInputService,
-		private _diffElementViewModel: DiffElementViewModelBase,
+		private _diffElementViewModel: DiffElementCellViewModelBase,
 		private _diffSide: DiffSide,
 		private _nestedCell: DiffNestedCellViewModel,
 		private _outputContainer: HTMLElement,
@@ -155,7 +155,8 @@ export class OutputElement extends Disposable {
 			description: index === currIndex ? nls.localize('curruentActiveMimeType', "Currently Active") : undefined
 		}));
 
-		const picker = this._quickInputService.createQuickPick();
+		const disposables = new DisposableStore();
+		const picker = disposables.add(this._quickInputService.createQuickPick());
 		picker.items = items;
 		picker.activeItems = items.filter(item => !!item.picked);
 		picker.placeholder = items.length !== mimeTypes.length
@@ -163,10 +164,10 @@ export class OutputElement extends Disposable {
 			: nls.localize('promptChooseMimeType.placeHolder', "Select mimetype to render for current output");
 
 		const pick = await new Promise<number | undefined>(resolve => {
-			picker.onDidAccept(() => {
+			disposables.add(picker.onDidAccept(() => {
 				resolve(picker.selectedItems.length === 1 ? (picker.selectedItems[0] as IMimeTypeRenderer).index : undefined);
-				picker.dispose();
-			});
+				disposables.dispose();
+			}));
 			picker.show();
 		});
 
@@ -228,7 +229,7 @@ export class OutputContainer extends Disposable {
 	constructor(
 		private _editor: INotebookTextDiffEditor,
 		private _notebookTextModel: NotebookTextModel,
-		private _diffElementViewModel: DiffElementViewModelBase,
+		private _diffElementViewModel: DiffElementCellViewModelBase,
 		private _nestedCellViewModel: DiffNestedCellViewModel,
 		private _diffSide: DiffSide,
 		private _outputContainer: HTMLElement,
diff --git a/src/vs/workbench/contrib/notebook/browser/diff/diffElementViewModel.ts b/src/vs/workbench/contrib/notebook/browser/diff/diffElementViewModel.ts
index fd3336fc32b..ad8e1461fa3 100644
--- a/src/vs/workbench/contrib/notebook/browser/diff/diffElementViewModel.ts
+++ b/src/vs/workbench/contrib/notebook/browser/diff/diffElementViewModel.ts
@@ -17,8 +17,10 @@ import { NotebookDiffEditorEventDispatcher, NotebookDiffViewEventType } from 'vs
 import { CellDiffViewModelLayoutChangeEvent, DIFF_CELL_MARGIN, DiffSide, IDiffElementLayoutInfo } from 'vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser';
 import { CellLayoutState, IGenericCellViewModel } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { NotebookLayoutInfo } from 'vs/workbench/contrib/notebook/browser/notebookViewEvents';
+import { NotebookCellTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookCellTextModel';
 import { NotebookTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookTextModel';
 import { ICellOutput, INotebookTextModel, IOutputDto, IOutputItemDto, NotebookCellMetadata } from 'vs/workbench/contrib/notebook/common/notebookCommon';
+import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
 
 export enum PropertyFoldingState {
 	Expanded,
@@ -33,15 +35,77 @@ interface ILayoutInfoDelta extends ILayoutInfoDelta0 {
 	recomputeOutput?: boolean;
 }
 
+export type IDiffElementViewModelBase = DiffElementCellViewModelBase | DiffElementPlaceholderViewModel;
+
 export abstract class DiffElementViewModelBase extends Disposable {
-	public metadataFoldingState: PropertyFoldingState;
-	public outputFoldingState: PropertyFoldingState;
 	protected _layoutInfoEmitter = this._register(new Emitter<CellDiffViewModelLayoutChangeEvent>());
 	onDidLayoutChange = this._layoutInfoEmitter.event;
+	constructor(
+		public readonly mainDocumentTextModel: INotebookTextModel,
+		public readonly editorEventDispatcher: NotebookDiffEditorEventDispatcher,
+		public readonly initData: {
+			metadataStatusHeight: number;
+			outputStatusHeight: number;
+			fontInfo: FontInfo | undefined;
+		}
+	) {
+		super();
+
+		this._register(this.editorEventDispatcher.onDidChangeLayout(e => this._layoutInfoEmitter.fire({ outerWidth: true })));
+	}
+
+	abstract layoutChange(): void;
+	abstract getHeight(lineHeight: number): number;
+	abstract get totalHeight(): number;
+}
+
+export class DiffElementPlaceholderViewModel extends DiffElementViewModelBase {
+	readonly type: 'placeholder' = 'placeholder';
+	public hiddenCells: DiffElementCellViewModelBase[] = [];
+	protected _unfoldHiddenCells = this._register(new Emitter<void>());
+	onUnfoldHiddenCells = this._unfoldHiddenCells.event;
+
+	constructor(
+		mainDocumentTextModel: INotebookTextModel,
+		editorEventDispatcher: NotebookDiffEditorEventDispatcher,
+		initData: {
+			metadataStatusHeight: number;
+			outputStatusHeight: number;
+			fontInfo: FontInfo | undefined;
+		}
+	) {
+		super(mainDocumentTextModel, editorEventDispatcher, initData);
+
+	}
+	get totalHeight() {
+		return 24 + (2 * DIFF_CELL_MARGIN);
+	}
+	getHeight(_: number): number {
+		return this.totalHeight;
+	}
+	override layoutChange(): void {
+		//
+	}
+	showHiddenCells() {
+		this._unfoldHiddenCells.fire();
+	}
+}
+
+export abstract class DiffElementCellViewModelBase extends DiffElementViewModelBase {
+	public cellFoldingState: PropertyFoldingState;
+	public metadataFoldingState: PropertyFoldingState;
+	public outputFoldingState: PropertyFoldingState;
 	protected _stateChangeEmitter = this._register(new Emitter<{ renderOutput: boolean }>());
 	onDidStateChange = this._stateChangeEmitter.event;
 	protected _layoutInfo!: IDiffElementLayoutInfo;
 
+	public displayIconToHideUnmodifiedCells?: boolean;
+	private _hideUnchangedCells = this._register(new Emitter<void>());
+	public onHideUnchangedCells = this._hideUnchangedCells.event;
+
+	hideUnchangedCells() {
+		this._hideUnchangedCells.fire();
+	}
 	set rawOutputHeight(height: number) {
 		this._layout({ rawOutputHeight: Math.min(OUTPUT_EDITOR_HEIGHT_MAGIC, height) });
 	}
@@ -114,45 +178,55 @@ export abstract class DiffElementViewModelBase extends Disposable {
 		return this._layoutInfo;
 	}
 
+	get totalHeight() {
+		return this.layoutInfo.totalHeight;
+	}
+
 	private _sourceEditorViewState: editorCommon.ICodeEditorViewState | editorCommon.IDiffEditorViewState | null = null;
 	private _outputEditorViewState: editorCommon.ICodeEditorViewState | editorCommon.IDiffEditorViewState | null = null;
 	private _metadataEditorViewState: editorCommon.ICodeEditorViewState | editorCommon.IDiffEditorViewState | null = null;
+	public readonly original: DiffNestedCellViewModel | undefined;
 
+	public readonly modified: DiffNestedCellViewModel | undefined;
 	constructor(
-		readonly mainDocumentTextModel: INotebookTextModel,
-		readonly original: DiffNestedCellViewModel | undefined,
-		readonly modified: DiffNestedCellViewModel | undefined,
+		mainDocumentTextModel: INotebookTextModel,
+		original: NotebookCellTextModel | undefined,
+		modified: NotebookCellTextModel | undefined,
 		readonly type: 'unchanged' | 'insert' | 'delete' | 'modified',
-		readonly editorEventDispatcher: NotebookDiffEditorEventDispatcher,
-		readonly initData: {
+		editorEventDispatcher: NotebookDiffEditorEventDispatcher,
+		initData: {
 			metadataStatusHeight: number;
 			outputStatusHeight: number;
 			fontInfo: FontInfo | undefined;
-		}
+		},
+		notebookService: INotebookService
 	) {
-		super();
+		super(mainDocumentTextModel, editorEventDispatcher, initData);
+		this.original = original ? this._register(new DiffNestedCellViewModel(original, notebookService)) : undefined;
+		this.modified = modified ? this._register(new DiffNestedCellViewModel(modified, notebookService)) : undefined;
 		const editorHeight = this._estimateEditorHeight(initData.fontInfo);
+		const cellStatusHeight = 25;
 		this._layoutInfo = {
 			width: 0,
 			editorHeight: editorHeight,
 			editorMargin: 0,
 			metadataHeight: 0,
+			cellStatusHeight,
 			metadataStatusHeight: 25,
 			rawOutputHeight: 0,
 			outputTotalHeight: 0,
 			outputStatusHeight: 25,
 			outputMetadataHeight: 0,
 			bodyMargin: 32,
-			totalHeight: 82 + editorHeight,
+			totalHeight: 82 + cellStatusHeight + editorHeight,
 			layoutState: CellLayoutState.Uninitialized
 		};
 
+		this.cellFoldingState = modified?.getTextBufferHash() !== original?.getTextBufferHash() ? PropertyFoldingState.Expanded : PropertyFoldingState.Collapsed;
 		this.metadataFoldingState = PropertyFoldingState.Collapsed;
 		this.outputFoldingState = PropertyFoldingState.Collapsed;
 
-		this._register(this.editorEventDispatcher.onDidChangeLayout(e => {
-			this._layoutInfoEmitter.fire({ outerWidth: true });
-		}));
+		this._register(this.editorEventDispatcher.onDidChangeLayout(e => this._layoutInfoEmitter.fire({ outerWidth: true })));
 	}
 
 	layoutChange() {
@@ -185,6 +259,7 @@ export abstract class DiffElementViewModelBase extends Disposable {
 		const editorHeight = delta.editorHeight !== undefined ? delta.editorHeight : this._layoutInfo.editorHeight;
 		const editorMargin = delta.editorMargin !== undefined ? delta.editorMargin : this._layoutInfo.editorMargin;
 		const metadataHeight = delta.metadataHeight !== undefined ? delta.metadataHeight : this._layoutInfo.metadataHeight;
+		const cellStatusHeight = delta.cellStatusHeight !== undefined ? delta.cellStatusHeight : this._layoutInfo.cellStatusHeight;
 		const metadataStatusHeight = delta.metadataStatusHeight !== undefined ? delta.metadataStatusHeight : this._layoutInfo.metadataStatusHeight;
 		const rawOutputHeight = delta.rawOutputHeight !== undefined ? delta.rawOutputHeight : this._layoutInfo.rawOutputHeight;
 		const outputStatusHeight = delta.outputStatusHeight !== undefined ? delta.outputStatusHeight : this._layoutInfo.outputStatusHeight;
@@ -194,6 +269,7 @@ export abstract class DiffElementViewModelBase extends Disposable {
 
 		const totalHeight = editorHeight
 			+ editorMargin
+			+ cellStatusHeight
 			+ metadataHeight
 			+ metadataStatusHeight
 			+ outputHeight
@@ -205,6 +281,7 @@ export abstract class DiffElementViewModelBase extends Disposable {
 			editorHeight: editorHeight,
 			editorMargin: editorMargin,
 			metadataHeight: metadataHeight,
+			cellStatusHeight,
 			metadataStatusHeight: metadataStatusHeight,
 			outputTotalHeight: outputHeight,
 			outputStatusHeight: outputStatusHeight,
@@ -239,6 +316,11 @@ export abstract class DiffElementViewModelBase extends Disposable {
 			somethingChanged = true;
 		}
 
+		if (newLayout.cellStatusHeight !== this._layoutInfo.cellStatusHeight) {
+			changeEvent.cellStatusHeight = true;
+			somethingChanged = true;
+		}
+
 		if (newLayout.metadataStatusHeight !== this._layoutInfo.metadataStatusHeight) {
 			changeEvent.metadataStatusHeight = true;
 			somethingChanged = true;
@@ -288,6 +370,7 @@ export abstract class DiffElementViewModelBase extends Disposable {
 		const totalHeight = editorHeight
 			+ this._layoutInfo.editorMargin
 			+ this._layoutInfo.metadataHeight
+			+ this._layoutInfo.cellStatusHeight
 			+ this._layoutInfo.metadataStatusHeight
 			+ this._layoutInfo.outputTotalHeight
 			+ this._layoutInfo.outputStatusHeight
@@ -329,6 +412,7 @@ export abstract class DiffElementViewModelBase extends Disposable {
 		this.editorEventDispatcher.emit([{ type: NotebookDiffViewEventType.CellLayoutChanged, source: this._layoutInfo }]);
 	}
 
+	abstract checkIfInputModified(): false | { reason: string | undefined };
 	abstract checkIfOutputsModified(): false | { reason: string | undefined };
 	abstract checkMetadataIfModified(): false | { reason: string | undefined };
 	abstract isOutputEmpty(): boolean;
@@ -372,7 +456,7 @@ export abstract class DiffElementViewModelBase extends Disposable {
 	}
 }
 
-export class SideBySideDiffElementViewModel extends DiffElementViewModelBase {
+export class SideBySideDiffElementViewModel extends DiffElementCellViewModelBase {
 	get originalDocument() {
 		return this.otherDocumentTextModel;
 	}
@@ -381,22 +465,23 @@ export class SideBySideDiffElementViewModel extends DiffElementViewModelBase {
 		return this.mainDocumentTextModel;
 	}
 
-	override readonly original: DiffNestedCellViewModel;
-	override readonly modified: DiffNestedCellViewModel;
+	override readonly original!: DiffNestedCellViewModel;
+	override readonly modified!: DiffNestedCellViewModel;
 	override readonly type: 'unchanged' | 'modified';
 
 	constructor(
 		mainDocumentTextModel: NotebookTextModel,
 		readonly otherDocumentTextModel: NotebookTextModel,
-		original: DiffNestedCellViewModel,
-		modified: DiffNestedCellViewModel,
+		original: NotebookCellTextModel,
+		modified: NotebookCellTextModel,
 		type: 'unchanged' | 'modified',
 		editorEventDispatcher: NotebookDiffEditorEventDispatcher,
 		initData: {
 			metadataStatusHeight: number;
 			outputStatusHeight: number;
 			fontInfo: FontInfo | undefined;
-		}
+		},
+		notebookService: INotebookService
 	) {
 		super(
 			mainDocumentTextModel,
@@ -404,12 +489,12 @@ export class SideBySideDiffElementViewModel extends DiffElementViewModelBase {
 			modified,
 			type,
 			editorEventDispatcher,
-			initData);
+			initData,
+			notebookService);
 
-		this.original = original;
-		this.modified = modified;
 		this.type = type;
 
+		this.cellFoldingState = this.modified.textModel.getValue() !== this.original.textModel.getValue() ? PropertyFoldingState.Expanded : PropertyFoldingState.Collapsed;
 		this.metadataFoldingState = PropertyFoldingState.Collapsed;
 		this.outputFoldingState = PropertyFoldingState.Collapsed;
 
@@ -435,7 +520,9 @@ export class SideBySideDiffElementViewModel extends DiffElementViewModelBase {
 				const modifiedMedataRaw = Object.assign({}, this.modified.metadata);
 				const originalCellMetadata = this.original.metadata;
 				for (const key of cellMetadataKeys) {
-					modifiedMedataRaw[key] = originalCellMetadata[key];
+					if (key in originalCellMetadata) {
+						modifiedMedataRaw[key] = originalCellMetadata[key];
+					}
 				}
 
 				this.modified.textModel.metadata = modifiedMedataRaw;
@@ -443,6 +530,14 @@ export class SideBySideDiffElementViewModel extends DiffElementViewModelBase {
 		}));
 	}
 
+	override checkIfInputModified(): false | { reason: string | undefined } {
+		if (this.original.textModel.getTextBufferHash() === this.modified.textModel.getTextBufferHash()) {
+			return false;
+		}
+		return {
+			reason: 'Cell content has changed',
+		};
+	}
 	checkIfOutputsModified() {
 		if (this.mainDocumentTextModel.transientOptions.transientOutputs) {
 			return false;
@@ -491,6 +586,7 @@ export class SideBySideDiffElementViewModel extends DiffElementViewModelBase {
 		return this._layoutInfo.editorHeight
 			+ this._layoutInfo.editorMargin
 			+ this._layoutInfo.metadataHeight
+			+ this._layoutInfo.cellStatusHeight
 			+ this._layoutInfo.metadataStatusHeight
 			+ this._layoutInfo.outputStatusHeight
 			+ this._layoutInfo.bodyMargin / 2
@@ -528,7 +624,7 @@ export class SideBySideDiffElementViewModel extends DiffElementViewModelBase {
 	}
 }
 
-export class SingleSideDiffElementViewModel extends DiffElementViewModelBase {
+export class SingleSideDiffElementViewModel extends DiffElementCellViewModelBase {
 	get cellViewModel() {
 		return this.type === 'insert' ? this.modified! : this.original!;
 	}
@@ -554,17 +650,18 @@ export class SingleSideDiffElementViewModel extends DiffElementViewModelBase {
 	constructor(
 		mainDocumentTextModel: NotebookTextModel,
 		readonly otherDocumentTextModel: NotebookTextModel,
-		original: DiffNestedCellViewModel | undefined,
-		modified: DiffNestedCellViewModel | undefined,
+		original: NotebookCellTextModel | undefined,
+		modified: NotebookCellTextModel | undefined,
 		type: 'insert' | 'delete',
 		editorEventDispatcher: NotebookDiffEditorEventDispatcher,
 		initData: {
 			metadataStatusHeight: number;
 			outputStatusHeight: number;
 			fontInfo: FontInfo | undefined;
-		}
+		},
+		notebookService: INotebookService
 	) {
-		super(mainDocumentTextModel, original, modified, type, editorEventDispatcher, initData);
+		super(mainDocumentTextModel, original, modified, type, editorEventDispatcher, initData, notebookService);
 		this.type = type;
 
 		this._register(this.cellViewModel.onDidChangeOutputLayout(() => {
@@ -572,6 +669,12 @@ export class SingleSideDiffElementViewModel extends DiffElementViewModelBase {
 		}));
 	}
 
+	override checkIfInputModified(): false | { reason: string | undefined } {
+		return {
+			reason: 'Cell content has changed',
+		};
+	}
+
 	getNestedCellViewModel(diffSide: DiffSide): DiffNestedCellViewModel {
 		return this.type === 'insert' ? this.modified! : this.original!;
 	}
@@ -599,6 +702,7 @@ export class SingleSideDiffElementViewModel extends DiffElementViewModelBase {
 		return this._layoutInfo.editorHeight
 			+ this._layoutInfo.editorMargin
 			+ this._layoutInfo.metadataHeight
+			+ this._layoutInfo.cellStatusHeight
 			+ this._layoutInfo.metadataStatusHeight
 			+ this._layoutInfo.outputStatusHeight
 			+ this._layoutInfo.bodyMargin / 2
@@ -720,7 +824,12 @@ export function getFormattedMetadataJSON(documentTextModel: INotebookTextModel,
 		language,
 		...filteredMetadata
 	};
-
+	// Give preference to the language we have been given.
+	// Metadata can contain `language` due to round-tripping of cell metadata.
+	// I.e. we add it here, and then from SCM when we revert the cell, we get this same metadata back with the `language` property.
+	if (language) {
+		obj.language = language;
+	}
 	const metadataSource = toFormattedString(obj, {});
 
 	return metadataSource;
diff --git a/src/vs/workbench/contrib/notebook/browser/diff/notebookDiff.css b/src/vs/workbench/contrib/notebook/browser/diff/notebookDiff.css
index a0a89a75d84..3ee2c8557c9 100644
--- a/src/vs/workbench/contrib/notebook/browser/diff/notebookDiff.css
+++ b/src/vs/workbench/contrib/notebook/browser/diff/notebookDiff.css
@@ -25,6 +25,11 @@
 	flex-direction: row;
 }
 
+.notebook-text-diff-editor .cell-placeholder-body {
+	display: flex;
+	flex-direction: row;
+}
+
 .notebook-text-diff-editor .webview-cover {
 	user-select: initial;
 	-webkit-user-select: initial;
@@ -99,6 +104,7 @@
 	width: 50%;
 }
 
+.notebook-text-diff-editor .cell-diff-editor-container .input-header-container,
 .notebook-text-diff-editor .cell-diff-editor-container .output-header-container,
 .notebook-text-diff-editor .cell-diff-editor-container .metadata-header-container {
 	display: flex;
@@ -107,13 +113,15 @@
 	cursor: default;
 }
 
+.notebook-text-diff-editor .cell-diff-editor-container .input-header-container .property-folding-indicator .codicon,
 .notebook-text-diff-editor .cell-diff-editor-container .output-header-container .property-folding-indicator .codicon,
 .notebook-text-diff-editor .cell-diff-editor-container .metadata-header-container .property-folding-indicator .codicon {
 	visibility: visible;
-	padding: 4px 0 0 10px;
+	padding: 4px 0 0 6px;
 	cursor: pointer;
 }
 
+.notebook-text-diff-editor .cell-diff-editor-container .input-header-container,
 .notebook-text-diff-editor .cell-diff-editor-container .output-header-container,
 .notebook-text-diff-editor .cell-diff-editor-container .metadata-header-container {
 	display: flex;
@@ -121,22 +129,32 @@
 	align-items: center;
 }
 
+.notebook-text-diff-editor .cell-diff-editor-container .input-header-container,
+.notebook-text-diff-editor .cell-diff-editor-container .output-header-container,
+.notebook-text-diff-editor .cell-diff-editor-container .metadata-header-container {
+	cursor: pointer;
+}
+
+.notebook-text-diff-editor .cell-diff-editor-container .input-header-container .property-toolbar,
 .notebook-text-diff-editor .cell-diff-editor-container .output-header-container .property-toolbar,
 .notebook-text-diff-editor .cell-diff-editor-container .metadata-header-container .property-toolbar {
 	margin-left: auto;
 }
 
+.notebook-text-diff-editor .cell-diff-editor-container .input-header-container .property-status,
 .notebook-text-diff-editor .cell-diff-editor-container .output-header-container .property-status,
 .notebook-text-diff-editor .cell-diff-editor-container .metadata-header-container .property-status {
 	font-size: 12px;
 }
 
+.notebook-text-diff-editor .cell-diff-editor-container .input-header-container .property-status span,
 .notebook-text-diff-editor .cell-diff-editor-container .output-header-container .property-status span,
 .notebook-text-diff-editor .cell-diff-editor-container .metadata-header-container .property-status span {
-	margin: 0 0 0 8px;
+	margin: 0 0 0 5px;
 	line-height: 21px;
 }
 
+.notebook-text-diff-editor .cell-diff-editor-container .input-header-container .property-status span.property-description,
 .notebook-text-diff-editor .cell-diff-editor-container .output-header-container .property-status span.property-description,
 .notebook-text-diff-editor .cell-diff-editor-container .metadata-header-container .property-status span.property-description {
 	font-style: italic;
@@ -292,7 +310,7 @@
 	width: 15px !important;
 }
 
-.monaco-workbench .notebook-text-diff-editor  > .monaco-list > .monaco-scrollable-element > .scrollbar.visible {
+.monaco-workbench .notebook-text-diff-editor > .monaco-list > .monaco-scrollable-element > .scrollbar.visible {
 	z-index: var(--z-index-notebook-scrollbar);
 	cursor: default;
 }
@@ -357,6 +375,7 @@
 .notebook-text-diff-editor .cell-body .cell-diff-editor-container.inserted .source-container,
 .notebook-text-diff-editor .cell-body .cell-diff-editor-container.inserted .source-container .monaco-editor .margin,
 .notebook-text-diff-editor .cell-body .cell-diff-editor-container.inserted .source-container .monaco-editor .monaco-editor-background,
+.notebook-text-diff-editor .cell-body .cell-diff-editor-container.inserted .input-header-container,
 .notebook-text-diff-editor .cell-body .cell-diff-editor-container.inserted .metadata-editor-container,
 .notebook-text-diff-editor .cell-body .cell-diff-editor-container.inserted .metadata-editor-container .monaco-editor .margin,
 .notebook-text-diff-editor .cell-body .cell-diff-editor-container.inserted .metadata-editor-container .monaco-editor .monaco-editor-background,
@@ -374,6 +393,7 @@
 .notebook-text-diff-editor .cell-body .cell-diff-editor-container.removed .source-container,
 .notebook-text-diff-editor .cell-body .cell-diff-editor-container.removed .source-container .monaco-editor .margin,
 .notebook-text-diff-editor .cell-body .cell-diff-editor-container.removed .source-container .monaco-editor .monaco-editor-background,
+.notebook-text-diff-editor .cell-body .cell-diff-editor-container.removed .input-header-container,
 .notebook-text-diff-editor .cell-body .cell-diff-editor-container.removed .metadata-editor-container,
 .notebook-text-diff-editor .cell-body .cell-diff-editor-container.removed .metadata-editor-container .monaco-editor .margin,
 .notebook-text-diff-editor .cell-body .cell-diff-editor-container.removed .metadata-editor-container .monaco-editor .monaco-editor-background,
@@ -390,3 +410,60 @@
 .notebook-text-diff-editor .cell-body .cell-diff-editor-container .source-container .monaco-editor .monaco-editor-background {
 	background: var(--vscode-notebook-cellEditorBackground, var(--vscode-editor-background));
 }
+
+/** Overlay to hide the unchanged cells */
+.notebook-text-diff-editor .cell-body.full div.diff-hidden-cells {
+	position: absolute;
+	left: 0;
+
+	font-size: 13px;
+	line-height: 14px;
+}
+
+.notebook-text-diff-editor .cell-body.full div.diff-hidden-cells .center {
+	color: var(--vscode-diffEditor-unchangedRegionForeground);
+	overflow: hidden;
+	display: block;
+	white-space: nowrap;
+
+	height: 24px;
+}
+
+.notebook-text-diff-editor .cell-body.full div.diff-hidden-cells .center span.codicon {
+	vertical-align: middle;
+}
+
+.notebook-text-diff-editor .cell-body.full div.diff-hidden-cells .center a:hover .codicon {
+	cursor: pointer;
+}
+
+/** Overlay to unhide the unchanged cells */
+.notebook-text-diff-editor .cell-placeholder-body {
+	background: var(--vscode-diffEditor-unchangedRegionBackground);
+	color: var(--vscode-diffEditor-unchangedRegionForeground);
+	min-height: 24px;
+}
+
+.notebook-text-diff-editor .cell-placeholder-body div.diff-hidden-cells .center {
+	overflow: hidden;
+	display: block;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+
+	height: 24px;
+}
+
+.notebook-text-diff-editor .cell-placeholder-body .text {
+	/** Add a gap between text and the unfold icon */
+	padding-left: 2px;
+}
+
+.notebook-text-diff-editor .cell-placeholder-body div.diff-hidden-cells .center span.codicon,
+.notebook-text-diff-editor .cell-placeholder-body .text {
+	vertical-align: middle;
+}
+
+.notebook-text-diff-editor .cell-placeholder-body div.diff-hidden-cells .center a:hover .codicon {
+	cursor: pointer;
+	color: var(--vscode-editorLink-activeForeground) !important;
+}
diff --git a/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffActions.ts b/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffActions.ts
index f7cfcf23fec..61d88e867dd 100644
--- a/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffActions.ts
+++ b/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffActions.ts
@@ -10,11 +10,11 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
 import { ContextKeyExpr, ContextKeyExpression } from 'vs/platform/contextkey/common/contextkey';
 import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { ActiveEditorContext } from 'vs/workbench/common/contextkeys';
-import { DiffElementViewModelBase, SideBySideDiffElementViewModel } from 'vs/workbench/contrib/notebook/browser/diff/diffElementViewModel';
-import { INotebookTextDiffEditor, NOTEBOOK_DIFF_CELL_INPUT, NOTEBOOK_DIFF_CELL_PROPERTY, NOTEBOOK_DIFF_CELL_PROPERTY_EXPANDED } from 'vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser';
+import { DiffElementCellViewModelBase, SideBySideDiffElementViewModel } from 'vs/workbench/contrib/notebook/browser/diff/diffElementViewModel';
+import { INotebookTextDiffEditor, NOTEBOOK_DIFF_CELL_IGNORE_WHITESPACE_KEY, NOTEBOOK_DIFF_CELL_INPUT, NOTEBOOK_DIFF_CELL_PROPERTY, NOTEBOOK_DIFF_CELL_PROPERTY_EXPANDED, NOTEBOOK_DIFF_HAS_UNCHANGED_CELLS, NOTEBOOK_DIFF_ITEM_DIFF_STATE, NOTEBOOK_DIFF_ITEM_KIND, NOTEBOOK_DIFF_UNCHANGED_CELLS_HIDDEN } from 'vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser';
 import { NotebookTextDiffEditor } from 'vs/workbench/contrib/notebook/browser/diff/notebookDiffEditor';
 import { NotebookDiffEditorInput } from 'vs/workbench/contrib/notebook/common/notebookDiffEditorInput';
-import { nextChangeIcon, openAsTextIcon, previousChangeIcon, renderOutputIcon, revertIcon } from 'vs/workbench/contrib/notebook/browser/notebookIcons';
+import { nextChangeIcon, openAsTextIcon, previousChangeIcon, renderOutputIcon, revertIcon, toggleWhitespace } from 'vs/workbench/contrib/notebook/browser/notebookIcons';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from 'vs/platform/configuration/common/configurationRegistry';
@@ -22,7 +22,12 @@ import { ICommandActionTitle } from 'vs/platform/action/common/action';
 import { DEFAULT_EDITOR_ASSOCIATION } from 'vs/workbench/common/editor';
 import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { CellEditType, NOTEBOOK_DIFF_EDITOR_ID } from 'vs/workbench/contrib/notebook/common/notebookCommon';
+import { CellEditType, ICellEditOperation, NOTEBOOK_DIFF_EDITOR_ID } from 'vs/workbench/contrib/notebook/common/notebookCommon';
+import { ITextResourceConfigurationService } from 'vs/editor/common/services/textResourceConfiguration';
+import { NotebookMultiTextDiffEditor } from 'vs/workbench/contrib/notebook/browser/diff/notebookMultiDiffEditor';
+import { Codicon } from 'vs/base/common/codicons';
+import type { URI } from 'vs/base/common/uri';
+import { TextEditorSelectionRevealType, type ITextEditorOptions } from 'vs/platform/editor/common/editor';
 
 // ActiveEditorContext.isEqualTo(SearchEditorConstants.SearchEditorID)
 
@@ -32,11 +37,11 @@ registerAction2(class extends Action2 {
 			id: 'notebook.diff.switchToText',
 			icon: openAsTextIcon,
 			title: localize2('notebook.diff.switchToText', 'Open Text Diff Editor'),
-			precondition: ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID),
+			precondition: ContextKeyExpr.or(ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID), ActiveEditorContext.isEqualTo(NotebookMultiTextDiffEditor.ID)),
 			menu: [{
 				id: MenuId.EditorTitle,
 				group: 'navigation',
-				when: ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID)
+				when: ContextKeyExpr.or(ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID), ActiveEditorContext.isEqualTo(NotebookMultiTextDiffEditor.ID)),
 			}]
 		});
 	}
@@ -45,7 +50,10 @@ registerAction2(class extends Action2 {
 		const editorService = accessor.get(IEditorService);
 
 		const activeEditor = editorService.activeEditorPane;
-		if (activeEditor && activeEditor instanceof NotebookTextDiffEditor) {
+		if (!activeEditor) {
+			return;
+		}
+		if (activeEditor instanceof NotebookTextDiffEditor || activeEditor instanceof NotebookMultiTextDiffEditor) {
 			const diffEditorInput = activeEditor.input as NotebookDiffEditorInput;
 
 			await editorService.openEditor(
@@ -62,12 +70,228 @@ registerAction2(class extends Action2 {
 	}
 });
 
+
+registerAction2(class extends Action2 {
+	constructor() {
+		super({
+			id: 'notebook.diffEditor.showUnchangedCells',
+			title: localize2('showUnchangedCells', 'Show Unchanged Cells'),
+			icon: Codicon.unfold,
+			precondition: ContextKeyExpr.and(ActiveEditorContext.isEqualTo(NotebookMultiTextDiffEditor.ID), ContextKeyExpr.has(NOTEBOOK_DIFF_HAS_UNCHANGED_CELLS.key)),
+			menu: {
+				when: ContextKeyExpr.and(ActiveEditorContext.isEqualTo(NotebookMultiTextDiffEditor.ID), ContextKeyExpr.has(NOTEBOOK_DIFF_HAS_UNCHANGED_CELLS.key), ContextKeyExpr.equals(NOTEBOOK_DIFF_UNCHANGED_CELLS_HIDDEN.key, true)),
+				id: MenuId.EditorTitle,
+				order: 22,
+				group: 'navigation',
+			},
+		});
+	}
+
+	run(accessor: ServicesAccessor, ...args: unknown[]): void {
+		const activeEditor = accessor.get(IEditorService).activeEditorPane;
+		if (!activeEditor) {
+			return;
+		}
+		if (activeEditor instanceof NotebookMultiTextDiffEditor) {
+			activeEditor.showUnchanged();
+		}
+	}
+});
+
+registerAction2(class extends Action2 {
+	constructor() {
+		super({
+			id: 'notebook.diffEditor.hideUnchangedCells',
+			title: localize2('hideUnchangedCells', 'Hide Unchanged Cells'),
+			icon: Codicon.fold,
+			precondition: ContextKeyExpr.and(ActiveEditorContext.isEqualTo(NotebookMultiTextDiffEditor.ID), ContextKeyExpr.has(NOTEBOOK_DIFF_HAS_UNCHANGED_CELLS.key)),
+			menu: {
+				when: ContextKeyExpr.and(ActiveEditorContext.isEqualTo(NotebookMultiTextDiffEditor.ID), ContextKeyExpr.has(NOTEBOOK_DIFF_HAS_UNCHANGED_CELLS.key), ContextKeyExpr.equals(NOTEBOOK_DIFF_UNCHANGED_CELLS_HIDDEN.key, false)),
+				id: MenuId.EditorTitle,
+				order: 22,
+				group: 'navigation',
+			},
+		});
+	}
+
+	run(accessor: ServicesAccessor, ...args: unknown[]): void {
+		const activeEditor = accessor.get(IEditorService).activeEditorPane;
+		if (!activeEditor) {
+			return;
+		}
+		if (activeEditor instanceof NotebookMultiTextDiffEditor) {
+			activeEditor.hideUnchanged();
+		}
+	}
+});
+
+registerAction2(class GoToFileAction extends Action2 {
+	constructor() {
+		super({
+			id: 'notebook.diffEditor.2.goToCell',
+			title: localize2('goToCell', 'Go To Cell'),
+			icon: Codicon.goToFile,
+			menu: {
+				when: ContextKeyExpr.and(ActiveEditorContext.isEqualTo(NotebookMultiTextDiffEditor.ID), ContextKeyExpr.equals(NOTEBOOK_DIFF_ITEM_KIND.key, 'Cell'), ContextKeyExpr.notEquals(NOTEBOOK_DIFF_ITEM_DIFF_STATE.key, 'delete')),
+				id: MenuId.MultiDiffEditorFileToolbar,
+				order: 0,
+				group: 'navigation',
+			},
+		});
+	}
+
+	async run(accessor: ServicesAccessor, ...args: any[]): Promise<void> {
+		const uri = args[0] as URI;
+		const editorService = accessor.get(IEditorService);
+		const activeEditorPane = editorService.activeEditorPane;
+		if (!(activeEditorPane instanceof NotebookMultiTextDiffEditor)) {
+			return;
+		}
+
+		await editorService.openEditor({
+			resource: uri,
+			options: {
+				selectionRevealType: TextEditorSelectionRevealType.CenterIfOutsideViewport,
+			} satisfies ITextEditorOptions,
+		});
+	}
+});
+
+const revertInput = localize('notebook.diff.cell.revertInput', "Revert Input");
+
+registerAction2(class extends Action2 {
+	constructor() {
+		super({
+			id: 'notebook.diffEditor.2.cell.revertInput',
+			title: revertInput,
+			icon: revertIcon,
+			menu: {
+				when: ContextKeyExpr.and(ActiveEditorContext.isEqualTo(NotebookMultiTextDiffEditor.ID), ContextKeyExpr.equals(NOTEBOOK_DIFF_ITEM_KIND.key, 'Cell'), ContextKeyExpr.equals(NOTEBOOK_DIFF_ITEM_DIFF_STATE.key, 'modified')),
+				id: MenuId.MultiDiffEditorFileToolbar,
+				order: 2,
+				group: 'navigation',
+			},
+		});
+	}
+
+	async run(accessor: ServicesAccessor, ...args: any[]): Promise<void> {
+		const uri = args[0] as URI;
+		const editorService = accessor.get(IEditorService);
+		const activeEditorPane = editorService.activeEditorPane;
+		if (!(activeEditorPane instanceof NotebookMultiTextDiffEditor)) {
+			return;
+		}
+
+		const item = activeEditorPane.getDiffElementViewModel(uri);
+		if (item && item instanceof SideBySideDiffElementViewModel) {
+			const modified = item.modified;
+			const original = item.original;
+
+			if (!original || !modified) {
+				return;
+			}
+
+			const bulkEditService = accessor.get(IBulkEditService);
+			await bulkEditService.apply([
+				new ResourceTextEdit(modified.uri, { range: modified.textModel.getFullModelRange(), text: original.textModel.getValue() }),
+			], { quotableLabel: 'Revert Notebook Cell Content Change' });
+		}
+	}
+});
+
+const revertOutputs = localize('notebook.diff.cell.revertOutputs', "Revert Outputs");
+
+registerAction2(class extends Action2 {
+	constructor() {
+		super(
+			{
+				id: 'notebook.diffEditor.2.cell.revertOutputs',
+				title: revertOutputs,
+				icon: revertIcon,
+				f1: false,
+				menu: {
+					when: ContextKeyExpr.and(ActiveEditorContext.isEqualTo(NotebookMultiTextDiffEditor.ID), ContextKeyExpr.equals(NOTEBOOK_DIFF_ITEM_KIND.key, 'Output'), ContextKeyExpr.equals(NOTEBOOK_DIFF_ITEM_DIFF_STATE.key, 'modified')),
+					id: MenuId.MultiDiffEditorFileToolbar,
+					order: 2,
+					group: 'navigation',
+				},
+			}
+		);
+	}
+	async run(accessor: ServicesAccessor, ...args: any[]): Promise<void> {
+		const uri = args[0] as URI;
+		const editorService = accessor.get(IEditorService);
+		const activeEditorPane = editorService.activeEditorPane;
+		if (!(activeEditorPane instanceof NotebookMultiTextDiffEditor)) {
+			return;
+		}
+
+		const item = activeEditorPane.getDiffElementViewModel(uri);
+		if (item && item instanceof SideBySideDiffElementViewModel) {
+			const original = item.original;
+
+			const modifiedCellIndex = item.modifiedDocument.cells.findIndex(cell => cell.handle === item.modified.handle);
+			if (modifiedCellIndex === -1) {
+				return;
+			}
+
+			item.mainDocumentTextModel.applyEdits([{
+				editType: CellEditType.Output, index: modifiedCellIndex, outputs: original.outputs
+			}], true, undefined, () => undefined, undefined, true);
+		}
+	}
+});
+
+const revertMetadata = localize('notebook.diff.cell.revertMetadata', "Revert Metadata");
+
+registerAction2(class extends Action2 {
+	constructor() {
+		super(
+			{
+				id: 'notebook.diffEditor.2.cell.revertMetadata',
+				title: revertMetadata,
+				icon: revertIcon,
+				f1: false,
+				menu: {
+					when: ContextKeyExpr.and(ActiveEditorContext.isEqualTo(NotebookMultiTextDiffEditor.ID), ContextKeyExpr.equals(NOTEBOOK_DIFF_ITEM_KIND.key, 'Metadata'), ContextKeyExpr.equals(NOTEBOOK_DIFF_ITEM_DIFF_STATE.key, 'modified')),
+					id: MenuId.MultiDiffEditorFileToolbar,
+					order: 2,
+					group: 'navigation',
+				},
+			}
+		);
+	}
+	async run(accessor: ServicesAccessor, ...args: any[]): Promise<void> {
+		const uri = args[0] as URI;
+		const editorService = accessor.get(IEditorService);
+		const activeEditorPane = editorService.activeEditorPane;
+		if (!(activeEditorPane instanceof NotebookMultiTextDiffEditor)) {
+			return;
+		}
+
+		const item = activeEditorPane.getDiffElementViewModel(uri);
+		if (item && item instanceof SideBySideDiffElementViewModel) {
+			const original = item.original;
+
+			const modifiedCellIndex = item.modifiedDocument.cells.findIndex(cell => cell.handle === item.modified.handle);
+			if (modifiedCellIndex === -1) {
+				return;
+			}
+
+			item.mainDocumentTextModel.applyEdits([{
+				editType: CellEditType.Metadata, index: modifiedCellIndex, metadata: original.metadata
+			}], true, undefined, () => undefined, undefined, true);
+		}
+	}
+});
+
+
 registerAction2(class extends Action2 {
 	constructor() {
 		super(
 			{
 				id: 'notebook.diff.cell.revertMetadata',
-				title: localize('notebook.diff.cell.revertMetadata', "Revert Metadata"),
+				title: revertMetadata,
 				icon: revertIcon,
 				f1: false,
 				menu: {
@@ -78,19 +302,29 @@ registerAction2(class extends Action2 {
 			}
 		);
 	}
-	run(accessor: ServicesAccessor, context?: { cell: DiffElementViewModelBase }) {
+	run(accessor: ServicesAccessor, context?: { cell: DiffElementCellViewModelBase }) {
 		if (!context) {
 			return;
 		}
 
+		if (!(context.cell instanceof SideBySideDiffElementViewModel)) {
+			return;
+		}
+
 		const original = context.cell.original;
 		const modified = context.cell.modified;
 
-		if (!original || !modified) {
+		const modifiedCellIndex = context.cell.mainDocumentTextModel.cells.indexOf(modified.textModel);
+		if (modifiedCellIndex === -1) {
 			return;
 		}
 
-		modified.textModel.metadata = original.metadata;
+		const rawEdits: ICellEditOperation[] = [{ editType: CellEditType.Metadata, index: modifiedCellIndex, metadata: original.metadata }];
+		if (context.cell.original.language && context.cell.modified.language !== context.cell.original.language) {
+			rawEdits.push({ editType: CellEditType.CellLanguage, index: modifiedCellIndex, language: context.cell.original.language });
+		}
+
+		context.cell.modifiedDocument.applyEdits(rawEdits, true, undefined, () => undefined, undefined, true);
 	}
 });
 
@@ -133,7 +367,7 @@ registerAction2(class extends Action2 {
 			}
 		);
 	}
-	run(accessor: ServicesAccessor, context?: { cell: DiffElementViewModelBase }) {
+	run(accessor: ServicesAccessor, context?: { cell: DiffElementCellViewModelBase }) {
 		if (!context) {
 			return;
 		}
@@ -158,7 +392,7 @@ registerAction2(class extends Action2 {
 			}
 		);
 	}
-	run(accessor: ServicesAccessor, context?: { cell: DiffElementViewModelBase }) {
+	run(accessor: ServicesAccessor, context?: { cell: DiffElementCellViewModelBase }) {
 		if (!context) {
 			return;
 		}
@@ -182,24 +416,56 @@ registerAction2(class extends Action2 {
 });
 
 
+registerAction2(class extends Action2 {
+	constructor() {
+		super(
+			{
+				id: 'notebook.toggle.diff.cell.ignoreTrimWhitespace',
+				title: localize('ignoreTrimWhitespace.label', "Show Leading/Trailing Whitespace Differences"),
+				icon: toggleWhitespace,
+				f1: false,
+				menu: {
+					id: MenuId.NotebookDiffCellInputTitle,
+					when: NOTEBOOK_DIFF_CELL_INPUT,
+					order: 1,
+				},
+				precondition: NOTEBOOK_DIFF_CELL_INPUT,
+				toggled: ContextKeyExpr.equals(NOTEBOOK_DIFF_CELL_IGNORE_WHITESPACE_KEY, false),
+			}
+		);
+	}
+	run(accessor: ServicesAccessor, context?: { cell: DiffElementCellViewModelBase }) {
+		const cell = context?.cell;
+		if (!cell?.modified) {
+			return;
+		}
+		const uri = cell.modified.uri;
+		const configService = accessor.get(ITextResourceConfigurationService);
+		const key = 'diffEditor.ignoreTrimWhitespace';
+		const val = configService.getValue(uri, key);
+		configService.updateValue(uri, key, !val);
+	}
+});
+
 registerAction2(class extends Action2 {
 	constructor() {
 		super(
 			{
 				id: 'notebook.diff.cell.revertInput',
-				title: localize('notebook.diff.cell.revertInput', "Revert Input"),
+				title: revertInput,
 				icon: revertIcon,
 				f1: false,
 				menu: {
 					id: MenuId.NotebookDiffCellInputTitle,
-					when: NOTEBOOK_DIFF_CELL_INPUT
+					when: NOTEBOOK_DIFF_CELL_INPUT,
+					order: 2
 				},
 				precondition: NOTEBOOK_DIFF_CELL_INPUT
 
 			}
 		);
 	}
-	run(accessor: ServicesAccessor, context?: { cell: DiffElementViewModelBase }) {
+	run(accessor: ServicesAccessor, context?: { cell: DiffElementCellViewModelBase }) {
 		if (!context) {
 			return;
 		}
@@ -253,7 +519,7 @@ registerAction2(class extends ToggleRenderAction {
 	constructor() {
 		super('notebook.diff.showOutputs',
 			localize2('notebook.diff.showOutputs', 'Show Outputs Differences'),
-			ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID),
+			ContextKeyExpr.or(ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID), ActiveEditorContext.isEqualTo(NotebookMultiTextDiffEditor.ID)),
 			ContextKeyExpr.notEquals('config.notebook.diff.ignoreOutputs', true),
 			2,
 			true,
@@ -266,7 +532,7 @@ registerAction2(class extends ToggleRenderAction {
 	constructor() {
 		super('notebook.diff.showMetadata',
 			localize2('notebook.diff.showMetadata', 'Show Metadata Differences'),
-			ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID),
+			ContextKeyExpr.or(ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID), ActiveEditorContext.isEqualTo(NotebookMultiTextDiffEditor.ID)),
 			ContextKeyExpr.notEquals('config.notebook.diff.ignoreMetadata', true),
 			1,
 			undefined,
diff --git a/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditor.ts b/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditor.ts
index dd98ad9d3a4..5cd6a59ff84 100644
--- a/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditor.ts
+++ b/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditor.ts
@@ -14,9 +14,9 @@ import { getDefaultNotebookCreationOptions } from 'vs/workbench/contrib/notebook
 import { IEditorGroup } from 'vs/workbench/services/editor/common/editorGroupsService';
 import { NotebookDiffEditorInput } from '../../common/notebookDiffEditorInput';
 import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { DiffElementViewModelBase, SideBySideDiffElementViewModel, SingleSideDiffElementViewModel } from 'vs/workbench/contrib/notebook/browser/diff/diffElementViewModel';
+import { DiffElementCellViewModelBase, IDiffElementViewModelBase, SideBySideDiffElementViewModel } from 'vs/workbench/contrib/notebook/browser/diff/diffElementViewModel';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { CellDiffSideBySideRenderer, CellDiffSingleSideRenderer, NotebookCellTextDiffListDelegate, NotebookTextDiffList } from 'vs/workbench/contrib/notebook/browser/diff/notebookDiffList';
+import { CellDiffPlaceholderRenderer, CellDiffSideBySideRenderer, CellDiffSingleSideRenderer, NotebookCellTextDiffListDelegate, NotebookTextDiffList } from 'vs/workbench/contrib/notebook/browser/diff/notebookDiffList';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { diffDiagonalFill, editorBackground, focusBorder, foreground } from 'vs/platform/theme/common/colorRegistry';
 import { INotebookEditorWorkerService } from 'vs/workbench/contrib/notebook/common/services/notebookWorkerService';
@@ -25,14 +25,12 @@ import { IEditorOptions as ICodeEditorOptions } from 'vs/editor/common/config/ed
 import { BareFontInfo, FontInfo } from 'vs/editor/common/config/fontInfo';
 import { PixelRatio } from 'vs/base/browser/pixelRatio';
 import { CellEditState, ICellOutputViewModel, IDisplayOutputLayoutUpdateRequest, IGenericCellViewModel, IInsetRenderOutput, INotebookEditorCreationOptions, INotebookEditorOptions } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { DiffSide, DIFF_CELL_MARGIN, IDiffCellInfo, INotebookTextDiffEditor } from 'vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser';
+import { DiffSide, DIFF_CELL_MARGIN, IDiffCellInfo, INotebookTextDiffEditor, INotebookDiffViewModel } from 'vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser';
 import { Emitter, Event } from 'vs/base/common/event';
 import { DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
 import { EditorPane } from 'vs/workbench/browser/parts/editor/editorPane';
-import { CellUri, INotebookDiffEditorModel, INotebookDiffResult, NOTEBOOK_DIFF_EDITOR_ID, NotebookSetting } from 'vs/workbench/contrib/notebook/common/notebookCommon';
+import { CellUri, INotebookDiffEditorModel, NOTEBOOK_DIFF_EDITOR_ID, NotebookSetting } from 'vs/workbench/contrib/notebook/common/notebookCommon';
 import { URI } from 'vs/base/common/uri';
-import { IDiffChange, IDiffResult } from 'vs/base/common/diff/diff';
-import { NotebookTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookTextModel';
 import { SequencerByKey } from 'vs/base/common/async';
 import { generateUuid } from 'vs/base/common/uuid';
 import { IMouseWheelEvent, StandardMouseEvent } from 'vs/base/browser/mouseEvent';
@@ -46,6 +44,8 @@ import { IEditorOptions } from 'vs/platform/editor/common/editor';
 import { cellIndexesToRanges, cellRangesToIndexes } from 'vs/workbench/contrib/notebook/common/notebookRange';
 import { NotebookDiffOverviewRuler } from 'vs/workbench/contrib/notebook/browser/diff/notebookDiffOverviewRuler';
 import { registerZIndex, ZIndex } from 'vs/platform/layout/browser/zIndexRegistry';
+import { NotebookDiffViewModel } from 'vs/workbench/contrib/notebook/browser/diff/notebookDiffViewModel';
+import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
 
 const $ = DOM.$;
 
@@ -94,14 +94,14 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 	private _overviewRulerContainer!: HTMLElement;
 	private _overviewRuler!: NotebookDiffOverviewRuler;
 	private _dimension: DOM.Dimension | null = null;
-	private _diffElementViewModels: DiffElementViewModelBase[] = [];
+	private notebookDiffViewModel?: INotebookDiffViewModel;
 	private _list!: NotebookTextDiffList;
 	private _modifiedWebview: BackLayerWebView<IDiffCellInfo> | null = null;
 	private _originalWebview: BackLayerWebView<IDiffCellInfo> | null = null;
 	private _webviewTransparentCover: HTMLElement | null = null;
 	private _fontInfo: FontInfo | undefined;
 
-	private readonly _onMouseUp = this._register(new Emitter<{ readonly event: MouseEvent; readonly target: DiffElementViewModelBase }>());
+	private readonly _onMouseUp = this._register(new Emitter<{ readonly event: MouseEvent; readonly target: IDiffElementViewModelBase }>());
 	public readonly onMouseUp = this._onMouseUp.event;
 	private readonly _onDidScroll = this._register(new Emitter<void>());
 	readonly onDidScroll: Event<void> = this._onDidScroll.event;
@@ -149,6 +149,7 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 		@IConfigurationService private readonly configurationService: IConfigurationService,
 		@ITelemetryService telemetryService: ITelemetryService,
 		@IStorageService storageService: IStorageService,
+		@INotebookService private readonly notebookService: INotebookService,
 	) {
 		super(NotebookTextDiffEditor.ID, group, telemetryService, themeService, storageService);
 		this._notebookOptions = instantiationService.createInstance(NotebookOptions, this.window, false, undefined);
@@ -277,6 +278,7 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 		const renderers = [
 			this.instantiationService.createInstance(CellDiffSingleSideRenderer, this),
 			this.instantiationService.createInstance(CellDiffSideBySideRenderer, this),
+			this.instantiationService.createInstance(CellDiffPlaceholderRenderer, this),
 		];
 
 		this._listViewContainer = DOM.append(this._rootElement, DOM.$('.notebook-diff-list-view'));
@@ -331,9 +333,11 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 		);
 
 		this._register(this._list);
-
 		this._register(this._list.onMouseUp(e => {
 			if (e.element) {
+				if (typeof e.index === 'number') {
+					this._list.setFocus([e.index]);
+				}
 				this._onMouseUp.fire({ event: e.browserEvent, target: e.element });
 			}
 		}));
@@ -375,7 +379,7 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 		this._overviewRuler = this._register(this.instantiationService.createInstance(NotebookDiffOverviewRuler, this, NotebookTextDiffEditor.ENTIRE_DIFF_OVERVIEW_WIDTH, this._overviewRulerContainer));
 	}
 
-	private _updateOutputsOffsetsInWebview(scrollTop: number, scrollHeight: number, activeWebview: BackLayerWebView<IDiffCellInfo>, getActiveNestedCell: (diffElement: DiffElementViewModelBase) => DiffNestedCellViewModel | undefined, diffSide: DiffSide) {
+	private _updateOutputsOffsetsInWebview(scrollTop: number, scrollHeight: number, activeWebview: BackLayerWebView<IDiffCellInfo>, getActiveNestedCell: (diffElement: DiffElementCellViewModelBase) => DiffNestedCellViewModel | undefined, diffSide: DiffSide) {
 		activeWebview.element.style.height = `${scrollHeight}px`;
 
 		if (activeWebview.insetMapping) {
@@ -469,6 +473,9 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 		this._modifiedWebview?.element.remove();
 		this._modifiedWebview = null;
 
+		this.notebookDiffViewModel?.dispose();
+		this.notebookDiffViewModel = undefined;
+
 		this._modifiedResourceDisposableStore.clear();
 		this._list.clear();
 
@@ -482,13 +489,13 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 				}
 
 				if (this._modifiedWebview) {
-					this._updateOutputsOffsetsInWebview(this._list.scrollTop, this._list.scrollHeight, this._modifiedWebview, (diffElement: DiffElementViewModelBase) => {
+					this._updateOutputsOffsetsInWebview(this._list.scrollTop, this._list.scrollHeight, this._modifiedWebview, (diffElement: DiffElementCellViewModelBase) => {
 						return diffElement.modified;
 					}, DiffSide.Modified);
 				}
 
 				if (this._originalWebview) {
-					this._updateOutputsOffsetsInWebview(this._list.scrollTop, this._list.scrollHeight, this._originalWebview, (diffElement: DiffElementViewModelBase) => {
+					this._updateOutputsOffsetsInWebview(this._list.scrollTop, this._list.scrollHeight, this._originalWebview, (diffElement: DiffElementCellViewModelBase) => {
 						return diffElement.original;
 					}, DiffSide.Original);
 				}
@@ -502,6 +509,16 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 		this._localStore.add(this._eventDispatcher.onDidChangeCellLayout(() => {
 			updateInsets();
 		}));
+
+		if (this._model) {
+			const vm = this.notebookDiffViewModel = this._register(new NotebookDiffViewModel(this._model, this.notebookEditorWorkerService, this.instantiationService, this.configurationService, this._eventDispatcher!, this.notebookService, this.fontInfo));
+			this._localStore.add(this.notebookDiffViewModel.onDidChangeItems(e => {
+				this._list.splice(e.start, e.deleteCount, e.elements);
+				if (this.isOverviewRulerEnabled()) {
+					this._overviewRuler.updateViewModels(vm.items, this._eventDispatcher);
+				}
+			}));
+		}
 	}
 
 	private async _createModifiedWebview(id: string, viewType: string, resource: URI): Promise<void> {
@@ -543,34 +560,25 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 	}
 
 	async updateLayout(token: CancellationToken, selections?: number[]) {
-		if (!this._model) {
+		if (!this._model || !this.notebookDiffViewModel) {
 			return;
 		}
 
-		const diffResult = await this.notebookEditorWorkerService.computeDiff(this._model.original.resource, this._model.modified.resource);
-
+		const diffResult = await this.notebookDiffViewModel.computeDiff(token);
 		if (token.isCancellationRequested) {
 			// after await the editor might be disposed.
 			return;
 		}
 
-		NotebookTextDiffEditor.prettyChanges(this._model, diffResult.cellsDiff);
-		const { viewModels, firstChangeIndex } = NotebookTextDiffEditor.computeDiff(this.instantiationService, this.configurationService, this._model, this._eventDispatcher!, diffResult, this.fontInfo);
-		const isSame = this._isViewModelTheSame(viewModels);
-
-		if (!isSame) {
+		if (diffResult) {
 			this._originalWebview?.removeInsets([...this._originalWebview?.insetMapping.keys()]);
 			this._modifiedWebview?.removeInsets([...this._modifiedWebview?.insetMapping.keys()]);
-			this._setViewModel(viewModels);
-		}
-
-		// this._diffElementViewModels = viewModels;
-		// this._list.splice(0, this._list.length, this._diffElementViewModels);
 
-		if (this._revealFirst && firstChangeIndex !== -1 && firstChangeIndex < this._list.length) {
-			this._revealFirst = false;
-			this._list.setFocus([firstChangeIndex]);
-			this._list.reveal(firstChangeIndex, 0.3);
+			if (this._revealFirst && diffResult.firstChangeIndex !== -1 && diffResult.firstChangeIndex < this._list.length) {
+				this._revealFirst = false;
+				this._list.setFocus([diffResult.firstChangeIndex]);
+				this._list.reveal(diffResult.firstChangeIndex, 0.3);
+			}
 		}
 
 		if (selections) {
@@ -578,200 +586,6 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 		}
 	}
 
-	private _isViewModelTheSame(viewModels: DiffElementViewModelBase[]) {
-		let isSame = true;
-		if (this._diffElementViewModels.length === viewModels.length) {
-			for (let i = 0; i < viewModels.length; i++) {
-				const a = this._diffElementViewModels[i];
-				const b = viewModels[i];
-
-				if (a.original?.textModel.getHashValue() !== b.original?.textModel.getHashValue()
-					|| a.modified?.textModel.getHashValue() !== b.modified?.textModel.getHashValue()) {
-					isSame = false;
-					break;
-				}
-			}
-		} else {
-			isSame = false;
-		}
-
-		return isSame;
-	}
-
-	private _setViewModel(viewModels: DiffElementViewModelBase[]) {
-		this._diffElementViewModels = viewModels;
-		this._list.splice(0, this._list.length, this._diffElementViewModels);
-		if (this.isOverviewRulerEnabled()) {
-			this._overviewRuler.updateViewModels(this._diffElementViewModels, this._eventDispatcher);
-		}
-	}
-
-	/**
-	 * making sure that swapping cells are always translated to `insert+delete`.
-	 */
-	static prettyChanges(model: INotebookDiffEditorModel, diffResult: IDiffResult) {
-		const changes = diffResult.changes;
-		for (let i = 0; i < diffResult.changes.length - 1; i++) {
-			// then we know there is another change after current one
-			const curr = changes[i];
-			const next = changes[i + 1];
-			const x = curr.originalStart;
-			const y = curr.modifiedStart;
-
-			if (
-				curr.originalLength === 1
-				&& curr.modifiedLength === 0
-				&& next.originalStart === x + 2
-				&& next.originalLength === 0
-				&& next.modifiedStart === y + 1
-				&& next.modifiedLength === 1
-				&& model.original.notebook.cells[x].getHashValue() === model.modified.notebook.cells[y + 1].getHashValue()
-				&& model.original.notebook.cells[x + 1].getHashValue() === model.modified.notebook.cells[y].getHashValue()
-			) {
-				// this is a swap
-				curr.originalStart = x;
-				curr.originalLength = 0;
-				curr.modifiedStart = y;
-				curr.modifiedLength = 1;
-
-				next.originalStart = x + 1;
-				next.originalLength = 1;
-				next.modifiedStart = y + 2;
-				next.modifiedLength = 0;
-
-				i++;
-			}
-		}
-	}
-
-	static computeDiff(instantiationService: IInstantiationService, configurationService: IConfigurationService, model: INotebookDiffEditorModel, eventDispatcher: NotebookDiffEditorEventDispatcher, diffResult: INotebookDiffResult, fontInfo: FontInfo | undefined) {
-		const cellChanges = diffResult.cellsDiff.changes;
-		const diffElementViewModels: DiffElementViewModelBase[] = [];
-		const originalModel = model.original.notebook;
-		const modifiedModel = model.modified.notebook;
-		let originalCellIndex = 0;
-		let modifiedCellIndex = 0;
-
-		let firstChangeIndex = -1;
-		const initData = {
-			metadataStatusHeight: configurationService.getValue('notebook.diff.ignoreMetadata') ? 0 : 25,
-			outputStatusHeight: configurationService.getValue<boolean>('notebook.diff.ignoreOutputs') || !!(modifiedModel.transientOptions.transientOutputs) ? 0 : 25,
-			fontInfo
-		};
-
-		for (let i = 0; i < cellChanges.length; i++) {
-			const change = cellChanges[i];
-			// common cells
-
-			for (let j = 0; j < change.originalStart - originalCellIndex; j++) {
-				const originalCell = originalModel.cells[originalCellIndex + j];
-				const modifiedCell = modifiedModel.cells[modifiedCellIndex + j];
-				if (originalCell.getHashValue() === modifiedCell.getHashValue()) {
-					diffElementViewModels.push(new SideBySideDiffElementViewModel(
-						model.modified.notebook,
-						model.original.notebook,
-						instantiationService.createInstance(DiffNestedCellViewModel, originalCell),
-						instantiationService.createInstance(DiffNestedCellViewModel, modifiedCell),
-						'unchanged',
-						eventDispatcher,
-						initData
-					));
-				} else {
-					if (firstChangeIndex === -1) {
-						firstChangeIndex = diffElementViewModels.length;
-					}
-
-					diffElementViewModels.push(new SideBySideDiffElementViewModel(
-						model.modified.notebook,
-						model.original.notebook,
-						instantiationService.createInstance(DiffNestedCellViewModel, originalCell),
-						instantiationService.createInstance(DiffNestedCellViewModel, modifiedCell),
-						'modified',
-						eventDispatcher,
-						initData
-					));
-				}
-			}
-
-			const modifiedLCS = NotebookTextDiffEditor.computeModifiedLCS(instantiationService, change, originalModel, modifiedModel, eventDispatcher, initData);
-			if (modifiedLCS.length && firstChangeIndex === -1) {
-				firstChangeIndex = diffElementViewModels.length;
-			}
-
-			diffElementViewModels.push(...modifiedLCS);
-			originalCellIndex = change.originalStart + change.originalLength;
-			modifiedCellIndex = change.modifiedStart + change.modifiedLength;
-		}
-
-		for (let i = originalCellIndex; i < originalModel.cells.length; i++) {
-			diffElementViewModels.push(new SideBySideDiffElementViewModel(
-				model.modified.notebook,
-				model.original.notebook,
-				instantiationService.createInstance(DiffNestedCellViewModel, originalModel.cells[i]),
-				instantiationService.createInstance(DiffNestedCellViewModel, modifiedModel.cells[i - originalCellIndex + modifiedCellIndex]),
-				'unchanged',
-				eventDispatcher,
-				initData
-			));
-		}
-
-		return {
-			viewModels: diffElementViewModels,
-			firstChangeIndex
-		};
-	}
-
-	static computeModifiedLCS(instantiationService: IInstantiationService, change: IDiffChange, originalModel: NotebookTextModel, modifiedModel: NotebookTextModel, eventDispatcher: NotebookDiffEditorEventDispatcher, initData: {
-		metadataStatusHeight: number;
-		outputStatusHeight: number;
-		fontInfo: FontInfo | undefined;
-	}) {
-		const result: DiffElementViewModelBase[] = [];
-		// modified cells
-		const modifiedLen = Math.min(change.originalLength, change.modifiedLength);
-
-		for (let j = 0; j < modifiedLen; j++) {
-			const isTheSame = originalModel.cells[change.originalStart + j].equal(modifiedModel.cells[change.modifiedStart + j]);
-			result.push(new SideBySideDiffElementViewModel(
-				modifiedModel,
-				originalModel,
-				instantiationService.createInstance(DiffNestedCellViewModel, originalModel.cells[change.originalStart + j]),
-				instantiationService.createInstance(DiffNestedCellViewModel, modifiedModel.cells[change.modifiedStart + j]),
-				isTheSame ? 'unchanged' : 'modified',
-				eventDispatcher,
-				initData
-			));
-		}
-
-		for (let j = modifiedLen; j < change.originalLength; j++) {
-			// deletion
-			result.push(new SingleSideDiffElementViewModel(
-				originalModel,
-				modifiedModel,
-				instantiationService.createInstance(DiffNestedCellViewModel, originalModel.cells[change.originalStart + j]),
-				undefined,
-				'delete',
-				eventDispatcher,
-				initData
-			));
-		}
-
-		for (let j = modifiedLen; j < change.modifiedLength; j++) {
-			// insertion
-			result.push(new SingleSideDiffElementViewModel(
-				modifiedModel,
-				originalModel,
-				undefined,
-				instantiationService.createInstance(DiffNestedCellViewModel, modifiedModel.cells[change.modifiedStart + j]),
-				'insert',
-				eventDispatcher,
-				initData
-			));
-		}
-
-		return result;
-	}
-
 	scheduleOutputHeightAck(cellInfo: IDiffCellInfo, outputId: string, height: number) {
 		const diffElement = cellInfo.diffElement;
 		// const activeWebview = diffSide === DiffSide.Modified ? this._modifiedWebview : this._originalWebview;
@@ -795,11 +609,11 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 		}, 10);
 	}
 
-	private pendingLayouts = new WeakMap<DiffElementViewModelBase, IDisposable>();
+	private pendingLayouts = new WeakMap<DiffElementCellViewModelBase, IDisposable>();
 
 
-	layoutNotebookCell(cell: DiffElementViewModelBase, height: number) {
-		const relayout = (cell: DiffElementViewModelBase, height: number) => {
+	layoutNotebookCell(cell: DiffElementCellViewModelBase, height: number) {
+		const relayout = (cell: DiffElementCellViewModelBase, height: number) => {
 			this._list.updateElementHeight2(cell, height);
 		};
 
@@ -832,6 +646,9 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 	}
 
 	previousChange(): void {
+		if (!this.notebookDiffViewModel) {
+			return;
+		}
 		let currFocus = this._list.getFocus()[0];
 
 		if (isNaN(currFocus) || currFocus < 0) {
@@ -840,9 +657,10 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 
 		// find the index of previous change
 		let prevChangeIndex = currFocus - 1;
+		const currentViewModels = this.notebookDiffViewModel.items;
 		while (prevChangeIndex >= 0) {
-			const vm = this._diffElementViewModels[prevChangeIndex];
-			if (vm.type !== 'unchanged') {
+			const vm = currentViewModels[prevChangeIndex];
+			if (vm.type !== 'unchanged' && vm.type !== 'placeholder') {
 				break;
 			}
 
@@ -854,7 +672,7 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 			this._list.reveal(prevChangeIndex);
 		} else {
 			// go to the last one
-			const index = findLastIdx(this._diffElementViewModels, vm => vm.type !== 'unchanged');
+			const index = findLastIdx(currentViewModels, vm => vm.type !== 'unchanged' && vm.type !== 'placeholder');
 			if (index >= 0) {
 				this._list.setFocus([index]);
 				this._list.reveal(index);
@@ -863,6 +681,9 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 	}
 
 	nextChange(): void {
+		if (!this.notebookDiffViewModel) {
+			return;
+		}
 		let currFocus = this._list.getFocus()[0];
 
 		if (isNaN(currFocus) || currFocus < 0) {
@@ -871,21 +692,22 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 
 		// find the index of next change
 		let nextChangeIndex = currFocus + 1;
-		while (nextChangeIndex < this._diffElementViewModels.length) {
-			const vm = this._diffElementViewModels[nextChangeIndex];
-			if (vm.type !== 'unchanged') {
+		const currentViewModels = this.notebookDiffViewModel.items;
+		while (nextChangeIndex < currentViewModels.length) {
+			const vm = currentViewModels[nextChangeIndex];
+			if (vm.type !== 'unchanged' && vm.type !== 'placeholder') {
 				break;
 			}
 
 			nextChangeIndex++;
 		}
 
-		if (nextChangeIndex < this._diffElementViewModels.length) {
+		if (nextChangeIndex < currentViewModels.length) {
 			this._list.setFocus([nextChangeIndex]);
 			this._list.reveal(nextChangeIndex);
 		} else {
 			// go to the first one
-			const index = this._diffElementViewModels.findIndex(vm => vm.type !== 'unchanged');
+			const index = currentViewModels.findIndex(vm => vm.type !== 'unchanged' && vm.type !== 'placeholder');
 			if (index >= 0) {
 				this._list.setFocus([index]);
 				this._list.reveal(index);
@@ -893,7 +715,7 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 		}
 	}
 
-	createOutput(cellDiffViewModel: DiffElementViewModelBase, cellViewModel: DiffNestedCellViewModel, output: IInsetRenderOutput, getOffset: () => number, diffSide: DiffSide): void {
+	createOutput(cellDiffViewModel: DiffElementCellViewModelBase, cellViewModel: DiffNestedCellViewModel, output: IInsetRenderOutput, getOffset: () => number, diffSide: DiffSide): void {
 		this._insetModifyQueueByOutputId.queue(output.source.model.outputId + (diffSide === DiffSide.Modified ? '-right' : 'left'), async () => {
 			const activeWebview = diffSide === DiffSide.Modified ? this._modifiedWebview : this._originalWebview;
 			if (!activeWebview) {
@@ -930,7 +752,7 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 		throw new Error('Not implemented');
 	}
 
-	removeInset(cellDiffViewModel: DiffElementViewModelBase, cellViewModel: DiffNestedCellViewModel, displayOutput: ICellOutputViewModel, diffSide: DiffSide) {
+	removeInset(cellDiffViewModel: DiffElementCellViewModelBase, cellViewModel: DiffNestedCellViewModel, displayOutput: ICellOutputViewModel, diffSide: DiffSide) {
 		this._insetModifyQueueByOutputId.queue(displayOutput.model.outputId + (diffSide === DiffSide.Modified ? '-right' : 'left'), async () => {
 			const activeWebview = diffSide === DiffSide.Modified ? this._modifiedWebview : this._originalWebview;
 			if (!activeWebview) {
@@ -945,7 +767,7 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 		});
 	}
 
-	showInset(cellDiffViewModel: DiffElementViewModelBase, cellViewModel: DiffNestedCellViewModel, displayOutput: ICellOutputViewModel, diffSide: DiffSide) {
+	showInset(cellDiffViewModel: DiffElementCellViewModelBase, cellViewModel: DiffNestedCellViewModel, displayOutput: ICellOutputViewModel, diffSide: DiffSide) {
 		this._insetModifyQueueByOutputId.queue(displayOutput.model.outputId + (diffSide === DiffSide.Modified ? '-right' : 'left'), async () => {
 			const activeWebview = diffSide === DiffSide.Modified ? this._modifiedWebview : this._originalWebview;
 			if (!activeWebview) {
@@ -969,7 +791,7 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 		});
 	}
 
-	hideInset(cellDiffViewModel: DiffElementViewModelBase, cellViewModel: DiffNestedCellViewModel, output: ICellOutputViewModel) {
+	hideInset(cellDiffViewModel: DiffElementCellViewModelBase, cellViewModel: DiffNestedCellViewModel, output: ICellOutputViewModel) {
 		this._modifiedWebview?.hideInset(output);
 		this._originalWebview?.hideInset(output);
 	}
@@ -998,8 +820,8 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 		this._modifiedResourceDisposableStore.clear();
 		this._list?.splice(0, this._list?.length || 0);
 		this._model = null;
-		this._diffElementViewModels.forEach(vm => vm.dispose());
-		this._diffElementViewModels = [];
+		this.notebookDiffViewModel?.dispose();
+		this.notebookDiffViewModel = undefined;
 	}
 
 	deltaCellOutputContainerClassNames(diffSide: DiffSide, cellId: string, added: string[], removed: string[]) {
@@ -1024,56 +846,6 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 		};
 	}
 
-	getCellOutputLayoutInfo(nestedCell: DiffNestedCellViewModel) {
-		if (!this._model) {
-			throw new Error('Editor is not attached to model yet');
-		}
-		const documentModel = CellUri.parse(nestedCell.uri);
-		if (!documentModel) {
-			throw new Error('Nested cell in the diff editor has wrong Uri');
-		}
-
-		const belongToOriginalDocument = this._model.original.notebook.uri.toString() === documentModel.notebook.toString();
-		const viewModel = this._diffElementViewModels.find(element => {
-			const textModel = belongToOriginalDocument ? element.original : element.modified;
-			if (!textModel) {
-				return false;
-			}
-
-			if (textModel.uri.toString() === nestedCell.uri.toString()) {
-				return true;
-			}
-
-			return false;
-		});
-
-		if (!viewModel) {
-			throw new Error('Nested cell in the diff editor does not match any diff element');
-		}
-
-		if (viewModel.type === 'unchanged') {
-			return this.getLayoutInfo();
-		}
-
-		if (viewModel.type === 'insert' || viewModel.type === 'delete') {
-			return {
-				width: this._dimension!.width / 2,
-				height: this._dimension!.height / 2,
-				fontInfo: this.fontInfo
-			};
-		}
-
-		if (viewModel.checkIfOutputsModified()) {
-			return {
-				width: this._dimension!.width / 2,
-				height: this._dimension!.height / 2,
-				fontInfo: this.fontInfo
-			};
-		} else {
-			return this.getLayoutInfo();
-		}
-	}
-
 	layout(dimension: DOM.Dimension, _position: DOM.IDomPosition): void {
 		this._rootElement.classList.toggle('mid-width', dimension.width < 1000 && dimension.width >= 600);
 		this._rootElement.classList.toggle('narrow-width', dimension.width < 600);
@@ -1133,4 +905,6 @@ registerThemingParticipant((theme, collector) => {
 	`);
 
 	collector.addRule(`.notebook-text-diff-editor .cell-body { margin: ${DIFF_CELL_MARGIN}px; }`);
+	// We do not want a left margin, as we add an overlay for expanind the collapsed/hidden cells.
+	collector.addRule(`.notebook-text-diff-editor .cell-placeholder-body { margin: ${DIFF_CELL_MARGIN}px 0; }`);
 });
diff --git a/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser.ts b/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser.ts
index 031c2afdc7f..321be79ddb7 100644
--- a/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser.ts
+++ b/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser.ts
@@ -4,10 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { CellLayoutState, ICellOutputViewModel, ICommonCellInfo, IGenericCellViewModel, IInsetRenderOutput } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { DiffElementViewModelBase } from 'vs/workbench/contrib/notebook/browser/diff/diffElementViewModel';
+import { DiffElementCellViewModelBase, IDiffElementViewModelBase } from 'vs/workbench/contrib/notebook/browser/diff/diffElementViewModel';
 import { Event } from 'vs/base/common/event';
 import { BareFontInfo } from 'vs/editor/common/config/fontInfo';
-import { DisposableStore } from 'vs/base/common/lifecycle';
+import { DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
 import { NotebookTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookTextModel';
 import { CodeEditorWidget } from 'vs/editor/browser/widget/codeEditor/codeEditorWidget';
 import { IMouseWheelEvent } from 'vs/base/browser/mouseEvent';
@@ -16,6 +16,8 @@ import { NotebookOptions } from 'vs/workbench/contrib/notebook/browser/notebookO
 import { NotebookLayoutInfo } from 'vs/workbench/contrib/notebook/browser/notebookViewEvents';
 import { WorkbenchToolBar } from 'vs/platform/actions/browser/toolbar';
 import { DiffEditorWidget } from 'vs/editor/browser/widget/diffEditor/diffEditorWidget';
+import { CancellationToken } from 'vs/base/common/cancellation';
+import { localize } from 'vs/nls';
 
 export enum DiffSide {
 	Original = 0,
@@ -23,24 +25,24 @@ export enum DiffSide {
 }
 
 export interface IDiffCellInfo extends ICommonCellInfo {
-	diffElement: DiffElementViewModelBase;
+	diffElement: DiffElementCellViewModelBase;
 }
 
 export interface INotebookTextDiffEditor {
 	notebookOptions: NotebookOptions;
 	readonly textModel?: NotebookTextModel;
-	onMouseUp: Event<{ readonly event: MouseEvent; readonly target: DiffElementViewModelBase }>;
+	onMouseUp: Event<{ readonly event: MouseEvent; readonly target: IDiffElementViewModelBase }>;
 	onDidScroll: Event<void>;
 	onDidDynamicOutputRendered: Event<{ cell: IGenericCellViewModel; output: ICellOutputViewModel }>;
 	getOverflowContainerDomNode(): HTMLElement;
 	getLayoutInfo(): NotebookLayoutInfo;
 	getScrollTop(): number;
 	getScrollHeight(): number;
-	layoutNotebookCell(cell: DiffElementViewModelBase, height: number): void;
-	createOutput(cellDiffViewModel: DiffElementViewModelBase, cellViewModel: IDiffNestedCellViewModel, output: IInsetRenderOutput, getOffset: () => number, diffSide: DiffSide): void;
-	showInset(cellDiffViewModel: DiffElementViewModelBase, cellViewModel: IDiffNestedCellViewModel, displayOutput: ICellOutputViewModel, diffSide: DiffSide): void;
-	removeInset(cellDiffViewModel: DiffElementViewModelBase, cellViewModel: IDiffNestedCellViewModel, output: ICellOutputViewModel, diffSide: DiffSide): void;
-	hideInset(cellDiffViewModel: DiffElementViewModelBase, cellViewModel: IDiffNestedCellViewModel, output: ICellOutputViewModel): void;
+	layoutNotebookCell(cell: DiffElementCellViewModelBase, height: number): void;
+	createOutput(cellDiffViewModel: DiffElementCellViewModelBase, cellViewModel: IDiffNestedCellViewModel, output: IInsetRenderOutput, getOffset: () => number, diffSide: DiffSide): void;
+	showInset(cellDiffViewModel: DiffElementCellViewModelBase, cellViewModel: IDiffNestedCellViewModel, displayOutput: ICellOutputViewModel, diffSide: DiffSide): void;
+	removeInset(cellDiffViewModel: DiffElementCellViewModelBase, cellViewModel: IDiffNestedCellViewModel, output: ICellOutputViewModel, diffSide: DiffSide): void;
+	hideInset(cellDiffViewModel: DiffElementCellViewModelBase, cellViewModel: IDiffNestedCellViewModel, output: ICellOutputViewModel): void;
 	/**
 	 * Trigger the editor to scroll from scroll event programmatically
 	 */
@@ -66,12 +68,22 @@ export interface CellDiffCommonRenderTemplate {
 	readonly bottomBorder: HTMLElement;
 }
 
+export interface CellDiffPlaceholderRenderTemplate {
+	readonly container: HTMLElement;
+	readonly placeholder: HTMLElement;
+	readonly body: HTMLElement;
+	readonly marginOverlay: IDiffCellMarginOverlay;
+	readonly elementDisposables: DisposableStore;
+}
+
 export interface CellDiffSingleSideRenderTemplate extends CellDiffCommonRenderTemplate {
 	readonly container: HTMLElement;
 	readonly body: HTMLElement;
 	readonly diffEditorContainer: HTMLElement;
 	readonly diagonalFill: HTMLElement;
 	readonly elementDisposables: DisposableStore;
+	readonly cellHeaderContainer: HTMLElement;
+	readonly editorContainer: HTMLElement;
 	readonly sourceEditor: CodeEditorWidget;
 	readonly metadataHeaderContainer: HTMLElement;
 	readonly metadataInfoContainer: HTMLElement;
@@ -79,12 +91,18 @@ export interface CellDiffSingleSideRenderTemplate extends CellDiffCommonRenderTe
 	readonly outputInfoContainer: HTMLElement;
 }
 
+export interface IDiffCellMarginOverlay extends IDisposable {
+	onAction: Event<void>;
+	show(): void;
+	hide(): void;
+}
 
 export interface CellDiffSideBySideRenderTemplate extends CellDiffCommonRenderTemplate {
 	readonly container: HTMLElement;
 	readonly body: HTMLElement;
 	readonly diffEditorContainer: HTMLElement;
 	readonly elementDisposables: DisposableStore;
+	readonly cellHeaderContainer: HTMLElement;
 	readonly sourceEditor: DiffEditorWidget;
 	readonly editorContainer: HTMLElement;
 	readonly inputToolbarContainer: HTMLElement;
@@ -93,6 +111,7 @@ export interface CellDiffSideBySideRenderTemplate extends CellDiffCommonRenderTe
 	readonly metadataInfoContainer: HTMLElement;
 	readonly outputHeaderContainer: HTMLElement;
 	readonly outputInfoContainer: HTMLElement;
+	readonly marginOverlay: IDiffCellMarginOverlay;
 }
 
 export interface IDiffElementLayoutInfo {
@@ -101,6 +120,7 @@ export interface IDiffElementLayoutInfo {
 	editorHeight: number;
 	editorMargin: number;
 	metadataHeight: number;
+	cellStatusHeight: number;
 	metadataStatusHeight: number;
 	rawOutputHeight: number;
 	outputMetadataHeight: number;
@@ -121,6 +141,31 @@ export interface CellDiffViewModelLayoutChangeEvent extends IDiffElementSelfLayo
 }
 
 export const DIFF_CELL_MARGIN = 16;
-export const NOTEBOOK_DIFF_CELL_INPUT = new RawContextKey<boolean>('notebookDiffCellInputChanged', false);
-export const NOTEBOOK_DIFF_CELL_PROPERTY = new RawContextKey<boolean>('notebookDiffCellPropertyChanged', false);
-export const NOTEBOOK_DIFF_CELL_PROPERTY_EXPANDED = new RawContextKey<boolean>('notebookDiffCellPropertyExpanded', false);
+export const NOTEBOOK_DIFF_CELL_INPUT = new RawContextKey<boolean>('notebook.diffEditor.cell.inputChanged', false);
+export const NOTEBOOK_DIFF_CELL_IGNORE_WHITESPACE_KEY = 'notebook.diffEditor.cell.ignoreWhitespace';
+export const NOTEBOOK_DIFF_CELL_IGNORE_WHITESPACE = new RawContextKey<boolean>(NOTEBOOK_DIFF_CELL_IGNORE_WHITESPACE_KEY, false);
+export const NOTEBOOK_DIFF_CELL_PROPERTY = new RawContextKey<boolean>('notebook.diffEditor.cell.property.changed', false);
+export const NOTEBOOK_DIFF_CELL_PROPERTY_EXPANDED = new RawContextKey<boolean>('notebook.diffEditor.cell.property.expanded', false);
+export const NOTEBOOK_DIFF_CELLS_COLLAPSED = new RawContextKey<boolean>('notebook.diffEditor.allCollapsed', undefined, localize('notebook.diffEditor.allCollapsed', "Whether all cells in notebook diff editor are collapsed"));
+export const NOTEBOOK_DIFF_HAS_UNCHANGED_CELLS = new RawContextKey<boolean>('notebook.diffEditor.hasUnchangedCells', undefined, localize('notebook.diffEditor.hasUnchangedCells', "Whether there are unchanged cells in the notebook diff editor"));
+export const NOTEBOOK_DIFF_UNCHANGED_CELLS_HIDDEN = new RawContextKey<boolean>('notebook.diffEditor.unchangedCellsAreHidden', undefined, localize('notebook.diffEditor.unchangedCellsAreHidden', "Whether the unchanged cells in the notebook diff editor are hidden"));
+export const NOTEBOOK_DIFF_ITEM_KIND = new RawContextKey<boolean>('notebook.diffEditor.item.kind', undefined, localize('notebook.diffEditor.item.kind', "The kind of item in the notebook diff editor, Cell, Metadata or Output"));
+export const NOTEBOOK_DIFF_ITEM_DIFF_STATE = new RawContextKey<boolean>('notebook.diffEditor.item.state', undefined, localize('notebook.diffEditor.item.state', "The diff state of item in the notebook diff editor, delete, insert, modified or unchanged"));
+
+export interface INotebookDiffViewModelUpdateEvent {
+	readonly start: number;
+	readonly deleteCount: number;
+	readonly elements: readonly IDiffElementViewModelBase[];
+}
+
+export interface INotebookDiffViewModel extends IDisposable {
+	readonly items: readonly IDiffElementViewModelBase[];
+	onDidChangeItems: Event<INotebookDiffViewModelUpdateEvent>;
+	/**
+	 * Computes the differences and generates the viewmodel.
+	 * If view models are generated, then the onDidChangeItems is triggered and will have a return value.
+	 * Else returns `undefined`
+	 * @param token
+	 */
+	computeDiff(token: CancellationToken): Promise<{ firstChangeIndex: number } | undefined>;
+}
diff --git a/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffList.ts b/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffList.ts
index a3cfecd2a6f..55910ef9136 100644
--- a/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffList.ts
+++ b/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffList.ts
@@ -14,9 +14,9 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { IListService, IWorkbenchListOptions, WorkbenchList } from 'vs/platform/list/browser/listService';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { DiffElementViewModelBase, SideBySideDiffElementViewModel, SingleSideDiffElementViewModel } from 'vs/workbench/contrib/notebook/browser/diff/diffElementViewModel';
-import { CellDiffSideBySideRenderTemplate, CellDiffSingleSideRenderTemplate, DIFF_CELL_MARGIN, INotebookTextDiffEditor } from 'vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser';
-import { DeletedElement, getOptimizedNestedCodeEditorWidgetOptions, InsertElement, ModifiedElement } from 'vs/workbench/contrib/notebook/browser/diff/diffComponents';
+import { DiffElementPlaceholderViewModel, IDiffElementViewModelBase, SideBySideDiffElementViewModel, SingleSideDiffElementViewModel } from 'vs/workbench/contrib/notebook/browser/diff/diffElementViewModel';
+import { CellDiffPlaceholderRenderTemplate, CellDiffSideBySideRenderTemplate, CellDiffSingleSideRenderTemplate, DIFF_CELL_MARGIN, INotebookTextDiffEditor } from 'vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser';
+import { CellDiffPlaceholderElement, CollapsedCellOverlayWidget, DeletedElement, getOptimizedNestedCodeEditorWidgetOptions, InsertElement, ModifiedElement, UnchangedCellOverlayWidget } from 'vs/workbench/contrib/notebook/browser/diff/diffComponents';
 import { CodeEditorWidget } from 'vs/editor/browser/widget/codeEditor/codeEditorWidget';
 import { DiffEditorWidget } from 'vs/editor/browser/widget/diffEditor/diffEditorWidget';
 import { IMenuService, MenuItemAction } from 'vs/platform/actions/common/actions';
@@ -30,8 +30,9 @@ import { PixelRatio } from 'vs/base/browser/pixelRatio';
 import { WorkbenchToolBar } from 'vs/platform/actions/browser/toolbar';
 import { fixedDiffEditorOptions, fixedEditorOptions } from 'vs/workbench/contrib/notebook/browser/diff/diffCellEditorOptions';
 import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
+import { localize } from 'vs/nls';
 
-export class NotebookCellTextDiffListDelegate implements IListVirtualDelegate<DiffElementViewModelBase> {
+export class NotebookCellTextDiffListDelegate implements IListVirtualDelegate<IDiffElementViewModelBase> {
 	private readonly lineHeight: number;
 
 	constructor(
@@ -42,15 +43,15 @@ export class NotebookCellTextDiffListDelegate implements IListVirtualDelegate<Di
 		this.lineHeight = BareFontInfo.createFromRawSettings(editorOptions, PixelRatio.getInstance(targetWindow).value).lineHeight;
 	}
 
-	getHeight(element: DiffElementViewModelBase): number {
+	getHeight(element: IDiffElementViewModelBase): number {
 		return element.getHeight(this.lineHeight);
 	}
 
-	hasDynamicHeight(element: DiffElementViewModelBase): boolean {
+	hasDynamicHeight(element: IDiffElementViewModelBase): boolean {
 		return false;
 	}
 
-	getTemplateId(element: DiffElementViewModelBase): string {
+	getTemplateId(element: IDiffElementViewModelBase): string {
 		switch (element.type) {
 			case 'delete':
 			case 'insert':
@@ -58,10 +59,56 @@ export class NotebookCellTextDiffListDelegate implements IListVirtualDelegate<Di
 			case 'modified':
 			case 'unchanged':
 				return CellDiffSideBySideRenderer.TEMPLATE_ID;
+			case 'placeholder':
+				return CellDiffPlaceholderRenderer.TEMPLATE_ID;
 		}
+	}
+}
+
+export class CellDiffPlaceholderRenderer implements IListRenderer<DiffElementPlaceholderViewModel, CellDiffPlaceholderRenderTemplate> {
+	static readonly TEMPLATE_ID = 'cell_diff_placeholder';
+
+	constructor(
+		readonly notebookEditor: INotebookTextDiffEditor,
+		@IInstantiationService protected readonly instantiationService: IInstantiationService
+	) { }
+
+	get templateId() {
+		return CellDiffPlaceholderRenderer.TEMPLATE_ID;
+	}
+
+	renderTemplate(container: HTMLElement): CellDiffPlaceholderRenderTemplate {
+		const body = DOM.$('.cell-placeholder-body');
+		DOM.append(container, body);
+
+		const elementDisposables = new DisposableStore();
+		const marginOverlay = new CollapsedCellOverlayWidget(body);
+		const contents = DOM.append(body, DOM.$('.contents'));
+		const placeholder = DOM.append(contents, DOM.$('span.text', { title: localize('notebook.diff.hiddenCells.expandAll', 'Double click to show') }));
+
+		return {
+			body,
+			container,
+			placeholder,
+			marginOverlay,
+			elementDisposables
+		};
+	}
 
+	renderElement(element: DiffElementPlaceholderViewModel, index: number, templateData: CellDiffPlaceholderRenderTemplate, height: number | undefined): void {
+		templateData.body.classList.remove('left', 'right', 'full');
+		templateData.elementDisposables.add(this.instantiationService.createInstance(CellDiffPlaceholderElement, element, templateData));
+	}
+
+	disposeTemplate(templateData: CellDiffPlaceholderRenderTemplate): void {
+		templateData.container.innerText = '';
+	}
+
+	disposeElement(element: DiffElementPlaceholderViewModel, index: number, templateData: CellDiffPlaceholderRenderTemplate): void {
+		templateData.elementDisposables.clear();
 	}
 }
+
 export class CellDiffSingleSideRenderer implements IListRenderer<SingleSideDiffElementViewModel, CellDiffSingleSideRenderTemplate | CellDiffSideBySideRenderTemplate> {
 	static readonly TEMPLATE_ID = 'cell_diff_single';
 
@@ -82,8 +129,9 @@ export class CellDiffSingleSideRenderer implements IListRenderer<SingleSideDiffE
 
 		const diagonalFill = DOM.append(body, DOM.$('.diagonal-fill'));
 
+		const cellHeaderContainer = DOM.append(diffEditorContainer, DOM.$('.input-header-container'));
 		const sourceContainer = DOM.append(diffEditorContainer, DOM.$('.source-container'));
-		const editor = this._buildSourceEditor(sourceContainer);
+		const { editor, editorContainer } = this._buildSourceEditor(sourceContainer);
 
 		const metadataHeaderContainer = DOM.append(diffEditorContainer, DOM.$('.metadata-header-container'));
 		const metadataInfoContainer = DOM.append(diffEditorContainer, DOM.$('.metadata-info-container'));
@@ -100,8 +148,10 @@ export class CellDiffSingleSideRenderer implements IListRenderer<SingleSideDiffE
 		return {
 			body,
 			container,
+			editorContainer,
 			diffEditorContainer,
 			diagonalFill,
+			cellHeaderContainer,
 			sourceEditor: editor,
 			metadataHeaderContainer,
 			metadataInfoContainer,
@@ -120,6 +170,7 @@ export class CellDiffSingleSideRenderer implements IListRenderer<SingleSideDiffE
 
 		const editor = this.instantiationService.createInstance(CodeEditorWidget, editorContainer, {
 			...fixedEditorOptions,
+			glyphMargin: false,
 			dimension: {
 				width: (this.notebookEditor.getLayoutInfo().width - 2 * DIFF_CELL_MARGIN) / 2 - 18,
 				height: 0
@@ -128,7 +179,7 @@ export class CellDiffSingleSideRenderer implements IListRenderer<SingleSideDiffE
 			overflowWidgetsDomNode: this.notebookEditor.getOverflowContainerDomNode()
 		}, {});
 
-		return editor;
+		return { editor, editorContainer };
 	}
 
 	renderElement(element: SingleSideDiffElementViewModel, index: number, templateData: CellDiffSingleSideRenderTemplate, height: number | undefined): void {
@@ -183,6 +234,7 @@ export class CellDiffSideBySideRenderer implements IListRenderer<SideBySideDiffE
 		const diffEditorContainer = DOM.$('.cell-diff-editor-container');
 		DOM.append(body, diffEditorContainer);
 
+		const cellHeaderContainer = DOM.append(diffEditorContainer, DOM.$('.input-header-container'));
 		const sourceContainer = DOM.append(diffEditorContainer, DOM.$('.source-container'));
 		const { editor, editorContainer } = this._buildSourceEditor(sourceContainer);
 
@@ -196,7 +248,8 @@ export class CellDiffSideBySideRenderer implements IListRenderer<SideBySideDiffE
 				}
 
 				return undefined;
-			}
+			},
+			highlightToggledItems: true
 		});
 
 		const metadataHeaderContainer = DOM.append(diffEditorContainer, DOM.$('.metadata-header-container'));
@@ -210,12 +263,14 @@ export class CellDiffSideBySideRenderer implements IListRenderer<SideBySideDiffE
 		const rightBorder = DOM.append(borderContainer, DOM.$('.right-border'));
 		const topBorder = DOM.append(borderContainer, DOM.$('.top-border'));
 		const bottomBorder = DOM.append(borderContainer, DOM.$('.bottom-border'));
-
+		const marginOverlay = new UnchangedCellOverlayWidget(body);
+		const elementDisposables = new DisposableStore();
 
 		return {
 			body,
 			container,
 			diffEditorContainer,
+			cellHeaderContainer,
 			sourceEditor: editor,
 			editorContainer,
 			inputToolbarContainer,
@@ -228,7 +283,8 @@ export class CellDiffSideBySideRenderer implements IListRenderer<SideBySideDiffE
 			rightBorder,
 			topBorder,
 			bottomBorder,
-			elementDisposables: new DisposableStore()
+			marginOverlay,
+			elementDisposables
 		};
 	}
 
@@ -237,10 +293,6 @@ export class CellDiffSideBySideRenderer implements IListRenderer<SideBySideDiffE
 
 		const editor = this.instantiationService.createInstance(DiffEditorWidget, editorContainer, {
 			...fixedDiffEditorOptions,
-			padding: {
-				top: 24,
-				bottom: 12
-			},
 			overflowWidgetsDomNode: this.notebookEditor.getOverflowContainerDomNode(),
 			originalEditable: false,
 			ignoreTrimWhitespace: false,
@@ -303,7 +355,7 @@ export class NotebookMouseController<T> extends MouseController<T> {
 	}
 }
 
-export class NotebookTextDiffList extends WorkbenchList<DiffElementViewModelBase> implements IDisposable, IStyleController {
+export class NotebookTextDiffList extends WorkbenchList<IDiffElementViewModelBase> implements IDisposable, IStyleController {
 	private styleElement?: HTMLStyleElement;
 
 	get rowsContainer(): HTMLElement {
@@ -313,21 +365,21 @@ export class NotebookTextDiffList extends WorkbenchList<DiffElementViewModelBase
 	constructor(
 		listUser: string,
 		container: HTMLElement,
-		delegate: IListVirtualDelegate<DiffElementViewModelBase>,
-		renderers: IListRenderer<DiffElementViewModelBase, CellDiffSingleSideRenderTemplate | CellDiffSideBySideRenderTemplate>[],
+		delegate: IListVirtualDelegate<IDiffElementViewModelBase>,
+		renderers: IListRenderer<IDiffElementViewModelBase, CellDiffSingleSideRenderTemplate | CellDiffSideBySideRenderTemplate | CellDiffPlaceholderRenderTemplate>[],
 		contextKeyService: IContextKeyService,
-		options: IWorkbenchListOptions<DiffElementViewModelBase>,
+		options: IWorkbenchListOptions<IDiffElementViewModelBase>,
 		@IListService listService: IListService,
 		@IConfigurationService configurationService: IConfigurationService,
 		@IInstantiationService instantiationService: IInstantiationService) {
 		super(listUser, container, delegate, renderers, options, contextKeyService, listService, configurationService, instantiationService);
 	}
 
-	protected override createMouseController(options: IListOptions<DiffElementViewModelBase>): MouseController<DiffElementViewModelBase> {
+	protected override createMouseController(options: IListOptions<IDiffElementViewModelBase>): MouseController<IDiffElementViewModelBase> {
 		return new NotebookMouseController(this);
 	}
 
-	getCellViewScrollTop(element: DiffElementViewModelBase): number {
+	getCellViewScrollTop(element: IDiffElementViewModelBase): number {
 		const index = this.indexOf(element);
 		// if (index === undefined || index < 0 || index >= this.length) {
 		// 	this._getViewIndexUpperBound(element);
@@ -354,7 +406,7 @@ export class NotebookTextDiffList extends WorkbenchList<DiffElementViewModelBase
 	}
 
 
-	updateElementHeight2(element: DiffElementViewModelBase, size: number) {
+	updateElementHeight2(element: IDiffElementViewModelBase, size: number) {
 		const viewIndex = this.indexOf(element);
 		const focused = this.getFocus();
 
diff --git a/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffOverviewRuler.ts b/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffOverviewRuler.ts
index 7d499393536..a63de3c7cbd 100644
--- a/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffOverviewRuler.ts
+++ b/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffOverviewRuler.ts
@@ -10,7 +10,7 @@ import { Color } from 'vs/base/common/color';
 import { DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
 import { defaultInsertColor, defaultRemoveColor, diffInserted, diffOverviewRulerInserted, diffOverviewRulerRemoved, diffRemoved } from 'vs/platform/theme/common/colorRegistry';
 import { IColorTheme, IThemeService, Themable } from 'vs/platform/theme/common/themeService';
-import { DiffElementViewModelBase } from 'vs/workbench/contrib/notebook/browser/diff/diffElementViewModel';
+import { IDiffElementViewModelBase } from 'vs/workbench/contrib/notebook/browser/diff/diffElementViewModel';
 import { NotebookDiffEditorEventDispatcher } from 'vs/workbench/contrib/notebook/browser/diff/eventDispatcher';
 import { INotebookTextDiffEditor } from 'vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser';
 
@@ -20,7 +20,7 @@ export class NotebookDiffOverviewRuler extends Themable {
 	private readonly _domNode: FastDomNode<HTMLCanvasElement>;
 	private readonly _overviewViewportDomElement: FastDomNode<HTMLElement>;
 
-	private _diffElementViewModels: DiffElementViewModelBase[] = [];
+	private _diffElementViewModels: readonly IDiffElementViewModelBase[] = [];
 	private _lanes = 2;
 
 	private _insertColor: Color | null;
@@ -94,7 +94,7 @@ export class NotebookDiffOverviewRuler extends Themable {
 		this._layoutNow();
 	}
 
-	updateViewModels(elements: DiffElementViewModelBase[], eventDispatcher: NotebookDiffEditorEventDispatcher | undefined) {
+	updateViewModels(elements: readonly IDiffElementViewModelBase[], eventDispatcher: NotebookDiffEditorEventDispatcher | undefined) {
 		this._disposables.clear();
 
 		this._diffElementViewModels = elements;
@@ -126,7 +126,7 @@ export class NotebookDiffOverviewRuler extends Themable {
 	private _layoutNow() {
 		const layoutInfo = this.notebookEditor.getLayoutInfo();
 		const height = layoutInfo.height;
-		const contentHeight = this._diffElementViewModels.map(view => view.layoutInfo.totalHeight).reduce((a, b) => a + b, 0);
+		const contentHeight = this._diffElementViewModels.map(view => view.totalHeight).reduce((a, b) => a + b, 0);
 		const ratio = PixelRatio.getInstance(DOM.getWindow(this._domNode.domNode)).value;
 		this._domNode.setWidth(this.width);
 		this._domNode.setHeight(height);
@@ -182,8 +182,7 @@ export class NotebookDiffOverviewRuler extends Themable {
 		for (let i = 0; i < this._diffElementViewModels.length; i++) {
 			const element = this._diffElementViewModels[i];
 
-			const cellHeight = Math.round((element.layoutInfo.totalHeight / scrollHeight) * ratio * height);
-
+			const cellHeight = Math.round((element.totalHeight / scrollHeight) * ratio * height);
 			switch (element.type) {
 				case 'insert':
 					ctx.fillStyle = this._insertColorHex;
@@ -203,6 +202,7 @@ export class NotebookDiffOverviewRuler extends Themable {
 					break;
 			}
 
+
 			currentFrom += cellHeight;
 		}
 	}
diff --git a/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffViewModel.ts b/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffViewModel.ts
new file mode 100644
index 00000000000..dd2b3f12201
--- /dev/null
+++ b/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffViewModel.ts
@@ -0,0 +1,545 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { CancellationToken } from 'vs/base/common/cancellation';
+import { IDiffResult, IDiffChange } from 'vs/base/common/diff/diff';
+import { Emitter, type IValueWithChangeEvent } from 'vs/base/common/event';
+import { Disposable, DisposableStore, dispose } from 'vs/base/common/lifecycle';
+import { Schemas } from 'vs/base/common/network';
+import type { URI } from 'vs/base/common/uri';
+import { FontInfo } from 'vs/editor/common/config/fontInfo';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import type { ContextKeyValue } from 'vs/platform/contextkey/common/contextkey';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { MultiDiffEditorItem } from 'vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService';
+import { DiffElementCellViewModelBase, DiffElementPlaceholderViewModel, IDiffElementViewModelBase, SideBySideDiffElementViewModel, SingleSideDiffElementViewModel } from 'vs/workbench/contrib/notebook/browser/diff/diffElementViewModel';
+import { NotebookDiffEditorEventDispatcher } from 'vs/workbench/contrib/notebook/browser/diff/eventDispatcher';
+import { INotebookDiffViewModel, INotebookDiffViewModelUpdateEvent, NOTEBOOK_DIFF_ITEM_DIFF_STATE, NOTEBOOK_DIFF_ITEM_KIND } from 'vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser';
+import { NotebookTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookTextModel';
+import { CellUri, INotebookDiffEditorModel, INotebookDiffResult } from 'vs/workbench/contrib/notebook/common/notebookCommon';
+import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
+import { INotebookEditorWorkerService } from 'vs/workbench/contrib/notebook/common/services/notebookWorkerService';
+
+export class NotebookDiffViewModel extends Disposable implements INotebookDiffViewModel, IValueWithChangeEvent<readonly MultiDiffEditorItem[]> {
+	private readonly placeholderAndRelatedCells = new Map<DiffElementPlaceholderViewModel, DiffElementCellViewModelBase[]>();
+	private readonly _items: IDiffElementViewModelBase[] = [];
+	get items(): readonly IDiffElementViewModelBase[] {
+		return this._items;
+	}
+	private readonly _onDidChangeItems = this._register(new Emitter<INotebookDiffViewModelUpdateEvent>());
+	public readonly onDidChangeItems = this._onDidChangeItems.event;
+	private readonly disposables = this._register(new DisposableStore());
+	private _onDidChange = this._register(new Emitter<void>());
+	private diffEditorItems: NotebookMultiDiffEditorItem[] = [];
+	public onDidChange = this._onDidChange.event;
+	get value(): readonly NotebookMultiDiffEditorItem[] {
+		return this.diffEditorItems
+			.filter(item => item.type !== 'placeholder')
+			.filter(item => {
+				if (this._includeUnchanged) {
+					return true;
+				}
+				if (item instanceof NotebookMultiDiffEditorCellItem) {
+					return item.type === 'unchanged' && item.containerType === 'unchanged' ? false : true;
+				}
+				if (item instanceof NotebookMultiDiffEditorMetadataItem) {
+					return item.type === 'unchanged' && item.containerType === 'unchanged' ? false : true;
+				}
+				if (item instanceof NotebookMultiDiffEditorOutputItem) {
+					return item.type === 'unchanged' && item.containerType === 'unchanged' ? false : true;
+				}
+				return true;
+			})
+			.filter(item => item instanceof NotebookMultiDiffEditorOutputItem ? !this.hideOutput : true)
+			.filter(item => item instanceof NotebookMultiDiffEditorMetadataItem ? !this.hideCellMetadata : true);
+	}
+
+	private _hasUnchangedCells?: boolean;
+	public get hasUnchangedCells() {
+		return this._hasUnchangedCells === true;
+	}
+	private _includeUnchanged?: boolean;
+	public get includeUnchanged() {
+		return this._includeUnchanged === true;
+	}
+	public set includeUnchanged(value) {
+		this._includeUnchanged = value;
+		this._onDidChange.fire();
+	}
+	private hideOutput?: boolean;
+	private hideCellMetadata?: boolean;
+
+	private originalCellViewModels: DiffElementCellViewModelBase[] = [];
+	constructor(private readonly model: INotebookDiffEditorModel,
+		private readonly notebookEditorWorkerService: INotebookEditorWorkerService,
+		private readonly instantiationService: IInstantiationService,
+		private readonly configurationService: IConfigurationService,
+		private readonly eventDispatcher: NotebookDiffEditorEventDispatcher,
+		private readonly notebookService: INotebookService,
+		private readonly fontInfo?: FontInfo,
+		private readonly excludeUnchangedPlaceholder?: boolean,
+	) {
+		super();
+		this.hideOutput = this.model.modified.notebook.transientOptions.transientOutputs || this.configurationService.getValue<boolean>('notebook.diff.ignoreOutputs');
+		this.hideCellMetadata = this.configurationService.getValue('notebook.diff.ignoreMetadata');
+
+		this._register(this.configurationService.onDidChangeConfiguration(e => {
+			let triggerChange = false;
+			if (e.affectsConfiguration('notebook.diff.ignoreMetadata')) {
+				const newValue = this.configurationService.getValue<boolean>('notebook.diff.ignoreMetadata');
+
+				if (newValue !== undefined && this.hideCellMetadata !== newValue) {
+					this.hideCellMetadata = newValue;
+					triggerChange = true;
+				}
+			}
+
+			if (e.affectsConfiguration('notebook.diff.ignoreOutputs')) {
+				const newValue = this.configurationService.getValue<boolean>('notebook.diff.ignoreOutputs');
+
+				if (newValue !== undefined && this.hideOutput !== (newValue || this.model.modified.notebook.transientOptions.transientOutputs)) {
+					this.hideOutput = newValue || !!(this.model.modified.notebook.transientOptions.transientOutputs);
+					triggerChange = true;
+				}
+			}
+			if (triggerChange) {
+				this._onDidChange.fire();
+			}
+		}));
+	}
+	override dispose() {
+		this.clear();
+		super.dispose();
+	}
+	private clear() {
+		this.disposables.clear();
+		dispose(Array.from(this.placeholderAndRelatedCells.keys()));
+		this.placeholderAndRelatedCells.clear();
+		dispose(this.originalCellViewModels);
+		this.originalCellViewModels = [];
+		dispose(this._items);
+		this._items.splice(0, this._items.length);
+	}
+
+	async computeDiff(token: CancellationToken): Promise<{ firstChangeIndex: number } | undefined> {
+		const diffResult = await this.notebookEditorWorkerService.computeDiff(this.model.original.resource, this.model.modified.resource);
+		if (token.isCancellationRequested) {
+			// after await the editor might be disposed.
+			return;
+		}
+
+		prettyChanges(this.model, diffResult.cellsDiff);
+
+		const { cellDiffInfo, firstChangeIndex } = computeDiff(this.model, diffResult);
+		if (isEqual(cellDiffInfo, this.originalCellViewModels, this.model)) {
+			return;
+		} else {
+			this.updateViewModels(cellDiffInfo);
+			this.updateDiffEditorItems();
+			return { firstChangeIndex };
+		}
+	}
+
+	private updateDiffEditorItems() {
+		this.diffEditorItems = [];
+		const originalSourceUri = this.model.original.resource!;
+		const modifiedSourceUri = this.model.modified.resource!;
+		this._hasUnchangedCells = false;
+		this.items.forEach(item => {
+			switch (item.type) {
+				case 'delete': {
+					this.diffEditorItems.push(new NotebookMultiDiffEditorCellItem(item.original!.uri, undefined, item.type, item.type));
+					const originalMetadata = CellUri.generateCellPropertyUri(originalSourceUri, item.original!.handle, Schemas.vscodeNotebookCellMetadata);
+					this.diffEditorItems.push(new NotebookMultiDiffEditorMetadataItem(originalMetadata, undefined, item.type, item.type));
+					const originalOutput = CellUri.generateCellPropertyUri(originalSourceUri, item.original!.handle, Schemas.vscodeNotebookCellOutput);
+					this.diffEditorItems.push(new NotebookMultiDiffEditorOutputItem(originalOutput, undefined, item.type, item.type));
+					break;
+				}
+				case 'insert': {
+					this.diffEditorItems.push(new NotebookMultiDiffEditorCellItem(undefined, item.modified!.uri, item.type, item.type));
+					const modifiedMetadata = CellUri.generateCellPropertyUri(modifiedSourceUri, item.modified!.handle, Schemas.vscodeNotebookCellMetadata);
+					this.diffEditorItems.push(new NotebookMultiDiffEditorMetadataItem(undefined, modifiedMetadata, item.type, item.type));
+					const modifiedOutput = CellUri.generateCellPropertyUri(modifiedSourceUri, item.modified!.handle, Schemas.vscodeNotebookCellOutput);
+					this.diffEditorItems.push(new NotebookMultiDiffEditorOutputItem(undefined, modifiedOutput, item.type, item.type));
+					break;
+				}
+				case 'modified': {
+					const cellType = item.checkIfInputModified() ? item.type : 'unchanged';
+					const containerChanged = (item.checkIfInputModified() || item.checkMetadataIfModified() || item.checkIfOutputsModified()) ? item.type : 'unchanged';
+					this.diffEditorItems.push(new NotebookMultiDiffEditorCellItem(item.original!.uri, item.modified!.uri, cellType, containerChanged));
+					const originalMetadata = CellUri.generateCellPropertyUri(originalSourceUri, item.original!.handle, Schemas.vscodeNotebookCellMetadata);
+					const modifiedMetadata = CellUri.generateCellPropertyUri(modifiedSourceUri, item.modified!.handle, Schemas.vscodeNotebookCellMetadata);
+					this.diffEditorItems.push(new NotebookMultiDiffEditorMetadataItem(originalMetadata, modifiedMetadata, item.checkMetadataIfModified() ? item.type : 'unchanged', containerChanged));
+					const originalOutput = CellUri.generateCellPropertyUri(originalSourceUri, item.original!.handle, Schemas.vscodeNotebookCellOutput);
+					const modifiedOutput = CellUri.generateCellPropertyUri(modifiedSourceUri, item.modified!.handle, Schemas.vscodeNotebookCellOutput);
+					this.diffEditorItems.push(new NotebookMultiDiffEditorOutputItem(originalOutput, modifiedOutput, item.checkIfOutputsModified() ? item.type : 'unchanged', containerChanged));
+					break;
+				}
+				case 'unchanged': {
+					this._hasUnchangedCells = true;
+					this.diffEditorItems.push(new NotebookMultiDiffEditorCellItem(item.original!.uri, item.modified!.uri, item.type, item.type));
+					const originalMetadata = CellUri.generateCellPropertyUri(originalSourceUri, item.original!.handle, Schemas.vscodeNotebookCellMetadata);
+					const modifiedMetadata = CellUri.generateCellPropertyUri(modifiedSourceUri, item.modified!.handle, Schemas.vscodeNotebookCellMetadata);
+					this.diffEditorItems.push(new NotebookMultiDiffEditorMetadataItem(originalMetadata, modifiedMetadata, item.type, item.type));
+					const originalOutput = CellUri.generateCellPropertyUri(originalSourceUri, item.original!.handle, Schemas.vscodeNotebookCellOutput);
+					const modifiedOutput = CellUri.generateCellPropertyUri(modifiedSourceUri, item.modified!.handle, Schemas.vscodeNotebookCellOutput);
+					this.diffEditorItems.push(new NotebookMultiDiffEditorOutputItem(originalOutput, modifiedOutput, item.type, item.type));
+					break;
+				}
+			}
+		});
+
+		this._onDidChange.fire();
+	}
+
+	private updateViewModels(cellDiffInfo: CellDiffInfo[]) {
+		const cellViewModels = createDiffViewModels(this.instantiationService, this.configurationService, this.model, this.eventDispatcher, cellDiffInfo, this.fontInfo, this.notebookService);
+		const oldLength = this._items.length;
+		this.clear();
+		this._items.splice(0, oldLength);
+
+		let placeholder: DiffElementPlaceholderViewModel | undefined = undefined;
+		this.originalCellViewModels = cellViewModels;
+		cellViewModels.forEach((vm, index) => {
+			if (vm.type === 'unchanged' && !this.excludeUnchangedPlaceholder) {
+				if (!placeholder) {
+					vm.displayIconToHideUnmodifiedCells = true;
+					placeholder = new DiffElementPlaceholderViewModel(vm.mainDocumentTextModel, vm.editorEventDispatcher, vm.initData);
+					this._items.push(placeholder);
+					const placeholderItem = placeholder;
+
+					this.disposables.add(placeholderItem.onUnfoldHiddenCells(() => {
+						const hiddenCellViewModels = this.placeholderAndRelatedCells.get(placeholderItem);
+						if (!Array.isArray(hiddenCellViewModels)) {
+							return;
+						}
+						const start = this._items.indexOf(placeholderItem);
+						this._items.splice(start, 1, ...hiddenCellViewModels);
+						this._onDidChangeItems.fire({ start, deleteCount: 1, elements: hiddenCellViewModels });
+					}));
+					this.disposables.add(vm.onHideUnchangedCells(() => {
+						const hiddenCellViewModels = this.placeholderAndRelatedCells.get(placeholderItem);
+						if (!Array.isArray(hiddenCellViewModels)) {
+							return;
+						}
+						const start = this._items.indexOf(vm);
+						this._items.splice(start, hiddenCellViewModels.length, placeholderItem);
+						this._onDidChangeItems.fire({ start, deleteCount: hiddenCellViewModels.length, elements: [placeholderItem] });
+					}));
+				}
+				const hiddenCellViewModels = this.placeholderAndRelatedCells.get(placeholder) || [];
+				hiddenCellViewModels.push(vm);
+				this.placeholderAndRelatedCells.set(placeholder, hiddenCellViewModels);
+				placeholder.hiddenCells.push(vm);
+			} else {
+				placeholder = undefined;
+				this._items.push(vm);
+			}
+		});
+
+		this._onDidChangeItems.fire({ start: 0, deleteCount: oldLength, elements: this._items });
+	}
+}
+
+
+/**
+ * making sure that swapping cells are always translated to `insert+delete`.
+ */
+export function prettyChanges(model: INotebookDiffEditorModel, diffResult: IDiffResult) {
+	const changes = diffResult.changes;
+	for (let i = 0; i < diffResult.changes.length - 1; i++) {
+		// then we know there is another change after current one
+		const curr = changes[i];
+		const next = changes[i + 1];
+		const x = curr.originalStart;
+		const y = curr.modifiedStart;
+
+		if (
+			curr.originalLength === 1
+			&& curr.modifiedLength === 0
+			&& next.originalStart === x + 2
+			&& next.originalLength === 0
+			&& next.modifiedStart === y + 1
+			&& next.modifiedLength === 1
+			&& model.original.notebook.cells[x].getHashValue() === model.modified.notebook.cells[y + 1].getHashValue()
+			&& model.original.notebook.cells[x + 1].getHashValue() === model.modified.notebook.cells[y].getHashValue()
+		) {
+			// this is a swap
+			curr.originalStart = x;
+			curr.originalLength = 0;
+			curr.modifiedStart = y;
+			curr.modifiedLength = 1;
+
+			next.originalStart = x + 1;
+			next.originalLength = 1;
+			next.modifiedStart = y + 2;
+			next.modifiedLength = 0;
+
+			i++;
+		}
+	}
+}
+
+type CellDiffInfo = {
+	originalCellIndex: number;
+	modifiedCellIndex: number;
+	type: 'unchanged' | 'modified';
+} |
+{
+	originalCellIndex: number;
+	type: 'delete';
+} |
+{
+	modifiedCellIndex: number;
+	type: 'insert';
+};
+function computeDiff(model: INotebookDiffEditorModel, diffResult: INotebookDiffResult) {
+	const cellChanges = diffResult.cellsDiff.changes;
+	const cellDiffInfo: CellDiffInfo[] = [];
+	const originalModel = model.original.notebook;
+	const modifiedModel = model.modified.notebook;
+	let originalCellIndex = 0;
+	let modifiedCellIndex = 0;
+
+	let firstChangeIndex = -1;
+
+	for (let i = 0; i < cellChanges.length; i++) {
+		const change = cellChanges[i];
+		// common cells
+
+		for (let j = 0; j < change.originalStart - originalCellIndex; j++) {
+			const originalCell = originalModel.cells[originalCellIndex + j];
+			const modifiedCell = modifiedModel.cells[modifiedCellIndex + j];
+			if (originalCell.getHashValue() === modifiedCell.getHashValue()) {
+				cellDiffInfo.push({
+					originalCellIndex: originalCellIndex + j,
+					modifiedCellIndex: modifiedCellIndex + j,
+					type: 'unchanged'
+				});
+			} else {
+				if (firstChangeIndex === -1) {
+					firstChangeIndex = cellDiffInfo.length;
+				}
+				cellDiffInfo.push({
+					originalCellIndex: originalCellIndex + j,
+					modifiedCellIndex: modifiedCellIndex + j,
+					type: 'modified'
+				});
+			}
+		}
+
+		const modifiedLCS = computeModifiedLCS(change, originalModel, modifiedModel);
+		if (modifiedLCS.length && firstChangeIndex === -1) {
+			firstChangeIndex = cellDiffInfo.length;
+		}
+
+		cellDiffInfo.push(...modifiedLCS);
+		originalCellIndex = change.originalStart + change.originalLength;
+		modifiedCellIndex = change.modifiedStart + change.modifiedLength;
+	}
+
+	for (let i = originalCellIndex; i < originalModel.cells.length; i++) {
+		cellDiffInfo.push({
+			originalCellIndex: i,
+			modifiedCellIndex: i - originalCellIndex + modifiedCellIndex,
+			type: 'unchanged'
+		});
+	}
+
+	return {
+		cellDiffInfo,
+		firstChangeIndex
+	};
+}
+function isEqual(cellDiffInfo: CellDiffInfo[], viewModels: DiffElementCellViewModelBase[], model: INotebookDiffEditorModel) {
+	if (cellDiffInfo.length !== viewModels.length) {
+		return false;
+	}
+	const originalModel = model.original.notebook;
+	const modifiedModel = model.modified.notebook;
+	for (let i = 0; i < viewModels.length; i++) {
+		const a = cellDiffInfo[i];
+		const b = viewModels[i];
+		if (a.type !== b.type) {
+			return false;
+		}
+		switch (a.type) {
+			case 'delete': {
+				if (originalModel.cells[a.originalCellIndex].handle !== b.original?.handle) {
+					return false;
+				}
+				continue;
+			}
+			case 'insert': {
+				if (modifiedModel.cells[a.modifiedCellIndex].handle !== b.modified?.handle) {
+					return false;
+				}
+				continue;
+			}
+			default: {
+				if (originalModel.cells[a.originalCellIndex].handle !== b.original?.handle) {
+					return false;
+				}
+				if (modifiedModel.cells[a.modifiedCellIndex].handle !== b.modified?.handle) {
+					return false;
+				}
+				continue;
+			}
+		}
+	}
+
+	return true;
+}
+
+function createDiffViewModels(instantiationService: IInstantiationService, configurationService: IConfigurationService, model: INotebookDiffEditorModel, eventDispatcher: NotebookDiffEditorEventDispatcher, computedCellDiffs: CellDiffInfo[], fontInfo: FontInfo | undefined, notebookService: INotebookService) {
+	const originalModel = model.original.notebook;
+	const modifiedModel = model.modified.notebook;
+	const initData = {
+		metadataStatusHeight: configurationService.getValue('notebook.diff.ignoreMetadata') ? 0 : 25,
+		outputStatusHeight: configurationService.getValue<boolean>('notebook.diff.ignoreOutputs') || !!(modifiedModel.transientOptions.transientOutputs) ? 0 : 25,
+		fontInfo
+	};
+
+	return computedCellDiffs.map(diff => {
+		switch (diff.type) {
+			case 'delete': {
+				return new SingleSideDiffElementViewModel(
+					originalModel,
+					modifiedModel,
+					originalModel.cells[diff.originalCellIndex],
+					undefined,
+					'delete',
+					eventDispatcher,
+					initData,
+					notebookService
+				);
+			}
+			case 'insert': {
+				return new SingleSideDiffElementViewModel(
+					modifiedModel,
+					originalModel,
+					undefined,
+					modifiedModel.cells[diff.modifiedCellIndex],
+					'insert',
+					eventDispatcher,
+					initData,
+					notebookService
+				);
+			}
+			case 'modified': {
+				return new SideBySideDiffElementViewModel(
+					model.modified.notebook,
+					model.original.notebook,
+					originalModel.cells[diff.originalCellIndex],
+					modifiedModel.cells[diff.modifiedCellIndex],
+					'modified',
+					eventDispatcher,
+					initData,
+					notebookService
+				);
+			}
+			case 'unchanged': {
+				return new SideBySideDiffElementViewModel(
+					model.modified.notebook,
+					model.original.notebook,
+					originalModel.cells[diff.originalCellIndex],
+					modifiedModel.cells[diff.modifiedCellIndex],
+					'unchanged', eventDispatcher,
+					initData,
+					notebookService
+				);
+			}
+		}
+	});
+}
+
+function computeModifiedLCS(change: IDiffChange, originalModel: NotebookTextModel, modifiedModel: NotebookTextModel) {
+	const result: CellDiffInfo[] = [];
+	// modified cells
+	const modifiedLen = Math.min(change.originalLength, change.modifiedLength);
+
+	for (let j = 0; j < modifiedLen; j++) {
+		const isTheSame = originalModel.cells[change.originalStart + j].equal(modifiedModel.cells[change.modifiedStart + j]);
+		result.push({
+			originalCellIndex: change.originalStart + j,
+			modifiedCellIndex: change.modifiedStart + j,
+			type: isTheSame ? 'unchanged' : 'modified'
+		});
+	}
+
+	for (let j = modifiedLen; j < change.originalLength; j++) {
+		// deletion
+		result.push({
+			originalCellIndex: change.originalStart + j,
+			type: 'delete'
+		});
+	}
+
+	for (let j = modifiedLen; j < change.modifiedLength; j++) {
+		result.push({
+			modifiedCellIndex: change.modifiedStart + j,
+			type: 'insert'
+		});
+	}
+
+	return result;
+}
+
+
+export abstract class NotebookMultiDiffEditorItem extends MultiDiffEditorItem {
+	constructor(
+		originalUri: URI | undefined,
+		modifiedUri: URI | undefined,
+		goToFileUri: URI | undefined,
+		public readonly type: IDiffElementViewModelBase['type'],
+		public readonly containerType: IDiffElementViewModelBase['type'],
+		public kind: 'Cell' | 'Metadata' | 'Output',
+		contextKeys?: Record<string, ContextKeyValue>,
+	) {
+		super(originalUri, modifiedUri, goToFileUri, contextKeys);
+	}
+}
+
+class NotebookMultiDiffEditorCellItem extends NotebookMultiDiffEditorItem {
+	constructor(
+		originalUri: URI | undefined,
+		modifiedUri: URI | undefined,
+		type: IDiffElementViewModelBase['type'],
+		containerType: IDiffElementViewModelBase['type'],
+	) {
+		super(originalUri, modifiedUri, modifiedUri || originalUri, type, containerType, 'Cell', {
+			[NOTEBOOK_DIFF_ITEM_KIND.key]: 'Cell',
+			[NOTEBOOK_DIFF_ITEM_DIFF_STATE.key]: type
+		});
+	}
+}
+
+class NotebookMultiDiffEditorMetadataItem extends NotebookMultiDiffEditorItem {
+	constructor(
+		originalUri: URI | undefined,
+		modifiedUri: URI | undefined,
+		type: IDiffElementViewModelBase['type'],
+		containerType: IDiffElementViewModelBase['type'],
+	) {
+		super(originalUri, modifiedUri, modifiedUri || originalUri, type, containerType, 'Metadata', {
+			[NOTEBOOK_DIFF_ITEM_KIND.key]: 'Metadata',
+			[NOTEBOOK_DIFF_ITEM_DIFF_STATE.key]: type
+		});
+	}
+}
+
+class NotebookMultiDiffEditorOutputItem extends NotebookMultiDiffEditorItem {
+	constructor(
+		originalUri: URI | undefined,
+		modifiedUri: URI | undefined,
+		type: IDiffElementViewModelBase['type'],
+		containerType: IDiffElementViewModelBase['type'],
+	) {
+		super(originalUri, modifiedUri, modifiedUri || originalUri, type, containerType, 'Output', {
+			[NOTEBOOK_DIFF_ITEM_KIND.key]: 'Output',
+			[NOTEBOOK_DIFF_ITEM_DIFF_STATE.key]: type
+		});
+	}
+}
diff --git a/src/vs/workbench/contrib/notebook/browser/diff/notebookMultiDiffEditor.ts b/src/vs/workbench/contrib/notebook/browser/diff/notebookMultiDiffEditor.ts
new file mode 100644
index 00000000000..42740fee41f
--- /dev/null
+++ b/src/vs/workbench/contrib/notebook/browser/diff/notebookMultiDiffEditor.ts
@@ -0,0 +1,283 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as DOM from 'vs/base/browser/dom';
+import { IWorkbenchUIElementFactory, type IResourceLabel } from 'vs/editor/browser/widget/multiDiffEditor/workbenchUIElementFactory';
+import { IStorageService } from 'vs/platform/storage/common/storage';
+import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { IThemeService } from 'vs/platform/theme/common/themeService';
+import { IEditorOpenContext } from 'vs/workbench/common/editor';
+import { IEditorGroup } from 'vs/workbench/services/editor/common/editorGroupsService';
+import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
+import { INotebookEditorWorkerService } from 'vs/workbench/contrib/notebook/common/services/notebookWorkerService';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { IEditorOptions as ICodeEditorOptions } from 'vs/editor/common/config/editorOptions';
+import { BareFontInfo, FontInfo } from 'vs/editor/common/config/fontInfo';
+import { PixelRatio } from 'vs/base/browser/pixelRatio';
+import { DisposableStore } from 'vs/base/common/lifecycle';
+import { EditorPane } from 'vs/workbench/browser/parts/editor/editorPane';
+import { CellUri, INotebookDiffEditorModel, NOTEBOOK_MULTI_DIFF_EDITOR_ID } from 'vs/workbench/contrib/notebook/common/notebookCommon';
+import { FontMeasurements } from 'vs/editor/browser/config/fontMeasurements';
+import { NotebookOptions } from 'vs/workbench/contrib/notebook/browser/notebookOptions';
+import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
+import { NotebookMultiDiffEditorInput, NotebookMultiDiffEditorWidgetInput } from 'vs/workbench/contrib/notebook/browser/diff/notebookMultiDiffEditorInput';
+import { MultiDiffEditorWidget } from 'vs/editor/browser/widget/multiDiffEditor/multiDiffEditorWidget';
+import { ResourceLabel } from 'vs/workbench/browser/labels';
+import type { IMultiDiffEditorOptions } from 'vs/editor/browser/widget/multiDiffEditor/multiDiffEditorWidgetImpl';
+import { INotebookDocumentService } from 'vs/workbench/services/notebook/common/notebookDocumentService';
+import { localize } from 'vs/nls';
+import { Schemas } from 'vs/base/common/network';
+import { getIconClassesForLanguageId } from 'vs/editor/common/services/getIconClasses';
+import { NotebookDiffViewModel } from 'vs/workbench/contrib/notebook/browser/diff/notebookDiffViewModel';
+import { NotebookDiffEditorEventDispatcher } from 'vs/workbench/contrib/notebook/browser/diff/eventDispatcher';
+import { NOTEBOOK_DIFF_CELLS_COLLAPSED, NOTEBOOK_DIFF_HAS_UNCHANGED_CELLS, NOTEBOOK_DIFF_UNCHANGED_CELLS_HIDDEN } from 'vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser';
+import type { DocumentDiffItemViewModel, MultiDiffEditorViewModel } from 'vs/editor/browser/widget/multiDiffEditor/multiDiffEditorViewModel';
+import type { URI } from 'vs/base/common/uri';
+import { type IDiffElementViewModelBase } from 'vs/workbench/contrib/notebook/browser/diff/diffElementViewModel';
+import { autorun, transaction } from 'vs/base/common/observable';
+
+export class NotebookMultiTextDiffEditor extends EditorPane {
+	private _multiDiffEditorWidget?: MultiDiffEditorWidget;
+	static readonly ID: string = NOTEBOOK_MULTI_DIFF_EDITOR_ID;
+	private _fontInfo: FontInfo | undefined;
+	protected _scopeContextKeyService!: IContextKeyService;
+	private readonly modelSpecificResources = this._register(new DisposableStore());
+	private _model?: INotebookDiffEditorModel;
+	private viewModel?: NotebookDiffViewModel;
+	private widgetViewModel?: MultiDiffEditorViewModel;
+	get textModel() {
+		return this._model?.modified.notebook;
+	}
+	private _notebookOptions: NotebookOptions;
+	get notebookOptions() {
+		return this._notebookOptions;
+	}
+	private readonly ctxAllCollapsed = this._parentContextKeyService.createKey<boolean>(NOTEBOOK_DIFF_CELLS_COLLAPSED.key, false);
+	private readonly ctxHasUnchangedCells = this._parentContextKeyService.createKey<boolean>(NOTEBOOK_DIFF_HAS_UNCHANGED_CELLS.key, false);
+	private readonly ctxHiddenUnchangedCells = this._parentContextKeyService.createKey<boolean>(NOTEBOOK_DIFF_UNCHANGED_CELLS_HIDDEN.key, true);
+
+	constructor(
+		group: IEditorGroup,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@IThemeService themeService: IThemeService,
+		@IContextKeyService private readonly _parentContextKeyService: IContextKeyService,
+		@INotebookEditorWorkerService private readonly notebookEditorWorkerService: INotebookEditorWorkerService,
+		@IConfigurationService private readonly configurationService: IConfigurationService,
+		@ITelemetryService telemetryService: ITelemetryService,
+		@IStorageService storageService: IStorageService,
+		@INotebookService private readonly notebookService: INotebookService,
+	) {
+		super(NotebookMultiTextDiffEditor.ID, group, telemetryService, themeService, storageService);
+		this._notebookOptions = instantiationService.createInstance(NotebookOptions, this.window, false, undefined);
+		this._register(this._notebookOptions);
+	}
+
+	private get fontInfo() {
+		if (!this._fontInfo) {
+			this._fontInfo = this.createFontInfo();
+		}
+
+		return this._fontInfo;
+	}
+	override layout(dimension: DOM.Dimension, position?: DOM.IDomPosition): void {
+		this._multiDiffEditorWidget!.layout(dimension);
+	}
+
+	private createFontInfo() {
+		const editorOptions = this.configurationService.getValue<ICodeEditorOptions>('editor');
+		return FontMeasurements.readFontInfo(this.window, BareFontInfo.createFromRawSettings(editorOptions, PixelRatio.getInstance(this.window).value));
+	}
+
+	protected createEditor(parent: HTMLElement): void {
+		this._multiDiffEditorWidget = this._register(this.instantiationService.createInstance(
+			MultiDiffEditorWidget,
+			parent,
+			this.instantiationService.createInstance(WorkbenchUIElementFactory),
+		));
+
+		this._register(this._multiDiffEditorWidget.onDidChangeActiveControl(() => {
+			this._onDidChangeControl.fire();
+		}));
+	}
+	override async setInput(input: NotebookMultiDiffEditorInput, options: IMultiDiffEditorOptions | undefined, context: IEditorOpenContext, token: CancellationToken): Promise<void> {
+		super.setInput(input, options, context, token);
+		const model = await input.resolve();
+		if (this._model !== model) {
+			this._detachModel();
+			this._model = model;
+		}
+		const eventDispatcher = this.modelSpecificResources.add(new NotebookDiffEditorEventDispatcher());
+		this.viewModel = this.modelSpecificResources.add(new NotebookDiffViewModel(model, this.notebookEditorWorkerService, this.instantiationService, this.configurationService, eventDispatcher, this.notebookService, undefined, true));
+		await this.viewModel.computeDiff(this.modelSpecificResources.add(new CancellationTokenSource()).token);
+		this.ctxHasUnchangedCells.set(this.viewModel.hasUnchangedCells);
+		this.ctxHasUnchangedCells.set(this.viewModel.hasUnchangedCells);
+
+		const widgetInput = this.modelSpecificResources.add(NotebookMultiDiffEditorWidgetInput.createInput(this.viewModel, this.instantiationService));
+		this.widgetViewModel = this.modelSpecificResources.add(await widgetInput.getViewModel());
+
+		const itemsWeHaveSeen = new WeakSet<DocumentDiffItemViewModel>();
+		this.modelSpecificResources.add(autorun(reader => {
+			/** @description NotebookDiffEditor => Collapse unmodified items */
+			if (!this.widgetViewModel || !this.viewModel) {
+				return;
+			}
+			const items = this.widgetViewModel.items.read(reader);
+			const diffItems = this.viewModel.value;
+			if (items.length !== diffItems.length) {
+				return;
+			}
+
+			// If cell has not changed, but metadata or output has changed, then collapse the cell & keep output/metadata expanded.
+			// Similarly if the cell has changed, but the metadata or output has not, then expand the cell, but collapse output/metadata.
+			transaction((tx) => {
+				items.forEach(item => {
+					// We do not want to mess with UI state if users change it, hence no need to collapse again.
+					if (itemsWeHaveSeen.has(item)) {
+						return;
+					}
+					itemsWeHaveSeen.add(item);
+					const diffItem = diffItems.find(d => d.modifiedUri?.toString() === item.modifiedUri?.toString() && d.originalUri?.toString() === item.originalUri?.toString());
+					if (diffItem && diffItem.type === 'unchanged') {
+						item.collapsed.set(true, tx);
+					}
+				});
+			});
+		}));
+
+
+		this._multiDiffEditorWidget!.setViewModel(this.widgetViewModel);
+	}
+
+	private _detachModel() {
+		this.viewModel = undefined;
+		this.modelSpecificResources.clear();
+	}
+	_generateFontFamily(): string {
+		return this.fontInfo.fontFamily ?? `"SF Mono", Monaco, Menlo, Consolas, "Ubuntu Mono", "Liberation Mono", "DejaVu Sans Mono", "Courier New", monospace`;
+	}
+	override setOptions(options: IMultiDiffEditorOptions | undefined): void {
+		super.setOptions(options);
+	}
+
+	override getControl() {
+		return this._multiDiffEditorWidget!.getActiveControl();
+	}
+
+	override focus(): void {
+		super.focus();
+
+		this._multiDiffEditorWidget?.getActiveControl()?.focus();
+	}
+
+	override hasFocus(): boolean {
+		return this._multiDiffEditorWidget?.getActiveControl()?.hasTextFocus() || super.hasFocus();
+	}
+
+	override clearInput(): void {
+		super.clearInput();
+		this._multiDiffEditorWidget!.setViewModel(undefined);
+		this.modelSpecificResources.clear();
+		this.viewModel = undefined;
+		this.widgetViewModel = undefined;
+	}
+
+	public expandAll() {
+		if (this.widgetViewModel) {
+			this.widgetViewModel.expandAll();
+			this.ctxAllCollapsed.set(false);
+		}
+	}
+	public collapseAll() {
+		if (this.widgetViewModel) {
+			this.widgetViewModel.collapseAll();
+			this.ctxAllCollapsed.set(true);
+		}
+	}
+
+	public hideUnchanged() {
+		if (this.viewModel) {
+			this.viewModel.includeUnchanged = false;
+			this.ctxHiddenUnchangedCells.set(true);
+		}
+	}
+
+	public showUnchanged() {
+		if (this.viewModel) {
+			this.viewModel.includeUnchanged = true;
+			this.ctxHiddenUnchangedCells.set(false);
+		}
+	}
+
+	public getDiffElementViewModel(uri: URI): IDiffElementViewModelBase | undefined {
+		if (uri.scheme === Schemas.vscodeNotebookCellOutput || uri.scheme === Schemas.vscodeNotebookCellOutputDiff ||
+			uri.scheme === Schemas.vscodeNotebookCellMetadata || uri.scheme === Schemas.vscodeNotebookCellMetadataDiff
+		) {
+			const data = CellUri.parseCellPropertyUri(uri, uri.scheme);
+			if (data) {
+				uri = CellUri.generate(data.notebook, data.handle);
+			}
+		}
+		return this.viewModel?.items.find(c => {
+			switch (c.type) {
+				case 'delete':
+					return c.original?.uri.toString() === uri.toString();
+				case 'insert':
+					return c.modified?.uri.toString() === uri.toString();
+				case 'modified':
+				case 'unchanged':
+					return c.modified?.uri.toString() === uri.toString() || c.original?.uri.toString() === uri.toString();
+				default:
+					return;
+			}
+		});
+	}
+}
+
+
+class WorkbenchUIElementFactory implements IWorkbenchUIElementFactory {
+	constructor(
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+		@INotebookDocumentService private readonly notebookDocumentService: INotebookDocumentService,
+		@INotebookService private readonly notebookService: INotebookService
+	) { }
+
+	createResourceLabel(element: HTMLElement): IResourceLabel {
+		const label = this._instantiationService.createInstance(ResourceLabel, element, {});
+		const that = this;
+		return {
+			setUri(uri, options = {}) {
+				if (!uri) {
+					label.element.clear();
+				} else {
+					let name = '';
+					let description = '';
+					let extraClasses: string[] | undefined = undefined;
+
+					if (uri.scheme === Schemas.vscodeNotebookCell) {
+						const notebookDocument = uri.scheme === Schemas.vscodeNotebookCell ? that.notebookDocumentService.getNotebook(uri) : undefined;
+						const cellIndex = Schemas.vscodeNotebookCell ? that.notebookDocumentService.getNotebook(uri)?.getCellIndex(uri) : undefined;
+						if (notebookDocument && cellIndex !== undefined) {
+							name = localize('notebookCellLabel', "Cell {0}", `${cellIndex + 1}`);
+							const nb = notebookDocument ? that.notebookService.getNotebookTextModel(notebookDocument?.uri) : undefined;
+							const cellLanguage = nb && cellIndex !== undefined ? nb.cells[cellIndex].language : undefined;
+							extraClasses = cellLanguage ? getIconClassesForLanguageId(cellLanguage) : undefined;
+						}
+					} else if (uri.scheme === Schemas.vscodeNotebookCellMetadata || uri.scheme === Schemas.vscodeNotebookCellMetadataDiff) {
+						description = localize('notebookCellMetadataLabel', "Metadata");
+					} else if (uri.scheme === Schemas.vscodeNotebookCellOutput || uri.scheme === Schemas.vscodeNotebookCellOutputDiff) {
+						description = localize('notebookCellOutputLabel', "Output");
+					}
+
+					label.element.setResource({ name, description }, { strikethrough: options.strikethrough, forceLabel: true, hideIcon: !extraClasses, extraClasses });
+				}
+			},
+			dispose() {
+				label.dispose();
+			}
+		};
+	}
+}
diff --git a/src/vs/workbench/contrib/notebook/browser/diff/notebookMultiDiffEditorInput.ts b/src/vs/workbench/contrib/notebook/browser/diff/notebookMultiDiffEditorInput.ts
new file mode 100644
index 00000000000..e0f66116604
--- /dev/null
+++ b/src/vs/workbench/contrib/notebook/browser/diff/notebookMultiDiffEditorInput.ts
@@ -0,0 +1,57 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { URI } from 'vs/base/common/uri';
+import { ITextModelService } from 'vs/editor/common/services/resolverService';
+import { ITextResourceConfigurationService } from 'vs/editor/common/services/textResourceConfiguration';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { MultiDiffEditorInput } from 'vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput';
+import { IMultiDiffSourceResolverService, IResolvedMultiDiffSource, type IMultiDiffSourceResolver } from 'vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService';
+import { NotebookDiffViewModel } from 'vs/workbench/contrib/notebook/browser/diff/notebookDiffViewModel';
+import { NotebookDiffEditorInput } from 'vs/workbench/contrib/notebook/common/notebookDiffEditorInput';
+import { NotebookEditorInput } from 'vs/workbench/contrib/notebook/common/notebookEditorInput';
+import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
+
+export const NotebookMultiDiffEditorScheme = 'multi-cell-notebook-diff-editor';
+
+export class NotebookMultiDiffEditorInput extends NotebookDiffEditorInput {
+	static override readonly ID: string = 'workbench.input.multiDiffNotebookInput';
+	static override create(instantiationService: IInstantiationService, resource: URI, name: string | undefined, description: string | undefined, originalResource: URI, viewType: string) {
+		const original = NotebookEditorInput.getOrCreate(instantiationService, originalResource, undefined, viewType);
+		const modified = NotebookEditorInput.getOrCreate(instantiationService, resource, undefined, viewType);
+		return instantiationService.createInstance(NotebookMultiDiffEditorInput, name, description, original, modified, viewType);
+	}
+}
+
+export class NotebookMultiDiffEditorWidgetInput extends MultiDiffEditorInput implements IMultiDiffSourceResolver {
+	public static createInput(notebookDiffViewModel: NotebookDiffViewModel, instantiationService: IInstantiationService): NotebookMultiDiffEditorWidgetInput {
+		const multiDiffSource = URI.parse(`${NotebookMultiDiffEditorScheme}:${new Date().getMilliseconds().toString() + Math.random().toString()}`);
+		return instantiationService.createInstance(
+			NotebookMultiDiffEditorWidgetInput,
+			multiDiffSource,
+			notebookDiffViewModel
+		);
+	}
+	constructor(
+		multiDiffSource: URI,
+		private readonly notebookDiffViewModel: NotebookDiffViewModel,
+		@ITextModelService _textModelService: ITextModelService,
+		@ITextResourceConfigurationService _textResourceConfigurationService: ITextResourceConfigurationService,
+		@IInstantiationService _instantiationService: IInstantiationService,
+		@IMultiDiffSourceResolverService _multiDiffSourceResolverService: IMultiDiffSourceResolverService,
+		@ITextFileService _textFileService: ITextFileService,
+	) {
+		super(multiDiffSource, undefined, undefined, true, _textModelService, _textResourceConfigurationService, _instantiationService, _multiDiffSourceResolverService, _textFileService);
+		this._register(_multiDiffSourceResolverService.registerResolver(this));
+	}
+
+	canHandleUri(uri: URI): boolean {
+		return uri.toString() === this.multiDiffSource.toString();
+	}
+
+	async resolveDiffSource(_: URI): Promise<IResolvedMultiDiffSource> {
+		return { resources: this.notebookDiffViewModel };
+	}
+}
diff --git a/src/vs/workbench/contrib/notebook/browser/media/notebook.css b/src/vs/workbench/contrib/notebook/browser/media/notebook.css
index d659b3cf277..daa4088d69b 100644
--- a/src/vs/workbench/contrib/notebook/browser/media/notebook.css
+++ b/src/vs/workbench/contrib/notebook/browser/media/notebook.css
@@ -353,6 +353,8 @@
 
 .cell-comment-container.review-widget {
 	border-left: 1px solid var(--vscode-peekView-border); border-right: 1px solid var(--vscode-peekView-border);
+	/* Restore text-wrap to default value to avoid inheriting nowrap from monaco-list. */
+	text-wrap: initial;
 }
 
 .cell-comment-container.review-widget > .head {
@@ -446,6 +448,13 @@
 	background-color: var(--vscode-notebook-symbolHighlightBackground) !important;
 }
 
+/** Cell Multi-Selection highlight */
+.nb-multicursor-selection {
+	min-width: 2px;
+	background-color: fuchsia;
+}
+
+
 /** Cell Search Range selection highlight */
 .monaco-workbench .notebookOverlay .monaco-list .monaco-list-row.code-cell-row.nb-multiCellHighlight .cell-focus-indicator,
 .monaco-workbench .notebookOverlay .monaco-list .monaco-list-row.markdown-cell-row.nb-multiCellHighlight {
diff --git a/src/vs/workbench/contrib/notebook/browser/notebook.contribution.ts b/src/vs/workbench/contrib/notebook/browser/notebook.contribution.ts
index f8ca13d3a1a..2d9999514e3 100644
--- a/src/vs/workbench/contrib/notebook/browser/notebook.contribution.ts
+++ b/src/vs/workbench/contrib/notebook/browser/notebook.contribution.ts
@@ -29,7 +29,7 @@ import { NotebookEditor } from 'vs/workbench/contrib/notebook/browser/notebookEd
 import { NotebookEditorInput, NotebookEditorInputOptions } from 'vs/workbench/contrib/notebook/common/notebookEditorInput';
 import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
 import { NotebookService } from 'vs/workbench/contrib/notebook/browser/services/notebookServiceImpl';
-import { CellKind, CellUri, IResolvedNotebookEditorModel, NotebookWorkingCopyTypeIdentifier, NotebookSetting, ICellOutput, ICell } from 'vs/workbench/contrib/notebook/common/notebookCommon';
+import { CellKind, CellUri, IResolvedNotebookEditorModel, NotebookWorkingCopyTypeIdentifier, NotebookSetting, ICellOutput, ICell, NotebookCellsChangeType } from 'vs/workbench/contrib/notebook/common/notebookCommon';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IUndoRedoService } from 'vs/platform/undoRedo/common/undoRedo';
 import { INotebookEditorModelResolverService } from 'vs/workbench/contrib/notebook/common/notebookEditorModelResolverService';
@@ -44,7 +44,7 @@ import { NotebookEditorWidgetService } from 'vs/workbench/contrib/notebook/brows
 import { IJSONContributionRegistry, Extensions as JSONExtensions } from 'vs/platform/jsonschemas/common/jsonContributionRegistry';
 import { IJSONSchema, IJSONSchemaMap } from 'vs/base/common/jsonSchema';
 import { Event } from 'vs/base/common/event';
-import { getFormattedMetadataJSON, getStreamOutputData } from 'vs/workbench/contrib/notebook/browser/diff/diffElementViewModel';
+import { getFormattedMetadataJSON, getFormattedOutputJSON, getStreamOutputData } from 'vs/workbench/contrib/notebook/browser/diff/diffElementViewModel';
 import { NotebookModelResolverServiceImpl } from 'vs/workbench/contrib/notebook/common/notebookEditorModelResolverServiceImpl';
 import { INotebookKernelHistoryService, INotebookKernelService } from 'vs/workbench/contrib/notebook/common/notebookKernelService';
 import { NotebookKernelService } from 'vs/workbench/contrib/notebook/browser/services/notebookKernelServiceImpl';
@@ -97,6 +97,7 @@ import 'vs/workbench/contrib/notebook/browser/contrib/debug/notebookDebugDecorat
 import 'vs/workbench/contrib/notebook/browser/contrib/execute/executionEditorProgress';
 import 'vs/workbench/contrib/notebook/browser/contrib/kernelDetection/notebookKernelDetection';
 import 'vs/workbench/contrib/notebook/browser/contrib/cellDiagnostics/cellDiagnostics';
+import 'vs/workbench/contrib/notebook/browser/contrib/multicursor/notebookMulticursor';
 
 // Diff Editor Contribution
 import 'vs/workbench/contrib/notebook/browser/diff/notebookDiffActions';
@@ -123,6 +124,8 @@ import { AccessibleViewRegistry } from 'vs/platform/accessibility/browser/access
 import { NotebookAccessibilityHelp } from 'vs/workbench/contrib/notebook/browser/notebookAccessibilityHelp';
 import { NotebookAccessibleView } from 'vs/workbench/contrib/notebook/browser/notebookAccessibleView';
 import { DefaultFormatter } from 'vs/workbench/contrib/format/browser/formatActionsMultiple';
+import { NotebookMultiTextDiffEditor } from 'vs/workbench/contrib/notebook/browser/diff/notebookMultiDiffEditor';
+import { NotebookMultiDiffEditorInput } from 'vs/workbench/contrib/notebook/browser/diff/notebookMultiDiffEditorInput';
 
 // --- Start Positron ---
 import { getShouldUsePositronEditor } from 'vs/workbench/contrib/positronNotebook/browser/positronNotebook.contribution';
@@ -153,7 +156,19 @@ Registry.as<IEditorPaneRegistry>(EditorExtensions.EditorPane).registerEditorPane
 	]
 );
 
+Registry.as<IEditorPaneRegistry>(EditorExtensions.EditorPane).registerEditorPane(
+	EditorPaneDescriptor.create(
+		NotebookMultiTextDiffEditor,
+		NotebookMultiTextDiffEditor.ID,
+		'Notebook Diff Editor'
+	),
+	[
+		new SyncDescriptor(NotebookMultiDiffEditorInput)
+	]
+);
+
 class NotebookDiffEditorSerializer implements IEditorSerializer {
+	constructor(@IConfigurationService private readonly _configurationService: IConfigurationService) { }
 	canSerialize(): boolean {
 		return true;
 	}
@@ -181,8 +196,11 @@ class NotebookDiffEditorSerializer implements IEditorSerializer {
 			return undefined;
 		}
 
-		const input = NotebookDiffEditorInput.create(instantiationService, resource, name, undefined, originalResource, viewType);
-		return input;
+		if (this._configurationService.getValue('notebook.experimental.enableNewDiffEditor')) {
+			return NotebookMultiDiffEditorInput.create(instantiationService, resource, name, undefined, originalResource, viewType);
+		} else {
+			return NotebookDiffEditorInput.create(instantiationService, resource, name, undefined, originalResource, viewType);
+		}
 	}
 
 	static canResolveBackup(editorInput: EditorInput, backupResource: URI): boolean {
@@ -425,15 +443,24 @@ class CellInfoContentProvider {
 		let result: ITextModel | null = null;
 
 		const mode = this._languageService.createById('json');
-
+		const disposables = new DisposableStore();
 		for (const cell of ref.object.notebook.cells) {
 			if (cell.handle === data.handle) {
+				const cellIndex = ref.object.notebook.cells.indexOf(cell);
 				const metadataSource = getFormattedMetadataJSON(ref.object.notebook, cell.metadata, cell.language);
 				result = this._modelService.createModel(
 					metadataSource,
 					mode,
 					resource
 				);
+				this._disposables.push(disposables.add(ref.object.notebook.onDidChangeContent(e => {
+					if (result && e.rawEvents.some(event => (event.kind === NotebookCellsChangeType.ChangeCellMetadata || event.kind === NotebookCellsChangeType.ChangeCellLanguage) && event.index === cellIndex)) {
+						const value = getFormattedMetadataJSON(ref.object.notebook, cell.metadata, cell.language);
+						if (result.getValue() !== value) {
+							result.setValue(getFormattedMetadataJSON(ref.object.notebook, cell.metadata, cell.language));
+						}
+					}
+				})));
 				break;
 			}
 		}
@@ -444,6 +471,7 @@ class CellInfoContentProvider {
 		}
 
 		const once = result.onWillDispose(() => {
+			disposables.dispose();
 			once.dispose();
 			ref.dispose();
 		});
@@ -498,6 +526,40 @@ class CellInfoContentProvider {
 		return result;
 	}
 
+	async provideOutputsTextContent(resource: URI): Promise<ITextModel | null> {
+		const existing = this._modelService.getModel(resource);
+		if (existing) {
+			return existing;
+		}
+
+		const data = CellUri.parseCellPropertyUri(resource, Schemas.vscodeNotebookCellOutput);
+		if (!data) {
+			return null;
+		}
+
+		const ref = await this._notebookModelResolverService.resolve(data.notebook);
+		const cell = ref.object.notebook.cells.find(cell => cell.handle === data.handle);
+
+		if (!cell) {
+			ref.dispose();
+			return null;
+		}
+
+		const mode = this._languageService.createById('json');
+		const model = this._modelService.createModel(getFormattedOutputJSON(cell.outputs || []), mode, resource, true);
+		const cellModelListener = Event.any(cell.onDidChangeOutputs ?? Event.None, cell.onDidChangeOutputItems ?? Event.None)(() => {
+			model.setValue(getFormattedOutputJSON(cell.outputs || []));
+		});
+
+		const once = model.onWillDispose(() => {
+			once.dispose();
+			cellModelListener.dispose();
+			ref.dispose();
+		});
+
+		return model;
+	}
+
 	async provideOutputTextContent(resource: URI): Promise<ITextModel | null> {
 		const existing = this._modelService.getModel(resource);
 		if (existing) {
@@ -506,7 +568,7 @@ class CellInfoContentProvider {
 
 		const data = CellUri.parseCellOutputUri(resource);
 		if (!data) {
-			return null;
+			return this.provideOutputsTextContent(resource);
 		}
 
 		const ref = await this._notebookModelResolverService.resolve(data.notebook);
@@ -1091,11 +1153,6 @@ configurationRegistry.registerConfiguration({
 			],
 			default: 'fullCell'
 		},
-		[NotebookSetting.cellChat]: {
-			markdownDescription: nls.localize('notebook.cellChat', "Enable experimental floating chat widget in notebooks."),
-			type: 'boolean',
-			default: false
-		},
 		[NotebookSetting.cellGenerate]: {
 			markdownDescription: nls.localize('notebook.cellGenerate', "Enable experimental generate action to create code cell with inline chat enabled."),
 			type: 'boolean',
diff --git a/src/vs/workbench/contrib/notebook/browser/notebookAccessibilityHelp.ts b/src/vs/workbench/contrib/notebook/browser/notebookAccessibilityHelp.ts
index efaf3983a26..1068c933d39 100644
--- a/src/vs/workbench/contrib/notebook/browser/notebookAccessibilityHelp.ts
+++ b/src/vs/workbench/contrib/notebook/browser/notebookAccessibilityHelp.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { IAccessibleViewImplentation } from 'vs/platform/accessibility/browser/accessibleViewRegistry';
-import { NOTEBOOK_IS_ACTIVE_EDITOR } from 'vs/workbench/contrib/notebook/common/notebookContextKeys';
+import { NOTEBOOK_EDITOR_FOCUSED } from 'vs/workbench/contrib/notebook/common/notebookContextKeys';
 import { localize } from 'vs/nls';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { AccessibleViewProviderId, AccessibleViewType, AccessibleContentProvider } from 'vs/platform/accessibility/browser/accessibleView';
@@ -16,7 +16,7 @@ import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService
 export class NotebookAccessibilityHelp implements IAccessibleViewImplentation {
 	readonly priority = 105;
 	readonly name = 'notebook';
-	readonly when = NOTEBOOK_IS_ACTIVE_EDITOR;
+	readonly when = NOTEBOOK_EDITOR_FOCUSED;
 	readonly type: AccessibleViewType = AccessibleViewType.Help;
 	getProvider(accessor: ServicesAccessor) {
 		const activeEditor = accessor.get(ICodeEditorService).getActiveCodeEditor()
@@ -33,14 +33,14 @@ export class NotebookAccessibilityHelp implements IAccessibleViewImplentation {
 export function getAccessibilityHelpText(): string {
 	return [
 		localize('notebook.overview', 'The notebook view is a collection of code and markdown cells. Code cells can be executed and will produce output directly below the cell.'),
-		localize('notebook.cell.edit', 'The Edit Cell command<keybinding:notebook.cell.edit> will focus on the cell input.'),
-		localize('notebook.cell.quitEdit', 'The Quit Edit command<keybinding:notebook.cell.quitEdit> will set focus on the cell container. The default (Escape) key may need to be pressed twice first exit the virtual cursor if active.'),
-		localize('notebook.cell.focusInOutput', 'The Focus Output command<keybinding:notebook.cell.focusInOutput> will set focus in the cell\'s output.'),
-		localize('notebook.focusNextEditor', 'The Focus Next Cell Editor command<keybinding:notebook.focusNextEditor> will set focus in the next cell\'s editor.'),
-		localize('notebook.focusPreviousEditor', 'The Focus Previous Cell Editor command<keybinding:notebook.focusPreviousEditor> will set focus in the previous cell\'s editor.'),
+		localize('notebook.cell.edit', 'The Edit Cell command{0} will focus on the cell input.', '<keybinding:notebook.cell.edit>'),
+		localize('notebook.cell.quitEdit', 'The Quit Edit command{0} will set focus on the cell container. The default (Escape) key may need to be pressed twice first exit the virtual cursor if active.', '<keybinding:notebook.cell.quitEdit>'),
+		localize('notebook.cell.focusInOutput', 'The Focus Output command{0} will set focus in the cell\'s output.', '<keybinding:notebook.cell.focusInOutput>'),
+		localize('notebook.focusNextEditor', 'The Focus Next Cell Editor command{0} will set focus in the next cell\'s editor.', '<keybinding:notebook.focusNextEditor>'),
+		localize('notebook.focusPreviousEditor', 'The Focus Previous Cell Editor command{0} will set focus in the previous cell\'s editor.', '<keybinding:notebook.focusPreviousEditor>'),
 		localize('notebook.cellNavigation', 'The up and down arrows will also move focus between cells while focused on the outer cell container.'),
-		localize('notebook.cell.executeAndFocusContainer', 'The Execute Cell command<keybinding:notebook.cell.executeAndFocusContainer> executes the cell that currently has focus.',),
-		localize('notebook.cell.insertCodeCellBelowAndFocusContainer', 'The Insert Cell Above/Below commands will create new empty code cells.'),
+		localize('notebook.cell.executeAndFocusContainer', 'The Execute Cell command{0} executes the cell that currently has focus.', '<keybinding:notebook.cell.executeAndFocusContainer>'),
+		localize('notebook.cell.insertCodeCellBelowAndFocusContainer', 'The Insert Cell Above{0} and Below{1} commands will create new empty code cells.', '<keybinding:notebook.cell.insertCodeCellAbove>', '<keybinding:notebook.cell.insertCodeCellBelow>'),
 		localize('notebook.changeCellType', 'The Change Cell to Code/Markdown commands are used to switch between cell types.')
 	].join('\n');
 }
diff --git a/src/vs/workbench/contrib/notebook/browser/notebookBrowser.ts b/src/vs/workbench/contrib/notebook/browser/notebookBrowser.ts
index b0abb66c5fb..49d3306e1a3 100644
--- a/src/vs/workbench/contrib/notebook/browser/notebookBrowser.ts
+++ b/src/vs/workbench/contrib/notebook/browser/notebookBrowser.ts
@@ -22,13 +22,13 @@ import { IEditorPane, IEditorPaneWithSelection } from 'vs/workbench/common/edito
 import { CellViewModelStateChangeEvent, NotebookCellStateChangedEvent, NotebookLayoutInfo } from 'vs/workbench/contrib/notebook/browser/notebookViewEvents';
 import { NotebookCellTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookCellTextModel';
 import { NotebookTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookTextModel';
-import { CellKind, ICellOutput, INotebookCellStatusBarItem, INotebookRendererInfo, INotebookFindOptions, IOrderedMimeType, NotebookCellInternalMetadata, NotebookCellMetadata, NOTEBOOK_EDITOR_ID, REPL_EDITOR_ID } from 'vs/workbench/contrib/notebook/common/notebookCommon';
+import { CellKind, ICellOutput, INotebookCellStatusBarItem, INotebookRendererInfo, INotebookFindOptions, IOrderedMimeType, NotebookCellInternalMetadata, NotebookCellMetadata, NOTEBOOK_EDITOR_ID } from 'vs/workbench/contrib/notebook/common/notebookCommon';
 import { isCompositeNotebookEditorInput } from 'vs/workbench/contrib/notebook/common/notebookEditorInput';
 import { INotebookKernel } from 'vs/workbench/contrib/notebook/common/notebookKernelService';
 import { NotebookOptions } from 'vs/workbench/contrib/notebook/browser/notebookOptions';
 import { cellRangesToIndexes, ICellRange, reduceCellRanges } from 'vs/workbench/contrib/notebook/common/notebookRange';
 import { IWebviewElement } from 'vs/workbench/contrib/webview/browser/webview';
-import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
+import { IEditorCommentsOptions, IEditorOptions } from 'vs/editor/common/config/editorOptions';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { IObservable } from 'vs/base/common/observable';
@@ -256,6 +256,7 @@ export interface ICellViewModel extends IGenericCellViewModel {
 	readonly mime: string;
 	cellKind: CellKind;
 	lineNumbers: 'on' | 'off' | 'inherit';
+	commentOptions: IEditorCommentsOptions;
 	chatHeight: number;
 	commentHeight: number;
 	focusMode: CellFocusMode;
@@ -271,6 +272,7 @@ export interface ICellViewModel extends IGenericCellViewModel {
 	hasModel(): this is IEditableCellViewModel;
 	resolveTextModel(): Promise<ITextModel>;
 	getSelections(): Selection[];
+	setSelections(selections: Selection[]): void;
 	getSelectionsStartPosition(): IPosition[] | undefined;
 	getCellDecorations(): INotebookCellDecorationOptions[];
 	getCellStatusBarItems(): INotebookCellStatusBarItem[];
@@ -360,6 +362,7 @@ export interface INotebookEditorOptions extends ITextEditorOptions {
 	readonly isReadOnly?: boolean;
 	readonly viewState?: INotebookEditorViewState;
 	readonly indexedCellOptions?: { index: number; selection?: IRange };
+	readonly label?: string;
 }
 
 export type INotebookEditorContributionCtor = IConstructorSignature<INotebookEditorContribution, [INotebookEditor]>;
@@ -483,7 +486,9 @@ export interface INotebookEditor {
 	readonly onDidFocusWidget: Event<void>;
 	readonly onDidBlurWidget: Event<void>;
 	readonly onDidScroll: Event<void>;
+	readonly onDidChangeLayout: Event<void>;
 	readonly onDidChangeActiveCell: Event<void>;
+	readonly onDidChangeActiveEditor: Event<INotebookEditor>;
 	readonly onDidChangeActiveKernel: Event<void>;
 	readonly onMouseUp: Event<INotebookEditorMouseEvent>;
 	readonly onMouseDown: Event<INotebookEditorMouseEvent>;
@@ -499,9 +504,14 @@ export interface INotebookEditor {
 	readonly isDisposed: boolean;
 	readonly activeKernel: INotebookKernel | undefined;
 	readonly scrollTop: number;
+	readonly scrollBottom: number;
 	readonly scopedContextKeyService: IContextKeyService;
+	/**
+	 * Required for Composite Editor check. The interface should not be changed.
+	 */
 	readonly activeCodeEditor: ICodeEditor | undefined;
 	readonly codeEditors: [ICellViewModel, ICodeEditor][];
+	readonly activeCellAndCodeEditor: [ICellViewModel, ICodeEditor] | undefined;
 	//#endregion
 
 	getLength(): number;
@@ -520,6 +530,7 @@ export interface INotebookEditor {
 	getEditorViewState(): INotebookEditorViewState;
 	restoreListViewState(viewState: INotebookEditorViewState | undefined): void;
 
+	getBaseCellEditorOptions(language: string): IBaseCellEditorOptions;
 
 	/**
 	 * Focus the active cell in notebook cell list
@@ -780,7 +791,6 @@ export interface INotebookEditorDelegate extends INotebookEditor {
 	readonly creationOptions: INotebookEditorCreationOptions;
 	readonly onDidChangeOptions: Event<void>;
 	readonly onDidChangeDecorations: Event<void>;
-	getBaseCellEditorOptions(language: string): IBaseCellEditorOptions;
 	createMarkupPreview(cell: ICellViewModel): Promise<void>;
 	unhideMarkupPreviews(cells: readonly ICellViewModel[]): Promise<void>;
 	hideMarkupPreviews(cells: readonly ICellViewModel[]): Promise<void>;
@@ -881,9 +891,9 @@ export function getNotebookEditorFromEditorPane(editorPane?: IEditorPane): INote
 
 	const input = editorPane.input;
 
-	const isInteractiveEditor = input && isCompositeNotebookEditorInput(input);
+	const isCompositeNotebook = input && isCompositeNotebookEditorInput(input);
 
-	if (isInteractiveEditor || editorPane.getId() === REPL_EDITOR_ID) {
+	if (isCompositeNotebook) {
 		return (editorPane.getControl() as { notebookEditor: INotebookEditor | undefined } | undefined)?.notebookEditor;
 	}
 
diff --git a/src/vs/workbench/contrib/notebook/browser/notebookEditor.ts b/src/vs/workbench/contrib/notebook/browser/notebookEditor.ts
index 473e8a1168d..848dea700ca 100644
--- a/src/vs/workbench/contrib/notebook/browser/notebookEditor.ts
+++ b/src/vs/workbench/contrib/notebook/browser/notebookEditor.ts
@@ -215,7 +215,7 @@ export class NotebookEditor extends EditorPane implements INotebookEditorPane, I
 			// we need to hide it before getting a new widget
 			this._widget.value?.onWillHide();
 
-			this._widget = <IBorrowValue<NotebookEditorWidget>>this._instantiationService.invokeFunction(this._notebookWidgetService.retrieveWidget, this.group, input, undefined, this._pagePosition?.dimension, this.window);
+			this._widget = <IBorrowValue<NotebookEditorWidget>>this._instantiationService.invokeFunction(this._notebookWidgetService.retrieveWidget, this.group.id, input, undefined, this._pagePosition?.dimension, this.window);
 
 			if (this._rootElement && this._widget.value!.getDomNode()) {
 				this._rootElement.setAttribute('aria-flowto', this._widget.value!.getDomNode().id || '');
diff --git a/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts b/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts
index b2df5bfdf41..6ce96bcf445 100644
--- a/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts
+++ b/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts
@@ -101,6 +101,8 @@ import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { PixelRatio } from 'vs/base/browser/pixelRatio';
 import { PreventDefaultContextMenuItemsContextKeyName } from 'vs/workbench/contrib/webview/browser/webview.contribution';
 import { NotebookAccessibilityProvider } from 'vs/workbench/contrib/notebook/browser/notebookAccessibilityProvider';
+import { NotebookHorizontalTracker } from 'vs/workbench/contrib/notebook/browser/viewParts/notebookHorizontalTracker';
+import { NotebookCellEditorPool } from 'vs/workbench/contrib/notebook/browser/view/notebookCellEditorPool';
 
 const $ = DOM.$;
 
@@ -150,6 +152,8 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditorD
 	readonly onDidChangeDecorations: Event<void> = this._onDidChangeDecorations.event;
 	private readonly _onDidScroll = this._register(new Emitter<void>());
 	readonly onDidScroll: Event<void> = this._onDidScroll.event;
+	private readonly _onDidChangeLayout = this._register(new Emitter<void>());
+	readonly onDidChangeLayout: Event<void> = this._onDidChangeLayout.event;
 	private readonly _onDidChangeActiveCell = this._register(new Emitter<void>());
 	readonly onDidChangeActiveCell: Event<void> = this._onDidChangeActiveCell.event;
 	private readonly _onDidChangeFocus = this._register(new Emitter<void>());
@@ -199,6 +203,7 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditorD
 	private _dndController: CellDragAndDropController | null = null;
 	private _listTopCellToolbar: ListTopCellToolbar | null = null;
 	private _renderedEditors: Map<ICellViewModel, ICodeEditor> = new Map();
+	private _editorPool!: NotebookCellEditorPool;
 	private _viewContext: ViewContext;
 	private _notebookViewModel: NotebookViewModel | undefined;
 	private readonly _localStore: DisposableStore = this._register(new DisposableStore());
@@ -259,6 +264,19 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditorD
 		return this._renderedEditors.get(focused);
 	}
 
+	get activeCellAndCodeEditor(): [ICellViewModel, ICodeEditor] | undefined {
+		if (this._isDisposed) {
+			return;
+		}
+
+		const [focused] = this._list.getFocusedElements();
+		const editor = this._renderedEditors.get(focused);
+		if (!editor) {
+			return;
+		}
+		return [focused, editor];
+	}
+
 	get codeEditors(): [ICellViewModel, ICodeEditor][] {
 		return [...this._renderedEditors];
 	}
@@ -323,6 +341,9 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditorD
 			this._notebookOptions,
 			eventDispatcher,
 			language => this.getBaseCellEditorOptions(language));
+		this._register(this._viewContext.eventDispatcher.onDidChangeLayout(() => {
+			this._onDidChangeLayout.fire();
+		}));
 		this._register(this._viewContext.eventDispatcher.onDidChangeCellState(e => {
 			this._onDidChangeCellState.fire(e);
 		}));
@@ -610,6 +631,8 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditorD
 		this._list.scrollableElement.appendChild(this._notebookOverviewRulerContainer);
 		this._registerNotebookOverviewRuler();
 
+		this._register(this.instantiationService.createInstance(NotebookHorizontalTracker, this, this._list.scrollableElement));
+
 		this._overflowContainer = document.createElement('div');
 		this._overflowContainer.classList.add('notebook-overflow-widget-container', 'monaco-editor');
 		DOM.append(parent, this._overflowContainer);
@@ -896,11 +919,11 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditorD
 
 	private _createCellList(): void {
 		this._body.classList.add('cell-list-container');
-
 		this._dndController = this._register(new CellDragAndDropController(this, this._body));
 		const getScopedContextKeyService = (container: HTMLElement) => this._list.contextKeyService.createScoped(container);
+		this._editorPool = this._register(this.instantiationService.createInstance(NotebookCellEditorPool, this, getScopedContextKeyService));
 		const renderers = [
-			this.instantiationService.createInstance(CodeCellRenderer, this, this._renderedEditors, this._dndController, getScopedContextKeyService),
+			this.instantiationService.createInstance(CodeCellRenderer, this, this._renderedEditors, this._editorPool, this._dndController, getScopedContextKeyService),
 			this.instantiationService.createInstance(MarkupCellRenderer, this, this._dndController, this._renderedEditors, getScopedContextKeyService),
 		];
 
@@ -1065,27 +1088,22 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditorD
 	}
 
 	private _registerNotebookStickyScroll() {
-		this._notebookStickyScroll = this._register(this.instantiationService.createInstance(NotebookStickyScroll, this._notebookStickyScrollContainer, this, this._list));
-
-		const localDisposableStore = this._register(new DisposableStore());
+		this._notebookStickyScroll = this._register(this.instantiationService.createInstance(NotebookStickyScroll, this._notebookStickyScrollContainer, this, this._list, (sizeDelta) => {
+			if (this.isDisposed) {
+				return;
+			}
 
-		this._register(this._notebookStickyScroll.onDidChangeNotebookStickyScroll((sizeDelta) => {
-			const d = localDisposableStore.add(DOM.scheduleAtNextAnimationFrame(DOM.getWindow(this.getDomNode()), () => {
-				if (this.isDisposed) {
-					return;
+			if (this._dimension && this._isVisible) {
+				if (sizeDelta > 0) { // delta > 0 ==> sticky is growing, cell list shrinking
+					this.layout(this._dimension);
+					this.setScrollTop(this.scrollTop + sizeDelta);
+				} else if (sizeDelta < 0) { // delta < 0 ==> sticky is shrinking, cell list growing
+					this.setScrollTop(this.scrollTop + sizeDelta);
+					this.layout(this._dimension);
 				}
+			}
 
-				if (this._dimension && this._isVisible) {
-					if (sizeDelta > 0) { // delta > 0 ==> sticky is growing, cell list shrinking
-						this.layout(this._dimension);
-						this.setScrollTop(this.scrollTop + sizeDelta);
-					} else if (sizeDelta < 0) { // delta < 0 ==> sticky is shrinking, cell list growing
-						this.setScrollTop(this.scrollTop + sizeDelta);
-						this.layout(this._dimension);
-					}
-				}
-				localDisposableStore.delete(d);
-			}));
+			this._onDidScroll.fire();
 		}));
 	}
 
@@ -2125,6 +2143,10 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditorD
 		return this._list.scrollTop;
 	}
 
+	get scrollBottom() {
+		return this._list.scrollTop + this._list.getRenderHeight();
+	}
+
 	getAbsoluteTopOfElement(cell: ICellViewModel) {
 		return this._list.getCellViewScrollTop(cell);
 	}
diff --git a/src/vs/workbench/contrib/notebook/browser/notebookIcons.ts b/src/vs/workbench/contrib/notebook/browser/notebookIcons.ts
index 63c68389080..17f72439a76 100644
--- a/src/vs/workbench/contrib/notebook/browser/notebookIcons.ts
+++ b/src/vs/workbench/contrib/notebook/browser/notebookIcons.ts
@@ -9,7 +9,6 @@ import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
 
 export const selectKernelIcon = registerIcon('notebook-kernel-select', Codicon.serverEnvironment, localize('selectKernelIcon', 'Configure icon to select a kernel in notebook editors.'));
 export const executeIcon = registerIcon('notebook-execute', Codicon.play, localize('executeIcon', 'Icon to execute in notebook editors.'));
-export const configIcon = registerIcon('notebook-config', Codicon.gear, localize('configIcon', 'Icon to configure in notebook editors.'));
 export const executeAboveIcon = registerIcon('notebook-execute-above', Codicon.runAbove, localize('executeAboveIcon', 'Icon to execute above cells in notebook editors.'));
 export const executeBelowIcon = registerIcon('notebook-execute-below', Codicon.runBelow, localize('executeBelowIcon', 'Icon to execute below cells in notebook editors.'));
 export const stopIcon = registerIcon('notebook-stop', Codicon.primitiveSquare, localize('stopIcon', 'Icon to stop an execution in notebook editors.'));
@@ -30,6 +29,7 @@ export const collapsedIcon = registerIcon('notebook-collapsed', Codicon.chevronR
 export const expandedIcon = registerIcon('notebook-expanded', Codicon.chevronDown, localize('expandedIcon', 'Icon to annotate an expanded section in notebook editors.'));
 export const openAsTextIcon = registerIcon('notebook-open-as-text', Codicon.fileCode, localize('openAsTextIcon', 'Icon to open the notebook in a text editor.'));
 export const revertIcon = registerIcon('notebook-revert', Codicon.discard, localize('revertIcon', 'Icon to revert in notebook editors.'));
+export const toggleWhitespace = registerIcon('notebook-diff-cell-toggle-whitespace', Codicon.whitespace, localize('toggleWhitespace', 'Icon for the toggle whitespace action in the diff editor.'));
 export const renderOutputIcon = registerIcon('notebook-render-output', Codicon.preview, localize('renderOutputIcon', 'Icon to render output in diff editor.'));
 export const mimetypeIcon = registerIcon('notebook-mimetype', Codicon.code, localize('mimetypeIcon', 'Icon for a mime type in notebook editors.'));
 export const copyIcon = registerIcon('notebook-copy', Codicon.copy, localize('copyIcon', 'Icon to copy content to clipboard'));
diff --git a/src/vs/workbench/contrib/notebook/browser/services/notebookEditorService.ts b/src/vs/workbench/contrib/notebook/browser/services/notebookEditorService.ts
index ec20db8d5cf..993acf3c2ff 100644
--- a/src/vs/workbench/contrib/notebook/browser/services/notebookEditorService.ts
+++ b/src/vs/workbench/contrib/notebook/browser/services/notebookEditorService.ts
@@ -4,7 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { CodeWindow } from 'vs/base/browser/window';
-import { IEditorGroup } from 'vs/workbench/services/editor/common/editorGroupsService';
 import { createDecorator, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { NotebookEditorInput } from 'vs/workbench/contrib/notebook/common/notebookEditorInput';
 import { INotebookEditor, INotebookEditorCreationOptions } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
@@ -22,7 +21,7 @@ export interface IBorrowValue<T> {
 export interface INotebookEditorService {
 	_serviceBrand: undefined;
 
-	retrieveWidget(accessor: ServicesAccessor, group: IEditorGroup, input: NotebookEditorInput, creationOptions?: INotebookEditorCreationOptions, dimension?: Dimension, codeWindow?: CodeWindow): IBorrowValue<INotebookEditor>;
+	retrieveWidget(accessor: ServicesAccessor, groupId: number, input: NotebookEditorInput, creationOptions?: INotebookEditorCreationOptions, dimension?: Dimension, codeWindow?: CodeWindow): IBorrowValue<INotebookEditor>;
 
 	retrieveExistingWidgetFromURI(resource: URI): IBorrowValue<NotebookEditorWidget> | undefined;
 	retrieveAllExistingWidgets(): IBorrowValue<NotebookEditorWidget>[];
diff --git a/src/vs/workbench/contrib/notebook/browser/services/notebookEditorServiceImpl.ts b/src/vs/workbench/contrib/notebook/browser/services/notebookEditorServiceImpl.ts
index 5b1360f0ca8..fb5349bd9b9 100644
--- a/src/vs/workbench/contrib/notebook/browser/services/notebookEditorServiceImpl.ts
+++ b/src/vs/workbench/contrib/notebook/browser/services/notebookEditorServiceImpl.ts
@@ -9,7 +9,7 @@ import { getDefaultNotebookCreationOptions, NotebookEditorWidget } from 'vs/work
 import { DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
 import { IEditorGroupsService, IEditorGroup } from 'vs/workbench/services/editor/common/editorGroupsService';
 import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { isCompositeNotebookEditorInput, NotebookEditorInput } from 'vs/workbench/contrib/notebook/common/notebookEditorInput';
+import { isCompositeNotebookEditorInput, isNotebookEditorInput, NotebookEditorInput } from 'vs/workbench/contrib/notebook/common/notebookEditorInput';
 import { IBorrowValue, INotebookEditorService } from 'vs/workbench/contrib/notebook/browser/services/notebookEditorService';
 import { INotebookEditor, INotebookEditorCreationOptions } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { Emitter } from 'vs/base/common/event';
@@ -31,12 +31,14 @@ export class NotebookEditorWidgetService implements INotebookEditorService {
 	private readonly _disposables = new DisposableStore();
 	private readonly _notebookEditors = new Map<string, INotebookEditor>();
 
+	private readonly groupListener = new Map<number, IDisposable[]>();
+
 	private readonly _onNotebookEditorAdd = new Emitter<INotebookEditor>();
 	private readonly _onNotebookEditorsRemove = new Emitter<INotebookEditor>();
 	readonly onDidAddNotebookEditor = this._onNotebookEditorAdd.event;
 	readonly onDidRemoveNotebookEditor = this._onNotebookEditorsRemove.event;
 
-	private readonly _borrowableEditors = new Map<number, ResourceMap<{ widget: NotebookEditorWidget; token: number | undefined }>>();
+	private readonly _borrowableEditors = new Map<number, ResourceMap<{ widget: NotebookEditorWidget; editorType: string; token: number | undefined }[]>>();
 
 	constructor(
 		@IEditorGroupsService private readonly editorGroupService: IEditorGroupsService,
@@ -44,31 +46,30 @@ export class NotebookEditorWidgetService implements INotebookEditorService {
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@IInstantiationService private readonly instantiationService: IInstantiationService
 	) {
-
-		const groupListener = new Map<number, IDisposable[]>();
 		const onNewGroup = (group: IEditorGroup) => {
 			const { id } = group;
 			const listeners: IDisposable[] = [];
 			listeners.push(group.onDidCloseEditor(e => {
-				const widgets = this._borrowableEditors.get(group.id);
-				if (!widgets) {
+				const widgetMap = this._borrowableEditors.get(group.id);
+				if (!widgetMap) {
 					return;
 				}
 
 				const inputs = e.editor instanceof NotebookEditorInput ? [e.editor] : (isCompositeNotebookEditorInput(e.editor) ? e.editor.editorInputs : []);
 				inputs.forEach(input => {
-					const value = widgets.get(input.resource);
-					if (!value) {
+					const widgets = widgetMap.get(input.resource);
+					const index = widgets?.findIndex(widget => widget.editorType === input.typeId);
+					if (!widgets || index === undefined || index === -1) {
 						return;
 					}
+					const value = widgets.splice(index, 1)[0];
 					value.token = undefined;
 					this._disposeWidget(value.widget);
-					widgets.delete(input.resource);
 					value.widget = (<any>undefined); // unset the widget so that others that still hold a reference don't harm us
 				});
 			}));
 			listeners.push(group.onWillMoveEditor(e => {
-				if (e.editor instanceof NotebookEditorInput) {
+				if (isNotebookEditorInput(e.editor)) {
 					this._allowWidgetMove(e.editor, e.groupId, e.target);
 				}
 
@@ -78,24 +79,26 @@ export class NotebookEditorWidgetService implements INotebookEditorService {
 					});
 				}
 			}));
-			groupListener.set(id, listeners);
+			this.groupListener.set(id, listeners);
 		};
 		this._disposables.add(editorGroupService.onDidAddGroup(onNewGroup));
 		editorGroupService.whenReady.then(() => editorGroupService.groups.forEach(onNewGroup));
 
 		// group removed -> clean up listeners, clean up widgets
 		this._disposables.add(editorGroupService.onDidRemoveGroup(group => {
-			const listeners = groupListener.get(group.id);
+			const listeners = this.groupListener.get(group.id);
 			if (listeners) {
 				listeners.forEach(listener => listener.dispose());
-				groupListener.delete(group.id);
+				this.groupListener.delete(group.id);
 			}
 			const widgets = this._borrowableEditors.get(group.id);
 			this._borrowableEditors.delete(group.id);
 			if (widgets) {
-				for (const value of widgets.values()) {
-					value.token = undefined;
-					this._disposeWidget(value.widget);
+				for (const values of widgets.values()) {
+					for (const value of values) {
+						value.token = undefined;
+						this._disposeWidget(value.widget);
+					}
 				}
 			}
 		}));
@@ -118,6 +121,10 @@ export class NotebookEditorWidgetService implements INotebookEditorService {
 		this._disposables.dispose();
 		this._onNotebookEditorAdd.dispose();
 		this._onNotebookEditorsRemove.dispose();
+		this.groupListener.forEach((listeners) => {
+			listeners.forEach(listener => listener.dispose());
+		});
+		this.groupListener.clear();
 	}
 
 	// --- group-based editor borrowing...
@@ -137,18 +144,25 @@ export class NotebookEditorWidgetService implements INotebookEditorService {
 			return;
 		}
 
-		const targetWidget = this._borrowableEditors.get(targetID)?.get(input.resource);
-		if (targetWidget) {
-			// not needed
+		const target = this._borrowableEditors.get(targetID)?.get(input.resource)?.findIndex(widget => widget.editorType === input.typeId);
+		if (target !== undefined && target !== -1) {
+			// not needed, a separate widget is already there
 			return;
 		}
 
-		const widget = this._borrowableEditors.get(sourceID)?.get(input.resource);
+		const widget = this._borrowableEditors.get(sourceID)?.get(input.resource)?.find(widget => widget.editorType === input.typeId);
 		if (!widget) {
 			throw new Error('no widget at source group');
 		}
+
 		// don't allow the widget to be retrieved at its previous location any more
-		this._borrowableEditors.get(sourceID)?.delete(input.resource);
+		const sourceWidgets = this._borrowableEditors.get(sourceID)?.get(input.resource);
+		if (sourceWidgets) {
+			const indexToRemove = sourceWidgets.findIndex(widget => widget.editorType === input.typeId);
+			if (indexToRemove !== -1) {
+				sourceWidgets.splice(indexToRemove, 1);
+			}
+		}
 
 		// allow the widget to be retrieved at its new location
 		let targetMap = this._borrowableEditors.get(targetID);
@@ -156,14 +170,16 @@ export class NotebookEditorWidgetService implements INotebookEditorService {
 			targetMap = new ResourceMap();
 			this._borrowableEditors.set(targetID, targetMap);
 		}
-		targetMap.set(input.resource, widget);
+		const widgetsAtTarget = targetMap.get(input.resource) ?? [];
+		widgetsAtTarget?.push(widget);
+		targetMap.set(input.resource, widgetsAtTarget);
 	}
 
 	retrieveExistingWidgetFromURI(resource: URI): IBorrowValue<NotebookEditorWidget> | undefined {
 		for (const widgetInfo of this._borrowableEditors.values()) {
-			const widget = widgetInfo.get(resource);
-			if (widget) {
-				return this._createBorrowValue(widget.token!, widget);
+			const widgets = widgetInfo.get(resource);
+			if (widgets && widgets.length > 0) {
+				return this._createBorrowValue(widgets[0].token!, widgets[0]);
 			}
 		}
 		return undefined;
@@ -172,38 +188,35 @@ export class NotebookEditorWidgetService implements INotebookEditorService {
 	retrieveAllExistingWidgets(): IBorrowValue<NotebookEditorWidget>[] {
 		const ret: IBorrowValue<NotebookEditorWidget>[] = [];
 		for (const widgetInfo of this._borrowableEditors.values()) {
-			for (const widget of widgetInfo.values()) {
-				ret.push(this._createBorrowValue(widget.token!, widget));
+			for (const widgets of widgetInfo.values()) {
+				for (const widget of widgets) {
+					ret.push(this._createBorrowValue(widget.token!, widget));
+				}
 			}
 		}
 		return ret;
 	}
 
-	retrieveWidget(accessor: ServicesAccessor, group: IEditorGroup, input: NotebookEditorInput, creationOptions?: INotebookEditorCreationOptions, initialDimension?: Dimension, codeWindow?: CodeWindow): IBorrowValue<NotebookEditorWidget> {
+	retrieveWidget(accessor: ServicesAccessor, groupId: number, input: NotebookEditorInput, creationOptions?: INotebookEditorCreationOptions, initialDimension?: Dimension, codeWindow?: CodeWindow): IBorrowValue<NotebookEditorWidget> {
 
-		let value = this._borrowableEditors.get(group.id)?.get(input.resource);
+		let value = this._borrowableEditors.get(groupId)?.get(input.resource)?.find(widget => widget.editorType === input.typeId);
 
 		if (!value) {
 			// NEW widget
 			const editorGroupContextKeyService = accessor.get(IContextKeyService);
 			const editorGroupEditorProgressService = accessor.get(IEditorProgressService);
-			const notebookInstantiationService = this.instantiationService.createChild(new ServiceCollection(
-				[IContextKeyService, editorGroupContextKeyService],
-				[IEditorProgressService, editorGroupEditorProgressService]));
-			const ctorOptions = creationOptions ?? getDefaultNotebookCreationOptions();
-			const widget = notebookInstantiationService.createInstance(NotebookEditorWidget, {
-				...ctorOptions,
-				codeWindow: codeWindow ?? ctorOptions.codeWindow,
-			}, initialDimension);
+			const widget = this.createWidget(editorGroupContextKeyService, editorGroupEditorProgressService, creationOptions, codeWindow, initialDimension);
 			const token = this._tokenPool++;
-			value = { widget, token };
+			value = { widget, editorType: input.typeId, token };
 
-			let map = this._borrowableEditors.get(group.id);
+			let map = this._borrowableEditors.get(groupId);
 			if (!map) {
 				map = new ResourceMap();
-				this._borrowableEditors.set(group.id, map);
+				this._borrowableEditors.set(groupId, map);
 			}
-			map.set(input.resource, value);
+			const values = map.get(input.resource) ?? [];
+			values.push(value);
+			map.set(input.resource, values);
 
 		} else {
 			// reuse a widget which was either free'ed before or which
@@ -214,6 +227,19 @@ export class NotebookEditorWidgetService implements INotebookEditorService {
 		return this._createBorrowValue(value.token!, value);
 	}
 
+	// protected for unit testing overrides
+	protected createWidget(editorGroupContextKeyService: IContextKeyService, editorGroupEditorProgressService: IEditorProgressService, creationOptions?: INotebookEditorCreationOptions, codeWindow?: CodeWindow, initialDimension?: Dimension) {
+		const notebookInstantiationService = this.instantiationService.createChild(new ServiceCollection(
+			[IContextKeyService, editorGroupContextKeyService],
+			[IEditorProgressService, editorGroupEditorProgressService]));
+		const ctorOptions = creationOptions ?? getDefaultNotebookCreationOptions();
+		const widget = notebookInstantiationService.createInstance(NotebookEditorWidget, {
+			...ctorOptions,
+			codeWindow: codeWindow ?? ctorOptions.codeWindow,
+		}, initialDimension);
+		return widget;
+	}
+
 	private _createBorrowValue(myToken: number, widget: { widget: NotebookEditorWidget; token: number | undefined }): IBorrowValue<NotebookEditorWidget> {
 		return {
 			get value() {
diff --git a/src/vs/workbench/contrib/notebook/browser/services/notebookExecutionServiceImpl.ts b/src/vs/workbench/contrib/notebook/browser/services/notebookExecutionServiceImpl.ts
index d3666822f40..a0449134fb6 100644
--- a/src/vs/workbench/contrib/notebook/browser/services/notebookExecutionServiceImpl.ts
+++ b/src/vs/workbench/contrib/notebook/browser/services/notebookExecutionServiceImpl.ts
@@ -8,7 +8,6 @@ import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';
 import * as nls from 'vs/nls';
 import { ICommandService } from 'vs/platform/commands/common/commands';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { ILogService } from 'vs/platform/log/common/log';
 import { IWorkspaceTrustRequestService } from 'vs/platform/workspace/common/workspaceTrust';
 import { KernelPickerMRUStrategy } from 'vs/workbench/contrib/notebook/browser/viewParts/notebookKernelQuickPickStrategy';
 import { NotebookCellTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookCellTextModel';
@@ -16,6 +15,7 @@ import { CellKind, INotebookTextModel, NotebookCellExecutionState } from 'vs/wor
 import { INotebookExecutionService, ICellExecutionParticipant } from 'vs/workbench/contrib/notebook/common/notebookExecutionService';
 import { INotebookCellExecution, INotebookExecutionStateService } from 'vs/workbench/contrib/notebook/common/notebookExecutionStateService';
 import { INotebookKernelHistoryService, INotebookKernelService } from 'vs/workbench/contrib/notebook/common/notebookKernelService';
+import { INotebookLoggingService } from 'vs/workbench/contrib/notebook/common/notebookLoggingService';
 
 
 export class NotebookExecutionService implements INotebookExecutionService, IDisposable {
@@ -27,7 +27,7 @@ export class NotebookExecutionService implements INotebookExecutionService, IDis
 		@INotebookKernelService private readonly _notebookKernelService: INotebookKernelService,
 		@INotebookKernelHistoryService private readonly _notebookKernelHistoryService: INotebookKernelHistoryService,
 		@IWorkspaceTrustRequestService private readonly _workspaceTrustRequestService: IWorkspaceTrustRequestService,
-		@ILogService private readonly _logService: ILogService,
+		@INotebookLoggingService private readonly _logService: INotebookLoggingService,
 		@INotebookExecutionStateService private readonly _notebookExecutionStateService: INotebookExecutionStateService,
 	) {
 	}
@@ -39,7 +39,7 @@ export class NotebookExecutionService implements INotebookExecutionService, IDis
 			return;
 		}
 
-		this._logService.debug(`NotebookExecutionService#executeNotebookCells ${JSON.stringify(cellsArr.map(c => c.handle))}`);
+		this._logService.debug(`Execution`, `${JSON.stringify(cellsArr.map(c => c.handle))}`);
 		const message = nls.localize('notebookRunTrust', "Executing a notebook cell will run code from this workspace.");
 		const trust = await this._workspaceTrustRequestService.requestWorkspaceTrust({ message });
 		if (!trust) {
@@ -85,15 +85,16 @@ export class NotebookExecutionService implements INotebookExecutionService, IDis
 			// the connecting state can change before the kernel resolves executeNotebookCellsRequest
 			const unconfirmed = validCellExecutions.filter(exe => exe.state === NotebookCellExecutionState.Unconfirmed);
 			if (unconfirmed.length) {
-				this._logService.debug(`NotebookExecutionService#executeNotebookCells completing unconfirmed executions ${JSON.stringify(unconfirmed.map(exe => exe.cellHandle))}`);
+				this._logService.debug(`Execution`, `Completing unconfirmed executions ${JSON.stringify(unconfirmed.map(exe => exe.cellHandle))}`);
 				unconfirmed.forEach(exe => exe.complete({}));
 			}
+			this._logService.debug(`Execution`, `Completed executions ${JSON.stringify(validCellExecutions.map(exe => exe.cellHandle))}`);
 		}
 	}
 
 	async cancelNotebookCellHandles(notebook: INotebookTextModel, cells: Iterable<number>): Promise<void> {
 		const cellsArr = Array.from(cells);
-		this._logService.debug(`NotebookExecutionService#cancelNotebookCellHandles ${JSON.stringify(cellsArr)}`);
+		this._logService.debug(`Execution`, `CancelNotebookCellHandles ${JSON.stringify(cellsArr)}`);
 		const kernel = this._notebookKernelService.getSelectedOrSuggestedKernel(notebook);
 		if (kernel) {
 			await kernel.cancelNotebookCellExecution(notebook.uri, cellsArr);
diff --git a/src/vs/workbench/contrib/notebook/browser/services/notebookLoggingServiceImpl.ts b/src/vs/workbench/contrib/notebook/browser/services/notebookLoggingServiceImpl.ts
index 9ca31a78982..c2085d617e7 100644
--- a/src/vs/workbench/contrib/notebook/browser/services/notebookLoggingServiceImpl.ts
+++ b/src/vs/workbench/contrib/notebook/browser/services/notebookLoggingServiceImpl.ts
@@ -20,7 +20,7 @@ export class NotebookLoggingService extends Disposable implements INotebookLoggi
 		@ILoggerService loggerService: ILoggerService,
 	) {
 		super();
-		this._logger = this._register(loggerService.createLogger(logChannelId, { name: nls.localize('renderChannelName', "Notebook rendering") }));
+		this._logger = this._register(loggerService.createLogger(logChannelId, { name: nls.localize('renderChannelName', "Notebook") }));
 	}
 
 	debug(category: string, output: string): void {
@@ -30,5 +30,13 @@ export class NotebookLoggingService extends Disposable implements INotebookLoggi
 	info(category: string, output: string): void {
 		this._logger.info(`[${category}] ${output}`);
 	}
+
+	warn(category: string, output: string): void {
+		this._logger.warn(`[${category}] ${output}`);
+	}
+
+	error(category: string, output: string): void {
+		this._logger.error(`[${category}] ${output}`);
+	}
 }
 
diff --git a/src/vs/workbench/contrib/notebook/browser/services/notebookServiceImpl.ts b/src/vs/workbench/contrib/notebook/browser/services/notebookServiceImpl.ts
index 5b2508cd57e..8edfa08e984 100644
--- a/src/vs/workbench/contrib/notebook/browser/services/notebookServiceImpl.ts
+++ b/src/vs/workbench/contrib/notebook/browser/services/notebookServiceImpl.ts
@@ -28,7 +28,7 @@ import { INotebookEditorOptions } from 'vs/workbench/contrib/notebook/browser/no
 import { NotebookDiffEditorInput } from 'vs/workbench/contrib/notebook/common/notebookDiffEditorInput';
 import { NotebookCellTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookCellTextModel';
 import { NotebookTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookTextModel';
-import { ACCESSIBLE_NOTEBOOK_DISPLAY_ORDER, CellUri, NotebookSetting, INotebookContributionData, INotebookExclusiveDocumentFilter, INotebookRendererInfo, INotebookTextModel, IOrderedMimeType, IOutputDto, MimeTypeDisplayOrder, NotebookData, NotebookEditorPriority, NotebookRendererMatch, NOTEBOOK_DISPLAY_ORDER, RENDERER_EQUIVALENT_EXTENSIONS, RENDERER_NOT_AVAILABLE, TransientOptions, NotebookExtensionDescription, INotebookStaticPreloadInfo } from 'vs/workbench/contrib/notebook/common/notebookCommon';
+import { ACCESSIBLE_NOTEBOOK_DISPLAY_ORDER, CellUri, NotebookSetting, INotebookContributionData, INotebookExclusiveDocumentFilter, INotebookRendererInfo, INotebookTextModel, IOrderedMimeType, IOutputDto, MimeTypeDisplayOrder, NotebookEditorPriority, NotebookRendererMatch, NOTEBOOK_DISPLAY_ORDER, RENDERER_EQUIVALENT_EXTENSIONS, RENDERER_NOT_AVAILABLE, NotebookExtensionDescription, INotebookStaticPreloadInfo } from 'vs/workbench/contrib/notebook/common/notebookCommon';
 import { NotebookEditorInput } from 'vs/workbench/contrib/notebook/common/notebookEditorInput';
 import { INotebookEditorModelResolverService } from 'vs/workbench/contrib/notebook/common/notebookEditorModelResolverService';
 import { NotebookOutputRendererInfo, NotebookStaticPreloadInfo as NotebookStaticPreloadInfo } from 'vs/workbench/contrib/notebook/common/notebookOutputRenderer';
@@ -41,7 +41,10 @@ import { InstallRecommendedExtensionAction } from 'vs/workbench/contrib/extensio
 import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
 import { INotebookDocument, INotebookDocumentService } from 'vs/workbench/services/notebook/common/notebookDocumentService';
 import { MergeEditorInput } from 'vs/workbench/contrib/mergeEditor/browser/mergeEditorInput';
-import type { EditorInputWithOptions, IResourceMergeEditorInput } from 'vs/workbench/common/editor';
+import type { EditorInputWithOptions, IResourceDiffEditorInput, IResourceMergeEditorInput } from 'vs/workbench/common/editor';
+import { streamToBuffer, VSBuffer, VSBufferReadableStream } from 'vs/base/common/buffer';
+import type { IEditorGroup } from 'vs/workbench/services/editor/common/editorGroupsService';
+import { NotebookMultiDiffEditorInput } from 'vs/workbench/contrib/notebook/browser/diff/notebookMultiDiffEditorInput';
 
 // --- Start Positron ---
 import { PositronNotebookEditorInput } from 'vs/workbench/contrib/positronNotebook/browser/PositronNotebookEditorInput';
@@ -230,7 +233,12 @@ export class NotebookProviderInfoStore extends Disposable {
 				// --- End Positron ---
 				return { editor: NotebookEditorInput.getOrCreate(this._instantiationService, ref.object.resource, undefined, notebookProviderInfo.id), options };
 			};
-			const notebookDiffEditorInputFactory: DiffEditorInputFactoryFunction = ({ modified, original, label, description }) => {
+			const notebookDiffEditorInputFactory: DiffEditorInputFactoryFunction = (diffEditorInput: IResourceDiffEditorInput, group: IEditorGroup) => {
+				const { modified, original, label, description } = diffEditorInput;
+
+				if (this._configurationService.getValue('notebook.experimental.enableNewDiffEditor')) {
+					return { editor: NotebookMultiDiffEditorInput.create(this._instantiationService, modified.resource!, label, description, original.resource!, notebookProviderInfo.id) };
+				}
 				return { editor: NotebookDiffEditorInput.create(this._instantiationService, modified.resource!, label, description, original.resource!, notebookProviderInfo.id) };
 			};
 			const mergeEditorInputFactory: MergeEditorInputFactoryFunction = (mergeEditor: IResourceMergeEditorInput): EditorInputWithOptions => {
@@ -803,17 +811,28 @@ export class NotebookService extends Disposable implements INotebookService {
 
 	// --- notebook documents: create, destory, retrieve, enumerate
 
-	createNotebookTextModel(viewType: string, uri: URI, data: NotebookData, transientOptions: TransientOptions): NotebookTextModel {
+	async createNotebookTextModel(viewType: string, uri: URI, stream?: VSBufferReadableStream): Promise<NotebookTextModel> {
 		if (this._models.has(uri)) {
 			throw new Error(`notebook for ${uri} already exists`);
 		}
-		const notebookModel = this._instantiationService.createInstance(NotebookTextModel, viewType, uri, data.cells, data.metadata, transientOptions);
+
+		const info = await this.withNotebookDataProvider(viewType);
+		if (!(info instanceof SimpleNotebookProviderInfo)) {
+			throw new Error('CANNOT open file notebook with this provider');
+		}
+
+
+		const bytes = stream ? await streamToBuffer(stream) : VSBuffer.fromByteArray([]);
+		const data = await info.serializer.dataToNotebook(bytes);
+
+
+		const notebookModel = this._instantiationService.createInstance(NotebookTextModel, info.viewType, uri, data.cells, data.metadata, info.serializer.options);
 		const modelData = new ModelData(notebookModel, this._onWillDisposeDocument.bind(this));
 		this._models.set(uri, modelData);
 		this._notebookDocumentService.addNotebookDocument(modelData);
 		this._onWillAddNotebookDocument.fire(notebookModel);
 		this._onDidAddNotebookDocument.fire(notebookModel);
-		this._postDocumentOpenActivation(viewType);
+		this._postDocumentOpenActivation(info.viewType);
 		return notebookModel;
 	}
 
diff --git a/src/vs/workbench/contrib/notebook/browser/services/notebookWorkerServiceImpl.ts b/src/vs/workbench/contrib/notebook/browser/services/notebookWorkerServiceImpl.ts
index 65980c57a9c..f57cd98db1b 100644
--- a/src/vs/workbench/contrib/notebook/browser/services/notebookWorkerServiceImpl.ts
+++ b/src/vs/workbench/contrib/notebook/browser/services/notebookWorkerServiceImpl.ts
@@ -5,13 +5,12 @@
 
 import { Disposable, DisposableStore, dispose, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
 import { URI } from 'vs/base/common/uri';
-import { SimpleWorkerClient } from 'vs/base/common/worker/simpleWorker';
-import { DefaultWorkerFactory } from 'vs/base/browser/defaultWorkerFactory';
+import { IWorkerClient, Proxied } from 'vs/base/common/worker/simpleWorker';
+import { createWebWorker } from 'vs/base/browser/defaultWorkerFactory';
 import { NotebookCellTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookCellTextModel';
 import { IMainCellDto, INotebookDiffResult, NotebookCellsChangeType } from 'vs/workbench/contrib/notebook/common/notebookCommon';
 import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
 import { NotebookEditorSimpleWorker } from 'vs/workbench/contrib/notebook/common/services/notebookSimpleWorker';
-import { INotebookWorkerHost } from 'vs/workbench/contrib/notebook/common/services/notebookWorkerHost';
 import { INotebookEditorWorkerService } from 'vs/workbench/contrib/notebook/common/services/notebookWorkerService';
 
 export class NotebookEditorWorkerServiceImpl extends Disposable implements INotebookEditorWorkerService {
@@ -58,23 +57,18 @@ class WorkerManager extends Disposable {
 	withWorker(): Promise<NotebookWorkerClient> {
 		// this._lastWorkerUsedTime = (new Date()).getTime();
 		if (!this._editorWorkerClient) {
-			this._editorWorkerClient = new NotebookWorkerClient(this._notebookService, 'notebookEditorWorkerService');
+			this._editorWorkerClient = new NotebookWorkerClient(this._notebookService);
 		}
 		return Promise.resolve(this._editorWorkerClient);
 	}
 }
 
-interface IWorkerClient<W> {
-	getProxyObject(): Promise<W>;
-	dispose(): void;
-}
-
 class NotebookEditorModelManager extends Disposable {
 	private _syncedModels: { [modelUrl: string]: IDisposable } = Object.create(null);
 	private _syncedModelsLastUsedTime: { [modelUrl: string]: number } = Object.create(null);
 
 	constructor(
-		private readonly _proxy: NotebookEditorSimpleWorker,
+		private readonly _proxy: Proxied<NotebookEditorSimpleWorker>,
 		private readonly _notebookService: INotebookService
 	) {
 		super();
@@ -101,7 +95,7 @@ class NotebookEditorModelManager extends Disposable {
 
 		const modelUrl = resource.toString();
 
-		this._proxy.acceptNewModel(
+		this._proxy.$acceptNewModel(
 			model.uri.toString(),
 			{
 				cells: model.cells.map(cell => ({
@@ -161,7 +155,7 @@ class NotebookEditorModelManager extends Disposable {
 				return data;
 			});
 
-			this._proxy.acceptModelChanged(modelUrl.toString(), {
+			this._proxy.$acceptModelChanged(modelUrl.toString(), {
 				rawEvents: dto,
 				versionId: event.versionId
 			});
@@ -171,7 +165,7 @@ class NotebookEditorModelManager extends Disposable {
 			this._stopModelSync(modelUrl);
 		}));
 		toDispose.add(toDisposable(() => {
-			this._proxy.acceptRemovedModel(modelUrl);
+			this._proxy.$acceptRemovedModel(modelUrl);
 		}));
 
 		this._syncedModels[modelUrl] = toDispose;
@@ -185,72 +179,47 @@ class NotebookEditorModelManager extends Disposable {
 	}
 }
 
-class NotebookWorkerHost implements INotebookWorkerHost {
-
-	private readonly _workerClient: NotebookWorkerClient;
-
-	constructor(workerClient: NotebookWorkerClient) {
-		this._workerClient = workerClient;
-	}
-
-	// foreign host request
-	public fhr(method: string, args: any[]): Promise<any> {
-		return this._workerClient.fhr(method, args);
-	}
-}
-
 class NotebookWorkerClient extends Disposable {
 	private _worker: IWorkerClient<NotebookEditorSimpleWorker> | null;
-	private readonly _workerFactory: DefaultWorkerFactory;
 	private _modelManager: NotebookEditorModelManager | null;
 
 
-	constructor(private readonly _notebookService: INotebookService, label: string) {
+	constructor(private readonly _notebookService: INotebookService) {
 		super();
-		this._workerFactory = new DefaultWorkerFactory(label);
 		this._worker = null;
 		this._modelManager = null;
 
 	}
 
-	// foreign host request
-	public fhr(method: string, args: any[]): Promise<any> {
-		throw new Error(`Not implemented!`);
-	}
-
 	computeDiff(original: URI, modified: URI) {
-		return this._withSyncedResources([original, modified]).then(proxy => {
-			return proxy.computeDiff(original.toString(), modified.toString());
-		});
+		const proxy = this._ensureSyncedResources([original, modified]);
+		return proxy.$computeDiff(original.toString(), modified.toString());
 	}
 
 	canPromptRecommendation(modelUri: URI) {
-		return this._withSyncedResources([modelUri]).then(proxy => {
-			return proxy.canPromptRecommendation(modelUri.toString());
-		});
+		const proxy = this._ensureSyncedResources([modelUri]);
+		return proxy.$canPromptRecommendation(modelUri.toString());
 	}
 
-	private _getOrCreateModelManager(proxy: NotebookEditorSimpleWorker): NotebookEditorModelManager {
+	private _getOrCreateModelManager(proxy: Proxied<NotebookEditorSimpleWorker>): NotebookEditorModelManager {
 		if (!this._modelManager) {
 			this._modelManager = this._register(new NotebookEditorModelManager(proxy, this._notebookService));
 		}
 		return this._modelManager;
 	}
 
-	protected _withSyncedResources(resources: URI[]): Promise<NotebookEditorSimpleWorker> {
-		return this._getProxy().then((proxy) => {
-			this._getOrCreateModelManager(proxy).ensureSyncedResources(resources);
-			return proxy;
-		});
+	protected _ensureSyncedResources(resources: URI[]): Proxied<NotebookEditorSimpleWorker> {
+		const proxy = this._getOrCreateWorker().proxy;
+		this._getOrCreateModelManager(proxy).ensureSyncedResources(resources);
+		return proxy;
 	}
 
 	private _getOrCreateWorker(): IWorkerClient<NotebookEditorSimpleWorker> {
 		if (!this._worker) {
 			try {
-				this._worker = this._register(new SimpleWorkerClient<NotebookEditorSimpleWorker, NotebookWorkerHost>(
-					this._workerFactory,
+				this._worker = this._register(createWebWorker<NotebookEditorSimpleWorker>(
 					'vs/workbench/contrib/notebook/common/services/notebookSimpleWorker',
-					new NotebookWorkerHost(this)
+					'NotebookEditorWorker'
 				));
 			} catch (err) {
 				// logOnceWebWorkerWarning(err);
@@ -260,15 +229,4 @@ class NotebookWorkerClient extends Disposable {
 		}
 		return this._worker;
 	}
-
-	protected _getProxy(): Promise<NotebookEditorSimpleWorker> {
-		return this._getOrCreateWorker().getProxyObject().then(undefined, (err) => {
-			// logOnceWebWorkerWarning(err);
-			// this._worker = new SynchronousWorkerClient(new EditorSimpleWorker(new EditorWorkerHost(this), null));
-			// return this._getOrCreateWorker().getProxyObject();
-			throw (err);
-		});
-	}
-
-
 }
diff --git a/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellExecution.ts b/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellExecution.ts
index d5c27d01001..c69d62f34f8 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellExecution.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellExecution.ts
@@ -6,9 +6,11 @@
 import * as DOM from 'vs/base/browser/dom';
 import { disposableTimeout } from 'vs/base/common/async';
 import { DisposableStore } from 'vs/base/common/lifecycle';
+import { clamp } from 'vs/base/common/numbers';
 import { ICellViewModel, INotebookEditorDelegate } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { CellViewModelStateChangeEvent } from 'vs/workbench/contrib/notebook/browser/notebookViewEvents';
 import { CellContentPart } from 'vs/workbench/contrib/notebook/browser/view/cellPart';
+import { CodeCellViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/codeCellViewModel';
 import { NotebookCellInternalMetadata } from 'vs/workbench/contrib/notebook/common/notebookCommon';
 import { INotebookExecutionStateService } from 'vs/workbench/contrib/notebook/common/notebookExecutionStateService';
 
@@ -39,6 +41,10 @@ export class CellExecutionPart extends CellContentPart {
 				this.updateExecutionOrder(this.currentCell.internalMetadata);
 			}
 		}));
+
+		this._register(this._notebookEditor.onDidScroll(() => {
+			this._updatePosition();
+		}));
 	}
 
 	override didRenderCell(element: ICellViewModel): void {
@@ -74,12 +80,38 @@ export class CellExecutionPart extends CellContentPart {
 	}
 
 	override updateInternalLayoutNow(element: ICellViewModel): void {
-		if (element.isInputCollapsed) {
-			DOM.hide(this._executionOrderLabel);
-		} else {
-			DOM.show(this._executionOrderLabel);
-			const top = element.layoutInfo.editorHeight - 22 + element.layoutInfo.statusBarHeight;
-			this._executionOrderLabel.style.top = `${top}px`;
+		this._updatePosition();
+	}
+
+	private _updatePosition() {
+		if (this.currentCell) {
+			if (this.currentCell.isInputCollapsed) {
+				DOM.hide(this._executionOrderLabel);
+			} else {
+				DOM.show(this._executionOrderLabel);
+				let top = this.currentCell.layoutInfo.editorHeight - 22 + this.currentCell.layoutInfo.statusBarHeight;
+
+				if (this.currentCell instanceof CodeCellViewModel) {
+					const elementTop = this._notebookEditor.getAbsoluteTopOfElement(this.currentCell);
+					const editorBottom = elementTop + this.currentCell.layoutInfo.outputContainerOffset;
+					// another approach to avoid the flicker caused by sticky scroll is manually calculate the scrollBottom:
+					// const scrollBottom = this._notebookEditor.scrollTop + this._notebookEditor.getLayoutInfo().height - 26 - this._notebookEditor.getLayoutInfo().stickyHeight;
+					const scrollBottom = this._notebookEditor.scrollBottom;
+
+					const lineHeight = 22;
+					if (scrollBottom <= editorBottom) {
+						const offset = editorBottom - scrollBottom;
+						top -= offset;
+						top = clamp(
+							top,
+							lineHeight + 12, // line height + padding for single line
+							this.currentCell.layoutInfo.editorHeight - lineHeight + this.currentCell.layoutInfo.statusBarHeight
+						);
+					}
+				}
+
+				this._executionOrderLabel.style.top = `${top}px`;
+			}
 		}
 	}
 }
diff --git a/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellOutput.ts b/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellOutput.ts
index 5300567754b..44465c84c6c 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellOutput.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellOutput.ts
@@ -381,7 +381,8 @@ class CellOutputElement extends Disposable {
 			});
 		}
 
-		const picker = this.quickInputService.createQuickPick();
+		const disposables = new DisposableStore();
+		const picker = disposables.add(this.quickInputService.createQuickPick({ useSeparators: true }));
 		picker.items = [
 			...items,
 			{ type: 'separator' },
@@ -393,10 +394,10 @@ class CellOutputElement extends Disposable {
 			: nls.localize('promptChooseMimeType.placeHolder', "Select mimetype to render for current output");
 
 		const pick = await new Promise<IMimeTypeRenderer | undefined>(resolve => {
-			picker.onDidAccept(() => {
+			disposables.add(picker.onDidAccept(() => {
 				resolve(picker.selectedItems.length === 1 ? (picker.selectedItems[0] as IMimeTypeRenderer) : undefined);
-				picker.dispose();
-			});
+				disposables.dispose();
+			}));
 			picker.show();
 		});
 
diff --git a/src/vs/workbench/contrib/notebook/browser/view/cellParts/codeCell.ts b/src/vs/workbench/contrib/notebook/browser/view/cellParts/codeCell.ts
index 5472a771c8f..c5eb8f3f3d4 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/cellParts/codeCell.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/cellParts/codeCell.ts
@@ -10,6 +10,7 @@ import { Codicon } from 'vs/base/common/codicons';
 import { ThemeIcon } from 'vs/base/common/themables';
 import { Event } from 'vs/base/common/event';
 import { Disposable, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
+import { clamp } from 'vs/base/common/numbers';
 import * as strings from 'vs/base/common/strings';
 import { EditorOption } from 'vs/editor/common/config/editorOptions';
 import { IDimension } from 'vs/editor/common/core/dimension';
@@ -31,6 +32,7 @@ import { CodeCellViewModel, outputDisplayLimit } from 'vs/workbench/contrib/note
 import { INotebookExecutionStateService } from 'vs/workbench/contrib/notebook/common/notebookExecutionStateService';
 import { WordHighlighterContribution } from 'vs/editor/contrib/wordHighlighter/browser/wordHighlighter';
 import { CodeActionController } from 'vs/editor/contrib/codeAction/browser/codeActionController';
+import { NotebookCellEditorPool } from 'vs/workbench/contrib/notebook/browser/view/notebookCellEditorPool';
 
 export class CodeCell extends Disposable {
 	private _outputContainerRenderer: CellOutputContainer;
@@ -48,6 +50,7 @@ export class CodeCell extends Disposable {
 		private readonly notebookEditor: IActiveNotebookEditorDelegate,
 		private readonly viewCell: CodeCellViewModel,
 		private readonly templateData: CodeCellRenderTemplate,
+		private readonly editorPool: NotebookCellEditorPool,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 		@IKeybindingService private readonly keybindingService: IKeybindingService,
 		@IOpenerService openerService: IOpenerService,
@@ -67,6 +70,7 @@ export class CodeCell extends Disposable {
 		this._renderedInputCollapseState = false; // editor is always expanded initially
 		DOM.show(this.templateData.editorPart); // however the editor part display might not be cleared on template
 
+		this.registerNotebookEditorListeners();
 		this.registerViewCellLayoutChange();
 		this.registerCellEditorEventListeners();
 		this.registerDecorations();
@@ -265,12 +269,52 @@ export class CodeCell extends Disposable {
 		}
 	}
 
+	private registerNotebookEditorListeners() {
+		this._register(this.notebookEditor.onDidScroll(() => {
+			this.adjustEditorPosition();
+		}));
+
+		this._register(this.notebookEditor.onDidChangeLayout(() => {
+			this.adjustEditorPosition();
+			this.onCellWidthChange();
+		}));
+	}
+
+	private adjustEditorPosition() {
+		const extraOffset = - 6 /** distance to the top of the cell editor, which is 6px under the focus indicator */ - 1 /** border */;
+		const min = 0;
+
+		const scrollTop = this.notebookEditor.scrollTop;
+		const elementTop = this.notebookEditor.getAbsoluteTopOfElement(this.viewCell);
+		const diff = scrollTop - elementTop + extraOffset;
+
+		const notebookEditorLayout = this.notebookEditor.getLayoutInfo();
+
+		// we should stop adjusting the top when users are viewing the bottom of the cell editor
+		const editorMaxHeight = notebookEditorLayout.height
+			- notebookEditorLayout.stickyHeight
+			- 26 /** notebook toolbar */;
+
+		const maxTop =
+			this.viewCell.layoutInfo.editorHeight
+			// + this.viewCell.layoutInfo.statusBarHeight
+			- editorMaxHeight
+			;
+		const top = maxTop > 20 ?
+			clamp(min, diff, maxTop) :
+			min;
+		this.templateData.editorPart.style.top = `${top}px`;
+		// scroll the editor with top
+		this.templateData.editor?.setScrollTop(top);
+	}
+
 	private registerViewCellLayoutChange() {
 		this._register(this.viewCell.onDidChangeLayout((e) => {
 			if (e.outerWidth !== undefined) {
 				const layoutInfo = this.templateData.editor.getLayoutInfo();
 				if (layoutInfo.width !== this.viewCell.layoutInfo.editorWidth) {
 					this.onCellWidthChange();
+					this.adjustEditorPosition();
 				}
 			}
 		}));
@@ -281,6 +325,7 @@ export class CodeCell extends Disposable {
 			if (e.contentHeightChanged) {
 				if (this.viewCell.layoutInfo.editorHeight !== e.contentHeight) {
 					this.onCellEditorHeightChange(e.contentHeight);
+					this.adjustEditorPosition();
 				}
 			}
 		}));
@@ -375,7 +420,7 @@ export class CodeCell extends Disposable {
 		}));
 	}
 
-	private shouldUpdateDOMFocus() {
+	private shouldPreserveEditor() {
 		// The DOM focus needs to be adjusted:
 		// when a cell editor should be focused
 		// the document active element is inside the notebook editor or the document body (cell editor being disposed previously)
@@ -385,7 +430,7 @@ export class CodeCell extends Disposable {
 	}
 
 	private updateEditorForFocusModeChange(sync: boolean) {
-		if (this.shouldUpdateDOMFocus()) {
+		if (this.shouldPreserveEditor()) {
 			if (sync) {
 				this.templateData.editor?.focus();
 			} else {
@@ -533,7 +578,17 @@ export class CodeCell extends Disposable {
 	}
 
 	private layoutEditor(dimension: IDimension): void {
-		this.templateData.editor?.layout(dimension, true);
+		const editorLayout = this.notebookEditor.getLayoutInfo();
+		const maxHeight = Math.min(
+			editorLayout.height
+			- editorLayout.stickyHeight
+			- 26 /** notebook toolbar */,
+			dimension.height
+		);
+		this.templateData.editor?.layout({
+			width: dimension.width,
+			height: maxHeight
+		}, true);
 	}
 
 	private onCellWidthChange(): void {
@@ -572,8 +627,9 @@ export class CodeCell extends Disposable {
 		this._isDisposed = true;
 
 		// move focus back to the cell list otherwise the focus goes to body
-		if (this.shouldUpdateDOMFocus()) {
-			this.notebookEditor.focusContainer();
+		if (this.shouldPreserveEditor()) {
+			// now the focus is on the monaco editor for the cell but detached from the rows.
+			this.editorPool.preserveFocusedEditor(this.viewCell);
 		}
 
 		this.viewCell.detachTextEditor();
diff --git a/src/vs/workbench/contrib/notebook/browser/view/notebookCellEditorPool.ts b/src/vs/workbench/contrib/notebook/browser/view/notebookCellEditorPool.ts
new file mode 100644
index 00000000000..f37e78c1359
--- /dev/null
+++ b/src/vs/workbench/contrib/notebook/browser/view/notebookCellEditorPool.ts
@@ -0,0 +1,136 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as DOM from 'vs/base/browser/dom';
+import { CancelablePromise, createCancelablePromise } from 'vs/base/common/async';
+import { Disposable, DisposableStore, MutableDisposable } from 'vs/base/common/lifecycle';
+import { CodeEditorWidget } from 'vs/editor/browser/widget/codeEditor/codeEditorWidget';
+import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
+import { ITextModelService } from 'vs/editor/common/services/resolverService';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { IContextKeyService, IScopedContextKeyService } from 'vs/platform/contextkey/common/contextkey';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
+import { CellFocusMode, ICellViewModel, INotebookEditorDelegate } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { CellEditorOptions } from 'vs/workbench/contrib/notebook/browser/view/cellParts/cellEditorOptions';
+
+export class NotebookCellEditorPool extends Disposable {
+	private readonly _focusedEditorDOM: HTMLElement;
+	private readonly _editorDisposable = this._register(new MutableDisposable());
+	private _editorContextKeyService!: IScopedContextKeyService;
+	private _editor!: CodeEditorWidget;
+	private _focusEditorCancellablePromise: CancelablePromise<void> | undefined;
+	private _isInitialized = false;
+	private _isDisposed = false;
+
+	constructor(
+		readonly notebookEditor: INotebookEditorDelegate,
+		private readonly contextKeyServiceProvider: (container: HTMLElement) => IScopedContextKeyService,
+		@ITextModelService private readonly textModelService: ITextModelService,
+		@IConfigurationService private readonly _configurationService: IConfigurationService,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+	) {
+		super();
+
+		this._focusedEditorDOM = this.notebookEditor.getDomNode().appendChild(DOM.$('.cell-editor-part-cache'));
+		this._focusedEditorDOM.style.position = 'absolute';
+		this._focusedEditorDOM.style.top = '-50000px';
+		this._focusedEditorDOM.style.width = '1px';
+		this._focusedEditorDOM.style.height = '1px';
+	}
+
+	private _initializeEditor(cell: ICellViewModel) {
+		this._editorContextKeyService = this._register(this.contextKeyServiceProvider(this._focusedEditorDOM));
+
+		const editorContainer = DOM.prepend(this._focusedEditorDOM, DOM.$('.cell-editor-container'));
+		const editorInstaService = this._register(this._instantiationService.createChild(new ServiceCollection([IContextKeyService, this._editorContextKeyService])));
+		EditorContextKeys.inCompositeEditor.bindTo(this._editorContextKeyService).set(true);
+		const editorOptions = new CellEditorOptions(this.notebookEditor.getBaseCellEditorOptions(cell.language), this.notebookEditor.notebookOptions, this._configurationService);
+
+		this._editor = this._register(editorInstaService.createInstance(CodeEditorWidget, editorContainer, {
+			...editorOptions.getDefaultValue(),
+			dimension: {
+				width: 0,
+				height: 0
+			},
+			scrollbar: {
+				vertical: 'hidden',
+				horizontal: 'auto',
+				handleMouseWheel: false,
+				useShadows: false,
+			},
+		}, {
+			contributions: this.notebookEditor.creationOptions.cellEditorContributions
+		}));
+
+		this._isInitialized = true;
+	}
+
+	preserveFocusedEditor(cell: ICellViewModel): void {
+		if (!this._isInitialized) {
+			this._initializeEditor(cell);
+		}
+
+		this._editorDisposable.clear();
+		this._focusEditorCancellablePromise?.cancel();
+
+		this._focusEditorCancellablePromise = createCancelablePromise(async token => {
+			const ref = await this.textModelService.createModelReference(cell.uri);
+
+			if (this._isDisposed || token.isCancellationRequested) {
+				ref.dispose();
+				return;
+			}
+
+			const editorDisposable = new DisposableStore();
+			editorDisposable.add(ref);
+			this._editor.setModel(ref.object.textEditorModel);
+			this._editor.setSelections(cell.getSelections());
+			this._editor.focus();
+
+			const _update = () => {
+				const editorSelections = this._editor.getSelections();
+				if (editorSelections) {
+					cell.setSelections(editorSelections);
+				}
+
+				this.notebookEditor.revealInView(cell);
+				this._editor.setModel(null);
+				ref.dispose();
+			};
+
+			editorDisposable.add(this._editor.onDidChangeModelContent((e) => {
+				_update();
+			}));
+
+			editorDisposable.add(this._editor.onDidChangeCursorSelection(e => {
+				if (e.source === 'keyboard' || e.source === 'mouse') {
+					_update();
+				}
+			}));
+
+			editorDisposable.add(this.notebookEditor.onDidChangeActiveEditor(() => {
+				const latestActiveCell = this.notebookEditor.getActiveCell();
+
+				if (latestActiveCell !== cell || latestActiveCell.focusMode !== CellFocusMode.Editor) {
+					// focus moves to another cell or cell container
+					// we should stop preserving the editor
+					this._editorDisposable.clear();
+					this._editor.setModel(null);
+					ref.dispose();
+				}
+			}));
+
+			this._editorDisposable.value = editorDisposable;
+		});
+	}
+
+	override dispose() {
+		this._isDisposed = true;
+		this._focusEditorCancellablePromise?.cancel();
+
+		super.dispose();
+	}
+}
diff --git a/src/vs/workbench/contrib/notebook/browser/view/notebookCellList.ts b/src/vs/workbench/contrib/notebook/browser/view/notebookCellList.ts
index a7cd34ca453..cd401a3b4c8 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/notebookCellList.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/notebookCellList.ts
@@ -1152,9 +1152,6 @@ export class NotebookCellList extends WorkbenchList<CellViewModel> implements ID
 			// Scrolled into view from above
 			this.view.setScrollTop(positionTop - 30);
 		}
-
-
-		element.revealRangeInCenter(range);
 	}
 	//#endregion
 
diff --git a/src/vs/workbench/contrib/notebook/browser/view/notebookCellListView.ts b/src/vs/workbench/contrib/notebook/browser/view/notebookCellListView.ts
index 52fbff1055d..d94da9273d3 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/notebookCellListView.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/notebookCellListView.ts
@@ -210,7 +210,7 @@ export class NotebookCellsLayout implements IRangeMap {
 			return this.count;
 		}
 
-		return this._prefixSumComputer.getIndexOf(offset).index;
+		return this._prefixSumComputer.getIndexOf(Math.trunc(offset)).index;
 	}
 
 	indexAfter(position: number): number {
diff --git a/src/vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView.ts b/src/vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView.ts
index 51c11f43383..5df72991c34 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView.ts
@@ -569,7 +569,7 @@ export class BackLayerWebView<T extends ICommonCellInfo> extends Themable {
 		}
 
 		return [
-			dirname(FileAccess.asFileUri('vs/loader.js')),
+			dirname(FileAccess.asFileUri('vs/loader.js')), // TODO@esm this file will not exist in the future
 		];
 	}
 
diff --git a/src/vs/workbench/contrib/notebook/browser/view/renderers/cellRenderer.ts b/src/vs/workbench/contrib/notebook/browser/view/renderers/cellRenderer.ts
index 564ddd06414..47841c238db 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/renderers/cellRenderer.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/renderers/cellRenderer.ts
@@ -50,6 +50,7 @@ import { MarkupCellViewModel } from 'vs/workbench/contrib/notebook/browser/viewM
 import { CellViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/notebookViewModelImpl';
 import { CellKind } from 'vs/workbench/contrib/notebook/common/notebookCommon';
 import { INotebookExecutionStateService } from 'vs/workbench/contrib/notebook/common/notebookExecutionStateService';
+import { NotebookCellEditorPool } from 'vs/workbench/contrib/notebook/browser/view/notebookCellEditorPool';
 
 const $ = DOM.$;
 
@@ -239,6 +240,7 @@ export class CodeCellRenderer extends AbstractCellRenderer implements IListRende
 	constructor(
 		notebookEditor: INotebookEditorDelegate,
 		private renderedEditors: Map<ICellViewModel, ICodeEditor>,
+		private editorPool: NotebookCellEditorPool,
 		dndController: CellDragAndDropController,
 		contextKeyServiceProvider: (container: HTMLElement) => IScopedContextKeyService,
 		@IConfigurationService configurationService: IConfigurationService,
@@ -288,6 +290,12 @@ export class CodeCellRenderer extends AbstractCellRenderer implements IListRende
 				width: 0,
 				height: 0
 			},
+			scrollbar: {
+				vertical: 'hidden',
+				horizontal: 'auto',
+				handleMouseWheel: false,
+				useShadows: false,
+			},
 		}, {
 			contributions: this.notebookEditor.creationOptions.cellEditorContributions
 		});
@@ -376,7 +384,7 @@ export class CodeCellRenderer extends AbstractCellRenderer implements IListRende
 		templateData.outputContainer.domNode.innerText = '';
 		templateData.outputContainer.domNode.appendChild(templateData.cellOutputCollapsedContainer);
 
-		templateData.elementDisposables.add(templateData.instantiationService.createInstance(CodeCell, this.notebookEditor, element, templateData));
+		templateData.elementDisposables.add(templateData.instantiationService.createInstance(CodeCell, this.notebookEditor, element, templateData, this.editorPool));
 		this.renderedEditors.set(element, templateData.editor);
 	}
 
diff --git a/src/vs/workbench/contrib/notebook/browser/viewModel/baseCellViewModel.ts b/src/vs/workbench/contrib/notebook/browser/viewModel/baseCellViewModel.ts
index 9ed29128b2c..f75bce458f8 100644
--- a/src/vs/workbench/contrib/notebook/browser/viewModel/baseCellViewModel.ts
+++ b/src/vs/workbench/contrib/notebook/browser/viewModel/baseCellViewModel.ts
@@ -8,6 +8,7 @@ import { Disposable, IDisposable, IReference, MutableDisposable, dispose } from
 import { Mimes } from 'vs/base/common/mime';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
+import { IEditorCommentsOptions } from 'vs/editor/common/config/editorOptions';
 import { IPosition } from 'vs/editor/common/core/position';
 import { IRange, Range } from 'vs/editor/common/core/range';
 import { Selection } from 'vs/editor/common/core/selection';
@@ -85,6 +86,15 @@ export abstract class BaseCellViewModel extends Disposable {
 		this._onDidChangeState.fire({ cellLineNumberChanged: true });
 	}
 
+	private _commentOptions: IEditorCommentsOptions;
+	public get commentOptions(): IEditorCommentsOptions {
+		return this._commentOptions;
+	}
+
+	public set commentOptions(newOptions: IEditorCommentsOptions) {
+		this._commentOptions = newOptions;
+	}
+
 	private _focusMode: CellFocusMode = CellFocusMode.Container;
 	get focusMode() {
 		return this._focusMode;
@@ -208,6 +218,13 @@ export abstract class BaseCellViewModel extends Disposable {
 		if (this.model.collapseState?.outputCollapsed) {
 			this._outputCollapsed = true;
 		}
+
+		this._commentOptions = this._configurationService.getValue<IEditorCommentsOptions>('editor.comments', { overrideIdentifier: this.language });
+		this._register(this._configurationService.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration('editor.comments')) {
+				this._commentOptions = this._configurationService.getValue<IEditorCommentsOptions>('editor.comments', { overrideIdentifier: this.language });
+			}
+		}));
 	}
 
 
@@ -510,12 +527,24 @@ export abstract class BaseCellViewModel extends Disposable {
 
 	setSelections(selections: Selection[]) {
 		if (selections.length) {
-			this._textEditor?.setSelections(selections);
+			if (this._textEditor) {
+				this._textEditor?.setSelections(selections);
+			} else if (this._editorViewStates) {
+				this._editorViewStates.cursorState = selections.map(selection => {
+					return {
+						inSelectionMode: !selection.isEmpty(),
+						selectionStart: selection.getStartPosition(),
+						position: selection.getEndPosition(),
+					};
+				});
+			}
 		}
 	}
 
 	getSelections() {
-		return this._textEditor?.getSelections() || [];
+		return this._textEditor?.getSelections()
+			?? this._editorViewStates?.cursorState.map(state => new Selection(state.selectionStart.lineNumber, state.selectionStart.column, state.position.lineNumber, state.position.column))
+			?? [];
 	}
 
 	getSelectionsStartPosition(): IPosition[] | undefined {
diff --git a/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorStickyScroll.ts b/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorStickyScroll.ts
index 50a6758941b..e82cdf45abf 100644
--- a/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorStickyScroll.ts
+++ b/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorStickyScroll.ts
@@ -106,6 +106,8 @@ export class NotebookStickyScroll extends Disposable {
 	readonly onDidChangeNotebookStickyScroll: Event<number> = this._onDidChangeNotebookStickyScroll.event;
 	private notebookCellOutlineReference?: IReference<NotebookCellOutlineDataSource>;
 
+	private readonly _layoutDisposableStore = this._register(new DisposableStore());
+
 	getDomNode(): HTMLElement {
 		return this.domNode;
 	}
@@ -143,6 +145,7 @@ export class NotebookStickyScroll extends Disposable {
 		private readonly domNode: HTMLElement,
 		private readonly notebookEditor: INotebookEditor,
 		private readonly notebookCellList: INotebookCellList,
+		private readonly layoutFn: (delta: number) => void,
 		@IContextMenuService private readonly _contextMenuService: IContextMenuService,
 		@IInstantiationService private readonly instantiationService: IInstantiationService
 	) {
@@ -269,8 +272,16 @@ export class NotebookStickyScroll extends Disposable {
 		const sizeDelta = this.getCurrentStickyHeight() - oldStickyHeight;
 		if (sizeDelta !== 0) {
 			this._onDidChangeNotebookStickyScroll.fire(sizeDelta);
+
+			const d = this._layoutDisposableStore.add(DOM.scheduleAtNextAnimationFrame(DOM.getWindow(this.getDomNode()), () => {
+				this.layoutFn(sizeDelta);
+				this.updateDisplay();
+
+				this._layoutDisposableStore.delete(d);
+			}));
+		} else {
+			this.updateDisplay();
 		}
-		this.updateDisplay();
 	}
 
 	private updateDisplay() {
diff --git a/src/vs/workbench/contrib/notebook/browser/viewParts/notebookHorizontalTracker.ts b/src/vs/workbench/contrib/notebook/browser/viewParts/notebookHorizontalTracker.ts
new file mode 100644
index 00000000000..22b678d7813
--- /dev/null
+++ b/src/vs/workbench/contrib/notebook/browser/viewParts/notebookHorizontalTracker.ts
@@ -0,0 +1,64 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { addDisposableListener, EventType, getWindow } from 'vs/base/browser/dom';
+import { IMouseWheelEvent } from 'vs/base/browser/mouseEvent';
+import { Disposable } from 'vs/base/common/lifecycle';
+import { isChrome } from 'vs/base/common/platform';
+import { CodeEditorWidget } from 'vs/editor/browser/widget/codeEditor/codeEditorWidget';
+import { INotebookEditorDelegate } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
+
+export class NotebookHorizontalTracker extends Disposable {
+	constructor(
+		private readonly _notebookEditor: INotebookEditorDelegate,
+		private readonly _listViewScrollablement: HTMLElement,
+	) {
+		super();
+
+		this._register(addDisposableListener(this._listViewScrollablement, EventType.MOUSE_WHEEL, (event: IMouseWheelEvent) => {
+			if (event.deltaX === 0) {
+				return;
+			}
+
+			const hoveringOnEditor = this._notebookEditor.codeEditors.find(editor => {
+				const editorLayout = editor[1].getLayoutInfo();
+				if (editorLayout.contentWidth === editorLayout.width) {
+					// no overflow
+					return false;
+				}
+
+				const editorDOM = editor[1].getDomNode();
+				if (editorDOM && editorDOM.contains(event.target as HTMLElement)) {
+					return true;
+				}
+
+				return false;
+			});
+
+			if (!hoveringOnEditor) {
+				return;
+			}
+
+			const targetWindow = getWindow(event);
+			const evt = {
+				deltaMode: event.deltaMode,
+				deltaX: event.deltaX,
+				deltaY: 0,
+				deltaZ: 0,
+				wheelDelta: event.wheelDelta && isChrome ? (event.wheelDelta / targetWindow.devicePixelRatio) : event.wheelDelta,
+				wheelDeltaX: event.wheelDeltaX && isChrome ? (event.wheelDeltaX / targetWindow.devicePixelRatio) : event.wheelDeltaX,
+				wheelDeltaY: 0,
+				detail: event.detail,
+				shiftKey: event.shiftKey,
+				type: event.type,
+				defaultPrevented: false,
+				preventDefault: () => { },
+				stopPropagation: () => { }
+			};
+
+			(hoveringOnEditor[1] as CodeEditorWidget).delegateScrollFromMouseWheelEvent(evt as any);
+		}));
+	}
+}
diff --git a/src/vs/workbench/contrib/notebook/browser/viewParts/notebookKernelQuickPickStrategy.ts b/src/vs/workbench/contrib/notebook/browser/viewParts/notebookKernelQuickPickStrategy.ts
index 7daf1889377..40a78447054 100644
--- a/src/vs/workbench/contrib/notebook/browser/viewParts/notebookKernelQuickPickStrategy.ts
+++ b/src/vs/workbench/contrib/notebook/browser/viewParts/notebookKernelQuickPickStrategy.ts
@@ -140,11 +140,15 @@ abstract class KernelPickerStrategyBase implements IKernelPickerStrategy {
 			return true;
 		}
 
-		const quickPick = this._quickInputService.createQuickPick<KernelQuickPickItem>();
+
+		const localDisposableStore = new DisposableStore();
+		const quickPick = localDisposableStore.add(this._quickInputService.createQuickPick<KernelQuickPickItem>({ useSeparators: true }));
 		const quickPickItems = this._getKernelPickerQuickPickItems(notebook, matchResult, this._notebookKernelService, scopedContextKeyService);
 
 		if (quickPickItems.length === 1 && supportAutoRun(quickPickItems[0]) && !skipAutoRun) {
-			return await this._handleQuickPick(editor, quickPickItems[0], quickPickItems as KernelQuickPickItem[]);
+			const picked = await this._handleQuickPick(editor, quickPickItems[0], quickPickItems as KernelQuickPickItem[]);
+			localDisposableStore.dispose();
+			return picked;
 		}
 
 		quickPick.items = quickPickItems;
@@ -205,7 +209,7 @@ abstract class KernelPickerStrategyBase implements IKernelPickerStrategy {
 		}, this);
 
 		const pick = await new Promise<{ selected: KernelQuickPickItem | undefined; items: KernelQuickPickItem[] }>((resolve, reject) => {
-			quickPick.onDidAccept(() => {
+			localDisposableStore.add(quickPick.onDidAccept(() => {
 				const item = quickPick.selectedItems[0];
 				if (item) {
 					resolve({ selected: item, items: quickPick.items as KernelQuickPickItem[] });
@@ -214,17 +218,19 @@ abstract class KernelPickerStrategyBase implements IKernelPickerStrategy {
 				}
 
 				quickPick.hide();
-			});
+			}));
 
-			quickPick.onDidHide(() => {
+			localDisposableStore.add(quickPick.onDidHide(() => {
 				kernelDetectionTaskListener.dispose();
 				kernelChangeEventListener.dispose();
 				quickPick.dispose();
 				resolve({ selected: undefined, items: quickPick.items as KernelQuickPickItem[] });
-			});
+			}));
 			quickPick.show();
 		});
 
+		localDisposableStore.dispose();
+
 		if (pick.selected) {
 			return await this._handleQuickPick(editor, pick.selected, pick.items);
 		}
@@ -343,7 +349,7 @@ abstract class KernelPickerStrategyBase implements IKernelPickerStrategy {
 
 	private async _showInstallKernelExtensionRecommendation(
 		notebookTextModel: NotebookTextModel,
-		quickPick: IQuickPick<KernelQuickPickItem>,
+		quickPick: IQuickPick<KernelQuickPickItem, { useSeparators: true }>,
 		extensionWorkbenchService: IExtensionsWorkbenchService,
 		token: CancellationToken
 	) {
@@ -523,7 +529,7 @@ export class KernelPickerMRUStrategy extends KernelPickerStrategyBase {
 	private async displaySelectAnotherQuickPick(editor: IActiveNotebookEditor, kernelListEmpty: boolean): Promise<boolean> {
 		const notebook: NotebookTextModel = editor.textModel;
 		const disposables = new DisposableStore();
-		const quickPick = this._quickInputService.createQuickPick<KernelQuickPickItem>();
+		const quickPick = disposables.add(this._quickInputService.createQuickPick<KernelQuickPickItem>({ useSeparators: true }));
 		const quickPickItem = await new Promise<KernelQuickPickItem | IQuickInputButton | undefined>(resolve => {
 			// select from kernel sources
 			quickPick.title = kernelListEmpty ? localize('select', "Select Kernel") : localize('selectAnotherKernel', "Select Another Kernel");
@@ -537,13 +543,12 @@ export class KernelPickerMRUStrategy extends KernelPickerStrategyBase {
 					resolve(button);
 				}
 			}));
-			quickPick.onDidTriggerItemButton(async (e) => {
-
+			disposables.add(quickPick.onDidTriggerItemButton(async (e) => {
 				if (isKernelSourceQuickPickItem(e.item) && e.item.documentation !== undefined) {
 					const uri = URI.isUri(e.item.documentation) ? URI.parse(e.item.documentation) : await this._commandService.executeCommand(e.item.documentation);
 					void this._openerService.open(uri, { openExternal: true });
 				}
-			});
+			}));
 			disposables.add(quickPick.onDidAccept(async () => {
 				resolve(quickPick.selectedItems[0]);
 			}));
@@ -711,7 +716,8 @@ export class KernelPickerMRUStrategy extends KernelPickerStrategyBase {
 
 	private async _selectOneKernel(notebook: NotebookTextModel, source: string, kernels: INotebookKernel[]) {
 		const quickPickItems: QuickPickInput<KernelPick>[] = kernels.map(kernel => toKernelQuickPick(kernel, undefined));
-		const quickPick = this._quickInputService.createQuickPick<KernelQuickPickItem>();
+		const localDisposableStore = new DisposableStore();
+		const quickPick = localDisposableStore.add(this._quickInputService.createQuickPick<KernelQuickPickItem>({ useSeparators: true }));
 		quickPick.items = quickPickItems;
 		quickPick.canSelectMany = false;
 
@@ -723,7 +729,7 @@ export class KernelPickerMRUStrategy extends KernelPickerStrategyBase {
 		// since this function resolves before the kernel is selected via this.selecteKernel below.
 		const deferred = new DeferredPromise<void>();
 		// --- End Positron ---
-		quickPick.onDidAccept(async () => {
+		localDisposableStore.add(quickPick.onDidAccept(async () => {
 			if (quickPick.selectedItems && quickPick.selectedItems.length > 0 && isKernelPick(quickPick.selectedItems[0])) {
 				await this._selecteKernel(notebook, quickPick.selectedItems[0].kernel);
 			}
@@ -733,14 +739,14 @@ export class KernelPickerMRUStrategy extends KernelPickerStrategyBase {
 			// --- Start Positron ---
 			deferred.complete();
 			// --- End Positron ---
-		});
+		}));
 
-		quickPick.onDidHide(() => {
-			quickPick.dispose();
+		localDisposableStore.add(quickPick.onDidHide(() => {
+			localDisposableStore.dispose();
 			// --- Start Positron ---
 			deferred.complete();
 			// --- End Positron ---
-		});
+		}));
 
 		quickPick.show();
 
diff --git a/src/vs/workbench/contrib/notebook/common/model/notebookCellTextModel.ts b/src/vs/workbench/contrib/notebook/common/model/notebookCellTextModel.ts
index 5c373d8b7cc..e83261cf204 100644
--- a/src/vs/workbench/contrib/notebook/common/model/notebookCellTextModel.ts
+++ b/src/vs/workbench/contrib/notebook/common/model/notebookCellTextModel.ts
@@ -163,6 +163,7 @@ export class NotebookCellTextModel extends Disposable implements ICell {
 					this._versionId = this._textModel.getVersionId();
 					this._alternativeId = this._textModel.getAlternativeVersionId();
 				}
+				this._textBufferHash = null;
 				this._onDidChangeContent.fire('content');
 			}));
 
@@ -418,6 +419,10 @@ export class NotebookCellTextModel extends Disposable implements ICell {
 			return false;
 		}
 
+		if (this.outputs.length !== b.outputs.length) {
+			return false;
+		}
+
 		if (this.getTextLength() !== b.getTextLength()) {
 			return false;
 		}
diff --git a/src/vs/workbench/contrib/notebook/common/model/notebookTextModel.ts b/src/vs/workbench/contrib/notebook/common/model/notebookTextModel.ts
index 21870a0067f..e1a875e70e6 100644
--- a/src/vs/workbench/contrib/notebook/common/model/notebookTextModel.ts
+++ b/src/vs/workbench/contrib/notebook/common/model/notebookTextModel.ts
@@ -17,11 +17,13 @@ import { IModelService } from 'vs/editor/common/services/model';
 import { Schemas } from 'vs/base/common/network';
 import { isEqual } from 'vs/base/common/resources';
 import { ILanguageService } from 'vs/editor/common/languages/language';
-import { ITextModel } from 'vs/editor/common/model';
+import { FindMatch, ITextModel } from 'vs/editor/common/model';
 import { TextModel } from 'vs/editor/common/model/textModel';
 import { isDefined } from 'vs/base/common/types';
 import { ILanguageDetectionService } from 'vs/workbench/services/languageDetection/common/languageDetectionWorkerService';
-
+import { IPosition } from 'vs/editor/common/core/position';
+import { Range } from 'vs/editor/common/core/range';
+import { SearchParams } from 'vs/editor/common/model/textModelSearch';
 
 class StackOperation implements IWorkspaceUndoRedoElement {
 	type: UndoRedoElementType.Workspace;
@@ -1173,6 +1175,43 @@ export class NotebookTextModel extends Disposable implements INotebookTextModel
 	private _indexIsInvalid(index: number): boolean {
 		return index < 0 || index >= this._cells.length;
 	}
+
+	//#region Find
+	findNextMatch(searchString: string, searchStart: { cellIndex: number; position: IPosition }, isRegex: boolean, matchCase: boolean, wordSeparators: string | null): { cell: NotebookCellTextModel; match: FindMatch } | null {
+		// check if search cell index is valid
+		this._assertIndex(searchStart.cellIndex);
+		const searchParams = new SearchParams(searchString, isRegex, matchCase, wordSeparators);
+		const searchData = searchParams.parseSearchRequest();
+
+		if (!searchData) {
+			return null;
+		}
+
+		let cellIndex = searchStart.cellIndex;
+		let searchStartPosition = searchStart.position;
+
+		while (cellIndex < this._cells.length) {
+			const cell = this._cells[cellIndex];
+			const searchRange = new Range(
+				searchStartPosition.lineNumber,
+				searchStartPosition.column,
+				cell.textBuffer.getLineCount(),
+				cell.textBuffer.getLineMaxColumn(cell.textBuffer.getLineCount())
+			);
+
+			const result = cell.textBuffer.findMatchesLineByLine(searchRange, searchData, false, 1);
+			if (result.length > 0) {
+				return { cell, match: result[0] };
+			}
+
+			// Move to the next cell
+			cellIndex++;
+			searchStartPosition = { lineNumber: 1, column: 1 }; // Reset position to start of the next cell
+		}
+
+		return null;
+	}
+	//#endregion
 }
 
 class OutputSequence implements ISequence {
diff --git a/src/vs/workbench/contrib/notebook/common/notebookCommon.ts b/src/vs/workbench/contrib/notebook/common/notebookCommon.ts
index 2df7cc459be..f12d11098ed 100644
--- a/src/vs/workbench/contrib/notebook/common/notebookCommon.ts
+++ b/src/vs/workbench/contrib/notebook/common/notebookCommon.ts
@@ -34,11 +34,12 @@ import { ICellExecutionError } from 'vs/workbench/contrib/notebook/common/notebo
 import { INotebookTextModelLike } from 'vs/workbench/contrib/notebook/common/notebookKernelService';
 import { ICellRange } from 'vs/workbench/contrib/notebook/common/notebookRange';
 import { RegisteredEditorPriority } from 'vs/workbench/services/editor/common/editorResolverService';
-import { generate as generateUri, parse as parseUri } from 'vs/workbench/services/notebook/common/notebookDocumentService';
+import { generateMetadataUri, generate as generateUri, parseMetadataUri, parse as parseUri } from 'vs/workbench/services/notebook/common/notebookDocumentService';
 import { IWorkingCopyBackupMeta, IWorkingCopySaveEvent } from 'vs/workbench/services/workingCopy/common/workingCopy';
 
 export const NOTEBOOK_EDITOR_ID = 'workbench.editor.notebook';
 export const NOTEBOOK_DIFF_EDITOR_ID = 'workbench.editor.notebookTextDiffEditor';
+export const NOTEBOOK_MULTI_DIFF_EDITOR_ID = 'workbench.editor.notebookMultiTextDiffEditor';
 export const INTERACTIVE_WINDOW_EDITOR_ID = 'workbench.editor.interactive';
 export const REPL_EDITOR_ID = 'workbench.editor.repl';
 
@@ -563,6 +564,15 @@ export interface INotebookContributionData {
 	priority?: RegisteredEditorPriority;
 }
 
+export namespace NotebookUri {
+	export const scheme = Schemas.vscodeNotebookMetadata;
+	export function generate(notebook: URI): URI {
+		return generateMetadataUri(notebook);
+	}
+	export function parse(metadata: URI): URI | undefined {
+		return parseMetadataUri(metadata);
+	}
+}
 
 export namespace CellUri {
 	export const scheme = Schemas.vscodeNotebookCell;
diff --git a/src/vs/workbench/contrib/notebook/common/notebookEditorInput.ts b/src/vs/workbench/contrib/notebook/common/notebookEditorInput.ts
index 5edcb35f62c..0536b7b0ae5 100644
--- a/src/vs/workbench/contrib/notebook/common/notebookEditorInput.ts
+++ b/src/vs/workbench/contrib/notebook/common/notebookEditorInput.ts
@@ -90,8 +90,15 @@ export class NotebookEditorInput extends AbstractResourceEditorInput {
 				return;
 			}
 
+			const reason = e.auto
+				? localize('vetoAutoExtHostRestart', "One of the opened editors is a notebook editor.")
+				: localize('vetoExtHostRestart', "Notebook '{0}' could not be saved.", this.resource.path);
+
 			e.veto((async () => {
 				const editors = editorService.findEditors(this);
+				if (e.auto) {
+					return true;
+				}
 				if (editors.length > 0) {
 					const result = await editorService.save(editors[0]);
 					if (result.success) {
@@ -99,7 +106,7 @@ export class NotebookEditorInput extends AbstractResourceEditorInput {
 					}
 				}
 				return true; // Veto
-			})(), localize('vetoExtHostRestart', "Notebook '{0}' could not be saved.", this.resource.path));
+			})(), reason);
 		}));
 	}
 
@@ -349,7 +356,7 @@ export class NotebookEditorInput extends AbstractResourceEditorInput {
 			return true;
 		}
 		if (otherInput instanceof NotebookEditorInput) {
-			return this.viewType === otherInput.viewType && isEqual(this.resource, otherInput.resource);
+			return this.editorId === otherInput.editorId && isEqual(this.resource, otherInput.resource);
 		}
 		return false;
 	}
@@ -366,8 +373,8 @@ export function isCompositeNotebookEditorInput(thing: unknown): thing is ICompos
 		&& ((<ICompositeNotebookEditorInput>thing).editorInputs.every(input => input instanceof NotebookEditorInput));
 }
 
-export function isNotebookEditorInput(thing: unknown): thing is NotebookEditorInput {
+export function isNotebookEditorInput(thing: EditorInput | undefined): thing is NotebookEditorInput {
 	return !!thing
 		&& typeof thing === 'object'
-		&& thing instanceof NotebookEditorInput;
+		&& thing.typeId === NotebookEditorInput.ID;
 }
diff --git a/src/vs/workbench/contrib/notebook/common/notebookEditorModel.ts b/src/vs/workbench/contrib/notebook/common/notebookEditorModel.ts
index a6a06d63186..52bd9d3a7c6 100644
--- a/src/vs/workbench/contrib/notebook/common/notebookEditorModel.ts
+++ b/src/vs/workbench/contrib/notebook/common/notebookEditorModel.ts
@@ -15,12 +15,12 @@ import { assertType } from 'vs/base/common/types';
 import { URI } from 'vs/base/common/uri';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IWriteFileOptions, IFileStatWithMetadata } from 'vs/platform/files/common/files';
-import { ILogService } from 'vs/platform/log/common/log';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IRevertOptions, ISaveOptions, IUntypedEditorInput } from 'vs/workbench/common/editor';
 import { EditorModel } from 'vs/workbench/common/editor/editorModel';
 import { NotebookTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookTextModel';
 import { ICellDto2, INotebookEditorModel, INotebookLoadOptions, IResolvedNotebookEditorModel, NotebookCellsChangeType, NotebookData, NotebookSetting } from 'vs/workbench/contrib/notebook/common/notebookCommon';
+import { INotebookLoggingService } from 'vs/workbench/contrib/notebook/common/notebookLoggingService';
 import { INotebookSerializer, INotebookService, SimpleNotebookProviderInfo } from 'vs/workbench/contrib/notebook/common/notebookService';
 import { IFilesConfigurationService } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService';
 import { IFileWorkingCopyModelConfiguration, SnapshotContext } from 'vs/workbench/services/workingCopy/common/fileWorkingCopy';
@@ -199,7 +199,7 @@ export class NotebookFileWorkingCopyModel extends Disposable implements IStoredF
 		private readonly _notebookService: INotebookService,
 		private readonly _configurationService: IConfigurationService,
 		private readonly _telemetryService: ITelemetryService,
-		private readonly _logService: ILogService
+		private readonly _notebookLogService: INotebookLoggingService,
 	) {
 		super();
 
@@ -247,7 +247,7 @@ export class NotebookFileWorkingCopyModel extends Disposable implements IStoredF
 				let serializer = this._notebookService.tryGetDataProviderSync(this.notebookModel.viewType)?.serializer;
 
 				if (!serializer) {
-					this._logService.warn('No serializer found for notebook model, checking if provider still needs to be resolved');
+					this._notebookLogService.info('WorkingCopyModel', 'No serializer found for notebook model, checking if provider still needs to be resolved');
 					serializer = await this.getNotebookSerializer();
 				}
 
@@ -342,6 +342,8 @@ export class NotebookFileWorkingCopyModel extends Disposable implements IStoredF
 		if (token.isCancellationRequested) {
 			throw new CancellationError();
 		}
+
+		this._notebookLogService.info('WorkingCopyModel', 'Notebook content updated from file system - ' + this._notebookModel.uri.toString());
 		this._notebookModel.reset(data.cells, data.metadata, serializer.options);
 	}
 
@@ -370,25 +372,15 @@ export class NotebookFileWorkingCopyModelFactory implements IStoredFileWorkingCo
 		@INotebookService private readonly _notebookService: INotebookService,
 		@IConfigurationService private readonly _configurationService: IConfigurationService,
 		@ITelemetryService private readonly _telemetryService: ITelemetryService,
-		@ILogService private readonly _logService: ILogService
+		@INotebookLoggingService private readonly _notebookLogService: INotebookLoggingService
 	) { }
 
 	async createModel(resource: URI, stream: VSBufferReadableStream, token: CancellationToken): Promise<NotebookFileWorkingCopyModel> {
 
-		const info = await this._notebookService.withNotebookDataProvider(this._viewType);
-		if (!(info instanceof SimpleNotebookProviderInfo)) {
-			throw new Error('CANNOT open file notebook with this provider');
-		}
-
-		const bytes = await streamToBuffer(stream);
-		const data = await info.serializer.dataToNotebook(bytes);
-
-		if (token.isCancellationRequested) {
-			throw new CancellationError();
-		}
+		const notebookModel = this._notebookService.getNotebookTextModel(resource) ??
+			await this._notebookService.createNotebookTextModel(this._viewType, resource, stream);
 
-		const notebookModel = this._notebookService.createNotebookTextModel(info.viewType, resource, data, info.serializer.options);
-		return new NotebookFileWorkingCopyModel(notebookModel, this._notebookService, this._configurationService, this._telemetryService, this._logService);
+		return new NotebookFileWorkingCopyModel(notebookModel, this._notebookService, this._configurationService, this._telemetryService, this._notebookLogService);
 	}
 }
 
diff --git a/src/vs/workbench/contrib/notebook/common/notebookEditorModelResolverService.ts b/src/vs/workbench/contrib/notebook/common/notebookEditorModelResolverService.ts
index dc3d26a0ca3..8231edfcdb9 100644
--- a/src/vs/workbench/contrib/notebook/common/notebookEditorModelResolverService.ts
+++ b/src/vs/workbench/contrib/notebook/common/notebookEditorModelResolverService.ts
@@ -8,6 +8,7 @@ import { URI } from 'vs/base/common/uri';
 import { IResolvedNotebookEditorModel, NotebookEditorModelCreationOptions } from 'vs/workbench/contrib/notebook/common/notebookCommon';
 import { IReference } from 'vs/base/common/lifecycle';
 import { Event, IWaitUntil } from 'vs/base/common/event';
+import { NotebookTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookTextModel';
 
 export const INotebookEditorModelResolverService = createDecorator<INotebookEditorModelResolverService>('INotebookModelResolverService');
 
@@ -49,6 +50,8 @@ export interface INotebookEditorModelResolverService {
 
 	isDirty(resource: URI): boolean;
 
+	createUntitledNotebookTextModel(viewType: string): Promise<NotebookTextModel>;
+
 	resolve(resource: URI, viewType?: string, creationOptions?: NotebookEditorModelCreationOptions): Promise<IReference<IResolvedNotebookEditorModel>>;
 	resolve(resource: IUntitledNotebookResource, viewType: string, creationOtions?: NotebookEditorModelCreationOptions): Promise<IReference<IResolvedNotebookEditorModel>>;
 }
diff --git a/src/vs/workbench/contrib/notebook/common/notebookEditorModelResolverServiceImpl.ts b/src/vs/workbench/contrib/notebook/common/notebookEditorModelResolverServiceImpl.ts
index d43273d4fa6..f34fbcae53a 100644
--- a/src/vs/workbench/contrib/notebook/common/notebookEditorModelResolverServiceImpl.ts
+++ b/src/vs/workbench/contrib/notebook/common/notebookEditorModelResolverServiceImpl.ts
@@ -9,7 +9,6 @@ import { CellUri, IResolvedNotebookEditorModel, NotebookEditorModelCreationOptio
 import { NotebookFileWorkingCopyModel, NotebookFileWorkingCopyModelFactory, SimpleNotebookEditorModel } from 'vs/workbench/contrib/notebook/common/notebookEditorModel';
 import { combinedDisposable, DisposableStore, dispose, IDisposable, IReference, ReferenceCollection, toDisposable } from 'vs/base/common/lifecycle';
 import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
-import { ILogService } from 'vs/platform/log/common/log';
 import { AsyncEmitter, Emitter, Event } from 'vs/base/common/event';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
 import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
@@ -23,6 +22,7 @@ import { CancellationToken } from 'vs/base/common/cancellation';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IFileReadLimits } from 'vs/platform/files/common/files';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { INotebookLoggingService } from 'vs/workbench/contrib/notebook/common/notebookLoggingService';
 
 class NotebookModelReferenceCollection extends ReferenceCollection<Promise<IResolvedNotebookEditorModel>> {
 
@@ -42,9 +42,9 @@ class NotebookModelReferenceCollection extends ReferenceCollection<Promise<IReso
 	constructor(
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 		@INotebookService private readonly _notebookService: INotebookService,
-		@ILogService private readonly _logService: ILogService,
 		@IConfigurationService private readonly _configurationService: IConfigurationService,
-		@ITelemetryService private readonly _telemetryService: ITelemetryService
+		@ITelemetryService private readonly _telemetryService: ITelemetryService,
+		@INotebookLoggingService private readonly _notebookLoggingService: INotebookLoggingService,
 	) {
 		super();
 	}
@@ -70,7 +70,7 @@ class NotebookModelReferenceCollection extends ReferenceCollection<Promise<IReso
 		const workingCopyTypeId = NotebookWorkingCopyTypeIdentifier.create(viewType);
 		let workingCopyManager = this._workingCopyManagers.get(workingCopyTypeId);
 		if (!workingCopyManager) {
-			const factory = new NotebookFileWorkingCopyModelFactory(viewType, this._notebookService, this._configurationService, this._telemetryService, this._logService);
+			const factory = new NotebookFileWorkingCopyModelFactory(viewType, this._notebookService, this._configurationService, this._telemetryService, this._notebookLoggingService);
 			workingCopyManager = <IFileWorkingCopyManager<NotebookFileWorkingCopyModel, NotebookFileWorkingCopyModel>><any>this._instantiationService.createInstance(
 				FileWorkingCopyManager,
 				workingCopyTypeId,
@@ -138,7 +138,7 @@ class NotebookModelReferenceCollection extends ReferenceCollection<Promise<IReso
 				this._modelListener.delete(model);
 				model.dispose();
 			} catch (err) {
-				this._logService.error('FAILED to destory notebook', err);
+				this._notebookLoggingService.error('NotebookModelCollection', 'FAILED to destory notebook - ' + err);
 			} finally {
 				this.modelsToDispose.delete(key); // Untrack as being disposed
 			}
@@ -177,46 +177,36 @@ export class NotebookModelResolverServiceImpl implements INotebookEditorModelRes
 		return this._data.isDirty(resource);
 	}
 
-	async resolve(resource: URI, viewType?: string, options?: NotebookEditorModelCreationOptions): Promise<IReference<IResolvedNotebookEditorModel>>;
-	async resolve(resource: IUntitledNotebookResource, viewType: string, options: NotebookEditorModelCreationOptions): Promise<IReference<IResolvedNotebookEditorModel>>;
-	async resolve(arg0: URI | IUntitledNotebookResource, viewType?: string, options?: NotebookEditorModelCreationOptions): Promise<IReference<IResolvedNotebookEditorModel>> {
-		let resource: URI;
-		let hasAssociatedFilePath = false;
-		if (URI.isUri(arg0)) {
-			resource = arg0;
-		} else {
-			if (!arg0.untitledResource) {
-				const info = this._notebookService.getContributedNotebookType(assertIsDefined(viewType));
-				if (!info) {
-					throw new Error('UNKNOWN view type: ' + viewType);
-				}
+	private createUntitledUri(notebookType: string) {
+		const info = this._notebookService.getContributedNotebookType(assertIsDefined(notebookType));
+		if (!info) {
+			throw new Error('UNKNOWN notebook type: ' + notebookType);
+		}
 
-				const suffix = NotebookProviderInfo.possibleFileEnding(info.selectors) ?? '';
-				for (let counter = 1; ; counter++) {
-					const candidate = URI.from({ scheme: Schemas.untitled, path: `Untitled-${counter}${suffix}`, query: viewType });
-					if (!this._notebookService.getNotebookTextModel(candidate)) {
-						resource = candidate;
-						break;
-					}
-				}
-			} else if (arg0.untitledResource.scheme === Schemas.untitled) {
-				resource = arg0.untitledResource;
-			} else {
-				resource = arg0.untitledResource.with({ scheme: Schemas.untitled });
-				hasAssociatedFilePath = true;
+		const suffix = NotebookProviderInfo.possibleFileEnding(info.selectors) ?? '';
+		for (let counter = 1; ; counter++) {
+			const candidate = URI.from({ scheme: Schemas.untitled, path: `Untitled-${counter}${suffix}`, query: notebookType });
+			if (!this._notebookService.getNotebookTextModel(candidate)) {
+				return candidate;
 			}
 		}
+	}
+
+	private async validateResourceViewType(uri: URI | undefined, viewType: string | undefined) {
+		if (!uri && !viewType) {
+			throw new Error('Must provide at least one of resource or viewType');
+		}
 
-		if (resource.scheme === CellUri.scheme) {
-			throw new Error(`CANNOT open a cell-uri as notebook. Tried with ${resource.toString()}`);
+		if (uri?.scheme === CellUri.scheme) {
+			throw new Error(`CANNOT open a cell-uri as notebook. Tried with ${uri.toString()}`);
 		}
 
-		resource = this._uriIdentService.asCanonicalUri(resource);
+		const resource = this._uriIdentService.asCanonicalUri(uri ?? this.createUntitledUri(viewType!));
 
-		const existingViewType = this._notebookService.getNotebookTextModel(resource)?.viewType;
+		const existingNotebook = this._notebookService.getNotebookTextModel(resource);
 		if (!viewType) {
-			if (existingViewType) {
-				viewType = existingViewType;
+			if (existingNotebook) {
+				viewType = existingNotebook.viewType;
 			} else {
 				await this._extensionService.whenInstalledExtensionsRegistered();
 				const providers = this._notebookService.getContributedNotebookTypes(resource);
@@ -230,9 +220,9 @@ export class NotebookModelResolverServiceImpl implements INotebookEditorModelRes
 			throw new Error(`Missing viewType for '${resource}'`);
 		}
 
-		if (existingViewType && existingViewType !== viewType) {
+		if (existingNotebook && existingNotebook.viewType !== viewType) {
 
-			await this._onWillFailWithConflict.fireAsync({ resource, viewType }, CancellationToken.None);
+			await this._onWillFailWithConflict.fireAsync({ resource: resource, viewType }, CancellationToken.None);
 
 			// check again, listener should have done cleanup
 			const existingViewType2 = this._notebookService.getNotebookTextModel(resource)?.viewType;
@@ -240,8 +230,34 @@ export class NotebookModelResolverServiceImpl implements INotebookEditorModelRes
 				throw new Error(`A notebook with view type '${existingViewType2}' already exists for '${resource}', CANNOT create another notebook with view type ${viewType}`);
 			}
 		}
+		return { resource, viewType };
+	}
+
+	public async createUntitledNotebookTextModel(viewType: string) {
+		const resource = this._uriIdentService.asCanonicalUri(this.createUntitledUri(viewType));
+
+		return (await this._notebookService.createNotebookTextModel(viewType, resource));
+	}
+
+	async resolve(resource: URI, viewType?: string, options?: NotebookEditorModelCreationOptions): Promise<IReference<IResolvedNotebookEditorModel>>;
+	async resolve(resource: IUntitledNotebookResource, viewType: string, options: NotebookEditorModelCreationOptions): Promise<IReference<IResolvedNotebookEditorModel>>;
+	async resolve(arg0: URI | IUntitledNotebookResource, viewType?: string, options?: NotebookEditorModelCreationOptions): Promise<IReference<IResolvedNotebookEditorModel>> {
+		let resource: URI | undefined;
+		let hasAssociatedFilePath;
+		if (URI.isUri(arg0)) {
+			resource = arg0;
+		} else if (arg0.untitledResource) {
+			if (arg0.untitledResource.scheme === Schemas.untitled) {
+				resource = arg0.untitledResource;
+			} else {
+				resource = arg0.untitledResource.with({ scheme: Schemas.untitled });
+				hasAssociatedFilePath = true;
+			}
+		}
+
+		const validated = await this.validateResourceViewType(resource, viewType);
 
-		const reference = this._data.acquire(resource.toString(), viewType, hasAssociatedFilePath, options?.limits, options?.scratchpad);
+		const reference = this._data.acquire(validated.resource.toString(), validated.viewType, hasAssociatedFilePath, options?.limits, options?.scratchpad);
 		try {
 			const model = await reference.object;
 			return {
diff --git a/src/vs/workbench/contrib/notebook/common/notebookLoggingService.ts b/src/vs/workbench/contrib/notebook/common/notebookLoggingService.ts
index 95d716f71b3..66440b42b09 100644
--- a/src/vs/workbench/contrib/notebook/common/notebookLoggingService.ts
+++ b/src/vs/workbench/contrib/notebook/common/notebookLoggingService.ts
@@ -10,5 +10,7 @@ export const INotebookLoggingService = createDecorator<INotebookLoggingService>(
 export interface INotebookLoggingService {
 	readonly _serviceBrand: undefined;
 	info(category: string, output: string): void;
+	warn(category: string, output: string): void;
+	error(category: string, output: string): void;
 	debug(category: string, output: string): void;
 }
diff --git a/src/vs/workbench/contrib/notebook/common/notebookService.ts b/src/vs/workbench/contrib/notebook/common/notebookService.ts
index d6a1125ebb0..d72b261c3c6 100644
--- a/src/vs/workbench/contrib/notebook/common/notebookService.ts
+++ b/src/vs/workbench/contrib/notebook/common/notebookService.ts
@@ -12,7 +12,7 @@ import { NotebookTextModel } from 'vs/workbench/contrib/notebook/common/model/no
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { NotebookCellTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookCellTextModel';
 import { IDisposable } from 'vs/base/common/lifecycle';
-import { VSBuffer } from 'vs/base/common/buffer';
+import { VSBuffer, VSBufferReadableStream } from 'vs/base/common/buffer';
 import { ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
 import { IFileStatWithMetadata, IWriteFileOptions } from 'vs/platform/files/common/files';
 import { ITextQuery } from 'vs/workbench/services/search/common/search';
@@ -87,7 +87,7 @@ export interface INotebookService {
 	updateMimePreferredRenderer(viewType: string, mimeType: string, rendererId: string, otherMimetypes: readonly string[]): void;
 	saveMimeDisplayOrder(target: ConfigurationTarget): void;
 
-	createNotebookTextModel(viewType: string, uri: URI, data: NotebookData, transientOptions: TransientOptions): NotebookTextModel;
+	createNotebookTextModel(viewType: string, uri: URI, stream?: VSBufferReadableStream): Promise<NotebookTextModel>;
 	getNotebookTextModel(uri: URI): NotebookTextModel | undefined;
 	getNotebookTextModels(): Iterable<NotebookTextModel>;
 	listNotebookDocuments(): readonly NotebookTextModel[];
diff --git a/src/vs/workbench/contrib/notebook/common/services/notebookSimpleWorker.esm.ts b/src/vs/workbench/contrib/notebook/common/services/notebookSimpleWorker.esm.ts
new file mode 100644
index 00000000000..d288a2ebd9d
--- /dev/null
+++ b/src/vs/workbench/contrib/notebook/common/services/notebookSimpleWorker.esm.ts
@@ -0,0 +1,9 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { bootstrapSimpleWorker } from 'vs/base/common/worker/simpleWorkerBootstrap';
+import { create } from './notebookSimpleWorker';
+
+bootstrapSimpleWorker(create);
diff --git a/src/vs/workbench/contrib/notebook/common/services/notebookSimpleWorker.ts b/src/vs/workbench/contrib/notebook/common/services/notebookSimpleWorker.ts
index b0b8c5153ab..aea29952839 100644
--- a/src/vs/workbench/contrib/notebook/common/services/notebookSimpleWorker.ts
+++ b/src/vs/workbench/contrib/notebook/common/services/notebookSimpleWorker.ts
@@ -6,12 +6,11 @@ import { ISequence, LcsDiff } from 'vs/base/common/diff/diff';
 import { doHash, hash, numberHash } from 'vs/base/common/hash';
 import { IDisposable } from 'vs/base/common/lifecycle';
 import { URI } from 'vs/base/common/uri';
-import { IRequestHandler } from 'vs/base/common/worker/simpleWorker';
+import { IRequestHandler, IWorkerServer } from 'vs/base/common/worker/simpleWorker';
 import * as model from 'vs/editor/common/model';
 import { PieceTreeTextBufferBuilder } from 'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBufferBuilder';
 import { CellKind, ICellDto2, IMainCellDto, INotebookDiffResult, IOutputDto, NotebookCellInternalMetadata, NotebookCellMetadata, NotebookCellsChangedEventDto, NotebookCellsChangeType, NotebookCellTextModelSplice, NotebookData, NotebookDocumentMetadata } from 'vs/workbench/contrib/notebook/common/notebookCommon';
 import { Range } from 'vs/editor/common/core/range';
-import { INotebookWorkerHost } from 'vs/workbench/contrib/notebook/common/services/notebookWorkerHost';
 import { VSBuffer } from 'vs/base/common/buffer';
 import { SearchParams } from 'vs/editor/common/model/textModelSearch';
 
@@ -191,7 +190,7 @@ export class NotebookEditorSimpleWorker implements IRequestHandler, IDisposable
 	dispose(): void {
 	}
 
-	public acceptNewModel(uri: string, data: NotebookData): void {
+	public $acceptNewModel(uri: string, data: NotebookData): void {
 		this._models[uri] = new MirrorNotebookDocument(URI.parse(uri), data.cells.map(dto => new MirrorCell(
 			(dto as unknown as IMainCellDto).handle,
 			dto.source,
@@ -202,19 +201,19 @@ export class NotebookEditorSimpleWorker implements IRequestHandler, IDisposable
 		)), data.metadata);
 	}
 
-	public acceptModelChanged(strURL: string, event: NotebookCellsChangedEventDto) {
+	public $acceptModelChanged(strURL: string, event: NotebookCellsChangedEventDto) {
 		const model = this._models[strURL];
 		model?.acceptModelChanged(event);
 	}
 
-	public acceptRemovedModel(strURL: string): void {
+	public $acceptRemovedModel(strURL: string): void {
 		if (!this._models[strURL]) {
 			return;
 		}
 		delete this._models[strURL];
 	}
 
-	computeDiff(originalUrl: string, modifiedUrl: string): INotebookDiffResult {
+	$computeDiff(originalUrl: string, modifiedUrl: string): INotebookDiffResult {
 		const original = this._getModel(originalUrl);
 		const modified = this._getModel(modifiedUrl);
 
@@ -276,7 +275,7 @@ export class NotebookEditorSimpleWorker implements IRequestHandler, IDisposable
 		};
 	}
 
-	canPromptRecommendation(modelUrl: string): boolean {
+	$canPromptRecommendation(modelUrl: string): boolean {
 		const model = this._getModel(modelUrl);
 		const cells = model.cells;
 
@@ -315,9 +314,9 @@ export class NotebookEditorSimpleWorker implements IRequestHandler, IDisposable
 }
 
 /**
- * Called on the worker side
- * @internal
+ * Defines the worker entry point. Must be exported and named `create`.
+ * @skipMangle
  */
-export function create(host: INotebookWorkerHost): IRequestHandler {
+export function create(workerServer: IWorkerServer): IRequestHandler {
 	return new NotebookEditorSimpleWorker();
 }
diff --git a/src/vs/workbench/contrib/notebook/test/browser/NotebookEditorWidgetService.test.ts b/src/vs/workbench/contrib/notebook/test/browser/NotebookEditorWidgetService.test.ts
new file mode 100644
index 00000000000..3fecf4cab2f
--- /dev/null
+++ b/src/vs/workbench/contrib/notebook/test/browser/NotebookEditorWidgetService.test.ts
@@ -0,0 +1,161 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+
+import assert from 'assert';
+import { Emitter, Event } from 'vs/base/common/event';
+import { DisposableStore } from 'vs/base/common/lifecycle';
+import { URI } from 'vs/base/common/uri';
+import { mock } from 'vs/base/test/common/mock';
+import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
+import { GroupIdentifier, IEditorCloseEvent, IEditorWillMoveEvent } from 'vs/workbench/common/editor';
+import { NotebookEditorWidget } from 'vs/workbench/contrib/notebook/browser/notebookEditorWidget';
+import { NotebookEditorWidgetService } from 'vs/workbench/contrib/notebook/browser/services/notebookEditorServiceImpl';
+import { NotebookEditorInput } from 'vs/workbench/contrib/notebook/common/notebookEditorInput';
+import { setupInstantiationService } from 'vs/workbench/contrib/notebook/test/browser/testNotebookEditor';
+import { IEditorGroup, IEditorGroupsService, IEditorPart } from 'vs/workbench/services/editor/common/editorGroupsService';
+import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+
+class TestNotebookEditorWidgetService extends NotebookEditorWidgetService {
+	constructor(
+		@IEditorGroupsService editorGroupService: IEditorGroupsService,
+		@IEditorService editorService: IEditorService,
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@IInstantiationService instantiationService: IInstantiationService
+	) {
+		super(editorGroupService, editorService, contextKeyService, instantiationService);
+	}
+
+	protected override createWidget(): NotebookEditorWidget {
+		return new class extends mock<NotebookEditorWidget>() {
+			override onWillHide = () => { };
+			override getDomNode = () => { return { remove: () => { } } as any; };
+			override dispose = () => { };
+		};
+	}
+}
+
+function createNotebookInput(path: string, editorType: string) {
+	return new class extends mock<NotebookEditorInput>() {
+		override resource = URI.parse(path);
+		override get typeId() { return editorType; }
+	};
+}
+
+suite('NotebookEditorWidgetService', () => {
+	let disposables: DisposableStore;
+	let instantiationService: TestInstantiationService;
+	let editorGroup1: IEditorGroup;
+	let editorGroup2: IEditorGroup;
+
+	let ondidRemoveGroup: Emitter<IEditorGroup>;
+	let onDidCloseEditor: Emitter<IEditorCloseEvent>;
+	let onWillMoveEditor: Emitter<IEditorWillMoveEvent>;
+	teardown(() => disposables.dispose());
+
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	setup(() => {
+		disposables = new DisposableStore();
+
+		ondidRemoveGroup = new Emitter<IEditorGroup>();
+		onDidCloseEditor = new Emitter<IEditorCloseEvent>();
+		onWillMoveEditor = new Emitter<IEditorWillMoveEvent>();
+
+		editorGroup1 = new class extends mock<IEditorGroup>() {
+			override id = 1;
+			override onDidCloseEditor = onDidCloseEditor.event;
+			override onWillMoveEditor = onWillMoveEditor.event;
+		};
+		editorGroup2 = new class extends mock<IEditorGroup>() {
+			override id = 2;
+			override onDidCloseEditor = Event.None;
+			override onWillMoveEditor = Event.None;
+		};
+
+		instantiationService = setupInstantiationService(disposables);
+		instantiationService.stub(IEditorGroupsService, new class extends mock<IEditorGroupsService>() {
+			override onDidRemoveGroup = ondidRemoveGroup.event;
+			override onDidAddGroup = Event.None;
+			override whenReady = Promise.resolve();
+			override groups = [editorGroup1, editorGroup2];
+			override getPart(group: IEditorGroup | GroupIdentifier): IEditorPart;
+			override getPart(container: unknown): IEditorPart;
+			override getPart(container: unknown): import("vs/workbench/services/editor/common/editorGroupsService").IEditorPart {
+				return { windowId: 0 } as any;
+			}
+		});
+		instantiationService.stub(IEditorService, new class extends mock<IEditorService>() {
+			override onDidEditorsChange = Event.None;
+		});
+	});
+
+	test('Retrieve widget within group', async function () {
+		const notebookEditorInput = createNotebookInput('/test.np', 'type1');
+		const notebookEditorService = disposables.add(instantiationService.createInstance(TestNotebookEditorWidgetService));
+		const widget = notebookEditorService.retrieveWidget(instantiationService, 1, notebookEditorInput);
+		const value = widget.value;
+		const widget2 = notebookEditorService.retrieveWidget(instantiationService, 1, notebookEditorInput);
+
+		assert.notStrictEqual(widget2.value, undefined, 'should create a widget');
+		assert.strictEqual(value, widget2.value, 'should return the same widget');
+		assert.strictEqual(widget.value, undefined, 'initial borrow should no longer have widget');
+	});
+
+	test('Retrieve independent widgets', async function () {
+		const inputType1 = createNotebookInput('/test.np', 'type1');
+		const inputType2 = createNotebookInput('/test.np', 'type2');
+		const notebookEditorService = disposables.add(instantiationService.createInstance(TestNotebookEditorWidgetService));
+		const widget = notebookEditorService.retrieveWidget(instantiationService, 1, inputType1);
+		const widgetDiffGroup = notebookEditorService.retrieveWidget(instantiationService, 2, inputType1);
+		const widgetDiffType = notebookEditorService.retrieveWidget(instantiationService, 1, inputType2);
+
+		assert.notStrictEqual(widget.value, undefined, 'should create a widget');
+		assert.notStrictEqual(widgetDiffGroup.value, undefined, 'should create a widget');
+		assert.notStrictEqual(widgetDiffType.value, undefined, 'should create a widget');
+		assert.notStrictEqual(widget.value, widgetDiffGroup.value, 'should return a different widget');
+		assert.notStrictEqual(widget.value, widgetDiffType.value, 'should return a different widget');
+	});
+
+	test('Only relevant widgets get disposed', async function () {
+		const inputType1 = createNotebookInput('/test.np', 'type1');
+		const inputType2 = createNotebookInput('/test.np', 'type2');
+		const notebookEditorService = disposables.add(instantiationService.createInstance(TestNotebookEditorWidgetService));
+		const widget = notebookEditorService.retrieveWidget(instantiationService, 1, inputType1);
+		const widgetDiffType = notebookEditorService.retrieveWidget(instantiationService, 1, inputType2);
+		const widgetDiffGroup = notebookEditorService.retrieveWidget(instantiationService, 2, inputType1);
+
+		ondidRemoveGroup.fire(editorGroup1);
+
+		assert.strictEqual(widget.value, undefined, 'widgets in group should get disposed');
+		assert.strictEqual(widgetDiffType.value, undefined, 'widgets in group should get disposed');
+		assert.notStrictEqual(widgetDiffGroup.value, undefined, 'other group should not be disposed');
+	});
+
+	test('Widget should move between groups when editor is moved', async function () {
+		const inputType1 = createNotebookInput('/test.np', NotebookEditorInput.ID);
+		const notebookEditorService = disposables.add(instantiationService.createInstance(TestNotebookEditorWidgetService));
+		const initialValue = notebookEditorService.retrieveWidget(instantiationService, 1, inputType1).value;
+
+		await new Promise(resolve => setTimeout(resolve, 0));
+
+		onWillMoveEditor.fire({
+			editor: inputType1,
+			groupId: 1,
+			target: 2,
+		});
+
+		const widgetDiffGroup = notebookEditorService.retrieveWidget(instantiationService, 2, inputType1);
+		const widgetFirstGroup = notebookEditorService.retrieveWidget(instantiationService, 1, inputType1);
+
+		assert.notStrictEqual(initialValue, undefined, 'valid widget');
+		assert.strictEqual(widgetDiffGroup.value, initialValue, 'widget should be reused in new group');
+		assert.notStrictEqual(widgetFirstGroup.value, initialValue, 'should create a new widget in the first group');
+	});
+
+});
diff --git a/src/vs/workbench/contrib/notebook/test/browser/cellOperations.test.ts b/src/vs/workbench/contrib/notebook/test/browser/cellOperations.test.ts
index 65ea08b7f27..55dec43a8ee 100644
--- a/src/vs/workbench/contrib/notebook/test/browser/cellOperations.test.ts
+++ b/src/vs/workbench/contrib/notebook/test/browser/cellOperations.test.ts
@@ -48,7 +48,7 @@ suite('CellOperations', () => {
 			],
 			async (editor, viewModel) => {
 				viewModel.updateSelectionsState({ kind: SelectionStateType.Index, focus: { start: 1, end: 2 }, selections: [{ start: 0, end: 2 }] });
-				await moveCellRange({ notebookEditor: editor, cell: viewModel.cellAt(1)! }, 'down');
+				await moveCellRange({ notebookEditor: editor }, 'down');
 				assert.strictEqual(viewModel.cellAt(0)?.getText(), '# header b');
 				assert.strictEqual(viewModel.cellAt(1)?.getText(), '# header a');
 				assert.strictEqual(viewModel.cellAt(2)?.getText(), 'var b = 1;');
@@ -74,7 +74,7 @@ suite('CellOperations', () => {
 				editor.setHiddenAreas(viewModel.getHiddenRanges());
 
 				viewModel.updateSelectionsState({ kind: SelectionStateType.Index, focus: { start: 0, end: 1 }, selections: [{ start: 0, end: 1 }] });
-				await moveCellRange({ notebookEditor: editor, cell: viewModel.cellAt(1)! }, 'down');
+				await moveCellRange({ notebookEditor: editor }, 'down');
 				assert.strictEqual(viewModel.cellAt(0)?.getText(), '# header b');
 				assert.strictEqual(viewModel.cellAt(1)?.getText(), '# header a');
 				assert.strictEqual(viewModel.cellAt(2)?.getText(), 'var b = 1;');
diff --git a/src/vs/workbench/contrib/notebook/test/browser/contrib/notebookCellDiagnostics.test.ts b/src/vs/workbench/contrib/notebook/test/browser/contrib/notebookCellDiagnostics.test.ts
index 86636c92a0b..8cb0202486a 100644
--- a/src/vs/workbench/contrib/notebook/test/browser/contrib/notebookCellDiagnostics.test.ts
+++ b/src/vs/workbench/contrib/notebook/test/browser/contrib/notebookCellDiagnostics.test.ts
@@ -73,7 +73,8 @@ suite('notebookCellDiagnostics', () => {
 			isDefault: true,
 			locations: [ChatAgentLocation.Editor],
 			metadata: {},
-			slashCommands: []
+			slashCommands: [],
+			disambiguation: [],
 		};
 		const chatAgentService = new class extends mock<IChatAgentService>() {
 			override getAgents(): IChatAgentData[] {
diff --git a/src/vs/workbench/contrib/notebook/test/browser/notebookDiff.test.ts b/src/vs/workbench/contrib/notebook/test/browser/notebookDiff.test.ts
index f2bb130dba9..e7e2ec10a72 100644
--- a/src/vs/workbench/contrib/notebook/test/browser/notebookDiff.test.ts
+++ b/src/vs/workbench/contrib/notebook/test/browser/notebookDiff.test.ts
@@ -5,13 +5,20 @@
 
 import assert from 'assert';
 import { VSBuffer } from 'vs/base/common/buffer';
-import { ISequence, LcsDiff } from 'vs/base/common/diff/diff';
+import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
+import { IDiffResult, ISequence, LcsDiff } from 'vs/base/common/diff/diff';
+import { DisposableStore } from 'vs/base/common/lifecycle';
 import { Mimes } from 'vs/base/common/mime';
+import { mock } from 'vs/base/test/common/mock';
 import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
 import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
+import { IDiffElementViewModelBase, SideBySideDiffElementViewModel } from 'vs/workbench/contrib/notebook/browser/diff/diffElementViewModel';
 import { NotebookDiffEditorEventDispatcher } from 'vs/workbench/contrib/notebook/browser/diff/eventDispatcher';
-import { NotebookTextDiffEditor } from 'vs/workbench/contrib/notebook/browser/diff/notebookDiffEditor';
+import { INotebookDiffViewModel, INotebookDiffViewModelUpdateEvent } from 'vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser';
+import { NotebookDiffViewModel, prettyChanges } from 'vs/workbench/contrib/notebook/browser/diff/notebookDiffViewModel';
 import { CellKind, INotebookTextModel } from 'vs/workbench/contrib/notebook/common/notebookCommon';
+import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
+import { INotebookEditorWorkerService } from 'vs/workbench/contrib/notebook/common/services/notebookWorkerService';
 import { withTestNotebookDiffModel } from 'vs/workbench/contrib/notebook/test/browser/testNotebookEditor';
 
 class CellSequence implements ISequence {
@@ -29,18 +36,44 @@ class CellSequence implements ISequence {
 	}
 }
 
-suite('NotebookCommon', () => {
+suite('NotebookDiff', () => {
+	let disposables: DisposableStore;
+	let token: CancellationToken;
+	let eventDispatcher: NotebookDiffEditorEventDispatcher;
+	let diffViewModel: NotebookDiffViewModel;
+	let diffResult: IDiffResult;
+	let notebookEditorWorkerService: INotebookEditorWorkerService;
+	teardown(() => disposables.dispose());
+
 	const configurationService = new TestConfigurationService();
 	ensureNoDisposablesAreLeakedInTestSuite();
 
+	setup(() => {
+		disposables = new DisposableStore();
+		const cancellation = disposables.add(new CancellationTokenSource());
+		eventDispatcher = disposables.add(new NotebookDiffEditorEventDispatcher());
+		token = cancellation.token;
+		notebookEditorWorkerService = new class extends mock<INotebookEditorWorkerService>() {
+			override computeDiff() { return Promise.resolve({ cellsDiff: diffResult }); }
+		};
+	});
+
+	async function verifyChangeEventIsNotFired(diffViewModel: INotebookDiffViewModel) {
+		let eventArgs: INotebookDiffViewModelUpdateEvent | undefined = undefined;
+		disposables.add(diffViewModel.onDidChangeItems(e => eventArgs = e));
+		await diffViewModel.computeDiff(token);
+
+		assert.strictEqual(eventArgs, undefined);
+	}
+
 	test('diff different source', async () => {
 		await withTestNotebookDiffModel([
 			['x', 'javascript', CellKind.Code, [{ outputId: 'someOtherId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([3])) }] }], { metadata: { collapsed: false }, executionOrder: 3 }],
 		], [
 			['y', 'javascript', CellKind.Code, [{ outputId: 'someOtherId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([3])) }] }], { metadata: { collapsed: false }, executionOrder: 3 }],
-		], (model, disposables, accessor) => {
+		], async (model, disposables, accessor) => {
 			const diff = new LcsDiff(new CellSequence(model.original.notebook), new CellSequence(model.modified.notebook));
-			const diffResult = diff.ComputeDiff(false);
+			diffResult = diff.ComputeDiff(false);
 			assert.strictEqual(diffResult.changes.length, 1);
 			assert.deepStrictEqual(diffResult.changes.map(change => ({
 				originalStart: change.originalStart,
@@ -54,19 +87,39 @@ suite('NotebookCommon', () => {
 				modifiedLength: 1
 			}]);
 
-			const eventDispatcher = disposables.add(new NotebookDiffEditorEventDispatcher());
-			const diffViewModels = NotebookTextDiffEditor.computeDiff(accessor, configurationService, model, eventDispatcher, {
-				cellsDiff: diffResult
-			}, undefined);
-			assert.strictEqual(diffViewModels.viewModels.length, 1);
-			assert.strictEqual(diffViewModels.viewModels[0].type, 'modified');
-			diffViewModels.viewModels.forEach(vm => {
-				vm.original?.dispose();
-				vm.modified?.dispose();
-				vm.dispose();
-			});
-			model.original.notebook.dispose();
-			model.modified.notebook.dispose();
+			diffViewModel = disposables.add(new NotebookDiffViewModel(model, notebookEditorWorkerService, accessor, configurationService, eventDispatcher, accessor.get<INotebookService>(INotebookService), undefined));
+			await diffViewModel.computeDiff(token);
+
+			assert.strictEqual(diffViewModel.items.length, 1);
+			assert.strictEqual(diffViewModel.items[0].type, 'modified');
+		});
+	});
+
+	test('No changes when re-computing diff with the same source', async () => {
+		await withTestNotebookDiffModel([
+			['x', 'javascript', CellKind.Code, [{ outputId: 'someOtherId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([3])) }] }], { metadata: { collapsed: false }, executionOrder: 3 }],
+		], [
+			['y', 'javascript', CellKind.Code, [{ outputId: 'someOtherId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([3])) }] }], { metadata: { collapsed: false }, executionOrder: 3 }],
+		], async (model, disposables, accessor) => {
+			const diff = new LcsDiff(new CellSequence(model.original.notebook), new CellSequence(model.modified.notebook));
+			diffResult = diff.ComputeDiff(false);
+			assert.strictEqual(diffResult.changes.length, 1);
+			assert.deepStrictEqual(diffResult.changes.map(change => ({
+				originalStart: change.originalStart,
+				originalLength: change.originalLength,
+				modifiedStart: change.modifiedStart,
+				modifiedLength: change.modifiedLength
+			})), [{
+				originalStart: 0,
+				originalLength: 1,
+				modifiedStart: 0,
+				modifiedLength: 1
+			}]);
+
+			diffViewModel = disposables.add(new NotebookDiffViewModel(model, notebookEditorWorkerService, accessor, configurationService, eventDispatcher, accessor.get<INotebookService>(INotebookService), undefined));
+			await diffViewModel.computeDiff(token);
+
+			await verifyChangeEventIsNotFired(diffViewModel);
 		});
 	});
 
@@ -77,9 +130,9 @@ suite('NotebookCommon', () => {
 		], [
 			['x', 'javascript', CellKind.Code, [{ outputId: 'someOtherId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([3])) }] }], { metadata: { collapsed: false }, executionOrder: 3 }],
 			['', 'javascript', CellKind.Code, [], {}]
-		], (model, disposables, accessor) => {
+		], async (model, disposables, accessor) => {
 			const diff = new LcsDiff(new CellSequence(model.original.notebook), new CellSequence(model.modified.notebook));
-			const diffResult = diff.ComputeDiff(false);
+			diffResult = diff.ComputeDiff(false);
 			assert.strictEqual(diffResult.changes.length, 1);
 			assert.deepStrictEqual(diffResult.changes.map(change => ({
 				originalStart: change.originalStart,
@@ -93,21 +146,31 @@ suite('NotebookCommon', () => {
 				modifiedLength: 1
 			}]);
 
-			const eventDispatcher = disposables.add(new NotebookDiffEditorEventDispatcher());
-			const diffViewModels = NotebookTextDiffEditor.computeDiff(accessor, configurationService, model, eventDispatcher, {
-				cellsDiff: diffResult
-			}, undefined);
-			assert.strictEqual(diffViewModels.viewModels.length, 2);
-			assert.strictEqual(diffViewModels.viewModels[0].type, 'modified');
-			assert.strictEqual(diffViewModels.viewModels[1].type, 'unchanged');
-
-			diffViewModels.viewModels.forEach(vm => {
-				vm.original?.dispose();
-				vm.modified?.dispose();
-				vm.dispose();
-			});
-			model.original.notebook.dispose();
-			model.modified.notebook.dispose();
+			diffViewModel = disposables.add(new NotebookDiffViewModel(model, notebookEditorWorkerService, accessor, configurationService, eventDispatcher, accessor.get<INotebookService>(INotebookService), undefined));
+			let eventArgs: INotebookDiffViewModelUpdateEvent | undefined = undefined;
+			disposables.add(diffViewModel.onDidChangeItems(e => eventArgs = e));
+			await diffViewModel.computeDiff(token);
+
+			assert.strictEqual(diffViewModel.items.length, 2);
+			assert.strictEqual(diffViewModel.items[0].type, 'modified');
+			assert.strictEqual(diffViewModel.items[1].type, 'placeholder');
+
+
+			diffViewModel.items[1].showHiddenCells();
+
+			assert.strictEqual(diffViewModel.items.length, 2);
+			assert.strictEqual(diffViewModel.items[0].type, 'modified');
+			assert.strictEqual(diffViewModel.items[1].type, 'unchanged');
+			assert.deepStrictEqual(eventArgs, { start: 1, deleteCount: 1, elements: [diffViewModel.items[1]] });
+
+			(diffViewModel.items[1] as unknown as SideBySideDiffElementViewModel).hideUnchangedCells();
+
+			assert.strictEqual(diffViewModel.items.length, 2);
+			assert.strictEqual(diffViewModel.items[0].type, 'modified');
+			assert.strictEqual((diffViewModel.items[1] as IDiffElementViewModelBase).type, 'placeholder');
+			assert.deepStrictEqual(eventArgs, { start: 1, deleteCount: 1, elements: [diffViewModel.items[1]] });
+
+			await verifyChangeEventIsNotFired(diffViewModel);
 		});
 	});
 
@@ -116,9 +179,9 @@ suite('NotebookCommon', () => {
 			['123456789', 'javascript', CellKind.Code, [], {}]
 		], [
 			['987654321', 'javascript', CellKind.Code, [], {}],
-		], (model, disposables, accessor) => {
+		], async (model, disposables, accessor) => {
 			const diff = new LcsDiff(new CellSequence(model.original.notebook), new CellSequence(model.modified.notebook));
-			const diffResult = diff.ComputeDiff(false);
+			diffResult = diff.ComputeDiff(false);
 			assert.strictEqual(diffResult.changes.length, 1);
 			assert.deepStrictEqual(diffResult.changes.map(change => ({
 				originalStart: change.originalStart,
@@ -132,20 +195,13 @@ suite('NotebookCommon', () => {
 				modifiedLength: 1
 			}]);
 
-			const eventDispatcher = disposables.add(new NotebookDiffEditorEventDispatcher());
-			const diffViewModels = NotebookTextDiffEditor.computeDiff(accessor, configurationService, model, eventDispatcher, {
-				cellsDiff: diffResult
-			}, undefined);
-			assert.strictEqual(diffViewModels.viewModels.length, 1);
-			assert.strictEqual(diffViewModels.viewModels[0].type, 'modified');
-
-			diffViewModels.viewModels.forEach(vm => {
-				vm.original?.dispose();
-				vm.modified?.dispose();
-				vm.dispose();
-			});
-			model.original.notebook.dispose();
-			model.modified.notebook.dispose();
+			diffViewModel = disposables.add(new NotebookDiffViewModel(model, notebookEditorWorkerService, accessor, configurationService, eventDispatcher, accessor.get<INotebookService>(INotebookService), undefined));
+			await diffViewModel.computeDiff(token);
+
+			assert.strictEqual(diffViewModel.items.length, 1);
+			assert.strictEqual(diffViewModel.items[0].type, 'modified');
+
+			await verifyChangeEventIsNotFired(diffViewModel);
 		});
 	});
 
@@ -162,9 +218,9 @@ suite('NotebookCommon', () => {
 				'    \'This version is debugged.\'\n',
 				'    return a * b'
 			].join(''), 'javascript', CellKind.Code, [], {}],
-		], (model, disposables, accessor) => {
+		], async (model, disposables, accessor) => {
 			const diff = new LcsDiff(new CellSequence(model.original.notebook), new CellSequence(model.modified.notebook));
-			const diffResult = diff.ComputeDiff(false);
+			diffResult = diff.ComputeDiff(false);
 			assert.strictEqual(diffResult.changes.length, 1);
 			assert.deepStrictEqual(diffResult.changes.map(change => ({
 				originalStart: change.originalStart,
@@ -178,20 +234,13 @@ suite('NotebookCommon', () => {
 				modifiedLength: 1
 			}]);
 
-			const eventDispatcher = disposables.add(new NotebookDiffEditorEventDispatcher());
-			const diffViewModels = NotebookTextDiffEditor.computeDiff(accessor, configurationService, model, eventDispatcher, {
-				cellsDiff: diffResult
-			}, undefined);
-			assert.strictEqual(diffViewModels.viewModels.length, 1);
-			assert.strictEqual(diffViewModels.viewModels[0].type, 'modified');
-
-			diffViewModels.viewModels.forEach(vm => {
-				vm.original?.dispose();
-				vm.modified?.dispose();
-				vm.dispose();
-			});
-			model.original.notebook.dispose();
-			model.modified.notebook.dispose();
+			diffViewModel = disposables.add(new NotebookDiffViewModel(model, notebookEditorWorkerService, accessor, configurationService, eventDispatcher, accessor.get<INotebookService>(INotebookService), undefined));
+			await diffViewModel.computeDiff(token);
+
+			assert.strictEqual(diffViewModel.items.length, 1);
+			assert.strictEqual(diffViewModel.items[0].type, 'modified');
+
+			await verifyChangeEventIsNotFired(diffViewModel);
 		});
 	});
 
@@ -204,25 +253,24 @@ suite('NotebookCommon', () => {
 			[['def foo(x, y):\n', '    return x * y\n', 'foo(1, 2)'].join(''), 'javascript', CellKind.Code, [{ outputId: 'someId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([6])) }] }], { metadata: { collapsed: false }, executionOrder: 5 }],
 			[['def foe(x, y):\n', '    return x + y\n', 'foe(3, 2)'].join(''), 'javascript', CellKind.Code, [{ outputId: 'someId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([2])) }] }], { metadata: { collapsed: false }, executionOrder: 6 }],
 			['', 'javascript', CellKind.Code, [], {}]
-		], (model, disposables, accessor) => {
+		], async (model, disposables, accessor) => {
 			const diff = new LcsDiff(new CellSequence(model.original.notebook), new CellSequence(model.modified.notebook));
-			const diffResult = diff.ComputeDiff(false);
-			const eventDispatcher = disposables.add(new NotebookDiffEditorEventDispatcher());
-			const diffViewModels = NotebookTextDiffEditor.computeDiff(accessor, configurationService, model, eventDispatcher, {
-				cellsDiff: diffResult
-			}, undefined);
-			assert.strictEqual(diffViewModels.viewModels.length, 3);
-			assert.strictEqual(diffViewModels.viewModels[0].type, 'modified');
-			assert.strictEqual(diffViewModels.viewModels[1].type, 'modified');
-			assert.strictEqual(diffViewModels.viewModels[2].type, 'unchanged');
-
-			diffViewModels.viewModels.forEach(vm => {
-				vm.original?.dispose();
-				vm.modified?.dispose();
-				vm.dispose();
-			});
-			model.original.notebook.dispose();
-			model.modified.notebook.dispose();
+			diffResult = diff.ComputeDiff(false);
+
+			diffViewModel = disposables.add(new NotebookDiffViewModel(model, notebookEditorWorkerService, accessor, configurationService, eventDispatcher, accessor.get<INotebookService>(INotebookService), undefined));
+			let eventArgs: INotebookDiffViewModelUpdateEvent | undefined = undefined;
+			disposables.add(diffViewModel.onDidChangeItems(e => eventArgs = e));
+			await diffViewModel.computeDiff(token);
+
+			assert.strictEqual(diffViewModel.items.length, 3);
+			assert.strictEqual(diffViewModel.items[0].type, 'modified');
+			assert.strictEqual(diffViewModel.items[1].type, 'modified');
+			assert.strictEqual(diffViewModel.items[2].type, 'placeholder');
+			diffViewModel.items[2].showHiddenCells();
+			assert.strictEqual(diffViewModel.items[2].type, 'unchanged');
+			assert.deepStrictEqual(eventArgs, { start: 2, deleteCount: 1, elements: [diffViewModel.items[2]] });
+
+			await verifyChangeEventIsNotFired(diffViewModel);
 		});
 	});
 
@@ -235,25 +283,26 @@ suite('NotebookCommon', () => {
 			['This is a test notebook with markdown cells only', 'markdown', CellKind.Markup, [], {}],
 			['Lorem ipsum dolor sit amet', 'markdown', CellKind.Markup, [], {}],
 			['In the news', 'markdown', CellKind.Markup, [], {}],
-		], (model, disposables, accessor) => {
+		], async (model, disposables, accessor) => {
 			const diff = new LcsDiff(new CellSequence(model.original.notebook), new CellSequence(model.modified.notebook));
-			const diffResult = diff.ComputeDiff(false);
-			const eventDispatcher = disposables.add(new NotebookDiffEditorEventDispatcher());
-			const diffViewModels = NotebookTextDiffEditor.computeDiff(accessor, configurationService, model, eventDispatcher, {
-				cellsDiff: diffResult
-			}, undefined);
-			assert.strictEqual(diffViewModels.viewModels.length, 3);
-			assert.strictEqual(diffViewModels.viewModels[0].type, 'modified');
-			assert.strictEqual(diffViewModels.viewModels[1].type, 'unchanged');
-			assert.strictEqual(diffViewModels.viewModels[2].type, 'modified');
-
-			diffViewModels.viewModels.forEach(vm => {
-				vm.original?.dispose();
-				vm.modified?.dispose();
-				vm.dispose();
-			});
-			model.original.notebook.dispose();
-			model.modified.notebook.dispose();
+			diffResult = diff.ComputeDiff(false);
+
+			diffViewModel = disposables.add(new NotebookDiffViewModel(model, notebookEditorWorkerService, accessor, configurationService, eventDispatcher, accessor.get<INotebookService>(INotebookService), undefined));
+			let eventArgs: INotebookDiffViewModelUpdateEvent | undefined = undefined;
+			disposables.add(diffViewModel.onDidChangeItems(e => eventArgs = e));
+			await diffViewModel.computeDiff(token);
+
+			assert.strictEqual(diffViewModel.items.length, 3);
+			assert.strictEqual(diffViewModel.items[0].type, 'modified');
+			assert.strictEqual(diffViewModel.items[1].type, 'placeholder');
+			assert.strictEqual(diffViewModel.items[2].type, 'modified');
+
+			diffViewModel.items[1].showHiddenCells();
+			assert.strictEqual(diffViewModel.items[1].type, 'unchanged');
+			assert.deepStrictEqual(eventArgs, { start: 1, deleteCount: 1, elements: [diffViewModel.items[1]] });
+
+			await verifyChangeEventIsNotFired(diffViewModel);
+
 		});
 	});
 
@@ -265,32 +314,32 @@ suite('NotebookCommon', () => {
 			['var h = 8;', 'javascript', CellKind.Code, [], {}],
 			['var a = 1;', 'javascript', CellKind.Code, [], {}],
 			['var b = 2;', 'javascript', CellKind.Code, [], {}]
-		], (model, disposables, accessor) => {
-			const eventDispatcher = disposables.add(new NotebookDiffEditorEventDispatcher());
-			const diffResult = NotebookTextDiffEditor.computeDiff(accessor, configurationService, model, eventDispatcher, {
-				cellsDiff: {
-					changes: [{
-						originalStart: 0,
-						originalLength: 0,
-						modifiedStart: 0,
-						modifiedLength: 1
-					}],
-					quitEarly: false
-				}
-			}, undefined);
-
-			assert.strictEqual(diffResult.firstChangeIndex, 0);
-			assert.strictEqual(diffResult.viewModels[0].type, 'insert');
-			assert.strictEqual(diffResult.viewModels[1].type, 'unchanged');
-			assert.strictEqual(diffResult.viewModels[2].type, 'unchanged');
-
-			diffResult.viewModels.forEach(vm => {
-				vm.original?.dispose();
-				vm.modified?.dispose();
-				vm.dispose();
-			});
-			model.original.notebook.dispose();
-			model.modified.notebook.dispose();
+		], async (model, disposables, accessor) => {
+			diffResult = {
+				changes: [{
+					originalStart: 0,
+					originalLength: 0,
+					modifiedStart: 0,
+					modifiedLength: 1
+				}],
+				quitEarly: false
+			};
+
+			diffViewModel = disposables.add(new NotebookDiffViewModel(model, notebookEditorWorkerService, accessor, configurationService, eventDispatcher, accessor.get<INotebookService>(INotebookService), undefined));
+			let eventArgs: INotebookDiffViewModelUpdateEvent | undefined = undefined;
+			disposables.add(diffViewModel.onDidChangeItems(e => eventArgs = e));
+			const result = await diffViewModel.computeDiff(token);
+
+			assert.strictEqual(result?.firstChangeIndex, 0);
+			assert.strictEqual(diffViewModel.items[0].type, 'insert');
+			assert.strictEqual(diffViewModel.items[1].type, 'placeholder');
+
+			diffViewModel.items[1].showHiddenCells();
+			assert.strictEqual(diffViewModel.items[1].type, 'unchanged');
+			assert.strictEqual(diffViewModel.items[2].type, 'unchanged');
+			assert.deepStrictEqual(eventArgs, { start: 1, deleteCount: 1, elements: [diffViewModel.items[1], diffViewModel.items[2]] });
+
+			await verifyChangeEventIsNotFired(diffViewModel);
 		});
 	});
 
@@ -315,40 +364,50 @@ suite('NotebookCommon', () => {
 			['var g = 7;', 'javascript', CellKind.Code, [], {}],
 		], async (model, disposables, accessor) => {
 			const eventDispatcher = disposables.add(new NotebookDiffEditorEventDispatcher());
-			const diffResult = NotebookTextDiffEditor.computeDiff(accessor, configurationService, model, eventDispatcher, {
-				cellsDiff: {
-					changes: [{
-						originalStart: 0,
-						originalLength: 0,
-						modifiedStart: 0,
-						modifiedLength: 1
-					}, {
-						originalStart: 0,
-						originalLength: 6,
-						modifiedStart: 1,
-						modifiedLength: 6
-					}],
-					quitEarly: false
-				}
-			}, undefined);
-
-			assert.strictEqual(diffResult.firstChangeIndex, 0);
-			assert.strictEqual(diffResult.viewModels[0].type, 'insert');
-			assert.strictEqual(diffResult.viewModels[1].type, 'unchanged');
-			assert.strictEqual(diffResult.viewModels[2].type, 'unchanged');
-			assert.strictEqual(diffResult.viewModels[3].type, 'unchanged');
-			assert.strictEqual(diffResult.viewModels[4].type, 'unchanged');
-			assert.strictEqual(diffResult.viewModels[5].type, 'unchanged');
-			assert.strictEqual(diffResult.viewModels[6].type, 'unchanged');
-			assert.strictEqual(diffResult.viewModels[7].type, 'unchanged');
-
-			diffResult.viewModels.forEach(vm => {
-				vm.original?.dispose();
-				vm.modified?.dispose();
-				vm.dispose();
-			});
-			model.original.notebook.dispose();
-			model.modified.notebook.dispose();
+			diffResult = {
+				changes: [{
+					originalStart: 0,
+					originalLength: 0,
+					modifiedStart: 0,
+					modifiedLength: 1
+				}, {
+					originalStart: 0,
+					originalLength: 6,
+					modifiedStart: 1,
+					modifiedLength: 6
+				}],
+				quitEarly: false
+			};
+
+			diffViewModel = disposables.add(new NotebookDiffViewModel(model, notebookEditorWorkerService, accessor, configurationService, eventDispatcher, accessor.get<INotebookService>(INotebookService), undefined));
+			let eventArgs: INotebookDiffViewModelUpdateEvent | undefined = undefined;
+			disposables.add(diffViewModel.onDidChangeItems(e => eventArgs = e));
+			const result = await diffViewModel.computeDiff(token);
+
+			assert.strictEqual(result?.firstChangeIndex, 0);
+			assert.strictEqual(diffViewModel.items.length, 2);
+			assert.strictEqual(diffViewModel.items[0].type, 'insert');
+			assert.strictEqual(diffViewModel.items[1].type, 'placeholder');
+
+			diffViewModel.items[1].showHiddenCells();
+			assert.strictEqual(diffViewModel.items[1].type, 'unchanged');
+			assert.strictEqual(diffViewModel.items[2].type, 'unchanged');
+			assert.strictEqual(diffViewModel.items[3].type, 'unchanged');
+			assert.strictEqual(diffViewModel.items[4].type, 'unchanged');
+			assert.strictEqual(diffViewModel.items[5].type, 'unchanged');
+			assert.strictEqual(diffViewModel.items[6].type, 'unchanged');
+			assert.strictEqual(diffViewModel.items[7].type, 'unchanged');
+			assert.deepStrictEqual(eventArgs, { start: 1, deleteCount: 1, elements: diffViewModel.items.slice(1) });
+
+
+			(diffViewModel.items[1] as unknown as SideBySideDiffElementViewModel).hideUnchangedCells();
+
+			assert.strictEqual(diffViewModel.items.length, 2);
+			assert.strictEqual(diffViewModel.items[0].type, 'insert');
+			assert.strictEqual((diffViewModel.items[1] as IDiffElementViewModelBase).type, 'placeholder');
+			assert.deepStrictEqual(eventArgs, { start: 1, deleteCount: 7, elements: [diffViewModel.items[1]] });
+
+			await verifyChangeEventIsNotFired(diffViewModel);
 		});
 	});
 
@@ -372,36 +431,51 @@ suite('NotebookCommon', () => {
 			['var f = 6;', 'javascript', CellKind.Code, [], {}],
 			['var g = 7;', 'javascript', CellKind.Code, [], {}],
 		], async (model, disposables, accessor) => {
-			const eventDispatcher = disposables.add(new NotebookDiffEditorEventDispatcher());
-			const diffResult = NotebookTextDiffEditor.computeDiff(accessor, configurationService, model, eventDispatcher, {
-				cellsDiff: {
-					changes: [{
-						originalStart: 4,
-						originalLength: 0,
-						modifiedStart: 4,
-						modifiedLength: 1
-					}],
-					quitEarly: false
-				}
-			}, undefined);
-
-			// assert.strictEqual(diffResult.firstChangeIndex, 4);
-			assert.strictEqual(diffResult.viewModels[0].type, 'unchanged');
-			assert.strictEqual(diffResult.viewModels[1].type, 'unchanged');
-			assert.strictEqual(diffResult.viewModels[2].type, 'unchanged');
-			assert.strictEqual(diffResult.viewModels[3].type, 'unchanged');
-			assert.strictEqual(diffResult.viewModels[4].type, 'insert');
-			assert.strictEqual(diffResult.viewModels[5].type, 'unchanged');
-			assert.strictEqual(diffResult.viewModels[6].type, 'unchanged');
-			assert.strictEqual(diffResult.viewModels[7].type, 'unchanged');
-
-			diffResult.viewModels.forEach(vm => {
-				vm.original?.dispose();
-				vm.modified?.dispose();
-				vm.dispose();
-			});
-			model.original.notebook.dispose();
-			model.modified.notebook.dispose();
+			diffResult = {
+				changes: [{
+					originalStart: 4,
+					originalLength: 0,
+					modifiedStart: 4,
+					modifiedLength: 1
+				}],
+				quitEarly: false
+			};
+
+			diffViewModel = disposables.add(new NotebookDiffViewModel(model, notebookEditorWorkerService, accessor, configurationService, eventDispatcher, accessor.get<INotebookService>(INotebookService), undefined));
+			let eventArgs: INotebookDiffViewModelUpdateEvent | undefined = undefined;
+			disposables.add(diffViewModel.onDidChangeItems(e => eventArgs = e));
+			await diffViewModel.computeDiff(token);
+
+			assert.strictEqual(diffViewModel.items[0].type, 'placeholder');
+			assert.strictEqual(diffViewModel.items[1].type, 'insert');
+			assert.strictEqual(diffViewModel.items[2].type, 'placeholder');
+
+			diffViewModel.items[0].showHiddenCells();
+			assert.strictEqual(diffViewModel.items[0].type, 'unchanged');
+			assert.strictEqual(diffViewModel.items[1].type, 'unchanged');
+			assert.strictEqual(diffViewModel.items[2].type, 'unchanged');
+			assert.strictEqual(diffViewModel.items[3].type, 'unchanged');
+			assert.strictEqual(diffViewModel.items[4].type, 'insert');
+			assert.strictEqual(diffViewModel.items[5].type, 'placeholder');
+			assert.deepStrictEqual(eventArgs, { start: 0, deleteCount: 1, elements: diffViewModel.items.slice(0, 4) });
+
+			diffViewModel.items[5].showHiddenCells();
+			assert.strictEqual((diffViewModel.items[0] as IDiffElementViewModelBase).type, 'unchanged');
+			assert.strictEqual(diffViewModel.items[1].type, 'unchanged');
+			assert.strictEqual((diffViewModel.items[2] as IDiffElementViewModelBase).type, 'unchanged');
+			assert.strictEqual(diffViewModel.items[3].type, 'unchanged');
+			assert.strictEqual(diffViewModel.items[4].type, 'insert');
+			assert.strictEqual(diffViewModel.items[5].type, 'unchanged');
+			assert.deepStrictEqual(eventArgs, { start: 5, deleteCount: 1, elements: diffViewModel.items.slice(5) });
+
+			(diffViewModel.items[0] as SideBySideDiffElementViewModel).hideUnchangedCells();
+			assert.strictEqual((diffViewModel.items[0] as IDiffElementViewModelBase).type, 'placeholder');
+			assert.strictEqual(diffViewModel.items[1].type, 'insert');
+			assert.strictEqual((diffViewModel.items[2] as IDiffElementViewModelBase).type, 'unchanged');
+			assert.deepStrictEqual(eventArgs, { start: 0, deleteCount: 4, elements: diffViewModel.items.slice(0, 1) });
+
+			await verifyChangeEventIsNotFired(diffViewModel);
+
 		});
 	});
 
@@ -458,7 +532,7 @@ suite('NotebookCommon', () => {
 		], async (model) => {
 			const diff = new LcsDiff(new CellSequence(model.original.notebook), new CellSequence(model.modified.notebook));
 			const diffResult = diff.ComputeDiff(false);
-			NotebookTextDiffEditor.prettyChanges(model, diffResult);
+			prettyChanges(model, diffResult);
 
 			assert.deepStrictEqual(diffResult.changes.map(change => ({
 				originalStart: change.originalStart,
@@ -510,7 +584,7 @@ suite('NotebookCommon', () => {
 		], async (model) => {
 			const diff = new LcsDiff(new CellSequence(model.original.notebook), new CellSequence(model.modified.notebook));
 			const diffResult = diff.ComputeDiff(false);
-			NotebookTextDiffEditor.prettyChanges(model, diffResult);
+			prettyChanges(model, diffResult);
 
 			assert.deepStrictEqual(diffResult.changes.map(change => ({
 				originalStart: change.originalStart,
@@ -533,25 +607,20 @@ suite('NotebookCommon', () => {
 		], [
 			['x', 'javascript', CellKind.Code, [{ outputId: 'someOtherId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([3])) }] }], { metadata: { collapsed: false }, executionOrder: 3 }],
 			['y', 'javascript', CellKind.Code, [{ outputId: 'someOtherId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([5])) }] }], { metadata: { collapsed: false }, executionOrder: 3 }],
-		], (model, disposables, accessor) => {
+		], async (model, disposables, accessor) => {
 			const diff = new LcsDiff(new CellSequence(model.original.notebook), new CellSequence(model.modified.notebook));
-			const diffResult = diff.ComputeDiff(false);
-			const eventDispatcher = disposables.add(new NotebookDiffEditorEventDispatcher());
-			const diffViewModels = NotebookTextDiffEditor.computeDiff(accessor, configurationService, model, eventDispatcher, {
-				cellsDiff: diffResult
-			}, undefined);
-			assert.strictEqual(diffViewModels.viewModels.length, 2);
-			assert.strictEqual(diffViewModels.viewModels[0].type, 'unchanged');
-			assert.strictEqual(diffViewModels.viewModels[0].checkIfOutputsModified(), false);
-			assert.strictEqual(diffViewModels.viewModels[1].type, 'modified');
-
-			diffViewModels.viewModels.forEach(vm => {
-				vm.original?.dispose();
-				vm.modified?.dispose();
-				vm.dispose();
-			});
-			model.original.notebook.dispose();
-			model.modified.notebook.dispose();
+			diffResult = diff.ComputeDiff(false);
+
+			diffViewModel = disposables.add(new NotebookDiffViewModel(model, notebookEditorWorkerService, accessor, configurationService, eventDispatcher, accessor.get<INotebookService>(INotebookService), undefined));
+			await diffViewModel.computeDiff(token);
+
+			assert.strictEqual(diffViewModel.items.length, 2);
+			assert.strictEqual(diffViewModel.items[0].type, 'placeholder');
+			diffViewModel.items[0].showHiddenCells();
+			assert.strictEqual((diffViewModel.items[0] as unknown as SideBySideDiffElementViewModel).checkIfOutputsModified(), false);
+			assert.strictEqual(diffViewModel.items[1].type, 'modified');
+
+			await verifyChangeEventIsNotFired(diffViewModel);
 		});
 	});
 
@@ -562,23 +631,20 @@ suite('NotebookCommon', () => {
 		], [
 			['x', 'javascript', CellKind.Code, [{ outputId: 'someOtherId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([3])) }] }], { metadata: { collapsed: false }, executionOrder: 3 }],
 			['y', 'javascript', CellKind.Code, [{ outputId: 'someOtherId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([5])) }] }], { metadata: { collapsed: false }, executionOrder: 3 }],
-		], (model, disposables, accessor) => {
+		], async (model, disposables, accessor) => {
 			const diff = new LcsDiff(new CellSequence(model.original.notebook), new CellSequence(model.modified.notebook));
-			const diffResult = diff.ComputeDiff(false);
-			const eventDispatcher = disposables.add(new NotebookDiffEditorEventDispatcher());
-			const diffViewModels = NotebookTextDiffEditor.computeDiff(accessor, configurationService, model, eventDispatcher, {
-				cellsDiff: diffResult
-			}, undefined);
-			assert.strictEqual(diffViewModels.viewModels.length, 2);
-			assert.strictEqual(diffViewModels.viewModels[0].original!.textModel.equal(diffViewModels.viewModels[0].modified!.textModel), true);
-			assert.strictEqual(diffViewModels.viewModels[1].original!.textModel.equal(diffViewModels.viewModels[1].modified!.textModel), false);
-			diffViewModels.viewModels.forEach(vm => {
-				vm.original?.dispose();
-				vm.modified?.dispose();
-				vm.dispose();
-			});
-			model.original.notebook.dispose();
-			model.modified.notebook.dispose();
+			diffResult = diff.ComputeDiff(false);
+
+			diffViewModel = disposables.add(new NotebookDiffViewModel(model, notebookEditorWorkerService, accessor, configurationService, eventDispatcher, accessor.get<INotebookService>(INotebookService), undefined));
+			await diffViewModel.computeDiff(token);
+
+			assert.strictEqual(diffViewModel.items.length, 2);
+			assert.strictEqual(diffViewModel.items[0].type, 'placeholder');
+			diffViewModel.items[0].showHiddenCells();
+			assert.strictEqual((diffViewModel.items[0] as unknown as SideBySideDiffElementViewModel).original!.textModel.equal((diffViewModel.items[0] as any).modified!.textModel), true);
+			assert.strictEqual((diffViewModel.items[1] as any).original!.textModel.equal((diffViewModel.items[1] as any).modified!.textModel), false);
+
+			await verifyChangeEventIsNotFired(diffViewModel);
 		});
 	});
 });
diff --git a/src/vs/workbench/contrib/notebook/test/browser/notebookExecutionService.test.ts b/src/vs/workbench/contrib/notebook/test/browser/notebookExecutionService.test.ts
index 09731c28e5d..9a3bfdc378f 100644
--- a/src/vs/workbench/contrib/notebook/test/browser/notebookExecutionService.test.ts
+++ b/src/vs/workbench/contrib/notebook/test/browser/notebookExecutionService.test.ts
@@ -26,6 +26,7 @@ import { NotebookTextModel } from 'vs/workbench/contrib/notebook/common/model/no
 import { CellKind, IOutputDto, NotebookCellMetadata } from 'vs/workbench/contrib/notebook/common/notebookCommon';
 import { INotebookExecutionStateService } from 'vs/workbench/contrib/notebook/common/notebookExecutionStateService';
 import { INotebookKernel, INotebookKernelHistoryService, INotebookKernelService, INotebookTextModelLike, VariablesResult } from 'vs/workbench/contrib/notebook/common/notebookKernelService';
+import { INotebookLoggingService } from 'vs/workbench/contrib/notebook/common/notebookLoggingService';
 import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
 import { setupInstantiationService, withTestNotebook as _withTestNotebook } from 'vs/workbench/contrib/notebook/test/browser/testNotebookEditor';
 
@@ -54,6 +55,12 @@ suite('NotebookExecutionService', () => {
 			override getNotebookTextModels() { return []; }
 		});
 
+		instantiationService.stub(INotebookLoggingService, new class extends mock<INotebookLoggingService>() {
+			override debug(category: string, output: string): void {
+				//
+			}
+		});
+
 		instantiationService.stub(IMenuService, new class extends mock<IMenuService>() {
 			override createMenu() {
 				return new class extends mock<IMenu>() {
diff --git a/src/vs/workbench/contrib/notebook/test/browser/notebookExecutionStateService.test.ts b/src/vs/workbench/contrib/notebook/test/browser/notebookExecutionStateService.test.ts
index 8dd95c484df..0a1fe3ada79 100644
--- a/src/vs/workbench/contrib/notebook/test/browser/notebookExecutionStateService.test.ts
+++ b/src/vs/workbench/contrib/notebook/test/browser/notebookExecutionStateService.test.ts
@@ -25,6 +25,7 @@ import { CellEditType, CellKind, CellUri, IOutputDto, NotebookCellMetadata, Note
 import { CellExecutionUpdateType, INotebookExecutionService } from 'vs/workbench/contrib/notebook/common/notebookExecutionService';
 import { INotebookExecutionStateService, NotebookExecutionType } from 'vs/workbench/contrib/notebook/common/notebookExecutionStateService';
 import { INotebookKernel, INotebookKernelService, VariablesResult } from 'vs/workbench/contrib/notebook/common/notebookKernelService';
+import { INotebookLoggingService } from 'vs/workbench/contrib/notebook/common/notebookLoggingService';
 import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
 import { setupInstantiationService, withTestNotebook as _withTestNotebook } from 'vs/workbench/contrib/notebook/test/browser/testNotebookEditor';
 
@@ -65,6 +66,11 @@ suite('NotebookExecutionStateService', () => {
 				};
 			}
 		});
+		instantiationService.stub(INotebookLoggingService, new class extends mock<INotebookLoggingService>() {
+			override debug(category: string, output: string): void {
+				//
+			}
+		});
 
 		kernelService = disposables.add(instantiationService.createInstance(NotebookKernelService));
 		instantiationService.set(INotebookKernelService, kernelService);
diff --git a/src/vs/workbench/contrib/notebook/test/browser/notebookTextModel.test.ts b/src/vs/workbench/contrib/notebook/test/browser/notebookTextModel.test.ts
index abcb1828caa..8300d36d232 100644
--- a/src/vs/workbench/contrib/notebook/test/browser/notebookTextModel.test.ts
+++ b/src/vs/workbench/contrib/notebook/test/browser/notebookTextModel.test.ts
@@ -1403,4 +1403,112 @@ suite('NotebookTextModel', () => {
 		});
 
 	});
+
+	test('findNextMatch', async function () {
+		await withTestNotebook(
+			[
+				['var a = 1;', 'javascript', CellKind.Code, [], {}],
+				['var b = 2;', 'javascript', CellKind.Code, [], {}],
+				['var c = 3;', 'javascript', CellKind.Code, [], {}],
+				['var d = 4;', 'javascript', CellKind.Code, [], {}]
+			],
+			(editor, viewModel) => {
+				const notebookModel = viewModel.notebookDocument;
+
+				// Test case 1: Find 'var' starting from the first cell
+				let findMatch = notebookModel.findNextMatch('var', { cellIndex: 0, position: { lineNumber: 1, column: 1 } }, false, false, null);
+				assert.ok(findMatch);
+				assert.strictEqual(findMatch!.match.range.startLineNumber, 1);
+				assert.strictEqual(findMatch!.match.range.startColumn, 1);
+
+				// Test case 2: Find 'b' starting from the second cell
+				findMatch = notebookModel.findNextMatch('b', { cellIndex: 1, position: { lineNumber: 1, column: 1 } }, false, false, null);
+				assert.ok(findMatch);
+				assert.strictEqual(findMatch!.match.range.startLineNumber, 1);
+				assert.strictEqual(findMatch!.match.range.startColumn, 5);
+
+				// Test case 3: Find 'c' starting from the third cell
+				findMatch = notebookModel.findNextMatch('c', { cellIndex: 2, position: { lineNumber: 1, column: 1 } }, false, false, null);
+				assert.ok(findMatch);
+				assert.strictEqual(findMatch!.match.range.startLineNumber, 1);
+				assert.strictEqual(findMatch!.match.range.startColumn, 5);
+
+				// Test case 4: Find 'd' starting from the fourth cell
+				findMatch = notebookModel.findNextMatch('d', { cellIndex: 3, position: { lineNumber: 1, column: 1 } }, false, false, null);
+				assert.ok(findMatch);
+				assert.strictEqual(findMatch!.match.range.startLineNumber, 1);
+				assert.strictEqual(findMatch!.match.range.startColumn, 5);
+
+				// Test case 5: No match found
+				findMatch = notebookModel.findNextMatch('e', { cellIndex: 0, position: { lineNumber: 1, column: 1 } }, false, false, null);
+				assert.strictEqual(findMatch, null);
+			}
+		);
+	});
+
+	test('findNextMatch 2', async function () {
+		await withTestNotebook(
+			[
+				['var a = 1; var a = 2;', 'javascript', CellKind.Code, [], {}],
+				['var b = 2;', 'javascript', CellKind.Code, [], {}],
+				['var c = 3;', 'javascript', CellKind.Code, [], {}],
+				['var d = 4;', 'javascript', CellKind.Code, [], {}]
+			],
+			(editor, viewModel) => {
+				const notebookModel = viewModel.notebookDocument;
+
+				// Test case 1: Find 'var' starting from the first cell
+				let findMatch = notebookModel.findNextMatch('var', { cellIndex: 0, position: { lineNumber: 1, column: 1 } }, false, false, null);
+				assert.ok(findMatch);
+				assert.strictEqual(findMatch!.match.range.startLineNumber, 1);
+				assert.strictEqual(findMatch!.match.range.startColumn, 1);
+
+				// Test case 2: Find 'b' starting from the second cell
+				findMatch = notebookModel.findNextMatch('b', { cellIndex: 1, position: { lineNumber: 1, column: 1 } }, false, false, null);
+				assert.ok(findMatch);
+				assert.strictEqual(findMatch!.match.range.startLineNumber, 1);
+				assert.strictEqual(findMatch!.match.range.startColumn, 5);
+
+				// Test case 3: Find 'c' starting from the third cell
+				findMatch = notebookModel.findNextMatch('c', { cellIndex: 2, position: { lineNumber: 1, column: 1 } }, false, false, null);
+				assert.ok(findMatch);
+				assert.strictEqual(findMatch!.match.range.startLineNumber, 1);
+				assert.strictEqual(findMatch!.match.range.startColumn, 5);
+
+				// Test case 4: Find 'd' starting from the fourth cell
+				findMatch = notebookModel.findNextMatch('d', { cellIndex: 3, position: { lineNumber: 1, column: 1 } }, false, false, null);
+				assert.ok(findMatch);
+				assert.strictEqual(findMatch!.match.range.startLineNumber, 1);
+				assert.strictEqual(findMatch!.match.range.startColumn, 5);
+
+				// Test case 5: No match found
+				findMatch = notebookModel.findNextMatch('e', { cellIndex: 0, position: { lineNumber: 1, column: 1 } }, false, false, null);
+				assert.strictEqual(findMatch, null);
+
+				// Test case 6: Same keywords in the same cell
+				findMatch = notebookModel.findNextMatch('var', { cellIndex: 0, position: { lineNumber: 1, column: 1 } }, false, false, null);
+				assert.ok(findMatch);
+				assert.strictEqual(findMatch!.match.range.startLineNumber, 1);
+				assert.strictEqual(findMatch!.match.range.startColumn, 1);
+
+				findMatch = notebookModel.findNextMatch('var', { cellIndex: 0, position: { lineNumber: 1, column: 5 } }, false, false, null);
+				assert.ok(findMatch);
+				assert.strictEqual(findMatch!.match.range.startLineNumber, 1);
+				assert.strictEqual(findMatch!.match.range.startColumn, 12);
+
+				// Test case 7: Search from the middle of a cell with keyword before and after
+				findMatch = notebookModel.findNextMatch('a', { cellIndex: 0, position: { lineNumber: 1, column: 10 } }, false, false, null);
+				assert.ok(findMatch);
+				assert.strictEqual(findMatch!.match.range.startLineNumber, 1);
+				assert.strictEqual(findMatch!.match.range.startColumn, 13);
+
+				// Test case 8: Search from a cell and next match is in another cell below
+				findMatch = notebookModel.findNextMatch('var', { cellIndex: 0, position: { lineNumber: 1, column: 20 } }, false, false, null);
+				assert.ok(findMatch);
+				assert.strictEqual(findMatch!.match.range.startLineNumber, 1);
+				assert.strictEqual(findMatch!.match.range.startColumn, 1);
+				// assert.strictEqual(match!.cellIndex, 1);
+			}
+		);
+	});
 });
diff --git a/src/vs/workbench/contrib/notebook/test/browser/testNotebookEditor.ts b/src/vs/workbench/contrib/notebook/test/browser/testNotebookEditor.ts
index 117ce7aaeda..d35dde6208e 100644
--- a/src/vs/workbench/contrib/notebook/test/browser/testNotebookEditor.ts
+++ b/src/vs/workbench/contrib/notebook/test/browser/testNotebookEditor.ts
@@ -217,7 +217,7 @@ export function setupInstantiationService(disposables: Pick<DisposableStore, 'ad
 function _createTestNotebookEditor(instantiationService: TestInstantiationService, disposables: DisposableStore, cells: MockNotebookCell[]): { editor: IActiveNotebookEditorDelegate; viewModel: NotebookViewModel } {
 
 	const viewType = 'notebook';
-	const notebook = disposables.add(instantiationService.createInstance(NotebookTextModel, viewType, URI.parse('test'), cells.map((cell): ICellDto2 => {
+	const notebook = disposables.add(instantiationService.createInstance(NotebookTextModel, viewType, URI.parse('test://test'), cells.map((cell): ICellDto2 => {
 		return {
 			source: cell[0],
 			mime: undefined,
@@ -378,12 +378,18 @@ export async function withTestNotebookDiffModel<R = any>(originalCells: [source:
 		override get notebook() {
 			return originalNotebook.viewModel.notebookDocument;
 		}
+		override get resource() {
+			return originalNotebook.viewModel.notebookDocument.uri;
+		}
 	};
 
 	const modifiedResource = new class extends mock<IResolvedNotebookEditorModel>() {
 		override get notebook() {
 			return modifiedNotebook.viewModel.notebookDocument;
 		}
+		override get resource() {
+			return modifiedNotebook.viewModel.notebookDocument.uri;
+		}
 	};
 
 	const model = new class extends mock<INotebookDiffEditorModel>() {
@@ -399,15 +405,19 @@ export async function withTestNotebookDiffModel<R = any>(originalCells: [source:
 	if (res instanceof Promise) {
 		res.finally(() => {
 			originalNotebook.editor.dispose();
+			originalNotebook.viewModel.notebookDocument.dispose();
 			originalNotebook.viewModel.dispose();
 			modifiedNotebook.editor.dispose();
+			modifiedNotebook.viewModel.notebookDocument.dispose();
 			modifiedNotebook.viewModel.dispose();
 			disposables.dispose();
 		});
 	} else {
 		originalNotebook.editor.dispose();
+		originalNotebook.viewModel.notebookDocument.dispose();
 		originalNotebook.viewModel.dispose();
 		modifiedNotebook.editor.dispose();
+		modifiedNotebook.viewModel.notebookDocument.dispose();
 		modifiedNotebook.viewModel.dispose();
 		disposables.dispose();
 	}
diff --git a/src/vs/workbench/contrib/output/browser/outputLinkProvider.ts b/src/vs/workbench/contrib/output/browser/outputLinkProvider.ts
index 3b82ad1889e..5ac17a4b889 100644
--- a/src/vs/workbench/contrib/output/browser/outputLinkProvider.ts
+++ b/src/vs/workbench/contrib/output/browser/outputLinkProvider.ts
@@ -9,24 +9,24 @@ import { IModelService } from 'vs/editor/common/services/model';
 import { ILink } from 'vs/editor/common/languages';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { OUTPUT_MODE_ID, LOG_MODE_ID } from 'vs/workbench/services/output/common/output';
-import { MonacoWebWorker, createWebWorker } from 'vs/editor/browser/services/webWorker';
-import { ICreateData, OutputLinkComputer } from 'vs/workbench/contrib/output/common/outputLinkComputer';
+import { OutputLinkComputer } from 'vs/workbench/contrib/output/common/outputLinkComputer';
 import { IDisposable, dispose, Disposable } from 'vs/base/common/lifecycle';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
 import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
+import { createWebWorker } from 'vs/base/browser/defaultWorkerFactory';
+import { IWorkerClient } from 'vs/base/common/worker/simpleWorker';
+import { WorkerTextModelSyncClient } from 'vs/editor/common/services/textModelSync/textModelSync.impl';
 
 export class OutputLinkProvider extends Disposable {
 
 	private static readonly DISPOSE_WORKER_TIME = 3 * 60 * 1000; // dispose worker after 3 minutes of inactivity
 
-	private worker?: MonacoWebWorker<OutputLinkComputer>;
+	private worker?: OutputLinkWorkerClient;
 	private disposeWorkerScheduler: RunOnceScheduler;
 	private linkProviderRegistration: IDisposable | undefined;
 
 	constructor(
 		@IWorkspaceContextService private readonly contextService: IWorkspaceContextService,
 		@IModelService private readonly modelService: IModelService,
-		@ILanguageConfigurationService private readonly languageConfigurationService: ILanguageConfigurationService,
 		@ILanguageFeaturesService private readonly languageFeaturesService: ILanguageFeaturesService,
 	) {
 		super();
@@ -65,28 +65,18 @@ export class OutputLinkProvider extends Disposable {
 		this.disposeWorkerScheduler.cancel();
 	}
 
-	private getOrCreateWorker(): MonacoWebWorker<OutputLinkComputer> {
+	private getOrCreateWorker(): OutputLinkWorkerClient {
 		this.disposeWorkerScheduler.schedule();
 
 		if (!this.worker) {
-			const createData: ICreateData = {
-				workspaceFolders: this.contextService.getWorkspace().folders.map(folder => folder.uri.toString())
-			};
-
-			this.worker = createWebWorker<OutputLinkComputer>(this.modelService, this.languageConfigurationService, {
-				moduleId: 'vs/workbench/contrib/output/common/outputLinkComputer',
-				createData,
-				label: 'outputLinkComputer'
-			});
+			this.worker = new OutputLinkWorkerClient(this.contextService, this.modelService);
 		}
 
 		return this.worker;
 	}
 
 	private async provideLinks(modelUri: URI): Promise<ILink[]> {
-		const linkComputer = await this.getOrCreateWorker().withSyncedResources([modelUri]);
-
-		return linkComputer.computeLinks(modelUri.toString());
+		return this.getOrCreateWorker().provideLinks(modelUri);
 	}
 
 	private disposeWorker(): void {
@@ -96,3 +86,32 @@ export class OutputLinkProvider extends Disposable {
 		}
 	}
 }
+
+class OutputLinkWorkerClient extends Disposable {
+	private readonly _workerClient: IWorkerClient<OutputLinkComputer>;
+	private readonly _workerTextModelSyncClient: WorkerTextModelSyncClient;
+	private readonly _initializeBarrier: Promise<void>;
+
+	constructor(
+		@IWorkspaceContextService private readonly contextService: IWorkspaceContextService,
+		@IModelService modelService: IModelService,
+	) {
+		super();
+		this._workerClient = this._register(createWebWorker<OutputLinkComputer>(
+			'vs/workbench/contrib/output/common/outputLinkComputer',
+			'OutputLinkDetectionWorker'
+		));
+		this._workerTextModelSyncClient = WorkerTextModelSyncClient.create(this._workerClient, modelService);
+		this._initializeBarrier = this._ensureWorkspaceFolders();
+	}
+
+	private async _ensureWorkspaceFolders(): Promise<void> {
+		await this._workerClient.proxy.$setWorkspaceFolders(this.contextService.getWorkspace().folders.map(folder => folder.uri.toString()));
+	}
+
+	public async provideLinks(modelUri: URI): Promise<ILink[]> {
+		await this._initializeBarrier;
+		await this._workerTextModelSyncClient.ensureSyncedResources([modelUri]);
+		return this._workerClient.proxy.$computeLinks(modelUri.toString());
+	}
+}
diff --git a/src/vs/workbench/contrib/output/browser/outputServices.ts b/src/vs/workbench/contrib/output/browser/outputServices.ts
index 6521eeec891..4307629daec 100644
--- a/src/vs/workbench/contrib/output/browser/outputServices.ts
+++ b/src/vs/workbench/contrib/output/browser/outputServices.ts
@@ -4,12 +4,13 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Event, Emitter } from 'vs/base/common/event';
+import { Schemas } from 'vs/base/common/network';
 import { URI } from 'vs/base/common/uri';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
 import { Registry } from 'vs/platform/registry/common/platform';
-import { IOutputChannel, IOutputService, OUTPUT_VIEW_ID, OUTPUT_SCHEME, LOG_MIME, OUTPUT_MIME, OutputChannelUpdateMode, IOutputChannelDescriptor, Extensions, IOutputChannelRegistry, ACTIVE_OUTPUT_CHANNEL_CONTEXT, CONTEXT_ACTIVE_FILE_OUTPUT, CONTEXT_ACTIVE_OUTPUT_LEVEL_SETTABLE, CONTEXT_ACTIVE_OUTPUT_LEVEL, CONTEXT_ACTIVE_OUTPUT_LEVEL_IS_DEFAULT } from 'vs/workbench/services/output/common/output';
+import { IOutputChannel, IOutputService, OUTPUT_VIEW_ID, LOG_MIME, OUTPUT_MIME, OutputChannelUpdateMode, IOutputChannelDescriptor, Extensions, IOutputChannelRegistry, ACTIVE_OUTPUT_CHANNEL_CONTEXT, CONTEXT_ACTIVE_FILE_OUTPUT, CONTEXT_ACTIVE_OUTPUT_LEVEL_SETTABLE, CONTEXT_ACTIVE_OUTPUT_LEVEL, CONTEXT_ACTIVE_OUTPUT_LEVEL_IS_DEFAULT } from 'vs/workbench/services/output/common/output';
 import { OutputLinkProvider } from 'vs/workbench/contrib/output/browser/outputLinkProvider';
 import { ITextModelService, ITextModelContentProvider } from 'vs/editor/common/services/resolverService';
 import { ITextModel } from 'vs/editor/common/model';
@@ -42,7 +43,7 @@ class OutputChannel extends Disposable implements IOutputChannel {
 		super();
 		this.id = outputChannelDescriptor.id;
 		this.label = outputChannelDescriptor.label;
-		this.uri = URI.from({ scheme: OUTPUT_SCHEME, path: this.id });
+		this.uri = URI.from({ scheme: Schemas.outputChannel, path: this.id });
 		this.model = this._register(outputChannelModelService.createOutputChannelModel(this.id, this.uri, outputChannelDescriptor.languageId ? languageService.createById(outputChannelDescriptor.languageId) : languageService.createByMimeType(outputChannelDescriptor.log ? LOG_MIME : OUTPUT_MIME), outputChannelDescriptor.file));
 	}
 
@@ -103,7 +104,7 @@ export class OutputService extends Disposable implements IOutputService, ITextMo
 		this.activeOutputChannelLevelIsDefaultContext = CONTEXT_ACTIVE_OUTPUT_LEVEL_IS_DEFAULT.bindTo(contextKeyService);
 
 		// Register as text model content provider for output
-		this._register(textModelResolverService.registerTextModelContentProvider(OUTPUT_SCHEME, this));
+		this._register(textModelResolverService.registerTextModelContentProvider(Schemas.outputChannel, this));
 		this._register(instantiationService.createInstance(OutputLinkProvider));
 
 		// Create output channels for already registered channels
diff --git a/src/vs/workbench/contrib/output/common/outputLinkComputer.esm.ts b/src/vs/workbench/contrib/output/common/outputLinkComputer.esm.ts
new file mode 100644
index 00000000000..2d3fd96b4e8
--- /dev/null
+++ b/src/vs/workbench/contrib/output/common/outputLinkComputer.esm.ts
@@ -0,0 +1,9 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { create } from './outputLinkComputer';
+import { bootstrapSimpleWorker } from 'vs/base/common/worker/simpleWorkerBootstrap';
+
+bootstrapSimpleWorker(create);
diff --git a/src/vs/workbench/contrib/output/common/outputLinkComputer.ts b/src/vs/workbench/contrib/output/common/outputLinkComputer.ts
index 0de2f9f2e15..aad9864e4f1 100644
--- a/src/vs/workbench/contrib/output/common/outputLinkComputer.ts
+++ b/src/vs/workbench/contrib/output/common/outputLinkComputer.ts
@@ -3,7 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IMirrorModel, IWorkerContext } from 'vs/editor/common/services/editorSimpleWorker';
 import { ILink } from 'vs/editor/common/languages';
 import { URI } from 'vs/base/common/uri';
 import * as extpath from 'vs/base/common/extpath';
@@ -12,28 +11,33 @@ import * as strings from 'vs/base/common/strings';
 import { Range } from 'vs/editor/common/core/range';
 import { isWindows } from 'vs/base/common/platform';
 import { Schemas } from 'vs/base/common/network';
-
-export interface ICreateData {
-	workspaceFolders: string[];
-}
+import { IRequestHandler, IWorkerServer } from 'vs/base/common/worker/simpleWorker';
+import { WorkerTextModelSyncServer, ICommonModel } from 'vs/editor/common/services/textModelSync/textModelSync.impl';
 
 export interface IResourceCreator {
 	toResource: (folderRelativePath: string) => URI | null;
 }
 
-export class OutputLinkComputer {
+export class OutputLinkComputer implements IRequestHandler {
+	_requestHandlerBrand: any;
+
+	private readonly workerTextModelSyncServer = new WorkerTextModelSyncServer();
 	private patterns = new Map<URI /* folder uri */, RegExp[]>();
 
-	constructor(private ctx: IWorkerContext, createData: ICreateData) {
-		this.computePatterns(createData);
+	constructor(workerServer: IWorkerServer) {
+		this.workerTextModelSyncServer.bindToServer(workerServer);
 	}
 
-	private computePatterns(createData: ICreateData): void {
+	$setWorkspaceFolders(workspaceFolders: string[]) {
+		this.computePatterns(workspaceFolders);
+	}
+
+	private computePatterns(_workspaceFolders: string[]): void {
 
 		// Produce patterns for each workspace root we are configured with
 		// This means that we will be able to detect links for paths that
 		// contain any of the workspace roots as segments.
-		const workspaceFolders = createData.workspaceFolders
+		const workspaceFolders = _workspaceFolders
 			.sort((resourceStrA, resourceStrB) => resourceStrB.length - resourceStrA.length) // longest paths first (for https://github.com/microsoft/vscode/issues/88121)
 			.map(resourceStr => URI.parse(resourceStr));
 
@@ -43,13 +47,11 @@ export class OutputLinkComputer {
 		}
 	}
 
-	private getModel(uri: string): IMirrorModel | undefined {
-		const models = this.ctx.getMirrorModels();
-
-		return models.find(model => model.uri.toString() === uri);
+	private getModel(uri: string): ICommonModel | undefined {
+		return this.workerTextModelSyncServer.getModel(uri);
 	}
 
-	computeLinks(uri: string): ILink[] {
+	$computeLinks(uri: string): ILink[] {
 		const model = this.getModel(uri);
 		if (!model) {
 			return [];
@@ -179,7 +181,10 @@ export class OutputLinkComputer {
 	}
 }
 
-// Export this function because this will be called by the web worker for computing links
-export function create(ctx: IWorkerContext, createData: ICreateData): OutputLinkComputer {
-	return new OutputLinkComputer(ctx, createData);
+/**
+ * Defines the worker entry point. Must be exported and named `create`.
+ * @skipMangle
+ */
+export function create(workerServer: IWorkerServer): OutputLinkComputer {
+	return new OutputLinkComputer(workerServer);
 }
diff --git a/src/vs/workbench/contrib/performance/browser/perfviewEditor.ts b/src/vs/workbench/contrib/performance/browser/perfviewEditor.ts
index 81653b58f6d..082f44a42c4 100644
--- a/src/vs/workbench/contrib/performance/browser/perfviewEditor.ts
+++ b/src/vs/workbench/contrib/performance/browser/perfviewEditor.ts
@@ -200,13 +200,13 @@ class PerfModelContentProvider implements ITextModelContentProvider {
 		const table: Array<Array<string | number | undefined>> = [];
 		table.push(['start => app.isReady', metrics.timers.ellapsedAppReady, '[main]', `initial startup: ${metrics.initialStartup}`]);
 		table.push(['nls:start => nls:end', metrics.timers.ellapsedNlsGeneration, '[main]', `initial startup: ${metrics.initialStartup}`]);
-		table.push(['require(main.bundle.js)', metrics.timers.ellapsedLoadMainBundle, '[main]', `initial startup: ${metrics.initialStartup}`]);
+		table.push(['import(main.bundle.js)', metrics.timers.ellapsedLoadMainBundle, '[main]', `initial startup: ${metrics.initialStartup}`]);
 		table.push(['start crash reporter', metrics.timers.ellapsedCrashReporter, '[main]', `initial startup: ${metrics.initialStartup}`]);
 		table.push(['serve main IPC handle', metrics.timers.ellapsedMainServer, '[main]', `initial startup: ${metrics.initialStartup}`]);
 		table.push(['create window', metrics.timers.ellapsedWindowCreate, '[main]', `initial startup: ${metrics.initialStartup}, ${metrics.initialStartup ? `state: ${metrics.timers.ellapsedWindowRestoreState}ms, widget: ${metrics.timers.ellapsedBrowserWindowCreate}ms, show: ${metrics.timers.ellapsedWindowMaximize}ms` : ''}`]);
 		table.push(['app.isReady => window.loadUrl()', metrics.timers.ellapsedWindowLoad, '[main]', `initial startup: ${metrics.initialStartup}`]);
-		table.push(['window.loadUrl() => begin to require(workbench.desktop.main.js)', metrics.timers.ellapsedWindowLoadToRequire, '[main->renderer]', StartupKindToString(metrics.windowKind)]);
-		table.push(['require(workbench.desktop.main.js)', metrics.timers.ellapsedRequire, '[renderer]', `cached data: ${(metrics.didUseCachedData ? 'YES' : 'NO')}${stats ? `, node_modules took ${stats.nodeRequireTotal}ms` : ''}`]);
+		table.push(['window.loadUrl() => begin to import(workbench.desktop.main.js)', metrics.timers.ellapsedWindowLoadToRequire, '[main->renderer]', StartupKindToString(metrics.windowKind)]);
+		table.push(['import(workbench.desktop.main.js)', metrics.timers.ellapsedRequire, '[renderer]', `cached data: ${(metrics.didUseCachedData ? 'YES' : 'NO')}${stats ? `, node_modules took ${stats.nodeRequireTotal}ms` : ''}`]);
 		table.push(['wait for window config', metrics.timers.ellapsedWaitForWindowConfig, '[renderer]', undefined]);
 		table.push(['init storage (global & workspace)', metrics.timers.ellapsedStorageInit, '[renderer]', undefined]);
 		table.push(['init workspace service', metrics.timers.ellapsedWorkspaceServiceInit, '[renderer]', undefined]);
@@ -332,7 +332,7 @@ class PerfModelContentProvider implements ITextModelContentProvider {
 		map.set(LoaderEventType.CachedDataFound, []);
 		map.set(LoaderEventType.CachedDataMissed, []);
 		map.set(LoaderEventType.CachedDataRejected, []);
-		if (typeof require.getStats === 'function') {
+		if (!isESM && typeof require.getStats === 'function') {
 			for (const stat of require.getStats()) {
 				if (map.has(stat.type)) {
 					map.get(stat.type)!.push(stat.detail);
diff --git a/src/vs/workbench/contrib/positronConsole/browser/components/consoleInput.tsx b/src/vs/workbench/contrib/positronConsole/browser/components/consoleInput.tsx
index dd3258848f5..aa9236456b7 100644
--- a/src/vs/workbench/contrib/positronConsole/browser/components/consoleInput.tsx
+++ b/src/vs/workbench/contrib/positronConsole/browser/components/consoleInput.tsx
@@ -28,7 +28,6 @@ import { InQuickPickContextKey } from 'vs/workbench/browser/quickaccess';
 import { FormatOnType } from 'vs/editor/contrib/format/browser/formatActions';
 import { EditorExtensionsRegistry } from 'vs/editor/browser/editorExtensions';
 import { MarkerController } from 'vs/editor/contrib/gotoError/browser/gotoError';
-import { HoverController } from 'vs/editor/contrib/hover/browser/hoverController';
 import { IEditorOptions, LineNumbersType } from 'vs/editor/common/config/editorOptions';
 import { CodeEditorWidget } from 'vs/editor/browser/widget/codeEditor/codeEditorWidget';
 import { SuggestController } from 'vs/editor/contrib/suggest/browser/suggestController';
@@ -47,6 +46,7 @@ import { HistoryInfixMatchStrategy } from 'vs/workbench/contrib/positronConsole/
 import { HistoryPrefixMatchStrategy } from 'vs/workbench/contrib/positronConsole/common/historyPrefixMatchStrategy';
 import { EmptyHistoryMatchStrategy, HistoryMatch, HistoryMatchStrategy } from 'vs/workbench/contrib/positronConsole/common/historyMatchStrategy';
 import { IPositronConsoleInstance, PositronConsoleState } from 'vs/workbench/services/positronConsole/browser/interfaces/positronConsoleService';
+import { ContentHoverController } from 'vs/editor/contrib/hover/browser/contentHoverController2';
 
 // Position enumeration.
 const enum Position {
@@ -691,7 +691,7 @@ export const ConsoleInput = (props: ConsoleInputProps) => {
 					SuggestController.ID,
 					SnippetController2.ID,
 					TabCompletionController.ID,
-					HoverController.ID,
+					ContentHoverController.ID,
 					MarkerController.ID,
 					ParameterHintsController.ID,
 					FormatOnType.ID,
diff --git a/src/vs/workbench/contrib/preferences/browser/keybindingsEditor.ts b/src/vs/workbench/contrib/preferences/browser/keybindingsEditor.ts
index 6f3c5086186..0a710773a28 100644
--- a/src/vs/workbench/contrib/preferences/browser/keybindingsEditor.ts
+++ b/src/vs/workbench/contrib/preferences/browser/keybindingsEditor.ts
@@ -62,6 +62,7 @@ import { getDefaultHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateF
 import { IEditorGroup } from 'vs/workbench/services/editor/common/editorGroupsService';
 import type { IManagedHover } from 'vs/base/browser/ui/hover/hover';
 import { IHoverService } from 'vs/platform/hover/browser/hover';
+import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
 
 const $ = DOM.$;
 
@@ -122,7 +123,8 @@ export class KeybindingsEditor extends EditorPane implements IKeybindingsEditorP
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 		@IEditorService private readonly editorService: IEditorService,
 		@IStorageService storageService: IStorageService,
-		@IConfigurationService private readonly configurationService: IConfigurationService
+		@IConfigurationService private readonly configurationService: IConfigurationService,
+		@IAccessibilityService private readonly accessibilityService: IAccessibilityService
 	) {
 		super(KeybindingsEditor.ID, group, telemetryService, themeService, storageService);
 		this.delayedFiltering = new Delayer<void>(300);
@@ -590,7 +592,7 @@ export class KeybindingsEditor extends EditorPane implements IKeybindingsEditorP
 		if (this.keybindingsEditorModel) {
 			const filter = this.searchWidget.getValue();
 			const keybindingsEntries: IKeybindingItemEntry[] = this.keybindingsEditorModel.fetch(filter, this.sortByPrecedenceAction.checked);
-
+			this.accessibilityService.alert(localize('foundResults', "{0} results", keybindingsEntries.length));
 			this.ariaLabelElement.setAttribute('aria-label', this.getAriaLabel(keybindingsEntries));
 
 			if (keybindingsEntries.length === 0) {
diff --git a/src/vs/workbench/contrib/preferences/browser/preferencesSearch.ts b/src/vs/workbench/contrib/preferences/browser/preferencesSearch.ts
index 7f8bb17a88f..616e7f6e91a 100644
--- a/src/vs/workbench/contrib/preferences/browser/preferencesSearch.ts
+++ b/src/vs/workbench/contrib/preferences/browser/preferencesSearch.ts
@@ -57,7 +57,7 @@ export class PreferencesSearchService extends Disposable implements IPreferences
 		return workbenchSettings.enableNaturalLanguageSearch;
 	}
 
-	getRemoteSearchProvider(filter: string, newExtensionsOnly = false): IRemoteSearchProvider | undefined {
+	getRemoteSearchProvider(filter: string): IRemoteSearchProvider | undefined {
 		if (!this.remoteSearchAllowed) {
 			return undefined;
 		}
@@ -523,9 +523,8 @@ class RemoteSearchProvider implements IRemoteSearchProvider {
 	private initializeSearchProviders() {
 		if (this.aiRelatedInformationService.isEnabled()) {
 			this.adaSearchProvider ??= new AiRelatedInformationSearchProvider(this.aiRelatedInformationService);
-		} else {
-			this.tfIdfSearchProvider ??= new TfIdfSearchProvider();
 		}
+		this.tfIdfSearchProvider ??= new TfIdfSearchProvider();
 	}
 
 	setFilter(filter: string): void {
@@ -533,9 +532,8 @@ class RemoteSearchProvider implements IRemoteSearchProvider {
 		this.filter = filter;
 		if (this.adaSearchProvider) {
 			this.adaSearchProvider.setFilter(filter);
-		} else {
-			this.tfIdfSearchProvider!.setFilter(filter);
 		}
+		this.tfIdfSearchProvider!.setFilter(filter);
 	}
 
 	searchModel(preferencesModel: ISettingsEditorModel, token?: CancellationToken): Promise<ISearchResult | null> {
@@ -543,11 +541,14 @@ class RemoteSearchProvider implements IRemoteSearchProvider {
 			return Promise.resolve(null);
 		}
 
-		if (this.adaSearchProvider) {
-			return this.adaSearchProvider.searchModel(preferencesModel, token);
-		} else {
+		if (!this.adaSearchProvider) {
 			return this.tfIdfSearchProvider!.searchModel(preferencesModel, token);
 		}
+
+		// Use TF-IDF search as a fallback, ref https://github.com/microsoft/vscode/issues/224946
+		return this.adaSearchProvider.searchModel(preferencesModel, token).then((results) => {
+			return results?.filterMatches.length ? results : this.tfIdfSearchProvider!.searchModel(preferencesModel, token);
+		});
 	}
 }
 
diff --git a/src/vs/workbench/contrib/preferences/browser/preferencesWidgets.ts b/src/vs/workbench/contrib/preferences/browser/preferencesWidgets.ts
index 0e9c2437930..cac09b8c128 100644
--- a/src/vs/workbench/contrib/preferences/browser/preferencesWidgets.ts
+++ b/src/vs/workbench/contrib/preferences/browser/preferencesWidgets.ts
@@ -437,8 +437,7 @@ export class SearchWidget extends Widget {
 
 	protected createInputBox(parent: HTMLElement): HistoryInputBox {
 		const showHistoryHint = () => showHistoryKeybindingHint(this.keybindingService);
-		const box = this._register(new ContextScopedHistoryInputBox(parent, this.contextViewService, { ...this.options, showHistoryHint }, this.contextKeyService));
-		return box;
+		return new ContextScopedHistoryInputBox(parent, this.contextViewService, { ...this.options, showHistoryHint }, this.contextKeyService);
 	}
 
 	showMessage(message: string): void {
diff --git a/src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts b/src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts
index 6150fb35e10..3b381a5c3a4 100644
--- a/src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts
+++ b/src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts
@@ -10,7 +10,7 @@ import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
 import { Button } from 'vs/base/browser/ui/button/button';
 import { ITreeElement } from 'vs/base/browser/ui/tree/tree';
 import { Action } from 'vs/base/common/actions';
-import { Delayer, ThrottledDelayer } from 'vs/base/common/async';
+import { Delayer } from 'vs/base/common/async';
 import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
 import { fromNow } from 'vs/base/common/date';
 import { isCancellationError } from 'vs/base/common/errors';
@@ -181,8 +181,7 @@ export class SettingsEditor2 extends EditorPane {
 	private tocTree!: TOCTree;
 
 	private delayedFilterLogging: Delayer<void>;
-	private localSearchDelayer: Delayer<void>;
-	private remoteSearchThrottle: ThrottledDelayer<void>;
+	private searchDelayer: Delayer<void>;
 	private searchInProgress: CancellationTokenSource | null = null;
 
 	private searchInputDelayer: Delayer<void>;
@@ -252,8 +251,7 @@ export class SettingsEditor2 extends EditorPane {
 	) {
 		super(SettingsEditor2.ID, group, telemetryService, themeService, storageService);
 		this.delayedFilterLogging = new Delayer<void>(1000);
-		this.localSearchDelayer = new Delayer(300);
-		this.remoteSearchThrottle = new ThrottledDelayer(200);
+		this.searchDelayer = new Delayer(300);
 		this.viewState = { settingsTarget: ConfigurationTarget.USER_LOCAL };
 
 		this.settingFastUpdateDelayer = new Delayer<void>(SettingsEditor2.SETTING_UPDATE_FAST_DEBOUNCE);
@@ -484,8 +482,7 @@ export class SettingsEditor2 extends EditorPane {
 
 		const target: SettingsTarget | undefined = options.folderUri ?? recoveredViewState?.settingsTarget ?? <SettingsTarget | undefined>options.target;
 		if (target) {
-			this.settingsTargetsWidget.settingsTarget = target;
-			this.viewState.settingsTarget = target;
+			this.settingsTargetsWidget.updateTarget(target);
 		}
 	}
 
@@ -1627,8 +1624,7 @@ export class SettingsEditor2 extends EditorPane {
 				this.searchResultModel = null;
 			}
 
-			this.localSearchDelayer.cancel();
-			this.remoteSearchThrottle.cancel();
+			this.searchDelayer.cancel();
 			if (this.searchInProgress) {
 				this.searchInProgress.cancel();
 				this.searchInProgress.dispose();
@@ -1719,7 +1715,7 @@ export class SettingsEditor2 extends EditorPane {
 		this.telemetryService.publicLog2<SettingsEditorFilterEvent, SettingsEditorFilterClassification>('settingsEditor.filter', data);
 	}
 
-	private triggerFilterPreferences(query: string): Promise<void> {
+	private async triggerFilterPreferences(query: string): Promise<void> {
 		if (this.searchInProgress) {
 			this.searchInProgress.cancel();
 			this.searchInProgress = null;
@@ -1727,33 +1723,39 @@ export class SettingsEditor2 extends EditorPane {
 
 		// Trigger the local search. If it didn't find an exact match, trigger the remote search.
 		const searchInProgress = this.searchInProgress = new CancellationTokenSource();
-		return this.localSearchDelayer.trigger(async () => {
-			if (searchInProgress && !searchInProgress.token.isCancellationRequested) {
-				const result = await this.localFilterPreferences(query);
-				if (result && !result.exactMatch) {
-					this.remoteSearchThrottle.trigger(async () => {
-						if (searchInProgress && !searchInProgress.token.isCancellationRequested) {
-							await this.remoteSearchPreferences(query, this.searchInProgress?.token);
-						}
-					});
+		return this.searchDelayer.trigger(async () => {
+			if (!searchInProgress.token.isCancellationRequested) {
+				const localResults = await this.localFilterPreferences(query, searchInProgress.token);
+				if (localResults && !localResults.exactMatch && !searchInProgress.token.isCancellationRequested) {
+					await this.remoteSearchPreferences(query, searchInProgress.token);
 				}
+
+				// Update UI only after all the search results are in
+				// ref https://github.com/microsoft/vscode/issues/224946
+				this.onDidFinishSearch();
 			}
 		});
 	}
 
+	private onDidFinishSearch() {
+		this.tocTreeModel.currentSearchModel = this.searchResultModel;
+		this.tocTreeModel.update();
+		this.tocTree.setFocus([]);
+		this.viewState.filterToCategory = undefined;
+		this.tocTree.expandAll();
+		this.settingsTree.scrollTop = 0;
+		this.refreshTOCTree();
+		this.renderTree(undefined, true);
+	}
+
 	private localFilterPreferences(query: string, token?: CancellationToken): Promise<ISearchResult | null> {
 		const localSearchProvider = this.preferencesSearchService.getLocalSearchProvider(query);
 		return this.filterOrSearchPreferences(query, SearchResultIdx.Local, localSearchProvider, token);
 	}
 
-	private remoteSearchPreferences(query: string, token?: CancellationToken): Promise<void> {
+	private remoteSearchPreferences(query: string, token?: CancellationToken): Promise<ISearchResult | null> {
 		const remoteSearchProvider = this.preferencesSearchService.getRemoteSearchProvider(query);
-		const newExtSearchProvider = this.preferencesSearchService.getRemoteSearchProvider(query, true);
-
-		return Promise.all([
-			this.filterOrSearchPreferences(query, SearchResultIdx.Remote, remoteSearchProvider, token),
-			this.filterOrSearchPreferences(query, SearchResultIdx.NewExtensions, newExtSearchProvider, token)
-		]).then(() => { });
+		return this.filterOrSearchPreferences(query, SearchResultIdx.Remote, remoteSearchProvider, token);
 	}
 
 	private async filterOrSearchPreferences(query: string, type: SearchResultIdx, searchProvider?: ISearchProvider, token?: CancellationToken): Promise<ISearchResult | null> {
@@ -1762,24 +1764,8 @@ export class SettingsEditor2 extends EditorPane {
 			// Handle cancellation like this because cancellation is lost inside the search provider due to async/await
 			return null;
 		}
-		if (!this.searchResultModel) {
-			this.searchResultModel = this.instantiationService.createInstance(SearchResultModel, this.viewState, this.settingsOrderByTocIndex, this.workspaceTrustManagementService.isWorkspaceTrusted());
-			// Must be called before this.renderTree()
-			// to make sure the search results count is set.
-			this.searchResultModel.setResult(type, result);
-			this.tocTreeModel.currentSearchModel = this.searchResultModel;
-		} else {
-			this.searchResultModel.setResult(type, result);
-			this.tocTreeModel.update();
-		}
-		if (type === SearchResultIdx.Local) {
-			this.tocTree.setFocus([]);
-			this.viewState.filterToCategory = undefined;
-			this.tocTree.expandAll();
-		}
-		this.settingsTree.scrollTop = 0;
-		this.refreshTOCTree();
-		this.renderTree(undefined, true);
+		this.searchResultModel ??= this.instantiationService.createInstance(SearchResultModel, this.viewState, this.settingsOrderByTocIndex, this.workspaceTrustManagementService.isWorkspaceTrusted());
+		this.searchResultModel.setResult(type, result);
 		return result;
 	}
 
diff --git a/src/vs/workbench/contrib/preferences/browser/settingsLayout.ts b/src/vs/workbench/contrib/preferences/browser/settingsLayout.ts
index 6fe424d224c..7beaef878f4 100644
--- a/src/vs/workbench/contrib/preferences/browser/settingsLayout.ts
+++ b/src/vs/workbench/contrib/preferences/browser/settingsLayout.ts
@@ -242,6 +242,11 @@ export const tocData: ITOCEntry<string> = {
 					id: 'features/chat',
 					label: localize('chat', 'Chat'),
 					settings: ['chat.*', 'inlineChat.*']
+				},
+				{
+					id: 'features/issueReporter',
+					label: localize('issueReporter', 'Issue Reporter'),
+					settings: ['issueReporter.*']
 				}
 			]
 		},
diff --git a/src/vs/workbench/contrib/preferences/browser/settingsTree.ts b/src/vs/workbench/contrib/preferences/browser/settingsTree.ts
index 73d7c2e286a..95dabc4d10d 100644
--- a/src/vs/workbench/contrib/preferences/browser/settingsTree.ts
+++ b/src/vs/workbench/contrib/preferences/browser/settingsTree.ts
@@ -67,10 +67,11 @@ import { settingsNumberInputBackground, settingsNumberInputBorder, settingsNumbe
 import { APPLY_ALL_PROFILES_SETTING, IWorkbenchConfigurationService } from 'vs/workbench/services/configuration/common/configuration';
 import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { ISetting, ISettingsGroup, SettingValueType } from 'vs/workbench/services/preferences/common/preferences';
+import { ISetting, ISettingsGroup, SETTINGS_AUTHORITY, SettingValueType } from 'vs/workbench/services/preferences/common/preferences';
 import { getInvalidTypeError } from 'vs/workbench/services/preferences/common/preferencesValidation';
 import { getDefaultHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
 import { IHoverService } from 'vs/platform/hover/browser/hover';
+import { URI } from 'vs/base/common/uri';
 
 const $ = DOM.$;
 
@@ -1377,6 +1378,8 @@ class SettingObjectRenderer extends AbstractSettingObjectRenderer implements ITr
 					// If the key of the default value is changed, remove the default value
 					if (e.originalItem.key.data !== e.newItem.key.data && settingSupportsRemoveDefault && e.originalItem.key.data in defaultValue) {
 						newValue[e.originalItem.key.data] = null;
+					} else {
+						delete newValue[e.originalItem.key.data];
 					}
 					newValue[e.newItem.key.data] = e.newItem.value.data;
 					newItems.push(e.newItem);
@@ -2114,6 +2117,7 @@ export class SettingTreeRenderers extends Disposable {
 			new Separator(),
 			this._instantiationService.createInstance(CopySettingIdAction),
 			this._instantiationService.createInstance(CopySettingAsJSONAction),
+			this._instantiationService.createInstance(CopySettingAsURLAction),
 		];
 
 		const actionFactory = (setting: ISetting, settingTarget: SettingsTarget) => this.getActionsForSetting(setting, settingTarget);
@@ -2599,6 +2603,29 @@ class CopySettingAsJSONAction extends Action {
 	}
 }
 
+class CopySettingAsURLAction extends Action {
+	static readonly ID = 'settings.copySettingAsURL';
+	static readonly LABEL = localize('copySettingAsURLLabel', "Copy Setting as URL");
+
+	constructor(
+		@IClipboardService private readonly clipboardService: IClipboardService,
+		@IProductService private readonly productService: IProductService,
+	) {
+		super(CopySettingAsURLAction.ID, CopySettingAsURLAction.LABEL);
+	}
+
+	override async run(context: SettingsTreeSettingElement): Promise<void> {
+		if (context) {
+			const settingKey = context.setting.key;
+			const product = this.productService.urlProtocol;
+			const uri = URI.from({ scheme: product, authority: SETTINGS_AUTHORITY, path: `/${settingKey}` }, true);
+			await this.clipboardService.writeText(uri.toString());
+		}
+
+		return Promise.resolve(undefined);
+	}
+}
+
 class SyncSettingAction extends Action {
 	static readonly ID = 'settings.stopSyncingSetting';
 	static readonly LABEL = localize('stopSyncingSetting', "Sync This Setting");
diff --git a/src/vs/workbench/contrib/relauncher/browser/relauncher.contribution.ts b/src/vs/workbench/contrib/relauncher/browser/relauncher.contribution.ts
index c4c03e186aa..8b83d9b4a92 100644
--- a/src/vs/workbench/contrib/relauncher/browser/relauncher.contribution.ts
+++ b/src/vs/workbench/contrib/relauncher/browser/relauncher.contribution.ts
@@ -39,6 +39,7 @@ export class SettingsChangeRelauncher extends Disposable implements IWorkbenchCo
 		'window.nativeTabs',
 		'window.nativeFullScreen',
 		'window.clickThroughInactive',
+		'window.experimentalControlOverlay',
 		'update.mode',
 		'editor.accessibilitySupport',
 		'security.workspace.trust.enabled',
@@ -52,6 +53,7 @@ export class SettingsChangeRelauncher extends Disposable implements IWorkbenchCo
 	private readonly nativeTabs = new ChangeObserver('boolean');
 	private readonly nativeFullScreen = new ChangeObserver('boolean');
 	private readonly clickThroughInactive = new ChangeObserver('boolean');
+	private readonly linuxWindowControlOverlay = new ChangeObserver('boolean');
 	private readonly updateMode = new ChangeObserver('string');
 	private accessibilitySupport: 'on' | 'off' | 'auto' | undefined;
 	private readonly workspaceTrustEnabled = new ChangeObserver('boolean');
@@ -99,6 +101,9 @@ export class SettingsChangeRelauncher extends Disposable implements IWorkbenchCo
 			// macOS: Click through (accept first mouse)
 			processChanged(isMacintosh && this.clickThroughInactive.handleChange(config.window?.clickThroughInactive));
 
+			// Linux: WCO
+			processChanged(isLinux && this.linuxWindowControlOverlay.handleChange(config.window?.experimentalControlOverlay));
+
 			// Update mode
 			processChanged(this.updateMode.handleChange(config.update?.mode));
 
diff --git a/src/vs/workbench/contrib/remote/browser/remote.ts b/src/vs/workbench/contrib/remote/browser/remote.ts
index 98e47977753..3d506179760 100644
--- a/src/vs/workbench/contrib/remote/browser/remote.ts
+++ b/src/vs/workbench/contrib/remote/browser/remote.ts
@@ -55,6 +55,9 @@ import { IWalkthroughsService } from 'vs/workbench/contrib/welcomeGettingStarted
 import { Schemas } from 'vs/base/common/network';
 import { mainWindow } from 'vs/base/browser/window';
 import { IHoverService } from 'vs/platform/hover/browser/hover';
+// --- Start PWB: Clear browser history
+import { BrowserStorageService } from 'vs/workbench/services/storage/browser/storageService';
+// --- End PWB: Clear browser history
 
 interface IViewModel {
 	onDidChangeHelpInformation: Event<void>;
@@ -793,14 +796,17 @@ export class RemoteAgentConnectionStatusListener extends Disposable implements I
 		@IQuickInputService quickInputService: IQuickInputService,
 		@ILogService logService: ILogService,
 		@IWorkbenchEnvironmentService environmentService: IWorkbenchEnvironmentService,
-		@ITelemetryService telemetryService: ITelemetryService
+		// --- Start PWB: clear browser history
+		@ITelemetryService telemetryService: ITelemetryService,
+		@IStorageService storageService: IStorageService
+		// --- End PWB: clear browser history
 	) {
 		super();
 		const connection = remoteAgentService.getConnection();
 		if (connection) {
 			let quickInputVisible = false;
-			quickInputService.onShow(() => quickInputVisible = true);
-			quickInputService.onHide(() => quickInputVisible = false);
+			this._register(quickInputService.onShow(() => quickInputVisible = true));
+			this._register(quickInputService.onHide(() => quickInputVisible = false));
 
 			let visibleProgress: VisibleProgress | null = null;
 			let reconnectWaitEvent: ReconnectionWaitEvent | null = null;
@@ -920,6 +926,11 @@ export class RemoteAgentConnectionStatusListener extends Disposable implements I
 							}
 							visibleProgress.report(nls.localize('connectionLost', "Connection Lost"));
 						}
+						// --- Start PWB: clear browser history
+						if (storageService instanceof BrowserStorageService) {
+							storageService.closeConnections();
+						}
+						// --- End PWB: clear browser history
 						break;
 
 					case PersistentConnectionEventType.ReconnectionWait:
@@ -928,6 +939,7 @@ export class RemoteAgentConnectionStatusListener extends Disposable implements I
 							visibleProgress = showProgress(null, [reconnectButton, reloadButton]);
 							visibleProgress.startTimer(Date.now() + 1000 * e.durationSeconds);
 						}
+
 						break;
 
 					case PersistentConnectionEventType.ReconnectionRunning:
@@ -1024,6 +1036,13 @@ export class RemoteAgentConnectionStatusListener extends Disposable implements I
 						lastIncomingDataTime = Date.now() - e.millisSinceLastIncomingData;
 						reconnectionAttempts = e.attempt;
 
+						// --- Start PWB: clear browser history
+						if (storageService instanceof BrowserStorageService) {
+							storageService.openConnections();
+						}
+						// --- End PWB: clear browser history
+
+
 						type RemoteConnectionGainClassification = {
 							owner: 'alexdima';
 							comment: 'The remote connection state is now `ConnectionGain`';
diff --git a/src/vs/workbench/contrib/remote/browser/remoteIndicator.ts b/src/vs/workbench/contrib/remote/browser/remoteIndicator.ts
index 6486aa5f0cf..137c02f390b 100644
--- a/src/vs/workbench/contrib/remote/browser/remoteIndicator.ts
+++ b/src/vs/workbench/contrib/remote/browser/remoteIndicator.ts
@@ -7,7 +7,7 @@ import * as nls from 'vs/nls';
 import { IRemoteAgentService, remoteConnectionLatencyMeasurer } from 'vs/workbench/services/remote/common/remoteAgentService';
 import { RunOnceScheduler, retry } from 'vs/base/common/async';
 import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable } from 'vs/base/common/lifecycle';
+import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
 import { MenuId, IMenuService, MenuItemAction, MenuRegistry, registerAction2, Action2, SubmenuItemAction } from 'vs/platform/actions/common/actions';
 import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
 import { StatusbarAlignment, IStatusbarService, IStatusbarEntryAccessor, IStatusbarEntry } from 'vs/workbench/services/statusbar/browser/statusbar';
@@ -803,12 +803,13 @@ export class RemoteStatusIndicator extends Disposable implements IWorkbenchContr
 			return items;
 		};
 
-		const quickPick = this.quickInputService.createQuickPick();
+		const disposables = new DisposableStore();
+		const quickPick = disposables.add(this.quickInputService.createQuickPick({ useSeparators: true }));
 		quickPick.placeholder = nls.localize('remoteActions', "Select an option to open a Remote Window");
 		quickPick.items = computeItems();
 		quickPick.sortByLabel = false;
 		quickPick.canSelectMany = false;
-		Event.once(quickPick.onDidAccept)((async _ => {
+		disposables.add(Event.once(quickPick.onDidAccept)((async _ => {
 			const selectedItems = quickPick.selectedItems;
 			if (selectedItems.length === 1) {
 				const commandId = selectedItems[0].id!;
@@ -831,21 +832,20 @@ export class RemoteStatusIndicator extends Disposable implements IWorkbenchContr
 					quickPick.hide();
 				}
 			}
-		}));
+		})));
 
-		Event.once(quickPick.onDidTriggerItemButton)(async (e) => {
+		disposables.add(Event.once(quickPick.onDidTriggerItemButton)(async (e) => {
 			const remoteExtension = this.remoteExtensionMetadata.find(value => ExtensionIdentifier.equals(value.id, e.item.id));
 			if (remoteExtension) {
 				await this.openerService.open(URI.parse(remoteExtension.helpLink));
 			}
-		});
+		}));
 
 		// refresh the items when actions change
-		const legacyItemUpdater = this.legacyIndicatorMenu.onDidChange(() => quickPick.items = computeItems());
-		quickPick.onDidHide(legacyItemUpdater.dispose);
+		disposables.add(this.legacyIndicatorMenu.onDidChange(() => quickPick.items = computeItems()));
+		disposables.add(this.remoteIndicatorMenu.onDidChange(() => quickPick.items = computeItems()));
 
-		const itemUpdater = this.remoteIndicatorMenu.onDidChange(() => quickPick.items = computeItems());
-		quickPick.onDidHide(itemUpdater.dispose);
+		disposables.add(quickPick.onDidHide(() => disposables.dispose()));
 
 		if (!this.remoteMetadataInitialized) {
 			quickPick.busy = true;
diff --git a/src/vs/workbench/contrib/remoteTunnel/electron-sandbox/remoteTunnel.contribution.ts b/src/vs/workbench/contrib/remoteTunnel/electron-sandbox/remoteTunnel.contribution.ts
index 0f750170457..e65b86ba068 100644
--- a/src/vs/workbench/contrib/remoteTunnel/electron-sandbox/remoteTunnel.contribution.ts
+++ b/src/vs/workbench/contrib/remoteTunnel/electron-sandbox/remoteTunnel.contribution.ts
@@ -363,19 +363,20 @@ export class RemoteTunnelWorkbenchContribution extends Disposable implements IWo
 
 	private async getAuthenticationSession(): Promise<ExistingSessionItem | undefined> {
 		const sessions = await this.getAllSessions();
-		const quickpick = this.quickInputService.createQuickPick<ExistingSessionItem | AuthenticationProviderOption | IQuickPickItem>();
+		const disposables = new DisposableStore();
+		const quickpick = disposables.add(this.quickInputService.createQuickPick<ExistingSessionItem | AuthenticationProviderOption | IQuickPickItem>({ useSeparators: true }));
 		quickpick.ok = false;
 		quickpick.placeholder = localize('accountPreference.placeholder', "Sign in to an account to enable remote access");
 		quickpick.ignoreFocusOut = true;
 		quickpick.items = await this.createQuickpickItems(sessions);
 
 		return new Promise((resolve, reject) => {
-			quickpick.onDidHide((e) => {
+			disposables.add(quickpick.onDidHide((e) => {
 				resolve(undefined);
-				quickpick.dispose();
-			});
+				disposables.dispose();
+			}));
 
-			quickpick.onDidAccept(async (e) => {
+			disposables.add(quickpick.onDidAccept(async (e) => {
 				const selection = quickpick.selectedItems[0];
 				if ('provider' in selection) {
 					const session = await this.authenticationService.createSession(selection.provider.id, selection.provider.scopes);
@@ -386,7 +387,7 @@ export class RemoteTunnelWorkbenchContribution extends Disposable implements IWo
 					resolve(undefined);
 				}
 				quickpick.hide();
-			});
+			}));
 
 			quickpick.show();
 		});
@@ -750,7 +751,7 @@ export class RemoteTunnelWorkbenchContribution extends Disposable implements IWo
 
 		return new Promise<void>((c, e) => {
 			const disposables = new DisposableStore();
-			const quickPick = this.quickInputService.createQuickPick();
+			const quickPick = this.quickInputService.createQuickPick({ useSeparators: true });
 			quickPick.placeholder = localize('manage.placeholder', 'Select a command to invoke');
 			disposables.add(quickPick);
 			const items: Array<QuickPickItem> = [];
diff --git a/src/vs/workbench/contrib/replNotebook/browser/repl.contribution.ts b/src/vs/workbench/contrib/replNotebook/browser/repl.contribution.ts
index 1db3282ad9e..683d23c9b6e 100644
--- a/src/vs/workbench/contrib/replNotebook/browser/repl.contribution.ts
+++ b/src/vs/workbench/contrib/replNotebook/browser/repl.contribution.ts
@@ -6,11 +6,10 @@
 import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { EditorPaneDescriptor, IEditorPaneRegistry } from 'vs/workbench/browser/editor';
-import { EditorExtensions, IEditorFactoryRegistry, IEditorSerializer, IUntypedEditorInput } from 'vs/workbench/common/editor';
-// is one contrib allowed to import from another?
+import { EditorExtensions, IEditorFactoryRegistry, IEditorSerializer } from 'vs/workbench/common/editor';
 import { parse } from 'vs/base/common/marshalling';
 import { assertType } from 'vs/base/common/types';
-import { URI } from 'vs/base/common/uri';
+import { URI, UriComponents } from 'vs/base/common/uri';
 import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { EditorInput } from 'vs/workbench/common/editor/editorInput';
 import { CellEditType, CellKind, NotebookSetting, NotebookWorkingCopyTypeIdentifier, REPL_EDITOR_ID } from 'vs/workbench/contrib/notebook/common/notebookCommon';
@@ -24,12 +23,7 @@ import { IWorkingCopyIdentifier } from 'vs/workbench/services/workingCopy/common
 import { IWorkingCopyEditorHandler, IWorkingCopyEditorService } from 'vs/workbench/services/workingCopy/common/workingCopyEditorService';
 import { extname, isEqual } from 'vs/base/common/resources';
 import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
-// eslint-disable-next-line local/code-translation-remind
-import { localize2 } from 'vs/nls';
-import { Action2, registerAction2 } from 'vs/platform/actions/common/actions';
 import { IEditorResolverService, RegisteredEditorPriority } from 'vs/workbench/services/editor/common/editorResolverService';
-import { Schemas } from 'vs/base/common/network';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { INotebookEditorModelResolverService } from 'vs/workbench/contrib/notebook/common/notebookEditorModelResolverService';
 import { isFalsyOrWhitespace } from 'vs/base/common/strings';
 import { IBulkEditService } from 'vs/editor/browser/services/bulkEditService';
@@ -40,8 +34,20 @@ import { IInteractiveHistoryService } from 'vs/workbench/contrib/interactive/bro
 import { NotebookEditorWidget } from 'vs/workbench/contrib/notebook/browser/notebookEditorWidget';
 import { INotebookEditorService } from 'vs/workbench/contrib/notebook/browser/services/notebookEditorService';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
+import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { getReplView } from 'vs/workbench/contrib/debug/browser/repl';
+import { REPL_VIEW_ID } from 'vs/workbench/contrib/debug/common/debug';
+import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
+import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
+import { Action2, MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
+import { localize2 } from 'vs/nls';
+import { NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT } from 'vs/workbench/contrib/notebook/browser/controller/coreActions';
+import * as icons from 'vs/workbench/contrib/notebook/browser/notebookIcons';
+import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { INotebookEditorOptions } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
 
-type SerializedNotebookEditorData = { resource: URI; preferredResource: URI; viewType: string; options?: NotebookEditorInputOptions };
+type SerializedNotebookEditorData = { resource: URI; preferredResource: URI; viewType: string; options?: NotebookEditorInputOptions; label?: string };
 class ReplEditorSerializer implements IEditorSerializer {
 	canSerialize(input: EditorInput): boolean {
 		return input.typeId === ReplEditorInput.ID;
@@ -52,7 +58,8 @@ class ReplEditorSerializer implements IEditorSerializer {
 			resource: input.resource,
 			preferredResource: input.preferredResource,
 			viewType: input.viewType,
-			options: input.options
+			options: input.options,
+			label: input.getName()
 		};
 		return JSON.stringify(data);
 	}
@@ -66,7 +73,7 @@ class ReplEditorSerializer implements IEditorSerializer {
 			return undefined;
 		}
 
-		const input = instantiationService.createInstance(ReplEditorInput, resource);
+		const input = instantiationService.createInstance(ReplEditorInput, resource, data.label);
 		return input;
 	}
 }
@@ -94,7 +101,6 @@ export class ReplDocumentContribution extends Disposable implements IWorkbenchCo
 	constructor(
 		@INotebookService notebookService: INotebookService,
 		@IEditorResolverService editorResolverService: IEditorResolverService,
-		@IEditorService editorService: IEditorService,
 		@INotebookEditorModelResolverService private readonly notebookEditorModelResolverService: INotebookEditorModelResolverService,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 		@IConfigurationService private readonly configurationService: IConfigurationService
@@ -102,16 +108,17 @@ export class ReplDocumentContribution extends Disposable implements IWorkbenchCo
 		super();
 
 		editorResolverService.registerEditor(
-			`*.replNotebook`,
+			// don't match anything, we don't need to support re-opening files as REPL editor at this point
+			` `,
 			{
 				id: 'repl',
 				label: 'repl Editor',
 				priority: RegisteredEditorPriority.option
 			},
 			{
-				canSupportResource: uri =>
-					(uri.scheme === Schemas.untitled && extname(uri) === '.replNotebook') ||
-					(uri.scheme === Schemas.vscodeNotebookCell && extname(uri) === '.replNotebook'),
+				// We want to support all notebook types which could have any file extension,
+				// so we just check if the resource corresponds to a notebook
+				canSupportResource: uri => notebookService.getNotebookTextModel(uri) !== undefined,
 				singlePerResource: true
 			},
 			{
@@ -124,7 +131,12 @@ export class ReplDocumentContribution extends Disposable implements IWorkbenchCo
 					ref.object.notebook.onWillDispose(() => {
 						ref.dispose();
 					});
-					return { editor: this.instantiationService.createInstance(ReplEditorInput, resource!), options };
+					const label = (options as INotebookEditorOptions)?.label ?? undefined;
+					return { editor: this.instantiationService.createInstance(ReplEditorInput, resource!, label), options };
+				},
+				createEditorInput: async ({ resource, options }) => {
+					const label = (options as INotebookEditorOptions)?.label ?? undefined;
+					return { editor: this.instantiationService.createInstance(ReplEditorInput, resource, label), options };
 				}
 			}
 		);
@@ -160,7 +172,7 @@ class ReplWindowWorkingCopyEditorHandler extends Disposable implements IWorkbenc
 	}
 
 	createEditor(workingCopy: IWorkingCopyIdentifier): EditorInput {
-		return this.instantiationService.createInstance(ReplEditorInput, workingCopy.resource);
+		return this.instantiationService.createInstance(ReplEditorInput, workingCopy.resource, undefined);
 	}
 
 	private async _installHandler(): Promise<void> {
@@ -177,29 +189,83 @@ class ReplWindowWorkingCopyEditorHandler extends Disposable implements IWorkbenc
 registerWorkbenchContribution2(ReplWindowWorkingCopyEditorHandler.ID, ReplWindowWorkingCopyEditorHandler, WorkbenchPhase.BlockRestore);
 registerWorkbenchContribution2(ReplDocumentContribution.ID, ReplDocumentContribution, WorkbenchPhase.BlockRestore);
 
-
 registerAction2(class extends Action2 {
 	constructor() {
 		super({
-			id: 'repl.newRepl',
-			title: localize2('repl.editor.open', 'New REPL Editor'),
-			category: 'Create',
+			id: 'repl.execute',
+			title: localize2('repl.execute', 'Execute REPL input'),
+			category: 'REPL',
+			keybinding: [{
+				when: ContextKeyExpr.equals('activeEditor', 'workbench.editor.repl'),
+				primary: KeyMod.CtrlCmd | KeyCode.Enter,
+				weight: NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT
+			}, {
+				when: ContextKeyExpr.and(
+					ContextKeyExpr.equals('activeEditor', 'workbench.editor.repl'),
+					ContextKeyExpr.equals('config.interactiveWindow.executeWithShiftEnter', true)
+				),
+				primary: KeyMod.Shift | KeyCode.Enter,
+				weight: NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT
+			}, {
+				when: ContextKeyExpr.and(
+					ContextKeyExpr.equals('activeEditor', 'workbench.editor.repl'),
+					ContextKeyExpr.equals('config.interactiveWindow.executeWithShiftEnter', false)
+				),
+				primary: KeyCode.Enter,
+				weight: NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT
+			}],
+			menu: [
+				{
+					id: MenuId.ReplInputExecute
+				}
+			],
+			icon: icons.executeIcon,
+			f1: false,
+			metadata: {
+				description: 'Execute the Contents of the Input Box',
+				args: [
+					{
+						name: 'resource',
+						description: 'Interactive resource Uri',
+						isOptional: true
+					}
+				]
+			}
 		});
 	}
 
-	async run(accessor: ServicesAccessor) {
-		const resource = URI.from({ scheme: Schemas.untitled, path: 'repl.replNotebook' });
-		const editorInput: IUntypedEditorInput = { resource, options: { override: 'repl' } };
-
+	async run(accessor: ServicesAccessor, context?: UriComponents): Promise<void> {
 		const editorService = accessor.get(IEditorService);
-		await editorService.openEditor(editorInput, 1);
+		const bulkEditService = accessor.get(IBulkEditService);
+		const historyService = accessor.get(IInteractiveHistoryService);
+		const notebookEditorService = accessor.get(INotebookEditorService);
+		let editorControl: { notebookEditor: NotebookEditorWidget | undefined; codeEditor: CodeEditorWidget } | undefined;
+		if (context) {
+			const resourceUri = URI.revive(context);
+			const editors = editorService.findEditors(resourceUri);
+			for (const found of editors) {
+				if (found.editor.typeId === ReplEditorInput.ID) {
+					const editor = await editorService.openEditor(found.editor, found.groupId);
+					editorControl = editor?.getControl() as { notebookEditor: NotebookEditorWidget | undefined; codeEditor: CodeEditorWidget } | undefined;
+					break;
+				}
+			}
+		}
+		else {
+			editorControl = editorService.activeEditorPane?.getControl() as { notebookEditor: NotebookEditorWidget | undefined; codeEditor: CodeEditorWidget } | undefined;
+		}
+
+		if (editorControl) {
+			executeReplInput(bulkEditService, historyService, notebookEditorService, editorControl);
+		}
 	}
 });
 
-export async function executeReplInput(accessor: ServicesAccessor, editorControl: { notebookEditor: NotebookEditorWidget | undefined; codeEditor: CodeEditorWidget }) {
-	const bulkEditService = accessor.get(IBulkEditService);
-	const historyService = accessor.get(IInteractiveHistoryService);
-	const notebookEditorService = accessor.get(INotebookEditorService);
+async function executeReplInput(
+	bulkEditService: IBulkEditService,
+	historyService: IInteractiveHistoryService,
+	notebookEditorService: INotebookEditorService,
+	editorControl: { notebookEditor: NotebookEditorWidget | undefined; codeEditor: CodeEditorWidget }) {
 
 	if (editorControl && editorControl.notebookEditor && editorControl.codeEditor) {
 		const notebookDocument = editorControl.notebookEditor.textModel;
@@ -215,7 +281,8 @@ export async function executeReplInput(accessor: ServicesAccessor, editorControl
 				return;
 			}
 
-			historyService.addToHistory(notebookDocument.uri, value);
+			historyService.replaceLast(notebookDocument.uri, value);
+			historyService.addToHistory(notebookDocument.uri, '');
 			textModel.setValue('');
 			notebookDocument.cells[index].resetTextBuffer(textModel.getTextBuffer());
 
@@ -259,3 +326,14 @@ export async function executeReplInput(accessor: ServicesAccessor, editorControl
 		}
 	}
 }
+
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+	id: 'list.find.replInputFocus',
+	weight: KeybindingWeight.WorkbenchContrib + 1,
+	when: ContextKeyExpr.equals('view', REPL_VIEW_ID),
+	primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KeyF,
+	secondary: [KeyCode.F3],
+	handler: (accessor) => {
+		getReplView(accessor.get(IViewsService))?.openFind();
+	}
+});
diff --git a/src/vs/workbench/contrib/replNotebook/browser/replEditor.ts b/src/vs/workbench/contrib/replNotebook/browser/replEditor.ts
index 53a0b25667d..e41ac91be87 100644
--- a/src/vs/workbench/contrib/replNotebook/browser/replEditor.ts
+++ b/src/vs/workbench/contrib/replNotebook/browser/replEditor.ts
@@ -4,20 +4,17 @@
  *--------------------------------------------------------------------------------------------*/
 
 import 'vs/css!./media/interactive';
-// eslint-disable-next-line local/code-translation-remind
-import * as nls from 'vs/nls';
 import * as DOM from 'vs/base/browser/dom';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { Emitter, Event } from 'vs/base/common/event';
 import { DisposableStore, MutableDisposable } from 'vs/base/common/lifecycle';
 import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
 import { CodeEditorWidget } from 'vs/editor/browser/widget/codeEditor/codeEditorWidget';
-import { ICodeEditorViewState, IDecorationOptions } from 'vs/editor/common/editorCommon';
+import { ICodeEditorViewState } from 'vs/editor/common/editorCommon';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IStorageService } from 'vs/platform/storage/common/storage';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { editorForeground, resolveColorValue } from 'vs/platform/theme/common/colorRegistry';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { EditorPane } from 'vs/workbench/browser/parts/editor/editorPane';
 import { EditorPaneSelectionChangeReason, IEditorMemento, IEditorOpenContext, IEditorPaneScrollPosition, IEditorPaneSelectionChangeEvent, IEditorPaneWithScrolling } from 'vs/workbench/common/editor';
@@ -57,14 +54,16 @@ import { ICursorPositionChangedEvent } from 'vs/editor/common/cursorEvents';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
 import { isEqual } from 'vs/base/common/resources';
 import { NotebookFindContrib } from 'vs/workbench/contrib/notebook/browser/contrib/find/notebookFindWidget';
-import { EXECUTE_REPL_COMMAND_ID, REPL_EDITOR_ID } from 'vs/workbench/contrib/notebook/common/notebookCommon';
+import { REPL_EDITOR_ID } from 'vs/workbench/contrib/notebook/common/notebookCommon';
 import 'vs/css!./interactiveEditor';
 import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
 import { deepClone } from 'vs/base/common/objects';
-import { HoverController } from 'vs/editor/contrib/hover/browser/hoverController';
+import { MarginHoverController } from 'vs/editor/contrib/hover/browser/marginHoverController';
+import { ContentHoverController } from 'vs/editor/contrib/hover/browser/contentHoverController2';
 import { ReplEditorInput } from 'vs/workbench/contrib/replNotebook/browser/replEditorInput';
+import { ReplInputHintContentWidget } from 'vs/workbench/contrib/interactive/browser/replInputHintContentWidget';
+import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
 
-const DECORATION_KEY = 'interactiveInputDecoration';
 const INTERACTIVE_EDITOR_VIEW_STATE_PREFERENCE_KEY = 'InteractiveEditorViewState';
 
 const INPUT_CELL_VERTICAL_PADDING = 8;
@@ -108,6 +107,7 @@ export class ReplEditor extends EditorPane implements IEditorPaneWithScrolling {
 	private _editorMemento: IEditorMemento<InteractiveEditorViewState>;
 	private readonly _groupListener = this._register(new MutableDisposable());
 	private _runbuttonToolbar: ToolBar | undefined;
+	private _hintElement: ReplInputHintContentWidget | undefined;
 
 	private _onDidFocusWidget = this._register(new Emitter<void>());
 	override get onDidFocus(): Event<void> { return this._onDidFocusWidget.event; }
@@ -143,9 +143,7 @@ export class ReplEditor extends EditorPane implements IEditorPaneWithScrolling {
 			themeService,
 			storageService
 		);
-		this._instantiationService = instantiationService;
 		this._notebookWidgetService = notebookWidgetService;
-		this._contextKeyService = contextKeyService;
 		this._configurationService = configurationService;
 		this._notebookKernelService = notebookKernelService;
 		this._languageService = languageService;
@@ -155,6 +153,11 @@ export class ReplEditor extends EditorPane implements IEditorPaneWithScrolling {
 		this._editorGroupService = editorGroupService;
 		this._extensionService = extensionService;
 
+		this._rootElement = DOM.$('.interactive-editor');
+		this._contextKeyService = this._register(contextKeyService.createScoped(this._rootElement));
+		this._contextKeyService.createKey('isCompositeNotebook', true);
+		this._instantiationService = this._register(instantiationService.createChild(new ServiceCollection([IContextKeyService, this._contextKeyService])));
+
 		this._editorOptions = this._computeEditorOptions();
 		this._register(this._configurationService.onDidChangeConfiguration(e => {
 			if (e.affectsConfiguration('editor') || e.affectsConfiguration('notebook')) {
@@ -164,8 +167,7 @@ export class ReplEditor extends EditorPane implements IEditorPaneWithScrolling {
 		this._notebookOptions = instantiationService.createInstance(NotebookOptions, this.window, true, { cellToolbarInteraction: 'hover', globalToolbar: true, stickyScrollEnabled: false, dragAndDropEnabled: false });
 		this._editorMemento = this.getEditorMemento<InteractiveEditorViewState>(editorGroupService, textResourceConfigurationService, INTERACTIVE_EDITOR_VIEW_STATE_PREFERENCE_KEY);
 
-		codeEditorService.registerDecorationType('interactive-decoration', DECORATION_KEY, {});
-		this._register(this._keybindingService.onDidUpdateKeybindings(this._updateInputDecoration, this));
+		this._register(this._keybindingService.onDidUpdateKeybindings(this._updateInputHint, this));
 		this._register(notebookExecutionStateService.onDidChangeExecution((e) => {
 			if (e.type === NotebookExecutionType.cell && isEqual(e.notebook, this._notebookWidget.value?.viewModel?.notebookDocument.uri)) {
 				const cell = this._notebookWidget.value?.getCellByHandle(e.cellHandle);
@@ -185,7 +187,7 @@ export class ReplEditor extends EditorPane implements IEditorPaneWithScrolling {
 	}
 
 	protected createEditor(parent: HTMLElement): void {
-		this._rootElement = DOM.append(parent, DOM.$('.interactive-editor'));
+		DOM.append(parent, this._rootElement);
 		this._rootElement.style.position = 'relative';
 		this._notebookEditorContainer = DOM.append(this._rootElement, DOM.$('.notebook-editor-container'));
 		this._inputCellContainer = DOM.append(this._rootElement, DOM.$('.input-cell-container'));
@@ -357,7 +359,7 @@ export class ReplEditor extends EditorPane implements IEditorPaneWithScrolling {
 
 		this._widgetDisposableStore.clear();
 
-		this._notebookWidget = <IBorrowValue<NotebookEditorWidget>>this._instantiationService.invokeFunction(this._notebookWidgetService.retrieveWidget, this.group, input, {
+		this._notebookWidget = <IBorrowValue<NotebookEditorWidget>>this._instantiationService.invokeFunction(this._notebookWidgetService.retrieveWidget, this.group.id, input, {
 			isEmbedded: true,
 			isReadOnly: true,
 			forRepl: true,
@@ -378,7 +380,8 @@ export class ReplEditor extends EditorPane implements IEditorPaneWithScrolling {
 			cellEditorContributions: EditorExtensionsRegistry.getSomeEditorContributions([
 				SelectionClipboardContributionID,
 				ContextMenuController.ID,
-				HoverController.ID,
+				ContentHoverController.ID,
+				MarginHoverController.ID,
 				MarkerController.ID
 			]),
 			options: this._notebookOptions,
@@ -396,7 +399,8 @@ export class ReplEditor extends EditorPane implements IEditorPaneWithScrolling {
 					ParameterHintsController.ID,
 					SnippetController2.ID,
 					TabCompletionController.ID,
-					HoverController.ID,
+					ContentHoverController.ID,
+					MarginHoverController.ID,
 					MarkerController.ID
 				])
 			}
@@ -480,13 +484,13 @@ export class ReplEditor extends EditorPane implements IEditorPaneWithScrolling {
 
 		this._widgetDisposableStore.add(this.themeService.onDidColorThemeChange(() => {
 			if (this.isVisible()) {
-				this._updateInputDecoration();
+				this._updateInputHint();
 			}
 		}));
 
 		this._widgetDisposableStore.add(this._codeEditorWidget.onDidChangeModelContent(() => {
 			if (this.isVisible()) {
-				this._updateInputDecoration();
+				this._updateInputHint();
 			}
 		}));
 
@@ -523,12 +527,16 @@ export class ReplEditor extends EditorPane implements IEditorPaneWithScrolling {
 		this._widgetDisposableStore.add(editorModel.onDidChangeContent(() => {
 			const value = editorModel.getValue();
 			if (this.input?.resource && value !== '') {
-				(this.input as ReplEditorInput).historyService.replaceLast(this.input.resource, value);
+				const historyService = (this.input as ReplEditorInput).historyService;
+				if (!historyService.matchesCurrent(this.input.resource, value)) {
+					historyService.replaceLast(this.input.resource, value);
+				}
 			}
 		}));
 
 		this._widgetDisposableStore.add(this._notebookWidget.value!.onDidScroll(() => this._onDidChangeScroll.fire()));
 
+		this._updateInputHint();
 		this._syncWithKernel();
 	}
 
@@ -586,8 +594,6 @@ export class ReplEditor extends EditorPane implements IEditorPaneWithScrolling {
 				NOTEBOOK_KERNEL.bindTo(this._contextKeyService).set(selectedOrSuggested.id);
 			}
 		}
-
-		this._updateInputDecoration();
 	}
 
 	layout(dimension: DOM.Dimension, position: DOM.IDomPosition): void {
@@ -627,46 +633,22 @@ export class ReplEditor extends EditorPane implements IEditorPaneWithScrolling {
 		return new DOM.Dimension(Math.max(0, width), Math.max(0, height));
 	}
 
-	private _updateInputDecoration(): void {
+	private _updateInputHint(): void {
 		if (!this._codeEditorWidget) {
 			return;
 		}
 
-		if (!this._codeEditorWidget.hasModel()) {
-			return;
-		}
-
-		const model = this._codeEditorWidget.getModel();
-
-		const decorations: IDecorationOptions[] = [];
-
-		if (model?.getValueLength() === 0) {
-			const transparentForeground = resolveColorValue(editorForeground, this.themeService.getColorTheme())?.transparent(0.4);
-			const languageId = model.getLanguageId();
-			if (languageId !== 'plaintext') {
-				const keybinding = this._keybindingService.lookupKeybinding(EXECUTE_REPL_COMMAND_ID, this._contextKeyService)?.getLabel();
-				const text = keybinding ?
-					nls.localize('interactiveInputPlaceHolder', "Type '{0}' code here and press {1} to run", languageId, keybinding) :
-					nls.localize('interactiveInputPlaceHolderNoKeybinding', "Type '{0}' code here and click run", languageId);
-				decorations.push({
-					range: {
-						startLineNumber: 0,
-						endLineNumber: 0,
-						startColumn: 0,
-						endColumn: 1
-					},
-					renderOptions: {
-						after: {
-							contentText: text,
-							color: transparentForeground ? transparentForeground.toString() : undefined
-						}
-					}
-				});
-			}
+		const shouldHide =
+			!this._codeEditorWidget.hasModel() ||
+			this._configurationService.getValue<boolean>(InteractiveWindowSetting.showExecutionHint) === false ||
+			this._codeEditorWidget.getModel()!.getValueLength() !== 0;
 
+		if (!this._hintElement && !shouldHide) {
+			this._hintElement = this._instantiationService.createInstance(ReplInputHintContentWidget, this._codeEditorWidget);
+		} else if (this._hintElement && shouldHide) {
+			this._hintElement.dispose();
+			this._hintElement = undefined;
 		}
-
-		this._codeEditorWidget.setDecorationsByType('interactive-decoration', DECORATION_KEY, decorations);
 	}
 
 	getScrollPosition(): IEditorPaneScrollPosition {
@@ -701,6 +683,8 @@ export class ReplEditor extends EditorPane implements IEditorPaneWithScrolling {
 				this._notebookWidget.value.onWillHide();
 			}
 		}
+
+		this._updateInputHint();
 	}
 
 	override clearInput() {
diff --git a/src/vs/workbench/contrib/replNotebook/browser/replEditorInput.ts b/src/vs/workbench/contrib/replNotebook/browser/replEditorInput.ts
index bf82d590a26..1e61f74a279 100644
--- a/src/vs/workbench/contrib/replNotebook/browser/replEditorInput.ts
+++ b/src/vs/workbench/contrib/replNotebook/browser/replEditorInput.ts
@@ -14,8 +14,8 @@ import { ILabelService } from 'vs/platform/label/common/label';
 import { EditorInputCapabilities } from 'vs/workbench/common/editor';
 import { IInteractiveHistoryService } from 'vs/workbench/contrib/interactive/browser/interactiveHistoryService';
 import { NotebookTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookTextModel';
-import { NotebookSetting } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { NotebookEditorInput } from 'vs/workbench/contrib/notebook/common/notebookEditorInput';
+import { CellEditType, CellKind, NotebookSetting } from 'vs/workbench/contrib/notebook/common/notebookCommon';
+import { ICompositeNotebookEditorInput, NotebookEditorInput } from 'vs/workbench/contrib/notebook/common/notebookEditorInput';
 import { INotebookEditorModelResolverService } from 'vs/workbench/contrib/notebook/common/notebookEditorModelResolverService';
 import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
 import { ICustomEditorLabelService } from 'vs/workbench/services/editor/common/customEditorLabelService';
@@ -23,15 +23,17 @@ import { IEditorService } from 'vs/workbench/services/editor/common/editorServic
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
 import { IFilesConfigurationService } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService';
 
-export class ReplEditorInput extends NotebookEditorInput {
+export class ReplEditorInput extends NotebookEditorInput implements ICompositeNotebookEditorInput {
 	static override ID: string = 'workbench.editorinputs.replEditorInput';
 
 	private inputModelRef: IReference<IResolvedTextEditorModel> | undefined;
 	private isScratchpad: boolean;
+	private label: string;
 	private isDisposing = false;
 
 	constructor(
 		resource: URI,
+		label: string | undefined,
 		@INotebookService _notebookService: INotebookService,
 		@INotebookEditorModelResolverService _notebookModelResolverService: INotebookEditorModelResolverService,
 		@IFileDialogService _fileDialogService: IFileDialogService,
@@ -47,15 +49,40 @@ export class ReplEditorInput extends NotebookEditorInput {
 		@IConfigurationService configurationService: IConfigurationService
 	) {
 		super(resource, undefined, 'jupyter-notebook', {}, _notebookService, _notebookModelResolverService, _fileDialogService, labelService, fileService, filesConfigurationService, extensionService, editorService, textResourceConfigurationService, customEditorLabelService);
-		this.isScratchpad = configurationService.getValue<boolean>(NotebookSetting.InteractiveWindowPromptToSave) !== true;
+		this.isScratchpad = resource.scheme === 'untitled' && configurationService.getValue<boolean>(NotebookSetting.InteractiveWindowPromptToSave) !== true;
+		this.label = label ?? this.createEditorLabel(resource);
+	}
+
+	private createEditorLabel(resource: URI | undefined): string {
+		if (!resource) {
+			return 'REPL';
+		}
+
+		if (resource.scheme === 'untitled') {
+			const match = new RegExp('Untitled-(\\d+)\.').exec(resource.path);
+			if (match?.length === 2) {
+				return `REPL - ${match[1]}`;
+			}
+		}
+
+		const filename = resource.path.split('/').pop();
+		return filename ? `REPL - ${filename}` : 'REPL';
 	}
 
 	override get typeId(): string {
 		return ReplEditorInput.ID;
 	}
 
+	override get editorId(): string | undefined {
+		return 'repl';
+	}
+
 	override getName() {
-		return 'REPL';
+		return this.label;
+	}
+
+	get editorInputs() {
+		return [this];
 	}
 
 	override get capabilities() {
@@ -67,12 +94,47 @@ export class ReplEditorInput extends NotebookEditorInput {
 			| scratchPad;
 	}
 
+	override async resolve() {
+		const model = await super.resolve();
+		if (model) {
+			await this.ensureInputBoxCell(model.notebook);
+		}
+
+		return model;
+	}
+
+	private async ensureInputBoxCell(notebook: NotebookTextModel) {
+		const lastCell = notebook.cells[notebook.cells.length - 1];
+
+		if (!lastCell || lastCell.cellKind === CellKind.Markup || lastCell.outputs.length > 0 || lastCell.internalMetadata.executionOrder !== undefined) {
+			notebook.applyEdits([
+				{
+					editType: CellEditType.Replace,
+					index: notebook.cells.length,
+					count: 0,
+					cells: [
+						{
+							cellKind: CellKind.Code,
+							language: 'python',
+							mime: undefined,
+							outputs: [],
+							source: ''
+						}
+					]
+				}
+			], true, undefined, () => undefined, undefined, false);
+		}
+	}
+
 	async resolveInput(notebook: NotebookTextModel) {
 		if (this.inputModelRef) {
 			return this.inputModelRef.object.textEditorModel;
 		}
-
 		const lastCell = notebook.cells[notebook.cells.length - 1];
+		if (!lastCell) {
+			throw new Error('The REPL editor requires at least one cell for the input box.');
+		}
+
 		this.inputModelRef = await this._textModelService.createModelReference(lastCell.uri);
 		return this.inputModelRef.object.textEditorModel;
 	}
diff --git a/src/vs/workbench/contrib/scm/browser/media/scm.css b/src/vs/workbench/contrib/scm/browser/media/scm.css
index 343c068d912..9af24908298 100644
--- a/src/vs/workbench/contrib/scm/browser/media/scm.css
+++ b/src/vs/workbench/contrib/scm/browser/media/scm.css
@@ -549,3 +549,63 @@
 .monaco-hover.history-item-hover .markdown-hover .hover-contents:not(.code-hover-contents):not(.html-hover-contents) span:not(.codicon) {
 	margin-bottom: 0 !important;
 }
+
+/* Graph */
+
+.scm-history-view .scm-provider .label-name {
+	font-weight: bold;
+}
+
+.scm-history-view .scm-provider .monaco-icon-label {
+	align-items: center;
+}
+
+.scm-history-view .scm-provider .state-label.monaco-count-badge.long {
+	display: flex;
+	font-size: 0.8em;
+	margin: 0 10px;
+	color: var(--vscode-debugView-stateLabelForeground);
+	background: var(--vscode-debugView-stateLabelBackground);
+	border-radius: 2px;
+}
+
+.scm-history-view .scm-provider .actions {
+	display: flex;
+	flex-grow: 1;
+}
+
+.scm-history-view .history-item-load-more {
+	display: flex;
+	height: 22px;
+}
+
+.scm-history-view .history-item-load-more .graph-placeholder {
+	mask-image: linear-gradient(black, transparent);
+}
+
+.scm-history-view .history-item-load-more .history-item-placeholder {
+	flex-grow: 1;
+}
+
+.scm-history-view .history-item-load-more .history-item-placeholder .monaco-highlighted-label {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	color: var(--vscode-textLink-foreground)
+}
+
+.scm-history-view .history-item-load-more .history-item-placeholder .monaco-highlighted-label .codicon {
+	font-size: 12px;
+	color: var(--vscode-textLink-foreground)
+}
+
+.scm-history-view .history-item-load-more .history-item-placeholder.shimmer {
+	padding: 2px 0;
+}
+
+.scm-history-view .history-item-load-more .history-item-placeholder.shimmer .monaco-icon-label-container {
+	height: 18px;
+	background: var(--vscode-scm-historyItemStatisticsBorder);
+	border-radius: 2px;
+	opacity: 0.5;
+}
diff --git a/src/vs/workbench/contrib/scm/browser/scm.contribution.ts b/src/vs/workbench/contrib/scm/browser/scm.contribution.ts
index 5d380467e9e..892fff0ad21 100644
--- a/src/vs/workbench/contrib/scm/browser/scm.contribution.ts
+++ b/src/vs/workbench/contrib/scm/browser/scm.contribution.ts
@@ -7,7 +7,7 @@ import { localize, localize2 } from 'vs/nls';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { IWorkbenchContributionsRegistry, registerWorkbenchContribution2, Extensions as WorkbenchExtensions, WorkbenchPhase } from 'vs/workbench/common/contributions';
 import { DirtyDiffWorkbenchController } from './dirtydiffDecorator';
-import { VIEWLET_ID, ISCMService, VIEW_PANE_ID, ISCMProvider, ISCMViewService, REPOSITORIES_VIEW_PANE_ID } from 'vs/workbench/contrib/scm/common/scm';
+import { VIEWLET_ID, ISCMService, VIEW_PANE_ID, ISCMProvider, ISCMViewService, REPOSITORIES_VIEW_PANE_ID, HISTORY_VIEW_PANE_ID } from 'vs/workbench/contrib/scm/common/scm';
 import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
 import { MenuRegistry, MenuId } from 'vs/platform/actions/common/actions';
 import { SCMActiveResourceContextKeyController, SCMActiveRepositoryController } from './activity';
@@ -32,9 +32,12 @@ import { Context as SuggestContext } from 'vs/editor/contrib/suggest/browser/sug
 import { MANAGE_TRUST_COMMAND_ID, WorkspaceTrustContext } from 'vs/workbench/contrib/workspace/common/workspace';
 import { IQuickDiffService } from 'vs/workbench/contrib/scm/common/quickDiff';
 import { QuickDiffService } from 'vs/workbench/contrib/scm/common/quickDiffService';
-import { getActiveElement } from 'vs/base/browser/dom';
+import { getActiveElement, isActiveElement } from 'vs/base/browser/dom';
 import { SCMWorkingSetController } from 'vs/workbench/contrib/scm/browser/workingSet';
 import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
+import { IListService, WorkbenchList } from 'vs/platform/list/browser/listService';
+import { isSCMRepository } from 'vs/workbench/contrib/scm/browser/util';
+import { SCMHistoryViewPane } from 'vs/workbench/contrib/scm/browser/scmHistoryViewPane';
 
 ModesRegistry.registerLanguage({
 	id: 'scminput',
@@ -82,7 +85,7 @@ viewsRegistry.registerViews([{
 	ctorDescriptor: new SyncDescriptor(SCMViewPane),
 	canToggleVisibility: true,
 	canMoveView: true,
-	weight: 80,
+	weight: 40,
 	order: -999,
 	containerIcon: sourceControlViewIcon,
 	openCommandActionDescriptor: {
@@ -112,6 +115,18 @@ viewsRegistry.registerViews([{
 	containerIcon: sourceControlViewIcon
 }], viewContainer);
 
+viewsRegistry.registerViews([{
+	id: HISTORY_VIEW_PANE_ID,
+	name: localize2('source control history', "Source Control Graph"),
+	ctorDescriptor: new SyncDescriptor(SCMHistoryViewPane),
+	canToggleVisibility: true,
+	canMoveView: true,
+	weight: 40,
+	order: 2, /* https://github.com/microsoft/vscode/issues/226447 */
+	when: ContextKeyExpr.and(ContextKeyExpr.has('scm.providerCount'), ContextKeyExpr.notEquals('scm.providerCount', 0)),
+	containerIcon: sourceControlViewIcon
+}], viewContainer);
+
 Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench)
 	.registerWorkbenchContribution(SCMActiveRepositoryController, LifecyclePhase.Restored);
 
@@ -308,33 +323,6 @@ Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration).regis
 			markdownDescription: localize('showInputActionButton', "Controls whether an action button can be shown in the Source Control input."),
 			default: true
 		},
-		'scm.showIncomingChanges': {
-			type: 'string',
-			enum: ['always', 'never', 'auto'],
-			enumDescriptions: [
-				localize('scm.showIncomingChanges.always', "Always show incoming changes in the Source Control view."),
-				localize('scm.showIncomingChanges.never', "Never show incoming changes in the Source Control view."),
-				localize('scm.showIncomingChanges.auto', "Only show incoming changes in the Source Control view when any exist."),
-			],
-			description: localize('scm.showIncomingChanges', "Controls whether incoming changes are shown in the Source Control view."),
-			default: 'auto'
-		},
-		'scm.showOutgoingChanges': {
-			type: 'string',
-			enum: ['always', 'never', 'auto'],
-			enumDescriptions: [
-				localize('scm.showOutgoingChanges.always', "Always show outgoing changes in the Source Control view."),
-				localize('scm.showOutgoingChanges.never', "Never show outgoing changes in the Source Control view."),
-				localize('scm.showOutgoingChanges.auto', "Only show outgoing changes in the Source Control view when any exist."),
-			],
-			description: localize('scm.showOutgoingChanges', "Controls whether outgoing changes are shown in the Source Control view."),
-			default: 'auto'
-		},
-		'scm.showChangesSummary': {
-			type: 'boolean',
-			description: localize('scm.showChangesSummary', "Controls whether the All Changes entry is shown for incoming/outgoing changes in the Source Control view."),
-			default: true
-		},
 		'scm.workingSets.enabled': {
 			type: 'boolean',
 			description: localize('scm.workingSets.enabled', "Controls whether to store editor working sets when switching between source control history item groups."),
@@ -350,9 +338,9 @@ Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration).regis
 			description: localize('scm.workingSets.default', "Controls the default working set to use when switching to a source control history item group that does not have a working set."),
 			default: 'current'
 		},
-		'scm.showHistoryGraph': {
+		'scm.compactFolders': {
 			type: 'boolean',
-			description: localize('scm.showHistoryGraph', "Controls whether to render incoming/outgoing changes using a graph in the Source Control view."),
+			description: localize('scm.compactFolders', "Controls whether the Source Control view should render folders in a compact form. In such a form, single child folders will be compressed in a combined tree element."),
 			default: true
 		}
 	}
@@ -458,12 +446,35 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 	primary: KeyMod.Alt | KeyCode.UpArrow
 });
 
-CommandsRegistry.registerCommand('scm.openInIntegratedTerminal', async (accessor, provider: ISCMProvider) => {
-	if (!provider || !provider.rootUri) {
+CommandsRegistry.registerCommand('scm.openInIntegratedTerminal', async (accessor, ...providers: ISCMProvider[]) => {
+	if (!providers || providers.length === 0) {
 		return;
 	}
 
 	const commandService = accessor.get(ICommandService);
+	const listService = accessor.get(IListService);
+
+	let provider = providers.length === 1 ? providers[0] : undefined;
+
+	if (!provider) {
+		const list = listService.lastFocusedList;
+		const element = list?.getHTMLElement();
+
+		if (list instanceof WorkbenchList && element && isActiveElement(element)) {
+			const [index] = list.getFocus();
+			const focusedElement = list.element(index);
+
+			// Source Control Repositories
+			if (isSCMRepository(focusedElement)) {
+				provider = focusedElement.provider;
+			}
+		}
+	}
+
+	if (!provider?.rootUri) {
+		return;
+	}
+
 	await commandService.executeCommand('openInIntegratedTerminal', provider.rootUri);
 });
 
diff --git a/src/vs/workbench/contrib/scm/browser/scmHistory.ts b/src/vs/workbench/contrib/scm/browser/scmHistory.ts
index e52ae7f242e..733c95f5462 100644
--- a/src/vs/workbench/contrib/scm/browser/scmHistory.ts
+++ b/src/vs/workbench/contrib/scm/browser/scmHistory.ts
@@ -12,31 +12,32 @@ import { chartsBlue, chartsGreen, chartsOrange, chartsPurple, chartsRed, chartsY
 import { asCssVariable, ColorIdentifier, registerColor } from 'vs/platform/theme/common/colorUtils';
 import { ISCMHistoryItem, ISCMHistoryItemGraphNode, ISCMHistoryItemViewModel } from 'vs/workbench/contrib/scm/common/history';
 import { rot } from 'vs/base/common/numbers';
+import { svgElem } from 'vs/base/browser/dom';
 
-const SWIMLANE_HEIGHT = 22;
-const SWIMLANE_WIDTH = 11;
+export const SWIMLANE_HEIGHT = 22;
+export const SWIMLANE_WIDTH = 11;
 const CIRCLE_RADIUS = 4;
 const SWIMLANE_CURVE_RADIUS = 5;
 
 /**
  * History graph colors (local, remote, base)
  */
-export const historyItemGroupLocal = registerColor('scm.historyGraph.historyItemGroupLocal', chartsBlue, localize('scm.historyGraph.historyItemGroupLocal', "Local history item group color."));
-export const historyItemGroupRemote = registerColor('scm.historyGraph.historyItemGroupRemote', chartsPurple, localize('scm.historyItemGroupRemote', "Remote history item group color."));
-export const historyItemGroupBase = registerColor('scm.historyGraph.historyItemGroupBase', chartsOrange, localize('scm.historyItemGroupBase', "Base history item group color."));
+export const historyItemGroupLocal = registerColor('scmGraph.historyItemGroupLocal', chartsBlue, localize('scmGraphHistoryItemGroupLocal', "Local history item group color."));
+export const historyItemGroupRemote = registerColor('scmGraph.historyItemGroupRemote', chartsPurple, localize('scmGraphHistoryItemGroupRemote', "Remote history item group color."));
+export const historyItemGroupBase = registerColor('scmGraph.historyItemGroupBase', chartsOrange, localize('scmGraphHistoryItemGroupBase', "Base history item group color."));
 
 /**
  * History item hover color
  */
-export const historyItemGroupHoverLabelForeground = registerColor('scm.historyGraph.historyItemGroupHoverLabelForeground', buttonForeground, localize('scm.historyItemGroupHoverLabelForeground', "History item group hover label foreground color."));
+export const historyItemGroupHoverLabelForeground = registerColor('scmGraph.historyItemHoverLabelForeground', buttonForeground, localize('scmGraphHistoryItemHoverLabelForeground', "History item hover label foreground color."));
 
 /**
  * History graph color registry
  */
 export const colorRegistry: ColorIdentifier[] = [
-	registerColor('scm.historyGraph.green', chartsGreen, localize('scm.historyGraph.green', "The green color used in history graph.")),
-	registerColor('scm.historyGraph.red', chartsRed, localize('scm.historyGraph.red', "The red color used in history graph.")),
-	registerColor('scm.historyGraph.yellow', chartsYellow, localize('scm.historyGraph.yellow', "The yellow color used in history graph.")),
+	registerColor('scmGraph.foreground1', chartsGreen, localize('scmGraphForeground1', "Source control graph foreground color (1).")),
+	registerColor('scmGraph.foreground2', chartsRed, localize('scmGraphForeground2', "Source control graph foreground color (2).")),
+	registerColor('scmGraph.foreground3', chartsYellow, localize('scmGraphForeground3', "Source control graph foreground color (3).")),
 ];
 
 function getLabelColorIdentifier(historyItem: ISCMHistoryItem, colorMap: Map<string, ColorIdentifier>): ColorIdentifier | undefined {
@@ -102,7 +103,8 @@ export function renderSCMHistoryItemGraph(historyItemViewModel: ISCMHistoryItemV
 	const circleIndex = inputIndex !== -1 ? inputIndex : inputSwimlanes.length;
 
 	// Circle color - use the output swimlane color if present, otherwise the input swimlane color
-	const circleColor = circleIndex < outputSwimlanes.length ? outputSwimlanes[circleIndex].color : inputSwimlanes[circleIndex].color;
+	const circleColor = circleIndex < outputSwimlanes.length ? outputSwimlanes[circleIndex].color :
+		circleIndex < inputSwimlanes.length ? inputSwimlanes[circleIndex].color : historyItemGroupLocal;
 
 	let outputSwimlaneIndex = 0;
 	for (let index = 0; index < inputSwimlanes.length; index++) {
@@ -227,6 +229,20 @@ export function renderSCMHistoryItemGraph(historyItemViewModel: ISCMHistoryItemV
 	return svg;
 }
 
+export function renderSCMHistoryGraphPlaceholder(columns: ISCMHistoryItemGraphNode[]): HTMLElement {
+	const elements = svgElem('svg', {
+		style: { height: `${SWIMLANE_HEIGHT}px`, width: `${SWIMLANE_WIDTH * (columns.length + 1)}px`, }
+	});
+
+	// Draw |
+	for (let index = 0; index < columns.length; index++) {
+		const path = drawVerticalLine(SWIMLANE_WIDTH * (index + 1), 0, SWIMLANE_HEIGHT, columns[index].color);
+		elements.root.append(path);
+	}
+
+	return elements.root;
+}
+
 export function toISCMHistoryItemViewModelArray(historyItems: ISCMHistoryItem[], colorMap = new Map<string, string>()): ISCMHistoryItemViewModel[] {
 	let colorIndex = -1;
 	const viewModels: ISCMHistoryItemViewModel[] = [];
@@ -238,10 +254,10 @@ export function toISCMHistoryItemViewModelArray(historyItems: ISCMHistoryItem[],
 		const inputSwimlanes = outputSwimlanesFromPreviousItem.map(i => deepClone(i));
 		const outputSwimlanes: ISCMHistoryItemGraphNode[] = [];
 
-		if (historyItem.parentIds.length > 0) {
-			let firstParentAdded = false;
+		let firstParentAdded = false;
 
-			// Add first parent to the output
+		// Add first parent to the output
+		if (historyItem.parentIds.length > 0) {
 			for (const node of inputSwimlanes) {
 				if (node.id === historyItem.id) {
 					if (!firstParentAdded) {
@@ -257,30 +273,30 @@ export function toISCMHistoryItemViewModelArray(historyItems: ISCMHistoryItem[],
 
 				outputSwimlanes.push(deepClone(node));
 			}
+		}
 
-			// Add unprocessed parent(s) to the output
-			for (let i = firstParentAdded ? 1 : 0; i < historyItem.parentIds.length; i++) {
-				// Color index (label -> next color)
-				let colorIdentifier: string | undefined;
-
-				if (!firstParentAdded) {
-					colorIdentifier = getLabelColorIdentifier(historyItem, colorMap);
-				} else {
-					const historyItemParent = historyItems
-						.find(h => h.id === historyItem.parentIds[i]);
-					colorIdentifier = historyItemParent ? getLabelColorIdentifier(historyItemParent, colorMap) : undefined;
-				}
+		// Add unprocessed parent(s) to the output
+		for (let i = firstParentAdded ? 1 : 0; i < historyItem.parentIds.length; i++) {
+			// Color index (label -> next color)
+			let colorIdentifier: string | undefined;
 
-				if (!colorIdentifier) {
-					colorIndex = rot(colorIndex + 1, colorRegistry.length);
-					colorIdentifier = colorRegistry[colorIndex];
-				}
+			if (!firstParentAdded) {
+				colorIdentifier = getLabelColorIdentifier(historyItem, colorMap);
+			} else {
+				const historyItemParent = historyItems
+					.find(h => h.id === historyItem.parentIds[i]);
+				colorIdentifier = historyItemParent ? getLabelColorIdentifier(historyItemParent, colorMap) : undefined;
+			}
 
-				outputSwimlanes.push({
-					id: historyItem.parentIds[i],
-					color: colorIdentifier
-				});
+			if (!colorIdentifier) {
+				colorIndex = rot(colorIndex + 1, colorRegistry.length);
+				colorIdentifier = colorRegistry[colorIndex];
 			}
+
+			outputSwimlanes.push({
+				id: historyItem.parentIds[i],
+				color: colorIdentifier
+			});
 		}
 
 		viewModels.push({
diff --git a/src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.ts b/src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.ts
new file mode 100644
index 00000000000..4805c6e286c
--- /dev/null
+++ b/src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.ts
@@ -0,0 +1,1037 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import 'vs/css!./media/scm';
+import { Event } from 'vs/base/common/event';
+import * as platform from 'vs/base/common/platform';
+import { $, append } from 'vs/base/browser/dom';
+import { IHoverOptions, IManagedHover, IManagedHoverTooltipMarkdownString } from 'vs/base/browser/ui/hover/hover';
+import { IHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegate';
+import { getDefaultHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
+import { IconLabel } from 'vs/base/browser/ui/iconLabel/iconLabel';
+import { IIdentityProvider, IKeyboardNavigationLabelProvider, IListVirtualDelegate } from 'vs/base/browser/ui/list/list';
+import { LabelFuzzyScore } from 'vs/base/browser/ui/tree/abstractTree';
+import { IAsyncDataSource, ITreeContextMenuEvent, ITreeNode, ITreeRenderer } from 'vs/base/browser/ui/tree/tree';
+import { fromNow } from 'vs/base/common/date';
+import { createMatches, FuzzyScore, IMatch } from 'vs/base/common/filters';
+import { MarkdownString } from 'vs/base/common/htmlContent';
+import { combinedDisposable, Disposable, DisposableMap, DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
+import { autorun, autorunWithStore, IObservable, ISettableObservable, observableValue } from 'vs/base/common/observable';
+import { ThemeIcon } from 'vs/base/common/themables';
+import { localize } from 'vs/nls';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { ContextKeyExpr, IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
+import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
+import { IHoverService, WorkbenchHoverDelegate } from 'vs/platform/hover/browser/hover';
+import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
+import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
+import { IOpenEvent, WorkbenchAsyncDataTree } from 'vs/platform/list/browser/listService';
+import { observableConfigValue } from 'vs/platform/observable/common/platformObservableUtils';
+import { IOpenerService } from 'vs/platform/opener/common/opener';
+import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { ColorIdentifier, registerColor } from 'vs/platform/theme/common/colorRegistry';
+import { IThemeService } from 'vs/platform/theme/common/themeService';
+import { IViewPaneOptions, ViewAction, ViewPane } from 'vs/workbench/browser/parts/views/viewPane';
+import { IViewDescriptorService, ViewContainerLocation } from 'vs/workbench/common/views';
+import { renderSCMHistoryItemGraph, historyItemGroupLocal, historyItemGroupRemote, historyItemGroupBase, historyItemGroupHoverLabelForeground, toISCMHistoryItemViewModelArray, SWIMLANE_WIDTH, renderSCMHistoryGraphPlaceholder } from 'vs/workbench/contrib/scm/browser/scmHistory';
+import { RepositoryActionRunner } from 'vs/workbench/contrib/scm/browser/scmRepositoryRenderer';
+import { collectContextMenuActions, connectPrimaryMenu, getActionViewItemProvider, isSCMHistoryItemLoadMoreTreeElement, isSCMHistoryItemViewModelTreeElement, isSCMRepository, isSCMViewService } from 'vs/workbench/contrib/scm/browser/util';
+import { ISCMHistoryItem, ISCMHistoryItemGroup, ISCMHistoryItemViewModel, SCMHistoryItemLoadMoreTreeElement, SCMHistoryItemViewModelTreeElement } from 'vs/workbench/contrib/scm/common/history';
+import { HISTORY_VIEW_PANE_ID, ISCMProvider, ISCMRepository, ISCMService, ISCMViewService, ISCMViewVisibleRepositoryChangeEvent } from 'vs/workbench/contrib/scm/common/scm';
+import { IListAccessibilityProvider } from 'vs/base/browser/ui/list/listWidget';
+import { stripIcons } from 'vs/base/common/iconLabels';
+import { IWorkbenchLayoutService, Position } from 'vs/workbench/services/layout/browser/layoutService';
+import { HoverPosition } from 'vs/base/browser/ui/hover/hoverWidget';
+import { IMenuService, MenuId, MenuItemAction, registerAction2 } from 'vs/platform/actions/common/actions';
+import { Iterable } from 'vs/base/common/iterator';
+import { Sequencer, Throttler } from 'vs/base/common/async';
+import { URI } from 'vs/base/common/uri';
+import { ICommandService } from 'vs/platform/commands/common/commands';
+import { ActionRunner, IAction, IActionRunner } from 'vs/base/common/actions';
+import { tail } from 'vs/base/common/arrays';
+import { Codicon } from 'vs/base/common/codicons';
+import { ContextKeys } from 'vs/workbench/contrib/scm/browser/scmViewPane';
+import { IActionViewItemProvider } from 'vs/base/browser/ui/actionbar/actionbar';
+import { WorkbenchToolBar } from 'vs/platform/actions/browser/toolbar';
+import { IProgressService } from 'vs/platform/progress/common/progress';
+
+const historyItemAdditionsForeground = registerColor('scmGraph.historyItemHoverAdditionsForeground', 'gitDecoration.addedResourceForeground', localize('scmGraph.HistoryItemHoverAdditionsForeground', "History item hover additions foreground color."));
+const historyItemDeletionsForeground = registerColor('scmGraph.historyItemHoverDeletionsForeground', 'gitDecoration.deletedResourceForeground', localize('scmGraph.HistoryItemHoverDeletionsForeground', "History item hover deletions foreground color."));
+
+type TreeElement = ISCMRepository | SCMHistoryItemViewModelTreeElement | SCMHistoryItemLoadMoreTreeElement;
+
+registerAction2(class extends ViewAction<SCMHistoryViewPane> {
+	constructor() {
+		super({
+			id: 'workbench.scm.action.refreshGraph',
+			title: localize('refreshGraph', "Refresh"),
+			viewId: HISTORY_VIEW_PANE_ID,
+			f1: false,
+			icon: Codicon.refresh,
+			menu: {
+				id: MenuId.SCMHistoryTitle,
+				when: ContextKeyExpr.or(
+					ContextKeyExpr.has('scmRepository'),
+					ContextKeyExpr.and(ContextKeys.RepositoryVisibilityCount.isEqualTo(1), ContextKeyExpr.equals('config.scm.alwaysShowRepositories', false))
+				),
+				group: 'navigation',
+				order: 1000
+			}
+		});
+	}
+
+	async runInView(accessor: ServicesAccessor, view: SCMHistoryViewPane, provider?: ISCMProvider): Promise<void> {
+		const scmService = accessor.get<ISCMService>(ISCMService);
+		const repository = provider ? scmService.getRepository(provider.id) : undefined;
+
+		view.refresh(repository);
+	}
+});
+
+class ListDelegate implements IListVirtualDelegate<TreeElement> {
+
+	getHeight(): number {
+		return 22;
+	}
+
+	getTemplateId(element: TreeElement): string {
+		if (isSCMRepository(element)) {
+			return RepositoryRenderer.TEMPLATE_ID;
+		} else if (isSCMHistoryItemViewModelTreeElement(element)) {
+			return HistoryItemRenderer.TEMPLATE_ID;
+		} else if (isSCMHistoryItemLoadMoreTreeElement(element)) {
+			return HistoryItemLoadMoreRenderer.TEMPLATE_ID;
+		} else {
+			throw new Error('Unknown element');
+		}
+	}
+}
+
+interface RepositoryTemplate {
+	readonly label: IconLabel;
+	readonly labelCustomHover: IManagedHover;
+	readonly stateLabel: HTMLElement;
+	readonly toolBar: WorkbenchToolBar;
+	readonly elementDisposables: DisposableStore;
+	readonly templateDisposable: IDisposable;
+}
+
+class RepositoryRenderer implements ITreeRenderer<ISCMRepository, FuzzyScore, RepositoryTemplate> {
+
+	static readonly TEMPLATE_ID = 'repository';
+	get templateId(): string { return RepositoryRenderer.TEMPLATE_ID; }
+
+	constructor(
+		private readonly description: (repository: ISCMRepository) => IObservable<string>,
+		private readonly actionRunner: IActionRunner,
+		private readonly actionViewItemProvider: IActionViewItemProvider,
+		@ICommandService private commandService: ICommandService,
+		@IContextKeyService private contextKeyService: IContextKeyService,
+		@IContextMenuService private contextMenuService: IContextMenuService,
+		@IHoverService private hoverService: IHoverService,
+		@IKeybindingService private keybindingService: IKeybindingService,
+		@IMenuService private menuService: IMenuService,
+		@ITelemetryService private telemetryService: ITelemetryService
+	) { }
+
+	renderTemplate(container: HTMLElement): RepositoryTemplate {
+		// hack
+		if (container.classList.contains('monaco-tl-contents')) {
+			(container.parentElement!.parentElement!.querySelector('.monaco-tl-twistie')! as HTMLElement).classList.add('force-twistie');
+		}
+
+		const element = append(container, $('.scm-provider'));
+		const label = new IconLabel(element);
+		const labelCustomHover = this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), label.element, '', {});
+		const stateLabel = append(element, $('div.state-label.monaco-count-badge.long'));
+		const toolBar = new WorkbenchToolBar(append(element, $('.actions')), { actionRunner: this.actionRunner, actionViewItemProvider: this.actionViewItemProvider, resetMenu: MenuId.SCMHistoryTitle }, this.menuService, this.contextKeyService, this.contextMenuService, this.keybindingService, this.commandService, this.telemetryService);
+
+		return { label, labelCustomHover, stateLabel, toolBar, elementDisposables: new DisposableStore(), templateDisposable: combinedDisposable(labelCustomHover, toolBar) };
+	}
+
+	renderElement(arg: ISCMRepository | ITreeNode<ISCMRepository, FuzzyScore>, index: number, templateData: RepositoryTemplate, height: number | undefined): void {
+		const repository = isSCMRepository(arg) ? arg : arg.element;
+
+		templateData.elementDisposables.add(autorun(reader => {
+			const description = this.description(repository).read(reader);
+			templateData.stateLabel.style.display = description !== '' ? '' : 'none';
+			templateData.stateLabel.textContent = description;
+		}));
+
+		templateData.label.setLabel(repository.provider.name);
+		templateData.labelCustomHover.update(repository.provider.rootUri ? `${repository.provider.label}: ${repository.provider.rootUri.fsPath}` : repository.provider.label);
+
+		templateData.elementDisposables.add(autorunWithStore((reader, store) => {
+			const currentHistoryItemGroup = repository.provider.historyProvider.read(reader)?.currentHistoryItemGroup.read(reader);
+			if (!currentHistoryItemGroup) {
+				templateData.toolBar.setActions([], []);
+				return;
+			}
+
+			const contextKeyService = this.contextKeyService.createOverlay([
+				['scmRepository', repository.id],
+				['scmProvider', repository.provider.contextValue],
+				['scmHistoryItemGroupHasRemote', !!currentHistoryItemGroup.remote],
+			]);
+			const menu = this.menuService.createMenu(MenuId.SCMHistoryTitle, contextKeyService);
+			store.add(connectPrimaryMenu(menu, (primary, secondary) => {
+				templateData.toolBar.setActions(primary, secondary);
+			}));
+		}));
+
+		templateData.toolBar.context = repository.provider;
+	}
+
+	disposeElement(group: ISCMRepository | ITreeNode<ISCMRepository, FuzzyScore>, index: number, template: RepositoryTemplate): void {
+		template.elementDisposables.clear();
+	}
+
+	disposeTemplate(templateData: RepositoryTemplate): void {
+		templateData.elementDisposables.dispose();
+		templateData.templateDisposable.dispose();
+	}
+}
+
+interface HistoryItemTemplate {
+	readonly element: HTMLElement;
+	readonly label: IconLabel;
+	readonly graphContainer: HTMLElement;
+	readonly labelContainer: HTMLElement;
+	readonly elementDisposables: DisposableStore;
+	readonly disposables: IDisposable;
+}
+
+class HistoryItemRenderer implements ITreeRenderer<SCMHistoryItemViewModelTreeElement, LabelFuzzyScore, HistoryItemTemplate> {
+
+	static readonly TEMPLATE_ID = 'history-item';
+	get templateId(): string { return HistoryItemRenderer.TEMPLATE_ID; }
+
+	constructor(
+		private readonly hoverDelegate: IHoverDelegate,
+		@IHoverService private readonly hoverService: IHoverService,
+		@IThemeService private readonly themeService: IThemeService
+	) { }
+
+	renderTemplate(container: HTMLElement): HistoryItemTemplate {
+		// hack
+		(container.parentElement!.parentElement!.querySelector('.monaco-tl-twistie')! as HTMLElement).classList.add('force-no-twistie');
+
+		const element = append(container, $('.history-item'));
+		const graphContainer = append(element, $('.graph-container'));
+		const iconLabel = new IconLabel(element, { supportIcons: true, supportHighlights: true, supportDescriptionHighlights: true });
+
+		const labelContainer = append(element, $('.label-container'));
+		element.appendChild(labelContainer);
+
+		return { element, graphContainer, label: iconLabel, labelContainer, elementDisposables: new DisposableStore(), disposables: new DisposableStore() };
+	}
+
+	renderElement(node: ITreeNode<SCMHistoryItemViewModelTreeElement, LabelFuzzyScore>, index: number, templateData: HistoryItemTemplate, height: number | undefined): void {
+		const historyItemViewModel = node.element.historyItemViewModel;
+		const historyItem = historyItemViewModel.historyItem;
+
+		const historyItemHover = this.hoverService.setupManagedHover(this.hoverDelegate, templateData.element, this.getTooltip(node.element));
+		templateData.elementDisposables.add(historyItemHover);
+
+		templateData.graphContainer.textContent = '';
+		templateData.graphContainer.appendChild(renderSCMHistoryItemGraph(historyItemViewModel));
+
+		const [matches, descriptionMatches] = this.processMatches(historyItemViewModel, node.filterData);
+		templateData.label.setLabel(historyItem.message, historyItem.author, { matches, descriptionMatches });
+
+		templateData.labelContainer.textContent = '';
+		if (historyItem.labels) {
+			// Get lits of labels to render (current, remote, base)
+			const labels = this.getLabels(node.element.repository);
+
+			for (const label of historyItem.labels) {
+				if (label.icon && ThemeIcon.isThemeIcon(label.icon) && labels.includes(label.title)) {
+					const icon = append(templateData.labelContainer, $('div.label'));
+					icon.classList.add(...ThemeIcon.asClassNameArray(label.icon));
+				}
+			}
+		}
+	}
+
+	private getLabels(repository: ISCMRepository): string[] {
+		const currentHistoryItemGroup = repository.provider.historyProvider.get()?.currentHistoryItemGroup.get();
+		if (!currentHistoryItemGroup) {
+			return [];
+		}
+
+		return [
+			currentHistoryItemGroup.name,
+			currentHistoryItemGroup.remote?.name,
+			currentHistoryItemGroup.base?.name]
+			.filter(l => l !== undefined);
+	}
+
+	private getTooltip(element: SCMHistoryItemViewModelTreeElement): IManagedHoverTooltipMarkdownString {
+		const colorTheme = this.themeService.getColorTheme();
+		const historyItem = element.historyItemViewModel.historyItem;
+		const currentHistoryItemGroup = element.repository.provider.historyProvider.get()?.currentHistoryItemGroup?.get();
+
+		const markdown = new MarkdownString('', { isTrusted: true, supportThemeIcons: true });
+
+		if (historyItem.author) {
+			markdown.appendMarkdown(`$(account) **${historyItem.author}**`);
+
+			if (historyItem.timestamp) {
+				const dateFormatter = new Intl.DateTimeFormat(platform.language, { year: 'numeric', month: 'long', day: 'numeric', hour: 'numeric', minute: 'numeric' });
+				markdown.appendMarkdown(`, $(history) ${fromNow(historyItem.timestamp, true, true)} (${dateFormatter.format(historyItem.timestamp)})`);
+			}
+
+			markdown.appendMarkdown('\n\n');
+		}
+
+		markdown.appendMarkdown(`${historyItem.message}\n\n`);
+
+		if (historyItem.statistics) {
+			markdown.appendMarkdown(`---\n\n`);
+
+			markdown.appendMarkdown(`<span>${historyItem.statistics.files === 1 ?
+				localize('fileChanged', "{0} file changed", historyItem.statistics.files) :
+				localize('filesChanged', "{0} files changed", historyItem.statistics.files)}</span>`);
+
+			if (historyItem.statistics.insertions) {
+				const historyItemAdditionsForegroundColor = colorTheme.getColor(historyItemAdditionsForeground);
+				markdown.appendMarkdown(`,&nbsp;<span style="color:${historyItemAdditionsForegroundColor};">${historyItem.statistics.insertions === 1 ?
+					localize('insertion', "{0} insertion{1}", historyItem.statistics.insertions, '(+)') :
+					localize('insertions', "{0} insertions{1}", historyItem.statistics.insertions, '(+)')}</span>`);
+			}
+
+			if (historyItem.statistics.deletions) {
+				const historyItemDeletionsForegroundColor = colorTheme.getColor(historyItemDeletionsForeground);
+				markdown.appendMarkdown(`,&nbsp;<span style="color:${historyItemDeletionsForegroundColor};">${historyItem.statistics.deletions === 1 ?
+					localize('deletion', "{0} deletion{1}", historyItem.statistics.deletions, '(-)') :
+					localize('deletions', "{0} deletions{1}", historyItem.statistics.deletions, '(-)')}</span>`);
+			}
+		}
+
+		const labels = this.getLabels(element.repository);
+		const historyItemLabels = (historyItem.labels ?? [])
+			.filter(l => labels.includes(l.title));
+
+		if (historyItemLabels.length > 0) {
+			const historyItemGroupLocalColor = colorTheme.getColor(historyItemGroupLocal);
+			const historyItemGroupRemoteColor = colorTheme.getColor(historyItemGroupRemote);
+			const historyItemGroupBaseColor = colorTheme.getColor(historyItemGroupBase);
+
+			const historyItemGroupHoverLabelForegroundColor = colorTheme.getColor(historyItemGroupHoverLabelForeground);
+
+			markdown.appendMarkdown(`\n\n---\n\n`);
+			markdown.appendMarkdown(historyItemLabels.map(label => {
+				const historyItemGroupHoverLabelBackgroundColor =
+					label.title === currentHistoryItemGroup?.name ? historyItemGroupLocalColor :
+						label.title === currentHistoryItemGroup?.remote?.name ? historyItemGroupRemoteColor :
+							label.title === currentHistoryItemGroup?.base?.name ? historyItemGroupBaseColor :
+								undefined;
+
+				const historyItemGroupHoverLabelIconId = ThemeIcon.isThemeIcon(label.icon) ? label.icon.id : '';
+
+				return `<span style="color:${historyItemGroupHoverLabelForegroundColor};background-color:${historyItemGroupHoverLabelBackgroundColor};border-radius:2px;">&nbsp;$(${historyItemGroupHoverLabelIconId})&nbsp;${label.title}&nbsp;</span>`;
+			}).join('&nbsp;&nbsp;'));
+		}
+
+		return { markdown, markdownNotSupportedFallback: historyItem.message };
+	}
+
+	private processMatches(historyItemViewModel: ISCMHistoryItemViewModel, filterData: LabelFuzzyScore | undefined): [IMatch[] | undefined, IMatch[] | undefined] {
+		if (!filterData) {
+			return [undefined, undefined];
+		}
+
+		return [
+			historyItemViewModel.historyItem.message === filterData.label ? createMatches(filterData.score) : undefined,
+			historyItemViewModel.historyItem.author === filterData.label ? createMatches(filterData.score) : undefined
+		];
+	}
+
+	disposeElement(element: ITreeNode<SCMHistoryItemViewModelTreeElement, LabelFuzzyScore>, index: number, templateData: HistoryItemTemplate, height: number | undefined): void {
+		templateData.elementDisposables.clear();
+	}
+
+	disposeTemplate(templateData: HistoryItemTemplate): void {
+		templateData.disposables.dispose();
+	}
+}
+
+interface LoadMoreTemplate {
+	readonly element: HTMLElement;
+	readonly graphPlaceholder: HTMLElement;
+	readonly historyItemPlaceholderContainer: HTMLElement;
+	readonly historyItemPlaceholderLabel: IconLabel;
+	readonly elementDisposables: DisposableStore;
+	readonly disposables: IDisposable;
+}
+
+class HistoryItemLoadMoreRenderer implements ITreeRenderer<SCMHistoryItemLoadMoreTreeElement, void, LoadMoreTemplate> {
+
+	static readonly TEMPLATE_ID = 'historyItemLoadMore';
+	get templateId(): string { return HistoryItemLoadMoreRenderer.TEMPLATE_ID; }
+
+	constructor(
+		private readonly _loadingMore: (repository: ISCMRepository) => IObservable<boolean>,
+		private readonly _loadMoreCallback: (repository: ISCMRepository) => void,
+		@IConfigurationService private readonly _configurationService: IConfigurationService,
+		@ISCMViewService private readonly _scmViewService: ISCMViewService) { }
+
+	renderTemplate(container: HTMLElement): LoadMoreTemplate {
+		// hack
+		(container.parentElement!.parentElement!.querySelector('.monaco-tl-twistie')! as HTMLElement).classList.add('force-no-twistie');
+
+		const element = append(container, $('.history-item-load-more'));
+		const graphPlaceholder = append(element, $('.graph-placeholder'));
+		const historyItemPlaceholderContainer = append(element, $('.history-item-placeholder'));
+		const historyItemPlaceholderLabel = new IconLabel(historyItemPlaceholderContainer, { supportIcons: true });
+
+		return { element, graphPlaceholder, historyItemPlaceholderContainer, historyItemPlaceholderLabel, elementDisposables: new DisposableStore(), disposables: new DisposableStore() };
+	}
+
+	renderElement(element: ITreeNode<SCMHistoryItemLoadMoreTreeElement, void>, index: number, templateData: LoadMoreTemplate, height: number | undefined): void {
+		const repositoryCount = this._scmViewService.visibleRepositories.length;
+		const alwaysShowRepositories = this._configurationService.getValue<boolean>('scm.alwaysShowRepositories') === true;
+
+		templateData.graphPlaceholder.textContent = '';
+		templateData.graphPlaceholder.style.width = `${SWIMLANE_WIDTH * (element.element.graphColumns.length + 1)}px`;
+		templateData.graphPlaceholder.appendChild(renderSCMHistoryGraphPlaceholder(element.element.graphColumns));
+
+		templateData.historyItemPlaceholderContainer.classList.toggle('shimmer', repositoryCount === 1 && !alwaysShowRepositories);
+
+		if (repositoryCount > 1 || alwaysShowRepositories) {
+			templateData.elementDisposables.add(autorun(reader => {
+				const loadingMore = this._loadingMore(element.element.repository).read(reader);
+				const icon = `$(${loadingMore ? 'loading~spin' : 'fold-down'})`;
+
+				templateData.historyItemPlaceholderLabel.setLabel(localize('loadMore', "{0} Load More...", icon));
+			}));
+		} else {
+			templateData.historyItemPlaceholderLabel.setLabel('');
+			this._loadMoreCallback(element.element.repository);
+		}
+	}
+
+	disposeTemplate(templateData: LoadMoreTemplate): void {
+		templateData.disposables.dispose();
+	}
+}
+
+class HistoryItemActionRunner extends ActionRunner {
+	constructor(private readonly getSelectedHistoryItems: () => SCMHistoryItemViewModelTreeElement[]) {
+		super();
+	}
+
+	protected override async runAction(action: IAction, context: SCMHistoryItemViewModelTreeElement): Promise<any> {
+		if (!(action instanceof MenuItemAction)) {
+			return super.runAction(action, context);
+		}
+
+		const args: (ISCMProvider | ISCMHistoryItem)[] = [];
+		args.push(context.repository.provider);
+
+		const selection = this.getSelectedHistoryItems();
+		const contextIsSelected = selection.some(s => s === context);
+		if (contextIsSelected && selection.length > 1) {
+			args.push(...selection.map(h => (
+				{
+					id: h.historyItemViewModel.historyItem.id,
+					parentIds: h.historyItemViewModel.historyItem.parentIds,
+					message: h.historyItemViewModel.historyItem.message,
+					author: h.historyItemViewModel.historyItem.author,
+					icon: h.historyItemViewModel.historyItem.icon,
+					timestamp: h.historyItemViewModel.historyItem.timestamp,
+					statistics: h.historyItemViewModel.historyItem.statistics,
+				} satisfies ISCMHistoryItem)));
+		} else {
+			args.push({
+				id: context.historyItemViewModel.historyItem.id,
+				parentIds: context.historyItemViewModel.historyItem.parentIds,
+				message: context.historyItemViewModel.historyItem.message,
+				author: context.historyItemViewModel.historyItem.author,
+				icon: context.historyItemViewModel.historyItem.icon,
+				timestamp: context.historyItemViewModel.historyItem.timestamp,
+				statistics: context.historyItemViewModel.historyItem.statistics,
+			} satisfies ISCMHistoryItem);
+		}
+
+		await action.run(...args);
+	}
+}
+
+class HistoryItemHoverDelegate extends WorkbenchHoverDelegate {
+	constructor(
+		private readonly _viewContainerLocation: ViewContainerLocation | null,
+		@IWorkbenchLayoutService private readonly layoutService: IWorkbenchLayoutService,
+		@IConfigurationService configurationService: IConfigurationService,
+		@IHoverService hoverService: IHoverService,
+
+	) {
+		super('element', true, () => this.getHoverOptions(), configurationService, hoverService);
+	}
+
+	private getHoverOptions(): Partial<IHoverOptions> {
+		const sideBarPosition = this.layoutService.getSideBarPosition();
+
+		let hoverPosition: HoverPosition;
+		if (this._viewContainerLocation === ViewContainerLocation.Sidebar) {
+			hoverPosition = sideBarPosition === Position.LEFT ? HoverPosition.RIGHT : HoverPosition.LEFT;
+		} else if (this._viewContainerLocation === ViewContainerLocation.AuxiliaryBar) {
+			hoverPosition = sideBarPosition === Position.LEFT ? HoverPosition.LEFT : HoverPosition.RIGHT;
+		} else {
+			hoverPosition = HoverPosition.RIGHT;
+		}
+
+		return { additionalClasses: ['history-item-hover'], position: { hoverPosition, forcePosition: true } };
+	}
+}
+
+class SCMHistoryViewPaneActionRunner extends ActionRunner {
+	constructor(@IProgressService private readonly _progressService: IProgressService) {
+		super();
+	}
+
+	protected override runAction(action: IAction, context?: unknown): Promise<void> {
+		return this._progressService.withProgress({ location: HISTORY_VIEW_PANE_ID },
+			async () => await super.runAction(action, context));
+	}
+}
+
+class SCMHistoryTreeAccessibilityProvider implements IListAccessibilityProvider<TreeElement> {
+
+	getWidgetAriaLabel(): string {
+		return localize('scm history', "Source Control History");
+	}
+
+	getAriaLabel(element: TreeElement): string {
+		if (isSCMRepository(element)) {
+			return `${element.provider.name} ${element.provider.label}`;
+		} else if (isSCMHistoryItemViewModelTreeElement(element)) {
+			const historyItem = element.historyItemViewModel.historyItem;
+			return `${stripIcons(historyItem.message).trim()}${historyItem.author ? `, ${historyItem.author}` : ''}`;
+		} else {
+			return '';
+		}
+	}
+}
+
+class SCMHistoryTreeIdentityProvider implements IIdentityProvider<TreeElement> {
+
+	getId(element: TreeElement): string {
+		if (isSCMRepository(element)) {
+			const provider = element.provider;
+			return `repo:${provider.id}`;
+		} else if (isSCMHistoryItemViewModelTreeElement(element)) {
+			const provider = element.repository.provider;
+			const historyItem = element.historyItemViewModel.historyItem;
+			return `historyItem:${provider.id}/${historyItem.id}/${historyItem.parentIds.join(',')}`;
+		} else if (isSCMHistoryItemLoadMoreTreeElement(element)) {
+			const provider = element.repository.provider;
+			return `historyItemLoadMore:${provider.id}}`;
+		} else {
+			throw new Error('Invalid tree element');
+		}
+	}
+}
+
+class SCMHistoryTreeKeyboardNavigationLabelProvider implements IKeyboardNavigationLabelProvider<TreeElement> {
+	getKeyboardNavigationLabel(element: TreeElement): { toString(): string } | { toString(): string }[] | undefined {
+		if (isSCMRepository(element)) {
+			return undefined;
+		} else if (isSCMHistoryItemViewModelTreeElement(element)) {
+			// For a history item we want to match both the message and
+			// the author. A match in the message takes precedence over
+			// a match in the author.
+			return [element.historyItemViewModel.historyItem.message, element.historyItemViewModel.historyItem.author];
+		} else if (isSCMHistoryItemLoadMoreTreeElement(element)) {
+			// We don't want to match the load more element
+			return '';
+		} else {
+			throw new Error('Invalid tree element');
+		}
+	}
+}
+
+type HistoryItemState = { currentHistoryItemGroup: ISCMHistoryItemGroup; items: ISCMHistoryItem[]; loadMore: boolean };
+
+class SCMHistoryTreeDataSource extends Disposable implements IAsyncDataSource<ISCMViewService, TreeElement> {
+	private readonly _state = new Map<ISCMRepository, HistoryItemState>();
+
+	constructor(
+		@IConfigurationService private readonly _configurationService: IConfigurationService,
+		@ISCMViewService private readonly _scmViewService: ISCMViewService
+	) {
+		super();
+	}
+
+	async getChildren(inputOrElement: ISCMViewService | TreeElement): Promise<Iterable<TreeElement>> {
+		const repositoryCount = this._scmViewService.visibleRepositories.length;
+		const alwaysShowRepositories = this._configurationService.getValue<boolean>('scm.alwaysShowRepositories') === true;
+
+		if (isSCMViewService(inputOrElement) && (repositoryCount > 1 || alwaysShowRepositories)) {
+			return this._scmViewService.visibleRepositories;
+		} else if ((isSCMViewService(inputOrElement) && repositoryCount === 1 && !alwaysShowRepositories) || isSCMRepository(inputOrElement)) {
+			const children: TreeElement[] = [];
+			inputOrElement = isSCMRepository(inputOrElement) ? inputOrElement : this._scmViewService.visibleRepositories[0];
+
+			const historyItems = await this._getHistoryItems(inputOrElement);
+			children.push(...historyItems);
+
+			const lastHistoryItem = tail(historyItems);
+			if (lastHistoryItem && lastHistoryItem.historyItemViewModel.outputSwimlanes.length > 0) {
+				children.push({
+					repository: inputOrElement,
+					graphColumns: lastHistoryItem.historyItemViewModel.outputSwimlanes,
+					type: 'historyItemLoadMore'
+				} satisfies SCMHistoryItemLoadMoreTreeElement);
+			}
+
+			return children;
+		}
+		return [];
+	}
+
+	hasChildren(inputOrElement: ISCMViewService | TreeElement): boolean {
+		if (isSCMViewService(inputOrElement)) {
+			return this._scmViewService.visibleRepositories.length !== 0;
+		} else if (isSCMRepository(inputOrElement)) {
+			return true;
+		} else if (isSCMHistoryItemViewModelTreeElement(inputOrElement)) {
+			return false;
+		} else if (isSCMHistoryItemLoadMoreTreeElement(inputOrElement)) {
+			return false;
+		} else {
+			throw new Error('hasChildren not implemented.');
+		}
+	}
+
+	clearState(repository?: ISCMRepository): void {
+		if (!repository) {
+			this._state.clear();
+			return;
+		}
+
+		this._state.delete(repository);
+	}
+
+	loadMore(repository: ISCMRepository): void {
+		const state = this._state.get(repository);
+		if (!state) {
+			return;
+		}
+
+		this._state.set(repository, { ...state, loadMore: true });
+	}
+
+	private async _getHistoryItems(element: ISCMRepository): Promise<SCMHistoryItemViewModelTreeElement[]> {
+		let state = this._state.get(element);
+		const historyProvider = element.provider.historyProvider.get();
+		const currentHistoryItemGroup = state?.currentHistoryItemGroup ?? historyProvider?.currentHistoryItemGroup.get();
+
+		if (!historyProvider || !currentHistoryItemGroup) {
+			return [];
+		}
+
+		if (!state || state.loadMore) {
+			const historyItemGroupIds = [
+				currentHistoryItemGroup.revision ?? currentHistoryItemGroup.id,
+				...currentHistoryItemGroup.remote ? [currentHistoryItemGroup.remote.revision ?? currentHistoryItemGroup.remote.id] : [],
+				...currentHistoryItemGroup.base ? [currentHistoryItemGroup.base.revision ?? currentHistoryItemGroup.base.id] : [],
+			];
+
+			const existingHistoryItems = state?.items ?? [];
+			const historyItems = await historyProvider.provideHistoryItems2({
+				historyItemGroupIds, limit: 50, skip: existingHistoryItems.length
+			}) ?? [];
+
+			state = {
+				currentHistoryItemGroup,
+				items: [...existingHistoryItems, ...historyItems],
+				loadMore: false
+			};
+
+			this._state.set(element, state);
+		}
+
+		// Create the color map
+		const colorMap = new Map<string, ColorIdentifier>([
+			[currentHistoryItemGroup.name, historyItemGroupLocal]
+		]);
+		if (currentHistoryItemGroup.remote) {
+			colorMap.set(currentHistoryItemGroup.remote.name, historyItemGroupRemote);
+		}
+		if (currentHistoryItemGroup.base) {
+			colorMap.set(currentHistoryItemGroup.base.name, historyItemGroupBase);
+		}
+
+		return toISCMHistoryItemViewModelArray(state.items, colorMap)
+			.map(historyItemViewModel => ({
+				repository: element,
+				historyItemViewModel,
+				type: 'historyItem2'
+			}) satisfies SCMHistoryItemViewModelTreeElement);
+	}
+
+	override dispose(): void {
+		this._state.clear();
+		super.dispose();
+	}
+}
+
+export class SCMHistoryViewPane extends ViewPane {
+
+	private _treeContainer!: HTMLElement;
+	private _tree!: WorkbenchAsyncDataTree<ISCMViewService, TreeElement, FuzzyScore>;
+	private _treeDataSource!: SCMHistoryTreeDataSource;
+	private _treeIdentityProvider!: SCMHistoryTreeIdentityProvider;
+	private _repositoryDescription = new Map<ISCMRepository, ISettableObservable<string>>();
+	private _repositoryLoadMore = new Map<ISCMRepository, ISettableObservable<boolean>>();
+
+	private readonly _actionRunner: IActionRunner;
+	private readonly _repositories = new DisposableMap<ISCMRepository>();
+	private readonly _visibilityDisposables = new DisposableStore();
+
+	private readonly _treeOperationSequencer = new Sequencer();
+	private readonly _updateChildrenThrottler = new Throttler();
+
+	private readonly _scmHistoryItemGroupHasRemoteContextKey: IContextKey<boolean | undefined>;
+
+	private readonly _providerCountBadgeConfig = observableConfigValue<'hidden' | 'auto' | 'visible'>('scm.providerCountBadge', 'hidden', this.configurationService);
+
+	constructor(
+		options: IViewPaneOptions,
+		@ICommandService private readonly _commandService: ICommandService,
+		@ISCMViewService private readonly _scmViewService: ISCMViewService,
+		@IProgressService private readonly _progressService: IProgressService,
+		@IConfigurationService configurationService: IConfigurationService,
+		@IContextMenuService contextMenuService: IContextMenuService,
+		@IKeybindingService keybindingService: IKeybindingService,
+		@IInstantiationService instantiationService: IInstantiationService,
+		@IViewDescriptorService viewDescriptorService: IViewDescriptorService,
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@IOpenerService openerService: IOpenerService,
+		@IThemeService themeService: IThemeService,
+		@ITelemetryService telemetryService: ITelemetryService,
+		@IHoverService hoverService: IHoverService
+	) {
+		super({ ...options, titleMenuId: MenuId.SCMHistoryTitle }, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService);
+
+		this._scmHistoryItemGroupHasRemoteContextKey = this.scopedContextKeyService.createKey('scmHistoryItemGroupHasRemote', undefined);
+
+		this._actionRunner = this.instantiationService.createInstance(SCMHistoryViewPaneActionRunner);
+		this._register(this._actionRunner);
+
+		this._register(this._updateChildrenThrottler);
+	}
+
+	protected override layoutBody(height: number, width: number): void {
+		super.layoutBody(height, width);
+		this._tree.layout(height, width);
+	}
+
+	protected override renderBody(container: HTMLElement): void {
+		super.renderBody(container);
+
+		this._treeContainer = append(container, $('.scm-view.scm-history-view'));
+		this._treeContainer.classList.add('file-icon-themable-tree');
+
+		this._register(autorun(reader => {
+			const providerCountBadgeConfig = this._providerCountBadgeConfig.read(reader);
+
+			this._treeContainer.classList.toggle('hide-provider-counts', providerCountBadgeConfig === 'hidden');
+			this._treeContainer.classList.toggle('auto-provider-counts', providerCountBadgeConfig === 'auto');
+		}));
+
+		this._createTree(this._treeContainer);
+
+		this.onDidChangeBodyVisibility(visible => {
+			if (visible) {
+				this._treeOperationSequencer.queue(async () => {
+					await this._tree.setInput(this._scmViewService);
+
+					Event.filter(this.configurationService.onDidChangeConfiguration,
+						e =>
+							e.affectsConfiguration('scm.alwaysShowRepositories'),
+						this._visibilityDisposables)
+						(() => {
+							this.updateActions();
+							this.refresh();
+						}, this, this._visibilityDisposables);
+
+					// Add visible repositories
+					this._scmViewService.onDidChangeVisibleRepositories(this._onDidChangeVisibleRepositories, this, this._visibilityDisposables);
+					this._onDidChangeVisibleRepositories({ added: this._scmViewService.visibleRepositories, removed: Iterable.empty() });
+
+					this._tree.scrollTop = 0;
+				});
+			} else {
+				this._treeDataSource.clearState();
+				this._visibilityDisposables.clear();
+				this._repositories.clearAndDisposeAll();
+			}
+		});
+	}
+
+	override getActionRunner(): IActionRunner | undefined {
+		return this._actionRunner;
+	}
+
+	async refresh(repository?: ISCMRepository): Promise<void> {
+		this._treeDataSource.clearState(repository);
+		await this._updateChildren(repository);
+
+		this._setRepositoryDescription(repository, '');
+		this._tree.scrollTop = 0;
+	}
+
+	private _createTree(container: HTMLElement): void {
+		this._treeIdentityProvider = new SCMHistoryTreeIdentityProvider();
+
+		const historyItemHoverDelegate = this.instantiationService.createInstance(HistoryItemHoverDelegate, this.viewDescriptorService.getViewLocationById(this.id));
+		this._register(historyItemHoverDelegate);
+
+		this._treeDataSource = this.instantiationService.createInstance(SCMHistoryTreeDataSource);
+		this._register(this._treeDataSource);
+
+		this._tree = this.instantiationService.createInstance(
+			WorkbenchAsyncDataTree,
+			'SCM History Tree',
+			container,
+			new ListDelegate(),
+			[
+				this.instantiationService.createInstance(RepositoryRenderer, repository => this._getRepositoryDescription(repository), this._actionRunner, getActionViewItemProvider(this.instantiationService)),
+				this.instantiationService.createInstance(HistoryItemRenderer, historyItemHoverDelegate),
+				this.instantiationService.createInstance(HistoryItemLoadMoreRenderer, repository => this._getLoadMore(repository), repository => this._loadMoreCallback(repository)),
+			],
+			this._treeDataSource,
+			{
+				accessibilityProvider: new SCMHistoryTreeAccessibilityProvider(),
+				identityProvider: this._treeIdentityProvider,
+				collapseByDefault: (e: unknown) => !isSCMRepository(e),
+				keyboardNavigationLabelProvider: new SCMHistoryTreeKeyboardNavigationLabelProvider(),
+				horizontalScrolling: false,
+				multipleSelectionSupport: false,
+			}
+		) as WorkbenchAsyncDataTree<ISCMViewService, TreeElement, FuzzyScore>;
+		this._register(this._tree);
+
+		this._tree.onDidOpen(this._onDidOpen, this, this._store);
+		this._tree.onContextMenu(this._onContextMenu, this, this._store);
+	}
+
+	private async _onDidOpen(e: IOpenEvent<TreeElement | undefined>): Promise<void> {
+		if (!e.element) {
+			return;
+		} else if (isSCMRepository(e.element)) {
+			this._scmViewService.focus(e.element);
+		} else if (isSCMHistoryItemViewModelTreeElement(e.element)) {
+			const historyItem = e.element.historyItemViewModel.historyItem;
+			const historyItemParentId = historyItem.parentIds.length > 0 ? historyItem.parentIds[0] : undefined;
+
+			const historyProvider = e.element.repository.provider.historyProvider.get();
+			const historyItemChanges = await historyProvider?.provideHistoryItemChanges(historyItem.id, historyItemParentId);
+			if (historyItemChanges) {
+				const title = `${historyItem.id.substring(0, 8)} - ${historyItem.message}`;
+
+				const rootUri = e.element.repository.provider.rootUri;
+				const path = rootUri ? rootUri.path : e.element.repository.provider.label;
+				const multiDiffSourceUri = URI.from({ scheme: 'scm-history-item', path: `${path}/${historyItemParentId}..${historyItem.id}` }, true);
+
+				await this._commandService.executeCommand('_workbench.openMultiDiffEditor', { title, multiDiffSourceUri, resources: historyItemChanges });
+			}
+
+			this._scmViewService.focus(e.element.repository);
+		} else if (isSCMHistoryItemLoadMoreTreeElement(e.element)) {
+			const repositoryCount = this._scmViewService.visibleRepositories.length;
+			const alwaysShowRepositories = this.configurationService.getValue<boolean>('scm.alwaysShowRepositories') === true;
+
+			if (repositoryCount > 1 || alwaysShowRepositories) {
+				this._loadMoreCallback(e.element.repository);
+				this._tree.setSelection([]);
+			}
+		}
+	}
+
+	private _onContextMenu(e: ITreeContextMenuEvent<TreeElement | null>): void {
+		const element = e.element;
+
+		if (!element) {
+			return;
+		}
+
+		let actions: IAction[] = [];
+		let context: TreeElement | ISCMProvider = element;
+		let actionRunner: IActionRunner = new HistoryItemActionRunner(() => this._getSelectedHistoryItems());
+
+		if (isSCMRepository(element)) {
+			const menus = this._scmViewService.menus.getRepositoryMenus(element.provider);
+			const menu = menus.repositoryContextMenu;
+
+			actions = collectContextMenuActions(menu);
+			actionRunner = new RepositoryActionRunner(() => this._getSelectedRepositories());
+			context = element.provider;
+		} else if (isSCMHistoryItemViewModelTreeElement(element)) {
+			const menus = this._scmViewService.menus.getRepositoryMenus(element.repository.provider);
+			const menu = menus.historyProviderMenu?.getHistoryItemMenu2(element);
+
+			actions = menu ? collectContextMenuActions(menu) : [];
+		}
+
+		actionRunner.onWillRun(() => this._tree.domFocus());
+
+		this.contextMenuService.showContextMenu({
+			getAnchor: () => e.anchor,
+			getActions: () => actions,
+			getActionsContext: () => context,
+			actionRunner
+		});
+	}
+
+	private _onDidChangeVisibleRepositories({ added, removed }: ISCMViewVisibleRepositoryChangeEvent): void {
+		// Added repositories
+		for (const repository of added) {
+			const repositoryDisposables = new DisposableStore();
+
+			repositoryDisposables.add(autorun(reader => {
+				const historyProvider = repository.provider.historyProvider.read(reader);
+				const currentHistoryItemGroupId = historyProvider?.currentHistoryItemGroupId.read(reader);
+				const currentHistoryItemGroupRevision = historyProvider?.currentHistoryItemGroupRevision.read(reader);
+				const currentHistoryItemGroupRemoteId = historyProvider?.currentHistoryItemGroupRemoteId.read(reader);
+
+				// Update scmHistoryItemGroupHasRemote context key
+				if (this._scmViewService.visibleRepositories.length === 1) {
+					this._scmHistoryItemGroupHasRemoteContextKey.set(!!currentHistoryItemGroupRemoteId);
+				} else {
+					this._scmHistoryItemGroupHasRemoteContextKey.reset();
+				}
+
+				if (!currentHistoryItemGroupId && !currentHistoryItemGroupRevision && !currentHistoryItemGroupRemoteId) {
+					return;
+				}
+
+				this.refresh(repository);
+			}));
+
+			repositoryDisposables.add(autorun(reader => {
+				const historyProvider = repository.provider.historyProvider.read(reader);
+				const currentHistoryItemGroupRemoteRevision = historyProvider?.currentHistoryItemGroupRemoteRevision.read(reader);
+
+				if (!currentHistoryItemGroupRemoteRevision) {
+					return;
+				}
+
+				// Remote revision changes can occur as a result of a user action (Fetch, Push) but
+				// it can also occur as a result of background action (Auto Fetch). If the tree is
+				// scrolled to the top, we can safely refresh the tree.
+				if (this._tree.scrollTop === 0) {
+					this.refresh(repository);
+					return;
+				}
+
+				// Set the "OUTDATED" description
+				const description = localize('outdated', "OUTDATED");
+				this._setRepositoryDescription(this._isRepositoryNodeVisible() ? repository : undefined, description);
+			}));
+
+			this._repositories.set(repository, repositoryDisposables);
+		}
+
+		// Removed repositories
+		for (const repository of removed) {
+			this._treeDataSource.clearState(repository);
+			this._repositoryDescription.delete(repository);
+			this._repositoryLoadMore.delete(repository);
+			this._repositories.deleteAndDispose(repository);
+		}
+
+		this._updateChildren();
+	}
+
+	private _getSelectedRepositories(): ISCMRepository[] {
+		const focusedRepositories = this._tree.getFocus().filter(r => !!r && isSCMRepository(r))! as ISCMRepository[];
+		const selectedRepositories = this._tree.getSelection().filter(r => !!r && isSCMRepository(r))! as ISCMRepository[];
+
+		return Array.from(new Set<ISCMRepository>([...focusedRepositories, ...selectedRepositories]));
+	}
+
+	private _getSelectedHistoryItems(): SCMHistoryItemViewModelTreeElement[] {
+		return this._tree.getSelection()
+			.filter(r => !!r && isSCMHistoryItemViewModelTreeElement(r))!;
+	}
+
+	private _getLoadMore(repository: ISCMRepository): ISettableObservable<boolean> {
+		let loadMore = this._repositoryLoadMore.get(repository);
+		if (!loadMore) {
+			loadMore = observableValue<boolean>(this, false);
+			this._repositoryLoadMore.set(repository, loadMore);
+		}
+
+		return loadMore;
+	}
+
+	private async _loadMoreCallback(repository: ISCMRepository): Promise<void> {
+		const loadMore = this._getLoadMore(repository);
+		if (loadMore.get()) {
+			return;
+		}
+
+		loadMore.set(true, undefined);
+		this._treeDataSource.loadMore(repository);
+
+		await this._updateChildren(repository);
+		loadMore.set(false, undefined);
+	}
+
+	private _getRepositoryDescription(repository: ISCMRepository): ISettableObservable<string> {
+		let description = this._repositoryDescription.get(repository);
+		if (!description) {
+			description = observableValue<string>(this, '');
+			this._repositoryDescription.set(repository, description);
+		}
+
+		return description;
+	}
+
+	private _setRepositoryDescription(repository: ISCMRepository | undefined, description: string): void {
+		if (!repository) {
+			this.updateTitleDescription(description);
+		} else {
+			this._getRepositoryDescription(repository).set(description, undefined);
+		}
+	}
+
+	private _isRepositoryNodeVisible(): boolean {
+		const repositoryCount = this._scmViewService.visibleRepositories.length;
+		const alwaysShowRepositories = this.configurationService.getValue<boolean>('scm.alwaysShowRepositories') === true;
+
+		return alwaysShowRepositories || repositoryCount > 1;
+	}
+
+	private _updateChildren(element?: ISCMRepository): Promise<void> {
+		return this._updateChildrenThrottler.queue(
+			() => this._treeOperationSequencer.queue(
+				async () => {
+					await this._progressService.withProgress({ location: this.id },
+						async () => {
+							if (element && this._tree.hasNode(element)) {
+								// Refresh specific repository
+								await this._tree.updateChildren(element, undefined, undefined, {
+									// diffIdentityProvider: this._treeIdentityProvider
+								});
+							} else {
+								// Refresh the entire tree
+								await this._tree.updateChildren(undefined, undefined, undefined, {
+									// diffIdentityProvider: this._treeIdentityProvider
+								});
+							}
+						});
+				}));
+	}
+
+	override dispose(): void {
+		this._visibilityDisposables.dispose();
+		this._repositories.dispose();
+		super.dispose();
+	}
+}
diff --git a/src/vs/workbench/contrib/scm/browser/scmRepositoryRenderer.ts b/src/vs/workbench/contrib/scm/browser/scmRepositoryRenderer.ts
index 594d24ef8f3..2c4970da2aa 100644
--- a/src/vs/workbench/contrib/scm/browser/scmRepositoryRenderer.ts
+++ b/src/vs/workbench/contrib/scm/browser/scmRepositoryRenderer.ts
@@ -65,13 +65,13 @@ export class RepositoryRenderer implements ICompressibleTreeRenderer<ISCMReposit
 	constructor(
 		private readonly toolbarMenuId: MenuId,
 		private readonly actionViewItemProvider: IActionViewItemProvider,
-		@ISCMViewService private scmViewService: ISCMViewService,
 		@ICommandService private commandService: ICommandService,
 		@IContextKeyService private contextKeyService: IContextKeyService,
 		@IContextMenuService private contextMenuService: IContextMenuService,
 		@IHoverService private hoverService: IHoverService,
 		@IKeybindingService private keybindingService: IKeybindingService,
 		@IMenuService private menuService: IMenuService,
+		@ISCMViewService private scmViewService: ISCMViewService,
 		@ITelemetryService private telemetryService: ITelemetryService
 	) { }
 
@@ -135,6 +135,7 @@ export class RepositoryRenderer implements ICompressibleTreeRenderer<ISCMReposit
 			menuSecondaryActions = secondary;
 			updateToolbar();
 		}));
+
 		templateData.toolBar.context = repository.provider;
 	}
 
diff --git a/src/vs/workbench/contrib/scm/browser/scmViewPane.ts b/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
index b3e022bdb0b..6a5d402e255 100644
--- a/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
+++ b/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
@@ -10,7 +10,7 @@ import { IDisposable, Disposable, DisposableStore, combinedDisposable, dispose,
 import { ViewPane, IViewPaneOptions, ViewAction } from 'vs/workbench/browser/parts/views/viewPane';
 import { append, $, Dimension, asCSSUrl, trackFocus, clearNode, prepend, isPointerEvent, isActiveElement } from 'vs/base/browser/dom';
 import { IListVirtualDelegate, IIdentityProvider } from 'vs/base/browser/ui/list/list';
-import { ISCMHistoryItem, ISCMHistoryItemChange, ISCMHistoryItemViewModel, SCMHistoryItemViewModelTreeElement, ISCMHistoryProviderCacheEntry, SCMHistoryItemChangeTreeElement, SCMHistoryItemGroupTreeElement, SCMHistoryItemTreeElement, SCMViewSeparatorElement } from 'vs/workbench/contrib/scm/common/history';
+import { ISCMHistoryItem, ISCMHistoryItemViewModel, SCMHistoryItemViewModelTreeElement, SCMHistoryItemChangeTreeElement, SCMHistoryItemGroupTreeElement, SCMHistoryItemTreeElement, SCMViewSeparatorElement } from 'vs/workbench/contrib/scm/common/history';
 import { ISCMResourceGroup, ISCMResource, InputValidationType, ISCMRepository, ISCMInput, IInputValidation, ISCMViewService, ISCMViewVisibleRepositoryChangeEvent, ISCMService, SCMInputChangeReason, VIEW_PANE_ID, ISCMActionButton, ISCMActionButtonDescriptor, ISCMRepositorySortKey, ISCMInputValueProviderContext, ISCMProvider } from 'vs/workbench/contrib/scm/common/scm';
 import { ResourceLabels, IResourceLabel, IFileLabelOptions } from 'vs/workbench/browser/labels';
 import { CountBadge } from 'vs/base/browser/ui/countBadge/countBadge';
@@ -21,9 +21,9 @@ import { IContextKeyService, IContextKey, ContextKeyExpr, RawContextKey } from '
 import { ICommandService } from 'vs/platform/commands/common/commands';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { MenuItemAction, IMenuService, registerAction2, MenuId, IAction2Options, MenuRegistry, Action2, IMenu } from 'vs/platform/actions/common/actions';
-import { IAction, ActionRunner, Action, Separator, IActionRunner, toAction } from 'vs/base/common/actions';
+import { IAction, ActionRunner, Action, Separator, IActionRunner } from 'vs/base/common/actions';
 import { ActionBar, IActionViewItemProvider } from 'vs/base/browser/ui/actionbar/actionbar';
-import { IThemeService, IFileIconTheme, registerThemingParticipant } from 'vs/platform/theme/common/themeService';
+import { IThemeService, IFileIconTheme } from 'vs/platform/theme/common/themeService';
 import { isSCMResource, isSCMResourceGroup, connectPrimaryMenuToInlineActionBar, isSCMRepository, isSCMInput, collectContextMenuActions, getActionViewItemProvider, isSCMActionButton, isSCMViewService, isSCMHistoryItemGroupTreeElement, isSCMHistoryItemTreeElement, isSCMHistoryItemChangeTreeElement, toDiffEditorArguments, isSCMResourceNode, isSCMHistoryItemChangeNode, isSCMViewSeparator, connectPrimaryMenu, isSCMHistoryItemViewModelTreeElement } from './util';
 import { WorkbenchCompressibleAsyncDataTree, IOpenEvent } from 'vs/platform/list/browser/listService';
 import { IConfigurationService, ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
@@ -43,7 +43,7 @@ import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storag
 import { EditorResourceAccessor, SideBySideEditor } from 'vs/workbench/common/editor';
 import { CodeEditorWidget, ICodeEditorWidgetOptions } from 'vs/editor/browser/widget/codeEditor/codeEditorWidget';
 import { IEditorConstructionOptions } from 'vs/editor/browser/config/editorConfiguration';
-import { getSimpleEditorOptions } from 'vs/workbench/contrib/codeEditor/browser/simpleEditorOptions';
+import { getSimpleEditorOptions, setupSimpleEditorSelectionStyling } from 'vs/workbench/contrib/codeEditor/browser/simpleEditorOptions';
 import { IModelService } from 'vs/editor/common/services/model';
 import { EditorExtensionsRegistry } from 'vs/editor/browser/editorExtensions';
 import { MenuPreventer } from 'vs/workbench/contrib/codeEditor/browser/menuPreventer';
@@ -81,7 +81,7 @@ import { CopyPasteController } from 'vs/editor/contrib/dropOrPasteInto/browser/c
 import { DropIntoEditorController } from 'vs/editor/contrib/dropOrPasteInto/browser/dropIntoEditorController';
 import { MessageController } from 'vs/editor/contrib/message/browser/messageController';
 import { defaultButtonStyles, defaultCountBadgeStyles } from 'vs/platform/theme/browser/defaultStyles';
-import { InlineCompletionsController } from 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsController';
+import { InlineCompletionsController } from 'vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController';
 import { CodeActionController } from 'vs/editor/contrib/codeAction/browser/codeActionController';
 import { Schemas } from 'vs/base/common/network';
 import { IDragAndDropData } from 'vs/base/browser/dnd';
@@ -95,7 +95,7 @@ import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity'
 import { EditOperation } from 'vs/editor/common/core/editOperation';
 import { stripIcons } from 'vs/base/common/iconLabels';
 import { IconLabel } from 'vs/base/browser/ui/iconLabel/iconLabel';
-import { ColorIdentifier, editorSelectionBackground, foreground, inputBackground, inputForeground, listActiveSelectionForeground, registerColor, selectionBackground, transparent } from 'vs/platform/theme/common/colorRegistry';
+import { foreground, listActiveSelectionForeground, registerColor, transparent } from 'vs/platform/theme/common/colorRegistry';
 import { IMenuWorkbenchToolBarOptions, WorkbenchToolBar } from 'vs/platform/actions/browser/toolbar';
 import { CancellationTokenSource } from 'vs/base/common/cancellation';
 import { DropdownWithPrimaryActionViewItem } from 'vs/platform/actions/browser/dropdownWithPrimaryActionViewItem';
@@ -104,17 +104,18 @@ import { MarkdownString } from 'vs/base/common/htmlContent';
 import type { IHoverOptions, IManagedHover, IManagedHoverTooltipMarkdownString } from 'vs/base/browser/ui/hover/hover';
 import { IHoverService, WorkbenchHoverDelegate } from 'vs/platform/hover/browser/hover';
 import { OpenScmGroupAction } from 'vs/workbench/contrib/multiDiffEditor/browser/scmMultiDiffSourceResolver';
-import { HoverController } from 'vs/editor/contrib/hover/browser/hoverController';
+import { ContentHoverController } from 'vs/editor/contrib/hover/browser/contentHoverController2';
+import { MarginHoverController } from 'vs/editor/contrib/hover/browser/marginHoverController';
 import { ITextModel } from 'vs/editor/common/model';
 import { autorun } from 'vs/base/common/observable';
 import { createInstantHoverDelegate, getDefaultHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
-import { historyItemGroupBase, historyItemGroupHoverLabelForeground, historyItemGroupLocal, historyItemGroupRemote, renderSCMHistoryItemGraph, toISCMHistoryItemViewModelArray } from 'vs/workbench/contrib/scm/browser/scmHistory';
+import { historyItemGroupBase, historyItemGroupHoverLabelForeground, historyItemGroupLocal, historyItemGroupRemote, renderSCMHistoryItemGraph } from 'vs/workbench/contrib/scm/browser/scmHistory';
 import { PlaceholderTextContribution } from 'vs/editor/contrib/placeholderText/browser/placeholderTextContribution';
 import { HoverPosition } from 'vs/base/browser/ui/hover/hoverWidget';
 import { IHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegate';
 import { IWorkbenchLayoutService, Position } from 'vs/workbench/services/layout/browser/layoutService';
 import { fromNow } from 'vs/base/common/date';
-import { equals } from 'vs/base/common/arrays';
+import { observableConfigValue } from 'vs/platform/observable/common/platformObservableUtils';
 
 // type SCMResourceTreeNode = IResourceNode<ISCMResource, ISCMResourceGroup>;
 // type SCMHistoryItemChangeResourceTreeNode = IResourceNode<SCMHistoryItemChangeTreeElement, SCMHistoryItemTreeElement>;
@@ -132,8 +133,6 @@ type TreeElement =
 	IResourceNode<SCMHistoryItemChangeTreeElement, SCMHistoryItemTreeElement> |
 	SCMViewSeparatorElement;
 
-type ShowChangesSetting = 'always' | 'never' | 'auto';
-
 const historyItemAdditionsForeground = registerColor('scm.historyItemAdditionsForeground', 'gitDecoration.addedResourceForeground', localize('scm.historyItemAdditionsForeground', "History item additions foreground color."));
 
 const historyItemDeletionsForeground = registerColor('scm.historyItemDeletionsForeground', 'gitDecoration.deletedResourceForeground', localize('scm.historyItemDeletionsForeground', "History item deletions foreground color."));
@@ -1332,7 +1331,7 @@ class SeparatorRenderer implements ICompressibleTreeRenderer<SCMViewSeparatorEle
 		]);
 		const menu = this.menuService.createMenu(MenuId.SCMChangesSeparator, contextKeyService);
 		templateData.elementDisposables.add(connectPrimaryMenu(menu, (primary, secondary) => {
-			secondary.push(...this.getFilterActions(element.element.repository));
+			secondary.splice(0, 0, ...this.getFilterActions(element.element.repository), new Separator());
 			templateData.toolBar.setActions(primary, secondary, [MenuId.SCMChangesSeparator]);
 		}));
 		templateData.toolBar.context = provider;
@@ -1734,14 +1733,6 @@ MenuRegistry.appendMenuItem(MenuId.SCMTitle, {
 	order: 1
 });
 
-MenuRegistry.appendMenuItem(MenuId.SCMTitle, {
-	title: localize('scmChanges', "Incoming & Outgoing"),
-	submenu: Menus.ChangesSettings,
-	when: ContextKeyExpr.and(ContextKeyExpr.equals('view', VIEW_PANE_ID), ContextKeys.RepositoryCount.notEqualsTo(0), ContextKeyExpr.equals('config.scm.showHistoryGraph', true).negate()),
-	group: '0_view&sort',
-	order: 2
-});
-
 MenuRegistry.appendMenuItem(Menus.ViewSort, {
 	title: localize('repositories', "Repositories"),
 	submenu: Menus.Repositories,
@@ -1749,162 +1740,6 @@ MenuRegistry.appendMenuItem(Menus.ViewSort, {
 	group: '0_repositories'
 });
 
-abstract class SCMChangesSettingAction extends Action2 {
-	constructor(
-		private readonly settingKey: string,
-		private readonly settingValue: 'always' | 'auto' | 'never',
-		desc: Readonly<IAction2Options>) {
-		super({
-			...desc,
-			f1: false,
-			toggled: ContextKeyExpr.equals(`config.${settingKey}`, settingValue),
-		});
-	}
-
-	override run(accessor: ServicesAccessor): void {
-		const configurationService = accessor.get(IConfigurationService);
-		configurationService.updateValue(this.settingKey, this.settingValue);
-	}
-}
-
-MenuRegistry.appendMenuItem(MenuId.SCMChangesSeparator, {
-	title: localize('incomingChanges', "Show Incoming Changes"),
-	submenu: MenuId.SCMIncomingChangesSetting,
-	group: '1_incoming&outgoing',
-	order: 1,
-	when: ContextKeyExpr.equals('config.scm.showHistoryGraph', false)
-});
-
-MenuRegistry.appendMenuItem(Menus.ChangesSettings, {
-	title: localize('incomingChanges', "Show Incoming Changes"),
-	submenu: MenuId.SCMIncomingChangesSetting,
-	group: '1_incoming&outgoing',
-	order: 1,
-	when: ContextKeyExpr.equals('config.scm.showHistoryGraph', false)
-});
-
-registerAction2(class extends SCMChangesSettingAction {
-	constructor() {
-		super('scm.showIncomingChanges', 'always',
-			{
-				id: 'workbench.scm.action.showIncomingChanges.always',
-				title: localize('always', "Always"),
-				menu: { id: MenuId.SCMIncomingChangesSetting },
-			});
-	}
-});
-
-registerAction2(class extends SCMChangesSettingAction {
-	constructor() {
-		super('scm.showIncomingChanges', 'auto',
-			{
-				id: 'workbench.scm.action.showIncomingChanges.auto',
-				title: localize('auto', "Auto"),
-				menu: {
-					id: MenuId.SCMIncomingChangesSetting,
-				}
-			});
-	}
-});
-
-registerAction2(class extends SCMChangesSettingAction {
-	constructor() {
-		super('scm.showIncomingChanges', 'never',
-			{
-				id: 'workbench.scm.action.showIncomingChanges.never',
-				title: localize('never', "Never"),
-				menu: {
-					id: MenuId.SCMIncomingChangesSetting,
-				}
-			});
-	}
-});
-
-MenuRegistry.appendMenuItem(MenuId.SCMChangesSeparator, {
-	title: localize('outgoingChanges', "Show Outgoing Changes"),
-	submenu: MenuId.SCMOutgoingChangesSetting,
-	group: '1_incoming&outgoing',
-	order: 2,
-	when: ContextKeyExpr.equals('config.scm.showHistoryGraph', false)
-});
-
-MenuRegistry.appendMenuItem(Menus.ChangesSettings, {
-	title: localize('outgoingChanges', "Show Outgoing Changes"),
-	submenu: MenuId.SCMOutgoingChangesSetting,
-	group: '1_incoming&outgoing',
-	order: 2,
-	when: ContextKeyExpr.equals('config.scm.showHistoryGraph', false)
-});
-
-registerAction2(class extends SCMChangesSettingAction {
-	constructor() {
-		super('scm.showOutgoingChanges', 'always',
-			{
-				id: 'workbench.scm.action.showOutgoingChanges.always',
-				title: localize('always', "Always"),
-				menu: {
-					id: MenuId.SCMOutgoingChangesSetting,
-
-				}
-			});
-	}
-});
-
-registerAction2(class extends SCMChangesSettingAction {
-	constructor() {
-		super('scm.showOutgoingChanges', 'auto',
-			{
-				id: 'workbench.scm.action.showOutgoingChanges.auto',
-				title: localize('auto', "Auto"),
-				menu: {
-					id: MenuId.SCMOutgoingChangesSetting,
-				}
-			});
-	}
-});
-
-registerAction2(class extends SCMChangesSettingAction {
-	constructor() {
-		super('scm.showOutgoingChanges', 'never',
-			{
-				id: 'workbench.scm.action.showOutgoingChanges.never',
-				title: localize('never', "Never"),
-				menu: {
-					id: MenuId.SCMOutgoingChangesSetting,
-				}
-			});
-	}
-});
-
-registerAction2(class extends Action2 {
-	constructor() {
-		super({
-			id: 'workbench.scm.action.scm.showChangesSummary',
-			title: localize('showChangesSummary', "Show Changes Summary"),
-			f1: false,
-			toggled: ContextKeyExpr.equals('config.scm.showChangesSummary', true),
-			menu: [
-				{
-					id: MenuId.SCMChangesSeparator,
-					order: 3,
-					when: ContextKeyExpr.equals('config.scm.showHistoryGraph', false)
-				},
-				{
-					id: Menus.ChangesSettings,
-					order: 3,
-					when: ContextKeyExpr.equals('config.scm.showHistoryGraph', false)
-				},
-			]
-		});
-	}
-
-	override run(accessor: ServicesAccessor) {
-		const configurationService = accessor.get(IConfigurationService);
-		const configValue = configurationService.getValue('scm.showChangesSummary') === true;
-		configurationService.updateValue('scm.showChangesSummary', !configValue);
-	}
-});
-
 registerAction2(class extends Action2 {
 	constructor() {
 		super({
@@ -1948,12 +1783,11 @@ registerAction2(class extends Action2 {
 
 		const title = historyItems.length === 1 ?
 			`${historyItems[0].id.substring(0, 8)} - ${historyItems[0].message}` :
-			localize('historyItemChangesEditorTitle', "All Changes ({0} ↔ {1})", historyItem.id.substring(0, 8), historyItemLast.id.substring(0, 8));
+			localize('historyItemChangesEditorTitle', "All Changes ({0} ↔ {1})", historyItemLast.id.substring(0, 8), historyItem.id.substring(0, 8));
 
 		const rootUri = provider.rootUri;
-		const multiDiffSourceUri = rootUri ?
-			rootUri.with({ scheme: 'scm-history-item', path: `${rootUri.path}/${historyItem.id}..${historyItemParentId}` }) :
-			URI.from({ scheme: 'scm-history-item', path: `${provider.label}/${historyItem.id}..${historyItemParentId}` }, true);
+		const path = rootUri ? rootUri.path : provider.label;
+		const multiDiffSourceUri = URI.from({ scheme: 'scm-history-item', path: `${path}/${historyItemParentId}..${historyItem.id}` }, true);
 
 		commandService.executeCommand('_workbench.openMultiDiffEditor', { title, multiDiffSourceUri, resources: historyItemChanges });
 	}
@@ -2754,7 +2588,8 @@ class SCMInputWidget {
 				DropIntoEditorController.ID,
 				EditorDictation.ID,
 				FormatOnType.ID,
-				HoverController.ID,
+				ContentHoverController.ID,
+				MarginHoverController.ID,
 				InlineCompletionsController.ID,
 				LinkDetector.ID,
 				MenuPreventer.ID,
@@ -3056,8 +2891,6 @@ export class SCMViewPane extends ViewPane {
 	private readonly revealResourceThrottler = new Throttler();
 	private readonly updateChildrenThrottler = new Throttler();
 
-	private historyProviderDataSource!: SCMTreeHistoryProviderDataSource;
-
 	private viewModeContextKey: IContextKey<ViewMode>;
 	private viewSortKeyContextKey: IContextKey<ViewSortKey>;
 	private areAllRepositoriesCollapsedContextKey: IContextKey<boolean>;
@@ -3192,20 +3025,10 @@ export class SCMViewPane extends ViewPane {
 						e =>
 							e.affectsConfiguration('scm.inputMinLineCount') ||
 							e.affectsConfiguration('scm.inputMaxLineCount') ||
-							e.affectsConfiguration('scm.showActionButton') ||
-							e.affectsConfiguration('scm.showIncomingChanges') ||
-							e.affectsConfiguration('scm.showOutgoingChanges') ||
-							e.affectsConfiguration('scm.showHistoryGraph'),
+							e.affectsConfiguration('scm.showActionButton'),
 						this.visibilityDisposables)
 						(() => this.updateChildren(), this, this.visibilityDisposables);
 
-					Event.filter(this.configurationService.onDidChangeConfiguration,
-						e => e.affectsConfiguration('scm.showChangesSummary'), this.visibilityDisposables)
-						(() => {
-							this.historyProviderDataSource.clearCache();
-							this.updateChildren();
-						}, this, this.visibilityDisposables);
-
 					// Add visible repositories
 					this.editorService.onDidActiveEditorChange(this.onDidActiveEditorChange, this, this.visibilityDisposables);
 					this.scmViewService.onDidChangeVisibleRepositories(this.onDidChangeVisibleRepositories, this, this.visibilityDisposables);
@@ -3266,12 +3089,11 @@ export class SCMViewPane extends ViewPane {
 		const historyItemHoverDelegate = this.instantiationService.createInstance(HistoryItemHoverDelegate, this.viewDescriptorService.getViewLocationById(this.id), this.layoutService.getSideBarPosition());
 		this.disposables.add(historyItemHoverDelegate);
 
-		this.historyProviderDataSource = this.instantiationService.createInstance(SCMTreeHistoryProviderDataSource, () => this.viewMode);
-		this.disposables.add(this.historyProviderDataSource);
-
-		const treeDataSource = this.instantiationService.createInstance(SCMTreeDataSource, () => this.viewMode, this.historyProviderDataSource);
+		const treeDataSource = this.instantiationService.createInstance(SCMTreeDataSource, () => this.viewMode);
 		this.disposables.add(treeDataSource);
 
+		const compressionEnabled = observableConfigValue('scm.compactFolders', true, this.configurationService);
+
 		this.tree = this.instantiationService.createInstance(
 			WorkbenchCompressibleAsyncDataTree,
 			'SCM Tree Repo',
@@ -3283,12 +3105,7 @@ export class SCMViewPane extends ViewPane {
 				this.actionButtonRenderer,
 				this.instantiationService.createInstance(RepositoryRenderer, MenuId.SCMTitle, getActionViewItemProvider(this.instantiationService)),
 				this.instantiationService.createInstance(ResourceGroupRenderer, getActionViewItemProvider(this.instantiationService)),
-				this.instantiationService.createInstance(ResourceRenderer, () => this.viewMode, this.listLabels, getActionViewItemProvider(this.instantiationService), resourceActionRunner),
-				this.instantiationService.createInstance(HistoryItemGroupRenderer, historyItemGroupActionRunner),
-				this.instantiationService.createInstance(HistoryItemRenderer, historyItemActionRunner, getActionViewItemProvider(this.instantiationService)),
-				this.instantiationService.createInstance(HistoryItem2Renderer, historyItemHoverDelegate),
-				this.instantiationService.createInstance(HistoryItemChangeRenderer, () => this.viewMode, this.listLabels),
-				this.instantiationService.createInstance(SeparatorRenderer, (repository) => this.getHistoryItemGroupFilterActions(repository)),
+				this.instantiationService.createInstance(ResourceRenderer, () => this.viewMode, this.listLabels, getActionViewItemProvider(this.instantiationService), resourceActionRunner)
 			],
 			treeDataSource,
 			{
@@ -3301,6 +3118,7 @@ export class SCMViewPane extends ViewPane {
 				sorter: new SCMTreeSorter(() => this.viewMode, () => this.viewSortKey),
 				keyboardNavigationLabelProvider: this.instantiationService.createInstance(SCMTreeKeyboardNavigationLabelProvider, () => this.viewMode),
 				overrideStyles: this.getLocationBasedColors().listOverrideStyles,
+				compressionEnabled: compressionEnabled.get(),
 				collapseByDefault: (e: unknown) => {
 					// Repository, Resource Group, Resource Folder (Tree), History Item Change Folder (Tree)
 					if (isSCMRepository(e) || isSCMResourceGroup(e) || isSCMResourceNode(e) || isSCMHistoryItemChangeNode(e)) {
@@ -3320,6 +3138,12 @@ export class SCMViewPane extends ViewPane {
 		this.tree.onDidScroll(this.inputRenderer.clearValidation, this.inputRenderer, this.disposables);
 		Event.filter(this.tree.onDidChangeCollapseState, e => isSCMRepository(e.node.element?.element), this.disposables)(this.updateRepositoryCollapseAllContextKeys, this, this.disposables);
 
+		this.disposables.add(autorun(reader => {
+			this.tree.updateOptions({
+				compressionEnabled: compressionEnabled.read(reader)
+			});
+		}));
+
 		append(container, overflowWidgetsDomNode);
 	}
 
@@ -3420,9 +3244,8 @@ export class SCMViewPane extends ViewPane {
 				const title = `${historyItem.id.substring(0, 8)} - ${historyItem.message}`;
 
 				const rootUri = e.element.repository.provider.rootUri;
-				const multiDiffSourceUri = rootUri ?
-					rootUri.with({ scheme: 'scm-history-item', path: `${rootUri.path}/${historyItem.id}..${historyItemParentId}` }) :
-					URI.from({ scheme: 'scm-history-item', path: `${e.element.repository.provider.label}/${historyItem.id}..${historyItemParentId}` }, true);
+				const path = rootUri ? rootUri.path : e.element.repository.provider.label;
+				const multiDiffSourceUri = URI.from({ scheme: 'scm-history-item', path: `${path}/${historyItemParentId}..${historyItem.id}` }, true);
 
 				await this.commandService.executeCommand('_workbench.openMultiDiffEditor', { title, multiDiffSourceUri, resources: historyItemChanges });
 			}
@@ -3498,15 +3321,6 @@ export class SCMViewPane extends ViewPane {
 			repositoryDisposables.add(repository.input.onDidChangeVisibility(() => this.updateChildren(repository)));
 			repositoryDisposables.add(repository.provider.onDidChangeResourceGroups(() => this.updateChildren(repository)));
 
-			repositoryDisposables.add(autorun(reader => {
-				repository.provider.historyProvider.read(reader)?.currentHistoryItemGroup.read(reader);
-
-				this.historyProviderDataSource.deleteCacheEntry(repository);
-				this.historyProviderDataSource.deleteHistoryItemGroupFilter(repository);
-
-				this.updateChildren(repository);
-			}));
-
 			const resourceGroupDisposables = repositoryDisposables.add(new DisposableMap<ISCMResourceGroup, IDisposable>());
 
 			const onDidChangeResourceGroups = () => {
@@ -3535,7 +3349,6 @@ export class SCMViewPane extends ViewPane {
 
 		// Removed repositories
 		for (const repository of removed) {
-			this.historyProviderDataSource.deleteCacheEntry(repository);
 			this.items.deleteAndDispose(repository);
 		}
 
@@ -3855,40 +3668,6 @@ export class SCMViewPane extends ViewPane {
 		}
 	}
 
-	private getHistoryItemGroupFilterActions(repository: ISCMRepository): IAction[] {
-		const currentHistoryItemGroup = repository.provider.historyProvider.get()?.currentHistoryItemGroup?.get();
-		if (!currentHistoryItemGroup) {
-			return [];
-		}
-
-		const toHistoryItemGroupFilterAction = (
-			historyItemGroupId: string,
-			historyItemGroupName: string): IAction => {
-			return toAction({
-				id: `workbench.scm.action.toggleHistoryItemGroupVisibility.${repository.id}.${historyItemGroupId}`,
-				label: historyItemGroupName,
-				checked: !this.historyProviderDataSource.getHistoryItemGroupFilter(repository).has(historyItemGroupId),
-				run: () => {
-					this.historyProviderDataSource.toggleHistoryItemGroupFilter(repository, historyItemGroupId);
-					this.historyProviderDataSource.deleteCacheEntry(repository);
-
-					this.updateChildren(repository);
-				}
-			});
-		};
-
-		const actions: IAction[] = [];
-		if (currentHistoryItemGroup.remote) {
-			actions.push(toHistoryItemGroupFilterAction(currentHistoryItemGroup.remote.id, currentHistoryItemGroup.remote.name));
-		}
-
-		if (currentHistoryItemGroup.base) {
-			actions.push(toHistoryItemGroupFilterAction(currentHistoryItemGroup.base.id, currentHistoryItemGroup.base.name));
-		}
-
-		return actions;
-	}
-
 	override shouldShowWelcome(): boolean {
 		return this.scmService.repositoryCount === 0;
 	}
@@ -3930,330 +3709,9 @@ export class SCMViewPane extends ViewPane {
 	}
 }
 
-class SCMTreeHistoryProviderDataSource extends Disposable {
-	private readonly _cache = new Map<ISCMRepository, ISCMHistoryProviderCacheEntry>();
-	private readonly _historyItemGroupFilter = new Map<ISCMRepository, Set<string>>();
-
-	constructor(
-		private readonly viewMode: () => ViewMode,
-		@IConfigurationService private readonly configurationService: IConfigurationService,
-		@IUriIdentityService private uriIdentityService: IUriIdentityService,
-	) {
-		super();
-	}
-
-	clearCache(): void {
-		this._cache.clear();
-	}
-
-	deleteCacheEntry(repository: ISCMRepository): void {
-		this._cache.delete(repository);
-	}
-
-	async getHistoryItemGroups(element: ISCMRepository): Promise<SCMHistoryItemGroupTreeElement[]> {
-		const { showIncomingChanges, showOutgoingChanges, showHistoryGraph } = this._getConfiguration();
-
-		const scmProvider = element.provider;
-		const historyProvider = scmProvider.historyProvider.get();
-		const currentHistoryItemGroup = historyProvider?.currentHistoryItemGroup.get();
-
-		if (!historyProvider || !currentHistoryItemGroup || (showIncomingChanges === 'never' && showOutgoingChanges === 'never') || showHistoryGraph) {
-			return [];
-		}
-
-		const children: SCMHistoryItemGroupTreeElement[] = [];
-		const historyProviderCacheEntry = this._getCacheEntry(element);
-
-		let incomingHistoryItemGroup = historyProviderCacheEntry?.incomingHistoryItemGroup;
-		let outgoingHistoryItemGroup = historyProviderCacheEntry?.outgoingHistoryItemGroup;
-
-		if (!incomingHistoryItemGroup && !outgoingHistoryItemGroup) {
-			// Common ancestor, ahead, behind
-			const ancestor = await historyProvider.resolveHistoryItemGroupCommonAncestor(currentHistoryItemGroup.id, currentHistoryItemGroup.remote?.id);
-			if (!ancestor) {
-				return [];
-			}
-
-			// Only show "Incoming" node if there is a base branch
-			incomingHistoryItemGroup = currentHistoryItemGroup.remote ? {
-				id: currentHistoryItemGroup.remote.id,
-				label: currentHistoryItemGroup.remote.name,
-				ariaLabel: localize('incomingChangesAriaLabel', "Incoming changes from {0}", currentHistoryItemGroup.remote.name),
-				icon: Codicon.arrowCircleDown,
-				direction: 'incoming',
-				ancestor: ancestor.id,
-				count: ancestor.behind,
-				repository: element,
-				type: 'historyItemGroup'
-			} : undefined;
-
-			outgoingHistoryItemGroup = {
-				id: currentHistoryItemGroup.id,
-				label: currentHistoryItemGroup.name,
-				ariaLabel: localize('outgoingChangesAriaLabel', "Outgoing changes to {0}", currentHistoryItemGroup.name),
-				icon: Codicon.arrowCircleUp,
-				direction: 'outgoing',
-				ancestor: ancestor.id,
-				count: ancestor.ahead,
-				repository: element,
-				type: 'historyItemGroup'
-			};
-
-			this._updateCacheEntry(element, {
-				incomingHistoryItemGroup,
-				outgoingHistoryItemGroup
-			});
-		}
-
-		// Incoming
-		if (incomingHistoryItemGroup &&
-			(showIncomingChanges === 'always' ||
-				(showIncomingChanges === 'auto' && (incomingHistoryItemGroup.count ?? 0) > 0))) {
-			children.push(incomingHistoryItemGroup);
-		}
-
-		// Outgoing
-		if (outgoingHistoryItemGroup &&
-			(showOutgoingChanges === 'always' ||
-				(showOutgoingChanges === 'auto' && (outgoingHistoryItemGroup.count ?? 0) > 0))) {
-			children.push(outgoingHistoryItemGroup);
-		}
-
-		return children;
-	}
-
-	getHistoryItemGroupFilter(element: ISCMRepository): Set<string> {
-		return this._historyItemGroupFilter.get(element) ?? new Set<string>();
-	}
-
-	deleteHistoryItemGroupFilter(repository: ISCMRepository): void {
-		this._historyItemGroupFilter.delete(repository);
-	}
-
-	toggleHistoryItemGroupFilter(element: ISCMRepository, historyItemGroupId: string): void {
-		const filters = this.getHistoryItemGroupFilter(element);
-		if (!filters.delete(historyItemGroupId)) {
-			filters.add(historyItemGroupId);
-		}
-
-		this._historyItemGroupFilter.set(element, filters);
-	}
-
-	async getHistoryItems(element: SCMHistoryItemGroupTreeElement): Promise<SCMHistoryItemTreeElement[]> {
-		const repository = element.repository;
-		const historyProvider = repository.provider.historyProvider.get();
-
-		if (!historyProvider) {
-			return [];
-		}
-
-		const historyProviderCacheEntry = this._getCacheEntry(repository);
-		const historyItemsMap = historyProviderCacheEntry.historyItems;
-		let historyItemsElement = historyProviderCacheEntry.historyItems.get(element.id);
-
-		if (!historyItemsElement) {
-			const historyItems = await historyProvider.provideHistoryItems(element.id, { limit: { id: element.ancestor } }) ?? [];
-
-			// All Changes
-			const { showChangesSummary } = this._getConfiguration();
-			const allChanges = showChangesSummary && historyItems.length >= 2 ?
-				await historyProvider.provideHistoryItemSummary(historyItems[0].id, element.ancestor) : undefined;
-
-			historyItemsElement = [allChanges, historyItems];
-			this._updateCacheEntry(repository, {
-				historyItems: historyItemsMap.set(element.id, historyItemsElement)
-			});
-		}
-
-		const children: SCMHistoryItemTreeElement[] = [];
-		if (historyItemsElement[0]) {
-			children.push({
-				...historyItemsElement[0],
-				icon: historyItemsElement[0].icon ?? Codicon.files,
-				message: localize('allChanges', "All Changes"),
-				historyItemGroup: element,
-				type: 'allChanges'
-			} satisfies SCMHistoryItemTreeElement);
-		}
-
-		children.push(...historyItemsElement[1]
-			.map(historyItem => ({
-				...historyItem,
-				historyItemGroup: element,
-				type: 'historyItem'
-			} satisfies SCMHistoryItemTreeElement)));
-
-		return children;
-	}
-
-	async getHistoryItems2(element: ISCMRepository): Promise<SCMHistoryItemViewModelTreeElement[]> {
-		const { showHistoryGraph } = this._getConfiguration();
-
-		const historyProvider = element.provider.historyProvider.get();
-		const currentHistoryItemGroup = historyProvider?.currentHistoryItemGroup.get();
-
-		if (!historyProvider || !currentHistoryItemGroup || !showHistoryGraph) {
-			return [];
-		}
-
-		const historyProviderCacheEntry = this._getCacheEntry(element);
-		let historyItemsElement = historyProviderCacheEntry.historyItems2.get(element.id);
-		const historyItemsMap = historyProviderCacheEntry.historyItems2;
-
-		if (!historyItemsElement) {
-			const historyItemGroupIds = [
-				currentHistoryItemGroup.id,
-				...currentHistoryItemGroup.remote ? [currentHistoryItemGroup.remote.id] : [],
-				...currentHistoryItemGroup.base ? [currentHistoryItemGroup.base.id] : [],
-			];
-
-			// Common ancestor of current, remote, base independent of the select history item group
-			const ancestor = await historyProvider.resolveHistoryItemGroupCommonAncestor2(historyItemGroupIds);
-			if (!ancestor) {
-				return [];
-			}
-
-			// History items of selected history item groups
-			const filters = this.getHistoryItemGroupFilter(element);
-			historyItemsElement = await historyProvider.provideHistoryItems2({
-				historyItemGroupIds: historyItemGroupIds.filter(id => !filters.has(id)),
-				limit: { id: ancestor }
-			}) ?? [];
-
-			this._updateCacheEntry(element, {
-				historyItems2: historyItemsMap.set(element.id, historyItemsElement)
-			});
-		}
-
-		// If we only have one history item that contains all the
-		// labels (current, remote, base), we don't need to show it
-		if (historyItemsElement.length === 1) {
-			const currentHistoryItemGroupLabels = [
-				currentHistoryItemGroup.name,
-				...currentHistoryItemGroup.remote ? [currentHistoryItemGroup.remote.name] : [],
-				...currentHistoryItemGroup.base ? [currentHistoryItemGroup.base.name] : [],
-			];
-
-			const labels = (historyItemsElement[0].labels ?? [])
-				.map(l => l.title);
-
-			if (equals(currentHistoryItemGroupLabels.sort(), labels.sort())) {
-				return [];
-			}
-		}
-
-		// Create the color map
-		const colorMap = new Map<string, ColorIdentifier>([
-			[currentHistoryItemGroup.name, historyItemGroupLocal]
-		]);
-		if (currentHistoryItemGroup.remote) {
-			colorMap.set(currentHistoryItemGroup.remote.name, historyItemGroupRemote);
-		}
-		if (currentHistoryItemGroup.base) {
-			colorMap.set(currentHistoryItemGroup.base.name, historyItemGroupBase);
-		}
-
-		return toISCMHistoryItemViewModelArray(historyItemsElement, colorMap)
-			.map(historyItemViewModel => ({
-				repository: element,
-				historyItemViewModel,
-				type: 'historyItem2'
-			}) satisfies SCMHistoryItemViewModelTreeElement);
-	}
-
-	async getHistoryItemChanges(element: SCMHistoryItemTreeElement): Promise<(SCMHistoryItemChangeTreeElement | IResourceNode<SCMHistoryItemChangeTreeElement, SCMHistoryItemTreeElement>)[]> {
-		const repository = element.historyItemGroup.repository;
-		const historyProvider = repository.provider.historyProvider.get();
-
-		if (!historyProvider) {
-			return [];
-		}
-
-		const historyProviderCacheEntry = this._getCacheEntry(repository);
-		const historyItemChangesMap = historyProviderCacheEntry.historyItemChanges;
-
-		const historyItemParentId = element.parentIds.length > 0 ? element.parentIds[0] : undefined;
-		let historyItemChanges = historyItemChangesMap.get(`${element.id}/${historyItemParentId}`);
-
-		if (!historyItemChanges) {
-			const historyItemParentId = element.parentIds.length > 0 ? element.parentIds[0] : undefined;
-			historyItemChanges = await historyProvider.provideHistoryItemChanges(element.id, historyItemParentId) ?? [];
-			this._updateCacheEntry(repository, {
-				historyItemChanges: historyItemChangesMap.set(`${element.id}/${historyItemParentId}`, historyItemChanges)
-			});
-		}
-
-		if (this.viewMode() === ViewMode.List) {
-			// List
-			return historyItemChanges.map(change => ({
-				...change,
-				historyItem: element,
-				type: 'historyItemChange'
-			}));
-		}
-
-		// Tree
-		const tree = new ResourceTree<SCMHistoryItemChangeTreeElement, SCMHistoryItemTreeElement>(element, repository.provider.rootUri ?? URI.file('/'), this.uriIdentityService.extUri);
-		for (const change of historyItemChanges) {
-			tree.add(change.uri, {
-				...change,
-				historyItem: element,
-				type: 'historyItemChange'
-			});
-		}
-
-		const children: (SCMHistoryItemChangeTreeElement | IResourceNode<SCMHistoryItemChangeTreeElement, SCMHistoryItemTreeElement>)[] = [];
-		for (const node of tree.root.children) {
-			children.push(node.element ?? node);
-		}
-
-		return children;
-	}
-
-	private _getCacheEntry(repository: ISCMRepository): ISCMHistoryProviderCacheEntry {
-		let entry = this._cache.get(repository);
-
-		if (!entry) {
-			entry = {
-				incomingHistoryItemGroup: undefined,
-				outgoingHistoryItemGroup: undefined,
-				historyItems: new Map<string, [ISCMHistoryItem | undefined, ISCMHistoryItem[]]>(),
-				historyItems2: new Map<string, ISCMHistoryItem[]>(),
-				historyItemChanges: new Map<string, ISCMHistoryItemChange[]>()
-			} satisfies ISCMHistoryProviderCacheEntry;
-
-			this._cache.set(repository, entry);
-		}
-
-		return entry;
-	}
-
-	private _updateCacheEntry(repository: ISCMRepository, entry: Partial<ISCMHistoryProviderCacheEntry>): void {
-		this._cache.set(repository, {
-			...this._getCacheEntry(repository),
-			...entry
-		});
-	}
-
-	private _getConfiguration(): {
-		showChangesSummary: boolean;
-		showIncomingChanges: ShowChangesSetting;
-		showOutgoingChanges: ShowChangesSetting;
-		showHistoryGraph: boolean;
-	} {
-		return {
-			showChangesSummary: this.configurationService.getValue<boolean>('scm.showChangesSummary'),
-			showIncomingChanges: this.configurationService.getValue<ShowChangesSetting>('scm.showIncomingChanges'),
-			showOutgoingChanges: this.configurationService.getValue<ShowChangesSetting>('scm.showOutgoingChanges'),
-			showHistoryGraph: this.configurationService.getValue<boolean>('scm.showHistoryGraph')
-		};
-	}
-}
-
 class SCMTreeDataSource extends Disposable implements IAsyncDataSource<ISCMViewService, TreeElement> {
 	constructor(
 		private readonly viewMode: () => ViewMode,
-		private readonly historyProviderDataSource: SCMTreeHistoryProviderDataSource,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
 		@ISCMViewService private readonly scmViewService: ISCMViewService
 	) {
@@ -4295,41 +3753,6 @@ class SCMTreeDataSource extends Disposable implements IAsyncDataSource<ISCMViewS
 				children.push(...resourceGroups);
 			}
 
-			// History item groups
-			const historyItemGroups = await this.historyProviderDataSource.getHistoryItemGroups(inputOrElement);
-
-			// Incoming/Outgoing Separator
-			if (historyItemGroups.length > 0) {
-				let label = localize('syncSeparatorHeader', "Incoming/Outgoing");
-				let ariaLabel = localize('syncSeparatorHeaderAriaLabel', "Incoming and outgoing changes");
-
-				const incomingHistoryItems = historyItemGroups.find(g => g.direction === 'incoming');
-				const outgoingHistoryItems = historyItemGroups.find(g => g.direction === 'outgoing');
-
-				if (incomingHistoryItems && !outgoingHistoryItems) {
-					label = localize('syncIncomingSeparatorHeader', "Incoming");
-					ariaLabel = localize('syncIncomingSeparatorHeaderAriaLabel', "Incoming changes");
-				} else if (!incomingHistoryItems && outgoingHistoryItems) {
-					label = localize('syncOutgoingSeparatorHeader', "Outgoing");
-					ariaLabel = localize('syncOutgoingSeparatorHeaderAriaLabel', "Outgoing changes");
-				}
-
-				children.push({ label, ariaLabel, repository: inputOrElement, type: 'separator' } satisfies SCMViewSeparatorElement);
-			}
-
-			children.push(...historyItemGroups);
-
-			// History items
-			const historyItems = await this.historyProviderDataSource.getHistoryItems2(inputOrElement);
-			if (historyItems.length > 0) {
-				const label = localize('syncSeparatorHeader', "Incoming/Outgoing");
-				const ariaLabel = localize('syncSeparatorHeaderAriaLabel', "Incoming and outgoing changes");
-
-				children.push({ label, ariaLabel, repository: inputOrElement, type: 'separator' } satisfies SCMViewSeparatorElement);
-			}
-
-			children.push(...historyItems);
-
 			return children;
 		} else if (isSCMResourceGroup(inputOrElement)) {
 			if (this.viewMode() === ViewMode.List) {
@@ -4352,12 +3775,6 @@ class SCMTreeDataSource extends Disposable implements IAsyncDataSource<ISCMViewS
 			}
 
 			return children;
-		} else if (isSCMHistoryItemGroupTreeElement(inputOrElement)) {
-			// History item group
-			return this.historyProviderDataSource.getHistoryItems(inputOrElement);
-		} else if (isSCMHistoryItemTreeElement(inputOrElement)) {
-			// History item changes (List/Tree)
-			return this.historyProviderDataSource.getHistoryItemChanges(inputOrElement);
 		}
 
 		return [];
@@ -4514,27 +3931,4 @@ export class SCMActionButton implements IDisposable {
 	}
 }
 
-// Override styles in selections.ts
-registerThemingParticipant((theme, collector) => {
-	const selectionBackgroundColor = theme.getColor(selectionBackground);
-
-	if (selectionBackgroundColor) {
-		// Override inactive selection bg
-		const inputBackgroundColor = theme.getColor(inputBackground);
-		if (inputBackgroundColor) {
-			collector.addRule(`.scm-view .scm-editor-container .monaco-editor-background { background-color: ${inputBackgroundColor}; } `);
-			collector.addRule(`.scm-view .scm-editor-container .monaco-editor .selected-text { background-color: ${inputBackgroundColor.transparent(0.4)}; }`);
-		}
-
-		// Override selected fg
-		const inputForegroundColor = theme.getColor(inputForeground);
-		if (inputForegroundColor) {
-			collector.addRule(`.scm-view .scm-editor-container .monaco-editor .view-line span.inline-selected-text { color: ${inputForegroundColor}; }`);
-		}
-
-		collector.addRule(`.scm-view .scm-editor-container .monaco-editor .focused .selected-text { background-color: ${selectionBackgroundColor}; }`);
-	} else {
-		// Use editor selection color if theme has not set a selection background color
-		collector.addRule(`.scm-view .scm-editor-container .monaco-editor .focused .selected-text { background-color: ${theme.getColor(editorSelectionBackground)}; }`);
-	}
-});
+setupSimpleEditorSelectionStyling('.scm-view .scm-editor-container');
diff --git a/src/vs/workbench/contrib/scm/browser/scmViewPaneContainer.ts b/src/vs/workbench/contrib/scm/browser/scmViewPaneContainer.ts
index c603d810d2b..1128546b764 100644
--- a/src/vs/workbench/contrib/scm/browser/scmViewPaneContainer.ts
+++ b/src/vs/workbench/contrib/scm/browser/scmViewPaneContainer.ts
@@ -6,7 +6,7 @@
 import 'vs/css!./media/scm';
 import { localize } from 'vs/nls';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { ISCMViewService, VIEWLET_ID } from 'vs/workbench/contrib/scm/common/scm';
+import { VIEWLET_ID } from 'vs/workbench/contrib/scm/common/scm';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
@@ -21,7 +21,6 @@ import { ViewPaneContainer } from 'vs/workbench/browser/parts/views/viewPaneCont
 export class SCMViewPaneContainer extends ViewPaneContainer {
 
 	constructor(
-		@ISCMViewService private readonly scmViewService: ISCMViewService,
 		@IWorkbenchLayoutService layoutService: IWorkbenchLayoutService,
 		@ITelemetryService telemetryService: ITelemetryService,
 		@IInstantiationService instantiationService: IInstantiationService,
@@ -49,8 +48,4 @@ export class SCMViewPaneContainer extends ViewPaneContainer {
 		return localize('source control', "Source Control");
 	}
 
-	override getActionsContext(): unknown {
-		return this.scmViewService.visibleRepositories.length === 1 ? this.scmViewService.visibleRepositories[0].provider : undefined;
-	}
-
 }
diff --git a/src/vs/workbench/contrib/scm/browser/util.ts b/src/vs/workbench/contrib/scm/browser/util.ts
index ed24dc67bf0..6d036fa7b34 100644
--- a/src/vs/workbench/contrib/scm/browser/util.ts
+++ b/src/vs/workbench/contrib/scm/browser/util.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as path from 'vs/base/common/path';
-import { SCMHistoryItemChangeTreeElement, SCMHistoryItemGroupTreeElement, SCMHistoryItemTreeElement, SCMHistoryItemViewModelTreeElement, SCMViewSeparatorElement } from 'vs/workbench/contrib/scm/common/history';
+import { SCMHistoryItemChangeTreeElement, SCMHistoryItemGroupTreeElement, SCMHistoryItemLoadMoreTreeElement, SCMHistoryItemTreeElement, SCMHistoryItemViewModelTreeElement, SCMViewSeparatorElement } from 'vs/workbench/contrib/scm/common/history';
 import { ISCMResource, ISCMRepository, ISCMResourceGroup, ISCMInput, ISCMActionButton, ISCMViewService, ISCMProvider } from 'vs/workbench/contrib/scm/common/scm';
 import { IMenu, MenuItemAction } from 'vs/platform/actions/common/actions';
 import { ActionBar, IActionViewItemProvider } from 'vs/base/browser/ui/actionbar/actionbar';
@@ -66,6 +66,10 @@ export function isSCMHistoryItemViewModelTreeElement(element: any): element is S
 	return (element as SCMHistoryItemViewModelTreeElement).type === 'historyItem2';
 }
 
+export function isSCMHistoryItemLoadMoreTreeElement(element: any): element is SCMHistoryItemLoadMoreTreeElement {
+	return (element as SCMHistoryItemLoadMoreTreeElement).type === 'historyItemLoadMore';
+}
+
 export function isSCMHistoryItemChangeTreeElement(element: any): element is SCMHistoryItemChangeTreeElement {
 	return (element as SCMHistoryItemChangeTreeElement).type === 'historyItemChange';
 }
diff --git a/src/vs/workbench/contrib/scm/common/history.ts b/src/vs/workbench/contrib/scm/common/history.ts
index 7e6bc762d0a..ea8911ac33d 100644
--- a/src/vs/workbench/contrib/scm/common/history.ts
+++ b/src/vs/workbench/contrib/scm/common/history.ts
@@ -21,7 +21,10 @@ export interface ISCMHistoryProviderMenus {
 export interface ISCMHistoryProvider {
 	readonly currentHistoryItemGroupId: IObservable<string | undefined>;
 	readonly currentHistoryItemGroupName: IObservable<string | undefined>;
+	readonly currentHistoryItemGroupRevision: IObservable<string | undefined>;
 	readonly currentHistoryItemGroup: IObservable<ISCMHistoryItemGroup | undefined>;
+	readonly currentHistoryItemGroupRemoteId: IObservable<string | undefined>;
+	readonly currentHistoryItemGroupRemoteRevision: IObservable<string | undefined>;
 
 	provideHistoryItems(historyItemGroupId: string, options: ISCMHistoryOptions): Promise<ISCMHistoryItem[] | undefined>;
 	provideHistoryItems2(options: ISCMHistoryOptions): Promise<ISCMHistoryItem[] | undefined>;
@@ -31,16 +34,9 @@ export interface ISCMHistoryProvider {
 	resolveHistoryItemGroupCommonAncestor2(historyItemGroupIds: string[]): Promise<string | undefined>;
 }
 
-export interface ISCMHistoryProviderCacheEntry {
-	readonly incomingHistoryItemGroup: SCMHistoryItemGroupTreeElement | undefined;
-	readonly outgoingHistoryItemGroup: SCMHistoryItemGroupTreeElement | undefined;
-	readonly historyItems: Map<string, [ISCMHistoryItem | undefined, ISCMHistoryItem[]]>;
-	readonly historyItems2: Map<string, ISCMHistoryItem[]>;
-	readonly historyItemChanges: Map<string, ISCMHistoryItemChange[]>;
-}
-
 export interface ISCMHistoryOptions {
 	readonly cursor?: string;
+	readonly skip?: number;
 	readonly limit?: number | { id?: string };
 	readonly historyItemGroupIds?: readonly string[];
 }
@@ -105,6 +101,12 @@ export interface SCMHistoryItemViewModelTreeElement {
 	readonly type: 'historyItem2';
 }
 
+export interface SCMHistoryItemLoadMoreTreeElement {
+	readonly repository: ISCMRepository;
+	readonly graphColumns: ISCMHistoryItemGraphNode[];
+	readonly type: 'historyItemLoadMore';
+}
+
 export interface SCMHistoryItemTreeElement extends ISCMHistoryItem {
 	readonly historyItemGroup: SCMHistoryItemGroupTreeElement;
 	readonly type: 'allChanges' | 'historyItem';
diff --git a/src/vs/workbench/contrib/scm/common/scm.ts b/src/vs/workbench/contrib/scm/common/scm.ts
index d4f812e822c..52f5563b2de 100644
--- a/src/vs/workbench/contrib/scm/common/scm.ts
+++ b/src/vs/workbench/contrib/scm/common/scm.ts
@@ -20,6 +20,7 @@ import { IObservable } from 'vs/base/common/observable';
 export const VIEWLET_ID = 'workbench.view.scm';
 export const VIEW_PANE_ID = 'workbench.scm';
 export const REPOSITORIES_VIEW_PANE_ID = 'workbench.scm.repositories';
+export const HISTORY_VIEW_PANE_ID = 'workbench.scm.history';
 
 export interface IBaselineResourceProvider {
 	getBaselineResource(resource: URI): Promise<URI>;
diff --git a/src/vs/workbench/contrib/search/browser/anythingQuickAccess.ts b/src/vs/workbench/contrib/search/browser/anythingQuickAccess.ts
index 74f304ba7a3..65e79d238a7 100644
--- a/src/vs/workbench/contrib/search/browser/anythingQuickAccess.ts
+++ b/src/vs/workbench/contrib/search/browser/anythingQuickAccess.ts
@@ -87,7 +87,7 @@ export class AnythingQuickAccessProvider extends PickerQuickAccessProvider<IAnyt
 
 	private readonly pickState = this._register(new class extends Disposable {
 
-		picker: IQuickPick<IAnythingQuickPickItem> | undefined = undefined;
+		picker: IQuickPick<IAnythingQuickPickItem, { useSeparators: true }> | undefined = undefined;
 
 		editorViewState = this._register(this.instantiationService.createInstance(PickerEditorState));
 
@@ -109,7 +109,7 @@ export class AnythingQuickAccessProvider extends PickerQuickAccessProvider<IAnyt
 			super();
 		}
 
-		set(picker: IQuickPick<IAnythingQuickPickItem>): void {
+		set(picker: IQuickPick<IAnythingQuickPickItem, { useSeparators: true }>): void {
 
 			// Picker for this run
 			this.picker = picker;
@@ -188,7 +188,7 @@ export class AnythingQuickAccessProvider extends PickerQuickAccessProvider<IAnyt
 		};
 	}
 
-	override provide(picker: IQuickPick<IAnythingQuickPickItem>, token: CancellationToken, runOptions?: AnythingQuickAccessProviderRunOptions): IDisposable {
+	override provide(picker: IQuickPick<IAnythingQuickPickItem, { useSeparators: true }>, token: CancellationToken, runOptions?: AnythingQuickAccessProviderRunOptions): IDisposable {
 		const disposables = new DisposableStore();
 
 		// Update the pick state for this run
diff --git a/src/vs/workbench/contrib/search/browser/notebookSearch/notebookSearchService.ts b/src/vs/workbench/contrib/search/browser/notebookSearch/notebookSearchService.ts
index 4ef1cdae76e..5265cf2c785 100644
--- a/src/vs/workbench/contrib/search/browser/notebookSearch/notebookSearchService.ts
+++ b/src/vs/workbench/contrib/search/browser/notebookSearch/notebookSearchService.ts
@@ -117,22 +117,21 @@ export class NotebookSearchService implements INotebookSearchService {
 	}
 
 	private async doesFileExist(includes: string[], folderQueries: IFolderQuery<URI>[], token: CancellationToken): Promise<boolean> {
-		const promises: Promise<void>[] = includes.map(async includePattern => {
+		const promises: Promise<boolean>[] = includes.map(async includePattern => {
 			const query = this.queryBuilder.file(folderQueries.map(e => e.folder), {
 				includePattern: includePattern.startsWith('/') ? includePattern : '**/' + includePattern, // todo: find cleaner way to ensure that globs match all appropriate filetypes
-				exists: true
+				exists: true,
+				onlyFileScheme: true,
 			});
 			return this.searchService.fileSearch(
 				query,
 				token
 			).then((ret) => {
-				if (!ret.limitHit) {
-					throw Error('File not found');
-				}
+				return !!ret.limitHit;
 			});
 		});
 
-		return Promise.any(promises).then(() => true).catch(() => false);
+		return Promise.any(promises);
 	}
 
 	private async getClosedNotebookResults(textQuery: ITextQuery, scannedFiles: ResourceSet, token: CancellationToken): Promise<IClosedNotebookSearchResults> {
diff --git a/src/vs/workbench/contrib/search/browser/notebookSearch/searchNotebookHelpers.ts b/src/vs/workbench/contrib/search/browser/notebookSearch/searchNotebookHelpers.ts
index 1211c0c35b3..d261e86146a 100644
--- a/src/vs/workbench/contrib/search/browser/notebookSearch/searchNotebookHelpers.ts
+++ b/src/vs/workbench/contrib/search/browser/notebookSearch/searchNotebookHelpers.ts
@@ -52,5 +52,5 @@ export function webviewMatchesToTextSearchMatches(webviewMatches: CellWebviewFin
 					new Range(0, rawMatch.searchPreviewInfo.range.start, 0, rawMatch.searchPreviewInfo.range.end),
 					undefined,
 					rawMatch.index) : undefined
-		).filter((e): e is ITextSearchMatch => !!e);
+		).filter((e): e is TextSearchMatch => !!e);
 }
diff --git a/src/vs/workbench/contrib/search/browser/quickTextSearch/textSearchQuickAccess.ts b/src/vs/workbench/contrib/search/browser/quickTextSearch/textSearchQuickAccess.ts
index bf17d3c47fc..6a54da2e050 100644
--- a/src/vs/workbench/contrib/search/browser/quickTextSearch/textSearchQuickAccess.ts
+++ b/src/vs/workbench/contrib/search/browser/quickTextSearch/textSearchQuickAccess.ts
@@ -100,7 +100,7 @@ export class TextSearchQuickAccess extends PickerQuickAccessProvider<ITextSearch
 		super.dispose();
 	}
 
-	override provide(picker: IQuickPick<ITextSearchQuickAccessItem>, token: CancellationToken, runOptions?: IQuickAccessProviderRunOptions): IDisposable {
+	override provide(picker: IQuickPick<ITextSearchQuickAccessItem, { useSeparators: true }>, token: CancellationToken, runOptions?: IQuickAccessProviderRunOptions): IDisposable {
 		const disposables = new DisposableStore();
 		if (TEXT_SEARCH_QUICK_ACCESS_PREFIX.length < picker.value.length) {
 			picker.valueSelection = [TEXT_SEARCH_QUICK_ACCESS_PREFIX.length, picker.value.length];
diff --git a/src/vs/workbench/contrib/search/browser/search.contribution.ts b/src/vs/workbench/contrib/search/browser/search.contribution.ts
index 1da6d744da9..93b067123e0 100644
--- a/src/vs/workbench/contrib/search/browser/search.contribution.ts
+++ b/src/vs/workbench/contrib/search/browser/search.contribution.ts
@@ -334,6 +334,11 @@ configurationRegistry.registerConfiguration({
 			default: 1,
 			markdownDescription: nls.localize('search.searchEditor.defaultNumberOfContextLines', "The default number of surrounding context lines to use when creating new Search Editors. If using `#search.searchEditor.reusePriorSearchConfiguration#`, this can be set to `null` (empty) to use the prior Search Editor's configuration.")
 		},
+		'search.searchEditor.focusResultsOnSearch': {
+			type: 'boolean',
+			default: false,
+			markdownDescription: nls.localize('search.searchEditor.focusResultsOnSearch', "When a search is triggered, focus the Search Editor results instead of the Search Editor input.")
+		},
 		'search.sortOrder': {
 			type: 'string',
 			enum: [SearchSortOrder.Default, SearchSortOrder.FileNames, SearchSortOrder.Type, SearchSortOrder.Modified, SearchSortOrder.CountDescending, SearchSortOrder.CountAscending],
diff --git a/src/vs/workbench/contrib/search/browser/searchModel.ts b/src/vs/workbench/contrib/search/browser/searchModel.ts
index 764f8966664..39fa7bb4e45 100644
--- a/src/vs/workbench/contrib/search/browser/searchModel.ts
+++ b/src/vs/workbench/contrib/search/browser/searchModel.ts
@@ -2479,20 +2479,12 @@ export class RangeHighlightDecorations implements IDisposable {
 	});
 }
 
-
-
 function textSearchResultToMatches(rawMatch: ITextSearchMatch, fileMatch: FileMatch, isAiContributed: boolean): Match[] {
-	const previewLines = rawMatch.preview.text.split('\n');
-	if (Array.isArray(rawMatch.ranges)) {
-		return rawMatch.ranges.map((r, i) => {
-			const previewRange: ISearchRange = (<ISearchRange[]>rawMatch.preview.matches)[i];
-			return new Match(fileMatch, previewLines, previewRange, r, isAiContributed);
-		});
-	} else {
-		const previewRange = <ISearchRange>rawMatch.preview.matches;
-		const match = new Match(fileMatch, previewLines, previewRange, rawMatch.ranges, isAiContributed);
-		return [match];
-	}
+	const previewLines = rawMatch.previewText.split('\n');
+	return rawMatch.rangeLocations.map((rangeLocation) => {
+		const previewRange: ISearchRange = rangeLocation.preview;
+		return new Match(fileMatch, previewLines, previewRange, rangeLocation.source, isAiContributed);
+	});
 }
 
 // text search to notebook matches
@@ -2500,18 +2492,12 @@ function textSearchResultToMatches(rawMatch: ITextSearchMatch, fileMatch: FileMa
 export function textSearchMatchesToNotebookMatches(textSearchMatches: ITextSearchMatch[], cell: CellMatch): MatchInNotebook[] {
 	const notebookMatches: MatchInNotebook[] = [];
 	textSearchMatches.forEach((textSearchMatch) => {
-		const previewLines = textSearchMatch.preview.text.split('\n');
-		if (Array.isArray(textSearchMatch.ranges)) {
-			textSearchMatch.ranges.forEach((r, i) => {
-				const previewRange: ISearchRange = (<ISearchRange[]>textSearchMatch.preview.matches)[i];
-				const match = new MatchInNotebook(cell, previewLines, previewRange, r, textSearchMatch.webviewIndex);
-				notebookMatches.push(match);
-			});
-		} else {
-			const previewRange = <ISearchRange>textSearchMatch.preview.matches;
-			const match = new MatchInNotebook(cell, previewLines, previewRange, textSearchMatch.ranges, textSearchMatch.webviewIndex);
+		const previewLines = textSearchMatch.previewText.split('\n');
+		textSearchMatch.rangeLocations.map((rangeLocation) => {
+			const previewRange: ISearchRange = rangeLocation.preview;
+			const match = new MatchInNotebook(cell, previewLines, previewRange, rangeLocation.source, textSearchMatch.webviewIndex);
 			notebookMatches.push(match);
-		}
+		});
 	});
 	return notebookMatches;
 }
diff --git a/src/vs/workbench/contrib/search/browser/searchResultsView.ts b/src/vs/workbench/contrib/search/browser/searchResultsView.ts
index 121512e94be..dd790ca14f5 100644
--- a/src/vs/workbench/contrib/search/browser/searchResultsView.ts
+++ b/src/vs/workbench/contrib/search/browser/searchResultsView.ts
@@ -235,7 +235,7 @@ export class FileMatchRenderer extends Disposable implements ICompressibleTreeRe
 		SearchContext.FileFocusKey.bindTo(contextKeyServiceMain).set(true);
 		SearchContext.FolderFocusKey.bindTo(contextKeyServiceMain).set(false);
 
-		const instantiationService = this.instantiationService.createChild(new ServiceCollection([IContextKeyService, contextKeyServiceMain]));
+		const instantiationService = this._register(this.instantiationService.createChild(new ServiceCollection([IContextKeyService, contextKeyServiceMain])));
 		const actions = disposables.add(instantiationService.createInstance(MenuWorkbenchToolBar, actionBarContainer, MenuId.SearchActionMenu, {
 			menuOptions: {
 				shouldForwardArgs: true
@@ -327,7 +327,7 @@ export class MatchRenderer extends Disposable implements ICompressibleTreeRender
 		SearchContext.FileFocusKey.bindTo(contextKeyServiceMain).set(false);
 		SearchContext.FolderFocusKey.bindTo(contextKeyServiceMain).set(false);
 
-		const instantiationService = this.instantiationService.createChild(new ServiceCollection([IContextKeyService, contextKeyServiceMain]));
+		const instantiationService = this._register(this.instantiationService.createChild(new ServiceCollection([IContextKeyService, contextKeyServiceMain])));
 		const actions = disposables.add(instantiationService.createInstance(MenuWorkbenchToolBar, actionBarContainer, MenuId.SearchActionMenu, {
 			menuOptions: {
 				shouldForwardArgs: true
diff --git a/src/vs/workbench/contrib/search/browser/searchView.ts b/src/vs/workbench/contrib/search/browser/searchView.ts
index 662d7fb9019..c677f0536e3 100644
--- a/src/vs/workbench/contrib/search/browser/searchView.ts
+++ b/src/vs/workbench/contrib/search/browser/searchView.ts
@@ -143,7 +143,7 @@ export class SearchView extends ViewPane {
 	private currentSelectedFileMatch: FileMatch | undefined;
 
 	private delayedRefresh: Delayer<void>;
-	private changedWhileHidden: boolean = false;
+	private changedWhileHidden: boolean;
 
 	private searchWithoutFolderMessageElement: HTMLElement | undefined;
 
@@ -256,7 +256,7 @@ export class SearchView extends ViewPane {
 			}
 		}));
 
-		this.viewModel = this._register(this.searchViewModelWorkbenchService.searchModel);
+		this.viewModel = this.searchViewModelWorkbenchService.searchModel;
 		this.queryBuilder = this.instantiationService.createInstance(QueryBuilder);
 		this.memento = new Memento(this.id, storageService);
 		this.viewletState = this.memento.getMemento(StorageScope.WORKSPACE, StorageTarget.MACHINE);
@@ -299,6 +299,8 @@ export class SearchView extends ViewPane {
 				this.searchWidget.prependReplaceHistory(restoredHistory.replace);
 			}
 		}));
+
+		this.changedWhileHidden = this.hasSearchResults();
 	}
 
 	get isTreeLayoutViewVisible(): boolean {
@@ -480,9 +482,10 @@ export class SearchView extends ViewPane {
 		this.queryDetails = dom.append(this.searchWidgetsContainerElement, $('.query-details'));
 
 		// Toggle query details button
+		const toggleQueryDetailsLabel = nls.localize('moreSearch', "Toggle Search Details");
 		this.toggleQueryDetailsButton = dom.append(this.queryDetails,
-			$('.more' + ThemeIcon.asCSSSelector(searchDetailsIcon), { tabindex: 0, role: 'button' }));
-		this._register(this.hoverService.setupManagedHover(getDefaultHoverDelegate('element'), this.toggleQueryDetailsButton, nls.localize('moreSearch', "Toggle Search Details")));
+			$('.more' + ThemeIcon.asCSSSelector(searchDetailsIcon), { tabindex: 0, role: 'button', 'aria-label': toggleQueryDetailsLabel }));
+		this._register(this.hoverService.setupManagedHover(getDefaultHoverDelegate('element'), this.toggleQueryDetailsButton, toggleQueryDetailsLabel));
 
 		this._register(dom.addDisposableListener(this.toggleQueryDetailsButton, dom.EventType.CLICK, e => {
 			dom.EventHelper.stop(e);
@@ -1589,7 +1592,7 @@ export class SearchView extends ViewPane {
 			}
 		};
 
-		const excludePattern = this.inputPatternExcludes.getValue();
+		const excludePattern = [{ pattern: this.inputPatternExcludes.getValue() }];
 		const includePattern = this.inputPatternIncludes.getValue();
 
 		// Need the full match line to correctly calculate replace text, if this is a search/replace with regex group references ($1, $2, ...).
diff --git a/src/vs/workbench/contrib/search/test/browser/searchNotebookHelpers.test.ts b/src/vs/workbench/contrib/search/test/browser/searchNotebookHelpers.test.ts
index f30dcaf0de3..fbd2327eb1d 100644
--- a/src/vs/workbench/contrib/search/test/browser/searchNotebookHelpers.test.ts
+++ b/src/vs/workbench/contrib/search/test/browser/searchNotebookHelpers.test.ts
@@ -149,28 +149,28 @@ suite('searchNotebookHelpers', () => {
 			codeWebviewResults = webviewMatchesToTextSearchMatches(codeCellFindMatch.webviewMatches);
 
 			assert.strictEqual(markdownContentResults.length, 1);
-			assert.strictEqual(markdownContentResults[0].preview.text, '# Hello World Test\n');
-			assertRangesEqual(markdownContentResults[0].preview.matches, [new Range(0, 14, 0, 18)]);
-			assertRangesEqual(markdownContentResults[0].ranges, [new Range(0, 14, 0, 18)]);
+			assert.strictEqual(markdownContentResults[0].previewText, '# Hello World Test\n');
+			assertRangesEqual(markdownContentResults[0].rangeLocations.map(e => e.preview), [new Range(0, 14, 0, 18)]);
+			assertRangesEqual(markdownContentResults[0].rangeLocations.map(e => e.source), [new Range(0, 14, 0, 18)]);
 
 
 			assert.strictEqual(codeContentResults.length, 2);
-			assert.strictEqual(codeContentResults[0].preview.text, 'print("test! testing!!")\n');
-			assert.strictEqual(codeContentResults[1].preview.text, 'print("this is a Test")\n');
-			assertRangesEqual(codeContentResults[0].preview.matches, [new Range(0, 7, 0, 11), new Range(0, 13, 0, 17)]);
-			assertRangesEqual(codeContentResults[0].ranges, [new Range(0, 7, 0, 11), new Range(0, 13, 0, 17)]);
+			assert.strictEqual(codeContentResults[0].previewText, 'print("test! testing!!")\n');
+			assert.strictEqual(codeContentResults[1].previewText, 'print("this is a Test")\n');
+			assertRangesEqual(codeContentResults[0].rangeLocations.map(e => e.preview), [new Range(0, 7, 0, 11), new Range(0, 13, 0, 17)]);
+			assertRangesEqual(codeContentResults[0].rangeLocations.map(e => e.source), [new Range(0, 7, 0, 11), new Range(0, 13, 0, 17)]);
 
 			assert.strictEqual(codeWebviewResults.length, 3);
-			assert.strictEqual(codeWebviewResults[0].preview.text, 'test! testing!!');
-			assert.strictEqual(codeWebviewResults[1].preview.text, 'test! testing!!');
-			assert.strictEqual(codeWebviewResults[2].preview.text, 'this is a Test');
-
-			assertRangesEqual(codeWebviewResults[0].preview.matches, [new Range(0, 1, 0, 5)]);
-			assertRangesEqual(codeWebviewResults[1].preview.matches, [new Range(0, 7, 0, 11)]);
-			assertRangesEqual(codeWebviewResults[2].preview.matches, [new Range(0, 11, 0, 15)]);
-			assertRangesEqual(codeWebviewResults[0].ranges, [new Range(0, 1, 0, 5)]);
-			assertRangesEqual(codeWebviewResults[1].ranges, [new Range(0, 7, 0, 11)]);
-			assertRangesEqual(codeWebviewResults[2].ranges, [new Range(0, 11, 0, 15)]);
+			assert.strictEqual(codeWebviewResults[0].previewText, 'test! testing!!');
+			assert.strictEqual(codeWebviewResults[1].previewText, 'test! testing!!');
+			assert.strictEqual(codeWebviewResults[2].previewText, 'this is a Test');
+
+			assertRangesEqual(codeWebviewResults[0].rangeLocations.map(e => e.preview), [new Range(0, 1, 0, 5)]);
+			assertRangesEqual(codeWebviewResults[1].rangeLocations.map(e => e.preview), [new Range(0, 7, 0, 11)]);
+			assertRangesEqual(codeWebviewResults[2].rangeLocations.map(e => e.preview), [new Range(0, 11, 0, 15)]);
+			assertRangesEqual(codeWebviewResults[0].rangeLocations.map(e => e.source), [new Range(0, 1, 0, 5)]);
+			assertRangesEqual(codeWebviewResults[1].rangeLocations.map(e => e.source), [new Range(0, 7, 0, 11)]);
+			assertRangesEqual(codeWebviewResults[2].rangeLocations.map(e => e.source), [new Range(0, 11, 0, 15)]);
 		});
 
 		test('convert ITextSearchMatch to MatchInNotebook', () => {
diff --git a/src/vs/workbench/contrib/search/test/browser/searchViewlet.test.ts b/src/vs/workbench/contrib/search/test/browser/searchViewlet.test.ts
index c35d9b87da6..d63cc7c48ef 100644
--- a/src/vs/workbench/contrib/search/test/browser/searchViewlet.test.ts
+++ b/src/vs/workbench/contrib/search/test/browser/searchViewlet.test.ts
@@ -60,21 +60,24 @@ suite('Search - Viewlet', () => {
 		result.add([{
 			resource: createFileUriFromPathFromRoot('/foo'),
 			results: [{
-				preview: {
-					text: 'bar',
-					matches: {
-						startLineNumber: 0,
-						startColumn: 0,
-						endLineNumber: 0,
-						endColumn: 1
+
+				previewText: 'bar',
+				rangeLocations: [
+					{
+						preview: {
+							startLineNumber: 0,
+							startColumn: 0,
+							endLineNumber: 0,
+							endColumn: 1
+						},
+						source: {
+							startLineNumber: 1,
+							startColumn: 0,
+							endLineNumber: 1,
+							endColumn: 1
+						}
 					}
-				},
-				ranges: {
-					startLineNumber: 1,
-					startColumn: 0,
-					endLineNumber: 1,
-					endColumn: 1
-				}
+				]
 			}]
 		}], '', false);
 
diff --git a/src/vs/workbench/contrib/searchEditor/browser/searchEditor.ts b/src/vs/workbench/contrib/searchEditor/browser/searchEditor.ts
index c3577b4e873..32f8ac94d59 100644
--- a/src/vs/workbench/contrib/searchEditor/browser/searchEditor.ts
+++ b/src/vs/workbench/contrib/searchEditor/browser/searchEditor.ts
@@ -165,8 +165,9 @@ export class SearchEditor extends AbstractTextCodeEditor<SearchEditorViewState>
 		this.includesExcludesContainer = DOM.append(container, DOM.$('.includes-excludes'));
 
 		// Toggle query details button
-		this.toggleQueryDetailsButton = DOM.append(this.includesExcludesContainer, DOM.$('.expand' + ThemeIcon.asCSSSelector(searchDetailsIcon), { tabindex: 0, role: 'button' }));
-		this._register(this.hoverService.setupManagedHover(getDefaultHoverDelegate('element'), this.toggleQueryDetailsButton, localize('moreSearch', "Toggle Search Details")));
+		const toggleQueryDetailsLabel = localize('moreSearch', "Toggle Search Details");
+		this.toggleQueryDetailsButton = DOM.append(this.includesExcludesContainer, DOM.$('.expand' + ThemeIcon.asCSSSelector(searchDetailsIcon), { tabindex: 0, role: 'button', 'aria-label': toggleQueryDetailsLabel }));
+		this._register(this.hoverService.setupManagedHover(getDefaultHoverDelegate('element'), this.toggleQueryDetailsButton, toggleQueryDetailsLabel));
 		this._register(DOM.addDisposableListener(this.toggleQueryDetailsButton, DOM.EventType.CLICK, e => {
 			DOM.EventHelper.stop(e);
 			this.toggleIncludesExcludes();
@@ -483,8 +484,21 @@ export class SearchEditor extends AbstractTextCodeEditor<SearchEditorViewState>
 	}
 
 	async triggerSearch(_options?: { resetCursor?: boolean; delay?: number; focusResults?: boolean }) {
+		const focusResults = this.searchConfig.searchEditor.focusResultsOnSearch;
+
+		// If _options don't define focusResult field, then use the setting
+		if (_options === undefined) {
+			_options = { focusResults: focusResults };
+		} else if (_options.focusResults === undefined) {
+			_options.focusResults = focusResults;
+		}
+
 		const options = { resetCursor: true, delay: 0, ..._options };
 
+		if (!(this.queryEditorWidget.searchInput?.inputBox.isInputValid())) {
+			return;
+		}
+
 		if (!this.pauseSearching) {
 			await this.runSearchDelayer.trigger(async () => {
 				this.toggleRunAgainMessage(false);
@@ -550,15 +564,14 @@ export class SearchEditor extends AbstractTextCodeEditor<SearchEditorViewState>
 			maxResults: this.searchConfig.maxResults ?? undefined,
 			disregardIgnoreFiles: !config.useExcludeSettingsAndIgnoreFiles || undefined,
 			disregardExcludeSettings: !config.useExcludeSettingsAndIgnoreFiles || undefined,
-			excludePattern: config.filesToExclude,
+			excludePattern: [{ pattern: config.filesToExclude }],
 			includePattern: config.filesToInclude,
 			onlyOpenEditors: config.onlyOpenEditors,
 			previewOptions: {
 				matchLines: 1,
 				charsPerLine: 1000
 			},
-			afterContext: config.contextLines,
-			beforeContext: config.contextLines,
+			surroundingContext: config.contextLines,
 			isSmartCase: this.searchConfig.smartCase,
 			expandPatterns: true,
 			notebookSearchConfig: {
diff --git a/src/vs/workbench/contrib/searchEditor/browser/searchEditorActions.ts b/src/vs/workbench/contrib/searchEditor/browser/searchEditorActions.ts
index 5ab5da3f9e6..970ea589887 100644
--- a/src/vs/workbench/contrib/searchEditor/browser/searchEditorActions.ts
+++ b/src/vs/workbench/contrib/searchEditor/browser/searchEditorActions.ts
@@ -219,6 +219,6 @@ export const createEditorFromSearchResult =
 		} else {
 			const input = instantiationService.invokeFunction(getOrMakeSearchEditorInput, { from: 'rawData', resultsContents: '', config: { ...config, contextLines } });
 			const editor = await editorService.openEditor(input, { pinned: true }) as SearchEditor;
-			editor.triggerSearch({ focusResults: true });
+			editor.triggerSearch();
 		}
 	};
diff --git a/src/vs/workbench/contrib/snippets/browser/snippetPicker.ts b/src/vs/workbench/contrib/snippets/browser/snippetPicker.ts
index 192845aa528..fea6822ab9f 100644
--- a/src/vs/workbench/contrib/snippets/browser/snippetPicker.ts
+++ b/src/vs/workbench/contrib/snippets/browser/snippetPicker.ts
@@ -11,6 +11,7 @@ import { Codicon } from 'vs/base/common/codicons';
 import { ThemeIcon } from 'vs/base/common/themables';
 import { Event } from 'vs/base/common/event';
 import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
+import { DisposableStore } from 'vs/base/common/lifecycle';
 
 export async function pickSnippet(accessor: ServicesAccessor, languageIdOrSnippets: string | Snippet[]): Promise<Snippet | undefined> {
 
@@ -77,16 +78,17 @@ export async function pickSnippet(accessor: ServicesAccessor, languageIdOrSnippe
 		return result;
 	};
 
-	const picker = quickInputService.createQuickPick<ISnippetPick>();
+	const disposables = new DisposableStore();
+	const picker = disposables.add(quickInputService.createQuickPick<ISnippetPick>({ useSeparators: true }));
 	picker.placeholder = nls.localize('pick.placeholder', "Select a snippet");
 	picker.matchOnDetail = true;
 	picker.ignoreFocusOut = false;
 	picker.keepScrollPosition = true;
-	picker.onDidTriggerItemButton(ctx => {
+	disposables.add(picker.onDidTriggerItemButton(ctx => {
 		const isEnabled = snippetService.isEnabled(ctx.item.snippet);
 		snippetService.updateEnablement(ctx.item.snippet, !isEnabled);
 		picker.items = makeSnippetPicks();
-	});
+	}));
 	picker.items = makeSnippetPicks();
 	if (!picker.items.length) {
 		picker.validationMessage = nls.localize('pick.noSnippetAvailable', "No snippet available");
@@ -96,6 +98,6 @@ export async function pickSnippet(accessor: ServicesAccessor, languageIdOrSnippe
 	// wait for an item to be picked or the picker to become hidden
 	await Promise.race([Event.toPromise(picker.onDidAccept), Event.toPromise(picker.onDidHide)]);
 	const result = picker.selectedItems[0]?.snippet;
-	picker.dispose();
+	disposables.dispose();
 	return result;
 }
diff --git a/src/vs/workbench/contrib/surveys/browser/ces.contribution.ts b/src/vs/workbench/contrib/surveys/browser/ces.contribution.ts
deleted file mode 100644
index b24d91f8da3..00000000000
--- a/src/vs/workbench/contrib/surveys/browser/ces.contribution.ts
+++ /dev/null
@@ -1,161 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import * as nls from 'vs/nls';
-import { language } from 'vs/base/common/platform';
-import { IWorkbenchContributionsRegistry, IWorkbenchContribution, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { IProductService } from 'vs/platform/product/common/productService';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { Severity, INotificationService } from 'vs/platform/notification/common/notification';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { IWorkbenchAssignmentService } from 'vs/workbench/services/assignment/common/assignmentService';
-import { URI } from 'vs/base/common/uri';
-import { platform } from 'vs/base/common/process';
-import { ThrottledDelayer } from 'vs/base/common/async';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { Event } from 'vs/base/common/event';
-
-const WAIT_TIME_TO_SHOW_SURVEY = 1000 * 60 * 60; // 1 hour
-const MIN_WAIT_TIME_TO_SHOW_SURVEY = 1000 * 60 * 2; // 2 minutes
-const MAX_INSTALL_AGE = 1000 * 60 * 60 * 24; // 24 hours
-const REMIND_LATER_DELAY = 1000 * 60 * 60 * 4; // 4 hours
-const SKIP_SURVEY_KEY = 'ces/skipSurvey';
-const REMIND_LATER_DATE_KEY = 'ces/remindLaterDate';
-
-class CESContribution extends Disposable implements IWorkbenchContribution {
-
-	private promptDelayer = this._register(new ThrottledDelayer<void>(0));
-	private readonly tasExperimentService: IWorkbenchAssignmentService | undefined;
-
-	constructor(
-		@IStorageService private readonly storageService: IStorageService,
-		@INotificationService private readonly notificationService: INotificationService,
-		@ITelemetryService private readonly telemetryService: ITelemetryService,
-		@IOpenerService private readonly openerService: IOpenerService,
-		@IProductService private readonly productService: IProductService,
-		@IWorkbenchAssignmentService tasExperimentService: IWorkbenchAssignmentService,
-	) {
-		super();
-
-		this.tasExperimentService = tasExperimentService;
-
-		if (!productService.cesSurveyUrl) {
-			return;
-		}
-
-		const skipSurvey = storageService.get(SKIP_SURVEY_KEY, StorageScope.APPLICATION, '');
-		if (skipSurvey) {
-			return;
-		}
-
-		this.schedulePrompt();
-	}
-
-	private async promptUser() {
-		const isCandidate = await this.tasExperimentService?.getTreatment<boolean>('CESSurvey');
-		if (!isCandidate) {
-			this.skipSurvey();
-			return;
-		}
-
-		const sendTelemetry = (userReaction: 'accept' | 'remindLater' | 'neverShowAgain' | 'cancelled') => {
-			/* __GDPR__
-			"cesSurvey:popup" : {
-				"owner": "digitarald",
-				"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-			}
-			*/
-			this.telemetryService.publicLog('cesSurvey:popup', { userReaction });
-		};
-
-		const message = await this.tasExperimentService?.getTreatment<string>('CESSurveyMessage') ?? nls.localize('cesSurveyQuestion', 'Got a moment to help the VS Code team? Please tell us about your experience with VS Code so far.');
-		const button = await this.tasExperimentService?.getTreatment<string>('CESSurveyButton') ?? nls.localize('giveFeedback', "Give Feedback");
-
-		const notification = this.notificationService.prompt(
-			Severity.Info,
-			message,
-			[{
-				label: button,
-				run: () => {
-					sendTelemetry('accept');
-					let surveyUrl = `${this.productService.cesSurveyUrl}?o=${encodeURIComponent(platform)}&v=${encodeURIComponent(this.productService.version)}&m=${encodeURIComponent(this.telemetryService.machineId)}`;
-
-					const usedParams = this.productService.surveys
-						?.filter(surveyData => surveyData.surveyId && surveyData.languageId)
-						// Counts provided by contrib/surveys/browser/languageSurveys
-						.filter(surveyData => this.storageService.getNumber(`${surveyData.surveyId}.editedCount`, StorageScope.APPLICATION, 0) > 0)
-						.map(surveyData => `${encodeURIComponent(surveyData.languageId)}Lang=1`)
-						.join('&');
-					if (usedParams) {
-						surveyUrl += `&${usedParams}`;
-					}
-					this.openerService.open(URI.parse(surveyUrl));
-					this.skipSurvey();
-				}
-			}, {
-				label: nls.localize('remindLater', "Remind Me Later"),
-				run: () => {
-					sendTelemetry('remindLater');
-					this.storageService.store(REMIND_LATER_DATE_KEY, new Date().toUTCString(), StorageScope.APPLICATION, StorageTarget.USER);
-					this.schedulePrompt();
-				}
-			}],
-			{
-				sticky: true,
-				onCancel: () => {
-					sendTelemetry('cancelled');
-					this.skipSurvey();
-				}
-			}
-		);
-
-		await Event.toPromise(notification.onDidClose);
-	}
-
-	private async schedulePrompt(): Promise<void> {
-		let waitTimeToShowSurvey = 0;
-		const remindLaterDate = this.storageService.get(REMIND_LATER_DATE_KEY, StorageScope.APPLICATION, '');
-		if (remindLaterDate) {
-			const timeToRemind = new Date(remindLaterDate).getTime() + REMIND_LATER_DELAY - Date.now();
-			if (timeToRemind > 0) {
-				waitTimeToShowSurvey = timeToRemind;
-			}
-		} else {
-			const timeFromInstall = Date.now() - new Date(this.telemetryService.firstSessionDate).getTime();
-			const isNewInstall = !isNaN(timeFromInstall) && timeFromInstall < MAX_INSTALL_AGE;
-
-			// Installation is older than MAX_INSTALL_AGE
-			if (!isNewInstall) {
-				this.skipSurvey();
-				return;
-			}
-			if (timeFromInstall < WAIT_TIME_TO_SHOW_SURVEY) {
-				waitTimeToShowSurvey = WAIT_TIME_TO_SHOW_SURVEY - timeFromInstall;
-			}
-		}
-		/* __GDPR__
-		"cesSurvey:schedule" : {
-			"owner": "digitarald"
-		}
-		*/
-		this.telemetryService.publicLog('cesSurvey:schedule');
-
-		this.promptDelayer.trigger(async () => {
-			await this.promptUser();
-		}, Math.max(waitTimeToShowSurvey, MIN_WAIT_TIME_TO_SHOW_SURVEY));
-	}
-
-	private skipSurvey(): void {
-		this.storageService.store(SKIP_SURVEY_KEY, this.productService.version, StorageScope.APPLICATION, StorageTarget.USER);
-	}
-}
-
-if (language === 'en') {
-	const workbenchRegistry = Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench);
-	workbenchRegistry.registerWorkbenchContribution(CESContribution, LifecyclePhase.Restored);
-}
diff --git a/src/vs/workbench/contrib/tags/common/javaWorkspaceTags.ts b/src/vs/workbench/contrib/tags/common/javaWorkspaceTags.ts
index 5e20a341739..5f2f1064da0 100644
--- a/src/vs/workbench/contrib/tags/common/javaWorkspaceTags.ts
+++ b/src/vs/workbench/contrib/tags/common/javaWorkspaceTags.ts
@@ -55,6 +55,25 @@ export const JavaLibrariesToLookFor: { predicate: (groupId: string, artifactId:
 	// event hubs
 	{ 'predicate': (groupId, artifactId) => groupId === 'com.azure' && artifactId.startsWith('azure-messaging-eventhubs'), 'tag': 'azure-eventhubs' },
 	{ 'predicate': (groupId, artifactId) => groupId === 'com.azure.spring' && artifactId.includes('eventhubs'), 'tag': 'azure-eventhubs' },
+	// ai related libraries
+	{ 'predicate': (groupId, artifactId) => groupId === 'dev.langchain4j', 'tag': 'langchain4j' },
+	{ 'predicate': (groupId, artifactId) => groupId === 'io.springboot.ai', 'tag': 'springboot-ai' },
+	{ 'predicate': (groupId, artifactId) => groupId === 'com.microsoft.semantic-kernel', 'tag': 'semantic-kernel' },
+	{ 'predicate': (groupId, artifactId) => groupId === 'com.azure' && artifactId === 'azure-ai-anomalydetector', 'tag': 'azure-ai-anomalydetector' },
+	{ 'predicate': (groupId, artifactId) => groupId === 'com.azure' && artifactId === 'azure-ai-formrecognizer', 'tag': 'azure-ai-formrecognizer' },
+	{ 'predicate': (groupId, artifactId) => groupId === 'com.azure' && artifactId === 'azure-ai-documentintelligence', 'tag': 'azure-ai-documentintelligence' },
+	{ 'predicate': (groupId, artifactId) => groupId === 'com.azure' && artifactId === 'azure-ai-translation-document', 'tag': 'azure-ai-translation-document' },
+	{ 'predicate': (groupId, artifactId) => groupId === 'com.azure' && artifactId === 'azure-ai-personalizer', 'tag': 'azure-ai-personalizer' },
+	{ 'predicate': (groupId, artifactId) => groupId === 'com.azure' && artifactId === 'azure-ai-translation-text', 'tag': 'azure-ai-translation-text' },
+	{ 'predicate': (groupId, artifactId) => groupId === 'com.azure' && artifactId === 'azure-ai-contentsafety', 'tag': 'azure-ai-contentsafety' },
+	{ 'predicate': (groupId, artifactId) => groupId === 'com.azure' && artifactId === 'azure-ai-vision-imageanalysis', 'tag': 'azure-ai-vision-imageanalysis' },
+	{ 'predicate': (groupId, artifactId) => groupId === 'com.azure' && artifactId === 'azure-ai-textanalytics', 'tag': 'azure-ai-textanalytics' },
+	{ 'predicate': (groupId, artifactId) => groupId === 'com.azure' && artifactId === 'azure-search-documents', 'tag': 'azure-search-documents' },
+	{ 'predicate': (groupId, artifactId) => groupId === 'com.azure' && artifactId === 'azure-ai-documenttranslator', 'tag': 'azure-ai-documenttranslator' },
+	{ 'predicate': (groupId, artifactId) => groupId === 'com.azure' && artifactId === 'azure-ai-vision-face', 'tag': 'azure-ai-vision-face' },
+	{ 'predicate': (groupId, artifactId) => groupId === 'com.azure' && artifactId === 'azure-ai-openai-assistants', 'tag': 'azure-ai-openai-assistants' },
+	{ 'predicate': (groupId, artifactId) => groupId === 'com.microsoft.azure.cognitiveservices', 'tag': 'azure-cognitiveservices' },
+	{ 'predicate': (groupId, artifactId) => groupId === 'com.microsoft.cognitiveservices.speech', 'tag': 'azure-cognitiveservices-speech' },
 	// open ai
 	{ 'predicate': (groupId, artifactId) => groupId === 'com.theokanning.openai-gpt3-java', 'tag': 'openai' },
 	// azure open ai
diff --git a/src/vs/workbench/contrib/tags/electron-sandbox/workspaceTagsService.ts b/src/vs/workbench/contrib/tags/electron-sandbox/workspaceTagsService.ts
index 9f731c0d526..9523e6c7662 100644
--- a/src/vs/workbench/contrib/tags/electron-sandbox/workspaceTagsService.ts
+++ b/src/vs/workbench/contrib/tags/electron-sandbox/workspaceTagsService.ts
@@ -160,6 +160,7 @@ const ModulesToLookFor = [
 	'@azure/attestation',
 	'@azure/data-tables',
 	'@azure/arm-appservice',
+	'@azure-rest/ai-inference',
 	'@azure-rest/arm-appservice',
 	'@azure/arm-appcontainers',
 	'@azure/arm-rediscache',
@@ -249,6 +250,7 @@ const PyMetaModulesToLookFor = [
 
 const PyModulesToLookFor = [
 	'azure',
+	'azure-ai-inference',
 	'azure-ai-language-conversations',
 	'azure-ai-language-questionanswering',
 	'azure-ai-ml',
@@ -671,6 +673,7 @@ export class WorkspaceTagsService implements IWorkspaceTagsService {
 			"workspace.npm.@azure/communication-administration" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.npm.@azure/attestation" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.npm.@azure/data-tables" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.npm.@azure-rest/ai-inference" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.npm.@azure-rest/arm-appservice" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.npm.@azure/arm-appservice" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.npm.@azure/arm-appcontainers" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
@@ -720,6 +723,24 @@ export class WorkspaceTagsService implements IWorkspaceTagsService {
 			"workspace.gradle.azure-storage" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.gradle.azure-servicebus" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.gradle.azure-eventhubs" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.gradle.langchain4j" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.gradle.springboot-ai" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.gradle.semantic-kernel" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.gradle.azure-ai-anomalydetector" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.gradle.azure-ai-formrecognizer" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.gradle.azure-ai-documentintelligence" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.gradle.azure-ai-translation-document" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.gradle.azure-ai-personalizer" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.gradle.azure-ai-translation-text" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.gradle.azure-ai-contentsafety" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.gradle.azure-ai-vision-imageanalysis" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.gradle.azure-ai-textanalytics" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.gradle.azure-search-documents" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.gradle.azure-ai-documenttranslator" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.gradle.azure-ai-vision-face" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.gradle.azure-ai-openai-assistants" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.gradle.azure-cognitiveservices" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.gradle.azure-cognitiveservices-speech" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.gradle.openai" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.gradle.azure-openai" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.gradle.azure-functions" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
@@ -741,6 +762,24 @@ export class WorkspaceTagsService implements IWorkspaceTagsService {
 			"workspace.pom.azure-storage" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.pom.azure-servicebus" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.pom.azure-eventhubs" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.pom.langchain4j" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.pom.springboot-ai" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.pom.semantic-kernel" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.pom.azure-ai-anomalydetector" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.pom.azure-ai-formrecognizer" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.pom.azure-ai-documentintelligence" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.pom.azure-ai-translation-document" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.pom.azure-ai-personalizer" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.pom.azure-ai-translation-text" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.pom.azure-ai-contentsafety" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.pom.azure-ai-vision-imageanalysis" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.pom.azure-ai-textanalytics" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.pom.azure-search-documents" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.pom.azure-ai-documenttranslator" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.pom.azure-ai-vision-face" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.pom.azure-ai-openai-assistants" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.pom.azure-cognitiveservices" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.pom.azure-cognitiveservices-speech" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.pom.openai" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.pom.azure-openai" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.pom.azure-functions" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
@@ -761,6 +800,7 @@ export class WorkspaceTagsService implements IWorkspaceTagsService {
 			"workspace.py.pulumi-azure" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.py.azure" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.py.azure-ai" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.py.azure-ai-inference" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.py.azure-ai-language-conversations" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.py.azure-ai-language-questionanswering" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.py.azure-ai-ml" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
diff --git a/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts b/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts
index 91cae4ca553..4670c5aaffb 100644
--- a/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts
+++ b/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts
@@ -55,7 +55,7 @@ import { getTemplates as getTaskTemplates } from 'vs/workbench/contrib/tasks/com
 import * as TaskConfig from '../common/taskConfiguration';
 import { TerminalTaskSystem } from './terminalTaskSystem';
 
-import { IQuickInputService, IQuickPick, IQuickPickItem, IQuickPickSeparator, QuickPickInput } from 'vs/platform/quickinput/common/quickInput';
+import { IQuickInputService, IQuickPickItem, IQuickPickSeparator, QuickPickInput } from 'vs/platform/quickinput/common/quickInput';
 
 import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { TaskDefinitionRegistry } from 'vs/workbench/contrib/tasks/common/taskDefinitionRegistry';
@@ -234,6 +234,8 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
 	private _onDidChangeTaskConfig: Emitter<void> = new Emitter();
 	public onDidChangeTaskConfig: Event<void> = this._onDidChangeTaskConfig.event;
 	public get isReconnected(): boolean { return this._tasksReconnected; }
+	private _onDidChangeTaskProviders = this._register(new Emitter<void>());
+	public onDidChangeTaskProviders = this._onDidChangeTaskProviders.event;
 
 	constructor(
 		@IConfigurationService private readonly _configurationService: IConfigurationService,
@@ -680,10 +682,12 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
 		const handle = AbstractTaskService._nextHandle++;
 		this._providers.set(handle, provider);
 		this._providerTypes.set(handle, type);
+		this._onDidChangeTaskProviders.fire();
 		return {
 			dispose: () => {
 				this._providers.delete(handle);
 				this._providerTypes.delete(handle);
+				this._onDidChangeTaskProviders.fire();
 			}
 		};
 	}
@@ -878,29 +882,15 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
 		if (!this._versionAndEngineCompatible(filter)) {
 			return Promise.resolve<Task[]>([]);
 		}
-		return this._getGroupedTasks(filter).then((map) => {
-			if (!filter || !filter.type) {
-				return map.all();
-			}
-			const result: Task[] = [];
-			map.forEach((tasks) => {
-				for (const task of tasks) {
-					if (ContributedTask.is(task) && ((task.defines.type === filter.type) || (task._source.label === filter.type))) {
-						result.push(task);
-					} else if (CustomTask.is(task)) {
-						if (task.type === filter.type) {
-							result.push(task);
-						} else {
-							const customizes = task.customizes();
-							if (customizes && customizes.type === filter.type) {
-								result.push(task);
-							}
-						}
-					}
-				}
-			});
-			return result;
-		});
+		return this._getGroupedTasks(filter).then((map) => this.applyFilterToTaskMap(filter, map));
+	}
+
+	public async getKnownTasks(filter?: ITaskFilter): Promise<Task[]> {
+		if (!this._versionAndEngineCompatible(filter)) {
+			return Promise.resolve<Task[]>([]);
+		}
+
+		return this._getGroupedTasks(filter, true, true).then((map) => this.applyFilterToTaskMap(filter, map));
 	}
 
 	public taskTypes(): string[] {
@@ -963,6 +953,30 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
 		return this._recentlyUsedTasksV1;
 	}
 
+	private applyFilterToTaskMap(filter: ITaskFilter | undefined, map: TaskMap): Task[] {
+		if (!filter || !filter.type) {
+			return map.all();
+		}
+		const result: Task[] = [];
+		map.forEach((tasks) => {
+			for (const task of tasks) {
+				if (ContributedTask.is(task) && ((task.defines.type === filter.type) || (task._source.label === filter.type))) {
+					result.push(task);
+				} else if (CustomTask.is(task)) {
+					if (task.type === filter.type) {
+						result.push(task);
+					} else {
+						const customizes = task.customizes();
+						if (customizes && customizes.type === filter.type) {
+							result.push(task);
+						}
+					}
+				}
+			}
+		});
+		return result;
+	}
+
 	private _getTasksFromStorage(type: 'persistent' | 'historical'): LRUCache<string, string> {
 		return type === 'persistent' ? this._getPersistentTasks() : this._getRecentTasks();
 	}
@@ -2009,7 +2023,7 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
 		return !definition || !definition.when || this._contextKeyService.contextMatchesRules(definition.when);
 	}
 
-	private async _getGroupedTasks(filter?: ITaskFilter, waitToActivate?: boolean): Promise<TaskMap> {
+	private async _getGroupedTasks(filter?: ITaskFilter, waitToActivate?: boolean, knownOnlyOrTrusted?: boolean): Promise<TaskMap> {
 		await this._waitForAllSupportedExecutions;
 		const type = filter?.type;
 		const needsRecentTasksMigration = this._needsRecentTasksMigration();
@@ -2096,141 +2110,144 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
 		}
 
 		try {
-			const customTasks = await this.getWorkspaceTasks();
-			const customTasksKeyValuePairs = Array.from(customTasks);
-			const customTasksPromises = customTasksKeyValuePairs.map(async ([key, folderTasks]) => {
-				const contributed = contributedTasks.get(key);
-				if (!folderTasks.set) {
-					if (contributed) {
-						result.add(key, ...contributed);
+			let tasks: [string, IWorkspaceFolderTaskResult][] = [];
+			// prevent workspace trust dialog from being shown in unexpected cases #224881
+			if (!knownOnlyOrTrusted || this._workspaceTrustManagementService.isWorkspaceTrusted()) {
+				tasks = Array.from(await this.getWorkspaceTasks());
+			}
+			await Promise.all(this._getCustomTaskPromises(tasks, filter, result, contributedTasks, waitToActivate));
+			if (needsRecentTasksMigration) {
+				// At this point we have all the tasks and can migrate the recently used tasks.
+				await this._migrateRecentTasks(result.all());
+			}
+			return result;
+		} catch {
+			// If we can't read the tasks.json file provide at least the contributed tasks
+			const result: TaskMap = new TaskMap();
+			for (const set of contributedTaskSets) {
+				for (const task of set.tasks) {
+					const folder = task.getWorkspaceFolder();
+					if (folder) {
+						result.add(folder, task);
 					}
-					return;
 				}
+			}
+			return result;
+		}
+	}
+	private _getCustomTaskPromises(customTasksKeyValuePairs: [string, IWorkspaceFolderTaskResult][], filter: ITaskFilter | undefined, result: TaskMap, contributedTasks: TaskMap, waitToActivate: boolean | undefined) {
+		return customTasksKeyValuePairs.map(async ([key, folderTasks]) => {
+			const contributed = contributedTasks.get(key);
+			if (!folderTasks.set) {
+				if (contributed) {
+					result.add(key, ...contributed);
+				}
+				return;
+			}
 
-				if (this._contextService.getWorkbenchState() === WorkbenchState.EMPTY) {
-					result.add(key, ...folderTasks.set.tasks);
-				} else {
-					const configurations = folderTasks.configurations;
-					const legacyTaskConfigurations = folderTasks.set ? this._getLegacyTaskConfigurations(folderTasks.set) : undefined;
-					const customTasksToDelete: Task[] = [];
-					if (configurations || legacyTaskConfigurations) {
-						const unUsedConfigurations: Set<string> = new Set<string>();
-						if (configurations) {
-							Object.keys(configurations.byIdentifier).forEach(key => unUsedConfigurations.add(key));
+			if (this._contextService.getWorkbenchState() === WorkbenchState.EMPTY) {
+				result.add(key, ...folderTasks.set.tasks);
+			} else {
+				const configurations = folderTasks.configurations;
+				const legacyTaskConfigurations = folderTasks.set ? this._getLegacyTaskConfigurations(folderTasks.set) : undefined;
+				const customTasksToDelete: Task[] = [];
+				if (configurations || legacyTaskConfigurations) {
+					const unUsedConfigurations: Set<string> = new Set<string>();
+					if (configurations) {
+						Object.keys(configurations.byIdentifier).forEach(key => unUsedConfigurations.add(key));
+					}
+					for (const task of contributed) {
+						if (!ContributedTask.is(task)) {
+							continue;
 						}
-						for (const task of contributed) {
-							if (!ContributedTask.is(task)) {
-								continue;
-							}
-							if (configurations) {
-								const configuringTask = configurations.byIdentifier[task.defines._key];
-								if (configuringTask) {
-									unUsedConfigurations.delete(task.defines._key);
-									result.add(key, TaskConfig.createCustomTask(task, configuringTask));
-								} else {
-									result.add(key, task);
-								}
-							} else if (legacyTaskConfigurations) {
-								const configuringTask = legacyTaskConfigurations[task.defines._key];
-								if (configuringTask) {
-									result.add(key, TaskConfig.createCustomTask(task, configuringTask));
-									customTasksToDelete.push(configuringTask);
-								} else {
-									result.add(key, task);
-								}
+						if (configurations) {
+							const configuringTask = configurations.byIdentifier[task.defines._key];
+							if (configuringTask) {
+								unUsedConfigurations.delete(task.defines._key);
+								result.add(key, TaskConfig.createCustomTask(task, configuringTask));
 							} else {
 								result.add(key, task);
 							}
-						}
-						if (customTasksToDelete.length > 0) {
-							const toDelete = customTasksToDelete.reduce<IStringDictionary<boolean>>((map, task) => {
-								map[task._id] = true;
-								return map;
-							}, Object.create(null));
-							for (const task of folderTasks.set.tasks) {
-								if (toDelete[task._id]) {
-									continue;
-								}
+						} else if (legacyTaskConfigurations) {
+							const configuringTask = legacyTaskConfigurations[task.defines._key];
+							if (configuringTask) {
+								result.add(key, TaskConfig.createCustomTask(task, configuringTask));
+								customTasksToDelete.push(configuringTask);
+							} else {
 								result.add(key, task);
 							}
 						} else {
-							result.add(key, ...folderTasks.set.tasks);
+							result.add(key, task);
+						}
+					}
+					if (customTasksToDelete.length > 0) {
+						const toDelete = customTasksToDelete.reduce<IStringDictionary<boolean>>((map, task) => {
+							map[task._id] = true;
+							return map;
+						}, Object.create(null));
+						for (const task of folderTasks.set.tasks) {
+							if (toDelete[task._id]) {
+								continue;
+							}
+							result.add(key, task);
 						}
+					} else {
+						result.add(key, ...folderTasks.set.tasks);
+					}
 
-						const unUsedConfigurationsAsArray = Array.from(unUsedConfigurations);
+					const unUsedConfigurationsAsArray = Array.from(unUsedConfigurations);
 
-						const unUsedConfigurationPromises = unUsedConfigurationsAsArray.map(async (value) => {
-							const configuringTask = configurations!.byIdentifier[value];
-							if (type && (type !== configuringTask.configures.type)) {
-								return;
-							}
+					const unUsedConfigurationPromises = unUsedConfigurationsAsArray.map(async (value) => {
+						const configuringTask = configurations!.byIdentifier[value];
+						if (filter?.type && (filter.type !== configuringTask.configures.type)) {
+							return;
+						}
 
-							let requiredTaskProviderUnavailable: boolean = false;
+						let requiredTaskProviderUnavailable: boolean = false;
 
-							for (const [handle, provider] of this._providers) {
-								const providerType = this._providerTypes.get(handle);
-								if (configuringTask.type === providerType) {
-									if (providerType && !this._isTaskProviderEnabled(providerType)) {
-										requiredTaskProviderUnavailable = true;
-										continue;
-									}
+						for (const [handle, provider] of this._providers) {
+							const providerType = this._providerTypes.get(handle);
+							if (configuringTask.type === providerType) {
+								if (providerType && !this._isTaskProviderEnabled(providerType)) {
+									requiredTaskProviderUnavailable = true;
+									continue;
+								}
 
-									try {
-										const resolvedTask = await provider.resolveTask(configuringTask);
-										if (resolvedTask && (resolvedTask._id === configuringTask._id)) {
-											result.add(key, TaskConfig.createCustomTask(resolvedTask, configuringTask));
-											return;
-										}
-									} catch (error) {
-										// Ignore errors. The task could not be provided by any of the providers.
+								try {
+									const resolvedTask = await provider.resolveTask(configuringTask);
+									if (resolvedTask && (resolvedTask._id === configuringTask._id)) {
+										result.add(key, TaskConfig.createCustomTask(resolvedTask, configuringTask));
+										return;
 									}
+								} catch (error) {
+									// Ignore errors. The task could not be provided by any of the providers.
 								}
 							}
+						}
+						if (requiredTaskProviderUnavailable) {
+							this._log(nls.localize(
+								'TaskService.providerUnavailable',
+								'Warning: {0} tasks are unavailable in the current environment.',
+								configuringTask.configures.type
+							));
+						} else if (!waitToActivate) {
+							this._log(nls.localize(
+								'TaskService.noConfiguration',
+								'Error: The {0} task detection didn\'t contribute a task for the following configuration:\n{1}\nThe task will be ignored.',
+								configuringTask.configures.type,
+								JSON.stringify(configuringTask._source.config.element, undefined, 4)
+							));
+							this._showOutput();
+						}
+					});
 
-							if (requiredTaskProviderUnavailable) {
-								this._log(nls.localize(
-									'TaskService.providerUnavailable',
-									'Warning: {0} tasks are unavailable in the current environment.',
-									configuringTask.configures.type
-								));
-							} else {
-								this._log(nls.localize(
-									'TaskService.noConfiguration',
-									'Error: The {0} task detection didn\'t contribute a task for the following configuration:\n{1}\nThe task will be ignored.',
-									configuringTask.configures.type,
-									JSON.stringify(configuringTask._source.config.element, undefined, 4)
-								));
-								this._showOutput();
-							}
-						});
-
-						await Promise.all(unUsedConfigurationPromises);
-					} else {
-						result.add(key, ...folderTasks.set.tasks);
-						result.add(key, ...contributed);
-					}
-				}
-			});
-
-			await Promise.all(customTasksPromises);
-			if (needsRecentTasksMigration) {
-				// At this point we have all the tasks and can migrate the recently used tasks.
-				await this._migrateRecentTasks(result.all());
-			}
-			return result;
-		} catch {
-			// If we can't read the tasks.json file provide at least the contributed tasks
-			const result: TaskMap = new TaskMap();
-			for (const set of contributedTaskSets) {
-				for (const task of set.tasks) {
-					const folder = task.getWorkspaceFolder();
-					if (folder) {
-						result.add(folder, task);
-					}
+					await Promise.all(unUsedConfigurationPromises);
+				} else {
+					result.add(key, ...folderTasks.set.tasks);
+					result.add(key, ...contributed);
 				}
 			}
-			return result;
-		}
+		});
 	}
 
 	private _getLegacyTaskConfigurations(workspaceTasks: ITaskSet): IStringDictionary<CustomTask> | undefined {
@@ -2728,34 +2745,22 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
 			entries.push(additionalEntries[0]);
 		}
 
-		const picker: IQuickPick<ITaskQuickPickEntry> = this._quickInputService.createQuickPick();
-		picker.placeholder = placeHolder;
-		picker.matchOnDescription = true;
-		if (name) {
-			picker.value = name;
-		}
-		picker.onDidTriggerItemButton(context => {
-			const task = context.item.task;
-			this._quickInputService.cancel();
-			if (ContributedTask.is(task)) {
-				this.customize(task, undefined, true);
-			} else if (CustomTask.is(task)) {
-				this.openConfig(task);
-			}
-		});
-		picker.items = entries;
-		picker.show();
-
-		return new Promise<ITaskQuickPickEntry | undefined | null>(resolve => {
-			this._register(picker.onDidAccept(async () => {
-				const selectedEntry = picker.selectedItems ? picker.selectedItems[0] : undefined;
-				picker.dispose();
-				if (!selectedEntry) {
-					resolve(undefined);
-				}
-				resolve(selectedEntry);
-			}));
-		});
+		return this._quickInputService.pick<ITaskQuickPickEntry>(
+			entries,
+			{
+				value: name,
+				placeHolder,
+				matchOnDescription: true,
+				onDidTriggerItemButton: context => {
+					const task = context.item.task;
+					this._quickInputService.cancel();
+					if (ContributedTask.is(task)) {
+						this.customize(task, undefined, true);
+					} else if (CustomTask.is(task)) {
+						this.openConfig(task);
+					}
+				},
+			});
 	}
 
 	private _needsRecentTasksMigration(): boolean {
diff --git a/src/vs/workbench/contrib/tasks/browser/taskQuickPick.ts b/src/vs/workbench/contrib/tasks/browser/taskQuickPick.ts
index fe0e1641dc1..37ae4fe36bc 100644
--- a/src/vs/workbench/contrib/tasks/browser/taskQuickPick.ts
+++ b/src/vs/workbench/contrib/tasks/browser/taskQuickPick.ts
@@ -11,7 +11,7 @@ import * as Types from 'vs/base/common/types';
 import { ITaskService, IWorkspaceFolderTaskResult } from 'vs/workbench/contrib/tasks/common/taskService';
 import { IQuickPickItem, QuickPickInput, IQuickPick, IQuickInputButton, IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
+import { Disposable, DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
 import { Event } from 'vs/base/common/event';
 import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
 import { Codicon } from 'vs/base/common/codicons';
@@ -229,11 +229,12 @@ export class TaskQuickPick extends Disposable {
 	}
 
 	public async show(placeHolder: string, defaultEntry?: ITaskQuickPickEntry, startAtType?: string, name?: string): Promise<Task | undefined | null> {
-		const picker: IQuickPick<ITaskTwoLevelQuickPickEntry> = this._quickInputService.createQuickPick();
+		const disposables = new DisposableStore();
+		const picker = disposables.add(this._quickInputService.createQuickPick<ITaskTwoLevelQuickPickEntry>({ useSeparators: true }));
 		picker.placeholder = placeHolder;
 		picker.matchOnDescription = true;
 		picker.ignoreFocusOut = false;
-		picker.onDidTriggerItemButton(async (context) => {
+		disposables.add(picker.onDidTriggerItemButton(async (context) => {
 			const task = context.item.task;
 			if (context.button.iconClass === ThemeIcon.asClassName(removeTaskIcon)) {
 				const key = (task && !Types.isString(task)) ? task.getKey() : undefined;
@@ -260,7 +261,7 @@ export class TaskQuickPick extends Disposable {
 					}
 				}
 			}
-		});
+		}));
 		if (name) {
 			picker.value = name;
 		}
@@ -269,37 +270,37 @@ export class TaskQuickPick extends Disposable {
 			// First show recent tasks configured tasks. Other tasks will be available at a second level
 			const topLevelEntriesResult = await this.getTopLevelEntries(defaultEntry);
 			if (topLevelEntriesResult.isSingleConfigured && this._configurationService.getValue<boolean>(QUICKOPEN_SKIP_CONFIG)) {
-				picker.dispose();
+				disposables.dispose();
 				return this._toTask(topLevelEntriesResult.isSingleConfigured);
 			}
 			const taskQuickPickEntries: QuickPickInput<ITaskTwoLevelQuickPickEntry>[] = topLevelEntriesResult.entries;
-			firstLevelTask = await this._doPickerFirstLevel(picker, taskQuickPickEntries);
+			firstLevelTask = await this._doPickerFirstLevel(picker, taskQuickPickEntries, disposables);
 		}
 		do {
 			if (Types.isString(firstLevelTask)) {
 				if (name) {
-					await this._doPickerFirstLevel(picker, (await this.getTopLevelEntries(defaultEntry)).entries);
-					picker.dispose();
+					await this._doPickerFirstLevel(picker, (await this.getTopLevelEntries(defaultEntry)).entries, disposables);
+					disposables.dispose();
 					return undefined;
 				}
-				const selectedEntry = await this.doPickerSecondLevel(picker, firstLevelTask);
+				const selectedEntry = await this.doPickerSecondLevel(picker, disposables, firstLevelTask);
 				// Proceed to second level of quick pick
 				if (selectedEntry && !selectedEntry.settingType && selectedEntry.task === null) {
 					// The user has chosen to go back to the first level
 					picker.value = '';
-					firstLevelTask = await this._doPickerFirstLevel(picker, (await this.getTopLevelEntries(defaultEntry)).entries);
+					firstLevelTask = await this._doPickerFirstLevel(picker, (await this.getTopLevelEntries(defaultEntry)).entries, disposables);
 				} else if (selectedEntry && Types.isString(selectedEntry.settingType)) {
-					picker.dispose();
+					disposables.dispose();
 					return this.handleSettingOption(selectedEntry.settingType);
 				} else {
-					picker.dispose();
+					disposables.dispose();
 					return (selectedEntry?.task && !Types.isString(selectedEntry?.task)) ? this._toTask(selectedEntry?.task) : undefined;
 				}
 			} else if (firstLevelTask) {
-				picker.dispose();
+				disposables.dispose();
 				return this._toTask(firstLevelTask);
 			} else {
-				picker.dispose();
+				disposables.dispose();
 				return firstLevelTask;
 			}
 		} while (1);
@@ -308,18 +309,18 @@ export class TaskQuickPick extends Disposable {
 
 
 
-	private async _doPickerFirstLevel(picker: IQuickPick<ITaskTwoLevelQuickPickEntry>, taskQuickPickEntries: QuickPickInput<ITaskTwoLevelQuickPickEntry>[]): Promise<Task | ConfiguringTask | string | null | undefined> {
+	private async _doPickerFirstLevel(picker: IQuickPick<ITaskTwoLevelQuickPickEntry, { useSeparators: true }>, taskQuickPickEntries: QuickPickInput<ITaskTwoLevelQuickPickEntry>[], disposables: DisposableStore): Promise<Task | ConfiguringTask | string | null | undefined> {
 		picker.items = taskQuickPickEntries;
-		showWithPinnedItems(this._storageService, runTaskStorageKey, picker, true);
+		disposables.add(showWithPinnedItems(this._storageService, runTaskStorageKey, picker, true));
 		const firstLevelPickerResult = await new Promise<ITaskTwoLevelQuickPickEntry | undefined | null>(resolve => {
-			Event.once(picker.onDidAccept)(async () => {
+			disposables.add(Event.once(picker.onDidAccept)(async () => {
 				resolve(picker.selectedItems ? picker.selectedItems[0] : undefined);
-			});
+			}));
 		});
 		return firstLevelPickerResult?.task;
 	}
 
-	public async doPickerSecondLevel(picker: IQuickPick<ITaskTwoLevelQuickPickEntry>, type: string, name?: string) {
+	public async doPickerSecondLevel(picker: IQuickPick<ITaskTwoLevelQuickPickEntry, { useSeparators: true }>, disposables: DisposableStore, type: string, name?: string) {
 		picker.busy = true;
 		if (type === SHOW_ALL) {
 			const items = (await this._taskService.tasks()).filter(t => !t.configurationProperties.hide).sort((a, b) => this._sorter.compare(a, b)).map(task => this._createTaskEntry(task));
@@ -332,9 +333,9 @@ export class TaskQuickPick extends Disposable {
 		await picker.show();
 		picker.busy = false;
 		const secondLevelPickerResult = await new Promise<ITaskTwoLevelQuickPickEntry | undefined | null>(resolve => {
-			Event.once(picker.onDidAccept)(async () => {
+			disposables.add(Event.once(picker.onDidAccept)(async () => {
 				resolve(picker.selectedItems ? picker.selectedItems[0] : undefined);
-			});
+			}));
 		});
 		return secondLevelPickerResult;
 	}
diff --git a/src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts b/src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts
index 117501cdadd..6919111b4c6 100644
--- a/src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts
+++ b/src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts
@@ -562,9 +562,7 @@ export class TerminalTaskSystem extends Disposable implements ITaskSystem {
 				return { exitCode: 0 };
 			});
 		}).finally(() => {
-			if (this._activeTasks[mapKey] === activeTask) {
-				delete this._activeTasks[mapKey];
-			}
+			delete this._activeTasks[mapKey];
 		});
 		const lastInstance = this._getInstances(task).pop();
 		const count = lastInstance?.count ?? { count: 0 };
diff --git a/src/vs/workbench/contrib/tasks/common/problemMatcher.ts b/src/vs/workbench/contrib/tasks/common/problemMatcher.ts
index 0bb6027fcb2..591f201162d 100644
--- a/src/vs/workbench/contrib/tasks/common/problemMatcher.ts
+++ b/src/vs/workbench/contrib/tasks/common/problemMatcher.ts
@@ -1195,6 +1195,212 @@ export namespace Schemas {
 			}
 		}
 	};
+
+	export const WatchingPattern: IJSONSchema = {
+		type: 'object',
+		additionalProperties: false,
+		properties: {
+			regexp: {
+				type: 'string',
+				description: localize('WatchingPatternSchema.regexp', 'The regular expression to detect the begin or end of a background task.')
+			},
+			file: {
+				type: 'integer',
+				description: localize('WatchingPatternSchema.file', 'The match group index of the filename. Can be omitted.')
+			},
+		}
+	};
+
+	export const PatternType: IJSONSchema = {
+		anyOf: [
+			{
+				type: 'string',
+				description: localize('PatternTypeSchema.name', 'The name of a contributed or predefined pattern')
+			},
+			Schemas.ProblemPattern,
+			Schemas.MultiLineProblemPattern
+		],
+		description: localize('PatternTypeSchema.description', 'A problem pattern or the name of a contributed or predefined problem pattern. Can be omitted if base is specified.')
+	};
+
+	export const ProblemMatcher: IJSONSchema = {
+		type: 'object',
+		additionalProperties: false,
+		properties: {
+			base: {
+				type: 'string',
+				description: localize('ProblemMatcherSchema.base', 'The name of a base problem matcher to use.')
+			},
+			owner: {
+				type: 'string',
+				description: localize('ProblemMatcherSchema.owner', 'The owner of the problem inside Code. Can be omitted if base is specified. Defaults to \'external\' if omitted and base is not specified.')
+			},
+			source: {
+				type: 'string',
+				description: localize('ProblemMatcherSchema.source', 'A human-readable string describing the source of this diagnostic, e.g. \'typescript\' or \'super lint\'.')
+			},
+			severity: {
+				type: 'string',
+				enum: ['error', 'warning', 'info'],
+				description: localize('ProblemMatcherSchema.severity', 'The default severity for captures problems. Is used if the pattern doesn\'t define a match group for severity.')
+			},
+			applyTo: {
+				type: 'string',
+				enum: ['allDocuments', 'openDocuments', 'closedDocuments'],
+				description: localize('ProblemMatcherSchema.applyTo', 'Controls if a problem reported on a text document is applied only to open, closed or all documents.')
+			},
+			pattern: PatternType,
+			fileLocation: {
+				oneOf: [
+					{
+						type: 'string',
+						enum: ['absolute', 'relative', 'autoDetect', 'search']
+					},
+					{
+						type: 'array',
+						prefixItems: [
+							{
+								type: 'string',
+								enum: ['absolute', 'relative', 'autoDetect', 'search']
+							},
+						],
+						minItems: 1,
+						maxItems: 1,
+						additionalItems: false
+					},
+					{
+						type: 'array',
+						prefixItems: [
+							{ type: 'string', enum: ['relative', 'autoDetect'] },
+							{ type: 'string' },
+						],
+						minItems: 2,
+						maxItems: 2,
+						additionalItems: false,
+						examples: [
+							['relative', '${workspaceFolder}'],
+							['autoDetect', '${workspaceFolder}'],
+						]
+					},
+					{
+						type: 'array',
+						prefixItems: [
+							{ type: 'string', enum: ['search'] },
+							{
+								type: 'object',
+								properties: {
+									'include': {
+										oneOf: [
+											{ type: 'string' },
+											{ type: 'array', items: { type: 'string' } }
+										]
+									},
+									'exclude': {
+										oneOf: [
+											{ type: 'string' },
+											{ type: 'array', items: { type: 'string' } }
+										]
+									},
+								},
+								required: ['include']
+							}
+						],
+						minItems: 2,
+						maxItems: 2,
+						additionalItems: false,
+						examples: [
+							['search', { 'include': ['${workspaceFolder}'] }],
+							['search', { 'include': ['${workspaceFolder}'], 'exclude': [] }]
+						],
+					}
+				],
+				description: localize('ProblemMatcherSchema.fileLocation', 'Defines how file names reported in a problem pattern should be interpreted. A relative fileLocation may be an array, where the second element of the array is the path of the relative file location. The search fileLocation mode, performs a deep (and, possibly, heavy) file system search within the directories specified by the include/exclude properties of the second element (or the current workspace directory if not specified).')
+			},
+			background: {
+				type: 'object',
+				additionalProperties: false,
+				description: localize('ProblemMatcherSchema.background', 'Patterns to track the begin and end of a matcher active on a background task.'),
+				properties: {
+					activeOnStart: {
+						type: 'boolean',
+						description: localize('ProblemMatcherSchema.background.activeOnStart', 'If set to true the background monitor is in active mode when the task starts. This is equals of issuing a line that matches the beginsPattern')
+					},
+					beginsPattern: {
+						oneOf: [
+							{
+								type: 'string'
+							},
+							Schemas.WatchingPattern
+						],
+						description: localize('ProblemMatcherSchema.background.beginsPattern', 'If matched in the output the start of a background task is signaled.')
+					},
+					endsPattern: {
+						oneOf: [
+							{
+								type: 'string'
+							},
+							Schemas.WatchingPattern
+						],
+						description: localize('ProblemMatcherSchema.background.endsPattern', 'If matched in the output the end of a background task is signaled.')
+					}
+				}
+			},
+			watching: {
+				type: 'object',
+				additionalProperties: false,
+				deprecationMessage: localize('ProblemMatcherSchema.watching.deprecated', 'The watching property is deprecated. Use background instead.'),
+				description: localize('ProblemMatcherSchema.watching', 'Patterns to track the begin and end of a watching matcher.'),
+				properties: {
+					activeOnStart: {
+						type: 'boolean',
+						description: localize('ProblemMatcherSchema.watching.activeOnStart', 'If set to true the watcher is in active mode when the task starts. This is equals of issuing a line that matches the beginPattern')
+					},
+					beginsPattern: {
+						oneOf: [
+							{
+								type: 'string'
+							},
+							Schemas.WatchingPattern
+						],
+						description: localize('ProblemMatcherSchema.watching.beginsPattern', 'If matched in the output the start of a watching task is signaled.')
+					},
+					endsPattern: {
+						oneOf: [
+							{
+								type: 'string'
+							},
+							Schemas.WatchingPattern
+						],
+						description: localize('ProblemMatcherSchema.watching.endsPattern', 'If matched in the output the end of a watching task is signaled.')
+					}
+				}
+			}
+		}
+	};
+
+	export const LegacyProblemMatcher: IJSONSchema = Objects.deepClone(ProblemMatcher);
+	LegacyProblemMatcher.properties = Objects.deepClone(LegacyProblemMatcher.properties) || {};
+	LegacyProblemMatcher.properties['watchedTaskBeginsRegExp'] = {
+		type: 'string',
+		deprecationMessage: localize('LegacyProblemMatcherSchema.watchedBegin.deprecated', 'This property is deprecated. Use the watching property instead.'),
+		description: localize('LegacyProblemMatcherSchema.watchedBegin', 'A regular expression signaling that a watched tasks begins executing triggered through file watching.')
+	};
+	LegacyProblemMatcher.properties['watchedTaskEndsRegExp'] = {
+		type: 'string',
+		deprecationMessage: localize('LegacyProblemMatcherSchema.watchedEnd.deprecated', 'This property is deprecated. Use the watching property instead.'),
+		description: localize('LegacyProblemMatcherSchema.watchedEnd', 'A regular expression signaling that a watched tasks ends executing.')
+	};
+
+	export const NamedProblemMatcher: IJSONSchema = Objects.deepClone(ProblemMatcher);
+	NamedProblemMatcher.properties = Objects.deepClone(NamedProblemMatcher.properties) || {};
+	NamedProblemMatcher.properties.name = {
+		type: 'string',
+		description: localize('NamedProblemMatcherSchema.name', 'The name of the problem matcher used to refer to it.')
+	};
+	NamedProblemMatcher.properties.label = {
+		type: 'string',
+		description: localize('NamedProblemMatcherSchema.label', 'A human readable label of the problem matcher.')
+	};
 }
 
 const problemPatternExtPoint = ExtensionsRegistry.registerExtensionPoint<Config.NamedProblemPatterns>({
@@ -1630,216 +1836,6 @@ export class ProblemMatcherParser extends Parser {
 	}
 }
 
-export namespace Schemas {
-
-	export const WatchingPattern: IJSONSchema = {
-		type: 'object',
-		additionalProperties: false,
-		properties: {
-			regexp: {
-				type: 'string',
-				description: localize('WatchingPatternSchema.regexp', 'The regular expression to detect the begin or end of a background task.')
-			},
-			file: {
-				type: 'integer',
-				description: localize('WatchingPatternSchema.file', 'The match group index of the filename. Can be omitted.')
-			},
-		}
-	};
-
-
-	export const PatternType: IJSONSchema = {
-		anyOf: [
-			{
-				type: 'string',
-				description: localize('PatternTypeSchema.name', 'The name of a contributed or predefined pattern')
-			},
-			Schemas.ProblemPattern,
-			Schemas.MultiLineProblemPattern
-		],
-		description: localize('PatternTypeSchema.description', 'A problem pattern or the name of a contributed or predefined problem pattern. Can be omitted if base is specified.')
-	};
-
-	export const ProblemMatcher: IJSONSchema = {
-		type: 'object',
-		additionalProperties: false,
-		properties: {
-			base: {
-				type: 'string',
-				description: localize('ProblemMatcherSchema.base', 'The name of a base problem matcher to use.')
-			},
-			owner: {
-				type: 'string',
-				description: localize('ProblemMatcherSchema.owner', 'The owner of the problem inside Code. Can be omitted if base is specified. Defaults to \'external\' if omitted and base is not specified.')
-			},
-			source: {
-				type: 'string',
-				description: localize('ProblemMatcherSchema.source', 'A human-readable string describing the source of this diagnostic, e.g. \'typescript\' or \'super lint\'.')
-			},
-			severity: {
-				type: 'string',
-				enum: ['error', 'warning', 'info'],
-				description: localize('ProblemMatcherSchema.severity', 'The default severity for captures problems. Is used if the pattern doesn\'t define a match group for severity.')
-			},
-			applyTo: {
-				type: 'string',
-				enum: ['allDocuments', 'openDocuments', 'closedDocuments'],
-				description: localize('ProblemMatcherSchema.applyTo', 'Controls if a problem reported on a text document is applied only to open, closed or all documents.')
-			},
-			pattern: PatternType,
-			fileLocation: {
-				oneOf: [
-					{
-						type: 'string',
-						enum: ['absolute', 'relative', 'autoDetect', 'search']
-					},
-					{
-						type: 'array',
-						prefixItems: [
-							{
-								type: 'string',
-								enum: ['absolute', 'relative', 'autoDetect', 'search']
-							},
-						],
-						minItems: 1,
-						maxItems: 1,
-						additionalItems: false
-					},
-					{
-						type: 'array',
-						prefixItems: [
-							{ type: 'string', enum: ['relative', 'autoDetect'] },
-							{ type: 'string' },
-						],
-						minItems: 2,
-						maxItems: 2,
-						additionalItems: false,
-						examples: [
-							['relative', '${workspaceFolder}'],
-							['autoDetect', '${workspaceFolder}'],
-						]
-					},
-					{
-						type: 'array',
-						prefixItems: [
-							{ type: 'string', enum: ['search'] },
-							{
-								type: 'object',
-								properties: {
-									'include': {
-										oneOf: [
-											{ type: 'string' },
-											{ type: 'array', items: { type: 'string' } }
-										]
-									},
-									'exclude': {
-										oneOf: [
-											{ type: 'string' },
-											{ type: 'array', items: { type: 'string' } }
-										]
-									},
-								},
-								required: ['include']
-							}
-						],
-						minItems: 2,
-						maxItems: 2,
-						additionalItems: false,
-						examples: [
-							['search', { 'include': ['${workspaceFolder}'] }],
-							['search', { 'include': ['${workspaceFolder}'], 'exclude': [] }]
-						],
-					}
-				],
-				description: localize('ProblemMatcherSchema.fileLocation', 'Defines how file names reported in a problem pattern should be interpreted. A relative fileLocation may be an array, where the second element of the array is the path of the relative file location. The search fileLocation mode, performs a deep (and, possibly, heavy) file system search within the directories specified by the include/exclude properties of the second element (or the current workspace directory if not specified).')
-			},
-			background: {
-				type: 'object',
-				additionalProperties: false,
-				description: localize('ProblemMatcherSchema.background', 'Patterns to track the begin and end of a matcher active on a background task.'),
-				properties: {
-					activeOnStart: {
-						type: 'boolean',
-						description: localize('ProblemMatcherSchema.background.activeOnStart', 'If set to true the background monitor is in active mode when the task starts. This is equals of issuing a line that matches the beginsPattern')
-					},
-					beginsPattern: {
-						oneOf: [
-							{
-								type: 'string'
-							},
-							Schemas.WatchingPattern
-						],
-						description: localize('ProblemMatcherSchema.background.beginsPattern', 'If matched in the output the start of a background task is signaled.')
-					},
-					endsPattern: {
-						oneOf: [
-							{
-								type: 'string'
-							},
-							Schemas.WatchingPattern
-						],
-						description: localize('ProblemMatcherSchema.background.endsPattern', 'If matched in the output the end of a background task is signaled.')
-					}
-				}
-			},
-			watching: {
-				type: 'object',
-				additionalProperties: false,
-				deprecationMessage: localize('ProblemMatcherSchema.watching.deprecated', 'The watching property is deprecated. Use background instead.'),
-				description: localize('ProblemMatcherSchema.watching', 'Patterns to track the begin and end of a watching matcher.'),
-				properties: {
-					activeOnStart: {
-						type: 'boolean',
-						description: localize('ProblemMatcherSchema.watching.activeOnStart', 'If set to true the watcher is in active mode when the task starts. This is equals of issuing a line that matches the beginPattern')
-					},
-					beginsPattern: {
-						oneOf: [
-							{
-								type: 'string'
-							},
-							Schemas.WatchingPattern
-						],
-						description: localize('ProblemMatcherSchema.watching.beginsPattern', 'If matched in the output the start of a watching task is signaled.')
-					},
-					endsPattern: {
-						oneOf: [
-							{
-								type: 'string'
-							},
-							Schemas.WatchingPattern
-						],
-						description: localize('ProblemMatcherSchema.watching.endsPattern', 'If matched in the output the end of a watching task is signaled.')
-					}
-				}
-			}
-		}
-	};
-
-	export const LegacyProblemMatcher: IJSONSchema = Objects.deepClone(ProblemMatcher);
-	LegacyProblemMatcher.properties = Objects.deepClone(LegacyProblemMatcher.properties) || {};
-	LegacyProblemMatcher.properties['watchedTaskBeginsRegExp'] = {
-		type: 'string',
-		deprecationMessage: localize('LegacyProblemMatcherSchema.watchedBegin.deprecated', 'This property is deprecated. Use the watching property instead.'),
-		description: localize('LegacyProblemMatcherSchema.watchedBegin', 'A regular expression signaling that a watched tasks begins executing triggered through file watching.')
-	};
-	LegacyProblemMatcher.properties['watchedTaskEndsRegExp'] = {
-		type: 'string',
-		deprecationMessage: localize('LegacyProblemMatcherSchema.watchedEnd.deprecated', 'This property is deprecated. Use the watching property instead.'),
-		description: localize('LegacyProblemMatcherSchema.watchedEnd', 'A regular expression signaling that a watched tasks ends executing.')
-	};
-
-	export const NamedProblemMatcher: IJSONSchema = Objects.deepClone(ProblemMatcher);
-	NamedProblemMatcher.properties = Objects.deepClone(NamedProblemMatcher.properties) || {};
-	NamedProblemMatcher.properties.name = {
-		type: 'string',
-		description: localize('NamedProblemMatcherSchema.name', 'The name of the problem matcher used to refer to it.')
-	};
-	NamedProblemMatcher.properties.label = {
-		type: 'string',
-		description: localize('NamedProblemMatcherSchema.label', 'A human readable label of the problem matcher.')
-	};
-}
-
 const problemMatchersExtPoint = ExtensionsRegistry.registerExtensionPoint<Config.INamedProblemMatcher[]>({
 	extensionPoint: 'problemMatchers',
 	deps: [problemPatternExtPoint],
diff --git a/src/vs/workbench/contrib/tasks/common/taskConfiguration.ts b/src/vs/workbench/contrib/tasks/common/taskConfiguration.ts
index 0de3b0a3839..6670671e78d 100644
--- a/src/vs/workbench/contrib/tasks/common/taskConfiguration.ts
+++ b/src/vs/workbench/contrib/tasks/common/taskConfiguration.ts
@@ -133,6 +133,7 @@ export interface IPresentationOptionsConfig {
 
 	/**
 	 * Controls whether the terminal that the task runs in is closed when the task completes.
+	 * Note that if the terminal process exits with a non-zero exit code, it will not close.
 	 */
 	close?: boolean;
 }
diff --git a/src/vs/workbench/contrib/tasks/common/taskService.ts b/src/vs/workbench/contrib/tasks/common/taskService.ts
index 3db39c2267d..dab0931a4c1 100644
--- a/src/vs/workbench/contrib/tasks/common/taskService.ts
+++ b/src/vs/workbench/contrib/tasks/common/taskService.ts
@@ -64,6 +64,8 @@ export interface IWorkspaceFolderTaskResult extends IWorkspaceTaskResult {
 export interface ITaskService {
 	readonly _serviceBrand: undefined;
 	onDidStateChange: Event<ITaskEvent>;
+	/** Fired when task providers are registered or unregistered */
+	onDidChangeTaskProviders: Event<void>;
 	isReconnected: boolean;
 	onDidReconnectToTasks: Event<void>;
 	supportsMultipleTaskExecutions: boolean;
@@ -75,6 +77,11 @@ export interface ITaskService {
 	getBusyTasks(): Promise<Task[]>;
 	terminate(task: Task): Promise<ITaskTerminateResponse>;
 	tasks(filter?: ITaskFilter): Promise<Task[]>;
+	/**
+	 * Gets tasks currently known to the task system. Unlike {@link tasks},
+	 * this does not activate extensions or prompt for workspace trust.
+	 */
+	getKnownTasks(filter?: ITaskFilter): Promise<Task[]>;
 	taskTypes(): string[];
 	getWorkspaceTasks(runSource?: TaskRunSource): Promise<Map<string, IWorkspaceFolderTaskResult>>;
 	getSavedTasks(type: 'persistent' | 'historical'): Promise<(Task | ConfiguringTask)[]>;
diff --git a/src/vs/workbench/contrib/terminal/browser/media/GitTabExpansion.psm1 b/src/vs/workbench/contrib/terminal/browser/media/GitTabExpansion.psm1
index 8bfad955965..ad61806ab5e 100644
--- a/src/vs/workbench/contrib/terminal/browser/media/GitTabExpansion.psm1
+++ b/src/vs/workbench/contrib/terminal/browser/media/GitTabExpansion.psm1
@@ -546,14 +546,16 @@ function GitTabExpansionInternal($lastBlock, $GitStatus = $null) {
 
 		# Handles git checkout|switch <ref>
 		"^(?:checkout|switch).* (?<ref>\S*)$" {
-			& {
-				& {
-					gitBranches $matches['ref'] $true
-					gitRemoteUniqueBranches $matches['ref']
-					# Return only unique branches (to eliminate duplicates where the branch exists locally and on the remote)
-				} | Select-Object -Unique | ConvertTo-VscodeCompletion -Type 'branch'
-
-				gitTags $matches['ref'] | Select-Object -Unique | ConvertTo-VscodeCompletion -Type 'tag'
+			if ($lastBlock -match "-b\s[^\s]*$") {
+				$null # Force zero results
+			} else {
+				[System.Management.Automation.CompletionResult]::new('.', '.', 'ParameterName', "Discard changes in working directory")
+				$lastCheckout = [System.Management.Automation.CompletionResult]::new('-', '-', 'ParameterName', "The last branch or commit that was checked out")
+				$lastCheckout | Add-Member -NotePropertyName 'CustomIcon' -NotePropertyValue 'gitBranch'
+				$lastCheckout
+				gitBranches $matches['ref'] $true | ConvertTo-VscodeCompletion -Type 'branch'
+				gitRemoteUniqueBranches $matches['ref'] | ConvertTo-VscodeCompletion -Type 'branch'
+				gitTags $matches['ref'] | ConvertTo-VscodeCompletion -Type 'tag'
 			}
 		}
 
@@ -607,11 +609,23 @@ function ConvertTo-VscodeCompletion {
 		[Parameter(ValueFromPipeline=$true)]
 		$CompletionText,
 		[string]
-		$Type
+		$Type,
+		[string]
+		$CustomIcon
 	)
 
 	Process {
-		$CompletionText | ForEach-Object { [System.Management.Automation.CompletionResult]::new($_, $_, 'DynamicKeyword', "$type $_") }
+		$completionMappings = @{
+			"branch" = "gitBranch"
+			"stash" = "gitStash"
+			"remote" = "remote"
+			"tag" = "tag"
+		}
+		$CompletionText | ForEach-Object {
+			$result = [System.Management.Automation.CompletionResult]::new($_, $_, [System.Management.Automation.CompletionResultType]::DynamicKeyword, "$Type $_")
+			$result | Add-Member -NotePropertyName 'CustomIcon' -NotePropertyValue $completionMappings[$Type]
+			$result
+		}
 	}
 }
 
@@ -641,7 +655,12 @@ Microsoft.PowerShell.Core\Register-ArgumentCompleter -CommandName $cmdNames -Nat
 	$textToComplete = $commandAst.ToString().PadRight($padLength, ' ').Substring(0, $padLength)
 
 	WriteTabExpLog "Expand: command: '$($commandAst.Extent.Text)', padded: '$textToComplete', padlen: $padLength"
-	Expand-GitCommand $textToComplete
+	$result = Expand-GitCommand $textToComplete
+	if ($null -eq $result) {
+		,@()
+	} else {
+		$result
+	}
 }
 
 
diff --git a/src/vs/workbench/contrib/terminal/browser/media/fish_xdg_data/fish/vendor_conf.d/shellIntegration.fish b/src/vs/workbench/contrib/terminal/browser/media/fish_xdg_data/fish/vendor_conf.d/shellIntegration.fish
index a771735ae52..0377d700096 100644
--- a/src/vs/workbench/contrib/terminal/browser/media/fish_xdg_data/fish/vendor_conf.d/shellIntegration.fish
+++ b/src/vs/workbench/contrib/terminal/browser/media/fish_xdg_data/fish/vendor_conf.d/shellIntegration.fish
@@ -24,7 +24,7 @@ set --global VSCODE_SHELL_INTEGRATION 1
 
 # Apply any explicit path prefix (see #99878)
 if status --is-login; and set -q VSCODE_PATH_PREFIX
-	fish_add_path -p $VSCODE_PATH_PREFIX
+	set -gx PATH "$VSCODE_PATH_PREFIX$PATH"
 end
 set -e VSCODE_PATH_PREFIX
 
diff --git a/src/vs/workbench/contrib/terminal/browser/media/shellIntegration-bash.sh b/src/vs/workbench/contrib/terminal/browser/media/shellIntegration-bash.sh
index e56630f1b08..fbeaa22f90a 100755
--- a/src/vs/workbench/contrib/terminal/browser/media/shellIntegration-bash.sh
+++ b/src/vs/workbench/contrib/terminal/browser/media/shellIntegration-bash.sh
@@ -34,7 +34,7 @@ if [ "$VSCODE_INJECTION" == "1" ]; then
 
 		# Apply any explicit path prefix (see #99878)
 		if [ -n "${VSCODE_PATH_PREFIX:-}" ]; then
-			export PATH=$VSCODE_PATH_PREFIX$PATH
+			export PATH="$VSCODE_PATH_PREFIX$PATH"
 			builtin unset VSCODE_PATH_PREFIX
 		fi
 	fi
@@ -328,10 +328,10 @@ __vsc_restore_exit_code() {
 
 __vsc_prompt_cmd_original() {
 	__vsc_status="$?"
+	builtin local cmd
 	__vsc_restore_exit_code "${__vsc_status}"
 	# Evaluate the original PROMPT_COMMAND similarly to how bash would normally
 	# See https://unix.stackexchange.com/a/672843 for technique
-	builtin local cmd
 	for cmd in "${__vsc_original_prompt_command[@]}"; do
 		eval "${cmd:-}"
 	done
diff --git a/src/vs/workbench/contrib/terminal/browser/media/shellIntegration-profile.zsh b/src/vs/workbench/contrib/terminal/browser/media/shellIntegration-profile.zsh
index 5a45b076b22..c25ded3d7eb 100644
--- a/src/vs/workbench/contrib/terminal/browser/media/shellIntegration-profile.zsh
+++ b/src/vs/workbench/contrib/terminal/browser/media/shellIntegration-profile.zsh
@@ -2,15 +2,17 @@
 #   Copyright (c) Microsoft Corporation. All rights reserved.
 #   Licensed under the MIT License. See License.txt in the project root for license information.
 # ---------------------------------------------------------------------------------------------
-if [[ $options[norcs] = off && -o "login" &&  -f $USER_ZDOTDIR/.zprofile ]]; then
-	VSCODE_ZDOTDIR=$ZDOTDIR
-	ZDOTDIR=$USER_ZDOTDIR
-	. $USER_ZDOTDIR/.zprofile
-	ZDOTDIR=$VSCODE_ZDOTDIR
+if [[ $options[norcs] = off && -o "login" ]]; then
+	if [[ -f $USER_ZDOTDIR/.zprofile ]]; then
+		VSCODE_ZDOTDIR=$ZDOTDIR
+		ZDOTDIR=$USER_ZDOTDIR
+		. $USER_ZDOTDIR/.zprofile
+		ZDOTDIR=$VSCODE_ZDOTDIR
+	fi
 
 	# Apply any explicit path prefix (see #99878)
 	if (( ${+VSCODE_PATH_PREFIX} )); then
-		export PATH=$VSCODE_PATH_PREFIX$PATH
+		export PATH="$VSCODE_PATH_PREFIX$PATH"
 	fi
 	builtin unset VSCODE_PATH_PREFIX
 fi
diff --git a/src/vs/workbench/contrib/terminal/browser/media/shellIntegration.ps1 b/src/vs/workbench/contrib/terminal/browser/media/shellIntegration.ps1
index 3bf39da3c3f..444df38452d 100644
--- a/src/vs/workbench/contrib/terminal/browser/media/shellIntegration.ps1
+++ b/src/vs/workbench/contrib/terminal/browser/media/shellIntegration.ps1
@@ -170,6 +170,13 @@ function Set-MappedKeyHandler {
 	}
 }
 
+function Get-KeywordCompletionResult(
+	$Keyword,
+	$Description = $Keyword
+) {
+	[System.Management.Automation.CompletionResult]::new($Keyword, $Keyword, [System.Management.Automation.CompletionResultType]::Keyword, $Description)
+}
+
 function Set-MappedKeyHandlers {
 	Set-MappedKeyHandler -Chord Ctrl+Spacebar -Sequence 'F12,a'
 	Set-MappedKeyHandler -Chord Alt+Spacebar -Sequence 'F12,b'
@@ -178,7 +185,7 @@ function Set-MappedKeyHandlers {
 
 	# Enable suggestions if the environment variable is set and Windows PowerShell is not being used
 	# as APIs are not available to support this feature
-	if ($env:VSCODE_SUGGEST -eq '1' -and $PSVersionTable.PSVersion -ge "6.0") {
+	if ($env:VSCODE_SUGGEST -eq '1' -and $PSVersionTable.PSVersion -ge "7.0") {
 		Remove-Item Env:VSCODE_SUGGEST
 
 		# VS Code send completions request (may override Ctrl+Spacebar)
@@ -189,7 +196,115 @@ function Set-MappedKeyHandlers {
 		# VS Code send global completions request
 		Set-PSReadLineKeyHandler -Chord 'F12,f' -ScriptBlock {
 			# Get commands, convert to string array to reduce the payload size and send as JSON
-			$commands = [System.Management.Automation.CompletionCompleters]::CompleteCommand('')
+			$commands = @(
+				[System.Management.Automation.CompletionCompleters]::CompleteCommand('')
+				Get-KeywordCompletionResult -Keyword 'begin'
+				Get-KeywordCompletionResult -Keyword 'break'
+				Get-KeywordCompletionResult -Keyword 'catch' -Description "catch [[<error type>][',' <error type>]*] {<statement list>}"
+				Get-KeywordCompletionResult -Keyword 'class' -Description @"
+class <class-name> [: [<base-class>][,<interface-list>]] {
+    [[<attribute>] [hidden] [static] <property-definition> ...]
+    [<class-name>([<constructor-argument-list>])
+      {<constructor-statement-list>} ...]
+    [[<attribute>] [hidden] [static] <method-definition> ...]
+}
+"@
+				Get-KeywordCompletionResult -Keyword 'clean'
+				Get-KeywordCompletionResult -Keyword 'continue'
+				Get-KeywordCompletionResult -Keyword 'data' -Description @"
+data [<variable-name>] [-supportedCommand <cmdlet-name>] {
+    <Permitted content>
+}
+"@
+				Get-KeywordCompletionResult -Keyword 'do' -Description @"
+do {<statement list>} while (<condition>)
+do {<statement list>} until (<condition>)
+"@
+				Get-KeywordCompletionResult -Keyword 'dynamicparam' -Description "dynamicparam {<statement-list>}"
+				Get-KeywordCompletionResult -Keyword 'else' -Description @"
+if (<test1>)
+    {<statement list 1>}
+[elseif (<test2>)
+    {<statement list 2>}]
+[else
+    {<statement list 3>}]
+"@
+				Get-KeywordCompletionResult -Keyword 'elseif' -Description @"
+if (<test1>)
+    {<statement list 1>}
+[elseif (<test2>)
+    {<statement list 2>}]
+[else
+    {<statement list 3>}]
+"@
+				Get-KeywordCompletionResult -Keyword 'end'
+				Get-KeywordCompletionResult -Keyword 'enum' -Description @"
+[[<attribute>]...] [Flag()] enum <enum-name>[ : <underlying-type-name>] {
+    <label 0> [= 1]
+    <label 1> [= 2]
+    <label 2> [= 4]
+    <label 3> [= 8]
+    ...
+}
+"@
+				Get-KeywordCompletionResult -Keyword 'exit' -Description "exit [<exitcode>]"
+				Get-KeywordCompletionResult -Keyword 'filter' -Description "filter [<scope:>]<name> {<statement list>}"
+				Get-KeywordCompletionResult -Keyword 'finally' -Description "finally {<statement list>}"
+				Get-KeywordCompletionResult -Keyword 'for' -Description @"
+for (<Init>; <Condition>; <Repeat>)
+{
+    <Statement list>
+}
+"@
+				Get-KeywordCompletionResult -Keyword 'foreach' -Description "foreach ($<item> in $<collection>){<statement list>}"
+				Get-KeywordCompletionResult -Keyword 'function' -Description @"
+function [<scope:>]<name> [([type]`$parameter1[,[type]`$parameter2])]
+{
+  begin {<statement list>}
+  process {<statement list>}
+  end {<statement list>}
+  clean {<statement list>}
+}
+"@
+				Get-KeywordCompletionResult -Keyword 'hidden'
+				Get-KeywordCompletionResult -Keyword 'if' -Description @"
+if (<test1>)
+	{<statement list 1>}
+[elseif (<test2>)
+	{<statement list 2>}]
+[else
+	{<statement list 3>}]
+"@
+				Get-KeywordCompletionResult -Keyword 'in' -Description "foreach (`$<item> in `$<collection>){<statement list>}"
+				Get-KeywordCompletionResult -Keyword 'param' -Description "param (`$Parameter1)"
+				Get-KeywordCompletionResult -Keyword 'process'
+				Get-KeywordCompletionResult -Keyword 'return' -Description "return [<expression>]"
+				Get-KeywordCompletionResult -Keyword 'static' -Description @"
+class <class-name> [: [<base-class>][,<interface-list>]] {
+    [[<attribute>] [hidden] [static] <property-definition> ...]
+    [<class-name>([<constructor-argument-list>])
+      {<constructor-statement-list>} ...]
+    [[<attribute>] [hidden] [static] <method-definition> ...]
+}
+"@
+				Get-KeywordCompletionResult -Keyword 'switch' -Description @"
+Switch (<test-expression>)
+{
+    <result1-to-be-matched> {<action>}
+    <result2-to-be-matched> {<action>}
+}
+"@
+				Get-KeywordCompletionResult -Keyword 'throw' -Description "throw [<expression>]"
+				Get-KeywordCompletionResult -Keyword 'trap' -Description "trap [[<error type>]] {<statement list>}"
+				Get-KeywordCompletionResult -Keyword 'try' -Description "try {<statement list>}"
+				Get-KeywordCompletionResult -Keyword 'until' -Description "do {<statement list>} until (<condition>)"
+				Get-KeywordCompletionResult -Keyword 'using' -Description @"
+using module <module-name>
+
+using assembly <.NET-assembly-path>
+"@
+				Get-KeywordCompletionResult -Keyword 'while' -Description "while (<condition>){<statement list>}"
+			)
 			$mappedCommands = Compress-Completions($commands)
 			$result = "$([char]0x1b)]633;CompletionsPwshCommands;commands;"
 			$result += $mappedCommands | ConvertTo-Json -Compress
@@ -211,6 +326,7 @@ function Set-MappedKeyHandlers {
 function Send-Completions {
 	$commandLine = ""
 	$cursorIndex = 0
+	$prefixCursorDelta = 0
 	[Microsoft.PowerShell.PSConsoleReadLine]::GetBufferState([ref]$commandLine, [ref]$cursorIndex)
 	$completionPrefix = $commandLine
 
@@ -218,34 +334,109 @@ function Send-Completions {
 	$result = "$([char]0x1b)]633;Completions"
 
 	# If there is a space in the input, defer to TabExpansion2 as it's more complicated to
-	# determine what type of completions to use
+	# determine what type of completions to use.
 	# `[` is included here as namespace commands are not included in CompleteCommand(''),
 	# additionally for some reason CompleteVariable('[') causes the prompt to clear and reprint
 	# multiple times
 	if ($completionPrefix.Contains(' ') -or $completionPrefix.Contains('[') -or $PSVersionTable.PSVersion -lt "6.0") {
-		$completions = TabExpansion2 -inputScript $completionPrefix -cursorColumn $cursorIndex
-		if ($null -ne $completions.CompletionMatches) {
-			$result += ";$($completions.ReplacementIndex);$($completions.ReplacementLength);$($cursorIndex);"
+
+		# Adjust the completion prefix and cursor index such that tab expansion will be requested
+		# immediately after the last whitespace. This allows the client to perform fuzzy filtering
+		# such that requesting completions in the middle of a word should show the same completions
+		# as at the start. This only happens when the last word does not include special characters:
+		# - `/` and `\`: Completions change when navigating directories.
+		# - `$`: Completions change when variables.
+		$lastWhitespaceIndex = $completionPrefix.LastIndexOf(' ')
+		$lastWord = $completionPrefix.Substring($lastWhitespaceIndex + 1)
+		if ($lastWord -notmatch '[/\\$]') {
+			if ($lastWhitespaceIndex -ne -1 -and $lastWhitespaceIndex -lt $cursorIndex) {
+				$newCursorIndex = $lastWhitespaceIndex + 1
+				$completionPrefix = $completionPrefix.Substring(0, $newCursorIndex)
+				$prefixCursorDelta = $cursorIndex - $newCursorIndex
+				$cursorIndex = $newCursorIndex
+			}
+		}
+		# If it contains `/` or `\`, get completions from the nearest `/` or `\` such that file
+		# completions are consistent regardless of where it was requested
+		elseif ($lastWord -match '[/\\]') {
+			$lastSlashIndex = $completionPrefix.LastIndexOfAny(@('/', '\'))
+			if ($lastSlashIndex -ne -1 -and $lastSlashIndex -lt $cursorIndex) {
+				$newCursorIndex = $lastSlashIndex + 1
+				$completionPrefix = $completionPrefix.Substring(0, $newCursorIndex)
+				$prefixCursorDelta = $cursorIndex - $newCursorIndex
+				$cursorIndex = $newCursorIndex
+			}
+		}
+
+		# Get completions using TabExpansion2
+		$completions = $null
+		try
+		{
+			$completions = TabExpansion2 -inputScript $completionPrefix -cursorColumn $cursorIndex
+		}
+		catch
+		{
+			# TabExpansion2 may throw when there are no completions, in this case return an empty
+			# list to prevent falling back to file path completions
+		}
+		if ($null -eq $completions -or $null -eq $completions.CompletionMatches) {
+			$result += ";0;$($completionPrefix.Length);$($completionPrefix.Length);[]"
+		} else {
+			$result += ";$($completions.ReplacementIndex);$($completions.ReplacementLength + $prefixCursorDelta);$($cursorIndex - $prefixCursorDelta);"
+			$json = [System.Collections.ArrayList]@($completions.CompletionMatches)
+			# Relative directory completions
 			if ($completions.CompletionMatches.Count -gt 0 -and $completions.CompletionMatches.Where({ $_.ResultType -eq 3 -or $_.ResultType -eq 4 })) {
-				$json = [System.Collections.ArrayList]@($completions.CompletionMatches)
-				# Add . and .. to the completions list
-				$json.Add([System.Management.Automation.CompletionResult]::new(
-					'.', '.', [System.Management.Automation.CompletionResultType]::ProviderContainer, (Get-Location).Path)
-				)
-				$json.Add([System.Management.Automation.CompletionResult]::new(
-					'..', '..', [System.Management.Automation.CompletionResultType]::ProviderContainer, (Split-Path (Get-Location) -Parent))
-				)
-				$mappedCommands = Compress-Completions($json)
-				$result += $mappedCommands | ConvertTo-Json -Compress
-			} else {
-				$mappedCommands = Compress-Completions($completions.CompletionMatches)
-				$result += $mappedCommands | ConvertTo-Json -Compress
+				# Add `../ relative to the top completion
+				$firstCompletion = $completions.CompletionMatches[0]
+				if ($firstCompletion.CompletionText.StartsWith("..$([System.IO.Path]::DirectorySeparatorChar)")) {
+					if ($completionPrefix -match "(\.\.\$([System.IO.Path]::DirectorySeparatorChar))+") {
+						$parentDir = "$($matches[0])..$([System.IO.Path]::DirectorySeparatorChar)"
+						$currentPath = Split-Path -Parent $firstCompletion.ToolTip
+						try {
+							$parentDirPath = Split-Path -Parent $currentPath
+							$json.Add([System.Management.Automation.CompletionResult]::new(
+								$parentDir, $parentDir, [System.Management.Automation.CompletionResultType]::ProviderContainer, $parentDirPath)
+							)
+						} catch { }
+					}
+				}
+				# Add `.` and `..` to the completions list for results that only contain files and dirs
+				else {
+					$json.Add([System.Management.Automation.CompletionResult]::new(
+						'.', '.', [System.Management.Automation.CompletionResultType]::ProviderContainer, (Get-Location).Path)
+					)
+					$json.Add([System.Management.Automation.CompletionResult]::new(
+						'..', '..', [System.Management.Automation.CompletionResultType]::ProviderContainer, (Split-Path (Get-Location) -Parent))
+					)
+				}
+			}
+			# Add `-` and `+` as a completion for move backwards in location history. Unfortunately
+			# we don't set the path it will navigate to since the Set-Location stack is not public
+			# API https://github.com/PowerShell/PowerShell/issues/23860
+			if ($completionPrefix -eq "cd -") {
+				$json.Add([System.Management.Automation.CompletionResult]::new('-', '-', [System.Management.Automation.CompletionResultType]::ProviderContainer, "Navigate backwards in location history"))
 			}
+			if ($completionPrefix -eq "cd +") {
+				$json.Add([System.Management.Automation.CompletionResult]::new('+', '+', [System.Management.Automation.CompletionResultType]::ProviderContainer, "Navigate forwards in location history"))
+			}
+			$mappedCommands = Compress-Completions($json)
+			$result += $mappedCommands | ConvertTo-Json -Compress
 		}
 	}
 	# If there is no space, get completions using CompletionCompleters as it gives us more
 	# control and works on the empty string
 	else {
+		# If it contains `/` or `\`, get completions from the nearest `/` or `\` such that file
+		# completions are consistent regardless of where it was requested
+		if ($completionPrefix -match '[/\\]') {
+			$lastSlashIndex = $completionPrefix.LastIndexOfAny(@('/', '\'))
+			if ($lastSlashIndex -ne -1 -and $lastSlashIndex -lt $cursorIndex) {
+				$newCursorIndex = $lastSlashIndex + 1
+				$completionPrefix = $completionPrefix.Substring(0, $newCursorIndex)
+				$prefixCursorDelta = $cursorIndex - $newCursorIndex
+				$cursorIndex = $newCursorIndex
+			}
+		}
 		# Note that CompleteCommand isn't included here as it's expensive
 		$completions = $(
 			# Add trailing \ for directories so behavior aligns with TabExpansion2
@@ -256,10 +447,10 @@ function Send-Completions {
 					$_
 				}
 			}
-			([System.Management.Automation.CompletionCompleters]::CompleteVariable($completionPrefix));
+			([System.Management.Automation.CompletionCompleters]::CompleteVariable(''))
 		)
 		if ($null -ne $completions) {
-			$result += ";$($completions.ReplacementIndex);$($completions.ReplacementLength);$($cursorIndex);"
+			$result += ";$($completions.ReplacementIndex);$($completions.ReplacementLength + $prefixCursorDelta);$($cursorIndex - $prefixCursorDelta);"
 			$mappedCommands = Compress-Completions($completions)
 			$result += $mappedCommands | ConvertTo-Json -Compress
 		} else {
@@ -275,7 +466,10 @@ function Send-Completions {
 
 function Compress-Completions($completions) {
 	$completions | ForEach-Object {
-		if ($_.CompletionText -eq $_.ToolTip) {
+		if ($_.CustomIcon) {
+			,@($_.CompletionText, $_.ResultType, $_.ToolTip, $_.CustomIcon)
+		}
+		elseif ($_.CompletionText -eq $_.ToolTip) {
 			,@($_.CompletionText, $_.ResultType)
 		} else {
 			,@($_.CompletionText, $_.ResultType, $_.ToolTip)
diff --git a/src/vs/workbench/contrib/terminal/browser/media/terminal.css b/src/vs/workbench/contrib/terminal/browser/media/terminal.css
index 42a44c8e9d5..6e0dc24cbf9 100644
--- a/src/vs/workbench/contrib/terminal/browser/media/terminal.css
+++ b/src/vs/workbench/contrib/terminal/browser/media/terminal.css
@@ -477,7 +477,7 @@
 	left: 0;
 	border: 1.5px solid #ffffff;
 	width: 0px !important;
-	border-color: var(--vscode-notebook-inactiveFocusedCellBorder);
+	border-color: var(--vscode-terminalCommandGuide-foreground);
 	box-sizing: border-box;
 	transform: translateX(3px);
 	pointer-events: none;
diff --git a/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts b/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts
index 52f3ffcb7be..f8c0423c0eb 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts
@@ -21,7 +21,7 @@ import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/
 import { IKeybindings, KeybindingWeight, KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { IQuickAccessRegistry, Extensions as QuickAccessExtensions } from 'vs/platform/quickinput/common/quickAccess';
 import { Registry } from 'vs/platform/registry/common/platform';
-import { ITerminalLogService, WindowsShellType } from 'vs/platform/terminal/common/terminal';
+import { GeneralShellType, ITerminalLogService, WindowsShellType } from 'vs/platform/terminal/common/terminal';
 import { TerminalLogService } from 'vs/platform/terminal/common/terminalLogService';
 import { registerTerminalPlatformConfiguration } from 'vs/platform/terminal/common/terminalPlatformConfiguration';
 import { EditorPaneDescriptor, IEditorPaneRegistry } from 'vs/workbench/browser/editor';
@@ -186,7 +186,7 @@ const enum Constants {
 // reader. This works even when clipboard.readText is not supported.
 if (isWindows) {
 	registerSendSequenceKeybinding(String.fromCharCode('V'.charCodeAt(0) - Constants.CtrlLetterOffset), { // ctrl+v
-		when: ContextKeyExpr.and(TerminalContextKeys.focus, ContextKeyExpr.equals(TerminalContextKeyStrings.ShellType, WindowsShellType.PowerShell), CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate()),
+		when: ContextKeyExpr.and(TerminalContextKeys.focus, ContextKeyExpr.equals(TerminalContextKeyStrings.ShellType, GeneralShellType.PowerShell), CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate()),
 		primary: KeyMod.CtrlCmd | KeyCode.KeyV
 	});
 }
@@ -195,31 +195,31 @@ if (isWindows) {
 // shell integration script. This allows keystrokes that cannot be sent via VT sequences to work.
 // See https://github.com/microsoft/terminal/issues/879#issuecomment-497775007
 registerSendSequenceKeybinding('\x1b[24~a', { // F12,a -> ctrl+space (MenuComplete)
-	when: ContextKeyExpr.and(TerminalContextKeys.focus, ContextKeyExpr.equals(TerminalContextKeyStrings.ShellType, WindowsShellType.PowerShell), TerminalContextKeys.terminalShellIntegrationEnabled, CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate()),
+	when: ContextKeyExpr.and(TerminalContextKeys.focus, ContextKeyExpr.equals(TerminalContextKeyStrings.ShellType, GeneralShellType.PowerShell), TerminalContextKeys.terminalShellIntegrationEnabled, CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate()),
 	primary: KeyMod.CtrlCmd | KeyCode.Space,
 	mac: { primary: KeyMod.WinCtrl | KeyCode.Space }
 });
 registerSendSequenceKeybinding('\x1b[24~b', { // F12,b -> alt+space (SetMark)
-	when: ContextKeyExpr.and(TerminalContextKeys.focus, ContextKeyExpr.equals(TerminalContextKeyStrings.ShellType, WindowsShellType.PowerShell), TerminalContextKeys.terminalShellIntegrationEnabled, CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate()),
+	when: ContextKeyExpr.and(TerminalContextKeys.focus, ContextKeyExpr.equals(TerminalContextKeyStrings.ShellType, GeneralShellType.PowerShell), TerminalContextKeys.terminalShellIntegrationEnabled, CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate()),
 	primary: KeyMod.Alt | KeyCode.Space
 });
 registerSendSequenceKeybinding('\x1b[24~c', { // F12,c -> shift+enter (AddLine)
-	when: ContextKeyExpr.and(TerminalContextKeys.focus, ContextKeyExpr.equals(TerminalContextKeyStrings.ShellType, WindowsShellType.PowerShell), TerminalContextKeys.terminalShellIntegrationEnabled, CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate()),
+	when: ContextKeyExpr.and(TerminalContextKeys.focus, ContextKeyExpr.equals(TerminalContextKeyStrings.ShellType, GeneralShellType.PowerShell), TerminalContextKeys.terminalShellIntegrationEnabled, CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate()),
 	primary: KeyMod.Shift | KeyCode.Enter
 });
 registerSendSequenceKeybinding('\x1b[24~d', { // F12,d -> shift+end (SelectLine) - HACK: \x1b[1;2F is supposed to work but it doesn't
-	when: ContextKeyExpr.and(TerminalContextKeys.focus, ContextKeyExpr.equals(TerminalContextKeyStrings.ShellType, WindowsShellType.PowerShell), TerminalContextKeys.terminalShellIntegrationEnabled, CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate()),
+	when: ContextKeyExpr.and(TerminalContextKeys.focus, ContextKeyExpr.equals(TerminalContextKeyStrings.ShellType, GeneralShellType.PowerShell), TerminalContextKeys.terminalShellIntegrationEnabled, CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate()),
 	mac: { primary: KeyMod.Shift | KeyMod.CtrlCmd | KeyCode.RightArrow }
 });
 registerSendSequenceKeybinding('\x1b[24~e', { // F12,e -> ctrl+space (Native suggest)
-	when: ContextKeyExpr.and(TerminalContextKeys.focus, ContextKeyExpr.equals(TerminalContextKeyStrings.ShellType, WindowsShellType.PowerShell), TerminalContextKeys.terminalShellIntegrationEnabled, CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate(), ContextKeyExpr.equals(`config.${TerminalSuggestSettingId.Enabled}`, true)),
+	when: ContextKeyExpr.and(TerminalContextKeys.focus, ContextKeyExpr.equals(TerminalContextKeyStrings.ShellType, GeneralShellType.PowerShell), TerminalContextKeys.terminalShellIntegrationEnabled, CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate(), ContextKeyExpr.equals(`config.${TerminalSuggestSettingId.Enabled}`, true)),
 	primary: KeyMod.CtrlCmd | KeyCode.Space,
 	mac: { primary: KeyMod.WinCtrl | KeyCode.Space }
 });
 
 // Always on pwsh keybindings
 registerSendSequenceKeybinding('\x1b[1;2H', { // Shift+home
-	when: ContextKeyExpr.and(TerminalContextKeys.focus, ContextKeyExpr.equals(TerminalContextKeyStrings.ShellType, WindowsShellType.PowerShell)),
+	when: ContextKeyExpr.and(TerminalContextKeys.focus, ContextKeyExpr.equals(TerminalContextKeyStrings.ShellType, GeneralShellType.PowerShell)),
 	mac: { primary: KeyMod.Shift | KeyMod.CtrlCmd | KeyCode.LeftArrow }
 });
 
diff --git a/src/vs/workbench/contrib/terminal/browser/terminal.ts b/src/vs/workbench/contrib/terminal/browser/terminal.ts
index 943c9291838..49d9f38b2cb 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminal.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminal.ts
@@ -29,6 +29,8 @@ import { GroupIdentifier } from 'vs/workbench/common/editor';
 import { ACTIVE_GROUP_TYPE, AUX_WINDOW_GROUP_TYPE, SIDE_GROUP_TYPE } from 'vs/workbench/services/editor/common/editorService';
 import type { ICurrentPartialCommand } from 'vs/platform/terminal/common/capabilities/commandDetection/terminalCommand';
 import type { IXtermCore } from 'vs/workbench/contrib/terminal/browser/xterm-private';
+import type { IMenu } from 'vs/platform/actions/common/actions';
+import type { Barrier } from 'vs/base/common/async';
 
 export const ITerminalService = createDecorator<ITerminalService>('terminalService');
 export const ITerminalConfigurationService = createDecorator<ITerminalConfigurationService>('terminalConfigurationService');
@@ -137,7 +139,7 @@ export interface ITerminalGroup {
 	attachToElement(element: HTMLElement): void;
 	addInstance(instance: ITerminalInstance): void;
 	removeInstance(instance: ITerminalInstance): void;
-	moveInstance(instance: ITerminalInstance, index: number): void;
+	moveInstance(instances: ITerminalInstance | ITerminalInstance[], index: number, position: 'before' | 'after'): void;
 	setVisible(visible: boolean): void;
 	layout(width: number, height: number): void;
 	addDisposable(disposable: IDisposable): void;
@@ -485,8 +487,8 @@ export interface ITerminalGroupService extends ITerminalInstanceHost {
 	 * @param source The source instance to move.
 	 * @param target The target instance to move the source instance to.
 	 */
-	moveGroup(source: ITerminalInstance, target: ITerminalInstance): void;
-	moveGroupToEnd(source: ITerminalInstance): void;
+	moveGroup(source: ITerminalInstance | ITerminalInstance[], target: ITerminalInstance): void;
+	moveGroupToEnd(source: ITerminalInstance | ITerminalInstance[]): void;
 
 	moveInstance(source: ITerminalInstance, target: ITerminalInstance, side: 'before' | 'after'): void;
 	unsplitInstance(instance: ITerminalInstance): void;
@@ -1040,6 +1042,21 @@ export interface ITerminalInstance extends IBaseTerminalInstance {
 	 * Update the parent context key service to use for this terminal instance.
 	 */
 	setParentContextKeyService(parentContextKeyService: IContextKeyService): void;
+
+	/**
+	 * Handles a mouse event for the terminal, this may happen on an anscestor of the terminal
+	 * instance's element.
+	 * @param event The mouse event.
+	 * @param contextMenu The context menu to show if needed.
+	 * @returns Whether the context menu should be suppressed.
+	 */
+	handleMouseEvent(event: MouseEvent, contextMenu: IMenu): Promise<{ cancelContextMenu: boolean } | void>;
+
+	/**
+	 * Pause input events until the provided barrier is resolved.
+	 * @param barrier The barrier to wait for until input events can continue.
+	 */
+	pauseInputEvents(barrier: Barrier): void;
 }
 
 export const enum XtermTerminalConstants {
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalActions.ts b/src/vs/workbench/contrib/terminal/browser/terminalActions.ts
index 11401eecf70..02633cd20c8 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalActions.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalActions.ts
@@ -1851,7 +1851,7 @@ async function pickTerminalCwd(accessor: ServicesAccessor, cancel?: Cancellation
 		return;
 	}
 
-	const folderCwdPairs = await Promise.all(folders.map(x => resolveWorkspaceFolderCwd(x, configurationService, configurationResolverService)));
+	const folderCwdPairs = await Promise.all(folders.map(e => resolveWorkspaceFolderCwd(e, configurationService, configurationResolverService)));
 	const shrinkedPairs = shrinkWorkspaceFolderCwdPairs(folderCwdPairs);
 
 	if (shrinkedPairs.length === 1) {
@@ -1891,7 +1891,7 @@ async function resolveWorkspaceFolderCwd(folder: IWorkspaceFolder, configuration
 
 	const resolvedCwdConfig = await configurationResolverService.resolveAsync(folder, cwdConfig);
 	return isAbsolute(resolvedCwdConfig) || resolvedCwdConfig.startsWith(AbstractVariableResolverService.VARIABLE_LHS)
-		? { folder, isAbsolute: true, isOverridden: true, cwd: URI.from({ scheme: folder.uri.scheme, path: resolvedCwdConfig }) }
+		? { folder, isAbsolute: true, isOverridden: true, cwd: URI.from({ ...folder.uri, path: resolvedCwdConfig }) }
 		: { folder, isAbsolute: false, isOverridden: true, cwd: URI.joinPath(folder.uri, resolvedCwdConfig) };
 }
 
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalEditor.ts b/src/vs/workbench/contrib/terminal/browser/terminalEditor.ts
index 06e6be5305e..d43d644d38e 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalEditor.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalEditor.ts
@@ -23,9 +23,6 @@ import { TerminalEditorInput } from 'vs/workbench/contrib/terminal/browser/termi
 import { getTerminalActionBarArgs } from 'vs/workbench/contrib/terminal/browser/terminalMenus';
 import { ITerminalProfileResolverService, ITerminalProfileService, TerminalCommandId } from 'vs/workbench/contrib/terminal/common/terminal';
 import { IEditorGroup } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { isMacintosh } from 'vs/base/common/platform';
-import { BrowserFeatures } from 'vs/base/browser/canIUse';
-import { INotificationService } from 'vs/platform/notification/common/notification';
 import { openContextMenu } from 'vs/workbench/contrib/terminal/browser/terminalContextMenu';
 import { ACTIVE_GROUP } from 'vs/workbench/services/editor/common/editorService';
 import { IWorkbenchLayoutService, Parts } from 'vs/workbench/services/layout/browser/layoutService';
@@ -62,7 +59,6 @@ export class TerminalEditor extends EditorPane {
 		@IMenuService menuService: IMenuService,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 		@IContextMenuService private readonly _contextMenuService: IContextMenuService,
-		@INotificationService private readonly _notificationService: INotificationService,
 		@ITerminalProfileService private readonly _terminalProfileService: ITerminalProfileService,
 		@IWorkbenchLayoutService private readonly _workbenchLayoutService: IWorkbenchLayoutService
 	) {
@@ -124,56 +120,9 @@ export class TerminalEditor extends EditorPane {
 		}
 		this._register(dom.addDisposableListener(this._editorInstanceElement, 'mousedown', async (event: MouseEvent) => {
 			const terminal = this._terminalEditorService.activeInstance;
-			if (this._terminalEditorService.instances.length === 0 || !terminal) {
-				return;
-			}
-
-			if (event.which === 2) {
-				switch (this._terminalConfigurationService.config.middleClickBehavior) {
-					case 'paste':
-						terminal.paste();
-						break;
-					case 'default':
-					default:
-						// Drop selection and focus terminal on Linux to enable middle button paste
-						// when click occurs on the selection itself.
-						terminal.focus();
-						break;
-				}
-			} else if (event.which === 3) {
-				const rightClickBehavior = this._terminalConfigurationService.config.rightClickBehavior;
-				if (rightClickBehavior === 'nothing') {
-					if (!event.shiftKey) {
-						this._cancelContextMenu = true;
-					}
-					return;
-				}
-				else if (rightClickBehavior === 'copyPaste' || rightClickBehavior === 'paste') {
-					// copyPaste: Shift+right click should open context menu
-					if (rightClickBehavior === 'copyPaste' && event.shiftKey) {
-						openContextMenu(this.window, event, this._editorInput?.terminalInstance, this._instanceMenu, this._contextMenuService);
-						return;
-					}
-
-					if (rightClickBehavior === 'copyPaste' && terminal.hasSelection()) {
-						await terminal.copySelection();
-						terminal.clearSelection();
-					} else {
-						if (BrowserFeatures.clipboard.readText) {
-							terminal.paste();
-						} else {
-							this._notificationService.info(`This browser doesn't support the clipboard.readText API needed to trigger a paste, try ${isMacintosh ? '⌘' : 'Ctrl'}+V instead.`);
-						}
-					}
-					// Clear selection after all click event bubbling is finished on Mac to prevent
-					// right-click selecting a word which is seemed cannot be disabled. There is a
-					// flicker when pasting but this appears to give the best experience if the
-					// setting is enabled.
-					if (isMacintosh) {
-						setTimeout(() => {
-							terminal.clearSelection();
-						}, 0);
-					}
+			if (this._terminalEditorService.instances.length > 0 && terminal) {
+				const result = await terminal.handleMouseEvent(event, this._instanceMenu);
+				if (typeof result === 'object' && result.cancelContextMenu) {
 					this._cancelContextMenu = true;
 				}
 			}
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalGroup.ts b/src/vs/workbench/contrib/terminal/browser/terminalGroup.ts
index 8e9ddcb5b6c..da31bcf18fd 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalGroup.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalGroup.ts
@@ -15,6 +15,7 @@ import { IShellLaunchConfig, ITerminalTabLayoutInfoById, TerminalLocation } from
 import { TerminalStatus } from 'vs/workbench/contrib/terminal/browser/terminalStatusList';
 import { getWindow } from 'vs/base/browser/dom';
 import { getPartByLocation } from 'vs/workbench/services/views/browser/viewsService';
+import { asArray } from 'vs/base/common/arrays';
 
 const enum Constants {
 	/**
@@ -408,16 +409,24 @@ export class TerminalGroup extends Disposable implements ITerminalGroup {
 		}
 	}
 
-	moveInstance(instance: ITerminalInstance, index: number): void {
-		const sourceIndex = this.terminalInstances.indexOf(instance);
-		if (sourceIndex === -1) {
+	moveInstance(instances: ITerminalInstance | ITerminalInstance[], index: number, position: 'before' | 'after'): void {
+		instances = asArray(instances);
+		const hasInvalidInstance = instances.some(instance => !this.terminalInstances.includes(instance));
+		if (hasInvalidInstance) {
 			return;
 		}
-		this._terminalInstances.splice(sourceIndex, 1);
-		this._terminalInstances.splice(index, 0, instance);
+		const insertIndex = position === 'before' ? index : index + 1;
+		this._terminalInstances.splice(insertIndex, 0, ...instances);
+		for (const item of instances) {
+			const originSourceGroupIndex = position === 'after' ? this._terminalInstances.indexOf(item) : this._terminalInstances.lastIndexOf(item);
+			this._terminalInstances.splice(originSourceGroupIndex, 1);
+		}
 		if (this._splitPaneContainer) {
-			this._splitPaneContainer.remove(instance);
-			this._splitPaneContainer.split(instance, index);
+			for (let i = 0; i < instances.length; i++) {
+				const item = instances[i];
+				this._splitPaneContainer.remove(item);
+				this._splitPaneContainer.split(item, index + (position === 'before' ? i : 0));
+			}
 		}
 		this._onInstancesChanged.fire();
 	}
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalGroupService.ts b/src/vs/workbench/contrib/terminal/browser/terminalGroupService.ts
index 381bff3c367..c1d21a12646 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalGroupService.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalGroupService.ts
@@ -14,11 +14,13 @@ import { IShellLaunchConfig } from 'vs/platform/terminal/common/terminal';
 import { IViewDescriptorService } from 'vs/workbench/common/views';
 import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
 import { ITerminalGroup, ITerminalGroupService, ITerminalInstance } from 'vs/workbench/contrib/terminal/browser/terminal';
+import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
 import { TerminalGroup } from 'vs/workbench/contrib/terminal/browser/terminalGroup';
 import { getInstanceFromResource } from 'vs/workbench/contrib/terminal/browser/terminalUri';
 import { TerminalViewPane } from 'vs/workbench/contrib/terminal/browser/terminalView';
 import { TERMINAL_VIEW_ID } from 'vs/workbench/contrib/terminal/common/terminal';
 import { TerminalContextKeys } from 'vs/workbench/contrib/terminal/common/terminalContextKey';
+import { asArray } from 'vs/base/common/arrays';
 
 export class TerminalGroupService extends Disposable implements ITerminalGroupService {
 	declare _serviceBrand: undefined;
@@ -35,6 +37,8 @@ export class TerminalGroupService extends Disposable implements ITerminalGroupSe
 
 	private _container: HTMLElement | undefined;
 
+	private _isQuickInputOpened: boolean = false;
+
 	private readonly _onDidChangeActiveGroup = this._register(new Emitter<ITerminalGroup | undefined>());
 	readonly onDidChangeActiveGroup = this._onDidChangeActiveGroup.event;
 	private readonly _onDidDisposeGroup = this._register(new Emitter<ITerminalGroup>());
@@ -62,7 +66,8 @@ export class TerminalGroupService extends Disposable implements ITerminalGroupSe
 		@IContextKeyService private _contextKeyService: IContextKeyService,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 		@IViewsService private readonly _viewsService: IViewsService,
-		@IViewDescriptorService private readonly _viewDescriptorService: IViewDescriptorService
+		@IViewDescriptorService private readonly _viewDescriptorService: IViewDescriptorService,
+		@IQuickInputService private readonly _quickInputService: IQuickInputService
 	) {
 		super();
 
@@ -71,6 +76,8 @@ export class TerminalGroupService extends Disposable implements ITerminalGroupSe
 		this._register(this.onDidDisposeGroup(group => this._removeGroup(group)));
 		this._register(this.onDidChangeGroups(() => this._terminalGroupCountContextKey.set(this.groups.length)));
 		this._register(Event.any(this.onDidChangeActiveGroup, this.onDidChangeInstances)(() => this.updateVisibility()));
+		this._register(this._quickInputService.onShow(() => this._isQuickInputOpened = true));
+		this._register(this._quickInputService.onHide(() => this._isQuickInputOpened = false));
 	}
 
 	hidePanel(): void {
@@ -208,7 +215,7 @@ export class TerminalGroupService extends Disposable implements ITerminalGroupSe
 
 		if (wasActiveGroup) {
 			// Adjust focus if the group was active
-			if (this.groups.length > 0) {
+			if (this.groups.length > 0 && !this._isQuickInputOpened) {
 				const newIndex = index < this.groups.length ? index : this.groups.length - 1;
 				this.setActiveGroupByIndex(newIndex, true);
 				this.activeInstance?.focus(true);
@@ -318,40 +325,66 @@ export class TerminalGroupService extends Disposable implements ITerminalGroupSe
 		this.setActiveGroupByIndex(newIndex);
 	}
 
-	moveGroup(source: ITerminalInstance, target: ITerminalInstance) {
-		const sourceGroup = this.getGroupForInstance(source);
+	private _getValidTerminalGroups = (sources: ITerminalInstance[]): Set<ITerminalGroup> => {
+		return new Set(
+			sources
+				.map(source => this.getGroupForInstance(source))
+				.filter((group) => group !== undefined)
+		);
+	};
+
+	moveGroup(source: ITerminalInstance | ITerminalInstance[], target: ITerminalInstance) {
+		source = asArray(source);
+		const sourceGroups = this._getValidTerminalGroups(source);
 		const targetGroup = this.getGroupForInstance(target);
-
-		// Something went wrong
-		if (!sourceGroup || !targetGroup) {
+		if (!targetGroup || sourceGroups.size === 0) {
 			return;
 		}
 
 		// The groups are the same, rearrange within the group
-		if (sourceGroup === targetGroup) {
-			const index = sourceGroup.terminalInstances.indexOf(target);
-			if (index !== -1) {
-				sourceGroup.moveInstance(source, index);
-			}
+		if (sourceGroups.size === 1 && sourceGroups.has(targetGroup)) {
+			const targetIndex = targetGroup.terminalInstances.indexOf(target);
+			const sortedSources = source.sort((a, b) => {
+				return targetGroup.terminalInstances.indexOf(a) - targetGroup.terminalInstances.indexOf(b);
+			});
+			const firstTargetIndex = targetGroup.terminalInstances.indexOf(sortedSources[0]);
+			const position: 'before' | 'after' = firstTargetIndex < targetIndex ? 'after' : 'before';
+			targetGroup.moveInstance(sortedSources, targetIndex, position);
+			this._onDidChangeInstances.fire();
 			return;
 		}
 
 		// The groups differ, rearrange groups
-		const sourceGroupIndex = this.groups.indexOf(sourceGroup);
 		const targetGroupIndex = this.groups.indexOf(targetGroup);
-		this.groups.splice(sourceGroupIndex, 1);
-		this.groups.splice(targetGroupIndex, 0, sourceGroup);
+		const sortedSourceGroups = Array.from(sourceGroups).sort((a, b) => {
+			return this.groups.indexOf(a) - this.groups.indexOf(b);
+		});
+		const firstSourceGroupIndex = this.groups.indexOf(sortedSourceGroups[0]);
+		const position: 'before' | 'after' = firstSourceGroupIndex < targetGroupIndex ? 'after' : 'before';
+		const insertIndex = position === 'after' ? targetGroupIndex + 1 : targetGroupIndex;
+		this.groups.splice(insertIndex, 0, ...sortedSourceGroups);
+		for (const sourceGroup of sortedSourceGroups) {
+			const originSourceGroupIndex = position === 'after' ? this.groups.indexOf(sourceGroup) : this.groups.lastIndexOf(sourceGroup);
+			this.groups.splice(originSourceGroupIndex, 1);
+		}
 		this._onDidChangeInstances.fire();
 	}
 
-	moveGroupToEnd(source: ITerminalInstance): void {
-		const sourceGroup = this.getGroupForInstance(source);
-		if (!sourceGroup) {
+	moveGroupToEnd(source: ITerminalInstance | ITerminalInstance[]): void {
+		source = asArray(source);
+		const sourceGroups = this._getValidTerminalGroups(source);
+		if (sourceGroups.size === 0) {
 			return;
 		}
-		const sourceGroupIndex = this.groups.indexOf(sourceGroup);
-		this.groups.splice(sourceGroupIndex, 1);
-		this.groups.push(sourceGroup);
+		const lastInstanceIndex = this.groups.length - 1;
+		const sortedSourceGroups = Array.from(sourceGroups).sort((a, b) => {
+			return this.groups.indexOf(a) - this.groups.indexOf(b);
+		});
+		this.groups.splice(lastInstanceIndex + 1, 0, ...sortedSourceGroups);
+		for (const sourceGroup of sortedSourceGroups) {
+			const sourceGroupIndex = this.groups.indexOf(sourceGroup);
+			this.groups.splice(sourceGroupIndex, 1);
+		}
 		this._onDidChangeInstances.fire();
 	}
 
@@ -371,7 +404,7 @@ export class TerminalGroupService extends Disposable implements ITerminalGroupSe
 
 		// Rearrange within the target group
 		const index = targetGroup.terminalInstances.indexOf(target) + (side === 'after' ? 1 : 0);
-		targetGroup.moveInstance(source, index);
+		targetGroup.moveInstance(source, index, side);
 	}
 
 	unsplitInstance(instance: ITerminalInstance) {
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalIcons.ts b/src/vs/workbench/contrib/terminal/browser/terminalIcons.ts
index 319bd19d57d..1bdd9470035 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalIcons.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalIcons.ts
@@ -9,7 +9,7 @@ import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
 
 export const terminalViewIcon = registerIcon('terminal-view-icon', Codicon.terminal, localize('terminalViewIcon', 'View icon of the terminal view.'));
 
-export const renameTerminalIcon = registerIcon('terminal-rename', Codicon.gear, localize('renameTerminalIcon', 'Icon for rename in the terminal quick menu.'));
+export const renameTerminalIcon = registerIcon('terminal-rename', Codicon.edit, localize('renameTerminalIcon', 'Icon for rename in the terminal quick menu.'));
 export const killTerminalIcon = registerIcon('terminal-kill', Codicon.trash, localize('killTerminalIcon', 'Icon for killing a terminal instance.'));
 export const newTerminalIcon = registerIcon('terminal-new', Codicon.add, localize('newTerminalIcon', 'Icon for creating a new terminal instance.'));
 
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts b/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
index 956a384840a..ff8607f6019 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
@@ -10,7 +10,7 @@ import * as dom from 'vs/base/browser/dom';
 import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { Orientation } from 'vs/base/browser/ui/sash/sash';
 import { DomScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
-import { AutoOpenBarrier, Promises, disposableTimeout, timeout } from 'vs/base/common/async';
+import { AutoOpenBarrier, Barrier, Promises, disposableTimeout, timeout } from 'vs/base/common/async';
 import { Codicon } from 'vs/base/common/codicons';
 import { debounce } from 'vs/base/common/decorators';
 import { ErrorNoTelemetry, onUnexpectedError } from 'vs/base/common/errors';
@@ -47,7 +47,7 @@ import { IMarkProperties, ITerminalCommand, TerminalCapability } from 'vs/platfo
 import { TerminalCapabilityStoreMultiplexer } from 'vs/platform/terminal/common/capabilities/terminalCapabilityStore';
 import { IEnvironmentVariableCollection, IMergedEnvironmentVariableCollection } from 'vs/platform/terminal/common/environmentVariable';
 import { deserializeEnvironmentVariableCollections } from 'vs/platform/terminal/common/environmentVariableShared';
-import { IProcessDataEvent, IProcessPropertyMap, IReconnectionProperties, IShellLaunchConfig, ITerminalDimensionsOverride, ITerminalLaunchError, ITerminalLogService, PosixShellType, ProcessPropertyType, ShellIntegrationStatus, TerminalExitReason, TerminalIcon, TerminalLocation, TerminalSettingId, TerminalShellType, TitleEventSource, WindowsShellType } from 'vs/platform/terminal/common/terminal';
+import { GeneralShellType, IProcessDataEvent, IProcessPropertyMap, IReconnectionProperties, IShellLaunchConfig, ITerminalDimensionsOverride, ITerminalLaunchError, ITerminalLogService, PosixShellType, ProcessPropertyType, ShellIntegrationStatus, TerminalExitReason, TerminalIcon, TerminalLocation, TerminalSettingId, TerminalShellType, TitleEventSource, WindowsShellType } from 'vs/platform/terminal/common/terminal';
 import { formatMessageForTerminal } from 'vs/platform/terminal/common/terminalStrings';
 import { editorBackground } from 'vs/platform/theme/common/colorRegistry';
 import { getIconRegistry } from 'vs/platform/theme/common/iconRegistry';
@@ -94,6 +94,9 @@ import { TerminalResizeDebouncer } from 'vs/workbench/contrib/terminal/browser/t
 // HACK: This file should not depend on terminalContrib
 // eslint-disable-next-line local/code-import-patterns
 import { TerminalAccessibilityCommandId } from 'vs/workbench/contrib/terminalContrib/accessibility/common/terminal.accessibility';
+import { openContextMenu } from 'vs/workbench/contrib/terminal/browser/terminalContextMenu';
+import type { IMenu } from 'vs/platform/actions/common/actions';
+import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 
 const enum Constants {
 	/**
@@ -120,12 +123,11 @@ interface IGridDimensions {
 	rows: number;
 }
 
-const shellIntegrationSupportedShellTypes = [
+const shellIntegrationSupportedShellTypes: (PosixShellType | GeneralShellType | WindowsShellType)[] = [
 	PosixShellType.Bash,
 	PosixShellType.Zsh,
-	PosixShellType.PowerShell,
-	PosixShellType.Python,
-	WindowsShellType.PowerShell
+	GeneralShellType.PowerShell,
+	GeneralShellType.Python,
 ];
 
 export class TerminalInstance extends Disposable implements ITerminalInstance {
@@ -195,6 +197,10 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 	private _lineDataEventAddon: LineDataEventAddon | undefined;
 	private readonly _scopedContextKeyService: IContextKeyService;
 	private _resizeDebouncer?: TerminalResizeDebouncer;
+	private _pauseInputEventBarrier: Barrier | undefined;
+	pauseInputEvents(barrier: Barrier): void {
+		this._pauseInputEventBarrier = barrier;
+	}
 
 	readonly capabilities = this._register(new TerminalCapabilityStoreMultiplexer());
 	readonly statusList: ITerminalStatusList;
@@ -354,6 +360,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 		private readonly _terminalInRunCommandPicker: IContextKey<boolean>,
 		private _shellLaunchConfig: IShellLaunchConfig,
 		@IContextKeyService private readonly _contextKeyService: IContextKeyService,
+		@IContextMenuService private readonly _contextMenuService: IContextMenuService,
 		@IInstantiationService instantiationService: IInstantiationService,
 		@ITerminalConfigurationService private readonly _terminalConfigurationService: ITerminalConfigurationService,
 		@ITerminalProfileResolverService private readonly _terminalProfileResolverService: ITerminalProfileResolverService,
@@ -802,6 +809,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 
 		this._register(this._processManager.onProcessData(e => this._onProcessData(e)));
 		this._register(xterm.raw.onData(async data => {
+			await this._pauseInputEventBarrier?.wait();
 			await this._processManager.write(data);
 			this._onDidInputData.fire(data);
 		}));
@@ -1156,6 +1164,9 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 	}
 
 	override dispose(reason?: TerminalExitReason): void {
+		if (this.shellLaunchConfig.type === 'Task' && reason === TerminalExitReason.Process && this._exitCode !== 0 && !this.shellLaunchConfig.waitOnExit) {
+			return;
+		}
 		if (this.isDisposed) {
 			return;
 		}
@@ -1599,7 +1610,6 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 				}
 			});
 		} else {
-			this.dispose(TerminalExitReason.Process);
 			if (exitMessage) {
 				const failedDuringLaunch = this._processManager.processState === ProcessState.KilledDuringLaunch;
 				if (failedDuringLaunch || this._terminalConfigurationService.config.showExitAlert) {
@@ -1615,6 +1625,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 					this._logService.warn(exitMessage);
 				}
 			}
+			this.dispose(TerminalExitReason.Process);
 		}
 
 		// First onExit to consumers, this can happen after the terminal has already been disposed.
@@ -2257,12 +2268,13 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 		const showAllColorsItem = { label: 'Reset to default' };
 		items.push(showAllColorsItem);
 
-		const quickPick = this._quickInputService.createQuickPick();
+		const disposables: IDisposable[] = [];
+		const quickPick = this._quickInputService.createQuickPick({ useSeparators: true });
+		disposables.push(quickPick);
 		quickPick.items = items;
 		quickPick.matchOnDescription = true;
 		quickPick.placeholder = nls.localize('changeColor', 'Select a color for the terminal');
 		quickPick.show();
-		const disposables: IDisposable[] = [];
 		const result = await new Promise<IQuickPickItem | undefined>(r => {
 			disposables.push(quickPick.onDidHide(() => r(undefined)));
 			disposables.push(quickPick.onDidAccept(() => r(quickPick.selectedItems[0])));
@@ -2290,6 +2302,66 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 	setParentContextKeyService(parentContextKeyService: IContextKeyService): void {
 		this._scopedContextKeyService.updateParent(parentContextKeyService);
 	}
+
+	async handleMouseEvent(event: MouseEvent, contextMenu: IMenu): Promise<{ cancelContextMenu: boolean } | void> {
+		// Don't handle mouse event if it was on the scroll bar
+		if (dom.isHTMLElement(event.target) && (event.target.classList.contains('scrollbar') || event.target.classList.contains('slider'))) {
+			return { cancelContextMenu: true };
+		}
+
+		// Middle click
+		if (event.which === 2) {
+			switch (this._terminalConfigurationService.config.middleClickBehavior) {
+				case 'paste':
+					this.paste();
+					break;
+				case 'default':
+				default:
+					// Drop selection and focus terminal on Linux to enable middle button paste
+					// when click occurs on the selection itself.
+					this.focus();
+					break;
+			}
+			return;
+		}
+
+		// Right click
+		if (event.which === 3) {
+			const rightClickBehavior = this._terminalConfigurationService.config.rightClickBehavior;
+			if (rightClickBehavior === 'nothing') {
+				if (!event.shiftKey) {
+					return { cancelContextMenu: true };
+				}
+				return;
+			}
+			else if (rightClickBehavior === 'copyPaste' || rightClickBehavior === 'paste') {
+				// copyPaste: Shift+right click should open context menu
+				if (rightClickBehavior === 'copyPaste' && event.shiftKey) {
+					openContextMenu(dom.getActiveWindow(), event, this, contextMenu, this._contextMenuService);
+					return;
+				}
+
+				if (rightClickBehavior === 'copyPaste' && this.hasSelection()) {
+					await this.copySelection();
+					this.clearSelection();
+				} else {
+					if (BrowserFeatures.clipboard.readText) {
+						this.paste();
+					} else {
+						this._notificationService.info(`This browser doesn't support the clipboard.readText API needed to trigger a paste, try ${isMacintosh ? '⌘' : 'Ctrl'}+V instead.`);
+					}
+				}
+				// Clear selection after all click event bubbling is finished on Mac to prevent
+				// right-click selecting a word which is seemed cannot be disabled. There is a
+				// flicker when pasting but this appears to give the best experience if the
+				// setting is enabled.
+				if (isMacintosh) {
+					setTimeout(() => this.clearSelection(), 0);
+				}
+				return { cancelContextMenu: true };
+			}
+		}
+	}
 }
 
 class TerminalInstanceDragAndDropController extends Disposable implements dom.IDragAndDropObserverCallbacks {
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalProcessManager.ts b/src/vs/workbench/contrib/terminal/browser/terminalProcessManager.ts
index 22204b7a88e..ff6ff01ea8e 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalProcessManager.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalProcessManager.ts
@@ -293,6 +293,7 @@ export class TerminalProcessManager extends Disposable implements ITerminalProce
 							nonce: this.shellIntegrationNonce
 						},
 						windowsEnableConpty: this._terminalConfigurationService.config.windowsEnableConpty,
+						windowsUseConptyDll: this._terminalConfigurationService.config.experimental?.windowsUseConptyDll ?? false,
 						environmentVariableCollections: this._extEnvironmentVariableCollection?.collections ? serializeEnvironmentVariableCollections(this._extEnvironmentVariableCollection.collections) : undefined,
 						workspaceFolder: this._cwdWorkspaceFolder,
 					};
@@ -493,6 +494,7 @@ export class TerminalProcessManager extends Disposable implements ITerminalProce
 				nonce: this.shellIntegrationNonce
 			},
 			windowsEnableConpty: this._terminalConfigurationService.config.windowsEnableConpty,
+			windowsUseConptyDll: this._terminalConfigurationService.config.experimental?.windowsUseConptyDll ?? false,
 			environmentVariableCollections: this._extEnvironmentVariableCollection ? serializeEnvironmentVariableCollections(this._extEnvironmentVariableCollection.collections) : undefined,
 			workspaceFolder: this._cwdWorkspaceFolder,
 		};
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalRunRecentQuickPick.ts b/src/vs/workbench/contrib/terminal/browser/terminalRunRecentQuickPick.ts
index b795f91f201..449e5210ec6 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalRunRecentQuickPick.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalRunRecentQuickPick.ts
@@ -27,6 +27,7 @@ import { showWithPinnedItems } from 'vs/platform/quickinput/browser/quickPickPin
 import { IStorageService } from 'vs/platform/storage/common/storage';
 import { IContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { AccessibleViewProviderId, IAccessibleViewService } from 'vs/platform/accessibility/browser/accessibleView';
+import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
 
 export async function showRunRecentQuickPick(
 	accessor: ServicesAccessor,
@@ -205,26 +206,27 @@ export async function showRunRecentQuickPick(
 	if (items.length === 0) {
 		return;
 	}
-	const fuzzySearchToggle = new Toggle({
+	const disposables = new DisposableStore();
+	const fuzzySearchToggle = disposables.add(new Toggle({
 		title: 'Fuzzy search',
 		icon: commandHistoryFuzzySearchIcon,
 		isChecked: filterMode === 'fuzzy',
 		inputActiveOptionBorder: asCssVariable(inputActiveOptionBorder),
 		inputActiveOptionForeground: asCssVariable(inputActiveOptionForeground),
 		inputActiveOptionBackground: asCssVariable(inputActiveOptionBackground)
-	});
-	fuzzySearchToggle.onChange(() => {
+	}));
+	disposables.add(fuzzySearchToggle.onChange(() => {
 		instantiationService.invokeFunction(showRunRecentQuickPick, instance, terminalInRunCommandPicker, type, fuzzySearchToggle.checked ? 'fuzzy' : 'contiguous', quickPick.value);
-	});
-	const outputProvider = instantiationService.createInstance(TerminalOutputProvider);
-	const quickPick = quickInputService.createQuickPick<Item | IQuickPickItem & { rawLabel: string }>();
+	}));
+	const outputProvider = disposables.add(instantiationService.createInstance(TerminalOutputProvider));
+	const quickPick = disposables.add(quickInputService.createQuickPick<Item | IQuickPickItem & { rawLabel: string }>({ useSeparators: true }));
 	const originalItems = items;
 	quickPick.items = [...originalItems];
 	quickPick.sortByLabel = false;
 	quickPick.placeholder = placeholder;
 	quickPick.matchOnLabelMode = filterMode || 'contiguous';
 	quickPick.toggles = [fuzzySearchToggle];
-	quickPick.onDidTriggerItemButton(async e => {
+	disposables.add(quickPick.onDidTriggerItemButton(async e => {
 		if (e.button === removeFromCommandHistoryButton) {
 			if (type === 'command') {
 				instantiationService.invokeFunction(getCommandHistory)?.remove(e.item.label);
@@ -250,20 +252,19 @@ export async function showRunRecentQuickPick(
 			}
 		}
 		await instantiationService.invokeFunction(showRunRecentQuickPick, instance, terminalInRunCommandPicker, type, filterMode, value);
-	}
-	);
-	quickPick.onDidChangeValue(async value => {
+	}));
+	disposables.add(quickPick.onDidChangeValue(async value => {
 		if (!value) {
 			await instantiationService.invokeFunction(showRunRecentQuickPick, instance, terminalInRunCommandPicker, type, filterMode, value);
 		}
-	});
+	}));
 	let terminalScrollStateSaved = false;
 	function restoreScrollState() {
 		terminalScrollStateSaved = false;
 		instance.xterm?.markTracker.restoreScrollState();
 		instance.xterm?.markTracker.clear();
 	}
-	quickPick.onDidChangeActive(async () => {
+	disposables.add(quickPick.onDidChangeActive(async () => {
 		const xterm = instance.xterm;
 		if (!xterm) {
 			return;
@@ -292,8 +293,8 @@ export async function showRunRecentQuickPick(
 		} else {
 			restoreScrollState();
 		}
-	});
-	quickPick.onDidAccept(async () => {
+	}));
+	disposables.add(quickPick.onDidAccept(async () => {
 		const result = quickPick.activeItems[0];
 		let text: string;
 		if (type === 'cwd') {
@@ -307,30 +308,32 @@ export async function showRunRecentQuickPick(
 			instance.focus();
 		}
 		restoreScrollState();
-	});
-	quickPick.onDidHide(() => restoreScrollState());
+	}));
+	disposables.add(quickPick.onDidHide(() => restoreScrollState()));
 	if (value) {
 		quickPick.value = value;
 	}
 	return new Promise<void>(r => {
 		terminalInRunCommandPicker.set(true);
-		showWithPinnedItems(storageService, runRecentStorageKey, quickPick, true);
-		quickPick.onDidHide(() => {
+		disposables.add(showWithPinnedItems(storageService, runRecentStorageKey, quickPick, true));
+		disposables.add(quickPick.onDidHide(() => {
 			terminalInRunCommandPicker.set(false);
 			accessibleViewService.showLastProvider(AccessibleViewProviderId.Terminal);
 			r();
-		});
+			disposables.dispose();
+		}));
 	});
 }
 
-class TerminalOutputProvider implements ITextModelContentProvider {
+class TerminalOutputProvider extends Disposable implements ITextModelContentProvider {
 	static scheme = 'TERMINAL_OUTPUT';
 
 	constructor(
 		@ITextModelService textModelResolverService: ITextModelService,
 		@IModelService private readonly _modelService: IModelService
 	) {
-		textModelResolverService.registerTextModelContentProvider(TerminalOutputProvider.scheme, this);
+		super();
+		this._register(textModelResolverService.registerTextModelContentProvider(TerminalOutputProvider.scheme, this));
 	}
 
 	async provideTextContent(resource: URI): Promise<ITextModel | null> {
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalService.ts b/src/vs/workbench/contrib/terminal/browser/terminalService.ts
index 1c28fc1fee9..26c60dd787b 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalService.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalService.ts
@@ -856,7 +856,7 @@ export class TerminalService extends Disposable implements ITerminalService {
 
 		if (target && side) {
 			const index = group.terminalInstances.indexOf(target) + (side === 'after' ? 1 : 0);
-			group.moveInstance(source, index);
+			group.moveInstance(source, index, side);
 		}
 
 		// Fire events
@@ -1114,7 +1114,7 @@ export class TerminalService extends Disposable implements ITerminalService {
 		} else {
 			const group = this._terminalGroupService.getGroupForInstance(parent);
 			if (!group) {
-				throw new Error(`Cannot split a terminal without a group ${parent}`);
+				throw new Error(`Cannot split a terminal without a group (instanceId: ${parent.instanceId}, title: ${parent.title})`);
 			}
 			shellLaunchConfig.parentTerminalId = parent.instanceId;
 			instance = group.split(shellLaunchConfig);
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalTabbedView.ts b/src/vs/workbench/contrib/terminal/browser/terminalTabbedView.ts
index 285c7a72ec1..7ae61c794c5 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalTabbedView.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalTabbedView.ts
@@ -9,10 +9,7 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { ITerminalConfigurationService, ITerminalGroupService, ITerminalInstance, ITerminalService, TerminalConnectionState } from 'vs/workbench/contrib/terminal/browser/terminal';
 import { TerminalTabsListSizes, TerminalTabList } from 'vs/workbench/contrib/terminal/browser/terminalTabsList';
-import { isMacintosh } from 'vs/base/common/platform';
 import * as dom from 'vs/base/browser/dom';
-import { BrowserFeatures } from 'vs/base/browser/canIUse';
-import { INotificationService } from 'vs/platform/notification/common/notification';
 import { Action, IAction, Separator } from 'vs/base/common/actions';
 import { IMenu, IMenuService, MenuId } from 'vs/platform/actions/common/actions';
 import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
@@ -73,7 +70,6 @@ export class TerminalTabbedView extends Disposable {
 		@ITerminalConfigurationService private readonly _terminalConfigurationService: ITerminalConfigurationService,
 		@ITerminalGroupService private readonly _terminalGroupService: ITerminalGroupService,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
-		@INotificationService private readonly _notificationService: INotificationService,
 		@IContextMenuService private readonly _contextMenuService: IContextMenuService,
 		@IConfigurationService private readonly _configurationService: IConfigurationService,
 		@IMenuService menuService: IMenuService,
@@ -332,57 +328,9 @@ export class TerminalTabbedView extends Disposable {
 		}));
 		this._register(dom.addDisposableListener(terminalContainer, 'mousedown', async (event: MouseEvent) => {
 			const terminal = this._terminalGroupService.activeInstance;
-			if (this._terminalGroupService.instances.length === 0 || !terminal) {
-				this._cancelContextMenu = true;
-				return;
-			}
-
-			if (event.which === 2) {
-				switch (this._terminalConfigurationService.config.middleClickBehavior) {
-					case 'paste':
-						terminal.paste();
-						break;
-					case 'default':
-					default:
-						// Drop selection and focus terminal on Linux to enable middle button paste
-						// when click occurs on the selection itself.
-						terminal.focus();
-						break;
-				}
-			} else if (event.which === 3) {
-				const rightClickBehavior = this._terminalConfigurationService.config.rightClickBehavior;
-				if (rightClickBehavior === 'nothing') {
-					if (!event.shiftKey) {
-						this._cancelContextMenu = true;
-					}
-					return;
-				}
-				else if (rightClickBehavior === 'copyPaste' || rightClickBehavior === 'paste') {
-					// copyPaste: Shift+right click should open context menu
-					if (rightClickBehavior === 'copyPaste' && event.shiftKey) {
-						openContextMenu(dom.getWindow(terminalContainer), event, terminal, this._instanceMenu, this._contextMenuService);
-						return;
-					}
-
-					if (rightClickBehavior === 'copyPaste' && terminal.hasSelection()) {
-						await terminal.copySelection();
-						terminal.clearSelection();
-					} else {
-						if (BrowserFeatures.clipboard.readText) {
-							terminal.paste();
-						} else {
-							this._notificationService.info(`This browser doesn't support the clipboard.readText API needed to trigger a paste, try ${isMacintosh ? '⌘' : 'Ctrl'}+V instead.`);
-						}
-					}
-					// Clear selection after all click event bubbling is finished on Mac to prevent
-					// right-click selecting a word which is seemed cannot be disabled. There is a
-					// flicker when pasting but this appears to give the best experience if the
-					// setting is enabled.
-					if (isMacintosh) {
-						setTimeout(() => {
-							terminal.clearSelection();
-						}, 0);
-					}
+			if (this._terminalGroupService.instances.length > 0 && terminal) {
+				const result = await terminal.handleMouseEvent(event, this._instanceMenu);
+				if (typeof result === 'object' && result.cancelContextMenu) {
 					this._cancelContextMenu = true;
 				}
 			}
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalTabsList.ts b/src/vs/workbench/contrib/terminal/browser/terminalTabsList.ts
index 86824099a3b..254e4cb11de 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalTabsList.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalTabsList.ts
@@ -668,7 +668,11 @@ class TerminalTabsDragAndDrop extends Disposable implements IListDragAndDrop<ITe
 			for (const uri of resources) {
 				const instance = this._terminalService.getInstanceFromResource(uri);
 				if (instance) {
-					sourceInstances = [instance];
+					if (Array.isArray(sourceInstances)) {
+						sourceInstances.push(instance);
+					} else {
+						sourceInstances = [instance];
+					}
 					this._terminalService.moveToTerminalView(instance);
 				} else if (this._primaryBackend) {
 					const terminalIdentifier = parseTerminalUri(uri);
@@ -712,19 +716,13 @@ class TerminalTabsDragAndDrop extends Disposable implements IListDragAndDrop<ITe
 		}
 
 		if (!targetInstance) {
-			this._terminalGroupService.moveGroupToEnd(sourceInstances[0]);
+			this._terminalGroupService.moveGroupToEnd(sourceInstances);
 			this._terminalService.setActiveInstance(sourceInstances[0]);
 			return;
 		}
 
-		let focused = false;
-		for (const instance of sourceInstances) {
-			this._terminalGroupService.moveGroup(instance, targetInstance);
-			if (!focused) {
-				this._terminalService.setActiveInstance(instance);
-				focused = true;
-			}
-		}
+		this._terminalGroupService.moveGroup(sourceInstances, targetInstance);
+		this._terminalService.setActiveInstance(sourceInstances[0]);
 	}
 
 	private async _handleExternalDrop(instance: ITerminalInstance | undefined, e: DragEvent) {
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalView.ts b/src/vs/workbench/contrib/terminal/browser/terminalView.ts
index d774d658c5d..1efbc44c871 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalView.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalView.ts
@@ -230,7 +230,7 @@ export class TerminalViewPane extends ViewPane {
 		if (!this._parentDomElement) {
 			return;
 		}
-		this._terminalTabbedView = this.instantiationService.createInstance(TerminalTabbedView, this._parentDomElement);
+		this._terminalTabbedView = this._register(this.instantiationService.createInstance(TerminalTabbedView, this._parentDomElement));
 	}
 
 	// eslint-disable-next-line @typescript-eslint/naming-convention
diff --git a/src/vs/workbench/contrib/terminal/browser/xterm/decorationAddon.ts b/src/vs/workbench/contrib/terminal/browser/xterm/decorationAddon.ts
index ed4925cadf6..96bfa019539 100644
--- a/src/vs/workbench/contrib/terminal/browser/xterm/decorationAddon.ts
+++ b/src/vs/workbench/contrib/terminal/browser/xterm/decorationAddon.ts
@@ -468,7 +468,7 @@ export class DecorationAddon extends Disposable implements ITerminalAddon {
 	}
 
 	private _showToggleVisibilityQuickPick() {
-		const quickPick = this._quickInputService.createQuickPick();
+		const quickPick = this._register(this._quickInputService.createQuickPick());
 		quickPick.hideInput = true;
 		quickPick.hideCheckAll = true;
 		quickPick.canSelectMany = true;
@@ -493,7 +493,7 @@ export class DecorationAddon extends Disposable implements ITerminalAddon {
 			}
 		}
 		quickPick.selectedItems = selectedItems;
-		quickPick.onDidChangeSelection(async e => {
+		this._register(quickPick.onDidChangeSelection(async e => {
 			let newValue: 'both' | 'gutter' | 'overviewRuler' | 'never' = 'never';
 			if (e.includes(gutterIcon)) {
 				if (e.includes(overviewRulerIcon)) {
@@ -505,7 +505,7 @@ export class DecorationAddon extends Disposable implements ITerminalAddon {
 				newValue = 'overviewRuler';
 			}
 			await this._configurationService.updateValue(TerminalSettingId.ShellIntegrationDecorationsEnabled, newValue);
-		});
+		}));
 		quickPick.ok = false;
 		quickPick.show();
 	}
diff --git a/src/vs/workbench/contrib/terminal/common/history.ts b/src/vs/workbench/contrib/terminal/common/history.ts
index 390d66980a4..edd9d7e4845 100644
--- a/src/vs/workbench/contrib/terminal/common/history.ts
+++ b/src/vs/workbench/contrib/terminal/common/history.ts
@@ -10,7 +10,7 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
 import { FileOperationError, FileOperationResult, IFileContent, IFileService } from 'vs/platform/files/common/files';
 import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { PosixShellType, TerminalSettingId, TerminalShellType } from 'vs/platform/terminal/common/terminal';
+import { GeneralShellType, PosixShellType, TerminalSettingId, TerminalShellType } from 'vs/platform/terminal/common/terminal';
 import { URI } from 'vs/base/common/uri';
 import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
 import { Schemas } from 'vs/base/common/network';
@@ -83,7 +83,7 @@ export async function getShellFileHistory(accessor: ServicesAccessor, shellType:
 		case PosixShellType.Bash:
 			result = await fetchBashHistory(accessor);
 			break;
-		case PosixShellType.PowerShell: // WindowsShellType.PowerShell has the same value
+		case GeneralShellType.PowerShell:
 			result = await fetchPwshHistory(accessor);
 			break;
 		case PosixShellType.Zsh:
@@ -92,7 +92,7 @@ export async function getShellFileHistory(accessor: ServicesAccessor, shellType:
 		case PosixShellType.Fish:
 			result = await fetchFishHistory(accessor);
 			break;
-		case PosixShellType.Python:
+		case GeneralShellType.Python:
 			result = await fetchPythonHistory(accessor);
 			break;
 		default: return [];
diff --git a/src/vs/workbench/contrib/terminal/common/terminal.ts b/src/vs/workbench/contrib/terminal/common/terminal.ts
index 48ce604f7d2..2bbbfd79329 100644
--- a/src/vs/workbench/contrib/terminal/common/terminal.ts
+++ b/src/vs/workbench/contrib/terminal/common/terminal.ts
@@ -214,6 +214,9 @@ export interface ITerminalConfiguration {
 	smoothScrolling: boolean;
 	ignoreBracketedPasteMode: boolean;
 	rescaleOverlappingGlyphs: boolean;
+	experimental?: {
+		windowsUseConptyDll?: boolean;
+	};
 }
 
 export interface ITerminalFont {
diff --git a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
index c44b2c3ccab..4dc967f592f 100644
--- a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
+++ b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
@@ -16,11 +16,12 @@ import { Extensions as WorkbenchExtensions, IConfigurationMigrationRegistry, Con
 // Import configuration schemes from terminalContrib - this is an exception to the eslint rule since
 // they need to be declared at part of the rest of the terminal configuration
 import { terminalAccessibilityConfiguration } from 'vs/workbench/contrib/terminalContrib/accessibility/common/terminalAccessibilityConfiguration'; // eslint-disable-line local/code-import-patterns
+import { terminalCommandGuideConfiguration } from 'vs/workbench/contrib/terminalContrib/commandGuide/common/terminalCommandGuideConfiguration'; // eslint-disable-line local/code-import-patterns
+import { terminalInitialHintConfiguration } from 'vs/workbench/contrib/terminalContrib/chat/common/terminalInitialHintConfiguration'; // eslint-disable-line local/code-import-patterns
 import { terminalStickyScrollConfiguration } from 'vs/workbench/contrib/terminalContrib/stickyScroll/common/terminalStickyScrollConfiguration'; // eslint-disable-line local/code-import-patterns
+import { terminalSuggestConfiguration } from 'vs/workbench/contrib/terminalContrib/suggest/common/terminalSuggestConfiguration'; // eslint-disable-line local/code-import-patterns
 import { terminalTypeAheadConfiguration } from 'vs/workbench/contrib/terminalContrib/typeAhead/common/terminalTypeAheadConfiguration'; // eslint-disable-line local/code-import-patterns
 import { terminalZoomConfiguration } from 'vs/workbench/contrib/terminalContrib/zoom/common/terminal.zoom'; // eslint-disable-line local/code-import-patterns
-import { terminalSuggestConfiguration } from 'vs/workbench/contrib/terminalContrib/suggest/common/terminalSuggestConfiguration'; // eslint-disable-line local/code-import-patterns
-import { terminalInitialHintConfiguration } from 'vs/workbench/contrib/terminalContrib/chat/common/terminalInitialHintConfiguration';  // eslint-disable-line local/code-import-patterns
 
 const terminalDescriptors = '\n- ' + [
 	'`\${cwd}`: ' + localize("cwd", "the terminal's current working directory"),
@@ -464,6 +465,11 @@ const terminalConfiguration: IConfigurationNode = {
 			type: 'boolean',
 			default: true
 		},
+		[TerminalSettingId.ExperimentalWindowsUseConptyDll]: {
+			markdownDescription: localize('terminal.integrated.experimentalWindowsUseConptyDll', "Whether to use the experimental conpty.dll shipped with VS Code, instead of the one bundled with Windows."),
+			type: 'boolean',
+			default: false
+		},
 		[TerminalSettingId.SplitCwd]: {
 			description: localize('terminal.integrated.splitCwd', "Controls the working directory a split terminal starts with."),
 			type: 'string',
@@ -624,6 +630,7 @@ const terminalConfiguration: IConfigurationNode = {
 			]
 		},
 		...terminalAccessibilityConfiguration,
+		...terminalCommandGuideConfiguration,
 		...terminalInitialHintConfiguration,
 		...terminalStickyScrollConfiguration,
 		...terminalSuggestConfiguration,
diff --git a/src/vs/workbench/contrib/terminal/terminal.all.ts b/src/vs/workbench/contrib/terminal/terminal.all.ts
index 18877870bc2..d4e3fe8311a 100644
--- a/src/vs/workbench/contrib/terminal/terminal.all.ts
+++ b/src/vs/workbench/contrib/terminal/terminal.all.ts
@@ -18,7 +18,7 @@ import 'vs/workbench/contrib/terminalContrib/developer/browser/terminal.develope
 import 'vs/workbench/contrib/terminalContrib/environmentChanges/browser/terminal.environmentChanges.contribution';
 import 'vs/workbench/contrib/terminalContrib/find/browser/terminal.find.contribution';
 import 'vs/workbench/contrib/terminalContrib/chat/browser/terminal.chat.contribution';
-import 'vs/workbench/contrib/terminalContrib/highlight/browser/terminal.highlight.contribution';
+import 'vs/workbench/contrib/terminalContrib/commandGuide/browser/terminal.commandGuide.contribution';
 import 'vs/workbench/contrib/terminalContrib/links/browser/terminal.links.contribution';
 import 'vs/workbench/contrib/terminalContrib/zoom/browser/terminal.zoom.contribution';
 import 'vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminal.stickyScroll.contribution';
diff --git a/src/vs/workbench/contrib/terminal/test/browser/terminalInstance.test.ts b/src/vs/workbench/contrib/terminal/test/browser/terminalInstance.test.ts
index 4d7c61fec55..58a23373a57 100644
--- a/src/vs/workbench/contrib/terminal/test/browser/terminalInstance.test.ts
+++ b/src/vs/workbench/contrib/terminal/test/browser/terminalInstance.test.ts
@@ -141,7 +141,7 @@ suite('Workbench - TerminalInstance', () => {
 							unicodeVersion: '6',
 							shellIntegration: {
 								enabled: true
-							},
+							}
 						}
 					},
 				})
diff --git a/src/vs/workbench/contrib/terminal/test/common/terminalEnvironment.test.ts b/src/vs/workbench/contrib/terminal/test/common/terminalEnvironment.test.ts
index 6c7ae16402a..a7a091d5ef6 100644
--- a/src/vs/workbench/contrib/terminal/test/common/terminalEnvironment.test.ts
+++ b/src/vs/workbench/contrib/terminal/test/common/terminalEnvironment.test.ts
@@ -8,7 +8,7 @@ import { IStringDictionary } from 'vs/base/common/collections';
 import { isWindows, OperatingSystem } from 'vs/base/common/platform';
 import { URI as Uri } from 'vs/base/common/uri';
 import { addTerminalEnvironmentKeys, createTerminalEnvironment, getCwd, getLangEnvVariable, mergeEnvironments, preparePathForShell, shouldSetLangEnvVariable } from 'vs/workbench/contrib/terminal/common/terminalEnvironment';
-import { PosixShellType, WindowsShellType } from 'vs/platform/terminal/common/terminal';
+import { GeneralShellType, PosixShellType, WindowsShellType } from 'vs/platform/terminal/common/terminal';
 import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
 
 suite('Workbench - TerminalEnvironment', () => {
@@ -239,9 +239,9 @@ suite('Workbench - TerminalEnvironment', () => {
 				strictEqual(await preparePathForShell('c:\\foo\\bar$(echo evil)baz', 'cmd', 'cmd', WindowsShellType.CommandPrompt, wslPathBackend, OperatingSystem.Windows, true), `"c:\\foo\\bar$(echo evil)baz"`);
 			});
 			test('PowerShell', async () => {
-				strictEqual(await preparePathForShell('c:\\foo\\bar', 'pwsh', 'pwsh', WindowsShellType.PowerShell, wslPathBackend, OperatingSystem.Windows, true), `c:\\foo\\bar`);
-				strictEqual(await preparePathForShell('c:\\foo\\bar\'baz', 'pwsh', 'pwsh', WindowsShellType.PowerShell, wslPathBackend, OperatingSystem.Windows, true), `& 'c:\\foo\\bar''baz'`);
-				strictEqual(await preparePathForShell('c:\\foo\\bar$(echo evil)baz', 'pwsh', 'pwsh', WindowsShellType.PowerShell, wslPathBackend, OperatingSystem.Windows, true), `& 'c:\\foo\\bar$(echo evil)baz'`);
+				strictEqual(await preparePathForShell('c:\\foo\\bar', 'pwsh', 'pwsh', GeneralShellType.PowerShell, wslPathBackend, OperatingSystem.Windows, true), `c:\\foo\\bar`);
+				strictEqual(await preparePathForShell('c:\\foo\\bar\'baz', 'pwsh', 'pwsh', GeneralShellType.PowerShell, wslPathBackend, OperatingSystem.Windows, true), `& 'c:\\foo\\bar''baz'`);
+				strictEqual(await preparePathForShell('c:\\foo\\bar$(echo evil)baz', 'pwsh', 'pwsh', GeneralShellType.PowerShell, wslPathBackend, OperatingSystem.Windows, true), `& 'c:\\foo\\bar$(echo evil)baz'`);
 			});
 			test('Git Bash', async () => {
 				strictEqual(await preparePathForShell('c:\\foo\\bar', 'bash', 'bash', WindowsShellType.GitBash, wslPathBackend, OperatingSystem.Windows, true), `'c:/foo/bar'`);
@@ -265,9 +265,9 @@ suite('Workbench - TerminalEnvironment', () => {
 				strictEqual(await preparePathForShell('c:\\foo\\bar$(echo evil)baz', 'cmd', 'cmd', WindowsShellType.CommandPrompt, wslPathBackend, OperatingSystem.Windows, false), `"c:\\foo\\bar$(echo evil)baz"`);
 			});
 			test('PowerShell', async () => {
-				strictEqual(await preparePathForShell('c:\\foo\\bar', 'pwsh', 'pwsh', WindowsShellType.PowerShell, wslPathBackend, OperatingSystem.Windows, false), `c:\\foo\\bar`);
-				strictEqual(await preparePathForShell('c:\\foo\\bar\'baz', 'pwsh', 'pwsh', WindowsShellType.PowerShell, wslPathBackend, OperatingSystem.Windows, false), `& 'c:\\foo\\bar''baz'`);
-				strictEqual(await preparePathForShell('c:\\foo\\bar$(echo evil)baz', 'pwsh', 'pwsh', WindowsShellType.PowerShell, wslPathBackend, OperatingSystem.Windows, false), `& 'c:\\foo\\bar$(echo evil)baz'`);
+				strictEqual(await preparePathForShell('c:\\foo\\bar', 'pwsh', 'pwsh', GeneralShellType.PowerShell, wslPathBackend, OperatingSystem.Windows, false), `c:\\foo\\bar`);
+				strictEqual(await preparePathForShell('c:\\foo\\bar\'baz', 'pwsh', 'pwsh', GeneralShellType.PowerShell, wslPathBackend, OperatingSystem.Windows, false), `& 'c:\\foo\\bar''baz'`);
+				strictEqual(await preparePathForShell('c:\\foo\\bar$(echo evil)baz', 'pwsh', 'pwsh', GeneralShellType.PowerShell, wslPathBackend, OperatingSystem.Windows, false), `& 'c:\\foo\\bar$(echo evil)baz'`);
 			});
 			test('Git Bash', async () => {
 				strictEqual(await preparePathForShell('c:\\foo\\bar', 'bash', 'bash', WindowsShellType.GitBash, wslPathBackend, OperatingSystem.Windows, false), `'c:/foo/bar'`);
diff --git a/src/vs/workbench/contrib/terminalContrib/accessibility/browser/terminal.accessibility.contribution.ts b/src/vs/workbench/contrib/terminalContrib/accessibility/browser/terminal.accessibility.contribution.ts
index c2b8198873a..679dac8930e 100644
--- a/src/vs/workbench/contrib/terminalContrib/accessibility/browser/terminal.accessibility.contribution.ts
+++ b/src/vs/workbench/contrib/terminalContrib/accessibility/browser/terminal.accessibility.contribution.ts
@@ -30,11 +30,11 @@ import { TerminalSettingId } from 'vs/platform/terminal/common/terminal';
 import { Event } from 'vs/base/common/event';
 import { ICurrentPartialCommand } from 'vs/platform/terminal/common/capabilities/commandDetection/terminalCommand';
 import { AccessibilitySignal, IAccessibilitySignalService } from 'vs/platform/accessibilitySignal/browser/accessibilitySignalService';
-import { alert } from 'vs/base/browser/ui/aria/aria';
 import { TerminalAccessibilitySettingId } from 'vs/workbench/contrib/terminalContrib/accessibility/common/terminalAccessibilityConfiguration';
 import { TerminalAccessibilityCommandId } from 'vs/workbench/contrib/terminalContrib/accessibility/common/terminal.accessibility';
 import { IAccessibleViewService, AccessibleViewProviderId, NavigationType } from 'vs/platform/accessibility/browser/accessibleView';
 import { accessibleViewCurrentProviderId, accessibleViewIsShown } from 'vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
+import { isWindows } from 'vs/base/common/platform';
 
 // #region Terminal Contributions
 
@@ -186,11 +186,14 @@ export class TerminalAccessibleViewContribution extends Disposable implements IT
 			return;
 		}
 		const command = filteredCommands[0];
-		this._accessibleViewService.setPosition(new Position(command.lineNumber, 1), true);
 		const commandLine = command.command.command;
-		if (commandLine) {
+		if (!isWindows && commandLine) {
+			this._accessibleViewService.setPosition(new Position(command.lineNumber, 1), true);
 			alert(commandLine);
+		} else {
+			this._accessibleViewService.setPosition(new Position(command.lineNumber, 1), true, true);
 		}
+
 		if (command.exitCode) {
 			this._accessibilitySignalService.playSignal(AccessibilitySignal.terminalCommandFailed);
 		} else {
diff --git a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatController.ts b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatController.ts
index b1b2b5ad1c9..d8ad5dae074 100644
--- a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatController.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatController.ts
@@ -206,6 +206,9 @@ export class TerminalChatController extends Disposable implements ITerminalContr
 
 	async acceptInput(): Promise<IChatResponseModel | undefined> {
 		assertType(this._chatWidget);
+		if (!this._model.value) {
+			await this.reveal();
+		}
 		assertType(this._model.value);
 		const lastInput = this._chatWidget.value.inlineChatWidget.value;
 		if (!lastInput) {
diff --git a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatWidget.ts b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatWidget.ts
index d28f3cf8455..9af4328c1ba 100644
--- a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatWidget.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatWidget.ts
@@ -203,7 +203,6 @@ export class TerminalChatWidget extends Disposable {
 		this._container.classList.add('hide');
 		this._inlineChatWidget.reset();
 		this._reset();
-		this._inlineChatWidget.updateChatMessage(undefined);
 		this._inlineChatWidget.updateToolbar(false);
 		this._visibleContextKey.set(false);
 		this._inlineChatWidget.value = '';
@@ -231,12 +230,6 @@ export class TerminalChatWidget extends Disposable {
 	input(): string {
 		return this._inlineChatWidget.value;
 	}
-	addToHistory(input: string): void {
-		this._inlineChatWidget.addToHistory(input);
-		this._inlineChatWidget.saveState();
-		this._inlineChatWidget.value = input;
-		this._inlineChatWidget.selectAll(true);
-	}
 	setValue(value?: string) {
 		this._inlineChatWidget.value = value ?? '';
 	}
diff --git a/src/vs/workbench/contrib/terminalContrib/chat/test/browser/terminalInitialHint.test.ts b/src/vs/workbench/contrib/terminalContrib/chat/test/browser/terminalInitialHint.test.ts
index 0558b023b16..a1dbbfbdd17 100644
--- a/src/vs/workbench/contrib/terminalContrib/chat/test/browser/terminalInitialHint.test.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chat/test/browser/terminalInitialHint.test.ts
@@ -33,6 +33,7 @@ suite('Terminal Initial Hint Addon', () => {
 		extensionDisplayName: 'test',
 		metadata: {},
 		slashCommands: [{ name: 'test', description: 'test' }],
+		disambiguation: [],
 		locations: [ChatAgentLocation.fromRaw('terminal')],
 		invoke: async () => { return {}; }
 	};
@@ -45,6 +46,7 @@ suite('Terminal Initial Hint Addon', () => {
 		metadata: {},
 		slashCommands: [{ name: 'test', description: 'test' }],
 		locations: [ChatAgentLocation.fromRaw('editor')],
+		disambiguation: [],
 		invoke: async () => { return {}; }
 	};
 	setup(async () => {
diff --git a/src/vs/workbench/contrib/terminalContrib/commandGuide/browser/terminal.commandGuide.contribution.ts b/src/vs/workbench/contrib/terminalContrib/commandGuide/browser/terminal.commandGuide.contribution.ts
new file mode 100644
index 00000000000..4cba20b6a3d
--- /dev/null
+++ b/src/vs/workbench/contrib/terminalContrib/commandGuide/browser/terminal.commandGuide.contribution.ts
@@ -0,0 +1,101 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import type { Terminal as RawXtermTerminal } from '@xterm/xterm';
+import { addDisposableListener } from 'vs/base/browser/dom';
+import { combinedDisposable, Disposable, MutableDisposable } from 'vs/base/common/lifecycle';
+import { localize } from 'vs/nls';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { TerminalCapability } from 'vs/platform/terminal/common/capabilities/capabilities';
+import { listInactiveSelectionBackground } from 'vs/platform/theme/common/colorRegistry';
+import { registerColor, transparent } from 'vs/platform/theme/common/colorUtils';
+import { PANEL_BORDER } from 'vs/workbench/common/theme';
+import { IDetachedTerminalInstance, ITerminalContribution, ITerminalInstance, IXtermTerminal } from 'vs/workbench/contrib/terminal/browser/terminal';
+import { registerTerminalContribution } from 'vs/workbench/contrib/terminal/browser/terminalExtensions';
+import { TerminalWidgetManager } from 'vs/workbench/contrib/terminal/browser/widgets/widgetManager';
+import { ITerminalProcessInfo, ITerminalProcessManager } from 'vs/workbench/contrib/terminal/common/terminal';
+import { terminalCommandGuideConfigSection, TerminalCommandGuideSettingId, type ITerminalCommandGuideConfiguration } from 'vs/workbench/contrib/terminalContrib/commandGuide/common/terminalCommandGuideConfiguration';
+
+// #region Terminal Contributions
+
+class TerminalCommandGuideContribution extends Disposable implements ITerminalContribution {
+	static readonly ID = 'terminal.highlight';
+
+	static get(instance: ITerminalInstance | IDetachedTerminalInstance): TerminalCommandGuideContribution | null {
+		return instance.getContribution<TerminalCommandGuideContribution>(TerminalCommandGuideContribution.ID);
+	}
+
+	private _xterm: IXtermTerminal & { raw: RawXtermTerminal } | undefined;
+	private readonly _activeCommandGuide = this._register(new MutableDisposable());
+
+	constructor(
+		private readonly _instance: ITerminalInstance | IDetachedTerminalInstance,
+		processManager: ITerminalProcessManager | ITerminalProcessInfo,
+		widgetManager: TerminalWidgetManager,
+		@IConfigurationService private readonly _configurationService: IConfigurationService,
+	) {
+		super();
+	}
+
+	xtermOpen(xterm: IXtermTerminal & { raw: RawXtermTerminal }): void {
+		this._xterm = xterm;
+		this._refreshActivatedState();
+		this._configurationService.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration(TerminalCommandGuideSettingId.ShowCommandGuide)) {
+				this._refreshActivatedState();
+			}
+		});
+	}
+
+	private _refreshActivatedState() {
+		const xterm = this._xterm;
+		if (!xterm) {
+			return;
+		}
+
+		const showCommandGuide = this._configurationService.getValue<ITerminalCommandGuideConfiguration>(terminalCommandGuideConfigSection).showCommandGuide;
+		if (!!this._activeCommandGuide.value === showCommandGuide) {
+			return;
+		}
+
+		if (!showCommandGuide) {
+			this._activeCommandGuide.clear();
+		} else {
+			const screenElement = xterm.raw.element!.querySelector('.xterm-screen')!;
+			const viewportElement = xterm.raw.element!.querySelector('.xterm-viewport')!;
+			this._activeCommandGuide.value = combinedDisposable(
+				addDisposableListener(screenElement, 'mousemove', (e: MouseEvent) => this._tryShowHighlight(screenElement, xterm, e)),
+				addDisposableListener(viewportElement, 'mousemove', (e: MouseEvent) => this._tryShowHighlight(screenElement, xterm, e)),
+				addDisposableListener(xterm.raw.element!, 'mouseout', () => xterm.markTracker.showCommandGuide(undefined)),
+				xterm.raw.onData(() => xterm.markTracker.showCommandGuide(undefined)),
+			);
+		}
+	}
+
+	private _tryShowHighlight(element: Element, xterm: IXtermTerminal & { raw: RawXtermTerminal }, e: MouseEvent) {
+		const rect = element.getBoundingClientRect();
+		if (!rect) {
+			return;
+		}
+		const mouseCursorY = Math.floor(e.offsetY / (rect.height / xterm.raw.rows));
+		const command = this._instance.capabilities.get(TerminalCapability.CommandDetection)?.getCommandForLine(xterm.raw.buffer.active.viewportY + mouseCursorY);
+		if (command && 'getOutput' in command) {
+			xterm.markTracker.showCommandGuide(command);
+		} else {
+			xterm.markTracker.showCommandGuide(undefined);
+		}
+	}
+}
+
+registerTerminalContribution(TerminalCommandGuideContribution.ID, TerminalCommandGuideContribution, false);
+
+export const TERMINAL_COMMAND_GUIDE_COLOR = registerColor('terminalCommandGuide.foreground', {
+	dark: transparent(listInactiveSelectionBackground, 1),
+	light: transparent(listInactiveSelectionBackground, 1),
+	hcDark: PANEL_BORDER,
+	hcLight: PANEL_BORDER
+}, localize('terminalCommandGuide.foreground', 'The foreground color of the terminal command guide that appears to the left of a command and its output on hover.'));
+
+// #endregion
diff --git a/src/vs/workbench/contrib/terminalContrib/commandGuide/common/terminalCommandGuideConfiguration.ts b/src/vs/workbench/contrib/terminalContrib/commandGuide/common/terminalCommandGuideConfiguration.ts
new file mode 100644
index 00000000000..bae0d5d8ed0
--- /dev/null
+++ b/src/vs/workbench/contrib/terminalContrib/commandGuide/common/terminalCommandGuideConfiguration.ts
@@ -0,0 +1,27 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import type { IStringDictionary } from 'vs/base/common/collections';
+import { localize } from 'vs/nls';
+import type { IConfigurationPropertySchema } from 'vs/platform/configuration/common/configurationRegistry';
+
+export const enum TerminalCommandGuideSettingId {
+	ShowCommandGuide = 'terminal.integrated.shellIntegration.showCommandGuide',
+}
+
+export const terminalCommandGuideConfigSection = 'terminal.integrated.shellIntegration';
+
+export interface ITerminalCommandGuideConfiguration {
+	showCommandGuide: boolean;
+}
+
+export const terminalCommandGuideConfiguration: IStringDictionary<IConfigurationPropertySchema> = {
+	[TerminalCommandGuideSettingId.ShowCommandGuide]: {
+		restricted: true,
+		markdownDescription: localize('showCommandGuide', "Whether to show the command guide when hovering over a command in the terminal."),
+		type: 'boolean',
+		default: true,
+	},
+};
diff --git a/src/vs/workbench/contrib/terminalContrib/highlight/browser/terminal.highlight.contribution.ts b/src/vs/workbench/contrib/terminalContrib/highlight/browser/terminal.highlight.contribution.ts
deleted file mode 100644
index 2217fb1aed1..00000000000
--- a/src/vs/workbench/contrib/terminalContrib/highlight/browser/terminal.highlight.contribution.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import type { Terminal as RawXtermTerminal } from '@xterm/xterm';
-import { addDisposableListener } from 'vs/base/browser/dom';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { TerminalCapability } from 'vs/platform/terminal/common/capabilities/capabilities';
-import { IDetachedTerminalInstance, ITerminalContribution, ITerminalInstance, IXtermTerminal } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { registerTerminalContribution } from 'vs/workbench/contrib/terminal/browser/terminalExtensions';
-import { TerminalWidgetManager } from 'vs/workbench/contrib/terminal/browser/widgets/widgetManager';
-import { ITerminalProcessInfo, ITerminalProcessManager } from 'vs/workbench/contrib/terminal/common/terminal';
-
-// #region Terminal Contributions
-class TerminalHighlightContribution extends Disposable implements ITerminalContribution {
-	static readonly ID = 'terminal.highlight';
-
-	static get(instance: ITerminalInstance | IDetachedTerminalInstance): TerminalHighlightContribution | null {
-		return instance.getContribution<TerminalHighlightContribution>(TerminalHighlightContribution.ID);
-	}
-
-	constructor(
-		private readonly _instance: ITerminalInstance | IDetachedTerminalInstance,
-		processManager: ITerminalProcessManager | ITerminalProcessInfo,
-		widgetManager: TerminalWidgetManager,
-	) {
-		super();
-	}
-
-	xtermOpen(xterm: IXtermTerminal & { raw: RawXtermTerminal }): void {
-		const screenElement = xterm.raw.element!.querySelector('.xterm-screen')!;
-		this._register(addDisposableListener(screenElement, 'mousemove', (e: MouseEvent) => this._tryShowHighlight(screenElement, xterm, e)));
-
-		const viewportElement = xterm.raw.element!.querySelector('.xterm-viewport')!;
-		this._register(addDisposableListener(viewportElement, 'mousemove', (e: MouseEvent) => this._tryShowHighlight(screenElement, xterm, e)));
-
-		this._register(addDisposableListener(xterm.raw.element!, 'mouseout', () => xterm.markTracker.showCommandGuide(undefined)));
-		this._register(xterm.raw.onData(() => xterm.markTracker.showCommandGuide(undefined)));
-	}
-
-	private _tryShowHighlight(element: Element, xterm: IXtermTerminal & { raw: RawXtermTerminal }, e: MouseEvent) {
-		const rect = element.getBoundingClientRect();
-		if (!rect) {
-			return;
-		}
-		const mouseCursorY = Math.floor(e.offsetY / (rect.height / xterm.raw.rows));
-		const command = this._instance.capabilities.get(TerminalCapability.CommandDetection)?.getCommandForLine(xterm.raw.buffer.active.viewportY + mouseCursorY);
-		if (command && 'getOutput' in command) {
-			xterm.markTracker.showCommandGuide(command);
-		} else {
-			xterm.markTracker.showCommandGuide(undefined);
-		}
-	}
-}
-
-registerTerminalContribution(TerminalHighlightContribution.ID, TerminalHighlightContribution, false);
-
-// #endregion
diff --git a/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLinkDetectorAdapter.ts b/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLinkDetectorAdapter.ts
index 26c047ea42d..fe3d75551c9 100644
--- a/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLinkDetectorAdapter.ts
+++ b/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLinkDetectorAdapter.ts
@@ -76,7 +76,8 @@ export class TerminalLinkDetectorAdapter extends Disposable implements ILinkProv
 		// Cap the maximum context on either side of the line being provided, by taking the context
 		// around the line being provided for this ensures the line the pointer is on will have
 		// links provided.
-		const maxLineContext = Math.max(this._detector.maxLinkLength, this._detector.xterm.cols);
+		const maxCharacterContext = Math.max(this._detector.maxLinkLength, this._detector.xterm.cols);
+		const maxLineContext = Math.ceil(maxCharacterContext / this._detector.xterm.cols);
 		const minStartLine = Math.max(startLine - maxLineContext, 0);
 		const maxEndLine = Math.min(endLine + maxLineContext, this._detector.xterm.buffer.active.length);
 
diff --git a/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLinkQuickpick.ts b/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLinkQuickpick.ts
index 0eee6b948a9..6b88eb4ce83 100644
--- a/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLinkQuickpick.ts
+++ b/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLinkQuickpick.ts
@@ -75,7 +75,9 @@ export class TerminalLinkQuickpick extends DisposableStore {
 		}
 
 		// Create and show quick pick
-		const pick = this._quickInputService.createQuickPick<IQuickPickItem | ITerminalLinkQuickPickItem>();
+		const pick = this._quickInputService.createQuickPick<IQuickPickItem | ITerminalLinkQuickPickItem>({ useSeparators: true });
+		const disposables = new DisposableStore();
+		disposables.add(pick);
 		pick.items = picks;
 		pick.placeholder = localize('terminal.integrated.openDetectedLink', "Select the link to open, type to filter all links");
 		pick.sortByLabel = false;
@@ -87,7 +89,6 @@ export class TerminalLinkQuickpick extends DisposableStore {
 		// Show all results only when filtering begins, this is done so the quick pick will show up
 		// ASAP with only the viewport entries.
 		let accepted = false;
-		const disposables = new DisposableStore();
 		if (!usingAllLinks) {
 			disposables.add(Event.once(pick.onDidChangeValue)(async () => {
 				const allLinks = await links.all;
diff --git a/src/vs/workbench/contrib/terminalContrib/quickFix/test/browser/quickFixAddon.test.ts b/src/vs/workbench/contrib/terminalContrib/quickFix/test/browser/quickFixAddon.test.ts
index 0607960f0d4..ddf9fbe88ca 100644
--- a/src/vs/workbench/contrib/terminalContrib/quickFix/test/browser/quickFixAddon.test.ts
+++ b/src/vs/workbench/contrib/terminalContrib/quickFix/test/browser/quickFixAddon.test.ts
@@ -3,34 +3,32 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import type { Terminal } from '@xterm/xterm';
 import { strictEqual } from 'assert';
+import { importAMDNodeModule } from 'vs/amdX';
 import { IAction } from 'vs/base/common/actions';
+import { Event } from 'vs/base/common/event';
 import { isWindows } from 'vs/base/common/platform';
+import { URI } from 'vs/base/common/uri';
+import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { TestCommandService } from 'vs/editor/test/browser/editorTestServices';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
 import { ContextMenuService } from 'vs/platform/contextview/browser/contextMenuService';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
+import { ILabelService } from 'vs/platform/label/common/label';
 import { ILogService, NullLogService } from 'vs/platform/log/common/log';
+import { IOpenerService } from 'vs/platform/opener/common/opener';
+import { IStorageService } from 'vs/platform/storage/common/storage';
 import { ITerminalCommand, TerminalCapability } from 'vs/platform/terminal/common/capabilities/capabilities';
 import { CommandDetectionCapability } from 'vs/platform/terminal/common/capabilities/commandDetectionCapability';
 import { TerminalCapabilityStore } from 'vs/platform/terminal/common/capabilities/terminalCapabilityStore';
-import { gitSimilar, freePort, FreePortOutputRegex, gitCreatePr, GitCreatePrOutputRegex, GitPushOutputRegex, gitPushSetUpstream, GitSimilarOutputRegex, gitTwoDashes, GitTwoDashesRegex, pwshUnixCommandNotFoundError, PwshUnixCommandNotFoundErrorOutputRegex, pwshGeneralError, PwshGeneralErrorOutputRegex, gitPull, GitPullOutputRegex } from 'vs/workbench/contrib/terminalContrib/quickFix/browser/terminalQuickFixBuiltinActions';
-import { TerminalQuickFixAddon, getQuickFixesForCommand } from 'vs/workbench/contrib/terminalContrib/quickFix/browser/quickFixAddon';
-import { URI } from 'vs/base/common/uri';
-import type { Terminal } from '@xterm/xterm';
-import { Event } from 'vs/base/common/event';
-import { LabelService } from 'vs/workbench/services/label/common/labelService';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { OpenerService } from 'vs/editor/browser/services/openerService';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { IStorageService } from 'vs/platform/storage/common/storage';
-import { TestStorageService } from 'vs/workbench/test/common/workbenchTestServices';
-import { ITerminalQuickFixService } from 'vs/workbench/contrib/terminalContrib/quickFix/browser/quickFix';
 import { ITerminalOutputMatcher } from 'vs/platform/terminal/common/terminal';
-import { importAMDNodeModule } from 'vs/amdX';
-import { TestCommandService } from 'vs/editor/test/browser/editorTestServices';
-import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { ITerminalQuickFixService } from 'vs/workbench/contrib/terminalContrib/quickFix/browser/quickFix';
+import { getQuickFixesForCommand, TerminalQuickFixAddon } from 'vs/workbench/contrib/terminalContrib/quickFix/browser/quickFixAddon';
+import { freePort, FreePortOutputRegex, gitCreatePr, GitCreatePrOutputRegex, gitPull, GitPullOutputRegex, GitPushOutputRegex, gitPushSetUpstream, gitSimilar, GitSimilarOutputRegex, gitTwoDashes, GitTwoDashesRegex, pwshGeneralError, PwshGeneralErrorOutputRegex, pwshUnixCommandNotFoundError, PwshUnixCommandNotFoundErrorOutputRegex } from 'vs/workbench/contrib/terminalContrib/quickFix/browser/terminalQuickFixBuiltinActions';
+import { TestStorageService } from 'vs/workbench/test/common/workbenchTestServices';
 
 suite('QuickFixAddon', () => {
 	const store = ensureNoDisposablesAreLeakedInTestSuite();
@@ -38,8 +36,8 @@ suite('QuickFixAddon', () => {
 	let quickFixAddon: TerminalQuickFixAddon;
 	let commandDetection: CommandDetectionCapability;
 	let commandService: TestCommandService;
-	let openerService: OpenerService;
-	let labelService: LabelService;
+	let openerService: IOpenerService;
+	let labelService: ILabelService;
 	let terminal: Terminal;
 	let instantiationService: TestInstantiationService;
 
@@ -59,13 +57,13 @@ suite('QuickFixAddon', () => {
 			extensionQuickFixes: Promise.resolve([])
 		} as Partial<ITerminalQuickFixService>);
 		instantiationService.stub(IConfigurationService, new TestConfigurationService());
-		instantiationService.stub(ILabelService, {} as Partial<ILabelService>);
+		labelService = instantiationService.stub(ILabelService, {} as Partial<ILabelService>);
 		const capabilities = store.add(new TerminalCapabilityStore());
 		instantiationService.stub(ILogService, new NullLogService());
 		commandDetection = store.add(instantiationService.createInstance(CommandDetectionCapability, terminal));
 		capabilities.add(TerminalCapability.CommandDetection, commandDetection);
 		instantiationService.stub(IContextMenuService, store.add(instantiationService.createInstance(ContextMenuService)));
-		instantiationService.stub(IOpenerService, {} as Partial<IOpenerService>);
+		openerService = instantiationService.stub(IOpenerService, {} as Partial<IOpenerService>);
 		commandService = new TestCommandService(instantiationService);
 
 		quickFixAddon = instantiationService.createInstance(TerminalQuickFixAddon, [], capabilities);
diff --git a/src/vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminalStickyScrollOverlay.ts b/src/vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminalStickyScrollOverlay.ts
index 07a40f9ef98..92d0aeb48c4 100644
--- a/src/vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminalStickyScrollOverlay.ts
+++ b/src/vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminalStickyScrollOverlay.ts
@@ -432,7 +432,6 @@ export class TerminalStickyScrollOverlay extends Disposable {
 	private _getOptions(): ITerminalOptions {
 		const o = this._xterm.raw.options;
 		return {
-			allowTransparency: true,
 			cursorInactiveStyle: 'none',
 			scrollback: 0,
 			logLevel: 'off',
diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminal.suggest.contribution.ts b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminal.suggest.contribution.ts
index 35989c71d16..433de4eedc7 100644
--- a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminal.suggest.contribution.ts
+++ b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminal.suggest.contribution.ts
@@ -5,9 +5,11 @@
 
 import type { Terminal as RawXtermTerminal } from '@xterm/xterm';
 import * as dom from 'vs/base/browser/dom';
+import { AutoOpenBarrier } from 'vs/base/common/async';
 import { Event } from 'vs/base/common/event';
 import { KeyCode } from 'vs/base/common/keyCodes';
 import { DisposableStore, MutableDisposable, toDisposable } from 'vs/base/common/lifecycle';
+import { isWindows } from 'vs/base/common/platform';
 import { localize2 } from 'vs/nls';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { ContextKeyExpr, IContextKey, IContextKeyService, IReadableSet } from 'vs/platform/contextkey/common/contextkey';
@@ -157,16 +159,32 @@ class TerminalSuggestContribution extends DisposableStore implements ITerminalCo
 			return;
 		}
 		if (this._terminalSuggestWidgetVisibleContextKey) {
-			this._addon.value = this._instantiationService.createInstance(SuggestAddon, TerminalSuggestContribution._cachedPwshCommands, this._instance.capabilities, this._terminalSuggestWidgetVisibleContextKey);
-			xterm.loadAddon(this._addon.value);
-			this._addon.value.setPanel(dom.findParentWithClass(xterm.element!, 'panel')!);
-			this._addon.value.setScreen(xterm.element!.querySelector('.xterm-screen')!);
-			this.add(this._instance.onDidBlur(() => this._addon.value?.hideSuggestWidget()));
-			this.add(this._addon.value.onAcceptedCompletion(async text => {
+			const addon = this._addon.value = this._instantiationService.createInstance(SuggestAddon, TerminalSuggestContribution._cachedPwshCommands, this._instance.capabilities, this._terminalSuggestWidgetVisibleContextKey);
+			xterm.loadAddon(addon);
+			addon.setPanel(dom.findParentWithClass(xterm.element!, 'panel')!);
+			addon.setScreen(xterm.element!.querySelector('.xterm-screen')!);
+			this.add(this._instance.onDidBlur(() => addon.hideSuggestWidget()));
+			this.add(addon.onAcceptedCompletion(async text => {
 				this._instance.focus();
 				this._instance.sendText(text, false);
 			}));
-			this.add(this._instance.onDidSendText(() => this._addon.value?.hideSuggestWidget()));
+
+			// If completions are requested, pause and queue input events until completions are
+			// received. This fixing some problems in PowerShell, particularly enter not executing
+			// when typing quickly and some characters being printed twice. On Windows this isn't
+			// needed because inputs are _not_ echoed when not handled immediately.
+			// TODO: This should be based on the OS of the pty host, not the client
+			if (!isWindows) {
+				let barrier: AutoOpenBarrier | undefined;
+				this.add(addon.onDidRequestCompletions(() => {
+					barrier = new AutoOpenBarrier(2000);
+					this._instance.pauseInputEvents(barrier);
+				}));
+				this.add(addon.onDidReceiveCompletions(() => {
+					barrier?.open();
+					barrier = undefined;
+				}));
+			}
 		}
 	}
 }
@@ -250,7 +268,8 @@ registerActiveInstanceAction({
 	keybinding: {
 		primary: KeyCode.Enter,
 		// Enter is bound to other workbench keybindings that this needs to beat
-		weight: KeybindingWeight.WorkbenchContrib + 1
+		weight: KeybindingWeight.WorkbenchContrib + 1,
+		when: ContextKeyExpr.notEquals(`config.${TerminalSuggestSettingId.RunOnEnter}`, 'ignore'),
 	},
 	run: (activeInstance) => TerminalSuggestContribution.get(activeInstance)?.addon?.acceptSelectedSuggestion(undefined, true)
 });
diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts
index 70b3c21fb3c..75c427be3c6 100644
--- a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts
+++ b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts
@@ -25,9 +25,10 @@ import { ITerminalConfigurationService } from 'vs/workbench/contrib/terminal/bro
 import type { IXtermCore } from 'vs/workbench/contrib/terminal/browser/xterm-private';
 import { TerminalStorageKeys } from 'vs/workbench/contrib/terminal/common/terminalStorageKeys';
 import { terminalSuggestConfigSection, type ITerminalSuggestConfiguration } from 'vs/workbench/contrib/terminalContrib/suggest/common/terminalSuggestConfiguration';
-import { SimpleCompletionItem } from 'vs/workbench/services/suggest/browser/simpleCompletionItem';
+import { SimpleCompletionItem, type ISimpleCompletion } from 'vs/workbench/services/suggest/browser/simpleCompletionItem';
 import { LineContext, SimpleCompletionModel } from 'vs/workbench/services/suggest/browser/simpleCompletionModel';
 import { ISimpleSelectedSuggestion, SimpleSuggestWidget } from 'vs/workbench/services/suggest/browser/simpleSuggestWidget';
+import type { ISimpleSuggestWidgetFontInfo } from 'vs/workbench/services/suggest/browser/simpleSuggestWidgetRenderer';
 
 export const enum VSCodeSuggestOscPt {
 	Completions = 'Completions',
@@ -39,13 +40,15 @@ export const enum VSCodeSuggestOscPt {
 export type CompressedPwshCompletion = [
 	completionText: string,
 	resultType: number,
-	toolTip: string
+	toolTip?: string,
+	customIcon?: string
 ];
 
 export type PwshCompletion = {
 	CompletionText: string;
 	ResultType: number;
 	ToolTip?: string;
+	CustomIcon?: string;
 };
 
 
@@ -104,7 +107,6 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 	private readonly _promptInputModelSubscriptions = this._register(new MutableDisposable());
 
 	private _mostRecentPromptInputState?: IPromptInputModelState;
-	private _initialPromptInputState?: IPromptInputModelState;
 	private _currentPromptInputState?: IPromptInputModelState;
 	private _model?: SimpleCompletionModel;
 
@@ -114,6 +116,7 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 	private _enableWidget: boolean = true;
 	private _pathSeparator: string = sep;
 	private _isFilteringDirectories: boolean = false;
+	private _mostRecentCompletion?: ISimpleCompletion;
 
 	private _codeCompletionsRequested: boolean = false;
 	private _gitCompletionsRequested: boolean = false;
@@ -135,6 +138,10 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 	readonly onBell = this._onBell.event;
 	private readonly _onAcceptedCompletion = this._register(new Emitter<string>());
 	readonly onAcceptedCompletion = this._onAcceptedCompletion.event;
+	private readonly _onDidRequestCompletions = this._register(new Emitter<void>());
+	readonly onDidRequestCompletions = this._onDidRequestCompletions.event;
+	private readonly _onDidReceiveCompletions = this._register(new Emitter<void>());
+	readonly onDidReceiveCompletions = this._onDidReceiveCompletions.event;
 
 	constructor(
 		private readonly _cachedPwshCommands: Set<SimpleCompletionItem>,
@@ -171,10 +178,8 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 			return this._handleVSCodeSequence(data);
 		}));
 		this._register(xterm.onData(e => {
-			if (!e.startsWith('\x1b[')) {
-				this._lastUserData = e;
-				this._lastUserDataTimestamp = Date.now();
-			}
+			this._lastUserData = e;
+			this._lastUserDataTimestamp = Date.now();
 		}));
 	}
 
@@ -187,6 +192,10 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 	}
 
 	private _requestCompletions(): void {
+		if (!this._promptInputModel) {
+			return;
+		}
+
 		const builtinCompletionsConfig = this._configurationService.getValue<ITerminalSuggestConfiguration>(terminalSuggestConfigSection).builtinCompletions;
 		if (!this._codeCompletionsRequested && builtinCompletionsConfig.pwshCode) {
 			this._onAcceptedCompletion.fire(SuggestAddon.requestEnableCodeCompletionsSequence);
@@ -206,6 +215,7 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 		// completions being requested again right after accepting a completion
 		if (this._lastUserDataTimestamp > this._lastAcceptedCompletionTimestamp) {
 			this._onAcceptedCompletion.fire(SuggestAddon.requestCompletionsSequence);
+			this._onDidRequestCompletions.fire();
 		}
 	}
 
@@ -223,11 +233,10 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 			// Quick suggestions
 			if (!this._terminalSuggestWidgetVisibleContextKey.get()) {
 				if (config.quickSuggestions) {
-					const completionPrefix = promptInputState.value.substring(0, promptInputState.cursorIndex);
-					if (promptInputState.cursorIndex === 1 || completionPrefix.match(/([\s\[])[^\s]$/)) {
+					if (promptInputState.cursorIndex === 1 || promptInputState.prefix.match(/([\s\[])[^\s]$/)) {
 						// Never request completions if the last key sequence was up or down as the user was likely
 						// navigating history
-						if (this._lastUserData !== /*up*/'\x1b[A' && this._lastUserData !== /*down*/'\x1b[B') {
+						if (!this._lastUserData?.match(/^\x1b[\[O]?[A-D]$/)) {
 							this._requestCompletions();
 							sent = true;
 						}
@@ -237,12 +246,14 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 
 			// Trigger characters - this happens even if the widget is showing
 			if (config.suggestOnTriggerCharacters && !sent) {
-				const lastChar = promptInputState.value.at(promptInputState.cursorIndex - 1);
+				const prefix = promptInputState.prefix;
 				if (
-					lastChar?.match(/[\-]/) ||
-					// Only trigger on \ and / if it's a directory. Not doing so causes problems
+					// Only trigger on `-` if it's after a space. This is required to not clear
+					// completions when typing the `-` in `git cherry-pick`
+					prefix?.match(/\s[\-]$/) ||
+					// Only trigger on `\` and `/` if it's a directory. Not doing so causes problems
 					// with git branches in particular
-					this._isFilteringDirectories && lastChar?.match(/[\\\/]/)
+					this._isFilteringDirectories && prefix?.match(/[\\\/]$/)
 				) {
 					this._requestCompletions();
 					sent = true;
@@ -251,7 +262,7 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 		}
 
 		this._mostRecentPromptInputState = promptInputState;
-		if (!this._promptInputModel || !this._terminal || !this._suggestWidget || !this._initialPromptInputState || this._leadingLineContent === undefined) {
+		if (!this._promptInputModel || !this._terminal || !this._suggestWidget || this._leadingLineContent === undefined) {
 			return;
 		}
 
@@ -265,18 +276,18 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 
 		// Hide the widget if the cursor moves to the left of the initial position as the
 		// completions are no longer valid
-		if (this._currentPromptInputState.cursorIndex < this._initialPromptInputState.cursorIndex) {
+		if (this._currentPromptInputState.cursorIndex < this._replacementIndex + this._replacementLength) {
 			this.hideSuggestWidget();
 			return;
 		}
 
 		if (this._terminalSuggestWidgetVisibleContextKey.get()) {
-			this._cursorIndexDelta = this._currentPromptInputState.cursorIndex - this._initialPromptInputState.cursorIndex;
-			let leadingLineContent = this._leadingLineContent + this._currentPromptInputState.value.substring(this._leadingLineContent.length, this._leadingLineContent.length + this._cursorIndexDelta);
+			this._cursorIndexDelta = this._currentPromptInputState.cursorIndex - (this._replacementIndex + this._replacementLength);
+			let normalizedLeadingLineContent = this._currentPromptInputState.value.substring(this._replacementIndex, this._replacementIndex + this._replacementLength + this._cursorIndexDelta);
 			if (this._isFilteringDirectories) {
-				leadingLineContent = normalizePathSeparator(leadingLineContent, this._pathSeparator);
+				normalizedLeadingLineContent = normalizePathSeparator(normalizedLeadingLineContent, this._pathSeparator);
 			}
-			const lineContext = new LineContext(leadingLineContent, this._cursorIndexDelta);
+			const lineContext = new LineContext(normalizedLeadingLineContent, this._cursorIndexDelta);
 			this._suggestWidget.setLineContext(lineContext);
 		}
 
@@ -290,9 +301,7 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 		if (!dimensions.width || !dimensions.height) {
 			return;
 		}
-		// TODO: What do frozen and auto do?
 		const xtermBox = this._screen!.getBoundingClientRect();
-
 		this._suggestWidget.showSuggestions(0, false, false, {
 			left: xtermBox.left + this._terminal.buffer.active.cursorX * dimensions.width,
 			top: xtermBox.top + this._terminal.buffer.active.cursorY * dimensions.height,
@@ -321,8 +330,12 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 		// Unrecognized sequence
 		return false;
 	}
+	private _replacementIndex: number = 0;
+	private _replacementLength: number = 0;
 
 	private _handleCompletionsSequence(terminal: Terminal, data: string, command: string, args: string[]): void {
+		this._onDidReceiveCompletions.fire();
+
 		// Nothing to handle if the terminal is not attached
 		if (!terminal.element || !this._enableWidget || !this._promptInputModel) {
 			return;
@@ -330,7 +343,16 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 
 		let replacementIndex = 0;
 		let replacementLength = this._promptInputModel.cursorIndex;
-		this._leadingLineContent = this._promptInputModel.value.substring(0, this._promptInputModel.cursorIndex);
+
+		this._currentPromptInputState = {
+			value: this._promptInputModel.value,
+			prefix: this._promptInputModel.prefix,
+			suffix: this._promptInputModel.suffix,
+			cursorIndex: this._promptInputModel.cursorIndex,
+			ghostTextIndex: this._promptInputModel.ghostTextIndex
+		};
+
+		this._leadingLineContent = this._currentPromptInputState.prefix.substring(replacementIndex, replacementIndex + replacementLength + this._cursorIndexDelta);
 
 		const payload = data.slice(command.length + args[0].length + args[1].length + args[2].length + 4/*semi-colons*/);
 		const rawCompletions: PwshCompletion | PwshCompletion[] | CompressedPwshCompletion[] | CompressedPwshCompletion = args.length === 0 || payload.length === 0 ? undefined : JSON.parse(payload);
@@ -341,21 +363,25 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 		if (this._leadingLineContent.includes(' ') || firstChar === '[') {
 			replacementIndex = parseInt(args[0]);
 			replacementLength = parseInt(args[1]);
-			this._leadingLineContent = this._promptInputModel.value.substring(0, this._promptInputModel.cursorIndex);
+			this._leadingLineContent = this._promptInputModel.prefix;
 		}
 		// This is a global command, add cached commands list to completions
 		else {
 			completions.push(...this._cachedPwshCommands);
 		}
 
-		this._currentPromptInputState = {
-			value: this._promptInputModel.value,
-			cursorIndex: this._promptInputModel.cursorIndex,
-			ghostTextIndex: this._promptInputModel.ghostTextIndex
-		};
-		this._cursorIndexDelta = 0;
+		this._replacementIndex = replacementIndex;
+		this._replacementLength = replacementLength;
+
+		if (this._mostRecentCompletion?.isDirectory && completions.every(e => e.completion.isDirectory)) {
+			completions.push(new SimpleCompletionItem(this._mostRecentCompletion));
+		}
+		this._mostRecentCompletion = undefined;
+
+		this._cursorIndexDelta = this._currentPromptInputState.cursorIndex - (replacementIndex + replacementLength);
+
+		let normalizedLeadingLineContent = this._leadingLineContent;
 
-		let leadingLineContent = this._leadingLineContent + this._currentPromptInputState.value.substring(this._leadingLineContent.length, this._leadingLineContent.length + this._cursorIndexDelta);
 		// If there is a single directory in the completions:
 		// - `\` and `/` are normalized such that either can be used
 		// - Using `\` or `/` will request new completions. It's important that this only occurs
@@ -365,9 +391,9 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 		if (this._isFilteringDirectories) {
 			const firstDir = completions.find(e => e.completion.isDirectory);
 			this._pathSeparator = firstDir?.completion.label.match(/(?<sep>[\\\/])/)?.groups?.sep ?? sep;
-			leadingLineContent = normalizePathSeparator(leadingLineContent, this._pathSeparator);
+			normalizedLeadingLineContent = normalizePathSeparator(normalizedLeadingLineContent, this._pathSeparator);
 		}
-		const lineContext = new LineContext(leadingLineContent, this._cursorIndexDelta);
+		const lineContext = new LineContext(normalizedLeadingLineContent, this._cursorIndexDelta);
 		const model = new SimpleCompletionModel(completions, lineContext, replacementIndex, replacementLength);
 		this._handleCompletionModel(model);
 	}
@@ -478,23 +504,20 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 	}
 
 	private _handleCompletionModel(model: SimpleCompletionModel): void {
-		if (model.items.length === 0 || !this._terminal?.element || !this._promptInputModel) {
+		if (!this._terminal?.element) {
 			return;
 		}
-		this._model = model;
 		const suggestWidget = this._ensureSuggestWidget(this._terminal);
+		suggestWidget.setCompletionModel(model);
+		if (model.items.length === 0 || !this._promptInputModel) {
+			return;
+		}
+		this._model = model;
 		const dimensions = this._getTerminalDimensions();
 		if (!dimensions.width || !dimensions.height) {
 			return;
 		}
-		// TODO: What do frozen and auto do?
 		const xtermBox = this._screen!.getBoundingClientRect();
-		this._initialPromptInputState = {
-			value: this._promptInputModel.value,
-			cursorIndex: this._promptInputModel.cursorIndex,
-			ghostTextIndex: this._promptInputModel.ghostTextIndex
-		};
-		suggestWidget.setCompletionModel(model);
 		suggestWidget.showSuggestions(0, false, false, {
 			left: xtermBox.left + this._terminal.buffer.active.cursorX * dimensions.width,
 			top: xtermBox.top + this._terminal.buffer.active.cursorY * dimensions.height,
@@ -507,7 +530,7 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 		if (!this._suggestWidget) {
 			const c = this._terminalConfigurationService.config;
 			const font = this._terminalConfigurationService.getFont(dom.getActiveWindow());
-			const fontInfo = {
+			const fontInfo: ISimpleSuggestWidgetFontInfo = {
 				fontFamily: font.fontFamily,
 				fontSize: font.fontSize,
 				lineHeight: Math.ceil(1.5 * font.fontSize),
@@ -552,7 +575,7 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 		if (!suggestion) {
 			suggestion = this._suggestWidget?.getFocusedItem();
 		}
-		const initialPromptInputState = this._initialPromptInputState ?? this._mostRecentPromptInputState;
+		const initialPromptInputState = this._mostRecentPromptInputState;
 		if (!suggestion || !initialPromptInputState || !this._leadingLineContent || !this._model) {
 			return;
 		}
@@ -597,7 +620,7 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 				}
 				case 'exactMatchIgnoreExtension': {
 					runOnEnter = replacementText.toLowerCase() === completionText.toLowerCase();
-					if (completion.icon === Codicon.symbolFile || completion.icon === Codicon.symbolMethod) {
+					if (completion.isFile) {
 						runOnEnter ||= replacementText.toLowerCase() === completionText.toLowerCase().replace(/\.[^\.]+$/, '');
 					}
 					break;
@@ -610,26 +633,37 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 			this._lastAcceptedCompletionTimestamp = 0;
 		}
 
+		this._mostRecentCompletion = completion;
+
 		const commonPrefixLen = commonPrefixLength(replacementText, completion.label);
+		const commonPrefix = replacementText.substring(replacementText.length - 1 - commonPrefixLen, replacementText.length - 1);
+		const completionSuffix = completion.label.substring(commonPrefixLen);
+		let resultSequence: string;
+		if (currentPromptInputState.suffix.length > 0 && currentPromptInputState.prefix.endsWith(commonPrefix) && currentPromptInputState.suffix.startsWith(completionSuffix)) {
+			// Move right to the end of the completion
+			resultSequence = '\x1bOC'.repeat(completion.label.length - commonPrefixLen);
+		} else {
+			resultSequence = [
+				// Backspace (left) to remove all additional input
+				'\x7F'.repeat(replacementText.length - commonPrefixLen),
+				// Delete (right) to remove any additional text in the same word
+				'\x1b[3~'.repeat(rightSideReplacementText.length),
+				// Write the completion
+				completionSuffix,
+				// Run on enter if needed
+				runOnEnter ? '\r' : ''
+			].join('');
+		}
 
 		// Send the completion
-		this._onAcceptedCompletion.fire([
-			// Backspace (left) to remove all additional input
-			'\x7F'.repeat(replacementText.length - commonPrefixLen),
-			// Delete (right) to remove any additional text in the same word
-			'\x1b[3~'.repeat(rightSideReplacementText.length),
-			// Write the completion
-			completion.label.substring(commonPrefixLen),
-			// Run on enter if needed
-			runOnEnter ? '\r' : ''
-		].join(''));
+		this._onAcceptedCompletion.fire(resultSequence);
 
 		this.hideSuggestWidget();
 	}
 
 	hideSuggestWidget(): void {
-		this._initialPromptInputState = undefined;
 		this._currentPromptInputState = undefined;
+		this._leadingLineContent = undefined;
 		this._suggestWidget?.hide();
 	}
 }
@@ -681,12 +715,14 @@ export function parseCompletionsFromShell(rawCompletions: PwshCompletion | PwshC
 				CompletionText: e[0],
 				ResultType: e[1],
 				ToolTip: e[2],
+				CustomIcon: e[3],
 			}));
 		} else if (Array.isArray(rawCompletions[0])) {
 			typedRawCompletions = (rawCompletions as CompressedPwshCompletion[]).map(e => ({
 				CompletionText: e[0],
 				ResultType: e[1],
 				ToolTip: e[2],
+				CustomIcon: e[3],
 			}));
 		} else {
 			typedRawCompletions = rawCompletions as PwshCompletion[];
@@ -702,7 +738,12 @@ function rawCompletionToSimpleCompletionItem(rawCompletion: PwshCompletion): Sim
 	// `.` and `..` entries because they are optimized not for navigating to different directories
 	// but for passing as args.
 	let label = rawCompletion.CompletionText;
-	if (rawCompletion.ResultType === 4 && !label.match(/^\.\.?$/) && !label.match(/[\\\/]$/)) {
+	if (
+		rawCompletion.ResultType === 4 &&
+		!label.match(/^[\-+]$/) && // Don't add a `/` to `-` or `+` (navigate location history)
+		!label.match(/^\.\.?$/) &&
+		!label.match(/[\\\/]$/)
+	) {
 		const separator = label.match(/(?<sep>[\\\/])/)?.groups?.sep ?? sep;
 		label = label + separator;
 	}
@@ -713,8 +754,8 @@ function rawCompletionToSimpleCompletionItem(rawCompletion: PwshCompletion): Sim
 	// Pwsh gives executables a result type of 2, but we want to treat them as files wrt the sorting
 	// and file extension score boost. An example of where this improves the experience is typing
 	// `git`, `git.exe` should appear at the top and beat `git-lfs.exe`. Keep the same icon though.
-	const icon = getIcon(rawCompletion.ResultType, detail);
-	const isExecutable = rawCompletion.ResultType === 2 && rawCompletion.CompletionText.match(/\.[a-z]{2,4}$/i);
+	const icon = getIcon(rawCompletion.ResultType, rawCompletion.CustomIcon);
+	const isExecutable = rawCompletion.ResultType === 2 && rawCompletion.CompletionText.match(/\.[a-z0-9]{2,4}$/i);
 	if (isExecutable) {
 		rawCompletion.ResultType = 3;
 	}
@@ -725,23 +766,15 @@ function rawCompletionToSimpleCompletionItem(rawCompletion: PwshCompletion): Sim
 		detail,
 		isFile: rawCompletion.ResultType === 3,
 		isDirectory: rawCompletion.ResultType === 4,
+		isKeyword: rawCompletion.ResultType === 12,
 	});
 }
 
-function getIcon(resultType: number, tooltip: string): ThemeIcon {
-	// Assume anything with type DynamicKeyword is a git branch
-	if (resultType === 13) {
-		if (tooltip.startsWith('branch ')) {
-			return Codicon.gitBranch;
-		}
-		if (tooltip.startsWith('tag ')) {
-			return Codicon.tag;
-		}
-		if (tooltip.startsWith('remote ')) {
-			return Codicon.remote;
-		}
-		if (tooltip.startsWith('stash ')) {
-			return Codicon.gitStash;
+function getIcon(resultType: number, customIconId?: string): ThemeIcon {
+	if (customIconId) {
+		const icon: ThemeIcon | undefined = customIconId in Codicon ? (Codicon as { [id: string]: ThemeIcon | undefined })[customIconId] : Codicon.symbolText;
+		if (icon) {
+			return icon;
 		}
 	}
 	return pwshTypeToIconMap[resultType] ?? Codicon.symbolText;
diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/common/terminalSuggestConfiguration.ts b/src/vs/workbench/contrib/terminalContrib/suggest/common/terminalSuggestConfiguration.ts
index 261286b2577..b1782935a01 100644
--- a/src/vs/workbench/contrib/terminalContrib/suggest/common/terminalSuggestConfiguration.ts
+++ b/src/vs/workbench/contrib/terminalContrib/suggest/common/terminalSuggestConfiguration.ts
@@ -32,7 +32,7 @@ export interface ITerminalSuggestConfiguration {
 export const terminalSuggestConfiguration: IStringDictionary<IConfigurationPropertySchema> = {
 	[TerminalSuggestSettingId.Enabled]: {
 		restricted: true,
-		markdownDescription: localize('suggest.enabled', "Enables experimental terminal Intellisense suggestions for supported shells ({0}) when {1} is set to {2}.\n\nIf shell integration is installed manually, {3} needs to be set to {4} before calling the shell integration script.", 'PowerShell', `\`#${TerminalSettingId.ShellIntegrationEnabled}#\``, '`true`', '`VSCODE_SUGGEST`', '`1`'),
+		markdownDescription: localize('suggest.enabled', "Enables experimental terminal Intellisense suggestions for supported shells ({0}) when {1} is set to {2}.\n\nIf shell integration is installed manually, {3} needs to be set to {4} before calling the shell integration script.", 'PowerShell v7+', `\`#${TerminalSettingId.ShellIntegrationEnabled}#\``, '`true`', '`VSCODE_SUGGEST`', '`1`'),
 		type: 'boolean',
 		default: false,
 	},
@@ -51,14 +51,15 @@ export const terminalSuggestConfiguration: IStringDictionary<IConfigurationPrope
 	[TerminalSuggestSettingId.RunOnEnter]: {
 		restricted: true,
 		markdownDescription: localize('suggest.runOnEnter', "Controls whether suggestions should run immediately when `Enter` (not `Tab`) is used to accept the result."),
-		enum: ['never', 'exactMatch', 'exactMatchIgnoreExtension', 'always'],
+		enum: ['ignore', 'never', 'exactMatch', 'exactMatchIgnoreExtension', 'always'],
 		markdownEnumDescriptions: [
+			localize('runOnEnter.ignore', "Ignore suggestions and send the enter directly to the shell without completing. This is used as the default value so the suggest widget is as unobtrusive as possible."),
 			localize('runOnEnter.never', "Never run on `Enter`."),
 			localize('runOnEnter.exactMatch', "Run on `Enter` when the suggestion is typed in its entirety."),
 			localize('runOnEnter.exactMatchIgnoreExtension', "Run on `Enter` when the suggestion is typed in its entirety or when a file is typed without its extension included."),
 			localize('runOnEnter.always', "Always run on `Enter`.")
 		],
-		default: 'exactMatchIgnoreExtension',
+		default: 'ignore',
 	},
 	[TerminalSuggestSettingId.BuiltinCompletions]: {
 		restricted: true,
diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/test/browser/terminalSuggestAddon.integrationTest.ts b/src/vs/workbench/contrib/terminalContrib/suggest/test/browser/terminalSuggestAddon.integrationTest.ts
index 142abdc5849..4a441311a91 100644
--- a/src/vs/workbench/contrib/terminalContrib/suggest/test/browser/terminalSuggestAddon.integrationTest.ts
+++ b/src/vs/workbench/contrib/terminalContrib/suggest/test/browser/terminalSuggestAddon.integrationTest.ts
@@ -31,6 +31,7 @@ import { events as windows11_pwsh_writehost_multiline } from 'vs/workbench/contr
 import { importAMDNodeModule } from 'vs/amdX';
 import { testRawPwshCompletions } from 'vs/workbench/contrib/terminalContrib/suggest/test/browser/testRawPwshCompletions';
 import { ITerminalConfigurationService } from 'vs/workbench/contrib/terminal/browser/terminal';
+import { timeout } from 'vs/base/common/async';
 
 const recordedTestCases: { name: string; events: RecordedSessionEvent[] }[] = [
 	{ name: 'macos_bash_echo_simple', events: macos_bash_echo_simple as any as RecordedSessionEvent[] },
@@ -162,14 +163,17 @@ suite('Terminal Contrib Suggest Recordings', () => {
 					case 'promptInputChange': {
 						const promptInputModel = capabilities.get(TerminalCapability.CommandDetection)?.promptInputModel;
 						if (promptInputModel && promptInputModel.getCombinedString() !== event.data) {
-							await new Promise<void>(r => {
-								const d = promptInputModel.onDidChangeInput(() => {
-									if (promptInputModel.getCombinedString() === event.data) {
-										d.dispose();
-										r();
-									}
-								});
-							});
+							await Promise.race([
+								await timeout(1000).then(() => { throw new Error(`Prompt input change timed out current="${promptInputModel.getCombinedString()}", expected="${event.data}"`); }),
+								await new Promise<void>(r => {
+									const d = promptInputModel.onDidChangeInput(() => {
+										if (promptInputModel.getCombinedString() === event.data) {
+											d.dispose();
+											r();
+										}
+									});
+								})
+							]);
 						}
 						break;
 					}
diff --git a/src/vs/workbench/contrib/testing/browser/icons.ts b/src/vs/workbench/contrib/testing/browser/icons.ts
index 43040a309ca..a941268349e 100644
--- a/src/vs/workbench/contrib/testing/browser/icons.ts
+++ b/src/vs/workbench/contrib/testing/browser/icons.ts
@@ -72,7 +72,9 @@ registerThemingParticipant((theme, collector) => {
 
 	collector.addRule(`
 		.monaco-editor .glyph-margin-widgets ${ThemeIcon.asCSSSelector(testingRunIcon)},
-		.monaco-editor .glyph-margin-widgets ${ThemeIcon.asCSSSelector(testingRunAllIcon)} {
+		.monaco-editor .glyph-margin-widgets ${ThemeIcon.asCSSSelector(testingRunAllIcon)},
+		.monaco-editor .glyph-margin-widgets ${ThemeIcon.asCSSSelector(testingDebugIcon)},
+		.monaco-editor .glyph-margin-widgets ${ThemeIcon.asCSSSelector(testingDebugAllIcon)} {
 			color: ${theme.getColor(testingColorRunAction)};
 		}
 	`);
diff --git a/src/vs/workbench/contrib/testing/browser/media/testing.css b/src/vs/workbench/contrib/testing/browser/media/testing.css
index ce342efcf54..1ff0bbcec78 100644
--- a/src/vs/workbench/contrib/testing/browser/media/testing.css
+++ b/src/vs/workbench/contrib/testing/browser/media/testing.css
@@ -252,7 +252,8 @@
 
 .test-output-peek-message-container .preview-text {
 	padding: 8px 12px 8px 20px;
-	height: calc(100% - 16px);
+	line-height: normal;
+	white-space: normal;
 }
 
 .test-output-peek-message-container .preview-text p:first-child {
@@ -398,11 +399,11 @@
 }
 
 .monaco-editor .testing-inline-message-severity-0 {
-	color: var(--vscode-testing-message-error-decorationForeground) !important;
+	background: var(--vscode-testing-message-error-lineBackground) !important;
 }
 
 .monaco-editor .testing-inline-message-severity-1 {
-	color: var(--vscode-testing-message-info-decorationForeground) !important;
+	background: var(--vscode-testing-message-info-lineBackground) !important;
 }
 
 /** -- coverage  */
diff --git a/src/vs/workbench/contrib/testing/browser/testCoverageView.ts b/src/vs/workbench/contrib/testing/browser/testCoverageView.ts
index 26ecefd409a..c72028427ca 100644
--- a/src/vs/workbench/contrib/testing/browser/testCoverageView.ts
+++ b/src/vs/workbench/contrib/testing/browser/testCoverageView.ts
@@ -698,13 +698,13 @@ registerAction2(class TestCoverageChangeSortingAction extends ViewAction<TestCov
 		quickInput.placeholder = localize('testing.coverageSortPlaceholder', 'Sort the Test Coverage view...');
 		quickInput.items = items;
 		quickInput.show();
-		quickInput.onDidHide(() => quickInput.dispose());
-		quickInput.onDidAccept(() => {
+		disposables.add(quickInput.onDidHide(() => disposables.dispose()));
+		disposables.add(quickInput.onDidAccept(() => {
 			const picked = quickInput.selectedItems[0]?.value;
 			if (picked !== undefined) {
 				view.sortOrder.set(picked, undefined);
 				quickInput.dispose();
 			}
-		});
+		}));
 	}
 });
diff --git a/src/vs/workbench/contrib/testing/browser/testExplorerActions.ts b/src/vs/workbench/contrib/testing/browser/testExplorerActions.ts
index fef1b03865d..4af95e2e04d 100644
--- a/src/vs/workbench/contrib/testing/browser/testExplorerActions.ts
+++ b/src/vs/workbench/contrib/testing/browser/testExplorerActions.ts
@@ -8,6 +8,7 @@ import { CancellationToken } from 'vs/base/common/cancellation';
 import { Codicon } from 'vs/base/common/codicons';
 import { Iterable } from 'vs/base/common/iterator';
 import { KeyChord, KeyCode, KeyMod } from 'vs/base/common/keyCodes';
+import { DisposableStore } from 'vs/base/common/lifecycle';
 import { isDefined } from 'vs/base/common/types';
 import { URI } from 'vs/base/common/uri';
 import { IActiveCodeEditor, ICodeEditor } from 'vs/editor/browser/editorBrowser';
@@ -465,22 +466,23 @@ function selectContinuousRunProfiles(
 		}
 	}
 
-	const quickpick = quickInputService.createQuickPick<IQuickPickItem & { profile: ITestRunProfile }>();
+	const disposables = new DisposableStore();
+	const quickpick = disposables.add(quickInputService.createQuickPick<IQuickPickItem & { profile: ITestRunProfile }>({ useSeparators: true }));
 	quickpick.title = localize('testing.selectContinuousProfiles', 'Select profiles to run when files change:');
 	quickpick.canSelectMany = true;
 	quickpick.items = qpItems;
 	quickpick.selectedItems = selectedItems;
 	quickpick.show();
-	return new Promise((resolve, reject) => {
-		quickpick.onDidAccept(() => {
+	return new Promise(resolve => {
+		disposables.add(quickpick.onDidAccept(() => {
 			resolve(quickpick.selectedItems.map(i => i.profile));
-			quickpick.dispose();
-		});
+			disposables.dispose();
+		}));
 
-		quickpick.onDidHide(() => {
+		disposables.add(quickpick.onDidHide(() => {
 			resolve([]);
-			quickpick.dispose();
-		});
+			disposables.dispose();
+		}));
 	});
 }
 
@@ -707,7 +709,7 @@ export class CancelTestRunAction extends Action2 {
 				weight: KeybindingWeight.WorkbenchContrib,
 				primary: KeyChord(KeyMod.CtrlCmd | KeyCode.Semicolon, KeyMod.CtrlCmd | KeyCode.KeyX),
 			},
-			menu: {
+			menu: [{
 				id: MenuId.ViewTitle,
 				order: ActionOrder.Run,
 				group: 'navigation',
@@ -715,19 +717,23 @@ export class CancelTestRunAction extends Action2 {
 					ContextKeyExpr.equals('view', Testing.ExplorerViewId),
 					ContextKeyExpr.equals(TestingContextKeys.isRunning.serialize(), true),
 				)
-			}
+			}]
 		});
 	}
 
 	/**
 	 * @override
 	 */
-	public async run(accessor: ServicesAccessor) {
+	public async run(accessor: ServicesAccessor, resultId?: string, taskId?: string) {
 		const resultService = accessor.get(ITestResultService);
 		const testService = accessor.get(ITestService);
-		for (const run of resultService.results) {
-			if (!run.completedAt) {
-				testService.cancelTestRun(run.id);
+		if (resultId) {
+			testService.cancelTestRun(resultId, taskId);
+		} else {
+			for (const run of resultService.results) {
+				if (!run.completedAt) {
+					testService.cancelTestRun(run.id);
+				}
 			}
 		}
 	}
@@ -1014,6 +1020,15 @@ async function getTestsAtCursor(testService: ITestService, uriIdentityService: I
 	return bestNodes.length ? bestNodes : bestNodesBefore;
 }
 
+const enum EditorContextOrder {
+	RunAtCursor,
+	DebugAtCursor,
+	RunInFile,
+	DebugInFile,
+	GoToRelated,
+	PeekRelated,
+}
+
 abstract class ExecuteTestAtCursor extends Action2 {
 	constructor(options: IAction2Options, protected readonly group: TestRunProfileBitset) {
 		super({
@@ -1024,7 +1039,7 @@ abstract class ExecuteTestAtCursor extends Action2 {
 			}, {
 				id: MenuId.EditorContext,
 				group: 'testing',
-				order: group === TestRunProfileBitset.Run ? ActionOrder.Run : ActionOrder.Debug,
+				order: group === TestRunProfileBitset.Run ? EditorContextOrder.RunAtCursor : EditorContextOrder.DebugAtCursor,
 				when: ContextKeyExpr.and(TestingContextKeys.activeEditorHasTests, TestingContextKeys.capabilityToContextKey[group]),
 			}]
 		});
@@ -1215,8 +1230,7 @@ abstract class ExecuteTestsInCurrentFile extends Action2 {
 			}, {
 				id: MenuId.EditorContext,
 				group: 'testing',
-				// add 0.1 to be after the "at cursor" commands
-				order: (group === TestRunProfileBitset.Run ? ActionOrder.Run : ActionOrder.Debug) + 0.1,
+				order: group === TestRunProfileBitset.Run ? EditorContextOrder.RunInFile : EditorContextOrder.DebugInFile,
 				when: ContextKeyExpr.and(TestingContextKeys.activeEditorHasTests, TestingContextKeys.capabilityToContextKey[group]),
 			}],
 		});
@@ -1765,8 +1779,8 @@ class GoToRelatedTest extends GoToRelatedTestAction {
 			),
 			menu: [{
 				id: MenuId.EditorContext,
-				group: 'navigation',
-				order: 3
+				group: 'testing',
+				order: EditorContextOrder.GoToRelated,
 			}]
 		});
 	}
@@ -1790,9 +1804,9 @@ class PeekRelatedTest extends GoToRelatedTestAction {
 				EditorContextKeys.isInEmbeddedEditor.toNegated()
 			),
 			menu: [{
-				id: MenuId.EditorContextPeek,
-				group: 'navigation',
-				order: 3
+				id: MenuId.EditorContext,
+				group: 'testing',
+				order: EditorContextOrder.PeekRelated,
 			}]
 		});
 	}
@@ -1826,8 +1840,8 @@ class GoToRelatedCode extends GoToRelatedCodeAction {
 			),
 			menu: [{
 				id: MenuId.EditorContext,
-				group: 'navigation',
-				order: 3
+				group: 'testing',
+				order: EditorContextOrder.GoToRelated,
 			}]
 		});
 	}
@@ -1850,9 +1864,9 @@ class PeekRelatedCode extends GoToRelatedCodeAction {
 				EditorContextKeys.isInEmbeddedEditor.toNegated()
 			),
 			menu: [{
-				id: MenuId.EditorContextPeek,
-				group: 'navigation',
-				order: 3
+				id: MenuId.EditorContext,
+				group: 'testing',
+				order: EditorContextOrder.PeekRelated,
 			}]
 		});
 	}
diff --git a/src/vs/workbench/contrib/testing/browser/testResultsView/testMessageStack.ts b/src/vs/workbench/contrib/testing/browser/testResultsView/testMessageStack.ts
index cb133b4b20d..c6c396e5840 100644
--- a/src/vs/workbench/contrib/testing/browser/testResultsView/testMessageStack.ts
+++ b/src/vs/workbench/contrib/testing/browser/testResultsView/testMessageStack.ts
@@ -30,6 +30,10 @@ export class TestResultStackWidget extends Disposable {
 		));
 	}
 
+	public collapseAll() {
+		this.widget.collapseAll();
+	}
+
 	public update(messageFrame: AnyStackFrame, stack: ITestMessageStackFrame[]) {
 		this.widget.setFrames([messageFrame, ...stack.map(frame => new CallStackFrame(
 			frame.label,
diff --git a/src/vs/workbench/contrib/testing/browser/testResultsView/testResultsOutput.ts b/src/vs/workbench/contrib/testing/browser/testResultsView/testResultsOutput.ts
index 365c450fc57..e21bbfc0083 100644
--- a/src/vs/workbench/contrib/testing/browser/testResultsView/testResultsOutput.ts
+++ b/src/vs/workbench/contrib/testing/browser/testResultsView/testResultsOutput.ts
@@ -65,7 +65,7 @@ export interface IPeekOutputRenderer extends IDisposable {
 	/** Updates the displayed test. Should clear if it cannot display the test. */
 	update(subject: InspectSubject): Promise<boolean>;
 	/** Recalculate content layout. Returns the height it should be rendered at. */
-	layout(dimension: dom.IDimension): number | undefined;
+	layout(dimension: dom.IDimension, hasMultipleFrames: boolean): number | undefined;
 	/** Dispose the content provider. */
 	dispose(): void;
 }
@@ -172,7 +172,7 @@ export class DiffContentProvider extends Disposable implements IPeekOutputRender
 		this.widget.clear();
 	}
 
-	public layout(dimensions: dom.IDimension) {
+	public layout(dimensions: dom.IDimension, hasMultipleFrames: boolean) {
 		this.dimension = dimensions;
 		const editor = this.widget.value;
 		if (!editor) {
@@ -180,7 +180,11 @@ export class DiffContentProvider extends Disposable implements IPeekOutputRender
 		}
 
 		editor.layout(dimensions);
-		const height = Math.min(1000, Math.max(editor.getOriginalEditor().getContentHeight(), editor.getModifiedEditor().getContentHeight()));
+		if (!hasMultipleFrames) {
+			return dimensions.height;
+		}
+
+		const height = Math.min(10000, Math.max(editor.getOriginalEditor().getContentHeight(), editor.getModifiedEditor().getContentHeight()));
 		editor.layout({ height, width: dimensions.width });
 		return height;
 	}
@@ -219,7 +223,6 @@ export class MarkdownTestMessagePeek extends Disposable implements IPeekOutputRe
 
 
 		const rendered = this._register(this.markdown.value.render(message.message, {}));
-		rendered.element.style.height = '100%';
 		rendered.element.style.userSelect = 'text';
 		rendered.element.classList.add('preview-text');
 		this.container.appendChild(rendered.element);
@@ -232,7 +235,7 @@ export class MarkdownTestMessagePeek extends Disposable implements IPeekOutputRe
 			return undefined;
 		}
 
-		this.element.style.width = `${dimension.width}px`;
+		this.element.style.width = `${dimension.width - 32}px`;
 		return this.element.clientHeight;
 	}
 
@@ -307,7 +310,7 @@ export class PlainTextMessagePeek extends Disposable implements IPeekOutputRende
 		this.model.clear();
 	}
 
-	public layout(dimensions: dom.IDimension) {
+	public layout(dimensions: dom.IDimension, hasMultipleFrames: boolean) {
 		this.dimension = dimensions;
 		const editor = this.widget.value;
 		if (!editor) {
@@ -315,6 +318,10 @@ export class PlainTextMessagePeek extends Disposable implements IPeekOutputRende
 		}
 
 		editor.layout(dimensions);
+		if (!hasMultipleFrames) {
+			return dimensions.height;
+		}
+
 		const height = editor.getContentHeight();
 		editor.layout({ height, width: dimensions.width });
 		return height;
diff --git a/src/vs/workbench/contrib/testing/browser/testResultsView/testResultsSubject.ts b/src/vs/workbench/contrib/testing/browser/testResultsView/testResultsSubject.ts
index 9fa863304ff..e61463bcdc0 100644
--- a/src/vs/workbench/contrib/testing/browser/testResultsView/testResultsSubject.ts
+++ b/src/vs/workbench/contrib/testing/browser/testResultsView/testResultsSubject.ts
@@ -22,6 +22,9 @@ interface ISubjectCommon {
 	controllerId: string;
 }
 
+export const inspectSubjectHasStack = (subject: InspectSubject | undefined) =>
+	subject instanceof MessageSubject && !!subject.stack?.length;
+
 export class MessageSubject implements ISubjectCommon {
 	public readonly test: ITestItem;
 	public readonly message: ITestMessage;
diff --git a/src/vs/workbench/contrib/testing/browser/testResultsView/testResultsTree.ts b/src/vs/workbench/contrib/testing/browser/testResultsView/testResultsTree.ts
index 7e78cebcfd1..6be1cd3c43f 100644
--- a/src/vs/workbench/contrib/testing/browser/testResultsView/testResultsTree.ts
+++ b/src/vs/workbench/contrib/testing/browser/testResultsView/testResultsTree.ts
@@ -32,12 +32,13 @@ import { IContextMenuService } from 'vs/platform/contextview/browser/contextView
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { WorkbenchCompressibleObjectTree } from 'vs/platform/list/browser/listService';
 import { IProgressService } from 'vs/platform/progress/common/progress';
+import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { widgetClose } from 'vs/platform/theme/common/iconRegistry';
 import { getTestItemContextOverlay } from 'vs/workbench/contrib/testing/browser/explorerProjections/testItemContextOverlay';
 import * as icons from 'vs/workbench/contrib/testing/browser/icons';
 import { renderTestMessageAsText } from 'vs/workbench/contrib/testing/browser/testMessageColorizer';
-import { TestOutputSubject, InspectSubject, TaskSubject, MessageSubject, mapFindTestMessage, getMessageArgs } from 'vs/workbench/contrib/testing/browser/testResultsView/testResultsSubject';
-import { Testing } from 'vs/workbench/contrib/testing/common/constants';
+import { InspectSubject, MessageSubject, TaskSubject, TestOutputSubject, getMessageArgs, mapFindTestMessage } from 'vs/workbench/contrib/testing/browser/testResultsView/testResultsSubject';
+import { TestCommandId, Testing } from 'vs/workbench/contrib/testing/common/constants';
 import { ITestCoverageService } from 'vs/workbench/contrib/testing/common/testCoverageService';
 import { ITestExplorerFilterState } from 'vs/workbench/contrib/testing/common/testExplorerFilterState';
 import { ITestProfileService } from 'vs/workbench/contrib/testing/common/testProfileService';
@@ -121,7 +122,19 @@ class CoverageElement implements ITreeElement {
 	) {
 		this.onDidChange = Event.fromObservableLight(coverageService.selected);
 	}
+}
+
+class OlderResultsElement implements ITreeElement {
+	public readonly type = 'older';
+	public readonly context: undefined;
+	public readonly id = `older-${this.n}`;
+	public readonly onDidChange = Event.None;
+	public readonly label: string;
+
+	constructor(private readonly n: number) {
+		this.label = localize('nOlderResults', '{0} older results', n);
 
+	}
 }
 
 class TestCaseElement implements ITreeElement {
@@ -173,7 +186,7 @@ class TaskElement implements ITreeElement {
 	public readonly changeEmitter = new Emitter<void>();
 	public readonly onDidChange = this.changeEmitter.event;
 	public readonly type = 'task';
-	public readonly context: string;
+	public readonly context: { resultId: string; taskId: string };
 	public readonly id: string;
 	public readonly label: string;
 	public readonly itemsCache = new CreationCache<TestCaseElement>();
@@ -185,8 +198,8 @@ class TaskElement implements ITreeElement {
 	constructor(public readonly results: ITestResult, public readonly task: ITestRunTaskResults, public readonly index: number) {
 		this.id = `${results.id}/${index}`;
 		this.task = results.tasks[index];
-		this.context = String(index);
-		this.label = this.task.name ?? localize('testUnnamedTask', 'Unnamed Task');
+		this.context = { resultId: results.id, taskId: this.task.id };
+		this.label = this.task.name;
 	}
 }
 
@@ -248,7 +261,7 @@ class TestMessageElement implements ITreeElement {
 	}
 }
 
-type TreeElement = TestResultElement | TestCaseElement | TestMessageElement | TaskElement | CoverageElement;
+type TreeElement = TestResultElement | TestCaseElement | TestMessageElement | TaskElement | CoverageElement | OlderResultsElement;
 
 export class OutputPeekTree extends Disposable {
 	private disposed = false;
@@ -268,6 +281,7 @@ export class OutputPeekTree extends Disposable {
 		@ITestExplorerFilterState explorerFilter: ITestExplorerFilterState,
 		@ITestCoverageService coverageService: ITestCoverageService,
 		@IProgressService progressService: IProgressService,
+		@ITelemetryService telemetryService: ITelemetryService,
 	) {
 		super();
 
@@ -312,6 +326,7 @@ export class OutputPeekTree extends Disposable {
 		)) as WorkbenchCompressibleObjectTree<TreeElement, FuzzyScore>;
 
 		const cc = new CreationCache<TreeElement>();
+
 		const getTaskChildren = (taskElem: TaskElement): Iterable<ICompressedTreeElement<TreeElement>> => {
 			const { results, index, itemsCache, task } = taskElem;
 			const tests = Iterable.filter(results.tests, test => test.tasks[index].state >= TestResultState.Running || test.tasks[index].messages.length > 0);
@@ -345,7 +360,7 @@ export class OutputPeekTree extends Disposable {
 				.filter(isDefined);
 		};
 
-		const getResultChildren = (result: ITestResult): Iterable<ICompressedTreeElement<TreeElement>> => {
+		const getResultChildren = (result: ITestResult): ICompressedTreeElement<TreeElement>[] => {
 			return result.tasks.map((task, taskIndex) => {
 				const taskElem = cc.getOrCreate(task, () => new TaskElement(result, task, taskIndex));
 				return ({
@@ -357,16 +372,42 @@ export class OutputPeekTree extends Disposable {
 			});
 		};
 
-		const getRootChildren = () => results.results.map(result => {
-			const element = cc.getOrCreate(result, () => new TestResultElement(result));
-			return {
-				element,
-				incompressible: true,
-				collapsible: true,
-				collapsed: this.tree.hasElement(element) ? this.tree.isCollapsed(element) : true,
-				children: getResultChildren(result)
-			};
-		});
+		const getRootChildren = (): Iterable<ICompressedTreeElement<TreeElement>> => {
+			let children: ICompressedTreeElement<TreeElement>[] = [];
+
+			const older = [];
+
+			for (const result of results.results) {
+				if (!children.length && result.tasks.length) {
+					children = getResultChildren(result);
+				} else if (children) {
+					const element = cc.getOrCreate(result, () => new TestResultElement(result));
+					older.push({
+						element,
+						incompressible: true,
+						collapsible: true,
+						collapsed: this.tree.hasElement(element) ? this.tree.isCollapsed(element) : true,
+						children: getResultChildren(result)
+					});
+				}
+			}
+
+			if (!children.length) {
+				return older;
+			}
+
+			if (older.length) {
+				children.push({
+					element: new OlderResultsElement(older.length),
+					incompressible: true,
+					collapsible: true,
+					collapsed: true,
+					children: older,
+				});
+			}
+
+			return children;
+		};
 
 		// Queued result updates to prevent spamming CPU when lots of tests are
 		// completing and messaging quickly (#142514)
@@ -388,17 +429,14 @@ export class OutputPeekTree extends Disposable {
 		};
 
 		const attachToResults = (result: LiveTestResult) => {
-			const resultNode = cc.get(result)! as TestResultElement;
 			const disposable = new DisposableStore();
 			disposable.add(result.onNewTask(i => {
+				this.tree.setChildren(null, getRootChildren(), { diffIdentityProvider });
+
 				if (result.tasks.length === 1) {
 					this.requestReveal.fire(new TaskSubject(result, 0)); // reveal the first task in new runs
 				}
 
-				if (this.tree.hasElement(resultNode)) {
-					this.tree.setChildren(resultNode, getResultChildren(result), { diffIdentityProvider });
-				}
-
 				// note: tasks are bounded and their lifetime is equivalent to that of
 				// the test result, so this doesn't leak indefinitely.
 				const task = result.tasks[i];
@@ -407,6 +445,7 @@ export class OutputPeekTree extends Disposable {
 					queueTaskChildrenUpdate(cc.get(task) as TaskElement);
 				}));
 			}));
+
 			disposable.add(result.onEndTask(index => {
 				(cc.get(result.tasks[index]) as TaskElement | undefined)?.changeEmitter.fire();
 			}));
@@ -432,11 +471,9 @@ export class OutputPeekTree extends Disposable {
 			}));
 
 			disposable.add(result.onComplete(() => {
-				resultNode.changeEmitter.fire();
+				(cc.get(result) as TestResultElement | undefined)?.changeEmitter.fire();
 				disposable.dispose();
 			}));
-
-			return resultNode;
 		};
 
 		this._register(results.onResultsChanged(e => {
@@ -449,18 +486,10 @@ export class OutputPeekTree extends Disposable {
 
 			if ('completed' in e) {
 				(cc.get(e.completed) as TestResultElement | undefined)?.changeEmitter.fire();
-				return;
-			}
-
-			this.tree.setChildren(null, getRootChildren(), { diffIdentityProvider });
-
-			// done after setChildren intentionally so that the ResultElement exists in the cache.
-			if ('started' in e) {
-				for (const child of this.tree.getNode(null).children) {
-					this.tree.collapse(child.element, false);
-				}
-
-				this.tree.expand(attachToResults(e.started), true);
+			} else if ('started' in e) {
+				attachToResults(e.started);
+			} else {
+				this.tree.setChildren(null, getRootChildren(), { diffIdentityProvider });
 			}
 		}));
 
@@ -545,6 +574,16 @@ export class OutputPeekTree extends Disposable {
 
 		this._register(this.tree.onContextMenu(e => this.onContextMenu(e)));
 
+		this._register(this.tree.onDidChangeCollapseState(e => {
+			if (e.node.element instanceof OlderResultsElement && !e.node.collapsed) {
+				telemetryService.publicLog2<{}, {
+					owner: 'connor4312';
+					// we're considering removing or depromoting this feature because we don't think it's used:
+					comment: 'Records that test history was used';
+				}>('testing.expandOlderResults');
+			}
+		}));
+
 		this.tree.setChildren(null, getRootChildren());
 		for (const result of results.results) {
 			if (!result.completedAt && result instanceof LiveTestResult) {
@@ -708,6 +747,15 @@ class TreeActionsProvider {
 				undefined,
 				() => this.requestReveal.fire(new TaskSubject(element.results, element.index)),
 			));
+			if (element.task.running) {
+				primary.push(new Action(
+					'testing.outputPeek.cancel',
+					localize('testing.cancelRun', 'Cancel Test Run'),
+					ThemeIcon.asClassName(icons.testingCancelIcon),
+					undefined,
+					() => this.commandService.executeCommand(TestCommandId.CancelTestRunAction, element.results.id, element.task.id),
+				));
+			}
 		}
 
 		if (element instanceof TestResultElement) {
@@ -790,22 +838,21 @@ class TreeActionsProvider {
 		}
 
 		if (element instanceof TestMessageElement) {
+			id = MenuId.TestMessageContext;
+			contextKeys.push([TestingContextKeys.testMessageContext.key, element.contextValue]);
+
 			primary.push(new Action(
-				'testing.outputPeek.goToFile',
-				localize('testing.goToFile', "Go to Source"),
+				'testing.outputPeek.goToTest',
+				localize('testing.goToTest', "Go to Test"),
 				ThemeIcon.asClassName(Codicon.goToFile),
 				undefined,
 				() => this.commandService.executeCommand('vscode.revealTest', element.test.item.extId),
 			));
-		}
 
-		if (element instanceof TestMessageElement) {
-			id = MenuId.TestMessageContext;
-			contextKeys.push([TestingContextKeys.testMessageContext.key, element.contextValue]);
 			if (this.showRevealLocationOnMessages && element.location) {
 				primary.push(new Action(
 					'testing.outputPeek.goToError',
-					localize('testing.goToError', "Go to Source"),
+					localize('testing.goToError', "Go to Error"),
 					ThemeIcon.asClassName(Codicon.goToFile),
 					undefined,
 					() => this.editorService.openEditor({
diff --git a/src/vs/workbench/contrib/testing/browser/testResultsView/testResultsViewContent.ts b/src/vs/workbench/contrib/testing/browser/testResultsView/testResultsViewContent.ts
index 70ef07f40fe..67f9f05bfc7 100644
--- a/src/vs/workbench/contrib/testing/browser/testResultsView/testResultsViewContent.ts
+++ b/src/vs/workbench/contrib/testing/browser/testResultsView/testResultsViewContent.ts
@@ -27,6 +27,7 @@ import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/c
 import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
 import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
+import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
 import { CustomStackFrame } from 'vs/workbench/contrib/debug/browser/callStackWidget';
 import * as icons from 'vs/workbench/contrib/testing/browser/icons';
 import { TestResultStackWidget } from 'vs/workbench/contrib/testing/browser/testResultsView/testMessageStack';
@@ -74,6 +75,7 @@ class MessageStackFrame extends CustomStackFrame {
 	}
 
 	public override render(container: HTMLElement): IDisposable {
+		this.message.style.visibility = 'visible';
 		container.appendChild(this.message);
 		return toDisposable(() => this.message.remove());
 	}
@@ -217,6 +219,7 @@ export class TestResultsViewContent extends Disposable {
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 		@ITextModelService protected readonly modelService: ITextModelService,
 		@IContextKeyService private readonly contextKeyService: IContextKeyService,
+		@IUriIdentityService private readonly uriIdentityService: IUriIdentityService,
 	) {
 		super();
 	}
@@ -310,7 +313,7 @@ export class TestResultsViewContent extends Disposable {
 		this.current = opts.subject;
 		return this.contentProvidersUpdateLimiter.queue(async () => {
 			this.currentSubjectStore.clear();
-			const callFrames = (opts.subject instanceof MessageSubject && opts.subject.stack) || [];
+			const callFrames = this.getCallFrames(opts.subject) || [];
 			const topFrame = await this.prepareTopFrame(opts.subject, callFrames);
 			this.callStackWidget.update(topFrame, callFrames);
 
@@ -319,20 +322,56 @@ export class TestResultsViewContent extends Disposable {
 		});
 	}
 
+	/**
+	 * Collapses all displayed stack frames.
+	 */
+	public collapseStack() {
+		this.callStackWidget.collapseAll();
+	}
+
+	private getCallFrames(subject: InspectSubject) {
+		if (!(subject instanceof MessageSubject)) {
+			return undefined;
+		}
+		const frames = subject.stack;
+		if (!frames?.length || !this.editor) {
+			return frames;
+		}
+
+		// If the test extension just sets the top frame as the same location
+		// where the message is displayed, in the case of a peek in an editor,
+		// don't show it again because it's just a duplicate
+		const topFrame = frames[0];
+		const peekLocation = subject.revealLocation;
+		const isTopFrameSame = peekLocation && topFrame.position && topFrame.uri
+			&& topFrame.position.lineNumber === peekLocation.range.startLineNumber
+			&& topFrame.position.column === peekLocation.range.startColumn
+			&& this.uriIdentityService.extUri.isEqual(topFrame.uri, peekLocation.uri);
+
+		return isTopFrameSame ? frames.slice(1) : frames;
+	}
+
 	private async prepareTopFrame(subject: InspectSubject, callFrames: ITestMessageStackFrame[]) {
+		// ensure the messageContainer is in the DOM so renderers can calculate the
+		// dimensions before it's rendered in the list.
+		this.messageContainer.style.visibility = 'hidden';
+		this.stackContainer.appendChild(this.messageContainer);
+
 		const topFrame = this.currentTopFrame = this.instantiationService.createInstance(MessageStackFrame, this.messageContainer, this.followupWidget, subject);
-		topFrame.showHeader.set(callFrames.length > 0, undefined);
+
+		const hasMultipleFrames = callFrames.length > 0;
+		topFrame.showHeader.set(hasMultipleFrames, undefined);
 
 		const provider = await findAsync(this.contentProviders, p => p.update(subject));
 		if (provider) {
 			if (this.dimension) {
-				topFrame.height.set(provider.layout(this.dimension)!, undefined);
+				topFrame.height.set(provider.layout(this.dimension, hasMultipleFrames)!, undefined);
 			}
 			if (provider.onDidContentSizeChange) {
 				this.currentSubjectStore.add(provider.onDidContentSizeChange(() => {
 					if (this.dimension && !this.isDoingLayoutUpdate) {
 						this.isDoingLayoutUpdate = true;
-						topFrame.height.set(provider.layout(this.dimension)!, undefined);
+						topFrame.height.set(provider.layout(this.dimension, hasMultipleFrames)!, undefined);
 						this.isDoingLayoutUpdate = false;
 					}
 				}));
@@ -345,7 +384,7 @@ export class TestResultsViewContent extends Disposable {
 	private layoutContentWidgets(dimension: dom.Dimension, width = this.splitView.getViewSize(SubView.Diff)) {
 		this.isDoingLayoutUpdate = true;
 		for (const provider of this.contentProviders) {
-			const frameHeight = provider.layout({ height: dimension.height, width });
+			const frameHeight = provider.layout({ height: dimension.height, width }, !!this.currentTopFrame?.showHeader.get());
 			if (frameHeight) {
 				this.currentTopFrame?.height.set(frameHeight, undefined);
 			}
diff --git a/src/vs/workbench/contrib/testing/browser/testing.contribution.ts b/src/vs/workbench/contrib/testing/browser/testing.contribution.ts
index e422256e519..8caac4a2527 100644
--- a/src/vs/workbench/contrib/testing/browser/testing.contribution.ts
+++ b/src/vs/workbench/contrib/testing/browser/testing.contribution.ts
@@ -25,7 +25,7 @@ import { testingResultsIcon, testingViewIcon } from 'vs/workbench/contrib/testin
 import { TestCoverageView } from 'vs/workbench/contrib/testing/browser/testCoverageView';
 import { TestingDecorationService, TestingDecorations } from 'vs/workbench/contrib/testing/browser/testingDecorations';
 import { TestingExplorerView } from 'vs/workbench/contrib/testing/browser/testingExplorerView';
-import { CloseTestPeek, GoToNextMessageAction, GoToPreviousMessageAction, OpenMessageInEditorAction, TestResultsView, TestingOutputPeekController, TestingPeekOpener, ToggleTestingPeekHistory } from 'vs/workbench/contrib/testing/browser/testingOutputPeek';
+import { CloseTestPeek, CollapsePeekStack, GoToNextMessageAction, GoToPreviousMessageAction, OpenMessageInEditorAction, TestResultsView, TestingOutputPeekController, TestingPeekOpener, ToggleTestingPeekHistory } from 'vs/workbench/contrib/testing/browser/testingOutputPeek';
 import { TestingProgressTrigger } from 'vs/workbench/contrib/testing/browser/testingProgressUiService';
 import { TestingViewPaneContainer } from 'vs/workbench/contrib/testing/browser/testingViewPaneContainer';
 import { testingConfiguration } from 'vs/workbench/contrib/testing/common/configuration';
@@ -136,6 +136,7 @@ registerAction2(GoToPreviousMessageAction);
 registerAction2(GoToNextMessageAction);
 registerAction2(CloseTestPeek);
 registerAction2(ToggleTestingPeekHistory);
+registerAction2(CollapsePeekStack);
 
 Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(TestingContentProvider, LifecyclePhase.Restored);
 Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(TestingPeekOpener, LifecyclePhase.Eventually);
diff --git a/src/vs/workbench/contrib/testing/browser/testingConfigurationUi.ts b/src/vs/workbench/contrib/testing/browser/testingConfigurationUi.ts
index 3e4eadf3ca7..58f99a705d9 100644
--- a/src/vs/workbench/contrib/testing/browser/testingConfigurationUi.ts
+++ b/src/vs/workbench/contrib/testing/browser/testingConfigurationUi.ts
@@ -14,6 +14,7 @@ import { testingUpdateProfiles } from 'vs/workbench/contrib/testing/browser/icon
 import { testConfigurationGroupNames } from 'vs/workbench/contrib/testing/common/constants';
 import { InternalTestItem, ITestRunProfile, TestRunProfileBitset } from 'vs/workbench/contrib/testing/common/testTypes';
 import { canUseProfileWithTest, ITestProfileService } from 'vs/workbench/contrib/testing/common/testProfileService';
+import { DisposableStore } from 'vs/base/common/lifecycle';
 
 interface IConfigurationPickerOptions {
 	/** Placeholder text */
@@ -82,7 +83,7 @@ function buildPicker(accessor: ServicesAccessor, {
 		}
 	}
 
-	const quickpick = accessor.get(IQuickInputService).createQuickPick<IQuickPickItem & { profile: ITestRunProfile }>();
+	const quickpick = accessor.get(IQuickInputService).createQuickPick<IQuickPickItem & { profile: ITestRunProfile }>({ useSeparators: true });
 	quickpick.items = items;
 	quickpick.placeholder = placeholder;
 	return quickpick;
@@ -108,6 +109,9 @@ CommandsRegistry.registerCommand({
 			return;
 		}
 
+		const disposables = new DisposableStore();
+		disposables.add(quickpick);
+
 		quickpick.canSelectMany = true;
 		if (options.selected) {
 			quickpick.selectedItems = quickpick.items
@@ -116,16 +120,16 @@ CommandsRegistry.registerCommand({
 		}
 
 		const pick = await new Promise<ITestRunProfile[] | undefined>(resolve => {
-			quickpick.onDidAccept(() => {
+			disposables.add(quickpick.onDidAccept(() => {
 				const selected = quickpick.selectedItems as readonly { profile?: ITestRunProfile }[];
 				resolve(selected.map(s => s.profile).filter(isDefined));
-			});
-			quickpick.onDidHide(() => resolve(undefined));
-			quickpick.onDidTriggerItemButton(triggerButtonHandler(profileService, resolve));
+			}));
+			disposables.add(quickpick.onDidHide(() => resolve(undefined)));
+			disposables.add(quickpick.onDidTriggerItemButton(triggerButtonHandler(profileService, resolve)));
 			quickpick.show();
 		});
 
-		quickpick.dispose();
+		disposables.dispose();
 		return pick;
 	}
 });
@@ -139,14 +143,17 @@ CommandsRegistry.registerCommand({
 			return;
 		}
 
+		const disposables = new DisposableStore();
+		disposables.add(quickpick);
+
 		const pick = await new Promise<ITestRunProfile | undefined>(resolve => {
-			quickpick.onDidAccept(() => resolve((quickpick.selectedItems[0] as { profile?: ITestRunProfile })?.profile));
-			quickpick.onDidHide(() => resolve(undefined));
-			quickpick.onDidTriggerItemButton(triggerButtonHandler(profileService, resolve));
+			disposables.add(quickpick.onDidAccept(() => resolve((quickpick.selectedItems[0] as { profile?: ITestRunProfile })?.profile)));
+			disposables.add(quickpick.onDidHide(() => resolve(undefined)));
+			disposables.add(quickpick.onDidTriggerItemButton(triggerButtonHandler(profileService, resolve)));
 			quickpick.show();
 		});
 
-		quickpick.dispose();
+		disposables.dispose();
 		return pick;
 	}
 });
diff --git a/src/vs/workbench/contrib/testing/browser/testingDecorations.ts b/src/vs/workbench/contrib/testing/browser/testingDecorations.ts
index 92ff5bee376..0ff1cc43644 100644
--- a/src/vs/workbench/contrib/testing/browser/testingDecorations.ts
+++ b/src/vs/workbench/contrib/testing/browser/testingDecorations.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as dom from 'vs/base/browser/dom';
+import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { Action, IAction, Separator, SubmenuAction } from 'vs/base/common/actions';
 import { equals } from 'vs/base/common/arrays';
 import { RunOnceScheduler } from 'vs/base/common/async';
@@ -11,6 +12,7 @@ import { Emitter, Event } from 'vs/base/common/event';
 import { IMarkdownString, MarkdownString } from 'vs/base/common/htmlContent';
 import { stripIcons } from 'vs/base/common/iconLabels';
 import { Iterable } from 'vs/base/common/iterator';
+import { KeyCode } from 'vs/base/common/keyCodes';
 import { Disposable, DisposableStore, IReference, MutableDisposable } from 'vs/base/common/lifecycle';
 import { ResourceMap } from 'vs/base/common/map';
 import { isMacintosh } from 'vs/base/common/platform';
@@ -24,7 +26,7 @@ import { EditorOption } from 'vs/editor/common/config/editorOptions';
 import { overviewRulerError, overviewRulerInfo } from 'vs/editor/common/core/editorColorRegistry';
 import { IRange } from 'vs/editor/common/core/range';
 import { IEditorContribution } from 'vs/editor/common/editorCommon';
-import { GlyphMarginLane, IModelDeltaDecoration, ITextModel, OverviewRulerLane, TrackedRangeStickiness } from 'vs/editor/common/model';
+import { GlyphMarginLane, IModelDecorationOptions, IModelDeltaDecoration, ITextModel, OverviewRulerLane, TrackedRangeStickiness } from 'vs/editor/common/model';
 import { IModelService } from 'vs/editor/common/services/model';
 import { localize } from 'vs/nls';
 import { createAndFillInContextMenuActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
@@ -39,7 +41,7 @@ import { themeColorFromId } from 'vs/platform/theme/common/themeService';
 import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
 import { EditorLineNumberContextMenu, GutterActionsRegistry } from 'vs/workbench/contrib/codeEditor/browser/editorLineNumberMenu';
 import { getTestItemContextOverlay } from 'vs/workbench/contrib/testing/browser/explorerProjections/testItemContextOverlay';
-import { testingRunAllIcon, testingRunIcon, testingStatesToIcons } from 'vs/workbench/contrib/testing/browser/icons';
+import { testingDebugAllIcon, testingDebugIcon, testingRunAllIcon, testingRunIcon, testingStatesToIcons } from 'vs/workbench/contrib/testing/browser/icons';
 import { renderTestMessageAsText } from 'vs/workbench/contrib/testing/browser/testMessageColorizer';
 import { DefaultGutterClickAction, TestingConfigKeys, getTestingConfiguration } from 'vs/workbench/contrib/testing/common/configuration';
 import { Testing, labelForTestInState } from 'vs/workbench/contrib/testing/common/constants';
@@ -147,6 +149,7 @@ export class TestingDecorationService extends Disposable implements ITestingDeco
 		rangeUpdateVersionId?: number;
 		/** Counter for the results rendered in the document */
 		generation: number;
+		isAlt?: boolean;
 		value: CachedDecorations;
 	}>();
 
@@ -277,6 +280,29 @@ export class TestingDecorationService extends Disposable implements ITestingDeco
 		this.changeEmitter.fire();
 	}
 
+	/**
+	 * Sets whether alternate actions are shown for the model.
+	 */
+	public updateDecorationsAlternateAction(resource: URI, isAlt: boolean) {
+		const model = this.modelService.getModel(resource);
+		const cached = this.decorationCache.get(resource);
+		if (!model || !cached || cached.isAlt === isAlt) {
+			return;
+		}
+
+		cached.isAlt = isAlt;
+		model.changeDecorations(accessor => {
+			for (const decoration of cached.value) {
+				if (decoration instanceof RunTestDecoration && decoration.editorDecoration.alternate) {
+					accessor.changeDecorationOptions(
+						decoration.id,
+						isAlt ? decoration.editorDecoration.alternate : decoration.editorDecoration.options,
+					);
+				}
+			}
+		});
+	}
+
 	/**
 	 * Applies the current set of test decorations to the given text model.
 	 */
@@ -431,6 +457,29 @@ export class TestingDecorations extends Disposable implements IEditorContributio
 				decorations.syncDecorations(this._currentUri);
 			}
 		}));
+
+		const win = dom.getWindow(editor.getDomNode());
+		this._register(dom.addDisposableListener(win, 'keydown', e => {
+			if (new StandardKeyboardEvent(e).keyCode === KeyCode.Alt && this._currentUri) {
+				decorations.updateDecorationsAlternateAction(this._currentUri, true);
+			}
+		}));
+		this._register(dom.addDisposableListener(win, 'keyup', e => {
+			if (new StandardKeyboardEvent(e).keyCode === KeyCode.Alt && this._currentUri) {
+				decorations.updateDecorationsAlternateAction(this._currentUri, false);
+			}
+		}));
+		this._register(dom.addDisposableListener(win, 'blur', () => {
+			if (this._currentUri) {
+				decorations.updateDecorationsAlternateAction(this._currentUri, false);
+			}
+		}));
+
+		this._register(this.editor.onKeyUp(e => {
+			if (e.keyCode === KeyCode.Alt && this._currentUri) {
+				decorations.updateDecorationsAlternateAction(this._currentUri!, false);
+			}
+		}));
 		this._register(this.editor.onDidChangeModel(e => this.attachModel(e.newModelUrl || undefined)));
 		this._register(this.editor.onMouseDown(e => {
 			if (e.target.position && this.currentUri) {
@@ -531,14 +580,22 @@ const collapseRange = (originalRange: IRange) => ({
 	endColumn: originalRange.startColumn,
 });
 
-const createRunTestDecoration = (tests: readonly IncrementalTestCollectionItem[], states: readonly (TestResultItem | undefined)[], visible: boolean): IModelDeltaDecoration => {
+const createRunTestDecoration = (
+	tests: readonly IncrementalTestCollectionItem[],
+	states: readonly (TestResultItem | undefined)[],
+	visible: boolean,
+	defaultGutterAction: DefaultGutterClickAction,
+): IModelDeltaDecoration & { alternate?: IModelDecorationOptions } => {
 	const range = tests[0]?.item.range;
 	if (!range) {
 		throw new Error('Test decorations can only be created for tests with a range');
 	}
 
 	if (!visible) {
-		return { range: collapseRange(range), options: { isWholeLine: true, description: 'run-test-decoration' } };
+		return {
+			range: collapseRange(range),
+			options: { isWholeLine: true, description: 'run-test-decoration' },
+		};
 	}
 
 	let computedState = TestResultState.Unset;
@@ -560,38 +617,51 @@ const createRunTestDecoration = (tests: readonly IncrementalTestCollectionItem[]
 	}
 
 	const hasMultipleTests = tests.length > 1 || tests[0].children.size > 0;
-	const icon = computedState === TestResultState.Unset
+
+	const primaryIcon = computedState === TestResultState.Unset
 		? (hasMultipleTests ? testingRunAllIcon : testingRunIcon)
 		: testingStatesToIcons.get(computedState)!;
 
+	const alternateIcon = defaultGutterAction === DefaultGutterClickAction.Debug
+		? (hasMultipleTests ? testingRunAllIcon : testingRunIcon)
+		: (hasMultipleTests ? testingDebugAllIcon : testingDebugIcon);
+
 	let hoverMessage: IMarkdownString | undefined;
 
-	let glyphMarginClassName = ThemeIcon.asClassName(icon) + ' testing-run-glyph';
+	let glyphMarginClassName = 'testing-run-glyph';
 	if (retired) {
 		glyphMarginClassName += ' retired';
 	}
 
-	return {
-		range: collapseRange(range),
-		options: {
-			description: 'run-test-decoration',
-			showIfCollapsed: true,
-			get hoverMessage() {
-				if (!hoverMessage) {
-					const building = hoverMessage = new MarkdownString('', true).appendText(hoverMessageParts.join(', ') + '.');
-					if (testIdWithMessages) {
-						const args = encodeURIComponent(JSON.stringify([testIdWithMessages]));
-						building.appendMarkdown(` [${localize('peekTestOutout', 'Peek Test Output')}](command:vscode.peekTestError?${args})`);
-					}
+	const defaultOptions: IModelDecorationOptions = {
+		description: 'run-test-decoration',
+		showIfCollapsed: true,
+		get hoverMessage() {
+			if (!hoverMessage) {
+				const building = hoverMessage = new MarkdownString('', true).appendText(hoverMessageParts.join(', ') + '.');
+				if (testIdWithMessages) {
+					const args = encodeURIComponent(JSON.stringify([testIdWithMessages]));
+					building.appendMarkdown(` [${localize('peekTestOutout', 'Peek Test Output')}](command:vscode.peekTestError?${args})`);
 				}
+			}
 
-				return hoverMessage;
-			},
-			glyphMargin: { position: GLYPH_MARGIN_LANE },
-			glyphMarginClassName,
-			stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
-			zIndex: 10000,
-		}
+			return hoverMessage;
+		},
+		glyphMargin: { position: GLYPH_MARGIN_LANE },
+		glyphMarginClassName: `${ThemeIcon.asClassName(primaryIcon)} ${glyphMarginClassName}`,
+		stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
+		zIndex: 10000,
+	};
+
+	const alternateOptions: IModelDecorationOptions = {
+		...defaultOptions,
+		glyphMarginClassName: `${ThemeIcon.asClassName(alternateIcon)} ${glyphMarginClassName}`,
+	};
+
+	return {
+		range: collapseRange(range),
+		options: defaultOptions,
+		alternate: alternateOptions,
 	};
 };
 
@@ -716,7 +786,7 @@ abstract class RunTestDecoration {
 		return this.tests.map(t => t.test.item.extId);
 	}
 
-	public editorDecoration: IModelDeltaDecoration;
+	public editorDecoration: IModelDeltaDecoration & { alternate?: IModelDecorationOptions };
 	public displayedStates: readonly (TestResultState | undefined)[];
 
 	constructor(
@@ -736,7 +806,12 @@ abstract class RunTestDecoration {
 		@IMenuService protected readonly menuService: IMenuService,
 	) {
 		this.displayedStates = tests.map(t => t.resultItem?.computedState);
-		this.editorDecoration = createRunTestDecoration(tests.map(t => t.test), tests.map(t => t.resultItem), visible);
+		this.editorDecoration = createRunTestDecoration(
+			tests.map(t => t.test),
+			tests.map(t => t.resultItem),
+			visible,
+			getTestingConfiguration(this.configurationService, TestingConfigKeys.DefaultGutterClickAction),
+		);
 		this.editorDecoration.options.glyphMarginHoverMessage = new MarkdownString().appendText(this.getGutterLabel());
 	}
 
@@ -787,7 +862,16 @@ abstract class RunTestDecoration {
 		this.tests = newTests;
 		this.displayedStates = displayedStates;
 		this.visible = visible;
-		this.editorDecoration.options = createRunTestDecoration(newTests.map(t => t.test), newTests.map(t => t.resultItem), visible).options;
+
+		const { options, alternate } = createRunTestDecoration(
+			newTests.map(t => t.test),
+			newTests.map(t => t.resultItem),
+			visible,
+			getTestingConfiguration(this.configurationService, TestingConfigKeys.DefaultGutterClickAction)
+		);
+
+		this.editorDecoration.options = options;
+		this.editorDecoration.alternate = alternate;
 		this.editorDecoration.options.glyphMarginHoverMessage = new MarkdownString().appendText(this.getGutterLabel());
 		return true;
 	}
@@ -998,17 +1082,18 @@ class MultiRunTestDecoration extends RunTestDecoration implements ITestDecoratio
 
 	private async pickAndRun(testItems: IMultiRunTest[]) {
 		const doPick = <T extends IQuickPickItem>(items: T[], title: string) => new Promise<T | undefined>(resolve => {
-			const pick = this.quickInputService.createQuickPick<T>();
+			const disposables = new DisposableStore();
+			const pick = disposables.add(this.quickInputService.createQuickPick<T>());
 			pick.placeholder = title;
 			pick.items = items;
-			pick.onDidHide(() => {
+			disposables.add(pick.onDidHide(() => {
 				resolve(undefined);
-				pick.dispose();
-			});
-			pick.onDidAccept(() => {
+				disposables.dispose();
+			}));
+			disposables.add(pick.onDidAccept(() => {
 				resolve(pick.selectedItems[0]);
-				pick.dispose();
-			});
+				disposables.dispose();
+			}));
 			pick.show();
 		});
 
diff --git a/src/vs/workbench/contrib/testing/browser/testingOutputPeek.ts b/src/vs/workbench/contrib/testing/browser/testingOutputPeek.ts
index ad9e402a89b..3acce2ece81 100644
--- a/src/vs/workbench/contrib/testing/browser/testingOutputPeek.ts
+++ b/src/vs/workbench/contrib/testing/browser/testingOutputPeek.ts
@@ -14,6 +14,7 @@ import { Iterable } from 'vs/base/common/iterator';
 import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
 import { Lazy } from 'vs/base/common/lazy';
 import { Disposable, MutableDisposable } from 'vs/base/common/lifecycle';
+import { observableValue } from 'vs/base/common/observable';
 import { count } from 'vs/base/common/strings';
 import { URI } from 'vs/base/common/uri';
 import { ICodeEditor, isCodeEditor } from 'vs/editor/browser/editorBrowser';
@@ -43,6 +44,7 @@ import { ServiceCollection } from 'vs/platform/instantiation/common/serviceColle
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { INotificationService } from 'vs/platform/notification/common/notification';
+import { bindContextKey } from 'vs/platform/observable/common/platformObservableUtils';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
 import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
@@ -52,7 +54,7 @@ import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity'
 import { IViewPaneOptions, ViewPane } from 'vs/workbench/browser/parts/views/viewPane';
 import { IViewDescriptorService } from 'vs/workbench/common/views';
 import { renderTestMessageAsText } from 'vs/workbench/contrib/testing/browser/testMessageColorizer';
-import { InspectSubject, MessageSubject, TaskSubject, TestOutputSubject, mapFindTestMessage } from 'vs/workbench/contrib/testing/browser/testResultsView/testResultsSubject';
+import { InspectSubject, MessageSubject, TaskSubject, TestOutputSubject, inspectSubjectHasStack, mapFindTestMessage } from 'vs/workbench/contrib/testing/browser/testResultsView/testResultsSubject';
 import { TestResultsViewContent } from 'vs/workbench/contrib/testing/browser/testResultsView/testResultsViewContent';
 import { testingMessagePeekBorder, testingPeekBorder, testingPeekHeaderBackground, testingPeekMessageHeaderBackground } from 'vs/workbench/contrib/testing/browser/theme';
 import { AutoOpenPeekViewWhen, TestingConfigKeys, getTestingConfiguration } from 'vs/workbench/contrib/testing/common/configuration';
@@ -92,18 +94,11 @@ export class TestingPeekOpener extends Disposable implements ITestingPeekOpener
 	private lastUri?: TestUriWithDocument;
 
 	/** @inheritdoc */
-	public readonly historyVisible = MutableObservableValue.stored(this._register(new StoredValue<boolean>({
+	public readonly historyVisible = this._register(MutableObservableValue.stored(new StoredValue<boolean>({
 		key: 'testHistoryVisibleInPeek',
 		scope: StorageScope.PROFILE,
 		target: StorageTarget.USER,
-	}, this.storageService)), false);
-
-	/** @inheritdoc */
-	public readonly callStackVisible = MutableObservableValue.stored(this._register(new StoredValue<boolean>({
-		key: 'testCallStackVisible',
-		scope: StorageScope.PROFILE,
-		target: StorageTarget.USER,
-	}, this.storageService)), true);
+	}, this.storageService), false));
 
 	constructor(
 		@IConfigurationService private readonly configuration: IConfigurationService,
@@ -505,6 +500,13 @@ export class TestingOutputPeekController extends Disposable implements IEditorCo
 		this.peek.clear();
 	}
 
+	/**
+	 * Collapses all displayed stack frames.
+	 */
+	public collapseStack() {
+		this.peek.value?.collapseStack();
+	}
+
 	/**
 	 * Shows the next message in the peek, if possible.
 	 */
@@ -652,10 +654,14 @@ class TestResultsPeek extends PeekViewWidget {
 	private static lastHeightInLines?: number;
 
 	private readonly visibilityChange = this._disposables.add(new Emitter<boolean>());
+	private readonly _current = observableValue<InspectSubject | undefined>('testPeekCurrent', undefined);
 	private content!: TestResultsViewContent;
 	private scopedContextKeyService!: IContextKeyService;
 	private dimension?: dom.Dimension;
-	public current?: InspectSubject;
+
+	public get current() {
+		return this._current.get();
+	}
 
 	constructor(
 		editor: ICodeEditor,
@@ -709,7 +715,14 @@ class TestResultsPeek extends PeekViewWidget {
 	protected override _fillHead(container: HTMLElement): void {
 		super._fillHead(container);
 
-		const menu = this.menuService.createMenu(MenuId.TestPeekTitle, this.contextKeyService);
+		const menuContextKeyService = this._disposables.add(this.contextKeyService.createScoped(container));
+		this._disposables.add(bindContextKey(
+			TestingContextKeys.peekHasStack,
+			menuContextKeyService,
+			reader => inspectSubjectHasStack(this._current.read(reader)),
+		));
+
+		const menu = this.menuService.createMenu(MenuId.TestPeekTitle, menuContextKeyService);
 		const actionBar = this._actionbarWidget!;
 		this._disposables.add(menu.onDidChange(() => {
 			actions.length = 0;
@@ -739,7 +752,7 @@ class TestResultsPeek extends PeekViewWidget {
 	 */
 	public setModel(subject: InspectSubject): Promise<void> {
 		if (subject instanceof TaskSubject || subject instanceof TestOutputSubject) {
-			this.current = subject;
+			this._current.set(subject, undefined);
 			return this.showInPlace(subject);
 		}
 
@@ -750,14 +763,14 @@ class TestResultsPeek extends PeekViewWidget {
 			return Promise.resolve();
 		}
 
-		this.current = subject;
+		this._current.set(subject, undefined);
 		if (!revealLocation) {
 			return this.showInPlace(subject);
 		}
 
 		// If there is a stack we want to display, ensure the default size is large-ish
 		const peekLines = TestResultsPeek.lastHeightInLines || Math.max(
-			subject instanceof MessageSubject && subject.stack?.length ? Math.ceil(this.getVisibleEditorLines() / 2) : 0,
+			inspectSubjectHasStack(subject) ? Math.ceil(this.getVisibleEditorLines() / 2) : 0,
 			hintMessagePeekHeight(message)
 		);
 
@@ -767,6 +780,13 @@ class TestResultsPeek extends PeekViewWidget {
 		return this.showInPlace(subject);
 	}
 
+	/**
+	 * Collapses all displayed stack frames.
+	 */
+	public collapseStack() {
+		this.content.collapseStack();
+	}
+
 	private getVisibleEditorLines() {
 		// note that we don't use the view ranges because we don't want to get
 		// thrown off by large wrapping lines. Being approximate here is okay.
@@ -1032,6 +1052,31 @@ export class GoToPreviousMessageAction extends Action2 {
 	}
 }
 
+export class CollapsePeekStack extends Action2 {
+	public static readonly ID = 'testing.collapsePeekStack';
+	constructor() {
+		super({
+			id: CollapsePeekStack.ID,
+			title: localize2('testing.collapsePeekStack', 'Collapse Stack Frames'),
+			icon: Codicon.collapseAll,
+			category: Categories.Test,
+			menu: [{
+				id: MenuId.TestPeekTitle,
+				when: TestingContextKeys.peekHasStack,
+				group: 'navigation',
+				order: 4,
+			}],
+		});
+	}
+
+	public override run(accessor: ServicesAccessor) {
+		const editor = getPeekedEditorFromFocus(accessor.get(ICodeEditorService));
+		if (editor) {
+			TestingOutputPeekController.get(editor)?.collapseStack();
+		}
+	}
+}
+
 export class OpenMessageInEditorAction extends Action2 {
 	public static readonly ID = 'testing.openMessageInEditor';
 	constructor() {
diff --git a/src/vs/workbench/contrib/testing/browser/theme.ts b/src/vs/workbench/contrib/testing/browser/theme.ts
index 0c088a787c3..05cd546475c 100644
--- a/src/vs/workbench/contrib/testing/browser/theme.ts
+++ b/src/vs/workbench/contrib/testing/browser/theme.ts
@@ -7,7 +7,7 @@ import { Color, RGBA } from 'vs/base/common/color';
 import { localize } from 'vs/nls';
 import { badgeBackground, badgeForeground, chartsGreen, chartsRed, contrastBorder, diffInserted, diffRemoved, editorBackground, editorErrorForeground, editorForeground, editorInfoForeground, opaque, registerColor, transparent } from 'vs/platform/theme/common/colorRegistry';
 import { registerThemingParticipant } from 'vs/platform/theme/common/themeService';
-import { TestMessageType, TestResultState } from 'vs/workbench/contrib/testing/common/testTypes';
+import { TestResultState } from 'vs/workbench/contrib/testing/common/testTypes';
 
 export const testingColorIconFailed = registerColor('testing.iconFailed', {
 	dark: '#f14c4c',
@@ -119,37 +119,27 @@ export const testingCoverCountBadgeBackground = registerColor('testing.coverCoun
 
 export const testingCoverCountBadgeForeground = registerColor('testing.coverCountBadgeForeground', badgeForeground, localize('testing.coverCountBadgeForeground', 'Foreground for the badge indicating execution count'));
 
-export const testMessageSeverityColors: {
-	[K in TestMessageType]: {
-		decorationForeground: string;
-		marginBackground: string;
-	};
-} = {
-	[TestMessageType.Error]: {
-		decorationForeground: registerColor(
-			'testing.message.error.decorationForeground',
-			{ dark: editorErrorForeground, light: editorErrorForeground, hcDark: editorForeground, hcLight: editorForeground },
-			localize('testing.message.error.decorationForeground', 'Text color of test error messages shown inline in the editor.')
-		),
-		marginBackground: registerColor(
-			'testing.message.error.lineBackground',
-			{ dark: new Color(new RGBA(255, 0, 0, 0.2)), light: new Color(new RGBA(255, 0, 0, 0.2)), hcDark: null, hcLight: null },
-			localize('testing.message.error.marginBackground', 'Margin color beside error messages shown inline in the editor.')
-		),
-	},
-	[TestMessageType.Output]: {
-		decorationForeground: registerColor(
-			'testing.message.info.decorationForeground',
-			transparent(editorForeground, 0.5),
-			localize('testing.message.info.decorationForeground', 'Text color of test info messages shown inline in the editor.')
-		),
-		marginBackground: registerColor(
-			'testing.message.info.lineBackground',
-			null,
-			localize('testing.message.info.marginBackground', 'Margin color beside info messages shown inline in the editor.')
-		),
-	},
-};
+
+registerColor(
+	'testing.message.error.decorationForeground',
+	{ dark: editorErrorForeground, light: editorErrorForeground, hcDark: editorForeground, hcLight: editorForeground },
+	localize('testing.message.error.decorationForeground', 'Text color of test error messages shown inline in the editor.')
+);
+registerColor(
+	'testing.message.error.lineBackground',
+	{ dark: new Color(new RGBA(255, 0, 0, 0.1)), light: new Color(new RGBA(255, 0, 0, 0.1)), hcDark: null, hcLight: null },
+	localize('testing.message.error.marginBackground', 'Margin color beside error messages shown inline in the editor.')
+);
+registerColor(
+	'testing.message.info.decorationForeground',
+	transparent(editorForeground, 0.5),
+	localize('testing.message.info.decorationForeground', 'Text color of test info messages shown inline in the editor.')
+);
+registerColor(
+	'testing.message.info.lineBackground',
+	null,
+	localize('testing.message.info.marginBackground', 'Margin color beside info messages shown inline in the editor.')
+);
 
 export const testStatesToIconColors: { [K in TestResultState]?: string } = {
 	[TestResultState.Errored]: testingColorIconErrored,
diff --git a/src/vs/workbench/contrib/testing/common/testExclusions.ts b/src/vs/workbench/contrib/testing/common/testExclusions.ts
index 768e931f314..65ff6ccf0bc 100644
--- a/src/vs/workbench/contrib/testing/common/testExclusions.ts
+++ b/src/vs/workbench/contrib/testing/common/testExclusions.ts
@@ -13,7 +13,7 @@ import { InternalTestItem } from 'vs/workbench/contrib/testing/common/testTypes'
 
 export class TestExclusions extends Disposable {
 	private readonly excluded = this._register(
-		MutableObservableValue.stored(this._register(new StoredValue<ReadonlySet<string>>({
+		MutableObservableValue.stored(new StoredValue<ReadonlySet<string>>({
 			key: 'excludedTestItems',
 			scope: StorageScope.WORKSPACE,
 			target: StorageTarget.MACHINE,
@@ -21,7 +21,7 @@ export class TestExclusions extends Disposable {
 				deserialize: v => new Set(JSON.parse(v)),
 				serialize: v => JSON.stringify([...v])
 			},
-		}, this.storageService)), new Set())
+		}, this.storageService), new Set())
 	);
 
 	constructor(@IStorageService private readonly storageService: IStorageService) {
diff --git a/src/vs/workbench/contrib/testing/common/testResult.ts b/src/vs/workbench/contrib/testing/common/testResult.ts
index bad2cef1f57..6f624060dea 100644
--- a/src/vs/workbench/contrib/testing/common/testResult.ts
+++ b/src/vs/workbench/contrib/testing/common/testResult.ts
@@ -607,7 +607,7 @@ export class LiveTestResult extends Disposable implements ITestResult {
 	private readonly doSerialize = new Lazy((): ISerializedTestResults => ({
 		id: this.id,
 		completedAt: this.completedAt!,
-		tasks: this.tasks.map(t => ({ id: t.id, name: t.name, ctrlId: t.ctrlId })),
+		tasks: this.tasks.map(t => ({ id: t.id, name: t.name, ctrlId: t.ctrlId, hasCoverage: !!t.coverage.get() })),
 		name: this.name,
 		request: this.request,
 		items: [...this.testById.values()].map(TestResultItem.serializeWithoutMessages),
@@ -616,7 +616,7 @@ export class LiveTestResult extends Disposable implements ITestResult {
 	private readonly doSerializeWithMessages = new Lazy((): ISerializedTestResults => ({
 		id: this.id,
 		completedAt: this.completedAt!,
-		tasks: this.tasks.map(t => ({ id: t.id, name: t.name, ctrlId: t.ctrlId })),
+		tasks: this.tasks.map(t => ({ id: t.id, name: t.name, ctrlId: t.ctrlId, hasCoverage: !!t.coverage.get() })),
 		name: this.name,
 		request: this.request,
 		items: [...this.testById.values()].map(TestResultItem.serialize),
@@ -675,7 +675,7 @@ export class HydratedTestResult implements ITestResult {
 		this.completedAt = serialized.completedAt;
 		this.tasks = serialized.tasks.map((task, i) => ({
 			id: task.id,
-			name: task.name,
+			name: task.name || localize('testUnnamedTask', 'Unnamed Task'),
 			ctrlId: task.ctrlId,
 			running: false,
 			coverage: observableValue(this, undefined),
diff --git a/src/vs/workbench/contrib/testing/common/testService.ts b/src/vs/workbench/contrib/testing/common/testService.ts
index 8dcbd95abd9..a7f688bdf92 100644
--- a/src/vs/workbench/contrib/testing/common/testService.ts
+++ b/src/vs/workbench/contrib/testing/common/testService.ts
@@ -311,7 +311,7 @@ export interface ITestService {
 	 * Fires when the user requests to cancel a test run -- or all runs, if no
 	 * runId is given.
 	 */
-	readonly onDidCancelTestRun: Event<{ runId: string | undefined }>;
+	readonly onDidCancelTestRun: Event<{ runId: string | undefined; taskId: string | undefined }>;
 
 	/**
 	 * Event that fires when the excluded tests change.
@@ -392,7 +392,7 @@ export interface ITestService {
 	/**
 	 * Cancels an ongoing test run by its ID, or all runs if no ID is given.
 	 */
-	cancelTestRun(runId?: string): void;
+	cancelTestRun(runId?: string, taskId?: string): void;
 
 	/**
 	 * Publishes a test diff for a controller.
diff --git a/src/vs/workbench/contrib/testing/common/testServiceImpl.ts b/src/vs/workbench/contrib/testing/common/testServiceImpl.ts
index 532a295484f..786d3d292cd 100644
--- a/src/vs/workbench/contrib/testing/common/testServiceImpl.ts
+++ b/src/vs/workbench/contrib/testing/common/testServiceImpl.ts
@@ -41,7 +41,7 @@ export class TestService extends Disposable implements ITestService {
 	private testControllers = observableValue<ReadonlyMap<string, IMainThreadTestController>>('testControllers', new Map<string, IMainThreadTestController>());
 	private testExtHosts = new Set<IMainThreadTestHostProxy>();
 
-	private readonly cancelExtensionTestRunEmitter = new Emitter<{ runId: string | undefined }>();
+	private readonly cancelExtensionTestRunEmitter = new Emitter<{ runId: string | undefined; taskId: string | undefined }>();
 	private readonly willProcessDiffEmitter = new Emitter<TestsDiff>();
 	private readonly didProcessDiffEmitter = new Emitter<TestsDiff>();
 	private readonly testRefreshCancellations = new Set<CancellationTokenSource>();
@@ -82,11 +82,11 @@ export class TestService extends Disposable implements ITestService {
 	/**
 	 * @inheritdoc
 	 */
-	public readonly showInlineOutput = MutableObservableValue.stored(this._register(new StoredValue<boolean>({
+	public readonly showInlineOutput = this._register(MutableObservableValue.stored(new StoredValue<boolean>({
 		key: 'inlineTestOutputVisible',
 		scope: StorageScope.WORKSPACE,
 		target: StorageTarget.USER
-	}, this.storage)), true);
+	}, this.storage), true));
 
 	constructor(
 		@IContextKeyService contextKeyService: IContextKeyService,
@@ -133,14 +133,14 @@ export class TestService extends Disposable implements ITestService {
 	/**
 	 * @inheritdoc
 	 */
-	public cancelTestRun(runId?: string) {
-		this.cancelExtensionTestRunEmitter.fire({ runId });
+	public cancelTestRun(runId?: string, taskId?: string) {
+		this.cancelExtensionTestRunEmitter.fire({ runId, taskId });
 
 		if (runId === undefined) {
 			for (const runCts of this.uiRunningTests.values()) {
 				runCts.cancel();
 			}
-		} else {
+		} else if (!taskId) {
 			this.uiRunningTests.get(runId)?.cancel();
 		}
 	}
diff --git a/src/vs/workbench/contrib/testing/common/testTypes.ts b/src/vs/workbench/contrib/testing/common/testTypes.ts
index d782ad9704d..42241e66187 100644
--- a/src/vs/workbench/contrib/testing/common/testTypes.ts
+++ b/src/vs/workbench/contrib/testing/common/testTypes.ts
@@ -332,7 +332,7 @@ export namespace ITestTaskState {
 
 export interface ITestRunTask {
 	id: string;
-	name: string | undefined;
+	name: string;
 	running: boolean;
 	ctrlId: string;
 }
@@ -585,7 +585,7 @@ export interface ISerializedTestResults {
 	/** Subset of test result items */
 	items: TestResultItem.Serialized[];
 	/** Tasks involved in the run. */
-	tasks: { id: string; name: string | undefined; ctrlId: string }[];
+	tasks: { id: string; name: string | undefined; ctrlId: string; hasCoverage: boolean }[];
 	/** Human-readable name of the test run. */
 	name: string;
 	/** Test trigger informaton */
diff --git a/src/vs/workbench/contrib/testing/common/testingContextKeys.ts b/src/vs/workbench/contrib/testing/common/testingContextKeys.ts
index ac303b4886f..1cfd764dc23 100644
--- a/src/vs/workbench/contrib/testing/common/testingContextKeys.ts
+++ b/src/vs/workbench/contrib/testing/common/testingContextKeys.ts
@@ -29,6 +29,7 @@ export namespace TestingContextKeys {
 	export const inlineCoverageEnabled = new RawContextKey('testing.inlineCoverageEnabled', false, { type: 'boolean', description: localize('testing.inlineCoverageEnabled', 'Indicates whether inline coverage is shown') });
 	export const canGoToRelatedCode = new RawContextKey('testing.canGoToRelatedCode', false, { type: 'boolean', description: localize('testing.canGoToRelatedCode', 'Whether a controller implements a capability to find code related to a test') });
 	export const canGoToRelatedTest = new RawContextKey('testing.canGoToRelatedTest', false, { type: 'boolean', description: localize('testing.canGoToRelatedTest', 'Whether a controller implements a capability to find tests related to code') });
+	export const peekHasStack = new RawContextKey('testing.peekHasStack', false, { type: 'boolean', description: localize('testing.peekHasStack', 'Whether the message shown in a peek view has a stack trace') });
 
 	export const capabilityToContextKey: { [K in TestRunProfileBitset]: RawContextKey<boolean> } = {
 		[TestRunProfileBitset.Run]: hasRunnableTests,
diff --git a/src/vs/workbench/contrib/testing/common/testingDecorations.ts b/src/vs/workbench/contrib/testing/common/testingDecorations.ts
index 80900e00901..0c28e6b87ae 100644
--- a/src/vs/workbench/contrib/testing/common/testingDecorations.ts
+++ b/src/vs/workbench/contrib/testing/common/testingDecorations.ts
@@ -41,6 +41,11 @@ export interface ITestingDecorationsService {
 	 * Returns undefined if there's no such decoration.
 	 */
 	getDecoratedTestPosition(resource: URI, testId: string): Position | undefined;
+
+	/**
+	 * Sets that alternative actions are displayed on the model.
+	 */
+	updateDecorationsAlternateAction(resource: URI, isAlt: boolean): void;
 }
 
 export interface ITestDecoration {
diff --git a/src/vs/workbench/contrib/testing/test/common/testResultService.test.ts b/src/vs/workbench/contrib/testing/test/common/testResultService.test.ts
index 36574ce8655..49b196b8c8f 100644
--- a/src/vs/workbench/contrib/testing/test/common/testResultService.test.ts
+++ b/src/vs/workbench/contrib/testing/test/common/testResultService.test.ts
@@ -66,7 +66,7 @@ suite('Workbench - Test Results Service', () => {
 		));
 
 		ds.add(r.onChange(e => changed.add(e)));
-		r.addTask({ id: 't', name: undefined, running: true, ctrlId: 'ctrl' });
+		r.addTask({ id: 't', name: 'n', running: true, ctrlId: 'ctrl' });
 
 		tests = ds.add(testStubs.nested());
 		const cts = ds.add(new CancellationTokenSource());
@@ -293,7 +293,7 @@ suite('Workbench - Test Results Service', () => {
 		} as IUriIdentityService, {
 			completedAt,
 			id: 'some-id',
-			tasks: [{ id: 't', name: undefined, ctrlId: 'ctrl' }],
+			tasks: [{ id: 't', name: undefined, ctrlId: 'ctrl', hasCoverage: false }],
 			name: 'hello world',
 			request: defaultOpts([]),
 			items: [{
diff --git a/src/vs/workbench/contrib/testing/test/common/testResultStorage.test.ts b/src/vs/workbench/contrib/testing/test/common/testResultStorage.test.ts
index 819acecec62..570e8d04b4d 100644
--- a/src/vs/workbench/contrib/testing/test/common/testResultStorage.test.ts
+++ b/src/vs/workbench/contrib/testing/test/common/testResultStorage.test.ts
@@ -28,7 +28,7 @@ suite('Workbench - Test Result Storage', () => {
 			NullTelemetryService,
 		));
 
-		t.addTask({ id: taskName, name: undefined, running: true, ctrlId: 'ctrlId' });
+		t.addTask({ id: taskName, name: 'n', running: true, ctrlId: 'ctrlId' });
 		const tests = ds.add(testStubs.nested());
 		tests.expand(tests.root.id, Infinity);
 		t.addTestChainToRun('ctrlId', [
diff --git a/src/vs/workbench/contrib/themes/browser/themes.contribution.ts b/src/vs/workbench/contrib/themes/browser/themes.contribution.ts
index cc65c5d4500..51b07588487 100644
--- a/src/vs/workbench/contrib/themes/browser/themes.contribution.ts
+++ b/src/vs/workbench/contrib/themes/browser/themes.contribution.ts
@@ -168,8 +168,9 @@ class MarketplaceThemesPicker {
 
 	public openQuickPick(value: string, currentTheme: IWorkbenchTheme | undefined, selectTheme: (theme: IWorkbenchTheme | undefined, applyTheme: boolean) => void): Promise<PickerResult> {
 		let result: PickerResult | undefined = undefined;
+		const disposables = new DisposableStore();
 		return new Promise<PickerResult>((s, _) => {
-			const quickpick = this.quickInputService.createQuickPick<ThemeItem>();
+			const quickpick = disposables.add(this.quickInputService.createQuickPick<ThemeItem>());
 			quickpick.items = [];
 			quickpick.sortByLabel = false;
 			quickpick.matchOnDescription = true;
@@ -177,8 +178,8 @@ class MarketplaceThemesPicker {
 			quickpick.title = 'Marketplace Themes';
 			quickpick.placeholder = localize('themes.selectMarketplaceTheme', "Type to Search More. Select to Install. Up/Down Keys to Preview");
 			quickpick.canSelectMany = false;
-			quickpick.onDidChangeValue(() => this.trigger(quickpick.value));
-			quickpick.onDidAccept(async _ => {
+			disposables.add(quickpick.onDidChangeValue(() => this.trigger(quickpick.value)));
+			disposables.add(quickpick.onDidAccept(async _ => {
 				const themeItem = quickpick.selectedItems[0];
 				if (themeItem?.galleryExtension) {
 					result = 'selected';
@@ -190,9 +191,9 @@ class MarketplaceThemesPicker {
 						selectTheme(currentTheme, true);
 					}
 				}
-			});
+			}));
 
-			quickpick.onDidTriggerItemButton(e => {
+			disposables.add(quickpick.onDidTriggerItemButton(e => {
 				if (isItem(e.item)) {
 					const extensionId = e.item.theme?.extensionData?.extensionId;
 					if (extensionId) {
@@ -201,31 +202,30 @@ class MarketplaceThemesPicker {
 						openExtensionViewlet(this.paneCompositeService, `${this.marketplaceQuery} ${quickpick.value}`);
 					}
 				}
-			});
-			quickpick.onDidChangeActive(themes => {
+			}));
+			disposables.add(quickpick.onDidChangeActive(themes => {
 				if (result === undefined) {
 					selectTheme(themes[0]?.theme, false);
 				}
-			});
+			}));
 
-			quickpick.onDidHide(() => {
+			disposables.add(quickpick.onDidHide(() => {
 				if (result === undefined) {
 					selectTheme(currentTheme, true);
 					result = 'cancelled';
 
 				}
-				quickpick.dispose();
 				s(result);
-			});
+			}));
 
-			quickpick.onDidTriggerButton(e => {
+			disposables.add(quickpick.onDidTriggerButton(e => {
 				if (e === this.quickInputService.backButton) {
 					result = 'back';
 					quickpick.hide();
 				}
-			});
+			}));
 
-			this.onDidChange(() => {
+			disposables.add(this.onDidChange(() => {
 				let items = this.themes;
 				if (this._searchOngoing) {
 					items = items.concat({ label: '$(sync~spin) Searching for themes...', id: undefined, alwaysShow: true });
@@ -239,9 +239,11 @@ class MarketplaceThemesPicker {
 				if (newActiveItem) {
 					quickpick.activeItems = [newActiveItem as ThemeItem];
 				}
-			});
+			}));
 			this.trigger(value);
 			quickpick.show();
+		}).finally(() => {
+			disposables.dispose();
 		});
 	}
 
@@ -291,7 +293,7 @@ interface InstalledThemesPickerOptions {
 	readonly title?: string;
 	readonly description?: string;
 	readonly toggles?: IQuickInputToggle[];
-	readonly onToggle?: (toggle: IQuickInputToggle, quickInput: IQuickPick<ThemeItem>) => Promise<void>;
+	readonly onToggle?: (toggle: IQuickInputToggle, quickInput: IQuickPick<ThemeItem, { useSeparators: boolean }>) => Promise<void>;
 }
 
 class InstalledThemesPicker {
@@ -338,12 +340,11 @@ class InstalledThemesPicker {
 		};
 
 		const pickInstalledThemes = (activeItemId: string | undefined) => {
+			const disposables = new DisposableStore();
 			return new Promise<void>((s, _) => {
 				let isCompleted = false;
-				const disposables = new DisposableStore();
-
 				const autoFocusIndex = picks.findIndex(p => isItem(p) && p.id === activeItemId);
-				const quickpick = this.quickInputService.createQuickPick<ThemeItem>();
+				const quickpick = disposables.add(this.quickInputService.createQuickPick<ThemeItem>({ useSeparators: true }));
 				quickpick.items = picks;
 				quickpick.title = this.options.title;
 				quickpick.description = this.options.description;
@@ -352,10 +353,10 @@ class InstalledThemesPicker {
 				quickpick.canSelectMany = false;
 				quickpick.toggles = this.options.toggles;
 				quickpick.toggles?.forEach(toggle => {
-					toggle.onChange(() => this.options.onToggle?.(toggle, quickpick), undefined, disposables);
+					disposables.add(toggle.onChange(() => this.options.onToggle?.(toggle, quickpick)));
 				});
 				quickpick.matchOnDescription = true;
-				quickpick.onDidAccept(async _ => {
+				disposables.add(quickpick.onDidAccept(async _ => {
 					isCompleted = true;
 					const theme = quickpick.selectedItems[0];
 					if (!theme || theme.configureItem) { // 'pick in marketplace' entry
@@ -375,17 +376,16 @@ class InstalledThemesPicker {
 
 					quickpick.hide();
 					s();
-				});
-				quickpick.onDidChangeActive(themes => selectTheme(themes[0]?.theme, false));
-				quickpick.onDidHide(() => {
+				}));
+				disposables.add(quickpick.onDidChangeActive(themes => selectTheme(themes[0]?.theme, false)));
+				disposables.add(quickpick.onDidHide(() => {
 					if (!isCompleted) {
 						selectTheme(currentTheme, true);
 						s();
 					}
 					quickpick.dispose();
-					disposables.dispose();
-				});
-				quickpick.onDidTriggerItemButton(e => {
+				}));
+				disposables.add(quickpick.onDidTriggerItemButton(e => {
 					if (isItem(e.item)) {
 						const extensionId = e.item.theme?.extensionData?.extensionId;
 						if (extensionId) {
@@ -394,8 +394,10 @@ class InstalledThemesPicker {
 							openExtensionViewlet(this.paneCompositeService, `${this.options.marketplaceTag} ${quickpick.value}`);
 						}
 					}
-				});
+				}));
 				quickpick.show();
+			}).finally(() => {
+				disposables.dispose();
 			});
 		};
 		await pickInstalledThemes(currentTheme.id);
diff --git a/src/vs/workbench/contrib/update/browser/releaseNotesEditor.ts b/src/vs/workbench/contrib/update/browser/releaseNotesEditor.ts
index 59854d21bc7..4ab11bdd24d 100644
--- a/src/vs/workbench/contrib/update/browser/releaseNotesEditor.ts
+++ b/src/vs/workbench/contrib/update/browser/releaseNotesEditor.ts
@@ -388,7 +388,7 @@ export class ReleaseNotesManager {
 					});
 
 					window.addEventListener('click', event => {
-						const href = event.target.href ?? event.target.parentElement.href ?? event.target.parentElement.parentElement?.href;
+						const href = event.target.href ?? event.target.parentElement?.href ?? event.target.parentElement?.parentElement?.href;
 						if (href && (href.startsWith('${Schemas.codeSetting}'))) {
 							vscode.postMessage({ type: 'clickSetting', value: { uri: href, x: event.clientX, y: event.clientY }});
 						}
diff --git a/src/vs/workbench/contrib/userDataProfile/browser/media/userDataProfilesEditor.css b/src/vs/workbench/contrib/userDataProfile/browser/media/userDataProfilesEditor.css
index d36ff0ba87f..02eaff02887 100644
--- a/src/vs/workbench/contrib/userDataProfile/browser/media/userDataProfilesEditor.css
+++ b/src/vs/workbench/contrib/userDataProfile/browser/media/userDataProfilesEditor.css
@@ -199,17 +199,20 @@
 	width: 250px;
 }
 
-.profiles-editor .contents-container .profile-use-as-default-container {
+.profiles-editor .contents-container .profile-use-as-default-container,
+.profiles-editor .contents-container .profile-use-for-current-container {
 	display: flex;
 	align-items: center;
 	line-height: 22px;
 }
 
-.profiles-editor .contents-container .profile-body .profile-row-container .profile-use-as-default-container .profile-description-element {
+.profiles-editor .contents-container .profile-body .profile-row-container .profile-use-as-default-container .profile-description-element,
+.profiles-editor .contents-container .profile-body .profile-row-container .profile-use-for-current-container .profile-description-element {
 	margin-top: -1px;
 }
 
-.profiles-editor .contents-container .profile-use-as-default-container .profile-use-as-default-label {
+.profiles-editor .contents-container .profile-use-as-default-container .profile-use-as-default-label,
+.profiles-editor .contents-container .profile-use-for-current-container .profile-use-as-default-label {
 	margin-left: 2px;
 }
 
@@ -292,7 +295,8 @@
 
 .profiles-editor .contents-container .profile-body .profile-row-container.profile-button-container .monaco-button {
 	margin-right: 10px;
-	max-width: 80px;
+	width: inherit;
+	padding: 4px 10px;
 }
 
 /* Profile Editor Tree Theming */
@@ -305,7 +309,7 @@
 	background-color: var(--vscode-settings-rowHoverBackground) !important;
 }
 
-.profiles-editor .contents-container .profile-body .profile-tree .monaco-list-row.focused {
+.profiles-editor .contents-container .profile-body .profile-tree .monaco-list:focus .monaco-list-row.focused {
 	outline: 1px solid var(--vscode-settings-focusedRowBorder) !important;
 }
 
@@ -336,7 +340,7 @@
 	outline: none !important;
 }
 
-.profiles-editor .contents-container .profile-body .profile-tree .monaco-list-row .profile-content-tree .monaco-list-row .monaco-tl-twistie {
+.profiles-editor .contents-container .profile-body .profile-tree .monaco-list-row .profile-content-tree .monaco-list-row .monaco-tl-twistie.collapsible {
 	cursor: pointer;
 }
 
diff --git a/src/vs/workbench/contrib/userDataProfile/browser/userDataProfile.contribution.ts b/src/vs/workbench/contrib/userDataProfile/browser/userDataProfile.contribution.ts
index d08a579c6a2..d7846f15af5 100644
--- a/src/vs/workbench/contrib/userDataProfile/browser/userDataProfile.contribution.ts
+++ b/src/vs/workbench/contrib/userDataProfile/browser/userDataProfile.contribution.ts
@@ -3,13 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IWorkbenchContributionsRegistry, Extensions, WorkbenchPhase, registerWorkbenchContribution2 } from 'vs/workbench/common/contributions';
+import { WorkbenchPhase, registerWorkbenchContribution2 } from 'vs/workbench/common/contributions';
 import { UserDataProfilesWorkbenchContribution } from 'vs/workbench/contrib/userDataProfile/browser/userDataProfile';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
 import './userDataProfileActions';
-import { UserDataProfilePreviewContribution } from 'vs/workbench/contrib/userDataProfile/browser/userDataProfilePreview';
 
-const workbenchRegistry = Registry.as<IWorkbenchContributionsRegistry>(Extensions.Workbench);
 registerWorkbenchContribution2(UserDataProfilesWorkbenchContribution.ID, UserDataProfilesWorkbenchContribution, WorkbenchPhase.BlockRestore);
-workbenchRegistry.registerWorkbenchContribution(UserDataProfilePreviewContribution, LifecyclePhase.Restored);
diff --git a/src/vs/workbench/contrib/userDataProfile/browser/userDataProfile.ts b/src/vs/workbench/contrib/userDataProfile/browser/userDataProfile.ts
index eb549acd66f..034c20ab97a 100644
--- a/src/vs/workbench/contrib/userDataProfile/browser/userDataProfile.ts
+++ b/src/vs/workbench/contrib/userDataProfile/browser/userDataProfile.ts
@@ -7,20 +7,18 @@ import { Disposable, DisposableStore, IDisposable, MutableDisposable } from 'vs/
 import { isWeb } from 'vs/base/common/platform';
 import { ServicesAccessor } from 'vs/editor/browser/editorExtensions';
 import { localize, localize2 } from 'vs/nls';
-import { Action2, IMenuService, MenuId, MenuRegistry, registerAction2 } from 'vs/platform/actions/common/actions';
+import { Action2, MenuId, MenuRegistry, registerAction2 } from 'vs/platform/actions/common/actions';
 import { ContextKeyExpr, IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { IUserDataProfile, IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
 import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
 import { ILifecycleService, LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { CURRENT_PROFILE_CONTEXT, HAS_PROFILES_CONTEXT, IS_CURRENT_PROFILE_TRANSIENT_CONTEXT, IS_PROFILE_IMPORT_IN_PROGRESS_CONTEXT, IUserDataProfileImportExportService, IUserDataProfileManagementService, IUserDataProfileService, PROFILES_CATEGORY, PROFILE_FILTER, IS_PROFILE_EXPORT_IN_PROGRESS_CONTEXT, ProfilesMenu, PROFILES_ENABLEMENT_CONTEXT, PROFILES_TITLE, IProfileTemplateInfo } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
-import { IQuickInputService, IQuickPickItem, IQuickPickSeparator } from 'vs/platform/quickinput/common/quickInput';
+import { CURRENT_PROFILE_CONTEXT, HAS_PROFILES_CONTEXT, IS_CURRENT_PROFILE_TRANSIENT_CONTEXT, IUserDataProfileManagementService, IUserDataProfileService, PROFILES_CATEGORY, PROFILES_ENABLEMENT_CONTEXT, PROFILES_TITLE, isProfileURL } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
+import { IQuickInputService, IQuickPickItem } from 'vs/platform/quickinput/common/quickInput';
 import { INotificationService } from 'vs/platform/notification/common/notification';
-import { IFileDialogService } from 'vs/platform/dialogs/common/dialogs';
 import { URI } from 'vs/base/common/uri';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
+import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { IWorkspaceTagsService } from 'vs/workbench/contrib/tags/common/workspaceTags';
-import { getErrorMessage } from 'vs/base/common/errors';
 import { Categories } from 'vs/platform/action/common/actionCommonCategories';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
 import { Registry } from 'vs/platform/registry/common/platform';
@@ -31,17 +29,11 @@ import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
 import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IUserDataProfilesEditor } from 'vs/workbench/contrib/userDataProfile/common/userDataProfile';
-import { ConfigurationScope, Extensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
-import { workbenchConfigurationNodeBase } from 'vs/workbench/common/configuration';
-import { IProductService } from 'vs/platform/product/common/productService';
-
-type IProfileTemplateQuickPickItem = IQuickPickItem & IProfileTemplateInfo;
+import { IURLService } from 'vs/platform/url/common/url';
+import { IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService';
 
 export const OpenProfileMenu = new MenuId('OpenProfile');
-const CONFIG_ENABLE_NEW_PROFILES_UI = 'workbench.experimental.enableNewProfilesUI';
-const CONTEXT_ENABLE_NEW_PROFILES_UI = ContextKeyExpr.equals('config.workbench.experimental.enableNewProfilesUI', true);
 
 export class UserDataProfilesWorkbenchContribution extends Disposable implements IWorkbenchContribution {
 
@@ -50,22 +42,20 @@ export class UserDataProfilesWorkbenchContribution extends Disposable implements
 	private readonly currentProfileContext: IContextKey<string>;
 	private readonly isCurrentProfileTransientContext: IContextKey<boolean>;
 	private readonly hasProfilesContext: IContextKey<boolean>;
-	private readonly startTime: number = Date.now();
 
 	constructor(
 		@IUserDataProfileService private readonly userDataProfileService: IUserDataProfileService,
 		@IUserDataProfilesService private readonly userDataProfilesService: IUserDataProfilesService,
 		@IUserDataProfileManagementService private readonly userDataProfileManagementService: IUserDataProfileManagementService,
-		@IUserDataProfileImportExportService private readonly userDataProfileImportExportService: IUserDataProfileImportExportService,
 		@ITelemetryService private readonly telemetryService: ITelemetryService,
 		@IWorkspaceContextService private readonly workspaceContextService: IWorkspaceContextService,
 		@IWorkspaceTagsService private readonly workspaceTagsService: IWorkspaceTagsService,
 		@IContextKeyService contextKeyService: IContextKeyService,
-		@IConfigurationService private readonly configurationService: IConfigurationService,
 		@IEditorGroupsService private readonly editorGroupsService: IEditorGroupsService,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
-		@IProductService private readonly productService: IProductService,
 		@ILifecycleService private readonly lifecycleService: ILifecycleService,
+		@IURLService private readonly urlService: IURLService,
+		@IBrowserWorkbenchEnvironmentService environmentService: IBrowserWorkbenchEnvironmentService,
 	) {
 		super();
 
@@ -84,39 +74,36 @@ export class UserDataProfilesWorkbenchContribution extends Disposable implements
 		this.hasProfilesContext.set(this.userDataProfilesService.profiles.length > 1);
 		this._register(this.userDataProfilesService.onDidChangeProfiles(e => this.hasProfilesContext.set(this.userDataProfilesService.profiles.length > 1)));
 
-		this.registerConfiguration();
 		this.registerEditor();
 		this.registerActions();
 
+		this._register(this.urlService.registerHandler(this));
+
 		if (isWeb) {
 			lifecycleService.when(LifecyclePhase.Eventually).then(() => userDataProfilesService.cleanUp());
 		}
 
 		this.reportWorkspaceProfileInfo();
-	}
 
-	private async openProfilesEditor(): Promise<IUserDataProfilesEditor | undefined> {
-		const editor = await this.editorGroupsService.activeGroup.openEditor(new UserDataProfilesEditorInput(this.instantiationService));
-		return editor as IUserDataProfilesEditor;
+		if (environmentService.options?.profileToPreview) {
+			lifecycleService.when(LifecyclePhase.Restored).then(() => this.handleURL(URI.revive(environmentService.options!.profileToPreview!)));
+		}
 	}
 
-	private isNewProfilesUIEnabled(): boolean {
-		return this.configurationService.getValue(CONFIG_ENABLE_NEW_PROFILES_UI) === true;
+	async handleURL(uri: URI): Promise<boolean> {
+		if (isProfileURL(uri)) {
+			const editor = await this.openProfilesEditor();
+			if (editor) {
+				editor.createNewProfile(uri);
+				return true;
+			}
+		}
+		return false;
 	}
 
-	private registerConfiguration(): void {
-		Registry.as<IConfigurationRegistry>(Extensions.Configuration)
-			.registerConfiguration({
-				...workbenchConfigurationNodeBase,
-				properties: {
-					[CONFIG_ENABLE_NEW_PROFILES_UI]: {
-						type: 'boolean',
-						description: localize('enable new profiles UI', "Enables the new profiles UI."),
-						default: this.productService.quality !== 'stable',
-						scope: ConfigurationScope.APPLICATION,
-					}
-				}
-			});
+	private async openProfilesEditor(): Promise<IUserDataProfilesEditor | undefined> {
+		const editor = await this.editorGroupsService.activeGroup.openEditor(new UserDataProfilesEditorInput(this.instantiationService));
+		return editor as IUserDataProfilesEditor;
 	}
 
 	private registerEditor(): void {
@@ -134,7 +121,6 @@ export class UserDataProfilesWorkbenchContribution extends Disposable implements
 	}
 
 	private registerActions(): void {
-		this.registerProfileSubMenu();
 		this._register(this.registerManageProfilesAction());
 		this._register(this.registerSwitchProfileAction());
 
@@ -143,8 +129,7 @@ export class UserDataProfilesWorkbenchContribution extends Disposable implements
 		this.registerProfilesActions();
 		this._register(this.userDataProfilesService.onDidChangeProfiles(() => this.registerProfilesActions()));
 
-		this.registerCurrentProfilesActions();
-		this._register(this.userDataProfileService.onDidChangeCurrentProfile(() => this.registerCurrentProfilesActions()));
+		this._register(this.registerExportCurrentProfileAction());
 
 		this.registerCreateFromCurrentProfileAction();
 		this.registerNewProfileAction();
@@ -153,31 +138,6 @@ export class UserDataProfilesWorkbenchContribution extends Disposable implements
 		this.registerHelpAction();
 	}
 
-	private registerProfileSubMenu(): void {
-		const getProfilesTitle = () => {
-			return localize('profiles', "Profile ({0})", this.userDataProfileService.currentProfile.name);
-		};
-		const when = ContextKeyExpr.or(CONTEXT_ENABLE_NEW_PROFILES_UI.negate(), HAS_PROFILES_CONTEXT);
-		MenuRegistry.appendMenuItem(MenuId.GlobalActivity, {
-			get title() {
-				return getProfilesTitle();
-			},
-			submenu: ProfilesMenu,
-			group: '2_configuration',
-			order: 1,
-			when,
-		});
-		MenuRegistry.appendMenuItem(MenuId.MenubarPreferencesMenu, {
-			get title() {
-				return getProfilesTitle();
-			},
-			submenu: ProfilesMenu,
-			group: '2_configuration',
-			order: 1,
-			when,
-		});
-	}
-
 	private registerOpenProfileSubMenu(): void {
 		MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
 			title: localize('New Profile Window', "New Window with Profile"),
@@ -192,50 +152,11 @@ export class UserDataProfilesWorkbenchContribution extends Disposable implements
 		this.profilesDisposable.value = new DisposableStore();
 		for (const profile of this.userDataProfilesService.profiles) {
 			if (!profile.isTransient) {
-				this.profilesDisposable.value.add(this.registerProfileEntryAction(profile));
 				this.profilesDisposable.value.add(this.registerNewWindowAction(profile));
 			}
 		}
 	}
 
-	private registerProfileEntryAction(profile: IUserDataProfile): IDisposable {
-		const that = this;
-		return registerAction2(class ProfileEntryAction extends Action2 {
-			constructor() {
-				super({
-					id: `workbench.profiles.actions.profileEntry.${profile.id}`,
-					title: profile.name,
-					toggled: ContextKeyExpr.equals(CURRENT_PROFILE_CONTEXT.key, profile.id),
-					menu: [
-						{
-							id: ProfilesMenu,
-							group: '0_profiles',
-							when: PROFILES_ENABLEMENT_CONTEXT,
-						}
-					]
-				});
-			}
-			async run(accessor: ServicesAccessor) {
-				if (that.userDataProfileService.currentProfile.id !== profile.id) {
-					if (profile.isDefault && Date.now() - that.startTime < (1000 * 20 /* 20 seconds */)) {
-						type SwitchToDefaultProfileInfoClassification = {
-							owner: 'sandy081';
-							comment: 'Report if the user switches to the default profile.';
-							emptyWindow: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'If the current window is empty window or not' };
-						};
-						type SwitchToDefaultProfileInfoEvent = {
-							emptyWindow: boolean;
-						};
-						that.telemetryService.publicLog2<SwitchToDefaultProfileInfoEvent, SwitchToDefaultProfileInfoClassification>('profiles:newwindowprofile', {
-							emptyWindow: that.workspaceContextService.getWorkbenchState() === WorkbenchState.EMPTY
-						});
-					}
-					return that.userDataProfileManagementService.switchProfile(profile);
-				}
-			}
-		});
-	}
-
 	private registerNewWindowWithProfileAction(): IDisposable {
 		return registerAction2(class NewWindowWithProfileAction extends Action2 {
 			constructor() {
@@ -272,7 +193,7 @@ export class UserDataProfilesWorkbenchContribution extends Disposable implements
 	private registerNewWindowAction(profile: IUserDataProfile): IDisposable {
 		const disposables = new DisposableStore();
 
-		const id = `workbench.action.openProfile.${profile.name.toLowerCase().replace('/\s+/', '_')}`;
+		const id = `workbench.action.openProfile.${profile.name.replace('/\s+/', '_')}`;
 
 		disposables.add(registerAction2(class NewWindowAction extends Action2 {
 
@@ -307,6 +228,7 @@ export class UserDataProfilesWorkbenchContribution extends Disposable implements
 	}
 
 	private registerSwitchProfileAction(): IDisposable {
+		const that = this;
 		return registerAction2(class SwitchProfileAction extends Action2 {
 			constructor() {
 				super({
@@ -319,30 +241,26 @@ export class UserDataProfilesWorkbenchContribution extends Disposable implements
 			}
 			async run(accessor: ServicesAccessor) {
 				const quickInputService = accessor.get(IQuickInputService);
-				const menuService = accessor.get(IMenuService);
-				const menu = menuService.getMenuActions(ProfilesMenu, accessor.get(IContextKeyService));
-				const actions = menu.find(([group]) => group === '0_profiles')?.[1] ?? [];
-				const result = await quickInputService.pick(actions.map(action => ({
-					action,
-					label: action.checked ? `$(check) ${action.label}` : action.label,
-				})), {
+
+				const items: Array<IQuickPickItem & { profile: IUserDataProfile }> = [];
+				for (const profile of that.userDataProfilesService.profiles) {
+					items.push({
+						id: profile.id,
+						label: profile.id === that.userDataProfileService.currentProfile.id ? `$(check) ${profile.name}` : profile.name,
+						profile,
+					});
+				}
+
+				const result = await quickInputService.pick(items.sort((a, b) => a.profile.name.localeCompare(b.profile.name)), {
 					placeHolder: localize('selectProfile', "Select Profile")
 				});
-				await result?.action.run();
-
+				if (result) {
+					await that.userDataProfileManagementService.switchProfile(result.profile);
+				}
 			}
 		});
 	}
 
-	private readonly currentprofileActionsDisposable = this._register(new MutableDisposable<DisposableStore>());
-	private registerCurrentProfilesActions(): void {
-		this.currentprofileActionsDisposable.value = new DisposableStore();
-		this.currentprofileActionsDisposable.value.add(this.registerEditCurrentProfileAction());
-		this.currentprofileActionsDisposable.value.add(this.registerShowCurrentProfileContentsAction());
-		this.currentprofileActionsDisposable.value.add(this.registerExportCurrentProfileAction());
-		this.currentprofileActionsDisposable.value.add(this.registerImportProfileAction());
-	}
-
 	private registerManageProfilesAction(): IDisposable {
 		const disposables = new DisposableStore();
 		disposables.add(registerAction2(class ManageProfilesAction extends Action2 {
@@ -358,18 +276,11 @@ export class UserDataProfilesWorkbenchContribution extends Disposable implements
 							id: MenuId.GlobalActivity,
 							group: '2_configuration',
 							order: 1,
-							when: ContextKeyExpr.and(CONTEXT_ENABLE_NEW_PROFILES_UI, HAS_PROFILES_CONTEXT.negate()),
 						},
 						{
 							id: MenuId.MenubarPreferencesMenu,
 							group: '2_configuration',
 							order: 1,
-							when: ContextKeyExpr.and(CONTEXT_ENABLE_NEW_PROFILES_UI, HAS_PROFILES_CONTEXT.negate()),
-						},
-						{
-							id: ProfilesMenu,
-							group: '1_manage',
-							when: ContextKeyExpr.and(CONTEXT_ENABLE_NEW_PROFILES_UI, HAS_PROFILES_CONTEXT),
 						},
 					]
 				});
@@ -385,69 +296,12 @@ export class UserDataProfilesWorkbenchContribution extends Disposable implements
 				id: 'workbench.profiles.actions.manageProfiles',
 				category: Categories.Preferences,
 				title: localize2('open profiles', "Open Profiles (UI)"),
-				precondition: CONTEXT_ENABLE_NEW_PROFILES_UI,
 			},
 		}));
 
 		return disposables;
 	}
 
-	private registerEditCurrentProfileAction(): IDisposable {
-		const that = this;
-		return registerAction2(class RenameCurrentProfileAction extends Action2 {
-			constructor() {
-				const precondition = ContextKeyExpr.and(ContextKeyExpr.notEquals(CURRENT_PROFILE_CONTEXT.key, that.userDataProfilesService.defaultProfile.id), IS_CURRENT_PROFILE_TRANSIENT_CONTEXT.toNegated());
-				super({
-					id: `workbench.profiles.actions.editCurrentProfile`,
-					title: localize2('edit profile', "Edit Profile..."),
-					precondition,
-					f1: true,
-					menu: [
-						{
-							id: ProfilesMenu,
-							group: '2_manage_current',
-							when: ContextKeyExpr.and(precondition, CONTEXT_ENABLE_NEW_PROFILES_UI.negate()),
-							order: 2
-						}
-					]
-				});
-			}
-			run(accessor: ServicesAccessor) {
-				if (that.isNewProfilesUIEnabled()) {
-					return that.openProfilesEditor();
-				} else {
-					return that.userDataProfileImportExportService.editProfile(that.userDataProfileService.currentProfile);
-				}
-			}
-		});
-	}
-
-	private registerShowCurrentProfileContentsAction(): IDisposable {
-		const id = 'workbench.profiles.actions.showProfileContents';
-		return registerAction2(class ShowProfileContentsAction extends Action2 {
-			constructor() {
-				super({
-					id,
-					title: localize2('show profile contents', "Show Profile Contents"),
-					category: PROFILES_CATEGORY,
-					menu: [
-						{
-							id: ProfilesMenu,
-							group: '2_manage_current',
-							order: 3,
-							when: CONTEXT_ENABLE_NEW_PROFILES_UI.negate()
-						}
-					]
-				});
-			}
-
-			async run(accessor: ServicesAccessor) {
-				const userDataProfileImportExportService = accessor.get(IUserDataProfileImportExportService);
-				return userDataProfileImportExportService.showProfileContents();
-			}
-		});
-	}
-
 	private registerExportCurrentProfileAction(): IDisposable {
 		const that = this;
 		const disposables = new DisposableStore();
@@ -458,26 +312,13 @@ export class UserDataProfilesWorkbenchContribution extends Disposable implements
 					id,
 					title: localize2('export profile', "Export Profile..."),
 					category: PROFILES_CATEGORY,
-					precondition: IS_PROFILE_EXPORT_IN_PROGRESS_CONTEXT.toNegated(),
-					menu: [
-						{
-							id: ProfilesMenu,
-							group: '4_import_export_profiles',
-							order: 1,
-							when: CONTEXT_ENABLE_NEW_PROFILES_UI.negate(),
-						}, {
-							id: MenuId.CommandPalette
-						}
-					]
+					f1: true,
 				});
 			}
 
-			async run(accessor: ServicesAccessor) {
-				if (that.isNewProfilesUIEnabled()) {
-					return that.openProfilesEditor();
-				} else {
-					return that.userDataProfileImportExportService.exportProfile2();
-				}
+			async run() {
+				const editor = await that.openProfilesEditor();
+				editor?.selectProfile(that.userDataProfileService.currentProfile);
 			}
 		}));
 		disposables.add(MenuRegistry.appendMenuItem(MenuId.MenubarShare, {
@@ -490,108 +331,6 @@ export class UserDataProfilesWorkbenchContribution extends Disposable implements
 		return disposables;
 	}
 
-	private registerImportProfileAction(): IDisposable {
-		const disposables = new DisposableStore();
-		const id = 'workbench.profiles.actions.importProfile';
-		const that = this;
-		disposables.add(registerAction2(class ImportProfileAction extends Action2 {
-			constructor() {
-				super({
-					id,
-					title: localize2('import profile', "Import Profile..."),
-					category: PROFILES_CATEGORY,
-					precondition: IS_PROFILE_IMPORT_IN_PROGRESS_CONTEXT.toNegated(),
-					menu: [
-						{
-							id: ProfilesMenu,
-							group: '4_import_export_profiles',
-							when: ContextKeyExpr.and(PROFILES_ENABLEMENT_CONTEXT, CONTEXT_ENABLE_NEW_PROFILES_UI.negate()),
-							order: 2
-						}, {
-							id: MenuId.CommandPalette,
-							when: PROFILES_ENABLEMENT_CONTEXT,
-						}
-					]
-				});
-			}
-
-			async run(accessor: ServicesAccessor) {
-				const fileDialogService = accessor.get(IFileDialogService);
-				const quickInputService = accessor.get(IQuickInputService);
-				const userDataProfileImportExportService = accessor.get(IUserDataProfileImportExportService);
-				const notificationService = accessor.get(INotificationService);
-
-				const disposables = new DisposableStore();
-				const quickPick = disposables.add(quickInputService.createQuickPick());
-				const profileTemplateQuickPickItems = await that.getProfileTemplatesQuickPickItems();
-
-				const updateQuickPickItems = (value?: string) => {
-					const quickPickItems: (IQuickPickItem | IQuickPickSeparator)[] = [];
-					if (value) {
-						quickPickItems.push({ label: quickPick.value, description: localize('import from url', "Import from URL") });
-					}
-					quickPickItems.push({ label: localize('import from file', "Select File...") });
-					if (profileTemplateQuickPickItems.length) {
-						quickPickItems.push({
-							type: 'separator',
-							label: localize('templates', "Profile Templates")
-						}, ...profileTemplateQuickPickItems);
-					}
-					quickPick.items = quickPickItems;
-				};
-
-				quickPick.title = localize('import profile quick pick title', "Import from Profile Template...");
-				quickPick.placeholder = localize('import profile placeholder', "Provide Profile Template URL");
-				quickPick.ignoreFocusOut = true;
-				disposables.add(quickPick.onDidChangeValue(updateQuickPickItems));
-				updateQuickPickItems();
-				quickPick.matchOnLabel = false;
-				quickPick.matchOnDescription = false;
-				disposables.add(quickPick.onDidAccept(async () => {
-					quickPick.hide();
-					const selectedItem = quickPick.selectedItems[0];
-					if (!selectedItem) {
-						return;
-					}
-					try {
-						if ((<IProfileTemplateQuickPickItem>selectedItem).url) {
-							return await that.userDataProfileImportExportService.createProfile(URI.parse((<IProfileTemplateQuickPickItem>selectedItem).url));
-						}
-						const profile = selectedItem.label === quickPick.value ? URI.parse(quickPick.value) : await this.getProfileUriFromFileSystem(fileDialogService);
-						if (profile) {
-							await userDataProfileImportExportService.importProfile(profile);
-						}
-					} catch (error) {
-						notificationService.error(localize('profile import error', "Error while creating profile: {0}", getErrorMessage(error)));
-					}
-				}));
-				disposables.add(quickPick.onDidHide(() => disposables.dispose()));
-				quickPick.show();
-			}
-
-			private async getProfileUriFromFileSystem(fileDialogService: IFileDialogService): Promise<URI | null> {
-				const profileLocation = await fileDialogService.showOpenDialog({
-					canSelectFolders: false,
-					canSelectFiles: true,
-					canSelectMany: false,
-					filters: PROFILE_FILTER,
-					title: localize('import profile dialog', "Select Profile Template File"),
-				});
-				if (!profileLocation) {
-					return null;
-				}
-				return profileLocation[0];
-			}
-		}));
-		disposables.add(MenuRegistry.appendMenuItem(MenuId.MenubarShare, {
-			command: {
-				id,
-				title: localize2('import profile share', "Import Profile..."),
-				precondition: PROFILES_ENABLEMENT_CONTEXT,
-			},
-		}));
-		return disposables;
-	}
 
 	private registerCreateFromCurrentProfileAction(): void {
 		const that = this;
@@ -606,8 +345,9 @@ export class UserDataProfilesWorkbenchContribution extends Disposable implements
 				});
 			}
 
-			run(accessor: ServicesAccessor) {
-				return that.userDataProfileImportExportService.createProfile(that.userDataProfileService.currentProfile);
+			async run() {
+				const editor = await that.openProfilesEditor();
+				editor?.createNewProfile(that.userDataProfileService.currentProfile);
 			}
 		}));
 	}
@@ -623,12 +363,6 @@ export class UserDataProfilesWorkbenchContribution extends Disposable implements
 					precondition: PROFILES_ENABLEMENT_CONTEXT,
 					f1: true,
 					menu: [
-						{
-							id: ProfilesMenu,
-							group: '3_manage_profiles',
-							when: ContextKeyExpr.and(PROFILES_ENABLEMENT_CONTEXT, CONTEXT_ENABLE_NEW_PROFILES_UI.negate()),
-							order: 1
-						},
 						{
 							id: OpenProfileMenu,
 							group: '1_manage_profiles',
@@ -639,12 +373,8 @@ export class UserDataProfilesWorkbenchContribution extends Disposable implements
 			}
 
 			async run(accessor: ServicesAccessor) {
-				if (that.isNewProfilesUIEnabled()) {
-					const editor = await that.openProfilesEditor();
-					return editor?.createNewProfile();
-				} else {
-					return that.userDataProfileImportExportService.createProfile();
-				}
+				const editor = await that.openProfilesEditor();
+				return editor?.createNewProfile();
 			}
 		}));
 	}
@@ -658,14 +388,6 @@ export class UserDataProfilesWorkbenchContribution extends Disposable implements
 					category: PROFILES_CATEGORY,
 					f1: true,
 					precondition: ContextKeyExpr.and(PROFILES_ENABLEMENT_CONTEXT, HAS_PROFILES_CONTEXT),
-					menu: [
-						{
-							id: ProfilesMenu,
-							group: '3_manage_profiles',
-							when: ContextKeyExpr.and(PROFILES_ENABLEMENT_CONTEXT, CONTEXT_ENABLE_NEW_PROFILES_UI.negate()),
-							order: 2
-						}
-					]
 				});
 			}
 
@@ -719,18 +441,6 @@ export class UserDataProfilesWorkbenchContribution extends Disposable implements
 		}));
 	}
 
-	private async getProfileTemplatesQuickPickItems(): Promise<IProfileTemplateQuickPickItem[]> {
-		const quickPickItems: IProfileTemplateQuickPickItem[] = [];
-		const profileTemplates = await this.userDataProfileManagementService.getBuiltinProfileTemplates();
-		for (const template of profileTemplates) {
-			quickPickItems.push({
-				label: template.name,
-				...template
-			});
-		}
-		return quickPickItems;
-	}
-
 	private async reportWorkspaceProfileInfo(): Promise<void> {
 		await this.lifecycleService.when(LifecyclePhase.Eventually);
 		const workspaceId = await this.workspaceTagsService.getTelemetryWorkspaceId(this.workspaceContextService.getWorkspace(), this.workspaceContextService.getWorkbenchState());
diff --git a/src/vs/workbench/contrib/userDataProfile/browser/userDataProfileActions.ts b/src/vs/workbench/contrib/userDataProfile/browser/userDataProfileActions.ts
index c19f31930f8..be347051b13 100644
--- a/src/vs/workbench/contrib/userDataProfile/browser/userDataProfileActions.ts
+++ b/src/vs/workbench/contrib/userDataProfile/browser/userDataProfileActions.ts
@@ -3,19 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IAction, Separator } from 'vs/base/common/actions';
-import { Codicon } from 'vs/base/common/codicons';
-import { localize, localize2 } from 'vs/nls';
+import { localize2 } from 'vs/nls';
 import { Categories } from 'vs/platform/action/common/actionCommonCategories';
-import { createAndFillInActionBarActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
-import { Action2, IMenuService, registerAction2 } from 'vs/platform/actions/common/actions';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { ContextKeyExpr, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
+import { Action2, registerAction2 } from 'vs/platform/actions/common/actions';
 import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { IQuickInputService, QuickPickItem } from 'vs/platform/quickinput/common/quickInput';
-import { IUserDataProfile, IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { HAS_PROFILES_CONTEXT, IUserDataProfileManagementService, IUserDataProfileService, MANAGE_PROFILES_ACTION_ID, PROFILES_CATEGORY, PROFILES_ENABLEMENT_CONTEXT, ProfilesMenu } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
+import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
+import { IUserDataProfileManagementService, PROFILES_CATEGORY, PROFILES_ENABLEMENT_CONTEXT } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
 
 class CreateTransientProfileAction extends Action2 {
 	static readonly ID = 'workbench.profiles.actions.createTemporaryProfile';
@@ -37,111 +30,6 @@ class CreateTransientProfileAction extends Action2 {
 
 registerAction2(CreateTransientProfileAction);
 
-export class RenameProfileAction extends Action2 {
-	static readonly ID = 'workbench.profiles.actions.renameProfile';
-	constructor() {
-		super({
-			id: RenameProfileAction.ID,
-			title: localize2('rename profile', "Rename..."),
-			category: PROFILES_CATEGORY,
-			f1: true,
-			precondition: ContextKeyExpr.and(PROFILES_ENABLEMENT_CONTEXT, HAS_PROFILES_CONTEXT),
-		});
-	}
-
-	async run(accessor: ServicesAccessor, profile?: IUserDataProfile) {
-		const quickInputService = accessor.get(IQuickInputService);
-		const userDataProfileService = accessor.get(IUserDataProfileService);
-		const userDataProfilesService = accessor.get(IUserDataProfilesService);
-		const userDataProfileManagementService = accessor.get(IUserDataProfileManagementService);
-		const notificationService = accessor.get(INotificationService);
-
-		if (!profile) {
-			profile = await this.pickProfile(quickInputService, userDataProfileService, userDataProfilesService);
-		}
-
-		if (!profile || profile.isDefault) {
-			return;
-		}
-
-		const name = await quickInputService.input({
-			value: profile.name,
-			title: localize('select profile to rename', 'Rename {0}', profile.name),
-			validateInput: async (value: string) => {
-				if (profile.name !== value && userDataProfilesService.profiles.some(p => p.name === value)) {
-					return localize('profileExists', "Profile with name {0} already exists.", value);
-				}
-				return undefined;
-			}
-		});
-		if (name && name !== profile.name) {
-			try {
-				await userDataProfileManagementService.updateProfile(profile, { name });
-			} catch (error) {
-				notificationService.error(error);
-			}
-		}
-	}
-
-	private async pickProfile(quickInputService: IQuickInputService, userDataProfileService: IUserDataProfileService, userDataProfilesService: IUserDataProfilesService): Promise<IUserDataProfile | undefined> {
-		const profiles = userDataProfilesService.profiles.filter(p => !p.isDefault && !p.isTransient);
-		if (!profiles.length) {
-			return undefined;
-		}
-		const pick = await quickInputService.pick(
-			profiles.map(profile => ({
-				label: profile.name,
-				description: profile.id === userDataProfileService.currentProfile.id ? localize('current', "Current") : undefined,
-				profile
-			})),
-			{
-				title: localize('rename specific profile', "Rename Profile..."),
-				placeHolder: localize('pick profile to rename', "Select Profile to Rename"),
-			});
-		return pick?.profile;
-	}
-}
-
-registerAction2(RenameProfileAction);
-
-registerAction2(class ManageProfilesAction extends Action2 {
-	constructor() {
-		super({
-			id: MANAGE_PROFILES_ACTION_ID,
-			title: localize2('mange', "Manage..."),
-			category: PROFILES_CATEGORY,
-			precondition: ContextKeyExpr.and(PROFILES_ENABLEMENT_CONTEXT, HAS_PROFILES_CONTEXT),
-		});
-	}
-
-	async run(accessor: ServicesAccessor) {
-		const quickInputService = accessor.get(IQuickInputService);
-		const menuService = accessor.get(IMenuService);
-		const contextKeyService = accessor.get(IContextKeyService);
-		const commandService = accessor.get(ICommandService);
-
-		const menu = menuService.getMenuActions(ProfilesMenu, contextKeyService);
-		const actions: IAction[] = [];
-		createAndFillInActionBarActions(menu, actions);
-
-		if (actions.length) {
-			const picks: QuickPickItem[] = actions.map(action => {
-				if (action instanceof Separator) {
-					return { type: 'separator' };
-				}
-				return {
-					id: action.id,
-					label: `${action.label}${action.checked ? ` $(${Codicon.check.id})` : ''}`,
-				};
-			});
-			const pick = await quickInputService.pick(picks, { canPickMany: false, title: PROFILES_CATEGORY.value });
-			if (pick?.id) {
-				await commandService.executeCommand(pick.id);
-			}
-		}
-	}
-});
-
 // Developer Actions
 
 registerAction2(class CleanupProfilesAction extends Action2 {
diff --git a/src/vs/workbench/contrib/userDataProfile/browser/userDataProfilePreview.ts b/src/vs/workbench/contrib/userDataProfile/browser/userDataProfilePreview.ts
deleted file mode 100644
index 4dd3d92a761..00000000000
--- a/src/vs/workbench/contrib/userDataProfile/browser/userDataProfilePreview.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import { getErrorMessage } from 'vs/base/common/errors';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { URI } from 'vs/base/common/uri';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService';
-import { IUserDataProfileImportExportService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
-
-export class UserDataProfilePreviewContribution extends Disposable implements IWorkbenchContribution {
-
-	constructor(
-		@IBrowserWorkbenchEnvironmentService environmentService: IBrowserWorkbenchEnvironmentService,
-		@IUserDataProfileImportExportService userDataProfileImportExportService: IUserDataProfileImportExportService,
-		@ILogService logService: ILogService
-	) {
-		super();
-		if (environmentService.options?.profileToPreview) {
-			userDataProfileImportExportService.importProfile(URI.revive(environmentService.options.profileToPreview), { mode: 'both' })
-				.then(null, error => logService.error('Error while previewing the profile', getErrorMessage(error)));
-		}
-	}
-
-}
diff --git a/src/vs/workbench/contrib/userDataProfile/browser/userDataProfilesEditor.ts b/src/vs/workbench/contrib/userDataProfile/browser/userDataProfilesEditor.ts
index 87de3af2e7c..17ddb9cb36d 100644
--- a/src/vs/workbench/contrib/userDataProfile/browser/userDataProfilesEditor.ts
+++ b/src/vs/workbench/contrib/userDataProfile/browser/userDataProfilesEditor.ts
@@ -20,7 +20,7 @@ import { IEditorOpenContext, IEditorSerializer, IUntypedEditorInput } from 'vs/w
 import { EditorInput } from 'vs/workbench/common/editor/editorInput';
 import { IUserDataProfilesEditor } from 'vs/workbench/contrib/userDataProfile/common/userDataProfile';
 import { IEditorGroup } from 'vs/workbench/services/editor/common/editorGroupsService';
-import { defaultUserDataProfileIcon, IProfileTemplateInfo, PROFILE_FILTER } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
+import { defaultUserDataProfileIcon, IProfileTemplateInfo, IUserDataProfileService, PROFILE_FILTER } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
 import { Orientation, Sizing, SplitView } from 'vs/base/browser/ui/splitview/splitview';
 import { Button, ButtonWithDropdown } from 'vs/base/browser/ui/button/button';
 import { defaultButtonStyles, defaultCheckboxStyles, defaultInputBoxStyles, defaultSelectBoxStyles, getInputBoxStyle, getListStyles } from 'vs/platform/theme/browser/defaultStyles';
@@ -92,6 +92,7 @@ export class UserDataProfilesEditor extends EditorPane implements IUserDataProfi
 	private profileWidget: ProfileWidget | undefined;
 
 	private model: UserDataProfilesEditorModel | undefined;
+	private templates: readonly IProfileTemplateInfo[] = [];
 
 	constructor(
 		group: IEditorGroup,
@@ -207,7 +208,7 @@ export class UserDataProfilesEditor extends EditorPane implements IUserDataProfi
 			actions: {
 				getActions: () => {
 					const actions: IAction[] = [];
-					if (this.model?.templates.length) {
+					if (this.templates.length) {
 						actions.push(new SubmenuAction('from.template', localize('from template', "From Template"), this.getCreateFromTemplateActions()));
 						actions.push(new Separator());
 					}
@@ -225,15 +226,13 @@ export class UserDataProfilesEditor extends EditorPane implements IUserDataProfi
 	}
 
 	private getCreateFromTemplateActions(): IAction[] {
-		return this.model
-			? this.model.templates.map(template =>
-				new Action(
-					`template:${template.url}`,
-					template.name,
-					undefined,
-					true,
-					() => this.createNewProfile(URI.parse(template.url))))
-			: [];
+		return this.templates.map(template =>
+			new Action(
+				`template:${template.url}`,
+				template.name,
+				undefined,
+				true,
+				() => this.createNewProfile(URI.parse(template.url))));
 	}
 
 	private registerListeners(): void {
@@ -319,6 +318,13 @@ export class UserDataProfilesEditor extends EditorPane implements IUserDataProfi
 		await this.model?.createNewProfile(copyFrom);
 	}
 
+	selectProfile(profile: IUserDataProfile): void {
+		const index = this.model?.profiles.findIndex(p => p instanceof UserDataProfileElement && p.profile.id === profile.id);
+		if (index !== undefined && index >= 0) {
+			this.profilesList?.setSelection([index]);
+		}
+	}
+
 	private async getProfileUriFromFileSystem(): Promise<URI | null> {
 		const profileLocation = await this.fileDialogService.showOpenDialog({
 			canSelectFolders: false,
@@ -336,9 +342,12 @@ export class UserDataProfilesEditor extends EditorPane implements IUserDataProfi
 	override async setInput(input: UserDataProfilesEditorInput, options: IEditorOptions | undefined, context: IEditorOpenContext, token: CancellationToken): Promise<void> {
 		await super.setInput(input, options, context, token);
 		this.model = await input.resolve();
-		if (this.profileWidget) {
-			this.profileWidget.templates = this.model.templates;
-		}
+		this.model.getTemplates().then(templates => {
+			this.templates = templates;
+			if (this.profileWidget) {
+				this.profileWidget.templates = templates;
+			}
+		});
 		this.updateProfilesList();
 		this._register(this.model.onDidChange(element =>
 			this.updateProfilesList(element)));
@@ -411,7 +420,7 @@ class ProfileElementRenderer implements IListRenderer<AbstractUserDataProfileEle
 		const label = append(container, $('.profile-list-item-label'));
 		const dirty = append(container, $(`span${ThemeIcon.asCSSSelector(Codicon.circleFilled)}`));
 		const description = append(container, $('.profile-list-item-description'));
-		append(description, $('span', undefined, localize('activeProfile', "In use")));
+		append(description, $(`span${ThemeIcon.asCSSSelector(Codicon.check)}`), $('span', undefined, localize('activeProfile', "In use")));
 
 		const actionsContainer = append(container, $('.profile-tree-item-actions-container'));
 		const actionBar = disposables.add(this.instantiationService.createInstance(WorkbenchToolBar,
@@ -501,6 +510,7 @@ class ProfileWidget extends Disposable {
 			[
 				this._register(this.instantiationService.createInstance(ProfileNameRenderer)),
 				this._register(this.instantiationService.createInstance(ProfileIconRenderer)),
+				this._register(this.instantiationService.createInstance(UseForCurrentWindowPropertyRenderer)),
 				this._register(this.instantiationService.createInstance(UseAsDefaultProfileRenderer)),
 				this.copyFromProfileRenderer,
 				contentsRenderer,
@@ -566,6 +576,13 @@ class ProfileWidget extends Disposable {
 	}
 
 	render(profileElement: AbstractUserDataProfileElement): void {
+		if (this._profileElement.value?.element === profileElement) {
+			return;
+		}
+
+		if (this._profileElement.value?.element instanceof UserDataProfileElement) {
+			this._profileElement.value.element.reset();
+		}
 		this.profileTree.setInput(profileElement);
 
 		const disposables = new DisposableStore();
@@ -642,7 +659,7 @@ class ProfileWidget extends Disposable {
 
 }
 
-type ProfileProperty = 'name' | 'icon' | 'copyFrom' | 'useAsDefault' | 'contents';
+type ProfileProperty = 'name' | 'icon' | 'copyFrom' | 'useForCurrent' | 'useAsDefault' | 'contents';
 
 interface ProfileTreeElement {
 	element: ProfileProperty;
@@ -667,6 +684,7 @@ class ProfileTreeDelegate extends CachedListVirtualDelegate<ProfileTreeElement>
 				return 68;
 			case 'copyFrom':
 				return 90;
+			case 'useForCurrent':
 			case 'useAsDefault':
 				return 68;
 			case 'contents':
@@ -886,7 +904,7 @@ class ProfileNameRenderer extends ProfilePropertyRenderer {
 						}
 						const initialName = profileElement?.root.getInitialName();
 						value = value.trim();
-						if (initialName !== value && this.userDataProfilesService.profiles.some(p => p.name === value)) {
+						if (initialName !== value && this.userDataProfilesService.profiles.some(p => !p.isTransient && p.name === value)) {
 							return {
 								content: localize('profileExists', "Profile with name {0} already exists.", value),
 								type: MessageType.WARNING
@@ -897,7 +915,6 @@ class ProfileNameRenderer extends ProfilePropertyRenderer {
 				}
 			}
 		));
-		disposables.add(this.userDataProfilesService.onDidChangeProfiles(() => nameInput.validate()));
 		nameInput.onDidChange(value => {
 			if (profileElement && value) {
 				profileElement.root.name = value;
@@ -928,6 +945,9 @@ class ProfileNameRenderer extends ProfilePropertyRenderer {
 					if (e.name || e.disabled) {
 						renderName(element);
 					}
+					if (e.profile) {
+						nameInput.validate();
+					}
 				}));
 			},
 			disposables,
@@ -1040,6 +1060,63 @@ class ProfileIconRenderer extends ProfilePropertyRenderer {
 	}
 }
 
+class UseForCurrentWindowPropertyRenderer extends ProfilePropertyRenderer {
+
+	readonly templateId: ProfileProperty = 'useForCurrent';
+
+	constructor(
+		@IUserDataProfileService private readonly userDataProfileService: IUserDataProfileService,
+	) {
+		super();
+	}
+
+	renderTemplate(parent: HTMLElement): IProfilePropertyRendererTemplate {
+		const disposables = new DisposableStore();
+		const elementDisposables = disposables.add(new DisposableStore());
+		let profileElement: ProfileTreeElement | undefined;
+
+		const useForCurrentWindowContainer = append(parent, $('.profile-row-container'));
+		append(useForCurrentWindowContainer, $('.profile-label-element', undefined, localize('use for curren window', "Use for Current Window")));
+		const useForCurrentWindowValueContainer = append(useForCurrentWindowContainer, $('.profile-use-for-current-container'));
+		const useForCurrentWindowTitle = localize('enable for current window', "Use this profile for the current window");
+		const useForCurrentWindowCheckbox = disposables.add(new Checkbox(useForCurrentWindowTitle, false, defaultCheckboxStyles));
+		append(useForCurrentWindowValueContainer, useForCurrentWindowCheckbox.domNode);
+		const useForCurrentWindowLabel = append(useForCurrentWindowValueContainer, $('.profile-description-element', undefined, useForCurrentWindowTitle));
+		disposables.add(useForCurrentWindowCheckbox.onChange(() => {
+			if (profileElement?.root instanceof UserDataProfileElement) {
+				profileElement.root.toggleCurrentWindowProfile();
+			}
+		}));
+		disposables.add(addDisposableListener(useForCurrentWindowLabel, EventType.CLICK, () => {
+			if (profileElement?.root instanceof UserDataProfileElement) {
+				profileElement.root.toggleCurrentWindowProfile();
+			}
+		}));
+
+		const renderUseCurrentProfile = (profileElement: ProfileTreeElement) => {
+			useForCurrentWindowCheckbox.checked = profileElement.root instanceof UserDataProfileElement && this.userDataProfileService.currentProfile.id === profileElement.root.profile.id;
+			if (useForCurrentWindowCheckbox.checked && this.userDataProfileService.currentProfile.isDefault) {
+				useForCurrentWindowCheckbox.disable();
+			} else {
+				useForCurrentWindowCheckbox.enable();
+			}
+		};
+
+		const that = this;
+		return {
+			set element(element: ProfileTreeElement) {
+				profileElement = element;
+				renderUseCurrentProfile(profileElement);
+				elementDisposables.add(that.userDataProfileService.onDidChangeCurrentProfile(e => {
+					renderUseCurrentProfile(element);
+				}));
+			},
+			disposables,
+			elementDisposables
+		};
+	}
+}
+
 class UseAsDefaultProfileRenderer extends ProfilePropertyRenderer {
 
 	readonly templateId: ProfileProperty = 'useAsDefault';
@@ -1050,7 +1127,7 @@ class UseAsDefaultProfileRenderer extends ProfilePropertyRenderer {
 		let profileElement: ProfileTreeElement | undefined;
 
 		const useAsDefaultProfileContainer = append(parent, $('.profile-row-container'));
-		append(useAsDefaultProfileContainer, $('.profile-label-element', undefined, localize('use as default', "Use as Default")));
+		append(useAsDefaultProfileContainer, $('.profile-label-element', undefined, localize('use for new windows', "Use for New Windows")));
 		const useAsDefaultProfileValueContainer = append(useAsDefaultProfileContainer, $('.profile-use-as-default-container'));
 		const useAsDefaultProfileTitle = localize('enable for new windows', "Use this profile as the default for new windows");
 		const useAsDefaultProfileCheckbox = disposables.add(new Checkbox(useAsDefaultProfileTitle, false, defaultCheckboxStyles));
@@ -1653,6 +1730,15 @@ export class UserDataProfilesEditorInput extends EditorInput {
 	}
 
 	override matches(otherInput: EditorInput | IUntypedEditorInput): boolean { return otherInput instanceof UserDataProfilesEditorInput; }
+
+	override dispose(): void {
+		for (const profile of this.model.profiles) {
+			if (profile instanceof UserDataProfileElement) {
+				profile.reset();
+			}
+		}
+		super.dispose();
+	}
 }
 
 export class UserDataProfilesEditorInputSerializer implements IEditorSerializer {
diff --git a/src/vs/workbench/contrib/userDataProfile/browser/userDataProfilesEditorModel.ts b/src/vs/workbench/contrib/userDataProfile/browser/userDataProfilesEditorModel.ts
index 26c3e7d7eb9..87827dcfaa0 100644
--- a/src/vs/workbench/contrib/userDataProfile/browser/userDataProfilesEditorModel.ts
+++ b/src/vs/workbench/contrib/userDataProfile/browser/userDataProfilesEditorModel.ts
@@ -10,7 +10,7 @@ import { localize } from 'vs/nls';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { DidChangeProfilesEvent, isUserDataProfile, IUserDataProfile, IUserDataProfilesService, ProfileResourceType, ProfileResourceTypeFlags, toUserDataProfile, UseDefaultProfileFlags } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { IProfileResourceChildTreeItem, IProfileTemplateInfo, IUserDataProfileImportExportService, IUserDataProfileManagementService, IUserDataProfileService, IUserDataProfileTemplate } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
+import { IProfileResourceChildTreeItem, IProfileTemplateInfo, isProfileURL, IUserDataProfileImportExportService, IUserDataProfileManagementService, IUserDataProfileService, IUserDataProfileTemplate } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
 import { Disposable, DisposableStore, toDisposable } from 'vs/base/common/lifecycle';
 import { URI } from 'vs/base/common/uri';
 import { equals } from 'vs/base/common/objects';
@@ -36,6 +36,9 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
 import { CONFIG_NEW_WINDOW_PROFILE } from 'vs/workbench/common/configuration';
 import { ResourceMap } from 'vs/base/common/map';
 import { getErrorMessage } from 'vs/base/common/errors';
+import { isWeb } from 'vs/base/common/platform';
+import { IProductService } from 'vs/platform/product/common/productService';
+import { IOpenerService } from 'vs/platform/opener/common/opener';
 
 export type ChangeEvent = {
 	readonly name?: boolean;
@@ -47,6 +50,7 @@ export type ChangeEvent = {
 	readonly copyFromInfo?: boolean;
 	readonly copyFlags?: boolean;
 	readonly preview?: boolean;
+	readonly profile?: boolean;
 	readonly disabled?: boolean;
 	readonly newWindowProfile?: boolean;
 };
@@ -350,17 +354,22 @@ export class UserDataProfileElement extends AbstractUserDataProfileElement {
 		}
 		));
 		this._register(this.userDataProfileService.onDidChangeCurrentProfile(() => this.active = this.userDataProfileService.currentProfile.id === this.profile.id));
-		this._register(this.userDataProfilesService.onDidChangeProfiles(() => {
-			const profile = this.userDataProfilesService.profiles.find(p => p.id === this.profile.id);
+		this._register(this.userDataProfilesService.onDidChangeProfiles(({ updated }) => {
+			const profile = updated.find(p => p.id === this.profile.id);
 			if (profile) {
 				this._profile = profile;
-				this.name = profile.name;
-				this.icon = profile.icon;
-				this.flags = profile.useDefaultFlags;
+				this.reset();
+				this._onDidChange.fire({ profile: true });
 			}
 		}));
 	}
 
+	reset(): void {
+		this.name = this._profile.name;
+		this.icon = this._profile.icon;
+		this.flags = this._profile.useDefaultFlags;
+	}
+
 	public async toggleNewWindowProfile(): Promise<void> {
 		if (this._isNewWindowProfile) {
 			await this.configurationService.updateValue(CONFIG_NEW_WINDOW_PROFILE, null);
@@ -378,6 +387,14 @@ export class UserDataProfileElement extends AbstractUserDataProfileElement {
 		}
 	}
 
+	public async toggleCurrentWindowProfile(): Promise<void> {
+		if (this.userDataProfileService.currentProfile.id === this.profile.id) {
+			await this.userDataProfileManagementService.switchProfile(this.userDataProfilesService.defaultProfile);
+		} else {
+			await this.userDataProfileManagementService.switchProfile(this.profile);
+		}
+	}
+
 	protected override async doSave(): Promise<void> {
 		await this.saveProfile(this.profile);
 	}
@@ -696,8 +713,7 @@ export class UserDataProfilesEditorModel extends EditorModel {
 	private _onDidChange = this._register(new Emitter<AbstractUserDataProfileElement | undefined>());
 	readonly onDidChange = this._onDidChange.event;
 
-	private _templates: IProfileTemplateInfo[] | undefined;
-	get templates(): readonly IProfileTemplateInfo[] { return this._templates ?? []; }
+	private templates: Promise<readonly IProfileTemplateInfo[]> | undefined;
 
 	constructor(
 		@IUserDataProfileService private readonly userDataProfileService: IUserDataProfileService,
@@ -707,6 +723,8 @@ export class UserDataProfilesEditorModel extends EditorModel {
 		@IDialogService private readonly dialogService: IDialogService,
 		@ITelemetryService private readonly telemetryService: ITelemetryService,
 		@IHostService private readonly hostService: IHostService,
+		@IProductService private readonly productService: IProductService,
+		@IOpenerService private readonly openerService: IOpenerService,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 	) {
 		super();
@@ -742,9 +760,11 @@ export class UserDataProfilesEditorModel extends EditorModel {
 		}
 	}
 
-	override async resolve(): Promise<void> {
-		await super.resolve();
-		this._templates = await this.userDataProfileManagementService.getBuiltinProfileTemplates();
+	getTemplates(): Promise<readonly IProfileTemplateInfo[]> {
+		if (!this.templates) {
+			this.templates = this.userDataProfileManagementService.getBuiltinProfileTemplates();
+		}
+		return this.templates;
 	}
 
 	private createProfileElement(profile: IUserDataProfile): [UserDataProfileElement, DisposableStore] {
@@ -752,7 +772,7 @@ export class UserDataProfilesEditorModel extends EditorModel {
 
 		const activateAction = disposables.add(new Action(
 			'userDataProfile.activate',
-			localize('active', "Use for Current Window"),
+			localize('active', "Use this Profile for Current Window"),
 			ThemeIcon.asClassName(Codicon.check),
 			true,
 			() => this.userDataProfileManagementService.switchProfile(profileElement.profile)
@@ -770,7 +790,7 @@ export class UserDataProfilesEditorModel extends EditorModel {
 			localize('export', "Export..."),
 			ThemeIcon.asClassName(Codicon.export),
 			true,
-			() => this.exportProfile(profileElement.profile)
+			() => this.userDataProfileImportExportService.exportProfile(profile)
 		));
 
 		const deleteAction = disposables.add(new Action(
@@ -789,25 +809,16 @@ export class UserDataProfilesEditorModel extends EditorModel {
 			() => this.openWindow(profileElement.profile)
 		));
 
-		const useAsNewWindowProfileAction = disposables.add(new Action(
-			'userDataProfile.useAsNewWindowProfile',
-			localize('use as new window', "Use for New Windows"),
-			undefined,
-			true,
-			() => profileElement.toggleNewWindowProfile()
-		));
-
 		const primaryActions: IAction[] = [];
+		primaryActions.push(activateAction);
 		primaryActions.push(newWindowAction);
-		if (!profile.isDefault) {
-			primaryActions.push(deleteAction);
-		}
 		const secondaryActions: IAction[] = [];
-		secondaryActions.push(activateAction);
-		secondaryActions.push(useAsNewWindowProfileAction);
-		secondaryActions.push(new Separator());
 		secondaryActions.push(copyFromProfileAction);
 		secondaryActions.push(exportAction);
+		if (!profile.isDefault) {
+			secondaryActions.push(new Separator());
+			secondaryActions.push(deleteAction);
+		}
 
 		const profileElement = disposables.add(this.instantiationService.createInstance(UserDataProfileElement,
 			profile,
@@ -815,16 +826,9 @@ export class UserDataProfilesEditorModel extends EditorModel {
 			[primaryActions, secondaryActions]
 		));
 
-		activateAction.checked = this.userDataProfileService.currentProfile.id === profileElement.profile.id;
+		activateAction.enabled = this.userDataProfileService.currentProfile.id !== profileElement.profile.id;
 		disposables.add(this.userDataProfileService.onDidChangeCurrentProfile(() =>
-			activateAction.checked = this.userDataProfileService.currentProfile.id === profileElement.profile.id));
-
-		useAsNewWindowProfileAction.checked = profileElement.isNewWindowProfile;
-		disposables.add(profileElement.onDidChange(e => {
-			if (e.newWindowProfile) {
-				useAsNewWindowProfileAction.checked = profileElement.isNewWindowProfile;
-			}
-		}));
+			activateAction.enabled = this.userDataProfileService.currentProfile.id !== profileElement.profile.id));
 
 		return [profileElement, disposables];
 	}
@@ -856,6 +860,8 @@ export class UserDataProfilesEditorModel extends EditorModel {
 			const disposables = new DisposableStore();
 			const cancellationTokenSource = new CancellationTokenSource();
 			disposables.add(toDisposable(() => cancellationTokenSource.dispose(true)));
+			const primaryActions: Action[] = [];
+			const secondaryActions: Action[] = [];
 			const createAction = disposables.add(new Action(
 				'userDataProfile.create',
 				localize('create', "Create"),
@@ -863,6 +869,16 @@ export class UserDataProfilesEditorModel extends EditorModel {
 				true,
 				() => this.saveNewProfile(false, cancellationTokenSource.token)
 			));
+			primaryActions.push(createAction);
+			if (isWeb && copyFrom instanceof URI && isProfileURL(copyFrom)) {
+				primaryActions.push(new Action(
+					'userDataProfile.createInDesktop',
+					localize('import in desktop', "Create in {0}", this.productService.nameLong),
+					undefined,
+					true,
+					() => this.openerService.open(copyFrom, { openExternal: true })
+				));
+			}
 			const cancelAction = disposables.add(new Action(
 				'userDataProfile.cancel',
 				localize('cancel', "Cancel"),
@@ -870,6 +886,7 @@ export class UserDataProfilesEditorModel extends EditorModel {
 				true,
 				() => this.discardNewProfile()
 			));
+			secondaryActions.push(cancelAction);
 			const previewProfileAction = disposables.add(new Action(
 				'userDataProfile.preview',
 				localize('preview', "Preview"),
@@ -877,17 +894,29 @@ export class UserDataProfilesEditorModel extends EditorModel {
 				true,
 				() => this.previewNewProfile(cancellationTokenSource.token)
 			));
+			if (!isWeb) {
+				secondaryActions.push(previewProfileAction);
+			}
+			const exportAction = disposables.add(new Action(
+				'userDataProfile.export',
+				localize('export', "Export..."),
+				ThemeIcon.asClassName(Codicon.export),
+				isUserDataProfile(copyFrom),
+				() => this.exportNewProfile(cancellationTokenSource.token)
+			));
 			this.newProfileElement = disposables.add(this.instantiationService.createInstance(NewProfileElement,
 				copyFrom ? '' : localize('untitled', "Untitled"),
 				copyFrom,
-				[[createAction], [cancelAction, previewProfileAction]],
-				[[cancelAction], []],
+				[primaryActions, secondaryActions],
+				[[cancelAction], [exportAction]],
 			));
 			const updateCreateActionLabel = () => {
-				if (this.newProfileElement?.copyFrom && this.userDataProfilesService.profiles.some(p => p.name === this.newProfileElement?.name)) {
-					createAction.label = localize('replace', "Replace");
-				} else {
-					createAction.label = localize('create', "Create");
+				if (createAction.enabled) {
+					if (this.newProfileElement?.copyFrom && this.userDataProfilesService.profiles.some(p => p.name === this.newProfileElement?.name)) {
+						createAction.label = localize('replace', "Replace");
+					} else {
+						createAction.label = localize('create', "Create");
+					}
 				}
 			};
 			updateCreateActionLabel();
@@ -900,6 +929,7 @@ export class UserDataProfilesEditorModel extends EditorModel {
 				}
 				if (e.name || e.copyFrom) {
 					updateCreateActionLabel();
+					exportAction.enabled = isUserDataProfile(this.newProfileElement?.copyFrom);
 				}
 			}));
 			disposables.add(this.userDataProfilesService.onDidChangeProfiles((e) => {
@@ -941,6 +971,27 @@ export class UserDataProfilesEditorModel extends EditorModel {
 		}
 	}
 
+	private async exportNewProfile(token: CancellationToken): Promise<void> {
+		if (!this.newProfileElement) {
+			return;
+		}
+		if (!isUserDataProfile(this.newProfileElement.copyFrom)) {
+			return;
+		}
+		const profile = toUserDataProfile(
+			generateUuid(),
+			this.newProfileElement.name,
+			this.newProfileElement.copyFrom.location,
+			this.newProfileElement.copyFrom.cacheHome,
+			{
+				icon: this.newProfileElement.icon,
+				useDefaultFlags: this.newProfileElement.flags,
+			},
+			this.userDataProfilesService.defaultProfile
+		);
+		await this.userDataProfileImportExportService.exportProfile(profile, this.newProfileElement.copyFlags);
+	}
+
 	async saveNewProfile(transient?: boolean, token?: CancellationToken): Promise<IUserDataProfile | undefined> {
 		if (!this.newProfileElement) {
 			return undefined;
@@ -1066,8 +1117,4 @@ export class UserDataProfilesEditorModel extends EditorModel {
 	private async openWindow(profile: IUserDataProfile): Promise<void> {
 		await this.hostService.openWindow({ forceProfile: profile.name });
 	}
-
-	private async exportProfile(profile: IUserDataProfile): Promise<void> {
-		return this.userDataProfileImportExportService.exportProfile(profile);
-	}
 }
diff --git a/src/vs/workbench/contrib/userDataProfile/common/userDataProfile.ts b/src/vs/workbench/contrib/userDataProfile/common/userDataProfile.ts
index cff91a7701a..cd9fac0c838 100644
--- a/src/vs/workbench/contrib/userDataProfile/common/userDataProfile.ts
+++ b/src/vs/workbench/contrib/userDataProfile/common/userDataProfile.ts
@@ -3,8 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { URI } from 'vs/base/common/uri';
+import { IUserDataProfile } from 'vs/platform/userDataProfile/common/userDataProfile';
 import { IEditorPane } from 'vs/workbench/common/editor';
 
 export interface IUserDataProfilesEditor extends IEditorPane {
-	createNewProfile(): Promise<void>;
+	createNewProfile(copyFrom?: URI | IUserDataProfile): Promise<void>;
+	selectProfile(profile: IUserDataProfile): void;
 }
diff --git a/src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts b/src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts
index 60678809819..a1d8daa7604 100644
--- a/src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts
+++ b/src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts
@@ -904,7 +904,7 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
 					const quickInputService = accessor.get(IQuickInputService);
 					const commandService = accessor.get(ICommandService);
 					const disposables = new DisposableStore();
-					const quickPick = quickInputService.createQuickPick();
+					const quickPick = quickInputService.createQuickPick({ useSeparators: true });
 					disposables.add(quickPick);
 					const items: Array<QuickPickItem> = [];
 					if (that.userDataSyncService.conflicts.length) {
diff --git a/src/vs/workbench/contrib/webview/browser/pre/index-no-csp.html b/src/vs/workbench/contrib/webview/browser/pre/index-no-csp.html
index ae571f8c84d..c3aaddae4d6 100644
--- a/src/vs/workbench/contrib/webview/browser/pre/index-no-csp.html
+++ b/src/vs/workbench/contrib/webview/browser/pre/index-no-csp.html
@@ -343,6 +343,15 @@
 
 				const hostname = location.hostname;
 
+				// --- Start PWB: server same origin ---
+				if (parentOrigin) {
+					const parent = new URL(parentOrigin);
+					if (parent.hostname === hostname) {
+						return start(parentOrigin);
+					}
+				}
+				// --- End PWB: server same origin ---
+
 				if (!crypto.subtle) {
 					// cannot validate, not running in a secure context
 					throw new Error(`'crypto.subtle' is not available so webviews will not work. This is likely because the editor is not running in a secure context (https://developer.mozilla.org/en-US/docs/Web/Security/Secure_Contexts).`);
diff --git a/src/vs/workbench/contrib/webview/browser/pre/index.html b/src/vs/workbench/contrib/webview/browser/pre/index.html
index f46e1240428..e1872fae054 100644
--- a/src/vs/workbench/contrib/webview/browser/pre/index.html
+++ b/src/vs/workbench/contrib/webview/browser/pre/index.html
@@ -4,10 +4,10 @@
 <head>
 	<meta charset="UTF-8">
 
+	<!-- Start PWB: serve same origin -->
 	<meta http-equiv="Content-Security-Policy"
-
-	content="default-src 'none'; script-src 'sha256-ikaxwm2UFoiIKkEZTEU4mnSxpYf3lmsrhy5KqqJZfek=' 'self'; frame-src 'self'; style-src 'unsafe-inline';">
-
+		content="default-src 'none'; script-src 'sha256-+ovIJoRj7d8FrfIuAWHjH1mece4hgyIcSOKA1OlOO+4=' 'self'; frame-src 'self'; style-src 'unsafe-inline';">
+	<!-- End PWB: serve same origin -->
 
 	<!-- Disable pinch zooming -->
 	<meta name="viewport"
@@ -350,6 +350,15 @@
 
 				const hostname = location.hostname;
 
+				// --- Start PWB: server same origin ---
+				if (parentOrigin) {
+					const parent = new URL(parentOrigin);
+					if (parent.hostname === hostname) {
+						return start(parentOrigin);
+					}
+				}
+				// --- End PWB: server same origin ---
+
 				if (!crypto.subtle) {
 					// cannot validate, not running in a secure context
 					throw new Error(`'crypto.subtle' is not available so webviews will not work. This is likely because the editor is not running in a secure context (https://developer.mozilla.org/en-US/docs/Web/Security/Secure_Contexts).`);
@@ -799,13 +808,28 @@
 
 
 		function handleInnerDragEvent(/** @type {DragEvent} */ e) {
+			/**
+			 * To ensure that the drop event always fires as expected, you should always include a preventDefault() call in the part of your code which handles the dragover event.
+			 * source: https://developer.mozilla.org/en-US/docs/Web/API/HTMLElement/drop_event
+			 **/
+			e.preventDefault();
+
 			if (!e.dataTransfer) {
 				return;
 			}
 
-			hostMessaging.postMessage('drag', {
-				shiftKey: e.shiftKey
-			});
+
+			// Only handle drags from outside editor for now
+			if (e.dataTransfer.items.length && Array.prototype.every.call(e.dataTransfer.items, item => item.kind === 'file')) {
+				hostMessaging.postMessage('drag', {
+					shiftKey: e.shiftKey
+				});
+			}
+
+		}
+
+		function handleInnerDropEvent(/**@type {DragEvent} */e) {
+			e.preventDefault();
 		}
 
 		/**
@@ -900,6 +924,7 @@
 		window.addEventListener('dragenter', handleInnerDragStartEvent);
 		window.addEventListener('dragover', handleInnerDragEvent);
 		window.addEventListener('drag', handleInnerDragEvent);
+		window.addEventListener('drop', handleInnerDropEvent);
 
 
 		onDomReady(() => {
@@ -1184,6 +1209,7 @@
 					contentWindow.addEventListener('dragenter', handleInnerDragStartEvent);
 					contentWindow.addEventListener('dragover', handleInnerDragEvent);
 					contentWindow.addEventListener('drag', handleInnerDragEvent);
+					contentWindow.addEventListener('drop', handleInnerDropEvent);
 
 					unloadMonitor.onIframeLoaded(newFrame);
 				}
diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts
index c6974fc36ce..2727a30439c 100644
--- a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts
+++ b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts
@@ -30,6 +30,7 @@ import { IExtensionService } from 'vs/workbench/services/extensions/common/exten
 import { StartupPageEditorResolverContribution, StartupPageRunnerContribution } from 'vs/workbench/contrib/welcomeGettingStarted/browser/startupPage';
 import { ExtensionsInput } from 'vs/workbench/contrib/extensions/common/extensionsInput';
 import { Categories } from 'vs/platform/action/common/actionCommonCategories';
+import { DisposableStore } from 'vs/base/common/lifecycle';
 
 // --- Start Positron ---
 import { IsDevelopmentContext } from 'vs/platform/contextkey/common/contextkeys';
@@ -253,21 +254,22 @@ registerAction2(class extends Action2 {
 		const gettingStartedService = accessor.get(IWalkthroughsService);
 		const extensionService = accessor.get(IExtensionService);
 
-		const quickPick = quickInputService.createQuickPick();
+		const disposables = new DisposableStore();
+		const quickPick = disposables.add(quickInputService.createQuickPick());
 		quickPick.canSelectMany = false;
 		quickPick.matchOnDescription = true;
 		quickPick.matchOnDetail = true;
 		quickPick.placeholder = localize('pickWalkthroughs', 'Select a walkthrough to open');
 		quickPick.items = await this.getQuickPickItems(contextService, gettingStartedService);
 		quickPick.busy = true;
-		quickPick.onDidAccept(() => {
+		disposables.add(quickPick.onDidAccept(() => {
 			const selection = quickPick.selectedItems[0];
 			if (selection) {
 				commandService.executeCommand('workbench.action.openWalkthrough', selection.id);
 			}
 			quickPick.hide();
-		});
-		quickPick.onDidHide(() => quickPick.dispose());
+		}));
+		disposables.add(quickPick.onDidHide(() => disposables.dispose()));
 		await extensionService.whenInstalledExtensionsRegistered();
 		gettingStartedService.onDidAddWalkthrough(async () => {
 			quickPick.items = await this.getQuickPickItems(contextService, gettingStartedService);
diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedDetailsRenderer.ts b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedDetailsRenderer.ts
index fef4b4928bf..9cc4cdf407c 100644
--- a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedDetailsRenderer.ts
+++ b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedDetailsRenderer.ts
@@ -17,6 +17,7 @@ import { IFileService } from 'vs/platform/files/common/files';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import { ILanguageService } from 'vs/editor/common/languages/language';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
+import { gettingStartedContentRegistry } from 'vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent';
 
 
 export class GettingStartedDetailsRenderer {
@@ -221,10 +222,20 @@ export class GettingStartedDetailsRenderer {
 		try {
 			const moduleId = JSON.parse(path.query).moduleId;
 			if (useModuleId && moduleId) {
-				const contents = await new Promise<string>(c => {
-					require([moduleId], content => {
-						c(content.default());
-					});
+				const contents = await new Promise<string>((resolve, reject) => {
+					const provider = gettingStartedContentRegistry.getProvider(moduleId);
+					if (!provider) {
+						// ESM-comment-begin
+						require([moduleId], content => {
+							resolve(content.default());
+						});
+						// ESM-comment-end
+						// ESM-uncomment-begin
+						// reject(`Getting started: no provider registered for ${moduleId}`);
+						// ESM-uncomment-end
+					} else {
+						resolve(provider());
+					}
 				});
 				return contents;
 			}
diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts b/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts
index f1c249d353c..3d1f4647345 100644
--- a/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts
+++ b/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts
@@ -3,19 +3,58 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/workbench/contrib/welcomeGettingStarted/common/media/theme_picker';
-import 'vs/workbench/contrib/welcomeGettingStarted/common/media/notebookProfile';
+import themePickerContent from 'vs/workbench/contrib/welcomeGettingStarted/common/media/theme_picker';
+import notebookProfileContent from 'vs/workbench/contrib/welcomeGettingStarted/common/media/notebookProfile';
 import { localize } from 'vs/nls';
 import { Codicon } from 'vs/base/common/codicons';
 import { ThemeIcon } from 'vs/base/common/themables';
 import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
 import { NotebookSetting } from 'vs/workbench/contrib/notebook/common/notebookCommon';
+import { CONTEXT_ACCESSIBILITY_MODE_ENABLED } from 'vs/platform/accessibility/common/accessibility';
+import { URI } from 'vs/base/common/uri';
 
+interface IGettingStartedContentProvider {
+	(): string;
+}
+
+class GettingStartedContentProviderRegistry {
+
+	private readonly providers = new Map<string, IGettingStartedContentProvider>();
+
+	registerProvider(moduleId: string, provider: IGettingStartedContentProvider): void {
+		this.providers.set(moduleId, provider);
+	}
+
+	getProvider(moduleId: string): IGettingStartedContentProvider | undefined {
+		return this.providers.get(moduleId);
+	}
+}
+export const gettingStartedContentRegistry = new GettingStartedContentProviderRegistry();
+
+export async function moduleToContent(resource: URI): Promise<string> {
+	if (!resource.query) {
+		throw new Error('Getting Started: invalid resource');
+	}
+
+	const query = JSON.parse(resource.query);
+	if (!query.moduleId) {
+		throw new Error('Getting Started: invalid resource');
+	}
+
+	const provider = gettingStartedContentRegistry.getProvider(query.moduleId);
+	if (!provider) {
+		throw new Error(`Getting Started: no provider registered for ${query.moduleId}`);
+	}
+
+	return provider();
+}
+
+gettingStartedContentRegistry.registerProvider('vs/workbench/contrib/welcomeGettingStarted/common/media/theme_picker', themePickerContent);
+gettingStartedContentRegistry.registerProvider('vs/workbench/contrib/welcomeGettingStarted/common/media/notebookProfile', notebookProfileContent);
 
 const setupIcon = registerIcon('getting-started-setup', Codicon.zap, localize('getting-started-setup-icon', "Icon used for the setup category of welcome page"));
 const beginnerIcon = registerIcon('getting-started-beginner', Codicon.lightbulb, localize('getting-started-beginner-icon', "Icon used for the beginner category of welcome page"));
 
-
 export type BuiltinGettingStartedStep = {
 	id: string;
 	title: string;
@@ -267,6 +306,7 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
 						'onSettingChanged:workbench.colorTheme',
 						'onCommand:workbench.action.selectTheme'
 					],
+					when: '!accessibilityModeEnabled',
 					media: { type: 'markdown', path: 'theme_picker', }
 				},
 				{
@@ -435,7 +475,84 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
 			]
 		}
 	},
-
+	{
+		id: 'SetupScreenReader',
+		title: localize('gettingStarted.setupScreenReader.title', "Get Started with VS Code using a Screen Reader"),
+		description: localize('gettingStarted.setupScreenReader.description', "Learn the tools and shortcuts that make VS Code accessible. Note that some actions are not actionable from within the context of the walkthrough."),
+		isFeatured: true,
+		icon: setupIcon,
+		when: CONTEXT_ACCESSIBILITY_MODE_ENABLED.key,
+		next: 'Setup',
+		content: {
+			type: 'steps',
+			steps: [
+				{
+					id: 'accessibilityHelp',
+					title: localize('gettingStarted.accessibilityHelp.title', "Use the accessibility help dialog to learn about features"),
+					description: localize('gettingStarted.accessibilityHelp.description.interpolated', "The accessibility help dialog provides information about what to expect from a feature and the commands/keybindings to operate them.\n With focus in an editor, terminal, notebook, chat response, comment, or debug console, the relevant dialog can be opened with the Open Accessibility Help command.\n{0}", Button(localize('openAccessibilityHelp', "Open Accessibility Help"), 'command:editor.action.accessibilityHelp')),
+					media: {
+						type: 'markdown', path: 'empty'
+					}
+				},
+				{
+					id: 'accessibleView',
+					title: localize('gettingStarted.accessibleView.title', "Use the accessible view to inspect content line by line, character by character"),
+					description: localize('gettingStarted.accessibleView.description.interpolated', "The accessible view is available for the terminal, hovers, notifications, comments, notebook output, chat responses, inline completions, and debug console output.\n With focus in any of those features, it can be opened with the Open Accessible View command.\n{0}", Button(localize('openAccessibleView', "Open Accessible View"), 'command:editor.action.accessibleView')),
+					media: {
+						type: 'markdown', path: 'empty'
+					}
+				},
+				{
+					id: 'verbositySettings',
+					title: localize('gettingStarted.verbositySettings.title', "Control the verbosity of aria labels"),
+					description: localize('gettingStarted.verbositySettings.description.interpolated', "Verbosity settings exist for features around the workbench so that once a user is familiar with a feature, they can avoid hearing hints about how to operate it. For example, features for which an accessibility help dialog exists will indicate how to open the dialog until the verbosity setting for that feature has been disabled.\n These and other accessibility settings can be configured by running the Open Accessibility Settings command.\n{0}", Button(localize('openVerbositySettings', "Open Accessibility Settings"), 'command:workbench.action.openAccessibilitySettings')),
+					media: {
+						type: 'markdown', path: 'empty'
+					}
+				},
+				{
+					id: 'accessibilitySignals',
+					title: localize('gettingStarted.accessibilitySignals.title', "Fine tune which accessibility signals you want to receive via audio or a braille device"),
+					description: localize('gettingStarted.accessibilitySignals.description.interpolated', "Accessibility sounds and announcements are played around the workbench for different events.\n These can be discovered and configured using the List Signal Sounds and List Signal Announcements commands.\n{0}\n{1}", Button(localize('listSignalSounds', "List Signal Sounds"), 'command:signals.sounds.help'), Button(localize('listSignalAnnouncements', "List Signal Announcements"), 'command:signals.announcements.help')),
+					media: {
+						type: 'markdown', path: 'empty'
+					}
+				},
+				{
+					id: 'hover',
+					title: localize('gettingStarted.hover.title', "Access the hover in the editor to get more information on a variable or symbol"),
+					description: localize('gettingStarted.hover.description.interpolated', "While focus is in the editor on a variable or symbol, a hover can be can be focused with the Show or Open Hover command.\n{0}", Button(localize('showOrFocusHover', "Show or Focus Hover"), 'command:editor.action.showHover')),
+					media: {
+						type: 'markdown', path: 'empty'
+					}
+				},
+				{
+					id: 'goToSymbol',
+					title: localize('gettingStarted.goToSymbol.title', "Navigate to symbols in a file"),
+					description: localize('gettingStarted.goToSymbol.description.interpolated', "The Go to Symbol command is useful for navigating between important landmarks in a document.\n{0}", Button(localize('openGoToSymbol', "Go to Symbol"), 'command:editor.action.goToSymbol')),
+					media: {
+						type: 'markdown', path: 'empty'
+					}
+				},
+				{
+					id: 'codeFolding',
+					title: localize('gettingStarted.codeFolding.title', "Use code folding to collapse blocks of code and focus on the code you're interested in."),
+					description: localize('gettingStarted.codeFolding.description.interpolated', "Fold or unfold a code section with the Toggle Fold command.\n{0}\n Fold or unfold recursively with the Toggle Fold Recursively Command\n{1}\n", Button(localize('toggleFold', "Toggle Fold"), 'command:editor.toggleFold'), Button(localize('toggleFoldRecursively', "Toggle Fold Recursively"), 'editor.toggleFoldRecursively')),
+					media: {
+						type: 'markdown', path: 'empty'
+					}
+				},
+				{
+					id: 'intellisense',
+					title: localize('gettingStarted.intellisense.title', "Use Intellisense to improve coding efficiency"),
+					description: localize('gettingStarted.intellisense.description.interpolated', "Intellisense suggestions can be opened with the Trigger Intellisense command.\n{0}\n Inline intellisense suggestions can be triggered with Trigger Inline Suggestion\n{1}\n Useful settings include editor.inlineCompletionsAccessibilityVerbose and editor.screenReaderAnnounceInlineSuggestion.", Button(localize('triggerIntellisense', "Trigger Intellisense"), 'command:editor.action.triggerSuggest'), Button(localize('triggerInlineSuggestion', 'Trigger Inline Suggestion'), 'command:editor.action.inlineSuggest.trigger')),
+					media: {
+						type: 'markdown', path: 'empty'
+					}
+				}
+			]
+		}
+	},
 	{
 		id: 'Beginner',
 		isFeatured: false,
@@ -532,7 +649,7 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
 				{
 					id: 'workspaceTrust',
 					title: localize('gettingStarted.workspaceTrust.title', "Safely browse and edit code"),
-					description: localize('gettingStarted.workspaceTrust.description.interpolated', "{0} lets you decide whether your project folders should **allow or restrict** automatic code execution __(required for extensions, debugging, etc)__.\nOpening a file/folder will prompt to grant trust. You can always {1} later.", Button(localize('workspaceTrust', "Workspace Trust"), 'https://github.com/microsoft/vscode-docs/blob/workspaceTrust/docs/editor/workspace-trust.md'), Button(localize('enableTrust', "enable trust"), 'command:toSide:workbench.action.manageTrustedDomain')),
+					description: localize('gettingStarted.workspaceTrust.description.interpolated', "{0} lets you decide whether your project folders should **allow or restrict** automatic code execution __(required for extensions, debugging, etc)__.\nOpening a file/folder will prompt to grant trust. You can always {1} later.", Button(localize('workspaceTrust', "Workspace Trust"), 'https://code.visualstudio.com/docs/editor/workspace-trust'), Button(localize('enableTrust', "enable trust"), 'command:toSide:workbench.action.manageTrustedDomain')),
 					when: 'workspacePlatform != \'webworker\' && !isWorkspaceTrusted && workspaceFolderCount == 0',
 					media: {
 						type: 'svg', altText: 'Workspace Trust editor in Restricted mode and a primary button for switching to Trusted mode.', path: 'workspaceTrust.svg'
diff --git a/src/vs/workbench/contrib/notebook/common/services/notebookWorkerHost.ts b/src/vs/workbench/contrib/welcomeGettingStarted/common/media/empty.ts
similarity index 75%
rename from src/vs/workbench/contrib/notebook/common/services/notebookWorkerHost.ts
rename to src/vs/workbench/contrib/welcomeGettingStarted/common/media/empty.ts
index 44a4e22da79..086fa08b842 100644
--- a/src/vs/workbench/contrib/notebook/common/services/notebookWorkerHost.ts
+++ b/src/vs/workbench/contrib/welcomeGettingStarted/common/media/empty.ts
@@ -3,7 +3,4 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-export interface INotebookWorkerHost {
-	// foreign host request
-	fhr(method: string, args: any[]): Promise<any>;
-}
+export default () => ``;
diff --git a/src/vs/workbench/contrib/welcomeViews/common/newFile.contribution.ts b/src/vs/workbench/contrib/welcomeViews/common/newFile.contribution.ts
index eae75a6e994..daf6daa2625 100644
--- a/src/vs/workbench/contrib/welcomeViews/common/newFile.contribution.ts
+++ b/src/vs/workbench/contrib/welcomeViews/common/newFile.contribution.ts
@@ -99,7 +99,7 @@ class NewFileTemplatesManager extends Disposable {
 		const { promise: resultPromise, resolve: resolveResult } = promiseWithResolvers<boolean>();
 
 		const disposables = new DisposableStore();
-		const qp = this.quickInputService.createQuickPick();
+		const qp = this.quickInputService.createQuickPick({ useSeparators: true });
 		qp.title = localize('newFileTitle', "New File...");
 		qp.placeholder = localize('newFilePlaceholder', "Select File Type or Enter File Name...");
 		qp.sortByLabel = false;
diff --git a/src/vs/workbench/contrib/welcomeWalkthrough/browser/editor/editorWalkThrough.ts b/src/vs/workbench/contrib/welcomeWalkthrough/browser/editor/editorWalkThrough.ts
index f1c241a759f..d1d26309d3a 100644
--- a/src/vs/workbench/contrib/welcomeWalkthrough/browser/editor/editorWalkThrough.ts
+++ b/src/vs/workbench/contrib/welcomeWalkthrough/browser/editor/editorWalkThrough.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/workbench/contrib/welcomeWalkthrough/browser/editor/vs_code_editor_walkthrough';
+import content from 'vs/workbench/contrib/welcomeWalkthrough/browser/editor/vs_code_editor_walkthrough';
 import { localize, localize2 } from 'vs/nls';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
@@ -13,6 +13,9 @@ import { IEditorSerializer } from 'vs/workbench/common/editor';
 import { EditorInput } from 'vs/workbench/common/editor/editorInput';
 import { Action2 } from 'vs/platform/actions/common/actions';
 import { Categories } from 'vs/platform/action/common/actionCommonCategories';
+import { walkThroughContentRegistry } from 'vs/workbench/contrib/welcomeWalkthrough/common/walkThroughContentProvider';
+
+walkThroughContentRegistry.registerProvider('vs/workbench/contrib/welcomeWalkthrough/browser/editor/vs_code_editor_walkthrough', content);
 
 const typeId = 'workbench.editors.walkThroughInput';
 const inputOptions: WalkThroughInputOptions = {
diff --git a/src/vs/workbench/contrib/welcomeWalkthrough/browser/walkThroughInput.ts b/src/vs/workbench/contrib/welcomeWalkthrough/browser/walkThroughInput.ts
index 1d6d5c184fe..6e926042715 100644
--- a/src/vs/workbench/contrib/welcomeWalkthrough/browser/walkThroughInput.ts
+++ b/src/vs/workbench/contrib/welcomeWalkthrough/browser/walkThroughInput.ts
@@ -8,9 +8,9 @@ import { EditorModel } from 'vs/workbench/common/editor/editorModel';
 import { URI } from 'vs/base/common/uri';
 import { DisposableStore, IReference } from 'vs/base/common/lifecycle';
 import { ITextEditorModel, ITextModelService } from 'vs/editor/common/services/resolverService';
-import { marked } from 'vs/base/common/marked/marked';
+import { marked, Tokens } from 'vs/base/common/marked/marked';
 import { isEqual } from 'vs/base/common/resources';
-import { requireToContent } from 'vs/workbench/contrib/welcomeWalkthrough/common/walkThroughContentProvider';
+import { moduleToContent } from 'vs/workbench/contrib/welcomeWalkthrough/common/walkThroughContentProvider';
 import { Dimension } from 'vs/base/browser/dom';
 import { EditorInputCapabilities, IUntypedEditorInput } from 'vs/workbench/common/editor';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
@@ -107,7 +107,7 @@ export class WalkThroughInput extends EditorInput {
 
 	override resolve(): Promise<WalkThroughModel> {
 		if (!this.promise) {
-			this.promise = requireToContent(this.instantiationService, this.options.resource)
+			this.promise = moduleToContent(this.instantiationService, this.options.resource)
 				.then(content => {
 					if (this.resource.path.endsWith('.html')) {
 						return new WalkThroughModel(content, []);
@@ -116,13 +116,13 @@ export class WalkThroughInput extends EditorInput {
 					const snippets: Promise<IReference<ITextEditorModel>>[] = [];
 					let i = 0;
 					const renderer = new marked.Renderer();
-					renderer.code = (code, lang) => {
+					renderer.code = ({ lang }: Tokens.Code) => {
 						i++;
 						const resource = this.options.resource.with({ scheme: Schemas.walkThroughSnippet, fragment: `${i}.${lang}` });
 						snippets.push(this.textModelResolverService.createModelReference(resource));
 						return `<div id="snippet-${resource.fragment}" class="walkThroughEditorContainer" ></div>`;
 					};
-					content = marked(content, { renderer });
+					content = marked(content, { async: false, renderer });
 
 					return Promise.all(snippets)
 						.then(refs => new WalkThroughModel(content, refs));
diff --git a/src/vs/workbench/contrib/welcomeWalkthrough/common/walkThroughContentProvider.ts b/src/vs/workbench/contrib/welcomeWalkthrough/common/walkThroughContentProvider.ts
index 24764f1e31a..caffa6fe43f 100644
--- a/src/vs/workbench/contrib/welcomeWalkthrough/common/walkThroughContentProvider.ts
+++ b/src/vs/workbench/contrib/welcomeWalkthrough/common/walkThroughContentProvider.ts
@@ -9,34 +9,60 @@ import { IModelService } from 'vs/editor/common/services/model';
 import { ITextModel, DefaultEndOfLine, EndOfLinePreference, ITextBufferFactory } from 'vs/editor/common/model';
 import { ILanguageService } from 'vs/editor/common/languages/language';
 import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
-import { marked } from 'vs/base/common/marked/marked';
+import * as marked from 'vs/base/common/marked/marked';
 import { Schemas } from 'vs/base/common/network';
 import { Range } from 'vs/editor/common/core/range';
 import { createTextBufferFactory } from 'vs/editor/common/model/textModel';
 import { assertIsDefined } from 'vs/base/common/types';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 
-export function requireToContent(instantiationService: IInstantiationService, resource: URI): Promise<string> {
+interface IWalkThroughContentProvider {
+	(accessor: ServicesAccessor): string;
+}
+
+class WalkThroughContentProviderRegistry {
+
+	private readonly providers = new Map<string, IWalkThroughContentProvider>();
+
+	registerProvider(moduleId: string, provider: IWalkThroughContentProvider): void {
+		this.providers.set(moduleId, provider);
+	}
+
+	getProvider(moduleId: string): IWalkThroughContentProvider | undefined {
+		return this.providers.get(moduleId);
+	}
+}
+export const walkThroughContentRegistry = new WalkThroughContentProviderRegistry();
+
+export async function moduleToContent(instantiationService: IInstantiationService, resource: URI): Promise<string> {
 	if (!resource.query) {
-		throw new Error('Welcome: invalid resource');
+		throw new Error('Walkthrough: invalid resource');
 	}
 
 	const query = JSON.parse(resource.query);
 	if (!query.moduleId) {
-		throw new Error('Welcome: invalid resource');
+		throw new Error('Walkthrough: invalid resource');
 	}
 
-	const content: Promise<string> = new Promise<string>((resolve, reject) => {
-		require([query.moduleId], content => {
-			try {
-				resolve(instantiationService.invokeFunction(content.default));
-			} catch (err) {
-				reject(err);
-			}
+	const provider = walkThroughContentRegistry.getProvider(query.moduleId);
+	if (!provider) {
+		// ESM-comment-begin
+		return new Promise<string>((resolve, reject) => {
+			require([query.moduleId], content => {
+				try {
+					resolve(instantiationService.invokeFunction(content.default));
+				} catch (err) {
+					reject(err);
+				}
+			});
 		});
-	});
+		// ESM-comment-end
+		// ESM-uncomment-begin
+		// throw new Error(`Walkthrough: no provider registered for ${query.moduleId}`);
+		// ESM-uncomment-end
+	}
 
-	return content;
+	return instantiationService.invokeFunction(provider);
 }
 
 export class WalkThroughSnippetContentProvider implements ITextModelContentProvider, IWorkbenchContribution {
@@ -57,7 +83,7 @@ export class WalkThroughSnippetContentProvider implements ITextModelContentProvi
 	private async textBufferFactoryFromResource(resource: URI): Promise<ITextBufferFactory> {
 		let ongoing = this.loads.get(resource.toString());
 		if (!ongoing) {
-			ongoing = requireToContent(this.instantiationService, resource)
+			ongoing = moduleToContent(this.instantiationService, resource)
 				.then(content => createTextBufferFactory(content))
 				.finally(() => this.loads.delete(resource.toString()));
 			this.loads.set(resource.toString(), ongoing);
@@ -71,13 +97,13 @@ export class WalkThroughSnippetContentProvider implements ITextModelContentProvi
 		if (!codeEditorModel) {
 			const j = parseInt(resource.fragment);
 			let i = 0;
-			const renderer = new marked.Renderer();
-			renderer.code = (code, lang) => {
+			const renderer = new marked.marked.Renderer();
+			renderer.code = ({ text, lang }: marked.Tokens.Code) => {
 				i++;
 				const languageId = typeof lang === 'string' ? this.languageService.getLanguageIdByLanguageName(lang) || '' : '';
 				const languageSelection = this.languageService.createById(languageId);
 				// Create all models for this resource in one go... we'll need them all and we don't want to re-parse markdown each time
-				const model = this.modelService.createModel(code, languageSelection, resource.with({ fragment: `${i}.${lang}` }));
+				const model = this.modelService.createModel(text, languageSelection, resource.with({ fragment: `${i}.${lang}` }));
 				if (i === j) { codeEditorModel = model; }
 				return '';
 			};
@@ -85,7 +111,7 @@ export class WalkThroughSnippetContentProvider implements ITextModelContentProvi
 			const lineCount = textBuffer.getLineCount();
 			const range = new Range(1, 1, lineCount, textBuffer.getLineLength(lineCount) + 1);
 			const markdown = textBuffer.getValueInRange(range, EndOfLinePreference.TextDefined);
-			marked(markdown, { renderer });
+			marked.marked(markdown, { renderer });
 		}
 		return assertIsDefined(codeEditorModel);
 	}
diff --git a/src/vs/workbench/electron-sandbox/actions/windowActions.ts b/src/vs/workbench/electron-sandbox/actions/windowActions.ts
index 5693f076eec..81da0a18bf3 100644
--- a/src/vs/workbench/electron-sandbox/actions/windowActions.ts
+++ b/src/vs/workbench/electron-sandbox/actions/windowActions.ts
@@ -12,7 +12,7 @@ import { getZoomLevel } from 'vs/base/browser/browser';
 import { FileKind } from 'vs/platform/files/common/files';
 import { IModelService } from 'vs/editor/common/services/model';
 import { ILanguageService } from 'vs/editor/common/languages/language';
-import { IQuickInputService, IQuickInputButton, IQuickPickItem } from 'vs/platform/quickinput/common/quickInput';
+import { IQuickInputService, IQuickInputButton, IQuickPickItem, QuickPickInput } from 'vs/platform/quickinput/common/quickInput';
 import { getIconClasses } from 'vs/editor/common/services/getIconClasses';
 import { ICommandHandler } from 'vs/platform/commands/common/commands';
 import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
@@ -253,11 +253,17 @@ abstract class BaseSwitchWindow extends Action2 {
 			readonly windowId: number;
 		}
 
-		const picks: Array<IWindowPickItem> = [];
+		function isWindowPickItem(candidate: unknown): candidate is IWindowPickItem {
+			const windowPickItem = candidate as IWindowPickItem | undefined;
+
+			return typeof windowPickItem?.windowId === 'number';
+		}
+
+		const picks: Array<QuickPickInput<IWindowPickItem>> = [];
 		for (const window of mainWindows) {
 			const auxiliaryWindows = mapMainWindowToAuxiliaryWindows.get(window.id);
 			if (mapMainWindowToAuxiliaryWindows.size > 0) {
-				picks.push({ type: 'separator', payload: -1, label: auxiliaryWindows ? localize('windowGroup', "window group") : undefined } as unknown as IWindowPickItem);
+				picks.push({ type: 'separator', label: auxiliaryWindows ? localize('windowGroup', "window group") : undefined });
 			}
 
 			const resource = window.filename ? URI.file(window.filename) : isSingleFolderWorkspaceIdentifier(window.workspace) ? window.workspace.uri : isWorkspaceIdentifier(window.workspace) ? window.workspace.configPath : undefined;
@@ -286,13 +292,27 @@ abstract class BaseSwitchWindow extends Action2 {
 			}
 		}
 
-		const placeHolder = localize('switchWindowPlaceHolder', "Select a window to switch to");
-		const autoFocusIndex = (picks.indexOf(picks.filter(pick => pick.windowId === currentWindowId)[0]) + 1) % picks.length;
-
 		const pick = await quickInputService.pick(picks, {
 			contextKey: 'inWindowsPicker',
-			activeItem: picks[autoFocusIndex],
-			placeHolder,
+			activeItem: (() => {
+				for (let i = 0; i < picks.length; i++) {
+					const pick = picks[i];
+					if (isWindowPickItem(pick) && pick.windowId === currentWindowId) {
+						let nextPick = picks[i + 1]; // try to select next window unless it's a separator
+						if (isWindowPickItem(nextPick)) {
+							return nextPick;
+						}
+
+						nextPick = picks[i + 2]; // otherwise try to select the next window after the separator
+						if (isWindowPickItem(nextPick)) {
+							return nextPick;
+						}
+					}
+				}
+
+				return undefined;
+			})(),
+			placeHolder: localize('switchWindowPlaceHolder', "Select a window to switch to"),
 			quickNavigate: this.isQuickNavigate() ? { keybindings: keybindingService.lookupKeybindings(this.desc.id) } : undefined,
 			hideInput: this.isQuickNavigate(),
 			onDidTriggerItemButton: async context => {
diff --git a/src/vs/workbench/electron-sandbox/desktop.contribution.ts b/src/vs/workbench/electron-sandbox/desktop.contribution.ts
index 3e07de539b8..fb0d846d7ec 100644
--- a/src/vs/workbench/electron-sandbox/desktop.contribution.ts
+++ b/src/vs/workbench/electron-sandbox/desktop.contribution.ts
@@ -235,6 +235,12 @@ import { MAX_ZOOM_LEVEL, MIN_ZOOM_LEVEL } from 'vs/platform/window/electron-sand
 				'scope': ConfigurationScope.APPLICATION,
 				'description': localize('titleBarStyle', "Adjust the appearance of the window title bar to be native by the OS or custom. On Linux and Windows, this setting also affects the application and context menu appearances. Changes require a full restart to apply."),
 			},
+			'window.experimentalControlOverlay': {
+				'type': 'boolean',
+				'included': isLinux,
+				'markdownDescription': localize('window.experimentalControlOverlay', "Show the native window controls when {0} is set to `custom` (Linux only).", '`#window.titleBarStyle#`'),
+				'default': true
+			},
 			'window.customTitleBarVisibility': {
 				'type': 'string',
 				'enum': ['auto', 'windowed', 'never'],
diff --git a/src/vs/workbench/electron-sandbox/desktop.main.ts b/src/vs/workbench/electron-sandbox/desktop.main.ts
index 90b3fb50616..a722f75a79a 100644
--- a/src/vs/workbench/electron-sandbox/desktop.main.ts
+++ b/src/vs/workbench/electron-sandbox/desktop.main.ts
@@ -206,7 +206,7 @@ export class DesktopMain extends Disposable {
 			logService.info('workbench#open()'); // marking workbench open helps to diagnose flaky integration/smoke tests
 		}
 		if (logService.getLevel() === LogLevel.Trace) {
-			logService.trace('workbench#open(): with configuration', safeStringify(this.configuration));
+			logService.trace('workbench#open(): with configuration', safeStringify({ ...this.configuration, nls: undefined /* exclude large property */ }));
 		}
 
 		// Shared Process
diff --git a/src/vs/workbench/electron-sandbox/parts/titlebar/titlebarPart.ts b/src/vs/workbench/electron-sandbox/parts/titlebar/titlebarPart.ts
index 12609c51916..2fa6f984217 100644
--- a/src/vs/workbench/electron-sandbox/parts/titlebar/titlebarPart.ts
+++ b/src/vs/workbench/electron-sandbox/parts/titlebar/titlebarPart.ts
@@ -156,17 +156,17 @@ export class NativeTitlebarPart extends BrowserTitlebarPart {
 			})));
 		}
 
-		// Window Controls (Native Windows/Linux)
-		if (!isMacintosh && !hasNativeTitlebar(this.configurationService) && !isWCOEnabled() && this.primaryWindowControls) {
+		// Window Controls (Native Linux when WCO is disabled)
+		if (isLinux && !hasNativeTitlebar(this.configurationService) && !isWCOEnabled() && this.windowControlsContainer) {
 
 			// Minimize
-			const minimizeIcon = append(this.primaryWindowControls, $('div.window-icon.window-minimize' + ThemeIcon.asCSSSelector(Codicon.chromeMinimize)));
+			const minimizeIcon = append(this.windowControlsContainer, $('div.window-icon.window-minimize' + ThemeIcon.asCSSSelector(Codicon.chromeMinimize)));
 			this._register(addDisposableListener(minimizeIcon, EventType.CLICK, () => {
 				this.nativeHostService.minimizeWindow({ targetWindowId });
 			}));
 
 			// Restore
-			this.maxRestoreControl = append(this.primaryWindowControls, $('div.window-icon.window-max-restore'));
+			this.maxRestoreControl = append(this.windowControlsContainer, $('div.window-icon.window-max-restore'));
 			this._register(addDisposableListener(this.maxRestoreControl, EventType.CLICK, async () => {
 				const maximized = await this.nativeHostService.isMaximized({ targetWindowId });
 				if (maximized) {
@@ -177,7 +177,7 @@ export class NativeTitlebarPart extends BrowserTitlebarPart {
 			}));
 
 			// Close
-			const closeIcon = append(this.primaryWindowControls, $('div.window-icon.window-close' + ThemeIcon.asCSSSelector(Codicon.chromeClose)));
+			const closeIcon = append(this.windowControlsContainer, $('div.window-icon.window-close' + ThemeIcon.asCSSSelector(Codicon.chromeClose)));
 			this._register(addDisposableListener(closeIcon, EventType.CLICK, () => {
 				this.nativeHostService.closeWindow({ targetWindowId });
 			}));
diff --git a/src/vs/workbench/electron-sandbox/window.ts b/src/vs/workbench/electron-sandbox/window.ts
index 140e12ee47d..914476a7fb2 100644
--- a/src/vs/workbench/electron-sandbox/window.ts
+++ b/src/vs/workbench/electron-sandbox/window.ts
@@ -54,7 +54,7 @@ import { IFilesConfigurationService } from 'vs/workbench/services/filesConfigura
 import { Event } from 'vs/base/common/event';
 import { IRemoteAuthorityResolverService } from 'vs/platform/remote/common/remoteAuthorityResolver';
 import { IAddressProvider, IAddress } from 'vs/platform/remote/common/remoteAgentConnection';
-import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
+import { IEditorGroupsService, IEditorPart } from 'vs/workbench/services/editor/common/editorGroupsService';
 import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
 import { AuthInfo } from 'vs/base/parts/sandbox/electron-sandbox/electronTypes';
 import { ILogService } from 'vs/platform/log/common/log';
@@ -80,6 +80,7 @@ import { ThemeIcon } from 'vs/base/common/themables';
 import { getWorkbenchContribution } from 'vs/workbench/common/contributions';
 import { DynamicWorkbenchSecurityConfiguration } from 'vs/workbench/common/configuration';
 import { nativeHoverDelegate } from 'vs/platform/hover/browser/hover';
+import { isESM } from 'vs/base/common/amd';
 
 export class NativeWindow extends BaseWindow {
 
@@ -90,8 +91,6 @@ export class NativeWindow extends BaseWindow {
 
 	private isDocumentedEdited = false;
 
-	private readonly mainPartEditorService: IEditorService;
-
 	constructor(
 		@IEditorService private readonly editorService: IEditorService,
 		@IEditorGroupsService private readonly editorGroupService: IEditorGroupsService,
@@ -133,8 +132,6 @@ export class NativeWindow extends BaseWindow {
 	) {
 		super(mainWindow, undefined, hostService, nativeEnvironmentService);
 
-		this.mainPartEditorService = editorService.createScoped('main', this._store);
-
 		this.registerListeners();
 		this.create();
 	}
@@ -377,9 +374,11 @@ export class NativeWindow extends BaseWindow {
 
 		this._register(onDidChangeZoomLevel(targetWindowId => this.handleOnDidChangeZoomLevel(targetWindowId)));
 
-		this._register(this.editorGroupService.onDidCreateAuxiliaryEditorPart(({ instantiationService, disposables, part }) => {
-			this.createWindowZoomStatusEntry(instantiationService, part.windowId, disposables);
-		}));
+		for (const part of this.editorGroupService.parts) {
+			this.createWindowZoomStatusEntry(part);
+		}
+
+		this._register(this.editorGroupService.onDidCreateAuxiliaryEditorPart(part => this.createWindowZoomStatusEntry(part)));
 
 		// Listen to visible editor changes (debounced in case a new editor opens immediately after)
 		this._register(Event.debounce(this.editorService.onDidVisibleEditorsChange, () => undefined, 0, undefined, undefined, undefined, this._store)(() => this.maybeCloseWindow()));
@@ -390,26 +389,13 @@ export class NativeWindow extends BaseWindow {
 			this.trackClosedWaitFiles(filesToWait.waitMarkerFileUri, coalesce(filesToWait.paths.map(path => path.fileUri)));
 		}
 
-		// macOS OS integration
+		// macOS OS integration: represented file name
 		if (isMacintosh) {
-			const updateRepresentedFilename = (editorService: IEditorService, targetWindowId: number | undefined) => {
-				const file = EditorResourceAccessor.getOriginalUri(editorService.activeEditor, { supportSideBySide: SideBySideEditor.PRIMARY, filterByScheme: Schemas.file });
-
-				// Represented Filename
-				this.nativeHostService.setRepresentedFilename(file?.fsPath ?? '', { targetWindowId });
-
-				// Custom title menu (main window only currently)
-				if (typeof targetWindowId !== 'number') {
-					this.provideCustomTitleContextMenu(file?.fsPath);
-				}
-			};
-
-			this._register(this.mainPartEditorService.onDidActiveEditorChange(() => updateRepresentedFilename(this.mainPartEditorService, undefined)));
+			for (const part of this.editorGroupService.parts) {
+				this.handleRepresentedFilename(part);
+			}
 
-			this._register(this.editorGroupService.onDidCreateAuxiliaryEditorPart(({ part, disposables }) => {
-				const auxiliaryEditorService = this.editorService.createScoped(part, disposables);
-				disposables.add(auxiliaryEditorService.onDidActiveEditorChange(() => updateRepresentedFilename(auxiliaryEditorService, part.windowId)));
-			}));
+			this._register(this.editorGroupService.onDidCreateAuxiliaryEditorPart(part => this.handleRepresentedFilename(part)));
 		}
 
 		// Maximize/Restore on doubleclick (for macOS custom title)
@@ -456,6 +442,26 @@ export class NativeWindow extends BaseWindow {
 		this._register(this.lifecycleService.onWillShutdown(e => this.onWillShutdown(e)));
 	}
 
+	private handleRepresentedFilename(part: IEditorPart): void {
+		const disposables = new DisposableStore();
+		Event.once(part.onWillDispose)(() => disposables.dispose());
+
+		const scopedEditorService = this.editorGroupService.getScopedInstantiationService(part).invokeFunction(accessor => accessor.get(IEditorService));
+		disposables.add(scopedEditorService.onDidActiveEditorChange(() => this.updateRepresentedFilename(scopedEditorService, part.windowId)));
+	}
+
+	private updateRepresentedFilename(editorService: IEditorService, targetWindowId: number): void {
+		const file = EditorResourceAccessor.getOriginalUri(editorService.activeEditor, { supportSideBySide: SideBySideEditor.PRIMARY, filterByScheme: Schemas.file });
+
+		// Represented Filename
+		this.nativeHostService.setRepresentedFilename(file?.fsPath ?? '', { targetWindowId });
+
+		// Custom title menu (main window only currently)
+		if (targetWindowId === mainWindow.vscodeWindowId) {
+			this.provideCustomTitleContextMenu(file?.fsPath);
+		}
+	}
+
 	//#region Window Lifecycle
 
 	private onBeforeShutdown({ veto, reason }: BeforeShutdownEvent): void {
@@ -646,8 +652,8 @@ export class NativeWindow extends BaseWindow {
 		// Clear old menu
 		this.customTitleContextMenuDisposable.clear();
 
-		// Provide new menu if a file is opened and we are on a custom title
-		if (!filePath || !hasNativeTitlebar(this.configurationService)) {
+		// Only provide a menu when we have a file path and custom titlebar
+		if (!filePath || hasNativeTitlebar(this.configurationService)) {
 			return;
 		}
 
@@ -694,11 +700,6 @@ export class NativeWindow extends BaseWindow {
 		// Touchbar menu (if enabled)
 		this.updateTouchbarMenu();
 
-		// Zoom status
-		for (const { window, disposables } of getWindows()) {
-			this.createWindowZoomStatusEntry(this.instantiationService, window.vscodeWindowId, disposables);
-		}
-
 		// Smoke Test Driver
 		if (this.environmentService.enableSmokeTestDriver) {
 			this.setupDriver();
@@ -708,7 +709,7 @@ export class NativeWindow extends BaseWindow {
 	private async handleWarnings(): Promise<void> {
 
 		// Check for cyclic dependencies
-		if (typeof require.hasDependencyCycle === 'function' && require.hasDependencyCycle()) {
+		if (!isESM && typeof require.hasDependencyCycle === 'function' && require.hasDependencyCycle()) {
 			if (isCI) {
 				this.logService.error('Error: There is a dependency cycle in the AMD modules that needs to be resolved!');
 				this.nativeHostService.exit(37); // running on a build machine, just exit without showing a dialog
@@ -1105,11 +1106,15 @@ export class NativeWindow extends BaseWindow {
 		}
 	}
 
-	private createWindowZoomStatusEntry(instantiationService: IInstantiationService, targetWindowId: number, disposables: DisposableStore): void {
-		this.mapWindowIdToZoomStatusEntry.set(targetWindowId, disposables.add(instantiationService.createInstance(ZoomStatusEntry)));
-		disposables.add(toDisposable(() => this.mapWindowIdToZoomStatusEntry.delete(targetWindowId)));
+	private createWindowZoomStatusEntry(part: IEditorPart): void {
+		const disposables = new DisposableStore();
+		Event.once(part.onWillDispose)(() => disposables.dispose());
 
-		this.updateWindowZoomStatusEntry(targetWindowId);
+		const scopedInstantiationService = this.editorGroupService.getScopedInstantiationService(part);
+		this.mapWindowIdToZoomStatusEntry.set(part.windowId, disposables.add(scopedInstantiationService.createInstance(ZoomStatusEntry)));
+		disposables.add(toDisposable(() => this.mapWindowIdToZoomStatusEntry.delete(part.windowId)));
+
+		this.updateWindowZoomStatusEntry(part.windowId);
 	}
 
 	private updateWindowZoomStatusEntry(targetWindowId: number): void {
@@ -1177,7 +1182,7 @@ class ZoomStatusEntry extends Disposable {
 	updateZoomEntry(visibleOrText: false | string, targetWindowId: number): void {
 		if (typeof visibleOrText === 'string') {
 			if (!this.disposable.value) {
-				this.createZoomEntry(targetWindowId, visibleOrText);
+				this.createZoomEntry(visibleOrText);
 			}
 
 			this.updateZoomLevelLabel(targetWindowId);
@@ -1186,7 +1191,7 @@ class ZoomStatusEntry extends Disposable {
 		}
 	}
 
-	private createZoomEntry(targetWindowId: number, visibleOrText: string) {
+	private createZoomEntry(visibleOrText: string): void {
 		const disposables = new DisposableStore();
 		this.disposable.value = disposables;
 
diff --git a/src/vs/workbench/services/actions/common/menusExtensionPoint.ts b/src/vs/workbench/services/actions/common/menusExtensionPoint.ts
index 665841e48a8..583606a7619 100644
--- a/src/vs/workbench/services/actions/common/menusExtensionPoint.ts
+++ b/src/vs/workbench/services/actions/common/menusExtensionPoint.ts
@@ -126,6 +126,12 @@ const apiMenus: IAPIMenu[] = [
 		id: MenuId.DebugToolBar,
 		description: localize('menus.debugToolBar', "The debug toolbar menu")
 	},
+	{
+		key: 'debug/createConfiguration',
+		id: MenuId.DebugCreateConfiguration,
+		proposed: 'contribDebugCreateConfiguration',
+		description: localize('menus.debugCreateConfiguation', "The debug create configuration menu")
+	},
 	{
 		key: 'notebook/variables/context',
 		id: MenuId.NotebookVariablesContext,
@@ -185,6 +191,12 @@ const apiMenus: IAPIMenu[] = [
 		description: localize('menus.input', "The Source Control input box menu"),
 		proposed: 'contribSourceControlInputBoxMenu'
 	},
+	{
+		key: 'scm/history/title',
+		id: MenuId.SCMHistoryTitle,
+		description: localize('menus.scmHistoryTitle', "The Source Control History title menu"),
+		proposed: 'contribSourceControlHistoryTitleMenu'
+	},
 	{
 		key: 'scm/historyItemChanges/title',
 		id: MenuId.SCMChangesSeparator,
@@ -266,6 +278,12 @@ const apiMenus: IAPIMenu[] = [
 		id: MenuId.ViewTitle,
 		description: localize('view.viewTitle', "The contributed view title menu")
 	},
+	{
+		key: 'viewContainer/title',
+		id: MenuId.ViewContainerTitle,
+		description: localize('view.containerTitle', "The contributed view container title menu"),
+		proposed: 'contribViewContainerTitle'
+	},
 	{
 		key: 'view/item/context',
 		id: MenuId.ViewItemContext,
@@ -1073,6 +1091,12 @@ menusExtensionPoint.setHandler(extensions => {
 					}
 				}
 
+				if (menu.id === MenuId.ViewContainerTitle && !menuItem.when?.includes('viewContainer == workbench.view.debug')) {
+					// Not a perfect check but enough to communicate that this proposed extension point is currently only for the debug view container
+					collector.error(localize('viewContainerTitle.when', "The {0} menu contribution must check {1} in its {2} clause.", '`viewContainer/title`', '`viewContainer == workbench.view.debug`', '"when"'));
+					continue;
+				}
+
 				item.when = ContextKeyExpr.deserialize(menuItem.when);
 				_menuRegistrations.add(MenuRegistry.appendMenuItem(menu.id, item));
 			}
diff --git a/src/vs/workbench/services/assignment/test/common/nullAssignmentService.ts b/src/vs/workbench/services/assignment/test/common/nullAssignmentService.ts
new file mode 100644
index 00000000000..50b2fb8e5b6
--- /dev/null
+++ b/src/vs/workbench/services/assignment/test/common/nullAssignmentService.ts
@@ -0,0 +1,18 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IWorkbenchAssignmentService } from 'vs/workbench/services/assignment/common/assignmentService';
+
+export class NullWorkbenchAssignmentService implements IWorkbenchAssignmentService {
+	_serviceBrand: undefined;
+
+	async getCurrentExperiments(): Promise<string[] | undefined> {
+		return [];
+	}
+
+	async getTreatment<T extends string | number | boolean>(name: string): Promise<T | undefined> {
+		return undefined;
+	}
+}
diff --git a/src/vs/workbench/services/authentication/browser/authenticationExtensionsService.ts b/src/vs/workbench/services/authentication/browser/authenticationExtensionsService.ts
index 2b0a0e98872..14d76fe7272 100644
--- a/src/vs/workbench/services/authentication/browser/authenticationExtensionsService.ts
+++ b/src/vs/workbench/services/authentication/browser/authenticationExtensionsService.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable, dispose, IDisposable, MutableDisposable } from 'vs/base/common/lifecycle';
+import { Disposable, DisposableStore, dispose, IDisposable, MutableDisposable } from 'vs/base/common/lifecycle';
 import * as nls from 'vs/nls';
 import { MenuId, MenuRegistry } from 'vs/platform/actions/common/actions';
 import { CommandsRegistry } from 'vs/platform/commands/common/commands';
@@ -143,7 +143,7 @@ export class AuthenticationExtensionsService extends Disposable implements IAuth
 		// * Extension id: The extension that has a preference
 		// * Provider id: The provider that the preference is for
 		// * The scopes: The subset of sessions that the preference applies to
-		const key = `${extensionId}-${providerId}-${session.scopes.join(' ')}`;
+		const key = `${extensionId}-${providerId}-${session.scopes.join(SCOPESLIST_SEPARATOR)}`;
 
 		// Store the preference in the workspace and application storage. This allows new workspaces to
 		// have a preference set already to limit the number of prompts that are shown... but also allows
@@ -157,7 +157,7 @@ export class AuthenticationExtensionsService extends Disposable implements IAuth
 		// * Extension id: The extension that has a preference
 		// * Provider id: The provider that the preference is for
 		// * The scopes: The subset of sessions that the preference applies to
-		const key = `${extensionId}-${providerId}-${scopes.join(' ')}`;
+		const key = `${extensionId}-${providerId}-${scopes.join(SCOPESLIST_SEPARATOR)}`;
 
 		// If a preference is set in the workspace, use that. Otherwise, use the global preference.
 		return this.storageService.get(key, StorageScope.WORKSPACE) ?? this.storageService.get(key, StorageScope.APPLICATION);
@@ -168,7 +168,7 @@ export class AuthenticationExtensionsService extends Disposable implements IAuth
 		// * Extension id: The extension that has a preference
 		// * Provider id: The provider that the preference is for
 		// * The scopes: The subset of sessions that the preference applies to
-		const key = `${extensionId}-${providerId}-${scopes.join(' ')}`;
+		const key = `${extensionId}-${providerId}-${scopes.join(SCOPESLIST_SEPARATOR)}`;
 
 		// This won't affect any other workspaces that have a preference set, but it will remove the preference
 		// for this workspace and the global preference. This is only paired with a call to updateSessionPreference...
@@ -220,7 +220,8 @@ export class AuthenticationExtensionsService extends Disposable implements IAuth
 		if (!allAccounts.length) {
 			throw new Error('No accounts available');
 		}
-		const quickPick = this.quickInputService.createQuickPick<{ label: string; session?: AuthenticationSession; account?: AuthenticationSessionAccount }>();
+		const disposables = new DisposableStore();
+		const quickPick = disposables.add(this.quickInputService.createQuickPick<{ label: string; session?: AuthenticationSession; account?: AuthenticationSessionAccount }>());
 		quickPick.ignoreFocusOut = true;
 		const items: { label: string; session?: AuthenticationSession; account?: AuthenticationSessionAccount }[] = availableSessions.map(session => {
 			return {
@@ -251,7 +252,7 @@ export class AuthenticationExtensionsService extends Disposable implements IAuth
 		quickPick.placeholder = nls.localize('getSessionPlateholder', "Select an account for '{0}' to use or Esc to cancel", extensionName);
 
 		return await new Promise((resolve, reject) => {
-			quickPick.onDidAccept(async _ => {
+			disposables.add(quickPick.onDidAccept(async _ => {
 				quickPick.dispose();
 				let session = quickPick.selectedItems[0].session;
 				if (!session) {
@@ -270,14 +271,14 @@ export class AuthenticationExtensionsService extends Disposable implements IAuth
 				this.removeAccessRequest(providerId, extensionId);
 
 				resolve(session);
-			});
+			}));
 
-			quickPick.onDidHide(_ => {
-				quickPick.dispose();
+			disposables.add(quickPick.onDidHide(_ => {
 				if (!quickPick.selectedItems[0]) {
 					reject('User did not consent to account access');
 				}
-			});
+				disposables.dispose();
+			}));
 
 			quickPick.show();
 		});
diff --git a/src/vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService.ts b/src/vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService.ts
index c0053495fa5..bdf33a9e56a 100644
--- a/src/vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService.ts
+++ b/src/vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService.ts
@@ -36,14 +36,17 @@ export interface IAuxiliaryWindowOpenEvent {
 export enum AuxiliaryWindowMode {
 	Maximized,
 	Normal,
-	Fullscreen,
-	Custom
+	Fullscreen
 }
 
 export interface IAuxiliaryWindowOpenOptions {
 	readonly bounds?: Partial<IRectangle>;
+
 	readonly mode?: AuxiliaryWindowMode;
 	readonly zoomLevel?: number;
+
+	readonly nativeTitlebar?: boolean;
+	readonly disableFullscreen?: boolean;
 }
 
 export interface IAuxiliaryWindowService {
@@ -329,9 +332,12 @@ export class BrowserAuxiliaryWindowService extends Disposable implements IAuxili
 			`top=${newWindowBounds.y}`,
 			`width=${newWindowBounds.width}`,
 			`height=${newWindowBounds.height}`,
-			options?.mode === AuxiliaryWindowMode.Custom ? 'titlebar=yes' : undefined, 	// non-standard property
-			options?.mode === AuxiliaryWindowMode.Maximized ? 'window-maximized=yes' : undefined, 	// non-standard property
-			options?.mode === AuxiliaryWindowMode.Fullscreen ? 'window-fullscreen=yes' : undefined 	// non-standard property
+
+			// non-standard properties
+			options?.nativeTitlebar ? 'window-native-titlebar=yes' : undefined,
+			options?.disableFullscreen ? 'window-disable-fullscreen=yes' : undefined,
+			options?.mode === AuxiliaryWindowMode.Maximized ? 'window-maximized=yes' : undefined,
+			options?.mode === AuxiliaryWindowMode.Fullscreen ? 'window-fullscreen=yes' : undefined
 		]);
 
 		const auxiliaryWindow = mainWindow.open(isFirefox ? '' /* FF immediately fires an unload event if using about:blank */ : 'about:blank', undefined, features.join(','));
diff --git a/src/vs/workbench/services/configuration/browser/configurationService.ts b/src/vs/workbench/services/configuration/browser/configurationService.ts
index c1bac6f8691..fb8df11ceaa 100644
--- a/src/vs/workbench/services/configuration/browser/configurationService.ts
+++ b/src/vs/workbench/services/configuration/browser/configurationService.ts
@@ -145,8 +145,12 @@ export class WorkspaceService extends Disposable implements IWorkbenchConfigurat
 		this.workspaceConfiguration = this._register(new WorkspaceConfiguration(configurationCache, fileService, uriIdentityService, logService));
 		this._register(this.workspaceConfiguration.onDidUpdateConfiguration(fromCache => {
 			this.onWorkspaceConfigurationChanged(fromCache).then(() => {
-				this.workspace.initialized = this.workspaceConfiguration.initialized;
-				this.checkAndMarkWorkspaceComplete(fromCache);
+				// -- Start PWB: Local storage ---
+				if (this.workspace) {
+					this.workspace.initialized = this.workspaceConfiguration.initialized;
+					this.checkAndMarkWorkspaceComplete(fromCache);
+				}
+				// -- End PWB ---
 			});
 		}));
 
@@ -552,6 +556,11 @@ export class WorkspaceService extends Disposable implements IWorkbenchConfigurat
 			previousFolders = this.workspace.folders;
 			this.workspace.update(workspace);
 		} else {
+			// --- Start PWB: Local storage ---
+			if (!workspace.initialized && this.workspaceConfiguration.initialized) {
+				workspace.initialized = true;
+			}
+			// --- End PWB ---
 			this.workspace = workspace;
 		}
 
diff --git a/src/vs/workbench/services/configurationResolver/browser/baseConfigurationResolverService.ts b/src/vs/workbench/services/configurationResolver/browser/baseConfigurationResolverService.ts
index a7c716da65d..c2b11d8110b 100644
--- a/src/vs/workbench/services/configurationResolver/browser/baseConfigurationResolverService.ts
+++ b/src/vs/workbench/services/configurationResolver/browser/baseConfigurationResolverService.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 import { Queue } from 'vs/base/common/async';
 import { IStringDictionary } from 'vs/base/common/collections';
+import { LRUCache } from 'vs/base/common/map';
 import { Schemas } from 'vs/base/common/network';
 import { IProcessEnvironment } from 'vs/base/common/platform';
 import * as Types from 'vs/base/common/types';
@@ -14,6 +15,7 @@ import { ICommandService } from 'vs/platform/commands/common/commands';
 import { ConfigurationTarget, IConfigurationOverrides, IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { ILabelService } from 'vs/platform/label/common/label';
 import { IInputOptions, IPickOptions, IQuickInputService, IQuickPickItem } from 'vs/platform/quickinput/common/quickInput';
+import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
 import { IWorkspaceContextService, IWorkspaceFolder, WorkbenchState } from 'vs/platform/workspace/common/workspace';
 import { EditorResourceAccessor, SideBySideEditor } from 'vs/workbench/common/editor';
 import { ConfiguredInput } from 'vs/workbench/services/configurationResolver/common/configurationResolver';
@@ -22,6 +24,9 @@ import { IEditorService } from 'vs/workbench/services/editor/common/editorServic
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
 import { IPathService } from 'vs/workbench/services/path/common/pathService';
 
+const LAST_INPUT_STORAGE_KEY = 'configResolveInputLru';
+const LAST_INPUT_CACHE_SIZE = 5;
+
 export abstract class BaseConfigurationResolverService extends AbstractVariableResolverService {
 
 	static readonly INPUT_OR_COMMAND_VARIABLES_PATTERN = /\${((input|command):(.*?))}/g;
@@ -42,6 +47,7 @@ export abstract class BaseConfigurationResolverService extends AbstractVariableR
 		private readonly labelService: ILabelService,
 		private readonly pathService: IPathService,
 		extensionService: IExtensionService,
+		private readonly storageService: IStorageService,
 	) {
 		super({
 			getFolderUri: (folderName: string): uri | undefined => {
@@ -214,7 +220,7 @@ export abstract class BaseConfigurationResolverService extends AbstractVariableR
 			switch (type) {
 
 				case 'input':
-					result = await this.showUserInput(name, inputs);
+					result = await this.showUserInput(section, name, inputs);
 					break;
 
 				case 'command': {
@@ -282,7 +288,7 @@ export abstract class BaseConfigurationResolverService extends AbstractVariableR
 	 * @param variable Name of the input variable.
 	 * @param inputInfos Information about each possible input variable.
 	 */
-	private showUserInput(variable: string, inputInfos: ConfiguredInput[]): Promise<string | undefined> {
+	private showUserInput(section: string | undefined, variable: string, inputInfos: ConfiguredInput[]): Promise<string | undefined> {
 
 		if (!inputInfos) {
 			return Promise.reject(new Error(nls.localize('inputVariable.noInputSection', "Variable '{0}' must be defined in an '{1}' section of the debug or task configuration.", variable, 'inputs')));
@@ -296,13 +302,17 @@ export abstract class BaseConfigurationResolverService extends AbstractVariableR
 				throw new Error(nls.localize('inputVariable.missingAttribute', "Input variable '{0}' is of type '{1}' and must include '{2}'.", variable, info.type, attrName));
 			};
 
+			const defaultValueMap = this.readInputLru();
+			const defaultValueKey = `${section}.${variable}`;
+			const previousPickedValue = defaultValueMap.get(defaultValueKey);
+
 			switch (info.type) {
 
 				case 'promptString': {
 					if (!Types.isString(info.description)) {
 						missingAttribute('description');
 					}
-					const inputOptions: IInputOptions = { prompt: info.description, ignoreFocusLost: true };
+					const inputOptions: IInputOptions = { prompt: info.description, ignoreFocusLost: true, value: previousPickedValue };
 					if (info.default) {
 						inputOptions.value = info.default;
 					}
@@ -310,6 +320,9 @@ export abstract class BaseConfigurationResolverService extends AbstractVariableR
 						inputOptions.password = info.password;
 					}
 					return this.userInputAccessQueue.queue(() => this.quickInputService.input(inputOptions)).then(resolvedInput => {
+						if (typeof resolvedInput === 'string') {
+							this.storeInputLru(defaultValueMap.set(defaultValueKey, resolvedInput));
+						}
 						return resolvedInput as string;
 					});
 				}
@@ -344,6 +357,8 @@ export abstract class BaseConfigurationResolverService extends AbstractVariableR
 						if (value === info.default) {
 							item.description = nls.localize('inputVariable.defaultInputValue', "(Default)");
 							picks.unshift(item);
+						} else if (!info.default && value === previousPickedValue) {
+							picks.unshift(item);
 						} else {
 							picks.push(item);
 						}
@@ -351,7 +366,9 @@ export abstract class BaseConfigurationResolverService extends AbstractVariableR
 					const pickOptions: IPickOptions<PickStringItem> = { placeHolder: info.description, matchOnDetail: true, ignoreFocusLost: true };
 					return this.userInputAccessQueue.queue(() => this.quickInputService.pick(picks, pickOptions, undefined)).then(resolvedInput => {
 						if (resolvedInput) {
-							return (resolvedInput as PickStringItem).value;
+							const value = (resolvedInput as PickStringItem).value;
+							this.storeInputLru(defaultValueMap.set(defaultValueKey, value));
+							return value;
 						}
 						return undefined;
 					});
@@ -375,4 +392,22 @@ export abstract class BaseConfigurationResolverService extends AbstractVariableR
 		}
 		return Promise.reject(new Error(nls.localize('inputVariable.undefinedVariable', "Undefined input variable '{0}' encountered. Remove or define '{0}' to continue.", variable)));
 	}
+
+	private storeInputLru(lru: LRUCache<string, string>): void {
+		this.storageService.store(LAST_INPUT_STORAGE_KEY, JSON.stringify(lru.toJSON()), StorageScope.WORKSPACE, StorageTarget.MACHINE);
+	}
+
+	private readInputLru(): LRUCache<string, string> {
+		const contents = this.storageService.get(LAST_INPUT_STORAGE_KEY, StorageScope.WORKSPACE);
+		const lru = new LRUCache<string, string>(LAST_INPUT_CACHE_SIZE);
+		try {
+			if (contents) {
+				lru.fromJSON(JSON.parse(contents));
+			}
+		} catch {
+			// ignored
+		}
+
+		return lru;
+	}
 }
diff --git a/src/vs/workbench/services/configurationResolver/browser/configurationResolverService.ts b/src/vs/workbench/services/configurationResolver/browser/configurationResolverService.ts
index 70f5d1cd368..f424953db37 100644
--- a/src/vs/workbench/services/configurationResolver/browser/configurationResolverService.ts
+++ b/src/vs/workbench/services/configurationResolver/browser/configurationResolverService.ts
@@ -8,6 +8,7 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
 import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import { ILabelService } from 'vs/platform/label/common/label';
 import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
+import { IStorageService } from 'vs/platform/storage/common/storage';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { BaseConfigurationResolverService } from 'vs/workbench/services/configurationResolver/browser/baseConfigurationResolverService';
 import { IConfigurationResolverService } from 'vs/workbench/services/configurationResolver/common/configurationResolver';
@@ -26,10 +27,11 @@ export class ConfigurationResolverService extends BaseConfigurationResolverServi
 		@ILabelService labelService: ILabelService,
 		@IPathService pathService: IPathService,
 		@IExtensionService extensionService: IExtensionService,
+		@IStorageService storageService: IStorageService,
 	) {
 		super({ getAppRoot: () => undefined, getExecPath: () => undefined },
 			Promise.resolve(Object.create(null)), editorService, configurationService,
-			commandService, workspaceContextService, quickInputService, labelService, pathService, extensionService);
+			commandService, workspaceContextService, quickInputService, labelService, pathService, extensionService, storageService);
 	}
 }
 
diff --git a/src/vs/workbench/services/configurationResolver/common/configurationResolver.ts b/src/vs/workbench/services/configurationResolver/common/configurationResolver.ts
index 7087026e975..1988fd45584 100644
--- a/src/vs/workbench/services/configurationResolver/common/configurationResolver.ts
+++ b/src/vs/workbench/services/configurationResolver/common/configurationResolver.ts
@@ -8,6 +8,7 @@ import { createDecorator } from 'vs/platform/instantiation/common/instantiation'
 import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
 import { ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
 import { IProcessEnvironment } from 'vs/base/common/platform';
+import { ErrorNoTelemetry } from 'vs/base/common/errors';
 
 export const IConfigurationResolverService = createDecorator<IConfigurationResolverService>('configurationResolverService');
 
@@ -111,7 +112,7 @@ export enum VariableKind {
 	PathSeparatorAlias = '/'
 }
 
-export class VariableError extends Error {
+export class VariableError extends ErrorNoTelemetry {
 	constructor(public readonly variable: VariableKind, message?: string) {
 		super(message);
 	}
diff --git a/src/vs/workbench/services/configurationResolver/electron-sandbox/configurationResolverService.ts b/src/vs/workbench/services/configurationResolver/electron-sandbox/configurationResolverService.ts
index bb1a8751e6d..f95d84fb698 100644
--- a/src/vs/workbench/services/configurationResolver/electron-sandbox/configurationResolverService.ts
+++ b/src/vs/workbench/services/configurationResolver/electron-sandbox/configurationResolverService.ts
@@ -16,6 +16,7 @@ import { ILabelService } from 'vs/platform/label/common/label';
 import { IShellEnvironmentService } from 'vs/workbench/services/environment/electron-sandbox/shellEnvironmentService';
 import { IPathService } from 'vs/workbench/services/path/common/pathService';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
+import { IStorageService } from 'vs/platform/storage/common/storage';
 
 export class ConfigurationResolverService extends BaseConfigurationResolverService {
 
@@ -30,6 +31,7 @@ export class ConfigurationResolverService extends BaseConfigurationResolverServi
 		@IShellEnvironmentService shellEnvironmentService: IShellEnvironmentService,
 		@IPathService pathService: IPathService,
 		@IExtensionService extensionService: IExtensionService,
+		@IStorageService storageService: IStorageService,
 	) {
 		super({
 			getAppRoot: (): string | undefined => {
@@ -39,7 +41,7 @@ export class ConfigurationResolverService extends BaseConfigurationResolverServi
 				return environmentService.execPath;
 			},
 		}, shellEnvironmentService.getShellEnv(), editorService, configurationService, commandService,
-			workspaceContextService, quickInputService, labelService, pathService, extensionService);
+			workspaceContextService, quickInputService, labelService, pathService, extensionService, storageService);
 	}
 }
 
diff --git a/src/vs/workbench/services/configurationResolver/test/electron-sandbox/configurationResolverService.test.ts b/src/vs/workbench/services/configurationResolver/test/electron-sandbox/configurationResolverService.test.ts
index c3636300a65..cf09d6df9b0 100644
--- a/src/vs/workbench/services/configurationResolver/test/electron-sandbox/configurationResolverService.test.ts
+++ b/src/vs/workbench/services/configurationResolver/test/electron-sandbox/configurationResolverService.test.ts
@@ -27,7 +27,7 @@ import { IConfigurationResolverService } from 'vs/workbench/services/configurati
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
 import { IPathService } from 'vs/workbench/services/path/common/pathService';
 import { TestEditorService, TestQuickInputService } from 'vs/workbench/test/browser/workbenchTestServices';
-import { TestContextService, TestExtensionService } from 'vs/workbench/test/common/workbenchTestServices';
+import { TestContextService, TestExtensionService, TestStorageService } from 'vs/workbench/test/common/workbenchTestServices';
 
 const mockLineNumber = 10;
 class TestEditorServiceWithActiveEditor extends TestEditorService {
@@ -84,7 +84,7 @@ suite('Configuration Resolver Service', () => {
 		extensionService = new TestExtensionService();
 		containingWorkspace = testWorkspace(URI.parse('file:///VSCode/workspaceLocation'));
 		workspace = containingWorkspace.folders[0];
-		configurationResolverService = new TestConfigurationResolverService(nullContext, Promise.resolve(envVariables), editorService, new MockInputsConfigurationService(), mockCommandService, new TestContextService(containingWorkspace), quickInputService, labelService, pathService, extensionService);
+		configurationResolverService = new TestConfigurationResolverService(nullContext, Promise.resolve(envVariables), editorService, new MockInputsConfigurationService(), mockCommandService, new TestContextService(containingWorkspace), quickInputService, labelService, pathService, extensionService, disposables.add(new TestStorageService()));
 	});
 
 	teardown(() => {
@@ -230,7 +230,7 @@ suite('Configuration Resolver Service', () => {
 			}
 		});
 
-		const service = new TestConfigurationResolverService(nullContext, Promise.resolve(envVariables), disposables.add(new TestEditorServiceWithActiveEditor()), configurationService, mockCommandService, new TestContextService(), quickInputService, labelService, pathService, extensionService);
+		const service = new TestConfigurationResolverService(nullContext, Promise.resolve(envVariables), disposables.add(new TestEditorServiceWithActiveEditor()), configurationService, mockCommandService, new TestContextService(), quickInputService, labelService, pathService, extensionService, disposables.add(new TestStorageService()));
 		assert.strictEqual(await service.resolveAsync(workspace, 'abc ${config:editor.fontFamily} xyz'), 'abc foo xyz');
 	});
 
@@ -241,7 +241,7 @@ suite('Configuration Resolver Service', () => {
 			}
 		});
 
-		const service = new TestConfigurationResolverService(nullContext, Promise.resolve(envVariables), disposables.add(new TestEditorServiceWithActiveEditor()), configurationService, mockCommandService, new TestContextService(), quickInputService, labelService, pathService, extensionService);
+		const service = new TestConfigurationResolverService(nullContext, Promise.resolve(envVariables), disposables.add(new TestEditorServiceWithActiveEditor()), configurationService, mockCommandService, new TestContextService(), quickInputService, labelService, pathService, extensionService, disposables.add(new TestStorageService()));
 		assert.strictEqual(await service.resolveAsync(undefined, 'abc ${config:editor.fontFamily} xyz'), 'abc foo xyz');
 	});
 
@@ -257,7 +257,7 @@ suite('Configuration Resolver Service', () => {
 			}
 		});
 
-		const service = new TestConfigurationResolverService(nullContext, Promise.resolve(envVariables), disposables.add(new TestEditorServiceWithActiveEditor()), configurationService, mockCommandService, new TestContextService(), quickInputService, labelService, pathService, extensionService);
+		const service = new TestConfigurationResolverService(nullContext, Promise.resolve(envVariables), disposables.add(new TestEditorServiceWithActiveEditor()), configurationService, mockCommandService, new TestContextService(), quickInputService, labelService, pathService, extensionService, disposables.add(new TestStorageService()));
 		assert.strictEqual(await service.resolveAsync(workspace, 'abc ${config:editor.fontFamily} ${config:terminal.integrated.fontFamily} xyz'), 'abc foo bar xyz');
 	});
 
@@ -273,7 +273,7 @@ suite('Configuration Resolver Service', () => {
 			}
 		});
 
-		const service = new TestConfigurationResolverService(nullContext, Promise.resolve(envVariables), disposables.add(new TestEditorServiceWithActiveEditor()), configurationService, mockCommandService, new TestContextService(), quickInputService, labelService, pathService, extensionService);
+		const service = new TestConfigurationResolverService(nullContext, Promise.resolve(envVariables), disposables.add(new TestEditorServiceWithActiveEditor()), configurationService, mockCommandService, new TestContextService(), quickInputService, labelService, pathService, extensionService, disposables.add(new TestStorageService()));
 		if (platform.isWindows) {
 			assert.strictEqual(await service.resolveAsync(workspace, 'abc ${config:editor.fontFamily} ${workspaceFolder} ${env:key1} xyz'), 'abc foo \\VSCode\\workspaceLocation Value for key1 xyz');
 		} else {
@@ -293,7 +293,7 @@ suite('Configuration Resolver Service', () => {
 			}
 		});
 
-		const service = new TestConfigurationResolverService(nullContext, Promise.resolve(envVariables), disposables.add(new TestEditorServiceWithActiveEditor()), configurationService, mockCommandService, new TestContextService(), quickInputService, labelService, pathService, extensionService);
+		const service = new TestConfigurationResolverService(nullContext, Promise.resolve(envVariables), disposables.add(new TestEditorServiceWithActiveEditor()), configurationService, mockCommandService, new TestContextService(), quickInputService, labelService, pathService, extensionService, disposables.add(new TestStorageService()));
 		if (platform.isWindows) {
 			assert.strictEqual(await service.resolveAsync(workspace, '${config:editor.fontFamily} ${config:terminal.integrated.fontFamily} ${workspaceFolder} - ${workspaceFolder} ${env:key1} - ${env:key2}'), 'foo bar \\VSCode\\workspaceLocation - \\VSCode\\workspaceLocation Value for key1 - Value for key2');
 		} else {
@@ -326,7 +326,7 @@ suite('Configuration Resolver Service', () => {
 			}
 		});
 
-		const service = new TestConfigurationResolverService(nullContext, Promise.resolve(envVariables), disposables.add(new TestEditorServiceWithActiveEditor()), configurationService, mockCommandService, new TestContextService(), quickInputService, labelService, pathService, extensionService);
+		const service = new TestConfigurationResolverService(nullContext, Promise.resolve(envVariables), disposables.add(new TestEditorServiceWithActiveEditor()), configurationService, mockCommandService, new TestContextService(), quickInputService, labelService, pathService, extensionService, disposables.add(new TestStorageService()));
 		assert.strictEqual(await service.resolveAsync(workspace, 'abc ${config:editor.fontFamily} ${config:editor.lineNumbers} ${config:editor.insertSpaces} xyz'), 'abc foo 123 false xyz');
 	});
 
@@ -335,7 +335,7 @@ suite('Configuration Resolver Service', () => {
 			editor: {}
 		});
 
-		const service = new TestConfigurationResolverService(nullContext, Promise.resolve(envVariables), disposables.add(new TestEditorServiceWithActiveEditor()), configurationService, mockCommandService, new TestContextService(), quickInputService, labelService, pathService, extensionService);
+		const service = new TestConfigurationResolverService(nullContext, Promise.resolve(envVariables), disposables.add(new TestEditorServiceWithActiveEditor()), configurationService, mockCommandService, new TestContextService(), quickInputService, labelService, pathService, extensionService, disposables.add(new TestStorageService()));
 		assert.strictEqual(await service.resolveAsync(workspace, 'abc ${unknownVariable} xyz'), 'abc ${unknownVariable} xyz');
 		assert.strictEqual(await service.resolveAsync(workspace, 'abc ${env:unknownVariable} xyz'), 'abc  xyz');
 	});
@@ -347,7 +347,7 @@ suite('Configuration Resolver Service', () => {
 			}
 		});
 
-		const service = new TestConfigurationResolverService(nullContext, Promise.resolve(envVariables), disposables.add(new TestEditorServiceWithActiveEditor()), configurationService, mockCommandService, new TestContextService(), quickInputService, labelService, pathService, extensionService);
+		const service = new TestConfigurationResolverService(nullContext, Promise.resolve(envVariables), disposables.add(new TestEditorServiceWithActiveEditor()), configurationService, mockCommandService, new TestContextService(), quickInputService, labelService, pathService, extensionService, disposables.add(new TestStorageService()));
 
 		assert.rejects(async () => await service.resolveAsync(workspace, 'abc ${env} xyz'));
 		assert.rejects(async () => await service.resolveAsync(workspace, 'abc ${env:} xyz'));
diff --git a/src/vs/workbench/services/dialogs/browser/simpleFileDialog.ts b/src/vs/workbench/services/dialogs/browser/simpleFileDialog.ts
index 95be556e81a..eddc7ca7190 100644
--- a/src/vs/workbench/services/dialogs/browser/simpleFileDialog.ts
+++ b/src/vs/workbench/services/dialogs/browser/simpleFileDialog.ts
@@ -18,7 +18,9 @@ import { IModelService } from 'vs/editor/common/services/model';
 import { ILanguageService } from 'vs/editor/common/languages/language';
 import { getIconClasses } from 'vs/editor/common/services/getIconClasses';
 import { Schemas } from 'vs/base/common/network';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
+// --- Start PWB: disable file downloads ---
+import { IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService';
+// --- End PWB ---
 import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
 import { IContextKeyService, IContextKey, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { equalsIgnoreCase, format, startsWithIgnoreCase } from 'vs/base/common/strings';
@@ -143,7 +145,9 @@ export class SimpleFileDialog implements ISimpleFileDialog {
 		@IFileDialogService private readonly fileDialogService: IFileDialogService,
 		@IModelService private readonly modelService: IModelService,
 		@ILanguageService private readonly languageService: ILanguageService,
-		@IWorkbenchEnvironmentService protected readonly environmentService: IWorkbenchEnvironmentService,
+		// --- Start PWB: disable file downloads ---
+		@IBrowserWorkbenchEnvironmentService protected readonly environmentService: IBrowserWorkbenchEnvironmentService,
+		// --- End PWB ---
 		@IRemoteAgentService private readonly remoteAgentService: IRemoteAgentService,
 		@IPathService protected readonly pathService: IPathService,
 		@IKeybindingService private readonly keybindingService: IKeybindingService,
@@ -286,20 +290,24 @@ export class SimpleFileDialog implements ISimpleFileDialog {
 			this.filePickBox.sortByLabel = false;
 			this.filePickBox.ignoreFocusOut = true;
 			this.filePickBox.ok = true;
-			if ((this.scheme !== Schemas.file) && this.options && this.options.availableFileSystems && (this.options.availableFileSystems.length > 1) && (this.options.availableFileSystems.indexOf(Schemas.file) > -1)) {
-				this.filePickBox.customButton = true;
-				this.filePickBox.customLabel = nls.localize('remoteFileDialog.local', 'Show Local');
-				let action;
-				if (isSave) {
-					action = SaveLocalFileCommand;
-				} else {
-					action = this.allowFileSelection ? (this.allowFolderSelection ? OpenLocalFileFolderCommand : OpenLocalFileCommand) : OpenLocalFolderCommand;
-				}
-				const keybinding = this.keybindingService.lookupKeybinding(action.ID);
-				if (keybinding) {
-					const label = keybinding.getLabel();
-					if (label) {
-						this.filePickBox.customHover = format('{0} ({1})', action.LABEL, label);
+			// --- Start PWB: disable file downloads ---
+			if ((isSave && this.environmentService.isEnabledFileDownloads) || (!isSave && this.environmentService.isEnabledFileUploads)) {
+				if ((this.scheme !== Schemas.file) && this.options && this.options.availableFileSystems && (this.options.availableFileSystems.length > 1) && (this.options.availableFileSystems.indexOf(Schemas.file) > -1)) {
+					this.filePickBox.customButton = true;
+					this.filePickBox.customLabel = nls.localize('remoteFileDialog.local', 'Show Local');
+					let action;
+					if (isSave) {
+						action = SaveLocalFileCommand;
+					} else {
+						action = this.allowFileSelection ? (this.allowFolderSelection ? OpenLocalFileFolderCommand : OpenLocalFileCommand) : OpenLocalFolderCommand;
+					}
+					const keybinding = this.keybindingService.lookupKeybinding(action.ID);
+					if (keybinding) {
+						const label = keybinding.getLabel();
+						if (label) {
+							this.filePickBox.customHover = format('{0} ({1})', action.LABEL, label);
+						}
+						// --- End PWB ---
 					}
 				}
 			}
diff --git a/src/vs/workbench/services/editor/browser/editorResolverService.ts b/src/vs/workbench/services/editor/browser/editorResolverService.ts
index 8275646f62e..e05a0389119 100644
--- a/src/vs/workbench/services/editor/browser/editorResolverService.ts
+++ b/src/vs/workbench/services/editor/browser/editorResolverService.ts
@@ -5,7 +5,7 @@
 
 import * as glob from 'vs/base/common/glob';
 import { distinct, firstOrDefault, insert } from 'vs/base/common/arrays';
-import { Disposable, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
+import { Disposable, DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
 import { basename, extname, isEqual } from 'vs/base/common/resources';
 import { URI } from 'vs/base/common/uri';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
@@ -716,7 +716,8 @@ export class EditorResolverService extends Disposable implements IEditorResolver
 		const editorPicks = this.mapEditorsToQuickPickEntry(resource, showDefaultPicker);
 
 		// Create the editor picker
-		const editorPicker = this.quickInputService.createQuickPick<IQuickPickItem>();
+		const disposables = new DisposableStore();
+		const editorPicker = disposables.add(this.quickInputService.createQuickPick<IQuickPickItem>({ useSeparators: true }));
 		const placeHolderMessage = showDefaultPicker ?
 			localize('promptOpenWith.updateDefaultPlaceHolder', "Select new default editor for '{0}'", `*${extname(resource)}`) :
 			localize('promptOpenWith.placeHolder', "Select editor for '{0}'", basename(resource));
@@ -730,7 +731,7 @@ export class EditorResolverService extends Disposable implements IEditorResolver
 
 		// Prompt the user to select an editor
 		const picked: EditorPick | undefined = await new Promise<EditorPick | undefined>(resolve => {
-			editorPicker.onDidAccept(e => {
+			disposables.add(editorPicker.onDidAccept(e => {
 				let result: EditorPick | undefined = undefined;
 
 				if (editorPicker.selectedItems.length === 1) {
@@ -747,11 +748,14 @@ export class EditorResolverService extends Disposable implements IEditorResolver
 				}
 
 				resolve(result);
-			});
+			}));
 
-			editorPicker.onDidHide(() => resolve(undefined));
+			disposables.add(editorPicker.onDidHide(() => {
+				disposables.dispose();
+				resolve(undefined);
+			}));
 
-			editorPicker.onDidTriggerItemButton(e => {
+			disposables.add(editorPicker.onDidTriggerItemButton(e => {
 
 				// Trigger opening and close picker
 				resolve({ item: e.item, openInBackground: false });
@@ -760,7 +764,7 @@ export class EditorResolverService extends Disposable implements IEditorResolver
 				if (resource && e.item && e.item.id) {
 					this.updateUserAssociations(`*${extname(resource)}`, e.item.id,);
 				}
-			});
+			}));
 
 			editorPicker.show();
 		});
diff --git a/src/vs/workbench/services/editor/common/editorGroupsService.ts b/src/vs/workbench/services/editor/common/editorGroupsService.ts
index b90d84720f0..a6483f92b8b 100644
--- a/src/vs/workbench/services/editor/common/editorGroupsService.ts
+++ b/src/vs/workbench/services/editor/common/editorGroupsService.ts
@@ -438,6 +438,11 @@ export interface IEditorPart extends IEditorGroupsContainer {
 	 */
 	readonly onDidScroll: Event<void>;
 
+	/**
+	 * An event for when the editor part is disposed.
+	 */
+	readonly onWillDispose: Event<void>;
+
 	/**
 	 * The identifier of the window the editor part is contained in.
 	 */
@@ -480,12 +485,6 @@ export interface IAuxiliaryEditorPart extends IEditorPart {
 	close(): boolean;
 }
 
-export interface IAuxiliaryEditorPartCreateEvent {
-	readonly part: IAuxiliaryEditorPart;
-	readonly instantiationService: IInstantiationService;
-	readonly disposables: DisposableStore;
-}
-
 export interface IEditorWorkingSet {
 	readonly id: string;
 	readonly name: string;
@@ -523,7 +522,7 @@ export interface IEditorGroupsService extends IEditorGroupsContainer {
 	/**
 	 * An event for when a new auxiliary editor part is created.
 	 */
-	readonly onDidCreateAuxiliaryEditorPart: Event<IAuxiliaryEditorPartCreateEvent>;
+	readonly onDidCreateAuxiliaryEditorPart: Event<IAuxiliaryEditorPart>;
 
 	/**
 	 * Provides access to the main window editor part.
@@ -561,6 +560,14 @@ export interface IEditorGroupsService extends IEditorGroupsContainer {
 	 */
 	createAuxiliaryEditorPart(options?: { bounds?: Partial<IRectangle> }): Promise<IAuxiliaryEditorPart>;
 
+	/**
+	 * Returns the instantiation service that is scoped to the
+	 * provided editor part. Use this method when building UI
+	 * that contributes to auxiliary editor parts to ensure the
+	 * UI is scoped to that part.
+	 */
+	getScopedInstantiationService(part: IEditorPart): IInstantiationService;
+
 	/**
 	 * Save a new editor working set from the currently opened
 	 * editors and group layout.
diff --git a/src/vs/workbench/services/environment/browser/environmentService.ts b/src/vs/workbench/services/environment/browser/environmentService.ts
index 4a8a93ff8bf..c75230b1d40 100644
--- a/src/vs/workbench/services/environment/browser/environmentService.ts
+++ b/src/vs/workbench/services/environment/browser/environmentService.ts
@@ -20,6 +20,10 @@ import { refineServiceDecorator } from 'vs/platform/instantiation/common/instant
 import { ITextEditorOptions } from 'vs/platform/editor/common/editor';
 import { EXTENSION_IDENTIFIER_WITH_LOG_REGEX } from 'vs/platform/environment/common/environmentService';
 
+// --- Start PWB ---
+import { isWeb } from 'vs/base/common/platform';
+// --- End PWB ---
+
 export const IBrowserWorkbenchEnvironmentService = refineServiceDecorator<IEnvironmentService, IBrowserWorkbenchEnvironmentService>(IEnvironmentService);
 
 /**
@@ -33,6 +37,18 @@ export interface IBrowserWorkbenchEnvironmentService extends IWorkbenchEnvironme
 	 */
 	readonly options?: IWorkbenchConstructionOptions;
 
+	// --- Start PWB: disable file downloads ---
+	/**
+	 * Enable downloading files via menu actions.
+	 */
+	readonly isEnabledFileDownloads?: boolean;
+
+	/**
+	 * Enable uploading files via menu actions.
+	 */
+	readonly isEnabledFileUploads?: boolean;
+	// --- End PWB ---
+
 	/**
 	 * Gets whether a resolver extension is expected for the environment.
 	 */
@@ -102,7 +118,31 @@ export class BrowserWorkbenchEnvironmentService implements IBrowserWorkbenchEnvi
 	get logFile(): URI { return joinPath(this.windowLogsPath, 'window.log'); }
 
 	@memoize
-	get userRoamingDataHome(): URI { return URI.file('/User').with({ scheme: Schemas.vscodeUserData }); }
+	// -- Start PWB: Local storage ---
+	get userRoamingDataHome(): URI {
+		// In a web context, derive the user data path from the `userDataPath`
+		// option if provided (always used on PWB)
+		return isWeb && this.options.userDataPath ?
+			joinPath(URI.file(this.options.userDataPath).with({ scheme: Schemas.vscodeRemote }), 'User') :
+			URI.file('/User').with({ scheme: Schemas.vscodeUserData });
+	}
+	// --- End PWB ---
+
+	// --- Start PWB: disable file downloads ---
+	get isEnabledFileDownloads(): boolean {
+		if (typeof this.options.isEnabledFileDownloads === 'undefined') {
+			throw new Error('isEnabledFileDownloads was not provided to the browser');
+		}
+		return this.options.isEnabledFileDownloads;
+	}
+
+	get isEnabledFileUploads(): boolean {
+		if (typeof this.options.isEnabledFileUploads === 'undefined') {
+			throw new Error('isEnabledFileUploads was not provided to the browser');
+		}
+		return this.options.isEnabledFileUploads;
+	}
+	// --- End PWB ---
 
 	@memoize
 	get argvResource(): URI { return joinPath(this.userRoamingDataHome, 'argv.json'); }
@@ -225,9 +265,11 @@ export class BrowserWorkbenchEnvironmentService implements IBrowserWorkbenchEnvi
 
 	@memoize
 	get webviewExternalEndpoint(): string {
-		const endpoint = this.options.webviewEndpoint
+		// --- Start PWB: serve same origin ---
+		const endpoint = (this.options.webviewEndpoint && new URL(this.options.webviewEndpoint, window.location.toString()).toString())
 			|| this.productService.webviewContentExternalBaseUrlTemplate
 			|| 'https://{{uuid}}.vscode-cdn.net/{{quality}}/{{commit}}/out/vs/workbench/contrib/webview/browser/pre/';
+		// --- End PWB: serve same origin ---
 
 		const webviewExternalEndpointCommit = this.payload?.get('webviewExternalEndpointCommit');
 		return endpoint
@@ -257,7 +299,7 @@ export class BrowserWorkbenchEnvironmentService implements IBrowserWorkbenchEnvi
 	get disableWorkspaceTrust(): boolean { return !this.options.enableWorkspaceTrust; }
 
 	@memoize
-	get lastActiveProfile(): string | undefined { return this.payload?.get('lastActiveProfile'); }
+	get profile(): string | undefined { return this.payload?.get('profile'); }
 
 	editSessionId: string | undefined = this.options.editSessionId;
 
diff --git a/src/vs/workbench/services/extensionManagement/browser/extensionEnablementService.ts b/src/vs/workbench/services/extensionManagement/browser/extensionEnablementService.ts
index bbbd1d0b177..ec37cfccaa5 100644
--- a/src/vs/workbench/services/extensionManagement/browser/extensionEnablementService.ts
+++ b/src/vs/workbench/services/extensionManagement/browser/extensionEnablementService.ts
@@ -41,7 +41,7 @@ export class ExtensionEnablementService extends Disposable implements IWorkbench
 	public readonly onEnablementChanged: Event<readonly IExtension[]> = this._onEnablementChanged.event;
 
 	protected readonly extensionsManager: ExtensionsManager;
-	private readonly storageManger: StorageManager;
+	private readonly storageManager: StorageManager;
 
 	constructor(
 		@IStorageService storageService: IStorageService,
@@ -63,7 +63,7 @@ export class ExtensionEnablementService extends Disposable implements IWorkbench
 		@IInstantiationService instantiationService: IInstantiationService,
 	) {
 		super();
-		this.storageManger = this._register(new StorageManager(storageService));
+		this.storageManager = this._register(new StorageManager(storageService));
 
 		const uninstallDisposable = this._register(Event.filter(extensionManagementService.onDidUninstallExtension, e => !e.error)(({ identifier }) => this._reset(identifier)));
 		let isDisposed = false;
@@ -610,11 +610,11 @@ export class ExtensionEnablementService extends Disposable implements IWorkbench
 		if (!this.hasWorkspace) {
 			return [];
 		}
-		return this.storageManger.get(storageId, StorageScope.WORKSPACE);
+		return this.storageManager.get(storageId, StorageScope.WORKSPACE);
 	}
 
 	private _setExtensions(storageId: string, extensions: IExtensionIdentifier[]): void {
-		this.storageManger.set(storageId, extensions, StorageScope.WORKSPACE);
+		this.storageManager.set(storageId, extensions, StorageScope.WORKSPACE);
 	}
 
 	private async _onDidChangeGloballyDisabledExtensions(extensionIdentifiers: ReadonlyArray<IExtensionIdentifier>, source?: string): Promise<void> {
diff --git a/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts b/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
index bb278a467dd..34b573f3373 100644
--- a/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
+++ b/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
@@ -195,7 +195,11 @@ export class ExtensionManagementService extends Disposable implements IWorkbench
 			promises.push(this.uninstallInServer(server, extensions));
 		}
 
-		await Promise.allSettled(promises);
+		const result = await Promise.allSettled(promises);
+		const errors = result.filter(r => r.status === 'rejected').map(r => r.reason);
+		if (errors.length) {
+			throw new Error(errors.map(e => e.message).join('\n'));
+		}
 	}
 
 	private async uninstallInServer(server: IExtensionManagementServer, extensions: UninstallExtensionInfo[]): Promise<void> {
diff --git a/src/vs/workbench/services/extensions/browser/extensionService.ts b/src/vs/workbench/services/extensions/browser/extensionService.ts
index a5596ccb66c..82347b71978 100644
--- a/src/vs/workbench/services/extensions/browser/extensionService.ts
+++ b/src/vs/workbench/services/extensions/browser/extensionService.ts
@@ -186,7 +186,7 @@ export class ExtensionService extends AbstractExtensionService implements IExten
 
 	protected async _onExtensionHostExit(code: number): Promise<void> {
 		// Dispose everything associated with the extension host
-		this._doStopExtensionHosts();
+		await this._doStopExtensionHosts();
 
 		// If we are running extension tests, forward logs and exit code
 		const automatedWindow = mainWindow as unknown as IAutomatedWindow;
diff --git a/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts b/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts
index 57c7b36e886..bffb8bba722 100644
--- a/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts
+++ b/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts
@@ -6,17 +6,19 @@
 import * as dom from 'vs/base/browser/dom';
 import { parentOriginHash } from 'vs/base/browser/iframe';
 import { mainWindow } from 'vs/base/browser/window';
+import { isESM } from 'vs/base/common/amd';
 import { Barrier } from 'vs/base/common/async';
 import { VSBuffer } from 'vs/base/common/buffer';
 import { canceled, onUnexpectedError } from 'vs/base/common/errors';
 import { Emitter, Event } from 'vs/base/common/event';
 import { Disposable, toDisposable } from 'vs/base/common/lifecycle';
-import { COI, FileAccess } from 'vs/base/common/network';
+import { AppResourcePath, COI, FileAccess } from 'vs/base/common/network';
 import * as platform from 'vs/base/common/platform';
 import { joinPath } from 'vs/base/common/resources';
 import { URI } from 'vs/base/common/uri';
 import { generateUuid } from 'vs/base/common/uuid';
 import { IMessagePassingProtocol } from 'vs/base/parts/ipc/common/ipc';
+import { getNLSLanguage, getNLSMessages } from 'vs/nls';
 import { ILabelService } from 'vs/platform/label/common/label';
 import { ILayoutService } from 'vs/platform/layout/browser/layoutService';
 import { ILogService, ILoggerService } from 'vs/platform/log/common/log';
@@ -85,7 +87,7 @@ export class WebWorkerExtensionHost extends Disposable implements IExtensionHost
 
 		const suffix = `?${suffixSearchParams.toString()}`;
 
-		const iframeModulePath = 'vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html';
+		const iframeModulePath: AppResourcePath = `vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.${isESM ? 'esm.' : ''}html`;
 		if (platform.isWeb) {
 			const webEndpointUrlTemplate = this._productService.webEndpointUrlTemplate;
 			const commit = this._productService.commit;
@@ -183,16 +185,16 @@ export class WebWorkerExtensionHost extends Disposable implements IExtensionHost
 			}
 			if (event.data.type === 'vscode.bootstrap.nls') {
 				const factoryModuleId = 'vs/base/worker/workerMain.js';
-				const baseUrl = require.toUrl(factoryModuleId).slice(0, -factoryModuleId.length);
+				const baseUrl = isESM ? undefined : require.toUrl(factoryModuleId).slice(0, -factoryModuleId.length);
 				iframe.contentWindow!.postMessage({
 					type: event.data.type,
 					data: {
 						baseUrl,
-						workerUrl: require.toUrl(factoryModuleId),
+						workerUrl: isESM ? FileAccess.asBrowserUri('vs/workbench/api/worker/extensionHostWorker.esm.js').toString(true) : require.toUrl(factoryModuleId),
+						fileRoot: globalThis._VSCODE_FILE_ROOT,
 						nls: {
-							// VSCODE_GLOBALS: NLS
-							messages: globalThis._VSCODE_NLS_MESSAGES,
-							language: globalThis._VSCODE_NLS_LANGUAGE
+							messages: getNLSMessages(),
+							language: getNLSLanguage()
 						}
 					}
 				}, '*');
diff --git a/src/vs/workbench/services/extensions/common/abstractExtensionService.ts b/src/vs/workbench/services/extensions/common/abstractExtensionService.ts
index 20f22d39113..5c82fed076c 100644
--- a/src/vs/workbench/services/extensions/common/abstractExtensionService.ts
+++ b/src/vs/workbench/services/extensions/common/abstractExtensionService.ts
@@ -204,23 +204,25 @@ export abstract class AbstractExtensionService extends Disposable implements IEx
 
 		this._register(this._lifecycleService.onWillShutdown(event => {
 			if (this._remoteAgentService.getConnection()) {
-				event.join(() => this._remoteAgentService.endConnection(), {
+				event.join(async () => {
+					// We need to disconnect the management connection before killing the local extension host.
+					// Otherwise, the local extension host might terminate the underlying tunnel before the
+					// management connection has a chance to send its disconnection message.
+					await this._remoteAgentService.endConnection();
+					await this._doStopExtensionHosts();
+					this._remoteAgentService.getConnection()?.dispose();
+				}, {
 					id: 'join.disconnectRemote',
 					label: nls.localize('disconnectRemote', "Disconnect Remote Agent"),
 					order: WillShutdownJoinerOrder.Last // after others have joined that might depend on a remote connection
 				});
+			} else {
+				event.join(this._doStopExtensionHosts(), {
+					id: 'join.stopExtensionHosts',
+					label: nls.localize('stopExtensionHosts', "Stopping Extension Hosts"),
+				});
 			}
 		}));
-
-		this._register(this._lifecycleService.onDidShutdown(() => {
-			// We need to disconnect the management connection before killing the local extension host.
-			// Otherwise, the local extension host might terminate the underlying tunnel before the
-			// management connection has a chance to send its disconnection message.
-			const connection = this._remoteAgentService.getConnection();
-			connection?.dispose();
-
-			this._doStopExtensionHosts();
-		}));
 	}
 
 	protected _getExtensionHostManagers(kind: ExtensionHostKind): IExtensionHostManager[] {
@@ -692,7 +694,7 @@ export abstract class AbstractExtensionService extends Disposable implements IEx
 		return this._doStopExtensionHostsWithVeto(reason, auto);
 	}
 
-	protected _doStopExtensionHosts(): void {
+	protected async _doStopExtensionHosts(): Promise<void> {
 		const previouslyActivatedExtensionIds: ExtensionIdentifier[] = [];
 		for (const extensionStatus of this._extensionStatus.values()) {
 			if (extensionStatus.activationStarted) {
@@ -700,7 +702,7 @@ export abstract class AbstractExtensionService extends Disposable implements IEx
 			}
 		}
 
-		this._extensionHostManagers.disposeAllInReverse();
+		await this._extensionHostManagers.stopAllInReverse();
 		for (const extensionStatus of this._extensionStatus.values()) {
 			extensionStatus.clearRuntimeStatus();
 		}
@@ -710,12 +712,13 @@ export abstract class AbstractExtensionService extends Disposable implements IEx
 		}
 	}
 
-	private async _doStopExtensionHostsWithVeto(reason: string, auto?: boolean): Promise<boolean> {
+	private async _doStopExtensionHostsWithVeto(reason: string, auto: boolean = false): Promise<boolean> {
 		const vetos: (boolean | Promise<boolean>)[] = [];
 		const vetoReasons = new Set<string>();
 
 		this._onWillStop.fire({
 			reason,
+			auto,
 			veto(value, reason) {
 				vetos.push(value);
 
@@ -737,7 +740,7 @@ export abstract class AbstractExtensionService extends Disposable implements IEx
 
 		const veto = await handleVetos(vetos, error => this._logService.error(error));
 		if (!veto) {
-			this._doStopExtensionHosts();
+			await this._doStopExtensionHosts();
 		} else {
 			if (!auto) {
 				const vetoReasonsArray = Array.from(vetoReasons);
@@ -828,7 +831,7 @@ export abstract class AbstractExtensionService extends Disposable implements IEx
 			if (signal) {
 				this._onRemoteExtensionHostCrashed(extensionHost, signal);
 			}
-			this._extensionHostManagers.disposeOne(extensionHost);
+			this._extensionHostManagers.stopOne(extensionHost);
 		}
 	}
 
@@ -893,7 +896,7 @@ export abstract class AbstractExtensionService extends Disposable implements IEx
 	}
 
 	public async startExtensionHosts(updates?: { toAdd: IExtension[]; toRemove: string[] }): Promise<void> {
-		this._doStopExtensionHosts();
+		await this._doStopExtensionHosts();
 
 		if (updates) {
 			await this._handleDeltaExtensions(new DeltaExtensionsQueueItem(updates.toAdd, updates.toRemove));
@@ -1219,7 +1222,7 @@ export abstract class AbstractExtensionService extends Disposable implements IEx
 	//#endregion
 
 	protected abstract _resolveExtensions(): Promise<ResolvedExtensions>;
-	protected abstract _onExtensionHostExit(code: number): void;
+	protected abstract _onExtensionHostExit(code: number): Promise<void>;
 	protected abstract _resolveAuthority(remoteAuthority: string): Promise<ResolverResult>;
 }
 
@@ -1227,8 +1230,13 @@ class ExtensionHostCollection extends Disposable {
 
 	private _extensionHostManagers: ExtensionHostManagerData[] = [];
 
-	public override dispose(): void {
-		this.disposeAllInReverse();
+	public override dispose() {
+		for (let i = this._extensionHostManagers.length - 1; i >= 0; i--) {
+			const manager = this._extensionHostManagers[i];
+			manager.extensionHost.disconnect();
+			manager.dispose();
+		}
+		this._extensionHostManagers = [];
 		super.dispose();
 	}
 
@@ -1236,20 +1244,23 @@ class ExtensionHostCollection extends Disposable {
 		this._extensionHostManagers.push(new ExtensionHostManagerData(extensionHostManager, disposableStore));
 	}
 
-	public disposeAllInReverse(): void {
+	public async stopAllInReverse(): Promise<void> {
 		// See https://github.com/microsoft/vscode/issues/152204
 		// Dispose extension hosts in reverse creation order because the local extension host
 		// might be critical in sustaining a connection to the remote extension host
 		for (let i = this._extensionHostManagers.length - 1; i >= 0; i--) {
-			this._extensionHostManagers[i].dispose();
+			const manager = this._extensionHostManagers[i];
+			await manager.extensionHost.disconnect();
+			manager.dispose();
 		}
 		this._extensionHostManagers = [];
 	}
 
-	public disposeOne(extensionHostManager: IExtensionHostManager): void {
+	public async stopOne(extensionHostManager: IExtensionHostManager): Promise<void> {
 		const index = this._extensionHostManagers.findIndex(el => el.extensionHost === extensionHostManager);
 		if (index >= 0) {
 			this._extensionHostManagers.splice(index, 1);
+			await extensionHostManager.disconnect();
 			extensionHostManager.dispose();
 		}
 	}
diff --git a/src/vs/workbench/services/extensions/common/extensionHostManager.ts b/src/vs/workbench/services/extensions/common/extensionHostManager.ts
index 5ac6e661e85..ced3a9b9070 100644
--- a/src/vs/workbench/services/extensions/common/extensionHostManager.ts
+++ b/src/vs/workbench/services/extensions/common/extensionHostManager.ts
@@ -161,13 +161,14 @@ export class ExtensionHostManager extends Disposable implements IExtensionHostMa
 		});
 	}
 
+	public async disconnect(): Promise<void> {
+		await this._extensionHost?.disconnect?.();
+	}
+
 	public override dispose(): void {
-		if (this._extensionHost) {
-			this._extensionHost.dispose();
-		}
-		if (this._rpcProtocol) {
-			this._rpcProtocol.dispose();
-		}
+		this._extensionHost?.dispose();
+		this._rpcProtocol?.dispose();
+
 		for (let i = 0, len = this._customers.length; i < len; i++) {
 			const customer = this._customers[i];
 			try {
diff --git a/src/vs/workbench/services/extensions/common/extensionHostManagers.ts b/src/vs/workbench/services/extensions/common/extensionHostManagers.ts
index 1b3b491ccd6..de4ecc8d1c6 100644
--- a/src/vs/workbench/services/extensions/common/extensionHostManagers.ts
+++ b/src/vs/workbench/services/extensions/common/extensionHostManagers.ts
@@ -20,6 +20,7 @@ export interface IExtensionHostManager {
 	readonly friendyName: string;
 	readonly onDidExit: Event<[number, string | null]>;
 	readonly onDidChangeResponsiveState: Event<ResponsiveState>;
+	disconnect(): Promise<void>;
 	dispose(): void;
 	ready(): Promise<void>;
 	representsRunningLocation(runningLocation: ExtensionRunningLocation): boolean;
diff --git a/src/vs/workbench/services/extensions/common/extensions.ts b/src/vs/workbench/services/extensions/common/extensions.ts
index fb5ae1df4a1..3ab067832dc 100644
--- a/src/vs/workbench/services/extensions/common/extensions.ts
+++ b/src/vs/workbench/services/extensions/common/extensions.ts
@@ -127,6 +127,7 @@ export interface IExtensionHost {
 	start(): Promise<IMessagePassingProtocol>;
 	getInspectPort(): { port: number; host: string } | undefined;
 	enableInspectPort(): Promise<boolean>;
+	disconnect?(): Promise<void>;
 	dispose(): void;
 }
 
@@ -312,16 +313,9 @@ function extensionDescriptionArrayToMap(extensions: IExtensionDescription[]): Ex
 }
 
 export function isProposedApiEnabled(extension: IExtensionDescription, proposal: ApiProposalName): boolean {
-	// --- Start Positron ---
-	// Enable all proposed APIs for builtin extensions.
-	if (extension.isBuiltin) {
-		return true;
-	}
-	// --- End Positron ---
-	if (!extension.enabledApiProposals) {
-		return false;
-	}
-	return extension.enabledApiProposals.includes(proposal);
+	// --- Start PWB: Always allow proposed API
+	return true;
+	// --- End PWB
 }
 
 export function checkProposedApiEnabled(extension: IExtensionDescription, proposal: ApiProposalName): void {
@@ -390,6 +384,11 @@ export interface WillStopExtensionHostsEvent {
 	 */
 	readonly reason: string;
 
+	/**
+	 * A flag to indicate if the operation was triggered automatically
+	 */
+	readonly auto: boolean;
+
 	/**
 	 * Allows to veto the stopping of extension hosts. The veto can be a long running
 	 * operation.
diff --git a/src/vs/workbench/services/extensions/common/extensionsProposedApi.ts b/src/vs/workbench/services/extensions/common/extensionsProposedApi.ts
index 8133ef3e43a..5bc5cc66c98 100644
--- a/src/vs/workbench/services/extensions/common/extensionsProposedApi.ts
+++ b/src/vs/workbench/services/extensions/common/extensionsProposedApi.ts
@@ -32,6 +32,9 @@ export class ExtensionsProposedApi {
 		this._envEnabledExtensions = new Set((_environmentService.extensionEnabledProposedApi ?? []).map(id => ExtensionIdentifier.toKey(id)));
 
 		this._envEnablesProposedApiForAll =
+			// --- Start PWB: Always allow proposed API
+			true ||
+			// --- End PWB
 			!_environmentService.isBuilt || // always allow proposed API when running out of sources
 			(_environmentService.isExtensionDevelopment && productService.quality !== 'stable') || // do not allow proposed API against stable builds when developing an extension
 			(this._envEnabledExtensions.size === 0 && Array.isArray(_environmentService.extensionEnabledProposedApi)); // always allow proposed API if --enable-proposed-api is provided without extension ID
diff --git a/src/vs/workbench/services/extensions/common/extensionsRegistry.ts b/src/vs/workbench/services/extensions/common/extensionsRegistry.ts
index 4ff19cad7b9..af4b0994c50 100644
--- a/src/vs/workbench/services/extensions/common/extensionsRegistry.ts
+++ b/src/vs/workbench/services/extensions/common/extensionsRegistry.ts
@@ -392,7 +392,7 @@ export const schema: IJSONSchema = {
 					},
 					{
 						label: 'onLanguageModelTool',
-						body: 'onLanguageModelTool:${1:toolName}',
+						body: 'onLanguageModelTool:${1:toolId}',
 						description: nls.localize('vscode.extension.activationEvents.onLanguageModelTool', 'An activation event emitted when the specified language model tool is invoked.'),
 					},
 					{
diff --git a/src/vs/workbench/services/extensions/common/lazyCreateExtensionHostManager.ts b/src/vs/workbench/services/extensions/common/lazyCreateExtensionHostManager.ts
index f279e796d13..90b31fec5a3 100644
--- a/src/vs/workbench/services/extensions/common/lazyCreateExtensionHostManager.ts
+++ b/src/vs/workbench/services/extensions/common/lazyCreateExtensionHostManager.ts
@@ -90,6 +90,9 @@ export class LazyCreateExtensionHostManager extends Disposable implements IExten
 			await this._actual.ready();
 		}
 	}
+	public async disconnect(): Promise<void> {
+		await this._actual?.disconnect();
+	}
 	public representsRunningLocation(runningLocation: ExtensionRunningLocation): boolean {
 		return this._extensionHost.runningLocation.equals(runningLocation);
 	}
diff --git a/src/vs/workbench/services/extensions/common/remoteExtensionHost.ts b/src/vs/workbench/services/extensions/common/remoteExtensionHost.ts
index 35a89486793..adc3ad85c0c 100644
--- a/src/vs/workbench/services/extensions/common/remoteExtensionHost.ts
+++ b/src/vs/workbench/services/extensions/common/remoteExtensionHost.ts
@@ -56,6 +56,7 @@ export class RemoteExtensionHost extends Disposable implements IExtensionHost {
 	private _protocol: PersistentProtocol | null;
 	private _hasLostConnection: boolean;
 	private _terminating: boolean;
+	private _hasDisconnected = false;
 	private readonly _isExtensionDevHost: boolean;
 
 	constructor(
@@ -268,22 +269,28 @@ export class RemoteExtensionHost extends Disposable implements IExtensionHost {
 		return Promise.resolve(false);
 	}
 
+	async disconnect() {
+		if (this._protocol && !this._hasDisconnected) {
+			this._protocol.send(createMessageOfType(MessageType.Terminate));
+			this._protocol.sendDisconnect();
+			this._hasDisconnected = true;
+			await this._protocol.drain();
+		}
+	}
+
 	override dispose(): void {
 		super.dispose();
 
 		this._terminating = true;
+		this.disconnect();
 
 		if (this._protocol) {
 			// Send the extension host a request to terminate itself
 			// (graceful termination)
 			// setTimeout(() => {
 			// console.log(`SENDING TERMINATE TO REMOTE EXT HOST!`);
-			const socket = this._protocol.getSocket();
-			this._protocol.send(createMessageOfType(MessageType.Terminate));
-			this._protocol.sendDisconnect();
-			this._protocol.dispose();
+			this._protocol.getSocket().end();
 			// this._protocol.drain();
-			socket.end();
 			this._protocol = null;
 			// }, 1000);
 		}
diff --git a/src/vs/workbench/services/extensions/electron-sandbox/nativeExtensionService.ts b/src/vs/workbench/services/extensions/electron-sandbox/nativeExtensionService.ts
index b7b77b23e0e..61eaeb7d0b3 100644
--- a/src/vs/workbench/services/extensions/electron-sandbox/nativeExtensionService.ts
+++ b/src/vs/workbench/services/extensions/electron-sandbox/nativeExtensionService.ts
@@ -420,9 +420,9 @@ export class NativeExtensionService extends AbstractExtensionService implements
 		return new ResolvedExtensions(await this._scanAllLocalExtensions(), remoteExtensions, /*hasLocalProcess*/true, /*allowRemoteExtensionsInLocalWebWorker*/false);
 	}
 
-	protected _onExtensionHostExit(code: number): void {
+	protected async _onExtensionHostExit(code: number): Promise<void> {
 		// Dispose everything associated with the extension host
-		this._doStopExtensionHosts();
+		await this._doStopExtensionHosts();
 
 		// Dispose the management connection to avoid reconnecting after the extension host exits
 		const connection = this._remoteAgentService.getConnection();
diff --git a/src/vs/workbench/services/extensions/test/browser/extensionService.test.ts b/src/vs/workbench/services/extensions/test/browser/extensionService.test.ts
index 69c2463958c..d71301c0a15 100644
--- a/src/vs/workbench/services/extensions/test/browser/extensionService.test.ts
+++ b/src/vs/workbench/services/extensions/test/browser/extensionService.test.ts
@@ -198,6 +198,9 @@ suite('ExtensionService', () => {
 			return new class extends mock<IExtensionHostManager>() {
 				override onDidExit = Event.None;
 				override onDidChangeResponsiveState = Event.None;
+				override disconnect() {
+					return Promise.resolve();
+				}
 				override dispose(): void {
 					order.push(`dispose ${extensionHostId}`);
 				}
@@ -212,7 +215,7 @@ suite('ExtensionService', () => {
 		protected _scanSingleExtension(extension: IExtension): Promise<IExtensionDescription | null> {
 			throw new Error('Method not implemented.');
 		}
-		protected _onExtensionHostExit(code: number): void {
+		protected _onExtensionHostExit(code: number): Promise<void> {
 			throw new Error('Method not implemented.');
 		}
 		protected _resolveAuthority(remoteAuthority: string): Promise<ResolverResult> {
@@ -255,7 +258,7 @@ suite('ExtensionService', () => {
 		extService = <MyTestExtensionService>instantiationService.get(IExtensionService);
 	});
 
-	teardown(() => {
+	teardown(async () => {
 		disposables.dispose();
 	});
 
diff --git a/src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.esm.html b/src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.esm.html
new file mode 100644
index 00000000000..5368e599820
--- /dev/null
+++ b/src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.esm.html
@@ -0,0 +1,164 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta http-equiv="Content-Security-Policy" content="
+			default-src 'none';
+			child-src 'self' data: blob:;
+			script-src 'self' 'unsafe-eval' 'sha256-DvAmW5Fes5iD5QQV6OcvitPCC3AegfXRIazQ4VJlSVA=' https: http://localhost:* blob:;
+			connect-src 'self' https: wss: http://localhost:* http://127.0.0.1:* ws://localhost:* ws://127.0.0.1:*;"/>
+	</head>
+	<body>
+	<script>
+(function () {
+	const searchParams = new URL(document.location.href).searchParams;
+	const vscodeWebWorkerExtHostId = searchParams.get('vscodeWebWorkerExtHostId') || '';
+	const name = searchParams.get('debugged') ? 'DebugExtensionHostWorker' : 'ExtensionHostWorker';
+	const parentOrigin = searchParams.get('parentOrigin') || window.origin;
+	const salt = searchParams.get('salt');
+
+	(async function () {
+		const hostnameValidationMarker = 'v--';
+		const hostname = location.hostname;
+		if (!hostname.startsWith(hostnameValidationMarker)) {
+			// validation not requested
+			return start();
+		}
+		if (!crypto.subtle) {
+			// cannot validate, not running in a secure context
+			return sendError(new Error(`Cannot validate in current context!`));
+		}
+
+		// Here the `parentOriginHash()` function from `src/vs/base/browser/iframe.ts` is inlined
+		// compute a sha-256 composed of `parentOrigin` and `salt` converted to base 32
+		/** @type {string} */
+		let parentOriginHash;
+		try {
+			const strData = JSON.stringify({ parentOrigin, salt });
+			const encoder = new TextEncoder();
+			const arrData = encoder.encode(strData);
+			const hash = await crypto.subtle.digest('sha-256', arrData);
+			const hashArray = Array.from(new Uint8Array(hash));
+			const hashHex = hashArray.map(b => b.toString(16).padStart(2, '0')).join('');
+			// sha256 has 256 bits, so we need at most ceil(lg(2^256-1)/lg(32)) = 52 chars to represent it in base 32
+			parentOriginHash = BigInt(`0x${hashHex}`).toString(32).padStart(52, '0');
+		} catch (err) {
+			return sendError(err instanceof Error ? err : new Error(String(err)));
+		}
+
+		const requiredSubdomain = `${hostnameValidationMarker}${parentOriginHash}.`;
+		if (hostname.substring(0, requiredSubdomain.length) === requiredSubdomain) {
+			// validation succeeded!
+			return start();
+		}
+
+		return sendError(new Error(`Expected '${requiredSubdomain}' as subdomain!`));
+	})();
+
+	function sendError(error) {
+		window.parent.postMessage({
+			vscodeWebWorkerExtHostId,
+			error: {
+				name: error ? error.name : '',
+				message: error ? error.message : '',
+				stack: error ? error.stack : []
+			}
+		}, '*');
+	}
+
+	function start() {
+
+		// Before we can load the worker, we need to get the current set of NLS
+		// configuration into this iframe. We ask the parent window to send it
+		// together with the necessary information to load the worker via Blob.
+
+		const bootstrapNlsType = 'vscode.bootstrap.nls';
+
+		self.onmessage = (event) => {
+			if (event.origin !== parentOrigin || event.data.type !== bootstrapNlsType) {
+				return;
+			}
+			const { data } = event.data;
+			createWorker(data.baseUrl, data.workerUrl, data.fileRoot, data.nls.messages, data.nls.language);
+		};
+
+		window.parent.postMessage({
+			vscodeWebWorkerExtHostId,
+			type: bootstrapNlsType
+		}, '*');
+	}
+
+	function createWorker(baseUrl, workerUrl, fileRoot, nlsMessages, nlsLanguage) {
+		try {
+			if (globalThis.crossOriginIsolated) {
+				workerUrl += '?vscode-coi=2'; // COEP
+			}
+
+			// ESM-comment-begin
+			const isESM = false;
+			// ESM-comment-end
+			// ESM-uncomment-begin
+			// const isESM = true;
+			// ESM-uncomment-end
+
+			const blob = new Blob([[
+				`/*extensionHostWorker*/`,
+				`globalThis.MonacoEnvironment = { baseUrl: '${baseUrl}' };`,
+				`globalThis._VSCODE_NLS_MESSAGES = ${JSON.stringify(nlsMessages)};`,
+				`globalThis._VSCODE_NLS_LANGUAGE = ${JSON.stringify(nlsLanguage)};`,
+				`globalThis._VSCODE_FILE_ROOT = '${fileRoot}';`,
+				isESM ? `await import('${workerUrl}');` : `importScripts('${workerUrl}');`,
+				`/*extensionHostWorker*/`
+			].join('')], { type: 'application/javascript' });
+
+			const worker = new Worker(URL.createObjectURL(blob), { name, type: isESM ? 'module' : undefined });
+			if (!isESM) {
+				// Note: cannot postMessage into a worker that is ESM because imports are async
+				worker.postMessage('vs/workbench/api/worker/extensionHostWorker');
+			}
+			const nestedWorkers = new Map();
+
+			worker.onmessage = (event) => {
+				const { data } = event;
+
+				if (data?.type === '_newWorker') {
+					const { id, port, url, options } = data;
+					const newWorker = new Worker(url, options);
+					newWorker.postMessage(port, [port]);
+					newWorker.onerror = console.error.bind(console);
+					nestedWorkers.set(id, newWorker);
+
+				} else if (data?.type === '_terminateWorker') {
+					const { id } = data;
+					if (nestedWorkers.has(id)) {
+						nestedWorkers.get(id).terminate();
+						nestedWorkers.delete(id);
+					}
+				} else {
+					worker.onerror = console.error.bind(console);
+					window.parent.postMessage({
+						vscodeWebWorkerExtHostId,
+						data
+					}, parentOrigin, [data]);
+				}
+			};
+
+			worker.onerror = (event) => {
+				console.error(event.message, event.error);
+				sendError(event.error);
+			};
+
+			self.onmessage = (event) => {
+				if (event.origin !== parentOrigin) {
+					return;
+				}
+				worker.postMessage(event.data, event.ports);
+			};
+		} catch (err) {
+			console.error(err);
+			sendError(err);
+		}
+	}
+})();
+	</script>
+	</body>
+</html>
diff --git a/src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html b/src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html
index 3983bdb9dd4..dcf275fb338 100644
--- a/src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html
+++ b/src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html
@@ -1,11 +1,13 @@
 <!DOCTYPE html>
 <html>
 	<head>
+		<!-- Start PWB: serve same origin -->
 		<meta http-equiv="Content-Security-Policy" content="
 			default-src 'none';
 			child-src 'self' data: blob:;
-			script-src 'self' 'unsafe-eval' 'sha256-V28GQnL3aYxbwgpV3yW1oJ+VKKe/PBSzWntNyH8zVXA=' https: http://localhost:* blob:;
+			script-src 'self' 'unsafe-eval' 'sha256-8E6fG+G1zD7AG0qI0zVe9p7PPsYL3YA7kjTGIzQdp7s=' https:;
 			connect-src 'self' https: wss: http://localhost:* http://127.0.0.1:* ws://localhost:* ws://127.0.0.1:*;"/>
+		<!-- End PWB: serve same origin -->
 	</head>
 	<body>
 	<script>
@@ -23,6 +25,14 @@
 			// validation not requested
 			return start();
 		}
+		// --- Start PWB: server same origin ---
+		if (parentOrigin) {
+			const parent = new URL(parentOrigin);
+			if (parent.hostname === hostname) {
+				return start(parentOrigin);
+			}
+		}
+		// --- End PWB: server same origin ---
 		if (!crypto.subtle) {
 			// cannot validate, not running in a secure context
 			return sendError(new Error(`Cannot validate in current context!`));
@@ -78,7 +88,7 @@
 				return;
 			}
 			const { data } = event.data;
-			createWorker(data.baseUrl, data.workerUrl, data.nls.messages, data.nls.language);
+			createWorker(data.baseUrl, data.workerUrl, data.fileRoot, data.nls.messages, data.nls.language);
 		};
 
 		window.parent.postMessage({
@@ -87,24 +97,35 @@
 		}, '*');
 	}
 
-	function createWorker(baseUrl, workerUrl, nlsMessages, nlsLanguage) {
+	function createWorker(baseUrl, workerUrl, fileRoot, nlsMessages, nlsLanguage) {
 		try {
 			if (globalThis.crossOriginIsolated) {
 				workerUrl += '?vscode-coi=2'; // COEP
 			}
 
+			// ESM-comment-begin
+			const isESM = false;
+			// ESM-comment-end
+			// ESM-uncomment-begin
+			// const isESM = true;
+			// ESM-uncomment-end
+
 			const blob = new Blob([[
 				`/*extensionHostWorker*/`,
 				`globalThis.MonacoEnvironment = { baseUrl: '${baseUrl}' };`,
-				// VSCODE_GLOBALS: NLS
 				`globalThis._VSCODE_NLS_MESSAGES = ${JSON.stringify(nlsMessages)};`,
 				`globalThis._VSCODE_NLS_LANGUAGE = ${JSON.stringify(nlsLanguage)};`,
-				`importScripts('${workerUrl}');`,
+				`globalThis._VSCODE_FILE_ROOT = '${fileRoot}';`,
+				isESM ? `await import('${workerUrl}');` : `importScripts('${workerUrl}');`,
+				isESM ? `globalThis.onmessage({ data: 'vs/workbench/api/worker/extensionHostWorker' });` : undefined, // important to start loading after the ESM async import has finished
 				`/*extensionHostWorker*/`
 			].join('')], { type: 'application/javascript' });
 
-			const worker = new Worker(URL.createObjectURL(blob), { name });
-			worker.postMessage('vs/workbench/api/worker/extensionHostWorker');
+			const worker = new Worker(URL.createObjectURL(blob), { name, type: isESM ? 'module' : undefined });
+			if (!isESM) {
+				// Note: cannot postMessage into a worker that is ESM because imports are async
+				worker.postMessage('vs/workbench/api/worker/extensionHostWorker');
+			}
 			const nestedWorkers = new Map();
 
 			worker.onmessage = (event) => {
diff --git a/src/vs/workbench/services/host/browser/browserHostService.ts b/src/vs/workbench/services/host/browser/browserHostService.ts
index 11f6227989f..253828dfd74 100644
--- a/src/vs/workbench/services/host/browser/browserHostService.ts
+++ b/src/vs/workbench/services/host/browser/browserHostService.ts
@@ -238,7 +238,7 @@ export class BrowserHostService extends Disposable implements IHostService {
 	}
 
 	private async doOpenWindow(toOpen: IWindowOpenable[], options?: IOpenWindowOptions): Promise<void> {
-		const payload = this.preservePayload(false /* not an empty window */);
+		const payload = this.preservePayload(false /* not an empty window */, options);
 		const fileOpenables: IFileToOpen[] = [];
 		const foldersToAdd: IWorkspaceFolderCreationData[] = [];
 
@@ -395,7 +395,7 @@ export class BrowserHostService extends Disposable implements IHostService {
 		this.instantiationService.invokeFunction(accessor => fn(accessor));
 	}
 
-	private preservePayload(isEmptyWindow: boolean): Array<unknown> | undefined {
+	private preservePayload(isEmptyWindow: boolean, options?: IOpenWindowOptions): Array<unknown> | undefined {
 
 		// Selectively copy payload: for now only extension debugging properties are considered
 		const newPayload: Array<unknown> = new Array();
@@ -411,12 +411,11 @@ export class BrowserHostService extends Disposable implements IHostService {
 			}
 		}
 
-		const windowConfig = this.configurationService.getValue<IWindowSettings | undefined>('window');
-		const newWindowProfile = (windowConfig?.newWindowProfile
-			? this.userDataProfilesService.profiles.find(profile => profile.name === windowConfig.newWindowProfile)
+		const newWindowProfile = (options?.forceProfile
+			? this.userDataProfilesService.profiles.find(profile => profile.name === options?.forceProfile)
 			: undefined) ?? this.userDataProfileService.currentProfile;
 		if (!newWindowProfile.isDefault) {
-			newPayload.push(['lastActiveProfile', newWindowProfile.id]);
+			newPayload.push(['profile', newWindowProfile.name]);
 		}
 
 		return newPayload.length ? newPayload : undefined;
@@ -453,7 +452,7 @@ export class BrowserHostService extends Disposable implements IHostService {
 	private async doOpenEmptyWindow(options?: IOpenEmptyWindowOptions): Promise<void> {
 		return this.doOpen(undefined, {
 			reuse: options?.forceReuseWindow,
-			payload: this.preservePayload(true /* empty window */)
+			payload: this.preservePayload(true /* empty window */, options)
 		});
 	}
 
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayoutService.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayoutService.ts
index ab8d76f8903..7f529f4a661 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayoutService.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayoutService.ts
@@ -5,6 +5,8 @@
 
 import * as nls from 'vs/nls';
 import { Emitter, Event } from 'vs/base/common/event';
+import { isESM } from 'vs/base/common/amd';
+import { AppResourcePath, FileAccess } from 'vs/base/common/network';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { KeymapInfo, IRawMixedKeyboardMapping, IKeymapInfo } from 'vs/workbench/services/keybinding/common/keymapInfo';
 import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
@@ -455,7 +457,10 @@ export class BrowserKeyboardMapperFactory extends BrowserKeyboardMapperFactoryBa
 
 		const platform = isWindows ? 'win' : isMacintosh ? 'darwin' : 'linux';
 
-		import('vs/workbench/services/keybinding/browser/keyboardLayouts/layout.contribution.' + platform).then((m) => {
+		import(isESM ?
+			FileAccess.asBrowserUri(`vs/workbench/services/keybinding/browser/keyboardLayouts/layout.contribution.${platform}.js` satisfies AppResourcePath).path :
+			`vs/workbench/services/keybinding/browser/keyboardLayouts/layout.contribution.${platform}`
+		).then((m) => {
 			const keymapInfos: IKeymapInfo[] = m.KeyboardLayoutContribution.INSTANCE.layoutInfos;
 			this._keymapInfos.push(...keymapInfos.map(info => (new KeymapInfo(info.layout, info.secondaryLayouts, info.mapping, info.isUserKeyboardLayout))));
 			this._mru = this._keymapInfos;
diff --git a/src/vs/workbench/services/languageDetection/browser/languageDetectionSimpleWorker.esm.ts b/src/vs/workbench/services/languageDetection/browser/languageDetectionSimpleWorker.esm.ts
new file mode 100644
index 00000000000..9e60f634136
--- /dev/null
+++ b/src/vs/workbench/services/languageDetection/browser/languageDetectionSimpleWorker.esm.ts
@@ -0,0 +1,9 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { create } from './languageDetectionSimpleWorker';
+import { bootstrapSimpleWorker } from 'vs/base/common/worker/simpleWorkerBootstrap';
+
+bootstrapSimpleWorker(create);
diff --git a/src/vs/workbench/services/languageDetection/browser/languageDetectionSimpleWorker.ts b/src/vs/workbench/services/languageDetection/browser/languageDetectionSimpleWorker.ts
index f967fc38127..8067c690fa3 100644
--- a/src/vs/workbench/services/languageDetection/browser/languageDetectionSimpleWorker.ts
+++ b/src/vs/workbench/services/languageDetection/browser/languageDetectionSimpleWorker.ts
@@ -4,39 +4,50 @@
  *--------------------------------------------------------------------------------------------*/
 
 import type { ModelOperations, ModelResult } from '@vscode/vscode-languagedetection';
+import { importAMDNodeModule } from 'vs/amdX';
 import { StopWatch } from 'vs/base/common/stopwatch';
-import { IRequestHandler } from 'vs/base/common/worker/simpleWorker';
-import { EditorSimpleWorker } from 'vs/editor/common/services/editorSimpleWorker';
-import { IEditorWorkerHost } from 'vs/editor/common/services/editorWorkerHost';
+import { IRequestHandler, IWorkerServer } from 'vs/base/common/worker/simpleWorker';
+import { LanguageDetectionWorkerHost, ILanguageDetectionWorker } from 'vs/workbench/services/languageDetection/browser/languageDetectionWorker.protocol';
+import { WorkerTextModelSyncServer } from 'vs/editor/common/services/textModelSync/textModelSync.impl';
 
 type RegexpModel = { detect: (inp: string, langBiases: Record<string, number>, supportedLangs?: string[]) => string | undefined };
 
 /**
- * Called on the worker side
- * @internal
+ * Defines the worker entry point. Must be exported and named `create`.
+ * @skipMangle
  */
-export function create(host: IEditorWorkerHost): IRequestHandler {
-	return new LanguageDetectionSimpleWorker(host, null);
+export function create(workerServer: IWorkerServer): IRequestHandler {
+	return new LanguageDetectionSimpleWorker(workerServer);
 }
 
 /**
  * @internal
  */
-export class LanguageDetectionSimpleWorker extends EditorSimpleWorker {
+export class LanguageDetectionSimpleWorker implements ILanguageDetectionWorker {
+	_requestHandlerBrand: any;
+
 	private static readonly expectedRelativeConfidence = 0.2;
 	private static readonly positiveConfidenceCorrectionBucket1 = 0.05;
 	private static readonly positiveConfidenceCorrectionBucket2 = 0.025;
 	private static readonly negativeConfidenceCorrection = 0.5;
 
+	private readonly _workerTextModelSyncServer = new WorkerTextModelSyncServer();
+
+	private readonly _host: LanguageDetectionWorkerHost;
 	private _regexpModel: RegexpModel | undefined;
 	private _regexpLoadFailed: boolean = false;
 
 	private _modelOperations: ModelOperations | undefined;
 	private _loadFailed: boolean = false;
 
-	private modelIdToCoreId = new Map<string, string>();
+	private modelIdToCoreId = new Map<string, string | undefined>();
+
+	constructor(workerServer: IWorkerServer) {
+		this._host = LanguageDetectionWorkerHost.getChannel(workerServer);
+		this._workerTextModelSyncServer.bindToServer(workerServer);
+	}
 
-	public async detectLanguage(uri: string, langBiases: Record<string, number> | undefined, preferHistory: boolean, supportedLangs?: string[]): Promise<string | undefined> {
+	public async $detectLanguage(uri: string, langBiases: Record<string, number> | undefined, preferHistory: boolean, supportedLangs?: string[]): Promise<string | undefined> {
 		const languages: string[] = [];
 		const confidences: number[] = [];
 		const stopWatch = new StopWatch();
@@ -46,7 +57,7 @@ export class LanguageDetectionSimpleWorker extends EditorSimpleWorker {
 		const neuralResolver = async () => {
 			for await (const language of this.detectLanguagesImpl(documentTextSample)) {
 				if (!this.modelIdToCoreId.has(language.languageId)) {
-					this.modelIdToCoreId.set(language.languageId, await this._host.fhr('getLanguageId', [language.languageId]));
+					this.modelIdToCoreId.set(language.languageId, await this._host.$getLanguageId(language.languageId));
 				}
 				const coreId = this.modelIdToCoreId.get(language.languageId);
 				if (coreId && (!supportedLangs?.length || supportedLangs.includes(coreId))) {
@@ -57,7 +68,7 @@ export class LanguageDetectionSimpleWorker extends EditorSimpleWorker {
 			stopWatch.stop();
 
 			if (languages.length) {
-				this._host.fhr('sendTelemetryEvent', [languages, confidences, stopWatch.elapsed()]);
+				this._host.$sendTelemetryEvent(languages, confidences, stopWatch.elapsed());
 				return languages[0];
 			}
 			return undefined;
@@ -81,7 +92,7 @@ export class LanguageDetectionSimpleWorker extends EditorSimpleWorker {
 	}
 
 	private getTextForDetection(uri: string): string | undefined {
-		const editorModel = this._getModel(uri);
+		const editorModel = this._workerTextModelSyncServer.getModel(uri);
 		if (!editorModel) { return; }
 
 		const end = editorModel.positionAt(10000);
@@ -101,9 +112,9 @@ export class LanguageDetectionSimpleWorker extends EditorSimpleWorker {
 		if (this._regexpModel) {
 			return this._regexpModel;
 		}
-		const uri: string = await this._host.fhr('getRegexpModelUri', []);
+		const uri: string = await this._host.$getRegexpModelUri();
 		try {
-			this._regexpModel = await import(uri) as RegexpModel;
+			this._regexpModel = await importAMDNodeModule(uri, '') as RegexpModel;
 			return this._regexpModel;
 		} catch (e) {
 			this._regexpLoadFailed = true;
@@ -136,11 +147,11 @@ export class LanguageDetectionSimpleWorker extends EditorSimpleWorker {
 			return this._modelOperations;
 		}
 
-		const uri: string = await this._host.fhr('getIndexJsUri', []);
-		const { ModelOperations } = await import(uri) as typeof import('@vscode/vscode-languagedetection');
+		const uri: string = await this._host.$getIndexJsUri();
+		const { ModelOperations } = await importAMDNodeModule(uri, '') as typeof import('@vscode/vscode-languagedetection');
 		this._modelOperations = new ModelOperations({
 			modelJsonLoaderFunc: async () => {
-				const response = await fetch(await this._host.fhr('getModelJsonUri', []));
+				const response = await fetch(await this._host.$getModelJsonUri());
 				try {
 					const modelJSON = await response.json();
 					return modelJSON;
@@ -150,7 +161,7 @@ export class LanguageDetectionSimpleWorker extends EditorSimpleWorker {
 				}
 			},
 			weightsLoaderFunc: async () => {
-				const response = await fetch(await this._host.fhr('getWeightsUri', []));
+				const response = await fetch(await this._host.$getWeightsUri());
 				const buffer = await response.arrayBuffer();
 				return buffer;
 			}
diff --git a/src/vs/workbench/services/languageDetection/browser/languageDetectionWorker.protocol.ts b/src/vs/workbench/services/languageDetection/browser/languageDetectionWorker.protocol.ts
new file mode 100644
index 00000000000..f0f494b5d80
--- /dev/null
+++ b/src/vs/workbench/services/languageDetection/browser/languageDetectionWorker.protocol.ts
@@ -0,0 +1,27 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IWorkerClient, IWorkerServer } from 'vs/base/common/worker/simpleWorker';
+
+export abstract class LanguageDetectionWorkerHost {
+	public static CHANNEL_NAME = 'languageDetectionWorkerHost';
+	public static getChannel(workerServer: IWorkerServer): LanguageDetectionWorkerHost {
+		return workerServer.getChannel<LanguageDetectionWorkerHost>(LanguageDetectionWorkerHost.CHANNEL_NAME);
+	}
+	public static setChannel(workerClient: IWorkerClient<any>, obj: LanguageDetectionWorkerHost): void {
+		workerClient.setChannel<LanguageDetectionWorkerHost>(LanguageDetectionWorkerHost.CHANNEL_NAME, obj);
+	}
+
+	abstract $getIndexJsUri(): Promise<string>;
+	abstract $getLanguageId(languageIdOrExt: string | undefined): Promise<string | undefined>;
+	abstract $sendTelemetryEvent(languages: string[], confidences: number[], timeSpent: number): Promise<void>;
+	abstract $getRegexpModelUri(): Promise<string>;
+	abstract $getModelJsonUri(): Promise<string>;
+	abstract $getWeightsUri(): Promise<string>;
+}
+
+export interface ILanguageDetectionWorker {
+	$detectLanguage(uri: string, langBiases: Record<string, number> | undefined, preferHistory: boolean, supportedLangs?: string[]): Promise<string | undefined>;
+}
diff --git a/src/vs/workbench/services/languageDetection/browser/languageDetectionWorkerServiceImpl.ts b/src/vs/workbench/services/languageDetection/browser/languageDetectionWorkerServiceImpl.ts
index 1577e10f794..df2b7aea924 100644
--- a/src/vs/workbench/services/languageDetection/browser/languageDetectionWorkerServiceImpl.ts
+++ b/src/vs/workbench/services/languageDetection/browser/languageDetectionWorkerServiceImpl.ts
@@ -12,18 +12,19 @@ import { ILanguageService } from 'vs/editor/common/languages/language';
 import { URI } from 'vs/base/common/uri';
 import { isWeb } from 'vs/base/common/platform';
 import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { LanguageDetectionSimpleWorker } from 'vs/workbench/services/languageDetection/browser/languageDetectionSimpleWorker';
 import { IModelService } from 'vs/editor/common/services/model';
-import { SimpleWorkerClient } from 'vs/base/common/worker/simpleWorker';
+import { IWorkerClient } from 'vs/base/common/worker/simpleWorker';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { EditorWorkerClient, EditorWorkerHost } from 'vs/editor/browser/services/editorWorkerService';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
 import { IDiagnosticsService } from 'vs/platform/diagnostics/common/diagnostics';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
 import { LRUCache } from 'vs/base/common/map';
 import { ILogService } from 'vs/platform/log/common/log';
+import { canASAR } from 'vs/base/common/amd';
+import { createWebWorker } from 'vs/base/browser/defaultWorkerFactory';
+import { WorkerTextModelSyncClient } from 'vs/editor/common/services/textModelSync/textModelSync.impl';
+import { ILanguageDetectionWorker, LanguageDetectionWorkerHost } from 'vs/workbench/services/languageDetection/browser/languageDetectionWorker.protocol';
 
 const TOP_LANG_COUNTS = 12;
 
@@ -61,29 +62,28 @@ export class LanguageDetectionService extends Disposable implements ILanguageDet
 		@IEditorService private readonly _editorService: IEditorService,
 		@ITelemetryService telemetryService: ITelemetryService,
 		@IStorageService storageService: IStorageService,
-		@ILogService private readonly _logService: ILogService,
-		@ILanguageConfigurationService languageConfigurationService: ILanguageConfigurationService
+		@ILogService private readonly _logService: ILogService
 	) {
 		super();
 
+		const useAsar = canASAR && this._environmentService.isBuilt && !isWeb;
 		this._languageDetectionWorkerClient = this._register(new LanguageDetectionWorkerClient(
 			modelService,
 			languageService,
 			telemetryService,
-			// TODO: See if it's possible to bundle vscode-languagedetection
-			this._environmentService.isBuilt && !isWeb
+			// TODO@esm: See if it's possible to bundle vscode-languagedetection
+			useAsar
 				? FileAccess.asBrowserUri(`${moduleLocationAsar}/dist/lib/index.js`).toString(true)
 				: FileAccess.asBrowserUri(`${moduleLocation}/dist/lib/index.js`).toString(true),
-			this._environmentService.isBuilt && !isWeb
+			useAsar
 				? FileAccess.asBrowserUri(`${moduleLocationAsar}/model/model.json`).toString(true)
 				: FileAccess.asBrowserUri(`${moduleLocation}/model/model.json`).toString(true),
-			this._environmentService.isBuilt && !isWeb
+			useAsar
 				? FileAccess.asBrowserUri(`${moduleLocationAsar}/model/group1-shard1of1.bin`).toString(true)
 				: FileAccess.asBrowserUri(`${moduleLocation}/model/group1-shard1of1.bin`).toString(true),
-			this._environmentService.isBuilt && !isWeb
+			useAsar
 				? FileAccess.asBrowserUri(`${regexpModuleLocationAsar}/dist/index.js`).toString(true)
 				: FileAccess.asBrowserUri(`${regexpModuleLocation}/dist/index.js`).toString(true),
-			languageConfigurationService
 		));
 
 		this.initEditorOpenedListeners(storageService);
@@ -177,80 +177,45 @@ export class LanguageDetectionService extends Disposable implements ILanguageDet
 	}
 }
 
-export interface IWorkerClient<W> {
-	getProxyObject(): Promise<W>;
-	dispose(): void;
-}
+export class LanguageDetectionWorkerClient extends Disposable {
+	private worker: {
+		workerClient: IWorkerClient<ILanguageDetectionWorker>;
+		workerTextModelSyncClient: WorkerTextModelSyncClient;
+	} | undefined;
 
-export class LanguageDetectionWorkerHost {
 	constructor(
-		private _indexJsUri: string,
-		private _modelJsonUri: string,
-		private _weightsUri: string,
-		private _telemetryService: ITelemetryService,
-	) {
-	}
-
-	async getIndexJsUri() {
-		return this._indexJsUri;
-	}
-
-	async getModelJsonUri() {
-		return this._modelJsonUri;
-	}
-
-	async getWeightsUri() {
-		return this._weightsUri;
-	}
-
-	async sendTelemetryEvent(languages: string[], confidences: number[], timeSpent: number): Promise<void> {
-		type LanguageDetectionStats = { languages: string; confidences: string; timeSpent: number };
-		type LanguageDetectionStatsClassification = {
-			owner: 'TylerLeonhardt';
-			comment: 'Helps understand how effective language detection is via confidences and how long it takes to run';
-			languages: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The languages that are guessed' };
-			confidences: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The confidences of each language guessed' };
-			timeSpent: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The time it took to run language detection' };
-		};
-
-		this._telemetryService.publicLog2<LanguageDetectionStats, LanguageDetectionStatsClassification>('automaticlanguagedetection.stats', {
-			languages: languages.join(','),
-			confidences: confidences.join(','),
-			timeSpent
-		});
-	}
-}
-
-export class LanguageDetectionWorkerClient extends EditorWorkerClient {
-	private workerPromise: Promise<IWorkerClient<LanguageDetectionSimpleWorker>> | undefined;
-
-	constructor(
-		modelService: IModelService,
+		private readonly _modelService: IModelService,
 		private readonly _languageService: ILanguageService,
 		private readonly _telemetryService: ITelemetryService,
 		private readonly _indexJsUri: string,
 		private readonly _modelJsonUri: string,
 		private readonly _weightsUri: string,
 		private readonly _regexpModelUri: string,
-		languageConfigurationService: ILanguageConfigurationService,
 	) {
-		super(modelService, true, 'languageDetectionWorkerService', languageConfigurationService);
+		super();
 	}
 
-	private _getOrCreateLanguageDetectionWorker(): Promise<IWorkerClient<LanguageDetectionSimpleWorker>> {
-		if (this.workerPromise) {
-			return this.workerPromise;
-		}
-
-		this.workerPromise = new Promise((resolve, reject) => {
-			resolve(this._register(new SimpleWorkerClient<LanguageDetectionSimpleWorker, EditorWorkerHost>(
-				this._workerFactory,
+	private _getOrCreateLanguageDetectionWorker(): {
+		workerClient: IWorkerClient<ILanguageDetectionWorker>;
+		workerTextModelSyncClient: WorkerTextModelSyncClient;
+	} {
+		if (!this.worker) {
+			const workerClient = this._register(createWebWorker<ILanguageDetectionWorker>(
 				'vs/workbench/services/languageDetection/browser/languageDetectionSimpleWorker',
-				new EditorWorkerHost(this)
-			)));
-		});
-
-		return this.workerPromise;
+				'LanguageDetectionWorker'
+			));
+			LanguageDetectionWorkerHost.setChannel(workerClient, {
+				$getIndexJsUri: async () => this.getIndexJsUri(),
+				$getLanguageId: async (languageIdOrExt) => this.getLanguageId(languageIdOrExt),
+				$sendTelemetryEvent: async (languages, confidences, timeSpent) => this.sendTelemetryEvent(languages, confidences, timeSpent),
+				$getRegexpModelUri: async () => this.getRegexpModelUri(),
+				$getModelJsonUri: async () => this.getModelJsonUri(),
+				$getWeightsUri: async () => this.getWeightsUri(),
+			});
+			const workerTextModelSyncClient = WorkerTextModelSyncClient.create(workerClient, this._modelService);
+			this.worker = { workerClient, workerTextModelSyncClient };
+		}
+		return this.worker;
 	}
 
 	private _guessLanguageIdByUri(uri: URI): string | undefined {
@@ -261,30 +226,6 @@ export class LanguageDetectionWorkerClient extends EditorWorkerClient {
 		return undefined;
 	}
 
-	protected override async _getProxy(): Promise<LanguageDetectionSimpleWorker> {
-		return (await this._getOrCreateLanguageDetectionWorker()).getProxyObject();
-	}
-
-	// foreign host request
-	public override async fhr(method: string, args: any[]): Promise<any> {
-		switch (method) {
-			case 'getIndexJsUri':
-				return this.getIndexJsUri();
-			case 'getModelJsonUri':
-				return this.getModelJsonUri();
-			case 'getWeightsUri':
-				return this.getWeightsUri();
-			case 'getRegexpModelUri':
-				return this.getRegexpModelUri();
-			case 'getLanguageId':
-				return this.getLanguageId(args[0]);
-			case 'sendTelemetryEvent':
-				return this.sendTelemetryEvent(args[0], args[1], args[2]);
-			default:
-				return super.fhr(method, args);
-		}
-	}
-
 	async getIndexJsUri() {
 		return this._indexJsUri;
 	}
@@ -330,8 +271,9 @@ export class LanguageDetectionWorkerClient extends EditorWorkerClient {
 			return quickGuess;
 		}
 
-		await this._withSyncedResources([resource]);
-		const modelId = await (await this._getProxy()).detectLanguage(resource.toString(), langBiases, preferHistory, supportedLangs);
+		const { workerClient, workerTextModelSyncClient } = this._getOrCreateLanguageDetectionWorker();
+		await workerTextModelSyncClient.ensureSyncedResources([resource]);
+		const modelId = await workerClient.proxy.$detectLanguage(resource.toString(), langBiases, preferHistory, supportedLangs);
 		const languageId = this.getLanguageId(modelId);
 
 		const LanguageDetectionStatsId = 'automaticlanguagedetection.perf';
diff --git a/src/vs/workbench/services/lifecycle/common/lifecycleService.ts b/src/vs/workbench/services/lifecycle/common/lifecycleService.ts
index 92006c0a577..09eee478155 100644
--- a/src/vs/workbench/services/lifecycle/common/lifecycleService.ts
+++ b/src/vs/workbench/services/lifecycle/common/lifecycleService.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Barrier } from 'vs/base/common/async';
 import { Emitter } from 'vs/base/common/event';
+import { Barrier } from 'vs/base/common/async';
 import { Disposable } from 'vs/base/common/lifecycle';
-import { mark } from 'vs/base/common/performance';
+import { ILifecycleService, WillShutdownEvent, StartupKind, LifecyclePhase, LifecyclePhaseToString, ShutdownReason, BeforeShutdownErrorEvent, InternalBeforeShutdownEvent } from 'vs/workbench/services/lifecycle/common/lifecycle';
 import { ILogService } from 'vs/platform/log/common/log';
+import { mark } from 'vs/base/common/performance';
 import { IStorageService, StorageScope, StorageTarget, WillSaveStateReason } from 'vs/platform/storage/common/storage';
-import { BeforeShutdownErrorEvent, ILifecycleService, InternalBeforeShutdownEvent, LifecyclePhase, LifecyclePhaseToString, ShutdownReason, StartupKind, WillShutdownEvent } from 'vs/workbench/services/lifecycle/common/lifecycle';
 
 export abstract class AbstractLifecycleService extends Disposable implements ILifecycleService {
 
@@ -44,7 +44,7 @@ export abstract class AbstractLifecycleService extends Disposable implements ILi
 
 	constructor(
 		@ILogService protected readonly logService: ILogService,
-		@IStorageService protected readonly storageService: IStorageService,
+		@IStorageService protected readonly storageService: IStorageService
 	) {
 		super();
 
diff --git a/src/vs/workbench/services/lifecycle/electron-sandbox/lifecycleService.ts b/src/vs/workbench/services/lifecycle/electron-sandbox/lifecycleService.ts
index 90da4ac5afa..0434e6ded59 100644
--- a/src/vs/workbench/services/lifecycle/electron-sandbox/lifecycleService.ts
+++ b/src/vs/workbench/services/lifecycle/electron-sandbox/lifecycleService.ts
@@ -11,22 +11,19 @@ import { ILogService } from 'vs/platform/log/common/log';
 import { AbstractLifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycleService';
 import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import { INativeHostService } from 'vs/platform/native/common/native';
-import { Promises, disposableTimeout, raceCancellation, timeout } from 'vs/base/common/async';
+import { Promises, disposableTimeout, raceCancellation } from 'vs/base/common/async';
 import { toErrorMessage } from 'vs/base/common/errorMessage';
 import { CancellationTokenSource } from 'vs/base/common/cancellation';
-import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
 
 export class NativeLifecycleService extends AbstractLifecycleService {
 
 	private static readonly BEFORE_SHUTDOWN_WARNING_DELAY = 5000;
 	private static readonly WILL_SHUTDOWN_WARNING_DELAY = 800;
-	private static readonly MAX_GRACEFUL_REMOTE_DISCONNECT_TIME = 3000;
 
 	constructor(
 		@INativeHostService private readonly nativeHostService: INativeHostService,
 		@IStorageService storageService: IStorageService,
-		@ILogService logService: ILogService,
-		@IRemoteAgentService private readonly remoteAgentService: IRemoteAgentService,
+		@ILogService logService: ILogService
 	) {
 		super(logService, storageService);
 
@@ -69,10 +66,6 @@ export class NativeLifecycleService extends AbstractLifecycleService {
 			// trigger onWillShutdown events and joining
 			await this.handleWillShutdown(reply.reason);
 
-			// now that all services have stored their data, it's safe to terminate
-			// the remote connection gracefully before synchronously saying we're shut down
-			await this.handleRemoteAgentDisconnect();
-
 			// trigger onDidShutdown event now that we know we will quit
 			this._onDidShutdown.fire();
 
@@ -81,19 +74,6 @@ export class NativeLifecycleService extends AbstractLifecycleService {
 		});
 	}
 
-	private async handleRemoteAgentDisconnect(): Promise<void> {
-		const longRunningWarning = disposableTimeout(() => {
-			this.logService.warn(`[lifecycle] the remote agent is taking a long time to disconnect, waiting...`);
-		}, NativeLifecycleService.BEFORE_SHUTDOWN_WARNING_DELAY);
-
-		await Promise.race([
-			this.remoteAgentService.endConnection(),
-			timeout(NativeLifecycleService.MAX_GRACEFUL_REMOTE_DISCONNECT_TIME),
-		]);
-
-		longRunningWarning.dispose();
-	}
-
 	protected async handleBeforeShutdown(reason: ShutdownReason): Promise<boolean> {
 		const logService = this.logService;
 
diff --git a/src/vs/workbench/services/model/common/modelService.ts b/src/vs/workbench/services/model/common/modelService.ts
index 570f72df42d..ba7f722a06d 100644
--- a/src/vs/workbench/services/model/common/modelService.ts
+++ b/src/vs/workbench/services/model/common/modelService.ts
@@ -4,26 +4,24 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { URI } from 'vs/base/common/uri';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
 import { IModelService } from 'vs/editor/common/services/model';
 import { ModelService } from 'vs/editor/common/services/modelService';
-import { ILanguageService } from 'vs/editor/common/languages/language';
 import { ITextResourcePropertiesService } from 'vs/editor/common/services/textResourceConfiguration';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import { IUndoRedoService } from 'vs/platform/undoRedo/common/undoRedo';
 import { IPathService } from 'vs/workbench/services/path/common/pathService';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 
 export class WorkbenchModelService extends ModelService {
 	constructor(
 		@IConfigurationService configurationService: IConfigurationService,
 		@ITextResourcePropertiesService resourcePropertiesService: ITextResourcePropertiesService,
 		@IUndoRedoService undoRedoService: IUndoRedoService,
-		@ILanguageConfigurationService languageConfigurationService: ILanguageConfigurationService,
-		@ILanguageService languageService: ILanguageService,
 		@IPathService private readonly _pathService: IPathService,
+		@IInstantiationService instantiationService: IInstantiationService,
 	) {
-		super(configurationService, resourcePropertiesService, undoRedoService, languageService, languageConfigurationService);
+		super(configurationService, resourcePropertiesService, undoRedoService, instantiationService);
 	}
 
 	protected override _schemaShouldMaintainUndoRedoElements(resource: URI) {
diff --git a/src/vs/workbench/services/notebook/common/notebookDocumentService.ts b/src/vs/workbench/services/notebook/common/notebookDocumentService.ts
index 96af748ef50..b42e1604665 100644
--- a/src/vs/workbench/services/notebook/common/notebookDocumentService.ts
+++ b/src/vs/workbench/services/notebook/common/notebookDocumentService.ts
@@ -51,6 +51,21 @@ export function generate(notebook: URI, handle: number): URI {
 	return notebook.with({ scheme: Schemas.vscodeNotebookCell, fragment });
 }
 
+export function parseMetadataUri(metadata: URI): URI | undefined {
+	if (metadata.scheme !== Schemas.vscodeNotebookMetadata) {
+		return undefined;
+	}
+
+	const _scheme = decodeBase64(metadata.fragment).toString();
+
+	return metadata.with({ scheme: _scheme, fragment: null });
+}
+
+export function generateMetadataUri(notebook: URI): URI {
+	const fragment = `${encodeBase64(VSBuffer.fromString(notebook.scheme), true, true)}`;
+	return notebook.with({ scheme: Schemas.vscodeNotebookMetadata, fragment });
+}
+
 export interface INotebookDocumentService {
 	readonly _serviceBrand: undefined;
 
diff --git a/src/vs/workbench/services/output/common/output.ts b/src/vs/workbench/services/output/common/output.ts
index 25ec20fe32d..51b550e3537 100644
--- a/src/vs/workbench/services/output/common/output.ts
+++ b/src/vs/workbench/services/output/common/output.ts
@@ -14,11 +14,6 @@ import { createDecorator } from 'vs/platform/instantiation/common/instantiation'
  */
 export const OUTPUT_MIME = 'text/x-code-output';
 
-/**
- * Output resource scheme.
- */
-export const OUTPUT_SCHEME = 'output';
-
 /**
  * Id used by the output editor.
  */
diff --git a/src/vs/workbench/services/progress/browser/progressService.ts b/src/vs/workbench/services/progress/browser/progressService.ts
index 58fe33f548f..a6fe906e6a0 100644
--- a/src/vs/workbench/services/progress/browser/progressService.ts
+++ b/src/vs/workbench/services/progress/browser/progressService.ts
@@ -51,7 +51,7 @@ export class ProgressService extends Disposable implements IProgressService {
 		const { location } = options;
 
 		const task = async (progress: IProgress<IProgressStep>) => {
-			const activeLock = this.userActivityService.markActive();
+			const activeLock = this.userActivityService.markActive({ whenHeldFor: 15_000 });
 			try {
 				return await originalTask(progress);
 			} finally {
diff --git a/src/vs/workbench/services/remote/browser/remoteAgentService.ts b/src/vs/workbench/services/remote/browser/remoteAgentService.ts
index b28ab9c941b..ee12dd5b070 100644
--- a/src/vs/workbench/services/remote/browser/remoteAgentService.ts
+++ b/src/vs/workbench/services/remote/browser/remoteAgentService.ts
@@ -27,7 +27,7 @@ export class RemoteAgentService extends AbstractRemoteAgentService implements IR
 		@IProductService productService: IProductService,
 		@IRemoteAuthorityResolverService remoteAuthorityResolverService: IRemoteAuthorityResolverService,
 		@ISignService signService: ISignService,
-		@ILogService logService: ILogService,
+		@ILogService logService: ILogService
 	) {
 		super(remoteSocketFactoryService, userDataProfileService, environmentService, productService, remoteAuthorityResolverService, signService, logService);
 	}
diff --git a/src/vs/workbench/services/remote/common/abstractRemoteAgentService.ts b/src/vs/workbench/services/remote/common/abstractRemoteAgentService.ts
index 914c0a91081..fe802daf50b 100644
--- a/src/vs/workbench/services/remote/common/abstractRemoteAgentService.ts
+++ b/src/vs/workbench/services/remote/common/abstractRemoteAgentService.ts
@@ -3,23 +3,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter } from 'vs/base/common/event';
 import { Disposable } from 'vs/base/common/lifecycle';
-import { getDelayedChannel, IChannel, IPCLogger, IServerChannel } from 'vs/base/parts/ipc/common/ipc';
+import { IChannel, IServerChannel, getDelayedChannel, IPCLogger } from 'vs/base/parts/ipc/common/ipc';
 import { Client } from 'vs/base/parts/ipc/common/ipc.net';
-import { IDiagnosticInfo, IDiagnosticInfoOptions } from 'vs/platform/diagnostics/common/diagnostics';
-import { ILogService } from 'vs/platform/log/common/log';
-import { IProductService } from 'vs/platform/product/common/productService';
+import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
 import { connectRemoteAgentManagement, IConnectionOptions, ManagementPersistentConnection, PersistentConnectionEvent } from 'vs/platform/remote/common/remoteAgentConnection';
-import { IRemoteAgentEnvironment, RemoteAgentConnectionContext } from 'vs/platform/remote/common/remoteAgentEnvironment';
+import { IExtensionHostExitInfo, IRemoteAgentConnection, IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
 import { IRemoteAuthorityResolverService } from 'vs/platform/remote/common/remoteAuthorityResolver';
-import { IRemoteSocketFactoryService } from 'vs/platform/remote/common/remoteSocketFactoryService';
+import { RemoteAgentConnectionContext, IRemoteAgentEnvironment } from 'vs/platform/remote/common/remoteAgentEnvironment';
+import { RemoteExtensionEnvironmentChannelClient } from 'vs/workbench/services/remote/common/remoteAgentEnvironmentChannel';
+import { IDiagnosticInfoOptions, IDiagnosticInfo } from 'vs/platform/diagnostics/common/diagnostics';
+import { Emitter } from 'vs/base/common/event';
 import { ISignService } from 'vs/platform/sign/common/sign';
+import { ILogService } from 'vs/platform/log/common/log';
 import { ITelemetryData, TelemetryLevel } from 'vs/platform/telemetry/common/telemetry';
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
-import { RemoteExtensionEnvironmentChannelClient } from 'vs/workbench/services/remote/common/remoteAgentEnvironmentChannel';
-import { IExtensionHostExitInfo, IRemoteAgentConnection, IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
+import { IProductService } from 'vs/platform/product/common/productService';
 import { IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
+import { IRemoteSocketFactoryService } from 'vs/platform/remote/common/remoteSocketFactoryService';
 
 export abstract class AbstractRemoteAgentService extends Disposable implements IRemoteAgentService {
 
@@ -35,7 +35,7 @@ export abstract class AbstractRemoteAgentService extends Disposable implements I
 		@IProductService productService: IProductService,
 		@IRemoteAuthorityResolverService private readonly _remoteAuthorityResolverService: IRemoteAuthorityResolverService,
 		@ISignService signService: ISignService,
-		@ILogService logService: ILogService,
+		@ILogService logService: ILogService
 	) {
 		super();
 		if (this._environmentService.remoteAuthority) {
diff --git a/src/vs/workbench/services/search/browser/searchService.ts b/src/vs/workbench/services/search/browser/searchService.ts
index f9aea8ee65a..162301a2742 100644
--- a/src/vs/workbench/services/search/browser/searchService.ts
+++ b/src/vs/workbench/services/search/browser/searchService.ts
@@ -14,11 +14,11 @@ import { IExtensionService } from 'vs/workbench/services/extensions/common/exten
 import { IFileMatch, IFileQuery, ISearchComplete, ISearchProgressItem, ISearchResultProvider, ISearchService, ITextQuery, SearchProviderType, TextSearchCompleteMessageType } from 'vs/workbench/services/search/common/search';
 import { SearchService } from 'vs/workbench/services/search/common/searchService';
 import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
-import { IWorkerClient, logOnceWebWorkerWarning, SimpleWorkerClient } from 'vs/base/common/worker/simpleWorker';
+import { IWorkerClient, logOnceWebWorkerWarning } from 'vs/base/common/worker/simpleWorker';
 import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { DefaultWorkerFactory } from 'vs/base/browser/defaultWorkerFactory';
+import { createWebWorker } from 'vs/base/browser/defaultWorkerFactory';
 import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { ILocalFileSearchSimpleWorker, ILocalFileSearchSimpleWorkerHost } from 'vs/workbench/services/search/common/localFileSearchWorkerTypes';
+import { ILocalFileSearchSimpleWorker, LocalFileSearchSimpleWorkerHost } from 'vs/workbench/services/search/common/localFileSearchWorkerTypes';
 import { memoize } from 'vs/base/common/decorators';
 import { HTMLFileSystemProvider } from 'vs/platform/files/browser/htmlFileSystemProvider';
 import { Schemas } from 'vs/base/common/network';
@@ -46,10 +46,9 @@ export class RemoteSearchService extends SearchService {
 	}
 }
 
-export class LocalFileSearchWorkerClient extends Disposable implements ISearchResultProvider, ILocalFileSearchSimpleWorkerHost {
+export class LocalFileSearchWorkerClient extends Disposable implements ISearchResultProvider {
 
 	protected _worker: IWorkerClient<ILocalFileSearchSimpleWorker> | null;
-	protected readonly _workerFactory: DefaultWorkerFactory;
 
 	private readonly _onDidReceiveTextSearchMatch = new Emitter<{ match: IFileMatch<UriComponents>; queryId: number }>();
 	readonly onDidReceiveTextSearchMatch: Event<{ match: IFileMatch<UriComponents>; queryId: number }> = this._onDidReceiveTextSearchMatch.event;
@@ -64,7 +63,6 @@ export class LocalFileSearchWorkerClient extends Disposable implements ISearchRe
 	) {
 		super();
 		this._worker = null;
-		this._workerFactory = new DefaultWorkerFactory('localFileSearchWorker');
 	}
 
 	sendTextSearchMatch(match: IFileMatch<UriComponents>, queryId: number): void {
@@ -77,15 +75,15 @@ export class LocalFileSearchWorkerClient extends Disposable implements ISearchRe
 	}
 
 	private async cancelQuery(queryId: number) {
-		const proxy = await this._getOrCreateWorker().getProxyObject();
-		proxy.cancelQuery(queryId);
+		const proxy = this._getOrCreateWorker().proxy;
+		proxy.$cancelQuery(queryId);
 	}
 
 	async textSearch(query: ITextQuery, onProgress?: (p: ISearchProgressItem) => void, token?: CancellationToken): Promise<ISearchComplete> {
 		try {
 			const queryDisposables = new DisposableStore();
 
-			const proxy = await this._getOrCreateWorker().getProxyObject();
+			const proxy = this._getOrCreateWorker().proxy;
 			const results: IFileMatch[] = [];
 
 			let limitHit = false;
@@ -114,7 +112,7 @@ export class LocalFileSearchWorkerClient extends Disposable implements ISearchRe
 				}));
 
 				const ignorePathCasing = this.uriIdentityService.extUri.ignorePathCasing(fq.folder);
-				const folderResults = await proxy.searchDirectory(handle, query, fq, ignorePathCasing, queryId);
+				const folderResults = await proxy.$searchDirectory(handle, query, fq, ignorePathCasing, queryId);
 				for (const folderResult of folderResults.results) {
 					results.push(revive(folderResult));
 				}
@@ -144,7 +142,7 @@ export class LocalFileSearchWorkerClient extends Disposable implements ISearchRe
 			const queryDisposables = new DisposableStore();
 			let limitHit = false;
 
-			const proxy = await this._getOrCreateWorker().getProxyObject();
+			const proxy = this._getOrCreateWorker().proxy;
 			const results: IFileMatch[] = [];
 			await Promise.all(query.folderQueries.map(async fq => {
 				const queryId = this.queryId++;
@@ -156,7 +154,7 @@ export class LocalFileSearchWorkerClient extends Disposable implements ISearchRe
 					return;
 				}
 				const caseSensitive = this.uriIdentityService.extUri.ignorePathCasing(fq.folder);
-				const folderResults = await proxy.listDirectory(handle, query, fq, caseSensitive, queryId);
+				const folderResults = await proxy.$listDirectory(handle, query, fq, caseSensitive, queryId);
 				for (const folderResult of folderResults.results) {
 					results.push({ resource: URI.joinPath(fq.folder, folderResult) });
 				}
@@ -185,11 +183,15 @@ export class LocalFileSearchWorkerClient extends Disposable implements ISearchRe
 	private _getOrCreateWorker(): IWorkerClient<ILocalFileSearchSimpleWorker> {
 		if (!this._worker) {
 			try {
-				this._worker = this._register(new SimpleWorkerClient<ILocalFileSearchSimpleWorker, ILocalFileSearchSimpleWorkerHost>(
-					this._workerFactory,
+				this._worker = this._register(createWebWorker<ILocalFileSearchSimpleWorker>(
 					'vs/workbench/services/search/worker/localFileSearch',
-					this,
+					'LocalFileSearchWorker'
 				));
+				LocalFileSearchSimpleWorkerHost.setChannel(this._worker, {
+					$sendTextSearchMatch: (match, queryId) => {
+						return this.sendTextSearchMatch(match, queryId);
+					}
+				});
 			} catch (err) {
 				logOnceWebWorkerWarning(err);
 				throw err;
diff --git a/src/vs/workbench/services/search/common/fileSearchManager.ts b/src/vs/workbench/services/search/common/fileSearchManager.ts
index 1685b1f258f..73505b7a1fb 100644
--- a/src/vs/workbench/services/search/common/fileSearchManager.ts
+++ b/src/vs/workbench/services/search/common/fileSearchManager.ts
@@ -10,8 +10,11 @@ import * as glob from 'vs/base/common/glob';
 import * as resources from 'vs/base/common/resources';
 import { StopWatch } from 'vs/base/common/stopwatch';
 import { URI } from 'vs/base/common/uri';
-import { IFileMatch, IFileSearchProviderStats, IFolderQuery, ISearchCompleteStats, IFileQuery, QueryGlobTester, resolvePatternsForProvider, hasSiblingFn } from 'vs/workbench/services/search/common/search';
-import { FileSearchProvider, FileSearchOptions } from 'vs/workbench/services/search/common/searchExtTypes';
+import { IFileMatch, IFileSearchProviderStats, IFolderQuery, ISearchCompleteStats, IFileQuery, QueryGlobTester, resolvePatternsForProvider, hasSiblingFn, excludeToGlobPattern, DEFAULT_MAX_SEARCH_RESULTS } from 'vs/workbench/services/search/common/search';
+import { FileSearchProviderFolderOptions, FileSearchProviderNew, FileSearchProviderOptions } from 'vs/workbench/services/search/common/searchExtTypes';
+import { TernarySearchTree } from 'vs/base/common/ternarySearchTree';
+import { Disposable } from 'vs/base/common/lifecycle';
+import { OldFileSearchProviderConverter } from 'vs/workbench/services/search/common/searchExtConversionTypes';
 
 interface IInternalFileMatch {
 	base: URI;
@@ -27,6 +30,13 @@ interface IDirectoryEntry {
 	basename: string;
 }
 
+interface FolderQueryInfo {
+	queryTester: QueryGlobTester;
+	noSiblingsClauses: boolean;
+	folder: URI;
+	tree: IDirectoryTree;
+}
+
 interface IDirectoryTree {
 	rootEntries: IDirectoryEntry[];
 	pathToEntries: { [relativePath: string]: IDirectoryEntry[] };
@@ -45,7 +55,7 @@ class FileSearchEngine {
 
 	private globalExcludePattern?: glob.ParsedExpression;
 
-	constructor(private config: IFileQuery, private provider: FileSearchProvider, private sessionToken?: CancellationToken) {
+	constructor(private config: IFileQuery, private provider: FileSearchProviderNew, private sessionLifecycle?: SessionLifecycle) {
 		this.filePattern = config.filePattern;
 		this.includePattern = config.includePattern && glob.parse(config.includePattern);
 		this.maxResults = config.maxResults || undefined;
@@ -90,13 +100,13 @@ class FileSearchEngine {
 					});
 			}
 
-			// For each root folder
-			Promise.all(folderQueries.map(fq => {
-				return this.searchInFolder(fq, onResult);
-			})).then(stats => {
+			// For each root folder'
+
+			// NEW: can just call with an array of folder info
+			this.doSearch(folderQueries, onResult).then(stats => {
 				resolve({
 					limitHit: this.isLimitHit,
-					stats: stats[0] || undefined // Only looking at single-folder workspace stats...
+					stats: stats || undefined // Only looking at single-folder workspace stats...
 				});
 			}, (err: Error) => {
 				reject(new Error(toErrorMessage(err)));
@@ -104,13 +114,25 @@ class FileSearchEngine {
 		});
 	}
 
-	private async searchInFolder(fq: IFolderQuery<URI>, onResult: (match: IInternalFileMatch) => void): Promise<IFileSearchProviderStats | null> {
+
+	private async doSearch(fqs: IFolderQuery<URI>[], onResult: (match: IInternalFileMatch) => void): Promise<IFileSearchProviderStats | null> {
 		const cancellation = new CancellationTokenSource();
-		const options = this.getSearchOptionsForFolder(fq);
-		const tree = this.initDirectoryTree();
+		const folderOptions = fqs.map(fq => this.getSearchOptionsForFolder(fq));
+		const session = this.provider instanceof OldFileSearchProviderConverter ? this.sessionLifecycle?.tokenSource.token : this.sessionLifecycle?.obj;
+		const options: FileSearchProviderOptions = {
+			folderOptions,
+			maxResults: this.config.maxResults ?? DEFAULT_MAX_SEARCH_RESULTS,
+			session
+		};
+
+
+		const folderMappings: TernarySearchTree<URI, FolderQueryInfo> = TernarySearchTree.forUris<FolderQueryInfo>();
+		fqs.forEach(fq => {
+			const queryTester = new QueryGlobTester(this.config, fq);
+			const noSiblingsClauses = !queryTester.hasSiblingExcludeClauses();
+			folderMappings.set(fq.folder, { queryTester, noSiblingsClauses, folder: fq.folder, tree: this.initDirectoryTree() });
+		});
 
-		const queryTester = new QueryGlobTester(this.config, fq);
-		const noSiblingsClauses = !queryTester.hasSiblingExcludeClauses();
 
 		let providerSW: StopWatch;
 
@@ -119,9 +141,7 @@ class FileSearchEngine {
 
 			providerSW = StopWatch.create();
 			const results = await this.provider.provideFileSearchResults(
-				{
-					pattern: this.config.filePattern || ''
-				},
+				this.config.filePattern || '',
 				options,
 				cancellation.token);
 			const providerTime = providerSW.elapsed();
@@ -131,19 +151,22 @@ class FileSearchEngine {
 				return null;
 			}
 
+
 			if (results) {
 				results.forEach(result => {
-					const relativePath = path.posix.relative(fq.folder.path, result.path);
 
-					if (noSiblingsClauses) {
+					const fqFolderInfo = folderMappings.findSubstr(result)!;
+					const relativePath = path.posix.relative(fqFolderInfo.folder.path, result.path);
+
+					if (fqFolderInfo.noSiblingsClauses) {
 						const basename = path.basename(result.path);
-						this.matchFile(onResult, { base: fq.folder, relativePath, basename });
+						this.matchFile(onResult, { base: fqFolderInfo.folder, relativePath, basename });
 
 						return;
 					}
 
 					// TODO: Optimize siblings clauses with ripgrep here.
-					this.addDirectoryEntries(tree, fq.folder, relativePath, onResult);
+					this.addDirectoryEntries(fqFolderInfo.tree, fqFolderInfo.folder, relativePath, onResult);
 				});
 			}
 
@@ -151,7 +174,10 @@ class FileSearchEngine {
 				return null;
 			}
 
-			this.matchDirectoryTree(tree, queryTester, onResult);
+			folderMappings.forEach(e => {
+				this.matchDirectoryTree(e.tree, e.queryTester, onResult);
+			});
+
 			return {
 				providerTime,
 				postProcessTime: postProcessSW.elapsed()
@@ -162,20 +188,30 @@ class FileSearchEngine {
 		}
 	}
 
-	private getSearchOptionsForFolder(fq: IFolderQuery<URI>): FileSearchOptions {
+	private getSearchOptionsForFolder(fq: IFolderQuery<URI>): FileSearchProviderFolderOptions {
 		const includes = resolvePatternsForProvider(this.config.includePattern, fq.includePattern);
-		const excludes = resolvePatternsForProvider(this.config.excludePattern, fq.excludePattern);
+		let excludePattern = fq.excludePattern?.map(e => ({
+			folder: e.folder,
+			patterns: resolvePatternsForProvider(this.config.excludePattern, e.pattern)
+		}));
+		if (!excludePattern?.length) {
+			excludePattern = [{
+				folder: undefined,
+				patterns: resolvePatternsForProvider(this.config.excludePattern, undefined)
+			}];
+		}
+		const excludes = excludeToGlobPattern(excludePattern);
 
 		return {
 			folder: fq.folder,
 			excludes,
 			includes,
-			useIgnoreFiles: !fq.disregardIgnoreFiles,
-			useGlobalIgnoreFiles: !fq.disregardGlobalIgnoreFiles,
-			useParentIgnoreFiles: !fq.disregardParentIgnoreFiles,
+			useIgnoreFiles: {
+				local: !fq.disregardIgnoreFiles,
+				parent: !fq.disregardParentIgnoreFiles,
+				global: !fq.disregardGlobalIgnoreFiles
+			},
 			followSymlinks: !fq.ignoreSymlinks,
-			maxResults: this.config.maxResults,
-			session: this.sessionToken
 		};
 	}
 
@@ -268,15 +304,34 @@ interface IInternalSearchComplete {
 	stats?: IFileSearchProviderStats;
 }
 
+/**
+ * For backwards compatibility, store both a cancellation token and a session object. The session object is the new implementation, where
+ */
+class SessionLifecycle extends Disposable {
+	public readonly obj: object;
+	public readonly tokenSource: CancellationTokenSource;
+
+	constructor() {
+		super();
+		this.obj = new Object();
+		this.tokenSource = new CancellationTokenSource();
+	}
+
+	public override dispose(): void {
+		this.tokenSource.cancel();
+		super.dispose();
+	}
+}
+
 export class FileSearchManager {
 
 	private static readonly BATCH_SIZE = 512;
 
-	private readonly sessions = new Map<string, CancellationTokenSource>();
+	private readonly sessions = new Map<string, SessionLifecycle>();
 
-	fileSearch(config: IFileQuery, provider: FileSearchProvider, onBatch: (matches: IFileMatch[]) => void, token: CancellationToken): Promise<ISearchCompleteStats> {
+	fileSearch(config: IFileQuery, provider: FileSearchProviderNew, onBatch: (matches: IFileMatch[]) => void, token: CancellationToken): Promise<ISearchCompleteStats> {
 		const sessionTokenSource = this.getSessionTokenSource(config.cacheKey);
-		const engine = new FileSearchEngine(config, provider, sessionTokenSource && sessionTokenSource.token);
+		const engine = new FileSearchEngine(config, provider, sessionTokenSource);
 
 		let resultCount = 0;
 		const onInternalResult = (batch: IInternalFileMatch[]) => {
@@ -300,17 +355,19 @@ export class FileSearchManager {
 	}
 
 	clearCache(cacheKey: string): void {
-		const sessionTokenSource = this.getSessionTokenSource(cacheKey);
-		sessionTokenSource?.cancel();
+		// cancel the token
+		this.sessions.get(cacheKey)?.dispose();
+		// with no reference to this, it will be removed from WeakMaps
+		this.sessions.delete(cacheKey);
 	}
 
-	private getSessionTokenSource(cacheKey: string | undefined): CancellationTokenSource | undefined {
+	private getSessionTokenSource(cacheKey: string | undefined): SessionLifecycle | undefined {
 		if (!cacheKey) {
 			return undefined;
 		}
 
 		if (!this.sessions.has(cacheKey)) {
-			this.sessions.set(cacheKey, new CancellationTokenSource());
+			this.sessions.set(cacheKey, new SessionLifecycle());
 		}
 
 		return this.sessions.get(cacheKey);
diff --git a/src/vs/workbench/services/search/common/getFileResults.ts b/src/vs/workbench/services/search/common/getFileResults.ts
index 366f8b030ef..2ad8f5db93d 100644
--- a/src/vs/workbench/services/search/common/getFileResults.ts
+++ b/src/vs/workbench/services/search/common/getFileResults.ts
@@ -3,17 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ITextSearchResult } from 'vs/workbench/services/search/common/search';
-import { TextSearchPreviewOptions } from 'vs/workbench/services/search/common/searchExtTypes';
+import { ITextSearchMatch, ITextSearchPreviewOptions, ITextSearchResult } from 'vs/workbench/services/search/common/search';
 import { Range } from 'vs/editor/common/core/range';
 
 export const getFileResults = (
 	bytes: Uint8Array,
 	pattern: RegExp,
 	options: {
-		beforeContext: number;
-		afterContext: number;
-		previewOptions: TextSearchPreviewOptions | undefined;
+		surroundingContext: number;
+		previewOptions: ITextSearchPreviewOptions | undefined;
 		remainingResultQuota: number;
 	}
 ): ITextSearchResult[] => {
@@ -71,8 +69,8 @@ export const getFileResults = (
 				endLine++;
 			}
 
-			if (options.beforeContext) {
-				for (let contextLine = Math.max(0, startLine - options.beforeContext); contextLine < startLine; contextLine++) {
+			if (options.surroundingContext) {
+				for (let contextLine = Math.max(0, startLine - options.surroundingContext); contextLine < startLine; contextLine++) {
 					contextLinesNeeded.add(contextLine);
 				}
 			}
@@ -102,14 +100,18 @@ export const getFileResults = (
 				matchStartIndex + matchedText.length - lineRanges[endLine].start - (endLine === startLine ? offset : 0)
 			);
 
-			const match: ITextSearchResult = {
-				ranges: fileRange,
-				preview: { text: previewText, matches: previewRange },
+			const match: ITextSearchMatch = {
+				rangeLocations: [{
+					source: fileRange,
+					preview: previewRange,
+				}],
+				previewText: previewText
 			};
+
 			results.push(match);
 
-			if (options.afterContext) {
-				for (let contextLine = endLine + 1; contextLine <= Math.min(endLine + options.afterContext, lineRanges.length - 1); contextLine++) {
+			if (options.surroundingContext) {
+				for (let contextLine = endLine + 1; contextLine <= Math.min(endLine + options.surroundingContext, lineRanges.length - 1); contextLine++) {
 					contextLinesNeeded.add(contextLine);
 				}
 			}
diff --git a/src/vs/workbench/services/search/common/localFileSearchWorkerTypes.ts b/src/vs/workbench/services/search/common/localFileSearchWorkerTypes.ts
index 8b51e88bedd..8515cd5eed0 100644
--- a/src/vs/workbench/services/search/common/localFileSearchWorkerTypes.ts
+++ b/src/vs/workbench/services/search/common/localFileSearchWorkerTypes.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { UriComponents } from 'vs/base/common/uri';
+import { IWorkerClient, IWorkerServer } from 'vs/base/common/worker/simpleWorker';
 import { IFileMatch, IFileQueryProps, IFolderQuery, ITextQueryProps } from 'vs/workbench/services/search/common/search';
 
 export interface IWorkerTextSearchComplete {
@@ -41,12 +42,20 @@ export interface IWorkerFileSystemFileHandle extends IWorkerFileSystemHandle {
 export interface ILocalFileSearchSimpleWorker {
 	_requestHandlerBrand: any;
 
-	cancelQuery(queryId: number): void;
+	$cancelQuery(queryId: number): void;
 
-	listDirectory(handle: IWorkerFileSystemDirectoryHandle, queryProps: IFileQueryProps<UriComponents>, folderQuery: IFolderQuery, ignorePathCasing: boolean, queryId: number): Promise<IWorkerFileSearchComplete>;
-	searchDirectory(handle: IWorkerFileSystemDirectoryHandle, queryProps: ITextQueryProps<UriComponents>, folderQuery: IFolderQuery, ignorePathCasing: boolean, queryId: number): Promise<IWorkerTextSearchComplete>;
+	$listDirectory(handle: IWorkerFileSystemDirectoryHandle, queryProps: IFileQueryProps<UriComponents>, folderQuery: IFolderQuery, ignorePathCasing: boolean, queryId: number): Promise<IWorkerFileSearchComplete>;
+	$searchDirectory(handle: IWorkerFileSystemDirectoryHandle, queryProps: ITextQueryProps<UriComponents>, folderQuery: IFolderQuery, ignorePathCasing: boolean, queryId: number): Promise<IWorkerTextSearchComplete>;
 }
 
-export interface ILocalFileSearchSimpleWorkerHost {
-	sendTextSearchMatch(match: IFileMatch<UriComponents>, queryId: number): void;
+export abstract class LocalFileSearchSimpleWorkerHost {
+	public static CHANNEL_NAME = 'localFileSearchWorkerHost';
+	public static getChannel(workerServer: IWorkerServer): LocalFileSearchSimpleWorkerHost {
+		return workerServer.getChannel<LocalFileSearchSimpleWorkerHost>(LocalFileSearchSimpleWorkerHost.CHANNEL_NAME);
+	}
+	public static setChannel(workerClient: IWorkerClient<any>, obj: LocalFileSearchSimpleWorkerHost): void {
+		workerClient.setChannel<LocalFileSearchSimpleWorkerHost>(LocalFileSearchSimpleWorkerHost.CHANNEL_NAME, obj);
+	}
+
+	abstract $sendTextSearchMatch(match: IFileMatch<UriComponents>, queryId: number): void;
 }
diff --git a/src/vs/workbench/services/search/common/queryBuilder.ts b/src/vs/workbench/services/search/common/queryBuilder.ts
index 0db88575f27..53b37e5f17d 100644
--- a/src/vs/workbench/services/search/common/queryBuilder.ts
+++ b/src/vs/workbench/services/search/common/queryBuilder.ts
@@ -18,10 +18,12 @@ import { isMultilineRegexSource } from 'vs/editor/common/model/textModelSearch';
 import * as nls from 'vs/nls';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { ILogService } from 'vs/platform/log/common/log';
+import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
 import { IWorkspaceContextService, IWorkspaceFolderData, toWorkspaceFolder, WorkbenchState } from 'vs/platform/workspace/common/workspace';
 import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
 import { IPathService } from 'vs/workbench/services/path/common/pathService';
-import { getExcludes, ICommonQueryProps, IFileQuery, IFolderQuery, IPatternInfo, ISearchConfiguration, ITextQuery, ITextSearchPreviewOptions, pathIncludedInQuery, QueryType } from 'vs/workbench/services/search/common/search';
+import { ExcludeGlobPattern, getExcludes, ICommonQueryProps, IFileQuery, IFolderQuery, IPatternInfo, ISearchConfiguration, ITextQuery, ITextSearchPreviewOptions, pathIncludedInQuery, QueryType } from 'vs/workbench/services/search/common/search';
+import { GlobPattern } from 'vs/workbench/services/search/common/searchExtTypes';
 
 /**
  * One folder to search and a glob expression that should be applied.
@@ -39,6 +41,31 @@ export interface ISearchPathPattern {
 	pattern?: glob.IExpression;
 }
 
+type ISearchPathPatternBuilder = string | string[];
+
+export interface ISearchPatternBuilder {
+	uri?: uri;
+	pattern: ISearchPathPatternBuilder;
+}
+
+export function isISearchPatternBuilder(object: ISearchPatternBuilder | ISearchPathPatternBuilder): object is ISearchPatternBuilder {
+	return (typeof object === 'object' && 'uri' in object && 'pattern' in object);
+}
+
+export function globPatternToISearchPatternBuilder(globPattern: GlobPattern): ISearchPatternBuilder {
+
+	if (typeof globPattern === 'string') {
+		return {
+			pattern: globPattern
+		};
+	}
+
+	return {
+		pattern: globPattern.pattern,
+		uri: globPattern.baseUri
+	};
+}
+
 /**
  * A set of search paths and a set of glob expressions that should be applied.
  */
@@ -49,8 +76,8 @@ export interface ISearchPathsInfo {
 
 interface ICommonQueryBuilderOptions {
 	_reason?: string;
-	excludePattern?: string | string[];
-	includePattern?: string | string[];
+	excludePattern?: ISearchPatternBuilder[];
+	includePattern?: ISearchPathPatternBuilder;
 	extraFileResources?: uri[];
 
 	/** Parse the special ./ syntax supported by the searchview, and expand foo to ** /foo */
@@ -65,6 +92,7 @@ interface ICommonQueryBuilderOptions {
 	disregardSearchExcludeSettings?: boolean;
 	ignoreSymlinks?: boolean;
 	onlyOpenEditors?: boolean;
+	onlyFileScheme?: boolean;
 }
 
 export interface IFileQueryBuilderOptions extends ICommonQueryBuilderOptions {
@@ -78,8 +106,7 @@ export interface IFileQueryBuilderOptions extends ICommonQueryBuilderOptions {
 export interface ITextQueryBuilderOptions extends ICommonQueryBuilderOptions {
 	previewOptions?: ITextSearchPreviewOptions;
 	fileEncoding?: string;
-	beforeContext?: number;
-	afterContext?: number;
+	surroundingContext?: number;
 	isSmartCase?: boolean;
 	notebookSearchConfig?: {
 		includeMarkupInput: boolean;
@@ -96,7 +123,8 @@ export class QueryBuilder {
 		@IWorkspaceContextService private readonly workspaceContextService: IWorkspaceContextService,
 		@IEditorGroupsService private readonly editorGroupsService: IEditorGroupsService,
 		@ILogService private readonly logService: ILogService,
-		@IPathService private readonly pathService: IPathService
+		@IPathService private readonly pathService: IPathService,
+		@IUriIdentityService private readonly uriIdentityService: IUriIdentityService
 	) {
 	}
 
@@ -117,8 +145,7 @@ export class QueryBuilder {
 			previewOptions: options.previewOptions,
 			maxFileSize: options.maxFileSize,
 			usePCRE2: searchConfig.search.usePCRE2 || fallbackToPCRE || false,
-			beforeContext: options.beforeContext,
-			afterContext: options.afterContext,
+			surroundingContext: options.surroundingContext,
 			userDisabledExcludesAndIgnoreFiles: options.disregardExcludeSettings && options.disregardIgnoreFiles,
 
 		};
@@ -198,15 +225,25 @@ export class QueryBuilder {
 			return {};
 		}
 
-		pattern = Array.isArray(pattern) ? pattern.map(normalizeSlashes) : normalizeSlashes(pattern);
+		if (Array.isArray(pattern)) {
+			pattern = pattern.filter(p => p.length > 0).map(normalizeSlashes);
+			if (!pattern.length) {
+				return {};
+			}
+		} else {
+			pattern = normalizeSlashes(pattern);
+		}
 		return expandPatterns
 			? this.parseSearchPaths(pattern)
 			: { pattern: patternListToIExpression(...(Array.isArray(pattern) ? pattern : [pattern])) };
 	}
 
 	private commonQuery(folderResources: (IWorkspaceFolderData | URI)[] = [], options: ICommonQueryBuilderOptions = {}): ICommonQueryProps<uri> {
+
+		let excludePatterns: string | string[] | undefined = Array.isArray(options.excludePattern) ? options.excludePattern.map(p => p.pattern).flat() : options.excludePattern;
+		excludePatterns = excludePatterns?.length === 1 ? excludePatterns[0] : excludePatterns;
 		const includeSearchPathsInfo: ISearchPathsInfo = this.handleIncludeExclude(options.includePattern, options.expandPatterns);
-		const excludeSearchPathsInfo: ISearchPathsInfo = this.handleIncludeExclude(options.excludePattern, options.expandPatterns);
+		const excludeSearchPathsInfo: ISearchPathsInfo = this.handleIncludeExclude(excludePatterns, options.expandPatterns);
 
 		// Build folderQueries from searchPaths, if given, otherwise folderResources
 		const includeFolderName = folderResources.length > 1;
@@ -224,7 +261,8 @@ export class QueryBuilder {
 			excludePattern: excludeSearchPathsInfo.pattern,
 			includePattern: includeSearchPathsInfo.pattern,
 			onlyOpenEditors: options.onlyOpenEditors,
-			maxResults: options.maxResults
+			maxResults: options.maxResults,
+			onlyFileScheme: options.onlyFileScheme
 		};
 
 		if (options.onlyOpenEditors) {
@@ -254,7 +292,8 @@ export class QueryBuilder {
 			const providerExists = isAbsolutePath(file);
 			// Special case userdata as we don't have a search provider for it, but it can be searched.
 			if (providerExists) {
-				const searchRoot = this.workspaceContextService.getWorkspaceFolder(file)?.uri ?? file.with({ path: path.dirname(file.fsPath) });
+
+				const searchRoot = this.workspaceContextService.getWorkspaceFolder(file)?.uri ?? this.uriIdentityService.extUri.dirname(file);
 
 				let folderQuery = foldersToSearch.get(searchRoot);
 				if (!folderQuery) {
@@ -522,6 +561,18 @@ export class QueryBuilder {
 	private getFolderQueryForRoot(folder: (IWorkspaceFolderData | URI), options: ICommonQueryBuilderOptions, searchPathExcludes: ISearchPathsInfo, includeFolderName: boolean): IFolderQuery | null {
 		let thisFolderExcludeSearchPathPattern: glob.IExpression | undefined;
 		const folderUri = URI.isUri(folder) ? folder : folder.uri;
+
+		// only use exclude root if it is different from the folder root
+		let excludeFolderRoots = options.excludePattern?.map(excludePattern => {
+			const excludeRoot = options.excludePattern && isISearchPatternBuilder(excludePattern) ? excludePattern.uri : undefined;
+			const shouldUseExcludeRoot = (!excludeRoot || !(URI.isUri(folder) && this.uriIdentityService.extUri.isEqual(folder, excludeRoot)));
+			return shouldUseExcludeRoot ? excludeRoot : undefined;
+		});
+
+		if (!excludeFolderRoots?.length) {
+			excludeFolderRoots = [undefined];
+		}
+
 		if (searchPathExcludes.searchPaths) {
 			const thisFolderExcludeSearchPath = searchPathExcludes.searchPaths.filter(sp => isEqual(sp.searchPath, folderUri))[0];
 			if (thisFolderExcludeSearchPath && !thisFolderExcludeSearchPath.pattern) {
@@ -540,10 +591,18 @@ export class QueryBuilder {
 		};
 
 		const folderName = URI.isUri(folder) ? basename(folder) : folder.name;
+
+		const excludePatternRet: ExcludeGlobPattern[] = excludeFolderRoots.map(excludeFolderRoot => {
+			return Object.keys(excludePattern).length > 0 ? {
+				folder: excludeFolderRoot,
+				pattern: excludePattern
+			} satisfies ExcludeGlobPattern : undefined;
+		}).filter((e) => e) as ExcludeGlobPattern[];
+
 		return {
 			folder: folderUri,
 			folderName: includeFolderName ? folderName : undefined,
-			excludePattern: Object.keys(excludePattern).length > 0 ? excludePattern : undefined,
+			excludePattern: excludePatternRet,
 			fileEncoding: folderConfig.files && folderConfig.files.encoding,
 			disregardIgnoreFiles: typeof options.disregardIgnoreFiles === 'boolean' ? options.disregardIgnoreFiles : !folderConfig.search.useIgnoreFiles,
 			disregardGlobalIgnoreFiles: typeof options.disregardGlobalIgnoreFiles === 'boolean' ? options.disregardGlobalIgnoreFiles : !folderConfig.search.useGlobalIgnoreFiles,
diff --git a/src/vs/workbench/services/search/common/search.ts b/src/vs/workbench/services/search/common/search.ts
index 563b0dda249..79b0e06ee8b 100644
--- a/src/vs/workbench/services/search/common/search.ts
+++ b/src/vs/workbench/services/search/common/search.ts
@@ -17,7 +17,7 @@ import { ITelemetryData } from 'vs/platform/telemetry/common/telemetry';
 import { Event } from 'vs/base/common/event';
 import * as paths from 'vs/base/common/path';
 import { isCancellationError } from 'vs/base/common/errors';
-import { TextSearchCompleteMessageType } from 'vs/workbench/services/search/common/searchExtTypes';
+import { GlobPattern, TextSearchCompleteMessageType } from 'vs/workbench/services/search/common/searchExtTypes';
 import { isThenable } from 'vs/base/common/async';
 import { ResourceSet } from 'vs/base/common/map';
 
@@ -67,10 +67,16 @@ export interface ISearchResultProvider {
 	clearCache(cacheKey: string): Promise<void>;
 }
 
+
+export interface ExcludeGlobPattern<U extends UriComponents = URI> {
+	folder?: U;
+	pattern: glob.IExpression;
+}
+
 export interface IFolderQuery<U extends UriComponents = URI> {
 	folder: U;
 	folderName?: string;
-	excludePattern?: glob.IExpression;
+	excludePattern?: ExcludeGlobPattern<U>[];
 	includePattern?: glob.IExpression;
 	fileEncoding?: string;
 	disregardIgnoreFiles?: boolean;
@@ -94,6 +100,7 @@ export interface ICommonQueryProps<U extends UriComponents> {
 
 	maxResults?: number;
 	usingSearchPaths?: boolean;
+	onlyFileScheme?: boolean;
 }
 
 export interface IFileQueryProps<U extends UriComponents> extends ICommonQueryProps<U> {
@@ -120,8 +127,7 @@ export interface ITextQueryProps<U extends UriComponents> extends ICommonQueryPr
 	previewOptions?: ITextSearchPreviewOptions;
 	maxFileSize?: number;
 	usePCRE2?: boolean;
-	afterContext?: number;
-	beforeContext?: number;
+	surroundingContext?: number;
 
 	userDisabledExcludesAndIgnoreFiles?: boolean;
 }
@@ -132,8 +138,7 @@ export interface IAITextQueryProps<U extends UriComponents> extends ICommonQuery
 
 	previewOptions?: ITextSearchPreviewOptions;
 	maxFileSize?: number;
-	afterContext?: number;
-	beforeContext?: number;
+	surroundingContext?: number;
 
 	userDisabledExcludesAndIgnoreFiles?: boolean;
 }
@@ -205,17 +210,12 @@ export interface ISearchRange {
 	readonly endColumn: number;
 }
 
-export interface ITextSearchResultPreview {
-	text: string;
-	matches: ISearchRange | ISearchRange[];
-	cellFragment?: string;
-}
-
 export interface ITextSearchMatch<U extends UriComponents = URI> {
 	uri?: U;
-	ranges: ISearchRange | ISearchRange[];
-	preview: ITextSearchResultPreview;
+	rangeLocations: SearchRangeSetPairing[];
+	previewText: string;
 	webviewIndex?: number;
+	cellFragment?: string;
 }
 
 export interface ITextSearchContext<U extends UriComponents = URI> {
@@ -227,7 +227,7 @@ export interface ITextSearchContext<U extends UriComponents = URI> {
 export type ITextSearchResult<U extends UriComponents = URI> = ITextSearchMatch<U> | ITextSearchContext<U>;
 
 export function resultIsMatch(result: ITextSearchResult): result is ITextSearchMatch {
-	return !!(<ITextSearchMatch>result).preview;
+	return !!(<ITextSearchMatch>result).rangeLocations && !!(<ITextSearchMatch>result).previewText;
 }
 
 export interface IProgressMessage {
@@ -306,20 +306,25 @@ export class FileMatch implements IFileMatch {
 	}
 }
 
+export interface SearchRangeSetPairing {
+	source: ISearchRange;
+	preview: ISearchRange;
+}
+
 export class TextSearchMatch implements ITextSearchMatch {
-	ranges: ISearchRange | ISearchRange[];
-	preview: ITextSearchResultPreview;
+	rangeLocations: SearchRangeSetPairing[] = [];
+	previewText: string;
 	webviewIndex?: number;
 
-	constructor(text: string, range: ISearchRange | ISearchRange[], previewOptions?: ITextSearchPreviewOptions, webviewIndex?: number) {
-		this.ranges = range;
+	constructor(text: string, ranges: ISearchRange | ISearchRange[], previewOptions?: ITextSearchPreviewOptions, webviewIndex?: number) {
 		this.webviewIndex = webviewIndex;
 
 		// Trim preview if this is one match and a single-line match with a preview requested.
 		// Otherwise send the full text, like for replace or for showing multiple previews.
 		// TODO this is fishy.
-		const ranges = Array.isArray(range) ? range : [range];
-		if (previewOptions && previewOptions.matchLines === 1 && isSingleLineRangeList(ranges)) {
+		const rangesArr = Array.isArray(ranges) ? ranges : [ranges];
+
+		if (previewOptions && previewOptions.matchLines === 1 && isSingleLineRangeList(rangesArr)) {
 			// 1 line preview requested
 			text = getNLines(text, previewOptions.matchLines);
 
@@ -327,8 +332,7 @@ export class TextSearchMatch implements ITextSearchMatch {
 			let shift = 0;
 			let lastEnd = 0;
 			const leadingChars = Math.floor(previewOptions.charsPerLine / 5);
-			const matches: ISearchRange[] = [];
-			for (const range of ranges) {
+			for (const range of rangesArr) {
 				const previewStart = Math.max(range.startColumn - leadingChars, 0);
 				const previewEnd = range.startColumn + previewOptions.charsPerLine;
 				if (previewStart > lastEnd + leadingChars + SEARCH_ELIDED_MIN_LEN) {
@@ -339,18 +343,25 @@ export class TextSearchMatch implements ITextSearchMatch {
 					result += text.slice(lastEnd, previewEnd);
 				}
 
-				matches.push(new OneLineRange(0, range.startColumn - shift, range.endColumn - shift));
 				lastEnd = previewEnd;
+				this.rangeLocations.push({
+					source: range,
+					preview: new OneLineRange(0, range.startColumn - shift, range.endColumn - shift)
+				});
+
 			}
 
-			this.preview = { text: result, matches: Array.isArray(this.ranges) ? matches : matches[0] };
+			this.previewText = result;
 		} else {
-			const firstMatchLine = Array.isArray(range) ? range[0].startLineNumber : range.startLineNumber;
+			const firstMatchLine = Array.isArray(ranges) ? ranges[0].startLineNumber : ranges.startLineNumber;
+
+			const rangeLocs = mapArrayOrNot(ranges, r => ({
+				preview: new SearchRange(r.startLineNumber - firstMatchLine, r.startColumn, r.endLineNumber - firstMatchLine, r.endColumn),
+				source: r
+			}));
 
-			this.preview = {
-				text,
-				matches: mapArrayOrNot(range, r => new SearchRange(r.startLineNumber - firstMatchLine, r.startColumn, r.endLineNumber - firstMatchLine, r.endColumn))
-			};
+			this.rangeLocations = Array.isArray(rangeLocs) ? rangeLocs : [rangeLocs];
+			this.previewText = text;
 		}
 	}
 }
@@ -430,6 +441,7 @@ export interface ISearchConfigurationProperties {
 		singleClickBehaviour: 'default' | 'peekDefinition';
 		reusePriorSearchConfiguration: boolean;
 		defaultNumberOfContextLines: number | null;
+		focusResultsOnSearch: boolean;
 		experimental: {};
 	};
 	sortOrder: SearchSortOrder;
@@ -669,17 +681,26 @@ export function resolvePatternsForProvider(globalPattern: glob.IExpression | und
 
 export class QueryGlobTester {
 
-	private _excludeExpression: glob.IExpression;
-	private _parsedExcludeExpression: glob.ParsedExpression;
+	private _excludeExpression: glob.IExpression[]; // TODO: evaluate globs based on baseURI of pattern
+	private _parsedExcludeExpression: glob.ParsedExpression[];
 
 	private _parsedIncludeExpression: glob.ParsedExpression | null = null;
 
 	constructor(config: ISearchQuery, folderQuery: IFolderQuery) {
-		this._excludeExpression = {
-			...(config.excludePattern || {}),
-			...(folderQuery.excludePattern || {})
-		};
-		this._parsedExcludeExpression = glob.parse(this._excludeExpression);
+		// todo: try to incorporate folderQuery.excludePattern.folder if available
+		this._excludeExpression = folderQuery.excludePattern?.map(excludePattern => {
+			return {
+				...(config.excludePattern || {}),
+				...(excludePattern.pattern || {})
+			} satisfies glob.IExpression;
+		}) ?? [];
+
+		if (this._excludeExpression.length === 0) {
+			// even if there are no folderQueries, we want to observe  the global excludes
+			this._excludeExpression = [config.excludePattern || {}];
+		}
+
+		this._parsedExcludeExpression = this._excludeExpression.map(e => glob.parse(e));
 
 		// Empty includeExpression means include nothing, so no {} shortcuts
 		let includeExpression: glob.IExpression | undefined = config.includePattern;
@@ -699,8 +720,26 @@ export class QueryGlobTester {
 		}
 	}
 
+	private _evalParsedExcludeExpression(testPath: string, basename: string | undefined, hasSibling?: (name: string) => boolean): string | null {
+		// todo: less hacky way of evaluating sync vs async sibling clauses
+		let result: string | null = null;
+
+		for (const folderExclude of this._parsedExcludeExpression) {
+
+			// find first non-null result
+			const evaluation = folderExclude(testPath, basename, hasSibling);
+
+			if (typeof evaluation === 'string') {
+				result = evaluation;
+				break;
+			}
+		}
+		return result;
+	}
+
+
 	matchesExcludesSync(testPath: string, basename?: string, hasSibling?: (name: string) => boolean): boolean {
-		if (this._parsedExcludeExpression && this._parsedExcludeExpression(testPath, basename, hasSibling)) {
+		if (this._parsedExcludeExpression && this._evalParsedExcludeExpression(testPath, basename, hasSibling)) {
 			return true;
 		}
 
@@ -711,7 +750,7 @@ export class QueryGlobTester {
 	 * Guaranteed sync - siblingsFn should not return a promise.
 	 */
 	includedInQuerySync(testPath: string, basename?: string, hasSibling?: (name: string) => boolean): boolean {
-		if (this._parsedExcludeExpression && this._parsedExcludeExpression(testPath, basename, hasSibling)) {
+		if (this._parsedExcludeExpression && this._evalParsedExcludeExpression(testPath, basename, hasSibling)) {
 			return false;
 		}
 
@@ -727,7 +766,6 @@ export class QueryGlobTester {
 	 * unless the expression is async.
 	 */
 	includedInQuery(testPath: string, basename?: string, hasSibling?: (name: string) => boolean | Promise<boolean>): Promise<boolean> | boolean {
-		const excluded = this._parsedExcludeExpression(testPath, basename, hasSibling);
 
 		const isIncluded = () => {
 			return this._parsedIncludeExpression ?
@@ -735,21 +773,27 @@ export class QueryGlobTester {
 				true;
 		};
 
-		if (isThenable(excluded)) {
-			return excluded.then(excluded => {
-				if (excluded) {
-					return false;
-				}
+		return Promise.all(this._parsedExcludeExpression.map(e => {
+			const excluded = e(testPath, basename, hasSibling);
+			if (isThenable(excluded)) {
+				return excluded.then(excluded => {
+					if (excluded) {
+						return false;
+					}
+
+					return isIncluded();
+				});
+			}
+
+			return isIncluded();
+
+		})).then(e => e.some(e => !!e));
 
-				return isIncluded();
-			});
-		}
 
-		return isIncluded();
 	}
 
 	hasSiblingExcludeClauses(): boolean {
-		return hasSiblingClauses(this._excludeExpression);
+		return this._excludeExpression.reduce((prev, curr) => hasSiblingClauses(curr) || prev, false);
 	}
 }
 
@@ -800,3 +844,18 @@ function listToMap(list: string[]) {
 	}
 	return map;
 }
+
+export function excludeToGlobPattern(excludesForFolder: { baseUri?: URI | undefined; patterns: string[] }[]): GlobPattern[] {
+	return excludesForFolder.flatMap(exclude => exclude.patterns.map(pattern => {
+		return exclude.baseUri ?
+			{
+				baseUri: exclude.baseUri,
+				pattern: pattern
+			} : pattern;
+	}));
+}
+
+export const DEFAULT_TEXT_SEARCH_PREVIEW_OPTIONS = {
+	matchLines: 100,
+	charsPerLine: 10000
+};
diff --git a/src/vs/workbench/services/search/common/searchExtConversionTypes.ts b/src/vs/workbench/services/search/common/searchExtConversionTypes.ts
new file mode 100644
index 00000000000..b57ed866087
--- /dev/null
+++ b/src/vs/workbench/services/search/common/searchExtConversionTypes.ts
@@ -0,0 +1,614 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { asArray, coalesce } from 'vs/base/common/arrays';
+import { CancellationToken } from 'vs/base/common/cancellation';
+import { URI } from 'vs/base/common/uri';
+import { IProgress } from 'vs/platform/progress/common/progress';
+import { DEFAULT_TEXT_SEARCH_PREVIEW_OPTIONS } from 'vs/workbench/services/search/common/search';
+import { Range, FileSearchProviderNew, FileSearchProviderOptions, ProviderResult, TextSearchCompleteNew, TextSearchContextNew, TextSearchMatchNew, TextSearchProviderNew, TextSearchProviderOptions, TextSearchQueryNew, TextSearchResultNew, AITextSearchProviderNew, TextSearchCompleteMessage } from 'vs/workbench/services/search/common/searchExtTypes';
+
+// old types that are retained for backward compatibility
+// TODO: delete this when search apis are adopted by all first-party extensions
+
+/**
+ * A relative pattern is a helper to construct glob patterns that are matched
+ * relatively to a base path. The base path can either be an absolute file path
+ * or a [workspace folder](#WorkspaceFolder).
+ */
+export interface RelativePattern {
+
+	/**
+	 * A base file path to which this pattern will be matched against relatively.
+	 */
+	base: string;
+
+	/**
+	 * A file glob pattern like `*.{ts,js}` that will be matched on file paths
+	 * relative to the base path.
+	 *
+	 * Example: Given a base of `/home/work/folder` and a file path of `/home/work/folder/index.js`,
+	 * the file glob pattern will match on `index.js`.
+	 */
+	pattern: string;
+}
+
+/**
+ * A file glob pattern to match file paths against. This can either be a glob pattern string
+ * (like `** /*.{ts,js}` without space before / or `*.{ts,js}`) or a [relative pattern](#RelativePattern).
+ *
+ * Glob patterns can have the following syntax:
+ * * `*` to match zero or more characters in a path segment
+ * * `?` to match on one character in a path segment
+ * * `**` to match any number of path segments, including none
+ * * `{}` to group conditions (e.g. `** /*.{ts,js}` without space before / matches all TypeScript and JavaScript files)
+ * * `[]` to declare a range of characters to match in a path segment (e.g., `example.[0-9]` to match on `example.0`, `example.1`, …)
+ * * `[!...]` to negate a range of characters to match in a path segment (e.g., `example.[!0-9]` to match on `example.a`, `example.b`, but not `example.0`)
+ *
+ * Note: a backslash (`\`) is not valid within a glob pattern. If you have an existing file
+ * path to match against, consider to use the [relative pattern](#RelativePattern) support
+ * that takes care of converting any backslash into slash. Otherwise, make sure to convert
+ * any backslash to slash when creating the glob pattern.
+ */
+export type GlobPattern = string | RelativePattern;
+
+/**
+ * The parameters of a query for text search.
+ */
+export interface TextSearchQuery {
+	/**
+	 * The text pattern to search for.
+	 */
+	pattern: string;
+
+	/**
+	 * Whether or not `pattern` should match multiple lines of text.
+	 */
+	isMultiline?: boolean;
+
+	/**
+	 * Whether or not `pattern` should be interpreted as a regular expression.
+	 */
+	isRegExp?: boolean;
+
+	/**
+	 * Whether or not the search should be case-sensitive.
+	 */
+	isCaseSensitive?: boolean;
+
+	/**
+	 * Whether or not to search for whole word matches only.
+	 */
+	isWordMatch?: boolean;
+}
+
+/**
+ * A file glob pattern to match file paths against.
+ * TODO@roblou - merge this with the GlobPattern docs/definition in vscode.d.ts.
+ * @see [GlobPattern](#GlobPattern)
+ */
+export type GlobString = string;
+
+/**
+ * Options common to file and text search
+ */
+export interface SearchOptions {
+	/**
+	 * The root folder to search within.
+	 */
+	folder: URI;
+
+	/**
+	 * Files that match an `includes` glob pattern should be included in the search.
+	 */
+	includes: GlobString[];
+
+	/**
+	 * Files that match an `excludes` glob pattern should be excluded from the search.
+	 */
+	excludes: GlobString[];
+
+	/**
+	 * Whether external files that exclude files, like .gitignore, should be respected.
+	 * See the vscode setting `"search.useIgnoreFiles"`.
+	 */
+	useIgnoreFiles: boolean;
+
+	/**
+	 * Whether symlinks should be followed while searching.
+	 * See the vscode setting `"search.followSymlinks"`.
+	 */
+	followSymlinks: boolean;
+
+	/**
+	 * Whether global files that exclude files, like .gitignore, should be respected.
+	 * See the vscode setting `"search.useGlobalIgnoreFiles"`.
+	 */
+	useGlobalIgnoreFiles: boolean;
+
+	/**
+	 * Whether files in parent directories that exclude files, like .gitignore, should be respected.
+	 * See the vscode setting `"search.useParentIgnoreFiles"`.
+	 */
+	useParentIgnoreFiles: boolean;
+}
+
+/**
+ * Options to specify the size of the result text preview.
+ * These options don't affect the size of the match itself, just the amount of preview text.
+ */
+export interface TextSearchPreviewOptions {
+	/**
+	 * The maximum number of lines in the preview.
+	 * Only search providers that support multiline search will ever return more than one line in the match.
+	 */
+	matchLines: number;
+
+	/**
+	 * The maximum number of characters included per line.
+	 */
+	charsPerLine: number;
+}
+
+/**
+ * Options that apply to text search.
+ */
+export interface TextSearchOptions extends SearchOptions {
+	/**
+	 * The maximum number of results to be returned.
+	 */
+	maxResults: number;
+
+	/**
+	 * Options to specify the size of the result text preview.
+	 */
+	previewOptions?: TextSearchPreviewOptions;
+
+	/**
+	 * Exclude files larger than `maxFileSize` in bytes.
+	 */
+	maxFileSize?: number;
+
+	/**
+	 * Interpret files using this encoding.
+	 * See the vscode setting `"files.encoding"`
+	 */
+	encoding?: string;
+
+	/**
+	 * Number of lines of context to include before each match.
+	 */
+	beforeContext?: number;
+
+	/**
+	 * Number of lines of context to include after each match.
+	 */
+	afterContext?: number;
+}
+/**
+ * Options that apply to AI text search.
+ */
+export interface AITextSearchOptions extends SearchOptions {
+	/**
+	 * The maximum number of results to be returned.
+	 */
+	maxResults: number;
+
+	/**
+	 * Options to specify the size of the result text preview.
+	 */
+	previewOptions?: TextSearchPreviewOptions;
+
+	/**
+	 * Exclude files larger than `maxFileSize` in bytes.
+	 */
+	maxFileSize?: number;
+
+	/**
+	 * Number of lines of context to include before each match.
+	 */
+	beforeContext?: number;
+
+	/**
+	 * Number of lines of context to include after each match.
+	 */
+	afterContext?: number;
+}
+
+/**
+ * Information collected when text search is complete.
+ */
+export interface TextSearchComplete {
+	/**
+	 * Whether the search hit the limit on the maximum number of search results.
+	 * `maxResults` on [`TextSearchOptions`](#TextSearchOptions) specifies the max number of results.
+	 * - If exactly that number of matches exist, this should be false.
+	 * - If `maxResults` matches are returned and more exist, this should be true.
+	 * - If search hits an internal limit which is less than `maxResults`, this should be true.
+	 */
+	limitHit?: boolean;
+
+	/**
+	 * Additional information regarding the state of the completed search.
+	 *
+	 * Supports links in markdown syntax:
+	 * - Click to [run a command](command:workbench.action.OpenQuickPick)
+	 * - Click to [open a website](https://aka.ms)
+	 */
+	message?: TextSearchCompleteMessage | TextSearchCompleteMessage[];
+}
+
+/**
+ * The parameters of a query for file search.
+ */
+export interface FileSearchQuery {
+	/**
+	 * The search pattern to match against file paths.
+	 */
+	pattern: string;
+}
+
+/**
+ * Options that apply to file search.
+ */
+export interface FileSearchOptions extends SearchOptions {
+	/**
+	 * The maximum number of results to be returned.
+	 */
+	maxResults?: number;
+
+	/**
+	 * A CancellationToken that represents the session for this search query. If the provider chooses to, this object can be used as the key for a cache,
+	 * and searches with the same session object can search the same cache. When the token is cancelled, the session is complete and the cache can be cleared.
+	 */
+	session?: CancellationToken;
+}
+
+/**
+ * A preview of the text result.
+ */
+export interface TextSearchMatchPreview {
+	/**
+	 * The matching lines of text, or a portion of the matching line that contains the match.
+	 */
+	text: string;
+
+	/**
+	 * The Range within `text` corresponding to the text of the match.
+	 * The number of matches must match the TextSearchMatch's range property.
+	 */
+	matches: Range | Range[];
+}
+
+/**
+ * A match from a text search
+ */
+export interface TextSearchMatch {
+	/**
+	 * The uri for the matching document.
+	 */
+	uri: URI;
+
+	/**
+	 * The range of the match within the document, or multiple ranges for multiple matches.
+	 */
+	ranges: Range | Range[];
+
+	/**
+	 * A preview of the text match.
+	 */
+	preview: TextSearchMatchPreview;
+}
+
+/**
+ * Checks if the given object is of type TextSearchMatch.
+ * @param object The object to check.
+ * @returns True if the object is a TextSearchMatch, false otherwise.
+ */
+function isTextSearchMatch(object: any): object is TextSearchMatch {
+	return 'uri' in object && 'ranges' in object && 'preview' in object;
+}
+
+/**
+ * A line of context surrounding a TextSearchMatch.
+ */
+export interface TextSearchContext {
+	/**
+	 * The uri for the matching document.
+	 */
+	uri: URI;
+
+	/**
+	 * One line of text.
+	 * previewOptions.charsPerLine applies to this
+	 */
+	text: string;
+
+	/**
+	 * The line number of this line of context.
+	 */
+	lineNumber: number;
+}
+
+export type TextSearchResult = TextSearchMatch | TextSearchContext;
+
+/**
+ * A FileSearchProvider provides search results for files in the given folder that match a query string. It can be invoked by quickaccess or other extensions.
+ *
+ * A FileSearchProvider is the more powerful of two ways to implement file search in VS Code. Use a FileSearchProvider if you wish to search within a folder for
+ * all files that match the user's query.
+ *
+ * The FileSearchProvider will be invoked on every keypress in quickaccess. When `workspace.findFiles` is called, it will be invoked with an empty query string,
+ * and in that case, every file in the folder should be returned.
+ */
+export interface FileSearchProvider {
+	/**
+	 * Provide the set of files that match a certain file path pattern.
+	 * @param query The parameters for this query.
+	 * @param options A set of options to consider while searching files.
+	 * @param progress A progress callback that must be invoked for all results.
+	 * @param token A cancellation token.
+	 */
+	provideFileSearchResults(query: FileSearchQuery, options: FileSearchOptions, token: CancellationToken): ProviderResult<URI[]>;
+}
+
+/**
+ * A TextSearchProvider provides search results for text results inside files in the workspace.
+ */
+export interface TextSearchProvider {
+	/**
+	 * Provide results that match the given text pattern.
+	 * @param query The parameters for this query.
+	 * @param options A set of options to consider while searching.
+	 * @param progress A progress callback that must be invoked for all results.
+	 * @param token A cancellation token.
+	 */
+	provideTextSearchResults(query: TextSearchQuery, options: TextSearchOptions, progress: IProgress<TextSearchResult>, token: CancellationToken): ProviderResult<TextSearchComplete>;
+}
+
+export interface AITextSearchProvider {
+	/**
+	 * Provide results that match the given text pattern.
+	 * @param query The parameter for this query.
+	 * @param options A set of options to consider while searching.
+	 * @param progress A progress callback that must be invoked for all results.
+	 * @param token A cancellation token.
+	 */
+	provideAITextSearchResults(query: string, options: AITextSearchOptions, progress: IProgress<TextSearchResult>, token: CancellationToken): ProviderResult<TextSearchComplete>;
+}
+
+/**
+ * Options that can be set on a findTextInFiles search.
+ */
+export interface FindTextInFilesOptions {
+	/**
+	 * A [glob pattern](#GlobPattern) that defines the files to search for. The glob pattern
+	 * will be matched against the file paths of files relative to their workspace. Use a [relative pattern](#RelativePattern)
+	 * to restrict the search results to a [workspace folder](#WorkspaceFolder).
+	 */
+	include?: GlobPattern;
+
+	/**
+	 * A [glob pattern](#GlobPattern) that defines files and folders to exclude. The glob pattern
+	 * will be matched against the file paths of resulting matches relative to their workspace. When `undefined` only default excludes will
+	 * apply, when `null` no excludes will apply.
+	 */
+	exclude?: GlobPattern | null;
+
+	/**
+	 * The maximum number of results to search for
+	 */
+	maxResults?: number;
+
+	/**
+	 * Whether external files that exclude files, like .gitignore, should be respected.
+	 * See the vscode setting `"search.useIgnoreFiles"`.
+	 */
+	useIgnoreFiles?: boolean;
+
+	/**
+	 * Whether global files that exclude files, like .gitignore, should be respected.
+	 * See the vscode setting `"search.useGlobalIgnoreFiles"`.
+	 */
+	useGlobalIgnoreFiles?: boolean;
+
+	/**
+	 * Whether files in parent directories that exclude files, like .gitignore, should be respected.
+	 * See the vscode setting `"search.useParentIgnoreFiles"`.
+	 */
+	useParentIgnoreFiles: boolean;
+
+	/**
+	 * Whether symlinks should be followed while searching.
+	 * See the vscode setting `"search.followSymlinks"`.
+	 */
+	followSymlinks?: boolean;
+
+	/**
+	 * Interpret files using this encoding.
+	 * See the vscode setting `"files.encoding"`
+	 */
+	encoding?: string;
+
+	/**
+	 * Options to specify the size of the result text preview.
+	 */
+	previewOptions?: TextSearchPreviewOptions;
+
+	/**
+	 * Number of lines of context to include before each match.
+	 */
+	beforeContext?: number;
+
+	/**
+	 * Number of lines of context to include after each match.
+	 */
+	afterContext?: number;
+}
+
+function newToOldFileProviderOptions(options: FileSearchProviderOptions): FileSearchOptions[] {
+	return options.folderOptions.map(folderOption => ({
+		folder: folderOption.folder,
+		excludes: folderOption.excludes.map(e => typeof (e) === 'string' ? e : e.pattern),
+		includes: folderOption.includes,
+		useGlobalIgnoreFiles: folderOption.useIgnoreFiles.global,
+		useIgnoreFiles: folderOption.useIgnoreFiles.local,
+		useParentIgnoreFiles: folderOption.useIgnoreFiles.parent,
+		followSymlinks: folderOption.followSymlinks,
+		maxResults: options.maxResults,
+		session: <CancellationToken | undefined>options.session // TODO: make sure that we actually use a cancellation token here.
+	} satisfies FileSearchOptions));
+}
+
+export class OldFileSearchProviderConverter implements FileSearchProviderNew {
+	constructor(private provider: FileSearchProvider) { }
+
+	provideFileSearchResults(pattern: string, options: FileSearchProviderOptions, token: CancellationToken): ProviderResult<URI[]> {
+		const getResult = async () => {
+			const newOpts = newToOldFileProviderOptions(options);
+			return Promise.all(newOpts.map(
+				o => this.provider.provideFileSearchResults({ pattern }, o, token)));
+		};
+		return getResult().then(e => coalesce(e).flat());
+	}
+}
+
+function newToOldTextProviderOptions(options: TextSearchProviderOptions): TextSearchOptions[] {
+	return options.folderOptions.map(folderOption => ({
+		folder: folderOption.folder,
+		excludes: folderOption.excludes.map(e => typeof (e) === 'string' ? e : e.pattern),
+		includes: folderOption.includes,
+		useGlobalIgnoreFiles: folderOption.useIgnoreFiles.global,
+		useIgnoreFiles: folderOption.useIgnoreFiles.local,
+		useParentIgnoreFiles: folderOption.useIgnoreFiles.parent,
+		followSymlinks: folderOption.followSymlinks,
+		maxResults: options.maxResults,
+		previewOptions: newToOldPreviewOptions(options.previewOptions),
+		maxFileSize: options.maxFileSize,
+		encoding: folderOption.encoding,
+		afterContext: options.surroundingContext,
+		beforeContext: options.surroundingContext
+	} satisfies TextSearchOptions));
+}
+
+export function newToOldPreviewOptions(options: {
+	matchLines?: number;
+	charsPerLine?: number;
+} | undefined
+): {
+	matchLines: number;
+	charsPerLine: number;
+} {
+	return {
+		matchLines: options?.matchLines ?? DEFAULT_TEXT_SEARCH_PREVIEW_OPTIONS.matchLines,
+		charsPerLine: options?.charsPerLine ?? DEFAULT_TEXT_SEARCH_PREVIEW_OPTIONS.charsPerLine
+	};
+}
+
+export function oldToNewTextSearchResult(result: TextSearchResult): TextSearchResultNew {
+	if (isTextSearchMatch(result)) {
+		const ranges = asArray(result.ranges).map((r, i) => {
+			const previewArr = asArray(result.preview.matches);
+			const matchingPreviewRange = previewArr[i];
+			return { sourceRange: r, previewRange: matchingPreviewRange };
+		});
+		return new TextSearchMatchNew(result.uri, ranges, result.preview.text);
+	} else {
+		return new TextSearchContextNew(result.uri, result.text, result.lineNumber);
+	}
+}
+
+export class OldTextSearchProviderConverter implements TextSearchProviderNew {
+	constructor(private provider: TextSearchProvider) { }
+
+	provideTextSearchResults(query: TextSearchQueryNew, options: TextSearchProviderOptions, progress: IProgress<TextSearchResultNew>, token: CancellationToken): ProviderResult<TextSearchCompleteNew> {
+
+		const progressShim = (oldResult: TextSearchResult) => {
+			if (!validateProviderResult(oldResult)) {
+				return;
+			}
+			progress.report(oldToNewTextSearchResult(oldResult));
+		};
+
+		const getResult = async () => {
+			return coalesce(await Promise.all(
+				newToOldTextProviderOptions(options).map(
+					o => this.provider.provideTextSearchResults(query, o, { report: (e) => progressShim(e) }, token))))
+				.reduce(
+					(prev, cur) => ({ limitHit: prev.limitHit || cur.limitHit }),
+					{ limitHit: false }
+				);
+		};
+		const oldResult = getResult();
+		return oldResult.then((e) => {
+			return {
+				limitHit: e.limitHit,
+				message: coalesce(asArray(e.message))
+			} satisfies TextSearchCompleteNew;
+		});
+	}
+}
+
+export class OldAITextSearchProviderConverter implements AITextSearchProviderNew {
+	constructor(private provider: AITextSearchProvider) { }
+
+	provideAITextSearchResults(query: string, options: TextSearchProviderOptions, progress: IProgress<TextSearchResultNew>, token: CancellationToken): ProviderResult<TextSearchCompleteNew> {
+		const progressShim = (oldResult: TextSearchResult) => {
+			if (!validateProviderResult(oldResult)) {
+				return;
+			}
+			progress.report(oldToNewTextSearchResult(oldResult));
+		};
+
+		const getResult = async () => {
+			return coalesce(await Promise.all(
+				newToOldTextProviderOptions(options).map(
+					o => this.provider.provideAITextSearchResults(query, o, { report: (e) => progressShim(e) }, token))))
+				.reduce(
+					(prev, cur) => ({ limitHit: prev.limitHit || cur.limitHit }),
+					{ limitHit: false }
+				);
+		};
+		const oldResult = getResult();
+		return oldResult.then((e) => {
+			return {
+				limitHit: e.limitHit,
+				message: coalesce(asArray(e.message))
+			} satisfies TextSearchCompleteNew;
+		});
+	}
+}
+
+function validateProviderResult(result: TextSearchResult): boolean {
+	if (extensionResultIsMatch(result)) {
+		if (Array.isArray(result.ranges)) {
+			if (!Array.isArray(result.preview.matches)) {
+				console.warn('INVALID - A text search provider match\'s`ranges` and`matches` properties must have the same type.');
+				return false;
+			}
+
+			if ((<Range[]>result.preview.matches).length !== result.ranges.length) {
+				console.warn('INVALID - A text search provider match\'s`ranges` and`matches` properties must have the same length.');
+				return false;
+			}
+		} else {
+			if (Array.isArray(result.preview.matches)) {
+				console.warn('INVALID - A text search provider match\'s`ranges` and`matches` properties must have the same length.');
+				return false;
+			}
+		}
+	}
+
+	return true;
+}
+
+export function extensionResultIsMatch(data: TextSearchResult): data is TextSearchMatch {
+	return !!(<TextSearchMatch>data).preview;
+}
diff --git a/src/vs/workbench/services/search/common/searchExtTypes.ts b/src/vs/workbench/services/search/common/searchExtTypes.ts
index cece6091496..e24af292c86 100644
--- a/src/vs/workbench/services/search/common/searchExtTypes.ts
+++ b/src/vs/workbench/services/search/common/searchExtTypes.ts
@@ -3,7 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { asArray } from 'vs/base/common/arrays';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { URI } from 'vs/base/common/uri';
 import { IProgress } from 'vs/platform/progress/common/progress';
@@ -56,9 +55,11 @@ export type ProviderResult<T> = T | undefined | null | Thenable<T | undefined |
 export interface RelativePattern {
 
 	/**
-	 * A base file path to which this pattern will be matched against relatively.
+	 * A base file path to which this pattern will be matched against relatively. The
+	 * file path must be absolute, should not have any trailing path separators and
+	 * not include any relative segments (`.` or `..`).
 	 */
-	base: string;
+	baseUri: URI;
 
 	/**
 	 * A file glob pattern like `*.{ts,js}` that will be matched on file paths
@@ -92,7 +93,7 @@ export type GlobPattern = string | RelativePattern;
 /**
  * The parameters of a query for text search.
  */
-export interface TextSearchQuery {
+export interface TextSearchQueryNew {
 	/**
 	 * The text pattern to search for.
 	 */
@@ -119,17 +120,8 @@ export interface TextSearchQuery {
 	isWordMatch?: boolean;
 }
 
-/**
- * A file glob pattern to match file paths against.
- * TODO@roblou - merge this with the GlobPattern docs/definition in vscode.d.ts.
- * @see [GlobPattern](#GlobPattern)
- */
-export type GlobString = string;
 
-/**
- * Options common to file and text search
- */
-export interface SearchOptions {
+export interface TextSearchProviderFolderOptions {
 	/**
 	 * The root folder to search within.
 	 */
@@ -138,59 +130,51 @@ export interface SearchOptions {
 	/**
 	 * Files that match an `includes` glob pattern should be included in the search.
 	 */
-	includes: GlobString[];
+	includes: string[];
 
 	/**
 	 * Files that match an `excludes` glob pattern should be excluded from the search.
 	 */
-	excludes: GlobString[];
-
-	/**
-	 * Whether external files that exclude files, like .gitignore, should be respected.
-	 * See the vscode setting `"search.useIgnoreFiles"`.
-	 */
-	useIgnoreFiles: boolean;
+	excludes: GlobPattern[];
 
 	/**
 	 * Whether symlinks should be followed while searching.
-	 * See the vscode setting `"search.followSymlinks"`.
+	 * For more info, see the setting description for `search.followSymlinks`.
 	 */
 	followSymlinks: boolean;
 
 	/**
-	 * Whether global files that exclude files, like .gitignore, should be respected.
-	 * See the vscode setting `"search.useGlobalIgnoreFiles"`.
+	 * Which file locations we should look for ignore (.gitignore or .ignore) files to respect.
 	 */
-	useGlobalIgnoreFiles: boolean;
+	useIgnoreFiles: {
+		/**
+		 * Use ignore files at the current workspace root.
+		 */
+		local: boolean;
+		/**
+		 * Use ignore files at the parent directory. If set, {@link TextSearchProviderOptions.useIgnoreFiles.local} should also be `true`.
+		 */
+		parent: boolean;
+		/**
+		 * Use global ignore files. If set, {@link TextSearchProviderOptions.useIgnoreFiles.local} should also be `true`.
+		 */
+		global: boolean;
+	};
 
 	/**
-	 * Whether files in parent directories that exclude files, like .gitignore, should be respected.
-	 * See the vscode setting `"search.useParentIgnoreFiles"`.
+	 * Interpret files using this encoding.
+	 * See the vscode setting `"files.encoding"`
 	 */
-	useParentIgnoreFiles: boolean;
+	encoding: string;
 }
 
 /**
- * Options to specify the size of the result text preview.
- * These options don't affect the size of the match itself, just the amount of preview text.
+ * Options that apply to text search.
  */
-export interface TextSearchPreviewOptions {
-	/**
-	 * The maximum number of lines in the preview.
-	 * Only search providers that support multiline search will ever return more than one line in the match.
-	 */
-	matchLines: number;
+export interface TextSearchProviderOptions {
 
-	/**
-	 * The maximum number of characters included per line.
-	 */
-	charsPerLine: number;
-}
+	folderOptions: TextSearchProviderFolderOptions[];
 
-/**
- * Options that apply to text search.
- */
-export interface TextSearchOptions extends SearchOptions {
 	/**
 	 * The maximum number of results to be returned.
 	 */
@@ -199,192 +183,222 @@ export interface TextSearchOptions extends SearchOptions {
 	/**
 	 * Options to specify the size of the result text preview.
 	 */
-	previewOptions?: TextSearchPreviewOptions;
+	previewOptions: {
+		/**
+		 * The maximum number of lines in the preview.
+		 * Only search providers that support multiline search will ever return more than one line in the match.
+		 * Defaults to 100.
+		 */
+		matchLines: number;
 
-	/**
-	 * Exclude files larger than `maxFileSize` in bytes.
-	 */
-	maxFileSize?: number;
+		/**
+		 * The maximum number of characters included per line.
+		 * Defaults to 10000.
+		 */
+		charsPerLine: number;
+	};
 
 	/**
-	 * Interpret files using this encoding.
-	 * See the vscode setting `"files.encoding"`
+	 * Exclude files larger than `maxFileSize` in bytes.
 	 */
-	encoding?: string;
+	maxFileSize: number | undefined;
 
-	/**
-	 * Number of lines of context to include before each match.
-	 */
-	beforeContext?: number;
 
 	/**
-	 * Number of lines of context to include after each match.
+	 * Number of lines of context to include before and after each match.
 	 */
-	afterContext?: number;
+	surroundingContext: number;
 }
+
+
 /**
- * Options that apply to AI text search.
+ * Information collected when text search is complete.
  */
-export interface AITextSearchOptions extends SearchOptions {
+export interface TextSearchCompleteNew {
 	/**
-	 * The maximum number of results to be returned.
+	 * Whether the search hit the limit on the maximum number of search results.
+	 * `maxResults` on [`TextSearchOptions`](#TextSearchOptions) specifies the max number of results.
+	 * - If exactly that number of matches exist, this should be false.
+	 * - If `maxResults` matches are returned and more exist, this should be true.
+	 * - If search hits an internal limit which is less than `maxResults`, this should be true.
 	 */
-	maxResults: number;
+	limitHit?: boolean;
+}
 
+export interface FileSearchProviderFolderOptions {
 	/**
-	 * Options to specify the size of the result text preview.
+	 * The root folder to search within.
 	 */
-	previewOptions?: TextSearchPreviewOptions;
+	folder: URI;
 
 	/**
-	 * Exclude files larger than `maxFileSize` in bytes.
+	 * Files that match an `includes` glob pattern should be included in the search.
 	 */
-	maxFileSize?: number;
+	includes: string[];
 
 	/**
-	 * Number of lines of context to include before each match.
+	 * Files that match an `excludes` glob pattern should be excluded from the search.
 	 */
-	beforeContext?: number;
+	excludes: GlobPattern[];
 
 	/**
-	 * Number of lines of context to include after each match.
+	 * Whether symlinks should be followed while searching.
+	 * For more info, see the setting description for `search.followSymlinks`.
 	 */
-	afterContext?: number;
-}
+	followSymlinks: boolean;
 
-/**
- * Represents the severity of a TextSearchComplete message.
- */
-export enum TextSearchCompleteMessageType {
-	Information = 1,
-	Warning = 2,
+	/**
+	 * Which file locations we should look for ignore (.gitignore or .ignore) files to respect.
+	 */
+	useIgnoreFiles: {
+		/**
+		 * Use ignore files at the current workspace root.
+		 */
+		local: boolean;
+		/**
+		 * Use ignore files at the parent directory. If set, {@link FileSearchProviderOptions.useIgnoreFiles.local} should also be `true`.
+		 */
+		parent: boolean;
+		/**
+		 * Use global ignore files. If set, {@link FileSearchProviderOptions.useIgnoreFiles.local} should also be `true`.
+		 */
+		global: boolean;
+	};
 }
 
 /**
- * A message regarding a completed search.
+ * Options that apply to file search.
  */
-export interface TextSearchCompleteMessage {
-	/**
-	 * Markdown text of the message.
-	 */
-	text: string;
+export interface FileSearchProviderOptions {
+	folderOptions: FileSearchProviderFolderOptions[];
+
 	/**
-	 * Whether the source of the message is trusted, command links are disabled for untrusted message sources.
+	 * An object with a lifespan that matches the session's lifespan. If the provider chooses to, this object can be used as the key for a cache,
+	 * and searches with the same session object can search the same cache. When the token is cancelled, the session is complete and the cache can be cleared.
 	 */
-	trusted?: boolean;
+	session: unknown;
+
 	/**
-	 * The message type, this affects how the message will be rendered.
+	 * The maximum number of results to be returned.
 	 */
-	type: TextSearchCompleteMessageType;
+	maxResults: number;
 }
 
 /**
- * Information collected when text search is complete.
+ * The main match information for a {@link TextSearchResultNew}.
  */
-export interface TextSearchComplete {
+export class TextSearchMatchNew {
 	/**
-	 * Whether the search hit the limit on the maximum number of search results.
-	 * `maxResults` on [`TextSearchOptions`](#TextSearchOptions) specifies the max number of results.
-	 * - If exactly that number of matches exist, this should be false.
-	 * - If `maxResults` matches are returned and more exist, this should be true.
-	 * - If search hits an internal limit which is less than `maxResults`, this should be true.
+	 * @param uri The uri for the matching document.
+	 * @param ranges The ranges associated with this match.
+	 * @param previewText The text that is used to preview the match. The highlighted range in `previewText` is specified in `ranges`.
 	 */
-	limitHit?: boolean;
+	constructor(
+		public uri: URI,
+		public ranges: { sourceRange: Range; previewRange: Range }[],
+		public previewText: string) { }
 
-	/**
-	 * Additional information regarding the state of the completed search.
-	 *
-	 * Supports links in markdown syntax:
-	 * - Click to [run a command](command:workbench.action.OpenQuickPick)
-	 * - Click to [open a website](https://aka.ms)
-	 */
-	message?: TextSearchCompleteMessage | TextSearchCompleteMessage[];
 }
 
 /**
- * The parameters of a query for file search.
+ * The potential context information for a {@link TextSearchResultNew}.
  */
-export interface FileSearchQuery {
+export class TextSearchContextNew {
 	/**
-	 * The search pattern to match against file paths.
+	 * @param uri The uri for the matching document.
+	 * @param text The line of context text.
+	 * @param lineNumber The line number of this line of context.
 	 */
-	pattern: string;
+	constructor(
+		public uri: URI,
+		public text: string,
+		public lineNumber: number) { }
 }
 
 /**
- * Options that apply to file search.
+ * A result payload for a text search, pertaining to matches within a single file.
  */
-export interface FileSearchOptions extends SearchOptions {
-	/**
-	 * The maximum number of results to be returned.
-	 */
-	maxResults?: number;
+export type TextSearchResultNew = TextSearchMatchNew | TextSearchContextNew;
 
-	/**
-	 * A CancellationToken that represents the session for this search query. If the provider chooses to, this object can be used as the key for a cache,
-	 * and searches with the same session object can search the same cache. When the token is cancelled, the session is complete and the cache can be cleared.
-	 */
-	session?: CancellationToken;
-}
 
 /**
- * A preview of the text result.
+ * A FileSearchProvider provides search results for files in the given folder that match a query string. It can be invoked by quickaccess or other extensions.
+ *
+ * A FileSearchProvider is the more powerful of two ways to implement file search in VS Code. Use a FileSearchProvider if you wish to search within a folder for
+ * all files that match the user's query.
+ *
+ * The FileSearchProvider will be invoked on every keypress in quickaccess. When `workspace.findFiles` is called, it will be invoked with an empty query string,
+ * and in that case, every file in the folder should be returned.
  */
-export interface TextSearchMatchPreview {
-	/**
-	 * The matching lines of text, or a portion of the matching line that contains the match.
-	 */
-	text: string;
-
+export interface FileSearchProviderNew {
 	/**
-	 * The Range within `text` corresponding to the text of the match.
-	 * The number of matches must match the TextSearchMatch's range property.
+	 * Provide the set of files that match a certain file path pattern.
+	 * @param query The parameters for this query.
+	 * @param options A set of options to consider while searching files.
+	 * @param progress A progress callback that must be invoked for all results.
+	 * @param token A cancellation token.
 	 */
-	matches: Range | Range[];
+	provideFileSearchResults(pattern: string, options: FileSearchProviderOptions, token: CancellationToken): ProviderResult<URI[]>;
 }
 
 /**
- * A match from a text search
+ * A TextSearchProvider provides search results for text results inside files in the workspace.
  */
-export interface TextSearchMatch {
+export interface TextSearchProviderNew {
 	/**
-	 * The uri for the matching document.
+	 * Provide results that match the given text pattern.
+	 * @param query The parameters for this query.
+	 * @param options A set of options to consider while searching.
+	 * @param progress A progress callback that must be invoked for all results.
+	 * @param token A cancellation token.
 	 */
-	uri: URI;
+	provideTextSearchResults(query: TextSearchQueryNew, options: TextSearchProviderOptions, progress: IProgress<TextSearchResultNew>, token: CancellationToken): ProviderResult<TextSearchCompleteNew>;
+}
 
+/**
+ * Information collected when text search is complete.
+ */
+export interface TextSearchCompleteNew {
 	/**
-	 * The range of the match within the document, or multiple ranges for multiple matches.
+	 * Whether the search hit the limit on the maximum number of search results.
+	 * `maxResults` on {@linkcode TextSearchOptions} specifies the max number of results.
+	 * - If exactly that number of matches exist, this should be false.
+	 * - If `maxResults` matches are returned and more exist, this should be true.
+	 * - If search hits an internal limit which is less than `maxResults`, this should be true.
 	 */
-	ranges: Range | Range[];
+	limitHit?: boolean;
 
 	/**
-	 * A preview of the text match.
+	 * Additional information regarding the state of the completed search.
+	 *
+	 * Messages with "Information" style support links in markdown syntax:
+	 * - Click to [run a command](command:workbench.action.OpenQuickPick)
+	 * - Click to [open a website](https://aka.ms)
+	 *
+	 * Commands may optionally return { triggerSearch: true } to signal to the editor that the original search should run be again.
 	 */
-	preview: TextSearchMatchPreview;
+	message?: TextSearchCompleteMessageNew[];
 }
 
 /**
- * A line of context surrounding a TextSearchMatch.
+ * A message regarding a completed search.
  */
-export interface TextSearchContext {
+export interface TextSearchCompleteMessageNew {
 	/**
-	 * The uri for the matching document.
+	 * Markdown text of the message.
 	 */
-	uri: URI;
-
+	text: string;
 	/**
-	 * One line of text.
-	 * previewOptions.charsPerLine applies to this
+	 * Whether the source of the message is trusted, command links are disabled for untrusted message sources.
+	 * Messaged are untrusted by default.
 	 */
-	text: string;
-
+	trusted?: boolean;
 	/**
-	 * The line number of this line of context.
+	 * The message type, this affects how the message will be rendered.
 	 */
-	lineNumber: number;
+	type: TextSearchCompleteMessageType;
 }
 
-export type TextSearchResult = TextSearchMatch | TextSearchContext;
 
 /**
  * A FileSearchProvider provides search results for files in the given folder that match a query string. It can be invoked by quickaccess or other extensions.
@@ -395,7 +409,7 @@ export type TextSearchResult = TextSearchMatch | TextSearchContext;
  * The FileSearchProvider will be invoked on every keypress in quickaccess. When `workspace.findFiles` is called, it will be invoked with an empty query string,
  * and in that case, every file in the folder should be returned.
  */
-export interface FileSearchProvider {
+export interface FileSearchProviderNew {
 	/**
 	 * Provide the set of files that match a certain file path pattern.
 	 * @param query The parameters for this query.
@@ -403,13 +417,13 @@ export interface FileSearchProvider {
 	 * @param progress A progress callback that must be invoked for all results.
 	 * @param token A cancellation token.
 	 */
-	provideFileSearchResults(query: FileSearchQuery, options: FileSearchOptions, token: CancellationToken): ProviderResult<URI[]>;
+	provideFileSearchResults(pattern: string, options: FileSearchProviderOptions, token: CancellationToken): ProviderResult<URI[]>;
 }
 
 /**
  * A TextSearchProvider provides search results for text results inside files in the workspace.
  */
-export interface TextSearchProvider {
+export interface TextSearchProviderNew {
 	/**
 	 * Provide results that match the given text pattern.
 	 * @param query The parameters for this query.
@@ -417,159 +431,111 @@ export interface TextSearchProvider {
 	 * @param progress A progress callback that must be invoked for all results.
 	 * @param token A cancellation token.
 	 */
-	provideTextSearchResults(query: TextSearchQuery, options: TextSearchOptions, progress: IProgress<TextSearchResult>, token: CancellationToken): ProviderResult<TextSearchComplete>;
-}
-
-export interface AITextSearchProvider {
-	/**
-	 * Provide results that match the given text pattern.
-	 * @param query The parameter for this query.
-	 * @param options A set of options to consider while searching.
-	 * @param progress A progress callback that must be invoked for all results.
-	 * @param token A cancellation token.
-	 */
-	provideAITextSearchResults(query: string, options: AITextSearchOptions, progress: IProgress<TextSearchResult>, token: CancellationToken): ProviderResult<TextSearchComplete>;
+	provideTextSearchResults(query: TextSearchQueryNew, options: TextSearchProviderOptions, progress: IProgress<TextSearchResultNew>, token: CancellationToken): ProviderResult<TextSearchCompleteNew>;
 }
 
 /**
- * Options that can be set on a findTextInFiles search.
+ * Information collected when text search is complete.
  */
-export interface FindTextInFilesOptions {
-	/**
-	 * A [glob pattern](#GlobPattern) that defines the files to search for. The glob pattern
-	 * will be matched against the file paths of files relative to their workspace. Use a [relative pattern](#RelativePattern)
-	 * to restrict the search results to a [workspace folder](#WorkspaceFolder).
-	 */
-	include?: GlobPattern;
-
-	/**
-	 * A [glob pattern](#GlobPattern) that defines files and folders to exclude. The glob pattern
-	 * will be matched against the file paths of resulting matches relative to their workspace. When `undefined` only default excludes will
-	 * apply, when `null` no excludes will apply.
-	 */
-	exclude?: GlobPattern | null;
-
+export interface TextSearchCompleteNew {
 	/**
-	 * The maximum number of results to search for
-	 */
-	maxResults?: number;
-
-	/**
-	 * Whether external files that exclude files, like .gitignore, should be respected.
-	 * See the vscode setting `"search.useIgnoreFiles"`.
-	 */
-	useIgnoreFiles?: boolean;
-
-	/**
-	 * Whether global files that exclude files, like .gitignore, should be respected.
-	 * See the vscode setting `"search.useGlobalIgnoreFiles"`.
-	 */
-	useGlobalIgnoreFiles?: boolean;
-
-	/**
-	 * Whether files in parent directories that exclude files, like .gitignore, should be respected.
-	 * See the vscode setting `"search.useParentIgnoreFiles"`.
-	 */
-	useParentIgnoreFiles: boolean;
-
-	/**
-	 * Whether symlinks should be followed while searching.
-	 * See the vscode setting `"search.followSymlinks"`.
-	 */
-	followSymlinks?: boolean;
-
-	/**
-	 * Interpret files using this encoding.
-	 * See the vscode setting `"files.encoding"`
+	 * Whether the search hit the limit on the maximum number of search results.
+	 * `maxResults` on {@linkcode TextSearchOptions} specifies the max number of results.
+	 * - If exactly that number of matches exist, this should be false.
+	 * - If `maxResults` matches are returned and more exist, this should be true.
+	 * - If search hits an internal limit which is less than `maxResults`, this should be true.
 	 */
-	encoding?: string;
+	limitHit?: boolean;
 
 	/**
-	 * Options to specify the size of the result text preview.
+	 * Additional information regarding the state of the completed search.
+	 *
+	 * Messages with "Information" style support links in markdown syntax:
+	 * - Click to [run a command](command:workbench.action.OpenQuickPick)
+	 * - Click to [open a website](https://aka.ms)
+	 *
+	 * Commands may optionally return { triggerSearch: true } to signal to the editor that the original search should run be again.
 	 */
-	previewOptions?: TextSearchPreviewOptions;
+	message?: TextSearchCompleteMessageNew[];
+}
 
+/**
+ * A message regarding a completed search.
+ */
+export interface TextSearchCompleteMessageNew {
 	/**
-	 * Number of lines of context to include before each match.
+	 * Markdown text of the message.
 	 */
-	beforeContext?: number;
-
+	text: string;
 	/**
-	 * Number of lines of context to include after each match.
+	 * Whether the source of the message is trusted, command links are disabled for untrusted message sources.
+	 * Messaged are untrusted by default.
 	 */
-	afterContext?: number;
-}
-
-// NEW TYPES
-// added temporarily for testing new API shape
-/**
- * A result payload for a text search, pertaining to matches within a single file.
- */
-export type TextSearchResultNew = TextSearchMatchNew | TextSearchContextNew;
-
-/**
- * The main match information for a {@link TextSearchResultNew}.
- */
-export class TextSearchMatchNew {
+	trusted?: boolean;
 	/**
-	 * @param uri The uri for the matching document.
-	 * @param ranges The ranges associated with this match.
-	 * @param previewText The text that is used to preview the match. The highlighted range in `previewText` is specified in `ranges`.
+	 * The message type, this affects how the message will be rendered.
 	 */
-	constructor(
-		public uri: URI,
-		public ranges: { sourceRange: Range; previewRange: Range }[],
-		public previewText: string) { }
-
+	type: TextSearchCompleteMessageType;
 }
 
 /**
- * The potential context information for a {@link TextSearchResultNew}.
+ * Options for following search.exclude and files.exclude settings.
  */
-export class TextSearchContextNew {
-	/**
-	 * @param uri The uri for the matching document.
-	 * @param text The line of context text.
-	 * @param lineNumber The line number of this line of context.
-	 */
-	constructor(
-		public uri: URI,
-		public text: string,
-		public lineNumber: number) { }
-}
-
 export enum ExcludeSettingOptions {
 	/*
 	 * Don't use any exclude settings.
 	 */
-	none = 1,
+	None = 1,
 	/*
 	 * Use:
 	 * - files.exclude setting
 	 */
-	filesExclude = 2,
+	FilesExclude = 2,
 	/*
 	 * Use:
 	 * - files.exclude setting
 	 * - search.exclude setting
 	 */
-	searchAndFilesExclude = 3
+	SearchAndFilesExclude = 3
 }
 
-export enum TextSearchCompleteMessageTypeNew {
+export enum TextSearchCompleteMessageType {
 	Information = 1,
 	Warning = 2,
 }
 
-function isTextSearchMatch(object: any): object is TextSearchMatch {
-	return 'uri' in object && 'ranges' in object && 'preview' in object;
+
+/**
+ * A message regarding a completed search.
+ */
+export interface TextSearchCompleteMessage {
+	/**
+	 * Markdown text of the message.
+	 */
+	text: string;
+	/**
+	 * Whether the source of the message is trusted, command links are disabled for untrusted message sources.
+	 */
+	trusted?: boolean;
+	/**
+	 * The message type, this affects how the message will be rendered.
+	 */
+	type: TextSearchCompleteMessageType;
 }
 
-export function oldToNewTextSearchResult(result: TextSearchResult): TextSearchResultNew {
-	if (isTextSearchMatch(result)) {
-		const ranges = asArray(result.ranges).map(r => ({ sourceRange: r, previewRange: r }));
-		return new TextSearchMatchNew(result.uri, ranges, result.preview.text);
-	} else {
-		return new TextSearchContextNew(result.uri, result.text, result.lineNumber);
-	}
+
+/**
+ * An AITextSearchProvider provides additional AI text search results in the workspace.
+ */
+export interface AITextSearchProviderNew {
+	/**
+	 * WARNING: VERY EXPERIMENTAL.
+	 *
+	 * Provide results that match the given text pattern.
+	 * @param query The parameter for this query.
+	 * @param options A set of options to consider while searching.
+	 * @param progress A progress callback that must be invoked for all results.
+	 * @param token A cancellation token.
+	 */
+	provideAITextSearchResults(query: string, options: TextSearchProviderOptions, progress: IProgress<TextSearchResultNew>, token: CancellationToken): ProviderResult<TextSearchCompleteNew>;
 }
diff --git a/src/vs/workbench/services/search/common/searchExtTypesInternal.ts b/src/vs/workbench/services/search/common/searchExtTypesInternal.ts
index 37ec6163bf5..22a5b808d3b 100644
--- a/src/vs/workbench/services/search/common/searchExtTypesInternal.ts
+++ b/src/vs/workbench/services/search/common/searchExtTypesInternal.ts
@@ -2,12 +2,20 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import type { FileSearchOptions, TextSearchOptions } from './searchExtTypes';
+import { FileSearchProviderFolderOptions, FileSearchProviderOptions, TextSearchProviderFolderOptions, TextSearchProviderOptions } from 'vs/workbench/services/search/common/searchExtTypes';
 
 interface RipgrepSearchOptionsCommon {
 	numThreads?: number;
 }
 
-export interface RipgrepTextSearchOptions extends TextSearchOptions, RipgrepSearchOptionsCommon { }
+export type TextSearchProviderOptionsRipgrep = Omit<Partial<TextSearchProviderOptions>, 'folderOptions'> & {
+	folderOptions: TextSearchProviderFolderOptions;
+};
 
-export interface RipgrepFileSearchOptions extends FileSearchOptions, RipgrepSearchOptionsCommon { }
+export type FileSearchProviderOptionsRipgrep = & {
+	folderOptions: FileSearchProviderFolderOptions;
+} & FileSearchProviderOptions;
+
+export interface RipgrepTextSearchOptions extends TextSearchProviderOptionsRipgrep, RipgrepSearchOptionsCommon { }
+
+export interface RipgrepFileSearchOptions extends FileSearchProviderOptionsRipgrep, RipgrepSearchOptionsCommon { }
diff --git a/src/vs/workbench/services/search/common/searchHelpers.ts b/src/vs/workbench/services/search/common/searchHelpers.ts
index fceb65c61a0..4f01ae27bf9 100644
--- a/src/vs/workbench/services/search/common/searchHelpers.ts
+++ b/src/vs/workbench/services/search/common/searchHelpers.ts
@@ -50,8 +50,8 @@ export function getTextSearchMatchWithModelContext(matches: ITextSearchMatch[],
 	let prevLine = -1;
 	for (let i = 0; i < matches.length; i++) {
 		const { start: matchStartLine, end: matchEndLine } = getMatchStartEnd(matches[i]);
-		if (typeof query.beforeContext === 'number' && query.beforeContext > 0) {
-			const beforeContextStartLine = Math.max(prevLine + 1, matchStartLine - query.beforeContext);
+		if (typeof query.surroundingContext === 'number' && query.surroundingContext > 0) {
+			const beforeContextStartLine = Math.max(prevLine + 1, matchStartLine - query.surroundingContext);
 			for (let b = beforeContextStartLine; b < matchStartLine; b++) {
 				results.push({
 					text: model.getLineContent(b + 1),
@@ -64,8 +64,8 @@ export function getTextSearchMatchWithModelContext(matches: ITextSearchMatch[],
 
 		const nextMatch = matches[i + 1];
 		const nextMatchStartLine = nextMatch ? getMatchStartEnd(nextMatch).start : Number.MAX_VALUE;
-		if (typeof query.afterContext === 'number' && query.afterContext > 0) {
-			const afterContextToLine = Math.min(nextMatchStartLine - 1, matchEndLine + query.afterContext, model.getLineCount() - 1);
+		if (typeof query.surroundingContext === 'number' && query.surroundingContext > 0) {
+			const afterContextToLine = Math.min(nextMatchStartLine - 1, matchEndLine + query.surroundingContext, model.getLineCount() - 1);
 			for (let a = matchEndLine + 1; a <= afterContextToLine; a++) {
 				results.push({
 					text: model.getLineContent(a + 1),
@@ -81,9 +81,9 @@ export function getTextSearchMatchWithModelContext(matches: ITextSearchMatch[],
 }
 
 function getMatchStartEnd(match: ITextSearchMatch): { start: number; end: number } {
-	const matchRanges = match.ranges;
-	const matchStartLine = Array.isArray(matchRanges) ? matchRanges[0].startLineNumber : matchRanges.startLineNumber;
-	const matchEndLine = Array.isArray(matchRanges) ? matchRanges[matchRanges.length - 1].endLineNumber : matchRanges.endLineNumber;
+	const matchRanges = match.rangeLocations.map(e => e.source);
+	const matchStartLine = matchRanges[0].startLineNumber;
+	const matchEndLine = matchRanges[matchRanges.length - 1].endLineNumber;
 
 	return {
 		start: matchStartLine,
diff --git a/src/vs/workbench/services/search/common/searchService.ts b/src/vs/workbench/services/search/common/searchService.ts
index f4e35c525e1..b58dc567e87 100644
--- a/src/vs/workbench/services/search/common/searchService.ts
+++ b/src/vs/workbench/services/search/common/searchService.ts
@@ -271,6 +271,9 @@ export class SearchService extends Disposable implements ISearchService {
 			return [];
 		}
 		await Promise.all([...fqs.keys()].map(async scheme => {
+			if (query.onlyFileScheme && scheme !== Schemas.file) {
+				return;
+			}
 			const schemeFQs = fqs.get(scheme)!;
 			let provider = this.getSearchProvider(query.type).get(scheme);
 
diff --git a/src/vs/workbench/services/search/common/textSearchManager.ts b/src/vs/workbench/services/search/common/textSearchManager.ts
index d135124aa05..5903b171c7e 100644
--- a/src/vs/workbench/services/search/common/textSearchManager.ts
+++ b/src/vs/workbench/services/search/common/textSearchManager.ts
@@ -3,28 +3,34 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { mapArrayOrNot } from 'vs/base/common/arrays';
 import { isThenable } from 'vs/base/common/async';
 import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
 import { toErrorMessage } from 'vs/base/common/errorMessage';
 import { Schemas } from 'vs/base/common/network';
 import * as path from 'vs/base/common/path';
 import * as resources from 'vs/base/common/resources';
+import { TernarySearchTree } from 'vs/base/common/ternarySearchTree';
 import { URI } from 'vs/base/common/uri';
-import { DEFAULT_MAX_SEARCH_RESULTS, hasSiblingPromiseFn, IAITextQuery, IExtendedExtensionSearchOptions, IFileMatch, IFolderQuery, IPatternInfo, ISearchCompleteStats, ITextQuery, ITextSearchContext, ITextSearchMatch, ITextSearchResult, ITextSearchStats, QueryGlobTester, QueryType, resolvePatternsForProvider } from 'vs/workbench/services/search/common/search';
-import { AITextSearchProvider, Range, TextSearchComplete, TextSearchMatch, TextSearchOptions, TextSearchProvider, TextSearchQuery, TextSearchResult } from 'vs/workbench/services/search/common/searchExtTypes';
+import { DEFAULT_MAX_SEARCH_RESULTS, hasSiblingPromiseFn, IAITextQuery, IExtendedExtensionSearchOptions, IFileMatch, IFolderQuery, excludeToGlobPattern, IPatternInfo, ISearchCompleteStats, ITextQuery, ITextSearchContext, ITextSearchMatch, ITextSearchResult, ITextSearchStats, QueryGlobTester, QueryType, resolvePatternsForProvider, ISearchRange, DEFAULT_TEXT_SEARCH_PREVIEW_OPTIONS } from 'vs/workbench/services/search/common/search';
+import { AITextSearchProviderNew, TextSearchCompleteNew, TextSearchMatchNew, TextSearchProviderFolderOptions, TextSearchProviderNew, TextSearchProviderOptions, TextSearchQueryNew, TextSearchResultNew } from 'vs/workbench/services/search/common/searchExtTypes';
 
 export interface IFileUtils {
 	readdir: (resource: URI) => Promise<string[]>;
 	toCanonicalName: (encoding: string) => string;
 }
 interface IAITextQueryProviderPair {
-	query: IAITextQuery; provider: AITextSearchProvider;
+	query: IAITextQuery; provider: AITextSearchProviderNew;
 }
 
 interface ITextQueryProviderPair {
-	query: ITextQuery; provider: TextSearchProvider;
+	query: ITextQuery; provider: TextSearchProviderNew;
 }
+interface FolderQueryInfo {
+	queryTester: QueryGlobTester;
+	folder: URI;
+	folderIdx: number;
+}
+
 export class TextSearchManager {
 
 	private collector: TextSearchResultsCollector | null = null;
@@ -48,14 +54,14 @@ export class TextSearchManager {
 			this.collector = new TextSearchResultsCollector(onProgress);
 
 			let isCanceled = false;
-			const onResult = (result: TextSearchResult, folderIdx: number) => {
+			const onResult = (result: TextSearchResultNew, folderIdx: number) => {
 				if (isCanceled) {
 					return;
 				}
 
 				if (!this.isLimitHit) {
 					const resultSize = this.resultSize(result);
-					if (extensionResultIsMatch(result) && typeof this.query.maxResults === 'number' && this.resultCount + resultSize > this.query.maxResults) {
+					if (result instanceof TextSearchMatchNew && typeof this.query.maxResults === 'number' && this.resultCount + resultSize > this.query.maxResults) {
 						this.isLimitHit = true;
 						isCanceled = true;
 						tokenSource.cancel();
@@ -65,27 +71,22 @@ export class TextSearchManager {
 
 					const newResultSize = this.resultSize(result);
 					this.resultCount += newResultSize;
-					if (newResultSize > 0 || !extensionResultIsMatch(result)) {
+					const a = result instanceof TextSearchMatchNew;
+
+					if (newResultSize > 0 || !a) {
 						this.collector!.add(result, folderIdx);
 					}
 				}
 			};
 
 			// For each root folder
-			Promise.all(folderQueries.map((fq, i) => {
-				return this.searchInFolder(fq, r => onResult(r, i), tokenSource.token);
-			})).then(results => {
+			this.doSearch(folderQueries, onResult, tokenSource.token).then(result => {
 				tokenSource.dispose();
 				this.collector!.flush();
 
-				const someFolderHitLImit = results.some(result => !!result && !!result.limitHit);
 				resolve({
-					limitHit: this.isLimitHit || someFolderHitLImit,
-					messages: results.flatMap(result => {
-						if (!result?.message) { return []; }
-						if (Array.isArray(result.message)) { return result.message; }
-						else { return [result.message]; }
-					}),
+					limitHit: this.isLimitHit || result?.limitHit,
+					messages: this.getMessagesFromResults(result),
 					stats: {
 						type: this.processType
 					}
@@ -98,8 +99,14 @@ export class TextSearchManager {
 		});
 	}
 
-	private resultSize(result: TextSearchResult): number {
-		if (extensionResultIsMatch(result)) {
+	private getMessagesFromResults(result: TextSearchCompleteNew | null | undefined) {
+		if (!result?.message) { return []; }
+		if (Array.isArray(result.message)) { return result.message; }
+		return [result.message];
+	}
+
+	private resultSize(result: TextSearchResultNew): number {
+		if (result instanceof TextSearchMatchNew) {
 			return Array.isArray(result.ranges) ?
 				result.ranges.length :
 				1;
@@ -110,29 +117,25 @@ export class TextSearchManager {
 		}
 	}
 
-	private trimResultToSize(result: TextSearchMatch, size: number): TextSearchMatch {
-		const rangesArr = Array.isArray(result.ranges) ? result.ranges : [result.ranges];
-		const matchesArr = Array.isArray(result.preview.matches) ? result.preview.matches : [result.preview.matches];
-
-		return {
-			ranges: rangesArr.slice(0, size),
-			preview: {
-				matches: matchesArr.slice(0, size),
-				text: result.preview.text
-			},
-			uri: result.uri
-		};
+	private trimResultToSize(result: TextSearchMatchNew, size: number): TextSearchMatchNew {
+		return new TextSearchMatchNew(result.uri, result.ranges.slice(0, size), result.previewText);
 	}
 
-	private async searchInFolder(folderQuery: IFolderQuery<URI>, onResult: (result: TextSearchResult) => void, token: CancellationToken): Promise<TextSearchComplete | null | undefined> {
-		const queryTester = new QueryGlobTester(this.query, folderQuery);
+	private async doSearch(folderQueries: IFolderQuery<URI>[], onResult: (result: TextSearchResultNew, folderIdx: number) => void, token: CancellationToken): Promise<TextSearchCompleteNew | null | undefined> {
+		const folderMappings: TernarySearchTree<URI, FolderQueryInfo> = TernarySearchTree.forUris<FolderQueryInfo>();
+		folderQueries.forEach((fq, i) => {
+			const queryTester = new QueryGlobTester(this.query, fq);
+			folderMappings.set(fq.folder, { queryTester, folder: fq.folder, folderIdx: i });
+		});
+
 		const testingPs: Promise<void>[] = [];
 		const progress = {
-			report: (result: TextSearchResult) => {
-				if (!this.validateProviderResult(result)) {
-					return;
-				}
+			report: (result: TextSearchResultNew) => {
 
+				if (result.uri === undefined) {
+					throw Error('Text search result URI is undefined. Please check provider implementation.');
+				}
+				const folderQuery = folderMappings.findSubstr(result.uri)!;
 				const hasSibling = folderQuery.folder.scheme === Schemas.file ?
 					hasSiblingPromiseFn(() => {
 						return this.fileUtils.readdir(resources.dirname(result.uri));
@@ -142,23 +145,32 @@ export class TextSearchManager {
 				const relativePath = resources.relativePath(folderQuery.folder, result.uri);
 				if (relativePath) {
 					// This method is only async when the exclude contains sibling clauses
-					const included = queryTester.includedInQuery(relativePath, path.basename(relativePath), hasSibling);
+					const included = folderQuery.queryTester.includedInQuery(relativePath, path.basename(relativePath), hasSibling);
 					if (isThenable(included)) {
 						testingPs.push(
 							included.then(isIncluded => {
 								if (isIncluded) {
-									onResult(result);
+									onResult(result, folderQuery.folderIdx);
 								}
 							}));
 					} else if (included) {
-						onResult(result);
+						onResult(result, folderQuery.folderIdx);
 					}
 				}
 			}
 		};
 
-		const searchOptions = this.getSearchOptionsForFolder(folderQuery);
-
+		const folderOptions = folderQueries.map(fq => this.getSearchOptionsForFolder(fq));
+		const searchOptions: TextSearchProviderOptions = {
+			folderOptions,
+			maxFileSize: this.query.maxFileSize,
+			maxResults: this.query.maxResults ?? DEFAULT_MAX_SEARCH_RESULTS,
+			previewOptions: this.query.previewOptions ?? DEFAULT_TEXT_SEARCH_PREVIEW_OPTIONS,
+			surroundingContext: this.query.surroundingContext ?? 0,
+		};
+		if ('usePCRE2' in this.query) {
+			(<IExtendedExtensionSearchOptions>searchOptions).usePCRE2 = this.query.usePCRE2;
+		}
 
 		let result;
 		if (this.queryProviderPair.query.type === QueryType.aiText) {
@@ -173,56 +185,39 @@ export class TextSearchManager {
 		return result;
 	}
 
-	private validateProviderResult(result: TextSearchResult): boolean {
-		if (extensionResultIsMatch(result)) {
-			if (Array.isArray(result.ranges)) {
-				if (!Array.isArray(result.preview.matches)) {
-					console.warn('INVALID - A text search provider match\'s`ranges` and`matches` properties must have the same type.');
-					return false;
-				}
-
-				if ((<Range[]>result.preview.matches).length !== result.ranges.length) {
-					console.warn('INVALID - A text search provider match\'s`ranges` and`matches` properties must have the same length.');
-					return false;
-				}
-			} else {
-				if (Array.isArray(result.preview.matches)) {
-					console.warn('INVALID - A text search provider match\'s`ranges` and`matches` properties must have the same length.');
-					return false;
-				}
-			}
-		}
+	private getSearchOptionsForFolder(fq: IFolderQuery<URI>): TextSearchProviderFolderOptions {
+		const includes = resolvePatternsForProvider(this.query.includePattern, fq.includePattern);
 
-		return true;
-	}
+		let excludePattern = fq.excludePattern?.map(e => ({
+			folder: e.folder,
+			patterns: resolvePatternsForProvider(this.query.excludePattern, e.pattern)
+		}));
 
-	private getSearchOptionsForFolder(fq: IFolderQuery<URI>): TextSearchOptions {
-		const includes = resolvePatternsForProvider(this.query.includePattern, fq.includePattern);
-		const excludes = resolvePatternsForProvider(this.query.excludePattern, fq.excludePattern);
+		if (!excludePattern || excludePattern.length === 0) {
+			excludePattern = [{
+				folder: undefined,
+				patterns: resolvePatternsForProvider(this.query.excludePattern, undefined)
+			}];
+		}
+		const excludes = excludeToGlobPattern(excludePattern);
 
 		const options = {
 			folder: URI.from(fq.folder),
 			excludes,
 			includes,
-			useIgnoreFiles: !fq.disregardIgnoreFiles,
-			useGlobalIgnoreFiles: !fq.disregardGlobalIgnoreFiles,
-			useParentIgnoreFiles: !fq.disregardParentIgnoreFiles,
+			useIgnoreFiles: {
+				local: !fq.disregardIgnoreFiles,
+				parent: !fq.disregardParentIgnoreFiles,
+				global: !fq.disregardGlobalIgnoreFiles
+			},
 			followSymlinks: !fq.ignoreSymlinks,
-			encoding: fq.fileEncoding && this.fileUtils.toCanonicalName(fq.fileEncoding),
-			maxFileSize: this.query.maxFileSize,
-			maxResults: this.query.maxResults ?? DEFAULT_MAX_SEARCH_RESULTS,
-			previewOptions: this.query.previewOptions,
-			afterContext: this.query.afterContext,
-			beforeContext: this.query.beforeContext
+			encoding: (fq.fileEncoding && this.fileUtils.toCanonicalName(fq.fileEncoding)) ?? '',
 		};
-		if ('usePCRE2' in this.query) {
-			(<IExtendedExtensionSearchOptions>options).usePCRE2 = this.query.usePCRE2;
-		}
 		return options;
 	}
 }
 
-function patternInfoToQuery(patternInfo: IPatternInfo): TextSearchQuery {
+function patternInfoToQuery(patternInfo: IPatternInfo): TextSearchQueryNew {
 	return {
 		isCaseSensitive: patternInfo.isCaseSensitive || false,
 		isRegExp: patternInfo.isRegExp || false,
@@ -243,7 +238,7 @@ export class TextSearchResultsCollector {
 		this._batchedCollector = new BatchedCollector<IFileMatch>(512, items => this.sendItems(items));
 	}
 
-	add(data: TextSearchResult, folderIdx: number): void {
+	add(data: TextSearchResultNew, folderIdx: number): void {
 		// Collects TextSearchResults into IInternalFileMatches and collates using BatchedCollector.
 		// This is efficient for ripgrep which sends results back one file at a time. It wouldn't be efficient for other search
 		// providers that send results in random order. We could do this step afterwards instead.
@@ -280,25 +275,25 @@ export class TextSearchResultsCollector {
 	}
 }
 
-function extensionResultToFrontendResult(data: TextSearchResult): ITextSearchResult {
+function extensionResultToFrontendResult(data: TextSearchResultNew): ITextSearchResult {
 	// Warning: result from RipgrepTextSearchEH has fake Range. Don't depend on any other props beyond these...
-	if (extensionResultIsMatch(data)) {
+	if (data instanceof TextSearchMatchNew) {
 		return {
-			preview: {
-				matches: mapArrayOrNot(data.preview.matches, m => ({
-					startLineNumber: m.start.line,
-					startColumn: m.start.character,
-					endLineNumber: m.end.line,
-					endColumn: m.end.character
-				})),
-				text: data.preview.text
-			},
-			ranges: mapArrayOrNot(data.ranges, r => ({
-				startLineNumber: r.start.line,
-				startColumn: r.start.character,
-				endLineNumber: r.end.line,
-				endColumn: r.end.character
-			}))
+			previewText: data.previewText,
+			rangeLocations: data.ranges.map(r => ({
+				preview: {
+					startLineNumber: r.previewRange.start.line,
+					startColumn: r.previewRange.start.character,
+					endLineNumber: r.previewRange.end.line,
+					endColumn: r.previewRange.end.character
+				} satisfies ISearchRange,
+				source: {
+					startLineNumber: r.sourceRange.start.line,
+					startColumn: r.sourceRange.start.character,
+					endLineNumber: r.sourceRange.end.line,
+					endColumn: r.sourceRange.end.character
+				} satisfies ISearchRange,
+			})),
 		} satisfies ITextSearchMatch;
 	} else {
 		return {
@@ -308,9 +303,6 @@ function extensionResultToFrontendResult(data: TextSearchResult): ITextSearchRes
 	}
 }
 
-export function extensionResultIsMatch(data: TextSearchResult): data is TextSearchMatch {
-	return !!(<TextSearchMatch>data).preview;
-}
 
 /**
  * Collects items that have a size - before the cumulative size of collected items reaches START_BATCH_AFTER_COUNT, the callback is called for every
diff --git a/src/vs/workbench/services/search/node/fileSearch.ts b/src/vs/workbench/services/search/node/fileSearch.ts
index a483dd848b0..fef9f7bc549 100644
--- a/src/vs/workbench/services/search/node/fileSearch.ts
+++ b/src/vs/workbench/services/search/node/fileSearch.ts
@@ -82,7 +82,15 @@ export class FileWalker {
 		this.folderExcludePatterns = new Map<string, AbsoluteAndRelativeParsedExpression>();
 
 		config.folderQueries.forEach(folderQuery => {
-			const folderExcludeExpression: glob.IExpression = Object.assign({}, folderQuery.excludePattern || {}, this.config.excludePattern || {});
+			const folderExcludeExpression: glob.IExpression = {}; // todo: consider exclude baseURI
+
+			folderQuery.excludePattern?.forEach(excludePattern => {
+				Object.assign(folderExcludeExpression, excludePattern.pattern || {}, this.config.excludePattern || {});
+			});
+
+			if (!folderQuery.excludePattern?.length) {
+				Object.assign(folderExcludeExpression, this.config.excludePattern || {});
+			}
 
 			// Add excludes for other root folders
 			const fqPath = folderQuery.folder.fsPath;
diff --git a/src/vs/workbench/services/search/node/rawSearchService.ts b/src/vs/workbench/services/search/node/rawSearchService.ts
index 61bde71b572..916097b4e5b 100644
--- a/src/vs/workbench/services/search/node/rawSearchService.ts
+++ b/src/vs/workbench/services/search/node/rawSearchService.ts
@@ -9,6 +9,7 @@ import { CancellationToken } from 'vs/base/common/cancellation';
 import { canceled } from 'vs/base/common/errors';
 import { Emitter, Event } from 'vs/base/common/event';
 import { compareItemsByFuzzyScore, FuzzyScorerCache, IItemAccessor, prepareQuery } from 'vs/base/common/fuzzyScorer';
+import { revive } from 'vs/base/common/marshalling';
 import { basename, dirname, join, sep } from 'vs/base/common/path';
 import { StopWatch } from 'vs/base/common/stopwatch';
 import { URI, UriComponents } from 'vs/base/common/uri';
@@ -443,8 +444,5 @@ function reviveQuery<U extends IRawQuery>(rawQuery: U): U extends IRawTextQuery
 }
 
 function reviveFolderQuery(rawFolderQuery: IFolderQuery<UriComponents>): IFolderQuery<URI> {
-	return {
-		...rawFolderQuery,
-		folder: URI.revive(rawFolderQuery.folder)
-	};
+	return revive(rawFolderQuery);
 }
diff --git a/src/vs/workbench/services/search/node/ripgrepSearchProvider.ts b/src/vs/workbench/services/search/node/ripgrepSearchProvider.ts
index bff10b050d6..3325258033e 100644
--- a/src/vs/workbench/services/search/node/ripgrepSearchProvider.ts
+++ b/src/vs/workbench/services/search/node/ripgrepSearchProvider.ts
@@ -6,34 +6,49 @@
 import { CancellationTokenSource, CancellationToken } from 'vs/base/common/cancellation';
 import { OutputChannel } from 'vs/workbench/services/search/node/ripgrepSearchUtils';
 import { RipgrepTextSearchEngine } from 'vs/workbench/services/search/node/ripgrepTextSearchEngine';
-import { TextSearchProvider, TextSearchComplete, TextSearchResult, TextSearchQuery, TextSearchOptions, } from 'vs/workbench/services/search/common/searchExtTypes';
+import { TextSearchProviderNew, TextSearchCompleteNew, TextSearchResultNew, TextSearchQueryNew, TextSearchProviderOptions, } from 'vs/workbench/services/search/common/searchExtTypes';
 import { Progress } from 'vs/platform/progress/common/progress';
 import { Schemas } from 'vs/base/common/network';
 import type { RipgrepTextSearchOptions } from 'vs/workbench/services/search/common/searchExtTypesInternal';
 
-export class RipgrepSearchProvider implements TextSearchProvider {
+export class RipgrepSearchProvider implements TextSearchProviderNew {
 	private inProgress: Set<CancellationTokenSource> = new Set();
 
 	constructor(private outputChannel: OutputChannel, private getNumThreads: () => Promise<number | undefined>) {
 		process.once('exit', () => this.dispose());
 	}
 
-	async provideTextSearchResults(query: TextSearchQuery, options: TextSearchOptions, progress: Progress<TextSearchResult>, token: CancellationToken): Promise<TextSearchComplete> {
+	async provideTextSearchResults(query: TextSearchQueryNew, options: TextSearchProviderOptions, progress: Progress<TextSearchResultNew>, token: CancellationToken): Promise<TextSearchCompleteNew> {
 		const numThreads = await this.getNumThreads();
 		const engine = new RipgrepTextSearchEngine(this.outputChannel, numThreads);
-		const extendedOptions: RipgrepTextSearchOptions = {
-			...options,
-			numThreads,
-		};
-		if (options.folder.scheme === Schemas.vscodeUserData) {
-			// Ripgrep search engine can only provide file-scheme results, but we want to use it to search some schemes that are backed by the filesystem, but with some other provider as the frontend,
-			// case in point vscode-userdata. In these cases we translate the query to a file, and translate the results back to the frontend scheme.
-			const translatedOptions = { ...extendedOptions, folder: options.folder.with({ scheme: Schemas.file }) };
-			const progressTranslator = new Progress<TextSearchResult>(data => progress.report({ ...data, uri: data.uri.with({ scheme: options.folder.scheme }) }));
-			return this.withToken(token, token => engine.provideTextSearchResults(query, translatedOptions, progressTranslator, token));
-		} else {
-			return this.withToken(token, token => engine.provideTextSearchResults(query, extendedOptions, progress, token));
-		}
+
+		return Promise.all(options.folderOptions.map(folderOption => {
+
+			const extendedOptions: RipgrepTextSearchOptions = {
+				folderOptions: folderOption,
+				numThreads,
+				maxResults: options.maxResults,
+				previewOptions: options.previewOptions,
+				maxFileSize: options.maxFileSize,
+				surroundingContext: options.surroundingContext
+			};
+			if (folderOption.folder.scheme === Schemas.vscodeUserData) {
+				// Ripgrep search engine can only provide file-scheme results, but we want to use it to search some schemes that are backed by the filesystem, but with some other provider as the frontend,
+				// case in point vscode-userdata. In these cases we translate the query to a file, and translate the results back to the frontend scheme.
+				const translatedOptions = { ...extendedOptions, folder: folderOption.folder.with({ scheme: Schemas.file }) };
+				const progressTranslator = new Progress<TextSearchResultNew>(data => progress.report({ ...data, uri: data.uri.with({ scheme: folderOption.folder.scheme }) }));
+				return this.withToken(token, token => engine.provideTextSearchResultsWithRgOptions(query, translatedOptions, progressTranslator, token));
+			} else {
+				return this.withToken(token, token => engine.provideTextSearchResultsWithRgOptions(query, extendedOptions, progress, token));
+			}
+		})).then((e => {
+			const complete: TextSearchCompleteNew = {
+				// todo: get this to actually check
+				limitHit: e.some(complete => !!complete && complete.limitHit)
+			};
+			return complete;
+		}));
+
 	}
 
 	private async withToken<T>(token: CancellationToken, fn: (token: CancellationToken) => Promise<T>): Promise<T> {
diff --git a/src/vs/workbench/services/search/node/ripgrepSearchUtils.ts b/src/vs/workbench/services/search/node/ripgrepSearchUtils.ts
index f9901923001..1a7b467f493 100644
--- a/src/vs/workbench/services/search/node/ripgrepSearchUtils.ts
+++ b/src/vs/workbench/services/search/node/ripgrepSearchUtils.ts
@@ -3,10 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { mapArrayOrNot } from 'vs/base/common/arrays';
-import { URI } from 'vs/base/common/uri';
 import { ILogService } from 'vs/platform/log/common/log';
-import { SearchRange, TextSearchMatch } from 'vs/workbench/services/search/common/search';
+import { SearchRange } from 'vs/workbench/services/search/common/search';
 import * as searchExtTypes from 'vs/workbench/services/search/common/searchExtTypes';
 
 export type Maybe<T> = T | null | undefined;
@@ -15,29 +13,11 @@ export function anchorGlob(glob: string): string {
 	return glob.startsWith('**') || glob.startsWith('/') ? glob : `/${glob}`;
 }
 
-/**
- * Create a vscode.TextSearchMatch by using our internal TextSearchMatch type for its previewOptions logic.
- */
-export function createTextSearchResult(uri: URI, text: string, range: searchExtTypes.Range | searchExtTypes.Range[], previewOptions?: searchExtTypes.TextSearchPreviewOptions): searchExtTypes.TextSearchMatch {
-	const searchRange = mapArrayOrNot(range, rangeToSearchRange);
-
-	const internalResult = new TextSearchMatch(text, searchRange, previewOptions);
-	const internalPreviewRange = internalResult.preview.matches;
-	return {
-		ranges: mapArrayOrNot(searchRange, searchRangeToRange),
-		uri,
-		preview: {
-			text: internalResult.preview.text,
-			matches: mapArrayOrNot(internalPreviewRange, searchRangeToRange)
-		}
-	};
-}
-
-function rangeToSearchRange(range: searchExtTypes.Range): SearchRange {
+export function rangeToSearchRange(range: searchExtTypes.Range): SearchRange {
 	return new SearchRange(range.start.line, range.start.character, range.end.line, range.end.character);
 }
 
-function searchRangeToRange(range: SearchRange): searchExtTypes.Range {
+export function searchRangeToRange(range: SearchRange): searchExtTypes.Range {
 	return new searchExtTypes.Range(range.startLineNumber, range.startColumn, range.endLineNumber, range.endColumn);
 }
 
diff --git a/src/vs/workbench/services/search/node/ripgrepTextSearchEngine.ts b/src/vs/workbench/services/search/node/ripgrepTextSearchEngine.ts
index 4740a661119..72796fe63a8 100644
--- a/src/vs/workbench/services/search/node/ripgrepTextSearchEngine.ts
+++ b/src/vs/workbench/services/search/node/ripgrepTextSearchEngine.ts
@@ -6,19 +6,20 @@
 import * as cp from 'child_process';
 import { EventEmitter } from 'events';
 import { StringDecoder } from 'string_decoder';
-import { coalesce } from 'vs/base/common/arrays';
+import { coalesce, mapArrayOrNot } from 'vs/base/common/arrays';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { groupBy } from 'vs/base/common/collections';
 import { splitGlobAware } from 'vs/base/common/glob';
 import { createRegExp, escapeRegExpCharacters } from 'vs/base/common/strings';
 import { URI } from 'vs/base/common/uri';
 import { Progress } from 'vs/platform/progress/common/progress';
-import { IExtendedExtensionSearchOptions, SearchError, SearchErrorCode, serializeSearchError } from 'vs/workbench/services/search/common/search';
-import { Range, TextSearchComplete, TextSearchContext, TextSearchMatch, TextSearchOptions, TextSearchPreviewOptions, TextSearchQuery, TextSearchResult } from 'vs/workbench/services/search/common/searchExtTypes';
+import { DEFAULT_MAX_SEARCH_RESULTS, IExtendedExtensionSearchOptions, ITextSearchPreviewOptions, SearchError, SearchErrorCode, serializeSearchError, TextSearchMatch } from 'vs/workbench/services/search/common/search';
+import { Range, TextSearchCompleteNew, TextSearchContextNew, TextSearchMatchNew, TextSearchProviderOptions, TextSearchQueryNew, TextSearchResultNew } from 'vs/workbench/services/search/common/searchExtTypes';
 import { AST as ReAST, RegExpParser, RegExpVisitor } from 'vscode-regexpp';
 import { rgPath } from '@vscode/ripgrep';
-import { anchorGlob, createTextSearchResult, IOutputChannel, Maybe } from './ripgrepSearchUtils';
+import { anchorGlob, IOutputChannel, Maybe, rangeToSearchRange, searchRangeToRange } from './ripgrepSearchUtils';
 import type { RipgrepTextSearchOptions } from 'vs/workbench/services/search/common/searchExtTypesInternal';
+import { newToOldPreviewOptions } from 'vs/workbench/services/search/common/searchExtConversionTypes';
 
 // If @vscode/ripgrep is in an .asar file, then the binary is unpacked.
 const rgDiskPath = rgPath.replace(/\bnode_modules\.asar\b/, 'node_modules.asar.unpacked');
@@ -27,11 +28,31 @@ export class RipgrepTextSearchEngine {
 
 	constructor(private outputChannel: IOutputChannel, private readonly _numThreads?: number | undefined) { }
 
-	provideTextSearchResults(query: TextSearchQuery, options: TextSearchOptions, progress: Progress<TextSearchResult>, token: CancellationToken): Promise<TextSearchComplete> {
+	provideTextSearchResults(query: TextSearchQueryNew, options: TextSearchProviderOptions, progress: Progress<TextSearchResultNew>, token: CancellationToken): Promise<TextSearchCompleteNew> {
+		return Promise.all(options.folderOptions.map(folderOption => {
+			const extendedOptions: RipgrepTextSearchOptions = {
+				folderOptions: folderOption,
+				numThreads: this._numThreads,
+				maxResults: options.maxResults,
+				previewOptions: options.previewOptions,
+				maxFileSize: options.maxFileSize,
+				surroundingContext: options.surroundingContext
+			};
+			return this.provideTextSearchResultsWithRgOptions(query, extendedOptions, progress, token);
+		})).then((e => {
+			const complete: TextSearchCompleteNew = {
+				// todo: get this to actually check
+				limitHit: e.some(complete => !!complete && complete.limitHit)
+			};
+			return complete;
+		}));
+	}
+
+	provideTextSearchResultsWithRgOptions(query: TextSearchQueryNew, options: RipgrepTextSearchOptions, progress: Progress<TextSearchResultNew>, token: CancellationToken): Promise<TextSearchCompleteNew> {
 		this.outputChannel.appendLine(`provideTextSearchResults ${query.pattern}, ${JSON.stringify({
 			...options,
 			...{
-				folder: options.folder.toString()
+				folder: options.folderOptions.folder.toString()
 			}
 		})}`);
 
@@ -44,7 +65,7 @@ export class RipgrepTextSearchEngine {
 			};
 			const rgArgs = getRgArgs(query, extendedOptions);
 
-			const cwd = options.folder.fsPath;
+			const cwd = options.folderOptions.folder.fsPath;
 
 			const escapedArgs = rgArgs
 				.map(arg => arg.match(/^-/) ? arg : `'${arg}'`)
@@ -59,8 +80,8 @@ export class RipgrepTextSearchEngine {
 			});
 
 			let gotResult = false;
-			const ripgrepParser = new RipgrepParser(options.maxResults, options.folder, options.previewOptions);
-			ripgrepParser.on('result', (match: TextSearchResult) => {
+			const ripgrepParser = new RipgrepParser(options.maxResults ?? DEFAULT_MAX_SEARCH_RESULTS, options.folderOptions.folder, newToOldPreviewOptions(options.previewOptions));
+			ripgrepParser.on('result', (match: TextSearchResultNew) => {
 				gotResult = true;
 				dataWithoutResult = '';
 				progress.report(match);
@@ -188,7 +209,7 @@ export class RipgrepParser extends EventEmitter {
 
 	private numResults = 0;
 
-	constructor(private maxResults: number, private root: URI, private previewOptions?: TextSearchPreviewOptions) {
+	constructor(private maxResults: number, private root: URI, private previewOptions: ITextSearchPreviewOptions) {
 		super();
 		this.stringDecoder = new StringDecoder();
 	}
@@ -202,7 +223,7 @@ export class RipgrepParser extends EventEmitter {
 	}
 
 
-	override on(event: 'result', listener: (result: TextSearchResult) => void): this;
+	override on(event: 'result', listener: (result: TextSearchResultNew) => void): this;
 	override on(event: 'hitLimit', listener: () => void): this;
 	override on(event: string, listener: (...args: any[]) => void): this {
 		super.on(event, listener);
@@ -243,6 +264,7 @@ export class RipgrepParser extends EventEmitter {
 		this.remainder = dataStr.substring(prevIdx);
 	}
 
+
 	private handleLine(outputLine: string): void {
 		if (this.isDone || !outputLine) {
 			return;
@@ -268,12 +290,12 @@ export class RipgrepParser extends EventEmitter {
 		} else if (parsedLine.type === 'context') {
 			const contextPath = bytesOrTextToString(parsedLine.data.path);
 			const uri = URI.joinPath(this.root, contextPath);
-			const result = this.createTextSearchContext(parsedLine.data, uri);
+			const result = this.createTextSearchContexts(parsedLine.data, uri);
 			result.forEach(r => this.onResult(r));
 		}
 	}
 
-	private createTextSearchMatch(data: IRgMatch, uri: URI): TextSearchMatch {
+	private createTextSearchMatch(data: IRgMatch, uri: URI): TextSearchMatchNew {
 		const lineNumber = data.line_number - 1;
 		const fullText = bytesOrTextToString(data.lines);
 		const fullTextBytes = Buffer.from(fullText);
@@ -326,25 +348,30 @@ export class RipgrepParser extends EventEmitter {
 			return new Range(startLineNumber, startCol, endLineNumber, endCol);
 		}));
 
-		return createTextSearchResult(uri, fullText, <Range[]>ranges, this.previewOptions);
+		const searchRange = mapArrayOrNot(<Range[]>ranges, rangeToSearchRange);
+
+		const internalResult = new TextSearchMatch(fullText, searchRange, this.previewOptions);
+		return new TextSearchMatchNew(
+			uri,
+			internalResult.rangeLocations.map(e => (
+				{
+					sourceRange: searchRangeToRange(e.source),
+					previewRange: searchRangeToRange(e.preview),
+				}
+			)),
+			internalResult.previewText);
 	}
 
-	private createTextSearchContext(data: IRgMatch, uri: URI): TextSearchContext[] {
+	private createTextSearchContexts(data: IRgMatch, uri: URI): TextSearchContextNew[] {
 		const text = bytesOrTextToString(data.lines);
 		const startLine = data.line_number;
 		return text
 			.replace(/\r?\n$/, '')
 			.split('\n')
-			.map((line, i) => {
-				return {
-					text: line,
-					uri,
-					lineNumber: startLine + i
-				};
-			});
+			.map((line, i) => new TextSearchContextNew(uri, line, startLine + i));
 	}
 
-	private onResult(match: TextSearchResult): void {
+	private onResult(match: TextSearchResultNew): void {
 		this.emit('result', match);
 	}
 }
@@ -373,12 +400,12 @@ function getNumLinesAndLastNewlineLength(text: string): { numLines: number; last
 }
 
 // exported for testing
-export function getRgArgs(query: TextSearchQuery, options: RipgrepTextSearchOptions): string[] {
+export function getRgArgs(query: TextSearchQueryNew, options: RipgrepTextSearchOptions): string[] {
 	const args = ['--hidden', '--no-require-git'];
 	args.push(query.isCaseSensitive ? '--case-sensitive' : '--ignore-case');
 
 	const { doubleStarIncludes, otherIncludes } = groupBy(
-		options.includes,
+		options.folderOptions.includes,
 		(include: string) => include.startsWith('**') ? 'doubleStarIncludes' : 'otherIncludes');
 
 	if (otherIncludes && otherIncludes.length) {
@@ -402,7 +429,7 @@ export function getRgArgs(query: TextSearchQuery, options: RipgrepTextSearchOpti
 		});
 	}
 
-	options.excludes
+	options.folderOptions.excludes.map(e => typeof (e) === 'string' ? e : e.pattern)
 		.map(anchorGlob)
 		.forEach(rgGlob => args.push('-g', `!${rgGlob}`));
 
@@ -410,8 +437,8 @@ export function getRgArgs(query: TextSearchQuery, options: RipgrepTextSearchOpti
 		args.push('--max-filesize', options.maxFileSize + '');
 	}
 
-	if (options.useIgnoreFiles) {
-		if (!options.useParentIgnoreFiles) {
+	if (options.folderOptions.useIgnoreFiles.local) {
+		if (!options.folderOptions.useIgnoreFiles.parent) {
 			args.push('--no-ignore-parent');
 		}
 	} else {
@@ -419,12 +446,12 @@ export function getRgArgs(query: TextSearchQuery, options: RipgrepTextSearchOpti
 		args.push('--no-ignore');
 	}
 
-	if (options.followSymlinks) {
+	if (options.folderOptions.followSymlinks) {
 		args.push('--follow');
 	}
 
-	if (options.encoding && options.encoding !== 'utf8') {
-		args.push('--encoding', options.encoding);
+	if (options.folderOptions.encoding && options.folderOptions.encoding !== 'utf8') {
+		args.push('--encoding', options.folderOptions.encoding);
 	}
 
 	if (options.numThreads) {
@@ -470,7 +497,7 @@ export function getRgArgs(query: TextSearchQuery, options: RipgrepTextSearchOpti
 	}
 
 	args.push('--no-config');
-	if (!options.useGlobalIgnoreFiles) {
+	if (!options.folderOptions.useIgnoreFiles.global) {
 		args.push('--no-ignore-global');
 	}
 
@@ -480,12 +507,9 @@ export function getRgArgs(query: TextSearchQuery, options: RipgrepTextSearchOpti
 		args.push('--multiline');
 	}
 
-	if (options.beforeContext) {
-		args.push('--before-context', options.beforeContext + '');
-	}
-
-	if (options.afterContext) {
-		args.push('--after-context', options.afterContext + '');
+	if (options.surroundingContext) {
+		args.push('--before-context', options.surroundingContext + '');
+		args.push('--after-context', options.surroundingContext + '');
 	}
 
 	// Folder to search
diff --git a/src/vs/workbench/services/search/node/textSearchAdapter.ts b/src/vs/workbench/services/search/node/textSearchAdapter.ts
index 58145f0af56..dd42e98acf4 100644
--- a/src/vs/workbench/services/search/node/textSearchAdapter.ts
+++ b/src/vs/workbench/services/search/node/textSearchAdapter.ts
@@ -5,7 +5,7 @@
 
 import { CancellationToken } from 'vs/base/common/cancellation';
 import * as pfs from 'vs/base/node/pfs';
-import { IFileMatch, IProgressMessage, ITextQuery, ITextSearchMatch, ISerializedFileMatch, ISerializedSearchSuccess } from 'vs/workbench/services/search/common/search';
+import { IFileMatch, IProgressMessage, ITextQuery, ITextSearchMatch, ISerializedFileMatch, ISerializedSearchSuccess, resultIsMatch } from 'vs/workbench/services/search/common/search';
 import { RipgrepTextSearchEngine } from 'vs/workbench/services/search/node/ripgrepTextSearchEngine';
 import { NativeTextSearchManager } from 'vs/workbench/services/search/node/textSearchManager';
 
@@ -50,9 +50,9 @@ function fileMatchToSerialized(match: IFileMatch): ISerializedFileMatch {
 		path: match.resource && match.resource.fsPath,
 		results: match.results,
 		numMatches: (match.results || []).reduce((sum, r) => {
-			if (!!(<ITextSearchMatch>r).ranges) {
+			if (resultIsMatch(r)) {
 				const m = <ITextSearchMatch>r;
-				return sum + (Array.isArray(m.ranges) ? m.ranges.length : 1);
+				return sum + m.rangeLocations.length;
 			} else {
 				return sum + 1;
 			}
diff --git a/src/vs/workbench/services/search/node/textSearchManager.ts b/src/vs/workbench/services/search/node/textSearchManager.ts
index 34cf4cce311..0da430976f2 100644
--- a/src/vs/workbench/services/search/node/textSearchManager.ts
+++ b/src/vs/workbench/services/search/node/textSearchManager.ts
@@ -6,12 +6,12 @@
 import { toCanonicalName } from 'vs/workbench/services/textfile/common/encoding';
 import * as pfs from 'vs/base/node/pfs';
 import { ITextQuery, ITextSearchStats } from 'vs/workbench/services/search/common/search';
-import { TextSearchProvider } from 'vs/workbench/services/search/common/searchExtTypes';
+import { TextSearchProviderNew } from 'vs/workbench/services/search/common/searchExtTypes';
 import { TextSearchManager } from 'vs/workbench/services/search/common/textSearchManager';
 
 export class NativeTextSearchManager extends TextSearchManager {
 
-	constructor(query: ITextQuery, provider: TextSearchProvider, _pfs: typeof pfs = pfs, processType: ITextSearchStats['type'] = 'searchProcess') {
+	constructor(query: ITextQuery, provider: TextSearchProviderNew, _pfs: typeof pfs = pfs, processType: ITextSearchStats['type'] = 'searchProcess') {
 		super({ query, provider }, {
 			readdir: resource => _pfs.Promises.readdir(resource.fsPath),
 			toCanonicalName: name => toCanonicalName(name)
diff --git a/src/vs/workbench/services/search/test/browser/queryBuilder.test.ts b/src/vs/workbench/services/search/test/browser/queryBuilder.test.ts
index e1172336673..a1bf218a328 100644
--- a/src/vs/workbench/services/search/test/browser/queryBuilder.test.ts
+++ b/src/vs/workbench/services/search/test/browser/queryBuilder.test.ts
@@ -211,12 +211,14 @@ suite('QueryBuilder', () => {
 				contentPattern: PATTERN_INFO,
 				folderQueries: [{
 					folder: ROOT_1_URI,
-					excludePattern: {
-						'bar/**': true,
-						'foo/**': {
-							'when': '$(basename).ts'
+					excludePattern: [{
+						pattern: {
+							'bar/**': true,
+							'foo/**': {
+								'when': '$(basename).ts'
+							}
 						}
-					}
+					}]
 				}],
 				type: QueryType.Text
 			});
@@ -337,12 +339,14 @@ suite('QueryBuilder', () => {
 						'foo': true,
 						'foo/**': true
 					},
-					excludePattern: {
-						'foo/**/*.js': true,
-						'bar/**': {
-							'when': '$(basename).ts'
+					excludePattern: [{
+						pattern: {
+							'foo/**/*.js': true,
+							'bar/**': {
+								'when': '$(basename).ts'
+							}
 						}
-					}
+					}]
 				}],
 				type: QueryType.Text
 			});
@@ -375,8 +379,8 @@ suite('QueryBuilder', () => {
 			{
 				contentPattern: PATTERN_INFO,
 				folderQueries: [
-					{ folder: ROOT_1_URI, excludePattern: patternsToIExpression('foo/**/*.js') },
-					{ folder: ROOT_2_URI, excludePattern: patternsToIExpression('bar') },
+					{ folder: ROOT_1_URI, excludePattern: makeExcludePatternFromPatterns('foo/**/*.js') },
+					{ folder: ROOT_2_URI, excludePattern: makeExcludePatternFromPatterns('bar') },
 					{ folder: ROOT_3_URI }
 				],
 				type: QueryType.Text
@@ -402,9 +406,9 @@ suite('QueryBuilder', () => {
 							'src': true,
 							'src/**': true
 						},
-						excludePattern: {
-							'bar': true
-						},
+						excludePattern: [{
+							pattern: { 'bar': true }
+						}],
 					}
 				],
 				type: QueryType.Text
@@ -418,7 +422,7 @@ suite('QueryBuilder', () => {
 				PATTERN_INFO,
 				[ROOT_1_URI],
 				{
-					excludePattern: 'foo',
+					excludePattern: [{ pattern: 'foo' }],
 					expandPatterns: true
 				}
 			),
@@ -452,7 +456,7 @@ suite('QueryBuilder', () => {
 				PATTERN_INFO,
 				[ROOT_1_URI],
 				{
-					excludePattern: './bar',
+					excludePattern: [{ pattern: './bar' }],
 					expandPatterns: true
 				}
 			),
@@ -460,7 +464,7 @@ suite('QueryBuilder', () => {
 				contentPattern: PATTERN_INFO,
 				folderQueries: [{
 					folder: ROOT_1_URI,
-					excludePattern: patternsToIExpression('bar', 'bar/**'),
+					excludePattern: makeExcludePatternFromPatterns('bar', 'bar/**'),
 				}],
 				type: QueryType.Text
 			});
@@ -470,7 +474,7 @@ suite('QueryBuilder', () => {
 				PATTERN_INFO,
 				[ROOT_1_URI],
 				{
-					excludePattern: './bar/**/*.ts',
+					excludePattern: [{ pattern: './bar/**/*.ts' }],
 					expandPatterns: true
 				}
 			),
@@ -478,7 +482,7 @@ suite('QueryBuilder', () => {
 				contentPattern: PATTERN_INFO,
 				folderQueries: [{
 					folder: ROOT_1_URI,
-					excludePattern: patternsToIExpression('bar/**/*.ts', 'bar/**/*.ts/**'),
+					excludePattern: makeExcludePatternFromPatterns('bar/**/*.ts', 'bar/**/*.ts/**'),
 				}],
 				type: QueryType.Text
 			});
@@ -488,7 +492,7 @@ suite('QueryBuilder', () => {
 				PATTERN_INFO,
 				[ROOT_1_URI],
 				{
-					excludePattern: '.\\bar\\**\\*.ts',
+					excludePattern: [{ pattern: '.\\bar\\**\\*.ts' }],
 					expandPatterns: true
 				}
 			),
@@ -496,7 +500,7 @@ suite('QueryBuilder', () => {
 				contentPattern: PATTERN_INFO,
 				folderQueries: [{
 					folder: ROOT_1_URI,
-					excludePattern: patternsToIExpression('bar/**/*.ts', 'bar/**/*.ts/**'),
+					excludePattern: makeExcludePatternFromPatterns('bar/**/*.ts', 'bar/**/*.ts/**'),
 				}],
 				type: QueryType.Text
 			});
@@ -524,7 +528,7 @@ suite('QueryBuilder', () => {
 				[ROOT_1_URI],
 				{
 					extraFileResources: [getUri('/foo/bar.js')],
-					excludePattern: '*.js',
+					excludePattern: [{ pattern: '*.js' }],
 					expandPatterns: true
 				}
 			),
@@ -1079,6 +1083,12 @@ suite('QueryBuilder', () => {
 		});
 	});
 });
+function makeExcludePatternFromPatterns(...patterns: string[]): {
+	pattern: IExpression;
+}[] | undefined {
+	const pattern = patternsToIExpression(...patterns);
+	return pattern ? [{ pattern }] : undefined;
+}
 
 function assertEqualTextQueries(actual: ITextQuery, expected: ITextQuery): void {
 	expected = {
@@ -1096,9 +1106,10 @@ export function assertEqualQueries(actual: ITextQuery | IFileQuery, expected: IT
 	};
 
 	const folderQueryToCompareObject = (fq: IFolderQuery) => {
+		const excludePattern = fq.excludePattern?.map(e => normalizeExpression(e.pattern));
 		return {
 			path: fq.folder.fsPath,
-			excludePattern: normalizeExpression(fq.excludePattern),
+			excludePattern: excludePattern?.length ? excludePattern : undefined,
 			includePattern: normalizeExpression(fq.includePattern),
 			fileEncoding: fq.fileEncoding
 		};
diff --git a/src/vs/workbench/services/search/test/common/search.test.ts b/src/vs/workbench/services/search/test/common/search.test.ts
index 5f0ec330f8a..81ace1f9e72 100644
--- a/src/vs/workbench/services/search/test/common/search.test.ts
+++ b/src/vs/workbench/services/search/test/common/search.test.ts
@@ -14,59 +14,64 @@ suite('TextSearchResult', () => {
 	};
 
 	function assertOneLinePreviewRangeText(text: string, result: TextSearchMatch): void {
+		assert.strictEqual(result.rangeLocations.length, 1);
 		assert.strictEqual(
-			result.preview.text.substring((<SearchRange>result.preview.matches).startColumn, (<SearchRange>result.preview.matches).endColumn),
+			result.previewText.substring((result.rangeLocations[0].preview).startColumn, (result.rangeLocations[0].preview).endColumn),
 			text);
 	}
 
+	function getFirstSourceFromResult(result: TextSearchMatch): OneLineRange {
+		return result.rangeLocations.map(e => e.source)[0];
+	}
+
 	ensureNoDisposablesAreLeakedInTestSuite();
 
 	test('empty without preview options', () => {
 		const range = new OneLineRange(5, 0, 0);
 		const result = new TextSearchMatch('', range);
-		assert.deepStrictEqual(result.ranges, range);
+		assert.deepStrictEqual(getFirstSourceFromResult(result), range);
 		assertOneLinePreviewRangeText('', result);
 	});
 
 	test('empty with preview options', () => {
 		const range = new OneLineRange(5, 0, 0);
 		const result = new TextSearchMatch('', range, previewOptions1);
-		assert.deepStrictEqual(result.ranges, range);
+		assert.deepStrictEqual(getFirstSourceFromResult(result), range);
 		assertOneLinePreviewRangeText('', result);
 	});
 
 	test('short without preview options', () => {
 		const range = new OneLineRange(5, 4, 7);
 		const result = new TextSearchMatch('foo bar', range);
-		assert.deepStrictEqual(result.ranges, range);
+		assert.deepStrictEqual(getFirstSourceFromResult(result), range);
 		assertOneLinePreviewRangeText('bar', result);
 	});
 
 	test('short with preview options', () => {
 		const range = new OneLineRange(5, 4, 7);
 		const result = new TextSearchMatch('foo bar', range, previewOptions1);
-		assert.deepStrictEqual(result.ranges, range);
+		assert.deepStrictEqual(getFirstSourceFromResult(result), range);
 		assertOneLinePreviewRangeText('bar', result);
 	});
 
 	test('leading', () => {
 		const range = new OneLineRange(5, 25, 28);
 		const result = new TextSearchMatch('long text very long text foo', range, previewOptions1);
-		assert.deepStrictEqual(result.ranges, range);
+		assert.deepStrictEqual(getFirstSourceFromResult(result), range);
 		assertOneLinePreviewRangeText('foo', result);
 	});
 
 	test('trailing', () => {
 		const range = new OneLineRange(5, 0, 3);
 		const result = new TextSearchMatch('foo long text very long text long text very long text long text very long text long text very long text long text very long text', range, previewOptions1);
-		assert.deepStrictEqual(result.ranges, range);
+		assert.deepStrictEqual(getFirstSourceFromResult(result), range);
 		assertOneLinePreviewRangeText('foo', result);
 	});
 
 	test('middle', () => {
 		const range = new OneLineRange(5, 30, 33);
 		const result = new TextSearchMatch('long text very long text long foo text very long text long text very long text long text very long text long text very long text', range, previewOptions1);
-		assert.deepStrictEqual(result.ranges, range);
+		assert.deepStrictEqual(getFirstSourceFromResult(result), range);
 		assertOneLinePreviewRangeText('foo', result);
 	});
 
@@ -78,7 +83,7 @@ suite('TextSearchResult', () => {
 
 		const range = new OneLineRange(0, 4, 7);
 		const result = new TextSearchMatch('foo bar', range, previewOptions);
-		assert.deepStrictEqual(result.ranges, range);
+		assert.deepStrictEqual(getFirstSourceFromResult(result), range);
 		assertOneLinePreviewRangeText('b', result);
 	});
 
@@ -90,12 +95,13 @@ suite('TextSearchResult', () => {
 
 		const range = new SearchRange(5, 4, 6, 3);
 		const result = new TextSearchMatch('foo bar\nfoo bar', range, previewOptions);
-		assert.deepStrictEqual(result.ranges, range);
-		assert.strictEqual(result.preview.text, 'foo bar\nfoo bar');
-		assert.strictEqual((<SearchRange>result.preview.matches).startLineNumber, 0);
-		assert.strictEqual((<SearchRange>result.preview.matches).startColumn, 4);
-		assert.strictEqual((<SearchRange>result.preview.matches).endLineNumber, 1);
-		assert.strictEqual((<SearchRange>result.preview.matches).endColumn, 3);
+		assert.deepStrictEqual(getFirstSourceFromResult(result), range);
+		assert.strictEqual(result.previewText, 'foo bar\nfoo bar');
+		assert.strictEqual(result.rangeLocations.length, 1);
+		assert.strictEqual(result.rangeLocations[0].preview.startLineNumber, 0);
+		assert.strictEqual(result.rangeLocations[0].preview.startColumn, 4);
+		assert.strictEqual(result.rangeLocations[0].preview.endLineNumber, 1);
+		assert.strictEqual(result.rangeLocations[0].preview.endColumn, 3);
 	});
 
 	test('compacts multiple ranges on long lines', () => {
@@ -108,8 +114,8 @@ suite('TextSearchResult', () => {
 		const range2 = new SearchRange(5, 133, 5, 136);
 		const range3 = new SearchRange(5, 141, 5, 144);
 		const result = new TextSearchMatch('foo bar 123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 foo bar baz bar', [range1, range2, range3], previewOptions);
-		assert.deepStrictEqual(result.preview.matches, [new OneLineRange(0, 4, 7), new OneLineRange(0, 42, 45), new OneLineRange(0, 50, 53)]);
-		assert.strictEqual(result.preview.text, 'foo bar 123456⟪ 117 characters skipped ⟫o bar baz bar');
+		assert.deepStrictEqual(result.rangeLocations.map(e => e.preview), [new OneLineRange(0, 4, 7), new OneLineRange(0, 42, 45), new OneLineRange(0, 50, 53)]);
+		assert.strictEqual(result.previewText, 'foo bar 123456⟪ 117 characters skipped ⟫o bar baz bar');
 	});
 
 	test('trims lines endings', () => {
@@ -119,8 +125,8 @@ suite('TextSearchResult', () => {
 			charsPerLine: 10000
 		};
 
-		assert.strictEqual(new TextSearchMatch('foo bar\n', range, previewOptions).preview.text, 'foo bar');
-		assert.strictEqual(new TextSearchMatch('foo bar\r\n', range, previewOptions).preview.text, 'foo bar');
+		assert.strictEqual(new TextSearchMatch('foo bar\n', range, previewOptions).previewText, 'foo bar');
+		assert.strictEqual(new TextSearchMatch('foo bar\r\n', range, previewOptions).previewText, 'foo bar');
 	});
 
 	// test('all lines of multiline match', () => {
diff --git a/src/vs/workbench/services/search/test/common/searchHelpers.test.ts b/src/vs/workbench/services/search/test/common/searchHelpers.test.ts
index 2d9db98c70d..bf9cabe8706 100644
--- a/src/vs/workbench/services/search/test/common/searchHelpers.test.ts
+++ b/src/vs/workbench/services/search/test/common/searchHelpers.test.ts
@@ -39,9 +39,9 @@ suite('SearchHelpers', () => {
 		test('simple', () => {
 			const results = editorMatchesToTextSearchResults([new FindMatch(new Range(6, 1, 6, 2), null)], mockTextModel);
 			assert.strictEqual(results.length, 1);
-			assert.strictEqual(results[0].preview.text, '6\n');
-			assertRangesEqual(results[0].preview.matches, [new Range(0, 0, 0, 1)]);
-			assertRangesEqual(results[0].ranges, [new Range(5, 0, 5, 1)]);
+			assert.strictEqual(results[0].previewText, '6\n');
+			assertRangesEqual(results[0].rangeLocations.map(e => e.preview), [new Range(0, 0, 0, 1)]);
+			assertRangesEqual(results[0].rangeLocations.map(e => e.source), [new Range(5, 0, 5, 1)]);
 		});
 
 		test('multiple', () => {
@@ -53,23 +53,23 @@ suite('SearchHelpers', () => {
 				],
 				mockTextModel);
 			assert.strictEqual(results.length, 2);
-			assertRangesEqual(results[0].preview.matches, [
+			assertRangesEqual(results[0].rangeLocations.map(e => e.preview), [
 				new Range(0, 0, 0, 1),
 				new Range(0, 3, 2, 1),
 			]);
-			assertRangesEqual(results[0].ranges, [
+			assertRangesEqual(results[0].rangeLocations.map(e => e.source), [
 				new Range(5, 0, 5, 1),
 				new Range(5, 3, 7, 1),
 			]);
-			assert.strictEqual(results[0].preview.text, '6\n7\n8\n');
+			assert.strictEqual(results[0].previewText, '6\n7\n8\n');
 
-			assertRangesEqual(results[1].preview.matches, [
+			assertRangesEqual(results[1].rangeLocations.map(e => e.preview), [
 				new Range(0, 0, 1, 2),
 			]);
-			assertRangesEqual(results[1].ranges, [
+			assertRangesEqual(results[1].rangeLocations.map(e => e.source), [
 				new Range(8, 0, 9, 2),
 			]);
-			assert.strictEqual(results[1].preview.text, '9\n10\n');
+			assert.strictEqual(results[1].previewText, '9\n10\n');
 		});
 	});
 
@@ -91,23 +91,24 @@ suite('SearchHelpers', () => {
 			}
 		} as ITextModel;
 
-		function getQuery(beforeContext?: number, afterContext?: number): ITextQuery {
+		function getQuery(surroundingContext?: number): ITextQuery {
 			return {
 				folderQueries: [],
 				type: QueryType.Text,
 				contentPattern: { pattern: 'test' },
-				beforeContext,
-				afterContext
+				surroundingContext,
 			};
 		}
 
 		test('no context', () => {
 			const matches = [{
-				preview: {
-					text: 'foo',
-					matches: new Range(0, 0, 0, 10)
-				},
-				ranges: new Range(0, 0, 0, 10)
+				previewText: 'foo',
+				rangeLocations: [
+					{
+						preview: new Range(0, 0, 0, 10),
+						source: new Range(0, 0, 0, 10)
+					}
+				]
 			}];
 
 			assert.deepStrictEqual(getTextSearchMatchWithModelContext(matches, mockTextModel, getQuery()), matches);
@@ -115,14 +116,17 @@ suite('SearchHelpers', () => {
 
 		test('simple', () => {
 			const matches = [{
-				preview: {
-					text: 'foo',
-					matches: new Range(0, 0, 0, 10)
-				},
-				ranges: new Range(1, 0, 1, 10)
-			}];
+				previewText: 'foo',
+				rangeLocations: [
+					{
+						preview: new Range(0, 0, 0, 10),
+						source: new Range(1, 0, 1, 10)
+					}
+				]
+			}
+			];
 
-			assert.deepStrictEqual(getTextSearchMatchWithModelContext(matches, mockTextModel, getQuery(1, 2)), [
+			assert.deepStrictEqual(getTextSearchMatchWithModelContext(matches, mockTextModel, getQuery(1)), [
 				{
 					text: '1',
 					lineNumber: 1
@@ -132,31 +136,31 @@ suite('SearchHelpers', () => {
 					text: '3',
 					lineNumber: 3
 				},
-				{
-					text: '4',
-					lineNumber: 4
-				},
 			] satisfies ITextSearchResult[]);
 		});
 
 		test('multiple matches next to each other', () => {
 			const matches = [
 				{
-					preview: {
-						text: 'foo',
-						matches: new Range(0, 0, 0, 10)
-					},
-					ranges: new Range(1, 0, 1, 10)
+					previewText: 'foo',
+					rangeLocations: [
+						{
+							preview: new Range(0, 0, 0, 10),
+							source: new Range(1, 0, 1, 10)
+						}
+					]
 				},
 				{
-					preview: {
-						text: 'bar',
-						matches: new Range(0, 0, 0, 10)
-					},
-					ranges: new Range(2, 0, 2, 10)
+					previewText: 'bar',
+					rangeLocations: [
+						{
+							preview: new Range(0, 0, 0, 10),
+							source: new Range(2, 0, 2, 10)
+						}
+					]
 				}];
 
-			assert.deepStrictEqual(getTextSearchMatchWithModelContext(matches, mockTextModel, getQuery(1, 2)), [
+			assert.deepStrictEqual(getTextSearchMatchWithModelContext(matches, mockTextModel, getQuery(1)), [
 				<ITextSearchContext>{
 					text: '1',
 					lineNumber: 1
@@ -166,40 +170,36 @@ suite('SearchHelpers', () => {
 					text: '4',
 					lineNumber: 4
 				},
-				<ITextSearchContext>{
-					text: '5',
-					lineNumber: 5
-				},
 			]);
 		});
 
 		test('boundaries', () => {
 			const matches = [
 				{
-					preview: {
-						text: 'foo',
-						matches: new Range(0, 0, 0, 10)
-					},
-					ranges: new Range(0, 0, 0, 10)
+					previewText: 'foo',
+					rangeLocations: [
+						{
+							preview: new Range(0, 0, 0, 10),
+							source: new Range(0, 0, 0, 10)
+						}
+					]
 				},
 				{
-					preview: {
-						text: 'bar',
-						matches: new Range(0, 0, 0, 10)
-					},
-					ranges: new Range(MOCK_LINE_COUNT - 1, 0, MOCK_LINE_COUNT - 1, 10)
+					previewText: 'bar',
+					rangeLocations: [
+						{
+							preview: new Range(0, 0, 0, 10),
+							source: new Range(MOCK_LINE_COUNT - 1, 0, MOCK_LINE_COUNT - 1, 10)
+						}
+					]
 				}];
 
-			assert.deepStrictEqual(getTextSearchMatchWithModelContext(matches, mockTextModel, getQuery(1, 2)), [
+			assert.deepStrictEqual(getTextSearchMatchWithModelContext(matches, mockTextModel, getQuery(1)), [
 				matches[0],
 				<ITextSearchContext>{
 					text: '2',
 					lineNumber: 2
 				},
-				<ITextSearchContext>{
-					text: '3',
-					lineNumber: 3
-				},
 				<ITextSearchContext>{
 					text: '' + (MOCK_LINE_COUNT - 1),
 					lineNumber: MOCK_LINE_COUNT - 1
diff --git a/src/vs/workbench/services/search/test/node/ripgrepTextSearchEngineUtils.test.ts b/src/vs/workbench/services/search/test/node/ripgrepTextSearchEngineUtils.test.ts
index e93c4efb269..b6a21e4202c 100644
--- a/src/vs/workbench/services/search/test/node/ripgrepTextSearchEngineUtils.test.ts
+++ b/src/vs/workbench/services/search/test/node/ripgrepTextSearchEngineUtils.test.ts
@@ -7,8 +7,10 @@ import assert from 'assert';
 import { joinPath } from 'vs/base/common/resources';
 import { URI } from 'vs/base/common/uri';
 import { fixRegexNewline, IRgMatch, IRgMessage, RipgrepParser, unicodeEscapesToPCRE2, fixNewline, getRgArgs, performBraceExpansionForRipgrep } from 'vs/workbench/services/search/node/ripgrepTextSearchEngine';
-import { Range, TextSearchOptions, TextSearchQuery, TextSearchResult } from 'vs/workbench/services/search/common/searchExtTypes';
+import { Range, TextSearchMatchNew, TextSearchQueryNew, TextSearchResultNew } from 'vs/workbench/services/search/common/searchExtTypes';
 import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { RipgrepTextSearchOptions } from 'vs/workbench/services/search/common/searchExtTypesInternal';
+import { DEFAULT_TEXT_SEARCH_PREVIEW_OPTIONS } from 'vs/workbench/services/search/common/search';
 
 suite('RipgrepTextSearchEngine', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
@@ -104,10 +106,10 @@ suite('RipgrepTextSearchEngine', () => {
 	suite('RipgrepParser', () => {
 		const TEST_FOLDER = URI.file('/foo/bar');
 
-		function testParser(inputData: string[], expectedResults: TextSearchResult[]): void {
-			const testParser = new RipgrepParser(1000, TEST_FOLDER);
+		function testParser(inputData: string[], expectedResults: TextSearchResultNew[]): void {
+			const testParser = new RipgrepParser(1000, TEST_FOLDER, DEFAULT_TEXT_SEARCH_PREVIEW_OPTIONS);
 
-			const actualResults: TextSearchResult[] = [];
+			const actualResults: TextSearchResultNew[] = [];
 			testParser.on('result', r => {
 				actualResults.push(r);
 			});
@@ -146,14 +148,14 @@ suite('RipgrepTextSearchEngine', () => {
 					makeRgMatch('file1.js', 'foobar', 4, [{ start: 3, end: 6 }])
 				],
 				[
-					{
-						preview: {
-							text: 'foobar',
-							matches: [new Range(0, 3, 0, 6)]
-						},
-						uri: joinPath(TEST_FOLDER, 'file1.js'),
-						ranges: [new Range(3, 3, 3, 6)]
-					}
+					new TextSearchMatchNew(
+						joinPath(TEST_FOLDER, 'file1.js'),
+						[{
+							previewRange: new Range(0, 3, 0, 6),
+							sourceRange: new Range(3, 3, 3, 6),
+						}],
+						'foobar'
+					)
 				]);
 		});
 
@@ -165,30 +167,30 @@ suite('RipgrepTextSearchEngine', () => {
 					makeRgMatch('app2/file3.js', 'foobar', 4, [{ start: 3, end: 6 }]),
 				],
 				[
-					{
-						preview: {
-							text: 'foobar',
-							matches: [new Range(0, 3, 0, 6)]
-						},
-						uri: joinPath(TEST_FOLDER, 'file1.js'),
-						ranges: [new Range(3, 3, 3, 6)]
-					},
-					{
-						preview: {
-							text: 'foobar',
-							matches: [new Range(0, 3, 0, 6)]
-						},
-						uri: joinPath(TEST_FOLDER, 'app/file2.js'),
-						ranges: [new Range(3, 3, 3, 6)]
-					},
-					{
-						preview: {
-							text: 'foobar',
-							matches: [new Range(0, 3, 0, 6)]
-						},
-						uri: joinPath(TEST_FOLDER, 'app2/file3.js'),
-						ranges: [new Range(3, 3, 3, 6)]
-					}
+					new TextSearchMatchNew(
+						joinPath(TEST_FOLDER, 'file1.js'),
+						[{
+							previewRange: new Range(0, 3, 0, 6),
+							sourceRange: new Range(3, 3, 3, 6),
+						}],
+						'foobar'
+					),
+					new TextSearchMatchNew(
+						joinPath(TEST_FOLDER, 'app/file2.js'),
+						[{
+							previewRange: new Range(0, 3, 0, 6),
+							sourceRange: new Range(3, 3, 3, 6),
+						}],
+						'foobar'
+					),
+					new TextSearchMatchNew(
+						joinPath(TEST_FOLDER, 'app2/file3.js'),
+						[{
+							previewRange: new Range(0, 3, 0, 6),
+							sourceRange: new Range(3, 3, 3, 6),
+						}],
+						'foobar'
+					)
 				]);
 		});
 
@@ -210,30 +212,30 @@ suite('RipgrepTextSearchEngine', () => {
 					dataStrs[2].substring(25)
 				],
 				[
-					{
-						preview: {
-							text: 'foo bar',
-							matches: [new Range(0, 3, 0, 7)]
-						},
-						uri: joinPath(TEST_FOLDER, 'file1.js'),
-						ranges: [new Range(3, 3, 3, 7)]
-					},
-					{
-						preview: {
-							text: 'foobar',
-							matches: [new Range(0, 3, 0, 6)]
-						},
-						uri: joinPath(TEST_FOLDER, 'app/file2.js'),
-						ranges: [new Range(3, 3, 3, 6)]
-					},
-					{
-						preview: {
-							text: 'foobar',
-							matches: [new Range(0, 3, 0, 6)]
-						},
-						uri: joinPath(TEST_FOLDER, 'app2/file3.js'),
-						ranges: [new Range(3, 3, 3, 6)]
-					}
+					new TextSearchMatchNew(
+						joinPath(TEST_FOLDER, 'file1.js'),
+						[{
+							previewRange: new Range(0, 3, 0, 7),
+							sourceRange: new Range(3, 3, 3, 7),
+						}],
+						'foo bar'
+					),
+					new TextSearchMatchNew(
+						joinPath(TEST_FOLDER, 'app/file2.js'),
+						[{
+							previewRange: new Range(0, 3, 0, 6),
+							sourceRange: new Range(3, 3, 3, 6),
+						}],
+						'foobar'
+					),
+					new TextSearchMatchNew(
+						joinPath(TEST_FOLDER, 'app2/file3.js'),
+						[{
+							previewRange: new Range(0, 3, 0, 6),
+							sourceRange: new Range(3, 3, 3, 6),
+						}],
+						'foobar'
+					)
 				]);
 		});
 
@@ -245,22 +247,26 @@ suite('RipgrepTextSearchEngine', () => {
 					makeRgMatch('file1.js', '', 5, []),
 				],
 				[
-					{
-						preview: {
-							text: 'foobar',
-							matches: [new Range(0, 0, 0, 1)]
-						},
-						uri: joinPath(TEST_FOLDER, 'file1.js'),
-						ranges: [new Range(3, 0, 3, 1)]
-					},
-					{
-						preview: {
-							text: '',
-							matches: [new Range(0, 0, 0, 0)]
-						},
-						uri: joinPath(TEST_FOLDER, 'file1.js'),
-						ranges: [new Range(4, 0, 4, 0)]
-					}
+					new TextSearchMatchNew(
+						joinPath(TEST_FOLDER, 'file1.js'),
+						[
+							{
+								previewRange: new Range(0, 0, 0, 1),
+								sourceRange: new Range(3, 0, 3, 1),
+							}
+						],
+						'foobar'
+					),
+					new TextSearchMatchNew(
+						joinPath(TEST_FOLDER, 'file1.js'),
+						[
+							{
+								previewRange: new Range(0, 0, 0, 0),
+								sourceRange: new Range(4, 0, 4, 0),
+							}
+						],
+						''
+					)
 				]);
 		});
 
@@ -270,14 +276,20 @@ suite('RipgrepTextSearchEngine', () => {
 					makeRgMatch('file1.js', 'foobarbazquux', 4, [{ start: 0, end: 4 }, { start: 6, end: 10 }]),
 				],
 				[
-					{
-						preview: {
-							text: 'foobarbazquux',
-							matches: [new Range(0, 0, 0, 4), new Range(0, 6, 0, 10)]
-						},
-						uri: joinPath(TEST_FOLDER, 'file1.js'),
-						ranges: [new Range(3, 0, 3, 4), new Range(3, 6, 3, 10)]
-					}
+					new TextSearchMatchNew(
+						joinPath(TEST_FOLDER, 'file1.js'),
+						[
+							{
+								previewRange: new Range(0, 0, 0, 4),
+								sourceRange: new Range(3, 0, 3, 4),
+							},
+							{
+								previewRange: new Range(0, 6, 0, 10),
+								sourceRange: new Range(3, 6, 3, 10),
+							}
+						],
+						'foobarbazquux'
+					)
 				]);
 		});
 
@@ -287,14 +299,20 @@ suite('RipgrepTextSearchEngine', () => {
 					makeRgMatch('file1.js', 'foo\nbar\nbaz\nquux', 4, [{ start: 0, end: 5 }, { start: 8, end: 13 }]),
 				],
 				[
-					{
-						preview: {
-							text: 'foo\nbar\nbaz\nquux',
-							matches: [new Range(0, 0, 1, 1), new Range(2, 0, 3, 1)]
-						},
-						uri: joinPath(TEST_FOLDER, 'file1.js'),
-						ranges: [new Range(3, 0, 4, 1), new Range(5, 0, 6, 1)]
-					}
+					new TextSearchMatchNew(
+						joinPath(TEST_FOLDER, 'file1.js'),
+						[
+							{
+								previewRange: new Range(0, 0, 1, 1),
+								sourceRange: new Range(3, 0, 4, 1),
+							},
+							{
+								previewRange: new Range(2, 0, 3, 1),
+								sourceRange: new Range(5, 0, 6, 1),
+							}
+						],
+						'foo\nbar\nbaz\nquux'
+					)
 				]);
 		});
 	});
@@ -303,19 +321,24 @@ suite('RipgrepTextSearchEngine', () => {
 		test('simple includes', () => {
 			// Only testing the args that come from includes.
 			function testGetRgArgs(includes: string[], expectedFromIncludes: string[]): void {
-				const query: TextSearchQuery = {
+				const query: TextSearchQueryNew = {
 					pattern: 'test'
 				};
 
-				const options: TextSearchOptions = {
-					includes: includes,
-					excludes: [],
+				const options: RipgrepTextSearchOptions = {
+					folderOptions: {
+						includes: includes,
+						excludes: [],
+						useIgnoreFiles: {
+							local: false,
+							global: false,
+							parent: false
+						},
+						followSymlinks: false,
+						folder: URI.file('/some/folder'),
+						encoding: 'utf8',
+					},
 					maxResults: 1000,
-					useIgnoreFiles: false,
-					followSymlinks: false,
-					useGlobalIgnoreFiles: false,
-					useParentIgnoreFiles: false,
-					folder: URI.file('/some/folder')
 				};
 				const expected = [
 					'--hidden',
diff --git a/src/vs/workbench/services/search/test/node/search.integrationTest.ts b/src/vs/workbench/services/search/test/node/search.integrationTest.ts
index ae3a4b4fe74..7017187ba99 100644
--- a/src/vs/workbench/services/search/test/node/search.integrationTest.ts
+++ b/src/vs/workbench/services/search/test/node/search.integrationTest.ts
@@ -499,15 +499,17 @@ flakySuite('FileSearchEngine', () => {
 		const folderQueries: IFolderQuery[] = [
 			{
 				folder: EXAMPLES_FIXTURES,
-				excludePattern: {
-					'**/anotherfile.txt': true
-				}
+				excludePattern: [{
+					pattern: { '**/anotherfile.txt': true }
+				}]
 			},
 			{
 				folder: MORE_FIXTURES,
-				excludePattern: {
-					'**/file.txt': true
-				}
+				excludePattern: [{
+					pattern: {
+						'**/file.txt': true
+					}
+				}]
 			}
 		];
 
@@ -755,7 +757,9 @@ flakySuite('FileWalker', () => {
 		const folderQueries: IFolderQuery[] = [
 			{
 				folder: URI.file(TEST_FIXTURES),
-				excludePattern: { '**/subfolder': true }
+				excludePattern: [{
+					pattern: { '**/subfolder': true }
+				}]
 			}
 		];
 
diff --git a/src/vs/workbench/services/search/test/node/textSearch.integrationTest.ts b/src/vs/workbench/services/search/test/node/textSearch.integrationTest.ts
index 503b314ffbe..d0de44585b9 100644
--- a/src/vs/workbench/services/search/test/node/textSearch.integrationTest.ts
+++ b/src/vs/workbench/services/search/test/node/textSearch.integrationTest.ts
@@ -291,7 +291,11 @@ flakySuite('TextSearch-integration', function () {
 		const config: ITextQuery = {
 			type: QueryType.Text,
 			folderQueries: [
-				{ folder: URI.file(EXAMPLES_FIXTURES), excludePattern: makeExpression('**/e*.js') },
+				{
+					folder: URI.file(EXAMPLES_FIXTURES), excludePattern: [{
+						pattern: makeExpression('**/e*.js')
+					}]
+				},
 				{ folder: URI.file(MORE_FIXTURES) }
 			],
 			contentPattern: { pattern: 'e' }
@@ -308,7 +312,7 @@ flakySuite('TextSearch-integration', function () {
 		};
 
 		return doSearchTest(config, 1).then(results => {
-			const matchRange = (<ITextSearchMatch>results[0].results![0]).ranges;
+			const matchRange = (<ITextSearchMatch>results[0].results![0]).rangeLocations.map(e => e.source);
 			assert.deepStrictEqual(matchRange, [{
 				startLineNumber: 0,
 				startColumn: 1,
@@ -329,7 +333,7 @@ flakySuite('TextSearch-integration', function () {
 			assert.strictEqual(results.length, 3);
 			assert.strictEqual(results[0].results!.length, 1);
 			const match = <ITextSearchMatch>results[0].results![0];
-			assert.strictEqual((<ISearchRange[]>match.ranges).length, 5);
+			assert.strictEqual((<ISearchRange[]>match.rangeLocations.map(e => e.source)).length, 5);
 		});
 	});
 
@@ -338,19 +342,16 @@ flakySuite('TextSearch-integration', function () {
 			type: QueryType.Text,
 			folderQueries: ROOT_FOLDER_QUERY,
 			contentPattern: { pattern: 'compiler.typeCheck();' },
-			beforeContext: 1,
-			afterContext: 2
+			surroundingContext: 1,
 		};
 
-		return doSearchTest(config, 4).then(results => {
-			assert.strictEqual(results.length, 4);
+		return doSearchTest(config, 3).then(results => {
+			assert.strictEqual(results.length, 3);
 			assert.strictEqual((<ITextSearchContext>results[0].results![0]).lineNumber, 24);
 			assert.strictEqual((<ITextSearchContext>results[0].results![0]).text, '        compiler.addUnit(prog,"input.ts");');
 			// assert.strictEqual((<ITextSearchMatch>results[1].results[0]).preview.text, '        compiler.typeCheck();\n'); // See https://github.com/BurntSushi/ripgrep/issues/1095
 			assert.strictEqual((<ITextSearchContext>results[2].results![0]).lineNumber, 26);
 			assert.strictEqual((<ITextSearchContext>results[2].results![0]).text, '        compiler.emit();');
-			assert.strictEqual((<ITextSearchContext>results[3].results![0]).lineNumber, 27);
-			assert.strictEqual((<ITextSearchContext>results[3].results![0]).text, '');
 		});
 	});
 
diff --git a/src/vs/workbench/services/search/test/node/textSearchManager.test.ts b/src/vs/workbench/services/search/test/node/textSearchManager.test.ts
index 1eb64535a8d..59f3750bf86 100644
--- a/src/vs/workbench/services/search/test/node/textSearchManager.test.ts
+++ b/src/vs/workbench/services/search/test/node/textSearchManager.test.ts
@@ -9,15 +9,15 @@ import { URI } from 'vs/base/common/uri';
 import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
 import { Progress } from 'vs/platform/progress/common/progress';
 import { ITextQuery, QueryType } from 'vs/workbench/services/search/common/search';
-import { ProviderResult, TextSearchComplete, TextSearchOptions, TextSearchProvider, TextSearchQuery, TextSearchResult } from 'vs/workbench/services/search/common/searchExtTypes';
+import { ProviderResult, TextSearchCompleteNew, TextSearchProviderOptions, TextSearchProviderNew, TextSearchQueryNew, TextSearchResultNew } from 'vs/workbench/services/search/common/searchExtTypes';
 import { NativeTextSearchManager } from 'vs/workbench/services/search/node/textSearchManager';
 
 suite('NativeTextSearchManager', () => {
 	test('fixes encoding', async () => {
 		let correctEncoding = false;
-		const provider: TextSearchProvider = {
-			provideTextSearchResults(query: TextSearchQuery, options: TextSearchOptions, progress: Progress<TextSearchResult>, token: CancellationToken): ProviderResult<TextSearchComplete> {
-				correctEncoding = options.encoding === 'windows-1252';
+		const provider: TextSearchProviderNew = {
+			provideTextSearchResults(query: TextSearchQueryNew, options: TextSearchProviderOptions, progress: Progress<TextSearchResultNew>, token: CancellationToken): ProviderResult<TextSearchCompleteNew> {
+				correctEncoding = options.folderOptions[0].encoding === 'windows-1252';
 
 				return null;
 			}
diff --git a/src/vs/workbench/services/search/worker/localFileSearch.esm.ts b/src/vs/workbench/services/search/worker/localFileSearch.esm.ts
new file mode 100644
index 00000000000..fadd727c58f
--- /dev/null
+++ b/src/vs/workbench/services/search/worker/localFileSearch.esm.ts
@@ -0,0 +1,9 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { bootstrapSimpleWorker } from 'vs/base/common/worker/simpleWorkerBootstrap';
+import { create } from 'vs/workbench/services/search/worker/localFileSearch';
+
+bootstrapSimpleWorker(create);
diff --git a/src/vs/workbench/services/search/worker/localFileSearch.ts b/src/vs/workbench/services/search/worker/localFileSearch.ts
index a49661f0285..a432afb5e55 100644
--- a/src/vs/workbench/services/search/worker/localFileSearch.ts
+++ b/src/vs/workbench/services/search/worker/localFileSearch.ts
@@ -5,8 +5,8 @@
 
 import * as glob from 'vs/base/common/glob';
 import { UriComponents, URI } from 'vs/base/common/uri';
-import { IRequestHandler } from 'vs/base/common/worker/simpleWorker';
-import { ILocalFileSearchSimpleWorker, ILocalFileSearchSimpleWorkerHost, IWorkerFileSearchComplete, IWorkerFileSystemDirectoryHandle, IWorkerFileSystemHandle, IWorkerTextSearchComplete } from 'vs/workbench/services/search/common/localFileSearchWorkerTypes';
+import { IRequestHandler, IWorkerServer } from 'vs/base/common/worker/simpleWorker';
+import { ILocalFileSearchSimpleWorker, LocalFileSearchSimpleWorkerHost, IWorkerFileSearchComplete, IWorkerFileSystemDirectoryHandle, IWorkerFileSystemHandle, IWorkerTextSearchComplete } from 'vs/workbench/services/search/common/localFileSearchWorkerTypes';
 import { ICommonQueryProps, IFileMatch, IFileQueryProps, IFolderQuery, IPatternInfo, ITextQueryProps, } from 'vs/workbench/services/search/common/search';
 import * as paths from 'vs/base/common/path';
 import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
@@ -15,6 +15,7 @@ import { IgnoreFile } from 'vs/workbench/services/search/common/ignoreFile';
 import { createRegExp } from 'vs/base/common/strings';
 import { Promises } from 'vs/base/common/async';
 import { ExtUri } from 'vs/base/common/resources';
+import { revive } from 'vs/base/common/marshalling';
 
 const PERF = false;
 
@@ -48,21 +49,24 @@ const time = async <T>(name: string, task: () => Promise<T> | T) => {
 };
 
 /**
- * Called on the worker side
- * @internal
+ * Defines the worker entry point. Must be exported and named `create`.
+ * @skipMangle
  */
-export function create(host: ILocalFileSearchSimpleWorkerHost): IRequestHandler {
-	return new LocalFileSearchSimpleWorker(host);
+export function create(workerServer: IWorkerServer): IRequestHandler {
+	return new LocalFileSearchSimpleWorker(workerServer);
 }
 
 export class LocalFileSearchSimpleWorker implements ILocalFileSearchSimpleWorker, IRequestHandler {
 	_requestHandlerBrand: any;
 
+	private readonly host: LocalFileSearchSimpleWorkerHost;
 	cancellationTokens: Map<number, CancellationTokenSource> = new Map();
 
-	constructor(private host: ILocalFileSearchSimpleWorkerHost) { }
+	constructor(workerServer: IWorkerServer) {
+		this.host = LocalFileSearchSimpleWorkerHost.getChannel(workerServer);
+	}
 
-	cancelQuery(queryId: number): void {
+	$cancelQuery(queryId: number): void {
 		this.cancellationTokens.get(queryId)?.cancel();
 	}
 
@@ -72,7 +76,7 @@ export class LocalFileSearchSimpleWorker implements ILocalFileSearchSimpleWorker
 		return source;
 	}
 
-	async listDirectory(handle: IWorkerFileSystemDirectoryHandle, query: IFileQueryProps<UriComponents>, folderQuery: IFolderQuery<UriComponents>, ignorePathCasing: boolean, queryId: number): Promise<IWorkerFileSearchComplete> {
+	async $listDirectory(handle: IWorkerFileSystemDirectoryHandle, query: IFileQueryProps<UriComponents>, folderQuery: IFolderQuery<UriComponents>, ignorePathCasing: boolean, queryId: number): Promise<IWorkerFileSearchComplete> {
 		const revivedFolderQuery = reviveFolderQuery(folderQuery);
 		const extUri = new ExtUri(() => ignorePathCasing);
 
@@ -107,7 +111,7 @@ export class LocalFileSearchSimpleWorker implements ILocalFileSearchSimpleWorker
 		};
 	}
 
-	async searchDirectory(handle: IWorkerFileSystemDirectoryHandle, query: ITextQueryProps<UriComponents>, folderQuery: IFolderQuery<UriComponents>, ignorePathCasing: boolean, queryId: number): Promise<IWorkerTextSearchComplete> {
+	async $searchDirectory(handle: IWorkerFileSystemDirectoryHandle, query: ITextQueryProps<UriComponents>, folderQuery: IFolderQuery<UriComponents>, ignorePathCasing: boolean, queryId: number): Promise<IWorkerTextSearchComplete> {
 		const revivedQuery = reviveFolderQuery(folderQuery);
 		const extUri = new ExtUri(() => ignorePathCasing);
 
@@ -138,8 +142,7 @@ export class LocalFileSearchSimpleWorker implements ILocalFileSearchSimpleWorker
 
 				const bytes = new Uint8Array(contents);
 				const fileResults = getFileResults(bytes, pattern, {
-					afterContext: query.afterContext ?? 0,
-					beforeContext: query.beforeContext ?? 0,
+					surroundingContext: query.surroundingContext ?? 0,
 					previewOptions: query.previewOptions,
 					remainingResultQuota: query.maxResults ? (query.maxResults - resultCount) : 10000,
 				});
@@ -153,7 +156,7 @@ export class LocalFileSearchSimpleWorker implements ILocalFileSearchSimpleWorker
 						resource: URI.joinPath(revivedQuery.folder, file.path),
 						results: fileResults,
 					};
-					this.host.sendTextSearchMatch(match, queryId);
+					this.host.$sendTextSearchMatch(match, queryId);
 					results.push(match);
 				}
 			};
@@ -176,12 +179,18 @@ export class LocalFileSearchSimpleWorker implements ILocalFileSearchSimpleWorker
 
 	private async walkFolderQuery(handle: IWorkerFileSystemDirectoryHandle, queryProps: ICommonQueryProps<URI>, folderQuery: IFolderQuery<URI>, extUri: ExtUri, onFile: (file: FileNode) => any, token: CancellationToken): Promise<void> {
 
-		const folderExcludes = glob.parse(folderQuery.excludePattern ?? {}, { trimForExclusions: true }) as glob.ParsedExpression;
+		const folderExcludes = folderQuery.excludePattern?.map(excludePattern => glob.parse(excludePattern.pattern ?? {}, { trimForExclusions: true }) as glob.ParsedExpression);
+
+		const evalFolderExcludes = (path: string, basename: string, hasSibling: (query: string) => boolean) => {
+			return folderExcludes?.some(folderExclude => {
+				return folderExclude(path, basename, hasSibling);
+			});
 
+		};
 		// For folders, only check if the folder is explicitly excluded so walking continues.
 		const isFolderExcluded = (path: string, basename: string, hasSibling: (query: string) => boolean) => {
 			path = path.slice(1);
-			if (folderExcludes(path, basename, hasSibling)) { return true; }
+			if (evalFolderExcludes(path, basename, hasSibling)) { return true; }
 			if (pathExcludedInQuery(queryProps, path)) { return true; }
 			return false;
 		};
@@ -189,7 +198,7 @@ export class LocalFileSearchSimpleWorker implements ILocalFileSearchSimpleWorker
 		// For files ensure the full check takes place.
 		const isFileIncluded = (path: string, basename: string, hasSibling: (query: string) => boolean) => {
 			path = path.slice(1);
-			if (folderExcludes(path, basename, hasSibling)) { return false; }
+			if (evalFolderExcludes(path, basename, hasSibling)) { return false; }
 			if (!pathIncludedInQuery(queryProps, path, extUri)) { return false; }
 			return true;
 		};
@@ -303,10 +312,7 @@ function createSearchRegExp(options: IPatternInfo): RegExp {
 }
 
 function reviveFolderQuery(folderQuery: IFolderQuery<UriComponents>): IFolderQuery<URI> {
-	return {
-		...folderQuery,
-		folder: URI.revive(folderQuery.folder),
-	};
+	return revive(folderQuery);
 }
 
 function reviveQueryProps(queryProps: ICommonQueryProps<UriComponents>): ICommonQueryProps<URI> {
diff --git a/src/vs/workbench/services/storage/browser/storageService.ts b/src/vs/workbench/services/storage/browser/storageService.ts
index a77c2db9446..4d2d0815bb8 100644
--- a/src/vs/workbench/services/storage/browser/storageService.ts
+++ b/src/vs/workbench/services/storage/browser/storageService.ts
@@ -4,7 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { BroadcastDataChannel } from 'vs/base/browser/broadcast';
-import { isSafari } from 'vs/base/browser/browser';
 import { getActiveWindow } from 'vs/base/browser/dom';
 import { IndexedDB } from 'vs/base/browser/indexedDB';
 import { DeferredPromise, Promises } from 'vs/base/common/async';
@@ -208,17 +207,43 @@ export class BrowserStorageService extends AbstractStorageService {
 		//
 		// On all other browsers, we keep the databases opened because
 		// we expect data to be written when the unload happens.
-		if (isSafari) {
-			this.applicationStorage?.close();
-			this.profileStorageDatabase?.close();
-			this.workspaceStorageDatabase?.close();
-		}
+		// --- Start PWB: Remove isSafari check
+		this.applicationStorage?.close();
+		this.profileStorageDatabase?.close();
+		this.workspaceStorageDatabase?.close();
+		// --- End PWB
 
 		// Always dispose to ensure that no timeouts or callbacks
 		// get triggered in this phase.
 		this.dispose();
 	}
 
+	// --- Start PWB: Clear browser history
+	openConnections(): void {
+		if (this.applicationStorageDatabase instanceof IndexedDBStorageDatabase) {
+			this.applicationStorageDatabase.pwbOpen();
+		}
+		if (this.profileStorageDatabase instanceof IndexedDBStorageDatabase) {
+			this.profileStorageDatabase.pwbOpen();
+		}
+		if (this.workspaceStorageDatabase instanceof IndexedDBStorageDatabase) {
+			this.workspaceStorageDatabase.pwbOpen();
+		}
+	}
+
+	closeConnections(): void {
+		if (this.applicationStorageDatabase instanceof IndexedDBStorageDatabase) {
+			this.applicationStorageDatabase.pwbClose();
+		}
+		if (this.profileStorageDatabase instanceof IndexedDBStorageDatabase) {
+			this.profileStorageDatabase.pwbClose();
+		}
+		if (this.workspaceStorageDatabase instanceof IndexedDBStorageDatabase) {
+			this.workspaceStorageDatabase.pwbClose();
+		}
+	}
+	// --- End PWB: Clear browser history
+
 	async clear(): Promise<void> {
 
 		// Clear key/values
@@ -429,6 +454,9 @@ export class IndexedDBStorageDatabase extends Disposable implements IIndexedDBSt
 
 			return requests;
 		});
+		// --- Start PWB: Clear browser history
+		db.pwbAddToSessionSet(IndexedDB.PWB_CHANGED_CONNECTION_KEY);
+		// --- End PWB
 
 		return true;
 	}
@@ -437,6 +465,19 @@ export class IndexedDBStorageDatabase extends Disposable implements IIndexedDBSt
 		// not suported in IndexedDB
 	}
 
+	// --- Start PWB: Clear browser history
+	async pwbOpen(): Promise<void> {
+		const db = await this.whenConnected;
+		await db.pwbOpen([IndexedDBStorageDatabase.STORAGE_OBJECT_STORE]);
+	}
+
+	async pwbClose(): Promise<void> {
+		const db = await this.whenConnected;
+		await this.pendingUpdate;
+		db.pwbClose();
+	}
+	// --- End PWB
+
 	async close(): Promise<void> {
 		const db = await this.whenConnected;
 
@@ -451,5 +492,8 @@ export class IndexedDBStorageDatabase extends Disposable implements IIndexedDBSt
 		const db = await this.whenConnected;
 
 		await db.runInTransaction(IndexedDBStorageDatabase.STORAGE_OBJECT_STORE, 'readwrite', objectStore => objectStore.clear());
+		// --- Start PWB: Clear browser history
+		db.pwbAddToSessionSet(IndexedDB.PWB_CHANGED_CONNECTION_KEY);
+		// --- End PWB
 	}
 }
diff --git a/src/vs/workbench/services/suggest/browser/simpleCompletionItem.ts b/src/vs/workbench/services/suggest/browser/simpleCompletionItem.ts
index 959d5f42fec..df8843389f6 100644
--- a/src/vs/workbench/services/suggest/browser/simpleCompletionItem.ts
+++ b/src/vs/workbench/services/suggest/browser/simpleCompletionItem.ts
@@ -29,6 +29,10 @@ export interface ISimpleCompletion {
 	 * Whether the completion is a directory.
 	 */
 	isDirectory?: boolean;
+	/**
+	 * Whether the completion is a keyword.
+	 */
+	isKeyword?: boolean;
 }
 
 export class SimpleCompletionItem {
diff --git a/src/vs/workbench/services/suggest/browser/simpleCompletionModel.ts b/src/vs/workbench/services/suggest/browser/simpleCompletionModel.ts
index 12297a1f4ad..44976a6d182 100644
--- a/src/vs/workbench/services/suggest/browser/simpleCompletionModel.ts
+++ b/src/vs/workbench/services/suggest/browser/simpleCompletionModel.ts
@@ -182,8 +182,16 @@ export class SimpleCompletionModel {
 		}
 
 		this._filteredItems = target.sort((a, b) => {
-			// Sort first by the score
-			let score = b.score[0] - a.score[0];
+			// Keywords should always appear at the bottom when they are not an exact match
+			let score = 0;
+			if (a.completion.isKeyword && a.labelLow !== wordLow || b.completion.isKeyword && b.labelLow !== wordLow) {
+				score = (a.completion.isKeyword ? 1 : 0) - (b.completion.isKeyword ? 1 : 0);
+				if (score !== 0) {
+					return score;
+				}
+			}
+			// Sort by the score
+			score = b.score[0] - a.score[0];
 			if (score !== 0) {
 				return score;
 			}
@@ -219,11 +227,12 @@ export class SimpleCompletionModel {
 // File score boosts for specific file extensions on Windows. This only applies when the file is the
 // _first_ part of the command line.
 const fileExtScores = new Map<string, number>(isWindows ? [
-	// Pwsh
+	// Windows - .ps1 > .exe > .bat > .cmd. This is the command precedence when running the files
+	//           without an extension, tested manually in pwsh v7.4.4
 	['ps1', 0.09],
-	// Windows
-	['bat', 0.05],
-	['cmd', 0.05],
+	['exe', 0.08],
+	['bat', 0.07],
+	['cmd', 0.07],
 	// Non-Windows
 	['sh', -0.05],
 	['bash', -0.05],
@@ -239,6 +248,7 @@ const fileExtScores = new Map<string, number>(isWindows ? [
 	// Windows
 	['bat', -0.05],
 	['cmd', -0.05],
+	['exe', -0.05],
 	// Non-Windows
 	['sh', 0.05],
 	['bash', 0.05],
diff --git a/src/vs/workbench/services/suggest/browser/simpleSuggestWidget.ts b/src/vs/workbench/services/suggest/browser/simpleSuggestWidget.ts
index 5882c72b2c2..57169c29c0e 100644
--- a/src/vs/workbench/services/suggest/browser/simpleSuggestWidget.ts
+++ b/src/vs/workbench/services/suggest/browser/simpleSuggestWidget.ts
@@ -10,7 +10,7 @@ import { List } from 'vs/base/browser/ui/list/listWidget';
 import { ResizableHTMLElement } from 'vs/base/browser/ui/resizable/resizable';
 import { SimpleCompletionItem } from 'vs/workbench/services/suggest/browser/simpleCompletionItem';
 import { LineContext, SimpleCompletionModel } from 'vs/workbench/services/suggest/browser/simpleCompletionModel';
-import { SimpleSuggestWidgetItemRenderer } from 'vs/workbench/services/suggest/browser/simpleSuggestWidgetRenderer';
+import { SimpleSuggestWidgetItemRenderer, type ISimpleSuggestWidgetFontInfo } from 'vs/workbench/services/suggest/browser/simpleSuggestWidgetRenderer';
 import { TimeoutTimer } from 'vs/base/common/async';
 import { Emitter, Event } from 'vs/base/common/event';
 import { MutableDisposable, Disposable } from 'vs/base/common/lifecycle';
@@ -84,7 +84,7 @@ export class SimpleSuggestWidget extends Disposable {
 	constructor(
 		private readonly _container: HTMLElement,
 		private readonly _persistedSize: IPersistedWidgetSizeDelegate,
-		private readonly _getFontInfo: () => { fontFamily: string; fontSize: number; lineHeight: number; fontWeight: string; letterSpacing: number },
+		private readonly _getFontInfo: () => ISimpleSuggestWidgetFontInfo,
 		options: IWorkbenchSuggestWidgetOptions,
 		@IInstantiationService instantiationService: IInstantiationService
 	) {
diff --git a/src/vs/workbench/services/suggest/browser/simpleSuggestWidgetRenderer.ts b/src/vs/workbench/services/suggest/browser/simpleSuggestWidgetRenderer.ts
index 278f302bd38..6b7596ea291 100644
--- a/src/vs/workbench/services/suggest/browser/simpleSuggestWidgetRenderer.ts
+++ b/src/vs/workbench/services/suggest/browser/simpleSuggestWidgetRenderer.ts
@@ -42,6 +42,14 @@ export interface ISimpleSuggestionTemplateData {
 	readonly disposables: DisposableStore;
 }
 
+export interface ISimpleSuggestWidgetFontInfo {
+	fontFamily: string;
+	fontSize: number;
+	lineHeight: number;
+	fontWeight: string;
+	letterSpacing: number;
+}
+
 export class SimpleSuggestWidgetItemRenderer implements IListRenderer<SimpleCompletionItem, ISimpleSuggestionTemplateData> {
 
 	private readonly _onDidToggleDetails = new Emitter<void>();
@@ -49,7 +57,7 @@ export class SimpleSuggestWidgetItemRenderer implements IListRenderer<SimpleComp
 
 	readonly templateId = 'suggestion';
 
-	constructor(private readonly _getFontInfo: () => { fontFamily: string; fontSize: number; lineHeight: number; fontWeight: string; letterSpacing: number }) {
+	constructor(private readonly _getFontInfo: () => ISimpleSuggestWidgetFontInfo) {
 	}
 
 	dispose(): void {
diff --git a/src/vs/workbench/services/textMate/browser/backgroundTokenization/textMateWorkerTokenizerController.ts b/src/vs/workbench/services/textMate/browser/backgroundTokenization/textMateWorkerTokenizerController.ts
index 3695379f0e9..419a1320def 100644
--- a/src/vs/workbench/services/textMate/browser/backgroundTokenization/textMateWorkerTokenizerController.ts
+++ b/src/vs/workbench/services/textMate/browser/backgroundTokenization/textMateWorkerTokenizerController.ts
@@ -6,6 +6,7 @@
 import { importAMDNodeModule } from 'vs/amdX';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { IObservable, autorun, keepObserved } from 'vs/base/common/observable';
+import { Proxied } from 'vs/base/common/worker/simpleWorker';
 import { countEOL } from 'vs/editor/common/core/eolCounter';
 import { LineRange } from 'vs/editor/common/core/lineRange';
 import { Range } from 'vs/editor/common/core/range';
@@ -39,7 +40,7 @@ export class TextMateWorkerTokenizerController extends Disposable {
 
 	constructor(
 		private readonly _model: ITextModel,
-		private readonly _worker: TextMateTokenizationWorker,
+		private readonly _worker: Proxied<TextMateTokenizationWorker>,
 		private readonly _languageIdCodec: ILanguageIdCodec,
 		private readonly _backgroundTokenizationStore: IBackgroundTokenizationStore,
 		private readonly _configurationService: IConfigurationService,
@@ -56,7 +57,7 @@ export class TextMateWorkerTokenizerController extends Disposable {
 					changes: changesToString(e.changes),
 				});
 			}
-			this._worker.acceptModelChanged(this.controllerId, e);
+			this._worker.$acceptModelChanged(this.controllerId, e);
 			this._pendingChanges.push(e);
 		}));
 
@@ -64,7 +65,7 @@ export class TextMateWorkerTokenizerController extends Disposable {
 			const languageId = this._model.getLanguageId();
 			const encodedLanguageId =
 				this._languageIdCodec.encodeLanguageId(languageId);
-			this._worker.acceptModelLanguageChanged(
+			this._worker.$acceptModelLanguageChanged(
 				this.controllerId,
 				languageId,
 				encodedLanguageId
@@ -73,7 +74,7 @@ export class TextMateWorkerTokenizerController extends Disposable {
 
 		const languageId = this._model.getLanguageId();
 		const encodedLanguageId = this._languageIdCodec.encodeLanguageId(languageId);
-		this._worker.acceptNewModel({
+		this._worker.$acceptNewModel({
 			uri: this._model.uri,
 			versionId: this._model.getVersionId(),
 			lines: this._model.getLinesContent(),
@@ -87,17 +88,17 @@ export class TextMateWorkerTokenizerController extends Disposable {
 		this._register(autorun(reader => {
 			/** @description update maxTokenizationLineLength */
 			const maxTokenizationLineLength = this._maxTokenizationLineLength.read(reader);
-			this._worker.acceptMaxTokenizationLineLength(this.controllerId, maxTokenizationLineLength);
+			this._worker.$acceptMaxTokenizationLineLength(this.controllerId, maxTokenizationLineLength);
 		}));
 	}
 
 	public override dispose(): void {
 		super.dispose();
-		this._worker.acceptRemovedModel(this.controllerId);
+		this._worker.$acceptRemovedModel(this.controllerId);
 	}
 
 	public requestTokens(startLineNumber: number, endLineNumberExclusive: number): void {
-		this._worker.retokenize(this.controllerId, startLineNumber, endLineNumberExclusive);
+		this._worker.$retokenize(this.controllerId, startLineNumber, endLineNumberExclusive);
 	}
 
 	/**
diff --git a/src/vs/workbench/services/textMate/browser/backgroundTokenization/threadedBackgroundTokenizerFactory.ts b/src/vs/workbench/services/textMate/browser/backgroundTokenization/threadedBackgroundTokenizerFactory.ts
index 9558ffdd75e..d1f658a0fcb 100644
--- a/src/vs/workbench/services/textMate/browser/backgroundTokenization/threadedBackgroundTokenizerFactory.ts
+++ b/src/vs/workbench/services/textMate/browser/backgroundTokenization/threadedBackgroundTokenizerFactory.ts
@@ -3,33 +3,34 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { canASAR } from 'vs/base/common/amd';
 import { DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
 import { AppResourcePath, FileAccess, nodeModulesAsarPath, nodeModulesPath } from 'vs/base/common/network';
 import { IObservable } from 'vs/base/common/observable';
 import { isWeb } from 'vs/base/common/platform';
 import { URI, UriComponents } from 'vs/base/common/uri';
-import { MonacoWebWorker, createWebWorker } from 'vs/editor/browser/services/webWorker';
 import { IBackgroundTokenizationStore, IBackgroundTokenizer } from 'vs/editor/common/languages';
 import { ILanguageService } from 'vs/editor/common/languages/language';
-import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
 import { ITextModel } from 'vs/editor/common/model';
-import { IModelService } from 'vs/editor/common/services/model';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { IExtensionResourceLoaderService } from 'vs/platform/extensionResourceLoader/common/extensionResourceLoader';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { ICreateData, ITextMateWorkerHost, StateDeltas, TextMateTokenizationWorker } from 'vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateTokenizationWorker.worker';
+import { ICreateData, StateDeltas, TextMateTokenizationWorker } from 'vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateTokenizationWorker.worker';
+import { TextMateWorkerHost } from './worker/textMateWorkerHost';
 import { TextMateWorkerTokenizerController } from 'vs/workbench/services/textMate/browser/backgroundTokenization/textMateWorkerTokenizerController';
 import { IValidGrammarDefinition } from 'vs/workbench/services/textMate/common/TMScopeRegistry';
 import type { IRawTheme } from 'vscode-textmate';
+import { createWebWorker } from 'vs/base/browser/defaultWorkerFactory';
+import { IWorkerClient, Proxied } from 'vs/base/common/worker/simpleWorker';
 
 export class ThreadedBackgroundTokenizerFactory implements IDisposable {
 	private static _reportedMismatchingTokens = false;
 
-	private _workerProxyPromise: Promise<TextMateTokenizationWorker | null> | null = null;
-	private _worker: MonacoWebWorker<TextMateTokenizationWorker> | null = null;
-	private _workerProxy: TextMateTokenizationWorker | null = null;
+	private _workerProxyPromise: Promise<Proxied<TextMateTokenizationWorker> | null> | null = null;
+	private _worker: IWorkerClient<TextMateTokenizationWorker> | null = null;
+	private _workerProxy: Proxied<TextMateTokenizationWorker> | null = null;
 	private readonly _workerTokenizerControllers = new Map</* backgroundTokenizerId */number, TextMateWorkerTokenizerController>();
 
 	private _currentTheme: IRawTheme | null = null;
@@ -40,8 +41,6 @@ export class ThreadedBackgroundTokenizerFactory implements IDisposable {
 		private readonly _reportTokenizationTime: (timeMs: number, languageId: string, sourceExtensionId: string | undefined, lineLength: number, isRandomSample: boolean) => void,
 		private readonly _shouldTokenizeAsync: () => boolean,
 		@IExtensionResourceLoaderService private readonly _extensionResourceLoaderService: IExtensionResourceLoaderService,
-		@IModelService private readonly _modelService: IModelService,
-		@ILanguageConfigurationService private readonly _languageConfigurationService: ILanguageConfigurationService,
 		@IConfigurationService private readonly _configurationService: IConfigurationService,
 		@ILanguageService private readonly _languageService: ILanguageService,
 		@IEnvironmentService private readonly _environmentService: IEnvironmentService,
@@ -115,43 +114,39 @@ export class ThreadedBackgroundTokenizerFactory implements IDisposable {
 		this._currentTheme = theme;
 		this._currentTokenColorMap = colorMap;
 		if (this._currentTheme && this._currentTokenColorMap && this._workerProxy) {
-			this._workerProxy.acceptTheme(this._currentTheme, this._currentTokenColorMap);
+			this._workerProxy.$acceptTheme(this._currentTheme, this._currentTokenColorMap);
 		}
 	}
 
-	private _getWorkerProxy(): Promise<TextMateTokenizationWorker | null> {
+	private _getWorkerProxy(): Promise<Proxied<TextMateTokenizationWorker> | null> {
 		if (!this._workerProxyPromise) {
 			this._workerProxyPromise = this._createWorkerProxy();
 		}
 		return this._workerProxyPromise;
 	}
 
-	private async _createWorkerProxy(): Promise<TextMateTokenizationWorker | null> {
-		const textmateModuleLocation: AppResourcePath = `${nodeModulesPath}/vscode-textmate`;
-		const textmateModuleLocationAsar: AppResourcePath = `${nodeModulesAsarPath}/vscode-textmate`;
+	private async _createWorkerProxy(): Promise<Proxied<TextMateTokenizationWorker> | null> {
 		const onigurumaModuleLocation: AppResourcePath = `${nodeModulesPath}/vscode-oniguruma`;
 		const onigurumaModuleLocationAsar: AppResourcePath = `${nodeModulesAsarPath}/vscode-oniguruma`;
 
-		const useAsar = this._environmentService.isBuilt && !isWeb;
-		const textmateLocation: AppResourcePath = useAsar ? textmateModuleLocationAsar : textmateModuleLocation;
+		const useAsar = canASAR && this._environmentService.isBuilt && !isWeb;
 		const onigurumaLocation: AppResourcePath = useAsar ? onigurumaModuleLocationAsar : onigurumaModuleLocation;
-		const textmateMain: AppResourcePath = `${textmateLocation}/release/main.js`;
-		const onigurumaMain: AppResourcePath = `${onigurumaLocation}/release/main.js`;
 		const onigurumaWASM: AppResourcePath = `${onigurumaLocation}/release/onig.wasm`;
-		const uri = FileAccess.asBrowserUri(textmateMain).toString(true);
 
 		const createData: ICreateData = {
 			grammarDefinitions: this._grammarDefinitions,
-			textmateMainUri: uri,
-			onigurumaMainUri: FileAccess.asBrowserUri(onigurumaMain).toString(true),
 			onigurumaWASMUri: FileAccess.asBrowserUri(onigurumaWASM).toString(true),
 		};
-		const host: ITextMateWorkerHost = {
-			readFile: async (_resource: UriComponents): Promise<string> => {
+		const worker = this._worker = createWebWorker<TextMateTokenizationWorker>(
+			'vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateTokenizationWorker.worker',
+			'TextMateWorker'
+		);
+		TextMateWorkerHost.setChannel(worker, {
+			$readFile: async (_resource: UriComponents): Promise<string> => {
 				const resource = URI.revive(_resource);
 				return this._extensionResourceLoaderService.readExtensionResource(resource);
 			},
-			setTokensAndStates: async (controllerId: number, versionId: number, tokens: Uint8Array, lineEndStateDeltas: StateDeltas[]): Promise<void> => {
+			$setTokensAndStates: async (controllerId: number, versionId: number, tokens: Uint8Array, lineEndStateDeltas: StateDeltas[]): Promise<void> => {
 				const controller = this._workerTokenizerControllers.get(controllerId);
 				// When a model detaches, it is removed synchronously from the map.
 				// However, the worker might still be sending tokens for that model,
@@ -160,27 +155,21 @@ export class ThreadedBackgroundTokenizerFactory implements IDisposable {
 					controller.setTokensAndStates(controllerId, versionId, tokens, lineEndStateDeltas);
 				}
 			},
-			reportTokenizationTime: (timeMs: number, languageId: string, sourceExtensionId: string | undefined, lineLength: number, isRandomSample: boolean): void => {
+			$reportTokenizationTime: (timeMs: number, languageId: string, sourceExtensionId: string | undefined, lineLength: number, isRandomSample: boolean): void => {
 				this._reportTokenizationTime(timeMs, languageId, sourceExtensionId, lineLength, isRandomSample);
 			}
-		};
-		const worker = this._worker = createWebWorker<TextMateTokenizationWorker>(this._modelService, this._languageConfigurationService, {
-			createData,
-			label: 'textMateWorker',
-			moduleId: 'vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateTokenizationWorker.worker',
-			host,
 		});
-		const proxy = await worker.getProxy();
+		await worker.proxy.$init(createData);
 
 		if (this._worker !== worker) {
 			// disposed in the meantime
 			return null;
 		}
-		this._workerProxy = proxy;
+		this._workerProxy = worker.proxy;
 		if (this._currentTheme && this._currentTokenColorMap) {
-			this._workerProxy.acceptTheme(this._currentTheme, this._currentTokenColorMap);
+			this._workerProxy.$acceptTheme(this._currentTheme, this._currentTokenColorMap);
 		}
-		return proxy;
+		return worker.proxy;
 	}
 
 	private _disposeWorker(): void {
diff --git a/src/vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateTokenizationWorker.worker.esm.ts b/src/vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateTokenizationWorker.worker.esm.ts
new file mode 100644
index 00000000000..a96bd44b037
--- /dev/null
+++ b/src/vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateTokenizationWorker.worker.esm.ts
@@ -0,0 +1,9 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { create } from './textMateTokenizationWorker.worker';
+import { bootstrapSimpleWorker } from 'vs/base/common/worker/simpleWorkerBootstrap';
+
+bootstrapSimpleWorker(create);
diff --git a/src/vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateTokenizationWorker.worker.ts b/src/vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateTokenizationWorker.worker.ts
index 3974d642732..237f681f3bc 100644
--- a/src/vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateTokenizationWorker.worker.ts
+++ b/src/vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateTokenizationWorker.worker.ts
@@ -6,29 +6,24 @@
 import { URI, UriComponents } from 'vs/base/common/uri';
 import { LanguageId } from 'vs/editor/common/encodedTokenAttributes';
 import { IModelChangedEvent } from 'vs/editor/common/model/mirrorTextModel';
-import { IWorkerContext } from 'vs/editor/common/services/editorSimpleWorker';
 import { ICreateGrammarResult, TMGrammarFactory } from 'vs/workbench/services/textMate/common/TMGrammarFactory';
 import { IValidEmbeddedLanguagesMap, IValidGrammarDefinition, IValidTokenTypeMap } from 'vs/workbench/services/textMate/common/TMScopeRegistry';
 import type { IOnigLib, IRawTheme, StackDiff } from 'vscode-textmate';
 import { TextMateWorkerTokenizer } from './textMateWorkerTokenizer';
+import { importAMDNodeModule } from 'vs/amdX';
+import { IRequestHandler, IWorkerServer } from 'vs/base/common/worker/simpleWorker';
+import { TextMateWorkerHost } from './textMateWorkerHost';
 
 /**
  * Defines the worker entry point. Must be exported and named `create`.
+ * @skipMangle
  */
-export function create(ctx: IWorkerContext<ITextMateWorkerHost>, createData: ICreateData): TextMateTokenizationWorker {
-	return new TextMateTokenizationWorker(ctx, createData);
-}
-
-export interface ITextMateWorkerHost {
-	readFile(_resource: UriComponents): Promise<string>;
-	setTokensAndStates(controllerId: number, versionId: number, tokens: Uint8Array, lineEndStateDeltas: StateDeltas[]): Promise<void>;
-	reportTokenizationTime(timeMs: number, languageId: string, sourceExtensionId: string | undefined, lineLength: number, isRandomSample: boolean): void;
+export function create(workerServer: IWorkerServer): TextMateTokenizationWorker {
+	return new TextMateTokenizationWorker(workerServer);
 }
 
 export interface ICreateData {
 	grammarDefinitions: IValidGrammarDefinitionDTO[];
-	textmateMainUri: string;
-	onigurumaMainUri: string;
 	onigurumaWASMUri: string;
 }
 
@@ -50,17 +45,19 @@ export interface StateDeltas {
 	stateDeltas: (StackDiff | null)[];
 }
 
-export class TextMateTokenizationWorker {
-	private readonly _host: ITextMateWorkerHost;
+export class TextMateTokenizationWorker implements IRequestHandler {
+	_requestHandlerBrand: any;
+
+	private readonly _host: TextMateWorkerHost;
 	private readonly _models = new Map</* controllerId */ number, TextMateWorkerTokenizer>();
 	private readonly _grammarCache: Promise<ICreateGrammarResult>[] = [];
-	private readonly _grammarFactory: Promise<TMGrammarFactory | null>;
+	private _grammarFactory: Promise<TMGrammarFactory | null> = Promise.resolve(null);
+
+	constructor(workerServer: IWorkerServer) {
+		this._host = TextMateWorkerHost.getChannel(workerServer);
+	}
 
-	constructor(
-		ctx: IWorkerContext<ITextMateWorkerHost>,
-		private readonly _createData: ICreateData
-	) {
-		this._host = ctx.host;
+	public async $init(_createData: ICreateData): Promise<void> {
 		const grammarDefinitions = _createData.grammarDefinitions.map<IValidGrammarDefinition>((def) => {
 			return {
 				location: URI.revive(def.location),
@@ -74,14 +71,13 @@ export class TextMateTokenizationWorker {
 				sourceExtensionId: def.sourceExtensionId,
 			};
 		});
-		this._grammarFactory = this._loadTMGrammarFactory(grammarDefinitions);
+		this._grammarFactory = this._loadTMGrammarFactory(grammarDefinitions, _createData.onigurumaWASMUri);
 	}
 
-	private async _loadTMGrammarFactory(grammarDefinitions: IValidGrammarDefinition[]): Promise<TMGrammarFactory> {
-		const uri = this._createData.textmateMainUri;
-		const vscodeTextmate = await import(uri);
-		const vscodeOniguruma = await import(this._createData.onigurumaMainUri);
-		const response = await fetch(this._createData.onigurumaWASMUri);
+	private async _loadTMGrammarFactory(grammarDefinitions: IValidGrammarDefinition[], onigurumaWASMUri: string): Promise<TMGrammarFactory> {
+		const vscodeTextmate = await importAMDNodeModule<typeof import('vscode-textmate')>('vscode-textmate', 'release/main.js');
+		const vscodeOniguruma = await importAMDNodeModule<typeof import('vscode-oniguruma')>('vscode-oniguruma', 'release/main.js');
+		const response = await fetch(onigurumaWASMUri);
 
 		// Using the response directly only works if the server sets the MIME type 'application/wasm'.
 		// Otherwise, a TypeError is thrown when using the streaming compiler.
@@ -97,13 +93,13 @@ export class TextMateTokenizationWorker {
 		return new TMGrammarFactory({
 			logTrace: (msg: string) => {/* console.log(msg) */ },
 			logError: (msg: string, err: any) => console.error(msg, err),
-			readFile: (resource: URI) => this._host.readFile(resource)
+			readFile: (resource: URI) => this._host.$readFile(resource)
 		}, grammarDefinitions, vscodeTextmate, onigLib);
 	}
 
 	// These methods are called by the renderer
 
-	public acceptNewModel(data: IRawModelData): void {
+	public $acceptNewModel(data: IRawModelData): void {
 		const uri = URI.revive(data.uri);
 		const that = this;
 		this._models.set(data.controllerId, new TextMateWorkerTokenizer(uri, data.lines, data.EOL, data.versionId, {
@@ -118,27 +114,27 @@ export class TextMateTokenizationWorker {
 				return that._grammarCache[encodedLanguageId];
 			},
 			setTokensAndStates(versionId: number, tokens: Uint8Array, stateDeltas: StateDeltas[]): void {
-				that._host.setTokensAndStates(data.controllerId, versionId, tokens, stateDeltas);
+				that._host.$setTokensAndStates(data.controllerId, versionId, tokens, stateDeltas);
 			},
 			reportTokenizationTime(timeMs: number, languageId: string, sourceExtensionId: string | undefined, lineLength: number, isRandomSample: boolean): void {
-				that._host.reportTokenizationTime(timeMs, languageId, sourceExtensionId, lineLength, isRandomSample);
+				that._host.$reportTokenizationTime(timeMs, languageId, sourceExtensionId, lineLength, isRandomSample);
 			},
 		}, data.languageId, data.encodedLanguageId, data.maxTokenizationLineLength));
 	}
 
-	public acceptModelChanged(controllerId: number, e: IModelChangedEvent): void {
+	public $acceptModelChanged(controllerId: number, e: IModelChangedEvent): void {
 		this._models.get(controllerId)!.onEvents(e);
 	}
 
-	public retokenize(controllerId: number, startLineNumber: number, endLineNumberExclusive: number): void {
+	public $retokenize(controllerId: number, startLineNumber: number, endLineNumberExclusive: number): void {
 		this._models.get(controllerId)!.retokenize(startLineNumber, endLineNumberExclusive);
 	}
 
-	public acceptModelLanguageChanged(controllerId: number, newLanguageId: string, newEncodedLanguageId: LanguageId): void {
+	public $acceptModelLanguageChanged(controllerId: number, newLanguageId: string, newEncodedLanguageId: LanguageId): void {
 		this._models.get(controllerId)!.onLanguageId(newLanguageId, newEncodedLanguageId);
 	}
 
-	public acceptRemovedModel(controllerId: number): void {
+	public $acceptRemovedModel(controllerId: number): void {
 		const model = this._models.get(controllerId);
 		if (model) {
 			model.dispose();
@@ -146,12 +142,12 @@ export class TextMateTokenizationWorker {
 		}
 	}
 
-	public async acceptTheme(theme: IRawTheme, colorMap: string[]): Promise<void> {
+	public async $acceptTheme(theme: IRawTheme, colorMap: string[]): Promise<void> {
 		const grammarFactory = await this._grammarFactory;
 		grammarFactory?.setTheme(theme, colorMap);
 	}
 
-	public acceptMaxTokenizationLineLength(controllerId: number, value: number): void {
+	public $acceptMaxTokenizationLineLength(controllerId: number, value: number): void {
 		this._models.get(controllerId)!.acceptMaxTokenizationLineLength(value);
 	}
 }
diff --git a/src/vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateWorkerHost.ts b/src/vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateWorkerHost.ts
new file mode 100644
index 00000000000..b2eb8549e99
--- /dev/null
+++ b/src/vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateWorkerHost.ts
@@ -0,0 +1,22 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { UriComponents } from 'vs/base/common/uri';
+import { IWorkerServer, IWorkerClient } from 'vs/base/common/worker/simpleWorker';
+import { StateDeltas } from 'vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateTokenizationWorker.worker';
+
+export abstract class TextMateWorkerHost {
+	public static CHANNEL_NAME = 'textMateWorkerHost';
+	public static getChannel(workerServer: IWorkerServer): TextMateWorkerHost {
+		return workerServer.getChannel<TextMateWorkerHost>(TextMateWorkerHost.CHANNEL_NAME);
+	}
+	public static setChannel(workerClient: IWorkerClient<any>, obj: TextMateWorkerHost): void {
+		workerClient.setChannel<TextMateWorkerHost>(TextMateWorkerHost.CHANNEL_NAME, obj);
+	}
+
+	abstract $readFile(_resource: UriComponents): Promise<string>;
+	abstract $setTokensAndStates(controllerId: number, versionId: number, tokens: Uint8Array, lineEndStateDeltas: StateDeltas[]): Promise<void>;
+	abstract $reportTokenizationTime(timeMs: number, languageId: string, sourceExtensionId: string | undefined, lineLength: number, isRandomSample: boolean): void;
+}
diff --git a/src/vs/workbench/services/textMate/browser/textMateTokenizationFeatureImpl.ts b/src/vs/workbench/services/textMate/browser/textMateTokenizationFeatureImpl.ts
index 02eef664f6f..734d72a998b 100644
--- a/src/vs/workbench/services/textMate/browser/textMateTokenizationFeatureImpl.ts
+++ b/src/vs/workbench/services/textMate/browser/textMateTokenizationFeatureImpl.ts
@@ -3,7 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { importAMDNodeModule } from 'vs/amdX';
+import { importAMDNodeModule, resolveAmdNodeModulePath } from 'vs/amdX';
+import { canASAR, isESM } from 'vs/base/common/amd';
 import * as dom from 'vs/base/browser/dom';
 import { equals as equalArray } from 'vs/base/common/arrays';
 import { Color } from 'vs/base/common/color';
@@ -371,13 +372,15 @@ export class TextMateTokenizationFeature extends Disposable implements ITextMate
 
 	private async _loadVSCodeOnigurumaWASM(): Promise<Response | ArrayBuffer> {
 		if (isWeb) {
-			const response = await fetch(FileAccess.asBrowserUri('vscode-oniguruma/../onig.wasm').toString(true));
+			const response = await fetch(isESM
+				? resolveAmdNodeModulePath('vscode-oniguruma', 'release/onig.wasm')
+				: FileAccess.asBrowserUri('vscode-oniguruma/../onig.wasm').toString(true));
 			// Using the response directly only works if the server sets the MIME type 'application/wasm'.
 			// Otherwise, a TypeError is thrown when using the streaming compiler.
 			// We therefore use the non-streaming compiler :(.
 			return await response.arrayBuffer();
 		} else {
-			const response = await fetch(this._environmentService.isBuilt
+			const response = await fetch(canASAR && this._environmentService.isBuilt
 				? FileAccess.asBrowserUri(`${nodeModulesAsarUnpackedPath}/vscode-oniguruma/release/onig.wasm`).toString(true)
 				: FileAccess.asBrowserUri(`${nodeModulesPath}/vscode-oniguruma/release/onig.wasm`).toString(true));
 			return response;
diff --git a/src/vs/workbench/services/textfile/common/encoding.ts b/src/vs/workbench/services/textfile/common/encoding.ts
index bae27136de4..537ec42d3dc 100644
--- a/src/vs/workbench/services/textfile/common/encoding.ts
+++ b/src/vs/workbench/services/textfile/common/encoding.ts
@@ -8,6 +8,7 @@ import { VSBuffer, VSBufferReadable, VSBufferReadableStream } from 'vs/base/comm
 import { importAMDNodeModule } from 'vs/amdX';
 import { CancellationTokenSource } from 'vs/base/common/cancellation';
 import { coalesce } from 'vs/base/common/arrays';
+import { isESM } from 'vs/base/common/amd';
 
 export const UTF8 = 'utf8';
 export const UTF8_with_bom = 'utf8bom';
@@ -320,7 +321,11 @@ const IGNORE_ENCODINGS = ['ascii', 'utf-16', 'utf-32'];
  * Guesses the encoding from buffer.
  */
 async function guessEncodingByBuffer(buffer: VSBuffer, candidateGuessEncodings?: string[]): Promise<string | null> {
-	const jschardet = await importAMDNodeModule<typeof import('jschardet')>('jschardet', 'dist/jschardet.min.js');
+
+	// TODO@bpasero TODO@esm: this used to be `dist/jschardet.min.js`, but we are running into an issue that
+	// https://github.com/aadsm/jschardet/pull/96 mitigates. Long-term we should just add minification
+	// of dependencies into our build process so that we do not depend on how others are doing it.
+	const jschardet = await importAMDNodeModule<typeof import('jschardet')>('jschardet', isESM ? 'dist/jschardet.js' : 'dist/jschardet.min.js');
 
 	// ensure to limit buffer for guessing due to https://github.com/aadsm/jschardet/issues/53
 	const limitedBuffer = buffer.slice(0, AUTO_ENCODING_GUESS_MAX_BYTES);
diff --git a/src/vs/workbench/services/textfile/common/textFileEditorModel.ts b/src/vs/workbench/services/textfile/common/textFileEditorModel.ts
index 3150fdd7b1d..0f55433f49d 100644
--- a/src/vs/workbench/services/textfile/common/textFileEditorModel.ts
+++ b/src/vs/workbench/services/textfile/common/textFileEditorModel.ts
@@ -1013,6 +1013,11 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 			this.lastResolvedFileStat = newFileStat;
 		}
 
+		// In all other cases update only the readonly and locked flags
+		else {
+			this.lastResolvedFileStat = { ...this.lastResolvedFileStat, readonly: newFileStat.readonly, locked: newFileStat.locked };
+		}
+
 		// Signal that the readonly state changed
 		if (this.isReadonly() !== oldReadonly) {
 			this._onDidChangeReadonly.fire();
@@ -1099,8 +1104,8 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 
 		this.logService.info(`Adjusting encoding based on configured language override to '${encoding}' for ${this.resource.toString(true)}.`);
 
-		// Re-open with new encoding
-		return this.setEncodingInternal(encoding, EncodingMode.Decode);
+		// Force resolve to pick up the new encoding
+		return this.forceResolveFromFile();
 	}
 
 	private hasEncodingSetExplicitly: boolean = false;
diff --git a/src/vs/workbench/services/textfile/test/browser/textFileEditorModel.test.ts b/src/vs/workbench/services/textfile/test/browser/textFileEditorModel.test.ts
index e7d56251018..81a8a0ef63b 100644
--- a/src/vs/workbench/services/textfile/test/browser/textFileEditorModel.test.ts
+++ b/src/vs/workbench/services/textfile/test/browser/textFileEditorModel.test.ts
@@ -10,7 +10,7 @@ import { EncodingMode, TextFileEditorModelState, snapshotToString, isTextFileEdi
 import { createFileEditorInput, workbenchInstantiationService, TestServiceAccessor, TestReadonlyTextFileEditorModel, getLastResolvedFileStat } from 'vs/workbench/test/browser/workbenchTestServices';
 import { ensureNoDisposablesAreLeakedInTestSuite, toResource } from 'vs/base/test/common/utils';
 import { TextFileEditorModelManager } from 'vs/workbench/services/textfile/common/textFileEditorModelManager';
-import { FileOperationResult, FileOperationError } from 'vs/platform/files/common/files';
+import { FileOperationResult, FileOperationError, NotModifiedSinceFileOperationError } from 'vs/platform/files/common/files';
 import { DeferredPromise, timeout } from 'vs/base/common/async';
 import { assertIsDefined } from 'vs/base/common/types';
 import { createTextBufferFactory } from 'vs/editor/common/model/textModel';
@@ -359,9 +359,7 @@ suite('Files - TextFileEditorModel', () => {
 
 		model.setLanguageId(languageId);
 
-		await deferredPromise.p;
-
-		assert.strictEqual(model.getEncoding(), UTF16be);
+		await deferredPromise.p; // this asserts that the model was reloaded due to the language change
 	});
 
 	test('create with language', async function () {
@@ -608,6 +606,22 @@ suite('Files - TextFileEditorModel', () => {
 		assert.strictEqual(getLastModifiedTime(model), mtime);
 	});
 
+	test('stat.readonly and stat.locked can change when decreased mtime is ignored', async function () {
+		const model: TextFileEditorModel = disposables.add(instantiationService.createInstance(TextFileEditorModel, toResource.call(this, '/path/index_async.txt'), 'utf8', undefined));
+
+		await model.resolve();
+
+		const stat = assertIsDefined(getLastResolvedFileStat(model));
+		accessor.textFileService.setReadStreamErrorOnce(new NotModifiedSinceFileOperationError('error', { ...stat, mtime: stat.mtime - 1, readonly: !stat.readonly, locked: !stat.locked }));
+
+		await model.resolve();
+
+		assert.ok(model);
+		assert.strictEqual(getLastModifiedTime(model), stat.mtime, 'mtime should not decrease');
+		assert.notStrictEqual(getLastResolvedFileStat(model)?.readonly, stat.readonly, 'readonly should have changed despite simultaneous attempt to decrease mtime');
+		assert.notStrictEqual(getLastResolvedFileStat(model)?.locked, stat.locked, 'locked should have changed despite simultaneous attempt to decrease mtime');
+	});
+
 	test('Resolve error is handled gracefully if model already exists', async function () {
 		const model: TextFileEditorModel = disposables.add(instantiationService.createInstance(TextFileEditorModel, toResource.call(this, '/path/index_async.txt'), 'utf8', undefined));
 
diff --git a/src/vs/workbench/services/themes/browser/fileIconThemeData.ts b/src/vs/workbench/services/themes/browser/fileIconThemeData.ts
index ae2c1c6cd0b..f261b39b677 100644
--- a/src/vs/workbench/services/themes/browser/fileIconThemeData.ts
+++ b/src/vs/workbench/services/themes/browser/fileIconThemeData.ts
@@ -465,6 +465,6 @@ function handleParentFolder(key: string, selectors: string[]): string {
 }
 
 function escapeCSS(str: string) {
-	str = str.replace(/[\x11\x12\x14\x15\x40]/g, '/'); // HTML class names can not contain certain whitespace characters, use / instead, which doesn't exist in file names.
+	str = str.replace(/[\s]/g, '/'); // HTML class names can not contain certain whitespace characters (https://dom.spec.whatwg.org/#interface-domtokenlist), use / instead, which doesn't exist in file names.
 	return mainWindow.CSS.escape(str);
 }
diff --git a/src/vs/workbench/services/themes/common/colorThemeData.ts b/src/vs/workbench/services/themes/common/colorThemeData.ts
index e74a4ab1e05..2019848fea7 100644
--- a/src/vs/workbench/services/themes/common/colorThemeData.ts
+++ b/src/vs/workbench/services/themes/common/colorThemeData.ts
@@ -245,7 +245,7 @@ export class ColorThemeData implements IWorkbenchColorTheme {
 		return undefined;
 	}
 
-	private getTokenColorIndex(): TokenColorIndex {
+	public getTokenColorIndex(): TokenColorIndex {
 		// collect all colors that tokens can have
 		if (!this.tokenColorIndex) {
 			const index = new TokenColorIndex();
diff --git a/src/vs/workbench/services/treeSitter/browser/treeSitterTokenizationFeature.contribution.ts b/src/vs/workbench/services/treeSitter/browser/treeSitterTokenizationFeature.contribution.ts
new file mode 100644
index 00000000000..ee04816c6ac
--- /dev/null
+++ b/src/vs/workbench/services/treeSitter/browser/treeSitterTokenizationFeature.contribution.ts
@@ -0,0 +1,27 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { registerSingleton, InstantiationType } from 'vs/platform/instantiation/common/extensions';
+import { IWorkbenchContribution, WorkbenchPhase, registerWorkbenchContribution2 } from 'vs/workbench/common/contributions';
+import { TreeSitterTextModelService } from 'vs/editor/browser/services/treeSitter/treeSitterParserService';
+import { ITreeSitterParserService } from 'vs/editor/common/services/treeSitterParserService';
+import { ITreeSitterTokenizationFeature } from 'vs/workbench/services/treeSitter/browser/treeSitterTokenizationFeature';
+
+/**
+ * Makes sure the ITreeSitterTokenizationService is instantiated
+ */
+class TreeSitterTokenizationInstantiator implements IWorkbenchContribution {
+
+	static readonly ID = 'workbench.contrib.treeSitterTokenizationInstantiator';
+
+	constructor(
+		@ITreeSitterParserService _treeSitterTokenizationService: ITreeSitterParserService,
+		@ITreeSitterTokenizationFeature _treeSitterTokenizationFeature: ITreeSitterTokenizationFeature
+	) { }
+}
+
+registerSingleton(ITreeSitterParserService, TreeSitterTextModelService, InstantiationType.Eager);
+
+registerWorkbenchContribution2(TreeSitterTokenizationInstantiator.ID, TreeSitterTokenizationInstantiator, WorkbenchPhase.BlockRestore);
diff --git a/src/vs/workbench/services/treeSitter/browser/treeSitterTokenizationFeature.ts b/src/vs/workbench/services/treeSitter/browser/treeSitterTokenizationFeature.ts
new file mode 100644
index 00000000000..efc71a942c8
--- /dev/null
+++ b/src/vs/workbench/services/treeSitter/browser/treeSitterTokenizationFeature.ts
@@ -0,0 +1,241 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+// eslint-disable-next-line local/code-import-patterns
+import type { Parser } from '@vscode/tree-sitter-wasm';
+import { Emitter, Event } from 'vs/base/common/event';
+import { Disposable, DisposableMap, DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
+import { AppResourcePath, FileAccess } from 'vs/base/common/network';
+import { FontStyle, MetadataConsts } from 'vs/editor/common/encodedTokenAttributes';
+import { ITreeSitterTokenizationSupport, LazyTokenizationSupport, TreeSitterTokenizationRegistry } from 'vs/editor/common/languages';
+import { ITextModel } from 'vs/editor/common/model';
+import { EDITOR_EXPERIMENTAL_PREFER_TREESITTER, ITreeSitterParserService, ITreeSitterParseResult } from 'vs/editor/common/services/treeSitterParserService';
+import { IModelTokensChangedEvent } from 'vs/editor/common/textModelEvents';
+import { ColumnRange } from 'vs/editor/contrib/inlineCompletions/browser/utils';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { IFileService } from 'vs/platform/files/common/files';
+import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
+import { createDecorator, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { IThemeService } from 'vs/platform/theme/common/themeService';
+import { TokenStyle } from 'vs/platform/theme/common/tokenClassificationRegistry';
+import { ColorThemeData } from 'vs/workbench/services/themes/common/colorThemeData';
+
+const ALLOWED_SUPPORT = ['typescript'];
+type TreeSitterQueries = string;
+
+export const ITreeSitterTokenizationFeature = createDecorator<ITreeSitterTokenizationFeature>('treeSitterTokenizationFeature');
+
+export interface ITreeSitterTokenizationFeature {
+	_serviceBrand: undefined;
+}
+
+class TreeSitterTokenizationFeature extends Disposable implements ITreeSitterTokenizationFeature {
+	public _serviceBrand: undefined;
+	private readonly _tokenizersRegistrations: DisposableMap<string, DisposableStore> = new DisposableMap();
+
+	constructor(
+		@IConfigurationService private readonly _configurationService: IConfigurationService,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+		@IFileService private readonly _fileService: IFileService
+	) {
+		super();
+
+		this._handleGrammarsExtPoint();
+		this._register(this._configurationService.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration(EDITOR_EXPERIMENTAL_PREFER_TREESITTER)) {
+				this._handleGrammarsExtPoint();
+			}
+		}));
+	}
+
+	private _getSetting(): string[] {
+		return this._configurationService.getValue<string[]>(EDITOR_EXPERIMENTAL_PREFER_TREESITTER) || [];
+	}
+
+	private _handleGrammarsExtPoint(): void {
+		const setting = this._getSetting();
+
+		// Eventually, this should actually use an extension point to add tree sitter grammars, but for now they are hard coded in core
+		for (const languageId of setting) {
+			if (ALLOWED_SUPPORT.includes(languageId) && !this._tokenizersRegistrations.has(languageId)) {
+				const lazyTokenizationSupport = new LazyTokenizationSupport(() => this._createTokenizationSupport(languageId));
+				const disposableStore = new DisposableStore();
+				disposableStore.add(lazyTokenizationSupport);
+				disposableStore.add(TreeSitterTokenizationRegistry.registerFactory(languageId, lazyTokenizationSupport));
+				this._tokenizersRegistrations.set(languageId, disposableStore);
+				TreeSitterTokenizationRegistry.getOrCreate(languageId);
+			}
+		}
+	}
+
+	private async _fetchQueries(newLanguage: string): Promise<TreeSitterQueries> {
+		const languageLocation: AppResourcePath = `vs/editor/common/languages/highlights/${newLanguage}.scm`;
+		const query = await this._fileService.readFile(FileAccess.asFileUri(languageLocation));
+		return query.value.toString();
+	}
+
+	private async _createTokenizationSupport(languageId: string): Promise<ITreeSitterTokenizationSupport & IDisposable | null> {
+		const queries = await this._fetchQueries(languageId);
+		return this._instantiationService.createInstance(TreeSitterTokenizationSupport, queries, languageId);
+	}
+}
+
+class TreeSitterTokenizationSupport extends Disposable implements ITreeSitterTokenizationSupport {
+	private _query: Parser.Query | undefined;
+	private readonly _onDidChangeTokens: Emitter<IModelTokensChangedEvent> = new Emitter();
+	public readonly onDidChangeTokens: Event<IModelTokensChangedEvent> = this._onDidChangeTokens.event;
+	private _colorThemeData!: ColorThemeData;
+	private _languageAddedListener: IDisposable | undefined;
+
+	constructor(
+		private readonly _queries: TreeSitterQueries,
+		private readonly _languageId: string,
+		@ITreeSitterParserService private readonly _treeSitterService: ITreeSitterParserService,
+		@IThemeService private readonly _themeService: IThemeService,
+	) {
+		super();
+		this._register(Event.runAndSubscribe(this._themeService.onDidColorThemeChange, () => this.reset()));
+	}
+
+	private _getTree(textModel: ITextModel): ITreeSitterParseResult | undefined {
+		return this._treeSitterService.getParseResult(textModel);
+	}
+
+	private _ensureQuery() {
+		if (!this._query) {
+			const language = this._treeSitterService.getOrInitLanguage(this._languageId);
+			if (!language) {
+				if (!this._languageAddedListener) {
+					this._languageAddedListener = this._register(Event.onceIf(this._treeSitterService.onDidAddLanguage, e => e.id === this._languageId)((e) => {
+						this._query = e.language.query(this._queries);
+					}));
+				}
+				return;
+			}
+			this._query = language.query(this._queries);
+		}
+		return this._query;
+	}
+
+	private reset() {
+		this._colorThemeData = this._themeService.getColorTheme() as ColorThemeData;
+	}
+
+	captureAtPosition(lineNumber: number, column: number, textModel: ITextModel): any {
+		const captures = this._captureAtRange(lineNumber, new ColumnRange(column, column), textModel);
+		return captures;
+	}
+
+	private _captureAtRange(lineNumber: number, columnRange: ColumnRange, textModel: ITextModel): Parser.QueryCapture[] {
+		const tree = this._getTree(textModel);
+		const query = this._ensureQuery();
+		if (!tree?.tree || !query) {
+			return [];
+		}
+		// Tree sitter row is 0 based, column is 0 based
+		return query.captures(tree.tree.rootNode, { startPosition: { row: lineNumber - 1, column: columnRange.startColumn - 1 }, endPosition: { row: lineNumber - 1, column: columnRange.endColumnExclusive } });
+	}
+
+	/**
+	 * Gets the tokens for a given line.
+	 * Each token takes 2 elements in the array. The first element is the offset of the end of the token *in the line, not in the document*, and the second element is the metadata.
+	 *
+	 * @param lineNumber
+	 * @returns
+	 */
+	public tokenizeEncoded(lineNumber: number, textModel: ITextModel): Uint32Array | undefined {
+		const lineLength = textModel.getLineMaxColumn(lineNumber);
+		const captures = this._captureAtRange(lineNumber, new ColumnRange(1, lineLength), textModel);
+
+		if (captures.length === 0) {
+			return undefined;
+		}
+
+		let tokens: Uint32Array = new Uint32Array(captures.length * 2);
+		let tokenIndex = 0;
+		const lineStartOffset = textModel.getOffsetAt({ lineNumber: lineNumber, column: 1 });
+
+		for (let captureIndex = 0; captureIndex < captures.length; captureIndex++) {
+			const capture = captures[captureIndex];
+			const metadata = this.findMetadata(capture.name);
+			const tokenEndIndex = capture.node.endIndex < lineStartOffset + lineLength ? capture.node.endIndex : lineStartOffset + lineLength;
+			const tokenStartIndex = capture.node.startIndex < lineStartOffset ? lineStartOffset : capture.node.startIndex;
+
+			const lineRelativeOffset = tokenEndIndex - lineStartOffset;
+			// Not every character will get captured, so we need to make sure that our current capture doesn't bleed toward the start of the line and cover characters that it doesn't apply to.
+			// We do this by creating a new token in the array if the previous token ends before the current token starts.
+			let previousTokenEnd: number;
+			const currentTokenLength = tokenEndIndex - tokenStartIndex;
+			if (captureIndex > 0) {
+				previousTokenEnd = tokens[(tokenIndex - 1) * 2];
+			} else {
+				previousTokenEnd = tokenStartIndex - lineStartOffset - 1;
+			}
+			const intermediateTokenOffset = lineRelativeOffset - currentTokenLength;
+			if (previousTokenEnd < intermediateTokenOffset) {
+				tokens[tokenIndex * 2] = intermediateTokenOffset;
+				tokens[tokenIndex * 2 + 1] = 0;
+				tokenIndex++;
+				const newTokens = new Uint32Array(tokens.length + 2);
+				newTokens.set(tokens);
+				tokens = newTokens;
+			}
+
+			tokens[tokenIndex * 2] = lineRelativeOffset;
+			tokens[tokenIndex * 2 + 1] = metadata;
+			tokenIndex++;
+		}
+
+		if (captures[captures.length - 1].node.endPosition.column + 1 < lineLength) {
+			const newTokens = new Uint32Array(tokens.length + 2);
+			newTokens.set(tokens);
+			tokens = newTokens;
+			tokens[tokenIndex * 2] = lineLength;
+			tokens[tokenIndex * 2 + 1] = 0;
+		}
+		return tokens;
+	}
+
+	private findMetadata(captureName: string): number {
+		const tokenStyle: TokenStyle | undefined = this._colorThemeData.resolveScopes([[captureName]]);
+		if (!tokenStyle) {
+			return 0;
+		}
+
+		let metadata = 0;
+		if (typeof tokenStyle.italic !== 'undefined') {
+			const italicBit = (tokenStyle.italic ? FontStyle.Italic : 0);
+			metadata |= italicBit | MetadataConsts.ITALIC_MASK;
+		}
+		if (typeof tokenStyle.bold !== 'undefined') {
+			const boldBit = (tokenStyle.bold ? FontStyle.Bold : 0);
+			metadata |= boldBit | MetadataConsts.BOLD_MASK;
+		}
+		if (typeof tokenStyle.underline !== 'undefined') {
+			const underlineBit = (tokenStyle.underline ? FontStyle.Underline : 0);
+			metadata |= underlineBit | MetadataConsts.UNDERLINE_MASK;
+		}
+		if (typeof tokenStyle.strikethrough !== 'undefined') {
+			const strikethroughBit = (tokenStyle.strikethrough ? FontStyle.Strikethrough : 0);
+			metadata |= strikethroughBit | MetadataConsts.STRIKETHROUGH_MASK;
+		}
+		if (tokenStyle.foreground) {
+			const tokenStyleForeground = this._colorThemeData.getTokenColorIndex().get(tokenStyle?.foreground);
+			const foregroundBits = tokenStyleForeground << MetadataConsts.FOREGROUND_OFFSET;
+			metadata |= foregroundBits;
+		}
+
+		return metadata;
+	}
+
+	override dispose() {
+		super.dispose();
+		this._query?.delete();
+		this._query = undefined;
+	}
+}
+
+registerSingleton(ITreeSitterTokenizationFeature, TreeSitterTokenizationFeature, InstantiationType.Eager);
+
diff --git a/src/vs/workbench/services/userActivity/common/userActivityService.ts b/src/vs/workbench/services/userActivity/common/userActivityService.ts
index fa572bccdae..2b9b123cef2 100644
--- a/src/vs/workbench/services/userActivity/common/userActivityService.ts
+++ b/src/vs/workbench/services/userActivity/common/userActivityService.ts
@@ -3,13 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { RunOnceScheduler, runWhenGlobalIdle } from 'vs/base/common/async';
+import { disposableTimeout, RunOnceScheduler, runWhenGlobalIdle } from 'vs/base/common/async';
 import { Emitter, Event } from 'vs/base/common/event';
-import { Disposable, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
+import { Disposable, DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
 import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import { IInstantiationService, createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { userActivityRegistry } from 'vs/workbench/services/userActivity/common/userActivityRegistry';
 
+export interface IMarkActiveOptions {
+	whenHeldFor?: number;
+}
+
 /**
  * Service that observes user activity in the window.
  */
@@ -31,9 +35,11 @@ export interface IUserActivityService {
 	 * Multiple consumers call this method; the user will only be considered
 	 * inactive once all consumers have disposed of their Disposables.
 	 */
-	markActive(): IDisposable;
+	markActive(opts?: IMarkActiveOptions): IDisposable;
 }
 
+const MARK_INACTIVE_DEBOUNCE = 10_000;
+
 export const IUserActivityService = createDecorator<IUserActivityService>('IUserActivityService');
 
 export class UserActivityService extends Disposable implements IUserActivityService {
@@ -41,7 +47,7 @@ export class UserActivityService extends Disposable implements IUserActivityServ
 	private readonly markInactive = this._register(new RunOnceScheduler(() => {
 		this.isActive = false;
 		this.changeEmitter.fire(false);
-	}, 10_000));
+	}, MARK_INACTIVE_DEBOUNCE));
 
 	private readonly changeEmitter = this._register(new Emitter<boolean>);
 	private active = 0;
@@ -64,7 +70,13 @@ export class UserActivityService extends Disposable implements IUserActivityServ
 	}
 
 	/** @inheritdoc */
-	markActive(): IDisposable {
+	markActive(opts?: IMarkActiveOptions): IDisposable {
+		if (opts?.whenHeldFor) {
+			const store = new DisposableStore();
+			store.add(disposableTimeout(() => store.add(this.markActive()), opts.whenHeldFor));
+			return store;
+		}
+
 		if (++this.active === 1) {
 			this.isActive = true;
 			this.changeEmitter.fire(true);
diff --git a/src/vs/workbench/services/userActivity/test/common/userActivityService.test.ts b/src/vs/workbench/services/userActivity/test/common/userActivityService.test.ts
new file mode 100644
index 00000000000..529c4a8a616
--- /dev/null
+++ b/src/vs/workbench/services/userActivity/test/common/userActivityService.test.ts
@@ -0,0 +1,74 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+
+import * as assert from 'assert';
+import * as sinon from 'sinon';
+import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
+import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
+import { IMarkActiveOptions, IUserActivityService, UserActivityService } from 'vs/workbench/services/userActivity/common/userActivityService';
+
+const MARK_INACTIVE_DEBOUNCE = 10_000;
+
+suite('UserActivityService', () => {
+	let userActivityService: IUserActivityService;
+	let clock: sinon.SinonFakeTimers;
+
+	const ds = ensureNoDisposablesAreLeakedInTestSuite();
+
+	setup(() => {
+		clock = sinon.useFakeTimers();
+		userActivityService = ds.add(new UserActivityService(ds.add(new TestInstantiationService())));
+	});
+
+	teardown(() => {
+		clock.restore();
+	});
+
+	test('isActive should be true initially', () => {
+		assert.ok(userActivityService.isActive);
+	});
+
+	test('markActive should be inactive when all handles gone', () => {
+		const h1 = userActivityService.markActive();
+		const h2 = userActivityService.markActive();
+		assert.strictEqual(userActivityService.isActive, true);
+		h1.dispose();
+		assert.strictEqual(userActivityService.isActive, true);
+		h2.dispose();
+		clock.tick(MARK_INACTIVE_DEBOUNCE);
+		assert.strictEqual(userActivityService.isActive, false);
+	});
+
+	test('markActive sets active whenHeldFor', async () => {
+		userActivityService.markActive().dispose();
+		clock.tick(MARK_INACTIVE_DEBOUNCE);
+
+		const duration = 100; // milliseconds
+		const opts: IMarkActiveOptions = { whenHeldFor: duration };
+		const handle = userActivityService.markActive(opts);
+		assert.strictEqual(userActivityService.isActive, false);
+		clock.tick(duration - 1);
+		assert.strictEqual(userActivityService.isActive, false);
+		clock.tick(1);
+		assert.strictEqual(userActivityService.isActive, true);
+		handle.dispose();
+
+		clock.tick(MARK_INACTIVE_DEBOUNCE);
+		assert.strictEqual(userActivityService.isActive, false);
+	});
+
+	test('markActive whenHeldFor before triggers', async () => {
+		userActivityService.markActive().dispose();
+		clock.tick(MARK_INACTIVE_DEBOUNCE);
+
+		const duration = 100; // milliseconds
+		const opts: IMarkActiveOptions = { whenHeldFor: duration };
+		userActivityService.markActive(opts).dispose();
+		assert.strictEqual(userActivityService.isActive, false);
+		clock.tick(duration + MARK_INACTIVE_DEBOUNCE);
+		assert.strictEqual(userActivityService.isActive, false);
+	});
+});
diff --git a/src/vs/workbench/services/userDataProfile/browser/userDataProfileImportExportService.ts b/src/vs/workbench/services/userDataProfile/browser/userDataProfileImportExportService.ts
index 33e8ccfd566..e2324bbe37b 100644
--- a/src/vs/workbench/services/userDataProfile/browser/userDataProfileImportExportService.ts
+++ b/src/vs/workbench/services/userDataProfile/browser/userDataProfileImportExportService.ts
@@ -7,47 +7,27 @@ import 'vs/css!./media/userDataProfileView';
 import { localize } from 'vs/nls';
 import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { Emitter, Event } from 'vs/base/common/event';
-import * as DOM from 'vs/base/browser/dom';
-import { IUserDataProfileImportExportService, PROFILE_FILTER, PROFILE_EXTENSION, IUserDataProfileContentHandler, IS_PROFILE_IMPORT_IN_PROGRESS_CONTEXT, PROFILES_TITLE, defaultUserDataProfileIcon, IUserDataProfileService, IProfileResourceTreeItem, PROFILES_CATEGORY, IUserDataProfileManagementService, IS_PROFILE_EXPORT_IN_PROGRESS_CONTEXT, ISaveProfileResult, IProfileImportOptions, PROFILE_URL_AUTHORITY, toUserDataProfileUri, IUserDataProfileCreateOptions } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
+import { Emitter } from 'vs/base/common/event';
+import { IUserDataProfileImportExportService, PROFILE_FILTER, PROFILE_EXTENSION, IUserDataProfileContentHandler, IUserDataProfileService, IProfileResourceTreeItem, PROFILES_CATEGORY, IUserDataProfileManagementService, ISaveProfileResult, IProfileImportOptions, PROFILE_URL_AUTHORITY, toUserDataProfileUri, IUserDataProfileCreateOptions, isProfileURL, PROFILE_URL_AUTHORITY_PREFIX } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
 import { Disposable, DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
 import { IDialogService, IFileDialogService, IPromptButton } from 'vs/platform/dialogs/common/dialogs';
 import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
 import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
 import { IFileService } from 'vs/platform/files/common/files';
 import { URI } from 'vs/base/common/uri';
-import { Extensions, ITreeItem, ITreeViewDataProvider, ITreeViewDescriptor, IViewContainersRegistry, IViewDescriptorService, IViewsRegistry, TreeItemCollapsibleState, ViewContainer, ViewContainerLocation } from 'vs/workbench/common/views';
-import { IViewsService } from 'vs/workbench/services/views/common/viewsService';
-import { IUserDataProfile, IUserDataProfileOptions, IUserDataProfilesService, ProfileResourceType, ProfileResourceTypeFlags, UseDefaultProfileFlags, isUserDataProfile, toUserDataProfile } from 'vs/platform/userDataProfile/common/userDataProfile';
-import { ContextKeyExpr, IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { ViewPaneContainer } from 'vs/workbench/browser/parts/views/viewPaneContainer';
-import { TreeView, TreeViewPane } from 'vs/workbench/browser/parts/views/treeView';
+import { ITreeItem, ITreeViewDataProvider } from 'vs/workbench/common/views';
+import { IUserDataProfile, IUserDataProfileOptions, IUserDataProfilesService, ProfileResourceType, ProfileResourceTypeFlags } from 'vs/platform/userDataProfile/common/userDataProfile';
 import { SettingsResource, SettingsResourceTreeItem } from 'vs/workbench/services/userDataProfile/browser/settingsResource';
 import { KeybindingsResource, KeybindingsResourceTreeItem } from 'vs/workbench/services/userDataProfile/browser/keybindingsResource';
 import { SnippetsResource, SnippetsResourceTreeItem } from 'vs/workbench/services/userDataProfile/browser/snippetsResource';
 import { TasksResource, TasksResourceTreeItem } from 'vs/workbench/services/userDataProfile/browser/tasksResource';
-import { ExtensionsResource, ExtensionsResourceExportTreeItem, ExtensionsResourceImportTreeItem, ExtensionsResourceTreeItem } from 'vs/workbench/services/userDataProfile/browser/extensionsResource';
-import { GlobalStateResource, GlobalStateResourceExportTreeItem, GlobalStateResourceImportTreeItem, GlobalStateResourceTreeItem } from 'vs/workbench/services/userDataProfile/browser/globalStateResource';
+import { ExtensionsResource, ExtensionsResourceExportTreeItem, ExtensionsResourceTreeItem } from 'vs/workbench/services/userDataProfile/browser/extensionsResource';
+import { GlobalStateResource, GlobalStateResourceExportTreeItem, GlobalStateResourceTreeItem } from 'vs/workbench/services/userDataProfile/browser/globalStateResource';
 import { InMemoryFileSystemProvider } from 'vs/platform/files/common/inMemoryFilesystemProvider';
-import { Button } from 'vs/base/browser/ui/button/button';
-import { IViewletViewOptions } from 'vs/workbench/browser/parts/views/viewsViewlet';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { IContextMenuService, IContextViewService } from 'vs/platform/contextview/browser/contextView';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { defaultButtonStyles, defaultInputBoxStyles, defaultSelectBoxStyles } from 'vs/platform/theme/browser/defaultStyles';
-import { generateUuid } from 'vs/base/common/uuid';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { EditorsOrder } from 'vs/workbench/common/editor';
-import { getErrorMessage, onUnexpectedError } from 'vs/base/common/errors';
 import { IProgressService, ProgressLocation } from 'vs/platform/progress/common/progress';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { IQuickInputService, IQuickPickItem, QuickPickItem } from 'vs/platform/quickinput/common/quickInput';
+import { IQuickInputService, QuickPickItem } from 'vs/platform/quickinput/common/quickInput';
 import { VSBuffer } from 'vs/base/common/buffer';
 import { joinPath } from 'vs/base/common/resources';
 import { escapeRegExpCharacters } from 'vs/base/common/strings';
@@ -55,32 +35,10 @@ import { Schemas } from 'vs/base/common/network';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import Severity from 'vs/base/common/severity';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-import { IURLHandler, IURLService } from 'vs/platform/url/common/url';
 import { asText, IRequestService } from 'vs/platform/request/common/request';
 import { IProductService } from 'vs/platform/product/common/productService';
 import { Mutable, isUndefined } from 'vs/base/common/types';
-import { Action, ActionRunner, IAction, IActionRunner } from 'vs/base/common/actions';
-import { isWeb } from 'vs/base/common/platform';
-import { Action2, MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
-import { Codicon, getAllCodicons } from 'vs/base/common/codicons';
-import { Barrier, CancelablePromise, createCancelablePromise } from 'vs/base/common/async';
-import { IExtensionManagementService } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { ExtensionType } from 'vs/platform/extensions/common/extensions';
-import { areSameExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
-import { MarkdownString } from 'vs/base/common/htmlContent';
-import { renderMarkdown } from 'vs/base/browser/markdownRenderer';
-import { showWindowLogActionId } from 'vs/workbench/services/log/common/logConstants';
-import { ISelectOptionItem, SelectBox } from 'vs/base/browser/ui/selectBox/selectBox';
-import { ThemeIcon } from 'vs/base/common/themables';
-import { IHoverService } from 'vs/platform/hover/browser/hover';
-import { HoverPosition } from 'vs/base/browser/ui/hover/hoverWidget';
-import { DEFAULT_ICON, ICONS } from 'vs/workbench/services/userDataProfile/common/userDataProfileIcons';
-import { WorkbenchIconSelectBox } from 'vs/workbench/services/userDataProfile/browser/iconSelectBox';
-import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import type { IHoverWidget } from 'vs/base/browser/ui/hover/hover';
-import { IAccessibleViewInformationService } from 'vs/workbench/services/accessibility/common/accessibleViewInformationService';
-import { ILogService } from 'vs/platform/log/common/log';
+import { CancelablePromise, createCancelablePromise } from 'vs/base/common/async';
 
 interface IUserDataProfileTemplate {
 	readonly name: string;
@@ -104,81 +62,31 @@ function isUserDataProfileTemplate(thing: unknown): thing is IUserDataProfileTem
 		&& (isUndefined(candidate.extensions) || typeof candidate.extensions === 'string'));
 }
 
-const EXPORT_PROFILE_PREVIEW_VIEW = 'workbench.views.profiles.export.preview';
-const IMPORT_PROFILE_PREVIEW_VIEW = 'workbench.views.profiles.import.preview';
-
-export class UserDataProfileImportExportService extends Disposable implements IUserDataProfileImportExportService, IURLHandler {
-
-	private static readonly PROFILE_URL_AUTHORITY_PREFIX = 'profile-';
+export class UserDataProfileImportExportService extends Disposable implements IUserDataProfileImportExportService {
 
 	readonly _serviceBrand: undefined;
 
 	private profileContentHandlers = new Map<string, IUserDataProfileContentHandler>();
-	private readonly isProfileExportInProgressContextKey: IContextKey<boolean>;
-	private readonly isProfileImportInProgressContextKey: IContextKey<boolean>;
 
-	private readonly viewContainer: ViewContainer;
 	private readonly fileUserDataProfileContentHandler: FileUserDataProfileContentHandler;
 
 	constructor(
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 		@IUserDataProfileService private readonly userDataProfileService: IUserDataProfileService,
-		@IViewsService private readonly viewsService: IViewsService,
-		@IEditorService private readonly editorService: IEditorService,
-		@IContextKeyService contextKeyService: IContextKeyService,
 		@IUserDataProfileManagementService private readonly userDataProfileManagementService: IUserDataProfileManagementService,
 		@IUserDataProfilesService private readonly userDataProfilesService: IUserDataProfilesService,
 		@IExtensionService private readonly extensionService: IExtensionService,
-		@IExtensionManagementService private readonly extensionManagementService: IExtensionManagementService,
 		@IQuickInputService private readonly quickInputService: IQuickInputService,
-		@INotificationService private readonly notificationService: INotificationService,
 		@IProgressService private readonly progressService: IProgressService,
 		@IDialogService private readonly dialogService: IDialogService,
 		@IClipboardService private readonly clipboardService: IClipboardService,
 		@IOpenerService private readonly openerService: IOpenerService,
 		@IRequestService private readonly requestService: IRequestService,
-		@IURLService urlService: IURLService,
 		@IProductService private readonly productService: IProductService,
 		@IUriIdentityService private readonly uriIdentityService: IUriIdentityService,
-		@ITelemetryService private readonly telemetryService: ITelemetryService,
-		@IContextViewService private readonly contextViewService: IContextViewService,
-		@IHoverService private readonly hoverService: IHoverService,
-		@ILogService private readonly logService: ILogService,
 	) {
 		super();
 		this.registerProfileContentHandler(Schemas.file, this.fileUserDataProfileContentHandler = instantiationService.createInstance(FileUserDataProfileContentHandler));
-		this.isProfileExportInProgressContextKey = IS_PROFILE_EXPORT_IN_PROGRESS_CONTEXT.bindTo(contextKeyService);
-		this.isProfileImportInProgressContextKey = IS_PROFILE_IMPORT_IN_PROGRESS_CONTEXT.bindTo(contextKeyService);
-
-		this.viewContainer = Registry.as<IViewContainersRegistry>(Extensions.ViewContainersRegistry).registerViewContainer(
-			{
-				id: 'userDataProfiles',
-				title: PROFILES_TITLE,
-				ctorDescriptor: new SyncDescriptor(
-					ViewPaneContainer,
-					['userDataProfiles', { mergeViewWithContainerWhenSingleView: true }]
-				),
-				icon: defaultUserDataProfileIcon,
-				hideIfEmpty: true,
-			}, ViewContainerLocation.Sidebar);
-
-		urlService.registerHandler(this);
-	}
-
-	private isProfileURL(uri: URI): boolean {
-		return uri.authority === PROFILE_URL_AUTHORITY || new RegExp(`^${UserDataProfileImportExportService.PROFILE_URL_AUTHORITY_PREFIX}`).test(uri.authority);
-	}
-
-	async handleURL(uri: URI): Promise<boolean> {
-		if (this.isProfileURL(uri)) {
-			try {
-				await this.importProfile(uri);
-			} catch (error) {
-				this.notificationService.error(localize('profile import error', "Error while importing profile: {0}", getErrorMessage(error)));
-			}
-			return true;
-		}
-		return false;
 	}
 
 	registerProfileContentHandler(id: string, profileContentHandler: IUserDataProfileContentHandler): IDisposable {
@@ -193,55 +101,6 @@ export class UserDataProfileImportExportService extends Disposable implements IU
 		this.profileContentHandlers.delete(id);
 	}
 
-	async exportProfile2(): Promise<void> {
-		if (this.isProfileExportInProgressContextKey.get()) {
-			this.logService.warn('Profile export already in progress.');
-			return;
-		}
-
-		return this.showProfileContents();
-	}
-
-	async importProfile(uri: URI, options?: IProfileImportOptions): Promise<void> {
-		if (this.isProfileImportInProgressContextKey.get()) {
-			this.notificationService.warn('Profile import already in progress.');
-			return;
-		}
-
-		this.isProfileImportInProgressContextKey.set(true);
-		const disposables = new DisposableStore();
-		disposables.add(toDisposable(() => this.isProfileImportInProgressContextKey.set(false)));
-
-		try {
-			const mode = options?.mode ?? 'preview';
-			const profileTemplate = await this.progressService.withProgress({
-				location: ProgressLocation.Window,
-				command: showWindowLogActionId,
-				title: localize('resolving uri', "{0}: Resolving profile content...", options?.mode ? localize('preview profile', "Preview Profile") : localize('import profile', "Create Profile")),
-			}, () => this.resolveProfileTemplate(uri, options));
-			if (!profileTemplate) {
-				return;
-			}
-			if (mode === 'preview') {
-				await this.previewProfile(profileTemplate, options);
-			} else if (mode === 'apply') {
-				await this.createAndSwitch(profileTemplate, !!options?.transient, true, options, localize('create profile', "Create Profile"));
-			} else if (mode === 'both') {
-				await this.importAndPreviewProfile(uri, profileTemplate, options);
-			}
-		} finally {
-			disposables.dispose();
-		}
-	}
-
-	createProfile(from?: IUserDataProfile | URI): Promise<void> {
-		return this.saveProfile(undefined, from);
-	}
-
-	editProfile(profile: IUserDataProfile): Promise<void> {
-		return this.saveProfile(profile);
-	}
-
 	async createFromProfile(from: IUserDataProfile, options: IUserDataProfileCreateOptions, token: CancellationToken): Promise<IUserDataProfile | undefined> {
 		const disposables = new DisposableStore();
 		let creationPromise: CancelablePromise<void>;
@@ -359,371 +218,16 @@ export class UserDataProfileImportExportService extends Disposable implements IU
 		}
 	}
 
-	private saveProfile(profile: IUserDataProfile): Promise<void>;
-	private saveProfile(profile?: IUserDataProfile, source?: IUserDataProfile | URI | IUserDataProfileTemplate): Promise<void>;
-	private async saveProfile(profile?: IUserDataProfile, source?: IUserDataProfile | URI | Mutable<IUserDataProfileTemplate>): Promise<void> {
-
-		type SaveProfileInfoClassification = {
-			owner: 'sandy081';
-			comment: 'Report when profile is about to be saved';
-		};
-		type CreateProfileInfoClassification = {
-			owner: 'sandy081';
-			comment: 'Report when profile is about to be created';
-			source: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Type of profile source' };
-		};
-		type CreateProfileInfoEvent = {
-			source: string | undefined;
-		};
-		const createProfileTelemetryData: CreateProfileInfoEvent = { source: source instanceof URI ? 'template' : isUserDataProfile(source) ? 'profile' : source ? 'external' : undefined };
-
-		if (profile) {
-			this.telemetryService.publicLog2<{}, SaveProfileInfoClassification>('userDataProfile.startEdit');
-		} else {
-			this.telemetryService.publicLog2<CreateProfileInfoEvent, CreateProfileInfoClassification>('userDataProfile.startCreate', createProfileTelemetryData);
-		}
-
+	async exportProfile(profile: IUserDataProfile, exportFlags?: ProfileResourceTypeFlags): Promise<void> {
 		const disposables = new DisposableStore();
-		const title = profile ? localize('save profile', "Edit {0} Profile...", profile.name) : localize('create new profle', "Create New Profile...");
-
-		const settings: IQuickPickItem & { id: ProfileResourceType } = { id: ProfileResourceType.Settings, label: localize('settings', "Settings"), picked: !profile?.useDefaultFlags?.settings };
-		const keybindings: IQuickPickItem & { id: ProfileResourceType } = { id: ProfileResourceType.Keybindings, label: localize('keybindings', "Keyboard Shortcuts"), picked: !profile?.useDefaultFlags?.keybindings };
-		const snippets: IQuickPickItem & { id: ProfileResourceType } = { id: ProfileResourceType.Snippets, label: localize('snippets', "Snippets"), picked: !profile?.useDefaultFlags?.snippets };
-		const tasks: IQuickPickItem & { id: ProfileResourceType } = { id: ProfileResourceType.Tasks, label: localize('tasks', "Tasks"), picked: !profile?.useDefaultFlags?.tasks };
-		const extensions: IQuickPickItem & { id: ProfileResourceType } = { id: ProfileResourceType.Extensions, label: localize('extensions', "Extensions"), picked: !profile?.useDefaultFlags?.extensions };
-		const resources = [settings, keybindings, snippets, tasks, extensions];
-
-		const quickPick = this.quickInputService.createQuickPick();
-		quickPick.title = title;
-		quickPick.placeholder = localize('name placeholder', "Profile name");
-		quickPick.value = profile?.name ?? (isUserDataProfileTemplate(source) ? this.generateProfileName(source.name) : '');
-		quickPick.canSelectMany = true;
-		quickPick.matchOnDescription = false;
-		quickPick.matchOnDetail = false;
-		quickPick.matchOnLabel = false;
-		quickPick.sortByLabel = false;
-		quickPick.hideCountBadge = true;
-		quickPick.ok = false;
-		quickPick.customButton = true;
-		quickPick.hideCheckAll = true;
-		quickPick.ignoreFocusOut = true;
-		quickPick.customLabel = profile ? localize('save', "Save") : localize('create', "Create");
-		quickPick.description = localize('customise the profile', "Choose what to configure in your Profile:");
-		quickPick.items = [...resources];
-
-		const update = () => {
-			quickPick.items = resources;
-			quickPick.selectedItems = resources.filter(item => item.picked);
-		};
-		update();
-
-		const validate = () => {
-			if (!profile && this.userDataProfilesService.profiles.some(p => p.name === quickPick.value)) {
-				quickPick.validationMessage = localize('profileExists', "Profile with name {0} already exists.", quickPick.value);
-				quickPick.severity = Severity.Warning;
-				return;
-			}
-			if (resources.every(resource => !resource.picked)) {
-				quickPick.validationMessage = localize('invalid configurations', "The profile should contain at least one configuration.");
-				quickPick.severity = Severity.Warning;
-				return;
-			}
-			quickPick.severity = Severity.Ignore;
-			quickPick.validationMessage = undefined;
-		};
-
-		disposables.add(quickPick.onDidChangeSelection(items => {
-			let needUpdate = false;
-			for (const resource of resources) {
-				resource.picked = items.includes(resource);
-				const description = resource.picked ? undefined : localize('use default profile', "Using Default Profile");
-				if (resource.description !== description) {
-					resource.description = description;
-					needUpdate = true;
-				}
-			}
-			if (needUpdate) {
-				update();
-			}
-			validate();
-		}));
-
-		disposables.add(quickPick.onDidChangeValue(validate));
-
-		let icon = DEFAULT_ICON;
-		if (profile?.icon) {
-			icon = ThemeIcon.fromId(profile.icon);
-		}
-		if (isUserDataProfileTemplate(source) && source.icon) {
-			icon = ThemeIcon.fromId(source.icon);
-		}
-		if (icon.id !== DEFAULT_ICON.id && !ICONS.some(({ id }) => id === icon.id) && !getAllCodicons().some(({ id }) => id === icon.id)) {
-			icon = DEFAULT_ICON;
-		}
-		let result: { name: string; items: ReadonlyArray<IQuickPickItem>; icon?: string | null } | undefined;
-		disposables.add(Event.any(quickPick.onDidCustom, quickPick.onDidAccept)(() => {
-			const name = quickPick.value.trim();
-			if (!name) {
-				quickPick.validationMessage = localize('name required', "Profile name is required and must be a non-empty value.");
-				quickPick.severity = Severity.Error;
-			}
-			if (quickPick.validationMessage) {
-				return;
-			}
-			result = { name, items: quickPick.selectedItems, icon: icon.id === DEFAULT_ICON.id ? null : icon.id };
-			quickPick.hide();
-			quickPick.severity = Severity.Ignore;
-			quickPick.validationMessage = undefined;
-		}));
-
-		const domNode = DOM.$('.profile-edit-widget');
-
-		const profileIconContainer = DOM.$('.profile-icon-container');
-		DOM.append(profileIconContainer, DOM.$('.profile-icon-label', undefined, localize('icon', "Icon:")));
-		const profileIconElement = DOM.append(profileIconContainer, DOM.$(`.profile-icon${ThemeIcon.asCSSSelector(icon)}`));
-		profileIconElement.tabIndex = 0;
-		profileIconElement.role = 'button';
-		profileIconElement.ariaLabel = localize('select icon', "Icon: {0}", icon.id);
-		const iconSelectBox = disposables.add(this.instantiationService.createInstance(WorkbenchIconSelectBox, { icons: ICONS, inputBoxStyles: defaultInputBoxStyles }));
-		const dimension = new DOM.Dimension(486, 260);
-		iconSelectBox.layout(dimension);
-		let hoverWidget: IHoverWidget | undefined;
-
-		const updateIcon = (updated: ThemeIcon | undefined) => {
-			icon = updated ?? DEFAULT_ICON;
-			profileIconElement.className = `profile-icon ${ThemeIcon.asClassName(icon)}`;
-			profileIconElement.ariaLabel = localize('select icon', "Icon: {0}", icon.id);
-		};
-		disposables.add(iconSelectBox.onDidSelect(selectedIcon => {
-			if (icon.id !== selectedIcon.id) {
-				updateIcon(selectedIcon);
-			}
-			hoverWidget?.dispose();
-			profileIconElement.focus();
-		}));
-		const showIconSelectBox = () => {
-			iconSelectBox.clearInput();
-			hoverWidget = this.hoverService.showHover({
-				content: iconSelectBox.domNode,
-				target: profileIconElement,
-				position: {
-					hoverPosition: HoverPosition.BELOW,
-				},
-				persistence: {
-					sticky: true,
-				},
-				appearance: {
-					showPointer: true,
-				},
-			}, true);
-			if (hoverWidget) {
-				iconSelectBox.layout(dimension);
-				disposables.add(hoverWidget);
-			}
-			iconSelectBox.focus();
-		};
-		disposables.add(DOM.addDisposableListener(profileIconElement, DOM.EventType.CLICK, (e: MouseEvent) => {
-			DOM.EventHelper.stop(e, true);
-			showIconSelectBox();
-		}));
-		disposables.add(DOM.addDisposableListener(profileIconElement, DOM.EventType.KEY_DOWN, e => {
-			const event = new StandardKeyboardEvent(e);
-			if (event.equals(KeyCode.Enter) || event.equals(KeyCode.Space)) {
-				DOM.EventHelper.stop(event, true);
-				showIconSelectBox();
-			}
-		}));
-		disposables.add(DOM.addDisposableListener(iconSelectBox.domNode, DOM.EventType.KEY_DOWN, e => {
-			const event = new StandardKeyboardEvent(e);
-			if (event.equals(KeyCode.Escape)) {
-				DOM.EventHelper.stop(event, true);
-				hoverWidget?.dispose();
-				profileIconElement.focus();
-			}
-		}));
-
-		if (!profile && !isUserDataProfileTemplate(source)) {
-			const profileTypeContainer = DOM.append(domNode, DOM.$('.profile-type-container'));
-			DOM.append(profileTypeContainer, DOM.$('.profile-type-create-label', undefined, localize('create from', "Copy from:")));
-			const separator = { text: '\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500', isDisabled: true };
-			const profileOptions: (ISelectOptionItem & { id?: string; source?: IUserDataProfile | URI })[] = [];
-			profileOptions.push({ text: localize('empty profile', "None") });
-			const templates = await this.userDataProfileManagementService.getBuiltinProfileTemplates();
-			if (templates.length) {
-				profileOptions.push({ ...separator, decoratorRight: localize('from templates', "Profile Templates") });
-				for (const template of templates) {
-					profileOptions.push({ text: template.name, id: template.url, source: URI.parse(template.url) });
-				}
-			}
-			profileOptions.push({ ...separator, decoratorRight: localize('from existing profiles', "Existing Profiles") });
-			for (const profile of this.userDataProfilesService.profiles) {
-				profileOptions.push({ text: profile.name, id: profile.id, source: profile });
-			}
-
-			const findOptionIndex = () => {
-				const index = profileOptions.findIndex(option => {
-					if (source instanceof URI) {
-						return option.source instanceof URI && this.uriIdentityService.extUri.isEqual(option.source, source);
-					} else if (isUserDataProfile(source)) {
-						return option.id === source.id;
-					}
-					return false;
-				});
-				return index > -1 ? index : 0;
-			};
-
-			const initialIndex = findOptionIndex();
-			const selectBox = disposables.add(this.instantiationService.createInstance(SelectBox,
-				profileOptions,
-				initialIndex,
-				this.contextViewService,
-				defaultSelectBoxStyles,
-				{
-					useCustomDrawn: true,
-					ariaLabel: localize('copy profile from', "Copy profile from"),
-				}
-			));
-			selectBox.render(DOM.append(profileTypeContainer, DOM.$('.profile-type-select-container')));
-
-			if (profileOptions[initialIndex].source) {
-				quickPick.value = this.generateProfileName(profileOptions[initialIndex].text);
-			}
-
-			const updateOptions = () => {
-				const option = profileOptions[findOptionIndex()];
-				for (const resource of resources) {
-					resource.picked = option.source && !(option.source instanceof URI) ? !option.source?.useDefaultFlags?.[resource.id] : true;
-				}
-				updateIcon(!(option.source instanceof URI) && option.source?.icon ? ThemeIcon.fromId(option.source.icon) : undefined);
-				update();
-			};
-
-			updateOptions();
-			disposables.add(selectBox.onDidSelect(({ index }) => {
-				source = profileOptions[index].source;
-				updateOptions();
-			}));
-		}
-
-		DOM.append(domNode, profileIconContainer);
-
-		quickPick.widget = domNode;
-		quickPick.show();
-
-		await new Promise<void>((c, e) => {
-			disposables.add(quickPick.onDidHide(() => {
-				disposables.dispose();
-				c();
-			}));
-		});
-
-		if (!result) {
-			if (profile) {
-				this.telemetryService.publicLog2<{}, SaveProfileInfoClassification>('userDataProfile.cancelEdit');
-			} else {
-				this.telemetryService.publicLog2<CreateProfileInfoEvent, CreateProfileInfoClassification>('userDataProfile.cancelCreate', createProfileTelemetryData);
-			}
-			return;
-		}
-
 		try {
-			const useDefaultFlags: UseDefaultProfileFlags | undefined = result.items.length === resources.length
-				? undefined
-				: {
-					settings: !result.items.includes(settings),
-					keybindings: !result.items.includes(keybindings),
-					snippets: !result.items.includes(snippets),
-					tasks: !result.items.includes(tasks),
-					extensions: !result.items.includes(extensions)
-				};
-			if (profile) {
-				await this.userDataProfileManagementService.updateProfile(profile, { name: result.name, icon: result.icon, useDefaultFlags: profile.useDefaultFlags && !useDefaultFlags ? {} : useDefaultFlags });
-			} else {
-				if (source instanceof URI) {
-					this.telemetryService.publicLog2<CreateProfileInfoEvent, CreateProfileInfoClassification>('userDataProfile.createFromTemplate', createProfileTelemetryData);
-					await this.importProfile(source, { mode: 'apply', name: result.name, useDefaultFlags, icon: result.icon ? result.icon : undefined });
-				} else if (isUserDataProfile(source)) {
-					this.telemetryService.publicLog2<CreateProfileInfoEvent, CreateProfileInfoClassification>('userDataProfile.createFromProfile', createProfileTelemetryData);
-					await this._createFromProfile(source, result.name, { useDefaultFlags, icon: result.icon ? result.icon : undefined });
-				} else if (isUserDataProfileTemplate(source)) {
-					source.name = result.name;
-					this.telemetryService.publicLog2<CreateProfileInfoEvent, CreateProfileInfoClassification>('userDataProfile.createFromExternalTemplate', createProfileTelemetryData);
-					await this.createAndSwitch(source, false, true, { useDefaultFlags, icon: result.icon ? result.icon : undefined }, localize('create profile', "Create Profile"));
-				} else {
-					this.telemetryService.publicLog2<CreateProfileInfoEvent, CreateProfileInfoClassification>('userDataProfile.createEmptyProfile', createProfileTelemetryData);
-					await this.userDataProfileManagementService.createAndEnterProfile(result.name, { useDefaultFlags, icon: result.icon ? result.icon : undefined });
-				}
-			}
-		} catch (error) {
-			this.notificationService.error(error);
-		}
-	}
-
-	async showProfileContents(): Promise<void> {
-		const view = this.viewsService.getViewWithId(EXPORT_PROFILE_PREVIEW_VIEW);
-		if (view) {
-			this.viewsService.openView(view.id, true);
-			return;
-		}
-		const disposables = new DisposableStore();
-		try {
-			const userDataProfilesExportState = disposables.add(this.instantiationService.createInstance(UserDataProfileExportState, this.userDataProfileService.currentProfile, undefined));
-			const barrier = new Barrier();
-			const exportAction = new BarrierAction(barrier, new Action('export', localize('export', "Export"), undefined, true, async () => {
-				exportAction.enabled = false;
-				try {
-					await this.doExportProfile(userDataProfilesExportState, EXPORT_PROFILE_PREVIEW_VIEW);
-				} catch (error) {
-					exportAction.enabled = true;
-					this.notificationService.error(error);
-					throw error;
-				}
-			}), this.notificationService);
-			const closeAction = new BarrierAction(barrier, new Action('close', localize('close', "Close")), this.notificationService);
-			await this.showProfilePreviewView(EXPORT_PROFILE_PREVIEW_VIEW, userDataProfilesExportState.profile.name, exportAction, closeAction, true, userDataProfilesExportState);
-			disposables.add(this.userDataProfileService.onDidChangeCurrentProfile(e => barrier.open()));
-			await barrier.wait();
-			await this.hideProfilePreviewView(EXPORT_PROFILE_PREVIEW_VIEW);
-		} finally {
-			disposables.dispose();
-		}
-	}
-
-	async exportProfile(profile: IUserDataProfile): Promise<void> {
-		const disposables = new DisposableStore();
-		try {
-			const userDataProfilesExportState = disposables.add(this.instantiationService.createInstance(UserDataProfileExportState, profile, undefined));
+			const userDataProfilesExportState = disposables.add(this.instantiationService.createInstance(UserDataProfileExportState, profile, exportFlags));
 			await this.doExportProfile(userDataProfilesExportState, ProgressLocation.Notification);
 		} finally {
 			disposables.dispose();
 		}
 	}
 
-	private async _createFromProfile(profile: IUserDataProfile, name: string, options?: IUserDataProfileCreateOptions): Promise<void> {
-		const userDataProfilesExportState = this.instantiationService.createInstance(UserDataProfileExportState, profile, options?.resourceTypeFlags);
-		try {
-			const profileTemplate = await userDataProfilesExportState.getProfileTemplate(name, options?.icon);
-			await this.progressService.withProgress({
-				location: ProgressLocation.Notification,
-				delay: 500,
-				sticky: true,
-			}, async progress => {
-				const reportProgress = (message: string) => progress.report({ message: localize('create from profile', "Create Profile: {0}", message) });
-				const createdProfile = await this.doCreateProfile(profileTemplate, false, false, { useDefaultFlags: options?.useDefaultFlags, icon: options?.icon, transient: options?.transient }, reportProgress);
-				if (createdProfile) {
-					if (options?.resourceTypeFlags?.extensions ?? true) {
-						reportProgress(localize('progress extensions', "Applying Extensions..."));
-						await this.instantiationService.createInstance(ExtensionsResource).copy(profile, createdProfile, false);
-					}
-					reportProgress(localize('switching profile', "Switching Profile..."));
-					await this.userDataProfileManagementService.switchProfile(createdProfile);
-				}
-			});
-		} finally {
-			userDataProfilesExportState.dispose();
-		}
-	}
-
 	async createTroubleshootProfile(): Promise<void> {
 		const userDataProfilesExportState = this.instantiationService.createInstance(UserDataProfileExportState, this.userDataProfileService.currentProfile, undefined);
 		try {
@@ -754,9 +258,7 @@ export class UserDataProfileImportExportService extends Disposable implements IU
 			return;
 		}
 
-		this.isProfileExportInProgressContextKey.set(true);
 		const disposables = new DisposableStore();
-		disposables.add(toDisposable(() => this.isProfileExportInProgressContextKey.set(false)));
 
 		try {
 			await this.progressService.withProgress({
@@ -866,128 +368,6 @@ export class UserDataProfileImportExportService extends Disposable implements IU
 		return profileTemplate;
 	}
 
-	private async importAndPreviewProfile(uri: URI, profileTemplate: IUserDataProfileTemplate, options: IUserDataProfileOptions | undefined): Promise<void> {
-		const disposables = new DisposableStore();
-
-		try {
-			const userDataProfileImportState = disposables.add(this.instantiationService.createInstance(UserDataProfileImportState, profileTemplate));
-			profileTemplate = await userDataProfileImportState.getProfileTemplateToImport();
-
-			const importedProfile = await this.createAndSwitch(profileTemplate, true, false, options, localize('preview profile', "Preview Profile"));
-
-			if (!importedProfile) {
-				return;
-			}
-
-			const barrier = new Barrier();
-			const importAction = this.getCreateAction(barrier, userDataProfileImportState);
-			const primaryAction = isWeb
-				? new Action('importInDesktop', localize('import in desktop', "Create Profile in {0}", this.productService.nameLong), undefined, true, async () => this.openerService.open(uri, { openExternal: true }))
-				: importAction;
-			const secondaryAction = isWeb
-				? importAction
-				: new BarrierAction(barrier, new Action('close', localize('close', "Close")), this.notificationService);
-
-			const view = await this.showProfilePreviewView(IMPORT_PROFILE_PREVIEW_VIEW, importedProfile.name, primaryAction, secondaryAction, false, userDataProfileImportState);
-			const message = new MarkdownString();
-			message.appendMarkdown(localize('preview profile message', "By default, extensions aren't installed when previewing a profile on the web. You can still install them manually before importing the profile. "));
-			message.appendMarkdown(`[${localize('learn more', "Learn more")}](https://aka.ms/vscode-extension-marketplace#_can-i-trust-extensions-from-the-marketplace).`);
-			view.setMessage(message);
-
-			const that = this;
-			const disposable = disposables.add(registerAction2(class extends Action2 {
-				constructor() {
-					super({
-						id: 'previewProfile.installExtensions',
-						title: localize('install extensions title', "Install Extensions"),
-						icon: Codicon.cloudDownload,
-						menu: {
-							id: MenuId.ViewItemContext,
-							group: 'inline',
-							when: ContextKeyExpr.and(ContextKeyExpr.equals('view', IMPORT_PROFILE_PREVIEW_VIEW), ContextKeyExpr.equals('viewItem', ProfileResourceType.Extensions)),
-						}
-					});
-				}
-				override async run(): Promise<void> {
-					return that.progressService.withProgress({
-						location: IMPORT_PROFILE_PREVIEW_VIEW,
-					}, async progress => {
-						view.setMessage(undefined);
-						const profileTemplate = await userDataProfileImportState.getProfileTemplateToImport();
-						if (profileTemplate.extensions) {
-							await that.instantiationService.createInstance(ExtensionsResource).apply(profileTemplate.extensions, importedProfile);
-						}
-						disposable.dispose();
-					});
-				}
-			}));
-			disposables.add(Event.debounce(this.extensionManagementService.onDidInstallExtensions, () => undefined, 100)(async () => {
-				const profileTemplate = await userDataProfileImportState.getProfileTemplateToImport();
-				if (profileTemplate.extensions) {
-					const profileExtensions = await that.instantiationService.createInstance(ExtensionsResource).getProfileExtensions(profileTemplate.extensions);
-					const installed = await this.extensionManagementService.getInstalled(ExtensionType.User);
-					if (profileExtensions.every(e => installed.some(i => areSameExtensions(e.identifier, i.identifier)))) {
-						disposable.dispose();
-					}
-				}
-			}));
-
-			await barrier.wait();
-			await this.hideProfilePreviewView(IMPORT_PROFILE_PREVIEW_VIEW);
-		} finally {
-			disposables.dispose();
-		}
-	}
-
-	private async previewProfile(profileTemplate: IUserDataProfileTemplate, options: IUserDataProfileOptions | undefined): Promise<void> {
-		const disposables = new DisposableStore();
-		try {
-			const userDataProfileImportState = disposables.add(this.instantiationService.createInstance(UserDataProfileImportState, profileTemplate));
-			if (userDataProfileImportState.isEmpty()) {
-				await this.createAndSwitch(profileTemplate, false, true, options, localize('create profile', "Create Profile"));
-			} else {
-				const barrier = new Barrier();
-				const cancelAction = new BarrierAction(barrier, new Action('cancel', localize('cancel', "Cancel")), this.notificationService);
-				const importAction = this.getCreateAction(barrier, userDataProfileImportState, cancelAction);
-				await this.showProfilePreviewView(IMPORT_PROFILE_PREVIEW_VIEW, profileTemplate.name, importAction, cancelAction, false, userDataProfileImportState);
-				await barrier.wait();
-				await this.hideProfilePreviewView(IMPORT_PROFILE_PREVIEW_VIEW);
-			}
-		} finally {
-			disposables.dispose();
-		}
-	}
-
-	private getCreateAction(barrier: Barrier, userDataProfileImportState: UserDataProfileImportState, cancelAction?: IAction): IAction {
-		const importAction = new BarrierAction(barrier, new Action('title', localize('import', "Create Profile"), undefined, true, async () => {
-			importAction.enabled = false;
-			if (cancelAction) {
-				cancelAction.enabled = false;
-			}
-			const profileTemplate = await userDataProfileImportState.getProfileTemplateToImport();
-			return this.saveProfile(undefined, profileTemplate);
-		}), this.notificationService);
-		return importAction;
-	}
-
-	private async createAndSwitch(profileTemplate: IUserDataProfileTemplate, temporaryProfile: boolean, extensions: boolean, options: IUserDataProfileOptions | undefined, title: string): Promise<IUserDataProfile | undefined> {
-		return this.progressService.withProgress({
-			location: ProgressLocation.Notification,
-			delay: 500,
-			sticky: true,
-		}, async (progress) => {
-			title = `${title} (${profileTemplate.name})`;
-			progress.report({ message: title });
-			const reportProgress = (message: string) => progress.report({ message: `${title}: ${message}` });
-			const profile = await this.doCreateProfile(profileTemplate, temporaryProfile, extensions, options, reportProgress);
-			if (profile) {
-				reportProgress(localize('switching profile', "Switching Profile..."));
-				await this.userDataProfileManagementService.switchProfile(profile);
-			}
-			return profile;
-		});
-	}
-
 	private async doCreateProfile(profileTemplate: IUserDataProfileTemplate, temporaryProfile: boolean, extensions: boolean, options: IUserDataProfileOptions | undefined, progress: (message: string) => void): Promise<IUserDataProfile | undefined> {
 		const profile = await this.getProfileToImport(profileTemplate, temporaryProfile, options);
 		if (!profile) {
@@ -1027,13 +407,13 @@ export class UserDataProfileImportExportService extends Disposable implements IU
 			return this.fileUserDataProfileContentHandler.readProfile(resource, CancellationToken.None);
 		}
 
-		if (this.isProfileURL(resource)) {
+		if (isProfileURL(resource)) {
 			let handlerId: string, idOrUri: string | URI;
 			if (resource.authority === PROFILE_URL_AUTHORITY) {
 				idOrUri = this.uriIdentityService.extUri.basename(resource);
 				handlerId = this.uriIdentityService.extUri.basename(this.uriIdentityService.extUri.dirname(resource));
 			} else {
-				handlerId = resource.authority.substring(UserDataProfileImportExportService.PROFILE_URL_AUTHORITY_PREFIX.length);
+				handlerId = resource.authority.substring(PROFILE_URL_AUTHORITY_PREFIX.length);
 				idOrUri = URI.parse(resource.path.substring(1));
 			}
 			await this.extensionService.activateByEvent(`onProfile:${handlerId}`);
@@ -1098,11 +478,6 @@ export class UserDataProfileImportExportService extends Disposable implements IU
 		}
 	}
 
-	private generateProfileName(profileName: string): string {
-		const existingProfile = this.userDataProfilesService.profiles.find(p => p.name === profileName);
-		return existingProfile ? `${profileName} ${this.getProfileNameIndex(profileName)}` : profileName;
-	}
-
 	private getProfileNameIndex(name: string): number {
 		const nameRegEx = new RegExp(`${escapeRegExpCharacters(name)}\\s(\\d+)`);
 		let nameIndex = 0;
@@ -1114,44 +489,6 @@ export class UserDataProfileImportExportService extends Disposable implements IU
 		return nameIndex + 1;
 	}
 
-	private async showProfilePreviewView(id: string, name: string, primary: IAction, secondary: IAction, refreshAction: boolean, userDataProfilesData: UserDataProfileImportExportState): Promise<UserDataProfilePreviewViewPane> {
-		const viewsRegistry = Registry.as<IViewsRegistry>(Extensions.ViewsRegistry);
-		const treeView = this.instantiationService.createInstance(TreeView, id, name);
-		if (refreshAction) {
-			treeView.showRefreshAction = true;
-		}
-		const actionRunner = new ActionRunner();
-		const descriptor: ITreeViewDescriptor = {
-			id,
-			name: { value: name, original: name },
-			ctorDescriptor: new SyncDescriptor(UserDataProfilePreviewViewPane, [userDataProfilesData, primary, secondary, actionRunner]),
-			canToggleVisibility: false,
-			canMoveView: false,
-			treeView,
-			collapsed: false,
-		};
-
-		viewsRegistry.registerViews([descriptor], this.viewContainer);
-		return (await this.viewsService.openView<UserDataProfilePreviewViewPane>(id, true))!;
-	}
-
-	private async hideProfilePreviewView(id: string): Promise<void> {
-		const viewsRegistry = Registry.as<IViewsRegistry>(Extensions.ViewsRegistry);
-		const viewDescriptor = viewsRegistry.getView(id);
-		if (viewDescriptor) {
-			(viewDescriptor as ITreeViewDescriptor).treeView.dispose();
-			viewsRegistry.deregisterViews([viewDescriptor], this.viewContainer);
-		}
-		await this.closeAllImportExportPreviewEditors();
-	}
-
-	private async closeAllImportExportPreviewEditors(): Promise<void> {
-		const editorsToColse = this.editorService.getEditors(EditorsOrder.SEQUENTIAL).filter(({ editor }) => editor.resource?.scheme === USER_DATA_PROFILE_EXPORT_SCHEME || editor.resource?.scheme === USER_DATA_PROFILE_EXPORT_PREVIEW_SCHEME || editor.resource?.scheme === USER_DATA_PROFILE_IMPORT_PREVIEW_SCHEME);
-		if (editorsToColse.length) {
-			await this.editorService.closeEditors(editorsToColse);
-		}
-	}
-
 }
 
 class FileUserDataProfileContentHandler implements IUserDataProfileContentHandler {
@@ -1163,6 +500,7 @@ class FileUserDataProfileContentHandler implements IUserDataProfileContentHandle
 		@IFileDialogService private readonly fileDialogService: IFileDialogService,
 		@IUriIdentityService private readonly uriIdentityService: IUriIdentityService,
 		@IFileService private readonly fileService: IFileService,
+		@IProductService private readonly productService: IProductService,
 		@ITextFileService private readonly textFileService: ITextFileService,
 	) { }
 
@@ -1180,7 +518,7 @@ class FileUserDataProfileContentHandler implements IUserDataProfileContentHandle
 	}
 
 	async canHandle(uri: URI): Promise<boolean> {
-		return uri.scheme !== Schemas.http && uri.scheme !== Schemas.https && await this.fileService.canHandleResource(uri);
+		return uri.scheme !== Schemas.http && uri.scheme !== Schemas.https && uri.scheme !== this.productService.urlProtocol && await this.fileService.canHandleResource(uri);
 	}
 
 	async readProfile(uri: URI, token: CancellationToken): Promise<string | null> {
@@ -1203,138 +541,8 @@ class FileUserDataProfileContentHandler implements IUserDataProfileContentHandle
 
 }
 
-class UserDataProfilePreviewViewPane extends TreeViewPane {
-
-	private buttonsContainer!: HTMLElement;
-	private primaryButton!: Button;
-	private secondaryButton!: Button;
-	private messageContainer!: HTMLElement;
-	private dimension: DOM.Dimension | undefined;
-	private totalTreeItemsCount: number = 0;
-
-	constructor(
-		private readonly userDataProfileData: UserDataProfileImportExportState,
-		private readonly primaryAction: Action,
-		private readonly secondaryAction: Action,
-		private readonly actionRunner: IActionRunner,
-		options: IViewletViewOptions,
-		@IKeybindingService keybindingService: IKeybindingService,
-		@IContextMenuService contextMenuService: IContextMenuService,
-		@IConfigurationService configurationService: IConfigurationService,
-		@IContextKeyService contextKeyService: IContextKeyService,
-		@IViewDescriptorService viewDescriptorService: IViewDescriptorService,
-		@IInstantiationService instantiationService: IInstantiationService,
-		@IOpenerService openerService: IOpenerService,
-		@IThemeService themeService: IThemeService,
-		@ITelemetryService telemetryService: ITelemetryService,
-		@INotificationService notificationService: INotificationService,
-		@IHoverService hoverService: IHoverService,
-		@IAccessibleViewInformationService accessibleViewService: IAccessibleViewInformationService,
-	) {
-		super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, notificationService, hoverService, accessibleViewService);
-	}
-
-	protected override renderTreeView(container: HTMLElement): void {
-		this.treeView.dataProvider = this.userDataProfileData;
-		super.renderTreeView(DOM.append(container, DOM.$('.profile-view-tree-container')));
-		this.messageContainer = DOM.append(container, DOM.$('.profile-view-message-container.hide'));
-		this.createButtons(container);
-		this._register(this.treeView.onDidChangeCheckboxState(() => this.updateConfirmButtonEnablement()));
-		this.computeAndLayout();
-		this._register(Event.any(this.userDataProfileData.onDidChangeRoots, this.treeView.onDidCollapseItem, this.treeView.onDidExpandItem)(() => this.computeAndLayout()));
-	}
-
-	private async computeAndLayout() {
-		const roots = await this.userDataProfileData.getRoots();
-		const children = await Promise.all(roots.map(async (root) => {
-			let expanded = root.collapsibleState === TreeItemCollapsibleState.Expanded;
-			try {
-				expanded = !this.treeView.isCollapsed(root);
-			} catch (error) { /* Ignore because element might not be added yet */ }
-			if (expanded) {
-				const children = await root.getChildren();
-				return children ?? [];
-			}
-			return [];
-		}));
-		this.totalTreeItemsCount = roots.length + children.flat().length;
-		this.updateConfirmButtonEnablement();
-		if (this.dimension) {
-			this.layoutTreeView(this.dimension.height, this.dimension.width);
-		}
-	}
-
-	private createButtons(container: HTMLElement): void {
-		this.buttonsContainer = DOM.append(container, DOM.$('.profile-view-buttons-container'));
-
-		this.primaryButton = this._register(new Button(this.buttonsContainer, { ...defaultButtonStyles }));
-		this.primaryButton.element.classList.add('profile-view-button');
-		this.primaryButton.label = this.primaryAction.label;
-		this.primaryButton.enabled = this.primaryAction.enabled;
-		this._register(this.primaryButton.onDidClick(() => this.actionRunner.run(this.primaryAction)));
-		this._register(this.primaryAction.onDidChange(e => {
-			if (e.enabled !== undefined) {
-				this.primaryButton.enabled = e.enabled;
-			}
-		}));
-
-		this.secondaryButton = this._register(new Button(this.buttonsContainer, { secondary: true, ...defaultButtonStyles }));
-		this.secondaryButton.label = this.secondaryAction.label;
-		this.secondaryButton.element.classList.add('profile-view-button');
-		this.secondaryButton.enabled = this.secondaryAction.enabled;
-		this._register(this.secondaryButton.onDidClick(() => this.actionRunner.run(this.secondaryAction)));
-		this._register(this.secondaryAction.onDidChange(e => {
-			if (e.enabled !== undefined) {
-				this.secondaryButton.enabled = e.enabled;
-			}
-		}));
-	}
-
-	protected override layoutTreeView(height: number, width: number): void {
-		this.dimension = new DOM.Dimension(width, height);
-
-		let messageContainerHeight = 0;
-		if (!this.messageContainer.classList.contains('hide')) {
-			messageContainerHeight = DOM.getClientArea(this.messageContainer).height;
-		}
-
-		const buttonContainerHeight = 108;
-		this.buttonsContainer.style.height = `${buttonContainerHeight}px`;
-		this.buttonsContainer.style.width = `${width}px`;
-
-		super.layoutTreeView(Math.min(height - buttonContainerHeight - messageContainerHeight, 22 * this.totalTreeItemsCount), width);
-	}
-
-	private updateConfirmButtonEnablement(): void {
-		this.primaryButton.enabled = this.primaryAction.enabled && this.userDataProfileData.isEnabled();
-	}
-
-	private readonly renderDisposables = this._register(new DisposableStore());
-	setMessage(message: MarkdownString | undefined): void {
-		this.messageContainer.classList.toggle('hide', !message);
-		DOM.clearNode(this.messageContainer);
-		if (message) {
-			this.renderDisposables.clear();
-			const rendered = this.renderDisposables.add(renderMarkdown(message, {
-				actionHandler: {
-					callback: (content) => {
-						this.openerService.open(content, { allowCommands: true }).catch(onUnexpectedError);
-					},
-					disposables: this.renderDisposables
-				}
-			}));
-			DOM.append(this.messageContainer, rendered.element);
-		}
-	}
-
-	refresh(): Promise<void> {
-		return this.treeView.refresh();
-	}
-}
-
 const USER_DATA_PROFILE_EXPORT_SCHEME = 'userdataprofileexport';
 const USER_DATA_PROFILE_EXPORT_PREVIEW_SCHEME = 'userdataprofileexportpreview';
-const USER_DATA_PROFILE_IMPORT_PREVIEW_SCHEME = 'userdataprofileimportpreview';
 
 abstract class UserDataProfileImportExportState extends Disposable implements ITreeViewDataProvider {
 
@@ -1572,107 +780,4 @@ class UserDataProfileExportState extends UserDataProfileImportExportState {
 
 }
 
-class UserDataProfileImportState extends UserDataProfileImportExportState {
-
-	private readonly disposables = this._register(new DisposableStore());
-
-	constructor(
-		readonly profile: IUserDataProfileTemplate,
-		@IFileService private readonly fileService: IFileService,
-		@IQuickInputService quickInputService: IQuickInputService,
-		@IInstantiationService private readonly instantiationService: IInstantiationService
-	) {
-		super(quickInputService);
-	}
-
-	protected async fetchRoots(): Promise<IProfileResourceTreeItem[]> {
-		this.disposables.clear();
-
-		const inMemoryProvider = this._register(new InMemoryFileSystemProvider());
-		this.disposables.add(this.fileService.registerProvider(USER_DATA_PROFILE_IMPORT_PREVIEW_SCHEME, inMemoryProvider));
-		const roots: IProfileResourceTreeItem[] = [];
-		const importPreviewProfle = toUserDataProfile(generateUuid(), this.profile.name, URI.file('/root').with({ scheme: USER_DATA_PROFILE_IMPORT_PREVIEW_SCHEME }), URI.file('/cache').with({ scheme: USER_DATA_PROFILE_IMPORT_PREVIEW_SCHEME }));
-
-		if (this.profile.settings) {
-			const settingsResource = this.instantiationService.createInstance(SettingsResource);
-			await settingsResource.apply(this.profile.settings, importPreviewProfle);
-			const settingsResourceTreeItem = this.instantiationService.createInstance(SettingsResourceTreeItem, importPreviewProfle);
-			if (await settingsResourceTreeItem.hasContent()) {
-				roots.push(settingsResourceTreeItem);
-			}
-		}
-
-		if (this.profile.keybindings) {
-			const keybindingsResource = this.instantiationService.createInstance(KeybindingsResource);
-			await keybindingsResource.apply(this.profile.keybindings, importPreviewProfle);
-			const keybindingsResourceTreeItem = this.instantiationService.createInstance(KeybindingsResourceTreeItem, importPreviewProfle);
-			if (await keybindingsResourceTreeItem.hasContent()) {
-				roots.push(keybindingsResourceTreeItem);
-			}
-		}
-
-		if (this.profile.snippets) {
-			const snippetsResource = this.instantiationService.createInstance(SnippetsResource);
-			await snippetsResource.apply(this.profile.snippets, importPreviewProfle);
-			const snippetsResourceTreeItem = this.instantiationService.createInstance(SnippetsResourceTreeItem, importPreviewProfle);
-			if (await snippetsResourceTreeItem.hasContent()) {
-				roots.push(snippetsResourceTreeItem);
-			}
-		}
-
-		if (this.profile.tasks) {
-			const tasksResource = this.instantiationService.createInstance(TasksResource);
-			await tasksResource.apply(this.profile.tasks, importPreviewProfle);
-			const tasksResourceTreeItem = this.instantiationService.createInstance(TasksResourceTreeItem, importPreviewProfle);
-			if (await tasksResourceTreeItem.hasContent()) {
-				roots.push(tasksResourceTreeItem);
-			}
-		}
-
-		if (this.profile.globalState) {
-			const globalStateResource = joinPath(importPreviewProfle.globalStorageHome, 'globalState.json');
-			const content = VSBuffer.fromString(JSON.stringify(JSON.parse(this.profile.globalState), null, '\t'));
-			if (content) {
-				await this.fileService.writeFile(globalStateResource, content);
-				roots.push(this.instantiationService.createInstance(GlobalStateResourceImportTreeItem, this.profile.globalState, globalStateResource));
-			}
-		}
-
-		if (this.profile.extensions) {
-			const extensionsResourceTreeItem = this.instantiationService.createInstance(ExtensionsResourceImportTreeItem, this.profile.extensions);
-			if (await extensionsResourceTreeItem.hasContent()) {
-				roots.push(extensionsResourceTreeItem);
-			}
-		}
-
-		inMemoryProvider.setReadOnly(true);
-
-		return roots;
-	}
-
-	isEmpty(): boolean {
-		return !(this.profile.settings || this.profile.keybindings || this.profile.tasks || this.profile.snippets || this.profile.globalState || this.profile.extensions);
-	}
-
-	async getProfileTemplateToImport(): Promise<IUserDataProfileTemplate> {
-		return this.getProfileTemplate(this.profile.name, this.profile.icon);
-	}
-
-}
-
-class BarrierAction extends Action {
-	constructor(barrier: Barrier, action: Action,
-		notificationService: INotificationService) {
-		super(action.id, action.label, action.class, action.enabled, async () => {
-			try {
-				await action.run();
-			} catch (error) {
-				notificationService.error(error);
-				throw error;
-			}
-			barrier.open();
-		});
-	}
-}
-
 registerSingleton(IUserDataProfileImportExportService, UserDataProfileImportExportService, InstantiationType.Delayed);
diff --git a/src/vs/workbench/services/userDataProfile/common/userDataProfile.ts b/src/vs/workbench/services/userDataProfile/common/userDataProfile.ts
index e5c260e0510..3efc285c1f8 100644
--- a/src/vs/workbench/services/userDataProfile/common/userDataProfile.ts
+++ b/src/vs/workbench/services/userDataProfile/common/userDataProfile.ts
@@ -6,7 +6,6 @@
 import { isUndefined } from 'vs/base/common/types';
 import { Event } from 'vs/base/common/event';
 import { localize, localize2 } from 'vs/nls';
-import { MenuId } from 'vs/platform/actions/common/actions';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { IUserDataProfile, IUserDataProfileOptions, IUserDataProfileUpdateOptions, ProfileResourceType, ProfileResourceTypeFlags } from 'vs/platform/userDataProfile/common/userDataProfile';
 import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
@@ -81,6 +80,11 @@ export function toUserDataProfileUri(path: string, productService: IProductServi
 	});
 }
 
+export const PROFILE_URL_AUTHORITY_PREFIX = 'profile-';
+export function isProfileURL(uri: URI): boolean {
+	return uri.authority === PROFILE_URL_AUTHORITY || new RegExp(`^${PROFILE_URL_AUTHORITY_PREFIX}`).test(uri.authority);
+}
+
 export interface IUserDataProfileCreateOptions extends IUserDataProfileOptions {
 	readonly name?: string;
 	readonly resourceTypeFlags?: ProfileResourceTypeFlags;
@@ -89,7 +93,7 @@ export interface IUserDataProfileCreateOptions extends IUserDataProfileOptions {
 export interface IProfileImportOptions extends IUserDataProfileCreateOptions {
 	readonly name?: string;
 	readonly icon?: string;
-	readonly mode?: 'preview' | 'apply' | 'both';
+	readonly mode?: 'apply';
 }
 
 export const IUserDataProfileImportExportService = createDecorator<IUserDataProfileImportExportService>('IUserDataProfileImportExportService');
@@ -100,12 +104,7 @@ export interface IUserDataProfileImportExportService {
 	unregisterProfileContentHandler(id: string): void;
 
 	resolveProfileTemplate(uri: URI): Promise<IUserDataProfileTemplate | null>;
-	exportProfile(profile: IUserDataProfile): Promise<void>;
-	exportProfile2(): Promise<void>;
-	importProfile(uri: URI, options?: IProfileImportOptions): Promise<void>;
-	showProfileContents(): Promise<void>;
-	createProfile(from?: IUserDataProfile | URI): Promise<void>;
-	editProfile(profile: IUserDataProfile): Promise<void>;
+	exportProfile(profile: IUserDataProfile, exportFlags?: ProfileResourceTypeFlags): Promise<void>;
 	createFromProfile(from: IUserDataProfile, options: IUserDataProfileCreateOptions, token: CancellationToken): Promise<IUserDataProfile | undefined>;
 	createProfileFromTemplate(profileTemplate: IUserDataProfileTemplate, options: IUserDataProfileCreateOptions, token: CancellationToken): Promise<IUserDataProfile | undefined>;
 	createTroubleshootProfile(): Promise<void>;
@@ -147,8 +146,6 @@ export interface IUserDataProfileContentHandler {
 
 export const defaultUserDataProfileIcon = registerIcon('defaultProfile-icon', Codicon.settings, localize('defaultProfileIcon', 'Icon for Default Profile.'));
 
-export const ProfilesMenu = new MenuId('Profiles');
-export const MANAGE_PROFILES_ACTION_ID = 'workbench.profiles.actions.manage';
 export const PROFILES_TITLE = localize2('profiles', 'Profiles');
 export const PROFILES_CATEGORY = { ...PROFILES_TITLE };
 export const PROFILE_EXTENSION = 'code-profile';
@@ -157,5 +154,3 @@ export const PROFILES_ENABLEMENT_CONTEXT = new RawContextKey<boolean>('profiles.
 export const CURRENT_PROFILE_CONTEXT = new RawContextKey<string>('currentProfile', '');
 export const IS_CURRENT_PROFILE_TRANSIENT_CONTEXT = new RawContextKey<boolean>('isCurrentProfileTransient', false);
 export const HAS_PROFILES_CONTEXT = new RawContextKey<boolean>('hasProfiles', false);
-export const IS_PROFILE_EXPORT_IN_PROGRESS_CONTEXT = new RawContextKey<boolean>('isProfileExportInProgress', false);
-export const IS_PROFILE_IMPORT_IN_PROGRESS_CONTEXT = new RawContextKey<boolean>('isProfileImportInProgress', false);
diff --git a/src/vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService.ts b/src/vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService.ts
index 40cea524423..74357319491 100644
--- a/src/vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService.ts
+++ b/src/vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService.ts
@@ -577,7 +577,7 @@ export class UserDataSyncWorkbenchService extends Disposable implements IUserDat
 
 		let result: UserDataSyncAccount | IAuthenticationProvider | undefined;
 		const disposables: DisposableStore = new DisposableStore();
-		const quickPick = disposables.add(this.quickInputService.createQuickPick<AccountQuickPickItem>());
+		const quickPick = disposables.add(this.quickInputService.createQuickPick<AccountQuickPickItem>({ useSeparators: true }));
 
 		const promise = new Promise<UserDataSyncAccount | IAuthenticationProvider | undefined>(c => {
 			disposables.add(quickPick.onDidHide(() => {
diff --git a/src/vs/workbench/services/workingCopy/common/storedFileWorkingCopy.ts b/src/vs/workbench/services/workingCopy/common/storedFileWorkingCopy.ts
index 0c3532605b9..80148112acc 100644
--- a/src/vs/workbench/services/workingCopy/common/storedFileWorkingCopy.ts
+++ b/src/vs/workbench/services/workingCopy/common/storedFileWorkingCopy.ts
@@ -439,7 +439,7 @@ export class StoredFileWorkingCopy<M extends IStoredFileWorkingCopyModel> extend
 
 	//#region Resolve
 
-	private lastResolvedFileStat: IFileStatWithMetadata | undefined;
+	lastResolvedFileStat: IFileStatWithMetadata | undefined; // !!! DO NOT MARK PRIVATE! USED IN TESTS !!!
 
 	isResolved(): this is IResolvedStoredFileWorkingCopy<M> {
 		return !!this.model;
@@ -1143,7 +1143,7 @@ export class StoredFileWorkingCopy<M extends IStoredFileWorkingCopyModel> extend
 			message = localize('staleSaveError', "Failed to save '{0}': The content of the file is newer. Do you want to overwrite the file with your changes?", this.name);
 
 			primaryActions.push(toAction({ id: 'fileWorkingCopy.overwrite', label: localize('overwrite', "Overwrite"), run: () => this.save({ ...options, ignoreModifiedSince: true, reason: SaveReason.EXPLICIT }) }));
-			primaryActions.push(toAction({ id: 'fileWorkingCopy.revert', label: localize('discard', "Discard"), run: () => this.revert() }));
+			primaryActions.push(toAction({ id: 'fileWorkingCopy.revert', label: localize('revert', "Revert"), run: () => this.revert() }));
 		}
 
 		// Any other save error
@@ -1196,8 +1196,8 @@ export class StoredFileWorkingCopy<M extends IStoredFileWorkingCopyModel> extend
 				}
 			}));
 
-			// Discard
-			primaryActions.push(toAction({ id: 'fileWorkingCopy.revert', label: localize('discard', "Discard"), run: () => this.revert() }));
+			// Revert
+			primaryActions.push(toAction({ id: 'fileWorkingCopy.revert', label: localize('revert', "Revert"), run: () => this.revert() }));
 
 			// Message
 			if (isWriteLocked) {
@@ -1242,6 +1242,11 @@ export class StoredFileWorkingCopy<M extends IStoredFileWorkingCopyModel> extend
 			this.lastResolvedFileStat = newFileStat;
 		}
 
+		// In all other cases update only the readonly and locked flags
+		else {
+			this.lastResolvedFileStat = { ...this.lastResolvedFileStat, readonly: newFileStat.readonly, locked: newFileStat.locked };
+		}
+
 		// Signal that the readonly state changed
 		if (this.isReadonly() !== oldReadonly) {
 			this._onDidChangeReadonly.fire();
diff --git a/src/vs/workbench/services/workingCopy/test/browser/storedFileWorkingCopy.test.ts b/src/vs/workbench/services/workingCopy/test/browser/storedFileWorkingCopy.test.ts
index 33c986d3432..2447f129225 100644
--- a/src/vs/workbench/services/workingCopy/test/browser/storedFileWorkingCopy.test.ts
+++ b/src/vs/workbench/services/workingCopy/test/browser/storedFileWorkingCopy.test.ts
@@ -10,7 +10,7 @@ import { StoredFileWorkingCopy, StoredFileWorkingCopyState, IStoredFileWorkingCo
 import { bufferToStream, newWriteableBufferStream, streamToBuffer, VSBuffer, VSBufferReadableStream } from 'vs/base/common/buffer';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { TestServiceAccessor, workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
+import { getLastResolvedFileStat, TestServiceAccessor, workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { basename } from 'vs/base/common/resources';
 import { FileChangesEvent, FileChangeType, FileOperationError, FileOperationResult, IFileStatWithMetadata, IWriteFileOptions, NotModifiedSinceFileOperationError } from 'vs/platform/files/common/files';
@@ -20,6 +20,7 @@ import { consumeReadable, consumeStream, isReadableStream } from 'vs/base/common
 import { runWithFakedTimers } from 'vs/base/test/common/timeTravelScheduler';
 import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
 import { SnapshotContext } from 'vs/workbench/services/workingCopy/common/fileWorkingCopy';
+import { assertIsDefined } from 'vs/base/common/types';
 
 export class TestStoredFileWorkingCopyModel extends Disposable implements IStoredFileWorkingCopyModel {
 
@@ -513,6 +514,23 @@ suite('StoredFileWorkingCopy', function () {
 		});
 	});
 
+	test('stat.readonly and stat.locked can change when decreased mtime is ignored', async function () {
+
+		await workingCopy.resolve();
+
+		const stat = assertIsDefined(getLastResolvedFileStat(workingCopy));
+		try {
+			accessor.fileService.readShouldThrowError = new NotModifiedSinceFileOperationError('error', { ...stat, mtime: stat.mtime - 1, readonly: !stat.readonly, locked: !stat.locked });
+			await workingCopy.resolve();
+		} finally {
+			accessor.fileService.readShouldThrowError = undefined;
+		}
+
+		assert.strictEqual(getLastResolvedFileStat(workingCopy)?.mtime, stat.mtime, 'mtime should not decrease');
+		assert.notStrictEqual(getLastResolvedFileStat(workingCopy)?.readonly, stat.readonly, 'readonly should have changed despite simultaneous attempt to decrease mtime');
+		assert.notStrictEqual(getLastResolvedFileStat(workingCopy)?.locked, stat.locked, 'locked should have changed despite simultaneous attempt to decrease mtime');
+	});
+
 	test('resolve (FILE_NOT_MODIFIED_SINCE can be handled for resolved working copies)', async () => {
 		await workingCopy.resolve();
 
diff --git a/src/vs/workbench/test/browser/quickAccess.test.ts b/src/vs/workbench/test/browser/quickAccess.test.ts
index 49c78111274..b335afdd8da 100644
--- a/src/vs/workbench/test/browser/quickAccess.test.ts
+++ b/src/vs/workbench/test/browser/quickAccess.test.ts
@@ -47,7 +47,7 @@ suite('QuickAccess', () => {
 
 		constructor(@IQuickInputService private readonly quickInputService: IQuickInputService, disposables: DisposableStore) { }
 
-		provide(picker: IQuickPick<IQuickPickItem>, token: CancellationToken): IDisposable {
+		provide(picker: IQuickPick<IQuickPickItem, { useSeparators: true }>, token: CancellationToken): IDisposable {
 			assert.ok(picker);
 			providerDefaultCalled = true;
 			token.onCancellationRequested(() => providerDefaultCanceled = true);
@@ -60,7 +60,7 @@ suite('QuickAccess', () => {
 	}
 
 	class TestProvider1 implements IQuickAccessProvider {
-		provide(picker: IQuickPick<IQuickPickItem>, token: CancellationToken): IDisposable {
+		provide(picker: IQuickPick<IQuickPickItem, { useSeparators: true }>, token: CancellationToken): IDisposable {
 			assert.ok(picker);
 			provider1Called = true;
 			token.onCancellationRequested(() => provider1Canceled = true);
@@ -70,7 +70,7 @@ suite('QuickAccess', () => {
 	}
 
 	class TestProvider2 implements IQuickAccessProvider {
-		provide(picker: IQuickPick<IQuickPickItem>, token: CancellationToken): IDisposable {
+		provide(picker: IQuickPick<IQuickPickItem, { useSeparators: true }>, token: CancellationToken): IDisposable {
 			assert.ok(picker);
 			provider2Called = true;
 			token.onCancellationRequested(() => provider2Canceled = true);
@@ -80,7 +80,7 @@ suite('QuickAccess', () => {
 	}
 
 	class TestProvider3 implements IQuickAccessProvider {
-		provide(picker: IQuickPick<IQuickPickItem>, token: CancellationToken): IDisposable {
+		provide(picker: IQuickPick<IQuickPickItem, { useSeparators: true }>, token: CancellationToken): IDisposable {
 			assert.ok(picker);
 			provider3Called = true;
 			token.onCancellationRequested(() => provider3Canceled = true);
diff --git a/src/vs/workbench/test/browser/workbenchTestServices.ts b/src/vs/workbench/test/browser/workbenchTestServices.ts
index 22edfd50019..7e308626e65 100644
--- a/src/vs/workbench/test/browser/workbenchTestServices.ts
+++ b/src/vs/workbench/test/browser/workbenchTestServices.ts
@@ -52,7 +52,7 @@ import { IExtensionService } from 'vs/workbench/services/extensions/common/exten
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { IDecorationsService, IResourceDecorationChangeEvent, IDecoration, IDecorationData, IDecorationsProvider } from 'vs/workbench/services/decorations/common/decorations';
 import { IDisposable, toDisposable, Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { IEditorGroupsService, IEditorGroup, GroupsOrder, GroupsArrangement, GroupDirection, IMergeGroupOptions, IEditorReplacement, IFindGroupScope, EditorGroupLayout, ICloseEditorOptions, GroupOrientation, ICloseAllEditorsOptions, ICloseEditorsFilter, IEditorDropTargetDelegate, IEditorPart, IAuxiliaryEditorPart, IEditorGroupsContainer, IAuxiliaryEditorPartCreateEvent, IEditorWorkingSet, IEditorGroupContextKeyProvider, IEditorWorkingSetOptions } from 'vs/workbench/services/editor/common/editorGroupsService';
+import { IEditorGroupsService, IEditorGroup, GroupsOrder, GroupsArrangement, GroupDirection, IMergeGroupOptions, IEditorReplacement, IFindGroupScope, EditorGroupLayout, ICloseEditorOptions, GroupOrientation, ICloseAllEditorsOptions, ICloseEditorsFilter, IEditorDropTargetDelegate, IEditorPart, IAuxiliaryEditorPart, IEditorGroupsContainer, IEditorWorkingSet, IEditorGroupContextKeyProvider, IEditorWorkingSetOptions } from 'vs/workbench/services/editor/common/editorGroupsService';
 import { IEditorService, ISaveEditorsOptions, IRevertAllEditorsOptions, PreferredGroup, IEditorsChangeEvent, ISaveEditorsResult } from 'vs/workbench/services/editor/common/editorService';
 import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
 import { IEditorPaneRegistry, EditorPaneDescriptor } from 'vs/workbench/browser/editor';
@@ -179,6 +179,8 @@ import { TerminalLogService } from 'vs/platform/terminal/common/terminalLogServi
 import { IEnvironmentVariableService } from 'vs/workbench/contrib/terminal/common/environmentVariable';
 import { EnvironmentVariableService } from 'vs/workbench/contrib/terminal/common/environmentVariableService';
 import { ContextMenuService } from 'vs/platform/contextview/browser/contextMenuService';
+import { IHoverService } from 'vs/platform/hover/browser/hover';
+import { NullHoverService } from 'vs/platform/hover/test/browser/nullHoverService';
 
 // --- Start Positron ---
 import { PartViewInfo } from 'vs/workbench/services/positronLayout/browser/interfaces/positronLayoutService';
@@ -352,7 +354,6 @@ export function workbenchInstantiationService(
 	instantiationService.stub(ITerminalInstanceService, new TestTerminalInstanceService());
 	instantiationService.stub(ITerminalEditorService, new TestTerminalEditorService());
 	instantiationService.stub(ITerminalGroupService, new TestTerminalGroupService());
-	instantiationService.stub(ITerminalInstanceService, new TestTerminalInstanceService());
 	instantiationService.stub(ITerminalProfileService, new TestTerminalProfileService());
 	instantiationService.stub(ITerminalProfileResolverService, new TestTerminalProfileResolverService());
 	instantiationService.stub(ITerminalConfigurationService, disposables.add(instantiationService.createInstance(TestTerminalConfigurationService)));
@@ -361,6 +362,7 @@ export function workbenchInstantiationService(
 	instantiationService.stub(IElevatedFileService, new BrowserElevatedFileService());
 	instantiationService.stub(IRemoteSocketFactoryService, new RemoteSocketFactoryService());
 	instantiationService.stub(ICustomEditorLabelService, disposables.add(new CustomEditorLabelService(configService, workspaceContextService)));
+	instantiationService.stub(IHoverService, NullHoverService);
 
 	return instantiationService;
 }
@@ -833,7 +835,7 @@ export class TestEditorGroupsService implements IEditorGroupsService {
 
 	windowId = mainWindow.vscodeWindowId;
 
-	onDidCreateAuxiliaryEditorPart: Event<IAuxiliaryEditorPartCreateEvent> = Event.None;
+	onDidCreateAuxiliaryEditorPart: Event<IAuxiliaryEditorPart> = Event.None;
 	onDidChangeActiveGroup: Event<IEditorGroup> = Event.None;
 	onDidActivateGroup: Event<IEditorGroup> = Event.None;
 	onDidAddGroup: Event<IEditorGroup> = Event.None;
@@ -846,6 +848,7 @@ export class TestEditorGroupsService implements IEditorGroupsService {
 	onDidLayout: Event<IDimension> = Event.None;
 	onDidChangeEditorPartOptions = Event.None;
 	onDidScroll = Event.None;
+	onWillDispose = Event.None;
 
 	orientation = GroupOrientation.HORIZONTAL;
 	isReady = true;
@@ -889,6 +892,7 @@ export class TestEditorGroupsService implements IEditorGroupsService {
 	isLayoutCentered(): boolean { return false; }
 	createEditorDropTarget(container: HTMLElement, delegate: IEditorDropTargetDelegate): IDisposable { return Disposable.None; }
 	registerContextKeyProvider<T extends ContextKeyValue>(_provider: IEditorGroupContextKeyProvider<T>): IDisposable { throw new Error('not implemented'); }
+	getScopedInstantiationService(part: IEditorPart): IInstantiationService { throw new Error('Method not implemented.'); }
 
 	partOptions!: IEditorPartOptions;
 	enforcePartOptions(options: IEditorPartOptions): IDisposable { return Disposable.None; }
@@ -1836,7 +1840,7 @@ export class TestEditorPart extends MainEditorPart implements IEditorGroupsServi
 	readonly mainPart = this;
 	readonly parts: readonly IEditorPart[] = [this];
 
-	readonly onDidCreateAuxiliaryEditorPart: Event<IAuxiliaryEditorPartCreateEvent> = Event.None;
+	readonly onDidCreateAuxiliaryEditorPart: Event<IAuxiliaryEditorPart> = Event.None;
 
 	testSaveState(): void {
 		return super.saveState();
@@ -1862,6 +1866,10 @@ export class TestEditorPart extends MainEditorPart implements IEditorGroupsServi
 		throw new Error('Method not implemented.');
 	}
 
+	getScopedInstantiationService(part: IEditorPart): IInstantiationService {
+		throw new Error('Method not implemented.');
+	}
+
 	getPart(group: number | IEditorGroup): IEditorPart { return this; }
 
 	saveWorkingSet(name: string): IEditorWorkingSet { throw new Error('Method not implemented.'); }
@@ -2027,8 +2035,8 @@ export class TestTerminalGroupService implements ITerminalGroupService {
 	onDidChangeInstances = Event.None;
 	createGroup(instance?: any): ITerminalGroup { throw new Error('Method not implemented.'); }
 	getGroupForInstance(instance: ITerminalInstance): ITerminalGroup | undefined { throw new Error('Method not implemented.'); }
-	moveGroup(source: ITerminalInstance, target: ITerminalInstance): void { throw new Error('Method not implemented.'); }
-	moveGroupToEnd(source: ITerminalInstance): void { throw new Error('Method not implemented.'); }
+	moveGroup(source: ITerminalInstance | ITerminalInstance[], target: ITerminalInstance): void { throw new Error('Method not implemented.'); }
+	moveGroupToEnd(source: ITerminalInstance | ITerminalInstance[]): void { throw new Error('Method not implemented.'); }
 	moveInstance(source: ITerminalInstance, target: ITerminalInstance, side: 'before' | 'after'): void { throw new Error('Method not implemented.'); }
 	unsplitInstance(instance: ITerminalInstance): void { throw new Error('Method not implemented.'); }
 	joinInstances(instances: ITerminalInstance[]): void { throw new Error('Method not implemented.'); }
@@ -2112,7 +2120,7 @@ export class TestQuickInputService implements IQuickInputService {
 
 	async input(options?: IInputOptions, token?: CancellationToken): Promise<string> { return options ? 'resolved' + options.prompt : 'resolved'; }
 
-	createQuickPick<T extends IQuickPickItem>(): IQuickPick<T> { throw new Error('not implemented.'); }
+	createQuickPick<T extends IQuickPickItem>(): IQuickPick<T, { useSeparators: boolean }> { throw new Error('not implemented.'); }
 	createInputBox(): IInputBox { throw new Error('not implemented.'); }
 	createQuickWidget(): IQuickWidget { throw new Error('Method not implemented.'); }
 	focus(): void { throw new Error('not implemented.'); }
diff --git a/src/vs/workbench/test/electron-sandbox/workbenchTestServices.ts b/src/vs/workbench/test/electron-sandbox/workbenchTestServices.ts
index 31f826bc813..b51a06d625f 100644
--- a/src/vs/workbench/test/electron-sandbox/workbenchTestServices.ts
+++ b/src/vs/workbench/test/electron-sandbox/workbenchTestServices.ts
@@ -84,6 +84,7 @@ export class TestNativeHostService implements INativeHostService {
 
 	async getWindows(): Promise<IOpenedMainWindow[]> { return []; }
 	async getActiveWindowId(): Promise<number | undefined> { return undefined; }
+	async getActiveWindowPosition(): Promise<IRectangle | undefined> { return undefined; }
 
 	openWindow(options?: IOpenEmptyWindowOptions): Promise<void>;
 	openWindow(toOpen: IWindowOpenable[], options?: IOpenWindowOptions): Promise<void>;
@@ -142,7 +143,7 @@ export class TestNativeHostService implements INativeHostService {
 	async closeWindow(): Promise<void> { }
 	async quit(): Promise<void> { }
 	async exit(code: number): Promise<void> { }
-	async openDevTools(options?: Partial<Electron.OpenDevToolsOptions> & INativeHostOptions | undefined): Promise<void> { }
+	async openDevTools(): Promise<void> { }
 	async toggleDevTools(): Promise<void> { }
 	async resolveProxy(url: string): Promise<string | undefined> { return undefined; }
 	async lookupAuthorization(authInfo: AuthInfo): Promise<Credentials | undefined> { return undefined; }
diff --git a/src/vs/workbench/workbench.common.main.ts b/src/vs/workbench/workbench.common.main.ts
index b3771bade8d..2edca41d60e 100644
--- a/src/vs/workbench/workbench.common.main.ts
+++ b/src/vs/workbench/workbench.common.main.ts
@@ -123,6 +123,7 @@ import 'vs/editor/common/services/languageFeaturesService';
 import 'vs/editor/common/services/semanticTokensStylingService';
 import 'vs/editor/common/services/treeViewsDndService';
 import 'vs/workbench/services/textMate/browser/textMateTokenizationFeature.contribution';
+import 'vs/workbench/services/treeSitter/browser/treeSitterTokenizationFeature.contribution';
 import 'vs/workbench/services/userActivity/common/userActivityService';
 import 'vs/workbench/services/userActivity/browser/userActivityBrowser';
 import 'vs/workbench/services/editor/browser/editorPaneService';
@@ -136,7 +137,7 @@ import { ContextViewService } from 'vs/platform/contextview/browser/contextViewS
 import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
 import { IListService, ListService } from 'vs/platform/list/browser/listService';
 import { IEditorWorkerService } from 'vs/editor/common/services/editorWorker';
-import { EditorWorkerService } from 'vs/editor/browser/services/editorWorkerService';
+import { WorkbenchEditorWorkerService } from 'vs/workbench/contrib/codeEditor/browser/workbenchEditorWorkerService';
 import { MarkerDecorationsService } from 'vs/editor/common/services/markerDecorationsService';
 import { IMarkerDecorationsService } from 'vs/editor/common/services/markerDecorations';
 import { IMarkerService } from 'vs/platform/markers/common/markers';
@@ -161,7 +162,7 @@ registerSingleton(IExtensionStorageService, ExtensionStorageService, Instantiati
 registerSingleton(IExtensionGalleryService, ExtensionGalleryService, InstantiationType.Delayed);
 registerSingleton(IContextViewService, ContextViewService, InstantiationType.Delayed);
 registerSingleton(IListService, ListService, InstantiationType.Delayed);
-registerSingleton(IEditorWorkerService, EditorWorkerService, InstantiationType.Eager /* registers link detection and word based suggestions for any document */);
+registerSingleton(IEditorWorkerService, WorkbenchEditorWorkerService, InstantiationType.Eager /* registers link detection and word based suggestions for any document */);
 registerSingleton(IMarkerDecorationsService, MarkerDecorationsService, InstantiationType.Delayed);
 registerSingleton(IMarkerService, MarkerService, InstantiationType.Delayed);
 registerSingleton(IContextKeyService, ContextKeyService, InstantiationType.Delayed);
@@ -346,7 +347,6 @@ import 'vs/workbench/contrib/update/browser/update.contribution';
 
 // Surveys
 import 'vs/workbench/contrib/surveys/browser/nps.contribution';
-import 'vs/workbench/contrib/surveys/browser/ces.contribution';
 import 'vs/workbench/contrib/surveys/browser/languageSurveys.contribution';
 
 // Welcome
diff --git a/src/vscode-dts/vscode.d.ts b/src/vscode-dts/vscode.d.ts
index 5aa748faabd..b84653d1505 100644
--- a/src/vscode-dts/vscode.d.ts
+++ b/src/vscode-dts/vscode.d.ts
@@ -157,7 +157,7 @@ declare module 'vscode' {
 		 * that the returned object is *not* live and changes to the
 		 * document are not reflected.
 		 *
-		 * @param line A line number in [0, lineCount).
+		 * @param line A line number in `[0, lineCount)`.
 		 * @returns A {@link TextLine line}.
 		 */
 		lineAt(line: number): TextLine;
@@ -4683,7 +4683,7 @@ declare module 'vscode' {
 		/**
 		 * The currently active {@linkcode SignatureHelp}.
 		 *
-		 * The `activeSignatureHelp` has its [`SignatureHelp.activeSignature`] field updated based on
+		 * The `activeSignatureHelp` has its {@linkcode SignatureHelp.activeSignature activeSignature} field updated based on
 		 * the user arrowing through available signatures.
 		 */
 		readonly activeSignatureHelp: SignatureHelp | undefined;
@@ -5356,22 +5356,22 @@ declare module 'vscode' {
 	export class Color {
 
 		/**
-		 * The red component of this color in the range [0-1].
+		 * The red component of this color in the range `[0-1]`.
 		 */
 		readonly red: number;
 
 		/**
-		 * The green component of this color in the range [0-1].
+		 * The green component of this color in the range `[0-1]`.
 		 */
 		readonly green: number;
 
 		/**
-		 * The blue component of this color in the range [0-1].
+		 * The blue component of this color in the range `[0-1]`.
 		 */
 		readonly blue: number;
 
 		/**
-		 * The alpha component of this color in the range [0-1].
+		 * The alpha component of this color in the range `[0-1]`.
 		 */
 		readonly alpha: number;
 
@@ -6279,7 +6279,9 @@ declare module 'vscode' {
 		 * If the language supports Unicode identifiers (e.g. JavaScript), it is preferable
 		 * to provide a word definition that uses exclusion of known separators.
 		 * e.g.: A regex that matches anything except known separators (and dot is allowed to occur in a floating point number):
-		 *   /(-?\d*\.\d\w*)|([^\`\~\!\@\#\%\^\&\*\(\)\-\=\+\[\{\]\}\\\|\;\:\'\"\,\.\<\>\/\?\s]+)/g
+		 * ```
+		 * /(-?\d*\.\d\w*)|([^\`\~\!\@\#\%\^\&\*\(\)\-\=\+\[\{\]\}\\\|\;\:\'\"\,\.\<\>\/\?\s]+)/g
+		 * ```
 		 */
 		wordPattern?: RegExp;
 		/**
@@ -7329,6 +7331,18 @@ declare module 'vscode' {
 		 */
 		readonly state: TerminalState;
 
+		/**
+		 * An object that contains [shell integration](https://code.visualstudio.com/docs/terminal/shell-integration)-powered
+		 * features for the terminal. This will always be `undefined` immediately after the terminal
+		 * is created. Listen to {@link window.onDidChangeTerminalShellIntegration} to be notified
+		 * when shell integration is activated for a terminal.
+		 *
+		 * Note that this object may remain undefined if shell integation never activates. For
+		 * example Command Prompt does not support shell integration and a user's shell setup could
+		 * conflict with the automatic shell integration activation.
+		 */
+		readonly shellIntegration: TerminalShellIntegration | undefined;
+
 		/**
 		 * Send text to the terminal. The text is written to the stdin of the underlying pty process
 		 * (shell) of the terminal.
@@ -7422,6 +7436,309 @@ declare module 'vscode' {
 		readonly isInteractedWith: boolean;
 	}
 
+	/**
+	 * [Shell integration](https://code.visualstudio.com/docs/terminal/shell-integration)-powered capabilities owned by a terminal.
+	 */
+	export interface TerminalShellIntegration {
+		/**
+		 * The current working directory of the terminal. This {@link Uri} may represent a file on
+		 * another machine (eg. ssh into another machine). This requires the shell integration to
+		 * support working directory reporting.
+		 */
+		readonly cwd: Uri | undefined;
+
+		/**
+		 * Execute a command, sending ^C as necessary to interrupt any running command if needed.
+		 *
+		 * @param commandLine The command line to execute, this is the exact text that will be sent
+		 * to the terminal.
+		 *
+		 * @example
+		 * // Execute a command in a terminal immediately after being created
+		 * const myTerm = window.createTerminal();
+		 * window.onDidChangeTerminalShellIntegration(async ({ terminal, shellIntegration }) => {
+		 *   if (terminal === myTerm) {
+		 *     const execution = shellIntegration.executeCommand('echo "Hello world"');
+		 *     window.onDidEndTerminalShellExecution(event => {
+		 *     if (event.execution === execution) {
+		 *       console.log(`Command exited with code ${event.exitCode}`);
+		 *     }
+		 *   }
+		 * }));
+		 * // Fallback to sendText if there is no shell integration within 3 seconds of launching
+		 * setTimeout(() => {
+		 *   if (!myTerm.shellIntegration) {
+		 *     myTerm.sendText('echo "Hello world"');
+		 *     // Without shell integration, we can't know when the command has finished or what the
+		 *     // exit code was.
+		 *   }
+		 * }, 3000);
+		 *
+		 * @example
+		 * // Send command to terminal that has been alive for a while
+		 * const commandLine = 'echo "Hello world"';
+		 * if (term.shellIntegration) {
+		 *   const execution = shellIntegration.executeCommand({ commandLine });
+		 *   window.onDidEndTerminalShellExecution(event => {
+		 *   if (event.execution === execution) {
+		 *     console.log(`Command exited with code ${event.exitCode}`);
+		 *   }
+		 * } else {
+		 *   term.sendText(commandLine);
+		 *   // Without shell integration, we can't know when the command has finished or what the
+		 *   // exit code was.
+		 * }
+		 */
+		executeCommand(commandLine: string): TerminalShellExecution;
+
+		/**
+		 * Execute a command, sending ^C as necessary to interrupt any running command if needed.
+		 *
+		 * *Note* This is not guaranteed to work as [shell integration](https://code.visualstudio.com/docs/terminal/shell-integration)
+		 * must be activated. Check whether {@link TerminalShellExecution.exitCode} is rejected to
+		 * verify whether it was successful.
+		 *
+		 * @param command A command to run.
+		 * @param args Arguments to launch the executable with which will be automatically escaped
+		 * based on the executable type.
+		 *
+		 * @example
+		 * // Execute a command in a terminal immediately after being created
+		 * const myTerm = window.createTerminal();
+		 * window.onDidChangeTerminalShellIntegration(async ({ terminal, shellIntegration }) => {
+		 *   if (terminal === myTerm) {
+		 *     const command = shellIntegration.executeCommand({
+		 *       command: 'echo',
+		 *       args: ['Hello world']
+		 *     });
+		 *     const code = await command.exitCode;
+		 *     console.log(`Command exited with code ${code}`);
+		 *   }
+		 * }));
+		 * // Fallback to sendText if there is no shell integration within 3 seconds of launching
+		 * setTimeout(() => {
+		 *   if (!myTerm.shellIntegration) {
+		 *     myTerm.sendText('echo "Hello world"');
+		 *     // Without shell integration, we can't know when the command has finished or what the
+		 *     // exit code was.
+		 *   }
+		 * }, 3000);
+		 *
+		 * @example
+		 * // Send command to terminal that has been alive for a while
+		 * const commandLine = 'echo "Hello world"';
+		 * if (term.shellIntegration) {
+		 *   const command = term.shellIntegration.executeCommand({
+		 *     command: 'echo',
+		 *     args: ['Hello world']
+		 *   });
+		 *   const code = await command.exitCode;
+		 *   console.log(`Command exited with code ${code}`);
+		 * } else {
+		 *   term.sendText(commandLine);
+		 *   // Without shell integration, we can't know when the command has finished or what the
+		 *   // exit code was.
+		 * }
+		 */
+		executeCommand(executable: string, args: string[]): TerminalShellExecution;
+	}
+
+	/**
+	 * A command that was executed in a terminal.
+	 */
+	export interface TerminalShellExecution {
+		/**
+		 * The command line that was executed. The {@link TerminalShellExecutionCommandLineConfidence confidence}
+		 * of this value depends on the specific shell's shell integration implementation. This
+		 * value may become more accurate after {@link window.onDidEndTerminalShellExecution} is
+		 * fired.
+		 *
+		 * @example
+		 * // Log the details of the command line on start and end
+		 * window.onDidStartTerminalShellExecution(event => {
+		 *   const commandLine = event.execution.commandLine;
+		 *   console.log(`Command started\n${summarizeCommandLine(commandLine)}`);
+		 * });
+		 * window.onDidEndTerminalShellExecution(event => {
+		 *   const commandLine = event.execution.commandLine;
+		 *   console.log(`Command ended\n${summarizeCommandLine(commandLine)}`);
+		 * });
+		 * function summarizeCommandLine(commandLine: TerminalShellExecutionCommandLine) {
+		 *   return [
+		 *     `  Command line: ${command.commandLine.value}`,
+		 *     `  Confidence: ${command.commandLine.confidence}`,
+		 *     `  Trusted: ${command.commandLine.isTrusted}
+		 *   ].join('\n');
+		 * }
+		 */
+		readonly commandLine: TerminalShellExecutionCommandLine;
+
+		/**
+		 * The working directory that was reported by the shell when this command executed. This
+		 * {@link Uri} may represent a file on another machine (eg. ssh into another machine). This
+		 * requires the shell integration to support working directory reporting.
+		 */
+		readonly cwd: Uri | undefined;
+
+		/**
+		 * Creates a stream of raw data (including escape sequences) that is written to the
+		 * terminal. This will only include data that was written after `read` was called for
+		 * the first time, ie. you must call `read` immediately after the command is executed via
+		 * {@link TerminalShellIntegration.executeCommand} or
+		 * {@link window.onDidStartTerminalShellExecution} to not miss any data.
+		 *
+		 * @example
+		 * // Log all data written to the terminal for a command
+		 * const command = term.shellIntegration.executeCommand({ commandLine: 'echo "Hello world"' });
+		 * const stream = command.read();
+		 * for await (const data of stream) {
+		 *   console.log(data);
+		 * }
+		 */
+		read(): AsyncIterable<string>;
+	}
+
+	/**
+	 * A command line that was executed in a terminal.
+	 */
+	export interface TerminalShellExecutionCommandLine {
+		/**
+		 * The full command line that was executed, including both the command and its arguments.
+		 */
+		readonly value: string;
+
+		/**
+		 * Whether the command line value came from a trusted source and is therefore safe to
+		 * execute without user additional confirmation, such as a notification that asks "Do you
+		 * want to execute (command)?". This verification is likely only needed if you are going to
+		 * execute the command again.
+		 *
+		 * This is `true` only when the command line was reported explicitly by the shell
+		 * integration script (ie. {@link TerminalShellExecutionCommandLineConfidence.High high confidence})
+		 * and it used a nonce for verification.
+		 */
+		readonly isTrusted: boolean;
+
+		/**
+		 * The confidence of the command line value which is determined by how the value was
+		 * obtained. This depends upon the implementation of the shell integration script.
+		 */
+		readonly confidence: TerminalShellExecutionCommandLineConfidence;
+	}
+
+	/**
+	 * The confidence of a {@link TerminalShellExecutionCommandLine} value.
+	 */
+	enum TerminalShellExecutionCommandLineConfidence {
+		/**
+		 * The command line value confidence is low. This means that the value was read from the
+		 * terminal buffer using markers reported by the shell integration script. Additionally one
+		 * of the following conditions will be met:
+		 *
+		 * - The command started on the very left-most column which is unusual, or
+		 * - The command is multi-line which is more difficult to accurately detect due to line
+		 *   continuation characters and right prompts.
+		 * - Command line markers were not reported by the shell integration script.
+		 */
+		Low = 0,
+
+		/**
+		 * The command line value confidence is medium. This means that the value was read from the
+		 * terminal buffer using markers reported by the shell integration script. The command is
+		 * single-line and does not start on the very left-most column (which is unusual).
+		 */
+		Medium = 1,
+
+		/**
+		 * The command line value confidence is high. This means that the value was explicitly sent
+		 * from the shell integration script or the command was executed via the
+		 * {@link TerminalShellIntegration.executeCommand} API.
+		 */
+		High = 2
+	}
+
+	/**
+	 * An event signalling that a terminal's shell integration has changed.
+	 */
+	export interface TerminalShellIntegrationChangeEvent {
+		/**
+		 * The terminal that shell integration has been activated in.
+		 */
+		readonly terminal: Terminal;
+
+		/**
+		 * The shell integration object.
+		 */
+		readonly shellIntegration: TerminalShellIntegration;
+	}
+
+	/**
+	 * An event signalling that an execution has started in a terminal.
+	 */
+	export interface TerminalShellExecutionStartEvent {
+		/**
+		 * The terminal that shell integration has been activated in.
+		 */
+		readonly terminal: Terminal;
+
+		/**
+		 * The shell integration object.
+		 */
+		readonly shellIntegration: TerminalShellIntegration;
+
+		/**
+		 * The terminal shell execution that has ended.
+		 */
+		readonly execution: TerminalShellExecution;
+	}
+
+	/**
+	 * An event signalling that an execution has ended in a terminal.
+	 */
+	export interface TerminalShellExecutionEndEvent {
+		/**
+		 * The terminal that shell integration has been activated in.
+		 */
+		readonly terminal: Terminal;
+
+		/**
+		 * The shell integration object.
+		 */
+		readonly shellIntegration: TerminalShellIntegration;
+
+		/**
+		 * The terminal shell execution that has ended.
+		 */
+		readonly execution: TerminalShellExecution;
+
+		/**
+		 * The exit code reported by the shell.
+		 *
+		 * Note that `undefined` means the shell either did not report an exit  code (ie. the shell
+		 * integration script is misbehaving) or the shell reported a command started before the command
+		 * finished (eg. a sub-shell was opened). Generally this should not happen, depending on the use
+		 * case, it may be best to treat this as a failure.
+		 *
+		 * @example
+		 * const execution = shellIntegration.executeCommand({
+		 *   command: 'echo',
+		 *   args: ['Hello world']
+		 * });
+		 * window.onDidEndTerminalShellExecution(event => {
+		 *   if (event.execution === execution) {
+		 *     if (event.exitCode === undefined) {
+		 * 	     console.log('Command finished but exit code is unknown');
+		 *     } else if (event.exitCode === 0) {
+		 * 	     console.log('Command succeeded');
+		 *     } else {
+		 * 	     console.log('Command failed');
+		 *     }
+		 *   }
+		 * });
+		 */
+		readonly exitCode: number | undefined;
+	}
+
 	/**
 	 * Provides information on a line in a terminal in order to provide links for it.
 	 */
@@ -10457,6 +10774,25 @@ declare module 'vscode' {
 		 */
 		export const onDidChangeTerminalState: Event<Terminal>;
 
+		/**
+		 * Fires when shell integration activates or one of its properties changes in a terminal.
+		 */
+		export const onDidChangeTerminalShellIntegration: Event<TerminalShellIntegrationChangeEvent>;
+
+		/**
+		 * This will be fired when a terminal command is started. This event will fire only when
+		 * [shell integration](https://code.visualstudio.com/docs/terminal/shell-integration) is
+		 * activated for the terminal.
+		 */
+		export const onDidStartTerminalShellExecution: Event<TerminalShellExecutionStartEvent>;
+
+		/**
+		 * This will be fired when a terminal command is ended. This event will fire only when
+		 * [shell integration](https://code.visualstudio.com/docs/terminal/shell-integration) is
+		 * activated for the terminal.
+		 */
+		export const onDidEndTerminalShellExecution: Event<TerminalShellExecutionEndEvent>;
+
 		/**
 		 * Represents the current window's state.
 		 */
@@ -11463,15 +11799,15 @@ declare module 'vscode' {
 			/**
 			 * If true, then the element will be selected.
 			 */
-			select?: boolean;
+			readonly select?: boolean;
 			/**
 			 * If true, then the element will be focused.
 			 */
-			focus?: boolean;
+			readonly focus?: boolean;
 			/**
 			 * If true, then the element will be expanded. If a number is passed, then up to that number of levels of children will be expanded
 			 */
-			expand?: boolean | number;
+			readonly expand?: boolean | number;
 		}): Thenable<void>;
 	}
 
@@ -16880,6 +17216,11 @@ declare module 'vscode' {
 		 * Note: you cannot use this option with any other options that prompt the user like {@link AuthenticationGetSessionOptions.createIfNone createIfNone}.
 		 */
 		silent?: boolean;
+
+		/**
+		 * The account that you would like to get a session for. This is passed down to the Authentication Provider to be used for creating the correct session.
+		 */
+		account?: AuthenticationSessionAccountInformation;
 	}
 
 	/**
@@ -16940,6 +17281,18 @@ declare module 'vscode' {
 		readonly changed: readonly AuthenticationSession[] | undefined;
 	}
 
+	/**
+	 * The options passed in to the {@link AuthenticationProvider.getSessions} and
+	 * {@link AuthenticationProvider.createSession} call.
+	 */
+	export interface AuthenticationProviderSessionOptions {
+		/**
+		 * The account that is being asked about. If this is passed in, the provider should
+		 * attempt to return the sessions that are only related to this account.
+		 */
+		account?: AuthenticationSessionAccountInformation;
+	}
+
 	/**
 	 * A provider for performing authentication to a service.
 	 */
@@ -16954,9 +17307,10 @@ declare module 'vscode' {
 		 * Get a list of sessions.
 		 * @param scopes An optional list of scopes. If provided, the sessions returned should match
 		 * these permissions, otherwise all sessions should be returned.
+		 * @param options Additional options for getting sessions.
 		 * @returns A promise that resolves to an array of authentication sessions.
 		 */
-		getSessions(scopes?: readonly string[]): Thenable<readonly AuthenticationSession[]>;
+		getSessions(scopes: readonly string[] | undefined, options: AuthenticationProviderSessionOptions): Thenable<AuthenticationSession[]>;
 
 		/**
 		 * Prompts a user to login.
@@ -16969,9 +17323,10 @@ declare module 'vscode' {
 		 * then this should never be called if there is already an existing session matching these
 		 * scopes.
 		 * @param scopes A list of scopes, permissions, that the new session should be created with.
+		 * @param options Additional options for creating a session.
 		 * @returns A promise that resolves to an authentication session.
 		 */
-		createSession(scopes: readonly string[]): Thenable<AuthenticationSession>;
+		createSession(scopes: readonly string[], options: AuthenticationProviderSessionOptions): Thenable<AuthenticationSession>;
 
 		/**
 		 * Removes the session corresponding to session id.
@@ -17034,6 +17389,20 @@ declare module 'vscode' {
 		 */
 		export function getSession(providerId: string, scopes: readonly string[], options?: AuthenticationGetSessionOptions): Thenable<AuthenticationSession | undefined>;
 
+		/**
+		 * Get all accounts that the user is logged in to for the specified provider.
+		 * Use this paired with {@link getSession} in order to get an authentication session for a specific account.
+		 *
+		 * Currently, there are only two authentication providers that are contributed from built in extensions
+		 * to the editor that implement GitHub and Microsoft authentication: their providerId's are 'github' and 'microsoft'.
+		 *
+		 * Note: Getting accounts does not imply that your extension has access to that account or its authentication sessions. You can verify access to the account by calling {@link getSession}.
+		 *
+		 * @param providerId The id of the provider to use
+		 * @returns A thenable that resolves to a readonly array of authentication accounts.
+		 */
+		export function getAccounts(providerId: string): Thenable<readonly AuthenticationSessionAccountInformation[]>;
+
 		/**
 		 * An {@link Event} which fires when the authentication sessions of an authentication provider have
 		 * been added, removed, or changed.
@@ -17724,6 +18093,34 @@ declare module 'vscode' {
 		error: string | MarkdownString | undefined;
 	}
 
+	/**
+	 * A stack frame found in the {@link TestMessage.stackTrace}.
+	 */
+	export class TestMessageStackFrame {
+		/**
+		 * The location of this stack frame. This should be provided as a URI if the
+		 * location of the call frame can be accessed by the editor.
+		 */
+		uri?: Uri;
+
+		/**
+		 * Position of the stack frame within the file.
+		 */
+		position?: Position;
+
+		/**
+		 * The name of the stack frame, typically a method or function name.
+		 */
+		label: string;
+
+		/**
+		 * @param label The name of the stack frame
+		 * @param file The file URI of the stack frame
+		 * @param position The position of the stack frame within the file
+		 */
+		constructor(label: string, uri?: Uri, position?: Position);
+	}
+
 	/**
 	 * Message associated with the test state. Can be linked to a specific
 	 * source range -- useful for assertion failures, for example.
@@ -17780,6 +18177,11 @@ declare module 'vscode' {
 		 */
 		contextValue?: string;
 
+		/**
+		 * The stack trace associated with the message or failure.
+		 */
+		stackTrace?: TestMessageStackFrame[];
+
 		/**
 		 * Creates a new TestMessage that will present as a diff in the editor.
 		 * @param message Message to display to the user.
@@ -18618,8 +19020,8 @@ declare module 'vscode' {
 		 * An event that fires whenever feedback for a result is received, e.g. when a user up- or down-votes
 		 * a result.
 		 *
-		 * The passed {@link ChatResultFeedback.result result} is guaranteed to be the same instance that was
-		 * previously returned from this chat participant.
+		 * The passed {@link ChatResultFeedback.result result} is guaranteed to have the same properties as the result that was
+		 * previously returned from this chat participant's handler.
 		 */
 		onDidReceiveFeedback: Event<ChatResultFeedback>;
 
diff --git a/src/vscode-dts/vscode.proposed.aiTextSearchProviderNew.d.ts b/src/vscode-dts/vscode.proposed.aiTextSearchProviderNew.d.ts
index d18010c77f2..a7bf57cde32 100644
--- a/src/vscode-dts/vscode.proposed.aiTextSearchProviderNew.d.ts
+++ b/src/vscode-dts/vscode.proposed.aiTextSearchProviderNew.d.ts
@@ -4,90 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 
 declare module 'vscode' {
-	/**
-	 * Options that apply to AI text search.
-	 */
-	export interface AITextSearchOptionsNew {
-
-		folderOptions: {
-			/**
-			 * The root folder to search within.
-			 */
-			folder: Uri;
-
-			/**
-			 * Files that match an `includes` glob pattern should be included in the search.
-			 */
-			includes: string[];
-
-			/**
-			 * Files that match an `excludes` glob pattern should be excluded from the search.
-			 */
-			excludes: GlobPattern[];
-
-			/**
-			 * Whether symlinks should be followed while searching.
-			 * For more info, see the setting description for `search.followSymlinks`.
-			 */
-			followSymlinks: boolean;
-
-			/**
-			 * Which file locations we should look for ignore (.gitignore or .ignore) files to respect.
-			 */
-			useIgnoreFiles: {
-				/**
-				 * Use ignore files at the current workspace root.
-				 */
-				local: boolean;
-				/**
-				 * Use ignore files at the parent directory. If set, {@link TextSearchProviderOptionsNew.useIgnoreFiles.local} should also be `true`.
-				 */
-				parent: boolean;
-				/**
-				 * Use global ignore files. If set, {@link TextSearchProviderOptionsNew.useIgnoreFiles.local} should also be `true`.
-				 */
-				global: boolean;
-			};
-		}[];
-
-		/**
-		 * The maximum number of results to be returned.
-		 */
-		maxResults: number;
-
-		/**
-		 * Options to specify the size of the result text preview.
-		 */
-		previewOptions: {
-			/**
-			 * The maximum number of lines in the preview.
-			 * Only search providers that support multiline search will ever return more than one line in the match.
-			 */
-			matchLines: number;
-
-			/**
-			 * The maximum number of characters included per line.
-			 */
-			charsPerLine: number;
-		};
-
-		/**
-		 * Exclude files larger than `maxFileSize` in bytes.
-		 */
-		maxFileSize: number;
-
-		/**
-		 * Interpret files using this encoding.
-		 * See the vscode setting `"files.encoding"`
-		 */
-		encoding: string;
-
-		/**
-		 * Number of lines of context to include before and after each match.
-		 */
-		surroundingContext: number;
-	}
-
 	/**
 	 * An AITextSearchProvider provides additional AI text search results in the workspace.
 	 */
@@ -101,7 +17,7 @@ declare module 'vscode' {
 		 * @param progress A progress callback that must be invoked for all results.
 		 * @param token A cancellation token.
 		 */
-		provideAITextSearchResults(query: string, options: AITextSearchOptionsNew, progress: Progress<TextSearchResultNew>, token: CancellationToken): ProviderResult<TextSearchCompleteNew>;
+		provideAITextSearchResults(query: string, options: TextSearchProviderOptions, progress: Progress<TextSearchResultNew>, token: CancellationToken): ProviderResult<TextSearchCompleteNew>;
 	}
 
 	export namespace workspace {
diff --git a/src/vscode-dts/vscode.proposed.authGetSessions.d.ts b/src/vscode-dts/vscode.proposed.authGetSessions.d.ts
deleted file mode 100644
index 6d425ed3232..00000000000
--- a/src/vscode-dts/vscode.proposed.authGetSessions.d.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-declare module 'vscode' {
-
-	// https://github.com/microsoft/vscode/issues/152399
-
-	// FOR THE CONSUMER
-
-	export namespace authentication {
-		/**
-		 * Get all accounts that the user is logged in to for the specified provider.
-		 * Use this paired with {@link getSession} in order to get an authentication session for a specific account.
-		 *
-		 * Currently, there are only two authentication providers that are contributed from built in extensions
-		 * to the editor that implement GitHub and Microsoft authentication: their providerId's are 'github' and 'microsoft'.
-		 *
-		 * Note: Getting accounts does not imply that your extension has access to that account or its authentication sessions. You can verify access to the account by calling {@link getSession}.
-		 *
-			 * @param providerId The id of the provider to use
-			 * @returns A thenable that resolves to a readonly array of authentication accounts.
-			 */
-		export function getAccounts(providerId: string): Thenable<readonly AuthenticationSessionAccountInformation[]>;
-	}
-
-	export interface AuthenticationGetSessionOptions {
-		/**
-		 * The account that you would like to get a session for. This is passed down to the Authentication Provider to be used for creating the correct session.
-		 */
-		account?: AuthenticationSessionAccountInformation;
-	}
-
-	// FOR THE AUTH PROVIDER
-
-	export interface AuthenticationProviderSessionOptions {
-		/**
-		 * The account that is being asked about. If this is passed in, the provider should
-		 * attempt to return the sessions that are only related to this account.
-		 */
-		account?: AuthenticationSessionAccountInformation;
-	}
-
-	export interface AuthenticationProvider {
-		/**
-		 * Get a list of sessions.
-		 * @param scopes An optional list of scopes. If provided, the sessions returned should match
-		 * these permissions, otherwise all sessions should be returned.
-		 * @param options Additional options for getting sessions.
-		 * @returns A promise that resolves to an array of authentication sessions.
-		 */
-		getSessions(scopes: readonly string[] | undefined, options: AuthenticationProviderSessionOptions): Thenable<AuthenticationSession[]>;
-		/**
-		 * Prompts a user to login.
-		 *
-		 * If login is successful, the onDidChangeSessions event should be fired.
-		 *
-		 * If login fails, a rejected promise should be returned.
-		 *
-		 * If the provider has specified that it does not support multiple accounts,
-		 * then this should never be called if there is already an existing session matching these
-		 * scopes.
-		 * @param scopes A list of scopes, permissions, that the new session should be created with.
-		 * @param options Additional options for creating a session.
-		 * @returns A promise that resolves to an authentication session.
-		 */
-		createSession(scopes: readonly string[], options: AuthenticationProviderSessionOptions): Thenable<AuthenticationSession>;
-	}
-}
diff --git a/src/vscode-dts/vscode.proposed.chatParticipantAdditions.d.ts b/src/vscode-dts/vscode.proposed.chatParticipantAdditions.d.ts
index 710e329ccc2..1fe38045e91 100644
--- a/src/vscode-dts/vscode.proposed.chatParticipantAdditions.d.ts
+++ b/src/vscode-dts/vscode.proposed.chatParticipantAdditions.d.ts
@@ -70,7 +70,7 @@ declare module 'vscode' {
 		constructor(value: Uri, license: string, snippet: string);
 	}
 
-	export type ExtendedChatResponsePart = ChatResponsePart | ChatResponseTextEditPart | ChatResponseDetectedParticipantPart | ChatResponseConfirmationPart | ChatResponseCodeCitationPart | ChatResponseReferencePart2;
+	export type ExtendedChatResponsePart = ChatResponsePart | ChatResponseTextEditPart | ChatResponseDetectedParticipantPart | ChatResponseConfirmationPart | ChatResponseCodeCitationPart | ChatResponseReferencePart2 | ChatResponseMovePart;
 
 	export class ChatResponseWarningPart {
 		value: MarkdownString;
@@ -87,7 +87,7 @@ declare module 'vscode' {
 		/**
 		 * The reference target.
 		 */
-		value: Uri | Location | { variableName: string; value?: Uri | Location };
+		value: Uri | Location | { variableName: string; value?: Uri | Location } | string;
 
 		/**
 		 * The icon for the reference.
@@ -109,7 +109,7 @@ declare module 'vscode' {
 		 * @param value A uri or location
 		 * @param iconPath Icon for the reference shown in UI
 		 */
-		constructor(value: Uri | Location | { variableName: string; value?: Uri | Location }, iconPath?: Uri | ThemeIcon | {
+		constructor(value: Uri | Location | { variableName: string; value?: Uri | Location } | string, iconPath?: Uri | ThemeIcon | {
 			/**
 			 * The icon path for the light theme.
 			 */
@@ -121,6 +121,14 @@ declare module 'vscode' {
 		}, options?: { status?: { description: string; kind: ChatResponseReferencePartStatusKind } });
 	}
 
+	export class ChatResponseMovePart {
+
+		readonly uri: Uri;
+		readonly range: Range;
+
+		constructor(uri: Uri, range: Range);
+	}
+
 	export interface ChatResponseStream {
 
 		/**
@@ -161,7 +169,7 @@ declare module 'vscode' {
 
 		reference(value: Uri | Location | { variableName: string; value?: Uri | Location }, iconPath?: Uri | ThemeIcon | { light: Uri; dark: Uri }): void;
 
-		reference2(value: Uri | Location | { variableName: string; value?: Uri | Location }, iconPath?: Uri | ThemeIcon | { light: Uri; dark: Uri }, options?: { status?: { description: string; kind: ChatResponseReferencePartStatusKind } }): void;
+		reference2(value: Uri | Location | string | { variableName: string; value?: Uri | Location }, iconPath?: Uri | ThemeIcon | { light: Uri; dark: Uri }, options?: { status?: { description: string; kind: ChatResponseReferencePartStatusKind } }): void;
 
 		codeCitation(value: Uri, license: string, snippet: string): void;
 
@@ -188,8 +196,6 @@ declare module 'vscode' {
 		 * The `data` for any confirmations that were rejected
 		 */
 		rejectedConfirmationData?: any[];
-
-		requestedTools?: string[];
 	}
 
 	// TODO@API fit this into the stream
@@ -224,19 +230,36 @@ declare module 'vscode' {
 
 	export type ChatExtendedRequestHandler = (request: ChatRequest, context: ChatContext, response: ChatResponseStream, token: CancellationToken) => ProviderResult<ChatResult | void>;
 
+	export interface ChatResult {
+		nextQuestion?: {
+			prompt: string;
+			participant?: string;
+			command?: string;
+		};
+	}
+
 	export namespace chat {
 		/**
 		 * Create a chat participant with the extended progress type
 		 */
 		export function createChatParticipant(id: string, handler: ChatExtendedRequestHandler): ChatParticipant;
 
-		/**
-		 * Current version of the proposal. Changes whenever backwards-incompatible changes are made.
-		 * If a new feature is added that doesn't break existing code, the version is not incremented. When the extension uses this new feature, it should set its engines.vscode version appropriately.
-		 * But if a change is made to an existing feature that would break existing code, the version should be incremented.
-		 * The chat extension should not activate if it doesn't support the current version.
-		 */
-		export const _version: 1 | number;
+		export function registerChatParticipantDetectionProvider(participantDetectionProvider: ChatParticipantDetectionProvider): Disposable;
+	}
+
+	export interface ChatParticipantMetadata {
+		participant: string;
+		command?: string;
+		disambiguation: { categoryName: string; description: string; examples: string[] }[];
+	}
+
+	export interface ChatParticipantDetectionResult {
+		participant: string;
+		command?: string;
+	}
+
+	export interface ChatParticipantDetectionProvider {
+		provideParticipantDetection(chatRequest: ChatRequest, context: ChatContext, options: { participants?: ChatParticipantMetadata[]; location: ChatLocation }, token: CancellationToken): ProviderResult<ChatParticipantDetectionResult>;
 	}
 
 	/*
@@ -265,6 +288,8 @@ declare module 'vscode' {
 		codeBlockIndex: number;
 		totalCharacters: number;
 		newFile?: boolean;
+		userAction?: string;
+		codeMapper?: string;
 	}
 
 	export interface ChatTerminalAction {
@@ -307,4 +332,8 @@ declare module 'vscode' {
 		 */
 		readonly name: string;
 	}
+
+	export interface ChatResultFeedback {
+		readonly unhelpfulReason?: string;
+	}
 }
diff --git a/src/vscode-dts/vscode.proposed.chatParticipantPrivate.d.ts b/src/vscode-dts/vscode.proposed.chatParticipantPrivate.d.ts
index ce699b1fec9..75cab1bcc46 100644
--- a/src/vscode-dts/vscode.proposed.chatParticipantPrivate.d.ts
+++ b/src/vscode-dts/vscode.proposed.chatParticipantPrivate.d.ts
@@ -56,6 +56,11 @@ declare module 'vscode' {
 		 */
 		readonly enableCommandDetection: boolean;
 
+		/**
+		 * If the chat participant or command was automatically assigned.
+		 */
+		readonly isParticipantDetected: boolean;
+
 		/**
 		 * The location at which the chat is happening. This will always be one of the supported values
 		 *
diff --git a/src/vscode-dts/vscode.proposed.chatProvider.d.ts b/src/vscode-dts/vscode.proposed.chatProvider.d.ts
index 9abbdc5d1aa..e645ffb2dc4 100644
--- a/src/vscode-dts/vscode.proposed.chatProvider.d.ts
+++ b/src/vscode-dts/vscode.proposed.chatProvider.d.ts
@@ -12,7 +12,7 @@ declare module 'vscode' {
 
 	export interface ChatResponseFragment2 {
 		index: number;
-		part: LanguageModelChatResponseTextPart | LanguageModelChatResponseFunctionUsePart;
+		part: LanguageModelChatResponseTextPart | LanguageModelChatResponseToolCallPart;
 	}
 
 	// @API extension ship a d.ts files for their options
diff --git a/src/vscode-dts/vscode.proposed.chatVariableResolver.d.ts b/src/vscode-dts/vscode.proposed.chatVariableResolver.d.ts
index 62f07234bb1..ec386ec928c 100644
--- a/src/vscode-dts/vscode.proposed.chatVariableResolver.d.ts
+++ b/src/vscode-dts/vscode.proposed.chatVariableResolver.d.ts
@@ -77,23 +77,6 @@ declare module 'vscode' {
 		Full = 3
 	}
 
-	export interface ChatVariableValue {
-		/**
-		 * The detail level of this chat variable value. If possible, variable resolvers should try to offer shorter values that will consume fewer tokens in an LLM prompt.
-		 */
-		level: ChatVariableLevel;
-
-		/**
-		 * The variable's value, which can be included in an LLM prompt as-is, or the chat participant may decide to read the value and do something else with it.
-		 */
-		value: string | Uri;
-
-		/**
-		 * A description of this value, which could be provided to the LLM as a hint.
-		 */
-		description?: string;
-	}
-
 	export interface ChatVariableResolverResponseStream {
 		/**
 		 * Push a progress part to this stream. Short-hand for
diff --git a/src/vscode-dts/vscode.proposed.contribChatParticipantDetection.d.ts b/src/vscode-dts/vscode.proposed.contribChatParticipantDetection.d.ts
new file mode 100644
index 00000000000..98205a85e8d
--- /dev/null
+++ b/src/vscode-dts/vscode.proposed.contribChatParticipantDetection.d.ts
@@ -0,0 +1,6 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+// empty placeholder declaration for the `chatParticipantDetection`-contribution point
diff --git a/src/vscode-dts/vscode.proposed.contribDebugCreateConfiguration.d.ts b/src/vscode-dts/vscode.proposed.contribDebugCreateConfiguration.d.ts
new file mode 100644
index 00000000000..9f866269987
--- /dev/null
+++ b/src/vscode-dts/vscode.proposed.contribDebugCreateConfiguration.d.ts
@@ -0,0 +1,6 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+// empty placeholder declaration for the `debugCreateConfiguation` menu
diff --git a/src/vscode-dts/vscode.proposed.contribSourceControlHistoryTitleMenu.d.ts b/src/vscode-dts/vscode.proposed.contribSourceControlHistoryTitleMenu.d.ts
new file mode 100644
index 00000000000..605348a6b30
--- /dev/null
+++ b/src/vscode-dts/vscode.proposed.contribSourceControlHistoryTitleMenu.d.ts
@@ -0,0 +1,7 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+// empty placeholder declaration for the `scm/history/title`-menu contribution point
+// https://github.com/microsoft/vscode/issues/226144
diff --git a/src/vscode-dts/vscode.proposed.contribViewContainerTitle.d.ts b/src/vscode-dts/vscode.proposed.contribViewContainerTitle.d.ts
new file mode 100644
index 00000000000..3983df4c509
--- /dev/null
+++ b/src/vscode-dts/vscode.proposed.contribViewContainerTitle.d.ts
@@ -0,0 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+// empty placeholder for view container title menus
+
+// https://github.com/microsoft/vscode/issues/200880 @roblourens
diff --git a/src/vscode-dts/vscode.proposed.defaultChatParticipant.d.ts b/src/vscode-dts/vscode.proposed.defaultChatParticipant.d.ts
index f4261b5b6fb..c6c18b39c8f 100644
--- a/src/vscode-dts/vscode.proposed.defaultChatParticipant.d.ts
+++ b/src/vscode-dts/vscode.proposed.defaultChatParticipant.d.ts
@@ -21,12 +21,14 @@ declare module 'vscode' {
 		icon?: Uri;
 	}
 
-	export interface ChatParticipant {
+	export interface ChatTitleProvider {
 		/**
-		 * When true, this participant is invoked by default when no other participant is being invoked
+		 * TODO@API Should this take a ChatResult like the followup provider, or just take a new ChatContext that includes the current message as history?
 		 */
-		isDefault?: boolean;
+		provideChatTitle(context: ChatContext, token: CancellationToken): ProviderResult<string>;
+	}
 
+	export interface ChatParticipant {
 		/**
 		 * When true, this participant is invoked when the user submits their query using ctrl/cmd+enter
 		 * TODO@API name
@@ -49,6 +51,7 @@ declare module 'vscode' {
 		helpTextPostfix?: string | MarkdownString;
 
 		welcomeMessageProvider?: ChatWelcomeMessageProvider;
+		titleProvider?: ChatTitleProvider;
 		requester?: ChatRequesterInformation;
 	}
 }
diff --git a/src/vscode-dts/vscode.proposed.extensionsAny.d.ts b/src/vscode-dts/vscode.proposed.extensionsAny.d.ts
index c53cd6d89f8..468ffe7b78c 100644
--- a/src/vscode-dts/vscode.proposed.extensionsAny.d.ts
+++ b/src/vscode-dts/vscode.proposed.extensionsAny.d.ts
@@ -28,6 +28,7 @@ declare module 'vscode' {
 		 * @return An extension or `undefined`.
 		 */
 		export function getExtension<T = any>(extensionId: string, includeDifferentExtensionHosts: boolean): Extension<T> | undefined;
+		export function getExtension<T = any>(extensionId: string, includeDifferentExtensionHosts: true): Extension<T | undefined> | undefined;
 
 		/**
 		 * All extensions across all extension hosts.
diff --git a/src/vscode-dts/vscode.proposed.fileSearchProviderNew.d.ts b/src/vscode-dts/vscode.proposed.fileSearchProviderNew.d.ts
index ad5a9d1d86e..36b0b482313 100644
--- a/src/vscode-dts/vscode.proposed.fileSearchProviderNew.d.ts
+++ b/src/vscode-dts/vscode.proposed.fileSearchProviderNew.d.ts
@@ -10,7 +10,7 @@ declare module 'vscode' {
 	/**
 	 * Options that apply to file search.
 	 */
-	export interface FileSearchProviderOptionsNew {
+	export interface FileSearchProviderOptions {
 		folderOptions: {
 			/**
 			 * The root folder to search within.
@@ -42,11 +42,11 @@ declare module 'vscode' {
 				 */
 				local: boolean;
 				/**
-				 * Use ignore files at the parent directory. If set, {@link FileSearchProviderOptionsNew.useIgnoreFiles.local} should also be `true`.
+				 * Use ignore files at the parent directory. If set, {@link FileSearchProviderOptions.useIgnoreFiles.local} should also be `true`.
 				 */
 				parent: boolean;
 				/**
-				 * Use global ignore files. If set, {@link FileSearchProviderOptionsNew.useIgnoreFiles.local} should also be `true`.
+				 * Use global ignore files. If set, {@link FileSearchProviderOptions.useIgnoreFiles.local} should also be `true`.
 				 */
 				global: boolean;
 			};
@@ -54,9 +54,10 @@ declare module 'vscode' {
 
 		/**
 		 * An object with a lifespan that matches the session's lifespan. If the provider chooses to, this object can be used as the key for a cache,
-		 * and searches with the same session object can search the same cache. When the token is cancelled, the session is complete and the cache can be cleared.
+		 * and searches with the same session object can search the same cache. When the object is garbage-collected, the session is complete and the cache can be cleared.
+		 * Please do not store any references to the session object, except via a weak reference (e.g. `WeakRef` or `WeakMap`).
 		 */
-		session: unknown;
+		session: object;
 
 		/**
 		 * The maximum number of results to be returned.
@@ -81,7 +82,7 @@ declare module 'vscode' {
 		 * @param options A set of options to consider while searching files.
 		 * @param token A cancellation token.
 		 */
-		provideFileSearchResults(pattern: string, options: FileSearchProviderOptionsNew, token: CancellationToken): ProviderResult<Uri[]>;
+		provideFileSearchResults(pattern: string, options: FileSearchProviderOptions, token: CancellationToken): ProviderResult<Uri[]>;
 	}
 
 	export namespace workspace {
diff --git a/src/vscode-dts/vscode.proposed.findFiles2New.d.ts b/src/vscode-dts/vscode.proposed.findFiles2New.d.ts
index 610687aa016..5ccc4e1bc32 100644
--- a/src/vscode-dts/vscode.proposed.findFiles2New.d.ts
+++ b/src/vscode-dts/vscode.proposed.findFiles2New.d.ts
@@ -7,8 +7,19 @@ declare module 'vscode' {
 
 	export interface FindFiles2OptionsNew {
 		/**
-		 * A {@link GlobPattern glob pattern} that defines files and folders to exclude. The glob pattern
-		 * will be matched against the file paths of resulting matches relative to their workspace.
+		 * An array of {@link GlobPattern GlobPattern} that defines files to exclude.
+		 * The glob patterns will be matched against the file paths of files relative to their workspace or {@link RelativePattern.baseUri} if applicable.
+		 *
+		 * If more than one value is used, the values are combined with a logical AND.
+		 * For example, consider the following code:
+		 *
+		 * ```ts
+		 * const ab = findFiles(['**​/*.js'], {exclude: ['*.ts', '*.js']});
+		 * const a = findFiles(['**​/*.js'], {exclude: ['*.ts']});
+		 * const b = findFiles(['**​/*.js'], {exclude: ['*.js']});
+		 * ```
+		 *
+		 * In this, `ab` will be the intersection of results from `a` and `b`.
 		 */
 		exclude?: GlobPattern[];
 
@@ -18,19 +29,21 @@ declare module 'vscode' {
 		useExcludeSettings?: ExcludeSettingOptions;
 
 		/**
-		 * The maximum number of results to search for
+		 * The maximum number of results to search for. Defaults to 20000 results.
 		 */
 		maxResults?: number;
 
 		/**
-		 * Which file locations we should look for ignore (.gitignore or .ignore) files to respect.
+		 * Which file locations have ignore (`.gitignore` or `.ignore`) files to follow.
 		 *
-		 * When any of these fields are `undefined`, we will:
-		 * - assume the value if possible (e.g. if only one is valid)
-		 * or
-		 * - follow settings using the value for the corresponding `search.use*IgnoreFiles` settting.
+		 * When any of these fields are `undefined`, the value will either be assumed (e.g. if only one is valid),
+		 * or it will follow settings based on the corresponding `search.use*IgnoreFiles` setting.
 		 *
 		 * Will log an error if an invalid combination is set.
+		 *
+		 * Although `.ignore` files are uncommon, they can be leveraged if there are patterns
+		 * that should not be known to git, but should be known to the search providers.
+		 * They should be in the same locations where `.gitignore` files are found, and they follow the same format.
 		 */
 		useIgnoreFiles?: {
 			/**
@@ -67,9 +80,21 @@ declare module 'vscode' {
 		 * @example
 		 * findFiles(['**​/*.js'], {exclude: ['**​/out/**'], useIgnoreFiles: true, maxResults: 10})
 		 *
-		 * @param filePattern A {@link GlobPattern glob pattern} that defines the files to search for. The glob pattern
-		 * will be matched against the file paths of resulting matches relative to their workspace. Use a {@link RelativePattern relative pattern}
-		 * to restrict the search results to a {@link WorkspaceFolder workspace folder}.
+		 * @param filePattern An array of {@link GlobPattern GlobPattern} that defines the files to search for.
+		 * The glob patterns will be matched against the file paths of files relative to their workspace or {@link baseUri GlobPattern.baseUri} if applicable.
+		 * Use a {@link RelativePattern RelativePatten} to restrict the search results to a {@link WorkspaceFolder workspace folder}.
+		 *
+		 * If more than one value is used, the values are combined with a logical OR.
+		 *
+		 * For example, consider the following code:
+		 *
+		 * ```ts
+		 * const ab = findFiles(['*.ts', '*.js']);
+		 * const a = findFiles(['**​/*.ts']);
+		 * const b = findFiles(['**​/*.js']);
+		 * ```
+		 *
+		 * In this, `ab` will be the union of results from `a` and `b`.
 		 * @param options A set of {@link FindFiles2Options FindFiles2Options} that defines where and how to search (e.g. exclude settings).
 		 * @param token A token that can be used to signal cancellation to the underlying search engine.
 		 * @returns A thenable that resolves to an array of resource identifiers. Will return no results if no
diff --git a/src/vscode-dts/vscode.proposed.findTextInFilesNew.d.ts b/src/vscode-dts/vscode.proposed.findTextInFilesNew.d.ts
index 928291faaaa..2756dce1aab 100644
--- a/src/vscode-dts/vscode.proposed.findTextInFilesNew.d.ts
+++ b/src/vscode-dts/vscode.proposed.findTextInFilesNew.d.ts
@@ -9,15 +9,38 @@ declare module 'vscode' {
 
 	export interface FindTextInFilesOptionsNew {
 		/**
-		 * A {@link GlobPattern glob pattern} that defines the files to search for. The glob pattern
-		 * will be matched against the file paths of files relative to their workspace. Use a {@link RelativePattern relative pattern}
-		 * to restrict the search results to a {@link WorkspaceFolder workspace folder}.
+		 * An array of {@link GlobPattern GlobPattern} that defines the files to search for.
+		 * The glob patterns will be matched against the file paths of files relative to their workspace or {@link baseUri GlobPattern.baseUri} if applicable.
+		 * Use a {@link RelativePattern RelativePattern} to restrict the search results to a {@link WorkspaceFolder workspace folder}.
+		 *
+		 * If more than one value is used, the values are combined with a logical OR.
+		 *
+		 * For example, consider the following code:
+		 *
+		 * ```ts
+		 * const ab = findTextInFilesNew('foo', {include: ['*.ts', '*.js']});
+		 * const a = findTextInFilesNew('foo', {include: ['*.ts']});
+		 * const b = findTextInFilesNew('foo', {include: ['*.js']});
+		 * ```
+		 *
+		 * In this, `ab` will be the union of results from `a` and `b`.
 		 */
 		include?: GlobPattern[];
 
 		/**
-		 * A {@link GlobPattern glob pattern} that defines files and folders to exclude. The glob pattern
-		 * will be matched against the file paths of resulting matches relative to their workspace.
+		 * An array of {@link GlobPattern GlobPattern} that defines files to exclude.
+		 * The glob patterns will be matched against the file paths of files relative to their workspace or {@link RelativePattern.baseUri} if applicable.
+		 *
+		 * If more than one value is used, the values are combined with a logical AND.
+		 * For example, consider the following code:
+		 *
+		 * ```ts
+		 * const ab = findTextInFilesNew('foo', {exclude: ['*.ts', '*.js']});
+		 * const a = findTextInFilesNew('foo', {exclude: ['*.ts']});
+		 * const b = findTextInFilesNew('foo', {exclude: ['*.js']});
+		 * ```
+		 *
+		 * In this, `ab` will be the intersection of results from `a` and `b`.
 		 */
 		exclude?: GlobPattern[];
 
@@ -27,20 +50,21 @@ declare module 'vscode' {
 		useExcludeSettings?: ExcludeSettingOptions;
 
 		/**
-		 * The maximum number of results to search for
+		 * The maximum number of results to search for. Defaults to 20000 results.
 		 */
 		maxResults?: number;
 
-
 		/**
-		 * Which file locations we should look for ignore (.gitignore or .ignore) files to respect.
+		 * Which file locations have ignore (`.gitignore` or `.ignore`) files to follow.
 		 *
-		 * When any of these fields are `undefined`, we will:
-		 * - assume the value if possible (e.g. if only one is valid)
-		 * or
-		 * - follow settings using the value for the corresponding `search.use*IgnoreFiles` settting.
+		 * When any of these fields are `undefined`, the value will either be assumed (e.g. if only one is valid),
+		 * or it will follow settings based on the corresponding `search.use*IgnoreFiles` setting.
 		 *
 		 * Will log an error if an invalid combination is set.
+		 *
+		 * Although `.ignore` files are uncommon, they can be leveraged if there are patterns
+		 * that should not be known to git, but should be known to the search providers.
+		 * They should be in the same locations where `.gitignore` files are found, and they follow the same format.
 		 */
 		useIgnoreFiles?: {
 			/**
@@ -78,10 +102,10 @@ declare module 'vscode' {
 		 */
 		previewOptions?: {
 			/**
-			 * The maximum number of lines in the preview.
+			 * The maximum number of lines in the preview of the match itself (not including surrounding context lines).
 			 * Only search providers that support multiline search will ever return more than one line in the match.
 			 */
-			matchLines?: number;
+			numMatchLines?: number;
 
 			/**
 			 * The maximum number of characters included per line.
@@ -106,25 +130,22 @@ declare module 'vscode' {
 		complete: Thenable<TextSearchCompleteNew>;
 	}
 
-	/*
-	* Options for following search.exclude and files.exclude settings.
-	*/
+	/**
+	 * Options for following search.exclude and files.exclude settings.
+	 */
 	export enum ExcludeSettingOptions {
-		/*
+		/**
 		 * Don't use any exclude settings.
 		 */
-		none = 1,
-		/*
-		 * Use:
-		 * - files.exclude setting
+		None = 1,
+		/**
+		 * Use the `files.exclude` setting
 		 */
-		filesExclude = 2,
-		/*
-		 * Use:
-		 * - files.exclude setting
-		 * - search.exclude setting
+		FilesExclude = 2,
+		/**
+		 * Use the `files.exclude` and `search.exclude` settings
 		 */
-		searchAndFilesExclude = 3
+		SearchAndFilesExclude = 3
 	}
 
 	export namespace workspace {
@@ -133,8 +154,8 @@ declare module 'vscode' {
 		 *
 		 * Search text in files across all {@link workspace.workspaceFolders workspace folders} in the workspace.
 		 * @param query The query parameters for the search - the search string, whether it's case-sensitive, or a regex, or matches whole words.
-		 * @param options An optional set of query options. Include and exclude patterns, maxResults, etc.
-		 * @param callback A callback, called for each result
+		 * @param options An optional set of query options.
+		 * @param callback A callback, called for each {@link TextSearchResultNew result}. This can be a direct match, or context that surrounds a match.
 		 * @param token A token that can be used to signal cancellation to the underlying search engine.
 		 * @return A thenable that resolves when the search is complete.
 		 */
diff --git a/src/vscode-dts/vscode.proposed.interactive.d.ts b/src/vscode-dts/vscode.proposed.interactive.d.ts
index 472f013cca3..d6c4c7b5296 100644
--- a/src/vscode-dts/vscode.proposed.interactive.d.ts
+++ b/src/vscode-dts/vscode.proposed.interactive.d.ts
@@ -6,8 +6,6 @@
 declare module 'vscode' {
 
 	export namespace interactive {
-		// Can be deleted after another insiders
-		export const _version: number;
 		export function transferActiveChat(toWorkspace: Uri): void;
 	}
 }
diff --git a/src/vscode-dts/vscode.proposed.lmTools.d.ts b/src/vscode-dts/vscode.proposed.lmTools.d.ts
index 6ba1a489db8..3fff1acd8dd 100644
--- a/src/vscode-dts/vscode.proposed.lmTools.d.ts
+++ b/src/vscode-dts/vscode.proposed.lmTools.d.ts
@@ -3,17 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-// version: 2
+// version: 6
 // https://github.com/microsoft/vscode/issues/213274
 
 declare module 'vscode' {
 
 	// TODO@API capabilities
 
-	export type JSONSchema = object;
-
 	// API -> LM: an tool/function that is available to the language model
-	export interface LanguageModelChatFunction {
+	export interface LanguageModelChatTool {
+		// TODO@API should use "id" here to match vscode tools, or keep name to match OpenAI?
 		name: string;
 		description: string;
 		parametersSchema?: JSONSchema;
@@ -21,8 +20,8 @@ declare module 'vscode' {
 
 	// API -> LM: add tools as request option
 	export interface LanguageModelChatRequestOptions {
-		// TODO@API this will a heterogeneous array of different types of tools
-		tools?: LanguageModelChatFunction[];
+		// TODO@API this will be a heterogeneous array of different types of tools
+		tools?: LanguageModelChatTool[];
 
 		/**
 		 * Force a specific tool to be used.
@@ -31,11 +30,12 @@ declare module 'vscode' {
 	}
 
 	// LM -> USER: function that should be used
-	export class LanguageModelChatResponseFunctionUsePart {
+	export class LanguageModelChatResponseToolCallPart {
 		name: string;
+		toolCallId: string;
 		parameters: any;
 
-		constructor(name: string, parameters: any);
+		constructor(name: string, toolCallId: string, parameters: any);
 	}
 
 	// LM -> USER: text chunk
@@ -46,22 +46,41 @@ declare module 'vscode' {
 	}
 
 	export interface LanguageModelChatResponse {
-
-		stream: AsyncIterable<LanguageModelChatResponseTextPart | LanguageModelChatResponseFunctionUsePart>;
+		stream: AsyncIterable<LanguageModelChatResponseTextPart | LanguageModelChatResponseToolCallPart>;
 	}
 
 
 	// USER -> LM: the result of a function call
-	export class LanguageModelChatMessageFunctionResultPart {
-		name: string;
+	export class LanguageModelChatMessageToolResultPart {
+		toolCallId: string;
 		content: string;
 		isError: boolean;
 
-		constructor(name: string, content: string, isError?: boolean);
+		constructor(toolCallId: string, content: string, isError?: boolean);
 	}
 
 	export interface LanguageModelChatMessage {
-		content2: string | LanguageModelChatMessageFunctionResultPart;
+		/**
+		 * A heterogeneous array of other things that a message can contain as content.
+		 * Some parts would be message-type specific for some models and wouldn't go together,
+		 * but it's up to the chat provider to decide what to do about that.
+		 * Can drop parts that are not valid for the message type.
+		 * LanguageModelChatMessageToolResultPart: only on User messages
+		 * LanguageModelChatResponseToolCallPart: only on Assistant messages
+		 */
+		content2: (string | LanguageModelChatMessageToolResultPart | LanguageModelChatResponseToolCallPart)[];
+	}
+
+	export interface LanguageModelToolResult {
+		/**
+		 * The result can contain arbitrary representations of the content. An example might be a `PromptElementJSON` from `@vscode/prompt-tsx`, using the `contentType` exported by that library.
+		 */
+		[contentType: string]: any;
+
+		/**
+		 * A string representation of the result which can be incorporated back into an LLM prompt without any special handling.
+		 */
+		toString(): string;
 	}
 
 	// Tool registration/invoking between extensions
@@ -70,7 +89,7 @@ declare module 'vscode' {
 		/**
 		 * Register a LanguageModelTool. The tool must also be registered in the package.json `languageModelTools` contribution point.
 		 */
-		export function registerTool(name: string, tool: LanguageModelTool): Disposable;
+		export function registerTool(id: string, tool: LanguageModelTool): Disposable;
 
 		/**
 		 * A list of all available tools.
@@ -79,18 +98,98 @@ declare module 'vscode' {
 
 		/**
 		 * Invoke a tool with the given parameters.
+		 * TODO@API Could request a set of contentTypes to be returned so they don't all need to be computed?
 		 */
-		export function invokeTool(name: string, parameters: Object, token: CancellationToken): Thenable<string>;
+		export function invokeTool(id: string, options: LanguageModelToolInvocationOptions, token: CancellationToken): Thenable<LanguageModelToolResult>;
 	}
 
-	// Is the same as LanguageModelChatFunction now, but could have more details in the future
+	export interface LanguageModelToolInvocationOptions {
+		/**
+		 * Parameters with which to invoke the tool.
+		 */
+		parameters: Object;
+
+		/**
+		 * Options to hint at how many tokens the tool should return in its response.
+		 */
+		tokenOptions?: {
+			/**
+			 * If known, the maximum number of tokens the tool should emit in its result.
+			 */
+			tokenBudget: number;
+
+			/**
+			 * Count the number of tokens in a message using the model specific tokenizer-logic.
+			 * @param text A string.
+			 * @param token Optional cancellation token.  See {@link CancellationTokenSource} for how to create one.
+			 * @returns A thenable that resolves to the number of tokens.
+			 */
+			countTokens(text: string, token?: CancellationToken): Thenable<number>;
+		};
+	}
+
+	export type JSONSchema = object;
+
 	export interface LanguageModelToolDescription {
-		name: string;
-		description: string;
+		/**
+		 * A unique identifier for the tool.
+		 */
+		id: string;
+
+		/**
+		 * A human-readable name for this tool that may be used to describe it in the UI.
+		 */
+		displayName: string | undefined;
+
+		/**
+		 * A description of this tool that may be passed to a language model.
+		 */
+		modelDescription: string;
+
+		/**
+		 * A JSON schema for the parameters this tool accepts.
+		 */
 		parametersSchema?: JSONSchema;
 	}
 
 	export interface LanguageModelTool {
-		invoke(parameters: any, token: CancellationToken): Thenable<string>;
+		// TODO@API should it be LanguageModelToolResult | string?
+		invoke(options: LanguageModelToolInvocationOptions, token: CancellationToken): ProviderResult<LanguageModelToolResult>;
+	}
+
+	export interface ChatLanguageModelToolReference {
+		/**
+		 * The tool's ID. Refers to a tool listed in {@link lm.tools}.
+		 */
+		readonly id: string;
+
+		/**
+		 * The start and end index of the reference in the {@link ChatRequest.prompt prompt}. When undefined, the reference was not part of the prompt text.
+		 *
+		 * *Note* that the indices take the leading `#`-character into account which means they can
+		 * used to modify the prompt as-is.
+		 */
+		readonly range?: [start: number, end: number];
+	}
+
+	export interface ChatRequest {
+		/**
+		 * The list of tools that the user attached to their request.
+		 *
+		 * *Note* that if tools are referenced in the text of the prompt, using `#`, the prompt contains
+		 * references as authored and that it is up to the participant
+		 * to further modify the prompt, for instance by inlining reference values or creating links to
+		 * headings which contain the resolved values. References are sorted in reverse by their range
+		 * in the prompt. That means the last reference in the prompt is the first in this list. This simplifies
+		 * string-manipulation of the prompt.
+		 */
+		readonly toolReferences: readonly ChatLanguageModelToolReference[];
+	}
+
+	export interface ChatRequestTurn {
+		/**
+		 * The list of tools were attached to this request.
+		 */
+		readonly toolReferences?: readonly ChatLanguageModelToolReference[];
 	}
 }
diff --git a/src/vscode-dts/vscode.proposed.notebookReplDocument.d.ts b/src/vscode-dts/vscode.proposed.notebookReplDocument.d.ts
new file mode 100644
index 00000000000..eefdb42cfc6
--- /dev/null
+++ b/src/vscode-dts/vscode.proposed.notebookReplDocument.d.ts
@@ -0,0 +1,20 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+declare module 'vscode' {
+
+	export interface NotebookDocumentShowOptions {
+		/**
+		 * The notebook should be opened in a REPL editor,
+		 * where the last cell of the notebook is an input box and the rest are read-only.
+		 */
+		readonly asRepl?: boolean;
+
+		/**
+		 * The label to be used for the editor tab.
+		 */
+		readonly label?: string;
+	}
+}
diff --git a/src/vscode-dts/vscode.proposed.scmHistoryProvider.d.ts b/src/vscode-dts/vscode.proposed.scmHistoryProvider.d.ts
index 85567a6fa7d..fb8d15d5664 100644
--- a/src/vscode-dts/vscode.proposed.scmHistoryProvider.d.ts
+++ b/src/vscode-dts/vscode.proposed.scmHistoryProvider.d.ts
@@ -35,6 +35,7 @@ declare module 'vscode' {
 
 	export interface SourceControlHistoryOptions {
 		readonly cursor?: string;
+		readonly skip?: number;
 		readonly limit?: number | { id?: string };
 		readonly historyItemGroupIds?: readonly string[];
 	}
diff --git a/src/vscode-dts/vscode.proposed.terminalShellIntegration.d.ts b/src/vscode-dts/vscode.proposed.terminalShellIntegration.d.ts
deleted file mode 100644
index 8e44e8e48d6..00000000000
--- a/src/vscode-dts/vscode.proposed.terminalShellIntegration.d.ts
+++ /dev/null
@@ -1,338 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-declare module 'vscode' {
-
-	// https://github.com/microsoft/vscode/issues/145234
-
-	/**
-	 * A command that was executed in a terminal.
-	 */
-	export interface TerminalShellExecution {
-		/**
-		 * The command line that was executed. The {@link TerminalShellExecutionCommandLineConfidence confidence}
-		 * of this value depends on the specific shell's shell integration implementation. This
-		 * value may become more accurate after {@link window.onDidEndTerminalShellExecution} is
-		 * fired.
-		 *
-		 * @example
-		 * // Log the details of the command line on start and end
-		 * window.onDidStartTerminalShellExecution(event => {
-		 *   const commandLine = event.execution.commandLine;
-		 *   console.log(`Command started\n${summarizeCommandLine(commandLine)}`);
-		 * });
-		 * window.onDidEndTerminalShellExecution(event => {
-		 *   const commandLine = event.execution.commandLine;
-		 *   console.log(`Command ended\n${summarizeCommandLine(commandLine)}`);
-		 * });
-		 * function summarizeCommandLine(commandLine: TerminalShellExecutionCommandLine) {
-		 *   return [
-		 *     `  Command line: ${command.commandLine.value}`,
-		 *     `  Confidence: ${command.commandLine.confidence}`,
-		 *     `  Trusted: ${command.commandLine.isTrusted}
-		 *   ].join('\n');
-		 * }
-		 */
-		readonly commandLine: TerminalShellExecutionCommandLine;
-
-		/**
-		 * The working directory that was reported by the shell when this command executed. This
-		 * {@link Uri} may represent a file on another machine (eg. ssh into another machine). This
-		 * requires the shell integration to support working directory reporting.
-		 */
-		readonly cwd: Uri | undefined;
-
-		/**
-		 * Creates a stream of raw data (including escape sequences) that is written to the
-		 * terminal. This will only include data that was written after `read` was called for
-		 * the first time, ie. you must call `read` immediately after the command is executed via
-		 * {@link TerminalShellIntegration.executeCommand} or
-		 * {@link window.onDidStartTerminalShellExecution} to not miss any data.
-		 *
-		 * @example
-		 * // Log all data written to the terminal for a command
-		 * const command = term.shellIntegration.executeCommand({ commandLine: 'echo "Hello world"' });
-		 * const stream = command.read();
-		 * for await (const data of stream) {
-		 *   console.log(data);
-		 * }
-		 */
-		read(): AsyncIterable<string>;
-	}
-
-	/**
-	 * A command line that was executed in a terminal.
-	 */
-	export interface TerminalShellExecutionCommandLine {
-		/**
-		 * The full command line that was executed, including both the command and its arguments.
-		 */
-		readonly value: string;
-
-		/**
-		 * Whether the command line value came from a trusted source and is therefore safe to
-		 * execute without user additional confirmation, such as a notification that asks "Do you
-		 * want to execute (command)?". This verification is likely only needed if you are going to
-		 * execute the command again.
-		 *
-		 * This is `true` only when the command line was reported explicitly by the shell
-		 * integration script (ie. {@link TerminalShellExecutionCommandLineConfidence.High high confidence})
-		 * and it used a nonce for verification.
-		 */
-		readonly isTrusted: boolean;
-
-		/**
-		 * The confidence of the command line value which is determined by how the value was
-		 * obtained. This depends upon the implementation of the shell integration script.
-		 */
-		readonly confidence: TerminalShellExecutionCommandLineConfidence;
-	}
-
-	/**
-	 * The confidence of a {@link TerminalShellExecutionCommandLine} value.
-	 */
-	enum TerminalShellExecutionCommandLineConfidence {
-		/**
-		 * The command line value confidence is low. This means that the value was read from the
-		 * terminal buffer using markers reported by the shell integration script. Additionally one
-		 * of the following conditions will be met:
-		 *
-		 * - The command started on the very left-most column which is unusual, or
-		 * - The command is multi-line which is more difficult to accurately detect due to line
-		 *   continuation characters and right prompts.
-		 * - Command line markers were not reported by the shell integration script.
-		 */
-		Low = 0,
-
-		/**
-		 * The command line value confidence is medium. This means that the value was read from the
-		 * terminal buffer using markers reported by the shell integration script. The command is
-		 * single-line and does not start on the very left-most column (which is unusual).
-		 */
-		Medium = 1,
-
-		/**
-		 * The command line value confidence is high. This means that the value was explicitly sent
-		 * from the shell integration script or the command was executed via the
-		 * {@link TerminalShellIntegration.executeCommand} API.
-		 */
-		High = 2
-	}
-
-	export interface Terminal {
-		/**
-		 * An object that contains [shell integration](https://code.visualstudio.com/docs/terminal/shell-integration)-powered
-		 * features for the terminal. This will always be `undefined` immediately after the terminal
-		 * is created. Listen to {@link window.onDidChangeTerminalShellIntegration} to be notified
-		 * when shell integration is activated for a terminal.
-		 *
-		 * Note that this object may remain undefined if shell integation never activates. For
-		 * example Command Prompt does not support shell integration and a user's shell setup could
-		 * conflict with the automatic shell integration activation.
-		 */
-		readonly shellIntegration: TerminalShellIntegration | undefined;
-	}
-
-	/**
-	 * [Shell integration](https://code.visualstudio.com/docs/terminal/shell-integration)-powered capabilities owned by a terminal.
-	 */
-	export interface TerminalShellIntegration {
-		/**
-		 * The current working directory of the terminal. This {@link Uri} may represent a file on
-		 * another machine (eg. ssh into another machine). This requires the shell integration to
-		 * support working directory reporting.
-		 */
-		readonly cwd: Uri | undefined;
-
-		/**
-		 * Execute a command, sending ^C as necessary to interrupt any running command if needed.
-		 *
-		 * @param commandLine The command line to execute, this is the exact text that will be sent
-		 * to the terminal.
-		 *
-		 * @example
-		 * // Execute a command in a terminal immediately after being created
-		 * const myTerm = window.createTerminal();
-		 * window.onDidChangeTerminalShellIntegration(async ({ terminal, shellIntegration }) => {
-		 *   if (terminal === myTerm) {
-		 *     const execution = shellIntegration.executeCommand('echo "Hello world"');
-		 *     window.onDidEndTerminalShellExecution(event => {
-		 *     if (event.execution === execution) {
-		 *       console.log(`Command exited with code ${event.exitCode}`);
-		 *     }
-		 *   }
-		 * }));
-		 * // Fallback to sendText if there is no shell integration within 3 seconds of launching
-		 * setTimeout(() => {
-		 *   if (!myTerm.shellIntegration) {
-		 *     myTerm.sendText('echo "Hello world"');
-		 *     // Without shell integration, we can't know when the command has finished or what the
-		 *     // exit code was.
-		 *   }
-		 * }, 3000);
-		 *
-		 * @example
-		 * // Send command to terminal that has been alive for a while
-		 * const commandLine = 'echo "Hello world"';
-		 * if (term.shellIntegration) {
-		 *   const execution = shellIntegration.executeCommand({ commandLine });
-		 *   window.onDidEndTerminalShellExecution(event => {
-		 *   if (event.execution === execution) {
-		 *     console.log(`Command exited with code ${event.exitCode}`);
-		 *   }
-		 * } else {
-		 *   term.sendText(commandLine);
-		 *   // Without shell integration, we can't know when the command has finished or what the
-		 *   // exit code was.
-		 * }
-		 */
-		executeCommand(commandLine: string): TerminalShellExecution;
-
-		/**
-		 * Execute a command, sending ^C as necessary to interrupt any running command if needed.
-		 *
-		 * *Note* This is not guaranteed to work as [shell integration](https://code.visualstudio.com/docs/terminal/shell-integration)
-		 * must be activated. Check whether {@link TerminalShellExecution.exitCode} is rejected to
-		 * verify whether it was successful.
-		 *
-		 * @param command A command to run.
-		 * @param args Arguments to launch the executable with which will be automatically escaped
-		 * based on the executable type.
-		 *
-		 * @example
-		 * // Execute a command in a terminal immediately after being created
-		 * const myTerm = window.createTerminal();
-		 * window.onDidActivateTerminalShellIntegration(async ({ terminal, shellIntegration }) => {
-		 *   if (terminal === myTerm) {
-		 *     const command = shellIntegration.executeCommand({
-		 *       command: 'echo',
-		 *       args: ['Hello world']
-		 *     });
-		 *     const code = await command.exitCode;
-		 *     console.log(`Command exited with code ${code}`);
-		 *   }
-		 * }));
-		 * // Fallback to sendText if there is no shell integration within 3 seconds of launching
-		 * setTimeout(() => {
-		 *   if (!myTerm.shellIntegration) {
-		 *     myTerm.sendText('echo "Hello world"');
-		 *     // Without shell integration, we can't know when the command has finished or what the
-		 *     // exit code was.
-		 *   }
-		 * }, 3000);
-		 *
-		 * @example
-		 * // Send command to terminal that has been alive for a while
-		 * const commandLine = 'echo "Hello world"';
-		 * if (term.shellIntegration) {
-		 *   const command = term.shellIntegration.executeCommand({
-		 *     command: 'echo',
-		 *     args: ['Hello world']
-		 *   });
-		 *   const code = await command.exitCode;
-		 *   console.log(`Command exited with code ${code}`);
-		 * } else {
-		 *   term.sendText(commandLine);
-		 *   // Without shell integration, we can't know when the command has finished or what the
-		 *   // exit code was.
-		 * }
-		 */
-		executeCommand(executable: string, args: string[]): TerminalShellExecution;
-	}
-
-	export interface TerminalShellIntegrationChangeEvent {
-		/**
-		 * The terminal that shell integration has been activated in.
-		 */
-		readonly terminal: Terminal;
-
-		/**
-		 * The shell integration object.
-		 */
-		readonly shellIntegration: TerminalShellIntegration;
-	}
-
-	export interface TerminalShellExecutionStartEvent {
-		/**
-		 * The terminal that shell integration has been activated in.
-		 */
-		readonly terminal: Terminal;
-
-		/**
-		 * The shell integration object.
-		 */
-		readonly shellIntegration: TerminalShellIntegration;
-
-		/**
-		 * The terminal shell execution that has ended.
-		 */
-		readonly execution: TerminalShellExecution;
-	}
-
-	export interface TerminalShellExecutionEndEvent {
-		/**
-		 * The terminal that shell integration has been activated in.
-		 */
-		readonly terminal: Terminal;
-
-		/**
-		 * The shell integration object.
-		 */
-		readonly shellIntegration: TerminalShellIntegration;
-
-		/**
-		 * The terminal shell execution that has ended.
-		 */
-		readonly execution: TerminalShellExecution;
-
-		/**
-		 * The exit code reported by the shell.
-		 *
-		 * Note that `undefined` means the shell either did not report an exit  code (ie. the shell
-		 * integration script is misbehaving) or the shell reported a command started before the command
-		 * finished (eg. a sub-shell was opened). Generally this should not happen, depending on the use
-		 * case, it may be best to treat this as a failure.
-		 *
-		 * @example
-		 * const execution = shellIntegration.executeCommand({
-		 *   command: 'echo',
-		 *   args: ['Hello world']
-		 * });
-		 * window.onDidEndTerminalShellExecution(event => {
-		 *   if (event.execution === execution) {
-		 *     if (event.exitCode === undefined) {
-		 * 	     console.log('Command finished but exit code is unknown');
-		 *     } else if (event.exitCode === 0) {
-		 * 	     console.log('Command succeeded');
-		 *     } else {
-		 * 	     console.log('Command failed');
-		 *     }
-		 *   }
-		 * });
-		 */
-		readonly exitCode: number | undefined;
-	}
-
-	export namespace window {
-		/**
-		 * Fires when shell integration activates or one of its properties changes in a terminal.
-		 */
-		export const onDidChangeTerminalShellIntegration: Event<TerminalShellIntegrationChangeEvent>;
-
-		/**
-		 * This will be fired when a terminal command is started. This event will fire only when
-		 * [shell integration](https://code.visualstudio.com/docs/terminal/shell-integration) is
-		 * activated for the terminal.
-		 */
-		export const onDidStartTerminalShellExecution: Event<TerminalShellExecutionStartEvent>;
-
-		/**
-		 * This will be fired when a terminal command is ended. This event will fire only when
-		 * [shell integration](https://code.visualstudio.com/docs/terminal/shell-integration) is
-		 * activated for the terminal.
-		 */
-		export const onDidEndTerminalShellExecution: Event<TerminalShellExecutionEndEvent>;
-	}
-}
diff --git a/src/vscode-dts/vscode.proposed.testMessageStackTrace.d.ts b/src/vscode-dts/vscode.proposed.testMessageStackTrace.d.ts
deleted file mode 100644
index b3f09b92835..00000000000
--- a/src/vscode-dts/vscode.proposed.testMessageStackTrace.d.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-declare module 'vscode' {
-	export class TestMessage2 extends TestMessage {
-		/**
-		 * The stack trace associated with the message or failure.
-		 */
-		stackTrace?: TestMessageStackFrame[];
-	}
-
-	export class TestMessageStackFrame {
-		/**
-		 * The location of this stack frame. This should be provided as a URI if the
-		 * location of the call frame can be accessed by the editor.
-		 */
-		file?: Uri;
-
-		/**
-		 * Position of the stack frame within the file.
-		 */
-		position?: Position;
-
-		/**
-		 * The name of the stack frame, typically a method or function name.
-		 */
-		label: string;
-
-		/**
-		 * @param label The name of the stack frame
-		 * @param file The file URI of the stack frame
-		 * @param position The position of the stack frame within the file
-		 */
-		constructor(label: string, file?: Uri, position?: Position);
-	}
-}
diff --git a/src/vscode-dts/vscode.proposed.testObserver.d.ts b/src/vscode-dts/vscode.proposed.testObserver.d.ts
index cb8091c887e..910a61428f7 100644
--- a/src/vscode-dts/vscode.proposed.testObserver.d.ts
+++ b/src/vscode-dts/vscode.proposed.testObserver.d.ts
@@ -102,6 +102,12 @@ declare module 'vscode' {
 		 * were passed in the {@link tests.runTests} method.
 		 */
 		readonly results: ReadonlyArray<Readonly<TestResultSnapshot>>;
+
+		/**
+		 * Gets coverage information for a URI. This function is available only
+		 * when a test run reported coverage.
+		 */
+		getDetailedCoverage?(uri: Uri, token?: CancellationToken): Thenable<FileCoverageDetail[]>;
 	}
 
 	/**
diff --git a/src/vscode-dts/vscode.proposed.textSearchCompleteNew.d.ts b/src/vscode-dts/vscode.proposed.textSearchCompleteNew.d.ts
index 8281931c815..60c3503210f 100644
--- a/src/vscode-dts/vscode.proposed.textSearchCompleteNew.d.ts
+++ b/src/vscode-dts/vscode.proposed.textSearchCompleteNew.d.ts
@@ -33,14 +33,6 @@ declare module 'vscode' {
 		/**
 		 * The message type, this affects how the message will be rendered.
 		 */
-		type: TextSearchCompleteMessageTypeNew;
-	}
-
-	/**
-	 * Represents the severity of a TextSearchComplete message.
-	 */
-	export enum TextSearchCompleteMessageTypeNew {
-		Information = 1,
-		Warning = 2,
+		type: TextSearchCompleteMessageType;
 	}
 }
diff --git a/src/vscode-dts/vscode.proposed.textSearchProviderNew.d.ts b/src/vscode-dts/vscode.proposed.textSearchProviderNew.d.ts
index 5f0f410942f..a82ca8f4ae2 100644
--- a/src/vscode-dts/vscode.proposed.textSearchProviderNew.d.ts
+++ b/src/vscode-dts/vscode.proposed.textSearchProviderNew.d.ts
@@ -8,31 +8,47 @@ declare module 'vscode' {
 	// https://github.com/microsoft/vscode/issues/59921
 
 	/**
-	 * The parameters of a query for text search.
+	 * The parameters of a query for text search. All optional booleans default to `false`.
 	 */
 	export interface TextSearchQueryNew {
 		/**
 		 * The text pattern to search for.
+		 *
+		 * If explicitly contains a newline character (`\n`), the default search behavior
+		 * will automatically enable {@link isMultiline}.
 		 */
 		pattern: string;
 
 		/**
 		 * Whether or not `pattern` should match multiple lines of text.
+		 *
+		 * If using the default search provider, this will be interpreted as `true` if
+		 * `pattern` contains a newline character (`\n`).
 		 */
 		isMultiline?: boolean;
 
 		/**
 		 * Whether or not `pattern` should be interpreted as a regular expression.
+		 *
+		 * If using the default search provider, this will be interpreted case-insensitively
+		 * if {@link isCaseSensitive} is `false` or not set.
 		 */
 		isRegExp?: boolean;
 
 		/**
 		 * Whether or not the search should be case-sensitive.
+		 *
+		 * If using the default search provider, this can be affected by the `search.smartCase` setting.
+		 * See the setting description for more information.
 		 */
 		isCaseSensitive?: boolean;
 
 		/**
 		 * Whether or not to search for whole word matches only.
+		 *
+		 * If enabled, the default search provider will check for boundary characters
+		 * (regex pattern `\b`) surrounding the {@link pattern} to see whether something
+		 * is a word match.
 		 */
 		isWordMatch?: boolean;
 	}
@@ -40,7 +56,7 @@ declare module 'vscode' {
 	/**
 	 * Options that apply to text search.
 	 */
-	export interface TextSearchProviderOptionsNew {
+	export interface TextSearchProviderOptions {
 
 		folderOptions: {
 			/**
@@ -73,14 +89,20 @@ declare module 'vscode' {
 				 */
 				local: boolean;
 				/**
-				 * Use ignore files at the parent directory. If set, {@link TextSearchProviderOptionsNew.useIgnoreFiles.local} should also be `true`.
+				 * Use ignore files at the parent directory. If set, {@link TextSearchProviderOptions.useIgnoreFiles.local} should also be `true`.
 				 */
 				parent: boolean;
 				/**
-				 * Use global ignore files. If set, {@link TextSearchProviderOptionsNew.useIgnoreFiles.local} should also be `true`.
+				 * Use global ignore files. If set, {@link TextSearchProviderOptions.useIgnoreFiles.local} should also be `true`.
 				 */
 				global: boolean;
 			};
+
+			/**
+			 * Interpret files using this encoding.
+			 * See the vscode setting `"files.encoding"`
+			 */
+			encoding: string;
 		}[];
 
 		/**
@@ -109,13 +131,7 @@ declare module 'vscode' {
 		/**
 		 * Exclude files larger than `maxFileSize` in bytes.
 		 */
-		maxFileSize: number;
-
-		/**
-		 * Interpret files using this encoding.
-		 * See the vscode setting `"files.encoding"`
-		 */
-		encoding: string;
+		maxFileSize: number | undefined;
 
 		/**
 		 * Number of lines of context to include before and after each match.
@@ -129,7 +145,7 @@ declare module 'vscode' {
 	export interface TextSearchCompleteNew {
 		/**
 		 * Whether the search hit the limit on the maximum number of search results.
-		 * `maxResults` on {@linkcode TextSearchProviderOptionsNew} specifies the max number of results.
+		 * `maxResults` on {@linkcode TextSearchProviderOptions} specifies the max number of results.
 		 * - If exactly that number of matches exist, this should be false.
 		 * - If `maxResults` matches are returned and more exist, this should be true.
 		 * - If search hits an internal limit which is less than `maxResults`, this should be true.
@@ -138,7 +154,17 @@ declare module 'vscode' {
 	}
 
 	/**
-	 * The main match information for a {@link TextSearchResultNew}.
+	 * A query match instance in a file.
+	 *
+	 * For example, consider this excerpt:
+	 *
+	 * ```ts
+	 * const bar = 1;
+	 * console.log(bar);
+	 * const foo = bar;
+	 * ```
+	 *
+	 * If the query is `log`, then the line `console.log(bar);` should be represented using a {@link TextSearchMatchNew}.
 	 */
 	export class TextSearchMatchNew {
 		/**
@@ -171,7 +197,20 @@ declare module 'vscode' {
 	}
 
 	/**
-	 * The potential context information for a {@link TextSearchResultNew}.
+	 * The context lines of text that are not a part of a match,
+	 * but that surround a match line of type {@link TextSearchMatchNew}.
+	 *
+	 * For example, consider this excerpt:
+	 *
+	 * ```ts
+	 * const bar = 1;
+	 * console.log(bar);
+	 * const foo = bar;
+	 * ```
+	 *
+	 * If the query is `log`, then the lines `const bar = 1;` and `const foo = bar;`
+	 * should be represented using two separate {@link TextSearchContextNew} for the search instance.
+	 * This example assumes that the finder requests one line of surrounding context.
 	 */
 	export class TextSearchContextNew {
 		/**
@@ -199,7 +238,8 @@ declare module 'vscode' {
 	}
 
 	/**
-	 * A result payload for a text search, pertaining to matches within a single file.
+	 * A result payload for a text search, pertaining to {@link TextSearchMatchNew matches}
+	 * and its associated {@link TextSearchContextNew context} within a single file.
 	 */
 	export type TextSearchResultNew = TextSearchMatchNew | TextSearchContextNew;
 
@@ -213,10 +253,11 @@ declare module 'vscode' {
 		 * Provide results that match the given text pattern.
 		 * @param query The parameters for this query.
 		 * @param options A set of options to consider while searching.
-		 * @param progress A progress callback that must be invoked for all results.
+		 * @param progress A progress callback that must be invoked for all {@link TextSearchResultNew results}.
+		 * These results can be direct matches, or context that surrounds matches.
 		 * @param token A cancellation token.
 		 */
-		provideTextSearchResults(query: TextSearchQueryNew, options: TextSearchProviderOptionsNew, progress: Progress<TextSearchResultNew>, token: CancellationToken): ProviderResult<TextSearchCompleteNew>;
+		provideTextSearchResults(query: TextSearchQueryNew, options: TextSearchProviderOptions, progress: Progress<TextSearchResultNew>, token: CancellationToken): ProviderResult<TextSearchCompleteNew>;
 	}
 
 	export namespace workspace {
diff --git a/test/automation/src/application.ts b/test/automation/src/application.ts
index e06eaaf5be4..2a0084e1c1d 100644
--- a/test/automation/src/application.ts
+++ b/test/automation/src/application.ts
@@ -6,6 +6,7 @@
 import { Workbench } from './workbench';
 import { Code, launch, LaunchOptions } from './code';
 import { Logger, measureAndLog } from './logger';
+import { Profiler } from './profiler';
 
 export const enum Quality {
 	Dev,
@@ -63,6 +64,10 @@ export class Application {
 		return this._userDataPath;
 	}
 
+	private _profiler: Profiler | undefined;
+
+	get profiler(): Profiler { return this._profiler!; }
+
 	async start(): Promise<void> {
 		await this._start();
 		await this.code.waitForElement('.explorer-folders-view');
@@ -110,6 +115,7 @@ export class Application {
 		});
 
 		this._workbench = new Workbench(this._code);
+		this._profiler = new Profiler(this.code);
 
 		return code;
 	}
diff --git a/test/automation/src/notebook.ts b/test/automation/src/notebook.ts
index e2760109a54..dff250027db 100644
--- a/test/automation/src/notebook.ts
+++ b/test/automation/src/notebook.ts
@@ -23,7 +23,6 @@ export class Notebook {
 
 		await this.code.waitForElement(activeRowSelector);
 		await this.focusFirstCell();
-		await this.waitForActiveCellEditorContents('code()');
 	}
 
 	async focusNextCell() {
diff --git a/test/automation/src/playwrightDriver.ts b/test/automation/src/playwrightDriver.ts
index 18c4bdb9c05..4f5318bf32e 100644
--- a/test/automation/src/playwrightDriver.ts
+++ b/test/automation/src/playwrightDriver.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as playwright from '@playwright/test';
+import type { Protocol } from 'playwright-core/types/protocol';
 import { dirname, join } from 'path';
 import { promises } from 'fs';
 import { IWindowDriver } from './driver';
@@ -83,7 +84,86 @@ export class PlaywrightDriver {
 		await this.whenLoaded;
 	}
 
+	private _cdpSession: playwright.CDPSession | undefined;
+
+	async startCDP() {
+		if (this._cdpSession) {
+			return;
+		}
+
+		this._cdpSession = await this.page.context().newCDPSession(this.page);
+	}
+
+	async collectGarbage() {
+		if (!this._cdpSession) {
+			throw new Error('CDP not started');
+		}
+
+		await this._cdpSession.send('HeapProfiler.collectGarbage');
+	}
+
+	async evaluate(options: Protocol.Runtime.evaluateParameters): Promise<Protocol.Runtime.evaluateReturnValue> {
+		if (!this._cdpSession) {
+			throw new Error('CDP not started');
+		}
+
+		return await this._cdpSession.send('Runtime.evaluate', options);
+	}
+
+	async releaseObjectGroup(parameters: Protocol.Runtime.releaseObjectGroupParameters): Promise<void> {
+		if (!this._cdpSession) {
+			throw new Error('CDP not started');
+		}
+
+		await this._cdpSession.send('Runtime.releaseObjectGroup', parameters);
+	}
+
+	async queryObjects(parameters: Protocol.Runtime.queryObjectsParameters): Promise<Protocol.Runtime.queryObjectsReturnValue> {
+		if (!this._cdpSession) {
+			throw new Error('CDP not started');
+		}
+
+		return await this._cdpSession.send('Runtime.queryObjects', parameters);
+	}
+
+	async callFunctionOn(parameters: Protocol.Runtime.callFunctionOnParameters): Promise<Protocol.Runtime.callFunctionOnReturnValue> {
+		if (!this._cdpSession) {
+			throw new Error('CDP not started');
+		}
+
+		return await this._cdpSession.send('Runtime.callFunctionOn', parameters);
+	}
+
+	async takeHeapSnapshot(): Promise<string> {
+		if (!this._cdpSession) {
+			throw new Error('CDP not started');
+		}
+
+		let snapshot = '';
+		const listener = (c: { chunk: string }) => {
+			snapshot += c.chunk;
+		};
+
+		this._cdpSession.addListener('HeapProfiler.addHeapSnapshotChunk', listener);
+
+		await this._cdpSession.send('HeapProfiler.takeHeapSnapshot');
+
+		this._cdpSession.removeListener('HeapProfiler.addHeapSnapshotChunk', listener);
+		return snapshot;
+	}
+
+	async getProperties(parameters: Protocol.Runtime.getPropertiesParameters): Promise<Protocol.Runtime.getPropertiesReturnValue> {
+		if (!this._cdpSession) {
+			throw new Error('CDP not started');
+		}
+
+		return await this._cdpSession.send('Runtime.getProperties', parameters);
+	}
+
+	// --- Start Positron ---
+	// Positron: make this method public for access from R/Python fixtures
 	async takeScreenshot(name: string): Promise<void> {
+		// --- End Positron ---
 		try {
 			const persistPath = join(this.options.logsPath, `playwright-screenshot-${PlaywrightDriver.screenShotCounter++}-${name.replace(/\s+/g, '-')}.png`);
 
@@ -231,9 +311,7 @@ export class PlaywrightDriver {
 		return this.page.evaluate(([driver]) => driver.getLogs(), [await this.getDriverHandle()] as const);
 	}
 
-	// --- Start Positron ---
-	private async evaluateWithDriver<T>(pageFunction: PageFunction<playwright.JSHandle<IWindowDriver>[], T>) {
-		// --- End Positron ---
+	private async evaluateWithDriver<T>(pageFunction: PageFunction<IWindowDriver[], T>) {
 		return this.page.evaluate(pageFunction, [await this.getDriverHandle()]);
 	}
 
diff --git a/test/automation/src/profiler.ts b/test/automation/src/profiler.ts
new file mode 100644
index 00000000000..9b3a0107d5e
--- /dev/null
+++ b/test/automation/src/profiler.ts
@@ -0,0 +1,208 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+const { decode_bytes } = require('@vscode/v8-heap-parser');
+import { Code } from './code';
+import { PlaywrightDriver } from './playwrightDriver';
+
+export class Profiler {
+	constructor(private readonly code: Code) {
+	}
+
+	async checkObjectLeaks(classNames: string | string[], fn: () => Promise<void>): Promise<void> {
+		await this.code.driver.startCDP();
+
+		const classNamesArray = Array.isArray(classNames) ? classNames : [classNames];
+		const countsBefore = await getInstances(this.code.driver, classNamesArray);
+
+		await fn();
+
+		const countAfter = await getInstances(this.code.driver, classNamesArray);
+		const leaks: string[] = [];
+		for (const className of classNamesArray) {
+			const count = countAfter[className] ?? 0;
+			const countBefore = countsBefore[className] ?? 0;
+			if (count !== countBefore) {
+				leaks.push(`Leaked ${count - countBefore} ${className}`);
+			}
+		}
+
+		if (leaks.length > 0) {
+			throw new Error(leaks.join('\n'));
+		}
+	}
+
+	async checkHeapLeaks(classNames: string | string[], fn: () => Promise<void>): Promise<void> {
+		await this.code.driver.startCDP();
+		await fn();
+
+		const heapSnapshotAfter = await this.code.driver.takeHeapSnapshot();
+		const buff = Buffer.from(heapSnapshotAfter);
+		const graph = await decode_bytes(buff);
+		const counts: number[] = Array.from(graph.get_class_counts(classNames));
+		const leaks: string[] = [];
+		for (let i = 0; i < classNames.length; i++) {
+			if (counts[i] > 0) {
+				leaks.push(`Leaked ${counts[i]} ${classNames[i]}`);
+			}
+		}
+
+		if (leaks.length > 0) {
+			throw new Error(leaks.join('\n'));
+		}
+	}
+}
+
+function generateUuid() {
+	// use `randomValues` if possible
+	function getRandomValues(bucket: Uint8Array): Uint8Array {
+		for (let i = 0; i < bucket.length; i++) {
+			bucket[i] = Math.floor(Math.random() * 256);
+		}
+		return bucket;
+	}
+
+	// prep-work
+	const _data = new Uint8Array(16);
+	const _hex: string[] = [];
+	for (let i = 0; i < 256; i++) {
+		_hex.push(i.toString(16).padStart(2, '0'));
+	}
+
+	// get data
+	getRandomValues(_data);
+
+	// set version bits
+	_data[6] = (_data[6] & 0x0f) | 0x40;
+	_data[8] = (_data[8] & 0x3f) | 0x80;
+
+	// print as string
+	let i = 0;
+	let result = '';
+	result += _hex[_data[i++]];
+	result += _hex[_data[i++]];
+	result += _hex[_data[i++]];
+	result += _hex[_data[i++]];
+	result += '-';
+	result += _hex[_data[i++]];
+	result += _hex[_data[i++]];
+	result += '-';
+	result += _hex[_data[i++]];
+	result += _hex[_data[i++]];
+	result += '-';
+	result += _hex[_data[i++]];
+	result += _hex[_data[i++]];
+	result += '-';
+	result += _hex[_data[i++]];
+	result += _hex[_data[i++]];
+	result += _hex[_data[i++]];
+	result += _hex[_data[i++]];
+	result += _hex[_data[i++]];
+	result += _hex[_data[i++]];
+	return result;
+}
+
+
+
+/*---------------------------------------------------------------------------------------------
+ *  The MIT License (MIT)
+ *  Copyright (c) 2023-present, Simon Siefke
+ *
+ *  This code is derived from https://github.com/SimonSiefke/vscode-memory-leak-finder
+ *--------------------------------------------------------------------------------------------*/
+
+const getInstances = async (driver: PlaywrightDriver, classNames: string[]): Promise<{ [key: string]: number }> => {
+	await driver.collectGarbage();
+	const objectGroup = `og:${generateUuid()}`;
+	const prototypeDescriptor = await driver.evaluate({
+		expression: 'Object.prototype',
+		returnByValue: false,
+		objectGroup,
+	});
+	const objects = await driver.queryObjects({
+		prototypeObjectId: prototypeDescriptor.result.objectId!,
+		objectGroup,
+	});
+	const fnResult1 = await driver.callFunctionOn({
+		functionDeclaration: `function(){
+	const objects = this
+	const classNames = ${JSON.stringify(classNames)}
+
+	const nativeConstructors = [
+		Object,
+		Array,
+		Function,
+		Set,
+		Map,
+		WeakMap,
+		WeakSet,
+		RegExp,
+		Node,
+		HTMLScriptElement,
+		DOMRectReadOnly,
+		DOMRect,
+		HTMLHtmlElement,
+		Node,
+		DOMTokenList,
+		HTMLUListElement,
+		HTMLStyleElement,
+		HTMLDivElement,
+		HTMLCollection,
+		FocusEvent,
+		Promise,
+		HTMLLinkElement,
+		HTMLLIElement,
+		HTMLAnchorElement,
+		HTMLSpanElement,
+		ArrayBuffer,
+		Uint16Array,
+		HTMLLabelElement,
+		TrustedTypePolicy,
+		Uint8Array,
+		Uint32Array,
+		HTMLHeadingElement,
+		MediaQueryList,
+		HTMLDocument,
+		TextDecoder,
+		TextEncoder,
+		HTMLInputElement,
+		HTMLCanvasElement,
+		HTMLIFrameElement,
+		Int32Array,
+		CSSStyleDeclaration
+	]
+
+	const isNativeConstructor = object => {
+		return nativeConstructors.includes(object.constructor) ||
+			object.constructor.name === 'AsyncFunction' ||
+			object.constructor.name === 'GeneratorFunction' ||
+			object.constructor.name === 'AsyncGeneratorFunction'
+	}
+
+	const isInstance = (object) => {
+		return object && !isNativeConstructor(object)
+	}
+
+	const instances = objects.filter(isInstance)
+
+	const counts = Object.create(null)
+	for(const instance of instances){
+		const name=instance.constructor.name
+		if(classNames.includes(name)){
+			counts[name]||= 0
+			counts[name]++
+		}
+	}
+	return counts
+}`,
+		objectId: objects.objects.objectId,
+		returnByValue: true,
+		objectGroup,
+	});
+
+	const returnObject = fnResult1.result.value;
+	await driver.releaseObjectGroup({ objectGroup: objectGroup });
+	return returnObject;
+};
diff --git a/test/monaco/monaco.test.ts b/test/monaco/monaco.test.ts
index 3613a1a7212..078fb2cb69e 100644
--- a/test/monaco/monaco.test.ts
+++ b/test/monaco/monaco.test.ts
@@ -7,6 +7,7 @@ import * as playwright from '@playwright/test';
 import { assert } from 'chai';
 
 const PORT = 8563;
+const TIMEOUT = 20 * 1000;
 
 const APP = `http://127.0.0.1:${PORT}/dist/core.html`;
 
@@ -18,7 +19,7 @@ type BrowserType = 'chromium' | 'firefox' | 'webkit';
 const browserType: BrowserType = process.env.BROWSER as BrowserType || 'chromium';
 
 before(async function () {
-	this.timeout(20 * 1000);
+	this.timeout(TIMEOUT);
 	console.log(`Starting browser: ${browserType}`);
 	browser = await playwright[browserType].launch({
 		headless: process.argv.includes('--headless'),
@@ -26,13 +27,13 @@ before(async function () {
 });
 
 after(async function () {
-	this.timeout(20 * 1000);
+	this.timeout(TIMEOUT);
 	await browser.close();
 });
 
 const pageErrors: any[] = [];
 beforeEach(async function () {
-	this.timeout(20 * 1000);
+	this.timeout(TIMEOUT);
 	page = await browser.newPage({
 		viewport: {
 			width: 800,
@@ -59,7 +60,7 @@ afterEach(async () => {
 });
 
 describe('API Integration Tests', function (): void {
-	this.timeout(20000);
+	this.timeout(TIMEOUT);
 
 	beforeEach(async () => {
 		await page.goto(APP);
diff --git a/test/smoke/src/areas/notebook/notebook.test.ts b/test/smoke/src/areas/notebook/notebook.test.ts
index a5251a5f75e..da4d527fe4f 100644
--- a/test/smoke/src/areas/notebook/notebook.test.ts
+++ b/test/smoke/src/areas/notebook/notebook.test.ts
@@ -8,7 +8,7 @@ import { Application, Logger } from '../../../../automation';
 import { installAllHandlers } from '../../utils';
 
 export function setup(logger: Logger) {
-	describe.skip('Notebooks', () => { // https://github.com/microsoft/vscode/issues/140575
+	describe('Notebooks', () => { // https://github.com/microsoft/vscode/issues/140575
 
 		// Shared before/after handling
 		installAllHandlers(logger);
@@ -25,7 +25,25 @@ export function setup(logger: Logger) {
 			cp.execSync('git reset --hard HEAD --quiet', { cwd: app.workspacePathOrFolder });
 		});
 
-		it('inserts/edits code cell', async function () {
+		it.skip('check heap leaks', async function () {
+			const app = this.app as Application;
+			await app.profiler.checkHeapLeaks(['NotebookTextModel', 'NotebookCellTextModel', 'NotebookEventDispatcher'], async () => {
+				await app.workbench.notebook.openNotebook();
+				await app.workbench.quickaccess.runCommand('workbench.action.files.save');
+				await app.workbench.quickaccess.runCommand('workbench.action.closeActiveEditor');
+			});
+		});
+
+		it('check object leaks', async function () {
+			const app = this.app as Application;
+			await app.profiler.checkObjectLeaks(['NotebookTextModel', 'NotebookCellTextModel', 'NotebookEventDispatcher'], async () => {
+				await app.workbench.notebook.openNotebook();
+				await app.workbench.quickaccess.runCommand('workbench.action.files.save');
+				await app.workbench.quickaccess.runCommand('workbench.action.closeActiveEditor');
+			});
+		});
+
+		it.skip('inserts/edits code cell', async function () {
 			const app = this.app as Application;
 			await app.workbench.notebook.openNotebook();
 			await app.workbench.notebook.focusNextCell();
@@ -34,7 +52,7 @@ export function setup(logger: Logger) {
 			await app.workbench.notebook.stopEditingCell();
 		});
 
-		it('inserts/edits markdown cell', async function () {
+		it.skip('inserts/edits markdown cell', async function () {
 			const app = this.app as Application;
 			await app.workbench.notebook.openNotebook();
 			await app.workbench.notebook.focusNextCell();
diff --git a/test/smoke/src/areas/task/task-quick-pick.test.ts b/test/smoke/src/areas/task/task-quick-pick.test.ts
index 106a2da3852..e88b28670bb 100644
--- a/test/smoke/src/areas/task/task-quick-pick.test.ts
+++ b/test/smoke/src/areas/task/task-quick-pick.test.ts
@@ -5,7 +5,7 @@
 
 import { Application, Task, Terminal, TerminalCommandId } from '../../../../automation/';
 
-export function setup() {
+export function setup(options?: { skipSuite: boolean }) {
 	describe('Task Quick Pick', () => {
 		let app: Application;
 		let task: Task;
@@ -39,17 +39,17 @@ export function setup() {
 				await task.configureTask({ type, command, label });
 				await task.assertTasks(label, [{ label }], 'run');
 			});
-			it('icon - icon only', async () => {
+			(options?.skipSuite ? it.skip : it)('icon - icon only', async () => {
 				const config = { label, type, command, icon: { id: "lightbulb" } };
 				await task.configureTask(config);
 				await task.assertTasks(label, [config], 'run');
 			});
-			it('icon - color only', async () => {
+			(options?.skipSuite ? it.skip : it)('icon - color only', async () => {
 				const config = { label, type, command, icon: { color: "terminal.ansiRed" } };
 				await task.configureTask(config);
 				await task.assertTasks(label, [{ label, type, command, icon: { color: "Red" } }], 'run');
 			});
-			it('icon - icon & color', async () => {
+			(options?.skipSuite ? it.skip : it)('icon - icon & color', async () => {
 				const config = { label, type, command, icon: { id: "lightbulb", color: "terminal.ansiRed" } };
 				await task.configureTask(config);
 				await task.assertTasks(label, [{ label, type, command, icon: { id: "lightbulb", color: "Red" } }], 'run');
diff --git a/test/smoke/src/areas/task/task.test.ts b/test/smoke/src/areas/task/task.test.ts
index 871eaabd269..d006ec2b9e8 100644
--- a/test/smoke/src/areas/task/task.test.ts
+++ b/test/smoke/src/areas/task/task.test.ts
@@ -16,7 +16,9 @@ export function setup(logger: Logger) {
 		// Shared before/after handling
 		installAllHandlers(logger);
 
-
-		setupTaskQuickPickTests();
+		// Refs https://github.com/microsoft/vscode/issues/225250
+		// Pty spawning fails with invalid fd error in product CI while development CI
+		// works fine, we need additional logging to investigate.
+		setupTaskQuickPickTests({ skipSuite: process.platform === 'linux' });
 	});
 }
diff --git a/test/smoke/src/areas/terminal/terminal-editors.test.ts b/test/smoke/src/areas/terminal/terminal-editors.test.ts
index 334c9ccdcba..39d1b6ced7f 100644
--- a/test/smoke/src/areas/terminal/terminal-editors.test.ts
+++ b/test/smoke/src/areas/terminal/terminal-editors.test.ts
@@ -6,8 +6,8 @@
 import { Application, Terminal, TerminalCommandId, TerminalCommandIdWithValue, SettingsEditor } from '../../../../automation';
 import { setTerminalTestSettings } from './terminal-helpers';
 
-export function setup() {
-	describe('Terminal Editors', () => {
+export function setup(options?: { skipSuite: boolean }) {
+	(options?.skipSuite ? describe.skip : describe)('Terminal Editors', () => {
 		let app: Application;
 		let terminal: Terminal;
 		let settingsEditor: SettingsEditor;
diff --git a/test/smoke/src/areas/terminal/terminal-input.test.ts b/test/smoke/src/areas/terminal/terminal-input.test.ts
index 5ccc642320a..46fe72ba79f 100644
--- a/test/smoke/src/areas/terminal/terminal-input.test.ts
+++ b/test/smoke/src/areas/terminal/terminal-input.test.ts
@@ -6,8 +6,8 @@
 import { Application, Terminal, SettingsEditor } from '../../../../automation';
 import { setTerminalTestSettings } from './terminal-helpers';
 
-export function setup() {
-	describe('Terminal Input', () => {
+export function setup(options?: { skipSuite: boolean }) {
+	(options?.skipSuite ? describe.skip : describe)('Terminal Input', () => {
 		let terminal: Terminal;
 		let settingsEditor: SettingsEditor;
 
diff --git a/test/smoke/src/areas/terminal/terminal-persistence.test.ts b/test/smoke/src/areas/terminal/terminal-persistence.test.ts
index 864f4871285..455d1f016d4 100644
--- a/test/smoke/src/areas/terminal/terminal-persistence.test.ts
+++ b/test/smoke/src/areas/terminal/terminal-persistence.test.ts
@@ -6,8 +6,8 @@
 import { Application, Terminal, TerminalCommandId, TerminalCommandIdWithValue, SettingsEditor } from '../../../../automation';
 import { setTerminalTestSettings } from './terminal-helpers';
 
-export function setup() {
-	describe('Terminal Persistence', () => {
+export function setup(options?: { skipSuite: boolean }) {
+	(options?.skipSuite ? describe.skip : describe)('Terminal Persistence', () => {
 		// Acquire automation API
 		let terminal: Terminal;
 		let settingsEditor: SettingsEditor;
@@ -75,7 +75,8 @@ export function setup() {
 				await terminal.assertTerminalGroups([
 					[{ name }]
 				]);
-				await terminal.waitForTerminalText(buffer => buffer.some(e => e.includes('terminal_test_content')));
+				// There can be line wrapping, so remove newlines and carriage returns #216464
+				await terminal.waitForTerminalText(buffer => buffer.some(e => e.replaceAll(/[\r\n]/g, '').includes('terminal_test_content')));
 			});
 		});
 	});
diff --git a/test/smoke/src/areas/terminal/terminal-profiles.test.ts b/test/smoke/src/areas/terminal/terminal-profiles.test.ts
index 388c71a53c2..e87509bc8e5 100644
--- a/test/smoke/src/areas/terminal/terminal-profiles.test.ts
+++ b/test/smoke/src/areas/terminal/terminal-profiles.test.ts
@@ -9,8 +9,8 @@ import { setTerminalTestSettings } from './terminal-helpers';
 const CONTRIBUTED_PROFILE_NAME = `JavaScript Debug Terminal`;
 const ANY_PROFILE_NAME = '^((?!JavaScript Debug Terminal).)*$';
 
-export function setup() {
-	describe('Terminal Profiles', () => {
+export function setup(options?: { skipSuite: boolean }) {
+	(options?.skipSuite ? describe.skip : describe)('Terminal Profiles', () => {
 		// Acquire automation API
 		let terminal: Terminal;
 		let settingsEditor: SettingsEditor;
diff --git a/test/smoke/src/areas/terminal/terminal-shellIntegration.test.ts b/test/smoke/src/areas/terminal/terminal-shellIntegration.test.ts
index 823f61f4e31..23f94e89f93 100644
--- a/test/smoke/src/areas/terminal/terminal-shellIntegration.test.ts
+++ b/test/smoke/src/areas/terminal/terminal-shellIntegration.test.ts
@@ -6,8 +6,8 @@
 import { Application, Terminal, SettingsEditor, TerminalCommandIdWithValue, TerminalCommandId } from '../../../../automation';
 import { setTerminalTestSettings } from './terminal-helpers';
 
-export function setup() {
-	describe('Terminal Shell Integration', () => {
+export function setup(options?: { skipSuite: boolean }) {
+	(options?.skipSuite ? describe.skip : describe)('Terminal Shell Integration', () => {
 		let terminal: Terminal;
 		let settingsEditor: SettingsEditor;
 		let app: Application;
diff --git a/test/smoke/src/areas/terminal/terminal-splitCwd.test.ts b/test/smoke/src/areas/terminal/terminal-splitCwd.test.ts
index 750c9f090b4..df6ab27eeec 100644
--- a/test/smoke/src/areas/terminal/terminal-splitCwd.test.ts
+++ b/test/smoke/src/areas/terminal/terminal-splitCwd.test.ts
@@ -6,8 +6,8 @@
 import { Application, Terminal, SettingsEditor } from '../../../../automation';
 import { setTerminalTestSettings } from './terminal-helpers';
 
-export function setup() {
-	describe('Terminal splitCwd', () => {
+export function setup(options?: { skipSuite: boolean }) {
+	(options?.skipSuite ? describe.skip : describe)('Terminal splitCwd', () => {
 		// Acquire automation API
 		let terminal: Terminal;
 		let settingsEditor: SettingsEditor;
diff --git a/test/smoke/src/areas/terminal/terminal-stickyScroll.test.ts b/test/smoke/src/areas/terminal/terminal-stickyScroll.test.ts
index bfd73854956..495a3bf033f 100644
--- a/test/smoke/src/areas/terminal/terminal-stickyScroll.test.ts
+++ b/test/smoke/src/areas/terminal/terminal-stickyScroll.test.ts
@@ -6,8 +6,8 @@
 import { Application, Terminal, SettingsEditor, TerminalCommandIdWithValue } from '../../../../automation';
 import { setTerminalTestSettings } from './terminal-helpers';
 
-export function setup() {
-	describe('Terminal stickyScroll', () => {
+export function setup(options?: { skipSuite: boolean }) {
+	(options?.skipSuite ? describe.skip : describe)('Terminal stickyScroll', () => {
 		// Acquire automation API
 		let app: Application;
 		let terminal: Terminal;
diff --git a/test/smoke/src/areas/terminal/terminal-tabs.test.ts b/test/smoke/src/areas/terminal/terminal-tabs.test.ts
index 4ff156c6069..0a34a0dfe95 100644
--- a/test/smoke/src/areas/terminal/terminal-tabs.test.ts
+++ b/test/smoke/src/areas/terminal/terminal-tabs.test.ts
@@ -6,8 +6,8 @@
 import { Application, Terminal, TerminalCommandId, TerminalCommandIdWithValue, SettingsEditor } from '../../../../automation';
 import { setTerminalTestSettings } from './terminal-helpers';
 
-export function setup() {
-	describe('Terminal Tabs', () => {
+export function setup(options?: { skipSuite: boolean }) {
+	(options?.skipSuite ? describe.skip : describe)('Terminal Tabs', () => {
 		// Acquire automation API
 		let terminal: Terminal;
 		let settingsEditor: SettingsEditor;
@@ -36,7 +36,7 @@ export function setup() {
 			await terminal.assertSingleTab({ name });
 		});
 
-		// TODO: Flaky https://github.com/microsoft/vscode/issues/216564
+		// DEBT: Flaky https://github.com/microsoft/vscode/issues/216564
 		it.skip('should reset the tab name to the default value when no name is provided', async () => {
 			await terminal.createTerminal();
 			const defaultName = await terminal.getSingleTabName();
diff --git a/test/smoke/src/areas/terminal/terminal.test.ts b/test/smoke/src/areas/terminal/terminal.test.ts
index 97dcb060b88..dc28a7c1190 100644
--- a/test/smoke/src/areas/terminal/terminal.test.ts
+++ b/test/smoke/src/areas/terminal/terminal.test.ts
@@ -36,15 +36,18 @@ export function setup(logger: Logger) {
 			await terminal.runCommand(TerminalCommandId.KillAll);
 		});
 
-		setupTerminalEditorsTests();
-		setupTerminalInputTests();
-		setupTerminalPersistenceTests();
-		setupTerminalProfileTests();
-		setupTerminalTabsTests();
-		setupTerminalShellIntegrationTests();
-		setupTerminalStickyScrollTests();
-		if (!process.platform.startsWith('win')) {
-			setupTerminalSplitCwdTests();
-		}
+		// https://github.com/microsoft/vscode/issues/216564
+		// The pty host can crash on Linux in smoke tests for an unknown reason. We need more user
+		// reports to investigate
+		setupTerminalEditorsTests({ skipSuite: process.platform === 'linux' });
+		setupTerminalInputTests({ skipSuite: process.platform === 'linux' });
+		setupTerminalPersistenceTests({ skipSuite: process.platform === 'linux' });
+		setupTerminalProfileTests({ skipSuite: process.platform === 'linux' });
+		setupTerminalTabsTests({ skipSuite: process.platform === 'linux' });
+		setupTerminalShellIntegrationTests({ skipSuite: process.platform === 'linux' });
+		setupTerminalStickyScrollTests({ skipSuite: process.platform === 'linux' });
+		// https://github.com/microsoft/vscode/pull/141974
+		// Windows is skipped here as well as it was never enabled from the start
+		setupTerminalSplitCwdTests({ skipSuite: process.platform === 'linux' || process.platform === 'win32' });
 	});
 }
diff --git a/test/smoke/src/main.ts b/test/smoke/src/main.ts
index a449410ed87..5755754f3d2 100644
--- a/test/smoke/src/main.ts
+++ b/test/smoke/src/main.ts
@@ -436,9 +436,9 @@ describe(`VSCode Smoke Tests (${opts.web ? 'Web' : 'Electron'})`, () => {
 	// if (!opts.web) { setupDataLossTests(() => opts['stable-build'] /* Do not change, deferred for a reason! */, logger); }
 	// setupPreferencesTests(logger);
 	// setupSearchTests(logger);
-	// setupNotebookTests(logger);
+	// if (!opts.web) { setupNotebookTests(logger); }
 	// setupLanguagesTests(logger);
-	// if (opts.web) { setupTerminalTests(logger); } // Not stable on desktop/remote https://github.com/microsoft/vscode/issues/146811
+	// setupTerminalTests(logger);
 	// setupTaskTests(logger);
 	// setupStatusbarTests(logger);
 	// if (quality !== Quality.Dev && quality !== Quality.OSS) { setupExtensionTests(logger); }
diff --git a/test/unit/assert-esm.js b/test/unit/assert-esm.js
new file mode 100644
index 00000000000..170c31382c6
--- /dev/null
+++ b/test/unit/assert-esm.js
@@ -0,0 +1,498 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+
+// UTILITY
+
+// Object.create compatible in IE
+const create = Object.create || function (p) {
+	if (!p) { throw Error('no type'); }
+	function f() { }
+	f.prototype = p;
+	return new f();
+  };
+
+  // UTILITY
+  var util = {
+	inherits: function (ctor, superCtor) {
+	  ctor.super_ = superCtor;
+	  ctor.prototype = create(superCtor.prototype, {
+		constructor: {
+		  value: ctor,
+		  enumerable: false,
+		  writable: true,
+		  configurable: true
+		}
+	  });
+	},
+	isArray: function (ar) {
+	  return Array.isArray(ar);
+	},
+	isBoolean: function (arg) {
+	  return typeof arg === 'boolean';
+	},
+	isNull: function (arg) {
+	  return arg === null;
+	},
+	isNullOrUndefined: function (arg) {
+	  return arg == null;
+	},
+	isNumber: function (arg) {
+	  return typeof arg === 'number';
+	},
+	isString: function (arg) {
+	  return typeof arg === 'string';
+	},
+	isSymbol: function (arg) {
+	  return typeof arg === 'symbol';
+	},
+	isUndefined: function (arg) {
+	  return arg === undefined;
+	},
+	isRegExp: function (re) {
+	  return util.isObject(re) && util.objectToString(re) === '[object RegExp]';
+	},
+	isObject: function (arg) {
+	  return typeof arg === 'object' && arg !== null;
+	},
+	isDate: function (d) {
+	  return util.isObject(d) && util.objectToString(d) === '[object Date]';
+	},
+	isError: function (e) {
+	  return isObject(e) &&
+		(objectToString(e) === '[object Error]' || e instanceof Error);
+	},
+	isFunction: function (arg) {
+	  return typeof arg === 'function';
+	},
+	isPrimitive: function (arg) {
+	  return arg === null ||
+		typeof arg === 'boolean' ||
+		typeof arg === 'number' ||
+		typeof arg === 'string' ||
+		typeof arg === 'symbol' ||  // ES6 symbol
+		typeof arg === 'undefined';
+	},
+	objectToString: function (o) {
+	  return Object.prototype.toString.call(o);
+	}
+  };
+
+  const pSlice = Array.prototype.slice;
+
+  // From https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/keys
+  const Object_keys = typeof Object.keys === 'function' ? Object.keys : (function () {
+	const hasOwnProperty = Object.prototype.hasOwnProperty,
+	  hasDontEnumBug = !({ toString: null }).propertyIsEnumerable('toString'),
+	  dontEnums = [
+		'toString',
+		'toLocaleString',
+		'valueOf',
+		'hasOwnProperty',
+		'isPrototypeOf',
+		'propertyIsEnumerable',
+		'constructor'
+	  ],
+	  dontEnumsLength = dontEnums.length;
+
+	return function (obj) {
+	  if (typeof obj !== 'object' && (typeof obj !== 'function' || obj === null)) {
+		throw new TypeError('Object.keys called on non-object');
+	  }
+
+	  let result = [], prop, i;
+
+	  for (prop in obj) {
+		if (hasOwnProperty.call(obj, prop)) {
+		  result.push(prop);
+		}
+	  }
+
+	  if (hasDontEnumBug) {
+		for (i = 0; i < dontEnumsLength; i++) {
+		  if (hasOwnProperty.call(obj, dontEnums[i])) {
+			result.push(dontEnums[i]);
+		  }
+		}
+	  }
+	  return result;
+	};
+  })();
+
+  // 1. The assert module provides functions that throw
+  // AssertionError's when particular conditions are not met. The
+  // assert module must conform to the following interface.
+
+  const assert = ok;
+
+  // 2. The AssertionError is defined in assert.
+  // new assert.AssertionError({ message: message,
+  //                             actual: actual,
+  //                             expected: expected })
+
+  assert.AssertionError = function AssertionError(options) {
+	this.name = 'AssertionError';
+	this.actual = options.actual;
+	this.expected = options.expected;
+	this.operator = options.operator;
+	if (options.message) {
+	  this.message = options.message;
+	  this.generatedMessage = false;
+	} else {
+	  this.message = getMessage(this);
+	  this.generatedMessage = true;
+	}
+	const stackStartFunction = options.stackStartFunction || fail;
+	if (Error.captureStackTrace) {
+	  Error.captureStackTrace(this, stackStartFunction);
+	} else {
+	  // try to throw an error now, and from the stack property
+	  // work out the line that called in to assert.js.
+	  try {
+		this.stack = (new Error).stack.toString();
+	  } catch (e) { }
+	}
+  };
+
+  // assert.AssertionError instanceof Error
+  util.inherits(assert.AssertionError, Error);
+
+  function replacer(key, value) {
+	if (util.isUndefined(value)) {
+	  return '' + value;
+	}
+	if (util.isNumber(value) && (isNaN(value) || !isFinite(value))) {
+	  return value.toString();
+	}
+	if (util.isFunction(value) || util.isRegExp(value)) {
+	  return value.toString();
+	}
+	return value;
+  }
+
+  function truncate(s, n) {
+	if (util.isString(s)) {
+	  return s.length < n ? s : s.slice(0, n);
+	} else {
+	  return s;
+	}
+  }
+
+  function getMessage(self) {
+	return truncate(JSON.stringify(self.actual, replacer), 128) + ' ' +
+	  self.operator + ' ' +
+	  truncate(JSON.stringify(self.expected, replacer), 128);
+  }
+
+  // At present only the three keys mentioned above are used and
+  // understood by the spec. Implementations or sub modules can pass
+  // other keys to the AssertionError's constructor - they will be
+  // ignored.
+
+  // 3. All of the following functions must throw an AssertionError
+  // when a corresponding condition is not met, with a message that
+  // may be undefined if not provided.  All assertion methods provide
+  // both the actual and expected values to the assertion error for
+  // display purposes.
+
+  export function fail(actual, expected, message, operator, stackStartFunction) {
+	throw new assert.AssertionError({
+	  message: message,
+	  actual: actual,
+	  expected: expected,
+	  operator: operator,
+	  stackStartFunction: stackStartFunction
+	});
+  }
+
+  // EXTENSION! allows for well behaved errors defined elsewhere.
+  assert.fail = fail;
+
+  // 4. Pure assertion tests whether a value is truthy, as determined
+  // by !!guard.
+  // assert.ok(guard, message_opt);
+  // This statement is equivalent to assert.equal(true, !!guard,
+  // message_opt);. To test strictly for the value true, use
+  // assert.strictEqual(true, guard, message_opt);.
+
+  export function ok(value, message) {
+	if (!value) { fail(value, true, message, '==', assert.ok); }
+  }
+  assert.ok = ok;
+
+  // 5. The equality assertion tests shallow, coercive equality with
+  // ==.
+  // assert.equal(actual, expected, message_opt);
+
+  assert.equal = function equal(actual, expected, message) {
+	if (actual != expected) { fail(actual, expected, message, '==', assert.equal); }
+  };
+
+  // 6. The non-equality assertion tests for whether two objects are not equal
+  // with != assert.notEqual(actual, expected, message_opt);
+
+  assert.notEqual = function notEqual(actual, expected, message) {
+	if (actual == expected) {
+	  fail(actual, expected, message, '!=', assert.notEqual);
+	}
+  };
+
+  // 7. The equivalence assertion tests a deep equality relation.
+  // assert.deepEqual(actual, expected, message_opt);
+
+  assert.deepEqual = function deepEqual(actual, expected, message) {
+	if (!_deepEqual(actual, expected, false)) {
+	  fail(actual, expected, message, 'deepEqual', assert.deepEqual);
+	}
+  };
+
+  assert.deepStrictEqual = function deepStrictEqual(actual, expected, message) {
+	if (!_deepEqual(actual, expected, true)) {
+	  fail(actual, expected, message, 'deepStrictEqual', assert.deepStrictEqual);
+	}
+  };
+
+  function _deepEqual(actual, expected, strict) {
+	// 7.1. All identical values are equivalent, as determined by ===.
+	if (actual === expected) {
+	  return true;
+	  // } else if (actual instanceof Buffer && expected instanceof Buffer) {
+	  //   return compare(actual, expected) === 0;
+
+	  // 7.2. If the expected value is a Date object, the actual value is
+	  // equivalent if it is also a Date object that refers to the same time.
+	} else if (util.isDate(actual) && util.isDate(expected)) {
+	  return actual.getTime() === expected.getTime();
+
+	  // 7.3 If the expected value is a RegExp object, the actual value is
+	  // equivalent if it is also a RegExp object with the same source and
+	  // properties (`global`, `multiline`, `lastIndex`, `ignoreCase`).
+	} else if (util.isRegExp(actual) && util.isRegExp(expected)) {
+	  return actual.source === expected.source &&
+		actual.global === expected.global &&
+		actual.multiline === expected.multiline &&
+		actual.lastIndex === expected.lastIndex &&
+		actual.ignoreCase === expected.ignoreCase;
+
+	  // 7.4. Other pairs that do not both pass typeof value == 'object',
+	  // equivalence is determined by ==.
+	} else if ((actual === null || typeof actual !== 'object') &&
+	  (expected === null || typeof expected !== 'object')) {
+	  return strict ? actual === expected : actual == expected;
+
+	  // 7.5 For all other Object pairs, including Array objects, equivalence is
+	  // determined by having the same number of owned properties (as verified
+	  // with Object.prototype.hasOwnProperty.call), the same set of keys
+	  // (although not necessarily the same order), equivalent values for every
+	  // corresponding key, and an identical 'prototype' property. Note: this
+	  // accounts for both named and indexed properties on Arrays.
+	} else {
+	  return objEquiv(actual, expected, strict);
+	}
+  }
+
+  function isArguments(object) {
+	return Object.prototype.toString.call(object) == '[object Arguments]';
+  }
+
+  function objEquiv(a, b, strict) {
+	if (a === null || a === undefined || b === null || b === undefined) { return false; }
+	// if one is a primitive, the other must be same
+	if (util.isPrimitive(a) || util.isPrimitive(b)) { return a === b; }
+	if (strict && Object.getPrototypeOf(a) !== Object.getPrototypeOf(b)) { return false; }
+	const aIsArgs = isArguments(a),
+	  bIsArgs = isArguments(b);
+	if ((aIsArgs && !bIsArgs) || (!aIsArgs && bIsArgs)) { return false; }
+	if (aIsArgs) {
+	  a = pSlice.call(a);
+	  b = pSlice.call(b);
+	  return _deepEqual(a, b, strict);
+	}
+	let ka = Object.keys(a),
+	  kb = Object.keys(b),
+	  key, i;
+	// having the same number of owned properties (keys incorporates
+	// hasOwnProperty)
+	if (ka.length !== kb.length) { return false; }
+	//the same set of keys (although not necessarily the same order),
+	ka.sort();
+	kb.sort();
+	//~~~cheap key test
+	for (i = ka.length - 1; i >= 0; i--) {
+	  if (ka[i] !== kb[i]) { return false; }
+	}
+	//equivalent values for every corresponding key, and
+	//~~~possibly expensive deep test
+	for (i = ka.length - 1; i >= 0; i--) {
+	  key = ka[i];
+	  if (!_deepEqual(a[key], b[key], strict)) { return false; }
+	}
+	return true;
+  }
+
+  // 8. The non-equivalence assertion tests for any deep inequality.
+  // assert.notDeepEqual(actual, expected, message_opt);
+
+  assert.notDeepEqual = function notDeepEqual(actual, expected, message) {
+	if (_deepEqual(actual, expected, false)) {
+	  fail(actual, expected, message, 'notDeepEqual', assert.notDeepEqual);
+	}
+  };
+
+  assert.notDeepStrictEqual = notDeepStrictEqual;
+  export function notDeepStrictEqual(actual, expected, message) {
+	if (_deepEqual(actual, expected, true)) {
+	  fail(actual, expected, message, 'notDeepStrictEqual', notDeepStrictEqual);
+	}
+  }
+
+
+  // 9. The strict equality assertion tests strict equality, as determined by ===.
+  // assert.strictEqual(actual, expected, message_opt);
+
+  assert.strictEqual = function strictEqual(actual, expected, message) {
+	if (actual !== expected) {
+	  fail(actual, expected, message, '===', assert.strictEqual);
+	}
+  };
+
+  // 10. The strict non-equality assertion tests for strict inequality, as
+  // determined by !==.  assert.notStrictEqual(actual, expected, message_opt);
+
+  assert.notStrictEqual = function notStrictEqual(actual, expected, message) {
+	if (actual === expected) {
+	  fail(actual, expected, message, '!==', assert.notStrictEqual);
+	}
+  };
+
+  function expectedException(actual, expected) {
+	if (!actual || !expected) {
+	  return false;
+	}
+
+	if (Object.prototype.toString.call(expected) == '[object RegExp]') {
+	  return expected.test(actual);
+	} else if (actual instanceof expected) {
+	  return true;
+	} else if (expected.call({}, actual) === true) {
+	  return true;
+	}
+
+	return false;
+  }
+
+  function _throws(shouldThrow, block, expected, message) {
+	let actual;
+
+	if (typeof block !== 'function') {
+	  throw new TypeError('block must be a function');
+	}
+
+	if (typeof expected === 'string') {
+	  message = expected;
+	  expected = null;
+	}
+
+	try {
+	  block();
+	} catch (e) {
+	  actual = e;
+	}
+
+	message = (expected && expected.name ? ' (' + expected.name + ').' : '.') +
+	  (message ? ' ' + message : '.');
+
+	if (shouldThrow && !actual) {
+	  fail(actual, expected, 'Missing expected exception' + message);
+	}
+
+	if (!shouldThrow && expectedException(actual, expected)) {
+	  fail(actual, expected, 'Got unwanted exception' + message);
+	}
+
+	if ((shouldThrow && actual && expected &&
+	  !expectedException(actual, expected)) || (!shouldThrow && actual)) {
+	  throw actual;
+	}
+  }
+
+  // 11. Expected to throw an error:
+  // assert.throws(block, Error_opt, message_opt);
+
+  assert.throws = function (block, /*optional*/error, /*optional*/message) {
+	_throws.apply(this, [true].concat(pSlice.call(arguments)));
+  };
+
+  // EXTENSION! This is annoying to write outside this module.
+  assert.doesNotThrow = function (block, /*optional*/message) {
+	_throws.apply(this, [false].concat(pSlice.call(arguments)));
+  };
+
+  assert.ifError = function (err) { if (err) { throw err; } };
+
+  function checkIsPromise(obj) {
+	return (obj !== null && typeof obj === 'object' &&
+	  typeof obj.then === 'function' &&
+	  typeof obj.catch === 'function');
+  }
+
+  const NO_EXCEPTION_SENTINEL = {};
+  async function waitForActual(promiseFn) {
+	let resultPromise;
+	if (typeof promiseFn === 'function') {
+	  // Return a rejected promise if `promiseFn` throws synchronously.
+	  resultPromise = promiseFn();
+	  // Fail in case no promise is returned.
+	  if (!checkIsPromise(resultPromise)) {
+		throw new Error('ERR_INVALID_RETURN_VALUE: promiseFn did not return Promise. ' + resultPromise);
+	  }
+	} else if (checkIsPromise(promiseFn)) {
+	  resultPromise = promiseFn;
+	} else {
+	  throw new Error('ERR_INVALID_ARG_TYPE: promiseFn is not Function or Promise. ' + promiseFn);
+	}
+
+	try {
+	  await resultPromise;
+	} catch (e) {
+	  return e;
+	}
+	return NO_EXCEPTION_SENTINEL;
+  }
+
+  function expectsError(shouldHaveError, actual, message) {
+	if (shouldHaveError && actual === NO_EXCEPTION_SENTINEL) {
+	  fail(undefined, 'Error', `Missing expected rejection${message ? ': ' + message : ''}`)
+	} else if (!shouldHaveError && actual !== NO_EXCEPTION_SENTINEL) {
+	  fail(actual, undefined, `Got unexpected rejection (${actual.message})${message ? ': ' + message : ''}`)
+	}
+  }
+
+  assert.rejects = async function rejects(promiseFn, message) {
+	expectsError(true, await waitForActual(promiseFn), message);
+  };
+
+  assert.doesNotReject = async function doesNotReject(fn, message) {
+	expectsError(false, await waitForActual(fn), message);
+  };
+
+  // ESM export
+  export default assert;
+  export const AssertionError = assert.AssertionError
+  // export const fail = assert.fail
+  // export const ok = assert.ok
+  export const equal = assert.equal
+  export const notEqual = assert.notEqual
+  export const deepEqual = assert.deepEqual
+  export const deepStrictEqual = assert.deepStrictEqual
+  export const notDeepEqual = assert.notDeepEqual
+  // export const notDeepStrictEqual = assert.notDeepStrictEqual
+  export const strictEqual = assert.strictEqual
+  export const notStrictEqual = assert.notStrictEqual
+  export const throws = assert.throws
+  export const doesNotThrow = assert.doesNotThrow
+  export const ifError = assert.ifError
+  export const rejects = assert.rejects
+  export const doesNotReject = assert.doesNotReject
diff --git a/test/unit/browser/index.esm.js b/test/unit/browser/index.esm.js
new file mode 100644
index 00000000000..b1d350f363c
--- /dev/null
+++ b/test/unit/browser/index.esm.js
@@ -0,0 +1,421 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+//@ts-check
+'use strict';
+
+const path = require('path');
+const glob = require('glob');
+const events = require('events');
+const mocha = require('mocha');
+const createStatsCollector = require('../../../node_modules/mocha/lib/stats-collector');
+const MochaJUnitReporter = require('mocha-junit-reporter');
+const url = require('url');
+const minimatch = require('minimatch');
+const fs = require('fs');
+const playwright = require('@playwright/test');
+const { applyReporter } = require('../reporter');
+const yaserver = require('yaserver');
+const http = require('http');
+const { randomBytes } = require('crypto');
+const minimist = require('minimist');
+const { promisify } = require('node:util');
+
+/**
+ * @type {{
+ * run: string;
+ * grep: string;
+ * runGlob: string;
+ * browser: string;
+ * reporter: string;
+ * 'reporter-options': string;
+ * tfs: string;
+ * build: boolean;
+ * debug: boolean;
+ * sequential: boolean;
+ * help: boolean;
+ * }}
+*/
+const args = minimist(process.argv.slice(2), {
+	boolean: ['build', 'debug', 'sequential', 'help'],
+	string: ['run', 'grep', 'runGlob', 'browser', 'reporter', 'reporter-options', 'tfs'],
+	default: {
+		build: false,
+		browser: ['chromium', 'firefox', 'webkit'],
+		reporter: process.platform === 'win32' ? 'list' : 'spec',
+		'reporter-options': ''
+	},
+	alias: {
+		grep: ['g', 'f'],
+		runGlob: ['glob', 'runGrep'],
+		debug: ['debug-browser'],
+		help: 'h'
+	},
+	describe: {
+		build: 'run with build output (out-build)',
+		run: 'only run tests matching <relative_file_path>',
+		grep: 'only run tests matching <pattern>',
+		debug: 'do not run browsers headless',
+		sequential: 'only run suites for a single browser at a time',
+		browser: 'browsers in which tests should run',
+		reporter: 'the mocha reporter',
+		'reporter-options': 'the mocha reporter options',
+		tfs: 'tfs',
+		help: 'show the help'
+	}
+});
+
+if (args.help) {
+	console.log(`Usage: node ${process.argv[1]} [options]
+
+Options:
+--build              run with build output (out-build)
+--run <relative_file_path> only run tests matching <relative_file_path>
+--grep, -g, -f <pattern> only run tests matching <pattern>
+--debug, --debug-browser do not run browsers headless
+--sequential         only run suites for a single browser at a time
+--browser <browser>  browsers in which tests should run
+--reporter <reporter> the mocha reporter
+--reporter-options <reporter-options> the mocha reporter options
+--tfs <tfs>          tfs
+--help, -h           show the help`);
+	process.exit(0);
+}
+
+const isDebug = !!args.debug;
+
+const withReporter = (function () {
+	if (args.tfs) {
+		{
+			return (browserType, runner) => {
+				new mocha.reporters.Spec(runner);
+				new MochaJUnitReporter(runner, {
+					reporterOptions: {
+						testsuitesTitle: `${args.tfs} ${process.platform}`,
+						mochaFile: process.env.BUILD_ARTIFACTSTAGINGDIRECTORY ? path.join(process.env.BUILD_ARTIFACTSTAGINGDIRECTORY, `test-results/${process.platform}-${process.arch}-${browserType}-${args.tfs.toLowerCase().replace(/[^\w]/g, '-')}-results.xml`) : undefined
+					}
+				});
+			};
+		}
+	} else {
+		return (_, runner) => applyReporter(runner, args);
+	}
+})();
+
+const outdir = args.build ? 'out-build' : 'out';
+const rootDir = path.resolve(__dirname, '..', '..', '..');
+const out = path.join(rootDir, `${outdir}`);
+
+function ensureIsArray(a) {
+	return Array.isArray(a) ? a : [a];
+}
+
+const testModules = (async function () {
+
+	const excludeGlob = '**/{node,electron-sandbox,electron-main}/**/*.test.js';
+	let isDefaultModules = true;
+	let promise;
+
+	if (args.run) {
+		// use file list (--run)
+		isDefaultModules = false;
+		promise = Promise.resolve(ensureIsArray(args.run).map(file => {
+			file = file.replace(/^src/, 'out');
+			file = file.replace(/\.ts$/, '.js');
+			return path.relative(out, file);
+		}));
+
+	} else {
+		// glob patterns (--glob)
+		const defaultGlob = '**/*.test.js';
+		const pattern = args.runGlob || defaultGlob;
+		isDefaultModules = pattern === defaultGlob;
+
+		promise = new Promise((resolve, reject) => {
+			glob(pattern, { cwd: out }, (err, files) => {
+				if (err) {
+					reject(err);
+				} else {
+					resolve(files);
+				}
+			});
+		});
+	}
+
+	return promise.then(files => {
+		const modules = [];
+		for (const file of files) {
+			if (!minimatch(file, excludeGlob)) {
+				modules.push(file.replace(/\.js$/, ''));
+
+			} else if (!isDefaultModules) {
+				console.warn(`DROPPONG ${file} because it cannot be run inside a browser`);
+			}
+		}
+		return modules;
+	});
+})();
+
+function consoleLogFn(msg) {
+	const type = msg.type();
+	const candidate = console[type];
+	if (candidate) {
+		return candidate;
+	}
+
+	if (type === 'warning') {
+		return console.warn;
+	}
+
+	return console.log;
+}
+
+async function createServer() {
+	// Demand a prefix to avoid issues with other services on the
+	// machine being able to access the test server.
+	const prefix = '/' + randomBytes(16).toString('hex');
+	const serveStatic = await yaserver.createServer({ rootDir });
+
+	/** Handles a request for a remote method call, invoking `fn` and returning the result */
+	const remoteMethod = async (req, response, fn) => {
+		const params = await new Promise((resolve, reject) => {
+			const body = [];
+			req.on('data', chunk => body.push(chunk));
+			req.on('end', () => resolve(JSON.parse(Buffer.concat(body).toString())));
+			req.on('error', reject);
+		});
+		try {
+			const result = await fn(...params);
+			response.writeHead(200, { 'Content-Type': 'application/json' });
+			response.end(JSON.stringify(result));
+		} catch (err) {
+			response.writeHead(500);
+			response.end(err.message);
+		}
+	};
+
+	const server = http.createServer((request, response) => {
+		if (!request.url?.startsWith(prefix)) {
+			return response.writeHead(404).end();
+		}
+
+		// rewrite the URL so the static server can handle the request correctly
+		request.url = request.url.slice(prefix.length);
+
+		function massagePath(p) {
+			// TODO@jrieken FISHY but it enables snapshot
+			// in ESM browser tests
+			p = String(p).replace(/\\/g, '/').replace(prefix, rootDir);
+			return p;
+		}
+
+		switch (request.url) {
+			case '/remoteMethod/__readFileInTests':
+				return remoteMethod(request, response, p => fs.promises.readFile(massagePath(p), 'utf-8'));
+			case '/remoteMethod/__writeFileInTests':
+				return remoteMethod(request, response, (p, contents) => fs.promises.writeFile(massagePath(p), contents));
+			case '/remoteMethod/__readDirInTests':
+				return remoteMethod(request, response, p => fs.promises.readdir(massagePath(p)));
+			case '/remoteMethod/__unlinkInTests':
+				return remoteMethod(request, response, p => fs.promises.unlink(massagePath(p)));
+			case '/remoteMethod/__mkdirPInTests':
+				return remoteMethod(request, response, p => fs.promises.mkdir(massagePath(p), { recursive: true }));
+			default:
+				return serveStatic.handle(request, response);
+		}
+	});
+
+	return new Promise((resolve, reject) => {
+		server.listen(0, 'localhost', () => {
+			resolve({
+				dispose: () => server.close(),
+				// @ts-ignore
+				url: `http://localhost:${server.address().port}${prefix}`
+			});
+		});
+		server.on('error', reject);
+	});
+}
+
+async function runTestsInBrowser(testModules, browserType) {
+	const server = await createServer();
+	const browser = await playwright[browserType].launch({ headless: !Boolean(args.debug), devtools: Boolean(args.debug) });
+	const context = await browser.newContext();
+	const page = await context.newPage();
+	const target = new URL(server.url + '/test/unit/browser/renderer.esm.html');
+	target.searchParams.set('baseUrl', url.pathToFileURL(path.join(rootDir, 'src')).toString());
+	if (args.build) {
+		target.searchParams.set('build', 'true');
+	}
+	if (process.env.BUILD_ARTIFACTSTAGINGDIRECTORY) {
+		target.searchParams.set('ci', 'true');
+	}
+
+	// append CSS modules as query-param
+	await promisify(require('glob'))('**/*.css', { cwd: out }).then(async cssModules => {
+		const cssData = await new Response((await new Response(cssModules.join(',')).blob()).stream().pipeThrough(new CompressionStream('gzip'))).arrayBuffer();
+		target.searchParams.set('_devCssData', Buffer.from(cssData).toString('base64'));
+	});
+
+	const emitter = new events.EventEmitter();
+	await page.exposeFunction('mocha_report', (type, data1, data2) => {
+		emitter.emit(type, data1, data2);
+	});
+
+	await page.goto(target.href);
+
+	if (args.build) {
+		const nlsMessages = await fs.promises.readFile(path.join(out, 'nls.messages.json'), 'utf8');
+		await page.evaluate(value => {
+			// when running from `out-build`, ensure to load the default
+			// messages file, because all `nls.localize` calls have their
+			// english values removed and replaced by an index.
+			// @ts-ignore
+			globalThis._VSCODE_NLS_MESSAGES = JSON.parse(value);
+		}, nlsMessages);
+	}
+
+	page.on('console', async msg => {
+		consoleLogFn(msg)(msg.text(), await Promise.all(msg.args().map(async arg => await arg.jsonValue())));
+	});
+
+	withReporter(browserType, new EchoRunner(emitter, browserType.toUpperCase()));
+
+	// collection failures for console printing
+	const failingModuleIds = [];
+	const failingTests = [];
+	emitter.on('fail', (test, err) => {
+		failingTests.push({ title: test.fullTitle, message: err.message });
+
+		if (err.stack) {
+			const regex = /(vs\/.*\.test)\.js/;
+			for (const line of String(err.stack).split('\n')) {
+				const match = regex.exec(line);
+				if (match) {
+					failingModuleIds.push(match[1]);
+					return;
+				}
+			}
+		}
+	});
+
+	try {
+		// @ts-expect-error
+		await page.evaluate(opts => loadAndRun(opts), {
+			modules: testModules,
+			grep: args.grep,
+		});
+	} catch (err) {
+		console.error(err);
+	}
+	if (!isDebug) {
+		server?.dispose();
+		await browser.close();
+	}
+
+	if (failingTests.length > 0) {
+		let res = `The followings tests are failing:\n - ${failingTests.map(({ title, message }) => `${title} (reason: ${message})`).join('\n - ')}`;
+
+		if (failingModuleIds.length > 0) {
+			res += `\n\nTo DEBUG, open ${browserType.toUpperCase()} and navigate to ${target.href}?${failingModuleIds.map(module => `m=${module}`).join('&')}`;
+		}
+
+		return `${res}\n`;
+	}
+}
+
+class EchoRunner extends events.EventEmitter {
+
+	constructor(event, title = '') {
+		super();
+		createStatsCollector(this);
+		event.on('start', () => this.emit('start'));
+		event.on('end', () => this.emit('end'));
+		event.on('suite', (suite) => this.emit('suite', EchoRunner.deserializeSuite(suite, title)));
+		event.on('suite end', (suite) => this.emit('suite end', EchoRunner.deserializeSuite(suite, title)));
+		event.on('test', (test) => this.emit('test', EchoRunner.deserializeRunnable(test)));
+		event.on('test end', (test) => this.emit('test end', EchoRunner.deserializeRunnable(test)));
+		event.on('hook', (hook) => this.emit('hook', EchoRunner.deserializeRunnable(hook)));
+		event.on('hook end', (hook) => this.emit('hook end', EchoRunner.deserializeRunnable(hook)));
+		event.on('pass', (test) => this.emit('pass', EchoRunner.deserializeRunnable(test)));
+		event.on('fail', (test, err) => this.emit('fail', EchoRunner.deserializeRunnable(test, title), EchoRunner.deserializeError(err)));
+		event.on('pending', (test) => this.emit('pending', EchoRunner.deserializeRunnable(test)));
+	}
+
+	static deserializeSuite(suite, titleExtra) {
+		return {
+			root: suite.root,
+			suites: suite.suites,
+			tests: suite.tests,
+			title: titleExtra && suite.title ? `${suite.title} - /${titleExtra}/` : suite.title,
+			titlePath: () => suite.titlePath,
+			fullTitle: () => suite.fullTitle,
+			timeout: () => suite.timeout,
+			retries: () => suite.retries,
+			slow: () => suite.slow,
+			bail: () => suite.bail
+		};
+	}
+
+	static deserializeRunnable(runnable, titleExtra) {
+		return {
+			title: runnable.title,
+			fullTitle: () => titleExtra && runnable.fullTitle ? `${runnable.fullTitle} - /${titleExtra}/` : runnable.fullTitle,
+			titlePath: () => runnable.titlePath,
+			async: runnable.async,
+			slow: () => runnable.slow,
+			speed: runnable.speed,
+			duration: runnable.duration,
+			currentRetry: () => runnable.currentRetry,
+		};
+	}
+
+	static deserializeError(err) {
+		const inspect = err.inspect;
+		err.inspect = () => inspect;
+		return err;
+	}
+}
+
+testModules.then(async modules => {
+
+	// run tests in selected browsers
+	const browserTypes = Array.isArray(args.browser)
+		? args.browser : [args.browser];
+
+	let messages = [];
+	let didFail = false;
+
+	try {
+		if (args.sequential) {
+			for (const browserType of browserTypes) {
+				messages.push(await runTestsInBrowser(modules, browserType));
+			}
+		} else {
+			messages = await Promise.all(browserTypes.map(async browserType => {
+				return await runTestsInBrowser(modules, browserType);
+			}));
+		}
+	} catch (err) {
+		console.error(err);
+		if (!isDebug) {
+			process.exit(1);
+		}
+	}
+
+	// aftermath
+	for (const msg of messages) {
+		if (msg) {
+			didFail = true;
+			console.log(msg);
+		}
+	}
+	if (!isDebug) {
+		process.exit(didFail ? 1 : 0);
+	}
+
+}).catch(err => {
+	console.error(err);
+});
diff --git a/test/unit/browser/index.js b/test/unit/browser/index.js
index b0a0f4ddb23..a924cdaa5e6 100644
--- a/test/unit/browser/index.js
+++ b/test/unit/browser/index.js
@@ -252,7 +252,6 @@ async function runTestsInBrowser(testModules, browserType) {
 			// when running from `out-build`, ensure to load the default
 			// messages file, because all `nls.localize` calls have their
 			// english values removed and replaced by an index.
-			// VSCODE_GLOBALS: NLS
 			// @ts-ignore
 			globalThis._VSCODE_NLS_MESSAGES = JSON.parse(value);
 		}, nlsMessages);
diff --git a/test/unit/browser/renderer.esm.html b/test/unit/browser/renderer.esm.html
new file mode 100644
index 00000000000..466b20d3455
--- /dev/null
+++ b/test/unit/browser/renderer.esm.html
@@ -0,0 +1,247 @@
+<html>
+
+<head>
+	<meta charset="utf-8">
+	<title>VSCode Tests</title>
+	<link href="../../../node_modules/mocha/mocha.css" rel="stylesheet" />
+</head>
+
+<body>
+	<div id="mocha"></div>
+	<script src="../../../node_modules/mocha/mocha.js"></script>
+	<script>
+		// !!! DO NOT CHANGE !!!
+		// Our unit tests may run in environments without
+		// display (e.g. from builds) and tests may by
+		// accident bring up native dialogs or even open
+		// windows. This we cannot allow as it may crash
+		// the test run.
+		// !!! DO NOT CHANGE !!!
+		window.open = function () { throw new Error('window.open() is not supported in tests!'); };
+		window.alert = function () { throw new Error('window.alert() is not supported in tests!'); }
+		window.confirm = function () { throw new Error('window.confirm() is not supported in tests!'); }
+
+		// Ignore uncaught cancelled promise errors
+		window.addEventListener('unhandledrejection', e => {
+			const name = e && e.reason && e.reason.name;
+
+			if (name === 'Canceled') {
+				e.preventDefault();
+				e.stopPropagation();
+			}
+		});
+
+		const urlParams = new URLSearchParams(window.location.search);
+		const isCI = urlParams.get('ci');
+
+		mocha.setup({
+			ui: 'tdd',
+			timeout: isCI ? 30000 : 5000
+		});
+	</script>
+
+	<script>
+		const isBuild = urlParams.get('build');
+		const out = !!isBuild ? 'out-build' : 'out';
+		const tasks =[];
+
+		// configure loader
+		const baseUrl = window.location.href;
+
+		// generate import map
+		const importMapParent = document.currentScript.parentNode;
+		const importMap = {
+			imports: {
+				vs: new URL(`../../../${out}/vs`, baseUrl).href,
+				assert: new URL('../assert-esm.js', baseUrl).href,
+				sinon: new URL('../../../node_modules/sinon/pkg/sinon-esm.js', baseUrl).href,
+				'sinon-test': new URL('../../../node_modules/sinon-test/dist/sinon-test-es.js', baseUrl).href,
+				'@xterm/xterm': new URL('../../../node_modules/@xterm/xterm/lib/xterm.js', baseUrl).href,
+				'@vscode/iconv-lite-umd': new URL('../../../node_modules/@vscode/iconv-lite-umd/lib/iconv-lite-umd.js', baseUrl).href,
+				jschardet: new URL('../../../node_modules/jschardet/dist/jschardet.min.js', baseUrl).href
+			}
+		}
+
+		// ---- CSS tricks
+
+		const cssDataBase64 = urlParams.get('_devCssData');
+		if (typeof cssDataBase64 === 'string') {
+
+			const style = document.createElement('style');
+			style.type = 'text/css';
+			document.head.appendChild(style);
+
+			globalThis._VSCODE_CSS_LOAD = function (url) {
+				// debugger;
+				style.sheet.insertRule(`@import url(${url});`);
+			};
+
+			const cssData = Uint8Array.from(atob(cssDataBase64), c => c.charCodeAt(0));
+			tasks.push(new Response(new Blob([cssData], {type:'application/octet-binary'}).stream().pipeThrough(new DecompressionStream('gzip'))).text().then(value => {
+				const cssModules = value.split(',');
+				for (const cssModule of cssModules) {
+					const cssUrl = new URL(`../../../${out}/${cssModule}`, baseUrl).href;
+					const jsSrc = `globalThis._VSCODE_CSS_LOAD('${cssUrl}');\n`;
+					const blob = new Blob([jsSrc], { type: 'application/javascript' });
+					importMap.imports[cssUrl] = URL.createObjectURL(blob);
+				}
+			}).catch(err => {
+				console.error(err);
+			}));
+		}
+
+		const initPromise = Promise.allSettled(tasks).then(() => {
+
+			const rawImportMap = JSON.stringify(importMap, undefined, 2);
+			const importMapScript = document.createElement('script');
+			importMapScript.type = 'importmap';
+			importMapScript.textContent = rawImportMap;
+			importMapParent.appendChild(importMapScript);
+
+		}).then(() => {
+			const bootstrapScript = document.createElement('script');
+			bootstrapScript.type = 'module';
+			bootstrapScript.textContent = document.getElementById('bootstrap').textContent
+			document.getElementById('bootstrap').remove();
+			document.body.append(bootstrapScript);
+		});
+
+		// set up require
+
+		globalThis._VSCODE_FILE_ROOT = new URL('../../../src', baseUrl).href;
+		globalThis.require = {
+			paths: {
+				xterm: new URL('../../../node_modules/xterm', baseUrl).href,
+				'@vscode/iconv-lite-umd': new URL('../../../node_modules/@vscode/iconv-lite-umd', baseUrl).href,
+				jschardet: new URL('../../../node_modules/jschardet', baseUrl).href
+			}
+		}
+	</script>
+	<script>
+		function serializeSuite(suite) {
+			return {
+				root: suite.root,
+				suites: suite.suites.map(serializeSuite),
+				tests: suite.tests.map(serializeRunnable),
+				title: suite.title,
+				fullTitle: suite.fullTitle(),
+				titlePath: suite.titlePath(),
+				timeout: suite.timeout(),
+				retries: suite.retries(),
+				slow: suite.slow(),
+				bail: suite.bail()
+			};
+		}
+		function serializeRunnable(runnable) {
+			return {
+				title: runnable.title,
+				titlePath: runnable.titlePath(),
+				fullTitle: runnable.fullTitle(),
+				async: runnable.async,
+				slow: runnable.slow(),
+				speed: runnable.speed,
+				duration: runnable.duration,
+				currentRetry: runnable.currentRetry(),
+			};
+		}
+		function serializeError(err) {
+			return {
+				message: err.message,
+				stack: err.stack,
+				actual: err.actual,
+				expected: err.expected,
+				uncaught: err.uncaught,
+				showDiff: err.showDiff,
+				inspect: typeof err.inspect === 'function' ? err.inspect() : ''
+			};
+		}
+		function PlaywrightReporter(runner) {
+			runner.on('start', () => window.mocha_report('start'));
+			runner.on('end', () => window.mocha_report('end'));
+			runner.on('suite', suite => window.mocha_report('suite', serializeSuite(suite)));
+			runner.on('suite end', suite => window.mocha_report('suite end', serializeSuite(suite)));
+			runner.on('test', test => window.mocha_report('test', serializeRunnable(test)));
+			runner.on('test end', test => window.mocha_report('test end', serializeRunnable(test)));
+			runner.on('hook', hook => window.mocha_report('hook', serializeRunnable(hook)));
+			runner.on('hook end', hook => window.mocha_report('hook end', serializeRunnable(hook)));
+			runner.on('pass', test => window.mocha_report('pass', serializeRunnable(test)));
+			runner.on('fail', (test, err) => window.mocha_report('fail', serializeRunnable(test), serializeError(err)));
+			runner.on('pending', test => window.mocha_report('pending', serializeRunnable(test)));
+		};
+
+		const remoteMethods = [
+			'__readFileInTests',
+			'__writeFileInTests',
+			'__readDirInTests',
+			'__unlinkInTests',
+			'__mkdirPInTests',
+		];
+
+		for (const method of remoteMethods) {
+			const prefix = window.location.pathname.split('/')[1];
+			globalThis[method] = async (...args) => {
+				const res = await fetch(`/${prefix}/remoteMethod/${method}`, {
+					body: JSON.stringify(args),
+					method: 'POST',
+					headers: { 'Content-Type': 'application/json' }
+				});
+
+				return res.json();
+			}
+		}
+
+		async function loadModules(modules) {
+			for (const file of modules) {
+				mocha.suite.emit(Mocha.Suite.constants.EVENT_FILE_PRE_REQUIRE, globalThis, file, mocha);
+				const m = await new Promise((resolve, reject) => import(`../../../${out}/${file}.js`).then(resolve, err => {
+					console.log("BAD" + file + JSON.stringify(err, undefined, '\t'));
+					resolve({});
+				}));
+				mocha.suite.emit(Mocha.Suite.constants.EVENT_FILE_REQUIRE, m, file, mocha);
+				mocha.suite.emit(Mocha.Suite.constants.EVENT_FILE_POST_REQUIRE, globalThis, file, mocha);
+			}
+		}
+
+		let _resolveTestData;
+		let _resolveTestRun;
+		globalThis._VSCODE_TEST_RUN = new Promise(resolve => _resolveTestData = resolve)
+
+		window.loadAndRun = async function loadAndRun(data, manual = false) {
+			_resolveTestData({data, manual})
+			return new Promise(resolve => _resolveTestRun = resolve);
+		}
+
+		const modules = new URL(window.location.href).searchParams.getAll('m');
+		if (Array.isArray(modules) && modules.length > 0) {
+			console.log('MANUALLY running tests', modules);
+
+			loadAndRun(modules, true).then(() => console.log('done'), err => console.log(err));
+		}
+	</script>
+
+
+	<script type="text" id="bootstrap">
+
+		const {data: {modules, grep}, manual} = await globalThis._VSCODE_TEST_RUN
+
+		// load
+		await loadModules(modules);
+
+		// run
+		await new Promise((resolve, reject) => {
+			if (grep) {
+				mocha.grep(grep);
+			}
+
+			if (!manual) {
+				mocha.reporter(PlaywrightReporter);
+			}
+			mocha.run(failCount => resolve(failCount === 0));
+		});
+
+		_resolveTestRun();
+
+	</script>
+</body>
+
+</html>
diff --git a/test/unit/browser/renderer.html b/test/unit/browser/renderer.html
index 7187baf7bf6..28e6912fcad 100644
--- a/test/unit/browser/renderer.html
+++ b/test/unit/browser/renderer.html
@@ -59,6 +59,7 @@
 				'sinon-test': new URL('../../../node_modules/sinon-test/dist/sinon-test.js', baseUrl).href,
 				'@xterm/xterm': new URL('../../../node_modules/@xterm/xterm/lib/xterm.js', baseUrl).href,
 				'@vscode/iconv-lite-umd': new URL('../../../node_modules/@vscode/iconv-lite-umd/lib/iconv-lite-umd.js', baseUrl).href,
+				'@vscode/tree-sitter-wasm': new URL('../../../node_modules/@vscode/tree-sitter-wasm/wasm/tree-sitter.js', baseUrl).href,
 				jschardet: new URL('../../../node_modules/jschardet/dist/jschardet.min.js', baseUrl).href
 			}
 		});
diff --git a/test/unit/electron/index.esm.js b/test/unit/electron/index.esm.js
new file mode 100644
index 00000000000..8daeeb26ab3
--- /dev/null
+++ b/test/unit/electron/index.esm.js
@@ -0,0 +1,358 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+//@ts-check
+'use strict';
+
+// mocha disables running through electron by default. Note that this must
+// come before any mocha imports.
+process.env.MOCHA_COLORS = '1';
+
+const { app, BrowserWindow, ipcMain, crashReporter, session } = require('electron');
+const product = require('../../../product.json');
+const { tmpdir } = require('os');
+const { existsSync, mkdirSync } = require('fs');
+const path = require('path');
+const mocha = require('mocha');
+const events = require('events');
+const MochaJUnitReporter = require('mocha-junit-reporter');
+const url = require('url');
+const net = require('net');
+const createStatsCollector = require('mocha/lib/stats-collector');
+const { applyReporter, importMochaReporter } = require('../reporter');
+
+const minimist = require('minimist');
+
+/**
+ * @type {{
+ * grep: string;
+ * run: string;
+ * runGlob: string;
+ * dev: boolean;
+ * reporter: string;
+ * 'reporter-options': string;
+ * 'waitServer': string;
+ * timeout: string;
+ * 'crash-reporter-directory': string;
+ * tfs: string;
+ * build: boolean;
+ * coverage: boolean;
+ * coveragePath: string;
+ * coverageFormats: string | string[];
+ * 'per-test-coverage': boolean;
+ * help: boolean;
+ * }}
+ */
+const args = minimist(process.argv.slice(2), {
+	string: ['grep', 'run', 'runGlob', 'reporter', 'reporter-options', 'waitServer', 'timeout', 'crash-reporter-directory', 'tfs', 'coveragePath', 'coverageFormats'],
+	boolean: ['build', 'coverage', 'help', 'dev', 'per-test-coverage'],
+	alias: {
+		'grep': ['g', 'f'],
+		'runGlob': ['glob', 'runGrep'],
+		'dev': ['dev-tools', 'devTools'],
+		'help': 'h'
+	},
+	default: {
+		'reporter': 'spec',
+		'reporter-options': ''
+	}
+});
+
+if (args.help) {
+	console.log(`Usage: node ${process.argv[1]} [options]
+
+Options:
+--grep, -g, -f <pattern>      only run tests matching <pattern>
+--run <file>                  only run tests from <file>
+--runGlob, --glob, --runGrep <file_pattern> only run tests matching <file_pattern>
+--build                       run with build output (out-build)
+--coverage                    generate coverage report
+--per-test-coverage           generate a per-test V8 coverage report, only valid with the full-json-stream reporter
+--dev, --dev-tools, --devTools <window> open dev tools, keep window open, reuse app data
+--reporter <reporter>         the mocha reporter (default: "spec")
+--reporter-options <options>  the mocha reporter options (default: "")
+--waitServer <port>           port to connect to and wait before running tests
+--timeout <ms>                timeout for tests
+--crash-reporter-directory <path> crash reporter directory
+--tfs <url>                   TFS server URL
+--help, -h                    show the help`);
+	process.exit(0);
+}
+
+let crashReporterDirectory = args['crash-reporter-directory'];
+if (crashReporterDirectory) {
+	crashReporterDirectory = path.normalize(crashReporterDirectory);
+
+	if (!path.isAbsolute(crashReporterDirectory)) {
+		console.error(`The path '${crashReporterDirectory}' specified for --crash-reporter-directory must be absolute.`);
+		app.exit(1);
+	}
+
+	if (!existsSync(crashReporterDirectory)) {
+		try {
+			mkdirSync(crashReporterDirectory);
+		} catch (error) {
+			console.error(`The path '${crashReporterDirectory}' specified for --crash-reporter-directory does not seem to exist or cannot be created.`);
+			app.exit(1);
+		}
+	}
+
+	// Crashes are stored in the crashDumps directory by default, so we
+	// need to change that directory to the provided one
+	console.log(`Found --crash-reporter-directory argument. Setting crashDumps directory to be '${crashReporterDirectory}'`);
+	app.setPath('crashDumps', crashReporterDirectory);
+
+	crashReporter.start({
+		companyName: 'Microsoft',
+		productName: process.env['VSCODE_DEV'] ? `${product.nameShort} Dev` : product.nameShort,
+		uploadToServer: false,
+		compress: true
+	});
+}
+
+if (!args.dev) {
+	app.setPath('userData', path.join(tmpdir(), `vscode-tests-${Date.now()}`));
+}
+
+function deserializeSuite(suite) {
+	return {
+		root: suite.root,
+		suites: suite.suites,
+		tests: suite.tests,
+		title: suite.title,
+		titlePath: () => suite.titlePath,
+		fullTitle: () => suite.fullTitle,
+		timeout: () => suite.timeout,
+		retries: () => suite.retries,
+		slow: () => suite.slow,
+		bail: () => suite.bail
+	};
+}
+
+function deserializeRunnable(runnable) {
+	return {
+		title: runnable.title,
+		titlePath: () => runnable.titlePath,
+		fullTitle: () => runnable.fullTitle,
+		async: runnable.async,
+		slow: () => runnable.slow,
+		speed: runnable.speed,
+		duration: runnable.duration,
+		currentRetry: () => runnable.currentRetry
+	};
+}
+
+function deserializeError(err) {
+	const inspect = err.inspect;
+	err.inspect = () => inspect;
+	// Unfortunately, mocha rewrites and formats err.actual/err.expected.
+	// This formatting is hard to reverse, so err.*JSON includes the unformatted value.
+	if (err.actual) {
+		err.actual = JSON.parse(err.actual).value;
+		err.actualJSON = err.actual;
+	}
+	if (err.expected) {
+		err.expected = JSON.parse(err.expected).value;
+		err.expectedJSON = err.expected;
+	}
+	return err;
+}
+
+class IPCRunner extends events.EventEmitter {
+
+	constructor(win) {
+		super();
+
+		this.didFail = false;
+		this.didEnd = false;
+
+		ipcMain.on('start', () => this.emit('start'));
+		ipcMain.on('end', () => {
+			this.didEnd = true;
+			this.emit('end');
+		});
+		ipcMain.on('suite', (e, suite) => this.emit('suite', deserializeSuite(suite)));
+		ipcMain.on('suite end', (e, suite) => this.emit('suite end', deserializeSuite(suite)));
+		ipcMain.on('test', (e, test) => this.emit('test', deserializeRunnable(test)));
+		ipcMain.on('test end', (e, test) => this.emit('test end', deserializeRunnable(test)));
+		ipcMain.on('hook', (e, hook) => this.emit('hook', deserializeRunnable(hook)));
+		ipcMain.on('hook end', (e, hook) => this.emit('hook end', deserializeRunnable(hook)));
+		ipcMain.on('pass', (e, test) => this.emit('pass', deserializeRunnable(test)));
+		ipcMain.on('fail', (e, test, err) => {
+			this.didFail = true;
+			this.emit('fail', deserializeRunnable(test), deserializeError(err));
+		});
+		ipcMain.on('pending', (e, test) => this.emit('pending', deserializeRunnable(test)));
+
+		ipcMain.handle('startCoverage', async () => {
+			win.webContents.debugger.attach();
+			await win.webContents.debugger.sendCommand('Debugger.enable');
+			await win.webContents.debugger.sendCommand('Profiler.enable');
+			await win.webContents.debugger.sendCommand('Profiler.startPreciseCoverage', {
+				detailed: true,
+				allowTriggeredUpdates: false,
+			});
+		});
+
+		const coverageScriptsReported = new Set();
+		ipcMain.handle('snapshotCoverage', async (_, test) => {
+			const coverage = await win.webContents.debugger.sendCommand('Profiler.takePreciseCoverage');
+			await Promise.all(coverage.result.map(async (r) => {
+				if (!coverageScriptsReported.has(r.scriptId)) {
+					coverageScriptsReported.add(r.scriptId);
+					const src = await win.webContents.debugger.sendCommand('Debugger.getScriptSource', { scriptId: r.scriptId });
+					r.source = src.scriptSource;
+				}
+			}));
+
+			if (!test) {
+				this.emit('coverage init', coverage);
+			} else {
+				this.emit('coverage increment', test, coverage);
+			}
+		});
+	}
+}
+
+app.on('ready', () => {
+
+	// needed when loading resources from the renderer, e.g xterm.js or the encoding lib
+	session.defaultSession.protocol.registerFileProtocol('vscode-file', (request, callback) => {
+		const path = new URL(request.url).pathname;
+		callback({ path });
+	});
+
+	ipcMain.on('error', (_, err) => {
+		if (!args.dev) {
+			console.error(err);
+			app.exit(1);
+		}
+	});
+
+	// We need to provide a basic `ISandboxConfiguration`
+	// for our preload script to function properly because
+	// some of our types depend on it (e.g. product.ts).
+	ipcMain.handle('vscode:test-vscode-window-config', async () => {
+		return {
+			product: {
+				version: '1.x.y',
+				nameShort: 'Code - OSS Dev',
+				nameLong: 'Code - OSS Dev',
+				applicationName: 'code-oss',
+				dataFolderName: '.vscode-oss',
+				urlProtocol: 'code-oss',
+			}
+		};
+	});
+
+	// No-op since invoke the IPC as part of IIFE in the preload.
+	ipcMain.handle('vscode:fetchShellEnv', event => { });
+
+	const win = new BrowserWindow({
+		height: 600,
+		width: 800,
+		show: false,
+		webPreferences: {
+			preload: path.join(__dirname, 'preload.js'), // ensure similar environment as VSCode as tests may depend on this
+			additionalArguments: [`--vscode-window-config=vscode:test-vscode-window-config`],
+			nodeIntegration: true,
+			contextIsolation: false,
+			enableWebSQL: false,
+			spellcheck: false
+		}
+	});
+
+	win.webContents.on('did-finish-load', () => {
+		if (args.dev) {
+			win.show();
+			win.webContents.openDevTools();
+		}
+
+		if (args.waitServer) {
+			waitForServer(Number(args.waitServer)).then(sendRun);
+		} else {
+			sendRun();
+		}
+	});
+
+	async function waitForServer(port) {
+		let timeout;
+		let socket;
+
+		return new Promise(resolve => {
+			socket = net.connect(port, '127.0.0.1');
+			socket.on('error', e => {
+				console.error('error connecting to waitServer', e);
+				resolve(undefined);
+			});
+
+			socket.on('close', () => {
+				resolve(undefined);
+			});
+
+			timeout = setTimeout(() => {
+				console.error('timed out waiting for before starting tests debugger');
+				resolve(undefined);
+			}, 15000);
+		}).finally(() => {
+			if (socket) {
+				socket.end();
+			}
+			clearTimeout(timeout);
+		});
+	}
+
+	function sendRun() {
+		win.webContents.send('run', args);
+	}
+
+	const target = url.pathToFileURL(path.join(__dirname, 'renderer.esm.html'));
+	target.searchParams.set('argv', JSON.stringify(args));
+	win.loadURL(target.href);
+
+	const runner = new IPCRunner(win);
+	createStatsCollector(runner);
+
+	// Handle renderer crashes, #117068
+	win.webContents.on('render-process-gone', (evt, details) => {
+		if (!runner.didEnd) {
+			console.error(`Renderer process crashed with: ${JSON.stringify(details)}`);
+			app.exit(1);
+		}
+	});
+
+	const reporters = [];
+
+	if (args.tfs) {
+		reporters.push(
+			new mocha.reporters.Spec(runner),
+			new MochaJUnitReporter(runner, {
+				reporterOptions: {
+					testsuitesTitle: `${args.tfs} ${process.platform}`,
+					mochaFile: process.env.BUILD_ARTIFACTSTAGINGDIRECTORY ? path.join(process.env.BUILD_ARTIFACTSTAGINGDIRECTORY, `test-results/${process.platform}-${process.arch}-${args.tfs.toLowerCase().replace(/[^\w]/g, '-')}-results.xml`) : undefined
+				}
+			}),
+		);
+	} else {
+		// mocha patches symbols to use windows escape codes, but it seems like
+		// Electron mangles these in its output.
+		if (process.platform === 'win32') {
+			Object.assign(importMochaReporter('base').symbols, {
+				ok: '+',
+				err: 'X',
+				dot: '.',
+			});
+		}
+
+		reporters.push(applyReporter(runner, args));
+	}
+
+	if (!args.dev) {
+		ipcMain.on('all done', async () => {
+			await Promise.all(reporters.map(r => r.drain?.()));
+			app.exit(runner.didFail ? 1 : 0);
+		});
+	}
+});
diff --git a/test/unit/electron/index.js b/test/unit/electron/index.js
index 09f573713a9..40c02606715 100644
--- a/test/unit/electron/index.js
+++ b/test/unit/electron/index.js
@@ -249,7 +249,7 @@ app.on('ready', () => {
 		width: 800,
 		show: false,
 		webPreferences: {
-			preload: path.join(__dirname, '..', '..', '..', 'src', 'vs', 'base', 'parts', 'sandbox', 'electron-sandbox', 'preload.js'), // ensure similar environment as VSCode as tests may depend on this
+			preload: path.join(__dirname, 'preload.js'),
 			additionalArguments: [`--vscode-window-config=vscode:test-vscode-window-config`],
 			nodeIntegration: true,
 			contextIsolation: false,
diff --git a/test/unit/electron/preload.js b/test/unit/electron/preload.js
new file mode 100644
index 00000000000..04439d66ea1
--- /dev/null
+++ b/test/unit/electron/preload.js
@@ -0,0 +1,92 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+// @ts-check
+(function () {
+	'use strict';
+
+	const { ipcRenderer, webFrame, contextBridge, webUtils } = require('electron');
+
+	const globals = {
+
+		ipcRenderer: {
+
+			send(channel, ...args) {
+				ipcRenderer.send(channel, ...args);
+			},
+
+			invoke(channel, ...args) {
+				return ipcRenderer.invoke(channel, ...args);
+			},
+
+			on(channel, listener) {
+				ipcRenderer.on(channel, listener);
+
+				return this;
+			},
+
+			once(channel, listener) {
+				ipcRenderer.once(channel, listener);
+
+				return this;
+			},
+
+			removeListener(channel, listener) {
+				ipcRenderer.removeListener(channel, listener);
+
+				return this;
+			}
+		},
+
+		webFrame: {
+
+			setZoomLevel(level) {
+				if (typeof level === 'number') {
+					webFrame.setZoomLevel(level);
+				}
+			}
+		},
+
+		webUtils: {
+
+			getPathForFile(file) {
+				return webUtils.getPathForFile(file);
+			}
+		},
+
+		process: {
+			get platform() { return process.platform; },
+			get arch() { return process.arch; },
+			get env() { return { ...process.env }; },
+			get versions() { return process.versions; },
+			get type() { return 'renderer'; },
+			get execPath() { return process.execPath; },
+
+			cwd() {
+				return process.env['VSCODE_CWD'] || process.execPath.substr(0, process.execPath.lastIndexOf(process.platform === 'win32' ? '\\' : '/'));
+			},
+
+			getProcessMemoryInfo() {
+				return process.getProcessMemoryInfo();
+			},
+
+			on(type, callback) {
+				// @ts-ignore
+				process.on(type, callback);
+			}
+		},
+	};
+
+	if (process.contextIsolated) {
+		try {
+			contextBridge.exposeInMainWorld('vscode', globals);
+		} catch (error) {
+			console.error(error);
+		}
+	} else {
+		// @ts-ignore
+		window.vscode = globals;
+	}
+}());
diff --git a/test/unit/electron/renderer.esm.html b/test/unit/electron/renderer.esm.html
new file mode 100644
index 00000000000..8f6866efca5
--- /dev/null
+++ b/test/unit/electron/renderer.esm.html
@@ -0,0 +1,136 @@
+<html>
+
+<head>
+	<meta charset="utf-8">
+	<title>VSCode Tests</title>
+	<link href="../../../node_modules/mocha/mocha.css" rel="stylesheet" />
+
+</head>
+
+<body>
+	<div id="mocha"></div>
+	<script src="../../../node_modules/mocha/mocha.js"></script>
+
+	<script>
+
+		// !!! DO NOT CHANGE !!!
+		// Our unit tests may run in environments without
+		// display (e.g. from builds) and tests may by
+		// accident bring up native dialogs or even open
+		// windows. This we cannot allow as it may crash
+		// the test run.
+		// !!! DO NOT CHANGE !!!
+		window.open = function () { throw new Error('window.open() is not supported in tests!'); };
+		window.alert = function () { throw new Error('window.alert() is not supported in tests!'); }
+		window.confirm = function () { throw new Error('window.confirm() is not supported in tests!'); }
+
+		// Ignore uncaught cancelled promise errors
+		window.addEventListener('unhandledrejection', e => {
+			const name = e && e.reason && e.reason.name;
+
+			if (name === 'Canceled') {
+				e.preventDefault();
+				e.stopPropagation();
+			}
+		});
+
+		mocha.setup({
+			ui: 'tdd',
+			timeout: 5000,
+			forbidOnly: typeof process.env['BUILD_ARTIFACTSTAGINGDIRECTORY'] === 'string' // disallow .only() when running on build machine
+		});
+	</script>
+	<script>
+		const urlParams = new URLSearchParams(window.location.search);
+		const argv = JSON.parse(urlParams.get('argv'));
+
+		const outdir = argv.build ? 'out-build' : 'out';
+		const basePath = require('path').join(__dirname, `../../../${outdir}/`);
+		const baseUrl = require('url').pathToFileURL(basePath);
+
+		// Tests run in a renderer that IS node-enabled. Wo we will encounter imports for node-modules which isn't
+		// supported by blink/chromium. To work around this, we generate an import map that maps all node modules
+		// to a blob that exports all properties of the module as named exports and the module itself as default.
+
+		function asRequireBlobUri(name) {
+			let _mod;
+			try {
+				_mod = require(name);
+
+			} catch (err) {
+				// These are somewhat expected because of platform differences (windows vs mac vs linux) or because of node/electron binary differences
+				// console.error(`[ESM] Failed to require ${name}`);
+				// console.error(err);
+				return undefined;
+			}
+
+			// export all properties and the module itself as default
+			let jsSrc = `const _mod = require('${name}')\n`;
+			for (const name of Object.keys(_mod)) {
+				jsSrc += `export const ${name} = _mod['${name}'];\n`;
+			}
+			jsSrc += `export default _mod;\n`;
+
+			const blob = new Blob([jsSrc], { type: 'application/javascript' });
+			const url = URL.createObjectURL(blob);
+			return url;
+		}
+
+		// generate import map
+		const importMap = {
+			imports: {
+				assert: new URL('../test/unit/assert-esm.js', baseUrl).href,
+				sinon: new URL('../node_modules/sinon/pkg/sinon-esm.js', baseUrl).href,
+				'sinon-test': new URL('../node_modules/sinon-test/dist/sinon-test-es.js', baseUrl).href,
+				'electron': asRequireBlobUri('electron'),
+			}
+		};
+
+
+		const builtin = require('module').builtinModules.filter(mod => !mod.startsWith('_') && !mod.startsWith('electron/js2c/')).sort();
+		const dependencies = Object.keys(require('../../../package.json').dependencies).sort();
+		const optionalDependencies = Object.keys(require('../../../package.json').optionalDependencies).sort();
+		const dependenciesRemote = Object.keys(require('../../../remote/package.json').dependencies).sort();
+
+		for (const name of new Set([].concat(builtin, dependencies, optionalDependencies, dependenciesRemote))) {
+
+			const url = asRequireBlobUri(name);
+			if(!url) {
+				continue;
+			}
+
+			importMap.imports[name] = url;
+		}
+
+		//2: CSS modules
+		const style = document.createElement('style');
+		style.type = 'text/css';
+		document.head.appendChild(style);
+
+		globalThis._VSCODE_CSS_LOAD = function (url) {
+			style.sheet.insertRule(`@import url(${url});`);
+		};
+
+		const { promisify } = require('util');
+		globalThis._VSCODE_TEST_INIT = promisify(require('glob'))('**/*.css', { cwd: basePath }).then(cssModules => {
+			for (const cssModule of cssModules) {
+				const cssUrl = new URL(cssModule, baseUrl).href;
+				const jsSrc = `globalThis._VSCODE_CSS_LOAD('${cssUrl}');\n`;
+				const blob = new Blob([jsSrc], { type: 'application/javascript' });
+				importMap.imports[cssUrl] = URL.createObjectURL(blob);
+			}
+
+		}).then(() => {
+
+			const rawImportMap = JSON.stringify(importMap, undefined, 2);
+			const importMapScript = document.createElement('script');
+			importMapScript.type = 'importmap';
+			importMapScript.textContent = rawImportMap;
+			document.head.append(importMapScript);
+		});
+
+	</script>
+	<script src="./renderer.esm.js"></script>
+</body>
+
+</html>
diff --git a/test/unit/electron/renderer.esm.js b/test/unit/electron/renderer.esm.js
new file mode 100644
index 00000000000..27d65249ac8
--- /dev/null
+++ b/test/unit/electron/renderer.esm.js
@@ -0,0 +1,366 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+// @ts-check
+
+/*eslint-env mocha*/
+
+const fs = require('fs');
+
+(function () {
+	const originals = {};
+	let logging = false;
+	let withStacks = false;
+
+	globalThis.beginLoggingFS = (_withStacks) => {
+		logging = true;
+		withStacks = _withStacks || false;
+	};
+	globalThis.endLoggingFS = () => {
+		logging = false;
+		withStacks = false;
+	};
+
+	function createSpy(element, cnt) {
+		return function (...args) {
+			if (logging) {
+				console.log(`calling ${element}: ` + args.slice(0, cnt).join(',') + (withStacks ? (`\n` + new Error().stack.split('\n').slice(2).join('\n')) : ''));
+			}
+			return originals[element].call(this, ...args);
+		};
+	}
+
+	function intercept(element, cnt) {
+		originals[element] = fs[element];
+		fs[element] = createSpy(element, cnt);
+	}
+
+	[
+		['realpathSync', 1],
+		['readFileSync', 1],
+		['openSync', 3],
+		['readSync', 1],
+		['closeSync', 1],
+		['readFile', 2],
+		['mkdir', 1],
+		['lstat', 1],
+		['stat', 1],
+		['watch', 1],
+		['readdir', 1],
+		['access', 2],
+		['open', 2],
+		['write', 1],
+		['fdatasync', 1],
+		['close', 1],
+		['read', 1],
+		['unlink', 1],
+		['rmdir', 1],
+	].forEach((element) => {
+		intercept(element[0], element[1]);
+	});
+})();
+
+const { ipcRenderer } = require('electron');
+const assert = require('assert');
+const path = require('path');
+const glob = require('glob');
+const util = require('util');
+const coverage = require('../coverage');
+const { pathToFileURL } = require('url');
+
+// Disabled custom inspect. See #38847
+if (util.inspect && util.inspect['defaultOptions']) {
+	util.inspect['defaultOptions'].customInspect = false;
+}
+
+// VSCODE_GLOBALS: node_modules
+globalThis._VSCODE_NODE_MODULES = new Proxy(Object.create(null), { get: (_target, mod) => require(String(mod)) });
+
+// VSCODE_GLOBALS: package/product.json
+globalThis._VSCODE_PRODUCT_JSON = require('../../../product.json');
+globalThis._VSCODE_PACKAGE_JSON = require('../../../package.json');
+
+// Test file operations that are common across platforms. Used for test infra, namely snapshot tests
+Object.assign(globalThis, {
+	__readFileInTests: path => fs.promises.readFile(path, 'utf-8'),
+	__writeFileInTests: (path, contents) => fs.promises.writeFile(path, contents),
+	__readDirInTests: path => fs.promises.readdir(path),
+	__unlinkInTests: path => fs.promises.unlink(path),
+	__mkdirPInTests: path => fs.promises.mkdir(path, { recursive: true }),
+});
+
+function initNls(opts) {
+	if (opts.build) {
+		// when running from `out-build`, ensure to load the default
+		// messages file, because all `nls.localize` calls have their
+		// english values removed and replaced by an index.
+		// VSCODE_GLOBALS: NLS
+		globalThis._VSCODE_NLS_MESSAGES = require(`../../../out-build/nls.messages.json`);
+	}
+}
+const _tests_glob = '**/test/**/*.test.js';
+let loader;
+let _out;
+const _loaderErrors = [];
+
+function initLoader(opts) {
+	// debugger;
+	const outdir = opts.build ? 'out-build' : 'out';
+	_out = path.join(__dirname, `../../../${outdir}`);
+
+	const baseUrl = pathToFileURL(path.join(__dirname, `../../../${outdir}/`));
+	globalThis._VSCODE_FILE_ROOT = baseUrl.href;
+
+	// set loader
+	/**
+	 * @param {string[]} modules
+	 * @param {(...args:any[]) => void} callback
+	 */
+	function esmRequire(modules, callback, errorback) {
+		const tasks = modules.map(mod => {
+
+			const url = new URL(`./${mod}.js`, baseUrl).href;
+			return import(url).catch(err => {
+				console.log(mod, url);
+				console.log(err);
+				_loaderErrors.push(err);
+				throw err;
+			});
+		});
+
+		Promise.all(tasks).then(modules => callback(...modules)).catch(errorback);
+	}
+
+	loader = { require: esmRequire };
+}
+
+function createCoverageReport(opts) {
+	if (opts.coverage) {
+		return coverage.createReport(opts.run || opts.runGlob);
+	}
+	return Promise.resolve(undefined);
+}
+
+function loadWorkbenchTestingUtilsModule() {
+	return new Promise((resolve, reject) => {
+		loader.require(['vs/workbench/test/common/utils'], resolve, reject);
+	});
+}
+
+async function loadModules(modules) {
+	for (const file of modules) {
+		mocha.suite.emit(Mocha.Suite.constants.EVENT_FILE_PRE_REQUIRE, globalThis, file, mocha);
+		const m = await new Promise((resolve, reject) => loader.require([file], resolve, reject));
+		mocha.suite.emit(Mocha.Suite.constants.EVENT_FILE_REQUIRE, m, file, mocha);
+		mocha.suite.emit(Mocha.Suite.constants.EVENT_FILE_POST_REQUIRE, globalThis, file, mocha);
+	}
+}
+
+function loadTestModules(opts) {
+
+	if (opts.run) {
+		const files = Array.isArray(opts.run) ? opts.run : [opts.run];
+		const modules = files.map(file => {
+			file = file.replace(/^src/, 'out');
+			file = file.replace(/\.ts$/, '.js');
+			return path.relative(_out, file).replace(/\.js$/, '');
+		});
+		return loadModules(modules);
+	}
+
+	const pattern = opts.runGlob || _tests_glob;
+
+	return new Promise((resolve, reject) => {
+		glob(pattern, { cwd: _out }, (err, files) => {
+			if (err) {
+				reject(err);
+				return;
+			}
+			const modules = files.map(file => file.replace(/\.js$/, ''));
+			resolve(modules);
+		});
+	}).then(loadModules);
+}
+
+function loadTests(opts) {
+
+	const _unexpectedErrors = [];
+
+	// collect unexpected errors
+	loader.require(['vs/base/common/errors'], function (errors) {
+		errors.setUnexpectedErrorHandler(function (err) {
+			let stack = (err ? err.stack : null);
+			if (!stack) {
+				stack = new Error().stack;
+			}
+
+			_unexpectedErrors.push((err && err.message ? err.message : err) + '\n' + stack);
+		});
+	});
+
+	return loadWorkbenchTestingUtilsModule().then((workbenchTestingModule) => {
+		const assertCleanState = workbenchTestingModule.assertCleanState;
+
+		suite('Tests are using suiteSetup and setup correctly', () => {
+			test('assertCleanState - check that registries are clean at the start of test running', () => {
+				assertCleanState();
+			});
+		});
+
+		return loadTestModules(opts).then(() => {
+			suite('Unexpected Errors & Loader Errors', function () {
+				test('should not have unexpected errors', function () {
+					const errors = _unexpectedErrors.concat(_loaderErrors);
+					if (errors.length) {
+						errors.forEach(function (stack) {
+							console.error('');
+							console.error(stack);
+						});
+						assert.ok(false, errors.join());
+					}
+				});
+
+				test('assertCleanState - check that registries are clean and objects are disposed at the end of test running', () => {
+					assertCleanState();
+				});
+			});
+		});
+	});
+}
+
+function serializeSuite(suite) {
+	return {
+		root: suite.root,
+		suites: suite.suites.map(serializeSuite),
+		tests: suite.tests.map(serializeRunnable),
+		title: suite.title,
+		fullTitle: suite.fullTitle(),
+		titlePath: suite.titlePath(),
+		timeout: suite.timeout(),
+		retries: suite.retries(),
+		slow: suite.slow(),
+		bail: suite.bail()
+	};
+}
+
+function serializeRunnable(runnable) {
+	return {
+		title: runnable.title,
+		fullTitle: runnable.fullTitle(),
+		titlePath: runnable.titlePath(),
+		async: runnable.async,
+		slow: runnable.slow(),
+		speed: runnable.speed,
+		duration: runnable.duration
+	};
+}
+
+function serializeError(err) {
+	return {
+		message: err.message,
+		stack: err.stack,
+		snapshotPath: err.snapshotPath,
+		actual: safeStringify({ value: err.actual }),
+		expected: safeStringify({ value: err.expected }),
+		uncaught: err.uncaught,
+		showDiff: err.showDiff,
+		inspect: typeof err.inspect === 'function' ? err.inspect() : ''
+	};
+}
+
+function safeStringify(obj) {
+	const seen = new Set();
+	return JSON.stringify(obj, (key, value) => {
+		if (value === undefined) {
+			return '[undefined]';
+		}
+
+		if (isObject(value) || Array.isArray(value)) {
+			if (seen.has(value)) {
+				return '[Circular]';
+			} else {
+				seen.add(value);
+			}
+		}
+		return value;
+	});
+}
+
+function isObject(obj) {
+	// The method can't do a type cast since there are type (like strings) which
+	// are subclasses of any put not positvely matched by the function. Hence type
+	// narrowing results in wrong results.
+	return typeof obj === 'object'
+		&& obj !== null
+		&& !Array.isArray(obj)
+		&& !(obj instanceof RegExp)
+		&& !(obj instanceof Date);
+}
+
+class IPCReporter {
+
+	constructor(runner) {
+		runner.on('start', () => ipcRenderer.send('start'));
+		runner.on('end', () => ipcRenderer.send('end'));
+		runner.on('suite', suite => ipcRenderer.send('suite', serializeSuite(suite)));
+		runner.on('suite end', suite => ipcRenderer.send('suite end', serializeSuite(suite)));
+		runner.on('test', test => ipcRenderer.send('test', serializeRunnable(test)));
+		runner.on('test end', test => ipcRenderer.send('test end', serializeRunnable(test)));
+		runner.on('hook', hook => ipcRenderer.send('hook', serializeRunnable(hook)));
+		runner.on('hook end', hook => ipcRenderer.send('hook end', serializeRunnable(hook)));
+		runner.on('pass', test => ipcRenderer.send('pass', serializeRunnable(test)));
+		runner.on('fail', (test, err) => ipcRenderer.send('fail', serializeRunnable(test), serializeError(err)));
+		runner.on('pending', test => ipcRenderer.send('pending', serializeRunnable(test)));
+	}
+}
+
+function runTests(opts) {
+	// this *must* come before loadTests, or it doesn't work.
+	if (opts.timeout !== undefined) {
+		mocha.timeout(opts.timeout);
+	}
+
+	return loadTests(opts).then(() => {
+
+		if (opts.grep) {
+			mocha.grep(opts.grep);
+		}
+
+		if (!opts.dev) {
+			mocha.reporter(IPCReporter);
+		}
+
+		const runner = mocha.run(() => {
+			createCoverageReport(opts).then(() => {
+				ipcRenderer.send('all done');
+			});
+		});
+
+		if (opts.dev) {
+			runner.on('fail', (test, err) => {
+
+				console.error(test.fullTitle());
+				console.error(err.stack);
+			});
+		}
+	});
+}
+
+ipcRenderer.on('run', async (_e, opts) => {
+	initNls(opts);
+	initLoader(opts);
+
+	await Promise.resolve(globalThis._VSCODE_TEST_INIT);
+
+	try {
+		await runTests(opts);
+	} catch (err) {
+		if (typeof err !== 'string') {
+			err = JSON.stringify(err);
+		}
+		console.error(err);
+		ipcRenderer.send('error', err);
+	}
+});
diff --git a/test/unit/electron/renderer.js b/test/unit/electron/renderer.js
index 453084968f5..b054584626b 100644
--- a/test/unit/electron/renderer.js
+++ b/test/unit/electron/renderer.js
@@ -66,7 +66,7 @@ const assert = require('assert');
 const path = require('path');
 const glob = require('glob');
 const util = require('util');
-const bootstrap = require('../../../src/bootstrap');
+const bootstrapNode = require('../../../src/bootstrap-node');
 const coverage = require('../coverage');
 const { takeSnapshotAndCountClasses } = require('../analyzeSnapshot');
 
@@ -102,7 +102,6 @@ function initNls(opts) {
 		// when running from `out-build`, ensure to load the default
 		// messages file, because all `nls.localize` calls have their
 		// english values removed and replaced by an index.
-		// VSCODE_GLOBALS: NLS
 		globalThis._VSCODE_NLS_MESSAGES = (require.__$__nodeRequire ?? require)(`../../../out-build/nls.messages.json`);
 	}
 }
@@ -116,7 +115,7 @@ function initLoader(opts) {
 	const loaderConfig = {
 		nodeRequire: require,
 		catchError: true,
-		baseUrl: bootstrap.fileUriFromPath(path.join(__dirname, '../../../src'), { isWindows: process.platform === 'win32' }),
+		baseUrl: bootstrapNode.fileUriFromPath(path.join(__dirname, '../../../src'), { isWindows: process.platform === 'win32' }),
 		paths: {
 			'vs': `../${outdir}/vs`,
 			'lib': `../${outdir}/lib`,
@@ -159,9 +158,8 @@ function loadTestModules(opts) {
 	if (opts.run) {
 		const files = Array.isArray(opts.run) ? opts.run : [opts.run];
 		const modules = files.map(file => {
-			file = file.replace(/^src/, 'out');
-			file = file.replace(/\.ts$/, '.js');
-			return path.relative(_out, file).replace(/\.js$/, '');
+			file = file.replace(/^src[\\/]/, '');
+			return file.replace(/\.[jt]s$/, '');
 		});
 		return loadModules(modules);
 	}
diff --git a/test/unit/node/index.js b/test/unit/node/index.js
index 9f0ec662a73..d087e8409f3 100644
--- a/test/unit/node/index.js
+++ b/test/unit/node/index.js
@@ -17,6 +17,7 @@ const minimatch = require('minimatch');
 const coverage = require('../coverage');
 const minimist = require('minimist');
 const { takeSnapshotAndCountClasses } = require('../analyzeSnapshot');
+const bootstrapNode = require('../../../src/bootstrap-node');
 
 /**
  * @type {{ build: boolean; run: string; runGlob: string; coverage: boolean; help: boolean; coverageFormats: string | string[]; coveragePath: string; }}
@@ -88,7 +89,6 @@ function main() {
 		// when running from `out-build`, ensure to load the default
 		// messages file, because all `nls.localize` calls have their
 		// english values removed and replaced by an index.
-		// VSCODE_GLOBALS: NLS
 		globalThis._VSCODE_NLS_MESSAGES = require(`../../../${out}/nls.messages.json`);
 	}
 
@@ -106,41 +106,9 @@ function main() {
 		console.error(e.stack || e);
 	});
 
-	/**
-	 * @param {string} path
-	 * @param {{ isWindows?: boolean, scheme?: string, fallbackAuthority?: string }} config
-	 * @returns {string}
-	 */
-	function fileUriFromPath(path, config) {
-
-		// Since we are building a URI, we normalize any backslash
-		// to slashes and we ensure that the path begins with a '/'.
-		let pathName = path.replace(/\\/g, '/');
-		if (pathName.length > 0 && pathName.charAt(0) !== '/') {
-			pathName = `/${pathName}`;
-		}
-
-		/** @type {string} */
-		let uri;
-
-		// Windows: in order to support UNC paths (which start with '//')
-		// that have their own authority, we do not use the provided authority
-		// but rather preserve it.
-		if (config.isWindows && pathName.startsWith('//')) {
-			uri = encodeURI(`${config.scheme || 'file'}:${pathName}`);
-		}
-
-		// Otherwise we optionally add the provided authority if specified
-		else {
-			uri = encodeURI(`${config.scheme || 'file'}://${config.fallbackAuthority || ''}${pathName}`);
-		}
-
-		return uri.replace(/#/g, '%23');
-	}
-
 	const loaderConfig = {
 		nodeRequire: require,
-		baseUrl: fileUriFromPath(src, { isWindows: process.platform === 'win32' }),
+		baseUrl: bootstrapNode.fileUriFromPath(src, { isWindows: process.platform === 'win32' }),
 		catchError: true
 	};
 
diff --git a/test/unit/node/index.mjs b/test/unit/node/index.mjs
new file mode 100644
index 00000000000..0193be6843b
--- /dev/null
+++ b/test/unit/node/index.mjs
@@ -0,0 +1,249 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+//@ts-check
+'use strict';
+
+process.env.MOCHA_COLORS = '1'; // Force colors (note that this must come before any mocha imports)
+
+import * as assert from 'assert';
+import Mocha from 'mocha';
+import * as path from 'path';
+import * as fs from 'fs';
+import glob from 'glob';
+import minimatch from 'minimatch';
+// const coverage = require('../coverage');
+import minimist from 'minimist';
+// const { takeSnapshotAndCountClasses } = require('../analyzeSnapshot');
+import * as module from 'module';
+import { fileURLToPath, pathToFileURL } from 'url';
+
+/**
+ * @type {{ build: boolean; run: string; runGlob: string; coverage: boolean; help: boolean; coverageFormats: string | string[]; coveragePath: string; }}
+ */
+const args = minimist(process.argv.slice(2), {
+	boolean: ['build', 'coverage', 'help'],
+	string: ['run', 'coveragePath', 'coverageFormats'],
+	alias: {
+		h: 'help'
+	},
+	default: {
+		build: false,
+		coverage: false,
+		help: false
+	},
+	description: {
+		build: 'Run from out-build',
+		run: 'Run a single file',
+		coverage: 'Generate a coverage report',
+		coveragePath: 'Path to coverage report to generate',
+		coverageFormats: 'Coverage formats to generate',
+		help: 'Show help'
+	}
+});
+
+if (args.help) {
+	console.log(`Usage: node test/unit/node/index [options]
+
+Options:
+--build          Run from out-build
+--run <file>     Run a single file
+--coverage       Generate a coverage report
+--help           Show help`);
+	process.exit(0);
+}
+
+const TEST_GLOB = '**/test/**/*.test.js';
+
+const excludeGlobs = [
+	'**/{browser,electron-sandbox,electron-main}/**/*.test.js',
+	'**/vs/platform/environment/test/node/nativeModules.test.js', // native modules are compiled against Electron and this test would fail with node.js
+	'**/vs/base/parts/storage/test/node/storage.test.js', // same as above, due to direct dependency to sqlite native module
+	'**/vs/workbench/contrib/testing/test/**' // flaky (https://github.com/microsoft/vscode/issues/137853)
+];
+
+const REPO_ROOT = fileURLToPath(new URL('../../../', import.meta.url));
+const out = args.build ? 'out-build' : 'out';
+const src = path.join(REPO_ROOT, out);
+const baseUrl = pathToFileURL(src);
+
+//@ts-ignore
+const majorRequiredNodeVersion = `v${/^target\s+"([^"]+)"$/m.exec(fs.readFileSync(path.join(REPO_ROOT, 'remote', '.yarnrc'), 'utf8'))[1]}`.substring(0, 3);
+const currentMajorNodeVersion = process.version.substring(0, 3);
+if (majorRequiredNodeVersion !== currentMajorNodeVersion) {
+	console.error(`node.js unit tests require a major node.js version of ${majorRequiredNodeVersion} (your version is: ${currentMajorNodeVersion})`);
+	process.exit(1);
+}
+
+function main() {
+
+	// VSCODE_GLOBALS: node_modules
+	const _require = module.createRequire(import.meta.url);
+	globalThis._VSCODE_NODE_MODULES = new Proxy(Object.create(null), { get: (_target, mod) => _require(String(mod)) });
+
+	// VSCODE_GLOBALS: package/product.json
+	globalThis._VSCODE_PRODUCT_JSON = _require(`${REPO_ROOT}/product.json`);
+	globalThis._VSCODE_PACKAGE_JSON = _require(`${REPO_ROOT}/package.json`);
+
+	// VSCODE_GLOBALS: file root
+	globalThis._VSCODE_FILE_ROOT = baseUrl.href;
+
+	if (args.build) {
+		// when running from `out-build`, ensure to load the default
+		// messages file, because all `nls.localize` calls have their
+		// english values removed and replaced by an index.
+		globalThis._VSCODE_NLS_MESSAGES = _require(`${REPO_ROOT}/${out}/nls.messages.json`);
+	}
+
+	// Test file operations that are common across platforms. Used for test infra, namely snapshot tests
+	Object.assign(globalThis, {
+		// __analyzeSnapshotInTests: takeSnapshotAndCountClasses,
+		__readFileInTests: (/** @type {string} */ path) => fs.promises.readFile(path, 'utf-8'),
+		__writeFileInTests: (/** @type {string} */ path, /** @type {BufferEncoding} */ contents) => fs.promises.writeFile(path, contents),
+		__readDirInTests: (/** @type {string} */ path) => fs.promises.readdir(path),
+		__unlinkInTests: (/** @type {string} */ path) => fs.promises.unlink(path),
+		__mkdirPInTests: (/** @type {string} */ path) => fs.promises.mkdir(path, { recursive: true }),
+	});
+
+	process.on('uncaughtException', function (e) {
+		console.error(e.stack || e);
+	});
+
+	/**
+	 * @param modules
+	 * @param onLoad
+	 * @param onError
+	 */
+	const loader = function (modules, onLoad, onError) {
+
+		modules = modules.filter(mod => {
+			if (mod.endsWith('css.build.test')) {
+				// AMD ONLY, ignore for ESM
+				return false;
+			}
+			return true;
+		});
+
+		const loads = modules.map(mod => import(`${baseUrl}/${mod}.js`).catch(err => {
+			console.error(`FAILED to load ${mod} as ${baseUrl}/${mod}.js`);
+			throw err;
+		}));
+		Promise.all(loads).then(onLoad, onError);
+	};
+
+
+	let didErr = false;
+	const write = process.stderr.write;
+	process.stderr.write = function (...args) {
+		didErr = didErr || !!args[0];
+		return write.apply(process.stderr, args);
+	};
+
+
+	const runner = new Mocha({
+		ui: 'tdd'
+	});
+
+	/**
+	 * @param modules
+	 */
+	async function loadModules(modules) {
+		for (const file of modules) {
+			runner.suite.emit(Mocha.Suite.constants.EVENT_FILE_PRE_REQUIRE, globalThis, file, runner);
+			const m = await new Promise((resolve, reject) => loader([file], resolve, reject));
+			runner.suite.emit(Mocha.Suite.constants.EVENT_FILE_REQUIRE, m, file, runner);
+			runner.suite.emit(Mocha.Suite.constants.EVENT_FILE_POST_REQUIRE, globalThis, file, runner);
+		}
+	}
+
+	/** @type { null|((callback:(err:any)=>void)=>void) } */
+	let loadFunc = null;
+
+	if (args.runGlob) {
+		loadFunc = (cb) => {
+			const doRun = /** @param tests */(tests) => {
+				const modulesToLoad = tests.map(test => {
+					if (path.isAbsolute(test)) {
+						test = path.relative(src, path.resolve(test));
+					}
+
+					return test.replace(/(\.js)|(\.d\.ts)|(\.js\.map)$/, '');
+				});
+				loadModules(modulesToLoad).then(() => cb(null), cb);
+			};
+
+			glob(args.runGlob, { cwd: src }, function (err, files) { doRun(files); });
+		};
+	} else if (args.run) {
+		const tests = (typeof args.run === 'string') ? [args.run] : args.run;
+		const modulesToLoad = tests.map(function (test) {
+			test = test.replace(/^src/, 'out');
+			test = test.replace(/\.ts$/, '.js');
+			return path.relative(src, path.resolve(test)).replace(/(\.js)|(\.js\.map)$/, '').replace(/\\/g, '/');
+		});
+		loadFunc = (cb) => {
+			loadModules(modulesToLoad).then(() => cb(null), cb);
+		};
+	} else {
+		loadFunc = (cb) => {
+			glob(TEST_GLOB, { cwd: src }, function (err, files) {
+				/** @type {string[]} */
+				const modules = [];
+				for (const file of files) {
+					if (!excludeGlobs.some(excludeGlob => minimatch(file, excludeGlob))) {
+						modules.push(file.replace(/\.js$/, ''));
+					}
+				}
+				loadModules(modules).then(() => cb(null), cb);
+			});
+		};
+	}
+
+	loadFunc(function (err) {
+		if (err) {
+			console.error(err);
+			return process.exit(1);
+		}
+
+		process.stderr.write = write;
+
+		if (!args.run && !args.runGlob) {
+			// set up last test
+			Mocha.suite('Loader', function () {
+				test('should not explode while loading', function () {
+					assert.ok(!didErr, `should not explode while loading: ${didErr}`);
+				});
+			});
+		}
+
+		// report failing test for every unexpected error during any of the tests
+		const unexpectedErrors = [];
+		Mocha.suite('Errors', function () {
+			test('should not have unexpected errors in tests', function () {
+				if (unexpectedErrors.length) {
+					unexpectedErrors.forEach(function (stack) {
+						console.error('');
+						console.error(stack);
+					});
+
+					assert.ok(false);
+				}
+			});
+		});
+
+		// replace the default unexpected error handler to be useful during tests
+		import(`${baseUrl}/vs/base/common/errors.js`).then(errors => {
+			errors.setUnexpectedErrorHandler(function (err) {
+				const stack = (err && err.stack) || (new Error().stack);
+				unexpectedErrors.push((err && err.message ? err.message : err) + '\n' + stack);
+			});
+
+			// fire up mocha
+			runner.run(failures => process.exit(failures ? 1 : 0));
+		});
+	});
+}
+
+main();
diff --git a/yarn.lock b/yarn.lock
index d041b1f60a9..07f7fa82a45 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -916,12 +916,12 @@
   dependencies:
     playwright-core "1.46.0"
 
-"@playwright/test@^1.45.0":
-  version "1.46.0"
-  resolved "https://registry.yarnpkg.com/@playwright/test/-/test-1.46.0.tgz#ccea6d22c40ee7fa567e4192fafbdf2a907e2714"
-  integrity sha512-/QYft5VArOrGRP5pgkrfKksqsKA6CEFyGQ/gjNe6q0y4tZ1aaPfq4gIjudr1s3D+pXyrPRdsy4opKDrjBabE5w==
+"@playwright/test@^1.46.1":
+  version "1.46.1"
+  resolved "https://registry.yarnpkg.com/@playwright/test/-/test-1.46.1.tgz#a8dfdcd623c4c23bb1b7ea588058aad41055c188"
+  integrity sha512-Fq6SwLujA/DOIvNC2EL/SojJnkKf/rAwJ//APpJJHRyMi1PdKrY3Az+4XNQ51N4RTbItbIByQ0jgd1tayq1aeA==
   dependencies:
-    playwright "1.46.0"
+    playwright "1.46.1"
 
 "@sindresorhus/is@^4.0.0":
   version "4.6.0"
@@ -1173,6 +1173,13 @@
   dependencies:
     "@types/node" "*"
 
+"@types/http-proxy@^1.17.9":
+  version "1.17.15"
+  resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.15.tgz#12118141ce9775a6499ecb4c01d02f90fc839d36"
+  integrity sha512-25g5atgiVNTIv0LBDTg1H74Hvayx0ajtJPLLcYE3whFv75J0pWNtOBzaXJQgDTmrX1bx5U9YC2w/n65BN1HwRQ==
+  dependencies:
+    "@types/node" "*"
+
 "@types/istanbul-lib-coverage@^2.0.1":
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz#7739c232a1fee9b4d3ce8985f314c0c6d33549d7"
@@ -1258,10 +1265,10 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-4.2.22.tgz#cf488a0f6b4a9c245d09927f4f757ca278b9c8ce"
   integrity sha512-LXRap3bb4AjtLZ5NOFc4ssVZrQPTgdPcNm++0SEJuJZaOA+xHkojJNYqy33A5q/94BmG5tA6yaMeD4VdCv5aSA==
 
-"@types/node@20.x", "@types/node@^20.9.0":
-  version "20.11.24"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.24.tgz#cc207511104694e84e9fb17f9a0c4c42d4517792"
-  integrity sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==
+"@types/node@20.x":
+  version "20.14.13"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.14.13.tgz#bf4fe8959ae1c43bc284de78bd6c01730933736b"
+  integrity sha512-+bHoGiZb8UiQ0+WEtmph2IWQCjIqg8MDZMAV+ppRRhUZnquF5mQkP/9vpSwJClEiSM/C7fZZExPzfU0vJTyp8w==
   dependencies:
     undici-types "~5.26.4"
 
@@ -1270,6 +1277,13 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-10.12.21.tgz#7e8a0c34cf29f4e17a36e9bd0ea72d45ba03908e"
   integrity sha512-CBgLNk4o3XMnqMc0rhb6lc77IwShMEglz05deDcn2lQxyXEZivfwgYJu7SMha9V5XcrP6qZuevTHV/QrN2vjKQ==
 
+"@types/node@^20.9.0":
+  version "20.11.24"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.24.tgz#cc207511104694e84e9fb17f9a0c4c42d4517792"
+  integrity sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==
+  dependencies:
+    undici-types "~5.26.4"
+
 "@types/prop-types@*":
   version "15.7.5"
   resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.5.tgz#5f19d2b85a98e9558036f6a3cacc8819420f05cf"
@@ -1620,10 +1634,10 @@
     bindings "^1.5.0"
     node-addon-api "^6.0.0"
 
-"@vscode/proxy-agent@^0.22.0":
-  version "0.22.0"
-  resolved "https://registry.yarnpkg.com/@vscode/proxy-agent/-/proxy-agent-0.22.0.tgz#bf571509d77c02c684be8c8526b7d0ac238c25cb"
-  integrity sha512-TQrv456pbrjmD6G+iOoXE1Mflm+8Ic/Kny4QU7ioiYe2+0HisvqzJM/CUa3Am5SWrNjMbntTHISjgmSaSlorrA==
+"@vscode/proxy-agent@^0.23.0":
+  version "0.23.0"
+  resolved "https://registry.yarnpkg.com/@vscode/proxy-agent/-/proxy-agent-0.23.0.tgz#1cdcf0b72c2180d705d4e304b807d9594845c90f"
+  integrity sha512-6lgxRrzURdWwBkk6TaB0+EYYjIWQXxry6GlVO0toBN8amIyVd3I7hLPKU9Xf+SOrLIrbdU0CLkmTOBHpPJLf/g==
   dependencies:
     "@tootallnate/once" "^3.0.0"
     agent-base "^7.0.1"
@@ -1721,6 +1735,11 @@
     tar-fs "^3.0.6"
     vscode-uri "^3.0.8"
 
+"@vscode/tree-sitter-wasm@^0.0.2":
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/@vscode/tree-sitter-wasm/-/tree-sitter-wasm-0.0.2.tgz#da21541d343be69bb263e9380d165e3b164ec1f0"
+  integrity sha512-N57MR/kt4jR0H/TXeDsVYeJmvvUiK7avow0fjy+/EeKcyNBJcM2BFhj4XOAaaMbhGsOcIeSvJFouRWctXI7sKw==
+
 "@vscode/v8-heap-parser@^0.1.0":
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/@vscode/v8-heap-parser/-/v8-heap-parser-0.1.0.tgz#f3fe61ce954cc3dd78ed42e09f865450685e351f"
@@ -2027,47 +2046,47 @@
   resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-2.0.5.tgz#325db42395cd49fe6c14057f9a900e427df8810e"
   integrity sha512-lqaoKnRYBdo1UgDX8uF24AfGMifWK19TxPmM5FHc2vAGxrJ/qtyUyFBWoY1tISZdelsQ5fBcOusifo5o5wSJxQ==
 
-"@xterm/addon-clipboard@0.2.0-beta.34":
-  version "0.2.0-beta.34"
-  resolved "https://registry.yarnpkg.com/@xterm/addon-clipboard/-/addon-clipboard-0.2.0-beta.34.tgz#9a753601e69d3f9aad10e6d22b3a3d05be237d6a"
-  integrity sha512-Iduj2jGO37VkFLrRzxK5SkE7b2bAPaIvkvcSnw5JCdsvu9cjmPy7jgJkvUu54Tltzt55X+YTkQQ2GIKHqcor8A==
+"@xterm/addon-clipboard@0.2.0-beta.35":
+  version "0.2.0-beta.35"
+  resolved "https://registry.yarnpkg.com/@xterm/addon-clipboard/-/addon-clipboard-0.2.0-beta.35.tgz#4c9b553ea63ce02a3c8075fea7df1637d52092ef"
+  integrity sha512-B8AulZEjsfvSEaLKp8oyRu7yJ7FJb5R3W0wpPbI/rOMVAuBwxDJsz0CxLvJUXnJX7OJwd5cjnyTnEcXJfMJycA==
   dependencies:
     js-base64 "^3.7.5"
 
-"@xterm/addon-image@0.9.0-beta.51":
-  version "0.9.0-beta.51"
-  resolved "https://registry.yarnpkg.com/@xterm/addon-image/-/addon-image-0.9.0-beta.51.tgz#832be645ab04de3ab1af28aa37d4c3bcc72d9960"
-  integrity sha512-u8f0C8Kae8d8jGo2OGaxy1j4hvXOij41ZUp5fNsGL3quYufwmtVixVHUnc7WfEMVdSaSBNqfDXE+qpV4i3C3ng==
-
-"@xterm/addon-search@0.16.0-beta.51":
-  version "0.16.0-beta.51"
-  resolved "https://registry.yarnpkg.com/@xterm/addon-search/-/addon-search-0.16.0-beta.51.tgz#4595c6294287a2560abe4b76f6ef2f0aafd2f05e"
-  integrity sha512-DhnNDP9bAd/7/9TW+0N3BUaF/6Fpv/6RiIiromlzSu+6g1VDmuWsd8JpeTxErOCoWZuEMLpVVje9ky3yj8pN9A==
-
-"@xterm/addon-serialize@0.14.0-beta.51":
-  version "0.14.0-beta.51"
-  resolved "https://registry.yarnpkg.com/@xterm/addon-serialize/-/addon-serialize-0.14.0-beta.51.tgz#0c9802ba94018e94a727abc9e977a2349279468f"
-  integrity sha512-EjKIOuzSP+HCtk05iwHk0N3jYfsx81bKRv4pfGXKsc3rN0H6gQ+bvx/abSkndtgIjKtee2cy1H8pggMaezmzIA==
-
-"@xterm/addon-unicode11@0.9.0-beta.51":
-  version "0.9.0-beta.51"
-  resolved "https://registry.yarnpkg.com/@xterm/addon-unicode11/-/addon-unicode11-0.9.0-beta.51.tgz#c2f2b1ad14b2481648ca7deaa0bf2923d987e2e6"
-  integrity sha512-6FmA4MOue7SDYjSLmuG8rZC2eeVZ+YjhWEXWiUAAoiZ9X11j9HMdOhWcutca3crAMc6mrHfjx6fNsUxwtELMkQ==
-
-"@xterm/addon-webgl@0.19.0-beta.51":
-  version "0.19.0-beta.51"
-  resolved "https://registry.yarnpkg.com/@xterm/addon-webgl/-/addon-webgl-0.19.0-beta.51.tgz#14cb115d45c140525eb51427e236189dd800c20c"
-  integrity sha512-oO6yVuVA+9kNA47bT2c2IkGj9eLWvV6mEEo8wHKN7WXyYUFgw6ivAgmdrIdnKh679xbCq7th3GfcESwwQFH/sg==
-
-"@xterm/headless@5.6.0-beta.51":
-  version "5.6.0-beta.51"
-  resolved "https://registry.yarnpkg.com/@xterm/headless/-/headless-5.6.0-beta.51.tgz#76ff548a88305fe476a7d3f991331c0393c0af45"
-  integrity sha512-ehd4L3c28mQKVEd5cMmUzR1f1XcAVbJukfR1YiD7ohjphHUxSsg6mYb5qGIh50SsQsDI6wHYuIvmNSjvNgHVOw==
-
-"@xterm/xterm@5.6.0-beta.51":
-  version "5.6.0-beta.51"
-  resolved "https://registry.yarnpkg.com/@xterm/xterm/-/xterm-5.6.0-beta.51.tgz#3b9a5016d9588eb0a05226f6fc090b48a85b7698"
-  integrity sha512-0i9gkiP2hhCMIRk5ACM8LJXHRd1umzC27ZDHD8n14vutrQRgdW4ENvCdmrWHiVJy4Ui1t7m70zdgg72shOgcEA==
+"@xterm/addon-image@0.9.0-beta.52":
+  version "0.9.0-beta.52"
+  resolved "https://registry.yarnpkg.com/@xterm/addon-image/-/addon-image-0.9.0-beta.52.tgz#a3115a50f884e5ba2f8ce09118a3d7e833fceb7b"
+  integrity sha512-1fWhnCIvLeO0aQ3CKqkTB9ye1bUsocpgFdDOgmwfW4XhLXpvu+QcyMGQMtWJHt8JWBN2w0cgR9eyfKw7orN+9Q==
+
+"@xterm/addon-search@0.16.0-beta.52":
+  version "0.16.0-beta.52"
+  resolved "https://registry.yarnpkg.com/@xterm/addon-search/-/addon-search-0.16.0-beta.52.tgz#f8c77629b95ceff7d6b93d95c4b085857f405470"
+  integrity sha512-ZLVh0O91dcjxCjrU3vadl+40Z/mBnYXhKNA58oU/dGWFtFxtUB9SaZoOUtBvnfDpQIloYAK6raC2AfVsKHzD8A==
+
+"@xterm/addon-serialize@0.14.0-beta.52":
+  version "0.14.0-beta.52"
+  resolved "https://registry.yarnpkg.com/@xterm/addon-serialize/-/addon-serialize-0.14.0-beta.52.tgz#19708cdd2895ddbd983b771ae9d14d7bc54cf7c9"
+  integrity sha512-1+ckKya1OURFmELH1Tjjoxz3Gnj78Dxj+NNRrEunfINkvyzaY+n8wT28FQxIlU5gJq+a0VGvlhNgTkMwgOn6aw==
+
+"@xterm/addon-unicode11@0.9.0-beta.52":
+  version "0.9.0-beta.52"
+  resolved "https://registry.yarnpkg.com/@xterm/addon-unicode11/-/addon-unicode11-0.9.0-beta.52.tgz#15afdf03c20d2e46b4eca68bd461eea71c8dd37f"
+  integrity sha512-5tZR/8c+vf0YNSYS6B9pEv8gyWWZpPYOf/BRQDkTGtYAnFf04MzggVE/U7tKUXGDzBhzwTPODq5qPNTX1xpGgw==
+
+"@xterm/addon-webgl@0.19.0-beta.52":
+  version "0.19.0-beta.52"
+  resolved "https://registry.yarnpkg.com/@xterm/addon-webgl/-/addon-webgl-0.19.0-beta.52.tgz#695b20a5fa88ff92e115624149592080fad59594"
+  integrity sha512-kbPO9iR166xW8qgRkYmKX2Vu0kQHXpxYLQ9jY/01e5kvNrI/rqRDV63FIq14ncOi7N3+dmTuUkjvbg8anCpuIw==
+
+"@xterm/headless@5.6.0-beta.52":
+  version "5.6.0-beta.52"
+  resolved "https://registry.yarnpkg.com/@xterm/headless/-/headless-5.6.0-beta.52.tgz#7f934a7d7c5bbf88e2d78c22317cd2464bc9638a"
+  integrity sha512-f4QITQwotblRLW6YOHnK801wHJWfFDnjD7jUEwaaAXtSp32xH3jguWnMP9/uuQX45q9ndjDjnm1t5aXX7gwqBQ==
+
+"@xterm/xterm@5.6.0-beta.52":
+  version "5.6.0-beta.52"
+  resolved "https://registry.yarnpkg.com/@xterm/xterm/-/xterm-5.6.0-beta.52.tgz#ed7456a8b78ea1d00431737d078b5ab0bafbcdfe"
+  integrity sha512-aZh8IBdZPb2N4NjTt/fQ/C90z/PM3Zxkfoqhmlsp5+v3Otmyw5kd3DepeHK1SFW/pz0/xdj4KFgX8t8Y2lDRbA==
 
 "@xtuc/ieee754@^1.2.0":
   version "1.2.0"
@@ -2246,11 +2265,6 @@ ansi-regex@^4.1.0:
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
   integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
 
-ansi-regex@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
-  integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==
-
 ansi-regex@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
@@ -4160,10 +4174,10 @@ electron-to-chromium@^1.4.668:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.717.tgz#99db370cae8cd090d5b01f8748e9ad369924d0f8"
   integrity sha512-6Fmg8QkkumNOwuZ/5mIbMU9WI3H2fmn5ajcVya64I5Yr5CcNmO7vcLt0Y7c96DCiMO5/9G+4sI2r6eEvdg1F7A==
 
-electron@30.1.2:
-  version "30.1.2"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-30.1.2.tgz#9c8b9b0d0e3f07783d8c5dbd9519b3ffd11f1551"
-  integrity sha512-A5CFGwbA+HSXnzwjc8fP2GIezBcAb0uN/VbNGLOW8DHOYn07rvJ/1bAJECHUUzt5zbfohveG3hpMQiYpbktuDw==
+electron@30.4.0:
+  version "30.4.0"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-30.4.0.tgz#66641a644059147f0e597e49999599e23dcdbfe3"
+  integrity sha512-ric3KLPQ9anXYjtTDkj5NbEcXZqRUwqxrxTviIjLdMdHqd5O+hkSHEzXgbSJUOt+7uw+zZuybn9+IM9y7iEpqg==
   dependencies:
     "@electron/get" "^2.0.0"
     "@types/node" "^20.9.0"
@@ -4784,6 +4798,11 @@ event-stream@~3.3.4:
     stream-combiner "^0.2.2"
     through "^2.3.8"
 
+eventemitter3@^4.0.0:
+  version "4.0.7"
+  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f"
+  integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==
+
 events@^3.0.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/events/-/events-3.2.0.tgz#93b87c18f8efcd4202a461aec4dfc0556b639379"
@@ -5158,6 +5177,11 @@ flush-write-stream@^1.0.2:
     inherits "^2.0.3"
     readable-stream "^2.3.6"
 
+follow-redirects@^1.0.0:
+  version "1.15.9"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.9.tgz#a604fa10e443bf98ca94228d9eebcc2e8a2c8ee1"
+  integrity sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==
+
 for-each@^0.3.3:
   version "0.3.3"
   resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e"
@@ -6120,6 +6144,15 @@ http-proxy-agent@^7.0.2:
     agent-base "^7.1.0"
     debug "^4.3.4"
 
+http-proxy@^1.18.1:
+  version "1.18.1"
+  resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549"
+  integrity sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==
+  dependencies:
+    eventemitter3 "^4.0.0"
+    follow-redirects "^1.0.0"
+    requires-port "^1.0.0"
+
 http2-wrapper@^1.0.0-beta.5.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/http2-wrapper/-/http2-wrapper-1.0.3.tgz#b8f55e0c1f25d4ebd08b3b0c2c079f9590800b3d"
@@ -7095,10 +7128,10 @@ just-extend@^4.0.2:
   resolved "https://registry.yarnpkg.com/just-extend/-/just-extend-4.2.1.tgz#ef5e589afb61e5d66b24eca749409a8939a8c744"
   integrity sha512-g3UB796vUFIY90VIv/WX3L2c8CS2MdWUww3CNrYmqza1Fg0DURc2K/O4YrnklBdQarSJ/y8JnJYDGc+1iumQjg==
 
-kerberos@2.1.1-alpha.0:
-  version "2.1.1-alpha.0"
-  resolved "https://registry.yarnpkg.com/kerberos/-/kerberos-2.1.1-alpha.0.tgz#c6d377b43c8206340fd184167754f2c81dad5ab1"
-  integrity sha512-II8N/ky/Vpd8y7LTxwCuAYoQ8XeV3HYxuK7IDmyoFacIhDljx4sdt/+sOwqgXEweQyCHlbZSKSaK82upqNM4Hw==
+kerberos@2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/kerberos/-/kerberos-2.1.1.tgz#170fc64d1a23e8c6d6ae2736d01189e2a1dbe0f7"
+  integrity sha512-414s1G/qgK2T60cXnZsHbtRj8Ynjg0DBlQWeY99tkyqQ2e8vGgFHvxRdvjTlLHg/SxBA0zLQcGE6Pk6Dfq/BCA==
   dependencies:
     bindings "^1.5.0"
     node-addon-api "^6.1.0"
@@ -8129,10 +8162,10 @@ node-html-parser@^6.1.1:
     css-select "^5.1.0"
     he "1.2.0"
 
-node-pty@1.1.0-beta11:
-  version "1.1.0-beta11"
-  resolved "https://registry.yarnpkg.com/node-pty/-/node-pty-1.1.0-beta11.tgz#909d5dd8f9aa2a7857e7b632fd4d2d4768bdf69f"
-  integrity sha512-vTjF+VrvSCfPDILUkIT+YrG1Fdn06/eBRS2fc9a3JzYAvknMB1Ip8aoJhxl8hNpjWAbprmCEiV91mlfNpCD+GQ==
+node-pty@1.1.0-beta21:
+  version "1.1.0-beta21"
+  resolved "https://registry.yarnpkg.com/node-pty/-/node-pty-1.1.0-beta21.tgz#d75c1dfe4ff2c173459c974df72e91a4eae6dc52"
+  integrity sha512-FYpnY9g8qMQLTpqyeY9NVli6YfCWwvG6v6gmaDBbPjlc1VMp/+Zivq0SStDrRr1aciGnFCZzpL0BzdMnmbDnAw==
   dependencies:
     node-addon-api "^7.1.0"
 
@@ -8836,12 +8869,17 @@ playwright-core@1.46.0:
   resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.46.0.tgz#2336ac453a943abf0dc95a76c117f9d3ebd390eb"
   integrity sha512-9Y/d5UIwuJk8t3+lhmMSAJyNP1BUC/DqP3cQJDQQL/oWqAiuPTLgy7Q5dzglmTLwcBRdetzgNM/gni7ckfTr6A==
 
-playwright@1.46.0, playwright@^1.45.0:
-  version "1.46.0"
-  resolved "https://registry.yarnpkg.com/playwright/-/playwright-1.46.0.tgz#c7ff490deae41fc1e814bf2cb62109dd9351164d"
-  integrity sha512-XYJ5WvfefWONh1uPAUAi0H2xXV5S3vrtcnXe6uAOgdGi3aSpqOSXX08IAjXW34xitfuOJsvXU5anXZxPSEQiJw==
+playwright-core@1.46.1:
+  version "1.46.1"
+  resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.46.1.tgz#28f3ab35312135dda75b0c92a3e5c0e7edb9cc8b"
+  integrity sha512-h9LqIQaAv+CYvWzsZ+h3RsrqCStkBHlgo6/TJlFst3cOTlLghBQlJwPOZKQJTKNaD3QIB7aAVQ+gfWbN3NXB7A==
+
+playwright@1.46.1:
+  version "1.46.1"
+  resolved "https://registry.yarnpkg.com/playwright/-/playwright-1.46.1.tgz#ea562bc48373648e10420a10c16842f0b227c218"
+  integrity sha512-oPcr1yqoXLCkgKtD5eNUPLiN40rYEM39odNpIb6VE6S7/15gJmA1NzVv6zJYusV0e7tzvkU/utBFNa/Kpxmwng==
   dependencies:
-    playwright-core "1.46.0"
+    playwright-core "1.46.1"
   optionalDependencies:
     fsevents "2.3.2"
 
@@ -8852,6 +8890,15 @@ playwright@^1.29.2:
   dependencies:
     playwright-core "1.30.0"
 
+playwright@^1.45.0:
+  version "1.46.0"
+  resolved "https://registry.yarnpkg.com/playwright/-/playwright-1.46.0.tgz#c7ff490deae41fc1e814bf2cb62109dd9351164d"
+  integrity sha512-XYJ5WvfefWONh1uPAUAi0H2xXV5S3vrtcnXe6uAOgdGi3aSpqOSXX08IAjXW34xitfuOJsvXU5anXZxPSEQiJw==
+  dependencies:
+    playwright-core "1.46.0"
+  optionalDependencies:
+    fsevents "2.3.2"
+
 plist@^3.0.1:
   version "3.0.5"
   resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.5.tgz#2cbeb52d10e3cdccccf0c11a63a85d830970a987"
@@ -10405,7 +10452,7 @@ streamx@^2.18.0:
   optionalDependencies:
     bare-events "^2.2.0"
 
-"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -10440,15 +10487,6 @@ string-width@^3.0.0, string-width@^3.1.0:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^5.1.0"
 
-string-width@^4.1.0, string-width@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5"
-  integrity sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==
-  dependencies:
-    emoji-regex "^8.0.0"
-    is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.0"
-
 string-width@^5.0.1, string-width@^5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794"
@@ -10553,7 +10591,7 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.1:
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -10581,13 +10619,6 @@ strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
   dependencies:
     ansi-regex "^4.1.0"
 
-strip-ansi@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532"
-  integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==
-  dependencies:
-    ansi-regex "^5.0.0"
-
 strip-ansi@^7.0.1, strip-ansi@^7.1.0:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
@@ -11113,6 +11144,11 @@ tslib@^2.6.2:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae"
   integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==
 
+tslib@^2.6.3:
+  version "2.6.3"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.3.tgz#0438f810ad7a9edcde7a241c3d80db693c8cbfe0"
+  integrity sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==
+
 tsscmp@1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/tsscmp/-/tsscmp-1.0.6.tgz#85b99583ac3589ec4bfef825b5000aa911d605eb"
@@ -11248,10 +11284,10 @@ typescript@^4.7.4:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.4.tgz#c464abca159669597be5f96b8943500b238e60e6"
   integrity sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==
 
-typescript@^5.6.0-dev.20240729:
-  version "5.6.0-dev.20240807"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.6.0-dev.20240807.tgz#2c3eee13cdd8a251607fadd29a7f181758d5191f"
-  integrity sha512-+5sI7HI0VR04hysSSG6XUTEXoUf4nZTMc+p7WLpdWmxqYVO/dodTdMbWRw+JeKNPW9tXzJ66jrGvED+hfBmizw==
+typescript@^5.7.0-dev.20240826:
+  version "5.7.0-dev.20240826"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.7.0-dev.20240826.tgz#81141692ffa634350236c866a5646faf5d565063"
+  integrity sha512-TsvYVfLcEGOXj9aWrf72qFTnZ8B+IoDuRQwPDHZMO6Y9QzIjM0iOhydUEKS9HPxpypAcyt1RC6xT9GybzOiLZQ==
 
 typical@^4.0.0:
   version "4.0.0"
@@ -11629,10 +11665,10 @@ vscode-regexpp@^3.1.0:
   resolved "https://registry.yarnpkg.com/vscode-regexpp/-/vscode-regexpp-3.1.0.tgz#42d059b6fffe99bd42939c0d013f632f0cad823f"
   integrity sha512-pqtN65VC1jRLawfluX4Y80MMG0DHJydWhe5ZwMHewZD6sys4LbU6lHwFAHxeuaVE6Y6+xZOtAw+9hvq7/0ejkg==
 
-vscode-textmate@9.0.0:
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-9.0.0.tgz#313c6c8792b0507aef35aeb81b6b370b37c44d6c"
-  integrity sha512-Cl65diFGxz7gpwbav10HqiY/eVYTO1sjQpmRmV991Bj7wAoOAjGQ97PpQcXorDE2Uc4hnGWLY17xme+5t6MlSg==
+vscode-textmate@9.1.0:
+  version "9.1.0"
+  resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-9.1.0.tgz#656a6aa163a9578397ba810733952bedb2b47202"
+  integrity sha512-lxKSVp2DkFOx9RDAvpiYUrB9/KT1fAfi1aE8CBGstP8N7rLF+Seifj8kDA198X0mYj1CjQUC+81+nQf8CO0nVA==
 
 vscode-uri@^3.0.8:
   version "3.0.8"