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

package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl.js

@@ -1,25 +1,31 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { CancellationError, isCancellationError, onUnexpectedError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { DisposableStore, dispose, toDisposable, Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { ResourceMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/map';
+import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { isCodeEditor, isDiffEditor, isCompositeEditor } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorBrowser';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
+import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import { observableConfigValue } from '@codingame/monaco-vscode-api/vscode/vs/platform/observable/common/platformObservableUtils';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatAgents.service';
 import { ModifiedFileEntryState } 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 { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
 import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { ToolDataSource } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService';
 import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService.service';
 import { CTX_INLINE_CHAT_HAS_AGENT, CTX_INLINE_CHAT_HAS_NOTEBOOK_AGENT, CTX_INLINE_CHAT_POSSIBLE, InlineChatConfigKeys } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
+import { InlineChatEditReviewSession } from './inlineChatEditReviewSession.js';
 import { IInlineChatSessionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatSessionService.service';
+import { IInlineChatSessionResolver } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatSessionResolver.service';
 import { observableFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableFromEvent';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
@@ -40,7 +46,16 @@ let InlineChatSessionServiceImpl = class InlineChatSessionServiceImpl {
     #onWillStartSession;
     #onDidChangeSessions;
     #chatService;
-    constructor(chatService, chatAgentService) {
+    #inlineChatSessionResolver;
+    #instantiationService;
+    #chatEditingService;
+    constructor(
+        chatService,
+        chatAgentService,
+        inlineChatSessionResolver,
+        instantiationService,
+        chatEditingService
+    ) {
         this.#store = ( new DisposableStore());
         this.#sessions = ( new ResourceMap());
         this.#onWillStartSession = this.#store.add(( new Emitter()));
@@ -48,6 +63,9 @@ let InlineChatSessionServiceImpl = class InlineChatSessionServiceImpl {
         this.#onDidChangeSessions = this.#store.add(( new Emitter()));
         this.onDidChangeSessions = this.#onDidChangeSessions.event;
         this.#chatService = chatService;
+        this.#inlineChatSessionResolver = inlineChatSessionResolver;
+        this.#instantiationService = instantiationService;
+        this.#chatEditingService = chatEditingService;
         const agentObs = observableFromEvent(
             this,
             chatAgentService.onDidChangeAgents,
@@ -64,28 +82,53 @@ let InlineChatSessionServiceImpl = class InlineChatSessionServiceImpl {
     dispose() {
         this.#store.dispose();
     }
-    createSession(editor) {
-        const uri = editor.getModel().uri;
+    async createSession(editor, isNotebook, token) {
+        const model = editor.getModel();
+        const uri = model.uri;
         if (( this.#sessions.has(uri))) {
             throw ( new Error("Session already exists"));
         }
         this.#onWillStartSession.fire(editor);
-        const chatModelRef = this.#chatService.startNewLocalSession(ChatAgentLocation.EditorInline, {
+        const isAgentHostEligible = uri.scheme === Schemas.file && !isNotebook;
+        const resolution = isAgentHostEligible ? await this.#inlineChatSessionResolver.resolve(token, model.getLanguageId(), uri) : undefined;
+        if (token.isCancellationRequested || (isAgentHostEligible && !resolution)) {
+            resolution?.modelRef.dispose();
+            throw ( new CancellationError());
+        }
+        if (( this.#sessions.has(uri))) {
+            resolution?.modelRef.dispose();
+            throw ( new Error("Session already exists"));
+        }
+        const chatModelRef = resolution?.modelRef ?? this.#chatService.startNewLocalSession(ChatAgentLocation.EditorInline, {
             canUseTools: false
         });
         const chatModel = chatModelRef.object;
-        chatModel.startEditingSession(false);
+        const lockToAgent = resolution?.lockToAgent;
+        let reviewSession;
+        let editingSession;
+        if (lockToAgent) {
+            reviewSession = this.#instantiationService.createInstance(InlineChatEditReviewSession, chatModel.sessionResource, uri);
+            editingSession = reviewSession;
+        } else {
+            chatModel.startEditingSession(false);
+            editingSession = chatModel.editingSession;
+        }
         const terminationState = observableValue(this, undefined);
         const store = ( new DisposableStore());
         store.add(toDisposable(() => {
             void this.#chatService.cancelCurrentRequestForSession(chatModel.sessionResource, "inlineChatSession");
-            chatModel.editingSession?.reject();
+            void editingSession.reject();
             this.#sessions.delete(uri);
             this.#onDidChangeSessions.fire(this);
         }));
         store.add(chatModelRef);
+        if (reviewSession) {
+            store.add(this.#chatEditingService.registerEditReviewSession(reviewSession));
+            store.add(reviewSession);
+            this.#installEditReviewObserver(chatModel, reviewSession, store);
+        }
         store.add(autorun(r => {
-            const entries = chatModel.editingSession?.entries.read(r);
+            const entries = editingSession.entries.read(r);
             if (!entries?.length) {
                 return;
             }
@@ -119,7 +162,8 @@ let InlineChatSessionServiceImpl = class InlineChatSessionServiceImpl {
             initialPosition: editor.getSelection().getStartPosition().delta(-1),
             initialSelection: editor.getSelection(),
             chatModel,
-            editingSession: chatModel.editingSession,
+            editingSession,
+            lockToAgent,
             terminationState,
             setTerminationState: state => {
                 terminationState.set(state, undefined);
@@ -131,6 +175,67 @@ let InlineChatSessionServiceImpl = class InlineChatSessionServiceImpl {
         this.#onDidChangeSessions.fire(this);
         return result;
     }
+    #installEditReviewObserver(chatModel, reviewSession, store) {
+        let turnQueue = Promise.resolve();
+        let isDisposed = false;
+        store.add(toDisposable(() => isDisposed = true));
+        store.add(chatModel.onDidChange(async e => {
+            if (e.kind !== "addRequest" || !e.request.response) {
+                return;
+            }
+            const response = e.request.response;
+            const previousTurn = turnQueue;
+            let completeTurn;
+            turnQueue = ( new Promise(resolve => completeTurn = resolve));
+            await previousTurn;
+            if (isDisposed) {
+                completeTurn?.();
+                return;
+            }
+            let beganTurn = false;
+            try {
+                await reviewSession.beginTurn(response);
+                beganTurn = true;
+                if (isDisposed) {
+                    return;
+                }
+                if (!response.isComplete) {
+                    const responseStore = ( new DisposableStore());
+                    try {
+                        await ( new Promise(resolve => {
+                            responseStore.add(response.onDidChange(() => {
+                                if (response.isComplete) {
+                                    resolve();
+                                }
+                            }));
+                            responseStore.add(reviewSession.onDidDispose(resolve));
+                            if (response.isComplete) {
+                                resolve();
+                            }
+                        }));
+                    } finally {
+                        responseStore.dispose();
+                    }
+                }
+            } catch (error) {
+                if (!isDisposed) {
+                    void this.#chatService.cancelCurrentRequestForSession(chatModel.sessionResource, "inlineChatBeginTurnFailed");
+                }
+                if (!isCancellationError(error)) {
+                    onUnexpectedError(error);
+                }
+            } finally {
+                if (beganTurn && !isDisposed) {
+                    try {
+                        await reviewSession.endTurn(response);
+                    } catch (error) {
+                        onUnexpectedError(error);
+                    }
+                }
+                completeTurn?.();
+            }
+        }));
+    }
     getSessionByTextModel(uri) {
         let result = this.#sessions.get(uri);
         if (!result) {
@@ -153,7 +258,7 @@ let InlineChatSessionServiceImpl = class InlineChatSessionServiceImpl {
         return undefined;
     }
 };
-InlineChatSessionServiceImpl = ( __decorate([( __param(0, IChatService)), ( __param(1, IChatAgentService))], InlineChatSessionServiceImpl));
+InlineChatSessionServiceImpl = ( __decorate([( __param(0, IChatService)), ( __param(1, IChatAgentService)), ( __param(2, IInlineChatSessionResolver)), ( __param(3, IInstantiationService)), ( __param(4, IChatEditingService))], InlineChatSessionServiceImpl));
 let InlineChatEnabler = class InlineChatEnabler {
     static {
         this.Id = "inlineChat.enabler";
@@ -215,7 +320,7 @@ let InlineChatEscapeToolContribution = class InlineChatEscapeToolContribution ex
         source: ToolDataSource.Internal,
         canBeReferencedInPrompt: false,
         alwaysDisplayInputOutput: false,
-        displayName: ( localize(11337, "Inline Chat to Panel Chat")),
+        displayName: ( localize(13084, "Inline Chat to Panel Chat")),
         modelDescription: "Show a short textual response when not being able to make code changes and when not having been asked for code changes. Can also be used to move the request to the richer panel chat which supports edits across files, creating and deleting files, multi-turn conversations between the user and the assistant, and access to more IDE tools, like retrieve problems, interact with source control, run terminal commands etc.",
         inputSchema: {
             type: "object",
@@ -224,7 +329,7 @@ let InlineChatEscapeToolContribution = class InlineChatEscapeToolContribution ex
                 response: {
                     type: "string",
                     description: ( localize(
-                        11338,
+                        13085,
                         "Optional brief response for inline chat. Keep it at 10 words or fewer."
                     )),
                     maxLength: 200
@@ -270,11 +375,11 @@ let InlineChatEscapeToolContribution = class InlineChatEscapeToolContribution ex
                             kind: "text",
                             value: "Cancel"
                         }],
-                        toolResultMessage: ( localize(11339, "Cancel"))
+                        toolResultMessage: ( localize(13086, "Cancel"))
                     };
                 }
                 const response = typeof invocation.parameters?.response === "string" && invocation.parameters.response.trim().length > 0 ? invocation.parameters.response.trim() : ( localize(
-                    11340,
+                    13087,
                     "Inline chat is designed for making single-file code changes. Continue your request in the Chat view or rephrase it for inline chat."
                 ));
                 session.setTerminationState(response);

package/vscode/src/vs/workbench/contrib/mcp/browser/mcpPromptArgumentPick.js

@@ -82,8 +82,8 @@ let McpPromptArgumentPick = class McpPromptArgumentPick extends Disposable {
             const arg = prompt.arguments[i];
             const restore = backSnapshots.at(i);
             quickPick.step = i + 1;
-            quickPick.placeholder = arg.required ? arg.description : `${arg.description || ""} (${( localize(11962, "Optional"))})`;
-            quickPick.title = ( localize(11963, "Value for: {0}", arg.title || arg.name));
+            quickPick.placeholder = arg.required ? arg.description : `${arg.description || ""} (${( localize(13720, "Optional"))})`;
+            quickPick.title = ( localize(13721, "Value for: {0}", arg.title || arg.name));
             quickPick.value = restore?.value ?? ((args.hasOwnProperty(arg.name) && args[arg.name]) || "");
             quickPick.items = restore?.items ?? [];
             quickPick.activeItems = restore?.activeItems ?? [];
@@ -105,7 +105,7 @@ let McpPromptArgumentPick = class McpPromptArgumentPick extends Disposable {
             }
         }
         quickPick.value = "";
-        quickPick.placeholder = ( localize(11964, "Loading..."));
+        quickPick.placeholder = ( localize(13722, "Loading..."));
         quickPick.busy = true;
         return args;
     }
@@ -116,13 +116,13 @@ let McpPromptArgumentPick = class McpPromptArgumentPick extends Disposable {
         const store = ( new DisposableStore());
         const input$ = observableValue(this, quickPick.value);
         const asyncPicks = [{
-            name: ( localize(11965, "Suggestions")),
+            name: ( localize(13723, "Suggestions")),
             observer: this._promptCompletions(arg, input$, argsSoFar)
         }, {
-            name: ( localize(11966, "Active File")),
+            name: ( localize(13724, "Active File")),
             observer: this._activeFileCompletions()
         }, {
-            name: ( localize(11967, "Files")),
+            name: ( localize(13725, "Files")),
             observer: this._fileCompletions(input$)
         }];
         store.add(autorun(reader => {
@@ -133,15 +133,15 @@ let McpPromptArgumentPick = class McpPromptArgumentPick extends Disposable {
             let items = [];
             items.push({
                 id: "insert-text",
-                label: ( localize(11968, "Insert as text")),
+                label: ( localize(13726, "Insert as text")),
                 iconClass: ThemeIcon.asClassName(Codicon.textSize),
                 action: "text",
                 alwaysShow: true
             });
             items.push({
                 id: "run-command",
-                label: ( localize(11969, "Run as Command")),
-                description: ( localize(11970, "Inserts the command output as the prompt argument")),
+                label: ( localize(13727, "Run as Command")),
+                description: ( localize(13728, "Inserts the command output as the prompt argument")),
                 iconClass: ThemeIcon.asClassName(Codicon.terminal),
                 action: "command",
                 alwaysShow: true
@@ -187,7 +187,7 @@ let McpPromptArgumentPick = class McpPromptArgumentPick extends Disposable {
                 store.add(quickPick.onDidAccept(() => {
                     const item = quickPick.selectedItems[0];
                     if (!quickPick.value && arg.required && (!item || item.action === "text" || item.action === "command")) {
-                        quickPick.validationMessage = ( localize(11971, "This argument is required"));
+                        quickPick.validationMessage = ( localize(13729, "This argument is required"));
                     } else if (!item) {
                         resolve({
                             id: "insert-text",
@@ -322,7 +322,7 @@ let McpPromptArgumentPick = class McpPromptArgumentPick extends Disposable {
             const items = [];
             items.push({
                 id: "active-file",
-                label: ( localize(11972, "Active File")),
+                label: ( localize(13730, "Active File")),
                 description: this._labelService.getUriLabel(resource),
                 iconClasses: getIconClasses(this._modelService, this._languageService, resource),
                 uri: resource,
@@ -332,10 +332,10 @@ let McpPromptArgumentPick = class McpPromptArgumentPick extends Disposable {
             if (selection && selection.model && selection.range && !selection.range.isEmpty()) {
                 const selectedText = selection.model.getValueInRange(selection.range);
                 const lineCount = selection.range.endLineNumber - selection.range.startLineNumber + 1;
-                const description = lineCount === 1 ? ( localize(11973, "line {0}", selection.range.startLineNumber)) : ( localize(11974, "{0} lines", lineCount));
+                const description = lineCount === 1 ? ( localize(13731, "line {0}", selection.range.startLineNumber)) : ( localize(13732, "{0} lines", lineCount));
                 items.push({
                     id: "selected-text",
-                    label: ( localize(11975, "Selected Text")),
+                    label: ( localize(13733, "Selected Text")),
                     description,
                     selectedText,
                     iconClass: ThemeIcon.asClassName(Codicon.selection),
@@ -369,7 +369,7 @@ let McpPromptArgumentPick = class McpPromptArgumentPick extends Disposable {
     async _getTerminalOutput(command, token) {
         const terminal = (this._terminal ??= this._register(await this._terminalService.createTerminal({
             config: {
-                name: ( localize(11976, "MCP Terminal")),
+                name: ( localize(13734, "MCP Terminal")),
                 isTransient: true,
                 forceShellIntegration: true,
                 isFeatureTerminal: true

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

@@ -41,7 +41,7 @@ function createNotebookOutputVariableEntry(outputViewModel, mimeType, notebookEd
         value: outputCellUri,
         id: ( outputCellUri.toString()),
         name: ( localize(
-            12389,
+            14152,
             "{0} • Cell {1} • Output {2}",
             fileName,
             `${cellIndex + 1}`,

package/vscode/src/vs/workbench/contrib/notebook/browser/controller/chat/cellChatActions.js

@@ -42,12 +42,12 @@ registerAction2(class extends NotebookAction {
         super({
             id: "notebook.cell.chat.start",
             title: {
-                value: "$(sparkle) " + ( localize(12492, "Generate")),
+                value: "$(sparkle) " + ( localize(14255, "Generate")),
                 original: "$(sparkle) Generate"
             },
-            tooltip: ( localize(12493, "Start Chat to Generate Code")),
+            tooltip: ( localize(14256, "Start Chat to Generate Code")),
             metadata: {
-                description: ( localize(12493, "Start Chat to Generate Code")),
+                description: ( localize(14256, "Start Chat to Generate Code")),
                 args: [{
                     name: "args",
                     schema: {
@@ -128,10 +128,10 @@ registerAction2(class extends NotebookAction {
         super({
             id: "notebook.cell.chat.startAtTop",
             title: {
-                value: "$(sparkle) " + ( localize(12492, "Generate")),
+                value: "$(sparkle) " + ( localize(14255, "Generate")),
                 original: "$(sparkle) Generate"
             },
-            tooltip: ( localize(12493, "Start Chat to Generate Code")),
+            tooltip: ( localize(14256, "Start Chat to Generate Code")),
             f1: false,
             menu: [{
                 id: MenuId.NotebookCellListTop,
@@ -149,8 +149,8 @@ MenuRegistry.appendMenuItem(MenuId.NotebookToolbar, {
     command: {
         id: "notebook.cell.chat.start",
         icon: Codicon.sparkle,
-        title: ( localize(12494, "Generate")),
-        tooltip: ( localize(12495, "Start Chat to Generate Code"))
+        title: ( localize(14257, "Generate")),
+        tooltip: ( localize(14258, "Start Chat to Generate Code"))
     },
     order: -10,
     group: "navigation/add",
@@ -160,9 +160,9 @@ class AcceptChangesAndRun extends EditorAction2 {
     constructor() {
         super({
             id: "notebook.inlineChat.acceptChangesAndRun",
-            title: ( localize2(12496, "Accept and Run")),
-            shortTitle: ( localize(12497, "Accept & Run")),
-            tooltip: ( localize(12498, "Accept the changes and run the cell")),
+            title: ( localize2(14259, "Accept and Run")),
+            shortTitle: ( localize(14260, "Accept & Run")),
+            tooltip: ( localize(14261, "Accept the changes and run the cell")),
             icon: Codicon.check,
             f1: true,
             precondition: ( ContextKeyExpr.and(( NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true)), CTX_INLINE_CHAT_VISIBLE)),

package/vscode/src/vs/workbench/contrib/notebook/browser/controller/chat/notebook.chat.contribution.js

@@ -91,7 +91,7 @@ let NotebookChatContribution = class NotebookChatContribution extends Disposable
                 result.suggestions.push({
                     label: `${chatVariableLeader}${NotebookKernelVariableKey}`,
                     insertText: `${chatVariableLeader}${NotebookKernelVariableKey}:`,
-                    detail: ( localize(12499, "Pick a variable from the kernel")),
+                    detail: ( localize(14262, "Pick a variable from the kernel")),
                     range,
                     kind: CompletionItemKind.Text,
                     command: {
@@ -198,7 +198,7 @@ class SelectAndInsertKernelVariableAction extends Action2 {
                 detail: variable.type
             });
         }
-        const placeHolder = quickPickItems.length > 0 ? ( localize(12500, "Select a kernel variable")) : ( localize(12501, "No kernel variables found"));
+        const placeHolder = quickPickItems.length > 0 ? ( localize(14263, "Select a kernel variable")) : ( localize(14264, "No kernel variables found"));
         const pickedVariable = await quickInputService.pick(quickPickItems, {
             placeHolder
         });
@@ -248,7 +248,7 @@ let KernelVariableContextPicker = class KernelVariableContextPicker {
         this.editorService = editorService;
         this.notebookKernelService = notebookKernelService;
         this.type = "pickerPick";
-        this.label = ( localize(12502, "Kernel Variable..."));
+        this.label = ( localize(14265, "Kernel Variable..."));
         this.icon = Codicon.serverEnvironment;
     }
     isEnabled(widget) {
@@ -287,7 +287,7 @@ let KernelVariableContextPicker = class KernelVariableContextPicker {
             return result;
         })();
         return {
-            placeholder: ( localize(12503, "Select a kernel variable")),
+            placeholder: ( localize(14266, "Select a kernel variable")),
             picks
         };
     }
@@ -297,7 +297,7 @@ registerAction2(class AddCellOutputToChatAction extends Action2 {
     constructor() {
         super({
             id: "notebook.cellOutput.addToChat",
-            title: ( localize(12504, "Add Cell Output to Chat")),
+            title: ( localize(14267, "Add Cell Output to Chat")),
             menu: {
                 id: MenuId.NotebookOutputToolbar,
                 when: ( ContextKeyExpr.and(NOTEBOOK_CELL_HAS_OUTPUTS, ContextKeyExpr.in(

package/vscode/src/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatContext.js

@@ -2,6 +2,6 @@
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { RawContextKey } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 
-const CTX_NOTEBOOK_CHAT_HAS_AGENT = ( new RawContextKey("notebookChatAgentRegistered", false, ( localize(12505, "Whether a chat agent for notebook is registered"))));
+const CTX_NOTEBOOK_CHAT_HAS_AGENT = ( new RawContextKey("notebookChatAgentRegistered", false, ( localize(14268, "Whether a chat agent for notebook is registered"))));
 
 export { CTX_NOTEBOOK_CHAT_HAS_AGENT };

package/vscode/src/vs/workbench/contrib/remoteCodingAgents/browser/remoteCodingAgents.contribution.js

@@ -13,42 +13,42 @@ import { IRemoteCodingAgentsService } from '@codingame/monaco-vscode-api/vscode/
 const extensionPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: "remoteCodingAgents",
     jsonSchema: {
-        description: ( localize(13608, "Contributes remote coding agent integrations to the chat widget.")),
+        description: ( localize(15375, "Contributes remote coding agent integrations to the chat widget.")),
         type: "array",
         items: {
             type: "object",
             properties: {
                 id: {
-                    description: ( localize(13609, "A unique identifier for this item.")),
+                    description: ( localize(15376, "A unique identifier for this item.")),
                     type: "string"
                 },
                 command: {
                     description: ( localize(
-                        13610,
+                        15377,
                         "Identifier of the command to execute. The command must be declared in the \"commands\" section."
                     )),
                     type: "string"
                 },
                 displayName: {
                     description: ( localize(
-                        13611,
+                        15378,
                         "A user-friendly name for this item which is used for display in menus."
                     )),
                     type: "string"
                 },
                 description: {
-                    description: ( localize(13612, "Description of the remote agent for use in menus and tooltips.")),
+                    description: ( localize(15379, "Description of the remote agent for use in menus and tooltips.")),
                     type: "string"
                 },
                 followUpRegex: {
                     description: ( localize(
-                        13613,
+                        15380,
                         "The last occurrence of pattern in an existing chat conversation is sent to the contributing extension to facilitate follow-up responses."
                     )),
                     type: "string"
                 },
                 when: {
-                    description: ( localize(13614, "Condition which must be true to show this item.")),
+                    description: ( localize(15381, "Condition which must be true to show this item.")),
                     type: "string"
                 }
             },
@@ -62,7 +62,7 @@ let RemoteCodingAgentsContribution = class RemoteCodingAgentsContribution extend
         this.remoteCodingAgentsService = remoteCodingAgentsService;
         extensionPoint.setHandler(extensions => {
             for (const ext of extensions) {
-                if (!isProposedApiEnabled(ext.description)) {
+                if (!isProposedApiEnabled(ext.description, "remoteCodingAgents")) {
                     continue;
                 }
                 if (!Array.isArray(ext.value)) {

package/vscode/src/vs/workbench/contrib/terminalContrib/chat/browser/terminal.chat.contribution.js

@@ -10,6 +10,7 @@ import { TerminalChatEnabler } from './terminalChatEnabler.js';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import './terminalChatService.js';
+import './terminalChatSessionResolver.js';
 
 registerTerminalContribution(TerminalChatController.ID, TerminalChatController, false);
 AccessibleViewRegistry.register(( new TerminalInlineChatAccessibleView()));

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

@@ -0,0 +1,81 @@
+import { MenuId } from "@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions";
+import { RawContextKey } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey";
+export declare enum TerminalChatCommandId {
+    Start = "workbench.action.terminal.chat.start",
+    Close = "workbench.action.terminal.chat.close",
+    MakeRequest = "workbench.action.terminal.chat.makeRequest",
+    Cancel = "workbench.action.terminal.chat.cancel",
+    RunCommand = "workbench.action.terminal.chat.runCommand",
+    RunFirstCommand = "workbench.action.terminal.chat.runFirstCommand",
+    InsertCommand = "workbench.action.terminal.chat.insertCommand",
+    InsertFirstCommand = "workbench.action.terminal.chat.insertFirstCommand",
+    ViewInChat = "workbench.action.terminal.chat.viewInChat",
+    RerunRequest = "workbench.action.terminal.chat.rerunRequest",
+    ViewHiddenChatTerminals = "workbench.action.terminal.chat.viewHiddenChatTerminals",
+    OpenTerminalSettingsLink = "workbench.action.terminal.chat.openTerminalSettingsLink",
+    DisableSessionAutoApproval = "workbench.action.terminal.chat.disableSessionAutoApproval",
+    FocusMostRecentChatTerminalOutput = "workbench.action.terminal.chat.focusMostRecentChatTerminalOutput",
+    FocusMostRecentChatTerminal = "workbench.action.terminal.chat.focusMostRecentChatTerminal",
+    ToggleChatTerminalOutput = "workbench.action.terminal.chat.toggleChatTerminalOutput",
+    FocusChatInstanceAction = "workbench.action.terminal.chat.focusChatInstance",
+    ContinueInBackground = "workbench.action.terminal.chat.continueInBackground"
+}
+export declare const MENU_TERMINAL_CHAT_WIDGET_INPUT_SIDE_TOOLBAR: MenuId;
+export declare const MENU_TERMINAL_CHAT_WIDGET_STATUS: MenuId;
+export declare const MENU_TERMINAL_CHAT_WIDGET_TOOLBAR: MenuId;
+export declare const MENU_CHAT_TERMINAL_TOOL_PROGRESS: MenuId;
+export declare enum TerminalChatContextKeyStrings {
+    ChatFocus = "terminalChatFocus",
+    ChatVisible = "terminalChatVisible",
+    ChatActiveRequest = "terminalChatActiveRequest",
+    ChatInputHasText = "terminalChatInputHasText",
+    ChatAgentRegistered = "terminalChatAgentRegistered",
+    ChatResponseEditorFocused = "terminalChatResponseEditorFocused",
+    ChatResponseContainsCodeBlock = "terminalChatResponseContainsCodeBlock",
+    ChatResponseContainsMultipleCodeBlocks = "terminalChatResponseContainsMultipleCodeBlocks",
+    ChatResponseSupportsIssueReporting = "terminalChatResponseSupportsIssueReporting",
+    ChatSessionResponseVote = "terminalChatSessionResponseVote",
+    ChatUsesAgentHost = "terminalChatUsesAgentHost",
+    ChatHasTerminals = "hasChatTerminals",
+    ChatHasHiddenTerminals = "hasHiddenChatTerminals",
+    ChatToolHasInstance = "chatTerminalToolHasInstance",
+    ChatToolCanContinueInBackground = "chatTerminalToolCanContinueInBackground",
+    ChatToolHasOutput = "chatTerminalToolHasOutput",
+    ChatToolUsesCollapsible = "chatTerminalToolUsesCollapsible",
+    ChatToolIsHiddenTerminal = "chatTerminalToolIsHiddenTerminal",
+    ChatToolOutputExpanded = "chatTerminalToolOutputExpanded"
+}
+export declare namespace TerminalChatContextKeys {
+    /** Whether the chat widget is focused */
+    const focused: RawContextKey<boolean>;
+    /** Whether the chat widget is visible */
+    const visible: RawContextKey<boolean>;
+    /** Whether there is an active chat request */
+    const requestActive: RawContextKey<boolean>;
+    /** Whether the chat input has text */
+    const inputHasText: RawContextKey<boolean>;
+    /** The chat response contains at least one code block */
+    const responseContainsCodeBlock: RawContextKey<boolean>;
+    /** The chat response contains multiple code blocks */
+    const responseContainsMultipleCodeBlocks: RawContextKey<boolean>;
+    /** A chat agent exists for the terminal location */
+    const hasChatAgent: RawContextKey<boolean>;
+    /** Whether the chat session is backed by the Agent Host */
+    const usesAgentHost: RawContextKey<boolean>;
+    /** Has terminals created via chat */
+    const hasChatTerminals: RawContextKey<boolean>;
+    /** Has hidden chat terminals */
+    const hasHiddenChatTerminals: RawContextKey<boolean>;
+    /** Whether the per-instance terminal tool progress part has a terminal instance attached */
+    const chatToolHasInstance: RawContextKey<boolean>;
+    /** Whether the continue-in-background action is available */
+    const chatToolCanContinueInBackground: RawContextKey<boolean>;
+    /** Whether terminal output is available for display */
+    const chatToolHasOutput: RawContextKey<boolean>;
+    /** Whether the terminal tool uses a collapsible wrapper */
+    const chatToolUsesCollapsible: RawContextKey<boolean>;
+    /** Whether the associated terminal is hidden from the user */
+    const chatToolIsHiddenTerminal: RawContextKey<boolean>;
+    /** Whether the terminal output section is currently expanded */
+    const chatToolOutputExpanded: RawContextKey<boolean>;
+}