@codingame/monaco-vscode-chat-service-override 18.4.0 → 19.0.0

package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/utils/promptFilesLocator.d.ts

@@ -2,14 +2,15 @@ import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
 import { IWorkspaceContextService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
-import { PromptsType } from "@codingame/monaco-vscode-47472025-cc45-5680-86cd-09ceaba921a1-common/vscode/vs/platform/prompts/common/prompts";
+import { PromptsType } from "@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes";
 import { IWorkbenchEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service";
 import { ISearchService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/search/common/search.service";
 import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
-import { TPromptsStorage } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/types";
+import { TPromptsStorage } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService";
 import { IUserDataProfileService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/userDataProfile/common/userDataProfile.service";
 import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
 export declare class PromptFilesLocator extends Disposable {
     private readonly fileService;
     private readonly configService;
@@ -17,10 +18,15 @@ export declare class PromptFilesLocator extends Disposable {
     private readonly environmentService;
     private readonly searchService;
     private readonly userDataService;
-    constructor(fileService: IFileService, configService: IConfigurationService, workspaceService: IWorkspaceContextService, environmentService: IWorkbenchEnvironmentService, searchService: ISearchService, userDataService: IUserDataProfileService);
+    private readonly logService;
+    constructor(fileService: IFileService, configService: IConfigurationService, workspaceService: IWorkspaceContextService, environmentService: IWorkbenchEnvironmentService, searchService: ISearchService, userDataService: IUserDataProfileService, logService: ILogService);
     listFiles(type: PromptsType, storage: TPromptsStorage, token: CancellationToken): Promise<readonly URI[]>;
     private listFilesInUserData;
-    getFilesUpdatedEvent(type: PromptsType): Event<void>;
+    getCopilotInstructionsFiles(instructionFilePaths: Iterable<string>): Promise<URI[]>;
+    createFilesUpdatedEvent(type: PromptsType): {
+        readonly event: Event<void>;
+        dispose: () => void;
+    };
     getConfigBasedSourceFolders(type: PromptsType): readonly URI[];
     private listFilesInLocal;
     private getLocalParentFolders;
@@ -28,4 +34,4 @@ export declare class PromptFilesLocator extends Disposable {
     private resolveFilesAtLocation;
     private searchFilesInLocation;
 }
-export declare const isValidGlob: (pattern: string) => boolean;
+export declare function isValidGlob(pattern: string): boolean;

package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/utils/promptFilesLocator.js

@@ -1,15 +1,14 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
-import { assert } from '@codingame/monaco-vscode-api/vscode/vs/base/common/assert';
 import { isAbsolute } from '@codingame/monaco-vscode-api/vscode/vs/base/common/path';
 import { ResourceSet } from '@codingame/monaco-vscode-api/vscode/vs/base/common/map';
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
-import { PromptsConfig } from '@codingame/monaco-vscode-47472025-cc45-5680-86cd-09ceaba921a1-common/vscode/vs/platform/prompts/common/config';
-import { basename, dirname, joinPath } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+import { getPromptFileLocationsConfigKey, PromptsConfig } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/config';
+import { joinPath, basename, dirname } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
-import { getPromptFileType, getPromptFileLocationsConfigKey, getPromptFileExtension } from '@codingame/monaco-vscode-47472025-cc45-5680-86cd-09ceaba921a1-common/vscode/vs/platform/prompts/common/prompts';
+import { getPromptFileType, getPromptFileExtension } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/promptFileLocations';
 import { IWorkbenchEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service';
 import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
 import { getExcludes, QueryType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/search/common/search';
@@ -17,10 +16,11 @@ import { ISearchService } from '@codingame/monaco-vscode-api/vscode/vs/workbench
 import { isCancellationError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 import { IUserDataProfileService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/userDataProfile/common/userDataProfile.service';
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
-import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { Disposable, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 
 let PromptFilesLocator = class PromptFilesLocator extends Disposable {
-    constructor(fileService, configService, workspaceService, environmentService, searchService, userDataService) {
+    constructor(fileService, configService, workspaceService, environmentService, searchService, userDataService, logService) {
         super();
         this.fileService = fileService;
         this.configService = configService;
@@ -28,6 +28,7 @@ let PromptFilesLocator = class PromptFilesLocator extends Disposable {
         this.environmentService = environmentService;
         this.searchService = searchService;
         this.userDataService = userDataService;
+        this.logService = logService;
     }
     async listFiles(type, storage, token) {
         if (storage === 'local') {
@@ -41,28 +42,55 @@ let PromptFilesLocator = class PromptFilesLocator extends Disposable {
         const files = await this.resolveFilesAtLocation(this.userDataService.currentProfile.promptsHome, token);
         return files.filter(file => getPromptFileType(file) === type);
     }
-    getFilesUpdatedEvent(type) {
-        const eventEmitter = this._register(( new Emitter()));
+    async getCopilotInstructionsFiles(instructionFilePaths) {
+        const { folders } = this.workspaceService.getWorkspace();
+        const result = [];
+        for (const folder of folders) {
+            for (const instructionFilePath of instructionFilePaths) {
+                const file = joinPath(folder.uri, instructionFilePath);
+                if (await this.fileService.exists(file)) {
+                    result.push(file);
+                }
+            }
+        }
+        return result;
+    }
+    createFilesUpdatedEvent(type) {
+        const disposables = ( new DisposableStore());
+        const eventEmitter = disposables.add(( new Emitter()));
+        const userDataFolder = this.userDataService.currentProfile.promptsHome;
         const key = getPromptFileLocationsConfigKey(type);
-        let parentFolders = ( this.getLocalParentFolders(type).map(folder => folder.parent));
-        this._register(this.configService.onDidChangeConfiguration(e => {
+        let parentFolders = this.getLocalParentFolders(type);
+        const externalFolderWatchers = disposables.add(( new DisposableStore()));
+        const updateExternalFolderWatchers = () => {
+            externalFolderWatchers.clear();
+            for (const folder of parentFolders) {
+                if (!this.workspaceService.getWorkspaceFolder(folder.parent)) {
+                    const recursive = folder.filePattern !== undefined;
+                    externalFolderWatchers.add(this.fileService.watch(folder.parent, { recursive, excludes: [] }));
+                }
+            }
+        };
+        updateExternalFolderWatchers();
+        disposables.add(this.configService.onDidChangeConfiguration(e => {
             if (e.affectsConfiguration(key)) {
-                parentFolders = ( this.getLocalParentFolders(type).map(folder => folder.parent));
+                parentFolders = this.getLocalParentFolders(type);
+                updateExternalFolderWatchers();
                 eventEmitter.fire();
             }
         }));
-        this._register(this.fileService.onDidFilesChange(e => {
-            if (e.affects(this.userDataService.currentProfile.promptsHome)) {
+        disposables.add(this.fileService.onDidFilesChange(e => {
+            if (e.affects(userDataFolder)) {
                 eventEmitter.fire();
                 return;
             }
-            if (( parentFolders.some(folder => e.affects(folder)))) {
+            if (( parentFolders.some(folder => e.affects(folder.parent)))) {
                 eventEmitter.fire();
                 return;
             }
         }));
-        this._register(this.fileService.watch(this.userDataService.currentProfile.promptsHome));
-        return eventEmitter.event;
+        disposables.add(this.fileService.watch(userDataFolder));
+        return { event: eventEmitter.event, dispose: () => disposables.dispose() };
     }
     getConfigBasedSourceFolders(type) {
         const configuredLocations = PromptsConfig.promptSourceFolders(this.configService, type);
@@ -113,23 +141,24 @@ let PromptFilesLocator = class PromptFilesLocator extends Disposable {
         const result = ( new ResourceSet());
         const { folders } = this.workspaceService.getWorkspace();
         for (const configuredLocation of configuredLocations) {
-            if (isAbsolute(configuredLocation)) {
-                const remoteAuthority = this.environmentService.remoteAuthority;
-                if (remoteAuthority) {
-                    result.add(( URI.from(
-                        { scheme: Schemas.vscodeRemote, authority: remoteAuthority, path: configuredLocation }
-                    )));
+            try {
+                if (isAbsolute(configuredLocation)) {
+                    let uri = URI.file(configuredLocation);
+                    const remoteAuthority = this.environmentService.remoteAuthority;
+                    if (remoteAuthority) {
+                        uri = uri.with({ scheme: Schemas.vscodeRemote, authority: remoteAuthority });
+                    }
+                    result.add(uri);
                 }
                 else {
-                    result.add(URI.file(configuredLocation));
+                    for (const workspaceFolder of folders) {
+                        const absolutePath = joinPath(workspaceFolder.uri, configuredLocation);
+                        result.add(absolutePath);
+                    }
                 }
             }
-            else {
-                for (const workspaceFolder of folders) {
-                    const absolutePath = joinPath(workspaceFolder.uri, configuredLocation);
-                    assert(isAbsolute(absolutePath.path), `Provided location must be an absolute path, got '${absolutePath.path}'.`);
-                    result.add(absolutePath);
-                }
+            catch (error) {
+                this.logService.error(`Failed to resolve prompt file location: ${configuredLocation}`, error);
             }
         }
         return [...result];
@@ -187,9 +216,10 @@ PromptFilesLocator = ( __decorate([
     ( __param(2, IWorkspaceContextService)),
     ( __param(3, IWorkbenchEnvironmentService)),
     ( __param(4, ISearchService)),
-    ( __param(5, IUserDataProfileService))
+    ( __param(5, IUserDataProfileService)),
+    ( __param(6, ILogService))
 ], PromptFilesLocator));
-const isValidGlob = (pattern) => {
+function isValidGlob(pattern) {
     let squareBrackets = false;
     let squareBracketsCount = 0;
     let curlyBrackets = false;
@@ -238,8 +268,8 @@ const isValidGlob = (pattern) => {
         return true;
     }
     return false;
-};
-const firstNonGlobParentAndPattern = (location) => {
+}
+function firstNonGlobParentAndPattern(location) {
     const segments = location.path.split('/');
     let i = 0;
     while (i < segments.length && isValidGlob(segments[i]) === false) {
@@ -256,6 +286,6 @@ const firstNonGlobParentAndPattern = (location) => {
         parent,
         filePattern: segments.slice(i).join('/')
     };
-};
+}
 
 export { PromptFilesLocator, isValidGlob };

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

@@ -30,7 +30,7 @@ const languageModelToolsExtensionPoint = ExtensionsRegistry.registerExtensionPoi
     },
     jsonSchema: {
         description: ( localize(
-            5203,
+            5363,
             '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',
@@ -56,7 +56,7 @@ const languageModelToolsExtensionPoint = ExtensionsRegistry.registerExtensionPoi
             properties: {
                 name: {
                     description: ( localize(
-                        5204,
+                        5364,
                         "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',
@@ -64,7 +64,7 @@ const languageModelToolsExtensionPoint = ExtensionsRegistry.registerExtensionPoi
                 },
                 toolReferenceName: {
                     markdownDescription: ( localize(
-                        5205,
+                        5365,
                         "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`'
                     )),
@@ -73,32 +73,32 @@ const languageModelToolsExtensionPoint = ExtensionsRegistry.registerExtensionPoi
                 },
                 displayName: {
                     description: ( localize(
-                        5206,
+                        5366,
                         "A human-readable name for this tool that may be used to describe it in the UI."
                     )),
                     type: 'string'
                 },
                 userDescription: {
-                    description: ( localize(5207, "A description of this tool that may be shown to the user.")),
+                    description: ( localize(5367, "A description of this tool that may be shown to the user.")),
                     type: 'string'
                 },
                 modelDescription: {
                     description: ( localize(
-                        5208,
+                        5368,
                         "A description of this tool that may be used by a language model to select it."
                     )),
                     type: 'string'
                 },
                 inputSchema: {
                     description: ( localize(
-                        5209,
+                        5369,
                         "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(
-                        5210,
+                        5370,
                         "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`'
                     )),
@@ -106,7 +106,7 @@ const languageModelToolsExtensionPoint = ExtensionsRegistry.registerExtensionPoi
                 },
                 icon: {
                     markdownDescription: ( localize(
-                        5211,
+                        5371,
                         "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: [{
@@ -116,11 +116,11 @@ const languageModelToolsExtensionPoint = ExtensionsRegistry.registerExtensionPoi
                             type: 'object',
                             properties: {
                                 light: {
-                                    description: ( localize(5212, 'Icon path when a light theme is used')),
+                                    description: ( localize(5372, 'Icon path when a light theme is used')),
                                     type: 'string'
                                 },
                                 dark: {
-                                    description: ( localize(5213, 'Icon path when a dark theme is used')),
+                                    description: ( localize(5373, 'Icon path when a dark theme is used')),
                                     type: 'string'
                                 }
                             }
@@ -128,14 +128,14 @@ const languageModelToolsExtensionPoint = ExtensionsRegistry.registerExtensionPoi
                 },
                 when: {
                     markdownDescription: ( localize(
-                        5214,
+                        5374,
                         "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(
-                        5215,
+                        5375,
                         "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',
@@ -153,7 +153,7 @@ const languageModelToolSetsExtensionPoint = ExtensionsRegistry.registerExtension
     deps: [languageModelToolsExtensionPoint],
     jsonSchema: {
         description: ( localize(
-            5216,
+            5376,
             'Contributes a set of language model tools that can be used together.'
         )),
         type: 'array',
@@ -171,23 +171,23 @@ const languageModelToolSetsExtensionPoint = ExtensionsRegistry.registerExtension
             properties: {
                 name: {
                     description: ( localize(
-                        5217,
+                        5377,
                         "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.")),
+                    description: ( localize(5378, "A description of this tool set.")),
                     type: 'string'
                 },
                 icon: {
-                    markdownDescription: ( localize(5219, "An icon that represents this tool set, like `$(zap)`")),
+                    markdownDescription: ( localize(5379, "An icon that represents this tool set, like `$(zap)`")),
                     type: 'string'
                 },
                 tools: {
                     markdownDescription: ( localize(
-                        5220,
+                        5380,
                         "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',
@@ -352,9 +352,9 @@ class LanguageModelToolDataRenderer extends Disposable {
             return { data: { headers: [], rows: [] }, dispose: () => { } };
         }
         const headers = [
-            ( localize(5221, "Name")),
-            ( localize(5222, "Display Name")),
-            ( localize(5223, "Description")),
+            ( localize(5381, "Name")),
+            ( localize(5382, "Display Name")),
+            ( localize(5383, "Description")),
         ];
         const rows = ( contribs.map(t => {
             return [
@@ -374,7 +374,7 @@ class LanguageModelToolDataRenderer extends Disposable {
 }
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: 'languageModelTools',
-    label: ( localize(5224, "Language Model Tools")),
+    label: ( localize(5384, "Language Model Tools")),
     access: {
         canToggle: false
     },
@@ -394,10 +394,10 @@ class LanguageModelToolSetDataRenderer extends Disposable {
             return { data: { headers: [], rows: [] }, dispose: () => { } };
         }
         const headers = [
-            ( localize(5225, "Name")),
-            ( localize(5226, "Reference Name")),
-            ( localize(5227, "Tools")),
-            ( localize(5228, "Description")),
+            ( localize(5385, "Name")),
+            ( localize(5386, "Reference Name")),
+            ( localize(5387, "Tools")),
+            ( localize(5388, "Description")),
         ];
         const rows = ( contribs.map(t => {
             return [
@@ -418,7 +418,7 @@ class LanguageModelToolSetDataRenderer extends Disposable {
 }
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: 'languageModelToolSets',
-    label: ( localize(5229, "Language Model Tool Sets")),
+    label: ( localize(5389, "Language Model Tool Sets")),
     access: {
         canToggle: false
     },

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

@@ -4,7 +4,7 @@ import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/l
 import { RawContextKey } 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 { IChatAgentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service";
-import { IChatModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel";
+import { IChatModel } from "@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-common/vscode/vs/workbench/contrib/chat/common/chatModel";
 import { ISpeechToTextEvent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/speech/common/speechService";
 import { ISpeechService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/speech/common/speechService.service";
 import { IVoiceChatService } from "./voiceChatService.service.js";

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

@@ -7,7 +7,7 @@ import { rtrim } from '@codingame/monaco-vscode-api/vscode/vs/base/common/string
 import { RawContextKey } 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 { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
-import { chatAgentLeader, chatSubcommandLeader } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
+import { chatAgentLeader, chatSubcommandLeader } from '@codingame/monaco-vscode-9ebd6daf-8734-5a28-ad24-b238f5e5819d-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
 import { SpeechToTextStatus } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/speech/common/speechService';
 import { ISpeechService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/speech/common/speechService.service';
 
@@ -21,7 +21,7 @@ var PhraseTextType;
 const VoiceChatInProgress = ( new RawContextKey(
     'voiceChatInProgress',
     false,
-    { type: 'boolean', description: ( localize(5230, "A speech-to-text session is in progress for chat.")) }
+    { type: 'boolean', description: ( localize(5390, "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,7 +1,7 @@
 
 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-6c0f93b9-169c-58c3-a9cb-7d60698eb52c-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
+import { InlineChatController2, InlineChatController1, InlineChatController } from '@codingame/monaco-vscode-3927dd53-f845-534c-9baa-1528ff3956c8-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';
@@ -11,9 +11,9 @@ 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-6c0f93b9-169c-58c3-a9cb-7d60698eb52c-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl';
+import { InlineChatEnabler } from '@codingame/monaco-vscode-3927dd53-f845-534c-9baa-1528ff3956c8-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 { ChatSubmitAction, CancelAction } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/browser/actions/chatExecuteActions';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
@@ -37,7 +37,7 @@ const editActionMenuItem = {
     order: 0,
     command: {
         id: ChatSubmitAction.ID,
-        title: ( localize(7361, "Edit Code")),
+        title: ( localize(7524, "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(7362, "Generate")),
+        title: ( localize(7525, "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(7363, "Cancel Request")),
-        shortTitle: ( localize(7364, "Cancel")),
+        title: ( localize(7526, "Cancel Request")),
+        shortTitle: ( localize(7527, "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-6c0f93b9-169c-58c3-a9cb-7d60698eb52c-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
+import { InlineChatController } from '@codingame/monaco-vscode-3927dd53-f845-534c-9baa-1528ff3956c8-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,7 +6,7 @@ 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-6c0f93b9-169c-58c3-a9cb-7d60698eb52c-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
+import { InlineChatController } from '@codingame/monaco-vscode-3927dd53-f845-534c-9baa-1528ff3956c8-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';
@@ -35,10 +35,9 @@ import { PLAINTEXT_LANGUAGE_ID } from '@codingame/monaco-vscode-api/vscode/vs/ed
 import { createStyleSheet2 } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/domStylesheets';
 import { stringValue } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/cssValue';
 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 { 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 { INSTRUCTIONS_LANGUAGE_ID, PROMPT_LANGUAGE_ID } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
+import { MODE_FILE_EXTENSION } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/promptFileLocations';
 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';
@@ -54,14 +53,14 @@ const IGNORED_LANGUAGE_IDS = ( new Set([
     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 CTX_INLINE_CHAT_SHOWING_HINT = ( new RawContextKey('inlineChatShowingHint', false, ( localize(7556, "Whether inline chat shows a contextual hint"))));
 const _inlineChatActionId = 'inlineChat.startWithCurrentLine';
 class InlineChatExpandLineAction extends EditorAction2 {
     constructor() {
         super({
             id: _inlineChatActionId,
             category: AbstractInline1ChatAction.category,
-            title: ( localize2(7394, "Start in Editor with Current Line")),
+            title: ( localize2(7557, "Start in Editor with Current Line")),
             f1: true,
             precondition: ( ContextKeyExpr.and(( CTX_INLINE_CHAT_VISIBLE.negate()), CTX_INLINE_CHAT_HAS_AGENT, EditorContextKeys.writable)),
             keybinding: [{
@@ -104,7 +103,7 @@ class ShowInlineChatHintAction extends EditorAction2 {
         super({
             id: 'inlineChat.showHint',
             category: AbstractInline1ChatAction.category,
-            title: ( localize2(7395, "Show Inline Chat Hint")),
+            title: ( localize2(7558, "Show Inline Chat Hint")),
             f1: false,
             precondition: ( ContextKeyExpr.and(( CTX_INLINE_CHAT_VISIBLE.negate()), CTX_INLINE_CHAT_HAS_AGENT, EditorContextKeys.writable)),
         });
@@ -199,7 +198,7 @@ let InlineChatHintsController = class InlineChatHintsController extends Disposab
         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);
+            const position = editorObs.cursorPosition.read(r);
             const model = editorObs.model.read(r);
             const kb = keyObs.read(r);
             if (ghostState !== undefined || !kb || !position || !model || !textFocus) {
@@ -208,10 +207,7 @@ let InlineChatHintsController = class InlineChatHintsController extends Disposab
             if (( IGNORED_LANGUAGE_IDS.has(model.getLanguageId()))) {
                 return undefined;
             }
-            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);
+            editorObs.versionId.read(r);
             const visible = this._visibilityObs.read(r);
             const isEol = model.getLineMaxColumn(position.lineNumber) === position.column;
             const isWhitespace = model.getLineLastNonWhitespaceColumn(position.lineNumber) === 0 && model.getValueLength() > 0 && position.column > 1;
@@ -235,15 +231,15 @@ let InlineChatHintsController = class InlineChatHintsController extends Disposab
                 this._ctxShowingHint.reset();
                 return;
             }
-            const agentName = chatAgentService.getDefaultAgent(ChatAgentLocation.Editor)?.name ?? ( localize(7396, "Chat"));
+            const agentName = chatAgentService.getDefaultAgent(ChatAgentLocation.Editor)?.name ?? ( localize(7559, "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(7397, "{0} to edit with {1}", kb, agentName));
+                content = '\u00a0' + ( localize(7560, "{0} to edit with {1}", kb, agentName));
             }
             else if (isEol) {
-                content = '\u00a0' + ( localize(7398, "{0} to continue with {1}", kb, agentName));
+                content = '\u00a0' + ( localize(7561, "{0} to continue with {1}", kb, agentName));
             }
             else {
                 content = '\u200a' + kb + '\u200a';
@@ -272,7 +268,7 @@ let InlineChatHintsController = class InlineChatHintsController extends Disposab
             getActions: () => [
                 toAction({
                     id: 'inlineChat.disableHint',
-                    label: ( localize(7399, "Disable Inline Chat Hint")),
+                    label: ( localize(7562, "Disable Inline Chat Hint")),
                     run: async () => {
                         await this._configurationService.updateValue(setting, false);
                     }
@@ -300,7 +296,7 @@ class HideInlineChatHintAction extends EditorAction2 {
     constructor() {
         super({
             id: 'inlineChat.hideHint',
-            title: ( localize2(7400, "Hide Inline Chat Hint")),
+            title: ( localize2(7563, "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-6c0f93b9-169c-58c3-a9cb-7d60698eb52c-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
+import { InlineChatController } from '@codingame/monaco-vscode-3927dd53-f845-534c-9baa-1528ff3956c8-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-4372ad43-a220-5e78-83e6-95a9cfd64384-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
+import { INotebookEditor } from "@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
 export declare class NotebookModifiedCellDecorator extends Disposable {
     private readonly notebookEditor;
     private readonly decorators;