@codingame/monaco-vscode-api 9.0.2 → 10.0.0

package/vscode/src/vs/workbench/contrib/chat/browser/media/chatInlineAnchorWidget.css.js

@@ -0,0 +1,4 @@
+import n from '../../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
+var css = ".chat-inline-anchor-widget{text-wrap:nowrap;border:1px solid var(--vscode-chat-requestBorder,var(--vscode-input-background,transparent));border-radius:4px;margin:0 1px;padding:1px 3px}.interactive-item-container .value .rendered-markdown .chat-inline-anchor-widget{color:inherit}.chat-inline-anchor-widget:hover{background-color:var(--vscode-list-hoverBackground)}.chat-inline-anchor-widget .icon{font-size:90%;line-height:1em;overflow:hidden;vertical-align:middle}.show-file-icons.chat-inline-anchor-widget .icon:before{background-position:50%;background-repeat:no-repeat;background-size:contain;display:inline-block;flex-shrink:0;line-height:100%;margin-bottom:1px;margin-right:3px;overflow:hidden}.chat-inline-anchor-widget .icon-label{text-wrap:wrap}";
+n(css,{});
+export { css, css as default };

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

@@ -8,9 +8,22 @@ function annotateSpecialMarkdownContent(response) {
     for (const item of response) {
         const previousItem = result[result.length - 1];
         if (item.kind === 'inlineReference') {
-            const location = 'uri' in item.inlineReference ? item.inlineReference : { uri: item.inlineReference };
+            const location = 'uri' in item.inlineReference
+                ? item.inlineReference
+                : 'name' in item.inlineReference
+                    ? { kind: 'symbol', symbol: item.inlineReference }
+                    : { uri: item.inlineReference };
             const printUri = ( URI.parse(contentRefUrl)).with({ fragment: JSON.stringify(location) });
-            const markdownText = `[${item.name || basename(location.uri)}](${( printUri.toString())})`;
+            let label = item.name;
+            if (!label) {
+                if (location.kind === 'symbol') {
+                    label = location.symbol.name;
+                }
+                else {
+                    label = basename(location.uri);
+                }
+            }
+            const markdownText = `[${label}](${( printUri.toString())})`;
             if (previousItem?.kind === 'markdownContent') {
                 const merged = appendMarkdownString(previousItem.content, ( new MarkdownString(markdownText)));
                 result[result.length - 1] = { content: merged, kind: 'markdownContent' };
@@ -34,6 +47,13 @@ function annotateSpecialMarkdownContent(response) {
                 result.push({ content: ( new MarkdownString(markdownText)), kind: 'markdownContent' });
             }
         }
+        else if (item.kind === 'codeblockUri') {
+            if (previousItem?.kind === 'markdownContent') {
+                const markdownText = `<vscode_codeblock_uri>${( item.uri.toString())}</vscode_codeblock_uri>`;
+                const merged = appendMarkdownString(previousItem.content, ( new MarkdownString(markdownText)));
+                result[result.length - 1] = { content: merged, kind: 'markdownContent' };
+            }
+        }
         else {
             result.push(item);
         }
@@ -71,6 +91,15 @@ function annotateVulnerabilitiesInText(response) {
     }
     return result;
 }
+function extractCodeblockUrisFromText(text) {
+    const match = /<vscode_codeblock_uri>(.*?)<\/vscode_codeblock_uri>/ms.exec(text);
+    if (match && match[1]) {
+        const result = ( URI.parse(match[1]));
+        const textWithoutResult = text.substring(0, match.index) + text.substring(match.index + match[0].length);
+        return { uri: result, textWithoutResult };
+    }
+    return undefined;
+}
 function extractVulnerabilitiesFromText(text) {
     const vulnerabilities = [];
     let newText = text;
@@ -97,4 +126,4 @@ function extractVulnerabilitiesFromText(text) {
     }
     return { newText, vulnerabilities };
 }
-export { annotateSpecialMarkdownContent, annotateVulnerabilitiesInText, contentRefUrl, extractVulnerabilitiesFromText };
+export { annotateSpecialMarkdownContent, annotateVulnerabilitiesInText, contentRefUrl, extractCodeblockUrisFromText, extractVulnerabilitiesFromText };

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

@@ -3,11 +3,17 @@ import { findLast } from '../../../../base/common/arraysFind.js';
 import { timeout } from '../../../../base/common/async.js';
 import { CancellationToken } from '../../../../base/common/cancellation.js';
 import { Emitter } from '../../../../base/common/event.js';
+import { isMarkdownString } from '../../../../base/common/htmlContent.js';
 import { Iterable } from '../../../../base/common/iterator.js';
 import { toDisposable } from '../../../../base/common/lifecycle.js';
 import { revive } from '../../../../base/common/marshalling.js';
 import { observableValue } from '../../../../base/common/observableInternal/base.js';
+import '../../../../base/common/arrays.js';
+import '../../../../base/common/observableInternal/autorun.js';
+import '../../../../base/common/observableInternal/derived.js';
+import '../../../../base/common/observableInternal/utils.js';
 import { equalsIgnoreCase } from '../../../../base/common/strings.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 import { ExtensionIdentifier } from '../../../../platform/extensions/common/extensions.js';
@@ -15,7 +21,6 @@ import { ILogService } from '../../../../platform/log/common/log.service.js';
 import { IProductService } from '../../../../platform/product/common/productService.service.js';
 import { asJson } from '../../../../platform/request/common/request.js';
 import { IRequestService } from '../../../../platform/request/common/request.service.js';
-import { StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
 import { IStorageService } from '../../../../platform/storage/common/storage.service.js';
 import { CONTEXT_CHAT_ENABLED, CONTEXT_CHAT_PANEL_PARTICIPANT_REGISTERED } from './chatContextKeys.js';
 var ChatAgentNameService_1;
@@ -38,6 +43,12 @@ var ChatAgentLocation;
     }
     ChatAgentLocation.fromRaw = fromRaw;
 })(ChatAgentLocation || (ChatAgentLocation = {})));
+function isChatWelcomeMessageContent(obj) {
+    return obj &&
+        ThemeIcon.isThemeIcon(obj.icon) &&
+        typeof obj.title === 'string' &&
+        isMarkdownString(obj.message);
+}
 let ChatAgentService = class ChatAgentService {
     static { this.AGENT_LEADER = '@'; }
     constructor(contextKeyService) {
@@ -269,9 +280,9 @@ class MergedChatAgent {
         }
         return [];
     }
-    provideWelcomeMessage(location, token) {
+    provideWelcomeMessage(token) {
         if (this.impl.provideWelcomeMessage) {
-            return this.impl.provideWelcomeMessage(location, token);
+            return this.impl.provideWelcomeMessage(token);
         }
         return undefined;
     }
@@ -298,12 +309,12 @@ let ChatAgentNameService = class ChatAgentNameService {
             return;
         }
         this.url = productService.chatParticipantRegistry;
-        const raw = storageService.get(ChatAgentNameService_1.StorageKey, StorageScope.APPLICATION);
+        const raw = storageService.get(ChatAgentNameService_1.StorageKey, -1 );
         try {
             this.registry.set(JSON.parse(raw ?? '{}'), undefined);
         }
         catch (err) {
-            storageService.remove(ChatAgentNameService_1.StorageKey, StorageScope.APPLICATION);
+            storageService.remove(ChatAgentNameService_1.StorageKey, -1 );
         }
         this.refresh();
     }
@@ -327,7 +338,7 @@ let ChatAgentNameService = class ChatAgentNameService {
         }
         const registry = result.restrictedChatParticipants;
         this.registry.set(registry, undefined);
-        this.storageService.store(ChatAgentNameService_1.StorageKey, JSON.stringify(registry), StorageScope.APPLICATION, StorageTarget.MACHINE);
+        this.storageService.store(ChatAgentNameService_1.StorageKey, JSON.stringify(registry), -1 , 1 );
     }
     getAgentNameRestriction(chatAgentData) {
         const nameAllowed = this.checkAgentNameRestriction(chatAgentData.name, chatAgentData).get();
@@ -376,4 +387,4 @@ function reviveSerializedAgent(raw) {
     }
     return revive(agent);
 }
-export { ChatAgentLocation, ChatAgentNameService, ChatAgentService, MergedChatAgent, getFullyQualifiedId, reviveSerializedAgent };
+export { ChatAgentLocation, ChatAgentNameService, ChatAgentService, MergedChatAgent, getFullyQualifiedId, isChatWelcomeMessageContent, reviveSerializedAgent };

package/vscode/src/vs/workbench/contrib/chat/common/chatCodeMapperService.service.js

@@ -0,0 +1,3 @@
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+const ICodeMapperService = ( createDecorator('codeMapperService'));
+export { ICodeMapperService };

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

@@ -11,10 +11,10 @@ import '../../../../platform/theme/common/colors/minimapColors.js';
 import { badgeBackground, badgeForeground } from '../../../../platform/theme/common/colors/miscColors.js';
 import '../../../../platform/theme/common/colors/quickpickColors.js';
 import '../../../../platform/theme/common/colors/searchColors.js';
-registerColor('chat.requestBorder', { dark: ( (new Color( (new RGBA(255, 255, 255, 0.10))))), light: ( (new Color( (new RGBA(0, 0, 0, 0.10))))), hcDark: contrastBorder, hcLight: contrastBorder, }, ( localize(7176, 'The border color of a chat request.')));
-const chatRequestBackground = registerColor('chat.requestBackground', { dark: ( (transparent(editorBackground, 0.62))), light: ( (transparent(editorBackground, 0.62))), hcDark: editorWidgetBackground, hcLight: null }, ( localize(7177, 'The background color of a chat request.')));
-const chatSlashCommandBackground = registerColor('chat.slashCommandBackground', { dark: '#34414b8f', light: '#d2ecff99', hcDark: Color.white, hcLight: badgeBackground }, ( localize(7178, 'The background color of a chat slash command.')));
-const chatSlashCommandForeground = registerColor('chat.slashCommandForeground', { dark: '#40A6FF', light: '#306CA2', hcDark: Color.black, hcLight: badgeForeground }, ( localize(7179, 'The foreground color of a chat slash command.')));
-registerColor('chat.avatarBackground', { dark: '#1f1f1f', light: '#f2f2f2', hcDark: Color.black, hcLight: Color.white, }, ( localize(7180, 'The background color of a chat avatar.')));
-registerColor('chat.avatarForeground', foreground, ( localize(7181, 'The foreground color of a chat avatar.')));
+registerColor('chat.requestBorder', { dark: ( (new Color( (new RGBA(255, 255, 255, 0.10))))), light: ( (new Color( (new RGBA(0, 0, 0, 0.10))))), hcDark: contrastBorder, hcLight: contrastBorder, }, ( localize(7269, 'The border color of a chat request.')));
+const chatRequestBackground = registerColor('chat.requestBackground', { dark: ( (transparent(editorBackground, 0.62))), light: ( (transparent(editorBackground, 0.62))), hcDark: editorWidgetBackground, hcLight: null }, ( localize(7270, 'The background color of a chat request.')));
+const chatSlashCommandBackground = registerColor('chat.slashCommandBackground', { dark: '#34414b8f', light: '#d2ecff99', hcDark: Color.white, hcLight: badgeBackground }, ( localize(7271, 'The background color of a chat slash command.')));
+const chatSlashCommandForeground = registerColor('chat.slashCommandForeground', { dark: '#40A6FF', light: '#306CA2', hcDark: Color.black, hcLight: badgeForeground }, ( localize(7272, 'The foreground color of a chat slash command.')));
+registerColor('chat.avatarBackground', { dark: '#1f1f1f', light: '#f2f2f2', hcDark: Color.black, hcLight: Color.white, }, ( localize(7273, 'The background color of a chat avatar.')));
+registerColor('chat.avatarForeground', foreground, ( localize(7274, 'The foreground color of a chat avatar.')));
 export { chatRequestBackground, chatSlashCommandBackground, chatSlashCommandForeground };

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

@@ -4,62 +4,77 @@ const CONTEXT_RESPONSE_VOTE = ( (new RawContextKey(
  'chatSessionResponseVote',
  '',
  { type: 'string', description: ( localize(
-  7009,
+  7141,
   "When the response has been voted up, is set to 'up'. When voted down, is set to 'down'. Otherwise an empty string."
  )) }
 )));
-const CONTEXT_VOTE_UP_ENABLED = ( (new RawContextKey('chatVoteUpEnabled', false, { type: 'boolean', description: ( localize(7010, "True when the chat vote up action is enabled.")) })));
 const CONTEXT_RESPONSE_DETECTED_AGENT_COMMAND = ( (new RawContextKey(
  'chatSessionResponseDetectedAgentOrCommand',
  false,
- { type: 'boolean', description: ( localize(7011, "When the agent or command was automatically detected")) }
+ { type: 'boolean', description: ( localize(7142, "When the agent or command was automatically detected")) }
 )));
 const CONTEXT_CHAT_RESPONSE_SUPPORT_ISSUE_REPORTING = ( (new RawContextKey(
  'chatResponseSupportsIssueReporting',
  false,
- { type: 'boolean', description: ( localize(7012, "True when the current chat response supports issue reporting.")) }
+ { type: 'boolean', description: ( localize(7143, "True when the current chat response supports issue reporting.")) }
 )));
 const CONTEXT_RESPONSE_FILTERED = ( (new RawContextKey(
  'chatSessionResponseFiltered',
  false,
- { type: 'boolean', description: ( localize(7013, "True when the chat response was filtered out by the server.")) }
+ { type: 'boolean', description: ( localize(7144, "True when the chat response was filtered out by the server.")) }
 )));
 const CONTEXT_RESPONSE_ERROR = ( (new RawContextKey(
  'chatSessionResponseError',
  false,
- { type: 'boolean', description: ( localize(7014, "True when the chat response resulted in an error.")) }
+ { type: 'boolean', description: ( localize(7145, "True when the chat response resulted in an error.")) }
 )));
 const CONTEXT_CHAT_REQUEST_IN_PROGRESS = ( (new RawContextKey(
  'chatSessionRequestInProgress',
  false,
- { type: 'boolean', description: ( localize(7015, "True when the current request is still in progress.")) }
+ { type: 'boolean', description: ( localize(7146, "True when the current request is still in progress.")) }
 )));
-const CONTEXT_RESPONSE = ( (new RawContextKey('chatResponse', false, { type: 'boolean', description: ( localize(7016, "The chat item is a response.")) })));
-const CONTEXT_REQUEST = ( (new RawContextKey('chatRequest', false, { type: 'boolean', description: ( localize(7017, "The chat item is a request")) })));
-const CONTEXT_CHAT_EDIT_APPLIED = ( (new RawContextKey('chatEditApplied', false, { type: 'boolean', description: ( localize(7018, "True when the chat text edits have been applied.")) })));
-const CONTEXT_CHAT_INPUT_HAS_TEXT = ( (new RawContextKey('chatInputHasText', false, { type: 'boolean', description: ( localize(7019, "True when the chat input has text.")) })));
-const CONTEXT_CHAT_INPUT_HAS_FOCUS = ( (new RawContextKey('chatInputHasFocus', false, { type: 'boolean', description: ( localize(7020, "True when the chat input has focus.")) })));
-const CONTEXT_IN_CHAT_INPUT = ( (new RawContextKey('inChatInput', false, { type: 'boolean', description: ( localize(7021, "True when focus is in the chat input, false otherwise.")) })));
-const CONTEXT_IN_CHAT_SESSION = ( (new RawContextKey('inChat', false, { type: 'boolean', description: ( localize(7022, "True when focus is in the chat widget, false otherwise.")) })));
+const CONTEXT_RESPONSE = ( (new RawContextKey('chatResponse', false, { type: 'boolean', description: ( localize(7147, "The chat item is a response.")) })));
+const CONTEXT_REQUEST = ( (new RawContextKey('chatRequest', false, { type: 'boolean', description: ( localize(7148, "The chat item is a request")) })));
+const CONTEXT_ITEM_ID = ( (new RawContextKey('chatItemId', '', { type: 'string', description: ( localize(7149, "The id of the chat item.")) })));
+const CONTEXT_LAST_ITEM_ID = ( (new RawContextKey('chatLastItemId', [], { type: 'string', description: ( localize(7150, "The id of the last chat item.")) })));
+const CONTEXT_CHAT_EDIT_APPLIED = ( (new RawContextKey('chatEditApplied', false, { type: 'boolean', description: ( localize(7151, "True when the chat text edits have been applied.")) })));
+const CONTEXT_CHAT_INPUT_HAS_TEXT = ( (new RawContextKey('chatInputHasText', false, { type: 'boolean', description: ( localize(7152, "True when the chat input has text.")) })));
+const CONTEXT_CHAT_INPUT_HAS_FOCUS = ( (new RawContextKey('chatInputHasFocus', false, { type: 'boolean', description: ( localize(7153, "True when the chat input has focus.")) })));
+const CONTEXT_IN_CHAT_INPUT = ( (new RawContextKey('inChatInput', false, { type: 'boolean', description: ( localize(7154, "True when focus is in the chat input, false otherwise.")) })));
+const CONTEXT_IN_CHAT_SESSION = ( (new RawContextKey('inChat', false, { type: 'boolean', description: ( localize(7155, "True when focus is in the chat widget, false otherwise.")) })));
 const CONTEXT_CHAT_ENABLED = ( (new RawContextKey('chatIsEnabled', false, { type: 'boolean', description: ( localize(
- 7023,
+ 7156,
  "True when chat is enabled because a default chat participant is activated with an implementation."
 )) })));
 const CONTEXT_CHAT_PANEL_PARTICIPANT_REGISTERED = ( (new RawContextKey(
  'chatPanelParticipantRegistered',
  false,
- { type: 'boolean', description: ( localize(7024, "True when a default chat participant is registered for the panel.")) }
+ { type: 'boolean', description: ( localize(7157, "True when a default chat participant is registered for the panel.")) }
 )));
 const CONTEXT_CHAT_EXTENSION_INVALID = ( (new RawContextKey(
  'chatExtensionInvalid',
  false,
  { type: 'boolean', description: ( localize(
-  7025,
+  7158,
   "True when the installed chat extension is invalid and needs to be updated."
  )) }
 )));
 const CONTEXT_CHAT_INPUT_CURSOR_AT_TOP = ( (new RawContextKey('chatCursorAtTop', false)));
 const CONTEXT_CHAT_INPUT_HAS_AGENT = ( (new RawContextKey('chatInputHasAgent', false)));
 const CONTEXT_CHAT_LOCATION = ( (new RawContextKey('chatLocation', undefined)));
-const CONTEXT_IN_QUICK_CHAT = ( (new RawContextKey('quickChatHasFocus', false, { type: 'boolean', description: ( localize(7026, "True when the quick chat UI has focus, false otherwise.")) })));
-export { CONTEXT_CHAT_EDIT_APPLIED, CONTEXT_CHAT_ENABLED, CONTEXT_CHAT_EXTENSION_INVALID, CONTEXT_CHAT_INPUT_CURSOR_AT_TOP, CONTEXT_CHAT_INPUT_HAS_AGENT, CONTEXT_CHAT_INPUT_HAS_FOCUS, CONTEXT_CHAT_INPUT_HAS_TEXT, CONTEXT_CHAT_LOCATION, CONTEXT_CHAT_PANEL_PARTICIPANT_REGISTERED, CONTEXT_CHAT_REQUEST_IN_PROGRESS, CONTEXT_CHAT_RESPONSE_SUPPORT_ISSUE_REPORTING, CONTEXT_IN_CHAT_INPUT, CONTEXT_IN_CHAT_SESSION, CONTEXT_IN_QUICK_CHAT, CONTEXT_REQUEST, CONTEXT_RESPONSE, CONTEXT_RESPONSE_DETECTED_AGENT_COMMAND, CONTEXT_RESPONSE_ERROR, CONTEXT_RESPONSE_FILTERED, CONTEXT_RESPONSE_VOTE, CONTEXT_VOTE_UP_ENABLED };
+const CONTEXT_IN_QUICK_CHAT = ( (new RawContextKey('quickChatHasFocus', false, { type: 'boolean', description: ( localize(7159, "True when the quick chat UI has focus, false otherwise.")) })));
+const CONTEXT_LANGUAGE_MODELS_ARE_USER_SELECTABLE = ( (new RawContextKey(
+ 'chatModelsAreUserSelectable',
+ false,
+ { type: 'boolean', description: ( localize(7160, "True when the chat model can be selected manually by the user.")) }
+)));
+const CONTEXT_PARTICIPANT_SUPPORTS_MODEL_PICKER = ( (new RawContextKey(
+ 'chatParticipantSupportsModelPicker',
+ true,
+ { type: 'boolean', description: ( localize(
+  7161,
+  "True when the current chat participant supports picking the model manually."
+ )) }
+)));
+const CONTEXT_CHAT_EDITING_ENABLED = ( (new RawContextKey('chatEditingEnabled', false)));
+export { CONTEXT_CHAT_EDITING_ENABLED, CONTEXT_CHAT_EDIT_APPLIED, CONTEXT_CHAT_ENABLED, CONTEXT_CHAT_EXTENSION_INVALID, CONTEXT_CHAT_INPUT_CURSOR_AT_TOP, CONTEXT_CHAT_INPUT_HAS_AGENT, CONTEXT_CHAT_INPUT_HAS_FOCUS, CONTEXT_CHAT_INPUT_HAS_TEXT, CONTEXT_CHAT_LOCATION, CONTEXT_CHAT_PANEL_PARTICIPANT_REGISTERED, CONTEXT_CHAT_REQUEST_IN_PROGRESS, CONTEXT_CHAT_RESPONSE_SUPPORT_ISSUE_REPORTING, CONTEXT_IN_CHAT_INPUT, CONTEXT_IN_CHAT_SESSION, CONTEXT_IN_QUICK_CHAT, CONTEXT_ITEM_ID, CONTEXT_LANGUAGE_MODELS_ARE_USER_SELECTABLE, CONTEXT_LAST_ITEM_ID, CONTEXT_PARTICIPANT_SUPPORTS_MODEL_PICKER, CONTEXT_REQUEST, CONTEXT_RESPONSE, CONTEXT_RESPONSE_DETECTED_AGENT_COMMAND, CONTEXT_RESPONSE_ERROR, CONTEXT_RESPONSE_FILTERED, CONTEXT_RESPONSE_VOTE };

package/vscode/src/vs/workbench/contrib/chat/common/chatEditingService.service.js

@@ -0,0 +1,3 @@
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+const IChatEditingService = ( createDecorator('chatEditingService'));
+export { IChatEditingService };

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

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { asArray, firstOrDefault } from '../../../../base/common/arrays.js';
+import { asArray } from '../../../../base/common/arrays.js';
 import { DeferredPromise } from '../../../../base/common/async.js';
 import { Emitter } from '../../../../base/common/event.js';
 import { isMarkdownString, MarkdownString } from '../../../../base/common/htmlContent.js';
@@ -11,13 +11,26 @@ import { URI, isUriComponents } from '../../../../base/common/uri.js';
 import { generateUuid } from '../../../../base/common/uuid.js';
 import { OffsetRange } from '../../../../editor/common/core/offsetRange.js';
 import { localize } from '../../../../nls.js';
-import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { ILogService } from '../../../../platform/log/common/log.service.js';
 import { ChatAgentLocation, reviveSerializedAgent } from './chatAgents.js';
 import { IChatAgentService } from './chatAgents.service.js';
 import { reviveParsedChatRequest, ChatRequestTextPart } from './chatParserTypes.js';
 import { isIUsedContext } from './chatService.js';
-var ChatModel_1, ChatWelcomeMessageModel_1;
+var ChatModel_1;
+function isChatRequestVariableEntry(obj) {
+    const entry = obj;
+    return typeof entry === 'object' &&
+        entry !== null &&
+        typeof entry.id === 'string' &&
+        typeof entry.name === 'string';
+}
+const nonHistoryKinds = ( (new Set(['toolInvocation', 'toolInvocationSerialized'])));
+function isChatProgressHistoryResponseContent(content) {
+    return !( (nonHistoryKinds.has(content.kind)));
+}
+function toChatHistoryContent(content) {
+    return content.filter(isChatProgressHistoryResponseContent);
+}
 class ChatRequestModel {
     static { this.nextId = 0; }
     get session() {
@@ -145,20 +158,21 @@ class Response extends Disposable {
         this._updateRepr();
     }
     _updateRepr(quiet) {
+        const inlineRefToRepr = (part) => 'uri' in part.inlineReference ? basename(part.inlineReference.uri) : 'name' in part.inlineReference ? part.inlineReference.name : basename(part.inlineReference);
         this._responseRepr = ( (this._responseParts.map(part => {
             if (part.kind === 'treeData') {
                 return '';
             }
             else if (part.kind === 'inlineReference') {
-                return basename('uri' in part.inlineReference ? part.inlineReference.uri : part.inlineReference);
+                return inlineRefToRepr(part);
             }
             else if (part.kind === 'command') {
                 return part.command.title;
             }
             else if (part.kind === 'textEditGroup') {
-                return ( localize(7027, "Made changes."));
+                return ( localize(7199, "Made changes."));
             }
-            else if (part.kind === 'progressMessage') {
+            else if (part.kind === 'progressMessage' || part.kind === 'codeblockUri' || part.kind === 'toolInvocation' || part.kind === 'toolInvocationSerialized') {
                 return '';
             }
             else if (part.kind === 'confirmation') {
@@ -173,7 +187,7 @@ class Response extends Disposable {
         this._responseRepr += this._citations.length ? '\n\n' + getCodeCitationsMessage(this._citations) : '';
         this._markdownContent = ( (this._responseParts.map(part => {
             if (part.kind === 'inlineReference') {
-                return basename('uri' in part.inlineReference ? part.inlineReference.uri : part.inlineReference);
+                return inlineRefToRepr(part);
             }
             else if (part.kind === 'markdownContent' || part.kind === 'markdownVuln') {
                 return part.content.value;
@@ -384,12 +398,6 @@ function isSerializableSessionData(obj) {
         typeof data.sessionId === 'string' &&
         obj.requests.every((request) => !request.usedContext  || isIUsedContext(request.usedContext));
 }
-var ChatRequestRemovalReason;
-( ((function(ChatRequestRemovalReason) {
-    ChatRequestRemovalReason[ChatRequestRemovalReason["Removal"] = 0] = "Removal";
-    ChatRequestRemovalReason[ChatRequestRemovalReason["Resend"] = 1] = "Resend";
-    ChatRequestRemovalReason[ChatRequestRemovalReason["Adoption"] = 2] = "Adoption";
-})(ChatRequestRemovalReason || (ChatRequestRemovalReason = {}))));
 var ChatModelInitState;
 ( ((function(ChatModelInitState) {
     ChatModelInitState[ChatModelInitState["Created"] = 0] = "Created";
@@ -398,7 +406,7 @@ var ChatModelInitState;
 })(ChatModelInitState || (ChatModelInitState = {}))));
 let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
     static getDefaultTitle(requests) {
-        const firstRequestMessage = firstOrDefault(requests)?.message ?? '';
+        const firstRequestMessage = requests.at(0)?.message ?? '';
         const message = typeof firstRequestMessage === 'string' ?
             firstRequestMessage :
             firstRequestMessage.text;
@@ -407,6 +415,9 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
     get welcomeMessage() {
         return this._welcomeMessage;
     }
+    get sampleQuestions() {
+        return this._sampleQuestions;
+    }
     get sessionId() {
         return this._sessionId;
     }
@@ -430,23 +441,19 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
         return this.chatAgentService.getDefaultAgent(ChatAgentLocation.Panel);
     }
     get requesterUsername() {
-        return (this._defaultAgent ?
-            this._defaultAgent.metadata.requester?.name :
-            this.initialData?.requesterUsername) ?? '';
+        return this._defaultAgent?.metadata.requester?.name ??
+            this.initialData?.requesterUsername ?? '';
     }
     get responderUsername() {
-        return (this._defaultAgent ?
-            this._defaultAgent.fullName :
-            this.initialData?.responderUsername) ?? '';
+        return this._defaultAgent?.fullName ??
+            this.initialData?.responderUsername ?? '';
     }
     get requesterAvatarIconUri() {
-        return this._defaultAgent ?
-            this._defaultAgent.metadata.requester?.icon :
+        return this._defaultAgent?.metadata.requester?.icon ??
             this._initialRequesterAvatarIconUri;
     }
     get responderAvatarIcon() {
-        return this._defaultAgent ?
-            this._defaultAgent?.metadata.themeIcon :
+        return this._defaultAgent?.metadata.themeIcon ??
             this._initialResponderAvatarIconUri;
     }
     get initState() {
@@ -464,13 +471,12 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
     get initialLocation() {
         return this._initialLocation;
     }
-    constructor(initialData, _initialLocation, logService, chatAgentService, instantiationService) {
+    constructor(initialData, _initialLocation, logService, chatAgentService) {
         super();
         this.initialData = initialData;
         this._initialLocation = _initialLocation;
         this.logService = logService;
         this.chatAgentService = chatAgentService;
-        this.instantiationService = instantiationService;
         this._onDidDispose = this._register(( (new Emitter())));
         this.onDidDispose = this._onDidDispose.event;
         this._onDidChange = this._register(( (new Emitter())));
@@ -493,12 +499,6 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
             this.logService.error(`Ignoring malformed session data: ${JSON.stringify(obj)}`);
             return [];
         }
-        if (obj.welcomeMessage) {
-            const content = ( (obj.welcomeMessage.map(
-                item => typeof item === 'string' ? ( (new MarkdownString(item))) : item
-            )));
-            this._welcomeMessage = this.instantiationService.createInstance(ChatWelcomeMessageModel, content, []);
-        }
         try {
             return (
                  (requests.map((raw) => {
@@ -584,16 +584,15 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
         this._initState = ChatModelInitState.Created;
         this._isInitializedDeferred = ( (new DeferredPromise()));
     }
-    initialize(welcomeMessage) {
+    initialize(welcomeMessage, sampleQuestions) {
         if (this.initState !== ChatModelInitState.Initializing) {
             throw ( (new Error(
                 `ChatModel is in the wrong state for initialize: ${ChatModelInitState[this.initState]}`
             )));
         }
         this._initState = ChatModelInitState.Initialized;
-        if (!this._welcomeMessage) {
-            this._welcomeMessage = welcomeMessage;
-        }
+        this._welcomeMessage = welcomeMessage;
+        this._sampleQuestions = sampleQuestions;
         this._isInitializedDeferred.complete();
         this._onDidChange.fire({ kind: 'initialize' });
     }
@@ -646,7 +645,7 @@ 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 });
+        oldOwner._onDidChange.fire({ kind: 'removeRequest', requestId: request.id, responseId: request.response?.id, reason: 2  });
         this._onDidChange.fire({ kind: 'addRequest', request });
     }
     acceptResponseProgress(request, progress, quiet) {
@@ -659,13 +658,15 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
         if (progress.kind === 'markdownContent' ||
             progress.kind === 'treeData' ||
             progress.kind === 'inlineReference' ||
+            progress.kind === 'codeblockUri' ||
             progress.kind === 'markdownVuln' ||
             progress.kind === 'progressMessage' ||
             progress.kind === 'command' ||
             progress.kind === 'textEdit' ||
             progress.kind === 'warning' ||
             progress.kind === 'progressTask' ||
-            progress.kind === 'confirmation') {
+            progress.kind === 'confirmation' ||
+            progress.kind === 'toolInvocation') {
             request.response.updateContent(progress, quiet);
         }
         else if (progress.kind === 'usedContext' || progress.kind === 'reference') {
@@ -688,7 +689,7 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
             this.logService.error(`Couldn't handle progress: ${JSON.stringify(progress)}`);
         }
     }
-    removeRequest(id, reason = ChatRequestRemovalReason.Removal) {
+    removeRequest(id, reason = 0 ) {
         const index = this._requests.findIndex(request => request.id === id);
         const request = this._requests[index];
         if (index !== -1) {
@@ -731,14 +732,6 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
             responderUsername: this.responderUsername,
             responderAvatarIconUri: this.responderAvatarIcon,
             initialLocation: this.initialLocation,
-            welcomeMessage: this._welcomeMessage?.content.map(c => {
-                if (Array.isArray(c)) {
-                    return c;
-                }
-                else {
-                    return c.value;
-                }
-            }),
             requests: ( (this._requests.map((r) => {
                 const message = {
                     ...r.message,
@@ -796,31 +789,8 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
 };
 ChatModel = ChatModel_1 = ( (__decorate([
     ( (__param(2, ILogService))),
-    ( (__param(3, IChatAgentService))),
-    ( (__param(4, IInstantiationService)))
+    ( (__param(3, IChatAgentService)))
 ], ChatModel)));
-let ChatWelcomeMessageModel = class ChatWelcomeMessageModel {
-    static { ChatWelcomeMessageModel_1 = this; }
-    static { this.nextId = 0; }
-    get id() {
-        return this._id;
-    }
-    constructor(content, sampleQuestions, chatAgentService) {
-        this.content = content;
-        this.sampleQuestions = sampleQuestions;
-        this.chatAgentService = chatAgentService;
-        this._id = 'welcome_' + ChatWelcomeMessageModel_1.nextId++;
-    }
-    get username() {
-        return this.chatAgentService.getContributedDefaultAgent(ChatAgentLocation.Panel)?.fullName ?? '';
-    }
-    get avatarIcon() {
-        return this.chatAgentService.getDefaultAgent(ChatAgentLocation.Panel)?.metadata.themeIcon;
-    }
-};
-ChatWelcomeMessageModel = ChatWelcomeMessageModel_1 = ( (__decorate([
-    ( (__param(2, IChatAgentService)))
-], ChatWelcomeMessageModel)));
 function updateRanges(variableData, diff) {
     return {
         variables: ( (variableData.variables.map(v => ({
@@ -866,8 +836,8 @@ function getCodeCitationsMessage(citations) {
     }
     const licenseTypes = citations.reduce((set, c) => set.add(c.license), ( (new Set())));
     const label = licenseTypes.size === 1 ?
-        ( localize(7028, "Similar code found with 1 license type", licenseTypes.size)) :
-        ( localize(7029, "Similar code found with {0} license types", licenseTypes.size));
+        ( localize(7200, "Similar code found with 1 license type", licenseTypes.size)) :
+        ( localize(7201, "Similar code found with {0} license types", licenseTypes.size));
     return label;
 }
-export { ChatModel, ChatModelInitState, ChatRequestModel, ChatRequestRemovalReason, ChatResponseModel, ChatWelcomeMessageModel, Response, appendMarkdownString, canMergeMarkdownStrings, getCodeCitationsMessage, isExportableSessionData, isSerializableSessionData, normalizeSerializableChatData, updateRanges };
+export { ChatModel, ChatModelInitState, ChatRequestModel, ChatResponseModel, Response, appendMarkdownString, canMergeMarkdownStrings, getCodeCitationsMessage, isChatRequestVariableEntry, isExportableSessionData, isSerializableSessionData, normalizeSerializableChatData, toChatHistoryContent, updateRanges };

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

@@ -41,11 +41,13 @@ class ChatRequestVariablePart {
 }
 class ChatRequestToolPart {
     static { this.Kind = 'tool'; }
-    constructor(range, editorRange, toolName, toolId) {
+    constructor(range, editorRange, toolName, toolId, displayName, icon) {
         this.range = range;
         this.editorRange = editorRange;
         this.toolName = toolName;
         this.toolId = toolId;
+        this.displayName = displayName;
+        this.icon = icon;
         this.kind = ChatRequestToolPart.Kind;
     }
     get text() {
@@ -102,13 +104,15 @@ class ChatRequestSlashCommandPart {
 }
 class ChatRequestDynamicVariablePart {
     static { this.Kind = 'dynamic'; }
-    constructor(range, editorRange, text, id, modelDescription, data) {
+    constructor(range, editorRange, text, id, modelDescription, data, fullName, icon) {
         this.range = range;
         this.editorRange = editorRange;
         this.text = text;
         this.id = id;
         this.modelDescription = modelDescription;
         this.data = data;
+        this.fullName = fullName;
+        this.icon = icon;
         this.kind = ChatRequestDynamicVariablePart.Kind;
     }
     get referenceText() {
@@ -129,7 +133,7 @@ function reviveParsedChatRequest(serialized) {
                 return ( new ChatRequestVariablePart(( new OffsetRange(part.range.start, part.range.endExclusive)), part.editorRange, part.variableName, part.variableArg, part.variableId || ''));
             }
             else if (part.kind === ChatRequestToolPart.Kind) {
-                return ( new ChatRequestToolPart(( new OffsetRange(part.range.start, part.range.endExclusive)), part.editorRange, part.toolName, part.toolId));
+                return ( new ChatRequestToolPart(( new OffsetRange(part.range.start, part.range.endExclusive)), part.editorRange, part.toolName, part.toolId, part.displayName, part.icon));
             }
             else if (part.kind === ChatRequestAgentPart.Kind) {
                 let agent = part.agent;
@@ -143,7 +147,7 @@ function reviveParsedChatRequest(serialized) {
                 return ( new ChatRequestSlashCommandPart(( new OffsetRange(part.range.start, part.range.endExclusive)), part.editorRange, part.slashCommand));
             }
             else if (part.kind === ChatRequestDynamicVariablePart.Kind) {
-                return ( new ChatRequestDynamicVariablePart(( new OffsetRange(part.range.start, part.range.endExclusive)), part.editorRange, part.text, part.id, part.modelDescription, revive(part.data)));
+                return ( new ChatRequestDynamicVariablePart(( new OffsetRange(part.range.start, part.range.endExclusive)), part.editorRange, part.text, part.id, part.modelDescription, revive(part.data), part.fullName, part.icon));
             }
             else {
                 throw ( new Error(`Unknown chat request part: ${part.kind}`));

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

@@ -143,7 +143,7 @@ let ChatRequestParser = class ChatRequestParser {
         }
         const tool = this.toolsService.getToolByName(name);
         if (tool && tool.canBeInvokedManually && (!usedAgent || usedAgent.agent.supportsToolReferences)) {
-            return ( new ChatRequestToolPart(varRange, varEditorRange, name, tool.id));
+            return ( new ChatRequestToolPart(varRange, varEditorRange, name, tool.id, tool.displayName, tool.icon));
         }
         return;
     }
@@ -210,7 +210,9 @@ let ChatRequestParser = class ChatRequestParser {
                 text,
                 refAtThisPosition.id,
                 refAtThisPosition.modelDescription,
-                refAtThisPosition.data
+                refAtThisPosition.data,
+                refAtThisPosition.fullName,
+                refAtThisPosition.icon
             ));
         }
         return;