@codingame/monaco-vscode-api 3.2.2 → 4.0.0

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

@@ -1,72 +1,166 @@
+import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { Emitter } from '../../../../base/common/event.js';
 import { Iterable } from '../../../../base/common/iterator.js';
-import { Disposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { toDisposable } from '../../../../base/common/lifecycle.js';
+import { ContextKeyExpr, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
 import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+var ChatAgentLocation;
+( (function(ChatAgentLocation) {
+    ChatAgentLocation["Panel"] = "panel";
+    ChatAgentLocation["Terminal"] = "terminal";
+    ChatAgentLocation["Notebook"] = "notebook";
+    ChatAgentLocation["Editor"] = "editor";
+})(ChatAgentLocation || (ChatAgentLocation = {})));
+( (function(ChatAgentLocation) {
+    function fromRaw(value) {
+        switch (value) {
+            case 'panel': return ChatAgentLocation.Panel;
+            case 'terminal': return ChatAgentLocation.Terminal;
+            case 'notebook': return ChatAgentLocation.Notebook;
+        }
+        return ChatAgentLocation.Panel;
+    }
+    ChatAgentLocation.fromRaw = fromRaw;
+})(ChatAgentLocation || (ChatAgentLocation = {})));
 const IChatAgentService = ( createDecorator('chatAgentService'));
-class ChatAgentService extends Disposable {
-    constructor() {
-        super(...arguments);
-        this._agents = ( new Map());
-        this._onDidChangeAgents = this._register(( new Emitter()));
+let ChatAgentService = class ChatAgentService {
+    static { this.AGENT_LEADER = '@'; }
+    constructor(contextKeyService) {
+        this.contextKeyService = contextKeyService;
+        this._agents = [];
+        this._onDidChangeAgents = ( new Emitter());
         this.onDidChangeAgents = this._onDidChangeAgents.event;
     }
-    static { this.AGENT_LEADER = '@'; }
-    dispose() {
-        super.dispose();
-        this._agents.clear();
+    registerAgent(id, data) {
+        const existingAgent = this.getAgent(id);
+        if (existingAgent) {
+            throw new Error(`Agent already registered: ${JSON.stringify(id)}`);
+        }
+        const that = this;
+        const commands = data.slashCommands;
+        data = {
+            ...data,
+            get slashCommands() {
+                return commands.filter(c => !c.when || that.contextKeyService.contextMatchesRules(ContextKeyExpr.deserialize(c.when)));
+            }
+        };
+        const entry = { data };
+        this._agents.push(entry);
+        return toDisposable(() => {
+            this._agents = this._agents.filter(a => a !== entry);
+            this._onDidChangeAgents.fire(undefined);
+        });
     }
-    registerAgent(agent) {
-        if (( this._agents.has(agent.id))) {
-            throw new Error(`Already registered an agent with id ${agent.id}`);
+    registerAgentImplementation(id, agentImpl) {
+        const entry = this._getAgentEntry(id);
+        if (!entry) {
+            throw new Error(`Unknown agent: ${JSON.stringify(id)}`);
+        }
+        if (entry.impl) {
+            throw new Error(`Agent already has implementation: ${JSON.stringify(id)}`);
         }
-        this._agents.set(agent.id, { agent });
-        this._onDidChangeAgents.fire(agent);
+        entry.impl = agentImpl;
+        this._onDidChangeAgents.fire(( new MergedChatAgent(entry.data, agentImpl)));
         return toDisposable(() => {
-            if (this._agents.delete(agent.id)) {
-                this._onDidChangeAgents.fire(undefined);
-            }
+            entry.impl = undefined;
+            this._onDidChangeAgents.fire(undefined);
+        });
+    }
+    registerDynamicAgent(data, agentImpl) {
+        const agent = { data, impl: agentImpl };
+        this._agents.push(agent);
+        this._onDidChangeAgents.fire(( new MergedChatAgent(data, agentImpl)));
+        return toDisposable(() => {
+            this._agents = this._agents.filter(a => a !== agent);
+            this._onDidChangeAgents.fire(undefined);
         });
     }
     updateAgent(id, updateMetadata) {
-        const data = this._agents.get(id);
-        if (!data) {
-            throw new Error(`No agent with id ${id} registered`);
+        const agent = this._getAgentEntry(id);
+        if (!agent?.impl) {
+            throw new Error(`No activated agent with id ${JSON.stringify(id)} registered`);
         }
-        data.agent.metadata = { ...data.agent.metadata, ...updateMetadata };
-        this._onDidChangeAgents.fire(data.agent);
+        agent.data.metadata = { ...agent.data.metadata, ...updateMetadata };
+        this._onDidChangeAgents.fire(( new MergedChatAgent(agent.data, agent.impl)));
     }
-    getDefaultAgent() {
-        return Iterable.find(( this._agents.values()), a => !!a.agent.metadata.isDefault)?.agent;
+    getDefaultAgent(location) {
+        return this.getActivatedAgents().find(a => !!a.isDefault && a.locations.includes(location));
     }
     getSecondaryAgent() {
-        return Iterable.find(( this._agents.values()), a => !!a.agent.metadata.isSecondary)?.agent;
+        return Iterable.find(( this._agents.values()), a => !!a.data.metadata.isSecondary)?.data;
+    }
+    _getAgentEntry(id) {
+        return this._agents.find(a => a.data.id === id);
+    }
+    getAgent(id) {
+        return this._getAgentEntry(id)?.data;
     }
     getAgents() {
-        return Array.from(( this._agents.values()), v => v.agent);
+        return ( this._agents.map(entry => entry.data));
     }
-    hasAgent(id) {
-        return ( this._agents.has(id));
+    getActivatedAgents() {
+        return ( Array.from(( this._agents.values()))
+            .filter(a => !!a.impl)
+            .map(a => ( new MergedChatAgent(a.data, a.impl))));
     }
-    getAgent(id) {
-        const data = this._agents.get(id);
-        return data?.agent;
+    getAgentsByName(name) {
+        return this.getAgents().filter(a => a.name === name);
     }
     async invokeAgent(id, request, progress, history, token) {
-        const data = this._agents.get(id);
-        if (!data) {
-            throw new Error(`No agent with id ${id}`);
+        const data = this._getAgentEntry(id);
+        if (!data?.impl) {
+            throw new Error(`No activated agent with id ${id}`);
         }
-        return await data.agent.invoke(request, progress, history, token);
+        return await data.impl.invoke(request, progress, history, token);
     }
-    async getFollowups(id, request, result, token) {
-        const data = this._agents.get(id);
-        if (!data) {
-            throw new Error(`No agent with id ${id}`);
+    async getFollowups(id, request, result, history, token) {
+        const data = this._getAgentEntry(id);
+        if (!data?.impl) {
+            throw new Error(`No activated agent with id ${id}`);
         }
-        if (!data.agent.provideFollowups) {
+        if (!data.impl?.provideFollowups) {
             return [];
         }
-        return data.agent.provideFollowups(request, result, token);
+        return data.impl.provideFollowups(request, result, history, token);
+    }
+};
+ChatAgentService = ( __decorate([
+    ( __param(0, IContextKeyService))
+], ChatAgentService));
+class MergedChatAgent {
+    constructor(data, impl) {
+        this.data = data;
+        this.impl = impl;
+    }
+    get id() { return this.data.id; }
+    get name() { return this.data.name ?? ''; }
+    get description() { return this.data.description ?? ''; }
+    get extensionId() { return this.data.extensionId; }
+    get isDefault() { return this.data.isDefault; }
+    get metadata() { return this.data.metadata; }
+    get slashCommands() { return this.data.slashCommands; }
+    get defaultImplicitVariables() { return this.data.defaultImplicitVariables; }
+    get locations() { return this.data.locations; }
+    async invoke(request, progress, history, token) {
+        return this.impl.invoke(request, progress, history, token);
+    }
+    async provideFollowups(request, result, history, token) {
+        if (this.impl.provideFollowups) {
+            return this.impl.provideFollowups(request, result, history, token);
+        }
+        return [];
+    }
+    provideWelcomeMessage(token) {
+        if (this.impl.provideWelcomeMessage) {
+            return this.impl.provideWelcomeMessage(token);
+        }
+        return undefined;
+    }
+    provideSampleQuestions(token) {
+        if (this.impl.provideSampleQuestions) {
+            return this.impl.provideSampleQuestions(token);
+        }
+        return undefined;
     }
 }
-export { ChatAgentService, IChatAgentService };
+export { ChatAgentLocation, ChatAgentService, IChatAgentService, MergedChatAgent };

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

@@ -0,0 +1,44 @@
+import { Color, RGBA } from '../../../../base/common/color.js';
+import { localizeWithPath } from '../../../../nls.js';
+import { registerColor, transparent } from '../../../../platform/theme/common/colorUtils.js';
+import { contrastBorder, foreground } from '../../../../platform/theme/common/colors/baseColors.js';
+import '../../../../platform/theme/common/colors/chartsColors.js';
+import { editorWidgetBackground, editorBackground } from '../../../../platform/theme/common/colors/editorColors.js';
+import '../../../../platform/theme/common/colors/inputColors.js';
+import '../../../../platform/theme/common/colors/listColors.js';
+import '../../../../platform/theme/common/colors/menuColors.js';
+import '../../../../platform/theme/common/colors/minimapColors.js';
+import { badgeBackground, badgeForeground } from '../../../../platform/theme/common/colors/miscColors.js';
+import '../../../../platform/theme/common/colors/quickpickColors.js';
+import '../../../../platform/theme/common/colors/searchColors.js';
+registerColor('chat.requestBorder', { dark: ( new Color(( new RGBA(255, 255, 255, 0.10)))), light: ( new Color(( new RGBA(0, 0, 0, 0.10)))), hcDark: contrastBorder, hcLight: contrastBorder, }, ( localizeWithPath(
+ 'vs/workbench/contrib/chat/common/chatColors',
+ 'chat.requestBorder',
+ 'The border color of a chat request.'
+)));
+const chatRequestBackground = registerColor('chat.requestBackground', { dark: ( transparent(editorBackground, 0.62)), light: ( transparent(editorBackground, 0.62)), hcDark: editorWidgetBackground, hcLight: null }, ( localizeWithPath(
+ 'vs/workbench/contrib/chat/common/chatColors',
+ 'chat.requestBackground',
+ 'The background color of a chat request.'
+)));
+const chatSlashCommandBackground = registerColor('chat.slashCommandBackground', { dark: '#34414B', light: '#D2ECFF', hcDark: Color.white, hcLight: badgeBackground }, ( localizeWithPath(
+ 'vs/workbench/contrib/chat/common/chatColors',
+ 'chat.slashCommandBackground',
+ 'The background color of a chat slash command.'
+)));
+const chatSlashCommandForeground = registerColor('chat.slashCommandForeground', { dark: '#40A6FF', light: '#306CA2', hcDark: Color.black, hcLight: badgeForeground }, ( localizeWithPath(
+ 'vs/workbench/contrib/chat/common/chatColors',
+ 'chat.slashCommandForeground',
+ 'The foreground color of a chat slash command.'
+)));
+registerColor('chat.avatarBackground', { dark: '#1f1f1f', light: '#f2f2f2', hcDark: Color.black, hcLight: Color.white, }, ( localizeWithPath(
+ 'vs/workbench/contrib/chat/common/chatColors',
+ 'chat.avatarBackground',
+ 'The background color of a chat avatar.'
+)));
+registerColor('chat.avatarForeground', { dark: foreground, light: foreground, hcDark: foreground, hcLight: foreground, }, ( localizeWithPath(
+ 'vs/workbench/contrib/chat/common/chatColors',
+ 'chat.avatarForeground',
+ 'The foreground color of a chat avatar.'
+)));
+export { chatRequestBackground, chatSlashCommandBackground, chatSlashCommandForeground };

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

@@ -9,6 +9,15 @@ const CONTEXT_RESPONSE_VOTE = ( new RawContextKey(
   "When the response has been voted up, is set to 'up'. When voted down, is set to 'down'. Otherwise an empty string."
  )) }
 ));
+const CONTEXT_RESPONSE_DETECTED_AGENT_COMMAND = ( new RawContextKey(
+ 'chatSessionResponseDetectedAgentOrCommand',
+ false,
+ { type: 'boolean', description: ( localizeWithPath(
+  'vs/workbench/contrib/chat/common/chatContextKeys',
+  'chatSessionResponseDetectedAgentOrCommand',
+  "When the agent or command was automatically detected"
+ )) }
+));
 const CONTEXT_CHAT_RESPONSE_SUPPORT_ISSUE_REPORTING = ( new RawContextKey(
  'chatResponseSupportsIssueReporting',
  false,
@@ -51,6 +60,11 @@ const CONTEXT_CHAT_INPUT_HAS_TEXT = ( new RawContextKey('chatInputHasText', fals
  'interactiveInputHasText',
  "True when the chat input has text."
 )) }));
+const CONTEXT_CHAT_INPUT_HAS_FOCUS = ( new RawContextKey('chatInputHasFocus', false, { type: 'boolean', description: ( localizeWithPath(
+ 'vs/workbench/contrib/chat/common/chatContextKeys',
+ 'interactiveInputHasFocus',
+ "True when the chat input has focus."
+)) }));
 const CONTEXT_IN_CHAT_INPUT = ( new RawContextKey('inChatInput', false, { type: 'boolean', description: ( localizeWithPath(
  'vs/workbench/contrib/chat/common/chatContextKeys',
  'inInteractiveInput',
@@ -67,4 +81,6 @@ const CONTEXT_PROVIDER_EXISTS = ( new RawContextKey('hasChatProvider', false, {
  "True when some chat provider has been registered."
 )) }));
 const CONTEXT_CHAT_INPUT_CURSOR_AT_TOP = ( new RawContextKey('chatCursorAtTop', false));
-export { CONTEXT_CHAT_INPUT_CURSOR_AT_TOP, CONTEXT_CHAT_INPUT_HAS_TEXT, CONTEXT_CHAT_REQUEST_IN_PROGRESS, CONTEXT_CHAT_RESPONSE_SUPPORT_ISSUE_REPORTING, CONTEXT_IN_CHAT_INPUT, CONTEXT_IN_CHAT_SESSION, CONTEXT_PROVIDER_EXISTS, CONTEXT_REQUEST, CONTEXT_RESPONSE, CONTEXT_RESPONSE_FILTERED, CONTEXT_RESPONSE_VOTE };
+const CONTEXT_CHAT_INPUT_HAS_AGENT = ( new RawContextKey('chatInputHasAgent', false));
+const CONTEXT_CHAT_LOCATION = ( new RawContextKey('chatLocation', undefined));
+export { CONTEXT_CHAT_INPUT_CURSOR_AT_TOP, CONTEXT_CHAT_INPUT_HAS_AGENT, CONTEXT_CHAT_INPUT_HAS_FOCUS, CONTEXT_CHAT_INPUT_HAS_TEXT, CONTEXT_CHAT_LOCATION, CONTEXT_CHAT_REQUEST_IN_PROGRESS, CONTEXT_CHAT_RESPONSE_SUPPORT_ISSUE_REPORTING, CONTEXT_IN_CHAT_INPUT, CONTEXT_IN_CHAT_SESSION, CONTEXT_PROVIDER_EXISTS, CONTEXT_REQUEST, CONTEXT_RESPONSE, CONTEXT_RESPONSE_DETECTED_AGENT_COMMAND, CONTEXT_RESPONSE_FILTERED, CONTEXT_RESPONSE_VOTE };

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 };