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

package/vscode/src/vs/workbench/contrib/chat/browser/contrib/chatInputEditorContrib.js

@@ -2,6 +2,7 @@
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
 import { Disposable, MutableDisposable, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { themeColorFromId } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
 import { ICodeEditorService } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/codeEditorService.service';
 import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
@@ -21,11 +22,11 @@ import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/sear
 import { IThemeService } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service';
 import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
 import { chatSlashCommandBackground, chatSlashCommandForeground } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/common/chatColors';
-import { IChatModeService } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/chatModes.service';
-import { ChatRequestAgentPart, ChatRequestAgentSubcommandPart, ChatRequestSlashCommandPart, ChatRequestSlashPromptPart, ChatRequestTextPart, ChatRequestToolPart, ChatRequestToolSetPart, chatAgentLeader, chatSubcommandLeader } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
-import { ChatRequestParser } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/chatRequestParser';
+import { ChatRequestAgentPart, ChatRequestAgentSubcommandPart, ChatRequestSlashCommandPart, ChatRequestSlashPromptPart, ChatRequestTextPart, ChatRequestToolPart, ChatRequestToolSetPart, chatAgentLeader, chatSubcommandLeader } from '@codingame/monaco-vscode-9ebd6daf-8734-5a28-ad24-b238f5e5819d-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
+import { ChatRequestParser } from '@codingame/monaco-vscode-9ebd6daf-8734-5a28-ad24-b238f5e5819d-common/vscode/vs/workbench/contrib/chat/common/chatRequestParser';
 import { ChatWidget } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/browser/chatWidget';
 import { dynamicVariableDecorationType } from '@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables';
+import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
 const decorationDescription = 'chat';
 const placeholderDecorationType = 'chat-session-detail';
@@ -35,13 +36,12 @@ function agentAndCommandToKey(agent, subcommand) {
     return subcommand ? `${agent.id}__${subcommand}` : agent.id;
 }
 let InputEditorDecorations = class InputEditorDecorations extends Disposable {
-    constructor(widget, codeEditorService, themeService, chatAgentService, chatModeService) {
+    constructor(widget, codeEditorService, themeService, chatAgentService) {
         super();
         this.widget = widget;
         this.codeEditorService = codeEditorService;
         this.themeService = themeService;
         this.chatAgentService = chatAgentService;
-        this.chatModeService = chatModeService;
         this.id = 'inputEditorDecorations';
         this.previouslyUsedAgents = ( new Set());
         this.viewModelDisposables = this._register(( new MutableDisposable()));
@@ -59,7 +59,13 @@ let InputEditorDecorations = class InputEditorDecorations extends Disposable {
             this.previouslyUsedAgents.add(agentAndCommandToKey(e.agent, e.slashCommand?.name));
         }));
         this._register(this.chatAgentService.onDidChangeAgents(() => this.updateInputEditorDecorations()));
-        this._register(this.chatModeService.onDidChangeChatModes(() => this.updateInputEditorDecorations()));
+        this._register(autorun(reader => {
+            const currentMode = this.widget.input.currentModeObs.read(reader);
+            if (currentMode) {
+                currentMode.description.read(reader);
+            }
+            this.updateInputEditorDecorations();
+        }));
         this.registerViewModelListeners();
     }
     registerViewModelListeners() {
@@ -104,7 +110,7 @@ let InputEditorDecorations = class InputEditorDecorations extends Disposable {
             return;
         }
         if (!inputValue) {
-            const description = this.widget.input.currentMode2.description;
+            const description = this.widget.input.currentModeObs.get().description.get();
             const decoration = [
                 {
                     range: {
@@ -216,8 +222,7 @@ let InputEditorDecorations = class InputEditorDecorations extends Disposable {
 InputEditorDecorations = ( __decorate([
     ( __param(1, ICodeEditorService)),
     ( __param(2, IThemeService)),
-    ( __param(3, IChatAgentService)),
-    ( __param(4, IChatModeService))
+    ( __param(3, IChatAgentService))
 ], InputEditorDecorations));
 class InputEditorSlashCommandMode extends Disposable {
     constructor(widget) {
@@ -268,7 +273,7 @@ let ChatTokenDeleter = class ChatTokenDeleter extends Disposable {
             }
             const change = e.changes[0];
             if (!change.text && this.widget.viewModel) {
-                const previousParsedValue = parser.parseChatRequest(this.widget.viewModel.sessionId, previousInputValue, widget.location, { selectedAgent: previousSelectedAgent, mode: this.widget.input.currentMode });
+                const previousParsedValue = parser.parseChatRequest(this.widget.viewModel.sessionId, previousInputValue, widget.location, { selectedAgent: previousSelectedAgent, mode: this.widget.input.currentModeKind });
                 const deletableTokens = previousParsedValue.parts.filter(p => p instanceof ChatRequestAgentPart || p instanceof ChatRequestAgentSubcommandPart || p instanceof ChatRequestSlashCommandPart || p instanceof ChatRequestSlashPromptPart || p instanceof ChatRequestToolPart);
                 deletableTokens.forEach(token => {
                     const deletedRangeOfToken = Range.intersectRanges(token.editorRange, change.range);

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

@@ -5,7 +5,7 @@ import { HoverAnchor, IEditorHoverParticipant, IEditorHoverRenderContext, IHover
 import { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { IChatWidgetService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service";
-import { IChatAgentData } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents";
+import { IChatAgentData } from "@codingame/monaco-vscode-9ebd6daf-8734-5a28-ad24-b238f5e5819d-common/vscode/vs/workbench/contrib/chat/common/chatAgents";
 export declare class ChatAgentHoverParticipant implements IEditorHoverParticipant<ChatAgentHoverPart> {
     private readonly editor;
     private readonly instantiationService;

package/vscode/src/vs/workbench/contrib/chat/browser/contrib/chatInputEditorHover.js

@@ -8,7 +8,7 @@ import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { ChatAgentHover, getChatAgentHoverOptions } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/browser/chatAgentHover';
 import { ChatEditorHoverWrapper } from './editorHoverWrapper.js';
-import { extractAgentAndCommand } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
+import { extractAgentAndCommand } from '@codingame/monaco-vscode-9ebd6daf-8734-5a28-ad24-b238f5e5819d-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 
 let ChatAgentHoverParticipant = class ChatAgentHoverParticipant {
@@ -58,7 +58,7 @@ let ChatAgentHoverParticipant = class ChatAgentHoverParticipant {
         return ( new RenderedHoverParts([renderedHoverPart]));
     }
     getAccessibleContent(hoverPart) {
-        return localize(5034, 'There is a chat agent hover part here.');
+        return localize(5123, 'There is a chat agent hover part here.');
     }
 };
 ChatAgentHoverParticipant = ( __decorate([

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

@@ -56,9 +56,11 @@ export declare class LanguageModelToolsService extends Disposable implements ILa
     private shouldAutoConfirm;
     private cleanupCallDisposables;
     cancelToolCallsForRequest(requestId: string): void;
-    toEnablementMap(toolOrToolsetNames: Iterable<string>): Record<string, boolean>;
+    toToolEnablementMap(toolOrToolsetNames: Set<string>): Record<string, boolean>;
+    toToolAndToolSetEnablementMap(enabledToolOrToolSetNames: readonly string[] | undefined): Map<ToolSet | IToolData, boolean>;
     private readonly _toolSets;
     readonly toolSets: IObservable<Iterable<ToolSet>>;
+    getToolSet(id: string): ToolSet | undefined;
     getToolSetByName(name: string): ToolSet | undefined;
     createToolSet(source: ToolDataSource, id: string, referenceName: string, options?: {
         icon?: ThemeIcon;

package/vscode/src/vs/workbench/contrib/chat/browser/languageModelToolsService.js

@@ -1,6 +1,5 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import { getActiveDocument } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { renderStringAsPlaintext } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/markdownRenderer';
 import { assertNever } from '@codingame/monaco-vscode-api/vscode/vs/base/common/assert';
 import { RunOnceScheduler } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
@@ -291,7 +290,12 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
     }
     async prepareToolInvocation(tool, dto, token) {
         const prepared = tool.impl.prepareToolInvocation ?
-            await tool.impl.prepareToolInvocation(dto.parameters, token)
+            await tool.impl.prepareToolInvocation({
+                parameters: dto.parameters,
+                chatRequestId: dto.chatRequestId,
+                chatSessionId: dto.context?.sessionId,
+                chatInteractionId: dto.chatInteractionId
+            }, token)
             : undefined;
         if (prepared?.confirmationMessages) {
             if (prepared.toolSpecificData?.kind !== 'terminal' && typeof prepared.confirmationMessages.allowAutoConfirm !== 'boolean') {
@@ -307,7 +311,6 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
         return prepared;
     }
     playAccessibilitySignal(toolInvocations) {
-        const hasFocusedWindow = getActiveDocument().hasFocus();
         const autoApproved = this._configurationService.getValue('chat.tools.autoApprove');
         if (autoApproved) {
             return;
@@ -316,7 +319,7 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
         if (!setting) {
             return;
         }
-        const soundEnabled = setting.sound === 'on' || (setting.sound === 'auto' && (this._accessibilityService.isScreenReaderOptimized() || !hasFocusedWindow));
+        const soundEnabled = setting.sound === 'on' || (setting.sound === 'auto' && (this._accessibilityService.isScreenReaderOptimized()));
         const announcementEnabled = this._accessibilityService.isScreenReaderOptimized() && setting.announcement === 'auto';
         if (soundEnabled || announcementEnabled) {
             this._accessibilitySignalService.playSignal(AccessibilitySignal.chatUserActionRequired, { customAlertMessage: this._instantiationService.invokeFunction(getToolConfirmationAlert, toolInvocations), userGesture: true, modality: !soundEnabled ? 'announcement' : undefined });
@@ -383,11 +386,10 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
             this._callsByRequestId.delete(requestId);
         }
     }
-    toEnablementMap(toolOrToolsetNames) {
-        const toolOrToolset = ( new Set(toolOrToolsetNames));
+    toToolEnablementMap(toolOrToolsetNames) {
         const result = {};
         for (const tool of ( this._tools.values())) {
-            if (tool.data.toolReferenceName && ( toolOrToolset.has(tool.data.toolReferenceName)) || ( toolOrToolset.has(tool.data.id))) {
+            if (tool.data.toolReferenceName && ( toolOrToolsetNames.has(tool.data.toolReferenceName))) {
                 result[tool.data.id] = true;
             }
             else {
@@ -395,17 +397,43 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
             }
         }
         for (const toolSet of this._toolSets) {
-            if (( toolOrToolset.has(toolSet.referenceName))) {
-                result[toolSet.referenceName] = true;
-            }
-            for (const tool of toolSet.getTools()) {
-                if (( toolOrToolset.has(tool.id))) {
+            if (( toolOrToolsetNames.has(toolSet.referenceName))) {
+                for (const tool of toolSet.getTools()) {
                     result[tool.id] = true;
                 }
             }
         }
         return result;
     }
+    toToolAndToolSetEnablementMap(enabledToolOrToolSetNames) {
+        const toolOrToolSetNames = enabledToolOrToolSetNames ? ( new Set(enabledToolOrToolSetNames)) : undefined;
+        const result = ( new Map());
+        for (const tool of this.getTools()) {
+            if (tool.canBeReferencedInPrompt) {
+                result.set(tool, toolOrToolSetNames === undefined || ( toolOrToolSetNames.has(tool.toolReferenceName ?? tool.displayName)));
+            }
+        }
+        for (const toolSet of this._toolSets) {
+            const enabled = toolOrToolSetNames === undefined || ( toolOrToolSetNames.has(toolSet.referenceName));
+            result.set(toolSet, enabled);
+            if (enabled && toolSet.source.type === 'mcp') {
+                for (const tool of toolSet.getTools()) {
+                    if (tool.canBeReferencedInPrompt) {
+                        result.set(tool, enabled);
+                    }
+                }
+            }
+        }
+        return result;
+    }
+    getToolSet(id) {
+        for (const toolSet of this._toolSets) {
+            if (toolSet.id === id) {
+                return toolSet;
+            }
+        }
+        return undefined;
+    }
     getToolSetByName(name) {
         for (const toolSet of this._toolSets) {
             if (toolSet.referenceName === name) {

package/vscode/src/vs/workbench/contrib/chat/browser/media/chatSetup.css

@@ -1,21 +1,3 @@
-@property --chat-setup-dialog-glow-angle {
-	syntax: '<angle>';
-	initial-value: 0deg;
-	inherits: false;
-}
-@keyframes chat-setup-dialog-glow-angle-animation {
-	0% {
-		--chat-setup-dialog-glow-angle: 0deg;
-	}
-	100% {
-		--chat-setup-dialog-glow-angle: 360deg;
-	}
-}
-.chat-setup-dialog.chat-setup-glow {
-	border: 2px solid !important;
-	border-image: linear-gradient(var(--chat-setup-dialog-glow-angle), var(--vscode-button-background) 0, var(--vscode-editorGutter-addedBackground)) 1 !important;
-	animation: 3s chat-setup-dialog-glow-angle-animation linear infinite;
-}
 .chat-setup-dialog {
 	.dialog-buttons-row > .dialog-buttons > .monaco-button.continue-button::before {
 		content: '';
@@ -51,77 +33,11 @@
 		color: var(--vscode-descriptionForeground);
 	}
 }
-.chat-setup-input-email {
-	.dialog-message-container,
-	.dialog-message-input {
-		width: 100% !important;
-	}
-	.buttons-separator {
-		display: flex;
-		width: 100%;
-		margin-top: 10px;
-		margin-bottom: 10px;
-		height: 20px;
-		align-items: center;
-	}
-	.buttons-separator-left {
-		width: 100%;
-		margin-right: 5px;
-		border-top: 1px solid var(--vscode-descriptionForeground);
-	}
-	.buttons-separator-right {
-		width: 100%;
-		margin-left: 5px;
-		border-top: 1px solid var(--vscode-descriptionForeground);
-	}
-	.dialog-buttons-row {
-		padding: 5px 10px 10px !important;
-	}
-	.monaco-inputbox {
-		width: 100% !important;
-		margin-left: 5px !important;
-		margin-right: 5px !important;
-		height: 30px;
-	}
-	.monaco-inputbox .ibwrapper {
-		height: 30px;
-	}
-	.monaco-inputbox .input {
-		height: 30px;
-	}
+.monaco-workbench.hc-black .chat-setup-dialog .dialog-buttons-row > .dialog-buttons > .monaco-button.continue-button.alternate.monochrome::before,
+.monaco-workbench.vs-dark .chat-setup-dialog .dialog-buttons-row > .dialog-buttons > .monaco-button.continue-button.alternate.monochrome::before {
+	background-image: url('./google-mono-dark.svg');
 }
-.chat-setup-dialog-legacy {
-	p {
-		margin-top: 0;
-		margin-bottom: 0;
-		width: 100%;
-	}
-	p.setup-settings {
-		font-size: 12px;
-		color: var(--vscode-descriptionForeground);
-		margin-top: 1em;
-	}
-	.chat-feature-container {
-		display: flex;
-		align-items: center;
-		gap: 6px;
-		padding: 5px 10px 5px 10px;
-	}
-	.chat-feature-container .codicon[class*='codicon-'] {
-		font-size: 16px;
-	}
-	.codicon[class*='codicon-'] {
-		font-size: 13px;
-		line-height: 1.4em;
-		vertical-align: bottom;
-	}
-	.button-container {
-		padding-top: 20px;
-	}
-	.monaco-button-dropdown {
-		width: 100%;
-	}
-	.monaco-button-dropdown .monaco-text-button {
-		width: 100%;
-	}
+.monaco-workbench.hc-light .chat-setup-dialog .dialog-buttons-row > .dialog-buttons > .monaco-button.continue-button.alternate.monochrome::before,
+.monaco-workbench.vs .chat-setup-dialog .dialog-buttons-row > .dialog-buttons > .monaco-button.continue-button.alternate.monochrome::before {
+	background-image: url('./google-mono-light.svg');
 }

package/vscode/src/vs/workbench/contrib/chat/browser/media/chatStatus.css

@@ -87,6 +87,38 @@
 .chat-status-bar-entry-tooltip .settings .setting.disabled .setting-label {
 	color: var(--vscode-disabledForeground);
 }
+.chat-status-bar-entry-tooltip .snooze-completions {
+	margin-top: 6px;
+	display: flex;
+	flex-direction: row;
+	flex-wrap: nowrap;
+	align-items: center;
+	gap: 6px;
+}
+.chat-status-bar-entry-tooltip .snooze-completions .monaco-button {
+	width: fit-content;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	text-wrap: nowrap;
+	padding: 2px 8px;
+	user-select: none;
+	-webkit-user-select: none;
+}
+.chat-status-bar-entry-tooltip .snooze-completions .snooze-label {
+	flex: 1;
+	padding-left: 2px;
+	color: var(--vscode-descriptionForeground);
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	font-variant-numeric: tabular-nums;
+}
+.chat-status-bar-entry-tooltip .snooze-completions.disabled .snooze-label {
+	color: var(--vscode-disabledForeground);
+}
+.chat-status-bar-entry-tooltip .snooze-completions .snooze-action-bar {
+	margin-left: auto;
+}
 .chat-status-bar-entry-tooltip .contribution .body {
 	display: flex;
 	flex-direction: row;

package/vscode/src/vs/workbench/contrib/chat/browser/media/google-mono-dark.svg

@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8 0C10.1563 1.22707e-05 11.967 0.793114 13.3525 2.08398L11.0576 4.37793C10.2286 3.58545 9.17429 3.18165 8 3.18164C5.91632 3.18164 4.15256 4.58959 3.52344 6.48047L3.41699 6.8457C3.32391 7.21717 3.27246 7.60448 3.27246 8C3.27246 8.52711 3.36354 9.03967 3.52344 9.51953C4.15267 11.4102 5.91647 12.8184 8 12.8184C9.07626 12.8184 9.99268 12.5346 10.709 12.0547L10.8643 11.9453C11.6252 11.3811 12.1318 10.5773 12.3057 9.63965H8V6.5459H15.5342C15.6286 7.0694 15.6797 7.61457 15.6797 8.18164C15.6797 10.6178 14.8074 12.6688 13.2949 14.0615H13.2939C11.9704 15.2833 10.16 16 8 16C4.97035 16 2.33693 14.3173 0.978516 11.835L0.850586 11.5928L0.65918 11.1816C0.236933 10.2065 0 9.12972 0 8C1.14184e-06 6.70915 0.308848 5.48721 0.850586 4.40723C2.16699 1.79267 4.87272 0 8 0Z" fill="white"/>
+</svg>

package/vscode/src/vs/workbench/contrib/chat/browser/media/google-mono-light.svg

@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8 0C10.1563 1.22707e-05 11.967 0.793114 13.3525 2.08398L11.0576 4.37793C10.2286 3.58545 9.17429 3.18165 8 3.18164C5.91632 3.18164 4.15256 4.58959 3.52344 6.48047L3.41699 6.8457C3.32391 7.21717 3.27246 7.60448 3.27246 8C3.27246 8.52711 3.36354 9.03967 3.52344 9.51953V9.52051C4.15267 11.4112 5.91647 12.8184 8 12.8184C9.07626 12.8184 9.99268 12.5346 10.709 12.0547L10.8643 11.9453C11.6252 11.3811 12.1318 10.5773 12.3057 9.63965H8V6.5459H15.5342C15.6286 7.0694 15.6797 7.61457 15.6797 8.18164C15.6797 10.6178 14.8074 12.6688 13.2949 14.0615H13.2939C11.9704 15.2833 10.16 16 8 16C4.97035 16 2.33693 14.3173 0.978516 11.835L0.850586 11.5928L0.65918 11.1816C0.236933 10.2065 0 9.12972 0 8C1.14184e-06 6.70915 0.308848 5.48721 0.850586 4.40723C2.16699 1.79267 4.87272 0 8 0Z" fill="black"/>
+</svg>

package/vscode/src/vs/workbench/contrib/chat/browser/{actions/promptActions/chatAttachInstructionsAction.d.ts → promptSyntax/attachInstructionsAction.d.ts}

@@ -1,25 +1,24 @@
-import { IChatWidget } from "@codingame/monaco-vscode-7adbeffb-8051-54a9-8c9b-b62ce9e5836f-common/vscode/vs/workbench/contrib/chat/browser/chat";
+import { IChatWidget } from "@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-common/vscode/vs/workbench/contrib/chat/browser/chat";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
-import { IPromptsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/types.service";
-import { ChatContextPick, IChatContextPickerItem } from "@codingame/monaco-vscode-f338ac19-278c-5fe1-bec8-b588de04a788-common/vscode/vs/workbench/contrib/chat/browser/chatContextPickService";
+import { IPromptsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.service";
+import { IChatContextPickerItem, IChatContextPicker } from "@codingame/monaco-vscode-f338ac19-278c-5fe1-bec8-b588de04a788-common/vscode/vs/workbench/contrib/chat/browser/chatContextPickService";
 import { ILabelService } from "@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service";
+import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 export interface IAttachInstructionsActionOptions {
     readonly widget?: IChatWidget;
     readonly resource?: URI;
     readonly skipSelectionDialog?: boolean;
 }
-export declare const registerAttachPromptActions: () => void;
+export declare function registerAttachPromptActions(): void;
 export declare class ChatInstructionsPickerPick implements IChatContextPickerItem {
     private readonly promptsService;
     private readonly labelService;
+    private readonly configurationService;
     readonly type = "pickerPick";
     readonly label: string;
     readonly icon: import("@codingame/monaco-vscode-api/vscode/vs/base/common/themables").ThemeIcon;
     readonly commandId = "workbench.action.chat.attach.instructions";
-    constructor(promptsService: IPromptsService, labelService: ILabelService);
+    constructor(promptsService: IPromptsService, labelService: ILabelService, configurationService: IConfigurationService);
     isEnabled(widget: IChatWidget): Promise<boolean> | boolean;
-    asPicker(): {
-        readonly placeholder: string;
-        readonly picks: Promise<ChatContextPick[]>;
-    };
+    asPicker(): IChatContextPicker;
 }

package/vscode/src/vs/workbench/contrib/chat/browser/{actions/promptActions/chatAttachInstructionsAction.js → promptSyntax/attachInstructionsAction.js}

@@ -1,31 +1,30 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import { ChatViewId } from '@codingame/monaco-vscode-7adbeffb-8051-54a9-8c9b-b62ce9e5836f-common/vscode/vs/workbench/contrib/chat/browser/chat';
+import { showChatView, ChatViewId } from '@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-common/vscode/vs/workbench/contrib/chat/browser/chat';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { CHAT_CATEGORY } from '@codingame/monaco-vscode-3a35f433-1297-5707-ab58-c261b8180e6d-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { CHAT_CATEGORY, CHAT_CONFIG_MENU_ID } from '@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { localize2, localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
-import { assertDefined } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
-import { IPromptsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/types.service';
-import { PromptsConfig } from '@codingame/monaco-vscode-47472025-cc45-5680-86cd-09ceaba921a1-common/vscode/vs/platform/prompts/common/config';
+import { IPromptsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.service';
+import { PromptsConfig } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/config';
 import { IViewsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service';
-import { PromptFilePickers } from './dialogs/askToSelectPrompt/promptFilePickers.js';
-import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
+import { PromptFilePickers } from './pickers/promptFilePickers.js';
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { Action2, MenuId, registerAction2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
-import { attachInstructionsFiles } from './dialogs/askToSelectPrompt/utils/attachInstructions.js';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
-import { PromptsType, getCleanPromptName } from '@codingame/monaco-vscode-47472025-cc45-5680-86cd-09ceaba921a1-common/vscode/vs/platform/prompts/common/prompts';
+import { getCleanPromptName } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/promptFileLocations';
+import { PromptsType, INSTRUCTIONS_LANGUAGE_ID } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
 import { compare } from '@codingame/monaco-vscode-api/vscode/vs/base/common/strings';
 import { ILabelService } from '@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service';
 import { dirname } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+import { toPromptFileVariableEntry, PromptFileVariableKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatVariableEntries';
 import { KeyMod, KeyCode } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
 import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { ICodeEditorService } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/codeEditorService.service';
-import { INSTRUCTIONS_LANGUAGE_ID } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/constants';
 import { CancellationToken } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import { IOpenerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service';
+import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 
 const ATTACH_INSTRUCTIONS_ACTION_ID = 'workbench.action.chat.attach.instructions';
 const CONFIGURE_INSTRUCTIONS_ACTION_ID = 'workbench.action.chat.configure.instructions';
@@ -33,7 +32,7 @@ class AttachInstructionsAction extends Action2 {
     constructor() {
         super({
             id: ATTACH_INSTRUCTIONS_ACTION_ID,
-            title: ( localize2(4525, "Attach Instructions...")),
+            title: ( localize2(5131, "Attach Instructions...")),
             f1: false,
             precondition: ( ContextKeyExpr.and(PromptsConfig.enabledCtx, ChatContextKeys.enabled)),
             category: CHAT_CATEGORY,
@@ -49,7 +48,6 @@ class AttachInstructionsAction extends Action2 {
     }
     async run(accessor, options) {
         const viewsService = accessor.get(IViewsService);
-        const commandService = accessor.get(ICommandService);
         const instaService = accessor.get(IInstantiationService);
         if (!options) {
             options = {
@@ -59,21 +57,19 @@ class AttachInstructionsAction extends Action2 {
         }
         const pickers = instaService.createInstance(PromptFilePickers);
         const { skipSelectionDialog, resource } = options;
-        const attachOptions = {
-            widget: options.widget,
-            viewsService,
-            commandService,
-        };
-        if (skipSelectionDialog) {
-            assertDefined(resource, 'Resource must be defined when skipping prompt selection dialog.');
-            const widget = await attachInstructionsFiles([resource], attachOptions);
+        const widget = options.widget ?? (await showChatView(viewsService));
+        if (!widget) {
+            return;
+        }
+        if (skipSelectionDialog && resource) {
+            widget.attachmentModel.addContext(toPromptFileVariableEntry(resource, PromptFileVariableKind.Instruction));
             widget.focusInput();
             return;
         }
-        const placeholder = ( localize(4526, 'Select instructions files to attach'));
+        const placeholder = ( localize(5132, 'Select instructions files to attach'));
         const result = await pickers.selectPromptFile({ resource, placeholder, type: PromptsType.instructions });
         if (result !== undefined) {
-            const widget = await attachInstructionsFiles([result.promptFile], attachOptions);
+            widget.attachmentModel.addContext(toPromptFileVariableEntry(result.promptFile, PromptFileVariableKind.Instruction));
             widget.focusInput();
         }
     }
@@ -82,24 +78,25 @@ class ManageInstructionsFilesAction extends Action2 {
     constructor() {
         super({
             id: CONFIGURE_INSTRUCTIONS_ACTION_ID,
-            title: ( localize2(4527, "Configure Instructions")),
+            title: ( localize2(5133, "Configure Instructions...")),
+            shortTitle: ( localize2(5134, "Instructions")),
             icon: Codicon.bookmark,
             f1: true,
             precondition: ( ContextKeyExpr.and(PromptsConfig.enabledCtx, ChatContextKeys.enabled)),
             category: CHAT_CATEGORY,
             menu: {
-                id: MenuId.ViewTitle,
-                when: ( ContextKeyExpr.equals('view', ChatViewId)),
+                id: CHAT_CONFIG_MENU_ID,
+                when: ( ContextKeyExpr.and(PromptsConfig.enabledCtx, ChatContextKeys.enabled, ( ContextKeyExpr.equals('view', ChatViewId)))),
                 order: 11,
-                group: '2_manage'
-            },
+                group: '0_level'
+            }
         });
     }
     async run(accessor) {
         const openerService = accessor.get(IOpenerService);
         const instaService = accessor.get(IInstantiationService);
         const pickers = instaService.createInstance(PromptFilePickers);
-        const placeholder = ( localize(4528, 'Select the instructions file to open'));
+        const placeholder = ( localize(5135, 'Select the instructions file to open'));
         const result = await pickers.selectPromptFile({ placeholder, type: PromptsType.instructions, optionEdit: false });
         if (result !== undefined) {
             await openerService.open(result.promptFile);
@@ -117,29 +114,30 @@ function getFocusedChatWidget(accessor) {
     }
     return lastFocusedWidget;
 }
-const getActiveInstructionsFileUri = (accessor) => {
+function getActiveInstructionsFileUri(accessor) {
     const codeEditorService = accessor.get(ICodeEditorService);
     const model = codeEditorService.getActiveCodeEditor()?.getModel();
     if (model?.getLanguageId() === INSTRUCTIONS_LANGUAGE_ID) {
         return model.uri;
     }
     return undefined;
-};
-const registerAttachPromptActions = () => {
+}
+function registerAttachPromptActions() {
     registerAction2(AttachInstructionsAction);
     registerAction2(ManageInstructionsFilesAction);
-};
+}
 let ChatInstructionsPickerPick = class ChatInstructionsPickerPick {
-    constructor(promptsService, labelService) {
+    constructor(promptsService, labelService, configurationService) {
         this.promptsService = promptsService;
         this.labelService = labelService;
+        this.configurationService = configurationService;
         this.type = 'pickerPick';
-        this.label = ( localize(4529, 'Instructions...'));
+        this.label = ( localize(5136, 'Instructions...'));
         this.icon = Codicon.bookmark;
         this.commandId = ATTACH_INSTRUCTIONS_ACTION_ID;
     }
     isEnabled(widget) {
-        return widget.attachmentModel.promptInstructions.featureEnabled;
+        return PromptsConfig.enabled(this.configurationService);
     }
     asPicker() {
         const picks = this.promptsService.listPromptFiles(PromptsType.instructions, CancellationToken.None).then(value => {
@@ -152,33 +150,33 @@ let ChatInstructionsPickerPick = class ChatInstructionsPickerPick {
                     result.push({
                         type: 'separator',
                         label: storage === 'user'
-                            ? ( localize(4530, 'User data folder'))
+                            ? ( localize(5137, 'User data folder'))
                             : this.labelService.getUriLabel(dirname(uri), { relative: true })
                     });
                 }
                 result.push({
                     label: getCleanPromptName(uri),
                     asAttachment: () => {
-                        return {
-                            kind: 'promptFile',
-                            id: ( uri.toString()),
-                            value: uri,
-                            name: this.labelService.getUriBasenameLabel(uri),
-                        };
+                        return toPromptFileVariableEntry(uri, PromptFileVariableKind.Instruction);
                     }
                 });
             }
             return result;
         });
         return {
-            placeholder: ( localize(4531, 'Select instructions files to attach')),
-            picks
+            placeholder: ( localize(5138, 'Select instructions files to attach')),
+            picks,
+            configure: {
+                label: ( localize(5139, 'Configure Instructions...')),
+                commandId: CONFIGURE_INSTRUCTIONS_ACTION_ID
+            }
         };
     }
 };
 ChatInstructionsPickerPick = ( __decorate([
     ( __param(0, IPromptsService)),
-    ( __param(1, ILabelService))
+    ( __param(1, ILabelService)),
+    ( __param(2, IConfigurationService))
 ], ChatInstructionsPickerPick));
 
 export { ChatInstructionsPickerPick, registerAttachPromptActions };

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

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