@codingame/monaco-vscode-chat-service-override 17.2.1 → 18.0.0

package/vscode/src/vs/workbench/contrib/chat/common/tools/languageModelToolsContribution.js

@@ -1,21 +1,25 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { isFalsyOrEmpty } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
 import { MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
-import { DisposableMap, Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { DisposableMap, DisposableStore, Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { joinPath } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+import { isFalsyOrWhitespace } from '@codingame/monaco-vscode-api/vscode/vs/base/common/strings';
 import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { ExtensionIdentifier } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensions/common/extensions';
 import { SyncDescriptor } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/descriptors';
-import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import { IProductService } from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service';
 import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
 import { Extensions } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensionManagement/common/extensionFeatures';
 import { isProposedApiEnabled } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions';
 import { ExtensionsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensionsRegistry';
+import { ToolDataSource } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService';
 import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service';
 import { toolsParametersSchemaSchemaId } from './languageModelToolsParametersSchema.js';
+import { transaction } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/transaction';
 
 const languageModelToolsExtensionPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'languageModelTools',
@@ -26,7 +30,7 @@ const languageModelToolsExtensionPoint = ExtensionsRegistry.registerExtensionPoi
     },
     jsonSchema: {
         description: ( localize(
-            5093,
+            5203,
             'Contributes a tool that can be invoked by a language model in a chat session, or from a standalone command. Registered tools can be used by all extensions.'
         )),
         type: 'array',
@@ -52,7 +56,7 @@ const languageModelToolsExtensionPoint = ExtensionsRegistry.registerExtensionPoi
             properties: {
                 name: {
                     description: ( localize(
-                        5094,
+                        5204,
                         "A unique name for this tool. This name must be a globally unique identifier, and is also used as a name when presenting this tool to a language model."
                     )),
                     type: 'string',
@@ -60,7 +64,7 @@ const languageModelToolsExtensionPoint = ExtensionsRegistry.registerExtensionPoi
                 },
                 toolReferenceName: {
                     markdownDescription: ( localize(
-                        5095,
+                        5205,
                         "If {0} is enabled for this tool, the user may use '#' with this name to invoke the tool in a query. Otherwise, the name is not required. Name must not contain whitespace.",
                         '`canBeReferencedInPrompt`'
                     )),
@@ -69,32 +73,32 @@ const languageModelToolsExtensionPoint = ExtensionsRegistry.registerExtensionPoi
                 },
                 displayName: {
                     description: ( localize(
-                        5096,
+                        5206,
                         "A human-readable name for this tool that may be used to describe it in the UI."
                     )),
                     type: 'string'
                 },
                 userDescription: {
-                    description: ( localize(5097, "A description of this tool that may be shown to the user.")),
+                    description: ( localize(5207, "A description of this tool that may be shown to the user.")),
                     type: 'string'
                 },
                 modelDescription: {
                     description: ( localize(
-                        5098,
+                        5208,
                         "A description of this tool that may be used by a language model to select it."
                     )),
                     type: 'string'
                 },
                 inputSchema: {
                     description: ( localize(
-                        5099,
+                        5209,
                         "A JSON schema for the input this tool accepts. The input must be an object at the top level. A particular language model may not support all JSON schema features. See the documentation for the language model family you are using for more information."
                     )),
                     $ref: toolsParametersSchemaSchemaId
                 },
                 canBeReferencedInPrompt: {
                     markdownDescription: ( localize(
-                        5100,
+                        5210,
                         "If true, this tool shows up as an attachment that the user can add manually to their request. Chat participants will receive the tool in {0}.",
                         '`ChatRequest#toolReferences`'
                     )),
@@ -102,7 +106,7 @@ const languageModelToolsExtensionPoint = ExtensionsRegistry.registerExtensionPoi
                 },
                 icon: {
                     markdownDescription: ( localize(
-                        5101,
+                        5211,
                         "An icon that represents this tool. Either a file path, an object with file paths for dark and light themes, or a theme icon reference, like `$(zap)`"
                     )),
                     anyOf: [{
@@ -112,11 +116,11 @@ const languageModelToolsExtensionPoint = ExtensionsRegistry.registerExtensionPoi
                             type: 'object',
                             properties: {
                                 light: {
-                                    description: ( localize(5102, 'Icon path when a light theme is used')),
+                                    description: ( localize(5212, 'Icon path when a light theme is used')),
                                     type: 'string'
                                 },
                                 dark: {
-                                    description: ( localize(5103, 'Icon path when a dark theme is used')),
+                                    description: ( localize(5213, 'Icon path when a dark theme is used')),
                                     type: 'string'
                                 }
                             }
@@ -124,14 +128,14 @@ const languageModelToolsExtensionPoint = ExtensionsRegistry.registerExtensionPoi
                 },
                 when: {
                     markdownDescription: ( localize(
-                        5104,
+                        5214,
                         "Condition which must be true for this tool to be enabled. Note that a tool may still be invoked by another extension even when its `when` condition is false."
                     )),
                     type: 'string'
                 },
                 tags: {
                     description: ( localize(
-                        5105,
+                        5215,
                         "A set of tags that roughly describe the tool's capabilities. A tool user may use these to filter the set of tools to just ones that are relevant for the task at hand, or they may want to pick a tag that can be used to identify just the tools contributed by this extension."
                     )),
                     type: 'array',
@@ -144,34 +148,89 @@ const languageModelToolsExtensionPoint = ExtensionsRegistry.registerExtensionPoi
         }
     }
 });
+const languageModelToolSetsExtensionPoint = ExtensionsRegistry.registerExtensionPoint({
+    extensionPoint: 'languageModelToolSets',
+    deps: [languageModelToolsExtensionPoint],
+    jsonSchema: {
+        description: ( localize(
+            5216,
+            'Contributes a set of language model tools that can be used together.'
+        )),
+        type: 'array',
+        items: {
+            additionalProperties: false,
+            type: 'object',
+            defaultSnippets: [{
+                    body: {
+                        name: '${1}',
+                        description: '${2}',
+                        tools: ['${3}']
+                    }
+                }],
+            required: ['name', 'description', 'tools'],
+            properties: {
+                name: {
+                    description: ( localize(
+                        5217,
+                        "A name for this tool set. Used as reference and should not contain whitespace."
+                    )),
+                    type: 'string',
+                    pattern: '^[\\w-]+$'
+                },
+                description: {
+                    description: ( localize(5218, "A description of this tool set.")),
+                    type: 'string'
+                },
+                icon: {
+                    markdownDescription: ( localize(5219, "An icon that represents this tool set, like `$(zap)`")),
+                    type: 'string'
+                },
+                tools: {
+                    markdownDescription: ( localize(
+                        5220,
+                        "A list of tools or tool sets to include in this tool set. Cannot be empty and must reference tools by their `toolReferenceName`."
+                    )),
+                    type: 'array',
+                    minItems: 1,
+                    items: {
+                        type: 'string'
+                    }
+                }
+            }
+        }
+    }
+});
 function toToolKey(extensionIdentifier, toolName) {
     return `${extensionIdentifier.value}/${toolName}`;
 }
+function toToolSetKey(extensionIdentifier, toolName) {
+    return `toolset:${extensionIdentifier.value}/${toolName}`;
+}
 let LanguageModelToolsExtensionPointHandler = class LanguageModelToolsExtensionPointHandler {
     static { this.ID = 'workbench.contrib.toolsExtensionPointHandler'; }
-    constructor(languageModelToolsService, logService, productService) {
+    constructor(productService, languageModelToolsService) {
         this._registrationDisposables = ( new DisposableMap());
-        languageModelToolsExtensionPoint.setHandler((extensions, delta) => {
+        languageModelToolsExtensionPoint.setHandler((_extensions, delta) => {
             for (const extension of delta.added) {
                 for (const rawTool of extension.value) {
                     if (!rawTool.name || !rawTool.modelDescription || !rawTool.displayName) {
-                        logService.error(`Extension '${extension.description.identifier.value}' CANNOT register tool without name, modelDescription, and displayName: ${JSON.stringify(rawTool)}`);
+                        extension.collector.error(`Extension '${extension.description.identifier.value}' CANNOT register tool without name, modelDescription, and displayName: ${JSON.stringify(rawTool)}`);
                         continue;
                     }
                     if (!rawTool.name.match(/^[\w-]+$/)) {
-                        logService.error(`Extension '${extension.description.identifier.value}' CANNOT register tool with invalid id: ${rawTool.name}. The id must match /^[\\w-]+$/.`);
+                        extension.collector.error(`Extension '${extension.description.identifier.value}' CANNOT register tool with invalid id: ${rawTool.name}. The id must match /^[\\w-]+$/.`);
                         continue;
                     }
                     if (rawTool.canBeReferencedInPrompt && !rawTool.toolReferenceName) {
-                        logService.error(`Extension '${extension.description.identifier.value}' CANNOT register tool with 'canBeReferencedInPrompt' set without a 'toolReferenceName': ${JSON.stringify(rawTool)}`);
+                        extension.collector.error(`Extension '${extension.description.identifier.value}' CANNOT register tool with 'canBeReferencedInPrompt' set without a 'toolReferenceName': ${JSON.stringify(rawTool)}`);
                         continue;
                     }
                     if ((rawTool.name.startsWith('copilot_') || rawTool.name.startsWith('vscode_')) && !isProposedApiEnabled(extension.description, 'chatParticipantPrivate')) {
-                        logService.error(`Extension '${extension.description.identifier.value}' CANNOT register tool with name starting with "vscode_" or "copilot_"`);
+                        extension.collector.error(`Extension '${extension.description.identifier.value}' CANNOT register tool with name starting with "vscode_" or "copilot_"`);
                         continue;
                     }
                     if (rawTool.tags?.some(tag => tag.startsWith('copilot_') || tag.startsWith('vscode_')) && !isProposedApiEnabled(extension.description, 'chatParticipantPrivate')) {
-                        logService.error(`Extension '${extension.description.identifier.value}' CANNOT register tool with tags starting with "vscode_" or "copilot_"`);
+                        extension.collector.error(`Extension '${extension.description.identifier.value}' CANNOT register tool with tags starting with "vscode_" or "copilot_"`);
                     }
                     const rawIcon = rawTool.icon;
                     let icon;
@@ -190,18 +249,25 @@ let LanguageModelToolsExtensionPointHandler = class LanguageModelToolsExtensionP
                     const isBuiltinTool = productService.defaultChatAgent?.chatExtensionId ?
                         ExtensionIdentifier.equals(extension.description.identifier, productService.defaultChatAgent.chatExtensionId) :
                         isProposedApiEnabled(extension.description, 'chatParticipantPrivate');
+                    const source = isBuiltinTool
+                        ? ToolDataSource.Internal
+                        : { type: 'extension', label: extension.description.displayName ?? extension.description.name, extensionId: extension.description.identifier };
                     const tool = {
                         ...rawTool,
-                        source: { type: 'extension', label: extension.description.displayName ?? extension.description.name, extensionId: extension.description.identifier, isExternalTool: !isBuiltinTool },
+                        source,
                         inputSchema: rawTool.inputSchema,
                         id: rawTool.name,
                         icon,
                         when: rawTool.when ? ContextKeyExpr.deserialize(rawTool.when) : undefined,
                         alwaysDisplayInputOutput: !isBuiltinTool,
-                        supportsToolPicker: rawTool.canBeReferencedInPrompt
                     };
-                    const disposable = languageModelToolsService.registerToolData(tool);
-                    this._registrationDisposables.set(toToolKey(extension.description.identifier, rawTool.name), disposable);
+                    try {
+                        const disposable = languageModelToolsService.registerToolData(tool);
+                        this._registrationDisposables.set(toToolKey(extension.description.identifier, rawTool.name), disposable);
+                    }
+                    catch (e) {
+                        extension.collector.error(`Failed to register tool '${rawTool.name}': ${e}`);
+                    }
                 }
             }
             for (const extension of delta.removed) {
@@ -210,12 +276,67 @@ let LanguageModelToolsExtensionPointHandler = class LanguageModelToolsExtensionP
                 }
             }
         });
+        languageModelToolSetsExtensionPoint.setHandler((_extensions, delta) => {
+            for (const extension of delta.added) {
+                if (!isProposedApiEnabled(extension.description, 'contribLanguageModelToolSets')) {
+                    extension.collector.error(`Extension '${extension.description.identifier.value}' CANNOT register language model tools because the 'contribLanguageModelToolSets' API proposal is not enabled.`);
+                    continue;
+                }
+                const isBuiltinTool = productService.defaultChatAgent?.chatExtensionId ?
+                    ExtensionIdentifier.equals(extension.description.identifier, productService.defaultChatAgent.chatExtensionId) :
+                    isProposedApiEnabled(extension.description, 'chatParticipantPrivate');
+                const source = isBuiltinTool
+                    ? ToolDataSource.Internal
+                    : { type: 'extension', label: extension.description.displayName ?? extension.description.name, extensionId: extension.description.identifier };
+                for (const toolSet of extension.value) {
+                    if (isFalsyOrWhitespace(toolSet.name)) {
+                        extension.collector.error(`Tool set '${toolSet.name}' CANNOT have an empty name`);
+                        continue;
+                    }
+                    if (isFalsyOrEmpty(toolSet.tools)) {
+                        extension.collector.error(`Tool set '${toolSet.name}' CANNOT have an empty tools array`);
+                        continue;
+                    }
+                    const tools = [];
+                    const toolSets = [];
+                    for (const toolName of toolSet.tools) {
+                        const toolObj = languageModelToolsService.getToolByName(toolName, true);
+                        if (toolObj) {
+                            tools.push(toolObj);
+                            continue;
+                        }
+                        const toolSetObj = languageModelToolsService.getToolSetByName(toolName);
+                        if (toolSetObj) {
+                            toolSets.push(toolSetObj);
+                            continue;
+                        }
+                        extension.collector.warn(`Tool set '${toolSet.name}' CANNOT find tool or tool set by name: ${toolName}`);
+                    }
+                    if (toolSets.length === 0 && tools.length === 0) {
+                        extension.collector.error(`Tool set '${toolSet.name}' CANNOT have an empty tools array (none of the tools were found)`);
+                        continue;
+                    }
+                    const store = ( new DisposableStore());
+                    const obj = languageModelToolsService.createToolSet(source, toToolSetKey(extension.description.identifier, toolSet.name), toolSet.referenceName ?? toolSet.name, { icon: toolSet.icon ? ThemeIcon.fromString(toolSet.icon) : undefined, description: toolSet.description });
+                    transaction(tx => {
+                        store.add(obj);
+                        tools.forEach(tool => store.add(obj.addTool(tool, tx)));
+                        toolSets.forEach(toolSet => store.add(obj.addToolSet(toolSet, tx)));
+                    });
+                    this._registrationDisposables.set(toToolSetKey(extension.description.identifier, toolSet.name), store);
+                }
+            }
+            for (const extension of delta.removed) {
+                for (const toolSet of extension.value) {
+                    this._registrationDisposables.deleteAndDispose(toToolSetKey(extension.description.identifier, toolSet.name));
+                }
+            }
+        });
     }
 };
 LanguageModelToolsExtensionPointHandler = ( __decorate([
-    ( __param(0, ILanguageModelToolsService)),
-    ( __param(1, ILogService)),
-    ( __param(2, IProductService))
+    ( __param(0, IProductService)),
+    ( __param(1, ILanguageModelToolsService))
 ], LanguageModelToolsExtensionPointHandler));
 class LanguageModelToolDataRenderer extends Disposable {
     constructor() {
@@ -231,9 +352,9 @@ class LanguageModelToolDataRenderer extends Disposable {
             return { data: { headers: [], rows: [] }, dispose: () => { } };
         }
         const headers = [
-            ( localize(5106, "Name")),
-            ( localize(5107, "Display Name")),
-            ( localize(5108, "Description")),
+            ( localize(5221, "Name")),
+            ( localize(5222, "Display Name")),
+            ( localize(5223, "Description")),
         ];
         const rows = ( contribs.map(t => {
             return [
@@ -253,11 +374,55 @@ class LanguageModelToolDataRenderer extends Disposable {
 }
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: 'languageModelTools',
-    label: ( localize(5109, "Language Model Tools")),
+    label: ( localize(5224, "Language Model Tools")),
     access: {
         canToggle: false
     },
     renderer: ( new SyncDescriptor(LanguageModelToolDataRenderer)),
 });
+class LanguageModelToolSetDataRenderer extends Disposable {
+    constructor() {
+        super(...arguments);
+        this.type = 'table';
+    }
+    shouldRender(manifest) {
+        return !!manifest.contributes?.languageModelToolSets;
+    }
+    render(manifest) {
+        const contribs = manifest.contributes?.languageModelToolSets ?? [];
+        if (!contribs.length) {
+            return { data: { headers: [], rows: [] }, dispose: () => { } };
+        }
+        const headers = [
+            ( localize(5225, "Name")),
+            ( localize(5226, "Reference Name")),
+            ( localize(5227, "Tools")),
+            ( localize(5228, "Description")),
+        ];
+        const rows = ( contribs.map(t => {
+            return [
+                ( new MarkdownString(`\`${t.name}\``)),
+                t.referenceName ? ( new MarkdownString(`\`#${t.referenceName}\``)) : 'none',
+                t.tools.join(', '),
+                t.description,
+            ];
+        }));
+        return {
+            data: {
+                headers,
+                rows
+            },
+            dispose: () => { }
+        };
+    }
+}
+( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
+    id: 'languageModelToolSets',
+    label: ( localize(5229, "Language Model Tool Sets")),
+    access: {
+        canToggle: false
+    },
+    renderer: ( new SyncDescriptor(LanguageModelToolSetDataRenderer)),
+});
 
 export { LanguageModelToolsExtensionPointHandler };

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

@@ -21,7 +21,7 @@ var PhraseTextType;
 const VoiceChatInProgress = ( new RawContextKey(
     'voiceChatInProgress',
     false,
-    { type: 'boolean', description: ( localize(5110, "A speech-to-text session is in progress for chat.")) }
+    { type: 'boolean', description: ( localize(5230, "A speech-to-text session is in progress for chat.")) }
 ));
 let VoiceChatService = class VoiceChatService extends Disposable {
     static { VoiceChatService_1 = this; }

package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChat.contribution.js

@@ -1,8 +1,8 @@
 
 import { registerEditorContribution, EditorContributionInstantiation } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorExtensions';
 import { registerAction2, MenuRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
-import { InlineChatController2, InlineChatController1, InlineChatController } from '@codingame/monaco-vscode-9f229325-8261-585c-a552-16085958c680-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
-import { KeepSessionAction2, UndoSessionAction2, CloseSessionAction2, RevealWidget, CancelRequestAction, StartSessionAction, CloseAction, ConfigureInlineChatAction, UnstashSessionAction, DiscardHunkAction, RerunAction, MoveToNextHunk, MoveToPreviousHunk, ArrowOutUpAction, ArrowOutDownAction, FocusInlineChat, ViewInChatAction, ToggleDiffForChange, AcceptChanges } from '@codingame/monaco-vscode-42931eb9-e564-530c-bafc-fa23ab43a070-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatActions';
+import { InlineChatController2, InlineChatController1, InlineChatController } from '@codingame/monaco-vscode-6c0f93b9-169c-58c3-a9cb-7d60698eb52c-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
+import { KeepSessionAction2, UndoSessionAction2, CloseSessionAction2, RevealWidget, CancelRequestAction, StartSessionAction, CloseAction, ConfigureInlineChatAction, UnstashSessionAction, DiscardHunkAction, RerunAction, MoveToNextHunk, MoveToPreviousHunk, ArrowOutUpAction, ArrowOutDownAction, FocusInlineChat, ViewInChatAction, ToggleDiffForChange, AcceptChanges } from '@codingame/monaco-vscode-07eaa805-9dea-5ec6-a422-a4f04872424d-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatActions';
 import { INLINE_CHAT_ID, CTX_INLINE_CHAT_REQUEST_IN_PROGRESS, CTX_INLINE_CHAT_EDITING, CTX_INLINE_CHAT_HAS_AGENT, MENU_INLINE_CHAT_WIDGET_STATUS } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
 import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
@@ -11,7 +11,7 @@ import { InlineChatNotebookContribution } from './inlineChatNotebook.js';
 import { Extensions, registerWorkbenchContribution2, WorkbenchPhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
 import { InlineChatAccessibleView } from './inlineChatAccessibleView.js';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
-import { InlineChatEnabler } from '@codingame/monaco-vscode-9f229325-8261-585c-a552-16085958c680-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl';
+import { InlineChatEnabler } from '@codingame/monaco-vscode-6c0f93b9-169c-58c3-a9cb-7d60698eb52c-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl';
 import { AccessibleViewRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/browser/accessibleViewRegistry';
 import { ChatSubmitAction, CancelAction } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/actions/chatExecuteActions';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
@@ -37,7 +37,7 @@ const editActionMenuItem = {
     order: 0,
     command: {
         id: ChatSubmitAction.ID,
-        title: ( localize(7227, "Edit Code")),
+        title: ( localize(7361, "Edit Code")),
     },
     when: ( ContextKeyExpr.and(ChatContextKeys.inputHasText, ( CTX_INLINE_CHAT_REQUEST_IN_PROGRESS.toNegated()), CTX_INLINE_CHAT_EDITING, CTX_INLINE_CHAT_HAS_AGENT)),
 };
@@ -46,7 +46,7 @@ const generateActionMenuItem = {
     order: 0,
     command: {
         id: ChatSubmitAction.ID,
-        title: ( localize(7228, "Generate")),
+        title: ( localize(7362, "Generate")),
     },
     when: ( ContextKeyExpr.and(ChatContextKeys.inputHasText, ( CTX_INLINE_CHAT_REQUEST_IN_PROGRESS.toNegated()), ( CTX_INLINE_CHAT_EDITING.toNegated()), CTX_INLINE_CHAT_HAS_AGENT)),
 };
@@ -57,8 +57,8 @@ const cancelActionMenuItem = {
     order: 0,
     command: {
         id: CancelAction.ID,
-        title: ( localize(7229, "Cancel Request")),
-        shortTitle: ( localize(7230, "Cancel")),
+        title: ( localize(7363, "Cancel Request")),
+        shortTitle: ( localize(7364, "Cancel")),
     },
     when: ( ContextKeyExpr.and(CTX_INLINE_CHAT_REQUEST_IN_PROGRESS)),
 };

package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatAccessibleView.js

@@ -1,5 +1,5 @@
 
-import { InlineChatController } from '@codingame/monaco-vscode-9f229325-8261-585c-a552-16085958c680-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
+import { InlineChatController } from '@codingame/monaco-vscode-6c0f93b9-169c-58c3-a9cb-7d60698eb52c-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
 import { CTX_INLINE_CHAT_FOCUSED, CTX_INLINE_CHAT_RESPONSE_FOCUSED } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
 import { ICodeEditorService } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/codeEditorService.service';
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';

package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatCurrentLine.js

@@ -6,13 +6,13 @@ import { MouseTargetType } from '@codingame/monaco-vscode-api/vscode/vs/editor/b
 import { localize, localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { RawContextKey, ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
-import { InlineChatController } from '@codingame/monaco-vscode-9f229325-8261-585c-a552-16085958c680-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
+import { InlineChatController } from '@codingame/monaco-vscode-6c0f93b9-169c-58c3-a9cb-7d60698eb52c-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
 import { CTX_INLINE_CHAT_VISIBLE, CTX_INLINE_CHAT_HAS_AGENT, ACTION_START, InlineChatConfigKeys } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
 import { EditorAction2 } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorExtensions';
 import { EditOperation } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/editOperation';
 import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
 import { Position } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/position';
-import { AbstractInline1ChatAction } from '@codingame/monaco-vscode-42931eb9-e564-530c-bafc-fa23ab43a070-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatActions';
+import { AbstractInline1ChatAction } from '@codingame/monaco-vscode-07eaa805-9dea-5ec6-a422-a4f04872424d-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatActions';
 import { EditorContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/editorContextKeys';
 import { TrackedRangeStickiness } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
@@ -37,21 +37,31 @@ import { stringValue } from '@codingame/monaco-vscode-api/vscode/vs/base/browser
 import { observableConfigValue } from '@codingame/monaco-vscode-api/vscode/vs/platform/observable/common/platformObservableUtils';
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
-import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/base';
-import { observableFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils';
-import { derivedWithStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/derived';
-import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/autorun';
+import { INSTRUCTIONS_LANGUAGE_ID, PROMPT_LANGUAGE_ID } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/constants';
+import { MODE_FILE_EXTENSION } from '@codingame/monaco-vscode-47472025-cc45-5680-86cd-09ceaba921a1-common/vscode/vs/platform/prompts/common/prompts';
+import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
+import { observableFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableFromEvent';
+import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
+import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
 
 var InlineChatHintsController_1;
 registerCss(inlineChat);
-const CTX_INLINE_CHAT_SHOWING_HINT = ( new RawContextKey('inlineChatShowingHint', false, ( localize(7259, "Whether inline chat shows a contextual hint"))));
+const IGNORED_LANGUAGE_IDS = ( new Set([
+    PLAINTEXT_LANGUAGE_ID,
+    'markdown',
+    'search-result',
+    INSTRUCTIONS_LANGUAGE_ID,
+    PROMPT_LANGUAGE_ID,
+    MODE_FILE_EXTENSION
+]));
+const CTX_INLINE_CHAT_SHOWING_HINT = ( new RawContextKey('inlineChatShowingHint', false, ( localize(7393, "Whether inline chat shows a contextual hint"))));
 const _inlineChatActionId = 'inlineChat.startWithCurrentLine';
 class InlineChatExpandLineAction extends EditorAction2 {
     constructor() {
         super({
             id: _inlineChatActionId,
             category: AbstractInline1ChatAction.category,
-            title: ( localize2(7260, "Start in Editor with Current Line")),
+            title: ( localize2(7394, "Start in Editor with Current Line")),
             f1: true,
             precondition: ( ContextKeyExpr.and(( CTX_INLINE_CHAT_VISIBLE.negate()), CTX_INLINE_CHAT_HAS_AGENT, EditorContextKeys.writable)),
             keybinding: [{
@@ -94,7 +104,7 @@ class ShowInlineChatHintAction extends EditorAction2 {
         super({
             id: 'inlineChat.showHint',
             category: AbstractInline1ChatAction.category,
-            title: ( localize2(7261, "Show Inline Chat Hint")),
+            title: ( localize2(7395, "Show Inline Chat Hint")),
             f1: false,
             precondition: ( ContextKeyExpr.and(( CTX_INLINE_CHAT_VISIBLE.negate()), CTX_INLINE_CHAT_HAS_AGENT, EditorContextKeys.writable)),
         });
@@ -186,7 +196,7 @@ let InlineChatHintsController = class InlineChatHintsController extends Disposab
         const keyObs = observableFromEvent(keybindingService.onDidUpdateKeybindings, _ => keybindingService.lookupKeybinding(ACTION_START)?.getLabel());
         const configHintEmpty = observableConfigValue(InlineChatConfigKeys.LineEmptyHint, false, this._configurationService);
         const configHintNL = observableConfigValue(InlineChatConfigKeys.LineNLHint, false, this._configurationService);
-        const showDataObs = derivedWithStore((r, store) => {
+        const showDataObs = derived((r) => {
             const ghostState = ghostCtrl?.model.read(r)?.state.read(r);
             const textFocus = editorObs.isTextFocused.read(r);
             let position = editorObs.cursorPosition.read(r);
@@ -195,11 +205,11 @@ let InlineChatHintsController = class InlineChatHintsController extends Disposab
             if (ghostState !== undefined || !kb || !position || !model || !textFocus) {
                 return undefined;
             }
-            if (model.getLanguageId() === PLAINTEXT_LANGUAGE_ID || model.getLanguageId() === 'markdown' || model.getLanguageId() === 'search-result') {
+            if (( IGNORED_LANGUAGE_IDS.has(model.getLanguageId()))) {
                 return undefined;
             }
-            const emitter = store.add(( new Emitter()));
-            store.add(model.onDidChangeContent(() => emitter.fire()));
+            const emitter = r.store.add(( new Emitter()));
+            r.store.add(model.onDidChangeContent(() => emitter.fire()));
             observableFromEvent(emitter.event, () => model.getVersionId()).read(r);
             position = model.validatePosition(position);
             const visible = this._visibilityObs.read(r);
@@ -225,15 +235,15 @@ let InlineChatHintsController = class InlineChatHintsController extends Disposab
                 this._ctxShowingHint.reset();
                 return;
             }
-            const agentName = chatAgentService.getDefaultAgent(ChatAgentLocation.Editor)?.name ?? ( localize(7262, "Chat"));
+            const agentName = chatAgentService.getDefaultAgent(ChatAgentLocation.Editor)?.name ?? ( localize(7396, "Chat"));
             const { position, isEol, isWhitespace, kb, model } = showData;
             const inlineClassName = ['a' , 'inline-chat-hint', 'inline-chat-hint-text'];
             let content;
             if (isWhitespace) {
-                content = '\u00a0' + ( localize(7263, "{0} to edit with {1}", kb, agentName));
+                content = '\u00a0' + ( localize(7397, "{0} to edit with {1}", kb, agentName));
             }
             else if (isEol) {
-                content = '\u00a0' + ( localize(7264, "{0} to continue with {1}", kb, agentName));
+                content = '\u00a0' + ( localize(7398, "{0} to continue with {1}", kb, agentName));
             }
             else {
                 content = '\u200a' + kb + '\u200a';
@@ -262,7 +272,7 @@ let InlineChatHintsController = class InlineChatHintsController extends Disposab
             getActions: () => [
                 toAction({
                     id: 'inlineChat.disableHint',
-                    label: ( localize(7265, "Disable Inline Chat Hint")),
+                    label: ( localize(7399, "Disable Inline Chat Hint")),
                     run: async () => {
                         await this._configurationService.updateValue(setting, false);
                     }
@@ -290,7 +300,7 @@ class HideInlineChatHintAction extends EditorAction2 {
     constructor() {
         super({
             id: 'inlineChat.hideHint',
-            title: ( localize2(7266, "Hide Inline Chat Hint")),
+            title: ( localize2(7400, "Hide Inline Chat Hint")),
             precondition: CTX_INLINE_CHAT_SHOWING_HINT,
             keybinding: {
                 weight: KeybindingWeight.EditorContrib - 10,

package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatNotebook.js

@@ -4,7 +4,7 @@ import { illegalState } from '@codingame/monaco-vscode-api/vscode/vs/base/common
 import { DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
 import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
-import { InlineChatController } from '@codingame/monaco-vscode-9f229325-8261-585c-a552-16085958c680-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
+import { InlineChatController } from '@codingame/monaco-vscode-6c0f93b9-169c-58c3-a9cb-7d60698eb52c-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
 import { IInlineChatSessionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatSessionService.service';
 import { INotebookEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/services/notebookEditorService.service';
 import { CellUri } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';

package/vscode/src/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookModifiedCellDecorator.d.ts

@@ -1,6 +1,6 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { CellDiffInfo } from "@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/notebook/browser/diff/notebookDiffViewModel";
-import { INotebookEditor } from "@codingame/monaco-vscode-324f9a6e-6231-5bfc-af17-e147abd2dfd2-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
+import { INotebookEditor } from "@codingame/monaco-vscode-4372ad43-a220-5e78-83e6-95a9cfd64384-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
 export declare class NotebookModifiedCellDecorator extends Disposable {
     private readonly notebookEditor;
     private readonly decorators;

package/vscode/src/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookModifiedCellDecorator.js

@@ -1,7 +1,7 @@
 
 import { Disposable, DisposableStore, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
-import { NotebookOverviewRulerLane } from '@codingame/monaco-vscode-324f9a6e-6231-5bfc-af17-e147abd2dfd2-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { overviewRulerModifiedForeground } from '@codingame/monaco-vscode-bb83fe45-f4c7-5673-b9f1-5c409a63f19c-common/vscode/vs/workbench/contrib/scm/common/quickDiff';
+import { NotebookOverviewRulerLane } from '@codingame/monaco-vscode-4372ad43-a220-5e78-83e6-95a9cfd64384-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { overviewRulerModifiedForeground } from '@codingame/monaco-vscode-f338ac19-278c-5fe1-bec8-b588de04a788-common/vscode/vs/workbench/contrib/scm/common/quickDiff';
 
 class NotebookModifiedCellDecorator extends Disposable {
     constructor(notebookEditor) {