@codingame/monaco-vscode-chat-service-override 25.1.2 → 26.0.0

package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/localAgentSessionsProvider.js

@@ -6,18 +6,22 @@ import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/even
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { ResourceSet } from '@codingame/monaco-vscode-api/vscode/vs/base/common/map';
 import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
-import { ResponseModelState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService';
+import { convertLegacyChatSessionTiming, ResponseModelState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
 import { localChatSessionType, ChatSessionStatus } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService';
 import { IChatSessionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service';
 import { getChatSessionType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatUri';
+import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 
 let LocalAgentsSessionsProvider = class LocalAgentsSessionsProvider extends Disposable {
-    static { this.ID = 'workbench.contrib.localAgentsSessionsProvider'; }
-    constructor(chatService, chatSessionsService) {
+    static {
+        this.ID = "workbench.contrib.localAgentsSessionsProvider";
+    }
+    constructor(chatService, chatSessionsService, logService) {
         super();
         this.chatService = chatService;
         this.chatSessionsService = chatSessionsService;
+        this.logService = logService;
         this.chatSessionType = localChatSessionType;
         this._onDidChange = this._register(( new Emitter()));
         this.onDidChange = this._onDidChange.event;
@@ -27,7 +31,11 @@ let LocalAgentsSessionsProvider = class LocalAgentsSessionsProvider extends Disp
         this.registerListeners();
     }
     registerListeners() {
-        this._register(this.chatSessionsService.registerChatModelChangeListeners(this.chatService, Schemas.vscodeLocalChatSession, () => this._onDidChangeChatSessionItems.fire()));
+        this._register(this.chatSessionsService.registerChatModelChangeListeners(
+            this.chatService,
+            Schemas.vscodeLocalChatSession,
+            () => this._onDidChangeChatSessionItems.fire()
+        ));
         this._register(this.chatSessionsService.onDidChangeSessionItems(sessionType => {
             if (sessionType === this.chatSessionType) {
                 this._onDidChange.fire();
@@ -61,8 +69,7 @@ let LocalAgentsSessionsProvider = class LocalAgentsSessionsProvider extends Disp
         try {
             const historyItems = await this.chatService.getHistorySessionItems();
             return coalesce(( historyItems.map(history => this.toChatSessionItem(history))));
-        }
-        catch (error) {
+        } catch (error) {
             return [];
         }
     }
@@ -82,33 +89,31 @@ let LocalAgentsSessionsProvider = class LocalAgentsSessionsProvider extends Disp
             description,
             status: model ? this.modelToStatus(model) : this.chatResponseStateToStatus(chat.lastResponseState),
             iconPath: Codicon.chatSparkle,
-            timing: chat.timing,
+            timing: convertLegacyChatSessionTiming(chat.timing),
             changes: chat.stats ? {
                 insertions: chat.stats.added,
                 deletions: chat.stats.removed,
-                files: chat.stats.fileCount,
+                files: chat.stats.fileCount
             } : undefined
         };
     }
     modelToStatus(model) {
         if (model.requestInProgress.get()) {
+            this.logService.trace(`[agent sessions] Session ${( model.sessionResource.toString())} request is in progress.`);
             return ChatSessionStatus.InProgress;
         }
         const lastRequest = model.getRequests().at(-1);
+        this.logService.trace(`[agent sessions] Session ${( model.sessionResource.toString())} last request response: state ${lastRequest?.response?.state}, isComplete ${lastRequest?.response?.isComplete}, isCanceled ${lastRequest?.response?.isCanceled}, error: ${lastRequest?.response?.result?.errorDetails?.message}.`);
         if (lastRequest?.response) {
             if (lastRequest.response.state === ResponseModelState.NeedsInput) {
                 return ChatSessionStatus.NeedsInput;
-            }
-            else if (lastRequest.response.isCanceled || lastRequest.response.result?.errorDetails?.code === 'canceled') {
+            } else if (lastRequest.response.isCanceled || lastRequest.response.result?.errorDetails?.code === "canceled") {
                 return ChatSessionStatus.Completed;
-            }
-            else if (lastRequest.response.result?.errorDetails) {
+            } else if (lastRequest.response.result?.errorDetails) {
                 return ChatSessionStatus.Failed;
-            }
-            else if (lastRequest.response.isComplete) {
+            } else if (lastRequest.response.isComplete) {
                 return ChatSessionStatus.Completed;
-            }
-            else {
+            } else {
                 return ChatSessionStatus.InProgress;
             }
         }
@@ -116,21 +121,18 @@ let LocalAgentsSessionsProvider = class LocalAgentsSessionsProvider extends Disp
     }
     chatResponseStateToStatus(state) {
         switch (state) {
-            case ResponseModelState.Cancelled:
-            case ResponseModelState.Complete:
-                return ChatSessionStatus.Completed;
-            case ResponseModelState.Failed:
-                return ChatSessionStatus.Failed;
-            case ResponseModelState.Pending:
-                return ChatSessionStatus.InProgress;
-            case ResponseModelState.NeedsInput:
-                return ChatSessionStatus.NeedsInput;
+        case ResponseModelState.Cancelled:
+        case ResponseModelState.Complete:
+            return ChatSessionStatus.Completed;
+        case ResponseModelState.Failed:
+            return ChatSessionStatus.Failed;
+        case ResponseModelState.Pending:
+            return ChatSessionStatus.InProgress;
+        case ResponseModelState.NeedsInput:
+            return ChatSessionStatus.NeedsInput;
         }
     }
 };
-LocalAgentsSessionsProvider = ( __decorate([
-    ( __param(0, IChatService)),
-    ( __param(1, IChatSessionsService))
-], LocalAgentsSessionsProvider));
+LocalAgentsSessionsProvider = ( __decorate([( __param(0, IChatService)), ( __param(1, IChatSessionsService)), ( __param(2, ILogService))], LocalAgentsSessionsProvider));
 
 export { LocalAgentsSessionsProvider };

package/vscode/src/vs/workbench/contrib/chat/browser/attachments/chatAttachmentResolveService.js

@@ -14,7 +14,7 @@ import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench
 import { isProposedApiEnabled } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions';
 import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { UntitledTextEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/untitled/common/untitledTextEditorInput';
-import { NOTEBOOK_CELL_OUTPUT_MIME_TYPE_LIST_FOR_CHAT_CONST, createNotebookOutputVariableEntry } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/notebook/browser/contrib/chat/notebookChatUtils';
+import { NOTEBOOK_CELL_OUTPUT_MIME_TYPE_LIST_FOR_CHAT_CONST, createNotebookOutputVariableEntry } from '../../../notebook/browser/contrib/chat/notebookChatUtils.js';
 import { getOutputViewModelFromId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/controller/cellOutputActions';
 import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { getAttachableImageExtension, CHAT_ATTACHABLE_IMAGE_MIME_TYPES } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel';
@@ -23,7 +23,13 @@ import { getPromptsTypeForLanguageId, PromptsType } from '@codingame/monaco-vsco
 import { resizeImage, imageToHash } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatImageUtils';
 
 let ChatAttachmentResolveService = class ChatAttachmentResolveService {
-    constructor(fileService, editorService, textModelService, extensionService, dialogService) {
+    constructor(
+        fileService,
+        editorService,
+        textModelService,
+        extensionService,
+        dialogService
+    ) {
         this.fileService = fileService;
         this.editorService = editorService;
         this.textModelService = textModelService;
@@ -40,8 +46,7 @@ let ChatAttachmentResolveService = class ChatAttachmentResolveService {
         let stat;
         try {
             stat = await this.fileService.stat(editor.resource);
-        }
-        catch {
+        } catch {
             return undefined;
         }
         if (!stat.isDirectory && !stat.isFile) {
@@ -49,7 +54,7 @@ let ChatAttachmentResolveService = class ChatAttachmentResolveService {
         }
         const imageContext = await this.resolveImageEditorAttachContext(editor.resource);
         if (imageContext) {
-            return ( this.extensionService.extensions.some(ext => isProposedApiEnabled(ext, 'chatReferenceBinaryData'))) ? imageContext : undefined;
+            return ( this.extensionService.extensions.some(ext => isProposedApiEnabled(ext, "chatReferenceBinaryData"))) ? imageContext : undefined;
         }
         return await this.resolveResourceAttachContext(editor.resource, stat.isDirectory);
     }
@@ -75,8 +80,7 @@ let ChatAttachmentResolveService = class ChatAttachmentResolveService {
                 const createdModel = await this.textModelService.createModelReference(resource);
                 languageId = createdModel.object.getLanguageId();
                 createdModel.dispose();
-            }
-            catch {
+            } catch {
                 omittedState = OmittedState.Full;
             }
             if (/\.(svg)$/i.test(resource.path)) {
@@ -86,14 +90,13 @@ let ChatAttachmentResolveService = class ChatAttachmentResolveService {
                 const promptsType = getPromptsTypeForLanguageId(languageId);
                 if (promptsType === PromptsType.prompt) {
                     return toPromptFileVariableEntry(resource, PromptFileVariableKind.PromptFile);
-                }
-                else if (promptsType === PromptsType.instructions) {
+                } else if (promptsType === PromptsType.instructions) {
                     return toPromptFileVariableEntry(resource, PromptFileVariableKind.Instruction);
                 }
             }
         }
         return {
-            kind: isDirectory ? 'directory' : 'file',
+            kind: isDirectory ? "directory" : "file",
             value: resource,
             id: ( resource.toString()),
             name: basename(resource),
@@ -108,8 +111,7 @@ let ChatAttachmentResolveService = class ChatAttachmentResolveService {
             if (!getAttachableImageExtension(mimeType)) {
                 return undefined;
             }
-        }
-        else {
+        } else {
             const match = SUPPORTED_IMAGE_EXTENSIONS_REGEX.exec(resource.path);
             if (!match) {
                 return undefined;
@@ -120,55 +122,58 @@ let ChatAttachmentResolveService = class ChatAttachmentResolveService {
         let dataBuffer;
         if (data) {
             dataBuffer = data;
-        }
-        else {
+        } else {
             let stat;
             try {
                 stat = await this.fileService.stat(resource);
-            }
-            catch {
+            } catch {
                 return undefined;
             }
             const readFile = await this.fileService.readFile(resource);
             if (stat.size > 30 * 1024 * 1024) {
-                this.dialogService.error(( localize(4934, 'Image is too large')), ( localize(4935, 'The image {0} is too large to be attached.', fileName)));
-                throw ( new Error('Image is too large'));
+                this.dialogService.error(( localize(5064, "Image is too large")), ( localize(5065, "The image {0} is too large to be attached.", fileName)));
+                throw ( new Error("Image is too large"));
             }
             dataBuffer = readFile.value;
         }
         const isPartiallyOmitted = /\.gif$/i.test(resource.path);
         const imageFileContext = await this.resolveImageAttachContext([{
-                id: ( resource.toString()),
-                name: fileName,
-                data: dataBuffer.buffer,
-                icon: Codicon.fileMedia,
-                resource: resource,
-                mimeType: mimeType,
-                omittedState: isPartiallyOmitted ? OmittedState.Partial : OmittedState.NotOmitted
-            }]);
+            id: ( resource.toString()),
+            name: fileName,
+            data: dataBuffer.buffer,
+            icon: Codicon.fileMedia,
+            resource: resource,
+            mimeType: mimeType,
+            omittedState: isPartiallyOmitted ? OmittedState.Partial : OmittedState.NotOmitted
+        }]);
         return imageFileContext[0];
     }
     resolveImageAttachContext(images) {
-        return Promise.all(( images.map(async (image) => ({
+        return Promise.all(( images.map(async image => ({
             id: image.id || (await imageToHash(image.data)),
             name: image.name,
             fullName: image.resource ? image.resource.path : undefined,
             value: await resizeImage(image.data, image.mimeType),
             icon: image.icon,
-            kind: 'image',
+            kind: "image",
             isFile: false,
             isDirectory: false,
             omittedState: image.omittedState || OmittedState.NotOmitted,
-            references: image.resource ? [{ reference: image.resource, kind: 'reference' }] : []
+            references: image.resource ? [{
+                reference: image.resource,
+                kind: "reference"
+            }] : []
         }))));
     }
     resolveMarkerAttachContext(markers) {
-        return ( markers.map((marker) => {
+        return ( markers.map(marker => {
             let filter;
-            if (!('severity' in marker)) {
-                filter = { filterUri: URI.revive(marker.uri), filterSeverity: MarkerSeverity.Warning };
-            }
-            else {
+            if (!("severity" in marker)) {
+                filter = {
+                    filterUri: URI.revive(marker.uri),
+                    filterSeverity: MarkerSeverity.Warning
+                };
+            } else {
                 filter = IDiagnosticVariableEntryFilterData.fromMarker(marker);
             }
             return IDiagnosticVariableEntryFilterData.toEntry(filter);
@@ -178,13 +183,16 @@ let ChatAttachmentResolveService = class ChatAttachmentResolveService {
         return ( symbols.map(symbol => {
             const resource = URI.file(symbol.fsPath);
             return {
-                kind: 'symbol',
+                kind: "symbol",
                 id: symbolId(resource, symbol.range),
-                value: { uri: resource, range: symbol.range },
+                value: {
+                    uri: resource,
+                    range: symbol.range
+                },
                 symbolKind: symbol.kind,
                 icon: SymbolKinds.toIcon(symbol.kind),
                 fullName: symbol.name,
-                name: symbol.name,
+                name: symbol.name
             };
         }));
     }
@@ -216,19 +224,13 @@ let ChatAttachmentResolveService = class ChatAttachmentResolveService {
                 ...d.historyItem,
                 references: []
             },
-            kind: 'scmHistoryItem'
+            kind: "scmHistoryItem"
         })));
     }
 };
-ChatAttachmentResolveService = ( __decorate([
-    ( __param(0, IFileService)),
-    ( __param(1, IEditorService)),
-    ( __param(2, ITextModelService)),
-    ( __param(3, IExtensionService)),
-    ( __param(4, IDialogService))
-], ChatAttachmentResolveService));
+ChatAttachmentResolveService = ( __decorate([( __param(0, IFileService)), ( __param(1, IEditorService)), ( __param(2, ITextModelService)), ( __param(3, IExtensionService)), ( __param(4, IDialogService))], ChatAttachmentResolveService));
 function symbolId(resource, range) {
-    let rangePart = '';
+    let rangePart = "";
     if (range) {
         rangePart = `:${range.startLineNumber}`;
         if (range.startLineNumber !== range.endLineNumber) {
@@ -237,7 +239,7 @@ function symbolId(resource, range) {
     }
     return resource.fsPath + rangePart;
 }
-const SUPPORTED_IMAGE_EXTENSIONS_REGEX = ( new RegExp(`\\.(${( Object.keys(CHAT_ATTACHABLE_IMAGE_MIME_TYPES)).join('|')})$`, 'i'));
+const SUPPORTED_IMAGE_EXTENSIONS_REGEX = ( new RegExp(`\\.(${( Object.keys(CHAT_ATTACHABLE_IMAGE_MIME_TYPES)).join("|")})$`, "i"));
 function getMimeTypeFromPath(match) {
     const ext = match[1].toLowerCase();
     return CHAT_ATTACHABLE_IMAGE_MIME_TYPES[ext];

package/vscode/src/vs/workbench/contrib/chat/browser/attachments/chatVariables.js

@@ -1,7 +1,7 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { ChatDynamicVariableModel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/attachments/chatDynamicVariables';
+import { ChatDynamicVariableModel } from '@codingame/monaco-vscode-xterm-addons-common/vscode/vs/workbench/contrib/chat/browser/attachments/chatDynamicVariables';
 import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
 
 let ChatVariablesService = class ChatVariablesService {
@@ -27,8 +27,8 @@ let ChatVariablesService = class ChatVariablesService {
                         modelDescription: attachment.modelDescription,
                         range: ( new Range(1, attachment.range.start + 1, 1, attachment.range.endExclusive + 1)),
                         icon: attachment.icon,
-                        isFile: attachment.kind === 'file',
-                        isDirectory: attachment.kind === 'directory',
+                        isFile: attachment.kind === "file",
+                        isDirectory: attachment.kind === "directory",
                         data: attachment.value
                     };
                     references.push(referenceObj);
@@ -46,8 +46,6 @@ let ChatVariablesService = class ChatVariablesService {
         return widget.input.selectedToolsModel.entriesMap.get();
     }
 };
-ChatVariablesService = ( __decorate([
-    ( __param(0, IChatWidgetService))
-], ChatVariablesService));
+ChatVariablesService = ( __decorate([( __param(0, IChatWidgetService))], ChatVariablesService));
 
 export { ChatVariablesService };

package/vscode/src/vs/workbench/contrib/chat/browser/attachments/media/simpleBrowserOverlay.css

@@ -40,7 +40,6 @@
 }
 
 .element-selection-main-content .monaco-button-dropdown > .monaco-button.monaco-text-button {
-	height: 24px;
 	align-content: center;
 	padding: 0px 5px;
 }