@codingame/monaco-vscode-chat-service-override 29.1.0 → 30.0.0

package/vscode/src/vs/workbench/contrib/chat/browser/widget/input/editor/chatInputCompletions.js

@@ -16,8 +16,6 @@ import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { generateUuid } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uuid';
 import { isCodeEditor, getCodeEditor } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorBrowser';
 import { ICodeEditorService } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/codeEditorService.service';
-import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
-import { getWordAtText } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/wordHelper';
 import { CompletionItemKind, SymbolKinds } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages';
 import { ILanguageFeaturesService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/languageFeatures.service';
 import { IOutlineModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/documentSymbols/browser/outlineModel.service';
@@ -61,6 +59,8 @@ import { IChatDebugService } from '@codingame/monaco-vscode-api/vscode/vs/workbe
 import { createDebugEventsAttachment } from '@codingame/monaco-vscode-xterm-addons-common/vscode/vs/workbench/contrib/chat/browser/chatDebug/chatDebugAttachment';
 import { getPromptFileType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/promptFileLocations';
 import { getChatSessionType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatUri';
+import { computeCompletionRanges, isEmptyUpToCompletionWord, escapeForCharClass } from './chatInputCompletionUtils.js';
+import { AgentSessionProviders, getAgentSessionProviderIcon } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessions';
 
 var BuiltinDynamicCompletions_1, ToolCompletions_1;
 const SlashCommandWord = /\/[\p{L}0-9_.:-]*/gu;
@@ -240,9 +240,6 @@ let SlashCommandCompletions = class SlashCommandCompletions extends Disposable {
                 }
                 const userInvocableCommands = promptCommands.filter(c => {
                     if (widget.lockedAgentId) {
-                        if (c.promptPath.extension) {
-                            return false;
-                        }
                         try {
                             const promptType = getPromptFileType(c.promptPath.uri);
                             if (promptType && promptType === PromptsType.hook) {
@@ -563,7 +560,7 @@ let AgentCompletions = class AgentCompletions extends Disposable {
                 if (!isEmptyUpToCompletionWord(model, range)) {
                     return;
                 }
-                const label = ( localize(7026, "Install Chat Extensions..."));
+                const label = ( localize(7080, "Install Chat Extensions..."));
                 const item = {
                     label,
                     insertText: "",
@@ -711,7 +708,7 @@ class StartParameterizedPromptAction extends Action2 {
                 messages = await prompt.resolve(args, cts.token);
             } catch (e) {
                 if (!cts.token.isCancellationRequested) {
-                    notificationService.error(( localize(7027, "Error resolving prompt: {0}", String(e))));
+                    notificationService.error(( localize(7081, "Error resolving prompt: {0}", String(e))));
                 }
                 replaceTextWith("");
                 return;
@@ -739,15 +736,15 @@ class StartParameterizedPromptAction extends Action2 {
                             id: generateUuid(),
                             kind: "generic",
                             value: contents,
-                            name: ( localize(7028, "Prompt Resource"))
+                            name: ( localize(7082, "Prompt Resource"))
                         });
                     }
                 } else if (mimeType && getAttachableImageExtension(mimeType)) {
                     const resized = await resizeImage(contents).catch(() => decodeBase64(contents).buffer);
                     chatWidget.attachmentModel.addContext({
                         id: generateUuid(),
-                        name: ( localize(7029, "Prompt Image")),
-                        fullName: ( localize(7029, "Prompt Image")),
+                        name: ( localize(7083, "Prompt Image")),
+                        fullName: ( localize(7083, "Prompt Image")),
                         value: resized,
                         kind: "image",
                         references: validURI && [{
@@ -827,7 +824,10 @@ let BuiltinDynamicCompletions = class BuiltinDynamicCompletions extends Disposab
         this.addDebugEventsSnapshotCommand = "_addDebugEventsSnapshotCmd";
     }
     static {
-        this.VariableNameDef = ( new RegExp(`${chatVariableLeader}[\\w:-]*`, "g"));
+        this.VariableNameDef = ( new RegExp(
+            `[${escapeForCharClass(chatVariableLeader)}${escapeForCharClass(chatAgentLeader)}][\\w:-]*`,
+            "g"
+        ));
     }
     constructor(
         historyService,
@@ -842,7 +842,8 @@ let BuiltinDynamicCompletions = class BuiltinDynamicCompletions extends Disposab
         codeEditorService,
         chatAgentService,
         instantiationService,
-        chatDebugService
+        chatDebugService,
+        chatSessionsService
     ) {
         super();
         this.historyService = historyService;
@@ -858,7 +859,11 @@ let BuiltinDynamicCompletions = class BuiltinDynamicCompletions extends Disposab
         this.chatAgentService = chatAgentService;
         this.instantiationService = instantiationService;
         this.chatDebugService = chatDebugService;
-        const fileWordPattern = ( new RegExp(`${chatVariableLeader}[^\\s]*`, "g"));
+        this.chatSessionsService = chatSessionsService;
+        const fileWordPattern = ( new RegExp(
+            `[${escapeForCharClass(chatVariableLeader)}${escapeForCharClass(chatAgentLeader)}][^\\s]*`,
+            "g"
+        ));
         this.registerVariableCompletions("fileAndFolder", async (
             {
                 widget,
@@ -903,8 +908,9 @@ let BuiltinDynamicCompletions = class BuiltinDynamicCompletions extends Disposab
             if (!currentSelection || !currentResource || currentSelection.isEmpty()) {
                 return;
             }
+            const typedLeader = range.varWord?.word?.charAt(0) === chatAgentLeader ? chatAgentLeader : chatVariableLeader;
             const basename = this.labelService.getUriBasenameLabel(currentResource);
-            const text = `${chatVariableLeader}file:${basename}:${currentSelection.startLineNumber}-${currentSelection.endLineNumber}`;
+            const text = `${typedLeader}file:${basename}:${currentSelection.startLineNumber}-${currentSelection.endLineNumber}`;
             const fullRangeText = `:${currentSelection.startLineNumber}:${currentSelection.startColumn}-${currentSelection.endLineNumber}:${currentSelection.endColumn}`;
             const description = this.labelService.getUriLabel(currentResource, {
                 relative: true
@@ -914,10 +920,10 @@ let BuiltinDynamicCompletions = class BuiltinDynamicCompletions extends Disposab
             };
             result.suggestions.push({
                 label: {
-                    label: `${chatVariableLeader}selection`,
+                    label: `${typedLeader}selection`,
                     description
                 },
-                filterText: `${chatVariableLeader}selection`,
+                filterText: `${typedLeader}selection`,
                 insertText: range.varWord?.endColumn === range.replace.endColumn ? `${text} ` : text,
                 range,
                 kind: CompletionItemKind.Text,
@@ -958,12 +964,103 @@ let BuiltinDynamicCompletions = class BuiltinDynamicCompletions extends Disposab
             const result = {
                 suggestions: []
             };
-            const range2 = computeCompletionRanges(model, position, ( new RegExp(`${chatVariableLeader}[^\\s]*`, "g")), true);
+            const range2 = computeCompletionRanges(model, position, ( new RegExp(
+                `[${escapeForCharClass(chatVariableLeader)}${escapeForCharClass(chatAgentLeader)}][^\\s]*`,
+                "g"
+            )), true);
             if (range2) {
                 this.addSymbolEntries(widget, result, range2, token);
             }
             return result;
         });
+        const sessionWordPattern = ( new RegExp(`${chatVariableLeader}[^\\s]*`, "g"));
+        this.registerVariableCompletions("sessionReference", async (
+            {
+                widget,
+                range
+            },
+            token
+        ) => {
+            if (widget.location !== ChatAgentLocation.Chat) {
+                return;
+            }
+            const typedWord = range.varWord?.word ?? "";
+            const sessionPrefix = `${chatVariableLeader}session`;
+            const result = {
+                suggestions: []
+            };
+            if (typedWord.toLowerCase().startsWith(`${sessionPrefix}:`)) {
+                const allSessions = [];
+                const sessionProviderFilter = [
+                    AgentSessionProviders.Local,
+                    AgentSessionProviders.Background,
+                    AgentSessionProviders.Claude
+                ];
+                for await (const group of this.chatSessionsService.getChatSessionItems(sessionProviderFilter, token)) {
+                    if (token.isCancellationRequested) {
+                        return;
+                    }
+                    const providerIcon = getAgentSessionProviderIcon(group.chatSessionType);
+                    for (const item of group.items) {
+                        allSessions.push({
+                            title: item.label,
+                            sessionResource: item.resource,
+                            lastMessageDate: item.timing.lastRequestEnded ?? item.timing.created,
+                            icon: item.iconPath ?? providerIcon
+                        });
+                    }
+                }
+                const currentSessionResource = widget.viewModel?.sessionResource;
+                const filteredSessions = allSessions.filter(s => !currentSessionResource || ( s.sessionResource.toString()) !== ( currentSessionResource.toString())).sort((a, b) => b.lastMessageDate - a.lastMessageDate);
+                for (const session of filteredSessions) {
+                    const text = `${sessionPrefix}:${session.title}`;
+                    const dateStr = ( new Date(session.lastMessageDate)).toLocaleString();
+                    result.suggestions.push({
+                        label: {
+                            label: session.title,
+                            description: dateStr
+                        },
+                        filterText: `${sessionPrefix}:${session.title}`,
+                        insertText: range.varWord?.endColumn === range.replace.endColumn ? `${text} ` : text,
+                        range,
+                        kind: CompletionItemKind.Text,
+                        sortText: `z${String(Number.MAX_SAFE_INTEGER - session.lastMessageDate).padStart(20, "0")}`,
+                        command: {
+                            id: BuiltinDynamicCompletions_1.addReferenceCommand,
+                            title: "",
+                            arguments: [( new ReferenceArgument(widget, {
+                                id: ( session.sessionResource.toString()),
+                                icon: session.icon,
+                                range: {
+                                    startLineNumber: range.replace.startLineNumber,
+                                    startColumn: range.replace.startColumn,
+                                    endLineNumber: range.replace.endLineNumber,
+                                    endColumn: range.replace.startColumn + text.length
+                                },
+                                data: session.sessionResource
+                            }))]
+                        }
+                    });
+                }
+            } else {
+                result.suggestions.push({
+                    label: {
+                        label: sessionPrefix,
+                        description: ( localize(7084, "Attach a chat session"))
+                    },
+                    filterText: sessionPrefix,
+                    insertText: `${sessionPrefix}:`,
+                    range,
+                    kind: CompletionItemKind.Text,
+                    sortText: "z",
+                    command: {
+                        id: "editor.action.triggerSuggest",
+                        title: ""
+                    }
+                });
+            }
+            return result;
+        }, sessionWordPattern);
         this.registerVariableCompletions("debugEventsSnapshot", (
             {
                 widget,
@@ -984,7 +1081,7 @@ let BuiltinDynamicCompletions = class BuiltinDynamicCompletions extends Disposab
             result.suggestions.push({
                 label: {
                     label: text,
-                    description: ( localize(7030, "Attach debug events snapshot"))
+                    description: ( localize(7085, "Attach debug events snapshot"))
                 },
                 filterText: text,
                 insertText: "",
@@ -1050,7 +1147,7 @@ let BuiltinDynamicCompletions = class BuiltinDynamicCompletions extends Disposab
             hasAccessToAllModels: true
         }, {
             _debugDisplayName: `chatVarCompletions-${debugName}`,
-            triggerCharacters: [chatVariableLeader],
+            triggerCharacters: [chatVariableLeader, chatAgentLeader],
             provideCompletionItems: async (model, position, context, token) => {
                 const widget = this.chatWidgetService.getWidgetByInputUri(model.uri);
                 if (!widget) {
@@ -1071,20 +1168,21 @@ let BuiltinDynamicCompletions = class BuiltinDynamicCompletions extends Disposab
         }));
     }
     async addFileAndFolderEntries(widget, result, info, token) {
+        const typedLeader = info.varWord?.word?.charAt(0) === chatAgentLeader ? chatAgentLeader : chatVariableLeader;
         const makeCompletionItem = (resource, kind, description, boostPriority) => {
             const basename = this.labelService.getUriBasenameLabel(resource);
-            const text = `${chatVariableLeader}file:${basename}`;
+            const text = `${typedLeader}file:${basename}`;
             const uriLabel = this.labelService.getUriLabel(resource, {
                 relative: true
             });
-            const labelDescription = description ? ( localize(7031, "{0} ({1})", uriLabel, description)) : uriLabel;
+            const labelDescription = description ? ( localize(7086, "{0} ({1})", uriLabel, description)) : uriLabel;
             const sortText = boostPriority ? " " : "!";
             return {
                 label: {
                     label: basename,
                     description: labelDescription
                 },
-                filterText: `${chatVariableLeader}${basename}`,
+                filterText: `${basename} ${typedLeader}${basename} ${uriLabel}`,
                 insertText: info.varWord?.endColumn === info.replace.endColumn ? `${text} ` : text,
                 range: info,
                 kind: kind === FileKind.FILE ? CompletionItemKind.File : CompletionItemKind.Folder,
@@ -1108,7 +1206,7 @@ let BuiltinDynamicCompletions = class BuiltinDynamicCompletions extends Disposab
             };
         };
         let pattern;
-        if (info.varWord?.word && info.varWord.word.startsWith(chatVariableLeader)) {
+        if (info.varWord?.word && (info.varWord.word.startsWith(chatVariableLeader) || info.varWord.word.startsWith(chatAgentLeader))) {
             pattern = info.varWord.word.toLowerCase().slice(1);
         }
         const seen = ( new ResourceSet());
@@ -1119,13 +1217,17 @@ let BuiltinDynamicCompletions = class BuiltinDynamicCompletions extends Disposab
                 continue;
             }
             if (pattern) {
+                const uriLabel = this.labelService.getUriLabel(resource, {
+                    relative: true
+                }).toLowerCase();
                 const basename = this.labelService.getUriBasenameLabel(resource).toLowerCase();
-                if (!isPatternInWord(pattern, 0, pattern.length, basename, 0, basename.length)) {
+                const combined = `${basename} ${uriLabel}`;
+                if (!isPatternInWord(pattern, 0, pattern.length, combined, 0, combined.length)) {
                     continue;
                 }
             }
             seen.add(resource);
-            const newLen = result.suggestions.push(makeCompletionItem(resource, FileKind.FILE, i === 0 ? ( localize(7032, "Active file")) : undefined, i === 0));
+            const newLen = result.suggestions.push(makeCompletionItem(resource, FileKind.FILE, i === 0 ? ( localize(7087, "Active file")) : undefined, i === 0));
             if (newLen - len >= 5) {
                 break;
             }
@@ -1165,8 +1267,9 @@ let BuiltinDynamicCompletions = class BuiltinDynamicCompletions extends Disposab
     addSymbolEntries(widget, result, info, token) {
         const timeoutMs = 100;
         const stopwatch = ( new StopWatch());
+        const typedLeader = info.varWord?.word?.charAt(0) === chatAgentLeader ? chatAgentLeader : chatVariableLeader;
         const makeSymbolCompletionItem = (symbolItem, pattern) => {
-            const text = `${chatVariableLeader}sym:${symbolItem.name}`;
+            const text = `${typedLeader}sym:${symbolItem.name}`;
             const resource = symbolItem.location.uri;
             const uriLabel = this.labelService.getUriLabel(resource, {
                 relative: true
@@ -1177,7 +1280,7 @@ let BuiltinDynamicCompletions = class BuiltinDynamicCompletions extends Disposab
                     label: symbolItem.name,
                     description: uriLabel
                 },
-                filterText: `${chatVariableLeader}${symbolItem.name}`,
+                filterText: `${typedLeader}${symbolItem.name}`,
                 insertText: info.varWord?.endColumn === info.replace.endColumn ? `${text} ` : text,
                 range: info,
                 kind: SymbolKinds.toCompletionKind(symbolItem.kind),
@@ -1201,7 +1304,7 @@ let BuiltinDynamicCompletions = class BuiltinDynamicCompletions extends Disposab
             };
         };
         let pattern;
-        if (info.varWord?.word && info.varWord.word.startsWith(chatVariableLeader)) {
+        if (info.varWord?.word && (info.varWord.word.startsWith(chatVariableLeader) || info.varWord.word.startsWith(chatAgentLeader))) {
             pattern = info.varWord.word.toLowerCase().slice(1);
         }
         const symbolsToAdd = [];
@@ -1248,67 +1351,17 @@ let BuiltinDynamicCompletions = class BuiltinDynamicCompletions extends Disposab
         arg.widget.getContrib(ChatDynamicVariableModel.ID)?.addReference(arg.variable);
     }
 };
-BuiltinDynamicCompletions = BuiltinDynamicCompletions_1 = ( __decorate([( __param(0, IHistoryService)), ( __param(1, IWorkspaceContextService)), ( __param(2, ISearchService)), ( __param(3, ILabelService)), ( __param(4, ILanguageFeaturesService)), ( __param(5, IChatWidgetService)), ( __param(6, IOutlineModelService)), ( __param(7, IEditorService)), ( __param(8, IConfigurationService)), ( __param(9, ICodeEditorService)), ( __param(10, IChatAgentService)), ( __param(11, IInstantiationService)), ( __param(12, IChatDebugService))], BuiltinDynamicCompletions));
+BuiltinDynamicCompletions = BuiltinDynamicCompletions_1 = ( __decorate([( __param(0, IHistoryService)), ( __param(1, IWorkspaceContextService)), ( __param(2, ISearchService)), ( __param(3, ILabelService)), ( __param(4, ILanguageFeaturesService)), ( __param(5, IChatWidgetService)), ( __param(6, IOutlineModelService)), ( __param(7, IEditorService)), ( __param(8, IConfigurationService)), ( __param(9, ICodeEditorService)), ( __param(10, IChatAgentService)), ( __param(11, IInstantiationService)), ( __param(12, IChatDebugService)), ( __param(13, IChatSessionsService))], BuiltinDynamicCompletions));
 ( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(BuiltinDynamicCompletions, LifecyclePhase.Eventually);
-function computeCompletionRanges(model, position, reg, onlyOnWordStart = false) {
-    const varWord = getWordAtText(position.column, reg, model.getLineContent(position.lineNumber), 0);
-    if (!varWord && model.getWordUntilPosition(position).word) {
-        return;
-    }
-    if (!varWord && position.column > 1) {
-        const textBefore = model.getValueInRange(( new Range(
-            position.lineNumber,
-            position.column - 1,
-            position.lineNumber,
-            position.column
-        )));
-        if (textBefore !== " ") {
-            return;
-        }
-    }
-    if (varWord && onlyOnWordStart) {
-        const wordBefore = model.getWordUntilPosition({
-            lineNumber: position.lineNumber,
-            column: varWord.startColumn
-        });
-        if (wordBefore.word) {
-            return;
-        }
-    }
-    let insert;
-    let replace;
-    if (!varWord) {
-        insert = replace = Range.fromPositions(position);
-    } else {
-        insert = ( new Range(
-            position.lineNumber,
-            varWord.startColumn,
-            position.lineNumber,
-            position.column
-        ));
-        replace = ( new Range(
-            position.lineNumber,
-            varWord.startColumn,
-            position.lineNumber,
-            varWord.endColumn
-        ));
-    }
-    return {
-        insert,
-        replace,
-        varWord
-    };
-}
-function isEmptyUpToCompletionWord(model, rangeResult) {
-    const startToCompletionWordStart = ( new Range(1, 1, rangeResult.replace.startLineNumber, rangeResult.replace.startColumn));
-    return !!model.getValueInRange(startToCompletionWordStart).match(/^\s*$/);
-}
 let ToolCompletions = class ToolCompletions extends Disposable {
     static {
         ToolCompletions_1 = this;
     }
     static {
-        this.VariableNameDef = ( new RegExp(`(?<=^|\\s)${chatVariableLeader}\\w*`, "g"));
+        this.VariableNameDef = ( new RegExp(
+            `(?<=^|\\s)[${escapeForCharClass(chatVariableLeader)}${escapeForCharClass(chatAgentLeader)}]\\w*`,
+            "g"
+        ));
     }
     constructor(languageFeaturesService, chatWidgetService, chatAgentService) {
         super();
@@ -1320,7 +1373,7 @@ let ToolCompletions = class ToolCompletions extends Disposable {
             hasAccessToAllModels: true
         }, {
             _debugDisplayName: "chatVariables",
-            triggerCharacters: [chatVariableLeader],
+            triggerCharacters: [chatVariableLeader, chatAgentLeader],
             provideCompletionItems: async (model, position, _context, _token) => {
                 const widget = this.chatWidgetService.getWidgetByInputUri(model.uri);
                 if (!widget) {
@@ -1344,6 +1397,8 @@ let ToolCompletions = class ToolCompletions extends Disposable {
                         usedNames.add(part.name);
                     }
                 }
+                const typedLeader = range.varWord?.word?.charAt(0) === chatAgentLeader ? chatAgentLeader : chatVariableLeader;
+                const pattern = range.varWord?.word ? range.varWord.word.toLowerCase().slice(1) : "";
                 const suggestions = [];
                 const iter = widget.input.selectedToolsModel.entriesMap.get();
                 for (const [item, enabled] of iter) {
@@ -1358,19 +1413,26 @@ let ToolCompletions = class ToolCompletions extends Disposable {
                         name = item.referenceName;
                     } else {
                         const source = item.source;
-                        detail = ( localize(7033, "{0}: {1}", source.label, item.displayName));
+                        detail = ( localize(7088, "{0}: {1}", source.label, item.displayName));
                         name = item.toolReferenceName ?? item.displayName;
                         documentation = item.userDescription ?? item.modelDescription;
                     }
                     if (( usedNames.has(name))) {
                         continue;
                     }
-                    const withLeader = `${chatVariableLeader}${name}`;
+                    if (pattern) {
+                        const lowerName = name.toLowerCase();
+                        if (!isPatternInWord(pattern, 0, pattern.length, lowerName, 0, lowerName.length)) {
+                            continue;
+                        }
+                    }
+                    const withLeader = `${typedLeader}${name}`;
                     suggestions.push({
                         label: withLeader,
                         range,
                         detail,
                         documentation,
+                        filterText: `${typedLeader}${name}`,
                         insertText: withLeader + " ",
                         kind: CompletionItemKind.Tool
                     });
@@ -1384,5 +1446,3 @@ let ToolCompletions = class ToolCompletions extends Disposable {
 };
 ToolCompletions = ToolCompletions_1 = ( __decorate([( __param(0, ILanguageFeaturesService)), ( __param(1, IChatWidgetService)), ( __param(2, IChatAgentService))], ToolCompletions));
 ( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(ToolCompletions, LifecyclePhase.Eventually);
-
-export { computeCompletionRanges };

package/vscode/src/vs/workbench/contrib/chat/browser/widget/input/editor/chatInputEditorContrib.js

@@ -350,7 +350,7 @@ let InputEditorDecorations = class InputEditorDecorations extends Disposable {
             };
             const promptHoverMessage = ( new MarkdownString());
             promptHoverMessage.appendText(( localize(
-                7034,
+                7089,
                 "Click to open {0}",
                 this.labelService.getUriLabel(promptSlashCommand.promptPath.uri, {
                     relative: true

package/vscode/src/vs/workbench/contrib/chat/browser/widget/input/editor/chatInputEditorHover.js

@@ -62,7 +62,7 @@ let ChatAgentHoverParticipant = class ChatAgentHoverParticipant {
         return ( new RenderedHoverParts([renderedHoverPart]));
     }
     getAccessibleContent(hoverPart) {
-        return localize(7035, "There is a chat agent hover part here.");
+        return localize(7090, "There is a chat agent hover part here.");
     }
 };
 ChatAgentHoverParticipant = ( __decorate([( __param(1, IInstantiationService)), ( __param(2, IChatWidgetService)), ( __param(3, ICommandService))], ChatAgentHoverParticipant));

package/vscode/src/vs/workbench/contrib/chat/browser/widgetHosts/chatQuick.js

@@ -253,7 +253,7 @@ let QuickChat = class QuickChat extends Disposable {
             disclaimerElement.classList.toggle("hidden", !showDisclaimer);
             if (showDisclaimer) {
                 const renderedMarkdown = disposables.add(this.markdownRendererService.render(( new MarkdownString(( localize(
-                    7081,
+                    7137,
                     "By continuing with {0} Copilot, you agree to {1}'s [Terms]({2}) and [Privacy Statement]({3})",
                     product.defaultChatAgent?.provider?.default?.name ?? "",
                     product.defaultChatAgent?.provider?.default?.name ?? "",

package/vscode/src/vs/workbench/contrib/chat/browser/widgetHosts/editor/chatEditor.js

@@ -174,7 +174,7 @@ let ChatEditor = class ChatEditor extends AbstractEditorWithViewState {
         let isContributedChatSession = false;
         const chatSessionType = input.getSessionType();
         if (chatSessionType !== localChatSessionType) {
-            const loadingMessage = ( localize(7082, "Loading..."));
+            const loadingMessage = ( localize(7138, "Loading..."));
             this.showLoadingInChatWidget(loadingMessage);
         }
         await super.setInput(input, options, context, token);

package/vscode/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/chatViewPane.d.ts

@@ -58,6 +58,7 @@ export declare class ChatViewPane extends ViewPane implements IViewWelcomeDelega
     private restoringSession;
     private readonly loadSessionCts;
     private readonly modelRef;
+    private readonly _previousModelRef;
     private readonly activityBadge;
     constructor(options: IViewPaneOptions, keybindingService: IKeybindingService, contextMenuService: IContextMenuService, configurationService: IConfigurationService, contextKeyService: IContextKeyService, viewDescriptorService: IViewDescriptorService, instantiationService: IInstantiationService, openerService: IOpenerService, themeService: IThemeService, hoverService: IHoverService, storageService: IStorageService, chatService: IChatService, chatAgentService: IChatAgentService, logService: ILogService, notificationService: INotificationService, layoutService: IWorkbenchLayoutService, chatSessionsService: IChatSessionsService, telemetryService: ITelemetryService, lifecycleService: ILifecycleService, progressService: IProgressService, agentSessionsService: IAgentSessionsService, chatEntitlementService: IChatEntitlementService, commandService: ICommandService, activityService: IActivityService, workbenchEnvironmentService: IWorkbenchEnvironmentService, hostService: IHostService);
     private updateContextKeys;

package/vscode/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/chatViewPane.js

@@ -143,6 +143,7 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
         this.lastDimensionsPerOrientation = ( new Map());
         this.loadSessionCts = this._register(( new MutableDisposable()));
         this.modelRef = this._register(( new MutableDisposable()));
+        this._previousModelRef = this._register(( new MutableDisposable()));
         this.activityBadge = this._register(( new MutableDisposable()));
         this.sessionsViewerOrientation = AgentSessionsViewerOrientation.Stacked;
         this.sessionsViewerOrientationConfiguration = "sideBySide";
@@ -315,7 +316,7 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
         const sessionsContainer = this.sessionsContainer = parent.appendChild($(".agent-sessions-container"));
         const sessionsTitleContainer = this.sessionsTitleContainer = append(sessionsContainer, $(".agent-sessions-title-container"));
         const sessionsTitle = this.sessionsTitle = append(sessionsTitleContainer, $("span.agent-sessions-title"));
-        sessionsTitle.textContent = ( localize(7101, "Sessions"));
+        sessionsTitle.textContent = ( localize(7157, "Sessions"));
         this._register(addDisposableListener(sessionsTitle, EventType.CLICK, () => {
             this.sessionsControl?.scrollToTop();
             this.sessionsControl?.focus();
@@ -343,7 +344,7 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
             ...defaultButtonStyles,
             secondary: true
         })));
-        newSessionButton.label = ( localize(7102, "New Session"));
+        newSessionButton.label = ( localize(7158, "New Session"));
         this._register(
             newSessionButton.onDidClick(() => this.commandService.executeCommand(ACTION_ID_NEW_CHAT))
         );
@@ -583,7 +584,7 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
                 progressBadgeDisposables.value.add(autorun(reader => {
                     if (model.requestInProgress.read(reader)) {
                         this.activityBadge.value = this.activityService.showViewActivity(this.id, {
-                            badge: ( new ProgressBadge(() => ( localize(7103, "Agent Session in Progress"))))
+                            badge: ( new ProgressBadge(() => ( localize(7159, "Agent Session in Progress"))))
                         });
                     } else {
                         this.activityBadge.clear();
@@ -621,6 +622,7 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
     }
     async showModel(token, modelRef, startNewSession = true) {
         const oldModelResource = this.modelRef.value?.object.sessionResource;
+        this._previousModelRef.value = this.modelRef.value;
         this.modelRef.value = undefined;
         let ref;
         if (startNewSession) {
@@ -635,6 +637,9 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
         }
         this.modelRef.value = ref;
         const model = ref?.object;
+        if (model && this._previousModelRef.value?.object.sessionResource.toString() === ( model.sessionResource.toString())) {
+            this._previousModelRef.value = undefined;
+        }
         if (model) {
             await this.updateWidgetLockState(getChatSessionType(model.sessionResource));
             if (token.isCancellationRequested) {
@@ -720,7 +725,7 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
                     return undefined;
                 }
                 this.logService.error(`Failed to load chat session '${( sessionResource.toString())}'`, err);
-                this.notificationService.error(( localize(7104, "Failed to open chat session: {0}", toErrorMessage(err))));
+                this.notificationService.error(( localize(7160, "Failed to open chat session: {0}", toErrorMessage(err))));
                 return this.showModel(token, undefined);
             } finally {
                 clearWidgetCancellationListener.dispose();
@@ -764,15 +769,17 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
             width
         };
         let remainingHeight = height;
-        let remainingWidth = width;
+        const remainingWidth = width;
+        const titleHeight = this.titleControl?.getHeight() ?? 0;
+        remainingHeight -= titleHeight;
         const {
             heightReduction,
             widthReduction
         } = this.layoutSessionsControl(remainingHeight, remainingWidth);
-        remainingHeight -= heightReduction;
-        remainingWidth -= widthReduction;
-        remainingHeight -= this.titleControl?.getHeight() ?? 0;
-        this._widget.layout(remainingHeight, remainingWidth);
+        this._widget.setInputPartMaxHeightOverride(
+            this.sessionsViewerOrientation === AgentSessionsViewerOrientation.Stacked ? remainingHeight : undefined
+        );
+        this._widget.layout(remainingHeight - heightReduction, remainingWidth - widthReduction);
         this.lastDimensionsPerOrientation.set(this.sessionsViewerOrientation, {
             height,
             width

package/vscode/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/chatViewTitleControl.js

@@ -23,7 +23,7 @@ let ChatViewTitleControl = class ChatViewTitleControl extends Disposable {
         ChatViewTitleControl_1 = this;
     }
     static {
-        this.DEFAULT_TITLE = ( localize(7105, "Chat"));
+        this.DEFAULT_TITLE = ( localize(7161, "Chat"));
     }
     static {
         this.PICK_AGENT_SESSION_ACTION_ID = "workbench.action.chat.pickAgentSession";
@@ -48,7 +48,7 @@ let ChatViewTitleControl = class ChatViewTitleControl extends Disposable {
             constructor() {
                 super({
                     id: ChatViewTitleControl_1.PICK_AGENT_SESSION_ACTION_ID,
-                    title: ( localize(7106, "Pick Agent Session")),
+                    title: ( localize(7162, "Pick Agent Session")),
                     f1: false,
                     menu: [{
                         id: MenuId.ChatViewSessionTitleNavigationToolbar,

package/vscode/src/vs/workbench/contrib/chat/common/chatArtifactExtraction.d.ts

@@ -0,0 +1,8 @@
+import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
+import { IResponse } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel";
+import { IArtifactGroupConfig, IChatArtifact } from "./tools/chatArtifactsService.js";
+/**
+ * Extracts artifacts from a single response's content parts, applying the given rules.
+ * Pure function, no side effects.
+ */
+export declare function extractArtifactsFromResponse(response: IResponse, sessionResource: URI, byMimeType: Record<string, IArtifactGroupConfig>, byFilePath: Record<string, IArtifactGroupConfig>): IChatArtifact[];