@codingame/monaco-vscode-chat-service-override 16.1.0 → 17.0.0

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

@@ -0,0 +1,65 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { IPromptsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/types.service';
+import { ProviderInstanceBase } from './providerInstanceBase.js';
+import { assert } from '@codingame/monaco-vscode-api/vscode/vs/base/common/assert';
+import { NotPromptFile } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/promptFileReferenceErrors';
+import { assertDefined } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
+import { ProviderInstanceManagerBase } from './providerInstanceManagerBase.js';
+import { MarkerSeverity } from '@codingame/monaco-vscode-api/vscode/vs/platform/markers/common/markers';
+import { IMarkerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/markers/common/markers.service';
+
+const MARKERS_OWNER_ID = 'prompt-link-diagnostics-provider';
+let PromptLinkDiagnosticsProvider = class PromptLinkDiagnosticsProvider extends ProviderInstanceBase {
+    constructor(model, promptsService, markerService) {
+        super(model, promptsService);
+        this.markerService = markerService;
+    }
+    async onPromptSettled() {
+        await this.parser.allSettled();
+        this.markerService.remove(MARKERS_OWNER_ID, [this.model.uri]);
+        const markers = [];
+        for (const link of this.parser.references) {
+            const { topError, linkRange } = link;
+            if (!topError || !linkRange) {
+                continue;
+            }
+            const { originalError } = topError;
+            if (originalError instanceof NotPromptFile) {
+                continue;
+            }
+            markers.push(toMarker(link));
+        }
+        this.markerService.changeOne(MARKERS_OWNER_ID, this.model.uri, markers);
+        return this;
+    }
+    toString() {
+        return `prompt-link-diagnostics:${this.model.uri.path}`;
+    }
+};
+PromptLinkDiagnosticsProvider = ( __decorate([
+    ( __param(1, IPromptsService)),
+    ( __param(2, IMarkerService))
+], PromptLinkDiagnosticsProvider));
+const toMarker = (link) => {
+    const { topError, linkRange } = link;
+    assertDefined(topError, 'Top error must to be defined.');
+    assertDefined(linkRange, 'Link range must to be defined.');
+    const { originalError } = topError;
+    assert(!(originalError instanceof NotPromptFile), 'Error must not be of "not prompt file" type.');
+    const severity = (topError.errorSubject === 'root')
+        ? MarkerSeverity.Error
+        : MarkerSeverity.Warning;
+    return {
+        message: topError.localizedMessage,
+        severity,
+        ...linkRange,
+    };
+};
+class PromptLinkDiagnosticsInstanceManager extends ProviderInstanceManagerBase {
+    get InstanceClass() {
+        return PromptLinkDiagnosticsProvider;
+    }
+}
+
+export { PromptLinkDiagnosticsInstanceManager };

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

@@ -1,15 +1,12 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import { LANGUAGE_SELECTOR } from '../constants.js';
 import { IPromptsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/types.service';
 import { assert } from '@codingame/monaco-vscode-api/vscode/vs/base/common/assert';
 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 { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
-import { FolderReference, NotPromptFile } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/promptFileReferenceErrors';
-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';
+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 { 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';
 
 let PromptLinkProvider = class PromptLinkProvider extends Disposable {
@@ -17,7 +14,7 @@ let PromptLinkProvider = class PromptLinkProvider extends Disposable {
         super();
         this.promptsService = promptsService;
         this.languageService = languageService;
-        this._register(this.languageService.linkProvider.register(LANGUAGE_SELECTOR, this));
+        this._register(this.languageService.linkProvider.register(PROMPT_AND_INSTRUCTIONS_LANGUAGE_SELECTOR, this));
     }
     async provideLinks(model, token) {
         assert(!token.isCancellationRequested, ( new CancellationError()));
@@ -55,7 +52,5 @@ PromptLinkProvider = ( __decorate([
     ( __param(0, IPromptsService)),
     ( __param(1, ILanguageFeaturesService))
 ], PromptLinkProvider));
-( Registry.as(Extensions.Workbench))
-    .registerWorkbenchContribution(PromptLinkProvider, LifecyclePhase.Eventually);
 
 export { PromptLinkProvider };

package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/{languageFeatures → contributions/languageFeatures/providers}/promptPathAutocompletion.d.ts

@@ -9,11 +9,11 @@ import { CompletionContext, CompletionItemProvider, CompletionList } from "@codi
 type TTriggerCharacter = ":" | "." | "/";
 export declare class PromptPathAutocompletion extends Disposable implements CompletionItemProvider {
     private readonly fileService;
-    private readonly promptSyntaxService;
+    private readonly promptsService;
     private readonly languageService;
     readonly _debugDisplayName: string;
     readonly triggerCharacters: TTriggerCharacter[];
-    constructor(fileService: IFileService, promptSyntaxService: IPromptsService, languageService: ILanguageFeaturesService);
+    constructor(fileService: IFileService, promptsService: IPromptsService, languageService: ILanguageFeaturesService);
     provideCompletionItems(model: ITextModel, position: Position, context: CompletionContext, token: CancellationToken): Promise<CompletionList | undefined>;
     private getFolderSuggestions;
     private getFirstFolderSuggestions;

package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/{languageFeatures → contributions/languageFeatures/providers}/promptPathAutocompletion.js

@@ -1,18 +1,14 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import { LANGUAGE_SELECTOR } from '../constants.js';
 import { IPromptsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/types.service';
+import { extUri } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { assertOneOf } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
-import { isWindows } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
 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 { dirname, extUri } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+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 { assert, assertNever } from '@codingame/monaco-vscode-api/vscode/vs/base/common/assert';
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
-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 { ILanguageFeaturesService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/languageFeatures.service';
-import { Extensions } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
 import { CompletionItemKind } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages';
 
 const findFileReference = (references, position) => {
@@ -33,14 +29,14 @@ const findFileReference = (references, position) => {
     return undefined;
 };
 let PromptPathAutocompletion = class PromptPathAutocompletion extends Disposable {
-    constructor(fileService, promptSyntaxService, languageService) {
+    constructor(fileService, promptsService, languageService) {
         super();
         this.fileService = fileService;
-        this.promptSyntaxService = promptSyntaxService;
+        this.promptsService = promptsService;
         this.languageService = languageService;
         this._debugDisplayName = 'PromptPathAutocompletion';
         this.triggerCharacters = [':', '.', '/'];
-        this._register(this.languageService.completionProvider.register(LANGUAGE_SELECTOR, this));
+        this._register(this.languageService.completionProvider.register(PROMPT_AND_INSTRUCTIONS_LANGUAGE_SELECTOR, this));
     }
     async provideCompletionItems(model, position, context, token) {
         assert(!token.isCancellationRequested, ( new CancellationError()));
@@ -49,7 +45,7 @@ let PromptPathAutocompletion = class PromptPathAutocompletion extends Disposable
             return undefined;
         }
         assertOneOf(triggerCharacter, this.triggerCharacters, `Prompt path autocompletion provider`);
-        const parser = this.promptSyntaxService.getSyntaxParserFor(model);
+        const parser = this.promptsService.getSyntaxParserFor(model);
         assert(!parser.disposed, 'Prompt parser must not be disposed.');
         const { references } = await parser
             .start()
@@ -59,15 +55,18 @@ let PromptPathAutocompletion = class PromptPathAutocompletion extends Disposable
         if (!fileReference) {
             return undefined;
         }
-        const modelDirname = dirname(model.uri);
+        const { parentFolder } = parser;
+        if (parentFolder === null) {
+            return undefined;
+        }
         if (triggerCharacter === ':' || (triggerCharacter === '.' && fileReference.path === '.')) {
             return {
-                suggestions: await this.getFirstFolderSuggestions(triggerCharacter, modelDirname, fileReference),
+                suggestions: await this.getFirstFolderSuggestions(triggerCharacter, parentFolder, fileReference),
             };
         }
         if (triggerCharacter === '/' || triggerCharacter === '.') {
             return {
-                suggestions: await this.getNonFirstFolderSuggestions(triggerCharacter, modelDirname, fileReference),
+                suggestions: await this.getNonFirstFolderSuggestions(triggerCharacter, parentFolder, fileReference),
             };
         }
         assertNever(triggerCharacter, `Unexpected trigger character '${triggerCharacter}'.`);
@@ -135,8 +134,8 @@ let PromptPathAutocompletion = class PromptPathAutocompletion extends Disposable
         if (linkRange === undefined) {
             return [];
         }
-        const currenFolder = extUri.resolvePath(fileFolderUri, path);
-        let suggestions = await this.getFolderSuggestions(currenFolder);
+        const currentFolder = extUri.resolvePath(fileFolderUri, path);
+        let suggestions = await this.getFolderSuggestions(currentFolder);
         if (character === '.') {
             suggestions = suggestions.filter((suggestion) => {
                 return suggestion.label.startsWith('.');
@@ -166,9 +165,5 @@ PromptPathAutocompletion = ( __decorate([
     ( __param(1, IPromptsService)),
     ( __param(2, ILanguageFeaturesService))
 ], PromptPathAutocompletion));
-if (!isWindows) {
-    ( Registry.as(Extensions.Workbench))
-        .registerWorkbenchContribution(PromptPathAutocompletion, LifecyclePhase.Eventually);
-}
 
 export { PromptPathAutocompletion };

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

@@ -0,0 +1,11 @@
+import { TSharedPrompt } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/types";
+import { IPromptsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/types.service";
+import { ITextModel } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/model";
+import { ObservableDisposable } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/base/common/observableDisposable";
+export declare abstract class ProviderInstanceBase extends ObservableDisposable {
+    protected readonly model: ITextModel;
+    protected abstract onPromptSettled(error: Error | undefined): Promise<this>;
+    abstract toString(): string;
+    protected readonly parser: TSharedPrompt;
+    constructor(model: ITextModel, promptsService: IPromptsService);
+}

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

@@ -0,0 +1,22 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { IPromptsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/types.service';
+import { ObservableDisposable } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/base/common/observableDisposable';
+
+let ProviderInstanceBase = class ProviderInstanceBase extends ObservableDisposable {
+    constructor(model, promptsService) {
+        super();
+        this.model = model;
+        this.parser = promptsService.getSyntaxParserFor(model);
+        this._register(this.parser.onSettled(this.onPromptSettled.bind(this)));
+        this.parser
+            .onDispose(this.dispose.bind(this))
+            .start();
+        setTimeout(this.onPromptSettled.bind(this));
+    }
+};
+ProviderInstanceBase = ( __decorate([
+    ( __param(1, IPromptsService))
+], ProviderInstanceBase));
+
+export { ProviderInstanceBase };

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

@@ -0,0 +1,17 @@
+import { ProviderInstanceBase } from "./providerInstanceBase.js";
+import { ITextModel } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/model";
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { IModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service";
+import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
+import { IEditor } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/editorCommon";
+import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
+import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
+export interface IPromptFileEditor extends IEditor {
+    readonly getModel: () => ITextModel;
+}
+export declare abstract class ProviderInstanceManagerBase<TInstance extends ProviderInstanceBase> extends Disposable {
+    private readonly instances;
+    protected abstract get InstanceClass(): new (editor: ITextModel, ...args: any[]) => TInstance;
+    constructor(modelService: IModelService, editorService: IEditorService, initService: IInstantiationService, configService: IConfigurationService);
+    private handleNewEditor;
+}

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

@@ -0,0 +1,83 @@
+
+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 { assertDefined } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
+import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { ObjectCache } from '../../../../../../../../base/common/objectCache.js';
+import { PROMPT_LANGUAGE_ID, INSTRUCTIONS_LANGUAGE_ID } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/constants';
+import { IModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service';
+import { PromptsConfig } from '@codingame/monaco-vscode-51fed910-d648-5620-9b80-9232cd79d116-common/vscode/vs/platform/prompts/common/config';
+import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
+import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
+import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
+
+let ProviderInstanceManagerBase = class ProviderInstanceManagerBase extends Disposable {
+    constructor(modelService, editorService, initService, configService) {
+        super();
+        this.instances = this._register(( new ObjectCache((model) => {
+            assert(model.isDisposed() === false, 'Text model must not be disposed.');
+            assertDefined(this.InstanceClass, 'Instance class field must be defined.');
+            const instance = initService.createInstance(this.InstanceClass, model);
+            instance.assertNotDisposed('Created instance must not be disposed.');
+            return instance;
+        })));
+        if (PromptsConfig.enabled(configService) === false) {
+            return;
+        }
+        this._register(editorService.onDidActiveEditorChange(() => {
+            const { activeTextEditorControl } = editorService;
+            if (activeTextEditorControl === undefined) {
+                return;
+            }
+            this.handleNewEditor(activeTextEditorControl);
+        }));
+        editorService
+            .visibleTextEditorControls
+            .forEach(this.handleNewEditor.bind(this));
+        this._register(modelService.onModelLanguageChanged((event) => {
+            const { model, oldLanguageId } = event;
+            if (isPromptFileModel(model)) {
+                this.instances.get(model);
+                return;
+            }
+            if (isPromptOrInstructionsFile(oldLanguageId)) {
+                this.instances.remove(model, true);
+                return;
+            }
+        }));
+    }
+    handleNewEditor(editor) {
+        const model = editor.getModel();
+        if (model === null) {
+            return this;
+        }
+        if (isPromptFileModel(model) === false) {
+            return this;
+        }
+        this.instances.get(model);
+        return this;
+    }
+};
+ProviderInstanceManagerBase = ( __decorate([
+    ( __param(0, IModelService)),
+    ( __param(1, IEditorService)),
+    ( __param(2, IInstantiationService)),
+    ( __param(3, IConfigurationService))
+], ProviderInstanceManagerBase));
+const isPromptOrInstructionsFile = (languageId) => {
+    return (languageId === PROMPT_LANGUAGE_ID) || (languageId === INSTRUCTIONS_LANGUAGE_ID);
+};
+const isPromptFileModel = (model) => {
+    if ('modified' in model || 'model' in model) {
+        return false;
+    }
+    if (model.isDisposed()) {
+        return false;
+    }
+    if (isPromptOrInstructionsFile(model.getLanguageId()) === false) {
+        return false;
+    }
+    return true;
+};
+
+export { ProviderInstanceManagerBase };

package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/textModelPromptParser.d.ts

@@ -1,9 +1,10 @@
-import { BasePromptParser } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/parsers/basePromptParser";
 import { ITextModel } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/model";
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
-import { TextModelContentsProvider } from "../contentProviders/textModelContentsProvider.js";
+import { BasePromptParser, IPromptParserOptions } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/parsers/basePromptParser";
+import { TextModelContentsProvider } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/contentProviders/textModelContentsProvider";
+import { IWorkspaceContextService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 export declare class TextModelPromptParser extends BasePromptParser<TextModelContentsProvider> {
-    constructor(model: ITextModel, seenReferences: string[] | undefined, initService: IInstantiationService, logService: ILogService);
+    constructor(model: ITextModel, options: Partial<IPromptParserOptions> | undefined, initService: IInstantiationService, workspaceService: IWorkspaceContextService, logService: ILogService);
     toString(): string;
 }

package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/textModelPromptParser.js

@@ -1,14 +1,15 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import { BasePromptParser } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/parsers/basePromptParser';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
-import { TextModelContentsProvider } from '../contentProviders/textModelContentsProvider.js';
+import { BasePromptParser } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/parsers/basePromptParser';
+import { TextModelContentsProvider } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/contentProviders/textModelContentsProvider';
+import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 
 let TextModelPromptParser = class TextModelPromptParser extends BasePromptParser {
-    constructor(model, seenReferences = [], initService, logService) {
-        const contentsProvider = initService.createInstance(TextModelContentsProvider, model);
-        super(contentsProvider, seenReferences, initService, logService);
+    constructor(model, options = {}, initService, workspaceService, logService) {
+        const contentsProvider = initService.createInstance(TextModelContentsProvider, model, options);
+        super(contentsProvider, options, initService, workspaceService, logService);
         this._register(contentsProvider);
     }
     toString() {
@@ -17,7 +18,8 @@ let TextModelPromptParser = class TextModelPromptParser extends BasePromptParser
 };
 TextModelPromptParser = ( __decorate([
     ( __param(2, IInstantiationService)),
-    ( __param(3, ILogService))
+    ( __param(3, IWorkspaceContextService)),
+    ( __param(4, ILogService))
 ], TextModelPromptParser));
 
 export { TextModelPromptParser };

package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.d.ts

@@ -1,20 +1,32 @@
-import { IPromptPath } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/types";
-import { IPromptsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/types.service";
+import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { ITextModel } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/model";
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { TextModelPromptParser } from "../parsers/textModelPromptParser.js";
+import { ILabelService } from "@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service";
+import { IModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { IUserDataProfileService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/userDataProfile/common/userDataProfile.service";
+import { IChatPromptSlashCommand, TCombinedToolsMetadata, IMetadata, IPromptPath, TPromptsType } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/types";
+import { IPromptsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/types.service";
 export declare class PromptsService extends Disposable implements IPromptsService {
+    private readonly labelService;
+    private readonly modelService;
     private readonly initService;
     private readonly userDataService;
     readonly _serviceBrand: undefined;
     private readonly cache;
     private readonly fileLocator;
-    constructor(initService: IInstantiationService, userDataService: IUserDataProfileService);
+    constructor(labelService: ILabelService, modelService: IModelService, initService: IInstantiationService, userDataService: IUserDataProfileService);
     getSyntaxParserFor(model: ITextModel): TextModelPromptParser & {
         disposed: false;
     };
-    listPromptFiles(): Promise<readonly IPromptPath[]>;
-    getSourceFolders(type: IPromptPath["type"]): readonly IPromptPath[];
+    listPromptFiles(type: TPromptsType): Promise<readonly IPromptPath[]>;
+    getSourceFolders(type: TPromptsType): readonly IPromptPath[];
+    asPromptSlashCommand(command: string): IChatPromptSlashCommand | undefined;
+    resolvePromptSlashCommand(data: IChatPromptSlashCommand): Promise<IPromptPath | undefined>;
+    findPromptSlashCommands(): Promise<IChatPromptSlashCommand[]>;
+    findInstructionFilesFor(files: readonly URI[]): Promise<readonly URI[]>;
+    getAllMetadata(promptUris: readonly URI[]): Promise<IMetadata[]>;
+    getCombinedToolsMetadata(promptUris: readonly URI[]): Promise<TCombinedToolsMetadata | null>;
 }
+export declare function getPromptCommandName(path: string): string;