diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
new file mode 100644
index 0000000000000..6b833803b2e34
--- /dev/null
+++ b/.github/copilot-instructions.md
@@ -0,0 +1,191 @@
+# Coding Guidelines
+
+## Introduction
+
+These are VS Code coding guidelines. Please also review our [Source Code Organisation](https://github.com/microsoft/vscode/wiki/Source-Code-Organization) page.
+
+## Indentation
+
+We use tabs, not spaces.
+
+## Naming Conventions
+
+* Use PascalCase for `type` names
+* Use PascalCase for `enum` values
+* Use camelCase for `function` and `method` names
+* Use camelCase for `property` names and `local variables`
+* Use whole words in names when possible
+
+## Types
+
+* Do not export `types` or `functions` unless you need to share it across multiple components
+* Do not introduce new `types` or `values` to the global namespace
+
+## Comments
+
+* When there are comments for `functions`, `interfaces`, `enums`, and `classes` use JSDoc style comments
+
+## Strings
+
+* Use "double quotes" for strings shown to the user that need to be externalized (localized)
+* Use 'single quotes' otherwise
+* All strings visible to the user need to be externalized
+
+## Style
+
+* Use arrow functions `=>` over anonymous function expressions
+* Only surround arrow function parameters when necessary. For example, `(x) => x + x` is wrong but the following are correct:
+
+```javascript
+x => x + x
+(x, y) => x + y
+<T>(x: T, y: T) => x === y
+```
+
+* Always surround loop and conditional bodies with curly braces
+* Open curly braces always go on the same line as whatever necessitates them
+* Parenthesized constructs should have no surrounding whitespace. A single space follows commas, colons, and semicolons in those constructs. For example:
+
+```javascript
+for (let i = 0, n = str.length; i < 10; i++) {
+    if (x < 10) {
+        foo();
+    }
+}
+
+function f(x: number, y: string): void { }
+```
+
+# Extension API Guidelines
+
+## Overview
+
+The following guidelines only apply to files in the `src/vscode-dts` folder.
+
+This is a loose collection of guidelines that you should be following when proposing API. The process for adding API is described here: [Extension API Process](https://github.com/Microsoft/vscode/wiki/Extension-API-process).
+
+## Core Principles
+
+### Avoid Breakage
+
+We DO NOT want to break API. Therefore be careful and conservative when proposing new API. It needs to hold up in the long term. Expose only the minimum but still try to anticipate potential future requests.
+
+### Namespaces
+
+The API is structured into different namespaces, like `commands`, `window`, `workspace` etc. Namespaces contain functions, constants, and events. All types (classes, enum, interfaces) are defined in the global, `vscode`, namespace.
+
+### JavaScript Feel
+
+The API should have a JavaScript’ish feel. While that is harder to put in rules, it means we use namespaces, properties, functions, and globals instead of object-factories and services. Also take inspiration from popular existing JS API, for instance `window.createStatusBarItem` is like `document.createElement`, the members of `DiagnosticsCollection` are similar to ES6 maps etc.
+
+### Global Events
+
+Events aren’t defined on the types they occur on but in the best matching namespace. For instance, document changes aren't sent by a document but via the `workspace.onDidChangeTextDocument` event. The event will contain the document in question. This **global event** pattern makes it easier to manage event subscriptions because changes happen less frequently.
+
+### Private Events
+
+Private or instance events aren't accessible via globals but exist on objects, e.g., `FileSystemWatcher#onDidCreate`.  *Don't* use private events unless the sender of the event is private. The rule of thumb is: 'Objects that can be accessed globally (editors, tasks, terminals, documents, etc)' should not have private events, objects that are private (only known by its creators, like tree views, web views) can send private events'
+
+### Event Naming
+
+Events follow the `on[Did|Will]VerbSubject` patterns, like `onDidChangeActiveEditor` or `onWillSaveTextDocument`. It doesn’t hurt to use explicit names.
+
+### Creating Objects
+
+Objects that live in the main thread but can be controlled/instantiated by extensions are declared as interfaces, e.g. `TextDocument` or `StatusBarItem`. When you allow creating such objects your API must follow the `createXYZ(args): XYZ` pattern. Because this is a constructor-replacement, the call must return synchronously.
+
+### Shy Objects
+
+Objects the API hands out to extensions should not contain more than what the API defines. Don’t expect everyone to read `vscode.d.ts` but also expect folks to use debugging-aided-intellisense, meaning whatever the debugger shows developers will program against. We don’t want to appear as making false promises. Prefix your private members with `_` as that is a common rule or, even better, use function-scopes to hide information.
+
+### Sync vs. Async
+
+Reading data, like an editor selection, a configuration value, etc. is synchronous. Setting a state that reflects on the main side is asynchronous. Despite updates being async your ‘extension host object’ should reflect the new state synchronously. This happens when setting an editor selection
+
+```
+ editor.selection = newSelection
+
+     |
+     |
+     V
+
+ 1. On the API object set the value as given
+ 2. Make an async-call to the main side ala `trySetSelection`
+ 3. The async-call returns with the actual selection (it might have changed in the meantime)
+ 4. On the API object set the value again
+```
+
+We usually don’t expose the fact that setting state is asynchronous. We try to have API that feels sync -`editor.selection` is a getter/setter and not a method.
+
+### Data Driven
+
+Whenever possible, you should define a data model and define provider-interfaces. This puts VS Code into control as we can decide when to ask those providers, how to deal with multiple providers etc. The `ReferenceProvider` interface is a good sample for this.
+
+### Enrich Data Incrementally
+
+Sometimes it is expensive for a provider to compute parts of its data. For instance, creating a full `CompletionItem` (with all the documentation and symbols resolved) conflicts with being able to compute a large list of them quickly. In those cases, providers should return a lightweight version and offer a `resolve` method that allows extensions to enrich data. The `CodeLensProvider` and `CompletionItemProvider` interfaces are good samples for this.
+
+### Cancellation
+
+Calls into a provider should always include a `CancellationToken` as the last parameter. With that, the main thread can signal to the provider that its result won’t be needed anymore. When adding new parameters to provider-functions, it is OK to have the token not at the end anymore.
+
+### Objects vs. Interfaces
+
+Objects that should be returned by a provider are usually represented by a class that extensions can instantiate, e.g. `CodeLens`. We do that to provide convenience constructors and to be able to populate default values.
+
+Data that we accept in methods calls, i.e., parameter types, like in `registerRenameProvider` or `showQuickPick`, are declared as interfaces. That makes it easy to fulfill the API contract using class-instances or plain object literals.
+
+### Strict and Relaxed Data
+
+Data the API returns is strict, e.g. `activeTextEditor` is an editor or `undefined`, but not `null`. On the other side, providers can return relaxed data. We usually accept 4 types: The actual type, like `Hover`, a `Thenable` of that type, `undefined` or `null`. With that we want to make it easy to implement a provider, e.g., if you can compute results synchronous you don’t need to wrap things into a promise or if a certain condition isn’t met simple return, etc.
+
+### Validate Data
+
+Although providers can return ‘relaxed’ data, you need to verify it. The same is true for arguments etc. Throw validation errors when possible, drop data object when invalid.
+
+### Copy Data
+
+Don’t send the data that a provider returned over the wire. Often it contains more information than we need and often there are cyclic dependencies. Use the provider data to create objects that your protocol speaks.
+
+### Enums
+
+When API-work started only numeric-enums were supported, today TypeScript supports string-or-types and string-enums. Because fewer concepts are better, we stick to numeric-enums.
+
+### Strict Null
+
+We define the API with strictNull-checks in mind. That means we use the optional annotation `foo?: number` and `null` or `undefined` in type annotations. For instance, its `activeTextEditor: TextEditor | undefined`. Again, be strict for types we define and relaxed when accepting data.
+
+### Undefined is False
+
+The default value of an optional, boolean property is `false`. This is for consistency with JS where undefined never evaluates to `true`.
+
+### JSDoc
+
+We add JSDoc for all parts of the API. The doc is supported by markdown syntax. When document string-datatypes that end up in the UI, use the phrase ‘Human-readable string…’
+
+## Optional Parameters (`?` vs `| undefined`)
+
+* For implementation, treat omitting a parameter with `?` the same as explicitly passing in `undefined`
+* Use `| undefined` when you want to callers to always have to consider the parameter.
+* Use `?` when you want to allow callers to omit the parameter.
+* Never use `?` and `| undefined` on a parameter. Instead follow the two rules above to decide which version to use.
+* If adding a new parameter to an existing function, use `?` as this allows the new signature to be backwards compatible with the old version.
+* Do not add an overload to add an optional parameter to the end of the function. Instead use `?`.
+
+## Optional Properties (`?` vs `| undefined`)
+
+* Do not write code that treats the absence of a property differently than a property being present but set to `undefined`
+    * This can sometimes hit you on spreads or iterating through objects, so just something to be aware of
+
+* For readonly properties on interfaces that VS Code exposes to extensions (this include managed objects, as well as the objects passed to events):
+    * Use `| undefined` as this makes it clear the property exists but has the value `undefined`.
+
+* For readonly properties on options bag type objects passed from extensions to VS Code:
+    * Use `?` when it is ok to omit the property
+    * Use `| undefined` when you want the user to have to pass in the property but `undefined` signals that you will fall back to some default
+    * Try to avoid `?` + `| undefined` in most cases. Instead use `?`. Using both `?` + `| undefined` isn't wrong, but it's often more clear to treat omitting the property as falling back to the default rather than passing in `undefined`
+
+* For unmanaged, writable objects:
+    * If using `?`, always also add `| undefined` unless want to allow the property to be omitted during initialization, but never allow users to explicitly set it to `undefined` afterwards. I don't think we have many cases where this will be needed
+        * In these cases, you may want to try changing the api to avoid this potential confusion
+    * If adding a new property to an unmanaged object, use `?` as this ensures the type is backwards compatible with the old version
diff --git a/.npmrc b/.npmrc
index eff6e8cdba917..22256e5d8e7ba 100644
--- a/.npmrc
+++ b/.npmrc
@@ -1,6 +1,6 @@
 disturl="https://electronjs.org/headers"
-target="32.2.5"
-ms_build_id="10579404"
+target="32.2.6"
+ms_build_id="10629634"
 runtime="electron"
 build_from_source="true"
 legacy-peer-deps="true"
diff --git a/build/checksums/electron.txt b/build/checksums/electron.txt
index 92c742d3b5002..17ec96faa2a02 100644
--- a/build/checksums/electron.txt
+++ b/build/checksums/electron.txt
@@ -1,75 +1,75 @@
-fed2c175e3b63682e7b939b704b524e5af7e664f6b020cfec4895b6258190f7c *chromedriver-v32.2.5-darwin-arm64.zip
-fa40996a7d0c5b830d101a0b6511300ff4477995b5af86b1e8be5e21341caa8e *chromedriver-v32.2.5-darwin-x64.zip
-9881960752aa2dee6577ab4c312d0a5e69f596c209cab32e2c5bd3b32222c79a *chromedriver-v32.2.5-linux-arm64.zip
-864754d188b9e7a15abd97a3b41d7d53db300ef3401b76fa81633c298e3b09f0 *chromedriver-v32.2.5-linux-armv7l.zip
-75e0d1f19e61caaa2b0f50966623f2948fffc864138f6ee8fe38791b733fd182 *chromedriver-v32.2.5-linux-x64.zip
-360695b3ac1f1faa9caf0c670d81ed065e230822d77343d7dd6aa2988b2ecf99 *chromedriver-v32.2.5-mas-arm64.zip
-03778e3fda6d50a9f122a3e5e4a5723953918f7b67ef5a41578ae1c41a3c2579 *chromedriver-v32.2.5-mas-x64.zip
-807a45c2c40a3da025a7fd394d2ef34ed78b0719f2af924694200818cca1c0ca *chromedriver-v32.2.5-win32-arm64.zip
-37da8dd36a36dbafa3b20101c5a3066ca03a36db45e478872b1c88231007f35e *chromedriver-v32.2.5-win32-ia32.zip
-8f624e3969185ea47840c3f65d6ff2e12a2d7d8b6251b15c8b51ff690bd0a517 *chromedriver-v32.2.5-win32-x64.zip
-2424f6f47c8c2e59546fad9d93324772ea1b6d290ce4672b6689ffc45c96a950 *electron-api.json
-e4b455bf2339bf3945c7eb3c9faa52f1122eb9d4b97cedeced5887c01125c33d *electron-v32.2.5-darwin-arm64-dsym-snapshot.zip
-016c1ec183649162c436c599bdc6f9a02a635fec4b30b99f97cc25829d70f07c *electron-v32.2.5-darwin-arm64-dsym.zip
-0cc937ba248fde2098e9affdd6aa0ea2f0091ab700d8ac9b46cba4a11a0adaff *electron-v32.2.5-darwin-arm64-symbols.zip
-add26413ae4b6055a37335be8a551007b8f47759ee3bed19d3ab0463c6b3422a *electron-v32.2.5-darwin-arm64.zip
-3f8802fba7a8274308b98d4ac50a730f3e75ed447cca70ae63395d6ebd1d2bc9 *electron-v32.2.5-darwin-x64-dsym-snapshot.zip
-f7a427b0b884be02f89b7a5b9a8dc9a6d573cf0c3a342e18483b4719a1c9a5b0 *electron-v32.2.5-darwin-x64-dsym.zip
-85b68c3869332a33d5ad3d90639b5d8e1777e67df9ae23ac85d1fa412d1ae98c *electron-v32.2.5-darwin-x64-symbols.zip
-67bb4e9e02f244516f10b78b380aa19a7026e025d568878d15035debe758eef4 *electron-v32.2.5-darwin-x64.zip
-8a3f519c6a31d40c9849e6641668a152e73ec210e3477d1bf2ed957ac9955b2d *electron-v32.2.5-linux-arm64-debug.zip
-9c64b56211d4013643cec784b030456b6b06f01cbdb96d4acc90dd5c91b74242 *electron-v32.2.5-linux-arm64-symbols.zip
-0215737ef1e8bb7ca2def455ec4abcfd5743a9fa7af0b7cfa608295a54f5aae3 *electron-v32.2.5-linux-arm64.zip
-8a3f519c6a31d40c9849e6641668a152e73ec210e3477d1bf2ed957ac9955b2d *electron-v32.2.5-linux-armv7l-debug.zip
-0f84c7b3be36ab416a14353ec92f439d1acd9f30be7308ad3b3b514425d7ee9c *electron-v32.2.5-linux-armv7l-symbols.zip
-e692c6d20cdea3f0e26519ac660b762e8119962f6b6e0032fe2a7fb73f4d205c *electron-v32.2.5-linux-armv7l.zip
-1e39d6c04ab451072539aba551df6900dd6f423678f491c3437643d3f18cf657 *electron-v32.2.5-linux-x64-debug.zip
-ab3c4a7beb1e5f18259142a70eecaa5c06eb72a23a692aecee87598dc413ea58 *electron-v32.2.5-linux-x64-symbols.zip
-6d92ff595786c3a8926684c6983fdcb09b20dc34b37a1affb4c4dbfb659fee1e *electron-v32.2.5-linux-x64.zip
-0fac69cb73abbd8a3fefdc80008053d68f0cefa3d5a79f1a849ae6dc374d2778 *electron-v32.2.5-mas-arm64-dsym-snapshot.zip
-cbced9a83753637506b3c0f1c57b42b19dffb4494746e0a2b73c8bce45f4b5ae *electron-v32.2.5-mas-arm64-dsym.zip
-d5b2f03a476a96d8e87670c2e07a84b872881bc49f327145a80b3f063490e0e2 *electron-v32.2.5-mas-arm64-symbols.zip
-b95e7232b208568e8d7f278eb341cdf88b8c5106403f5abedc495305e3b6744f *electron-v32.2.5-mas-arm64.zip
-5031bafcb557ad61a75f925147917b575428671a252ebbf6b77f53410ae3e434 *electron-v32.2.5-mas-x64-dsym-snapshot.zip
-206e023d61e299289869f96ad218863a14a5e71f05b48f16de1cc48e53ba028f *electron-v32.2.5-mas-x64-dsym.zip
-7bdb96b90ffa22ef1156c508f957c66ad1033b3be1cb1a3b9dd7bb98c9088696 *electron-v32.2.5-mas-x64-symbols.zip
-2f46aa2c8a9a7f28a1bd148a41d170389396c457634a896bef38e472b5e66d9c *electron-v32.2.5-mas-x64.zip
-f614582a35d4e4d68ea6861d35d49062908a202e208cf09354ef66982c540f7f *electron-v32.2.5-win32-arm64-pdb.zip
-c8f8375ab562970ca02ba83755c69fa104a2621ad481d25f93cec797b64bf6bc *electron-v32.2.5-win32-arm64-symbols.zip
-48b81d28fdceb4ab3ca27650d79bab910a1a19dbda72271882bfdc877c71975f *electron-v32.2.5-win32-arm64-toolchain-profile.zip
-b3d6ed4c2ccc567bcd4f405ed20b33e4ba9dd0bcfb54cb99017a0ed2eb8ec1ef *electron-v32.2.5-win32-arm64.zip
-2d5ca8fc59b5cbb8799dd1ee2916725ed7f12d2b6264062e19b1378aca7b326a *electron-v32.2.5-win32-ia32-pdb.zip
-fd8de6c8ccf7094bf83d5ce86866d9e73b082dc4f28250bc939431d79a46a2d9 *electron-v32.2.5-win32-ia32-symbols.zip
-48b81d28fdceb4ab3ca27650d79bab910a1a19dbda72271882bfdc877c71975f *electron-v32.2.5-win32-ia32-toolchain-profile.zip
-b426125e315e2819c60b39b2e443d8a76e5b1fc320595b5b560b00e931c6a0d1 *electron-v32.2.5-win32-ia32.zip
-8bb5edd099cc5ef155179928fba6bc3d78b7111eed8e6b9727bc068c787ec235 *electron-v32.2.5-win32-x64-pdb.zip
-329eb0d32cb6c03c617dc5b5378c97a6f359b63492c00207a73ec0dd427d70a4 *electron-v32.2.5-win32-x64-symbols.zip
-48b81d28fdceb4ab3ca27650d79bab910a1a19dbda72271882bfdc877c71975f *electron-v32.2.5-win32-x64-toolchain-profile.zip
-0ae7add4862e34675384e7119902e6d2384d2712a5ebe98d8994b45dfa6ead12 *electron-v32.2.5-win32-x64.zip
-146a192ac5e05bbd8172e3107cd4a1cae2b4882c98272ec735a2628889803104 *electron.d.ts
-3f1f2db3beade0ef71ba4e8c1549368133f9aad1f377db91aba3dbac773dc770 *ffmpeg-v32.2.5-darwin-arm64.zip
-441b3459f3e684f1444a7a88b56d88efc7ed0f466efc71b4daa32b467442231a *ffmpeg-v32.2.5-darwin-x64.zip
-3f1eafaf4cd90ab43ba0267429189be182435849a166a2cbe1faefc0d07217c4 *ffmpeg-v32.2.5-linux-arm64.zip
-3db919bc57e1a5bf7c1bae1d7aeacf4a331990ea82750391c0b24a046d9a2812 *ffmpeg-v32.2.5-linux-armv7l.zip
-fe7d779dddbfb5da5999a7607fc5e3c7a6ab7c65e8da9fee1384918865231612 *ffmpeg-v32.2.5-linux-x64.zip
-20f83028f1e263287bc83ec817d548a3e9c160aeadeb97bea0b40b6c256e6b2f *ffmpeg-v32.2.5-mas-arm64.zip
-921551e865c81047259b77325c5d1bfc1cd29463c2eab7d9b37bb2bb507e9e25 *ffmpeg-v32.2.5-mas-x64.zip
-713563936304f814324874686f19bcdc6b7d6472e8d4f4ab459970a059123d7a *ffmpeg-v32.2.5-win32-arm64.zip
-616b736527e7a2b07fd62d8cff7c62d3a2f41725c4d45a6075c9354b5d758085 *ffmpeg-v32.2.5-win32-ia32.zip
-517786aabef79bb55fd932676ad3ccacd776fac47b230067f3b939207ad7f204 *ffmpeg-v32.2.5-win32-x64.zip
-d66731d99d7a4f586a86f3eea4b5807e7601da8d7b697a6ae0edff296b6a2206 *hunspell_dictionaries.zip
-f5a90b865c32194e2e593c790ad05fb11f2011208796a0ad5438ac03792a3da0 *libcxx-objects-v32.2.5-linux-arm64.zip
-dfcbae6c5b65397ec7ecf56fe9675ac2ca8a6507cdfe3abee10acd36c55536ad *libcxx-objects-v32.2.5-linux-armv7l.zip
-a358503519eb66da7ae35d5ac0cf47482c045e2c03a6a0dd70e77e94f44d95c9 *libcxx-objects-v32.2.5-linux-x64.zip
-7c1d5dff2dc9e9a450ec29da808ef1720bf129b71e7418b8815e8525da65f899 *libcxx_headers.zip
-875d1697b3cde375ed63cb56104b1c53157bdd611fb3938f086be9579177bce2 *libcxxabi_headers.zip
-1639adba066f123dbbf9d632a3ea786e7bc8e9027ff103972207e818e08946fb *mksnapshot-v32.2.5-darwin-arm64.zip
-de90ae0b520d8ff3a175e632f627ccc413260d4e19e40c09cd9b1b75b4482611 *mksnapshot-v32.2.5-darwin-x64.zip
-62029765e6b48ceee36a6b6c9e3252b386271c22839bafd21dabd2f3f1f19901 *mksnapshot-v32.2.5-linux-arm64-x64.zip
-be21fd7442a9d599d70de8fb8776fe778b979fe85a47bfb92e57ac3158d2abcc *mksnapshot-v32.2.5-linux-armv7l-x64.zip
-9a4f258c13b69846f405344e400a9dd149c943c39c04cf1799b6dc19cc223449 *mksnapshot-v32.2.5-linux-x64.zip
-b53b42662802239c6f49e5c9805ed05463197ddbd8ca35436389adb4420e4ebb *mksnapshot-v32.2.5-mas-arm64.zip
-f32544d647db6cdea6e538d29f05e65b01b7d8d98b8904ed7961e5ed7204cc4b *mksnapshot-v32.2.5-mas-x64.zip
-8fc8daed10eea093d185a4bda35dc95789e8f99932193b6b9ff1ff5411f39c38 *mksnapshot-v32.2.5-win32-arm64-x64.zip
-ce5d40a5e795be00faefa0383e32a96b8d41d3c1c050d2b86944084cb03de9db *mksnapshot-v32.2.5-win32-ia32.zip
-7e9451ad4308f9d7a3dcd8e3ce55d029f82128a6b1370adb086e8f854d58d4e9 *mksnapshot-v32.2.5-win32-x64.zip
+bb4164f7b554606b2c4daaf43e81bf2e2b5cf0d4441cfdd74f04653237fcf655 *chromedriver-v32.2.6-darwin-arm64.zip
+a0fc3df1c6cd17bfe62ffbb1eba3655ca625dea5046e5d2b3dbb0e9e349cd10e *chromedriver-v32.2.6-darwin-x64.zip
+671d6dab890747ea73ba5589327eef7612670950a20e5f88c7d8a301b5491e26 *chromedriver-v32.2.6-linux-arm64.zip
+55bfd4e33fef1506261d4cb3074988e1970c2a762ca76a8f1197512a1766723c *chromedriver-v32.2.6-linux-armv7l.zip
+d3c7a45c8c75152db927b3596f506995e72631df870b302b7dbcbd3399e54a3a *chromedriver-v32.2.6-linux-x64.zip
+567f77d09708942901c6cdce6708b995f6ac779faceebb4ed383ca5003e2de4e *chromedriver-v32.2.6-mas-arm64.zip
+b3a28181b1d077742f1be632a802e15b5a36a260b1cfe0e429735de9f52d074a *chromedriver-v32.2.6-mas-x64.zip
+a113f5bd747b6eeb033f4d6ea2f53cf332d9b45d6340af514dd938bac7f99419 *chromedriver-v32.2.6-win32-arm64.zip
+3b3237a788fad0a6be63a69b93c28b6052db23aeaa1a75d2589be15b4c2c0f2f *chromedriver-v32.2.6-win32-ia32.zip
+1096c131cf8e3f98a01525e93d573eaf4fd23492d8dd78a211e39c448e69e463 *chromedriver-v32.2.6-win32-x64.zip
+8e6fcf3171c3fcdcb117f641ec968bb53be3d38696e388636bf34f04c10b987d *electron-api.json
+b1b20784a97e64992c92480e69af828a110d834372479b26759f1559b3da80fc *electron-v32.2.6-darwin-arm64-dsym-snapshot.zip
+f11dd5a84229430ec59b4335415a4b308dc4330ff7b9febae20165fbdd862e92 *electron-v32.2.6-darwin-arm64-dsym.zip
+cc96cf91f6b108dc927d8f7daee2fe27ae8a492c932993051508aa779e816445 *electron-v32.2.6-darwin-arm64-symbols.zip
+fcb6bbb6aa3c1020b4045dbe9f2a5286173d5025248550f55631e70568e91775 *electron-v32.2.6-darwin-arm64.zip
+d2bfeea27fc91936b4f71d0f5c577e5ad0ea094edba541dfa348948fd65c3331 *electron-v32.2.6-darwin-x64-dsym-snapshot.zip
+5e7684cc12c0dee11fb933b68301d0fe68d3198d1daeadd5e1b4cf52743f79bf *electron-v32.2.6-darwin-x64-dsym.zip
+6d2a7d41ab14fc7d3c5e4b35d5d425edb2d13978dcc332e781ec8b7bcfe6a794 *electron-v32.2.6-darwin-x64-symbols.zip
+c0964ee5fdcefb1003ffd7ef574b07e5147856f3a94bb4335f78c409f8cf2eca *electron-v32.2.6-darwin-x64.zip
+604d88b9d434ea66ddf234dd129dcef3d468b95b0da47e2f1555a682c8d0de28 *electron-v32.2.6-linux-arm64-debug.zip
+f448e91df42fc84177bcd46378e49ee648f6114984fc57af4a84690a5197c23e *electron-v32.2.6-linux-arm64-symbols.zip
+9e4f9345cae06e8e5679b228e7b7ac21b8733e3fcda8903e3dcbc8171c53f8be *electron-v32.2.6-linux-arm64.zip
+604d88b9d434ea66ddf234dd129dcef3d468b95b0da47e2f1555a682c8d0de28 *electron-v32.2.6-linux-armv7l-debug.zip
+c85d5ca3f38dc4140040bcde6a37ac9c7510bb542f12e1ffce695a35f68e3c13 *electron-v32.2.6-linux-armv7l-symbols.zip
+df4b490a9c501d83c5305f20b2a9d1aa100d2e878e59ebafde477f21d35e3300 *electron-v32.2.6-linux-armv7l.zip
+a5aa67da85ee318ff0770d55a506f62e6e5a10e967dfab272a94bcd91922e075 *electron-v32.2.6-linux-x64-debug.zip
+671eb342a58e056f0dee5a6e9c69a6a96ee2141f81d306fa1a0e2635e22aa7c0 *electron-v32.2.6-linux-x64-symbols.zip
+a3231409db7f8ac2cc446708f17e2abac0f8549c166eaab2f427e8d0f864208d *electron-v32.2.6-linux-x64.zip
+8b8d0aeadcf21633216a9cce87d323ad6aa21e38ec82092cd5f65bf171be025f *electron-v32.2.6-mas-arm64-dsym-snapshot.zip
+298931236955b83d174738d3325931e9672a8333bf854fc5f471168b0f7e70be *electron-v32.2.6-mas-arm64-dsym.zip
+53e4c666a6f5f87aa150b1c2f34532e3711e00b0237fb103dcbef64d65979429 *electron-v32.2.6-mas-arm64-symbols.zip
+bedbc78acc3bc6cb30e5fe1f133562104152022273ec21a83cd32a0eece9003f *electron-v32.2.6-mas-arm64.zip
+9ba3def756c90460867d968af5417996991bf3b4b306dba4c9fbde43de2f771d *electron-v32.2.6-mas-x64-dsym-snapshot.zip
+e4a3f9392934bb4ef82a214fec2ce1f319ea409b89bf03b2a2a4ab7a55688d0c *electron-v32.2.6-mas-x64-dsym.zip
+55c54fd01faf5767493183001a440b837b63f8b8d64c36f7b42fa7217af36dcd *electron-v32.2.6-mas-x64-symbols.zip
+1efe974cd426a288d617750c864e6edbf28495c3b851a5bc806af19cda7a274d *electron-v32.2.6-mas-x64.zip
+88c50d34dc48a55a11014349d2d278f895f1615405614dbfcf27dff5f5030cf1 *electron-v32.2.6-win32-arm64-pdb.zip
+b0b2211bf0f11924bcd693b6783627c7f6c9a066117bcf05c10766064c79794c *electron-v32.2.6-win32-arm64-symbols.zip
+48b81d28fdceb4ab3ca27650d79bab910a1a19dbda72271882bfdc877c71975f *electron-v32.2.6-win32-arm64-toolchain-profile.zip
+2b7962348f23410863cb6562d79654ce534666bab9f75965b5c8ebee61f49657 *electron-v32.2.6-win32-arm64.zip
+d248ab4ec8b4a5aec414c7a404e0efd9b9a73083f7c5cb6c657c2ed58c4cbe94 *electron-v32.2.6-win32-ia32-pdb.zip
+2ef98197d66d94aee4978047f22ba07538d259b25a8f5f301d9564a13649e72c *electron-v32.2.6-win32-ia32-symbols.zip
+48b81d28fdceb4ab3ca27650d79bab910a1a19dbda72271882bfdc877c71975f *electron-v32.2.6-win32-ia32-toolchain-profile.zip
+e85dbf85d58cab5b06cdb8e76fde3a25306e7c1808f5bb30925ba7e29ff14d13 *electron-v32.2.6-win32-ia32.zip
+9d76b0c0d475cc062b2a951fbfb3b17837880102fb6cc042e2736dfebbfa0e5d *electron-v32.2.6-win32-x64-pdb.zip
+3d7b93bafc633429f5c9f820bcb4843d504b12e454b3ecebb1b69c15b5f4080f *electron-v32.2.6-win32-x64-symbols.zip
+48b81d28fdceb4ab3ca27650d79bab910a1a19dbda72271882bfdc877c71975f *electron-v32.2.6-win32-x64-toolchain-profile.zip
+77d5e5b76b49767e6a3ad292dc315fbc7cdccd557ac38da9093b8ac6da9262d5 *electron-v32.2.6-win32-x64.zip
+a52935712eb4fc2c12ac4ae611a57e121da3b6165c2de1abd7392ed4261287e2 *electron.d.ts
+6345ea55fda07544434c90c276cdceb2662044b9e0355894db67ca95869af22a *ffmpeg-v32.2.6-darwin-arm64.zip
+4c1347e8653727513a22be013008c2760d19200977295b98506b3b9947e74090 *ffmpeg-v32.2.6-darwin-x64.zip
+3f1eafaf4cd90ab43ba0267429189be182435849a166a2cbe1faefc0d07217c4 *ffmpeg-v32.2.6-linux-arm64.zip
+3db919bc57e1a5bf7c1bae1d7aeacf4a331990ea82750391c0b24a046d9a2812 *ffmpeg-v32.2.6-linux-armv7l.zip
+fe7d779dddbfb5da5999a7607fc5e3c7a6ab7c65e8da9fee1384918865231612 *ffmpeg-v32.2.6-linux-x64.zip
+e09ae881113d1b3103aec918e7c95c36f82b2db63657320c380c94386f689138 *ffmpeg-v32.2.6-mas-arm64.zip
+ee316e435662201a81fcededc62582dc87a0bd5c9fd0f6a8a55235eca806652f *ffmpeg-v32.2.6-mas-x64.zip
+415395968d31e13056cefcb589ed550a0e80d7c3d0851ee3ba29e4dcdf174210 *ffmpeg-v32.2.6-win32-arm64.zip
+17f61a5293b707c984cee52b57a7e505cde994d22828e31c016434521638e419 *ffmpeg-v32.2.6-win32-ia32.zip
+f9b47951a553eec21636b3cc15eccf0a2ba272567146ec8a6e2eeb91a985fd62 *ffmpeg-v32.2.6-win32-x64.zip
+7d2b596bd94e4d5c7befba11662dc563a02f18c183da12ebd56f38bb6f4382e9 *hunspell_dictionaries.zip
+06bca9a33142b5834fbca6d10d7f3303b0b5c52e7222fe783db109cd4c5260ed *libcxx-objects-v32.2.6-linux-arm64.zip
+7ab8ff5a4e1d3a6639978ed718d2732df9c1a4dd4dcd3e18f6746a2168d353a9 *libcxx-objects-v32.2.6-linux-armv7l.zip
+ba96792896751e11fdba63e5e336e323979986176aa1848122ca3757c854352e *libcxx-objects-v32.2.6-linux-x64.zip
+1f858d484f4ce27f9f3c4a120b2881f88c17c81129ca10e495b50398fb2eed64 *libcxx_headers.zip
+4566afb06a6dd8bd895dba5350a5705868203321116a1ae0a216d5a4a6bfb289 *libcxxabi_headers.zip
+350f5419c14aede5802c4f0ef5204ddbbe0eb7d5263524da38d19f43620d8530 *mksnapshot-v32.2.6-darwin-arm64.zip
+9f4e4943df4502943994ffa17525b7b5b9a1d889dbc5aeb28bfc40f9146323ec *mksnapshot-v32.2.6-darwin-x64.zip
+6295ad1a4ab3b24ac99ec85d35ebfce3861e58185b94d20077e364e81ad935f8 *mksnapshot-v32.2.6-linux-arm64-x64.zip
+ed9e1931165a2ff85c1af9f10b3bf8ba05d2dae31331d1d4f5ff1512078e4411 *mksnapshot-v32.2.6-linux-armv7l-x64.zip
+6680c63b11e4638708d88c130474ceb2ee92fc58c62cfcd3bf33dda9fee771c2 *mksnapshot-v32.2.6-linux-x64.zip
+5a4c45b755b7bbdcad51345f5eb2935ba988987650f9b8540c7ef04015207a2f *mksnapshot-v32.2.6-mas-arm64.zip
+1e6243d6a1b68f327457b9dae244ffaeadc265b07a99d9c36f1abcff31e36856 *mksnapshot-v32.2.6-mas-x64.zip
+407099537b17860ce7dcea6ba582a854314c29dc152a6df0abcc77ebb0187b4c *mksnapshot-v32.2.6-win32-arm64-x64.zip
+f9107536378e19ae9305386dacf6fae924c7ddaad0cf0a6f49694e1e8af6ded5 *mksnapshot-v32.2.6-win32-ia32.zip
+82a142db76a2cc5dfb9a89e4cd721cfebc0f3077d2415d8f3d86bb7411f0fe27 *mksnapshot-v32.2.6-win32-x64.zip
diff --git a/build/checksums/nodejs.txt b/build/checksums/nodejs.txt
index 632cc7155e054..9e53ad9083232 100644
--- a/build/checksums/nodejs.txt
+++ b/build/checksums/nodejs.txt
@@ -1,7 +1,7 @@
-92e180624259d082562592bb12548037c6a417069be29e452ec5d158d657b4be  node-v20.18.0-darwin-arm64.tar.gz
-c02aa7560612a4e2cc359fd89fae7aedde370c06db621f2040a4a9f830a125dc  node-v20.18.0-darwin-x64.tar.gz
-38bccb35c06ee4edbcd00c77976e3fad1d69d2e57c3c0c363d1700a2a2493278  node-v20.18.0-linux-arm64.tar.gz
-9a522daa837d4d32dc700bf9b18dea9e21a229b113a22cfcf38f1f2240bbbc47  node-v20.18.0-linux-armv7l.tar.gz
-24a5d58a1d4c2903478f4b7c3cfd2eeb5cea2cae3baee11a4dc6a1fed25fec6c  node-v20.18.0-linux-x64.tar.gz
-e66327f3d1de938059bedda660de2eff1a508b61d777ff247615a019eb153d46  win-arm64/node.exe
-35b7c95a379beb606f5798ed83081690df13190077630b234163c6607aa4cc94  win-x64/node.exe
+9e92ce1032455a9cc419fe71e908b27ae477799371b45a0844eedb02279922a4  node-v20.18.1-darwin-arm64.tar.gz
+c5497dd17c8875b53712edaf99052f961013cedc203964583fc0cfc0aaf93581  node-v20.18.1-darwin-x64.tar.gz
+73cd297378572e0bc9dfc187c5ec8cca8d43aee6a596c10ebea1ed5f9ec682b6  node-v20.18.1-linux-arm64.tar.gz
+7b7c3315818e9fe57512737c2380fada14d8717ce88945fb6f7b8baadd3cfb92  node-v20.18.1-linux-armv7l.tar.gz
+259e5a8bf2e15ecece65bd2a47153262eda71c0b2c9700d5e703ce4951572784  node-v20.18.1-linux-x64.tar.gz
+9a52905b5d22b08b5b34e86b8d5358cd22c03fbd0fcb9dbb37c9bd82a8f18c17  win-arm64/node.exe
+06c1dec1b428927d6ff01c8f5882f119ec13b61ac77483760aa7fba215c72cf5  win-x64/node.exe
diff --git a/cgmanifest.json b/cgmanifest.json
index 63e0e74d1f814..832a3f604b782 100644
--- a/cgmanifest.json
+++ b/cgmanifest.json
@@ -516,11 +516,11 @@
 				"git": {
 					"name": "nodejs",
 					"repositoryUrl": "https://github.com/nodejs/node",
-					"commitHash": "7eebd17fa2c1e48e4534f3a69560388fab2f2c07"
+					"commitHash": "70178110a8e52d28dc957b6b20da94e455922025"
 				}
 			},
 			"isOnlyProductionDependency": true,
-			"version": "20.18.0"
+			"version": "20.18.1"
 		},
 		{
 			"component": {
@@ -528,12 +528,12 @@
 				"git": {
 					"name": "electron",
 					"repositoryUrl": "https://github.com/electron/electron",
-					"commitHash": "a6a0c4cb6d815bbc9503620c7641d57e14b03868"
+					"commitHash": "10e0ce069260b2cc984c301d5a7ecb3492f0c2f0"
 				}
 			},
 			"isOnlyProductionDependency": true,
 			"license": "MIT",
-			"version": "32.2.5"
+			"version": "32.2.6"
 		},
 		{
 			"component": {
diff --git a/extensions/git/package.json b/extensions/git/package.json
index 1851ef8703886..103caae96f7bf 100644
--- a/extensions/git/package.json
+++ b/extensions/git/package.json
@@ -453,6 +453,12 @@
         "category": "Git",
         "enablement": "!operationInProgress"
       },
+      {
+        "command": "git.checkoutRef",
+        "title": "%command.checkoutRef%",
+        "category": "Git",
+        "enablement": "!operationInProgress"
+      },
       {
         "command": "git.checkoutRefDetached",
         "title": "%command.checkoutRefDetached%",
@@ -1470,6 +1476,10 @@
           "command": "git.copyCommitMessage",
           "when": "false"
         },
+        {
+          "command": "git.checkoutRef",
+          "when": "false"
+        },
         {
           "command": "git.checkoutRefDetached",
           "when": "false"
@@ -2028,6 +2038,7 @@
           "group": "9_copy@2"
         }
       ],
+      "scm/historyItemRef/context": [],
       "editor/title": [
         {
           "command": "git.openFile",
diff --git a/extensions/git/package.nls.json b/extensions/git/package.nls.json
index 1f6775a2da58a..d706b650c8a0e 100644
--- a/extensions/git/package.nls.json
+++ b/extensions/git/package.nls.json
@@ -62,6 +62,7 @@
 	"command.undoCommit": "Undo Last Commit",
 	"command.checkout": "Checkout to...",
 	"command.checkoutDetached": "Checkout to (Detached)...",
+	"command.checkoutRef": "Checkout",
 	"command.checkoutRefDetached": "Checkout (Detached)",
 	"command.branch": "Create Branch...",
 	"command.branchFrom": "Create Branch From...",
diff --git a/extensions/git/src/blame.ts b/extensions/git/src/blame.ts
index 9c6bc5ae76193..fbc5aaa417bc7 100644
--- a/extensions/git/src/blame.ts
+++ b/extensions/git/src/blame.ts
@@ -160,6 +160,7 @@ export class GitBlameController {
 		this._model.onDidOpenRepository(this._onDidOpenRepository, this, this._disposables);
 		this._model.onDidCloseRepository(this._onDidCloseRepository, this, this._disposables);
 
+		window.onDidChangeActiveTextEditor(e => this._updateTextEditorBlameInformation(e), this, this._disposables);
 		window.onDidChangeTextEditorSelection(e => this._updateTextEditorBlameInformation(e.textEditor), this, this._disposables);
 		window.onDidChangeTextEditorDiffInformation(e => this._updateTextEditorBlameInformation(e.textEditor), this, this._disposables);
 
diff --git a/extensions/git/src/commands.ts b/extensions/git/src/commands.ts
index cc85c83728aa1..5266955198fe2 100644
--- a/extensions/git/src/commands.ts
+++ b/extensions/git/src/commands.ts
@@ -5,7 +5,7 @@
 
 import * as os from 'os';
 import * as path from 'path';
-import { Command, commands, Disposable, LineChange, MessageOptions, Position, ProgressLocation, QuickPickItem, Range, SourceControlResourceState, TextDocumentShowOptions, TextEditor, Uri, ViewColumn, window, workspace, WorkspaceEdit, WorkspaceFolder, TimelineItem, env, Selection, TextDocumentContentProvider, InputBoxValidationSeverity, TabInputText, TabInputTextMerge, QuickPickItemKind, TextDocument, LogOutputChannel, l10n, Memento, UIKind, QuickInputButton, ThemeIcon, SourceControlHistoryItem, SourceControl, InputBoxValidationMessage, Tab, TabInputNotebook, QuickInputButtonLocation, SourceControlHistoryItemRef } from 'vscode';
+import { Command, commands, Disposable, LineChange, MessageOptions, Position, ProgressLocation, QuickPickItem, Range, SourceControlResourceState, TextDocumentShowOptions, TextEditor, Uri, ViewColumn, window, workspace, WorkspaceEdit, WorkspaceFolder, TimelineItem, env, Selection, TextDocumentContentProvider, InputBoxValidationSeverity, TabInputText, TabInputTextMerge, QuickPickItemKind, TextDocument, LogOutputChannel, l10n, Memento, UIKind, QuickInputButton, ThemeIcon, SourceControlHistoryItem, SourceControl, InputBoxValidationMessage, Tab, TabInputNotebook, QuickInputButtonLocation } from 'vscode';
 import TelemetryReporter from '@vscode/extension-telemetry';
 import { uniqueNamesGenerator, adjectives, animals, colors, NumberDictionary } from '@joaomoreno/unique-names-generator';
 import { ForcePushMode, GitErrorCodes, Ref, RefType, Status, CommitOptions, RemoteSourcePublisher, Remote } from './api/git';
@@ -2505,8 +2505,18 @@ export class CommandCenter {
 		return this._checkout(repository, { detached: true, treeish });
 	}
 
+	@command('git.checkoutRef', { repository: true })
+	async checkoutRef(repository: Repository, historyItem?: SourceControlHistoryItem, historyItemRefId?: string): Promise<boolean> {
+		const historyItemRef = historyItem?.references?.find(r => r.id === historyItemRefId);
+		if (!historyItemRef) {
+			return false;
+		}
+
+		return this._checkout(repository, { treeish: historyItemRefId });
+	}
+
 	@command('git.checkoutRefDetached', { repository: true })
-	async checkoutRefDetached(repository: Repository, historyItem?: SourceControlHistoryItemRef): Promise<boolean> {
+	async checkoutRefDetached(repository: Repository, historyItem?: SourceControlHistoryItem): Promise<boolean> {
 		if (!historyItem) {
 			return false;
 		}
diff --git a/extensions/terminal-suggest/src/completions/cd.ts b/extensions/terminal-suggest/src/completions/cd.ts
index 89fc633911b27..0eb7aaba25b19 100644
--- a/extensions/terminal-suggest/src/completions/cd.ts
+++ b/extensions/terminal-suggest/src/completions/cd.ts
@@ -9,7 +9,6 @@ const cdSpec: Fig.Spec = {
 	args: {
 		name: 'folder',
 		template: 'folders',
-		isVariadic: true,
 
 		suggestions: [
 			{
diff --git a/extensions/terminal-suggest/src/terminalSuggestMain.ts b/extensions/terminal-suggest/src/terminalSuggestMain.ts
index d9483f728cd06..89ffde7496a70 100644
--- a/extensions/terminal-suggest/src/terminalSuggestMain.ts
+++ b/extensions/terminal-suggest/src/terminalSuggestMain.ts
@@ -288,7 +288,7 @@ export function getCompletionItemsFromSpecs(specs: Fig.Spec[], terminalContext:
 		}
 	}
 
-	if (!specificSuggestionsProvided) {
+	if (!specificSuggestionsProvided && (filesRequested === foldersRequested)) {
 		// Include builitin/available commands in the results
 		for (const command of availableCommands) {
 			if ((!terminalContext.commandLine.trim() || !!prefix) && command.startsWith(prefix) && !items.find(item => item.label === command)) {
diff --git a/package-lock.json b/package-lock.json
index f1ee69e00fa77..67d913bcb2815 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -96,7 +96,7 @@
         "cssnano": "^6.0.3",
         "debounce": "^1.0.0",
         "deemon": "^1.8.0",
-        "electron": "32.2.5",
+        "electron": "32.2.6",
         "eslint": "^9.11.1",
         "eslint-formatter-compact": "^8.40.0",
         "eslint-plugin-header": "3.1.1",
@@ -5815,9 +5815,9 @@
       "dev": true
     },
     "node_modules/electron": {
-      "version": "32.2.5",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-32.2.5.tgz",
-      "integrity": "sha512-8t5IGOvms/JTcLNnlOH7rFCAJIZJAazwYrF7kQsKQSLzDHh4z8mGFrU11NN3W4bIT6Yg5DJNniSWz3O5wJLmCw==",
+      "version": "32.2.6",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-32.2.6.tgz",
+      "integrity": "sha512-aGG1MLvWCf+ECUFBCmaCF52F8312OPAJfph2D0FSsFmlbfnJuNevZCbty2lFzsiIMtU7/QRo6d0ksbgR4s7y3w==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
diff --git a/package.json b/package.json
index 64f0e91044e4a..841d2a58c1c1e 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "code-oss-dev",
   "version": "1.96.0",
-  "distro": "9f7044d3679195e9328d2e34fb2d8e833127239b",
+  "distro": "40103071553e7c3bf5cecea4ec8a0ad14509c451",
   "author": {
     "name": "Microsoft Corporation"
   },
@@ -154,7 +154,7 @@
     "cssnano": "^6.0.3",
     "debounce": "^1.0.0",
     "deemon": "^1.8.0",
-    "electron": "32.2.5",
+    "electron": "32.2.6",
     "eslint": "^9.11.1",
     "eslint-formatter-compact": "^8.40.0",
     "eslint-plugin-header": "3.1.1",
diff --git a/remote/.npmrc b/remote/.npmrc
index 929e26e4c4b73..b74c59d2b8f3d 100644
--- a/remote/.npmrc
+++ b/remote/.npmrc
@@ -1,6 +1,6 @@
 disturl="https://nodejs.org/dist"
-target="20.18.0"
-ms_build_id="300025"
+target="20.18.1"
+ms_build_id="307485"
 runtime="node"
 build_from_source="true"
 legacy-peer-deps="true"
diff --git a/scripts/test-integration.bat b/scripts/test-integration.bat
index 5c832677ca6e9..b59cceada070d 100644
--- a/scripts/test-integration.bat
+++ b/scripts/test-integration.bat
@@ -52,6 +52,11 @@ echo ### Colorize tests
 call npm run test-extension -- -l vscode-colorize-tests
 if %errorlevel% neq 0 exit /b %errorlevel%
 
+echo.
+echo ### Terminal Suggest tests
+call npm run test-extension -- -l terminal-suggest --enable-proposed-api=vscode.vscode-api-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%
diff --git a/src/vs/base/browser/fastDomNode.ts b/src/vs/base/browser/fastDomNode.ts
index 1ef17e48cd5d4..9d58aaba9c3df 100644
--- a/src/vs/base/browser/fastDomNode.ts
+++ b/src/vs/base/browser/fastDomNode.ts
@@ -39,6 +39,10 @@ export class FastDomNode<T extends HTMLElement> {
 		public readonly domNode: T
 	) { }
 
+	public focus(): void {
+		this.domNode.focus();
+	}
+
 	public setMaxWidth(_maxWidth: number | string): void {
 		const maxWidth = numberAsPixels(_maxWidth);
 		if (this._maxWidth === maxWidth) {
diff --git a/src/vs/base/browser/ui/tree/abstractTree.ts b/src/vs/base/browser/ui/tree/abstractTree.ts
index be65784fd80b4..64efdcaabea15 100644
--- a/src/vs/base/browser/ui/tree/abstractTree.ts
+++ b/src/vs/base/browser/ui/tree/abstractTree.ts
@@ -1177,7 +1177,7 @@ export class FindController<T, TFilterData> extends AbstractFindController<T, TF
 		this.tree.refilter();
 
 		if (pattern) {
-			this.tree.focusNext(0, true, undefined, node => !FuzzyScore.isDefault(node.filterData as any as FuzzyScore));
+			this.tree.focusNext(0, true, undefined, (node) => this.shouldAllowFocus(node));
 		}
 
 		const focus = this.tree.getFocus();
diff --git a/src/vs/base/browser/ui/tree/asyncDataTree.ts b/src/vs/base/browser/ui/tree/asyncDataTree.ts
index 418c47a4754d6..9d0d2cbf4b25f 100644
--- a/src/vs/base/browser/ui/tree/asyncDataTree.ts
+++ b/src/vs/base/browser/ui/tree/asyncDataTree.ts
@@ -227,8 +227,10 @@ export interface IAsyncFindToggles {
 	findMode: TreeFindMode;
 }
 
-export interface IAsyncFindResultMetadata {
+export interface IAsyncFindResult<T> {
 	warningMessage?: string;
+	matchCount: number;
+	isMatch(element: T): boolean;
 }
 
 export interface IAsyncFindProvider<T> {
@@ -241,7 +243,7 @@ export interface IAsyncFindProvider<T> {
 	/**
 	 * `find` is called when the user types one or more character into the find input.
 	 */
-	find(pattern: string, toggles: IAsyncFindToggles, token: CancellationToken): Promise<IAsyncFindResultMetadata>;
+	find(pattern: string, toggles: IAsyncFindToggles, token: CancellationToken): Promise<IAsyncFindResult<T> | undefined>;
 
 	/**
 	 * `isVisible` is called to check if an element should be visible.
@@ -285,8 +287,10 @@ class AsyncFindFilter<T> extends FindFilter<T> {
 
 }
 
+// TODO Fix types
 class AsyncFindController<TInput, T, TFilterData> extends FindController<T, TFilterData> {
 	private activeTokenSource: CancellationTokenSource | undefined;
+	private activeFindMetadata: IAsyncFindResult<T> | undefined;
 	private activeSession = false;
 	private asyncWorkInProgress = false;
 	private taskQueue = new ThrottledDelayer(250);
@@ -342,13 +346,15 @@ class AsyncFindController<TInput, T, TFilterData> extends FindController<T, TFil
 		}
 
 		this.asyncWorkInProgress = true;
+		this.activeFindMetadata = undefined;
 
 		const findMetadata = await this.findProvider.find(pattern, { matchType: this.matchType, findMode: this.mode }, token);
-		if (token.isCancellationRequested) {
+		if (token.isCancellationRequested || findMetadata === undefined) {
 			return;
 		}
 
 		this.asyncWorkInProgress = false;
+		this.activeFindMetadata = findMetadata;
 
 		this.filter.reset();
 		super.applyPattern(pattern);
@@ -371,8 +377,15 @@ class AsyncFindController<TInput, T, TFilterData> extends FindController<T, TFil
 	}
 
 	protected override render(): void {
-		if (!this.asyncWorkInProgress) {
-			super.render();
+		if (this.asyncWorkInProgress || !this.activeFindMetadata) {
+			return;
+		}
+
+		const showNotFound = this.activeFindMetadata.matchCount === 0 && this.pattern.length > 0;
+		this.renderMessage(showNotFound);
+
+		if (this.pattern.length) {
+			this.alertResults(this.activeFindMetadata.matchCount);
 		}
 	}
 
@@ -385,6 +398,23 @@ class AsyncFindController<TInput, T, TFilterData> extends FindController<T, TFil
 
 		this.applyPattern(this.pattern);
 	}
+
+	override shouldAllowFocus(node: ITreeNode<T, TFilterData>): boolean {
+		return this.shouldFocusWhenNavigating(node as ITreeNode<IAsyncDataTreeNode<TInput, T> | null, TFilterData>);
+	}
+
+	shouldFocusWhenNavigating(node: ITreeNode<IAsyncDataTreeNode<TInput, T> | null, TFilterData>): boolean {
+		if (!this.activeSession || !this.activeFindMetadata) {
+			return true;
+		}
+
+		const element = node.element?.element as T | undefined;
+		if (element && this.activeFindMetadata.isMatch(element)) {
+			return true;
+		}
+
+		return !FuzzyScore.isDefault(node.filterData as any as FuzzyScore);
+	}
 }
 
 function asObjectTreeOptions<TInput, T, TFilterData>(options?: IAsyncDataTreeOptions<T, TFilterData>): IObjectTreeOptions<IAsyncDataTreeNode<TInput, T>, TFilterData> | undefined {
@@ -534,6 +564,8 @@ export class AsyncDataTree<TInput, T, TFilterData = void> implements IDisposable
 
 	get onDidUpdateOptions(): Event<IAsyncDataTreeOptionsUpdate> { return this.tree.onDidUpdateOptions; }
 
+	private focusNavigationFilter: ((node: ITreeNode<IAsyncDataTreeNode<TInput, T> | null, TFilterData>) => boolean) | undefined;
+
 	readonly onDidChangeFindOpenState: Event<boolean>;
 	get onDidChangeStickyScrollFocused(): Event<boolean> { return this.tree.onDidChangeStickyScrollFocused; }
 
@@ -600,6 +632,7 @@ export class AsyncDataTree<TInput, T, TFilterData = void> implements IDisposable
 			const findOptions = { styles: options.findWidgetStyles, showNotFoundMessage: options.showNotFoundMessage };
 			this.findController = this.disposables.add(new AsyncFindController(this.tree, options.findProvider!, findFilter!, this.tree.options.contextViewProvider!, findOptions));
 
+			this.focusNavigationFilter = node => this.findController!.shouldFocusWhenNavigating(node);
 			this.onDidChangeFindOpenState = this.findController!.onDidChangeOpenState;
 			this.onDidChangeFindMode = this.findController!.onDidChangeMode;
 			this.onDidChangeFindMatchType = this.findController!.onDidChangeMatchType;
@@ -935,27 +968,27 @@ export class AsyncDataTree<TInput, T, TFilterData = void> implements IDisposable
 	}
 
 	focusNext(n = 1, loop = false, browserEvent?: UIEvent): void {
-		this.tree.focusNext(n, loop, browserEvent);
+		this.tree.focusNext(n, loop, browserEvent, this.focusNavigationFilter);
 	}
 
 	focusPrevious(n = 1, loop = false, browserEvent?: UIEvent): void {
-		this.tree.focusPrevious(n, loop, browserEvent);
+		this.tree.focusPrevious(n, loop, browserEvent, this.focusNavigationFilter);
 	}
 
 	focusNextPage(browserEvent?: UIEvent): Promise<void> {
-		return this.tree.focusNextPage(browserEvent);
+		return this.tree.focusNextPage(browserEvent, this.focusNavigationFilter);
 	}
 
 	focusPreviousPage(browserEvent?: UIEvent): Promise<void> {
-		return this.tree.focusPreviousPage(browserEvent);
+		return this.tree.focusPreviousPage(browserEvent, this.focusNavigationFilter);
 	}
 
 	focusLast(browserEvent?: UIEvent): void {
-		this.tree.focusLast(browserEvent);
+		this.tree.focusLast(browserEvent, this.focusNavigationFilter);
 	}
 
 	focusFirst(browserEvent?: UIEvent): void {
-		this.tree.focusFirst(browserEvent);
+		this.tree.focusFirst(browserEvent, this.focusNavigationFilter);
 	}
 
 	getFocus(): T[] {
diff --git a/src/vs/base/common/product.ts b/src/vs/base/common/product.ts
index 01eaed143e9ec..cc1452c9c5e0d 100644
--- a/src/vs/base/common/product.ts
+++ b/src/vs/base/common/product.ts
@@ -313,6 +313,8 @@ export interface IDefaultChatAgent {
 	readonly documentationUrl: string;
 	readonly privacyStatementUrl: string;
 	readonly skusDocumentationUrl: string;
+	readonly publicCodeMatchesUrl: string;
+	readonly managePlanUrl: string;
 	readonly providerId: string;
 	readonly providerName: string;
 	readonly providerScopes: string[][];
diff --git a/src/vs/editor/browser/controller/editContext/native/nativeEditContext.ts b/src/vs/editor/browser/controller/editContext/native/nativeEditContext.ts
index cab5f079c99b0..896794fc929b4 100644
--- a/src/vs/editor/browser/controller/editContext/native/nativeEditContext.ts
+++ b/src/vs/editor/browser/controller/editContext/native/nativeEditContext.ts
@@ -75,8 +75,6 @@ export class NativeEditContext extends AbstractEditContext {
 		this.textArea = new FastDomNode(document.createElement('textarea'));
 		this.textArea.setClassName('native-edit-context-textarea');
 
-		this._register(NativeEditContextRegistry.registerTextArea(ownerID, this.textArea.domNode));
-
 		this._updateDomAttributes();
 
 		overflowGuardContainer.appendChild(this.domNode);
@@ -160,6 +158,7 @@ export class NativeEditContext extends AbstractEditContext {
 			}
 			viewController.paste(text, pasteOnNewLine, multicursorText, mode);
 		}));
+		this._register(NativeEditContextRegistry.register(ownerID, this));
 	}
 
 	// --- Public methods ---
@@ -204,6 +203,10 @@ export class NativeEditContext extends AbstractEditContext {
 		return true;
 	}
 
+	public onWillPaste(): void {
+		this._screenReaderSupport.setIgnoreSelectionChangeTime();
+	}
+
 	public writeScreenReaderContent(): void {
 		this._screenReaderSupport.writeScreenReaderContent();
 	}
@@ -455,6 +458,9 @@ export class NativeEditContext extends AbstractEditContext {
 		// When using a Braille display or NVDA for example, it is possible for users to reposition the
 		// system caret. This is reflected in Chrome as a `selectionchange` event and needs to be reflected within the editor.
 
+		// `selectionchange` events often come multiple times for a single logical change
+		// so throttle multiple `selectionchange` events that burst in a short period of time.
+		let previousSelectionChangeEventTime = 0;
 		return addDisposableListener(this.domNode.domNode.ownerDocument, 'selectionchange', () => {
 			const isScreenReaderOptimized = this._accessibilityService.isScreenReaderOptimized();
 			if (!this.isFocused() || !isScreenReaderOptimized) {
@@ -464,6 +470,21 @@ export class NativeEditContext extends AbstractEditContext {
 			if (!screenReaderContentState) {
 				return;
 			}
+			const now = Date.now();
+			const delta1 = now - previousSelectionChangeEventTime;
+			previousSelectionChangeEventTime = now;
+			if (delta1 < 5) {
+				// received another `selectionchange` event within 5ms of the previous `selectionchange` event
+				// => ignore it
+				return;
+			}
+			const delta2 = now - this._screenReaderSupport.getIgnoreSelectionChangeTime();
+			this._screenReaderSupport.resetSelectionChangeTime();
+			if (delta2 < 100) {
+				// received a `selectionchange` event within 100ms since we touched the textarea
+				// => ignore it, since we caused it
+				return;
+			}
 			const activeDocument = getActiveWindow().document;
 			const activeDocumentSelection = activeDocument.getSelection();
 			if (!activeDocumentSelection) {
@@ -474,11 +495,14 @@ export class NativeEditContext extends AbstractEditContext {
 				return;
 			}
 			const range = activeDocumentSelection.getRangeAt(0);
-			const model = this._context.viewModel.model;
-			const offsetOfStartOfScreenReaderContent = model.getOffsetAt(screenReaderContentState.startPositionWithinEditor);
+			const viewModel = this._context.viewModel;
+			const model = viewModel.model;
+			const coordinatesConverter = viewModel.coordinatesConverter;
+			const modelScreenReaderContentStartPositionWithinEditor = coordinatesConverter.convertViewPositionToModelPosition(screenReaderContentState.startPositionWithinEditor);
+			const offsetOfStartOfScreenReaderContent = model.getOffsetAt(modelScreenReaderContentStartPositionWithinEditor);
 			let offsetOfSelectionStart = range.startOffset + offsetOfStartOfScreenReaderContent;
 			let offsetOfSelectionEnd = range.endOffset + offsetOfStartOfScreenReaderContent;
-			const modelUsesCRLF = this._context.viewModel.model.getEndOfLineSequence() === EndOfLineSequence.CRLF;
+			const modelUsesCRLF = model.getEndOfLineSequence() === EndOfLineSequence.CRLF;
 			if (modelUsesCRLF) {
 				const screenReaderContentText = screenReaderContentState.value;
 				const offsetTransformer = new PositionOffsetTransformer(screenReaderContentText);
diff --git a/src/vs/editor/browser/controller/editContext/native/nativeEditContextRegistry.ts b/src/vs/editor/browser/controller/editContext/native/nativeEditContextRegistry.ts
index 763c2099fc13c..eda3528812505 100644
--- a/src/vs/editor/browser/controller/editContext/native/nativeEditContextRegistry.ts
+++ b/src/vs/editor/browser/controller/editContext/native/nativeEditContextRegistry.ts
@@ -4,22 +4,23 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { IDisposable } from '../../../../../base/common/lifecycle.js';
+import { NativeEditContext } from './nativeEditContext.js';
 
 class NativeEditContextRegistryImpl {
 
-	private _textAreaMapping: Map<string, HTMLTextAreaElement> = new Map();
+	private _nativeEditContextMapping: Map<string, NativeEditContext> = new Map();
 
-	registerTextArea(ownerID: string, textArea: HTMLTextAreaElement): IDisposable {
-		this._textAreaMapping.set(ownerID, textArea);
+	register(ownerID: string, nativeEditContext: NativeEditContext): IDisposable {
+		this._nativeEditContextMapping.set(ownerID, nativeEditContext);
 		return {
 			dispose: () => {
-				this._textAreaMapping.delete(ownerID);
+				this._nativeEditContextMapping.delete(ownerID);
 			}
 		};
 	}
 
-	getTextArea(ownerID: string): HTMLTextAreaElement | undefined {
-		return this._textAreaMapping.get(ownerID);
+	get(ownerID: string): NativeEditContext | undefined {
+		return this._nativeEditContextMapping.get(ownerID);
 	}
 }
 
diff --git a/src/vs/editor/browser/controller/editContext/native/screenReaderSupport.ts b/src/vs/editor/browser/controller/editContext/native/screenReaderSupport.ts
index a668f4e91c6ae..1bec4ec372b85 100644
--- a/src/vs/editor/browser/controller/editContext/native/screenReaderSupport.ts
+++ b/src/vs/editor/browser/controller/editContext/native/screenReaderSupport.ts
@@ -29,6 +29,7 @@ export class ScreenReaderSupport {
 	private _lineHeight: number = 1;
 	private _fontInfo: FontInfo | undefined;
 	private _accessibilityPageSize: number = 1;
+	private _ignoreSelectionChangeTime: number = 0;
 
 	private _primarySelection: Selection = new Selection(1, 1, 1, 1);
 	private _screenReaderContentState: ScreenReaderContentState | undefined;
@@ -43,6 +44,18 @@ export class ScreenReaderSupport {
 		this._updateDomAttributes();
 	}
 
+	public setIgnoreSelectionChangeTime(): void {
+		this._ignoreSelectionChangeTime = Date.now();
+	}
+
+	public getIgnoreSelectionChangeTime(): number {
+		return this._ignoreSelectionChangeTime;
+	}
+
+	public resetSelectionChangeTime(): void {
+		this._ignoreSelectionChangeTime = 0;
+	}
+
 	public onConfigurationChanged(e: ViewConfigurationChangedEvent): void {
 		this._updateConfigurationSettings();
 		this._updateDomAttributes();
@@ -129,6 +142,7 @@ export class ScreenReaderSupport {
 			return;
 		}
 		if (this._domNode.domNode.textContent !== this._screenReaderContentState.value) {
+			this.setIgnoreSelectionChangeTime();
 			this._domNode.domNode.textContent = this._screenReaderContentState.value;
 		}
 		this._setSelectionOfScreenReaderContent(this._screenReaderContentState.selectionStart, this._screenReaderContentState.selectionEnd);
@@ -175,6 +189,7 @@ export class ScreenReaderSupport {
 		const range = new globalThis.Range();
 		range.setStart(textContent, selectionOffsetStart);
 		range.setEnd(textContent, selectionOffsetEnd);
+		this.setIgnoreSelectionChangeTime();
 		activeDocumentSelection.removeAllRanges();
 		activeDocumentSelection.addRange(range);
 	}
diff --git a/src/vs/editor/common/config/editorOptions.ts b/src/vs/editor/common/config/editorOptions.ts
index 17e0805cbdb5f..51fee410a6baa 100644
--- a/src/vs/editor/common/config/editorOptions.ts
+++ b/src/vs/editor/common/config/editorOptions.ts
@@ -4170,6 +4170,7 @@ export interface IInlineSuggestOptions {
 			enabled?: boolean;
 			useMixedLinesDiff?: 'never' | 'whenPossible' | 'afterJumpWhenPossible';
 			useInterleavedLinesDiff?: 'never' | 'always' | 'afterJump';
+			onlyShowWhenCloseToCursor?: boolean;
 		};
 	};
 }
@@ -4201,6 +4202,7 @@ class InlineEditorSuggest extends BaseEditorOption<EditorOption.inlineSuggest, I
 					enabled: true,
 					useMixedLinesDiff: 'never',
 					useInterleavedLinesDiff: 'never',
+					onlyShowWhenCloseToCursor: true,
 				},
 			},
 		};
@@ -4256,6 +4258,11 @@ class InlineEditorSuggest extends BaseEditorOption<EditorOption.inlineSuggest, I
 					description: nls.localize('inlineSuggest.edits.experimental.useInterleavedLinesDiff', "Controls whether to enable experimental interleaved lines diff in inline suggestions."),
 					enum: ['never', 'always', 'afterJump'],
 				},
+				'editor.inlineSuggest.edits.experimental.onlyShowWhenCloseToCursor': {
+					type: 'boolean',
+					default: defaults.edits.experimental.onlyShowWhenCloseToCursor,
+					description: nls.localize('inlineSuggest.edits.experimental.onlyShowWhenCloseToCursor', "Controls whether to only show inline suggestions when the cursor is close to the suggestion.")
+				},
 			}
 		);
 	}
@@ -4278,6 +4285,7 @@ class InlineEditorSuggest extends BaseEditorOption<EditorOption.inlineSuggest, I
 					enabled: boolean(input.edits?.experimental?.enabled, this.defaultValue.edits.experimental.enabled),
 					useMixedLinesDiff: stringSet(input.edits?.experimental?.useMixedLinesDiff, this.defaultValue.edits.experimental.useMixedLinesDiff, ['never', 'whenPossible', 'afterJumpWhenPossible']),
 					useInterleavedLinesDiff: stringSet(input.edits?.experimental?.useInterleavedLinesDiff, this.defaultValue.edits.experimental.useInterleavedLinesDiff, ['never', 'always', 'afterJump']),
+					onlyShowWhenCloseToCursor: boolean(input.edits?.experimental?.onlyShowWhenCloseToCursor, this.defaultValue.edits.experimental.onlyShowWhenCloseToCursor),
 				},
 			},
 		};
diff --git a/src/vs/editor/contrib/clipboard/browser/clipboard.ts b/src/vs/editor/contrib/clipboard/browser/clipboard.ts
index 5add082374358..15fc67e770b49 100644
--- a/src/vs/editor/contrib/clipboard/browser/clipboard.ts
+++ b/src/vs/editor/contrib/clipboard/browser/clipboard.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as browser from '../../../../base/browser/browser.js';
-import { getActiveDocument, getActiveWindow, isHTMLElement } from '../../../../base/browser/dom.js';
+import { getActiveDocument } from '../../../../base/browser/dom.js';
 import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
 import * as platform from '../../../../base/common/platform.js';
 import * as nls from '../../../../nls.js';
@@ -240,15 +240,14 @@ if (PasteAction) {
 				// Since we can not call execCommand('paste') on a dom node with edit context set
 				// we added a hidden text area that receives the paste execution
 				// see nativeEditContext.ts for more details
-				const textAreaDomNode = NativeEditContextRegistry.getTextArea(focusedEditor.getId());
-				if (textAreaDomNode) {
-					const currentFocusedElement = getActiveWindow().document.activeElement;
-					textAreaDomNode.focus();
+				const nativeEditContext = NativeEditContextRegistry.get(focusedEditor.getId());
+				if (nativeEditContext) {
+					const textArea = nativeEditContext.textArea;
+					nativeEditContext.onWillPaste();
+					textArea.focus();
 					result = focusedEditor.getContainerDomNode().ownerDocument.execCommand('paste');
-					textAreaDomNode.textContent = '';
-					if (isHTMLElement(currentFocusedElement)) {
-						currentFocusedElement.focus();
-					}
+					textArea.domNode.textContent = '';
+					nativeEditContext.domNode.focus();
 				} else {
 					result = false;
 				}
diff --git a/src/vs/editor/contrib/dropOrPasteInto/browser/copyPasteController.ts b/src/vs/editor/contrib/dropOrPasteInto/browser/copyPasteController.ts
index 873313c82b351..8d4cbf1241d17 100644
--- a/src/vs/editor/contrib/dropOrPasteInto/browser/copyPasteController.ts
+++ b/src/vs/editor/contrib/dropOrPasteInto/browser/copyPasteController.ts
@@ -684,6 +684,12 @@ export class CopyPasteController extends Disposable implements IEditorContributi
 				return editIndex;
 			}
 		}
+
+		// Specific case for pasting code blocks.
+		if (edits.filter(edit => edit.kind.contains(new HierarchicalKind('chat.attach.text')))) {
+			return edits.findIndex(edit => edit.kind.contains(new HierarchicalKind('text.plain')));
+		}
+
 		return 0;
 	}
 }
diff --git a/src/vs/editor/contrib/dropOrPasteInto/browser/postEditWidget.ts b/src/vs/editor/contrib/dropOrPasteInto/browser/postEditWidget.ts
index 638145d25d04c..beb1948da5ece 100644
--- a/src/vs/editor/contrib/dropOrPasteInto/browser/postEditWidget.ts
+++ b/src/vs/editor/contrib/dropOrPasteInto/browser/postEditWidget.ts
@@ -7,10 +7,12 @@ import * as dom from '../../../../base/browser/dom.js';
 import { Button } from '../../../../base/browser/ui/button/button.js';
 import { IAction } from '../../../../base/common/actions.js';
 import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { Codicon } from '../../../../base/common/codicons.js';
 import { toErrorMessage } from '../../../../base/common/errorMessage.js';
 import { isCancellationError } from '../../../../base/common/errors.js';
 import { Event } from '../../../../base/common/event.js';
 import { Disposable, MutableDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
 import { localize } from '../../../../nls.js';
 import { ActionListItemKind, IActionListItem } from '../../../../platform/actionWidget/browser/actionList.js';
 import { IActionWidgetService } from '../../../../platform/actionWidget/browser/actionWidget.js';
@@ -118,18 +120,17 @@ class PostEditWidget<T extends DocumentPasteEdit | DocumentDropEdit> extends Dis
 		const pos = dom.getDomNodePagePosition(this.button.element);
 		const anchor = { x: pos.left + pos.width, y: pos.top + pos.height };
 
-		this._actionWidgetService.show('postEditWidget', false, [
-			...this.edits.allEdits.map((edit, i): IActionListItem<T> => {
+		this._actionWidgetService.show('postEditWidget', false,
+			this.edits.allEdits.map((edit, i): IActionListItem<T> => {
 				return {
-					item: edit,
 					kind: ActionListItemKind.Action,
+					item: edit,
 					label: edit.title,
 					disabled: false,
 					canPreview: false,
-					hideIcon: true
+					group: { title: '', icon: ThemeIcon.fromId(i === this.edits.activeEditIndex ? Codicon.check.id : Codicon.blank.id) },
 				};
-			})
-		], {
+			}), {
 			onHide: () => {
 				this.editor.focus();
 			},
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/controller/commands.ts b/src/vs/editor/contrib/inlineCompletions/browser/controller/commands.ts
index 0a41954d91361..5a9273456c115 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/controller/commands.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/controller/commands.ts
@@ -13,7 +13,7 @@ import { IConfigurationService } from '../../../../../platform/configuration/com
 import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
 import { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { ICodeEditor } from '../../../../browser/editorBrowser.js';
-import { EditorAction, ServicesAccessor } from '../../../../browser/editorExtensions.js';
+import { EditorAction, EditorCommand, ServicesAccessor } from '../../../../browser/editorExtensions.js';
 import { EditorContextKeys } from '../../../../common/editorContextKeys.js';
 import { Context as SuggestContext } from '../../../suggest/browser/suggest.js';
 import { inlineSuggestCommitId, showNextInlineSuggestionActionId, showPreviousInlineSuggestionActionId } from './commandIds.js';
@@ -103,19 +103,17 @@ export class ExplicitTriggerInlineEditAction extends EditorAction {
 	}
 }
 
-export class TriggerInlineEditAction extends Action2 {
+export class TriggerInlineEditAction extends EditorCommand {
 	constructor() {
 		super({
 			id: 'editor.action.inlineSuggest.triggerInlineEdit',
-			title: nls.localize2('action.inlineSuggest.trigger.inlineEdit', "Trigger Inline Edit"),
 			precondition: EditorContextKeys.writable,
-			f1: false,
 		});
 	}
 
-	public async run(accessor: ServicesAccessor | undefined, editor: ICodeEditor): Promise<void> {
+	public override async runEditorCommand(accessor: ServicesAccessor | null, editor: ICodeEditor, args: { triggerKind?: 'automatic' | 'explicit' }): Promise<void> {
 		const controller = InlineCompletionsController.get(editor);
-		await controller?.model.get()?.triggerExplicitly(undefined, true);
+		await controller?.model.get()?.trigger(undefined, true);
 	}
 }
 
@@ -309,7 +307,7 @@ export class ToggleAlwaysShowInlineSuggestionToolbar extends Action2 {
 		});
 	}
 
-	public async run(accessor: ServicesAccessor, editor: ICodeEditor): Promise<void> {
+	public async run(accessor: ServicesAccessor): Promise<void> {
 		const configService = accessor.get(IConfigurationService);
 		const currentValue = configService.getValue<'always' | 'onHover'>('editor.inlineSuggest.showToolbar');
 		const newValue = currentValue === 'always' ? 'onHover' : 'always';
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletions.contribution.ts b/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletions.contribution.ts
index 9221334c230db..36be1d4e5f940 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletions.contribution.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletions.contribution.ts
@@ -6,7 +6,7 @@
 import { AccessibleViewRegistry } from '../../../../platform/accessibility/browser/accessibleViewRegistry.js';
 import { registerAction2 } from '../../../../platform/actions/common/actions.js';
 import { wrapInHotClass1 } from '../../../../platform/observable/common/wrapInHotClass.js';
-import { EditorContributionInstantiation, registerEditorAction, registerEditorContribution } from '../../../browser/editorExtensions.js';
+import { EditorContributionInstantiation, registerEditorAction, registerEditorCommand, registerEditorContribution } from '../../../browser/editorExtensions.js';
 import { HoverParticipantRegistry } from '../../hover/browser/hoverTypes.js';
 import { AcceptInlineCompletion, AcceptNextLineOfInlineCompletion, AcceptNextWordOfInlineCompletion, DevExtractReproSample, HideInlineCompletion, JumpToNextInlineEdit, ShowNextInlineSuggestionAction, ShowPreviousInlineSuggestionAction, ToggleAlwaysShowInlineSuggestionToolbar, ExplicitTriggerInlineEditAction, TriggerInlineSuggestionAction, TriggerInlineEditAction } from './controller/commands.js';
 import { InlineCompletionsController } from './controller/inlineCompletionsController.js';
@@ -21,7 +21,7 @@ registerEditorContribution(InlineCompletionsController.ID, wrapInHotClass1(Inlin
 
 registerEditorAction(TriggerInlineSuggestionAction);
 registerEditorAction(ExplicitTriggerInlineEditAction);
-registerAction2(TriggerInlineEditAction);
+registerEditorCommand(new TriggerInlineEditAction());
 registerEditorAction(ShowNextInlineSuggestionAction);
 registerEditorAction(ShowPreviousInlineSuggestionAction);
 registerEditorAction(AcceptNextWordOfInlineCompletion);
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.ts b/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.ts
index f09dea308b17c..3de779b83648b 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.ts
@@ -14,6 +14,7 @@ import { ICommandService } from '../../../../../platform/commands/common/command
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 import { ICodeEditor } from '../../../../browser/editorBrowser.js';
 import { observableCodeEditor } from '../../../../browser/observableCodeEditor.js';
+import { EditorOption } from '../../../../common/config/editorOptions.js';
 import { CursorColumns } from '../../../../common/core/cursorColumns.js';
 import { EditOperation } from '../../../../common/core/editOperation.js';
 import { LineRange } from '../../../../common/core/lineRange.js';
@@ -53,6 +54,8 @@ export class InlineCompletionsModel extends Disposable {
 
 	private readonly _editorObs = observableCodeEditor(this._editor);
 
+	private readonly onlyShowWhenCloseToCursor = this._editorObs.getOption(EditorOption.inlineSuggest).map(v => !!v.edits.experimental.onlyShowWhenCloseToCursor);
+
 	constructor(
 		public readonly textModel: ITextModel,
 		private readonly _selectedSuggestItem: IObservable<SuggestItemInfo | undefined>,
@@ -87,6 +90,11 @@ export class InlineCompletionsModel extends Disposable {
 				}
 			}
 		}));
+
+		this._register(autorun(reader => {
+			this._editorObs.versionId.read(reader);
+			this._inAcceptFlow.set(false, undefined);
+		}));
 	}
 
 	public debugGetSelectedSuggestItem(): IObservable<SuggestItemInfo | undefined> {
@@ -201,8 +209,13 @@ export class InlineCompletionsModel extends Disposable {
 		return this._source.fetch(cursorPosition, context, itemToPreserve);
 	});
 
-	public async trigger(tx?: ITransaction): Promise<void> {
-		this._isActive.set(true, tx);
+	public async trigger(tx?: ITransaction, onlyFetchInlineEdits: boolean = false): Promise<void> {
+		subtransaction(tx, tx => {
+			if (onlyFetchInlineEdits) {
+				this._onlyRequestInlineEditsSignal.trigger(tx);
+			}
+			this._isActive.set(true, tx);
+		});
 		await this._fetchInlineCompletionsPromise.get();
 	}
 
@@ -344,6 +357,10 @@ export class InlineCompletionsModel extends Disposable {
 			const cursorAtInlineEdit = LineRange.fromRangeInclusive(edit.range).addMargin(1, 1).contains(cursorPos.lineNumber);
 
 			const cursorDist = LineRange.fromRange(edit.range).distanceToLine(this._primaryPosition.read(reader).lineNumber);
+
+			if (this.onlyShowWhenCloseToCursor.read(reader) && cursorDist > 3 && !item.inlineEdit.request.isExplicitRequest && !this._inAcceptFlow.read(reader)) {
+				return undefined;
+			}
 			const disableCollapsing = true;
 			const currentItemIsCollapsed = !disableCollapsing && (cursorDist > 1 && this._collapsedInlineEditId.read(reader) === item.inlineEdit.semanticId);
 
@@ -579,6 +596,8 @@ export class InlineCompletionsModel extends Disposable {
 				.then(undefined, onUnexpectedExternalError);
 			completion.source.removeRef();
 		}
+
+		this._inAcceptFlow.set(true, undefined);
 	}
 
 	public async acceptNextWord(editor: ICodeEditor): Promise<void> {
@@ -711,6 +730,7 @@ export class InlineCompletionsModel extends Disposable {
 	}
 
 	private _jumpedTo = observableValue(this, false);
+	private _inAcceptFlow = observableValue(this, false);
 
 	public jump(): void {
 		const s = this.inlineEditState.get();
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsSource.ts b/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsSource.ts
index ea817862159aa..79b3b8faacb3a 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsSource.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsSource.ts
@@ -216,6 +216,10 @@ class UpdateRequest {
 				|| this.context.triggerKind === InlineCompletionTriggerKind.Explicit)
 			&& this.versionId === other.versionId;
 	}
+
+	public get isExplicitRequest() {
+		return this.context.triggerKind === InlineCompletionTriggerKind.Explicit;
+	}
 }
 
 class UpdateOperation implements IDisposable {
diff --git a/src/vs/editor/contrib/rename/browser/renameWidget.ts b/src/vs/editor/contrib/rename/browser/renameWidget.ts
index 6e93d0862fd6d..e5a7bc7149750 100644
--- a/src/vs/editor/contrib/rename/browser/renameWidget.ts
+++ b/src/vs/editor/contrib/rename/browser/renameWidget.ts
@@ -995,7 +995,7 @@ class InputWithButton implements IDisposable {
 
 	setStopButton() {
 		this._buttonState = 'stop';
-		this._stopIcon ??= renderIcon(Codicon.primitiveSquare);
+		this._stopIcon ??= renderIcon(Codicon.stopCircle);
 		dom.clearNode(this.button);
 		this.button.appendChild(this._stopIcon);
 		this.button.setAttribute('aria-label', 'Cancel generating new name suggestions');
diff --git a/src/vs/monaco.d.ts b/src/vs/monaco.d.ts
index f938917618352..921924f240d72 100644
--- a/src/vs/monaco.d.ts
+++ b/src/vs/monaco.d.ts
@@ -4599,6 +4599,7 @@ declare namespace monaco.editor {
 				enabled?: boolean;
 				useMixedLinesDiff?: 'never' | 'whenPossible' | 'afterJumpWhenPossible';
 				useInterleavedLinesDiff?: 'never' | 'always' | 'afterJump';
+				onlyShowWhenCloseToCursor?: boolean;
 			};
 		};
 	}
diff --git a/src/vs/platform/actions/common/actions.ts b/src/vs/platform/actions/common/actions.ts
index cdc635fb5b21f..7f00003c0f305 100644
--- a/src/vs/platform/actions/common/actions.ts
+++ b/src/vs/platform/actions/common/actions.ts
@@ -124,6 +124,7 @@ export class MenuId {
 	static readonly SCMSourceControlInline = new MenuId('SCMSourceControlInline');
 	static readonly SCMSourceControlTitle = new MenuId('SCMSourceControlTitle');
 	static readonly SCMHistoryTitle = new MenuId('SCMHistoryTitle');
+	static readonly SCMHistoryItemRefContext = new MenuId('SCMHistoryItemRefContext');
 	static readonly SCMTitle = new MenuId('SCMTitle');
 	static readonly SearchContext = new MenuId('SearchContext');
 	static readonly SearchActionMenu = new MenuId('SearchActionContext');
diff --git a/src/vs/platform/utilityProcess/electron-main/utilityProcess.ts b/src/vs/platform/utilityProcess/electron-main/utilityProcess.ts
index 90b054ad13dd9..e2f88fbf8c0f7 100644
--- a/src/vs/platform/utilityProcess/electron-main/utilityProcess.ts
+++ b/src/vs/platform/utilityProcess/electron-main/utilityProcess.ts
@@ -169,7 +169,6 @@ export class UtilityProcess extends Disposable {
 	private process: ElectronUtilityProcess | undefined = undefined;
 	private processPid: number | undefined = undefined;
 	private configuration: IUtilityProcessConfiguration | undefined = undefined;
-	private killed = false;
 
 	constructor(
 		@ILogService private readonly logService: ILogService,
@@ -316,11 +315,10 @@ export class UtilityProcess extends Disposable {
 
 		// Exit
 		this._register(Event.fromNodeEventEmitter<number>(process, 'exit')(code => {
-			const normalizedCode = this.isNormalExit(code) ? 0 : code;
-			this.log(`received exit event with code ${normalizedCode}`, Severity.Info);
+			this.log(`received exit event with code ${code}`, Severity.Info);
 
 			// Event
-			this._onExit.fire({ pid: this.processPid!, code: normalizedCode, signal: 'unknown' });
+			this._onExit.fire({ pid: this.processPid!, code, signal: 'unknown' });
 
 			// Cleanup
 			this.onDidExitOrCrashOrKill();
@@ -368,7 +366,7 @@ export class UtilityProcess extends Disposable {
 
 		// Child process gone
 		this._register(Event.fromNodeEventEmitter<{ details: Details }>(app, 'child-process-gone', (event, details) => ({ event, details }))(({ details }) => {
-			if (details.type === 'Utility' && details.name === serviceName && !this.isNormalExit(details.exitCode)) {
+			if (details.type === 'Utility' && details.name === serviceName) {
 				this.log(`crashed with code ${details.exitCode} and reason '${details.reason}'`, Severity.Error);
 
 				// Telemetry
@@ -458,24 +456,12 @@ export class UtilityProcess extends Disposable {
 		const killed = this.process.kill();
 		if (killed) {
 			this.log('successfully killed the process', Severity.Info);
-			this.killed = true;
 			this.onDidExitOrCrashOrKill();
 		} else {
 			this.log('unable to kill the process', Severity.Warning);
 		}
 	}
 
-	private isNormalExit(exitCode: number): boolean {
-		if (exitCode === 0) {
-			return true;
-		}
-
-		// Treat an exit code of 15 (SIGTERM) as a normal exit
-		// if we triggered the termination from process.kill()
-
-		return this.killed && exitCode === 15 /* SIGTERM */;
-	}
-
 	private onDidExitOrCrashOrKill(): void {
 		if (typeof this.processPid === 'number') {
 			UtilityProcess.all.delete(this.processPid);
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
index 09050b213f6cb..ea329abe91ed3 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
@@ -32,6 +32,7 @@ import { IEditorGroupsService } from '../../../../services/editor/common/editorG
 import { ACTIVE_GROUP, IEditorService } from '../../../../services/editor/common/editorService.js';
 import { IHostService } from '../../../../services/host/browser/host.js';
 import { IViewsService } from '../../../../services/views/common/viewsService.js';
+import { EXTENSIONS_CATEGORY, IExtensionsWorkbenchService } from '../../../extensions/common/extensions.js';
 import { ChatAgentLocation, IChatAgentService } from '../../common/chatAgents.js';
 import { ChatContextKeys } from '../../common/chatContextKeys.js';
 import { extractAgentAndCommand } from '../../common/chatParserTypes.js';
@@ -39,6 +40,7 @@ import { IChatDetail, IChatService } from '../../common/chatService.js';
 import { IChatVariablesService } from '../../common/chatVariables.js';
 import { IChatRequestViewModel, IChatResponseViewModel, isRequestVM } from '../../common/chatViewModel.js';
 import { IChatWidgetHistoryService } from '../../common/chatWidgetHistoryService.js';
+import { CopilotUsageExtensionFeatureId } from '../../common/languageModelStats.js';
 import { ChatViewId, IChatWidget, IChatWidgetService, showChatView } from '../chat.js';
 import { IChatEditorOptions } from '../chatEditor.js';
 import { ChatEditorInput } from '../chatEditorInput.js';
@@ -474,7 +476,7 @@ export function registerChatActions() {
 					{
 						id: MenuId.ChatCommandCenter,
 						group: 'z_end',
-						order: 1
+						order: 2
 					}
 				]
 			});
@@ -487,6 +489,52 @@ export function registerChatActions() {
 			}
 		}
 	});
+
+	registerAction2(class ManagePlanAction extends Action2 {
+
+		static readonly ID = 'workbench.action.chat.managePlan';
+		static readonly TITLE = localize2('managePlan', "Manage {0} Plan", defaultChat.name);
+
+		constructor() {
+			super({
+				id: ManagePlanAction.ID,
+				title: ManagePlanAction.TITLE,
+				f1: true,
+				category: CHAT_CATEGORY,
+				menu: [
+					{
+						id: MenuId.ChatCommandCenter,
+						group: 'z_end',
+						order: 1
+					}
+				]
+			});
+		}
+
+		override async run(accessor: ServicesAccessor): Promise<void> {
+			const openerService = accessor.get(IOpenerService);
+			if (defaultChat.documentationUrl) {
+				openerService.open(URI.parse(defaultChat.managePlanUrl));
+			}
+		}
+	});
+
+	registerAction2(class ShowExtensionsUsingCopilit extends Action2 {
+
+		constructor() {
+			super({
+				id: 'workbench.action.chat.showExtensionsUsingCopilot',
+				title: localize2('showCopilotUsageExtensions', "Show Extensions using Copilot"),
+				f1: true,
+				category: EXTENSIONS_CATEGORY,
+			});
+		}
+
+		override async run(accessor: ServicesAccessor): Promise<void> {
+			const extensionsWorkbenchService = accessor.get(IExtensionsWorkbenchService);
+			extensionsWorkbenchService.openSearch(`@feature:${CopilotUsageExtensionFeatureId}`);
+		}
+	});
 }
 
 export function stringifyItem(item: IChatRequestViewModel | IChatResponseViewModel, includeName = true): string {
@@ -504,6 +552,7 @@ const defaultChat = {
 	name: product.defaultChatAgent?.name ?? '',
 	icon: Codicon[product.defaultChatAgent?.icon as keyof typeof Codicon ?? 'commentDiscussion'],
 	documentationUrl: product.defaultChatAgent?.documentationUrl ?? '',
+	managePlanUrl: product.defaultChatAgent?.managePlanUrl ?? '',
 };
 
 MenuRegistry.appendMenuItem(MenuId.CommandCenter, {
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatClearActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatClearActions.ts
index e67ca53cb1691..35f5f0ebbf2b8 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatClearActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatClearActions.ts
@@ -181,7 +181,7 @@ export function registerNewChatActions() {
 				announceChatCleared(accessibilitySignalService);
 				const widget = widgetService.getWidgetBySessionId(context.sessionId);
 				if (widget) {
-					chatEditingService.currentEditingSessionObs.get()?.stop();
+					chatEditingService.currentEditingSessionObs.get()?.stop(true);
 					widget.clear();
 					widget.attachmentModel.clear();
 					widget.focusInput();
@@ -192,7 +192,7 @@ export function registerNewChatActions() {
 				const widget = chatView.widget;
 
 				announceChatCleared(accessibilitySignalService);
-				chatEditingService.currentEditingSessionObs.get()?.stop();
+				chatEditingService.currentEditingSessionObs.get()?.stop(true);
 				widget.clear();
 				widget.attachmentModel.clear();
 				widget.focusInput();
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
index be164a6ec03a5..e3853f580f2a2 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
@@ -407,6 +407,7 @@ export class AttachContextAction extends Action2 {
 					kind: 'symbol',
 					id: this._getFileContextId(pick.symbol.location),
 					value: pick.symbol.location,
+					symbolKind: pick.symbol.kind,
 					fullName: pick.label,
 					name: pick.symbol.name,
 					isDynamic: true
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts
index 2e2159439ef35..1b8f11d485110 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts
@@ -279,7 +279,7 @@ class SendToChatEditingAction extends Action2 {
 				return;
 			}
 
-			await currentEditingSession?.stop();
+			await currentEditingSession?.stop(true);
 		}
 
 		const { widget: editingWidget } = await viewsService.openView(EditsViewId) as ChatViewPane;
diff --git a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
index 8900c8509a8c3..7e78fa37eaf9e 100644
--- a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
+++ b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
@@ -60,7 +60,7 @@ import { registerChatEditorActions } from './chatEditorActions.js';
 import { ChatEditorController } from './chatEditorController.js';
 import { ChatEditorInput, ChatEditorInputSerializer } from './chatEditorInput.js';
 import { ChatInputBoxContentProvider } from './chatEdinputInputContentProvider.js';
-import { ChatEditorSaving } from './chatEditorSaving.js';
+import { ChatEditorAutoSaveDisabler, ChatEditorSaving } from './chatEditorSaving.js';
 import { agentSlashCommandToMarkdown, agentToMarkdown } from './chatMarkdownDecorationsRenderer.js';
 import { ChatCompatibilityNotifier, ChatExtensionPointHandler } from './chatParticipant.contribution.js';
 import { ChatPasteProvidersFeature } from './chatPasteProviders.js';
@@ -319,6 +319,7 @@ registerWorkbenchContribution2(ChatCommandCenterRendering.ID, ChatCommandCenterR
 registerWorkbenchContribution2(ChatImplicitContextContribution.ID, ChatImplicitContextContribution, WorkbenchPhase.Eventually);
 registerWorkbenchContribution2(ChatRelatedFilesContribution.ID, ChatRelatedFilesContribution, WorkbenchPhase.Eventually);
 registerWorkbenchContribution2(ChatEditorSaving.ID, ChatEditorSaving, WorkbenchPhase.AfterRestored);
+registerWorkbenchContribution2(ChatEditorAutoSaveDisabler.ID, ChatEditorAutoSaveDisabler, WorkbenchPhase.BlockRestore);
 registerWorkbenchContribution2(ChatViewsWelcomeHandler.ID, ChatViewsWelcomeHandler, WorkbenchPhase.BlockStartup);
 registerWorkbenchContribution2(ChatGettingStartedContribution.ID, ChatGettingStartedContribution, WorkbenchPhase.Eventually);
 
diff --git a/src/vs/workbench/contrib/chat/browser/chat.ts b/src/vs/workbench/contrib/chat/browser/chat.ts
index 9762b500e2ebb..0c248860768a8 100644
--- a/src/vs/workbench/contrib/chat/browser/chat.ts
+++ b/src/vs/workbench/contrib/chat/browser/chat.ts
@@ -111,6 +111,7 @@ export interface IChatListItemRendererOptions {
 	readonly noPadding?: boolean;
 	readonly editableCodeBlock?: boolean;
 	readonly renderCodeBlockPills?: boolean;
+	readonly renderDetectedCommandsWithRequest?: boolean;
 	readonly renderTextEditsAsSummary?: (uri: URI) => boolean;
 }
 
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatAgentCommandContentPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatAgentCommandContentPart.ts
new file mode 100644
index 0000000000000..1e8da9fa4daad
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatAgentCommandContentPart.ts
@@ -0,0 +1,52 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { IHoverService } from '../../../../../platform/hover/browser/hover.js';
+import { IChatAgentCommand } from '../../common/chatAgents.js';
+import { chatSubcommandLeader } from '../../common/chatParserTypes.js';
+import { IChatRendererContent } from '../../common/chatViewModel.js';
+import { ChatTreeItem } from '../chat.js';
+import { IChatContentPart } from './chatContentParts.js';
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { localize } from '../../../../../nls.js';
+import { Button } from '../../../../../base/browser/ui/button/button.js';
+import { generateUuid } from '../../../../../base/common/uuid.js';
+
+
+export class ChatAgentCommandContentPart extends Disposable implements IChatContentPart {
+
+	readonly domNode: HTMLElement = document.createElement('span');
+
+	constructor(
+		cmd: IChatAgentCommand,
+		onClick: () => void,
+		@IHoverService private readonly _hoverService: IHoverService,
+	) {
+		super();
+		this.domNode.classList.add('chat-agent-command');
+		this.domNode.setAttribute('aria-label', cmd.name);
+		this.domNode.setAttribute('role', 'button');
+
+		const groupId = generateUuid();
+
+		const commandSpan = document.createElement('span');
+		this.domNode.appendChild(commandSpan);
+		commandSpan.innerText = chatSubcommandLeader + cmd.name;
+		this._store.add(this._hoverService.setupDelayedHover(commandSpan, { content: cmd.description, appearance: { showPointer: true } }, { groupId }));
+
+		const rerun = localize('rerun', "Rerun without {0}{1}", chatSubcommandLeader, cmd.name);
+		const btn = new Button(this.domNode, { ariaLabel: rerun });
+		btn.icon = Codicon.close;
+		btn.onDidClick(() => onClick());
+		this._store.add(btn);
+		this._store.add(this._hoverService.setupDelayedHover(btn.element, { content: rerun, appearance: { showPointer: true } }, { groupId }));
+	}
+
+	hasSameContent(other: IChatRendererContent, followingContent: IChatRendererContent[], element: ChatTreeItem): boolean {
+		return false;
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatAttachmentsContentPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatAttachmentsContentPart.ts
index 251f1e0c7dc16..f4a329f0317a5 100644
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatAttachmentsContentPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatAttachmentsContentPart.ts
@@ -15,7 +15,7 @@ import { ServicesAccessor } from '../../../../../editor/browser/editorExtensions
 import { IRange, Range } from '../../../../../editor/common/core/range.js';
 import { EditorContextKeys } from '../../../../../editor/common/editorContextKeys.js';
 import { LanguageFeatureRegistry } from '../../../../../editor/common/languageFeatureRegistry.js';
-import { Location } from '../../../../../editor/common/languages.js';
+import { Location, SymbolKind } from '../../../../../editor/common/languages.js';
 import { ILanguageService } from '../../../../../editor/common/languages/language.js';
 import { ILanguageFeaturesService } from '../../../../../editor/common/services/languageFeatures.js';
 import { IModelService } from '../../../../../editor/common/services/model.js';
@@ -31,6 +31,7 @@ import { ITextEditorOptions } from '../../../../../platform/editor/common/editor
 import { FileKind, IFileService } from '../../../../../platform/files/common/files.js';
 import { IHoverService } from '../../../../../platform/hover/browser/hover.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { ILabelService } from '../../../../../platform/label/common/label.js';
 import { IOpenerService, OpenInternalOptions } from '../../../../../platform/opener/common/opener.js';
 import { FolderThemeIcon, IThemeService } from '../../../../../platform/theme/common/themeService.js';
 import { fillEditorsDragData } from '../../../../browser/dnd.js';
@@ -61,6 +62,7 @@ export class ChatAttachmentsContentPart extends Disposable {
 		@IFileService private readonly fileService: IFileService,
 		@ICommandService private readonly commandService: ICommandService,
 		@IThemeService private readonly themeService: IThemeService,
+		@ILabelService private readonly labelService: ILabelService
 	) {
 		super();
 
@@ -74,9 +76,9 @@ export class ChatAttachmentsContentPart extends Disposable {
 		const hoverDelegate = this.attachedContextDisposables.add(createInstantHoverDelegate());
 
 		this.variables.forEach(async (attachment) => {
-			const resource = 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;
-			if (resource && attachment.isFile && this.workingSet.find(entry => entry.toString() === resource.toString())) {
+			let resource = 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;
+			let range = attachment.value && typeof attachment.value === 'object' && 'range' in attachment.value && Range.isIRange(attachment.value.range) ? attachment.value.range : undefined;
+			if (resource && attachment.isFile && this.workingSet.find(entry => entry.toString() === resource?.toString())) {
 				// Don't render attachment if it's in the working set
 				return;
 			}
@@ -117,8 +119,11 @@ export class ChatAttachmentsContentPart extends Disposable {
 					icon: !this.themeService.getFileIconTheme().hasFolderIcons ? FolderThemeIcon : undefined
 				});
 
-				this.attachedContextDisposables.add(this.instantiationService.invokeFunction(accessor => hookUpResourceAttachmentDragAndContextMenu(accessor, widget, resource)));
-
+				this.instantiationService.invokeFunction(accessor => {
+					if (resource) {
+						this.attachedContextDisposables.add(hookUpResourceAttachmentDragAndContextMenu(accessor, widget, resource));
+					}
+				});
 			} else if (attachment.isImage) {
 				ariaLabel = localize('chat.imageAttachment', "Attached image, {0}", attachment.name);
 
@@ -152,21 +157,33 @@ export class ChatAttachmentsContentPart extends Disposable {
 			} else if (isPasteVariableEntry(attachment)) {
 				ariaLabel = localize('chat.attachment', "Attached context, {0}", attachment.name);
 
+				const classNames = ['file-icon', `${attachment.language}-lang-file-icon`];
+				if (attachment.copiedFrom) {
+					resource = attachment.copiedFrom.uri;
+					range = attachment.copiedFrom.range;
+					const filename = basename(resource.path);
+					label.setLabel(filename, undefined, { extraClasses: classNames });
+				} else {
+					label.setLabel(attachment.fileName, undefined, { extraClasses: classNames });
+				}
+				widget.appendChild(dom.$('span.attachment-additional-info', {}, `Pasted ${attachment.pastedLines}`));
+
+				widget.style.position = 'relative';
+
 				const hoverContent: IManagedHoverTooltipMarkdownString = {
 					markdown: {
-						value: `\`\`\`${attachment.language}\n${attachment.code}\n\`\`\``,
+						value: `**${attachment.copiedFrom ? this.labelService.getUriLabel(attachment.copiedFrom.uri, { relative: true }) : attachment.fileName}**\n\n---\n\n\`\`\`${attachment.language}\n${attachment.code}\n\`\`\``,
 					},
 					markdownNotSupportedFallback: attachment.code,
 				};
 
-				const classNames = ['file-icon', `${attachment.language}-lang-file-icon`];
-				label.setLabel(attachment.fileName, undefined, { extraClasses: classNames });
-				widget.appendChild(dom.$('span.attachment-additional-info', {}, `Pasted ${attachment.pastedLines}`));
-
-				widget.style.position = 'relative';
-
 				if (!this.attachedContextDisposables.isDisposed) {
 					this.attachedContextDisposables.add(this.hoverService.setupManagedHover(hoverDelegate, widget, hoverContent, { trapFocus: true }));
+
+					const resource = attachment.copiedFrom?.uri;
+					if (resource) {
+						this.attachedContextDisposables.add(this.instantiationService.invokeFunction(accessor => hookUpResourceAttachmentDragAndContextMenu(accessor, widget, resource)));
+					}
 				}
 			} else {
 				const attachmentLabel = attachment.fullName ?? attachment.name;
@@ -178,7 +195,7 @@ export class ChatAttachmentsContentPart extends Disposable {
 
 			if (attachment.kind === 'symbol') {
 				const scopedContextKeyService = this.attachedContextDisposables.add(this.contextKeyService.createScoped(widget));
-				this.attachedContextDisposables.add(this.instantiationService.invokeFunction(accessor => hookUpSymbolAttachmentDragAndContextMenu(accessor, widget, scopedContextKeyService, attachment, MenuId.ChatInputSymbolAttachmentContext)));
+				this.attachedContextDisposables.add(this.instantiationService.invokeFunction(accessor => hookUpSymbolAttachmentDragAndContextMenu(accessor, widget, scopedContextKeyService, { ...attachment, kind: attachment.symbolKind }, MenuId.ChatInputSymbolAttachmentContext)));
 			}
 
 			if (isAttachmentPartialOrOmitted) {
@@ -273,7 +290,7 @@ export function hookUpResourceAttachmentDragAndContextMenu(accessor: ServicesAcc
 	return store;
 }
 
-export function hookUpSymbolAttachmentDragAndContextMenu(accessor: ServicesAccessor, widget: HTMLElement, scopedContextKeyService: IScopedContextKeyService, attachment: { name: string; value: Location }, contextMenuId: MenuId): IDisposable {
+export function hookUpSymbolAttachmentDragAndContextMenu(accessor: ServicesAccessor, widget: HTMLElement, scopedContextKeyService: IScopedContextKeyService, attachment: { name: string; value: Location; kind: SymbolKind }, contextMenuId: MenuId): IDisposable {
 	const instantiationService = accessor.get(IInstantiationService);
 	const languageFeaturesService = accessor.get(ILanguageFeaturesService);
 	const textModelService = accessor.get(ITextModelService);
@@ -295,7 +312,7 @@ export function hookUpSymbolAttachmentDragAndContextMenu(accessor: ServicesAcces
 			fsPath: attachment.value.uri.fsPath,
 			range: attachment.value.range,
 			name: attachment.name,
-			kind: 0
+			kind: attachment.kind,
 		}], e);
 
 		e.dataTransfer?.setDragImage(widget, 0, 0);
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatMarkdownContentPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatMarkdownContentPart.ts
index d4b7425654d53..d0ac0fec70166 100644
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatMarkdownContentPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatMarkdownContentPart.ts
@@ -326,7 +326,7 @@ class CollapsedCodeBlock extends Disposable {
 		this._uri = uri;
 
 		const iconText = this.labelService.getUriBasenameLabel(uri);
-		const modifiedEntry = this.chatEditingService.currentEditingSession?.entries.get().find(entry => entry.modifiedURI.toString() === uri.toString());
+		const modifiedEntry = this.chatEditingService.currentEditingSession?.getEntry(uri);
 		const isComplete = !modifiedEntry?.isCurrentlyBeingModified.get();
 
 		let iconClasses: string[] = [];
diff --git a/src/vs/workbench/contrib/chat/browser/chatDragAndDrop.ts b/src/vs/workbench/contrib/chat/browser/chatDragAndDrop.ts
index 519b7c7737397..96b99f953f6ef 100644
--- a/src/vs/workbench/contrib/chat/browser/chatDragAndDrop.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatDragAndDrop.ts
@@ -23,7 +23,7 @@ import { EditorInput } from '../../../common/editor/editorInput.js';
 import { IEditorService } from '../../../services/editor/common/editorService.js';
 import { IExtensionService, isProposedApiEnabled } from '../../../services/extensions/common/extensions.js';
 import { UntitledTextEditorInput } from '../../../services/untitled/common/untitledTextEditorInput.js';
-import { IChatRequestVariableEntry } from '../common/chatModel.js';
+import { IChatRequestVariableEntry, ISymbolVariableEntry } from '../common/chatModel.js';
 import { ChatAttachmentModel } from './chatAttachmentModel.js';
 import { IChatInputStyles } from './chatInputPart.js';
 
@@ -285,13 +285,14 @@ export class ChatDragAndDrop extends Themable {
 		return undefined;
 	}
 
-	private resolveSymbolsAttachContext(symbols: DocumentSymbolTransferData[]): IChatRequestVariableEntry[] {
+	private resolveSymbolsAttachContext(symbols: DocumentSymbolTransferData[]): ISymbolVariableEntry[] {
 		return symbols.map(symbol => {
 			const resource = URI.file(symbol.fsPath);
 			return {
 				kind: 'symbol',
 				id: symbolId(resource, symbol.range),
 				value: { uri: resource, range: symbol.range },
+				symbolKind: symbol.kind,
 				fullName: `$(${SymbolKinds.toIcon(symbol.kind).id}) ${symbol.name}`,
 				name: symbol.name,
 				isDynamic: true
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingActions.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingActions.ts
index a2720ec691dea..ff6e5c6d20c38 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingActions.ts
@@ -130,7 +130,7 @@ registerAction2(class OpenFileInDiffAction extends WorkingSetAction {
 	async runWorkingSetAction(accessor: ServicesAccessor, currentEditingSession: IChatEditingSession, _chatWidget: IChatWidget, ...uris: URI[]): Promise<void> {
 		const editorService = accessor.get(IEditorService);
 		for (const uri of uris) {
-			const editedFile = currentEditingSession.entries.get().find((e) => e.modifiedURI.toString() === uri.toString());
+			const editedFile = currentEditingSession.getEntry(uri);
 			if (editedFile?.state.get() === WorkingSetEntryState.Modified) {
 				await editorService.openEditor({
 					original: { resource: URI.from(editedFile.originalURI, true) },
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedFileEntry.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedFileEntry.ts
index defe157b7b7fc..a4a893da03062 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedFileEntry.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedFileEntry.ts
@@ -192,6 +192,7 @@ export class ChatEditingModifiedFileEntry extends Disposable implements IModifie
 			telemetryInfo: this._telemetryInfo
 		};
 	}
+
 	restoreFromSnapshot(snapshot: ISnapshotEntry) {
 		this._stateObs.set(snapshot.state, undefined);
 		this.docSnapshot.setValue(snapshot.original);
@@ -258,6 +259,7 @@ export class ChatEditingModifiedFileEntry extends Disposable implements IModifie
 			}
 
 			this._allEditsAreFromUs = false;
+			this._updateDiffInfoSeq(true);
 		}
 
 		if (!this.isCurrentlyBeingModified.get()) {
@@ -271,8 +273,6 @@ export class ChatEditingModifiedFileEntry extends Disposable implements IModifie
 					}
 			}
 		}
-
-		this._updateDiffInfoSeq(!this._isEditFromUs);
 	}
 
 	acceptAgentEdits(textEdits: TextEdit[], isLastEdits: boolean): void {
@@ -347,7 +347,7 @@ export class ChatEditingModifiedFileEntry extends Disposable implements IModifie
 				{ computeMoves: true, ignoreTrimWhitespace: false, maxComputationTimeMs: 3000 },
 				'advanced'
 			),
-			timeout(fast ? 50 : 800) // DON't diff too fast
+			timeout(fast ? 0 : 800) // DON't diff too fast
 		]);
 
 		if (this.docSnapshot.isDisposed() || this.doc.isDisposed()) {
@@ -369,6 +369,7 @@ export class ChatEditingModifiedFileEntry extends Disposable implements IModifie
 		}
 
 		this.docSnapshot.setValue(this.doc.createSnapshot());
+		this._diffInfo.set(nullDocumentDiff, transaction);
 		this._edit = OffsetEdit.empty;
 		this._stateObs.set(WorkingSetEntryState.Accepted, transaction);
 		await this.collapse(transaction);
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingService.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingService.ts
index a4255e29f0d33..73410285c947e 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingService.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingService.ts
@@ -14,6 +14,7 @@ import { ResourceMap } from '../../../../../base/common/map.js';
 import { derived, IObservable, observableValue, runOnChange, ValueWithChangeEventFromObservable } from '../../../../../base/common/observable.js';
 import { compare } from '../../../../../base/common/strings.js';
 import { ThemeIcon } from '../../../../../base/common/themables.js';
+import { isString } from '../../../../../base/common/types.js';
 import { URI } from '../../../../../base/common/uri.js';
 import { TextEdit } from '../../../../../editor/common/languages.js';
 import { ITextModelService } from '../../../../../editor/common/services/resolverService.js';
@@ -23,6 +24,7 @@ import { IFileService } from '../../../../../platform/files/common/files.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 import { bindContextKey } from '../../../../../platform/observable/common/platformObservableUtils.js';
 import { IProgressService, ProgressLocation } from '../../../../../platform/progress/common/progress.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../../platform/storage/common/storage.js';
 import { IWorkbenchAssignmentService } from '../../../../services/assignment/common/assignmentService.js';
 import { IDecorationData, IDecorationsProvider, IDecorationsService } from '../../../../services/decorations/common/decorations.js';
 import { IEditorService } from '../../../../services/editor/common/editorService.js';
@@ -36,6 +38,9 @@ import { IChatService } from '../../common/chatService.js';
 import { ChatEditingSession } from './chatEditingSession.js';
 import { ChatEditingSnapshotTextModelContentProvider, ChatEditingTextModelContentProvider } from './chatEditingTextModelContentProviders.js';
 
+
+const STORAGE_KEY_EDITING_SESSION = 'chat.editingSession';
+
 export class ChatEditingService extends Disposable implements IChatEditingService {
 
 	_serviceBrand: undefined;
@@ -70,6 +75,8 @@ export class ChatEditingService extends Disposable implements IChatEditingServic
 		return this._editingSessionFileLimit ?? defaultChatEditingMaxFileLimit;
 	}
 
+	private _restoringEditingSession: Promise<IChatEditingSession> | undefined;
+
 	private _applyingChatEditsFailedContextKey: IContextKey<boolean | undefined>;
 
 	private _chatRelatedFilesProviders = new Map<number, IChatRelatedFilesProvider>();
@@ -85,7 +92,8 @@ export class ChatEditingService extends Disposable implements IChatEditingServic
 		@IDecorationsService decorationsService: IDecorationsService,
 		@IFileService private readonly _fileService: IFileService,
 		@ILifecycleService private readonly lifecycleService: ILifecycleService,
-		@IWorkbenchAssignmentService private readonly _workbenchAssignmentService: IWorkbenchAssignmentService
+		@IWorkbenchAssignmentService private readonly _workbenchAssignmentService: IWorkbenchAssignmentService,
+		@IStorageService storageService: IStorageService,
 	) {
 		super();
 		this._applyingChatEditsFailedContextKey = applyingChatEditsFailedContextKey.bindTo(contextKeyService);
@@ -142,6 +150,7 @@ export class ChatEditingService extends Disposable implements IChatEditingServic
 		this._register(this.lifecycleService.onWillShutdown((e) => {
 			const session = this._currentSessionObs.get();
 			if (session) {
+				storageService.store(STORAGE_KEY_EDITING_SESSION, session.chatSessionId, StorageScope.WORKSPACE, StorageTarget.MACHINE);
 				e.join(session.storeState(), { id: 'join.chatEditingSession', label: localize('join.chatEditingSession', "Saving chat edits history") });
 			}
 		}));
@@ -151,6 +160,21 @@ export class ChatEditingService extends Disposable implements IChatEditingServic
 			return this._editingSessionFileLimit;
 		});
 		void this._editingSessionFileLimitPromise;
+
+		const sessionIdToRestore = storageService.get(STORAGE_KEY_EDITING_SESSION, StorageScope.WORKSPACE);
+		if (isString(sessionIdToRestore)) {
+			this._restoringEditingSession = this.startOrContinueEditingSession(sessionIdToRestore);
+			this._restoringEditingSession.finally(() => {
+				this._restoringEditingSession = undefined;
+			});
+		}
+	}
+
+	async getOrRestoreEditingSession(): Promise<IChatEditingSession | null> {
+		if (this._restoringEditingSession) {
+			await this._restoringEditingSession;
+		}
+		return this.currentEditingSessionObs.get();
 	}
 
 	getSnapshotUri(id: string, uri: URI) {
@@ -161,37 +185,26 @@ export class ChatEditingService extends Disposable implements IChatEditingServic
 		return session.getSnapshot(id, uri)?.snapshotUri;
 	}
 
-	getEditingSession(resource: URI): IChatEditingSession | null {
-		const session = this.currentEditingSession;
-		if (!session) {
-			return null;
-		}
-		const entries = session.entries.get();
-		for (const entry of entries) {
-			if (entry.modifiedURI.toString() === resource.toString()) {
-				return session;
-			}
-		}
-		return null;
-	}
-
 	override dispose(): void {
 		this._currentSessionObs.get()?.dispose();
 		super.dispose();
 	}
 
 	async startOrContinueEditingSession(chatSessionId: string): Promise<IChatEditingSession> {
+		await this._restoringEditingSession;
+
 		const session = this._currentSessionObs.get();
 		if (session) {
 			if (session.chatSessionId === chatSessionId) {
 				return session;
 			} else if (session.chatSessionId !== chatSessionId) {
-				await session.stop();
+				await session.stop(true);
 			}
 		}
 		return this._createEditingSession(chatSessionId);
 	}
 
+
 	private async _createEditingSession(chatSessionId: string): Promise<IChatEditingSession> {
 		if (this._currentSessionObs.get()) {
 			throw new BugIndicatingError('Cannot have more than one active editing session');
@@ -200,12 +213,11 @@ export class ChatEditingService extends Disposable implements IChatEditingServic
 		this._currentSessionDisposables.clear();
 
 		const session = this._instantiationService.createInstance(ChatEditingSession, chatSessionId, this._editingSessionFileLimitPromise);
+		await session.init();
 
 		// listen for completed responses, run the code mapper and apply the edits to this edit session
 		this._currentSessionDisposables.add(this.installAutoApplyObserver(session));
 
-		await session.restoreState();
-
 		this._currentSessionDisposables.add(session.onDidDispose(() => {
 			this._currentSessionDisposables.clear();
 			this._currentSessionObs.set(null, undefined);
@@ -231,7 +243,7 @@ export class ChatEditingService extends Disposable implements IChatEditingServic
 
 	private installAutoApplyObserver(session: ChatEditingSession): IDisposable {
 
-		const chatModel = this._chatService.getSession(session.chatSessionId);
+		const chatModel = this._chatService.getOrRestoreSession(session.chatSessionId);
 		if (!chatModel) {
 			throw new Error(`Edit session was created for a non-existing chat session: ${session.chatSessionId}`);
 		}
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
index d82246020c116..e0a8c56525b10 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
@@ -8,7 +8,7 @@ import { BugIndicatingError } from '../../../../../base/common/errors.js';
 import { Emitter } from '../../../../../base/common/event.js';
 import { Disposable } from '../../../../../base/common/lifecycle.js';
 import { ResourceMap, ResourceSet } from '../../../../../base/common/map.js';
-import { autorun, derived, IObservable, ITransaction, observableValue, transaction } from '../../../../../base/common/observable.js';
+import { autorun, derived, IObservable, IReader, ITransaction, observableValue, transaction } from '../../../../../base/common/observable.js';
 import { URI } from '../../../../../base/common/uri.js';
 import { isCodeEditor, isDiffEditor } from '../../../../../editor/browser/editorBrowser.js';
 import { IBulkEditService } from '../../../../../editor/browser/services/bulkEditService.js';
@@ -30,7 +30,7 @@ import { IEditorService } from '../../../../services/editor/common/editorService
 import { MultiDiffEditor } from '../../../multiDiffEditor/browser/multiDiffEditor.js';
 import { MultiDiffEditorInput } from '../../../multiDiffEditor/browser/multiDiffEditorInput.js';
 import { ChatAgentLocation, IChatAgentService } from '../../common/chatAgents.js';
-import { ChatEditingSessionChangeType, ChatEditingSessionState, ChatEditKind, IChatEditingSession, WorkingSetDisplayMetadata, WorkingSetEntryRemovalReason, WorkingSetEntryState } from '../../common/chatEditingService.js';
+import { ChatEditingSessionChangeType, ChatEditingSessionState, ChatEditKind, IChatEditingSession, IModifiedFileEntry, WorkingSetDisplayMetadata, WorkingSetEntryRemovalReason, WorkingSetEntryState } from '../../common/chatEditingService.js';
 import { IChatResponseModel } from '../../common/chatModel.js';
 import { ChatEditingMultiDiffSourceResolver } from './chatEditingService.js';
 import { ChatEditingModifiedFileEntry, IModifiedEntryTelemetryInfo, ISnapshotEntry } from './chatEditingModifiedFileEntry.js';
@@ -48,6 +48,7 @@ const STORAGE_CONTENTS_FOLDER = 'contents';
 const STORAGE_STATE_FILE = 'state.json';
 
 export class ChatEditingSession extends Disposable implements IChatEditingSession {
+
 	private readonly _state = observableValue<ChatEditingSessionState>(this, ChatEditingSessionState.Initial);
 	private readonly _linearHistory = observableValue<IChatEditingSessionSnapshot[]>(this, []);
 	private readonly _linearHistoryIndex = observableValue<number>(this, 0);
@@ -140,11 +141,26 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 		@IFileService private readonly _fileService: IFileService,
 		@IFileDialogService private readonly _dialogService: IFileDialogService,
 		@IChatAgentService private readonly _chatAgentService: IChatAgentService,
-		@IEnvironmentService private readonly _environmentService: IEnvironmentService,
-		@ILogService private readonly _logService: ILogService,
 		@IChatService private readonly _chatService: IChatService,
 	) {
 		super();
+	}
+
+	public async init(): Promise<void> {
+		const restoredSessionState = await this._instantiationService.createInstance(ChatEditingSessionStorage, this.chatSessionId).restoreState();
+		if (restoredSessionState) {
+			for (const uri of restoredSessionState.filesToSkipCreating) {
+				this._filesToSkipCreating.add(uri);
+			}
+			for (const [uri, content] of restoredSessionState.initialFileContents) {
+				this._initialFileContents.set(uri, content);
+			}
+			this._pendingSnapshot = restoredSessionState.pendingSnapshot;
+			await this._restoreSnapshot(restoredSessionState.recentSnapshot);
+			this._linearHistoryIndex.set(restoredSessionState.linearHistoryIndex, undefined);
+			this._linearHistory.set(restoredSessionState.linearHistory, undefined);
+			this._state.set(ChatEditingSessionState.Idle, undefined);
+		}
 
 		// Add the currently active editors to the working set
 		this._trackCurrentEditorsInWorkingSet();
@@ -158,7 +174,27 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 			});
 			this._onDidChange.fire(ChatEditingSessionChangeType.WorkingSet);
 		}));
+	}
+
+	public getEntry(uri: URI): IModifiedFileEntry | undefined {
+		return this._entriesObs.get().find(e => isEqual(e.modifiedURI, uri));
+	}
 
+	public readEntry(uri: URI, reader: IReader | undefined): IModifiedFileEntry | undefined {
+		return this._entriesObs.read(reader).find(e => isEqual(e.modifiedURI, uri));
+	}
+
+	public storeState(): Promise<void> {
+		const storage = this._instantiationService.createInstance(ChatEditingSessionStorage, this.chatSessionId);
+		const state: StoredSessionState = {
+			filesToSkipCreating: [...this._filesToSkipCreating],
+			initialFileContents: this._initialFileContents,
+			pendingSnapshot: this._pendingSnapshot,
+			recentSnapshot: this._createSnapshot(undefined),
+			linearHistoryIndex: this._linearHistoryIndex.get(),
+			linearHistory: this._linearHistory.get(),
+		};
+		return storage.storeState(state);
 	}
 
 	private _trackCurrentEditorsInWorkingSet(e?: IEditorCloseEvent) {
@@ -404,11 +440,14 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 
 	private stopPromise: Promise<void> | undefined;
 
-	async stop(): Promise<void> {
+	async stop(clearState = false): Promise<void> {
 		if (!this.stopPromise) {
 			this.stopPromise = this._performStop();
 		}
 		await this.stopPromise;
+		if (clearState) {
+			await this._instantiationService.createInstance(ChatEditingSessionStorage, this.chatSessionId).clearState();
+		}
 	}
 
 	async _performStop(): Promise<void> {
@@ -423,9 +462,6 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 			});
 		}));
 
-		// delete the persisted editing session state
-		await this._clearState();
-
 		if (this._state.get() !== ChatEditingSessionState.Disposed) {
 			// session got disposed while we were closing editors and clearing state
 			this.dispose();
@@ -637,13 +673,32 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 				?.collapsed.set(true, transaction);
 		}
 	}
+}
+
+interface StoredSessionState {
+	readonly filesToSkipCreating: URI[];
+	readonly initialFileContents: ResourceMap<string>;
+	readonly pendingSnapshot?: IChatEditingSessionSnapshot;
+	readonly recentSnapshot: IChatEditingSessionSnapshot;
+	readonly linearHistoryIndex: number;
+	readonly linearHistory: IChatEditingSessionSnapshot[];
+}
+
+class ChatEditingSessionStorage {
+	constructor(
+		private readonly chatSessionId: string,
+		@IFileService private readonly _fileService: IFileService,
+		@IEnvironmentService private readonly _environmentService: IEnvironmentService,
+		@ILogService private readonly _logService: ILogService,
+		@IWorkspaceContextService private readonly _workspaceContextService: IWorkspaceContextService,
+	) { }
 
 	private _getStorageLocation(): URI {
 		const workspaceId = this._workspaceContextService.getWorkspace().id;
 		return joinPath(this._environmentService.workspaceStorageHome, workspaceId, 'chatEditingSessions', this.chatSessionId);
 	}
 
-	public async restoreState(): Promise<boolean> {
+	public async restoreState(): Promise<StoredSessionState | undefined> {
 		const storageLocation = this._getStorageLocation();
 		const getFileContent = (hash: string) => {
 			return this._fileService.readFile(joinPath(storageLocation, STORAGE_CONTENTS_FOLDER, hash)).then(content => content.value.toString());
@@ -682,39 +737,40 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 			const stateFilePath = joinPath(storageLocation, STORAGE_STATE_FILE);
 			if (! await this._fileService.exists(stateFilePath)) {
 				this._logService.debug(`chatEditingSession: No editing session state found at ${stateFilePath.toString()}`);
-				return false;
+				return undefined;
 			}
 			this._logService.debug(`chatEditingSession: Restoring editing session at ${stateFilePath.toString()}`);
 			const stateFileContent = await this._fileService.readFile(stateFilePath);
 			const data = JSON.parse(stateFileContent.value.toString()) as IChatEditingSessionDTO;
 			if (data.version !== STORAGE_VERSION) {
-				return false;
+				return undefined;
 			}
 
-			this._filesToSkipCreating.clear();
-			this._initialFileContents.clear();
+			const linearHistory = await Promise.all(data.linearHistory.map(deserializeChatEditingSessionSnapshot));
+			const filesToSkipCreating = data.filesToSkipCreating.map((uriStr: string) => URI.parse(uriStr));
 
-			const snapshotsFromHistory = await Promise.all(data.linearHistory.map(deserializeChatEditingSessionSnapshot));
-			data.filesToSkipCreating.forEach((uriStr: string) => {
-				this._filesToSkipCreating.add(URI.parse(uriStr));
-			});
+			const initialFileContents = new ResourceMap<string>();
 			for (const fileContentDTO of data.initialFileContents) {
-				this._initialFileContents.set(URI.parse(fileContentDTO[0]), await getFileContent(fileContentDTO[1]));
+				initialFileContents.set(URI.parse(fileContentDTO[0]), await getFileContent(fileContentDTO[1]));
 			}
-			this._pendingSnapshot = data.pendingSnapshot ? await deserializeChatEditingSessionSnapshot(data.pendingSnapshot) : undefined;
-			this._restoreSnapshot(await deserializeChatEditingSessionSnapshot(data.recentSnapshot));
-			this._linearHistoryIndex.set(data.linearHistoryIndex, undefined);
-			this._linearHistory.set(snapshotsFromHistory, undefined);
-			this._state.set(ChatEditingSessionState.Idle, undefined);
-			this._updateRequestHiddenState();
-			return true;
+			const pendingSnapshot = data.pendingSnapshot ? await deserializeChatEditingSessionSnapshot(data.pendingSnapshot) : undefined;
+			const recentSnapshot = await deserializeChatEditingSessionSnapshot(data.recentSnapshot);
+
+			return {
+				filesToSkipCreating,
+				initialFileContents,
+				pendingSnapshot,
+				recentSnapshot,
+				linearHistoryIndex: data.linearHistoryIndex,
+				linearHistory
+			};
 		} catch (e) {
 			this._logService.error(`Error restoring chat editing session from ${storageLocation.toString()}`, e);
 		}
-		return false;
+		return undefined;
 	}
 
-	public async storeState(): Promise<void> {
+	public async storeState(state: StoredSessionState): Promise<void> {
 		const storageFolder = this._getStorageLocation();
 		const contentsFolder = URI.joinPath(storageFolder, STORAGE_CONTENTS_FOLDER);
 
@@ -774,12 +830,12 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 			const data = {
 				version: STORAGE_VERSION,
 				sessionId: this.chatSessionId,
-				linearHistory: this._linearHistory.get().map(serializeChatEditingSessionSnapshot),
-				linearHistoryIndex: this._linearHistoryIndex.get(),
-				initialFileContents: serializeResourceMap(this._initialFileContents, value => addFileContent(value)),
-				pendingSnapshot: this._pendingSnapshot ? serializeChatEditingSessionSnapshot(this._pendingSnapshot) : undefined,
-				recentSnapshot: serializeChatEditingSessionSnapshot(this._createSnapshot(undefined)),
-				filesToSkipCreating: Array.from(this._filesToSkipCreating.keys()).map(uri => uri.toString()),
+				linearHistory: state.linearHistory.map(serializeChatEditingSessionSnapshot),
+				linearHistoryIndex: state.linearHistoryIndex,
+				initialFileContents: serializeResourceMap(state.initialFileContents, value => addFileContent(value)),
+				pendingSnapshot: state.pendingSnapshot ? serializeChatEditingSessionSnapshot(state.pendingSnapshot) : undefined,
+				recentSnapshot: serializeChatEditingSessionSnapshot(state.recentSnapshot),
+				filesToSkipCreating: state.filesToSkipCreating.map(uri => uri.toString()),
 			} satisfies IChatEditingSessionDTO;
 
 			this._logService.debug(`chatEditingSession: Storing editing session at ${storageFolder.toString()}: ${fileContents.size} files`);
@@ -790,21 +846,22 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 
 			await this._fileService.writeFile(joinPath(storageFolder, STORAGE_STATE_FILE), VSBuffer.fromString(JSON.stringify(data, undefined, 2)));
 		} catch (e) {
-			this._logService.error(`Error storing chat editing session to ${storageFolder.toString()}`, e);
+			this._logService.debug(`Error storing chat editing session to ${storageFolder.toString()}`, e);
 		}
 	}
 
-	private async _clearState(): Promise<void> {
+	public async clearState(): Promise<void> {
 		const storageFolder = this._getStorageLocation();
 		if (await this._fileService.exists(storageFolder)) {
 			this._logService.debug(`chatEditingSession: Clearing editing session at ${storageFolder.toString()}`);
 			try {
 				await this._fileService.del(storageFolder, { recursive: true });
 			} catch (e) {
-				this._logService.info(`Error clearing chat editing session from ${storageFolder.toString()}`, e);
+				this._logService.debug(`Error clearing chat editing session from ${storageFolder.toString()}`, e);
 			}
 		}
 	}
+
 }
 
 export interface IChatEditingSessionSnapshot {
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditorActions.ts b/src/vs/workbench/contrib/chat/browser/chatEditorActions.ts
index 16aa746bdd36b..a95f045cd1b54 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditorActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditorActions.ts
@@ -159,7 +159,7 @@ abstract class AcceptDiscardAction extends Action2 {
 			return;
 		}
 
-		const session = chatEditingService.getEditingSession(uri);
+		const session = chatEditingService.currentEditingSession;
 		if (!session) {
 			return;
 		}
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditorController.ts b/src/vs/workbench/contrib/chat/browser/chatEditorController.ts
index 7ee423ec280de..e0c26c8f9ebe8 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditorController.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditorController.ts
@@ -7,7 +7,6 @@ import './media/chatEditorController.css';
 import { getTotalWidth } from '../../../../base/browser/dom.js';
 import { Disposable, DisposableStore, dispose, toDisposable } from '../../../../base/common/lifecycle.js';
 import { autorun, derived, IObservable, observableFromEvent, observableValue } from '../../../../base/common/observable.js';
-import { isEqual } from '../../../../base/common/resources.js';
 import { themeColorFromId } from '../../../../base/common/themables.js';
 import { ICodeEditor, IOverlayWidget, IOverlayWidgetPosition, IOverlayWidgetPositionCoordinates, IViewZone, MouseTargetType } from '../../../../editor/browser/editorBrowser.js';
 import { LineSource, renderLines, RenderOptions } from '../../../../editor/browser/widget/diffEditor/components/diffEditorViewZones/renderLines.js';
@@ -86,7 +85,7 @@ export class ChatEditorController extends Disposable implements IEditorContribut
 			const model = modelObs.read(r);
 
 			const session = this._chatEditingService.currentEditingSessionObs.read(r);
-			const entry = session?.entries.read(r).find(e => isEqual(e.modifiedURI, model?.uri));
+			const entry = model?.uri ? session?.readEntry(model.uri, r) : undefined;
 
 			if (!entry || entry.state.read(r) !== WorkingSetEntryState.Modified) {
 				this._clearRendering();
@@ -106,7 +105,9 @@ export class ChatEditorController extends Disposable implements IEditorContribut
 			if (!value || value.state.read(r) !== ChatEditingSessionState.StreamingEdits) {
 				return false;
 			}
-			return value.entries.read(r).some(e => isEqual(e.modifiedURI, this._editor.getModel()?.uri));
+
+			const model = modelObs.read(r);
+			return model ? value.readEntry(model.uri, r) : undefined;
 		});
 
 
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditorSaving.ts b/src/vs/workbench/contrib/chat/browser/chatEditorSaving.ts
index 4d0728bc076a6..b0b078d75e242 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditorSaving.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditorSaving.ts
@@ -8,10 +8,9 @@ import { Codicon } from '../../../../base/common/codicons.js';
 import { CancellationError } from '../../../../base/common/errors.js';
 import { Iterable } from '../../../../base/common/iterator.js';
 import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
-import { Disposable, DisposableMap, DisposableStore, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import { Disposable, DisposableStore, MutableDisposable } from '../../../../base/common/lifecycle.js';
 import { ResourceSet } from '../../../../base/common/map.js';
-import { autorunWithStore } from '../../../../base/common/observable.js';
-import { isEqual } from '../../../../base/common/resources.js';
+import { autorun, autorunWithStore } from '../../../../base/common/observable.js';
 import { assertType } from '../../../../base/common/types.js';
 import { URI } from '../../../../base/common/uri.js';
 import { ServicesAccessor } from '../../../../editor/browser/editorExtensions.js';
@@ -22,26 +21,97 @@ import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextke
 import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
 import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { ILabelService } from '../../../../platform/label/common/label.js';
+import { observableConfigValue } from '../../../../platform/observable/common/platformObservableUtils.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
 import { IWorkbenchContribution } from '../../../common/contributions.js';
 import { IEditorIdentifier, SaveReason } from '../../../common/editor.js';
 import { IEditorService } from '../../../services/editor/common/editorService.js';
 import { IFilesConfigurationService } from '../../../services/filesConfiguration/common/filesConfigurationService.js';
+import { ILifecycleService } from '../../../services/lifecycle/common/lifecycle.js';
 import { ITextFileService } from '../../../services/textfile/common/textfiles.js';
 import { ChatAgentLocation, IChatAgentService } from '../common/chatAgents.js';
 import { ChatContextKeys } from '../common/chatContextKeys.js';
-import { applyingChatEditsFailedContextKey, CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME, hasUndecidedChatEditingResourceContextKey, IChatEditingService, IChatEditingSession, IModifiedFileEntry, WorkingSetEntryState } from '../common/chatEditingService.js';
+import { applyingChatEditsFailedContextKey, CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME, hasUndecidedChatEditingResourceContextKey, IChatEditingService, IModifiedFileEntry, WorkingSetEntryState } from '../common/chatEditingService.js';
 import { IChatModel } from '../common/chatModel.js';
 import { IChatService } from '../common/chatService.js';
 import { ChatEditingModifiedFileEntry } from './chatEditing/chatEditingModifiedFileEntry.js';
 
+
+const STORAGE_KEY_AUTOSAVE_DISABLED = 'chat.editing.autosaveDisabled';
+
+export class ChatEditorAutoSaveDisabler extends Disposable implements IWorkbenchContribution {
+
+	static readonly ID: string = 'workbench.chat.autoSaveDisabler';
+
+	private _autosaveDisabledUris: string[] = [];
+
+	constructor(
+		@IConfigurationService configService: IConfigurationService,
+		@IChatEditingService chatEditingService: IChatEditingService,
+		@IFilesConfigurationService fileConfigService: IFilesConfigurationService,
+		@ILifecycleService lifecycleService: ILifecycleService,
+		@IStorageService storageService: IStorageService
+	) {
+		super();
+
+		// on shutdown remember all files that have auto save disabled
+		this._store.add(lifecycleService.onWillShutdown((e) => {
+			storageService.store(STORAGE_KEY_AUTOSAVE_DISABLED, this._autosaveDisabledUris, StorageScope.WORKSPACE, StorageTarget.MACHINE);
+		}));
+
+		const alwaysSaveConfig = observableConfigValue<boolean>(ChatEditorSaving._config, false, configService);
+
+		// as quickly as possible disable auto save for all files that were modified before the last shutdown
+		if (!alwaysSaveConfig.get()) {
+			const autoSaveDisabled = storageService.getObject<string[]>(STORAGE_KEY_AUTOSAVE_DISABLED, StorageScope.WORKSPACE, []);
+			if (Array.isArray(autoSaveDisabled) && autoSaveDisabled.length > 0) {
+
+				const initializingStore = new DisposableStore();
+				for (const uriString of autoSaveDisabled) {
+					initializingStore.add(fileConfigService.disableAutoSave(URI.parse(uriString)));
+				}
+				chatEditingService.getOrRestoreEditingSession().finally(() => {
+					// by now the session is restored and the auto save handlers are in place
+					initializingStore.dispose();
+				});
+
+			}
+		}
+
+		// listen to session changes and update auto save settings accordingly
+		const saveConfig = this._store.add(new MutableDisposable());
+		autorun(reader => {
+			const store = new DisposableStore();
+			const autoSaveDisabled = [];
+			try {
+				if (alwaysSaveConfig.read(reader)) {
+					return;
+				}
+				const session = chatEditingService.currentEditingSessionObs.read(reader);
+				if (session) {
+					const entries = session.entries.read(reader);
+					for (const entry of entries) {
+						if (entry.state.read(reader) === WorkingSetEntryState.Modified) {
+							autoSaveDisabled.push(entry.modifiedURI.toString());
+							store.add(fileConfigService.disableAutoSave(entry.modifiedURI));
+						}
+					}
+				}
+			} finally {
+				saveConfig.value = store; // disposes the previous store, after we have added the new one
+				this._autosaveDisabledUris = autoSaveDisabled;
+			}
+		});
+	}
+}
+
+
 export class ChatEditorSaving extends Disposable implements IWorkbenchContribution {
 
 	static readonly ID: string = 'workbench.chat.editorSaving';
 
 	static readonly _config = 'chat.editing.alwaysSaveWithGeneratedChanges';
 
-	private readonly _sessionStore = this._store.add(new DisposableMap<IChatEditingSession>());
-
 	constructor(
 		@IConfigurationService configService: IConfigurationService,
 		@IChatEditingService chatEditingService: IChatEditingService,
@@ -50,7 +120,6 @@ export class ChatEditorSaving extends Disposable implements IWorkbenchContributi
 		@ILabelService labelService: ILabelService,
 		@IDialogService dialogService: IDialogService,
 		@IChatService private readonly _chatService: IChatService,
-		@IFilesConfigurationService private readonly _fileConfigService: IFilesConfigurationService,
 	) {
 		super();
 
@@ -64,10 +133,8 @@ export class ChatEditorSaving extends Disposable implements IWorkbenchContributi
 			if (!chatSession) {
 				return;
 			}
-			const entries = session.entries.read(r);
-
 			store.add(textFileService.files.onDidSave(e => {
-				const entry = entries.find(entry => isEqual(entry.modifiedURI, e.model.resource));
+				const entry = session.getEntry(e.model.resource);
 				if (entry && entry.state.get() === WorkingSetEntryState.Modified) {
 					this._reportSavedWhenReady(chatSession, entry);
 				}
@@ -85,10 +152,6 @@ export class ChatEditorSaving extends Disposable implements IWorkbenchContributi
 				return;
 			}
 
-			if (chatEditingService.currentEditingSession) {
-				this._handleNewEditingSession(chatEditingService.currentEditingSession, store);
-			}
-
 			const saveJobs = new class {
 
 				private _deferred?: DeferredPromise<void>;
@@ -151,7 +214,6 @@ export class ChatEditorSaving extends Disposable implements IWorkbenchContributi
 				}
 			};
 
-			store.add(chatEditingService.onDidCreateEditingSession(e => this._handleNewEditingSession(e, store)));
 			store.add(textFileService.files.addSaveParticipant({
 				participate: async (workingCopy, context, progress, token) => {
 
@@ -161,16 +223,16 @@ export class ChatEditorSaving extends Disposable implements IWorkbenchContributi
 						return;
 					}
 
-					const session = chatEditingService.getEditingSession(workingCopy.resource);
+					const session = await chatEditingService.getOrRestoreEditingSession();
 					if (!session) {
 						return;
 					}
-
-					if (!session.entries.get().find(e => e.state.get() === WorkingSetEntryState.Modified && e.modifiedURI.toString() === workingCopy.resource.toString())) {
+					const entry = session.getEntry(workingCopy.resource);
+					if (!entry || entry.state.get() !== WorkingSetEntryState.Modified) {
 						return;
 					}
 
-					return saveJobs.add(workingCopy.resource);
+					return saveJobs.add(entry.modifiedURI);
 				}
 			}));
 		};
@@ -211,38 +273,6 @@ export class ChatEditorSaving extends Disposable implements IWorkbenchContributi
 		});
 		this._store.add(d);
 	}
-
-	private _handleNewEditingSession(session: IChatEditingSession, container: DisposableStore) {
-
-		const store = new DisposableStore();
-		container.add(store);
-
-		// disable auto save for those files involved in editing
-		const saveConfig = store.add(new MutableDisposable());
-		const update = () => {
-			const store = new DisposableStore();
-			const entries = session.entries.get();
-			for (const entry of entries) {
-				if (entry.state.get() === WorkingSetEntryState.Modified) {
-					store.add(this._fileConfigService.disableAutoSave(entry.modifiedURI));
-				}
-			}
-			saveConfig.value = store;
-		};
-
-		update();
-
-		this._sessionStore.set(session, store);
-
-		store.add(session.onDidChange(() => {
-			update();
-		}));
-
-		store.add(session.onDidDispose(() => {
-			store.dispose();
-			container.delete(store);
-		}));
-	}
 }
 
 export class ChatEditingSaveAllAction extends Action2 {
diff --git a/src/vs/workbench/contrib/chat/browser/chatInlineAnchorWidget.ts b/src/vs/workbench/contrib/chat/browser/chatInlineAnchorWidget.ts
index e38cd46e3052b..e74cab4ab0c33 100644
--- a/src/vs/workbench/contrib/chat/browser/chatInlineAnchorWidget.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatInlineAnchorWidget.ts
@@ -123,7 +123,7 @@ export class InlineAnchorWidget extends Disposable {
 				});
 			}));
 
-			this._store.add(instantiationService.invokeFunction(accessor => hookUpSymbolAttachmentDragAndContextMenu(accessor, element, contextKeyService, { value: symbol.location, name: symbol.name }, MenuId.ChatInlineSymbolAnchorContext)));
+			this._store.add(instantiationService.invokeFunction(accessor => hookUpSymbolAttachmentDragAndContextMenu(accessor, element, contextKeyService, { value: symbol.location, name: symbol.name, kind: symbol.kind }, MenuId.ChatInlineSymbolAnchorContext)));
 		} else {
 			location = this.data;
 
diff --git a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
index 3f3fea37900b3..330f320c3947c 100644
--- a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
@@ -62,6 +62,7 @@ import { IHoverService } from '../../../../platform/hover/browser/hover.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
 import { WorkbenchList } from '../../../../platform/list/browser/listService.js';
 import { ILogService } from '../../../../platform/log/common/log.js';
 import { INotificationService } from '../../../../platform/notification/common/notification.js';
@@ -281,6 +282,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		@IThemeService private readonly themeService: IThemeService,
 		@ITextModelService private readonly textModelResolverService: ITextModelService,
 		@IStorageService private readonly storageService: IStorageService,
+		@ILabelService private readonly labelService: ILabelService,
 	) {
 		super();
 
@@ -799,8 +801,8 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 
 			let ariaLabel: string | undefined;
 
-			const resource = 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;
+			let resource = 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;
+			let range = attachment.value && typeof attachment.value === 'object' && 'range' in attachment.value && Range.isIRange(attachment.value.range) ? attachment.value.range : undefined;
 			if (resource && (attachment.isFile || attachment.isDirectory)) {
 				const fileBasename = basename(resource.path);
 				const fileDirname = dirname(resource.path);
@@ -820,7 +822,11 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 				});
 
 				this.attachButtonAndDisposables(widget, index, attachment, hoverDelegate);
-				store.add(this.instantiationService.invokeFunction(accessor => hookUpResourceAttachmentDragAndContextMenu(accessor, widget, resource)));
+				this.instantiationService.invokeFunction(accessor => {
+					if (resource) {
+						store.add(hookUpResourceAttachmentDragAndContextMenu(accessor, widget, resource));
+					}
+				});
 
 			} else if (attachment.isImage) {
 				ariaLabel = localize('chat.imageAttachment', "Attached image, {0}", attachment.name);
@@ -859,20 +865,33 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 			} else if (isPasteVariableEntry(attachment)) {
 				ariaLabel = localize('chat.attachment', "Attached context, {0}", attachment.name);
 
+				const classNames = ['file-icon', `${attachment.language}-lang-file-icon`];
+				if (attachment.copiedFrom) {
+					resource = attachment.copiedFrom.uri;
+					range = attachment.copiedFrom.range;
+					const filename = basename(resource.path);
+					label.setLabel(filename, undefined, { extraClasses: classNames });
+				} else {
+					label.setLabel(attachment.fileName, undefined, { extraClasses: classNames });
+				}
+				widget.appendChild(dom.$('span.attachment-additional-info', {}, `Pasted ${attachment.pastedLines}`));
+
+				widget.style.position = 'relative';
+
 				const hoverContent: IManagedHoverTooltipMarkdownString = {
 					markdown: {
-						value: `\`\`\`${attachment.language}\n${attachment.code}\n\`\`\``,
+						value: `**${attachment.copiedFrom ? this.labelService.getUriLabel(attachment.copiedFrom.uri, { relative: true }) : attachment.fileName}**\n\n---\n\n\`\`\`${attachment.language}\n${attachment.code}\n\`\`\``,
 					},
 					markdownNotSupportedFallback: attachment.code,
 				};
-
-				const classNames = ['file-icon', `${attachment.language}-lang-file-icon`];
-				label.setLabel(attachment.fileName, undefined, { extraClasses: classNames });
-				widget.appendChild(dom.$('span.attachment-additional-info', {}, `Pasted ${attachment.pastedLines}`));
-
-				widget.style.position = 'relative';
 				store.add(this.hoverService.setupManagedHover(hoverDelegate, widget, hoverContent, { trapFocus: true }));
 				this.attachButtonAndDisposables(widget, index, attachment, hoverDelegate);
+
+				const copiedFromResource = attachment.copiedFrom?.uri;
+				if (copiedFromResource) {
+					store.add(this.instantiationService.invokeFunction(accessor => hookUpResourceAttachmentDragAndContextMenu(accessor, widget, copiedFromResource)));
+				}
+
 			} else {
 				const attachmentLabel = attachment.fullName ?? attachment.name;
 				const withIcon = attachment.icon?.id ? `$(${attachment.icon.id}) ${attachmentLabel}` : attachmentLabel;
@@ -885,7 +904,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 
 			if (attachment.kind === 'symbol') {
 				const scopedContextKeyService = store.add(this.contextKeyService.createScoped(widget));
-				store.add(this.instantiationService.invokeFunction(accessor => hookUpSymbolAttachmentDragAndContextMenu(accessor, widget, scopedContextKeyService, attachment, MenuId.ChatInputSymbolAttachmentContext)));
+				store.add(this.instantiationService.invokeFunction(accessor => hookUpSymbolAttachmentDragAndContextMenu(accessor, widget, scopedContextKeyService, { ...attachment, kind: attachment.symbolKind }, MenuId.ChatInputSymbolAttachmentContext)));
 			}
 
 			await Promise.all(attachmentInitPromises);
@@ -1205,7 +1224,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 				if (e.element?.kind === 'reference' && URI.isUri(e.element.reference)) {
 					const modifiedFileUri = e.element.reference;
 
-					const entry = chatEditingSession.entries.get().find(entry => entry.modifiedURI.toString() === modifiedFileUri.toString());
+					const entry = chatEditingSession.getEntry(modifiedFileUri);
 					const diffInfo = entry?.diffInfo.get();
 					const range = diffInfo?.changes.at(0)?.modified.toExclusiveRange();
 
diff --git a/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts b/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts
index c80aaadddfd66..38223be2d89fa 100644
--- a/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts
@@ -53,6 +53,7 @@ import { CodeBlockModelCollection } from '../common/codeBlockModelCollection.js'
 import { MarkUnhelpfulActionId } from './actions/chatTitleActions.js';
 import { ChatTreeItem, IChatCodeBlockInfo, IChatFileTreeInfo, IChatListItemRendererOptions, IChatWidgetService } from './chat.js';
 import { ChatAgentHover, getChatAgentHoverOptions } from './chatAgentHover.js';
+import { ChatAgentCommandContentPart } from './chatContentParts/chatAgentCommandContentPart.js';
 import { ChatAttachmentsContentPart } from './chatContentParts/chatAttachmentsContentPart.js';
 import { ChatCodeCitationContentPart } from './chatContentParts/chatCodeCitationContentPart.js';
 import { ChatCommandButtonContentPart } from './chatContentParts/chatCommandContentPart.js';
@@ -123,8 +124,8 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 	protected readonly _onDidClickFollowup = this._register(new Emitter<IChatFollowup>());
 	readonly onDidClickFollowup: Event<IChatFollowup> = this._onDidClickFollowup.event;
 
-	private readonly _onDidClickRerunWithAgentOrCommandDetection = new Emitter<IChatResponseViewModel>();
-	readonly onDidClickRerunWithAgentOrCommandDetection: Event<IChatResponseViewModel> = this._onDidClickRerunWithAgentOrCommandDetection.event;
+	private readonly _onDidClickRerunWithAgentOrCommandDetection = new Emitter<{ sessionId: string; requestId: string }>();
+	readonly onDidClickRerunWithAgentOrCommandDetection: Event<{ sessionId: string; requestId: string }> = this._onDidClickRerunWithAgentOrCommandDetection.event;
 
 	protected readonly _onDidChangeItemHeight = this._register(new Emitter<IItemHeightChangeParams>());
 	readonly onDidChangeItemHeight: Event<IItemHeightChangeParams> = this._onDidChangeItemHeight.event;
@@ -531,6 +532,17 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 				};
 				const newPart = this.renderChatContentPart(data, templateData, context);
 				if (newPart) {
+
+					if (this.rendererOptions.renderDetectedCommandsWithRequest
+						&& isRequestVM(element) && element.agentOrSlashCommandDetected && element.slashCommand
+						&& data.kind === 'markdownContent' // TODO this is fishy but I didn't find a better way to render on the same inline as the MD request part
+					) {
+						newPart.domNode.style.display = 'inline-flex';
+						const cmdPart = this.instantiationService.createInstance(ChatAgentCommandContentPart, element.slashCommand, () => this._onDidClickRerunWithAgentOrCommandDetection.fire({ sessionId: element.sessionId, requestId: element.id }));
+						templateData.value.appendChild(cmdPart.domNode);
+						parts.push(cmdPart);
+					}
+
 					templateData.value.appendChild(newPart.domNode);
 					parts.push(newPart);
 				}
diff --git a/src/vs/workbench/contrib/chat/browser/chatPasteProviders.ts b/src/vs/workbench/contrib/chat/browser/chatPasteProviders.ts
index 62350a6cb09d3..d8b2d668bca11 100644
--- a/src/vs/workbench/contrib/chat/browser/chatPasteProviders.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatPasteProviders.ts
@@ -15,13 +15,20 @@ import { ChatInputPart } from './chatInputPart.js';
 import { IChatWidgetService } from './chat.js';
 import { Codicon } from '../../../../base/common/codicons.js';
 import { localize } from '../../../../nls.js';
-import { IChatRequestVariableEntry } from '../common/chatModel.js';
+import { IChatRequestPasteVariableEntry, IChatRequestVariableEntry } from '../common/chatModel.js';
 import { IExtensionService, isProposedApiEnabled } from '../../../services/extensions/common/extensions.js';
 import { Mimes } from '../../../../base/common/mime.js';
-import { URI } from '../../../../base/common/uri.js';
+import { IModelService } from '../../../../editor/common/services/model.js';
+import { URI, UriComponents } from '../../../../base/common/uri.js';
+import { basename } from '../../../../base/common/resources.js';
 
 const COPY_MIME_TYPES = 'application/vnd.code.additional-editor-data';
 
+interface SerializedCopyData {
+	readonly uri: UriComponents;
+	readonly range: IRange;
+}
+
 export class PasteImageProvider implements DocumentPasteEditProvider {
 
 	public readonly kind = new HierarchicalKind('chat.attach.image');
@@ -149,9 +156,10 @@ export class CopyTextProvider implements DocumentPasteEditProvider {
 		if (model.uri.scheme === ChatInputPart.INPUT_SCHEME) {
 			return;
 		}
+
 		const customDataTransfer = new VSDataTransfer();
-		const rangesString = JSON.stringify({ ranges: ranges[0], uri: model.uri.toString() });
-		customDataTransfer.append(COPY_MIME_TYPES, createStringDataTransferItem(rangesString));
+		const data: SerializedCopyData = { range: ranges[0], uri: model.uri.toJSON() };
+		customDataTransfer.append(COPY_MIME_TYPES, createStringDataTransferItem(JSON.stringify(data)));
 		return customDataTransfer;
 	}
 }
@@ -165,7 +173,8 @@ export class PasteTextProvider implements DocumentPasteEditProvider {
 	public readonly pasteMimeTypes = [COPY_MIME_TYPES];
 
 	constructor(
-		private readonly chatWidgetService: IChatWidgetService
+		private readonly chatWidgetService: IChatWidgetService,
+		private readonly modelService: IModelService
 	) { }
 
 	async provideDocumentPasteEdits(model: ITextModel, ranges: readonly IRange[], dataTransfer: IReadonlyVSDataTransfer, context: DocumentPasteContext, token: CancellationToken): Promise<DocumentPasteEditsSession | undefined> {
@@ -182,14 +191,29 @@ export class PasteTextProvider implements DocumentPasteEditProvider {
 
 		const textdata = await text.asString();
 		const metadata = JSON.parse(await editorData.asString());
-		const additionalData = JSON.parse(await additionalEditorData.asString());
+		const additionalData: SerializedCopyData = JSON.parse(await additionalEditorData.asString());
 
 		const widget = this.chatWidgetService.getWidgetByInputUri(model.uri);
 		if (!widget) {
 			return;
 		}
 
-		const copiedContext = await getCopiedContext(textdata, additionalData.uri, metadata.mode, additionalData.ranges);
+		const start = additionalData.range.startLineNumber;
+		const end = additionalData.range.endLineNumber;
+		if (start === end) {
+			const textModel = this.modelService.getModel(URI.revive(additionalData.uri));
+			if (!textModel) {
+				return;
+			}
+
+			// If copied line text data is the entire line content, then we can paste it as a code attachment. Otherwise, we ignore and use default paste provider.
+			const lineContent = textModel.getLineContent(start);
+			if (lineContent !== textdata) {
+				return;
+			}
+		}
+
+		const copiedContext = getCopiedContext(textdata, URI.revive(additionalData.uri), metadata.mode, additionalData.range);
 
 		if (token.isCancellationRequested || !copiedContext) {
 			return;
@@ -204,25 +228,29 @@ export class PasteTextProvider implements DocumentPasteEditProvider {
 	}
 }
 
-async function getCopiedContext(code: string, file: string, language: string, ranges: IRange): Promise<IChatRequestVariableEntry | undefined> {
-	const fileName = file.split('/').pop() || 'unknown file';
-	const start = ranges.startLineNumber;
-	const end = ranges.endLineNumber;
+function getCopiedContext(code: string, file: URI, language: string, range: IRange): IChatRequestPasteVariableEntry {
+	const fileName = basename(file);
+	const start = range.startLineNumber;
+	const end = range.endLineNumber;
 	const resultText = `Copied Selection of Code: \n\n\n From the file: ${fileName} From lines ${start} to ${end} \n \`\`\`${code}\`\`\``;
 	const pastedLines = start === end ? localize('pastedAttachment.oneLine', '1 line') : localize('pastedAttachment.multipleLines', '{0} lines', end + 1 - start);
 	return {
 		kind: 'paste',
 		value: resultText,
-		id: `${fileName}${start}${end}${ranges.startColumn}${ranges.endColumn}`,
+		id: `${fileName}${start}${end}${range.startColumn}${range.endColumn}`,
 		name: `${fileName} ${pastedLines}`,
 		icon: Codicon.code,
 		isDynamic: true,
 		pastedLines,
 		language,
-		fileName,
+		fileName: file.toString(),
+		copiedFrom: {
+			uri: file,
+			range
+		},
 		code,
 		references: [{
-			reference: URI.parse(file),
+			reference: file,
 			kind: 'reference'
 		}]
 	};
@@ -264,11 +292,12 @@ export class ChatPasteProvidersFeature extends Disposable {
 	constructor(
 		@ILanguageFeaturesService languageFeaturesService: ILanguageFeaturesService,
 		@IChatWidgetService chatWidgetService: IChatWidgetService,
-		@IExtensionService extensionService: IExtensionService
+		@IExtensionService extensionService: IExtensionService,
+		@IModelService modelService: IModelService
 	) {
 		super();
 		this._register(languageFeaturesService.documentPasteEditProvider.register({ scheme: ChatInputPart.INPUT_SCHEME, pattern: '*', hasAccessToAllModels: true }, new PasteImageProvider(chatWidgetService, extensionService)));
-		this._register(languageFeaturesService.documentPasteEditProvider.register({ scheme: ChatInputPart.INPUT_SCHEME, pattern: '*', hasAccessToAllModels: true }, new PasteTextProvider(chatWidgetService)));
+		this._register(languageFeaturesService.documentPasteEditProvider.register({ scheme: ChatInputPart.INPUT_SCHEME, pattern: '*', hasAccessToAllModels: true }, new PasteTextProvider(chatWidgetService, modelService)));
 		this._register(languageFeaturesService.documentPasteEditProvider.register('*', new CopyTextProvider()));
 	}
 }
diff --git a/src/vs/workbench/contrib/chat/browser/chatSetup.contribution.ts b/src/vs/workbench/contrib/chat/browser/chatSetup.contribution.ts
index 35d57c7085179..650eb959cd8fc 100644
--- a/src/vs/workbench/contrib/chat/browser/chatSetup.contribution.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatSetup.contribution.ts
@@ -49,6 +49,7 @@ import { IChatAgentService } from '../common/chatAgents.js';
 import { IActivityService, ProgressBadge } from '../../../services/activity/common/activity.js';
 import { CHAT_EDITING_SIDEBAR_PANEL_ID, CHAT_SIDEBAR_PANEL_ID } from './chatViewPane.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { CHAT_CATEGORY } from './actions/chatActions.js';
 
 const defaultChat = {
 	extensionId: product.defaultChatAgent?.extensionId ?? '',
@@ -59,6 +60,7 @@ const defaultChat = {
 	documentationUrl: product.defaultChatAgent?.documentationUrl ?? '',
 	privacyStatementUrl: product.defaultChatAgent?.privacyStatementUrl ?? '',
 	skusDocumentationUrl: product.defaultChatAgent?.skusDocumentationUrl ?? '',
+	publicCodeMatchesUrl: product.defaultChatAgent?.publicCodeMatchesUrl ?? '',
 	providerId: product.defaultChatAgent?.providerId ?? '',
 	providerName: product.defaultChatAgent?.providerName ?? '',
 	providerScopes: product.defaultChatAgent?.providerScopes ?? [[]],
@@ -101,6 +103,7 @@ class ChatSetupContribution extends Disposable implements IWorkbenchContribution
 		}
 
 		this.registerChatWelcome();
+		this.registerActions();
 	}
 
 	private registerChatWelcome(): void {
@@ -120,59 +123,6 @@ class ChatSetupContribution extends Disposable implements IWorkbenchContribution
 			content: disposables => disposables.add(this.instantiationService.createInstance(ChatSetupWelcomeContent, this.chatSetupController)).element,
 		});
 	}
-}
-
-//#endregion
-
-//#region Entitlements Resolver
-
-type ChatSetupEntitlementClassification = {
-	entitlement: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Flag indicating the chat entitlement state' };
-	entitled: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Flag indicating if the user is chat setup entitled' };
-	limited: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Flag indicating if the user is chat setup limited' };
-	owner: 'bpasero';
-	comment: 'Reporting chat setup entitlements';
-};
-
-type ChatSetupEntitlementEvent = {
-	entitlement: ChatEntitlement;
-	entitled: boolean;
-	limited: boolean;
-};
-
-interface IResolvedEntitlements {
-	readonly entitlement: ChatEntitlement;
-	readonly entitled: boolean;
-	readonly limited: boolean;
-}
-
-const TRIGGER_SETUP_COMMAND_ID = 'workbench.action.chat.triggerSetup';
-
-class ChatSetupEntitlementResolver extends Disposable {
-
-	private _entitlement = ChatEntitlement.Unknown;
-	get entitlement() { return this._entitlement; }
-
-	private readonly _onDidChangeEntitlement = this._register(new Emitter<ChatEntitlement>());
-	readonly onDidChangeEntitlement = this._onDidChangeEntitlement.event;
-
-	private pendingResolveCts = new CancellationTokenSource();
-	private resolvedEntitlements: IResolvedEntitlements | undefined = undefined;
-
-	constructor(
-		private readonly chatSetupContext: ChatSetupContext,
-		@ITelemetryService private readonly telemetryService: ITelemetryService,
-		@IAuthenticationService private readonly authenticationService: IAuthenticationService,
-		@IInstantiationService private readonly instantiationService: IInstantiationService,
-		@ILogService private readonly logService: ILogService,
-	) {
-		super();
-
-		this.registerActions();
-		this.registerListeners();
-
-		this.resolve();
-	}
 
 	private registerActions(): void {
 		const that = this;
@@ -186,6 +136,7 @@ class ChatSetupEntitlementResolver extends Disposable {
 				super({
 					id: ChatSetupTriggerAction.ID,
 					title: ChatSetupTriggerAction.TITLE,
+					category: CHAT_CATEGORY,
 					f1: true,
 					precondition: ContextKeyExpr.and(
 						ChatContextKeys.Setup.installed.negate(),
@@ -236,6 +187,7 @@ class ChatSetupEntitlementResolver extends Disposable {
 					id: ChatSetupHideAction.ID,
 					title: ChatSetupHideAction.TITLE,
 					f1: true,
+					category: CHAT_CATEGORY,
 					precondition: ContextKeyExpr.and(
 						ChatContextKeys.Setup.installed.negate(),
 						ContextKeyExpr.or(
@@ -246,7 +198,7 @@ class ChatSetupEntitlementResolver extends Disposable {
 					menu: {
 						id: MenuId.ChatCommandCenter,
 						group: 'z_end',
-						order: 2,
+						order: 3,
 						when: ChatContextKeys.Setup.installed.negate()
 					}
 				});
@@ -283,11 +235,63 @@ class ChatSetupEntitlementResolver extends Disposable {
 			}
 		}
 
-		//#endregion
-
 		registerAction2(ChatSetupTriggerAction);
 		registerAction2(ChatSetupHideAction);
 	}
+}
+
+//#endregion
+
+//#region Entitlements Resolver
+
+type ChatSetupEntitlementClassification = {
+	entitlement: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Flag indicating the chat entitlement state' };
+	entitled: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Flag indicating if the user is chat setup entitled' };
+	limited: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Flag indicating if the user is chat setup limited' };
+	owner: 'bpasero';
+	comment: 'Reporting chat setup entitlements';
+};
+
+type ChatSetupEntitlementEvent = {
+	entitlement: ChatEntitlement;
+	entitled: boolean;
+	limited: boolean;
+};
+
+interface IResolvedEntitlements {
+	readonly entitlement: ChatEntitlement;
+	readonly entitled: boolean;
+	readonly limited: boolean;
+}
+
+const TRIGGER_SETUP_COMMAND_ID = 'workbench.action.chat.triggerSetup';
+
+class ChatSetupEntitlementResolver extends Disposable {
+
+	private _entitlement = ChatEntitlement.Unknown;
+	get entitlement() { return this._entitlement; }
+
+	private readonly _onDidChangeEntitlement = this._register(new Emitter<ChatEntitlement>());
+	readonly onDidChangeEntitlement = this._onDidChangeEntitlement.event;
+
+	private pendingResolveCts = new CancellationTokenSource();
+	private resolvedEntitlements: IResolvedEntitlements | undefined = undefined;
+
+	private entitlementsUpdateBarrier: Barrier | undefined = undefined;
+
+	constructor(
+		private readonly chatSetupContext: ChatSetupContext,
+		@ITelemetryService private readonly telemetryService: ITelemetryService,
+		@IAuthenticationService private readonly authenticationService: IAuthenticationService,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@ILogService private readonly logService: ILogService,
+	) {
+		super();
+
+		this.registerListeners();
+
+		this.resolve();
+	}
 
 	private registerListeners(): void {
 		this._register(this.authenticationService.onDidChangeDeclaredProviders(() => this.resolve()));
@@ -417,11 +421,18 @@ class ChatSetupEntitlementResolver extends Disposable {
 		return result;
 	}
 
-	private update({ entitlement: newEntitlement, limited, entitled }: IResolvedEntitlements): void {
+	private async update({ entitlement: newEntitlement, limited, entitled }: IResolvedEntitlements): Promise<void> {
+		await this.entitlementsUpdateBarrier?.wait();
+
 		const oldEntitlement = this._entitlement;
 		this._entitlement = newEntitlement;
 
-		this.chatSetupContext.update({ canSignUp: newEntitlement === ChatEntitlement.Available, limited, entitled });
+		this.chatSetupContext.update({
+			signedOut: newEntitlement === ChatEntitlement.Unknown,
+			canSignUp: newEntitlement === ChatEntitlement.Available,
+			limited,
+			entitled
+		});
 
 		if (oldEntitlement !== this._entitlement) {
 			this._onDidChangeEntitlement.fire(this._entitlement);
@@ -432,6 +443,15 @@ class ChatSetupEntitlementResolver extends Disposable {
 		return this.resolveEntitlement(session, CancellationToken.None);
 	}
 
+	suspend(): void {
+		this.entitlementsUpdateBarrier = new Barrier();
+	}
+
+	resume(): void {
+		this.entitlementsUpdateBarrier?.open();
+		this.entitlementsUpdateBarrier = undefined;
+	}
+
 	override dispose(): void {
 		this.pendingResolveCts.dispose(true);
 
@@ -512,7 +532,7 @@ class ChatSetupController extends Disposable {
 		this._onDidChange.fire();
 	}
 
-	async setup(enableTelemetry: boolean): Promise<void> {
+	async setup(enableTelemetry: boolean, enableDetection: boolean): Promise<void> {
 		const title = localize('setupChatProgress', "Getting {0} ready...", defaultChat.name);
 		const badge = this.activityService.showViewContainerActivity(isCopilotEditsViewActive(this.viewsService) ? CHAT_EDITING_SIDEBAR_PANEL_ID : CHAT_SIDEBAR_PANEL_ID, {
 			badge: new ProgressBadge(() => title),
@@ -524,13 +544,13 @@ class ChatSetupController extends Disposable {
 				location: ProgressLocation.Window,
 				command: TRIGGER_SETUP_COMMAND_ID,
 				title,
-			}, () => this.doSetup(enableTelemetry));
+			}, () => this.doSetup(enableTelemetry, enableDetection));
 		} finally {
 			badge.dispose();
 		}
 	}
 
-	private async doSetup(enableTelemetry: boolean): Promise<void> {
+	private async doSetup(enableTelemetry: boolean, enableDetection: boolean): Promise<void> {
 		try {
 			let session: AuthenticationSession | undefined;
 
@@ -556,7 +576,7 @@ class ChatSetupController extends Disposable {
 				}
 			}
 			this.setStep(ChatSetupStep.Installing);
-			await this.install(session, enableTelemetry);
+			await this.install(session, enableTelemetry, enableDetection);
 		} finally {
 			this.setStep(ChatSetupStep.Initial);
 		}
@@ -578,20 +598,21 @@ class ChatSetupController extends Disposable {
 		return session;
 	}
 
-	private async install(session: AuthenticationSession, enableTelemetry: boolean): Promise<void> {
+	private async install(session: AuthenticationSession, enableTelemetry: boolean, enableDetection: boolean): Promise<void> {
 		const signedIn = !!session;
 		const activeElement = getActiveElement();
 
-		let installResult: 'installed' | 'cancelled' | 'failedInstall';
+		let installResult: 'installed' | 'cancelled' | 'failedInstall' | undefined = undefined;
 		const wasInstalled = this.chatSetupContext.getContext().installed;
 		let didSignUp = false;
 		try {
 			showCopilotView(this.viewsService);
 
-			this.chatSetupContext.suspend(); // reduces flicker
+			this.chatSetupContext.suspend(); 	// reduces
+			this.entitlementResolver.suspend(); // flicker
 
 			if (this.canSignUpLimited) {
-				didSignUp = await this.signUpLimited(session, enableTelemetry);
+				didSignUp = await this.signUpLimited(session, enableTelemetry, enableDetection);
 			} else {
 				this.logService.trace('[chat setup] install: not signing up to limited SKU');
 			}
@@ -613,10 +634,15 @@ class ChatSetupController extends Disposable {
 				this.commandService.executeCommand('github.copilot.refreshToken'); // ugly, but we need to signal to the extension that sign-up happened
 			}
 
-			await Promise.race([
-				timeout(5000), 												// helps prevent flicker with sign-in welcome view
-				Event.toPromise(this.chatAgentService.onDidChangeAgents)	// https://github.com/microsoft/vscode-copilot/issues/9274
-			]).finally(() => this.chatSetupContext.resume());
+			if (installResult === 'installed') {
+				await Promise.race([
+					timeout(5000), 												// helps prevent flicker with sign-in welcome view
+					Event.toPromise(this.chatAgentService.onDidChangeAgents)	// https://github.com/microsoft/vscode-copilot/issues/9274
+				]);
+			}
+
+			this.chatSetupContext.resume();
+			this.entitlementResolver.resume();
 		}
 
 		this.telemetryService.publicLog2<InstallChatEvent, InstallChatClassification>('commandCenter.chatInstall', { installResult, signedIn });
@@ -626,9 +652,10 @@ class ChatSetupController extends Disposable {
 		}
 	}
 
-	private async signUpLimited(session: AuthenticationSession, enableTelemetry: boolean): Promise<boolean> {
+	private async signUpLimited(session: AuthenticationSession, enableTelemetry: boolean, enableDetection: boolean): Promise<boolean> {
 		const body = {
-			restricted_telemetry: enableTelemetry ? 'enabled' : 'disabled'
+			restricted_telemetry: enableTelemetry ? 'enabled' : 'disabled',
+			public_code_suggestions: enableDetection ? 'enabled' : 'disabled'
 		};
 		this.logService.trace(`[chat setup] sign-up: options ${JSON.stringify(body)}`);
 
@@ -664,7 +691,7 @@ class ChatSetupController extends Disposable {
 			this.logService.error('[chat setup] sign-up: not subscribed');
 		}
 
-		this.chatSetupContext.update({ entitled: false, limited: subscribed, canSignUp: !subscribed });
+		this.chatSetupContext.update({ signedOut: false, entitled: false, limited: subscribed, canSignUp: !subscribed });
 
 		return subscribed;
 	}
@@ -688,7 +715,7 @@ class ChatSetupWelcomeContent extends Disposable {
 		const markdown = this._register(this.instantiationService.createInstance(MarkdownRenderer, {}));
 
 		// Header
-		const header = localize({ key: 'setupHeader', comment: ['{Locked="[{0}]({1})"}'] }, "[{0}]({1}) is your AI pair programmer that helps you with code suggestions, answers your questions, and more.", defaultChat.name, defaultChat.documentationUrl);
+		const header = localize({ key: 'setupHeader', comment: ['{Locked="[{0}]({1})"}'] }, "[{0}]({1}) is your AI pair programmer that provides code suggestions, edits across your project, and answers to your questions.", defaultChat.name, defaultChat.documentationUrl);
 		this.element.appendChild($('p')).appendChild(this._register(markdown.render(new MarkdownString(header, { isTrusted: true }))).element);
 
 		const limitedSkuHeader = localize({ key: 'limitedSkuHeader', comment: ['{Locked="[{0}]({1})"}'] }, "Enable powerful AI features for free with the [{0}]({1}) plan.", defaultChat.entitlementSkuTypeLimitedName, defaultChat.skusDocumentationUrl);
@@ -698,17 +725,20 @@ class ChatSetupWelcomeContent extends Disposable {
 		const telemetryLabel = localize('telemetryLabel', "Allow {0} to use my data, including prompts, suggestions, and code snippets, for product improvements", defaultChat.providerName);
 		const { container: telemetryContainer, checkbox: telemetryCheckbox } = this.createCheckBox(telemetryLabel, this.telemetryService.telemetryLevel === TelemetryLevel.NONE ? false : true, markdown);
 
+		const detectionLabel = localize('detectionLabel', "Allow code suggestions that [match public code]({0})", defaultChat.publicCodeMatchesUrl);
+		const { container: detectionContainer, checkbox: detectionCheckbox } = this.createCheckBox(detectionLabel, true, markdown);
+
 		// Setup Button
 		const buttonRow = this.element.appendChild($('p'));
 		const button = this._register(new Button(buttonRow, { ...defaultButtonStyles, supportIcons: true }));
-		this._register(button.onDidClick(() => this.controller.setup(telemetryCheckbox.checked)));
+		this._register(button.onDidClick(() => this.controller.setup(telemetryCheckbox.checked, detectionCheckbox.checked)));
 
 		// Footer
 		const footer = localize({ key: 'privacyFooter', comment: ['{Locked="["}', '{Locked="]({0})"}'] }, "By proceeding you agree to our [privacy statement]({0}).", defaultChat.privacyStatementUrl);
 		this.element.appendChild($('p')).appendChild(this._register(markdown.render(new MarkdownString(footer, { isTrusted: true }))).element);
 
 		// Update based on model state
-		this._register(Event.runAndSubscribe(this.controller.onDidChange, () => this.update(limitedSkuHeaderElement, [telemetryContainer], [telemetryCheckbox], button)));
+		this._register(Event.runAndSubscribe(this.controller.onDidChange, () => this.update(limitedSkuHeaderElement, [telemetryContainer, detectionContainer], [telemetryCheckbox, detectionCheckbox], button)));
 	}
 
 	private createCheckBox(label: string, checked: boolean, markdown: MarkdownRenderer): { container: HTMLElement; checkbox: Checkbox } {
@@ -728,11 +758,11 @@ class ChatSetupWelcomeContent extends Disposable {
 	}
 
 	private update(limitedSkuHeaderElement: HTMLElement, limitedCheckboxContainers: HTMLElement[], limitedCheckboxes: Checkbox[], button: Button): void {
+		setVisibility(this.controller.canSignUpLimited || this.controller.entitlement === ChatEntitlement.Unknown, limitedSkuHeaderElement);
+		setVisibility(this.controller.canSignUpLimited, ...limitedCheckboxContainers);
+
 		switch (this.controller.step) {
 			case ChatSetupStep.Initial:
-				setVisibility(this.controller.canSignUpLimited || this.controller.entitlement === ChatEntitlement.Unknown, limitedSkuHeaderElement);
-				setVisibility(this.controller.canSignUpLimited, ...limitedCheckboxContainers);
-
 				for (const checkbox of limitedCheckboxes) {
 					checkbox.enable();
 				}
@@ -805,17 +835,19 @@ class ChatSetupContext extends Disposable {
 	private static readonly CHAT_SETUP_TRIGGERD = 'chat.setupTriggered';
 	private static readonly CHAT_EXTENSION_INSTALLED = 'chat.extensionInstalled';
 
+	private readonly canSignUpContextKey = ChatContextKeys.Setup.canSignUp.bindTo(this.contextKeyService);
+	private readonly signedOutContextKey = ChatContextKeys.Setup.signedOut.bindTo(this.contextKeyService);
 	private readonly entitledContextKey = ChatContextKeys.Setup.entitled.bindTo(this.contextKeyService);
 	private readonly limitedContextKey = ChatContextKeys.Setup.limited.bindTo(this.contextKeyService);
-	private readonly canSignUpContextKey = ChatContextKeys.Setup.canSignUp.bindTo(this.contextKeyService);
 	private readonly triggeredContext = ChatContextKeys.Setup.triggered.bindTo(this.contextKeyService);
 	private readonly installedContext = ChatContextKeys.Setup.installed.bindTo(this.contextKeyService);
 
+	private canSignUp = false;
+	private signedOut = false;
+	private entitled = false;
+	private limited = false;
 	private triggered = this.storageService.getBoolean(ChatSetupContext.CHAT_SETUP_TRIGGERD, StorageScope.PROFILE, false);
 	private installed = this.storageService.getBoolean(ChatSetupContext.CHAT_EXTENSION_INSTALLED, StorageScope.PROFILE, false);
-	private limited = false;
-	private entitled = false;
-	private canSignUp = false;
 
 	private contextKeyUpdateBarrier: Barrier | undefined = undefined;
 
@@ -836,34 +868,32 @@ class ChatSetupContext extends Disposable {
 		this._register(this.extensionService.onDidChangeExtensions(result => {
 			for (const extension of result.removed) {
 				if (ExtensionIdentifier.equals(defaultChat.extensionId, extension.identifier)) {
-					this.update({ chatInstalled: false });
+					this.update({ installed: false });
 					break;
 				}
 			}
 
 			for (const extension of result.added) {
 				if (ExtensionIdentifier.equals(defaultChat.extensionId, extension.identifier)) {
-					this.update({ chatInstalled: true });
+					this.update({ installed: true });
 					break;
 				}
 			}
 		}));
 
 		const extensions = await this.extensionManagementService.getInstalled();
-
-		const chatInstalled = !!extensions.find(value => ExtensionIdentifier.equals(value.identifier.id, defaultChat.extensionId));
-		this.update({ chatInstalled });
+		this.update({ installed: !!extensions.find(value => ExtensionIdentifier.equals(value.identifier.id, defaultChat.extensionId)) });
 	}
 
-	update(context: { chatInstalled: boolean }): Promise<void>;
+	update(context: { installed: boolean }): Promise<void>;
 	update(context: { triggered: boolean }): Promise<void>;
-	update(context: { limited: boolean; entitled: boolean; canSignUp: boolean }): Promise<void>;
-	update(context: { triggered?: boolean; chatInstalled?: boolean; limited?: boolean; entitled?: boolean; canSignUp?: boolean }): Promise<void> {
-		if (typeof context.chatInstalled === 'boolean') {
-			this.installed = context.chatInstalled;
-			this.storageService.store(ChatSetupContext.CHAT_EXTENSION_INSTALLED, context.chatInstalled, StorageScope.PROFILE, StorageTarget.MACHINE);
+	update(context: { signedOut: boolean; limited: boolean; entitled: boolean; canSignUp: boolean }): Promise<void>;
+	update(context: { installed?: boolean; triggered?: boolean; signedOut?: boolean; limited?: boolean; entitled?: boolean; canSignUp?: boolean }): Promise<void> {
+		if (typeof context.installed === 'boolean') {
+			this.installed = context.installed;
+			this.storageService.store(ChatSetupContext.CHAT_EXTENSION_INSTALLED, context.installed, StorageScope.PROFILE, StorageTarget.MACHINE);
 
-			if (context.chatInstalled) {
+			if (context.installed) {
 				context.triggered = true; // allows to fallback to setup view if the extension is uninstalled
 			}
 		}
@@ -877,6 +907,14 @@ class ChatSetupContext extends Disposable {
 			}
 		}
 
+		if (typeof context.signedOut === 'boolean') {
+			this.signedOut = context.signedOut;
+		}
+
+		if (typeof context.canSignUp === 'boolean') {
+			this.canSignUp = context.canSignUp;
+		}
+
 		if (typeof context.limited === 'boolean') {
 			this.limited = context.limited;
 		}
@@ -885,10 +923,6 @@ class ChatSetupContext extends Disposable {
 			this.entitled = context.entitled;
 		}
 
-		if (typeof context.canSignUp === 'boolean') {
-			this.canSignUp = context.canSignUp;
-		}
-
 		return this.updateContext();
 	}
 
@@ -902,11 +936,12 @@ class ChatSetupContext extends Disposable {
 			this.storageService.remove('interactive.sessions', this.workspaceContextService.getWorkspace().folders.length ? StorageScope.WORKSPACE : StorageScope.APPLICATION);
 		}
 
+		this.canSignUpContextKey.set(this.canSignUp);
+		this.signedOutContextKey.set(this.signedOut);
 		this.triggeredContext.set(showChatSetup);
 		this.installedContext.set(this.installed);
 		this.limitedContextKey.set(this.limited);
 		this.entitledContextKey.set(this.entitled);
-		this.canSignUpContextKey.set(this.canSignUp);
 	}
 
 	getContext() {
diff --git a/src/vs/workbench/contrib/chat/browser/chatWidget.ts b/src/vs/workbench/contrib/chat/browser/chatWidget.ts
index e7792dc1d9a9f..1d0211078a925 100644
--- a/src/vs/workbench/contrib/chat/browser/chatWidget.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatWidget.ts
@@ -505,7 +505,7 @@ export class ChatWidget extends Disposable implements IChatWidget {
 	}
 
 	private onDidChangeItems(skipDynamicLayout?: boolean) {
-		if (this.tree && this._visible) {
+		if (this._visible || !this.viewModel) {
 			const treeItems = (this.viewModel?.getItems() ?? [])
 				.map((item): ITreeElement<ChatTreeItem> => {
 					return {
diff --git a/src/vs/workbench/contrib/chat/browser/media/chat.css b/src/vs/workbench/contrib/chat/browser/media/chat.css
index e1f9bb59ebb59..6c69e08c4151d 100644
--- a/src/vs/workbench/contrib/chat/browser/media/chat.css
+++ b/src/vs/workbench/contrib/chat/browser/media/chat.css
@@ -919,6 +919,7 @@ have to be updated for changes to the rules above, or to support more deeply nes
 
 .interactive-session .chat-attached-context .chat-attached-context-attachment .monaco-icon-label .codicon {
 	padding-left: 4px;
+	font-size: 100% !important;
 }
 
 .interactive-session .chat-attached-context {
@@ -1122,12 +1123,38 @@ have to be updated for changes to the rules above, or to support more deeply nes
 	color: var(--vscode-chat-slashCommandForeground);
 }
 
+
 .interactive-item-container .chat-resource-widget,
 .interactive-item-container .chat-agent-widget .monaco-button {
 	border-radius: 4px;
 	padding: 1px 3px;
 }
 
+.interactive-item-container .chat-agent-command {
+	background-color: var(--vscode-chat-slashCommandBackground);
+	color: var(--vscode-chat-slashCommandForeground);
+	display: inline-flex;
+	align-items: center;
+	margin-right: 0.5ch;
+	border-radius: 4px;
+	padding: 0 0 0 3px;
+}
+
+.interactive-item-container .chat-agent-command > .monaco-button {
+	display: flex;
+	align-self: stretch;
+	align-items: center;
+	cursor: pointer;
+	padding: 0 2px;
+	margin-left: 2px;
+	border-top-right-radius: 4px;
+	border-bottom-right-radius: 4px;
+}
+
+.interactive-item-container .chat-agent-command > .monaco-button:hover {
+	background: var(--vscode-toolbar-hoverBackground);
+}
+
 .interactive-item-container .chat-agent-widget .monaco-text-button {
 	display: inline;
 	border: none;
diff --git a/src/vs/workbench/contrib/chat/common/chatContextKeys.ts b/src/vs/workbench/contrib/chat/common/chatContextKeys.ts
index e3eed1531c9dd..05be053772605 100644
--- a/src/vs/workbench/contrib/chat/common/chatContextKeys.ts
+++ b/src/vs/workbench/contrib/chat/common/chatContextKeys.ts
@@ -44,6 +44,7 @@ export namespace ChatContextKeys {
 	export const Setup = {
 		canSignUp: new RawContextKey<boolean>('chatSetupCanSignUp', false, { type: 'boolean', description: localize('chatSetupCanSignUp', "True when user can sign up to be a chat limited user.") }),
 
+		signedOut: new RawContextKey<boolean>('chatSetupSignedOut', false, { type: 'boolean', description: localize('chatSetupSignedOut', "True when user is signed out.") }),
 		entitled: new RawContextKey<boolean>('chatSetupEntitled', false, { type: 'boolean', description: localize('chatSetupEntitled', "True when user is a chat entitled user.") }),
 		limited: new RawContextKey<boolean>('chatSetupLimited', false, { type: 'boolean', description: localize('chatSetupLimited', "True when user is a chat limited user.") }),
 
diff --git a/src/vs/workbench/contrib/chat/common/chatEditingService.ts b/src/vs/workbench/contrib/chat/common/chatEditingService.ts
index 74f7d6cd270d3..d8768cf937db8 100644
--- a/src/vs/workbench/contrib/chat/common/chatEditingService.ts
+++ b/src/vs/workbench/contrib/chat/common/chatEditingService.ts
@@ -7,7 +7,7 @@ import { CancellationToken, CancellationTokenSource } from '../../../../base/com
 import { Event } from '../../../../base/common/event.js';
 import { IDisposable } from '../../../../base/common/lifecycle.js';
 import { ResourceMap } from '../../../../base/common/map.js';
-import { IObservable, ITransaction } from '../../../../base/common/observable.js';
+import { IObservable, IReader, ITransaction } from '../../../../base/common/observable.js';
 import { URI } from '../../../../base/common/uri.js';
 import { IDocumentDiff } from '../../../../editor/common/diff/documentDiffProvider.js';
 import { TextEdit } from '../../../../editor/common/languages.js';
@@ -37,7 +37,7 @@ export interface IChatEditingService {
 	readonly editingSessionFileLimit: number;
 
 	startOrContinueEditingSession(chatSessionId: string): Promise<IChatEditingSession>;
-	getEditingSession(resource: URI): IChatEditingSession | null;
+	getOrRestoreEditingSession(): Promise<IChatEditingSession | null>;
 	createSnapshot(requestId: string): void;
 	getSnapshotUri(requestId: string, uri: URI): URI | undefined;
 	restoreSnapshot(requestId: string | undefined): Promise<void>;
@@ -81,10 +81,12 @@ export interface IChatEditingSession {
 	remove(reason: WorkingSetEntryRemovalReason, ...uris: URI[]): void;
 	accept(...uris: URI[]): Promise<void>;
 	reject(...uris: URI[]): Promise<void>;
+	getEntry(uri: URI): IModifiedFileEntry | undefined;
+	readEntry(uri: URI, reader?: IReader): IModifiedFileEntry | undefined;
 	/**
 	 * Will lead to this object getting disposed
 	 */
-	stop(): Promise<void>;
+	stop(clearState?: boolean): Promise<void>;
 
 	undoInteraction(): Promise<void>;
 	redoInteraction(): Promise<void>;
diff --git a/src/vs/workbench/contrib/chat/common/chatModel.ts b/src/vs/workbench/contrib/chat/common/chatModel.ts
index cc30b06e5d71f..ee0c9c9805379 100644
--- a/src/vs/workbench/contrib/chat/common/chatModel.ts
+++ b/src/vs/workbench/contrib/chat/common/chatModel.ts
@@ -16,7 +16,7 @@ import { URI, UriComponents, UriDto, isUriComponents } from '../../../../base/co
 import { generateUuid } from '../../../../base/common/uuid.js';
 import { IOffsetRange, OffsetRange } from '../../../../editor/common/core/offsetRange.js';
 import { IRange } from '../../../../editor/common/core/range.js';
-import { Location, TextEdit } from '../../../../editor/common/languages.js';
+import { Location, SymbolKind, TextEdit } from '../../../../editor/common/languages.js';
 import { localize } from '../../../../nls.js';
 import { ILogService } from '../../../../platform/log/common/log.js';
 import { ChatAgentLocation, IChatAgentCommand, IChatAgentData, IChatAgentResult, IChatAgentService, IChatWelcomeMessageContent, reviveSerializedAgent } from './chatAgents.js';
@@ -60,14 +60,23 @@ export interface IChatRequestPasteVariableEntry extends Omit<IBaseChatRequestVar
 	readonly kind: 'paste';
 	code: string;
 	language: string;
-	fileName: string;
 	pastedLines: string;
+
+	// This is only used for old serialized data and should be removed once we no longer support it
+	fileName: string;
+
+	// This is only undefined on old serialized data
+	copiedFrom: {
+		readonly uri: URI;
+		readonly range: IRange;
+	} | undefined;
 }
 
 export interface ISymbolVariableEntry extends Omit<IBaseChatRequestVariableEntry, 'kind'> {
 	readonly kind: 'symbol';
 	readonly isDynamic: true;
 	readonly value: Location;
+	readonly symbolKind: SymbolKind;
 }
 
 export interface ICommandResultVariableEntry extends Omit<IBaseChatRequestVariableEntry, 'kind'> {
diff --git a/src/vs/workbench/contrib/chat/common/chatViewModel.ts b/src/vs/workbench/contrib/chat/common/chatViewModel.ts
index 1f7578eeba43f..0b2e220dbd4d4 100644
--- a/src/vs/workbench/contrib/chat/common/chatViewModel.ts
+++ b/src/vs/workbench/contrib/chat/common/chatViewModel.ts
@@ -77,6 +77,8 @@ export interface IChatRequestViewModel {
 	readonly isHidden: boolean;
 	readonly isComplete: boolean;
 	readonly isCompleteAddedRequest: boolean;
+	readonly slashCommand: IChatAgentCommand | undefined;
+	readonly agentOrSlashCommandDetected: boolean;
 }
 
 export interface IChatResponseMarkdownRenderData {
@@ -387,6 +389,14 @@ export class ChatRequestViewModel implements IChatRequestViewModel {
 		return this._model.isHidden;
 	}
 
+	get slashCommand(): IChatAgentCommand | undefined {
+		return this._model.response?.slashCommand;
+	}
+
+	get agentOrSlashCommandDetected(): boolean {
+		return this._model.response?.agentOrSlashCommandDetected ?? false;
+	}
+
 	currentRenderedHeight: number | undefined;
 
 	constructor(
diff --git a/src/vs/workbench/contrib/chat/common/languageModelStats.ts b/src/vs/workbench/contrib/chat/common/languageModelStats.ts
index 290a6e3cd8740..79cf4367c80ab 100644
--- a/src/vs/workbench/contrib/chat/common/languageModelStats.ts
+++ b/src/vs/workbench/contrib/chat/common/languageModelStats.ts
@@ -11,6 +11,7 @@ import { ExtensionIdentifier } from '../../../../platform/extensions/common/exte
 import { Extensions, IExtensionFeaturesManagementService, IExtensionFeaturesRegistry } from '../../../services/extensionManagement/common/extensionFeatures.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
 import { localize } from '../../../../nls.js';
+import { Codicon } from '../../../../base/common/codicons.js';
 
 export const ILanguageModelStatsService = createDecorator<ILanguageModelStatsService>('ILanguageModelStatsService');
 
@@ -63,7 +64,7 @@ export class LanguageModelStatsService extends Disposable implements ILanguageMo
 	}
 
 	async update(model: string, extensionId: ExtensionIdentifier, agent: string | undefined, tokenCount: number | undefined): Promise<void> {
-		await this.extensionFeaturesManagementService.getAccess(extensionId, 'languageModels');
+		await this.extensionFeaturesManagementService.getAccess(extensionId, CopilotUsageExtensionFeatureId);
 
 		// update model access
 		this.addAccess(model, extensionId.value);
@@ -160,10 +161,12 @@ export class LanguageModelStatsService extends Disposable implements ILanguageMo
 	}
 }
 
+export const CopilotUsageExtensionFeatureId = 'copilot';
 Registry.as<IExtensionFeaturesRegistry>(Extensions.ExtensionFeaturesRegistry).registerExtensionFeature({
-	id: 'languageModels',
-	label: localize('Language Models', "Language Models"),
+	id: CopilotUsageExtensionFeatureId,
+	label: localize('Language Models', "Copilot"),
 	description: localize('languageModels', "Language models usage statistics of this extension."),
+	icon: Codicon.copilot,
 	access: {
 		canToggle: false
 	},
diff --git a/src/vs/workbench/contrib/extensions/browser/abstractRuntimeExtensionsEditor.ts b/src/vs/workbench/contrib/extensions/browser/abstractRuntimeExtensionsEditor.ts
index 308bf216205c1..dddffbe25177a 100644
--- a/src/vs/workbench/contrib/extensions/browser/abstractRuntimeExtensionsEditor.ts
+++ b/src/vs/workbench/contrib/extensions/browser/abstractRuntimeExtensionsEditor.ts
@@ -422,8 +422,8 @@ export abstract class AbstractRuntimeExtensionsEditor extends EditorPane {
 							data.msgContainer.appendChild($('span', undefined, `${feature.label}: `));
 							data.msgContainer.appendChild($('span', undefined, ...renderLabelWithIcons(`$(${status.severity === Severity.Error ? errorIcon.id : warningIcon.id}) ${status.message}`)));
 						}
-						if (accessData?.totalCount > 0) {
-							const element = $('span', undefined, `${nls.localize('requests count', "{0} Requests: {1} (Overall)", feature.label, accessData.totalCount)}${accessData.current ? nls.localize('session requests count', ", {0} (Session)", accessData.current.count) : ''}`);
+						if (accessData?.accessTimes.length > 0) {
+							const element = $('span', undefined, `${nls.localize('requests count', "{0} Usage: {1} Requests", feature.label, accessData.accessTimes.length)}${accessData.current ? nls.localize('session requests count', ", {0} Requests (Session)", accessData.current.accessTimes.length) : ''}`);
 							if (accessData.current) {
 								const title = nls.localize('requests count title', "Last request was {0}.", fromNow(accessData.current.lastAccessed, true, true));
 								data.elementDisposables.push(this._hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), element, title));
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionFeaturesTab.ts b/src/vs/workbench/contrib/extensions/browser/extensionFeaturesTab.ts
index 1c04096e8a096..82cf04b772c49 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionFeaturesTab.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionFeaturesTab.ts
@@ -107,7 +107,7 @@ class RuntimeStatusMarkdownRenderer extends Disposable implements IExtensionFeat
 		for (const feature of features) {
 			const accessData = this.extensionFeaturesManagementService.getAccessData(extensionId, feature.id);
 			if (accessData) {
-				data.appendMarkdown(`\n ### ${feature.label}\n\n`);
+				data.appendMarkdown(`\n ### ${localize('label', "{0} Usage", feature.label)}\n\n`);
 				const status = accessData?.current?.status;
 				if (status) {
 					if (status?.severity === Severity.Error) {
@@ -117,12 +117,20 @@ class RuntimeStatusMarkdownRenderer extends Disposable implements IExtensionFeat
 						data.appendMarkdown(`$(${warningIcon.id}) ${status.message}\n\n`);
 					}
 				}
-				if (accessData?.totalCount) {
+				if (accessData?.accessTimes.length) {
+					const now = new Date();
+					const counts = {
+						today: accessData.accessTimes.filter(time => time > new Date(now.setHours(0, 0, 0, 0))).length,
+						lastWeek: accessData.accessTimes.filter(time => time > new Date(now.setDate(now.getDate() - 7))).length,
+						lastMonth: accessData.accessTimes.filter(time => time > new Date(now.setMonth(now.getMonth() - 1))).length,
+					};
 					if (accessData.current) {
-						data.appendMarkdown(`${localize('last request', "Last Request: `{0}`", fromNow(accessData.current.lastAccessed, true, true))}\n\n`);
-						data.appendMarkdown(`${localize('requests count session', "Requests (Session) : `{0}`", accessData.current.count)}\n\n`);
+						data.appendMarkdown(`${localize('last request', "Recent: `{0}`", fromNow(accessData.current.lastAccessed, true, true))}\n\n`);
+						data.appendMarkdown(`${localize('requests count session', "Session: `{0}` Requests", accessData.accessTimes.length)}\n\n`);
 					}
-					data.appendMarkdown(`${localize('requests count total', "Requests (Overall): `{0}`", accessData.totalCount)}\n\n`);
+					data.appendMarkdown(`${localize('requests count today', "Today: `{0}` Requests", counts.today)}\n\n`);
+					data.appendMarkdown(`${localize('requests count last week', "Last 7 Days: `{0}` Requests", counts.lastWeek)}\n\n`);
+					data.appendMarkdown(`${localize('requests count last month', "Last 30 Days: `{0}` Requests", counts.lastMonth)}\n\n`);
 				}
 			}
 		}
diff --git a/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts b/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
index e781968174e89..2863a7a6d77da 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
@@ -13,7 +13,7 @@ import { EnablementState, IExtensionManagementServerService, IWorkbenchExtension
 import { IExtensionIgnoredRecommendationsService, IExtensionRecommendationsService } from '../../../services/extensionRecommendations/common/extensionRecommendations.js';
 import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions, IWorkbenchContribution } from '../../../common/contributions.js';
 import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
-import { VIEWLET_ID, IExtensionsWorkbenchService, IExtensionsViewPaneContainer, TOGGLE_IGNORE_EXTENSION_ACTION_ID, INSTALL_EXTENSION_FROM_VSIX_COMMAND_ID, WORKSPACE_RECOMMENDATIONS_VIEW_ID, IWorkspaceRecommendedExtensionsView, AutoUpdateConfigurationKey, HasOutdatedExtensionsContext, SELECT_INSTALL_VSIX_EXTENSION_COMMAND_ID, LIST_WORKSPACE_UNSUPPORTED_EXTENSIONS_COMMAND_ID, ExtensionEditorTab, THEME_ACTIONS_GROUP, INSTALL_ACTIONS_GROUP, OUTDATED_EXTENSIONS_VIEW_ID, CONTEXT_HAS_GALLERY, extensionsSearchActionsMenu, UPDATE_ACTIONS_GROUP, IExtensionArg, ExtensionRuntimeActionType } from '../common/extensions.js';
+import { VIEWLET_ID, IExtensionsWorkbenchService, IExtensionsViewPaneContainer, TOGGLE_IGNORE_EXTENSION_ACTION_ID, INSTALL_EXTENSION_FROM_VSIX_COMMAND_ID, WORKSPACE_RECOMMENDATIONS_VIEW_ID, IWorkspaceRecommendedExtensionsView, AutoUpdateConfigurationKey, HasOutdatedExtensionsContext, SELECT_INSTALL_VSIX_EXTENSION_COMMAND_ID, LIST_WORKSPACE_UNSUPPORTED_EXTENSIONS_COMMAND_ID, ExtensionEditorTab, THEME_ACTIONS_GROUP, INSTALL_ACTIONS_GROUP, OUTDATED_EXTENSIONS_VIEW_ID, CONTEXT_HAS_GALLERY, extensionsSearchActionsMenu, UPDATE_ACTIONS_GROUP, IExtensionArg, ExtensionRuntimeActionType, EXTENSIONS_CATEGORY } from '../common/extensions.js';
 import { ReinstallAction, InstallSpecificVersionOfExtensionAction, ConfigureWorkspaceRecommendedExtensionsAction, ConfigureWorkspaceFolderRecommendedExtensionsAction, SetColorThemeAction, SetFileIconThemeAction, SetProductIconThemeAction, ClearLanguageAction, ToggleAutoUpdateForExtensionAction, ToggleAutoUpdatesForPublisherAction, TogglePreReleaseExtensionAction, InstallAnotherVersionAction, InstallAction } from './extensionsActions.js';
 import { ExtensionsInput } from '../common/extensionsInput.js';
 import { ExtensionEditor } from './extensionEditor.js';
@@ -1805,7 +1805,7 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi
 		this.registerExtensionAction({
 			id: 'workbench.extensions.action.addToWorkspaceRecommendations',
 			title: localize2('workbench.extensions.action.addToWorkspaceRecommendations', "Add Extension to Workspace Recommendations"),
-			category: localize('extensions', "Extensions"),
+			category: EXTENSIONS_CATEGORY,
 			menu: {
 				id: MenuId.CommandPalette,
 				when: ContextKeyExpr.and(WorkbenchStateContext.isEqualTo('workspace'), ContextKeyExpr.equals('resourceScheme', Schemas.extension)),
@@ -1828,7 +1828,7 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi
 		this.registerExtensionAction({
 			id: 'workbench.extensions.action.addToWorkspaceFolderRecommendations',
 			title: localize2('workbench.extensions.action.addToWorkspaceFolderRecommendations', "Add Extension to Workspace Folder Recommendations"),
-			category: localize('extensions', "Extensions"),
+			category: EXTENSIONS_CATEGORY,
 			menu: {
 				id: MenuId.CommandPalette,
 				when: ContextKeyExpr.and(WorkbenchStateContext.isEqualTo('folder'), ContextKeyExpr.equals('resourceScheme', Schemas.extension)),
@@ -1839,7 +1839,7 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi
 		this.registerExtensionAction({
 			id: 'workbench.extensions.action.addToWorkspaceIgnoredRecommendations',
 			title: localize2('workbench.extensions.action.addToWorkspaceIgnoredRecommendations', "Add Extension to Workspace Ignored Recommendations"),
-			category: localize('extensions', "Extensions"),
+			category: EXTENSIONS_CATEGORY,
 			menu: {
 				id: MenuId.CommandPalette,
 				when: ContextKeyExpr.and(WorkbenchStateContext.isEqualTo('workspace'), ContextKeyExpr.equals('resourceScheme', Schemas.extension)),
@@ -1862,7 +1862,7 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi
 		this.registerExtensionAction({
 			id: 'workbench.extensions.action.addToWorkspaceFolderIgnoredRecommendations',
 			title: localize2('workbench.extensions.action.addToWorkspaceFolderIgnoredRecommendations', "Add Extension to Workspace Folder Ignored Recommendations"),
-			category: localize('extensions', "Extensions"),
+			category: EXTENSIONS_CATEGORY,
 			menu: {
 				id: MenuId.CommandPalette,
 				when: ContextKeyExpr.and(WorkbenchStateContext.isEqualTo('folder'), ContextKeyExpr.equals('resourceScheme', Schemas.extension)),
@@ -1873,7 +1873,7 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi
 		this.registerExtensionAction({
 			id: ConfigureWorkspaceRecommendedExtensionsAction.ID,
 			title: { value: ConfigureWorkspaceRecommendedExtensionsAction.LABEL, original: 'Configure Recommended Extensions (Workspace)' },
-			category: localize('extensions', "Extensions"),
+			category: EXTENSIONS_CATEGORY,
 			menu: {
 				id: MenuId.CommandPalette,
 				when: WorkbenchStateContext.isEqualTo('workspace'),
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsList.ts b/src/vs/workbench/contrib/extensions/browser/extensionsList.ts
index 6c533cd8be72a..2afa3e73bbf63 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsList.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsList.ts
@@ -12,10 +12,10 @@ import { IInstantiationService } from '../../../../platform/instantiation/common
 import { IListVirtualDelegate } from '../../../../base/browser/ui/list/list.js';
 import { IPagedRenderer } from '../../../../base/browser/ui/list/listPaging.js';
 import { Event } from '../../../../base/common/event.js';
-import { IExtension, ExtensionContainers, ExtensionState, IExtensionsWorkbenchService } from '../common/extensions.js';
+import { IExtension, ExtensionContainers, ExtensionState, IExtensionsWorkbenchService, IExtensionsViewState } from '../common/extensions.js';
 import { ManageExtensionAction, ExtensionRuntimeStateAction, ExtensionStatusLabelAction, RemoteInstallAction, ExtensionStatusAction, LocalInstallAction, ButtonWithDropDownExtensionAction, InstallDropdownAction, InstallingLabelAction, ButtonWithDropdownExtensionActionViewItem, DropDownExtensionAction, WebInstallAction, MigrateDeprecatedExtensionAction, SetLanguageAction, ClearLanguageAction, UpdateAction } from './extensionsActions.js';
 import { areSameExtensions } from '../../../../platform/extensionManagement/common/extensionManagementUtil.js';
-import { RatingsWidget, InstallCountWidget, RecommendationWidget, RemoteBadgeWidget, ExtensionPackCountWidget as ExtensionPackBadgeWidget, SyncIgnoredWidget, ExtensionHoverWidget, ExtensionActivationStatusWidget, PreReleaseBookmarkWidget, extensionVerifiedPublisherIconColor, VerifiedPublisherWidget } from './extensionsWidgets.js';
+import { RatingsWidget, InstallCountWidget, RecommendationWidget, RemoteBadgeWidget, ExtensionPackCountWidget as ExtensionPackBadgeWidget, SyncIgnoredWidget, ExtensionHoverWidget, ExtensionRuntimeStatusWidget, PreReleaseBookmarkWidget, extensionVerifiedPublisherIconColor, VerifiedPublisherWidget } from './extensionsWidgets.js';
 import { IExtensionService } from '../../../services/extensions/common/extensions.js';
 import { IWorkbenchExtensionEnablementService } from '../../../services/extensionManagement/common/extensionManagement.js';
 import { INotificationService } from '../../../../platform/notification/common/notification.js';
@@ -29,11 +29,6 @@ import { IActionViewItemOptions } from '../../../../base/browser/ui/actionbar/ac
 
 const EXTENSION_LIST_ELEMENT_HEIGHT = 72;
 
-export interface IExtensionsViewState {
-	onFocus: Event<IExtension>;
-	onBlur: Event<IExtension>;
-}
-
 export interface ITemplateData {
 	root: HTMLElement;
 	element: HTMLElement;
@@ -63,7 +58,7 @@ export type ExtensionListRendererOptions = {
 export class Renderer implements IPagedRenderer<IExtension, ITemplateData> {
 
 	constructor(
-		private extensionViewState: IExtensionsViewState,
+		private readonly extensionViewState: IExtensionsViewState,
 		private readonly options: ExtensionListRendererOptions,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 		@INotificationService private readonly notificationService: INotificationService,
@@ -148,7 +143,7 @@ export class Renderer implements IPagedRenderer<IExtension, ITemplateData> {
 			verifiedPublisherWidget,
 			extensionHoverWidget,
 			this.instantiationService.createInstance(SyncIgnoredWidget, syncIgnore),
-			this.instantiationService.createInstance(ExtensionActivationStatusWidget, activationStatus, true),
+			this.instantiationService.createInstance(ExtensionRuntimeStatusWidget, this.extensionViewState, activationStatus),
 			this.instantiationService.createInstance(InstallCountWidget, installCount, true),
 			this.instantiationService.createInstance(RatingsWidget, ratings, true),
 		];
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsViewer.ts b/src/vs/workbench/contrib/extensions/browser/extensionsViewer.ts
index 491d214b57434..82f9f53d501ea 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsViewer.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsViewer.ts
@@ -42,7 +42,7 @@ export class ExtensionsGridView extends Disposable {
 	) {
 		super();
 		this.element = dom.append(parent, dom.$('.extensions-grid-view'));
-		this.renderer = this.instantiationService.createInstance(Renderer, { onFocus: Event.None, onBlur: Event.None }, { hoverOptions: { position() { return HoverPosition.BELOW; } } });
+		this.renderer = this.instantiationService.createInstance(Renderer, { onFocus: Event.None, onBlur: Event.None, filters: {} }, { hoverOptions: { position() { return HoverPosition.BELOW; } } });
 		this.delegate = delegate;
 		this.disposableStore = this._register(new DisposableStore());
 	}
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsViews.ts b/src/vs/workbench/contrib/extensions/browser/extensionsViews.ts
index 8abcf780b3d20..2d148a7f3bc40 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsViews.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsViews.ts
@@ -17,8 +17,8 @@ import { IKeybindingService } from '../../../../platform/keybinding/common/keybi
 import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
 import { append, $ } from '../../../../base/browser/dom.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { Delegate, Renderer, IExtensionsViewState } from './extensionsList.js';
-import { ExtensionState, IExtension, IExtensionsWorkbenchService, IWorkspaceRecommendedExtensionsView } from '../common/extensions.js';
+import { Delegate, Renderer } from './extensionsList.js';
+import { ExtensionState, IExtension, IExtensionsViewState, IExtensionsWorkbenchService, IWorkspaceRecommendedExtensionsView } from '../common/extensions.js';
 import { Query } from '../common/extensionQuery.js';
 import { IExtensionService, toExtension } from '../../../services/extensions/common/extensions.js';
 import { IThemeService } from '../../../../platform/theme/common/themeService.js';
@@ -72,6 +72,10 @@ class ExtensionsViewState extends Disposable implements IExtensionsViewState {
 
 	private currentlyFocusedItems: IExtension[] = [];
 
+	filters: {
+		featureId?: string;
+	} = {};
+
 	onFocusChange(extensions: IExtension[]): void {
 		this.currentlyFocusedItems.forEach(extension => this._onBlur.fire(extension));
 		this.currentlyFocusedItems = extensions;
@@ -119,6 +123,7 @@ export class ExtensionsListView extends ViewPane {
 	private list: WorkbenchPagedList<IExtension> | null = null;
 	private queryRequest: { query: string; request: CancelablePromise<IPagedModel<IExtension>> } | null = null;
 	private queryResult: IQueryResult | undefined;
+	private extensionsViewState: ExtensionsViewState | undefined;
 
 	private readonly contextMenuActionRunner = this._register(new ActionRunner());
 
@@ -186,8 +191,8 @@ export class ExtensionsListView extends ViewPane {
 		const messageSeverityIcon = append(messageContainer, $(''));
 		const messageBox = append(messageContainer, $('.message'));
 		const delegate = new Delegate();
-		const extensionsViewState = new ExtensionsViewState();
-		const renderer = this.instantiationService.createInstance(Renderer, extensionsViewState, {
+		this.extensionsViewState = new ExtensionsViewState();
+		const renderer = this.instantiationService.createInstance(Renderer, this.extensionsViewState, {
 			hoverOptions: {
 				position: () => {
 					const viewLocation = this.viewDescriptorService.getViewLocationById(this.id);
@@ -217,9 +222,9 @@ export class ExtensionsListView extends ViewPane {
 			openOnSingleClick: true
 		}) as WorkbenchPagedList<IExtension>;
 		this._register(this.list.onContextMenu(e => this.onContextMenu(e), this));
-		this._register(this.list.onDidChangeFocus(e => extensionsViewState.onFocusChange(coalesce(e.elements)), this));
+		this._register(this.list.onDidChangeFocus(e => this.extensionsViewState?.onFocusChange(coalesce(e.elements)), this));
 		this._register(this.list);
-		this._register(extensionsViewState);
+		this._register(this.extensionsViewState);
 
 		this._register(Event.debounce(Event.filter(this.list.onDidOpen, e => e.element !== null), (_, event) => event, 75, true)(options => {
 			this.openExtension(options.element!, { sideByside: options.sideBySide, ...options.editorOptions });
@@ -257,6 +262,9 @@ export class ExtensionsListView extends ViewPane {
 		if (this.queryResult) {
 			this.queryResult.disposables.dispose();
 			this.queryResult = undefined;
+			if (this.extensionsViewState) {
+				this.extensionsViewState.filters = {};
+			}
 		}
 
 		const parsedQuery = Query.parse(query);
@@ -721,6 +729,9 @@ export class ExtensionsListView extends ViewPane {
 		if (!feature) {
 			return [];
 		}
+		if (this.extensionsViewState) {
+			this.extensionsViewState.filters.featureId = featureId;
+		}
 		const renderer = feature.renderer ? this.instantiationService.createInstance<IExtensionFeatureRenderer>(feature.renderer) : undefined;
 		try {
 			const result = local.filter(e => {
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsWidgets.ts b/src/vs/workbench/contrib/extensions/browser/extensionsWidgets.ts
index 503acfe26fdcb..3c4cfaa8782c1 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsWidgets.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsWidgets.ts
@@ -6,7 +6,7 @@
 import './media/extensionsWidgets.css';
 import * as semver from '../../../../base/common/semver/semver.js';
 import { Disposable, toDisposable, DisposableStore, MutableDisposable, IDisposable } from '../../../../base/common/lifecycle.js';
-import { IExtension, IExtensionsWorkbenchService, IExtensionContainer, ExtensionState, ExtensionEditorTab } from '../common/extensions.js';
+import { IExtension, IExtensionsWorkbenchService, IExtensionContainer, ExtensionState, ExtensionEditorTab, IExtensionsViewState } from '../common/extensions.js';
 import { append, $, reset, addDisposableListener, EventType, finalHandler } from '../../../../base/browser/dom.js';
 import * as platform from '../../../../base/common/platform.js';
 import { localize } from '../../../../nls.js';
@@ -43,6 +43,10 @@ import { defaultCountBadgeStyles } from '../../../../platform/theme/browser/defa
 import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
 import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
 import type { IManagedHover } from '../../../../base/browser/ui/hover/hover.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { Extensions, IExtensionFeaturesManagementService, IExtensionFeaturesRegistry } from '../../../services/extensionManagement/common/extensionFeatures.js';
+import { ExtensionIdentifier } from '../../../../platform/extensions/common/extensions.js';
+import { Codicon } from '../../../../base/common/codicons.js';
 
 export abstract class ExtensionWidget extends Disposable implements IExtensionContainer {
 	private _extension: IExtension | null = null;
@@ -481,12 +485,13 @@ export class SyncIgnoredWidget extends ExtensionWidget {
 	}
 }
 
-export class ExtensionActivationStatusWidget extends ExtensionWidget {
+export class ExtensionRuntimeStatusWidget extends ExtensionWidget {
 
 	constructor(
+		private readonly extensionViewState: IExtensionsViewState,
 		private readonly container: HTMLElement,
-		private readonly small: boolean,
 		@IExtensionService extensionService: IExtensionService,
+		@IExtensionFeaturesManagementService private readonly extensionFeaturesManagementService: IExtensionFeaturesManagementService,
 		@IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
 	) {
 		super();
@@ -495,6 +500,11 @@ export class ExtensionActivationStatusWidget extends ExtensionWidget {
 				this.update();
 			}
 		}));
+		this._register(extensionFeaturesManagementService.onDidChangeAccessData(e => {
+			if (this.extension && ExtensionIdentifier.equals(this.extension.identifier.id, e.extension)) {
+				this.update();
+			}
+		}));
 	}
 
 	render(): void {
@@ -504,21 +514,25 @@ export class ExtensionActivationStatusWidget extends ExtensionWidget {
 			return;
 		}
 
-		const extensionStatus = this.extensionsWorkbenchService.getExtensionRuntimeStatus(this.extension);
-		if (!extensionStatus || !extensionStatus.activationTimes) {
-			return;
+		if (this.extensionViewState.filters.featureId && this.extension.state === ExtensionState.Installed) {
+			const accessData = this.extensionFeaturesManagementService.getAllAccessDataForExtension(new ExtensionIdentifier(this.extension.identifier.id)).get(this.extensionViewState.filters.featureId);
+			const feature = Registry.as<IExtensionFeaturesRegistry>(Extensions.ExtensionFeaturesRegistry).getExtensionFeature(this.extensionViewState.filters.featureId);
+			if (feature?.icon && accessData) {
+				const featureAccessTimeElement = append(this.container, $('span.activationTime'));
+				featureAccessTimeElement.textContent = localize('feature access label', "{0} reqs", accessData.accessTimes.length);
+				const iconElement = append(this.container, $('span' + ThemeIcon.asCSSSelector(feature.icon)));
+				iconElement.style.paddingLeft = '4px';
+				return;
+			}
 		}
 
-		const activationTime = extensionStatus.activationTimes.codeLoadingTime + extensionStatus.activationTimes.activateCallTime;
-		if (this.small) {
+		const extensionStatus = this.extensionsWorkbenchService.getExtensionRuntimeStatus(this.extension);
+		if (extensionStatus?.activationTimes) {
+			const activationTime = extensionStatus.activationTimes.codeLoadingTime + extensionStatus.activationTimes.activateCallTime;
 			append(this.container, $('span' + ThemeIcon.asCSSSelector(activationTimeIcon)));
 			const activationTimeElement = append(this.container, $('span.activationTime'));
 			activationTimeElement.textContent = `${activationTime}ms`;
-		} else {
-			const activationTimeElement = append(this.container, $('span.activationTime'));
-			activationTimeElement.textContent = `${localize('activation', "Activation time")}${extensionStatus.activationTimes.activationReason.startup ? ` (${localize('startup', "Startup")})` : ''} : ${activationTime}ms`;
 		}
-
 	}
 
 }
@@ -536,6 +550,7 @@ export class ExtensionHoverWidget extends ExtensionWidget {
 		private readonly options: ExtensionHoverOptions,
 		private readonly extensionStatusAction: ExtensionStatusAction,
 		@IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
+		@IExtensionFeaturesManagementService private readonly extensionFeaturesManagementService: IExtensionFeaturesManagementService,
 		@IHoverService private readonly hoverService: IHoverService,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
 		@IExtensionRecommendationsService private readonly extensionRecommendationsService: IExtensionRecommendationsService,
@@ -651,11 +666,12 @@ export class ExtensionHoverWidget extends ExtensionWidget {
 
 		const preReleaseMessage = ExtensionHoverWidget.getPreReleaseMessage(this.extension);
 		const extensionRuntimeStatus = this.extensionsWorkbenchService.getExtensionRuntimeStatus(this.extension);
+		const extensionFeaturesAccessData = this.extensionFeaturesManagementService.getAllAccessDataForExtension(new ExtensionIdentifier(this.extension.identifier.id));
 		const extensionStatus = this.extensionStatusAction.status;
 		const runtimeState = this.extension.runtimeState;
 		const recommendationMessage = this.getRecommendationMessage(this.extension);
 
-		if (extensionRuntimeStatus || extensionStatus.length || runtimeState || recommendationMessage || preReleaseMessage) {
+		if (extensionRuntimeStatus || extensionFeaturesAccessData.size || extensionStatus.length || runtimeState || recommendationMessage || preReleaseMessage) {
 
 			markdown.appendMarkdown(`---`);
 			markdown.appendText(`\n`);
@@ -681,6 +697,20 @@ export class ExtensionHoverWidget extends ExtensionWidget {
 				}
 			}
 
+			if (extensionFeaturesAccessData.size) {
+				const registry = Registry.as<IExtensionFeaturesRegistry>(Extensions.ExtensionFeaturesRegistry);
+				for (const [featureId, accessData] of extensionFeaturesAccessData) {
+					if (accessData?.accessTimes.length) {
+						const feature = registry.getExtensionFeature(featureId);
+						if (feature) {
+							markdown.appendMarkdown(localize('feature usage label', "{0} usage", feature.label));
+							markdown.appendMarkdown(`: ${localize('total', "{0} requests in last 30 days)", accessData.accessTimes.length)} [$(${Codicon.linkExternal.id})](${URI.parse(`command:extension.open?${encodeURIComponent(JSON.stringify([this.extension.identifier.id, ExtensionEditorTab.Features]))}`)})`);
+							markdown.appendText(`\n`);
+						}
+					}
+				}
+			}
+
 			for (const status of extensionStatus) {
 				if (status.icon) {
 					markdown.appendMarkdown(`$(${status.icon.id})&nbsp;`);
diff --git a/src/vs/workbench/contrib/extensions/common/extensions.ts b/src/vs/workbench/contrib/extensions/common/extensions.ts
index 6207063200d71..79ee9e673b706 100644
--- a/src/vs/workbench/contrib/extensions/common/extensions.ts
+++ b/src/vs/workbench/contrib/extensions/common/extensions.ts
@@ -21,8 +21,10 @@ import { MenuId } from '../../../../platform/actions/common/actions.js';
 import { ProgressLocation } from '../../../../platform/progress/common/progress.js';
 import { Severity } from '../../../../platform/notification/common/notification.js';
 import { IMarkdownString } from '../../../../base/common/htmlContent.js';
+import { localize2 } from '../../../../nls.js';
 
 export const VIEWLET_ID = 'workbench.view.extensions';
+export const EXTENSIONS_CATEGORY = localize2('extensions', "Extensions");
 
 export interface IExtensionsViewPaneContainer extends IViewPaneContainer {
 	readonly searchValue: string | undefined;
@@ -196,6 +198,14 @@ export interface IExtensionContainer extends IDisposable {
 	update(): void;
 }
 
+export interface IExtensionsViewState {
+	onFocus: Event<IExtension>;
+	onBlur: Event<IExtension>;
+	filters: {
+		featureId?: string;
+	};
+}
+
 export class ExtensionContainers extends Disposable {
 
 	constructor(
diff --git a/src/vs/workbench/contrib/files/browser/views/explorerView.ts b/src/vs/workbench/contrib/files/browser/views/explorerView.ts
index 97cee3715ee7f..e77296ffed938 100644
--- a/src/vs/workbench/contrib/files/browser/views/explorerView.ts
+++ b/src/vs/workbench/contrib/files/browser/views/explorerView.ts
@@ -435,7 +435,7 @@ export class ExplorerView extends ViewPane implements IExplorerView {
 		const explorerLabels = this.instantiationService.createInstance(ResourceLabels, { onDidChangeVisibility: this.onDidChangeBodyVisibility });
 		this._register(explorerLabels);
 
-		this.findProvider = this.instantiationService.createInstance(ExplorerFindProvider, () => this.tree);
+		this.findProvider = this.instantiationService.createInstance(ExplorerFindProvider, this.filter, () => this.tree);
 
 		const updateWidth = (stat: ExplorerItem) => this.tree.updateWidth(stat);
 		this.renderer = this.instantiationService.createInstance(FilesRenderer, container, explorerLabels, this.findProvider.highlightTree, updateWidth);
diff --git a/src/vs/workbench/contrib/files/browser/views/explorerViewer.ts b/src/vs/workbench/contrib/files/browser/views/explorerViewer.ts
index b17d1a20cee9d..572f92c19b1de 100644
--- a/src/vs/workbench/contrib/files/browser/views/explorerViewer.ts
+++ b/src/vs/workbench/contrib/files/browser/views/explorerViewer.ts
@@ -44,7 +44,7 @@ import { IWorkspaceFolderCreationData } from '../../../../../platform/workspaces
 import { findValidPasteFileTarget } from '../fileActions.js';
 import { FuzzyScore, createMatches } from '../../../../../base/common/filters.js';
 import { Emitter, Event, EventMultiplexer } from '../../../../../base/common/event.js';
-import { IAsyncDataTreeViewState, IAsyncFindProvider, IAsyncFindResultMetadata, IAsyncFindToggles, ITreeCompressionDelegate } from '../../../../../base/browser/ui/tree/asyncDataTree.js';
+import { IAsyncDataTreeViewState, IAsyncFindProvider, IAsyncFindResult, IAsyncFindToggles, ITreeCompressionDelegate } from '../../../../../base/browser/ui/tree/asyncDataTree.js';
 import { ICompressibleTreeRenderer } from '../../../../../base/browser/ui/tree/objectTree.js';
 import { ICompressedTreeNode } from '../../../../../base/browser/ui/tree/compressedObjectTreeModel.js';
 import { ILabelService } from '../../../../../platform/label/common/label.js';
@@ -183,7 +183,8 @@ export class PhantomExplorerItem extends ExplorerItem {
 }
 
 interface FindHighlightLayer {
-	total: number;
+	childMatches: number;
+	isMatch: boolean;
 	stats: {
 		[statName: string]: FindHighlightLayer;
 	};
@@ -191,6 +192,7 @@ interface FindHighlightLayer {
 
 interface IExplorerFindHighlightTree {
 	get(item: ExplorerItem): number;
+	isMatch(item: ExplorerItem): boolean;
 }
 
 class ExplorerFindHighlightTree implements IExplorerFindHighlightTree {
@@ -202,9 +204,21 @@ class ExplorerFindHighlightTree implements IExplorerFindHighlightTree {
 	}
 
 	get(item: ExplorerItem): number {
+		const result = this.find(item);
+		if (result === undefined) {
+			return 0;
+		}
+
+		const { treeLayer, relPath } = result;
+		this._highlightedItems.set(relPath, item);
+
+		return treeLayer.childMatches;
+	}
+
+	private find(item: ExplorerItem): { treeLayer: FindHighlightLayer; relPath: string } | undefined {
 		const rootLayer = this._tree.get(item.root.name);
 		if (rootLayer === undefined) {
-			return 0;
+			return undefined;
 		}
 
 		const relPath = relativePath(item.root.resource, item.resource);
@@ -215,15 +229,13 @@ class ExplorerFindHighlightTree implements IExplorerFindHighlightTree {
 		let treeLayer = rootLayer;
 		for (const segment of relPath.split('/')) {
 			if (!treeLayer.stats[segment]) {
-				return 0;
+				return undefined;
 			}
 
 			treeLayer = treeLayer.stats[segment];
 		}
 
-		this._highlightedItems.set(relPath, item);
-
-		return treeLayer.total;
+		return { treeLayer, relPath };
 	}
 
 	add(resource: URI, root: ExplorerItem): void {
@@ -233,18 +245,31 @@ class ExplorerFindHighlightTree implements IExplorerFindHighlightTree {
 		}
 
 		if (!this._tree.get(root.name)) {
-			this._tree.set(root.name, { total: 0, stats: {} });
+			this._tree.set(root.name, { childMatches: 0, stats: {}, isMatch: false });
 		}
 
 		let treeLayer = this._tree.get(root.name)!;
-		for (const stat of relPath.split('/').slice(0, -1)) {
+		for (const stat of relPath.split('/')) {
 			if (!treeLayer.stats[stat]) {
-				treeLayer.stats[stat] = { total: 0, stats: {} };
+				treeLayer.stats[stat] = { childMatches: 0, stats: {}, isMatch: false };
 			}
 
 			treeLayer = treeLayer.stats[stat];
-			treeLayer.total++;
+			treeLayer.childMatches++;
+		}
+
+		treeLayer.childMatches--; // the last segment is the file itself
+		treeLayer.isMatch = true;
+	}
+
+	isMatch(item: ExplorerItem): boolean {
+		const result = this.find(item);
+		if (result === undefined) {
+			return false;
 		}
+
+		const { treeLayer } = result;
+		return treeLayer.isMatch;
 	}
 
 	clear(): void {
@@ -266,6 +291,7 @@ export class ExplorerFindProvider implements IAsyncFindProvider<ExplorerItem> {
 	}
 
 	constructor(
+		private readonly filesFilter: FilesFilter,
 		private readonly treeProvider: () => WorkbenchCompressibleAsyncDataTree<ExplorerItem | ExplorerItem[], ExplorerItem, FuzzyScore>,
 		@ISearchService private readonly searchService: ISearchService,
 		@IFileService private readonly fileService: IFileService,
@@ -309,7 +335,7 @@ export class ExplorerFindProvider implements IAsyncFindProvider<ExplorerItem> {
 		}
 	}
 
-	async find(pattern: string, toggles: IAsyncFindToggles, token: CancellationToken): Promise<IAsyncFindResultMetadata> {
+	async find(pattern: string, toggles: IAsyncFindToggles, token: CancellationToken): Promise<IAsyncFindResult<ExplorerItem> | undefined> {
 		const promise = this.doFind(pattern, toggles, token);
 
 		return await this.progressService.withProgress({
@@ -318,7 +344,7 @@ export class ExplorerFindProvider implements IAsyncFindProvider<ExplorerItem> {
 		}, _progress => promise);
 	}
 
-	async doFind(pattern: string, toggles: IAsyncFindToggles, token: CancellationToken): Promise<IAsyncFindResultMetadata> {
+	async doFind(pattern: string, toggles: IAsyncFindToggles, token: CancellationToken): Promise<IAsyncFindResult<ExplorerItem> | undefined> {
 		if (toggles.findMode === TreeFindMode.Highlight) {
 			if (this.filterSessionStartState) {
 				await this.endFilterSession();
@@ -357,7 +383,7 @@ export class ExplorerFindProvider implements IAsyncFindProvider<ExplorerItem> {
 		this.explorerFindActiveContextKey.set(true);
 	}
 
-	async doFilterFind(pattern: string, matchType: TreeFindMatchType, token: CancellationToken): Promise<IAsyncFindResultMetadata> {
+	async doFilterFind(pattern: string, matchType: TreeFindMatchType, token: CancellationToken): Promise<IAsyncFindResult<ExplorerItem> | undefined> {
 		if (!this.filterSessionStartState) {
 			throw new Error('ExplorerFindProvider: no session state');
 		}
@@ -366,7 +392,7 @@ export class ExplorerFindProvider implements IAsyncFindProvider<ExplorerItem> {
 		const searchResults = await this.getSearchResults(pattern, roots, matchType, token);
 
 		if (token.isCancellationRequested) {
-			return {};
+			return undefined;
 		}
 
 		this.clearPhantomElements();
@@ -378,7 +404,11 @@ export class ExplorerFindProvider implements IAsyncFindProvider<ExplorerItem> {
 		await tree.setInput(this.filterSessionStartState.input);
 
 		const hitMaxResults = searchResults.some(({ hitMaxResults }) => hitMaxResults);
-		return { warningMessage: hitMaxResults ? localize('searchMaxResultsWarning', "The result set only contains a subset of all matches. Be more specific in your search to narrow down the results.") : undefined };
+		return {
+			isMatch: (item: ExplorerItem) => item.isMarkedAsFiltered(),
+			matchCount: searchResults.reduce((acc, { files, directories }) => acc + files.length + directories.length, 0),
+			warningMessage: hitMaxResults ? localize('searchMaxResultsWarning', "The result set only contains a subset of all matches. Be more specific in your search to narrow down the results.") : undefined
+		};
 	}
 
 	private addWorkspaceFilterResults(root: ExplorerItem, files: URI[], directories: URI[]): void {
@@ -473,7 +503,7 @@ export class ExplorerFindProvider implements IAsyncFindProvider<ExplorerItem> {
 		this.highlightSessionStartState = { rootsWithProviders: new Set(roots) };
 	}
 
-	async doHighlightFind(pattern: string, matchType: TreeFindMatchType, token: CancellationToken): Promise<IAsyncFindResultMetadata> {
+	async doHighlightFind(pattern: string, matchType: TreeFindMatchType, token: CancellationToken): Promise<IAsyncFindResult<ExplorerItem> | undefined> {
 		if (!this.highlightSessionStartState) {
 			throw new Error('ExplorerFindProvider: no highlight session state');
 		}
@@ -482,7 +512,7 @@ export class ExplorerFindProvider implements IAsyncFindProvider<ExplorerItem> {
 		const searchResults = await this.getSearchResults(pattern, roots, matchType, token);
 
 		if (token.isCancellationRequested) {
-			return {};
+			return undefined;
 		}
 
 		this.clearHighlights();
@@ -491,7 +521,11 @@ export class ExplorerFindProvider implements IAsyncFindProvider<ExplorerItem> {
 		}
 
 		const hitMaxResults = searchResults.some(({ hitMaxResults }) => hitMaxResults);
-		return { warningMessage: hitMaxResults ? localize('searchMaxResultsWarning', "The result set only contains a subset of all matches. Be more specific in your search to narrow down the results.") : undefined };
+		return {
+			isMatch: (item: ExplorerItem) => this.findHighlightTree.isMatch(item) || (this.findHighlightTree.get(item) > 0 && this.treeProvider().isCollapsed(item)),
+			matchCount: searchResults.reduce((acc, { files, directories }) => acc + files.length + directories.length, 0),
+			warningMessage: hitMaxResults ? localize('searchMaxResultsWarning', "The result set only contains a subset of all matches. Be more specific in your search to narrow down the results.") : undefined
+		};
 	}
 
 	private addWorkspaceHighlightResults(root: ExplorerItem, resources: URI[]): void {
@@ -515,7 +549,7 @@ export class ExplorerFindProvider implements IAsyncFindProvider<ExplorerItem> {
 			const firstParent = findFirstParent(resource, root);
 			if (firstParent) {
 				this.findHighlightTree.add(resource, root);
-				storeDirectories(firstParent);
+				storeDirectories(firstParent.parent!);
 			}
 		}
 
@@ -588,7 +622,10 @@ export class ExplorerFindProvider implements IAsyncFindProvider<ExplorerItem> {
 		const fileResultResources = fileResults.results.map(result => result.resource);
 		const directoryResources = getMatchingDirectoriesFromFiles(folderResults.results.map(result => result.resource), root, segmentMatchPattern);
 
-		return { explorerRoot: root, files: fileResultResources, directories: directoryResources, hitMaxResults: !!fileResults.limitHit || !!folderResults.limitHit };
+		const filteredFileResources = fileResultResources.filter(resource => !this.filesFilter.isIgnored(resource, root.resource, false));
+		const filteredDirectoryResources = directoryResources.filter(resource => !this.filesFilter.isIgnored(resource, root.resource, true));
+
+		return { explorerRoot: root, files: filteredFileResources, directories: filteredDirectoryResources, hitMaxResults: !!fileResults.limitHit || !!folderResults.limitHit };
 	}
 }
 
@@ -1371,12 +1408,9 @@ export class FilesFilter implements ITreeFilter<ExplorerItem, FuzzyScore> {
 		// Hide those that match Hidden Patterns
 		const cached = this.hiddenExpressionPerRoot.get(stat.root.resource.toString());
 		const globMatch = cached?.parsed(path.relative(stat.root.resource.path, stat.resource.path), stat.name, name => !!(stat.parent && stat.parent.getChild(name)));
-		// Small optimization to only traverse gitIgnore if the globMatch from fileExclude returned nothing
-		const ignoreFile = globMatch ? undefined : this.ignoreTreesPerRoot.get(stat.root.resource.toString())?.findSubstr(stat.resource);
-		const isIncludedInTraversal = ignoreFile?.isPathIncludedInTraversal(stat.resource.path, stat.isDirectory);
-		// Doing !undefined returns true and we want it to be false when undefined because that means it's not included in the ignore file
-		const isIgnoredByIgnoreFile = isIncludedInTraversal === undefined ? false : !isIncludedInTraversal;
-		if (isIgnoredByIgnoreFile || globMatch || stat.parent?.isExcluded) {
+		// Small optimization to only run isHiddenResource (traverse gitIgnore) if the globMatch from fileExclude returned nothing
+		const isHiddenResource = !!globMatch ? true : this.isIgnored(stat.resource, stat.root.resource, stat.isDirectory);
+		if (isHiddenResource || stat.parent?.isExcluded) {
 			stat.isExcluded = true;
 			const editors = this.editorService.visibleEditors;
 			const editor = editors.find(e => e.resource && this.uriIdentityService.extUri.isEqualOrParent(e.resource, stat.resource));
@@ -1391,6 +1425,14 @@ export class FilesFilter implements ITreeFilter<ExplorerItem, FuzzyScore> {
 		return true;
 	}
 
+	isIgnored(resource: URI, rootResource: URI, isDirectory: boolean): boolean {
+		const ignoreFile = this.ignoreTreesPerRoot.get(rootResource.toString())?.findSubstr(resource);
+		const isIncludedInTraversal = ignoreFile?.isPathIncludedInTraversal(resource.path, isDirectory);
+
+		// Doing !undefined returns true and we want it to be false when undefined because that means it's not included in the ignore file
+		return isIncludedInTraversal === undefined ? false : !isIncludedInTraversal;
+	}
+
 	dispose(): void {
 		dispose(this.toDispose);
 	}
diff --git a/src/vs/workbench/contrib/files/test/browser/explorerFindProvider.test.ts b/src/vs/workbench/contrib/files/test/browser/explorerFindProvider.test.ts
index c4b21ae4321bd..cc796913bc4e8 100644
--- a/src/vs/workbench/contrib/files/test/browser/explorerFindProvider.test.ts
+++ b/src/vs/workbench/contrib/files/test/browser/explorerFindProvider.test.ts
@@ -9,11 +9,11 @@ import { ICompressedTreeNode } from '../../../../../base/browser/ui/tree/compres
 import { ExplorerItem } from '../../common/explorerModel.js';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 import { ITreeCompressionDelegate } from '../../../../../base/browser/ui/tree/asyncDataTree.js';
-import { ITreeNode, IAsyncDataSource } from '../../../../../base/browser/ui/tree/tree.js';
+import { ITreeNode, IAsyncDataSource, ITreeFilter, TreeFilterResult } from '../../../../../base/browser/ui/tree/tree.js';
 import { DisposableStore } from '../../../../../base/common/lifecycle.js';
 import { TestFileService, workbenchInstantiationService } from '../../../../test/browser/workbenchTestServices.js';
 import { NullFilesConfigurationService } from '../../../../test/common/workbenchTestServices.js';
-import { ExplorerFindProvider } from '../../browser/views/explorerViewer.js';
+import { ExplorerFindProvider, FilesFilter } from '../../browser/views/explorerViewer.js';
 import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
 import { IWorkbenchCompressibleAsyncDataTreeOptions, WorkbenchCompressibleAsyncDataTree } from '../../../../../platform/list/browser/listService.js';
 import { IListAccessibilityProvider } from '../../../../../base/browser/ui/list/listWidget.js';
@@ -120,7 +120,13 @@ class CompressionDelegate implements ITreeCompressionDelegate<ExplorerItem> {
 	}
 }
 
-suite('Files - ExplorerView', () => {
+class TestFilesFilter implements ITreeFilter<ExplorerItem> {
+	filter(): TreeFilterResult<void> { return true; }
+	isIgnored(): boolean { return false; }
+	dispose() { }
+}
+
+suite('Find Provider - ExplorerView', () => {
 	const disposables = ensureNoDisposablesAreLeakedInTestSuite();
 
 	const fileService = new TestFileService();
@@ -196,6 +202,7 @@ suite('Files - ExplorerView', () => {
 		const compressionDelegate = new CompressionDelegate(dataSource);
 		const keyboardNavigationLabelProvider = new KeyboardNavigationLabelProvider();
 		const accessibilityProvider = new AccessibilityProvider();
+		const filter = instantiationService.createInstance(TestFilesFilter) as unknown as FilesFilter;
 
 		const options: IWorkbenchCompressibleAsyncDataTreeOptions<ExplorerItem, FuzzyScore> = { identityProvider: new IdentityProvider(), keyboardNavigationLabelProvider, accessibilityProvider };
 		const tree = disposables.add(instantiationService.createInstance(WorkbenchCompressibleAsyncDataTree<ExplorerItem | ExplorerItem[], ExplorerItem, FuzzyScore>, 'test', container, new VirtualDelegate(), compressionDelegate, [new Renderer()], dataSource, options));
@@ -203,7 +210,7 @@ suite('Files - ExplorerView', () => {
 
 		await tree.setInput(root);
 
-		const findProvider = instantiationService.createInstance(ExplorerFindProvider, () => tree);
+		const findProvider = instantiationService.createInstance(ExplorerFindProvider, filter, () => tree);
 
 		findProvider.startSession();
 
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatController.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatController.ts
index 4ae0db4961b75..113a0b014702d 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatController.ts
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatController.ts
@@ -17,6 +17,7 @@ import { StopWatch } from '../../../../base/common/stopwatch.js';
 import { assertType } from '../../../../base/common/types.js';
 import { generateUuid } from '../../../../base/common/uuid.js';
 import { ICodeEditor, isCodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { EditorOption } from '../../../../editor/common/config/editorOptions.js';
 import { IPosition, Position } from '../../../../editor/common/core/position.js';
 import { IRange, Range } from '../../../../editor/common/core/range.js';
 import { ISelection, Selection, SelectionDirection } from '../../../../editor/common/core/selection.js';
@@ -591,8 +592,19 @@ export class InlineChatController implements IEditorContribution {
 		const progressiveEditsClock = StopWatch.create();
 		const progressiveEditsQueue = new Queue();
 
-		let next: State.WAIT_FOR_INPUT | State.SHOW_REQUEST | State.CANCEL | State.PAUSE | State.ACCEPT = State.WAIT_FOR_INPUT;
+		// disable typing and squiggles while streaming a reply
+		const origDeco = this._editor.getOption(EditorOption.renderValidationDecorations);
+		this._editor.updateOptions({
+			renderValidationDecorations: 'off'
+		});
+		store.add(toDisposable(() => {
+			this._editor.updateOptions({
+				renderValidationDecorations: origDeco
+			});
+		}));
 
+
+		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);
@@ -804,9 +816,9 @@ export class InlineChatController implements IEditorContribution {
 			this._log(err);
 		}
 
+		this._resetWidget();
 		this._inlineChatSessionService.releaseSession(this._session);
 
-		this._resetWidget();
 
 		this._strategy?.dispose();
 		this._strategy = undefined;
@@ -814,6 +826,9 @@ export class InlineChatController implements IEditorContribution {
 	}
 
 	private async[State.CANCEL]() {
+
+		this._resetWidget();
+
 		if (this._session) {
 			// assertType(this._session);
 			assertType(this._strategy);
@@ -838,7 +853,6 @@ export class InlineChatController implements IEditorContribution {
 			}
 		}
 
-		this._resetWidget();
 
 		this._strategy?.dispose();
 		this._strategy = undefined;
@@ -888,9 +902,7 @@ export class InlineChatController implements IEditorContribution {
 		this._ctxVisible.reset();
 		this._ctxUserDidEdit.reset();
 
-		if (this._ui.rawValue) {
-			this._ui.rawValue.hide();
-		}
+		this._ui.rawValue?.hide();
 
 		// Return focus to the editor only if the current focus is within the editor widget
 		if (this._editor.hasWidgetFocus()) {
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatCurrentLine.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatCurrentLine.ts
index dfd271fa79b1d..42e95f4c460ed 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatCurrentLine.ts
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatCurrentLine.ts
@@ -184,6 +184,12 @@ export class InlineChatHintsController extends Disposable implements IEditorCont
 
 		const ghostCtrl = InlineCompletionsController.get(editor);
 
+		this._store.add(commandService.onWillExecuteCommand(e => {
+			if (e.commandId === _inlineChatActionId || e.commandId === ACTION_START) {
+				this.hide();
+			}
+		}));
+
 		this._store.add(this._editor.onMouseDown(e => {
 			if (e.target.type !== MouseTargetType.CONTENT_TEXT) {
 				return;
@@ -227,16 +233,19 @@ export class InlineChatHintsController extends Disposable implements IEditorCont
 
 			const visible = this._visibilityObs.read(r);// || this._ctxMenuVisibleObs.read(r);
 			const isEol = model.getLineMaxColumn(position.lineNumber) === position.column;
-			const isWhitespace = model.getLineLastNonWhitespaceColumn(position.lineNumber) === 0 && model.getValueLength() > 0;
+			const isWhitespace = model.getLineLastNonWhitespaceColumn(position.lineNumber) === 0 && model.getValueLength() > 0 && position.column > 1;
 
-			const shouldShow = (isWhitespace && _configurationService.getValue(InlineChatConfigKeys.LineEmptyHint))
-				|| (visible && isEol && _configurationService.getValue(InlineChatConfigKeys.LineSuffixHint));
+			if (isWhitespace) {
+				return _configurationService.getValue(InlineChatConfigKeys.LineEmptyHint)
+					? { isEol, isWhitespace, kb, position, model }
+					: undefined;
+			}
 
-			if (!shouldShow) {
-				return undefined;
+			if (visible && isEol && _configurationService.getValue(InlineChatConfigKeys.LineSuffixHint)) {
+				return { isEol, isWhitespace, kb, position, model };
 			}
 
-			return { isEol, isWhitespace, kb, position, model };
+			return undefined;
 		});
 
 		this._store.add(autorun(r => {
@@ -255,9 +264,9 @@ export class InlineChatHintsController extends Disposable implements IEditorCont
 			const inlineClassName: string[] = ['inline-chat-hint'];
 			let content: string;
 			if (isWhitespace) {
-				content = '\u00a0' + localize('title2', "{0} to edit with {1}...", kb, agentName);
+				content = '\u00a0' + localize('title2', "{0} to edit with {1}", kb, agentName);
 			} else if (isEol) {
-				content = '\u00a0' + localize('title1', "{0} to continue with {1}...", kb, agentName);
+				content = '\u00a0' + localize('title1', "{0} to continue with {1}", kb, agentName);
 			} else {
 				content = '\u200a' + kb + '\u200a';
 				inlineClassName.push('embedded');
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatWidget.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatWidget.ts
index 9060badbfad53..c947e3ed8562e 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatWidget.ts
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatWidget.ts
@@ -4,7 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { $, Dimension, getActiveElement, getTotalHeight, h, reset, trackFocus } from '../../../../base/browser/dom.js';
-import { renderFormattedText } from '../../../../base/browser/formattedTextRenderer.js';
 import { IActionViewItemOptions } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
 import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
 import { renderLabelWithIcons } from '../../../../base/browser/ui/iconLabel/iconLabels.js';
@@ -49,8 +48,7 @@ import { ChatWidget, IChatViewState, IChatWidgetLocationOptions } from '../../ch
 import { chatRequestBackground } from '../../chat/common/chatColors.js';
 import { ChatContextKeys } from '../../chat/common/chatContextKeys.js';
 import { IChatModel } from '../../chat/common/chatModel.js';
-import { chatSubcommandLeader } from '../../chat/common/chatParserTypes.js';
-import { ChatAgentVoteDirection, IChatSendRequestOptions, IChatService } from '../../chat/common/chatService.js';
+import { ChatAgentVoteDirection, IChatService } from '../../chat/common/chatService.js';
 import { isResponseVM } from '../../chat/common/chatViewModel.js';
 import { CTX_INLINE_CHAT_FOCUSED, CTX_INLINE_CHAT_RESPONSE_FOCUSED, inlineChatBackground, inlineChatForeground } from '../common/inlineChat.js';
 import { HunkInformation, Session } from './inlineChatSession.js';
@@ -90,7 +88,6 @@ export class InlineChatWidget {
 			h('div.status@status', [
 				h('div.label.info.hidden@infoLabel'),
 				h('div.actions.hidden@toolbar1'),
-				h('div.rerun@rerun'),
 				h('div.label.status.hidden@statusLabel'),
 				h('div.actions.secondary.hidden@toolbar2'),
 			]),
@@ -201,8 +198,6 @@ export class InlineChatWidget {
 				ctxResponseSupportIssues.reset();
 			}));
 
-			const detectedAgentCmdStore = viewModelStore.add(new DisposableStore());
-
 			viewModelStore.add(viewModel.onDidChange(() => {
 
 				this._requestInProgress.set(viewModel.requestInProgress, undefined);
@@ -216,37 +211,6 @@ export class InlineChatWidget {
 				ctxResponseErrorFiltered.set((!!(isResponseVM(last) && last.errorDetails?.responseIsFiltered)));
 				ctxResponseSupportIssues.set(isResponseVM(last) && (last.agent?.metadata.supportIssueReporting ?? false));
 
-				if (isResponseVM(last) && last.agentOrSlashCommandDetected && last.slashCommand) {
-					this._elements.rerun.innerText = last.slashCommand.name;
-					this._elements.rerun.title = last.slashCommand.description;
-
-					const msg = localize('usedAgentSlashCommand', "``{0}`` [[(rerun without)]]", `${chatSubcommandLeader}${last.slashCommand.name}`);
-
-					reset(this._elements.rerun, renderFormattedText(msg, {
-						className: 'agentOrSlashCommandDetected',
-						inline: true,
-						renderCodeSegments: true,
-						actionHandler: {
-							disposables: detectedAgentCmdStore,
-							callback: (content) => {
-								const request = this._chatService.getSession(last.sessionId)?.getRequests().find(candidate => candidate.id === last.requestId);
-								if (request) {
-									const options: IChatSendRequestOptions = {
-										noCommandDetection: true,
-										attempt: request.attempt + 1,
-										location: location.location,
-										userSelectedModelId: this.chatWidget.input.currentLanguageModel
-									};
-									this._chatService.resendRequest(request, options);
-								}
-							},
-						}
-					}));
-
-				} else {
-					reset(this._elements.rerun);
-				}
-
 				this._onDidChangeHeight.fire();
 			}));
 			this._onDidChangeHeight.fire();
@@ -515,7 +479,6 @@ export class InlineChatWidget {
 		this._chatWidget.saveState();
 
 		reset(this._elements.statusLabel);
-		reset(this._elements.rerun);
 		this._elements.statusLabel.classList.toggle('hidden', true);
 		this._elements.toolbar1.classList.add('hidden');
 		this._elements.toolbar2.classList.add('hidden');
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatZoneWidget.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatZoneWidget.ts
index 267dd8dd858a9..f9eae206b0b16 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatZoneWidget.ts
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatZoneWidget.ts
@@ -89,6 +89,7 @@ export class InlineChatZoneWidget extends ZoneWidget {
 						return isEqual(uri, editor.getModel()?.uri)
 							&& configurationService.getValue<EditMode>(InlineChatConfigKeys.Mode) === EditMode.Live;
 					},
+					renderDetectedCommandsWithRequest: true,
 				}
 			}
 		});
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 708a821ba7d91..7ef2b96f6579d 100644
--- a/src/vs/workbench/contrib/inlineChat/test/browser/inlineChatController.test.ts
+++ b/src/vs/workbench/contrib/inlineChat/test/browser/inlineChatController.test.ts
@@ -71,7 +71,7 @@ import { ITextModelService } from '../../../../../editor/common/services/resolve
 import { TextModelResolverService } from '../../../../services/textmodelResolver/common/textModelResolverService.js';
 import { ChatInputBoxContentProvider } from '../../../chat/browser/chatEdinputInputContentProvider.js';
 
-suite('InteractiveChatController', function () {
+suite('InlineChatController', function () {
 
 	const agentData = {
 		extensionId: nullExtensionDescription.identifier,
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookCellDecorators.ts b/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookCellDecorators.ts
index 9c3a2e66930d1..3b849314eee95 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookCellDecorators.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookCellDecorators.ts
@@ -3,7 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { isEqual } from '../../../../../../base/common/resources.js';
 import { Disposable, DisposableStore, dispose, toDisposable } from '../../../../../../base/common/lifecycle.js';
 import { autorun, autorunWithStore, derived, observableFromEvent } from '../../../../../../base/common/observable.js';
 import { IChatEditingService, ChatEditingSessionState } from '../../../../chat/common/chatEditingService.js';
@@ -32,6 +31,7 @@ import { splitLines } from '../../../../../../base/common/strings.js';
 import { DefaultLineHeight } from '../../diff/diffElementViewModel.js';
 import { INotebookOriginalCellModelFactory } from './notebookOriginalCellModelFactory.js';
 import { DetailedLineRangeMapping } from '../../../../../../editor/common/diff/rangeMapping.js';
+import { isEqual } from '../../../../../../base/common/resources.js';
 
 
 export class NotebookCellDiffDecorator extends DisposableStore {
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookChatEditController.ts b/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookChatEditController.ts
index 03c38c2e40b87..80633f7556b84 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookChatEditController.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookChatEditController.ts
@@ -3,7 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { isEqual } from '../../../../../../base/common/resources.js';
 import { Disposable, dispose, IReference, toDisposable } from '../../../../../../base/common/lifecycle.js';
 import { autorun, derived, derivedWithStore, observableFromEvent, observableValue } from '../../../../../../base/common/observable.js';
 import { IChatEditingService, WorkingSetEntryState } from '../../../../chat/common/chatEditingService.js';
@@ -86,7 +85,7 @@ class NotebookChatEditorController extends Disposable {
 			if (!model || !session) {
 				return;
 			}
-			return session.entries.read(r).find(e => isEqual(e.modifiedURI, model.uri));
+			return session.readEntry(model.uri, r);
 		}).recomputeInitiallyAndOnChange(this._store);
 
 
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookSynchronizer.ts b/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookSynchronizer.ts
index d2a1325348451..2f5571dd6e8cf 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookSynchronizer.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookSynchronizer.ts
@@ -91,7 +91,7 @@ export class NotebookModelSynchronizer extends Disposable {
 			if (!session) {
 				return;
 			}
-			return session.entries.read(r).find(e => isEqual(e.modifiedURI, model.uri));
+			return session.readEntry(model.uri, r);
 		}).recomputeInitiallyAndOnChange(this._store);
 
 
diff --git a/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.ts b/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.ts
index 554ea526b6648..3393ae598df14 100644
--- a/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.ts
+++ b/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.ts
@@ -34,7 +34,7 @@ import { IDiffEditorOptions, EditorOption } from '../../../../editor/common/conf
 import { Action, IAction, ActionRunner } from '../../../../base/common/actions.js';
 import { IActionBarOptions } from '../../../../base/browser/ui/actionbar/actionbar.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
-import { basename, isEqual } from '../../../../base/common/resources.js';
+import { basename } from '../../../../base/common/resources.js';
 import { MenuId, IMenuService, IMenu, MenuItemAction, MenuRegistry } from '../../../../platform/actions/common/actions.js';
 import { getFlatActionBarActions } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
 import { ScrollType, IEditorContribution, IDiffEditorModel, IEditorModel, IEditorDecorationsCollection } from '../../../../editor/common/editorCommon.js';
@@ -1457,8 +1457,8 @@ export class DirtyDiffModel extends Disposable {
 		}
 		const uri = this._model.resource;
 
-		const session = this._chatEditingService.getEditingSession(uri);
-		if (session && session.entries.get().find(v => isEqual(v.modifiedURI, uri) && v.state.get() === WorkingSetEntryState.Modified)) {
+		const session = this._chatEditingService.currentEditingSession;
+		if (session && session.getEntry(uri)?.state.get() === WorkingSetEntryState.Modified) {
 			// disable dirty diff when doing chat edits
 			return Promise.resolve([]);
 		}
diff --git a/src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.ts b/src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.ts
index 8b786a6d4071b..8f6ff85d98b09 100644
--- a/src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.ts
+++ b/src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.ts
@@ -40,11 +40,11 @@ import { IListAccessibilityProvider } from '../../../../base/browser/ui/list/lis
 import { stripIcons } from '../../../../base/common/iconLabels.js';
 import { IWorkbenchLayoutService, Position } from '../../../services/layout/browser/layoutService.js';
 import { HoverPosition } from '../../../../base/browser/ui/hover/hoverWidget.js';
-import { Action2, MenuId, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { Action2, IMenuService, MenuId, MenuItemAction, registerAction2 } from '../../../../platform/actions/common/actions.js';
 import { Sequencer, Throttler } from '../../../../base/common/async.js';
 import { URI } from '../../../../base/common/uri.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.js';
-import { ActionRunner, IAction, IActionRunner } from '../../../../base/common/actions.js';
+import { ActionRunner, IAction, IActionRunner, Separator, SubmenuAction } from '../../../../base/common/actions.js';
 import { delta, groupBy } from '../../../../base/common/arrays.js';
 import { Codicon } from '../../../../base/common/codicons.js';
 import { IProgressService } from '../../../../platform/progress/common/progress.js';
@@ -63,6 +63,7 @@ import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hover
 import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
 import { IExtensionService } from '../../../services/extensions/common/extensions.js';
 import { groupBy as groupBy2 } from '../../../../base/common/collections.js';
+import { getFlatContextMenuActions } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
 
 const PICK_REPOSITORY_ACTION_ID = 'workbench.scm.action.graph.pickRepository';
 const PICK_HISTORY_ITEM_REFS_ACTION_ID = 'workbench.scm.action.graph.pickHistoryItemRefs';
@@ -1213,6 +1214,7 @@ export class SCMHistoryViewPane extends ViewPane {
 		options: IViewPaneOptions,
 		@ICommandService private readonly _commandService: ICommandService,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+		@IMenuService private readonly _menuService: IMenuService,
 		@IProgressService private readonly _progressService: IProgressService,
 		@IConfigurationService configurationService: IConfigurationService,
 		@IContextMenuService contextMenuService: IContextMenuService,
@@ -1570,14 +1572,46 @@ export class SCMHistoryViewPane extends ViewPane {
 			return;
 		}
 
+		const historyItemMenuActions = this._menuService.getMenuActions(MenuId.SCMChangesContext, this.scopedContextKeyService, {
+			arg: element.repository.provider,
+			shouldForwardArgs: true
+		});
+
+		const actions = getFlatContextMenuActions(historyItemMenuActions);
+		if (element.historyItemViewModel.historyItem.references?.length) {
+			actions.push(new Separator());
+		}
+
+		const that = this;
+		for (const ref of element.historyItemViewModel.historyItem.references ?? []) {
+			const contextKeyService = this.scopedContextKeyService.createOverlay([
+				['scmHistoryItemRef', ref.id]
+			]);
+
+			const historyItemRefMenuActions = this._menuService.getMenuActions(MenuId.SCMHistoryItemRefContext, contextKeyService);
+			const historyItemRefSubMenuActions = getFlatContextMenuActions(historyItemRefMenuActions)
+				.map(action => new class extends MenuItemAction {
+					constructor() {
+						super(
+							{ id: action.id, title: action.label }, undefined,
+							{ arg: element!.repository.provider, shouldForwardArgs: true },
+							undefined, undefined, contextKeyService, that._commandService);
+					}
+
+					override run(): Promise<void> {
+						return super.run(element.historyItemViewModel.historyItem, ref.id);
+					}
+				});
+
+			if (historyItemRefSubMenuActions.length > 0) {
+				actions.push(new SubmenuAction(`scm.historyItemRef.${ref.id}`, ref.name, historyItemRefSubMenuActions));
+			}
+		}
+
 		this.contextMenuService.showContextMenu({
 			contextKeyService: this.scopedContextKeyService,
-			menuId: MenuId.SCMChangesContext,
-			menuActionOptions: {
-				arg: element.repository.provider,
-				shouldForwardArgs: true
-			},
 			getAnchor: () => e.anchor,
+			getActions: () => actions,
 			getActionsContext: () => element.historyItemViewModel.historyItem
 		});
 	}
diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionService.ts b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionService.ts
index 8666054c46030..d2a92171c4861 100644
--- a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionService.ts
+++ b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionService.ts
@@ -5,7 +5,6 @@
 import { CancellationToken } from '../../../../../base/common/cancellation.js';
 import { Disposable, IDisposable, toDisposable } from '../../../../../base/common/lifecycle.js';
 import { Schemas } from '../../../../../base/common/network.js';
-import { basename } from '../../../../../base/common/path.js';
 import { URI } from '../../../../../base/common/uri.js';
 import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
 import { IFileService } from '../../../../../platform/files/common/files.js';
@@ -199,21 +198,15 @@ export class TerminalCompletionService extends Disposable implements ITerminalCo
 		}
 
 		const resourceCompletions: ITerminalCompletion[] = [];
-
-		const parentDirPath = cwd.fsPath.split(resourceRequestConfig.pathSeparator).slice(0, -1).join(resourceRequestConfig.pathSeparator);
-		const dirToPrefixMap = new Map<URI, string>();
-
-		dirToPrefixMap.set(cwd, '.');
-		dirToPrefixMap.set(cwd.with({ path: parentDirPath }), '..');
-
 		const endsWithSpace = promptValue.substring(0, cursorPosition).endsWith(' ');
 		let lastWord;
 		if (endsWithSpace) {
 			lastWord = '';
 		} else {
-			lastWord = promptValue.substring(0, cursorPosition).trim().split(' ').pop() ?? '';
+			lastWord = promptValue.substring(0, cursorPosition).trim().split(' ').at(-1) ?? '';
 		}
-		if (lastWord.includes(basename(cwd.fsPath))) {
+		const pathStartsWithSlash = /^(\.\/|\.\.\/)/.test(lastWord);
+		if (pathStartsWithSlash) {
 			lastWord = '';
 		}
 
@@ -237,34 +230,37 @@ export class TerminalCompletionService extends Disposable implements ITerminalCo
 		// 	});
 		// }
 
-		for (const [dir, prefix] of dirToPrefixMap) {
-			const fileStat = await this._fileService.resolve(dir, { resolveSingleChildDescendants: true });
-			if (!fileStat || !fileStat?.children) {
-				return;
-			}
+		const fileStat = await this._fileService.resolve(cwd, { resolveSingleChildDescendants: true });
+		if (!fileStat || !fileStat?.children) {
+			return;
+		}
 
-			for (const stat of fileStat.children) {
-				let kind: TerminalCompletionItemKind | undefined;
-				if (foldersRequested && stat.isDirectory) {
-					kind = TerminalCompletionItemKind.Folder;
-				}
-				if (filesRequested && !stat.isDirectory && (stat.isFile || stat.resource.scheme === Schemas.file)) {
-					kind = TerminalCompletionItemKind.File;
-				}
-				if (kind === undefined) {
-					continue;
-				}
-				const isDirectory = kind === TerminalCompletionItemKind.Folder;
-				const label = isDirectory ? prefix + stat.resource.fsPath.replace(dir.fsPath, '') + resourceRequestConfig.pathSeparator : prefix + stat.resource.fsPath.replace(dir.fsPath, '');
-				resourceCompletions.push({
-					label,
-					kind,
-					isDirectory,
-					isFile: kind === TerminalCompletionItemKind.File,
-					replacementIndex: cursorPosition - lastWord.length,
-					replacementLength: label.length
-				});
+		for (const stat of fileStat.children) {
+			let kind: TerminalCompletionItemKind | undefined;
+			if (foldersRequested && stat.isDirectory) {
+				kind = TerminalCompletionItemKind.Folder;
+			}
+			if (filesRequested && !stat.isDirectory && (stat.isFile || stat.resource.scheme === Schemas.file)) {
+				kind = TerminalCompletionItemKind.File;
 			}
+			if (kind === undefined) {
+				continue;
+			}
+			const isDirectory = kind === TerminalCompletionItemKind.Folder;
+			let label;
+			if (pathStartsWithSlash) {
+				label = isDirectory ? stat.resource.fsPath.replace(cwd.fsPath, '').substring(1) + resourceRequestConfig.pathSeparator : stat.resource.fsPath.replace(cwd.fsPath, '').substring(1).replace(cwd.fsPath, '');
+			} else {
+				label = isDirectory ? '.' + stat.resource.fsPath.replace(cwd.fsPath, '') + resourceRequestConfig.pathSeparator : '.' + stat.resource.fsPath.replace(cwd.fsPath, '');
+			}
+			resourceCompletions.push({
+				label,
+				kind,
+				isDirectory,
+				isFile: kind === TerminalCompletionItemKind.File,
+				replacementIndex: cursorPosition - lastWord.length,
+				replacementLength: label.length
+			});
 		}
 
 		return resourceCompletions.length ? resourceCompletions : undefined;
diff --git a/src/vs/workbench/contrib/testing/browser/testingDecorations.ts b/src/vs/workbench/contrib/testing/browser/testingDecorations.ts
index 494f0703bbed2..f65839ebff53d 100644
--- a/src/vs/workbench/contrib/testing/browser/testingDecorations.ts
+++ b/src/vs/workbench/contrib/testing/browser/testingDecorations.ts
@@ -1374,7 +1374,7 @@ class TestErrorContentWidget extends Disposable implements IContentWidget {
 
 		let text: string;
 		if (message.expected !== undefined && message.actual !== undefined) {
-			text = `${truncateMiddle(message.actual, 15)} != ${truncateMiddle(message.expected, 15)}`;
+			text = `${truncateMiddle(message.actual.replace(/\s+/g, ' '), 30)} != ${truncateMiddle(message.expected.replace(/\s+/g, ' '), 30)}`;
 		} else {
 			const msg = renderStringAsPlaintext(message.message);
 			const lf = msg.indexOf('\n');
diff --git a/src/vs/workbench/services/actions/common/menusExtensionPoint.ts b/src/vs/workbench/services/actions/common/menusExtensionPoint.ts
index 683d0a924527c..7b6dff93618d5 100644
--- a/src/vs/workbench/services/actions/common/menusExtensionPoint.ts
+++ b/src/vs/workbench/services/actions/common/menusExtensionPoint.ts
@@ -187,6 +187,12 @@ const apiMenus: IAPIMenu[] = [
 		description: localize('menus.historyItemContext', "The Source Control history item context menu"),
 		proposed: 'contribSourceControlHistoryItemMenu'
 	},
+	{
+		key: 'scm/historyItemRef/context',
+		id: MenuId.SCMHistoryItemRefContext,
+		description: localize('menus.historyItemRefContext', "The Source Control history item reference context menu"),
+		proposed: 'contribSourceControlHistoryItemMenu'
+	},
 	{
 		key: 'statusBar/remoteIndicator',
 		id: MenuId.StatusBarRemoteIndicatorMenu,
diff --git a/src/vs/workbench/services/extensionManagement/common/extensionFeatures.ts b/src/vs/workbench/services/extensionManagement/common/extensionFeatures.ts
index a44288fd9027a..c2f9a35cc926f 100644
--- a/src/vs/workbench/services/extensionManagement/common/extensionFeatures.ts
+++ b/src/vs/workbench/services/extensionManagement/common/extensionFeatures.ts
@@ -14,6 +14,7 @@ import Severity from '../../../../base/common/severity.js';
 import { IStringDictionary } from '../../../../base/common/collections.js';
 import { ResolvedKeybinding } from '../../../../base/common/keybindings.js';
 import { Color } from '../../../../base/common/color.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
 
 export namespace Extensions {
 	export const ExtensionFeaturesRegistry = 'workbench.registry.extensionFeatures';
@@ -56,6 +57,7 @@ export interface IExtensionFeatureDescriptor {
 	readonly id: string;
 	readonly label: string;
 	readonly description?: string;
+	readonly icon?: ThemeIcon;
 	readonly access: {
 		readonly canToggle?: boolean;
 		readonly requireUserConsent?: boolean;
@@ -73,11 +75,11 @@ export interface IExtensionFeaturesRegistry {
 
 export interface IExtensionFeatureAccessData {
 	readonly current?: {
-		readonly count: number;
-		readonly lastAccessed: number;
+		readonly accessTimes: Date[];
+		readonly lastAccessed: Date;
 		readonly status?: { readonly severity: Severity; readonly message: string };
 	};
-	readonly totalCount: number;
+	readonly accessTimes: Date[];
 }
 
 export const IExtensionFeaturesManagementService = createDecorator<IExtensionFeaturesManagementService>('IExtensionFeaturesManagementService');
@@ -92,6 +94,7 @@ export interface IExtensionFeaturesManagementService {
 	getAccess(extension: ExtensionIdentifier, featureId: string, justification?: string): Promise<boolean>;
 
 	readonly onDidChangeAccessData: Event<{ readonly extension: ExtensionIdentifier; readonly featureId: string; readonly accessData: IExtensionFeatureAccessData }>;
+	getAllAccessDataForExtension(extension: ExtensionIdentifier): Map<string, IExtensionFeatureAccessData>;
 	getAccessData(extension: ExtensionIdentifier, featureId: string): IExtensionFeatureAccessData | undefined;
 	setStatus(extension: ExtensionIdentifier, featureId: string, status: { readonly severity: Severity; readonly message: string } | undefined): void;
 }
diff --git a/src/vs/workbench/services/extensionManagement/common/extensionFeaturesManagemetService.ts b/src/vs/workbench/services/extensionManagement/common/extensionFeaturesManagemetService.ts
index 4eeb0851a4d44..172241857f4e3 100644
--- a/src/vs/workbench/services/extensionManagement/common/extensionFeaturesManagemetService.ts
+++ b/src/vs/workbench/services/extensionManagement/common/extensionFeaturesManagemetService.ts
@@ -47,6 +47,7 @@ class ExtensionFeaturesManagementService extends Disposable implements IExtensio
 		super();
 		this.registry = Registry.as<IExtensionFeaturesRegistry>(Extensions.ExtensionFeaturesRegistry);
 		this.extensionFeaturesState = this.loadState();
+		this.garbageCollectOldRequests();
 		this._register(storageService.onDidChangeValue(StorageScope.PROFILE, FEATURES_STATE_KEY, this._store)(e => this.onDidStorageChange(e)));
 	}
 
@@ -59,7 +60,7 @@ class ExtensionFeaturesManagementService extends Disposable implements IExtensio
 		if (isBoolean(isDisabled)) {
 			return !isDisabled;
 		}
-		const defaultExtensionAccess = feature.access.extensionsList?.[extension.value];
+		const defaultExtensionAccess = feature.access.extensionsList?.[extension._lower];
 		if (isBoolean(defaultExtensionAccess)) {
 			return defaultExtensionAccess;
 		}
@@ -109,7 +110,7 @@ class ExtensionFeaturesManagementService extends Disposable implements IExtensio
 				const extensionDescription = this.extensionService.extensions.find(e => ExtensionIdentifier.equals(e.identifier, extension));
 				const confirmationResult = await this.dialogService.confirm({
 					title: localize('accessExtensionFeature', "Access '{0}' Feature", feature.label),
-					message: localize('accessExtensionFeatureMessage', "'{0}' extension would like to access the '{1}' feature.", extensionDescription?.displayName ?? extension.value, feature.label),
+					message: localize('accessExtensionFeatureMessage', "'{0}' extension would like to access the '{1}' feature.", extensionDescription?.displayName ?? extension._lower, feature.label),
 					detail: justification ?? feature.description,
 					custom: true,
 					primaryButton: localize('allow', "Allow"),
@@ -123,17 +124,29 @@ class ExtensionFeaturesManagementService extends Disposable implements IExtensio
 			}
 		}
 
+		const accessTime = new Date();
 		featureState.accessData.current = {
-			count: featureState.accessData.current?.count ? featureState.accessData.current?.count + 1 : 1,
-			lastAccessed: Date.now(),
+			accessTimes: [accessTime].concat(featureState.accessData.current?.accessTimes ?? []),
+			lastAccessed: accessTime,
 			status: featureState.accessData.current?.status
 		};
-		featureState.accessData.totalCount = featureState.accessData.totalCount + 1;
+		featureState.accessData.accessTimes = (featureState.accessData.accessTimes ?? []).concat(accessTime);
 		this.saveState();
 		this._onDidChangeAccessData.fire({ extension, featureId, accessData: featureState.accessData });
 		return true;
 	}
 
+	getAllAccessDataForExtension(extension: ExtensionIdentifier): Map<string, IExtensionFeatureAccessData> {
+		const result = new Map<string, IExtensionFeatureAccessData>();
+		const extensionState = this.extensionFeaturesState.get(extension._lower);
+		if (extensionState) {
+			for (const [featureId, featureState] of extensionState) {
+				result.set(featureId, featureState.accessData);
+			}
+		}
+		return result;
+	}
+
 	getAccessData(extension: ExtensionIdentifier, featureId: string): IExtensionFeatureAccessData | undefined {
 		const feature = this.registry.getExtensionFeature(featureId);
 		if (!feature) {
@@ -149,26 +162,26 @@ class ExtensionFeaturesManagementService extends Disposable implements IExtensio
 		}
 		const featureState = this.getAndSetIfNotExistsExtensionFeatureState(extension, featureId);
 		featureState.accessData.current = {
-			count: featureState.accessData.current?.count ?? 0,
-			lastAccessed: featureState.accessData.current?.lastAccessed ?? 0,
+			accessTimes: featureState.accessData.current?.accessTimes ?? [],
+			lastAccessed: featureState.accessData.current?.lastAccessed ?? new Date(),
 			status
 		};
 		this._onDidChangeAccessData.fire({ extension, featureId, accessData: this.getAccessData(extension, featureId)! });
 	}
 
 	private getExtensionFeatureState(extension: ExtensionIdentifier, featureId: string): IExtensionFeatureState | undefined {
-		return this.extensionFeaturesState.get(extension.value)?.get(featureId);
+		return this.extensionFeaturesState.get(extension._lower)?.get(featureId);
 	}
 
 	private getAndSetIfNotExistsExtensionFeatureState(extension: ExtensionIdentifier, featureId: string): Mutable<IExtensionFeatureState> {
-		let extensionState = this.extensionFeaturesState.get(extension.value);
+		let extensionState = this.extensionFeaturesState.get(extension._lower);
 		if (!extensionState) {
 			extensionState = new Map<string, IExtensionFeatureState>();
-			this.extensionFeaturesState.set(extension.value, extensionState);
+			this.extensionFeaturesState.set(extension._lower, extensionState);
 		}
 		let featureState = extensionState.get(featureId);
 		if (!featureState) {
-			featureState = { accessData: { totalCount: 0 } };
+			featureState = { accessData: { accessTimes: [] } };
 			extensionState.set(featureId, featureState);
 		}
 		return featureState;
@@ -191,7 +204,7 @@ class ExtensionFeaturesManagementService extends Disposable implements IExtensio
 					const newAccessData = this.getAccessData(extension, featureId);
 					const oldAccessData = oldExtensionFeaturesState?.get(featureId)?.accessData;
 					if (!equals(newAccessData, oldAccessData)) {
-						this._onDidChangeAccessData.fire({ extension, featureId, accessData: newAccessData ?? { totalCount: 0 } });
+						this._onDidChangeAccessData.fire({ extension, featureId, accessData: newAccessData ?? { accessTimes: [] } });
 					}
 				}
 			}
@@ -199,7 +212,7 @@ class ExtensionFeaturesManagementService extends Disposable implements IExtensio
 	}
 
 	private loadState(): Map<string, Map<string, IExtensionFeatureState>> {
-		let data: IStringDictionary<IStringDictionary<{ disabled?: boolean; accessCount: number }>> = {};
+		let data: IStringDictionary<IStringDictionary<{ disabled?: boolean; accessTimes?: number[] }>> = {};
 		const raw = this.storageService.get(FEATURES_STATE_KEY, StorageScope.PROFILE, '{}');
 		try {
 			data = JSON.parse(raw);
@@ -215,29 +228,49 @@ class ExtensionFeaturesManagementService extends Disposable implements IExtensio
 				extensionFeatureState.set(featureId, {
 					disabled: extensionFeature.disabled,
 					accessData: {
-						totalCount: extensionFeature.accessCount
+						accessTimes: (extensionFeature.accessTimes ?? []).map(time => new Date(time)),
 					}
 				});
 			}
-			result.set(extensionId, extensionFeatureState);
+			result.set(extensionId.toLowerCase(), extensionFeatureState);
 		}
 		return result;
 	}
 
 	private saveState(): void {
-		const data: IStringDictionary<IStringDictionary<{ disabled?: boolean; accessCount: number }>> = {};
+		const data: IStringDictionary<IStringDictionary<{ disabled?: boolean; accessTimes: number[] }>> = {};
 		this.extensionFeaturesState.forEach((extensionState, extensionId) => {
-			const extensionFeatures: IStringDictionary<{ disabled?: boolean; accessCount: number }> = {};
+			const extensionFeatures: IStringDictionary<{ disabled?: boolean; accessTimes: number[] }> = {};
 			extensionState.forEach((featureState, featureId) => {
 				extensionFeatures[featureId] = {
 					disabled: featureState.disabled,
-					accessCount: featureState.accessData.totalCount
+					accessTimes: featureState.accessData.accessTimes.map(time => time.getTime()),
 				};
 			});
 			data[extensionId] = extensionFeatures;
 		});
 		this.storageService.store(FEATURES_STATE_KEY, JSON.stringify(data), StorageScope.PROFILE, StorageTarget.USER);
 	}
+
+	private garbageCollectOldRequests(): void {
+		const now = new Date();
+		const thirtyDaysAgo = new Date(now.setDate(now.getDate() - 30));
+		let modified = false;
+
+		for (const [, featuresStateMap] of this.extensionFeaturesState) {
+			for (const [, featureState] of featuresStateMap) {
+				const originalLength = featureState.accessData.accessTimes.length;
+				featureState.accessData.accessTimes = featureState.accessData.accessTimes.filter(accessTime => accessTime > thirtyDaysAgo);
+				if (featureState.accessData.accessTimes.length !== originalLength) {
+					modified = true;
+				}
+			}
+		}
+
+		if (modified) {
+			this.saveState();
+		}
+	}
 }
 
 registerSingleton(IExtensionFeaturesManagementService, ExtensionFeaturesManagementService, InstantiationType.Delayed);
diff --git a/test/unit/electron/renderer.js b/test/unit/electron/renderer.js
index 9dd1b2174ec09..7c28a98930cf7 100644
--- a/test/unit/electron/renderer.js
+++ b/test/unit/electron/renderer.js
@@ -211,7 +211,7 @@ async function loadTests(opts) {
 	]);
 
 	const _allowedSuitesWithOutput = new Set([
-		'InteractiveChatController'
+		'InlineChatController'
 	]);
 
 	let _testsWithUnexpectedOutput = false;