@codingame/monaco-vscode-api 5.3.0 → 6.0.0

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

@@ -1,4 +1,5 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
+import { localizeWithPath } from '../../../../nls.js';
 import { asArray, firstOrDefault } from '../../../../base/common/arrays.js';
 import { DeferredPromise } from '../../../../base/common/async.js';
 import { Emitter } from '../../../../base/common/event.js';
@@ -12,15 +13,16 @@ 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.service.js';
-import { ChatAgentLocation } from './chatAgents.js';
+import { ChatAgentLocation, reviveSerializedAgent } from './chatAgents.js';
 import { IChatAgentService } from './chatAgents.service.js';
 import { getPromptText, reviveParsedChatRequest, ChatRequestTextPart } from './chatParserTypes.js';
 import { isIUsedContext } from './chatService.js';
 var ChatModel_1, ChatWelcomeMessageModel_1;
+const _moduleId = "vs/workbench/contrib/chat/common/chatModel";
 class ChatRequestModel {
     static { this.nextId = 0; }
-    get id() {
-        return this._id;
+    get session() {
+        return this._session;
     }
     get username() {
         return this.session.requesterUsername;
@@ -37,12 +39,15 @@ class ChatRequestModel {
     set variableData(v) {
         this._variableData = v;
     }
-    constructor(session, message, _variableData, _attempt = 0) {
-        this.session = session;
+    constructor(_session, message, _variableData, _attempt = 0) {
+        this._session = _session;
         this.message = message;
         this._variableData = _variableData;
         this._attempt = _attempt;
-        this._id = 'request_' + ChatRequestModel.nextId++;
+        this.id = 'request_' + ChatRequestModel.nextId++;
+    }
+    adoptTo(session) {
+        this._session = session;
     }
 }
 class Response {
@@ -53,10 +58,10 @@ class Response {
         return this._responseParts;
     }
     constructor(value) {
-        this._onDidChangeValue = ( new Emitter());
-        this._responseParts = ( asArray(value).map((v) => (isMarkdownString(v) ?
+        this._onDidChangeValue = ( (new Emitter()));
+        this._responseParts = ( (asArray(value).map((v) => (isMarkdownString(v) ?
             { content: v, kind: 'markdownContent' } :
-            'kind' in v ? v : { kind: 'treeData', treeData: v })));
+            'kind' in v ? v : { kind: 'treeData', treeData: v }))));
         this._updateRepr(true);
     }
     asString() {
@@ -74,13 +79,7 @@ class Response {
                 this._responseParts.push(progress);
             }
             else {
-                lastResponsePart.content = {
-                    value: lastResponsePart.content.value + progress.content.value,
-                    isTrusted: lastResponsePart.content.isTrusted,
-                    supportThemeIcons: lastResponsePart.content.supportThemeIcons,
-                    supportHtml: lastResponsePart.content.supportHtml,
-                    baseUri: lastResponsePart.content.baseUri
-                };
+                lastResponsePart.content = appendMarkdownString(lastResponsePart.content, progress.content);
             }
             this._updateRepr(quiet);
         }
@@ -104,13 +103,27 @@ class Response {
                 this._updateRepr(quiet);
             }
         }
+        else if (progress.kind === 'progressTask') {
+            const responsePosition = this._responseParts.push(progress) - 1;
+            this._updateRepr(quiet);
+            const disp = progress.onDidAddProgress(() => {
+                this._updateRepr(false);
+            });
+            progress.task?.().then((content) => {
+                disp.dispose();
+                if (typeof content === 'string') {
+                    this._responseParts[responsePosition] = { ...progress, content: ( (new MarkdownString(content))) };
+                }
+                this._updateRepr(false);
+            });
+        }
         else {
             this._responseParts.push(progress);
             this._updateRepr(quiet);
         }
     }
     _updateRepr(quiet) {
-        this._responseRepr = ( this._responseParts.map(part => {
+        this._responseRepr = ( (this._responseParts.map(part => {
             if (part.kind === 'treeData') {
                 return '';
             }
@@ -121,12 +134,20 @@ class Response {
                 return part.command.title;
             }
             else if (part.kind === 'textEditGroup') {
+                return ( localizeWithPath(_moduleId, 0, "Made changes."));
+            }
+            else if (part.kind === 'progressMessage') {
                 return '';
             }
+            else if (part.kind === 'confirmation') {
+                return `${part.title}\n${part.message}`;
+            }
             else {
                 return part.content.value;
             }
-        })).join('\n\n');
+        })))
+            .filter(s => s.length > 0)
+            .join('\n\n');
         if (!quiet) {
             this._onDidChangeValue.fire();
         }
@@ -134,8 +155,8 @@ class Response {
 }
 class ChatResponseModel extends Disposable {
     static { this.nextId = 0; }
-    get id() {
-        return this._id;
+    get session() {
+        return this._session;
     }
     get isComplete() {
         return this._isComplete;
@@ -182,9 +203,9 @@ class ChatResponseModel extends Disposable {
     get isStale() {
         return this._isStale;
     }
-    constructor(_response, session, _agent, _slashCommand, requestId, _isComplete = false, _isCanceled = false, _vote, _result, followups) {
+    constructor(_response, _session, _agent, _slashCommand, requestId, _isComplete = false, _isCanceled = false, _vote, _result, followups) {
         super();
-        this.session = session;
+        this._session = _session;
         this._agent = _agent;
         this._slashCommand = _slashCommand;
         this.requestId = requestId;
@@ -192,16 +213,16 @@ class ChatResponseModel extends Disposable {
         this._isCanceled = _isCanceled;
         this._vote = _vote;
         this._result = _result;
-        this._onDidChange = this._register(( new Emitter()));
+        this._onDidChange = this._register(( (new Emitter())));
         this.onDidChange = this._onDidChange.event;
         this._contentReferences = [];
         this._progressMessages = [];
         this._isStale = false;
         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._response = ( (new Response(_response)));
         this._register(this._response.onDidChangeValue(() => this._onDidChange.fire()));
-        this._id = 'response_' + ChatResponseModel.nextId++;
+        this.id = 'response_' + ChatResponseModel.nextId++;
     }
     updateContent(responsePart, quiet) {
         this._response.updateContent(responsePart, quiet);
@@ -256,6 +277,10 @@ class ChatResponseModel extends Disposable {
         this._onDidChange.fire();
         return true;
     }
+    adoptTo(session) {
+        this._session = session;
+        this._onDidChange.fire();
+    }
 }
 function isExportableSessionData(obj) {
     const data = obj;
@@ -269,12 +294,18 @@ function isSerializableSessionData(obj) {
         typeof data.sessionId === 'string' &&
         obj.requests.every((request) => !request.usedContext  || isIUsedContext(request.usedContext));
 }
+var ChatRequestRemovalReason;
+( ((function(ChatRequestRemovalReason) {
+    ChatRequestRemovalReason[ChatRequestRemovalReason["Removal"] = 0] = "Removal";
+    ChatRequestRemovalReason[ChatRequestRemovalReason["Resend"] = 1] = "Resend";
+    ChatRequestRemovalReason[ChatRequestRemovalReason["Adoption"] = 2] = "Adoption";
+})(ChatRequestRemovalReason || (ChatRequestRemovalReason = {}))));
 var ChatModelInitState;
-( (function(ChatModelInitState) {
+( ((function(ChatModelInitState) {
     ChatModelInitState[ChatModelInitState["Created"] = 0] = "Created";
     ChatModelInitState[ChatModelInitState["Initializing"] = 1] = "Initializing";
     ChatModelInitState[ChatModelInitState["Initialized"] = 2] = "Initialized";
-})(ChatModelInitState || (ChatModelInitState = {})));
+})(ChatModelInitState || (ChatModelInitState = {}))));
 let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
     static getDefaultTitle(requests) {
         const firstRequestMessage = firstOrDefault(requests)?.message ?? '';
@@ -309,7 +340,7 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
     }
     get responderUsername() {
         return (this._defaultAgent ?
-            this._defaultAgent.metadata.fullName :
+            this._defaultAgent.fullName :
             this.initialData?.responderUsername) ?? '';
     }
     get requesterAvatarIconUri() {
@@ -341,12 +372,12 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
         this.logService = logService;
         this.chatAgentService = chatAgentService;
         this.instantiationService = instantiationService;
-        this._onDidDispose = this._register(( new Emitter()));
+        this._onDidDispose = this._register(( (new Emitter())));
         this.onDidDispose = this._onDidDispose.event;
-        this._onDidChange = this._register(( new Emitter()));
+        this._onDidChange = this._register(( (new Emitter())));
         this.onDidChange = this._onDidChange.event;
         this._initState = ChatModelInitState.Created;
-        this._isInitializedDeferred = ( new DeferredPromise());
+        this._isInitializedDeferred = ( (new DeferredPromise()));
         this._isImported = false;
         this._isImported = (!!initialData && !isSerializableSessionData(initialData)) || (initialData?.isImported ?? false);
         this._sessionId = (isSerializableSessionData(initialData) && initialData.sessionId) || generateUuid();
@@ -362,56 +393,79 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
             return [];
         }
         if (obj.welcomeMessage) {
-            const content = ( obj.welcomeMessage.map(item => typeof item === 'string' ? ( new MarkdownString(item)) : item));
+            const content = ( (obj.welcomeMessage.map(
+                item => typeof item === 'string' ? ( (new MarkdownString(item))) : item
+            )));
             this._welcomeMessage = this.instantiationService.createInstance(ChatWelcomeMessageModel, content, []);
         }
         try {
-            return ( requests.map((raw) => {
-                const parsedRequest = typeof raw.message === 'string'
-                    ? this.getParsedRequestFromString(raw.message)
-                    : reviveParsedChatRequest(raw.message);
-                const variableData = raw.variableData && Array.isArray(raw.variableData.variables)
-                    ? raw.variableData :
-                    { variables: [] };
-                const request = ( new ChatRequestModel(this, parsedRequest, variableData));
-                if (raw.response || raw.result || raw.responseErrorDetails) {
-                    const agent = (raw.agent && 'metadata' in raw.agent) ?
-                        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));
-                    if (raw.usedContext) {
-                        request.response.applyReference(revive(raw.usedContext));
-                    }
-                    if (raw.contentReferences) {
-                        raw.contentReferences.forEach(r => request.response.applyReference(revive(r)));
+            return (
+                 (requests.map((raw) => {
+                    const parsedRequest = typeof raw.message === 'string'
+                        ? this.getParsedRequestFromString(raw.message)
+                        : reviveParsedChatRequest(raw.message);
+                    const variableData = this.reviveVariableData(raw.variableData);
+                    const request = ( (new ChatRequestModel(this, parsedRequest, variableData)));
+                    if (raw.response || raw.result || raw.responseErrorDetails) {
+                        const agent = (raw.agent && 'metadata' in raw.agent) ?
+                            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
+                        )));
+                        if (raw.usedContext) {
+                            request.response.applyReference(revive(raw.usedContext));
+                        }
+                        if (raw.contentReferences) {
+                            raw.contentReferences.forEach(r => request.response.applyReference(revive(r)));
+                        }
                     }
-                }
-                return request;
-            }));
+                    return request;
+                }))
+            );
         }
         catch (error) {
             this.logService.error('Failed to parse chat data', error);
             return [];
         }
     }
-    reviveSerializedAgent(raw) {
-        const agent = 'name' in raw ?
-            raw :
-            {
-                ...raw,
-                name: raw.id,
-            };
-        if (!('extensionPublisherId' in agent)) {
-            agent.extensionPublisherId = agent.extensionPublisher ?? '';
-        }
-        if (!('extensionDisplayName' in agent)) {
-            agent.extensionDisplayName = '';
-        }
-        return revive(agent);
+    reviveVariableData(raw) {
+        const variableData = raw && Array.isArray(raw.variables)
+            ? raw :
+            { variables: [] };
+        variableData.variables = ( (variableData.variables.map((v) => {
+            if ('values' in v && Array.isArray(v.values)) {
+                return {
+                    id: v.id ?? '',
+                    name: v.name,
+                    value: v.values[0]?.value,
+                    range: v.range,
+                    modelDescription: v.modelDescription,
+                    references: v.references
+                };
+            }
+            else {
+                return v;
+            }
+        })));
+        return variableData;
     }
     getParsedRequestFromString(message) {
-        const parts = [( new ChatRequestTextPart(( new OffsetRange(0, message.length)), { startColumn: 1, startLineNumber: 1, endColumn: 1, endLineNumber: 1 }, message))];
+        const parts = [( (new ChatRequestTextPart(
+             (new OffsetRange(0, message.length)),
+            { startColumn: 1, startLineNumber: 1, endColumn: 1, endLineNumber: 1 },
+            message
+        )))];
         return {
             text: message,
             parts
@@ -419,21 +473,21 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
     }
     startInitialize() {
         if (this.initState !== ChatModelInitState.Created) {
-            throw ( new Error(
+            throw ( (new Error(
                 `ChatModel is in the wrong state for startInitialize: ${ChatModelInitState[this.initState]}`
-            ));
+            )));
         }
         this._initState = ChatModelInitState.Initializing;
     }
     deinitialize() {
         this._initState = ChatModelInitState.Created;
-        this._isInitializedDeferred = ( new DeferredPromise());
+        this._isInitializedDeferred = ( (new DeferredPromise()));
     }
     initialize(welcomeMessage) {
         if (this.initState !== ChatModelInitState.Initializing) {
-            throw ( new Error(
+            throw ( (new Error(
                 `ChatModel is in the wrong state for initialize: ${ChatModelInitState[this.initState]}`
-            ));
+            )));
         }
         this._initState = ChatModelInitState.Initialized;
         if (!this._welcomeMessage) {
@@ -444,9 +498,9 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
     }
     setInitializationError(error) {
         if (this.initState !== ChatModelInitState.Initializing) {
-            throw ( new Error(
+            throw ( (new Error(
                 `ChatModel is in the wrong state for setInitializationError: ${ChatModelInitState[this.initState]}`
-            ));
+            )));
         }
         if (!this._isInitializedDeferred.isSettled) {
             this._isInitializedDeferred.error(error);
@@ -459,20 +513,42 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
         return this._requests;
     }
     addRequest(message, variableData, attempt, chatAgent, slashCommand) {
-        const request = ( new ChatRequestModel(this, message, variableData, attempt));
-        request.response = ( new ChatResponseModel([], this, chatAgent, slashCommand, request.id));
+        const request = ( (new ChatRequestModel(this, message, variableData, attempt)));
+        request.response = ( (new ChatResponseModel([], this, chatAgent, slashCommand, request.id)));
         this._requests.push(request);
         this._onDidChange.fire({ kind: 'addRequest', request });
         return request;
     }
+    adoptRequest(request) {
+        const oldOwner = request.session;
+        const index = oldOwner._requests.findIndex(candidate => candidate.id === request.id);
+        if (index === -1) {
+            return;
+        }
+        oldOwner._requests.splice(index, 1);
+        request.adoptTo(this);
+        request.response?.adoptTo(this);
+        this._requests.push(request);
+        oldOwner._onDidChange.fire({ kind: 'removeRequest', requestId: request.id, responseId: request.response?.id, reason: ChatRequestRemovalReason.Adoption });
+        this._onDidChange.fire({ kind: 'addRequest', request });
+    }
     acceptResponseProgress(request, progress, quiet) {
         if (!request.response) {
-            request.response = ( new ChatResponseModel([], this, undefined, undefined, request.id));
+            request.response = ( (new ChatResponseModel([], this, undefined, undefined, request.id)));
         }
         if (request.response.isComplete) {
-            throw ( new Error('acceptResponseProgress: Adding progress to a completed response'));
-        }
-        if (progress.kind === 'markdownContent' || progress.kind === 'treeData' || progress.kind === 'inlineReference' || progress.kind === 'markdownVuln' || progress.kind === 'progressMessage' || progress.kind === 'command' || progress.kind === 'textEdit') {
+            throw ( (new Error('acceptResponseProgress: Adding progress to a completed response')));
+        }
+        if (progress.kind === 'markdownContent' ||
+            progress.kind === 'treeData' ||
+            progress.kind === 'inlineReference' ||
+            progress.kind === 'markdownVuln' ||
+            progress.kind === 'progressMessage' ||
+            progress.kind === 'command' ||
+            progress.kind === 'textEdit' ||
+            progress.kind === 'warning' ||
+            progress.kind === 'progressTask' ||
+            progress.kind === 'confirmation') {
             request.response.updateContent(progress, quiet);
         }
         else if (progress.kind === 'usedContext' || progress.kind === 'reference') {
@@ -488,11 +564,11 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
             this.logService.error(`Couldn't handle progress: ${JSON.stringify(progress)}`);
         }
     }
-    removeRequest(id) {
+    removeRequest(id, reason = ChatRequestRemovalReason.Removal) {
         const index = this._requests.findIndex(request => request.id === id);
         const request = this._requests[index];
         if (index !== -1) {
-            this._onDidChange.fire({ kind: 'removeRequest', requestId: request.id, responseId: request.response?.id });
+            this._onDidChange.fire({ kind: 'removeRequest', requestId: request.id, responseId: request.response?.id, reason });
             this._requests.splice(index, 1);
             request.response?.dispose();
         }
@@ -504,13 +580,13 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
     }
     setResponse(request, result) {
         if (!request.response) {
-            request.response = ( new ChatResponseModel([], this, undefined, undefined, request.id));
+            request.response = ( (new ChatResponseModel([], this, undefined, undefined, request.id)));
         }
         request.response.setResult(result);
     }
     completeResponse(request) {
         if (!request.response) {
-            throw ( new Error('Call setResponse before completeResponse'));
+            throw ( (new Error('Call setResponse before completeResponse')));
         }
         request.response.complete();
     }
@@ -539,16 +615,16 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
                     return c.value;
                 }
             }),
-            requests: ( this._requests.map((r) => {
+            requests: ( (this._requests.map((r) => {
                 const message = {
                     ...r.message,
-                    parts: ( r.message.parts.map(p => p && 'toJSON' in p ? p.toJSON() : p))
+                    parts: ( (r.message.parts.map(p => p && 'toJSON' in p ? p.toJSON() : p)))
                 };
                 return {
                     message,
                     variableData: r.variableData,
                     response: r.response ?
-                        ( r.response.response.value.map(item => {
+                        ( (r.response.response.value.map(item => {
                             if (item.kind === 'treeData') {
                                 return item.treeData;
                             }
@@ -558,7 +634,7 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
                             else {
                                 return item;
                             }
-                        }))
+                        })))
                         : undefined,
                     result: r.response?.result,
                     followups: r.response?.followups,
@@ -569,7 +645,7 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
                     usedContext: r.response?.usedContext,
                     contentReferences: r.response?.contentReferences
                 };
-            })),
+            }))),
         };
     }
     toJSON() {
@@ -586,11 +662,11 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
         super.dispose();
     }
 };
-ChatModel = ChatModel_1 = ( __decorate([
-    ( __param(2, ILogService)),
-    ( __param(3, IChatAgentService)),
-    ( __param(4, IInstantiationService))
-], ChatModel));
+ChatModel = ChatModel_1 = ( (__decorate([
+    ( (__param(2, ILogService))),
+    ( (__param(3, IChatAgentService))),
+    ( (__param(4, IInstantiationService)))
+], ChatModel)));
 let ChatWelcomeMessageModel = class ChatWelcomeMessageModel {
     static { ChatWelcomeMessageModel_1 = this; }
     static { this.nextId = 0; }
@@ -604,15 +680,15 @@ let ChatWelcomeMessageModel = class ChatWelcomeMessageModel {
         this._id = 'welcome_' + ChatWelcomeMessageModel_1.nextId++;
     }
     get username() {
-        return this.chatAgentService.getDefaultAgent(ChatAgentLocation.Panel)?.metadata.fullName ?? '';
+        return this.chatAgentService.getContributedDefaultAgent(ChatAgentLocation.Panel)?.fullName ?? '';
     }
     get avatarIcon() {
         return this.chatAgentService.getDefaultAgent(ChatAgentLocation.Panel)?.metadata.themeIcon;
     }
 };
-ChatWelcomeMessageModel = ChatWelcomeMessageModel_1 = ( __decorate([
-    ( __param(2, IChatAgentService))
-], ChatWelcomeMessageModel));
+ChatWelcomeMessageModel = ChatWelcomeMessageModel_1 = ( (__decorate([
+    ( (__param(2, IChatAgentService)))
+], ChatWelcomeMessageModel)));
 function getHistoryEntriesFromModel(model, forAgentId) {
     const history = [];
     for (const request of model.getRequests()) {
@@ -638,13 +714,13 @@ function getHistoryEntriesFromModel(model, forAgentId) {
 }
 function updateRanges(variableData, diff) {
     return {
-        variables: ( variableData.variables.map(v => ({
+        variables: ( (variableData.variables.map(v => ({
             ...v,
             range: v.range && {
                 start: v.range.start - diff,
                 endExclusive: v.range.endExclusive - diff
             }
-        })))
+        }))))
     };
 }
 function canMergeMarkdownStrings(md1, md2) {
@@ -665,4 +741,14 @@ function canMergeMarkdownStrings(md1, md2) {
         md1.supportHtml === md2.supportHtml &&
         md1.supportThemeIcons === md2.supportThemeIcons;
 }
-export { ChatModel, ChatModelInitState, ChatRequestModel, ChatResponseModel, ChatWelcomeMessageModel, Response, canMergeMarkdownStrings, getHistoryEntriesFromModel, isExportableSessionData, isSerializableSessionData, updateRanges };
+function appendMarkdownString(md1, md2) {
+    const appendedValue = typeof md2 === 'string' ? md2 : md2.value;
+    return {
+        value: md1.value + appendedValue,
+        isTrusted: md1.isTrusted,
+        supportThemeIcons: md1.supportThemeIcons,
+        supportHtml: md1.supportHtml,
+        baseUri: md1.baseUri
+    };
+}
+export { ChatModel, ChatModelInitState, ChatRequestModel, ChatRequestRemovalReason, ChatResponseModel, ChatWelcomeMessageModel, Response, appendMarkdownString, canMergeMarkdownStrings, getHistoryEntriesFromModel, isExportableSessionData, isSerializableSessionData, updateRanges };

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

@@ -1,5 +1,6 @@
 import { revive } from '../../../../base/common/marshalling.js';
 import { OffsetRange } from '../../../../editor/common/core/offsetRange.js';
+import { reviveSerializedAgent } from './chatAgents.js';
 function getPromptText(request) {
     const message = ( request.parts.map(r => r.promptText)).join('').trimStart();
     const diff = request.text.length - message.length;
@@ -22,11 +23,12 @@ const chatAgentLeader = '@';
 const chatSubcommandLeader = '/';
 class ChatRequestVariablePart {
     static { this.Kind = 'var'; }
-    constructor(range, editorRange, variableName, variableArg) {
+    constructor(range, editorRange, variableName, variableArg, variableId) {
         this.range = range;
         this.editorRange = editorRange;
         this.variableName = variableName;
         this.variableArg = variableArg;
+        this.variableId = variableId;
         this.kind = ChatRequestVariablePart.Kind;
     }
     get text() {
@@ -84,10 +86,12 @@ class ChatRequestSlashCommandPart {
 }
 class ChatRequestDynamicVariablePart {
     static { this.Kind = 'dynamic'; }
-    constructor(range, editorRange, text, data) {
+    constructor(range, editorRange, text, id, modelDescription, data) {
         this.range = range;
         this.editorRange = editorRange;
         this.text = text;
+        this.id = id;
+        this.modelDescription = modelDescription;
         this.data = data;
         this.kind = ChatRequestDynamicVariablePart.Kind;
     }
@@ -106,16 +110,11 @@ function reviveParsedChatRequest(serialized) {
                 return ( new ChatRequestTextPart(( new OffsetRange(part.range.start, part.range.endExclusive)), part.editorRange, part.text));
             }
             else if (part.kind === ChatRequestVariablePart.Kind) {
-                return ( new ChatRequestVariablePart(( new OffsetRange(part.range.start, part.range.endExclusive)), part.editorRange, part.variableName, part.variableArg));
+                return ( new ChatRequestVariablePart(( new OffsetRange(part.range.start, part.range.endExclusive)), part.editorRange, part.variableName, part.variableArg, part.variableName || ''));
             }
             else if (part.kind === ChatRequestAgentPart.Kind) {
                 let agent = part.agent;
-                if (!('name' in agent)) {
-                    agent = {
-                        ...agent,
-                        name: agent.id
-                    };
-                }
+                agent = reviveSerializedAgent(agent);
                 return ( new ChatRequestAgentPart(( new OffsetRange(part.range.start, part.range.endExclusive)), part.editorRange, agent));
             }
             else if (part.kind === ChatRequestAgentSubcommandPart.Kind) {
@@ -125,7 +124,7 @@ function reviveParsedChatRequest(serialized) {
                 return ( new ChatRequestSlashCommandPart(( new OffsetRange(part.range.start, part.range.endExclusive)), part.editorRange, part.slashCommand));
             }
             else if (part.kind === ChatRequestDynamicVariablePart.Kind) {
-                return ( new ChatRequestDynamicVariablePart(( new OffsetRange(part.range.start, part.range.endExclusive)), part.editorRange, part.text, revive(part.data)));
+                return ( new ChatRequestDynamicVariablePart(( new OffsetRange(part.range.start, part.range.endExclusive)), part.editorRange, part.text, part.id, part.modelDescription, revive(part.data)));
             }
             else {
                 throw ( new Error(`Unknown chat request part: ${part.kind}`));