@codingame/monaco-vscode-api 3.2.3 → 4.1.0

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

@@ -4,16 +4,18 @@ import { DeferredPromise } from '../../../../base/common/async.js';
 import { Emitter } from '../../../../base/common/event.js';
 import { isMarkdownString, MarkdownString } from '../../../../base/common/htmlContent.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
+import { ResourceMap } from '../../../../base/common/map.js';
 import { revive } from '../../../../base/common/marshalling.js';
 import { basename } from '../../../../base/common/resources.js';
-import { URI } from '../../../../base/common/uri.js';
+import { URI, isUriComponents } from '../../../../base/common/uri.js';
 import { generateUuid } from '../../../../base/common/uuid.js';
 import { OffsetRange } from '../../../../editor/common/core/offsetRange.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { ILogService } from '../../../../platform/log/common/log.js';
-import { IChatAgentService } from './chatAgents.js';
-import { reviveParsedChatRequest, ChatRequestTextPart, getPromptText } from './chatParserTypes.js';
+import { ChatAgentLocation, IChatAgentService } from './chatAgents.js';
+import { getPromptText, reviveParsedChatRequest, ChatRequestTextPart } from './chatParserTypes.js';
 import { isIUsedContext } from './chatService.js';
-var ChatModel_1;
+var ChatModel_1, ChatWelcomeMessageModel_1;
 class ChatRequestModel {
     static { this.nextId = 0; }
     get id() {
@@ -137,6 +139,9 @@ class ChatResponseModel extends Disposable {
     get response() {
         return this._response;
     }
+    get edits() {
+        return this._edits;
+    }
     get result() {
         return this._result;
     }
@@ -146,8 +151,8 @@ class ChatResponseModel extends Disposable {
     get username() {
         return this.session.responderUsername;
     }
-    get avatarIconUri() {
-        return this.session.responderAvatarIconUri;
+    get avatarIcon() {
+        return this.session.responderAvatarIcon;
     }
     get agent() {
         return this._agent;
@@ -155,6 +160,9 @@ class ChatResponseModel extends Disposable {
     get slashCommand() {
         return this._slashCommand;
     }
+    get agentOrSlashCommandDetected() {
+        return this._agentOrSlashCommandDetected ?? false;
+    }
     get usedContext() {
         return this._usedContext;
     }
@@ -185,12 +193,23 @@ class ChatResponseModel extends Disposable {
         this._isStale = Array.isArray(_response) && (_response.length !== 0 || isMarkdownString(_response) && _response.value.length !== 0);
         this._followups = followups ? [...followups] : undefined;
         this._response = ( new Response(_response));
+        this._edits = ( new ResourceMap());
         this._register(this._response.onDidChangeValue(() => this._onDidChange.fire()));
         this._id = 'response_' + ChatResponseModel.nextId++;
     }
     updateContent(responsePart, quiet) {
         this._response.updateContent(responsePart, quiet);
     }
+    updateTextEdits(uri, edits) {
+        const array = this._edits.get(uri);
+        if (!array) {
+            this._edits.set(uri, edits);
+        }
+        else {
+            array.push(...edits);
+        }
+        this._onDidChange.fire();
+    }
     applyReference(progress) {
         if (progress.kind === 'usedContext') {
             this._usedContext = progress;
@@ -203,6 +222,7 @@ class ChatResponseModel extends Disposable {
     setAgent(agent, slashCommand) {
         this._agent = agent;
         this._slashCommand = slashCommand;
+        this._agentOrSlashCommandDetected = true;
         this._onDidChange.fire();
     }
     setResult(result) {
@@ -234,8 +254,7 @@ function isExportableSessionData(obj) {
     const data = obj;
     return typeof data === 'object' &&
         typeof data.providerId === 'string' &&
-        typeof data.requesterUsername === 'string' &&
-        typeof data.responderUsername === 'string';
+        typeof data.requesterUsername === 'string';
 }
 function isSerializableSessionData(obj) {
     const data = obj;
@@ -267,9 +286,6 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
     get sessionId() {
         return this._sessionId;
     }
-    get inputPlaceholder() {
-        return this._session?.inputPlaceholder;
-    }
     get requestInProgress() {
         const lastRequest = this._requests[this._requests.length - 1];
         return !!lastRequest && !!lastRequest.response && !lastRequest.response.isComplete;
@@ -277,17 +293,28 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
     get creationDate() {
         return this._creationDate;
     }
+    get _defaultAgent() {
+        return this.chatAgentService.getDefaultAgent(ChatAgentLocation.Panel);
+    }
     get requesterUsername() {
-        return this._session?.requesterUsername ?? this.initialData?.requesterUsername ?? '';
+        return (this._defaultAgent ?
+            this._defaultAgent.metadata.requester?.name :
+            this.initialData?.requesterUsername) ?? '';
     }
     get responderUsername() {
-        return this._session?.responderUsername ?? this.initialData?.responderUsername ?? '';
+        return (this._defaultAgent ?
+            this._defaultAgent.metadata.fullName :
+            this.initialData?.responderUsername) ?? '';
     }
     get requesterAvatarIconUri() {
-        return this._session ? this._session.requesterAvatarIconUri : this._initialRequesterAvatarIconUri;
+        return this._defaultAgent ?
+            this._defaultAgent.metadata.requester?.icon :
+            this._initialRequesterAvatarIconUri;
     }
-    get responderAvatarIconUri() {
-        return this._session ? this._session.responderAvatarIconUri : this._initialResponderAvatarIconUri;
+    get responderAvatarIcon() {
+        return this._defaultAgent ?
+            this._defaultAgent?.metadata.themeIcon :
+            this._initialResponderAvatarIconUri;
     }
     get initState() {
         return this._initState;
@@ -298,12 +325,13 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
     get title() {
         return ChatModel_1.getDefaultTitle(this._requests);
     }
-    constructor(providerId, initialData, logService, chatAgentService) {
+    constructor(providerId, initialData, logService, chatAgentService, instantiationService) {
         super();
         this.providerId = providerId;
         this.initialData = initialData;
         this.logService = logService;
         this.chatAgentService = chatAgentService;
+        this.instantiationService = instantiationService;
         this._onDidDispose = this._register(( new Emitter()));
         this.onDidDispose = this._onDidDispose.event;
         this._onDidChange = this._register(( new Emitter()));
@@ -316,7 +344,7 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
         this._requests = initialData ? this._deserialize(initialData) : [];
         this._creationDate = (isSerializableSessionData(initialData) && initialData.creationDate) || Date.now();
         this._initialRequesterAvatarIconUri = initialData?.requesterAvatarIconUri && URI.revive(initialData.requesterAvatarIconUri);
-        this._initialResponderAvatarIconUri = initialData?.responderAvatarIconUri && URI.revive(initialData.responderAvatarIconUri);
+        this._initialResponderAvatarIconUri = isUriComponents(initialData?.responderAvatarIconUri) ? URI.revive(initialData.responderAvatarIconUri) : initialData?.responderAvatarIconUri;
     }
     _deserialize(obj) {
         const requests = obj.requests;
@@ -326,7 +354,7 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
         }
         if (obj.welcomeMessage) {
             const content = ( obj.welcomeMessage.map(item => typeof item === 'string' ? ( new MarkdownString(item)) : item));
-            this._welcomeMessage = ( new ChatWelcomeMessageModel(this, content, []));
+            this._welcomeMessage = this.instantiationService.createInstance(ChatWelcomeMessageModel, content, []);
         }
         try {
             return ( requests.map((raw) => {
@@ -339,7 +367,7 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
                 const request = ( new ChatRequestModel(this, parsedRequest, variableData));
                 if (raw.response || raw.result || raw.responseErrorDetails) {
                     const agent = (raw.agent && 'metadata' in raw.agent) ?
-                        revive(raw.agent) : undefined;
+                        this.reviveSerializedAgent(raw.agent) : undefined;
                     const result = 'responseErrorDetails' in raw ?
                         { errorDetails: raw.responseErrorDetails } : raw.result;
                     request.response = ( new ChatResponseModel(raw.response ?? [( new MarkdownString(raw.response))], this, agent, raw.slashCommand, request.id, true, raw.isCanceled, raw.vote, result, raw.followups));
@@ -358,6 +386,15 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
             return [];
         }
     }
+    reviveSerializedAgent(raw) {
+        const agent = 'name' in raw ?
+            raw :
+            {
+                ...raw,
+                name: raw.id,
+            };
+        return revive(agent);
+    }
     getParsedRequestFromString(message) {
         const parts = [( new ChatRequestTextPart(( new OffsetRange(0, message.length)), { startColumn: 1, startLineNumber: 1, endColumn: 1, endLineNumber: 1 }, message))];
         return {
@@ -432,11 +469,14 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
             request.response.applyReference(progress);
         }
         else if (progress.kind === 'agentDetection') {
-            const agent = this.chatAgentService.getAgent(progress.agentName);
+            const agent = this.chatAgentService.getAgent(progress.agentId);
             if (agent) {
                 request.response.setAgent(agent, progress.command);
             }
         }
+        else if (progress.kind === 'textEdit') {
+            request.response.updateTextEdits(progress.uri, progress.edits);
+        }
         else {
             this.logService.error(`Couldn't handle progress: ${JSON.stringify(progress)}`);
         }
@@ -485,7 +525,7 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
             requesterUsername: this.requesterUsername,
             requesterAvatarIconUri: this.requesterAvatarIconUri,
             responderUsername: this.responderUsername,
-            responderAvatarIconUri: this.responderAvatarIconUri,
+            responderAvatarIconUri: this.responderAvatarIcon,
             welcomeMessage: this._welcomeMessage?.content.map(c => {
                 if (Array.isArray(c)) {
                     return c;
@@ -519,7 +559,9 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
                     followups: r.response?.followups,
                     isCanceled: r.response?.isCanceled,
                     vote: r.response?.vote,
-                    agent: r.response?.agent ? { id: r.response.agent.id, extensionId: r.response.agent.extensionId, metadata: r.response.agent.metadata } : undefined,
+                    agent: r.response?.agent ?
+                        { id: r.response.agent.id, name: r.response.agent.name, description: r.response.agent.description, extensionId: r.response.agent.extensionId, metadata: r.response.agent.metadata, slashCommands: [], locations: r.response.agent.locations, isDefault: r.response.agent.isDefault }
+                        : undefined,
                     slashCommand: r.response?.slashCommand,
                     usedContext: r.response?.usedContext,
                     contentReferences: r.response?.contentReferences
@@ -545,26 +587,31 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
 };
 ChatModel = ChatModel_1 = ( __decorate([
     ( __param(2, ILogService)),
-    ( __param(3, IChatAgentService))
+    ( __param(3, IChatAgentService)),
+    ( __param(4, IInstantiationService))
 ], ChatModel));
-class ChatWelcomeMessageModel {
+let ChatWelcomeMessageModel = class ChatWelcomeMessageModel {
+    static { ChatWelcomeMessageModel_1 = this; }
     static { this.nextId = 0; }
     get id() {
         return this._id;
     }
-    constructor(session, content, sampleQuestions) {
-        this.session = session;
+    constructor(content, sampleQuestions, chatAgentService) {
         this.content = content;
         this.sampleQuestions = sampleQuestions;
-        this._id = 'welcome_' + ChatWelcomeMessageModel.nextId++;
+        this.chatAgentService = chatAgentService;
+        this._id = 'welcome_' + ChatWelcomeMessageModel_1.nextId++;
     }
     get username() {
-        return this.session.responderUsername;
+        return this.chatAgentService.getDefaultAgent(ChatAgentLocation.Panel)?.metadata.fullName ?? '';
     }
-    get avatarIconUri() {
-        return this.session.responderAvatarIconUri;
+    get avatarIcon() {
+        return this.chatAgentService.getDefaultAgent(ChatAgentLocation.Panel)?.metadata.themeIcon;
     }
-}
+};
+ChatWelcomeMessageModel = ChatWelcomeMessageModel_1 = ( __decorate([
+    ( __param(2, IChatAgentService))
+], ChatWelcomeMessageModel));
 function getHistoryEntriesFromModel(model) {
     const history = [];
     for (const request of model.getRequests()) {
@@ -578,7 +625,8 @@ function getHistoryEntriesFromModel(model) {
             agentId: request.response.agent?.id ?? '',
             message: promptTextResult.message,
             command: request.response.slashCommand?.name,
-            variables: updateRanges(request.variableData, promptTextResult.diff)
+            variables: updateRanges(request.variableData, promptTextResult.diff),
+            location: ChatAgentLocation.Panel
         };
         history.push({ request: historyRequest, response: request.response.response.value, result: request.response.result ?? {} });
     }
@@ -588,7 +636,7 @@ function updateRanges(variableData, diff) {
     return {
         variables: ( variableData.variables.map(v => ({
             ...v,
-            range: {
+            range: v.range && {
                 start: v.range.start - diff,
                 endExclusive: v.range.endExclusive - diff
             }

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

@@ -46,7 +46,7 @@ class ChatRequestAgentPart {
         this.kind = ChatRequestAgentPart.Kind;
     }
     get text() {
-        return `${chatAgentLeader}${this.agent.id}`;
+        return `${chatAgentLeader}${this.agent.name}`;
     }
     get promptText() {
         return '';
@@ -58,6 +58,8 @@ class ChatRequestAgentPart {
             editorRange: this.editorRange,
             agent: {
                 id: this.agent.id,
+                name: this.agent.name,
+                description: this.agent.description,
                 metadata: this.agent.metadata
             }
         };
@@ -120,7 +122,14 @@ function reviveParsedChatRequest(serialized) {
                 return ( new ChatRequestVariablePart(( new OffsetRange(part.range.start, part.range.endExclusive)), part.editorRange, part.variableName, part.variableArg));
             }
             else if (part.kind === ChatRequestAgentPart.Kind) {
-                return ( new ChatRequestAgentPart(( new OffsetRange(part.range.start, part.range.endExclusive)), part.editorRange, part.agent));
+                let agent = part.agent;
+                if (!('name' in agent)) {
+                    agent = {
+                        ...agent,
+                        name: agent.id
+                    };
+                }
+                return ( new ChatRequestAgentPart(( new OffsetRange(part.range.start, part.range.endExclusive)), part.editorRange, agent));
             }
             else if (part.kind === ChatRequestAgentSubcommandPart.Kind) {
                 return ( new ChatRequestAgentSubcommandPart(( new OffsetRange(part.range.start, part.range.endExclusive)), part.editorRange, part.command));
@@ -137,4 +146,9 @@ function reviveParsedChatRequest(serialized) {
         }))
     };
 }
-export { ChatRequestAgentPart, ChatRequestAgentSubcommandPart, ChatRequestDynamicVariablePart, ChatRequestSlashCommandPart, ChatRequestTextPart, ChatRequestVariablePart, chatAgentLeader, chatSubcommandLeader, chatVariableLeader, getPromptText, reviveParsedChatRequest };
+function extractAgentAndCommand(parsed) {
+    const agentPart = parsed.parts.find((r) => r instanceof ChatRequestAgentPart);
+    const commandPart = parsed.parts.find((r) => r instanceof ChatRequestAgentSubcommandPart);
+    return { agentPart, commandPart };
+}
+export { ChatRequestAgentPart, ChatRequestAgentSubcommandPart, ChatRequestDynamicVariablePart, ChatRequestSlashCommandPart, ChatRequestTextPart, ChatRequestVariablePart, chatAgentLeader, chatSubcommandLeader, chatVariableLeader, extractAgentAndCommand, getPromptText, reviveParsedChatRequest };

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

@@ -2,25 +2,22 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 import { OffsetRange } from '../../../../editor/common/core/offsetRange.js';
 import { Position } from '../../../../editor/common/core/position.js';
 import { Range } from '../../../../editor/common/core/range.js';
-import { IChatAgentService } from './chatAgents.js';
+import { ChatAgentLocation, IChatAgentService } from './chatAgents.js';
 import { chatVariableLeader, chatAgentLeader, chatSubcommandLeader, ChatRequestTextPart, ChatRequestAgentPart, ChatRequestVariablePart, ChatRequestSlashCommandPart, ChatRequestAgentSubcommandPart, ChatRequestDynamicVariablePart } from './chatParserTypes.js';
-import { IChatService } from './chatService.js';
 import { IChatSlashCommandService } from './chatSlashCommands.js';
 import { IChatVariablesService } from './chatVariables.js';
 const agentReg = /^@([\w_\-]+)(?=(\s|$|\b))/i;
 const variableReg = /^#([\w_\-]+)(:\d+)?(?=(\s|$|\b))/i;
 const slashReg = /\/([\w_\-]+)(?=(\s|$|\b))/i;
 let ChatRequestParser = class ChatRequestParser {
-    constructor(agentService, variableService, slashCommandService, chatService) {
+    constructor(agentService, variableService, slashCommandService) {
         this.agentService = agentService;
         this.variableService = variableService;
         this.slashCommandService = slashCommandService;
-        this.chatService = chatService;
     }
-    parseChatRequest(sessionId, message) {
+    parseChatRequest(sessionId, message, location = ChatAgentLocation.Panel, context) {
         const parts = [];
         const references = this.variableService.getDynamicVariables(sessionId);
-        const model = this.chatService.getSession(sessionId);
         let lineNumber = 1;
         let column = 1;
         for (let i = 0; i < message.length; i++) {
@@ -32,10 +29,10 @@ let ChatRequestParser = class ChatRequestParser {
                     newPart = this.tryToParseVariable(message.slice(i), i, ( new Position(lineNumber, column)), parts);
                 }
                 else if (char === chatAgentLeader) {
-                    newPart = this.tryToParseAgent(message.slice(i), message, i, ( new Position(lineNumber, column)), parts);
+                    newPart = this.tryToParseAgent(message.slice(i), message, i, ( new Position(lineNumber, column)), parts, location, context);
                 }
                 else if (char === chatSubcommandLeader) {
-                    newPart = this.tryToParseSlashCommand(model, message.slice(i), message, i, ( new Position(lineNumber, column)), parts);
+                    newPart = this.tryToParseSlashCommand(message.slice(i), message, i, ( new Position(lineNumber, column)), parts);
                 }
                 if (!newPart) {
                     newPart = this.tryToParseDynamicVariable(message.slice(i), i, ( new Position(lineNumber, column)), references);
@@ -79,21 +76,24 @@ let ChatRequestParser = class ChatRequestParser {
             text: message,
         };
     }
-    tryToParseAgent(message, fullMessage, offset, position, parts) {
-        const nextVariableMatch = message.match(agentReg);
-        if (!nextVariableMatch) {
+    tryToParseAgent(message, fullMessage, offset, position, parts, location, context) {
+        const nextAgentMatch = message.match(agentReg);
+        if (!nextAgentMatch) {
             return;
         }
-        const [full, name] = nextVariableMatch;
-        const varRange = ( new OffsetRange(offset, offset + full.length));
-        const varEditorRange = ( new Range(
+        const [full, name] = nextAgentMatch;
+        const agentRange = ( new OffsetRange(offset, offset + full.length));
+        const agentEditorRange = ( new Range(
             position.lineNumber,
             position.column,
             position.lineNumber,
             position.column + full.length
         ));
-        const agent = this.agentService.getAgent(name);
-        if (!agent) {
+        const agents = this.agentService.getAgentsByName(name);
+        const agent = agents.length > 1 && context?.selectedAgent ?
+            context.selectedAgent :
+            agents[0];
+        if (!agent || !agent.locations.includes(location)) {
             return;
         }
         if (( parts.some(p => p instanceof ChatRequestAgentPart))) {
@@ -110,7 +110,7 @@ let ChatRequestParser = class ChatRequestParser {
         if (textSincePreviousPart.trim() !== '') {
             return;
         }
-        return ( new ChatRequestAgentPart(varRange, varEditorRange, agent));
+        return ( new ChatRequestAgentPart(agentRange, agentEditorRange, agent));
     }
     tryToParseVariable(message, offset, position, parts) {
         const nextVariableMatch = message.match(variableReg);
@@ -131,7 +131,7 @@ let ChatRequestParser = class ChatRequestParser {
         }
         return;
     }
-    tryToParseSlashCommand(model, remainingMessage, fullMessage, offset, position, parts) {
+    tryToParseSlashCommand(remainingMessage, fullMessage, offset, position, parts) {
         const nextSlashMatch = remainingMessage.match(slashReg);
         if (!nextSlashMatch) {
             return;
@@ -160,8 +160,7 @@ let ChatRequestParser = class ChatRequestParser {
             if (textSincePreviousPart.trim() !== '') {
                 return;
             }
-            const subCommands = usedAgent.agent.getLastSlashCommands(model);
-            const subCommand = subCommands?.find(c => c.name === command);
+            const subCommand = usedAgent.agent.slashCommands.find(c => c.name === command);
             if (subCommand) {
                 return ( new ChatRequestAgentSubcommandPart(slashRange, slashEditorRange, subCommand));
             }
@@ -190,7 +189,6 @@ let ChatRequestParser = class ChatRequestParser {
 ChatRequestParser = ( __decorate([
     ( __param(0, IChatAgentService)),
     ( __param(1, IChatVariablesService)),
-    ( __param(2, IChatSlashCommandService)),
-    ( __param(3, IChatService))
+    ( __param(2, IChatSlashCommandService))
 ], ChatRequestParser));
 export { ChatRequestParser };

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

@@ -26,4 +26,5 @@ var ChatCopyKind;
     ChatCopyKind[ChatCopyKind["Toolbar"] = 2] = "Toolbar";
 })(ChatCopyKind || (ChatCopyKind = {})));
 const IChatService = ( createDecorator('IChatService'));
-export { ChatCopyKind, IChatService, InteractiveSessionVoteDirection, isIDocumentContext, isIUsedContext };
+const KEYWORD_ACTIVIATION_SETTING_ID = 'accessibility.voice.keywordActivation';
+export { ChatCopyKind, IChatService, InteractiveSessionVoteDirection, KEYWORD_ACTIVIATION_SETTING_ID, isIDocumentContext, isIUsedContext };