@codingame/monaco-vscode-api 30.0.1 → 31.0.0

package/vscode/src/vs/workbench/contrib/chat/browser/aiCustomization/aiCustomizationManagement.js

@@ -8,16 +8,19 @@ import { MenuId } from '../../../../../platform/actions/common/actions.js';
 const AI_CUSTOMIZATION_MANAGEMENT_EDITOR_ID = "workbench.editor.aiCustomizationManagement";
 const AI_CUSTOMIZATION_MANAGEMENT_EDITOR_INPUT_ID = "workbench.input.aiCustomizationManagement";
 const AICustomizationManagementCommands = {
-    OpenEditor: "aiCustomization.openManagementEditor"};
-const CONTEXT_AI_CUSTOMIZATION_MANAGEMENT_EDITOR = ( new RawContextKey("aiCustomizationManagementEditorFocused", false, ( localize(5390, "Whether the Chat Customizations editor is focused"))));
+    OpenEditor: "aiCustomization.openManagementEditor",
+    OpenMarketplace: "aiCustomization.openMarketplace",
+    GenerateDebugReport: "aiCustomization.generateDebugReport"
+};
+const CONTEXT_AI_CUSTOMIZATION_MANAGEMENT_EDITOR = ( new RawContextKey("aiCustomizationManagementEditorFocused", false, ( localize(5407, "Whether the Agent Customizations editor is focused"))));
 const CONTEXT_AI_CUSTOMIZATION_MANAGEMENT_SECTION = ( new RawContextKey(
-    "aiCustomizationManagementSection",
+    "chatCustomizationSection",
     AICustomizationManagementSection.Agents,
-    ( localize(5391, "The currently selected section in the Chat Customizations editor"))
+    ( localize(5408, "The currently selected section in the Agent Customizations editor"))
 ));
-const CONTEXT_AI_CUSTOMIZATION_MANAGEMENT_HARNESS = ( new RawContextKey("aiCustomizationManagementHarness", "", ( localize(
-    5392,
-    "The active harness (session type) in the Chat Customizations editor"
+const CONTEXT_AI_CUSTOMIZATION_MANAGEMENT_HARNESS = ( new RawContextKey("chatCustomizationSessionType", "", ( localize(
+    5409,
+    "The active harness (session type) in the Agent Customizations editor"
 ))));
 MenuId.for("AICustomizationManagementEditorTitle");
 const AICustomizationManagementItemMenuId = MenuId.for("AICustomizationManagementEditorItem");
@@ -27,6 +30,7 @@ const AI_CUSTOMIZATION_ITEM_STORAGE_KEY = "aiCustomizationManagementItemStorage"
 const AI_CUSTOMIZATION_ITEM_URI_KEY = "aiCustomizationManagementItemUri";
 const AI_CUSTOMIZATION_ITEM_PLUGIN_URI_KEY = "aiCustomizationManagementItemPluginUri";
 const AI_CUSTOMIZATION_ITEM_DISABLED_KEY = "aiCustomizationManagementItemDisabled";
+const AI_CUSTOMIZATION_SUPPORTS_TROUBLESHOOT_KEY = "aiCustomizationManagementSupportsTroubleshoot";
 const AI_CUSTOMIZATION_MANAGEMENT_SELECTED_SECTION_KEY = "aiCustomizationManagement.selectedSection";
 const AI_CUSTOMIZATION_MANAGEMENT_SIDEBAR_WIDTH_KEY = "aiCustomizationManagement.sidebarWidth";
 const SIDEBAR_DEFAULT_WIDTH = 200;
@@ -34,4 +38,4 @@ const SIDEBAR_MIN_WIDTH = 150;
 const SIDEBAR_MAX_WIDTH = 350;
 const CONTENT_MIN_WIDTH = 400;
 
-export { AICustomizationManagementCommands, AICustomizationManagementCreateMenuId, AICustomizationManagementItemMenuId, AICustomizationManagementSection, AI_CUSTOMIZATION_ITEM_DISABLED_KEY, AI_CUSTOMIZATION_ITEM_PLUGIN_URI_KEY, AI_CUSTOMIZATION_ITEM_STORAGE_KEY, AI_CUSTOMIZATION_ITEM_TYPE_KEY, AI_CUSTOMIZATION_ITEM_URI_KEY, AI_CUSTOMIZATION_MANAGEMENT_EDITOR_ID, AI_CUSTOMIZATION_MANAGEMENT_EDITOR_INPUT_ID, AI_CUSTOMIZATION_MANAGEMENT_SELECTED_SECTION_KEY, AI_CUSTOMIZATION_MANAGEMENT_SIDEBAR_WIDTH_KEY, CONTENT_MIN_WIDTH, CONTEXT_AI_CUSTOMIZATION_MANAGEMENT_EDITOR, CONTEXT_AI_CUSTOMIZATION_MANAGEMENT_HARNESS, CONTEXT_AI_CUSTOMIZATION_MANAGEMENT_SECTION, SIDEBAR_DEFAULT_WIDTH, SIDEBAR_MAX_WIDTH, SIDEBAR_MIN_WIDTH };
+export { AICustomizationManagementCommands, AICustomizationManagementCreateMenuId, AICustomizationManagementItemMenuId, AICustomizationManagementSection, AI_CUSTOMIZATION_ITEM_DISABLED_KEY, AI_CUSTOMIZATION_ITEM_PLUGIN_URI_KEY, AI_CUSTOMIZATION_ITEM_STORAGE_KEY, AI_CUSTOMIZATION_ITEM_TYPE_KEY, AI_CUSTOMIZATION_ITEM_URI_KEY, AI_CUSTOMIZATION_MANAGEMENT_EDITOR_ID, AI_CUSTOMIZATION_MANAGEMENT_EDITOR_INPUT_ID, AI_CUSTOMIZATION_MANAGEMENT_SELECTED_SECTION_KEY, AI_CUSTOMIZATION_MANAGEMENT_SIDEBAR_WIDTH_KEY, AI_CUSTOMIZATION_SUPPORTS_TROUBLESHOOT_KEY, CONTENT_MIN_WIDTH, CONTEXT_AI_CUSTOMIZATION_MANAGEMENT_EDITOR, CONTEXT_AI_CUSTOMIZATION_MANAGEMENT_HARNESS, CONTEXT_AI_CUSTOMIZATION_MANAGEMENT_SECTION, SIDEBAR_DEFAULT_WIDTH, SIDEBAR_MAX_WIDTH, SIDEBAR_MIN_WIDTH };

package/vscode/src/vs/workbench/contrib/chat/browser/attachments/chatScreenshotContext.js

@@ -5,7 +5,7 @@ const ScreenshotVariableId = "screenshot-focused-window";
 function convertBufferToScreenshotVariable(buffer) {
     return {
         id: ScreenshotVariableId,
-        name: ( localize(5549, "Screenshot")),
+        name: ( localize(5618, "Screenshot")),
         value: buffer.buffer,
         kind: "image"
     };

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

@@ -85,6 +85,11 @@ export interface ISessionTypePickerDelegate {
      * and update pickers accordingly.
      */
     onDidChangeActiveSessionProvider?: Event<AgentSessionTarget>;
+    /**
+     * Returns whether the current session's workspace has a git repository.
+     * Used to gate cloud delegation which requires a GitHub repository.
+     */
+    hasGitRepository?(): boolean;
 }
 export declare const ChatViewPaneTarget: unique symbol;
 export interface IQuickChatOpenOptions {
@@ -106,7 +111,6 @@ export interface IChatCodeBlockInfo {
     readonly codeBlockIndex: number;
     readonly elementId: string;
     readonly uri: URI | undefined;
-    readonly uriPromise: Promise<URI | undefined>;
     codemapperUri: URI | undefined;
     readonly chatSessionResource: URI | undefined;
     focus(): void;
@@ -245,6 +249,8 @@ export interface IChatWidget {
     lastSelectedAgent: IChatAgentData | undefined;
     readonly scopedContextKeyService: IContextKeyService;
     readonly input: ChatInputPart;
+    /** The main input part at the bottom of the widget. Unlike `input`, this always returns the main input, not the inline editing input. */
+    readonly inputPart: ChatInputPart;
     readonly attachmentModel: ChatAttachmentModel;
     readonly locationData?: IChatLocationData;
     readonly contribs: readonly IChatWidgetContrib[];

package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorContextKeys.js

@@ -17,16 +17,16 @@ import { autorun } from '../../../../../base/common/observableInternal/reactions
 import { derived } from '../../../../../base/common/observableInternal/observables/derived.js';
 import { constObservable } from '../../../../../base/common/observableInternal/observables/constObservable.js';
 
-const ctxIsGlobalEditingSession = ( new RawContextKey("chatEdits.isGlobalEditingSession", undefined, ( localize(6023, "The current editor is part of the global edit session"))));
-const ctxHasEditorModification = ( new RawContextKey("chatEdits.hasEditorModifications", undefined, ( localize(6024, "The current editor contains chat modifications"))));
-const ctxIsCurrentlyBeingModified = ( new RawContextKey("chatEdits.isCurrentlyBeingModified", undefined, ( localize(6025, "The current editor is currently being modified"))));
-const ctxReviewModeEnabled = ( new RawContextKey("chatEdits.isReviewModeEnabled", true, ( localize(6026, "Review mode for chat changes is enabled"))));
+const ctxIsGlobalEditingSession = ( new RawContextKey("chatEdits.isGlobalEditingSession", undefined, ( localize(6114, "The current editor is part of the global edit session"))));
+const ctxHasEditorModification = ( new RawContextKey("chatEdits.hasEditorModifications", undefined, ( localize(6115, "The current editor contains chat modifications"))));
+const ctxIsCurrentlyBeingModified = ( new RawContextKey("chatEdits.isCurrentlyBeingModified", undefined, ( localize(6116, "The current editor is currently being modified"))));
+const ctxReviewModeEnabled = ( new RawContextKey("chatEdits.isReviewModeEnabled", true, ( localize(6117, "Review mode for chat changes is enabled"))));
 const ctxHasRequestInProgress = ( new RawContextKey("chatEdits.isRequestInProgress", false, ( localize(
-    6027,
+    6118,
     "The current editor shows a file from an edit session which is still in progress"
 ))));
-const ctxRequestCount = ( new RawContextKey("chatEdits.requestCount", 0, ( localize(6028, "The number of turns the editing session in this editor has"))));
-const ctxCursorInChangeRange = ( new RawContextKey("chatEdits.cursorInChangeRange", false, ( localize(6029, "The cursor is inside a change range made by chat editing."))));
+const ctxRequestCount = ( new RawContextKey("chatEdits.requestCount", 0, ( localize(6119, "The number of turns the editing session in this editor has"))));
+const ctxCursorInChangeRange = ( new RawContextKey("chatEdits.cursorInChangeRange", false, ( localize(6120, "The cursor is inside a change range made by chat editing."))));
 let ChatEditingEditorContextKeys = class ChatEditingEditorContextKeys {
     static {
         this.ID = "chat.edits.editorContextKeys";

package/vscode/src/vs/workbench/contrib/chat/browser/chatSessions/chatSessionDescription.js

@@ -33,14 +33,14 @@ function getInProgressSessionDescription(chatModel) {
                 const confirmationTitle = state.confirmationMessages?.title;
                 const titleMessage = confirmationTitle && (typeof confirmationTitle === "string" ? confirmationTitle : confirmationTitle.value);
                 const descriptionValue = typeof description === "string" ? description : description.value;
-                description = titleMessage ?? ( localize(6190, "Waiting for confirmation: {0}", descriptionValue));
+                description = titleMessage ?? ( localize(6254, "Waiting for confirmation: {0}", descriptionValue));
             }
         } else if (part.kind === "toolInvocationSerialized") {
             description = part.invocationMessage;
         } else if (part.kind === "progressMessage") {
             description = part.content;
         } else if (part.kind === "thinking") {
-            description = ( localize(6191, "Thinking..."));
+            description = ( localize(6255, "Thinking..."));
         }
     }
     return description ? renderAsPlaintext(description, {

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

@@ -53,7 +53,6 @@ export declare class ChatSessionsService extends Disposable implements IChatSess
     get onDidChangeOptionGroups(): Event<string>;
     private readonly inProgressMap;
     private readonly _sessionTypeOptions;
-    private readonly _sessionTypeNewSessionOptions;
     private readonly _sessions;
     private readonly _resourceAliases;
     private readonly _customizationsProviders;
@@ -133,8 +132,7 @@ export declare class ChatSessionsService extends Disposable implements IChatSess
      * Get available option groups for a session type
      */
     getOptionGroupsForSessionType(chatSessionType: string): IChatSessionProviderOptionGroup[] | undefined;
-    getNewSessionOptionsForSessionType(chatSessionType: string): ReadonlyChatSessionOptionsMap | undefined;
-    setNewSessionOptionsForSessionType(chatSessionType: string, options: ReadonlyChatSessionOptionsMap): void;
+    getNewChatSessionInputState(chatSessionType: string, sessionResource: URI): Promise<readonly IChatSessionProviderOptionGroup[] | undefined>;
     /**
      * Get the capabilities for a specific session type
      */

package/vscode/src/vs/workbench/contrib/chat/browser/chatSessions/chatSessions.contribution.js

@@ -29,8 +29,8 @@ import { ExtensionsRegistry } from '../../../../services/extensions/common/exten
 import { ChatEditorInput } from '../widgetHosts/editor/chatEditorInput.js';
 import { IChatAgentService } from '../../common/participants/chatAgents.service.js';
 import { ChatContextKeys } from '../../common/actions/chatContextKeys.js';
-import { isSessionInProgressStatus, ChatSessionStatus } from '../../common/chatSessionsService.js';
-import '../../../../../platform/instantiation/common/instantiation.js';
+import { isSessionInProgressStatus, ChatSessionOptionsMap, ChatSessionStatus } from '../../common/chatSessionsService.js';
+import { IChatSessionsService } from '../../common/chatSessionsService.service.js';
 import { ChatAgentLocation, ChatModeKind } from '../../common/constants.js';
 import { CHAT_CATEGORY } from '../actions/chatActions.js';
 import { ResponseModelState } from '../../common/chatService/chatService.js';
@@ -56,39 +56,39 @@ import { autorun } from '../../../../../base/common/observableInternal/reactions
 const extensionPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: "chatSessions",
     jsonSchema: {
-        description: ( localize(6193, "Contributes chat session integrations to the chat widget.")),
+        description: ( localize(6257, "Contributes chat session integrations to the chat widget.")),
         type: "array",
         items: {
             type: "object",
             additionalProperties: false,
             properties: {
                 type: {
-                    description: ( localize(6194, "Unique identifier for the type of chat session.")),
+                    description: ( localize(6258, "Unique identifier for the type of chat session.")),
                     type: "string"
                 },
                 name: {
                     description: ( localize(
-                        6195,
+                        6259,
                         "Name of the dynamically registered chat participant (eg: @agent). Must not contain whitespace."
                     )),
                     type: "string",
                     pattern: "^[\\w-]+$"
                 },
                 displayName: {
-                    description: ( localize(6196, "A longer name for this item which is used for display in menus.")),
+                    description: ( localize(6260, "A longer name for this item which is used for display in menus.")),
                     type: "string"
                 },
                 description: {
-                    description: ( localize(6197, "Description of the chat session for use in menus and tooltips.")),
+                    description: ( localize(6261, "Description of the chat session for use in menus and tooltips.")),
                     type: "string"
                 },
                 when: {
-                    description: ( localize(6198, "Condition which must be true to show this item.")),
+                    description: ( localize(6262, "Condition which must be true to show this item.")),
                     type: "string"
                 },
                 icon: {
                     description: ( localize(
-                        6199,
+                        6263,
                         "Icon identifier (codicon ID) for the chat session editor tab. For example, \"{0}\" or \"{1}\".",
                         "$(github)",
                         "$(cloud)"
@@ -99,22 +99,22 @@ const extensionPoint = ExtensionsRegistry.registerExtensionPoint({
                         type: "object",
                         properties: {
                             light: {
-                                description: ( localize(6200, "Icon path when a light theme is used")),
+                                description: ( localize(6264, "Icon path when a light theme is used")),
                                 type: "string"
                             },
                             dark: {
-                                description: ( localize(6201, "Icon path when a dark theme is used")),
+                                description: ( localize(6265, "Icon path when a dark theme is used")),
                                 type: "string"
                             }
                         }
                     }]
                 },
                 order: {
-                    description: ( localize(6202, "Order in which this item should be displayed.")),
+                    description: ( localize(6266, "Order in which this item should be displayed.")),
                     type: "integer"
                 },
                 alternativeIds: {
-                    description: ( localize(6203, "Alternative identifiers for backward compatibility.")),
+                    description: ( localize(6267, "Alternative identifiers for backward compatibility.")),
                     type: "array",
                     items: {
                         type: "string"
@@ -122,95 +122,95 @@ const extensionPoint = ExtensionsRegistry.registerExtensionPoint({
                 },
                 welcomeTitle: {
                     description: ( localize(
-                        6204,
+                        6268,
                         "Title text to display in the chat welcome view for this session type."
                     )),
                     type: "string"
                 },
                 welcomeMessage: {
                     description: ( localize(
-                        6205,
+                        6269,
                         "Message text (supports markdown) to display in the chat welcome view for this session type."
                     )),
                     type: "string"
                 },
                 welcomeTips: {
                     description: ( localize(
-                        6206,
+                        6270,
                         "Tips text (supports markdown and theme icons) to display in the chat welcome view for this session type."
                     )),
                     type: "string"
                 },
                 inputPlaceholder: {
                     description: ( localize(
-                        6207,
+                        6271,
                         "Placeholder text to display in the chat input box for this session type."
                     )),
                     type: "string"
                 },
                 capabilities: {
-                    description: ( localize(6208, "Optional capabilities for this chat session.")),
+                    description: ( localize(6272, "Optional capabilities for this chat session.")),
                     type: "object",
                     additionalProperties: false,
                     properties: {
                         supportsFileAttachments: {
                             description: ( localize(
-                                6209,
+                                6273,
                                 "Whether this chat session supports attaching files or file references."
                             )),
                             type: "boolean"
                         },
                         supportsToolAttachments: {
                             description: ( localize(
-                                6210,
+                                6274,
                                 "Whether this chat session supports attaching tools or tool references."
                             )),
                             type: "boolean"
                         },
                         supportsMCPAttachments: {
-                            description: ( localize(6211, "Whether this chat session supports attaching MCP resources.")),
+                            description: ( localize(6275, "Whether this chat session supports attaching MCP resources.")),
                             type: "boolean"
                         },
                         supportsImageAttachments: {
-                            description: ( localize(6212, "Whether this chat session supports attaching images.")),
+                            description: ( localize(6276, "Whether this chat session supports attaching images.")),
                             type: "boolean"
                         },
                         supportsSearchResultAttachments: {
-                            description: ( localize(6213, "Whether this chat session supports attaching search results.")),
+                            description: ( localize(6277, "Whether this chat session supports attaching search results.")),
                             type: "boolean"
                         },
                         supportsInstructionAttachments: {
-                            description: ( localize(6214, "Whether this chat session supports attaching instructions.")),
+                            description: ( localize(6278, "Whether this chat session supports attaching instructions.")),
                             type: "boolean"
                         },
                         supportsSourceControlAttachments: {
                             description: ( localize(
-                                6215,
+                                6279,
                                 "Whether this chat session supports attaching source control changes."
                             )),
                             type: "boolean"
                         },
                         supportsProblemAttachments: {
-                            description: ( localize(6216, "Whether this chat session supports attaching problems.")),
+                            description: ( localize(6280, "Whether this chat session supports attaching problems.")),
                             type: "boolean"
                         },
                         supportsSymbolAttachments: {
-                            description: ( localize(6217, "Whether this chat session supports attaching symbols.")),
+                            description: ( localize(6281, "Whether this chat session supports attaching symbols.")),
                             type: "boolean"
                         },
                         supportsPromptAttachments: {
-                            description: ( localize(6218, "Whether this chat session supports attaching prompts.")),
+                            description: ( localize(6282, "Whether this chat session supports attaching prompts.")),
                             type: "boolean"
                         },
                         supportsHandOffs: {
-                            description: ( localize(6219, "Whether this chat session supports hand-off prompts.")),
+                            description: ( localize(6283, "Whether this chat session supports hand-off prompts.")),
                             type: "boolean"
                         }
                     }
                 },
                 commands: {
                     markdownDescription: ( localize(
-                        6220,
+                        6284,
                         "Commands available for this chat session, which the user can invoke with a `/`."
                     )),
                     type: "array",
@@ -227,17 +227,17 @@ const extensionPoint = ExtensionsRegistry.registerExtensionPoint({
                         properties: {
                             name: {
                                 description: ( localize(
-                                    6221,
+                                    6285,
                                     "A short name by which this command is referred to in the UI, e.g. `fix` or `explain` for commands that fix an issue or explain code. The name should be unique among the commands provided by this participant."
                                 )),
                                 type: "string"
                             },
                             description: {
-                                description: ( localize(6222, "A description of this command.")),
+                                description: ( localize(6286, "A description of this command.")),
                                 type: "string"
                             },
                             when: {
-                                description: ( localize(6223, "A condition which must be true to enable this command.")),
+                                description: ( localize(6287, "A condition which must be true to enable this command.")),
                                 type: "string"
                             }
                         }
@@ -245,7 +245,7 @@ const extensionPoint = ExtensionsRegistry.registerExtensionPoint({
                 },
                 canDelegate: {
                     description: ( localize(
-                        6224,
+                        6288,
                         "Whether delegation is supported. Default is false. Note that enabling this is experimental and may not be respected at all times."
                     )),
                     type: "boolean",
@@ -253,14 +253,14 @@ const extensionPoint = ExtensionsRegistry.registerExtensionPoint({
                 },
                 customAgentTarget: {
                     description: ( localize(
-                        6225,
+                        6289,
                         "When set, the chat session will show a filtered mode picker that prefers custom agents whose target property matches this value. Custom agents without a target property are still shown in all session types. This enables the use of standard agent/mode with contributed sessions."
                     )),
                     type: "string"
                 },
                 requiresCustomModels: {
                     description: ( localize(
-                        6226,
+                        6290,
                         "When set, the chat session will show a filtered model picker that prefers custom models. This enables the use of standard model picker with contributed sessions."
                     )),
                     type: "boolean",
@@ -268,7 +268,7 @@ const extensionPoint = ExtensionsRegistry.registerExtensionPoint({
                 },
                 autoAttachReferences: {
                     description: ( localize(
-                        6227,
+                        6291,
                         "Whether to automatically attach instruction files to chat requests for this session type."
                     )),
                     type: "boolean",
@@ -276,7 +276,7 @@ const extensionPoint = ExtensionsRegistry.registerExtensionPoint({
                 },
                 useRequestToPopulateBuiltInPickers: {
                     description: ( localize(
-                        6228,
+                        6292,
                         "Whether to use ChatRequestTurn2 to populate built-in pickers such as the Agent and Model pickers."
                     )),
                     type: "boolean",
@@ -365,7 +365,6 @@ let ChatSessionsService = class ChatSessionsService extends Disposable {
         this._onDidChangeOptionGroups = this._register(( new Emitter()));
         this.inProgressMap = ( new Map());
         this._sessionTypeOptions = ( new Map());
-        this._sessionTypeNewSessionOptions = ( new Map());
         this._sessions = ( new ResourceMap());
         this._resourceAliases = ( new ResourceMap());
         this._customizationsProviders = ( new Map());
@@ -557,7 +556,7 @@ let ChatSessionsService = class ChatSessionsService extends Disposable {
             constructor() {
                 super({
                     id: `workbench.action.chat.openSessionWithPrompt.${contribution.type}`,
-                    title: ( localize2(6229, "New {0} with Prompt", contribution.displayName)),
+                    title: ( localize2(6293, "New {0} with Prompt", contribution.displayName)),
                     category: CHAT_CATEGORY,
                     icon: Codicon.plus,
                     f1: false,
@@ -574,7 +573,12 @@ let ChatSessionsService = class ChatSessionsService extends Disposable {
                 if (chatOptions) {
                     let attachedContext = chatOptions.attachedContext;
                     const resource = URI.revive(chatOptions.resource);
-                    const ref = await chatService.acquireOrLoadSession(resource, ChatAgentLocation.Chat, CancellationToken.None);
+                    const ref = await chatService.acquireOrLoadSession(
+                        resource,
+                        ChatAgentLocation.Chat,
+                        CancellationToken.None,
+                        "ChatSessionsContribution#sendPrompt"
+                    );
                     try {
                         const promptFile = await resolvePromptSlashCommand(chatOptions.prompt, promptsService, toolsService);
                         if (promptFile) {
@@ -599,7 +603,7 @@ let ChatSessionsService = class ChatSessionsService extends Disposable {
             constructor() {
                 super({
                     id: `workbench.action.chat.openNewSessionEditor.${contribution.type}`,
-                    title: ( localize2(6230, "New {0}", contribution.displayName)),
+                    title: ( localize2(6294, "New {0} Session", contribution.displayName)),
                     category: CHAT_CATEGORY,
                     icon: Codicon.plus,
                     f1: true,
@@ -622,7 +626,7 @@ let ChatSessionsService = class ChatSessionsService extends Disposable {
             constructor() {
                 super({
                     id: `workbench.action.chat.openNewSessionSidebar.${contribution.type}`,
-                    title: ( localize2(6231, "New {0}", contribution.displayName)),
+                    title: ( localize2(6295, "New {0} Session", contribution.displayName)),
                     category: CHAT_CATEGORY,
                     icon: Codicon.plus,
                     f1: false,
@@ -1033,13 +1037,20 @@ let ChatSessionsService = class ChatSessionsService extends Disposable {
             throw Error(`Can not find provider for ${sessionResource}`);
         }
         let session;
-        const newSessionOptions = this.getNewSessionOptionsForSessionType(resolvedType);
-        if (isUntitledChatSession(sessionResource) && newSessionOptions) {
+        const newSessionOptionGroups = isUntitledChatSession(sessionResource) ? await this.getNewChatSessionInputState(resolvedType, sessionResource) : undefined;
+        if (isUntitledChatSession(sessionResource) && newSessionOptionGroups) {
+            const options = ( new Map());
+            for (const group of newSessionOptionGroups) {
+                const selected = group.selected ?? group.items.find(item => item.default) ?? group.items[0];
+                if (selected) {
+                    options.set(group.id, selected);
+                }
+            }
             session = {
                 sessionResource: sessionResource,
                 onWillDispose: Event.None,
                 history: [],
-                options: newSessionOptions ?? {},
+                options: options.size > 0 ? options : undefined,
                 dispose: () => {}
             };
         } else {
@@ -1142,15 +1153,21 @@ let ChatSessionsService = class ChatSessionsService extends Disposable {
     getOptionGroupsForSessionType(chatSessionType) {
         return this._sessionTypeOptions.get(chatSessionType);
     }
-    getNewSessionOptionsForSessionType(chatSessionType) {
-        const options = this._sessionTypeNewSessionOptions.get(chatSessionType);
-        if (!options || options.size === 0) {
+    async getNewChatSessionInputState(chatSessionType, sessionResource) {
+        const controllerData = this._itemControllers.get(chatSessionType);
+        if (controllerData?.controller.getNewChatSessionInputState) {
+            const groups = await controllerData.controller.getNewChatSessionInputState(sessionResource, CancellationToken.None);
+            if (groups?.length) {
+                this._sessionTypeOptions.set(chatSessionType, [...groups]);
+                this._onDidChangeOptionGroups.fire(chatSessionType);
+            }
+            return groups;
+        }
+        const groups = this._sessionTypeOptions.get(chatSessionType);
+        if (!groups?.length) {
             return undefined;
         }
-        return ( new Map(options));
-    }
-    setNewSessionOptionsForSessionType(chatSessionType, options) {
-        this._sessionTypeNewSessionOptions.set(chatSessionType, ( new Map(options)));
+        return groups;
     }
     getCapabilitiesForSessionType(chatSessionType) {
         const contribution = this._contributions.get(chatSessionType)?.contribution;
@@ -1191,7 +1208,7 @@ function registerNewSessionInPlaceAction(type, displayName) {
         constructor() {
             super({
                 id: `workbench.action.chat.openNewChatSessionInPlace.${type}`,
-                title: ( localize2(6232, "New {0}", displayName)),
+                title: ( localize2(6296, "New {0} Session", displayName)),
                 category: CHAT_CATEGORY,
                 f1: false,
                 precondition: ChatContextKeys.enabled
@@ -1207,7 +1224,7 @@ function registerNewSessionInPlaceAction(type, displayName) {
             }
             await openChatSession(accessor, {
                 type: type,
-                displayName: ( localize(6233, "Chat")),
+                displayName: ( localize(6297, "Chat")),
                 position: chatSessionPosition,
                 replaceEditor: true
             });
@@ -1219,7 +1236,7 @@ function registerNewSessionExternalAction(type, displayName, commandId) {
         constructor() {
             super({
                 id: `workbench.action.chat.openNewChatSessionExternal.${type}`,
-                title: ( localize2(6234, "New {0}", displayName)),
+                title: ( localize2(6298, "New {0} Session", displayName)),
                 category: CHAT_CATEGORY,
                 f1: false,
                 precondition: ChatContextKeys.enabled
@@ -1239,6 +1256,7 @@ var ChatSessionPosition;
 async function openChatSession(accessor, openOptions, chatSendOptions) {
     const viewsService = accessor.get(IViewsService);
     const chatService = accessor.get(IChatService);
+    const chatSessionService = accessor.get(IChatSessionsService);
     const logService = accessor.get(ILogService);
     const editorGroupService = accessor.get(IEditorGroupsService);
     const editorService = accessor.get(IEditorService);
@@ -1264,7 +1282,7 @@ async function openChatSession(accessor, openOptions, chatSendOptions) {
                     override: ChatEditorInput.EditorID,
                     pinned: true,
                     title: {
-                        fallback: ( localize(6235, "{0}", openOptions.displayName))
+                        fallback: ( localize(6299, "{0}", openOptions.displayName))
                     }
                 };
                 if (openOptions.replaceEditor) {
@@ -1303,13 +1321,7 @@ async function openChatSession(accessor, openOptions, chatSendOptions) {
     if (chatSendOptions) {
         try {
             if (chatSendOptions.initialSessionOptions) {
-                const model = chatService.getSession(resource);
-                if (model?.contributedChatSession) {
-                    model.setContributedChatSession({
-                        ...model.contributedChatSession,
-                        initialSessionOptions: chatSendOptions.initialSessionOptions
-                    });
-                }
+                chatSessionService.updateSessionOptions(resource, normalizeSessionOptions(chatSendOptions.initialSessionOptions));
             }
             let attachedContext = chatSendOptions.attachedContext;
             const promptFile = await resolvePromptSlashCommand(chatSendOptions.prompt, promptsService, toolsService);
@@ -1328,6 +1340,15 @@ async function openChatSession(accessor, openOptions, chatSendOptions) {
         }
     }
 }
+function normalizeSessionOptions(options) {
+    if (options instanceof Map) {
+        return options;
+    }
+    if (Array.isArray(options)) {
+        return ( new Map(( options.map(o => [o.optionId, o.value]))));
+    }
+    return ChatSessionOptionsMap.fromRecord(options);
+}
 async function resolvePromptSlashCommand(prompt, promptsService, toolsService) {
     const slashMatch = prompt.match(slashReg);
     if (slashMatch) {
@@ -1337,11 +1358,12 @@ async function resolvePromptSlashCommand(prompt, promptsService, toolsService) {
             const refs = parseResult.body?.variableReferences.map((
                 {
                     name,
-                    offset
+                    offset,
+                    fullLength
                 }
             ) => ({
                 name,
-                range: ( new OffsetRange(offset, offset + name.length + 1))
+                range: ( new OffsetRange(offset, offset + fullLength))
             })) ?? [];
             const toolReferences = toolsService.toToolReferences(refs);
             return toPromptFileVariableEntry(