@codingame/monaco-vscode-api 31.0.1 → 32.0.1

package/vscode/src/vs/workbench/contrib/chat/common/chatModes.d.ts

@@ -1,46 +1,45 @@
+import { Event } from "../../../../base/common/event.js";
 import { Disposable } from "../../../../base/common/lifecycle.js";
 import { IObservable } from "../../../../base/common/observable.js";
 import { URI } from "../../../../base/common/uri.js";
 import { IOffsetRange } from "../../../../editor/common/core/ranges/offsetRange.js";
 import { IConfigurationService } from "../../../../platform/configuration/common/configuration.service.js";
-import { ContextKeyExpression } from "../../../../platform/contextkey/common/contextkey.js";
 import { IContextKeyService } from "../../../../platform/contextkey/common/contextkey.service.js";
-import { ILogService } from "../../../../platform/log/common/log.service.js";
-import { IStorageService } from "../../../../platform/storage/common/storage.service.js";
-import { IChatAgentService } from "./participants/chatAgents.service.js";
+import { IInstantiationService } from "../../../../platform/instantiation/common/instantiation.js";
 import { ChatModeKind } from "./constants.js";
 import { IHandOff } from "./promptSyntax/promptFileParser.js";
 import { IAgentSource, ICustomAgent, ICustomAgentVisibility, PromptsStorage } from "./promptSyntax/service/promptsService.js";
-import { IPromptsService } from "./promptSyntax/service/promptsService.service.js";
 import { PromptFileSource, Target } from "./promptSyntax/promptTypes.js";
 import { ThemeIcon } from "../../../../base/common/themables.js";
 import { IChatModeService } from "./chatModes.service.js";
+/**
+ * The set of chat modes available for a particular session type, partitioned
+ * into builtin and custom modes, with helpers for lookup by id or name.
+ */
+export interface IChatModes {
+    readonly sessionType: string;
+    readonly onDidChange: Event<void>;
+    readonly builtin: readonly IChatMode[];
+    readonly custom: readonly IChatMode[];
+    findModeById(id: string): IChatMode | undefined;
+    findModeByName(name: string): IChatMode | undefined;
+    /**
+     * Awaits the most recently scheduled refresh of custom prompt modes.
+     * After this resolves, {@link custom} reflects the latest data from the
+     * prompts service.
+     */
+    waitForRefresh(): Promise<void>;
+}
 export declare class ChatModeService extends Disposable implements IChatModeService {
-    private readonly promptsService;
-    private readonly chatAgentService;
-    private readonly logService;
-    private readonly storageService;
+    private readonly instantiationService;
     private readonly configurationService;
     readonly _serviceBrand: undefined;
-    private static readonly CUSTOM_MODES_STORAGE_KEY;
-    private readonly hasCustomModes;
     private readonly agentModeDisabledByPolicy;
-    private readonly _customModeInstances;
-    private readonly _onDidChangeChatModes;
-    readonly onDidChangeChatModes: import("../../../../base/common/event.js").Event<void>;
-    constructor(promptsService: IPromptsService, chatAgentService: IChatAgentService, contextKeyService: IContextKeyService, logService: ILogService, storageService: IStorageService, configurationService: IConfigurationService);
-    private loadCachedModes;
-    private deserializeCachedModes;
-    private saveCachedModes;
-    private refreshCustomPromptModes;
-    getModes(): {
-        builtin: readonly IChatMode[];
-        custom: readonly IChatMode[];
-    };
-    findModeById(id: string | ChatModeKind): IChatMode | undefined;
-    findModeByName(name: string): IChatMode | undefined;
-    private getBuiltinModes;
-    private getCustomModes;
+    /** Cached per-sessionType {@link ChatModes} instances. */
+    private readonly _modesBySessionType;
+    constructor(instantiationService: IInstantiationService, contextKeyService: IContextKeyService, configurationService: IConfigurationService);
+    getModes(sessionType: string): IChatModes;
+    awaitModes(sessionType: string): Promise<IChatModes>;
     private updateAgentModePolicyContextKey;
     private isAgentModeDisabledByPolicy;
 }
@@ -82,7 +81,6 @@ export interface IChatMode {
     readonly visibility?: IObservable<ICustomAgentVisibility | undefined>;
     readonly agents?: IObservable<readonly string[] | undefined>;
     readonly sessionTypes?: readonly string[];
-    readonly when?: ContextKeyExpression;
 }
 export interface IVariableReference {
     readonly name: string;
@@ -107,7 +105,6 @@ export declare class CustomChatMode implements IChatMode {
     private readonly _agentsObservable;
     private _source;
     private _sessionTypes;
-    private _when;
     readonly id: string;
     get name(): IObservable<string>;
     get description(): IObservable<string | undefined>;
@@ -125,7 +122,6 @@ export declare class CustomChatMode implements IChatMode {
     get visibility(): IObservable<ICustomAgentVisibility | undefined>;
     get agents(): IObservable<readonly string[] | undefined>;
     get sessionTypes(): readonly string[] | undefined;
-    get when(): ContextKeyExpression | undefined;
     readonly kind = ChatModeKind.Agent;
     constructor(customChatMode: ICustomAgent);
     /**

package/vscode/src/vs/workbench/contrib/chat/common/chatModes.js

@@ -2,22 +2,24 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { CancellationToken } from '../../../../base/common/cancellation.js';
 import { Emitter } from '../../../../base/common/event.js';
-import { Disposable } from '../../../../base/common/lifecycle.js';
+import { Disposable, DisposableMap } from '../../../../base/common/lifecycle.js';
 import '../../../../base/common/observableInternal/index.js';
 import { URI, isUriComponents } from '../../../../base/common/uri.js';
 import { localize } from '../../../../nls.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 import { ExtensionIdentifier } from '../../../../platform/extensions/common/extensions.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { ILogService } from '../../../../platform/log/common/log.service.js';
 import { StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
 import { IStorageService } from '../../../../platform/storage/common/storage.service.js';
 import { IChatAgentService } from './participants/chatAgents.service.js';
 import { ChatContextKeys } from './actions/chatContextKeys.js';
 import { ChatConfiguration, ChatModeKind } from './constants.js';
-import { PromptsStorage, isCustomAgentVisibility } from './promptSyntax/service/promptsService.js';
+import { PromptsStorage, matchesSessionType, isCustomAgentVisibility } from './promptSyntax/service/promptsService.js';
 import { IPromptsService } from './promptSyntax/service/promptsService.service.js';
-import { Target, PromptFileSource } from './promptSyntax/promptTypes.js';
+import { ICustomizationHarnessService } from './customizationHarnessService.service.js';
+import { Target } from './promptSyntax/promptTypes.js';
 import { Codicon } from '../../../../base/common/codicons.js';
 import { hash } from '../../../../base/common/hash.js';
 import { isString } from '../../../../base/common/types.js';
@@ -26,57 +28,83 @@ import { constObservable } from '../../../../base/common/observableInternal/obse
 import { observableValue } from '../../../../base/common/observableInternal/observables/observableValue.js';
 import { transaction } from '../../../../base/common/observableInternal/transaction.js';
 
-var ChatModeService_1;
-let ChatModeService = class ChatModeService extends Disposable {
+var ChatModes_1;
+let ChatModes = class ChatModes extends Disposable {
     static {
-        ChatModeService_1 = this;
+        ChatModes_1 = this;
     }
     static {
-        this.CUSTOM_MODES_STORAGE_KEY = "chat.customModes";
+        this.CUSTOM_MODES_STORAGE_KEY_PREFIX = "chat.customModes.";
     }
     constructor(
+        sessionType,
         promptsService,
         chatAgentService,
         contextKeyService,
         logService,
         storageService,
-        configurationService
+        configurationService,
+        customizationHarnessService
     ) {
         super();
+        this.sessionType = sessionType;
         this.promptsService = promptsService;
         this.chatAgentService = chatAgentService;
         this.logService = logService;
         this.storageService = storageService;
         this.configurationService = configurationService;
+        this.customizationHarnessService = customizationHarnessService;
         this._customModeInstances = ( new Map());
-        this._onDidChangeChatModes = this._register(( new Emitter()));
-        this.onDidChangeChatModes = this._onDidChangeChatModes.event;
+        this._onDidChange = this._register(( new Emitter()));
+        this.onDidChange = this._onDidChange.event;
+        this._pendingRefresh = Promise.resolve();
+        this._storageKey = ChatModes_1.CUSTOM_MODES_STORAGE_KEY_PREFIX + sessionType;
         this.hasCustomModes = ChatContextKeys.Modes.hasCustomChatModes.bindTo(contextKeyService);
-        this.agentModeDisabledByPolicy = ChatContextKeys.Modes.agentModeDisabledByPolicy.bindTo(contextKeyService);
-        this.updateAgentModePolicyContextKey();
         this.loadCachedModes();
-        void this.refreshCustomPromptModes(true);
+        this._pendingRefresh = this.refreshCustomPromptModes(true);
         this._register(this.promptsService.onDidChangeCustomAgents(() => {
-            void this.refreshCustomPromptModes(true);
+            this._pendingRefresh = this.refreshCustomPromptModes(true);
+        }));
+        this._register(this.customizationHarnessService.onDidChangeCustomAgents(e => {
+            if (e.sessionType === this.sessionType && this.useChatSessionCustomizationsForCustomAgents()) {
+                this._pendingRefresh = this.refreshCustomPromptModes(true);
+            }
         }));
         this._register(this.storageService.onWillSaveState(() => this.saveCachedModes()));
         this._register(this.configurationService.onDidChangeConfiguration(e => {
             if (e.affectsConfiguration(ChatConfiguration.AgentEnabled)) {
-                this.updateAgentModePolicyContextKey();
-                this._onDidChangeChatModes.fire();
+                this._onDidChange.fire();
+            }
+            if (e.affectsConfiguration(ChatConfiguration.UseChatSessionCustomizationsForCustomAgents)) {
+                this._pendingRefresh = this.refreshCustomPromptModes(true);
             }
         }));
         let didHaveToolsAgent = this.chatAgentService.hasToolsAgent;
         this._register(this.chatAgentService.onDidChangeAgents(() => {
             if (didHaveToolsAgent !== this.chatAgentService.hasToolsAgent) {
                 didHaveToolsAgent = this.chatAgentService.hasToolsAgent;
-                this._onDidChangeChatModes.fire();
+                this._onDidChange.fire();
             }
         }));
     }
+    get builtin() {
+        return this.getBuiltinModes();
+    }
+    get custom() {
+        return this.getCustomModes();
+    }
+    findModeById(id) {
+        return this.getBuiltinModes().find(mode => mode.id === id) ?? this._customModeInstances.get(id);
+    }
+    findModeByName(name) {
+        return this.getBuiltinModes().find(mode => mode.name.get() === name) ?? this.getCustomModes().find(mode => mode.name.get() === name);
+    }
+    waitForRefresh() {
+        return this._pendingRefresh;
+    }
     loadCachedModes() {
         try {
-            const cachedCustomModes = this.storageService.getObject(ChatModeService_1.CUSTOM_MODES_STORAGE_KEY, StorageScope.WORKSPACE);
+            const cachedCustomModes = this.storageService.getObject(this._storageKey, StorageScope.WORKSPACE);
             if (cachedCustomModes) {
                 this.deserializeCachedModes(cachedCustomModes);
             }
@@ -118,7 +146,8 @@ let ChatModeService = class ChatModeService extends Disposable {
                         sessionTypes: cachedMode.sessionTypes,
                         source: reviveChatModeSource(cachedMode.source) ?? {
                             storage: PromptsStorage.local
-                        }
+                        },
+                        enabled: true
                     };
                     const instance = ( new CustomChatMode(customChatMode));
                     this._customModeInstances.set(( uri.toString()), instance);
@@ -133,7 +162,7 @@ let ChatModeService = class ChatModeService extends Disposable {
         try {
             const modesToCache = Array.from(( this._customModeInstances.values()));
             this.storageService.store(
-                ChatModeService_1.CUSTOM_MODES_STORAGE_KEY,
+                this._storageKey,
                 modesToCache,
                 StorageScope.WORKSPACE,
                 StorageTarget.MACHINE
@@ -142,12 +171,16 @@ let ChatModeService = class ChatModeService extends Disposable {
             this.logService.warn("Failed to save cached custom agents", error);
         }
     }
+    useChatSessionCustomizationsForCustomAgents() {
+        return this.configurationService.getValue(ChatConfiguration.UseChatSessionCustomizationsForCustomAgents) === true;
+    }
     async refreshCustomPromptModes(fireChangeEvent) {
         try {
-            const customModes = await this.promptsService.getCustomAgents(CancellationToken.None);
+            const useHarness = this.useChatSessionCustomizationsForCustomAgents();
+            const customModes = useHarness ? await this.customizationHarnessService.getCustomAgents(this.sessionType, CancellationToken.None) : (await this.promptsService.getCustomAgents(CancellationToken.None)).filter(mode => matchesSessionType(mode.sessionTypes, this.sessionType));
             const seenUris = ( new Set());
             for (const customMode of customModes) {
-                if (!customMode.visibility.userInvocable) {
+                if (!customMode.visibility.userInvocable || !customMode.enabled) {
                     continue;
                 }
                 const uriString = ( customMode.uri.toString());
@@ -172,21 +205,9 @@ let ChatModeService = class ChatModeService extends Disposable {
             this.hasCustomModes.set(false);
         }
         if (fireChangeEvent) {
-            this._onDidChangeChatModes.fire();
+            this._onDidChange.fire();
         }
     }
-    getModes() {
-        return {
-            builtin: this.getBuiltinModes(),
-            custom: this.getCustomModes()
-        };
-    }
-    findModeById(id) {
-        return this.getBuiltinModes().find(mode => mode.id === id) ?? this._customModeInstances.get(id);
-    }
-    findModeByName(name) {
-        return this.getBuiltinModes().find(mode => mode.name.get() === name) ?? this.getCustomModes().find(mode => mode.name.get() === name);
-    }
     getBuiltinModes() {
         const builtinModes = [ChatMode.Ask];
         if (this.chatAgentService.hasToolsAgent || this.isAgentModeDisabledByPolicy()) {
@@ -198,6 +219,38 @@ let ChatModeService = class ChatModeService extends Disposable {
     getCustomModes() {
         return this.chatAgentService.hasToolsAgent || this.isAgentModeDisabledByPolicy() ? Array.from(( this._customModeInstances.values())) : [];
     }
+    isAgentModeDisabledByPolicy() {
+        return this.configurationService.inspect(ChatConfiguration.AgentEnabled).policyValue === false;
+    }
+};
+ChatModes = ChatModes_1 = ( __decorate([( __param(1, IPromptsService)), ( __param(2, IChatAgentService)), ( __param(3, IContextKeyService)), ( __param(4, ILogService)), ( __param(5, IStorageService)), ( __param(6, IConfigurationService)), ( __param(7, ICustomizationHarnessService))], ChatModes));
+let ChatModeService = class ChatModeService extends Disposable {
+    constructor(instantiationService, contextKeyService, configurationService) {
+        super();
+        this.instantiationService = instantiationService;
+        this.configurationService = configurationService;
+        this._modesBySessionType = this._register(( new DisposableMap()));
+        this.agentModeDisabledByPolicy = ChatContextKeys.Modes.agentModeDisabledByPolicy.bindTo(contextKeyService);
+        this.updateAgentModePolicyContextKey();
+        this._register(this.configurationService.onDidChangeConfiguration(e => {
+            if (e.affectsConfiguration(ChatConfiguration.AgentEnabled)) {
+                this.updateAgentModePolicyContextKey();
+            }
+        }));
+    }
+    getModes(sessionType) {
+        let modes = this._modesBySessionType.get(sessionType);
+        if (!modes) {
+            modes = this.instantiationService.createInstance(ChatModes, sessionType);
+            this._modesBySessionType.set(sessionType, modes);
+        }
+        return modes;
+    }
+    async awaitModes(sessionType) {
+        const modes = this.getModes(sessionType);
+        await modes.waitForRefresh();
+        return modes;
+    }
     updateAgentModePolicyContextKey() {
         this.agentModeDisabledByPolicy.set(this.isAgentModeDisabledByPolicy());
     }
@@ -205,7 +258,7 @@ let ChatModeService = class ChatModeService extends Disposable {
         return this.configurationService.inspect(ChatConfiguration.AgentEnabled).policyValue === false;
     }
 };
-ChatModeService = ChatModeService_1 = ( __decorate([( __param(0, IPromptsService)), ( __param(1, IChatAgentService)), ( __param(2, IContextKeyService)), ( __param(3, ILogService)), ( __param(4, IStorageService)), ( __param(5, IConfigurationService))], ChatModeService));
+ChatModeService = ( __decorate([( __param(0, IInstantiationService)), ( __param(1, IContextKeyService)), ( __param(2, IConfigurationService))], ChatModeService));
 function isCachedChatModeData(data) {
     if (typeof data !== "object" || data === null) {
         return false;
@@ -262,9 +315,6 @@ class CustomChatMode {
     get sessionTypes() {
         return this._sessionTypes;
     }
-    get when() {
-        return this._when;
-    }
     constructor(customChatMode) {
         this.kind = ChatModeKind.Agent;
         this.id = ( customChatMode.uri.toString());
@@ -281,7 +331,6 @@ class CustomChatMode {
         this._uriObservable = observableValue("uri", customChatMode.uri);
         this._source = customChatMode.source;
         this._sessionTypes = customChatMode.sessionTypes;
-        this._when = customChatMode.when;
     }
     updateData(newData) {
         transaction(tx => {
@@ -298,7 +347,6 @@ class CustomChatMode {
             this._uriObservable.set(newData.uri, tx);
             this._source = newData.source;
             this._sessionTypes = newData.sessionTypes;
-            this._when = newData.when;
         });
     }
     toJSON() {
@@ -341,8 +389,7 @@ function serializeChatModeSource(source) {
     if (source.storage === PromptsStorage.extension) {
         return {
             storage: PromptsStorage.extension,
-            extensionId: source.extensionId.value,
-            type: source.type
+            extensionId: source.extensionId.value
         };
     }
     if (source.storage === PromptsStorage.plugin) {
@@ -360,16 +407,9 @@ function reviveChatModeSource(data) {
         return undefined;
     }
     if (data.storage === PromptsStorage.extension) {
-        let type;
-        if (data.type === "provider"  || data.type === PromptFileSource.ExtensionAPI) {
-            type = PromptFileSource.ExtensionAPI;
-        } else {
-            type = PromptFileSource.ExtensionContribution;
-        }
         return {
             storage: PromptsStorage.extension,
-            extensionId: ( new ExtensionIdentifier(data.extensionId)),
-            type
+            extensionId: ( new ExtensionIdentifier(data.extensionId))
         };
     }
     if (data.storage === PromptsStorage.plugin) {
@@ -408,9 +448,9 @@ class BuiltinChatMode {
 }
 var ChatMode;
 (function(ChatMode) {
-    ChatMode.Ask = ( new BuiltinChatMode(ChatModeKind.Ask, "Ask", ( localize(7376, "Explore and understand your code")), Codicon.question));
-    ChatMode.Edit = ( new BuiltinChatMode(ChatModeKind.Edit, "Edit", ( localize(7377, "Edit or refactor selected code")), Codicon.edit));
-    ChatMode.Agent = ( new BuiltinChatMode(ChatModeKind.Agent, "Agent", ( localize(7378, "Describe what to build")), Codicon.agent));
+    ChatMode.Ask = ( new BuiltinChatMode(ChatModeKind.Ask, "Ask", ( localize(7687, "Explore and understand your code")), Codicon.question));
+    ChatMode.Edit = ( new BuiltinChatMode(ChatModeKind.Edit, "Edit", ( localize(7688, "Edit or refactor selected code")), Codicon.edit));
+    ChatMode.Agent = ( new BuiltinChatMode(ChatModeKind.Agent, "Agent", ( localize(7689, "Describe what to build")), Codicon.agent));
 })(ChatMode || (ChatMode = {}));
 function isBuiltinChatMode(mode) {
     return mode.id === ChatMode.Ask.id || mode.id === ChatMode.Edit.id || mode.id === ChatMode.Agent.id;

package/vscode/src/vs/workbench/contrib/chat/common/chatModes.service.d.ts

@@ -1,13 +1,18 @@
-import { Event } from "../../../../base/common/event.js";
-import { IChatMode } from "./chatModes.js";
+import { IChatModes } from "./chatModes.js";
 export declare const IChatModeService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IChatModeService>;
 export interface IChatModeService {
     readonly _serviceBrand: undefined;
-    readonly onDidChangeChatModes: Event<void>;
-    getModes(): {
-        builtin: readonly IChatMode[];
-        custom: readonly IChatMode[];
-    };
-    findModeById(id: string): IChatMode | undefined;
-    findModeByName(name: string): IChatMode | undefined;
+    /**
+    * Returns the chat modes available for the given session type. Custom modes
+    * are filtered by their declared {@link ICustomAgent.sessionTypes}.
+    *
+    * Instances are cached by session type and live for the lifetime of the service.
+    */
+    getModes(sessionType: string): IChatModes;
+    /**
+    * Like {@link getModes}, but awaits the in-flight refresh of custom prompt
+    * modes so callers see an up-to-date snapshot. Use this when synchronous
+    * results are not required and stale data would be surprising.
+    */
+    awaitModes(sessionType: string): Promise<IChatModes>;
 }

package/vscode/src/vs/workbench/contrib/chat/common/chatService/chatService.d.ts

@@ -23,6 +23,7 @@ import { IChatAgentCommand, IChatAgentData, IChatAgentResult, UserSelectedTools
 import { HookTypeValue } from "../promptSyntax/hookTypes.js";
 import { IChatParserContext } from "../requestParser/chatRequestParser.js";
 import { IPreparedToolInvocation, IToolConfirmationMessages, IToolResult, IToolResultInputOutputDetails, ToolDataSource } from "../tools/languageModelToolsService.js";
+import { ConfirmationOptionKind } from "../../../../../platform/agentHost/common/state/protocol/state.js";
 export interface IChatRequest {
     message: string;
     variables: Record<string, IChatRequestVariableValue[]>;
@@ -44,6 +45,12 @@ export interface IChatResponseErrorDetails {
     responseIsRedacted?: boolean;
     isQuotaExceeded?: boolean;
     isRateLimited?: boolean;
+    /**
+     * If true, the error is an expected operational condition (e.g. user-actionable
+     * configuration, network connectivity, missing dependency) and should not be
+     * logged as a `chatAgentError` telemetry event.
+     */
+    isExpectedError?: boolean;
     level?: ChatErrorLevel;
     confirmationButtons?: IChatResponseErrorDetailsConfirmationButton[];
     code?: string;
@@ -220,6 +227,10 @@ export interface IChatWarningMessage {
     content: IMarkdownString;
     kind: "warning";
 }
+export interface IChatInfoMessage {
+    content: IMarkdownString;
+    kind: "info";
+}
 export interface IChatAgentVulnerabilityDetails {
     title: string;
     description: string;
@@ -362,6 +373,10 @@ export interface IChatElicitationRequest {
     state: IObservable<ElicitationState>;
     acceptedResult?: Record<string, unknown>;
     moreActions?: IAction[];
+    riskAssessment?: {
+        toolId: string;
+        parameters: unknown;
+    };
     accept(value: IAction | true): Promise<void>;
     reject?: () => Promise<void>;
     isHidden?: IObservable<boolean>;
@@ -525,12 +540,13 @@ export type ConfirmedReason = {
 } | {
     type: ToolConfirmKind.UserAction;
     selectedButton?: string;
+    selectedButtonKind?: ConfirmationOptionKind;
 } | {
     type: ToolConfirmKind.Skipped;
 };
 export interface IChatToolInvocation {
     readonly presentation: IPreparedToolInvocation["presentation"];
-    readonly toolSpecificData?: IChatTerminalToolInvocationData | ILegacyChatTerminalToolInvocationData | IChatToolInputInvocationData | IChatExtensionsContent | IChatPullRequestContent | IChatTodoListContent | IChatSubagentToolInvocationData | IChatSimpleToolInvocationData | IChatToolResourcesInvocationData | IChatModifiedFilesConfirmationData;
+    readonly toolSpecificData?: IChatTerminalToolInvocationData | ILegacyChatTerminalToolInvocationData | IChatToolInputInvocationData | IChatExtensionsContent | IChatPullRequestContent | IChatTodoListContent | IChatSubagentToolInvocationData | IChatSimpleToolInvocationData | IChatSearchToolInvocationData | IChatToolResourcesInvocationData | IChatModifiedFilesConfirmationData;
     /**
      * Observable that tracks the `kind` of `toolSpecificData`. Used by the
      * tool invocation part to re-render when the kind changes (e.g. from
@@ -640,7 +656,7 @@ export interface IToolResultOutputDetailsSerialized {
  */
 export interface IChatToolInvocationSerialized {
     presentation: IPreparedToolInvocation["presentation"];
-    toolSpecificData?: IChatTerminalToolInvocationData | IChatToolInputInvocationData | IChatExtensionsContent | IChatPullRequestContent | IChatTodoListContent | IChatSubagentToolInvocationData | IChatSimpleToolInvocationData | IChatToolResourcesInvocationData | IChatModifiedFilesConfirmationData;
+    toolSpecificData?: IChatTerminalToolInvocationData | IChatToolInputInvocationData | IChatExtensionsContent | IChatPullRequestContent | IChatTodoListContent | IChatSubagentToolInvocationData | IChatSimpleToolInvocationData | IChatSearchToolInvocationData | IChatToolResourcesInvocationData | IChatModifiedFilesConfirmationData;
     invocationMessage: string | IMarkdownString;
     originMessage: string | IMarkdownString | undefined;
     pastTenseMessage: string | IMarkdownString | undefined;
@@ -711,6 +727,9 @@ export interface IChatSimpleToolInvocationData {
     input: string;
     output: string;
 }
+export interface IChatSearchToolInvocationData {
+    readonly kind: "search";
+}
 export interface IChatToolResourcesInvocationData {
     readonly kind: "resources";
     readonly values: Array<URI | Location>;
@@ -753,6 +772,14 @@ export interface IChatDisabledClaudeHooksPart {
 }
 /** A single approval option shown in the plan review dropdown button. */
 export interface IChatPlanApprovalAction {
+    /**
+     * Stable identifier for matching the chosen action programmatically.
+     * Unlike `label` this is not localized, so callers should compare
+     * against `IChatPlanReviewResult.actionId` rather than `action`.
+     * Optional for backwards-compatibility; omit for one-off actions
+     * where the localized label is the only intended identifier.
+     */
+    id?: string;
     label: string;
     description?: string;
     default?: boolean;
@@ -761,9 +788,22 @@ export interface IChatPlanApprovalAction {
 }
 /** The result of reviewing a plan. */
 export interface IChatPlanReviewResult {
+    /** The chosen action's localized `label`. */
     action?: string;
+    /** The chosen action's stable `id`, if it had one. Prefer this over
+     * `action` for programmatic comparisons. */
+    actionId?: string;
     rejected: boolean;
+    /** Combined feedback string sent to the agent (overall comment + inline
+     * comments, joined and formatted as markdown). */
     feedback?: string;
+    /** Display-only: the overall textarea comment, kept separate from
+     * `feedbackInlineMarkdown` so the chat transcript can render the two
+     * parts differently. Falls back to `feedback` when unset. */
+    feedbackOverall?: string;
+    /** Display-only: pre-formatted markdown listing the inline comments
+     * (heading + bullets). See `feedbackOverall`. */
+    feedbackInlineMarkdown?: string;
 }
 /**
  * A plan review widget. Presents a title, markdown plan content, an optional
@@ -800,7 +840,7 @@ export declare class ChatMcpServersStarting implements IChatMcpServersStarting {
     wait(): Promise<IAutostartResult>;
     toJSON(): IChatMcpServersStartingSerialized;
 }
-export type IChatProgress = IChatMarkdownContent | IChatAgentMarkdownContentWithVulnerability | IChatTreeData | IChatMultiDiffData | IChatMultiDiffDataSerialized | IChatUsedContext | IChatContentReference | IChatContentInlineReference | IChatCodeCitation | IChatProgressMessage | IChatTask | IChatTaskResult | IChatCommandButton | IChatWarningMessage | IChatTextEdit | IChatNotebookEdit | IChatWorkspaceEdit | IChatMoveMessage | IChatResponseCodeblockUriPart | IChatConfirmation | IChatQuestionCarousel | IChatPlanReview | IChatClearToPreviousToolInvocation | IChatToolInvocation | IChatToolInvocationSerialized | IChatExtensionsContent | IChatPullRequestContent | IChatUndoStop | IChatThinkingPart | IChatTaskSerialized | IChatElicitationRequest | IChatElicitationRequestSerialized | IChatMcpServersStarting | IChatMcpServersStartingSerialized | IChatHookPart | IChatExternalToolInvocationUpdate | IChatDisabledClaudeHooksPart;
+export type IChatProgress = IChatMarkdownContent | IChatAgentMarkdownContentWithVulnerability | IChatTreeData | IChatMultiDiffData | IChatMultiDiffDataSerialized | IChatUsedContext | IChatContentReference | IChatContentInlineReference | IChatCodeCitation | IChatProgressMessage | IChatTask | IChatTaskResult | IChatCommandButton | IChatWarningMessage | IChatInfoMessage | IChatTextEdit | IChatNotebookEdit | IChatWorkspaceEdit | IChatMoveMessage | IChatResponseCodeblockUriPart | IChatConfirmation | IChatQuestionCarousel | IChatPlanReview | IChatClearToPreviousToolInvocation | IChatToolInvocation | IChatToolInvocationSerialized | IChatExtensionsContent | IChatPullRequestContent | IChatUndoStop | IChatThinkingPart | IChatTaskSerialized | IChatElicitationRequest | IChatElicitationRequestSerialized | IChatMcpServersStarting | IChatMcpServersStartingSerialized | IChatHookPart | IChatExternalToolInvocationUpdate | IChatDisabledClaudeHooksPart;
 export interface IChatFollowup {
     kind: "reply";
     message: string;
@@ -961,6 +1001,11 @@ export interface IChatDetail {
     isActive: boolean;
     stats?: IChatSessionStats;
     lastResponseState: ResponseModelState;
+    /**
+     * The working directory URI associated with this session.
+     * Only populated in the sessions/agents window context.
+     */
+    workingDirectory?: URI;
 }
 export interface IChatProviderInfo {
     id: string;
@@ -1039,7 +1084,7 @@ export interface IChatSendRequestOptions {
     rejectedConfirmationData?: any[];
     attachedContext?: IChatRequestVariableEntry[];
     resolvedVariables?: IChatRequestVariableEntry[];
-    agentHostSessionConfig?: Record<string, string>;
+    agentHostSessionConfig?: Record<string, unknown>;
     /** The target agent ID can be specified with this property instead of using @ in 'message' */
     agentId?: string;
     /** agentId, but will not add a @ name to the request */