@codingame/monaco-vscode-chat-service-override 30.0.0 → 31.0.0

package/vscode/src/vs/workbench/contrib/chat/browser/tools/usagesTool.js

@@ -71,13 +71,13 @@ let UsagesTool = class UsagesTool extends Disposable {
         let userDescription;
         if (( languageIds.has("*"))) {
             modelDescription += "\n\nSupported for all languages.";
-            userDescription = ( localize(6696, "Find references, definitions, and implementations of a symbol"));
+            userDescription = ( localize(6779, "Find references, definitions, and implementations of a symbol"));
         } else {
             const sorted = [...languageIds].sort();
             modelDescription += `\n\nCurrently supported for: ${sorted.join(", ")}.`;
             const niceNames = ( sorted.map(id => this._languageService.getLanguageName(id) ?? id));
             userDescription = ( localize(
-                6697,
+                6780,
                 "Find references, definitions, and implementations of a symbol ({0})",
                 niceNames.join(", ")
             ));
@@ -87,7 +87,7 @@ let UsagesTool = class UsagesTool extends Disposable {
             toolReferenceName: "usages",
             canBeReferencedInPrompt: false,
             icon: ThemeIcon.fromId(Codicon.references.id),
-            displayName: ( localize(6698, "List Code Usages")),
+            displayName: ( localize(6781, "List Code Usages")),
             userDescription,
             modelDescription,
             source: ToolDataSource.Internal,
@@ -119,7 +119,7 @@ let UsagesTool = class UsagesTool extends Disposable {
     async prepareToolInvocation(context, _token) {
         const input = context.parameters;
         return {
-            invocationMessage: ( localize(6699, "Analyzing usages of `{0}`", input.symbol))
+            invocationMessage: ( localize(6782, "Analyzing usages of `{0}`", input.symbol))
         };
     }
     async invoke(invocation, _countTokens, _progress, token) {
@@ -172,7 +172,7 @@ let UsagesTool = class UsagesTool extends Disposable {
             )]);
             if (references.length === 0) {
                 const result = createToolSimpleTextResult(`No usages found for \`${input.symbol}\`.`);
-                result.toolResultMessage = ( new MarkdownString(( localize(6700, "Analyzed usages of `{0}`, no results", input.symbol))));
+                result.toolResultMessage = ( new MarkdownString(( localize(6783, "Analyzed usages of `{0}`, no results", input.symbol))));
                 return result;
             }
             const previews = await this._getLinePreviews(input.symbol, references, token);
@@ -193,8 +193,8 @@ let UsagesTool = class UsagesTool extends Disposable {
             }
             const text = lines.join("\n");
             const result = createToolSimpleTextResult(text);
-            result.toolResultMessage = references.length === 1 ? ( new MarkdownString(( localize(6701, "Analyzed usages of `{0}`, 1 result", input.symbol)))) : ( new MarkdownString(( localize(
-                6702,
+            result.toolResultMessage = references.length === 1 ? ( new MarkdownString(( localize(6784, "Analyzed usages of `{0}`, 1 result", input.symbol)))) : ( new MarkdownString(( localize(
+                6785,
                 "Analyzed usages of `{0}`, {1} results",
                 input.symbol,
                 references.length

package/vscode/src/vs/workbench/contrib/chat/browser/viewsWelcome/chatViewsWelcomeHandler.js

@@ -17,29 +17,29 @@ const chatViewsWelcomeJsonSchema = {
     properties: {
         icon: {
             type: "string",
-            description: ( localize(6703, "The icon for the welcome message."))
+            description: ( localize(6786, "The icon for the welcome message."))
         },
         title: {
             type: "string",
-            description: ( localize(6704, "The title of the welcome message."))
+            description: ( localize(6787, "The title of the welcome message."))
         },
         content: {
             type: "string",
             description: ( localize(
-                6705,
+                6788,
                 "The content of the welcome message. The first command link will be rendered as a button."
             ))
         },
         when: {
             type: "string",
-            description: ( localize(6706, "Condition when the welcome message is shown."))
+            description: ( localize(6789, "Condition when the welcome message is shown."))
         }
     }
 };
 const chatViewsWelcomeExtensionPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: "chatViewsWelcome",
     jsonSchema: {
-        description: ( localize(6707, "Contributes a welcome message to a chat view")),
+        description: ( localize(6790, "Contributes a welcome message to a chat view")),
         type: "array",
         items: chatViewsWelcomeJsonSchema
     }

package/vscode/src/vs/workbench/contrib/chat/browser/widget/input/chatQueuePickerActionItem.js

@@ -39,7 +39,7 @@ let ChatQueuePickerActionItem = class ChatQueuePickerActionItem extends BaseActi
         this.configurationService = configurationService;
         this._altKeyPressed = false;
         const isSteerDefault = this._isSteerDefault();
-        this._primaryActionAction = this._register(( new Action("chat.queuePickerPrimary", isSteerDefault ? ( localize(7061, "Steer with Message")) : ( localize(7062, "Add to Queue")), ThemeIcon.asClassName(isSteerDefault ? Codicon.arrowUp : Codicon.add), !!contextKeyService.getContextKeyValue(ChatContextKeys.inputHasText.key), () => this._runDefaultAction())));
+        this._primaryActionAction = this._register(( new Action("chat.queuePickerPrimary", isSteerDefault ? ( localize(7184, "Steer with Message")) : ( localize(7185, "Add to Queue")), ThemeIcon.asClassName(isSteerDefault ? Codicon.arrowUp : Codicon.add), !!contextKeyService.getContextKeyValue(ChatContextKeys.inputHasText.key), () => this._runDefaultAction())));
         this._primaryAction = this._register(( new ActionViewItem(undefined, this._primaryActionAction, {
             icon: true,
             label: false
@@ -47,7 +47,7 @@ let ChatQueuePickerActionItem = class ChatQueuePickerActionItem extends BaseActi
         this._register(contextKeyService.onDidChangeContext(e => {
             this._primaryActionAction.enabled = !!contextKeyService.getContextKeyValue(ChatContextKeys.inputHasText.key);
         }));
-        const dropdownAction = this._register(( new Action("chat.queuePickerDropdown", ( localize(7063, "More Actions...")))));
+        const dropdownAction = this._register(( new Action("chat.queuePickerDropdown", ( localize(7186, "More Actions...")))));
         this._dropdown = this._register(( new ChevronActionWidgetDropdown(dropdownAction, {
             actionProvider: {
                 getActions: () => this._getDropdownActions()
@@ -75,7 +75,7 @@ let ChatQueuePickerActionItem = class ChatQueuePickerActionItem extends BaseActi
     }
     _updatePrimaryAction() {
         const isSteer = this._isEffectiveSteer();
-        this._primaryActionAction.label = isSteer ? ( localize(7061, "Steer with Message")) : ( localize(7062, "Add to Queue"));
+        this._primaryActionAction.label = isSteer ? ( localize(7184, "Steer with Message")) : ( localize(7185, "Add to Queue"));
         this._primaryActionAction.class = ThemeIcon.asClassName(isSteer ? Codicon.arrowUp : Codicon.add);
     }
     _runDefaultAction() {
@@ -125,7 +125,7 @@ let ChatQueuePickerActionItem = class ChatQueuePickerActionItem extends BaseActi
         const isSteerDefault = this._isSteerDefault();
         const queueAction = {
             id: ChatQueueMessageAction.ID,
-            label: ( localize(7062, "Add to Queue")),
+            label: ( localize(7185, "Add to Queue")),
             tooltip: "",
             enabled: true,
             checked: !isSteerDefault,
@@ -133,7 +133,7 @@ let ChatQueuePickerActionItem = class ChatQueuePickerActionItem extends BaseActi
             class: undefined,
             hover: {
                 content: ( localize(
-                    7064,
+                    7187,
                     "Queue this message to send after the current request completes. The current response will finish uninterrupted before the queued message is sent."
                 ))
             },
@@ -143,7 +143,7 @@ let ChatQueuePickerActionItem = class ChatQueuePickerActionItem extends BaseActi
         };
         const steerAction = {
             id: ChatSteerWithMessageAction.ID,
-            label: ( localize(7061, "Steer with Message")),
+            label: ( localize(7184, "Steer with Message")),
             tooltip: "",
             enabled: true,
             checked: isSteerDefault,
@@ -151,7 +151,7 @@ let ChatQueuePickerActionItem = class ChatQueuePickerActionItem extends BaseActi
             class: undefined,
             hover: {
                 content: ( localize(
-                    7065,
+                    7188,
                     "Send this message at the next opportunity, signaling the current request to yield. The current response will stop and the new message will be sent immediately."
                 ))
             },
@@ -161,13 +161,13 @@ let ChatQueuePickerActionItem = class ChatQueuePickerActionItem extends BaseActi
         };
         const sendAction = {
             id: "_" + ChatSubmitAction.ID,
-            label: ( localize(7066, "Stop and Send")),
+            label: ( localize(7189, "Stop and Send")),
             tooltip: "",
             enabled: true,
             icon: Codicon.arrowRight,
             class: undefined,
             hover: {
-                content: ( localize(7067, "Cancel the current request and send this message immediately."))
+                content: ( localize(7190, "Cancel the current request and send this message immediately."))
             },
             run: () => {
                 this.commandService.executeCommand(ChatSubmitAction.ID);

package/vscode/src/vs/workbench/contrib/chat/browser/widget/input/chatStatusWidget.d.ts

@@ -1,23 +1,22 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service";
-import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
 import { IChatEntitlementService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService.service";
 import { IChatInputPartWidget } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/widget/input/chatInputPartWidgets";
 /**
  * Widget that displays a status message with an optional action button.
- * Only shown for free tier users when the setting is enabled (experiment controlled via onExP tag).
+ * Shown only when chat quota is exceeded and the chat session is empty, and only for
+ * anonymous or free tier users.
  */
 export declare class ChatStatusWidget extends Disposable implements IChatInputPartWidget {
     private readonly chatEntitlementService;
     private readonly commandService;
-    private readonly configurationService;
     private readonly telemetryService;
     static readonly ID = "chatStatusWidget";
     readonly domNode: HTMLElement;
     private messageElement;
     private actionButton;
-    constructor(chatEntitlementService: IChatEntitlementService, commandService: ICommandService, configurationService: IConfigurationService, telemetryService: ITelemetryService);
+    constructor(chatEntitlementService: IChatEntitlementService, commandService: ICommandService, telemetryService: ITelemetryService);
     private initializeIfEnabled;
     get height(): number;
     private createWidgetContent;

package/vscode/src/vs/workbench/contrib/chat/browser/widget/input/chatStatusWidget.js

@@ -6,7 +6,6 @@ import { Button } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/b
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
-import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
 import { defaultButtonStyles } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/browser/defaultStyles';
@@ -23,16 +22,10 @@ let ChatStatusWidget = class ChatStatusWidget extends Disposable {
     static {
         this.ID = "chatStatusWidget";
     }
-    constructor(
-        chatEntitlementService,
-        commandService,
-        configurationService,
-        telemetryService
-    ) {
+    constructor(chatEntitlementService, commandService, telemetryService) {
         super();
         this.chatEntitlementService = chatEntitlementService;
         this.commandService = commandService;
-        this.configurationService = configurationService;
         this.telemetryService = telemetryService;
         this.domNode = $(".chat-status-widget");
         this.domNode.style.display = "none";
@@ -41,7 +34,7 @@ let ChatStatusWidget = class ChatStatusWidget extends Disposable {
     initializeIfEnabled() {
         const entitlement = this.chatEntitlementService.entitlement;
         const isAnonymous = this.chatEntitlementService.anonymous;
-        if (isAnonymous && this.configurationService.getValue("chat.statusWidget.anonymous")) {
+        if (isAnonymous) {
             this.createWidgetContent("anonymous");
         } else if (entitlement === ChatEntitlement.Free) {
             this.createWidgetContent("free");
@@ -65,19 +58,19 @@ let ChatStatusWidget = class ChatStatusWidget extends Disposable {
         this.actionButton.element.classList.add("chat-status-button");
         if (enabledSku === "anonymous") {
             const message = ( localize(
-                7068,
+                7191,
                 "You've reached the limit for chat messages. Sign in to use Copilot Free."
             ));
-            const buttonLabel = ( localize(7069, "Sign In"));
+            const buttonLabel = ( localize(7192, "Sign In"));
             this.messageElement.textContent = message;
             this.actionButton.label = buttonLabel;
-            this.actionButton.element.ariaLabel = ( localize(7070, "{0} {1}", message, buttonLabel));
+            this.actionButton.element.ariaLabel = ( localize(7193, "{0} {1}", message, buttonLabel));
         } else {
-            const message = ( localize(7071, "You've reached the limit for chat messages."));
-            const buttonLabel = ( localize(7072, "Upgrade"));
+            const message = ( localize(7194, "You've reached the limit for chat messages."));
+            const buttonLabel = ( localize(7195, "Upgrade"));
             this.messageElement.textContent = message;
             this.actionButton.label = buttonLabel;
-            this.actionButton.element.ariaLabel = ( localize(7073, "{0} {1}", message, buttonLabel));
+            this.actionButton.element.ariaLabel = ( localize(7196, "{0} {1}", message, buttonLabel));
         }
         this._register(this.actionButton.onDidClick(async () => {
             const commandId = this.chatEntitlementService.anonymous ? CHAT_SETUP_ACTION_ID : "workbench.action.chat.upgradePlan";
@@ -91,7 +84,7 @@ let ChatStatusWidget = class ChatStatusWidget extends Disposable {
         this.domNode.appendChild(actionContainer);
     }
 };
-ChatStatusWidget = ( __decorate([( __param(0, IChatEntitlementService)), ( __param(1, ICommandService)), ( __param(2, IConfigurationService)), ( __param(3, ITelemetryService))], ChatStatusWidget));
+ChatStatusWidget = ( __decorate([( __param(0, IChatEntitlementService)), ( __param(1, ICommandService)), ( __param(2, ITelemetryService))], ChatStatusWidget));
 ChatInputPartWidgetsRegistry.register(ChatStatusWidget.ID, ChatStatusWidget, ( ContextKeyExpr.and(
     ChatContextKeys.chatQuotaExceeded,
     ChatContextKeys.chatSessionIsEmpty,

package/vscode/src/vs/workbench/contrib/chat/browser/widget/input/editor/chatInputCompletions.js

@@ -48,16 +48,16 @@ import { IChatSlashCommandService } from '@codingame/monaco-vscode-api/vscode/vs
 import { ChatModeKind, ChatAgentLocation, isSupportedChatFileScheme } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { isToolSet } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService';
 import { IChatSessionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service';
+import { getActiveHarnessSlashCommands } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/customizationHarnessService';
+import { ICustomizationHarnessService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/customizationHarnessService.service';
+import { matchesSessionType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService';
 import { IPromptsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.service';
-import { Target, PromptsType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
+import { Target } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
 import { ChatSubmitAction } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/actions/chatExecuteActions';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { resizeImage } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatImageUtils';
 import { ChatDynamicVariableModel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/attachments/chatDynamicVariables';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
-import { IChatDebugService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatDebugService.service';
-import { createDebugEventsAttachment } from '@codingame/monaco-vscode-xterm-addons-common/vscode/vs/workbench/contrib/chat/browser/chatDebug/chatDebugAttachment';
-import { getPromptFileType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/promptFileLocations';
 import { getChatSessionType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatUri';
 import { computeCompletionRanges, isEmptyUpToCompletionWord, escapeForCharClass } from './chatInputCompletionUtils.js';
 import { AgentSessionProviders, getAgentSessionProviderIcon } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessions';
@@ -71,6 +71,7 @@ let SlashCommandCompletions = class SlashCommandCompletions extends Disposable {
         chatWidgetService,
         chatSlashCommandService,
         promptsService,
+        harnessService,
         chatService,
         chatSessionsService,
         mcpService
@@ -80,6 +81,7 @@ let SlashCommandCompletions = class SlashCommandCompletions extends Disposable {
         this.chatWidgetService = chatWidgetService;
         this.chatSlashCommandService = chatSlashCommandService;
         this.promptsService = promptsService;
+        this.harnessService = harnessService;
         this._register(this.languageFeaturesService.completionProvider.register({
             scheme: Schemas.vscodeChatInput,
             hasAccessToAllModels: true
@@ -94,8 +96,7 @@ let SlashCommandCompletions = class SlashCommandCompletions extends Disposable {
                 let customAgentTarget = undefined;
                 if (widget.lockedAgentId) {
                     const sessionResource = widget.viewModel.model.sessionResource;
-                    const ctx = sessionResource && chatService.getChatSessionFromInternalUri(sessionResource);
-                    customAgentTarget = (ctx ? chatSessionsService.getCustomAgentTargetForSessionType(getChatSessionType(sessionResource)) : undefined) ?? Target.Undefined;
+                    customAgentTarget = (sessionResource ? chatSessionsService.getCustomAgentTargetForSessionType(getChatSessionType(sessionResource)) : undefined) ?? Target.Undefined;
                 }
                 const range = computeCompletionRanges(model, position, SlashCommandWord);
                 if (!range) {
@@ -231,24 +232,15 @@ let SlashCommandCompletions = class SlashCommandCompletions extends Disposable {
                 if (usedAgent) {
                     return;
                 }
-                const promptCommands = await this.promptsService.getPromptSlashCommands(token);
+                const promptCommands = await getActiveHarnessSlashCommands(this.harnessService, this.promptsService, token);
                 if (promptCommands.length === 0) {
                     return null;
                 }
                 if (widget.lockedAgentId && !widget.attachmentCapabilities.supportsPromptAttachments) {
                     return null;
                 }
-                const userInvocableCommands = promptCommands.filter(c => {
-                    if (widget.lockedAgentId) {
-                        try {
-                            const promptType = getPromptFileType(c.promptPath.uri);
-                            if (promptType && promptType === PromptsType.hook) {
-                                return false;
-                            }
-                        } catch {}
-                    }
-                    return true;
-                }).filter(c => c.parsedPromptFile?.header?.userInvocable !== false).filter(c => !c.when || widget.scopedContextKeyService.contextMatchesRules(c.when));
+                const currentSessionType = widget.viewModel.model.sessionResource ? getChatSessionType(widget.viewModel.model.sessionResource) : undefined;
+                const userInvocableCommands = promptCommands.filter(c => c.userInvocable).filter(c => matchesSessionType(c.sessionTypes, currentSessionType));
                 if (userInvocableCommands.length === 0) {
                     return null;
                 }
@@ -315,7 +307,7 @@ let SlashCommandCompletions = class SlashCommandCompletions extends Disposable {
         }));
     }
 };
-SlashCommandCompletions = ( __decorate([( __param(0, ILanguageFeaturesService)), ( __param(1, IChatWidgetService)), ( __param(2, IChatSlashCommandService)), ( __param(3, IPromptsService)), ( __param(4, IChatService)), ( __param(5, IChatSessionsService)), ( __param(6, IMcpService))], SlashCommandCompletions));
+SlashCommandCompletions = ( __decorate([( __param(0, ILanguageFeaturesService)), ( __param(1, IChatWidgetService)), ( __param(2, IChatSlashCommandService)), ( __param(3, IPromptsService)), ( __param(4, ICustomizationHarnessService)), ( __param(5, IChatService)), ( __param(6, IChatSessionsService)), ( __param(7, IMcpService))], SlashCommandCompletions));
 ( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(SlashCommandCompletions, LifecyclePhase.Eventually);
 let AgentCompletions = class AgentCompletions extends Disposable {
     constructor(
@@ -560,7 +552,7 @@ let AgentCompletions = class AgentCompletions extends Disposable {
                 if (!isEmptyUpToCompletionWord(model, range)) {
                     return;
                 }
-                const label = ( localize(7080, "Install Chat Extensions..."));
+                const label = ( localize(7202, "Install Chat Extensions..."));
                 const item = {
                     label,
                     insertText: "",
@@ -708,7 +700,7 @@ class StartParameterizedPromptAction extends Action2 {
                 messages = await prompt.resolve(args, cts.token);
             } catch (e) {
                 if (!cts.token.isCancellationRequested) {
-                    notificationService.error(( localize(7081, "Error resolving prompt: {0}", String(e))));
+                    notificationService.error(( localize(7203, "Error resolving prompt: {0}", String(e))));
                 }
                 replaceTextWith("");
                 return;
@@ -736,15 +728,15 @@ class StartParameterizedPromptAction extends Action2 {
                             id: generateUuid(),
                             kind: "generic",
                             value: contents,
-                            name: ( localize(7082, "Prompt Resource"))
+                            name: ( localize(7204, "Prompt Resource"))
                         });
                     }
                 } else if (mimeType && getAttachableImageExtension(mimeType)) {
                     const resized = await resizeImage(contents).catch(() => decodeBase64(contents).buffer);
                     chatWidget.attachmentModel.addContext({
                         id: generateUuid(),
-                        name: ( localize(7083, "Prompt Image")),
-                        fullName: ( localize(7083, "Prompt Image")),
+                        name: ( localize(7205, "Prompt Image")),
+                        fullName: ( localize(7205, "Prompt Image")),
                         value: resized,
                         kind: "image",
                         references: validURI && [{
@@ -820,9 +812,6 @@ let BuiltinDynamicCompletions = class BuiltinDynamicCompletions extends Disposab
     static {
         this.addReferenceCommand = "_addReferenceCmd";
     }
-    static {
-        this.addDebugEventsSnapshotCommand = "_addDebugEventsSnapshotCmd";
-    }
     static {
         this.VariableNameDef = ( new RegExp(
             `[${escapeForCharClass(chatVariableLeader)}${escapeForCharClass(chatAgentLeader)}][\\w:-]*`,
@@ -842,7 +831,6 @@ let BuiltinDynamicCompletions = class BuiltinDynamicCompletions extends Disposab
         codeEditorService,
         chatAgentService,
         instantiationService,
-        chatDebugService,
         chatSessionsService
     ) {
         super();
@@ -858,7 +846,6 @@ let BuiltinDynamicCompletions = class BuiltinDynamicCompletions extends Disposab
         this.codeEditorService = codeEditorService;
         this.chatAgentService = chatAgentService;
         this.instantiationService = instantiationService;
-        this.chatDebugService = chatDebugService;
         this.chatSessionsService = chatSessionsService;
         const fileWordPattern = ( new RegExp(
             `[${escapeForCharClass(chatVariableLeader)}${escapeForCharClass(chatAgentLeader)}][^\\s]*`,
@@ -1046,7 +1033,7 @@ let BuiltinDynamicCompletions = class BuiltinDynamicCompletions extends Disposab
                 result.suggestions.push({
                     label: {
                         label: sessionPrefix,
-                        description: ( localize(7084, "Attach a chat session"))
+                        description: ( localize(7206, "Attach a chat session"))
                     },
                     filterText: sessionPrefix,
                     insertText: `${sessionPrefix}:`,
@@ -1061,58 +1048,12 @@ let BuiltinDynamicCompletions = class BuiltinDynamicCompletions extends Disposab
             }
             return result;
         }, sessionWordPattern);
-        this.registerVariableCompletions("debugEventsSnapshot", (
-            {
-                widget,
-                range
-            }
-        ) => {
-            if (widget.location !== ChatAgentLocation.Chat) {
-                return;
-            }
-            const sessionResource = widget.viewModel?.sessionResource;
-            if (!sessionResource || this.chatDebugService.getEvents(sessionResource).length === 0) {
-                return;
-            }
-            const text = `${chatVariableLeader}debugEventsSnapshot`;
-            const result = {
-                suggestions: []
-            };
-            result.suggestions.push({
-                label: {
-                    label: text,
-                    description: ( localize(7085, "Attach debug events snapshot"))
-                },
-                filterText: text,
-                insertText: "",
-                range,
-                kind: CompletionItemKind.Text,
-                sortText: "z",
-                command: {
-                    id: BuiltinDynamicCompletions_1.addDebugEventsSnapshotCommand,
-                    title: "",
-                    arguments: [widget]
-                }
-            });
-            return result;
-        });
         this._register(
             CommandsRegistry.registerCommand(BuiltinDynamicCompletions_1.addReferenceCommand, (_services, arg) => {
                 assertType(arg instanceof ReferenceArgument);
                 return this.cmdAddReference(arg);
             })
         );
-        this._register(CommandsRegistry.registerCommand(
-            BuiltinDynamicCompletions_1.addDebugEventsSnapshotCommand,
-            async (_services, widget) => {
-                const sessionResource = widget.viewModel?.sessionResource;
-                if (!sessionResource) {
-                    return;
-                }
-                const attachment = await createDebugEventsAttachment(sessionResource, this.chatDebugService);
-                widget.attachmentModel.addContext(attachment);
-            }
-        ));
     }
     findActiveCodeEditor() {
         const codeEditor = this.codeEditorService.getActiveCodeEditor();
@@ -1175,7 +1116,7 @@ let BuiltinDynamicCompletions = class BuiltinDynamicCompletions extends Disposab
             const uriLabel = this.labelService.getUriLabel(resource, {
                 relative: true
             });
-            const labelDescription = description ? ( localize(7086, "{0} ({1})", uriLabel, description)) : uriLabel;
+            const labelDescription = description ? ( localize(7207, "{0} ({1})", uriLabel, description)) : uriLabel;
             const sortText = boostPriority ? " " : "!";
             return {
                 label: {
@@ -1227,7 +1168,7 @@ let BuiltinDynamicCompletions = class BuiltinDynamicCompletions extends Disposab
                 }
             }
             seen.add(resource);
-            const newLen = result.suggestions.push(makeCompletionItem(resource, FileKind.FILE, i === 0 ? ( localize(7087, "Active file")) : undefined, i === 0));
+            const newLen = result.suggestions.push(makeCompletionItem(resource, FileKind.FILE, i === 0 ? ( localize(7208, "Active file")) : undefined, i === 0));
             if (newLen - len >= 5) {
                 break;
             }
@@ -1351,7 +1292,7 @@ let BuiltinDynamicCompletions = class BuiltinDynamicCompletions extends Disposab
         arg.widget.getContrib(ChatDynamicVariableModel.ID)?.addReference(arg.variable);
     }
 };
-BuiltinDynamicCompletions = BuiltinDynamicCompletions_1 = ( __decorate([( __param(0, IHistoryService)), ( __param(1, IWorkspaceContextService)), ( __param(2, ISearchService)), ( __param(3, ILabelService)), ( __param(4, ILanguageFeaturesService)), ( __param(5, IChatWidgetService)), ( __param(6, IOutlineModelService)), ( __param(7, IEditorService)), ( __param(8, IConfigurationService)), ( __param(9, ICodeEditorService)), ( __param(10, IChatAgentService)), ( __param(11, IInstantiationService)), ( __param(12, IChatDebugService)), ( __param(13, IChatSessionsService))], BuiltinDynamicCompletions));
+BuiltinDynamicCompletions = BuiltinDynamicCompletions_1 = ( __decorate([( __param(0, IHistoryService)), ( __param(1, IWorkspaceContextService)), ( __param(2, ISearchService)), ( __param(3, ILabelService)), ( __param(4, ILanguageFeaturesService)), ( __param(5, IChatWidgetService)), ( __param(6, IOutlineModelService)), ( __param(7, IEditorService)), ( __param(8, IConfigurationService)), ( __param(9, ICodeEditorService)), ( __param(10, IChatAgentService)), ( __param(11, IInstantiationService)), ( __param(12, IChatSessionsService))], BuiltinDynamicCompletions));
 ( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(BuiltinDynamicCompletions, LifecyclePhase.Eventually);
 let ToolCompletions = class ToolCompletions extends Disposable {
     static {
@@ -1413,7 +1354,7 @@ let ToolCompletions = class ToolCompletions extends Disposable {
                         name = item.referenceName;
                     } else {
                         const source = item.source;
-                        detail = ( localize(7088, "{0}: {1}", source.label, item.displayName));
+                        detail = ( localize(7209, "{0}: {1}", source.label, item.displayName));
                         name = item.toolReferenceName ?? item.displayName;
                         documentation = item.userDescription ?? item.modelDescription;
                     }

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

@@ -10,7 +10,6 @@ import { ICodeEditorService } from '@codingame/monaco-vscode-api/vscode/vs/edito
 import { Position } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/position';
 import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
 import { TrackedRangeStickiness } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model';
-import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { ILabelService } from '@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colorUtils';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/baseColors';
@@ -28,8 +27,7 @@ import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbe
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { chatSlashCommandBackground, chatSlashCommandForeground } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/common/widget/chatColors';
 import { ChatRequestTextPart, ChatRequestSlashPromptPart, ChatRequestAgentPart, ChatRequestAgentSubcommandPart, ChatRequestSlashCommandPart, ChatRequestToolPart, ChatRequestToolSetPart, ChatRequestDynamicVariablePart, chatAgentLeader, chatSubcommandLeader } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/requestParser/chatParserTypes';
-import { ChatRequestParser } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/requestParser/chatRequestParser';
-import { getDynamicVariablesForWidget, getSelectedToolAndToolSetsForWidget } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/attachments/chatVariables';
+import { slashReg, agentReg, variableReg } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/requestParser/chatRequestParser';
 import { IPromptsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.service';
 import { ChatWidget } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/widget/chatWidget';
 import { dynamicVariableDecorationType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/attachments/chatDynamicVariables';
@@ -346,13 +344,13 @@ let InputEditorDecorations = class InputEditorDecorations extends Disposable {
         if (slashPromptPart && promptSlashCommand) {
             this.clickablePromptSlashCommand = {
                 range: Range.lift(slashPromptPart.editorRange),
-                uri: promptSlashCommand.promptPath.uri
+                uri: promptSlashCommand.uri
             };
             const promptHoverMessage = ( new MarkdownString());
             promptHoverMessage.appendText(( localize(
-                7089,
+                7210,
                 "Click to open {0}",
-                this.labelService.getUriLabel(promptSlashCommand.promptPath.uri, {
+                this.labelService.getUriLabel(promptSlashCommand.uri, {
                     relative: true
                 })
             )));
@@ -447,66 +445,35 @@ class InputEditorSlashCommandMode extends Disposable {
     }
 }
 ChatWidget.CONTRIBS.push(InputEditorDecorations, InputEditorSlashCommandMode);
-let ChatTokenDeleter = class ChatTokenDeleter extends Disposable {
-    constructor(widget, instantiationService) {
+class ChatTokenDeleter extends Disposable {
+    constructor(widget) {
         super();
         this.widget = widget;
-        this.instantiationService = instantiationService;
         this.id = "chatTokenDeleter";
-        const parser = this.instantiationService.createInstance(ChatRequestParser);
-        const inputValue = this.widget.inputEditor.getValue();
-        let previousInputValue;
-        let previousSelectedAgent;
+        let prevInsertTokenRange;
         this._register(this.widget.inputEditor.onDidChangeModelContent(e => {
-            if (!previousInputValue) {
-                previousInputValue = inputValue;
-                previousSelectedAgent = this.widget.lastSelectedAgent;
-            }
-            const change = e.changes[0];
-            if (!change.text && this.widget.viewModel) {
-                const attachmentCapabilities = previousSelectedAgent?.capabilities ?? this.widget.attachmentCapabilities;
-                const previousParsedValue = parser.parseChatRequestWithReferences(
-                    getDynamicVariablesForWidget(this.widget),
-                    getSelectedToolAndToolSetsForWidget(this.widget),
-                    previousInputValue,
-                    this.widget.location,
-                    {
-                        selectedAgent: previousSelectedAgent,
-                        mode: this.widget.input.currentModeKind,
-                        attachmentCapabilities
-                    }
-                );
-                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);
-                    if (deletedRangeOfToken && Range.compareRangesUsingStarts(token.editorRange, change.range) < 0) {
-                        if (previousInputValue && Range.isEmpty(deletedRangeOfToken)) {
-                            const deletedText = previousInputValue.substring(change.rangeOffset, change.rangeOffset + change.rangeLength);
-                            if (deletedText !== " ") {
-                                return;
-                            }
-                        }
-                        const length = deletedRangeOfToken.endColumn - deletedRangeOfToken.startColumn;
-                        const rangeToDelete = ( new Range(
-                            token.editorRange.startLineNumber,
-                            token.editorRange.startColumn,
-                            token.editorRange.endLineNumber,
-                            token.editorRange.endColumn - length
+            let insertedTokenRange;
+            if (e.changes.length === 1) {
+                const change = e.changes[0];
+                if (change.text.length > 0 && change.rangeLength === 1) {
+                    if (slashReg.test(change.text) || agentReg.test(change.text) || variableReg.test(change.text)) {
+                        insertedTokenRange = ( new Range(
+                            change.range.startLineNumber,
+                            change.range.startColumn,
+                            change.range.endLineNumber,
+                            change.range.startColumn + change.text.length
                         ));
-                        this.widget.inputEditor.executeEdits(this.id, [{
-                            range: rangeToDelete,
-                            text: ""
-                        }]);
-                        this.widget.refreshParsedInput();
                     }
-                });
+                } else if (change.text.length === 0 && prevInsertTokenRange && change.range.endColumn === prevInsertTokenRange.endColumn) {
+                    this.widget.inputEditor.executeEdits(this.id, [{
+                        range: prevInsertTokenRange,
+                        text: ""
+                    }]);
+                    this.widget.refreshParsedInput();
+                }
             }
-            previousInputValue = this.widget.inputEditor.getValue();
-            previousSelectedAgent = this.widget.lastSelectedAgent;
+            prevInsertTokenRange = insertedTokenRange;
         }));
     }
-};
-ChatTokenDeleter = ( __decorate([( __param(1, IInstantiationService))], ChatTokenDeleter));
+}
 ChatWidget.CONTRIBS.push(ChatTokenDeleter);