@codingame/monaco-vscode-chat-service-override 36.2.7 → 37.0.0

package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedDocumentEntry.js

@@ -142,7 +142,7 @@ let ChatEditingModifiedDocumentEntry = class ChatEditingModifiedDocumentEntry ex
             if (inProgress) {
                 const res = this._lastModifyingResponseObs.read(r);
                 const req = res && res.session.getRequests().find(value => value.id === res.requestId);
-                resourceFilter.value = markerService.installResourceFilter(this.modifiedURI, req?.message.text || ( localize(7019, "Chat Edits")));
+                resourceFilter.value = markerService.installResourceFilter(this.modifiedURI, req?.message.text || ( localize(8125, "Chat Edits")));
             } else {
                 resourceFilter.clear();
             }
@@ -194,7 +194,7 @@ let ChatEditingModifiedDocumentEntry = class ChatEditingModifiedDocumentEntry ex
     }
     _createUndoRedoElement(response) {
         const request = response.session.getRequests().find(req => req.id === response.requestId);
-        const label = request?.message.text ? ( localize(7020, "Chat Edit: '{0}'", request.message.text)) : ( localize(7021, "Chat Edit"));
+        const label = request?.message.text ? ( localize(8126, "Chat Edit: '{0}'", request.message.text)) : ( localize(8127, "Chat Edit"));
         return ( new SingleModelEditStackElement(label, "chat.edit", this.modifiedModel, null));
     }
     async acceptAgentEdits(resource, textEdits, isLastEdits, responseModel) {

package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedFileEntry.js

@@ -27,6 +27,7 @@ import { IUndoRedoService } from '@codingame/monaco-vscode-api/vscode/vs/platfor
 import { IFilesConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/filesConfiguration/common/filesConfigurationService.service';
 import { IAiEditTelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/editTelemetry/browser/telemetry/aiEditTelemetry/aiEditTelemetryService.service';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
+import { isAgentHostSessionResource } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService';
 import { ModifiedFileEntryState, ChatEditKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 import { observableValueOpts } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValueOpts';
@@ -42,7 +43,7 @@ class AutoAcceptControl {
         this.cancel = cancel;
     }
 }
-const pendingRewriteMinimap = registerColor("minimap.chatEditHighlight", ( transparent(editorBackground, 0.6)), ( localize(7022, "Color of pending edit regions in the minimap")));
+const pendingRewriteMinimap = registerColor("minimap.chatEditHighlight", ( transparent(editorBackground, 0.6)), ( localize(8128, "Color of pending edit regions in the minimap")));
 let AbstractChatEditingModifiedFileEntry = class AbstractChatEditingModifiedFileEntry extends Disposable {
     static {
         AbstractChatEditingModifiedFileEntry_1 = this;
@@ -227,11 +228,12 @@ let AbstractChatEditingModifiedFileEntry = class AbstractChatEditingModifiedFile
         this._notifyAction({
             kind: "chatEditingSessionAction",
             uri: this.modifiedURI,
-            hasRemainingEdits: false,
+            hasRemainingEdits: outcome === "userModified",
             outcome
         });
     }
     _notifyAction(action) {
+        const isAgentHostSession = isAgentHostSessionResource(this._telemetryInfo.sessionResource);
         if (action.kind === "chatEditingHunkAction" && action.outcome === "accepted") {
             this._aiEditTelemetryService.handleCodeAccepted({
                 suggestionId: undefined,
@@ -244,7 +246,8 @@ let AbstractChatEditingModifiedFileEntry = class AbstractChatEditingModifiedFile
                 feature: this._telemetryInfo.feature,
                 languageId: action.languageId,
                 source: undefined,
-                sourceRequestId: this._telemetryInfo.requestId
+                sourceRequestId: this._telemetryInfo.requestId,
+                isAgentHostSession
             });
         } else if (action.kind === "chatEditingHunkAction" && action.outcome === "rejected") {
             this._aiEditTelemetryService.handleCodeRejected({
@@ -258,7 +261,8 @@ let AbstractChatEditingModifiedFileEntry = class AbstractChatEditingModifiedFile
                 feature: this._telemetryInfo.feature,
                 languageId: action.languageId,
                 source: undefined,
-                sourceRequestId: this._telemetryInfo.requestId
+                sourceRequestId: this._telemetryInfo.requestId,
+                isAgentHostSession
             });
         }
         this._chatService.notifyUserAction({

package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.js

@@ -485,7 +485,7 @@ let ChatEditingModifiedNotebookEntry = class ChatEditingModifiedNotebookEntry ex
     }
     _createUndoRedoElement(response) {
         const request = response.session.getRequests().find(req => req.id === response.requestId);
-        const label = request?.message.text ? ( localize(7023, "Chat Edit: '{0}'", request.message.text)) : ( localize(7024, "Chat Edit"));
+        const label = request?.message.text ? ( localize(8129, "Chat Edit: '{0}'", request.message.text)) : ( localize(8130, "Chat Edit"));
         const transientOptions = this.transientOptions;
         const outputSizeLimit = this.configurationService.getValue(NotebookSetting.outputBackupSizeLimit) * 1024;
         let initial = createSnapshot(this.modifiedModel, transientOptions, outputSizeLimit);

package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingServiceImpl.d.ts

@@ -16,7 +16,7 @@ import { ILifecycleService } from "@codingame/monaco-vscode-api/vscode/vs/workbe
 import { IMultiDiffSourceResolver, IResolvedMultiDiffSource } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService";
 import { IMultiDiffSourceResolverService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService.service";
 import { INotebookService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service";
-import { IChatEditingSession, IChatEditingSessionProvider } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService";
+import { IChatEditReviewSession, IChatEditingSession, IChatEditingSessionProvider } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService";
 import { IChatEditingService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService.service";
 import { ChatModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel";
 import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service";
@@ -31,7 +31,8 @@ export declare class ChatEditingService extends Disposable implements IChatEditi
     _serviceBrand: undefined;
     private readonly _providers;
     private readonly _sessionsObs;
-    readonly editingSessionsObs: IObservable<readonly IChatEditingSession[]>;
+    private readonly _editingSessions;
+    readonly editingSessionsObs: IObservable<readonly IChatEditReviewSession[]>;
     constructor(_instantiationService: IInstantiationService, multiDiffSourceResolverService: IMultiDiffSourceResolverService, textModelService: ITextModelService, contextKeyService: IContextKeyService, _chatService: IChatService, _editorService: IEditorService, decorationsService: IDecorationsService, _fileService: IFileService, lifecycleService: ILifecycleService, storageService: IStorageService, logService: ILogService, extensionService: IExtensionService, productService: IProductService, notebookService: INotebookService, _configurationService: IConfigurationService);
     dispose(): void;
     startOrContinueGlobalEditingSession(chatModel: ChatModel): IChatEditingSession;
@@ -40,14 +41,16 @@ export declare class ChatEditingService extends Disposable implements IChatEditi
     createEditingSession(chatModel: ChatModel, global?: boolean): IChatEditingSession;
     transferEditingSession(chatModel: ChatModel, session: IChatEditingSession): IChatEditingSession;
     private _createEditingSession;
+    registerEditReviewSession(session: IChatEditReviewSession): IDisposable;
     registerEditingSessionProvider(scheme: string, provider: IChatEditingSessionProvider): IDisposable;
     private installAutoApplyObserver;
     private observerEditsInResponse;
 }
 export declare class ChatEditingMultiDiffSourceResolver implements IMultiDiffSourceResolver {
     private readonly _editingSessionsObs;
+    private readonly _getEditingSession;
     private readonly _instantiationService;
-    constructor(_editingSessionsObs: IObservable<readonly IChatEditingSession[]>, _instantiationService: IInstantiationService);
+    constructor(_editingSessionsObs: IObservable<readonly IChatEditReviewSession[]>, _getEditingSession: (chatSessionResource: URI) => IChatEditingSession | undefined, _instantiationService: IInstantiationService);
     canHandleUri(uri: URI): boolean;
     resolveDiffSource(uri: URI): Promise<IResolvedMultiDiffSource>;
 }

package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingServiceImpl.js

@@ -33,7 +33,7 @@ import { MultiDiffEditorItem } from '@codingame/monaco-vscode-api/vscode/vs/work
 import { IMultiDiffSourceResolverService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService.service';
 import { CellUri } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { INotebookService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
-import { chatEditingAgentSupportsReadonlyReferencesContextKey, ChatEditingSessionState, ModifiedFileEntryState, CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME, parseChatMultiDiffUri, chatEditingResourceContextKey, inChatEditingSessionContextKey } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService';
+import { chatEditingAgentSupportsReadonlyReferencesContextKey, ModifiedFileEntryState, CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME, parseChatMultiDiffUri, chatEditingResourceContextKey, inChatEditingSessionContextKey } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService';
 import { isCellTextEditOperationArray } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
 import { getChatSessionType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatUri';
@@ -76,6 +76,7 @@ let ChatEditingService = class ChatEditingService extends Disposable {
         this._sessionsObs = observableValueOpts({
             equalsFn: (a, b) => false
         }, ( new LinkedList()));
+        this._editingSessions = ( new ResourceMap());
         this.editingSessionsObs = derived(r => {
             const result = Array.from(this._sessionsObs.read(r));
             return result;
@@ -83,9 +84,13 @@ let ChatEditingService = class ChatEditingService extends Disposable {
         this._register(decorationsService.registerDecorationsProvider(
             _instantiationService.createInstance(ChatDecorationsProvider, this.editingSessionsObs)
         ));
-        this._register(multiDiffSourceResolverService.registerResolver(
-            _instantiationService.createInstance(ChatEditingMultiDiffSourceResolver, this.editingSessionsObs)
-        ));
+        this._register(
+            multiDiffSourceResolverService.registerResolver(_instantiationService.createInstance(
+                ChatEditingMultiDiffSourceResolver,
+                this.editingSessionsObs,
+                resource => this.getEditingSession(resource)
+            ))
+        );
         this._register(textModelService.registerTextModelContentProvider(
             ChatEditingTextModelContentProvider.scheme,
             _instantiationService.createInstance(ChatEditingTextModelContentProvider, this)
@@ -112,7 +117,7 @@ let ChatEditingService = class ChatEditingService extends Disposable {
         let storageTask;
         this._register(storageService.onWillSaveState(() => {
             const tasks = [];
-            for (const session of this.editingSessionsObs.get()) {
+            for (const session of ( this._editingSessions.values())) {
                 if (!session.isGlobalEditingSession) {
                     continue;
                 }
@@ -126,12 +131,12 @@ let ChatEditingService = class ChatEditingService extends Disposable {
             }
             e.join(storageTask, {
                 id: "join.chatEditingSession",
-                label: ( localize(7025, "Saving chat edits history"))
+                label: ( localize(8131, "Saving chat edits history"))
             });
         }));
     }
     dispose() {
-        dispose(this._sessionsObs.get());
+        dispose(( this._editingSessions.values()));
         super.dispose();
     }
     startOrContinueGlobalEditingSession(chatModel) {
@@ -147,7 +152,7 @@ let ChatEditingService = class ChatEditingService extends Disposable {
         return undefined;
     }
     getEditingSession(chatSessionResource) {
-        return this.editingSessionsObs.get().find(candidate => isEqual(candidate.chatSessionResource, chatSessionResource));
+        return this._editingSessions.get(chatSessionResource);
     }
     createEditingSession(chatModel, global = false) {
         return this._createEditingSession(chatModel, global, undefined);
@@ -170,6 +175,7 @@ let ChatEditingService = class ChatEditingService extends Disposable {
         );
         const list = this._sessionsObs.get();
         const removeSession = list.unshift(session);
+        this._editingSessions.set(session.chatSessionResource, session);
         const store = ( new DisposableStore());
         this._store.add(store);
         if (!provider && session instanceof ChatEditingSession) {
@@ -177,12 +183,24 @@ let ChatEditingService = class ChatEditingService extends Disposable {
         }
         store.add(session.onDidDispose(e => {
             removeSession();
+            if (this._editingSessions.get(session.chatSessionResource) === session) {
+                this._editingSessions.delete(session.chatSessionResource);
+            }
             this._sessionsObs.set(list, undefined);
             this._store.delete(store);
         }));
         this._sessionsObs.set(list, undefined);
         return session;
     }
+    registerEditReviewSession(session) {
+        const list = this._sessionsObs.get();
+        const removeSession = list.unshift(session);
+        this._sessionsObs.set(list, undefined);
+        return toDisposable(() => {
+            removeSession();
+            this._sessionsObs.set(list, undefined);
+        });
+    }
     registerEditingSessionProvider(scheme, provider) {
         this._providers.set(scheme, provider);
         return toDisposable(() => {
@@ -358,7 +376,7 @@ class ChatDecorationsProvider extends Disposable {
     constructor(_sessions) {
         super();
         this._sessions = _sessions;
-        this.label = ( localize(7026, "Chat Editing"));
+        this.label = ( localize(8132, "Chat Editing"));
         this._currentEntries = derived(this, r => {
             const sessions = this._sessions.read(r);
             if (!sessions) {
@@ -366,10 +384,8 @@ class ChatDecorationsProvider extends Disposable {
             }
             const result = [];
             for (const session of sessions) {
-                if (session.state.read(r) !== ChatEditingSessionState.Disposed) {
-                    const entries = session.entries.read(r);
-                    result.push(...entries);
-                }
+                const entries = session.entries.read(r);
+                result.push(...entries);
             }
             return result;
         });
@@ -402,7 +418,7 @@ class ChatDecorationsProvider extends Disposable {
             return {
                 weight: 1000,
                 letter: Codicon.diffModified,
-                tooltip: ( localize(7027, "Pending changes from chat")),
+                tooltip: ( localize(8133, "Pending changes from chat")),
                 bubble: true
             };
         }
@@ -410,8 +426,9 @@ class ChatDecorationsProvider extends Disposable {
     }
 }
 let ChatEditingMultiDiffSourceResolver = class ChatEditingMultiDiffSourceResolver {
-    constructor(_editingSessionsObs, _instantiationService) {
+    constructor(_editingSessionsObs, _getEditingSession, _instantiationService) {
         this._editingSessionsObs = _editingSessionsObs;
+        this._getEditingSession = _getEditingSession;
         this._instantiationService = _instantiationService;
     }
     canHandleUri(uri) {
@@ -420,14 +437,13 @@ let ChatEditingMultiDiffSourceResolver = class ChatEditingMultiDiffSourceResolve
     async resolveDiffSource(uri) {
         const parsed = parseChatMultiDiffUri(uri);
         const thisSession = derived(this, r => {
-            return this._editingSessionsObs.read(r).find(
-                candidate => isEqual(candidate.chatSessionResource, parsed.chatSessionResource)
-            );
+            this._editingSessionsObs.read(r);
+            return this._getEditingSession(parsed.chatSessionResource);
         });
         return this._instantiationService.createInstance(ChatEditingMultiDiffSource, thisSession, parsed.showPreviousChanges);
     }
 };
-ChatEditingMultiDiffSourceResolver = ( __decorate([( __param(1, IInstantiationService))], ChatEditingMultiDiffSourceResolver));
+ChatEditingMultiDiffSourceResolver = ( __decorate([( __param(2, IInstantiationService))], ChatEditingMultiDiffSourceResolver));
 class ChatEditingMultiDiffSource {
     constructor(_currentSession, _showPreviousChanges) {
         this._currentSession = _currentSession;

package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.js

@@ -5,6 +5,7 @@ import { VSBuffer } from '@codingame/monaco-vscode-api/vscode/vs/base/common/buf
 import { CancellationToken } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import { BugIndicatingError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+import { isStringInSample } from '@codingame/monaco-vscode-api/vscode/vs/base/common/hash';
 import { MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
 import { Iterable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/iterator';
 import { Disposable, DisposableStore, dispose } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
@@ -282,10 +283,13 @@ let ChatEditingSession = ChatEditingSession_1 = class ChatEditingSession extends
     storeState() {
         const storage = this._instantiationService.createInstance(ChatEditingSessionStorage, this.chatSessionResource);
         const storedState = this._getStoredState();
-        this._telemetryService.publicLog2("chatEditing/sessionStore", {
-            editSessionId: getKeyForChatSessionResource(this.chatSessionResource),
-            ...this._countEntryStates(this._entriesObs.get())
-        });
+        const editSessionId = getKeyForChatSessionResource(this.chatSessionResource);
+        if (isStringInSample(editSessionId, 5)) {
+            this._telemetryService.publicLog2("chatEditing/sessionStore", {
+                editSessionId,
+                ...this._countEntryStates(this._entriesObs.get())
+            });
+        }
         return storage.storeState(storedState);
     }
     _getStoredState(sessionResource = this.chatSessionResource) {
@@ -410,7 +414,7 @@ let ChatEditingSession = ChatEditingSession_1 = class ChatEditingSession extends
         }
         const input = MultiDiffEditorInput.fromResourceMultiDiffEditorInput({
             multiDiffSource: getMultiDiffSourceUri(this, previousChanges),
-            label: ( localize(7028, "Suggested Edits"))
+            label: ( localize(8134, "Suggested Edits"))
         }, this._instantiationService);
         this._editorPane = await this._editorService.openEditor(input, {
             pinned: true,
@@ -856,10 +860,13 @@ let ChatEditingSession = ChatEditingSession_1 = class ChatEditingSession extends
             }
         }
         this._entriesObs.set(entriesArr, undefined);
-        this._telemetryService.publicLog2("chatEditing/sessionRestore", {
-            editSessionId: getKeyForChatSessionResource(this.chatSessionResource),
-            ...this._countEntryStates(entriesArr)
-        });
+        const editSessionId = getKeyForChatSessionResource(this.chatSessionResource);
+        if (isStringInSample(editSessionId, 5)) {
+            this._telemetryService.publicLog2("chatEditing/sessionRestore", {
+                editSessionId,
+                ...this._countEntryStates(entriesArr)
+            });
+        }
     }
     async _acceptEdits(resource, textEdits, isLastEdits, responseModel) {
         const entry = await this._getOrCreateModifiedFileEntry(

package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSessionStorage.js

@@ -10,6 +10,7 @@ import { IEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/plat
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
+import { getChatSessionStorageResource } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatUri';
 import { getKeyForChatSessionResource } from './chatEditingOperations.js';
 
 const STORAGE_CONTENTS_FOLDER = "contents";
@@ -31,12 +32,12 @@ let ChatEditingSessionStorage = class ChatEditingSessionStorage {
     }
     _getStorageLocation() {
         const workspaceId = this._workspaceContextService.getWorkspace().id;
-        return joinPath(
+        const storageRoot = joinPath(
             this._environmentService.workspaceStorageHome,
             workspaceId,
-            "chatEditingSessions",
-            this.storageKey
+            "chatEditingSessions"
         );
+        return getChatSessionStorageResource(storageRoot, this.storageKey);
     }
     async restoreState() {
         const storageLocation = this._getStorageLocation();

package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingTextModelChangeService.d.ts

@@ -38,14 +38,14 @@ export declare class ChatEditingTextModelChangeService extends Disposable {
     private _diffOperationIds;
     private readonly _diffInfo;
     get diffInfo(): IObservable<{
-        originalModel: ITextModel;
-        modifiedModel: ITextModel;
-        keep: (changes: DetailedLineRangeMapping) => Promise<boolean>;
-        undo: (changes: DetailedLineRangeMapping) => Promise<boolean>;
         identical: boolean;
         quitEarly: boolean;
         changes: readonly DetailedLineRangeMapping[];
         moves: readonly import("@codingame/monaco-vscode-api/vscode/vs/editor/common/diff/linesDiffComputer").MovedText[];
+        originalModel: ITextModel;
+        modifiedModel: ITextModel;
+        keep: (changes: DetailedLineRangeMapping) => Promise<boolean>;
+        undo: (changes: DetailedLineRangeMapping) => Promise<boolean>;
     }>;
     private readonly _editDecorationClear;
     private _editDecorations;

package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/media/chatEditingEditorOverlay.css

@@ -43,6 +43,10 @@
 	gap: 6px;
 }
 
+.chat-editor-overlay-widget .chat-editor-overlay-progress > .codicon {
+	font-size: var(--vscode-codiconFontSize-compact);
+}
+
 .chat-editor-overlay-widget.busy .chat-editor-overlay-progress {
 	display: inline-flex;
 }

package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/media/chatEditingExplanationWidget.css

@@ -89,6 +89,11 @@
 	background-color: var(--vscode-toolbar-hoverBackground);
 }
 
+.chat-explanation-read-indicator > .codicon,
+.chat-explanation-item-read > .codicon {
+	font-size: var(--vscode-codiconFontSize-compact);
+}
+
 .chat-explanation-read-indicator.unread {
 	color: var(--vscode-textLink-foreground);
 	opacity: 1;
@@ -114,7 +119,7 @@
 
 /* Title */
 .chat-explanation-title {
-	font-weight: 500;
+	font-weight: var(--vscode-fontWeight-semiBold);
 	color: var(--vscode-foreground);
 	white-space: nowrap;
 }
@@ -221,7 +226,7 @@
 	border-radius: 3px;
 	color: var(--vscode-foreground);
 	opacity: 0.3;
-	font-size: 12px;
+	font-size: var(--vscode-codiconFontSize-compact);
 }
 
 .chat-explanation-item:hover .chat-explanation-item-read {

package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/chatEditingNotebookEditorIntegration.js

@@ -630,7 +630,7 @@ let ChatEditingNotebookEditorWidgetIntegration = class ChatEditingNotebookEditor
             modified: {
                 resource: this._entry.modifiedURI
             },
-            label: ( localize(7029, "{0} (changes from chat)", basename(this._entry.modifiedURI)))
+            label: ( localize(8135, "{0} (changes from chat)", basename(this._entry.modifiedURI)))
         };
         await this._editorService.openEditor(diffInput);
     }

package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/notebookCellChanges.d.ts

@@ -10,23 +10,23 @@ import { ITextModel } from "@codingame/monaco-vscode-api/vscode/vs/editor/common
  * Even when there are no changes, diff will contain the number of lines in the document.
  * This way we can always calculate the total number of lines in the document.
  */
-export type ICellDiffInfo = {
+export type ICellDiffInfo = ({
     originalCellIndex: number;
     modifiedCellIndex: number;
     type: "unchanged";
-} & IDocumentDiffWithModelsAndActions | {
+} & IDocumentDiffWithModelsAndActions) | ({
     originalCellIndex: number;
     modifiedCellIndex: number;
     type: "modified";
-} & IDocumentDiffWithModelsAndActions | {
+} & IDocumentDiffWithModelsAndActions) | ({
     modifiedCellIndex: undefined;
     originalCellIndex: number;
     type: "delete";
-} & IDocumentDiffWithModelsAndActions | {
+} & IDocumentDiffWithModelsAndActions) | ({
     modifiedCellIndex: number;
     originalCellIndex: undefined;
     type: "insert";
-} & IDocumentDiffWithModelsAndActions;
+} & IDocumentDiffWithModelsAndActions);
 interface IDocumentDiffWithModelsAndActions {
     /**
      * The changes between the original and modified document.

package/vscode/src/vs/workbench/contrib/chat/browser/chatImageCarouselService.js

@@ -9,7 +9,7 @@ import { VSBuffer } from '@codingame/monaco-vscode-api/vscode/vs/base/common/buf
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
-import { extractImagesFromChatResponse, extractImagesFromChatRequest, extractImagesFromChatVariables } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/common/chatImageExtraction';
+import { extractImagesFromChatResponse, extractImagesFromChatRequest, extractImagesFromChatVariables } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatImageExtraction';
 import { isRequestVM, isResponseVM } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 
@@ -86,7 +86,7 @@ async function collectCarouselSections(items, readFile, currentInput) {
         const inputImages = deduplicateConsecutiveImages(extractImagesFromChatVariables(currentInput.attachments));
         if (inputImages.length > 0) {
             sections.push({
-                title: currentInput.text.trim() || ( localize(7030, "Current Input")),
+                title: currentInput.text.trim() || ( localize(8136, "Current Input")),
                 images: ( inputImages.map((
                     {
                         uri,
@@ -177,7 +177,7 @@ function findImageInListByData(images, data) {
 }
 function buildCollectionArgs(sections, clickedGlobalIndex, sessionResource) {
     const collectionId = ( sessionResource.toString()) + "_carousel";
-    const defaultTitle = ( localize(7031, "Conversation Images"));
+    const defaultTitle = ( localize(8137, "Conversation Images"));
     return {
         collection: {
             id: collectionId,

package/vscode/src/vs/workbench/contrib/chat/browser/chatInputPills.d.ts

@@ -0,0 +1,86 @@
+import { type IAction, type IActionRunner } from "@codingame/monaco-vscode-api/vscode/vs/base/common/actions";
+import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { IObservable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
+import type { ThemeIcon } from "@codingame/monaco-vscode-api/vscode/vs/base/common/themables";
+import type { CodeWindow } from "@codingame/monaco-vscode-api/vscode/vs/base/browser/window";
+import { IContextMenuService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextview/browser/contextView.service";
+import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
+import { ResourceLabels } from "@codingame/monaco-vscode-api/vscode/vs/workbench/browser/labels";
+import { type IChatChangesStats } from "../../../browser/chatChangesPill.js";
+import { type ChatPillsCompactMode, type IChatPill, type IChatPillSection } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/browser/chatPills";
+import { type IChatDropdownPillOptions } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/browser/chatDropdownPill";
+import { SessionChatPillKind } from "../common/sessionChatPills.js";
+import { ISessionChatPillVisibilityService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/sessionChatPills.service";
+export interface IChatInputPillSource {
+    readonly kind?: SessionChatPillKind;
+    readonly hasData: IObservable<boolean>;
+    /** Whether any entries remain after the pill's own filtering. */
+    readonly isVisible?: IObservable<boolean>;
+    readonly pill: IObservable<IChatPill>;
+    getContextMenuActions?(): readonly IAction[];
+    /** Actions on this pill's content, shown directly when its context menu is opened. */
+    getContextMenuPrimaryActions?(): readonly IAction[];
+}
+export interface IChatInputPillsOptions {
+    readonly debugName: string;
+    readonly compact: ChatPillsCompactMode;
+    readonly targetWindow?: CodeWindow;
+    readonly enabled: IObservable<boolean>;
+    readonly sources: IObservable<readonly IChatInputPillSource[]>;
+    readonly offeredKinds: readonly SessionChatPillKind[];
+    readonly ariaLabel?: string;
+    readonly context?: IObservable<unknown>;
+    readonly actionRunner?: IActionRunner;
+    readonly focusFallback?: () => void;
+}
+export interface IStandardChatInputPillSections {
+    readonly sections: IObservable<readonly IChatPillSection[]>;
+    /** Keeps configuration reachable when the source filters out all its entries. */
+    readonly hasData?: IObservable<boolean>;
+    readonly icon?: ThemeIcon | IObservable<ThemeIcon>;
+    getContextMenuActions?(): readonly IAction[];
+    getContextMenuPrimaryActions?(): readonly IAction[];
+}
+export interface IStandardChatInputPillsData {
+    readonly changes?: {
+        readonly stats: IObservable<IChatChangesStats>;
+        readonly label: IObservable<string>;
+        open(): void;
+        getContextMenuActions?(): readonly IAction[];
+    };
+    readonly pullRequests?: IStandardChatInputPillSections;
+    readonly issues?: IStandardChatInputPillSections;
+    readonly artifacts?: IStandardChatInputPillSections;
+    readonly references?: IStandardChatInputPillSections;
+    readonly customizations?: IStandardChatInputPillSections;
+    readonly browsers?: IStandardChatInputPillSections;
+    readonly subagents?: IStandardChatInputPillSections;
+}
+/** Creates a source backed by one section/dropdown pill. */
+export declare function createChatSectionPillSource(kind: SessionChatPillKind, action: IChatPill["action"], sections: IObservable<readonly IChatPillSection[]>, options: IChatDropdownPillOptions, resourceLabels: ResourceLabels, instantiationService: IInstantiationService): IChatInputPillSource;
+/** Builds the canonical pill components and ordering from surface-specific data adapters. */
+export declare class StandardChatInputPillSources extends Disposable {
+    readonly sources: readonly IChatInputPillSource[];
+    constructor(data: IStandardChatInputPillsData, offeredKinds: readonly SessionChatPillKind[], instantiationService: IInstantiationService);
+}
+/** Shared renderer/controller for status pills above a chat input. */
+export declare class ChatInputPills extends Disposable {
+    private readonly _options;
+    private readonly _contextMenuService;
+    private readonly _visibility;
+    readonly element: HTMLElement;
+    readonly onDidChange: Event<void>;
+    private readonly _onDidChangeVisibility;
+    readonly onDidChangeVisibility: Event<boolean>;
+    private readonly _row;
+    private readonly _pills;
+    private _visible;
+    constructor(container: HTMLElement | undefined, _options: IChatInputPillsOptions, _contextMenuService: IContextMenuService, _visibility: ISessionChatPillVisibilityService, instantiationService: IInstantiationService);
+    get visible(): boolean;
+    getPillElements(): readonly HTMLElement[];
+    private _getTargetKind;
+    private _getVisibilityActions;
+}
+/** Creates a source for a pill whose data presence is represented by its membership. */
+export declare function createChatInputPillSource(pill: IChatPill, kind?: SessionChatPillKind): IChatInputPillSource;