@codingame/monaco-vscode-api 25.1.2 → 26.0.0

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

@@ -12,23 +12,24 @@ import { Schemas } from '../../../../../base/common/network.js';
 import { equals } from '../../../../../base/common/objects.js';
 import '../../../../../base/common/observableInternal/index.js';
 import { basename, isEqual } from '../../../../../base/common/resources.js';
-import { URI, isUriComponents } from '../../../../../base/common/uri.js';
+import { hasKey } from '../../../../../base/common/types.js';
+import { URI } from '../../../../../base/common/uri.js';
 import { generateUuid } from '../../../../../base/common/uuid.js';
 import { OffsetRange } from '../../../../../editor/common/core/ranges/offsetRange.js';
-import { TextEdit } from '../../../../../editor/common/languages.js';
 import { localize } from '../../../../../nls.js';
 import { ILogService } from '../../../../../platform/log/common/log.service.js';
 import { CellUri } from '../../../notebook/common/notebookCommon.js';
+import { IChatRequestVariableEntry, isStringVariableEntry, isImplicitVariableEntry, isStringImplicitContextValue } from '../attachments/chatVariableEntries.js';
 import { migrateLegacyTerminalToolSpecificData } from '../chat.js';
+import { IChatToolInvocation, ChatResponseClearToPreviousToolInvocationReason, ResponseModelState, ElicitationState, isIUsedContext } from '../chatService/chatService.js';
+import { IChatService } from '../chatService/chatService.service.js';
+import { ChatAgentLocation, ChatModeKind } from '../constants.js';
+import { ModifiedFileEntryState } from '../editing/chatEditingService.js';
+import { IChatEditingService } from '../editing/chatEditingService.service.js';
 import { reviveSerializedAgent } from '../participants/chatAgents.js';
 import { IChatAgentService } from '../participants/chatAgents.service.js';
-import { editEntriesToMultiDiffData, ModifiedFileEntryState } from '../editing/chatEditingService.js';
-import { IChatEditingService } from '../editing/chatEditingService.service.js';
 import { reviveParsedChatRequest, ChatRequestTextPart } from '../requestParser/chatParserTypes.js';
-import { IChatToolInvocation, ChatResponseClearToPreviousToolInvocationReason, ResponseModelState, ElicitationState, isIUsedContext } from '../chatService/chatService.js';
-import { IChatService } from '../chatService/chatService.service.js';
 import { LocalChatSessionUri } from './chatUri.js';
-import { ChatAgentLocation, ChatModeKind } from '../constants.js';
 import { observableFromEvent } from '../../../../../base/common/observableInternal/observables/observableFromEvent.js';
 import { autorunSelfDisposable, autorun } from '../../../../../base/common/observableInternal/reactions/autorun.js';
 import { observableValueOpts } from '../../../../../base/common/observableInternal/observables/observableValueOpts.js';
@@ -38,15 +39,24 @@ import { derived } from '../../../../../base/common/observableInternal/observabl
 
 var ChatModel_1;
 const CHAT_ATTACHABLE_IMAGE_MIME_TYPES = {
-    png: 'image/png',
-    jpg: 'image/jpeg',
-    jpeg: 'image/jpeg',
-    gif: 'image/gif',
-    webp: 'image/webp',
+    png: "image/png",
+    jpg: "image/jpeg",
+    jpeg: "image/jpeg",
+    gif: "image/gif",
+    webp: "image/webp"
 };
 function getAttachableImageExtension(mimeType) {
     return Object.entries(CHAT_ATTACHABLE_IMAGE_MIME_TYPES).find(([_, value]) => value === mimeType)?.[0];
 }
+var IChatRequestVariableData;
+(function(IChatRequestVariableData) {
+    function toExport(data) {
+        return {
+            variables: ( data.variables.map(IChatRequestVariableEntry.toExport))
+        };
+    }
+    IChatRequestVariableData.toExport = toExport;
+})(IChatRequestVariableData || (IChatRequestVariableData = {}));
 function isCellTextEditOperation(value) {
     const candidate = value;
     return !!candidate && !!candidate.edit && !!candidate.uri && URI.isUri(candidate.uri);
@@ -54,17 +64,23 @@ function isCellTextEditOperation(value) {
 function isCellTextEditOperationArray(value) {
     return ( value.some(isCellTextEditOperation));
 }
-const nonHistoryKinds = ( new Set(
-    ['toolInvocation', 'toolInvocationSerialized', 'undoStop', 'prepareToolInvocation']
-));
+const nonHistoryKinds = ( new Set(["toolInvocation", "toolInvocationSerialized", "undoStop"]));
 function isChatProgressHistoryResponseContent(content) {
     return !( nonHistoryKinds.has(content.kind));
 }
 function toChatHistoryContent(content) {
     return content.filter(isChatProgressHistoryResponseContent);
 }
-const defaultChatResponseModelChangeReason = { reason: 'other' };
+const defaultChatResponseModelChangeReason = {
+    reason: "other"
+};
 class ChatRequestModel {
+    get shouldBeBlocked() {
+        return this._shouldBeBlocked;
+    }
+    setShouldBeBlocked(value) {
+        this._shouldBeBlocked.set(value, undefined);
+    }
     get session() {
         return this._session;
     }
@@ -75,6 +91,7 @@ class ChatRequestModel {
         return this._variableData;
     }
     set variableData(v) {
+        this._version++;
         this._variableData = v;
     }
     get confirmation() {
@@ -89,8 +106,12 @@ class ChatRequestModel {
     get editedFileEvents() {
         return this._editedFileEvents;
     }
+    get version() {
+        return this._version;
+    }
     constructor(params) {
-        this.shouldBeBlocked = false;
+        this._shouldBeBlocked = observableValue(this, false);
+        this._version = 0;
         this._session = params.session;
         this.message = params.message;
         this._variableData = params.variableData;
@@ -102,7 +123,7 @@ class ChatRequestModel {
         this._attachedContext = params.attachedContext;
         this.isCompleteAddedRequest = params.isCompleteAddedRequest ?? false;
         this.modelId = params.modelId;
-        this.id = params.restoredId ?? 'request_' + generateUuid();
+        this.id = params.restoredId ?? "request_" + generateUuid();
         this._editedFileEvents = params.editedFileEvents;
         this.userSelectedTools = params.userSelectedTools;
     }
@@ -115,8 +136,8 @@ class AbstractResponse {
         return this._responseParts;
     }
     constructor(value) {
-        this._responseRepr = '';
-        this._markdownContent = '';
+        this._responseRepr = "";
+        this._markdownContent = "";
         this._responseParts = value;
         this._updateRepr();
     }
@@ -129,18 +150,14 @@ class AbstractResponse {
     _updateRepr() {
         this._responseRepr = this.partsToRepr(this._responseParts);
         this._markdownContent = ( this._responseParts.map(part => {
-            if (part.kind === 'inlineReference') {
+            if (part.kind === "inlineReference") {
                 return this.inlineRefToRepr(part);
-            }
-            else if (part.kind === 'markdownContent' || part.kind === 'markdownVuln') {
+            } else if (part.kind === "markdownContent" || part.kind === "markdownVuln") {
                 return part.content.value;
+            } else {
+                return "";
             }
-            else {
-                return '';
-            }
-        }))
-            .filter(s => s.length > 0)
-            .join('');
+        })).filter(s => s.length > 0).join("");
     }
     partsToRepr(parts) {
         const blocks = [];
@@ -149,98 +166,104 @@ class AbstractResponse {
         for (const part of parts) {
             let segment;
             switch (part.kind) {
-                case 'clearToPreviousToolInvocation':
-                    currentBlockSegments = [];
-                    blocks.length = 0;
-                    hasEditGroupsAfterLastClear = false;
-                    continue;
-                case 'treeData':
-                case 'progressMessage':
-                case 'codeblockUri':
-                case 'extensions':
-                case 'pullRequest':
-                case 'undoStop':
-                case 'prepareToolInvocation':
-                case 'elicitation2':
-                case 'elicitationSerialized':
-                case 'thinking':
-                case 'multiDiffData':
-                case 'mcpServersStarting':
-                    continue;
-                case 'toolInvocation':
-                case 'toolInvocationSerialized':
-                    segment = this.getToolInvocationText(part);
-                    break;
-                case 'inlineReference':
-                    segment = { text: this.inlineRefToRepr(part) };
-                    break;
-                case 'command':
-                    segment = { text: part.command.title, isBlock: true };
-                    break;
-                case 'textEditGroup':
-                case 'notebookEditGroup':
-                    hasEditGroupsAfterLastClear = true;
-                    continue;
-                case 'confirmation':
-                    if (part.message instanceof MarkdownString) {
-                        segment = { text: `${part.title}\n${part.message.value}`, isBlock: true };
-                        break;
-                    }
-                    segment = { text: `${part.title}\n${part.message}`, isBlock: true };
-                    break;
-                case 'markdownContent':
-                case 'markdownVuln':
-                case 'progressTask':
-                case 'progressTaskSerialized':
-                case 'warning':
-                    segment = { text: part.content.value };
+            case "clearToPreviousToolInvocation":
+                currentBlockSegments = [];
+                blocks.length = 0;
+                hasEditGroupsAfterLastClear = false;
+                continue;
+            case "treeData":
+            case "progressMessage":
+            case "codeblockUri":
+            case "extensions":
+            case "pullRequest":
+            case "undoStop":
+            case "workspaceEdit":
+            case "elicitation2":
+            case "elicitationSerialized":
+            case "thinking":
+            case "multiDiffData":
+            case "mcpServersStarting":
+            case "questionCarousel":
+                continue;
+            case "toolInvocation":
+            case "toolInvocationSerialized":
+                segment = this.getToolInvocationText(part);
+                break;
+            case "inlineReference":
+                segment = {
+                    text: this.inlineRefToRepr(part)
+                };
+                break;
+            case "command":
+                segment = {
+                    text: part.command.title,
+                    isBlock: true
+                };
+                break;
+            case "textEditGroup":
+            case "notebookEditGroup":
+                hasEditGroupsAfterLastClear = true;
+                continue;
+            case "confirmation":
+                if (part.message instanceof MarkdownString) {
+                    segment = {
+                        text: `${part.title}\n${part.message.value}`,
+                        isBlock: true
+                    };
                     break;
-                default:
-                    continue;
+                }
+                segment = {
+                    text: `${part.title}\n${part.message}`,
+                    isBlock: true
+                };
+                break;
+            case "markdownContent":
+            case "markdownVuln":
+            case "progressTask":
+            case "progressTaskSerialized":
+            case "warning":
+                segment = {
+                    text: part.content.value
+                };
+                break;
+            default:
+                continue;
             }
             if (segment.isBlock) {
                 if (currentBlockSegments.length) {
-                    blocks.push(currentBlockSegments.join(''));
+                    blocks.push(currentBlockSegments.join(""));
                     currentBlockSegments = [];
                 }
                 blocks.push(segment.text);
-            }
-            else {
+            } else {
                 currentBlockSegments.push(segment.text);
             }
         }
         if (currentBlockSegments.length) {
-            blocks.push(currentBlockSegments.join(''));
+            blocks.push(currentBlockSegments.join(""));
         }
         if (hasEditGroupsAfterLastClear) {
-            blocks.push(( localize(5960, "Made changes.")));
+            blocks.push(( localize(6246, "Made changes.")));
         }
-        return blocks.join('\n\n');
+        return blocks.join("\n\n");
     }
     inlineRefToRepr(part) {
-        if ('uri' in part.inlineReference) {
+        if ("uri" in part.inlineReference) {
             return this.uriToRepr(part.inlineReference.uri);
         }
-        return 'name' in part.inlineReference
-            ? '`' + part.inlineReference.name + '`'
-            : this.uriToRepr(part.inlineReference);
+        return "name" in part.inlineReference ? "`" + part.inlineReference.name + "`" : this.uriToRepr(part.inlineReference);
     }
     getToolInvocationText(toolInvocation) {
-        let message = '';
-        let input = '';
+        let message = "";
+        let input = "";
         if (toolInvocation.pastTenseMessage) {
-            message = typeof toolInvocation.pastTenseMessage === 'string'
-                ? toolInvocation.pastTenseMessage
-                : toolInvocation.pastTenseMessage.value;
-        }
-        else {
-            message = typeof toolInvocation.invocationMessage === 'string'
-                ? toolInvocation.invocationMessage
-                : toolInvocation.invocationMessage.value;
+            message = typeof toolInvocation.pastTenseMessage === "string" ? toolInvocation.pastTenseMessage : toolInvocation.pastTenseMessage.value;
+        } else {
+            message = typeof toolInvocation.invocationMessage === "string" ? toolInvocation.invocationMessage : toolInvocation.invocationMessage.value;
         }
         if (toolInvocation.toolSpecificData) {
-            if (toolInvocation.toolSpecificData.kind === 'terminal') {
-                message = 'Ran terminal command';
+            if (toolInvocation.toolSpecificData.kind === "terminal") {
+                message = "Ran terminal command";
                 const terminalData = migrateLegacyTerminalToolSpecificData(toolInvocation.toolSpecificData);
                 input = terminalData.commandLine.userEdited ?? terminalData.commandLine.toolEdited ?? terminalData.commandLine.original;
             }
@@ -249,14 +272,17 @@ class AbstractResponse {
         if (input) {
             text += `: ${input}`;
         }
-        if (toolInvocation.kind === 'toolInvocationSerialized' || (toolInvocation.kind === 'toolInvocation' && IChatToolInvocation.isComplete(toolInvocation))) {
+        if (toolInvocation.kind === "toolInvocationSerialized" || (toolInvocation.kind === "toolInvocation" && IChatToolInvocation.isComplete(toolInvocation))) {
             const resultDetails = IChatToolInvocation.resultDetails(toolInvocation);
-            if (resultDetails && 'input' in resultDetails) {
-                const resultPrefix = toolInvocation.kind === 'toolInvocationSerialized' || IChatToolInvocation.isComplete(toolInvocation) ? 'Completed' : 'Errored';
+            if (resultDetails && "input" in resultDetails) {
+                const resultPrefix = toolInvocation.kind === "toolInvocationSerialized" || IChatToolInvocation.isComplete(toolInvocation) ? "Completed" : "Errored";
                 text += `\n${resultPrefix} with input: ${resultDetails.input}`;
             }
         }
-        return { text, isBlock: true };
+        return {
+            text,
+            isBlock: true
+        };
     }
     uriToRepr(uri) {
         if (uri.scheme === Schemas.http || uri.scheme === Schemas.https) {
@@ -267,8 +293,8 @@ class AbstractResponse {
 }
 class ResponseView extends AbstractResponse {
     constructor(_response, undoStop) {
-        let idx = _response.value.findIndex(v => v.kind === 'undoStop' && v.id === undoStop);
-        if (_response.value[idx + 1]?.kind === 'codeblockUri' && _response.value[idx - 1]?.kind === 'markdownContent') {
+        let idx = _response.value.findIndex(v => v.kind === "undoStop" && v.id === undoStop);
+        if (_response.value[idx + 1]?.kind === "codeblockUri" && _response.value[idx - 1]?.kind === "markdownContent") {
             idx--;
         }
         super(idx === -1 ? _response.value.slice() : _response.value.slice(0, idx));
@@ -280,9 +306,13 @@ class Response extends AbstractResponse {
         return this._onDidChangeValue.event;
     }
     constructor(value) {
-        super(( asArray(value).map((v) => ('kind' in v ? v :
-            isMarkdownString(v) ? { content: v, kind: 'markdownContent' } :
-                { kind: 'treeData', treeData: v }))));
+        super(( asArray(value).map(v => ("kind" in v ? v : isMarkdownString(v) ? {
+            content: v,
+            kind: "markdownContent"
+        } : {
+            kind: "treeData",
+            treeData: v
+        }))));
         this._onDidChangeValue = ( new Emitter());
         this._citations = [];
     }
@@ -297,71 +327,60 @@ class Response extends AbstractResponse {
         let lastToolInvocationIndex = -1;
         for (let i = this._responseParts.length - 1; i >= 0; i--) {
             const part = this._responseParts[i];
-            if (part.kind === 'toolInvocation' || part.kind === 'toolInvocationSerialized') {
+            if (part.kind === "toolInvocation" || part.kind === "toolInvocationSerialized") {
                 lastToolInvocationIndex = i;
                 break;
             }
         }
         if (lastToolInvocationIndex !== -1) {
             this._responseParts = this._responseParts.slice(0, lastToolInvocationIndex + 1);
-        }
-        else {
+        } else {
             this._responseParts = [];
         }
         if (message) {
-            this._responseParts.push({ kind: 'warning', content: ( new MarkdownString(message)) });
+            this._responseParts.push({
+                kind: "warning",
+                content: ( new MarkdownString(message))
+            });
         }
         this._updateRepr(true);
     }
     updateContent(progress, quiet) {
-        if (progress.kind === 'clearToPreviousToolInvocation') {
+        if (progress.kind === "clearToPreviousToolInvocation") {
             if (progress.reason === ChatResponseClearToPreviousToolInvocationReason.CopyrightContentRetry) {
                 this.clearToPreviousToolInvocation(( localize(
-                    5961,
+                    6247,
                     "Response cleared due to possible match to public code, retrying with modified prompt."
                 )));
-            }
-            else if (progress.reason === ChatResponseClearToPreviousToolInvocationReason.FilteredContentRetry) {
+            } else if (progress.reason === ChatResponseClearToPreviousToolInvocationReason.FilteredContentRetry) {
                 this.clearToPreviousToolInvocation(( localize(
-                    5962,
+                    6248,
                     "Response cleared due to content safety filters, retrying with modified prompt."
                 )));
-            }
-            else {
+            } else {
                 this.clearToPreviousToolInvocation();
             }
             return;
-        }
-        else if (progress.kind === 'markdownContent') {
-            const lastResponsePart = this._responseParts
-                .filter(p => p.kind !== 'textEditGroup')
-                .at(-1);
-            if (!lastResponsePart || lastResponsePart.kind !== 'markdownContent' || !canMergeMarkdownStrings(lastResponsePart.content, progress.content)) {
+        } else if (progress.kind === "markdownContent") {
+            const lastResponsePart = this._responseParts.filter(p => p.kind !== "textEditGroup").at(-1);
+            if (!lastResponsePart || lastResponsePart.kind !== "markdownContent" || !canMergeMarkdownStrings(lastResponsePart.content, progress.content)) {
                 this._responseParts.push(progress);
-            }
-            else {
+            } else {
                 const idx = this._responseParts.indexOf(lastResponsePart);
-                this._responseParts[idx] = { ...lastResponsePart, content: appendMarkdownString(lastResponsePart.content, progress.content) };
+                this._responseParts[idx] = {
+                    ...lastResponsePart,
+                    content: appendMarkdownString(lastResponsePart.content, progress.content)
+                };
             }
             this._updateRepr(quiet);
-        }
-        else if (progress.kind === 'thinking') {
-            const lastResponsePart = this._responseParts
-                .filter(p => p.kind !== 'textEditGroup')
-                .at(-1);
-            const lastText = lastResponsePart && lastResponsePart.kind === 'thinking'
-                ? (Array.isArray(lastResponsePart.value) ? lastResponsePart.value.join('') : (lastResponsePart.value || ''))
-                : '';
-            const currText = Array.isArray(progress.value) ? progress.value.join('') : (progress.value || '');
-            const isEmpty = (s) => s.length === 0;
-            if (!lastResponsePart
-                || lastResponsePart.kind !== 'thinking'
-                || isEmpty(currText)
-                || isEmpty(lastText)
-                || !canMergeMarkdownStrings(( new MarkdownString(lastText)), ( new MarkdownString(currText)))) {
+        } else if (progress.kind === "thinking") {
+            const lastResponsePart = this._responseParts.filter(p => p.kind !== "textEditGroup").at(-1);
+            const lastText = lastResponsePart && lastResponsePart.kind === "thinking" ? (Array.isArray(lastResponsePart.value) ? lastResponsePart.value.join("") : (lastResponsePart.value || "")) : "";
+            const currText = Array.isArray(progress.value) ? progress.value.join("") : (progress.value || "");
+            const isEmpty = s => s.length === 0;
+            if (!lastResponsePart || lastResponsePart.kind !== "thinking" || isEmpty(currText) || isEmpty(lastText) || !canMergeMarkdownStrings(( new MarkdownString(lastText)), ( new MarkdownString(currText)))) {
                 this._responseParts.push(progress);
-            }
-            else {
+            } else {
                 const idx = this._responseParts.indexOf(lastResponsePart);
                 this._responseParts[idx] = {
                     ...lastResponsePart,
@@ -369,53 +388,36 @@ class Response extends AbstractResponse {
                 };
             }
             this._updateRepr(quiet);
-        }
-        else if (progress.kind === 'textEdit' || progress.kind === 'notebookEdit') {
+        } else if (progress.kind === "textEdit" || progress.kind === "notebookEdit") {
             const notebookUri = CellUri.parse(progress.uri)?.notebook;
             const uri = notebookUri ?? progress.uri;
-            let found = false;
-            const groupKind = progress.kind === 'textEdit' && !notebookUri ? 'textEditGroup' : 'notebookEditGroup';
-            const edits =
-             groupKind === 'textEditGroup' ?
-                progress.edits :
-                ( progress.edits.map(edit => TextEdit.isTextEdit(edit) ?
-                    { uri: progress.uri, edit }
-                    : edit));
             const isExternalEdit = progress.isExternalEdit;
-            for (let i = 0; !found && i < this._responseParts.length; i++) {
-                const candidate = this._responseParts[i];
-                if (candidate.kind === groupKind && !candidate.done && isEqual(candidate.uri, uri)) {
-                    candidate.edits.push(edits);
-                    candidate.done = progress.done;
-                    found = true;
-                }
-            }
-            if (!found) {
-                this._responseParts.push({
-                    kind: groupKind,
-                    uri,
-                    edits: [edits],
-                    done: progress.done,
-                    isExternalEdit,
-                });
+            if (progress.kind === "textEdit" && !notebookUri) {
+                this._mergeOrPushTextEditGroup(uri, progress.edits, progress.done, isExternalEdit);
+            } else if (progress.kind === "textEdit") {
+                const cellEdits = ( progress.edits.map(edit => ({
+                    uri: progress.uri,
+                    edit
+                })));
+                this._mergeOrPushNotebookEditGroup(uri, cellEdits, progress.done, isExternalEdit);
+            } else {
+                this._mergeOrPushNotebookEditGroup(uri, progress.edits, progress.done, isExternalEdit);
             }
             this._updateRepr(quiet);
-        }
-        else if (progress.kind === 'progressTask') {
+        } 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) => {
+            progress.task?.().then(content => {
                 disp.dispose();
-                if (typeof content === 'string') {
+                if (typeof content === "string") {
                     this._responseParts[responsePosition].content = ( new MarkdownString(content));
                 }
                 this._updateRepr(false);
             });
-        }
-        else if (progress.kind === 'toolInvocation') {
+        } else if (progress.kind === "toolInvocation") {
             autorunSelfDisposable(reader => {
                 progress.state.read(reader);
                 this._updateRepr(false);
@@ -425,8 +427,7 @@ class Response extends AbstractResponse {
             });
             this._responseParts.push(progress);
             this._updateRepr(quiet);
-        }
-        else {
+        } else {
             this._responseParts.push(progress);
             this._updateRepr(quiet);
         }
@@ -435,12 +436,44 @@ class Response extends AbstractResponse {
         this._citations.push(citation);
         this._updateRepr();
     }
+    _mergeOrPushTextEditGroup(uri, edits, done, isExternalEdit) {
+        for (const candidate of this._responseParts) {
+            if (candidate.kind === "textEditGroup" && !candidate.done && isEqual(candidate.uri, uri)) {
+                candidate.edits.push(edits);
+                candidate.done = done;
+                return;
+            }
+        }
+        this._responseParts.push({
+            kind: "textEditGroup",
+            uri,
+            edits: [edits],
+            done,
+            isExternalEdit
+        });
+    }
+    _mergeOrPushNotebookEditGroup(uri, edits, done, isExternalEdit) {
+        for (const candidate of this._responseParts) {
+            if (candidate.kind === "notebookEditGroup" && !candidate.done && isEqual(candidate.uri, uri)) {
+                candidate.edits.push(edits);
+                candidate.done = done;
+                return;
+            }
+        }
+        this._responseParts.push({
+            kind: "notebookEditGroup",
+            uri,
+            edits: [edits],
+            done,
+            isExternalEdit
+        });
+    }
     _updateRepr(quiet) {
         super._updateRepr();
         if (!this._onDidChangeValue) {
             return;
         }
-        this._responseRepr += this._citations.length ? '\n\n' + getCodeCitationsMessage(this._citations) : '';
+        this._responseRepr += this._citations.length ? "\n\n" + getCodeCitationsMessage(this._citations) : "";
         if (!quiet) {
             this._onDidChangeValue.fire();
         }
@@ -466,6 +499,9 @@ class ChatResponseModel extends Disposable {
         return this._timestamp;
     }
     set shouldBeRemovedOnSend(disablement) {
+        if (this._shouldBeRemovedOnSend === disablement) {
+            return;
+        }
         this._shouldBeRemovedOnSend = disablement;
         this._onDidChange.fire(defaultChatResponseModelChangeReason);
     }
@@ -481,11 +517,14 @@ class ChatResponseModel extends Disposable {
     }
     get state() {
         const state = this._modelState.get().value;
-        if (state === ResponseModelState.Complete && !!this._result?.errorDetails && this.result?.errorDetails?.code !== 'canceled') {
+        if (state === ResponseModelState.Complete && !!this._result?.errorDetails && this.result?.errorDetails?.code !== "canceled") {
             return ResponseModelState.Failed;
         }
         return state;
     }
+    get stateT() {
+        return this._modelState.get();
+    }
     get vote() {
         return this._vote;
     }
@@ -504,9 +543,6 @@ class ChatResponseModel extends Disposable {
     get username() {
         return this.session.responderUsername;
     }
-    get avatarIcon() {
-        return this.session.responderAvatarIcon;
-    }
     get agent() {
         return this._agent;
     }
@@ -548,8 +584,10 @@ class ChatResponseModel extends Disposable {
         super();
         this._onDidChange = this._register(( new Emitter()));
         this.onDidChange = this._onDidChange.event;
-        this._modelState = observableValue(this, { value: ResponseModelState.Pending });
-        this._shouldBeBlocked = false;
+        this._modelState = observableValue(this, {
+            value: ResponseModelState.Pending
+        });
+        this._shouldBeBlocked = observableValue(this, false);
         this._contentReferences = [];
         this._codeCitations = [];
         this._progressMessages = [];
@@ -569,7 +607,7 @@ class ChatResponseModel extends Disposable {
         this._followups = params.followups ? [...params.followups] : undefined;
         this.isCompleteAddedRequest = params.isCompleteAddedRequest ?? false;
         this._shouldBeRemovedOnSend = params.shouldBeRemovedOnSend;
-        this._shouldBeBlocked = params.shouldBeBlocked ?? false;
+        this._shouldBeBlocked.set(params.shouldBeBlocked ?? false, undefined);
         this._isStale = Array.isArray(params.responseContent) && (params.responseContent.length !== 0 || isMarkdownString(params.responseContent) && params.responseContent.value.length !== 0);
         this._response = this._register(( new Response(params.responseContent)));
         this._codeBlockInfos = params.codeBlockInfos ? [...params.codeBlockInfos] : undefined;
@@ -577,14 +615,20 @@ class ChatResponseModel extends Disposable {
         const _pendingInfo = ( signal.map((_value, r) => {
             signal.read(r);
             for (const part of this._response.value) {
-                if (part.kind === 'toolInvocation' && part.state.read(r).type === IChatToolInvocation.StateKind.WaitingForConfirmation) {
-                    const title = part.confirmationMessages?.title;
-                    return title ? (isMarkdownString(title) ? title.value : title) : undefined;
+                if (part.kind === "toolInvocation") {
+                    const state = part.state.read(r);
+                    if (state.type === IChatToolInvocation.StateKind.WaitingForConfirmation) {
+                        const title = state.confirmationMessages?.title;
+                        return title ? (isMarkdownString(title) ? title.value : title) : undefined;
+                    }
+                    if (state.type === IChatToolInvocation.StateKind.WaitingForPostApproval) {
+                        return localize(6249, "Approve tool result?");
+                    }
                 }
-                if (part.kind === 'confirmation' && !part.isUsed) {
+                if (part.kind === "confirmation" && !part.isUsed) {
                     return part.title;
                 }
-                if (part.kind === 'elicitation2' && part.state.read(r) === ElicitationState.Pending) {
+                if (part.kind === "elicitation2" && part.state.read(r) === ElicitationState.Pending) {
                     const title = part.title;
                     return isMarkdownString(title) ? title.value : title;
                 }
@@ -592,39 +636,33 @@ class ChatResponseModel extends Disposable {
             return undefined;
         }));
         const _startedWaitingAt = ( ( _pendingInfo.map(p => !!p)).map(p => p ? Date.now() : undefined));
-        this.isPendingConfirmation = ( _startedWaitingAt.map(
-            (waiting, r) => waiting ? { startedWaitingAt: waiting, detail: _pendingInfo.read(r) } : undefined
-        ));
+        this.isPendingConfirmation = ( _startedWaitingAt.map((waiting, r) => waiting ? {
+            startedWaitingAt: waiting,
+            detail: _pendingInfo.read(r)
+        } : undefined));
         this.isInProgress = ( signal.map((_value, r) => {
             signal.read(r);
-            return !_pendingInfo.read(r)
-                && !this.shouldBeRemovedOnSend
-                && (this._modelState.read(r).value === ResponseModelState.Pending || this._modelState.read(r).value === ResponseModelState.NeedsInput);
-        }));
-        this._register(this._response.onDidChangeValue(() => this._onDidChange.fire(defaultChatResponseModelChangeReason)));
-        this.id = params.restoredId ?? 'response_' + generateUuid();
-        this._register(this._session.onDidChange((e) => {
-            if (e.kind === 'setCheckpoint') {
-                const isDisabled = ( e.disabledResponseIds.has(this.id));
-                const didChange = this._shouldBeBlocked === isDisabled;
-                this._shouldBeBlocked = isDisabled;
-                if (didChange) {
-                    this._onDidChange.fire(defaultChatResponseModelChangeReason);
-                }
-            }
+            return !_pendingInfo.read(r) && !this.shouldBeRemovedOnSend && (this._modelState.read(r).value === ResponseModelState.Pending || this._modelState.read(r).value === ResponseModelState.NeedsInput);
         }));
+        this._register(
+            this._response.onDidChangeValue(() => this._onDidChange.fire(defaultChatResponseModelChangeReason))
+        );
+        this.id = params.restoredId ?? "response_" + generateUuid();
         let lastStartedWaitingAt = undefined;
         this.confirmationAdjustedTimestamp = derived(reader => {
             const pending = this.isPendingConfirmation.read(reader);
             if (pending) {
-                this._modelState.set({ value: ResponseModelState.NeedsInput }, undefined);
+                this._modelState.set({
+                    value: ResponseModelState.NeedsInput
+                }, undefined);
                 if (!lastStartedWaitingAt) {
                     lastStartedWaitingAt = pending.startedWaitingAt;
                 }
-            }
-            else if (lastStartedWaitingAt) {
+            } else if (lastStartedWaitingAt) {
                 if (this._modelState.read(reader).value === ResponseModelState.NeedsInput) {
-                    this._modelState.set({ value: ResponseModelState.Pending }, undefined);
+                    this._modelState.set({
+                        value: ResponseModelState.Pending
+                    }, undefined);
                 }
                 this._timeSpentWaitingAccumulator += Date.now() - lastStartedWaitingAt;
                 lastStartedWaitingAt = undefined;
@@ -634,22 +672,27 @@ class ChatResponseModel extends Disposable {
     }
     initializeCodeBlockInfos(codeBlockInfo) {
         if (this._codeBlockInfos) {
-            throw ( new BugIndicatingError('Code block infos have already been initialized'));
+            throw ( new BugIndicatingError("Code block infos have already been initialized"));
         }
         this._codeBlockInfos = [...codeBlockInfo];
     }
+    setBlockedState(isBlocked) {
+        this._shouldBeBlocked.set(isBlocked, undefined);
+    }
     updateContent(responsePart, quiet) {
         this._response.updateContent(responsePart, quiet);
     }
     addUndoStop(undoStop) {
-        this._onDidChange.fire({ reason: 'undoStop', id: undoStop.id });
+        this._onDidChange.fire({
+            reason: "undoStop",
+            id: undoStop.id
+        });
         this._response.updateContent(undoStop, true);
     }
     applyReference(progress) {
-        if (progress.kind === 'usedContext') {
+        if (progress.kind === "usedContext") {
             this._usedContext = progress;
-        }
-        else if (progress.kind === 'reference') {
+        } else if (progress.kind === "reference") {
             this._contentReferences.push(progress);
             this._onDidChange.fire(defaultChatResponseModelChangeReason);
         }
@@ -676,13 +719,23 @@ class ChatResponseModel extends Disposable {
         if (this._result?.errorDetails?.responseIsRedacted) {
             this._response.clear();
         }
-        const state = !!this._result?.errorDetails && this._result.errorDetails.code !== 'canceled' ? ResponseModelState.Failed : ResponseModelState.Complete;
-        this._modelState.set({ value: state, completedAt: Date.now() }, undefined);
-        this._onDidChange.fire({ reason: 'completedRequest' });
+        const state = !!this._result?.errorDetails && this._result.errorDetails.code !== "canceled" ? ResponseModelState.Failed : ResponseModelState.Complete;
+        this._modelState.set({
+            value: state,
+            completedAt: Date.now()
+        }, undefined);
+        this._onDidChange.fire({
+            reason: "completedRequest"
+        });
     }
     cancel() {
-        this._modelState.set({ value: ResponseModelState.Cancelled, completedAt: Date.now() }, undefined);
-        this._onDidChange.fire({ reason: 'completedRequest' });
+        this._modelState.set({
+            value: ResponseModelState.Cancelled,
+            completedAt: Date.now()
+        }, undefined);
+        this._onDidChange.fire({
+            reason: "completedRequest"
+        });
     }
     setFollowups(followups) {
         this._followups = followups;
@@ -722,9 +775,14 @@ class ChatResponseModel extends Disposable {
         return {
             responseId: this.id,
             result: this.result,
-            responseMarkdownInfo: this.codeBlockInfos?.map(info => ({ suggestionId: info.suggestionId })),
+            responseMarkdownInfo: this.codeBlockInfos?.map(info => ({
+                suggestionId: info.suggestionId
+            })),
             followups: this.followups,
-            modelState: modelState.value === ResponseModelState.Pending || modelState.value === ResponseModelState.NeedsInput ? { value: ResponseModelState.Cancelled, completedAt: Date.now() } : modelState,
+            modelState: modelState.value === ResponseModelState.Pending || modelState.value === ResponseModelState.NeedsInput ? {
+                value: ResponseModelState.Cancelled,
+                completedAt: Date.now()
+            } : modelState,
             vote: this.vote,
             voteDownReason: this.voteDownReason,
             slashCommand: this.slashCommand,
@@ -732,18 +790,17 @@ class ChatResponseModel extends Disposable {
             contentReferences: this.contentReferences,
             codeCitations: this.codeCitations,
             timestamp: this._timestamp,
-            timeSpentWaiting: (pendingConfirmation ? Date.now() - pendingConfirmation.startedWaitingAt : 0) + this._timeSpentWaitingAccumulator,
+            timeSpentWaiting: (pendingConfirmation ? Date.now() - pendingConfirmation.startedWaitingAt : 0) + this._timeSpentWaitingAccumulator
         };
     }
 }
 function normalizeSerializableChatData(raw) {
     normalizeOldFields(raw);
-    if (!('version' in raw)) {
+    if (!("version" in raw)) {
         return {
             version: 3,
             ...raw,
-            lastMessageDate: raw.creationDate,
-            customTitle: undefined,
+            customTitle: undefined
         };
     }
     if (raw.version === 2) {
@@ -762,12 +819,7 @@ function normalizeOldFields(raw) {
     if (!raw.creationDate) {
         raw.creationDate = getLastYearDate();
     }
-    if ('version' in raw && (raw.version === 2 || raw.version === 3)) {
-        if (!raw.lastMessageDate) {
-            raw.lastMessageDate = getLastYearDate();
-        }
-    }
-    if (raw.initialLocation === 'editing-session') {
+    if (raw.initialLocation === "editing-session") {
         raw.initialLocation = ChatAgentLocation.Chat;
     }
 }
@@ -777,35 +829,38 @@ function getLastYearDate() {
     return lastYearDate.getTime();
 }
 function isExportableSessionData(obj) {
-    return !!obj &&
-        Array.isArray(obj.requests) &&
-        typeof obj.responderUsername === 'string';
+    return !!obj && Array.isArray(obj.requests) && typeof obj.responderUsername === "string";
 }
 function isSerializableSessionData(obj) {
     const data = obj;
-    return isExportableSessionData(obj) &&
-        typeof data.creationDate === 'number' &&
-        typeof data.sessionId === 'string' &&
-        obj.requests.every((request) => !request.usedContext  || isIUsedContext(request.usedContext));
+    return isExportableSessionData(obj) && typeof data.creationDate === "number" && typeof data.sessionId === "string" && obj.requests.every(
+        request => !request.usedContext  || isIUsedContext(request.usedContext)
+    );
 }
 var ChatRequestRemovalReason;
-(function (ChatRequestRemovalReason) {
+(function(ChatRequestRemovalReason) {
     ChatRequestRemovalReason[ChatRequestRemovalReason["Removal"] = 0] = "Removal";
     ChatRequestRemovalReason[ChatRequestRemovalReason["Resend"] = 1] = "Resend";
     ChatRequestRemovalReason[ChatRequestRemovalReason["Adoption"] = 2] = "Adoption";
 })(ChatRequestRemovalReason || (ChatRequestRemovalReason = {}));
 class InputModel {
     constructor(initialState) {
-        this._state = observableValueOpts({ debugName: 'inputModelState', equalsFn: equals }, initialState);
+        this._state = observableValueOpts({
+            debugName: "inputModelState",
+            equalsFn: equals
+        }, initialState);
         this.state = this._state;
     }
     setState(state) {
         const current = this._state.get();
         this._state.set({
             attachments: [],
-            mode: { id: 'agent', kind: ChatModeKind.Agent },
+            mode: {
+                id: "agent",
+                kind: ChatModeKind.Agent
+            },
             selectedModel: undefined,
-            inputText: '',
+            inputText: "",
             selections: [],
             contrib: {},
             ...current,
@@ -820,9 +875,18 @@ class InputModel {
         if (!value) {
             return undefined;
         }
+        const persistableAttachments = value.attachments.filter(attachment => {
+            if (isStringVariableEntry(attachment)) {
+                return false;
+            }
+            if (isImplicitVariableEntry(attachment) && isStringImplicitContextValue(attachment.value)) {
+                return false;
+            }
+            return true;
+        });
         return {
             contrib: value.contrib,
-            attachments: value.attachments,
+            attachments: persistableAttachments,
             mode: value.mode,
             selectedModel: value.selectedModel ? {
                 identifier: value.selectedModel.identifier,
@@ -835,11 +899,9 @@ class InputModel {
 }
 let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
     static getDefaultTitle(requests) {
-        const firstRequestMessage = requests.at(0)?.message ?? '';
-        const message = typeof firstRequestMessage === 'string' ?
-            firstRequestMessage :
-            firstRequestMessage.text;
-        return message.split('\n')[0].substring(0, 200);
+        const firstRequestMessage = requests.at(0)?.message ?? "";
+        const message = typeof firstRequestMessage === "string" ? firstRequestMessage : firstRequestMessage.text;
+        return message.split("\n")[0].substring(0, 200);
     }
     get contributedChatSession() {
         return this._contributedChatSession;
@@ -847,6 +909,12 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
     setContributedChatSession(session) {
         this._contributedChatSession = session;
     }
+    get repoData() {
+        return this._repoData;
+    }
+    setRepoData(data) {
+        this._repoData = data;
+    }
     get sessionId() {
         return this._sessionId;
     }
@@ -863,25 +931,24 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
         return this._timestamp;
     }
     get timing() {
-        const lastResponse = this._requests.at(-1)?.response;
+        const lastRequest = this._requests.at(-1);
+        const lastResponse = lastRequest?.response;
+        const lastRequestStarted = lastRequest?.timestamp;
+        const lastRequestEnded = lastResponse?.completedAt ?? lastResponse?.timestamp;
         return {
-            startTime: this._timestamp,
-            endTime: lastResponse?.completedAt ?? lastResponse?.timestamp
+            created: this._timestamp,
+            lastRequestStarted,
+            lastRequestEnded
         };
     }
     get lastMessageDate() {
-        return this._lastMessageDate;
+        return this._requests.at(-1)?.timestamp ?? this._timestamp;
     }
     get _defaultAgent() {
         return this.chatAgentService.getDefaultAgent(ChatAgentLocation.Chat, ChatModeKind.Ask);
     }
     get responderUsername() {
-        return this._defaultAgent?.fullName ??
-            this._initialResponderUsername ?? '';
-    }
-    get responderAvatarIcon() {
-        return this._defaultAgent?.metadata.themeIcon ??
-            this._initialResponderAvatarIconUri;
+        return this._defaultAgent?.fullName ?? this._initialResponderUsername ?? "";
     }
     get isImported() {
         return this._isImported;
@@ -907,7 +974,14 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
     get willKeepAlive() {
         return !this._disableBackgroundKeepAlive;
     }
-    constructor(initialData, initialModelProps, logService, chatAgentService, chatEditingService, chatService) {
+    constructor(
+        dataRef,
+        initialModelProps,
+        logService,
+        chatAgentService,
+        chatEditingService,
+        chatService
+    ) {
         super();
         this.logService = logService;
         this.chatAgentService = chatAgentService;
@@ -921,10 +995,13 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
         this._canUseTools = true;
         this.currentEditedFileEvents = ( new ResourceMap());
         this._checkpoint = undefined;
+        const initialData = dataRef?.value;
         const isValidExportedData = isExportableSessionData(initialData);
         const isValidFullData = isValidExportedData && isSerializableSessionData(initialData);
         if (initialData && !isValidExportedData) {
-            this.logService.warn(`ChatModel#constructor: Loaded malformed session data: ${JSON.stringify(initialData)}`);
+            this.logService.warn(
+                `ChatModel#constructor: Loaded malformed session data: ${JSON.stringify(initialData)}`
+            );
         }
         this._isImported = !!initialData && isValidExportedData && !isValidFullData;
         this._sessionId = (isValidFullData && initialData.sessionId) || initialModelProps.sessionId || generateUuid();
@@ -932,7 +1009,6 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
         this._disableBackgroundKeepAlive = initialModelProps.disableBackgroundKeepAlive ?? false;
         this._requests = initialData ? this._deserialize(initialData) : [];
         this._timestamp = (isValidFullData && initialData.creationDate) || Date.now();
-        this._lastMessageDate = (isValidFullData && initialData.lastMessageDate) || this._timestamp;
         this._customTitle = isValidFullData ? initialData.customTitle : undefined;
         const serializedInputState = initialModelProps.inputState || (isValidFullData && initialData.inputState ? initialData.inputState : undefined);
         this.inputModel = ( new InputModel(serializedInputState && {
@@ -946,8 +1022,9 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
             inputText: serializedInputState.inputText,
             selections: serializedInputState.selections
         }));
+        this.dataSerializer = dataRef?.serializer;
         this._initialResponderUsername = initialData?.responderUsername;
-        this._initialResponderAvatarIconUri = isUriComponents(initialData?.responderAvatarIconUri) ? URI.revive(initialData.responderAvatarIconUri) : initialData?.responderAvatarIconUri;
+        this._repoData = isValidFullData && initialData.repoData ? initialData.repoData : undefined;
         this._initialLocation = initialData?.initialLocation ?? initialModelProps.initialLocation;
         this._canUseTools = initialModelProps.canUseTools;
         this.lastRequestObs = observableFromEvent(this, this.onDidChange, () => this._requests.at(-1));
@@ -956,16 +1033,14 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
             if (!request?.response) {
                 return;
             }
-            reader.store.add(request.response.onDidChange(async (ev) => {
-                if (ev.reason === 'completedRequest' && this._editingSession) {
-                    if (request === this._requests.at(-1)
-                        && request.session.sessionResource.scheme !== Schemas.vscodeLocalChatSession
-                        && this._editingSession.hasEditsInRequest(request.id)) {
-                        const diffs = this._editingSession.getDiffsForFilesInRequest(request.id);
-                        request.response?.updateContent(editEntriesToMultiDiffData(diffs), true);
-                    }
-                    this._onDidChange.fire({ kind: 'completedRequest', request });
+            reader.store.add(request.response.onDidChange(async ev => {
+                if (!this._editingSession || ev.reason !== "completedRequest") {
+                    return;
                 }
+                this._onDidChange.fire({
+                    kind: "completedRequest",
+                    request
+                });
             }));
         }));
         this.requestInProgress = ( this.lastRequestObs.map((request, r) => {
@@ -978,7 +1053,7 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
             }
             return {
                 title: this.title,
-                detail: pendingInfo.detail,
+                detail: pendingInfo.detail
             };
         }));
         if (this.initialLocation === ChatAgentLocation.Chat && !initialModelProps.disableBackgroundKeepAlive) {
@@ -989,27 +1064,23 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
                 const shouldStayAlive = inProgress || !!needsInput;
                 if (shouldStayAlive && !selfRef.value) {
                     selfRef.value = chatService.getActiveSessionReference(this._sessionResource);
-                }
-                else if (!shouldStayAlive && selfRef.value) {
+                } else if (!shouldStayAlive && selfRef.value) {
                     selfRef.clear();
                 }
             }));
         }
     }
     startEditingSession(isGlobalEditingSession, transferFromSession) {
-        const session = this._editingSession ??= this._register(transferFromSession
-            ? this.chatEditingService.transferEditingSession(this, transferFromSession)
-            : isGlobalEditingSession
-                ? this.chatEditingService.startOrContinueGlobalEditingSession(this)
-                : this.chatEditingService.createEditingSession(this));
+        const session = this._editingSession ??= this._register(
+            transferFromSession ? this.chatEditingService.transferEditingSession(this, transferFromSession) : isGlobalEditingSession ? this.chatEditingService.startOrContinueGlobalEditingSession(this) : this.chatEditingService.createEditingSession(this)
+        );
         if (!this._disableBackgroundKeepAlive) {
             const selfRef = this._register(( new MutableDisposable()));
             this._register(autorun(r => {
                 const hasModified = ( session.entries.read(r).some(e => e.state.read(r) === ModifiedFileEntryState.Modified));
                 if (hasModified && !selfRef.value) {
                     selfRef.value = this.chatService.getActiveSessionReference(this._sessionResource);
-                }
-                else if (!hasModified && selfRef.value) {
+                } else if (!hasModified && selfRef.value) {
                     selfRef.clear();
                 }
             }));
@@ -1019,27 +1090,28 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
         }));
     }
     notifyEditingAction(action) {
-        const state = action.outcome === 'accepted' ? ChatRequestEditedFileEventKind.Keep :
-            action.outcome === 'rejected' ? ChatRequestEditedFileEventKind.Undo :
-                action.outcome === 'userModified' ? ChatRequestEditedFileEventKind.UserModification : null;
+        const state = action.outcome === "accepted" ? ChatRequestEditedFileEventKind.Keep : action.outcome === "rejected" ? ChatRequestEditedFileEventKind.Undo : action.outcome === "userModified" ? ChatRequestEditedFileEventKind.UserModification : null;
         if (state === null) {
             return;
         }
         if (!( this.currentEditedFileEvents.has(action.uri)) || this.currentEditedFileEvents.get(action.uri)?.eventKind === ChatRequestEditedFileEventKind.Keep) {
-            this.currentEditedFileEvents.set(action.uri, { eventKind: state, uri: action.uri });
+            this.currentEditedFileEvents.set(action.uri, {
+                eventKind: state,
+                uri: action.uri
+            });
         }
     }
     _deserialize(obj) {
-        const requests = obj.requests;
+        const requests = hasKey(obj, {
+            serializer: true
+        }) ? obj.value.requests : obj.requests;
         if (!Array.isArray(requests)) {
             this.logService.error(`Ignoring malformed session data: ${JSON.stringify(obj)}`);
             return [];
         }
         try {
-            return ( requests.map((raw) => {
-                const parsedRequest = typeof raw.message === 'string'
-                    ? this.getParsedRequestFromString(raw.message)
-                    : reviveParsedChatRequest(raw.message);
+            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({
                     session: this,
@@ -1049,21 +1121,35 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
                     restoredId: raw.requestId,
                     confirmation: raw.confirmation,
                     editedFileEvents: raw.editedFileEvents,
-                    modelId: raw.modelId,
+                    modelId: raw.modelId
                 }));
-                request.shouldBeRemovedOnSend = raw.isHidden ? { requestId: raw.requestId } : raw.shouldBeRemovedOnSend;
+                request.shouldBeRemovedOnSend = raw.isHidden ? {
+                    requestId: raw.requestId
+                } : raw.shouldBeRemovedOnSend;
                 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;
+                    const agent =
+                    (raw.agent && "metadata" in raw.agent) ? reviveSerializedAgent(raw.agent) : undefined;
+                    const result = "responseErrorDetails" in raw ?
+                    {
+                        errorDetails: raw.responseErrorDetails
+                    } : raw.result;
+                    let modelState = raw.modelState || {
+                        value: raw.isCanceled ? ResponseModelState.Cancelled : ResponseModelState.Complete,
+                        completedAt: Date.now()
+                    };
+                    if (modelState.value === ResponseModelState.Pending || modelState.value === ResponseModelState.NeedsInput) {
+                        modelState = {
+                            value: ResponseModelState.Cancelled,
+                            completedAt: Date.now()
+                        };
+                    }
                     request.response = ( new ChatResponseModel({
                         responseContent: raw.response ?? [( new MarkdownString(raw.response))],
                         session: this,
                         agent,
                         slashCommand: raw.slashCommand,
                         requestId: request.id,
-                        modelState: raw.modelState || { value: raw.isCanceled ? ResponseModelState.Cancelled : ResponseModelState.Complete, completedAt: 'lastMessageDate' in obj ? obj.lastMessageDate : Date.now() },
+                        modelState,
                         vote: raw.vote,
                         timestamp: raw.timestamp,
                         voteDownReason: raw.voteDownReason,
@@ -1071,10 +1157,14 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
                         followups: raw.followups,
                         restoredId: raw.responseId,
                         timeSpentWaiting: raw.timeSpentWaiting,
-                        shouldBeBlocked: request.shouldBeBlocked,
-                        codeBlockInfos: raw.responseMarkdownInfo?.map(info => ({ suggestionId: info.suggestionId })),
+                        shouldBeBlocked: request.shouldBeBlocked.get(),
+                        codeBlockInfos: raw.responseMarkdownInfo?.map(info => ({
+                            suggestionId: info.suggestionId
+                        }))
                     }));
-                    request.response.shouldBeRemovedOnSend = raw.isHidden ? { requestId: raw.requestId } : raw.shouldBeRemovedOnSend;
+                    request.response.shouldBeRemovedOnSend = raw.isHidden ? {
+                        requestId: raw.requestId
+                    } : raw.shouldBeRemovedOnSend;
                     if (raw.usedContext) {
                         request.response.applyReference(revive(raw.usedContext));
                     }
@@ -1083,36 +1173,25 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
                 }
                 return request;
             }));
-        }
-        catch (error) {
-            this.logService.error('Failed to parse chat data', error);
+        } catch (error) {
+            this.logService.error("Failed to parse chat data", error);
             return [];
         }
     }
     reviveVariableData(raw) {
-        const variableData = raw && Array.isArray(raw.variables)
-            ? raw :
-            { variables: [] };
-        variableData.variables = ( variableData.variables.map((v) => {
-            if (v && 'values' in v && Array.isArray(v.values)) {
-                return {
-                    kind: 'generic',
-                    id: v.id ?? '',
-                    name: v.name,
-                    value: v.values[0]?.value,
-                    range: v.range,
-                    modelDescription: v.modelDescription,
-                    references: v.references
-                };
-            }
-            else {
-                return v;
-            }
-        }));
+        const variableData = raw && Array.isArray(raw.variables) ? raw : {
+            variables: []
+        };
+        variableData.variables = ( variableData.variables.map(IChatRequestVariableEntry.fromExport));
         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
@@ -1123,7 +1202,7 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
     }
     resetCheckpoint() {
         for (const request of this._requests) {
-            request.shouldBeBlocked = false;
+            request.setShouldBeBlocked(false);
         }
     }
     setCheckpoint(requestId) {
@@ -1134,52 +1213,58 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
                 if (request.id === requestId) {
                     checkpointIndex = index;
                     checkpoint = request;
-                    request.shouldBeBlocked = true;
+                    request.setShouldBeBlocked(true);
                 }
             });
             if (!checkpoint) {
                 return;
             }
         }
-        const disabledRequestIds = ( new Set());
-        const disabledResponseIds = ( new Set());
         for (let i = this._requests.length - 1; i >= 0; i -= 1) {
             const request = this._requests[i];
             if (this._checkpoint && !checkpoint) {
-                request.shouldBeBlocked = false;
-            }
-            else if (checkpoint && i >= checkpointIndex) {
-                request.shouldBeBlocked = true;
-                disabledRequestIds.add(request.id);
+                request.setShouldBeBlocked(false);
+            } else if (checkpoint && i >= checkpointIndex) {
+                request.setShouldBeBlocked(true);
                 if (request.response) {
-                    disabledResponseIds.add(request.response.id);
+                    request.response.setBlockedState(true);
                 }
-            }
-            else if (checkpoint && i < checkpointIndex) {
-                request.shouldBeBlocked = false;
+            } else if (checkpoint && i < checkpointIndex) {
+                request.setShouldBeBlocked(false);
             }
         }
         this._checkpoint = checkpoint;
-        this._onDidChange.fire({
-            kind: 'setCheckpoint',
-            disabledRequestIds,
-            disabledResponseIds
-        });
     }
     get checkpoint() {
         return this._checkpoint;
     }
     _setDisabledRequests(requestIds) {
-        this._requests.forEach((request) => {
+        this._requests.forEach(request => {
             const shouldBeRemovedOnSend = requestIds.find(r => r.requestId === request.id);
             request.shouldBeRemovedOnSend = shouldBeRemovedOnSend;
             if (request.response) {
                 request.response.shouldBeRemovedOnSend = shouldBeRemovedOnSend;
             }
         });
-        this._onDidChange.fire({ kind: 'setHidden' });
+        this._onDidChange.fire({
+            kind: "setHidden"
+        });
     }
-    addRequest(message, variableData, attempt, modeInfo, chatAgent, slashCommand, confirmation, locationData, attachments, isCompleteAddedRequest, modelId, userSelectedTools, id) {
+    addRequest(
+        message,
+        variableData,
+        attempt,
+        modeInfo,
+        chatAgent,
+        slashCommand,
+        confirmation,
+        locationData,
+        attachments,
+        isCompleteAddedRequest,
+        modelId,
+        userSelectedTools,
+        id
+    ) {
         const editedFileEvents = [...( this.currentEditedFileEvents.values())];
         this.currentEditedFileEvents.clear();
         const request = ( new ChatRequestModel({
@@ -1196,7 +1281,7 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
             isCompleteAddedRequest,
             modelId,
             editedFileEvents: editedFileEvents.length ? editedFileEvents : undefined,
-            userSelectedTools,
+            userSelectedTools
         }));
         request.response = ( new ChatResponseModel({
             responseContent: [],
@@ -1205,24 +1290,32 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
             slashCommand,
             requestId: request.id,
             isCompleteAddedRequest,
-            codeBlockInfos: undefined,
+            codeBlockInfos: undefined
         }));
         this._requests.push(request);
-        this._lastMessageDate = Date.now();
-        this._onDidChange.fire({ kind: 'addRequest', request });
+        this._onDidChange.fire({
+            kind: "addRequest",
+            request
+        });
         return request;
     }
     setCustomTitle(title) {
         this._customTitle = title;
-        this._onDidChange.fire({ kind: 'setCustomTitle', title });
+        this._onDidChange.fire({
+            kind: "setCustomTitle",
+            title
+        });
     }
     updateRequest(request, variableData) {
         request.variableData = variableData;
-        this._onDidChange.fire({ kind: 'changedRequest', request });
+        this._onDidChange.fire({
+            kind: "changedRequest",
+            request
+        });
     }
     adoptRequest(request) {
         const oldOwner = request.session;
-        const index = oldOwner._requests.findIndex((candidate) => candidate.id === request.id);
+        const index = oldOwner._requests.findIndex(candidate => candidate.id === request.id);
         if (index === -1) {
             return;
         }
@@ -1230,8 +1323,16 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
         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 });
+        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) {
@@ -1239,29 +1340,31 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
                 responseContent: [],
                 session: this,
                 requestId: request.id,
-                codeBlockInfos: undefined,
+                codeBlockInfos: undefined
             }));
         }
         if (request.response.isComplete) {
-            throw ( new Error('acceptResponseProgress: Adding progress to a completed response'));
+            throw ( new Error("acceptResponseProgress: Adding progress to a completed response"));
         }
-        if (progress.kind === 'usedContext' || progress.kind === 'reference') {
+        if (progress.kind === "usedContext" || progress.kind === "reference") {
             request.response.applyReference(progress);
-        }
-        else if (progress.kind === 'codeCitation') {
+        } else if (progress.kind === "codeCitation") {
             request.response.applyCodeCitation(progress);
-        }
-        else if (progress.kind === 'move') {
-            this._onDidChange.fire({ kind: 'move', target: progress.uri, range: progress.range });
-        }
-        else if (progress.kind === 'codeblockUri' && progress.isEdit) {
-            request.response.addUndoStop({ id: progress.undoStopId ?? generateUuid(), kind: 'undoStop' });
+        } else if (progress.kind === "move") {
+            this._onDidChange.fire({
+                kind: "move",
+                target: progress.uri,
+                range: progress.range
+            });
+        } else if (progress.kind === "codeblockUri" && progress.isEdit) {
+            request.response.addUndoStop({
+                id: progress.undoStopId ?? generateUuid(),
+                kind: "undoStop"
+            });
             request.response.updateContent(progress, quiet);
-        }
-        else if (progress.kind === 'progressTaskResult') {
+        } else if (progress.kind === "progressTaskResult") {
             this.logService.error(`Couldn't handle progress: ${JSON.stringify(progress)}`);
-        }
-        else {
+        } else {
             request.response.updateContent(progress, quiet);
         }
     }
@@ -1269,7 +1372,12 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
         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, reason });
+            this._onDidChange.fire({
+                kind: "removeRequest",
+                requestId: request.id,
+                responseId: request.response?.id,
+                reason
+            });
             this._requests.splice(index, 1);
             request.response?.dispose();
         }
@@ -1285,7 +1393,7 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
                 responseContent: [],
                 session: this,
                 requestId: request.id,
-                codeBlockInfos: undefined,
+                codeBlockInfos: undefined
             }));
         }
         request.response.setResult(result);
@@ -1298,47 +1406,46 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
     }
     setResponseModel(request, response) {
         request.response = response;
-        this._onDidChange.fire({ kind: 'addResponse', response });
+        this._onDidChange.fire({
+            kind: "addResponse",
+            response
+        });
     }
     toExport() {
         return {
             responderUsername: this.responderUsername,
-            responderAvatarIconUri: this.responderAvatarIcon,
             initialLocation: this.initialLocation,
-            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))
                 };
                 const agent = r.response?.agent;
-                const agentJson = agent && 'toJSON' in agent ? agent.toJSON() :
-                    agent ? { ...agent } : undefined;
+                const agentJson = agent && "toJSON" in agent ? agent.toJSON() : agent ? {
+                    ...agent
+                } : undefined;
                 return {
                     requestId: r.id,
                     message,
-                    variableData: r.variableData,
-                    response: r.response ?
-                        ( r.response.entireResponse.value.map(item => {
-                            if (item.kind === 'treeData') {
-                                return item.treeData;
-                            }
-                            else if (item.kind === 'markdownContent') {
-                                return item.content;
-                            }
-                            else {
-                                return item;
-                            }
-                        }))
-                        : undefined,
+                    variableData: IChatRequestVariableData.toExport(r.variableData),
+                    response: r.response ? ( r.response.entireResponse.value.map(item => {
+                        if (item.kind === "treeData") {
+                            return item.treeData;
+                        } else if (item.kind === "markdownContent") {
+                            return item.content;
+                        } else {
+                            return item;
+                        }
+                    })) : undefined,
                     shouldBeRemovedOnSend: r.shouldBeRemovedOnSend,
                     agent: agentJson,
                     timestamp: r.timestamp,
                     confirmation: r.confirmation,
                     editedFileEvents: r.editedFileEvents,
                     modelId: r.modelId,
-                    ...r.response?.toJSON(),
+                    ...r.response?.toJSON()
                 };
-            })),
+            }))
         };
     }
     toJSON() {
@@ -1347,10 +1454,9 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
             ...this.toExport(),
             sessionId: this.sessionId,
             creationDate: this._timestamp,
-            lastMessageDate: this._lastMessageDate,
             customTitle: this._customTitle,
-            hasPendingEdits: !!(this._editingSession?.entries.get().some(e => e.state.get() === ModifiedFileEntryState.Modified)),
             inputState: this.inputModel.toJSON(),
+            repoData: this._repoData
         };
     }
     dispose() {
@@ -1359,12 +1465,7 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
         super.dispose();
     }
 };
-ChatModel = ChatModel_1 = ( __decorate([
-    ( __param(2, ILogService)),
-    ( __param(3, IChatAgentService)),
-    ( __param(4, IChatEditingService)),
-    ( __param(5, IChatService))
-], ChatModel));
+ChatModel = ChatModel_1 = ( __decorate([( __param(2, ILogService)), ( __param(3, IChatAgentService)), ( __param(4, IChatEditingService)), ( __param(5, IChatService))], ChatModel));
 function updateRanges(variableData, diff) {
     return {
         variables: ( variableData.variables.map(v => ({
@@ -1378,24 +1479,17 @@ function updateRanges(variableData, diff) {
 }
 function canMergeMarkdownStrings(md1, md2) {
     if (md1.baseUri && md2.baseUri) {
-        const baseUriEquals = md1.baseUri.scheme === md2.baseUri.scheme
-            && md1.baseUri.authority === md2.baseUri.authority
-            && md1.baseUri.path === md2.baseUri.path
-            && md1.baseUri.query === md2.baseUri.query
-            && md1.baseUri.fragment === md2.baseUri.fragment;
+        const baseUriEquals = md1.baseUri.scheme === md2.baseUri.scheme && md1.baseUri.authority === md2.baseUri.authority && md1.baseUri.path === md2.baseUri.path && md1.baseUri.query === md2.baseUri.query && md1.baseUri.fragment === md2.baseUri.fragment;
         if (!baseUriEquals) {
             return false;
         }
-    }
-    else if (md1.baseUri || md2.baseUri) {
+    } else if (md1.baseUri || md2.baseUri) {
         return false;
     }
-    return equals(md1.isTrusted, md2.isTrusted) &&
-        md1.supportHtml === md2.supportHtml &&
-        md1.supportThemeIcons === md2.supportThemeIcons;
+    return equals(md1.isTrusted, md2.isTrusted) && md1.supportHtml === md2.supportHtml && md1.supportThemeIcons === md2.supportThemeIcons;
 }
 function appendMarkdownString(md1, md2) {
-    const appendedValue = typeof md2 === 'string' ? md2 : md2.value;
+    const appendedValue = typeof md2 === "string" ? md2 : md2.value;
     return {
         value: md1.value + appendedValue,
         isTrusted: md1.isTrusted,
@@ -1406,28 +1500,26 @@ function appendMarkdownString(md1, md2) {
 }
 function getCodeCitationsMessage(citations) {
     if (citations.length === 0) {
-        return '';
+        return "";
     }
     const licenseTypes = citations.reduce((set, c) => set.add(c.license), ( new Set()));
-    const label = licenseTypes.size === 1 ?
-        ( localize(5963, "Similar code found with 1 license type", licenseTypes.size)) :
-        ( localize(5964, "Similar code found with {0} license types", licenseTypes.size));
+    const label = licenseTypes.size === 1 ? ( localize(6250, "Similar code found with 1 license type", licenseTypes.size)) : ( localize(6251, "Similar code found with {0} license types", licenseTypes.size));
     return label;
 }
 var ChatRequestEditedFileEventKind;
-(function (ChatRequestEditedFileEventKind) {
+(function(ChatRequestEditedFileEventKind) {
     ChatRequestEditedFileEventKind[ChatRequestEditedFileEventKind["Keep"] = 1] = "Keep";
     ChatRequestEditedFileEventKind[ChatRequestEditedFileEventKind["Undo"] = 2] = "Undo";
     ChatRequestEditedFileEventKind[ChatRequestEditedFileEventKind["UserModification"] = 3] = "UserModification";
 })(ChatRequestEditedFileEventKind || (ChatRequestEditedFileEventKind = {}));
 var ChatResponseResource;
-(function (ChatResponseResource) {
-    ChatResponseResource.scheme = 'vscode-chat-response-resource';
+(function(ChatResponseResource) {
+    ChatResponseResource.scheme = "vscode-chat-response-resource";
     function createUri(sessionResource, toolCallId, index, basename) {
         return ( URI.from({
             scheme: ChatResponseResource.scheme,
             authority: encodeHex(VSBuffer.fromString(( sessionResource.toString()))),
-            path: `/tool/${toolCallId}/${index}` + (basename ? `/${basename}` : ''),
+            path: `/tool/${toolCallId}/${index}` + (basename ? `/${basename}` : "")
         }));
     }
     ChatResponseResource.createUri = createUri;
@@ -1435,33 +1527,31 @@ var ChatResponseResource;
         if (uri.scheme !== ChatResponseResource.scheme) {
             return undefined;
         }
-        const parts = uri.path.split('/');
+        const parts = uri.path.split("/");
         if (parts.length < 5) {
             return undefined;
         }
         const [, kind, toolCallId, index] = parts;
-        if (kind !== 'tool') {
+        if (kind !== "tool") {
             return undefined;
         }
         let sessionResource;
         try {
             sessionResource = ( URI.parse(( decodeHex(uri.authority).toString())));
-        }
-        catch (e) {
+        } catch (e) {
             if (e instanceof SyntaxError) {
                 sessionResource = LocalChatSessionUri.forSession(uri.authority);
-            }
-            else {
+            } else {
                 throw e;
             }
         }
         return {
             sessionResource,
             toolCallId: toolCallId,
-            index: Number(index),
+            index: Number(index)
         };
     }
     ChatResponseResource.parseUri = parseUri;
 })(ChatResponseResource || (ChatResponseResource = {}));
 
-export { CHAT_ATTACHABLE_IMAGE_MIME_TYPES, ChatModel, ChatRequestEditedFileEventKind, ChatRequestModel, ChatRequestRemovalReason, ChatResponseModel, ChatResponseResource, Response, appendMarkdownString, canMergeMarkdownStrings, defaultChatResponseModelChangeReason, getAttachableImageExtension, getCodeCitationsMessage, isCellTextEditOperation, isCellTextEditOperationArray, isExportableSessionData, isSerializableSessionData, normalizeSerializableChatData, toChatHistoryContent, updateRanges };
+export { CHAT_ATTACHABLE_IMAGE_MIME_TYPES, ChatModel, ChatRequestEditedFileEventKind, ChatRequestModel, ChatRequestRemovalReason, ChatResponseModel, ChatResponseResource, IChatRequestVariableData, Response, appendMarkdownString, canMergeMarkdownStrings, defaultChatResponseModelChangeReason, getAttachableImageExtension, getCodeCitationsMessage, isCellTextEditOperation, isCellTextEditOperationArray, isExportableSessionData, isSerializableSessionData, normalizeSerializableChatData, toChatHistoryContent, updateRanges };