@codingame/monaco-vscode-katex-common 26.2.2 → 28.0.0

package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatCollapsibleMarkdownContentPart.d.ts

@@ -1,9 +1,10 @@
 import { IHoverService } from "@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service";
 import { IMarkdownRenderer } from "@codingame/monaco-vscode-api/vscode/vs/platform/markdown/browser/markdownRenderer";
+import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { IChatRendererContent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel";
 import { ChatTreeItem } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat";
 import { ChatCollapsibleContentPart } from "./chatCollapsibleContentPart.js";
-import { IChatContentPartRenderContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatContentParts";
+import { IChatContentPartRenderContext } from "./chatContentParts.js";
 /**
  * A collapsible content part that displays markdown content.
  * The title is shown in the collapsed state, and the full content is shown when expanded.
@@ -12,7 +13,7 @@ export declare class ChatCollapsibleMarkdownContentPart extends ChatCollapsibleC
     private readonly markdownContent;
     private readonly chatContentMarkdownRenderer;
     private contentElement;
-    constructor(title: string, markdownContent: string, context: IChatContentPartRenderContext, chatContentMarkdownRenderer: IMarkdownRenderer, hoverService: IHoverService);
+    constructor(title: string, markdownContent: string, context: IChatContentPartRenderContext, chatContentMarkdownRenderer: IMarkdownRenderer, hoverService: IHoverService, configurationService: IConfigurationService);
     protected initContent(): HTMLElement;
     hasSameContent(other: IChatRendererContent, _followingContent: IChatRendererContent[], _element: ChatTreeItem): boolean;
 }

package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatCollapsibleMarkdownContentPart.js

@@ -4,11 +4,19 @@ import { $ } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
 import { IHoverService } from '@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service';
+import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { ChatCollapsibleContentPart } from './chatCollapsibleContentPart.js';
 
 let ChatCollapsibleMarkdownContentPart = class ChatCollapsibleMarkdownContentPart extends ChatCollapsibleContentPart {
-    constructor(title, markdownContent, context, chatContentMarkdownRenderer, hoverService) {
-        super(title, context, undefined, hoverService);
+    constructor(
+        title,
+        markdownContent,
+        context,
+        chatContentMarkdownRenderer,
+        hoverService,
+        configurationService
+    ) {
+        super(title, context, undefined, hoverService, configurationService);
         this.markdownContent = markdownContent;
         this.chatContentMarkdownRenderer = chatContentMarkdownRenderer;
         this.icon = Codicon.check;
@@ -27,6 +35,6 @@ let ChatCollapsibleMarkdownContentPart = class ChatCollapsibleMarkdownContentPar
         return false;
     }
 };
-ChatCollapsibleMarkdownContentPart = ( __decorate([( __param(4, IHoverService))], ChatCollapsibleMarkdownContentPart));
+ChatCollapsibleMarkdownContentPart = ( __decorate([( __param(4, IHoverService)), ( __param(5, IConfigurationService))], ChatCollapsibleMarkdownContentPart));
 
 export { ChatCollapsibleMarkdownContentPart };

package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatCommandContentPart.d.ts

@@ -1,6 +1,6 @@
 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 { IChatContentPart, IChatContentPartRenderContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatContentParts";
+import { IChatContentPart, IChatContentPartRenderContext } from "./chatContentParts.js";
 import { IChatProgressRenderableResponseContent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel";
 import { IChatCommandButton } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService";
 export declare class ChatCommandButtonContentPart extends Disposable implements IChatContentPart {

package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatCommandContentPart.js

@@ -23,7 +23,7 @@ let ChatCommandButtonContentPart = class ChatCommandButtonContentPart extends Di
         }
     }
     renderButton(container, command, enabled, secondary) {
-        const tooltip = enabled ? command.tooltip : ( localize(5902, "Button not available in restored chat"));
+        const tooltip = enabled ? command.tooltip : ( localize(6496, "Button not available in restored chat"));
         const button = this._register(( new Button(container, {
             ...defaultButtonStyles,
             supportIcons: true,

package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatConfirmationContentPart.d.ts

@@ -4,7 +4,7 @@ import { IChatProgressRenderableResponseContent } from "@codingame/monaco-vscode
 import { IChatConfirmation } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService";
 import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service";
 import { IChatWidgetService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service";
-import { IChatContentPart, IChatContentPartRenderContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatContentParts";
+import { IChatContentPart, IChatContentPartRenderContext } from "./chatContentParts.js";
 export declare class ChatConfirmationContentPart extends Disposable implements IChatContentPart {
     private readonly instantiationService;
     private readonly chatService;

package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatConfirmationContentPart.js

@@ -26,10 +26,10 @@ let ChatConfirmationContentPart = class ChatConfirmationContentPart extends Disp
             data: confirmation.data,
             isSecondary: button !== confirmation.buttons?.[0]
         }))) : [{
-            label: ( localize(5903, "Accept")),
+            label: ( localize(6497, "Accept")),
             data: confirmation.data
         }, {
-            label: ( localize(5904, "Dismiss")),
+            label: ( localize(6498, "Dismiss")),
             data: confirmation.data,
             isSecondary: true
         }];

package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatConfirmationWidget.d.ts

@@ -7,7 +7,7 @@ import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platf
 import { IContextMenuService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextview/browser/contextView.service";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { IMarkdownRendererService } from "@codingame/monaco-vscode-api/vscode/vs/platform/markdown/browser/markdownRenderer.service";
-import { IChatContentPartRenderContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatContentParts";
+import { IChatContentPartRenderContext } from "./chatContentParts.js";
 import { IChatMarkdownAnchorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatMarkdownAnchorService.service";
 export interface IChatConfirmationButton<T> {
     label: string;

package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatConfirmationWidget.js

@@ -405,7 +405,7 @@ function configureAccessibilityContainer(container, title, message) {
     container.tabIndex = 0;
     const titleAsString = typeof title === "string" ? title : title.value;
     const messageAsString = typeof message === "string" ? message : message && "value" in message ? message.value : message && "textContent" in message ? message.textContent : "";
-    container.setAttribute("aria-label", ( localize(5905, "Chat Confirmation Dialog {0} {1}", titleAsString, messageAsString)));
+    container.setAttribute("aria-label", ( localize(6499, "Chat Confirmation Dialog {0} {1}", titleAsString, messageAsString)));
     container.classList.add("chat-confirmation-widget-container");
 }
 

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

@@ -0,0 +1,59 @@
+import { Disposable, IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { ChatTreeItem, IChatCodeBlockInfo } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat";
+import { IChatRendererContent, IChatRequestViewModel, IChatResponseViewModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel";
+import { CodeBlockModelCollection } from "../../../common/widget/codeBlockModelCollection.js";
+import { DiffEditorPool, EditorPool } from "./chatContentCodePools.js";
+import { IObservable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
+import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
+import { ITextModel } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/model";
+import { ILanguageSelection } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language";
+import { IModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service";
+import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
+export interface IChatContentPart extends IDisposable {
+    domNode: HTMLElement | undefined;
+    /**
+     * Used to indicate a part's ownership of a code block.
+     */
+    codeblocksPartId?: string;
+    /**
+     * Codeblocks that were rendered by this part into CodeBlockModelCollection.
+     */
+    codeblocks?: IChatCodeBlockInfo[];
+    /**
+     * Returns true if the other content is equivalent to what is already rendered in this content part.
+     * Returns false if a rerender is needed.
+     * followingContent is all the content that will be rendered after this content part (to support progress messages' behavior).
+     */
+    hasSameContent(other: IChatRendererContent, followingContent: IChatRendererContent[], element: ChatTreeItem): boolean;
+    /**
+     * Called when the content part is mounted to the DOM after being detached
+     * due to virtualization.
+     */
+    onDidRemount?(): void;
+    addDisposable?(disposable: IDisposable): void;
+}
+export interface IChatContentPartRenderContext {
+    readonly element: IChatRequestViewModel | IChatResponseViewModel;
+    readonly elementIndex: number;
+    readonly container: HTMLElement;
+    readonly content: ReadonlyArray<IChatRendererContent>;
+    readonly contentIndex: number;
+    readonly editorPool: EditorPool;
+    readonly codeBlockStartIndex: number;
+    readonly treeStartIndex: number;
+    readonly diffEditorPool: DiffEditorPool;
+    readonly codeBlockModelCollection: CodeBlockModelCollection;
+    readonly currentWidth: IObservable<number>;
+    readonly onDidChangeVisibility: Event<boolean>;
+    readonly inlineTextModels: InlineTextModelCollection;
+}
+/**
+ * Ref-counted collection of inline text models keyed by URI. Models are
+ * created on first acquire and disposed only when the last reference is
+ * released, preventing duplicate-model errors during re-renders.
+ */
+export declare class InlineTextModelCollection extends Disposable {
+    private readonly _collection;
+    constructor(modelService: IModelService);
+    acquire(uri: URI, value: string, languageSelection: ILanguageSelection | null, isForSimpleWidget: boolean): import("@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle").IReference<ITextModel>;
+}

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

@@ -0,0 +1,29 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { Disposable, ReferenceCollection } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { IModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service';
+
+let InlineTextModelCollection = class InlineTextModelCollection extends Disposable {
+    constructor(modelService) {
+        super();
+        this._collection = ( new InlineTextModelReferenceCollection(modelService));
+    }
+    acquire(uri, value, languageSelection, isForSimpleWidget) {
+        return this._collection.acquire(( uri.toString()), uri, value, languageSelection, isForSimpleWidget);
+    }
+};
+InlineTextModelCollection = ( __decorate([( __param(0, IModelService))], InlineTextModelCollection));
+class InlineTextModelReferenceCollection extends ReferenceCollection {
+    constructor(modelService) {
+        super();
+        this.modelService = modelService;
+    }
+    createReferencedObject(key, uri, value, languageSelection, isForSimpleWidget) {
+        return this.modelService.createModel(value, languageSelection, uri, isForSimpleWidget);
+    }
+    destroyReferencedObject(_key, model) {
+        model.dispose();
+    }
+}
+
+export { InlineTextModelCollection };

package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatDiffBlockPart.d.ts

@@ -31,8 +31,6 @@ export declare class MarkdownDiffBlockPart extends Disposable {
     private readonly modelService;
     private readonly textModelService;
     private readonly languageService;
-    private readonly _onDidChangeContentHeight;
-    readonly onDidChangeContentHeight: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<void>;
     readonly element: HTMLElement;
     private readonly comparePart;
     private readonly modelRef;

package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatDiffBlockPart.js

@@ -1,7 +1,6 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { CancellationToken } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
-import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { hashAsync } from '@codingame/monaco-vscode-api/vscode/vs/base/common/hash';
 import { Disposable, MutableDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
@@ -66,13 +65,8 @@ let MarkdownDiffBlockPart = class MarkdownDiffBlockPart extends Disposable {
         this.modelService = modelService;
         this.textModelService = textModelService;
         this.languageService = languageService;
-        this._onDidChangeContentHeight = this._register(( new Emitter()));
-        this.onDidChangeContentHeight = this._onDidChangeContentHeight.event;
         this.modelRef = this._register(( new MutableDisposable()));
         this.comparePart = this._register(diffEditorPool.get());
-        this._register(this.comparePart.object.onDidChangeContentHeight(() => {
-            this._onDidChangeContentHeight.fire();
-        }));
         const originalUri = ( URI.from({
             scheme: Schemas.vscodeChatCodeBlock,
             path: `/chat-diff-original-${data.codeBlockIndex}-${generateUuid()}`

package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatDisabledClaudeHooksContentPart.d.ts

@@ -2,7 +2,7 @@ import { Disposable, IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/
 import { IMarkdownRendererService } from "@codingame/monaco-vscode-api/vscode/vs/platform/markdown/browser/markdownRenderer.service";
 import { IOpenerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service";
 import { IChatRendererContent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel";
-import { IChatContentPart, IChatContentPartRenderContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatContentParts";
+import { IChatContentPart, IChatContentPartRenderContext } from "./chatContentParts.js";
 export declare class ChatDisabledClaudeHooksContentPart extends Disposable implements IChatContentPart {
     private readonly _openerService;
     private readonly _markdownRendererService;

package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatDisabledClaudeHooksContentPart.js

@@ -24,12 +24,12 @@ let ChatDisabledClaudeHooksContentPart = class ChatDisabledClaudeHooksContentPar
         const icon = $(".chat-disabled-claude-hooks-icon");
         icon.classList.add(...ThemeIcon.asClassNameArray(Codicon.info));
         const enableLink = createMarkdownCommandLink({
-            title: ( localize(5906, "Enable")),
+            title: ( localize(6500, "Enable")),
             id: "workbench.action.openSettings",
             arguments: [PromptsConfig.USE_CLAUDE_HOOKS]
         });
         const message = ( localize(
-            5907,
+            6501,
             "Claude Code hooks are available for this workspace. {0}",
             enableLink
         ));

package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatElicitationContentPart.d.ts

@@ -5,7 +5,7 @@ import { IKeybindingService } from "@codingame/monaco-vscode-api/vscode/vs/platf
 import { IChatProgressRenderableResponseContent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel";
 import { IChatElicitationRequest, IChatElicitationRequestSerialized } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService";
 import { IChatAccessibilityService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service";
-import { IChatContentPart, IChatContentPartRenderContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatContentParts";
+import { IChatContentPart, IChatContentPartRenderContext } from "./chatContentParts.js";
 export declare class ChatElicitationContentPart extends Disposable implements IChatContentPart {
     private readonly elicitation;
     private readonly instantiationService;

package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatErrorConfirmationPart.d.ts

@@ -5,12 +5,14 @@ import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/pl
 import { ChatErrorLevel, IChatResponseErrorDetailsConfirmationButton } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService";
 import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service";
 import { IChatErrorDetailsPart, IChatRendererContent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel";
+import { IChatAccessibilityService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service";
 import { IChatWidgetService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service";
-import { IChatContentPart, IChatContentPartRenderContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatContentParts";
+import { IChatContentPart, IChatContentPartRenderContext } from "./chatContentParts.js";
 export declare class ChatErrorConfirmationContentPart extends Disposable implements IChatContentPart {
     private readonly errorDetails;
+    private readonly chatAccessibilityService;
     readonly domNode: HTMLElement;
-    constructor(kind: ChatErrorLevel, content: IMarkdownString, errorDetails: IChatErrorDetailsPart, confirmationButtons: IChatResponseErrorDetailsConfirmationButton[], renderer: IMarkdownRenderer, context: IChatContentPartRenderContext, instantiationService: IInstantiationService, chatWidgetService: IChatWidgetService, chatService: IChatService);
+    constructor(kind: ChatErrorLevel, content: IMarkdownString, errorDetails: IChatErrorDetailsPart, confirmationButtons: IChatResponseErrorDetailsConfirmationButton[], renderer: IMarkdownRenderer, context: IChatContentPartRenderContext, instantiationService: IInstantiationService, chatWidgetService: IChatWidgetService, chatService: IChatService, chatAccessibilityService: IChatAccessibilityService);
     hasSameContent(other: IChatRendererContent): boolean;
     addDisposable(disposable: IDisposable): void;
 }

package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatErrorConfirmationPart.js

@@ -7,7 +7,7 @@ import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { defaultButtonStyles } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/browser/defaultStyles';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
 import { assertIsResponseVM } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel';
-import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
+import { IChatWidgetService, IChatAccessibilityService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { ChatErrorWidget } from './chatErrorContentPart.js';
 
 const $ = $$1;
@@ -21,10 +21,12 @@ let ChatErrorConfirmationContentPart = class ChatErrorConfirmationContentPart ex
         context,
         instantiationService,
         chatWidgetService,
-        chatService
+        chatService,
+        chatAccessibilityService
     ) {
         super();
         this.errorDetails = errorDetails;
+        this.chatAccessibilityService = chatAccessibilityService;
         const element = context.element;
         assertIsResponseVM(element);
         this.domNode = $(".chat-error-confirmation");
@@ -49,6 +51,7 @@ let ChatErrorConfirmationContentPart = class ChatErrorConfirmationContentPart ex
                 const widget = chatWidgetService.getWidgetBySessionResource(element.sessionResource);
                 options.userSelectedModelId = widget?.input.currentLanguageModel;
                 Object.assign(options, widget?.getModeRequestOptions());
+                this.chatAccessibilityService.acceptRequest(element.sessionResource);
                 await chatService.sendRequest(element.sessionResource, prompt, options);
             }));
         });
@@ -60,6 +63,6 @@ let ChatErrorConfirmationContentPart = class ChatErrorConfirmationContentPart ex
         this._register(disposable);
     }
 };
-ChatErrorConfirmationContentPart = ( __decorate([( __param(6, IInstantiationService)), ( __param(7, IChatWidgetService)), ( __param(8, IChatService))], ChatErrorConfirmationContentPart));
+ChatErrorConfirmationContentPart = ( __decorate([( __param(6, IInstantiationService)), ( __param(7, IChatWidgetService)), ( __param(8, IChatService)), ( __param(9, IChatAccessibilityService))], ChatErrorConfirmationContentPart));
 
 export { ChatErrorConfirmationContentPart };

package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatErrorContentPart.d.ts

@@ -3,7 +3,7 @@ import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/l
 import { IMarkdownRenderer } from "@codingame/monaco-vscode-api/vscode/vs/platform/markdown/browser/markdownRenderer";
 import { ChatErrorLevel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService";
 import { IChatRendererContent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel";
-import { IChatContentPart } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatContentParts";
+import { IChatContentPart } from "./chatContentParts.js";
 export declare class ChatErrorContentPart extends Disposable implements IChatContentPart {
     private readonly errorDetails;
     readonly domNode: HTMLElement;

package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatExtensionsContentPart.d.ts

@@ -4,7 +4,7 @@ import { IExtensionsWorkbenchService } from "@codingame/monaco-vscode-api/vscode
 import { IChatExtensionsContent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService";
 import { IChatRendererContent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel";
 import { ChatTreeItem, IChatCodeBlockInfo } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat";
-import { IChatContentPart } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatContentParts";
+import { IChatContentPart } from "./chatContentParts.js";
 export declare class ChatExtensionsContentPart extends Disposable implements IChatContentPart {
     private readonly extensionsContent;
     readonly domNode: HTMLElement;

package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatExtensionsContentPart.js

@@ -30,7 +30,7 @@ let ChatExtensionsContentPart = class ChatExtensionsContentPart extends Disposab
         append(
             loadingElement,
             $(ThemeIcon.asCSSSelector(ThemeIcon.modify(Codicon.loading, "spin"))),
-            $("span.loading-message", undefined, ( localize(5908, "Loading extensions...")))
+            $("span.loading-message", undefined, ( localize(6502, "Loading extensions...")))
         );
         const extensionsList = append(this.domNode, $(".extensions-list"));
         const list = this._register(

package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatHookContentPart.d.ts

@@ -1,12 +1,13 @@
 import { IHoverService } from "@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service";
+import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { IChatHookPart } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService";
 import { IChatRendererContent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel";
 import { ChatTreeItem } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat";
 import { ChatCollapsibleContentPart } from "./chatCollapsibleContentPart.js";
-import { IChatContentPart, IChatContentPartRenderContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatContentParts";
+import { IChatContentPart, IChatContentPartRenderContext } from "./chatContentParts.js";
 export declare class ChatHookContentPart extends ChatCollapsibleContentPart implements IChatContentPart {
     private readonly hookPart;
-    constructor(hookPart: IChatHookPart, context: IChatContentPartRenderContext, hoverService: IHoverService);
+    constructor(hookPart: IChatHookPart, context: IChatContentPartRenderContext, hoverService: IHoverService, configurationService: IConfigurationService);
     protected initContent(): HTMLElement;
     hasSameContent(other: IChatRendererContent, _followingContent: IChatRendererContent[], _element: ChatTreeItem): boolean;
 }

package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatHookContentPart.js

@@ -5,22 +5,23 @@ import { $ } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { IHoverService } from '@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service';
-import { HOOK_TYPES, HookType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/hookSchema';
+import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
+import { HOOK_METADATA, HookType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/hookTypes';
 import { ChatCollapsibleContentPart } from './chatCollapsibleContentPart.js';
 import * as chatHookContentPart from './media/chatHookContentPart.css';
 
 registerCss(chatHookContentPart);
 function getHookTypeLabel(hookType) {
-    return HOOK_TYPES.find(hook => hook.id === hookType)?.label ?? hookType;
+    return HOOK_METADATA[hookType]?.label ?? hookType;
 }
 let ChatHookContentPart = class ChatHookContentPart extends ChatCollapsibleContentPart {
-    constructor(hookPart, context, hoverService) {
+    constructor(hookPart, context, hoverService, configurationService) {
         const hookTypeLabel = getHookTypeLabel(hookPart.hookType);
         const isStopped = !!hookPart.stopReason;
         const isWarning = !!hookPart.systemMessage;
         const toolName = hookPart.toolDisplayName;
-        const title = isStopped ? (toolName ? ( localize(5909, "Blocked {0} - {1} hook", toolName, hookTypeLabel)) : ( localize(5910, "Blocked by {0} hook", hookTypeLabel))) : (toolName ? ( localize(5911, "Warning for {0} - {1} hook", toolName, hookTypeLabel)) : ( localize(5912, "Warning from {0} hook", hookTypeLabel)));
-        super(title, context, undefined, hoverService);
+        const title = isStopped ? (toolName ? ( localize(6503, "Blocked {0} - {1} hook", toolName, hookTypeLabel)) : ( localize(6504, "Blocked by {0} hook", hookTypeLabel))) : (toolName ? ( localize(6505, "Warning for {0} - {1} hook", toolName, hookTypeLabel)) : ( localize(6506, "Warning from {0} hook", hookTypeLabel)));
+        super(title, context, undefined, hoverService, configurationService);
         this.hookPart = hookPart;
         this.icon = isStopped ? Codicon.error : isWarning ? Codicon.warning : Codicon.check;
         if (isStopped) {
@@ -50,6 +51,6 @@ let ChatHookContentPart = class ChatHookContentPart extends ChatCollapsibleConte
         return other.hookType === this.hookPart.hookType && other.stopReason === this.hookPart.stopReason && other.systemMessage === this.hookPart.systemMessage && other.toolDisplayName === this.hookPart.toolDisplayName;
     }
 };
-ChatHookContentPart = ( __decorate([( __param(2, IHoverService))], ChatHookContentPart));
+ChatHookContentPart = ( __decorate([( __param(2, IHoverService)), ( __param(3, IConfigurationService))], ChatHookContentPart));
 
 export { ChatHookContentPart };

package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatInlineAnchorWidget.d.ts

@@ -39,7 +39,6 @@ export declare class InlineAnchorWidget extends Disposable {
     private readonly notebookDocumentService;
     private readonly openerService;
     static readonly className = "chat-inline-anchor-widget";
-    private readonly _chatResourceContext;
     readonly data: ContentRefData;
     constructor(element: HTMLAnchorElement | HTMLElement, inlineReference: IChatContentInlineReference, metadata: InlineAnchorWidgetMetadata | undefined, configurationService: IConfigurationService, originalContextKeyService: IContextKeyService, contextMenuService: IContextMenuService, fileService: IFileService, hoverService: IHoverService, instantiationService: IInstantiationService, labelService: ILabelService, languageService: ILanguageService, menuService: IMenuService, modelService: IModelService, telemetryService: ITelemetryService, themeService: IThemeService, notebookDocumentService: INotebookDocumentService, openerService: IOpenerService);
     getHTMLElement(): HTMLElement;

package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatInlineAnchorWidget.js

@@ -41,7 +41,7 @@ import { globMatchesResource } from '@codingame/monaco-vscode-api/vscode/vs/work
 import { INotebookDocumentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/notebook/common/notebookDocumentService.service';
 import { ExplorerFolderContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/files/common/files';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { chatAttachmentResourceContextKey, hookUpSymbolAttachmentDragAndContextMenu } from '../../attachments/chatAttachmentWidgets.js';
+import { hookUpSymbolAttachmentDragAndContextMenu, chatAttachmentResourceContextKey } from '../../attachments/chatAttachmentWidgets.js';
 import { IChatMarkdownAnchorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatMarkdownAnchorService.service';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { ChatConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
@@ -133,13 +133,10 @@ let InlineAnchorWidget = class InlineAnchorWidget extends Disposable {
         } : {
             uri: inlineReference.inlineReference
         };
-        const contextKeyService = this._register(originalContextKeyService.createScoped(element));
-        this._chatResourceContext = chatAttachmentResourceContextKey.bindTo(contextKeyService);
         element.classList.add(InlineAnchorWidget_1.className, "show-file-icons");
         let iconText;
         let iconClasses;
         let location;
-        let updateContextKeys;
         if (this.data.kind === "symbol") {
             const symbol = this.data.symbol;
             location = this.data.symbol.location;
@@ -152,7 +149,7 @@ let InlineAnchorWidget = class InlineAnchorWidget extends Disposable {
                 SymbolKinds.toIcon(symbol.kind)
             )];
             this._store.add(instantiationService.invokeFunction(
-                accessor => hookUpSymbolAttachmentDragAndContextMenu(accessor, element, contextKeyService, {
+                accessor => hookUpSymbolAttachmentDragAndContextMenu(accessor, element, originalContextKeyService, {
                     value: symbol.location,
                     name: symbol.name,
                     kind: symbol.kind
@@ -186,23 +183,28 @@ let InlineAnchorWidget = class InlineAnchorWidget extends Disposable {
             this._register(themeService.onDidFileIconThemeChange(() => {
                 refreshIconClasses();
             }));
-            const isFolderContext = ExplorerFolderContext.bindTo(contextKeyService);
+            let isDirectory = false;
             fileService.stat(location.uri).then(stat => {
-                isFolderContext.set(stat.isDirectory);
+                isDirectory = stat.isDirectory;
                 if (stat.isDirectory) {
                     fileKind = FileKind.FOLDER;
                     refreshIconClasses();
                 }
             }).catch(() => {});
+            const contextKeyService = this._register(originalContextKeyService.createScoped(element));
+            chatAttachmentResourceContextKey.bindTo(contextKeyService).set(( location.uri.toString()));
+            const isFolderContext = ExplorerFolderContext.bindTo(contextKeyService);
+            let contextMenuInitialized = false;
             this._register(
                 addDisposableListener(element, EventType.CONTEXT_MENU, async domEvent => {
                     const event = ( new StandardMouseEvent(getWindow(domEvent), domEvent));
                     EventHelper.stop(domEvent, true);
-                    try {
-                        await updateContextKeys?.();
-                    } catch (e) {
-                        console.error(e);
+                    if (!contextMenuInitialized) {
+                        contextMenuInitialized = true;
+                        const resourceContextKey = ( new StaticResourceContextKey(contextKeyService, fileService, languageService, modelService));
+                        resourceContextKey.set(location.uri);
                     }
+                    isFolderContext.set(isDirectory);
                     if (this._store.isDisposed) {
                         return;
                     }
@@ -220,10 +222,10 @@ let InlineAnchorWidget = class InlineAnchorWidget extends Disposable {
             );
             if (location.range) {
                 if (location.range.startLineNumber === location.range.endLineNumber) {
-                    element.setAttribute("aria-label", ( localize(5913, "{0} line {1}", filePathLabel, location.range.startLineNumber)));
+                    element.setAttribute("aria-label", ( localize(6507, "{0} line {1}", filePathLabel, location.range.startLineNumber)));
                 } else {
                     element.setAttribute("aria-label", ( localize(
-                        5914,
+                        6508,
                         "{0} lines {1} to {2}",
                         filePathLabel,
                         location.range.startLineNumber,
@@ -232,9 +234,6 @@ let InlineAnchorWidget = class InlineAnchorWidget extends Disposable {
                 }
             }
         }
-        const resourceContextKey = ( new StaticResourceContextKey(contextKeyService, fileService, languageService, modelService));
-        resourceContextKey.set(location.uri);
-        this._chatResourceContext.set(( location.uri.toString()));
         const iconEl = $("span.icon");
         iconEl.classList.add(...iconClasses);
         element.replaceChildren(iconEl, $("span.icon-label", {}, ...iconText));
@@ -302,7 +301,7 @@ registerAction2(class AddFileToChatAction extends Action2 {
     constructor() {
         super({
             id: AddFileToChatAction.id,
-            title: ( localize2(5915, "Add File to Chat")),
+            title: ( localize2(6509, "Add File to Chat")),
             menu: [{
                 id: MenuId.ChatInlineResourceAnchorContext,
                 group: "chat",
@@ -326,7 +325,7 @@ registerAction2(class CopyResourceAction extends Action2 {
     constructor() {
         super({
             id: CopyResourceAction.id,
-            title: ( localize2(5916, "Copy")),
+            title: ( localize2(6510, "Copy")),
             f1: false,
             precondition: chatAttachmentResourceContextKey,
             keybinding: {
@@ -353,7 +352,7 @@ registerAction2(class OpenToSideResourceAction extends Action2 {
     constructor() {
         super({
             id: OpenToSideResourceAction.id,
-            title: ( localize2(5917, "Open to the Side")),
+            title: ( localize2(6511, "Open to the Side")),
             f1: false,
             precondition: chatAttachmentResourceContextKey,
             keybinding: {
@@ -419,8 +418,8 @@ registerAction2(class GoToDefinitionAction extends Action2 {
         super({
             id: GoToDefinitionAction.id,
             title: {
-                ...( localize2(5918, "Go to Definition")),
-                mnemonicTitle: ( localize(5919, "Go to &&Definition"))
+                ...( localize2(6512, "Go to Definition")),
+                mnemonicTitle: ( localize(6513, "Go to &&Definition"))
             },
             menu: ( [
                 MenuId.ChatInlineSymbolAnchorContext,
@@ -477,8 +476,8 @@ registerAction2(class GoToTypeDefinitionsAction extends Action2 {
         super({
             id: GoToTypeDefinitionsAction.id,
             title: {
-                ...( localize2(5920, "Go to Type Definitions")),
-                mnemonicTitle: ( localize(5921, "Go to &&Type Definitions"))
+                ...( localize2(6514, "Go to Type Definitions")),
+                mnemonicTitle: ( localize(6515, "Go to &&Type Definitions"))
             },
             menu: ( [
                 MenuId.ChatInlineSymbolAnchorContext,
@@ -503,8 +502,8 @@ registerAction2(class GoToImplementations extends Action2 {
         super({
             id: GoToImplementations.id,
             title: {
-                ...( localize2(5922, "Go to Implementations")),
-                mnemonicTitle: ( localize(5923, "Go to &&Implementations"))
+                ...( localize2(6516, "Go to Implementations")),
+                mnemonicTitle: ( localize(6517, "Go to &&Implementations"))
             },
             menu: ( [
                 MenuId.ChatInlineSymbolAnchorContext,
@@ -529,8 +528,8 @@ registerAction2(class GoToReferencesAction extends Action2 {
         super({
             id: GoToReferencesAction.id,
             title: {
-                ...( localize2(5924, "Go to References")),
-                mnemonicTitle: ( localize(5925, "Go to &&References"))
+                ...( localize2(6518, "Go to References")),
+                mnemonicTitle: ( localize(6519, "Go to &&References"))
             },
             menu: ( [
                 MenuId.ChatInlineSymbolAnchorContext,