@codingame/monaco-vscode-chat-service-override 8.0.1 → 8.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-chat-service-override",
-  "version": "8.0.1",
+  "version": "8.0.3",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,6 +26,6 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@8.0.1"
+    "vscode": "npm:@codingame/monaco-vscode-api@8.0.3"
   }
 }

package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatMoveActions.js

@@ -22,7 +22,7 @@ function registerMoveActions() {
         constructor() {
             super({
                 id: `workbench.action.chat.openInEditor`,
-                title: ( localize2(7134, "Open Chat in Editor")),
+                title: ( localize2(7129, "Open Chat in Editor")),
                 category: CHAT_CATEGORY,
                 precondition: CONTEXT_CHAT_ENABLED,
                 f1: true,
@@ -42,7 +42,7 @@ function registerMoveActions() {
         constructor() {
             super({
                 id: `workbench.action.chat.openInNewWindow`,
-                title: ( localize2(7135, "Open Chat in New Window")),
+                title: ( localize2(7130, "Open Chat in New Window")),
                 category: CHAT_CATEGORY,
                 precondition: CONTEXT_CHAT_ENABLED,
                 f1: true,
@@ -62,7 +62,7 @@ function registerMoveActions() {
         constructor() {
             super({
                 id: `workbench.action.chat.openInSidebar`,
-                title: ( localize2(7136, "Open Chat in Side Bar")),
+                title: ( localize2(7131, "Open Chat in Side Bar")),
                 category: CHAT_CATEGORY,
                 precondition: CONTEXT_CHAT_ENABLED,
                 f1: true,

package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatTitleActions.js

@@ -22,7 +22,7 @@ function registerChatTitleActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.markHelpful',
-                title: ( localize2(7129, "Helpful")),
+                title: ( localize2(7132, "Helpful")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.thumbsup,
@@ -59,7 +59,7 @@ function registerChatTitleActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.markUnhelpful',
-                title: ( localize2(7130, "Unhelpful")),
+                title: ( localize2(7133, "Unhelpful")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.thumbsdown,
@@ -96,7 +96,7 @@ function registerChatTitleActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.reportIssueForBug',
-                title: ( localize2(7131, "Report Issue")),
+                title: ( localize2(7134, "Report Issue")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.report,
@@ -130,7 +130,7 @@ function registerChatTitleActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.insertIntoNotebook',
-                title: ( localize2(7132, "Insert into Notebook")),
+                title: ( localize2(7135, "Insert into Notebook")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.insert,
@@ -192,7 +192,7 @@ function registerChatTitleActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.remove',
-                title: ( localize2(7133, "Remove Request and Response")),
+                title: ( localize2(7136, "Remove Request and Response")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.x,

package/vscode/src/vs/workbench/contrib/chat/common/chatServiceImpl.js

@@ -256,7 +256,11 @@ let ChatService = class ChatService extends Disposable {
         const enableCommandDetection = !options?.noCommandDetection;
         const defaultAgent = this.chatAgentService.getDefaultAgent(location);
         model.removeRequest(request.id, ChatRequestRemovalReason.Resend);
-        await this._sendRequestAsync(model, model.sessionId, request.message, attempt, enableCommandDetection, defaultAgent, location, options).responseCompletePromise;
+        const resendOptions = {
+            ...options,
+            locationData: request.locationData
+        };
+        await this._sendRequestAsync(model, model.sessionId, request.message, attempt, enableCommandDetection, defaultAgent, location, resendOptions).responseCompletePromise;
     }
     async sendRequest(sessionId, request, options) {
         this.trace('sendRequest', `sessionId: ${sessionId}, message: ${request.substring(0, 20)}${request.length > 20 ? '[...]' : ''}}`);
@@ -363,7 +367,7 @@ let ChatService = class ChatService extends Disposable {
                     await this.extensionService.activateByEvent(`onChatParticipant:${agent.id}`);
                     const history = getHistoryEntriesFromModel(model, agentPart?.agent.id);
                     const initVariableData = { variables: [] };
-                    request = model.addRequest(parsedRequest, initVariableData, attempt, agent, agentSlashCommandPart?.command);
+                    request = model.addRequest(parsedRequest, initVariableData, attempt, agent, agentSlashCommandPart?.command, options?.locationData);
                     completeResponseCreated();
                     const variableData = await this.chatVariablesService.resolveVariables(parsedRequest, options?.attachedContext, model, progressCallback, token);
                     model.updateRequest(request, variableData);
@@ -379,7 +383,7 @@ let ChatService = class ChatService extends Disposable {
                         enableCommandDetection,
                         attempt,
                         location,
-                        locationData: options?.locationData,
+                        locationData: request.locationData,
                         acceptedConfirmationData: options?.acceptedConfirmationData,
                         rejectedConfirmationData: options?.rejectedConfirmationData,
                     };