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

package/vscode/src/vs/workbench/contrib/chat/browser/{actions/promptActions/dialogs/askToSelectPrompt → promptSyntax/pickers}/promptFilePickers.js

@@ -5,7 +5,7 @@ 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 { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
-import { IPromptsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/types.service';
+import { IPromptsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.service';
 import { extUri, dirname, joinPath } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
@@ -13,24 +13,24 @@ import { ILabelService } from '@codingame/monaco-vscode-api/vscode/vs/platform/l
 import { IOpenerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service';
 import { IDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service';
 import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
-import { PromptsType, getCleanPromptName } from '@codingame/monaco-vscode-47472025-cc45-5680-86cd-09ceaba921a1-common/vscode/vs/platform/prompts/common/prompts';
-import { PROMPT_DOCUMENTATION_URL, INSTRUCTIONS_DOCUMENTATION_URL, MODE_DOCUMENTATION_URL } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/constants';
-import { NEW_PROMPT_COMMAND_ID, NEW_INSTRUCTIONS_COMMAND_ID, NEW_MODE_COMMAND_ID } from '../../../../promptSyntax/contributions/createPromptCommand/createPromptCommand.js';
+import { getCleanPromptName } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/promptFileLocations';
+import { PROMPT_DOCUMENTATION_URL, INSTRUCTIONS_DOCUMENTATION_URL, MODE_DOCUMENTATION_URL, PromptsType } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
+import { NEW_PROMPT_COMMAND_ID, NEW_INSTRUCTIONS_COMMAND_ID, NEW_MODE_COMMAND_ID } from '../newPromptFileActions.js';
 import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service';
-import { askForPromptFileName } from '../../../../promptSyntax/contributions/createPromptCommand/dialogs/askForPromptName.js';
+import { askForPromptFileName } from './askForPromptName.js';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { CancellationToken } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
-import { askForPromptSourceFolder } from '../../../../promptSyntax/contributions/createPromptCommand/dialogs/askForPromptSourceFolder.js';
 import { UILabelProvider } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keybindingLabels';
 import { OS } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
+import { askForPromptSourceFolder } from './askForPromptSourceFolder.js';
 
 const HELP_BUTTON = ( Object.freeze({
-    tooltip: ( localize(4542, "Help")),
+    tooltip: ( localize(5178, "Help")),
     iconClass: ThemeIcon.asClassName(Codicon.question),
 }));
 const NEW_PROMPT_FILE_OPTION = ( Object.freeze({
     type: 'item',
-    label: `$(plus) ${( localize(4543, 'New prompt file...'))}`,
+    label: `$(plus) ${( localize(5179, 'New prompt file...'))}`,
     value: ( URI.parse(PROMPT_DOCUMENTATION_URL)),
     pickable: false,
     alwaysShow: true,
@@ -39,16 +39,25 @@ const NEW_PROMPT_FILE_OPTION = ( Object.freeze({
 }));
 const NEW_INSTRUCTIONS_FILE_OPTION = ( Object.freeze({
     type: 'item',
-    label: `$(plus) ${( localize(4544, 'Create new instruction file...'))}`,
+    label: `$(plus) ${( localize(5180, 'New instruction file...'))}`,
     value: ( URI.parse(INSTRUCTIONS_DOCUMENTATION_URL)),
     pickable: false,
     alwaysShow: true,
     buttons: [HELP_BUTTON],
     commandId: NEW_INSTRUCTIONS_COMMAND_ID,
 }));
+const UPDATE_INSTRUCTIONS_OPTION = ( Object.freeze({
+    type: 'item',
+    label: `$(refresh) ${( localize(5181, 'Generate instructions...'))}`,
+    value: ( URI.parse(INSTRUCTIONS_DOCUMENTATION_URL)),
+    pickable: false,
+    alwaysShow: true,
+    buttons: [HELP_BUTTON],
+    commandId: 'workbench.action.chat.generateInstructions',
+}));
 const NEW_MODE_FILE_OPTION = ( Object.freeze({
     type: 'item',
-    label: `$(plus) ${( localize(4545, 'Create new custom chat mode file...'))}`,
+    label: `$(plus) ${( localize(5182, 'Create new custom chat mode file...'))}`,
     value: ( URI.parse(MODE_DOCUMENTATION_URL)),
     pickable: false,
     alwaysShow: true,
@@ -56,20 +65,20 @@ const NEW_MODE_FILE_OPTION = ( Object.freeze({
     commandId: NEW_MODE_COMMAND_ID,
 }));
 const EDIT_BUTTON = ( Object.freeze({
-    tooltip: ( localize(4546, "Open in Editor")),
+    tooltip: ( localize(5183, "Open in Editor")),
     iconClass: ThemeIcon.asClassName(Codicon.edit),
 }));
 const DELETE_BUTTON = ( Object.freeze({
-    tooltip: ( localize(4547, "Delete")),
+    tooltip: ( localize(5184, "Delete")),
     iconClass: ThemeIcon.asClassName(Codicon.trash),
 }));
 const RENAME_BUTTON = ( Object.freeze({
-    tooltip: ( localize(4548, "Rename")),
+    tooltip: ( localize(5185, "Rename")),
     iconClass: ThemeIcon.asClassName(Codicon.replace),
 }));
 const COPY_BUTTON = ( Object.freeze({
     tooltip: ( localize(
-        4549,
+        5186,
         "Copy or Move (press {0})",
         UILabelProvider.modifierLabels[OS].ctrlKey
     )),
@@ -89,7 +98,7 @@ let PromptFilePickers = class PromptFilePickers {
     async selectPromptFile(options) {
         const quickPick = this._quickInputService.createQuickPick();
         quickPick.busy = true;
-        quickPick.placeholder = ( localize(4550, 'Searching file system...'));
+        quickPick.placeholder = ( localize(5187, 'Searching file system...'));
         try {
             const fileOptions = await this._createPromptPickItems(options);
             const activeItem = options.resource && fileOptions.find(f => extUri.isEqual(f.value, options.resource));
@@ -177,20 +186,20 @@ let PromptFilePickers = class PromptFilePickers {
                 return 0;
             });
         }
-        const newItem = options.optionNew !== false ? this._getNewItem(options.type) : undefined;
-        if (newItem) {
-            fileOptions.splice(0, 0, newItem);
+        const newItems = options.optionNew !== false ? this._getNewItems(options.type) : [];
+        if (newItems.length > 0) {
+            fileOptions.splice(0, 0, ...newItems);
         }
         return fileOptions;
     }
-    _getNewItem(type) {
+    _getNewItems(type) {
         switch (type) {
             case PromptsType.prompt:
-                return NEW_PROMPT_FILE_OPTION;
+                return [NEW_PROMPT_FILE_OPTION];
             case PromptsType.instructions:
-                return NEW_INSTRUCTIONS_FILE_OPTION;
+                return [NEW_INSTRUCTIONS_FILE_OPTION, UPDATE_INSTRUCTIONS_OPTION];
             case PromptsType.mode:
-                return NEW_MODE_FILE_OPTION;
+                return [NEW_MODE_FILE_OPTION];
             default:
                 throw ( new Error(`Unknown prompt type '${type}'.`));
         }
@@ -199,7 +208,7 @@ let PromptFilePickers = class PromptFilePickers {
         const { uri, storage } = promptFile;
         const fileWithoutExtension = getCleanPromptName(uri);
         const description = (storage === 'user')
-            ? ( localize(4551, 'User data folder'))
+            ? ( localize(5188, 'User data folder'))
             : this._labelService.getUriLabel(dirname(uri), { relative: true });
         const tooltip = (storage === 'user')
             ? description
@@ -270,7 +279,7 @@ let PromptFilePickers = class PromptFilePickers {
             await this.keepQuickPickOpen(quickPick, async () => {
                 const filename = getCleanPromptName(value);
                 const { confirmed } = await this._dialogService.confirm({
-                    message: ( localize(4552, "Are you sure you want to delete '{0}'?", filename)),
+                    message: ( localize(5189, "Are you sure you want to delete '{0}'?", filename)),
                 });
                 if (!confirmed) {
                     return;

package/vscode/src/vs/workbench/contrib/chat/browser/promptSyntax/promptCodingAgentActionContribution.d.ts

@@ -0,0 +1,11 @@
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { ICodeEditor } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorBrowser";
+import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
+export declare class PromptCodingAgentActionContribution extends Disposable {
+    private readonly _editor;
+    private readonly _instantiationService;
+    static readonly ID = "promptCodingAgentActionContribution";
+    private readonly _overlayWidgets;
+    constructor(_editor: ICodeEditor, _instantiationService: IInstantiationService);
+    private _updateOverlayWidget;
+}

package/vscode/src/vs/workbench/contrib/chat/browser/promptSyntax/promptCodingAgentActionContribution.js

@@ -0,0 +1,35 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { Disposable, DisposableMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { registerEditorContribution, EditorContributionInstantiation } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorExtensions';
+import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
+import { PROMPT_LANGUAGE_ID } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
+import { PromptCodingAgentActionOverlayWidget } from './promptCodingAgentActionOverlay.js';
+
+let PromptCodingAgentActionContribution = class PromptCodingAgentActionContribution extends Disposable {
+    static { this.ID = 'promptCodingAgentActionContribution'; }
+    constructor(_editor, _instantiationService) {
+        super();
+        this._editor = _editor;
+        this._instantiationService = _instantiationService;
+        this._overlayWidgets = this._register(( new DisposableMap()));
+        this._register(this._editor.onDidChangeModel(() => {
+            this._updateOverlayWidget();
+        }));
+        this._updateOverlayWidget();
+    }
+    _updateOverlayWidget() {
+        const model = this._editor.getModel();
+        this._overlayWidgets.deleteAndDispose(this._editor);
+        if (model && model.getLanguageId() === PROMPT_LANGUAGE_ID) {
+            const widget = this._instantiationService.createInstance(PromptCodingAgentActionOverlayWidget, this._editor);
+            this._overlayWidgets.set(this._editor, widget);
+        }
+    }
+};
+PromptCodingAgentActionContribution = ( __decorate([
+    ( __param(1, IInstantiationService))
+], PromptCodingAgentActionContribution));
+registerEditorContribution(PromptCodingAgentActionContribution.ID, PromptCodingAgentActionContribution, EditorContributionInstantiation.AfterFirstRender);
+
+export { PromptCodingAgentActionContribution };

package/vscode/src/vs/workbench/contrib/chat/browser/promptSyntax/promptCodingAgentActionOverlay.d.ts

@@ -0,0 +1,22 @@
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { ICodeEditor, IOverlayWidget, IOverlayWidgetPosition } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorBrowser";
+import { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service";
+import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
+import { IRemoteCodingAgentsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/remoteCodingAgents/common/remoteCodingAgentsService.service";
+export declare class PromptCodingAgentActionOverlayWidget extends Disposable implements IOverlayWidget {
+    private readonly _editor;
+    private readonly _commandService;
+    private readonly _contextKeyService;
+    private readonly _remoteCodingAgentService;
+    private static readonly ID;
+    private readonly _domNode;
+    private readonly _button;
+    private _isVisible;
+    constructor(_editor: ICodeEditor, _commandService: ICommandService, _contextKeyService: IContextKeyService, _remoteCodingAgentService: IRemoteCodingAgentsService);
+    getId(): string;
+    getDomNode(): HTMLElement;
+    getPosition(): IOverlayWidgetPosition | null;
+    private _updateVisibility;
+    private _execute;
+    dispose(): void;
+}

package/vscode/src/vs/workbench/contrib/chat/browser/promptSyntax/promptCodingAgentActionOverlay.js

@@ -0,0 +1,117 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { OverlayWidgetPositionPreference } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorBrowser';
+import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
+import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
+import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
+import { IRemoteCodingAgentsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/remoteCodingAgents/common/remoteCodingAgentsService.service';
+import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { Button } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/button/button';
+import { getPromptCommandName } from '../../common/promptSyntax/service/promptsServiceImpl.js';
+import { PROMPT_LANGUAGE_ID } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
+import { $ } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+
+var PromptCodingAgentActionOverlayWidget_1;
+let PromptCodingAgentActionOverlayWidget = class PromptCodingAgentActionOverlayWidget extends Disposable {
+    static { PromptCodingAgentActionOverlayWidget_1 = this; }
+    static { this.ID = 'promptCodingAgentActionOverlay'; }
+    constructor(_editor, _commandService, _contextKeyService, _remoteCodingAgentService) {
+        super();
+        this._editor = _editor;
+        this._commandService = _commandService;
+        this._contextKeyService = _contextKeyService;
+        this._remoteCodingAgentService = _remoteCodingAgentService;
+        this._isVisible = false;
+        this._domNode = $('.prompt-coding-agent-action-overlay');
+        this._button = this._register(( new Button(this._domNode, {
+            supportIcons: true,
+            title: ( localize(5190, "Run prompt file in a remote coding agent"))
+        })));
+        this._button.element.style.background = 'var(--vscode-button-background)';
+        this._button.element.style.color = 'var(--vscode-button-foreground)';
+        this._button.label = ( localize(5191, "{0} Delegate to Copilot coding agent", '$(cloud-upload)'));
+        this._register(this._button.onDidClick(async () => {
+            await this._execute();
+        }));
+        this._register(this._contextKeyService.onDidChangeContext(() => {
+            this._updateVisibility();
+        }));
+        this._register(this._editor.onDidChangeModel(() => {
+            this._updateVisibility();
+        }));
+        this._register(this._editor.onDidLayoutChange(() => {
+            if (this._isVisible) {
+                this._editor.layoutOverlayWidget(this);
+            }
+        }));
+        this._updateVisibility();
+    }
+    getId() {
+        return PromptCodingAgentActionOverlayWidget_1.ID;
+    }
+    getDomNode() {
+        return this._domNode;
+    }
+    getPosition() {
+        if (!this._isVisible) {
+            return null;
+        }
+        return {
+            preference: OverlayWidgetPositionPreference.BOTTOM_RIGHT_CORNER,
+        };
+    }
+    _updateVisibility() {
+        const enableRemoteCodingAgentPromptFileOverlay = ChatContextKeys.enableRemoteCodingAgentPromptFileOverlay.getValue(this._contextKeyService);
+        const hasRemoteCodingAgent = ChatContextKeys.hasRemoteCodingAgent.getValue(this._contextKeyService);
+        const model = this._editor.getModel();
+        const isPromptFile = model?.getLanguageId() === PROMPT_LANGUAGE_ID;
+        const shouldBeVisible = !!(isPromptFile && enableRemoteCodingAgentPromptFileOverlay && hasRemoteCodingAgent);
+        if (shouldBeVisible !== this._isVisible) {
+            this._isVisible = shouldBeVisible;
+            if (this._isVisible) {
+                this._editor.addOverlayWidget(this);
+            }
+            else {
+                this._editor.removeOverlayWidget(this);
+            }
+        }
+    }
+    async _execute() {
+        const model = this._editor.getModel();
+        if (!model) {
+            return;
+        }
+        this._button.enabled = false;
+        try {
+            const promptContent = model.getValue();
+            const promptName = getPromptCommandName(model.uri.path);
+            const agents = this._remoteCodingAgentService.getAvailableAgents();
+            const agent = agents[0];
+            if (!agent) {
+                return;
+            }
+            await this._commandService.executeCommand(agent.command, {
+                userPrompt: promptName,
+                summary: promptContent,
+                source: 'prompt',
+            });
+        }
+        finally {
+            this._button.enabled = true;
+        }
+    }
+    dispose() {
+        if (this._isVisible) {
+            this._editor.removeOverlayWidget(this);
+        }
+        super.dispose();
+    }
+};
+PromptCodingAgentActionOverlayWidget = PromptCodingAgentActionOverlayWidget_1 = ( __decorate([
+    ( __param(1, ICommandService)),
+    ( __param(2, IContextKeyService)),
+    ( __param(3, IRemoteCodingAgentsService))
+], PromptCodingAgentActionOverlayWidget));
+
+export { PromptCodingAgentActionOverlayWidget };

package/vscode/src/vs/workbench/contrib/chat/browser/promptSyntax/promptFileActions.d.ts

@@ -0,0 +1 @@
+export declare function registerPromptActions(): void;

package/vscode/src/vs/workbench/contrib/chat/browser/promptSyntax/promptFileActions.js

@@ -0,0 +1,16 @@
+
+import { registerAttachPromptActions } from './attachInstructionsAction.js';
+import { registerChatModeActions } from './chatModeActions.js';
+import { registerRunPromptActions } from './runPromptAction.js';
+import { registerSaveToPromptActions } from './saveToPromptAction.js';
+import { registerNewPromptFileActions } from './newPromptFileActions.js';
+
+function registerPromptActions() {
+    registerRunPromptActions();
+    registerAttachPromptActions();
+    registerSaveToPromptActions();
+    registerChatModeActions();
+    registerNewPromptFileActions();
+}
+
+export { registerPromptActions };

package/vscode/src/vs/workbench/contrib/chat/browser/promptSyntax/promptToolsCodeLensProvider.js

@@ -2,19 +2,18 @@
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { generateUuid } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uuid';
-import { EditOperation } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/editOperation';
 import { isITextModel } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model';
 import { ILanguageFeaturesService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/languageFeatures.service';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { CommandsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { showToolsPicker } from '../actions/chatToolPicker.js';
-import { ToolSet } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService';
 import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service';
-import { ALL_PROMPTS_LANGUAGE_SELECTOR } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/constants';
-import { PromptToolsMetadata } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/parsers/promptHeader/metadata/tools';
-import { IPromptsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/types.service';
+import { ALL_PROMPTS_LANGUAGE_SELECTOR } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
+import { PromptToolsMetadata } from '../../common/promptSyntax/parsers/promptHeader/metadata/tools.js';
+import { IPromptsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.service';
 import { registerEditorFeature } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/editorFeatures';
+import { PromptFileRewriter } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/browser/promptSyntax/promptFileRewriter';
 
 let PromptToolsCodeLensProvider = class PromptToolsCodeLensProvider extends Disposable {
     constructor(promptsService, languageService, languageModelToolsService, instantiationService) {
@@ -34,10 +33,13 @@ let PromptToolsCodeLensProvider = class PromptToolsCodeLensProvider extends Disp
     }
     async provideCodeLenses(model, token) {
         const parser = this.promptsService.getSyntaxParserFor(model);
-        const { header } = await parser
-            .start()
-            .settled();
-        if ((header === undefined) || token.isCancellationRequested) {
+        await parser.start(token).settled();
+        const { header } = parser;
+        if (!header) {
+            return undefined;
+        }
+        const completed = await header.settled;
+        if (!completed || token.isCancellationRequested) {
             return undefined;
         }
         if (('tools' in header.metadataUtility) === false) {
@@ -50,7 +52,7 @@ let PromptToolsCodeLensProvider = class PromptToolsCodeLensProvider extends Disp
         const codeLens = {
             range: tools.range.collapseToStart(),
             command: {
-                title: ( localize(5077, "Configure Tools...")),
+                title: ( localize(5192, "Configure Tools...")),
                 id: this.cmdId,
                 arguments: [model, tools]
             }
@@ -58,32 +60,12 @@ let PromptToolsCodeLensProvider = class PromptToolsCodeLensProvider extends Disp
         return { lenses: [codeLens] };
     }
     async updateTools(model, tools) {
-        const toolNames = ( new Set(tools.value));
-        const selectedToolsNow = ( new Map());
-        for (const tool of this.languageModelToolsService.getTools()) {
-            selectedToolsNow.set(tool, ( toolNames.has(tool.toolReferenceName ?? tool.displayName)));
-        }
-        for (const toolSet of this.languageModelToolsService.toolSets.get()) {
-            selectedToolsNow.set(toolSet, ( toolNames.has(toolSet.referenceName)));
-        }
-        const newSelectedAfter = await this.instantiationService.invokeFunction(showToolsPicker, ( localize(5078, "Select tools")), selectedToolsNow);
+        const selectedToolsNow = tools.value ? this.languageModelToolsService.toToolAndToolSetEnablementMap(tools.value) : ( new Map());
+        const newSelectedAfter = await this.instantiationService.invokeFunction(showToolsPicker, ( localize(5193, "Select tools")), undefined, selectedToolsNow);
         if (!newSelectedAfter) {
             return;
         }
-        const newToolNames = [];
-        for (const [item, picked] of newSelectedAfter) {
-            if (picked) {
-                if (item instanceof ToolSet) {
-                    newToolNames.push(item.referenceName);
-                }
-                else {
-                    newToolNames.push(item.toolReferenceName ?? item.displayName);
-                }
-            }
-        }
-        model.pushStackElement();
-        model.pushEditOperations(null, [EditOperation.replaceMove(tools.range, `tools: [${( newToolNames.map(s => `'${s}'`)).join(', ')}]`)], () => null);
-        model.pushStackElement();
+        await this.instantiationService.createInstance(PromptFileRewriter).rewriteTools(model, newSelectedAfter, tools.range);
     }
 };
 PromptToolsCodeLensProvider = ( __decorate([

package/vscode/src/vs/workbench/contrib/chat/browser/promptSyntax/promptUrlHandler.d.ts

@@ -0,0 +1,27 @@
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+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 { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
+import { INotificationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification.service";
+import { IOpenerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service";
+import { IRequestService } from "@codingame/monaco-vscode-api/vscode/vs/platform/request/common/request.service";
+import { IURLHandler } from "@codingame/monaco-vscode-api/vscode/vs/platform/url/common/url";
+import { IURLService } from "@codingame/monaco-vscode-api/vscode/vs/platform/url/common/url.service";
+import { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
+import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
+import { IDialogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service";
+import { IHostService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/host/browser/host.service";
+export declare class PromptUrlHandler extends Disposable implements IWorkbenchContribution, IURLHandler {
+    private readonly notificationService;
+    private readonly requestService;
+    private readonly instantiationService;
+    private readonly fileService;
+    private readonly openerService;
+    private readonly logService;
+    private readonly dialogService;
+    private readonly hostService;
+    static readonly ID = "workbench.contrib.promptUrlHandler";
+    constructor(urlService: IURLService, notificationService: INotificationService, requestService: IRequestService, instantiationService: IInstantiationService, fileService: IFileService, openerService: IOpenerService, logService: ILogService, dialogService: IDialogService, hostService: IHostService);
+    handleURL(uri: URI): Promise<boolean>;
+    private shouldBlockInstall;
+}

package/vscode/src/vs/workbench/contrib/chat/browser/promptSyntax/promptUrlHandler.js

@@ -0,0 +1,153 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { streamToBuffer, VSBuffer } from '@codingame/monaco-vscode-api/vscode/vs/base/common/buffer';
+import { CancellationToken } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
+import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+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 { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
+import { INotificationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification.service';
+import { IOpenerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service';
+import { IRequestService } from '@codingame/monaco-vscode-api/vscode/vs/platform/request/common/request.service';
+import { IURLService } from '@codingame/monaco-vscode-api/vscode/vs/platform/url/common/url.service';
+import { askForPromptFileName } from './pickers/askForPromptName.js';
+import { askForPromptSourceFolder } from './pickers/askForPromptSourceFolder.js';
+import { getCleanPromptName } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/promptFileLocations';
+import { PromptsType } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
+import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
+import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { IDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service';
+import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
+import { MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
+import { IHostService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/host/browser/host.service';
+import { mainWindow } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/window';
+
+let PromptUrlHandler = class PromptUrlHandler extends Disposable {
+    static { this.ID = 'workbench.contrib.promptUrlHandler'; }
+    constructor(urlService, notificationService, requestService, instantiationService, fileService, openerService, logService, dialogService, hostService) {
+        super();
+        this.notificationService = notificationService;
+        this.requestService = requestService;
+        this.instantiationService = instantiationService;
+        this.fileService = fileService;
+        this.openerService = openerService;
+        this.logService = logService;
+        this.dialogService = dialogService;
+        this.hostService = hostService;
+        this._register(urlService.registerHandler(this));
+    }
+    async handleURL(uri) {
+        let promptType;
+        switch (uri.path) {
+            case 'chat-prompt/install':
+                promptType = PromptsType.prompt;
+                break;
+            case 'chat-instructions/install':
+                promptType = PromptsType.instructions;
+                break;
+            case 'chat-mode/install':
+                promptType = PromptsType.mode;
+                break;
+            default:
+                return false;
+        }
+        try {
+            const query = decodeURIComponent(uri.query);
+            if (!query || !query.startsWith('url=')) {
+                return true;
+            }
+            const urlString = query.substring(4);
+            const url = ( URI.parse(urlString));
+            if (url.scheme !== Schemas.https && url.scheme !== Schemas.http) {
+                this.logService.error(`[PromptUrlHandler] Invalid URL: ${urlString}`);
+                return true;
+            }
+            await this.hostService.focus(mainWindow);
+            if (await this.shouldBlockInstall(promptType, url)) {
+                return true;
+            }
+            const result = await this.requestService.request({ type: 'GET', url: urlString }, CancellationToken.None);
+            if (result.res.statusCode !== 200) {
+                this.logService.error(`[PromptUrlHandler] Failed to fetch URL: ${urlString}`);
+                this.notificationService.error(( localize(5194, 'Failed to fetch URL: {0}', urlString)));
+                return true;
+            }
+            const responseData = ( (await streamToBuffer(result.stream)).toString());
+            const newFolder = await this.instantiationService.invokeFunction(askForPromptSourceFolder, promptType);
+            if (!newFolder) {
+                return true;
+            }
+            const newName = await this.instantiationService.invokeFunction(askForPromptFileName, promptType, newFolder.uri, getCleanPromptName(url));
+            if (!newName) {
+                return true;
+            }
+            const promptUri = URI.joinPath(newFolder.uri, newName);
+            await this.fileService.createFolder(newFolder.uri);
+            await this.fileService.createFile(promptUri, VSBuffer.fromString(responseData));
+            await this.openerService.open(promptUri);
+            return true;
+        }
+        catch (error) {
+            this.logService.error(`Error handling prompt URL ${( uri.toString())}`, error);
+            return true;
+        }
+    }
+    async shouldBlockInstall(promptType, url) {
+        let uriLabel = ( url.toString());
+        if (uriLabel.length > 50) {
+            uriLabel = `${uriLabel.substring(0, 35)}...${uriLabel.substring(uriLabel.length - 15)}`;
+        }
+        const detail = ( new MarkdownString('', { supportHtml: true }));
+        detail.appendMarkdown(( localize(5195, "This will access {0}.\n\n", `[${uriLabel}](${( url.toString())})`)));
+        detail.appendMarkdown(( localize(
+            5196,
+            "If you did not initiate this request, it may represent an attempted attack on your system. Unless you took an explicit action to initiate this request, you should press 'No'"
+        )));
+        let message;
+        switch (promptType) {
+            case PromptsType.prompt:
+                message = ( localize(
+                    5197,
+                    "An external application wants to create a prompt file with content from a URL. Do you want to continue by selecting a destination folder and name?"
+                ));
+                break;
+            case PromptsType.instructions:
+                message = ( localize(
+                    5198,
+                    "An external application wants to create an instructions file with content from a URL. Do you want to continue by selecting a destination folder and name?"
+                ));
+                break;
+            default:
+                message = ( localize(
+                    5199,
+                    "An external application wants to create a chat mode with content from a URL. Do you want to continue by selecting a destination folder and name?"
+                ));
+                break;
+        }
+        const { confirmed } = await this.dialogService.confirm({
+            type: 'warning',
+            primaryButton: ( localize(5200, "&&Yes")),
+            cancelButton: ( localize(5201, "No")),
+            message,
+            custom: {
+                markdownDetails: [{
+                        markdown: detail
+                    }]
+            }
+        });
+        return !confirmed;
+    }
+};
+PromptUrlHandler = ( __decorate([
+    ( __param(0, IURLService)),
+    ( __param(1, INotificationService)),
+    ( __param(2, IRequestService)),
+    ( __param(3, IInstantiationService)),
+    ( __param(4, IFileService)),
+    ( __param(5, IOpenerService)),
+    ( __param(6, ILogService)),
+    ( __param(7, IDialogService)),
+    ( __param(8, IHostService))
+], PromptUrlHandler));
+
+export { PromptUrlHandler };

package/vscode/src/vs/workbench/contrib/chat/browser/promptSyntax/runPromptAction.d.ts

@@ -0,0 +1 @@
+export declare function registerRunPromptActions(): void;