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

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

@@ -0,0 +1,93 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { VSBuffer, decodeBase64 } from '@codingame/monaco-vscode-api/vscode/vs/base/common/buffer';
+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 { newWriteableStream } from '@codingame/monaco-vscode-api/vscode/vs/base/common/stream';
+import { FileSystemProviderCapabilities, FileType, createFileSystemProviderError, FileSystemProviderErrorCode } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files';
+import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
+import { ChatResponseResource } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel';
+import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
+import { isToolResultInputOutputDetails } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService';
+
+let ChatResponseResourceFileSystemProvider = class ChatResponseResourceFileSystemProvider extends Disposable {
+    static { this.ID = 'workbench.contrib.chatResponseResourceFileSystemProvider'; }
+    constructor(chatService, _fileService) {
+        super();
+        this.chatService = chatService;
+        this._fileService = _fileService;
+        this.onDidChangeCapabilities = Event.None;
+        this.onDidChangeFile = Event.None;
+        this.capabilities = FileSystemProviderCapabilities.None
+            | FileSystemProviderCapabilities.Readonly
+            | FileSystemProviderCapabilities.PathCaseSensitive
+            | FileSystemProviderCapabilities.FileReadStream
+            | FileSystemProviderCapabilities.FileAtomicRead
+            | FileSystemProviderCapabilities.FileReadWrite;
+        this._register(this._fileService.registerProvider(ChatResponseResource.scheme, this));
+    }
+    readFile(resource) {
+        return Promise.resolve(this.lookupURI(resource));
+    }
+    readFileStream(resource) {
+        const stream = newWriteableStream(data => VSBuffer.concat(( data.map(data => VSBuffer.wrap(data)))).buffer);
+        stream.end(this.lookupURI(resource));
+        return stream;
+    }
+    stat(resource) {
+        const r = this.lookupURI(resource);
+        return Promise.resolve({
+            type: FileType.File,
+            ctime: 0,
+            mtime: 0,
+            size: r.length,
+        });
+    }
+    delete() {
+        throw createFileSystemProviderError('fs is readonly', FileSystemProviderErrorCode.NoPermissions);
+    }
+    watch() {
+        return Disposable.None;
+    }
+    mkdir() {
+        throw createFileSystemProviderError('fs is readonly', FileSystemProviderErrorCode.NoPermissions);
+    }
+    readdir() {
+        return Promise.resolve([]);
+    }
+    rename() {
+        throw createFileSystemProviderError('fs is readonly', FileSystemProviderErrorCode.NoPermissions);
+    }
+    writeFile() {
+        throw createFileSystemProviderError('fs is readonly', FileSystemProviderErrorCode.NoPermissions);
+    }
+    lookupURI(uri) {
+        const parsed = ChatResponseResource.parseUri(uri);
+        if (!parsed) {
+            throw createFileSystemProviderError(`File not found`, FileSystemProviderErrorCode.FileNotFound);
+        }
+        const { sessionId, requestId, toolCallId } = parsed;
+        const result = this.chatService.getSession(sessionId)
+            ?.getRequests()
+            .find(r => r.id === requestId)
+            ?.response?.entireResponse.value
+            .find((r) => (r.kind === 'toolInvocation' || r.kind === 'toolInvocationSerialized') && r.toolCallId === toolCallId);
+        if (!result) {
+            throw createFileSystemProviderError(`File not found`, FileSystemProviderErrorCode.FileNotFound);
+        }
+        if (!isToolResultInputOutputDetails(result.resultDetails)) {
+            throw createFileSystemProviderError(`Tool does not have I/O`, FileSystemProviderErrorCode.FileNotFound);
+        }
+        const part = result.resultDetails.output.at(parsed.index);
+        if (!part) {
+            throw createFileSystemProviderError(`Tool does not have part`, FileSystemProviderErrorCode.FileNotFound);
+        }
+        return part.isText ? ( new TextEncoder()).encode(part.value) : decodeBase64(part.value).buffer;
+    }
+};
+ChatResponseResourceFileSystemProvider = ( __decorate([
+    ( __param(0, IChatService)),
+    ( __param(1, IFileService))
+], ChatResponseResourceFileSystemProvider));
+
+export { ChatResponseResourceFileSystemProvider };

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

@@ -18,6 +18,7 @@ import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/c
 import { IChatSlashCommandService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSlashCommands.service";
 import { IChatTransferService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatTransferService.service";
 import { ChatAgentLocation } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants";
+import { ILanguageModelsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels.service";
 export declare class ChatService extends Disposable implements IChatService {
     private readonly storageService;
     private readonly logService;
@@ -30,6 +31,7 @@ export declare class ChatService extends Disposable implements IChatService {
     private readonly configurationService;
     private readonly experimentService;
     private readonly chatTransferService;
+    private readonly languageModelsService;
     _serviceBrand: undefined;
     private readonly _sessionModels;
     private readonly _pendingRequests;
@@ -46,7 +48,7 @@ export declare class ChatService extends Disposable implements IChatService {
     private readonly _onDidDisposeSession;
     readonly onDidDisposeSession: Event<{
         sessionId: string;
-        reason: "initializationFailed" | "cleared";
+        reason: "cleared";
     }>;
     private readonly _sessionFollowupCancelTokens;
     private readonly _chatServiceTelemetry;
@@ -54,7 +56,7 @@ export declare class ChatService extends Disposable implements IChatService {
     private get useFileStorage();
     get edits2Enabled(): boolean;
     private get isEmptyWindow();
-    constructor(storageService: IStorageService, logService: ILogService, extensionService: IExtensionService, instantiationService: IInstantiationService, telemetryService: ITelemetryService, workspaceContextService: IWorkspaceContextService, chatSlashCommandService: IChatSlashCommandService, chatAgentService: IChatAgentService, configurationService: IConfigurationService, experimentService: IWorkbenchAssignmentService, chatTransferService: IChatTransferService);
+    constructor(storageService: IStorageService, logService: ILogService, extensionService: IExtensionService, instantiationService: IInstantiationService, telemetryService: ITelemetryService, workspaceContextService: IWorkspaceContextService, chatSlashCommandService: IChatSlashCommandService, chatAgentService: IChatAgentService, configurationService: IConfigurationService, experimentService: IWorkbenchAssignmentService, chatTransferService: IChatTransferService, languageModelsService: ILanguageModelsService);
     isEnabled(location: ChatAgentLocation): boolean;
     private saveState;
     private syncEmptyWindowChats;
@@ -80,6 +82,7 @@ export declare class ChatService extends Disposable implements IChatService {
     private parseChatRequest;
     private refreshFollowupsCancellationToken;
     private _sendRequestAsync;
+    private resolveModelId;
     private prepareContext;
     private checkAgentAllowed;
     private attachmentKindsForTelemetry;

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

@@ -34,6 +34,7 @@ import { IChatSlashCommandService } from '@codingame/monaco-vscode-api/vscode/vs
 import { IChatTransferService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatTransferService.service';
 import { ChatConfiguration, ChatAgentLocation, ChatMode } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { ChatMessageRole } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels';
+import { ILanguageModelsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels.service';
 import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service';
 
 const serializedChatKey = 'interactive.sessions';
@@ -73,7 +74,7 @@ let ChatService = class ChatService extends Disposable {
         const workspace = this.workspaceContextService.getWorkspace();
         return !workspace.configuration && workspace.folders.length === 0;
     }
-    constructor(storageService, logService, extensionService, instantiationService, telemetryService, workspaceContextService, chatSlashCommandService, chatAgentService, configurationService, experimentService, chatTransferService) {
+    constructor(storageService, logService, extensionService, instantiationService, telemetryService, workspaceContextService, chatSlashCommandService, chatAgentService, configurationService, experimentService, chatTransferService, languageModelsService) {
         super();
         this.storageService = storageService;
         this.logService = logService;
@@ -86,6 +87,7 @@ let ChatService = class ChatService extends Disposable {
         this.configurationService = configurationService;
         this.experimentService = experimentService;
         this.chatTransferService = chatTransferService;
+        this.languageModelsService = languageModelsService;
         this._sessionModels = this._register(( new DisposableMap()));
         this._pendingRequests = this._register(( new DisposableMap()));
         this._deletedChatIds = ( new Set());
@@ -278,7 +280,7 @@ let ChatService = class ChatService extends Disposable {
             const liveSessionItems = ( Array.from(( this._sessionModels.values()))
                 .filter(session => !session.isImported)
                 .map(session => {
-                const title = session.title || ( localize(5054, "New Chat"));
+                const title = session.title || ( localize(5162, "New Chat"));
                 return {
                     sessionId: session.sessionId,
                     title,
@@ -312,7 +314,7 @@ let ChatService = class ChatService extends Disposable {
         const liveSessionItems = ( Array.from(( this._sessionModels.values()))
             .filter(session => !session.isImported)
             .map(session => {
-            const title = session.title || ( localize(5054, "New Chat"));
+            const title = session.title || ( localize(5162, "New Chat"));
             return {
                 sessionId: session.sessionId,
                 title,
@@ -355,19 +357,9 @@ let ChatService = class ChatService extends Disposable {
         this.initializeSession(model, token);
         return model;
     }
-    async initializeSession(model, token) {
-        try {
-            this.trace('initializeSession', `Initialize session ${model.sessionId}`);
-            model.startInitialize();
-            this.activateDefaultAgent(model.initialLocation).catch(e => this.logService.error(e));
-            model.initialize();
-        }
-        catch (err) {
-            this.trace('startSession', `initializeSession failed: ${err}`);
-            model.setInitializationError(err);
-            this._sessionModels.deleteAndDispose(model.sessionId);
-            this._onDidDisposeSession.fire({ sessionId: model.sessionId, reason: 'initializationFailed' });
-        }
+    initializeSession(model, token) {
+        this.trace('initializeSession', `Initialize session ${model.sessionId}`);
+        this.activateDefaultAgent(model.initialLocation).catch(e => this.logService.error(e));
     }
     async activateDefaultAgent(location) {
         await this.extensionService.whenInstalledExtensionsRegistered();
@@ -375,7 +367,13 @@ let ChatService = class ChatService extends Disposable {
         if (!defaultAgentData) {
             throw ( new ErrorNoTelemetry('No default agent contributed'));
         }
-        await this.extensionService.activateByEvent(`onChatParticipant:${defaultAgentData.id}`);
+        if (!defaultAgentData.isCore) {
+            await this.extensionService.activateById(defaultAgentData.extensionId, {
+                activationEvent: `onChatParticipant:${defaultAgentData.id}`,
+                extensionId: defaultAgentData.extensionId,
+                startup: false
+            });
+        }
         const defaultAgent = this.chatAgentService.getActivatedAgents().find(agent => agent.id === defaultAgentData.id);
         if (!defaultAgent) {
             throw ( new ErrorNoTelemetry('No default agent registered'));
@@ -422,7 +420,6 @@ let ChatService = class ChatService extends Disposable {
         if (!model && model !== request.session) {
             throw ( new Error(`Unknown session: ${request.session.sessionId}`));
         }
-        await model.waitForInitialization();
         const cts = this._pendingRequests.get(request.session.sessionId);
         if (cts) {
             this.trace('resendRequest', `Session ${request.session.sessionId} already has a pending request, cancelling...`);
@@ -450,7 +447,6 @@ let ChatService = class ChatService extends Disposable {
         if (!model) {
             throw ( new Error(`Unknown session: ${sessionId}`));
         }
-        await model.waitForInitialization();
         if (( this._pendingRequests.has(sessionId))) {
             this.trace('sendRequest', `Session ${sessionId} already has a pending request`);
             return;
@@ -524,13 +520,17 @@ let ChatService = class ChatService extends Disposable {
                     return;
                 }
                 gotProgress = true;
-                if (progress.kind === 'markdownContent') {
-                    this.trace('sendRequest', `Provider returned progress for session ${model.sessionId}, ${progress.content.value.length} chars`);
-                }
-                else {
-                    this.trace('sendRequest', `Provider returned progress: ${JSON.stringify(progress)}`);
+                for (let i = 0; i < progress.length; i++) {
+                    const isLast = i === progress.length - 1;
+                    const progressItem = progress[i];
+                    if (progressItem.kind === 'markdownContent') {
+                        this.trace('sendRequest', `Provider returned progress for session ${model.sessionId}, ${progressItem.content.value.length} chars`);
+                    }
+                    else {
+                        this.trace('sendRequest', `Provider returned progress: ${JSON.stringify(progressItem)}`);
+                    }
+                    model.acceptResponseProgress(request, progressItem, !isLast);
                 }
-                model.acceptResponseProgress(request, progress);
                 completeResponseCreated();
             };
             let detectedAgent;
@@ -552,7 +552,8 @@ let ChatService = class ChatService extends Disposable {
                     numCodeBlocks: getCodeBlocks(request.response?.response.toString() ?? '').length,
                     isParticipantDetected: !!detectedAgent,
                     enableCommandDetection,
-                    attachmentKinds: this.attachmentKindsForTelemetry(request.variableData)
+                    attachmentKinds: this.attachmentKindsForTelemetry(request.variableData),
+                    model: this.resolveModelId(options?.userSelectedModelId),
                 });
                 model.cancelRequest(request);
             });
@@ -593,7 +594,7 @@ let ChatService = class ChatService extends Disposable {
                             rejectedConfirmationData: options?.rejectedConfirmationData,
                             userSelectedModelId: options?.userSelectedModelId,
                             userSelectedTools: options?.userSelectedTools,
-                            userSelectedTools2: options?.userSelectedTools2,
+                            modeInstructions: options?.modeInstructions,
                             toolSelectionIsExclusive: options?.toolSelectionIsExclusive,
                             editedFileEvents: request.editedFileEvents
                         };
@@ -639,7 +640,7 @@ let ChatService = class ChatService extends Disposable {
                     }
                     const message = parsedRequest.text;
                     const commandResult = await this.chatSlashCommandService.executeCommand(commandPart.slashCommand.command, message.substring(commandPart.slashCommand.command.length + 1).trimStart(), ( new Progress(p => {
-                        progressCallback(p);
+                        progressCallback([p]);
                     })), history, location, token);
                     agentOrCommandFollowups = Promise.resolve(commandResult?.followUp);
                     rawResult = {};
@@ -647,13 +648,13 @@ let ChatService = class ChatService extends Disposable {
                 else {
                     throw ( new Error(`Cannot handle request`));
                 }
-                if (token.isCancellationRequested) {
+                if (token.isCancellationRequested && !rawResult) {
                     return;
                 }
                 else {
                     if (!rawResult) {
                         this.trace('sendRequest', `Provider returned no response for session ${model.sessionId}`);
-                        rawResult = { errorDetails: { message: ( localize(5055, "Provider returned null response")) } };
+                        rawResult = { errorDetails: { message: ( localize(5163, "Provider returned null response")) } };
                     }
                     const result = rawResult.errorDetails?.responseIsFiltered ? 'filtered' :
                         rawResult.errorDetails && gotProgress ? 'errorWithOutput' :
@@ -674,7 +675,8 @@ let ChatService = class ChatService extends Disposable {
                         location,
                         citations: request.response?.codeCitations.length ?? 0,
                         numCodeBlocks: getCodeBlocks(request.response?.response.toString() ?? '').length,
-                        attachmentKinds: this.attachmentKindsForTelemetry(request.variableData)
+                        attachmentKinds: this.attachmentKindsForTelemetry(request.variableData),
+                        model: this.resolveModelId(options?.userSelectedModelId),
                     });
                     model.setResponse(request, rawResult);
                     completeResponseCreated();
@@ -709,7 +711,8 @@ let ChatService = class ChatService extends Disposable {
                     numCodeBlocks: 0,
                     enableCommandDetection,
                     isParticipantDetected: !!detectedAgent,
-                    attachmentKinds: this.attachmentKindsForTelemetry(request.variableData)
+                    attachmentKinds: this.attachmentKindsForTelemetry(request.variableData),
+                    model: this.resolveModelId(options?.userSelectedModelId)
                 });
                 this.logService.error(`Error while handling chat request: ${toErrorMessage(err, true)}`);
                 if (request) {
@@ -734,6 +737,9 @@ let ChatService = class ChatService extends Disposable {
             responseCompletePromise: rawResponsePromise,
         };
     }
+    resolveModelId(userSelectedModelId) {
+        return userSelectedModelId && this.languageModelsService.lookupLanguageModel(userSelectedModelId)?.id;
+    }
     prepareContext(attachedContextVariables) {
         attachedContextVariables ??= [];
         attachedContextVariables.sort((a, b) => {
@@ -767,6 +773,9 @@ let ChatService = class ChatService extends Disposable {
                 if (v.kind === 'tool') {
                     return 'toolInPrompt';
                 }
+                else if (v.kind === 'toolset') {
+                    return 'toolsetInPrompt';
+                }
                 else {
                     return 'fileInPrompt';
                 }
@@ -786,6 +795,9 @@ let ChatService = class ChatService extends Disposable {
             else if (v.kind === 'tool') {
                 return 'tool';
             }
+            else if (v.kind === 'toolset') {
+                return 'toolset';
+            }
             else {
                 if (URI.isUri(v.value)) {
                     return 'file';
@@ -829,7 +841,6 @@ let ChatService = class ChatService extends Disposable {
         if (!model) {
             throw ( new Error(`Unknown session: ${sessionId}`));
         }
-        await model.waitForInitialization();
         const pendingRequest = this._pendingRequests.get(sessionId);
         if (pendingRequest?.requestId === requestId) {
             pendingRequest.cancel();
@@ -845,7 +856,6 @@ let ChatService = class ChatService extends Disposable {
         if (!target) {
             throw ( new Error(`Unknown session: ${sessionId}`));
         }
-        await target.waitForInitialization();
         const oldOwner = request.session;
         target.adoptRequest(request);
         if (request.response && !request.response.isComplete) {
@@ -862,7 +872,6 @@ let ChatService = class ChatService extends Disposable {
         if (!model) {
             throw ( new Error(`Unknown session: ${sessionId}`));
         }
-        await model.waitForInitialization();
         const parsedRequest = typeof message === 'string' ?
             this.instantiationService.createInstance(ChatRequestParser).parseChatRequest(sessionId, message) :
             message;
@@ -966,7 +975,8 @@ ChatService = ( __decorate([
     ( __param(7, IChatAgentService)),
     ( __param(8, IConfigurationService)),
     ( __param(9, IWorkbenchAssignmentService)),
-    ( __param(10, IChatTransferService))
+    ( __param(10, IChatTransferService)),
+    ( __param(11, ILanguageModelsService))
 ], ChatService));
 function getCodeBlocks(text) {
     const lines = text.split('\n');

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

@@ -51,7 +51,7 @@ let ChatSessionStore = class ChatSessionStore extends Disposable {
             }
             e.join(this.storeTask, {
                 id: 'join.chatSessionStore',
-                label: ( localize(5056, "Saving chat history"))
+                label: ( localize(5164, "Saving chat history"))
             });
         }));
     }
@@ -324,7 +324,7 @@ function isChatSessionIndex(data) {
 }
 function getSessionMetadata(session) {
     const title = session instanceof ChatModel ?
-        (session.title || ( localize(5057, "New Chat"))) :
+        (session.title || ( localize(5165, "New Chat"))) :
         session.customTitle ?? ChatModel.getDefaultTitle(session.requests);
     return {
         sessionId: session.sessionId,

package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/contributions/configMigration.d.ts

@@ -1,5 +1,9 @@
+import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
 import { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 export declare class ConfigMigration implements IWorkbenchContribution {
-    constructor(configService: IConfigurationService);
+    private readonly logService;
+    private readonly configService;
+    constructor(logService: ILogService, configService: IConfigurationService);
+    private migrateConfig;
 }

package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/contributions/configMigration.js

@@ -1,13 +1,22 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { assert } from '@codingame/monaco-vscode-api/vscode/vs/base/common/assert';
-import { asBoolean } from '@codingame/monaco-vscode-51fed910-d648-5620-9b80-9232cd79d116-common/vscode/vs/platform/prompts/common/config';
+import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
+import { asBoolean } from '@codingame/monaco-vscode-47472025-cc45-5680-86cd-09ceaba921a1-common/vscode/vs/platform/prompts/common/config';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
-import { CONFIG_KEY, PROMPT_LOCATIONS_CONFIG_KEY } from '@codingame/monaco-vscode-51fed910-d648-5620-9b80-9232cd79d116-common/vscode/vs/platform/prompts/common/constants';
+import { CONFIG_KEY, PROMPT_LOCATIONS_CONFIG_KEY } from '@codingame/monaco-vscode-47472025-cc45-5680-86cd-09ceaba921a1-common/vscode/vs/platform/prompts/common/prompts';
 
 let ConfigMigration = class ConfigMigration {
-    constructor(configService) {
-        const value = configService.getValue(CONFIG_KEY);
+    constructor(logService, configService) {
+        this.logService = logService;
+        this.configService = configService;
+        this.migrateConfig()
+            .catch((error) => {
+            this.logService.warn('failed to migrate config setting value.', error);
+        });
+    }
+    async migrateConfig() {
+        const value = await this.configService.getValue(CONFIG_KEY);
         if ((value === undefined) || (value === null)) {
             return;
         }
@@ -26,8 +35,8 @@ let ConfigMigration = class ConfigMigration {
                 }
                 locationsValue[trimmedValue] = true;
             }
-            configService.updateValue(CONFIG_KEY, true);
-            configService.updateValue(PROMPT_LOCATIONS_CONFIG_KEY, locationsValue);
+            await this.configService.updateValue(CONFIG_KEY, true);
+            await this.configService.updateValue(PROMPT_LOCATIONS_CONFIG_KEY, locationsValue);
             return;
         }
         if (typeof value === 'object') {
@@ -43,20 +52,21 @@ let ConfigMigration = class ConfigMigration {
                 }
                 locationsValue[trimmedValue] = enabled;
             }
-            configService.updateValue(CONFIG_KEY, true);
-            configService.updateValue(PROMPT_LOCATIONS_CONFIG_KEY, locationsValue);
+            await this.configService.updateValue(CONFIG_KEY, true);
+            await this.configService.updateValue(PROMPT_LOCATIONS_CONFIG_KEY, locationsValue);
             return;
         }
         if (typeof value === 'string') {
             assert(asBoolean(value) === undefined, `String value must not be a boolean, got '${value}'.`);
-            configService.updateValue(CONFIG_KEY, true);
-            configService.updateValue(PROMPT_LOCATIONS_CONFIG_KEY, { [value]: true });
+            await this.configService.updateValue(CONFIG_KEY, true);
+            await this.configService.updateValue(PROMPT_LOCATIONS_CONFIG_KEY, { [value]: true });
             return;
         }
     }
 };
 ConfigMigration = ( __decorate([
-    ( __param(0, IConfigurationService))
+    ( __param(0, ILogService)),
+    ( __param(1, IConfigurationService))
 ], ConfigMigration));
 
 export { ConfigMigration };

package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/contributions/index.js

@@ -1,16 +1,21 @@
 
 import { ConfigMigration } from './configMigration.js';
-import './languageFeatures/index.js';
+import { LANGUAGE_FEATURE_CONTRIBUTIONS } from './languageFeatures/index.js';
 import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
 import { LifecyclePhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import { Extensions } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
 
 const registerPromptFileContributions = () => {
+    registerContributions(LANGUAGE_FEATURE_CONTRIBUTIONS);
     registerContribution(ConfigMigration);
 };
 const registerContribution = (contribution) => {
     ( Registry.as(Extensions.Workbench))
         .registerWorkbenchContribution(contribution, LifecyclePhase.Eventually);
 };
+const registerContributions = (contributions) => {
+    contributions
+        .forEach(registerContribution);
+};
 
 export { registerPromptFileContributions };

package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/contributions/languageFeatures/index.js

@@ -4,14 +4,15 @@ import { isWindows } from '@codingame/monaco-vscode-api/vscode/vs/base/common/pl
 import { PromptPathAutocompletion } from './providers/promptPathAutocompletion.js';
 import { PromptLinkDiagnosticsInstanceManager } from './providers/promptLinkDiagnosticsProvider.js';
 import { PromptHeaderDiagnosticsInstanceManager } from './providers/promptHeaderDiagnosticsProvider.js';
-import { PromptDecorationsProviderInstanceManager } from './providers/decorationsProvider/promptDecorationsProvider.js';
 
 const CONTRIBUTIONS = [
     PromptLinkProvider,
     PromptLinkDiagnosticsInstanceManager,
     PromptHeaderDiagnosticsInstanceManager,
-    PromptDecorationsProviderInstanceManager,
 ];
 if (isWindows === false) {
     CONTRIBUTIONS.push(PromptPathAutocompletion);
 }
+const LANGUAGE_FEATURE_CONTRIBUTIONS = ( Object.freeze(CONTRIBUTIONS));
+
+export { LANGUAGE_FEATURE_CONTRIBUTIONS };

package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/contributions/languageFeatures/providers/promptHeaderDiagnosticsProvider.d.ts

@@ -1,15 +1,16 @@
 import { IPromptsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/types.service";
 import { ProviderInstanceBase } from "./providerInstanceBase.js";
 import { ITextModel } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/model";
-import { ProviderInstanceManagerBase } from "./providerInstanceManagerBase.js";
+import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
+import { ProviderInstanceManagerBase, TProviderClass } from "./providerInstanceManagerBase.js";
 import { IMarkerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/markers/common/markers.service";
 declare class PromptHeaderDiagnosticsProvider extends ProviderInstanceBase {
     private readonly markerService;
     constructor(model: ITextModel, promptsService: IPromptsService, markerService: IMarkerService);
-    protected onPromptSettled(): Promise<this>;
+    protected onPromptSettled(_error: Error | undefined, token: CancellationToken): this;
     toString(): string;
 }
 export declare class PromptHeaderDiagnosticsInstanceManager extends ProviderInstanceManagerBase<PromptHeaderDiagnosticsProvider> {
-    protected get InstanceClass(): typeof PromptHeaderDiagnosticsProvider;
+    protected get InstanceClass(): TProviderClass<PromptHeaderDiagnosticsProvider>;
 }
 export {};

package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/contributions/languageFeatures/providers/promptHeaderDiagnosticsProvider.js

@@ -14,22 +14,26 @@ let PromptHeaderDiagnosticsProvider = class PromptHeaderDiagnosticsProvider exte
         super(model, promptsService);
         this.markerService = markerService;
     }
-    async onPromptSettled() {
-        await this.parser.allSettled();
+    onPromptSettled(_error, token) {
         this.markerService.remove(MARKERS_OWNER_ID, [this.model.uri]);
         const { header } = this.parser;
         if (header === undefined) {
             return this;
         }
-        const markers = [];
-        for (const diagnostic of header.diagnostics) {
-            markers.push(toMarker(diagnostic));
-        }
-        this.markerService.changeOne(MARKERS_OWNER_ID, this.model.uri, markers);
+        header.settled.then(() => {
+            if (token.isCancellationRequested) {
+                return;
+            }
+            const markers = [];
+            for (const diagnostic of header.diagnostics) {
+                markers.push(toMarker(diagnostic));
+            }
+            this.markerService.changeOne(MARKERS_OWNER_ID, this.model.uri, markers);
+        });
         return this;
     }
     toString() {
-        return `prompt-link-diagnostics:${this.model.uri.path}`;
+        return `prompt-header-diagnostics:${this.model.uri.path}`;
     }
 };
 PromptHeaderDiagnosticsProvider = ( __decorate([

package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/contributions/languageFeatures/providers/promptLinkDiagnosticsProvider.d.ts

@@ -1,15 +1,15 @@
 import { IPromptsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/types.service";
 import { ProviderInstanceBase } from "./providerInstanceBase.js";
 import { ITextModel } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/model";
-import { ProviderInstanceManagerBase } from "./providerInstanceManagerBase.js";
+import { ProviderInstanceManagerBase, TProviderClass } from "./providerInstanceManagerBase.js";
 import { IMarkerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/markers/common/markers.service";
 declare class PromptLinkDiagnosticsProvider extends ProviderInstanceBase {
     private readonly markerService;
     constructor(model: ITextModel, promptsService: IPromptsService, markerService: IMarkerService);
-    protected onPromptSettled(): Promise<this>;
+    protected onPromptSettled(): this;
     toString(): string;
 }
 export declare class PromptLinkDiagnosticsInstanceManager extends ProviderInstanceManagerBase<PromptLinkDiagnosticsProvider> {
-    protected get InstanceClass(): typeof PromptLinkDiagnosticsProvider;
+    protected get InstanceClass(): TProviderClass<PromptLinkDiagnosticsProvider>;
 }
 export {};

package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/contributions/languageFeatures/providers/promptLinkDiagnosticsProvider.js

@@ -15,8 +15,7 @@ let PromptLinkDiagnosticsProvider = class PromptLinkDiagnosticsProvider extends
         super(model, promptsService);
         this.markerService = markerService;
     }
-    async onPromptSettled() {
-        await this.parser.allSettled();
+    onPromptSettled() {
         this.markerService.remove(MARKERS_OWNER_ID, [this.model.uri]);
         const markers = [];
         for (const link of this.parser.references) {

package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/contributions/languageFeatures/providers/promptLinkProvider.js

@@ -5,7 +5,7 @@ import { assert } from '@codingame/monaco-vscode-api/vscode/vs/base/common/asser
 import { assertDefined } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { CancellationError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
-import { PROMPT_AND_INSTRUCTIONS_LANGUAGE_SELECTOR } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/constants';
+import { ALL_PROMPTS_LANGUAGE_SELECTOR } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/constants';
 import { FolderReference, NotPromptFile } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/promptFileReferenceErrors';
 import { ILanguageFeaturesService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/languageFeatures.service';
 
@@ -14,12 +14,12 @@ let PromptLinkProvider = class PromptLinkProvider extends Disposable {
         super();
         this.promptsService = promptsService;
         this.languageService = languageService;
-        this._register(this.languageService.linkProvider.register(PROMPT_AND_INSTRUCTIONS_LANGUAGE_SELECTOR, this));
+        this._register(this.languageService.linkProvider.register(ALL_PROMPTS_LANGUAGE_SELECTOR, this));
     }
     async provideLinks(model, token) {
         assert(!token.isCancellationRequested, ( new CancellationError()));
         const parser = this.promptsService.getSyntaxParserFor(model);
-        assert(!parser.disposed, 'Prompt parser must not be disposed.');
+        assert(parser.isDisposed === false, 'Prompt parser must not be disposed.');
         const { references } = await parser
             .start()
             .settled();