@codingame/monaco-vscode-api 30.0.1 → 31.0.0

package/vscode/src/vs/workbench/api/common/extHostAuthentication.js

@@ -372,7 +372,7 @@ let DynamicAuthProvider = class DynamicAuthProvider {
         this._createFlows = [];
         if (_serverMetadata.authorization_endpoint) {
             this._createFlows.push({
-                label: ( localize(2741, "URL Handler")),
+                label: ( localize(2736, "URL Handler")),
                 handler: (scopes, progress, token) => this._createWithUrlHandler(scopes, progress, token)
             });
         }
@@ -451,7 +451,7 @@ let DynamicAuthProvider = class DynamicAuthProvider {
                     id: this.id
                 }, {
                     location: ProgressLocation.Notification,
-                    title: ( localize(2742, "Authenticating to '{0}'", this.label)),
+                    title: ( localize(2737, "Authenticating to '{0}'", this.label)),
                     cancellable: true
                 }, (progress, token) => handler(scopes, progress, token));
                 if (token) {
@@ -463,12 +463,12 @@ let DynamicAuthProvider = class DynamicAuthProvider {
                     break;
                 }
                 const message = isCancellationError(err) ? ( localize(
-                    2743,
+                    2738,
                     "Having trouble authenticating to '{0}'? Would you like to try a different way? ({1})",
                     this.label,
                     nextMode
                 )) : ( localize(
-                    2744,
+                    2739,
                     "You have not yet finished authenticating to '{0}'. Would you like to try a different way? ({1})",
                     this.label,
                     nextMode
@@ -567,7 +567,7 @@ let DynamicAuthProvider = class DynamicAuthProvider {
             throw ( new CancellationError());
         }
         progress.report({
-            message: ( localize(2745, "Complete the authentication in the browser window that has opened."))
+            message: ( localize(2740, "Complete the authentication in the browser window that has opened."))
         });
         let code;
         try {

package/vscode/src/vs/workbench/api/common/extHostChatAgents2.d.ts

@@ -9,7 +9,7 @@ import { IChatAgentRequest, IChatAgentResult, IChatAgentResultTimings, UserSelec
 import { IChatFollowup, IChatUserActionEvent, IChatVoteAction } from "../../contrib/chat/common/chatService/chatService.js";
 import { ChatAgentLocation } from "../../contrib/chat/common/constants.js";
 import { Dto } from "../../services/extensions/common/proxyIdentifier.js";
-import { ExtHostChatAgentsShape2, IChatAgentCompletionItem, IChatAgentHistoryEntryDto, IChatAgentProgressShape, IChatSessionCustomizationItemDto, IChatSessionContextDto, ICustomAgentDto, IInstructionDto, IMainContext, ISkillDto } from "./extHost.protocol.js";
+import { ExtHostChatAgentsShape2, IChatAgentCompletionItem, IChatAgentHistoryEntryDto, IChatAgentInvokeResult, IChatAgentProgressShape, IChatSessionCustomizationItemDto, IChatSessionContextDto, IMainContext } from "./extHost.protocol.js";
 import { CommandsConverter, ExtHostCommands } from "./extHostCommands.js";
 import { ExtHostDiagnostics } from "./extHostDiagnostics.js";
 import { ExtHostDocuments } from "./extHostDocuments.js";
@@ -17,6 +17,7 @@ import { ExtHostLanguageModels } from "./extHostLanguageModels.js";
 import { ExtHostLanguageModelTools } from "./extHostLanguageModelTools.js";
 import { IPromptFileContext, IPromptFileResource } from "../../contrib/chat/common/promptSyntax/service/promptsService.js";
 import { PromptsType } from "../../contrib/chat/common/promptSyntax/promptTypes.js";
+import { ExtHostChatSessions } from "./extHostChatSessions.js";
 import { ExtHostDocumentsAndEditors } from "./extHostDocumentsAndEditors.js";
 export declare class ChatAgentResponseStream {
     private readonly _extension;
@@ -43,6 +44,7 @@ export declare class ExtHostChatAgents2 extends Disposable implements ExtHostCha
     private readonly _languageModels;
     private readonly _diagnostics;
     private readonly _tools;
+    private readonly _chatSessions;
     private static _idPool;
     private readonly _agents;
     private readonly _proxy;
@@ -66,20 +68,41 @@ export declare class ExtHostChatAgents2 extends Disposable implements ExtHostCha
     readonly onDidChangeInstructions: import("../../../base/common/event.js").Event<void>;
     private readonly _onDidChangeSkills;
     readonly onDidChangeSkills: import("../../../base/common/event.js").Event<void>;
-    private _customAgents;
-    private _instructions;
-    private _skills;
+    private readonly _onDidChangeSlashCommands;
+    readonly onDidChangeSlashCommands: import("../../../base/common/event.js").Event<void>;
+    private readonly _onDidChangeHooks;
+    readonly onDidChangeHooks: import("../../../base/common/event.js").Event<void>;
+    private readonly _onDidChangePlugins;
+    readonly onDidChangePlugins: import("../../../base/common/event.js").Event<void>;
+    private readonly _customAgents;
+    private readonly _instructions;
+    private readonly _skills;
+    private readonly _slashCommands;
+    private readonly _hooks;
+    private readonly _plugins;
     private _activeChatPanelSessionResource;
     private readonly _onDidChangeActiveChatPanelSessionResource;
     readonly onDidChangeActiveChatPanelSessionResource: import("../../../base/common/event.js").Event<URI | undefined>;
     get activeChatPanelSessionResource(): URI | undefined;
-    get customAgents(): readonly vscode.ChatResource[];
-    get instructions(): readonly vscode.ChatResource[];
-    get skills(): readonly vscode.ChatResource[];
-    $acceptCustomAgents(agents: ICustomAgentDto[]): void;
-    $acceptInstructions(instructions: IInstructionDto[]): void;
-    $acceptSkills(skills: ISkillDto[]): void;
-    constructor(mainContext: IMainContext, _logService: ILogService, _commands: ExtHostCommands, _documents: ExtHostDocuments, _editorsAndDocuments: ExtHostDocumentsAndEditors, _languageModels: ExtHostLanguageModels, _diagnostics: ExtHostDiagnostics, _tools: ExtHostLanguageModelTools);
+    private toCustomAgent;
+    private toInstruction;
+    private toSkill;
+    private toSlashCommand;
+    private toHook;
+    private toPlugin;
+    provideCustomAgents(token: vscode.CancellationToken): Thenable<readonly vscode.ChatCustomAgent[]>;
+    provideInstructions(token: vscode.CancellationToken): Thenable<readonly vscode.ChatInstruction[]>;
+    provideSkills(token: vscode.CancellationToken): Thenable<readonly vscode.ChatSkill[]>;
+    provideSlashCommands(token: vscode.CancellationToken): Thenable<readonly vscode.ChatSlashCommand[]>;
+    provideHooks(token: vscode.CancellationToken): Thenable<readonly vscode.ChatHook[]>;
+    providePlugins(token: vscode.CancellationToken): Thenable<readonly vscode.ChatPlugin[]>;
+    $onDidChangeCustomAgents(): void;
+    $onDidChangeInstructions(): void;
+    $onDidChangeSkills(): void;
+    $onDidChangeSlashCommands(): void;
+    $onDidChangeHooks(): void;
+    $onDidChangePlugins(): void;
+    constructor(mainContext: IMainContext, _logService: ILogService, _commands: ExtHostCommands, _documents: ExtHostDocuments, _editorsAndDocuments: ExtHostDocumentsAndEditors, _languageModels: ExtHostLanguageModels, _diagnostics: ExtHostDiagnostics, _tools: ExtHostLanguageModelTools, _chatSessions: ExtHostChatSessions);
     transferActiveChat(newWorkspace: vscode.Uri): Promise<void>;
     createChatAgent(extension: IExtensionDescription, id: string, handler: vscode.ChatExtendedRequestHandler): vscode.ChatParticipant;
     createDynamicChatAgent(extension: IExtensionDescription, id: string, dynamicProps: vscode.DynamicChatParticipantProps, handler: vscode.ChatExtendedRequestHandler): vscode.ChatParticipant;
@@ -88,7 +111,7 @@ export declare class ExtHostChatAgents2 extends Disposable implements ExtHostCha
      * Internal method that handles all prompt file provider types.
      * Routes custom agents, instructions, prompt files, and skills to the unified internal implementation.
      */
-    registerPromptFileProvider(extension: IExtensionDescription, type: PromptsType, provider: vscode.ChatCustomAgentProvider | vscode.ChatInstructionsProvider | vscode.ChatPromptFileProvider | vscode.ChatSkillProvider): vscode.Disposable;
+    registerPromptFileProvider(extension: IExtensionDescription, type: PromptsType, provider: vscode.ChatCustomAgentProvider | vscode.ChatInstructionsProvider | vscode.ChatPromptFileProvider | vscode.ChatSkillProvider | vscode.ChatHookProvider): vscode.Disposable;
     $providePromptFiles(handle: number, type: PromptsType, context: IPromptFileContext, token: CancellationToken): Promise<IPromptFileResource[] | undefined>;
     registerChatSessionCustomizationProvider(extension: IExtensionDescription, chatSessionType: string, metadata: vscode.ChatSessionCustomizationProviderMetadata, provider: vscode.ChatSessionCustomizationProvider): vscode.Disposable;
     $provideChatSessionCustomizations(handle: number, token: CancellationToken): Promise<IChatSessionCustomizationItemDto[] | undefined>;
@@ -105,7 +128,7 @@ export declare class ExtHostChatAgents2 extends Disposable implements ExtHostCha
     $invokeAgent(handle: number, requestDto: Dto<IChatAgentRequest>, context: {
         history: IChatAgentHistoryEntryDto[];
         chatSessionContext?: IChatSessionContextDto;
-    }, token: CancellationToken): Promise<IChatAgentResult | undefined>;
+    }, token: CancellationToken): Promise<IChatAgentInvokeResult | undefined>;
     private getDiagnosticsWhenEnabled;
     private getToolsForRequest;
     private prepareHistoryTurns;

package/vscode/src/vs/workbench/api/common/extHostChatAgents2.js

@@ -12,6 +12,7 @@ import { assertType } from '../../../base/common/types.js';
 import { URI } from '../../../base/common/uri.js';
 import { generateUuid } from '../../../base/common/uuid.js';
 import { ExtensionIdentifier } from '../../../platform/extensions/common/extensions.js';
+import { packErrorForTelemetry } from '../../../platform/telemetry/common/errorTelemetry.js';
 import { isChatViewTitleActionContext } from '../../contrib/chat/common/actions/chatActions.js';
 import { ChatAgentVoteDirection } from '../../contrib/chat/common/chatService/chatService.js';
 import { LocalChatSessionUri } from '../../contrib/chat/common/model/chatUri.js';
@@ -404,33 +405,112 @@ class ExtHostChatAgents2 extends Disposable {
     get activeChatPanelSessionResource() {
         return this._activeChatPanelSessionResource;
     }
-    get customAgents() {
-        return this._customAgents;
+    toCustomAgent(dto) {
+        return ( Object.freeze({
+            uri: URI.revive(dto.uri),
+            name: dto.name,
+            description: dto.description,
+            source: dto.source,
+            extensionId: dto.extensionId,
+            pluginUri: dto.pluginUri ? URI.revive(dto.pluginUri) : undefined,
+            sessionTypes: dto.sessionTypes,
+            argumentHint: dto.argumentHint,
+            tools: dto.tools,
+            model: dto.model,
+            userInvocable: dto.userInvocable,
+            disableModelInvocation: dto.disableModelInvocation
+        }));
+    }
+    toInstruction(dto) {
+        return ( Object.freeze({
+            uri: URI.revive(dto.uri),
+            name: dto.name,
+            description: dto.description,
+            source: dto.source,
+            extensionId: dto.extensionId,
+            pluginUri: dto.pluginUri ? URI.revive(dto.pluginUri) : undefined,
+            sessionTypes: dto.sessionTypes,
+            pattern: dto.pattern
+        }));
+    }
+    toSkill(dto) {
+        return ( Object.freeze({
+            uri: URI.revive(dto.uri),
+            name: dto.name,
+            description: dto.description,
+            source: dto.source,
+            extensionId: dto.extensionId,
+            pluginUri: dto.pluginUri ? URI.revive(dto.pluginUri) : undefined,
+            sessionTypes: dto.sessionTypes,
+            userInvocable: dto.userInvocable
+        }));
+    }
+    toSlashCommand(dto) {
+        return ( Object.freeze({
+            uri: URI.revive(dto.uri),
+            name: dto.name,
+            description: dto.description,
+            source: dto.source,
+            extensionId: dto.extensionId,
+            pluginUri: dto.pluginUri ? URI.revive(dto.pluginUri) : undefined,
+            sessionTypes: dto.sessionTypes,
+            argumentHint: dto.argumentHint,
+            userInvocable: dto.userInvocable
+        }));
+    }
+    toHook(dto) {
+        return ( Object.freeze({
+            uri: URI.revive(dto.uri),
+            sessionTypes: dto.sessionTypes
+        }));
     }
-    get instructions() {
-        return this._instructions;
+    toPlugin(dto) {
+        return ( Object.freeze({
+            uri: URI.revive(dto.uri)
+        }));
+    }
+    provideCustomAgents(token) {
+        return this._customAgents.get(token);
+    }
+    provideInstructions(token) {
+        return this._instructions.get(token);
+    }
+    provideSkills(token) {
+        return this._skills.get(token);
+    }
+    provideSlashCommands(token) {
+        return this._slashCommands.get(token);
     }
-    get skills() {
-        return this._skills;
+    provideHooks(token) {
+        return this._hooks.get(token);
     }
-    $acceptCustomAgents(agents) {
-        this._customAgents = ( agents.map(a => ( Object.freeze({
-            uri: URI.revive(a.uri)
-        }))));
+    providePlugins(token) {
+        return this._plugins.get(token);
+    }
+    $onDidChangeCustomAgents() {
+        this._customAgents.clear();
         this._onDidChangeCustomAgents.fire();
     }
-    $acceptInstructions(instructions) {
-        this._instructions = ( instructions.map(i => ( Object.freeze({
-            uri: URI.revive(i.uri)
-        }))));
+    $onDidChangeInstructions() {
+        this._instructions.clear();
         this._onDidChangeInstructions.fire();
     }
-    $acceptSkills(skills) {
-        this._skills = ( skills.map(s => ( Object.freeze({
-            uri: URI.revive(s.uri)
-        }))));
+    $onDidChangeSkills() {
+        this._skills.clear();
         this._onDidChangeSkills.fire();
     }
+    $onDidChangeSlashCommands() {
+        this._slashCommands.clear();
+        this._onDidChangeSlashCommands.fire();
+    }
+    $onDidChangeHooks() {
+        this._hooks.clear();
+        this._onDidChangeHooks.fire();
+    }
+    $onDidChangePlugins() {
+        this._plugins.clear();
+        this._onDidChangePlugins.fire();
+    }
     constructor(
         mainContext,
         _logService,
@@ -439,7 +519,8 @@ class ExtHostChatAgents2 extends Disposable {
         _editorsAndDocuments,
         _languageModels,
         _diagnostics,
-        _tools
+        _tools,
+        _chatSessions
     ) {
         super();
         this._logService = _logService;
@@ -449,6 +530,7 @@ class ExtHostChatAgents2 extends Disposable {
         this._languageModels = _languageModels;
         this._diagnostics = _diagnostics;
         this._tools = _tools;
+        this._chatSessions = _chatSessions;
         this._agents = ( new Map());
         this._participantDetectionProviders = ( new Map());
         this._promptFileProviders = ( new Map());
@@ -467,9 +549,30 @@ class ExtHostChatAgents2 extends Disposable {
         this.onDidChangeInstructions = this._onDidChangeInstructions.event;
         this._onDidChangeSkills = this._register(( new Emitter()));
         this.onDidChangeSkills = this._onDidChangeSkills.event;
-        this._customAgents = [];
-        this._instructions = [];
-        this._skills = [];
+        this._onDidChangeSlashCommands = this._register(( new Emitter()));
+        this.onDidChangeSlashCommands = this._onDidChangeSlashCommands.event;
+        this._onDidChangeHooks = this._register(( new Emitter()));
+        this.onDidChangeHooks = this._onDidChangeHooks.event;
+        this._onDidChangePlugins = this._register(( new Emitter()));
+        this.onDidChangePlugins = this._onDidChangePlugins.event;
+        this._customAgents = ( new CachedPromise(
+            () => this._proxy.$provideCustomAgents(CancellationToken.None).then(agents => ( agents.map(agent => this.toCustomAgent(agent))))
+        ));
+        this._instructions = ( new CachedPromise(
+            () => this._proxy.$provideInstructions(CancellationToken.None).then(instructions => ( instructions.map(instruction => this.toInstruction(instruction))))
+        ));
+        this._skills = ( new CachedPromise(
+            () => this._proxy.$provideSkills(CancellationToken.None).then(skills => ( skills.map(skill => this.toSkill(skill))))
+        ));
+        this._slashCommands = ( new CachedPromise(
+            () => this._proxy.$provideSlashCommands(CancellationToken.None).then(slashCommands => ( slashCommands.map(slashCommand => this.toSlashCommand(slashCommand))))
+        ));
+        this._hooks = ( new CachedPromise(
+            () => this._proxy.$provideHooks(CancellationToken.None).then(hooks => ( hooks.map(hook => this.toHook(hook))))
+        ));
+        this._plugins = ( new CachedPromise(
+            () => this._proxy.$providePlugins(CancellationToken.None).then(plugins => ( plugins.map(plugin => this.toPlugin(plugin))))
+        ));
         this._onDidChangeActiveChatPanelSessionResource = this._register(( new Emitter()));
         this.onDidChangeActiveChatPanelSessionResource = this._onDidChangeActiveChatPanelSessionResource.event;
         this._proxy = ( mainContext.getProxy(MainContext.MainThreadChatAgents2));
@@ -532,6 +635,9 @@ class ExtHostChatAgents2 extends Disposable {
         case PromptsType.skill:
             changeEvent = provider.onDidChangeSkills;
             break;
+        case PromptsType.hook:
+            changeEvent = provider.onDidChangeHooks;
+            break;
         }
         if (changeEvent) {
             disposables.add(changeEvent(() => {
@@ -564,6 +670,9 @@ class ExtHostChatAgents2 extends Disposable {
         case PromptsType.skill:
             resources = (await provider.provideSkills(context, token)) ?? undefined;
             break;
+        case PromptsType.hook:
+            resources = (await provider.provideHooks(context, token)) ?? undefined;
+            break;
         }
         return resources;
     }
@@ -576,7 +685,7 @@ class ExtHostChatAgents2 extends Disposable {
         const metadataDto = {
             label: metadata.label,
             iconId: metadata.iconId,
-            unsupportedTypes: metadata.unsupportedTypes?.map(t => ChatSessionCustomizationType.from(t))
+            supportedTypes: metadata.supportedTypes?.map(t => ChatSessionCustomizationType.from(t))
         };
         this._proxy.$registerChatSessionCustomizationProvider(handle, chatSessionType, metadataDto, extension.identifier);
         const disposables = ( new DisposableStore());
@@ -754,13 +863,16 @@ class ExtHostChatAgents2 extends Disposable {
             this._inFlightRequests.add(inFlightRequest);
             let chatSessionContext;
             if (context.chatSessionContext) {
+                const sessionResource = URI.revive(context.chatSessionContext.chatSessionResource);
+                const inputState = await this._chatSessions.getInputStateForSession(sessionResource, context.chatSessionContext.initialSessionOptions, token);
                 chatSessionContext = {
                     chatSessionItem: {
-                        resource: URI.revive(context.chatSessionContext.chatSessionResource),
+                        resource: sessionResource,
                         label: context.chatSessionContext.isUntitled ? "Untitled Session" : "Session"
                     },
                     isUntitled: context.chatSessionContext.isUntitled,
-                    initialSessionOptions: context.chatSessionContext.initialSessionOptions
+                    initialSessionOptions: context.chatSessionContext.initialSessionOptions,
+                    inputState
                 };
             }
             const chatContext = {
@@ -815,13 +927,19 @@ class ExtHostChatAgents2 extends Disposable {
             }
             const isQuotaExceeded = e instanceof Error && e.name === "ChatQuotaExceeded";
             const isRateLimited = e instanceof Error && e.name === "ChatRateLimited";
+            const {
+                callstack: errorCallstack
+            } = packErrorForTelemetry(e);
+            const errorName = e instanceof Error ? e.name : undefined;
             return {
                 errorDetails: {
                     message: toErrorMessage(e),
                     responseIsIncomplete: true,
                     isQuotaExceeded,
                     isRateLimited
-                }
+                },
+                errorCallstack,
+                errorName
             };
         } finally {
             if (inFlightRequest) {
@@ -1239,6 +1357,26 @@ function raceCancellationWithTimeout(cancelWait, promise, token) {
         promise.then(resolve, reject).finally(() => ref.dispose());
     }));
 }
+class CachedPromise {
+    constructor(computeFn) {
+        this.computeFn = computeFn;
+    }
+    get(token) {
+        if (!this.cachedPromise) {
+            const promise = this.computeFn().catch(err => {
+                if (this.cachedPromise === promise) {
+                    this.cachedPromise = undefined;
+                }
+                throw err;
+            });
+            this.cachedPromise = promise;
+        }
+        return raceCancellation(this.cachedPromise, token, []);
+    }
+    clear() {
+        this.cachedPromise = undefined;
+    }
+}
 function isBuiltinParticipant(agentId) {
     return agentId.startsWith("github.copilot");
 }

package/vscode/src/vs/workbench/api/common/extHostChatDebug.d.ts

@@ -28,5 +28,9 @@ export declare class ExtHostChatDebug extends Disposable implements ExtHostChatD
         uri: UriComponents;
         sessionTitle?: string;
     } | undefined>;
+    $getAvailableDebugSessionResources(_handle: number, token: CancellationToken): Promise<{
+        uri: UriComponents;
+        title?: string;
+    }[]>;
     dispose(): void;
 }

package/vscode/src/vs/workbench/api/common/extHostChatDebug.js

@@ -405,6 +405,13 @@ let ExtHostChatDebug = class ExtHostChatDebug extends Disposable {
             sessionTitle: result.sessionTitle
         };
     }
+    async $getAvailableDebugSessionResources(_handle, token) {
+        if (!this._provider?.provideAvailableDebugSessionResources) {
+            return [];
+        }
+        const result = await this._provider.provideAvailableDebugSessionResources(token);
+        return result ?? [];
+    }
     dispose() {
         for (const store of ( this._activeProgress.values())) {
             store.dispose();

package/vscode/src/vs/workbench/api/common/extHostChatSessions.d.ts

@@ -1,12 +1,12 @@
 import type * as vscode from "vscode";
 import { CancellationToken } from "../../../base/common/cancellation.js";
 import { Disposable } from "../../../base/common/lifecycle.js";
-import { UriComponents } from "../../../base/common/uri.js";
+import { URI, UriComponents } from "../../../base/common/uri.js";
 import { IExtensionDescription } from "../../../platform/extensions/common/extensions.js";
 import { ILogService } from "../../../platform/log/common/log.service.js";
 import { IChatSessionProviderOptionItem } from "../../contrib/chat/common/chatSessionsService.js";
 import { IChatAgentRequest, IChatAgentResult } from "../../contrib/chat/common/participants/chatAgents.js";
-import { ChatSessionContentContextDto, IChatSessionDto, ExtHostChatSessionsShape, IChatSessionRequestHistoryItemDto, IChatSessionProviderOptions, IChatNewSessionRequestDto } from "./extHost.protocol.js";
+import { ChatSessionContentContextDto, ExtHostChatSessionsShape, IChatNewSessionRequestDto, IChatSessionDto, IChatSessionProviderOptions, IChatSessionRequestHistoryItemDto } from "./extHost.protocol.js";
 import { ExtHostCommands } from "./extHostCommands.js";
 import { ExtHostLanguageModels } from "./extHostLanguageModels.js";
 import { IExtHostRpcService } from "./extHostRpcService.js";
@@ -26,9 +26,10 @@ export declare class ExtHostChatSessions extends Disposable implements ExtHostCh
      */
     private readonly _extHostChatSessions;
     /**
-     * Store option groups with onSearch callbacks per provider handle
+     * Map of proxy command id -> original command id + controller handle.
+     * Used to wrap option group commands so they receive `{ inputState, sessionResource }` instead of just `sessionResource`.
      */
-    private readonly _providerOptionGroups;
+    private readonly _proxyCommands;
     constructor(commands: ExtHostCommands, _languageModels: ExtHostLanguageModels, _extHostRpc: IExtHostRpcService, _logService: ILogService);
     registerChatSessionItemProvider(extension: IExtensionDescription, chatSessionType: string, provider: vscode.ChatSessionItemProvider): vscode.Disposable;
     createChatSessionItemController(extension: IExtensionDescription, id: string, refreshHandler: (token: vscode.CancellationToken) => Thenable<void>): vscode.ChatSessionItemController;
@@ -42,12 +43,28 @@ export declare class ExtHostChatSessions extends Disposable implements ExtHostCh
     $forkChatSession(handle: number, sessionResourceComponents: UriComponents, request: IChatSessionRequestHistoryItemDto | undefined, token: CancellationToken): Promise<ReturnType<typeof typeConvert.ChatSessionItem.from>>;
     private convertRequestDtoToRequestTurn;
     private getChatSessionItemController;
+    private _createInputStateFromOptions;
+    /**
+     * Gets the input state for a session. This calls the controller's `getChatSessionInputState` handler if available,
+     * otherwise falls back to creating an input state from the session options.
+     */
+    getInputStateForSession(sessionResource: URI | undefined, initialSessionOptions: ReadonlyArray<{
+        optionId: string;
+        value: string;
+    }> | undefined, token: CancellationToken): Promise<vscode.ChatSessionInputState>;
+    /**
+     * Wraps option group commands with proxy commands so that extensions using the new
+     * `getChatSessionInputState` API receive `{ inputState, sessionResource }` instead of just `sessionResource`.
+     *
+     * For controllers that do not implement the new API, commands are returned unchanged.
+     */
+    private _wrapOptionGroupCommands;
     private getModelForRequest;
     private convertRequestTurn;
     private convertReferenceToVariable;
     private convertResponseTurn;
-    $invokeOptionGroupSearch(providerHandle: number, optionGroupId: string, query: string, token: CancellationToken): Promise<IChatSessionProviderOptionItem[]>;
     $refreshChatSessionItems(handle: number, token: CancellationToken): Promise<void>;
     $newChatSessionItem(handle: number, request: IChatNewSessionRequestDto, token: CancellationToken): Promise<ReturnType<typeof typeConvert.ChatSessionItem.from> | undefined>;
     $onDidChangeChatSessionItemState(controllerHandle: number, sessionResourceComponents: UriComponents, archived: boolean): void;
+    $provideChatSessionInputState(controllerHandle: number, sessionResourceComponents: UriComponents | undefined, token: CancellationToken): Promise<vscode.ChatSessionProviderOptionGroup[] | undefined>;
 }