@codingame/monaco-vscode-katex-common 25.0.0 → 25.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-katex-common",
-  "version": "25.0.0",
+  "version": "25.1.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - common package depending on katex",
   "keywords": [],
@@ -15,7 +15,7 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-api": "25.0.0",
+    "@codingame/monaco-vscode-api": "25.1.0",
     "katex": "0.16.27",
     "marked": "14.0.0"
   },

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

@@ -26,8 +26,8 @@ import { MultiDiffEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/wor
 import { MultiDiffEditorItem } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
 import { getChatSessionType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatUri';
-import { constObservable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/constObservable';
 import { isObservable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils/utils';
+import { constObservable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/constObservable';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
 const $ = $$1;

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

@@ -112,7 +112,8 @@ let ChatTerminalToolConfirmationSubPart = class ChatTerminalToolConfirmationSubP
             }
         };
         const languageId = this.languageService.getLanguageIdByLanguageName(terminalData.language ?? 'sh') ?? 'shellscript';
-        const model = this._register(this.modelService.createModel(terminalData.commandLine.toolEdited ?? terminalData.commandLine.original, this.languageService.createById(languageId), this._getUniqueCodeBlockUri(), true));
+        const initialContent = (terminalData.commandLine.toolEdited ?? terminalData.commandLine.original).trimStart();
+        const model = this._register(this.modelService.createModel(initialContent, this.languageService.createById(languageId), this._getUniqueCodeBlockUri(), true));
         thenRegisterOrDispose(textModelService.createModelReference(model.uri), this._store);
         const editor = this._register(this.editorPool.get());
         const renderPromise = editor.object.render({
@@ -140,7 +141,8 @@ let ChatTerminalToolConfirmationSubPart = class ChatTerminalToolConfirmationSubP
             this._onDidChangeHeight.fire();
         }));
         this._register(model.onDidChangeContent(e => {
-            terminalData.commandLine.userEdited = model.getValue();
+            const currentValue = model.getValue();
+            terminalData.commandLine.userEdited = currentValue !== initialContent ? currentValue : undefined;
         }));
         const elements = h('.chat-confirmation-message-terminal', [
             h('.chat-confirmation-message-terminal-editor@editor'),

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

@@ -183,7 +183,7 @@ let ChatTerminalToolProgressPart = class ChatTerminalToolProgressPart extends Ba
             h('.chat-terminal-content-message@message')
         ]);
         this._titleElement = elements.title;
-        const command = terminalData.commandLine.userEdited ?? terminalData.commandLine.toolEdited ?? terminalData.commandLine.original;
+        const command = (terminalData.commandLine.userEdited ?? terminalData.commandLine.toolEdited ?? terminalData.commandLine.original).trimStart();
         this._commandText = command;
         this._terminalOutputContextKey = ChatContextKeys.inChatTerminalToolOutput.bindTo(this._contextKeyService);
         this._decoration = this._register(this._instantiationService.createInstance(TerminalCommandDecoration, {

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

@@ -193,6 +193,16 @@ export declare class ChatInputPart extends Disposable implements IHistoryNavigat
     private readonly _waitForPersistedLanguageModel;
     private _onDidChangeCurrentLanguageModel;
     private readonly _chatSessionOptionEmitters;
+    /**
+     * Scoped context key service for this chat input part.
+     * Used to isolate option group context keys to this specific chat input instance.
+     */
+    private _scopedContextKeyService;
+    /**
+     * Map of option group ID to its context key.
+     * Keys follow the pattern `chatSessionOption.<groupId>` and hold the currently selected option item ID.
+     */
+    private readonly _optionContextKeys;
     private _currentLanguageModel;
     get currentLanguageModel(): string | undefined;
     get selectedLanguageModel(): ILanguageModelChatMetadataAndIdentifier | undefined;
@@ -297,6 +307,21 @@ export declare class ChatInputPart extends Disposable implements IHistoryNavigat
     private _acceptInputForVoiceover;
     private _handleAttachedContextChange;
     private getOrCreateOptionEmitter;
+    /**
+     * Get or create a context key for an option group.
+     * Context keys follow the pattern `chatSessionOption.<groupId>`.
+     */
+    private getOrCreateOptionContextKey;
+    /**
+     * Update the context key for an option group with the current selection.
+     * This enables `when` expressions on other option groups to react to changes.
+     */
+    private updateOptionContextKey;
+    /**
+     * Evaluate whether an option group should be visible based on its `when` expression.
+     * Returns true if the option group should be visible, false otherwise.
+     */
+    private evaluateOptionGroupVisibility;
     /**
      * Refresh all registered option groups for the current chat session.
      * Fires events for each option group with their current selection.

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

@@ -45,6 +45,7 @@ import { MenuWorkbenchButtonBar } from '../../../../../../platform/actions/brows
 import { MenuWorkbenchToolBar, HiddenItemStrategy } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/browser/toolbar';
 import { MenuId, MenuItemAction } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
+import { RawContextKey, ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
 import { registerAndCreateHistoryNavigationContext } from '@codingame/monaco-vscode-api/vscode/vs/platform/history/browser/contextScopedHistoryWidget';
@@ -273,6 +274,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         this._waitForPersistedLanguageModel = this._register(( new MutableDisposable()));
         this._onDidChangeCurrentLanguageModel = this._register(( new Emitter()));
         this._chatSessionOptionEmitters = ( new Map());
+        this._optionContextKeys = ( new Map());
         this._onDidChangeCurrentChatMode = this._register(( new Emitter()));
         this.onDidChangeCurrentChatMode = this._onDidChangeCurrentChatMode.event;
         this.inputUri = ( URI.parse(`${Schemas.vscodeChatInput}:input-${ChatInputPart_1._counter++}`));
@@ -489,6 +491,16 @@ let ChatInputPart = class ChatInputPart extends Disposable {
             return [];
         }
         this.disposeSessionPickerWidgets();
+        for (const optionGroup of optionGroups) {
+            if (!ctx) {
+                continue;
+            }
+            const currentOption = this.chatSessionsService.getSessionOption(ctx.chatSessionResource, optionGroup.id);
+            if (currentOption) {
+                const optionId = typeof currentOption === 'string' ? currentOption : currentOption.id;
+                this.updateOptionContextKey(optionGroup.id, optionId);
+            }
+        }
         const widgets = [];
         for (const optionGroup of optionGroups) {
             if (!ctx) {
@@ -497,6 +509,9 @@ let ChatInputPart = class ChatInputPart extends Disposable {
             if (!this.chatSessionsService.getSessionOption(ctx.chatSessionResource, optionGroup.id)) {
                 continue;
             }
+            if (!this.evaluateOptionGroupVisibility(optionGroup)) {
+                continue;
+            }
             const initialItem = this.getCurrentOptionForGroup(optionGroup.id);
             const initialState = { group: optionGroup, item: initialItem };
             const itemDelegate = {
@@ -507,8 +522,10 @@ let ChatInputPart = class ChatInputPart extends Disposable {
                     if (!ctx) {
                         return;
                     }
+                    this.updateOptionContextKey(optionGroup.id, option.id);
                     this.getOrCreateOptionEmitter(optionGroup.id).fire(option);
                     this.chatSessionsService.notifySessionOptionsChange(ctx.chatSessionResource, [{ optionId: optionGroup.id, value: option }]).catch(err => this.logService.error(`Failed to notify extension of ${optionGroup.id} change:`, err));
+                    this.refreshChatSessionPickers();
                 },
                 getAllOptions: () => {
                     const ctx = resolveChatSessionContext();
@@ -929,6 +946,38 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         }
         return emitter;
     }
+    getOrCreateOptionContextKey(optionGroupId) {
+        if (!this._scopedContextKeyService) {
+            return undefined;
+        }
+        let contextKey = this._optionContextKeys.get(optionGroupId);
+        if (!contextKey) {
+            const rawKey = ( new RawContextKey(`chatSessionOption.${optionGroupId}`, ''));
+            contextKey = rawKey.bindTo(this._scopedContextKeyService);
+            this._optionContextKeys.set(optionGroupId, contextKey);
+        }
+        return contextKey;
+    }
+    updateOptionContextKey(optionGroupId, optionItemId) {
+        const normalizedOptionId = optionItemId.trim();
+        const contextKey = this.getOrCreateOptionContextKey(optionGroupId);
+        if (contextKey) {
+            contextKey.set(normalizedOptionId);
+        }
+    }
+    evaluateOptionGroupVisibility(optionGroup) {
+        if (!optionGroup.when) {
+            return true;
+        }
+        if (!this._scopedContextKeyService) {
+            return true;
+        }
+        const expr = ContextKeyExpr.deserialize(optionGroup.when);
+        if (!expr) {
+            return true;
+        }
+        return this._scopedContextKeyService.contextMatchesRules(expr);
+    }
     refreshChatSessionPickers() {
         const sessionResource = this._widget?.viewModel?.model.sessionResource;
         const hideAll = () => {
@@ -949,11 +998,32 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         if (!this.chatSessionsService.hasAnySessionOptions(ctx.chatSessionResource)) {
             return hideAll();
         }
+        for (const optionGroup of optionGroups) {
+            const currentOption = this.chatSessionsService.getSessionOption(ctx.chatSessionResource, optionGroup.id);
+            if (currentOption) {
+                const optionId = typeof currentOption === 'string' ? currentOption : currentOption.id;
+                this.updateOptionContextKey(optionGroup.id, optionId);
+            }
+            else {
+                this.logService.trace(`[ChatInputPart] No session option set for group '${optionGroup.id}'`);
+            }
+        }
+        const visibleGroupIds = ( new Set());
+        for (const optionGroup of optionGroups) {
+            if (!this.chatSessionsService.getSessionOption(ctx.chatSessionResource, optionGroup.id)) {
+                continue;
+            }
+            if (this.evaluateOptionGroupVisibility(optionGroup)) {
+                visibleGroupIds.add(optionGroup.id);
+            }
+        }
+        if (visibleGroupIds.size === 0) {
+            return hideAll();
+        }
         this.chatSessionHasOptions.set(true);
         const currentWidgetGroupIds = ( new Set(( this.chatSessionPickerWidgets.keys())));
-        const requiredGroupIds = ( new Set(( optionGroups.map(g => g.id))));
-        const needsRecreation = currentWidgetGroupIds.size !== requiredGroupIds.size ||
-            !Array.from(requiredGroupIds).every(id => ( currentWidgetGroupIds.has(id)));
+        const needsRecreation = currentWidgetGroupIds.size !== visibleGroupIds.size ||
+            !Array.from(visibleGroupIds).every(id => ( currentWidgetGroupIds.has(id)));
         if (needsRecreation && this._lastSessionPickerAction && this.chatSessionPickerContainer) {
             const widgets = this.createChatSessionPickerWidgets(this._lastSessionPickerAction);
             clearNode(this.chatSessionPickerContainer);
@@ -1015,7 +1085,8 @@ let ChatInputPart = class ChatInputPart extends Disposable {
             return;
         }
         if (typeof currentOptionValue === 'string') {
-            return optionGroup.items.find(m => m.id === currentOptionValue);
+            const normalizedOptionId = currentOptionValue.trim();
+            return optionGroup.items.find(m => m.id === normalizedOptionId);
         }
         else {
             return currentOptionValue;
@@ -1089,6 +1160,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         container.append(this.container);
         this.container.append(this.chatInputOverlay);
         this.container.classList.toggle('compact', this.options.renderStyle === 'compact');
+        this._scopedContextKeyService = this._register(this.contextKeyService.createScoped(this.container));
         this.followupsContainer = elements.followupsContainer;
         const inputAndSideToolbar = elements.inputAndSideToolbar;
         const inputContainer = elements.inputContainer;